diff --git a/.clang-tidy b/.clang-tidy
index 3903911a277..dc1cebe9430 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -5,128 +5,126 @@
 # a) the new check is not controversial (this includes many checks in readability-* and google-*) or
 # b) too noisy (checks with > 100 new warnings are considered noisy, this includes e.g. cppcoreguidelines-*).
 
-# TODO: Once clang(-tidy) 17 is the minimum, we can convert this list to YAML
-# See https://releases.llvm.org/17.0.1/tools/clang/tools/extra/docs/ReleaseNotes.html#improvements-to-clang-tidy
+HeaderFilterRegex: '^.*/(base|src|programs|utils)/.*(h|hpp)$'
 
-# TODO Let clang-tidy check headers in further directories
-#      --> HeaderFilterRegex: '^.*/(src|base|programs|utils)/.*(h|hpp)$'
-HeaderFilterRegex: '^.*/(base)/.*(h|hpp)$'
+Checks: [
+  '*',
 
-Checks: '*,
-    -abseil-*,
+  '-abseil-*',
 
-    -altera-*,
+  '-altera-*',
 
-    -android-*,
+  '-android-*',
 
-    -bugprone-assignment-in-if-condition,
-    -bugprone-branch-clone,
-    -bugprone-easily-swappable-parameters,
-    -bugprone-exception-escape,
-    -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,
+  '-bugprone-assignment-in-if-condition',
+  '-bugprone-branch-clone',
+  '-bugprone-easily-swappable-parameters',
+  '-bugprone-exception-escape',
+  '-bugprone-forward-declaration-namespace',
+  '-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,
-    -cert-oop54-cpp,
-    -cert-oop57-cpp,
+  '-cert-dcl16-c',
+  '-cert-dcl37-c',
+  '-cert-dcl51-cpp',
+  '-cert-err58-cpp',
+  '-cert-msc32-c',
+  '-cert-msc51-cpp',
+  '-cert-oop54-cpp',
+  '-cert-oop57-cpp',
 
-    -clang-analyzer-unix.Malloc,
+  '-clang-analyzer-optin.performance.Padding',
 
-    -cppcoreguidelines-*, # impractical in a codebase as large as ClickHouse, also slow
+  '-clang-analyzer-unix.Malloc',
 
-    -darwin-*,
+  '-cppcoreguidelines-*', # impractical in a codebase as large as ClickHouse, also slow
 
-    -fuchsia-*,
+  '-darwin-*',
 
-    -google-build-using-namespace,
-    -google-readability-braces-around-statements,
-    -google-readability-casting,
-    -google-readability-function-size,
-    -google-readability-namespace-comments,
-    -google-readability-todo,
+  '-fuchsia-*',
 
-    -hicpp-avoid-c-arrays,
-    -hicpp-avoid-goto,
-    -hicpp-braces-around-statements,
-    -hicpp-explicit-conversions,
-    -hicpp-function-size,
-    -hicpp-member-init,
-    -hicpp-move-const-arg,
-    -hicpp-multiway-paths-covered,
-    -hicpp-named-parameter,
-    -hicpp-no-array-decay,
-    -hicpp-no-assembler,
-    -hicpp-no-malloc,
-    -hicpp-signed-bitwise,
-    -hicpp-special-member-functions,
-    -hicpp-uppercase-literal-suffix,
-    -hicpp-use-auto,
-    -hicpp-use-emplace,
-    -hicpp-vararg,
+  '-google-build-using-namespace',
+  '-google-readability-braces-around-statements',
+  '-google-readability-casting',
+  '-google-readability-function-size',
+  '-google-readability-namespace-comments',
+  '-google-readability-todo',
 
-    -linuxkernel-*,
+  '-hicpp-avoid-c-arrays',
+  '-hicpp-avoid-goto',
+  '-hicpp-braces-around-statements',
+  '-hicpp-explicit-conversions',
+  '-hicpp-function-size',
+  '-hicpp-member-init',
+  '-hicpp-move-const-arg',
+  '-hicpp-multiway-paths-covered',
+  '-hicpp-named-parameter',
+  '-hicpp-no-array-decay',
+  '-hicpp-no-assembler',
+  '-hicpp-no-malloc',
+  '-hicpp-signed-bitwise',
+  '-hicpp-special-member-functions',
+  '-hicpp-uppercase-literal-suffix',
+  '-hicpp-use-auto',
+  '-hicpp-use-emplace',
+  '-hicpp-vararg',
 
-    -llvm-*,
+  '-linuxkernel-*',
 
-    -llvmlibc-*,
+  '-llvm-*',
 
-    -openmp-*,
+  '-llvmlibc-*',
 
-    -misc-const-correctness,
-    -misc-include-cleaner, # useful but far too many occurrences
-    -misc-no-recursion,
-    -misc-non-private-member-variables-in-classes,
-    -misc-confusable-identifiers, # useful but slooow
-    -misc-use-anonymous-namespace,
+  '-openmp-*',
 
-    -modernize-avoid-c-arrays,
-    -modernize-concat-nested-namespaces,
-    -modernize-macro-to-enum,
-    -modernize-pass-by-value,
-    -modernize-return-braced-init-list,
-    -modernize-use-auto,
-    -modernize-use-default-member-init,
-    -modernize-use-emplace,
-    -modernize-use-nodiscard,
-    -modernize-use-override,
-    -modernize-use-trailing-return-type,
+  '-misc-const-correctness',
+  '-misc-include-cleaner', # useful but far too many occurrences
+  '-misc-no-recursion',
+  '-misc-non-private-member-variables-in-classes',
+  '-misc-confusable-identifiers', # useful but slooo
+  '-misc-use-anonymous-namespace',
 
-    -performance-inefficient-string-concatenation,
-    -performance-no-int-to-ptr,
-    -performance-avoid-endl,
-    -performance-unnecessary-value-param,
+  '-modernize-avoid-c-arrays',
+  '-modernize-concat-nested-namespaces',
+  '-modernize-macro-to-enum',
+  '-modernize-pass-by-value',
+  '-modernize-return-braced-init-list',
+  '-modernize-use-auto',
+  '-modernize-use-default-member-init',
+  '-modernize-use-emplace',
+  '-modernize-use-nodiscard',
+  '-modernize-use-trailing-return-type',
 
-    -portability-simd-intrinsics,
+  '-performance-inefficient-string-concatenation',
+  '-performance-no-int-to-ptr',
+  '-performance-avoid-endl',
+  '-performance-unnecessary-value-param',
 
-    -readability-avoid-unconditional-preprocessor-if,
-    -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,
-    -readability-named-parameter,
-    -readability-redundant-declaration,
-    -readability-simplify-boolean-expr,
-    -readability-static-accessed-through-instance,
-    -readability-suspicious-call-argument,
-    -readability-uppercase-literal-suffix,
-    -readability-use-anyofallof,
+  '-portability-simd-intrinsics',
 
-    -zircon-*,
-'
+  '-readability-avoid-unconditional-preprocessor-if',
+  '-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',
+  '-readability-named-parameter',
+  '-readability-redundant-declaration',
+  '-readability-simplify-boolean-expr',
+  '-readability-suspicious-call-argument',
+  '-readability-uppercase-literal-suffix',
+  '-readability-use-anyofallof',
+
+  '-zircon-*'
+]
 
 WarningsAsErrors: '*'
 
diff --git a/.github/ISSUE_TEMPLATE/85_bug-report.md b/.github/ISSUE_TEMPLATE/85_bug-report.md
index 93b2342af70..6bf265260ac 100644
--- a/.github/ISSUE_TEMPLATE/85_bug-report.md
+++ b/.github/ISSUE_TEMPLATE/85_bug-report.md
@@ -17,7 +17,7 @@ assignees: ''
 
 > A link to reproducer in [https://fiddle.clickhouse.com/](https://fiddle.clickhouse.com/).
 
-**Does it reproduce on recent release?**
+**Does it reproduce on the most recent release?**
 
 [The list of releases](https://github.com/ClickHouse/ClickHouse/blob/master/utils/list-versions/version_date.tsv)
 
@@ -34,11 +34,11 @@ assignees: ''
 **How to reproduce**
 
 * Which ClickHouse server version to use
-* Which interface to use, if matters
+* Which interface to use, if it matters
 * Non-default settings, if any
 * `CREATE TABLE` statements for all tables involved
 * Sample data for all these tables, use [clickhouse-obfuscator](https://github.com/ClickHouse/ClickHouse/blob/master/programs/obfuscator/Obfuscator.cpp#L42-L80) if necessary
-* Queries to run that lead to unexpected result
+* Queries to run that lead to an unexpected result
 
 **Expected behavior**
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index db170c3e28f..85b1d460833 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,6 +12,7 @@ tests/ci/cancel_and_rerun_workflow_lambda/app.py
 - Build/Testing/Packaging Improvement
 - Documentation (changelog entry is not required)
 - Bug Fix (user-visible misbehavior in an official stable release)
+- CI Fix or Improvement (changelog entry is not required)
 - Not for changelog (changelog entry is not required)
 
 
@@ -39,3 +40,45 @@ At a minimum, the following information should be added (but add more as needed)
 
 
 > Information about CI checks: https://clickhouse.com/docs/en/development/continuous-integration/
+
+---
+### Modify your CI run:
+**NOTE:** If your merge the PR with modified CI you **MUST KNOW** what you are doing
+**NOTE:** Checked options will be applied if set before CI RunConfig/PrepareRunConfig step
+
+#### Include tests (required builds will be added automatically):
+- [ ] <!---ci_include_fast--> Fast test
+- [ ] <!---ci_include_integration--> Integration Tests
+- [ ] <!---ci_include_stateless--> Stateless tests
+- [ ] <!---ci_include_stateful--> Stateful tests
+- [ ] <!---ci_include_unit--> Unit tests
+- [ ] <!---ci_include_performance--> Performance tests
+- [ ] <!---ci_include_asan--> All with ASAN
+- [ ] <!---ci_include_tsan--> All with TSAN
+- [ ] <!---ci_include_analyzer--> All with Analyzer
+- [ ] <!---ci_include_KEYWORD--> Add your option here
+
+#### Exclude tests:
+- [ ] <!---ci_exclude_fast--> Fast test
+- [ ] <!---ci_exclude_integration--> Integration Tests
+- [ ] <!---ci_exclude_stateless--> Stateless tests
+- [ ] <!---ci_exclude_stateful--> Stateful tests
+- [ ] <!---ci_exclude_performance--> Performance tests
+- [ ] <!---ci_exclude_asan--> All with ASAN
+- [ ] <!---ci_exclude_tsan--> All with TSAN
+- [ ] <!---ci_exclude_msan--> All with MSAN
+- [ ] <!---ci_exclude_ubsan--> All with UBSAN
+- [ ] <!---ci_exclude_coverage--> All with Coverage
+- [ ] <!---ci_exclude_aarch64--> All with Aarch64
+- [ ] <!---ci_exclude_KEYWORD--> Add your option here
+
+#### Extra options:
+- [ ] <!---do_not_test--> do not test (only style check)
+- [ ] <!---no_merge_commit--> disable merge-commit (no merge from master before tests)
+- [ ] <!---no_ci_cache--> disable CI cache (job reuse)
+
+#### Only specified batches in multi-batch jobs:
+- [ ] <!---batch_0--> 1
+- [ ] <!---batch_1--> 2
+- [ ] <!---batch_2--> 3
+- [ ] <!---batch_3--> 4
diff --git a/.github/workflows/backport_branches.yml b/.github/workflows/backport_branches.yml
index ef554a1b0ff..2a98722414b 100644
--- a/.github/workflows/backport_branches.yml
+++ b/.github/workflows/backport_branches.yml
@@ -11,7 +11,7 @@ on: # yamllint disable-line rule:truthy
       - 'backport/**'
 jobs:
   RunConfig:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     outputs:
       data: ${{ steps.runconfig.outputs.CI_DATA }}
     steps:
@@ -67,8 +67,6 @@ jobs:
       test_name: Compatibility check (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
   CompatibilityCheckAarch64:
     needs: [RunConfig, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
@@ -77,8 +75,6 @@ jobs:
       test_name: Compatibility check (aarch64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
 #########################################################################################
@@ -138,21 +134,22 @@ jobs:
 ############################################################################################
 ##################################### Docker images  #######################################
 ############################################################################################
-  DockerServerImages:
+  DockerServerImage:
     needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Docker server and keeper images
+      test_name: Docker server image
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+  DockerKeeperImage:
+    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Docker keeper image
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      checkout_depth: 0  # It MUST BE THE SAME for all dependencies and the job itself
-      run_command: |
-        cd "$GITHUB_WORKSPACE/tests/ci"
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-server --image-path docker/server --allow-build-reuse
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper --allow-build-reuse
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
@@ -169,14 +166,8 @@ jobs:
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
   BuilderSpecialReport:
     # run report check for failed builds to indicate the CI error
     if: ${{ !cancelled() }}
@@ -187,14 +178,8 @@ jobs:
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse special build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
 ############################################################################################
 #################################### INSTALL PACKAGES ######################################
 ############################################################################################
diff --git a/.github/workflows/jepsen.yml b/.github/workflows/jepsen.yml
index 50118eaf622..db837ac1ec7 100644
--- a/.github/workflows/jepsen.yml
+++ b/.github/workflows/jepsen.yml
@@ -8,13 +8,13 @@ on: # yamllint disable-line rule:truthy
   schedule:
     - cron: '0 */6 * * *'
   workflow_dispatch:
-  workflow_call:
 jobs:
   KeeperJepsenRelease:
     uses: ./.github/workflows/reusable_simple_job.yml
     with:
       test_name: Jepsen keeper check
       runner_type: style-checker
+      report_required: true
       run_command: |
         python3 jepsen_check.py keeper
   # ServerJepsenRelease:
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index d2865eb737d..816bdfd4f31 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -11,10 +11,12 @@ on: # yamllint disable-line rule:truthy
       - 'master'
 jobs:
   RunConfig:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     outputs:
       data: ${{ steps.runconfig.outputs.CI_DATA }}
     steps:
+      - name: DebugInfo
+        uses: hmarr/debug-action@a701ed95a46e6f2fb0df25e1a558c16356fae35a
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
         with:
@@ -33,11 +35,9 @@ jobs:
       - name: PrepareRunConfig
         id: runconfig
         run: |
-            echo "::group::configure CI run"
-            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --rebuild-all-binaries --outfile ${{ runner.temp }}/ci_run_data.json
-            echo "::endgroup::"
+            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json
 
-            echo "::group::CI run configure results"
+            echo "::group::CI configuration"
             python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
             echo "::endgroup::"
 
@@ -55,7 +55,6 @@ jobs:
     uses: ./.github/workflows/reusable_docker.yml
     with:
       data: ${{ needs.RunConfig.outputs.data }}
-      set_latest: true
   StyleCheck:
     needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() }}
@@ -74,8 +73,6 @@ jobs:
       test_name: Compatibility check (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
   CompatibilityCheckAarch64:
     needs: [RunConfig, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
@@ -84,8 +81,6 @@ jobs:
       test_name: Compatibility check (aarch64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
 #########################################################################################
@@ -98,6 +93,14 @@ jobs:
       build_name: package_release
       checkout_depth: 0
       data: ${{ needs.RunConfig.outputs.data }}
+  BuilderDebReleaseCoverage:
+    needs: [RunConfig, BuildDockers]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: package_release_coverage
+      checkout_depth: 0
+      data: ${{ needs.RunConfig.outputs.data }}
   BuilderDebAarch64:
     needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() }}
@@ -242,22 +245,22 @@ jobs:
 ############################################################################################
 ##################################### Docker images  #######################################
 ############################################################################################
-  DockerServerImages:
+  DockerServerImage:
     needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Docker server and keeper images
+      test_name: Docker server image
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+  DockerKeeperImage:
+    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Docker keeper image
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      # FIXME: avoid using 0 checkout
-      checkout_depth: 0  # It MUST BE THE SAME for all dependencies and the job itself
-      run_command: |
-        cd "$GITHUB_WORKSPACE/tests/ci"
-        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
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
@@ -266,7 +269,6 @@ jobs:
     if: ${{ !cancelled() }}
     needs:
       - RunConfig
-      - BuilderBinRelease
       - BuilderDebAarch64
       - BuilderDebAsan
       - BuilderDebDebug
@@ -277,14 +279,8 @@ jobs:
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
   BuilderSpecialReport:
     # run report check for failed builds to indicate the CI error
     if: ${{ !cancelled() }}
@@ -301,17 +297,13 @@ jobs:
       - BuilderBinAarch64V80Compat
       - BuilderBinClangTidy
       - BuilderBinAmd64Musl
+      - BuilderDebReleaseCoverage
+      - BuilderBinRelease
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse special build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
   MarkReleaseReady:
     if: ${{ !failure() && !cancelled() }}
     needs:
@@ -321,11 +313,25 @@ jobs:
       - BuilderDebAarch64
     runs-on: [self-hosted, style-checker]
     steps:
+      - name: Debug
+        run: |
+          echo need with different filters
+          cat << 'EOF'
+          ${{ toJSON(needs) }}
+          ${{ toJSON(needs.*.result) }}
+          no failures ${{ !contains(needs.*.result, 'failure') }}
+          no skips ${{ !contains(needs.*.result, 'skipped') }}
+          no both ${{ !(contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
+          EOF
+      - name: Not ready
+        # fail the job to be able restart it
+        if: ${{ contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure') }}
+        run: exit 1
       - name: Check out repository code
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
         uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
       - name: Mark Commit Release Ready
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 mark_release_ready.py
@@ -363,36 +369,28 @@ jobs:
       test_name: Stateless tests (release)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseDatabaseOrdinary:
+  FunctionalStatelessTestReleaseAnalyzerS3Replicated:
     needs: [RunConfig, BuilderDebRelease]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Stateless tests (release, DatabaseOrdinary)
+      test_name: Stateless tests (release, old analyzer, s3, DatabaseReplicated)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseDatabaseReplicated:
-    needs: [RunConfig, BuilderDebRelease]
+  FunctionalStatelessTestS3Debug:
+    needs: [RunConfig, BuilderDebDebug]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Stateless tests (release, DatabaseReplicated)
+      test_name: Stateless tests (debug, s3 storage)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseAnalyzer:
-    needs: [RunConfig, BuilderDebRelease]
+  FunctionalStatelessTestS3Tsan:
+    needs: [RunConfig, BuilderDebTsan]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Stateless tests (release, analyzer)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseS3:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (release, s3 storage)
+      test_name: Stateless tests (tsan, s3 storage)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
   FunctionalStatelessTestAarch64:
@@ -503,6 +501,55 @@ jobs:
       test_name: Stateful tests (debug)
       runner_type: func-tester
       data: ${{ needs.RunConfig.outputs.data }}
+  # Parallel replicas
+  FunctionalStatefulTestDebugParallelReplicas:
+    needs: [RunConfig, BuilderDebDebug]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (debug, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestUBsanParallelReplicas:
+    needs: [RunConfig, BuilderDebUBsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (ubsan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestMsanParallelReplicas:
+    needs: [RunConfig, BuilderDebMsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (msan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestTsanParallelReplicas:
+    needs: [RunConfig, BuilderDebTsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (tsan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestAsanParallelReplicas:
+    needs: [RunConfig, BuilderDebAsan]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (asan, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+  FunctionalStatefulTestReleaseParallelReplicas:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Stateful tests (release, ParallelReplicas)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
 ##############################################################################################
 ########################### ClickBench #######################################################
 ##############################################################################################
@@ -585,7 +632,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Integration tests (asan, analyzer)
+      test_name: Integration tests (asan, old analyzer)
       runner_type: stress-tester
       data: ${{ needs.RunConfig.outputs.data }}
   IntegrationTestsTsan:
@@ -710,6 +757,28 @@ jobs:
       runner_type: func-tester-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
 ##############################################################################################
+############################ SQLLOGIC TEST ###################################################
+##############################################################################################
+  SQLLogicTestRelease:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Sqllogic test (release)
+      runner_type: func-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
+##################################### SQL TEST ###############################################
+##############################################################################################
+  SQLTest:
+    needs: [RunConfig, BuilderDebRelease]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: SQLTest
+      runner_type: fuzzer-unit-tester
+      data: ${{ needs.RunConfig.outputs.data }}
+##############################################################################################
 ###################################### SQLANCER FUZZERS ######################################
 ##############################################################################################
   SQLancerTestRelease:
@@ -734,15 +803,14 @@ jobs:
       - MarkReleaseReady
       - FunctionalStatelessTestDebug
       - FunctionalStatelessTestRelease
-      - FunctionalStatelessTestReleaseDatabaseOrdinary
-      - FunctionalStatelessTestReleaseDatabaseReplicated
-      - FunctionalStatelessTestReleaseAnalyzer
-      - FunctionalStatelessTestReleaseS3
+      - FunctionalStatelessTestReleaseAnalyzerS3Replicated
       - FunctionalStatelessTestAarch64
       - FunctionalStatelessTestAsan
       - FunctionalStatelessTestTsan
       - FunctionalStatelessTestMsan
       - FunctionalStatelessTestUBsan
+      - FunctionalStatelessTestS3Debug
+      - FunctionalStatelessTestS3Tsan
       - FunctionalStatefulTestDebug
       - FunctionalStatefulTestRelease
       - FunctionalStatefulTestAarch64
@@ -750,6 +818,12 @@ jobs:
       - FunctionalStatefulTestTsan
       - FunctionalStatefulTestMsan
       - FunctionalStatefulTestUBsan
+      - FunctionalStatefulTestDebugParallelReplicas
+      - FunctionalStatefulTestUBsanParallelReplicas
+      - FunctionalStatefulTestMsanParallelReplicas
+      - FunctionalStatefulTestTsanParallelReplicas
+      - FunctionalStatefulTestAsanParallelReplicas
+      - FunctionalStatefulTestReleaseParallelReplicas
       - StressTestDebug
       - StressTestAsan
       - StressTestTsan
@@ -775,6 +849,8 @@ jobs:
       - UnitTestsReleaseClang
       - SQLancerTestRelease
       - SQLancerTestDebug
+      - SQLLogicTestRelease
+      - SQLTest
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2774eae24cc..515236bb826 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -14,7 +14,7 @@ jobs:
     # The task for having a preserved ENV and event.json for later investigation
     uses: ./.github/workflows/debug.yml
   RunConfig:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     outputs:
       data: ${{ steps.runconfig.outputs.CI_DATA }}
     steps:
@@ -28,7 +28,7 @@ jobs:
         id: runconfig
         run: |
             echo "::group::configure CI run"
-            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --skip-jobs --rebuild-all-docker --outfile ${{ runner.temp }}/ci_run_data.json
+            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --skip-jobs --outfile ${{ runner.temp }}/ci_run_data.json
             echo "::endgroup::"
 
             echo "::group::CI run configure results"
@@ -45,62 +45,3 @@ jobs:
     with:
       data: "${{ needs.RunConfig.outputs.data }}"
       set_latest: true
-  SonarCloud:
-    runs-on: [self-hosted, builder]
-    env:
-      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-17
-      CXX: clang++-17
-    steps:
-      - name: Check out repository code
-        uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-          filter: tree:0
-          submodules: true
-      - name: Set up JDK 11
-        uses: actions/setup-java@v1
-        with:
-          java-version: 11
-      - name: Download and set up sonar-scanner
-        env:
-          SONAR_SCANNER_DOWNLOAD_URL: https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-${{ env.SONAR_SCANNER_VERSION }}-linux.zip
-        run: |
-          mkdir -p "$HOME/.sonar"
-          curl -sSLo "$HOME/.sonar/sonar-scanner.zip" "${{ env.SONAR_SCANNER_DOWNLOAD_URL }}"
-          unzip -o "$HOME/.sonar/sonar-scanner.zip" -d "$HOME/.sonar/"
-          echo "$HOME/.sonar/sonar-scanner-${{ env.SONAR_SCANNER_VERSION }}-linux/bin" >> "$GITHUB_PATH"
-      - name: Download and set up build-wrapper
-        env:
-          BUILD_WRAPPER_DOWNLOAD_URL: ${{ env.SONAR_SERVER_URL }}/static/cpp/build-wrapper-linux-x86.zip
-        run: |
-          curl -sSLo "$HOME/.sonar/build-wrapper-linux-x86.zip" "${{ env.BUILD_WRAPPER_DOWNLOAD_URL }}"
-          unzip -o "$HOME/.sonar/build-wrapper-linux-x86.zip" -d "$HOME/.sonar/"
-          echo "$HOME/.sonar/build-wrapper-linux-x86" >> "$GITHUB_PATH"
-      - name: Set Up Build Tools
-        run: |
-          sudo apt-get update
-          sudo apt-get install -yq git cmake ccache ninja-build python3 yasm nasm
-          sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
-      - name: Run build-wrapper
-        run: |
-          mkdir build
-          cd build
-          cmake ..
-          cd ..
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build build/
-      - name: Run sonar-scanner
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-        run: |
-          sonar-scanner \
-            --define sonar.host.url="${{ env.SONAR_SERVER_URL }}" \
-            --define sonar.cfamily.build-wrapper-output="${{ env.BUILD_WRAPPER_OUT_DIR }}" \
-            --define sonar.projectKey="ClickHouse_ClickHouse" \
-            --define sonar.organization="clickhouse-java" \
-            --define sonar.cfamily.cpp23.enabled=true \
-            --define sonar.exclusions="**/*.java,**/*.ts,**/*.js,**/*.css,**/*.sql"
diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index bd2b2b60904..74ce8452de8 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -6,6 +6,7 @@ env:
   PYTHONUNBUFFERED: 1
 
 on:  # yamllint disable-line rule:truthy
+  merge_group:
   pull_request:
     types:
       - synchronize
@@ -13,15 +14,15 @@ on:  # yamllint disable-line rule:truthy
       - opened
     branches:
       - master
-##########################################################################################
-##################################### SMALL CHECKS #######################################
-##########################################################################################
+
 jobs:
   RunConfig:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     outputs:
       data: ${{ steps.runconfig.outputs.CI_DATA }}
     steps:
+      - name: DebugInfo
+        uses: hmarr/debug-action@a701ed95a46e6f2fb0df25e1a558c16356fae35a
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
         with:
@@ -29,6 +30,7 @@ jobs:
           fetch-depth: 0 # to get version
           filter: tree:0
       - name: Labels check
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 run_check.py
@@ -44,11 +46,9 @@ jobs:
       - name: PrepareRunConfig
         id: runconfig
         run: |
-            echo "::group::configure CI run"
             python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json
-            echo "::endgroup::"
 
-            echo "::group::CI run configure results"
+            echo "::group::CI configuration"
             python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
             echo "::endgroup::"
 
@@ -58,24 +58,18 @@ jobs:
               echo 'EOF'
             } >> "$GITHUB_OUTPUT"
       - name: Re-create GH statuses for skipped jobs if any
+        if: ${{ github.event_name != 'merge_group' }}
         run: |
             python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ runner.temp }}/ci_run_data.json --update-gh-statuses
-      - name: Style check early
-        # hack to run style check before the docker build job if possible (style-check image not changed)
-        if: contains(fromJson(steps.runconfig.outputs.CI_DATA).jobs_data.jobs_to_do, 'Style check early')
-        run: |
-          DOCKER_TAG=$(echo '${{ toJson(fromJson(steps.runconfig.outputs.CI_DATA).docker_data.images) }}' | tr -d '\n')
-          export DOCKER_TAG=$DOCKER_TAG
-          python3 ./tests/ci/style_check.py --no-push
   BuildDockers:
     needs: [RunConfig]
-    if: ${{ !failure() && !cancelled() }}
+    if: ${{ !failure() && !cancelled() && toJson(fromJson(needs.RunConfig.outputs.data).docker_data.missing_multi) != '[]' }}
     uses: ./.github/workflows/reusable_docker.yml
     with:
       data: ${{ needs.RunConfig.outputs.data }}
   StyleCheck:
     needs: [RunConfig, BuildDockers]
-    if: ${{ !failure() && !cancelled() }}
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Style check')}}
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: Style check
@@ -88,897 +82,109 @@ jobs:
         ROBOT_CLICKHOUSE_SSH_KEY<<RCSK
         ${{secrets.ROBOT_CLICKHOUSE_SSH_KEY}}
         RCSK
-  DocsCheck:
-    needs: [RunConfig, StyleCheck]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Docs check
-      runner_type: func-tester-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 docs_check.py
   FastTest:
     needs: [RunConfig, StyleCheck]
-    if: ${{ !failure() && !cancelled() }}
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'Fast test') }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Fast tests
+      test_name: Fast test
       runner_type: builder
       data: ${{ needs.RunConfig.outputs.data }}
       run_command: |
           python3 fast_test_check.py
-  CompatibilityCheckX86:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Compatibility check (amd64)
-      runner_type: style-checker
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
-  CompatibilityCheckAarch64:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Compatibility check (aarch64)
-      runner_type: style-checker
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
-#########################################################################################
-#################################### ORDINARY BUILDS ####################################
-#########################################################################################
-  BuilderDebDebug:
+
+  ################################# Main statges #################################
+  # for main CI chain
+  #
+  Builds_1:
     needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_1') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
+    uses: ./.github/workflows/reusable_build_stage.yml
     with:
-      build_name: package_debug
+      stage: Builds_1
       data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebRelease:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
+  Tests_1:
+    needs: [RunConfig, Builds_1]
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_1') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
+    uses: ./.github/workflows/reusable_test_stage.yml
     with:
-      build_name: package_release
-      checkout_depth: 0
+      stage: Tests_1
       data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebAarch64:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
+  Builds_2:
+    needs: [RunConfig, Builds_1]
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Builds_2') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
+    uses: ./.github/workflows/reusable_build_stage.yml
     with:
-      build_name: package_aarch64
-      checkout_depth: 0
+      stage: Builds_2
       data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinRelease:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
+  Tests_2:
+    needs: [RunConfig, Builds_2]
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).stages_data.stages_to_do, 'Tests_2') }}
+    # using callable wf (reusable_stage.yml) allows to group all nested jobs under a tab
+    uses: ./.github/workflows/reusable_test_stage.yml
     with:
-      build_name: binary_release
+      stage: Tests_2
       data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebAsan:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: package_asan
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebUBsan:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: package_ubsan
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebTsan:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: package_tsan
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderDebMsan:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: package_msan
-      data: ${{ needs.RunConfig.outputs.data }}
-##########################################################################################
-##################################### SPECIAL BUILDS #####################################
-##########################################################################################
-  BuilderBinClangTidy:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_tidy
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinDarwin:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_darwin
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinAarch64:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinFreeBSD:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_freebsd
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinDarwinAarch64:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_darwin_aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinPPC64:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_ppc64le
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinAmd64Compat:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_amd64_compat
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinAmd64Musl:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_amd64_musl
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinAarch64V80Compat:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_aarch64_v80compat
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinRISCV64:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_riscv64
-      data: ${{ needs.RunConfig.outputs.data }}
-  BuilderBinS390X:
-    needs: [RunConfig, FastTest]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_build.yml
-    with:
-      build_name: binary_s390x
-      data: ${{ needs.RunConfig.outputs.data }}
-############################################################################################
-##################################### Docker images  #######################################
-############################################################################################
-  DockerServerImages:
-    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Docker server and keeper images
-      runner_type: style-checker
-      data: ${{ needs.RunConfig.outputs.data }}
-      checkout_depth: 0  # It MUST BE THE SAME for all dependencies and the job itself
-      run_command: |
-        cd "$GITHUB_WORKSPACE/tests/ci"
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-server --image-path docker/server --allow-build-reuse
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper --allow-build-reuse
-############################################################################################
-##################################### BUILD REPORTER #######################################
-############################################################################################
-  BuilderReport:
+
+  ################################# Reports #################################
+  # Reports should by run even if Builds_1/2 fail, so put them separatly in wf (not in Tests_1/2)
+  Builds_1_Report:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled() }}
+    if: ${{ !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse build check') }}
     needs:
       - RunConfig
-      - BuilderBinRelease
-      - BuilderDebAarch64
-      - BuilderDebAsan
-      - BuilderDebDebug
-      - BuilderDebMsan
-      - BuilderDebRelease
-      - BuilderDebTsan
-      - BuilderDebUBsan
+      - Builds_1
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
-  BuilderSpecialReport:
+  Builds_2_Report:
     # run report check for failed builds to indicate the CI error
-    if: ${{ !cancelled() }}
+    if: ${{ !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse special build check') }}
     needs:
       - RunConfig
-      - BuilderBinAarch64
-      - BuilderBinDarwin
-      - BuilderBinDarwinAarch64
-      - BuilderBinFreeBSD
-      - BuilderBinPPC64
-      - BuilderBinRISCV64
-      - BuilderBinS390X
-      - BuilderBinAmd64Compat
-      - BuilderBinAarch64V80Compat
-      - BuilderBinClangTidy
+      - Builds_2
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse special build check
-      runner_type: style-checker
-      data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
-############################################################################################
-#################################### INSTALL PACKAGES ######################################
-############################################################################################
-  InstallPackagesTestRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Install packages (amd64)
-      runner_type: style-checker
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 install_check.py "$CHECK_NAME"
-  InstallPackagesTestAarch64:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Install packages (arm64)
       runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 install_check.py "$CHECK_NAME"
-##############################################################################################
-########################### FUNCTIONAl STATELESS TESTS #######################################
-##############################################################################################
-  FunctionalStatelessTestRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (release)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseDatabaseReplicated:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (release, DatabaseReplicated)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseAnalyzer:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (release, analyzer)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestReleaseS3:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (release, s3 storage)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestS3Debug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (debug, s3 storage)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestS3Tsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (tsan, s3 storage)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestAarch64:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (aarch64)
-      runner_type: func-tester-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (asan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (tsan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestMsan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (msan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestUBsan:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (ubsan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests (debug)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatelessTestFlakyCheck:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateless tests flaky check (asan)
-      data: ${{ needs.RunConfig.outputs.data }}
-      runner_type: func-tester
-  TestsBugfixCheck:
-    needs: [RunConfig, StyleCheck]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: tests bugfix validate check
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        KILL_TIMEOUT=3600
-      run_command: |
-        TEMP_PATH="${TEMP_PATH}/integration" \
-          python3 integration_test_check.py "Integration $CHECK_NAME" \
-            --validate-bugfix --post-commit-status=file || echo 'ignore exit code'
 
-        TEMP_PATH="${TEMP_PATH}/stateless" \
-          python3 functional_test_check.py "Stateless $CHECK_NAME" "$KILL_TIMEOUT" \
-            --validate-bugfix --post-commit-status=file || echo 'ignore exit code'
-
-        python3 bugfix_validate_check.py "${TEMP_PATH}/stateless/functional_commit_status.tsv" "${TEMP_PATH}/integration/integration_commit_status.tsv"
-##############################################################################################
-############################ FUNCTIONAl STATEFUL TESTS #######################################
-##############################################################################################
-  FunctionalStatefulTestRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (release)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestAarch64:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (aarch64)
-      runner_type: func-tester-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (asan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (tsan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestMsan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (msan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestUBsan:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (ubsan)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (debug)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  # Parallel replicas
-  FunctionalStatefulTestDebugParallelReplicas:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (debug, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestUBsanParallelReplicas:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (ubsan, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestMsanParallelReplicas:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (msan, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestTsanParallelReplicas:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (tsan, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestAsanParallelReplicas:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (asan, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  FunctionalStatefulTestReleaseParallelReplicas:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stateful tests (release, ParallelReplicas)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-##############################################################################################
-########################### ClickBench #######################################################
-##############################################################################################
-  ClickBenchAMD64:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: ClickBench (amd64)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 clickbench.py "$CHECK_NAME"
-  ClickBenchAarch64:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: ClickBench (aarch64)
-      runner_type: func-tester-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 clickbench.py "$CHECK_NAME"
-##############################################################################################
-######################################### STRESS TESTS #######################################
-##############################################################################################
-  StressTestAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stress test (asan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  StressTestTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stress test (tsan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  StressTestMsan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stress test (msan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  StressTestUBsan:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stress test (ubsan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  StressTestDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Stress test (debug)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-##############################################################################################
-######################################### UPGRADE CHECK ######################################
-##############################################################################################
-  UpgradeCheckAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Upgrade check (asan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UpgradeCheckTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Upgrade check (tsan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UpgradeCheckMsan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Upgrade check (msan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UpgradeCheckDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Upgrade check (debug)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-##############################################################################################
-##################################### AST FUZZERS ############################################
-##############################################################################################
-  ASTFuzzerTestAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: AST fuzzer (asan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  ASTFuzzerTestTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: AST fuzzer (tsan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  ASTFuzzerTestUBSan:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: AST fuzzer (ubsan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  ASTFuzzerTestMSan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: AST fuzzer (msan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  ASTFuzzerTestDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: AST fuzzer (debug)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-#############################################################################################
-############################# INTEGRATION TESTS #############################################
-#############################################################################################
-  IntegrationTestsAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Integration tests (asan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  IntegrationTestsAnalyzerAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Integration tests (asan, analyzer)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  IntegrationTestsTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Integration tests (tsan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  IntegrationTestsRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Integration tests (release)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  IntegrationTestsFlakyCheck:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Integration tests flaky check (asan)
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-#############################################################################################
-#################################### UNIT TESTS #############################################
-#############################################################################################
-  UnitTestsAsan:
-    needs: [RunConfig, BuilderDebAsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Unit tests (asan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UnitTestsReleaseClang:
-    needs: [RunConfig, BuilderBinRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Unit tests (release)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UnitTestsTsan:
-    needs: [RunConfig, BuilderDebTsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Unit tests (tsan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UnitTestsMsan:
-    needs: [RunConfig, BuilderDebMsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Unit tests (msan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  UnitTestsUBsan:
-    needs: [RunConfig, BuilderDebUBsan]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Unit tests (ubsan)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-#############################################################################################
-#################################### PERFORMANCE TESTS ######################################
-#############################################################################################
-  PerformanceComparisonX86:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Performance Comparison
-      runner_type: stress-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  PerformanceComparisonAarch:
-    needs: [RunConfig, BuilderDebAarch64]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Performance Comparison Aarch64
-      runner_type: func-tester-aarch64
-      data: ${{ needs.RunConfig.outputs.data }}
-##############################################################################################
-###################################### SQLANCER FUZZERS ######################################
-##############################################################################################
-  SQLancerTestRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: SQLancer (release)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-  SQLancerTestDebug:
-    needs: [RunConfig, BuilderDebDebug]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: SQLancer (debug)
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
+  ################################# Stage Final #################################
+  #
   FinishCheck:
-    if: ${{ !failure() && !cancelled() }}
-    needs:
-      - BuilderReport
-      - BuilderSpecialReport
-      - DocsCheck
-      - FastTest
-      - FunctionalStatelessTestDebug
-      - FunctionalStatelessTestRelease
-      - FunctionalStatelessTestReleaseDatabaseReplicated
-      - FunctionalStatelessTestReleaseAnalyzer
-      - FunctionalStatelessTestAarch64
-      - FunctionalStatelessTestAsan
-      - FunctionalStatelessTestTsan
-      - FunctionalStatelessTestMsan
-      - FunctionalStatelessTestUBsan
-      - FunctionalStatefulTestDebug
-      - FunctionalStatefulTestRelease
-      - FunctionalStatefulTestAarch64
-      - FunctionalStatefulTestAsan
-      - FunctionalStatefulTestTsan
-      - FunctionalStatefulTestMsan
-      - FunctionalStatefulTestUBsan
-      - FunctionalStatelessTestReleaseS3
-      - FunctionalStatelessTestS3Debug
-      - FunctionalStatelessTestS3Tsan
-      - FunctionalStatefulTestReleaseParallelReplicas
-      - FunctionalStatefulTestAsanParallelReplicas
-      - FunctionalStatefulTestTsanParallelReplicas
-      - FunctionalStatefulTestMsanParallelReplicas
-      - FunctionalStatefulTestUBsanParallelReplicas
-      - FunctionalStatefulTestDebugParallelReplicas
-      - StressTestDebug
-      - StressTestAsan
-      - StressTestTsan
-      - StressTestMsan
-      - StressTestUBsan
-      - UpgradeCheckAsan
-      - UpgradeCheckTsan
-      - UpgradeCheckMsan
-      - UpgradeCheckDebug
-      - ASTFuzzerTestDebug
-      - ASTFuzzerTestAsan
-      - ASTFuzzerTestTsan
-      - ASTFuzzerTestMSan
-      - ASTFuzzerTestUBSan
-      - IntegrationTestsAsan
-      - IntegrationTestsAnalyzerAsan
-      - IntegrationTestsTsan
-      - IntegrationTestsRelease
-      - IntegrationTestsFlakyCheck
-      - PerformanceComparisonX86
-      - PerformanceComparisonAarch
-      - UnitTestsAsan
-      - UnitTestsTsan
-      - UnitTestsMsan
-      - UnitTestsUBsan
-      - UnitTestsReleaseClang
-      - CompatibilityCheckX86
-      - CompatibilityCheckAarch64
-      - SQLancerTestRelease
-      - SQLancerTestDebug
+    if: ${{ !failure() && !cancelled() && github.event_name != 'merge_group' }}
+    needs: [Tests_1, Tests_2]
     runs-on: [self-hosted, style-checker]
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
       - name: Finish label
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 finish_check.py
           python3 merge_pr.py --check-approved
-##############################################################################################
-############################ SQLLOGIC TEST ###################################################
-##############################################################################################
-  SQLLogicTestRelease:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: Sqllogic test (release)
-      runner_type: func-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-##############################################################################################
-##################################### SQL TEST ###############################################
-##############################################################################################
-  SQLTest:
-    needs: [RunConfig, BuilderDebRelease]
-    if: ${{ !failure() && !cancelled() }}
-    uses: ./.github/workflows/reusable_test.yml
-    with:
-      test_name: SQLTest
-      runner_type: fuzzer-unit-tester
-      data: ${{ needs.RunConfig.outputs.data }}
-#############################################################################################
-###################################### NOT IN FINISH ########################################
+
+
 #############################################################################################
 ###################################### JEPSEN TESTS #########################################
 #############################################################################################
+  # This is special test NOT INCLUDED in FinishCheck
+  # When it's skipped, all dependent tasks will be skipped too.
+  # DO NOT add it there
   Jepsen:
-    # This is special test NOT INCLUDED in FinishCheck
-    # When it's skipped, all dependent tasks will be skipped too.
-    # DO NOT add it there
-    if: ${{ !failure() && !cancelled() && contains(github.event.pull_request.labels.*.name, 'jepsen-test') }}
-    needs: [RunConfig, BuilderBinRelease]
-    uses: ./.github/workflows/jepsen.yml
-#############################################################################################
-####################################### libFuzzer ###########################################
-#############################################################################################
-  libFuzzer:
-    if: ${{ !failure() && !cancelled() && contains(github.event.pull_request.labels.*.name, 'libFuzzer') }}
-    needs: [RunConfig, StyleCheck]
-    uses: ./.github/workflows/libfuzzer.yml
+    # we need concurrency as the job uses dedicated instances in the cloud
+    concurrency:
+      group: jepsen
+    if: ${{ !failure() && !cancelled() && contains(fromJson(needs.RunConfig.outputs.data).jobs_data.jobs_to_do, 'ClickHouse Keeper Jepsen') }}
+    # jepsen needs binary_release build which is in Builds_2
+    needs: [RunConfig, Builds_2]
+    uses: ./.github/workflows/reusable_test.yml
     with:
+      test_name: ClickHouse Keeper Jepsen
+      runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 051a3ea1eac..3bd6dfae6ca 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -54,10 +54,13 @@ jobs:
     - name: Check docker clickhouse/clickhouse-server building
       run: |
         cd "$GITHUB_WORKSPACE/tests/ci"
-        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
+        export CHECK_NAME="Docker server image"
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" --check-name "$CHECK_NAME" --push
+    - name: Check docker clickhouse/clickhouse-keeper building
+      run: |
+        cd "$GITHUB_WORKSPACE/tests/ci"
+        export CHECK_NAME="Docker keeper image"
+        python3 docker_server.py --release-type auto --version "$GITHUB_TAG" --check-name "$CHECK_NAME" --push
     - name: Cleanup
       if: always()
       run: |
diff --git a/.github/workflows/release_branches.yml b/.github/workflows/release_branches.yml
index 69229ef75df..4d45c8d8d4b 100644
--- a/.github/workflows/release_branches.yml
+++ b/.github/workflows/release_branches.yml
@@ -14,7 +14,7 @@ on: # yamllint disable-line rule:truthy
 
 jobs:
   RunConfig:
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     outputs:
       data: ${{ steps.runconfig.outputs.CI_DATA }}
     steps:
@@ -41,7 +41,7 @@ jobs:
         id: runconfig
         run: |
             echo "::group::configure CI run"
-            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --rebuild-all-binaries --outfile ${{ runner.temp }}/ci_run_data.json
+            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --configure --outfile ${{ runner.temp }}/ci_run_data.json
             echo "::endgroup::"
             echo "::group::CI run configure results"
             python3 -m json.tool ${{ runner.temp }}/ci_run_data.json
@@ -68,8 +68,6 @@ jobs:
       test_name: Compatibility check (amd64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (amd64)" --check-glibc --check-distributions
   CompatibilityCheckAarch64:
     needs: [RunConfig, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
@@ -78,8 +76,6 @@ jobs:
       test_name: Compatibility check (aarch64)
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      run_command: |
-        python3 compatibility_check.py --check-name "Compatibility check (aarch64)" --check-glibc
 #########################################################################################
 #################################### ORDINARY BUILDS ####################################
 #########################################################################################
@@ -91,6 +87,8 @@ jobs:
       build_name: package_release
       checkout_depth: 0
       data: ${{ needs.RunConfig.outputs.data }}
+      # always rebuild on release branches to be able to publish from any commit
+      force: true
   BuilderDebAarch64:
     needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() }}
@@ -99,6 +97,8 @@ jobs:
       build_name: package_aarch64
       checkout_depth: 0
       data: ${{ needs.RunConfig.outputs.data }}
+      # always rebuild on release branches to be able to publish from any commit
+      force: true
   BuilderDebAsan:
     needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() }}
@@ -142,6 +142,8 @@ jobs:
       build_name: binary_darwin
       checkout_depth: 0
       data: ${{ needs.RunConfig.outputs.data }}
+      # always rebuild on release branches to be able to publish from any commit
+      force: true
   BuilderBinDarwinAarch64:
     needs: [RunConfig, BuildDockers]
     if: ${{ !failure() && !cancelled() }}
@@ -150,24 +152,27 @@ jobs:
       build_name: binary_darwin_aarch64
       checkout_depth: 0
       data: ${{ needs.RunConfig.outputs.data }}
+      # always rebuild on release branches to be able to publish from any commit
+      force: true
 ############################################################################################
 ##################################### Docker images  #######################################
 ############################################################################################
-  DockerServerImages:
+  DockerServerImage:
     needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Docker server and keeper images
+      test_name: Docker server image
+      runner_type: style-checker
+      data: ${{ needs.RunConfig.outputs.data }}
+  DockerKeeperImage:
+    needs: [RunConfig, BuilderDebRelease, BuilderDebAarch64]
+    if: ${{ !failure() && !cancelled() }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: Docker keeper image
       runner_type: style-checker
       data: ${{ needs.RunConfig.outputs.data }}
-      checkout_depth: 0
-      run_command: |
-        cd "$GITHUB_WORKSPACE/tests/ci"
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-server --image-path docker/server --allow-build-reuse
-        python3 docker_server.py --release-type head --no-push \
-          --image-repo clickhouse/clickhouse-keeper --image-path docker/keeper --allow-build-reuse
 ############################################################################################
 ##################################### BUILD REPORTER #######################################
 ############################################################################################
@@ -186,37 +191,20 @@ jobs:
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
   BuilderSpecialReport:
     # run report check for failed builds to indicate the CI error
     if: ${{ !cancelled() }}
     needs:
       - RunConfig
-      - BuilderDebRelease
-      - BuilderDebAarch64
-      - BuilderDebAsan
-      - BuilderDebTsan
-      - BuilderDebUBsan
-      - BuilderDebMsan
-      - BuilderDebDebug
+      - BuilderBinDarwin
+      - BuilderBinDarwinAarch64
     uses: ./.github/workflows/reusable_test.yml
     with:
       test_name: ClickHouse special build check
-      runner_type: style-checker
+      runner_type: style-checker-aarch64
       data: ${{ needs.RunConfig.outputs.data }}
-      additional_envs: |
-        NEEDS_DATA<<NDENV
-        ${{ toJSON(needs) }}
-        NDENV
-      run_command: |
-        python3 build_report_check.py "$CHECK_NAME"
   MarkReleaseReady:
     if: ${{ !failure() && !cancelled() }}
     needs:
@@ -224,13 +212,27 @@ jobs:
       - BuilderBinDarwinAarch64
       - BuilderDebRelease
       - BuilderDebAarch64
-    runs-on: [self-hosted, style-checker]
+    runs-on: [self-hosted, style-checker-aarch64]
     steps:
+      - name: Debug
+        run: |
+          echo need with different filters
+          cat << 'EOF'
+          ${{ toJSON(needs) }}
+          ${{ toJSON(needs.*.result) }}
+          no failures ${{ !contains(needs.*.result, 'failure') }}
+          no skips ${{ !contains(needs.*.result, 'skipped') }}
+          no both ${{ !(contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
+          EOF
+      - name: Not ready
+        # fail the job to be able restart it
+        if: ${{ contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure') }}
+        run: exit 1
       - name: Check out repository code
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
         uses: ClickHouse/checkout@v1
-        with:
-          clear-repository: true
       - name: Mark Commit Release Ready
+        if: ${{ ! (contains(needs.*.result, 'skipped') || contains(needs.*.result, 'failure')) }}
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
           python3 mark_release_ready.py
@@ -434,7 +436,7 @@ jobs:
     if: ${{ !failure() && !cancelled() }}
     uses: ./.github/workflows/reusable_test.yml
     with:
-      test_name: Integration tests (asan, analyzer)
+      test_name: Integration tests (asan, old analyzer)
       runner_type: stress-tester
       data: ${{ needs.RunConfig.outputs.data }}
   IntegrationTestsTsan:
@@ -456,7 +458,8 @@ jobs:
   FinishCheck:
     if: ${{ !failure() && !cancelled() }}
     needs:
-      - DockerServerImages
+      - DockerServerImage
+      - DockerKeeperImage
       - BuilderReport
       - BuilderSpecialReport
       - MarkReleaseReady
diff --git a/.github/workflows/reusable_build.yml b/.github/workflows/reusable_build.yml
index e6aa04a3569..80d78d93e1b 100644
--- a/.github/workflows/reusable_build.yml
+++ b/.github/workflows/reusable_build.yml
@@ -26,6 +26,10 @@ name: Build ClickHouse
         description: json ci data
         type: string
         required: true
+      force:
+        description: disallow job skipping
+        type: boolean
+        default: false
       additional_envs:
         description: additional ENV variables to setup the job
         type: string
@@ -33,7 +37,7 @@ name: Build ClickHouse
 jobs:
   Build:
     name: Build-${{inputs.build_name}}
-    if: contains(fromJson(inputs.data).jobs_data.jobs_to_do, inputs.build_name)
+    if: ${{ contains(fromJson(inputs.data).jobs_data.jobs_to_do, inputs.build_name) || inputs.force }}
     env:
       GITHUB_JOB_OVERRIDDEN: Build-${{inputs.build_name}}
     runs-on: [self-hosted, '${{inputs.runner_type}}']
@@ -58,6 +62,7 @@ jobs:
       - name: Apply sparse checkout for contrib # in order to check that it doesn't break build
         # This step is done in GITHUB_WORKSPACE,
         # because it's broken in REPO_COPY for some reason
+        # See also update-submodules.sh
         if: ${{ env.BUILD_SPARSE_CHECKOUT == 'true' }}
         run: |
           rm -rf "$GITHUB_WORKSPACE/contrib" && echo 'removed'
@@ -72,15 +77,20 @@ jobs:
       - name: Pre
         run: |
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --pre --job-name '${{inputs.build_name}}'
-      - name: Build
+      - name: Run
         run: |
-          python3 "$GITHUB_WORKSPACE/tests/ci/build_check.py" "$BUILD_NAME"
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" \
+            --infile ${{ toJson(inputs.data) }} \
+            --job-name "$BUILD_NAME" \
+            --run \
+            ${{ inputs.force && '--force' || '' }}
       - name: Post
         # it still be build report to upload for failed build job
-        if: always()
+        if: ${{ !cancelled() }}
         run: |
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --post --job-name '${{inputs.build_name}}'
       - name: Mark as done
+        if: ${{ !cancelled() }}
         run: |
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --mark-success --job-name '${{inputs.build_name}}'
       - name: Clean
diff --git a/.github/workflows/reusable_build_stage.yml b/.github/workflows/reusable_build_stage.yml
new file mode 100644
index 00000000000..4463645880b
--- /dev/null
+++ b/.github/workflows/reusable_build_stage.yml
@@ -0,0 +1,32 @@
+### FIXME: merge reusable_test.yml and reusable_build.yml as they are almost identical
+#          and then merge reusable_build_stage.yml and reusable_test_stage.yml
+
+name: BuildStageWF
+'on':
+  workflow_call:
+    inputs:
+      stage:
+        description: stage name
+        type: string
+        required: true
+      data:
+        description: ci data
+        type: string
+        required: true
+
+jobs:
+  s:
+    if: ${{ !failure() && !cancelled() }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job_name_and_runner_type: ${{ fromJson(inputs.data).stages_data[inputs.stage] }}
+    uses: ./.github/workflows/reusable_build.yml
+    with:
+      build_name: ${{ matrix.job_name_and_runner_type.job_name }}
+      runner_type: ${{ matrix.job_name_and_runner_type.runner_type }}
+      # don't forget to pass force flag (no ci cache/no reuse) - once it's needed
+      force: false
+      # for now let's do I deep checkout for builds
+      checkout_depth: 0
+      data: ${{ inputs.data }}
diff --git a/.github/workflows/reusable_docker.yml b/.github/workflows/reusable_docker.yml
index 08a5740e7e0..3fe1a8883c6 100644
--- a/.github/workflows/reusable_docker.yml
+++ b/.github/workflows/reusable_docker.yml
@@ -46,7 +46,7 @@ jobs:
     needs: [DockerBuildAmd64, DockerBuildAarch64]
     runs-on: [self-hosted, style-checker]
     if: |
-      !failure() && !cancelled() && toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]'
+      !failure() && !cancelled() && (toJson(fromJson(inputs.data).docker_data.missing_multi) != '[]' || inputs.set_latest)
     steps:
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
@@ -55,14 +55,12 @@ jobs:
       - name: Build images
         run: |
           cd "$GITHUB_WORKSPACE/tests/ci"
+          FLAG_LATEST=''
           if [ "${{ inputs.set_latest }}" == "true" ]; then
+            FLAG_LATEST='--set-latest'
             echo "latest tag will be set for resulting manifests"
-            python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64 \
-              --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
-              --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_multi) }}' \
-              --set-latest
-          else
-            python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64 \
-              --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
-              --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_multi) }}'
           fi
+          python3 docker_manifests_merge.py --suffix amd64 --suffix aarch64 \
+            --image-tags '${{ toJson(fromJson(inputs.data).docker_data.images) }}' \
+            --missing-images '${{ toJson(fromJson(inputs.data).docker_data.missing_multi) }}' \
+            $FLAG_LATEST
diff --git a/.github/workflows/reusable_simple_job.yml b/.github/workflows/reusable_simple_job.yml
index ea196a32664..7b7084420a4 100644
--- a/.github/workflows/reusable_simple_job.yml
+++ b/.github/workflows/reusable_simple_job.yml
@@ -34,12 +34,16 @@ name: Simple job
       working-directory:
         description: sets custom working directory
         type: string
-        default: ""
+        default: "$GITHUB_WORKSPACE/tests/ci"
       git_ref:
         description: commit to use, merge commit for pr or head
         required: false
         type: string
         default: ${{ github.event.after }} # no merge commit
+      report_required:
+        description: set to true if job report with the commit status required
+        type: boolean
+        default: false
     secrets:
       secret_envs:
         description: if given, it's passed to the environments
@@ -58,6 +62,8 @@ jobs:
     env:
       GITHUB_JOB_OVERRIDDEN: ${{inputs.test_name}}
     steps:
+      - name: DebugInfo
+        uses: hmarr/debug-action@a701ed95a46e6f2fb0df25e1a558c16356fae35a
       - name: Check out repository code
         uses: ClickHouse/checkout@v1
         with:
@@ -79,12 +85,12 @@ jobs:
           job_type: test
       - name: Run
         run: |
-          if [ -n '${{ inputs.working-directory }}' ]; then
-            cd "${{ inputs.working-directory }}"
-          else
-            cd "$GITHUB_WORKSPACE/tests/ci"
-          fi
+          cd "${{ inputs.working-directory }}"
           ${{ inputs.run_command }}
+      - name: Post
+        if: ${{ inputs.report_required }}
+        run: |
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --post --job-name '${{inputs.test_name}}'
       - name: Clean
         if: always()
         uses: ./.github/actions/clean
diff --git a/.github/workflows/reusable_test.yml b/.github/workflows/reusable_test.yml
index 09177ad887a..e30ef863a86 100644
--- a/.github/workflows/reusable_test.yml
+++ b/.github/workflows/reusable_test.yml
@@ -38,7 +38,7 @@ name: Testing workflow
       working-directory:
         description: sets custom working directory
         type: string
-        default: ""
+        default: "$GITHUB_WORKSPACE/tests/ci"
     secrets:
       secret_envs:
         description: if given, it's passed to the environments
@@ -96,22 +96,18 @@ jobs:
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --pre --job-name '${{inputs.test_name}}'
       - name: Run
         run: |
-          if [ -n "${{ inputs.working-directory }}" ]; then
-            cd "${{ inputs.working-directory }}"
-          else
-            cd "$GITHUB_WORKSPACE/tests/ci"
-          fi
-          if [ -n "$(echo '${{ inputs.run_command }}' | tr -d '\n')" ]; then
-            echo "Running command from workflow input"
-            ${{ inputs.run_command }}
-          else
-            echo "Running command from job config"
-            python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --run --job-name '${{inputs.test_name}}'
-          fi
+          cd "${{ inputs.working-directory }}"
+          python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" \
+            --infile ${{ toJson(inputs.data) }} \
+            --job-name '${{inputs.test_name}}' \
+            --run \
+            --run-command '''${{inputs.run_command}}'''
       - name: Post run
+        if: ${{ !cancelled() }}
         run: |
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --post --job-name '${{inputs.test_name}}'
       - name: Mark as done
+        if: ${{ !cancelled() }}
         run: |
           python3 "$GITHUB_WORKSPACE/tests/ci/ci.py" --infile ${{ toJson(inputs.data) }} --mark-success --job-name '${{inputs.test_name}}' --batch ${{matrix.batch}}
       - name: Clean
diff --git a/.github/workflows/reusable_test_stage.yml b/.github/workflows/reusable_test_stage.yml
new file mode 100644
index 00000000000..d7bd55fab43
--- /dev/null
+++ b/.github/workflows/reusable_test_stage.yml
@@ -0,0 +1,25 @@
+name: StageWF
+'on':
+  workflow_call:
+    inputs:
+      stage:
+        description: stage name
+        type: string
+        required: true
+      data:
+        description: ci data
+        type: string
+        required: true
+
+jobs:
+  s:
+    if: ${{ !failure() && !cancelled() }}
+    strategy:
+      fail-fast: false
+      matrix:
+        job_name_and_runner_type: ${{ fromJson(inputs.data).stages_data[inputs.stage] }}
+    uses: ./.github/workflows/reusable_test.yml
+    with:
+      test_name: ${{ matrix.job_name_and_runner_type.job_name }}
+      runner_type: ${{ matrix.job_name_and_runner_type.runner_type }}
+      data: ${{ inputs.data }}
diff --git a/.github/workflows/tags_stable.yml b/.github/workflows/tags_stable.yml
index 0a3945829ca..e4fc9f0b1d3 100644
--- a/.github/workflows/tags_stable.yml
+++ b/.github/workflows/tags_stable.yml
@@ -55,7 +55,7 @@ jobs:
         python3 ./utils/security-generator/generate_security.py > SECURITY.md
         git diff HEAD
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3
+      uses: peter-evans/create-pull-request@v6
       with:
         author: "robot-clickhouse <robot-clickhouse@users.noreply.github.com>"
         token: ${{ secrets.ROBOT_CLICKHOUSE_COMMIT_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 5341f23a94f..db3f77d7d1e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,8 +164,11 @@ tests/queries/0_stateless/*.generated-expect
 tests/queries/0_stateless/*.expect.history
 tests/integration/**/_gen
 
+# pytest --pdb history
+.pdb_history
+
 # rust
-/rust/**/target
+/rust/**/target*
 # It is autogenerated from *.in
 /rust/**/.cargo/config.toml
 /rust/**/vendor
diff --git a/.gitmessage b/.gitmessage
index f4a25a837bc..797446edd49 100644
--- a/.gitmessage
+++ b/.gitmessage
@@ -1,10 +1,29 @@
 
 
-## To avoid merge commit in CI run (add a leading space to apply):
-#no-merge-commit
+### CI modificators (add a leading space to apply) ###
 
-## Running specified job (add a leading space to apply):
+## To avoid a merge commit in CI:
+#no_merge_commit
+
+## To discard CI cache:
+#no_ci_cache
+
+## To not test (only style check):
+#do_not_test
+
+## To run specified set of tests in CI:
+#ci_set_<SET_NAME>
+#ci_set_reduced
+#ci_set_arm
+#ci_set_integration
+#ci_set_analyzer
+
+## To run specified job in CI:
 #job_<JOB NAME>
 #job_stateless_tests_release
 #job_package_debug
 #job_integration_tests_asan
+
+## To run only specified batches for multi-batch job(s)
+#batch_2
+#batch_1_2_3
diff --git a/.gitmodules b/.gitmodules
index 68016bf8c5b..a618104f364 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -99,7 +99,7 @@
 	url = https://github.com/awslabs/aws-c-event-stream
 [submodule "aws-c-common"]
 	path = contrib/aws-c-common
-	url = https://github.com/ClickHouse/aws-c-common
+	url = https://github.com/awslabs/aws-c-common.git
 [submodule "aws-checksums"]
 	path = contrib/aws-checksums
 	url = https://github.com/awslabs/aws-checksums
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b36142cc9f..dd88f3ee2c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,2164 +1,504 @@
 ### Table of Contents
-**[ClickHouse release v23.12, 2023-12-28](#2312)**<br/>
-**[ClickHouse release v23.11, 2023-12-06](#2311)**<br/>
-**[ClickHouse release v23.10, 2023-11-02](#2310)**<br/>
-**[ClickHouse release v23.9, 2023-09-28](#239)**<br/>
-**[ClickHouse release v23.8 LTS, 2023-08-31](#238)**<br/>
-**[ClickHouse release v23.7, 2023-07-27](#237)**<br/>
-**[ClickHouse release v23.6, 2023-06-30](#236)**<br/>
-**[ClickHouse release v23.5, 2023-06-08](#235)**<br/>
-**[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/>
+**[ClickHouse release v24.3 LTS, 2024-03-26](#243)**<br/>
+**[ClickHouse release v24.2, 2024-02-29](#242)**<br/>
+**[ClickHouse release v24.1, 2024-01-30](#241)**<br/>
+**[Changelog for 2023](https://clickhouse.com/docs/en/whats-new/changelog/2023/)**<br/>
 
-# 2023 Changelog
+# 2024 Changelog
 
-### <a id="2312"></a> ClickHouse release 23.12, 2023-12-28
-
-#### Backward Incompatible Change
-* Fix check for non-deterministic functions in TTL expressions. Previously, you could create a TTL expression with non-deterministic functions in some cases, which could lead to undefined behavior later. This fixes [#37250](https://github.com/ClickHouse/ClickHouse/issues/37250). Disallow TTL expressions that don't depend on any columns of a table by default. It can be allowed back by `SET allow_suspicious_ttl_expressions = 1` or `SET compatibility = '23.11'`. Closes [#37286](https://github.com/ClickHouse/ClickHouse/issues/37286). [#51858](https://github.com/ClickHouse/ClickHouse/pull/51858) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The MergeTree setting `clean_deleted_rows` is deprecated, it has no effect anymore. The `CLEANUP` keyword for the `OPTIMIZE` is not allowed by default (it can be unlocked with the `allow_experimental_replacing_merge_with_cleanup` setting). [#58267](https://github.com/ClickHouse/ClickHouse/pull/58267) ([Alexander Tokmakov](https://github.com/tavplubix)). This fixes [#57930](https://github.com/ClickHouse/ClickHouse/issues/57930). This closes [#54988](https://github.com/ClickHouse/ClickHouse/issues/54988). This closes [#54570](https://github.com/ClickHouse/ClickHouse/issues/54570). This closes [#50346](https://github.com/ClickHouse/ClickHouse/issues/50346). This closes [#47579](https://github.com/ClickHouse/ClickHouse/issues/47579). The feature has to be removed because it is not good. We have to remove it as quickly as possible, because there is no other option. [#57932](https://github.com/ClickHouse/ClickHouse/pull/57932) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### New Feature
-* Implement Refreshable Materialized Views, requested in [#33919](https://github.com/ClickHouse/ClickHouse/issues/33919). [#56946](https://github.com/ClickHouse/ClickHouse/pull/56946) ([Michael Kolupaev](https://github.com/al13n321), [Michael Guzov](https://github.com/koloshmet)).
-* Introduce `PASTE JOIN`, which allows users to join tables without `ON` clause simply by row numbers. Example: `SELECT * FROM (SELECT number AS a FROM numbers(2)) AS t1 PASTE JOIN (SELECT number AS a FROM numbers(2) ORDER BY a DESC) AS t2`. [#57995](https://github.com/ClickHouse/ClickHouse/pull/57995) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* The `ORDER BY` clause now supports specifying `ALL`, meaning that ClickHouse sorts by all columns in the `SELECT` clause. Example: `SELECT col1, col2 FROM tab WHERE [...] ORDER BY ALL`. [#57875](https://github.com/ClickHouse/ClickHouse/pull/57875) ([zhongyuankai](https://github.com/zhongyuankai)).
-* Added a new mutation command `ALTER TABLE <table> APPLY DELETED MASK`, which allows to enforce applying of mask written by lightweight delete and to remove rows marked as deleted from disk. [#57433](https://github.com/ClickHouse/ClickHouse/pull/57433) ([Anton Popov](https://github.com/CurtizJ)).
-* A handler `/binary` opens a visual viewer of symbols inside the ClickHouse binary. [#58211](https://github.com/ClickHouse/ClickHouse/pull/58211) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added a new SQL function `sqid` to generate Sqids (https://sqids.org/), example: `SELECT sqid(125, 126)`. [#57512](https://github.com/ClickHouse/ClickHouse/pull/57512) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add a new function `seriesPeriodDetectFFT` to detect series period using FFT. [#57574](https://github.com/ClickHouse/ClickHouse/pull/57574) ([Bhavna Jindal](https://github.com/bhavnajindal)).
-* Add an HTTP endpoint for checking if Keeper is ready to accept traffic. [#55876](https://github.com/ClickHouse/ClickHouse/pull/55876) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Add 'union' mode for schema inference. In this mode the resulting table schema is the union of all files schemas (so schema is inferred from each file). The mode of schema inference is controlled by a setting `schema_inference_mode` with two possible values - `default` and `union`. Closes [#55428](https://github.com/ClickHouse/ClickHouse/issues/55428). [#55892](https://github.com/ClickHouse/ClickHouse/pull/55892) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add new setting `input_format_csv_try_infer_numbers_from_strings` that allows to infer numbers from strings in CSV format. Closes [#56455](https://github.com/ClickHouse/ClickHouse/issues/56455). [#56859](https://github.com/ClickHouse/ClickHouse/pull/56859) ([Kruglov Pavel](https://github.com/Avogar)).
-* When the number of databases or tables exceeds a configurable threshold, show a warning to the user. [#57375](https://github.com/ClickHouse/ClickHouse/pull/57375) ([凌涛](https://github.com/lingtaolf)).
-* Dictionary with `HASHED_ARRAY` (and `COMPLEX_KEY_HASHED_ARRAY`) layout supports `SHARDS` similarly to `HASHED`. [#57544](https://github.com/ClickHouse/ClickHouse/pull/57544) ([vdimir](https://github.com/vdimir)).
-* Add asynchronous metrics for total primary key bytes and total allocated primary key bytes in memory. [#57551](https://github.com/ClickHouse/ClickHouse/pull/57551) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `SHA512_256` function. [#57645](https://github.com/ClickHouse/ClickHouse/pull/57645) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `FORMAT_BYTES` as an alias for `formatReadableSize`. [#57592](https://github.com/ClickHouse/ClickHouse/pull/57592) ([Bharat Nallan](https://github.com/bharatnc)).
-* Allow passing optional session token to the `s3` table function. [#57850](https://github.com/ClickHouse/ClickHouse/pull/57850) ([Shani Elharrar](https://github.com/shanielh)).
-* Introduce a new setting `http_make_head_request`. If it is turned off, the URL table engine will not do a HEAD request to determine the file size. This is needed to support inefficient, misconfigured, or not capable HTTP servers. [#54602](https://github.com/ClickHouse/ClickHouse/pull/54602) ([Fionera](https://github.com/fionera)).
-* It is now possible to refer to ALIAS column in index (non-primary-key) definitions (issue [#55650](https://github.com/ClickHouse/ClickHouse/issues/55650)). Example: `CREATE TABLE tab(col UInt32, col_alias ALIAS col + 1, INDEX idx (col_alias) TYPE minmax) ENGINE = MergeTree ORDER BY col;`. [#57546](https://github.com/ClickHouse/ClickHouse/pull/57546) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added a new setting `readonly` which can be used to specify an S3 disk is read only. It can be useful to create a table on a disk of `s3_plain` type, while having read only access to the underlying S3 bucket. [#57977](https://github.com/ClickHouse/ClickHouse/pull/57977) ([Pengyuan Bian](https://github.com/bianpengyuan)).
-* The primary key analysis in MergeTree tables will now be applied to predicates that include the virtual column `_part_offset` (optionally with `_part`). This feature can serve as a special kind of a secondary index. [#58224](https://github.com/ClickHouse/ClickHouse/pull/58224) ([Amos Bird](https://github.com/amosbird)).
-
-#### Performance Improvement
-* Extract non-intersecting parts ranges from MergeTree table during FINAL processing. That way we can avoid additional FINAL logic for this non-intersecting parts ranges. In case when amount of duplicate values with same primary key is low, performance will be almost the same as without FINAL. Improve reading performance for MergeTree FINAL when `do_not_merge_across_partitions_select_final` setting is set. [#58120](https://github.com/ClickHouse/ClickHouse/pull/58120) ([Maksim Kita](https://github.com/kitaisreal)).
-* Made copy between s3 disks using a s3-server-side copy instead of copying through the buffer. Improves `BACKUP/RESTORE` operations and `clickhouse-disks copy` command. [#56744](https://github.com/ClickHouse/ClickHouse/pull/56744) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* Hash JOIN respects setting `max_joined_block_size_rows` and do not produce large blocks for `ALL JOIN`. [#56996](https://github.com/ClickHouse/ClickHouse/pull/56996) ([vdimir](https://github.com/vdimir)).
-* Release memory for aggregation earlier. This may avoid unnecessary external aggregation. [#57691](https://github.com/ClickHouse/ClickHouse/pull/57691) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Improve performance of string serialization. [#57717](https://github.com/ClickHouse/ClickHouse/pull/57717) ([Maksim Kita](https://github.com/kitaisreal)).
-* Support trivial count optimization for `Merge`-engine tables. [#57867](https://github.com/ClickHouse/ClickHouse/pull/57867) ([skyoct](https://github.com/skyoct)).
-* Optimized aggregation in some cases. [#57872](https://github.com/ClickHouse/ClickHouse/pull/57872) ([Anton Popov](https://github.com/CurtizJ)).
-* The `hasAny` function can now take advantage of the full-text skipping indices. [#57878](https://github.com/ClickHouse/ClickHouse/pull/57878) ([Jpnock](https://github.com/Jpnock)).
-* Function `if(cond, then, else)` (and its alias `cond ? then : else`) were optimized to use branch-free evaluation. [#57885](https://github.com/ClickHouse/ClickHouse/pull/57885) ([zhanglistar](https://github.com/zhanglistar)).
-* MergeTree automatically derive `do_not_merge_across_partitions_select_final` setting if partition key expression contains only columns from primary key expression. [#58218](https://github.com/ClickHouse/ClickHouse/pull/58218) ([Maksim Kita](https://github.com/kitaisreal)).
-* Speedup `MIN` and `MAX` for native types. [#58231](https://github.com/ClickHouse/ClickHouse/pull/58231) ([Raúl Marín](https://github.com/Algunenano)).
-* Implement `SLRU` cache policy for filesystem cache. [#57076](https://github.com/ClickHouse/ClickHouse/pull/57076) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* The limit for the number of connections per endpoint for background fetches was raised from `15` to the value of `background_fetches_pool_size` setting. - MergeTree-level setting `replicated_max_parallel_fetches_for_host` became obsolete - MergeTree-level settings `replicated_fetches_http_connection_timeout`, `replicated_fetches_http_send_timeout` and `replicated_fetches_http_receive_timeout` are moved to the Server-level. - Setting `keep_alive_timeout` is added to the list of Server-level settings. [#57523](https://github.com/ClickHouse/ClickHouse/pull/57523) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Make querying `system.filesystem_cache` not memory intensive. [#57687](https://github.com/ClickHouse/ClickHouse/pull/57687) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Reduce memory usage on strings deserialization. [#57787](https://github.com/ClickHouse/ClickHouse/pull/57787) ([Maksim Kita](https://github.com/kitaisreal)).
-* More efficient constructor for Enum - it makes sense when Enum has a boatload of values. [#57887](https://github.com/ClickHouse/ClickHouse/pull/57887) ([Duc Canh Le](https://github.com/canhld94)).
-* An improvement for reading from the filesystem cache: always use `pread` method. [#57970](https://github.com/ClickHouse/ClickHouse/pull/57970) ([Nikita Taranov](https://github.com/nickitat)).
-* Add optimization for AND notEquals chain in logical expression optimizer. This optimization is only available with the experimental Analyzer enabled. [#58214](https://github.com/ClickHouse/ClickHouse/pull/58214) ([Kevin Mingtarja](https://github.com/kevinmingtarja)).
-
-#### Improvement
-* Support for soft memory limit in Keeper. It will refuse requests if the memory usage is close to the maximum. [#57271](https://github.com/ClickHouse/ClickHouse/pull/57271) ([Han Fei](https://github.com/hanfei1991)). [#57699](https://github.com/ClickHouse/ClickHouse/pull/57699) ([Han Fei](https://github.com/hanfei1991)).
-* Make inserts into distributed tables handle updated cluster configuration properly. When the list of cluster nodes is dynamically updated, the Directory Monitor of the distribution table will update it. [#42826](https://github.com/ClickHouse/ClickHouse/pull/42826) ([zhongyuankai](https://github.com/zhongyuankai)).
-* Do not allow creating a replicated table with inconsistent merge parameters. [#56833](https://github.com/ClickHouse/ClickHouse/pull/56833) ([Duc Canh Le](https://github.com/canhld94)).
-* Show uncompressed size in `system.tables`. [#56618](https://github.com/ClickHouse/ClickHouse/issues/56618). [#57186](https://github.com/ClickHouse/ClickHouse/pull/57186) ([Chen Lixiang](https://github.com/chenlx0)).
-* Add `skip_unavailable_shards` as a setting for `Distributed` tables that is similar to the corresponding query-level setting. Closes [#43666](https://github.com/ClickHouse/ClickHouse/issues/43666). [#57218](https://github.com/ClickHouse/ClickHouse/pull/57218) ([Gagan Goel](https://github.com/tntnatbry)).
-* The function `substring` (aliases: `substr`, `mid`) can now be used with `Enum` types. Previously, the first function argument had to be a value of type `String` or `FixedString`. This improves compatibility with 3rd party tools such as Tableau via MySQL interface. [#57277](https://github.com/ClickHouse/ClickHouse/pull/57277) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Function `format` now supports arbitrary argument types (instead of only `String` and `FixedString` arguments). This is important to calculate `SELECT format('The {0} to all questions is {1}', 'answer', 42)`. [#57549](https://github.com/ClickHouse/ClickHouse/pull/57549) ([Robert Schulze](https://github.com/rschu1ze)).
-* Allows to use the `date_trunc` function with a case-insensitive first argument. Both cases are now supported: `SELECT date_trunc('day', now())` and `SELECT date_trunc('DAY', now())`. [#57624](https://github.com/ClickHouse/ClickHouse/pull/57624) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Better hints when a table doesn't exist. [#57342](https://github.com/ClickHouse/ClickHouse/pull/57342) ([Bharat Nallan](https://github.com/bharatnc)).
-* Allow to overwrite `max_partition_size_to_drop` and `max_table_size_to_drop` server settings in query time. [#57452](https://github.com/ClickHouse/ClickHouse/pull/57452) ([Jordi Villar](https://github.com/jrdi)).
-* Slightly better inference of unnamed tupes in JSON formats. [#57751](https://github.com/ClickHouse/ClickHouse/pull/57751) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add support for read-only flag when connecting to Keeper (fixes [#53749](https://github.com/ClickHouse/ClickHouse/issues/53749)). [#57479](https://github.com/ClickHouse/ClickHouse/pull/57479) ([Mikhail Koviazin](https://github.com/mkmkme)).
-* Fix possible distributed sends stuck due to "No such file or directory" (during recovering a batch from disk). Fix possible issues with `error_count` from `system.distribution_queue` (in case of `distributed_directory_monitor_max_sleep_time_ms` >5min). Introduce profile event to track async INSERT failures - `DistributedAsyncInsertionFailures`. [#57480](https://github.com/ClickHouse/ClickHouse/pull/57480) ([Azat Khuzhin](https://github.com/azat)).
-* Support PostgreSQL generated columns and default column values in `MaterializedPostgreSQL` (experimental feature). Closes [#40449](https://github.com/ClickHouse/ClickHouse/issues/40449). [#57568](https://github.com/ClickHouse/ClickHouse/pull/57568) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Allow to apply some filesystem cache config settings changes without server restart. [#57578](https://github.com/ClickHouse/ClickHouse/pull/57578) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Properly handling PostgreSQL table structure with empty array. [#57618](https://github.com/ClickHouse/ClickHouse/pull/57618) ([Mike Kot](https://github.com/myrrc)).
-* Expose the total number of errors occurred since last server restart as a `ClickHouseErrorMetric_ALL` metric. [#57627](https://github.com/ClickHouse/ClickHouse/pull/57627) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Allow nodes in the configuration file with `from_env`/`from_zk` reference and non empty element with replace=1. [#57628](https://github.com/ClickHouse/ClickHouse/pull/57628) ([Azat Khuzhin](https://github.com/azat)).
-* A table function `fuzzJSON` which allows generating a lot of malformed JSON for fuzzing. [#57646](https://github.com/ClickHouse/ClickHouse/pull/57646) ([Julia Kartseva](https://github.com/jkartseva)).
-* Allow IPv6 to UInt128 conversion and binary arithmetic. [#57707](https://github.com/ClickHouse/ClickHouse/pull/57707) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Add a setting for `async inserts deduplication cache` - how long we wait for cache update. Deprecate setting `async_block_ids_cache_min_update_interval_ms`. Now cache is updated only in case of conflicts. [#57743](https://github.com/ClickHouse/ClickHouse/pull/57743) ([alesapin](https://github.com/alesapin)).
-* `sleep()` function now can be cancelled with `KILL QUERY`. [#57746](https://github.com/ClickHouse/ClickHouse/pull/57746) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Forbid `CREATE TABLE ... AS SELECT` queries for `Replicated` table engines in the experimental `Replicated` database because they are not supported. Reference [#35408](https://github.com/ClickHouse/ClickHouse/issues/35408). [#57796](https://github.com/ClickHouse/ClickHouse/pull/57796) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix and improve transforming queries for external databases, to recursively obtain all compatible predicates. [#57888](https://github.com/ClickHouse/ClickHouse/pull/57888) ([flynn](https://github.com/ucasfl)).
-* Support dynamic reloading of the filesystem cache size. Closes [#57866](https://github.com/ClickHouse/ClickHouse/issues/57866). [#57897](https://github.com/ClickHouse/ClickHouse/pull/57897) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Correctly support `system.stack_trace` for threads with blocked SIGRTMIN (these threads can exist in low-quality external libraries such as Apache rdkafka). [#57907](https://github.com/ClickHouse/ClickHouse/pull/57907) ([Azat Khuzhin](https://github.com/azat)). Aand also send signal to the threads only if it is not blocked to avoid waiting `storage_system_stack_trace_pipe_read_timeout_ms` when it does not make any sense. [#58136](https://github.com/ClickHouse/ClickHouse/pull/58136) ([Azat Khuzhin](https://github.com/azat)).
-* Tolerate keeper failures in the quorum inserts' check. [#57986](https://github.com/ClickHouse/ClickHouse/pull/57986) ([Raúl Marín](https://github.com/Algunenano)).
-* Add max/peak RSS (`MemoryResidentMax`) into system.asynchronous_metrics. [#58095](https://github.com/ClickHouse/ClickHouse/pull/58095) ([Azat Khuzhin](https://github.com/azat)).
-* This PR allows users to use s3-style links (`https://` and `s3://`) without mentioning region if it's not default. Also find the correct region if the user mentioned the wrong one. [#58148](https://github.com/ClickHouse/ClickHouse/pull/58148) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* `clickhouse-format --obfuscate` will know about Settings, MergeTreeSettings, and time zones and keep their names unchanged. [#58179](https://github.com/ClickHouse/ClickHouse/pull/58179) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added explicit `finalize()` function in `ZipArchiveWriter`. Simplify too complicated code in `ZipArchiveWriter`. This fixes [#58074](https://github.com/ClickHouse/ClickHouse/issues/58074). [#58202](https://github.com/ClickHouse/ClickHouse/pull/58202) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Make caches with the same path use the same cache objects. This behaviour existed before, but was broken in 23.4. If such caches with the same path have different set of cache settings, an exception will be thrown, that this is not allowed. [#58264](https://github.com/ClickHouse/ClickHouse/pull/58264) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Parallel replicas (experimental feature): friendly settings [#57542](https://github.com/ClickHouse/ClickHouse/pull/57542) ([Igor Nikonov](https://github.com/devcrafter)).
-* Parallel replicas (experimental feature): announcement response handling improvement [#57749](https://github.com/ClickHouse/ClickHouse/pull/57749) ([Igor Nikonov](https://github.com/devcrafter)).
-* Parallel replicas (experimental feature): give more respect to `min_number_of_marks` in `ParallelReplicasReadingCoordinator` [#57763](https://github.com/ClickHouse/ClickHouse/pull/57763) ([Nikita Taranov](https://github.com/nickitat)).
-* Parallel replicas (experimental feature): disable parallel replicas with IN (subquery) [#58133](https://github.com/ClickHouse/ClickHouse/pull/58133) ([Igor Nikonov](https://github.com/devcrafter)).
-* Parallel replicas (experimental feature): add profile event 'ParallelReplicasUsedCount' [#58173](https://github.com/ClickHouse/ClickHouse/pull/58173) ([Igor Nikonov](https://github.com/devcrafter)).
-* Non POST requests such as HEAD will be readonly similar to GET. [#58060](https://github.com/ClickHouse/ClickHouse/pull/58060) ([San](https://github.com/santrancisco)).
-* Add `bytes_uncompressed` column to `system.part_log` [#58167](https://github.com/ClickHouse/ClickHouse/pull/58167) ([Jordi Villar](https://github.com/jrdi)).
-* Add base backup name to `system.backups` and `system.backup_log` tables [#58178](https://github.com/ClickHouse/ClickHouse/pull/58178) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
-* Add support for specifying query parameters in the command line in clickhouse-local [#58210](https://github.com/ClickHouse/ClickHouse/pull/58210) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
-
-#### Build/Testing/Packaging Improvement
-* Randomize more settings [#39663](https://github.com/ClickHouse/ClickHouse/pull/39663) ([Anton Popov](https://github.com/CurtizJ)).
-* Randomize disabled optimizations in CI [#57315](https://github.com/ClickHouse/ClickHouse/pull/57315) ([Raúl Marín](https://github.com/Algunenano)).
-* Allow usage of Azure-related table engines/functions on macOS. [#51866](https://github.com/ClickHouse/ClickHouse/pull/51866) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* ClickHouse Fast Test now uses Musl instead of GLibc. [#57711](https://github.com/ClickHouse/ClickHouse/pull/57711) ([Alexey Milovidov](https://github.com/alexey-milovidov)). The fully-static Musl build is available to download from the CI.
-* Run ClickBench for every commit. This closes [#57708](https://github.com/ClickHouse/ClickHouse/issues/57708). [#57712](https://github.com/ClickHouse/ClickHouse/pull/57712) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove the usage of a harmful C/POSIX `select` function from external libraries. [#57467](https://github.com/ClickHouse/ClickHouse/pull/57467) ([Igor Nikonov](https://github.com/devcrafter)).
-* Settings only available in ClickHouse Cloud will be also present in the open-source ClickHouse build for convenience. [#57638](https://github.com/ClickHouse/ClickHouse/pull/57638) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fixed a possibility of sorting order breakage in TTL GROUP BY [#49103](https://github.com/ClickHouse/ClickHouse/pull/49103) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix: split `lttb` bucket strategy, first bucket and last bucket should only contain single point [#57003](https://github.com/ClickHouse/ClickHouse/pull/57003) ([FFish](https://github.com/wxybear)).
-* Fix possible deadlock in the `Template` format during sync after error [#57004](https://github.com/ClickHouse/ClickHouse/pull/57004) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix early stop while parsing a file with skipping lots of errors [#57006](https://github.com/ClickHouse/ClickHouse/pull/57006) ([Kruglov Pavel](https://github.com/Avogar)).
-* Prevent dictionary's ACL bypass via the `dictionary` table function [#57362](https://github.com/ClickHouse/ClickHouse/pull/57362) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix another case of a "non-ready set" error found by Fuzzer. [#57423](https://github.com/ClickHouse/ClickHouse/pull/57423) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix several issues regarding PostgreSQL `array_ndims` usage. [#57436](https://github.com/ClickHouse/ClickHouse/pull/57436) ([Ryan Jacobs](https://github.com/ryanmjacobs)).
-* Fix RWLock inconsistency after write lock timeout [#57454](https://github.com/ClickHouse/ClickHouse/pull/57454) ([Vitaly Baranov](https://github.com/vitlibar)). Fix RWLock inconsistency after write lock timeout (again) [#57733](https://github.com/ClickHouse/ClickHouse/pull/57733) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix: don't exclude ephemeral column when building pushing to view chain [#57461](https://github.com/ClickHouse/ClickHouse/pull/57461) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* MaterializedPostgreSQL (experimental issue): fix issue [#41922](https://github.com/ClickHouse/ClickHouse/issues/41922), add test for [#41923](https://github.com/ClickHouse/ClickHouse/issues/41923) [#57515](https://github.com/ClickHouse/ClickHouse/pull/57515) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Ignore ON CLUSTER clause in grant/revoke queries for management of replicated access entities.  [#57538](https://github.com/ClickHouse/ClickHouse/pull/57538) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* Fix crash in clickhouse-local [#57553](https://github.com/ClickHouse/ClickHouse/pull/57553) ([Nikolay Degterinsky](https://github.com/evillique)).
-* A fix for Hash JOIN. [#57564](https://github.com/ClickHouse/ClickHouse/pull/57564) ([vdimir](https://github.com/vdimir)).
-* Fix possible error in PostgreSQL source [#57567](https://github.com/ClickHouse/ClickHouse/pull/57567) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix type correction in Hash JOIN for nested LowCardinality. [#57614](https://github.com/ClickHouse/ClickHouse/pull/57614) ([vdimir](https://github.com/vdimir)).
-* Avoid hangs of `system.stack_trace` by correctly prohibiting parallel reading from it. [#57641](https://github.com/ClickHouse/ClickHouse/pull/57641) ([Azat Khuzhin](https://github.com/azat)).
-* Fix an error for aggregation of sparse columns with `any(...) RESPECT NULL` [#57710](https://github.com/ClickHouse/ClickHouse/pull/57710) ([Azat Khuzhin](https://github.com/azat)).
-* Fix unary operators parsing [#57713](https://github.com/ClickHouse/ClickHouse/pull/57713) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix dependency loading for the experimental table engine `MaterializedPostgreSQL`. [#57754](https://github.com/ClickHouse/ClickHouse/pull/57754) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix retries for disconnected nodes for BACKUP/RESTORE ON CLUSTER [#57764](https://github.com/ClickHouse/ClickHouse/pull/57764) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix result of external aggregation in case of partially materialized projection [#57790](https://github.com/ClickHouse/ClickHouse/pull/57790) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix merge in aggregation functions with `*Map` combinator [#57795](https://github.com/ClickHouse/ClickHouse/pull/57795) ([Anton Popov](https://github.com/CurtizJ)).
-* Disable `system.kafka_consumers` because it has a bug. [#57822](https://github.com/ClickHouse/ClickHouse/pull/57822) ([Azat Khuzhin](https://github.com/azat)).
-* Fix LowCardinality keys support in Merge JOIN. [#57827](https://github.com/ClickHouse/ClickHouse/pull/57827) ([vdimir](https://github.com/vdimir)).
-* A fix for `InterpreterCreateQuery` related to the sample block. [#57855](https://github.com/ClickHouse/ClickHouse/pull/57855) ([Maksim Kita](https://github.com/kitaisreal)).
-* `addresses_expr` were ignored for named collections from PostgreSQL. [#57874](https://github.com/ClickHouse/ClickHouse/pull/57874) ([joelynch](https://github.com/joelynch)).
-* Fix invalid memory access in BLAKE3 (Rust) [#57876](https://github.com/ClickHouse/ClickHouse/pull/57876) ([Raúl Marín](https://github.com/Algunenano)). Then it was rewritten from Rust to C++ for better [memory-safety](https://www.memorysafety.org/). [#57994](https://github.com/ClickHouse/ClickHouse/pull/57994) ([Raúl Marín](https://github.com/Algunenano)).
-* Normalize function names in `CREATE INDEX` [#57906](https://github.com/ClickHouse/ClickHouse/pull/57906) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix handling of unavailable replicas before first request happened [#57933](https://github.com/ClickHouse/ClickHouse/pull/57933) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix literal alias misclassification [#57988](https://github.com/ClickHouse/ClickHouse/pull/57988) ([Chen768959](https://github.com/Chen768959)).
-* Fix invalid preprocessing on Keeper [#58069](https://github.com/ClickHouse/ClickHouse/pull/58069) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix integer overflow in the `Poco` library, related to `UTF32Encoding` [#58073](https://github.com/ClickHouse/ClickHouse/pull/58073) ([Andrey Fedotov](https://github.com/anfedotoff)).
-* Fix parallel replicas (experimental feature) in presence of a scalar subquery with a big integer value [#58118](https://github.com/ClickHouse/ClickHouse/pull/58118) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix `accurateCastOrNull` for out-of-range `DateTime` [#58139](https://github.com/ClickHouse/ClickHouse/pull/58139) ([Andrey Zvonov](https://github.com/zvonand)).
-* Fix possible `PARAMETER_OUT_OF_BOUND` error during subcolumns reading from a wide part in MergeTree [#58175](https://github.com/ClickHouse/ClickHouse/pull/58175) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix a slow-down of CREATE VIEW with an enormous number of subqueries [#58220](https://github.com/ClickHouse/ClickHouse/pull/58220) ([Tao Wang](https://github.com/wangtZJU)).
-* Fix parallel parsing for JSONCompactEachRow [#58181](https://github.com/ClickHouse/ClickHouse/pull/58181) ([Alexey Milovidov](https://github.com/alexey-milovidov)). [#58250](https://github.com/ClickHouse/ClickHouse/pull/58250) ([Kruglov Pavel](https://github.com/Avogar)).
-
-
-### <a id="2311"></a> ClickHouse release 23.11, 2023-12-06
-
-#### Backward Incompatible Change
-* The default ClickHouse server configuration file has enabled `access_management` (user manipulation by SQL queries) and `named_collection_control` (manipulation of named collection by SQL queries) for the `default` user by default. This closes [#56482](https://github.com/ClickHouse/ClickHouse/issues/56482). [#56619](https://github.com/ClickHouse/ClickHouse/pull/56619) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Multiple improvements for `RESPECT NULLS`/`IGNORE NULLS` for window functions. If you use them as aggregate functions and store the states of aggregate functions with these modifiers, they might become incompatible. [#57189](https://github.com/ClickHouse/ClickHouse/pull/57189) ([Raúl Marín](https://github.com/Algunenano)).
-* Remove optimization `optimize_move_functions_out_of_any`. [#57190](https://github.com/ClickHouse/ClickHouse/pull/57190) ([Raúl Marín](https://github.com/Algunenano)).
-* Formatters `%l`/`%k`/`%c` in function `parseDateTime` are now able to parse hours/months without leading zeros, e.g. `select parseDateTime('2023-11-26 8:14', '%F %k:%i')` now works. Set `parsedatetime_parse_without_leading_zeros = 0` to restore the previous behavior which required two digits. Function `formatDateTime` is now also able to print hours/months without leading zeros. This is controlled by setting `formatdatetime_format_without_leading_zeros` but off by default to not break existing use cases. [#55872](https://github.com/ClickHouse/ClickHouse/pull/55872) ([Azat Khuzhin](https://github.com/azat)).
-* You can no longer use the aggregate function `avgWeighted` with arguments of type `Decimal`. Workaround: convert arguments to `Float64`. This closes [#43928](https://github.com/ClickHouse/ClickHouse/issues/43928). This closes [#31768](https://github.com/ClickHouse/ClickHouse/issues/31768). This closes [#56435](https://github.com/ClickHouse/ClickHouse/issues/56435). If you have used this function inside materialized views or projections with `Decimal` arguments, contact support@clickhouse.com. Fixed error in aggregate function `sumMap` and made it slower around 1.5..2 times. It does not matter because the function is garbage anyway. This closes [#54955](https://github.com/ClickHouse/ClickHouse/issues/54955). This closes [#53134](https://github.com/ClickHouse/ClickHouse/issues/53134). This closes [#55148](https://github.com/ClickHouse/ClickHouse/issues/55148). Fix a bug in function `groupArraySample` - it used the same random seed in case more than one aggregate state is generated in a query. [#56350](https://github.com/ClickHouse/ClickHouse/pull/56350) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### New Feature
-* Added server setting `async_load_databases` for asynchronous loading of databases and tables. Speeds up the server start time. Applies to databases with `Ordinary`, `Atomic` and `Replicated` engines. Their tables load metadata asynchronously. Query to a table increases the priority of the load job and waits for it to be done. Added a new table `system.asynchronous_loader` for introspection. [#49351](https://github.com/ClickHouse/ClickHouse/pull/49351) ([Sergei Trifonov](https://github.com/serxa)).
-* Add system table `blob_storage_log`. It allows auditing all the data written to S3 and other object storages. [#52918](https://github.com/ClickHouse/ClickHouse/pull/52918) ([vdimir](https://github.com/vdimir)).
-* Use statistics to order prewhere conditions better. [#53240](https://github.com/ClickHouse/ClickHouse/pull/53240) ([Han Fei](https://github.com/hanfei1991)).
-* Added support for compression in the Keeper's protocol. It can be enabled on the ClickHouse side by using this flag `use_compression` inside `zookeeper` section. Keep in mind that only ClickHouse Keeper supports compression, while Apache ZooKeeper does not. Resolves [#49507](https://github.com/ClickHouse/ClickHouse/issues/49507). [#54957](https://github.com/ClickHouse/ClickHouse/pull/54957) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Introduce the feature `storage_metadata_write_full_object_key`. If it is set as `true` then metadata files are written with the new format. With that format ClickHouse stores full remote object key in the metadata file which allows better flexibility and optimization. [#55566](https://github.com/ClickHouse/ClickHouse/pull/55566) ([Sema Checherinda](https://github.com/CheSema)).
-* Add new settings and syntax to protect named collections' fields from being overridden. This is meant to prevent a malicious user from obtaining unauthorized access to secrets. [#55782](https://github.com/ClickHouse/ClickHouse/pull/55782) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Add `hostname` column to all system log tables - it is useful if you make the system tables replicated, shared, or distributed. [#55894](https://github.com/ClickHouse/ClickHouse/pull/55894) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `CHECK ALL TABLES` query. [#56022](https://github.com/ClickHouse/ClickHouse/pull/56022) ([vdimir](https://github.com/vdimir)).
-* Added function `fromDaysSinceYearZero` which is similar to MySQL's `FROM_DAYS`. E.g. `SELECT fromDaysSinceYearZero(739136)` returns `2023-09-08`. [#56088](https://github.com/ClickHouse/ClickHouse/pull/56088) ([Joanna Hulboj](https://github.com/jh0x)).
-* Add an external Python tool to view backups and to extract information from them without using ClickHouse. [#56268](https://github.com/ClickHouse/ClickHouse/pull/56268) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Implement a new setting called `preferred_optimize_projection_name`. If it is set to a non-empty string, the specified projection would be used if possible instead of choosing from all the candidates. [#56309](https://github.com/ClickHouse/ClickHouse/pull/56309) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add 4-letter command for yielding/resigning leadership (https://github.com/ClickHouse/ClickHouse/issues/56352). [#56354](https://github.com/ClickHouse/ClickHouse/pull/56354) ([Pradeep Chhetri](https://github.com/chhetripradeep)). [#56620](https://github.com/ClickHouse/ClickHouse/pull/56620) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
-* Added a new SQL function, `arrayRandomSample(arr, k)` which returns a sample of k elements from the input array. Similar functionality could previously be achieved only with less convenient syntax, e.g. `SELECT arrayReduce('groupArraySample(3)', range(10))`. [#56416](https://github.com/ClickHouse/ClickHouse/pull/56416) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added support for `Float16` type data to use in `.npy` files. Closes [#56344](https://github.com/ClickHouse/ClickHouse/issues/56344). [#56424](https://github.com/ClickHouse/ClickHouse/pull/56424) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Added a system view `information_schema.statistics` for better compatibility with Tableau Online. [#56425](https://github.com/ClickHouse/ClickHouse/pull/56425) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Add `system.symbols` table useful for introspection of the binary. [#56548](https://github.com/ClickHouse/ClickHouse/pull/56548) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Configurable dashboards. Queries for charts are now loaded using a query, which by default uses a new `system.dashboards` table. [#56771](https://github.com/ClickHouse/ClickHouse/pull/56771) ([Sergei Trifonov](https://github.com/serxa)).
-* Introduce `fileCluster` table function - it is useful if you mount a shared filesystem (NFS and similar) into the `user_files` directory. [#56868](https://github.com/ClickHouse/ClickHouse/pull/56868) ([Andrey Zvonov](https://github.com/zvonand)).
-* Add `_size` virtual column with file size in bytes to `s3/file/hdfs/url/azureBlobStorage` engines. [#57126](https://github.com/ClickHouse/ClickHouse/pull/57126) ([Kruglov Pavel](https://github.com/Avogar)).
-* Expose the number of errors for each error code occurred on a server since last restart from the Prometheus endpoint. [#57209](https://github.com/ClickHouse/ClickHouse/pull/57209) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* ClickHouse keeper reports its running availability zone at `/keeper/availability-zone` path. This can be configured via `<availability_zone><value>us-west-1a</value></availability_zone>`. [#56715](https://github.com/ClickHouse/ClickHouse/pull/56715) ([Jianfei Hu](https://github.com/incfly)).
-* Make ALTER materialized_view MODIFY QUERY non experimental and deprecate `allow_experimental_alter_materialized_view_structure` setting. Fixes [#15206](https://github.com/ClickHouse/ClickHouse/issues/15206). [#57311](https://github.com/ClickHouse/ClickHouse/pull/57311) ([alesapin](https://github.com/alesapin)).
-* Setting `join_algorithm` respects specified order [#51745](https://github.com/ClickHouse/ClickHouse/pull/51745) ([vdimir](https://github.com/vdimir)).
-* Add support for the [well-known Protobuf types](https://protobuf.dev/reference/protobuf/google.protobuf/) in the Protobuf format. [#56741](https://github.com/ClickHouse/ClickHouse/pull/56741) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-
-#### Performance Improvement
-* Adaptive timeouts for interacting with S3. The first attempt is made with low send and receive timeouts. [#56314](https://github.com/ClickHouse/ClickHouse/pull/56314) ([Sema Checherinda](https://github.com/CheSema)).
-* Increase the default value of `max_concurrent_queries` from 100 to 1000. This makes sense when there is a large number of connecting clients, which are slowly sending or receiving data, so the server is not limited by CPU, or when the number of CPU cores is larger than 100. Also, enable the concurrency control by default, and set the desired number of query processing threads in total as twice the number of CPU cores. It improves performance in scenarios with a very large number of concurrent queries. [#46927](https://github.com/ClickHouse/ClickHouse/pull/46927) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Support parallel evaluation of window functions. Fixes [#34688](https://github.com/ClickHouse/ClickHouse/issues/34688). [#39631](https://github.com/ClickHouse/ClickHouse/pull/39631) ([Dmitry Novik](https://github.com/novikd)).
-* `Numbers` table engine (of the `system.numbers` table) now analyzes the condition to generate the needed subset of data, like table's index. [#50909](https://github.com/ClickHouse/ClickHouse/pull/50909) ([JackyWoo](https://github.com/JackyWoo)).
-* Improved the performance of filtering by `IN (...)` condition for `Merge` table engine. [#54905](https://github.com/ClickHouse/ClickHouse/pull/54905) ([Nikita Taranov](https://github.com/nickitat)).
-* An improvement which takes place when the filesystem cache is full and there are big reads. [#55158](https://github.com/ClickHouse/ClickHouse/pull/55158) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add ability to disable checksums for S3 to avoid excessive pass over the file (this is controlled by the setting `s3_disable_checksum`). [#55559](https://github.com/ClickHouse/ClickHouse/pull/55559) ([Azat Khuzhin](https://github.com/azat)).
-* Now we read synchronously from remote tables when data is in page cache (like we do for local tables). It is faster, it doesn't require synchronisation inside the thread pool, and doesn't hesitate to do `seek`-s on local FS, and reduces CPU wait. [#55841](https://github.com/ClickHouse/ClickHouse/pull/55841) ([Nikita Taranov](https://github.com/nickitat)).
-* Optimization for getting value from `map`, `arrayElement`. It will bring about 30% speedup. - reduce the reserved memory - reduce the `resize` call. [#55957](https://github.com/ClickHouse/ClickHouse/pull/55957) ([lgbo](https://github.com/lgbo-ustc)).
-* Optimization of multi-stage filtering with AVX-512. The performance experiments of the OnTime dataset on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) show that this change could bring the improvements of 7.4%, 5.9%, 4.7%, 3.0%, and 4.6% to the QPS of the query Q2, Q3, Q4, Q5 and Q6 respectively while having no impact on others. [#56079](https://github.com/ClickHouse/ClickHouse/pull/56079) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Limit the number of threads busy inside the query profiler. If there are more - they will skip profiling. [#56105](https://github.com/ClickHouse/ClickHouse/pull/56105) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Decrease the amount of virtual function calls in window functions. [#56120](https://github.com/ClickHouse/ClickHouse/pull/56120) ([Maksim Kita](https://github.com/kitaisreal)).
-* Allow recursive Tuple field pruning in ORC data format to speed up scaning. [#56122](https://github.com/ClickHouse/ClickHouse/pull/56122) ([�扬](https://github.com/taiyang-li)).
-* Trivial count optimization for `Npy` data format: queries like `select count() from 'data.npy'` will work much more fast because of caching the results. [#56304](https://github.com/ClickHouse/ClickHouse/pull/56304) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Queries with aggregation and a large number of streams will use less amount of memory during the plan's construction. [#57074](https://github.com/ClickHouse/ClickHouse/pull/57074) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Improve performance of executing queries for use cases with many users and highly concurrent queries (>2000 QPS) by optimizing the access to ProcessList. [#57106](https://github.com/ClickHouse/ClickHouse/pull/57106) ([Andrej Hoos](https://github.com/adikus)).
-* Trivial improvement on array join, reuse some intermediate results. [#57183](https://github.com/ClickHouse/ClickHouse/pull/57183) ([�扬](https://github.com/taiyang-li)).
-* There are cases when stack unwinding was slow. Not anymore. [#57221](https://github.com/ClickHouse/ClickHouse/pull/57221) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Now we use default read pool for reading from external storage when `max_streams = 1`. It is beneficial when read prefetches are enabled. [#57334](https://github.com/ClickHouse/ClickHouse/pull/57334) ([Nikita Taranov](https://github.com/nickitat)).
-* Keeper improvement: improve memory-usage during startup by delaying log preprocessing. [#55660](https://github.com/ClickHouse/ClickHouse/pull/55660) ([Antonio Andelic](https://github.com/antonio2368)).
-* Improved performance of glob matching for `File` and `HDFS` storages. [#56141](https://github.com/ClickHouse/ClickHouse/pull/56141) ([Andrey Zvonov](https://github.com/zvonand)).
-* Posting lists in experimental full text indexes are now compressed which reduces their size by 10-30%. [#56226](https://github.com/ClickHouse/ClickHouse/pull/56226) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Parallelise `BackupEntriesCollector` in backups. [#56312](https://github.com/ClickHouse/ClickHouse/pull/56312) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
-#### Improvement
-* Add a new `MergeTree` setting `add_implicit_sign_column_constraint_for_collapsing_engine` (disabled by default). When enabled, it adds an implicit CHECK constraint for `CollapsingMergeTree` tables that restricts the value of the `Sign` column to be only -1 or 1. [#56701](https://github.com/ClickHouse/ClickHouse/issues/56701). [#56986](https://github.com/ClickHouse/ClickHouse/pull/56986) ([Kevin Mingtarja](https://github.com/kevinmingtarja)).
-* Enable adding new disk to storage configuration without restart. [#56367](https://github.com/ClickHouse/ClickHouse/pull/56367) ([Duc Canh Le](https://github.com/canhld94)).
-* Support creating and materializing index in the same alter query, also support "modify TTL" and "materialize TTL" in the same query. Closes [#55651](https://github.com/ClickHouse/ClickHouse/issues/55651). [#56331](https://github.com/ClickHouse/ClickHouse/pull/56331) ([flynn](https://github.com/ucasfl)).
-* Add a new table function named `fuzzJSON` with rows containing perturbed versions of the source JSON string with random variations. [#56490](https://github.com/ClickHouse/ClickHouse/pull/56490) ([Julia Kartseva](https://github.com/jkartseva)).
-* Engine `Merge` filters the records according to the row policies of the underlying tables, so you don't have to create another row policy on a `Merge` table. [#50209](https://github.com/ClickHouse/ClickHouse/pull/50209) ([Ilya Golshtein](https://github.com/ilejn)).
-* Add a setting `max_execution_time_leaf` to limit the execution time on shard for distributed query, and `timeout_overflow_mode_leaf` to control the behaviour if timeout happens. [#51823](https://github.com/ClickHouse/ClickHouse/pull/51823) ([Duc Canh Le](https://github.com/canhld94)).
-* Add ClickHouse setting to disable tunneling for HTTPS requests over HTTP proxy. [#55033](https://github.com/ClickHouse/ClickHouse/pull/55033) ([Arthur Passos](https://github.com/arthurpassos)).
-* Set `background_fetches_pool_size` to 16, background_schedule_pool_size to 512 that is better for production usage with frequent small insertions. [#54327](https://github.com/ClickHouse/ClickHouse/pull/54327) ([Denny Crane](https://github.com/den-crane)).
-* While read data from a csv format file, and at end of line is `\r` , which not followed by `\n`, then we will enconter the exception as follows `Cannot parse CSV format: found \r (CR) not followed by \n (LF). Line must end by \n (LF) or \r\n (CR LF) or \n\r.` In clickhouse, the csv end of line must be `\n` or `\r\n` or `\n\r`, so the `\r` must be followed by `\n`, but in some suitation, the csv input data is abnormal, like above, `\r` is at end of line. [#54340](https://github.com/ClickHouse/ClickHouse/pull/54340) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Update Arrow library to release-13.0.0 that supports new encodings. Closes [#44505](https://github.com/ClickHouse/ClickHouse/issues/44505). [#54800](https://github.com/ClickHouse/ClickHouse/pull/54800) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improve performance of ON CLUSTER queries by removing heavy system calls to get all network interfaces when looking for local ip address in the DDL entry hosts list. [#54909](https://github.com/ClickHouse/ClickHouse/pull/54909) ([Duc Canh Le](https://github.com/canhld94)).
-* Fixed accounting of memory allocated before attaching a thread to a query or a user. [#56089](https://github.com/ClickHouse/ClickHouse/pull/56089) ([Nikita Taranov](https://github.com/nickitat)).
-* Add support for `LARGE_LIST` in Apache Arrow formats. [#56118](https://github.com/ClickHouse/ClickHouse/pull/56118) ([edef](https://github.com/edef1c)).
-* Allow manual compaction of `EmbeddedRocksDB` via `OPTIMIZE` query. [#56225](https://github.com/ClickHouse/ClickHouse/pull/56225) ([Azat Khuzhin](https://github.com/azat)).
-* Add ability to specify BlockBasedTableOptions for `EmbeddedRocksDB` tables. [#56264](https://github.com/ClickHouse/ClickHouse/pull/56264) ([Azat Khuzhin](https://github.com/azat)).
-* `SHOW COLUMNS` now displays MySQL's equivalent data type name when the connection was made through the MySQL protocol. Previously, this was the case when setting `use_mysql_types_in_show_columns = 1`. The setting is retained but made obsolete. [#56277](https://github.com/ClickHouse/ClickHouse/pull/56277) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fixed possible `The local set of parts of table doesn't look like the set of parts in ZooKeeper` error if server was restarted just after `TRUNCATE` or `DROP PARTITION`. [#56282](https://github.com/ClickHouse/ClickHouse/pull/56282) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fixed handling of non-const query strings in functions `formatQuery`/ `formatQuerySingleLine`. Also added `OrNull` variants of both functions that return a NULL when a query cannot be parsed instead of throwing an exception. [#56327](https://github.com/ClickHouse/ClickHouse/pull/56327) ([Robert Schulze](https://github.com/rschu1ze)).
-* Allow backup of materialized view with dropped inner table instead of failing the backup. [#56387](https://github.com/ClickHouse/ClickHouse/pull/56387) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Queries to `system.replicas` initiate requests to ZooKeeper when certain columns are queried. When there are thousands of tables these requests might produce a considerable load on ZooKeeper. If there are multiple simultaneous queries to `system.replicas` they do same requests multiple times. The change is to "deduplicate" requests from concurrent queries. [#56420](https://github.com/ClickHouse/ClickHouse/pull/56420) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix translation to MySQL compatible query for querying external databases. [#56456](https://github.com/ClickHouse/ClickHouse/pull/56456) ([flynn](https://github.com/ucasfl)).
-* Add support for backing up and restoring tables using `KeeperMap` engine. [#56460](https://github.com/ClickHouse/ClickHouse/pull/56460) ([Antonio Andelic](https://github.com/antonio2368)).
-* 404 response for CompleteMultipartUpload has to be rechecked. Operation could be done on server even if client got timeout or other network errors. The next retry of CompleteMultipartUpload receives 404 response. If the object key exists that operation is considered as successful. [#56475](https://github.com/ClickHouse/ClickHouse/pull/56475) ([Sema Checherinda](https://github.com/CheSema)).
-* Enable the HTTP OPTIONS method by default - it simplifies requesting ClickHouse from a web browser. [#56483](https://github.com/ClickHouse/ClickHouse/pull/56483) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The value for `dns_max_consecutive_failures` was changed by mistake in [#46550](https://github.com/ClickHouse/ClickHouse/issues/46550) - this is reverted and adjusted to a better value. Also, increased the HTTP keep-alive timeout to a reasonable value from production. [#56485](https://github.com/ClickHouse/ClickHouse/pull/56485) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Load base backups lazily (a base backup won't be loaded until it's needed). Also add some log message and profile events for backups. [#56516](https://github.com/ClickHouse/ClickHouse/pull/56516) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Setting `query_cache_store_results_of_queries_with_nondeterministic_functions` (with values `false` or `true`) was marked obsolete. It was replaced by setting `query_cache_nondeterministic_function_handling`, a three-valued enum that controls how the query cache handles queries with non-deterministic functions: a) throw an exception (default behavior), b) save the non-deterministic query result regardless, or c) ignore, i.e. don't throw an exception and don't cache the result. [#56519](https://github.com/ClickHouse/ClickHouse/pull/56519) ([Robert Schulze](https://github.com/rschu1ze)).
-* Rewrite equality with `is null` check in JOIN ON section. Experimental *Analyzer only*. [#56538](https://github.com/ClickHouse/ClickHouse/pull/56538) ([vdimir](https://github.com/vdimir)).
-* Function`concat` now supports arbitrary argument types (instead of only String and FixedString arguments). This makes it behave more similar to MySQL `concat` implementation. For example, `SELECT concat('ab', 42)` now returns `ab42`. [#56540](https://github.com/ClickHouse/ClickHouse/pull/56540) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Allow getting cache configuration from 'named_collection' section in config or from SQL created named collections. [#56541](https://github.com/ClickHouse/ClickHouse/pull/56541) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* PostgreSQL database engine: Make the removal of outdated tables less aggressive with unsuccessful postgres connection. [#56609](https://github.com/ClickHouse/ClickHouse/pull/56609) ([jsc0218](https://github.com/jsc0218)).
-* It took too much time to connnect to PG when URL is not right, so the relevant query stucks there and get cancelled. [#56648](https://github.com/ClickHouse/ClickHouse/pull/56648) ([jsc0218](https://github.com/jsc0218)).
-* Keeper improvement: disable compressed logs by default in Keeper. [#56763](https://github.com/ClickHouse/ClickHouse/pull/56763) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add config setting `wait_dictionaries_load_at_startup`. [#56782](https://github.com/ClickHouse/ClickHouse/pull/56782) ([Vitaly Baranov](https://github.com/vitlibar)).
-* There was a potential vulnerability in previous ClickHouse versions: if a user has connected and unsuccessfully tried to authenticate with the "interserver secret" method, the server didn't terminate the connection immediately but continued to receive and ignore the leftover packets from the client. While these packets are ignored, they are still parsed, and if they use a compression method with another known vulnerability, it will lead to exploitation of it without authentication. This issue was found with [ClickHouse Bug Bounty Program](https://github.com/ClickHouse/ClickHouse/issues/38986) by https://twitter.com/malacupa. [#56794](https://github.com/ClickHouse/ClickHouse/pull/56794) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fetching a part waits when that part is fully committed on remote replica. It is better not send part in PreActive state. In case of zero copy this is mandatory restriction. [#56808](https://github.com/ClickHouse/ClickHouse/pull/56808) ([Sema Checherinda](https://github.com/CheSema)).
-* Fix possible postgresql logical replication conversion error when using experimental `MaterializedPostgreSQL`. [#53721](https://github.com/ClickHouse/ClickHouse/pull/53721) ([takakawa](https://github.com/takakawa)).
-* Implement user-level setting `alter_move_to_space_execute_async` which allow to execute queries `ALTER TABLE ... MOVE PARTITION|PART TO DISK|VOLUME` asynchronously. The size of pool for background executions is controlled by `background_move_pool_size`. Default behavior is synchronous execution. Fixes [#47643](https://github.com/ClickHouse/ClickHouse/issues/47643). [#56809](https://github.com/ClickHouse/ClickHouse/pull/56809) ([alesapin](https://github.com/alesapin)).
-* Able to filter by engine when scanning system.tables, avoid unnecessary (potentially time-consuming) connection. [#56813](https://github.com/ClickHouse/ClickHouse/pull/56813) ([jsc0218](https://github.com/jsc0218)).
-* Show `total_bytes` and `total_rows` in system tables for RocksDB storage. [#56816](https://github.com/ClickHouse/ClickHouse/pull/56816) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-* Allow basic commands in ALTER for TEMPORARY tables. [#56892](https://github.com/ClickHouse/ClickHouse/pull/56892) ([Sergey](https://github.com/icuken)).
-* LZ4 compression. Buffer compressed block in a rare case when out buffer capacity is not enough for writing compressed block directly to out's buffer. [#56938](https://github.com/ClickHouse/ClickHouse/pull/56938) ([Sema Checherinda](https://github.com/CheSema)).
-* Add metrics for the number of queued jobs, which is useful for the IO thread pool. [#56958](https://github.com/ClickHouse/ClickHouse/pull/56958) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a setting for PostgreSQL table engine setting in the config file. Added a check for the setting Added documentation around the additional setting. [#56959](https://github.com/ClickHouse/ClickHouse/pull/56959) ([Peignon Melvyn](https://github.com/melvynator)).
-* Function `concat` can now be called with a single argument, e.g., `SELECT concat('abc')`. This makes its behavior more consistent with MySQL's concat implementation. [#57000](https://github.com/ClickHouse/ClickHouse/pull/57000) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Signs all `x-amz-*` headers as required by AWS S3 docs. [#57001](https://github.com/ClickHouse/ClickHouse/pull/57001) ([Arthur Passos](https://github.com/arthurpassos)).
-* Function `fromDaysSinceYearZero` (alias: `FROM_DAYS`) can now be used with unsigned and signed integer types (previously, it had to be an unsigned integer). This improve compatibility with 3rd party tools such as Tableau Online. [#57002](https://github.com/ClickHouse/ClickHouse/pull/57002) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Add `system.s3queue_log` to default config. [#57036](https://github.com/ClickHouse/ClickHouse/pull/57036) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Change the default for `wait_dictionaries_load_at_startup` to true, and use this setting only if `dictionaries_lazy_load` is false. [#57133](https://github.com/ClickHouse/ClickHouse/pull/57133) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Check dictionary source type on creation even if `dictionaries_lazy_load` is enabled. [#57134](https://github.com/ClickHouse/ClickHouse/pull/57134) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Plan-level optimizations can now be enabled/disabled individually. Previously, it was only possible to disable them all. The setting which previously did that (`query_plan_enable_optimizations`) is retained and can still be used to disable all optimizations. [#57152](https://github.com/ClickHouse/ClickHouse/pull/57152) ([Robert Schulze](https://github.com/rschu1ze)).
-* The server's exit code will correspond to the exception code. For example, if the server cannot start due to memory limit, it will exit with the code 241 = MEMORY_LIMIT_EXCEEDED. In previous versions, the exit code for exceptions was always 70 = Poco::Util::ExitCode::EXIT_SOFTWARE. [#57153](https://github.com/ClickHouse/ClickHouse/pull/57153) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Do not demangle and symbolize stack frames from `functional` C++ header. [#57201](https://github.com/ClickHouse/ClickHouse/pull/57201) ([Mike Kot](https://github.com/myrrc)).
-* HTTP server page `/dashboard` now supports charts with multiple lines. [#57236](https://github.com/ClickHouse/ClickHouse/pull/57236) ([Sergei Trifonov](https://github.com/serxa)).
-* The `max_memory_usage_in_client` command line option supports a string value with a suffix (K, M, G, etc). Closes [#56879](https://github.com/ClickHouse/ClickHouse/issues/56879). [#57273](https://github.com/ClickHouse/ClickHouse/pull/57273) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Bumped Intel QPL (used by codec `DEFLATE_QPL`) from v1.2.0 to v1.3.1 . Also fixed a bug in case of BOF (Block On Fault) = 0, changed to handle page faults by falling back to SW path. [#57291](https://github.com/ClickHouse/ClickHouse/pull/57291) ([jasperzhu](https://github.com/jinjunzh)).
-* Increase default `replicated_deduplication_window` of MergeTree settings from 100 to 1k. [#57335](https://github.com/ClickHouse/ClickHouse/pull/57335) ([sichenzhao](https://github.com/sichenzhao)).
-* Stop using `INCONSISTENT_METADATA_FOR_BACKUP` that much. If possible prefer to continue scanning instead of stopping and starting the scanning for backup from the beginning. [#57385](https://github.com/ClickHouse/ClickHouse/pull/57385) ([Vitaly Baranov](https://github.com/vitlibar)).
-
-#### Build/Testing/Packaging Improvement
-* Add SQLLogic test. [#56078](https://github.com/ClickHouse/ClickHouse/pull/56078) ([Han Fei](https://github.com/hanfei1991)).
-* Make `clickhouse-local` and `clickhouse-client` available under short names (`ch`, `chl`, `chc`) for usability. [#56634](https://github.com/ClickHouse/ClickHouse/pull/56634) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Optimized build size further by removing unused code from external libraries. [#56786](https://github.com/ClickHouse/ClickHouse/pull/56786) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add automatic check that there are no large translation units. [#56559](https://github.com/ClickHouse/ClickHouse/pull/56559) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Lower the size of the single-binary distribution. This closes [#55181](https://github.com/ClickHouse/ClickHouse/issues/55181). [#56617](https://github.com/ClickHouse/ClickHouse/pull/56617) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Information about the sizes of every translation unit and binary file after each build will be sent to the CI database in ClickHouse Cloud. This closes [#56107](https://github.com/ClickHouse/ClickHouse/issues/56107). [#56636](https://github.com/ClickHouse/ClickHouse/pull/56636) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Certain files of "Apache Arrow" library (which we use only for non-essential things like parsing the arrow format) were rebuilt all the time regardless of the build cache. This is fixed. [#56657](https://github.com/ClickHouse/ClickHouse/pull/56657) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Avoid recompiling translation units depending on the autogenerated source file about version. [#56660](https://github.com/ClickHouse/ClickHouse/pull/56660) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Tracing data of the linker invocations will be sent to the CI database in ClickHouse Cloud. [#56725](https://github.com/ClickHouse/ClickHouse/pull/56725) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Use DWARF 5 debug symbols for the clickhouse binary (was DWARF 4 previously). [#56770](https://github.com/ClickHouse/ClickHouse/pull/56770) ([Michael Kolupaev](https://github.com/al13n321)).
-* Add a new build option `SANITIZE_COVERAGE`. If it is enabled, the code is instrumented to track the coverage. The collected information is available inside ClickHouse with: (1) a new function `coverage` that returns an array of unique addresses in the code found after the previous coverage reset; (2) `SYSTEM RESET COVERAGE` query that resets the accumulated data. This allows us to compare the coverage of different tests, including differential code coverage. Continuation of [#20539](https://github.com/ClickHouse/ClickHouse/issues/20539). [#56102](https://github.com/ClickHouse/ClickHouse/pull/56102) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Some of the stack frames might not be resolved when collecting stacks. In such cases the raw address might be helpful. [#56267](https://github.com/ClickHouse/ClickHouse/pull/56267) ([Alexander Gololobov](https://github.com/davenger)).
-* Add an option to disable `libssh`. [#56333](https://github.com/ClickHouse/ClickHouse/pull/56333) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Enable temporary_data_in_cache in S3 tests in CI. [#48425](https://github.com/ClickHouse/ClickHouse/pull/48425) ([vdimir](https://github.com/vdimir)).
-* Set the max memory usage for clickhouse-client (`1G`) in the CI. [#56873](https://github.com/ClickHouse/ClickHouse/pull/56873) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fix exerimental Analyzer - insertion from select with subquery referencing insertion table should process only insertion block. [#50857](https://github.com/ClickHouse/ClickHouse/pull/50857) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix a bug in `str_to_map` function. [#56423](https://github.com/ClickHouse/ClickHouse/pull/56423) ([Arthur Passos](https://github.com/arthurpassos)).
-* Keeper `reconfig`: add timeout before yielding/taking leadership [#53481](https://github.com/ClickHouse/ClickHouse/pull/53481) ([Mike Kot](https://github.com/myrrc)).
-* Fix incorrect header in grace hash join and filter pushdown [#53922](https://github.com/ClickHouse/ClickHouse/pull/53922) ([vdimir](https://github.com/vdimir)).
-* Select from system tables when table based on table function. [#55540](https://github.com/ClickHouse/ClickHouse/pull/55540) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* RFC: Fix "Cannot find column X in source stream" for Distributed queries with LIMIT BY [#55836](https://github.com/ClickHouse/ClickHouse/pull/55836) ([Azat Khuzhin](https://github.com/azat)).
-* Fix 'Cannot read from file:' while running client in a background [#55976](https://github.com/ClickHouse/ClickHouse/pull/55976) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix clickhouse-local exit on bad send_logs_level setting [#55994](https://github.com/ClickHouse/ClickHouse/pull/55994) ([Kruglov Pavel](https://github.com/Avogar)).
-* Bug fix explain ast with parameterized view [#56004](https://github.com/ClickHouse/ClickHouse/pull/56004) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix a crash during table loading on startup [#56232](https://github.com/ClickHouse/ClickHouse/pull/56232) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix ClickHouse-sourced dictionaries with an explicit query [#56236](https://github.com/ClickHouse/ClickHouse/pull/56236) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix segfault in signal handler for Keeper [#56266](https://github.com/ClickHouse/ClickHouse/pull/56266) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix incomplete query result for UNION in view() function. [#56274](https://github.com/ClickHouse/ClickHouse/pull/56274) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix inconsistency of "cast('0' as DateTime64(3))" and "cast('0' as Nullable(DateTime64(3)))" [#56286](https://github.com/ClickHouse/ClickHouse/pull/56286) ([�扬](https://github.com/taiyang-li)).
-* Fix rare race condition related to Memory allocation failure [#56303](https://github.com/ClickHouse/ClickHouse/pull/56303) ([alesapin](https://github.com/alesapin)).
-* Fix restore from backup with `flatten_nested` and `data_type_default_nullable` [#56306](https://github.com/ClickHouse/ClickHouse/pull/56306) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix crash in case of adding a column with type Object(JSON) [#56307](https://github.com/ClickHouse/ClickHouse/pull/56307) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix crash in filterPushDown [#56380](https://github.com/ClickHouse/ClickHouse/pull/56380) ([vdimir](https://github.com/vdimir)).
-* Fix restore from backup with mat view and dropped source table [#56383](https://github.com/ClickHouse/ClickHouse/pull/56383) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix segfault during Kerberos initialization [#56401](https://github.com/ClickHouse/ClickHouse/pull/56401) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix buffer overflow in T64 [#56434](https://github.com/ClickHouse/ClickHouse/pull/56434) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix nullable primary key in final (2) [#56452](https://github.com/ClickHouse/ClickHouse/pull/56452) ([Amos Bird](https://github.com/amosbird)).
-* Fix ON CLUSTER queries without database on initial node [#56484](https://github.com/ClickHouse/ClickHouse/pull/56484) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix startup failure due to TTL dependency [#56489](https://github.com/ClickHouse/ClickHouse/pull/56489) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix ALTER COMMENT queries ON CLUSTER [#56491](https://github.com/ClickHouse/ClickHouse/pull/56491) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix ALTER COLUMN with ALIAS [#56493](https://github.com/ClickHouse/ClickHouse/pull/56493) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix empty NAMED COLLECTIONs [#56494](https://github.com/ClickHouse/ClickHouse/pull/56494) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix two cases of projection analysis. [#56502](https://github.com/ClickHouse/ClickHouse/pull/56502) ([Amos Bird](https://github.com/amosbird)).
-* Fix handling of aliases in query cache [#56545](https://github.com/ClickHouse/ClickHouse/pull/56545) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix conversion from `Nullable(Enum)` to `Nullable(String)` [#56644](https://github.com/ClickHouse/ClickHouse/pull/56644) ([Nikolay Degterinsky](https://github.com/evillique)).
-* More reliable log handling in Keeper [#56670](https://github.com/ClickHouse/ClickHouse/pull/56670) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix configuration merge for nodes with substitution attributes [#56694](https://github.com/ClickHouse/ClickHouse/pull/56694) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Fix duplicate usage of table function input(). [#56695](https://github.com/ClickHouse/ClickHouse/pull/56695) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix: RabbitMQ OpenSSL dynamic loading issue [#56703](https://github.com/ClickHouse/ClickHouse/pull/56703) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix crash in GCD codec in case when zeros present in data [#56704](https://github.com/ClickHouse/ClickHouse/pull/56704) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix 'mutex lock failed: Invalid argument' in clickhouse-local during insert into function [#56710](https://github.com/ClickHouse/ClickHouse/pull/56710) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix Date text parsing in optimistic path [#56765](https://github.com/ClickHouse/ClickHouse/pull/56765) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix crash in FPC codec [#56795](https://github.com/ClickHouse/ClickHouse/pull/56795) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* DatabaseReplicated: fix DDL query timeout after recovering a replica [#56796](https://github.com/ClickHouse/ClickHouse/pull/56796) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix incorrect nullable columns reporting in MySQL binary protocol [#56799](https://github.com/ClickHouse/ClickHouse/pull/56799) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Support Iceberg metadata files for metastore tables [#56810](https://github.com/ClickHouse/ClickHouse/pull/56810) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix TSAN report under transform [#56817](https://github.com/ClickHouse/ClickHouse/pull/56817) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix SET query and SETTINGS formatting [#56825](https://github.com/ClickHouse/ClickHouse/pull/56825) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix failure to start due to table dependency in joinGet [#56828](https://github.com/ClickHouse/ClickHouse/pull/56828) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix flattening existing Nested columns during ADD COLUMN [#56830](https://github.com/ClickHouse/ClickHouse/pull/56830) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix allow cr end of line for csv [#56901](https://github.com/ClickHouse/ClickHouse/pull/56901) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Fix `tryBase64Decode` with invalid input [#56913](https://github.com/ClickHouse/ClickHouse/pull/56913) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix generating deep nested columns in CapnProto/Protobuf schemas [#56941](https://github.com/ClickHouse/ClickHouse/pull/56941) ([Kruglov Pavel](https://github.com/Avogar)).
-* Prevent incompatible ALTER of projection columns [#56948](https://github.com/ClickHouse/ClickHouse/pull/56948) ([Amos Bird](https://github.com/amosbird)).
-* Fix sqlite file path validation [#56984](https://github.com/ClickHouse/ClickHouse/pull/56984) ([San](https://github.com/santrancisco)).
-* S3Queue: fix metadata reference increment [#56990](https://github.com/ClickHouse/ClickHouse/pull/56990) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* S3Queue minor fix [#56999](https://github.com/ClickHouse/ClickHouse/pull/56999) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix file path validation for DatabaseFileSystem [#57029](https://github.com/ClickHouse/ClickHouse/pull/57029) ([San](https://github.com/santrancisco)).
-* Fix `fuzzBits` with `ARRAY JOIN` [#57033](https://github.com/ClickHouse/ClickHouse/pull/57033) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix Nullptr dereference in partial merge join with joined_subquery_re… [#57048](https://github.com/ClickHouse/ClickHouse/pull/57048) ([vdimir](https://github.com/vdimir)).
-* Fix race condition in RemoteSource [#57052](https://github.com/ClickHouse/ClickHouse/pull/57052) ([Raúl Marín](https://github.com/Algunenano)).
-* Implement `bitHammingDistance` for big integers [#57073](https://github.com/ClickHouse/ClickHouse/pull/57073) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* S3-style links bug fix [#57075](https://github.com/ClickHouse/ClickHouse/pull/57075) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Fix JSON_QUERY function with multiple numeric paths [#57096](https://github.com/ClickHouse/ClickHouse/pull/57096) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Fix buffer overflow in Gorilla codec [#57107](https://github.com/ClickHouse/ClickHouse/pull/57107) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Close interserver connection on any exception before authentication [#57142](https://github.com/ClickHouse/ClickHouse/pull/57142) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix segfault after ALTER UPDATE with Nullable MATERIALIZED column [#57147](https://github.com/ClickHouse/ClickHouse/pull/57147) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix incorrect JOIN plan optimization with partially materialized normal projection [#57196](https://github.com/ClickHouse/ClickHouse/pull/57196) ([Amos Bird](https://github.com/amosbird)).
-* Ignore comments when comparing column descriptions [#57259](https://github.com/ClickHouse/ClickHouse/pull/57259) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix `ReadonlyReplica` metric for all cases [#57267](https://github.com/ClickHouse/ClickHouse/pull/57267) ([Antonio Andelic](https://github.com/antonio2368)).
-* Background merges correctly use temporary data storage in the cache [#57275](https://github.com/ClickHouse/ClickHouse/pull/57275) ([vdimir](https://github.com/vdimir)).
-* Keeper fix for changelog and snapshots [#57299](https://github.com/ClickHouse/ClickHouse/pull/57299) ([Antonio Andelic](https://github.com/antonio2368)).
-* Ignore finished ON CLUSTER tasks if hostname changed [#57339](https://github.com/ClickHouse/ClickHouse/pull/57339) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* MergeTree mutations reuse source part index granularity [#57352](https://github.com/ClickHouse/ClickHouse/pull/57352) ([Maksim Kita](https://github.com/kitaisreal)).
-* FS cache: add a limit for background download [#57424](https://github.com/ClickHouse/ClickHouse/pull/57424) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
-
-### <a id="2310"></a> ClickHouse release 23.10, 2023-11-02
-
-#### Backward Incompatible Change
-* There is no longer an option to automatically remove broken data parts. This closes [#55174](https://github.com/ClickHouse/ClickHouse/issues/55174). [#55184](https://github.com/ClickHouse/ClickHouse/pull/55184) ([Alexey Milovidov](https://github.com/alexey-milovidov)). [#55557](https://github.com/ClickHouse/ClickHouse/pull/55557) ([Jihyuk Bok](https://github.com/tomahawk28)).
-* The obsolete in-memory data parts can no longer be read from the write-ahead log. If you have configured in-memory parts before, they have to be removed before the upgrade. [#55186](https://github.com/ClickHouse/ClickHouse/pull/55186) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove the integration with Meilisearch. Reason: it was compatible only with the old version 0.18. The recent version of Meilisearch changed the protocol and does not work anymore. Note: we would appreciate it if you help to return it back. [#55189](https://github.com/ClickHouse/ClickHouse/pull/55189) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Rename directory monitor concept into background INSERT. All the settings `*directory_monitor*` had been renamed to `distributed_background_insert*`. *Backward compatibility should be preserved* (since old settings had been added as an alias). [#55978](https://github.com/ClickHouse/ClickHouse/pull/55978) ([Azat Khuzhin](https://github.com/azat)).
-* Do not interpret the `send_timeout` set on the client side as the `receive_timeout` on the server side and vise-versa. [#56035](https://github.com/ClickHouse/ClickHouse/pull/56035) ([Azat Khuzhin](https://github.com/azat)).
-* Comparison of time intervals with different units will throw an exception. This closes [#55942](https://github.com/ClickHouse/ClickHouse/issues/55942). You might have occasionally rely on the previous behavior when the underlying numeric values were compared regardless of the units. [#56090](https://github.com/ClickHouse/ClickHouse/pull/56090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Rewrited the experimental `S3Queue` table engine completely: changed the way we keep information in zookeeper which allows to make less zookeeper requests, added caching of zookeeper state in cases when we know the state will not change, improved the polling from s3 process to make it less aggressive, changed the way ttl and max set for trached files is maintained, now it is a background process. Added `system.s3queue` and `system.s3queue_log` tables. Closes [#54998](https://github.com/ClickHouse/ClickHouse/issues/54998). [#54422](https://github.com/ClickHouse/ClickHouse/pull/54422) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Arbitrary paths on HTTP endpoint are no longer interpreted as a request to the `/query` endpoint. [#55521](https://github.com/ClickHouse/ClickHouse/pull/55521) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-
-#### New Feature
-* Add function `arrayFold(accumulator, x1, ..., xn -> expression, initial, array1, ..., arrayn)` which applies a lambda function to multiple arrays of the same cardinality and collects the result in an accumulator. [#49794](https://github.com/ClickHouse/ClickHouse/pull/49794) ([Lirikl](https://github.com/Lirikl)).
-* Support for `Npy` format. `SELECT * FROM file('example_array.npy', Npy)`. [#55982](https://github.com/ClickHouse/ClickHouse/pull/55982) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* If a table has a space-filling curve in its key, e.g., `ORDER BY mortonEncode(x, y)`, the conditions on its arguments, e.g., `x >= 10 AND x <= 20 AND y >= 20 AND y <= 30` can be used for indexing. A setting `analyze_index_with_space_filling_curves` is added to enable or disable this analysis. This closes [#41195](https://github.com/ClickHouse/ClickHouse/issue/41195). Continuation of [#4538](https://github.com/ClickHouse/ClickHouse/pull/4538). Continuation of [#6286](https://github.com/ClickHouse/ClickHouse/pull/6286). Continuation of [#28130](https://github.com/ClickHouse/ClickHouse/pull/28130). Continuation of [#41753](https://github.com/ClickHouse/ClickHouse/pull/#41753). [#55642](https://github.com/ClickHouse/ClickHouse/pull/55642) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* A new setting called `force_optimize_projection_name`, it takes a name of projection as an argument. If it's value set to a non-empty string, ClickHouse checks that this projection is used in the query at least once. Closes [#55331](https://github.com/ClickHouse/ClickHouse/issues/55331). [#56134](https://github.com/ClickHouse/ClickHouse/pull/56134) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Support asynchronous inserts with external data via native protocol. Previously it worked only if data is inlined into query. [#54730](https://github.com/ClickHouse/ClickHouse/pull/54730) ([Anton Popov](https://github.com/CurtizJ)).
-* Added aggregation function `lttb` which uses the [Largest-Triangle-Three-Buckets](https://skemman.is/bitstream/1946/15343/3/SS_MSthesis.pdf) algorithm for downsampling data for visualization. [#53145](https://github.com/ClickHouse/ClickHouse/pull/53145) ([Sinan](https://github.com/sinsinan)).
-* Query`CHECK TABLE` has better performance and usability (sends progress updates, cancellable). Support checking particular part with `CHECK TABLE ... PART 'part_name'`. [#53404](https://github.com/ClickHouse/ClickHouse/pull/53404) ([vdimir](https://github.com/vdimir)).
-* Added function `jsonMergePatch`. When working with JSON data as strings, it provides a way to merge these strings (of JSON objects) together to form a single string containing a single JSON object. [#54364](https://github.com/ClickHouse/ClickHouse/pull/54364) ([Memo](https://github.com/Joeywzr)).
-* The second part of Kusto Query Language dialect support. [Phase 1 implementation ](https://github.com/ClickHouse/ClickHouse/pull/37961) has been merged. [#42510](https://github.com/ClickHouse/ClickHouse/pull/42510) ([larryluogit](https://github.com/larryluogit)).
-* Added a new SQL function, `arrayRandomSample(arr, k)` which returns a sample of k elements from the input array. Similar functionality could previously be achieved only with less convenient syntax, e.g. "SELECT arrayReduce('groupArraySample(3)', range(10))". [#54391](https://github.com/ClickHouse/ClickHouse/pull/54391) ([itayisraelov](https://github.com/itayisraelov)).
-* Introduce `-ArgMin`/`-ArgMax` aggregate combinators which allow to aggregate by min/max values only. One use case can be found in [#54818](https://github.com/ClickHouse/ClickHouse/issues/54818). This PR also reorganize combinators into dedicated folder. [#54947](https://github.com/ClickHouse/ClickHouse/pull/54947) ([Amos Bird](https://github.com/amosbird)).
-* Allow to drop cache for Protobuf format with `SYSTEM DROP SCHEMA FORMAT CACHE [FOR Protobuf]`. [#55064](https://github.com/ClickHouse/ClickHouse/pull/55064) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-* Add external HTTP Basic authenticator. [#55199](https://github.com/ClickHouse/ClickHouse/pull/55199) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Added function `byteSwap` which reverses the bytes of unsigned integers. This is particularly useful for reversing values of types which are represented as unsigned integers internally such as IPv4. [#55211](https://github.com/ClickHouse/ClickHouse/pull/55211) ([Priyansh Agrawal](https://github.com/Priyansh121096)).
-* Added function `formatQuery` which returns a formatted version (possibly spanning multiple lines) of a SQL query string. Also added function `formatQuerySingleLine` which does the same but the returned string will not contain linebreaks. [#55239](https://github.com/ClickHouse/ClickHouse/pull/55239) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Added `DWARF` input format that reads debug symbols from an ELF executable/library/object file. [#55450](https://github.com/ClickHouse/ClickHouse/pull/55450) ([Michael Kolupaev](https://github.com/al13n321)).
-* Allow to save unparsed records and errors in RabbitMQ, NATS and FileLog engines. Add virtual columns `_error` and `_raw_message`(for NATS and RabbitMQ), `_raw_record` (for FileLog) that are filled when ClickHouse fails to parse new record. The behaviour is controlled under storage settings `nats_handle_error_mode` for NATS, `rabbitmq_handle_error_mode` for RabbitMQ, `handle_error_mode` for FileLog similar to `kafka_handle_error_mode`. If it's set to `default`, en exception will be thrown when ClickHouse fails to parse a record, if it's set to `stream`, erorr and raw record will be saved into virtual columns. Closes [#36035](https://github.com/ClickHouse/ClickHouse/issues/36035). [#55477](https://github.com/ClickHouse/ClickHouse/pull/55477) ([Kruglov Pavel](https://github.com/Avogar)).
-* Keeper client improvement: add `get_all_children_number command` that returns number of all children nodes under a specific path. [#55485](https://github.com/ClickHouse/ClickHouse/pull/55485) ([guoxiaolong](https://github.com/guoxiaolongzte)).
-* Keeper client improvement: add `get_direct_children_number` command that returns number of direct children nodes under a path. [#55898](https://github.com/ClickHouse/ClickHouse/pull/55898) ([xuzifu666](https://github.com/xuzifu666)).
-* Add statement `SHOW SETTING setting_name` which is a simpler version of existing statement `SHOW SETTINGS`. [#55979](https://github.com/ClickHouse/ClickHouse/pull/55979) ([Maksim Kita](https://github.com/kitaisreal)).
-* Added fields `substreams` and `filenames` to the `system.parts_columns` table. [#55108](https://github.com/ClickHouse/ClickHouse/pull/55108) ([Anton Popov](https://github.com/CurtizJ)).
-* Add support for `SHOW MERGES` query. [#55815](https://github.com/ClickHouse/ClickHouse/pull/55815) ([megao](https://github.com/jetgm)).
-* Introduce a setting `create_table_empty_primary_key_by_default` for default `ORDER BY ()`. [#55899](https://github.com/ClickHouse/ClickHouse/pull/55899) ([Srikanth Chekuri](https://github.com/srikanthccv)).
-
-#### Performance Improvement
-* Add option `query_plan_preserve_num_streams_after_window_functions` to preserve the number of streams after evaluating window functions to allow parallel stream processing. [#50771](https://github.com/ClickHouse/ClickHouse/pull/50771) ([frinkr](https://github.com/frinkr)).
-* Release more streams if data is small. [#53867](https://github.com/ClickHouse/ClickHouse/pull/53867) ([Jiebin Sun](https://github.com/jiebinn)).
-* RoaringBitmaps being optimized before serialization. [#55044](https://github.com/ClickHouse/ClickHouse/pull/55044) ([UnamedRus](https://github.com/UnamedRus)).
-* Posting lists in inverted indexes are now optimized to use the smallest possible representation for internal bitmaps. Depending on the repetitiveness of the data, this may significantly reduce the space consumption of inverted indexes. [#55069](https://github.com/ClickHouse/ClickHouse/pull/55069) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Fix contention on Context lock, this significantly improves performance for a lot of short-running concurrent queries. [#55121](https://github.com/ClickHouse/ClickHouse/pull/55121) ([Maksim Kita](https://github.com/kitaisreal)).
-* Improved the performance of inverted index creation by 30%. This was achieved by replacing `std::unordered_map` with `absl::flat_hash_map`. [#55210](https://github.com/ClickHouse/ClickHouse/pull/55210) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Support ORC filter push down (rowgroup level). [#55330](https://github.com/ClickHouse/ClickHouse/pull/55330) ([�扬](https://github.com/taiyang-li)).
-* Improve performance of external aggregation with a lot of temporary files. [#55489](https://github.com/ClickHouse/ClickHouse/pull/55489) ([Maksim Kita](https://github.com/kitaisreal)).
-* Set a reasonable size for the marks cache for secondary indices by default to avoid loading the marks over and over again. [#55654](https://github.com/ClickHouse/ClickHouse/pull/55654) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Avoid unnecessary reconstruction of index granules when reading skip indexes. This addresses [#55653](https://github.com/ClickHouse/ClickHouse/issues/55653#issuecomment-1763766009). [#55683](https://github.com/ClickHouse/ClickHouse/pull/55683) ([Amos Bird](https://github.com/amosbird)).
-* Cache CAST function in set during execution to improve the performance of function `IN` when set element type doesn't exactly match column type. [#55712](https://github.com/ClickHouse/ClickHouse/pull/55712) ([Duc Canh Le](https://github.com/canhld94)).
-* Performance improvement for `ColumnVector::insertMany` and `ColumnVector::insertManyFrom`. [#55714](https://github.com/ClickHouse/ClickHouse/pull/55714) ([frinkr](https://github.com/frinkr)).
-* Optimized Map subscript operations by predicting the next row's key position and reduce the comparisons. [#55929](https://github.com/ClickHouse/ClickHouse/pull/55929) ([lgbo](https://github.com/lgbo-ustc)).
-* Support struct fields pruning in Parquet (in previous versions it didn't work in some cases). [#56117](https://github.com/ClickHouse/ClickHouse/pull/56117) ([lgbo](https://github.com/lgbo-ustc)).
-* Add the ability to tune the number of parallel replicas used in a query execution based on the estimation of rows to read. [#51692](https://github.com/ClickHouse/ClickHouse/pull/51692) ([Raúl Marín](https://github.com/Algunenano)).
-* Optimized external aggregation memory consumption in case many temporary files were generated. [#54798](https://github.com/ClickHouse/ClickHouse/pull/54798) ([Nikita Taranov](https://github.com/nickitat)).
-* Distributed queries executed in `async_socket_for_remote` mode (default) now respect `max_threads` limit. Previously, some queries could create excessive threads (up to `max_distributed_connections`), causing server performance issues. [#53504](https://github.com/ClickHouse/ClickHouse/pull/53504) ([filimonov](https://github.com/filimonov)).
-* Caching skip-able entries while executing DDL from Zookeeper distributed DDL queue. [#54828](https://github.com/ClickHouse/ClickHouse/pull/54828) ([Duc Canh Le](https://github.com/canhld94)).
-* Experimental inverted indexes do not store tokens with too many matches (i.e. row ids in the posting list). This saves space and avoids ineffective index lookups when sequential scans would be equally fast or faster. The previous heuristics (`density` parameter passed to the index definition) that controlled when tokens would not be stored was too confusing for users. A much simpler heuristics based on parameter `max_rows_per_postings_list` (default: 64k) is introduced which directly controls the maximum allowed number of row ids in a postings list. [#55616](https://github.com/ClickHouse/ClickHouse/pull/55616) ([Harry Lee](https://github.com/HarryLeeIBM)).
-* Improve write performance to `EmbeddedRocksDB` tables. [#55732](https://github.com/ClickHouse/ClickHouse/pull/55732) ([Duc Canh Le](https://github.com/canhld94)).
-* Improved overall resilience for ClickHouse in case of many parts within partition (more than 1000). It might reduce the number of `TOO_MANY_PARTS` errors. [#55526](https://github.com/ClickHouse/ClickHouse/pull/55526) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Reduced memory consumption during loading of hierarchical dictionaries. [#55838](https://github.com/ClickHouse/ClickHouse/pull/55838) ([Nikita Taranov](https://github.com/nickitat)).
-* All dictionaries support setting `dictionary_use_async_executor`. [#55839](https://github.com/ClickHouse/ClickHouse/pull/55839) ([vdimir](https://github.com/vdimir)).
-* Prevent excesive memory usage when deserializing AggregateFunctionTopKGenericData. [#55947](https://github.com/ClickHouse/ClickHouse/pull/55947) ([Raúl Marín](https://github.com/Algunenano)).
-* On a Keeper with lots of watches AsyncMetrics threads can consume 100% of CPU for noticable time in `DB::KeeperStorage::getSessionsWithWatchesCount`. The fix is to avoid traversing heavy `watches` and `list_watches` sets. [#56054](https://github.com/ClickHouse/ClickHouse/pull/56054) ([Alexander Gololobov](https://github.com/davenger)).
-* Add setting `optimize_trivial_approximate_count_query` to use `count` approximation for storage EmbeddedRocksDB. Enable trivial count for StorageJoin. [#55806](https://github.com/ClickHouse/ClickHouse/pull/55806) ([Duc Canh Le](https://github.com/canhld94)).
-
-#### Improvement
-* Functions `toDayOfWeek` (MySQL alias: `DAYOFWEEK`), `toYearWeek` (`YEARWEEK`) and `toWeek` (`WEEK`) now supports `String` arguments. This makes its behavior consistent with MySQL's behavior. [#55589](https://github.com/ClickHouse/ClickHouse/pull/55589) ([Robert Schulze](https://github.com/rschu1ze)).
-* Introduced setting `date_time_overflow_behavior` with possible values `ignore`, `throw`, `saturate` that controls the overflow behavior when converting from Date, Date32, DateTime64, Integer or Float to Date, Date32, DateTime or DateTime64. [#55696](https://github.com/ClickHouse/ClickHouse/pull/55696) ([Andrey Zvonov](https://github.com/zvonand)).
-* Implement query parameters support for `ALTER TABLE ... ACTION PARTITION [ID] {parameter_name:ParameterType}`. Merges [#49516](https://github.com/ClickHouse/ClickHouse/issues/49516). Closes [#49449](https://github.com/ClickHouse/ClickHouse/issues/49449). [#55604](https://github.com/ClickHouse/ClickHouse/pull/55604) ([alesapin](https://github.com/alesapin)).
-* Print processor ids in a prettier manner in EXPLAIN. [#48852](https://github.com/ClickHouse/ClickHouse/pull/48852) ([Vlad Seliverstov](https://github.com/behebot)).
-* Creating a direct dictionary with a lifetime field will be rejected at create time (as the lifetime does not make sense for direct dictionaries). Fixes: [#27861](https://github.com/ClickHouse/ClickHouse/issues/27861). [#49043](https://github.com/ClickHouse/ClickHouse/pull/49043) ([Rory Crispin](https://github.com/RoryCrispin)).
-* Allow parameters in queries with partitions like `ALTER TABLE t DROP PARTITION`. Closes [#49449](https://github.com/ClickHouse/ClickHouse/issues/49449). [#49516](https://github.com/ClickHouse/ClickHouse/pull/49516) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add a new column `xid` for `system.zookeeper_connection`. [#50702](https://github.com/ClickHouse/ClickHouse/pull/50702) ([helifu](https://github.com/helifu)).
-* Display the correct server settings in `system.server_settings` after configuration reload. [#53774](https://github.com/ClickHouse/ClickHouse/pull/53774) ([helifu](https://github.com/helifu)).
-* Add support for mathematical minus `−` character in queries, similar to `-`. [#54100](https://github.com/ClickHouse/ClickHouse/pull/54100) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add replica groups to the experimental `Replicated` database engine. Closes [#53620](https://github.com/ClickHouse/ClickHouse/issues/53620). [#54421](https://github.com/ClickHouse/ClickHouse/pull/54421) ([Nikolay Degterinsky](https://github.com/evillique)).
-* It is better to retry retriable s3 errors than totally fail the query. Set bigger value to the s3_retry_attempts by default. [#54770](https://github.com/ClickHouse/ClickHouse/pull/54770) ([Sema Checherinda](https://github.com/CheSema)).
-* Add load balancing mode `hostname_levenshtein_distance`. [#54826](https://github.com/ClickHouse/ClickHouse/pull/54826) ([JackyWoo](https://github.com/JackyWoo)).
-* Improve hiding secrets in logs. [#55089](https://github.com/ClickHouse/ClickHouse/pull/55089) ([Vitaly Baranov](https://github.com/vitlibar)).
-* For now the projection analysis will be performed only on top of query plan. The setting `query_plan_optimize_projection` became obsolete (it was enabled by default long time ago). [#55112](https://github.com/ClickHouse/ClickHouse/pull/55112) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* When function `untuple` is now called on a tuple with named elements and itself has an alias (e.g. `select untuple(tuple(1)::Tuple(element_alias Int)) AS untuple_alias`), then the result column name is now generated from the untuple alias and the tuple element alias (in the example: "untuple_alias.element_alias"). [#55123](https://github.com/ClickHouse/ClickHouse/pull/55123) ([garcher22](https://github.com/garcher22)).
-* Added setting `describe_include_virtual_columns`, which allows to include virtual columns of table into result of `DESCRIBE` query. Added setting `describe_compact_output`. If it is set to `true`, `DESCRIBE` query returns only names and types of columns without extra information. [#55129](https://github.com/ClickHouse/ClickHouse/pull/55129) ([Anton Popov](https://github.com/CurtizJ)).
-* Sometimes `OPTIMIZE` with `optimize_throw_if_noop=1` may fail with an error `unknown reason` while the real cause of it - different projections in different parts. This behavior is fixed. [#55130](https://github.com/ClickHouse/ClickHouse/pull/55130) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Allow to have several `MaterializedPostgreSQL` tables following the same Postgres table. By default this behaviour is not enabled (for compatibility, because it is a backward-incompatible change), but can be turned on with setting `materialized_postgresql_use_unique_replication_consumer_identifier`. Closes [#54918](https://github.com/ClickHouse/ClickHouse/issues/54918). [#55145](https://github.com/ClickHouse/ClickHouse/pull/55145) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Allow to parse negative `DateTime64` and `DateTime` with fractional part from short strings. [#55146](https://github.com/ClickHouse/ClickHouse/pull/55146) ([Andrey Zvonov](https://github.com/zvonand)).
-* To improve compatibility with MySQL, 1. `information_schema.tables` now includes the new field `table_rows`, and 2. `information_schema.columns` now includes the new field `extra`. [#55215](https://github.com/ClickHouse/ClickHouse/pull/55215) ([Robert Schulze](https://github.com/rschu1ze)).
-* Clickhouse-client won't show "0 rows in set" if it is zero and if exception was thrown. [#55240](https://github.com/ClickHouse/ClickHouse/pull/55240) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Support rename table without keyword `TABLE` like `RENAME db.t1 to db.t2`. [#55373](https://github.com/ClickHouse/ClickHouse/pull/55373) ([凌涛](https://github.com/lingtaolf)).
-* Add `internal_replication` to `system.clusters`. [#55377](https://github.com/ClickHouse/ClickHouse/pull/55377) ([Konstantin Morozov](https://github.com/k-morozov)).
-* Select remote proxy resolver based on request protocol, add proxy feature docs and remove `DB::ProxyConfiguration::Protocol::ANY`. [#55430](https://github.com/ClickHouse/ClickHouse/pull/55430) ([Arthur Passos](https://github.com/arthurpassos)).
-* Avoid retrying keeper operations on INSERT after table shutdown. [#55519](https://github.com/ClickHouse/ClickHouse/pull/55519) ([Azat Khuzhin](https://github.com/azat)).
-* `SHOW COLUMNS` now correctly reports type `FixedString` as `BLOB` if setting `use_mysql_types_in_show_columns` is on. Also added two new settings, `mysql_map_string_to_text_in_show_columns` and `mysql_map_fixed_string_to_text_in_show_columns` to switch the output for types `String` and `FixedString` as `TEXT` or `BLOB`. [#55617](https://github.com/ClickHouse/ClickHouse/pull/55617) ([Serge Klochkov](https://github.com/slvrtrn)).
-* During ReplicatedMergeTree tables startup clickhouse server checks set of parts for unexpected parts (exists locally, but not in zookeeper). All unexpected parts move to detached directory and instead of them server tries to restore some ancestor (covered) parts. Now server tries to restore closest ancestors instead of random covered parts. [#55645](https://github.com/ClickHouse/ClickHouse/pull/55645) ([alesapin](https://github.com/alesapin)).
-* The advanced dashboard now supports draggable charts on touch devices. This closes [#54206](https://github.com/ClickHouse/ClickHouse/issues/54206). [#55649](https://github.com/ClickHouse/ClickHouse/pull/55649) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Use the default query format if declared when outputting exception with `http_write_exception_in_output_format`. [#55739](https://github.com/ClickHouse/ClickHouse/pull/55739) ([Raúl Marín](https://github.com/Algunenano)).
-* Provide a better message for common MATERIALIZED VIEW pitfalls. [#55826](https://github.com/ClickHouse/ClickHouse/pull/55826) ([Raúl Marín](https://github.com/Algunenano)).
-* If you dropped the current database, you will still be able to run some queries in `clickhouse-local` and switch to another database. This makes the behavior consistent with `clickhouse-client`. This closes [#55834](https://github.com/ClickHouse/ClickHouse/issues/55834). [#55853](https://github.com/ClickHouse/ClickHouse/pull/55853) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Functions `(add|subtract)(Year|Quarter|Month|Week|Day|Hour|Minute|Second|Millisecond|Microsecond|Nanosecond)` now support string-encoded date arguments, e.g. `SELECT addDays('2023-10-22', 1)`. This increases compatibility with MySQL and is needed by Tableau Online. [#55869](https://github.com/ClickHouse/ClickHouse/pull/55869) ([Robert Schulze](https://github.com/rschu1ze)).
-* The setting `apply_deleted_mask` when disabled allows to read rows that where marked as deleted by lightweight DELETE queries. This is useful for debugging. [#55952](https://github.com/ClickHouse/ClickHouse/pull/55952) ([Alexander Gololobov](https://github.com/davenger)).
-* Allow skipping `null` values when serailizing Tuple to json objects, which makes it possible to keep compatiability with Spark's `to_json` function, which is also useful for gluten. [#55956](https://github.com/ClickHouse/ClickHouse/pull/55956) ([�扬](https://github.com/taiyang-li)).
-* Functions `(add|sub)Date` now support string-encoded date arguments, e.g. `SELECT addDate('2023-10-22 11:12:13', INTERVAL 5 MINUTE)`. The same support for string-encoded date arguments is added to the plus and minus operators, e.g. `SELECT '2023-10-23' + INTERVAL 1 DAY`. This increases compatibility with MySQL and is needed by Tableau Online. [#55960](https://github.com/ClickHouse/ClickHouse/pull/55960) ([Robert Schulze](https://github.com/rschu1ze)).
-* Allow unquoted strings with CR (`\r`) in CSV format. Closes [#39930](https://github.com/ClickHouse/ClickHouse/issues/39930). [#56046](https://github.com/ClickHouse/ClickHouse/pull/56046) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allow to run `clickhouse-keeper` using embedded config. [#56086](https://github.com/ClickHouse/ClickHouse/pull/56086) ([Maksim Kita](https://github.com/kitaisreal)).
-* Set limit of the maximum configuration value for `queued.min.messages` to avoid problem with start fetching data with Kafka. [#56121](https://github.com/ClickHouse/ClickHouse/pull/56121) ([Stas Morozov](https://github.com/r3b-fish)).
-* Fixed a typo in SQL function `minSampleSizeContinous` (renamed `minSampleSizeContinuous`). Old name is preserved for backward compatibility. This closes: [#56139](https://github.com/ClickHouse/ClickHouse/issues/56139). [#56143](https://github.com/ClickHouse/ClickHouse/pull/56143) ([Dorota Szeremeta](https://github.com/orotaday)).
-* Print path for broken parts on disk before shutting down the server. Before this change if a part is corrupted on disk and server cannot start, it was almost impossible to understand which part is broken. This is fixed. [#56181](https://github.com/ClickHouse/ClickHouse/pull/56181) ([Duc Canh Le](https://github.com/canhld94)).
-
-#### Build/Testing/Packaging Improvement
-* If the database in Docker is already initialized, it doesn't need to be initialized again upon subsequent launches. This can potentially fix the issue of infinite container restarts when the database fails to load within 1000 attempts (relevant for very large databases and multi-node setups). [#50724](https://github.com/ClickHouse/ClickHouse/pull/50724) ([Alexander Nikolaev](https://github.com/AlexNik)).
-* Resource with source code including submodules is built in Darwin special build task. It may be used to build ClickHouse without checking out the submodules. [#51435](https://github.com/ClickHouse/ClickHouse/pull/51435) ([Ilya Yatsishin](https://github.com/qoega)).
-* An error was occuring when building ClickHouse with the AVX series of instructions enabled globally (which isn't recommended). The reason is that snappy does not enable `SNAPPY_HAVE_X86_CRC32`. [#55049](https://github.com/ClickHouse/ClickHouse/pull/55049) ([monchickey](https://github.com/monchickey)).
-* Solve issue with launching standalone `clickhouse-keeper` from `clickhouse-server` package. [#55226](https://github.com/ClickHouse/ClickHouse/pull/55226) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* In the tests, RabbitMQ version is updated to 3.12.6. Improved logs collection for RabbitMQ tests. [#55424](https://github.com/ClickHouse/ClickHouse/pull/55424) ([Ilya Yatsishin](https://github.com/qoega)).
-* Modified the error message difference between openssl and boringssl to fix the functional test. [#55975](https://github.com/ClickHouse/ClickHouse/pull/55975) ([MeenaRenganathan22](https://github.com/MeenaRenganathan22)).
-* Use upstream repo for apache datasketches. [#55787](https://github.com/ClickHouse/ClickHouse/pull/55787) ([Nikita Taranov](https://github.com/nickitat)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Skip hardlinking inverted index files in mutation [#47663](https://github.com/ClickHouse/ClickHouse/pull/47663) ([cangyin](https://github.com/cangyin)).
-* Fixed bug of `match` function (regex) with pattern containing alternation produces incorrect key condition. Closes #53222. [#54696](https://github.com/ClickHouse/ClickHouse/pull/54696) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix 'Cannot find column' in read-in-order optimization with ARRAY JOIN [#51746](https://github.com/ClickHouse/ClickHouse/pull/51746) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Support missed experimental `Object(Nullable(json))` subcolumns in query. [#54052](https://github.com/ClickHouse/ClickHouse/pull/54052) ([zps](https://github.com/VanDarkholme7)).
-* Re-add fix for `accurateCastOrNull` [#54629](https://github.com/ClickHouse/ClickHouse/pull/54629) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix detecting `DEFAULT` for columns of a Distributed table created without AS [#55060](https://github.com/ClickHouse/ClickHouse/pull/55060) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Proper cleanup in case of exception in ctor of ShellCommandSource [#55103](https://github.com/ClickHouse/ClickHouse/pull/55103) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix deadlock in LDAP assigned role update [#55119](https://github.com/ClickHouse/ClickHouse/pull/55119) ([Julian Maicher](https://github.com/jmaicher)).
-* Suppress error statistics update for internal exceptions [#55128](https://github.com/ClickHouse/ClickHouse/pull/55128) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix deadlock in backups [#55132](https://github.com/ClickHouse/ClickHouse/pull/55132) ([alesapin](https://github.com/alesapin)).
-* Fix storage Iceberg files retrieval [#55144](https://github.com/ClickHouse/ClickHouse/pull/55144) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix partition pruning of extra columns in set. [#55172](https://github.com/ClickHouse/ClickHouse/pull/55172) ([Amos Bird](https://github.com/amosbird)).
-* Fix recalculation of skip indexes in ALTER UPDATE queries when table has adaptive granularity [#55202](https://github.com/ClickHouse/ClickHouse/pull/55202) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix for background download in fs cache [#55252](https://github.com/ClickHouse/ClickHouse/pull/55252) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Avoid possible memory leaks in compressors in case of missing buffer finalization [#55262](https://github.com/ClickHouse/ClickHouse/pull/55262) ([Azat Khuzhin](https://github.com/azat)).
-* Fix functions execution over sparse columns [#55275](https://github.com/ClickHouse/ClickHouse/pull/55275) ([Azat Khuzhin](https://github.com/azat)).
-* Fix incorrect merging of Nested for SELECT FINAL FROM SummingMergeTree [#55276](https://github.com/ClickHouse/ClickHouse/pull/55276) ([Azat Khuzhin](https://github.com/azat)).
-* Fix bug with inability to drop detached partition in replicated merge tree on top of S3 without zero copy [#55309](https://github.com/ClickHouse/ClickHouse/pull/55309) ([alesapin](https://github.com/alesapin)).
-* Fix a crash in MergeSortingPartialResultTransform (due to zero chunks after `remerge`) [#55335](https://github.com/ClickHouse/ClickHouse/pull/55335) ([Azat Khuzhin](https://github.com/azat)).
-* Fix data-race in CreatingSetsTransform (on errors) due to throwing shared exception [#55338](https://github.com/ClickHouse/ClickHouse/pull/55338) ([Azat Khuzhin](https://github.com/azat)).
-* Fix trash optimization (up to a certain extent) [#55353](https://github.com/ClickHouse/ClickHouse/pull/55353) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix leak in StorageHDFS [#55370](https://github.com/ClickHouse/ClickHouse/pull/55370) ([Azat Khuzhin](https://github.com/azat)).
-* Fix parsing of arrays in cast operator [#55417](https://github.com/ClickHouse/ClickHouse/pull/55417) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix filtering by virtual columns with OR filter in query [#55418](https://github.com/ClickHouse/ClickHouse/pull/55418) ([Azat Khuzhin](https://github.com/azat)).
-* Fix MongoDB connection issues [#55419](https://github.com/ClickHouse/ClickHouse/pull/55419) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix MySQL interface boolean representation [#55427](https://github.com/ClickHouse/ClickHouse/pull/55427) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Fix MySQL text protocol DateTime formatting and LowCardinality(Nullable(T)) types reporting [#55479](https://github.com/ClickHouse/ClickHouse/pull/55479) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Make `use_mysql_types_in_show_columns` affect only `SHOW COLUMNS` [#55481](https://github.com/ClickHouse/ClickHouse/pull/55481) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix stack symbolizer parsing `DW_FORM_ref_addr` incorrectly and sometimes crashing [#55483](https://github.com/ClickHouse/ClickHouse/pull/55483) ([Michael Kolupaev](https://github.com/al13n321)).
-* Destroy fiber in case of exception in cancelBefore in AsyncTaskExecutor [#55516](https://github.com/ClickHouse/ClickHouse/pull/55516) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix Query Parameters not working with custom HTTP handlers [#55521](https://github.com/ClickHouse/ClickHouse/pull/55521) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Fix checking of non handled data for Values format [#55527](https://github.com/ClickHouse/ClickHouse/pull/55527) ([Azat Khuzhin](https://github.com/azat)).
-* Fix 'Invalid cursor state' in odbc interacting with MS SQL Server [#55558](https://github.com/ClickHouse/ClickHouse/pull/55558) ([vdimir](https://github.com/vdimir)).
-* Fix max execution time and 'break' overflow mode [#55577](https://github.com/ClickHouse/ClickHouse/pull/55577) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix crash in QueryNormalizer with cyclic aliases [#55602](https://github.com/ClickHouse/ClickHouse/pull/55602) ([vdimir](https://github.com/vdimir)).
-* Disable wrong optimization and add a test [#55609](https://github.com/ClickHouse/ClickHouse/pull/55609) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Merging [#52352](https://github.com/ClickHouse/ClickHouse/issues/52352) [#55621](https://github.com/ClickHouse/ClickHouse/pull/55621) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add a test to avoid incorrect decimal sorting [#55662](https://github.com/ClickHouse/ClickHouse/pull/55662) ([Amos Bird](https://github.com/amosbird)).
-* Fix progress bar for s3 and azure Cluster functions with url without globs [#55666](https://github.com/ClickHouse/ClickHouse/pull/55666) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix filtering by virtual columns with OR filter in query (resubmit) [#55678](https://github.com/ClickHouse/ClickHouse/pull/55678) ([Azat Khuzhin](https://github.com/azat)).
-* Fixes and improvements for Iceberg storage [#55695](https://github.com/ClickHouse/ClickHouse/pull/55695) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix data race in CreatingSetsTransform (v2) [#55786](https://github.com/ClickHouse/ClickHouse/pull/55786) ([Azat Khuzhin](https://github.com/azat)).
-* Throw exception when parsing illegal string as float if precise_float_parsing is true [#55861](https://github.com/ClickHouse/ClickHouse/pull/55861) ([�扬](https://github.com/taiyang-li)).
-* Disable predicate pushdown if the CTE contains stateful functions [#55871](https://github.com/ClickHouse/ClickHouse/pull/55871) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix normalize ASTSelectWithUnionQuery, as it was stripping `FORMAT` from the query [#55887](https://github.com/ClickHouse/ClickHouse/pull/55887) ([flynn](https://github.com/ucasfl)).
-* Try to fix possible segfault in Native ORC input format [#55891](https://github.com/ClickHouse/ClickHouse/pull/55891) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix window functions in case of sparse columns. [#55895](https://github.com/ClickHouse/ClickHouse/pull/55895) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* fix: StorageNull supports subcolumns [#55912](https://github.com/ClickHouse/ClickHouse/pull/55912) ([FFish](https://github.com/wxybear)).
-* Do not write retriable errors for Replicated mutate/merge into error log [#55944](https://github.com/ClickHouse/ClickHouse/pull/55944) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `SHOW DATABASES LIMIT <N>` [#55962](https://github.com/ClickHouse/ClickHouse/pull/55962) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix autogenerated Protobuf schema with fields with underscore [#55974](https://github.com/ClickHouse/ClickHouse/pull/55974) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix dateTime64ToSnowflake64() with non-default scale [#55983](https://github.com/ClickHouse/ClickHouse/pull/55983) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix output/input of Arrow dictionary column [#55989](https://github.com/ClickHouse/ClickHouse/pull/55989) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix fetching schema from schema registry in AvroConfluent [#55991](https://github.com/ClickHouse/ClickHouse/pull/55991) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix 'Block structure mismatch' on concurrent ALTER and INSERTs in Buffer table [#55995](https://github.com/ClickHouse/ClickHouse/pull/55995) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix incorrect free space accounting for least_used JBOD policy [#56030](https://github.com/ClickHouse/ClickHouse/pull/56030) ([Azat Khuzhin](https://github.com/azat)).
-* Fix missing scalar issue when evaluating subqueries inside table functions [#56057](https://github.com/ClickHouse/ClickHouse/pull/56057) ([Amos Bird](https://github.com/amosbird)).
-* Fix wrong query result when http_write_exception_in_output_format=1 [#56135](https://github.com/ClickHouse/ClickHouse/pull/56135) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix schema cache for fallback JSON->JSONEachRow with changed settings [#56172](https://github.com/ClickHouse/ClickHouse/pull/56172) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add error handler to odbc-bridge [#56185](https://github.com/ClickHouse/ClickHouse/pull/56185) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-
-
-### <a id="239"></a> ClickHouse release 23.9, 2023-09-28
-
-#### Backward Incompatible Change
-* Remove the `status_info` configuration option and dictionaries status from the default Prometheus handler. [#54090](https://github.com/ClickHouse/ClickHouse/pull/54090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The experimental parts metadata cache is removed from the codebase. [#54215](https://github.com/ClickHouse/ClickHouse/pull/54215) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disable setting `input_format_json_try_infer_numbers_from_strings` by default, so we don't try to infer numbers from strings in JSON formats by default to avoid possible parsing errors when sample data contains strings that looks like a number. [#55099](https://github.com/ClickHouse/ClickHouse/pull/55099) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### New Feature
-* Improve schema inference from JSON formats: 1) Now it's possible to infer named Tuples from JSON objects without experimantal JSON type under a setting `input_format_json_try_infer_named_tuples_from_objects` in JSON formats. Previously without experimantal type JSON we could only infer JSON objects as Strings or Maps, now we can infer named Tuple. Resulting Tuple type will conain all keys of objects that were read in data sample during schema inference. It can be useful for reading structured JSON data without sparse objects. The setting is enabled by default. 2) Allow parsing JSON array into a column with type String under setting `input_format_json_read_arrays_as_strings`. It can help reading arrays with values with different types. 3) Allow to use type String for JSON keys with unkown types (`null`/`[]`/`{}`) in sample data under setting `input_format_json_infer_incomplete_types_as_strings`. Now in JSON formats we can read any value into String column and we can avoid getting error `Cannot determine type for column 'column_name' by first 25000 rows of data, most likely this column contains only Nulls or empty Arrays/Maps` during schema inference by using type String for unknown types, so the data will be read successfully. [#54427](https://github.com/ClickHouse/ClickHouse/pull/54427) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added IO scheduling support for remote disks. Storage configuration for disk types `s3`, `s3_plain`, `hdfs` and `azure_blob_storage` can now contain `read_resource` and `write_resource` elements holding resource names. Scheduling policies for these resources can be configured in a separate server configuration section `resources`. Queries can be marked using setting `workload` and classified using server configuration section `workload_classifiers` to achieve diverse resource scheduling goals. More details in [the docs](https://clickhouse.com/docs/en/operations/workload-scheduling). [#47009](https://github.com/ClickHouse/ClickHouse/pull/47009) ([Sergei Trifonov](https://github.com/serxa)). Added "bandwidth_limit" IO scheduling node type. It allows you to specify `max_speed` and `max_burst` constraints on traffic passing though this node. [#54618](https://github.com/ClickHouse/ClickHouse/pull/54618) ([Sergei Trifonov](https://github.com/serxa)).
-* Added new type of authentication based on SSH keys. It works only for the native TCP protocol. [#41109](https://github.com/ClickHouse/ClickHouse/pull/41109) ([George Gamezardashvili](https://github.com/InfJoker)).
-* Added a new column `_block_number` for MergeTree tables. [#44532](https://github.com/ClickHouse/ClickHouse/issues/44532). [#47532](https://github.com/ClickHouse/ClickHouse/pull/47532) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Add `IF EMPTY` clause for `DROP TABLE` queries. [#48915](https://github.com/ClickHouse/ClickHouse/pull/48915) ([Pavel Novitskiy](https://github.com/pnovitskiy)).
-* SQL functions `toString(datetime, timezone)` and `formatDateTime(datetime, format, timezone)` now support non-constant timezone arguments. [#53680](https://github.com/ClickHouse/ClickHouse/pull/53680) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add support for `ALTER TABLE MODIFY COMMENT`. Note: something similar was added by an external contributor a long time ago, but the feature did not work at all and only confused users. This closes [#36377](https://github.com/ClickHouse/ClickHouse/issues/36377). [#51304](https://github.com/ClickHouse/ClickHouse/pull/51304) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Note: this command does not propagate between replicas, so the replicas of a table could have different comments.
-* Added `GCD` a.k.a. "greatest common denominator" as a new data compression codec. The codec computes the GCD of all column values, and then divides each value by the GCD. The GCD codec is a data preparation codec (similar to Delta and DoubleDelta) and cannot be used stand-alone. It works with data integer, decimal and date/time type. A viable use case for the GCD codec are column values that change (increase/decrease) in multiples of the GCD, e.g. 24 - 28 - 16 - 24 - 8 - 24 (assuming GCD = 4). [#53149](https://github.com/ClickHouse/ClickHouse/pull/53149) ([Alexander Nam](https://github.com/seshWCS)).
-* Two new type aliases `DECIMAL(P)` (as shortcut for `DECIMAL(P, 0)` and `DECIMAL` (as shortcut for `DECIMAL(10, 0)`) were added. This makes ClickHouse more compatible with MySQL's SQL dialect. [#53328](https://github.com/ClickHouse/ClickHouse/pull/53328) ([Val Doroshchuk](https://github.com/valbok)).
-* Added a new system log table `backup_log` to track all `BACKUP` and `RESTORE` operations. [#53638](https://github.com/ClickHouse/ClickHouse/pull/53638) ([Victor Krasnov](https://github.com/sirvickr)).
-* Added a format setting `output_format_markdown_escape_special_characters` (default: false). The setting controls whether special characters like `!`, `#`, `$` etc. are escaped (i.e. prefixed by a backslash) in the `Markdown` output format. [#53860](https://github.com/ClickHouse/ClickHouse/pull/53860) ([irenjj](https://github.com/irenjj)).
-* Add function `decodeHTMLComponent`. [#54097](https://github.com/ClickHouse/ClickHouse/pull/54097) ([Bharat Nallan](https://github.com/bharatnc)).
-* Added `peak_threads_usage` to query_log table. [#54335](https://github.com/ClickHouse/ClickHouse/pull/54335) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Add `SHOW FUNCTIONS` support to clickhouse-client. [#54337](https://github.com/ClickHouse/ClickHouse/pull/54337) ([Julia Kartseva](https://github.com/wat-ze-hex)).
-* Added function `toDaysSinceYearZero` with alias `TO_DAYS` (for compatibility with MySQL) which returns the number of days passed since `0001-01-01` (in Proleptic Gregorian Calendar). [#54479](https://github.com/ClickHouse/ClickHouse/pull/54479) ([Robert Schulze](https://github.com/rschu1ze)). Function `toDaysSinceYearZero` now supports arguments of type `DateTime` and `DateTime64`. [#54856](https://github.com/ClickHouse/ClickHouse/pull/54856) ([Serge Klochkov](https://github.com/slvrtrn)).
-* Added functions `YYYYMMDDtoDate`, `YYYYMMDDtoDate32`, `YYYYMMDDhhmmssToDateTime` and `YYYYMMDDhhmmssToDateTime64`. They convert a date or date with time encoded as integer (e.g. 20230911) into a native date or date with time. As such, they provide the opposite functionality of existing functions `YYYYMMDDToDate`, `YYYYMMDDToDateTime`, `YYYYMMDDhhmmddToDateTime`, `YYYYMMDDhhmmddToDateTime64`. [#54509](https://github.com/ClickHouse/ClickHouse/pull/54509) ([Quanfa Fu](https://github.com/dentiscalprum)) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add several string distance functions, including `byteHammingDistance`, `editDistance`. [#54935](https://github.com/ClickHouse/ClickHouse/pull/54935) ([flynn](https://github.com/ucasfl)).
-* Allow specifying the expiration date and, optionally, the time for user credentials with `VALID UNTIL datetime` clause. [#51261](https://github.com/ClickHouse/ClickHouse/pull/51261) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Allow S3-style URLs for table functions `s3`, `gcs`, `oss`. URL is automatically converted to HTTP. Example: `'s3://clickhouse-public-datasets/hits.csv'` is converted to `'https://clickhouse-public-datasets.s3.amazonaws.com/hits.csv'`. [#54931](https://github.com/ClickHouse/ClickHouse/pull/54931) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add new setting `print_pretty_type_names` to print pretty deep nested types like Tuple/Maps/Arrays. [#55095](https://github.com/ClickHouse/ClickHouse/pull/55095) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Performance Improvement
-* Speed up reading from S3 by enabling prefetches by default. [#53709](https://github.com/ClickHouse/ClickHouse/pull/53709) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Do not implicitly read PK and version columns in lonely parts if unnecessary for queries with FINAL. [#53919](https://github.com/ClickHouse/ClickHouse/pull/53919) ([Duc Canh Le](https://github.com/canhld94)).
-* Optimize group by constant keys. Will optimize queries with group by `_file/_path` after https://github.com/ClickHouse/ClickHouse/pull/53529. [#53549](https://github.com/ClickHouse/ClickHouse/pull/53549) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improve performance of sorting for `Decimal` columns. Improve performance of insertion into `MergeTree` if ORDER BY contains a `Decimal` column. Improve performance of sorting when data is already sorted or almost sorted. [#35961](https://github.com/ClickHouse/ClickHouse/pull/35961) ([Maksim Kita](https://github.com/kitaisreal)).
-* Improve performance for huge query analysis. Fixes [#51224](https://github.com/ClickHouse/ClickHouse/issues/51224). [#51469](https://github.com/ClickHouse/ClickHouse/pull/51469) ([frinkr](https://github.com/frinkr)).
-* An optimization to rewrite `COUNT(DISTINCT ...)` and various `uniq` variants to `count` if it is selected from a subquery with GROUP BY. [#52082](https://github.com/ClickHouse/ClickHouse/pull/52082) [#52645](https://github.com/ClickHouse/ClickHouse/pull/52645) ([JackyWoo](https://github.com/JackyWoo)).
-* Remove manual calls to `mmap/mremap/munmap` and delegate all this work to `jemalloc` - and it slightly improves performance. [#52792](https://github.com/ClickHouse/ClickHouse/pull/52792) ([Nikita Taranov](https://github.com/nickitat)).
-* Fixed high in CPU consumption when working with NATS. [#54399](https://github.com/ClickHouse/ClickHouse/pull/54399) ([Vasilev Pyotr](https://github.com/vahpetr)).
-* Since we use separate instructions for executing `toString` with datetime argument, it is possible to improve performance a bit for non-datetime arguments and have some parts of the code cleaner. Follows up [#53680](https://github.com/ClickHouse/ClickHouse/issues/53680). [#54443](https://github.com/ClickHouse/ClickHouse/pull/54443) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Instead of serializing json elements into a `std::stringstream`, this PR try to put the serialization result into `ColumnString` direclty. [#54613](https://github.com/ClickHouse/ClickHouse/pull/54613) ([lgbo](https://github.com/lgbo-ustc)).
-* Enable ORDER BY optimization for reading data in corresponding order from a MergeTree table in case that the table is behind a view. [#54628](https://github.com/ClickHouse/ClickHouse/pull/54628) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Improve JSON SQL functions by reusing `GeneratorJSONPath` and removing several shared pointers. [#54735](https://github.com/ClickHouse/ClickHouse/pull/54735) ([lgbo](https://github.com/lgbo-ustc)).
-* Keeper tries to batch flush requests for better performance. [#53049](https://github.com/ClickHouse/ClickHouse/pull/53049) ([Antonio Andelic](https://github.com/antonio2368)).
-* Now `clickhouse-client` processes files in parallel in case of `INFILE 'glob_expression'`. Closes [#54218](https://github.com/ClickHouse/ClickHouse/issues/54218). [#54533](https://github.com/ClickHouse/ClickHouse/pull/54533) ([Max K.](https://github.com/mkaynov)).
-* Allow to use primary key for IN function where primary key column types are different from `IN` function right side column types. Example: `SELECT id FROM test_table WHERE id IN (SELECT '5')`. Closes [#48936](https://github.com/ClickHouse/ClickHouse/issues/48936). [#54544](https://github.com/ClickHouse/ClickHouse/pull/54544) ([Maksim Kita](https://github.com/kitaisreal)).
-* Hash JOIN tries to shrink internal buffers consuming half of maximal available memory (set by `max_bytes_in_join`). [#54584](https://github.com/ClickHouse/ClickHouse/pull/54584) ([vdimir](https://github.com/vdimir)).
-* Respect `max_block_size` for array join to avoid possible OOM. Close [#54290](https://github.com/ClickHouse/ClickHouse/issues/54290). [#54664](https://github.com/ClickHouse/ClickHouse/pull/54664) ([�扬](https://github.com/taiyang-li)).
-* Reuse HTTP connections in the `s3` table function. [#54812](https://github.com/ClickHouse/ClickHouse/pull/54812) ([Michael Kolupaev](https://github.com/al13n321)).
-* Replace the linear search in `MergeTreeRangeReader::Stream::ceilRowsToCompleteGranules` with a binary search. [#54869](https://github.com/ClickHouse/ClickHouse/pull/54869) ([usurai](https://github.com/usurai)).
-
-#### Experimental Feature
-* The creation of `Annoy` indexes can now be parallelized using setting `max_threads_for_annoy_index_creation`. [#54047](https://github.com/ClickHouse/ClickHouse/pull/54047) ([Robert Schulze](https://github.com/rschu1ze)).
-* Parallel replicas over distributed don't read from all replicas [#54199](https://github.com/ClickHouse/ClickHouse/pull/54199) ([Igor Nikonov](https://github.com/devcrafter)).
-
-#### Improvement
-* Allow to replace long names of files of columns in `MergeTree` data parts to hashes of names. It helps to avoid `File name too long` error in some cases. [#50612](https://github.com/ClickHouse/ClickHouse/pull/50612) ([Anton Popov](https://github.com/CurtizJ)).
-* Parse data in `JSON` format as `JSONEachRow` if failed to parse metadata. It will allow to read files with `.json` extension even if real format is JSONEachRow. Closes [#45740](https://github.com/ClickHouse/ClickHouse/issues/45740). [#54405](https://github.com/ClickHouse/ClickHouse/pull/54405) ([Kruglov Pavel](https://github.com/Avogar)).
-* Output valid JSON/XML on excetpion during HTTP query execution. Add setting `http_write_exception_in_output_format` to enable/disable this behaviour (enabled by default). [#52853](https://github.com/ClickHouse/ClickHouse/pull/52853) ([Kruglov Pavel](https://github.com/Avogar)).
-* View `information_schema.tables` now has a new field `data_length` which shows the approximate size of the data on disk. Required to run queries generated by Amazon QuickSight. [#55037](https://github.com/ClickHouse/ClickHouse/pull/55037) ([Robert Schulze](https://github.com/rschu1ze)).
-* The MySQL interface gained a minimal implementation of prepared statements, just enough to allow a connection from Tableau Online to ClickHouse via the MySQL connector. [#54115](https://github.com/ClickHouse/ClickHouse/pull/54115) ([Serge Klochkov](https://github.com/slvrtrn)). Please note: the prepared statements implementation is pretty minimal, we do not support arguments binding yet, it is not required in this particular Tableau online use case. It will be implemented as a follow-up if necessary after extensive testing of Tableau Online in case we discover issues.
-* Support case-insensitive and dot-all matching modes in `regexp_tree` dictionaries. [#50906](https://github.com/ClickHouse/ClickHouse/pull/50906) ([Johann Gan](https://github.com/johanngan)).
-* Keeper improvement: Add a `createIfNotExists` Keeper command. [#48855](https://github.com/ClickHouse/ClickHouse/pull/48855) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* More precise integer type inference, fix [#51236](https://github.com/ClickHouse/ClickHouse/issues/51236). [#53003](https://github.com/ClickHouse/ClickHouse/pull/53003) ([Chen768959](https://github.com/Chen768959)).
-* Introduced resolving of charsets in the string literals for MaterializedMySQL. [#53220](https://github.com/ClickHouse/ClickHouse/pull/53220) ([Val Doroshchuk](https://github.com/valbok)).
-* Fix a subtle issue with a rarely used `EmbeddedRocksDB` table engine in an extremely rare scenario: sometimes the `EmbeddedRocksDB` table engine does not close files correctly in NFS after running `DROP TABLE`. [#53502](https://github.com/ClickHouse/ClickHouse/pull/53502) ([Mingliang Pan](https://github.com/liangliangpan)).
-* `RESTORE TABLE ON CLUSTER` must create replicated tables with a matching UUID on hosts. Otherwise the macro `{uuid}` in ZooKeeper path can't work correctly after RESTORE. This PR implements that. [#53765](https://github.com/ClickHouse/ClickHouse/pull/53765) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Added restore setting `restore_broken_parts_as_detached`: if it's true the RESTORE process won't stop on broken parts while restoring, instead all the broken parts will be copied to the `detached` folder with the prefix `broken-from-backup'. If it's false the RESTORE process will stop on the first broken part (if any). The default value is false. [#53877](https://github.com/ClickHouse/ClickHouse/pull/53877) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add `elapsed_ns` field to HTTP headers X-ClickHouse-Progress and X-ClickHouse-Summary. [#54179](https://github.com/ClickHouse/ClickHouse/pull/54179) ([joelynch](https://github.com/joelynch)).
-* Implementation of `reconfig` (https://github.com/ClickHouse/ClickHouse/pull/49450), `sync`, and `exists` commands for keeper-client. [#54201](https://github.com/ClickHouse/ClickHouse/pull/54201) ([pufit](https://github.com/pufit)).
-* `clickhouse-local` and `clickhouse-client` now allow to specify the `--query` parameter multiple times, e.g. `./clickhouse-client --query "SELECT 1" --query "SELECT 2"`. This syntax is slightly more intuitive than `./clickhouse-client --multiquery "SELECT  1;S ELECT 2"`, a bit easier to script (e.g. `queries.push_back('--query "$q"')`) and more consistent with the behavior of existing parameter `--queries-file` (e.g. `./clickhouse client --queries-file queries1.sql --queries-file queries2.sql`). [#54249](https://github.com/ClickHouse/ClickHouse/pull/54249) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add sub-second precision to `formatReadableTimeDelta`. [#54250](https://github.com/ClickHouse/ClickHouse/pull/54250) ([Andrey Zvonov](https://github.com/zvonand)).
-* Enable `allow_remove_stale_moving_parts` by default. [#54260](https://github.com/ClickHouse/ClickHouse/pull/54260) ([vdimir](https://github.com/vdimir)).
-* Fix using count from cache and improve progress bar for reading from archives. [#54271](https://github.com/ClickHouse/ClickHouse/pull/54271) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add support for S3 credentials using SSO. To define a profile to be used with SSO, set `AWS_PROFILE` environment variable. [#54347](https://github.com/ClickHouse/ClickHouse/pull/54347) ([Antonio Andelic](https://github.com/antonio2368)).
-* Support NULL as default for nested types Array/Tuple/Map for input formats. Closes [#51100](https://github.com/ClickHouse/ClickHouse/issues/51100). [#54351](https://github.com/ClickHouse/ClickHouse/pull/54351) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allow reading some unusual configuration of chunks from Arrow/Parquet formats. [#54370](https://github.com/ClickHouse/ClickHouse/pull/54370) ([Arthur Passos](https://github.com/arthurpassos)).
-* Add `STD` alias to `stddevPop` function for MySQL compatibility. Closes [#54274](https://github.com/ClickHouse/ClickHouse/issues/54274). [#54382](https://github.com/ClickHouse/ClickHouse/pull/54382) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add `addDate` function for compatibility with MySQL and `subDate` for consistency. Reference [#54275](https://github.com/ClickHouse/ClickHouse/issues/54275). [#54400](https://github.com/ClickHouse/ClickHouse/pull/54400) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add `modification_time` into `system.detached_parts`. [#54506](https://github.com/ClickHouse/ClickHouse/pull/54506) ([Azat Khuzhin](https://github.com/azat)).
-* Added a setting `splitby_max_substrings_includes_remaining_string` which controls if functions "splitBy*()" with argument "max_substring" > 0 include the remaining string (if any) in the result array (Python/Spark semantics) or not. The default behavior does not change. [#54518](https://github.com/ClickHouse/ClickHouse/pull/54518) ([Robert Schulze](https://github.com/rschu1ze)).
-* Better integer types inference for `Int64`/`UInt64` fields. Continuation of [#53003](https://github.com/ClickHouse/ClickHouse/pull/53003). Now it works also for nested types like Arrays of Arrays and for functions like `map/tuple`. Issue: [#51236](https://github.com/ClickHouse/ClickHouse/issues/51236). [#54553](https://github.com/ClickHouse/ClickHouse/pull/54553) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added array operations for multiplying, dividing and modulo on scalar. Works in each way, for example `5 * [5, 5]` and `[5, 5] * 5` - both cases are possible. [#54608](https://github.com/ClickHouse/ClickHouse/pull/54608) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add optional `version` argument to `rm` command in `keeper-client` to support safer deletes. [#54708](https://github.com/ClickHouse/ClickHouse/pull/54708) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Disable killing the server by systemd (that may lead to data loss when using Buffer tables). [#54744](https://github.com/ClickHouse/ClickHouse/pull/54744) ([Azat Khuzhin](https://github.com/azat)).
-* Added field `is_deterministic` to system table `system.functions` which indicates whether the result of a function is stable between two invocations (given exactly the same inputs) or not. [#54766](https://github.com/ClickHouse/ClickHouse/pull/54766) [#55035](https://github.com/ClickHouse/ClickHouse/pull/55035) ([Robert Schulze](https://github.com/rschu1ze)).
-* Made the views in schema `information_schema` more compatible with the equivalent views in MySQL (i.e. modified and extended them) up to a point where Tableau Online is able to connect to ClickHouse. More specifically: 1. The type of field `information_schema.tables.table_type` changed from Enum8 to String. 2. Added fields `table_comment` and `table_collation` to view `information_schema.table`. 3. Added views `information_schema.key_column_usage` and `referential_constraints`. 4. Replaced uppercase aliases in `information_schema` views with concrete uppercase columns. [#54773](https://github.com/ClickHouse/ClickHouse/pull/54773) ([Serge Klochkov](https://github.com/slvrtrn)).
-* The query cache now returns an error if the user tries to cache the result of a query with a non-deterministic function such as `now`, `randomString` and `dictGet`. Compared to the previous behavior (silently don't cache the result), this reduces confusion and surprise for users. [#54801](https://github.com/ClickHouse/ClickHouse/pull/54801) ([Robert Schulze](https://github.com/rschu1ze)).
-* Forbid special columns like materialized/ephemeral/alias for `file`/`s3`/`url`/... storages, fix insert into ephemeral columns from files. Closes [#53477](https://github.com/ClickHouse/ClickHouse/issues/53477). [#54803](https://github.com/ClickHouse/ClickHouse/pull/54803) ([Kruglov Pavel](https://github.com/Avogar)).
-* More configurable collecting metadata for backup. [#54804](https://github.com/ClickHouse/ClickHouse/pull/54804) ([Vitaly Baranov](https://github.com/vitlibar)).
-* `clickhouse-local`'s log file (if enabled with --server_logs_file flag) will now prefix each line with timestamp, thread id, etc, just like `clickhouse-server`. [#54807](https://github.com/ClickHouse/ClickHouse/pull/54807) ([Michael Kolupaev](https://github.com/al13n321)).
-* Field `is_obsolete` in the `system.merge_tree_settings` table - it is now 1 for obsolete merge tree settings. Previously, only the description indicated that the setting is obsolete. [#54837](https://github.com/ClickHouse/ClickHouse/pull/54837) ([Robert Schulze](https://github.com/rschu1ze)).
-* Make it possible to use plural when using interval literals. `INTERVAL 2 HOURS` should be equivalent to `INTERVAL 2 HOUR`. [#54860](https://github.com/ClickHouse/ClickHouse/pull/54860) ([Jordi Villar](https://github.com/jrdi)).
-* Always allow the creation of a projection with `Nullable` PK. This fixes [#54814](https://github.com/ClickHouse/ClickHouse/issues/54814). [#54895](https://github.com/ClickHouse/ClickHouse/pull/54895) ([Amos Bird](https://github.com/amosbird)).
-* Retry backup's S3 operations after connection reset failure. [#54900](https://github.com/ClickHouse/ClickHouse/pull/54900) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Make the exception message exact in case of the maximum value of a settings is less than the minimum value. [#54925](https://github.com/ClickHouse/ClickHouse/pull/54925) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* `LIKE`, `match`, and other regular expressions matching functions now allow matching with patterns containing non-UTF-8 substrings by falling back to binary matching. Example: you can use `string LIKE '\xFE\xFF%'` to detect BOM. This closes [#54486](https://github.com/ClickHouse/ClickHouse/issues/54486). [#54942](https://github.com/ClickHouse/ClickHouse/pull/54942) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added `ContextLockWaitMicroseconds` profile event. [#55029](https://github.com/ClickHouse/ClickHouse/pull/55029) ([Maksim Kita](https://github.com/kitaisreal)).
-* The Keeper dynamically adjusts log levels. [#50372](https://github.com/ClickHouse/ClickHouse/pull/50372) ([helifu](https://github.com/helifu)).
-* Added function `timestamp` for compatibility with MySQL. Closes [#54275](https://github.com/ClickHouse/ClickHouse/issues/54275). [#54639](https://github.com/ClickHouse/ClickHouse/pull/54639) ([Nikolay Degterinsky](https://github.com/evillique)).
-
-#### Build/Testing/Packaging Improvement
-* Bumped the compiler of official and continuous integration builds of ClickHouse from Clang 16 to 17. [#53831](https://github.com/ClickHouse/ClickHouse/pull/53831) ([Robert Schulze](https://github.com/rschu1ze)).
-* Regenerated tld data for lookups (`tldLookup.generated.cpp`). [#54269](https://github.com/ClickHouse/ClickHouse/pull/54269) ([Bharat Nallan](https://github.com/bharatnc)).
-* Remove the redundant `clickhouse-keeper-client` symlink. [#54587](https://github.com/ClickHouse/ClickHouse/pull/54587) ([Tomas Barton](https://github.com/deric)).
-* Use `/usr/bin/env` to resolve bash - now it supports Nix OS. [#54603](https://github.com/ClickHouse/ClickHouse/pull/54603) ([Fionera](https://github.com/fionera)).
-* CMake added `PROFILE_CPU` option needed to perform `perf record` without using a DWARF call graph. [#54917](https://github.com/ClickHouse/ClickHouse/pull/54917) ([Maksim Kita](https://github.com/kitaisreal)).
-* If the linker is different than LLD, stop with a fatal error. [#55036](https://github.com/ClickHouse/ClickHouse/pull/55036) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Replaced the library to handle (encode/decode) base64 values from Turbo-Base64 to aklomp-base64. Both are SIMD-accelerated on x86 and ARM but 1. the license of the latter (BSD-2) is more favorable for ClickHouse, Turbo64 switched in the meantime to GPL-3, 2. with more GitHub stars, aklomp-base64 seems more future-proof, 3. aklomp-base64 has a slightly nicer API (which is arguably subjective), and 4. aklomp-base64 does not require us to hack around bugs (like non-threadsafe initialization). Note: aklomp-base64 rejects unpadded base64 values whereas Turbo-Base64 decodes them on a best-effort basis. RFC-4648 leaves it open whether padding is mandatory or not, but depending on the context this may be a behavioral change to be aware of. [#54119](https://github.com/ClickHouse/ClickHouse/pull/54119) ([Mikhail Koviazin](https://github.com/mkmkme)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fix REPLACE/MOVE PARTITION with zero-copy replication (note: "zero-copy replication" is an experimental feature) [#54193](https://github.com/ClickHouse/ClickHouse/pull/54193) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix zero copy locks with hardlinks (note: "zero-copy replication" is an experimental feature) [#54859](https://github.com/ClickHouse/ClickHouse/pull/54859) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix zero copy garbage (note: "zero-copy replication" is an experimental feature) [#54550](https://github.com/ClickHouse/ClickHouse/pull/54550) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Pass HTTP retry timeout as milliseconds (it was incorrect before). [#54438](https://github.com/ClickHouse/ClickHouse/pull/54438) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix misleading error message in OUTFILE with `CapnProto`/`Protobuf` [#52870](https://github.com/ClickHouse/ClickHouse/pull/52870) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix summary reporting with parallel replicas with LIMIT [#53050](https://github.com/ClickHouse/ClickHouse/pull/53050) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix throttling of BACKUPs from/to S3 (in case native copy was not used) and in some other places as well [#53336](https://github.com/ClickHouse/ClickHouse/pull/53336) ([Azat Khuzhin](https://github.com/azat)).
-* Fix IO throttling during copying whole directories [#53338](https://github.com/ClickHouse/ClickHouse/pull/53338) ([Azat Khuzhin](https://github.com/azat)).
-* Fix: moved to prewhere condition actions can lose column [#53492](https://github.com/ClickHouse/ClickHouse/pull/53492) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fixed internal error when replacing with byte-equal parts [#53735](https://github.com/ClickHouse/ClickHouse/pull/53735) ([Pedro Riera](https://github.com/priera)).
-* Fix: require columns participating in interpolate expression [#53754](https://github.com/ClickHouse/ClickHouse/pull/53754) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix cluster discovery initialization + setting up fail points in config [#54113](https://github.com/ClickHouse/ClickHouse/pull/54113) ([vdimir](https://github.com/vdimir)).
-* Fix issues in `accurateCastOrNull` [#54136](https://github.com/ClickHouse/ClickHouse/pull/54136) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix nullable primary key with the FINAL modifier [#54164](https://github.com/ClickHouse/ClickHouse/pull/54164) ([Amos Bird](https://github.com/amosbird)).
-* Fixed error that prevented insertion in replicated materialized view of new data in presence of duplicated data. [#54184](https://github.com/ClickHouse/ClickHouse/pull/54184) ([Pedro Riera](https://github.com/priera)).
-* Fix: allow `IPv6` for bloom filter [#54200](https://github.com/ClickHouse/ClickHouse/pull/54200) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* fix possible type mismatch with `IPv4` [#54212](https://github.com/ClickHouse/ClickHouse/pull/54212) ([Bharat Nallan](https://github.com/bharatnc)).
-* Fix `system.data_skipping_indices` for recreated indices [#54225](https://github.com/ClickHouse/ClickHouse/pull/54225) ([Artur Malchanau](https://github.com/Hexta)).
-* fix name clash for multiple join rewriter v2 [#54240](https://github.com/ClickHouse/ClickHouse/pull/54240) ([Tao Wang](https://github.com/wangtZJU)).
-* Fix unexpected errors in `system.errors` after join [#54306](https://github.com/ClickHouse/ClickHouse/pull/54306) ([vdimir](https://github.com/vdimir)).
-* Fix `isZeroOrNull(NULL)` [#54316](https://github.com/ClickHouse/ClickHouse/pull/54316) ([flynn](https://github.com/ucasfl)).
-* Fix: parallel replicas over distributed with `prefer_localhost_replica` = 1 [#54334](https://github.com/ClickHouse/ClickHouse/pull/54334) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix logical error in vertical merge + replacing merge tree + optimize cleanup [#54368](https://github.com/ClickHouse/ClickHouse/pull/54368) ([alesapin](https://github.com/alesapin)).
-* Fix possible error `URI contains invalid characters` in the `s3` table function [#54373](https://github.com/ClickHouse/ClickHouse/pull/54373) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix segfault in AST optimization of `arrayExists` function [#54379](https://github.com/ClickHouse/ClickHouse/pull/54379) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Check for overflow before addition in `analysisOfVariance` function [#54385](https://github.com/ClickHouse/ClickHouse/pull/54385) ([Antonio Andelic](https://github.com/antonio2368)).
-* Reproduce and fix the bug in removeSharedRecursive [#54430](https://github.com/ClickHouse/ClickHouse/pull/54430) ([Sema Checherinda](https://github.com/CheSema)).
-* Fix possible incorrect result with SimpleAggregateFunction in PREWHERE and FINAL [#54436](https://github.com/ClickHouse/ClickHouse/pull/54436) ([Azat Khuzhin](https://github.com/azat)).
-* Fix filtering parts with indexHint for non analyzer [#54449](https://github.com/ClickHouse/ClickHouse/pull/54449) ([Azat Khuzhin](https://github.com/azat)).
-* Fix aggregate projections with normalized states [#54480](https://github.com/ClickHouse/ClickHouse/pull/54480) ([Amos Bird](https://github.com/amosbird)).
-* `clickhouse-local`: something for multiquery parameter [#54498](https://github.com/ClickHouse/ClickHouse/pull/54498) ([CuiShuoGuo](https://github.com/bakam412)).
-* `clickhouse-local` supports `--database` command line argument [#54503](https://github.com/ClickHouse/ClickHouse/pull/54503) ([vdimir](https://github.com/vdimir)).
-* Fix possible parsing error in `-WithNames` formats with disabled `input_format_with_names_use_header` [#54513](https://github.com/ClickHouse/ClickHouse/pull/54513) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix rare case of CHECKSUM_DOESNT_MATCH error [#54549](https://github.com/ClickHouse/ClickHouse/pull/54549) ([alesapin](https://github.com/alesapin)).
-* Fix sorting of UNION ALL of already sorted results [#54564](https://github.com/ClickHouse/ClickHouse/pull/54564) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix snapshot install in Keeper [#54572](https://github.com/ClickHouse/ClickHouse/pull/54572) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix race in `ColumnUnique` [#54575](https://github.com/ClickHouse/ClickHouse/pull/54575) ([Nikita Taranov](https://github.com/nickitat)).
-* Annoy/Usearch index: Fix LOGICAL_ERROR during build-up with default values [#54600](https://github.com/ClickHouse/ClickHouse/pull/54600) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix serialization of `ColumnDecimal` [#54601](https://github.com/ClickHouse/ClickHouse/pull/54601) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix schema inference for *Cluster functions for column names with spaces [#54635](https://github.com/ClickHouse/ClickHouse/pull/54635) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix using structure from insertion tables in case of defaults and explicit insert columns [#54655](https://github.com/ClickHouse/ClickHouse/pull/54655) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix: avoid using regex match, possibly containing alternation, as a key condition. [#54696](https://github.com/ClickHouse/ClickHouse/pull/54696) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix ReplacingMergeTree with vertical merge and cleanup [#54706](https://github.com/ClickHouse/ClickHouse/pull/54706) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix virtual columns having incorrect values after ORDER BY [#54811](https://github.com/ClickHouse/ClickHouse/pull/54811) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix filtering parts with indexHint for non analyzer [#54825](https://github.com/ClickHouse/ClickHouse/pull/54825) [#54449](https://github.com/ClickHouse/ClickHouse/pull/54449) ([Azat Khuzhin](https://github.com/azat)).
-* Fix Keeper segfault during shutdown [#54841](https://github.com/ClickHouse/ClickHouse/pull/54841) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix `Invalid number of rows in Chunk` in MaterializedPostgreSQL [#54844](https://github.com/ClickHouse/ClickHouse/pull/54844) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Move obsolete format settings to separate section [#54855](https://github.com/ClickHouse/ClickHouse/pull/54855) ([Kruglov Pavel](https://github.com/Avogar)).
-* Rebuild `minmax_count_projection` when partition key gets modified [#54943](https://github.com/ClickHouse/ClickHouse/pull/54943) ([Amos Bird](https://github.com/amosbird)).
-* Fix bad cast to `ColumnVector<Int128>` in function `if` [#55019](https://github.com/ClickHouse/ClickHouse/pull/55019) ([Kruglov Pavel](https://github.com/Avogar)).
-* Prevent attaching parts from tables with different projections or indices [#55062](https://github.com/ClickHouse/ClickHouse/pull/55062) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Store NULL in scalar result map for empty subquery result [#52240](https://github.com/ClickHouse/ClickHouse/pull/52240) ([vdimir](https://github.com/vdimir)).
-* Fix `FINAL` produces invalid read ranges in a rare case [#54934](https://github.com/ClickHouse/ClickHouse/pull/54934) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix: insert quorum w/o keeper retries [#55026](https://github.com/ClickHouse/ClickHouse/pull/55026) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix simple state with nullable [#55030](https://github.com/ClickHouse/ClickHouse/pull/55030) ([Pedro Riera](https://github.com/priera)).
-
-
-### <a id="238"></a> ClickHouse release 23.8 LTS, 2023-08-31
-
-#### Backward Incompatible Change
-* If a dynamic disk contains a name, it should be specified as `disk = disk(name = 'disk_name'`, ...) in disk function arguments. In previous version it could be specified as `disk = disk_<disk_name>(...)`, which is no longer supported. [#52820](https://github.com/ClickHouse/ClickHouse/pull/52820) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* `clickhouse-benchmark` will establish connections in parallel when invoked with `--concurrency` more than one. Previously it was unusable if you ran it with 1000 concurrent connections from Europe to the US. Correct calculation of QPS for connections with high latency. Backward incompatible change: the option for JSON output of `clickhouse-benchmark` is removed. If you've used this option, you can also extract data from the `system.query_log` in JSON format as a workaround. [#53293](https://github.com/ClickHouse/ClickHouse/pull/53293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The `microseconds` column is removed from the `system.text_log`, and the `milliseconds` column is removed from the `system.metric_log`, because they are redundant in the presence of the `event_time_microseconds` column. [#53601](https://github.com/ClickHouse/ClickHouse/pull/53601) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Deprecate the metadata cache feature. It is experimental and we have never used it. The feature is dangerous: [#51182](https://github.com/ClickHouse/ClickHouse/issues/51182). Remove the `system.merge_tree_metadata_cache` system table. The metadata cache is still available in this version but will be removed soon. This closes [#39197](https://github.com/ClickHouse/ClickHouse/issues/39197). [#51303](https://github.com/ClickHouse/ClickHouse/pull/51303) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disable support for 3DES in TLS connections. [#52893](https://github.com/ClickHouse/ClickHouse/pull/52893) ([Kenji Noguchi](https://github.com/knoguchi)).
-
-#### New Feature
-* Direct import from zip/7z/tar archives. Example: `file('*.zip :: *.csv')`. [#50321](https://github.com/ClickHouse/ClickHouse/pull/50321) ([nikitakeba](https://github.com/nikitakeba)).
-* Add column `ptr` to `system.trace_log` for `trace_type = 'MemorySample'`. This column contains an address of allocation. Added function `flameGraph` which can build flamegraph containing allocated and not released memory. Reworking of [#38391](https://github.com/ClickHouse/ClickHouse/issues/38391). [#45322](https://github.com/ClickHouse/ClickHouse/pull/45322) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Added table function `azureBlobStorageCluster`. The supported set of features is very similar to table function `s3Cluster`. [#50795](https://github.com/ClickHouse/ClickHouse/pull/50795) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Allow using `cluster`, `clusterAllReplicas`, `remote`, and `remoteSecure` without table name in issue [#50808](https://github.com/ClickHouse/ClickHouse/issues/50808). [#50848](https://github.com/ClickHouse/ClickHouse/pull/50848) ([Yangkuan Liu](https://github.com/LiuYangkuan)).
-* A system table to monitor Kafka consumers. [#50999](https://github.com/ClickHouse/ClickHouse/pull/50999) ([Ilya Golshtein](https://github.com/ilejn)).
-* Added `max_sessions_for_user` setting. [#51724](https://github.com/ClickHouse/ClickHouse/pull/51724) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* New functions `toUTCTimestamp/fromUTCTimestamp` to act same as spark's `to_utc_timestamp/from_utc_timestamp`. [#52117](https://github.com/ClickHouse/ClickHouse/pull/52117) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Add new functions `structureToCapnProtoSchema`/`structureToProtobufSchema` that convert ClickHouse table structure to CapnProto/Protobuf format schema. Allow to input/output data in CapnProto/Protobuf format without external format schema using autogenerated schema from table structure (controlled by settings `format_capn_proto_use_autogenerated_schema`/`format_protobuf_use_autogenerated_schema`). Allow to export autogenerated schema while input/output using setting `output_format_schema`. [#52278](https://github.com/ClickHouse/ClickHouse/pull/52278) ([Kruglov Pavel](https://github.com/Avogar)).
-* A new field `query_cache_usage` in `system.query_log` now shows if and how the query cache was used. [#52384](https://github.com/ClickHouse/ClickHouse/pull/52384) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add new function `startsWithUTF8` and `endsWithUTF8`. [#52555](https://github.com/ClickHouse/ClickHouse/pull/52555) ([�扬](https://github.com/taiyang-li)).
-* Allow variable number of columns in TSV/CustomSeparated/JSONCompactEachRow, make schema inference work with variable number of columns. Add settings `input_format_tsv_allow_variable_number_of_columns`, `input_format_custom_allow_variable_number_of_columns`, `input_format_json_compact_allow_variable_number_of_columns`. [#52692](https://github.com/ClickHouse/ClickHouse/pull/52692) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added `SYSTEM STOP/START PULLING REPLICATION LOG` queries (for testing `ReplicatedMergeTree`). [#52881](https://github.com/ClickHouse/ClickHouse/pull/52881) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Allow to execute constant non-deterministic functions in mutations on initiator. [#53129](https://github.com/ClickHouse/ClickHouse/pull/53129) ([Anton Popov](https://github.com/CurtizJ)).
-* Add input format `One` that doesn't read any data and always returns single row with column `dummy` with type `UInt8` and value `0` like `system.one`. It can be used together with `_file/_path` virtual columns to list files in file/s3/url/hdfs/etc table functions without reading any data. [#53209](https://github.com/ClickHouse/ClickHouse/pull/53209) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add `tupleConcat` function. Closes [#52759](https://github.com/ClickHouse/ClickHouse/issues/52759). [#53239](https://github.com/ClickHouse/ClickHouse/pull/53239) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Support `TRUNCATE DATABASE` operation. [#53261](https://github.com/ClickHouse/ClickHouse/pull/53261) ([Bharat Nallan](https://github.com/bharatnc)).
-* Add `max_threads_for_indexes` setting to limit number of threads used for primary key processing. [#53313](https://github.com/ClickHouse/ClickHouse/pull/53313) ([jorisgio](https://github.com/jorisgio)).
-* Re-add SipHash keyed functions. [#53525](https://github.com/ClickHouse/ClickHouse/pull/53525) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* ([#52755](https://github.com/ClickHouse/ClickHouse/issues/52755) , [#52895](https://github.com/ClickHouse/ClickHouse/issues/52895)) Added functions `arrayRotateLeft`, `arrayRotateRight`, `arrayShiftLeft`, `arrayShiftRight`. [#53557](https://github.com/ClickHouse/ClickHouse/pull/53557) ([Mikhail Koviazin](https://github.com/mkmkme)).
-* Add column `name` to `system.clusters` as an alias to cluster. [#53605](https://github.com/ClickHouse/ClickHouse/pull/53605) ([irenjj](https://github.com/irenjj)).
-* The advanced dashboard now allows mass editing (save/load). [#53608](https://github.com/ClickHouse/ClickHouse/pull/53608) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The advanced dashboard now has an option to maximize charts and move them around. [#53622](https://github.com/ClickHouse/ClickHouse/pull/53622) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added support for adding and subtracting arrays: `[5,2] + [1,7]`. Division and multiplication were not implemented due to confusion between pointwise multiplication and the scalar product of arguments. Closes [#49939](https://github.com/ClickHouse/ClickHouse/issues/49939). [#52625](https://github.com/ClickHouse/ClickHouse/pull/52625) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add support for string literals as table names. Closes [#52178](https://github.com/ClickHouse/ClickHouse/issues/52178). [#52635](https://github.com/ClickHouse/ClickHouse/pull/52635) ([hendrik-m](https://github.com/hendrik-m)).
-
-#### Experimental Feature
-* Add new table engine `S3Queue` for streaming data import from s3. Closes [#37012](https://github.com/ClickHouse/ClickHouse/issues/37012). [#49086](https://github.com/ClickHouse/ClickHouse/pull/49086) ([s-kat](https://github.com/s-kat)). It is not ready to use. Do not use it.
-* Enable parallel reading from replicas over distributed table. Related to [#49708](https://github.com/ClickHouse/ClickHouse/issues/49708). [#53005](https://github.com/ClickHouse/ClickHouse/pull/53005) ([Igor Nikonov](https://github.com/devcrafter)).
-* Add experimental support for HNSW as approximate neighbor search method. [#53447](https://github.com/ClickHouse/ClickHouse/pull/53447) ([Davit Vardanyan](https://github.com/davvard)). This is currently intended for those who continue working on the implementation. Do not use it.
-
-#### Performance Improvement
-* Parquet filter pushdown. I.e. when reading Parquet files, row groups (chunks of the file) are skipped based on the WHERE condition and the min/max values in each column. In particular, if the file is roughly sorted by some column, queries that filter by a short range of that column will be much faster. [#52951](https://github.com/ClickHouse/ClickHouse/pull/52951) ([Michael Kolupaev](https://github.com/al13n321)).
-* Optimize reading small row groups by batching them together in Parquet. Closes [#53069](https://github.com/ClickHouse/ClickHouse/issues/53069). [#53281](https://github.com/ClickHouse/ClickHouse/pull/53281) ([Kruglov Pavel](https://github.com/Avogar)).
-* Optimize count from files in most input formats. Closes [#44334](https://github.com/ClickHouse/ClickHouse/issues/44334). [#53637](https://github.com/ClickHouse/ClickHouse/pull/53637) ([Kruglov Pavel](https://github.com/Avogar)).
-* Use filter by file/path before reading in `url`/`file`/`hdfs` table functions. [#53529](https://github.com/ClickHouse/ClickHouse/pull/53529) ([Kruglov Pavel](https://github.com/Avogar)).
-* Enable JIT compilation for AArch64, PowerPC, SystemZ, RISC-V. [#38217](https://github.com/ClickHouse/ClickHouse/pull/38217) ([Maksim Kita](https://github.com/kitaisreal)).
-* Add setting `rewrite_count_distinct_if_with_count_distinct_implementation` to rewrite `countDistinctIf` with `count_distinct_implementation`. Closes [#30642](https://github.com/ClickHouse/ClickHouse/issues/30642). [#46051](https://github.com/ClickHouse/ClickHouse/pull/46051) ([flynn](https://github.com/ucasfl)).
-* Speed up merging of states of `uniq` and `uniqExact` aggregate functions by parallelizing conversion before merge. [#50748](https://github.com/ClickHouse/ClickHouse/pull/50748) ([Jiebin Sun](https://github.com/jiebinn)).
-* Optimize aggregation performance of nullable string key when using a large number of variable length keys. [#51399](https://github.com/ClickHouse/ClickHouse/pull/51399) ([LiuNeng](https://github.com/liuneng1994)).
-* Add a pass in Analyzer for time filter optimization with preimage. The performance experiments of SSB on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) show that this change could bring an improvement of 8.5% to the geomean QPS when the experimental analyzer is enabled. [#52091](https://github.com/ClickHouse/ClickHouse/pull/52091) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Optimize the merge if all hash sets are single-level in the `uniqExact` (COUNT DISTINCT) function. [#52973](https://github.com/ClickHouse/ClickHouse/pull/52973) ([Jiebin Sun](https://github.com/jiebinn)).
-* `Join` table engine: do not clone hash join data structure with all columns. [#53046](https://github.com/ClickHouse/ClickHouse/pull/53046) ([Duc Canh Le](https://github.com/canhld94)).
-* Implement native `ORC` input format without the "apache arrow" library to improve performance. [#53324](https://github.com/ClickHouse/ClickHouse/pull/53324) ([�扬](https://github.com/taiyang-li)).
-* The dashboard will tell the server to compress the data, which is useful for large time frames over slow internet connections. For example, one chart with 86400 points can be 1.5 MB uncompressed and 60 KB compressed with `br`. [#53569](https://github.com/ClickHouse/ClickHouse/pull/53569) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Better utilization of thread pool for BACKUPs and RESTOREs. [#53649](https://github.com/ClickHouse/ClickHouse/pull/53649) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Load filesystem cache metadata on startup in parallel. Configured by `load_metadata_threads` (default: 1) cache config setting. Related to [#52037](https://github.com/ClickHouse/ClickHouse/issues/52037). [#52943](https://github.com/ClickHouse/ClickHouse/pull/52943) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Improve `move_primary_key_columns_to_end_of_prewhere`. [#53337](https://github.com/ClickHouse/ClickHouse/pull/53337) ([Han Fei](https://github.com/hanfei1991)).
-* This optimizes the interaction with ClickHouse Keeper. Previously the caller could register the same watch callback multiple times. In that case each entry was consuming memory and the same callback was called multiple times which didn't make much sense. In order to avoid this the caller could have some logic to not add the same watch multiple times. With this change this deduplication is done internally if the watch callback is passed via shared_ptr. [#53452](https://github.com/ClickHouse/ClickHouse/pull/53452) ([Alexander Gololobov](https://github.com/davenger)).
-* Cache number of rows in files for count in file/s3/url/hdfs/azure functions. The cache can be enabled/disabled by setting `use_cache_for_count_from_files` (enabled by default). Continuation of https://github.com/ClickHouse/ClickHouse/pull/53637. [#53692](https://github.com/ClickHouse/ClickHouse/pull/53692) ([Kruglov Pavel](https://github.com/Avogar)).
-* More careful thread management will improve the speed of the S3 table function over a large number of files by more than ~25%. [#53668](https://github.com/ClickHouse/ClickHouse/pull/53668) ([pufit](https://github.com/pufit)).
-
-#### Improvement
-* Add `stderr_reaction` configuration/setting to control the reaction (none, log or throw) when external command stderr has data. This helps make debugging external command easier. [#43210](https://github.com/ClickHouse/ClickHouse/pull/43210) ([Amos Bird](https://github.com/amosbird)).
-* Add `partition` column to the `system part_log` and merge table. [#48990](https://github.com/ClickHouse/ClickHouse/pull/48990) ([Jianfei Hu](https://github.com/incfly)).
-* The sizes of the (index) uncompressed/mark, mmap and query caches can now be configured dynamically at runtime (without server restart). [#51446](https://github.com/ClickHouse/ClickHouse/pull/51446) ([Robert Schulze](https://github.com/rschu1ze)).
-* If a dictionary is created with a complex key, automatically choose the "complex key" layout variant. [#49587](https://github.com/ClickHouse/ClickHouse/pull/49587) ([xiebin](https://github.com/xbthink)).
-* Add setting `use_concurrency_control` for better testing of the new concurrency control feature. [#49618](https://github.com/ClickHouse/ClickHouse/pull/49618) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added suggestions for mistyped names for databases and tables. [#49801](https://github.com/ClickHouse/ClickHouse/pull/49801) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* While read small files from HDFS by Gluten, we found that it will cost more times when compare to directly query by Spark. And we did something with that. [#50063](https://github.com/ClickHouse/ClickHouse/pull/50063) ([KevinyhZou](https://github.com/KevinyhZou)).
-* There were too many worthless error logs after session expiration, which we didn't like. [#50171](https://github.com/ClickHouse/ClickHouse/pull/50171) ([helifu](https://github.com/helifu)).
-* Introduce fallback ZooKeeper sessions which are time-bound. Fixed `index` column in system.zookeeper_connection for DNS addresses. [#50424](https://github.com/ClickHouse/ClickHouse/pull/50424) ([Anton Kozlov](https://github.com/tonickkozlov)).
-* Add ability to log when max_partitions_per_insert_block is reached. [#50948](https://github.com/ClickHouse/ClickHouse/pull/50948) ([Sean Haynes](https://github.com/seandhaynes)).
-* Added a bunch of custom commands to clickhouse-keeper-client (mostly to make ClickHouse debugging easier). [#51117](https://github.com/ClickHouse/ClickHouse/pull/51117) ([pufit](https://github.com/pufit)).
-* Updated check for connection string in `azureBlobStorage` table function as connection string with "sas" does not always begin with the default endpoint and updated connection URL to include "sas" token after adding Azure's container to URL. [#51141](https://github.com/ClickHouse/ClickHouse/pull/51141) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix description for filtering sets in the `full_sorting_merge` JOIN algorithm. [#51329](https://github.com/ClickHouse/ClickHouse/pull/51329) ([Tanay Tummalapalli](https://github.com/ttanay)).
-* Fixed memory consumption in `Aggregator` when `max_block_size` is huge. [#51566](https://github.com/ClickHouse/ClickHouse/pull/51566) ([Nikita Taranov](https://github.com/nickitat)).
-* Add `SYSTEM SYNC FILESYSTEM CACHE` command. It will compare in-memory state of filesystem cache with what it has on disk and fix in-memory state if needed. This is only needed if you are making manual interventions in on-disk data, which is highly discouraged. [#51622](https://github.com/ClickHouse/ClickHouse/pull/51622) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Attempt to create a generic proxy resolver for CH while keeping backwards compatibility with existing S3 storage conf proxy resolver. [#51749](https://github.com/ClickHouse/ClickHouse/pull/51749) ([Arthur Passos](https://github.com/arthurpassos)).
-* Support reading tuple subcolumns from file/s3/hdfs/url/azureBlobStorage table functions. [#51806](https://github.com/ClickHouse/ClickHouse/pull/51806) ([Kruglov Pavel](https://github.com/Avogar)).
-* Function `arrayIntersect` now returns the values in the order, corresponding to the first argument. Closes [#27622](https://github.com/ClickHouse/ClickHouse/issues/27622). [#51850](https://github.com/ClickHouse/ClickHouse/pull/51850) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Add new queries, which allow to create/drop of access entities in specified access storage or move access entities from one access storage to another. [#51912](https://github.com/ClickHouse/ClickHouse/pull/51912) ([pufit](https://github.com/pufit)).
-* Make `ALTER TABLE FREEZE` queries not replicated in the Replicated database engine. [#52064](https://github.com/ClickHouse/ClickHouse/pull/52064) ([Mike Kot](https://github.com/myrrc)).
-* Added possibility to flush system tables on unexpected shutdown. [#52174](https://github.com/ClickHouse/ClickHouse/pull/52174) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Fix the case when `s3` table function refused to work with pre-signed URLs. close [#50846](https://github.com/ClickHouse/ClickHouse/issues/50846). [#52310](https://github.com/ClickHouse/ClickHouse/pull/52310) ([chen](https://github.com/xiedeyantu)).
-* Add column `name` as an alias to `event` and `metric` in the `system.events` and `system.metrics` tables. Closes [#51257](https://github.com/ClickHouse/ClickHouse/issues/51257). [#52315](https://github.com/ClickHouse/ClickHouse/pull/52315) ([chen](https://github.com/xiedeyantu)).
-* Added support of syntax `CREATE UNIQUE INDEX` in parser as a no-op for better SQL compatibility. `UNIQUE` index is not supported. Set `create_index_ignore_unique = 1` to ignore UNIQUE keyword in queries. [#52320](https://github.com/ClickHouse/ClickHouse/pull/52320) ([Ilya Yatsishin](https://github.com/qoega)).
-* Add support of predefined macro (`{database}` and `{table}`) in some Kafka engine settings: topic, consumer, client_id, etc. [#52386](https://github.com/ClickHouse/ClickHouse/pull/52386) ([Yury Bogomolov](https://github.com/ybogo)).
-* Disable updating the filesystem cache during backup/restore. Filesystem cache must not be updated during backup/restore, it seems it just slows down the process without any profit (because the BACKUP command can read a lot of data and it's no use to put all the data to the filesystem cache and immediately evict it). [#52402](https://github.com/ClickHouse/ClickHouse/pull/52402) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The configuration of S3 endpoint allow using it from the root, and append '/' automatically if needed. [#47809](https://github.com/ClickHouse/ClickHouse/issues/47809). [#52600](https://github.com/ClickHouse/ClickHouse/pull/52600) ([xiaolei565](https://github.com/xiaolei565)).
-* For clickhouse-local allow positional options and populate global UDF settings (user_scripts_path and user_defined_executable_functions_config). [#52643](https://github.com/ClickHouse/ClickHouse/pull/52643) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* `system.asynchronous_metrics` now includes metrics "QueryCacheEntries" and "QueryCacheBytes" to inspect the query cache. [#52650](https://github.com/ClickHouse/ClickHouse/pull/52650) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added possibility to use `s3_storage_class` parameter in the `SETTINGS` clause of the `BACKUP` statement for backups to S3. [#52658](https://github.com/ClickHouse/ClickHouse/pull/52658) ([Roman Vasin](https://github.com/rvasin)).
-* Add utility `print-backup-info.py` which parses a backup metadata file and prints information about the backup. [#52690](https://github.com/ClickHouse/ClickHouse/pull/52690) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Closes [#49510](https://github.com/ClickHouse/ClickHouse/issues/49510). Currently we have database and table names case-sensitive, but BI tools query `information_schema` sometimes in lowercase, sometimes in uppercase. For this reason we have `information_schema` database, containing lowercase tables, such as `information_schema.tables` and `INFORMATION_SCHEMA` database, containing uppercase tables, such as `INFORMATION_SCHEMA.TABLES`. But some tools are querying `INFORMATION_SCHEMA.tables` and `information_schema.TABLES`. The proposed solution is to duplicate both lowercase and uppercase tables in lowercase and uppercase `information_schema` database. [#52695](https://github.com/ClickHouse/ClickHouse/pull/52695) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Query`CHECK TABLE` has better performance and usability (sends progress updates, cancellable). [#52745](https://github.com/ClickHouse/ClickHouse/pull/52745) ([vdimir](https://github.com/vdimir)).
-* Add support for `modulo`, `intDiv`, `intDivOrZero` for tuples by distributing them across tuple's elements. [#52758](https://github.com/ClickHouse/ClickHouse/pull/52758) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Search for default `yaml` and `yml` configs in clickhouse-client after `xml`. [#52767](https://github.com/ClickHouse/ClickHouse/pull/52767) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* When merging into non-'clickhouse' rooted configuration, configs with different root node name just bypassed without exception. [#52770](https://github.com/ClickHouse/ClickHouse/pull/52770) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Now it's possible to specify min (`memory_profiler_sample_min_allocation_size`) and max (`memory_profiler_sample_max_allocation_size`) size for allocations to be tracked with sampling memory profiler. [#52779](https://github.com/ClickHouse/ClickHouse/pull/52779) ([alesapin](https://github.com/alesapin)).
-* Add `precise_float_parsing` setting to switch float parsing methods (fast/precise). [#52791](https://github.com/ClickHouse/ClickHouse/pull/52791) ([Andrey Zvonov](https://github.com/zvonand)).
-* Use the same default paths for `clickhouse-keeper` (symlink) as for `clickhouse-keeper` (executable). [#52861](https://github.com/ClickHouse/ClickHouse/pull/52861) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Improve error message for table function `remote`. Closes [#40220](https://github.com/ClickHouse/ClickHouse/issues/40220). [#52959](https://github.com/ClickHouse/ClickHouse/pull/52959) ([jiyoungyoooo](https://github.com/jiyoungyoooo)).
-* Added the possibility to specify custom storage policy in the `SETTINGS` clause of `RESTORE` queries. [#52970](https://github.com/ClickHouse/ClickHouse/pull/52970) ([Victor Krasnov](https://github.com/sirvickr)).
-* Add the ability to throttle the S3 requests on backup operations (`BACKUP` and `RESTORE` commands now honor `s3_max_[get/put]_[rps/burst]`). [#52974](https://github.com/ClickHouse/ClickHouse/pull/52974) ([Daniel Pozo Escalona](https://github.com/danipozo)).
-* Add settings to ignore ON CLUSTER clause in queries for management of replicated user-defined functions or access control entities with replicated storage. [#52975](https://github.com/ClickHouse/ClickHouse/pull/52975) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* EXPLAIN actions for JOIN step. [#53006](https://github.com/ClickHouse/ClickHouse/pull/53006) ([Maksim Kita](https://github.com/kitaisreal)).
-* Make `hasTokenOrNull` and `hasTokenCaseInsensitiveOrNull` return null for empty needles. [#53059](https://github.com/ClickHouse/ClickHouse/pull/53059) ([ltrk2](https://github.com/ltrk2)).
-* Allow to restrict allowed paths for filesystem caches. Mainly useful for dynamic disks. If in server config `filesystem_caches_path` is specified, all filesystem caches' paths will be restricted to this directory. E.g. if the `path` in cache config is relative - it will be put in `filesystem_caches_path`; if `path` in cache config is absolute, it will be required to lie inside `filesystem_caches_path`. If `filesystem_caches_path` is not specified in config, then behaviour will be the same as in earlier versions. [#53124](https://github.com/ClickHouse/ClickHouse/pull/53124) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Added a bunch of custom commands (mostly to make ClickHouse debugging easier). [#53127](https://github.com/ClickHouse/ClickHouse/pull/53127) ([pufit](https://github.com/pufit)).
-* Add diagnostic info about file name during schema inference - it helps when you process multiple files with globs. [#53135](https://github.com/ClickHouse/ClickHouse/pull/53135) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Client will load suggestions using the main connection if the second connection is not allowed to create a session. [#53177](https://github.com/ClickHouse/ClickHouse/pull/53177) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Add EXCEPT clause to `SYSTEM STOP/START LISTEN QUERIES [ALL/DEFAULT/CUSTOM]` query, for example `SYSTEM STOP LISTEN QUERIES ALL EXCEPT TCP, HTTP`. [#53280](https://github.com/ClickHouse/ClickHouse/pull/53280) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Change the default of `max_concurrent_queries` from 100 to 1000. It's ok to have many concurrent queries if they are not heavy, and mostly waiting for the network. Note: don't confuse concurrent queries and QPS: for example, ClickHouse server can do tens of thousands of QPS with less than 100 concurrent queries. [#53285](https://github.com/ClickHouse/ClickHouse/pull/53285) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Limit number of concurrent background partition optimize merges. [#53405](https://github.com/ClickHouse/ClickHouse/pull/53405) ([Duc Canh Le](https://github.com/canhld94)).
-* Added a setting `allow_moving_table_directory_to_trash` that allows to ignore `Directory for table data already exists` error when replicating/recovering a `Replicated` database. [#53425](https://github.com/ClickHouse/ClickHouse/pull/53425) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* If server settings `asynchronous_metrics_update_period_s` and `asynchronous_heavy_metrics_update_period_s` are misconfigured to 0, it will now fail gracefully instead of terminating the application. [#53428](https://github.com/ClickHouse/ClickHouse/pull/53428) ([Robert Schulze](https://github.com/rschu1ze)).
-* The ClickHouse server now respects memory limits changed via cgroups when reloading its configuration. [#53455](https://github.com/ClickHouse/ClickHouse/pull/53455) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add ability to turn off flush of Distributed tables on `DETACH`, `DROP`, or server shutdown. [#53501](https://github.com/ClickHouse/ClickHouse/pull/53501) ([Azat Khuzhin](https://github.com/azat)).
-* The `domainRFC` function now supports IPv6 in square brackets. [#53506](https://github.com/ClickHouse/ClickHouse/pull/53506) ([Chen768959](https://github.com/Chen768959)).
-* Use longer timeout for S3 CopyObject requests, which are used in backups. [#53533](https://github.com/ClickHouse/ClickHouse/pull/53533) ([Michael Kolupaev](https://github.com/al13n321)).
-* Added server setting `aggregate_function_group_array_max_element_size`. This setting is used to limit array size for `groupArray` function at serialization. The default value is `16777215`. [#53550](https://github.com/ClickHouse/ClickHouse/pull/53550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* `SCHEMA` was added as alias for `DATABASE` to improve MySQL compatibility. [#53587](https://github.com/ClickHouse/ClickHouse/pull/53587) ([Daniël van Eeden](https://github.com/dveeden)).
-* Add asynchronous metrics about tables in the system database. For example, `TotalBytesOfMergeTreeTablesSystem`. This closes [#53603](https://github.com/ClickHouse/ClickHouse/issues/53603). [#53604](https://github.com/ClickHouse/ClickHouse/pull/53604) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* SQL editor in the Play UI and Dashboard will not use Grammarly. [#53614](https://github.com/ClickHouse/ClickHouse/pull/53614) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* As expert-level settings, it is now possible to (1) configure the size_ratio (i.e. the relative size of the protected queue) of the [index] mark/uncompressed caches, (2) configure the cache policy of the index mark and index uncompressed caches. [#53657](https://github.com/ClickHouse/ClickHouse/pull/53657) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added client info validation to the query packet in TCPHandler. [#53673](https://github.com/ClickHouse/ClickHouse/pull/53673) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Retry loading parts in case of network errors while interaction with Microsoft Azure. [#53750](https://github.com/ClickHouse/ClickHouse/pull/53750) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Stacktrace for exceptions, Materailized view exceptions are propagated. [#53766](https://github.com/ClickHouse/ClickHouse/pull/53766) ([Ilya Golshtein](https://github.com/ilejn)).
-* If no hostname or port were specified, keeper client will try to search for a connection string in the ClickHouse's config.xml. [#53769](https://github.com/ClickHouse/ClickHouse/pull/53769) ([pufit](https://github.com/pufit)).
-* Add profile event `PartsLockMicroseconds` which shows the amount of microseconds we hold the data parts lock in MergeTree table engine family. [#53797](https://github.com/ClickHouse/ClickHouse/pull/53797) ([alesapin](https://github.com/alesapin)).
-* Make reconnect limit in RAFT limits configurable for keeper. This configuration can help to make keeper to rebuild connection with peers quicker if the current connection is broken. [#53817](https://github.com/ClickHouse/ClickHouse/pull/53817) ([Pengyuan Bian](https://github.com/bianpengyuan)).
-* Ignore foreign keys in tables definition to improve compatibility with MySQL, so a user wouldn't need to rewrite his SQL of the foreign key part, ref [#53380](https://github.com/ClickHouse/ClickHouse/issues/53380). [#53864](https://github.com/ClickHouse/ClickHouse/pull/53864) ([jsc0218](https://github.com/jsc0218)).
-
-#### Build/Testing/Packaging Improvement
-* Don't expose symbols from ClickHouse binary to dynamic linker. It might fix [#43933](https://github.com/ClickHouse/ClickHouse/issues/43933). [#47475](https://github.com/ClickHouse/ClickHouse/pull/47475) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add `clickhouse-keeper-client` symlink to the clickhouse-server package. [#51882](https://github.com/ClickHouse/ClickHouse/pull/51882) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Add https://github.com/elliotchance/sqltest to CI to report the SQL 2016 conformance. [#52293](https://github.com/ClickHouse/ClickHouse/pull/52293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Upgrade PRQL to 0.9.3. [#53060](https://github.com/ClickHouse/ClickHouse/pull/53060) ([Maximilian Roos](https://github.com/max-sixty)).
-* System tables from CI checks are exported to ClickHouse Cloud. [#53086](https://github.com/ClickHouse/ClickHouse/pull/53086) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The compiler's profile data (`-ftime-trace`) is uploaded to ClickHouse Cloud. [#53100](https://github.com/ClickHouse/ClickHouse/pull/53100) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Speed up Debug and Tidy builds. [#53178](https://github.com/ClickHouse/ClickHouse/pull/53178) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Speed up the build by removing tons and tonnes of garbage. One of the frequently included headers was poisoned by boost. [#53180](https://github.com/ClickHouse/ClickHouse/pull/53180) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove even more garbage. [#53182](https://github.com/ClickHouse/ClickHouse/pull/53182) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The function `arrayAUC` was using heavy C++ templates - ditched them. [#53183](https://github.com/ClickHouse/ClickHouse/pull/53183) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Some translation units were always rebuilt regardless of ccache. The culprit is found and fixed. [#53184](https://github.com/ClickHouse/ClickHouse/pull/53184) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The compiler's profile data (`-ftime-trace`) is uploaded to ClickHouse Cloud., the second attempt after [#53100](https://github.com/ClickHouse/ClickHouse/issues/53100). [#53213](https://github.com/ClickHouse/ClickHouse/pull/53213) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Export logs from CI in stateful tests to ClickHouse Cloud. [#53351](https://github.com/ClickHouse/ClickHouse/pull/53351) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Export logs from CI in stress tests. [#53353](https://github.com/ClickHouse/ClickHouse/pull/53353) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Export logs from CI in fuzzer. [#53354](https://github.com/ClickHouse/ClickHouse/pull/53354) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Preserve environment parameters in `clickhouse start` command. Fixes [#51962](https://github.com/ClickHouse/ClickHouse/issues/51962). [#53418](https://github.com/ClickHouse/ClickHouse/pull/53418) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Follow up for [#53418](https://github.com/ClickHouse/ClickHouse/issues/53418). Small improvements for install_check.py, adding tests for proper ENV parameters passing to the main process on `init.d start`. [#53457](https://github.com/ClickHouse/ClickHouse/pull/53457) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Reorganize file management in CMake to prevent potential duplications. For instance, `indexHint.cpp` is duplicated in both `dbms_sources` and `clickhouse_functions_sources`. [#53621](https://github.com/ClickHouse/ClickHouse/pull/53621) ([Amos Bird](https://github.com/amosbird)).
-* Upgrade snappy to 1.1.10. [#53672](https://github.com/ClickHouse/ClickHouse/pull/53672) ([�扬](https://github.com/taiyang-li)).
-* Slightly improve cmake build by sanitizing some dependencies and removing some duplicates. Each commit includes a short description of the changes made. [#53759](https://github.com/ClickHouse/ClickHouse/pull/53759) ([Amos Bird](https://github.com/amosbird)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Do not reset (experimental) Annoy index during build-up with more than one mark [#51325](https://github.com/ClickHouse/ClickHouse/pull/51325) ([Tian Xinhui](https://github.com/xinhuitian)).
-* Fix usage of temporary directories during RESTORE [#51493](https://github.com/ClickHouse/ClickHouse/pull/51493) ([Azat Khuzhin](https://github.com/azat)).
-* Fix binary arithmetic for Nullable(IPv4) [#51642](https://github.com/ClickHouse/ClickHouse/pull/51642) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Support IPv4 and IPv6 data types as dictionary attributes [#51756](https://github.com/ClickHouse/ClickHouse/pull/51756) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* A fix for checksum of compress marks [#51777](https://github.com/ClickHouse/ClickHouse/pull/51777) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix mistakenly comma parsing as part of datetime in CSV best effort parsing [#51950](https://github.com/ClickHouse/ClickHouse/pull/51950) ([Kruglov Pavel](https://github.com/Avogar)).
-* Don't throw exception when executable UDF has parameters [#51961](https://github.com/ClickHouse/ClickHouse/pull/51961) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix recalculation of skip indexes and projections in `ALTER DELETE` queries [#52530](https://github.com/ClickHouse/ClickHouse/pull/52530) ([Anton Popov](https://github.com/CurtizJ)).
-* MaterializedMySQL: Fix the infinite loop in ReadBuffer::read [#52621](https://github.com/ClickHouse/ClickHouse/pull/52621) ([Val Doroshchuk](https://github.com/valbok)).
-* Load suggestion only with `clickhouse` dialect [#52628](https://github.com/ClickHouse/ClickHouse/pull/52628) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Init and destroy ares channel on demand. [#52634](https://github.com/ClickHouse/ClickHouse/pull/52634) ([Arthur Passos](https://github.com/arthurpassos)).
-* Fix filtering by virtual columns with OR expression [#52653](https://github.com/ClickHouse/ClickHouse/pull/52653) ([Azat Khuzhin](https://github.com/azat)).
-* Fix crash in function `tuple` with one sparse column argument [#52659](https://github.com/ClickHouse/ClickHouse/pull/52659) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix named collections on cluster [#52687](https://github.com/ClickHouse/ClickHouse/pull/52687) ([Al Korgun](https://github.com/alkorgun)).
-* Fix reading of unnecessary column in case of multistage `PREWHERE` [#52689](https://github.com/ClickHouse/ClickHouse/pull/52689) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix unexpected sort result on multi columns with nulls first direction [#52761](https://github.com/ClickHouse/ClickHouse/pull/52761) ([copperybean](https://github.com/copperybean)).
-* Fix data race in Keeper reconfiguration [#52804](https://github.com/ClickHouse/ClickHouse/pull/52804) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix sorting of sparse columns with large limit [#52827](https://github.com/ClickHouse/ClickHouse/pull/52827) ([Anton Popov](https://github.com/CurtizJ)).
-* clickhouse-keeper: fix implementation of server with poll. [#52833](https://github.com/ClickHouse/ClickHouse/pull/52833) ([Andy Fiddaman](https://github.com/citrus-it)).
-* Make regexp analyzer recognize named capturing groups [#52840](https://github.com/ClickHouse/ClickHouse/pull/52840) ([Han Fei](https://github.com/hanfei1991)).
-* Fix possible assert in `~PushingAsyncPipelineExecutor` in clickhouse-local [#52862](https://github.com/ClickHouse/ClickHouse/pull/52862) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix reading of empty `Nested(Array(LowCardinality(...)))` [#52949](https://github.com/ClickHouse/ClickHouse/pull/52949) ([Anton Popov](https://github.com/CurtizJ)).
-* Added new tests for session_log and fixed the inconsistency between login and logout. [#52958](https://github.com/ClickHouse/ClickHouse/pull/52958) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Fix password leak in show create mysql table [#52962](https://github.com/ClickHouse/ClickHouse/pull/52962) ([Duc Canh Le](https://github.com/canhld94)).
-* Convert sparse column format to full in CreateSetAndFilterOnTheFlyStep [#53000](https://github.com/ClickHouse/ClickHouse/pull/53000) ([vdimir](https://github.com/vdimir)).
-* Fix rare race condition with empty key prefix directory deletion in fs cache [#53055](https://github.com/ClickHouse/ClickHouse/pull/53055) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix ZstdDeflatingWriteBuffer truncating the output sometimes [#53064](https://github.com/ClickHouse/ClickHouse/pull/53064) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix query_id in part_log with async flush queries [#53103](https://github.com/ClickHouse/ClickHouse/pull/53103) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix possible error from cache "Read unexpected size" [#53121](https://github.com/ClickHouse/ClickHouse/pull/53121) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Disable the new parquet encoder [#53130](https://github.com/ClickHouse/ClickHouse/pull/53130) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix "Not-ready Set" exception [#53162](https://github.com/ClickHouse/ClickHouse/pull/53162) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix character escaping in the PostgreSQL engine [#53250](https://github.com/ClickHouse/ClickHouse/pull/53250) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Experimental session_log table: Added new tests for session_log and fixed the inconsistency between login and logout. [#53255](https://github.com/ClickHouse/ClickHouse/pull/53255) ([Alexey Gerasimchuck](https://github.com/Demilivor)). Fixed inconsistency between login success and logout [#53302](https://github.com/ClickHouse/ClickHouse/pull/53302) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Fix adding sub-second intervals to DateTime [#53309](https://github.com/ClickHouse/ClickHouse/pull/53309) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix "Context has expired" error in dictionaries [#53342](https://github.com/ClickHouse/ClickHouse/pull/53342) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix incorrect normal projection AST format [#53347](https://github.com/ClickHouse/ClickHouse/pull/53347) ([Amos Bird](https://github.com/amosbird)).
-* Forbid use_structure_from_insertion_table_in_table_functions when execute Scalar [#53348](https://github.com/ClickHouse/ClickHouse/pull/53348) ([flynn](https://github.com/ucasfl)).
-* Fix loading lazy database during system.table select query [#53372](https://github.com/ClickHouse/ClickHouse/pull/53372) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fixed system.data_skipping_indices for MaterializedMySQL [#53381](https://github.com/ClickHouse/ClickHouse/pull/53381) ([Filipp Ozinov](https://github.com/bakwc)).
-* Fix processing single carriage return in TSV file segmentation engine [#53407](https://github.com/ClickHouse/ClickHouse/pull/53407) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix `Context has expired` error properly [#53433](https://github.com/ClickHouse/ClickHouse/pull/53433) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix `timeout_overflow_mode` when having subquery in the rhs of IN [#53439](https://github.com/ClickHouse/ClickHouse/pull/53439) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix an unexpected behavior in [#53152](https://github.com/ClickHouse/ClickHouse/issues/53152) [#53440](https://github.com/ClickHouse/ClickHouse/pull/53440) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Fix JSON_QUERY Function parse error while path is all number [#53470](https://github.com/ClickHouse/ClickHouse/pull/53470) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Fix wrong columns order for queries with parallel FINAL. [#53489](https://github.com/ClickHouse/ClickHouse/pull/53489) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed SELECTing from ReplacingMergeTree with do_not_merge_across_partitions_select_final [#53511](https://github.com/ClickHouse/ClickHouse/pull/53511) ([Vasily Nemkov](https://github.com/Enmk)).
-* Flush async insert queue first on shutdown [#53547](https://github.com/ClickHouse/ClickHouse/pull/53547) ([joelynch](https://github.com/joelynch)).
-* Fix crash in join on sparse columna [#53548](https://github.com/ClickHouse/ClickHouse/pull/53548) ([vdimir](https://github.com/vdimir)).
-* Fix possible UB in Set skipping index for functions with incorrect args [#53559](https://github.com/ClickHouse/ClickHouse/pull/53559) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible UB in inverted indexes (experimental feature) [#53560](https://github.com/ClickHouse/ClickHouse/pull/53560) ([Azat Khuzhin](https://github.com/azat)).
-* Fix: interpolate expression takes source column instead of same name aliased from select expression. [#53572](https://github.com/ClickHouse/ClickHouse/pull/53572) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix number of dropped granules in EXPLAIN PLAN index=1 [#53616](https://github.com/ClickHouse/ClickHouse/pull/53616) ([wangxiaobo](https://github.com/wzb5212)).
-* Correctly handle totals and extremes with `DelayedSource` [#53644](https://github.com/ClickHouse/ClickHouse/pull/53644) ([Antonio Andelic](https://github.com/antonio2368)).
-* Prepared set cache in mutation pipeline stuck [#53645](https://github.com/ClickHouse/ClickHouse/pull/53645) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix bug on mutations with subcolumns of type JSON in predicates of UPDATE and DELETE queries. [#53677](https://github.com/ClickHouse/ClickHouse/pull/53677) ([VanDarkholme7](https://github.com/VanDarkholme7)).
-* Fix filter pushdown for full_sorting_merge join [#53699](https://github.com/ClickHouse/ClickHouse/pull/53699) ([vdimir](https://github.com/vdimir)).
-* Try to fix bug with `NULL::LowCardinality(Nullable(...)) NOT IN` [#53706](https://github.com/ClickHouse/ClickHouse/pull/53706) ([Andrey Zvonov](https://github.com/zvonand)).
-* Fix: sorted distinct with sparse columns [#53711](https://github.com/ClickHouse/ClickHouse/pull/53711) ([Igor Nikonov](https://github.com/devcrafter)).
-* `transform`: correctly handle default column with multiple rows [#53742](https://github.com/ClickHouse/ClickHouse/pull/53742) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix fuzzer crash in parseDateTime [#53764](https://github.com/ClickHouse/ClickHouse/pull/53764) ([Robert Schulze](https://github.com/rschu1ze)).
-* MaterializedPostgreSQL: fix uncaught exception in getCreateTableQueryImpl [#53832](https://github.com/ClickHouse/ClickHouse/pull/53832) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix possible segfault while using PostgreSQL engine [#53847](https://github.com/ClickHouse/ClickHouse/pull/53847) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix named_collection_admin alias [#54066](https://github.com/ClickHouse/ClickHouse/pull/54066) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
-### <a id="237"></a> ClickHouse release 23.7, 2023-07-27
-
-#### Backward Incompatible Change
-* Add `NAMED COLLECTION` access type (aliases `USE NAMED COLLECTION`, `NAMED COLLECTION USAGE`). This PR is backward incompatible because this access type is disabled by default (because a parent access type `NAMED COLLECTION ADMIN` is disabled by default as well). Proposed in [#50277](https://github.com/ClickHouse/ClickHouse/issues/50277). To grant use `GRANT NAMED COLLECTION ON collection_name TO user` or `GRANT NAMED COLLECTION ON * TO user`, to be able to give these grants `named_collection_admin` is required in config (previously it was named `named_collection_control`, so will remain as an alias). [#50625](https://github.com/ClickHouse/ClickHouse/pull/50625) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fixing a typo in the `system.parts` column name `last_removal_attemp_time`. Now it is named `last_removal_attempt_time`. [#52104](https://github.com/ClickHouse/ClickHouse/pull/52104) ([filimonov](https://github.com/filimonov)).
-* Bump version of the distributed_ddl_entry_format_version to 5 by default (enables opentelemetry and initial_query_idd pass through). This will not allow to process existing entries for distributed DDL after *downgrade* (but note, that usually there should be no such unprocessed entries). [#52128](https://github.com/ClickHouse/ClickHouse/pull/52128) ([Azat Khuzhin](https://github.com/azat)).
-* Check projection metadata the same way we check ordinary metadata. This change may prevent the server from starting in case there was a table with an invalid projection. An example is a projection that created positional columns in PK (e.g. `projection p (select * order by 1, 4)` which is not allowed in table PK and can cause a crash during insert/merge). Drop such projections before the update. Fixes [#52353](https://github.com/ClickHouse/ClickHouse/issues/52353). [#52361](https://github.com/ClickHouse/ClickHouse/pull/52361) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* The experimental feature `hashid` is removed due to a bug. The quality of implementation was questionable at the start, and it didn't get through the experimental status. This closes [#52406](https://github.com/ClickHouse/ClickHouse/issues/52406). [#52449](https://github.com/ClickHouse/ClickHouse/pull/52449) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### New Feature
-* Added `Overlay` database engine to combine multiple databases into one. Added `Filesystem` database engine to represent a directory in the filesystem as a set of implicitly available tables with auto-detected formats and structures. A new `S3` database engine allows to read-only interact with s3 storage by representing a prefix as a set of tables. A new `HDFS` database engine allows to interact with HDFS storage in the same way. [#48821](https://github.com/ClickHouse/ClickHouse/pull/48821) ([alekseygolub](https://github.com/alekseygolub)).
-* Add support for external disks in Keeper for storing snapshots and logs. [#50098](https://github.com/ClickHouse/ClickHouse/pull/50098) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add support for multi-directory selection (`{}`) globs. [#50559](https://github.com/ClickHouse/ClickHouse/pull/50559) ([Andrey Zvonov](https://github.com/zvonand)).
-* Kafka connector can fetch Avro schema from schema registry with basic authentication using url-encoded credentials. [#49664](https://github.com/ClickHouse/ClickHouse/pull/49664) ([Ilya Golshtein](https://github.com/ilejn)).
-* Add function `arrayJaccardIndex` which computes the Jaccard similarity between two arrays. [#50076](https://github.com/ClickHouse/ClickHouse/pull/50076) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Add a column `is_obsolete` to `system.settings` and similar tables. Closes [#50819](https://github.com/ClickHouse/ClickHouse/issues/50819). [#50826](https://github.com/ClickHouse/ClickHouse/pull/50826) ([flynn](https://github.com/ucasfl)).
-* Implement support of encrypted elements in configuration file. Added possibility to use encrypted text in leaf elements of configuration file. The text is encrypted using encryption codecs from `<encryption_codecs>` section. [#50986](https://github.com/ClickHouse/ClickHouse/pull/50986) ([Roman Vasin](https://github.com/rvasin)).
-* Grace Hash Join algorithm is now applicable to FULL and RIGHT JOINs. [#49483](https://github.com/ClickHouse/ClickHouse/issues/49483). [#51013](https://github.com/ClickHouse/ClickHouse/pull/51013) ([lgbo](https://github.com/lgbo-ustc)).
-* Add `SYSTEM STOP LISTEN` query for more graceful termination. Closes [#47972](https://github.com/ClickHouse/ClickHouse/issues/47972). [#51016](https://github.com/ClickHouse/ClickHouse/pull/51016) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add `input_format_csv_allow_variable_number_of_columns` options. [#51273](https://github.com/ClickHouse/ClickHouse/pull/51273) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Another boring feature: add function `substring_index`, as in Spark or MySQL. [#51472](https://github.com/ClickHouse/ClickHouse/pull/51472) ([�扬](https://github.com/taiyang-li)).
-* A system table `jemalloc_bins` to show stats for jemalloc bins. Example `SELECT *, size * (nmalloc - ndalloc) AS allocated_bytes FROM system.jemalloc_bins WHERE allocated_bytes > 0 ORDER BY allocated_bytes DESC LIMIT 10`. Enjoy. [#51674](https://github.com/ClickHouse/ClickHouse/pull/51674) ([Alexander Gololobov](https://github.com/davenger)).
-* Add `RowBinaryWithDefaults` format with extra byte before each column as a flag for using the column's default value. Closes [#50854](https://github.com/ClickHouse/ClickHouse/issues/50854). [#51695](https://github.com/ClickHouse/ClickHouse/pull/51695) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added `default_temporary_table_engine` setting. Same as `default_table_engine` but for temporary tables. [#51292](https://github.com/ClickHouse/ClickHouse/issues/51292). [#51708](https://github.com/ClickHouse/ClickHouse/pull/51708) ([velavokr](https://github.com/velavokr)).
-* Added new `initcap` / `initcapUTF8` functions which convert the first letter of each word to upper case and the rest to lower case. [#51735](https://github.com/ClickHouse/ClickHouse/pull/51735) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Create table now supports `PRIMARY KEY` syntax in column definition. Columns are added to primary index in the same order columns are defined. [#51881](https://github.com/ClickHouse/ClickHouse/pull/51881) ([Ilya Yatsishin](https://github.com/qoega)).
-* Added the possibility to use date and time format specifiers in log and error log file names, either in config files (`log` and `errorlog` tags) or command line arguments (`--log-file` and `--errorlog-file`). [#51945](https://github.com/ClickHouse/ClickHouse/pull/51945) ([Victor Krasnov](https://github.com/sirvickr)).
-* Added Peak Memory Usage statistic to HTTP headers. [#51946](https://github.com/ClickHouse/ClickHouse/pull/51946) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Added new `hasSubsequence` (+`CaseInsensitive` and `UTF8` versions) functions to match subsequences in strings. [#52050](https://github.com/ClickHouse/ClickHouse/pull/52050) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Add `array_agg` as alias of `groupArray` for PostgreSQL compatibility. Closes [#52100](https://github.com/ClickHouse/ClickHouse/issues/52100). ### Documentation entry for user-facing changes. [#52135](https://github.com/ClickHouse/ClickHouse/pull/52135) ([flynn](https://github.com/ucasfl)).
-* Add `any_value` as a compatibility alias for `any` aggregate function. Closes [#52140](https://github.com/ClickHouse/ClickHouse/issues/52140). [#52147](https://github.com/ClickHouse/ClickHouse/pull/52147) ([flynn](https://github.com/ucasfl)).
-* Add aggregate function `array_concat_agg` for compatibility with BigQuery, it's alias of `groupArrayArray`. Closes [#52139](https://github.com/ClickHouse/ClickHouse/issues/52139). [#52149](https://github.com/ClickHouse/ClickHouse/pull/52149) ([flynn](https://github.com/ucasfl)).
-* Add `OCTET_LENGTH` as an alias to `length`. Closes [#52153](https://github.com/ClickHouse/ClickHouse/issues/52153). [#52176](https://github.com/ClickHouse/ClickHouse/pull/52176) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Added `firstLine` function to extract the first line from the multi-line string. This closes [#51172](https://github.com/ClickHouse/ClickHouse/issues/51172). [#52209](https://github.com/ClickHouse/ClickHouse/pull/52209) ([Mikhail Koviazin](https://github.com/mkmkme)).
-* Implement KQL-style formatting for the `Interval` data type. This is only needed for compatibility with the `Kusto` query language. [#45671](https://github.com/ClickHouse/ClickHouse/pull/45671) ([ltrk2](https://github.com/ltrk2)).
-* Added query `SYSTEM FLUSH ASYNC INSERT QUEUE` which flushes all pending asynchronous inserts to the destination tables. Added a server-side setting `async_insert_queue_flush_on_shutdown` (`true` by default) which determines whether to flush queue of asynchronous inserts on graceful shutdown. Setting `async_insert_threads` is now a server-side setting. [#49160](https://github.com/ClickHouse/ClickHouse/pull/49160) ([Anton Popov](https://github.com/CurtizJ)).
-* Aliases `current_database` and a new function `current_schemas` for compatibility with PostgreSQL. [#51076](https://github.com/ClickHouse/ClickHouse/pull/51076) ([Pedro Riera](https://github.com/priera)).
-* Add alias for functions `today` (now available under the `curdate`/`current_date` names) and `now` (`current_timestamp`). [#52106](https://github.com/ClickHouse/ClickHouse/pull/52106) ([Lloyd-Pottiger](https://github.com/Lloyd-Pottiger)).
-* Support `async_deduplication_token` for async insert. [#52136](https://github.com/ClickHouse/ClickHouse/pull/52136) ([Han Fei](https://github.com/hanfei1991)).
-* Add new setting `disable_url_encoding` that allows to disable decoding/encoding path in uri in URL engine. [#52337](https://github.com/ClickHouse/ClickHouse/pull/52337) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Performance Improvement
-* Enable automatic selection of the sparse serialization format by default. It improves performance. The format is supported since version 22.1. After this change, downgrading to versions older than 22.1 might not be possible. A downgrade may require to set `ratio_of_defaults_for_sparse_serialization=0.9375` [55153](https://github.com/ClickHouse/ClickHouse/issues/55153). You can turn off the usage of the sparse serialization format by providing the `ratio_of_defaults_for_sparse_serialization = 1` setting for your MergeTree tables. [#49631](https://github.com/ClickHouse/ClickHouse/pull/49631) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Enable `move_all_conditions_to_prewhere` and `enable_multiple_prewhere_read_steps` settings by default. [#46365](https://github.com/ClickHouse/ClickHouse/pull/46365) ([Alexander Gololobov](https://github.com/davenger)).
-* Improves performance of some queries by tuning allocator. [#46416](https://github.com/ClickHouse/ClickHouse/pull/46416) ([Azat Khuzhin](https://github.com/azat)).
-* Now we use fixed-size tasks in `MergeTreePrefetchedReadPool` as in `MergeTreeReadPool`. Also from now we use connection pool for S3 requests. [#49732](https://github.com/ClickHouse/ClickHouse/pull/49732) ([Nikita Taranov](https://github.com/nickitat)).
-* More pushdown to the right side of join. [#50532](https://github.com/ClickHouse/ClickHouse/pull/50532) ([Nikita Taranov](https://github.com/nickitat)).
-* Improve grace_hash join by reserving hash table's size (resubmit). [#50875](https://github.com/ClickHouse/ClickHouse/pull/50875) ([lgbo](https://github.com/lgbo-ustc)).
-* Waiting on lock in `OpenedFileCache` could be noticeable sometimes. We sharded it into multiple sub-maps (each with its own lock) to avoid contention. [#51341](https://github.com/ClickHouse/ClickHouse/pull/51341) ([Nikita Taranov](https://github.com/nickitat)).
-* Move conditions with primary key columns to the end of PREWHERE chain. The idea is that conditions with PK columns are likely to be used in PK analysis and will not contribute much more to PREWHERE filtering. [#51958](https://github.com/ClickHouse/ClickHouse/pull/51958) ([Alexander Gololobov](https://github.com/davenger)).
-* Speed up `COUNT(DISTINCT)` for String types by inlining SipHash. The performance experiments of *OnTime* on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) show that this change could bring an improvement of *11.6%* to the QPS of the query *Q8* while having no impact on others. [#52036](https://github.com/ClickHouse/ClickHouse/pull/52036) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Enable `allow_vertical_merges_from_compact_to_wide_parts` by default. It will save memory usage during merges. [#52295](https://github.com/ClickHouse/ClickHouse/pull/52295) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix incorrect projection analysis which invalidates primary keys. This issue only exists when `query_plan_optimize_primary_key = 1, query_plan_optimize_projection = 1`. This fixes [#48823](https://github.com/ClickHouse/ClickHouse/issues/48823). This fixes [#51173](https://github.com/ClickHouse/ClickHouse/issues/51173). [#52308](https://github.com/ClickHouse/ClickHouse/pull/52308) ([Amos Bird](https://github.com/amosbird)).
-* Reduce the number of syscalls in `FileCache::loadMetadata` - this speeds up server startup if the filesystem cache is configured. [#52435](https://github.com/ClickHouse/ClickHouse/pull/52435) ([Raúl Marín](https://github.com/Algunenano)).
-* Allow to have strict lower boundary for file segment size by downloading remaining data in the background. Minimum size of file segment (if actual file size is bigger) is configured as cache configuration setting `boundary_alignment`, by default `4Mi`. Number of background threads are configured as cache configuration setting `background_download_threads`, by default `2`. Also `max_file_segment_size` was increased from `8Mi` to `32Mi` in this PR. [#51000](https://github.com/ClickHouse/ClickHouse/pull/51000) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Decreased default timeouts for S3 from 30 seconds to 3 seconds, and for other HTTP from 180 seconds to 30 seconds. [#51171](https://github.com/ClickHouse/ClickHouse/pull/51171) ([Michael Kolupaev](https://github.com/al13n321)).
-* New setting `merge_tree_determine_task_size_by_prewhere_columns` added. If set to `true` only sizes of the columns from `PREWHERE` section will be considered to determine reading task size. Otherwise all the columns from query are considered. [#52606](https://github.com/ClickHouse/ClickHouse/pull/52606) ([Nikita Taranov](https://github.com/nickitat)).
-
-#### Improvement
-* Use read_bytes/total_bytes_to_read for progress bar in s3/file/url/... table functions for better progress indication. [#51286](https://github.com/ClickHouse/ClickHouse/pull/51286) ([Kruglov Pavel](https://github.com/Avogar)).
-* Introduce a table setting `wait_for_unique_parts_send_before_shutdown_ms` which specify the amount of time replica will wait before closing interserver handler for replicated sends. Also fix inconsistency with shutdown of tables and interserver handlers: now server shutdown tables first and only after it shut down interserver handlers. [#51851](https://github.com/ClickHouse/ClickHouse/pull/51851) ([alesapin](https://github.com/alesapin)).
-* Allow SQL standard `FETCH` without `OFFSET`. See https://antonz.org/sql-fetch/. [#51293](https://github.com/ClickHouse/ClickHouse/pull/51293) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Allow filtering HTTP headers for the URL/S3 table functions with the new `http_forbid_headers` section in config. Both exact matching and regexp filters are available. [#51038](https://github.com/ClickHouse/ClickHouse/pull/51038) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Don't show messages about `16 EiB` free space in logs, as they don't make sense. This closes [#49320](https://github.com/ClickHouse/ClickHouse/issues/49320). [#49342](https://github.com/ClickHouse/ClickHouse/pull/49342) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Properly check the limit for the `sleepEachRow` function. Add a setting `function_sleep_max_microseconds_per_block`. This is needed for generic query fuzzer. [#49343](https://github.com/ClickHouse/ClickHouse/pull/49343) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix two issues in `geoHash` functions. [#50066](https://github.com/ClickHouse/ClickHouse/pull/50066) ([�扬](https://github.com/taiyang-li)).
-* Log async insert flush queries into `system.query_log`. [#51160](https://github.com/ClickHouse/ClickHouse/pull/51160) ([Raúl Marín](https://github.com/Algunenano)).
-* Functions `date_diff` and `age` now support millisecond/microsecond unit and work with microsecond precision. [#51291](https://github.com/ClickHouse/ClickHouse/pull/51291) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Improve parsing of path in clickhouse-keeper-client. [#51359](https://github.com/ClickHouse/ClickHouse/pull/51359) ([Azat Khuzhin](https://github.com/azat)).
-* A third-party product depending on ClickHouse (Gluten: a Plugin to Double SparkSQL's Performance) had a bug. This fix avoids heap overflow in that third-party product while reading from HDFS. [#51386](https://github.com/ClickHouse/ClickHouse/pull/51386) ([�扬](https://github.com/taiyang-li)).
-* Add ability to disable native copy for S3 (setting for BACKUP/RESTORE `allow_s3_native_copy`, and `s3_allow_native_copy` for `s3`/`s3_plain` disks). [#51448](https://github.com/ClickHouse/ClickHouse/pull/51448) ([Azat Khuzhin](https://github.com/azat)).
-* Add column `primary_key_size` to `system.parts` table to show compressed primary key size on disk. Closes [#51400](https://github.com/ClickHouse/ClickHouse/issues/51400). [#51496](https://github.com/ClickHouse/ClickHouse/pull/51496) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
-* Allow running `clickhouse-local` without procfs, without home directory existing, and without name resolution plugins from glibc. [#51518](https://github.com/ClickHouse/ClickHouse/pull/51518) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add placeholder `%a` for rull filename in rename_files_after_processing setting. [#51603](https://github.com/ClickHouse/ClickHouse/pull/51603) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add column `modification_time` into `system.parts_columns`. [#51685](https://github.com/ClickHouse/ClickHouse/pull/51685) ([Azat Khuzhin](https://github.com/azat)).
-* Add new setting `input_format_csv_use_default_on_bad_values` to CSV format that allows to insert default value when parsing of a single field failed. [#51716](https://github.com/ClickHouse/ClickHouse/pull/51716) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Added a crash log flush to the disk after the unexpected crash. [#51720](https://github.com/ClickHouse/ClickHouse/pull/51720) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Fix behavior in dashboard page where errors unrelated to authentication are not shown. Also fix 'overlapping' chart behavior. [#51744](https://github.com/ClickHouse/ClickHouse/pull/51744) ([Zach Naimon](https://github.com/ArctypeZach)).
-* Allow UUID to UInt128 conversion. [#51765](https://github.com/ClickHouse/ClickHouse/pull/51765) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Added support for function `range` of Nullable arguments. [#51767](https://github.com/ClickHouse/ClickHouse/pull/51767) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Convert condition like `toyear(x) = c` to `c1 <= x < c2`. [#51795](https://github.com/ClickHouse/ClickHouse/pull/51795) ([Han Fei](https://github.com/hanfei1991)).
-* Improve MySQL compatibility of the statement `SHOW INDEX`. [#51796](https://github.com/ClickHouse/ClickHouse/pull/51796) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix `use_structure_from_insertion_table_in_table_functions` does not work with `MATERIALIZED` and `ALIAS` columns. Closes [#51817](https://github.com/ClickHouse/ClickHouse/issues/51817). Closes [#51019](https://github.com/ClickHouse/ClickHouse/issues/51019). [#51825](https://github.com/ClickHouse/ClickHouse/pull/51825) ([flynn](https://github.com/ucasfl)).
-* Cache dictionary now requests only unique keys from source. Closes [#51762](https://github.com/ClickHouse/ClickHouse/issues/51762). [#51853](https://github.com/ClickHouse/ClickHouse/pull/51853) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fixed the case when settings were not applied for EXPLAIN query when FORMAT was provided. [#51859](https://github.com/ClickHouse/ClickHouse/pull/51859) ([Nikita Taranov](https://github.com/nickitat)).
-* Allow SETTINGS before FORMAT in DESCRIBE TABLE query for compatibility with SELECT query. Closes [#51544](https://github.com/ClickHouse/ClickHouse/issues/51544). [#51899](https://github.com/ClickHouse/ClickHouse/pull/51899) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Var-Int encoded integers (e.g. used by the native protocol) can now use the full 64-bit range. 3rd party clients are advised to update their var-int code accordingly. [#51905](https://github.com/ClickHouse/ClickHouse/pull/51905) ([Robert Schulze](https://github.com/rschu1ze)).
-* Update certificates when they change without the need to manually SYSTEM RELOAD CONFIG. [#52030](https://github.com/ClickHouse/ClickHouse/pull/52030) ([Mike Kot](https://github.com/myrrc)).
-* Added `allow_create_index_without_type` setting that allow to ignore `ADD INDEX` queries without specified `TYPE`. Standard SQL queries will just succeed without changing table schema. [#52056](https://github.com/ClickHouse/ClickHouse/pull/52056) ([Ilya Yatsishin](https://github.com/qoega)).
-* Log messages are written to the `system.text_log` from the server startup. [#52113](https://github.com/ClickHouse/ClickHouse/pull/52113) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* In cases where the HTTP endpoint has multiple IP addresses and the first of them is unreachable, a timeout exception was thrown. Made session creation with handling all resolved endpoints. [#52116](https://github.com/ClickHouse/ClickHouse/pull/52116) ([Aleksei Filatov](https://github.com/aalexfvk)).
-* Avro input format now supports Union even if it contains only a single type. Closes [#52131](https://github.com/ClickHouse/ClickHouse/issues/52131). [#52137](https://github.com/ClickHouse/ClickHouse/pull/52137) ([flynn](https://github.com/ucasfl)).
-* Add setting `optimize_use_implicit_projections` to disable implicit projections (currently only `min_max_count` projection). [#52152](https://github.com/ClickHouse/ClickHouse/pull/52152) ([Amos Bird](https://github.com/amosbird)).
-* It was possible to use the function `hasToken` for infinite loop. Now this possibility is removed. This closes [#52156](https://github.com/ClickHouse/ClickHouse/issues/52156). [#52160](https://github.com/ClickHouse/ClickHouse/pull/52160) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Create ZK ancestors optimistically. [#52195](https://github.com/ClickHouse/ClickHouse/pull/52195) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix [#50582](https://github.com/ClickHouse/ClickHouse/issues/50582). Avoid the `Not found column ... in block` error in some cases of reading in-order and constants. [#52259](https://github.com/ClickHouse/ClickHouse/pull/52259) ([Chen768959](https://github.com/Chen768959)).
-* Check whether S2 geo primitives are invalid as early as possible on ClickHouse side. This closes: [#27090](https://github.com/ClickHouse/ClickHouse/issues/27090). [#52260](https://github.com/ClickHouse/ClickHouse/pull/52260) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Add back missing projection QueryAccessInfo when `query_plan_optimize_projection = 1`. This fixes [#50183](https://github.com/ClickHouse/ClickHouse/issues/50183) . This fixes [#50093](https://github.com/ClickHouse/ClickHouse/issues/50093). [#52327](https://github.com/ClickHouse/ClickHouse/pull/52327) ([Amos Bird](https://github.com/amosbird)).
-* When `ZooKeeperRetriesControl` rethrows an error, it's more useful to see its original stack trace, not the one from `ZooKeeperRetriesControl` itself. [#52347](https://github.com/ClickHouse/ClickHouse/pull/52347) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Wait for zero copy replication lock even if some disks don't support it. [#52376](https://github.com/ClickHouse/ClickHouse/pull/52376) ([Raúl Marín](https://github.com/Algunenano)).
-* Now interserver port will be closed only after tables are shut down. [#52498](https://github.com/ClickHouse/ClickHouse/pull/52498) ([alesapin](https://github.com/alesapin)).
-
-#### Experimental Feature
-* Writing parquet files is 10x faster, it's multi-threaded now. Almost the same speed as reading. [#49367](https://github.com/ClickHouse/ClickHouse/pull/49367) ([Michael Kolupaev](https://github.com/al13n321)). This is controlled by the setting `output_format_parquet_use_custom_encoder` which is disabled by default, because the feature is non-ideal.
-* Added support for [PRQL](https://prql-lang.org/) as a query language. [#50686](https://github.com/ClickHouse/ClickHouse/pull/50686) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Allow to add disk name for custom disks. Previously custom disks would use an internal generated disk name. Now it will be possible with `disk = disk_<name>(...)` (e.g. disk will have name `name`) . [#51552](https://github.com/ClickHouse/ClickHouse/pull/51552) ([Kseniia Sumarokova](https://github.com/kssenii)). This syntax can be changed in this release.
-* (experimental MaterializedMySQL) Fixed crash when `mysqlxx::Pool::Entry` is used after it was disconnected. [#52063](https://github.com/ClickHouse/ClickHouse/pull/52063) ([Val Doroshchuk](https://github.com/valbok)).
-* (experimental MaterializedMySQL) `CREATE TABLE ... AS SELECT` .. is now supported in MaterializedMySQL. [#52067](https://github.com/ClickHouse/ClickHouse/pull/52067) ([Val Doroshchuk](https://github.com/valbok)).
-* (experimental MaterializedMySQL) Introduced automatic conversion of text types to utf8 for MaterializedMySQL. [#52084](https://github.com/ClickHouse/ClickHouse/pull/52084) ([Val Doroshchuk](https://github.com/valbok)).
-* (experimental MaterializedMySQL) Now unquoted UTF-8 strings are supported in DDL for MaterializedMySQL. [#52318](https://github.com/ClickHouse/ClickHouse/pull/52318) ([Val Doroshchuk](https://github.com/valbok)).
-* (experimental MaterializedMySQL) Now double quoted comments are supported in MaterializedMySQL. [#52355](https://github.com/ClickHouse/ClickHouse/pull/52355) ([Val Doroshchuk](https://github.com/valbok)).
-* Upgrade Intel QPL from v1.1.0 to v1.2.0 2. Upgrade Intel accel-config from v3.5 to v4.0 3. Fixed issue that Device IOTLB miss has big perf. impact for IAA accelerators. [#52180](https://github.com/ClickHouse/ClickHouse/pull/52180) ([jasperzhu](https://github.com/jinjunzh)).
-* The `session_timezone` setting (new in version 23.6) is demoted to experimental. [#52445](https://github.com/ClickHouse/ClickHouse/pull/52445) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Support ZooKeeper `reconfig` command for ClickHouse Keeper with incremental reconfiguration which can be enabled via `keeper_server.enable_reconfiguration` setting. Support adding servers, removing servers, and changing server priorities. [#49450](https://github.com/ClickHouse/ClickHouse/pull/49450) ([Mike Kot](https://github.com/myrrc)). It is suspected that this feature is incomplete.
-
-#### Build/Testing/Packaging Improvement
-* Add experimental ClickHouse builds for Linux RISC-V 64 to CI. [#31398](https://github.com/ClickHouse/ClickHouse/pull/31398) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add integration test check with the enabled Analyzer. [#50926](https://github.com/ClickHouse/ClickHouse/pull/50926) [#52210](https://github.com/ClickHouse/ClickHouse/pull/52210) ([Dmitry Novik](https://github.com/novikd)).
-* Reproducible builds for Rust. [#52395](https://github.com/ClickHouse/ClickHouse/pull/52395) ([Azat Khuzhin](https://github.com/azat)).
-* Update Cargo dependencies. [#51721](https://github.com/ClickHouse/ClickHouse/pull/51721) ([Raúl Marín](https://github.com/Algunenano)).
-* Make the function `CHColumnToArrowColumn::fillArrowArrayWithArrayColumnData` to work with nullable arrays, which are not possible in ClickHouse, but needed for Gluten. [#52112](https://github.com/ClickHouse/ClickHouse/pull/52112) ([�扬](https://github.com/taiyang-li)).
-* We've updated the CCTZ library to master, but there are no user-visible changes. [#52124](https://github.com/ClickHouse/ClickHouse/pull/52124) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The `system.licenses` table now includes the hard-forked library Poco. This closes [#52066](https://github.com/ClickHouse/ClickHouse/issues/52066). [#52127](https://github.com/ClickHouse/ClickHouse/pull/52127) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Check that there are no cases of bad punctuation: whitespace before a comma like `Hello ,world` instead of `Hello, world`. [#52549](https://github.com/ClickHouse/ClickHouse/pull/52549) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-* Fix MaterializedPostgreSQL syncTables [#49698](https://github.com/ClickHouse/ClickHouse/pull/49698) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix projection with optimize_aggregators_of_group_by_keys [#49709](https://github.com/ClickHouse/ClickHouse/pull/49709) ([Amos Bird](https://github.com/amosbird)).
-* Fix optimize_skip_unused_shards with JOINs [#51037](https://github.com/ClickHouse/ClickHouse/pull/51037) ([Azat Khuzhin](https://github.com/azat)).
-* Fix formatDateTime() with fractional negative datetime64 [#51290](https://github.com/ClickHouse/ClickHouse/pull/51290) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Functions `hasToken*` were totally wrong. Add a test for [#43358](https://github.com/ClickHouse/ClickHouse/issues/43358) [#51378](https://github.com/ClickHouse/ClickHouse/pull/51378) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix optimization to move functions before sorting. [#51481](https://github.com/ClickHouse/ClickHouse/pull/51481) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix Block structure mismatch in Pipe::unitePipes for FINAL [#51492](https://github.com/ClickHouse/ClickHouse/pull/51492) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix SIGSEGV for clusters with zero weight across all shards (fixes INSERT INTO FUNCTION clusterAllReplicas()) [#51545](https://github.com/ClickHouse/ClickHouse/pull/51545) ([Azat Khuzhin](https://github.com/azat)).
-* Fix timeout for hedged requests [#51582](https://github.com/ClickHouse/ClickHouse/pull/51582) ([Azat Khuzhin](https://github.com/azat)).
-* Fix logical error in ANTI join with NULL [#51601](https://github.com/ClickHouse/ClickHouse/pull/51601) ([vdimir](https://github.com/vdimir)).
-* Fix for moving 'IN' conditions to PREWHERE [#51610](https://github.com/ClickHouse/ClickHouse/pull/51610) ([Alexander Gololobov](https://github.com/davenger)).
-* Do not apply PredicateExpressionsOptimizer for ASOF/ANTI join [#51633](https://github.com/ClickHouse/ClickHouse/pull/51633) ([vdimir](https://github.com/vdimir)).
-* Fix async insert with deduplication for ReplicatedMergeTree using merging algorithms [#51676](https://github.com/ClickHouse/ClickHouse/pull/51676) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix reading from empty column in `parseSipHashKey` [#51804](https://github.com/ClickHouse/ClickHouse/pull/51804) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix segfault when create invalid EmbeddedRocksdb table [#51847](https://github.com/ClickHouse/ClickHouse/pull/51847) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix inserts into MongoDB tables [#51876](https://github.com/ClickHouse/ClickHouse/pull/51876) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix deadlock on DatabaseCatalog shutdown [#51908](https://github.com/ClickHouse/ClickHouse/pull/51908) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix error in subquery operators [#51922](https://github.com/ClickHouse/ClickHouse/pull/51922) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix async connect to hosts with multiple ips [#51934](https://github.com/ClickHouse/ClickHouse/pull/51934) ([Kruglov Pavel](https://github.com/Avogar)).
-* Do not remove inputs after ActionsDAG::merge [#51947](https://github.com/ClickHouse/ClickHouse/pull/51947) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Check refcount in `RemoveManyObjectStorageOperation::finalize` instead of `execute` [#51954](https://github.com/ClickHouse/ClickHouse/pull/51954) ([vdimir](https://github.com/vdimir)).
-* Allow parametric UDFs [#51964](https://github.com/ClickHouse/ClickHouse/pull/51964) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Small fix for toDateTime64() for dates after 2283-12-31 [#52130](https://github.com/ClickHouse/ClickHouse/pull/52130) ([Andrey Zvonov](https://github.com/zvonand)).
-* Fix ORDER BY tuple of WINDOW functions [#52145](https://github.com/ClickHouse/ClickHouse/pull/52145) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix incorrect projection analysis when aggregation expression contains monotonic functions [#52151](https://github.com/ClickHouse/ClickHouse/pull/52151) ([Amos Bird](https://github.com/amosbird)).
-* Fix error in `groupArrayMoving` functions [#52161](https://github.com/ClickHouse/ClickHouse/pull/52161) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disable direct join for range dictionary [#52187](https://github.com/ClickHouse/ClickHouse/pull/52187) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix sticky mutations test (and extremely rare race condition) [#52197](https://github.com/ClickHouse/ClickHouse/pull/52197) ([alesapin](https://github.com/alesapin)).
-* Fix race in Web disk [#52211](https://github.com/ClickHouse/ClickHouse/pull/52211) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix data race in Connection::setAsyncCallback on unknown packet from server [#52219](https://github.com/ClickHouse/ClickHouse/pull/52219) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix temp data deletion on startup, add test [#52275](https://github.com/ClickHouse/ClickHouse/pull/52275) ([vdimir](https://github.com/vdimir)).
-* Don't use minmax_count projections when counting nullable columns [#52297](https://github.com/ClickHouse/ClickHouse/pull/52297) ([Amos Bird](https://github.com/amosbird)).
-* MergeTree/ReplicatedMergeTree should use server timezone for log entries [#52325](https://github.com/ClickHouse/ClickHouse/pull/52325) ([Azat Khuzhin](https://github.com/azat)).
-* Fix parameterized view with cte and multiple usage [#52328](https://github.com/ClickHouse/ClickHouse/pull/52328) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Disable expression templates for time intervals [#52335](https://github.com/ClickHouse/ClickHouse/pull/52335) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix `apply_snapshot` in Keeper [#52358](https://github.com/ClickHouse/ClickHouse/pull/52358) ([Antonio Andelic](https://github.com/antonio2368)).
-* Update build-osx.md [#52377](https://github.com/ClickHouse/ClickHouse/pull/52377) ([AlexBykovski](https://github.com/AlexBykovski)).
-* Fix `countSubstrings` hang with empty needle and a column haystack [#52409](https://github.com/ClickHouse/ClickHouse/pull/52409) ([Sergei Trifonov](https://github.com/serxa)).
-* Fix normal projection with merge table  [#52432](https://github.com/ClickHouse/ClickHouse/pull/52432) ([Amos Bird](https://github.com/amosbird)).
-* Fix possible double-free in Aggregator [#52439](https://github.com/ClickHouse/ClickHouse/pull/52439) ([Nikita Taranov](https://github.com/nickitat)).
-* Fixed inserting into Buffer engine [#52440](https://github.com/ClickHouse/ClickHouse/pull/52440) ([Vasily Nemkov](https://github.com/Enmk)).
-* The implementation of AnyHash was non-conformant. [#52448](https://github.com/ClickHouse/ClickHouse/pull/52448) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Check recursion depth in OptimizedRegularExpression [#52451](https://github.com/ClickHouse/ClickHouse/pull/52451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix data-race DatabaseReplicated::startupTables()/canExecuteReplicatedMetadataAlter() [#52490](https://github.com/ClickHouse/ClickHouse/pull/52490) ([Azat Khuzhin](https://github.com/azat)).
-* Fix abort in function `transform` [#52513](https://github.com/ClickHouse/ClickHouse/pull/52513) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix lightweight delete after drop of projection [#52517](https://github.com/ClickHouse/ClickHouse/pull/52517) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix possible error "Cannot drain connections: cancel first" [#52585](https://github.com/ClickHouse/ClickHouse/pull/52585) ([Kruglov Pavel](https://github.com/Avogar)).
-
-
-### <a id="236"></a> ClickHouse release 23.6, 2023-06-29
-
-#### Backward Incompatible Change
-* Delete feature `do_not_evict_index_and_mark_files` in the fs cache. This feature was only making things worse. [#51253](https://github.com/ClickHouse/ClickHouse/pull/51253) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Remove ALTER support for experimental LIVE VIEW. [#51287](https://github.com/ClickHouse/ClickHouse/pull/51287) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Decrease the default values for `http_max_field_value_size` and `http_max_field_name_size` to 128 KiB. [#51163](https://github.com/ClickHouse/ClickHouse/pull/51163) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* CGroups metrics related to CPU are replaced with one metric, `CGroupMaxCPU` for better usability. The `Normalized` CPU usage metrics will be normalized to CGroups limits instead of the total number of CPUs when they are set. This closes [#50836](https://github.com/ClickHouse/ClickHouse/issues/50836). [#50835](https://github.com/ClickHouse/ClickHouse/pull/50835) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-#### New Feature
-* The function `transform` as well as `CASE` with value matching started to support all data types. This closes [#29730](https://github.com/ClickHouse/ClickHouse/issues/29730). This closes [#32387](https://github.com/ClickHouse/ClickHouse/issues/32387). This closes [#50827](https://github.com/ClickHouse/ClickHouse/issues/50827). This closes [#31336](https://github.com/ClickHouse/ClickHouse/issues/31336). This closes [#40493](https://github.com/ClickHouse/ClickHouse/issues/40493). [#51351](https://github.com/ClickHouse/ClickHouse/pull/51351) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added option `--rename_files_after_processing <pattern>`. This closes [#34207](https://github.com/ClickHouse/ClickHouse/issues/34207). [#49626](https://github.com/ClickHouse/ClickHouse/pull/49626) ([alekseygolub](https://github.com/alekseygolub)).
-* Add support for `TRUNCATE` modifier in `INTO OUTFILE` clause. Suggest using `APPEND` or `TRUNCATE` for `INTO OUTFILE` when file exists. [#50950](https://github.com/ClickHouse/ClickHouse/pull/50950) ([alekar](https://github.com/alekar)).
-* Add table engine `Redis` and table function `redis`. It allows querying external Redis servers. [#50150](https://github.com/ClickHouse/ClickHouse/pull/50150) ([JackyWoo](https://github.com/JackyWoo)).
-* Allow to skip empty files in file/s3/url/hdfs table functions using settings `s3_skip_empty_files`, `hdfs_skip_empty_files`, `engine_file_skip_empty_files`, `engine_url_skip_empty_files`. [#50364](https://github.com/ClickHouse/ClickHouse/pull/50364) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add a new setting named `use_mysql_types_in_show_columns` to alter the `SHOW COLUMNS` SQL statement to display MySQL equivalent types when a client is connected via the MySQL compatibility port. [#49577](https://github.com/ClickHouse/ClickHouse/pull/49577) ([Thomas Panetti](https://github.com/tpanetti)).
-* Clickhouse-client can now be called with a connection string instead of "--host", "--port", "--user" etc. [#50689](https://github.com/ClickHouse/ClickHouse/pull/50689) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Add setting `session_timezone`; it is used as the default timezone for a session when not explicitly specified. [#44149](https://github.com/ClickHouse/ClickHouse/pull/44149) ([Andrey Zvonov](https://github.com/zvonand)).
-* Codec DEFLATE_QPL is now controlled via server setting "enable_deflate_qpl_codec" (default: false) instead of setting "allow_experimental_codecs". This marks DEFLATE_QPL non-experimental. [#50775](https://github.com/ClickHouse/ClickHouse/pull/50775) ([Robert Schulze](https://github.com/rschu1ze)).
-
-#### Performance Improvement
-* Improved scheduling of merge selecting and cleanup tasks in `ReplicatedMergeTree`. The tasks will not be executed too frequently when there's nothing to merge or cleanup. Added settings `max_merge_selecting_sleep_ms`, `merge_selecting_sleep_slowdown_factor`, `max_cleanup_delay_period` and `cleanup_thread_preferred_points_per_iteration`. It should close [#31919](https://github.com/ClickHouse/ClickHouse/issues/31919). [#50107](https://github.com/ClickHouse/ClickHouse/pull/50107) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Make filter push down through cross join. [#50605](https://github.com/ClickHouse/ClickHouse/pull/50605) ([Han Fei](https://github.com/hanfei1991)).
-* Improve performance with enabled QueryProfiler using thread-local timer_id instead of global object. [#48778](https://github.com/ClickHouse/ClickHouse/pull/48778) ([Jiebin Sun](https://github.com/jiebinn)).
-* Rewrite CapnProto input/output format to improve its performance. Map column names and CapnProto fields case insensitive, fix reading/writing of nested structure fields. [#49752](https://github.com/ClickHouse/ClickHouse/pull/49752) ([Kruglov Pavel](https://github.com/Avogar)).
-* Optimize parquet write performance for parallel threads. [#50102](https://github.com/ClickHouse/ClickHouse/pull/50102) ([Hongbin Ma](https://github.com/binmahone)).
-* Disable `parallelize_output_from_storages` for processing MATERIALIZED VIEWs and storages with one block only. [#50214](https://github.com/ClickHouse/ClickHouse/pull/50214) ([Azat Khuzhin](https://github.com/azat)).
-* Merge PR [#46558](https://github.com/ClickHouse/ClickHouse/pull/46558). Avoid block permutation during sort if the block is already sorted. [#50697](https://github.com/ClickHouse/ClickHouse/pull/50697) ([Alexey Milovidov](https://github.com/alexey-milovidov), [Maksim Kita](https://github.com/kitaisreal)).
-* Make multiple list requests to ZooKeeper in parallel to speed up reading from system.zookeeper table. [#51042](https://github.com/ClickHouse/ClickHouse/pull/51042) ([Alexander Gololobov](https://github.com/davenger)).
-* Speedup initialization of DateTime lookup tables for time zones. This should reduce startup/connect time of clickhouse-client especially in debug build as it is rather heavy. [#51347](https://github.com/ClickHouse/ClickHouse/pull/51347) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix data lakes slowness because of synchronous head requests. (Related to Iceberg/Deltalake/Hudi being slow with a lot of files). [#50976](https://github.com/ClickHouse/ClickHouse/pull/50976) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Do not read all the columns from right GLOBAL JOIN table. [#50721](https://github.com/ClickHouse/ClickHouse/pull/50721) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-
-#### Experimental Feature
-* Support parallel replicas with the analyzer. [#50441](https://github.com/ClickHouse/ClickHouse/pull/50441) ([Raúl Marín](https://github.com/Algunenano)).
-* Add random sleep before large merges/mutations execution to split load more evenly between replicas in case of zero-copy replication. [#51282](https://github.com/ClickHouse/ClickHouse/pull/51282) ([alesapin](https://github.com/alesapin)).
-* Do not replicate `ALTER PARTITION` queries and mutations through `Replicated` database if it has only one shard and the underlying table is `ReplicatedMergeTree`. [#51049](https://github.com/ClickHouse/ClickHouse/pull/51049) ([Alexander Tokmakov](https://github.com/tavplubix)).
-
-#### Improvement
-* Relax the thresholds for "too many parts" to be more modern. Return the backpressure during long-running insert queries. [#50856](https://github.com/ClickHouse/ClickHouse/pull/50856) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Allow to cast IPv6 to IPv4 address for CIDR ::ffff:0:0/96 (IPv4-mapped addresses). [#49759](https://github.com/ClickHouse/ClickHouse/pull/49759) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Update MongoDB protocol to support MongoDB 5.1 version and newer. Support for the versions with the old protocol (<3.6) is preserved. Closes [#45621](https://github.com/ClickHouse/ClickHouse/issues/45621), [#49879](https://github.com/ClickHouse/ClickHouse/issues/49879). [#50061](https://github.com/ClickHouse/ClickHouse/pull/50061) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add setting `input_format_max_bytes_to_read_for_schema_inference` to limit the number of bytes to read in schema inference. Closes [#50577](https://github.com/ClickHouse/ClickHouse/issues/50577). [#50592](https://github.com/ClickHouse/ClickHouse/pull/50592) ([Kruglov Pavel](https://github.com/Avogar)).
-* Respect setting `input_format_null_as_default` in schema inference. [#50602](https://github.com/ClickHouse/ClickHouse/pull/50602) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allow to skip trailing empty lines in CSV/TSV/CustomSeparated formats via settings `input_format_csv_skip_trailing_empty_lines`, `input_format_tsv_skip_trailing_empty_lines` and `input_format_custom_skip_trailing_empty_lines` (disabled by default). Closes [#49315](https://github.com/ClickHouse/ClickHouse/issues/49315). [#50635](https://github.com/ClickHouse/ClickHouse/pull/50635) ([Kruglov Pavel](https://github.com/Avogar)).
-* Functions "toDateOrDefault|OrNull" and "accuateCast[OrDefault|OrNull]" now correctly parse numeric arguments. [#50709](https://github.com/ClickHouse/ClickHouse/pull/50709) ([Dmitry Kardymon](https://github.com/kardymonds)).
-* Support CSV with whitespace or `\t` field delimiters, and these delimiters are supported in Spark. [#50712](https://github.com/ClickHouse/ClickHouse/pull/50712) ([KevinyhZou](https://github.com/KevinyhZou)).
-* Settings `number_of_mutations_to_delay` and `number_of_mutations_to_throw` are enabled by default now with values 500 and 1000 respectively. [#50726](https://github.com/ClickHouse/ClickHouse/pull/50726) ([Anton Popov](https://github.com/CurtizJ)).
-* The dashboard correctly shows missing values. This closes [#50831](https://github.com/ClickHouse/ClickHouse/issues/50831). [#50832](https://github.com/ClickHouse/ClickHouse/pull/50832) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added the possibility to use date and time arguments in the syslog timestamp format in functions `parseDateTimeBestEffort*` and `parseDateTime64BestEffort*`. [#50925](https://github.com/ClickHouse/ClickHouse/pull/50925) ([Victor Krasnov](https://github.com/sirvickr)).
-* Command line parameter "--password" in clickhouse-client can now be specified only once. [#50966](https://github.com/ClickHouse/ClickHouse/pull/50966) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
-* Use `hash_of_all_files` from `system.parts` to check identity of parts during on-cluster backups. [#50997](https://github.com/ClickHouse/ClickHouse/pull/50997) ([Vitaly Baranov](https://github.com/vitlibar)).
-* The system table zookeeper_connection connected_time identifies the time when the connection is established (standard format), and session_uptime_elapsed_seconds is added, which labels the duration of the established connection session (in seconds). [#51026](https://github.com/ClickHouse/ClickHouse/pull/51026) ([郭�龙](https://github.com/guoxiaolongzte)).
-* Improve the progress bar for file/s3/hdfs/url table functions by using chunk size from source data and using incremental total size counting in each thread. Fix the progress bar for *Cluster functions. This closes [#47250](https://github.com/ClickHouse/ClickHouse/issues/47250). [#51088](https://github.com/ClickHouse/ClickHouse/pull/51088) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add total_bytes_to_read to the Progress packet in TCP protocol for better Progress bar. [#51158](https://github.com/ClickHouse/ClickHouse/pull/51158) ([Kruglov Pavel](https://github.com/Avogar)).
-* Better checking of data parts on disks with filesystem cache. [#51164](https://github.com/ClickHouse/ClickHouse/pull/51164) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix sometimes not correct current_elements_num in fs cache. [#51242](https://github.com/ClickHouse/ClickHouse/pull/51242) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
-#### Build/Testing/Packaging Improvement
-* Add embedded keeper-client to standalone keeper binary. [#50964](https://github.com/ClickHouse/ClickHouse/pull/50964) ([pufit](https://github.com/pufit)).
-* Actual LZ4 version is used now. [#50621](https://github.com/ClickHouse/ClickHouse/pull/50621) ([Nikita Taranov](https://github.com/nickitat)).
-* ClickHouse server will print the list of changed settings on fatal errors. This closes [#51137](https://github.com/ClickHouse/ClickHouse/issues/51137). [#51138](https://github.com/ClickHouse/ClickHouse/pull/51138) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Allow building ClickHouse with clang-17. [#51300](https://github.com/ClickHouse/ClickHouse/pull/51300) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* [SQLancer](https://github.com/sqlancer/sqlancer) check is considered stable as bugs that were triggered by it are fixed. Now failures of SQLancer check will be reported as failed check status. [#51340](https://github.com/ClickHouse/ClickHouse/pull/51340) ([Ilya Yatsishin](https://github.com/qoega)).
-* Split huge `RUN` in Dockerfile into smaller conditional. Install the necessary tools on demand in the same `RUN` layer, and remove them after that. Upgrade the OS only once at the beginning. Use a modern way to check the signed repository. Downgrade the base repo to ubuntu:20.04 to address the issues on older docker versions. Upgrade golang version to address golang vulnerabilities. [#51504](https://github.com/ClickHouse/ClickHouse/pull/51504) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-
-#### Bug Fix (user-visible misbehavior in an official stable release)
-
-* Report loading status for executable dictionaries correctly [#48775](https://github.com/ClickHouse/ClickHouse/pull/48775) ([Anton Kozlov](https://github.com/tonickkozlov)).
-* Proper mutation of skip indices and projections [#50104](https://github.com/ClickHouse/ClickHouse/pull/50104) ([Amos Bird](https://github.com/amosbird)).
-* Cleanup moving parts [#50489](https://github.com/ClickHouse/ClickHouse/pull/50489) ([vdimir](https://github.com/vdimir)).
-* Fix backward compatibility for IP types hashing in aggregate functions [#50551](https://github.com/ClickHouse/ClickHouse/pull/50551) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix Log family table return wrong rows count after truncate [#50585](https://github.com/ClickHouse/ClickHouse/pull/50585) ([flynn](https://github.com/ucasfl)).
-* Fix bug in `uniqExact` parallel merging [#50590](https://github.com/ClickHouse/ClickHouse/pull/50590) ([Nikita Taranov](https://github.com/nickitat)).
-* Revert recent grace hash join changes [#50699](https://github.com/ClickHouse/ClickHouse/pull/50699) ([vdimir](https://github.com/vdimir)).
-* Query Cache: Try to fix bad cast from `ColumnConst` to `ColumnVector<char8_t>` [#50704](https://github.com/ClickHouse/ClickHouse/pull/50704) ([Robert Schulze](https://github.com/rschu1ze)).
-* Avoid storing logs in Keeper containing unknown operation [#50751](https://github.com/ClickHouse/ClickHouse/pull/50751) ([Antonio Andelic](https://github.com/antonio2368)).
-* SummingMergeTree support for DateTime64 [#50797](https://github.com/ClickHouse/ClickHouse/pull/50797) ([Jordi Villar](https://github.com/jrdi)).
-* Add compatibility setting for non-const timezones [#50834](https://github.com/ClickHouse/ClickHouse/pull/50834) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix hashing of LDAP params in the cache entries [#50865](https://github.com/ClickHouse/ClickHouse/pull/50865) ([Julian Maicher](https://github.com/jmaicher)).
-* Fallback to parsing big integer from String instead of exception in Parquet format [#50873](https://github.com/ClickHouse/ClickHouse/pull/50873) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix checking the lock file too often while writing a backup [#50889](https://github.com/ClickHouse/ClickHouse/pull/50889) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Do not apply projection if read-in-order was enabled. [#50923](https://github.com/ClickHouse/ClickHouse/pull/50923) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix race in the Azure blob storage iterator [#50936](https://github.com/ClickHouse/ClickHouse/pull/50936) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix erroneous `sort_description` propagation in `CreatingSets` [#50955](https://github.com/ClickHouse/ClickHouse/pull/50955) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix Iceberg v2 optional metadata parsing [#50974](https://github.com/ClickHouse/ClickHouse/pull/50974) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* MaterializedMySQL: Keep parentheses for empty table overrides [#50977](https://github.com/ClickHouse/ClickHouse/pull/50977) ([Val Doroshchuk](https://github.com/valbok)).
-* Fix crash in BackupCoordinationStageSync::setError() [#51012](https://github.com/ClickHouse/ClickHouse/pull/51012) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix subtly broken copy-on-write of ColumnLowCardinality dictionary [#51064](https://github.com/ClickHouse/ClickHouse/pull/51064) ([Michael Kolupaev](https://github.com/al13n321)).
-* Generate safe IVs [#51086](https://github.com/ClickHouse/ClickHouse/pull/51086) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix ineffective query cache for SELECTs with subqueries [#51132](https://github.com/ClickHouse/ClickHouse/pull/51132) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix Set index with constant nullable comparison. [#51205](https://github.com/ClickHouse/ClickHouse/pull/51205) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix a crash in s3 and s3Cluster functions [#51209](https://github.com/ClickHouse/ClickHouse/pull/51209) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix a crash with compiled expressions [#51231](https://github.com/ClickHouse/ClickHouse/pull/51231) ([LiuNeng](https://github.com/liuneng1994)).
-* Fix use-after-free in StorageURL when switching URLs [#51260](https://github.com/ClickHouse/ClickHouse/pull/51260) ([Michael Kolupaev](https://github.com/al13n321)).
-* Updated check for parameterized view [#51272](https://github.com/ClickHouse/ClickHouse/pull/51272) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix multiple writing of same file to backup [#51299](https://github.com/ClickHouse/ClickHouse/pull/51299) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix fuzzer failure in ActionsDAG [#51301](https://github.com/ClickHouse/ClickHouse/pull/51301) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Remove garbage from function `transform` [#51350](https://github.com/ClickHouse/ClickHouse/pull/51350) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
-
-### <a id="235"></a> ClickHouse release 23.5, 2023-06-08
+### <a id="243"></a> ClickHouse release 24.3 LTS, 2024-03-27
 
 #### Upgrade Notes
-* Compress marks and primary key by default. It significantly reduces the cold query time. Upgrade notes: the support for compressed marks and primary key has been added in version 22.9. If you turned on compressed marks or primary key or installed version 23.5 or newer, which has compressed marks or primary key on by default, you will not be able to downgrade to version 22.8 or earlier. You can also explicitly disable compressed marks or primary keys by specifying the `compress_marks` and `compress_primary_key` settings in the `<merge_tree>` section of the server configuration file. **Upgrade notes:** If you upgrade from versions prior to 22.9, you should either upgrade all replicas at once or disable the compression before upgrade, or upgrade through an intermediate version, where the compressed marks are supported but not enabled by default, such as 23.3. [#42587](https://github.com/ClickHouse/ClickHouse/pull/42587) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Make local object storage work consistently with s3 object storage, fix problem with append (closes [#48465](https://github.com/ClickHouse/ClickHouse/issues/48465)), make it configurable as independent storage. The change is backward incompatible because the cache on top of local object storage is not compatible to previous versions. [#48791](https://github.com/ClickHouse/ClickHouse/pull/48791) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* The experimental feature "in-memory data parts" is removed. The data format is still supported, but the settings are no-op, and compact or wide parts will be used instead. This closes [#45409](https://github.com/ClickHouse/ClickHouse/issues/45409). [#49429](https://github.com/ClickHouse/ClickHouse/pull/49429) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Changed default values of settings `parallelize_output_from_storages` and `input_format_parquet_preserve_order`. This allows ClickHouse to reorder rows when reading from files (e.g. CSV or Parquet), greatly improving performance in many cases. To restore the old behavior of preserving order, use `parallelize_output_from_storages = 0`, `input_format_parquet_preserve_order = 1`. [#49479](https://github.com/ClickHouse/ClickHouse/pull/49479) ([Michael Kolupaev](https://github.com/al13n321)).
-* Make projections production-ready. Add the `optimize_use_projections` setting to control whether the projections will be selected for SELECT queries. The setting `allow_experimental_projection_optimization` is obsolete and does nothing. [#49719](https://github.com/ClickHouse/ClickHouse/pull/49719) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Mark `joinGet` as non-deterministic (so as `dictGet`). It allows using them in mutations without an extra setting. [#49843](https://github.com/ClickHouse/ClickHouse/pull/49843) ([Azat Khuzhin](https://github.com/azat)).
-* Revert the "`groupArray` returns cannot be nullable" change (due to binary compatibility breakage for `groupArray`/`groupArrayLast`/`groupArraySample` over `Nullable` types, which likely will lead to `TOO_LARGE_ARRAY_SIZE` or `CANNOT_READ_ALL_DATA`). [#49971](https://github.com/ClickHouse/ClickHouse/pull/49971) ([Azat Khuzhin](https://github.com/azat)).
-* Setting `enable_memory_bound_merging_of_aggregation_results` is enabled by default. If you update from version prior to 22.12, we recommend to set this flag to `false` until update is finished. [#50319](https://github.com/ClickHouse/ClickHouse/pull/50319) ([Nikita Taranov](https://github.com/nickitat)).
+* The setting `allow_experimental_analyzer` is enabled by default and it switches the query analysis to a new implementation, which has better compatibility and feature completeness. The feature "analyzer" is considered beta instead of experimental. You can turn the old behavior by setting the `compatibility` to `24.2` or disabling the `allow_experimental_analyzer` setting. Watch the [video on YouTube](https://www.youtube.com/watch?v=zhrOYQpgvkk).
+* ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. This is controlled by the settings, `output_format_parquet_string_as_string`, `output_format_orc_string_as_string`, `output_format_arrow_string_as_string`. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases. Parquet/ORC/Arrow supports many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools lack support for the faster `lz4` compression method, that's why we set `zstd` by default. This is controlled by the settings `output_format_parquet_compression_method`, `output_format_orc_compression_method`, and `output_format_arrow_compression_method`. We changed the default to `zstd` for Parquet and ORC, but not Arrow (it is emphasized for low-level usages). [#61817](https://github.com/ClickHouse/ClickHouse/pull/61817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* In the new ClickHouse version, the functions `geoDistance`, `greatCircleDistance`, and `greatCircleAngle` will use 64-bit double precision floating point data type for internal calculations and return type if all the arguments are Float64. This closes [#58476](https://github.com/ClickHouse/ClickHouse/issues/58476). In previous versions, the function always used Float32. You can switch to the old behavior by setting `geo_distance_returns_float64_on_float64_arguments` to `false` or setting `compatibility` to `24.2` or earlier. [#61848](https://github.com/ClickHouse/ClickHouse/pull/61848) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Co-authored with [Geet Patel](https://github.com/geetptl).
+* The obsolete in-memory data parts have been deprecated since version 23.5 and have not been supported since version 23.10. Now the remaining code is removed. Continuation of [#55186](https://github.com/ClickHouse/ClickHouse/issues/55186) and [#45409](https://github.com/ClickHouse/ClickHouse/issues/45409). It is unlikely that you have used in-memory data parts because they were available only before version 23.5 and only when you enabled them manually by specifying the corresponding SETTINGS for a MergeTree table. To check if you have in-memory data parts, run the following query: `SELECT part_type, count() FROM system.parts GROUP BY part_type ORDER BY part_type`. To disable the usage of in-memory data parts, do `ALTER TABLE ... MODIFY SETTING min_bytes_for_compact_part = DEFAULT, min_rows_for_compact_part = DEFAULT`. Before upgrading from old ClickHouse releases, first check that you don't have in-memory data parts. If there are in-memory data parts, disable them first, then wait while there are no in-memory data parts and continue the upgrade. [#61127](https://github.com/ClickHouse/ClickHouse/pull/61127) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Changed the column name from `duration_ms` to `duration_microseconds` in the `system.zookeeper` table to reflect the reality that the duration is in the microsecond resolution. [#60774](https://github.com/ClickHouse/ClickHouse/pull/60774) ([Duc Canh Le](https://github.com/canhld94)).
+* Reject incoming INSERT queries in case when query-level settings `async_insert` and `deduplicate_blocks_in_dependent_materialized_views` are enabled together. This behaviour is controlled by a setting `throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert` and enabled by default. This is a continuation of https://github.com/ClickHouse/ClickHouse/pull/59699 needed to unblock https://github.com/ClickHouse/ClickHouse/pull/59915. [#60888](https://github.com/ClickHouse/ClickHouse/pull/60888) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Utility `clickhouse-copier` is moved to a separate repository on GitHub: https://github.com/ClickHouse/copier. It is no longer included in the bundle but is still available as a separate download. This closes: [#60734](https://github.com/ClickHouse/ClickHouse/issues/60734) This closes: [#60540](https://github.com/ClickHouse/ClickHouse/issues/60540) This closes: [#60250](https://github.com/ClickHouse/ClickHouse/issues/60250) This closes: [#52917](https://github.com/ClickHouse/ClickHouse/issues/52917) This closes: [#51140](https://github.com/ClickHouse/ClickHouse/issues/51140) This closes: [#47517](https://github.com/ClickHouse/ClickHouse/issues/47517) This closes: [#47189](https://github.com/ClickHouse/ClickHouse/issues/47189) This closes: [#46598](https://github.com/ClickHouse/ClickHouse/issues/46598) This closes: [#40257](https://github.com/ClickHouse/ClickHouse/issues/40257) This closes: [#36504](https://github.com/ClickHouse/ClickHouse/issues/36504) This closes: [#35485](https://github.com/ClickHouse/ClickHouse/issues/35485) This closes: [#33702](https://github.com/ClickHouse/ClickHouse/issues/33702) This closes: [#26702](https://github.com/ClickHouse/ClickHouse/issues/26702).
+* To increase compatibility with MySQL, the compatibility alias `locate` now accepts arguments `(needle, haystack[, start_pos])` by default. The previous behavior `(haystack, needle, [, start_pos])` can be restored by setting `function_locate_has_mysql_compatible_argument_order = 0`. [#61092](https://github.com/ClickHouse/ClickHouse/pull/61092) ([Robert Schulze](https://github.com/rschu1ze)).
+* Forbid `SimpleAggregateFunction` in `ORDER BY` of `MergeTree` tables (like `AggregateFunction` is forbidden, but they are forbidden because they are not comparable) by default (use `allow_suspicious_primary_key` to allow them). [#61399](https://github.com/ClickHouse/ClickHouse/pull/61399) ([Azat Khuzhin](https://github.com/azat)).
+* The `Ordinary` database engine is deprecated. You will receive a warning in clickhouse-client if your server is using it. This closes [#52229](https://github.com/ClickHouse/ClickHouse/issues/52229). [#56942](https://github.com/ClickHouse/ClickHouse/pull/56942) ([shabroo](https://github.com/shabroo)).
 
 #### New Feature
-* Added storage engine AzureBlobStorage and azureBlobStorage table function. The supported set of features is very similar to storage/table function S3 [#50604] (https://github.com/ClickHouse/ClickHouse/pull/50604) ([alesapin](https://github.com/alesapin)) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni).
-* Added native ClickHouse Keeper CLI Client, it is available as `clickhouse keeper-client` [#47414](https://github.com/ClickHouse/ClickHouse/pull/47414) ([pufit](https://github.com/pufit)).
-* Add `urlCluster` table function. Refactor all *Cluster table functions to reduce code duplication. Make schema inference work for all possible *Cluster function signatures and for named collections. Closes [#38499](https://github.com/ClickHouse/ClickHouse/issues/38499). [#45427](https://github.com/ClickHouse/ClickHouse/pull/45427) ([attack204](https://github.com/attack204)), Pavel Kruglov.
-* The query cache can now be used for production workloads. [#47977](https://github.com/ClickHouse/ClickHouse/pull/47977) ([Robert Schulze](https://github.com/rschu1ze)). The query cache can now support queries with totals and extremes modifier. [#48853](https://github.com/ClickHouse/ClickHouse/pull/48853) ([Robert Schulze](https://github.com/rschu1ze)). Make `allow_experimental_query_cache` setting as obsolete for backward-compatibility. It was removed in https://github.com/ClickHouse/ClickHouse/pull/47977. [#49934](https://github.com/ClickHouse/ClickHouse/pull/49934) ([Timur Solodovnikov](https://github.com/tsolodov)).
-* Geographical data types (`Point`, `Ring`, `Polygon`, and `MultiPolygon`) are production-ready. [#50022](https://github.com/ClickHouse/ClickHouse/pull/50022) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add schema inference to PostgreSQL, MySQL, MeiliSearch, and SQLite table engines. Closes [#49972](https://github.com/ClickHouse/ClickHouse/issues/49972). [#50000](https://github.com/ClickHouse/ClickHouse/pull/50000) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Password type in queries like `CREATE USER u IDENTIFIED BY 'p'` will be automatically set according to the setting `default_password_type` in the `config.xml` on the server. Closes [#42915](https://github.com/ClickHouse/ClickHouse/issues/42915). [#44674](https://github.com/ClickHouse/ClickHouse/pull/44674) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add bcrypt password authentication type. Closes [#34599](https://github.com/ClickHouse/ClickHouse/issues/34599). [#44905](https://github.com/ClickHouse/ClickHouse/pull/44905) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Introduces new keyword `INTO OUTFILE 'file.txt' APPEND`. [#48880](https://github.com/ClickHouse/ClickHouse/pull/48880) ([alekar](https://github.com/alekar)).
-* Added `system.zookeeper_connection` table that shows information about Keeper connections. [#45245](https://github.com/ClickHouse/ClickHouse/pull/45245) ([mateng915](https://github.com/mateng0915)).
-* Add new function `generateRandomStructure` that generates random table structure. It can be used in combination with table function `generateRandom`. [#47409](https://github.com/ClickHouse/ClickHouse/pull/47409) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allow the use of `CASE` without an `ELSE` branch and extended `transform` to deal with more types. Also fix some issues that made transform() return incorrect results when decimal types were mixed with other numeric types. [#48300](https://github.com/ClickHouse/ClickHouse/pull/48300) ([Salvatore Mesoraca](https://github.com/aiven-sal)). This closes #2655. This closes #9596. This closes #38666.
-* Added [server-side encryption using KMS keys](https://docs.aws.amazon.com/AmazonS3/latest/userguide/UsingKMSEncryption.html) with S3 tables, and the `header` setting with S3 disks. Closes [#48723](https://github.com/ClickHouse/ClickHouse/issues/48723). [#48724](https://github.com/ClickHouse/ClickHouse/pull/48724) ([Johann Gan](https://github.com/johanngan)).
-* 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. Resubmit [#46089](https://github.com/ClickHouse/ClickHouse/issues/46089). Closes [#48774](https://github.com/ClickHouse/ClickHouse/issues/48774). [#48787](https://github.com/ClickHouse/ClickHouse/pull/48787) ([Dmitry Novik](https://github.com/novikd)).
-* Function `dotProduct` work for array. [#49050](https://github.com/ClickHouse/ClickHouse/pull/49050) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Support statement `SHOW INDEX` to improve compatibility with MySQL. [#49158](https://github.com/ClickHouse/ClickHouse/pull/49158) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add virtual column `_file` and `_path` support to table function `url`. - Improve error message for table function `url`. - resolves [#49231](https://github.com/ClickHouse/ClickHouse/issues/49231) - resolves [#49232](https://github.com/ClickHouse/ClickHouse/issues/49232). [#49356](https://github.com/ClickHouse/ClickHouse/pull/49356) ([Ziyi Tan](https://github.com/Ziy1-Tan)).
-* Adding the `grants` field in the users.xml file, which allows specifying grants for users. [#49381](https://github.com/ClickHouse/ClickHouse/pull/49381) ([pufit](https://github.com/pufit)).
-* Support full/right join by using grace hash join algorithm. [#49483](https://github.com/ClickHouse/ClickHouse/pull/49483) ([lgbo](https://github.com/lgbo-ustc)).
-* `WITH FILL` modifier groups filling by sorting prefix. Controlled by `use_with_fill_by_sorting_prefix` setting (enabled by default). Related to [#33203](https://github.com/ClickHouse/ClickHouse/issues/33203)#issuecomment-1418736794. [#49503](https://github.com/ClickHouse/ClickHouse/pull/49503) ([Igor Nikonov](https://github.com/devcrafter)).
-* Clickhouse-client now accepts queries after "--multiquery" when "--query" (or "-q") is absent. example: clickhouse-client --multiquery "select 1; select 2;". [#49870](https://github.com/ClickHouse/ClickHouse/pull/49870) ([Alexey Gerasimchuk](https://github.com/Demilivor)).
-* Add separate `handshake_timeout` for receiving Hello packet from replica. Closes [#48854](https://github.com/ClickHouse/ClickHouse/issues/48854). [#49948](https://github.com/ClickHouse/ClickHouse/pull/49948) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added a function "space" which repeats a space as many times as specified. [#50103](https://github.com/ClickHouse/ClickHouse/pull/50103) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added --input_format_csv_trim_whitespaces option. [#50215](https://github.com/ClickHouse/ClickHouse/pull/50215) ([Alexey Gerasimchuk](https://github.com/Demilivor)).
-* Allow the `dictGetAll` function for regexp tree dictionaries to return values from multiple matches as arrays. Closes [#50254](https://github.com/ClickHouse/ClickHouse/issues/50254). [#50255](https://github.com/ClickHouse/ClickHouse/pull/50255) ([Johann Gan](https://github.com/johanngan)).
-* Added `toLastDayOfWeek` function to round a date or a date with time up to the nearest Saturday or Sunday. [#50315](https://github.com/ClickHouse/ClickHouse/pull/50315) ([Victor Krasnov](https://github.com/sirvickr)).
-* Ability to ignore a skip index by specifying `ignore_data_skipping_indices`. [#50329](https://github.com/ClickHouse/ClickHouse/pull/50329) ([Boris Kuschel](https://github.com/bkuschel)).
-* Add `system.user_processes` table and `SHOW USER PROCESSES` query to show memory info and ProfileEvents on user level. [#50492](https://github.com/ClickHouse/ClickHouse/pull/50492) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
-* Add server and format settings `display_secrets_in_show_and_select` for displaying secrets of tables, databases, table functions, and dictionaries. Add privilege `displaySecretsInShowAndSelect` controlling which users can view secrets. [#46528](https://github.com/ClickHouse/ClickHouse/pull/46528) ([Mike Kot](https://github.com/myrrc)).
-* Allow to set up a ROW POLICY for all tables that belong to a DATABASE. [#47640](https://github.com/ClickHouse/ClickHouse/pull/47640) ([Ilya Golshtein](https://github.com/ilejn)).
+* Support reading and writing backups as `tar` (in addition to `zip`). [#59535](https://github.com/ClickHouse/ClickHouse/pull/59535) ([josh-hildred](https://github.com/josh-hildred)).
+* Implemented support for S3 Express buckets. [#59965](https://github.com/ClickHouse/ClickHouse/pull/59965) ([Nikita Taranov](https://github.com/nickitat)).
+* Allow to attach parts from a different disk (using copy instead of hard link). [#60112](https://github.com/ClickHouse/ClickHouse/pull/60112) ([Unalian](https://github.com/Unalian)).
+* Size-capped `Memory` tables: controlled by their settings, `min_bytes_to_keep, max_bytes_to_keep, min_rows_to_keep` and `max_rows_to_keep`. [#60612](https://github.com/ClickHouse/ClickHouse/pull/60612) ([Jake Bamrah](https://github.com/JakeBamrah)).
+* Separate limits on number of waiting and executing queries. Added new server setting `max_waiting_queries` that limits the number of queries waiting due to `async_load_databases`. Existing limits on number of executing queries no longer count waiting queries. [#61053](https://github.com/ClickHouse/ClickHouse/pull/61053) ([Sergei Trifonov](https://github.com/serxa)).
+* Added a table `system.keywords` which contains all the keywords from parser. Mostly needed and will be used for better fuzzing and syntax highlighting. [#51808](https://github.com/ClickHouse/ClickHouse/pull/51808) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add support for `ATTACH PARTITION ALL`. [#61107](https://github.com/ClickHouse/ClickHouse/pull/61107) ([Kirill Nikiforov](https://github.com/allmazz)).
+* Add a new function, `getClientHTTPHeader`. This closes [#54665](https://github.com/ClickHouse/ClickHouse/issues/54665). Co-authored with @lingtaolf. [#61820](https://github.com/ClickHouse/ClickHouse/pull/61820) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add `generate_series` as a table function (compatibility alias for PostgreSQL to the existing `numbers` function). This function generates table with an arithmetic progression with natural numbers. [#59390](https://github.com/ClickHouse/ClickHouse/pull/59390) ([divanik](https://github.com/divanik)).
+* A mode for `topK`/`topkWeighed` support mode, which return count of values and its error. [#54508](https://github.com/ClickHouse/ClickHouse/pull/54508) ([UnamedRus](https://github.com/UnamedRus)).
+* Added function `toMillisecond` which returns the millisecond component for values of type`DateTime` or `DateTime64`. [#60281](https://github.com/ClickHouse/ClickHouse/pull/60281) ([Shaun Struwig](https://github.com/Blargian)).
+* Allow configuring HTTP redirect handlers for clickhouse-server. For example, you can make `/` redirect to the Play UI. [#60390](https://github.com/ClickHouse/ClickHouse/pull/60390) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
 #### Performance Improvement
-* Compress marks and primary key by default. It significantly reduces the cold query time. Upgrade notes: the support for compressed marks and primary key has been added in version 22.9. If you turned on compressed marks or primary key or installed version 23.5 or newer, which has compressed marks or primary key on by default, you will not be able to downgrade to version 22.8 or earlier. You can also explicitly disable compressed marks or primary keys by specifying the `compress_marks` and `compress_primary_key` settings in the `<merge_tree>` section of the server configuration file. [#42587](https://github.com/ClickHouse/ClickHouse/pull/42587) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* New setting s3_max_inflight_parts_for_one_file sets the limit of concurrently loaded parts with multipart upload request in scope of one file. [#49961](https://github.com/ClickHouse/ClickHouse/pull/49961) ([Sema Checherinda](https://github.com/CheSema)).
-* When reading from multiple files reduce parallel parsing threads for each file. Resolves [#42192](https://github.com/ClickHouse/ClickHouse/issues/42192). [#46661](https://github.com/ClickHouse/ClickHouse/pull/46661) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Use aggregate projection only if it reads fewer granules than normal reading. It should help in case if query hits the PK of the table, but not the projection. Fixes [#49150](https://github.com/ClickHouse/ClickHouse/issues/49150). [#49417](https://github.com/ClickHouse/ClickHouse/pull/49417) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Do not store blocks in `ANY` hash join if nothing is inserted. [#48633](https://github.com/ClickHouse/ClickHouse/pull/48633) ([vdimir](https://github.com/vdimir)).
-* Fixes aggregate combinator `-If` when JIT compiled, and enable JIT compilation for aggregate functions. Closes [#48120](https://github.com/ClickHouse/ClickHouse/issues/48120). [#49083](https://github.com/ClickHouse/ClickHouse/pull/49083) ([Igor Nikonov](https://github.com/devcrafter)).
-* For reading from remote tables we use smaller tasks (instead of reading the whole part) to make tasks stealing work * task size is determined by size of columns to read * always use 1mb buffers for reading from s3 * boundaries of cache segments aligned to 1mb so they have decent size even with small tasks. it also should prevent fragmentation. [#49287](https://github.com/ClickHouse/ClickHouse/pull/49287) ([Nikita Taranov](https://github.com/nickitat)).
-* Introduced settings: - `merge_max_block_size_bytes` to limit the amount of memory used for background operations. - `vertical_merge_algorithm_min_bytes_to_activate` to add another condition to activate vertical merges. [#49313](https://github.com/ClickHouse/ClickHouse/pull/49313) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Default size of a read buffer for reading from local filesystem changed to a slightly better value. Also two new settings are introduced: `max_read_buffer_size_local_fs` and `max_read_buffer_size_remote_fs`. [#49321](https://github.com/ClickHouse/ClickHouse/pull/49321) ([Nikita Taranov](https://github.com/nickitat)).
-* Improve memory usage and speed of `SPARSE_HASHED`/`HASHED` dictionaries (e.g. `SPARSE_HASHED` now eats 2.6x less memory, and is ~2x faster). [#49380](https://github.com/ClickHouse/ClickHouse/pull/49380) ([Azat Khuzhin](https://github.com/azat)).
-* Optimize the `system.query_log` and `system.query_thread_log` tables by applying `LowCardinality` when appropriate. The queries over these tables will be faster. [#49530](https://github.com/ClickHouse/ClickHouse/pull/49530) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Better performance when reading local `Parquet` files (through parallel reading). [#49539](https://github.com/ClickHouse/ClickHouse/pull/49539) ([Michael Kolupaev](https://github.com/al13n321)).
-* Improve the performance of `RIGHT/FULL JOIN` by up to 2 times in certain scenarios, especially when joining a small left table with a large right table. [#49585](https://github.com/ClickHouse/ClickHouse/pull/49585) ([lgbo](https://github.com/lgbo-ustc)).
-* Improve performance of BLAKE3 by 11% by enabling LTO for Rust. [#49600](https://github.com/ClickHouse/ClickHouse/pull/49600) ([Azat Khuzhin](https://github.com/azat)). Now it is on par with C++.
-* Optimize the structure of the `system.opentelemetry_span_log`. Use `LowCardinality` where appropriate. Although this table is generally stupid (it is using the Map data type even for common attributes), it will be slightly better. [#49647](https://github.com/ClickHouse/ClickHouse/pull/49647) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Try to reserve hash table's size in `grace_hash` join. [#49816](https://github.com/ClickHouse/ClickHouse/pull/49816) ([lgbo](https://github.com/lgbo-ustc)).
-* Parallel merge of `uniqExactIf` states. Closes [#49885](https://github.com/ClickHouse/ClickHouse/issues/49885). [#50285](https://github.com/ClickHouse/ClickHouse/pull/50285) ([flynn](https://github.com/ucasfl)).
-* Keeper improvement: add `CheckNotExists` request to Keeper, which allows to improve the performance of Replicated tables. [#48897](https://github.com/ClickHouse/ClickHouse/pull/48897) ([Antonio Andelic](https://github.com/antonio2368)).
-* Keeper performance improvements: avoid serializing same request twice while processing. Cache deserialization results of large requests. Controlled by new coordination setting `min_request_size_for_cache`. [#49004](https://github.com/ClickHouse/ClickHouse/pull/49004) ([Antonio Andelic](https://github.com/antonio2368)).
-* Reduced number of `List` ZooKeeper requests when selecting parts to merge and a lot of partitions do not have anything to merge. [#49637](https://github.com/ClickHouse/ClickHouse/pull/49637) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Rework locking in the FS cache [#44985](https://github.com/ClickHouse/ClickHouse/pull/44985) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Disable pure parallel replicas if trivial count optimization is possible. [#50594](https://github.com/ClickHouse/ClickHouse/pull/50594) ([Raúl Marín](https://github.com/Algunenano)).
-* Don't send head request for all keys in Iceberg schema inference, only for keys that are used for reaing data. [#50203](https://github.com/ClickHouse/ClickHouse/pull/50203) ([Kruglov Pavel](https://github.com/Avogar)).
-* Setting `enable_memory_bound_merging_of_aggregation_results` is enabled by default. [#50319](https://github.com/ClickHouse/ClickHouse/pull/50319) ([Nikita Taranov](https://github.com/nickitat)).
+* Optimized function `dotProduct` to omit unnecessary and expensive memory copies. [#60928](https://github.com/ClickHouse/ClickHouse/pull/60928) ([Robert Schulze](https://github.com/rschu1ze)).
+* 30x faster printing for 256-bit integers. [#61100](https://github.com/ClickHouse/ClickHouse/pull/61100) ([Raúl Marín](https://github.com/Algunenano)).
+* If the table's primary key contains mostly useless columns, don't keep them in memory. This is controlled by a new setting `primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns` with the value `0.9` by default, which means: for a composite primary key, if a column changes its value for at least 0.9 of all the times, the next columns after it will be not loaded. [#60255](https://github.com/ClickHouse/ClickHouse/pull/60255) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve the performance of serialized aggregation method when involving multiple `Nullable` columns. [#55809](https://github.com/ClickHouse/ClickHouse/pull/55809) ([Amos Bird](https://github.com/amosbird)).
+* Lazy build JSON's output to improve performance of ALL JOIN. [#58278](https://github.com/ClickHouse/ClickHouse/pull/58278) ([LiuNeng](https://github.com/liuneng1994)).
+* Make HTTP/HTTPs connections with external services, such as AWS S3 reusable for all uses cases. Even when response is 3xx or 4xx. [#58845](https://github.com/ClickHouse/ClickHouse/pull/58845) ([Sema Checherinda](https://github.com/CheSema)).
+* Improvements to aggregate functions `argMin` / `argMax` / `any` / `anyLast` / `anyHeavy`, as well as `ORDER BY {u8/u16/u32/u64/i8/i16/u32/i64) LIMIT 1` queries. [#58640](https://github.com/ClickHouse/ClickHouse/pull/58640) ([Raúl Marín](https://github.com/Algunenano)).
+* Trivial optimization for column's filter. Peak memory can be reduced to 44% of the original in some cases. [#59698](https://github.com/ClickHouse/ClickHouse/pull/59698) ([�扬](https://github.com/taiyang-li)).
+* Execute `multiIf` function in a columnar fashion when the result type's underlying type is a number. [#60384](https://github.com/ClickHouse/ClickHouse/pull/60384) ([�扬](https://github.com/taiyang-li)).
+* Faster (almost 2x) mutexes. [#60823](https://github.com/ClickHouse/ClickHouse/pull/60823) ([Azat Khuzhin](https://github.com/azat)).
+* Drain multiple connections in parallel when a distributed query is finishing. [#60845](https://github.com/ClickHouse/ClickHouse/pull/60845) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Optimize data movement between columns of a Nullable number or a Nullable string, which improves some micro-benchmarks. [#60846](https://github.com/ClickHouse/ClickHouse/pull/60846) ([�扬](https://github.com/taiyang-li)).
+* Operations with the filesystem cache will suffer less from the lock contention. [#61066](https://github.com/ClickHouse/ClickHouse/pull/61066) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Optimize array join and other JOINs by preventing a wrong compiler's optimization. Close [#61074](https://github.com/ClickHouse/ClickHouse/issues/61074).  [#61075](https://github.com/ClickHouse/ClickHouse/pull/61075) ([�扬](https://github.com/taiyang-li)).
+* If a query with a syntax error contained `COLUMNS` matcher with a regular expression, the regular expression was compiled each time during the parser's backtracking, instead of being compiled once. This was a fundamental error. The compiled regexp was put to AST. But the letter A in AST means "abstract" which means it should not contain heavyweight objects. Parts of AST can be created and discarded during parsing, including a large number of backtracking. This leads to slowness on the parsing side and consequently allows DoS by a readonly user. But the main problem is that it prevents progress in fuzzers. [#61543](https://github.com/ClickHouse/ClickHouse/pull/61543) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a new analyzer pass to optimize the IN operator for a single value. [#61564](https://github.com/ClickHouse/ClickHouse/pull/61564) ([LiuNeng](https://github.com/liuneng1994)).
+* DNSResolver shuffles set of resolved IPs which is needed to uniformly utilize multiple endpoints of AWS S3. [#60965](https://github.com/ClickHouse/ClickHouse/pull/60965) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### Experimental Feature
-* `DEFLATE_QPL` codec lower the minimum simd version to SSE 4.2. [doc change in qpl](https://github.com/intel/qpl/commit/3f8f5cea27739f5261e8fd577dc233ffe88bf679) - Intel® QPL relies on a run-time kernels dispatcher and cpuid check to choose the best available implementation(sse/avx2/avx512) - restructured cmakefile for qpl build in clickhouse to align with latest upstream qpl. [#49811](https://github.com/ClickHouse/ClickHouse/pull/49811) ([jasperzhu](https://github.com/jinjunzh)).
-* Add initial support to do JOINs with pure parallel replicas. [#49544](https://github.com/ClickHouse/ClickHouse/pull/49544) ([Raúl Marín](https://github.com/Algunenano)).
-* More parallelism on `Outdated` parts removal with "zero-copy replication". [#49630](https://github.com/ClickHouse/ClickHouse/pull/49630) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Parallel Replicas: 1) Fixed an error `NOT_FOUND_COLUMN_IN_BLOCK` in case of using parallel replicas with non-replicated storage with disabled setting `parallel_replicas_for_non_replicated_merge_tree` 2) Now `allow_experimental_parallel_reading_from_replicas` have 3 possible values - 0, 1 and 2. 0 - disabled, 1 - enabled, silently disable them in case of failure (in case of FINAL or JOIN), 2 - enabled, throw an exception in case of failure. 3) If FINAL modifier is used in SELECT query and parallel replicas are enabled, ClickHouse will try to disable them if `allow_experimental_parallel_reading_from_replicas` is set to 1 and throw an exception otherwise. [#50195](https://github.com/ClickHouse/ClickHouse/pull/50195) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* When parallel replicas are enabled they will always skip unavailable servers (the behavior is controlled by the setting `skip_unavailable_shards`, enabled by default and can be only disabled). This closes: [#48565](https://github.com/ClickHouse/ClickHouse/issues/48565). [#50293](https://github.com/ClickHouse/ClickHouse/pull/50293) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Support parallel reading for Azure blob storage. This improves the performance of the experimental Azure object storage. [#61503](https://github.com/ClickHouse/ClickHouse/pull/61503) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Add asynchronous WriteBuffer for Azure blob storage similar to S3. This improves the performance of the experimental Azure object storage. [#59929](https://github.com/ClickHouse/ClickHouse/pull/59929) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Use managed identity for backups IO when using Azure Blob Storage. Add a setting to prevent ClickHouse from attempting to create a non-existent container, which requires permissions at the storage account level. [#61785](https://github.com/ClickHouse/ClickHouse/pull/61785) ([Daniel Pozo Escalona](https://github.com/danipozo)).
+* Add a setting `parallel_replicas_allow_in_with_subquery = 1` which allows subqueries for IN work with parallel replicas. [#60950](https://github.com/ClickHouse/ClickHouse/pull/60950) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* A change for the "zero-copy" replication: all zero copy locks related to a table have to be dropped when the table is dropped. The directory which contains these locks has to be removed also. [#57575](https://github.com/ClickHouse/ClickHouse/pull/57575) ([Sema Checherinda](https://github.com/CheSema)).
 
 #### Improvement
-* The `BACKUP` command will not decrypt data from encrypted disks while making a backup. Instead the data will be stored in a backup in encrypted form. Such backups can be restored only to an encrypted disk with the same (or extended) list of encryption keys. [#48896](https://github.com/ClickHouse/ClickHouse/pull/48896) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Added possibility to use temporary tables in FROM part of ATTACH PARTITION FROM and REPLACE PARTITION FROM. [#49436](https://github.com/ClickHouse/ClickHouse/pull/49436) ([Roman Vasin](https://github.com/rvasin)).
-* Added setting `async_insert` for `MergeTree` tables. It has the same meaning as query-level setting `async_insert` and enables asynchronous inserts for specific table. Note: it doesn't take effect for insert queries from `clickhouse-client`, use query-level setting in that case. [#49122](https://github.com/ClickHouse/ClickHouse/pull/49122) ([Anton Popov](https://github.com/CurtizJ)).
-* Add support for size suffixes in quota creation statement parameters. [#49087](https://github.com/ClickHouse/ClickHouse/pull/49087) ([Eridanus](https://github.com/Eridanus117)).
-* Extend `first_value` and `last_value` to accept NULL. [#46467](https://github.com/ClickHouse/ClickHouse/pull/46467) ([lgbo](https://github.com/lgbo-ustc)).
-* Add alias `str_to_map` and `mapFromString` for `extractKeyValuePairs`. closes https://github.com/clickhouse/clickhouse/issues/47185. [#49466](https://github.com/ClickHouse/ClickHouse/pull/49466) ([flynn](https://github.com/ucasfl)).
-* Add support for CGroup version 2 for asynchronous metrics about the memory usage and availability. This closes [#37983](https://github.com/ClickHouse/ClickHouse/issues/37983). [#45999](https://github.com/ClickHouse/ClickHouse/pull/45999) ([sichenzhao](https://github.com/sichenzhao)).
-* Cluster table functions should always skip unavailable shards. close [#46314](https://github.com/ClickHouse/ClickHouse/issues/46314). [#46765](https://github.com/ClickHouse/ClickHouse/pull/46765) ([zk_kiger](https://github.com/zk-kiger)).
-* Allow CSV file to contain empty columns in its header. [#47496](https://github.com/ClickHouse/ClickHouse/pull/47496) ([你��过�啊](https://github.com/iiiuwioajdks)).
-* Add Google Cloud Storage S3 compatible table function `gcs`. Like the `oss` and `cosn` functions, it is just an alias over the `s3` table function, and it does not bring any new features. [#47815](https://github.com/ClickHouse/ClickHouse/pull/47815) ([Kuba Kaflik](https://github.com/jkaflik)).
-* Add ability to use strict parts size for S3 (compatibility with CloudFlare R2 S3 Storage). [#48492](https://github.com/ClickHouse/ClickHouse/pull/48492) ([Azat Khuzhin](https://github.com/azat)).
-* Added new columns with info about `Replicated` database replicas to `system.clusters`: `database_shard_name`, `database_replica_name`, `is_active`. Added an optional `FROM SHARD` clause to `SYSTEM DROP DATABASE REPLICA` query. [#48548](https://github.com/ClickHouse/ClickHouse/pull/48548) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Add a new column `zookeeper_name` in system.replicas, to indicate on which (auxiliary) zookeeper cluster the replicated table's metadata is stored. [#48549](https://github.com/ClickHouse/ClickHouse/pull/48549) ([cangyin](https://github.com/cangyin)).
-* `IN` operator support the comparison of `Date` and `Date32`. Closes [#48736](https://github.com/ClickHouse/ClickHouse/issues/48736). [#48806](https://github.com/ClickHouse/ClickHouse/pull/48806) ([flynn](https://github.com/ucasfl)).
-* Support for erasure codes in `HDFS`, author: @M1eyu2018, @tomscut. [#48833](https://github.com/ClickHouse/ClickHouse/pull/48833) ([M1eyu](https://github.com/M1eyu2018)).
-* Implement SYSTEM DROP REPLICA from auxiliary ZooKeeper clusters, may be close [#48931](https://github.com/ClickHouse/ClickHouse/issues/48931). [#48932](https://github.com/ClickHouse/ClickHouse/pull/48932) ([wangxiaobo](https://github.com/wzb5212)).
-* Add Array data type to MongoDB. Closes [#48598](https://github.com/ClickHouse/ClickHouse/issues/48598). [#48983](https://github.com/ClickHouse/ClickHouse/pull/48983) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Support storing `Interval` data types in tables. [#49085](https://github.com/ClickHouse/ClickHouse/pull/49085) ([larryluogit](https://github.com/larryluogit)).
-* Allow using `ntile` window function without explicit window frame definition: `ntile(3) OVER (ORDER BY a)`, close [#46763](https://github.com/ClickHouse/ClickHouse/issues/46763). [#49093](https://github.com/ClickHouse/ClickHouse/pull/49093) ([vdimir](https://github.com/vdimir)).
-* Added settings (`number_of_mutations_to_delay`, `number_of_mutations_to_throw`) to delay or throw `ALTER` queries that create mutations (`ALTER UPDATE`, `ALTER DELETE`, `ALTER MODIFY COLUMN`, ...) in case when table already has a lot of unfinished mutations. [#49117](https://github.com/ClickHouse/ClickHouse/pull/49117) ([Anton Popov](https://github.com/CurtizJ)).
-* Catch exception from `create_directories` in filesystem cache. [#49203](https://github.com/ClickHouse/ClickHouse/pull/49203) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Copies embedded examples to a new field `example` in `system.functions` to supplement the field `description`. [#49222](https://github.com/ClickHouse/ClickHouse/pull/49222) ([Dan Roscigno](https://github.com/DanRoscigno)).
-* Enable connection options for the MongoDB dictionary. Example: ``` 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> ``` ### Documentation entry for user-facing changes. [#49225](https://github.com/ClickHouse/ClickHouse/pull/49225) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* Added an alias `asymptotic` for `asymp` computational method for `kolmogorovSmirnovTest`. Improved documentation. [#49286](https://github.com/ClickHouse/ClickHouse/pull/49286) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Aggregation function groupBitAnd/Or/Xor now work on signed integer data. This makes them consistent with the behavior of scalar functions bitAnd/Or/Xor. [#49292](https://github.com/ClickHouse/ClickHouse/pull/49292) ([exmy](https://github.com/exmy)).
-* Split function-documentation into more fine-granular fields. [#49300](https://github.com/ClickHouse/ClickHouse/pull/49300) ([Robert Schulze](https://github.com/rschu1ze)).
-* Use multiple threads shared between all tables within a server to load outdated data parts. The the size of the pool and its queue is controlled by `max_outdated_parts_loading_thread_pool_size` and `outdated_part_loading_thread_pool_queue_size` settings. [#49317](https://github.com/ClickHouse/ClickHouse/pull/49317) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Don't overestimate the size of processed data for `LowCardinality` columns when they share dictionaries between blocks. This closes [#49322](https://github.com/ClickHouse/ClickHouse/issues/49322). See also [#48745](https://github.com/ClickHouse/ClickHouse/issues/48745). [#49323](https://github.com/ClickHouse/ClickHouse/pull/49323) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Parquet writer now uses reasonable row group size when invoked through `OUTFILE`. [#49325](https://github.com/ClickHouse/ClickHouse/pull/49325) ([Michael Kolupaev](https://github.com/al13n321)).
-* Allow restricted keywords like `ARRAY` as an alias if the alias is quoted. Closes [#49324](https://github.com/ClickHouse/ClickHouse/issues/49324). [#49360](https://github.com/ClickHouse/ClickHouse/pull/49360) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Data parts loading and deletion jobs were moved to shared server-wide pools instead of per-table pools. Pools sizes are controlled via settings `max_active_parts_loading_thread_pool_size`, `max_outdated_parts_loading_thread_pool_size` and `max_parts_cleaning_thread_pool_size` in top-level config. Table-level settings `max_part_loading_threads` and `max_part_removal_threads` became obsolete. [#49474](https://github.com/ClickHouse/ClickHouse/pull/49474) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Allow `?password=pass` in URL of the Play UI. Password is replaced in browser history. [#49505](https://github.com/ClickHouse/ClickHouse/pull/49505) ([Mike Kot](https://github.com/myrrc)).
-* Allow reading zero-size objects from remote filesystems. (because empty files are not backup'd, so we might end up with zero blobs in metadata file). Closes [#49480](https://github.com/ClickHouse/ClickHouse/issues/49480). [#49519](https://github.com/ClickHouse/ClickHouse/pull/49519) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Attach thread MemoryTracker to `total_memory_tracker` after `ThreadGroup` detached. [#49527](https://github.com/ClickHouse/ClickHouse/pull/49527) ([Dmitry Novik](https://github.com/novikd)).
-* Fix parameterized views when a query parameter is used multiple times in the query. [#49556](https://github.com/ClickHouse/ClickHouse/pull/49556) ([Azat Khuzhin](https://github.com/azat)).
-* Release memory allocated for the last sent ProfileEvents snapshot in the context of a query. Followup [#47564](https://github.com/ClickHouse/ClickHouse/issues/47564). [#49561](https://github.com/ClickHouse/ClickHouse/pull/49561) ([Dmitry Novik](https://github.com/novikd)).
-* Function "makeDate" now provides a MySQL-compatible overload (year & day of the year argument). [#49603](https://github.com/ClickHouse/ClickHouse/pull/49603) ([Robert Schulze](https://github.com/rschu1ze)).
-* Support `dictionary` table function for `RegExpTreeDictionary`. [#49666](https://github.com/ClickHouse/ClickHouse/pull/49666) ([Han Fei](https://github.com/hanfei1991)).
-* Added weighted fair IO scheduling policy. Added dynamic resource manager, which allows IO scheduling hierarchy to be updated in runtime w/o server restarts. [#49671](https://github.com/ClickHouse/ClickHouse/pull/49671) ([Sergei Trifonov](https://github.com/serxa)).
-* Add compose request after multipart upload to GCS. This enables the usage of copy operation on objects uploaded with the multipart upload. It's recommended to set `s3_strict_upload_part_size` to some value because compose request can fail on objects created with parts of different sizes. [#49693](https://github.com/ClickHouse/ClickHouse/pull/49693) ([Antonio Andelic](https://github.com/antonio2368)).
-* For the `extractKeyValuePairs` function: improve the "best-effort" parsing logic to accept `key_value_delimiter` as a valid part of the value. This also simplifies branching and might even speed up things a bit. [#49760](https://github.com/ClickHouse/ClickHouse/pull/49760) ([Arthur Passos](https://github.com/arthurpassos)).
-* Add `initial_query_id` field for system.processors_profile_log [#49777](https://github.com/ClickHouse/ClickHouse/pull/49777) ([helifu](https://github.com/helifu)).
-* System log tables can now have custom sorting keys. [#49778](https://github.com/ClickHouse/ClickHouse/pull/49778) ([helifu](https://github.com/helifu)).
-* A new field `partitions` to `system.query_log` is used to indicate which partitions are participating in the calculation. [#49779](https://github.com/ClickHouse/ClickHouse/pull/49779) ([helifu](https://github.com/helifu)).
-* Added `enable_the_endpoint_id_with_zookeeper_name_prefix` setting for `ReplicatedMergeTree` (disabled by default). When enabled, it adds ZooKeeper cluster name to table's interserver communication endpoint. It avoids `Duplicate interserver IO endpoint` errors when having replicated tables with the same path, but different auxiliary ZooKeepers. [#49780](https://github.com/ClickHouse/ClickHouse/pull/49780) ([helifu](https://github.com/helifu)).
-* Add query parameters to `clickhouse-local`. Closes [#46561](https://github.com/ClickHouse/ClickHouse/issues/46561). [#49785](https://github.com/ClickHouse/ClickHouse/pull/49785) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Allow loading dictionaries and functions from YAML by default. In previous versions, it required editing the `dictionaries_config` or `user_defined_executable_functions_config` in the configuration file, as they expected `*.xml` files. [#49812](https://github.com/ClickHouse/ClickHouse/pull/49812) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The Kafka table engine now allows to use alias columns. [#49824](https://github.com/ClickHouse/ClickHouse/pull/49824) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-* Add setting to limit the max number of pairs produced by `extractKeyValuePairs`, a safeguard to avoid using way too much memory. [#49836](https://github.com/ClickHouse/ClickHouse/pull/49836) ([Arthur Passos](https://github.com/arthurpassos)).
-* Add support for (an unusual) case where the arguments in the `IN` operator are single-element tuples. [#49844](https://github.com/ClickHouse/ClickHouse/pull/49844) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
-* `bitHammingDistance` function support `String` and `FixedString` data type. Closes [#48827](https://github.com/ClickHouse/ClickHouse/issues/48827). [#49858](https://github.com/ClickHouse/ClickHouse/pull/49858) ([flynn](https://github.com/ucasfl)).
-* Fix timeout resetting errors in the client on OS X. [#49863](https://github.com/ClickHouse/ClickHouse/pull/49863) ([alekar](https://github.com/alekar)).
-* Add support for big integers, such as UInt128, Int128, UInt256, and Int256 in the function `bitCount`. This enables Hamming distance over large bit masks for AI applications. [#49867](https://github.com/ClickHouse/ClickHouse/pull/49867) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fingerprints to be used instead of key IDs in encrypted disks. This simplifies the configuration of encrypted disks. [#49882](https://github.com/ClickHouse/ClickHouse/pull/49882) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add UUID data type to PostgreSQL. Closes [#49739](https://github.com/ClickHouse/ClickHouse/issues/49739). [#49894](https://github.com/ClickHouse/ClickHouse/pull/49894) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Function `toUnixTimestamp` now accepts `Date` and `Date32` arguments. [#49989](https://github.com/ClickHouse/ClickHouse/pull/49989) ([Victor Krasnov](https://github.com/sirvickr)).
-* Charge only server memory for dictionaries. [#49995](https://github.com/ClickHouse/ClickHouse/pull/49995) ([Azat Khuzhin](https://github.com/azat)).
-* The server will allow using the `SQL_*` settings such as `SQL_AUTO_IS_NULL` as no-ops for MySQL compatibility. This closes [#49927](https://github.com/ClickHouse/ClickHouse/issues/49927). [#50013](https://github.com/ClickHouse/ClickHouse/pull/50013) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Preserve initial_query_id for ON CLUSTER queries, which is useful for introspection (under `distributed_ddl_entry_format_version=5`). [#50015](https://github.com/ClickHouse/ClickHouse/pull/50015) ([Azat Khuzhin](https://github.com/azat)).
-* Preserve backward incompatibility for renamed settings by using aliases (`allow_experimental_projection_optimization` for `optimize_use_projections`, `allow_experimental_lightweight_delete` for `enable_lightweight_delete`). [#50044](https://github.com/ClickHouse/ClickHouse/pull/50044) ([Azat Khuzhin](https://github.com/azat)).
-* Support passing FQDN through setting my_hostname to register cluster node in keeper. Add setting of invisible to support multi compute groups. A compute group as a cluster, is invisible to other compute groups. [#50186](https://github.com/ClickHouse/ClickHouse/pull/50186) ([Yangkuan Liu](https://github.com/LiuYangkuan)).
-* Fix PostgreSQL reading all the data even though `LIMIT n` could be specified. [#50187](https://github.com/ClickHouse/ClickHouse/pull/50187) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add new profile events for queries with subqueries (`QueriesWithSubqueries`/`SelectQueriesWithSubqueries`/`InsertQueriesWithSubqueries`). [#50204](https://github.com/ClickHouse/ClickHouse/pull/50204) ([Azat Khuzhin](https://github.com/azat)).
-* Adding the roles field in the users.xml file, which allows specifying roles with grants via a config file. [#50278](https://github.com/ClickHouse/ClickHouse/pull/50278) ([pufit](https://github.com/pufit)).
-* Report `CGroupCpuCfsPeriod` and `CGroupCpuCfsQuota` in AsynchronousMetrics. - Respect cgroup v2 memory limits during server startup. [#50379](https://github.com/ClickHouse/ClickHouse/pull/50379) ([alekar](https://github.com/alekar)).
-* Add a signal handler for SIGQUIT to work the same way as SIGINT. Closes [#50298](https://github.com/ClickHouse/ClickHouse/issues/50298). [#50435](https://github.com/ClickHouse/ClickHouse/pull/50435) ([Nikolay Degterinsky](https://github.com/evillique)).
-* In case JSON parse fails due to the large size of the object output the last position to allow debugging. [#50474](https://github.com/ClickHouse/ClickHouse/pull/50474) ([Valentin Alexeev](https://github.com/valentinalexeev)).
-* Support decimals with not fixed size. Closes [#49130](https://github.com/ClickHouse/ClickHouse/issues/49130). [#50586](https://github.com/ClickHouse/ClickHouse/pull/50586) ([Kruglov Pavel](https://github.com/Avogar)).
+* Use `MergeTree` as a default table engine. [#60524](https://github.com/ClickHouse/ClickHouse/pull/60524) ([Alexey Milovidov](https://github.com/alexey-milovidov))
+* Enable `output_format_pretty_row_numbers` by default. It is better for usability. [#61791](https://github.com/ClickHouse/ClickHouse/pull/61791) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* In the previous version, some numbers in Pretty formats were not pretty enough. [#61794](https://github.com/ClickHouse/ClickHouse/pull/61794) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* A long value in Pretty formats won't be cut if it is the single value in the resultset, such as in the result of the `SHOW CREATE TABLE` query. [#61795](https://github.com/ClickHouse/ClickHouse/pull/61795) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Similarly to `clickhouse-local`, `clickhouse-client` will accept the `--output-format` option as a synonym to the `--format` option. This closes [#59848](https://github.com/ClickHouse/ClickHouse/issues/59848). [#61797](https://github.com/ClickHouse/ClickHouse/pull/61797) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* If stdout is a terminal and the output format is not specified, `clickhouse-client` and similar tools will use `PrettyCompact` by default, similarly to the interactive mode. `clickhouse-client` and `clickhouse-local` will handle command line arguments for input and output formats in a unified fashion. This closes [#61272](https://github.com/ClickHouse/ClickHouse/issues/61272). [#61800](https://github.com/ClickHouse/ClickHouse/pull/61800) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Underscore digit groups in Pretty formats for better readability. This is controlled by a new setting, `output_format_pretty_highlight_digit_groups`. [#61802](https://github.com/ClickHouse/ClickHouse/pull/61802) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add ability to override initial INSERT settings via `SYSTEM FLUSH DISTRIBUTED`. [#61832](https://github.com/ClickHouse/ClickHouse/pull/61832) ([Azat Khuzhin](https://github.com/azat)).
+* Enable processors profiling (time spent/in and out bytes for sorting, aggregation, ...) by default. [#61096](https://github.com/ClickHouse/ClickHouse/pull/61096) ([Azat Khuzhin](https://github.com/azat)).
+* Support files without format extension in Filesystem database. [#60795](https://github.com/ClickHouse/ClickHouse/pull/60795) ([Kruglov Pavel](https://github.com/Avogar)).
+* Make all format names case insensitive, like Tsv, or TSV, or tsv, or even rowbinary. [#60420](https://github.com/ClickHouse/ClickHouse/pull/60420) ([豪肥肥](https://github.com/HowePa)). I appreciate if you will continue to write it correctly, e.g., `JSON` 😇, not `Json` 🤮, but we don't mind if you spell it as you prefer.
+* Added `none_only_active` mode for `distributed_ddl_output_mode` setting. [#60340](https://github.com/ClickHouse/ClickHouse/pull/60340) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* The advanced dashboard has slightly better colors for multi-line graphs. [#60391](https://github.com/ClickHouse/ClickHouse/pull/60391) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The Advanced dashboard now has controls always visible on scrolling. This allows you to add a new chart without scrolling up. [#60692](https://github.com/ClickHouse/ClickHouse/pull/60692) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* While running the `MODIFY COLUMN` query for materialized views, check the inner table's structure to ensure every column exists. [#47427](https://github.com/ClickHouse/ClickHouse/pull/47427) ([sunny](https://github.com/sunny19930321)).
+* String types and Enums can be used in the same context, such as: arrays, UNION queries, conditional expressions. This closes [#60726](https://github.com/ClickHouse/ClickHouse/issues/60726). [#60727](https://github.com/ClickHouse/ClickHouse/pull/60727) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow declaring Enums in the structure of external data for query processing (this is an immediate temporary table that you can provide for your query). [#57857](https://github.com/ClickHouse/ClickHouse/pull/57857) ([Duc Canh Le](https://github.com/canhld94)).
+* Consider lightweight deleted rows when selecting parts to merge, so the disk size of the resulting part will be estimated better. [#58223](https://github.com/ClickHouse/ClickHouse/pull/58223) ([Zhuo Qiu](https://github.com/jewelzqiu)).
+* Added comments for columns for more system tables. Continuation of https://github.com/ClickHouse/ClickHouse/pull/58356. [#59016](https://github.com/ClickHouse/ClickHouse/pull/59016) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Now we can use virtual columns in PREWHERE. It's worthwhile for non-const virtual columns like `_part_offset`. [#59033](https://github.com/ClickHouse/ClickHouse/pull/59033) ([Amos Bird](https://github.com/amosbird)). Improved overall usability of virtual columns. Now it is allowed to use virtual columns in `PREWHERE` (it's worthwhile for non-const virtual columns like `_part_offset`). Now a builtin documentation is available for virtual columns as a comment of column in `DESCRIBE` query with enabled setting `describe_include_virtual_columns`. [#60205](https://github.com/ClickHouse/ClickHouse/pull/60205) ([Anton Popov](https://github.com/CurtizJ)).
+* Instead of using a constant key, now object storage generates key for determining remove objects capability. [#59495](https://github.com/ClickHouse/ClickHouse/pull/59495) ([Sema Checherinda](https://github.com/CheSema)).
+* Allow "local" as object storage type instead of "local_blob_storage". [#60165](https://github.com/ClickHouse/ClickHouse/pull/60165) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Parallel flush of pending INSERT blocks of Distributed engine on `DETACH`/server shutdown and `SYSTEM FLUSH DISTRIBUTED` (Parallelism will work only if you have multi-disk policy for a table (like everything in the Distributed engine right now)). [#60225](https://github.com/ClickHouse/ClickHouse/pull/60225) ([Azat Khuzhin](https://github.com/azat)).
+* Add a setting to force read-through cache for merges. [#60308](https://github.com/ClickHouse/ClickHouse/pull/60308) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* An improvement for the MySQL compatibility protocol. The issue [#57598](https://github.com/ClickHouse/ClickHouse/issues/57598) mentions a variant behaviour regarding transaction handling. An issued COMMIT/ROLLBACK when no transaction is active is reported as an error contrary to MySQL behaviour. [#60338](https://github.com/ClickHouse/ClickHouse/pull/60338) ([PapaToemmsn](https://github.com/PapaToemmsn)).
+* Function `substring` now has a new alias `byteSlice`. [#60494](https://github.com/ClickHouse/ClickHouse/pull/60494) ([Robert Schulze](https://github.com/rschu1ze)).
+* Renamed server setting `dns_cache_max_size` to `dns_cache_max_entries` to reduce ambiguity. [#60500](https://github.com/ClickHouse/ClickHouse/pull/60500) ([Kirill Nikiforov](https://github.com/allmazz)).
+* `SHOW INDEX | INDEXES | INDICES | KEYS` no longer sorts by the primary key columns (which was unintuitive). [#60514](https://github.com/ClickHouse/ClickHouse/pull/60514) ([Robert Schulze](https://github.com/rschu1ze)).
+* Keeper improvement: abort during startup if an invalid snapshot is detected to avoid data loss. [#60537](https://github.com/ClickHouse/ClickHouse/pull/60537) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update tzdata to 2024a. [#60768](https://github.com/ClickHouse/ClickHouse/pull/60768) ([Raúl Marín](https://github.com/Algunenano)).
+* Keeper improvement: support `leadership_expiry_ms` in Keeper's settings. [#60806](https://github.com/ClickHouse/ClickHouse/pull/60806) ([Brokenice0415](https://github.com/Brokenice0415)).
+* Always infer exponential numbers in JSON formats regardless of the setting `input_format_try_infer_exponent_floats`. Add setting `input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects` that allows to use String type for ambiguous paths instead of an exception during named Tuples inference from JSON objects. [#60808](https://github.com/ClickHouse/ClickHouse/pull/60808) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for `START TRANSACTION` syntax typically used in MySQL syntax, resolving https://github.com/ClickHouse/ClickHouse/discussions/60865. [#60886](https://github.com/ClickHouse/ClickHouse/pull/60886) ([Zach Naimon](https://github.com/ArctypeZach)).
+* Add a flag for the full-sorting merge join algorithm to treat null as biggest/smallest. So the behavior can be compitable with other SQL systems, like Apache Spark. [#60896](https://github.com/ClickHouse/ClickHouse/pull/60896) ([loudongfeng](https://github.com/loudongfeng)).
+* Support detect output format by file exctension in `clickhouse-client` and `clickhouse-local`. [#61036](https://github.com/ClickHouse/ClickHouse/pull/61036) ([豪肥肥](https://github.com/HowePa)).
+* Update memory limit in runtime when Linux's CGroups value changed. [#61049](https://github.com/ClickHouse/ClickHouse/pull/61049) ([Han Fei](https://github.com/hanfei1991)).
+* Add the function `toUInt128OrZero`, which was missed by mistake (the mistake is related to https://github.com/ClickHouse/ClickHouse/pull/945). The compatibility aliases `FROM_UNIXTIME` and `DATE_FORMAT` (they are not ClickHouse-native and only exist for MySQL compatibility) have been made case insensitive, as expected for SQL-compatibility aliases. [#61114](https://github.com/ClickHouse/ClickHouse/pull/61114) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improvements for the access checks, allowing to revoke of unpossessed rights in case the target user doesn't have the revoking grants either. Example: `GRANT SELECT ON *.* TO user1; REVOKE SELECT ON system.* FROM user1;`. [#61115](https://github.com/ClickHouse/ClickHouse/pull/61115) ([pufit](https://github.com/pufit)).
+* Fix `has()` function with `Nullable` column (fixes [#60214](https://github.com/ClickHouse/ClickHouse/issues/60214)). [#61249](https://github.com/ClickHouse/ClickHouse/pull/61249) ([Mikhail Koviazin](https://github.com/mkmkme)).
+* Now it's possible to specify the attribute `merge="true"` in config substitutions for subtrees `<include from_zk="/path" merge="true">`. In case this attribute specified, clickhouse will merge subtree with existing configuration, otherwise default behavior is append new content to configuration. [#61299](https://github.com/ClickHouse/ClickHouse/pull/61299) ([alesapin](https://github.com/alesapin)).
+* Add async metrics for virtual memory mappings: `VMMaxMapCount` & `VMNumMaps`. Closes [#60662](https://github.com/ClickHouse/ClickHouse/issues/60662). [#61354](https://github.com/ClickHouse/ClickHouse/pull/61354) ([Tuan Pham Anh](https://github.com/tuanpavn)).
+* Use `temporary_files_codec` setting in all places where we create temporary data, for example external memory sorting and external memory GROUP BY. Before it worked only in `partial_merge` JOIN algorithm. [#61456](https://github.com/ClickHouse/ClickHouse/pull/61456) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add a new setting `max_parser_backtracks` which allows to limit the complexity of query parsing. [#61502](https://github.com/ClickHouse/ClickHouse/pull/61502) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Less contention during dynamic resize of the filesystem cache. [#61524](https://github.com/ClickHouse/ClickHouse/pull/61524) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disallow sharded mode of StorageS3 queue, because it will be rewritten. [#61537](https://github.com/ClickHouse/ClickHouse/pull/61537) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed typo: from `use_leagcy_max_level` to `use_legacy_max_level`. [#61545](https://github.com/ClickHouse/ClickHouse/pull/61545) ([William Schoeffel](https://github.com/wiledusc)).
+* Remove some duplicate entries in `system.blob_storage_log`. [#61622](https://github.com/ClickHouse/ClickHouse/pull/61622) ([YenchangChan](https://github.com/YenchangChan)).
+* Added `current_user` function as a compatibility alias for MySQL. [#61770](https://github.com/ClickHouse/ClickHouse/pull/61770) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix inconsistent floating point aggregate function states in mixed x86-64 / ARM clusters [#60610](https://github.com/ClickHouse/ClickHouse/pull/60610) ([Harry Lee](https://github.com/HarryLeeIBM)).
 
 #### Build/Testing/Packaging Improvement
-* New and improved `keeper-bench`. Everything can be customized from YAML/XML file: - request generator - each type of request generator can have a specific set of fields - multi requests can be generated just by doing the same under `multi` key - for each request or subrequest in multi a `weight` field can be defined to control distribution - define trees that need to be setup for a test run - hosts can be defined with all timeouts customizable and it's possible to control how many sessions to generate for each host - integers defined with `min_value` and `max_value` fields are random number generators. [#48547](https://github.com/ClickHouse/ClickHouse/pull/48547) ([Antonio Andelic](https://github.com/antonio2368)).
-* Io_uring is not supported on macos, don't choose it when running tests on local to avoid occasional failures. [#49250](https://github.com/ClickHouse/ClickHouse/pull/49250) ([Frank Chen](https://github.com/FrankChen021)).
-* Support named fault injection for testing. [#49361](https://github.com/ClickHouse/ClickHouse/pull/49361) ([Han Fei](https://github.com/hanfei1991)).
-* Allow running ClickHouse in the OS where the `prctl` (process control) syscall is not available, such as AWS Lambda. [#49538](https://github.com/ClickHouse/ClickHouse/pull/49538) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fixed the issue of build conflict between contrib/isa-l and isa-l in qpl [49296](https://github.com/ClickHouse/ClickHouse/issues/49296). [#49584](https://github.com/ClickHouse/ClickHouse/pull/49584) ([jasperzhu](https://github.com/jinjunzh)).
-* Utilities are now only build if explicitly requested ("-DENABLE_UTILS=1") instead of by default, this reduces link times in typical development builds. [#49620](https://github.com/ClickHouse/ClickHouse/pull/49620) ([Robert Schulze](https://github.com/rschu1ze)).
-* Pull build description of idxd-config into a separate CMake file to avoid accidental removal in future. [#49651](https://github.com/ClickHouse/ClickHouse/pull/49651) ([jasperzhu](https://github.com/jinjunzh)).
-* Add CI check with an enabled analyzer in the master. Follow-up [#49562](https://github.com/ClickHouse/ClickHouse/issues/49562). [#49668](https://github.com/ClickHouse/ClickHouse/pull/49668) ([Dmitry Novik](https://github.com/novikd)).
-* Switch to LLVM/clang 16. [#49678](https://github.com/ClickHouse/ClickHouse/pull/49678) ([Azat Khuzhin](https://github.com/azat)).
-* Allow building ClickHouse with clang-17. [#49851](https://github.com/ClickHouse/ClickHouse/pull/49851) ([Alexey Milovidov](https://github.com/alexey-milovidov)). [#50410](https://github.com/ClickHouse/ClickHouse/pull/50410) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* ClickHouse is now easier to be integrated into other cmake projects. [#49991](https://github.com/ClickHouse/ClickHouse/pull/49991) ([Amos Bird](https://github.com/amosbird)). (Which is strongly discouraged - Alexey Milovidov).
-* Fix strange additional QEMU logging after [#47151](https://github.com/ClickHouse/ClickHouse/issues/47151), see https://s3.amazonaws.com/clickhouse-test-reports/50078/a4743996ee4f3583884d07bcd6501df0cfdaa346/stateless_tests__release__databasereplicated__[3_4].html. [#50442](https://github.com/ClickHouse/ClickHouse/pull/50442) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* ClickHouse can work on Linux RISC-V 6.1.22. This closes [#50456](https://github.com/ClickHouse/ClickHouse/issues/50456). [#50457](https://github.com/ClickHouse/ClickHouse/pull/50457) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Bump internal protobuf to v3.18 (fixes bogus CVE-2022-1941). [#50400](https://github.com/ClickHouse/ClickHouse/pull/50400) ([Robert Schulze](https://github.com/rschu1ze)).
-* Bump internal libxml2 to v2.10.4 (fixes bogus CVE-2023-28484 and bogus CVE-2023-29469). [#50402](https://github.com/ClickHouse/ClickHouse/pull/50402) ([Robert Schulze](https://github.com/rschu1ze)).
-* Bump c-ares to v1.19.1 (bogus CVE-2023-32067, bogus CVE-2023-31130, bogus CVE-2023-31147). [#50403](https://github.com/ClickHouse/ClickHouse/pull/50403) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix bogus CVE-2022-2469 in libgsasl. [#50404](https://github.com/ClickHouse/ClickHouse/pull/50404) ([Robert Schulze](https://github.com/rschu1ze)).
+* The real-time query profiler now works on AArch64. In previous versions, it worked only when a program didn't spend time inside a syscall. [#60807](https://github.com/ClickHouse/ClickHouse/pull/60807) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ClickHouse version has been added to docker labels. Closes [#54224](https://github.com/ClickHouse/ClickHouse/issues/54224). [#60949](https://github.com/ClickHouse/ClickHouse/pull/60949) ([Nikolay Monkov](https://github.com/nikmonkov)).
+* Upgrade `prqlc` to 0.11.3. [#60616](https://github.com/ClickHouse/ClickHouse/pull/60616) ([Maximilian Roos](https://github.com/max-sixty)).
+* Add generic query text fuzzer in `clickhouse-local`. [#61508](https://github.com/ClickHouse/ClickHouse/pull/61508) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
 #### Bug Fix (user-visible misbehavior in an official stable release)
+* Fix finished_mutations_to_keep=0 for MergeTree (as docs says 0 is to keep everything) [#60031](https://github.com/ClickHouse/ClickHouse/pull/60031) ([Azat Khuzhin](https://github.com/azat)).
+* Something was wrong with the FINAL optimization, here is how the author describes it: "PartsSplitter invalid ranges for the same part". [#60041](https://github.com/ClickHouse/ClickHouse/pull/60041) ([Maksim Kita](https://github.com/kitaisreal)).
+* Something was wrong with Apache Hive, which is experimental and not supported. [#60262](https://github.com/ClickHouse/ClickHouse/pull/60262) ([shanfengp](https://github.com/Aed-p)).
+* An improvement for experimental parallel replicas: force reanalysis if parallel replicas changed [#60362](https://github.com/ClickHouse/ClickHouse/pull/60362) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix usage of plain metadata type with new disks configuration option [#60396](https://github.com/ClickHouse/ClickHouse/pull/60396) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Try to fix logical error 'Cannot capture column because it has incompatible type' in mapContainsKeyLike [#60451](https://github.com/ClickHouse/ClickHouse/pull/60451) ([Kruglov Pavel](https://github.com/Avogar)).
+* Avoid calculation of scalar subqueries for CREATE TABLE. [#60464](https://github.com/ClickHouse/ClickHouse/pull/60464) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).
+* Something was wrong with experimental KQL (Kusto) support: fix `max_query_size_for_kql_compound_operator`: [#60534](https://github.com/ClickHouse/ClickHouse/pull/60534) ([Yong Wang](https://github.com/kashwy)).
+* Keeper fix: add timeouts when waiting for commit logs [#60544](https://github.com/ClickHouse/ClickHouse/pull/60544) ([Antonio Andelic](https://github.com/antonio2368)).
+* Don't output number tips for date types [#60577](https://github.com/ClickHouse/ClickHouse/pull/60577) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix reading from MergeTree with non-deterministic functions in filter [#60586](https://github.com/ClickHouse/ClickHouse/pull/60586) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix logical error on bad compatibility setting value type [#60596](https://github.com/ClickHouse/ClickHouse/pull/60596) ([Kruglov Pavel](https://github.com/Avogar)).
+* fix(prql): Robust panic handler [#60615](https://github.com/ClickHouse/ClickHouse/pull/60615) ([Maximilian Roos](https://github.com/max-sixty)).
+* Fix `intDiv` for decimal and date arguments [#60672](https://github.com/ClickHouse/ClickHouse/pull/60672) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix: expand CTE in alter modify query [#60682](https://github.com/ClickHouse/ClickHouse/pull/60682) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix system.parts for non-Atomic/Ordinary database engine (i.e. Memory) [#60689](https://github.com/ClickHouse/ClickHouse/pull/60689) ([Azat Khuzhin](https://github.com/azat)).
+* Fix "Invalid storage definition in metadata file" for parameterized views [#60708](https://github.com/ClickHouse/ClickHouse/pull/60708) ([Azat Khuzhin](https://github.com/azat)).
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove wrong assertion in aggregate function quantileGK [#60740](https://github.com/ClickHouse/ClickHouse/pull/60740) ([�扬](https://github.com/taiyang-li)).
+* Fix insert-select + insert_deduplication_token bug by setting streams to 1 [#60745](https://github.com/ClickHouse/ClickHouse/pull/60745) ([Jordi Villar](https://github.com/jrdi)).
+* Prevent setting custom metadata headers on unsupported multipart upload operations [#60748](https://github.com/ClickHouse/ClickHouse/pull/60748) ([Francisco J. Jurado Moreno](https://github.com/Beetelbrox)).
+* Fix toStartOfInterval [#60763](https://github.com/ClickHouse/ClickHouse/pull/60763) ([Andrey Zvonov](https://github.com/zvonand)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash with different allow_experimental_analyzer value in subqueries [#60770](https://github.com/ClickHouse/ClickHouse/pull/60770) ([Dmitry Novik](https://github.com/novikd)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible stuck on error in HashedDictionaryParallelLoader [#60926](https://github.com/ClickHouse/ClickHouse/pull/60926) ([vdimir](https://github.com/vdimir)).
+* Fix async RESTORE with Replicated database (experimental feature) [#60934](https://github.com/ClickHouse/ClickHouse/pull/60934) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix deadlock in async inserts to `Log` tables via native protocol [#61055](https://github.com/ClickHouse/ClickHouse/pull/61055) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix lazy execution of default argument in dictGetOrDefault for RangeHashedDictionary [#61196](https://github.com/ClickHouse/ClickHouse/pull/61196) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix multiple bugs in groupArraySorted [#61203](https://github.com/ClickHouse/ClickHouse/pull/61203) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix Keeper reconfig for standalone binary [#61233](https://github.com/ClickHouse/ClickHouse/pull/61233) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix usage of session_token in S3 engine [#61234](https://github.com/ClickHouse/ClickHouse/pull/61234) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible incorrect result of aggregate function `uniqExact` [#61257](https://github.com/ClickHouse/ClickHouse/pull/61257) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bugs in show database [#61269](https://github.com/ClickHouse/ClickHouse/pull/61269) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix logical error in RabbitMQ storage with MATERIALIZED columns [#61320](https://github.com/ClickHouse/ClickHouse/pull/61320) ([vdimir](https://github.com/vdimir)).
+* Fix CREATE OR REPLACE DICTIONARY [#61356](https://github.com/ClickHouse/ClickHouse/pull/61356) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix ATTACH query with external ON CLUSTER [#61365](https://github.com/ClickHouse/ClickHouse/pull/61365) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix consecutive keys optimization for nullable keys [#61393](https://github.com/ClickHouse/ClickHouse/pull/61393) ([Anton Popov](https://github.com/CurtizJ)).
+* fix issue of actions dag split [#61458](https://github.com/ClickHouse/ClickHouse/pull/61458) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix finishing a failed RESTORE [#61466](https://github.com/ClickHouse/ClickHouse/pull/61466) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Disable async_insert_use_adaptive_busy_timeout correctly with compatibility settings [#61468](https://github.com/ClickHouse/ClickHouse/pull/61468) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow queuing in restore pool [#61475](https://github.com/ClickHouse/ClickHouse/pull/61475) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix an inconsistency when reading system.parts using UUID. [#61479](https://github.com/ClickHouse/ClickHouse/pull/61479) ([Dan Wu](https://github.com/wudanzy)).
+* Fix ALTER QUERY MODIFY SQL SECURITY [#61480](https://github.com/ClickHouse/ClickHouse/pull/61480) ([pufit](https://github.com/pufit)).
+* Fix a crash in window view (experimental feature) [#61526](https://github.com/ClickHouse/ClickHouse/pull/61526) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix `repeat` with non-native integers [#61527](https://github.com/ClickHouse/ClickHouse/pull/61527) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix client's `-s` argument [#61530](https://github.com/ClickHouse/ClickHouse/pull/61530) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix crash in arrayPartialReverseSort [#61539](https://github.com/ClickHouse/ClickHouse/pull/61539) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix string search with const position [#61547](https://github.com/ClickHouse/ClickHouse/pull/61547) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix addDays cause an error when used DateTime64 [#61561](https://github.com/ClickHouse/ClickHouse/pull/61561) ([Shuai li](https://github.com/loneylee)).
+* Disallow LowCardinality input type for JSONExtract [#61617](https://github.com/ClickHouse/ClickHouse/pull/61617) ([Julia Kartseva](https://github.com/jkartseva)).
+* Fix `system.part_log` for async insert with deduplication [#61620](https://github.com/ClickHouse/ClickHouse/pull/61620) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix a `Non-ready set` exception for system.parts. [#61666](https://github.com/ClickHouse/ClickHouse/pull/61666) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix actual_part_name for REPLACE_RANGE (`Entry actual part isn't empty yet`) [#61675](https://github.com/ClickHouse/ClickHouse/pull/61675) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix a sanitizer report in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+* Fix an observation that the RANGE frame is not supported for Nullable columns. [#61766](https://github.com/ClickHouse/ClickHouse/pull/61766) ([YuanLiu](https://github.com/ditgittube)).
 
-* ActionsDAG: fix wrong optimization [#47584](https://github.com/ClickHouse/ClickHouse/pull/47584) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Correctly handle concurrent snapshots in Keeper [#48466](https://github.com/ClickHouse/ClickHouse/pull/48466) ([Antonio Andelic](https://github.com/antonio2368)).
-* MergeTreeMarksLoader holds DataPart instead of DataPartStorage [#48515](https://github.com/ClickHouse/ClickHouse/pull/48515) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Sequence state fix [#48603](https://github.com/ClickHouse/ClickHouse/pull/48603) ([Ilya Golshtein](https://github.com/ilejn)).
-* Back/Restore concurrency check on previous fails [#48726](https://github.com/ClickHouse/ClickHouse/pull/48726) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix Attaching a table with non-existent ZK path does not increase the ReadonlyReplica metric [#48954](https://github.com/ClickHouse/ClickHouse/pull/48954) ([wangxiaobo](https://github.com/wzb5212)).
-* Fix possible terminate called for uncaught exception in some places [#49112](https://github.com/ClickHouse/ClickHouse/pull/49112) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix key not found error for queries with multiple StorageJoin [#49137](https://github.com/ClickHouse/ClickHouse/pull/49137) ([vdimir](https://github.com/vdimir)).
-* Fix wrong query result when using nullable primary key [#49172](https://github.com/ClickHouse/ClickHouse/pull/49172) ([Duc Canh Le](https://github.com/canhld94)).
-* Fix reinterpretAs*() on big endian machines [#49198](https://github.com/ClickHouse/ClickHouse/pull/49198) ([Suzy Wang](https://github.com/SuzyWangIBMer)).
-* (Experimental zero-copy replication) Lock zero copy parts more atomically [#49211](https://github.com/ClickHouse/ClickHouse/pull/49211) ([alesapin](https://github.com/alesapin)).
-* Fix race on Outdated parts loading [#49223](https://github.com/ClickHouse/ClickHouse/pull/49223) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix all key value is null and group use rollup return wrong answer [#49282](https://github.com/ClickHouse/ClickHouse/pull/49282) ([Shuai li](https://github.com/loneylee)).
-* Fix calculating load_factor for HASHED dictionaries with SHARDS [#49319](https://github.com/ClickHouse/ClickHouse/pull/49319) ([Azat Khuzhin](https://github.com/azat)).
-* Disallow configuring compression CODECs for alias columns [#49363](https://github.com/ClickHouse/ClickHouse/pull/49363) ([Timur Solodovnikov](https://github.com/tsolodov)).
-* Fix bug in removal of existing part directory [#49365](https://github.com/ClickHouse/ClickHouse/pull/49365) ([alesapin](https://github.com/alesapin)).
-* Properly fix GCS when HMAC is used [#49390](https://github.com/ClickHouse/ClickHouse/pull/49390) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix fuzz bug when subquery set is not built when reading from remote() [#49425](https://github.com/ClickHouse/ClickHouse/pull/49425) ([Alexander Gololobov](https://github.com/davenger)).
-* Invert `shutdown_wait_unfinished_queries` [#49427](https://github.com/ClickHouse/ClickHouse/pull/49427) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* (Experimental zero-copy replication) Fix another zero copy bug [#49473](https://github.com/ClickHouse/ClickHouse/pull/49473) ([alesapin](https://github.com/alesapin)).
-* Fix postgres database setting [#49481](https://github.com/ClickHouse/ClickHouse/pull/49481) ([Mal Curtis](https://github.com/snikch)).
-* Correctly handle `s3Cluster` arguments [#49490](https://github.com/ClickHouse/ClickHouse/pull/49490) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix bug in TraceCollector destructor. [#49508](https://github.com/ClickHouse/ClickHouse/pull/49508) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix AsynchronousReadIndirectBufferFromRemoteFS breaking on short seeks [#49525](https://github.com/ClickHouse/ClickHouse/pull/49525) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix dictionaries loading order [#49560](https://github.com/ClickHouse/ClickHouse/pull/49560) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Forbid the change of data type of Object('json') column [#49563](https://github.com/ClickHouse/ClickHouse/pull/49563) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix stress test (Logical error: Expected 7134 >= 11030) [#49623](https://github.com/ClickHouse/ClickHouse/pull/49623) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix bug in DISTINCT [#49628](https://github.com/ClickHouse/ClickHouse/pull/49628) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix: DISTINCT in order with zero values in non-sorted columns [#49636](https://github.com/ClickHouse/ClickHouse/pull/49636) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix one-off error in big integers found by UBSan with fuzzer [#49645](https://github.com/ClickHouse/ClickHouse/pull/49645) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix reading from sparse columns after restart [#49660](https://github.com/ClickHouse/ClickHouse/pull/49660) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix assert in SpanHolder::finish() with fibers [#49673](https://github.com/ClickHouse/ClickHouse/pull/49673) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix short circuit functions and mutations with sparse arguments [#49716](https://github.com/ClickHouse/ClickHouse/pull/49716) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix writing appended files to incremental backups [#49725](https://github.com/ClickHouse/ClickHouse/pull/49725) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix "There is no physical column _row_exists in table" error occurring during lightweight delete mutation on a table with Object column. [#49737](https://github.com/ClickHouse/ClickHouse/pull/49737) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix msan issue in randomStringUTF8(uneven number) [#49750](https://github.com/ClickHouse/ClickHouse/pull/49750) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix aggregate function kolmogorovSmirnovTest [#49768](https://github.com/ClickHouse/ClickHouse/pull/49768) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Fix settings aliases in native protocol [#49776](https://github.com/ClickHouse/ClickHouse/pull/49776) ([Azat Khuzhin](https://github.com/azat)).
-* Fix `arrayMap` with array of tuples with single argument [#49789](https://github.com/ClickHouse/ClickHouse/pull/49789) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix per-query IO/BACKUPs throttling settings [#49797](https://github.com/ClickHouse/ClickHouse/pull/49797) ([Azat Khuzhin](https://github.com/azat)).
-* Fix setting NULL in profile definition [#49831](https://github.com/ClickHouse/ClickHouse/pull/49831) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix a bug with projections and the aggregate_functions_null_for_empty setting (for query_plan_optimize_projection) [#49873](https://github.com/ClickHouse/ClickHouse/pull/49873) ([Amos Bird](https://github.com/amosbird)).
-* Fix processing pending batch for Distributed async INSERT after restart [#49884](https://github.com/ClickHouse/ClickHouse/pull/49884) ([Azat Khuzhin](https://github.com/azat)).
-* Fix assertion in CacheMetadata::doCleanup [#49914](https://github.com/ClickHouse/ClickHouse/pull/49914) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* fix `is_prefix` in OptimizeRegularExpression [#49919](https://github.com/ClickHouse/ClickHouse/pull/49919) ([Han Fei](https://github.com/hanfei1991)).
-* Fix metrics `WriteBufferFromS3Bytes`, `WriteBufferFromS3Microseconds` and `WriteBufferFromS3RequestsErrors` [#49930](https://github.com/ClickHouse/ClickHouse/pull/49930) ([Aleksandr Musorin](https://github.com/AVMusorin)).
-* Fix IPv6 encoding in protobuf [#49933](https://github.com/ClickHouse/ClickHouse/pull/49933) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix possible Logical error on bad Nullable parsing for text formats [#49960](https://github.com/ClickHouse/ClickHouse/pull/49960) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add setting output_format_parquet_compliant_nested_types to produce more compatible Parquet files [#50001](https://github.com/ClickHouse/ClickHouse/pull/50001) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix logical error in stress test "Not enough space to add ..." [#50021](https://github.com/ClickHouse/ClickHouse/pull/50021) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Avoid deadlock when starting table in attach thread of `ReplicatedMergeTree` [#50026](https://github.com/ClickHouse/ClickHouse/pull/50026) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix assert in SpanHolder::finish() with fibers attempt 2 [#50034](https://github.com/ClickHouse/ClickHouse/pull/50034) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add proper escaping for DDL OpenTelemetry context serialization [#50045](https://github.com/ClickHouse/ClickHouse/pull/50045) ([Azat Khuzhin](https://github.com/azat)).
-* Fix reporting broken projection parts [#50052](https://github.com/ClickHouse/ClickHouse/pull/50052) ([Amos Bird](https://github.com/amosbird)).
-* JIT compilation not equals NaN fix [#50056](https://github.com/ClickHouse/ClickHouse/pull/50056) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix crashing in case of Replicated database without arguments [#50058](https://github.com/ClickHouse/ClickHouse/pull/50058) ([Azat Khuzhin](https://github.com/azat)).
-* Fix crash with `multiIf` and constant condition and nullable arguments [#50123](https://github.com/ClickHouse/ClickHouse/pull/50123) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix invalid index analysis for date related keys [#50153](https://github.com/ClickHouse/ClickHouse/pull/50153) ([Amos Bird](https://github.com/amosbird)).
-* do not allow modify order by when there are no order by cols [#50154](https://github.com/ClickHouse/ClickHouse/pull/50154) ([Han Fei](https://github.com/hanfei1991)).
-* Fix broken index analysis when binary operator contains a null constant argument [#50177](https://github.com/ClickHouse/ClickHouse/pull/50177) ([Amos Bird](https://github.com/amosbird)).
-* clickhouse-client: disallow usage of `--query` and `--queries-file` at the same time [#50210](https://github.com/ClickHouse/ClickHouse/pull/50210) ([Alexey Gerasimchuk](https://github.com/Demilivor)).
-* Fix UB for INTO OUTFILE extensions (APPEND / AND STDOUT) and WATCH EVENTS [#50216](https://github.com/ClickHouse/ClickHouse/pull/50216) ([Azat Khuzhin](https://github.com/azat)).
-* Fix skipping spaces at end of row in CustomSeparatedIgnoreSpaces format [#50224](https://github.com/ClickHouse/ClickHouse/pull/50224) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix iceberg metadata parsing [#50232](https://github.com/ClickHouse/ClickHouse/pull/50232) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix nested distributed SELECT in WITH clause [#50234](https://github.com/ClickHouse/ClickHouse/pull/50234) ([Azat Khuzhin](https://github.com/azat)).
-* Fix msan issue in keyed siphash [#50245](https://github.com/ClickHouse/ClickHouse/pull/50245) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix bugs in Poco sockets in non-blocking mode, use true non-blocking sockets [#50252](https://github.com/ClickHouse/ClickHouse/pull/50252) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix checksum calculation for backup entries [#50264](https://github.com/ClickHouse/ClickHouse/pull/50264) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Comparison functions NaN fix [#50287](https://github.com/ClickHouse/ClickHouse/pull/50287) ([Maksim Kita](https://github.com/kitaisreal)).
-* JIT aggregation nullable key fix [#50291](https://github.com/ClickHouse/ClickHouse/pull/50291) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix clickhouse-local crashing when writing empty Arrow or Parquet output [#50328](https://github.com/ClickHouse/ClickHouse/pull/50328) ([Michael Kolupaev](https://github.com/al13n321)).
-* Fix crash when Pool::Entry::disconnect() is called [#50334](https://github.com/ClickHouse/ClickHouse/pull/50334) ([Val Doroshchuk](https://github.com/valbok)).
-* Improved fetch part by holding directory lock longer [#50339](https://github.com/ClickHouse/ClickHouse/pull/50339) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix bitShift* functions with both constant arguments [#50343](https://github.com/ClickHouse/ClickHouse/pull/50343) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix Keeper deadlock on exception when preprocessing requests. [#50387](https://github.com/ClickHouse/ClickHouse/pull/50387) ([frinkr](https://github.com/frinkr)).
-* Fix hashing of const integer values [#50421](https://github.com/ClickHouse/ClickHouse/pull/50421) ([Robert Schulze](https://github.com/rschu1ze)).
-* Fix merge_tree_min_rows_for_seek/merge_tree_min_bytes_for_seek for data skipping indexes [#50432](https://github.com/ClickHouse/ClickHouse/pull/50432) ([Azat Khuzhin](https://github.com/azat)).
-* Limit the number of in-flight tasks for loading outdated parts [#50450](https://github.com/ClickHouse/ClickHouse/pull/50450) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Keeper fix: apply uncommitted state after snapshot install [#50483](https://github.com/ClickHouse/ClickHouse/pull/50483) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix incorrect constant folding [#50536](https://github.com/ClickHouse/ClickHouse/pull/50536) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix logical error in stress test (Not enough space to add ...) [#50583](https://github.com/ClickHouse/ClickHouse/pull/50583) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix converting Null to LowCardinality(Nullable) in values table function [#50637](https://github.com/ClickHouse/ClickHouse/pull/50637) ([Kruglov Pavel](https://github.com/Avogar)).
-* Revert invalid RegExpTreeDictionary optimization [#50642](https://github.com/ClickHouse/ClickHouse/pull/50642) ([Johann Gan](https://github.com/johanngan)).
-
-### <a id="234"></a> ClickHouse release 23.4, 2023-04-26
+### <a id="242"></a> ClickHouse release 24.2, 2024-02-29
 
 #### 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)).
+* Validate suspicious/experimental types in nested types. Previously we didn't validate such types (except JSON) in nested types like Array/Tuple/Map. [#59385](https://github.com/ClickHouse/ClickHouse/pull/59385) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add sanity check for number of threads and block sizes. [#60138](https://github.com/ClickHouse/ClickHouse/pull/60138) ([Raúl Marín](https://github.com/Algunenano)).
+* Don't infer floats in exponential notation by default. Add a setting `input_format_try_infer_exponent_floats` that will restore previous behaviour (disabled by default). Closes [#59476](https://github.com/ClickHouse/ClickHouse/issues/59476). [#59500](https://github.com/ClickHouse/ClickHouse/pull/59500) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow alter operations to be surrounded by parenthesis. The emission of parentheses can be controlled by the `format_alter_operations_with_parentheses` config. By default, in formatted queries the parentheses are emitted as we store the formatted alter operations in some places as metadata (e.g.: mutations). The new syntax clarifies some of the queries where alter operations end in a list. E.g.: `ALTER TABLE x MODIFY TTL date GROUP BY a, b, DROP COLUMN c` cannot be parsed properly with the old syntax. In the new syntax the query `ALTER TABLE x (MODIFY TTL date GROUP BY a, b), (DROP COLUMN c)` is obvious. Older versions are not able to read the new syntax, therefore using the new syntax might cause issues if newer and older version of ClickHouse are mixed in a single cluster. [#59532](https://github.com/ClickHouse/ClickHouse/pull/59532) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
 
 #### 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)).
+* Added new syntax which allows to specify definer user in View/Materialized View. This allows to execute selects/inserts from views without explicit grants for underlying tables. So, a View will encapsulate the grants. [#54901](https://github.com/ClickHouse/ClickHouse/pull/54901) [#60439](https://github.com/ClickHouse/ClickHouse/pull/60439) ([pufit](https://github.com/pufit)).
+* Try to detect file format automatically during schema inference if it's unknown in `file/s3/hdfs/url/azureBlobStorage` engines. Closes [#50576](https://github.com/ClickHouse/ClickHouse/issues/50576). [#59092](https://github.com/ClickHouse/ClickHouse/pull/59092) ([Kruglov Pavel](https://github.com/Avogar)).
+* Implement auto-adjustment for asynchronous insert timeouts. The following settings are introduced: async_insert_poll_timeout_ms, async_insert_use_adaptive_busy_timeout, async_insert_busy_timeout_min_ms, async_insert_busy_timeout_max_ms, async_insert_busy_timeout_increase_rate, async_insert_busy_timeout_decrease_rate. [#58486](https://github.com/ClickHouse/ClickHouse/pull/58486) ([Julia Kartseva](https://github.com/jkartseva)).
+* Allow to set up a quota for maximum sequential login failures. [#54737](https://github.com/ClickHouse/ClickHouse/pull/54737) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
+* A new aggregate function `groupArrayIntersect`. Follows up: [#49862](https://github.com/ClickHouse/ClickHouse/issues/49862). [#59598](https://github.com/ClickHouse/ClickHouse/pull/59598) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Backup & Restore support for `AzureBlobStorage`. Resolves [#50747](https://github.com/ClickHouse/ClickHouse/issues/50747). [#56988](https://github.com/ClickHouse/ClickHouse/pull/56988) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* The user can now specify the template string directly in the query using `format_schema_rows_template` as an alternative to `format_template_row`. Closes [#31363](https://github.com/ClickHouse/ClickHouse/issues/31363). [#59088](https://github.com/ClickHouse/ClickHouse/pull/59088) ([Shaun Struwig](https://github.com/Blargian)).
+* Implemented automatic conversion of merge tree tables of different kinds to replicated engine. Create empty `convert_to_replicated` file in table's data directory (`/clickhouse/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`) and that table will be converted automatically on next server start. [#57798](https://github.com/ClickHouse/ClickHouse/pull/57798) ([Kirill](https://github.com/kirillgarbar)).
+* Added query `ALTER TABLE table FORGET PARTITION partition` that removes ZooKeeper nodes, related to an empty partition. [#59507](https://github.com/ClickHouse/ClickHouse/pull/59507) ([Sergei Trifonov](https://github.com/serxa)). This is an expert-level feature.
+* Support JWT credentials file for the NATS table engine. [#59543](https://github.com/ClickHouse/ClickHouse/pull/59543) ([Nickolaj Jepsen](https://github.com/nickolaj-jepsen)).
+* Implemented `system.dns_cache` table, which can be useful for debugging DNS issues. [#59856](https://github.com/ClickHouse/ClickHouse/pull/59856) ([Kirill Nikiforov](https://github.com/allmazz)).
+* The codec `LZ4HC` will accept a new level 2, which is faster than the previous minimum level 3, at the expense of less compression. In previous versions, `LZ4HC(2)` and less was the same as `LZ4HC(3)`. Author: [Cyan4973](https://github.com/Cyan4973). [#60090](https://github.com/ClickHouse/ClickHouse/pull/60090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Implemented `system.dns_cache` table, which can be useful for debugging DNS issues. New server setting dns_cache_max_size. [#60257](https://github.com/ClickHouse/ClickHouse/pull/60257) ([Kirill Nikiforov](https://github.com/allmazz)).
+* Support single-argument version for the `merge` table function, as `merge(['db_name', ] 'tables_regexp')`. [#60372](https://github.com/ClickHouse/ClickHouse/pull/60372) ([豪肥肥](https://github.com/HowePa)).
+* Support negative positional arguments. Closes [#57736](https://github.com/ClickHouse/ClickHouse/issues/57736). [#58292](https://github.com/ClickHouse/ClickHouse/pull/58292) ([flynn](https://github.com/ucasfl)).
+* Support specifying a set of permitted users for specific S3 settings in config using `user` key. [#60144](https://github.com/ClickHouse/ClickHouse/pull/60144) ([Antonio Andelic](https://github.com/antonio2368)).
+* Added table function `mergeTreeIndex`. It represents the contents of index and marks files of `MergeTree` tables. It can be used for introspection. Syntax: `mergeTreeIndex(database, table, [with_marks = true])` where `database.table` is an existing table with `MergeTree` engine. [#58140](https://github.com/ClickHouse/ClickHouse/pull/58140) ([Anton Popov](https://github.com/CurtizJ)).
 
 #### 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)).
+* Added function `seriesOutliersDetectTukey` to detect outliers in series data using Tukey's fences algorithm. [#58632](https://github.com/ClickHouse/ClickHouse/pull/58632) ([Bhavna Jindal](https://github.com/bhavnajindal)). Keep in mind that the behavior will be changed in the next patch release.
+* Add function `variantType` that returns Enum with variant type name for each row. [#59398](https://github.com/ClickHouse/ClickHouse/pull/59398) ([Kruglov Pavel](https://github.com/Avogar)).
+* Support `LEFT JOIN`, `ALL INNER JOIN`, and simple subqueries for parallel replicas (only with analyzer). New setting `parallel_replicas_prefer_local_join` chooses local `JOIN` execution (by default) vs `GLOBAL JOIN`. All tables should exist on every replica from `cluster_for_parallel_replicas`. New settings `min_external_table_block_size_rows` and `min_external_table_block_size_bytes` are used to squash small blocks that are sent for temporary tables (only with analyzer). [#58916](https://github.com/ClickHouse/ClickHouse/pull/58916) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Allow concurrent table creation in the `Replicated` database during adding or recovering a new replica. [#59277](https://github.com/ClickHouse/ClickHouse/pull/59277) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Implement comparison operator for `Variant` values and proper Field inserting into `Variant` column. Don't allow creating `Variant` type with similar variant types by default (allow uder a setting `allow_suspicious_variant_types`) Closes [#59996](https://github.com/ClickHouse/ClickHouse/issues/59996). Closes [#59850](https://github.com/ClickHouse/ClickHouse/issues/59850). [#60198](https://github.com/ClickHouse/ClickHouse/pull/60198) ([Kruglov Pavel](https://github.com/Avogar)).
+* Disable parallel replicas JOIN with CTE (not analyzer) [#59239](https://github.com/ClickHouse/ClickHouse/pull/59239) ([Raúl Marín](https://github.com/Algunenano)).
 
 #### 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)).
+* Primary key will use less amount of memory. [#60049](https://github.com/ClickHouse/ClickHouse/pull/60049) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve memory usage for primary key and some other operations. [#60050](https://github.com/ClickHouse/ClickHouse/pull/60050) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The tables' primary keys will be loaded in memory lazily on first access. This is controlled by the new MergeTree setting `primary_key_lazy_load`, which is on by default. This provides several advantages: - it will not be loaded for tables that are not used; - if there is not enough memory, an exception will be thrown on first use instead of at server startup. This provides several disadvantages: - the latency of loading the primary key will be paid on the first query rather than before accepting connections; this theoretically may introduce a thundering-herd problem. This closes [#11188](https://github.com/ClickHouse/ClickHouse/issues/11188). [#60093](https://github.com/ClickHouse/ClickHouse/pull/60093) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Vectorized distance functions used in vector search. [#58866](https://github.com/ClickHouse/ClickHouse/pull/58866) ([Robert Schulze](https://github.com/rschu1ze)).
+* Vectorized function `dotProduct` which is useful for vector search. [#60202](https://github.com/ClickHouse/ClickHouse/pull/60202) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add short-circuit ability for `dictGetOrDefault` function. Closes [#52098](https://github.com/ClickHouse/ClickHouse/issues/52098). [#57767](https://github.com/ClickHouse/ClickHouse/pull/57767) ([jsc0218](https://github.com/jsc0218)).
+* Keeper improvement: cache only a certain amount of logs in-memory controlled by `latest_logs_cache_size_threshold` and `commit_logs_cache_size_threshold`. [#59460](https://github.com/ClickHouse/ClickHouse/pull/59460) ([Antonio Andelic](https://github.com/antonio2368)).
+* Keeper improvement: reduce size of data node even more. [#59592](https://github.com/ClickHouse/ClickHouse/pull/59592) ([Antonio Andelic](https://github.com/antonio2368)).
+* Continue optimizing branch miss of `if` function when result type is `Float*/Decimal*/*Int*`, follow up of https://github.com/ClickHouse/ClickHouse/pull/57885. [#59148](https://github.com/ClickHouse/ClickHouse/pull/59148) ([�扬](https://github.com/taiyang-li)).
+* Optimize `if` function when the input type is `Map`, the speed-up is up to ~10x. [#59413](https://github.com/ClickHouse/ClickHouse/pull/59413) ([�扬](https://github.com/taiyang-li)).
+* Improve performance of the `Int8` type by implementing strict aliasing (we already have it for `UInt8` and all other integer types). [#59485](https://github.com/ClickHouse/ClickHouse/pull/59485) ([Raúl Marín](https://github.com/Algunenano)).
+* Optimize performance of sum/avg conditionally for bigint and big decimal types by reducing branch miss. [#59504](https://github.com/ClickHouse/ClickHouse/pull/59504) ([�扬](https://github.com/taiyang-li)).
+* Improve performance of SELECTs with active mutations. [#59531](https://github.com/ClickHouse/ClickHouse/pull/59531) ([Azat Khuzhin](https://github.com/azat)).
+* Optimized function `isNotNull` with AVX2. [#59621](https://github.com/ClickHouse/ClickHouse/pull/59621) ([�扬](https://github.com/taiyang-li)).
+* Improve ASOF JOIN performance for sorted or almost sorted data. [#59731](https://github.com/ClickHouse/ClickHouse/pull/59731) ([Maksim Kita](https://github.com/kitaisreal)).
+* The previous default value equals to 1 MB for `async_insert_max_data_size` appeared to be too small. The new one would be 10 MiB. [#59536](https://github.com/ClickHouse/ClickHouse/pull/59536) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Use multiple threads while reading the metadata of tables from a backup while executing the RESTORE command. [#60040](https://github.com/ClickHouse/ClickHouse/pull/60040) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Now if `StorageBuffer` has more than 1 shard (`num_layers` > 1) background flush will happen simultaneously for all shards in multiple threads. [#60111](https://github.com/ClickHouse/ClickHouse/pull/60111) ([alesapin](https://github.com/alesapin)).
 
 #### 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)).
+* When output format is `Pretty` format and a block consists of a single numeric value which exceeds one million, A readable number will be printed on table right. [#60379](https://github.com/ClickHouse/ClickHouse/pull/60379) ([rogeryk](https://github.com/rogeryk)).
+* Added settings `split_parts_ranges_into_intersecting_and_non_intersecting_final` and `split_intersecting_parts_ranges_into_layers_final`. These settings are needed to disable optimizations for queries with `FINAL` and needed for debug only. [#59705](https://github.com/ClickHouse/ClickHouse/pull/59705) ([Maksim Kita](https://github.com/kitaisreal)). Actually not only for that - they can also lower memory usage at the expense of performance.
+* Rename the setting `extract_kvp_max_pairs_per_row` to `extract_key_value_pairs_max_pairs_per_row`. The issue (unnecessary abbreviation in the setting name) was introduced in https://github.com/ClickHouse/ClickHouse/pull/43606. Fix the documentation of this setting. [#59683](https://github.com/ClickHouse/ClickHouse/pull/59683) ([Alexey Milovidov](https://github.com/alexey-milovidov)). [#59960](https://github.com/ClickHouse/ClickHouse/pull/59960) ([jsc0218](https://github.com/jsc0218)).
+* Running `ALTER COLUMN MATERIALIZE` on a column with `DEFAULT` or `MATERIALIZED` expression now precisely follows the semantics. [#58023](https://github.com/ClickHouse/ClickHouse/pull/58023) ([Duc Canh Le](https://github.com/canhld94)).
+* Enabled an exponential backoff logic for errors during mutations. It will reduce the CPU usage, memory usage and log file sizes. [#58036](https://github.com/ClickHouse/ClickHouse/pull/58036) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Add improvement to count the `InitialQuery` Profile Event. [#58195](https://github.com/ClickHouse/ClickHouse/pull/58195) ([Unalian](https://github.com/Unalian)).
+* Allow to define `volume_priority` in `storage_configuration`. [#58533](https://github.com/ClickHouse/ClickHouse/pull/58533) ([Andrey Zvonov](https://github.com/zvonand)).
+* Add support for the `Date32` type in the `T64` codec. [#58738](https://github.com/ClickHouse/ClickHouse/pull/58738) ([Hongbin Ma](https://github.com/binmahone)).
+* Allow trailing commas in types with several items. [#59119](https://github.com/ClickHouse/ClickHouse/pull/59119) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* Settings for the Distributed table engine can now be specified in the server configuration file (similar to MergeTree settings), e.g. `<distributed> <flush_on_detach>false</flush_on_detach> </distributed>`. [#59291](https://github.com/ClickHouse/ClickHouse/pull/59291) ([Azat Khuzhin](https://github.com/azat)).
+* Retry disconnects and expired sessions when reading `system.zookeeper`. This is helpful when reading many rows from `system.zookeeper` table especially in the presence of fault-injected disconnects. [#59388](https://github.com/ClickHouse/ClickHouse/pull/59388) ([Alexander Gololobov](https://github.com/davenger)).
+* Do not interpret numbers with leading zeroes as octals when `input_format_values_interpret_expressions=0`. [#59403](https://github.com/ClickHouse/ClickHouse/pull/59403) ([Joanna Hulboj](https://github.com/jh0x)).
+* At startup and whenever config files are changed, ClickHouse updates the hard memory limits of its total memory tracker. These limits are computed based on various server settings and cgroups limits (on Linux). Previously, setting `/sys/fs/cgroup/memory.max` (for cgroups v2) was hard-coded. As a result, cgroup v2 memory limits configured for nested groups (hierarchies), e.g. `/sys/fs/cgroup/my/nested/group/memory.max` were ignored. This is now fixed. The behavior of v1 memory limits remains unchanged. [#59435](https://github.com/ClickHouse/ClickHouse/pull/59435) ([Robert Schulze](https://github.com/rschu1ze)).
+* New profile events added to observe the time spent on calculating PK/projections/secondary indices during `INSERT`-s. [#59436](https://github.com/ClickHouse/ClickHouse/pull/59436) ([Nikita Taranov](https://github.com/nickitat)).
+* Allow to define a starting point for S3Queue with Ordered mode at the creation using a setting `s3queue_last_processed_path`. [#59446](https://github.com/ClickHouse/ClickHouse/pull/59446) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Made comments for system tables also available in `system.tables` in `clickhouse-local`. [#59493](https://github.com/ClickHouse/ClickHouse/pull/59493) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* `system.zookeeper` table: previously the whole result was accumulated in memory and returned as one big chunk. This change should help to reduce memory consumption when reading many rows from `system.zookeeper`, allow showing intermediate progress (how many rows have been read so far) and avoid hitting connection timeout when result set is big. [#59545](https://github.com/ClickHouse/ClickHouse/pull/59545) ([Alexander Gololobov](https://github.com/davenger)).
+* Now dashboard understands both compressed and uncompressed state of URL's #hash (backward compatibility). Continuation of [#59124](https://github.com/ClickHouse/ClickHouse/issues/59124) . [#59548](https://github.com/ClickHouse/ClickHouse/pull/59548) ([Amos Bird](https://github.com/amosbird)).
+* Bumped Intel QPL (used by codec `DEFLATE_QPL`) from v1.3.1 to v1.4.0 . Also fixed a bug for polling timeout mechanism, as we observed in same cases timeout won't work properly, if timeout happen, IAA and CPU may process buffer concurrently. So far, we'd better make sure IAA codec status is not QPL_STS_BEING_PROCESSED, then fallback to SW codec. [#59551](https://github.com/ClickHouse/ClickHouse/pull/59551) ([jasperzhu](https://github.com/jinjunzh)).
+* Do not show a warning about the server version in ClickHouse Cloud because ClickHouse Cloud handles seamless upgrades automatically. [#59657](https://github.com/ClickHouse/ClickHouse/pull/59657) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* After self-extraction temporary binary is moved instead copying. [#59661](https://github.com/ClickHouse/ClickHouse/pull/59661) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix stack unwinding on Apple macOS. This closes [#53653](https://github.com/ClickHouse/ClickHouse/issues/53653). [#59690](https://github.com/ClickHouse/ClickHouse/pull/59690) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Check for stack overflow in parsers even if the user misconfigured the `max_parser_depth` setting to a very high value. This closes [#59622](https://github.com/ClickHouse/ClickHouse/issues/59622). [#59697](https://github.com/ClickHouse/ClickHouse/pull/59697) ([Alexey Milovidov](https://github.com/alexey-milovidov)). [#60434](https://github.com/ClickHouse/ClickHouse/pull/60434)
+* Unify XML and SQL created named collection behaviour in Kafka storage. [#59710](https://github.com/ClickHouse/ClickHouse/pull/59710) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
+* In case when `merge_max_block_size_bytes` is small enough and tables contain wide rows (strings or tuples) background merges may stuck in an endless loop. This behaviour is fixed. Follow-up for https://github.com/ClickHouse/ClickHouse/pull/59340. [#59812](https://github.com/ClickHouse/ClickHouse/pull/59812) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow uuid in replica_path if CREATE TABLE explicitly has it. [#59908](https://github.com/ClickHouse/ClickHouse/pull/59908) ([Azat Khuzhin](https://github.com/azat)).
+* Add column `metadata_version` of ReplicatedMergeTree table in `system.tables` system table. [#59942](https://github.com/ClickHouse/ClickHouse/pull/59942) ([Maksim Kita](https://github.com/kitaisreal)).
+* Keeper improvement: send only Keeper related metrics/events for Prometheus. [#59945](https://github.com/ClickHouse/ClickHouse/pull/59945) ([Antonio Andelic](https://github.com/antonio2368)).
+* The dashboard will display metrics across different ClickHouse versions even if the structure of system tables has changed after the upgrade. [#59967](https://github.com/ClickHouse/ClickHouse/pull/59967) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow loading AZ info from a file. [#59976](https://github.com/ClickHouse/ClickHouse/pull/59976) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Keeper improvement: add retries on failures for Disk related operations. [#59980](https://github.com/ClickHouse/ClickHouse/pull/59980) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add new config setting `backups.remove_backup_files_after_failure`: `<clickhouse> <backups> <remove_backup_files_after_failure>true</remove_backup_files_after_failure> </backups> </clickhouse>`. [#60002](https://github.com/ClickHouse/ClickHouse/pull/60002) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Copy S3 file GCP fallback to buffer copy in case GCP returned `Internal Error` with `GATEWAY_TIMEOUT` HTTP error code. [#60164](https://github.com/ClickHouse/ClickHouse/pull/60164) ([Maksim Kita](https://github.com/kitaisreal)).
+* Short circuit execution for `ULIDStringToDateTime`. [#60211](https://github.com/ClickHouse/ClickHouse/pull/60211) ([Juan Madurga](https://github.com/jlmadurga)).
+* Added `query_id` column for tables `system.backups` and `system.backup_log`. Added error stacktrace to `error` column. [#60220](https://github.com/ClickHouse/ClickHouse/pull/60220) ([Maksim Kita](https://github.com/kitaisreal)).
+* Connections through the MySQL port now automatically run with setting `prefer_column_name_to_alias = 1` to support QuickSight out-of-the-box. Also, settings `mysql_map_string_to_text_in_show_columns` and `mysql_map_fixed_string_to_text_in_show_columns` are now enabled by default, affecting also only MySQL connections. This increases compatibility with more BI tools. [#60365](https://github.com/ClickHouse/ClickHouse/pull/60365) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix a race condition in JavaScript code leading to duplicate charts on top of each other. [#60392](https://github.com/ClickHouse/ClickHouse/pull/60392) ([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.
+* Added builds and tests with coverage collection with introspection. Continuation of [#56102](https://github.com/ClickHouse/ClickHouse/issues/56102). [#58792](https://github.com/ClickHouse/ClickHouse/pull/58792) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update the Rust toolchain in `corrosion-cmake` when the CMake cross-compilation toolchain variable is set. [#59309](https://github.com/ClickHouse/ClickHouse/pull/59309) ([Aris Tritas](https://github.com/aris-aiven)).
+* Add some fuzzing to ASTLiterals. [#59383](https://github.com/ClickHouse/ClickHouse/pull/59383) ([Raúl Marín](https://github.com/Algunenano)).
+* If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+* Remove ability to disable generic clickhouse components (like server/client/...), but keep some that requires extra libraries (like ODBC or keeper). [#59857](https://github.com/ClickHouse/ClickHouse/pull/59857) ([Azat Khuzhin](https://github.com/azat)).
+* Query fuzzer will fuzz SETTINGS inside queries. [#60087](https://github.com/ClickHouse/ClickHouse/pull/60087) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add support for building ClickHouse with clang-19 (master). [#60448](https://github.com/ClickHouse/ClickHouse/pull/60448) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 
 #### 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)).
+* Fix a "Non-ready set" error in TTL WHERE. [#57430](https://github.com/ClickHouse/ClickHouse/pull/57430) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix a bug in the `quantilesGK` function [#58216](https://github.com/ClickHouse/ClickHouse/pull/58216) ([�扬](https://github.com/taiyang-li)).
+* Fix a wrong behavior with `intDiv` for Decimal arguments [#59243](https://github.com/ClickHouse/ClickHouse/pull/59243) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix `translate` with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix digest calculation in Keeper [#59439](https://github.com/ClickHouse/ClickHouse/pull/59439) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix stacktraces for binaries without debug symbols [#59444](https://github.com/ClickHouse/ClickHouse/pull/59444) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `ASTAlterCommand::formatImpl` in case of column specific settings… [#59445](https://github.com/ClickHouse/ClickHouse/pull/59445) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix `SELECT * FROM [...] ORDER BY ALL` with Analyzer [#59462](https://github.com/ClickHouse/ClickHouse/pull/59462) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Fix possible uncaught exception during distributed query cancellation [#59487](https://github.com/ClickHouse/ClickHouse/pull/59487) ([Azat Khuzhin](https://github.com/azat)).
+* Make MAX use the same rules as permutation for complex types [#59498](https://github.com/ClickHouse/ClickHouse/pull/59498) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix corner case when passing `update_insert_deduplication_token_in_dependent_materialized_views` [#59544](https://github.com/ClickHouse/ClickHouse/pull/59544) ([Jordi Villar](https://github.com/jrdi)).
+* Fix incorrect result of arrayElement / map on empty value [#59594](https://github.com/ClickHouse/ClickHouse/pull/59594) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash in topK when merging empty states [#59603](https://github.com/ClickHouse/ClickHouse/pull/59603) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix distributed table with a constant sharding key [#59606](https://github.com/ClickHouse/ClickHouse/pull/59606) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix KQL issue found by WingFuzz [#59626](https://github.com/ClickHouse/ClickHouse/pull/59626) ([Yong Wang](https://github.com/kashwy)).
+* Fix error "Read beyond last offset" for AsynchronousBoundedReadBuffer [#59630](https://github.com/ClickHouse/ClickHouse/pull/59630) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Maintain function alias in RewriteSumFunctionWithSumAndCountVisitor [#59658](https://github.com/ClickHouse/ClickHouse/pull/59658) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix query start time on non initial queries [#59662](https://github.com/ClickHouse/ClickHouse/pull/59662) ([Raúl Marín](https://github.com/Algunenano)).
+* Validate types of arguments for `minmax` skipping index [#59733](https://github.com/ClickHouse/ClickHouse/pull/59733) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix AST fuzzer issue in function `countMatches` [#59752](https://github.com/ClickHouse/ClickHouse/pull/59752) ([Robert Schulze](https://github.com/rschu1ze)).
+* RabbitMQ: fix having neither acked nor nacked messages [#59775](https://github.com/ClickHouse/ClickHouse/pull/59775) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix StorageURL doing some of the query execution in single thread [#59833](https://github.com/ClickHouse/ClickHouse/pull/59833) ([Michael Kolupaev](https://github.com/al13n321)).
+* S3Queue: fix uninitialized value [#59897](https://github.com/ClickHouse/ClickHouse/pull/59897) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix parsing of partition expressions surrounded by parens [#59901](https://github.com/ClickHouse/ClickHouse/pull/59901) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix crash in JSONColumnsWithMetadata format over HTTP [#59925](https://github.com/ClickHouse/ClickHouse/pull/59925) ([Kruglov Pavel](https://github.com/Avogar)).
+* Do not rewrite sum to count if the return value differs in Analyzer [#59926](https://github.com/ClickHouse/ClickHouse/pull/59926) ([Azat Khuzhin](https://github.com/azat)).
+* UniqExactSet read crash fix [#59928](https://github.com/ClickHouse/ClickHouse/pull/59928) ([Maksim Kita](https://github.com/kitaisreal)).
+* ReplicatedMergeTree invalid metadata_version fix [#59946](https://github.com/ClickHouse/ClickHouse/pull/59946) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix data race in `StorageDistributed` [#59987](https://github.com/ClickHouse/ClickHouse/pull/59987) ([Nikita Taranov](https://github.com/nickitat)).
+* Docker: run init scripts when option is enabled rather than disabled [#59991](https://github.com/ClickHouse/ClickHouse/pull/59991) ([jktng](https://github.com/jktng)).
+* Fix INSERT into `SQLite` with single quote (by escaping single quotes with a quote instead of backslash) [#60015](https://github.com/ClickHouse/ClickHouse/pull/60015) ([Azat Khuzhin](https://github.com/azat)).
+* Fix several logical errors in `arrayFold` [#60022](https://github.com/ClickHouse/ClickHouse/pull/60022) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix optimize_uniq_to_count removing the column alias [#60026](https://github.com/ClickHouse/ClickHouse/pull/60026) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix possible exception from S3Queue table on drop [#60036](https://github.com/ClickHouse/ClickHouse/pull/60036) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix formatting of NOT with single literals [#60042](https://github.com/ClickHouse/ClickHouse/pull/60042) ([Raúl Marín](https://github.com/Algunenano)).
+* Use max_query_size from context in DDLLogEntry instead of hardcoded 4096 [#60083](https://github.com/ClickHouse/ClickHouse/pull/60083) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix inconsistent formatting of queries containing tables named `table`. Fix wrong formatting of queries with `UNION ALL`, `INTERSECT`, and `EXCEPT` when their structure wasn't linear. This closes #52349. Fix wrong formatting of `SYSTEM` queries, including `SYSTEM ... DROP FILESYSTEM CACHE`, `SYSTEM ... REFRESH/START/STOP/CANCEL/TEST VIEW`, `SYSTEM ENABLE/DISABLE FAILPOINT`. Fix formatting of parameterized DDL queries. Fix the formatting of the `DESCRIBE FILESYSTEM CACHE` query. Fix incorrect formatting of the `SET param_...` (a query setting a parameter). Fix incorrect formatting of `CREATE INDEX` queries. Fix inconsistent formatting of `CREATE USER` and similar queries. Fix inconsistent formatting of `CREATE SETTINGS PROFILE`. Fix incorrect formatting of `ALTER ... MODIFY REFRESH`. Fix inconsistent formatting of window functions if frame offsets were expressions. Fix inconsistent formatting of `RESPECT NULLS` and `IGNORE NULLS` if they were used after a function that implements an operator (such as `plus`). Fix idiotic formatting of `SYSTEM SYNC REPLICA ... LIGHTWEIGHT FROM ...`. Fix inconsistent formatting of invalid queries with `GROUP BY GROUPING SETS ... WITH ROLLUP/CUBE/TOTALS`. Fix inconsistent formatting of `GRANT CURRENT GRANTS`. Fix inconsistent formatting of `CREATE TABLE (... COLLATE)`. Additionally, I fixed the incorrect formatting of `EXPLAIN` in subqueries (#60102). Fixed incorrect formatting of lambda functions (#60012). Added a check so there is no way to miss these abominations in the future. [#60095](https://github.com/ClickHouse/ClickHouse/pull/60095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix inconsistent formatting of explain in subqueries [#60102](https://github.com/ClickHouse/ClickHouse/pull/60102) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix cosineDistance crash with Nullable [#60150](https://github.com/ClickHouse/ClickHouse/pull/60150) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow casting of bools in string representation to true bools [#60160](https://github.com/ClickHouse/ClickHouse/pull/60160) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix `system.s3queue_log` [#60166](https://github.com/ClickHouse/ClickHouse/pull/60166) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix arrayReduce with nullable aggregate function name [#60188](https://github.com/ClickHouse/ClickHouse/pull/60188) ([Raúl Marín](https://github.com/Algunenano)).
+* Hide sensitive info for `S3Queue` [#60233](https://github.com/ClickHouse/ClickHouse/pull/60233) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix http exception codes. [#60252](https://github.com/ClickHouse/ClickHouse/pull/60252) ([Austin Kothig](https://github.com/kothiga)).
+* S3Queue: fix a bug (also fixes flaky test_storage_s3_queue/test.py::test_shards_distributed) [#60282](https://github.com/ClickHouse/ClickHouse/pull/60282) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix use-of-uninitialized-value and invalid result in hashing functions with IPv6 [#60359](https://github.com/ClickHouse/ClickHouse/pull/60359) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix OptimizeDateOrDateTimeConverterWithPreimageVisitor with null arguments [#60453](https://github.com/ClickHouse/ClickHouse/pull/60453) ([Raúl Marín](https://github.com/Algunenano)).
+* Fixed a minor bug that prevented distributed table queries sent from either KQL or PRQL dialect clients to be executed on replicas. [#59674](https://github.com/ClickHouse/ClickHouse/issues/59674). [#60470](https://github.com/ClickHouse/ClickHouse/pull/60470) ([Alexey Milovidov](https://github.com/alexey-milovidov)) [#59674](https://github.com/ClickHouse/ClickHouse/pull/59674) ([Austin Kothig](https://github.com/kothiga)).
 
-### <a id="232"></a> ClickHouse release 23.2, 2023-02-23
+
+### <a id="241"></a> ClickHouse release 24.1, 2024-01-30
 
 #### Backward Incompatible Change
-* Extend function "toDayOfWeek()" (alias: "DAYOFWEEK") with a mode argument that encodes whether the week starts on Monday or Sunday and whether counting starts at 0 or 1. For consistency with other date time functions, the mode argument was inserted between the time and the time zone arguments. This breaks existing usage of the (previously undocumented) 2-argument syntax "toDayOfWeek(time, time_zone)". A fix is to rewrite the function into "toDayOfWeek(time, 0, time_zone)". [#45233](https://github.com/ClickHouse/ClickHouse/pull/45233) ([Robert Schulze](https://github.com/rschu1ze)).
-* Rename setting `max_query_cache_size` to `filesystem_cache_max_download_size`. [#45614](https://github.com/ClickHouse/ClickHouse/pull/45614) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* The `default` user will not have permissions for access type `SHOW NAMED COLLECTION` by default (e.g. `default` user will no longer be able to grant ALL to other users as it was before, therefore this PR is backward incompatible). [#46010](https://github.com/ClickHouse/ClickHouse/pull/46010) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* If the SETTINGS clause is specified before the FORMAT clause, the settings will be applied to formatting as well. [#46003](https://github.com/ClickHouse/ClickHouse/pull/46003) ([Azat Khuzhin](https://github.com/azat)).
-* Remove support for setting `materialized_postgresql_allow_automatic_update` (which was by default turned off). [#46106](https://github.com/ClickHouse/ClickHouse/pull/46106) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Slightly improve performance of `countDigits` on realistic datasets. This closed [#44518](https://github.com/ClickHouse/ClickHouse/issues/44518). In previous versions, `countDigits(0)` returned `0`; now it returns `1`, which is more correct, and follows the existing documentation. [#46187](https://github.com/ClickHouse/ClickHouse/pull/46187) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Disallow creation of new columns compressed by a combination of codecs "Delta" or "DoubleDelta" followed by codecs "Gorilla" or "FPC". This can be bypassed using setting "allow_suspicious_codecs = true". [#45652](https://github.com/ClickHouse/ClickHouse/pull/45652) ([Robert Schulze](https://github.com/rschu1ze)).
+* The setting `print_pretty_type_names` is turned on by default. You can turn it off to keep the old behavior or `SET compatibility = '23.12'`. [#57726](https://github.com/ClickHouse/ClickHouse/pull/57726) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The MergeTree setting `clean_deleted_rows` is deprecated, it has no effect anymore. The `CLEANUP` keyword for `OPTIMIZE` is not allowed by default (unless `allow_experimental_replacing_merge_with_cleanup` is enabled). [#58316](https://github.com/ClickHouse/ClickHouse/pull/58316) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* The function `reverseDNSQuery` is no longer available. This closes [#58368](https://github.com/ClickHouse/ClickHouse/issues/58368). [#58369](https://github.com/ClickHouse/ClickHouse/pull/58369) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Enable various changes to improve the access control in the configuration file. These changes affect the behavior, and you check the `config.xml` in the `access_control_improvements` section. In case you are not confident, keep the values in the configuration file as they were in the previous version. [#58584](https://github.com/ClickHouse/ClickHouse/pull/58584) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve the operation of `sumMapFiltered` with NaN values. NaN values are now placed at the end (instead of randomly) and considered different from any values. `-0` is now also treated as equal to `0`; since 0 values are discarded, `-0` values are discarded too. [#58959](https://github.com/ClickHouse/ClickHouse/pull/58959) ([Raúl Marín](https://github.com/Algunenano)).
+* The function `visibleWidth` will behave according to the docs. In previous versions, it simply counted code points after string serialization, like the `lengthUTF8` function, but didn't consider zero-width and combining characters, full-width characters, tabs, and deletes. Now the behavior is changed accordingly. If you want to keep the old behavior, set `function_visible_width_behavior` to `0`, or set `compatibility` to `23.12` or lower. [#59022](https://github.com/ClickHouse/ClickHouse/pull/59022) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* `Kusto` dialect is disabled until these two bugs will be fixed: [#59037](https://github.com/ClickHouse/ClickHouse/issues/59037) and [#59036](https://github.com/ClickHouse/ClickHouse/issues/59036). [#59305](https://github.com/ClickHouse/ClickHouse/pull/59305) ([Alexey Milovidov](https://github.com/alexey-milovidov)). Any attempt to use `Kusto` will result in exception.
+* More efficient implementation of the `FINAL` modifier no longer guarantees preserving the order even if `max_threads = 1`. If you counted on the previous behavior, set `enable_vertical_final` to 0 or `compatibility` to `23.12`. 
 
 #### New Feature
-* Add `StorageIceberg` and table function `iceberg` to access iceberg table store on S3. [#45384](https://github.com/ClickHouse/ClickHouse/pull/45384) ([flynn](https://github.com/ucasfl)).
-* Allow configuring storage as `SETTINGS disk = '<disk_name>'` (instead of `storage_policy`) and with explicit disk creation `SETTINGS disk = disk(type=s3, ...)`. [#41976](https://github.com/ClickHouse/ClickHouse/pull/41976) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Expose `ProfileEvents` counters in `system.part_log`. [#38614](https://github.com/ClickHouse/ClickHouse/pull/38614) ([Bharat Nallan](https://github.com/bharatnc)).
-* Enrichment of the existing `ReplacingMergeTree` engine to allow duplicate the insertion. It leverages the power of both `ReplacingMergeTree` and `CollapsingMergeTree` in one MergeTree engine. Deleted data are not returned when queried, but not removed from disk neither. [#41005](https://github.com/ClickHouse/ClickHouse/pull/41005) ([youennL-cs](https://github.com/youennL-cs)).
-* Add `generateULID` function. Closes [#36536](https://github.com/ClickHouse/ClickHouse/issues/36536). [#44662](https://github.com/ClickHouse/ClickHouse/pull/44662) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Add `corrMatrix` aggregate function, calculating each two columns. In addition, since Aggregatefunctions `covarSamp` and `covarPop` are similar to `corr`, I add `covarSampMatrix`, `covarPopMatrix` by the way. @alexey-milovidov closes [#44587](https://github.com/ClickHouse/ClickHouse/issues/44587). [#44680](https://github.com/ClickHouse/ClickHouse/pull/44680) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Introduce arrayShuffle function for random array permutations. [#45271](https://github.com/ClickHouse/ClickHouse/pull/45271) ([Joanna Hulboj](https://github.com/jh0x)).
-* Support types `FIXED_SIZE_BINARY` type in Arrow, `FIXED_LENGTH_BYTE_ARRAY` in `Parquet` and match them to `FixedString`. Add settings `output_format_parquet_fixed_string_as_fixed_byte_array/output_format_arrow_fixed_string_as_fixed_byte_array` to control default output type for FixedString. Closes [#45326](https://github.com/ClickHouse/ClickHouse/issues/45326). [#45340](https://github.com/ClickHouse/ClickHouse/pull/45340) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add a new column `last_exception_time` to system.replication_queue. [#45457](https://github.com/ClickHouse/ClickHouse/pull/45457) ([Frank Chen](https://github.com/FrankChen021)).
-* Add two new functions which allow for user-defined keys/seeds with SipHash{64,128}. [#45513](https://github.com/ClickHouse/ClickHouse/pull/45513) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Allow a three-argument version for table function `format`. close [#45808](https://github.com/ClickHouse/ClickHouse/issues/45808). [#45873](https://github.com/ClickHouse/ClickHouse/pull/45873) ([FFFFFFFHHHHHHH](https://github.com/FFFFFFFHHHHHHH)).
-* Add `JodaTime` format support for 'x','w','S'. Refer to https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html. [#46073](https://github.com/ClickHouse/ClickHouse/pull/46073) ([zk_kiger](https://github.com/zk-kiger)).
-* Support window function `ntile`. ([lgbo](https://github.com/lgbo-ustc)).
-* Add setting `final` to implicitly apply the `FINAL` modifier to every table. [#40945](https://github.com/ClickHouse/ClickHouse/pull/40945) ([Arthur Passos](https://github.com/arthurpassos)).
-* Added `arrayPartialSort` and `arrayPartialReverseSort` functions. [#46296](https://github.com/ClickHouse/ClickHouse/pull/46296) ([Joanna Hulboj](https://github.com/jh0x)).
-* The new http parameter `client_protocol_version` allows setting a client protocol version for HTTP responses using the Native format. [#40397](https://github.com/ClickHouse/ClickHouse/issues/40397). [#46360](https://github.com/ClickHouse/ClickHouse/pull/46360) ([Geoff Genz](https://github.com/genzgd)).
-* Add new function `regexpExtract`, like spark function `REGEXP_EXTRACT` for compatibility. It is similar to the existing function `extract`. [#46469](https://github.com/ClickHouse/ClickHouse/pull/46469) ([�扬](https://github.com/taiyang-li)).
-* Add new function `JSONArrayLength`, which returns the number of elements in the outermost JSON array. The function returns NULL if the input JSON string is invalid. [#46631](https://github.com/ClickHouse/ClickHouse/pull/46631) ([�扬](https://github.com/taiyang-li)).
+* Implement Variant data type that represents a union of other data types. Type `Variant(T1, T2, ..., TN)` means that each row of this type has a value of either type `T1` or `T2` or ... or `TN` or none of them (`NULL` value). Variant type is available under a setting `allow_experimental_variant_type`. Reference: [#54864](https://github.com/ClickHouse/ClickHouse/issues/54864). [#58047](https://github.com/ClickHouse/ClickHouse/pull/58047) ([Kruglov Pavel](https://github.com/Avogar)).
+* Certain settings (currently `min_compress_block_size` and `max_compress_block_size`) can now be specified at column-level where they take precedence over the corresponding table-level setting. Example: `CREATE TABLE tab (col String SETTINGS (min_compress_block_size = 81920, max_compress_block_size = 163840)) ENGINE = MergeTree ORDER BY tuple();`. [#55201](https://github.com/ClickHouse/ClickHouse/pull/55201) ([Duc Canh Le](https://github.com/canhld94)).
+* Add `quantileDD` aggregate function as well as the corresponding `quantilesDD` and `medianDD`. It is based on the DDSketch https://www.vldb.org/pvldb/vol12/p2195-masson.pdf. ### Documentation entry for user-facing changes. [#56342](https://github.com/ClickHouse/ClickHouse/pull/56342) ([Srikanth Chekuri](https://github.com/srikanthccv)).
+* Allow to configure any kind of object storage with any kind of metadata type. [#58357](https://github.com/ClickHouse/ClickHouse/pull/58357) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Added `null_status_on_timeout_only_active` and `throw_only_active` modes for `distributed_ddl_output_mode` that allow to avoid waiting for inactive replicas. [#58350](https://github.com/ClickHouse/ClickHouse/pull/58350) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add function `arrayShingles` to compute subarrays, e.g. `arrayShingles([1, 2, 3, 4, 5], 3)` returns `[[1,2,3],[2,3,4],[3,4,5]]`. [#58396](https://github.com/ClickHouse/ClickHouse/pull/58396) ([Zheng Miao](https://github.com/zenmiao7)).
+* Added functions `punycodeEncode`, `punycodeDecode`, `idnaEncode` and `idnaDecode` which are useful for translating international domain names to an ASCII representation according to the IDNA standard. [#58454](https://github.com/ClickHouse/ClickHouse/pull/58454) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added string similarity functions `dramerauLevenshteinDistance`, `jaroSimilarity` and `jaroWinklerSimilarity`. [#58531](https://github.com/ClickHouse/ClickHouse/pull/58531) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add two settings `output_format_compression_level` to change output compression level and `output_format_compression_zstd_window_log` to explicitly set compression window size and enable long-range mode for zstd compression if output compression method is `zstd`. Applied for `INTO OUTFILE` and when writing to table functions `file`, `url`, `hdfs`, `s3`, and `azureBlobStorage`. [#58539](https://github.com/ClickHouse/ClickHouse/pull/58539) ([Duc Canh Le](https://github.com/canhld94)).
+* Automatically disable ANSI escape sequences in Pretty formats if the output is not a terminal. Add new `auto` mode to setting `output_format_pretty_color`. [#58614](https://github.com/ClickHouse/ClickHouse/pull/58614) ([Shaun Struwig](https://github.com/Blargian)).
+* Added function `sqidDecode` which decodes [Sqids](https://sqids.org/). [#58544](https://github.com/ClickHouse/ClickHouse/pull/58544) ([Robert Schulze](https://github.com/rschu1ze)).
+* Allow to read Bool values into String in JSON input formats. It's done under a setting `input_format_json_read_bools_as_strings` that is enabled by default. [#58561](https://github.com/ClickHouse/ClickHouse/pull/58561) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added function `seriesDecomposeSTL` which decomposes a time series into a season, a trend and a residual component. [#57078](https://github.com/ClickHouse/ClickHouse/pull/57078) ([Bhavna Jindal](https://github.com/bhavnajindal)).
+* Introduced MySQL Binlog Client for MaterializedMySQL: One binlog connection for many databases. [#57323](https://github.com/ClickHouse/ClickHouse/pull/57323) ([Val Doroshchuk](https://github.com/valbok)).
+* Intel QuickAssist Technology (QAT) provides hardware-accelerated compression and cryptograpy. ClickHouse got a new compression codec `ZSTD_QAT` which utilizes QAT for zstd compression. The codec uses [Intel's QATlib](https://github.com/intel/qatlib) and [Inte's QAT ZSTD Plugin](https://github.com/intel/QAT-ZSTD-Plugin). Right now, only compression can be accelerated in hardware (a software fallback kicks in in case QAT could not be initialized), decompression always runs in software. [#57509](https://github.com/ClickHouse/ClickHouse/pull/57509) ([jasperzhu](https://github.com/jinjunzh)).
+* Implementing the new way how object storage keys are generated for s3 disks. Now the format could be defined in terms of `re2` regex syntax with `key_template` option in disc description. [#57663](https://github.com/ClickHouse/ClickHouse/pull/57663) ([Sema Checherinda](https://github.com/CheSema)).
+* Table system.dropped_tables_parts contains parts of system.dropped_tables tables (dropped but not yet removed tables). [#58038](https://github.com/ClickHouse/ClickHouse/pull/58038) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Add settings `max_materialized_views_size_for_table` to limit the number of materialized views attached to a table. [#58068](https://github.com/ClickHouse/ClickHouse/pull/58068) ([zhongyuankai](https://github.com/zhongyuankai)).
+* `clickhouse-format` improvements: support INSERT queries with `VALUES`; support comments (use `--comments` to output them); support `--max_line_length` option to format only long queries in multiline. [#58246](https://github.com/ClickHouse/ClickHouse/pull/58246) ([vdimir](https://github.com/vdimir)).
+* Attach all system tables in `clickhouse-local`, including `system.parts`. This closes [#58312](https://github.com/ClickHouse/ClickHouse/issues/58312). [#58359](https://github.com/ClickHouse/ClickHouse/pull/58359) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support for `Enum` data types in function `transform`. This closes [#58241](https://github.com/ClickHouse/ClickHouse/issues/58241). [#58360](https://github.com/ClickHouse/ClickHouse/pull/58360) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add table `system.database_engines`. [#58390](https://github.com/ClickHouse/ClickHouse/pull/58390) ([Bharat Nallan](https://github.com/bharatnc)). Allow registering database engines independently in the codebase. [#58365](https://github.com/ClickHouse/ClickHouse/pull/58365) ([Bharat Nallan](https://github.com/bharatnc)). Allow registering interpreters independently. [#58443](https://github.com/ClickHouse/ClickHouse/pull/58443) ([Bharat Nallan](https://github.com/bharatnc)).
+* Added `FROM <Replicas>` modifier for `SYSTEM SYNC REPLICA LIGHTWEIGHT` query. With the `FROM` modifier ensures we wait for fetches and drop-ranges only for the specified source replicas, as well as any replica not in zookeeper or with an empty source_replica. [#58393](https://github.com/ClickHouse/ClickHouse/pull/58393) ([Jayme Bird](https://github.com/jaymebrd)).
+* Added setting `update_insert_deduplication_token_in_dependent_materialized_views`. This setting allows to update insert deduplication token with table identifier during insert in dependent materialized views. Closes [#59165](https://github.com/ClickHouse/ClickHouse/issues/59165). [#59238](https://github.com/ClickHouse/ClickHouse/pull/59238) ([Maksim Kita](https://github.com/kitaisreal)).
+* Added statement `SYSTEM RELOAD ASYNCHRONOUS METRICS` which updates the asynchronous metrics. Mostly useful for testing and development. [#53710](https://github.com/ClickHouse/ClickHouse/pull/53710) ([Robert Schulze](https://github.com/rschu1ze)).
 
 #### Performance Improvement
-* The introduced logic works if PREWHERE condition is a conjunction of multiple conditions (cond1 AND cond2 AND ... ). It groups those conditions that require reading the same columns into steps. After each step the corresponding part of the full condition is computed and the result rows might be filtered. This allows to read fewer rows in the next steps thus saving IO bandwidth and doing less computation. This logic is disabled by default for now. It will be enabled by default in one of the future releases once it is known to not have any regressions, so it is highly encouraged to be used for testing. It can be controlled by 2 settings: "enable_multiple_prewhere_read_steps" and "move_all_conditions_to_prewhere". [#46140](https://github.com/ClickHouse/ClickHouse/pull/46140) ([Alexander Gololobov](https://github.com/davenger)).
-* An option added to aggregate partitions independently if table partition key and group by key are compatible. Controlled by the setting `allow_aggregate_partitions_independently`. Disabled by default because of limited applicability (please refer to the docs). [#45364](https://github.com/ClickHouse/ClickHouse/pull/45364) ([Nikita Taranov](https://github.com/nickitat)).
-* 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). [#45681](https://github.com/ClickHouse/ClickHouse/pull/45681) [#46282](https://github.com/ClickHouse/ClickHouse/pull/46282) ([Anton Popov](https://github.com/CurtizJ)).
-* Optimize `Parquet` reader by using batch reader. [#45878](https://github.com/ClickHouse/ClickHouse/pull/45878) ([LiuNeng](https://github.com/liuneng1994)).
-* Add new `local_filesystem_read_method` method `io_uring` based on the asynchronous Linux [io_uring](https://kernel.dk/io_uring.pdf) subsystem, improving read performance almost universally compared to the default `pread` method. [#38456](https://github.com/ClickHouse/ClickHouse/pull/38456) ([Saulius Valatka](https://github.com/sauliusvl)).
-* 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). It is helpful in performance. [#44730](https://github.com/ClickHouse/ClickHouse/pull/44730) ([�扬](https://github.com/taiyang-li)).
-* Improve lower/upper function performance with avx512 instructions. [#37894](https://github.com/ClickHouse/ClickHouse/pull/37894) ([yaqi-zhao](https://github.com/yaqi-zhao)).
-* Remove the limitation that on systems with >=32 cores and SMT disabled ClickHouse uses only half of the cores (the case when you disable Hyper Threading in BIOS). [#44973](https://github.com/ClickHouse/ClickHouse/pull/44973) ([Robert Schulze](https://github.com/rschu1ze)).
-* Improve performance of function `multiIf` by columnar executing, speed up by 2.3x. [#45296](https://github.com/ClickHouse/ClickHouse/pull/45296) ([�扬](https://github.com/taiyang-li)).
-* Add fast path for function `position` when the needle is empty. [#45382](https://github.com/ClickHouse/ClickHouse/pull/45382) ([�扬](https://github.com/taiyang-li)).
-* Enable `query_plan_remove_redundant_sorting` optimization by default. Optimization implemented in [#45420](https://github.com/ClickHouse/ClickHouse/issues/45420). [#45567](https://github.com/ClickHouse/ClickHouse/pull/45567) ([Igor Nikonov](https://github.com/devcrafter)).
-* Increased HTTP Transfer Encoding chunk size to improve performance of large queries using the HTTP interface. [#45593](https://github.com/ClickHouse/ClickHouse/pull/45593) ([Geoff Genz](https://github.com/genzgd)).
-* 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)).
-* Improve performance of filtering for big integers and decimal types. [#45949](https://github.com/ClickHouse/ClickHouse/pull/45949) ([�扬](https://github.com/taiyang-li)).
-* This change could effectively reduce the overhead of obtaining the filter from ColumnNullable(UInt8) and improve the overall query performance. To evaluate the impact of this change, we adopted TPC-H benchmark but revised the column types from non-nullable to nullable, and we measured the QPS of its queries as the performance indicator. [#45962](https://github.com/ClickHouse/ClickHouse/pull/45962) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Make the `_part` and `_partition_id` virtual column be `LowCardinality(String)` type. Closes [#45964](https://github.com/ClickHouse/ClickHouse/issues/45964). [#45975](https://github.com/ClickHouse/ClickHouse/pull/45975) ([flynn](https://github.com/ucasfl)).
-* Improve the performance of Decimal conversion when the scale does not change. [#46095](https://github.com/ClickHouse/ClickHouse/pull/46095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Allow to increase prefetching for read data. [#46168](https://github.com/ClickHouse/ClickHouse/pull/46168) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Rewrite `arrayExists(x -> x = 1, arr)` -> `has(arr, 1)`, which improve performance by 1.34x. [#46188](https://github.com/ClickHouse/ClickHouse/pull/46188) ([�扬](https://github.com/taiyang-li)).
-* 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)).
-* Update zstd to v1.5.4. It has some minor improvements in performance and compression ratio. If you run replicas with different versions of ClickHouse you may see reasonable error messages `Data after merge/mutation is not byte-identical to data on another replicas.` with explanation. These messages are Ok and you should not worry. [#46280](https://github.com/ClickHouse/ClickHouse/pull/46280) ([Raúl Marín](https://github.com/Algunenano)).
-* Fix performance degradation caused by [#39737](https://github.com/ClickHouse/ClickHouse/issues/39737). [#46309](https://github.com/ClickHouse/ClickHouse/pull/46309) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The `replicas_status` handle will answer quickly even in case of a large replication queue. [#46310](https://github.com/ClickHouse/ClickHouse/pull/46310) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add avx512 support for aggregate function `sum`, function unary arithmetic, function comparison. [#37870](https://github.com/ClickHouse/ClickHouse/pull/37870) ([zhao zhou](https://github.com/zzachimed)).
-* Rewrote the code around marks distribution and the overall coordination of the reading in order to achieve the maximum performance improvement. This closes [#34527](https://github.com/ClickHouse/ClickHouse/issues/34527). [#43772](https://github.com/ClickHouse/ClickHouse/pull/43772) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Remove redundant DISTINCT clauses in query (subqueries). Implemented on top of query plan. It does similar optimization as `optimize_duplicate_order_by_and_distinct` regarding DISTINCT clauses. Can be enabled via `query_plan_remove_redundant_distinct` setting. Related to [#42648](https://github.com/ClickHouse/ClickHouse/issues/42648). [#44176](https://github.com/ClickHouse/ClickHouse/pull/44176) ([Igor Nikonov](https://github.com/devcrafter)).
-* A few query rewrite optimizations: `sumIf(123, cond) -> 123 * countIf(1, cond)`, `sum(if(cond, 123, 0)) -> 123 * countIf(cond)`, `sum(if(cond, 0, 123)) -> 123 * countIf(not(cond))` [#44728](https://github.com/ClickHouse/ClickHouse/pull/44728) ([�扬](https://github.com/taiyang-li)).
-* Improved how memory bound merging and aggregation in order on top query plan interact. Previously we fell back to explicit sorting for AIO in some cases when it wasn't actually needed. [#45892](https://github.com/ClickHouse/ClickHouse/pull/45892) ([Nikita Taranov](https://github.com/nickitat)).
-* Concurrent merges are scheduled using round-robin by default to ensure fair and starvation-free operation. Previously in heavily overloaded shards, big merges could possibly be starved by smaller merges due to the use of strict priority scheduling. Added `background_merges_mutations_scheduling_policy` server config option to select scheduling algorithm (`round_robin` or `shortest_task_first`). [#46247](https://github.com/ClickHouse/ClickHouse/pull/46247) ([Sergei Trifonov](https://github.com/serxa)).
+* Coordination for parallel replicas is rewritten for better parallelism and cache locality. It has been tested for linear scalability on hundreds of replicas. It also got support for reading in order. [#57968](https://github.com/ClickHouse/ClickHouse/pull/57968) ([Nikita Taranov](https://github.com/nickitat)).
+* Replace HTTP outgoing buffering based with the native ClickHouse buffers. Add bytes counting metrics for interfaces. [#56064](https://github.com/ClickHouse/ClickHouse/pull/56064) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Large aggregation states of `uniqExact` will be merged in parallel in distrubuted queries. [#59009](https://github.com/ClickHouse/ClickHouse/pull/59009) ([Nikita Taranov](https://github.com/nickitat)).
+* Lower memory usage after reading from `MergeTree` tables. [#59290](https://github.com/ClickHouse/ClickHouse/pull/59290) ([Anton Popov](https://github.com/CurtizJ)).
+* Lower memory usage in vertical merges. [#59340](https://github.com/ClickHouse/ClickHouse/pull/59340) ([Anton Popov](https://github.com/CurtizJ)).
+* Avoid huge memory consumption during Keeper startup for more cases. [#58455](https://github.com/ClickHouse/ClickHouse/pull/58455) ([Antonio Andelic](https://github.com/antonio2368)).
+* Keeper improvement: reduce Keeper's memory usage for stored nodes. [#59002](https://github.com/ClickHouse/ClickHouse/pull/59002) ([Antonio Andelic](https://github.com/antonio2368)).
+* More cache-friendly final implementation. Note on the behaviour change: previously queries with `FINAL` modifier that read with a single stream (e.g. `max_threads = 1`) produced sorted output without explicitly provided `ORDER BY` clause. This is no longer guaranteed when `enable_vertical_final = true` (and it is so by default). [#54366](https://github.com/ClickHouse/ClickHouse/pull/54366) ([Duc Canh Le](https://github.com/canhld94)).
+* Bypass extra copying in `ReadBufferFromIStream` which is used, e.g., for reading from S3. [#56961](https://github.com/ClickHouse/ClickHouse/pull/56961) ([Nikita Taranov](https://github.com/nickitat)).
+* Optimize array element function when input is Array(Map)/Array(Array(Num)/Array(Array(String))/Array(BigInt)/Array(Decimal). The previous implementations did more allocations than needed. The optimization speed up is up to ~6x especially when input type is Array(Map). [#56403](https://github.com/ClickHouse/ClickHouse/pull/56403) ([�扬](https://github.com/taiyang-li)).
+* Read column once while reading more than one subcolumn from it in compact parts. [#57631](https://github.com/ClickHouse/ClickHouse/pull/57631) ([Kruglov Pavel](https://github.com/Avogar)).
+* Rewrite the AST of `sum(column + constant)` function. This is available as an optimization pass for Analyzer [#57853](https://github.com/ClickHouse/ClickHouse/pull/57853) ([Jiebin Sun](https://github.com/jiebinn)).
+* The evaluation of function `match` now utilizes skipping indices `ngrambf_v1` and `tokenbf_v1`. [#57882](https://github.com/ClickHouse/ClickHouse/pull/57882) ([凌涛](https://github.com/lingtaolf)).
+* The evaluation of function `match` now utilizes inverted indices. [#58284](https://github.com/ClickHouse/ClickHouse/pull/58284) ([凌涛](https://github.com/lingtaolf)).
+* MergeTree `FINAL` does not compare rows from same non-L0 part. [#58142](https://github.com/ClickHouse/ClickHouse/pull/58142) ([Duc Canh Le](https://github.com/canhld94)).
+* Speed up iota calls (filling array with consecutive numbers). [#58271](https://github.com/ClickHouse/ClickHouse/pull/58271) ([Raúl Marín](https://github.com/Algunenano)).
+* Speedup MIN/MAX for non-numeric types. [#58334](https://github.com/ClickHouse/ClickHouse/pull/58334) ([Raúl Marín](https://github.com/Algunenano)).
+* Optimize the combination of filters (like in multi-stage PREWHERE) with BMI2/SSE intrinsics [#58800](https://github.com/ClickHouse/ClickHouse/pull/58800) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
+* Use one thread less in `clickhouse-local`. [#58968](https://github.com/ClickHouse/ClickHouse/pull/58968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve the `multiIf` function performance when the type is Nullable. [#57745](https://github.com/ClickHouse/ClickHouse/pull/57745) ([KevinyhZou](https://github.com/KevinyhZou)).
+* Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+* Lower memory consumption in backups to S3. [#58962](https://github.com/ClickHouse/ClickHouse/pull/58962) ([Vitaly Baranov](https://github.com/vitlibar)).
 
 #### Improvement
-* Enable retries for INSERT by default in case of ZooKeeper session loss. We already use it in production. [#46308](https://github.com/ClickHouse/ClickHouse/pull/46308) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add ability to ignore unknown keys in JSON object for named tuples (`input_format_json_ignore_unknown_keys_in_named_tuple`). [#45678](https://github.com/ClickHouse/ClickHouse/pull/45678) ([Azat Khuzhin](https://github.com/azat)).
-* Support optimizing the `where` clause with sorting key expression move to `prewhere`  for query with `final`. [#38893](https://github.com/ClickHouse/ClickHouse/issues/38893). [#38950](https://github.com/ClickHouse/ClickHouse/pull/38950) ([hexiaoting](https://github.com/hexiaoting)).
-* Add new metrics for backups: num_processed_files and processed_files_size described actual number of processed files. [#42244](https://github.com/ClickHouse/ClickHouse/pull/42244) ([Aleksandr](https://github.com/AVMusorin)).
-* Added retries on interserver DNS errors. [#43179](https://github.com/ClickHouse/ClickHouse/pull/43179) ([Anton Kozlov](https://github.com/tonickkozlov)).
-* Keeper improvement: try preallocating space on the disk to avoid undefined out-of-space issues. Introduce setting `max_log_file_size` for the maximum size of Keeper's Raft log files. [#44370](https://github.com/ClickHouse/ClickHouse/pull/44370) ([Antonio Andelic](https://github.com/antonio2368)).
-* Optimize behavior for a replica delay api logic in case the replica is read-only. [#45148](https://github.com/ClickHouse/ClickHouse/pull/45148) ([mateng915](https://github.com/mateng0915)).
-* Ask for the password in clickhouse-client interactively in a case when the empty password is wrong. Closes [#46702](https://github.com/ClickHouse/ClickHouse/issues/46702). [#46730](https://github.com/ClickHouse/ClickHouse/pull/46730) ([Nikolay Degterinsky](https://github.com/evillique)). 
-* Mark `Gorilla` compression on columns of non-Float* type as suspicious. [#45376](https://github.com/ClickHouse/ClickHouse/pull/45376) ([Robert Schulze](https://github.com/rschu1ze)).
-* Show replica name that is executing a merge in the `postpone_reason` column. [#45458](https://github.com/ClickHouse/ClickHouse/pull/45458) ([Frank Chen](https://github.com/FrankChen021)).
-* Save exception stack trace in part_log. [#45459](https://github.com/ClickHouse/ClickHouse/pull/45459) ([Frank Chen](https://github.com/FrankChen021)).
-* The `regexp_tree` dictionary is polished and now it is compatible with https://github.com/ua-parser/uap-core. [#45631](https://github.com/ClickHouse/ClickHouse/pull/45631) ([Han Fei](https://github.com/hanfei1991)).
-* Updated checking of `SYSTEM SYNC REPLICA`, resolves [#45508](https://github.com/ClickHouse/ClickHouse/issues/45508) [#45648](https://github.com/ClickHouse/ClickHouse/pull/45648) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Rename setting `replication_alter_partitions_sync` to `alter_sync`. [#45659](https://github.com/ClickHouse/ClickHouse/pull/45659) ([Antonio Andelic](https://github.com/antonio2368)).
-* The `generateRandom` table function and the engine now support `LowCardinality` data types. This is useful for testing, for example you can write `INSERT INTO table SELECT * FROM generateRandom() LIMIT 1000`. This is needed to debug [#45590](https://github.com/ClickHouse/ClickHouse/issues/45590). [#45661](https://github.com/ClickHouse/ClickHouse/pull/45661) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* The experimental query result cache now provides more modular configuration settings. [#45679](https://github.com/ClickHouse/ClickHouse/pull/45679) ([Robert Schulze](https://github.com/rschu1ze)).
-* Renamed "query result cache" to "query cache". [#45682](https://github.com/ClickHouse/ClickHouse/pull/45682) ([Robert Schulze](https://github.com/rschu1ze)).
-* add `SYSTEM SYNC FILE CACHE` command. It will do the `sync` syscall. [#8921](https://github.com/ClickHouse/ClickHouse/issues/8921). [#45685](https://github.com/ClickHouse/ClickHouse/pull/45685) ([DR](https://github.com/freedomDR)).
-* Add a new S3 setting `allow_head_object_request`. This PR makes usage of `GetObjectAttributes` request instead of `HeadObject` introduced in https://github.com/ClickHouse/ClickHouse/pull/45288 optional (and disabled by default). [#45701](https://github.com/ClickHouse/ClickHouse/pull/45701) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add ability to override connection settings based on connection names (that said that now you can forget about storing password for each connection, you can simply put everything into `~/.clickhouse-client/config.xml` and even use different history files for them, which can be also useful). [#45715](https://github.com/ClickHouse/ClickHouse/pull/45715) ([Azat Khuzhin](https://github.com/azat)).
-* Arrow format: support the duration type. Closes [#45669](https://github.com/ClickHouse/ClickHouse/issues/45669). [#45750](https://github.com/ClickHouse/ClickHouse/pull/45750) ([flynn](https://github.com/ucasfl)).
-* Extend the logging in the Query Cache to improve investigations of the caching behavior. [#45751](https://github.com/ClickHouse/ClickHouse/pull/45751) ([Robert Schulze](https://github.com/rschu1ze)).
-* The query cache's server-level settings are now reconfigurable at runtime. [#45758](https://github.com/ClickHouse/ClickHouse/pull/45758) ([Robert Schulze](https://github.com/rschu1ze)).
-* Hide password in logs when a table function's arguments are specified with a named collection. [#45774](https://github.com/ClickHouse/ClickHouse/pull/45774) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Improve internal S3 client to correctly deduce regions and redirections for different types of URLs. [#45783](https://github.com/ClickHouse/ClickHouse/pull/45783) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add support for Map, IPv4 and IPv6 types in generateRandom. Mostly useful for testing. [#45785](https://github.com/ClickHouse/ClickHouse/pull/45785) ([Raúl Marín](https://github.com/Algunenano)).
-* Support empty/notEmpty for IP types. [#45799](https://github.com/ClickHouse/ClickHouse/pull/45799) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* The column `num_processed_files` was split into two columns: `num_files` (for BACKUP) and `files_read` (for RESTORE). The column `processed_files_size` was split into two columns: `total_size` (for BACKUP) and `bytes_read` (for RESTORE). [#45800](https://github.com/ClickHouse/ClickHouse/pull/45800) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add support for `SHOW ENGINES` query for MySQL compatibility. [#45859](https://github.com/ClickHouse/ClickHouse/pull/45859) ([Filatenkov Artur](https://github.com/FArthur-cmd)).
-* Improved how the obfuscator deals with queries. [#45867](https://github.com/ClickHouse/ClickHouse/pull/45867) ([Raúl Marín](https://github.com/Algunenano)).
-* Improve behaviour of conversion into Date for boundary value 65535 (2149-06-06). [#46042](https://github.com/ClickHouse/ClickHouse/pull/46042) [#45914](https://github.com/ClickHouse/ClickHouse/pull/45914) ([Joanna Hulboj](https://github.com/jh0x)).
-* Add setting `check_referential_table_dependencies` to check referential dependencies on `DROP TABLE`. This PR solves [#38326](https://github.com/ClickHouse/ClickHouse/issues/38326). [#45936](https://github.com/ClickHouse/ClickHouse/pull/45936) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix `tupleElement` to return `Null` when having `Null` argument. Closes [#45894](https://github.com/ClickHouse/ClickHouse/issues/45894). [#45952](https://github.com/ClickHouse/ClickHouse/pull/45952) ([flynn](https://github.com/ucasfl)).
-* Throw an error on no files satisfying the S3 wildcard. Closes [#45587](https://github.com/ClickHouse/ClickHouse/issues/45587). [#45957](https://github.com/ClickHouse/ClickHouse/pull/45957) ([chen](https://github.com/xiedeyantu)).
-* Use cluster state data to check concurrent backup/restore. [#45982](https://github.com/ClickHouse/ClickHouse/pull/45982) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* ClickHouse Client: Use "exact" matching for fuzzy search, which has correct case ignorance and more appropriate algorithm for matching SQL queries. [#46000](https://github.com/ClickHouse/ClickHouse/pull/46000) ([Azat Khuzhin](https://github.com/azat)).
-* Forbid wrong create View syntax `CREATE View X TO Y AS SELECT`. Closes [#4331](https://github.com/ClickHouse/ClickHouse/issues/4331). [#46043](https://github.com/ClickHouse/ClickHouse/pull/46043) ([flynn](https://github.com/ucasfl)).
-* Storage `Log` family support setting the `storage_policy`. Closes [#43421](https://github.com/ClickHouse/ClickHouse/issues/43421). [#46044](https://github.com/ClickHouse/ClickHouse/pull/46044) ([flynn](https://github.com/ucasfl)).
-* Improve `JSONColumns` format when the result is empty. Closes [#46024](https://github.com/ClickHouse/ClickHouse/issues/46024). [#46053](https://github.com/ClickHouse/ClickHouse/pull/46053) ([flynn](https://github.com/ucasfl)).
-* Add reference implementation for SipHash128. [#46065](https://github.com/ClickHouse/ClickHouse/pull/46065) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Add a new metric to record allocations times and bytes using mmap. [#46068](https://github.com/ClickHouse/ClickHouse/pull/46068) ([�扬](https://github.com/taiyang-li)).
-* Currently for functions like `leftPad`, `rightPad`, `leftPadUTF8`, `rightPadUTF8`, the second argument `length` must be UInt8|16|32|64|128|256. Which is too strict for clickhouse users, besides, it is not consistent with other similar functions like `arrayResize`, `substring` and so on. [#46103](https://github.com/ClickHouse/ClickHouse/pull/46103) ([�扬](https://github.com/taiyang-li)).
-* Fix assertion in the `welchTTest` function in debug build when the resulting statistics is NaN. Unified the behavior with other similar functions. Change the behavior of `studentTTest` to return NaN instead of throwing an exception because the previous behavior was inconvenient. This closes [#41176](https://github.com/ClickHouse/ClickHouse/issues/41176) This closes [#42162](https://github.com/ClickHouse/ClickHouse/issues/42162). [#46141](https://github.com/ClickHouse/ClickHouse/pull/46141) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* More convenient usage of big integers and ORDER BY WITH FILL. Allow using plain integers for start and end points in WITH FILL when ORDER BY big (128-bit and 256-bit) integers. Fix the wrong result for big integers with negative start or end points. This closes [#16733](https://github.com/ClickHouse/ClickHouse/issues/16733). [#46152](https://github.com/ClickHouse/ClickHouse/pull/46152) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add `parts`, `active_parts` and `total_marks` columns to `system.tables` on [issue](https://github.com/ClickHouse/ClickHouse/issues/44336). [#46161](https://github.com/ClickHouse/ClickHouse/pull/46161) ([attack204](https://github.com/attack204)).
-* Functions "multi[Fuzzy]Match(Any|AnyIndex|AllIndices}" now reject regexes which will likely evaluate very slowly in vectorscan. [#46167](https://github.com/ClickHouse/ClickHouse/pull/46167) ([Robert Schulze](https://github.com/rschu1ze)).
-* When `insert_null_as_default` is enabled and column doesn't have defined default value, the default of column type will be used. Also this PR fixes using default values on nulls in case of LowCardinality columns. [#46171](https://github.com/ClickHouse/ClickHouse/pull/46171) ([Kruglov Pavel](https://github.com/Avogar)).
-* Prefer explicitly defined access keys for S3 clients. If `use_environment_credentials` is set to `true`, and the user has provided the access key through query or config, they will be used instead of the ones from the environment variable. [#46191](https://github.com/ClickHouse/ClickHouse/pull/46191) ([Antonio Andelic](https://github.com/antonio2368)).
-* Add an alias "DATE_FORMAT()" for function "formatDateTime()" to improve compatibility with MySQL's SQL dialect, extend function `formatDateTime` with substitutions "a", "b", "c", "h", "i", "k", "l" "r", "s", "W". ### Documentation entry for user-facing changes User-readable short description: `DATE_FORMAT` is an alias of `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. (Provide link to [formatDateTime](https://clickhouse.com/docs/en/sql-reference/functions/date-time-functions/#formatdatetime)). [#46302](https://github.com/ClickHouse/ClickHouse/pull/46302) ([Jake Bamrah](https://github.com/JakeBamrah)).
-* Add `ProfileEvents` and `CurrentMetrics` about the callback tasks for parallel replicas (`s3Cluster` and `MergeTree` tables). [#46313](https://github.com/ClickHouse/ClickHouse/pull/46313) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Add support for `DELETE` and `UPDATE` for tables using `KeeperMap` storage engine. [#46330](https://github.com/ClickHouse/ClickHouse/pull/46330) ([Antonio Andelic](https://github.com/antonio2368)).
-* Allow writing RENAME queries with query parameters. Resolves [#45778](https://github.com/ClickHouse/ClickHouse/issues/45778). [#46407](https://github.com/ClickHouse/ClickHouse/pull/46407) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Fix parameterized SELECT queries with REPLACE transformer. Resolves [#33002](https://github.com/ClickHouse/ClickHouse/issues/33002). [#46420](https://github.com/ClickHouse/ClickHouse/pull/46420) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Exclude the internal database used for temporary/external tables from the calculation of asynchronous metric "NumberOfDatabases". This makes the behavior consistent with system table "system.databases". [#46435](https://github.com/ClickHouse/ClickHouse/pull/46435) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added `last_exception_time` column into distribution_queue table. [#46564](https://github.com/ClickHouse/ClickHouse/pull/46564) ([Aleksandr](https://github.com/AVMusorin)).
-* Support for IN clause with parameter in parameterized views. [#46583](https://github.com/ClickHouse/ClickHouse/pull/46583) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Do not load named collections on server startup (load them on first access instead). [#46607](https://github.com/ClickHouse/ClickHouse/pull/46607) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
+* Added comments (brief descriptions) to all columns of system tables. There are several reasons for this: - We use system tables a lot, and sometimes it could be very difficult for developer to understand the purpose and the meaning of a particular column. - We change (add new ones or modify existing) system tables a lot and the documentation for them is always outdated. For example take a look at the documentation page for [`system.parts`](https://clickhouse.com/docs/en/operations/system-tables/parts). It misses a lot of columns - We would like to eventually generate documentation directly from ClickHouse. [#58356](https://github.com/ClickHouse/ClickHouse/pull/58356) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow queries without aliases for subqueries for `PASTE JOIN`. [#58654](https://github.com/ClickHouse/ClickHouse/pull/58654) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Enable `MySQL`/`MariaDB` integration on macOS. This closes [#21191](https://github.com/ClickHouse/ClickHouse/issues/21191). [#46316](https://github.com/ClickHouse/ClickHouse/pull/46316) ([Alexey Milovidov](https://github.com/alexey-milovidov)) ([Robert Schulze](https://github.com/rschu1ze)).
+* Disable `max_rows_in_set_to_optimize_join` by default. [#56396](https://github.com/ClickHouse/ClickHouse/pull/56396) ([vdimir](https://github.com/vdimir)).
+* Add `<host_name>` config parameter that allows avoiding resolving hostnames in ON CLUSTER DDL queries and Replicated database engines. This mitigates the possibility of the queue being stuck in case of a change in cluster definition. Closes [#57573](https://github.com/ClickHouse/ClickHouse/issues/57573). [#57603](https://github.com/ClickHouse/ClickHouse/pull/57603) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Increase `load_metadata_threads` to 16 for the filesystem cache. It will make the server start up faster. [#57732](https://github.com/ClickHouse/ClickHouse/pull/57732) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add ability to throttle merges/mutations (`max_mutations_bandwidth_for_server`/`max_merges_bandwidth_for_server`). [#57877](https://github.com/ClickHouse/ClickHouse/pull/57877) ([Azat Khuzhin](https://github.com/azat)).
+* Replaced undocumented (boolean) column `is_hot_reloadable` in system table `system.server_settings` by (Enum8) column `changeable_without_restart` with possible values `No`, `Yes`, `IncreaseOnly` and `DecreaseOnly`. Also documented the column. [#58029](https://github.com/ClickHouse/ClickHouse/pull/58029) ([skyoct](https://github.com/skyoct)).
+* Cluster discovery supports setting username and password, close [#58063](https://github.com/ClickHouse/ClickHouse/issues/58063). [#58123](https://github.com/ClickHouse/ClickHouse/pull/58123) ([vdimir](https://github.com/vdimir)).
+* Support query parameters in `ALTER TABLE ... PART`. [#58297](https://github.com/ClickHouse/ClickHouse/pull/58297) ([Azat Khuzhin](https://github.com/azat)).
+* Create consumers for Kafka tables on the fly (but keep them for some period - `kafka_consumers_pool_ttl_ms`, since last used), this should fix problem with statistics for `system.kafka_consumers` (that does not consumed when nobody reads from Kafka table, which leads to live memory leak and slow table detach) and also this PR enables stats for `system.kafka_consumers` by default again. [#58310](https://github.com/ClickHouse/ClickHouse/pull/58310) ([Azat Khuzhin](https://github.com/azat)).
+* `sparkBar` as an alias to `sparkbar`. [#58335](https://github.com/ClickHouse/ClickHouse/pull/58335) ([凌涛](https://github.com/lingtaolf)).
+* Avoid sending `ComposeObject` requests after upload to `GCS`. [#58343](https://github.com/ClickHouse/ClickHouse/pull/58343) ([Azat Khuzhin](https://github.com/azat)).
+* Correctly handle keys with dot in the name in configurations XMLs. [#58354](https://github.com/ClickHouse/ClickHouse/pull/58354) ([Azat Khuzhin](https://github.com/azat)).
+* Make function `format` return constant on constant arguments. This closes [#58355](https://github.com/ClickHouse/ClickHouse/issues/58355). [#58358](https://github.com/ClickHouse/ClickHouse/pull/58358) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Adding a setting `max_estimated_execution_time` to separate `max_execution_time` and `max_estimated_execution_time`. [#58402](https://github.com/ClickHouse/ClickHouse/pull/58402) ([Zhang Yifan](https://github.com/zhangyifan27)).
+* Provide a hint when an invalid database engine name is used. [#58444](https://github.com/ClickHouse/ClickHouse/pull/58444) ([Bharat Nallan](https://github.com/bharatnc)).
+* Add settings for better control of indexes type in Arrow dictionary. Use signed integer type for indexes by default as Arrow recommends. Closes [#57401](https://github.com/ClickHouse/ClickHouse/issues/57401). [#58519](https://github.com/ClickHouse/ClickHouse/pull/58519) ([Kruglov Pavel](https://github.com/Avogar)).
+* Implement [#58575](https://github.com/ClickHouse/ClickHouse/issues/58575) Support `CLICKHOUSE_PASSWORD_FILE ` environment variable when running the docker image. [#58583](https://github.com/ClickHouse/ClickHouse/pull/58583) ([Eyal Halpern Shalev](https://github.com/Eyal-Shalev)).
+* When executing some queries, which require a lot of streams for reading data, the error `"Paste JOIN requires sorted tables only"` was previously thrown. Now the numbers of streams resize to 1 in that case. [#58608](https://github.com/ClickHouse/ClickHouse/pull/58608) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Better message for INVALID_IDENTIFIER error. [#58703](https://github.com/ClickHouse/ClickHouse/pull/58703) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Improved handling of signed numeric literals in normalizeQuery. [#58710](https://github.com/ClickHouse/ClickHouse/pull/58710) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
+* Support Point data type for MySQL. [#58721](https://github.com/ClickHouse/ClickHouse/pull/58721) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* When comparing a Float32 column and a const string, read the string as Float32 (instead of Float64). [#58724](https://github.com/ClickHouse/ClickHouse/pull/58724) ([Raúl Marín](https://github.com/Algunenano)).
+* Improve S3 compatibility, add ECloud EOS storage support. [#58786](https://github.com/ClickHouse/ClickHouse/pull/58786) ([xleoken](https://github.com/xleoken)).
+* Allow `KILL QUERY` to cancel backups / restores. This PR also makes running backups and restores visible in `system.processes`. Also, there is a new setting in the server configuration now - `shutdown_wait_backups_and_restores` (default=true) which makes the server either wait on shutdown for all running backups and restores to finish or just cancel them. [#58804](https://github.com/ClickHouse/ClickHouse/pull/58804) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Avro format to support ZSTD codec. Closes [#58735](https://github.com/ClickHouse/ClickHouse/issues/58735). [#58805](https://github.com/ClickHouse/ClickHouse/pull/58805) ([flynn](https://github.com/ucasfl)).
+* MySQL interface gained support for `net_write_timeout` and `net_read_timeout` settings. `net_write_timeout` is translated into the native `send_timeout` ClickHouse setting and, similarly, `net_read_timeout` into `receive_timeout`. Fixed an issue where it was possible to set MySQL `sql_select_limit` setting only if the entire statement was in upper case. [#58835](https://github.com/ClickHouse/ClickHouse/pull/58835) ([Serge Klochkov](https://github.com/slvrtrn)).
+* A better exception message while conflict of creating dictionary and table with the same name. [#58841](https://github.com/ClickHouse/ClickHouse/pull/58841) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Make sure that for custom (created from SQL) disks ether `filesystem_caches_path` (a common directory prefix for all filesystem caches) or `custom_cached_disks_base_directory` (a common directory prefix for only filesystem caches created from custom disks) is specified in server config. `custom_cached_disks_base_directory` has higher priority for custom disks over `filesystem_caches_path`, which is used if the former one is absent. Filesystem cache setting `path` must lie inside that directory, otherwise exception will be thrown preventing disk to be created. This will not affect disks created on an older version and server was upgraded - then the exception will not be thrown to allow the server to successfully start). `custom_cached_disks_base_directory` is added to default server config as `/var/lib/clickhouse/caches/`. Closes [#57825](https://github.com/ClickHouse/ClickHouse/issues/57825). [#58869](https://github.com/ClickHouse/ClickHouse/pull/58869) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* MySQL interface gained compatibility with `SHOW WARNINGS`/`SHOW COUNT(*) WARNINGS` queries, though the returned result is always an empty set. [#58929](https://github.com/ClickHouse/ClickHouse/pull/58929) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Skip unavailable replicas when executing parallel distributed `INSERT SELECT`. [#58931](https://github.com/ClickHouse/ClickHouse/pull/58931) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Display word-descriptive log level while enabling structured log formatting in json. [#58936](https://github.com/ClickHouse/ClickHouse/pull/58936) ([Tim Liou](https://github.com/wheatdog)).
+* MySQL interface gained support for `CAST(x AS SIGNED)` and `CAST(x AS UNSIGNED)` statements via data type aliases: `SIGNED` for Int64, and `UNSIGNED` for UInt64. This improves compatibility with BI tools such as Looker Studio. [#58954](https://github.com/ClickHouse/ClickHouse/pull/58954) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Change working directory to the data path in docker container. [#58975](https://github.com/ClickHouse/ClickHouse/pull/58975) ([cangyin](https://github.com/cangyin)).
+* Added setting for Azure Blob Storage `azure_max_unexpected_write_error_retries` , can also be set from config under azure section. [#59001](https://github.com/ClickHouse/ClickHouse/pull/59001) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Allow server to start with broken data lake table. Closes [#58625](https://github.com/ClickHouse/ClickHouse/issues/58625). [#59080](https://github.com/ClickHouse/ClickHouse/pull/59080) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow to ignore schema evolution in the `Iceberg` table engine and read all data using schema specified by the user on table creation or latest schema parsed from metadata on table creation. This is done under a setting `iceberg_engine_ignore_schema_evolution` that is disabled by default. Note that enabling this setting can lead to incorrect result as in case of evolved schema all data files will be read using the same schema. [#59133](https://github.com/ClickHouse/ClickHouse/pull/59133) ([Kruglov Pavel](https://github.com/Avogar)).
+* Prohibit mutable operations (`INSERT`/`ALTER`/`OPTIMIZE`/...) on read-only/write-once storages with a proper `TABLE_IS_READ_ONLY` error (to avoid leftovers). Avoid leaving left-overs on write-once disks (`format_version.txt`) on `CREATE`/`ATTACH`. Ignore `DROP` for `ReplicatedMergeTree` (so as for `MergeTree`). Fix iterating over `s3_plain` (`MetadataStorageFromPlainObjectStorage::iterateDirectory`). Note read-only is `web` disk, and write-once is `s3_plain`. [#59170](https://github.com/ClickHouse/ClickHouse/pull/59170) ([Azat Khuzhin](https://github.com/azat)).
+* Fix bug in the experimental `_block_number` column which could lead to logical error during complex combination of `ALTER`s and `merge`s. Fixes [#56202](https://github.com/ClickHouse/ClickHouse/issues/56202). Replaces [#58601](https://github.com/ClickHouse/ClickHouse/issues/58601). [#59295](https://github.com/ClickHouse/ClickHouse/pull/59295) ([alesapin](https://github.com/alesapin)).
+* Play UI understands when an exception is returned inside JSON. Adjustment for [#52853](https://github.com/ClickHouse/ClickHouse/issues/52853). [#59303](https://github.com/ClickHouse/ClickHouse/pull/59303) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* `/binary` HTTP handler allows to specify user, host, and optionally, password in the query string. [#59311](https://github.com/ClickHouse/ClickHouse/pull/59311) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support backups for compressed in-memory tables. This closes [#57893](https://github.com/ClickHouse/ClickHouse/issues/57893). [#59315](https://github.com/ClickHouse/ClickHouse/pull/59315) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support the `FORMAT` clause in `BACKUP` and `RESTORE` queries. [#59338](https://github.com/ClickHouse/ClickHouse/pull/59338) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Function `concatWithSeparator` now supports arbitrary argument types (instead of only `String` and `FixedString` arguments). For example, `SELECT concatWithSeparator('.', 'number', 1)` now returns `number.1`. [#59341](https://github.com/ClickHouse/ClickHouse/pull/59341) ([Robert Schulze](https://github.com/rschu1ze)).
 
 #### Build/Testing/Packaging Improvement
-* Introduce GWP-ASan implemented by the LLVM runtime. This closes [#27039](https://github.com/ClickHouse/ClickHouse/issues/27039). [#45226](https://github.com/ClickHouse/ClickHouse/pull/45226) ([Han Fei](https://github.com/hanfei1991)).
-* We want to make our tests less stable and more flaky: add randomization for merge tree settings in tests. [#38983](https://github.com/ClickHouse/ClickHouse/pull/38983) ([Anton Popov](https://github.com/CurtizJ)).
-* Enable the HDFS support in PowerPC and which helps to fixes the following functional tests 02113_hdfs_assert.sh, 02244_hdfs_cluster.sql and 02368_cancel_write_into_hdfs.sh. [#44949](https://github.com/ClickHouse/ClickHouse/pull/44949) ([MeenaRenganathan22](https://github.com/MeenaRenganathan22)).
-* 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)).
-* ClickHouse's fork of poco was moved from "contrib/" to "base/poco/". [#46075](https://github.com/ClickHouse/ClickHouse/pull/46075) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add an option for `clickhouse-watchdog` to restart the child process. This does not make a lot of use. [#46312](https://github.com/ClickHouse/ClickHouse/pull/46312) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* If the environment variable `CLICKHOUSE_DOCKER_RESTART_ON_EXIT` is set to 1, the Docker container will run `clickhouse-server` as a child instead of the first process, and restart it when it exited. [#46391](https://github.com/ClickHouse/ClickHouse/pull/46391) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix Systemd service file. [#46461](https://github.com/ClickHouse/ClickHouse/pull/46461) ([SuperDJY](https://github.com/cmsxbc)).
-* 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)).
-* 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)).
+* Improve aliases for clickhouse binary (now `ch`/`clickhouse` is `clickhouse-local` or `clickhouse` depends on the arguments) and add bash completion for new aliases. [#58344](https://github.com/ClickHouse/ClickHouse/pull/58344) ([Azat Khuzhin](https://github.com/azat)).
+* Add settings changes check to CI to check that all settings changes are reflected in settings changes history. [#58555](https://github.com/ClickHouse/ClickHouse/pull/58555) ([Kruglov Pavel](https://github.com/Avogar)).
+* Use tables directly attached from S3 in stateful tests. [#58791](https://github.com/ClickHouse/ClickHouse/pull/58791) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Save the whole `fuzzer.log` as an archive instead of the last 100k lines. `tail -n 100000` often removes lines with table definitions. Example:. [#58821](https://github.com/ClickHouse/ClickHouse/pull/58821) ([Dmitry Novik](https://github.com/novikd)).
+* Enable Rust on macOS with Aarch64 (this will add fuzzy search in client with skim and the PRQL language, though I don't think that are people who host ClickHouse on darwin, so it is mostly for fuzzy search in client I would say). [#59272](https://github.com/ClickHouse/ClickHouse/pull/59272) ([Azat Khuzhin](https://github.com/azat)).
+* Fix aggregation issue in mixed x86_64 and ARM clusters [#59132](https://github.com/ClickHouse/ClickHouse/pull/59132) ([Harry Lee](https://github.com/HarryLeeIBM)).
 
+#### Bug Fix (user-visible misbehavior in an official stable release)
 
-#### Bug Fix (user-visible misbehavior in official stable release)
+* Add join keys conversion for nested LowCardinality [#51550](https://github.com/ClickHouse/ClickHouse/pull/51550) ([vdimir](https://github.com/vdimir)).
+* Flatten only true Nested type if flatten_nested=1, not all Array(Tuple) [#56132](https://github.com/ClickHouse/ClickHouse/pull/56132) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix a bug with projections and the `aggregate_functions_null_for_empty` setting during insertion. [#56944](https://github.com/ClickHouse/ClickHouse/pull/56944) ([Amos Bird](https://github.com/amosbird)).
+* Fixed potential exception due to stale profile UUID [#57263](https://github.com/ClickHouse/ClickHouse/pull/57263) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix working with read buffers in StreamingFormatExecutor [#57438](https://github.com/ClickHouse/ClickHouse/pull/57438) ([Kruglov Pavel](https://github.com/Avogar)).
+* Ignore MVs with dropped target table during pushing to views [#57520](https://github.com/ClickHouse/ClickHouse/pull/57520) ([Kruglov Pavel](https://github.com/Avogar)).
+* Eliminate possible race between ALTER_METADATA and MERGE_PARTS [#57755](https://github.com/ClickHouse/ClickHouse/pull/57755) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the expressions order bug in group by with rollup [#57786](https://github.com/ClickHouse/ClickHouse/pull/57786) ([Chen768959](https://github.com/Chen768959)).
+* A fix for the obsolete "zero-copy" replication feature: Fix lost blobs after dropping a replica with broken detached parts [#58333](https://github.com/ClickHouse/ClickHouse/pull/58333) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Allow users to work with symlinks in user_files_path [#58447](https://github.com/ClickHouse/ClickHouse/pull/58447) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix a crash when graphite table does not have an agg function [#58453](https://github.com/ClickHouse/ClickHouse/pull/58453) ([Duc Canh Le](https://github.com/canhld94)).
+* Delay reading from StorageKafka to allow multiple reads in materialized views [#58477](https://github.com/ClickHouse/ClickHouse/pull/58477) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix a stupid case of intersecting parts [#58482](https://github.com/ClickHouse/ClickHouse/pull/58482) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* MergeTreePrefetchedReadPool disable for LIMIT only queries [#58505](https://github.com/ClickHouse/ClickHouse/pull/58505) ([Maksim Kita](https://github.com/kitaisreal)).
+* Enable ordinary databases while restoration [#58520](https://github.com/ClickHouse/ClickHouse/pull/58520) ([Jihyuk Bok](https://github.com/tomahawk28)).
+* Fix Apache Hive threadpool reading for ORC/Parquet/... [#58537](https://github.com/ClickHouse/ClickHouse/pull/58537) ([sunny](https://github.com/sunny19930321)).
+* Hide credentials in `system.backup_log`'s `base_backup_name` column [#58550](https://github.com/ClickHouse/ClickHouse/pull/58550) ([Daniel Pozo Escalona](https://github.com/danipozo)).
+* `toStartOfInterval` for milli- microsencods values rounding [#58557](https://github.com/ClickHouse/ClickHouse/pull/58557) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Disable `max_joined_block_rows` in ConcurrentHashJoin [#58595](https://github.com/ClickHouse/ClickHouse/pull/58595) ([vdimir](https://github.com/vdimir)).
+* Fix join using nullable in the old analyzer [#58596](https://github.com/ClickHouse/ClickHouse/pull/58596) ([vdimir](https://github.com/vdimir)).
+* `makeDateTime64`: Allow non-const fraction argument [#58597](https://github.com/ClickHouse/ClickHouse/pull/58597) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix possible NULL dereference during symbolizing inline frames [#58607](https://github.com/ClickHouse/ClickHouse/pull/58607) ([Azat Khuzhin](https://github.com/azat)).
+* Improve isolation of query cache entries under re-created users or role switches [#58611](https://github.com/ClickHouse/ClickHouse/pull/58611) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix broken partition key analysis when doing projection optimization [#58638](https://github.com/ClickHouse/ClickHouse/pull/58638) ([Amos Bird](https://github.com/amosbird)).
+* Query cache: Fix per-user quota [#58731](https://github.com/ClickHouse/ClickHouse/pull/58731) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix stream partitioning in parallel window functions [#58739](https://github.com/ClickHouse/ClickHouse/pull/58739) ([Dmitry Novik](https://github.com/novikd)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Don't process requests in Keeper during shutdown [#58765](https://github.com/ClickHouse/ClickHouse/pull/58765) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix a null pointer dereference in `SlabsPolygonIndex::find` [#58771](https://github.com/ClickHouse/ClickHouse/pull/58771) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix JSONExtract function for LowCardinality(Nullable) columns [#58808](https://github.com/ClickHouse/ClickHouse/pull/58808) ([vdimir](https://github.com/vdimir)).
+* A fix for unexpected accumulation of memory usage while creating a huge number of tables by CREATE and DROP. [#58831](https://github.com/ClickHouse/ClickHouse/pull/58831) ([Maksim Kita](https://github.com/kitaisreal)).
+* Multiple read file log storage in mv [#58877](https://github.com/ClickHouse/ClickHouse/pull/58877) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Restriction for the access key id for s3. [#58900](https://github.com/ClickHouse/ClickHouse/pull/58900) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix possible crash in clickhouse-local during loading suggestions [#58907](https://github.com/ClickHouse/ClickHouse/pull/58907) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash when `indexHint` is used [#58911](https://github.com/ClickHouse/ClickHouse/pull/58911) ([Dmitry Novik](https://github.com/novikd)).
+* Fix StorageURL forgetting headers on server restart [#58933](https://github.com/ClickHouse/ClickHouse/pull/58933) ([Michael Kolupaev](https://github.com/al13n321)).
+* Analyzer: fix storage replacement with insertion block [#58958](https://github.com/ClickHouse/ClickHouse/pull/58958) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix seek in ReadBufferFromZipArchive [#58966](https://github.com/ClickHouse/ClickHouse/pull/58966) ([Michael Kolupaev](https://github.com/al13n321)).
+* A fix for experimental inverted indices (don't use in production): `DROP INDEX` of inverted index now removes all relevant files from persistence [#59040](https://github.com/ClickHouse/ClickHouse/pull/59040) ([mochi](https://github.com/MochiXu)).
+* Fix data race on query_factories_info [#59049](https://github.com/ClickHouse/ClickHouse/pull/59049) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable "Too many redirects" error retry [#59099](https://github.com/ClickHouse/ClickHouse/pull/59099) ([skyoct](https://github.com/skyoct)).
+* Fix not started database shutdown deadlock [#59137](https://github.com/ClickHouse/ClickHouse/pull/59137) ([Sergei Trifonov](https://github.com/serxa)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix crash with nullable timezone for `toString` [#59190](https://github.com/ClickHouse/ClickHouse/pull/59190) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix abort in iceberg metadata on bad file paths [#59275](https://github.com/ClickHouse/ClickHouse/pull/59275) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix architecture name in select of Rust target [#59307](https://github.com/ClickHouse/ClickHouse/pull/59307) ([p1rattttt](https://github.com/p1rattttt)).
+* Fix a logical error about "not-ready set" for querying from `system.tables` with a subquery in the IN clause. [#59351](https://github.com/ClickHouse/ClickHouse/pull/59351) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
 
-* 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)).
-* Fix functions (quantilesExactExclusive, quantilesExactInclusive) return unsorted array element. [#45379](https://github.com/ClickHouse/ClickHouse/pull/45379) ([wujunfu](https://github.com/wujunfu)).
-* Fix uncaught exception in HTTPHandler when open telemetry is enabled. [#45456](https://github.com/ClickHouse/ClickHouse/pull/45456) ([Frank Chen](https://github.com/FrankChen021)).
-* Don't infer Dates from 8 digit numbers. It could lead to wrong data to be read. [#45581](https://github.com/ClickHouse/ClickHouse/pull/45581) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fixes to correctly use `odbc_bridge_use_connection_pooling` setting. [#45591](https://github.com/ClickHouse/ClickHouse/pull/45591) ([Bharat Nallan](https://github.com/bharatnc)).
-* When the callback in the cache is called, it is possible that this cache is destructed. To keep it safe, we capture members by value. It's also safe for task schedule because it will be deactivated before storage is destroyed. Resolve [#45548](https://github.com/ClickHouse/ClickHouse/issues/45548). [#45601](https://github.com/ClickHouse/ClickHouse/pull/45601) ([Han Fei](https://github.com/hanfei1991)).
-* Fix data corruption when codecs Delta or DoubleDelta are combined with codec Gorilla. [#45615](https://github.com/ClickHouse/ClickHouse/pull/45615) ([Robert Schulze](https://github.com/rschu1ze)).
-* Correctly check types when using N-gram bloom filter index to avoid invalid reads. [#45617](https://github.com/ClickHouse/ClickHouse/pull/45617) ([Antonio Andelic](https://github.com/antonio2368)).
-* A couple of segfaults have been reported around `c-ares`. They were introduced in my previous pull requests. I have fixed them with the help of Alexander Tokmakov. [#45629](https://github.com/ClickHouse/ClickHouse/pull/45629) ([Arthur Passos](https://github.com/arthurpassos)).
-* 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)).
-* Set compression method and level for backup Closes [#45690](https://github.com/ClickHouse/ClickHouse/issues/45690). [#45737](https://github.com/ClickHouse/ClickHouse/pull/45737) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
-* Should use `select_query_typed.limitByOffset` instead of `select_query_typed.limitOffset`. [#45817](https://github.com/ClickHouse/ClickHouse/pull/45817) ([刘陶峰](https://github.com/taofengliu)).
-* When use experimental analyzer, queries like `SELECT number FROM numbers(100) LIMIT 10 OFFSET 10;` get wrong results (empty result for this sql). That is caused by an unnecessary offset step added by planner. [#45822](https://github.com/ClickHouse/ClickHouse/pull/45822) ([刘陶峰](https://github.com/taofengliu)).
-* 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)).
-* 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)).
-* Add the `query_kind` column to the `system.processes` table and the `SHOW PROCESSLIST` query. Remove duplicate code. It fixes a bug: the global configuration parameter `max_concurrent_select_queries` was not respected to queries with `INTERSECT` or `EXCEPT` chains. [#45872](https://github.com/ClickHouse/ClickHouse/pull/45872) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix crash in a function `stochasticLinearRegression`. Found by WingFuzz. [#45985](https://github.com/ClickHouse/ClickHouse/pull/45985) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix crash in `SELECT` queries with `INTERSECT` and `EXCEPT` modifiers that read data from tables with enabled sparse columns (controlled by setting `ratio_of_defaults_for_sparse_serialization`). [#45987](https://github.com/ClickHouse/ClickHouse/pull/45987) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix read in order optimization for DESC sorting with FINAL, close [#45815](https://github.com/ClickHouse/ClickHouse/issues/45815). [#46009](https://github.com/ClickHouse/ClickHouse/pull/46009) ([Vladimir C](https://github.com/vdimir)).
-* 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)).
-* Fix elapsed column in system.processes (10x error). [#46047](https://github.com/ClickHouse/ClickHouse/pull/46047) ([Azat Khuzhin](https://github.com/azat)).
-* 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)).
-* Fix environment variable substitution in the configuration when a parameter already has a value. This closes [#46131](https://github.com/ClickHouse/ClickHouse/issues/46131). This closes [#9547](https://github.com/ClickHouse/ClickHouse/issues/9547). [#46144](https://github.com/ClickHouse/ClickHouse/pull/46144) ([pufit](https://github.com/pufit)).
-* Fix incorrect predicate push down with grouping sets. Closes [#45947](https://github.com/ClickHouse/ClickHouse/issues/45947). [#46151](https://github.com/ClickHouse/ClickHouse/pull/46151) ([flynn](https://github.com/ucasfl)).
-* Fix possible pipeline stuck error on `fulls_sorting_join` with constant keys. [#46175](https://github.com/ClickHouse/ClickHouse/pull/46175) ([Vladimir C](https://github.com/vdimir)).
-* Never rewrite tuple functions as literals during formatting to avoid incorrect results. [#46232](https://github.com/ClickHouse/ClickHouse/pull/46232) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
-* Fix possible out of bounds error while reading LowCardinality(Nullable) in Arrow format. [#46270](https://github.com/ClickHouse/ClickHouse/pull/46270) ([Kruglov Pavel](https://github.com/Avogar)).
-* 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)).
-* Fix possible crash which can be caused by an integer overflow while deserializing aggregating state of a function that stores HashTable. [#46349](https://github.com/ClickHouse/ClickHouse/pull/46349) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* 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)).
-* Fixed a LOGICAL_ERROR on an attempt to execute `ALTER ... MOVE PART ... TO TABLE`. This type of query was never actually supported. [#46359](https://github.com/ClickHouse/ClickHouse/pull/46359) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix s3Cluster schema inference in parallel distributed insert select when `parallel_distributed_insert_select` is enabled. [#46381](https://github.com/ClickHouse/ClickHouse/pull/46381) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix queries like `ALTER TABLE ... UPDATE nested.arr1 = nested.arr2 ...`, where `arr1` and `arr2` are fields of the same `Nested` column. [#46387](https://github.com/ClickHouse/ClickHouse/pull/46387) ([Anton Popov](https://github.com/CurtizJ)).
-* Scheduler may fail to schedule a task. If it happens, the whole MulityPartUpload should be aborted and `UploadHelper` must wait for already scheduled tasks. [#46451](https://github.com/ClickHouse/ClickHouse/pull/46451) ([Dmitry Novik](https://github.com/novikd)).
-* Fix PREWHERE for Merge with different default types (fixes some `NOT_FOUND_COLUMN_IN_BLOCK` when the default type for the column differs, also allow `PREWHERE` when the type of column is the same across tables, and prohibit it, only if it differs). [#46454](https://github.com/ClickHouse/ClickHouse/pull/46454) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a crash that could happen when constant values are used in `ORDER BY`. Fixes [#46466](https://github.com/ClickHouse/ClickHouse/issues/46466). [#46493](https://github.com/ClickHouse/ClickHouse/pull/46493) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Do not throw exception if `disk` setting was specified on query level, but `storage_policy` was specified in config merge tree settings section. `disk` will override setting from config. [#46533](https://github.com/ClickHouse/ClickHouse/pull/46533) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* 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)).
-* fixes [#46557](https://github.com/ClickHouse/ClickHouse/issues/46557). [#46611](https://github.com/ClickHouse/ClickHouse/pull/46611) ([Alexander Gololobov](https://github.com/davenger)).
-* Fix endless restarts of clickhouse-server systemd unit if server cannot start within 1m30sec (Disable timeout logic for starting clickhouse-server from systemd service). [#46613](https://github.com/ClickHouse/ClickHouse/pull/46613) ([Azat Khuzhin](https://github.com/azat)).
-* Allocated during asynchronous inserts memory buffers were deallocated in the global context and MemoryTracker counters for corresponding user and query were not updated correctly. That led to false positive OOM exceptions. [#46622](https://github.com/ClickHouse/ClickHouse/pull/46622) ([Dmitry Novik](https://github.com/novikd)).
-* Updated to not clear on_expression from table_join as its used by future analyze runs resolves [#45185](https://github.com/ClickHouse/ClickHouse/issues/45185). [#46487](https://github.com/ClickHouse/ClickHouse/pull/46487) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-
-
-### <a id="231"></a> ClickHouse release 23.1, 2023-01-26
-
-### ClickHouse release 23.1
-
-#### Upgrade Notes
-* The `SYSTEM RESTART DISK` query becomes a no-op. [#44647](https://github.com/ClickHouse/ClickHouse/pull/44647) ([alesapin](https://github.com/alesapin)).
-* The `PREALLOCATE` option for `HASHED`/`SPARSE_HASHED` dictionaries becomes a no-op. [#45388](https://github.com/ClickHouse/ClickHouse/pull/45388) ([Azat Khuzhin](https://github.com/azat)). It does not give significant advantages anymore.
-* Disallow `Gorilla` codec on columns of non-Float32 or non-Float64 type. [#45252](https://github.com/ClickHouse/ClickHouse/pull/45252) ([Robert Schulze](https://github.com/rschu1ze)). It was pointless and led to inconsistencies. 
-* Parallel quorum inserts might work incorrectly with `*MergeTree` tables created with the deprecated syntax. Therefore, parallel quorum inserts support is completely disabled for such tables. It does not affect tables created with a new syntax. [#45430](https://github.com/ClickHouse/ClickHouse/pull/45430) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Use the `GetObjectAttributes` request instead of the `HeadObject` request to get the size of an object in AWS S3. This change fixes handling endpoints without explicit regions after updating the AWS SDK, for example. [#45288](https://github.com/ClickHouse/ClickHouse/pull/45288) ([Vitaly Baranov](https://github.com/vitlibar)). AWS S3 and Minio are tested, but keep in mind that various S3-compatible services (GCS, R2, B2) may have subtle incompatibilities. This change also may require you to adjust the ACL to allow the `GetObjectAttributes` request.
-* Forbid paths in timezone names. For example, a timezone name like `/usr/share/zoneinfo/Asia/Aden` is not allowed; the IANA timezone database name like `Asia/Aden` should be used. [#44225](https://github.com/ClickHouse/ClickHouse/pull/44225) ([Kruglov Pavel](https://github.com/Avogar)).
-* Queries combining equijoin and constant expressions (e.g., `JOIN ON t1.x = t2.x AND 1 = 1`) are forbidden due to incorrect results. [#44016](https://github.com/ClickHouse/ClickHouse/pull/44016) ([Vladimir C](https://github.com/vdimir)).
-
-
-#### New Feature
-* Dictionary source for extracting keys by traversing regular expressions tree. It can be used for User-Agent parsing. [#40878](https://github.com/ClickHouse/ClickHouse/pull/40878) ([Vage Ogannisian](https://github.com/nooblose)). [#43858](https://github.com/ClickHouse/ClickHouse/pull/43858) ([Han Fei](https://github.com/hanfei1991)).
-* Added parametrized view functionality, now it's possible to specify query parameters for the View table engine. resolves [#40907](https://github.com/ClickHouse/ClickHouse/issues/40907). [#41687](https://github.com/ClickHouse/ClickHouse/pull/41687) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Add `quantileInterpolatedWeighted`/`quantilesInterpolatedWeighted` functions. [#38252](https://github.com/ClickHouse/ClickHouse/pull/38252) ([Bharat Nallan](https://github.com/bharatnc)).
-* Array join support for the `Map` type, like the function "explode" in Spark. [#43239](https://github.com/ClickHouse/ClickHouse/pull/43239) ([�扬](https://github.com/taiyang-li)).
-* Support SQL standard binary and hex string literals. [#43785](https://github.com/ClickHouse/ClickHouse/pull/43785) ([Mo Xuan](https://github.com/mo-avatar)).
-* Allow formatting `DateTime` in Joda-Time style. Refer to [the Joda-Time docs](https://joda-time.sourceforge.net/apidocs/org/joda/time/format/DateTimeFormat.html). [#43818](https://github.com/ClickHouse/ClickHouse/pull/43818) ([�扬](https://github.com/taiyang-li)).
-* Implemented a fractional second formatter (`%f`) for `formatDateTime`. [#44060](https://github.com/ClickHouse/ClickHouse/pull/44060) ([ltrk2](https://github.com/ltrk2)). [#44497](https://github.com/ClickHouse/ClickHouse/pull/44497) ([Alexander Gololobov](https://github.com/davenger)).
-* Added `age` function to calculate the difference between two dates or dates with time values expressed as the number of full units. Closes [#41115](https://github.com/ClickHouse/ClickHouse/issues/41115). [#44421](https://github.com/ClickHouse/ClickHouse/pull/44421) ([Robert Schulze](https://github.com/rschu1ze)).
-* Add `Null` source for dictionaries. Closes [#44240](https://github.com/ClickHouse/ClickHouse/issues/44240). [#44502](https://github.com/ClickHouse/ClickHouse/pull/44502) ([mayamika](https://github.com/mayamika)).
-* Allow configuring the S3 storage class with the `s3_storage_class` configuration option. Such as `<s3_storage_class>STANDARD/INTELLIGENT_TIERING</s3_storage_class>` Closes [#44443](https://github.com/ClickHouse/ClickHouse/issues/44443). [#44707](https://github.com/ClickHouse/ClickHouse/pull/44707) ([chen](https://github.com/xiedeyantu)).
-* Insert default values in case of missing elements in JSON object while parsing named tuple. Add setting `input_format_json_defaults_for_missing_elements_in_named_tuple` that controls this behaviour. Closes [#45142](https://github.com/ClickHouse/ClickHouse/issues/45142)#issuecomment-1380153217. [#45231](https://github.com/ClickHouse/ClickHouse/pull/45231) ([Kruglov Pavel](https://github.com/Avogar)).
-* Record server startup time in ProfileEvents (`ServerStartupMilliseconds`). Resolves [#43188](https://github.com/ClickHouse/ClickHouse/issues/43188). [#45250](https://github.com/ClickHouse/ClickHouse/pull/45250) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Refactor and Improve streaming engines Kafka/RabbitMQ/NATS and add support for all formats, also refactor formats a bit: - Fix producing messages in row-based formats with suffixes/prefixes. Now every message is formatted completely with all delimiters and can be parsed back using input format. - Support block-based formats like Native, Parquet, ORC, etc. Every block is formatted as a separate message. The number of rows in one message depends on the block size, so you can control it via the setting `max_block_size`. - Add new engine settings `kafka_max_rows_per_message/rabbitmq_max_rows_per_message/nats_max_rows_per_message`. They control the number of rows formatted in one message in row-based formats. Default value: 1. - Fix high memory consumption in the NATS table engine. - Support arbitrary binary data in NATS producer (previously it worked only with strings contained \0 at the end) - Add missing Kafka/RabbitMQ/NATS engine settings in the documentation. - Refactor producing and consuming in Kafka/RabbitMQ/NATS, separate it from WriteBuffers/ReadBuffers semantic. - Refactor output formats: remove callbacks on each row used in Kafka/RabbitMQ/NATS (now we don't use callbacks there), allow to use IRowOutputFormat directly, clarify row end and row between delimiters, make it possible to reset output format to start formatting again - Add proper implementation in formatRow function (bonus after formats refactoring). [#42777](https://github.com/ClickHouse/ClickHouse/pull/42777) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support reading/writing `Nested` tables as `List` of `Struct` in `CapnProto` format. Read/write `Decimal32/64` as `Int32/64`. Closes [#43319](https://github.com/ClickHouse/ClickHouse/issues/43319). [#43379](https://github.com/ClickHouse/ClickHouse/pull/43379) ([Kruglov Pavel](https://github.com/Avogar)).
-* Added a `message_format_string` column to `system.text_log`. The column contains a pattern that was used to format the message. [#44543](https://github.com/ClickHouse/ClickHouse/pull/44543) ([Alexander Tokmakov](https://github.com/tavplubix)). This allows various analytics over the ClickHouse logs.
-* Try to autodetect headers with column names (and maybe types) for CSV/TSV/CustomSeparated input formats.
-Add settings input_format_tsv/csv/custom_detect_header that enable this behaviour (enabled by default). Closes [#44640](https://github.com/ClickHouse/ClickHouse/issues/44640). [#44953](https://github.com/ClickHouse/ClickHouse/pull/44953) ([Kruglov Pavel](https://github.com/Avogar)).
-
-#### Experimental Feature
-* Add an experimental inverted index as a new secondary index type for efficient text search. [#38667](https://github.com/ClickHouse/ClickHouse/pull/38667) ([larryluogit](https://github.com/larryluogit)).
-* Add experimental query result cache. [#43797](https://github.com/ClickHouse/ClickHouse/pull/43797) ([Robert Schulze](https://github.com/rschu1ze)).
-* Added extendable and configurable scheduling subsystem for IO requests (not yet integrated with IO code itself). [#41840](https://github.com/ClickHouse/ClickHouse/pull/41840) ([Sergei Trifonov](https://github.com/serxa)). This feature does nothing at all, enjoy.
-* Added `SYSTEM DROP DATABASE REPLICA` that removes metadata of a dead replica of a `Replicated` database. Resolves [#41794](https://github.com/ClickHouse/ClickHouse/issues/41794). [#42807](https://github.com/ClickHouse/ClickHouse/pull/42807) ([Alexander Tokmakov](https://github.com/tavplubix)).
-
-#### Performance Improvement
-* Do not load inactive parts at startup of `MergeTree` tables. [#42181](https://github.com/ClickHouse/ClickHouse/pull/42181) ([Anton Popov](https://github.com/CurtizJ)).
-* Improved latency of reading from storage `S3` and table function `s3` with large numbers of small files. Now settings `remote_filesystem_read_method` and `remote_filesystem_read_prefetch` take effect while reading from storage `S3`. [#43726](https://github.com/ClickHouse/ClickHouse/pull/43726) ([Anton Popov](https://github.com/CurtizJ)).
-* Optimization for reading struct fields in Parquet/ORC files. Only the required fields are loaded. [#44484](https://github.com/ClickHouse/ClickHouse/pull/44484) ([lgbo](https://github.com/lgbo-ustc)).
-* Two-level aggregation algorithm was mistakenly disabled for queries over the HTTP interface. It was enabled back, and it leads to a major performance improvement. [#45450](https://github.com/ClickHouse/ClickHouse/pull/45450) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Added mmap support for StorageFile, which should improve the performance of clickhouse-local. [#43927](https://github.com/ClickHouse/ClickHouse/pull/43927) ([pufit](https://github.com/pufit)).
-* Added sharding support in HashedDictionary to allow parallel load (almost linear scaling based on number of shards). [#40003](https://github.com/ClickHouse/ClickHouse/pull/40003) ([Azat Khuzhin](https://github.com/azat)).
-* Speed up query parsing. [#42284](https://github.com/ClickHouse/ClickHouse/pull/42284) ([Raúl Marín](https://github.com/Algunenano)).
-* Always replace OR chain `expr = x1 OR ... OR expr = xN` to `expr IN (x1, ..., xN)` in the case where `expr` is a `LowCardinality` column. Setting `optimize_min_equality_disjunction_chain_length` is ignored in this case. [#42889](https://github.com/ClickHouse/ClickHouse/pull/42889) ([Guo Wangyang](https://github.com/guowangy)).
-* Slightly improve performance by optimizing the code around ThreadStatus. [#43586](https://github.com/ClickHouse/ClickHouse/pull/43586) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Optimize the column-wise ternary logic evaluation by achieving auto-vectorization. In the performance test of this [microbenchmark](https://github.com/ZhiguoZh/ClickHouse/blob/20221123-ternary-logic-opt-example/src/Functions/examples/associative_applier_perf.cpp), we've observed a peak **performance gain** of **21x** on the ICX device (Intel Xeon Platinum 8380 CPU). [#43669](https://github.com/ClickHouse/ClickHouse/pull/43669) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Avoid acquiring read locks in the `system.tables` table if possible. [#43840](https://github.com/ClickHouse/ClickHouse/pull/43840) ([Raúl Marín](https://github.com/Algunenano)).
-* Optimize ThreadPool. The performance experiments of SSB (Star Schema Benchmark) on the ICX device (Intel Xeon Platinum 8380 CPU, 80 cores, 160 threads) shows that this change could effectively decrease the lock contention for ThreadPoolImpl::mutex by **75%**, increasing the CPU utilization and improving the overall performance by **2.4%**. [#44308](https://github.com/ClickHouse/ClickHouse/pull/44308) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
-* Now the optimisation for predicting the hash table size is applied only if the cached hash table size is sufficiently large (thresholds were determined empirically and hardcoded). [#44455](https://github.com/ClickHouse/ClickHouse/pull/44455) ([Nikita Taranov](https://github.com/nickitat)).
-* Small performance improvement for asynchronous reading from remote filesystems. [#44868](https://github.com/ClickHouse/ClickHouse/pull/44868) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Add fast path for: - `col like '%%'`; - `col like '%'`; - `col not like '%'`; - `col not like '%'`; - `match(col, '.*')`. [#45244](https://github.com/ClickHouse/ClickHouse/pull/45244) ([�扬](https://github.com/taiyang-li)).
-* Slightly improve happy path optimisation in filtering (WHERE clause). [#45289](https://github.com/ClickHouse/ClickHouse/pull/45289) ([Nikita Taranov](https://github.com/nickitat)).
-* Provide monotonicity info for `toUnixTimestamp64*` to enable more algebraic optimizations for index analysis. [#44116](https://github.com/ClickHouse/ClickHouse/pull/44116) ([Nikita Taranov](https://github.com/nickitat)).
-* Allow the configuration of temporary data for query processing (spilling to disk) to cooperate with the filesystem cache (taking up the space from the cache disk) [#43972](https://github.com/ClickHouse/ClickHouse/pull/43972) ([Vladimir C](https://github.com/vdimir)). This mainly improves [ClickHouse Cloud](https://clickhouse.cloud/), but can be used for self-managed setups as well, if you know what to do.
-* Make `system.replicas` table do parallel fetches of replicas statuses. Closes [#43918](https://github.com/ClickHouse/ClickHouse/issues/43918). [#43998](https://github.com/ClickHouse/ClickHouse/pull/43998) ([Nikolay Degterinsky](https://github.com/evillique)).
-* Optimize memory consumption during backup to S3: files to S3 now will be copied directly without using `WriteBufferFromS3` (which could use a lot of memory). [#45188](https://github.com/ClickHouse/ClickHouse/pull/45188) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Add a cache for async block ids. This will reduce the number of requests of ZooKeeper when we enable async inserts deduplication. [#45106](https://github.com/ClickHouse/ClickHouse/pull/45106) ([Han Fei](https://github.com/hanfei1991)).
-
-#### Improvement
-
-* Use structure from insertion table in generateRandom without arguments. [#45239](https://github.com/ClickHouse/ClickHouse/pull/45239) ([Kruglov Pavel](https://github.com/Avogar)).
-* Allow to implicitly convert floats stored in string fields of JSON to integers in `JSONExtract` functions. E.g. `JSONExtract('{"a": "1000.111"}', 'a', 'UInt64')` -> `1000`, previously it returned 0. [#45432](https://github.com/ClickHouse/ClickHouse/pull/45432) ([Anton Popov](https://github.com/CurtizJ)).
-* Added fields `supports_parallel_parsing` and `supports_parallel_formatting` to table `system.formats` for better introspection. [#45499](https://github.com/ClickHouse/ClickHouse/pull/45499) ([Anton Popov](https://github.com/CurtizJ)).
-* Improve reading CSV field in CustomSeparated/Template format. Closes [#42352](https://github.com/ClickHouse/ClickHouse/issues/42352) Closes [#39620](https://github.com/ClickHouse/ClickHouse/issues/39620). [#43332](https://github.com/ClickHouse/ClickHouse/pull/43332) ([Kruglov Pavel](https://github.com/Avogar)).
-* Unify query elapsed time measurements. [#43455](https://github.com/ClickHouse/ClickHouse/pull/43455) ([Raúl Marín](https://github.com/Algunenano)).
-* Improve automatic usage of structure from insertion table in table functions file/hdfs/s3 when virtual columns are present in a select query, it fixes the possible error `Block structure mismatch` or `number of columns mismatch`. [#43695](https://github.com/ClickHouse/ClickHouse/pull/43695) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add support for signed arguments in the function `range`. Fixes [#43333](https://github.com/ClickHouse/ClickHouse/issues/43333). [#43733](https://github.com/ClickHouse/ClickHouse/pull/43733) ([sanyu](https://github.com/wineternity)).
-* Remove redundant sorting, for example, sorting related ORDER BY clauses in subqueries. Implemented on top of query plan. It does similar optimization as `optimize_duplicate_order_by_and_distinct` regarding `ORDER BY` clauses, but more generic, since it's applied to any redundant sorting steps (not only caused by ORDER BY clause) and applied to subqueries of any depth. Related to [#42648](https://github.com/ClickHouse/ClickHouse/issues/42648). [#43905](https://github.com/ClickHouse/ClickHouse/pull/43905) ([Igor Nikonov](https://github.com/devcrafter)).
-* Add the ability to disable deduplication of files for BACKUP (for backups without deduplication ATTACH can be used instead of full RESTORE). For example `BACKUP foo TO S3(...) SETTINGS deduplicate_files=0` (default `deduplicate_files=1`). [#43947](https://github.com/ClickHouse/ClickHouse/pull/43947) ([Azat Khuzhin](https://github.com/azat)).
-* Refactor and improve schema inference for text formats. Add new setting `schema_inference_make_columns_nullable` that controls making result types `Nullable` (enabled by default);. [#44019](https://github.com/ClickHouse/ClickHouse/pull/44019) ([Kruglov Pavel](https://github.com/Avogar)).
-* Better support for `PROXYv1` protocol. [#44135](https://github.com/ClickHouse/ClickHouse/pull/44135) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Add information about the latest part check by cleanup threads into `system.parts` table. [#44244](https://github.com/ClickHouse/ClickHouse/pull/44244) ([Dmitry Novik](https://github.com/novikd)).
-* Disable table functions in readonly mode for inserts. [#44290](https://github.com/ClickHouse/ClickHouse/pull/44290) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Add a setting `simultaneous_parts_removal_limit` to allow limiting the number of parts being processed by one iteration of CleanupThread. [#44461](https://github.com/ClickHouse/ClickHouse/pull/44461) ([Dmitry Novik](https://github.com/novikd)).
-* Do not initialize ReadBufferFromS3 when only virtual columns are needed in a query. This may be helpful to [#44246](https://github.com/ClickHouse/ClickHouse/issues/44246). [#44493](https://github.com/ClickHouse/ClickHouse/pull/44493) ([chen](https://github.com/xiedeyantu)).
-* Prevent duplicate column names hints. Closes [#44130](https://github.com/ClickHouse/ClickHouse/issues/44130). [#44519](https://github.com/ClickHouse/ClickHouse/pull/44519) ([Joanna Hulboj](https://github.com/jh0x)).
-* Allow macro substitution in endpoint of disks. Resolve [#40951](https://github.com/ClickHouse/ClickHouse/issues/40951). [#44533](https://github.com/ClickHouse/ClickHouse/pull/44533) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Improve schema inference when `input_format_json_read_object_as_string` is enabled. [#44546](https://github.com/ClickHouse/ClickHouse/pull/44546) ([Kruglov Pavel](https://github.com/Avogar)).
-* Add a user-level setting `database_replicated_allow_replicated_engine_arguments` which allows banning the creation of `ReplicatedMergeTree` tables with arguments in `DatabaseReplicated`. [#44566](https://github.com/ClickHouse/ClickHouse/pull/44566) ([alesapin](https://github.com/alesapin)).
-* Prevent users from mistakenly specifying zero (invalid) value for `index_granularity`. This closes [#44536](https://github.com/ClickHouse/ClickHouse/issues/44536). [#44578](https://github.com/ClickHouse/ClickHouse/pull/44578) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Added possibility to set path to service keytab file in `keytab` parameter in `kerberos` section of config.xml. [#44594](https://github.com/ClickHouse/ClickHouse/pull/44594) ([Roman Vasin](https://github.com/rvasin)).
-* Use already written part of the query for fuzzy search (pass to the `skim` library, which is written in Rust and linked statically to ClickHouse). [#44600](https://github.com/ClickHouse/ClickHouse/pull/44600) ([Azat Khuzhin](https://github.com/azat)).
-* Enable `input_format_json_read_objects_as_strings` by default to be able to read nested JSON objects while JSON Object type is experimental. [#44657](https://github.com/ClickHouse/ClickHouse/pull/44657) ([Kruglov Pavel](https://github.com/Avogar)).
-* Improvement for deduplication of async inserts: when users do duplicate async inserts, we should deduplicate inside the memory before we query Keeper. [#44682](https://github.com/ClickHouse/ClickHouse/pull/44682) ([Han Fei](https://github.com/hanfei1991)).
-* Input/output `Avro` format will parse bool type as ClickHouse bool type. [#44684](https://github.com/ClickHouse/ClickHouse/pull/44684) ([Kruglov Pavel](https://github.com/Avogar)).
-* Support Bool type in Arrow/Parquet/ORC. Closes [#43970](https://github.com/ClickHouse/ClickHouse/issues/43970). [#44698](https://github.com/ClickHouse/ClickHouse/pull/44698) ([Kruglov Pavel](https://github.com/Avogar)).
-* Don't greedily parse beyond the quotes when reading UUIDs - it may lead to mistakenly successful parsing of incorrect data. [#44686](https://github.com/ClickHouse/ClickHouse/pull/44686) ([Raúl Marín](https://github.com/Algunenano)).
-* Infer UInt64 in case of Int64 overflow and fix some transforms in schema inference. [#44696](https://github.com/ClickHouse/ClickHouse/pull/44696) ([Kruglov Pavel](https://github.com/Avogar)).
-* Previously dependency resolving inside `Replicated` database was done in a hacky way, and now it's done right using an explicit graph. [#44697](https://github.com/ClickHouse/ClickHouse/pull/44697) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
-* Fix `output_format_pretty_row_numbers` does not preserve the counter across the blocks. Closes [#44815](https://github.com/ClickHouse/ClickHouse/issues/44815). [#44832](https://github.com/ClickHouse/ClickHouse/pull/44832) ([flynn](https://github.com/ucasfl)).
-* Don't report errors in `system.errors` due to parts being merged concurrently with the background cleanup process. [#44874](https://github.com/ClickHouse/ClickHouse/pull/44874) ([Raúl Marín](https://github.com/Algunenano)).
-* Optimize and fix metrics for Distributed async INSERT. [#44922](https://github.com/ClickHouse/ClickHouse/pull/44922) ([Azat Khuzhin](https://github.com/azat)).
-* Added settings to disallow concurrent backups and restores resolves [#43891](https://github.com/ClickHouse/ClickHouse/issues/43891) Implementation: * Added server-level settings to disallow concurrent backups and restores, which are read and set when BackupWorker is created in Context. * Settings are set to true by default. * Before starting backup or restores, added a check to see if any other backups/restores are running. For internal requests, it checks if it is from the self node using backup_uuid. [#45072](https://github.com/ClickHouse/ClickHouse/pull/45072) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Add `<storage_policy>` config parameter for system logs. [#45320](https://github.com/ClickHouse/ClickHouse/pull/45320) ([Stig Bakken](https://github.com/stigsb)).
-
-#### Build/Testing/Packaging Improvement
-* Statically link with the `skim` library (it is written in Rust) for fuzzy search in clickhouse client/local history. [#44239](https://github.com/ClickHouse/ClickHouse/pull/44239) ([Azat Khuzhin](https://github.com/azat)).
-* We removed support for shared linking because of Rust. Actually, Rust is only an excuse for this removal, and we wanted to remove it nevertheless. [#44828](https://github.com/ClickHouse/ClickHouse/pull/44828) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* 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)).
-* The `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)).
-* CRC-32 changes to address the WeakHash collision issue in PowerPC. [#45144](https://github.com/ClickHouse/ClickHouse/pull/45144) ([MeenaRenganathan22](https://github.com/MeenaRenganathan22)).
-* Update aws-c* submodules [#43020](https://github.com/ClickHouse/ClickHouse/pull/43020) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Automatically merge green backport PRs and green approved PRs [#41110](https://github.com/ClickHouse/ClickHouse/pull/41110) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
-* Introduce a [website](https://aretestsgreenyet.com/) for the status of ClickHouse CI. [Source](https://github.com/ClickHouse/aretestsgreenyet).
-
-#### Bug Fix
-
-* Replace domain IP types (IPv4, IPv6) with native. [#43221](https://github.com/ClickHouse/ClickHouse/pull/43221) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)). It automatically fixes some missing implementations in the code.
-* Fix the backup process if mutations get killed during the backup process. [#45351](https://github.com/ClickHouse/ClickHouse/pull/45351) ([Vitaly Baranov](https://github.com/vitlibar)).
-* Fix the `Invalid number of rows in Chunk` exception message. [#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 an uninitialized value after executing expressions after sorting. Closes [#43386](https://github.com/ClickHouse/ClickHouse/issues/43386) [#43635](https://github.com/ClickHouse/ClickHouse/pull/43635) ([Kruglov Pavel](https://github.com/Avogar)).
-* Better handling of NULL in aggregate combinators, fix possible segfault/logical error while using an obscure optimization `optimize_rewrite_sum_if_to_count_if`. Closes [#43758](https://github.com/ClickHouse/ClickHouse/issues/43758). [#43813](https://github.com/ClickHouse/ClickHouse/pull/43813) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix CREATE USER/ROLE query settings constraints. [#43993](https://github.com/ClickHouse/ClickHouse/pull/43993) ([Nikolay Degterinsky](https://github.com/evillique)).
-* 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)).
-* Fix parsing of bad version from compatibility setting. [#44224](https://github.com/ClickHouse/ClickHouse/pull/44224) ([Kruglov Pavel](https://github.com/Avogar)).
-* Bring interval subtraction from datetime in line with addition. [#44241](https://github.com/ClickHouse/ClickHouse/pull/44241) ([ltrk2](https://github.com/ltrk2)).
-* Remove limits on the maximum size of the result for view. [#44261](https://github.com/ClickHouse/ClickHouse/pull/44261) ([lizhuoyu5](https://github.com/lzydmxy)).
-* Fix possible logical error in cache if `do_not_evict_index_and_mrk_files=1`. Closes [#42142](https://github.com/ClickHouse/ClickHouse/issues/42142). [#44268](https://github.com/ClickHouse/ClickHouse/pull/44268) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix possible too early cache write interruption in write-through cache (caching could be stopped due to false assumption when it shouldn't have). [#44289](https://github.com/ClickHouse/ClickHouse/pull/44289) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Fix possible crash in the case function `IN` with constant arguments was used as a constant argument together with `LowCardinality`. Fixes [#44221](https://github.com/ClickHouse/ClickHouse/issues/44221). [#44346](https://github.com/ClickHouse/ClickHouse/pull/44346) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix support for complex parameters (like arrays) of parametric aggregate functions. This closes [#30975](https://github.com/ClickHouse/ClickHouse/issues/30975). The aggregate function `sumMapFiltered` was unusable in distributed queries before this change. [#44358](https://github.com/ClickHouse/ClickHouse/pull/44358) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix reading ObjectId in BSON schema inference. [#44382](https://github.com/ClickHouse/ClickHouse/pull/44382) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix race which can lead to premature temp parts removal before merge finishes in ReplicatedMergeTree. This issue could lead to errors like `No such file or directory: xxx`. Fixes [#43983](https://github.com/ClickHouse/ClickHouse/issues/43983). [#44383](https://github.com/ClickHouse/ClickHouse/pull/44383) ([alesapin](https://github.com/alesapin)).
-* Some invalid `SYSTEM ... ON CLUSTER` queries worked in an unexpected way if a cluster name was not specified. It's fixed, now invalid queries throw `SYNTAX_ERROR` as they should. Fixes [#44264](https://github.com/ClickHouse/ClickHouse/issues/44264). [#44387](https://github.com/ClickHouse/ClickHouse/pull/44387) ([Alexander Tokmakov](https://github.com/tavplubix)).
-* Fix reading Map type in ORC format. [#44400](https://github.com/ClickHouse/ClickHouse/pull/44400) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix reading columns that are not presented in input data in Parquet/ORC formats. Previously it could lead to error `INCORRECT_NUMBER_OF_COLUMNS`. Closes [#44333](https://github.com/ClickHouse/ClickHouse/issues/44333). [#44405](https://github.com/ClickHouse/ClickHouse/pull/44405) ([Kruglov Pavel](https://github.com/Avogar)).
-* Previously the `bar` function used the same 'â–‹' (U+258B "Left five eighths block") character to display both 5/8 and 6/8 bars. This change corrects this behavior by using 'â–Š' (U+258A "Left three quarters block") for displaying 6/8 bar. [#44410](https://github.com/ClickHouse/ClickHouse/pull/44410) ([Alexander Gololobov](https://github.com/davenger)).
-* Placing profile settings after profile settings constraints in the configuration file made constraints ineffective. [#44411](https://github.com/ClickHouse/ClickHouse/pull/44411) ([Konstantin Bogdanov](https://github.com/thevar1able)).
-* Fix `SYNTAX_ERROR` while running `EXPLAIN AST INSERT` queries with data. Closes [#44207](https://github.com/ClickHouse/ClickHouse/issues/44207). [#44413](https://github.com/ClickHouse/ClickHouse/pull/44413) ([save-my-heart](https://github.com/save-my-heart)).
-* Fix reading bool value with CRLF in CSV format. Closes [#44401](https://github.com/ClickHouse/ClickHouse/issues/44401). [#44442](https://github.com/ClickHouse/ClickHouse/pull/44442) ([Kruglov Pavel](https://github.com/Avogar)).
-* Don't execute and/or/if/multiIf on a LowCardinality dictionary, so the result type cannot be LowCardinality. It could lead to the error `Illegal column ColumnLowCardinality` in some cases. Fixes [#43603](https://github.com/ClickHouse/ClickHouse/issues/43603). [#44469](https://github.com/ClickHouse/ClickHouse/pull/44469) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix mutations with the setting `max_streams_for_merge_tree_reading`. [#44472](https://github.com/ClickHouse/ClickHouse/pull/44472) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix potential null pointer dereference with GROUPING SETS in ASTSelectQuery::formatImpl ([#43049](https://github.com/ClickHouse/ClickHouse/issues/43049)). [#44479](https://github.com/ClickHouse/ClickHouse/pull/44479) ([Robert Schulze](https://github.com/rschu1ze)).
-* Validate types in table function arguments, CAST function arguments, JSONAsObject schema inference according to settings. [#44501](https://github.com/ClickHouse/ClickHouse/pull/44501) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix IN function with LowCardinality and const column, close [#44503](https://github.com/ClickHouse/ClickHouse/issues/44503). [#44506](https://github.com/ClickHouse/ClickHouse/pull/44506) ([Duc Canh Le](https://github.com/canhld94)).
-* Fixed a bug in the normalization of a `DEFAULT` expression in `CREATE TABLE` statement. The second argument of the 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)).
-* Projections do not work in presence of WITH ROLLUP, WITH CUBE and WITH TOTALS. In previous versions, a query produced an exception instead of skipping the usage of projections. This closes [#44614](https://github.com/ClickHouse/ClickHouse/issues/44614). This closes [#42772](https://github.com/ClickHouse/ClickHouse/issues/42772). [#44615](https://github.com/ClickHouse/ClickHouse/pull/44615) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Async blocks were not cleaned because the function `get all blocks sorted by time` didn't get async blocks. [#44651](https://github.com/ClickHouse/ClickHouse/pull/44651) ([Han Fei](https://github.com/hanfei1991)).
-* Fix `LOGICAL_ERROR` `The top step of the right pipeline should be ExpressionStep` for JOIN with subquery, UNION, and TOTALS. Fixes [#43687](https://github.com/ClickHouse/ClickHouse/issues/43687). [#44673](https://github.com/ClickHouse/ClickHouse/pull/44673) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Avoid `std::out_of_range` exception in the Executable table engine. [#44681](https://github.com/ClickHouse/ClickHouse/pull/44681) ([Kruglov Pavel](https://github.com/Avogar)).
-* Do not apply `optimize_syntax_fuse_functions` to quantiles on AST, close [#44712](https://github.com/ClickHouse/ClickHouse/issues/44712). [#44713](https://github.com/ClickHouse/ClickHouse/pull/44713) ([Vladimir C](https://github.com/vdimir)).
-* Fix bug with wrong type in Merge table and PREWHERE, close [#43324](https://github.com/ClickHouse/ClickHouse/issues/43324). [#44716](https://github.com/ClickHouse/ClickHouse/pull/44716) ([Vladimir C](https://github.com/vdimir)).
-* Fix a possible crash during shutdown (while destroying TraceCollector). Fixes [#44757](https://github.com/ClickHouse/ClickHouse/issues/44757). [#44758](https://github.com/ClickHouse/ClickHouse/pull/44758) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix a possible crash in distributed query processing. The crash could happen if a query with totals or extremes returned an empty result and there are mismatched types in the Distributed and the local tables. Fixes [#44738](https://github.com/ClickHouse/ClickHouse/issues/44738). [#44760](https://github.com/ClickHouse/ClickHouse/pull/44760) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix fsync for fetches (`min_compressed_bytes_to_fsync_after_fetch`)/small files (ttl.txt, columns.txt) in mutations (`min_rows_to_fsync_after_merge`/`min_compressed_bytes_to_fsync_after_merge`). [#44781](https://github.com/ClickHouse/ClickHouse/pull/44781) ([Azat Khuzhin](https://github.com/azat)).
-* A rare race condition was possible when querying the `system.parts` or `system.parts_columns` tables in the presence of parts being moved between disks. Introduced in [#41145](https://github.com/ClickHouse/ClickHouse/issues/41145). [#44809](https://github.com/ClickHouse/ClickHouse/pull/44809) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix the error `Context has expired` which could appear with enabled projections optimization. Can be reproduced for queries with specific functions, like `dictHas/dictGet` which use context in runtime. Fixes [#44844](https://github.com/ClickHouse/ClickHouse/issues/44844). [#44850](https://github.com/ClickHouse/ClickHouse/pull/44850) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* A 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)).
-* Ignore cases when hardware monitor sensors cannot be read instead of showing a full exception message in logs. [#44895](https://github.com/ClickHouse/ClickHouse/pull/44895) ([Raúl Marín](https://github.com/Algunenano)).
-* Use `max_delay_to_insert` value in case the calculated time to delay INSERT exceeds the setting value. Related to [#44902](https://github.com/ClickHouse/ClickHouse/issues/44902). [#44916](https://github.com/ClickHouse/ClickHouse/pull/44916) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix error `Different order of columns in UNION subquery` for queries with `UNION`. Fixes [#44866](https://github.com/ClickHouse/ClickHouse/issues/44866). [#44920](https://github.com/ClickHouse/ClickHouse/pull/44920) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Delay for INSERT can be calculated incorrectly, which can lead to always using `max_delay_to_insert` setting as delay instead of a correct value. Using simple formula `max_delay_to_insert * (parts_over_threshold/max_allowed_parts_over_threshold)` i.e. delay grows proportionally to parts over threshold. Closes [#44902](https://github.com/ClickHouse/ClickHouse/issues/44902). [#44954](https://github.com/ClickHouse/ClickHouse/pull/44954) ([Igor Nikonov](https://github.com/devcrafter)).
-* Fix alter table TTL error when a wide part has the lightweight delete mask. [#44959](https://github.com/ClickHouse/ClickHouse/pull/44959) ([Mingliang Pan](https://github.com/liangliangpan)).
-* Follow-up fix for Replace domain IP types (IPv4, IPv6) with native [#43221](https://github.com/ClickHouse/ClickHouse/issues/43221). [#45024](https://github.com/ClickHouse/ClickHouse/pull/45024) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Follow-up fix for Replace domain IP types (IPv4, IPv6) with native https://github.com/ClickHouse/ClickHouse/pull/43221. [#45043](https://github.com/ClickHouse/ClickHouse/pull/45043) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* A buffer overflow was possible in the parser. Found by fuzzer. [#45047](https://github.com/ClickHouse/ClickHouse/pull/45047) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-* Fix possible cannot-read-all-data error in storage FileLog. Closes [#45051](https://github.com/ClickHouse/ClickHouse/issues/45051), [#38257](https://github.com/ClickHouse/ClickHouse/issues/38257). [#45057](https://github.com/ClickHouse/ClickHouse/pull/45057) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Memory efficient aggregation (setting `distributed_aggregation_memory_efficient`) is disabled when grouping sets are present in the query. [#45058](https://github.com/ClickHouse/ClickHouse/pull/45058) ([Nikita Taranov](https://github.com/nickitat)).
-* Fix `RANGE_HASHED` dictionary to count range columns as part of the primary key during updates when `update_field` is specified. Closes [#44588](https://github.com/ClickHouse/ClickHouse/issues/44588). [#45061](https://github.com/ClickHouse/ClickHouse/pull/45061) ([Maksim Kita](https://github.com/kitaisreal)).
-* Fix error `Cannot capture column` for `LowCardinality` captured argument of nested lambda. Fixes [#45028](https://github.com/ClickHouse/ClickHouse/issues/45028). [#45065](https://github.com/ClickHouse/ClickHouse/pull/45065) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix the wrong query result of `additional_table_filters` (additional filter was not applied) in case the minmax/count projection is used. [#45133](https://github.com/ClickHouse/ClickHouse/pull/45133) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fixed bug in `histogram` function accepting negative values. [#45147](https://github.com/ClickHouse/ClickHouse/pull/45147) ([simpleton](https://github.com/rgzntrade)).
-* Fix wrong column nullability in StoreageJoin, close [#44940](https://github.com/ClickHouse/ClickHouse/issues/44940). [#45184](https://github.com/ClickHouse/ClickHouse/pull/45184) ([Vladimir C](https://github.com/vdimir)).
-* Fix `background_fetches_pool_size` settings reload (increase at runtime). [#45189](https://github.com/ClickHouse/ClickHouse/pull/45189) ([Raúl Marín](https://github.com/Algunenano)).
-* Correctly process `SELECT` queries on KV engines (e.g. KeeperMap, EmbeddedRocksDB) using `IN` on the key with subquery producing different type. [#45215](https://github.com/ClickHouse/ClickHouse/pull/45215) ([Antonio Andelic](https://github.com/antonio2368)).
-* Fix logical error in SEMI JOIN & join_use_nulls in some cases, close [#45163](https://github.com/ClickHouse/ClickHouse/issues/45163), close [#45209](https://github.com/ClickHouse/ClickHouse/issues/45209). [#45230](https://github.com/ClickHouse/ClickHouse/pull/45230) ([Vladimir C](https://github.com/vdimir)).
-* Fix heap-use-after-free in reading from s3. [#45253](https://github.com/ClickHouse/ClickHouse/pull/45253) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix bug when the Avro Union type is ['null', Nested type], closes [#45275](https://github.com/ClickHouse/ClickHouse/issues/45275). Fix bug that incorrectly infers `bytes` type to `Float`. [#45276](https://github.com/ClickHouse/ClickHouse/pull/45276) ([flynn](https://github.com/ucasfl)).
-* Throw a correct exception when explicit PREWHERE cannot be used with a table using the storage engine `Merge`. [#45319](https://github.com/ClickHouse/ClickHouse/pull/45319) ([Antonio Andelic](https://github.com/antonio2368)).
-* Under WSL1 Ubuntu self-extracting ClickHouse fails to decompress due to inconsistency - /proc/self/maps reporting 32bit file's inode, while stat reporting 64bit inode. [#45339](https://github.com/ClickHouse/ClickHouse/pull/45339) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* Fix race in Distributed table startup (that could lead to processing file of async INSERT multiple times). [#45360](https://github.com/ClickHouse/ClickHouse/pull/45360) ([Azat Khuzhin](https://github.com/azat)).
-* Fix a possible crash while reading from storage `S3` and table function `s3` in the case when `ListObject` request has failed. [#45371](https://github.com/ClickHouse/ClickHouse/pull/45371) ([Anton Popov](https://github.com/CurtizJ)).
-* 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)).
-* Fix s3Cluster schema inference when structure from insertion table is used in `INSERT INTO ... SELECT * FROM s3Cluster` queries. [#45422](https://github.com/ClickHouse/ClickHouse/pull/45422) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fix bug in JSON/BSONEachRow parsing with HTTP that could lead to using default values for some columns instead of values from data. [#45424](https://github.com/ClickHouse/ClickHouse/pull/45424) ([Kruglov Pavel](https://github.com/Avogar)).
-* Fixed bug (Code: 632. DB::Exception: Unexpected data ... after parsed IPv6 value ...) with typed parsing of IP types from text source. [#45425](https://github.com/ClickHouse/ClickHouse/pull/45425) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
-* close [#45297](https://github.com/ClickHouse/ClickHouse/issues/45297) Add check for empty regular expressions. [#45428](https://github.com/ClickHouse/ClickHouse/pull/45428) ([Han Fei](https://github.com/hanfei1991)).
-* Fix possible (likely distributed) query hung. [#45448](https://github.com/ClickHouse/ClickHouse/pull/45448) ([Azat Khuzhin](https://github.com/azat)).
-* Fix possible deadlock with `allow_asynchronous_read_from_io_pool_for_merge_tree` enabled in case of exception from `ThreadPool::schedule`. [#45481](https://github.com/ClickHouse/ClickHouse/pull/45481) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
-* Fix possible in-use table after DETACH. [#45493](https://github.com/ClickHouse/ClickHouse/pull/45493) ([Azat Khuzhin](https://github.com/azat)).
-* Fix rare abort in the case when a query is canceled and parallel parsing was used during its execution. [#45498](https://github.com/ClickHouse/ClickHouse/pull/45498) ([Anton Popov](https://github.com/CurtizJ)).
-* Fix a race between Distributed table creation and INSERT into it (could lead to CANNOT_LINK during INSERT into the table). [#45502](https://github.com/ClickHouse/ClickHouse/pull/45502) ([Azat Khuzhin](https://github.com/azat)).
-* Add proper default (SLRU) to cache policy getter. Closes [#45514](https://github.com/ClickHouse/ClickHouse/issues/45514). [#45524](https://github.com/ClickHouse/ClickHouse/pull/45524) ([Kseniia Sumarokova](https://github.com/kssenii)).
-* Disallow array join in mutations closes [#42637](https://github.com/ClickHouse/ClickHouse/issues/42637) [#44447](https://github.com/ClickHouse/ClickHouse/pull/44447) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-* Fix for qualified asterisks with alias table name and column transformer. Resolves [#44736](https://github.com/ClickHouse/ClickHouse/issues/44736). [#44755](https://github.com/ClickHouse/ClickHouse/pull/44755) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
-
-## [Changelog for 2022](https://clickhouse.com/docs/en/whats-new/changelog/2022)
+## [Changelog for 2023](https://clickhouse.com/docs/en/whats-new/changelog/2023)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 063cfc77302..42c21cae9f1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,16 +56,21 @@ option(ENABLE_CHECK_HEAVY_BUILDS "Don't allow C++ translation units to compile t
 if (ENABLE_CHECK_HEAVY_BUILDS)
     # set DATA (since RSS does not work since 2.6.x+) to 5G
     set (RLIMIT_DATA 5000000000)
-    # set VIRT (RLIMIT_AS) to 10G (DATA*10)
+    # set VIRT (RLIMIT_AS) to 10G (DATA*2)
     set (RLIMIT_AS 10000000000)
     # set CPU time limit to 1000 seconds
     set (RLIMIT_CPU 1000)
 
-    # -fsanitize=memory is too heavy
-    if (SANITIZE STREQUAL "memory")
+    # Sanitizers are too heavy
+    if (SANITIZE OR SANITIZE_COVERAGE OR WITH_COVERAGE)
        set (RLIMIT_DATA 10000000000) # 10G
     endif()
 
+    # For some files currently building RISCV64 might be too slow. TODO: Improve compilation times per file
+    if (ARCH_RISCV64)
+        set (RLIMIT_CPU 1800)
+    endif()
+
     set (CMAKE_CXX_COMPILER_LAUNCHER prlimit --as=${RLIMIT_AS} --data=${RLIMIT_DATA} --cpu=${RLIMIT_CPU} ${CMAKE_CXX_COMPILER_LAUNCHER})
 endif ()
 
@@ -102,6 +107,8 @@ if (ENABLE_FUZZING)
 
     # For codegen_select_fuzzer
     set (ENABLE_PROTOBUF 1)
+
+    add_compile_definitions(FUZZING_MODE=1)
 endif()
 
 # Global libraries
@@ -110,11 +117,6 @@ endif()
 # - sanitize.cmake
 add_library(global-libs INTERFACE)
 
-# We don't want to instrument everything with fuzzer, but only specific targets (see below),
-# also, since we build our own llvm, we specifically don't want to instrument
-# libFuzzer library itself - it would result in infinite recursion
-#include (cmake/fuzzer.cmake)
-
 include (cmake/sanitize.cmake)
 
 option(ENABLE_COLORED_BUILD "Enable colors in compiler output" ON)
@@ -254,10 +256,17 @@ endif()
 
 include(cmake/cpu_features.cmake)
 
-# Asynchronous unwind tables are needed for Query Profiler.
-# They are already by default on some platforms but possibly not on all platforms.
-# Enable it explicitly.
-set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
+
+# Query Profiler doesn't work on MacOS for several reasons
+# - PHDR cache is not available
+# - We use native functionality to get stacktraces which is not async signal safe
+# and thus we don't need to generate asynchronous unwind tables
+if (NOT OS_DARWIN)
+    # Asynchronous unwind tables are needed for Query Profiler.
+    # They are already by default on some platforms but possibly not on all platforms.
+    # Enable it explicitly.
+    set (COMPILER_FLAGS "${COMPILER_FLAGS} -fasynchronous-unwind-tables")
+endif()
 
 # Reproducible builds.
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
@@ -312,7 +321,8 @@ if (COMPILER_CLANG)
     endif()
 endif ()
 
-set (COMPILER_FLAGS "${COMPILER_FLAGS}")
+# Disable floating-point expression contraction in order to get consistent floating point calculation results across platforms
+set (COMPILER_FLAGS "${COMPILER_FLAGS} -ffp-contract=off")
 
 # Our built-in unwinder only supports DWARF version up to 4.
 set (DEBUG_INFO_FLAGS "-g")
@@ -348,7 +358,7 @@ if (COMPILER_CLANG)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdiagnostics-absolute-paths")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fdiagnostics-absolute-paths")
 
-    if (NOT ENABLE_TESTS AND NOT SANITIZE AND OS_LINUX)
+    if (NOT ENABLE_TESTS AND NOT SANITIZE AND NOT SANITIZE_COVERAGE AND OS_LINUX)
         # https://clang.llvm.org/docs/ThinLTO.html
         # Applies to clang and linux only.
         # Disabled when building with tests or sanitizers.
@@ -546,7 +556,9 @@ if (ENABLE_RUST)
     endif()
 endif()
 
-if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO" AND NOT SANITIZE AND OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64))
+if (CMAKE_BUILD_TYPE_UC STREQUAL "RELWITHDEBINFO"
+    AND NOT SANITIZE AND NOT SANITIZE_COVERAGE AND NOT ENABLE_FUZZING
+    AND OS_LINUX AND (ARCH_AMD64 OR ARCH_AARCH64))
     set(CHECK_LARGE_OBJECT_SIZES_DEFAULT ON)
 else ()
     set(CHECK_LARGE_OBJECT_SIZES_DEFAULT OFF)
@@ -569,9 +581,6 @@ if (FUZZER)
             if (NOT(target_type STREQUAL "INTERFACE_LIBRARY" OR target_type STREQUAL "UTILITY"))
                 target_compile_options(${target} PRIVATE "-fsanitize=fuzzer-no-link")
             endif()
-            # clickhouse fuzzer isn't working correctly
-            # initial PR https://github.com/ClickHouse/ClickHouse/pull/27526
-            #if (target MATCHES ".+_fuzzer" OR target STREQUAL "clickhouse")
             if (target_type STREQUAL "EXECUTABLE" AND target MATCHES ".+_fuzzer")
                 message(STATUS "${target} instrumented with fuzzer")
                 target_link_libraries(${target} PUBLIC ch_contrib::fuzzer)
@@ -581,6 +590,12 @@ if (FUZZER)
                 get_target_property(target_bin_dir ${target} BINARY_DIR)
                 add_custom_command(TARGET fuzzers POST_BUILD COMMAND mv "${target_bin_dir}/${target_bin_name}" "${CMAKE_CURRENT_BINARY_DIR}/programs/" VERBATIM)
             endif()
+            if (target STREQUAL "clickhouse")
+                message(STATUS "${target} instrumented with fuzzer")
+                target_link_libraries(${target} PUBLIC ch_contrib::fuzzer_no_main)
+                # Add to fuzzers bundle
+                add_dependencies(fuzzers ${target})
+            endif()
         endif()
     endforeach()
     add_custom_command(TARGET fuzzers POST_BUILD COMMAND SRC=${CMAKE_SOURCE_DIR} BIN=${CMAKE_BINARY_DIR} OUT=${CMAKE_BINARY_DIR}/programs ${CMAKE_SOURCE_DIR}/tests/fuzz/build.sh VERBATIM)
diff --git a/README.md b/README.md
index d356e429892..2b97bd25d70 100644
--- a/README.md
+++ b/README.md
@@ -28,18 +28,32 @@ curl https://clickhouse.com/ | sh
 * [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 (github.dev)](https://github.dev/ClickHouse/ClickHouse) with syntax highlighting, powered by github.dev.
-* [Static Analysis (SonarCloud)](https://sonarcloud.io/project/issues?resolved=false&id=ClickHouse_ClickHouse) proposes C++ quality improvements.
 * [Contacts](https://clickhouse.com/company/contact) can help to get your questions answered if there are any.
 
+## Monthly Release & Community Call
+
+Every month we get together with the community (users, contributors, customers, those interested in learning more about ClickHouse) to discuss what is coming in the latest release. If you are interested in sharing what you've built on ClickHouse, let us know.
+
+* [v24.3 Community Call](https://clickhouse.com/company/events/v24-3-community-release-call) - Mar 26
+* [v24.4 Community Call](https://clickhouse.com/company/events/v24-4-community-release-call) - Apr 30
+
 ## Upcoming Events
 
-Keep an eye out for upcoming meetups around the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com.
+Keep an eye out for upcoming meetups and eventsaround the world. Somewhere else you want us to be? Please feel free to reach out to tyler `<at>` clickhouse `<dot>` com. You can also peruse [ClickHouse Events](https://clickhouse.com/company/news-events) for a list of all upcoming trainings, meetups, speaking engagements, etc.
+
+* [ClickHouse Meetup in Bellevue](https://www.meetup.com/clickhouse-seattle-user-group/events/298650371/) - Mar 11
+* [ClickHouse Meetup at Ramp's Offices in NYC](https://www.meetup.com/clickhouse-new-york-user-group/events/298640542/) - Mar 19
+* [ClickHouse Melbourne Meetup](https://www.meetup.com/clickhouse-australia-user-group/events/299479750/) - Mar 20
+* [ClickHouse Meetup in Paris](https://www.meetup.com/clickhouse-france-user-group/events/298997115/) - Mar 21
+* [ClickHouse Meetup in Bengaluru](https://www.meetup.com/clickhouse-bangalore-user-group/events/299479850/) - Mar 23
+* [ClickHouse Meetup in Zurich](https://www.meetup.com/clickhouse-switzerland-meetup-group/events/299628922/) - Apr 16
+* [ClickHouse Meetup in Copenhagen](https://www.meetup.com/clickhouse-denmark-meetup-group/events/299629133/) - Apr 23
+* [ClickHouse Meetup in Dubai](https://www.meetup.com/clickhouse-dubai-meetup-group/events/299629189/) - May 28
+
 
 ## Recent Recordings
 * **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.10 Release Webinar**](https://www.youtube.com/watch?v=PGQS6uPb970) All the features of 23.10, one convenient video! Watch it now!
-* **All release webinar recordings**: [YouTube playlist](https://www.youtube.com/playlist?list=PL0Z2YDlm0b3jAlSy1JxyP8zluvXaN3nxU)
-
+* **Recording available**: [**v24.2 Release Call**](https://www.youtube.com/watch?v=iN2y-TK8f3A) All the features of 24.2, one convenient video! Watch it now!
   
  ## Interested in joining ClickHouse and making it your full-time job? 
   
diff --git a/SECURITY.md b/SECURITY.md
index a200e172a3b..4701f2ec70b 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -13,16 +13,16 @@ The following versions of ClickHouse server are currently being supported with s
 
 | Version | Supported |
 |:-|:-|
-| 23.12 | ✔� |
-| 23.11 | ✔� |
-| 23.10 | ✔� |
-| 23.9 | � |
+| 24.3 | ✔� |
+| 24.2 | ✔� |
+| 24.1 | ✔� |
+| 23.* | � |
 | 23.8 | ✔� |
 | 23.7 | � |
 | 23.6 | � |
 | 23.5 | � |
 | 23.4 | � |
-| 23.3 | ✔� |
+| 23.3 | � |
 | 23.2 | � |
 | 23.1 | � |
 | 22.* | � |
diff --git a/base/base/CMakeLists.txt b/base/base/CMakeLists.txt
index 3886932d198..27aa0bd6baf 100644
--- a/base/base/CMakeLists.txt
+++ b/base/base/CMakeLists.txt
@@ -10,13 +10,17 @@ set (CMAKE_CXX_STANDARD 20)
 
 set (SRCS
     argsToConfig.cpp
+    cgroupsv2.cpp
     coverage.cpp
     demangle.cpp
+    Decimal.cpp
     getAvailableMemoryAmount.cpp
     getFQDNOrHostName.cpp
     getMemoryAmount.cpp
     getPageSize.cpp
     getThreadId.cpp
+    int8_to_string.cpp
+    itoa.cpp
     JSON.cpp
     mremap.cpp
     phdr_cache.cpp
diff --git a/base/base/Decimal.cpp b/base/base/Decimal.cpp
new file mode 100644
index 00000000000..7e65c0eb8d1
--- /dev/null
+++ b/base/base/Decimal.cpp
@@ -0,0 +1,87 @@
+#include <base/Decimal.h>
+#include <base/extended_types.h>
+
+namespace DB
+{
+
+/// Explicit template instantiations.
+
+#define FOR_EACH_UNDERLYING_DECIMAL_TYPE(M) \
+    M(Int32)  \
+    M(Int64)  \
+    M(Int128) \
+    M(Int256)
+
+#define FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS(M, X) \
+    M(Int32, X) \
+    M(Int64, X) \
+    M(Int128, X) \
+    M(Int256, X)
+
+template <typename T> const Decimal<T> & Decimal<T>::operator += (const T & x) { value += x; return *this; }
+template <typename T> const Decimal<T> & Decimal<T>::operator -= (const T & x) { value -= x; return *this; }
+template <typename T> const Decimal<T> & Decimal<T>::operator *= (const T & x) { value *= x; return *this; }
+template <typename T> const Decimal<T> & Decimal<T>::operator /= (const T & x) { value /= x; return *this; }
+template <typename T> const Decimal<T> & Decimal<T>::operator %= (const T & x) { value %= x; return *this; }
+
+template <typename T> void NO_SANITIZE_UNDEFINED Decimal<T>::addOverflow(const T & x) { value += x; }
+
+/// Maybe this explicit instantiation affects performance since operators cannot be inlined.
+
+template <typename T> template <typename U> const Decimal<T> & Decimal<T>::operator += (const Decimal<U> & x) { value += static_cast<T>(x.value); return *this; }
+template <typename T> template <typename U> const Decimal<T> & Decimal<T>::operator -= (const Decimal<U> & x) { value -= static_cast<T>(x.value); return *this; }
+template <typename T> template <typename U> const Decimal<T> & Decimal<T>::operator *= (const Decimal<U> & x) { value *= static_cast<T>(x.value); return *this; }
+template <typename T> template <typename U> const Decimal<T> & Decimal<T>::operator /= (const Decimal<U> & x) { value /= static_cast<T>(x.value); return *this; }
+template <typename T> template <typename U> const Decimal<T> & Decimal<T>::operator %= (const Decimal<U> & x) { value %= static_cast<T>(x.value); return *this; }
+
+#define DISPATCH(TYPE_T, TYPE_U) \
+    template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator += (const Decimal<TYPE_U> & x); \
+    template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator -= (const Decimal<TYPE_U> & x); \
+    template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator *= (const Decimal<TYPE_U> & x); \
+    template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator /= (const Decimal<TYPE_U> & x); \
+    template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator %= (const Decimal<TYPE_U> & x);
+#define INVOKE(X) FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+#define DISPATCH(TYPE) template struct Decimal<TYPE>;
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
+
+template <typename T> bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
+template <typename T> bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
+template <typename T> bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
+template <typename T> bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
+template <typename T> bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
+template <typename T> bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
+
+#define DISPATCH(TYPE) \
+template bool operator< (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template bool operator> (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template bool operator<= (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template bool operator>= (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template bool operator== (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template bool operator!= (const Decimal<TYPE> & x, const Decimal<TYPE> & y);
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
+
+
+template <typename T> Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
+template <typename T> Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
+template <typename T> Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
+template <typename T> Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
+template <typename T> Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
+
+#define DISPATCH(TYPE) \
+template Decimal<TYPE> operator+ (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template Decimal<TYPE> operator- (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template Decimal<TYPE> operator* (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template Decimal<TYPE> operator/ (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+template Decimal<TYPE> operator- (const Decimal<TYPE> & x);
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
+
+#undef FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS
+#undef FOR_EACH_UNDERLYING_DECIMAL_TYPE
+}
diff --git a/base/base/Decimal.h b/base/base/Decimal.h
index 2405ba9ca0d..42f9e67c49d 100644
--- a/base/base/Decimal.h
+++ b/base/base/Decimal.h
@@ -1,20 +1,28 @@
 #pragma once
+
 #include <base/extended_types.h>
 #include <base/Decimal_fwd.h>
+#include <base/types.h>
+#include <base/defines.h>
 
-#if !defined(NO_SANITIZE_UNDEFINED)
-#if defined(__clang__)
-    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
-#else
-    #define NO_SANITIZE_UNDEFINED
-#endif
-#endif
 
 namespace DB
 {
 template <class> struct Decimal;
 class DateTime64;
 
+#define FOR_EACH_UNDERLYING_DECIMAL_TYPE(M) \
+    M(Int32) \
+    M(Int64) \
+    M(Int128) \
+    M(Int256)
+
+#define FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS(M, X) \
+    M(Int32,  X) \
+    M(Int64,  X) \
+    M(Int128, X) \
+    M(Int256, X)
+
 using Decimal32 = Decimal<Int32>;
 using Decimal64 = Decimal<Int64>;
 using Decimal128 = Decimal<Int128>;
@@ -55,36 +63,73 @@ struct Decimal
             return static_cast<U>(value);
     }
 
-    const Decimal<T> & operator += (const T & x) { value += x; return *this; }
-    const Decimal<T> & operator -= (const T & x) { value -= x; return *this; }
-    const Decimal<T> & operator *= (const T & x) { value *= x; return *this; }
-    const Decimal<T> & operator /= (const T & x) { value /= x; return *this; }
-    const Decimal<T> & operator %= (const T & x) { value %= x; return *this; }
+    const Decimal<T> & operator += (const T & x);
+    const Decimal<T> & operator -= (const T & x);
+    const Decimal<T> & operator *= (const T & x);
+    const Decimal<T> & operator /= (const T & x);
+    const Decimal<T> & operator %= (const T & x);
 
-    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x) { value += x.value; return *this; }
-    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x) { value -= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x) { value *= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x) { value /= x.value; return *this; }
-    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x) { value %= x.value; return *this; }
+    template <typename U> const Decimal<T> & operator += (const Decimal<U> & x);
+    template <typename U> const Decimal<T> & operator -= (const Decimal<U> & x);
+    template <typename U> const Decimal<T> & operator *= (const Decimal<U> & x);
+    template <typename U> const Decimal<T> & operator /= (const Decimal<U> & x);
+    template <typename U> const Decimal<T> & operator %= (const Decimal<U> & x);
 
     /// This is to avoid UB for sumWithOverflow()
-    void NO_SANITIZE_UNDEFINED addOverflow(const T & x) { value += x; }
+    void NO_SANITIZE_UNDEFINED addOverflow(const T & x);
 
     T value;
 };
 
-template <typename T> inline bool operator< (const Decimal<T> & x, const Decimal<T> & y) { return x.value < y.value; }
-template <typename T> inline bool operator> (const Decimal<T> & x, const Decimal<T> & y) { return x.value > y.value; }
-template <typename T> inline bool operator<= (const Decimal<T> & x, const Decimal<T> & y) { return x.value <= y.value; }
-template <typename T> inline bool operator>= (const Decimal<T> & x, const Decimal<T> & y) { return x.value >= y.value; }
-template <typename T> inline bool operator== (const Decimal<T> & x, const Decimal<T> & y) { return x.value == y.value; }
-template <typename T> inline bool operator!= (const Decimal<T> & x, const Decimal<T> & y) { return x.value != y.value; }
+#define DISPATCH(TYPE) extern template struct Decimal<TYPE>;
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
 
-template <typename T> inline Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y) { return x.value + y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y) { return x.value - y.value; }
-template <typename T> inline Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y) { return x.value * y.value; }
-template <typename T> inline Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y) { return x.value / y.value; }
-template <typename T> inline Decimal<T> operator- (const Decimal<T> & x) { return -x.value; }
+#define DISPATCH(TYPE_T, TYPE_U) \
+    extern template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator += (const Decimal<TYPE_U> & x); \
+    extern template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator -= (const Decimal<TYPE_U> & x); \
+    extern template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator *= (const Decimal<TYPE_U> & x); \
+    extern template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator /= (const Decimal<TYPE_U> & x); \
+    extern template const Decimal<TYPE_T> & Decimal<TYPE_T>::operator %= (const Decimal<TYPE_U> & x);
+#define INVOKE(X) FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+template <typename T> bool operator< (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> bool operator> (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> bool operator<= (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> bool operator>= (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> bool operator== (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> bool operator!= (const Decimal<T> & x, const Decimal<T> & y);
+
+#define DISPATCH(TYPE) \
+extern template bool operator< (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template bool operator> (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template bool operator<= (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template bool operator>= (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template bool operator== (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template bool operator!= (const Decimal<TYPE> & x, const Decimal<TYPE> & y);
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
+
+template <typename T> Decimal<T> operator+ (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> Decimal<T> operator- (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> Decimal<T> operator* (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> Decimal<T> operator/ (const Decimal<T> & x, const Decimal<T> & y);
+template <typename T> Decimal<T> operator- (const Decimal<T> & x);
+
+#define DISPATCH(TYPE) \
+extern template Decimal<TYPE> operator+ (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template Decimal<TYPE> operator- (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template Decimal<TYPE> operator* (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template Decimal<TYPE> operator/ (const Decimal<TYPE> & x, const Decimal<TYPE> & y); \
+extern template Decimal<TYPE> operator- (const Decimal<TYPE> & x);
+FOR_EACH_UNDERLYING_DECIMAL_TYPE(DISPATCH)
+#undef DISPATCH
+
+#undef FOR_EACH_UNDERLYING_DECIMAL_TYPE_PASS
+#undef FOR_EACH_UNDERLYING_DECIMAL_TYPE
 
 /// Distinguishable type to allow function resolution/deduction based on value type,
 /// but also relatively easy to convert to/from Decimal64.
@@ -99,7 +144,7 @@ public:
 };
 }
 
-constexpr DB::UInt64 max_uint_mask = std::numeric_limits<DB::UInt64>::max();
+constexpr UInt64 max_uint_mask = std::numeric_limits<UInt64>::max();
 
 namespace std
 {
@@ -114,8 +159,8 @@ namespace std
     {
         size_t operator()(const DB::Decimal128 & x) const
         {
-            return std::hash<DB::Int64>()(x.value >> 64)
-                ^ std::hash<DB::Int64>()(x.value & max_uint_mask);
+            return std::hash<Int64>()(x.value >> 64)
+                ^ std::hash<Int64>()(x.value & max_uint_mask);
         }
     };
 
@@ -134,8 +179,8 @@ namespace std
         size_t operator()(const DB::Decimal256 & x) const
         {
             // FIXME temp solution
-            return std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value >> 64 & max_uint_mask))
-                ^ std::hash<DB::Int64>()(static_cast<DB::Int64>(x.value & max_uint_mask));
+            return std::hash<Int64>()(static_cast<Int64>(x.value >> 64 & max_uint_mask))
+                ^ std::hash<Int64>()(static_cast<Int64>(x.value & max_uint_mask));
         }
     };
 }
diff --git a/base/base/Decimal_fwd.h b/base/base/Decimal_fwd.h
index 589d6224917..beb228cea3c 100644
--- a/base/base/Decimal_fwd.h
+++ b/base/base/Decimal_fwd.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <base/types.h>
+#include <base/extended_types.h>
 
 namespace wide
 {
@@ -44,3 +45,8 @@ concept is_over_big_int =
     || std::is_same_v<T, Decimal128>
     || std::is_same_v<T, Decimal256>;
 }
+
+template <> struct is_signed<DB::Decimal32> { static constexpr bool value = true; };
+template <> struct is_signed<DB::Decimal64> { static constexpr bool value = true; };
+template <> struct is_signed<DB::Decimal128> { static constexpr bool value = true; };
+template <> struct is_signed<DB::Decimal256> { static constexpr bool value = true; };
diff --git a/base/base/IPv4andIPv6.h b/base/base/IPv4andIPv6.h
index e2f93b54124..9b1e518c161 100644
--- a/base/base/IPv4andIPv6.h
+++ b/base/base/IPv4andIPv6.h
@@ -1,8 +1,7 @@
 #pragma once
 
-#include <base/strong_typedef.h>
 #include <base/extended_types.h>
-#include <Common/formatIPv6.h>
+#include <base/strong_typedef.h>
 #include <Common/memcmpSmall.h>
 
 namespace DB
@@ -62,7 +61,8 @@ namespace std
     {
         size_t operator()(const DB::IPv6 & x) const
         {
-            return std::hash<std::string_view>{}(std::string_view(reinterpret_cast<const char*>(&x.toUnderType()), IPV6_BINARY_LENGTH));
+            return std::hash<std::string_view>{}(
+                std::string_view(reinterpret_cast<const char *>(&x.toUnderType()), sizeof(DB::IPv6::UnderlyingType)));
         }
     };
 
diff --git a/base/base/JSON.cpp b/base/base/JSON.cpp
index 0b43be38149..9da059c98b6 100644
--- a/base/base/JSON.cpp
+++ b/base/base/JSON.cpp
@@ -10,14 +10,10 @@
 #define JSON_MAX_DEPTH 100
 
 
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
 POCO_IMPLEMENT_EXCEPTION(JSONException, Poco::Exception, "JSONException") // NOLINT(cert-err60-cpp, modernize-use-noexcept, hicpp-use-noexcept)
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 
 /// Read unsigned integer in a simple form from a non-0-terminated string.
diff --git a/base/base/JSON.h b/base/base/JSON.h
index 850b74715c6..bc053670a96 100644
--- a/base/base/JSON.h
+++ b/base/base/JSON.h
@@ -39,14 +39,10 @@
 
 
 // NOLINTBEGIN(google-explicit-constructor)
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-dynamic-exception-spec"
 POCO_DECLARE_EXCEPTION(Foundation_API, JSONException, Poco::Exception)
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 // NOLINTEND(google-explicit-constructor)
 
 class JSON
diff --git a/base/base/StringRef.h b/base/base/StringRef.h
index 150cd81e33c..24af84626de 100644
--- a/base/base/StringRef.h
+++ b/base/base/StringRef.h
@@ -185,7 +185,8 @@ inline bool memequalWide(const char * p1, const char * p2, size_t size)
     {
         case 3: if (!compare8(p1 + 32, p2 + 32)) return false; [[fallthrough]];
         case 2: if (!compare8(p1 + 16, p2 + 16)) return false; [[fallthrough]];
-        case 1: if (!compare8(p1, p2)) return false;
+        case 1: if (!compare8(p1, p2)) return false; [[fallthrough]];
+        default: ;
     }
 
     return compare8(p1 + size - 16, p2 + size - 16);
diff --git a/base/base/bit_cast.h b/base/base/bit_cast.h
index 4783a84586b..9a92b7660f1 100644
--- a/base/base/bit_cast.h
+++ b/base/base/bit_cast.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <bit>
 #include <cstring>
 #include <algorithm>
 #include <type_traits>
diff --git a/base/base/cgroupsv2.cpp b/base/base/cgroupsv2.cpp
new file mode 100644
index 00000000000..1686c6bd88c
--- /dev/null
+++ b/base/base/cgroupsv2.cpp
@@ -0,0 +1,64 @@
+#include <base/cgroupsv2.h>
+
+#include <base/defines.h>
+
+#include <fstream>
+#include <sstream>
+
+
+bool cgroupsV2Enabled()
+{
+#if defined(OS_LINUX)
+    /// This file exists iff the host has cgroups v2 enabled.
+    auto controllers_file = default_cgroups_mount / "cgroup.controllers";
+    if (!std::filesystem::exists(controllers_file))
+        return false;
+    return true;
+#else
+    return false;
+#endif
+}
+
+bool cgroupsV2MemoryControllerEnabled()
+{
+#if defined(OS_LINUX)
+    chassert(cgroupsV2Enabled());
+    /// According to https://docs.kernel.org/admin-guide/cgroup-v2.html:
+    /// - file 'cgroup.controllers' defines which controllers *can* be enabled
+    /// - file 'cgroup.subtree_control' defines which controllers *are* enabled
+    /// Caveat: nested groups may disable controllers. For simplicity, check only the top-level group.
+    std::ifstream subtree_control_file(default_cgroups_mount / "cgroup.subtree_control");
+    if (!subtree_control_file.is_open())
+        return false;
+    std::string controllers;
+    std::getline(subtree_control_file, controllers);
+    if (controllers.find("memory") == std::string::npos)
+        return false;
+    return true;
+#else
+    return false;
+#endif
+}
+
+std::string cgroupV2OfProcess()
+{
+#if defined(OS_LINUX)
+    chassert(cgroupsV2Enabled());
+    /// All PIDs assigned to a cgroup are in /sys/fs/cgroups/{cgroup_name}/cgroup.procs
+    /// A simpler way to get the membership is:
+    std::ifstream cgroup_name_file("/proc/self/cgroup");
+    if (!cgroup_name_file.is_open())
+        return "";
+    /// With cgroups v2, there will be a *single* line with prefix "0::/"
+    /// (see https://docs.kernel.org/admin-guide/cgroup-v2.html)
+    std::string cgroup;
+    std::getline(cgroup_name_file, cgroup);
+    static const std::string v2_prefix = "0::/";
+    if (!cgroup.starts_with(v2_prefix))
+        return "";
+    cgroup = cgroup.substr(v2_prefix.length());
+    return cgroup;
+#else
+    return "";
+#endif
+}
diff --git a/base/base/cgroupsv2.h b/base/base/cgroupsv2.h
new file mode 100644
index 00000000000..70219d87cd1
--- /dev/null
+++ b/base/base/cgroupsv2.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <filesystem>
+#include <string>
+
+#if defined(OS_LINUX)
+/// I think it is possible to mount the cgroups hierarchy somewhere else (e.g. when in containers).
+/// /sys/fs/cgroup was still symlinked to the actual mount in the cases that I have seen.
+static inline const std::filesystem::path default_cgroups_mount = "/sys/fs/cgroup";
+#endif
+
+/// Is cgroups v2 enabled on the system?
+bool cgroupsV2Enabled();
+
+/// Is the memory controller of cgroups v2 enabled on the system?
+/// Assumes that cgroupsV2Enabled() is enabled.
+bool cgroupsV2MemoryControllerEnabled();
+
+/// Which cgroup does the process belong to?
+/// Returns an empty string if the cgroup cannot be determined.
+/// Assumes that cgroupsV2Enabled() is enabled.
+std::string cgroupV2OfProcess();
diff --git a/base/base/coverage.cpp b/base/base/coverage.cpp
index d70c3bcd82b..d96b3ea1e9a 100644
--- a/base/base/coverage.cpp
+++ b/base/base/coverage.cpp
@@ -1,6 +1,7 @@
 #include "coverage.h"
+#include <sys/mman.h>
 
-#pragma GCC diagnostic ignored "-Wreserved-identifier"
+#pragma clang diagnostic ignored "-Wreserved-identifier"
 
 
 /// WITH_COVERAGE enables the default implementation of code coverage,
@@ -12,11 +13,7 @@
 #include <unistd.h>
 
 
-#    if defined(__clang__)
 extern "C" void __llvm_profile_dump(); // NOLINT
-#    elif defined(__GNUC__) || defined(__GNUG__)
-extern "C" void __gcov_exit();
-#    endif
 
 #endif
 
@@ -27,12 +24,7 @@ void dumpCoverageReportIfPossible()
     static std::mutex mutex;
     std::lock_guard lock(mutex);
 
-#    if defined(__clang__)
     __llvm_profile_dump(); // NOLINT
-#    elif defined(__GNUC__) || defined(__GNUG__)
-    __gcov_exit();
-#    endif
-
 #endif
 }
 
@@ -52,11 +44,21 @@ namespace
     uint32_t * guards_start = nullptr;
     uint32_t * guards_end = nullptr;
 
-    uintptr_t * coverage_array = nullptr;
+    uintptr_t * current_coverage_array = nullptr;
+    uintptr_t * cumulative_coverage_array = nullptr;
     size_t coverage_array_size = 0;
 
     uintptr_t * all_addresses_array = nullptr;
     size_t all_addresses_array_size = 0;
+
+    uintptr_t * allocate(size_t size)
+    {
+        /// Note: mmap return zero-initialized memory, and we count on that.
+        void * map = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+        if (MAP_FAILED == map)
+            return nullptr;
+        return static_cast<uintptr_t*>(map);
+    }
 }
 
 extern "C"
@@ -79,7 +81,8 @@ void __sanitizer_cov_trace_pc_guard_init(uint32_t * start, uint32_t * stop)
     coverage_array_size = stop - start;
 
     /// Note: we will leak this.
-    coverage_array = static_cast<uintptr_t*>(malloc(sizeof(uintptr_t) * coverage_array_size));
+    current_coverage_array = allocate(sizeof(uintptr_t) * coverage_array_size);
+    cumulative_coverage_array = allocate(sizeof(uintptr_t) * coverage_array_size);
 
     resetCoverage();
 }
@@ -92,8 +95,8 @@ void __sanitizer_cov_pcs_init(const uintptr_t * pcs_begin, const uintptr_t * pcs
         return;
     pc_table_initialized = true;
 
-    all_addresses_array = static_cast<uintptr_t*>(malloc(sizeof(uintptr_t) * coverage_array_size));
     all_addresses_array_size = pcs_end - pcs_begin;
+    all_addresses_array = allocate(sizeof(uintptr_t) * all_addresses_array_size);
 
     /// They are not a real pointers, but also contain a flag in the most significant bit,
     /// in which we are not interested for now. Reset it.
@@ -115,17 +118,24 @@ void __sanitizer_cov_trace_pc_guard(uint32_t * guard)
     /// The values of `*guard` are as you set them in
     /// __sanitizer_cov_trace_pc_guard_init and so you can make them consecutive
     /// and use them to dereference an array or a bit vector.
-    void * pc = __builtin_return_address(0);
+    intptr_t pc = reinterpret_cast<uintptr_t>(__builtin_return_address(0));
 
-    coverage_array[guard - guards_start] = reinterpret_cast<uintptr_t>(pc);
+    current_coverage_array[guard - guards_start] = pc;
+    cumulative_coverage_array[guard - guards_start] = pc;
 }
 
 }
 
 __attribute__((no_sanitize("coverage")))
-std::span<const uintptr_t> getCoverage()
+std::span<const uintptr_t> getCurrentCoverage()
 {
-    return {coverage_array, coverage_array_size};
+    return {current_coverage_array, coverage_array_size};
+}
+
+__attribute__((no_sanitize("coverage")))
+std::span<const uintptr_t> getCumulativeCoverage()
+{
+    return {cumulative_coverage_array, coverage_array_size};
 }
 
 __attribute__((no_sanitize("coverage")))
@@ -137,7 +147,7 @@ std::span<const uintptr_t> getAllInstrumentedAddresses()
 __attribute__((no_sanitize("coverage")))
 void resetCoverage()
 {
-    memset(coverage_array, 0, coverage_array_size * sizeof(*coverage_array));
+    memset(current_coverage_array, 0, coverage_array_size * sizeof(*current_coverage_array));
 
     /// The guard defines whether the __sanitizer_cov_trace_pc_guard should be called.
     /// For example, you can unset it after first invocation to prevent excessive work.
diff --git a/base/base/coverage.h b/base/base/coverage.h
index f75ed2d3553..a6e5a6848d7 100644
--- a/base/base/coverage.h
+++ b/base/base/coverage.h
@@ -15,7 +15,10 @@ void dumpCoverageReportIfPossible();
 /// Get accumulated unique program addresses of the instrumented parts of the code,
 /// seen so far after program startup or after previous reset.
 /// The returned span will be represented as a sparse map, containing mostly zeros, which you should filter away.
-std::span<const uintptr_t> getCoverage();
+std::span<const uintptr_t> getCurrentCoverage();
+
+/// Similar but not being reset.
+std::span<const uintptr_t> getCumulativeCoverage();
 
 /// Get all instrumented addresses that could be in the coverage.
 std::span<const uintptr_t> getAllInstrumentedAddresses();
diff --git a/base/base/defines.h b/base/base/defines.h
index 02058a29096..627c50c27d2 100644
--- a/base/base/defines.h
+++ b/base/base/defines.h
@@ -11,7 +11,7 @@
 ///   including <base/defines.h>
 /// - it should not have fallback to 0,
 ///   since this may create false-positive detection (common problem)
-#if defined(__clang__) && defined(__has_feature)
+#if defined(__has_feature)
 #    define ch_has_feature __has_feature
 #endif
 
@@ -76,24 +76,11 @@
 /// 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.
-#if defined(__clang__)
-#    define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
-#    define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
-#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
-#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED __attribute__((__always_inline__, __no_sanitize__("undefined")))
-#else  /// It does not work in GCC. GCC 7 cannot recognize this attribute and GCC 8 simply ignores it.
-#    define NO_SANITIZE_UNDEFINED
-#    define NO_SANITIZE_ADDRESS
-#    define NO_SANITIZE_THREAD
-#    define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED ALWAYS_INLINE
-#endif
-
-#if defined(__clang__) && defined(__clang_major__) && __clang_major__ >= 14
-#    define DISABLE_SANITIZER_INSTRUMENTATION __attribute__((disable_sanitizer_instrumentation))
-#else
-#    define DISABLE_SANITIZER_INSTRUMENTATION
-#endif
-
+#define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
+#define NO_SANITIZE_ADDRESS __attribute__((__no_sanitize__("address")))
+#define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
+#define ALWAYS_INLINE_NO_SANITIZE_UNDEFINED __attribute__((__always_inline__, __no_sanitize__("undefined")))
+#define DISABLE_SANITIZER_INSTRUMENTATION __attribute__((disable_sanitizer_instrumentation))
 
 #if !__has_include(<sanitizer/asan_interface.h>) || !defined(ADDRESS_SANITIZER)
 #   define ASAN_UNPOISON_MEMORY_REGION(a, b)
@@ -121,68 +108,53 @@
         {
             [[noreturn]] void abortOnFailedAssertion(const String & description);
         }
-        #define chassert(x) do { static_cast<bool>(x) ? void(0) : ::DB::abortOnFailedAssertion(#x); } while (0)
+        #define chassert_1(x, ...) do { static_cast<bool>(x) ? void(0) : ::DB::abortOnFailedAssertion(#x); } while (0)
+        #define chassert_2(x, comment, ...) do { static_cast<bool>(x) ? void(0) : ::DB::abortOnFailedAssertion(comment); } while (0)
         #define UNREACHABLE() abort()
         // clang-format off
     #else
         /// Here sizeof() trick is used to suppress unused warning for result,
         /// since simple "(void)x" will evaluate the expression, while
         /// "sizeof(!(x))" will not.
-        #define chassert(x) (void)sizeof(!(x))
+        #define chassert_1(x, ...) (void)sizeof(!(x))
+        #define chassert_2(x, comment, ...) (void)sizeof(!(x))
         #define UNREACHABLE() __builtin_unreachable()
     #endif
+        #define CHASSERT_DISPATCH(_1,_2, N,...) N(_1, _2)
+        #define CHASSERT_INVOKE(tuple) CHASSERT_DISPATCH tuple
+        #define chassert(...) CHASSERT_INVOKE((__VA_ARGS__, chassert_2, chassert_1))
+
 #endif
 
 /// Macros for Clang Thread Safety Analysis (TSA). They can be safely ignored by other compilers.
 /// Feel free to extend, but please stay close to https://clang.llvm.org/docs/ThreadSafetyAnalysis.html#mutexheader
-#if defined(__clang__)
-#    define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       /// data is protected by given capability
-#    define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 /// pointed-to data is protected by the given capability
-#    define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                /// thread needs exclusive possession of given capability
-#    define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  /// thread needs shared possession of given capability
-#    define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               /// annotated lock must be locked after given lock
-#    define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           /// disable TSA for a function
-#    define TSA_CAPABILITY(...) __attribute__((capability(__VA_ARGS__)))                       /// object of a class can be used as capability
-#    define TSA_ACQUIRE(...) __attribute__((acquire_capability(__VA_ARGS__)))                        /// function acquires a capability, but does not release it
-#    define TSA_TRY_ACQUIRE(...) __attribute__((try_acquire_capability(__VA_ARGS__)))                /// function tries to acquire a capability and returns a boolean value indicating success or failure
-#    define TSA_RELEASE(...) __attribute__((release_capability(__VA_ARGS__)))                        /// function releases the given capability
-#    define TSA_ACQUIRE_SHARED(...) __attribute__((acquire_shared_capability(__VA_ARGS__)))          /// function acquires a shared capability, but does not release it
-#    define TSA_TRY_ACQUIRE_SHARED(...) __attribute__((try_acquire_shared_capability(__VA_ARGS__)))  /// function tries to acquire a shared capability and returns a boolean value indicating success or failure
-#    define TSA_RELEASE_SHARED(...) __attribute__((release_shared_capability(__VA_ARGS__)))          /// function releases the given shared capability
-#    define TSA_SCOPED_LOCKABLE __attribute__((scoped_lockable)) /// object of a class has scoped lockable capability
+#define TSA_GUARDED_BY(...) __attribute__((guarded_by(__VA_ARGS__)))                       /// data is protected by given capability
+#define TSA_PT_GUARDED_BY(...) __attribute__((pt_guarded_by(__VA_ARGS__)))                 /// pointed-to data is protected by the given capability
+#define TSA_REQUIRES(...) __attribute__((requires_capability(__VA_ARGS__)))                /// thread needs exclusive possession of given capability
+#define TSA_REQUIRES_SHARED(...) __attribute__((requires_shared_capability(__VA_ARGS__)))  /// thread needs shared possession of given capability
+#define TSA_ACQUIRED_AFTER(...) __attribute__((acquired_after(__VA_ARGS__)))               /// annotated lock must be locked after given lock
+#define TSA_NO_THREAD_SAFETY_ANALYSIS __attribute__((no_thread_safety_analysis))           /// disable TSA for a function
+#define TSA_CAPABILITY(...) __attribute__((capability(__VA_ARGS__)))                       /// object of a class can be used as capability
+#define TSA_ACQUIRE(...) __attribute__((acquire_capability(__VA_ARGS__)))                        /// function acquires a capability, but does not release it
+#define TSA_TRY_ACQUIRE(...) __attribute__((try_acquire_capability(__VA_ARGS__)))                /// function tries to acquire a capability and returns a boolean value indicating success or failure
+#define TSA_RELEASE(...) __attribute__((release_capability(__VA_ARGS__)))                        /// function releases the given capability
+#define TSA_ACQUIRE_SHARED(...) __attribute__((acquire_shared_capability(__VA_ARGS__)))          /// function acquires a shared capability, but does not release it
+#define TSA_TRY_ACQUIRE_SHARED(...) __attribute__((try_acquire_shared_capability(__VA_ARGS__)))  /// function tries to acquire a shared capability and returns a boolean value indicating success or failure
+#define TSA_RELEASE_SHARED(...) __attribute__((release_shared_capability(__VA_ARGS__)))          /// function releases the given shared capability
+#define TSA_SCOPED_LOCKABLE __attribute__((scoped_lockable)) /// object of a class has scoped lockable capability
 
 /// Macros for suppressing TSA warnings for specific reads/writes (instead of suppressing it for the whole function)
 /// They use a lambda function to apply function attribute to a single statement. This enable us to suppress warnings locally instead of
 /// suppressing them in the whole function
 /// Consider adding a comment when using these macros.
-#   define TSA_SUPPRESS_WARNING_FOR_READ(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> const auto & { return (x); }())
-#   define TSA_SUPPRESS_WARNING_FOR_WRITE(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> auto & { return (x); }())
+#define TSA_SUPPRESS_WARNING_FOR_READ(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> const auto & { return (x); }())
+#define TSA_SUPPRESS_WARNING_FOR_WRITE(x) ([&]() TSA_NO_THREAD_SAFETY_ANALYSIS -> auto & { return (x); }())
 
 /// This macro is useful when only one thread writes to a member
 /// and you want to read this member from the same thread without locking a mutex.
 /// It's safe (because no concurrent writes are possible), but TSA generates a warning.
 /// (Seems like there's no way to verify it, but it makes sense to distinguish it from TSA_SUPPRESS_WARNING_FOR_READ for readability)
-#   define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
-
-#else
-#    define TSA_GUARDED_BY(...)
-#    define TSA_PT_GUARDED_BY(...)
-#    define TSA_REQUIRES(...)
-#    define TSA_REQUIRES_SHARED(...)
-#    define TSA_NO_THREAD_SAFETY_ANALYSIS
-#    define TSA_CAPABILITY(...)
-#    define TSA_ACQUIRE(...)
-#    define TSA_TRY_ACQUIRE(...)
-#    define TSA_RELEASE(...)
-#    define TSA_ACQUIRE_SHARED(...)
-#    define TSA_TRY_ACQUIRE_SHARED(...)
-#    define TSA_RELEASE_SHARED(...)
-#    define TSA_SCOPED_LOCKABLE
-
-#    define TSA_SUPPRESS_WARNING_FOR_READ(x) (x)
-#    define TSA_SUPPRESS_WARNING_FOR_WRITE(x) (x)
-#    define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
-#endif
+#define TSA_READ_ONE_THREAD(x) TSA_SUPPRESS_WARNING_FOR_READ(x)
 
 /// A template function for suppressing warnings about unused variables or function results.
 template <typename... Args>
diff --git a/base/base/extended_types.h b/base/base/extended_types.h
index b58df45a97e..796167ab45d 100644
--- a/base/base/extended_types.h
+++ b/base/base/extended_types.h
@@ -64,6 +64,44 @@ template <> struct is_arithmetic<UInt256> { static constexpr bool value = true;
 template <typename T>
 inline constexpr bool is_arithmetic_v = is_arithmetic<T>::value;
 
+#define FOR_EACH_ARITHMETIC_TYPE(M) \
+    M(DataTypeDate) \
+    M(DataTypeDate32) \
+    M(DataTypeDateTime) \
+    M(DataTypeInt8) \
+    M(DataTypeUInt8) \
+    M(DataTypeInt16) \
+    M(DataTypeUInt16) \
+    M(DataTypeInt32) \
+    M(DataTypeUInt32) \
+    M(DataTypeInt64) \
+    M(DataTypeUInt64) \
+    M(DataTypeInt128) \
+    M(DataTypeUInt128) \
+    M(DataTypeInt256) \
+    M(DataTypeUInt256) \
+    M(DataTypeFloat32) \
+    M(DataTypeFloat64)
+
+#define FOR_EACH_ARITHMETIC_TYPE_PASS(M, X) \
+    M(DataTypeDate, X) \
+    M(DataTypeDate32, X) \
+    M(DataTypeDateTime, X) \
+    M(DataTypeInt8, X) \
+    M(DataTypeUInt8, X) \
+    M(DataTypeInt16, X) \
+    M(DataTypeUInt16, X) \
+    M(DataTypeInt32, X) \
+    M(DataTypeUInt32, X) \
+    M(DataTypeInt64, X) \
+    M(DataTypeUInt64, X) \
+    M(DataTypeInt128, X) \
+    M(DataTypeUInt128, X) \
+    M(DataTypeInt256, X) \
+    M(DataTypeUInt256, X) \
+    M(DataTypeFloat32, X) \
+    M(DataTypeFloat64, X)
+
 template <typename T>
 struct make_unsigned // NOLINT(readability-identifier-naming)
 {
diff --git a/base/base/getMemoryAmount.cpp b/base/base/getMemoryAmount.cpp
index a46e964c5a3..3d01e301f45 100644
--- a/base/base/getMemoryAmount.cpp
+++ b/base/base/getMemoryAmount.cpp
@@ -1,19 +1,55 @@
-#include <stdexcept>
-#include <fstream>
 #include <base/getMemoryAmount.h>
+
+#include <base/cgroupsv2.h>
 #include <base/getPageSize.h>
 
+#include <fstream>
+#include <stdexcept>
+
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/param.h>
-#if defined(BSD)
-#include <sys/sysctl.h>
+
+
+namespace
+{
+
+std::optional<uint64_t> getCgroupsV2MemoryLimit()
+{
+#if defined(OS_LINUX)
+    if (!cgroupsV2Enabled())
+        return {};
+
+    if (!cgroupsV2MemoryControllerEnabled())
+        return {};
+
+    std::string cgroup = cgroupV2OfProcess();
+    auto current_cgroup = cgroup.empty() ? default_cgroups_mount : (default_cgroups_mount / cgroup);
+
+    /// Open the bottom-most nested memory limit setting file. If there is no such file at the current
+    /// level, try again at the parent level as memory settings are inherited.
+    while (current_cgroup != default_cgroups_mount.parent_path())
+    {
+        std::ifstream setting_file(current_cgroup / "memory.max");
+        if (setting_file.is_open())
+        {
+            uint64_t value;
+            if (setting_file >> value)
+                return {value};
+            else
+                return {}; /// e.g. the cgroups default "max"
+        }
+        current_cgroup = current_cgroup.parent_path();
+    }
+
+    return {};
+#else
+    return {};
 #endif
+}
 
+}
 
-/** Returns the size of physical memory (RAM) in bytes.
-  * Returns 0 on unsupported platform
-  */
 uint64_t getMemoryAmountOrZero()
 {
     int64_t num_pages = sysconf(_SC_PHYS_PAGES);
@@ -26,34 +62,27 @@ uint64_t getMemoryAmountOrZero()
 
     uint64_t memory_amount = num_pages * page_size;
 
-#if defined(OS_LINUX)
-    // Try to lookup at the Cgroup limit
-
-    // CGroups v2
-    std::ifstream cgroupv2_limit("/sys/fs/cgroup/memory.max");
-    if (cgroupv2_limit.is_open())
-    {
-        uint64_t memory_limit = 0;
-        cgroupv2_limit >> memory_limit;
-        if (memory_limit > 0 && memory_limit < memory_amount)
-            memory_amount = memory_limit;
-    }
+    /// Respect the memory limit set by cgroups v2.
+    auto limit_v2 = getCgroupsV2MemoryLimit();
+    if (limit_v2.has_value() && *limit_v2 < memory_amount)
+         memory_amount = *limit_v2;
     else
     {
-        // CGroups v1
-        std::ifstream cgroup_limit("/sys/fs/cgroup/memory/memory.limit_in_bytes");
-        if (cgroup_limit.is_open())
+        /// Cgroups v1 were replaced by v2 in 2015. The only reason we keep supporting v1 is that the transition to v2
+        /// has been slow. Caveat : Hierarchical groups as in v2 are not supported for v1, the location of the memory
+        /// limit (virtual) file is hard-coded.
+        /// TODO: check at the end of 2024 if we can get rid of v1.
+        std::ifstream limit_file_v1("/sys/fs/cgroup/memory/memory.limit_in_bytes");
+        if (limit_file_v1.is_open())
         {
-            uint64_t memory_limit = 0; // in case of read error
-            cgroup_limit >> memory_limit;
-            if (memory_limit > 0 && memory_limit < memory_amount)
-                memory_amount = memory_limit;
+            uint64_t limit_v1;
+            if (limit_file_v1 >> limit_v1)
+                if (limit_v1 < memory_amount)
+                    memory_amount = limit_v1;
         }
     }
-#endif
 
     return memory_amount;
-
 }
 
 
diff --git a/base/base/getMemoryAmount.h b/base/base/getMemoryAmount.h
index 7ebd92a8bcf..37ee0ebe7c6 100644
--- a/base/base/getMemoryAmount.h
+++ b/base/base/getMemoryAmount.h
@@ -2,11 +2,10 @@
 
 #include <cstdint>
 
-/** Returns the size of physical memory (RAM) in bytes.
-  * Returns 0 on unsupported platform or if it cannot determine the size of physical memory.
-  */
+/// Returns the size in bytes of physical memory (RAM) available to the process. The value can
+/// be smaller than the total available RAM available to the system due to cgroups settings.
+/// Returns 0 on unsupported platform or if it cannot determine the size of physical memory.
 uint64_t getMemoryAmountOrZero();
 
-/** Throws exception if it cannot determine the size of physical memory.
-  */
+/// Throws exception if it cannot determine the size of physical memory.
 uint64_t getMemoryAmount();
diff --git a/base/base/int8_to_string.cpp b/base/base/int8_to_string.cpp
new file mode 100644
index 00000000000..f74a6b8077e
--- /dev/null
+++ b/base/base/int8_to_string.cpp
@@ -0,0 +1,9 @@
+#include <base/int8_to_string.h>
+
+namespace std
+{
+std::string to_string(Int8 v) /// NOLINT (cert-dcl58-cpp)
+{
+    return to_string(int8_t{v});
+}
+}
diff --git a/base/base/int8_to_string.h b/base/base/int8_to_string.h
new file mode 100644
index 00000000000..af0914f4312
--- /dev/null
+++ b/base/base/int8_to_string.h
@@ -0,0 +1,17 @@
+#pragma once
+
+#include <base/defines.h>
+#include <base/types.h>
+
+#include <fmt/format.h>
+
+template <>
+struct fmt::formatter<Int8> : fmt::formatter<int8_t>
+{
+};
+
+
+namespace std
+{
+std::string to_string(Int8 v); /// NOLINT (cert-dcl58-cpp)
+}
diff --git a/base/base/iostream_debug_helpers.h b/base/base/iostream_debug_helpers.h
index f531a56031b..5c601251272 100644
--- a/base/base/iostream_debug_helpers.h
+++ b/base/base/iostream_debug_helpers.h
@@ -155,9 +155,7 @@ Out & dump(Out & out, const char * name, T && x) // NOLINT(cppcoreguidelines-mis
     return dumpValue(out, x) << "; ";
 }
 
-#ifdef __clang__
 #pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
-#endif
 
 #define DUMPVAR(VAR) ::dump(std::cerr, #VAR, (VAR));
 #define DUMPHEAD std::cerr << __FILE__ << ':' << __LINE__ << " [ " << getThreadId() << " ] ";
diff --git a/base/base/itoa.cpp b/base/base/itoa.cpp
new file mode 100644
index 00000000000..fd8fd8de025
--- /dev/null
+++ b/base/base/itoa.cpp
@@ -0,0 +1,503 @@
+// Based on https://github.com/amdn/itoa and combined with our optimizations
+//
+//=== itoa.cpp - Fast integer to ascii conversion                 --*- C++ -*-//
+//
+// The MIT License (MIT)
+// Copyright (c) 2016 Arturo Martin-de-Nicolas
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+//     The above copyright notice and this permission notice shall be included
+//     in all copies or substantial portions of the Software.
+//
+// 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//===----------------------------------------------------------------------===//
+
+#include <cstddef>
+#include <cstdint>
+#include <cstring>
+#include <type_traits>
+#include <base/defines.h>
+#include <base/extended_types.h>
+#include <base/itoa.h>
+
+namespace
+{
+template <typename T>
+ALWAYS_INLINE inline constexpr T pow10(size_t x)
+{
+    return x ? 10 * pow10<T>(x - 1) : 1;
+}
+
+// Division by a power of 10 is implemented using a multiplicative inverse.
+// This strength reduction is also done by optimizing compilers, but
+// presently the fastest results are produced by using the values
+// for the multiplication and the shift as given by the algorithm
+// described by Agner Fog in "Optimizing Subroutines in Assembly Language"
+//
+// http://www.agner.org/optimize/optimizing_assembly.pdf
+//
+// "Integer division by a constant (all processors)
+// A floating point number can be divided by a constant by multiplying
+// with the reciprocal. If we want to do the same with integers, we have
+// to scale the reciprocal by 2n and then shift the product to the right
+// by n. There are various algorithms for finding a suitable value of n
+// and compensating for rounding errors. The algorithm described below
+// was invented by Terje Mathisen, Norway, and not published elsewhere."
+
+/// Division by constant is performed by:
+/// 1. Adding 1 if needed;
+/// 2. Multiplying by another constant;
+/// 3. Shifting right by another constant.
+template <typename UInt, bool add_, UInt multiplier_, unsigned shift_>
+struct Division
+{
+    static constexpr bool add{add_};
+    static constexpr UInt multiplier{multiplier_};
+    static constexpr unsigned shift{shift_};
+};
+
+/// Select a type with appropriate number of bytes from the list of types.
+/// First parameter is the number of bytes requested. Then goes a list of types with 1, 2, 4, ... number of bytes.
+/// Example: SelectType<4, uint8_t, uint16_t, uint32_t, uint64_t> will select uint32_t.
+template <size_t N, typename T, typename... Ts>
+struct SelectType
+{
+    using Result = typename SelectType<N / 2, Ts...>::Result;
+};
+
+template <typename T, typename... Ts>
+struct SelectType<1, T, Ts...>
+{
+    using Result = T;
+};
+
+
+/// Division by 10^N where N is the size of the type.
+template <size_t N>
+using DivisionBy10PowN = typename SelectType<
+    N,
+    Division<uint8_t, false, 205U, 11>, /// divide by 10
+    Division<uint16_t, true, 41943U, 22>, /// divide by 100
+    Division<uint32_t, false, 3518437209U, 45>, /// divide by 10000
+    Division<uint64_t, false, 12379400392853802749ULL, 90> /// divide by 100000000
+    >::Result;
+
+template <size_t N>
+using UnsignedOfSize = typename SelectType<N, uint8_t, uint16_t, uint32_t, uint64_t, __uint128_t>::Result;
+
+/// Holds the result of dividing an unsigned N-byte variable by 10^N resulting in
+template <size_t N>
+struct QuotientAndRemainder
+{
+    UnsignedOfSize<N> quotient; // quotient with fewer than 2*N decimal digits
+    UnsignedOfSize<N / 2> remainder; // remainder with at most N decimal digits
+};
+
+template <size_t N>
+QuotientAndRemainder<N> inline split(UnsignedOfSize<N> value)
+{
+    constexpr DivisionBy10PowN<N> division;
+
+    UnsignedOfSize<N> quotient = (division.multiplier * (UnsignedOfSize<2 * N>(value) + division.add)) >> division.shift;
+    UnsignedOfSize<N / 2> remainder = static_cast<UnsignedOfSize<N / 2>>(value - quotient * pow10<UnsignedOfSize<N / 2>>(N));
+
+    return {quotient, remainder};
+}
+
+ALWAYS_INLINE inline char * outDigit(char * p, uint8_t value)
+{
+    *p = '0' + value;
+    ++p;
+    return p;
+}
+
+// Using a lookup table to convert binary numbers from 0 to 99
+// into ascii characters as described by Andrei Alexandrescu in
+// https://www.facebook.com/notes/facebook-engineering/three-optimization-tips-for-c/10151361643253920/
+
+const char digits[201] = "00010203040506070809"
+                         "10111213141516171819"
+                         "20212223242526272829"
+                         "30313233343536373839"
+                         "40414243444546474849"
+                         "50515253545556575859"
+                         "60616263646566676869"
+                         "70717273747576777879"
+                         "80818283848586878889"
+                         "90919293949596979899";
+
+ALWAYS_INLINE inline char * outTwoDigits(char * p, uint8_t value)
+{
+    memcpy(p, &digits[value * 2], 2);
+    p += 2;
+    return p;
+}
+
+namespace convert
+{
+template <typename UInt, size_t N = sizeof(UInt)>
+char * head(char * p, UInt u);
+template <typename UInt, size_t N = sizeof(UInt)>
+char * tail(char * p, UInt u);
+
+//===----------------------------------------------------------===//
+//     head: find most significant digit, skip leading zeros
+//===----------------------------------------------------------===//
+
+// "x" contains quotient and remainder after division by 10^N
+// quotient is less than 10^N
+template <size_t N>
+ALWAYS_INLINE inline char * head(char * p, QuotientAndRemainder<N> x)
+{
+    p = head(p, UnsignedOfSize<N / 2>(x.quotient));
+    p = tail(p, x.remainder);
+    return p;
+}
+
+// "u" is less than 10^2*N
+template <typename UInt, size_t N>
+ALWAYS_INLINE inline char * head(char * p, UInt u)
+{
+    return u < pow10<UnsignedOfSize<N>>(N) ? head(p, UnsignedOfSize<N / 2>(u)) : head<N>(p, split<N>(u));
+}
+
+// recursion base case, selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * head<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
+{
+    return u < 10 ? outDigit(p, u) : outTwoDigits(p, u);
+}
+
+//===----------------------------------------------------------===//
+//     tail: produce all digits including leading zeros
+//===----------------------------------------------------------===//
+
+// recursive step, "u" is less than 10^2*N
+template <typename UInt, size_t N>
+ALWAYS_INLINE inline char * tail(char * p, UInt u)
+{
+    QuotientAndRemainder<N> x = split<N>(u);
+    p = tail(p, UnsignedOfSize<N / 2>(x.quotient));
+    p = tail(p, x.remainder);
+    return p;
+}
+
+// recursion base case, selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * tail<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
+{
+    return outTwoDigits(p, u);
+}
+
+//===----------------------------------------------------------===//
+// large values are >= 10^2*N
+// where x contains quotient and remainder after division by 10^N
+//===----------------------------------------------------------===//
+template <size_t N>
+ALWAYS_INLINE inline char * large(char * p, QuotientAndRemainder<N> x)
+{
+    QuotientAndRemainder<N> y = split<N>(x.quotient);
+    p = head(p, UnsignedOfSize<N / 2>(y.quotient));
+    p = tail(p, y.remainder);
+    p = tail(p, x.remainder);
+    return p;
+}
+
+//===----------------------------------------------------------===//
+// handle values of "u" that might be >= 10^2*N
+// where N is the size of "u" in bytes
+//===----------------------------------------------------------===//
+template <typename UInt, size_t N = sizeof(UInt)>
+ALWAYS_INLINE inline char * uitoa(char * p, UInt u)
+{
+    if (u < pow10<UnsignedOfSize<N>>(N))
+        return head(p, UnsignedOfSize<N / 2>(u));
+    QuotientAndRemainder<N> x = split<N>(u);
+
+    return u < pow10<UnsignedOfSize<N>>(2 * N) ? head<N>(p, x) : large<N>(p, x);
+}
+
+// selected when "u" is one byte
+template <>
+ALWAYS_INLINE inline char * uitoa<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
+{
+    if (u < 10)
+        return outDigit(p, u);
+    else if (u < 100)
+        return outTwoDigits(p, u);
+    else
+    {
+        p = outDigit(p, u / 100);
+        p = outTwoDigits(p, u % 100);
+        return p;
+    }
+}
+
+//===----------------------------------------------------------===//
+//     handle unsigned and signed integral operands
+//===----------------------------------------------------------===//
+
+// itoa: handle unsigned integral operands (selected by SFINAE)
+template <typename U, std::enable_if_t<!std::is_signed_v<U> && std::is_integral_v<U>> * = nullptr>
+ALWAYS_INLINE inline char * itoa(U u, char * p)
+{
+    return convert::uitoa(p, u);
+}
+
+// itoa: handle signed integral operands (selected by SFINAE)
+template <typename I, size_t N = sizeof(I), std::enable_if_t<std::is_signed_v<I> && std::is_integral_v<I>> * = nullptr>
+ALWAYS_INLINE inline char * itoa(I i, char * p)
+{
+    // Need "mask" to be filled with a copy of the sign bit.
+    // If "i" is a negative value, then the result of "operator >>"
+    // is implementation-defined, though usually it is an arithmetic
+    // right shift that replicates the sign bit.
+    // Use a conditional expression to be portable,
+    // a good optimizing compiler generates an arithmetic right shift
+    // and avoids the conditional branch.
+    UnsignedOfSize<N> mask = i < 0 ? ~UnsignedOfSize<N>(0) : 0;
+    // Now get the absolute value of "i" and cast to unsigned type UnsignedOfSize<N>.
+    // Cannot use std::abs() because the result is undefined
+    // in 2's complement systems for the most-negative value.
+    // Want to avoid conditional branch for performance reasons since
+    // CPU branch prediction will be ineffective when negative values
+    // occur randomly.
+    // Let "u" be "i" cast to unsigned type UnsignedOfSize<N>.
+    // Subtract "u" from 2*u if "i" is positive or 0 if "i" is negative.
+    // This yields the absolute value with the desired type without
+    // using a conditional branch and without invoking undefined or
+    // implementation defined behavior:
+    UnsignedOfSize<N> u = ((2 * UnsignedOfSize<N>(i)) & ~mask) - UnsignedOfSize<N>(i);
+    // Unconditionally store a minus sign when producing digits
+    // in a forward direction and increment the pointer only if
+    // the value is in fact negative.
+    // This avoids a conditional branch and is safe because we will
+    // always produce at least one digit and it will overwrite the
+    // minus sign when the value is not negative.
+    *p = '-';
+    p += (mask & 1);
+    p = convert::uitoa(p, u);
+    return p;
+}
+}
+
+const uint64_t max_multiple_of_hundred_that_fits_in_64_bits = 1'00'00'00'00'00'00'00'00'00ull;
+const int max_multiple_of_hundred_blocks = 9;
+static_assert(max_multiple_of_hundred_that_fits_in_64_bits % 100 == 0);
+
+ALWAYS_INLINE inline char * writeUIntText(UInt128 _x, char * p)
+{
+    /// If we the highest 64bit item is empty, we can print just the lowest item as u64
+    if (_x.items[UInt128::_impl::little(1)] == 0)
+        return convert::itoa(_x.items[UInt128::_impl::little(0)], p);
+
+    /// Doing operations using __int128 is faster and we already rely on this feature
+    using T = unsigned __int128;
+    T x = (T(_x.items[UInt128::_impl::little(1)]) << 64) + T(_x.items[UInt128::_impl::little(0)]);
+
+    /// We are going to accumulate blocks of 2 digits to print until the number is small enough to be printed as u64
+    /// To do this we could do: x / 100, x % 100
+    /// But these would mean doing many iterations with long integers, so instead we divide by a much longer integer
+    /// multiple of 100 (100^9) and then get the blocks out of it (as u64)
+    /// Once we reach u64::max we can stop and use the fast method to print that in the front
+    static const T large_divisor = max_multiple_of_hundred_that_fits_in_64_bits;
+    static const T largest_uint64 = std::numeric_limits<uint64_t>::max();
+    uint8_t two_values[20] = {0}; // 39 Max characters / 2
+
+    int current_block = 0;
+    while (x > largest_uint64)
+    {
+        uint64_t u64_remainder = uint64_t(x % large_divisor);
+        x /= large_divisor;
+
+        int pos = current_block;
+        while (u64_remainder)
+        {
+            two_values[pos] = uint8_t(u64_remainder % 100);
+            pos++;
+            u64_remainder /= 100;
+        }
+        current_block += max_multiple_of_hundred_blocks;
+    }
+
+    char * highest_part_print = convert::itoa(uint64_t(x), p);
+    for (int i = 0; i < current_block; i++)
+    {
+        outTwoDigits(highest_part_print, two_values[current_block - 1 - i]);
+        highest_part_print += 2;
+    }
+
+    return highest_part_print;
+}
+
+ALWAYS_INLINE inline char * writeUIntText(UInt256 _x, char * p)
+{
+    /// If possible, treat it as a smaller integer as they are much faster to print
+    if (_x.items[UInt256::_impl::little(3)] == 0 && _x.items[UInt256::_impl::little(2)] == 0)
+        return writeUIntText(UInt128{_x.items[UInt256::_impl::little(0)], _x.items[UInt256::_impl::little(1)]}, p);
+
+    /// If available (x86) we transform from our custom class to _BitInt(256) which has better support in the compiler
+    /// and produces better code
+    using T =
+#if defined(__x86_64__)
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wbit-int-extension"
+        unsigned _BitInt(256)
+#    pragma clang diagnostic pop
+#else
+        UInt256
+#endif
+        ;
+
+#if defined(__x86_64__)
+    T x = (T(_x.items[UInt256::_impl::little(3)]) << 192) + (T(_x.items[UInt256::_impl::little(2)]) << 128)
+        + (T(_x.items[UInt256::_impl::little(1)]) << 64) + T(_x.items[UInt256::_impl::little(0)]);
+#else
+    T x = _x;
+#endif
+
+    /// Similar to writeUIntText(UInt128) only that in this case we will stop as soon as we reach the largest u128
+    /// and switch to that function
+    uint8_t two_values[39] = {0}; // 78 Max characters / 2
+    int current_pos = 0;
+
+    static const T large_divisor = max_multiple_of_hundred_that_fits_in_64_bits;
+    static const T largest_uint128 = T(std::numeric_limits<uint64_t>::max()) << 64 | T(std::numeric_limits<uint64_t>::max());
+
+    while (x > largest_uint128)
+    {
+        uint64_t u64_remainder = uint64_t(x % large_divisor);
+        x /= large_divisor;
+
+        int pos = current_pos;
+        while (u64_remainder)
+        {
+            two_values[pos] = uint8_t(u64_remainder % 100);
+            pos++;
+            u64_remainder /= 100;
+        }
+        current_pos += max_multiple_of_hundred_blocks;
+    }
+
+#if defined(__x86_64__)
+    UInt128 pending{uint64_t(x), uint64_t(x >> 64)};
+#else
+    UInt128 pending{x.items[UInt256::_impl::little(0)], x.items[UInt256::_impl::little(1)]};
+#endif
+
+    char * highest_part_print = writeUIntText(pending, p);
+    for (int i = 0; i < current_pos; i++)
+    {
+        outTwoDigits(highest_part_print, two_values[current_pos - 1 - i]);
+        highest_part_print += 2;
+    }
+
+    return highest_part_print;
+}
+
+ALWAYS_INLINE inline char * writeLeadingMinus(char * pos)
+{
+    *pos = '-';
+    return pos + 1;
+}
+
+template <typename T>
+ALWAYS_INLINE inline char * writeSIntText(T x, char * pos)
+{
+    static_assert(std::is_same_v<T, Int128> || std::is_same_v<T, Int256>);
+
+    using UnsignedT = make_unsigned_t<T>;
+    static constexpr T min_int = UnsignedT(1) << (sizeof(T) * 8 - 1);
+
+    if (unlikely(x == min_int))
+    {
+        if constexpr (std::is_same_v<T, Int128>)
+        {
+            const char * res = "-170141183460469231731687303715884105728";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
+        else if constexpr (std::is_same_v<T, Int256>)
+        {
+            const char * res = "-57896044618658097711785492504343953926634992332820282019728792003956564819968";
+            memcpy(pos, res, strlen(res));
+            return pos + strlen(res);
+        }
+    }
+
+    if (x < 0)
+    {
+        x = -x;
+        pos = writeLeadingMinus(pos);
+    }
+    return writeUIntText(UnsignedT(x), pos);
+}
+}
+
+char * itoa(UInt8 i, char * p)
+{
+    return convert::itoa(uint8_t(i), p);
+}
+
+char * itoa(Int8 i, char * p)
+{
+    return convert::itoa(int8_t(i), p);
+}
+
+char * itoa(UInt128 i, char * p)
+{
+    return writeUIntText(i, p);
+}
+
+char * itoa(Int128 i, char * p)
+{
+    return writeSIntText(i, p);
+}
+
+char * itoa(UInt256 i, char * p)
+{
+    return writeUIntText(i, p);
+}
+
+char * itoa(Int256 i, char * p)
+{
+    return writeSIntText(i, p);
+}
+
+#define DEFAULT_ITOA(T) \
+    char * itoa(T i, char * p) \
+    { \
+        return convert::itoa(i, p); \
+    }
+
+#define FOR_MISSING_INTEGER_TYPES(M) \
+    M(uint8_t) \
+    M(UInt16) \
+    M(UInt32) \
+    M(UInt64) \
+    M(int8_t) \
+    M(Int16) \
+    M(Int32) \
+    M(Int64)
+
+FOR_MISSING_INTEGER_TYPES(DEFAULT_ITOA)
+
+#if defined(OS_DARWIN)
+DEFAULT_ITOA(unsigned long)
+DEFAULT_ITOA(long)
+#endif
+
+#undef FOR_MISSING_INTEGER_TYPES
+#undef DEFAULT_ITOA
diff --git a/base/base/itoa.h b/base/base/itoa.h
index 513070c99d9..3461d679d43 100644
--- a/base/base/itoa.h
+++ b/base/base/itoa.h
@@ -1,446 +1,30 @@
 #pragma once
 
-// Based on https://github.com/amdn/itoa and combined with our optimizations
-//
-//=== itoa.h - Fast integer to ascii conversion                   --*- C++ -*-//
-//
-// The MIT License (MIT)
-// Copyright (c) 2016 Arturo Martin-de-Nicolas
-//
-// Permission is hereby granted, free of charge, to any person obtaining a copy
-// of this software and associated documentation files (the "Software"), to deal
-// in the Software without restriction, including without limitation the rights
-// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-// copies of the Software, and to permit persons to whom the Software is
-// furnished to do so, subject to the following conditions:
-//
-//     The above copyright notice and this permission notice shall be included
-//     in all copies or substantial portions of the Software.
-//
-// 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 AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-// SOFTWARE.
-//===----------------------------------------------------------------------===//
-
-#include <cstdint>
-#include <cstddef>
-#include <cstring>
-#include <type_traits>
 #include <base/extended_types.h>
 
+#define FOR_INTEGER_TYPES(M) \
+    M(uint8_t) \
+    M(UInt8) \
+    M(UInt16) \
+    M(UInt32) \
+    M(UInt64) \
+    M(UInt128) \
+    M(UInt256) \
+    M(int8_t) \
+    M(Int8) \
+    M(Int16) \
+    M(Int32) \
+    M(Int64) \
+    M(Int128) \
+    M(Int256)
 
-template <typename T>
-inline int digits10(T x)
-{
-    if (x < 10ULL)
-        return 1;
-    if (x < 100ULL)
-        return 2;
-    if (x < 1000ULL)
-        return 3;
+#define INSTANTIATION(T) char * itoa(T i, char * p);
+FOR_INTEGER_TYPES(INSTANTIATION)
 
-    if (x < 1000000000000ULL)
-    {
-        if (x < 100000000ULL)
-        {
-            if (x < 1000000ULL)
-            {
-                if (x < 10000ULL)
-                    return 4;
-                else
-                    return 5 + (x >= 100000ULL);
-            }
+#if defined(OS_DARWIN)
+INSTANTIATION(unsigned long)
+INSTANTIATION(long)
+#endif
 
-            return 7 + (x >= 10000000ULL);
-        }
-
-        if (x < 10000000000ULL)
-            return 9 + (x >= 1000000000ULL);
-
-        return 11 + (x >= 100000000000ULL);
-    }
-
-    return 12 + digits10(x / 1000000000000ULL);
-}
-
-
-namespace impl
-{
-
-template <typename T>
-static constexpr T pow10(size_t x)
-{
-    return x ? 10 * pow10<T>(x - 1) : 1;
-}
-
-// Division by a power of 10 is implemented using a multiplicative inverse.
-// This strength reduction is also done by optimizing compilers, but
-// presently the fastest results are produced by using the values
-// for the multiplication and the shift as given by the algorithm
-// described by Agner Fog in "Optimizing Subroutines in Assembly Language"
-//
-// http://www.agner.org/optimize/optimizing_assembly.pdf
-//
-// "Integer division by a constant (all processors)
-// A floating point number can be divided by a constant by multiplying
-// with the reciprocal. If we want to do the same with integers, we have
-// to scale the reciprocal by 2n and then shift the product to the right
-// by n. There are various algorithms for finding a suitable value of n
-// and compensating for rounding errors. The algorithm described below
-// was invented by Terje Mathisen, Norway, and not published elsewhere."
-
-/// Division by constant is performed by:
-/// 1. Adding 1 if needed;
-/// 2. Multiplying by another constant;
-/// 3. Shifting right by another constant.
-template <typename UInt, bool add_, UInt multiplier_, unsigned shift_>
-struct Division
-{
-    static constexpr bool add{add_};
-    static constexpr UInt multiplier{multiplier_};
-    static constexpr unsigned shift{shift_};
-};
-
-/// Select a type with appropriate number of bytes from the list of types.
-/// First parameter is the number of bytes requested. Then goes a list of types with 1, 2, 4, ... number of bytes.
-/// Example: SelectType<4, uint8_t, uint16_t, uint32_t, uint64_t> will select uint32_t.
-template <size_t N, typename T, typename... Ts>
-struct SelectType
-{
-    using Result = typename SelectType<N / 2, Ts...>::Result;
-};
-
-template <typename T, typename... Ts>
-struct SelectType<1, T, Ts...>
-{
-    using Result = T;
-};
-
-
-/// Division by 10^N where N is the size of the type.
-template <size_t N>
-using DivisionBy10PowN = typename SelectType
-<
-    N,
-    Division<uint8_t, false, 205U, 11>,                           /// divide by 10
-    Division<uint16_t, true, 41943U, 22>,                         /// divide by 100
-    Division<uint32_t, false, 3518437209U, 45>,                   /// divide by 10000
-    Division<uint64_t, false, 12379400392853802749ULL, 90>        /// divide by 100000000
->::Result;
-
-template <size_t N>
-using UnsignedOfSize = typename SelectType
-<
-    N,
-    uint8_t,
-    uint16_t,
-    uint32_t,
-    uint64_t,
-    __uint128_t
->::Result;
-
-/// Holds the result of dividing an unsigned N-byte variable by 10^N resulting in
-template <size_t N>
-struct QuotientAndRemainder
-{
-    UnsignedOfSize<N> quotient; // quotient with fewer than 2*N decimal digits
-    UnsignedOfSize<N / 2> remainder; // remainder with at most N decimal digits
-};
-
-template <size_t N>
-QuotientAndRemainder<N> static inline split(UnsignedOfSize<N> value)
-{
-    constexpr DivisionBy10PowN<N> division;
-
-    UnsignedOfSize<N> quotient = (division.multiplier * (UnsignedOfSize<2 * N>(value) + division.add)) >> division.shift;
-    UnsignedOfSize<N / 2> remainder = static_cast<UnsignedOfSize<N / 2>>(value - quotient * pow10<UnsignedOfSize<N / 2>>(N));
-
-    return {quotient, remainder};
-}
-
-
-static inline char * outDigit(char * p, uint8_t value)
-{
-    *p = '0' + value;
-    ++p;
-    return p;
-}
-
-// Using a lookup table to convert binary numbers from 0 to 99
-// into ascii characters as described by Andrei Alexandrescu in
-// https://www.facebook.com/notes/facebook-engineering/three-optimization-tips-for-c/10151361643253920/
-
-static const char digits[201] = "00010203040506070809"
-                                "10111213141516171819"
-                                "20212223242526272829"
-                                "30313233343536373839"
-                                "40414243444546474849"
-                                "50515253545556575859"
-                                "60616263646566676869"
-                                "70717273747576777879"
-                                "80818283848586878889"
-                                "90919293949596979899";
-
-static inline char * outTwoDigits(char * p, uint8_t value)
-{
-    memcpy(p, &digits[value * 2], 2);
-    p += 2;
-    return p;
-}
-
-
-namespace convert
-{
-    template <typename UInt, size_t N = sizeof(UInt)> static char * head(char * p, UInt u);
-    template <typename UInt, size_t N = sizeof(UInt)> static char * tail(char * p, UInt u);
-
-    //===----------------------------------------------------------===//
-    //     head: find most significant digit, skip leading zeros
-    //===----------------------------------------------------------===//
-
-    // "x" contains quotient and remainder after division by 10^N
-    // quotient is less than 10^N
-    template <size_t N>
-    static inline char * head(char * p, QuotientAndRemainder<N> x)
-    {
-        p = head(p, UnsignedOfSize<N / 2>(x.quotient));
-        p = tail(p, x.remainder);
-        return p;
-    }
-
-    // "u" is less than 10^2*N
-    template <typename UInt, size_t N>
-    static inline char * head(char * p, UInt u)
-    {
-        return u < pow10<UnsignedOfSize<N>>(N)
-            ? head(p, UnsignedOfSize<N / 2>(u))
-            : head<N>(p, split<N>(u));
-    }
-
-    // recursion base case, selected when "u" is one byte
-    template <>
-    inline char * head<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
-    {
-        return u < 10
-            ? outDigit(p, u)
-            : outTwoDigits(p, u);
-    }
-
-    //===----------------------------------------------------------===//
-    //     tail: produce all digits including leading zeros
-    //===----------------------------------------------------------===//
-
-    // recursive step, "u" is less than 10^2*N
-    template <typename UInt, size_t N>
-    static inline char * tail(char * p, UInt u)
-    {
-        QuotientAndRemainder<N> x = split<N>(u);
-        p = tail(p, UnsignedOfSize<N / 2>(x.quotient));
-        p = tail(p, x.remainder);
-        return p;
-    }
-
-    // recursion base case, selected when "u" is one byte
-    template <>
-    inline char * tail<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
-    {
-        return outTwoDigits(p, u);
-    }
-
-    //===----------------------------------------------------------===//
-    // large values are >= 10^2*N
-    // where x contains quotient and remainder after division by 10^N
-    //===----------------------------------------------------------===//
-
-    template <size_t N>
-    static inline char * large(char * p, QuotientAndRemainder<N> x)
-    {
-        QuotientAndRemainder<N> y = split<N>(x.quotient);
-        p = head(p, UnsignedOfSize<N / 2>(y.quotient));
-        p = tail(p, y.remainder);
-        p = tail(p, x.remainder);
-        return p;
-    }
-
-    //===----------------------------------------------------------===//
-    // handle values of "u" that might be >= 10^2*N
-    // where N is the size of "u" in bytes
-    //===----------------------------------------------------------===//
-
-    template <typename UInt, size_t N = sizeof(UInt)>
-    static inline char * uitoa(char * p, UInt u)
-    {
-        if (u < pow10<UnsignedOfSize<N>>(N))
-            return head(p, UnsignedOfSize<N / 2>(u));
-        QuotientAndRemainder<N> x = split<N>(u);
-
-        return u < pow10<UnsignedOfSize<N>>(2 * N)
-            ? head<N>(p, x)
-            : large<N>(p, x);
-    }
-
-    // selected when "u" is one byte
-    template <>
-    inline char * uitoa<UnsignedOfSize<1>, 1>(char * p, UnsignedOfSize<1> u)
-    {
-        if (u < 10)
-            return outDigit(p, u);
-        else if (u < 100)
-            return outTwoDigits(p, u);
-        else
-        {
-            p = outDigit(p, u / 100);
-            p = outTwoDigits(p, u % 100);
-            return p;
-        }
-    }
-
-    //===----------------------------------------------------------===//
-    //     handle unsigned and signed integral operands
-    //===----------------------------------------------------------===//
-
-    // itoa: handle unsigned integral operands (selected by SFINAE)
-    template <typename U, std::enable_if_t<!std::is_signed_v<U> && std::is_integral_v<U>> * = nullptr>
-    static inline char * itoa(U u, char * p)
-    {
-        return convert::uitoa(p, u);
-    }
-
-    // itoa: handle signed integral operands (selected by SFINAE)
-    template <typename I, size_t N = sizeof(I), std::enable_if_t<std::is_signed_v<I> && std::is_integral_v<I>> * = nullptr>
-    static inline char * itoa(I i, char * p)
-    {
-        // Need "mask" to be filled with a copy of the sign bit.
-        // If "i" is a negative value, then the result of "operator >>"
-        // is implementation-defined, though usually it is an arithmetic
-        // right shift that replicates the sign bit.
-        // Use a conditional expression to be portable,
-        // a good optimizing compiler generates an arithmetic right shift
-        // and avoids the conditional branch.
-        UnsignedOfSize<N> mask = i < 0 ? ~UnsignedOfSize<N>(0) : 0;
-        // Now get the absolute value of "i" and cast to unsigned type UnsignedOfSize<N>.
-        // Cannot use std::abs() because the result is undefined
-        // in 2's complement systems for the most-negative value.
-        // Want to avoid conditional branch for performance reasons since
-        // CPU branch prediction will be ineffective when negative values
-        // occur randomly.
-        // Let "u" be "i" cast to unsigned type UnsignedOfSize<N>.
-        // Subtract "u" from 2*u if "i" is positive or 0 if "i" is negative.
-        // This yields the absolute value with the desired type without
-        // using a conditional branch and without invoking undefined or
-        // implementation defined behavior:
-        UnsignedOfSize<N> u = ((2 * UnsignedOfSize<N>(i)) & ~mask) - UnsignedOfSize<N>(i);
-        // Unconditionally store a minus sign when producing digits
-        // in a forward direction and increment the pointer only if
-        // the value is in fact negative.
-        // This avoids a conditional branch and is safe because we will
-        // always produce at least one digit and it will overwrite the
-        // minus sign when the value is not negative.
-        *p = '-';
-        p += (mask & 1);
-        p = convert::uitoa(p, u);
-        return p;
-    }
-}
-
-
-template <typename T>
-static inline char * writeUIntText(T x, char * p)
-{
-    static_assert(is_unsigned_v<T>);
-
-    int len = digits10(x);
-    auto * pp = p + len;
-    while (x >= 100)
-    {
-        const auto i = x % 100;
-        x /= 100;
-        pp -= 2;
-        outTwoDigits(pp, i);
-    }
-    if (x < 10)
-        *p = '0' + x;
-    else
-        outTwoDigits(p, x);
-    return p + len;
-}
-
-static inline char * writeLeadingMinus(char * pos)
-{
-    *pos = '-';
-    return pos + 1;
-}
-
-template <typename T>
-static inline char * writeSIntText(T x, char * pos)
-{
-    static_assert(std::is_same_v<T, Int128> || std::is_same_v<T, Int256>);
-
-    using UnsignedT = make_unsigned_t<T>;
-    static constexpr T min_int = UnsignedT(1) << (sizeof(T) * 8 - 1);
-
-    if (unlikely(x == min_int))
-    {
-        if constexpr (std::is_same_v<T, Int128>)
-        {
-            const char * res = "-170141183460469231731687303715884105728";
-            memcpy(pos, res, strlen(res));
-            return pos + strlen(res);
-        }
-        else if constexpr (std::is_same_v<T, Int256>)
-        {
-            const char * res = "-57896044618658097711785492504343953926634992332820282019728792003956564819968";
-            memcpy(pos, res, strlen(res));
-            return pos + strlen(res);
-        }
-    }
-
-    if (x < 0)
-    {
-        x = -x;
-        pos = writeLeadingMinus(pos);
-    }
-    return writeUIntText(UnsignedT(x), pos);
-}
-
-}
-
-template <typename I>
-char * itoa(I i, char * p)
-{
-    return impl::convert::itoa(i, p);
-}
-
-template <>
-inline char * itoa(char8_t i, char * p)
-{
-    return impl::convert::itoa(uint8_t(i), p);
-}
-
-template <>
-inline char * itoa(UInt128 i, char * p)
-{
-    return impl::writeUIntText(i, p);
-}
-
-template <>
-inline char * itoa(Int128 i, char * p)
-{
-    return impl::writeSIntText(i, p);
-}
-
-template <>
-inline char * itoa(UInt256 i, char * p)
-{
-    return impl::writeUIntText(i, p);
-}
-
-template <>
-inline char * itoa(Int256 i, char * p)
-{
-    return impl::writeSIntText(i, p);
-}
+#undef FOR_INTEGER_TYPES
+#undef INSTANTIATION
diff --git a/base/base/phdr_cache.cpp b/base/base/phdr_cache.cpp
index 7d37f01b560..802d1bf35f5 100644
--- a/base/base/phdr_cache.cpp
+++ b/base/base/phdr_cache.cpp
@@ -11,10 +11,8 @@
 /// Thread Sanitizer uses dl_iterate_phdr function on initialization and fails if we provide our own.
 #ifdef USE_PHDR_CACHE
 
-#if defined(__clang__)
-#   pragma clang diagnostic ignored "-Wreserved-id-macro"
-#   pragma clang diagnostic ignored "-Wunused-macros"
-#endif
+#pragma clang diagnostic ignored "-Wreserved-id-macro"
+#pragma clang diagnostic ignored "-Wunused-macros"
 
 #define __msan_unpoison(X, Y) // NOLINT
 #if defined(ch_has_feature)
@@ -57,10 +55,6 @@ std::atomic<PHDRCache *> phdr_cache {};
 
 
 extern "C"
-#ifndef __clang__
-[[gnu::visibility("default")]]
-[[gnu::externally_visible]]
-#endif
 int dl_iterate_phdr(int (*callback) (dl_phdr_info * info, size_t size, void * data), void * data)
 {
     auto * current_phdr_cache = phdr_cache.load();
diff --git a/base/base/sort.h b/base/base/sort.h
index 1a814587763..e46c388d185 100644
--- a/base/base/sort.h
+++ b/base/base/sort.h
@@ -59,24 +59,19 @@ using ComparatorWrapper = Comparator;
 
 #endif
 
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wold-style-cast"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wold-style-cast"
 
 #include <miniselect/floyd_rivest_select.h>
 
-template <typename RandomIt>
-void nth_element(RandomIt first, RandomIt nth, RandomIt last)
+template <typename RandomIt, typename Compare>
+void nth_element(RandomIt first, RandomIt nth, RandomIt last, Compare compare)
 {
-    using value_type = typename std::iterator_traits<RandomIt>::value_type;
-    using comparator = std::less<value_type>;
-
-    comparator compare;
-    ComparatorWrapper<comparator> compare_wrapper = compare;
-
 #ifndef NDEBUG
     ::shuffle(first, last);
 #endif
 
+    ComparatorWrapper<Compare> compare_wrapper = compare;
     ::miniselect::floyd_rivest_select(first, nth, last, compare_wrapper);
 
 #ifndef NDEBUG
@@ -87,6 +82,15 @@ void nth_element(RandomIt first, RandomIt nth, RandomIt last)
 #endif
 }
 
+template <typename RandomIt>
+void nth_element(RandomIt first, RandomIt nth, RandomIt last)
+{
+    using value_type = typename std::iterator_traits<RandomIt>::value_type;
+    using comparator = std::less<value_type>;
+
+    ::nth_element(first, nth, last, comparator());
+}
+
 template <typename RandomIt, typename Compare>
 void partial_sort(RandomIt first, RandomIt middle, RandomIt last, Compare compare)
 {
@@ -111,7 +115,7 @@ void partial_sort(RandomIt first, RandomIt middle, RandomIt last)
     ::partial_sort(first, middle, last, comparator());
 }
 
-#pragma GCC diagnostic pop
+#pragma clang diagnostic pop
 
 template <typename RandomIt, typename Compare>
 void sort(RandomIt first, RandomIt last, Compare compare)
diff --git a/base/base/types.h b/base/base/types.h
index 5825c8ae7ad..a4874860514 100644
--- a/base/base/types.h
+++ b/base/base/types.h
@@ -3,40 +3,34 @@
 #include <cstdint>
 #include <string>
 
-using Int8 = int8_t;
-using Int16 = int16_t;
-using Int32 = int32_t;
-using Int64 = int64_t;
-
-#ifndef __cpp_char8_t
-using char8_t = unsigned char;
-#endif
-
-/// This is needed for more strict aliasing. https://godbolt.org/z/xpJBSb https://stackoverflow.com/a/57453713
+/// Using char8_t more strict aliasing (https://stackoverflow.com/a/57453713)
 using UInt8 = char8_t;
 
+/// Same for using signed _BitInt(8) (there isn't a signed char8_t, which would be more convenient)
+/// See https://godbolt.org/z/fafnWEnnf
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wbit-int-extension"
+using Int8 = signed _BitInt(8);
+#pragma clang diagnostic pop
+
+namespace std
+{
+template <>
+struct hash<Int8> /// NOLINT (cert-dcl58-cpp)
+{
+    size_t operator()(const Int8 x) const { return std::hash<int8_t>()(int8_t{x}); }
+};
+}
+
 using UInt16 = uint16_t;
 using UInt32 = uint32_t;
 using UInt64 = uint64_t;
 
-using String = std::string;
-
-namespace DB
-{
-
-using UInt8 = ::UInt8;
-using UInt16 = ::UInt16;
-using UInt32 = ::UInt32;
-using UInt64 = ::UInt64;
-
-using Int8 = ::Int8;
-using Int16 = ::Int16;
-using Int32 = ::Int32;
-using Int64 = ::Int64;
+using Int16 = int16_t;
+using Int32 = int32_t;
+using Int64 = int64_t;
 
 using Float32 = float;
 using Float64 = double;
 
 using String = std::string;
-
-}
diff --git a/base/base/wide_integer_impl.h b/base/base/wide_integer_impl.h
index c1fd7b69b7f..0e98b6e5ee6 100644
--- a/base/base/wide_integer_impl.h
+++ b/base/base/wide_integer_impl.h
@@ -6,14 +6,13 @@
 
 #include "throwError.h"
 
+#include <bit>
 #include <cmath>
 #include <cfloat>
 #include <cassert>
 #include <tuple>
 #include <limits>
 
-#include <boost/math/special_functions/fpclassify.hpp>
-
 // NOLINTBEGIN(*)
 
 /// Use same extended double for all platforms
@@ -21,6 +20,7 @@
 #define CONSTEXPR_FROM_DOUBLE constexpr
 using FromDoubleIntermediateType = long double;
 #else
+#include <boost/math/special_functions/fpclassify.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
 /// `wide_integer_from_builtin` can't be constexpr with non-literal `cpp_bin_float_double_extended`
 #define CONSTEXPR_FROM_DOUBLE
@@ -308,6 +308,13 @@ struct integer<Bits, Signed>::_impl
         constexpr uint64_t max_int = std::numeric_limits<uint64_t>::max();
         static_assert(std::is_same_v<T, double> || std::is_same_v<T, FromDoubleIntermediateType>);
         /// Implementation specific behaviour on overflow (if we don't check here, stack overflow will triggered in bigint_cast).
+#if (LDBL_MANT_DIG == 64)
+        if (!std::isfinite(t))
+        {
+            self = 0;
+            return;
+        }
+#else
         if constexpr (std::is_same_v<T, double>)
         {
             if (!std::isfinite(t))
@@ -324,6 +331,7 @@ struct integer<Bits, Signed>::_impl
                 return;
             }
         }
+#endif
 
         const T alpha = t / static_cast<T>(max_int);
 
diff --git a/base/glibc-compatibility/musl/aarch64/syscall.s b/base/glibc-compatibility/musl/aarch64/syscall.s
index 845986bf787..aadaea04ef5 100644
--- a/base/glibc-compatibility/musl/aarch64/syscall.s
+++ b/base/glibc-compatibility/musl/aarch64/syscall.s
@@ -2,6 +2,7 @@
 .hidden __syscall
 .type __syscall,%function
 __syscall:
+.cfi_startproc
 	uxtw x8,w0
 	mov x0,x1
 	mov x1,x2
@@ -12,3 +13,4 @@ __syscall:
 	mov x6,x7
 	svc 0
 	ret
+.cfi_endproc
diff --git a/base/glibc-compatibility/musl/getauxval.c b/base/glibc-compatibility/musl/getauxval.c
index 44a9f979f99..ea5cff9fc11 100644
--- a/base/glibc-compatibility/musl/getauxval.c
+++ b/base/glibc-compatibility/musl/getauxval.c
@@ -20,11 +20,7 @@
 
 /// Suppress TSan since it is possible for this code to be called from multiple threads,
 /// and initialization is safe to be done multiple times from multiple threads.
-#if defined(__clang__)
-#    define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
-#else
-#    define NO_SANITIZE_THREAD
-#endif
+#define NO_SANITIZE_THREAD __attribute__((__no_sanitize__("thread")))
 
 // We don't have libc struct available here.
 // Compute aux vector manually (from /proc/self/auxv).
diff --git a/base/harmful/harmful.c b/base/harmful/harmful.c
index 78796ca0c05..54b552a84ea 100644
--- a/base/harmful/harmful.c
+++ b/base/harmful/harmful.c
@@ -6,11 +6,7 @@
 /// It is only enabled in debug build (its intended use is for CI checks).
 #if !defined(NDEBUG)
 
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wincompatible-library-redeclaration"
-#else
-    #pragma GCC diagnostic ignored "-Wbuiltin-declaration-mismatch"
-#endif
+#pragma clang diagnostic ignored "-Wincompatible-library-redeclaration"
 
 /// We cannot use libc headers here.
 long write(int, const void *, unsigned long);
diff --git a/base/poco/Foundation/include/Poco/BufferedStreamBuf.h b/base/poco/Foundation/include/Poco/BufferedStreamBuf.h
index 9f4cbd4e4d8..d97e37eedf3 100644
--- a/base/poco/Foundation/include/Poco/BufferedStreamBuf.h
+++ b/base/poco/Foundation/include/Poco/BufferedStreamBuf.h
@@ -26,6 +26,11 @@
 #include "Poco/StreamUtil.h"
 
 
+namespace DB
+{
+class ReadBufferFromIStream;
+}
+
 namespace Poco
 {
 
@@ -120,6 +125,8 @@ protected:
     openmode getMode() const { return _mode; }
 
 private:
+    friend class DB::ReadBufferFromIStream;
+
     virtual int readFromDevice(char_type * /*buffer*/, std::streamsize /*length*/) { return 0; }
 
     virtual int writeToDevice(const char_type * /*buffer*/, std::streamsize /*length*/) { return 0; }
diff --git a/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h b/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h
new file mode 100644
index 00000000000..7b31307e1ca
--- /dev/null
+++ b/base/poco/Foundation/include/Poco/FPEnvironment_SUN.h
@@ -0,0 +1,75 @@
+//
+// FPEnvironment_SUN.h
+//
+// Library: Foundation
+// Package: Core
+// Module:  FPEnvironment
+//
+// Definitions of class FPEnvironmentImpl for Solaris.
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#ifndef Foundation_FPEnvironment_SUN_INCLUDED
+#define Foundation_FPEnvironment_SUN_INCLUDED
+
+
+#include <ieeefp.h>
+#include "Poco/Foundation.h"
+
+
+namespace Poco
+{
+
+
+class FPEnvironmentImpl
+{
+protected:
+    enum RoundingModeImpl
+    {
+        FP_ROUND_DOWNWARD_IMPL = FP_RM,
+        FP_ROUND_UPWARD_IMPL = FP_RP,
+        FP_ROUND_TONEAREST_IMPL = FP_RN,
+        FP_ROUND_TOWARDZERO_IMPL = FP_RZ
+    };
+    enum FlagImpl
+    {
+        FP_DIVIDE_BY_ZERO_IMPL = FP_X_DZ,
+        FP_INEXACT_IMPL = FP_X_IMP,
+        FP_OVERFLOW_IMPL = FP_X_OFL,
+        FP_UNDERFLOW_IMPL = FP_X_UFL,
+        FP_INVALID_IMPL = FP_X_INV
+    };
+    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:
+    fp_rnd _rnd;
+    fp_except _exc;
+};
+
+
+} // namespace Poco
+
+
+#endif // Foundation_FPEnvironment_SUN_INCLUDED
diff --git a/base/poco/Foundation/include/Poco/LinearHashTable.h b/base/poco/Foundation/include/Poco/LinearHashTable.h
index 0464ecb1bc4..d91f75d1d1f 100644
--- a/base/poco/Foundation/include/Poco/LinearHashTable.h
+++ b/base/poco/Foundation/include/Poco/LinearHashTable.h
@@ -68,7 +68,7 @@ public:
     typedef typename Bucket::iterator BucketIterator;
     typedef typename BucketVec::iterator BucketVecIterator;
 
-    class ConstIterator : public std::iterator<std::forward_iterator_tag, Value>
+    class ConstIterator
     {
     public:
         ConstIterator() : _initialized(false) { }
diff --git a/base/poco/Foundation/include/Poco/Logger.h b/base/poco/Foundation/include/Poco/Logger.h
index ffe3766dfec..2a1cb33b407 100644
--- a/base/poco/Foundation/include/Poco/Logger.h
+++ b/base/poco/Foundation/include/Poco/Logger.h
@@ -22,6 +22,7 @@
 #include <cstddef>
 #include <map>
 #include <vector>
+
 #include "Poco/Channel.h"
 #include "Poco/Format.h"
 #include "Poco/Foundation.h"
@@ -33,7 +34,8 @@ namespace Poco
 
 
 class Exception;
-
+class Logger;
+using LoggerPtr = std::shared_ptr<Logger>;
 
 class Foundation_API Logger : public Channel
 /// Logger is a special Channel that acts as the main
@@ -870,21 +872,21 @@ public:
     /// If the Logger does not yet exist, it is created, based
     /// on its parent logger.
 
-    static Logger & unsafeGet(const std::string & name);
-    /// Returns a reference to the Logger with the given name.
+    static LoggerPtr getShared(const std::string & name, bool should_be_owned_by_shared_ptr_if_created = true);
+    /// Returns a shared pointer to the Logger with the given name.
     /// If the Logger does not yet exist, it is created, based
     /// on its parent logger.
-    ///
-    /// WARNING: This method is not thread safe. You should
-    /// probably use get() instead.
-    /// The only time this method should be used is during
-    /// program initialization, when only one thread is running.
 
     static Logger & create(const std::string & name, Channel * pChannel, int level = Message::PRIO_INFORMATION);
     /// Creates and returns a reference to a Logger with the
     /// given name. The Logger's Channel and log level as set as
     /// specified.
 
+    static LoggerPtr createShared(const std::string & name, Channel * pChannel, int level = Message::PRIO_INFORMATION);
+    /// Creates and returns a shared pointer to a Logger with the
+    /// given name. The Logger's Channel and log level as set as
+    /// specified.
+
     static Logger & root();
     /// Returns a reference to the root logger, which is the ultimate
     /// ancestor of all Loggers.
@@ -893,13 +895,6 @@ public:
     /// Returns a pointer to the Logger with the given name if it
     /// exists, or a null pointer otherwise.
 
-    static void destroy(const std::string & name);
-    /// Destroys the logger with the specified name. Does nothing
-    /// if the logger is not found.
-    ///
-    /// After a logger has been destroyed, all references to it
-    /// become invalid.
-
     static void shutdown();
     /// Shuts down the logging framework and releases all
     /// Loggers.
@@ -928,9 +923,17 @@ public:
 
     static const std::string ROOT; /// The name of the root logger ("").
 
-protected:
-    typedef std::map<std::string, Logger *> LoggerMap;
+public:
+    struct LoggerEntry
+    {
+        Poco::Logger * logger;
+        bool owned_by_shared_ptr = false;
+    };
 
+    using LoggerMap = std::unordered_map<std::string, LoggerEntry>;
+    using LoggerMapIterator = LoggerMap::iterator;
+
+protected:
     Logger(const std::string & name, Channel * pChannel, int level);
     ~Logger();
 
@@ -938,11 +941,16 @@ protected:
     void log(const std::string & text, Message::Priority prio, const char * file, int line);
 
     static std::string format(const std::string & fmt, int argc, std::string argv[]);
-    static Logger & parent(const std::string & name);
-    static void add(Logger * pLogger);
-    static Logger * find(const std::string & name);
 
 private:
+    static std::pair<Logger::LoggerMapIterator, bool> unsafeGet(const std::string & name, bool get_shared);
+    static Logger * unsafeGetRawPtr(const std::string & name);
+    static std::pair<LoggerMapIterator, bool> unsafeCreate(const std::string & name, Channel * pChannel, int level = Message::PRIO_INFORMATION);
+    static Logger & parent(const std::string & name);
+    static std::pair<LoggerMapIterator, bool> add(Logger * pLogger);
+    static std::optional<LoggerMapIterator> find(const std::string & name);
+    static Logger * findRawPtr(const std::string & name);
+
     Logger();
     Logger(const Logger &);
     Logger & operator=(const Logger &);
@@ -950,9 +958,6 @@ private:
     std::string _name;
     Channel * _pChannel;
     std::atomic_int _level;
-
-    static LoggerMap * _pLoggerMap;
-    static Mutex _mapMtx;
 };
 
 
diff --git a/base/poco/Foundation/include/Poco/RefCountedObject.h b/base/poco/Foundation/include/Poco/RefCountedObject.h
index 4ad32e30cad..db966089e00 100644
--- a/base/poco/Foundation/include/Poco/RefCountedObject.h
+++ b/base/poco/Foundation/include/Poco/RefCountedObject.h
@@ -38,15 +38,15 @@ public:
     /// Creates the RefCountedObject.
     /// The initial reference count is one.
 
-    void duplicate() const;
-    /// Increments the object's reference count.
+    size_t duplicate() const;
+    /// Increments the object's reference count, returns reference count before call.
 
-    void release() const throw();
+    size_t release() const throw();
     /// Decrements the object's reference count
     /// and deletes the object if the count
-    /// reaches zero.
+    /// reaches zero, returns reference count before call.
 
-    int referenceCount() const;
+    size_t referenceCount() const;
     /// Returns the reference count.
 
 protected:
@@ -57,36 +57,40 @@ private:
     RefCountedObject(const RefCountedObject &);
     RefCountedObject & operator=(const RefCountedObject &);
 
-    mutable AtomicCounter _counter;
+    mutable std::atomic<size_t> _counter;
 };
 
 
 //
 // inlines
 //
-inline int RefCountedObject::referenceCount() const
+inline size_t RefCountedObject::referenceCount() const
 {
-    return _counter.value();
+    return _counter.load(std::memory_order_acquire);
 }
 
 
-inline void RefCountedObject::duplicate() const
+inline size_t RefCountedObject::duplicate() const
 {
-    ++_counter;
+    return _counter.fetch_add(1, std::memory_order_acq_rel);
 }
 
 
-inline void RefCountedObject::release() const throw()
+inline size_t RefCountedObject::release() const throw()
 {
+    size_t reference_count_before = _counter.fetch_sub(1, std::memory_order_acq_rel);
+
     try
     {
-        if (--_counter == 0)
+        if (reference_count_before == 1)
             delete this;
     }
     catch (...)
     {
         poco_unexpected();
     }
+
+    return reference_count_before;
 }
 
 
diff --git a/base/poco/Foundation/src/Environment_UNIX.cpp b/base/poco/Foundation/src/Environment_UNIX.cpp
index 202e5d88f83..faabb374778 100644
--- a/base/poco/Foundation/src/Environment_UNIX.cpp
+++ b/base/poco/Foundation/src/Environment_UNIX.cpp
@@ -281,15 +281,15 @@ void EnvironmentImpl::nodeIdImpl(NodeId& id)
 /// #include <sys/ioctl.h>
 #if defined(sun) || defined(__sun)
 #include <sys/sockio.h>
+#include <netdb.h>
+#include <net/if.h>
+#include <net/if_arp.h>
 #endif
 /// #include <sys/socket.h>
 /// #include <sys/types.h>
 /// #include <netinet/in.h>
 /// #include <net/if.h>
 /// #include <arpa/inet.h>
-/// #include <netdb.h>
-/// #include <net/if.h>
-/// #include <net/if_arp.h>
 /// #include <unistd.h>
 
 
diff --git a/base/poco/Foundation/src/FPEnvironment_SUN.cpp b/base/poco/Foundation/src/FPEnvironment_SUN.cpp
new file mode 100644
index 00000000000..36ee36431df
--- /dev/null
+++ b/base/poco/Foundation/src/FPEnvironment_SUN.cpp
@@ -0,0 +1,139 @@
+//
+// FPEnvironment_SUN.cpp
+//
+// Library: Foundation
+// Package: Core
+// Module:  FPEnvironment
+//
+// Copyright (c) 2005-2006, Applied Informatics Software Engineering GmbH.
+// and Contributors.
+//
+// SPDX-License-Identifier:	BSL-1.0
+//
+
+
+#include <math.h>
+#include "Poco/FPEnvironment_SUN.h"
+
+
+namespace Poco {
+
+
+FPEnvironmentImpl::FPEnvironmentImpl()
+{
+	_rnd = fpgetround();
+	_exc = fpgetmask();
+}
+
+
+FPEnvironmentImpl::FPEnvironmentImpl(const FPEnvironmentImpl& env)
+{
+	_rnd = env._rnd;
+	_exc = env._exc;
+}
+
+
+FPEnvironmentImpl::~FPEnvironmentImpl()
+{
+	fpsetround(_rnd);
+	fpsetmask(_exc);
+}
+
+
+FPEnvironmentImpl& FPEnvironmentImpl::operator = (const FPEnvironmentImpl& env)
+{
+	_rnd = env._rnd;
+	_exc = env._exc;
+	return *this;
+}
+
+
+bool FPEnvironmentImpl::isInfiniteImpl(float value)
+{
+	int cls = fpclass(value);
+	return cls == FP_PINF || cls == FP_NINF;
+}
+
+
+bool FPEnvironmentImpl::isInfiniteImpl(double value)
+{
+	int cls = fpclass(value);
+	return cls == FP_PINF || cls == FP_NINF;
+}
+
+
+bool FPEnvironmentImpl::isInfiniteImpl(long double value)
+{
+	int cls = fpclass(value);
+	return cls == FP_PINF || cls == FP_NINF;
+}
+
+
+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 isnan((double) value) != 0;
+}
+
+
+float FPEnvironmentImpl::copySignImpl(float target, float source)
+{
+	return (float) copysign(target, source);
+}
+
+
+double FPEnvironmentImpl::copySignImpl(double target, double source)
+{
+	return (float) copysign(target, source);
+}
+
+
+long double FPEnvironmentImpl::copySignImpl(long double target, long double source)
+{
+	return (source > 0 && target > 0) || (source < 0 && target < 0) ? target : -target;
+}
+
+
+void FPEnvironmentImpl::keepCurrentImpl()
+{
+	fpsetround(_rnd);
+	fpsetmask(_exc);
+}
+
+
+void FPEnvironmentImpl::clearFlagsImpl()
+{
+	fpsetsticky(0);
+}
+
+
+bool FPEnvironmentImpl::isFlagImpl(FlagImpl flag)
+{
+	return (fpgetsticky() & flag) != 0;
+}
+
+
+void FPEnvironmentImpl::setRoundingModeImpl(RoundingModeImpl mode)
+{
+	fpsetround((fp_rnd) mode);
+}
+
+
+FPEnvironmentImpl::RoundingModeImpl FPEnvironmentImpl::getRoundingModeImpl()
+{
+	return (FPEnvironmentImpl::RoundingModeImpl) fpgetround();
+}
+
+
+} // namespace Poco
diff --git a/base/poco/Foundation/src/Logger.cpp b/base/poco/Foundation/src/Logger.cpp
index 3d5de585b4f..779af384b0b 100644
--- a/base/poco/Foundation/src/Logger.cpp
+++ b/base/poco/Foundation/src/Logger.cpp
@@ -20,12 +20,31 @@
 #include "Poco/NumberParser.h"
 #include "Poco/String.h"
 
+#include <cassert>
+#include <mutex>
+
+namespace
+{
+
+std::mutex & getLoggerMutex()
+{
+	auto get_logger_mutex_placeholder_memory = []()
+	{
+		static char buffer[sizeof(std::mutex)]{};
+		return buffer;
+	};
+
+	static std::mutex * logger_mutex = new (get_logger_mutex_placeholder_memory()) std::mutex();
+	return *logger_mutex;
+}
+
+Poco::Logger::LoggerMap * _pLoggerMap = nullptr;
+
+}
 
 namespace Poco {
 
 
-Logger::LoggerMap* Logger::_pLoggerMap = 0;
-Mutex Logger::_mapMtx;
 const std::string Logger::ROOT;
 
 
@@ -73,7 +92,7 @@ void Logger::setProperty(const std::string& name, const std::string& value)
 		setChannel(LoggingRegistry::defaultRegistry().channelForName(value));
 	else if (name == "level")
 		setLevel(value);
-	else 
+	else
 		Channel::setProperty(name, value);
 }
 
@@ -112,17 +131,17 @@ void Logger::dump(const std::string& msg, const void* buffer, std::size_t length
 
 void Logger::setLevel(const std::string& name, int level)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
 	if (_pLoggerMap)
 	{
 		std::string::size_type len = name.length();
-		for (LoggerMap::iterator it = _pLoggerMap->begin(); it != _pLoggerMap->end(); ++it)
+		for (auto & it : *_pLoggerMap)
 		{
-			if (len == 0 || 
-				(it->first.compare(0, len, name) == 0 && (it->first.length() == len || it->first[len] == '.')))
+			if (len == 0 ||
+				(it.first.compare(0, len, name) == 0 && (it.first.length() == len || it.first[len] == '.')))
 			{
-				it->second->setLevel(level);
+				it.second.logger->setLevel(level);
 			}
 		}
 	}
@@ -131,17 +150,17 @@ void Logger::setLevel(const std::string& name, int level)
 
 void Logger::setChannel(const std::string& name, Channel* pChannel)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
 	if (_pLoggerMap)
 	{
 		std::string::size_type len = name.length();
-		for (LoggerMap::iterator it = _pLoggerMap->begin(); it != _pLoggerMap->end(); ++it)
+		for (auto & it : *_pLoggerMap)
 		{
 			if (len == 0 ||
-				(it->first.compare(0, len, name) == 0 && (it->first.length() == len || it->first[len] == '.')))
+				(it.first.compare(0, len, name) == 0 && (it.first.length() == len || it.first[len] == '.')))
 			{
-				it->second->setChannel(pChannel);
+				it.second.logger->setChannel(pChannel);
 			}
 		}
 	}
@@ -150,17 +169,17 @@ void Logger::setChannel(const std::string& name, Channel* pChannel)
 
 void Logger::setProperty(const std::string& loggerName, const std::string& propertyName, const std::string& value)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
 	if (_pLoggerMap)
 	{
 		std::string::size_type len = loggerName.length();
-		for (LoggerMap::iterator it = _pLoggerMap->begin(); it != _pLoggerMap->end(); ++it)
+		for (auto & it : *_pLoggerMap)
 		{
 			if (len == 0 ||
-				(it->first.compare(0, len, loggerName) == 0 && (it->first.length() == len || it->first[len] == '.')))
+				(it.first.compare(0, len, loggerName) == 0 && (it.first.length() == len || it.first[len] == '.')))
 			{
-				it->second->setProperty(propertyName, value);
+				it.second.logger->setProperty(propertyName, value);
 			}
 		}
 	}
@@ -280,108 +299,200 @@ void Logger::formatDump(std::string& message, const void* buffer, std::size_t le
 }
 
 
-Logger& Logger::get(const std::string& name)
+namespace
 {
-	Mutex::ScopedLock lock(_mapMtx);
 
-	return unsafeGet(name);
+struct LoggerDeleter
+{
+	void operator()(Poco::Logger * logger)
+	{
+		std::lock_guard<std::mutex> lock(getLoggerMutex());
+
+		/// If logger infrastructure is destroyed just decrement logger reference count
+		if (!_pLoggerMap)
+		{
+			logger->release();
+			return;
+		}
+
+		auto it = _pLoggerMap->find(logger->name());
+		assert(it != _pLoggerMap->end());
+
+		/** If reference count is 1, this means this shared pointer owns logger
+		  * and need destroy it.
+		  */
+		size_t reference_count_before_release = logger->release();
+		if (reference_count_before_release == 1)
+		{
+			assert(it->second.owned_by_shared_ptr);
+			_pLoggerMap->erase(it);
+		}
+	}
+};
+
+inline LoggerPtr makeLoggerPtr(Logger & logger, bool owned_by_shared_ptr)
+{
+	if (owned_by_shared_ptr)
+		return LoggerPtr(&logger, LoggerDeleter());
+
+	return LoggerPtr(std::shared_ptr<void>{}, &logger);
+}
+
 }
 
 
-Logger& Logger::unsafeGet(const std::string& name)
+Logger& Logger::get(const std::string& name)
 {
-	Logger* pLogger = find(name);
-	if (!pLogger)
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
+
+	auto [it, inserted] = unsafeGet(name, false /*get_shared*/);
+	return *it->second.logger;
+}
+
+
+LoggerPtr Logger::getShared(const std::string & name, bool should_be_owned_by_shared_ptr_if_created)
+{
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
+	auto [it, inserted] = unsafeGet(name, true /*get_shared*/);
+
+	/** If during `unsafeGet` logger was created, then this shared pointer owns it.
+	  * If logger was already created, then this shared pointer does not own it.
+	  */
+	if (inserted && should_be_owned_by_shared_ptr_if_created)
+		it->second.owned_by_shared_ptr = true;
+
+	return makeLoggerPtr(*it->second.logger, it->second.owned_by_shared_ptr);
+}
+
+
+std::pair<Logger::LoggerMapIterator, bool> Logger::unsafeGet(const std::string& name, bool get_shared)
+{
+	std::optional<Logger::LoggerMapIterator> optional_logger_it = find(name);
+
+	if (optional_logger_it)
 	{
+		auto & logger_it = *optional_logger_it;
+
+		if (logger_it->second.owned_by_shared_ptr)
+		{
+			logger_it->second.logger->duplicate();
+
+			if (!get_shared)
+				logger_it->second.owned_by_shared_ptr = false;
+		}
+	}
+
+	if (!optional_logger_it)
+	{
+		Logger * logger = nullptr;
+
 		if (name == ROOT)
 		{
-			pLogger = new Logger(name, 0, Message::PRIO_INFORMATION);
+			logger = new Logger(name, nullptr, Message::PRIO_INFORMATION);
 		}
 		else
 		{
 			Logger& par = parent(name);
-			pLogger = new Logger(name, par.getChannel(), par.getLevel());
+			logger = new Logger(name, par.getChannel(), par.getLevel());
 		}
-		add(pLogger);
+
+		return add(logger);
 	}
-	return *pLogger;
+
+	return std::make_pair(*optional_logger_it, false);
+}
+
+
+Logger * Logger::unsafeGetRawPtr(const std::string & name)
+{
+	return unsafeGet(name, false /*get_shared*/).first->second.logger;
 }
 
 
 Logger& Logger::create(const std::string& name, Channel* pChannel, int level)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
-	if (find(name)) throw ExistsException();
-	Logger* pLogger = new Logger(name, pChannel, level);
-	add(pLogger);
-	return *pLogger;
+	return *unsafeCreate(name, pChannel, level).first->second.logger;
 }
 
+LoggerPtr Logger::createShared(const std::string & name, Channel * pChannel, int level)
+{
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
+
+	auto [it, inserted] = unsafeCreate(name, pChannel, level);
+	it->second.owned_by_shared_ptr = true;
+
+	return makeLoggerPtr(*it->second.logger, it->second.owned_by_shared_ptr);
+}
 
 Logger& Logger::root()
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
-	return unsafeGet(ROOT);
+	return *unsafeGetRawPtr(ROOT);
 }
 
 
 Logger* Logger::has(const std::string& name)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
-	return find(name);
+	auto optional_it = find(name);
+	if (!optional_it)
+		return nullptr;
+
+	return (*optional_it)->second.logger;
 }
 
 
 void Logger::shutdown()
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
 	if (_pLoggerMap)
 	{
-		for (LoggerMap::iterator it = _pLoggerMap->begin(); it != _pLoggerMap->end(); ++it)
+		for (auto & it : *_pLoggerMap)
 		{
-			it->second->release();
+			if (it.second.owned_by_shared_ptr)
+				continue;
+
+			it.second.logger->release();
 		}
+
 		delete _pLoggerMap;
-		_pLoggerMap = 0;
+		_pLoggerMap = nullptr;
 	}
 }
 
 
-Logger* Logger::find(const std::string& name)
+std::optional<Logger::LoggerMapIterator> Logger::find(const std::string& name)
 {
 	if (_pLoggerMap)
 	{
 		LoggerMap::iterator it = _pLoggerMap->find(name);
 		if (it != _pLoggerMap->end())
-			return it->second;
+			return it;
+
+		return {};
 	}
-	return 0;
+
+	return {};
 }
 
-
-void Logger::destroy(const std::string& name)
+Logger * Logger::findRawPtr(const std::string & name)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	auto optional_it = find(name);
+	if (!optional_it)
+		return nullptr;
 
-	if (_pLoggerMap)
-	{
-		LoggerMap::iterator it = _pLoggerMap->find(name);
-		if (it != _pLoggerMap->end())
-		{
-			it->second->release();
-			_pLoggerMap->erase(it);
-		}
-	}
+	return (*optional_it)->second.logger;
 }
 
 
 void Logger::names(std::vector<std::string>& names)
 {
-	Mutex::ScopedLock lock(_mapMtx);
+	std::lock_guard<std::mutex> lock(getLoggerMutex());
 
 	names.clear();
 	if (_pLoggerMap)
@@ -394,19 +505,27 @@ void Logger::names(std::vector<std::string>& names)
 }
 
 
+std::pair<Logger::LoggerMapIterator, bool> Logger::unsafeCreate(const std::string & name, Channel * pChannel, int level)
+{
+	if (find(name)) throw ExistsException();
+	Logger* pLogger = new Logger(name, pChannel, level);
+	return add(pLogger);
+}
+
+
 Logger& Logger::parent(const std::string& name)
 {
 	std::string::size_type pos = name.rfind('.');
 	if (pos != std::string::npos)
 	{
 		std::string pname = name.substr(0, pos);
-		Logger* pParent = find(pname);
+		Logger* pParent = findRawPtr(pname);
 		if (pParent)
 			return *pParent;
 		else
 			return parent(pname);
 	}
-	else return unsafeGet(ROOT);
+	else return *unsafeGetRawPtr(ROOT);
 }
 
 
@@ -474,11 +593,14 @@ namespace
 }
 
 
-void Logger::add(Logger* pLogger)
+std::pair<Logger::LoggerMapIterator, bool> Logger::add(Logger* pLogger)
 {
 	if (!_pLoggerMap)
-		_pLoggerMap = new LoggerMap;
-	_pLoggerMap->insert(LoggerMap::value_type(pLogger->name(), pLogger));
+		_pLoggerMap = new Logger::LoggerMap;
+
+	auto result = _pLoggerMap->emplace(pLogger->name(), LoggerEntry{pLogger, false /*owned_by_shared_ptr*/});
+	assert(result.second);
+	return result;
 }
 
 
diff --git a/base/poco/Foundation/src/NamedEvent_UNIX.cpp b/base/poco/Foundation/src/NamedEvent_UNIX.cpp
index 978e6e0bc02..3cda4104c73 100644
--- a/base/poco/Foundation/src/NamedEvent_UNIX.cpp
+++ b/base/poco/Foundation/src/NamedEvent_UNIX.cpp
@@ -31,7 +31,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_ANDROID) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_ANDROID) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD) || (POCO_OS == POCO_OS_SOLARIS)
 	union semun
 	{
 		int                 val;
diff --git a/base/poco/Foundation/src/NamedMutex_UNIX.cpp b/base/poco/Foundation/src/NamedMutex_UNIX.cpp
index 6cfa1369c9d..d53d54d7bb5 100644
--- a/base/poco/Foundation/src/NamedMutex_UNIX.cpp
+++ b/base/poco/Foundation/src/NamedMutex_UNIX.cpp
@@ -31,7 +31,7 @@
 namespace Poco {
 
 
-#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_ANDROID) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD)
+#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_ANDROID) || (POCO_OS == POCO_OS_CYGWIN) || (POCO_OS == POCO_OS_FREE_BSD) || (POCO_OS == POCO_OS_SOLARIS)
 	union semun
 	{
 		int                 val;
diff --git a/base/poco/Foundation/src/pcre_compile.c b/base/poco/Foundation/src/pcre_compile.c
index 3a6fafe8d56..b5f5f9a8286 100644
--- a/base/poco/Foundation/src/pcre_compile.c
+++ b/base/poco/Foundation/src/pcre_compile.c
@@ -4835,7 +4835,7 @@ for (;; ptr++)
 
     If the class contains characters outside the 0-255 range, a different
     opcode is compiled. It may optionally have a bit map for characters < 256,
-    but those above are are explicitly listed afterwards. A flag byte tells
+    but those above are explicitly listed afterwards. A flag byte tells
     whether the bitmap is present, and whether this is a negated class or not.
 
     In JavaScript compatibility mode, an isolated ']' causes an error. In
diff --git a/base/poco/JSON/src/pdjson.c b/base/poco/JSON/src/pdjson.c
index 18768ac96d3..563fa277439 100644
--- a/base/poco/JSON/src/pdjson.c
+++ b/base/poco/JSON/src/pdjson.c
@@ -314,13 +314,13 @@ static int read_unicode(json_stream *json)
 
         if (l < 0xdc00 || l > 0xdfff) {
             json_error(json, "invalid surrogate pair continuation \\u%04lx out "
-                             "of range (dc00-dfff)", l);
+                             "of range (dc00-dfff)", (unsigned long)l);
             return -1;
         }
 
         cp = ((h - 0xd800) * 0x400) + ((l - 0xdc00) + 0x10000);
     } else if (cp >= 0xdc00 && cp <= 0xdfff) {
-            json_error(json, "dangling surrogate \\u%04lx", cp);
+            json_error(json, "dangling surrogate \\u%04lx", (unsigned long)cp);
             return -1;
     }
 
diff --git a/base/poco/Net/CMakeLists.txt b/base/poco/Net/CMakeLists.txt
index 792045c9b43..50ffbdf905a 100644
--- a/base/poco/Net/CMakeLists.txt
+++ b/base/poco/Net/CMakeLists.txt
@@ -9,6 +9,10 @@ elseif (OS_DARWIN OR OS_FREEBSD)
     target_compile_definitions (_poco_net PUBLIC POCO_HAVE_FD_POLL)
 endif ()
 
+if (OS_SUNOS)
+    target_link_libraries (_poco_net PUBLIC socket nsl)
+endif ()
+
 # TODO: remove these warning exclusions
 target_compile_options (_poco_net
     PRIVATE
diff --git a/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h b/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
index 5f4729c9278..a6576aa561d 100644
--- a/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
+++ b/base/poco/Net/include/Poco/Net/HTTPChunkedStream.h
@@ -45,6 +45,8 @@ namespace Net
         ~HTTPChunkedStreamBuf();
         void close();
 
+        bool isComplete() const { return _chunk == std::char_traits<char>::eof(); }
+
     protected:
         int readFromDevice(char * buffer, std::streamsize length);
         int writeToDevice(const char * buffer, std::streamsize length);
@@ -68,6 +70,8 @@ namespace Net
         ~HTTPChunkedIOS();
         HTTPChunkedStreamBuf * rdbuf();
 
+        bool isComplete() const { return _buf.isComplete(); }
+
     protected:
         HTTPChunkedStreamBuf _buf;
     };
diff --git a/base/poco/Net/include/Poco/Net/HTTPClientSession.h b/base/poco/Net/include/Poco/Net/HTTPClientSession.h
index 7c0caa1c18b..edbb135d8c6 100644
--- a/base/poco/Net/include/Poco/Net/HTTPClientSession.h
+++ b/base/poco/Net/include/Poco/Net/HTTPClientSession.h
@@ -210,9 +210,22 @@ namespace Net
         void setKeepAliveTimeout(const Poco::Timespan & timeout);
         /// Sets the connection timeout for HTTP connections.
 
-        const Poco::Timespan & getKeepAliveTimeout() const;
+        Poco::Timespan getKeepAliveTimeout() const;
         /// Returns the connection timeout for HTTP connections.
 
+        void setKeepAliveMaxRequests(int max_requests);
+
+        int getKeepAliveMaxRequests() const;
+
+        int getKeepAliveRequest() const;
+
+        bool isKeepAliveExpired(double reliability = 1.0) const;
+        /// Returns if the connection is expired with some margin as fraction of timeout as reliability
+
+        double getKeepAliveReliability() const;
+        /// Returns the current fraction of keep alive timeout when connection is considered safe to use
+        /// It helps to avoid situation when a client uses nearly expired connection and receives NoMessageException
+
         virtual std::ostream & sendRequest(HTTPRequest & request);
         /// Sends the header for the given HTTP request to
         /// the server.
@@ -275,7 +288,7 @@ namespace Net
         /// This method should only be called if the request contains
         /// a "Expect: 100-continue" header.
 
-        void flushRequest();
+        virtual void flushRequest();
         /// Flushes the request stream.
         ///
         /// Normally this method does not need to be called.
@@ -283,7 +296,7 @@ namespace Net
         /// fully sent if receiveResponse() is not called, e.g.,
         /// because the underlying socket will be detached.
 
-        void reset();
+        virtual void reset();
         /// Resets the session and closes the socket.
         ///
         /// The next request will initiate a new connection,
@@ -303,6 +316,9 @@ namespace Net
         /// Returns true if the proxy should be bypassed
         /// for the current host.
 
+        const Poco::Timestamp & getLastRequest() const;
+        /// Returns time when connection has been used last time
+
     protected:
         enum
         {
@@ -338,6 +354,12 @@ namespace Net
         /// Calls proxyConnect() and attaches the resulting StreamSocket
         /// to the HTTPClientSession.
 
+        void setLastRequest(Poco::Timestamp time);
+
+        void assign(HTTPClientSession & session);
+
+        void setKeepAliveRequest(int request);
+
         HTTPSessionFactory _proxySessionFactory;
         /// Factory to create HTTPClientSession to proxy.
     private:
@@ -346,6 +368,8 @@ namespace Net
         Poco::UInt16 _port;
         ProxyConfig _proxyConfig;
         Poco::Timespan _keepAliveTimeout;
+        int _keepAliveCurrentRequest = 0;
+        int _keepAliveMaxRequests = 1000;
         Poco::Timestamp _lastRequest;
         bool _reconnect;
         bool _mustReconnect;
@@ -354,6 +378,7 @@ namespace Net
         Poco::SharedPtr<std::ostream> _pRequestStream;
         Poco::SharedPtr<std::istream> _pResponseStream;
 
+        static const double _defaultKeepAliveReliabilityLevel;
         static ProxyConfig _globalProxyConfig;
 
         HTTPClientSession(const HTTPClientSession &);
@@ -433,11 +458,30 @@ namespace Net
     }
 
 
-    inline const Poco::Timespan & HTTPClientSession::getKeepAliveTimeout() const
+    inline Poco::Timespan HTTPClientSession::getKeepAliveTimeout() const
     {
         return _keepAliveTimeout;
     }
 
+    inline const Poco::Timestamp & HTTPClientSession::getLastRequest() const
+    {
+        return _lastRequest;
+    }
+
+    inline double HTTPClientSession::getKeepAliveReliability() const
+    {
+        return _defaultKeepAliveReliabilityLevel;
+    }
+
+    inline int HTTPClientSession::getKeepAliveMaxRequests() const
+    {
+        return _keepAliveMaxRequests;
+    }
+
+    inline int HTTPClientSession::getKeepAliveRequest() const
+    {
+        return _keepAliveCurrentRequest;
+    }
 
 }
 } // namespace Poco::Net
diff --git a/base/poco/Net/include/Poco/Net/HTTPFixedLengthStream.h b/base/poco/Net/include/Poco/Net/HTTPFixedLengthStream.h
index 2f4df102605..17fa47cfa9b 100644
--- a/base/poco/Net/include/Poco/Net/HTTPFixedLengthStream.h
+++ b/base/poco/Net/include/Poco/Net/HTTPFixedLengthStream.h
@@ -48,6 +48,8 @@ namespace Net
         HTTPFixedLengthStreamBuf(HTTPSession & session, ContentLength length, openmode mode);
         ~HTTPFixedLengthStreamBuf();
 
+        bool isComplete() const;
+
     protected:
         int readFromDevice(char * buffer, std::streamsize length);
         int writeToDevice(const char * buffer, std::streamsize length);
@@ -67,6 +69,8 @@ namespace Net
         ~HTTPFixedLengthIOS();
         HTTPFixedLengthStreamBuf * rdbuf();
 
+        bool isComplete() const { return _buf.isComplete(); }
+
     protected:
         HTTPFixedLengthStreamBuf _buf;
     };
diff --git a/base/poco/Net/include/Poco/Net/HTTPMessage.h b/base/poco/Net/include/Poco/Net/HTTPMessage.h
index 0bef50803a8..8bc95ccc1af 100644
--- a/base/poco/Net/include/Poco/Net/HTTPMessage.h
+++ b/base/poco/Net/include/Poco/Net/HTTPMessage.h
@@ -120,6 +120,10 @@ namespace Net
         /// The value is set to "Keep-Alive" if keepAlive is
         /// true, or to "Close" otherwise.
 
+        void setKeepAliveTimeout(int timeout, int max_requests);
+        int getKeepAliveTimeout() const;
+        int getKeepAliveMaxRequests() const;
+
         bool getKeepAlive() const;
         /// Returns true if
         ///   * the message has a Connection header field and its value is "Keep-Alive"
diff --git a/base/poco/Net/include/Poco/Net/HTTPRequestHandlerFactory.h b/base/poco/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
index 029d936769b..9bc35b7ff70 100644
--- a/base/poco/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
+++ b/base/poco/Net/include/Poco/Net/HTTPRequestHandlerFactory.h
@@ -30,7 +30,6 @@ namespace Net
 
 
     class HTTPServerRequest;
-    class HTTPServerResponse;
     class HTTPRequestHandler;
 
 
diff --git a/base/poco/Net/include/Poco/Net/HTTPServerParams.h b/base/poco/Net/include/Poco/Net/HTTPServerParams.h
index 3c836a630a0..d614c62d57a 100644
--- a/base/poco/Net/include/Poco/Net/HTTPServerParams.h
+++ b/base/poco/Net/include/Poco/Net/HTTPServerParams.h
@@ -44,7 +44,7 @@ namespace Net
         ///   - timeout:              60 seconds
         ///   - keepAlive:            true
         ///   - maxKeepAliveRequests: 0
-        ///   - keepAliveTimeout:     10 seconds
+        ///   - keepAliveTimeout:     15 seconds
 
         void setServerName(const std::string & serverName);
         /// Sets the name and port (name:port) that the server uses to identify itself.
diff --git a/base/poco/Net/include/Poco/Net/HTTPServerSession.h b/base/poco/Net/include/Poco/Net/HTTPServerSession.h
index ec928af304f..3df7995509a 100644
--- a/base/poco/Net/include/Poco/Net/HTTPServerSession.h
+++ b/base/poco/Net/include/Poco/Net/HTTPServerSession.h
@@ -56,6 +56,8 @@ namespace Net
         SocketAddress serverAddress();
         /// Returns the server's address.
 
+        void setKeepAliveTimeout(Poco::Timespan keepAliveTimeout);
+
     private:
         bool _firstRequest;
         Poco::Timespan _keepAliveTimeout;
diff --git a/base/poco/Net/include/Poco/Net/HTTPSession.h b/base/poco/Net/include/Poco/Net/HTTPSession.h
index 934b34be5d5..cac14f479db 100644
--- a/base/poco/Net/include/Poco/Net/HTTPSession.h
+++ b/base/poco/Net/include/Poco/Net/HTTPSession.h
@@ -64,6 +64,15 @@ namespace Net
         Poco::Timespan getTimeout() const;
         /// Returns the timeout for the HTTP session.
 
+        Poco::Timespan getConnectionTimeout() const;
+        /// Returns connection timeout for the HTTP session.
+
+        Poco::Timespan getSendTimeout() const;
+        /// Returns send timeout for the HTTP session.
+
+        Poco::Timespan getReceiveTimeout() const;
+        /// Returns receive timeout for the HTTP session.
+
         bool connected() const;
         /// Returns true if the underlying socket is connected.
 
@@ -217,12 +226,25 @@ namespace Net
         return _keepAlive;
     }
 
-
     inline Poco::Timespan HTTPSession::getTimeout() const
     {
         return _receiveTimeout;
     }
 
+    inline Poco::Timespan HTTPSession::getConnectionTimeout() const
+    {
+        return _connectionTimeout;
+    }
+
+    inline Poco::Timespan HTTPSession::getSendTimeout() const
+    {
+        return _sendTimeout;
+    }
+
+    inline Poco::Timespan HTTPSession::getReceiveTimeout() const
+    {
+        return _receiveTimeout;
+    }
 
     inline StreamSocket & HTTPSession::socket()
     {
diff --git a/base/poco/Net/include/Poco/Net/HTTPStream.h b/base/poco/Net/include/Poco/Net/HTTPStream.h
index 48502347b2c..a00a861880f 100644
--- a/base/poco/Net/include/Poco/Net/HTTPStream.h
+++ b/base/poco/Net/include/Poco/Net/HTTPStream.h
@@ -63,6 +63,8 @@ namespace Net
         ~HTTPIOS();
         HTTPStreamBuf * rdbuf();
 
+        bool isComplete() const { return false; }
+
     protected:
         HTTPStreamBuf _buf;
     };
diff --git a/base/poco/Net/src/HTTPChunkedStream.cpp b/base/poco/Net/src/HTTPChunkedStream.cpp
index 376e3f55492..16ed1e71c31 100644
--- a/base/poco/Net/src/HTTPChunkedStream.cpp
+++ b/base/poco/Net/src/HTTPChunkedStream.cpp
@@ -49,10 +49,12 @@ HTTPChunkedStreamBuf::~HTTPChunkedStreamBuf()
 
 void HTTPChunkedStreamBuf::close()
 {
-	if (_mode & std::ios::out)
+	if (_mode & std::ios::out && _chunk != std::char_traits<char>::eof())
 	{
 		sync();
 		_session.write("0\r\n\r\n", 5);
+
+        _chunk = std::char_traits<char>::eof();
 	}
 }
 
diff --git a/base/poco/Net/src/HTTPClientSession.cpp b/base/poco/Net/src/HTTPClientSession.cpp
index 2282cca682b..c9899266be7 100644
--- a/base/poco/Net/src/HTTPClientSession.cpp
+++ b/base/poco/Net/src/HTTPClientSession.cpp
@@ -37,6 +37,7 @@ namespace Net {
 
 
 HTTPClientSession::ProxyConfig HTTPClientSession::_globalProxyConfig;
+const double HTTPClientSession::_defaultKeepAliveReliabilityLevel = 0.9;
 
 
 HTTPClientSession::HTTPClientSession():
@@ -220,17 +221,53 @@ void HTTPClientSession::setGlobalProxyConfig(const ProxyConfig& config)
 
 void HTTPClientSession::setKeepAliveTimeout(const Poco::Timespan& timeout)
 {
-	_keepAliveTimeout = timeout;
+    if (connected())
+    {
+        throw Poco::IllegalStateException("cannot change keep alive timeout on initiated connection, "
+                                          "That value is managed privately after connection is established.");
+    }
+    _keepAliveTimeout = timeout;
+}
+
+
+void HTTPClientSession::setKeepAliveMaxRequests(int max_requests)
+{
+    if (connected())
+    {
+        throw Poco::IllegalStateException("cannot change keep alive max requests on initiated connection, "
+                                          "That value is managed privately after connection is established.");
+    }
+    _keepAliveMaxRequests = max_requests;
+}
+
+
+void HTTPClientSession::setKeepAliveRequest(int request)
+{
+    _keepAliveCurrentRequest = request;
+}
+
+
+
+void HTTPClientSession::setLastRequest(Poco::Timestamp time)
+{
+    if (connected())
+    {
+        throw Poco::IllegalStateException("cannot change last request on initiated connection, "
+                                          "That value is managed privately after connection is established.");
+    }
+    _lastRequest = time;
 }
 
 
 std::ostream& HTTPClientSession::sendRequest(HTTPRequest& request)
 {
 	_pRequestStream = 0;
-	_pResponseStream = 0;
+    _pResponseStream = 0;
 	clearException();
 	_responseReceived = false;
 
+    _keepAliveCurrentRequest += 1;
+
 	bool keepAlive = getKeepAlive();
 	if (((connected() && !keepAlive) || mustReconnect()) && !_host.empty())
 	{
@@ -241,8 +278,10 @@ std::ostream& HTTPClientSession::sendRequest(HTTPRequest& request)
 	{
 		if (!connected())
 			reconnect();
-		if (!keepAlive)
-			request.setKeepAlive(false);
+        if (!request.has(HTTPMessage::CONNECTION))
+            request.setKeepAlive(keepAlive);
+        if (keepAlive && !request.has(HTTPMessage::CONNECTION_KEEP_ALIVE) && _keepAliveTimeout.totalSeconds() > 0)
+            request.setKeepAliveTimeout(_keepAliveTimeout.totalSeconds(), _keepAliveMaxRequests);
 		if (!request.has(HTTPRequest::HOST) && !_host.empty())
 			request.setHost(_host, _port);
 		if (!_proxyConfig.host.empty() && !bypassProxy())
@@ -324,6 +363,17 @@ std::istream& HTTPClientSession::receiveResponse(HTTPResponse& response)
 
 	_mustReconnect = getKeepAlive() && !response.getKeepAlive();
 
+    if (!_mustReconnect)
+    {
+        /// when server sends its keep alive timeout, client has to follow that value
+        auto timeout = response.getKeepAliveTimeout();
+        if (timeout > 0)
+            _keepAliveTimeout = std::min(_keepAliveTimeout, Poco::Timespan(timeout, 0));
+        auto max_requests = response.getKeepAliveMaxRequests();
+        if (max_requests > 0)
+            _keepAliveMaxRequests = std::min(_keepAliveMaxRequests, max_requests);
+    }
+
 	if (!_expectResponseBody || response.getStatus() < 200 || response.getStatus() == HTTPResponse::HTTP_NO_CONTENT || response.getStatus() == HTTPResponse::HTTP_NOT_MODIFIED)
 		_pResponseStream = new HTTPFixedLengthInputStream(*this, 0);
 	else if (response.getChunkedTransferEncoding())
@@ -430,15 +480,18 @@ std::string HTTPClientSession::proxyRequestPrefix() const
 	return result;
 }
 
+bool HTTPClientSession::isKeepAliveExpired(double reliability) const
+{
+    Poco::Timestamp now;
+    return Timespan(Timestamp::TimeDiff(reliability *_keepAliveTimeout.totalMicroseconds())) <= now - _lastRequest
+            || _keepAliveCurrentRequest > _keepAliveMaxRequests;
+}
 
 bool HTTPClientSession::mustReconnect() const
 {
 	if (!_mustReconnect)
-	{
-		Poco::Timestamp now;
-		return _keepAliveTimeout <= now - _lastRequest;
-	}
-	else return true;
+        return isKeepAliveExpired(_defaultKeepAliveReliabilityLevel);
+    return true;
 }
 
 
@@ -501,5 +554,33 @@ bool HTTPClientSession::bypassProxy() const
 	else return false;
 }
 
+void HTTPClientSession::assign(Poco::Net::HTTPClientSession & session)
+{
+    poco_assert (this != &session);
+
+    if (session.buffered())
+        throw Poco::LogicException("assign a session with not empty buffered data");
+
+    if (buffered())
+        throw Poco::LogicException("assign to a session with not empty buffered data");
+
+    poco_assert(!connected());
+
+    setResolvedHost(session.getResolvedHost());
+    setProxyConfig(session.getProxyConfig());
+
+    setTimeout(session.getConnectionTimeout(), session.getSendTimeout(), session.getReceiveTimeout());
+    setKeepAlive(session.getKeepAlive());
+
+    setLastRequest(session.getLastRequest());
+    setKeepAliveTimeout(session.getKeepAliveTimeout());
+
+    _keepAliveMaxRequests = session._keepAliveMaxRequests;
+    _keepAliveCurrentRequest = session._keepAliveCurrentRequest;
+
+    attachSocket(session.detachSocket());
+
+    session.reset();
+}
 
 } } // namespace Poco::Net
diff --git a/base/poco/Net/src/HTTPFixedLengthStream.cpp b/base/poco/Net/src/HTTPFixedLengthStream.cpp
index fd77ff71cd9..837e5723c57 100644
--- a/base/poco/Net/src/HTTPFixedLengthStream.cpp
+++ b/base/poco/Net/src/HTTPFixedLengthStream.cpp
@@ -43,6 +43,12 @@ HTTPFixedLengthStreamBuf::~HTTPFixedLengthStreamBuf()
 }
 
 
+bool HTTPFixedLengthStreamBuf::isComplete() const
+{
+    return _count == _length;
+}
+
+
 int HTTPFixedLengthStreamBuf::readFromDevice(char* buffer, std::streamsize length)
 {
 	int n = 0;
diff --git a/base/poco/Net/src/HTTPMessage.cpp b/base/poco/Net/src/HTTPMessage.cpp
index 0cd234ee9cb..c0083ec410c 100644
--- a/base/poco/Net/src/HTTPMessage.cpp
+++ b/base/poco/Net/src/HTTPMessage.cpp
@@ -17,6 +17,7 @@
 #include "Poco/NumberFormatter.h"
 #include "Poco/NumberParser.h"
 #include "Poco/String.h"
+#include <format>
 
 
 using Poco::NumberFormatter;
@@ -179,4 +180,51 @@ bool HTTPMessage::getKeepAlive() const
 }
 
 
+void HTTPMessage::setKeepAliveTimeout(int timeout, int max_requests)
+{
+    add(HTTPMessage::CONNECTION_KEEP_ALIVE, std::format("timeout={}, max={}", timeout, max_requests));
+}
+
+
+int parseFromHeaderValues(const std::string_view header_value, const std::string_view param_name)
+{
+    auto param_value_pos = header_value.find(param_name);
+    if (param_value_pos == std::string::npos)
+        param_value_pos = header_value.size();
+    if (param_value_pos != header_value.size())
+        param_value_pos += param_name.size();
+
+    auto param_value_end = header_value.find(',', param_value_pos);
+    if (param_value_end == std::string::npos)
+        param_value_end = header_value.size();
+
+    auto timeout_value_substr = header_value.substr(param_value_pos, param_value_end - param_value_pos);
+    if (timeout_value_substr.empty())
+        return -1;
+
+    int value = 0;
+    auto [ptr, ec] = std::from_chars(timeout_value_substr.begin(), timeout_value_substr.end(), value);
+
+    if (ec == std::errc())
+        return value;
+
+    return -1;
+}
+
+
+int HTTPMessage::getKeepAliveTimeout() const
+{
+    const std::string& ka_header = get(HTTPMessage::CONNECTION_KEEP_ALIVE, HTTPMessage::EMPTY);
+    static const std::string_view timeout_param = "timeout=";
+    return parseFromHeaderValues(ka_header, timeout_param);
+}
+
+
+int HTTPMessage::getKeepAliveMaxRequests() const
+{
+    const std::string& ka_header = get(HTTPMessage::CONNECTION_KEEP_ALIVE, HTTPMessage::EMPTY);
+    static const std::string_view timeout_param = "max=";
+    return parseFromHeaderValues(ka_header, timeout_param);
+}
+
 } } // namespace Poco::Net
diff --git a/base/poco/Net/src/HTTPServerConnection.cpp b/base/poco/Net/src/HTTPServerConnection.cpp
index c57984b0162..d5eb29d3134 100644
--- a/base/poco/Net/src/HTTPServerConnection.cpp
+++ b/base/poco/Net/src/HTTPServerConnection.cpp
@@ -88,7 +88,18 @@ void HTTPServerConnection::run()
 					
 						pHandler->handleRequest(request, response);
 						session.setKeepAlive(_pParams->getKeepAlive() && response.getKeepAlive() && session.canKeepAlive());
-					}
+
+                        /// all that fuzz is all about to make session close with less timeout than 15s (set in HTTPServerParams c-tor)
+                        if (_pParams->getKeepAlive() && response.getKeepAlive() && session.canKeepAlive())
+                        {
+                            int value = response.getKeepAliveTimeout();
+                            if (value < 0)
+                                value = request.getKeepAliveTimeout();
+                            if (value > 0)
+                                session.setKeepAliveTimeout(Poco::Timespan(value, 0));
+                        }
+
+                    }
 					else sendErrorResponse(session, HTTPResponse::HTTP_NOT_IMPLEMENTED);
 				}
 				catch (Poco::Exception&)
diff --git a/base/poco/Net/src/HTTPServerSession.cpp b/base/poco/Net/src/HTTPServerSession.cpp
index d4f2b24879e..f67a63a9e0e 100644
--- a/base/poco/Net/src/HTTPServerSession.cpp
+++ b/base/poco/Net/src/HTTPServerSession.cpp
@@ -33,6 +33,12 @@ HTTPServerSession::~HTTPServerSession()
 {
 }
 
+void HTTPServerSession::setKeepAliveTimeout(Poco::Timespan keepAliveTimeout)
+{
+    _keepAliveTimeout = keepAliveTimeout;
+}
+
+
 
 bool HTTPServerSession::hasMoreRequests()
 {
diff --git a/base/poco/Net/src/TCPServerDispatcher.cpp b/base/poco/Net/src/TCPServerDispatcher.cpp
index 20a1ffe1b4f..7f9f9a20ee7 100644
--- a/base/poco/Net/src/TCPServerDispatcher.cpp
+++ b/base/poco/Net/src/TCPServerDispatcher.cpp
@@ -93,7 +93,7 @@ void TCPServerDispatcher::release()
 
 void TCPServerDispatcher::run()
 {
-	AutoPtr<TCPServerDispatcher> guard(this, true); // ensure object stays alive
+	AutoPtr<TCPServerDispatcher> guard(this); // ensure object stays alive
 
 	int idleTime = (int) _pParams->getThreadIdleTime().totalMilliseconds();
 
@@ -149,11 +149,13 @@ void TCPServerDispatcher::enqueue(const StreamSocket& socket)
 		{
 			try
 			{
+                this->duplicate();
 				_threadPool.startWithPriority(_pParams->getThreadPriority(), *this, threadName);
 				++_currentThreads;
 			}
 			catch (Poco::Exception& exc)
 			{
+                this->release();
 				++_refusedConnections;
 				std::cerr << "Got exception while starting thread for connection. Error code: "
 						  << exc.code() << ", message: '" << exc.displayText() << "'" << std::endl;
diff --git a/cmake/autogenerated_versions.txt b/cmake/autogenerated_versions.txt
index e5a8c064808..26cb0eb23c6 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 54482)
+SET(VERSION_REVISION 54485)
 SET(VERSION_MAJOR 24)
-SET(VERSION_MINOR 1)
+SET(VERSION_MINOR 4)
 SET(VERSION_PATCH 1)
-SET(VERSION_GITHASH a2faa65b080a587026c86844f3a20c74d23a86f8)
-SET(VERSION_DESCRIBE v24.1.1.1-testing)
-SET(VERSION_STRING 24.1.1.1)
+SET(VERSION_GITHASH 2c5c589a882ceec35439650337b92db3e76f0081)
+SET(VERSION_DESCRIBE v24.4.1.1-testing)
+SET(VERSION_STRING 24.4.1.1)
 # end of autochange
diff --git a/cmake/fuzzer.cmake b/cmake/fuzzer.cmake
deleted file mode 100644
index dd0c4b080fe..00000000000
--- a/cmake/fuzzer.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# see ./CMakeLists.txt for variable declaration
-if (FUZZER)
-    if (FUZZER STREQUAL "libfuzzer")
-        # NOTE: Eldar Zaitov decided to name it "libfuzzer" instead of "fuzzer" to keep in mind another possible fuzzer backends.
-        # NOTE: no-link means that all the targets are built with instrumentation for fuzzer, but only some of them
-        # (tests) have entry point for fuzzer and it's not checked.
-        set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link -DFUZZER=1")
-        set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SAN_FLAGS} -fsanitize=fuzzer-no-link -DFUZZER=1")
-
-        # NOTE: oss-fuzz can change LIB_FUZZING_ENGINE variable
-        if (NOT LIB_FUZZING_ENGINE)
-            set (LIB_FUZZING_ENGINE "-fsanitize=fuzzer")
-        endif ()
-    else ()
-        message (FATAL_ERROR "Unknown fuzzer type: ${FUZZER}")
-    endif ()
-endif()
diff --git a/cmake/sanitize.cmake b/cmake/sanitize.cmake
index 3f7a8498059..9d53b2004b4 100644
--- a/cmake/sanitize.cmake
+++ b/cmake/sanitize.cmake
@@ -30,7 +30,7 @@ if (SANITIZE)
     elseif (SANITIZE STREQUAL "thread")
         set (TSAN_FLAGS "-fsanitize=thread")
         if (COMPILER_CLANG)
-            set (TSAN_FLAGS "${TSAN_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tests/tsan_suppressions.txt")
+            set (TSAN_FLAGS "${TSAN_FLAGS} -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/tests/tsan_ignorelist.txt")
         endif()
 
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${TSAN_FLAGS}")
@@ -48,7 +48,7 @@ if (SANITIZE)
             set(UBSAN_FLAGS "${UBSAN_FLAGS} -fno-sanitize=unsigned-integer-overflow")
         endif()
         if (COMPILER_CLANG)
-            set (UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize-blacklist=${PROJECT_SOURCE_DIR}/tests/ubsan_suppressions.txt")
+            set (UBSAN_FLAGS "${UBSAN_FLAGS} -fsanitize-ignorelist=${PROJECT_SOURCE_DIR}/tests/ubsan_ignorelist.txt")
         endif()
 
         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SAN_FLAGS} ${UBSAN_FLAGS}")
@@ -63,14 +63,14 @@ endif()
 option(WITH_COVERAGE "Instrumentation for code coverage with default implementation" OFF)
 
 if (WITH_COVERAGE)
-    message (INFORMATION "Enabled instrumentation for code coverage")
+    message (STATUS "Enabled instrumentation for code coverage")
     set(COVERAGE_FLAGS "-fprofile-instr-generate -fcoverage-mapping")
 endif()
 
 option (SANITIZE_COVERAGE "Instrumentation for code coverage with custom callbacks" OFF)
 
 if (SANITIZE_COVERAGE)
-    message (INFORMATION "Enabled instrumentation for code coverage")
+    message (STATUS "Enabled instrumentation for code coverage")
 
     # We set this define for whole build to indicate that at least some parts are compiled with coverage.
     # And to expose it in system.build_options.
@@ -79,6 +79,10 @@ if (SANITIZE_COVERAGE)
 
     # But the actual coverage will be enabled on per-library basis: for ClickHouse code, but not for 3rd-party.
     set (COVERAGE_FLAGS "-fsanitize-coverage=trace-pc-guard,pc-table")
-endif()
 
-set (WITHOUT_COVERAGE_FLAGS "-fno-profile-instr-generate -fno-coverage-mapping -fno-sanitize-coverage=trace-pc-guard,pc-table")
+    set (WITHOUT_COVERAGE_FLAGS "-fno-profile-instr-generate -fno-coverage-mapping -fno-sanitize-coverage=trace-pc-guard,pc-table")
+    set (WITHOUT_COVERAGE_FLAGS_LIST -fno-profile-instr-generate -fno-coverage-mapping -fno-sanitize-coverage=trace-pc-guard,pc-table)
+else()
+    set (WITHOUT_COVERAGE_FLAGS "")
+    set (WITHOUT_COVERAGE_FLAGS_LIST "")
+endif()
diff --git a/cmake/warnings.cmake b/cmake/warnings.cmake
index 00fa32a6b7f..455e4f09939 100644
--- a/cmake/warnings.cmake
+++ b/cmake/warnings.cmake
@@ -46,5 +46,6 @@ if (COMPILER_CLANG)
     no_warning(thread-safety-negative) # experimental flag, too many false positives
     no_warning(enum-constexpr-conversion) # breaks magic-enum library in clang-16
     no_warning(unsafe-buffer-usage) # too aggressive
+    no_warning(switch-default) # conflicts with "defaults in a switch covering all enum values"
     # TODO Enable conversion, sign-conversion, double-promotion warnings.
 endif ()
diff --git a/contrib/NuRaft b/contrib/NuRaft
index 1278e32bb0d..cb5dc3c906e 160000
--- a/contrib/NuRaft
+++ b/contrib/NuRaft
@@ -1 +1 @@
-Subproject commit 1278e32bb0d5dc489f947e002bdf8c71b0ddaa63
+Subproject commit cb5dc3c906e80f253e9ce9535807caef827cc2e0
diff --git a/contrib/avro b/contrib/avro
index 2fb8a8a6ec0..d43acc84d3d 160000
--- a/contrib/avro
+++ b/contrib/avro
@@ -1 +1 @@
-Subproject commit 2fb8a8a6ec0eab9109b68abf3b4857e8c476b918
+Subproject commit d43acc84d3d455b016f847d6666fbc3cd27f16a9
diff --git a/contrib/avro-cmake/CMakeLists.txt b/contrib/avro-cmake/CMakeLists.txt
index 63b3854eef9..96f740b6dd2 100644
--- a/contrib/avro-cmake/CMakeLists.txt
+++ b/contrib/avro-cmake/CMakeLists.txt
@@ -59,12 +59,3 @@ target_link_libraries (_avrocpp PRIVATE boost::headers_only boost::iostreams)
 target_compile_definitions (_avrocpp PUBLIC SNAPPY_CODEC_AVAILABLE)
 target_include_directories (_avrocpp PRIVATE ${SNAPPY_INCLUDE_DIR})
 target_link_libraries (_avrocpp PRIVATE ch_contrib::snappy)
-
-# create a symlink to include headers with <avro/...>
-set(AVRO_INCLUDE_DIR "${CMAKE_CURRENT_BINARY_DIR}/include")
-ADD_CUSTOM_TARGET(avro_symlink_headers ALL
-    COMMAND ${CMAKE_COMMAND} -E make_directory "${AVRO_INCLUDE_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E create_symlink "${AVROCPP_ROOT_DIR}/api" "${AVRO_INCLUDE_DIR}/avro"
-)
-add_dependencies(_avrocpp avro_symlink_headers)
-target_include_directories(_avrocpp SYSTEM BEFORE PUBLIC "${AVRO_INCLUDE_DIR}")
diff --git a/contrib/aws b/contrib/aws
index ca02358dcc7..32870e234ca 160000
--- a/contrib/aws
+++ b/contrib/aws
@@ -1 +1 @@
-Subproject commit ca02358dcc7ce3ab733dd4cbcc32734eecfa4ee3
+Subproject commit 32870e234cac03e0ac46370c26858b0ffdf14200
diff --git a/contrib/aws-c-auth b/contrib/aws-c-auth
index 97133a2b5db..baeffa791d9 160000
--- a/contrib/aws-c-auth
+++ b/contrib/aws-c-auth
@@ -1 +1 @@
-Subproject commit 97133a2b5dbca1ccdf88cd6f44f39d0531d27d12
+Subproject commit baeffa791d9d1cf61460662a6d9ac2186aaf05df
diff --git a/contrib/aws-c-cal b/contrib/aws-c-cal
index 85dd7664b78..9453687ff54 160000
--- a/contrib/aws-c-cal
+++ b/contrib/aws-c-cal
@@ -1 +1 @@
-Subproject commit 85dd7664b786a389c6fb1a6f031ab4bb2282133d
+Subproject commit 9453687ff5493ba94eaccf8851200565c4364c77
diff --git a/contrib/aws-c-common b/contrib/aws-c-common
index 45dcb2849c8..80f21b3cac5 160000
--- a/contrib/aws-c-common
+++ b/contrib/aws-c-common
@@ -1 +1 @@
-Subproject commit 45dcb2849c891dba2100b270b4676765c92949ff
+Subproject commit 80f21b3cac5ac51c6b8a62c7d2a5ef58a75195ee
diff --git a/contrib/aws-c-compression b/contrib/aws-c-compression
index b517b7decd0..99ec79ee297 160000
--- a/contrib/aws-c-compression
+++ b/contrib/aws-c-compression
@@ -1 +1 @@
-Subproject commit b517b7decd0dac30be2162f5186c250221c53aff
+Subproject commit 99ec79ee2970f1a045d4ced1501b97ee521f2f85
diff --git a/contrib/aws-c-event-stream b/contrib/aws-c-event-stream
index 2f9b60c42f9..08f24e384e5 160000
--- a/contrib/aws-c-event-stream
+++ b/contrib/aws-c-event-stream
@@ -1 +1 @@
-Subproject commit 2f9b60c42f90840ec11822acda3d8cdfa97a773d
+Subproject commit 08f24e384e5be20bcffa42b49213d24dad7881ae
diff --git a/contrib/aws-c-http b/contrib/aws-c-http
index dd344619879..a082f8a2067 160000
--- a/contrib/aws-c-http
+++ b/contrib/aws-c-http
@@ -1 +1 @@
-Subproject commit dd34461987947672444d0bc872c5a733dfdb9711
+Subproject commit a082f8a2067e4a31db73f1d4ffd702a8dc0f7089
diff --git a/contrib/aws-c-io b/contrib/aws-c-io
index d58ed4f272b..11ce3c750a1 160000
--- a/contrib/aws-c-io
+++ b/contrib/aws-c-io
@@ -1 +1 @@
-Subproject commit d58ed4f272b1cb4f89ac9196526ceebe5f2b0d89
+Subproject commit 11ce3c750a1dac7b04069fc5bff89e97e91bad4d
diff --git a/contrib/aws-c-mqtt b/contrib/aws-c-mqtt
index 33c3455cec8..6d36cd37262 160000
--- a/contrib/aws-c-mqtt
+++ b/contrib/aws-c-mqtt
@@ -1 +1 @@
-Subproject commit 33c3455cec82b16feb940e12006cefd7b3ef4194
+Subproject commit 6d36cd3726233cb757468d0ea26f6cd8dad151ec
diff --git a/contrib/aws-c-s3 b/contrib/aws-c-s3
index d7bfe602d69..de36fee8fe7 160000
--- a/contrib/aws-c-s3
+++ b/contrib/aws-c-s3
@@ -1 +1 @@
-Subproject commit d7bfe602d6925948f1fff95784e3613cca6a3900
+Subproject commit de36fee8fe7ab02f10987877ae94a805bf440c1f
diff --git a/contrib/aws-c-sdkutils b/contrib/aws-c-sdkutils
index 208a701fa01..fd8c0ba2e23 160000
--- a/contrib/aws-c-sdkutils
+++ b/contrib/aws-c-sdkutils
@@ -1 +1 @@
-Subproject commit 208a701fa01e99c7c8cc3dcebc8317da71362972
+Subproject commit fd8c0ba2e233997eaaefe82fb818b8b444b956d3
diff --git a/contrib/aws-checksums b/contrib/aws-checksums
index ad53be196a2..321b805559c 160000
--- a/contrib/aws-checksums
+++ b/contrib/aws-checksums
@@ -1 +1 @@
-Subproject commit ad53be196a25bbefa3700a01187fdce573a7d2d0
+Subproject commit 321b805559c8e911be5bddba13fcbd222a3e2d3a
diff --git a/contrib/aws-cmake/CMakeLists.txt b/contrib/aws-cmake/CMakeLists.txt
index 950a0e06cd0..abde20addaf 100644
--- a/contrib/aws-cmake/CMakeLists.txt
+++ b/contrib/aws-cmake/CMakeLists.txt
@@ -25,6 +25,7 @@ include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsFeatureTests.cmake")
 include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsThreadAffinity.cmake")
 include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsThreadName.cmake")
 include("${ClickHouse_SOURCE_DIR}/contrib/aws-cmake/AwsSIMD.cmake")
+include("${ClickHouse_SOURCE_DIR}/contrib/aws-crt-cpp/cmake/AwsGetVersion.cmake")
 
 
 # Gather sources and options.
@@ -35,6 +36,8 @@ set(AWS_PUBLIC_COMPILE_DEFS)
 set(AWS_PRIVATE_COMPILE_DEFS)
 set(AWS_PRIVATE_LIBS)
 
+list(APPEND AWS_PRIVATE_COMPILE_DEFS "-DINTEL_NO_ITTNOTIFY_API")
+
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
     list(APPEND AWS_PRIVATE_COMPILE_DEFS "-DDEBUG_BUILD")
 endif()
@@ -85,14 +88,20 @@ file(GLOB AWS_SDK_CORE_SRC
     "${AWS_SDK_CORE_DIR}/source/external/cjson/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/external/tinyxml2/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/http/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/http/crt/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/http/standard/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/internal/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/monitoring/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/net/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/net/linux-shared/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/platform/linux-shared/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/smithy/tracing/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/base64/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/utils/component-registry/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/crypto/*.cpp"
-    "${AWS_SDK_CORE_DIR}/source/utils/crypto/openssl/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/crypto/factory/*.cpp"
+    "${AWS_SDK_CORE_DIR}/source/utils/crypto/openssl/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/event/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/json/*.cpp"
     "${AWS_SDK_CORE_DIR}/source/utils/logging/*.cpp"
@@ -115,9 +124,8 @@ OPTION(USE_AWS_MEMORY_MANAGEMENT "Aws memory management" OFF)
 configure_file("${AWS_SDK_CORE_DIR}/include/aws/core/SDKConfig.h.in"
     "${CMAKE_CURRENT_BINARY_DIR}/include/aws/core/SDKConfig.h" @ONLY)
 
-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")
+aws_get_version(AWS_CRT_CPP_VERSION_MAJOR AWS_CRT_CPP_VERSION_MINOR AWS_CRT_CPP_VERSION_PATCH FULL_VERSION GIT_HASH)
+configure_file("${AWS_CRT_DIR}/include/aws/crt/Config.h.in" "${AWS_CRT_DIR}/include/aws/crt/Config.h" @ONLY)
 
 list(APPEND AWS_SOURCES ${AWS_SDK_CORE_SRC} ${AWS_SDK_CORE_NET_SRC} ${AWS_SDK_CORE_PLATFORM_SRC})
 
@@ -176,6 +184,7 @@ file(GLOB AWS_COMMON_SRC
     "${AWS_COMMON_DIR}/source/*.c"
     "${AWS_COMMON_DIR}/source/external/*.c"
     "${AWS_COMMON_DIR}/source/posix/*.c"
+    "${AWS_COMMON_DIR}/source/linux/*.c"
 )
 
 file(GLOB AWS_COMMON_ARCH_SRC
diff --git a/contrib/aws-crt-cpp b/contrib/aws-crt-cpp
index 8a301b7e842..f532d6abc0d 160000
--- a/contrib/aws-crt-cpp
+++ b/contrib/aws-crt-cpp
@@ -1 +1 @@
-Subproject commit 8a301b7e842f1daed478090c869207300972379f
+Subproject commit f532d6abc0d2b0d8b5d6fe9e7c51eaedbe4afbd0
diff --git a/contrib/aws-s2n-tls b/contrib/aws-s2n-tls
index 71f4794b758..9a1e7545402 160000
--- a/contrib/aws-s2n-tls
+++ b/contrib/aws-s2n-tls
@@ -1 +1 @@
-Subproject commit 71f4794b7580cf780eb4aca77d69eded5d3c7bb4
+Subproject commit 9a1e75454023e952b366ce1eab9c54007250119f
diff --git a/contrib/boost-cmake/CMakeLists.txt b/contrib/boost-cmake/CMakeLists.txt
index 343e863e496..2c60fc0e552 100644
--- a/contrib/boost-cmake/CMakeLists.txt
+++ b/contrib/boost-cmake/CMakeLists.txt
@@ -44,12 +44,14 @@ set (SRCS_IOSTREAMS
     "${LIBRARY_DIR}/libs/iostreams/src/gzip.cpp"
     "${LIBRARY_DIR}/libs/iostreams/src/mapped_file.cpp"
     "${LIBRARY_DIR}/libs/iostreams/src/zlib.cpp"
+    "${LIBRARY_DIR}/libs/iostreams/src/zstd.cpp"
 )
 
 add_library (_boost_iostreams ${SRCS_IOSTREAMS})
 add_library (boost::iostreams ALIAS _boost_iostreams)
 target_include_directories (_boost_iostreams PRIVATE ${LIBRARY_DIR})
 target_link_libraries (_boost_iostreams PRIVATE ch_contrib::zlib)
+target_link_libraries (_boost_iostreams PRIVATE ch_contrib::zstd)
 
 # program_options
 
diff --git a/contrib/c-ares-cmake/CMakeLists.txt b/contrib/c-ares-cmake/CMakeLists.txt
index 86ab6f90260..daec96ff1b1 100644
--- a/contrib/c-ares-cmake/CMakeLists.txt
+++ b/contrib/c-ares-cmake/CMakeLists.txt
@@ -86,6 +86,8 @@ elseif (OS_DARWIN)
     target_compile_definitions(_c-ares PRIVATE -D_DARWIN_C_SOURCE)
 elseif (OS_FREEBSD)
     target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/freebsd")
+elseif (OS_SUNOS)
+    target_include_directories(_c-ares SYSTEM PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/c-ares-cmake/solaris")
 endif()
 
 add_library(ch_contrib::c-ares ALIAS _c-ares)
diff --git a/contrib/c-ares-cmake/solaris/ares_build.h b/contrib/c-ares-cmake/solaris/ares_build.h
new file mode 100644
index 00000000000..f42b59d07bd
--- /dev/null
+++ b/contrib/c-ares-cmake/solaris/ares_build.h
@@ -0,0 +1,104 @@
+/* include/ares_build.h.  Generated from ares_build.h.in by configure.  */
+#ifndef __CARES_BUILD_H
+#define __CARES_BUILD_H
+
+
+/* Copyright (C) 2009 - 2021 by Daniel Stenberg et al
+ *
+ * Permission to use, copy, modify, and distribute this software and its
+ * documentation for any purpose and without fee is hereby granted, provided
+ * that the above copyright notice appear in all copies and that both that
+ * copyright notice and this permission notice appear in supporting
+ * documentation, and that the name of M.I.T. not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  M.I.T. makes no representations about the
+ * suitability of this software for any purpose.  It is provided "as is"
+ * without express or implied warranty.
+ */
+
+/* ================================================================ */
+/*               NOTES FOR CONFIGURE CAPABLE SYSTEMS                */
+/* ================================================================ */
+
+/*
+ * NOTE 1:
+ * -------
+ *
+ * Nothing in this file is intended to be modified or adjusted by the
+ * c-ares library user nor by the c-ares library builder.
+ *
+ * If you think that something actually needs to be changed, adjusted
+ * or fixed in this file, then, report it on the c-ares development
+ * mailing list: http://lists.haxx.se/listinfo/c-ares/
+ *
+ * This header file shall only export symbols which are 'cares' or 'CARES'
+ * prefixed, otherwise public name space would be polluted.
+ *
+ * NOTE 2:
+ * -------
+ *
+ * Right now you might be staring at file ares_build.h.in or ares_build.h,
+ * this is due to the following reason:
+ *
+ * On systems capable of running the configure script, the configure process
+ * will overwrite the distributed ares_build.h file with one that is suitable
+ * and specific to the library being configured and built, which is generated
+ * from the ares_build.h.in template file.
+ *
+ */
+
+/* ================================================================ */
+/*  DEFINITION OF THESE SYMBOLS SHALL NOT TAKE PLACE ANYWHERE ELSE  */
+/* ================================================================ */
+
+#ifdef CARES_TYPEOF_ARES_SOCKLEN_T
+#  error "CARES_TYPEOF_ARES_SOCKLEN_T shall not be defined except in ares_build.h"
+   Error Compilation_aborted_CARES_TYPEOF_ARES_SOCKLEN_T_already_defined
+#endif
+
+#define CARES_HAVE_ARPA_NAMESER_H 1
+#define CARES_HAVE_ARPA_NAMESER_COMPAT_H 1
+
+/* ================================================================ */
+/*  EXTERNAL INTERFACE SETTINGS FOR CONFIGURE CAPABLE SYSTEMS ONLY  */
+/* ================================================================ */
+
+/* Configure process defines this to 1 when it finds out that system  */
+/* header file ws2tcpip.h must be included by the external interface. */
+/* #undef CARES_PULL_WS2TCPIP_H */
+#ifdef CARES_PULL_WS2TCPIP_H
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#  include <winsock2.h>
+#  include <ws2tcpip.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system   */
+/* header file sys/types.h must be included by the external interface. */
+#define CARES_PULL_SYS_TYPES_H 1
+#ifdef CARES_PULL_SYS_TYPES_H
+#  include <sys/types.h>
+#endif
+
+/* Configure process defines this to 1 when it finds out that system    */
+/* header file sys/socket.h must be included by the external interface. */
+#define CARES_PULL_SYS_SOCKET_H 1
+#ifdef CARES_PULL_SYS_SOCKET_H
+#  include <sys/socket.h>
+#endif
+
+/* Integral data type used for ares_socklen_t. */
+#define CARES_TYPEOF_ARES_SOCKLEN_T socklen_t
+
+/* Data type definition of ares_socklen_t. */
+typedef CARES_TYPEOF_ARES_SOCKLEN_T ares_socklen_t;
+
+/* Integral data type used for ares_ssize_t. */
+#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
+
+/* Data type definition of ares_ssize_t. */
+typedef CARES_TYPEOF_ARES_SSIZE_T ares_ssize_t;
+
+#endif /* __CARES_BUILD_H */
diff --git a/contrib/c-ares-cmake/solaris/ares_config.h b/contrib/c-ares-cmake/solaris/ares_config.h
new file mode 100644
index 00000000000..c4ac5e38966
--- /dev/null
+++ b/contrib/c-ares-cmake/solaris/ares_config.h
@@ -0,0 +1,503 @@
+/* src/lib/ares_config.h.  Generated from ares_config.h.in by configure.  */
+/* src/lib/ares_config.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* define this if ares is built for a big endian system */
+/* #undef ARES_BIG_ENDIAN */
+
+/* Defined for build that exposes internal static functions for testing. */
+/* #undef CARES_EXPOSE_STATICS */
+
+/* a suitable file/device to read random data from */
+#define CARES_RANDOM_FILE "/dev/urandom"
+
+/* Defined for build with symbol hiding. */
+#define CARES_SYMBOL_HIDING 1
+
+/* Definition to make a library symbol externally visible. */
+#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
+
+/* the signed version of size_t */
+#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
+
+/* Use resolver library to configure cares */
+/* #undef CARES_USE_LIBRESOLV */
+
+/* if a /etc/inet dir is being used */
+#define ETC_INET 1
+
+/* Define to the type of arg 2 for gethostname. */
+#define GETHOSTNAME_TYPE_ARG2 int
+
+/* Define to the type qualifier of arg 1 for getnameinfo. */
+#define GETNAMEINFO_QUAL_ARG1 const
+
+/* Define to the type of arg 1 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
+
+/* Define to the type of arg 2 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG2 socklen_t
+
+/* Define to the type of args 4 and 6 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG46 socklen_t
+
+/* Define to the type of arg 7 for getnameinfo. */
+#define GETNAMEINFO_TYPE_ARG7 int
+
+/* Specifies the number of arguments to getservbyport_r */
+#define GETSERVBYPORT_R_ARGS 5
+
+/* Specifies the size of the buffer to pass to getservbyport_r */
+#define GETSERVBYPORT_R_BUFSIZE 4096
+
+/* Define to 1 if you have AF_INET6. */
+#define HAVE_AF_INET6 1
+
+/* Define to 1 if you have the <arpa/inet.h> header file. */
+#define HAVE_ARPA_INET_H 1
+
+/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
+#define HAVE_ARPA_NAMESER_COMPAT_H 1
+
+/* Define to 1 if you have the <arpa/nameser.h> header file. */
+#define HAVE_ARPA_NAMESER_H 1
+
+/* Define to 1 if you have the <assert.h> header file. */
+#define HAVE_ASSERT_H 1
+
+/* Define to 1 if you have the `bitncmp' function. */
+/* #undef HAVE_BITNCMP */
+
+/* Define to 1 if bool is an available type. */
+#define HAVE_BOOL_T 1
+
+/* Define to 1 if you have the clock_gettime function and monotonic timer. */
+#define HAVE_CLOCK_GETTIME_MONOTONIC 1
+
+/* Define to 1 if you have the closesocket function. */
+/* #undef HAVE_CLOSESOCKET */
+
+/* Define to 1 if you have the CloseSocket camel case function. */
+/* #undef HAVE_CLOSESOCKET_CAMEL */
+
+/* Define to 1 if you have the connect function. */
+#define HAVE_CONNECT 1
+
+/* define if the compiler supports basic C++11 syntax */
+#define HAVE_CXX11 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <errno.h> header file. */
+#define HAVE_ERRNO_H 1
+
+/* Define to 1 if you have the fcntl function. */
+#define HAVE_FCNTL 1
+
+/* Define to 1 if you have the <fcntl.h> header file. */
+#define HAVE_FCNTL_H 1
+
+/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
+#define HAVE_FCNTL_O_NONBLOCK 1
+
+/* Define to 1 if you have the freeaddrinfo function. */
+#define HAVE_FREEADDRINFO 1
+
+/* Define to 1 if you have a working getaddrinfo function. */
+#define HAVE_GETADDRINFO 1
+
+/* Define to 1 if the getaddrinfo function is threadsafe. */
+#define HAVE_GETADDRINFO_THREADSAFE 1
+
+/* Define to 1 if you have the getenv function. */
+#define HAVE_GETENV 1
+
+/* Define to 1 if you have the gethostbyaddr function. */
+#define HAVE_GETHOSTBYADDR 1
+
+/* Define to 1 if you have the gethostbyname function. */
+#define HAVE_GETHOSTBYNAME 1
+
+/* Define to 1 if you have the gethostname function. */
+#define HAVE_GETHOSTNAME 1
+
+/* Define to 1 if you have the getnameinfo function. */
+#define HAVE_GETNAMEINFO 1
+
+/* Define to 1 if you have the getservbyport_r function. */
+#define HAVE_GETSERVBYPORT_R 1
+
+/* Define to 1 if you have the `gettimeofday' function. */
+#define HAVE_GETTIMEOFDAY 1
+
+/* Define to 1 if you have the `if_indextoname' function. */
+#define HAVE_IF_INDEXTONAME 1
+
+/* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
+/* #undef HAVE_INET_NET_PTON */
+
+/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
+#define HAVE_INET_NTOP 1
+
+/* Define to 1 if you have a IPv6 capable working inet_pton function. */
+#define HAVE_INET_PTON 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the ioctl function. */
+#define HAVE_IOCTL 1
+
+/* Define to 1 if you have the ioctlsocket function. */
+/* #undef HAVE_IOCTLSOCKET */
+
+/* Define to 1 if you have the IoctlSocket camel case function. */
+/* #undef HAVE_IOCTLSOCKET_CAMEL */
+
+/* Define to 1 if you have a working IoctlSocket camel case FIONBIO function.
+   */
+/* #undef HAVE_IOCTLSOCKET_CAMEL_FIONBIO */
+
+/* Define to 1 if you have a working ioctlsocket FIONBIO function. */
+/* #undef HAVE_IOCTLSOCKET_FIONBIO */
+
+/* Define to 1 if you have a working ioctl FIONBIO function. */
+/* #undef HAVE_IOCTL_FIONBIO */
+
+/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
+/* #undef HAVE_IOCTL_SIOCGIFADDR */
+
+/* Define to 1 if you have the `resolve' library (-lresolve). */
+/* #undef HAVE_LIBRESOLVE */
+
+/* Define to 1 if you have the <limits.h> header file. */
+#define HAVE_LIMITS_H 1
+
+/* if your compiler supports LL */
+#define HAVE_LL 1
+
+/* Define to 1 if the compiler supports the 'long long' data type. */
+#define HAVE_LONGLONG 1
+
+/* Define to 1 if you have the malloc.h header file. */
+#define HAVE_MALLOC_H 1
+
+/* Define to 1 if you have the memory.h header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the MSG_NOSIGNAL flag. */
+#define HAVE_MSG_NOSIGNAL 1
+
+/* Define to 1 if you have the <netdb.h> header file. */
+#define HAVE_NETDB_H 1
+
+/* Define to 1 if you have the <netinet/in.h> header file. */
+#define HAVE_NETINET_IN_H 1
+
+/* Define to 1 if you have the <netinet/tcp.h> header file. */
+#define HAVE_NETINET_TCP_H 1
+
+/* Define to 1 if you have the <net/if.h> header file. */
+#define HAVE_NET_IF_H 1
+
+/* Define to 1 if you have PF_INET6. */
+#define HAVE_PF_INET6 1
+
+/* Define to 1 if you have the recv function. */
+#define HAVE_RECV 1
+
+/* Define to 1 if you have the recvfrom function. */
+#define HAVE_RECVFROM 1
+
+/* Define to 1 if you have the send function. */
+#define HAVE_SEND 1
+
+/* Define to 1 if you have the setsockopt function. */
+#define HAVE_SETSOCKOPT 1
+
+/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
+/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
+
+/* Define to 1 if you have the <signal.h> header file. */
+#define HAVE_SIGNAL_H 1
+
+/* Define to 1 if sig_atomic_t is an available typedef. */
+#define HAVE_SIG_ATOMIC_T 1
+
+/* Define to 1 if sig_atomic_t is already defined as volatile. */
+/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
+
+/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
+#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+
+/* Define to 1 if you have the socket function. */
+#define HAVE_SOCKET 1
+
+/* Define to 1 if you have the <socket.h> header file. */
+/* #undef HAVE_SOCKET_H */
+
+/* Define to 1 if you have the <stdbool.h> header file. */
+#define HAVE_STDBOOL_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdio.h> header file. */
+#define HAVE_STDIO_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the strcasecmp function. */
+#define HAVE_STRCASECMP 1
+
+/* Define to 1 if you have the strcmpi function. */
+/* #undef HAVE_STRCMPI */
+
+/* Define to 1 if you have the strdup function. */
+#define HAVE_STRDUP 1
+
+/* Define to 1 if you have the stricmp function. */
+/* #undef HAVE_STRICMP */
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the strncasecmp function. */
+#define HAVE_STRNCASECMP 1
+
+/* Define to 1 if you have the strncmpi function. */
+/* #undef HAVE_STRNCMPI */
+
+/* Define to 1 if you have the strnicmp function. */
+/* #undef HAVE_STRNICMP */
+
+/* Define to 1 if you have the <stropts.h> header file. */
+#define HAVE_STROPTS_H 1
+
+/* Define to 1 if you have struct addrinfo. */
+#define HAVE_STRUCT_ADDRINFO 1
+
+/* Define to 1 if you have struct in6_addr. */
+#define HAVE_STRUCT_IN6_ADDR 1
+
+/* Define to 1 if you have struct sockaddr_in6. */
+#define HAVE_STRUCT_SOCKADDR_IN6 1
+
+/* if struct sockaddr_storage is defined */
+#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+
+/* Define to 1 if you have the timeval struct. */
+#define HAVE_STRUCT_TIMEVAL 1
+
+/* Define to 1 if you have the <sys/ioctl.h> header file. */
+#define HAVE_SYS_IOCTL_H 1
+
+/* Define to 1 if you have the <sys/param.h> header file. */
+#define HAVE_SYS_PARAM_H 1
+
+/* Define to 1 if you have the <sys/select.h> header file. */
+#define HAVE_SYS_SELECT_H 1
+
+/* Define to 1 if you have the <sys/socket.h> header file. */
+#define HAVE_SYS_SOCKET_H 1
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/time.h> header file. */
+#define HAVE_SYS_TIME_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/uio.h> header file. */
+#define HAVE_SYS_UIO_H 1
+
+/* Define to 1 if you have the <time.h> header file. */
+#define HAVE_TIME_H 1
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#define HAVE_UNISTD_H 1
+
+/* Define to 1 if you have the windows.h header file. */
+/* #undef HAVE_WINDOWS_H */
+
+/* Define to 1 if you have the winsock2.h header file. */
+/* #undef HAVE_WINSOCK2_H */
+
+/* Define to 1 if you have the winsock.h header file. */
+/* #undef HAVE_WINSOCK_H */
+
+/* Define to 1 if you have the writev function. */
+#define HAVE_WRITEV 1
+
+/* Define to 1 if you have the ws2tcpip.h header file. */
+/* #undef HAVE_WS2TCPIP_H */
+
+/* Define if __system_property_get exists. */
+/* #undef HAVE___SYSTEM_PROPERTY_GET */
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#define LT_OBJDIR ".libs/"
+
+/* Define to 1 if you need the malloc.h header file even with stdlib.h */
+/* #undef NEED_MALLOC_H */
+
+/* Define to 1 if you need the memory.h header file even with stdlib.h */
+/* #undef NEED_MEMORY_H */
+
+/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
+#define NEED_REENTRANT 1
+
+/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
+/* #undef NEED_THREAD_SAFE */
+
+/* cpu-machine-OS */
+#define OS "x86_64-pc-solaris2.11"
+
+/* Name of package */
+#define PACKAGE "c-ares"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT "c-ares mailing list: http://lists.haxx.se/listinfo/c-ares"
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "c-ares"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "c-ares 1.18.1"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "c-ares"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.18.1"
+
+/* Define to the type qualifier pointed by arg 5 for recvfrom. */
+#define RECVFROM_QUAL_ARG5 
+
+/* Define to the type of arg 1 for recvfrom. */
+#define RECVFROM_TYPE_ARG1 int
+
+/* Define to the type pointed by arg 2 for recvfrom. */
+#define RECVFROM_TYPE_ARG2 void
+
+/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
+#define RECVFROM_TYPE_ARG2_IS_VOID 1
+
+/* Define to the type of arg 3 for recvfrom. */
+#define RECVFROM_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recvfrom. */
+#define RECVFROM_TYPE_ARG4 int
+
+/* Define to the type pointed by arg 5 for recvfrom. */
+#define RECVFROM_TYPE_ARG5 struct sockaddr
+
+/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
+/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
+
+/* Define to the type pointed by arg 6 for recvfrom. */
+#define RECVFROM_TYPE_ARG6 void
+
+/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
+#define RECVFROM_TYPE_ARG6_IS_VOID 1
+
+/* Define to the function return type for recvfrom. */
+#define RECVFROM_TYPE_RETV ssize_t
+
+/* Define to the type of arg 1 for recv. */
+#define RECV_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for recv. */
+#define RECV_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for recv. */
+#define RECV_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for recv. */
+#define RECV_TYPE_ARG4 int
+
+/* Define to the function return type for recv. */
+#define RECV_TYPE_RETV ssize_t
+
+/* Define as the return type of signal handlers (`int' or `void'). */
+#define RETSIGTYPE void
+
+/* Define to the type qualifier of arg 2 for send. */
+#define SEND_QUAL_ARG2 const
+
+/* Define to the type of arg 1 for send. */
+#define SEND_TYPE_ARG1 int
+
+/* Define to the type of arg 2 for send. */
+#define SEND_TYPE_ARG2 void *
+
+/* Define to the type of arg 3 for send. */
+#define SEND_TYPE_ARG3 size_t
+
+/* Define to the type of arg 4 for send. */
+#define SEND_TYPE_ARG4 int
+
+/* Define to the function return type for send. */
+#define SEND_TYPE_RETV ssize_t
+
+/* Define to 1 if all of the C90 standard headers exist (not just the ones
+   required in a freestanding environment). This macro is provided for
+   backward compatibility; new code need not use it. */
+#define STDC_HEADERS 1
+
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
+   macro is obsolete. */
+#define TIME_WITH_SYS_TIME 1
+
+/* Define to disable non-blocking sockets. */
+/* #undef USE_BLOCKING_SOCKETS */
+
+/* Version number of package */
+#define VERSION "1.18.1"
+
+/* Define to avoid automatic inclusion of winsock.h */
+/* #undef WIN32_LEAN_AND_MEAN */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if OS is AIX. */
+#ifndef _ALL_SOURCE
+/* #  undef _ALL_SOURCE */
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+/* Define to empty if `const' does not conform to ANSI C. */
+/* #undef const */
+
+/* Type to use in place of in_addr_t when system does not provide it. */
+/* #undef in_addr_t */
+
+/* Define to `unsigned int' if <sys/types.h> does not define. */
+/* #undef size_t */
diff --git a/contrib/cctz b/contrib/cctz
index 8529bcef5cd..7918cb7afe8 160000
--- a/contrib/cctz
+++ b/contrib/cctz
@@ -1 +1 @@
-Subproject commit 8529bcef5cd996b7c0f4d7475286b76b5d126c4c
+Subproject commit 7918cb7afe82e53428e39a045a437fdfd4f3df47
diff --git a/contrib/corrosion-cmake/CMakeLists.txt b/contrib/corrosion-cmake/CMakeLists.txt
index 8adc2c0b23a..4f60304d74d 100644
--- a/contrib/corrosion-cmake/CMakeLists.txt
+++ b/contrib/corrosion-cmake/CMakeLists.txt
@@ -1,8 +1,5 @@
 if (NOT ENABLE_LIBRARIES)
   set(DEFAULT_ENABLE_RUST FALSE)
-elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "aarch64"))
-  message(STATUS "Rust is not available on aarch64-apple-darwin")
-  set(DEFAULT_ENABLE_RUST FALSE)
 else()
   list (APPEND CMAKE_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake")
   find_package(Rust)
@@ -19,27 +16,30 @@ message(STATUS "Checking Rust toolchain for current target")
 
 # See https://doc.rust-lang.org/nightly/rustc/platform-support.html
 
-if((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
-    set(Rust_CARGO_TARGET "x86_64-unknown-linux-musl")
-elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
-    set(Rust_CARGO_TARGET "x86_64-unknown-linux-gnu")
-elseif((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
-    set(Rust_CARGO_TARGET "aarch64-unknown-linux-musl")
-elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
-    set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
-elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
-    set(Rust_CARGO_TARGET "x86_64-apple-darwin")
-elseif((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
-    set(Rust_CARGO_TARGET "x86_64-unknown-freebsd")
-elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-riscv64")
-    set(Rust_CARGO_TARGET "riscv64gc-unknown-linux-gnu")
-endif()
-
-if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
-    set(Rust_CARGO_TARGET "powerpc64le-unknown-linux-gnu")
-endif()
-
-message(STATUS "Switched Rust target to ${Rust_CARGO_TARGET}")
+if(DEFINED CMAKE_TOOLCHAIN_FILE)
+    if(CMAKE_TOOLCHAIN_FILE MATCHES "ppc64le")
+        set(Rust_CARGO_TARGET "powerpc64le-unknown-linux-gnu")
+    elseif((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
+        set(Rust_CARGO_TARGET "x86_64-unknown-linux-musl")
+    elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-x86_64")
+        set(Rust_CARGO_TARGET "x86_64-unknown-linux-gnu")
+    elseif((CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64") AND (CMAKE_TOOLCHAIN_FILE MATCHES "musl"))
+        set(Rust_CARGO_TARGET "aarch64-unknown-linux-musl")
+    elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-aarch64")
+        set(Rust_CARGO_TARGET "aarch64-unknown-linux-gnu")
+    elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
+        set(Rust_CARGO_TARGET "x86_64-apple-darwin")
+    elseif((CMAKE_TOOLCHAIN_FILE MATCHES "darwin") AND (CMAKE_TOOLCHAIN_FILE MATCHES "aarch64"))
+        set(Rust_CARGO_TARGET "aarch64-apple-darwin")
+    elseif((CMAKE_TOOLCHAIN_FILE MATCHES "freebsd") AND (CMAKE_TOOLCHAIN_FILE MATCHES "x86_64"))
+        set(Rust_CARGO_TARGET "x86_64-unknown-freebsd")
+    elseif(CMAKE_TOOLCHAIN_FILE MATCHES "linux/toolchain-riscv64")
+        set(Rust_CARGO_TARGET "riscv64gc-unknown-linux-gnu")
+    else()
+        message(FATAL_ERROR "Unsupported rust target")
+    endif()
+    message(STATUS "Switched Rust target to ${Rust_CARGO_TARGET}")
+endif ()
 
 # FindRust.cmake
 list(APPEND CMAKE_MODULE_PATH "${ClickHouse_SOURCE_DIR}/contrib/corrosion/cmake")
diff --git a/contrib/cppkafka b/contrib/cppkafka
index 5a119f689f8..9c5ea0e3324 160000
--- a/contrib/cppkafka
+++ b/contrib/cppkafka
@@ -1 +1 @@
-Subproject commit 5a119f689f8a4d90d10a9635e7ee2bee5c127de1
+Subproject commit 9c5ea0e332486961e612deacc6e3f0c1874c688d
diff --git a/contrib/curl b/contrib/curl
index d755a5f7c00..1a05e833f8f 160000
--- a/contrib/curl
+++ b/contrib/curl
@@ -1 +1 @@
-Subproject commit d755a5f7c009dd63a61b2c745180d8ba937cbfeb
+Subproject commit 1a05e833f8f7140628b27882b10525fd9ec4b873
diff --git a/contrib/curl-cmake/curl_config.h b/contrib/curl-cmake/curl_config.h
index a38aa60fe6d..4d4c2972f57 100644
--- a/contrib/curl-cmake/curl_config.h
+++ b/contrib/curl-cmake/curl_config.h
@@ -51,3 +51,8 @@
 #define USE_OPENSSL
 #define USE_THREADS_POSIX
 #define USE_ARES
+
+#ifdef __illumos__
+#define HAVE_POSIX_STRERROR_R 1
+#define HAVE_STRERROR_R 1
+#endif
diff --git a/contrib/jemalloc-cmake/CMakeLists.txt b/contrib/jemalloc-cmake/CMakeLists.txt
index 15e965ed841..b633f0fda50 100644
--- a/contrib/jemalloc-cmake/CMakeLists.txt
+++ b/contrib/jemalloc-cmake/CMakeLists.txt
@@ -34,9 +34,9 @@ if (OS_LINUX)
     # avoid spurious latencies and additional work associated with
     # MADV_DONTNEED. See
     # https://github.com/ClickHouse/ClickHouse/issues/11121 for motivation.
-    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "percpu_arena:percpu,oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
 else()
-    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:5000,dirty_decay_ms:5000")
+    set (JEMALLOC_CONFIG_MALLOC_CONF "oversize_threshold:0,muzzy_decay_ms:0,dirty_decay_ms:5000")
 endif()
 # CACHE variable is empty to allow changing defaults without the necessity
 # to purge cache
@@ -161,6 +161,9 @@ target_include_directories(_jemalloc SYSTEM PRIVATE
 
 target_compile_definitions(_jemalloc PRIVATE -DJEMALLOC_NO_PRIVATE_NAMESPACE)
 
+# Because our coverage callbacks call malloc, and recursive call of malloc could not work.
+target_compile_options(_jemalloc PRIVATE ${WITHOUT_COVERAGE_FLAGS_LIST})
+
 if (CMAKE_BUILD_TYPE_UC STREQUAL "DEBUG")
     target_compile_definitions(_jemalloc PRIVATE
         -DJEMALLOC_DEBUG=1
diff --git a/contrib/libarchive-cmake/CMakeLists.txt b/contrib/libarchive-cmake/CMakeLists.txt
index cd5658b7086..e89770da5f6 100644
--- a/contrib/libarchive-cmake/CMakeLists.txt
+++ b/contrib/libarchive-cmake/CMakeLists.txt
@@ -157,7 +157,7 @@ if (TARGET ch_contrib::zlib)
 endif()
 
 if (TARGET ch_contrib::zstd)
-    target_compile_definitions(_libarchive PUBLIC HAVE_ZSTD_H=1 HAVE_LIBZSTD=1)
+    target_compile_definitions(_libarchive PUBLIC HAVE_ZSTD_H=1 HAVE_LIBZSTD=1 HAVE_LIBZSTD_COMPRESSOR=1)
     target_link_libraries(_libarchive PRIVATE ch_contrib::zstd)
 endif()
 
diff --git a/contrib/libhdfs3 b/contrib/libhdfs3
index b9598e60167..0d04201c453 160000
--- a/contrib/libhdfs3
+++ b/contrib/libhdfs3
@@ -1 +1 @@
-Subproject commit b9598e6016720a7c088bfe85ce1fa0410f9d2103
+Subproject commit 0d04201c45359f0d0701fb1e8297d25eff7cfecf
diff --git a/contrib/libmetrohash/src/metrohash128.h b/contrib/libmetrohash/src/metrohash128.h
index 639a4fa97e3..f507c917caf 100644
--- a/contrib/libmetrohash/src/metrohash128.h
+++ b/contrib/libmetrohash/src/metrohash128.h
@@ -17,6 +17,8 @@
 #ifndef METROHASH_METROHASH_128_H
 #define METROHASH_METROHASH_128_H
 
+// NOLINTBEGIN(readability-avoid-const-params-in-decls)
+
 #include <stdint.h>
 
 class MetroHash128
@@ -25,21 +27,21 @@ public:
     static const uint32_t bits = 128;
 
     // Constructor initializes the same as Initialize()
-    MetroHash128(const uint64_t seed=0);
-    
+    explicit MetroHash128(const uint64_t seed=0);
+
     // Initializes internal state for new hash with optional seed
     void Initialize(const uint64_t seed=0);
-    
+
     // Update the hash state with a string of bytes. If the length
     // is sufficiently long, the implementation switches to a bulk
     // hashing algorithm directly on the argument buffer for speed.
     void Update(const uint8_t * buffer, const uint64_t length);
-    
+
     // Constructs the final hash and writes it to the argument buffer.
     // After a hash is finalized, this instance must be Initialized()-ed
     // again or the behavior of Update() and Finalize() is undefined.
     void Finalize(uint8_t * const hash);
-    
+
     // A non-incremental function implementation. This can be significantly
     // faster than the incremental implementation for some usage patterns.
     static void Hash(const uint8_t * buffer, const uint64_t length, uint8_t * const hash, const uint64_t seed=0);
@@ -57,7 +59,7 @@ private:
     static const uint64_t k1 = 0x8648DBDB;
     static const uint64_t k2 = 0x7BDEC03B;
     static const uint64_t k3 = 0x2F5870A5;
-    
+
     struct { uint64_t v[4]; } state;
     struct { uint8_t b[32]; } input;
     uint64_t bytes;
@@ -68,5 +70,6 @@ private:
 void metrohash128_1(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * out);
 void metrohash128_2(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * out);
 
+// NOLINTEND(readability-avoid-const-params-in-decls)
 
 #endif // #ifndef METROHASH_METROHASH_128_H
diff --git a/contrib/libmetrohash/src/metrohash64.cpp b/contrib/libmetrohash/src/metrohash64.cpp
index 7b5ec7f1a42..6ff64027292 100644
--- a/contrib/libmetrohash/src/metrohash64.cpp
+++ b/contrib/libmetrohash/src/metrohash64.cpp
@@ -26,13 +26,13 @@ const uint8_t MetroHash64::test_seed_1[8] =   { 0x3B, 0x0D, 0x48, 0x1C, 0xF4, 0x
 
 
 
-MetroHash64::MetroHash64(const uint64_t seed)
+MetroHash64::MetroHash64(uint64_t seed)
 {
     Initialize(seed);
 }
 
 
-void MetroHash64::Initialize(const uint64_t seed)
+void MetroHash64::Initialize(uint64_t seed)
 {
     vseed = (static_cast<uint64_t>(seed) + k2) * k0;
 
@@ -47,7 +47,7 @@ void MetroHash64::Initialize(const uint64_t seed)
 }
 
 
-void MetroHash64::Update(const uint8_t * const buffer, const uint64_t length)
+void MetroHash64::Update(const uint8_t * const buffer, uint64_t length)
 {
     const uint8_t * ptr = reinterpret_cast<const uint8_t*>(buffer);
     const uint8_t * const end = ptr + length;
@@ -62,7 +62,7 @@ void MetroHash64::Update(const uint8_t * const buffer, const uint64_t length)
         memcpy(input.b + (bytes % 32), ptr, static_cast<size_t>(fill));
         ptr   += fill;
         bytes += fill;
-        
+
         // input buffer is still partially filled
         if ((bytes % 32) != 0) return;
 
@@ -72,7 +72,7 @@ void MetroHash64::Update(const uint8_t * const buffer, const uint64_t length)
         state.v[2] += read_u64(&input.b[16]) * k2; state.v[2] = rotate_right(state.v[2],29) + state.v[0];
         state.v[3] += read_u64(&input.b[24]) * k3; state.v[3] = rotate_right(state.v[3],29) + state.v[1];
     }
-    
+
     // bulk update
     bytes += static_cast<uint64_t>(end - ptr);
     while (ptr <= (end - 32))
@@ -83,14 +83,14 @@ void MetroHash64::Update(const uint8_t * const buffer, const uint64_t length)
         state.v[2] += read_u64(ptr) * k2; ptr += 8; state.v[2] = rotate_right(state.v[2],29) + state.v[0];
         state.v[3] += read_u64(ptr) * k3; ptr += 8; state.v[3] = rotate_right(state.v[3],29) + state.v[1];
     }
-    
+
     // store remaining bytes in input buffer
     if (ptr < end)
         memcpy(input.b, ptr, static_cast<size_t>(end - ptr));
 }
 
 
-void MetroHash64::Finalize(uint8_t * const hash)
+void MetroHash64::Finalize(uint8_t * hash)
 {
     // finalize bulk loop, if used
     if (bytes >= 32)
@@ -102,11 +102,11 @@ void MetroHash64::Finalize(uint8_t * const hash)
 
         state.v[0] = vseed + (state.v[0] ^ state.v[1]);
     }
-    
+
     // process any bytes remaining in the input buffer
     const uint8_t * ptr = reinterpret_cast<const uint8_t*>(input.b);
     const uint8_t * const end = ptr + (bytes % 32);
-    
+
     if ((end - ptr) >= 16)
     {
         state.v[1]  = state.v[0] + (read_u64(ptr) * k2); ptr += 8; state.v[1] = rotate_right(state.v[1],29) * k3;
@@ -139,7 +139,7 @@ void MetroHash64::Finalize(uint8_t * const hash)
         state.v[0] += read_u8 (ptr) * k3;
         state.v[0] ^= rotate_right(state.v[0], 37) * k1;
     }
-    
+
     state.v[0] ^= rotate_right(state.v[0], 28);
     state.v[0] *= k0;
     state.v[0] ^= rotate_right(state.v[0], 29);
@@ -152,7 +152,7 @@ void MetroHash64::Finalize(uint8_t * const hash)
 }
 
 
-void MetroHash64::Hash(const uint8_t * buffer, const uint64_t length, uint8_t * const hash, const uint64_t seed)
+void MetroHash64::Hash(const uint8_t * buffer, uint64_t length, uint8_t * const hash, uint64_t seed)
 {
     const uint8_t * ptr = reinterpret_cast<const uint8_t*>(buffer);
     const uint8_t * const end = ptr + length;
@@ -238,7 +238,7 @@ bool MetroHash64::ImplementationVerified()
 
     // verify incremental implementation
     MetroHash64 metro;
-    
+
     metro.Initialize(0);
     metro.Update(reinterpret_cast<const uint8_t *>(MetroHash64::test_string), strlen(MetroHash64::test_string));
     metro.Finalize(hash);
@@ -262,9 +262,9 @@ void metrohash64_1(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
 
     const uint8_t * ptr = reinterpret_cast<const uint8_t*>(key);
     const uint8_t * const end = ptr + len;
-    
+
     uint64_t hash = ((static_cast<uint64_t>(seed) + k2) * k0) + len;
-    
+
     if (len >= 32)
     {
         uint64_t v[4];
@@ -272,7 +272,7 @@ void metrohash64_1(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v[1] = hash;
         v[2] = hash;
         v[3] = hash;
-        
+
         do
         {
             v[0] += read_u64(ptr) * k0; ptr += 8; v[0] = rotate_right(v[0],29) + v[2];
@@ -288,7 +288,7 @@ void metrohash64_1(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v[1] ^= rotate_right(((v[1] + v[3]) * k1) + v[2], 33) * k0;
         hash += v[0] ^ v[1];
     }
-    
+
     if ((end - ptr) >= 16)
     {
         uint64_t v0 = hash + (read_u64(ptr) * k0); ptr += 8; v0 = rotate_right(v0,33) * k1;
@@ -297,32 +297,32 @@ void metrohash64_1(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v1 ^= rotate_right(v1 * k3, 35) + v0;
         hash += v1;
     }
-    
+
     if ((end - ptr) >= 8)
     {
         hash += read_u64(ptr) * k3; ptr += 8;
         hash ^= rotate_right(hash, 33) * k1;
-        
+
     }
-    
+
     if ((end - ptr) >= 4)
     {
         hash += read_u32(ptr) * k3; ptr += 4;
         hash ^= rotate_right(hash, 15) * k1;
     }
-    
+
     if ((end - ptr) >= 2)
     {
         hash += read_u16(ptr) * k3; ptr += 2;
         hash ^= rotate_right(hash, 13) * k1;
     }
-    
+
     if ((end - ptr) >= 1)
     {
         hash += read_u8 (ptr) * k3;
         hash ^= rotate_right(hash, 25) * k1;
     }
-    
+
     hash ^= rotate_right(hash, 33);
     hash *= k0;
     hash ^= rotate_right(hash, 33);
@@ -336,13 +336,13 @@ void metrohash64_2(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
     static const uint64_t k0 = 0xD6D018F5;
     static const uint64_t k1 = 0xA2AA033B;
     static const uint64_t k2 = 0x62992FC1;
-    static const uint64_t k3 = 0x30BC5B29; 
+    static const uint64_t k3 = 0x30BC5B29;
 
     const uint8_t * ptr = reinterpret_cast<const uint8_t*>(key);
     const uint8_t * const end = ptr + len;
-    
+
     uint64_t hash = ((static_cast<uint64_t>(seed) + k2) * k0) + len;
-    
+
     if (len >= 32)
     {
         uint64_t v[4];
@@ -350,7 +350,7 @@ void metrohash64_2(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v[1] = hash;
         v[2] = hash;
         v[3] = hash;
-        
+
         do
         {
             v[0] += read_u64(ptr) * k0; ptr += 8; v[0] = rotate_right(v[0],29) + v[2];
@@ -366,7 +366,7 @@ void metrohash64_2(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v[1] ^= rotate_right(((v[1] + v[3]) * k1) + v[2], 30) * k0;
         hash += v[0] ^ v[1];
     }
-    
+
     if ((end - ptr) >= 16)
     {
         uint64_t v0 = hash + (read_u64(ptr) * k2); ptr += 8; v0 = rotate_right(v0,29) * k3;
@@ -375,31 +375,31 @@ void metrohash64_2(const uint8_t * key, uint64_t len, uint32_t seed, uint8_t * o
         v1 ^= rotate_right(v1 * k3, 34) + v0;
         hash += v1;
     }
-    
+
     if ((end - ptr) >= 8)
     {
         hash += read_u64(ptr) * k3; ptr += 8;
         hash ^= rotate_right(hash, 36) * k1;
     }
-    
+
     if ((end - ptr) >= 4)
     {
         hash += read_u32(ptr) * k3; ptr += 4;
         hash ^= rotate_right(hash, 15) * k1;
     }
-    
+
     if ((end - ptr) >= 2)
     {
         hash += read_u16(ptr) * k3; ptr += 2;
         hash ^= rotate_right(hash, 15) * k1;
     }
-    
+
     if ((end - ptr) >= 1)
     {
         hash += read_u8 (ptr) * k3;
         hash ^= rotate_right(hash, 23) * k1;
     }
-    
+
     hash ^= rotate_right(hash, 28);
     hash *= k0;
     hash ^= rotate_right(hash, 29);
diff --git a/contrib/libmetrohash/src/metrohash64.h b/contrib/libmetrohash/src/metrohash64.h
index d58898b117d..7003a1848be 100644
--- a/contrib/libmetrohash/src/metrohash64.h
+++ b/contrib/libmetrohash/src/metrohash64.h
@@ -25,24 +25,24 @@ public:
     static const uint32_t bits = 64;
 
     // Constructor initializes the same as Initialize()
-    MetroHash64(const uint64_t seed=0);
-    
+    explicit MetroHash64(uint64_t seed=0);
+
     // Initializes internal state for new hash with optional seed
-    void Initialize(const uint64_t seed=0);
-    
+    void Initialize(uint64_t seed=0);
+
     // Update the hash state with a string of bytes. If the length
     // is sufficiently long, the implementation switches to a bulk
     // hashing algorithm directly on the argument buffer for speed.
-    void Update(const uint8_t * buffer, const uint64_t length);
-    
+    void Update(const uint8_t * buffer, uint64_t length);
+
     // Constructs the final hash and writes it to the argument buffer.
     // After a hash is finalized, this instance must be Initialized()-ed
     // again or the behavior of Update() and Finalize() is undefined.
-    void Finalize(uint8_t * const hash);
-    
+    void Finalize(uint8_t * hash);
+
     // A non-incremental function implementation. This can be significantly
     // faster than the incremental implementation for some usage patterns.
-    static void Hash(const uint8_t * buffer, const uint64_t length, uint8_t * const hash, const uint64_t seed=0);
+    static void Hash(const uint8_t * buffer, uint64_t length, uint8_t * hash, uint64_t seed=0);
 
     // Does implementation correctly execute test vectors?
     static bool ImplementationVerified();
@@ -57,7 +57,7 @@ private:
     static const uint64_t k1 = 0xA2AA033B;
     static const uint64_t k2 = 0x62992FC1;
     static const uint64_t k3 = 0x30BC5B29;
-    
+
     struct { uint64_t v[4]; } state;
     struct { uint8_t b[32]; } input;
     uint64_t bytes;
diff --git a/contrib/libssh b/contrib/libssh
index 2c76332ef56..ed4011b9187 160000
--- a/contrib/libssh
+++ b/contrib/libssh
@@ -1 +1 @@
-Subproject commit 2c76332ef56d90f55965ab24da6b6dbcbef29c4c
+Subproject commit ed4011b91873836713576475a98cd132cd834539
diff --git a/contrib/libssh-cmake/CMakeLists.txt b/contrib/libssh-cmake/CMakeLists.txt
index 7a3816d4dce..ecd1fccb800 100644
--- a/contrib/libssh-cmake/CMakeLists.txt
+++ b/contrib/libssh-cmake/CMakeLists.txt
@@ -1,39 +1,100 @@
-option (ENABLE_SSH "Enable support for SSH keys and protocol" ON)
+option (ENABLE_SSH "Enable support for libssh" ${ENABLE_LIBRARIES})
 
 if (NOT ENABLE_SSH)
-    message(STATUS "Not using SSH")
+    message(STATUS "Not using libssh")
     return()
 endif()
 
+# CMake variables needed by libssh_version.h.cmake, update them when you update libssh
+set(libssh_VERSION_MAJOR 0)
+set(libssh_VERSION_MINOR 9)
+set(libssh_VERSION_PATCH 8)
+
 set(LIB_SOURCE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libssh")
 set(LIB_BINARY_DIR "${ClickHouse_BINARY_DIR}/contrib/libssh")
 
-project(libssh VERSION 0.9.7 LANGUAGES C)
+set(libssh_SRCS
+    ${LIB_SOURCE_DIR}/src/agent.c
+    ${LIB_SOURCE_DIR}/src/auth.c
+    ${LIB_SOURCE_DIR}/src/base64.c
+    ${LIB_SOURCE_DIR}/src/bignum.c
+    ${LIB_SOURCE_DIR}/src/buffer.c
+    ${LIB_SOURCE_DIR}/src/callbacks.c
+    ${LIB_SOURCE_DIR}/src/chachapoly.c
+    ${LIB_SOURCE_DIR}/src/channels.c
+    ${LIB_SOURCE_DIR}/src/client.c
+    ${LIB_SOURCE_DIR}/src/config.c
+    ${LIB_SOURCE_DIR}/src/config_parser.c
+    ${LIB_SOURCE_DIR}/src/connect.c
+    ${LIB_SOURCE_DIR}/src/connector.c
+    ${LIB_SOURCE_DIR}/src/curve25519.c
+    ${LIB_SOURCE_DIR}/src/dh.c
+    ${LIB_SOURCE_DIR}/src/ecdh.c
+    ${LIB_SOURCE_DIR}/src/error.c
+    ${LIB_SOURCE_DIR}/src/external/bcrypt_pbkdf.c
+    ${LIB_SOURCE_DIR}/src/external/blowfish.c
+    ${LIB_SOURCE_DIR}/src/external/chacha.c
+    ${LIB_SOURCE_DIR}/src/external/poly1305.c
+    ${LIB_SOURCE_DIR}/src/getpass.c
+    ${LIB_SOURCE_DIR}/src/init.c
+    ${LIB_SOURCE_DIR}/src/kdf.c
+    ${LIB_SOURCE_DIR}/src/kex.c
+    ${LIB_SOURCE_DIR}/src/known_hosts.c
+    ${LIB_SOURCE_DIR}/src/knownhosts.c
+    ${LIB_SOURCE_DIR}/src/legacy.c
+    ${LIB_SOURCE_DIR}/src/log.c
+    ${LIB_SOURCE_DIR}/src/match.c
+    ${LIB_SOURCE_DIR}/src/messages.c
+    ${LIB_SOURCE_DIR}/src/misc.c
+    ${LIB_SOURCE_DIR}/src/options.c
+    ${LIB_SOURCE_DIR}/src/packet.c
+    ${LIB_SOURCE_DIR}/src/packet_cb.c
+    ${LIB_SOURCE_DIR}/src/packet_crypt.c
+    ${LIB_SOURCE_DIR}/src/pcap.c
+    ${LIB_SOURCE_DIR}/src/pki.c
+    ${LIB_SOURCE_DIR}/src/pki_container_openssh.c
+    ${LIB_SOURCE_DIR}/src/pki_ed25519_common.c
+    ${LIB_SOURCE_DIR}/src/poll.c
+    ${LIB_SOURCE_DIR}/src/scp.c
+    ${LIB_SOURCE_DIR}/src/session.c
+    ${LIB_SOURCE_DIR}/src/socket.c
+    ${LIB_SOURCE_DIR}/src/string.c
+    ${LIB_SOURCE_DIR}/src/threads.c
+    ${LIB_SOURCE_DIR}/src/token.c
+    ${LIB_SOURCE_DIR}/src/wrapper.c
+    # some files of libssh/src/ are missing - why?
 
-# global needed variable
-set(APPLICATION_NAME ${PROJECT_NAME})
+    ${LIB_SOURCE_DIR}/src/threads/noop.c
+    ${LIB_SOURCE_DIR}/src/threads/pthread.c
+    # files missing - why?
 
-# SOVERSION scheme: CURRENT.AGE.REVISION
-#   If there was an incompatible interface change:
-#     Increment CURRENT. Set AGE and REVISION to 0
-#   If there was a compatible interface change:
-#     Increment AGE. Set REVISION to 0
-#   If the source code was changed, but there were no interface changes:
-#     Increment REVISION.
-set(LIBRARY_VERSION "4.8.7")
-set(LIBRARY_SOVERSION "4")
+    # LIBCRYPT specific
+    ${LIB_SOURCE_DIR}/src/dh_crypto.c
+    ${LIB_SOURCE_DIR}/src/ecdh_crypto.c
+    ${LIB_SOURCE_DIR}/src/libcrypto.c
+    ${LIB_SOURCE_DIR}/src/pki_crypto.c
+    ${LIB_SOURCE_DIR}/src/threads/libcrypto.c
 
-# Copy library files to a lib sub-directory
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${LIB_BINARY_DIR}/lib")
+    ${LIB_SOURCE_DIR}/src/bind.c
+    ${LIB_SOURCE_DIR}/src/bind_config.c
+    ${LIB_SOURCE_DIR}/src/options.c
+    ${LIB_SOURCE_DIR}/src/server.c
+)
 
-set(CMAKE_THREAD_PREFER_PTHREADS ON)
-set(THREADS_PREFER_PTHREAD_FLAG ON)
+if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
+    add_compile_definitions(USE_BORINGSSL=1)
+endif()
 
-set(WITH_ZLIB OFF)
-set(WITH_SYMBOL_VERSIONING OFF)
-set(WITH_SERVER ON)
+configure_file(${LIB_SOURCE_DIR}/include/libssh/libssh_version.h.cmake ${LIB_BINARY_DIR}/include/libssh/libssh_version.h @ONLY)
 
-include(IncludeSources.cmake)
+add_library(_ssh ${libssh_SRCS})
+add_library(ch_contrib::ssh ALIAS _ssh)
+
+target_link_libraries(_ssh PRIVATE OpenSSL::Crypto)
+
+target_include_directories(_ssh PUBLIC "${LIB_SOURCE_DIR}/include" "${LIB_BINARY_DIR}/include")
+
+# These headers need to be generated using the native build system on each platform.
 if (OS_LINUX)
     if (ARCH_AMD64)
         if (USE_MUSL)
@@ -63,7 +124,3 @@ elseif (OS_FREEBSD)
 else ()
     message(FATAL_ERROR "Platform is not supported")
 endif()
-
-configure_file(${LIB_SOURCE_DIR}/include/libssh/libssh_version.h.cmake
-               ${LIB_BINARY_DIR}/include/libssh/libssh_version.h
-               @ONLY)
diff --git a/contrib/libssh-cmake/IncludeSources.cmake b/contrib/libssh-cmake/IncludeSources.cmake
deleted file mode 100644
index 30348d5d7dd..00000000000
--- a/contrib/libssh-cmake/IncludeSources.cmake
+++ /dev/null
@@ -1,98 +0,0 @@
-set(LIBSSH_LINK_LIBRARIES
-  ${LIBSSH_LINK_LIBRARIES}
-  OpenSSL::Crypto
-)
-
-set(libssh_SRCS
-  ${LIB_SOURCE_DIR}/src/agent.c
-  ${LIB_SOURCE_DIR}/src/auth.c
-  ${LIB_SOURCE_DIR}/src/base64.c
-  ${LIB_SOURCE_DIR}/src/bignum.c
-  ${LIB_SOURCE_DIR}/src/buffer.c
-  ${LIB_SOURCE_DIR}/src/callbacks.c
-  ${LIB_SOURCE_DIR}/src/channels.c
-  ${LIB_SOURCE_DIR}/src/client.c
-  ${LIB_SOURCE_DIR}/src/config.c
-  ${LIB_SOURCE_DIR}/src/connect.c
-  ${LIB_SOURCE_DIR}/src/connector.c
-  ${LIB_SOURCE_DIR}/src/curve25519.c
-  ${LIB_SOURCE_DIR}/src/dh.c
-  ${LIB_SOURCE_DIR}/src/ecdh.c
-  ${LIB_SOURCE_DIR}/src/error.c
-  ${LIB_SOURCE_DIR}/src/getpass.c
-  ${LIB_SOURCE_DIR}/src/init.c
-  ${LIB_SOURCE_DIR}/src/kdf.c
-  ${LIB_SOURCE_DIR}/src/kex.c
-  ${LIB_SOURCE_DIR}/src/known_hosts.c
-  ${LIB_SOURCE_DIR}/src/knownhosts.c
-  ${LIB_SOURCE_DIR}/src/legacy.c
-  ${LIB_SOURCE_DIR}/src/log.c
-  ${LIB_SOURCE_DIR}/src/match.c
-  ${LIB_SOURCE_DIR}/src/messages.c
-  ${LIB_SOURCE_DIR}/src/misc.c
-  ${LIB_SOURCE_DIR}/src/options.c
-  ${LIB_SOURCE_DIR}/src/packet.c
-  ${LIB_SOURCE_DIR}/src/packet_cb.c
-  ${LIB_SOURCE_DIR}/src/packet_crypt.c
-  ${LIB_SOURCE_DIR}/src/pcap.c
-  ${LIB_SOURCE_DIR}/src/pki.c
-  ${LIB_SOURCE_DIR}/src/pki_container_openssh.c
-  ${LIB_SOURCE_DIR}/src/poll.c
-  ${LIB_SOURCE_DIR}/src/session.c
-  ${LIB_SOURCE_DIR}/src/scp.c
-  ${LIB_SOURCE_DIR}/src/socket.c
-  ${LIB_SOURCE_DIR}/src/string.c
-  ${LIB_SOURCE_DIR}/src/threads.c
-  ${LIB_SOURCE_DIR}/src/wrapper.c
-  ${LIB_SOURCE_DIR}/src/external/bcrypt_pbkdf.c
-  ${LIB_SOURCE_DIR}/src/external/blowfish.c
-  ${LIB_SOURCE_DIR}/src/external/chacha.c
-  ${LIB_SOURCE_DIR}/src/external/poly1305.c
-  ${LIB_SOURCE_DIR}/src/chachapoly.c
-  ${LIB_SOURCE_DIR}/src/config_parser.c
-  ${LIB_SOURCE_DIR}/src/token.c
-  ${LIB_SOURCE_DIR}/src/pki_ed25519_common.c
-)
-
-set(libssh_SRCS
-    ${libssh_SRCS}
-    ${LIB_SOURCE_DIR}/src/threads/noop.c
-    ${LIB_SOURCE_DIR}/src/threads/pthread.c
-)
-
-# LIBCRYPT specific
-set(libssh_SRCS
-    ${libssh_SRCS}
-    ${LIB_SOURCE_DIR}/src/threads/libcrypto.c
-    ${LIB_SOURCE_DIR}/src/pki_crypto.c
-    ${LIB_SOURCE_DIR}/src/ecdh_crypto.c
-    ${LIB_SOURCE_DIR}/src/libcrypto.c
-    ${LIB_SOURCE_DIR}/src/dh_crypto.c
-)
-
-if (NOT (ENABLE_OPENSSL OR ENABLE_OPENSSL_DYNAMIC))
-    add_compile_definitions(USE_BORINGSSL=1)
-endif()
-
-set(libssh_SRCS
-${libssh_SRCS}
-${LIB_SOURCE_DIR}/src/options.c
-${LIB_SOURCE_DIR}/src/server.c
-${LIB_SOURCE_DIR}/src/bind.c
-${LIB_SOURCE_DIR}/src/bind_config.c
-)
-
-
-add_library(_ssh STATIC ${libssh_SRCS})
-
-target_include_directories(_ssh PRIVATE ${LIB_BINARY_DIR})
-target_include_directories(_ssh PUBLIC "${LIB_SOURCE_DIR}/include" "${LIB_BINARY_DIR}/include")
-target_link_libraries(_ssh
-                      PRIVATE ${LIBSSH_LINK_LIBRARIES})
-
-add_library(ch_contrib::ssh ALIAS _ssh)
-
-target_compile_options(_ssh
-                     PRIVATE
-                        ${DEFAULT_C_COMPILE_FLAGS}
-                        -D_GNU_SOURCE)
diff --git a/contrib/libunwind-cmake/unwind-override.c b/contrib/libunwind-cmake/unwind-override.c
index 616bab6ae4b..57928d817eb 100644
--- a/contrib/libunwind-cmake/unwind-override.c
+++ b/contrib/libunwind-cmake/unwind-override.c
@@ -1,6 +1,10 @@
 #include <libunwind.h>
 
+/// On MacOS this function will be replaced with a dynamic symbol
+/// from the system library.
+#if !defined(OS_DARWIN)
 int backtrace(void ** buffer, int size)
 {
     return unw_backtrace(buffer, size);
 }
+#endif
diff --git a/contrib/liburing b/contrib/liburing
index f5a48392c4e..f4e42a515cd 160000
--- a/contrib/liburing
+++ b/contrib/liburing
@@ -1 +1 @@
-Subproject commit f5a48392c4ea33f222cbebeb2e2fc31620162949
+Subproject commit f4e42a515cd78c8c9cac2be14222834be5f8df2b
diff --git a/contrib/libuv b/contrib/libuv
index 3a85b2eb3d8..4482964660c 160000
--- a/contrib/libuv
+++ b/contrib/libuv
@@ -1 +1 @@
-Subproject commit 3a85b2eb3d83f369b8a8cafd329d7e9dc28f60cf
+Subproject commit 4482964660c77eec1166cd7d14fb915e3dbd774a
diff --git a/contrib/llvm-project b/contrib/llvm-project
index 2568a7cd129..d2142eed980 160000
--- a/contrib/llvm-project
+++ b/contrib/llvm-project
@@ -1 +1 @@
-Subproject commit 2568a7cd1297c7c3044b0f3cc0c23a6f6444d856
+Subproject commit d2142eed98046a47ff7112e3cc1e197c8a5cd80f
diff --git a/contrib/llvm-project-cmake/CMakeLists.txt b/contrib/llvm-project-cmake/CMakeLists.txt
index d09060912d8..76e620314a2 100644
--- a/contrib/llvm-project-cmake/CMakeLists.txt
+++ b/contrib/llvm-project-cmake/CMakeLists.txt
@@ -1,5 +1,6 @@
-if (APPLE OR SANITIZE STREQUAL "undefined" OR SANITIZE STREQUAL "memory")
-    # llvm-tblgen, that is used during LLVM build, doesn't work with UBSan.
+if (APPLE OR SANITIZE STREQUAL "memory")
+    # llvm-tblgen, that is used during LLVM build, will throw MSAN errors when running (breaking the build)
+    # TODO: Retest when upgrading LLVM or build only llvm-tblgen without sanitizers
     set (ENABLE_EMBEDDED_COMPILER_DEFAULT OFF)
     set (ENABLE_DWARF_PARSER_DEFAULT OFF)
 else()
diff --git a/contrib/lz4 b/contrib/lz4
index 92ebf1870b9..ce45a9dbdb0 160000
--- a/contrib/lz4
+++ b/contrib/lz4
@@ -1 +1 @@
-Subproject commit 92ebf1870b9acbefc0e7970409a181954a10ff40
+Subproject commit ce45a9dbdb059511a3e9576b19db3e7f1a4f172e
diff --git a/contrib/nuraft-cmake/CMakeLists.txt b/contrib/nuraft-cmake/CMakeLists.txt
index eaca00566d6..736e91e359d 100644
--- a/contrib/nuraft-cmake/CMakeLists.txt
+++ b/contrib/nuraft-cmake/CMakeLists.txt
@@ -32,6 +32,7 @@ set(SRCS
     "${LIBRARY_DIR}/src/handle_custom_notification.cxx"
     "${LIBRARY_DIR}/src/handle_vote.cxx"
     "${LIBRARY_DIR}/src/launcher.cxx"
+    "${LIBRARY_DIR}/src/log_entry.cxx"
     "${LIBRARY_DIR}/src/srv_config.cxx"
     "${LIBRARY_DIR}/src/snapshot_sync_req.cxx"
     "${LIBRARY_DIR}/src/snapshot_sync_ctx.cxx"
@@ -50,6 +51,12 @@ else()
     target_compile_definitions(_nuraft PRIVATE USE_BOOST_ASIO=1 BOOST_ASIO_STANDALONE=1)
 endif()
 
+target_link_libraries (_nuraft PRIVATE clickhouse_common_io)
+# We must have it PUBLIC here because some headers which depend on it directly
+# included in clickhouse
+target_compile_definitions(_nuraft PUBLIC USE_CLICKHOUSE_THREADS=1)
+MESSAGE(STATUS "Will use clickhouse threads for NuRaft")
+
 target_include_directories (_nuraft SYSTEM PRIVATE "${LIBRARY_DIR}/include/libnuraft")
 # for some reason include "asio.h" directly without "boost/" prefix.
 target_include_directories (_nuraft SYSTEM PRIVATE "${ClickHouse_SOURCE_DIR}/contrib/boost/boost")
diff --git a/contrib/qpl b/contrib/qpl
index a61bdd845fd..d4715e0e798 160000
--- a/contrib/qpl
+++ b/contrib/qpl
@@ -1 +1 @@
-Subproject commit a61bdd845fd7ca363b2bcc55454aa520dfcd8298
+Subproject commit d4715e0e79896b85612158e135ee1a85f3b3e04d
diff --git a/contrib/rapidjson b/contrib/rapidjson
index c4ef90ccdbc..800ca2f38fc 160000
--- a/contrib/rapidjson
+++ b/contrib/rapidjson
@@ -1 +1 @@
-Subproject commit c4ef90ccdbc21d5d5a628d08316bfd301e32d6fa
+Subproject commit 800ca2f38fc3b387271d9e1926fcfc9070222104
diff --git a/contrib/simdjson b/contrib/simdjson
index 1075e8609c4..6060be2fdf6 160000
--- a/contrib/simdjson
+++ b/contrib/simdjson
@@ -1 +1 @@
-Subproject commit 1075e8609c4afa253162d441437af929c29e31bb
+Subproject commit 6060be2fdf62edf4a8f51a8b0883d57d09397b30
diff --git a/contrib/update-submodules.sh b/contrib/update-submodules.sh
index b12f3f924dc..072d7a5dc2f 100755
--- a/contrib/update-submodules.sh
+++ b/contrib/update-submodules.sh
@@ -6,9 +6,15 @@ SCRIPT_DIR=$(dirname "${SCRIPT_PATH}")
 GIT_DIR=$(git -C "$SCRIPT_DIR" rev-parse --show-toplevel)
 cd $GIT_DIR
 
+# Exclude from contribs some garbage subdirs that we don't need.
+# It reduces the checked out files size about 3 times and therefore speeds up indexing in IDEs and searching.
+# NOTE .git/ still contains everything that we don't check out (although, it's compressed)
+# See also https://git-scm.com/docs/git-sparse-checkout
 contrib/sparse-checkout/setup-sparse-checkout.sh
+
 git submodule init
 git submodule sync
+
 # NOTE: do not use --remote for `git submodule update`[1] command, since the submodule references to the specific commit SHA1 in the subproject.
 #       It may cause unexpected behavior. Instead you need to commit a new SHA1 for a submodule.
 #
@@ -18,7 +24,7 @@ git config --file .gitmodules --get-regexp '.*path' | sed 's/[^ ]* //' | xargs -
 # We don't want to depend on any third-party CMake files.
 # To check it, find and delete them.
 grep -o -P '"contrib/[^"]+"' .gitmodules |
-  grep -v -P 'contrib/(llvm-project|google-protobuf|grpc|abseil-cpp|corrosion)' |
+  grep -v -P 'contrib/(llvm-project|google-protobuf|grpc|abseil-cpp|corrosion|aws-crt-cpp)' |
   xargs -I@ find @ \
     -'(' -name 'CMakeLists.txt' -or -name '*.cmake' -')' -and -not -name '*.h.cmake' \
     -delete
diff --git a/contrib/xxHash b/contrib/xxHash
index 3078dc6039f..bbb27a5efb8 160000
--- a/contrib/xxHash
+++ b/contrib/xxHash
@@ -1 +1 @@
-Subproject commit 3078dc6039f8c0bffcb1904f81cfe6b2c3209435
+Subproject commit bbb27a5efb85b92a0486cf361a8635715a53f6ba
diff --git a/contrib/xxHash-cmake/CMakeLists.txt b/contrib/xxHash-cmake/CMakeLists.txt
index 314094e9523..bd7192ae944 100644
--- a/contrib/xxHash-cmake/CMakeLists.txt
+++ b/contrib/xxHash-cmake/CMakeLists.txt
@@ -7,7 +7,7 @@ add_library(xxHash ${SRCS})
 target_include_directories(xxHash SYSTEM BEFORE INTERFACE "${LIBRARY_DIR}")
 
 # XXH_INLINE_ALL - Make all functions inline, with implementations being directly included within xxhash.h. Inlining functions is beneficial for speed on small keys.
-# https://github.com/Cyan4973/xxHash/tree/v0.8.1#build-modifiers
+# https://github.com/Cyan4973/xxHash/tree/v0.8.2#build-modifiers
 target_compile_definitions(xxHash PUBLIC XXH_INLINE_ALL)
 
 add_library(ch_contrib::xxHash ALIAS xxHash)
diff --git a/docker/images.json b/docker/images.json
index d2f098f53d7..7439517379b 100644
--- a/docker/images.json
+++ b/docker/images.json
@@ -1,8 +1,12 @@
 {
-    "docker/packager/binary": {
+    "docker/packager/binary-builder": {
         "name": "clickhouse/binary-builder",
         "dependent": []
     },
+    "docker/packager/cctools": {
+        "name": "clickhouse/cctools",
+        "dependent": []
+    },
     "docker/test/compatibility/centos": {
         "name": "clickhouse/test-old-centos",
         "dependent": []
@@ -30,7 +34,6 @@
     "docker/test/util": {
         "name": "clickhouse/test-util",
         "dependent": [
-            "docker/packager/binary",
             "docker/test/base",
             "docker/test/fasttest"
         ]
@@ -62,13 +65,14 @@
         "dependent": []
     },
     "docker/test/integration/runner": {
-        "only_amd64": true,
         "name": "clickhouse/integration-tests-runner",
         "dependent": []
     },
     "docker/test/fasttest": {
         "name": "clickhouse/fasttest",
-        "dependent": []
+        "dependent": [
+            "docker/packager/binary-builder"
+        ]
     },
     "docker/test/style": {
         "name": "clickhouse/style-test",
diff --git a/docker/keeper/Dockerfile b/docker/keeper/Dockerfile
index 4b5e8cd3970..346868e19c4 100644
--- a/docker/keeper/Dockerfile
+++ b/docker/keeper/Dockerfile
@@ -34,7 +34,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.12.2.59"
+ARG VERSION="24.3.2.23"
 ARG PACKAGES="clickhouse-keeper"
 ARG DIRECT_DOWNLOAD_URLS=""
 
@@ -44,7 +44,10 @@ ARG DIRECT_DOWNLOAD_URLS=""
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
-
+ARG DEFAULT_UID="101"
+ARG DEFAULT_GID="101"
+RUN addgroup -S -g "${DEFAULT_GID}" clickhouse && \
+    adduser -S -h "/var/lib/clickhouse" -s /bin/bash -G clickhouse -g "ClickHouse keeper" -u "${DEFAULT_UID}" clickhouse
 
 ARG TARGETARCH
 RUN arch=${TARGETARCH:-amd64} \
@@ -71,20 +74,21 @@ RUN arch=${TARGETARCH:-amd64} \
         fi \
     ; done \
     && rm /tmp/*.tgz /install -r \
-    && addgroup -S -g 101 clickhouse \
-    && adduser -S -h /var/lib/clickhouse -s /bin/bash -G clickhouse -g "ClickHouse keeper" -u 101 clickhouse \
-    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-keeper /etc/clickhouse-keeper \
-    && chown clickhouse:clickhouse /var/lib/clickhouse \
-    && chown root:clickhouse /var/log/clickhouse-keeper \
     && chmod +x /entrypoint.sh \
     && apk add --no-cache su-exec bash tzdata \
     && cp /usr/share/zoneinfo/UTC /etc/localtime \
-    && echo "UTC" > /etc/timezone \
-    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-keeper /etc/clickhouse-keeper
+    && echo "UTC" > /etc/timezone
 
+ARG DEFAULT_CONFIG_DIR="/etc/clickhouse-keeper"
+ARG DEFAULT_DATA_DIR="/var/lib/clickhouse-keeper"
+ARG DEFAULT_LOG_DIR="/var/log/clickhouse-keeper"
+RUN mkdir -p "${DEFAULT_DATA_DIR}" "${DEFAULT_LOG_DIR}" "${DEFAULT_CONFIG_DIR}" \
+    && chown clickhouse:clickhouse "${DEFAULT_DATA_DIR}" \
+    && chown root:clickhouse "${DEFAULT_LOG_DIR}" \
+    && chmod ugo+Xrw -R "${DEFAULT_DATA_DIR}" "${DEFAULT_LOG_DIR}" "${DEFAULT_CONFIG_DIR}"
 
+# /var/lib/clickhouse is necessary due to the current default configuration for Keeper
+VOLUME "${DEFAULT_DATA_DIR}" /var/lib/clickhouse
 EXPOSE 2181 10181 44444 9181
 
-VOLUME /var/lib/clickhouse /var/log/clickhouse-keeper /etc/clickhouse-keeper
-
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/keeper/entrypoint.sh b/docker/keeper/entrypoint.sh
index 939cd941aeb..1390ad9ce74 100644
--- a/docker/keeper/entrypoint.sh
+++ b/docker/keeper/entrypoint.sh
@@ -80,7 +80,7 @@ if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
     # so the container can't be finished by ctrl+c
     export CLICKHOUSE_WATCHDOG_ENABLE
 
-    cd /var/lib/clickhouse
+    cd "${DATA_DIR}"
 
     # There is a config file. It is already tested with gosu (if it is readably by keeper user)
     if [ -f "$KEEPER_CONFIG" ]; then
diff --git a/docker/packager/README.md b/docker/packager/README.md
index e0b7f38ea58..3604e8585a4 100644
--- a/docker/packager/README.md
+++ b/docker/packager/README.md
@@ -28,7 +28,6 @@ lrwxrwxrwx 1 root root        10  clickhouse-benchmark -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-clang -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-client -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-compressor -> clickhouse
-lrwxrwxrwx 1 root root        10  clickhouse-copier -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-extract-from-config -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-format -> clickhouse
 lrwxrwxrwx 1 root root        10  clickhouse-lld -> clickhouse
diff --git a/docker/packager/binary/Dockerfile b/docker/packager/binary-builder/Dockerfile
similarity index 62%
rename from docker/packager/binary/Dockerfile
rename to docker/packager/binary-builder/Dockerfile
index 1a99ab0d0b6..73ec4275f12 100644
--- a/docker/packager/binary/Dockerfile
+++ b/docker/packager/binary-builder/Dockerfile
@@ -1,45 +1,11 @@
 # docker build -t clickhouse/binary-builder .
 ARG FROM_TAG=latest
-FROM clickhouse/test-util:latest AS cctools
-# The cctools are built always from the clickhouse/test-util:latest and cached inline
-# Theoretically, it should improve rebuild speed significantly
+FROM clickhouse/fasttest:$FROM_TAG
 ENV CC=clang-${LLVM_VERSION}
 ENV CXX=clang++-${LLVM_VERSION}
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# DO NOT PUT ANYTHING BEFORE THE NEXT TWO `RUN` DIRECTIVES
-# THE MOST HEAVY OPERATION MUST BE THE FIRST IN THE CACHE
-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-# libtapi is required to support .tbh format from recent MacOS SDKs
-RUN git clone https://github.com/tpoechtrager/apple-libtapi.git \
-    && cd apple-libtapi \
-    && git checkout 15dfc2a8c9a2a89d06ff227560a69f5265b692f9 \
-    && INSTALLPREFIX=/cctools ./build.sh \
-    && ./install.sh \
-    && cd .. \
-    && rm -rf apple-libtapi
 
-# Build and install tools for cross-linking to Darwin (x86-64)
-# Build and install tools for cross-linking to Darwin (aarch64)
-RUN git clone https://github.com/tpoechtrager/cctools-port.git \
-    && cd cctools-port/cctools \
-    && git checkout 2a3e1c2a6ff54a30f898b70cfb9ba1692a55fad7 \
-    && ./configure --prefix=/cctools --with-libtapi=/cctools \
-        --target=x86_64-apple-darwin \
-    && make install -j$(nproc) \
-    && make clean \
-    && ./configure --prefix=/cctools --with-libtapi=/cctools \
-        --target=aarch64-apple-darwin \
-    && make install -j$(nproc) \
-    && cd ../.. \
-    && rm -rf cctools-port
-
-# !!!!!!!!!!!
-# END COMPILE
-# !!!!!!!!!!!
-
-FROM clickhouse/test-util:$FROM_TAG
-ENV CC=clang-${LLVM_VERSION}
-ENV CXX=clang++-${LLVM_VERSION}
+# If the cctools is updated, then first build it in the CI, then update here in a different commit
+COPY --from=clickhouse/cctools:d9e3596e706b /cctools /cctools
 
 # Rust toolchain and libraries
 ENV RUSTUP_HOME=/rust/rustup
@@ -72,7 +38,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test --yes \
         zstd \
         zip \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # Download toolchain and SDK for Darwin
 RUN curl -sL -O https://github.com/phracker/MacOSX-SDKs/releases/download/11.3/MacOSX11.0.sdk.tar.xz
@@ -95,7 +61,7 @@ RUN arch=${TARGETARCH:-amd64} \
     && rm /tmp/nfpm.deb
 
 ARG GO_VERSION=1.19.10
-# We need go for clickhouse-diagnostics
+# We needed go for clickhouse-diagnostics (it is not used anymore)
 RUN arch=${TARGETARCH:-amd64} \
     && curl -Lo /tmp/go.tgz "https://go.dev/dl/go${GO_VERSION}.linux-${arch}.tar.gz" \
     && tar -xzf /tmp/go.tgz -C /usr/local/ \
@@ -110,8 +76,6 @@ 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
 
-COPY --from=cctools /cctools /cctools
-
 RUN mkdir /workdir && chmod 777 /workdir
 WORKDIR /workdir
 
diff --git a/docker/packager/binary/build.sh b/docker/packager/binary-builder/build.sh
similarity index 90%
rename from docker/packager/binary/build.sh
rename to docker/packager/binary-builder/build.sh
index b63643419fe..032aceb0af3 100755
--- a/docker/packager/binary/build.sh
+++ b/docker/packager/binary-builder/build.sh
@@ -36,22 +36,6 @@ rm -f CMakeCache.txt
 
 if [ -n "$MAKE_DEB" ]; then
   rm -rf /build/packages/root
-  # NOTE: this is for backward compatibility with previous releases,
-  # that does not diagnostics tool (only script).
-  if [ -d /build/programs/diagnostics ]; then
-    if [ -z "$SANITIZER" ]; then
-      # We need to check if clickhouse-diagnostics is fine and build it
-      (
-        cd /build/programs/diagnostics
-        make test-no-docker
-        GOARCH="${DEB_ARCH}" CGO_ENABLED=0 make VERSION="$VERSION_STRING" build
-        mv clickhouse-diagnostics ..
-      )
-    else
-      echo -e "#!/bin/sh\necho 'Not implemented for this type of package'" > /build/programs/clickhouse-diagnostics
-      chmod +x /build/programs/clickhouse-diagnostics
-    fi
-  fi
 fi
 
 
@@ -121,8 +105,6 @@ if [ -n "$MAKE_DEB" ]; then
   # No quotes because I want it to expand to nothing if empty.
   # shellcheck disable=SC2086
   DESTDIR=/build/packages/root ninja $NINJA_FLAGS programs/install
-  cp /build/programs/clickhouse-diagnostics /build/packages/root/usr/bin
-  cp /build/programs/clickhouse-diagnostics /output
   bash -x /build/packages/build
 fi
 
diff --git a/docker/packager/cctools/Dockerfile b/docker/packager/cctools/Dockerfile
new file mode 100644
index 00000000000..d986c6a3c86
--- /dev/null
+++ b/docker/packager/cctools/Dockerfile
@@ -0,0 +1,34 @@
+# This is a hack to significantly reduce the build time of the clickhouse/binary-builder
+# It's based on the assumption that we don't care of the cctools version so much
+# It event does not depend on the clickhouse/fasttest in the `docker/images.json`
+ARG FROM_TAG=latest
+FROM clickhouse/fasttest:$FROM_TAG as builder
+
+ENV CC=clang-${LLVM_VERSION}
+ENV CXX=clang++-${LLVM_VERSION}
+
+RUN git clone https://github.com/tpoechtrager/apple-libtapi.git \
+    && cd apple-libtapi \
+    && git checkout 15dfc2a8c9a2a89d06ff227560a69f5265b692f9 \
+    && INSTALLPREFIX=/cctools ./build.sh \
+    && ./install.sh \
+    && cd .. \
+    && rm -rf apple-libtapi
+
+# Build and install tools for cross-linking to Darwin (x86-64)
+# Build and install tools for cross-linking to Darwin (aarch64)
+RUN git clone https://github.com/tpoechtrager/cctools-port.git \
+    && cd cctools-port/cctools \
+    && git checkout 2a3e1c2a6ff54a30f898b70cfb9ba1692a55fad7 \
+    && ./configure --prefix=/cctools --with-libtapi=/cctools \
+        --target=x86_64-apple-darwin \
+    && make install -j$(nproc) \
+    && make clean \
+    && ./configure --prefix=/cctools --with-libtapi=/cctools \
+        --target=aarch64-apple-darwin \
+    && make install -j$(nproc) \
+    && cd ../.. \
+    && rm -rf cctools-port
+
+FROM scratch
+COPY --from=builder /cctools /cctools
diff --git a/docker/packager/packager b/docker/packager/packager
index ade36a55591..23fc26bc1a4 100755
--- a/docker/packager/packager
+++ b/docker/packager/packager
@@ -1,16 +1,16 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import subprocess
-import os
 import argparse
 import logging
+import os
+import subprocess
 import sys
 from pathlib import Path
 from typing import List, Optional
 
 SCRIPT_PATH = Path(__file__).absolute()
-IMAGE_TYPE = "binary"
-IMAGE_NAME = f"clickhouse/{IMAGE_TYPE}-builder"
+IMAGE_TYPE = "binary-builder"
+IMAGE_NAME = f"clickhouse/{IMAGE_TYPE}"
 
 
 class BuildException(Exception):
@@ -115,12 +115,17 @@ def run_docker_image_with_env(
     subprocess.check_call(cmd, shell=True)
 
 
-def is_release_build(debug_build: bool, package_type: str, sanitizer: str) -> bool:
-    return not debug_build and package_type == "deb" and sanitizer == ""
+def is_release_build(
+    debug_build: bool, package_type: str, sanitizer: str, coverage: bool
+) -> bool:
+    return (
+        not debug_build and package_type == "deb" and sanitizer == "" and not coverage
+    )
 
 
 def parse_env_variables(
     debug_build: bool,
+    coverage: bool,
     compiler: str,
     sanitizer: str,
     package_type: str,
@@ -261,7 +266,7 @@ def parse_env_variables(
         build_target = (
             f"{build_target} clickhouse-odbc-bridge clickhouse-library-bridge"
         )
-        if is_release_build(debug_build, package_type, sanitizer):
+        if is_release_build(debug_build, package_type, sanitizer, coverage):
             cmake_flags.append("-DSPLIT_DEBUG_SYMBOLS=ON")
             result.append("WITH_PERFORMANCE=1")
             if is_cross_arm:
@@ -287,6 +292,9 @@ def parse_env_variables(
     else:
         result.append("BUILD_TYPE=None")
 
+    if coverage:
+        cmake_flags.append("-DSANITIZE_COVERAGE=1 -DBUILD_STANDALONE_KEEPER=0")
+
     if not cache:
         cmake_flags.append("-DCOMPILER_CACHE=disabled")
 
@@ -415,6 +423,11 @@ def parse_args() -> argparse.Namespace:
         choices=("address", "thread", "memory", "undefined", ""),
         default="",
     )
+    parser.add_argument(
+        "--coverage",
+        action="store_true",
+        help="enable granular coverage with introspection",
+    )
 
     parser.add_argument("--clang-tidy", action="store_true")
     parser.add_argument(
@@ -507,6 +520,7 @@ def main() -> None:
 
     env_prepared = parse_env_variables(
         args.debug_build,
+        args.coverage,
         args.compiler,
         args.sanitizer,
         args.package_type,
diff --git a/docker/server/Dockerfile.alpine b/docker/server/Dockerfile.alpine
index 452d8539a48..36f09c092f8 100644
--- a/docker/server/Dockerfile.alpine
+++ b/docker/server/Dockerfile.alpine
@@ -32,7 +32,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.12.2.59"
+ARG VERSION="24.3.2.23"
 ARG PACKAGES="clickhouse-client clickhouse-server clickhouse-common-static"
 ARG DIRECT_DOWNLOAD_URLS=""
 
@@ -42,6 +42,10 @@ ARG DIRECT_DOWNLOAD_URLS=""
 # We do that in advance at the begining of Dockerfile before any packages will be
 # installed to prevent picking those uid / gid by some unrelated software.
 # The same uid / gid (101) is used both for alpine and ubuntu.
+ARG DEFAULT_UID="101"
+ARG DEFAULT_GID="101"
+RUN addgroup -S -g "${DEFAULT_GID}" clickhouse && \
+    adduser -S -h "/var/lib/clickhouse" -s /bin/bash -G clickhouse -g "ClickHouse server" -u "${DEFAULT_UID}" clickhouse
 
 RUN arch=${TARGETARCH:-amd64} \
     && cd /tmp \
@@ -66,23 +70,30 @@ RUN arch=${TARGETARCH:-amd64} \
         fi \
     ; done \
     && rm /tmp/*.tgz /install -r \
-    && addgroup -S -g 101 clickhouse \
-    && adduser -S -h /var/lib/clickhouse -s /bin/bash -G clickhouse -g "ClickHouse server" -u 101 clickhouse \
-    && mkdir -p /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server/config.d /etc/clickhouse-server/users.d /etc/clickhouse-client /docker-entrypoint-initdb.d \
-    && chown clickhouse:clickhouse /var/lib/clickhouse \
-    && chown root:clickhouse /var/log/clickhouse-server \
     && chmod +x /entrypoint.sh \
     && apk add --no-cache bash tzdata \
     && cp /usr/share/zoneinfo/UTC /etc/localtime \
-    && echo "UTC" > /etc/timezone \
-    && chmod ugo+Xrw -R /var/lib/clickhouse /var/log/clickhouse-server /etc/clickhouse-server /etc/clickhouse-client
+    && echo "UTC" > /etc/timezone
 
-# we need to allow "others" access to clickhouse folder, because docker container
-# can be started with arbitrary uid (openshift usecase)
+ARG DEFAULT_CLIENT_CONFIG_DIR="/etc/clickhouse-client"
+ARG DEFAULT_SERVER_CONFIG_DIR="/etc/clickhouse-server"
+ARG DEFAULT_DATA_DIR="/var/lib/clickhouse"
+ARG DEFAULT_LOG_DIR="/var/log/clickhouse-server"
 
+# we need to allow "others" access to ClickHouse folders, because docker containers
+# can be started with arbitrary uids (OpenShift usecase)
+RUN mkdir -p \
+      "${DEFAULT_DATA_DIR}" \
+      "${DEFAULT_LOG_DIR}" \
+      "${DEFAULT_CLIENT_CONFIG_DIR}" \
+      "${DEFAULT_SERVER_CONFIG_DIR}/config.d" \
+      "${DEFAULT_SERVER_CONFIG_DIR}/users.d" \
+      /docker-entrypoint-initdb.d \
+    && chown clickhouse:clickhouse "${DEFAULT_DATA_DIR}" \
+    && chown root:clickhouse "${DEFAULT_LOG_DIR}" \
+    && chmod ugo+Xrw -R "${DEFAULT_DATA_DIR}" "${DEFAULT_LOG_DIR}" "${DEFAULT_CLIENT_CONFIG_DIR}" "${DEFAULT_SERVER_CONFIG_DIR}"
+
+VOLUME "${DEFAULT_DATA_DIR}"
 EXPOSE 9000 8123 9009
 
-VOLUME /var/lib/clickhouse \
-       /var/log/clickhouse-server
-
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu
index 0cefa3c14cb..531a50efe96 100644
--- a/docker/server/Dockerfile.ubuntu
+++ b/docker/server/Dockerfile.ubuntu
@@ -23,14 +23,11 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list
         tzdata \
         wget \
     && apt-get clean \
-    && rm -rf \
-        /var/lib/apt/lists/* \
-        /var/cache/debconf \
-        /tmp/*
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 ARG REPO_CHANNEL="stable"
 ARG REPOSITORY="deb [signed-by=/usr/share/keyrings/clickhouse-keyring.gpg] https://packages.clickhouse.com/deb ${REPO_CHANNEL} main"
-ARG VERSION="23.12.2.59"
+ARG VERSION="24.3.2.23"
 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/server/entrypoint.sh b/docker/server/entrypoint.sh
index b9c7ea34a36..79e809ea7f1 100755
--- a/docker/server/entrypoint.sh
+++ b/docker/server/entrypoint.sh
@@ -49,17 +49,10 @@ CLICKHOUSE_PASSWORD="${CLICKHOUSE_PASSWORD:-}"
 CLICKHOUSE_DB="${CLICKHOUSE_DB:-}"
 CLICKHOUSE_ACCESS_MANAGEMENT="${CLICKHOUSE_DEFAULT_ACCESS_MANAGEMENT:-0}"
 
-for dir in "$DATA_DIR" \
-  "$ERROR_LOG_DIR" \
-  "$LOG_DIR" \
-  "$TMP_DIR" \
-  "$USER_PATH" \
-  "$FORMAT_SCHEMA_PATH" \
-  "${DISKS_PATHS[@]}" \
-  "${DISKS_METADATA_PATHS[@]}"
-do
+function create_directory_and_do_chown() {
+    local dir=$1
     # check if variable not empty
-    [ -z "$dir" ] && continue
+    [ -z "$dir" ] && return
     # ensure directories exist
     if [ "$DO_CHOWN" = "1" ]; then
         mkdir="mkdir"
@@ -81,6 +74,23 @@ do
             chown -R "$USER:$GROUP" "$dir"
         fi
     fi
+}
+
+create_directory_and_do_chown "$DATA_DIR"
+
+# Change working directory to $DATA_DIR in case there're paths relative to $DATA_DIR, also avoids running
+# clickhouse-server at root directory.
+cd "$DATA_DIR"
+
+for dir in "$ERROR_LOG_DIR" \
+  "$LOG_DIR" \
+  "$TMP_DIR" \
+  "$USER_PATH" \
+  "$FORMAT_SCHEMA_PATH" \
+  "${DISKS_PATHS[@]}" \
+  "${DISKS_METADATA_PATHS[@]}"
+do
+    create_directory_and_do_chown "$dir"
 done
 
 # if clickhouse user is defined - create it (user "default" already exists out of box)
@@ -108,13 +118,19 @@ if [ -n "$CLICKHOUSE_USER" ] && [ "$CLICKHOUSE_USER" != "default" ] || [ -n "$CL
 EOT
 fi
 
+CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS="${CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS:-}"
+
 # checking $DATA_DIR for initialization
 if [ -d "${DATA_DIR%/}/data" ]; then
     DATABASE_ALREADY_EXISTS='true'
 fi
 
-# only run initialization on an empty data directory
-if [ -z "${DATABASE_ALREADY_EXISTS}" ]; then
+# run initialization if flag CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS is not empty or data directory is empty
+if [[ -n "${CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS}" || -z "${DATABASE_ALREADY_EXISTS}" ]]; then
+  RUN_INITDB_SCRIPTS='true'
+fi
+
+if [ -n "${RUN_INITDB_SCRIPTS}" ]; then
     if [ -n "$(ls /docker-entrypoint-initdb.d/)" ] || [ -n "$CLICKHOUSE_DB" ]; then
         # port is needed to check if clickhouse-server is ready for connections
         HTTP_PORT="$(clickhouse extract-from-config --config-file "$CLICKHOUSE_CONFIG" --key=http_port --try)"
diff --git a/docker/test/base/Dockerfile b/docker/test/base/Dockerfile
index b48017fdacc..2317f84e0cb 100644
--- a/docker/test/base/Dockerfile
+++ b/docker/test/base/Dockerfile
@@ -13,7 +13,10 @@ RUN apt-get update \
         zstd \
         locales \
         sudo \
-        --yes --no-install-recommends
+        --yes --no-install-recommends \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
+
 
 # Sanitizer options for services (clickhouse-server)
 # Set resident memory limit for TSAN to 45GiB (46080MiB) to avoid OOMs in Stress tests
@@ -30,6 +33,9 @@ ENV TSAN_OPTIONS='halt_on_error=1 abort_on_error=1 history_size=7 memory_limit_m
 ENV UBSAN_OPTIONS='print_stacktrace=1'
 ENV MSAN_OPTIONS='abort_on_error=1 poison_in_dtor=1'
 
+# for external_symbolizer_path
+RUN ln -s /usr/bin/llvm-symbolizer-${LLVM_VERSION} /usr/bin/llvm-symbolizer
+
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
 
diff --git a/docker/test/base/setup_export_logs.sh b/docker/test/base/setup_export_logs.sh
index ea82e071112..8858e12c50e 100755
--- a/docker/test/base/setup_export_logs.sh
+++ b/docker/test/base/setup_export_logs.sh
@@ -17,16 +17,20 @@ CLICKHOUSE_CI_LOGS_CLUSTER=${CLICKHOUSE_CI_LOGS_CLUSTER:-system_logs_export}
 
 EXTRA_COLUMNS=${EXTRA_COLUMNS:-"pull_request_number UInt32, commit_sha String, check_start_time DateTime('UTC'), check_name LowCardinality(String), instance_type LowCardinality(String), instance_id String, INDEX ix_pr (pull_request_number) TYPE set(100), INDEX ix_commit (commit_sha) TYPE set(100), INDEX ix_check_time (check_start_time) TYPE minmax, "}
 EXTRA_COLUMNS_EXPRESSION=${EXTRA_COLUMNS_EXPRESSION:-"CAST(0 AS UInt32) AS pull_request_number, '' AS commit_sha, now() AS check_start_time, toLowCardinality('') AS check_name, toLowCardinality('') AS instance_type, '' AS instance_id"}
-EXTRA_ORDER_BY_COLUMNS=${EXTRA_ORDER_BY_COLUMNS:-"check_name, "}
+EXTRA_ORDER_BY_COLUMNS=${EXTRA_ORDER_BY_COLUMNS:-"check_name"}
 
 # trace_log needs more columns for symbolization
 EXTRA_COLUMNS_TRACE_LOG="${EXTRA_COLUMNS} symbols Array(LowCardinality(String)), lines Array(LowCardinality(String)), "
 EXTRA_COLUMNS_EXPRESSION_TRACE_LOG="${EXTRA_COLUMNS_EXPRESSION}, arrayMap(x -> demangle(addressToSymbol(x)), trace)::Array(LowCardinality(String)) AS symbols, arrayMap(x -> addressToLine(x), trace)::Array(LowCardinality(String)) AS lines"
 
+# coverage_log needs more columns for symbolization, but only symbol names (the line numbers are too heavy to calculate)
+EXTRA_COLUMNS_COVERAGE_LOG="${EXTRA_COLUMNS} symbols Array(LowCardinality(String)), "
+EXTRA_COLUMNS_EXPRESSION_COVERAGE_LOG="${EXTRA_COLUMNS_EXPRESSION}, arrayMap(x -> demangle(addressToSymbol(x)), coverage)::Array(LowCardinality(String)) AS symbols"
+
 
 function __set_connection_args
 {
-    # It's impossible to use generous $CONNECTION_ARGS string, it's unsafe from word splitting perspective.
+    # It's impossible to use a generic $CONNECTION_ARGS string, it's unsafe from word splitting perspective.
     # That's why we must stick to the generated option
     CONNECTION_ARGS=(
         --receive_timeout=45 --send_timeout=45 --secure
@@ -129,6 +133,19 @@ function setup_logs_replication
     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%'")
     echo "Build is debug or sanitizer: $debug_or_sanitizer_build"
 
+    # We will pre-create a table system.coverage_log.
+    # It is normally created by clickhouse-test rather than the server,
+    # so we will create it in advance to make it be picked up by the next commands:
+
+    clickhouse-client --query "
+        CREATE TABLE IF NOT EXISTS system.coverage_log
+        (
+            time DateTime COMMENT 'The time of test run',
+            test_name String COMMENT 'The name of the test',
+            coverage Array(UInt64) COMMENT 'An array of addresses of the code (a subset of addresses instrumented for coverage) that were encountered during the test run'
+        ) ENGINE = Null COMMENT 'Contains information about per-test coverage from the CI, but used only for exporting to the CI cluster'
+    "
+
     # For each system log table:
     echo 'Create %_log tables'
     clickhouse-client --query "SHOW TABLES FROM system LIKE '%\\_log'" | while read -r table
@@ -139,11 +156,16 @@ function setup_logs_replication
             # Do not try to resolve stack traces in case of debug/sanitizers
             # build, since it is too slow (flushing of trace_log can take ~1min
             # with such MV attached)
-            if [[ "$debug_or_sanitizer_build" = 1 ]]; then
+            if [[ "$debug_or_sanitizer_build" = 1 ]]
+            then
                 EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION}"
             else
                 EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION_TRACE_LOG}"
             fi
+        elif [[ "$table" = "coverage_log" ]]
+        then
+            EXTRA_COLUMNS_FOR_TABLE="${EXTRA_COLUMNS_COVERAGE_LOG}"
+            EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION_COVERAGE_LOG}"
         else
             EXTRA_COLUMNS_FOR_TABLE="${EXTRA_COLUMNS}"
             EXTRA_COLUMNS_EXPRESSION_FOR_TABLE="${EXTRA_COLUMNS_EXPRESSION}"
@@ -160,7 +182,7 @@ function setup_logs_replication
         # Create the destination table with adapted name and structure:
         statement=$(clickhouse-client --format TSVRaw --query "SHOW CREATE TABLE system.${table}" | sed -r -e '
             s/^\($/('"$EXTRA_COLUMNS_FOR_TABLE"'/;
-            s/ORDER BY \(/ORDER BY ('"$EXTRA_ORDER_BY_COLUMNS"'/;
+            s/^ORDER BY (([^\(].+?)|\((.+?)\))$/ORDER BY ('"$EXTRA_ORDER_BY_COLUMNS"', \2\3)/;
             s/^CREATE TABLE system\.\w+_log$/CREATE TABLE IF NOT EXISTS '"$table"'_'"$hash"'/;
             /^TTL /d
             ')
@@ -168,7 +190,7 @@ function setup_logs_replication
         echo -e "Creating remote destination table ${table}_${hash} with statement:\n${statement}" >&2
 
         echo "$statement" | clickhouse-client --database_replicated_initial_query_timeout_sec=10 \
-            --distributed_ddl_task_timeout=30 \
+            --distributed_ddl_task_timeout=30 --distributed_ddl_output_mode=throw_only_active \
             "${CONNECTION_ARGS[@]}" || continue
 
         echo "Creating table system.${table}_sender" >&2
diff --git a/docker/test/fasttest/Dockerfile b/docker/test/fasttest/Dockerfile
index a38f59dacac..912ff191e57 100644
--- a/docker/test/fasttest/Dockerfile
+++ b/docker/test/fasttest/Dockerfile
@@ -6,9 +6,17 @@ FROM clickhouse/test-util:$FROM_TAG
 RUN apt-get update \
     && apt-get install \
         brotli \
+        clang-${LLVM_VERSION} \
+        clang-tidy-${LLVM_VERSION} \
+        cmake \
         expect \
         file \
+        libclang-${LLVM_VERSION}-dev \
+        libclang-rt-${LLVM_VERSION}-dev \
+        lld-${LLVM_VERSION} \
+        llvm-${LLVM_VERSION}-dev \
         lsof \
+        ninja-build \
         odbcinst \
         psmisc \
         python3 \
@@ -20,23 +28,61 @@ RUN apt-get update \
         pv \
         jq \
         zstd \
-    --yes --no-install-recommends
+        --yes --no-install-recommends \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-RUN pip3 install numpy scipy pandas Jinja2
+RUN pip3 install numpy==1.26.3 scipy==1.12.0 pandas==1.5.3 Jinja2==3.1.3
 
-ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
+# This symlink is required by gcc to find the lld linker
+RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
+# FIXME: workaround for "The imported target "merge-fdata" references the file" error
+# https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/commit/992e52c0b156a5ba9c6a8a54f8c4857ddd3d371d
+RUN sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' /usr/lib/llvm-${LLVM_VERSION}/lib/cmake/llvm/LLVMExports-*.cmake
 
-RUN mkdir -p /tmp/clickhouse-odbc-tmp \
-  && wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
-  && cp /tmp/clickhouse-odbc-tmp/lib64/*.so /usr/local/lib/ \
-  && odbcinst -i -d -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbcinst.ini.sample \
-  && odbcinst -i -s -l -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbc.ini.sample \
-  && rm -rf /tmp/clickhouse-odbc-tmp \
+ARG CCACHE_VERSION=4.6.1
+RUN mkdir /tmp/ccache \
+    && cd /tmp/ccache \
+    && curl -L \
+        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz \
+        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz.asc \
+    && gpg --recv-keys --keyserver hkps://keyserver.ubuntu.com 5A939A71A46792CF57866A51996DDA075594ADB8 \
+    && gpg --verify ccache-4.6.1.tar.xz.asc \
+    && tar xf ccache-$CCACHE_VERSION.tar.xz \
+    && cd /tmp/ccache/ccache-$CCACHE_VERSION \
+    && cmake -DCMAKE_INSTALL_PREFIX=/usr \
+        -DCMAKE_BUILD_TYPE=None \
+        -DZSTD_FROM_INTERNET=ON \
+        -DREDIS_STORAGE_BACKEND=OFF \
+        -Wno-dev \
+        -B build \
+        -S . \
+    && make VERBOSE=1 -C build \
+    && make install -C build \
+    && cd / \
+    && rm -rf /tmp/ccache
+
+ARG TARGETARCH
+ARG SCCACHE_VERSION=v0.7.7
+ENV SCCACHE_IGNORE_SERVER_IO_ERROR=1
+# sccache requires a value for the region. So by default we use The Default Region
+ENV SCCACHE_REGION=us-east-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
+
+# Give suid to gdb to grant it attach permissions
+# chmod 777 to make the container user independent
+RUN chmod u+s /usr/bin/gdb \
   && mkdir -p /var/lib/clickhouse \
   && chmod 777 /var/lib/clickhouse
 
-# chmod 777 to make the container user independent
-
 ENV TZ=Europe/Amsterdam
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh
index 5af05034415..d78c52f1fe6 100755
--- a/docker/test/fasttest/run.sh
+++ b/docker/test/fasttest/run.sh
@@ -211,6 +211,17 @@ function build
         echo "build_clickhouse_fasttest_binary: [ OK ] $BUILD_SECONDS_ELAPSED sec." \
           | ts '%Y-%m-%d %H:%M:%S' \
           | tee "$FASTTEST_OUTPUT/test_result.txt"
+
+        (
+            # This query should fail, and print stacktrace with proper symbol names (even on a stripped binary)
+            clickhouse_output=$(programs/clickhouse-stripped --stacktrace -q 'select' 2>&1 || :)
+            if [[ $clickhouse_output =~ DB::LocalServer::main ]]; then
+                echo "stripped_clickhouse_shows_symbols_names: [ OK ] 0 sec."
+            else
+                echo -e "stripped_clickhouse_shows_symbols_names: [ FAIL ] 0 sec. - clickhouse output:\n\n$clickhouse_output\n"
+            fi
+        ) | ts '%Y-%m-%d %H:%M:%S' | tee -a "$FASTTEST_OUTPUT/test_result.txt"
+
         if [ "$COPY_CLICKHOUSE_BINARY_TO_OUTPUT" -eq "1" ]; then
             mkdir -p "$FASTTEST_OUTPUT/binaries/"
             cp programs/clickhouse "$FASTTEST_OUTPUT/binaries/clickhouse"
diff --git a/docker/test/fuzzer/Dockerfile b/docker/test/fuzzer/Dockerfile
index 0bc0fb06633..d3f78ac1d95 100644
--- a/docker/test/fuzzer/Dockerfile
+++ b/docker/test/fuzzer/Dockerfile
@@ -29,7 +29,7 @@ RUN apt-get update \
             wget \
     && apt-get autoremove --yes \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 RUN pip3 install Jinja2
 
diff --git a/docker/test/fuzzer/run-fuzzer.sh b/docker/test/fuzzer/run-fuzzer.sh
index 8aeb06ec27b..76661a5b51c 100755
--- a/docker/test/fuzzer/run-fuzzer.sh
+++ b/docker/test/fuzzer/run-fuzzer.sh
@@ -86,7 +86,7 @@ function download
 
     chmod +x clickhouse
     # clickhouse may be compressed - run once to decompress
-    ./clickhouse ||:
+    ./clickhouse --query "SELECT 1" ||:
     ln -s ./clickhouse ./clickhouse-server
     ln -s ./clickhouse ./clickhouse-client
     ln -s ./clickhouse ./clickhouse-local
@@ -173,9 +173,23 @@ function fuzz
 
     mkdir -p /var/run/clickhouse-server
 
-    # NOTE: we use process substitution here to preserve keep $! as a pid of clickhouse-server
-    clickhouse-server --config-file db/config.xml --pid-file /var/run/clickhouse-server/clickhouse-server.pid -- --path db > server.log 2>&1 &
-    server_pid=$!
+    # server.log -> All server logs, including sanitizer
+    # stderr.log -> Process logs (sanitizer) only
+    clickhouse-server \
+        --config-file db/config.xml \
+        --pid-file /var/run/clickhouse-server/clickhouse-server.pid \
+        --  --path db \
+            --logger.console=0 \
+            --logger.log=server.log 2>&1 | tee -a stderr.log >> server.log 2>&1 &
+    for _ in {1..30}
+    do
+        if clickhouse-client --query "select 1"
+        then
+            break
+        fi
+        sleep 1
+    done
+    server_pid=$(cat /var/run/clickhouse-server/clickhouse-server.pid)
 
     kill -0 $server_pid
 
@@ -242,11 +256,17 @@ quit
         --create-query-fuzzer-runs=50 \
         --queries-file $(ls -1 ch/tests/queries/0_stateless/*.sql | sort -R) \
         $NEW_TESTS_OPT \
-        > >(tail -n 100000 > fuzzer.log) \
+        > fuzzer.log \
         2>&1 &
     fuzzer_pid=$!
     echo "Fuzzer pid is $fuzzer_pid"
 
+    # The fuzzer_pid belongs to the timeout process.
+    actual_fuzzer_pid=$(ps -o pid= --ppid "$fuzzer_pid")
+
+    echo "Attaching gdb to the fuzzer itself"
+    gdb -batch -command script.gdb -p $actual_fuzzer_pid &
+
     # Wait for the fuzzer to complete.
     # Note that the 'wait || ...' thing is required so that the script doesn't
     # exit because of 'set -e' when 'wait' returns nonzero code.
@@ -337,10 +357,9 @@ quit
         # which is confusing.
         task_exit_code=$fuzzer_exit_code
         echo "failure" > status.txt
-        { rg -ao "Found error:.*" fuzzer.log \
-            || rg -ao "Exception:.*" fuzzer.log \
-            || echo "Fuzzer failed ($fuzzer_exit_code). See the logs." ; } \
-            | tail -1 > description.txt
+        echo "Let op!" > description.txt
+        echo "Fuzzer went wrong with error code: ($fuzzer_exit_code). Its process died somehow when the server stayed alive. The server log probably won't tell you much so try to find information in other files." >>description.txt
+        { rg -ao "Found error:.*" fuzzer.log || rg -ao "Exception:.*" fuzzer.log; } | tail -1 >>description.txt
     fi
 
     if test -f core.*; then
@@ -386,10 +405,17 @@ if [ -f core.zst ]; then
     CORE_LINK='<a href="core.zst">core.zst</a>'
 fi
 
-rg --text -F '<Fatal>' server.log > fatal.log ||:
+# Keep all the lines in the paragraphs containing <Fatal> that either contain <Fatal> or don't start with 20... (year)
+sed -n '/<Fatal>/,/^$/p' server.log | awk '/<Fatal>/ || !/^20/' > fatal.log ||:
+FATAL_LINK=''
+if [ -s fatal.log ]; then
+    FATAL_LINK='<a href="fatal.log">fatal.log</a>'
+fi
+
 dmesg -T > dmesg.log ||:
 
-zstd --threads=0 server.log
+zstd --threads=0 --rm server.log
+zstd --threads=0 --rm fuzzer.log
 
 cat > report.html <<EOF ||:
 <!DOCTYPE html>
@@ -413,11 +439,13 @@ p.links a { padding: 5px; margin: 3px; background: #FFF; line-height: 2; white-s
 <h1>AST Fuzzer for PR <a href="https://github.com/ClickHouse/ClickHouse/pull/${PR_TO_TEST}">#${PR_TO_TEST}</a> @ ${SHA_TO_TEST}</h1>
 <p class="links">
   <a href="run.log">run.log</a>
-  <a href="fuzzer.log">fuzzer.log</a>
+  <a href="fuzzer.log.zst">fuzzer.log.zst</a>
   <a href="server.log.zst">server.log.zst</a>
+  <a href="stderr.log">stderr.log</a>
   <a href="main.log">main.log</a>
   <a href="dmesg.log">dmesg.log</a>
   ${CORE_LINK}
+  ${FATAL_LINK}
 </p>
 <table>
 <tr>
diff --git a/docker/test/install/deb/Dockerfile b/docker/test/install/deb/Dockerfile
index e9c928b1fe7..71daffa6f2a 100644
--- a/docker/test/install/deb/Dockerfile
+++ b/docker/test/install/deb/Dockerfile
@@ -10,13 +10,13 @@ ENV \
   init=/lib/systemd/systemd
 
 # install systemd packages
-RUN apt-get update && \
-  apt-get install -y --no-install-recommends \
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends \
     sudo \
     systemd \
-    && \
-  apt-get clean && \
-  rm -rf /var/lib/apt/lists
+    \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # configure systemd
 # remove systemd 'wants' triggers
diff --git a/docker/test/integration/hive_server/Dockerfile b/docker/test/integration/hive_server/Dockerfile
index e37e2800557..e34899e3329 100644
--- a/docker/test/integration/hive_server/Dockerfile
+++ b/docker/test/integration/hive_server/Dockerfile
@@ -1,31 +1,27 @@
 FROM ubuntu:20.04
 MAINTAINER lgbo-ustc <lgbo.ustc@gmail.com>
 
-RUN apt-get update 
-RUN apt-get install -y wget openjdk-8-jre
-
-RUN wget https://archive.apache.org/dist/hadoop/common/hadoop-3.1.0/hadoop-3.1.0.tar.gz && \
-        tar -xf hadoop-3.1.0.tar.gz && rm -rf hadoop-3.1.0.tar.gz
-RUN wget https://apache.apache.org/dist/hive/hive-2.3.9/apache-hive-2.3.9-bin.tar.gz && \
-        tar -xf apache-hive-2.3.9-bin.tar.gz && rm -rf apache-hive-2.3.9-bin.tar.gz
-RUN apt install -y vim
-
-RUN apt install -y openssh-server openssh-client
-
-RUN apt install -y mysql-server
-
-RUN mkdir -p /root/.ssh && \
-        ssh-keygen -t rsa -b 2048 -P '' -f /root/.ssh/id_rsa && \
-        cat /root/.ssh/id_rsa.pub > /root/.ssh/authorized_keys && \
-        cp /root/.ssh/id_rsa /etc/ssh/ssh_host_rsa_key && \
-        cp /root/.ssh/id_rsa.pub /etc/ssh/ssh_host_rsa_key.pub
-
-RUN wget https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.27.tar.gz &&\
-        tar -xf mysql-connector-java-8.0.27.tar.gz && \
-        mv mysql-connector-java-8.0.27/mysql-connector-java-8.0.27.jar /apache-hive-2.3.9-bin/lib/ && \
-        rm -rf mysql-connector-java-8.0.27.tar.gz mysql-connector-java-8.0.27
-
-RUN apt install -y iputils-ping net-tools
+RUN apt-get update \
+  && apt-get install -y wget openjdk-8-jre \
+  && wget https://archive.apache.org/dist/hadoop/common/hadoop-3.1.0/hadoop-3.1.0.tar.gz \
+  && tar -xf hadoop-3.1.0.tar.gz && rm -rf hadoop-3.1.0.tar.gz \
+  && wget https://apache.apache.org/dist/hive/hive-2.3.9/apache-hive-2.3.9-bin.tar.gz \
+  && tar -xf apache-hive-2.3.9-bin.tar.gz && rm -rf apache-hive-2.3.9-bin.tar.gz \
+  && apt install -y vim \
+  && apt install -y openssh-server openssh-client \
+  && apt install -y mysql-server \
+  && mkdir -p /root/.ssh \
+  && ssh-keygen -t rsa -b 2048 -P '' -f /root/.ssh/id_rsa \
+  && cat /root/.ssh/id_rsa.pub > /root/.ssh/authorized_keys \
+  && cp /root/.ssh/id_rsa /etc/ssh/ssh_host_rsa_key \
+  && cp /root/.ssh/id_rsa.pub /etc/ssh/ssh_host_rsa_key.pub \
+  && wget https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-8.0.27.tar.gz \
+  && tar -xf mysql-connector-java-8.0.27.tar.gz \
+  && mv mysql-connector-java-8.0.27/mysql-connector-java-8.0.27.jar /apache-hive-2.3.9-bin/lib/ \
+  && rm -rf mysql-connector-java-8.0.27.tar.gz mysql-connector-java-8.0.27 \
+  && apt install -y iputils-ping net-tools \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 ENV JAVA_HOME=/usr
 ENV HADOOP_HOME=/hadoop-3.1.0
@@ -44,4 +40,3 @@ COPY demo_data.txt /
 ENV PATH=/apache-hive-2.3.9-bin/bin:/hadoop-3.1.0/bin:/hadoop-3.1.0/sbin:$PATH
 RUN service ssh start && sed s/HOSTNAME/$HOSTNAME/ /hadoop-3.1.0/etc/hadoop/core-site.xml.template > /hadoop-3.1.0/etc/hadoop/core-site.xml && hdfs namenode -format
 COPY start.sh /
-
diff --git a/docker/test/integration/postgresql_java_client/Dockerfile b/docker/test/integration/postgresql_java_client/Dockerfile
index f5484028ec9..c5583085ef3 100644
--- a/docker/test/integration/postgresql_java_client/Dockerfile
+++ b/docker/test/integration/postgresql_java_client/Dockerfile
@@ -3,14 +3,10 @@
 
 FROM ubuntu:18.04
 
-RUN apt-get update && \
-    apt-get install -y software-properties-common build-essential openjdk-8-jdk curl
-
-RUN rm -rf \
-        /var/lib/apt/lists/* \
-        /var/cache/debconf \
-        /tmp/* \
-RUN apt-get clean
+RUN apt-get update \
+    && apt-get install -y software-properties-common build-essential openjdk-8-jdk curl \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 ARG ver=42.2.12
 RUN curl -L -o /postgresql-java-${ver}.jar https://repo1.maven.org/maven2/org/postgresql/postgresql/${ver}/postgresql-${ver}.jar
diff --git a/docker/test/integration/runner/Dockerfile b/docker/test/integration/runner/Dockerfile
index c795fbf0672..8297a7100d1 100644
--- a/docker/test/integration/runner/Dockerfile
+++ b/docker/test/integration/runner/Dockerfile
@@ -37,11 +37,8 @@ RUN apt-get update \
     libkrb5-dev \
     krb5-user \
     g++ \
-    && rm -rf \
-        /var/lib/apt/lists/* \
-        /var/cache/debconf \
-        /tmp/* \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 ENV TZ=Etc/UTC
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -62,47 +59,49 @@ RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \
     && dockerd --version; docker --version
 
 
+# kazoo 2.10.0 is broken
+# https://s3.amazonaws.com/clickhouse-test-reports/59337/524625a1d2f4cc608a3f1059e3df2c30f353a649/integration_tests__asan__analyzer__[5_6].html
 RUN python3 -m pip install --no-cache-dir \
-    PyMySQL \
-    aerospike==11.1.0 \
-    asyncio \
+    PyMySQL==1.1.0 \
+    asyncio==3.4.3 \
     avro==1.10.2 \
-    azure-storage-blob \
-    boto3 \
-    cassandra-driver \
-    confluent-kafka==1.9.2 \
+    azure-storage-blob==12.19.0 \
+    boto3==1.34.24 \
+    cassandra-driver==3.29.0 \
+    confluent-kafka==2.3.0 \
     delta-spark==2.3.0 \
-    dict2xml \
-    dicttoxml \
+    dict2xml==1.7.4 \
+    dicttoxml==1.7.16 \
     docker==6.1.3 \
     docker-compose==1.29.2 \
-    grpcio \
-    grpcio-tools \
-    kafka-python \
-    kazoo \
-    lz4 \
-    minio \
-    nats-py \
-    protobuf \
+    grpcio==1.60.0 \
+    grpcio-tools==1.60.0 \
+    kafka-python==2.0.2 \
+    lz4==4.3.3 \
+    minio==7.2.3 \
+    nats-py==2.6.0 \
+    protobuf==4.25.2 \
+    kazoo==2.9.0 \
     psycopg2-binary==2.9.6 \
-    pyhdfs \
+    pyhdfs==0.3.1 \
     pymongo==3.11.0 \
     pyspark==3.3.2 \
-    pytest \
+    pytest==7.4.4 \
     pytest-order==1.0.0 \
-    pytest-random \
-    pytest-repeat \
-    pytest-timeout \
-    pytest-xdist \
-    pytz \
+    pytest-random==0.2 \
+    pytest-repeat==0.9.3 \
+    pytest-timeout==2.2.0 \
+    pytest-xdist==3.5.0 \
+    pytest-reportlog==0.4.0 \
+    pytz==2023.3.post1 \
     pyyaml==5.3.1 \
-    redis \
-    requests-kerberos \
+    redis==5.0.1 \
+    requests-kerberos==0.14.0 \
     tzlocal==2.1 \
-    retry \
-    bs4 \
-    lxml \
-    urllib3
+    retry==0.9.2 \
+    bs4==0.0.2 \
+    lxml==5.1.0 \
+    urllib3==2.0.7
 # bs4, lxml are for cloud tests, do not delete
 
 # Hudi supports only spark 3.3.*, not 3.4
@@ -127,7 +126,6 @@ RUN set -x \
 
 COPY modprobe.sh /usr/local/bin/modprobe
 COPY dockerd-entrypoint.sh /usr/local/bin/
-COPY compose/ /compose/
 COPY misc/ /misc/
 
 
diff --git a/docker/test/integration/runner/dockerd-entrypoint.sh b/docker/test/integration/runner/dockerd-entrypoint.sh
index b05aef76faf..8882daa38ea 100755
--- a/docker/test/integration/runner/dockerd-entrypoint.sh
+++ b/docker/test/integration/runner/dockerd-entrypoint.sh
@@ -23,13 +23,15 @@ if [ -f /sys/fs/cgroup/cgroup.controllers ]; then
         > /sys/fs/cgroup/cgroup.subtree_control
 fi
 
-# In case of test hung it is convenient to use pytest --pdb to debug it,
-# 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
 # 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 &
+#
+# In case of test hung it is convenient to use pytest --pdb to debug it,
+# and on hung you can simply press Ctrl-C and it will spawn a python pdb,
+# but on SIGINT dockerd will exit, so we spawn new session to ignore SIGINT by
+# docker.
+# Note, that if you will run it via runner, it will send SIGINT to docker anyway.
+setsid 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
diff --git a/docker/test/keeper-jepsen/Dockerfile b/docker/test/keeper-jepsen/Dockerfile
index a794e076ec0..3c5d0a6ecb4 100644
--- a/docker/test/keeper-jepsen/Dockerfile
+++ b/docker/test/keeper-jepsen/Dockerfile
@@ -24,7 +24,10 @@ RUN mkdir "/root/.ssh"
 RUN touch "/root/.ssh/known_hosts"
 
 # install java
-RUN apt-get update && apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends
+RUN apt-get update && \
+    apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # install clojure
 RUN curl -O "https://download.clojure.org/install/linux-install-${CLOJURE_VERSION}.sh" && \
diff --git a/docker/test/libfuzzer/Dockerfile b/docker/test/libfuzzer/Dockerfile
index 081cf5473f8..c9802a0e44e 100644
--- a/docker/test/libfuzzer/Dockerfile
+++ b/docker/test/libfuzzer/Dockerfile
@@ -27,7 +27,7 @@ RUN apt-get update \
             wget \
     && apt-get autoremove --yes \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 RUN pip3 install Jinja2
 
diff --git a/docker/test/performance-comparison/Dockerfile b/docker/test/performance-comparison/Dockerfile
index e4ced104445..1835900b316 100644
--- a/docker/test/performance-comparison/Dockerfile
+++ b/docker/test/performance-comparison/Dockerfile
@@ -37,7 +37,7 @@ RUN apt-get update \
     && apt-get purge --yes python3-dev g++ \
     && apt-get autoremove --yes \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 COPY run.sh /
 
diff --git a/docker/test/server-jepsen/Dockerfile b/docker/test/server-jepsen/Dockerfile
index a212427b2a1..fd70fc45702 100644
--- a/docker/test/server-jepsen/Dockerfile
+++ b/docker/test/server-jepsen/Dockerfile
@@ -31,7 +31,9 @@ RUN mkdir "/root/.ssh"
 RUN touch "/root/.ssh/known_hosts"
 
 # install java
-RUN apt-get update && apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends
+RUN apt-get update && apt-get install default-jre default-jdk libjna-java libjna-jni ssh gnuplot graphviz --yes --no-install-recommends \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # install clojure
 RUN curl -O "https://download.clojure.org/install/linux-install-${CLOJURE_VERSION}.sh" && \
diff --git a/docker/test/server-jepsen/run.sh b/docker/test/server-jepsen/run.sh
index 81e442e65b6..09198ca1968 100644
--- a/docker/test/server-jepsen/run.sh
+++ b/docker/test/server-jepsen/run.sh
@@ -20,6 +20,8 @@ if [ -n "$WITH_LOCAL_BINARY" ]; then
     clickhouse_source="--clickhouse-source /clickhouse"
 fi
 
+# $TESTS_TO_RUN comes from docker
+# shellcheck disable=SC2153
 tests_count="--test-count $TESTS_TO_RUN"
 tests_to_run="test-all"
 workload=""
@@ -47,6 +49,6 @@ fi
 
 cd "$CLICKHOUSE_REPO_PATH/tests/jepsen.clickhouse"
 
-(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"
+(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/sqlancer/Dockerfile b/docker/test/sqlancer/Dockerfile
index 5977044345e..82fc2598397 100644
--- a/docker/test/sqlancer/Dockerfile
+++ b/docker/test/sqlancer/Dockerfile
@@ -5,9 +5,10 @@ FROM ubuntu:22.04
 ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
-RUN apt-get update --yes && \
-	env DEBIAN_FRONTEND=noninteractive apt-get install wget git default-jdk maven python3 --yes --no-install-recommends && \
-	apt-get clean
+RUN apt-get update --yes \
+    && env DEBIAN_FRONTEND=noninteractive apt-get install wget git default-jdk maven python3 --yes --no-install-recommends  \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 # We need to get the repository's HEAD each time despite, so we invalidate layers' cache
 ARG CACHE_INVALIDATOR=0
diff --git a/docker/test/sqllogic/Dockerfile b/docker/test/sqllogic/Dockerfile
index 48457a99de3..1ea1e52e6fa 100644
--- a/docker/test/sqllogic/Dockerfile
+++ b/docker/test/sqllogic/Dockerfile
@@ -15,7 +15,8 @@ RUN apt-get update --yes \
             unixodbc-dev \
             odbcinst \
             sudo \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 RUN pip3 install \
     numpy \
@@ -23,17 +24,18 @@ RUN pip3 install \
     deepdiff \
     sqlglot
 
-ARG odbc_repo="https://github.com/ClickHouse/clickhouse-odbc.git"
+ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.6.20200320/clickhouse-odbc-1.1.6-Linux.tar.gz"
+
+RUN mkdir -p /tmp/clickhouse-odbc-tmp \
+  && cd /tmp/clickhouse-odbc-tmp \
+  && curl -L ${odbc_driver_url} | tar --strip-components=1 -xz clickhouse-odbc-1.1.6-Linux \
+  && mkdir /usr/local/lib64 -p \
+  && cp /tmp/clickhouse-odbc-tmp/lib64/*.so /usr/local/lib64/ \
+  && odbcinst -i -d -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbcinst.ini.sample \
+  && odbcinst -i -s -l -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbc.ini.sample \
+  && sed -i 's"=libclickhouseodbc"=/usr/local/lib64/libclickhouseodbc"' /etc/odbcinst.ini \
+  && rm -rf /tmp/clickhouse-odbc-tmp
 
-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=9000
diff --git a/docker/test/sqltest/Dockerfile b/docker/test/sqltest/Dockerfile
index 437677f4fd1..7f59f65761f 100644
--- a/docker/test/sqltest/Dockerfile
+++ b/docker/test/sqltest/Dockerfile
@@ -11,7 +11,8 @@ RUN apt-get update --yes \
             python3-dev \
             python3-pip \
             sudo \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 RUN pip3 install \
     pyyaml \
diff --git a/docker/test/stateful/Dockerfile b/docker/test/stateful/Dockerfile
index f513735a2d0..355e70f180e 100644
--- a/docker/test/stateful/Dockerfile
+++ b/docker/test/stateful/Dockerfile
@@ -9,16 +9,9 @@ RUN apt-get update -y \
         python3-requests \
         nodejs \
         npm \
-    && apt-get clean
-
-COPY s3downloader /s3downloader
-
-ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com"
-ENV DATASETS="hits visits"
-
-# The following is already done in clickhouse/stateless-test
-# RUN npm install -g azurite
-# RUN npm install tslib
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
+COPY create.sql /
 COPY run.sh /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stateful/create.sql b/docker/test/stateful/create.sql
new file mode 100644
index 00000000000..14e592ab5e3
--- /dev/null
+++ b/docker/test/stateful/create.sql
@@ -0,0 +1,333 @@
+ATTACH TABLE datasets.hits_v1 UUID '78ebf6a1-d987-4579-b3ec-00c1a087b1f3'
+(
+    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 disk = disk(type = cache, path = '/var/lib/clickhouse/filesystem_caches/stateful/', max_size = '4G',
+         disk = disk(type = web, endpoint = 'https://clickhouse-datasets-web.s3.us-east-1.amazonaws.com/'));
+
+ATTACH TABLE datasets.visits_v1 UUID '5131f834-711f-4168-98a5-968b691a104b'
+(
+    CounterID UInt32,
+    StartDate Date,
+    Sign Int8,
+    IsNew UInt8,
+    VisitID UInt64,
+    UserID UInt64,
+    StartTime DateTime,
+    Duration UInt32,
+    UTCStartTime DateTime,
+    PageViews Int32,
+    Hits Int32,
+    IsBounce UInt8,
+    Referer String,
+    StartURL String,
+    RefererDomain String,
+    StartURLDomain String,
+    EndURL String,
+    LinkURL String,
+    IsDownload UInt8,
+    TraficSourceID Int8,
+    SearchEngineID UInt16,
+    SearchPhrase String,
+    AdvEngineID UInt8,
+    PlaceID Int32,
+    RefererCategories Array(UInt16),
+    URLCategories Array(UInt16),
+    URLRegions Array(UInt32),
+    RefererRegions Array(UInt32),
+    IsYandex UInt8,
+    GoalReachesDepth Int32,
+    GoalReachesURL Int32,
+    GoalReachesAny Int32,
+    SocialSourceNetworkID UInt8,
+    SocialSourcePage String,
+    MobilePhoneModel String,
+    ClientEventTime DateTime,
+    RegionID UInt32,
+    ClientIP UInt32,
+    ClientIP6 FixedString(16),
+    RemoteIP UInt32,
+    RemoteIP6 FixedString(16),
+    IPNetworkID UInt32,
+    SilverlightVersion3 UInt32,
+    CodeVersion UInt32,
+    ResolutionWidth UInt16,
+    ResolutionHeight UInt16,
+    UserAgentMajor UInt16,
+    UserAgentMinor UInt16,
+    WindowClientWidth UInt16,
+    WindowClientHeight UInt16,
+    SilverlightVersion2 UInt8,
+    SilverlightVersion4 UInt16,
+    FlashVersion3 UInt16,
+    FlashVersion4 UInt16,
+    ClientTimeZone Int16,
+    OS UInt8,
+    UserAgent UInt8,
+    ResolutionDepth UInt8,
+    FlashMajor UInt8,
+    FlashMinor UInt8,
+    NetMajor UInt8,
+    NetMinor UInt8,
+    MobilePhone UInt8,
+    SilverlightVersion1 UInt8,
+    Age UInt8,
+    Sex UInt8,
+    Income UInt8,
+    JavaEnable UInt8,
+    CookieEnable UInt8,
+    JavascriptEnable UInt8,
+    IsMobile UInt8,
+    BrowserLanguage UInt16,
+    BrowserCountry UInt16,
+    Interests UInt16,
+    Robotness UInt8,
+    GeneralInterests Array(UInt16),
+    Params Array(String),
+    "Goals.ID" Array(UInt32),
+    "Goals.Serial" Array(UInt32),
+    "Goals.EventTime" Array(DateTime),
+    "Goals.Price" Array(Int64),
+    "Goals.OrderID" Array(String),
+    "Goals.CurrencyID" Array(UInt32),
+    WatchIDs Array(UInt64),
+    ParamSumPrice Int64,
+    ParamCurrency FixedString(3),
+    ParamCurrencyID UInt16,
+    ClickLogID UInt64,
+    ClickEventID Int32,
+    ClickGoodEvent Int32,
+    ClickEventTime DateTime,
+    ClickPriorityID Int32,
+    ClickPhraseID Int32,
+    ClickPageID Int32,
+    ClickPlaceID Int32,
+    ClickTypeID Int32,
+    ClickResourceID Int32,
+    ClickCost UInt32,
+    ClickClientIP UInt32,
+    ClickDomainID UInt32,
+    ClickURL String,
+    ClickAttempt UInt8,
+    ClickOrderID UInt32,
+    ClickBannerID UInt32,
+    ClickMarketCategoryID UInt32,
+    ClickMarketPP UInt32,
+    ClickMarketCategoryName String,
+    ClickMarketPPName String,
+    ClickAWAPSCampaignName String,
+    ClickPageName String,
+    ClickTargetType UInt16,
+    ClickTargetPhraseID UInt64,
+    ClickContextType UInt8,
+    ClickSelectType Int8,
+    ClickOptions String,
+    ClickGroupBannerID Int32,
+    OpenstatServiceName String,
+    OpenstatCampaignID String,
+    OpenstatAdID String,
+    OpenstatSourceID String,
+    UTMSource String,
+    UTMMedium String,
+    UTMCampaign String,
+    UTMContent String,
+    UTMTerm String,
+    FromTag String,
+    HasGCLID UInt8,
+    FirstVisit DateTime,
+    PredLastVisit Date,
+    LastVisit Date,
+    TotalVisits UInt32,
+    "TraficSource.ID" Array(Int8),
+    "TraficSource.SearchEngineID" Array(UInt16),
+    "TraficSource.AdvEngineID" Array(UInt8),
+    "TraficSource.PlaceID" Array(UInt16),
+    "TraficSource.SocialSourceNetworkID" Array(UInt8),
+    "TraficSource.Domain" Array(String),
+    "TraficSource.SearchPhrase" Array(String),
+    "TraficSource.SocialSourcePage" Array(String),
+    Attendance FixedString(16),
+    CLID UInt32,
+    YCLID UInt64,
+    NormalizedRefererHash UInt64,
+    SearchPhraseHash UInt64,
+    RefererDomainHash UInt64,
+    NormalizedStartURLHash UInt64,
+    StartURLDomainHash UInt64,
+    NormalizedEndURLHash UInt64,
+    TopLevelDomain UInt64,
+    URLScheme UInt64,
+    OpenstatServiceNameHash UInt64,
+    OpenstatCampaignIDHash UInt64,
+    OpenstatAdIDHash UInt64,
+    OpenstatSourceIDHash UInt64,
+    UTMSourceHash UInt64,
+    UTMMediumHash UInt64,
+    UTMCampaignHash UInt64,
+    UTMContentHash UInt64,
+    UTMTermHash UInt64,
+    FromHash UInt64,
+    WebVisorEnabled UInt8,
+    WebVisorActivity UInt32,
+    "ParsedParams.Key1" Array(String),
+    "ParsedParams.Key2" Array(String),
+    "ParsedParams.Key3" Array(String),
+    "ParsedParams.Key4" Array(String),
+    "ParsedParams.Key5" Array(String),
+    "ParsedParams.ValueDouble" Array(Float64),
+    "Market.Type" Array(UInt8),
+    "Market.GoalID" Array(UInt32),
+    "Market.OrderID" Array(String),
+    "Market.OrderPrice" Array(Int64),
+    "Market.PP" Array(UInt32),
+    "Market.DirectPlaceID" Array(UInt32),
+    "Market.DirectOrderID" Array(UInt32),
+    "Market.DirectBannerID" Array(UInt32),
+    "Market.GoodID" Array(String),
+    "Market.GoodName" Array(String),
+    "Market.GoodQuantity" Array(Int32),
+    "Market.GoodPrice" Array(Int64),
+    IslandID FixedString(16)
+)
+ENGINE = CollapsingMergeTree(Sign)
+PARTITION BY toYYYYMM(StartDate)
+ORDER BY (CounterID, StartDate, intHash32(UserID), VisitID)
+SAMPLE BY intHash32(UserID)
+SETTINGS disk = disk(type = cache, path = '/var/lib/clickhouse/filesystem_caches/stateful/', max_size = '4G',
+         disk = disk(type = web, endpoint = 'https://clickhouse-datasets-web.s3.us-east-1.amazonaws.com/'));
diff --git a/docker/test/stateful/run.sh b/docker/test/stateful/run.sh
index 9079246429f..c2e9fdfe41d 100755
--- a/docker/test/stateful/run.sh
+++ b/docker/test/stateful/run.sh
@@ -25,7 +25,7 @@ azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
 config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
 
 cache_policy=""
-if [ $(( $(date +%-d) % 2 )) -eq 1 ]; then
+if [ $(($RANDOM%2)) -eq 1 ]; then
     cache_policy="SLRU"
 else
     cache_policy="LRU"
@@ -97,21 +97,9 @@ start
 
 setup_logs_replication
 
-# shellcheck disable=SC2086 # No quotes because I want to split it into words.
-/s3downloader --url-prefix "$S3_URL" --dataset-names $DATASETS
-chmod 777 -R /var/lib/clickhouse
 clickhouse-client --query "SHOW DATABASES"
-
-clickhouse-client --query "ATTACH DATABASE datasets ENGINE = Ordinary"
-
-service clickhouse-server restart
-
-# Wait for server to start accepting connections
-for _ in {1..120}; do
-    clickhouse-client --query "SELECT 1" && break
-    sleep 1
-done
-
+clickhouse-client --query "CREATE DATABASE datasets"
+clickhouse-client --multiquery < create.sql
 clickhouse-client --query "SHOW TABLES FROM datasets"
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
diff --git a/docker/test/stateful/s3downloader b/docker/test/stateful/s3downloader
deleted file mode 100755
index 77601fb5af6..00000000000
--- a/docker/test/stateful/s3downloader
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import os
-import sys
-import time
-import tarfile
-import logging
-import argparse
-import requests
-import tempfile
-
-
-DEFAULT_URL = "https://clickhouse-datasets.s3.amazonaws.com"
-
-AVAILABLE_DATASETS = {
-    "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())
-    )
-
-
-def build_url(base_url, dataset):
-    return os.path.join(base_url, dataset, "partitions", AVAILABLE_DATASETS[dataset])
-
-
-def download_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:
-                response = requests.get(url, stream=True)
-                response.raise_for_status()
-                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"
-                    )
-                    f.write(response.content)
-                else:
-                    dl = 0
-                    total_length = int(total_length)
-                    logging.info("Content length is %ld bytes", total_length)
-                    for data in response.iter_content(chunk_size=4096):
-                        dl += len(data)
-                        f.write(data)
-                        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.flush()
-            break
-        except Exception as ex:
-            sys.stdout.write("\n")
-            time.sleep(3)
-            logging.info("Exception while downloading %s, retry %s", ex, i + 1)
-            if os.path.exists(path):
-                os.remove(path)
-    else:
-        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:
-        comp_file.extractall(path=clickhouse_path)
-    logging.info("Unpack finished")
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=logging.INFO)
-
-    parser = argparse.ArgumentParser(
-        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/")
-
-    args = parser.parse_args()
-    datasets = args.dataset_names
-    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()
-        try:
-            download_url_for_dataset = build_url(args.url_prefix, dataset)
-            download_with_progress(download_url_for_dataset, temp_archive_path)
-            unpack_to_clickhouse_directory(temp_archive_path, args.clickhouse_data_path)
-        except Exception as ex:
-            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,
-            )
-            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/.gitignore b/docker/test/stateless/.gitignore
new file mode 100644
index 00000000000..928fed26d6d
--- /dev/null
+++ b/docker/test/stateless/.gitignore
@@ -0,0 +1 @@
+/minio_data
diff --git a/docker/test/stateless/Dockerfile b/docker/test/stateless/Dockerfile
index 6f593a5bd1d..cd8864c6299 100644
--- a/docker/test/stateless/Dockerfile
+++ b/docker/test/stateless/Dockerfile
@@ -3,7 +3,7 @@
 ARG FROM_TAG=latest
 FROM clickhouse/test-base:$FROM_TAG
 
-ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.4.20200302/clickhouse-odbc-1.1.4-Linux.tar.gz"
+ARG odbc_driver_url="https://github.com/ClickHouse/clickhouse-odbc/releases/download/v1.1.6.20200320/clickhouse-odbc-1.1.6-Linux.tar.gz"
 
 # golang version 1.13 on Ubuntu 20 is enough for tests
 RUN apt-get update -y \
@@ -35,7 +35,6 @@ RUN apt-get update -y \
             sudo \
             tree \
             unixodbc \
-            wget \
             rustc \
             cargo \
             zstd \
@@ -44,16 +43,20 @@ RUN apt-get update -y \
             pv \
             zip \
             p7zip-full \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-RUN pip3 install numpy scipy pandas Jinja2
+RUN pip3 install numpy==1.26.3 scipy==1.12.0 pandas==1.5.3 Jinja2==3.1.3 pyarrow==15.0.0
 
 RUN mkdir -p /tmp/clickhouse-odbc-tmp \
-   && wget -nv -O - ${odbc_driver_url} | tar --strip-components=1 -xz -C /tmp/clickhouse-odbc-tmp \
-   && cp /tmp/clickhouse-odbc-tmp/lib64/*.so /usr/local/lib/ \
-   && odbcinst -i -d -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbcinst.ini.sample \
-   && odbcinst -i -s -l -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbc.ini.sample \
-   && rm -rf /tmp/clickhouse-odbc-tmp
+  && cd /tmp/clickhouse-odbc-tmp \
+  && curl -L ${odbc_driver_url} | tar --strip-components=1 -xz clickhouse-odbc-1.1.6-Linux \
+  && mkdir /usr/local/lib64 -p \
+  && cp /tmp/clickhouse-odbc-tmp/lib64/*.so /usr/local/lib64/ \
+  && odbcinst -i -d -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbcinst.ini.sample \
+  && odbcinst -i -s -l -f /tmp/clickhouse-odbc-tmp/share/doc/clickhouse-odbc/config/odbc.ini.sample \
+  && sed -i 's"=libclickhouseodbc"=/usr/local/lib64/libclickhouseodbc"' /etc/odbcinst.ini \
+  && rm -rf /tmp/clickhouse-odbc-tmp
 
 ENV TZ=Europe/Amsterdam
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -69,12 +72,11 @@ ARG TARGETARCH
 
 # Download Minio-related binaries
 RUN arch=${TARGETARCH:-amd64} \
-    && wget "https://dl.min.io/server/minio/release/linux-${arch}/archive/minio.RELEASE.${MINIO_SERVER_VERSION}" -O ./minio \
-    && wget "https://dl.min.io/client/mc/release/linux-${arch}/archive/mc.RELEASE.${MINIO_CLIENT_VERSION}" -O ./mc \
+    && curl -L "https://dl.min.io/server/minio/release/linux-${arch}/archive/minio.RELEASE.${MINIO_SERVER_VERSION}" -o ./minio \
+    && curl -L "https://dl.min.io/client/mc/release/linux-${arch}/archive/mc.RELEASE.${MINIO_CLIENT_VERSION}" -o ./mc \
     && chmod +x ./mc ./minio
 
-
-RUN wget --no-verbose 'https://archive.apache.org/dist/hadoop/common/hadoop-3.3.1/hadoop-3.3.1.tar.gz' \
+RUN curl -L --no-verbose -O 'https://archive.apache.org/dist/hadoop/common/hadoop-3.3.1/hadoop-3.3.1.tar.gz' \
     && tar -xvf hadoop-3.3.1.tar.gz \
     && rm -rf hadoop-3.3.1.tar.gz
 
diff --git a/docker/test/stateless/attach_gdb.lib b/docker/test/stateless/attach_gdb.lib
index f4738cdc333..d288288bb17 100644
--- a/docker/test/stateless/attach_gdb.lib
+++ b/docker/test/stateless/attach_gdb.lib
@@ -1,5 +1,6 @@
 #!/bin/bash
 
+# shellcheck source=./utils.lib
 source /utils.lib
 
 function attach_gdb_to_clickhouse()
diff --git a/docker/test/stateless/clickhouse-statelest-test-runner.Dockerfile b/docker/test/stateless/clickhouse-statelest-test-runner.Dockerfile
index dc83e8b8d2e..a9802f6f1da 100644
--- a/docker/test/stateless/clickhouse-statelest-test-runner.Dockerfile
+++ b/docker/test/stateless/clickhouse-statelest-test-runner.Dockerfile
@@ -9,6 +9,8 @@ FROM ubuntu:20.04 as clickhouse-test-runner-base
 VOLUME /packages
 
 CMD apt-get update ;\
-	DEBIAN_FRONTEND=noninteractive \
-	apt install -y /packages/clickhouse-common-static_*.deb \
-		/packages/clickhouse-client_*.deb
+    DEBIAN_FRONTEND=noninteractive \
+    apt install -y /packages/clickhouse-common-static_*.deb \
+        /packages/clickhouse-client_*.deb \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
diff --git a/docker/test/stateless/run.sh b/docker/test/stateless/run.sh
index 4e9486d7286..271f30d187b 100755
--- a/docker/test/stateless/run.sh
+++ b/docker/test/stateless/run.sh
@@ -16,6 +16,8 @@ ln -snf "/usr/share/zoneinfo/$TZ" /etc/localtime && echo "$TZ" > /etc/timezone
 
 dpkg -i package_folder/clickhouse-common-static_*.deb
 dpkg -i package_folder/clickhouse-common-static-dbg_*.deb
+dpkg -i package_folder/clickhouse-odbc-bridge_*.deb
+dpkg -i package_folder/clickhouse-library-bridge_*.deb
 dpkg -i package_folder/clickhouse-server_*.deb
 dpkg -i package_folder/clickhouse-client_*.deb
 
@@ -41,6 +43,8 @@ source /utils.lib
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
     echo "Azure is disabled"
+elif [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+    echo "Azure is disabled"
 else
     azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
 fi
@@ -51,21 +55,33 @@ fi
 config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
 
 if [[ -n "$BUGFIX_VALIDATE_CHECK" ]] && [[ "$BUGFIX_VALIDATE_CHECK" -eq 1 ]]; then
-    sudo cat /etc/clickhouse-server/config.d/zookeeper.xml \
-    | sed "/<use_compression>1<\/use_compression>/d" \
-    > /etc/clickhouse-server/config.d/zookeeper.xml.tmp
-    sudo mv /etc/clickhouse-server/config.d/zookeeper.xml.tmp /etc/clickhouse-server/config.d/zookeeper.xml
+    sudo sed -i "/<use_compression>1<\/use_compression>/d" /etc/clickhouse-server/config.d/zookeeper.xml
 
     # it contains some new settings, but we can safely remove it
+    rm /etc/clickhouse-server/config.d/handlers.yaml
     rm /etc/clickhouse-server/users.d/s3_cache_new.xml
     rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml
+
+    #todo: remove these after 24.3 released.
+    sudo sed -i "s|<object_storage_type>azure<|<object_storage_type>azure_blob_storage<|" /etc/clickhouse-server/config.d/azure_storage_conf.xml
+
+    #todo: remove these after 24.3 released.
+    sudo sed -i "s|<object_storage_type>local<|<object_storage_type>local_blob_storage<|" /etc/clickhouse-server/config.d/storage_conf.xml
+
+    function remove_keeper_config()
+    {
+        sudo sed -i "/<$1>$2<\/$1>/d" /etc/clickhouse-server/config.d/keeper_port.xml
+    }
+    # commit_logs_cache_size_threshold setting doesn't exist on some older versions
+    remove_keeper_config "commit_logs_cache_size_threshold" "[[:digit:]]\+"
+    remove_keeper_config "latest_logs_cache_size_threshold" "[[:digit:]]\+"
 fi
 
 # For flaky check we also enable thread fuzzer
 if [ "$NUM_TRIES" -gt "1" ]; 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_SLEEP_TIME_US_MAX=100000
 
     export THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY=1
     export THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY=1
@@ -76,10 +92,10 @@ if [ "$NUM_TRIES" -gt "1" ]; then
     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
+    export THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US_MAX=10000
+    export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US_MAX=10000
+    export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US_MAX=10000
+    export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US_MAX=10000
 
     mkdir -p /var/run/clickhouse-server
     # simplest way to forward env variables to server
@@ -89,15 +105,13 @@ else
 fi
 
 if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
-    sudo cat /etc/clickhouse-server1/config.d/filesystem_caches_path.xml \
-    | sed "s|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches_1/</filesystem_caches_path>|" \
-    > /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp
-    mv /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp /etc/clickhouse-server1/config.d/filesystem_caches_path.xml
+    sudo sed -i "s|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches_1/</filesystem_caches_path>|" /etc/clickhouse-server1/config.d/filesystem_caches_path.xml
 
-    sudo cat /etc/clickhouse-server2/config.d/filesystem_caches_path.xml \
-    | sed "s|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches_2/</filesystem_caches_path>|" \
-    > /etc/clickhouse-server2/config.d/filesystem_caches_path.xml.tmp
-    mv /etc/clickhouse-server2/config.d/filesystem_caches_path.xml.tmp /etc/clickhouse-server2/config.d/filesystem_caches_path.xml
+    sudo sed -i "s|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches_2/</filesystem_caches_path>|" /etc/clickhouse-server2/config.d/filesystem_caches_path.xml
+
+    sudo sed -i "s|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches/</custom_cached_disks_base_directory>|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches_1/</custom_cached_disks_base_directory>|" /etc/clickhouse-server1/config.d/filesystem_caches_path.xml
+
+    sudo sed -i "s|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches/</custom_cached_disks_base_directory>|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches_2/</custom_cached_disks_base_directory>|" /etc/clickhouse-server2/config.d/filesystem_caches_path.xml
 
     mkdir -p /var/run/clickhouse-server1
     sudo chown clickhouse:clickhouse /var/run/clickhouse-server1
@@ -127,6 +141,32 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     MAX_RUN_TIME=$((MAX_RUN_TIME != 0 ? MAX_RUN_TIME : 9000))    # set to 2.5 hours if 0 (unlimited)
 fi
 
+if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+    sudo cat /etc/clickhouse-server1/config.d/filesystem_caches_path.xml \
+    | sed "s|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>|<filesystem_caches_path>/var/lib/clickhouse/filesystem_caches_1/</filesystem_caches_path>|" \
+    > /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp
+    mv /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp /etc/clickhouse-server1/config.d/filesystem_caches_path.xml
+
+    sudo cat /etc/clickhouse-server1/config.d/filesystem_caches_path.xml \
+    | sed "s|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches/</custom_cached_disks_base_directory>|<custom_cached_disks_base_directory replace=\"replace\">/var/lib/clickhouse/filesystem_caches_1/</custom_cached_disks_base_directory>|" \
+    > /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp
+    mv /etc/clickhouse-server1/config.d/filesystem_caches_path.xml.tmp /etc/clickhouse-server1/config.d/filesystem_caches_path.xml
+
+    mkdir -p /var/run/clickhouse-server1
+    sudo chown clickhouse:clickhouse /var/run/clickhouse-server1
+    sudo -E -u clickhouse /usr/bin/clickhouse server --config /etc/clickhouse-server1/config.xml --daemon \
+    --pid-file /var/run/clickhouse-server1/clickhouse-server.pid \
+    -- --path /var/lib/clickhouse1/ --logger.stderr /var/log/clickhouse-server/stderr1.log \
+    --logger.log /var/log/clickhouse-server/clickhouse-server1.log --logger.errorlog /var/log/clickhouse-server/clickhouse-server1.err.log \
+    --tcp_port 19000 --tcp_port_secure 19440 --http_port 18123 --https_port 18443 --interserver_http_port 19009 --tcp_with_proxy_port 19010 \
+    --mysql_port 19004 --postgresql_port 19005 \
+    --keeper_server.tcp_port 19181 --keeper_server.server_id 2 \
+    --prometheus.port 19988 \
+    --macros.replica r2   # It doesn't work :(
+
+    MAX_RUN_TIME=$((MAX_RUN_TIME < 9000 ? MAX_RUN_TIME : 9000))  # min(MAX_RUN_TIME, 2.5 hours)
+    MAX_RUN_TIME=$((MAX_RUN_TIME != 0 ? MAX_RUN_TIME : 9000))    # set to 2.5 hours if 0 (unlimited)
+fi
 
 # Wait for the server to start, but not for too long.
 for _ in {1..100}
@@ -173,13 +213,21 @@ function run_tests()
         ADDITIONAL_OPTIONS+=('--s3-storage')
     fi
 
+    if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+        ADDITIONAL_OPTIONS+=('--shared-catalog')
+    fi
+
     if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
         ADDITIONAL_OPTIONS+=('--replicated-database')
+        # Too many tests fail for DatabaseReplicated in parallel.
         ADDITIONAL_OPTIONS+=('--jobs')
         ADDITIONAL_OPTIONS+=('2')
+    elif [[ 1 == $(clickhouse-client --query "SELECT value LIKE '%SANITIZE_COVERAGE%' FROM system.build_options WHERE name = 'CXX_FLAGS'") ]]; then
+        # Coverage on a per-test basis could only be collected sequentially.
+        # Do not set the --jobs parameter.
+        echo "Running tests with coverage collection."
     else
-        # Too many tests fail for DatabaseReplicated in parallel. All other
-        # configurations are OK.
+        # All other configurations are OK.
         ADDITIONAL_OPTIONS+=('--jobs')
         ADDITIONAL_OPTIONS+=('8')
     fi
@@ -235,6 +283,29 @@ clickhouse-client -q "system flush logs" ||:
 # stop logs replication to make it possible to dump logs tables via clickhouse-local
 stop_logs_replication
 
+# Try to get logs while server is running
+failed_to_save_logs=0
+for table in query_log zookeeper_log trace_log transactions_info_log metric_log
+do
+    err=$( { clickhouse-client -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst; } 2>&1 )
+    echo "$err"
+    [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+    if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+        err=$( { clickhouse-client --port 19000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst; } 2>&1 )
+        echo "$err"
+        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+        err=$( { clickhouse-client --port 29000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.2.tsv.zst; } 2>&1 )
+        echo "$err"
+        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+    fi
+
+    if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+        err=$( { clickhouse-client --port 19000 -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst; } 2>&1 )
+        echo "$err"
+        [[ "0" != "${#err}"  ]] && failed_to_save_logs=1
+    fi
+done
+
 # 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.
@@ -244,6 +315,10 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     sudo clickhouse stop --pid-path /var/run/clickhouse-server2 ||:
 fi
 
+if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+    sudo clickhouse stop --pid-path /var/run/clickhouse-server1 ||:
+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 &
@@ -254,21 +329,29 @@ if [[ -n "$USE_S3_STORAGE_FOR_MERGE_TREE" ]] && [[ "$USE_S3_STORAGE_FOR_MERGE_TR
     data_path_config="--config-file=/etc/clickhouse-server/config.xml"
 fi
 
-# Compress tables.
-#
-# NOTE:
-# - that due to tests with s3 storage we cannot use /var/lib/clickhouse/data
-#   directly
-# - even though ci auto-compress some files (but not *.tsv) it does this only
-#   for files >64MB, we want this files to be compressed explicitly
-for table in query_log zookeeper_log trace_log transactions_info_log
-do
-    clickhouse-local "$data_path_config" --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
-    if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
-        clickhouse-local --path /var/lib/clickhouse1/ --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst ||:
-        clickhouse-local --path /var/lib/clickhouse2/ --only-system-tables -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.2.tsv.zst ||:
-    fi
-done
+
+# If server crashed dump system logs with clickhouse-local
+if [ $failed_to_save_logs -ne 0 ]; then
+    # Compress tables.
+    #
+    # NOTE:
+    # - that due to tests with s3 storage we cannot use /var/lib/clickhouse/data
+    #   directly
+    # - even though ci auto-compress some files (but not *.tsv) it does this only
+    #   for files >64MB, we want this files to be compressed explicitly
+    for table in query_log zookeeper_log trace_log transactions_info_log metric_log
+    do
+        clickhouse-local "$data_path_config" --only-system-tables --stacktrace -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.tsv.zst ||:
+        if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]; then
+            clickhouse-local --path /var/lib/clickhouse1/ --only-system-tables --stacktrace -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst ||:
+            clickhouse-local --path /var/lib/clickhouse2/ --only-system-tables --stacktrace -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.2.tsv.zst ||:
+        fi
+
+        if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+            clickhouse-local --path /var/lib/clickhouse1/ --only-system-tables --stacktrace -q "select * from system.$table format TSVWithNamesAndTypes" | zstd --threads=0 > /test_output/$table.1.tsv.zst ||:
+        fi
+    done
+fi
 
 # Also export trace log in flamegraph-friendly format.
 for trace_type in CPU Memory Real
@@ -306,3 +389,10 @@ if [[ -n "$USE_DATABASE_REPLICATED" ]] && [[ "$USE_DATABASE_REPLICATED" -eq 1 ]]
     tar -chf /test_output/coordination1.tar /var/lib/clickhouse1/coordination ||:
     tar -chf /test_output/coordination2.tar /var/lib/clickhouse2/coordination ||:
 fi
+
+if [[ -n "$USE_SHARED_CATALOG" ]] && [[ "$USE_SHARED_CATALOG" -eq 1 ]]; then
+    rg -Fa "<Fatal>" /var/log/clickhouse-server/clickhouse-server1.log ||:
+    zstd --threads=0 < /var/log/clickhouse-server/clickhouse-server1.log > /test_output/clickhouse-server1.log.zst ||:
+    mv /var/log/clickhouse-server/stderr1.log /test_output/ ||:
+    tar -chf /test_output/coordination1.tar /var/lib/clickhouse1/coordination ||:
+fi
diff --git a/docker/test/stateless/stress_tests.lib b/docker/test/stateless/stress_tests.lib
index 6f0dabb5207..b69f1d28fcf 100644
--- a/docker/test/stateless/stress_tests.lib
+++ b/docker/test/stateless/stress_tests.lib
@@ -19,7 +19,7 @@ function escaped()
 
 function head_escaped()
 {
-    head -n $FAILURE_CONTEXT_LINES $1 | escaped
+    head -n "$FAILURE_CONTEXT_LINES" "$1" | escaped
 }
 
 function unts()
@@ -29,15 +29,15 @@ function unts()
 
 function trim_server_logs()
 {
-    head -n $FAILURE_CONTEXT_LINES "/test_output/$1" | grep -Eo " \[ [0-9]+ \] \{.*" | escaped
+    head -n "$FAILURE_CONTEXT_LINES" "/test_output/$1" | grep -Eo " \[ [0-9]+ \] \{.*" | escaped
 }
 
 function install_packages()
 {
-    dpkg -i $1/clickhouse-common-static_*.deb
-    dpkg -i $1/clickhouse-common-static-dbg_*.deb
-    dpkg -i $1/clickhouse-server_*.deb
-    dpkg -i $1/clickhouse-client_*.deb
+    dpkg -i "$1"/clickhouse-common-static_*.deb
+    dpkg -i "$1"/clickhouse-common-static-dbg_*.deb
+    dpkg -i "$1"/clickhouse-server_*.deb
+    dpkg -i "$1"/clickhouse-client_*.deb
 }
 
 function configure()
@@ -54,11 +54,11 @@ function configure()
     sudo mv /etc/clickhouse-server/config.d/keeper_port.xml.tmp /etc/clickhouse-server/config.d/keeper_port.xml
 
     function randomize_config_boolean_value {
-        value=$(($RANDOM % 2))
-        sudo cat /etc/clickhouse-server/config.d/$2.xml \
+        value=$((RANDOM % 2))
+        sudo cat "/etc/clickhouse-server/config.d/$2.xml" \
         | sed "s|<$1>[01]</$1>|<$1>$value</$1>|" \
-        > /etc/clickhouse-server/config.d/$2.xml.tmp
-        sudo mv /etc/clickhouse-server/config.d/$2.xml.tmp /etc/clickhouse-server/config.d/$2.xml
+        > "/etc/clickhouse-server/config.d/$2.xml.tmp"
+        sudo mv "/etc/clickhouse-server/config.d/$2.xml.tmp" "/etc/clickhouse-server/config.d/$2.xml"
     }
 
     if [[ -n "$RANDOMIZE_KEEPER_FEATURE_FLAGS" ]] && [[ "$RANDOMIZE_KEEPER_FEATURE_FLAGS" -eq 1 ]]; then
@@ -78,6 +78,8 @@ function configure()
         randomize_config_boolean_value use_compression zookeeper
     fi
 
+    randomize_config_boolean_value allow_experimental_block_number_column block_number
+
     # for clickhouse-server (via service)
     echo "ASAN_OPTIONS='malloc_context_size=10 verbosity=1 allocator_release_to_os_interval_ms=10000'" >> /etc/environment
     # for clickhouse-client
@@ -144,17 +146,17 @@ EOL
 
 }
 
-function stop()
+function stop_server()
 {
-    local max_tries="${1:-90}"
-    local check_hang="${2:-true}"
+    local max_tries=90
+    local check_hang=true
     local pid
     # Preserve the pid, since the server can hung after the PID will be deleted.
     pid="$(cat /var/run/clickhouse-server/clickhouse-server.pid)"
 
     clickhouse stop --max-tries "$max_tries" --do-not-kill && return
 
-    if [ $check_hang == true ]
+    if [ "$check_hang" == true ]
     then
       # We failed to stop the server with SIGTERM. Maybe it hang, let's collect stacktraces.
       # Add a special status just in case, so it will be possible to find in the CI DB
@@ -163,7 +165,7 @@ function stop()
       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
+      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
@@ -174,12 +176,13 @@ function stop()
     fi
 }
 
-function start()
+function start_server()
 {
     counter=0
+    max_attempt=120
     until clickhouse-client --query "SELECT 1"
     do
-        if [ "$counter" -gt ${1:-120} ]
+        if [ "$counter" -gt "$max_attempt" ]
         then
             echo "Cannot start clickhouse-server"
             rg --text "<Error>.*Application" /var/log/clickhouse-server/clickhouse-server.log > /test_output/application_errors.txt ||:
@@ -212,8 +215,7 @@ function check_server_start()
 function check_logs_for_critical_errors()
 {
     # Sanitizer asserts
-    rg -Fa "==================" /var/log/clickhouse-server/stderr.log | rg -v "in query:" >> /test_output/tmp
-    rg -Fa "WARNING" /var/log/clickhouse-server/stderr.log >> /test_output/tmp
+    sed -n '/WARNING:.*anitizer/,/^$/p' /var/log/clickhouse-server/stderr.log >> /test_output/tmp
     rg -Fav -e "ASan doesn't fully support makecontext/swapcontext functions" -e "DB::Exception" /test_output/tmp > /dev/null \
         && echo -e "Sanitizer assert (in stderr.log)$FAIL$(head_escaped /test_output/tmp)" >> /test_output/test_results.tsv \
         || echo -e "No sanitizer asserts$OK" >> /test_output/test_results.tsv
@@ -231,8 +233,8 @@ function check_logs_for_critical_errors()
     # Remove file logical_errors.txt if it's empty
     [ -s /test_output/logical_errors.txt ] || rm /test_output/logical_errors.txt
 
-    # No such key errors
-    rg --text "Code: 499.*The specified key does not exist" /var/log/clickhouse-server/clickhouse-server*.log > /test_output/no_such_key_errors.txt \
+    # No such key errors (ignore a.myext which is used in 02724_database_s3.sh and does not exist)
+    rg --text "Code: 499.*The specified key does not exist" /var/log/clickhouse-server/clickhouse-server*.log | grep -v "a.myext" > /test_output/no_such_key_errors.txt \
         && echo -e "S3_ERROR No such key thrown (see clickhouse-server.log or no_such_key_errors.txt)$FAIL$(trim_server_logs no_such_key_errors.txt)" >> /test_output/test_results.tsv \
         || echo -e "No lost s3 keys$OK" >> /test_output/test_results.tsv
 
@@ -285,9 +287,9 @@ function collect_query_and_trace_logs()
 
 function collect_core_dumps()
 {
-  find . -type f -maxdepth 1 -name 'core.*' | while read core; do
-      zstd --threads=0 $core
-      mv $core.zst /test_output/
+  find . -type f -maxdepth 1 -name 'core.*' | while read -r core; do
+      zstd --threads=0 "$core"
+      mv "$core.zst" /test_output/
   done
 }
 
diff --git a/docker/test/stress/Dockerfile b/docker/test/stress/Dockerfile
index eddeb04758b..0f81a1cd07f 100644
--- a/docker/test/stress/Dockerfile
+++ b/docker/test/stress/Dockerfile
@@ -19,12 +19,11 @@ RUN apt-get update -y \
             openssl \
             netcat-openbsd \
             brotli \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 COPY run.sh /
 
-ENV DATASETS="hits visits"
-ENV S3_URL="https://clickhouse-datasets.s3.amazonaws.com"
 ENV EXPORT_S3_STORAGE_POLICIES=1
 
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/stress/run.sh b/docker/test/stress/run.sh
index ad236df0af4..6c6caf872e9 100644
--- a/docker/test/stress/run.sh
+++ b/docker/test/stress/run.sh
@@ -16,7 +16,9 @@ ln -s /usr/share/clickhouse-test/clickhouse-test /usr/bin/clickhouse-test
 
 # Stress tests and upgrade check uses similar code that was placed
 # in a separate bash library. See tests/ci/stress_tests.lib
+# shellcheck source=../stateless/attach_gdb.lib
 source /attach_gdb.lib
+# shellcheck source=../stateless/stress_tests.lib
 source /stress_tests.lib
 
 install_packages package_folder
@@ -25,7 +27,7 @@ install_packages package_folder
 # and find more potential issues.
 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_SLEEP_TIME_US_MAX=100000
 
 export THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY=1
 export THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY=1
@@ -36,11 +38,11 @@ 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_TIME_US_MAX=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
+export THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US_MAX=10000
+export THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US_MAX=10000
+export THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US_MAX=10000
 
 export THREAD_FUZZER_EXPLICIT_SLEEP_PROBABILITY=0.01
 export THREAD_FUZZER_EXPLICIT_MEMORY_EXCEPTION_PROBABILITY=0.01
@@ -55,23 +57,22 @@ azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
 
 config_logs_export_cluster /etc/clickhouse-server/config.d/system_logs_export.yaml
 
-start
+start_server
 
 setup_logs_replication
 
-# shellcheck disable=SC2086 # No quotes because I want to split it into words.
-/s3downloader --url-prefix "$S3_URL" --dataset-names $DATASETS
-chmod 777 -R /var/lib/clickhouse
-clickhouse-client --query "ATTACH DATABASE IF NOT EXISTS datasets ENGINE = Ordinary"
+clickhouse-client --query "CREATE DATABASE datasets"
+clickhouse-client --multiquery < create.sql
+clickhouse-client --query "SHOW TABLES FROM datasets"
+
 clickhouse-client --query "CREATE DATABASE IF NOT EXISTS test"
 
-
-stop
+stop_server
 mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/clickhouse-server.initial.log
 
 # Randomize cache policies.
 cache_policy=""
-if [ $(( $(date +%-d) % 2 )) -eq 1 ]; then
+if [ $(($RANDOM%2)) -eq 1 ]; then
     cache_policy="SLRU"
 else
     cache_policy="LRU"
@@ -86,7 +87,26 @@ if [ "$cache_policy" = "SLRU" ]; then
     mv /etc/clickhouse-server/config.d/storage_conf.xml.tmp /etc/clickhouse-server/config.d/storage_conf.xml
 fi
 
-start
+# Disable experimental WINDOW VIEW tests for stress tests, since they may be
+# created with old analyzer and then, after server restart it will refuse to
+# start.
+# FIXME: remove once the support for WINDOW VIEW will be implemented in analyzer.
+sudo cat /etc/clickhouse-server/users.d/stress_tests_overrides.xml <<EOL
+<clickhouse>
+    <profiles>
+        <default>
+            <allow_experimental_window_view>false</allow_experimental_window_view>
+            <constraints>
+               <allow_experimental_window_view>
+                   <readonly/>
+               </allow_experimental_window_view>
+            </constraints>
+        </default>
+    </profiles>
+</clickhouse>
+EOL
+
+start_server
 
 clickhouse-client --query "SHOW TABLES FROM datasets"
 clickhouse-client --query "SHOW TABLES FROM test"
@@ -189,7 +209,7 @@ clickhouse-client --query "SHOW TABLES FROM test"
 
 clickhouse-client --query "SYSTEM STOP THREAD FUZZER"
 
-stop
+stop_server
 
 # Let's enable S3 storage by default
 export USE_S3_STORAGE_FOR_MERGE_TREE=1
@@ -223,7 +243,7 @@ if [ $(( $(date +%-d) % 2 )) -eq 1 ]; then
         > /etc/clickhouse-server/config.d/enable_async_load_databases.xml
 fi
 
-start
+start_server
 
 stress --hung-check --drop-databases --output-folder test_output --skip-func-tests "$SKIP_TESTS_OPTION" --global-time-limit 1200 \
     && echo -e "Test script exit code$OK" >> /test_output/test_results.tsv \
@@ -233,18 +253,18 @@ stress --hung-check --drop-databases --output-folder test_output --skip-func-tes
 rg -Fa "No queries hung" /test_output/test_results.tsv | grep -Fa "OK" \
   || echo -e "Hung check failed, possible deadlock found (see hung_check.log)$FAIL$(head_escaped /test_output/hung_check.log)" >> /test_output/test_results.tsv
 
-stop
+stop_server
 mv /var/log/clickhouse-server/clickhouse-server.log /var/log/clickhouse-server/clickhouse-server.stress.log
 
 # NOTE Disable thread fuzzer before server start with data after stress test.
 # In debug build it can take a lot of time.
 unset "${!THREAD_@}"
 
-start
+start_server
 
 check_server_start
 
-stop
+stop_server
 
 [ -f /var/log/clickhouse-server/clickhouse-server.log ] || echo -e "Server log does not exist\tFAIL"
 [ -f /var/log/clickhouse-server/stderr.log ] || echo -e "Stderr log does not exist\tFAIL"
@@ -273,7 +293,7 @@ clickhouse-local --structure "test String, res String, time Nullable(Float32), d
 (test like '%Signal 9%') DESC,
 (test like '%Fatal message%') DESC,
 rowNumberInAllBlocks()
-LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv || echo "failure\tCannot parse test_results.tsv" > /test_output/check_status.tsv
+LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv || echo -e "failure\tCannot parse test_results.tsv" > /test_output/check_status.tsv
 [ -s /test_output/check_status.tsv ] || echo -e "success\tNo errors found" > /test_output/check_status.tsv
 
 # But OOMs in stress test are allowed
diff --git a/docker/test/style/Dockerfile b/docker/test/style/Dockerfile
index a4feae27c67..5d53d03606f 100644
--- a/docker/test/style/Dockerfile
+++ b/docker/test/style/Dockerfile
@@ -8,20 +8,23 @@ ARG apt_archive="http://archive.ubuntu.com"
 RUN sed -i "s|http://archive.ubuntu.com|$apt_archive|g" /etc/apt/sources.list
 
 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 \
-    locales \
-    && pip3 install black==23.1.0 boto3 codespell==2.2.1 mypy==1.3.0 PyGithub unidiff pylint==2.6.2 \
+        aspell \
+        curl \
+        git \
+        file \
+        libxml2-utils \
+        moreutils \
+        python3-fuzzywuzzy \
+        python3-pip \
+        yamllint \
+        locales \
     && apt-get clean \
-    && rm -rf /root/.cache/pip 
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
+
+# python-magic is the same version as in Ubuntu 22.04
+RUN pip3 install black==23.12.0 boto3 codespell==2.2.1 mypy==1.8.0 PyGithub unidiff pylint==3.1.0 \
+        python-magic==0.4.24 requests types-requests \
+    && rm -rf /root/.cache/pip
 
 RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen en_US.UTF-8
 ENV LC_ALL en_US.UTF-8
@@ -29,6 +32,19 @@ ENV LC_ALL en_US.UTF-8
 # Architecture of the image when BuildKit/buildx is used
 ARG TARGETARCH
 
+ARG SHELLCHECK_VERSION=0.9.0
+RUN arch=${TARGETARCH:-amd64} \
+  && case $arch in \
+      amd64) sarch=x86_64 ;; \
+      arm64) sarch=aarch64 ;; \
+    esac \
+  && curl -L \
+    "https://github.com/koalaman/shellcheck/releases/download/v${SHELLCHECK_VERSION}/shellcheck-v${SHELLCHECK_VERSION}.linux.${sarch}.tar.xz" \
+    | tar xJ --strip=1 -C /tmp \
+  && mv /tmp/shellcheck /usr/bin \
+  && rm -rf /tmp/*
+
+
 # Get act and actionlint from releases
 RUN arch=${TARGETARCH:-amd64} \
   && case $arch in \
@@ -46,5 +62,4 @@ RUN arch=${TARGETARCH:-amd64} \
 
 
 COPY run.sh /
-COPY process_style_check_result.py /
 CMD ["/bin/bash", "/run.sh"]
diff --git a/docker/test/upgrade/Dockerfile b/docker/test/upgrade/Dockerfile
index 9152230af1c..78d912fd031 100644
--- a/docker/test/upgrade/Dockerfile
+++ b/docker/test/upgrade/Dockerfile
@@ -19,7 +19,8 @@ RUN apt-get update -y \
             openssl \
             netcat-openbsd \
             brotli \
-    && apt-get clean
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 COPY run.sh /
 
diff --git a/docker/test/upgrade/run.sh b/docker/test/upgrade/run.sh
index f014fce49f6..6761ddba3e5 100644
--- a/docker/test/upgrade/run.sh
+++ b/docker/test/upgrade/run.sh
@@ -16,7 +16,9 @@ ln -s /usr/share/clickhouse-test/ci/get_previous_release_tag.py /usr/bin/get_pre
 
 # Stress tests and upgrade check uses similar code that was placed
 # in a separate bash library. See tests/ci/stress_tests.lib
+# shellcheck source=../stateless/attach_gdb.lib
 source /attach_gdb.lib
+# shellcheck source=../stateless/stress_tests.lib
 source /stress_tests.lib
 
 azurite-blob --blobHost 0.0.0.0 --blobPort 10000 --debug /azurite_log &
@@ -56,16 +58,16 @@ echo "ATTACH DATABASE system ENGINE=Ordinary" > /var/lib/clickhouse/metadata/sys
 # Install previous release packages
 install_packages previous_release_package_folder
 
+# Save old settings from system table for settings changes check
+clickhouse-local -q "select * from system.settings format Native" > old_settings.native
+
 # Initial run without S3 to create system.*_log on local file system to make it
 # available for dump via clickhouse-local
 configure
 
 function remove_keeper_config()
 {
-  sudo cat /etc/clickhouse-server/config.d/keeper_port.xml \
-    | sed "/<$1>$2<\/$1>/d" \
-    > /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
+  sudo sed -i "/<$1>$2<\/$1>/d" /etc/clickhouse-server/config.d/keeper_port.xml
 }
 
 # async_replication setting doesn't exist on some older versions
@@ -74,10 +76,25 @@ remove_keeper_config "async_replication" "1"
 # create_if_not_exists feature flag doesn't exist on some older versions
 remove_keeper_config "create_if_not_exists" "[01]"
 
+#todo: remove these after 24.3 released.
+sudo sed -i "s|<object_storage_type>azure<|<object_storage_type>azure_blob_storage<|" /etc/clickhouse-server/config.d/azure_storage_conf.xml
+
+#todo: remove these after 24.3 released.
+sudo sed -i "s|<object_storage_type>local<|<object_storage_type>local_blob_storage<|" /etc/clickhouse-server/config.d/storage_conf.xml
+
+# latest_logs_cache_size_threshold setting doesn't exist on some older versions
+remove_keeper_config "latest_logs_cache_size_threshold" "[[:digit:]]\+"
+
+# commit_logs_cache_size_threshold setting doesn't exist on some older versions
+remove_keeper_config "commit_logs_cache_size_threshold" "[[:digit:]]\+"
+
 # it contains some new settings, but we can safely remove it
 rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
 rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml
+rm /etc/clickhouse-server/config.d/storage_conf_02963.xml
+rm /etc/clickhouse-server/config.d/backoff_failed_mutation.xml
+rm /etc/clickhouse-server/config.d/handlers.yaml
 rm /etc/clickhouse-server/users.d/nonconst_timezone.xml
 rm /etc/clickhouse-server/users.d/s3_cache_new.xml
 rm /etc/clickhouse-server/users.d/replicated_ddl_entry.xml
@@ -94,10 +111,13 @@ export ZOOKEEPER_FAULT_INJECTION=0
 configure
 
 # 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
+sudo sed -i "s|<force_sync>false</force_sync>|<force_sync>true</force_sync>|" /etc/clickhouse-server/config.d/keeper_port.xml
+
+#todo: remove these after 24.3 released.
+sudo sed -i "s|<object_storage_type>azure<|<object_storage_type>azure_blob_storage<|" /etc/clickhouse-server/config.d/azure_storage_conf.xml
+
+#todo: remove these after 24.3 released.
+sudo sed -i "s|<object_storage_type>local<|<object_storage_type>local_blob_storage<|" /etc/clickhouse-server/config.d/storage_conf.xml
 
 # async_replication setting doesn't exist on some older versions
 remove_keeper_config "async_replication" "1"
@@ -105,11 +125,14 @@ remove_keeper_config "async_replication" "1"
 # create_if_not_exists feature flag doesn't exist on some older versions
 remove_keeper_config "create_if_not_exists" "[01]"
 
+# latest_logs_cache_size_threshold setting doesn't exist on some older versions
+remove_keeper_config "latest_logs_cache_size_threshold" "[[:digit:]]\+"
+
+# commit_logs_cache_size_threshold setting doesn't exist on some older versions
+remove_keeper_config "commit_logs_cache_size_threshold" "[[:digit:]]\+"
+
 # 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 sed -i "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
 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
 
@@ -117,6 +140,10 @@ sudo chgrp clickhouse /etc/clickhouse-server/config.d/s3_storage_policy_by_defau
 rm /etc/clickhouse-server/config.d/merge_tree.xml
 rm /etc/clickhouse-server/config.d/enable_wait_for_shutdown_replicated_tables.xml
 rm /etc/clickhouse-server/config.d/zero_copy_destructive_operations.xml
+rm /etc/clickhouse-server/config.d/storage_conf_02963.xml
+rm /etc/clickhouse-server/config.d/backoff_failed_mutation.xml
+rm /etc/clickhouse-server/config.d/handlers.yaml
+rm /etc/clickhouse-server/config.d/block_number.xml
 rm /etc/clickhouse-server/users.d/nonconst_timezone.xml
 rm /etc/clickhouse-server/users.d/s3_cache_new.xml
 rm /etc/clickhouse-server/users.d/replicated_ddl_entry.xml
@@ -150,11 +177,65 @@ install_packages package_folder
 export ZOOKEEPER_FAULT_INJECTION=1
 configure
 
+# Check that all new/changed setting were added in settings changes history.
+# Some settings can be different for builds with sanitizers, so we check
+# settings changes only for non-sanitizer builds.
+IS_SANITIZED=$(clickhouse-local --query "SELECT value LIKE '%-fsanitize=%' FROM system.build_options WHERE name = 'CXX_FLAGS'")
+if [ "${IS_SANITIZED}" -eq "0" ]
+then
+  clickhouse-local -q "select * from system.settings format Native" > new_settings.native
+  clickhouse-local -nmq "
+  CREATE TABLE old_settings AS file('old_settings.native');
+  CREATE TABLE new_settings AS file('new_settings.native');
+
+  SELECT
+      name,
+      new_settings.value AS new_value,
+      old_settings.value AS old_value
+  FROM new_settings
+  LEFT JOIN old_settings ON new_settings.name = old_settings.name
+  WHERE (new_settings.value != old_settings.value) AND (name NOT IN (
+      SELECT arrayJoin(tupleElement(changes, 'name'))
+      FROM system.settings_changes
+      WHERE version = extract(version(), '^(?:\\d+\\.\\d+)')
+  ))
+  SETTINGS join_use_nulls = 1
+  INTO OUTFILE 'changed_settings.txt'
+  FORMAT PrettyCompactNoEscapes;
+
+  SELECT name
+  FROM new_settings
+  WHERE (name NOT IN (
+      SELECT name
+      FROM old_settings
+  )) AND (name NOT IN (
+      SELECT arrayJoin(tupleElement(changes, 'name'))
+      FROM system.settings_changes
+      WHERE version = extract(version(), '^(?:\\d+\\.\\d+)')
+  ))
+  INTO OUTFILE 'new_settings.txt'
+  FORMAT PrettyCompactNoEscapes;
+  "
+
+  if [ -s changed_settings.txt ]
+  then
+      mv changed_settings.txt /test_output/
+      echo -e "Changed settings are not reflected in settings changes history (see changed_settings.txt)$FAIL$(head_escaped /test_output/changed_settings.txt)" >> /test_output/test_results.tsv
+  else
+      echo -e "There are no changed settings or they are reflected in settings changes history$OK" >> /test_output/test_results.tsv
+  fi
+
+  if [ -s new_settings.txt ]
+  then
+      mv new_settings.txt /test_output/
+      echo -e "New settings are not reflected in settings changes history (see new_settings.txt)$FAIL$(head_escaped /test_output/new_settings.txt)" >> /test_output/test_results.tsv
+  else
+      echo -e "There are no new settings or they are reflected in settings changes history$OK" >> /test_output/test_results.tsv
+  fi
+fi
+
 # Just in case previous version left some garbage in zk
-sudo cat /etc/clickhouse-server/config.d/lost_forever_check.xml \
-  | sed "s|>1<|>0<|g" \
-  > /etc/clickhouse-server/config.d/lost_forever_check.xml.tmp
-sudo mv /etc/clickhouse-server/config.d/lost_forever_check.xml.tmp /etc/clickhouse-server/config.d/lost_forever_check.xml
+sudo sed -i "s|>1<|>0<|g" /etc/clickhouse-server/config.d/lost_forever_check.xml \
 rm /etc/clickhouse-server/config.d/filesystem_caches_path.xml
 
 start 500
@@ -255,8 +336,10 @@ clickhouse-local --structure "test String, res String, time Nullable(Float32), d
 (test like '%Fatal message%') DESC,
 (test like '%Error message%') DESC,
 (test like '%previous release%') DESC,
+(test like '%Changed settings%') DESC,
+(test like '%New settings%') DESC,
 rowNumberInAllBlocks()
-LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv || echo "failure\tCannot parse test_results.tsv" > /test_output/check_status.tsv
+LIMIT 1" < /test_output/test_results.tsv > /test_output/check_status.tsv || echo -e "failure\tCannot parse test_results.tsv" > /test_output/check_status.tsv
 [ -s /test_output/check_status.tsv ] || echo -e "success\tNo errors found" > /test_output/check_status.tsv
 
 # But OOMs in stress test are allowed
diff --git a/docker/test/util/Dockerfile b/docker/test/util/Dockerfile
index eb5abce280a..5446adf3793 100644
--- a/docker/test/util/Dockerfile
+++ b/docker/test/util/Dockerfile
@@ -5,7 +5,6 @@ FROM ubuntu:22.04
 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=17
 
 RUN apt-get update \
@@ -27,9 +26,12 @@ RUN apt-get update \
     && export CODENAME="$(lsb_release --codename --short | tr 'A-Z' 'a-z')" \
     && echo "deb https://apt.llvm.org/${CODENAME}/ llvm-toolchain-${CODENAME}-${LLVM_VERSION} main" >> \
         /etc/apt/sources.list \
-    && apt-get clean
+    && apt-get update \
+    && apt-get install --yes --no-install-recommends --verbose-versions llvm-${LLVM_VERSION} \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
-# Install cmake 3.20+ for rust support
+# Install cmake 3.20+ for Rust support
 # Used https://askubuntu.com/a/1157132 as reference
 RUN curl -s https://apt.kitware.com/keys/kitware-archive-latest.asc | \
         gpg --dearmor - > /etc/apt/trusted.gpg.d/kitware.gpg && \
@@ -41,71 +43,17 @@ RUN apt-get update \
         bash \
         bsdmainutils \
         build-essential \
-        clang-${LLVM_VERSION} \
-        clang-tidy-${LLVM_VERSION} \
-        cmake \
         gdb \
         git \
         gperf \
-        libclang-rt-${LLVM_VERSION}-dev \
-        lld-${LLVM_VERSION} \
-        llvm-${LLVM_VERSION} \
-        llvm-${LLVM_VERSION}-dev \
-        libclang-${LLVM_VERSION}-dev \
         moreutils \
         nasm \
-        ninja-build \
         pigz \
         rename \
         software-properties-common \
         tzdata \
         --yes --no-install-recommends \
-    && apt-get clean
-
-# This symlink required by gcc to find lld compiler
-RUN ln -s /usr/bin/lld-${LLVM_VERSION} /usr/bin/ld.lld
-# for external_symbolizer_path
-RUN ln -s /usr/bin/llvm-symbolizer-${LLVM_VERSION} /usr/bin/llvm-symbolizer
-# FIXME: workaround for "The imported target "merge-fdata" references the file" error
-# https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/-/commit/992e52c0b156a5ba9c6a8a54f8c4857ddd3d371d
-RUN sed -i '/_IMPORT_CHECK_FILES_FOR_\(mlir-\|llvm-bolt\|merge-fdata\|MLIR\)/ {s|^|#|}' /usr/lib/llvm-${LLVM_VERSION}/lib/cmake/llvm/LLVMExports-*.cmake
-
-ARG CCACHE_VERSION=4.6.1
-RUN mkdir /tmp/ccache \
-    && cd /tmp/ccache \
-    && curl -L \
-        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz \
-        -O https://github.com/ccache/ccache/releases/download/v$CCACHE_VERSION/ccache-$CCACHE_VERSION.tar.xz.asc \
-    && gpg --recv-keys --keyserver hkps://keyserver.ubuntu.com 5A939A71A46792CF57866A51996DDA075594ADB8 \
-    && gpg --verify ccache-4.6.1.tar.xz.asc \
-    && tar xf ccache-$CCACHE_VERSION.tar.xz \
-    && cd /tmp/ccache/ccache-$CCACHE_VERSION \
-    && cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE=None \
-        -DZSTD_FROM_INTERNET=ON \
-        -DREDIS_STORAGE_BACKEND=OFF \
-        -Wno-dev \
-        -B build \
-        -S . \
-    && make VERBOSE=1 -C build \
-    && make install -C build \
-    && cd / \
-    && rm -rf /tmp/ccache
-
-ARG TARGETARCH
-ARG SCCACHE_VERSION=v0.5.4
-ENV SCCACHE_IGNORE_SERVER_IO_ERROR=1
-# sccache requires a value for the region. So by default we use The Default Region
-ENV SCCACHE_REGION=us-east-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
-
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/*
 
 COPY process_functional_tests_result.py /
diff --git a/docs/changelogs/v23.10.1.1976-stable.md b/docs/changelogs/v23.10.1.1976-stable.md
index 0e7e7bcd55a..b08383a859b 100644
--- a/docs/changelogs/v23.10.1.1976-stable.md
+++ b/docs/changelogs/v23.10.1.1976-stable.md
@@ -403,4 +403,3 @@ sidebar_label: 2023
 * Do not remove part if `Too many open files` is thrown [#56238](https://github.com/ClickHouse/ClickHouse/pull/56238) ([Nikolay Degterinsky](https://github.com/evillique)).
 * Fix ORC commit [#56261](https://github.com/ClickHouse/ClickHouse/pull/56261) ([Raúl Marín](https://github.com/Algunenano)).
 * Fix typo in largestTriangleThreeBuckets.md [#56263](https://github.com/ClickHouse/ClickHouse/pull/56263) ([Nikita Taranov](https://github.com/nickitat)).
-
diff --git a/docs/changelogs/v23.11.5.29-stable.md b/docs/changelogs/v23.11.5.29-stable.md
new file mode 100644
index 00000000000..f73a21c2095
--- /dev/null
+++ b/docs/changelogs/v23.11.5.29-stable.md
@@ -0,0 +1,31 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.11.5.29-stable (d83b108deca) FIXME as compared to v23.11.4.24-stable (e79d840d7fe)
+
+#### Improvement
+* Backported in [#58815](https://github.com/ClickHouse/ClickHouse/issues/58815): Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#59234](https://github.com/ClickHouse/ClickHouse/issues/59234): Allow to ignore schema evolution in Iceberg table engine and read all data using schema specified by the user on table creation or latest schema parsed from metadata on table creation. This is done under a setting `iceberg_engine_ignore_schema_evolution` that is disabled by default. Note that enabling this setting can lead to incorrect result as in case of evolved schema all data files will be read using the same schema. [#59133](https://github.com/ClickHouse/ClickHouse/pull/59133) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix a stupid case of intersecting parts [#58482](https://github.com/ClickHouse/ClickHouse/pull/58482) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix stream partitioning in parallel window functions [#58739](https://github.com/ClickHouse/ClickHouse/pull/58739) ([Dmitry Novik](https://github.com/novikd)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix JSONExtract function for LowCardinality(Nullable) columns [#58808](https://github.com/ClickHouse/ClickHouse/pull/58808) ([vdimir](https://github.com/vdimir)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix not-ready set for system.tables [#59351](https://github.com/ClickHouse/ClickHouse/pull/59351) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* refine error message [#57991](https://github.com/ClickHouse/ClickHouse/pull/57991) ([Han Fei](https://github.com/hanfei1991)).
+* Fix rare race in external sort/aggregation with temporary data in cache [#58013](https://github.com/ClickHouse/ClickHouse/pull/58013) ([Anton Popov](https://github.com/CurtizJ)).
+* Follow-up to [#58482](https://github.com/ClickHouse/ClickHouse/issues/58482) [#58574](https://github.com/ClickHouse/ClickHouse/pull/58574) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible race in ManyAggregatedData dtor. [#58624](https://github.com/ClickHouse/ClickHouse/pull/58624) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Decrease log level for one log message [#59168](https://github.com/ClickHouse/ClickHouse/pull/59168) ([Kseniia Sumarokova](https://github.com/kssenii)).
+
diff --git a/docs/changelogs/v23.12.3.40-stable.md b/docs/changelogs/v23.12.3.40-stable.md
new file mode 100644
index 00000000000..e2a9e3af407
--- /dev/null
+++ b/docs/changelogs/v23.12.3.40-stable.md
@@ -0,0 +1,36 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.12.3.40-stable (a594704ae75) FIXME as compared to v23.12.2.59-stable (17ab210e761)
+
+#### Improvement
+* Backported in [#58660](https://github.com/ClickHouse/ClickHouse/issues/58660): When executing some queries, which require a lot of streams for reading data, the error `"Paste JOIN requires sorted tables only"` was previously thrown. Now the numbers of streams resize to 1 in that case. [#58608](https://github.com/ClickHouse/ClickHouse/pull/58608) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Backported in [#58817](https://github.com/ClickHouse/ClickHouse/issues/58817): Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#59235](https://github.com/ClickHouse/ClickHouse/issues/59235): Allow to ignore schema evolution in Iceberg table engine and read all data using schema specified by the user on table creation or latest schema parsed from metadata on table creation. This is done under a setting `iceberg_engine_ignore_schema_evolution` that is disabled by default. Note that enabling this setting can lead to incorrect result as in case of evolved schema all data files will be read using the same schema. [#59133](https://github.com/ClickHouse/ClickHouse/pull/59133) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Delay reading from StorageKafka to allow multiple reads in materialized views [#58477](https://github.com/ClickHouse/ClickHouse/pull/58477) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix a stupid case of intersecting parts [#58482](https://github.com/ClickHouse/ClickHouse/pull/58482) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Disable max_joined_block_rows in ConcurrentHashJoin [#58595](https://github.com/ClickHouse/ClickHouse/pull/58595) ([vdimir](https://github.com/vdimir)).
+* Fix stream partitioning in parallel window functions [#58739](https://github.com/ClickHouse/ClickHouse/pull/58739) ([Dmitry Novik](https://github.com/novikd)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix JSONExtract function for LowCardinality(Nullable) columns [#58808](https://github.com/ClickHouse/ClickHouse/pull/58808) ([vdimir](https://github.com/vdimir)).
+* Multiple read file log storage in mv [#58877](https://github.com/ClickHouse/ClickHouse/pull/58877) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix not-ready set for system.tables [#59351](https://github.com/ClickHouse/ClickHouse/pull/59351) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Follow-up to [#58482](https://github.com/ClickHouse/ClickHouse/issues/58482) [#58574](https://github.com/ClickHouse/ClickHouse/pull/58574) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix possible race in ManyAggregatedData dtor. [#58624](https://github.com/ClickHouse/ClickHouse/pull/58624) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Change log level for super imporant message in Keeper [#59010](https://github.com/ClickHouse/ClickHouse/pull/59010) ([alesapin](https://github.com/alesapin)).
+* Decrease log level for one log message [#59168](https://github.com/ClickHouse/ClickHouse/pull/59168) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix fasttest by pinning pip dependencies [#59256](https://github.com/ClickHouse/ClickHouse/pull/59256) ([Azat Khuzhin](https://github.com/azat)).
+* No debug symbols in Rust [#59306](https://github.com/ClickHouse/ClickHouse/pull/59306) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/changelogs/v23.12.4.15-stable.md b/docs/changelogs/v23.12.4.15-stable.md
new file mode 100644
index 00000000000..a67b5aee312
--- /dev/null
+++ b/docs/changelogs/v23.12.4.15-stable.md
@@ -0,0 +1,21 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.12.4.15-stable (4233d111d20) FIXME as compared to v23.12.3.40-stable (a594704ae75)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix incorrect result of arrayElement / map[] on empty value [#59594](https://github.com/ClickHouse/ClickHouse/pull/59594) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash in topK when merging empty states [#59603](https://github.com/ClickHouse/ClickHouse/pull/59603) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix distributed table with a constant sharding key [#59606](https://github.com/ClickHouse/ClickHouse/pull/59606) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix 02720_row_policy_column_with_dots [#59453](https://github.com/ClickHouse/ClickHouse/pull/59453) ([Duc Canh Le](https://github.com/canhld94)).
+* Pin python dependencies in stateless tests [#59663](https://github.com/ClickHouse/ClickHouse/pull/59663) ([Raúl Marín](https://github.com/Algunenano)).
+
diff --git a/docs/changelogs/v23.12.5.81-stable.md b/docs/changelogs/v23.12.5.81-stable.md
new file mode 100644
index 00000000000..0a0acd97d58
--- /dev/null
+++ b/docs/changelogs/v23.12.5.81-stable.md
@@ -0,0 +1,64 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.12.5.81-stable (a0fbe3ae813) FIXME as compared to v23.12.4.15-stable (4233d111d20)
+
+#### Improvement
+* Backported in [#60290](https://github.com/ClickHouse/ClickHouse/issues/60290): Copy S3 file GCP fallback to buffer copy in case GCP returned `Internal Error` with `GATEWAY_TIMEOUT` HTTP error code. [#60164](https://github.com/ClickHouse/ClickHouse/pull/60164) ([Maksim Kita](https://github.com/kitaisreal)).
+* Backported in [#60830](https://github.com/ClickHouse/ClickHouse/issues/60830): Update tzdata to 2024a. [#60768](https://github.com/ClickHouse/ClickHouse/pull/60768) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#59883](https://github.com/ClickHouse/ClickHouse/issues/59883): If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix_kql_issue_found_by_wingfuzz [#59626](https://github.com/ClickHouse/ClickHouse/pull/59626) ([Yong Wang](https://github.com/kashwy)).
+* Fix error "Read beyond last offset" for AsynchronousBoundedReadBuffer [#59630](https://github.com/ClickHouse/ClickHouse/pull/59630) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix query start time on non initial queries [#59662](https://github.com/ClickHouse/ClickHouse/pull/59662) ([Raúl Marín](https://github.com/Algunenano)).
+* rabbitmq: fix having neither acked nor nacked messages [#59775](https://github.com/ClickHouse/ClickHouse/pull/59775) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix parsing of partition expressions surrounded by parens [#59901](https://github.com/ClickHouse/ClickHouse/pull/59901) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix optimize_uniq_to_count removing the column alias [#60026](https://github.com/ClickHouse/ClickHouse/pull/60026) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix cosineDistance crash with Nullable [#60150](https://github.com/ClickHouse/ClickHouse/pull/60150) ([Raúl Marín](https://github.com/Algunenano)).
+* Hide sensitive info for s3queue [#60233](https://github.com/ClickHouse/ClickHouse/pull/60233) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix_max_query_size_for_kql_compound_operator: [#60534](https://github.com/ClickHouse/ClickHouse/pull/60534) ([Yong Wang](https://github.com/kashwy)).
+* Reduce the number of read rows from `system.numbers` [#60546](https://github.com/ClickHouse/ClickHouse/pull/60546) ([JackyWoo](https://github.com/JackyWoo)).
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Prevent setting custom metadata headers on unsupported multipart upload operations [#60748](https://github.com/ClickHouse/ClickHouse/pull/60748) ([Francisco J. Jurado Moreno](https://github.com/Beetelbrox)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash with different allow_experimental_analyzer value in subqueries [#60770](https://github.com/ClickHouse/ClickHouse/pull/60770) ([Dmitry Novik](https://github.com/novikd)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix Keeper reconfig for standalone binary [#61233](https://github.com/ClickHouse/ClickHouse/pull/61233) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#60767](https://github.com/ClickHouse/ClickHouse/issues/60767): Decoupled changes from [#60408](https://github.com/ClickHouse/ClickHouse/issues/60408). [#60553](https://github.com/ClickHouse/ClickHouse/pull/60553) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#60582](https://github.com/ClickHouse/ClickHouse/issues/60582): Arm and amd docker build jobs use similar job names and thus overwrite job reports - aarch64 and amd64 suffixes added to fix this. [#60554](https://github.com/ClickHouse/ClickHouse/pull/60554) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61041](https://github.com/ClickHouse/ClickHouse/issues/61041): Debug and fix markreleaseready. [#60611](https://github.com/ClickHouse/ClickHouse/pull/60611) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61030](https://github.com/ClickHouse/ClickHouse/issues/61030): ... [#61022](https://github.com/ClickHouse/ClickHouse/pull/61022) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61224](https://github.com/ClickHouse/ClickHouse/issues/61224): ... [#61183](https://github.com/ClickHouse/ClickHouse/pull/61183) ([Han Fei](https://github.com/hanfei1991)).
+* Backported in [#61190](https://github.com/ClickHouse/ClickHouse/issues/61190): ... [#61185](https://github.com/ClickHouse/ClickHouse/pull/61185) ([Max K.](https://github.com/maxknv)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Backport [#59798](https://github.com/ClickHouse/ClickHouse/issues/59798) to 23.12: CI: do not reuse builds on release branches"'. [#59979](https://github.com/ClickHouse/ClickHouse/pull/59979) ([Max K.](https://github.com/maxknv)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* CI: move ci-specifics from job scripts to ci.py [#58516](https://github.com/ClickHouse/ClickHouse/pull/58516) ([Max K.](https://github.com/maxknv)).
+* Make ZooKeeper actually sequentialy consistent [#59735](https://github.com/ClickHouse/ClickHouse/pull/59735) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix special build reports in release branches [#59797](https://github.com/ClickHouse/ClickHouse/pull/59797) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: do not reuse builds on release branches [#59798](https://github.com/ClickHouse/ClickHouse/pull/59798) ([Max K.](https://github.com/maxknv)).
+* Fix mark release ready [#59994](https://github.com/ClickHouse/ClickHouse/pull/59994) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Ability to detect undead ZooKeeper sessions [#60044](https://github.com/ClickHouse/ClickHouse/pull/60044) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Detect io_uring in tests [#60373](https://github.com/ClickHouse/ClickHouse/pull/60373) ([Azat Khuzhin](https://github.com/azat)).
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+* Remove broken test while we fix it [#60547](https://github.com/ClickHouse/ClickHouse/pull/60547) ([Raúl Marín](https://github.com/Algunenano)).
+* Speed up cctools building [#61011](https://github.com/ClickHouse/ClickHouse/pull/61011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v23.12.6.19-stable.md b/docs/changelogs/v23.12.6.19-stable.md
new file mode 100644
index 00000000000..4659532d3de
--- /dev/null
+++ b/docs/changelogs/v23.12.6.19-stable.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.12.6.19-stable (40080a3c2a4) FIXME as compared to v23.12.5.81-stable (a0fbe3ae813)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Improve isolation of query cache entries under re-created users or role switches [#58611](https://github.com/ClickHouse/ClickHouse/pull/58611) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix possible incorrect result of aggregate function `uniqExact` [#61257](https://github.com/ClickHouse/ClickHouse/pull/61257) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix consecutive keys optimization for nullable keys [#61393](https://github.com/ClickHouse/ClickHouse/pull/61393) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix string search with const position [#61547](https://github.com/ClickHouse/ClickHouse/pull/61547) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix crash in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#61429](https://github.com/ClickHouse/ClickHouse/issues/61429):. [#61374](https://github.com/ClickHouse/ClickHouse/pull/61374) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61486](https://github.com/ClickHouse/ClickHouse/issues/61486): ... [#61441](https://github.com/ClickHouse/ClickHouse/pull/61441) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61641](https://github.com/ClickHouse/ClickHouse/issues/61641):. [#61592](https://github.com/ClickHouse/ClickHouse/pull/61592) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61811](https://github.com/ClickHouse/ClickHouse/issues/61811): ![Screenshot_20240323_025055](https://github.com/ClickHouse/ClickHouse/assets/18581488/ccaab212-a1d3-4dfb-8d56-b1991760b6bf). [#61801](https://github.com/ClickHouse/ClickHouse/pull/61801) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/changelogs/v23.3.20.27-lts.md b/docs/changelogs/v23.3.20.27-lts.md
new file mode 100644
index 00000000000..9f49e47f0bc
--- /dev/null
+++ b/docs/changelogs/v23.3.20.27-lts.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.3.20.27-lts (cc974ba4f81) FIXME as compared to v23.3.19.32-lts (c4d4ca8ec02)
+
+#### Improvement
+* Backported in [#58818](https://github.com/ClickHouse/ClickHouse/issues/58818): Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#59877](https://github.com/ClickHouse/ClickHouse/issues/59877): If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix working with read buffers in StreamingFormatExecutor [#57438](https://github.com/ClickHouse/ClickHouse/pull/57438) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix cosineDistance crash with Nullable [#60150](https://github.com/ClickHouse/ClickHouse/pull/60150) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix possible race in ManyAggregatedData dtor. [#58624](https://github.com/ClickHouse/ClickHouse/pull/58624) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Make ZooKeeper actually sequentialy consistent [#59735](https://github.com/ClickHouse/ClickHouse/pull/59735) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
diff --git a/docs/changelogs/v23.3.21.26-lts.md b/docs/changelogs/v23.3.21.26-lts.md
new file mode 100644
index 00000000000..b0f059c4907
--- /dev/null
+++ b/docs/changelogs/v23.3.21.26-lts.md
@@ -0,0 +1,24 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.3.21.26-lts (d9672a3731f) FIXME as compared to v23.3.20.27-lts (cc974ba4f81)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix reading from sparse columns after restart [#49660](https://github.com/ClickHouse/ClickHouse/pull/49660) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#57104](https://github.com/ClickHouse/ClickHouse/pull/57104) ([Kruglov Pavel](https://github.com/Avogar)).
+* Detect io_uring in tests [#60373](https://github.com/ClickHouse/ClickHouse/pull/60373) ([Azat Khuzhin](https://github.com/azat)).
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v23.3.22.3-lts.md b/docs/changelogs/v23.3.22.3-lts.md
new file mode 100644
index 00000000000..2900480e12d
--- /dev/null
+++ b/docs/changelogs/v23.3.22.3-lts.md
@@ -0,0 +1,13 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.3.22.3-lts (04075bf96a1) FIXME as compared to v23.3.21.26-lts (d9672a3731f)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix crash in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+
diff --git a/docs/changelogs/v23.5.1.3174-stable.md b/docs/changelogs/v23.5.1.3174-stable.md
index 01e5425de71..2212eb6e893 100644
--- a/docs/changelogs/v23.5.1.3174-stable.md
+++ b/docs/changelogs/v23.5.1.3174-stable.md
@@ -596,4 +596,3 @@ sidebar_label: 2023
 * Fix assertion from stress test [#50718](https://github.com/ClickHouse/ClickHouse/pull/50718) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Fix flaky unit test [#50719](https://github.com/ClickHouse/ClickHouse/pull/50719) ([Kseniia Sumarokova](https://github.com/kssenii)).
 * Show correct sharing state in system.query_cache [#50728](https://github.com/ClickHouse/ClickHouse/pull/50728) ([Robert Schulze](https://github.com/rschu1ze)).
-
diff --git a/docs/changelogs/v23.6.1.1524-stable.md b/docs/changelogs/v23.6.1.1524-stable.md
index 6d295d61ef4..b91c5340789 100644
--- a/docs/changelogs/v23.6.1.1524-stable.md
+++ b/docs/changelogs/v23.6.1.1524-stable.md
@@ -298,4 +298,3 @@ sidebar_label: 2023
 * Update version_date.tsv and changelogs after v23.4.5.22-stable [#51638](https://github.com/ClickHouse/ClickHouse/pull/51638) ([robot-clickhouse](https://github.com/robot-clickhouse)).
 * Update version_date.tsv and changelogs after v23.3.7.5-lts [#51639](https://github.com/ClickHouse/ClickHouse/pull/51639) ([robot-clickhouse](https://github.com/robot-clickhouse)).
 * Update parts.md [#51643](https://github.com/ClickHouse/ClickHouse/pull/51643) ([Ramazan Polat](https://github.com/ramazanpolat)).
-
diff --git a/docs/changelogs/v23.8.1.2992-lts.md b/docs/changelogs/v23.8.1.2992-lts.md
index e3e0e4f0344..7c224b19350 100644
--- a/docs/changelogs/v23.8.1.2992-lts.md
+++ b/docs/changelogs/v23.8.1.2992-lts.md
@@ -588,4 +588,3 @@ sidebar_label: 2023
 * tests: mark 02152_http_external_tables_memory_tracking as no-parallel [#54155](https://github.com/ClickHouse/ClickHouse/pull/54155) ([Azat Khuzhin](https://github.com/azat)).
 * The external logs have had colliding arguments [#54165](https://github.com/ClickHouse/ClickHouse/pull/54165) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
 * Rename macro [#54169](https://github.com/ClickHouse/ClickHouse/pull/54169) ([Kseniia Sumarokova](https://github.com/kssenii)).
-
diff --git a/docs/changelogs/v23.8.10.43-lts.md b/docs/changelogs/v23.8.10.43-lts.md
new file mode 100644
index 00000000000..0093467d129
--- /dev/null
+++ b/docs/changelogs/v23.8.10.43-lts.md
@@ -0,0 +1,39 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.8.10.43-lts (a278225bba9) FIXME as compared to v23.8.9.54-lts (192a1d231fa)
+
+#### Improvement
+* Backported in [#58819](https://github.com/ClickHouse/ClickHouse/issues/58819): Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+* Backported in [#60286](https://github.com/ClickHouse/ClickHouse/issues/60286): Copy S3 file GCP fallback to buffer copy in case GCP returned `Internal Error` with `GATEWAY_TIMEOUT` HTTP error code. [#60164](https://github.com/ClickHouse/ClickHouse/pull/60164) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#59879](https://github.com/ClickHouse/ClickHouse/issues/59879): If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Background merges correctly use temporary data storage in the cache [#57275](https://github.com/ClickHouse/ClickHouse/pull/57275) ([vdimir](https://github.com/vdimir)).
+* MergeTree mutations reuse source part index granularity [#57352](https://github.com/ClickHouse/ClickHouse/pull/57352) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix JSONExtract function for LowCardinality(Nullable) columns [#58808](https://github.com/ClickHouse/ClickHouse/pull/58808) ([vdimir](https://github.com/vdimir)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix error "Read beyond last offset" for AsynchronousBoundedReadBuffer [#59630](https://github.com/ClickHouse/ClickHouse/pull/59630) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix query start time on non initial queries [#59662](https://github.com/ClickHouse/ClickHouse/pull/59662) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+* rabbitmq: fix having neither acked nor nacked messages [#59775](https://github.com/ClickHouse/ClickHouse/pull/59775) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix cosineDistance crash with Nullable [#60150](https://github.com/ClickHouse/ClickHouse/pull/60150) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix rare race in external sort/aggregation with temporary data in cache [#58013](https://github.com/ClickHouse/ClickHouse/pull/58013) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix possible race in ManyAggregatedData dtor. [#58624](https://github.com/ClickHouse/ClickHouse/pull/58624) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix 02720_row_policy_column_with_dots [#59453](https://github.com/ClickHouse/ClickHouse/pull/59453) ([Duc Canh Le](https://github.com/canhld94)).
+* Pin python dependencies in stateless tests [#59663](https://github.com/ClickHouse/ClickHouse/pull/59663) ([Raúl Marín](https://github.com/Algunenano)).
+* Make ZooKeeper actually sequentialy consistent [#59735](https://github.com/ClickHouse/ClickHouse/pull/59735) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Remove broken test while we fix it [#60547](https://github.com/ClickHouse/ClickHouse/pull/60547) ([Raúl Marín](https://github.com/Algunenano)).
+
diff --git a/docs/changelogs/v23.8.11.28-lts.md b/docs/changelogs/v23.8.11.28-lts.md
new file mode 100644
index 00000000000..acc284caa72
--- /dev/null
+++ b/docs/changelogs/v23.8.11.28-lts.md
@@ -0,0 +1,30 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.8.11.28-lts (31879d2ab4c) FIXME as compared to v23.8.10.43-lts (a278225bba9)
+
+#### Improvement
+* Backported in [#60828](https://github.com/ClickHouse/ClickHouse/issues/60828): Update tzdata to 2024a. [#60768](https://github.com/ClickHouse/ClickHouse/pull/60768) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Use the current branch test-utils to build cctools'. [#61276](https://github.com/ClickHouse/ClickHouse/pull/61276) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#57104](https://github.com/ClickHouse/ClickHouse/pull/57104) ([Kruglov Pavel](https://github.com/Avogar)).
+* Detect io_uring in tests [#60373](https://github.com/ClickHouse/ClickHouse/pull/60373) ([Azat Khuzhin](https://github.com/azat)).
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v23.8.12.13-lts.md b/docs/changelogs/v23.8.12.13-lts.md
new file mode 100644
index 00000000000..dbb36fdc00e
--- /dev/null
+++ b/docs/changelogs/v23.8.12.13-lts.md
@@ -0,0 +1,20 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v23.8.12.13-lts (bdbd0d87e5d) FIXME as compared to v23.8.11.28-lts (31879d2ab4c)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Improve isolation of query cache entries under re-created users or role switches [#58611](https://github.com/ClickHouse/ClickHouse/pull/58611) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix string search with const position [#61547](https://github.com/ClickHouse/ClickHouse/pull/61547) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix crash in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#61428](https://github.com/ClickHouse/ClickHouse/issues/61428):. [#61374](https://github.com/ClickHouse/ClickHouse/pull/61374) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61484](https://github.com/ClickHouse/ClickHouse/issues/61484): ... [#61441](https://github.com/ClickHouse/ClickHouse/pull/61441) ([Max K.](https://github.com/maxknv)).
+
diff --git a/docs/changelogs/v23.9.1.1854-stable.md b/docs/changelogs/v23.9.1.1854-stable.md
index 655dd54d81b..bccd082bbaa 100644
--- a/docs/changelogs/v23.9.1.1854-stable.md
+++ b/docs/changelogs/v23.9.1.1854-stable.md
@@ -11,6 +11,7 @@ sidebar_label: 2023
 * Remove the `status_info` configuration option and dictionaries status from the default Prometheus handler. [#54090](https://github.com/ClickHouse/ClickHouse/pull/54090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * The experimental parts metadata cache is removed from the codebase. [#54215](https://github.com/ClickHouse/ClickHouse/pull/54215) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
 * Disable setting `input_format_json_try_infer_numbers_from_strings` by default, so we don't try to infer numbers from strings in JSON formats by default to avoid possible parsing errors when sample data contains strings that looks like a number. [#55099](https://github.com/ClickHouse/ClickHouse/pull/55099) ([Kruglov Pavel](https://github.com/Avogar)).
+* IPv6 bloom filter indexes created prior to March 2023 are not compatible with current version and have to be rebuilt. [#54200](https://github.com/ClickHouse/ClickHouse/pull/54200) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
 
 #### New Feature
 * Added new type of authentication based on SSH keys. It works only for Native TCP protocol. [#41109](https://github.com/ClickHouse/ClickHouse/pull/41109) ([George Gamezardashvili](https://github.com/InfJoker)).
@@ -378,4 +379,3 @@ sidebar_label: 2023
 * Fix typo in packager when ccache is used [#55104](https://github.com/ClickHouse/ClickHouse/pull/55104) ([Ilya Yatsishin](https://github.com/qoega)).
 * Reduce flakiness of 01455_opentelemetry_distributed [#55111](https://github.com/ClickHouse/ClickHouse/pull/55111) ([Michael Kolupaev](https://github.com/al13n321)).
 * Fix build [#55113](https://github.com/ClickHouse/ClickHouse/pull/55113) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
-
diff --git a/docs/changelogs/v24.1.1.2048-stable.md b/docs/changelogs/v24.1.1.2048-stable.md
new file mode 100644
index 00000000000..8e4647da86e
--- /dev/null
+++ b/docs/changelogs/v24.1.1.2048-stable.md
@@ -0,0 +1,438 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.1.2048-stable (5a024dfc093) FIXME as compared to v23.12.1.1368-stable (a2faa65b080)
+
+#### Backward Incompatible Change
+* The setting `print_pretty_type_names` is turned on by default. You can turn it off to keep the old behavior or `SET compatibility = '23.12'`. [#57726](https://github.com/ClickHouse/ClickHouse/pull/57726) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The MergeTree setting `clean_deleted_rows` is deprecated, it has no effect anymore. The `CLEANUP` keyword for `OPTIMIZE` is not allowed by default (unless `allow_experimental_replacing_merge_with_cleanup` is enabled). [#58316](https://github.com/ClickHouse/ClickHouse/pull/58316) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* The function `reverseDNSQuery` is no longer available. This closes [#58368](https://github.com/ClickHouse/ClickHouse/issues/58368). [#58369](https://github.com/ClickHouse/ClickHouse/pull/58369) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Enable various changes to improve the access control in the configuration file. These changes affect the behavior, and you check the `config.xml` in the `access_control_improvements` section. In case you are not confident, keep the values in the configuration file as they were in the previous version. [#58584](https://github.com/ClickHouse/ClickHouse/pull/58584) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow queries without aliases for subqueries for `PASTE JOIN`. [#58654](https://github.com/ClickHouse/ClickHouse/pull/58654) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix sumMapFiltered with NaN values. NaN values are now placed at the end (instead of randomly) and considered different from any values. `-0` is now also treated as equal to `0`; since 0 values are discarded, `-0` values are discarded too. [#58959](https://github.com/ClickHouse/ClickHouse/pull/58959) ([Raúl Marín](https://github.com/Algunenano)).
+* The function `visibleWidth` will behave according to the docs. In previous versions, it simply counted code points after string serialization, like the `lengthUTF8` function, but didn't consider zero-width and combining characters, full-width characters, tabs, and deletes. Now the behavior is changed accordingly. If you want to keep the old behavior, set `function_visible_width_behavior` to `0`, or set `compatibility` to `23.12` or lower. [#59022](https://github.com/ClickHouse/ClickHouse/pull/59022) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Kusto dialect is disabled until these two bugs will be fixed: [#59037](https://github.com/ClickHouse/ClickHouse/issues/59037) and [#59036](https://github.com/ClickHouse/ClickHouse/issues/59036). [#59305](https://github.com/ClickHouse/ClickHouse/pull/59305) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+* Allow partitions from tables with different partition expressions to be attached when the destination table partition expression doesn't re-partition/ split the part. [#39507](https://github.com/ClickHouse/ClickHouse/pull/39507) ([Arthur Passos](https://github.com/arthurpassos)).
+* Added statement `SYSTEM RELOAD ASYNCHRONOUS METRICS` which updates the asynchronous metrics. Mostly useful for testing and development. [#53710](https://github.com/ClickHouse/ClickHouse/pull/53710) ([Robert Schulze](https://github.com/rschu1ze)).
+* Certain settings (currently `min_compress_block_size` and `max_compress_block_size`) can now be specified at column-level where they take precedence over the corresponding table-level setting. Example: `CREATE TABLE tab (col String SETTINGS (min_compress_block_size = 81920, max_compress_block_size = 163840)) ENGINE = MergeTree ORDER BY tuple();`. [#55201](https://github.com/ClickHouse/ClickHouse/pull/55201) ([Duc Canh Le](https://github.com/canhld94)).
+* Add `quantileDDSketch` aggregate function as well as the corresponding `quantilesDDSketch` and `medianDDSketch`. It is based on the DDSketch https://www.vldb.org/pvldb/vol12/p2195-masson.pdf. ### Documentation entry for user-facing changes. [#56342](https://github.com/ClickHouse/ClickHouse/pull/56342) ([Srikanth Chekuri](https://github.com/srikanthccv)).
+* Added function `seriesDecomposeSTL()` which decomposes a time series into a season, a trend and a residual component. [#57078](https://github.com/ClickHouse/ClickHouse/pull/57078) ([Bhavna Jindal](https://github.com/bhavnajindal)).
+* Introduced MySQL Binlog Client for MaterializedMySQL: One binlog connection for many databases. [#57323](https://github.com/ClickHouse/ClickHouse/pull/57323) ([Val Doroshchuk](https://github.com/valbok)).
+* Intel QuickAssist Technology (QAT) provides hardware-accelerated compression and cryptograpy. ClickHouse got a new compression codec `ZSTD_QAT` which utilizes QAT for zstd compression. The codec uses [Intel's QATlib](https://github.com/intel/qatlib) and [Inte's QAT ZSTD Plugin](https://github.com/intel/QAT-ZSTD-Plugin). Right now, only compression can be accelerated in hardware (a software fallback kicks in in case QAT could not be initialized), decompression always runs in software. [#57509](https://github.com/ClickHouse/ClickHouse/pull/57509) ([jasperzhu](https://github.com/jinjunzh)).
+* Implementing the new way how object storage keys are generated for s3 disks. Now the format could be defined in terms of `re2` regex syntax with `key_template` option in disc description. [#57663](https://github.com/ClickHouse/ClickHouse/pull/57663) ([Sema Checherinda](https://github.com/CheSema)).
+* Table system.dropped_tables_parts contains parts of system.dropped_tables tables (dropped but not yet removed tables). [#58038](https://github.com/ClickHouse/ClickHouse/pull/58038) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Implement Variant data type that represents a union of other data types. Type `Variant(T1, T2, ..., TN)` means that each row of this type has a value of either type `T1` or `T2` or ... or `TN` or none of them (`NULL` value). Variant type is available under a setting `allow_experimental_variant_type`. Reference: [#54864](https://github.com/ClickHouse/ClickHouse/issues/54864). [#58047](https://github.com/ClickHouse/ClickHouse/pull/58047) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add settings `max_materialized_views_size_for_table` to limit the number of materialized views attached to a table. [#58068](https://github.com/ClickHouse/ClickHouse/pull/58068) ([zhongyuankai](https://github.com/zhongyuankai)).
+* `clickhouse-format` improvements: * support INSERT queries with `VALUES` * support comments (use `--comments` to output them) * support `--max_line_length` option to format only long queries in multiline. [#58246](https://github.com/ClickHouse/ClickHouse/pull/58246) ([vdimir](https://github.com/vdimir)).
+* Added `null_status_on_timeout_only_active` and `throw_only_active` modes for `distributed_ddl_output_mode` that allow to avoid waiting for inactive replicas. [#58350](https://github.com/ClickHouse/ClickHouse/pull/58350) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add table `system.database_engines`. [#58390](https://github.com/ClickHouse/ClickHouse/pull/58390) ([Bharat Nallan](https://github.com/bharatnc)).
+* Added FROM <Replicas> modifier for SYSTEM SYNC REPLICA LIGHTWEIGHT query. The FROM modifier ensures we wait for for fetches and drop-ranges only for the specified source replicas, as well as any replica not in zookeeper or with an empty source_replica. [#58393](https://github.com/ClickHouse/ClickHouse/pull/58393) ([Jayme Bird](https://github.com/jaymebrd)).
+* Add function `arrayShingles()` to compute subarrays, e.g. `arrayShingles([1, 2, 3, 4, 5], 3)` returns `[[1,2,3],[2,3,4],[3,4,5]]`. [#58396](https://github.com/ClickHouse/ClickHouse/pull/58396) ([Zheng Miao](https://github.com/zenmiao7)).
+* Added functions `punycodeEncode()`, `punycodeDecode()`, `idnaEncode()` and `idnaDecode()` which are useful for translating international domain names to an ASCII representation according to the IDNA standard. [#58454](https://github.com/ClickHouse/ClickHouse/pull/58454) ([Robert Schulze](https://github.com/rschu1ze)).
+* Added string similarity functions `dramerauLevenshteinDistance()`, `jaroSimilarity()` and `jaroWinklerSimilarity()`. [#58531](https://github.com/ClickHouse/ClickHouse/pull/58531) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add two settings `output_format_compression_level` to change output compression level and `output_format_compression_zstd_window_log` to explicitly set compression window size and enable long-range mode for zstd compression if output compression method is `zstd`. Applied for `INTO OUTFILE` and when writing to table functions `file`, `url`, `hdfs`, `s3`, and `azureBlobStorage`. [#58539](https://github.com/ClickHouse/ClickHouse/pull/58539) ([Duc Canh Le](https://github.com/canhld94)).
+* Automatically disable ANSI escape sequences in Pretty formats if the output is not a terminal. Add new `auto` mode to setting `output_format_pretty_color`. [#58614](https://github.com/ClickHouse/ClickHouse/pull/58614) ([Shaun Struwig](https://github.com/Blargian)).
+* Added setting `update_insert_deduplication_token_in_dependent_materialized_views`. This setting allows to update insert deduplication token with table identifier during insert in dependent materialized views. Closes [#59165](https://github.com/ClickHouse/ClickHouse/issues/59165). [#59238](https://github.com/ClickHouse/ClickHouse/pull/59238) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Performance Improvement
+* More cache-friendly final implementation. Note on the behaviour change: previously queries with `FINAL` modifier that read with a single stream (e.g. `max_threads=1`) produced sorted output without explicitly provided `ORDER BY` clause. This behaviour no longer exists when `enable_vertical_final = true` (and it is so by default). [#54366](https://github.com/ClickHouse/ClickHouse/pull/54366) ([Duc Canh Le](https://github.com/canhld94)).
+* Optimize array element function when input is array(map)/array(array(num)/array(array(string))/array(bigint)/array(decimal). Current implementation causes too many reallocs. The optimization speed up by ~6x especially when input type is array(map). [#56403](https://github.com/ClickHouse/ClickHouse/pull/56403) ([�扬](https://github.com/taiyang-li)).
+* Bypass `Poco::BasicBufferedStreamBuf` abstraction when reading from S3 (namely `ReadBufferFromIStream`) to avoid extra copying of data. [#56961](https://github.com/ClickHouse/ClickHouse/pull/56961) ([Nikita Taranov](https://github.com/nickitat)).
+* Read column once while reading more that one subcolumn from it in Compact parts. [#57631](https://github.com/ClickHouse/ClickHouse/pull/57631) ([Kruglov Pavel](https://github.com/Avogar)).
+* Rewrite the AST of sum(column + literal) function. [#57853](https://github.com/ClickHouse/ClickHouse/pull/57853) ([Jiebin Sun](https://github.com/jiebinn)).
+* The evaluation of function `match()` now utilizes skipping indices `ngrambf_v1` and `tokenbf_v1`. [#57882](https://github.com/ClickHouse/ClickHouse/pull/57882) ([凌涛](https://github.com/lingtaolf)).
+* Default coordinator for parallel replicas is rewritten for better cache locality (same mark ranges are almost always assigned to the same replicas). Consistent hashing is used also during work stealing, so better tail latency is expected. It has been tested for linear scalability on a hundred of replicas. [#57968](https://github.com/ClickHouse/ClickHouse/pull/57968) ([Nikita Taranov](https://github.com/nickitat)).
+* MergeTree FINAL to not compare rows from same non-L0 part. [#58142](https://github.com/ClickHouse/ClickHouse/pull/58142) ([Duc Canh Le](https://github.com/canhld94)).
+* Speed up iota calls (filling array with consecutive numbers). [#58271](https://github.com/ClickHouse/ClickHouse/pull/58271) ([Raúl Marín](https://github.com/Algunenano)).
+* The evaluation of function `match()` now utilizes inverted indices. [#58284](https://github.com/ClickHouse/ClickHouse/pull/58284) ([凌涛](https://github.com/lingtaolf)).
+* Speedup MIN/MAX for non numeric types. [#58334](https://github.com/ClickHouse/ClickHouse/pull/58334) ([Raúl Marín](https://github.com/Algunenano)).
+* Enable JIT compilation for aggregation without a key. Closes [#41461](https://github.com/ClickHouse/ClickHouse/issues/41461). Originally [#53757](https://github.com/ClickHouse/ClickHouse/issues/53757). [#58440](https://github.com/ClickHouse/ClickHouse/pull/58440) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The performance experiments of **OnTime** on the Intel server with up to AVX2 (and BMI2) support show that this change could effectively improve the QPS of **Q2** and **Q3** by **5.0%** and **3.7%** through reducing the cycle ratio of the hotspot, **_DB::MergeTreeRangeReader::ReadResult::optimize_**, **from 11.48% to 1.09%** and **from 8.09% to 0.67%** respectively while having no impact on others. [#58800](https://github.com/ClickHouse/ClickHouse/pull/58800) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
+* Use one thread less in `clickhouse-local`. [#58968](https://github.com/ClickHouse/ClickHouse/pull/58968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Large aggregation states of `uniqExact` will be merged in parallel in distrubuted queries. [#59009](https://github.com/ClickHouse/ClickHouse/pull/59009) ([Nikita Taranov](https://github.com/nickitat)).
+* Lower memory usage after reading from `MergeTree` tables. [#59290](https://github.com/ClickHouse/ClickHouse/pull/59290) ([Anton Popov](https://github.com/CurtizJ)).
+* Lower memory usage in vertical merges. [#59340](https://github.com/ClickHouse/ClickHouse/pull/59340) ([Anton Popov](https://github.com/CurtizJ)).
+
+#### Improvement
+* Enable MySQL/MariaDB on macOS. This closes [#21191](https://github.com/ClickHouse/ClickHouse/issues/21191). [#46316](https://github.com/ClickHouse/ClickHouse/pull/46316) ([Robert Schulze](https://github.com/rschu1ze)).
+* Do not interpret numbers with leading zeroes as octals. [#55575](https://github.com/ClickHouse/ClickHouse/pull/55575) ([Joanna Hulboj](https://github.com/jh0x)).
+* Replace HTTP outgoing buffering based on std ostream with CH Buffer. Add bytes counting metrics for interfaces. [#56064](https://github.com/ClickHouse/ClickHouse/pull/56064) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Disable `max_rows_in_set_to_optimize_join` by default. [#56396](https://github.com/ClickHouse/ClickHouse/pull/56396) ([vdimir](https://github.com/vdimir)).
+* Add `<host_name>` config parameter that allows avoiding resolving hostnames in DDLWorker. This mitigates the possibility of the queue being stuck in case of a change in cluster definition. Closes [#57573](https://github.com/ClickHouse/ClickHouse/issues/57573). [#57603](https://github.com/ClickHouse/ClickHouse/pull/57603) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Increase `load_metadata_threads` to 16 for the filesystem cache. It will make the server start up faster. [#57732](https://github.com/ClickHouse/ClickHouse/pull/57732) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve the `multiIf` function performance when the type is Nullable. [#57745](https://github.com/ClickHouse/ClickHouse/pull/57745) ([KevinyhZou](https://github.com/KevinyhZou)).
+* Add ability to throttle merges/mutations (`max_mutations_bandwidth_for_server`/`max_merges_bandwidth_for_server`). [#57877](https://github.com/ClickHouse/ClickHouse/pull/57877) ([Azat Khuzhin](https://github.com/azat)).
+* Replaced undocumented (boolean) column `is_hot_reloadable` in system table `system.server_settings` by (Enum8) column `changeable_without_restart` with possible values `No`, `Yes`, `IncreaseOnly` and `DecreaseOnly`. Also documented the column. [#58029](https://github.com/ClickHouse/ClickHouse/pull/58029) ([skyoct](https://github.com/skyoct)).
+* ClusterDiscovery supports setting username and password, close [#58063](https://github.com/ClickHouse/ClickHouse/issues/58063). [#58123](https://github.com/ClickHouse/ClickHouse/pull/58123) ([vdimir](https://github.com/vdimir)).
+* Support query parameters in ALTER TABLE ... PART. [#58297](https://github.com/ClickHouse/ClickHouse/pull/58297) ([Azat Khuzhin](https://github.com/azat)).
+* Create consumers for Kafka tables on fly (but keep them for some period - `kafka_consumers_pool_ttl_ms`, since last used), this should fix problem with statistics for `system.kafka_consumers` (that does not consumed when nobody reads from Kafka table, which leads to live memory leak and slow table detach) and also this PR enables stats for `system.kafka_consumers` by default again. [#58310](https://github.com/ClickHouse/ClickHouse/pull/58310) ([Azat Khuzhin](https://github.com/azat)).
+* Sparkbar as an alias to sparkbar. [#58335](https://github.com/ClickHouse/ClickHouse/pull/58335) ([凌涛](https://github.com/lingtaolf)).
+* Avoid sending ComposeObject requests after upload to GCS. [#58343](https://github.com/ClickHouse/ClickHouse/pull/58343) ([Azat Khuzhin](https://github.com/azat)).
+* Correctly handle keys with dot in the name in configurations XMLs. [#58354](https://github.com/ClickHouse/ClickHouse/pull/58354) ([Azat Khuzhin](https://github.com/azat)).
+* Added comments (brief descriptions) to all columns of system tables. The are several reasons fro this: - We use system tables a lot and sometimes is could be very difficult for developer to understand the purpose and the meaning of a particular column. - We change (add new ones or modify existing) system tables a lot and the documentation for them is always outdated. For example take a look at the documentation page for [`system.parts`](https://clickhouse.com/docs/en/operations/system-tables/parts). It misses a lot of columns - We would like to eventually generate documentation directly from ClickHouse. [#58356](https://github.com/ClickHouse/ClickHouse/pull/58356) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow to configure any kind of object storage with any kind of metadata type. [#58357](https://github.com/ClickHouse/ClickHouse/pull/58357) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Make function `format` return constant on constant arguments. This closes [#58355](https://github.com/ClickHouse/ClickHouse/issues/58355). [#58358](https://github.com/ClickHouse/ClickHouse/pull/58358) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Attach all system tables in `clickhouse-local`, including `system.parts`. This closes [#58312](https://github.com/ClickHouse/ClickHouse/issues/58312). [#58359](https://github.com/ClickHouse/ClickHouse/pull/58359) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support for `Enum` data types in function `transform`. This closes [#58241](https://github.com/ClickHouse/ClickHouse/issues/58241). [#58360](https://github.com/ClickHouse/ClickHouse/pull/58360) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow registering database engines independently. [#58365](https://github.com/ClickHouse/ClickHouse/pull/58365) ([Bharat Nallan](https://github.com/bharatnc)).
+* Adding a setting `max_estimated_execution_time` to separate `max_execution_time` and `max_estimated_execution_time`. [#58402](https://github.com/ClickHouse/ClickHouse/pull/58402) ([Zhang Yifan](https://github.com/zhangyifan27)).
+* Allow registering interpreters independently. [#58443](https://github.com/ClickHouse/ClickHouse/pull/58443) ([Bharat Nallan](https://github.com/bharatnc)).
+* Provide hint when an invalid database engine name is used. [#58444](https://github.com/ClickHouse/ClickHouse/pull/58444) ([Bharat Nallan](https://github.com/bharatnc)).
+* Avoid huge memory consumption during Keeper startup for more cases. [#58455](https://github.com/ClickHouse/ClickHouse/pull/58455) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add settings for better control of indexes type in Arrow dictionary. Use signed integer type for indexes by default as Arrow recommends. Closes [#57401](https://github.com/ClickHouse/ClickHouse/issues/57401). [#58519](https://github.com/ClickHouse/ClickHouse/pull/58519) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added function `sqidDecode()` which decodes [Sqids](https://sqids.org/). [#58544](https://github.com/ClickHouse/ClickHouse/pull/58544) ([Robert Schulze](https://github.com/rschu1ze)).
+* Allow to read Bool values into String in JSON input formats. It's done under a setting `input_format_json_read_bools_as_strings` that is enabled by default. [#58561](https://github.com/ClickHouse/ClickHouse/pull/58561) ([Kruglov Pavel](https://github.com/Avogar)).
+* Implement [#58575](https://github.com/ClickHouse/ClickHouse/issues/58575) Support `CLICKHOUSE_PASSWORD_FILE ` environment variable when running the docker image. [#58583](https://github.com/ClickHouse/ClickHouse/pull/58583) ([Eyal Halpern Shalev](https://github.com/Eyal-Shalev)).
+* When executing some queries, which require a lot of streams for reading data, the error `"Paste JOIN requires sorted tables only"` was previously thrown. Now the numbers of streams resize to 1 in that case. [#58608](https://github.com/ClickHouse/ClickHouse/pull/58608) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Add `SYSTEM JEMALLOC PURGE` for purging unused jemalloc pages, `SYSTEM JEMALLOC [ ENABLE | DISABLE | FLUSH ] PROFILE` for controlling jemalloc profile if the profiler is enabled. Add jemalloc-related 4LW command in Keeper: `jmst` for dumping jemalloc stats, `jmfp`, `jmep`, `jmdp` for controlling jemalloc profile if the profiler is enabled. [#58665](https://github.com/ClickHouse/ClickHouse/pull/58665) ([Antonio Andelic](https://github.com/antonio2368)).
+* Better message for INVALID_IDENTIFIER error. [#58703](https://github.com/ClickHouse/ClickHouse/pull/58703) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Improved handling of signed numeric literals in normalizeQuery. [#58710](https://github.com/ClickHouse/ClickHouse/pull/58710) ([Salvatore Mesoraca](https://github.com/aiven-sal)).
+* Support Point data type for MySQL. [#58721](https://github.com/ClickHouse/ClickHouse/pull/58721) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* When comparing a Float32 column and a const string, read the string as Float32 (instead of Float64). [#58724](https://github.com/ClickHouse/ClickHouse/pull/58724) ([Raúl Marín](https://github.com/Algunenano)).
+* Improve S3 compatible, add Ecloud EOS storage support. [#58786](https://github.com/ClickHouse/ClickHouse/pull/58786) ([xleoken](https://github.com/xleoken)).
+* Allow `KILL QUERY` to cancel backups / restores. This PR also makes running backups and restores visible in `system.processes`. Also there is a new setting in the server configuration now - `shutdown_wait_backups_and_restores` (default=true) which makes the server either wait on shutdown for all running backups and restores to finish or just cancel them. [#58804](https://github.com/ClickHouse/ClickHouse/pull/58804) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Avro format support Zstd codec. Closes [#58735](https://github.com/ClickHouse/ClickHouse/issues/58735). [#58805](https://github.com/ClickHouse/ClickHouse/pull/58805) ([flynn](https://github.com/ucasfl)).
+* MySQL interface gained support for `net_write_timeout` and `net_read_timeout` settings. `net_write_timeout` is translated into the native `send_timeout` ClickHouse setting and, similarly, `net_read_timeout` into `receive_timeout`. Fixed an issue where it was possible to set MySQL `sql_select_limit` setting only if the entire statement was in upper case. [#58835](https://github.com/ClickHouse/ClickHouse/pull/58835) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Fixing a problem described in [#58719](https://github.com/ClickHouse/ClickHouse/issues/58719). [#58841](https://github.com/ClickHouse/ClickHouse/pull/58841) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Make sure that for custom (created from SQL) disks ether `filesystem_caches_path` (a common directory prefix for all filesystem caches) or `custom_cached_disks_base_directory` (a common directory prefix for only filesystem caches created from custom disks) is specified in server config. `custom_cached_disks_base_directory` has higher priority for custom disks over `filesystem_caches_path`, which is used if the former one is absent. Filesystem cache setting `path` must lie inside that directory, otherwise exception will be thrown preventing disk to be created. This will not affect disks created on an older version and server was upgraded - then the exception will not be thrown to allow the server to successfully start). `custom_cached_disks_base_directory` is added to default server config as `/var/lib/clickhouse/caches/`. Closes [#57825](https://github.com/ClickHouse/ClickHouse/issues/57825). [#58869](https://github.com/ClickHouse/ClickHouse/pull/58869) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* MySQL interface gained compatibility with `SHOW WARNINGS`/`SHOW COUNT(*) WARNINGS` queries, though the returned result is always an empty set. [#58929](https://github.com/ClickHouse/ClickHouse/pull/58929) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Skip unavailable replicas when executing parallel distributed `INSERT SELECT`. [#58931](https://github.com/ClickHouse/ClickHouse/pull/58931) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Display word-descriptive log level while enabling structured log formatting in json. [#58936](https://github.com/ClickHouse/ClickHouse/pull/58936) ([Tim Liou](https://github.com/wheatdog)).
+* MySQL interface gained support for `CAST(x AS SIGNED)` and `CAST(x AS UNSIGNED)` statements via data type aliases: `SIGNED` for Int64, and `UNSIGNED` for UInt64. This improves compatibility with BI tools such as Looker Studio. [#58954](https://github.com/ClickHouse/ClickHouse/pull/58954) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Function `seriesDecomposeSTL()` now returns a baseline component as season + trend components. [#58961](https://github.com/ClickHouse/ClickHouse/pull/58961) ([Bhavna Jindal](https://github.com/bhavnajindal)).
+* Fix memory management in copyDataToS3File. [#58962](https://github.com/ClickHouse/ClickHouse/pull/58962) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Change working directory to data path in docker container. [#58975](https://github.com/ClickHouse/ClickHouse/pull/58975) ([cangyin](https://github.com/cangyin)).
+* Added setting for Azure Blob Storage `azure_max_unexpected_write_error_retries` , can also be set from config under azure section. [#59001](https://github.com/ClickHouse/ClickHouse/pull/59001) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Keeper improvement: reduce Keeper's memory usage for stored nodes. [#59002](https://github.com/ClickHouse/ClickHouse/pull/59002) ([Antonio Andelic](https://github.com/antonio2368)).
+* Allow server to start with broken data lake table. Closes [#58625](https://github.com/ClickHouse/ClickHouse/issues/58625). [#59080](https://github.com/ClickHouse/ClickHouse/pull/59080) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixes https://github.com/ClickHouse/ClickHouse/pull/59120#issuecomment-1906177350. [#59122](https://github.com/ClickHouse/ClickHouse/pull/59122) ([Arthur Passos](https://github.com/arthurpassos)).
+* The state of URL's #hash in the dashboard is now compressed using [lz-string](https://github.com/pieroxy/lz-string). The default size of the state string is compressed from 6856B to 2823B. [#59124](https://github.com/ClickHouse/ClickHouse/pull/59124) ([Amos Bird](https://github.com/amosbird)).
+* Allow to ignore schema evolution in Iceberg table engine and read all data using schema specified by the user on table creation or latest schema parsed from metadata on table creation. This is done under a setting `iceberg_engine_ignore_schema_evolution` that is disabled by default. Note that enabling this setting can lead to incorrect result as in case of evolved schema all data files will be read using the same schema. [#59133](https://github.com/ClickHouse/ClickHouse/pull/59133) ([Kruglov Pavel](https://github.com/Avogar)).
+* Prohibit mutable operations (`INSERT`/`ALTER`/`OPTIMIZE`/...) on read-only/write-once storages with a proper `TABLE_IS_READ_ONLY` error (to avoid leftovers). Avoid leaving left-overs on write-once disks (`format_version.txt`) on `CREATE`/`ATTACH`. Ignore `DROP` for `ReplicatedMergeTree` (so as for `MergeTree`). Fix iterating over `s3_plain` (`MetadataStorageFromPlainObjectStorage::iterateDirectory`). Note read-only is `web` disk, and write-once is `s3_plain`. [#59170](https://github.com/ClickHouse/ClickHouse/pull/59170) ([Azat Khuzhin](https://github.com/azat)).
+* MySQL interface gained support for `net_write_timeout` and `net_read_timeout` settings. `net_write_timeout` is translated into the native `send_timeout` ClickHouse setting and, similarly, `net_read_timeout` into `receive_timeout`. Fixed an issue where it was possible to set MySQL `sql_select_limit` setting only if the entire statement was in upper case. [#59293](https://github.com/ClickHouse/ClickHouse/pull/59293) ([Serge Klochkov](https://github.com/slvrtrn)).
+* Fix bug in experimental `_block_number` column which could lead to logical error during complex combination of `ALTER`s and `merge`s. Fixes [#56202](https://github.com/ClickHouse/ClickHouse/issues/56202). Replaces [#58601](https://github.com/ClickHouse/ClickHouse/issues/58601). CC @SmitaRKulkarni. [#59295](https://github.com/ClickHouse/ClickHouse/pull/59295) ([alesapin](https://github.com/alesapin)).
+* Play UI understands when an exception is returned inside JSON. Adjustment for [#52853](https://github.com/ClickHouse/ClickHouse/issues/52853). [#59303](https://github.com/ClickHouse/ClickHouse/pull/59303) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* `/binary` HTTP handler allows to specify user, host, and optionally, password in the query string. [#59311](https://github.com/ClickHouse/ClickHouse/pull/59311) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support backups for compressed in-memory tables. This closes [#57893](https://github.com/ClickHouse/ClickHouse/issues/57893). [#59315](https://github.com/ClickHouse/ClickHouse/pull/59315) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve exception message of function regexp_extract, close [#56393](https://github.com/ClickHouse/ClickHouse/issues/56393). [#59319](https://github.com/ClickHouse/ClickHouse/pull/59319) ([�扬](https://github.com/taiyang-li)).
+* Support the FORMAT clause in BACKUP and RESTORE queries. [#59338](https://github.com/ClickHouse/ClickHouse/pull/59338) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Function `concatWithSeparator()` now supports arbitrary argument types (instead of only `String` and `FixedString` arguments). For example, `SELECT concatWithSeparator('.', 'number', 1)` now returns `number.1`. [#59341](https://github.com/ClickHouse/ClickHouse/pull/59341) ([Robert Schulze](https://github.com/rschu1ze)).
+
+#### Build/Testing/Packaging Improvement
+* Improve aliases for clickhouse binary (now `ch`/`clickhouse` is `clickhouse-local` or `clickhouse` depends on the arguments) and add bash completion for new aliases. [#58344](https://github.com/ClickHouse/ClickHouse/pull/58344) ([Azat Khuzhin](https://github.com/azat)).
+* Add settings changes check to CI to check that all settings changes are reflected in settings changes history. [#58555](https://github.com/ClickHouse/ClickHouse/pull/58555) ([Kruglov Pavel](https://github.com/Avogar)).
+* Use tables directly attached from S3 in stateful tests. [#58791](https://github.com/ClickHouse/ClickHouse/pull/58791) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Save the whole `fuzzer.log` as an archive instead of the last 100k lines. `tail -n 100000` often removes lines with table definitions. Example:. [#58821](https://github.com/ClickHouse/ClickHouse/pull/58821) ([Dmitry Novik](https://github.com/novikd)).
+* Enable Rust on OSX ARM64 (this will add fuzzy search in client with skim and prql language, though I don't think that are people who hosts ClickHouse on darwin, so it is mostly for fuzzy search in client I would say). [#59272](https://github.com/ClickHouse/ClickHouse/pull/59272) ([Azat Khuzhin](https://github.com/azat)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Add join keys conversion for nested lowcardinality [#51550](https://github.com/ClickHouse/ClickHouse/pull/51550) ([vdimir](https://github.com/vdimir)).
+* Flatten only true Nested type if flatten_nested=1, not all Array(Tuple) [#56132](https://github.com/ClickHouse/ClickHouse/pull/56132) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix a bug with projections and the aggregate_functions_null_for_empty setting during insertion. [#56944](https://github.com/ClickHouse/ClickHouse/pull/56944) ([Amos Bird](https://github.com/amosbird)).
+* Fixed potential exception due to stale profile UUID [#57263](https://github.com/ClickHouse/ClickHouse/pull/57263) ([Vasily Nemkov](https://github.com/Enmk)).
+* Fix working with read buffers in StreamingFormatExecutor [#57438](https://github.com/ClickHouse/ClickHouse/pull/57438) ([Kruglov Pavel](https://github.com/Avogar)).
+* Ignore MVs with dropped target table during pushing to views [#57520](https://github.com/ClickHouse/ClickHouse/pull/57520) ([Kruglov Pavel](https://github.com/Avogar)).
+* [RFC] Eliminate possible race between ALTER_METADATA and MERGE_PARTS [#57755](https://github.com/ClickHouse/ClickHouse/pull/57755) ([Azat Khuzhin](https://github.com/azat)).
+* Fix the exprs order bug in group by with rollup [#57786](https://github.com/ClickHouse/ClickHouse/pull/57786) ([Chen768959](https://github.com/Chen768959)).
+* Fix lost blobs after dropping a replica with broken detached parts [#58333](https://github.com/ClickHouse/ClickHouse/pull/58333) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Allow users to work with symlinks in user_files_path (again) [#58447](https://github.com/ClickHouse/ClickHouse/pull/58447) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix segfault when graphite table does not have agg function [#58453](https://github.com/ClickHouse/ClickHouse/pull/58453) ([Duc Canh Le](https://github.com/canhld94)).
+* Delay reading from StorageKafka to allow multiple reads in materialized views [#58477](https://github.com/ClickHouse/ClickHouse/pull/58477) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix a stupid case of intersecting parts [#58482](https://github.com/ClickHouse/ClickHouse/pull/58482) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* MergeTreePrefetchedReadPool disable for LIMIT only queries [#58505](https://github.com/ClickHouse/ClickHouse/pull/58505) ([Maksim Kita](https://github.com/kitaisreal)).
+* Enable ordinary databases while restoration [#58520](https://github.com/ClickHouse/ClickHouse/pull/58520) ([Jihyuk Bok](https://github.com/tomahawk28)).
+* Fix hive threadpool read ORC/Parquet/... Failed [#58537](https://github.com/ClickHouse/ClickHouse/pull/58537) ([sunny](https://github.com/sunny19930321)).
+* Hide credentials in system.backup_log base_backup_name column [#58550](https://github.com/ClickHouse/ClickHouse/pull/58550) ([Daniel Pozo Escalona](https://github.com/danipozo)).
+* toStartOfInterval for milli- microsencods values rounding [#58557](https://github.com/ClickHouse/ClickHouse/pull/58557) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Disable max_joined_block_rows in ConcurrentHashJoin [#58595](https://github.com/ClickHouse/ClickHouse/pull/58595) ([vdimir](https://github.com/vdimir)).
+* Fix join using nullable in old analyzer [#58596](https://github.com/ClickHouse/ClickHouse/pull/58596) ([vdimir](https://github.com/vdimir)).
+* `makeDateTime64()`: Allow non-const fraction argument [#58597](https://github.com/ClickHouse/ClickHouse/pull/58597) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix possible NULL dereference during symbolizing inline frames [#58607](https://github.com/ClickHouse/ClickHouse/pull/58607) ([Azat Khuzhin](https://github.com/azat)).
+* Improve isolation of query cache entries under re-created users or role switches [#58611](https://github.com/ClickHouse/ClickHouse/pull/58611) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix broken partition key analysis when doing projection optimization [#58638](https://github.com/ClickHouse/ClickHouse/pull/58638) ([Amos Bird](https://github.com/amosbird)).
+* Query cache: Fix per-user quota [#58731](https://github.com/ClickHouse/ClickHouse/pull/58731) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix stream partitioning in parallel window functions [#58739](https://github.com/ClickHouse/ClickHouse/pull/58739) ([Dmitry Novik](https://github.com/novikd)).
+* Fix double destroy call on exception throw in addBatchLookupTable8 [#58745](https://github.com/ClickHouse/ClickHouse/pull/58745) ([Raúl Marín](https://github.com/Algunenano)).
+* Don't process requests in Keeper during shutdown [#58765](https://github.com/ClickHouse/ClickHouse/pull/58765) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix Segfault in `SlabsPolygonIndex::find` [#58771](https://github.com/ClickHouse/ClickHouse/pull/58771) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix JSONExtract function for LowCardinality(Nullable) columns [#58808](https://github.com/ClickHouse/ClickHouse/pull/58808) ([vdimir](https://github.com/vdimir)).
+* Table CREATE DROP Poco::Logger memory leak fix [#58831](https://github.com/ClickHouse/ClickHouse/pull/58831) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix HTTP compressors finalization [#58846](https://github.com/ClickHouse/ClickHouse/pull/58846) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Multiple read file log storage in mv [#58877](https://github.com/ClickHouse/ClickHouse/pull/58877) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Restriction for the access key id for s3. [#58900](https://github.com/ClickHouse/ClickHouse/pull/58900) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix possible crash in clickhouse-local during loading suggestions [#58907](https://github.com/ClickHouse/ClickHouse/pull/58907) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash when indexHint() is used [#58911](https://github.com/ClickHouse/ClickHouse/pull/58911) ([Dmitry Novik](https://github.com/novikd)).
+* Fix StorageURL forgetting headers on server restart [#58933](https://github.com/ClickHouse/ClickHouse/pull/58933) ([Michael Kolupaev](https://github.com/al13n321)).
+* Analyzer: fix storage replacement with insertion block [#58958](https://github.com/ClickHouse/ClickHouse/pull/58958) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix seek in ReadBufferFromZipArchive [#58966](https://github.com/ClickHouse/ClickHouse/pull/58966) ([Michael Kolupaev](https://github.com/al13n321)).
+* `DROP INDEX` of inverted index now removes all relevant files from persistence [#59040](https://github.com/ClickHouse/ClickHouse/pull/59040) ([mochi](https://github.com/MochiXu)).
+* Fix data race on query_factories_info [#59049](https://github.com/ClickHouse/ClickHouse/pull/59049) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disable "Too many redirects" error  retry [#59099](https://github.com/ClickHouse/ClickHouse/pull/59099) ([skyoct](https://github.com/skyoct)).
+* Fix aggregation issue in mixed x86_64 and ARM clusters [#59132](https://github.com/ClickHouse/ClickHouse/pull/59132) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* Fix not started database shutdown deadlock [#59137](https://github.com/ClickHouse/ClickHouse/pull/59137) ([Sergei Trifonov](https://github.com/serxa)).
+* Fix: LIMIT BY and LIMIT in distributed query [#59153](https://github.com/ClickHouse/ClickHouse/pull/59153) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix crash with nullable timezone for `toString` [#59190](https://github.com/ClickHouse/ClickHouse/pull/59190) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix abort in iceberg metadata on bad file paths [#59275](https://github.com/ClickHouse/ClickHouse/pull/59275) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix architecture name in select of Rust target [#59307](https://github.com/ClickHouse/ClickHouse/pull/59307) ([p1rattttt](https://github.com/p1rattttt)).
+* Fix not-ready set for system.tables [#59351](https://github.com/ClickHouse/ClickHouse/pull/59351) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix lazy initialization in RabbitMQ [#59352](https://github.com/ClickHouse/ClickHouse/pull/59352) ([Kruglov Pavel](https://github.com/Avogar)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Refreshable materialized views (takeover)"'. [#58296](https://github.com/ClickHouse/ClickHouse/pull/58296) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Fix an error in the release script - it didn't allow to make 23.12."'. [#58381](https://github.com/ClickHouse/ClickHouse/pull/58381) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* NO CL ENTRY:  'Revert "Use CH Buffer for HTTP out stream, add metrics for interfaces"'. [#58450](https://github.com/ClickHouse/ClickHouse/pull/58450) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Second attempt: Use CH Buffer for HTTP out stream, add metrics for interfaces'. [#58475](https://github.com/ClickHouse/ClickHouse/pull/58475) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* NO CL ENTRY:  'Revert "Merging [#53757](https://github.com/ClickHouse/ClickHouse/issues/53757)"'. [#58542](https://github.com/ClickHouse/ClickHouse/pull/58542) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Add support for MySQL `net_write_timeout` and `net_read_timeout` settings"'. [#58872](https://github.com/ClickHouse/ClickHouse/pull/58872) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Extend performance test norm_dist.xml"'. [#58989](https://github.com/ClickHouse/ClickHouse/pull/58989) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Add a test for [#47892](https://github.com/ClickHouse/ClickHouse/issues/47892)"'. [#58990](https://github.com/ClickHouse/ClickHouse/pull/58990) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Allow parallel replicas for JOIN with analyzer [part 1]."'. [#59059](https://github.com/ClickHouse/ClickHouse/pull/59059) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Consume leading zeroes when parsing a number in ConstantExpressionTemplate"'. [#59070](https://github.com/ClickHouse/ClickHouse/pull/59070) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Revert "Allow parallel replicas for JOIN with analyzer [part 1].""'. [#59076](https://github.com/ClickHouse/ClickHouse/pull/59076) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* NO CL ENTRY:  'Revert "Allow to attach partition from table with different partition expression when destination partition expression doesn't re-partition"'. [#59120](https://github.com/ClickHouse/ClickHouse/pull/59120) ([Robert Schulze](https://github.com/rschu1ze)).
+* NO CL ENTRY:  'DisksApp.cpp: fix typo (specifiged → specified)'. [#59140](https://github.com/ClickHouse/ClickHouse/pull/59140) ([Nikolay Edigaryev](https://github.com/edigaryev)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Analyzer: Fix resolving subcolumns in JOIN [#49703](https://github.com/ClickHouse/ClickHouse/pull/49703) ([vdimir](https://github.com/vdimir)).
+* Analyzer: always qualify execution names [#53705](https://github.com/ClickHouse/ClickHouse/pull/53705) ([Dmitry Novik](https://github.com/novikd)).
+* Insert quorum: check host node version in addition [#55528](https://github.com/ClickHouse/ClickHouse/pull/55528) ([Igor Nikonov](https://github.com/devcrafter)).
+* Remove more old code of projection analysis [#55579](https://github.com/ClickHouse/ClickHouse/pull/55579) ([Anton Popov](https://github.com/CurtizJ)).
+* Better exception messages in input formats [#57053](https://github.com/ClickHouse/ClickHouse/pull/57053) ([Kruglov Pavel](https://github.com/Avogar)).
+* Parallel replicas custom key: skip unavailable replicas [#57235](https://github.com/ClickHouse/ClickHouse/pull/57235) ([Igor Nikonov](https://github.com/devcrafter)).
+* Small change in log message in MergeTreeDataMergerMutator [#57550](https://github.com/ClickHouse/ClickHouse/pull/57550) ([Nikita Taranov](https://github.com/nickitat)).
+* fs cache: small optimization [#57615](https://github.com/ClickHouse/ClickHouse/pull/57615) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Customizable dependency failure handling for AsyncLoader [#57697](https://github.com/ClickHouse/ClickHouse/pull/57697) ([Sergei Trifonov](https://github.com/serxa)).
+* Bring test back [#57700](https://github.com/ClickHouse/ClickHouse/pull/57700) ([Nikita Taranov](https://github.com/nickitat)).
+* Change default database name in clickhouse-local to 'default' [#57774](https://github.com/ClickHouse/ClickHouse/pull/57774) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add option `--show-whitespaces-in-diff` to clickhouse-test [#57870](https://github.com/ClickHouse/ClickHouse/pull/57870) ([vdimir](https://github.com/vdimir)).
+* Update `query_masking_rules` when reloading the config, attempt 2 [#57993](https://github.com/ClickHouse/ClickHouse/pull/57993) ([Mikhail Koviazin](https://github.com/mkmkme)).
+* Remove unneeded parameter `use_external_buffer` from `AsynchronousReadBuffer*` [#58077](https://github.com/ClickHouse/ClickHouse/pull/58077) ([Nikita Taranov](https://github.com/nickitat)).
+* Print another message in Bugfix check if internal check had been failed [#58091](https://github.com/ClickHouse/ClickHouse/pull/58091) ([vdimir](https://github.com/vdimir)).
+* Refactor StorageMerge virtual columns filtering. [#58255](https://github.com/ClickHouse/ClickHouse/pull/58255) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Analyzer: fix tuple comparison when result is always null [#58266](https://github.com/ClickHouse/ClickHouse/pull/58266) ([vdimir](https://github.com/vdimir)).
+* Fix an error in the release script - it didn't allow to make 23.12. [#58288](https://github.com/ClickHouse/ClickHouse/pull/58288) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v23.12.1.1368-stable [#58290](https://github.com/ClickHouse/ClickHouse/pull/58290) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix test_storage_s3_queue/test.py::test_drop_table [#58293](https://github.com/ClickHouse/ClickHouse/pull/58293) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix timeout in 01732_race_condition_storage_join_long [#58298](https://github.com/ClickHouse/ClickHouse/pull/58298) ([vdimir](https://github.com/vdimir)).
+* Handle another case for preprocessing in Keeper [#58308](https://github.com/ClickHouse/ClickHouse/pull/58308) ([Antonio Andelic](https://github.com/antonio2368)).
+* Disable max_bytes_before_external* in 00172_hits_joins [#58309](https://github.com/ClickHouse/ClickHouse/pull/58309) ([vdimir](https://github.com/vdimir)).
+* Analyzer: support functional arguments in USING clause [#58317](https://github.com/ClickHouse/ClickHouse/pull/58317) ([Dmitry Novik](https://github.com/novikd)).
+* Fixed logical error in CheckSortedTransform [#58318](https://github.com/ClickHouse/ClickHouse/pull/58318) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Refreshable materialized views again [#58320](https://github.com/ClickHouse/ClickHouse/pull/58320) ([Michael Kolupaev](https://github.com/al13n321)).
+* Organize symbols from src/* into DB namespace [#58336](https://github.com/ClickHouse/ClickHouse/pull/58336) ([Amos Bird](https://github.com/amosbird)).
+* Add a style check against DOS and Windows [#58345](https://github.com/ClickHouse/ClickHouse/pull/58345) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Check what happen if remove array joined columns from KeyCondition [#58346](https://github.com/ClickHouse/ClickHouse/pull/58346) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Upload time of the perf tests into artifacts as test_duration_ms [#58348](https://github.com/ClickHouse/ClickHouse/pull/58348) ([Azat Khuzhin](https://github.com/azat)).
+* Keep exception format string in retries ctl [#58351](https://github.com/ClickHouse/ClickHouse/pull/58351) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix replication.lib helper (system.mutations has database not current_database) [#58352](https://github.com/ClickHouse/ClickHouse/pull/58352) ([Azat Khuzhin](https://github.com/azat)).
+* Refactor StorageHDFS and StorageFile virtual columns filtering [#58353](https://github.com/ClickHouse/ClickHouse/pull/58353) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix suspended workers for AsyncLoader [#58362](https://github.com/ClickHouse/ClickHouse/pull/58362) ([Sergei Trifonov](https://github.com/serxa)).
+* Remove stale events from README [#58364](https://github.com/ClickHouse/ClickHouse/pull/58364) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Do not fail the CI on an expired token [#58384](https://github.com/ClickHouse/ClickHouse/pull/58384) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add a test for [#38534](https://github.com/ClickHouse/ClickHouse/issues/38534) [#58391](https://github.com/ClickHouse/ClickHouse/pull/58391) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* fix database engine validation inside database factory [#58395](https://github.com/ClickHouse/ClickHouse/pull/58395) ([Bharat Nallan](https://github.com/bharatnc)).
+* Fix bad formatting of the `timeDiff` compatibility alias [#58398](https://github.com/ClickHouse/ClickHouse/pull/58398) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix a comment; remove unused method; stop using pointers [#58399](https://github.com/ClickHouse/ClickHouse/pull/58399) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix test_user_valid_until [#58409](https://github.com/ClickHouse/ClickHouse/pull/58409) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Make a test not depend on the lack of floating point associativity [#58439](https://github.com/ClickHouse/ClickHouse/pull/58439) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix `02944_dynamically_change_filesystem_cache_size` [#58445](https://github.com/ClickHouse/ClickHouse/pull/58445) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Analyzer: Fix LOGICAL_ERROR with LowCardinality [#58457](https://github.com/ClickHouse/ClickHouse/pull/58457) ([Dmitry Novik](https://github.com/novikd)).
+* Replace `std::regex` by re2 [#58458](https://github.com/ClickHouse/ClickHouse/pull/58458) ([Robert Schulze](https://github.com/rschu1ze)).
+* Improve perf tests [#58478](https://github.com/ClickHouse/ClickHouse/pull/58478) ([Raúl Marín](https://github.com/Algunenano)).
+* Check if I can remove KeyCondition analysis on AST. [#58480](https://github.com/ClickHouse/ClickHouse/pull/58480) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix some thread pool settings not updating at runtime [#58485](https://github.com/ClickHouse/ClickHouse/pull/58485) ([Michael Kolupaev](https://github.com/al13n321)).
+* Lower log levels for some Raft logs to new test level [#58487](https://github.com/ClickHouse/ClickHouse/pull/58487) ([Antonio Andelic](https://github.com/antonio2368)).
+* PartsSplitter small refactoring [#58506](https://github.com/ClickHouse/ClickHouse/pull/58506) ([Maksim Kita](https://github.com/kitaisreal)).
+* Sync content of the docker test images [#58507](https://github.com/ClickHouse/ClickHouse/pull/58507) ([Max K.](https://github.com/maxknv)).
+* CI: move ci-specifics from job scripts to ci.py [#58516](https://github.com/ClickHouse/ClickHouse/pull/58516) ([Max K.](https://github.com/maxknv)).
+* Minor fixups for `sqid()` [#58517](https://github.com/ClickHouse/ClickHouse/pull/58517) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update version_date.tsv and changelogs after v23.12.2.59-stable [#58545](https://github.com/ClickHouse/ClickHouse/pull/58545) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.11.4.24-stable [#58546](https://github.com/ClickHouse/ClickHouse/pull/58546) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.8.9.54-lts [#58547](https://github.com/ClickHouse/ClickHouse/pull/58547) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.10.6.60-stable [#58548](https://github.com/ClickHouse/ClickHouse/pull/58548) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.3.19.32-lts [#58549](https://github.com/ClickHouse/ClickHouse/pull/58549) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update CHANGELOG.md [#58559](https://github.com/ClickHouse/ClickHouse/pull/58559) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Fix test 02932_kill_query_sleep [#58560](https://github.com/ClickHouse/ClickHouse/pull/58560) ([Vitaly Baranov](https://github.com/vitlibar)).
+* CI fix. Add packager script to build digest [#58571](https://github.com/ClickHouse/ClickHouse/pull/58571) ([Max K.](https://github.com/maxknv)).
+* fix and test that S3Clients are reused [#58573](https://github.com/ClickHouse/ClickHouse/pull/58573) ([Sema Checherinda](https://github.com/CheSema)).
+* Follow-up to [#58482](https://github.com/ClickHouse/ClickHouse/issues/58482) [#58574](https://github.com/ClickHouse/ClickHouse/pull/58574) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Do not load database engines in suggest [#58586](https://github.com/ClickHouse/ClickHouse/pull/58586) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong message in Keeper [#58588](https://github.com/ClickHouse/ClickHouse/pull/58588) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add some missing LLVM includes [#58594](https://github.com/ClickHouse/ClickHouse/pull/58594) ([Raúl Marín](https://github.com/Algunenano)).
+* Small fix in Keeper [#58598](https://github.com/ClickHouse/ClickHouse/pull/58598) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update analyzer_tech_debt.txt [#58599](https://github.com/ClickHouse/ClickHouse/pull/58599) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Simplify release.py script [#58600](https://github.com/ClickHouse/ClickHouse/pull/58600) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update analyzer_tech_debt.txt [#58602](https://github.com/ClickHouse/ClickHouse/pull/58602) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Refactor stacktrace symbolizer to avoid copy-paste [#58610](https://github.com/ClickHouse/ClickHouse/pull/58610) ([Azat Khuzhin](https://github.com/azat)).
+* Add intel AMX checking [#58617](https://github.com/ClickHouse/ClickHouse/pull/58617) ([Roman Glinskikh](https://github.com/omgronny)).
+* Optional `client` argument for `S3Helper` [#58619](https://github.com/ClickHouse/ClickHouse/pull/58619) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add sorting to 02366_kql_summarize.sql [#58621](https://github.com/ClickHouse/ClickHouse/pull/58621) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix possible race in ManyAggregatedData dtor. [#58624](https://github.com/ClickHouse/ClickHouse/pull/58624) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove more projections code [#58628](https://github.com/ClickHouse/ClickHouse/pull/58628) ([Anton Popov](https://github.com/CurtizJ)).
+* Remove finalize() from ~WriteBufferFromEncryptedFile [#58629](https://github.com/ClickHouse/ClickHouse/pull/58629) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Update test_replicated_database/test.py [#58647](https://github.com/ClickHouse/ClickHouse/pull/58647) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Try disabling `muzzy_decay_ms` in jemalloc [#58648](https://github.com/ClickHouse/ClickHouse/pull/58648) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix test_replicated_database::test_startup_without_zk flakiness [#58649](https://github.com/ClickHouse/ClickHouse/pull/58649) ([Azat Khuzhin](https://github.com/azat)).
+* Fix 01600_remerge_sort_lowered_memory_bytes_ratio flakiness (due to settings randomization) [#58650](https://github.com/ClickHouse/ClickHouse/pull/58650) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer: Fix assertion in HashJoin with duplicate columns [#58652](https://github.com/ClickHouse/ClickHouse/pull/58652) ([vdimir](https://github.com/vdimir)).
+* Document that `match()` can use `ngrambf_v1` and `tokenbf_v1` indexes [#58655](https://github.com/ClickHouse/ClickHouse/pull/58655) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix perf tests duration (checks.test_duration_ms) [#58656](https://github.com/ClickHouse/ClickHouse/pull/58656) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer: Correctly handle constant set in index [#58657](https://github.com/ClickHouse/ClickHouse/pull/58657) ([Dmitry Novik](https://github.com/novikd)).
+* fix a typo in stress randomization setting [#58658](https://github.com/ClickHouse/ClickHouse/pull/58658) ([Sema Checherinda](https://github.com/CheSema)).
+* Small follow-up to `std::regex` --> `re2` conversion ([#58458](https://github.com/ClickHouse/ClickHouse/issues/58458)) [#58678](https://github.com/ClickHouse/ClickHouse/pull/58678) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove `<regex>` from libcxx [#58681](https://github.com/ClickHouse/ClickHouse/pull/58681) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix bad log message [#58698](https://github.com/ClickHouse/ClickHouse/pull/58698) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Some small improvements to version_helper from [#57203](https://github.com/ClickHouse/ClickHouse/issues/57203) [#58712](https://github.com/ClickHouse/ClickHouse/pull/58712) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Small fixes in different helpers [#58717](https://github.com/ClickHouse/ClickHouse/pull/58717) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix bug in new (not released yet) parallel replicas coordinator [#58722](https://github.com/ClickHouse/ClickHouse/pull/58722) ([Nikita Taranov](https://github.com/nickitat)).
+* Analyzer: Fix LOGICAL_ERROR in CountDistinctPass [#58723](https://github.com/ClickHouse/ClickHouse/pull/58723) ([Dmitry Novik](https://github.com/novikd)).
+* Fix reading of offsets subcolumn (`size0`) from `Nested` [#58729](https://github.com/ClickHouse/ClickHouse/pull/58729) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix Mac OS X [#58733](https://github.com/ClickHouse/ClickHouse/pull/58733) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* fix stress with generate-template-key [#58740](https://github.com/ClickHouse/ClickHouse/pull/58740) ([Sema Checherinda](https://github.com/CheSema)).
+* more relaxed check [#58751](https://github.com/ClickHouse/ClickHouse/pull/58751) ([Sema Checherinda](https://github.com/CheSema)).
+* Fix usage of small buffers for remote reading [#58768](https://github.com/ClickHouse/ClickHouse/pull/58768) ([Nikita Taranov](https://github.com/nickitat)).
+* Add missing includes when _LIBCPP_REMOVE_TRANSITIVE_INCLUDES enabled [#58770](https://github.com/ClickHouse/ClickHouse/pull/58770) ([Artem Alperin](https://github.com/hdnpth)).
+* Remove some code [#58772](https://github.com/ClickHouse/ClickHouse/pull/58772) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove some code [#58790](https://github.com/ClickHouse/ClickHouse/pull/58790) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix trash in performance tests [#58794](https://github.com/ClickHouse/ClickHouse/pull/58794) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix data race in Keeper [#58806](https://github.com/ClickHouse/ClickHouse/pull/58806) ([Antonio Andelic](https://github.com/antonio2368)).
+* Increase log level to trace to help debug `00993_system_parts_race_condition_drop_zookeeper` [#58809](https://github.com/ClickHouse/ClickHouse/pull/58809) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* DatabaseCatalog background tasks add log names [#58832](https://github.com/ClickHouse/ClickHouse/pull/58832) ([Maksim Kita](https://github.com/kitaisreal)).
+* Analyzer: Resolve GROUPING function on shards [#58833](https://github.com/ClickHouse/ClickHouse/pull/58833) ([Dmitry Novik](https://github.com/novikd)).
+* Allow parallel replicas for JOIN with analyzer [part 1]. [#58838](https://github.com/ClickHouse/ClickHouse/pull/58838) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `isRetry` method [#58839](https://github.com/ClickHouse/ClickHouse/pull/58839) ([alesapin](https://github.com/alesapin)).
+* fs cache: fix data race in slru [#58842](https://github.com/ClickHouse/ClickHouse/pull/58842) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix reading from an invisible part in new (not released yet) parallel replicas coordinator [#58844](https://github.com/ClickHouse/ClickHouse/pull/58844) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix bad log message [#58849](https://github.com/ClickHouse/ClickHouse/pull/58849) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Set max_bytes_before_external_group_by in 01961_roaring_memory_tracking [#58863](https://github.com/ClickHouse/ClickHouse/pull/58863) ([vdimir](https://github.com/vdimir)).
+* Fix `00089_group_by_arrays_of_fixed` with external aggregation [#58873](https://github.com/ClickHouse/ClickHouse/pull/58873) ([Antonio Andelic](https://github.com/antonio2368)).
+* DiskWeb minor improvement in loading [#58874](https://github.com/ClickHouse/ClickHouse/pull/58874) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix RPN construction for indexHint [#58875](https://github.com/ClickHouse/ClickHouse/pull/58875) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: add test with GROUP BY on shards [#58876](https://github.com/ClickHouse/ClickHouse/pull/58876) ([Dmitry Novik](https://github.com/novikd)).
+* Jepsen job to reuse builds [#58881](https://github.com/ClickHouse/ClickHouse/pull/58881) ([Max K.](https://github.com/maxknv)).
+* Fix ambiguity in the setting description [#58883](https://github.com/ClickHouse/ClickHouse/pull/58883) ([Denny Crane](https://github.com/den-crane)).
+* Less error prone interface of read buffers [#58886](https://github.com/ClickHouse/ClickHouse/pull/58886) ([Anton Popov](https://github.com/CurtizJ)).
+* Add metric for keeper memory soft limit [#58890](https://github.com/ClickHouse/ClickHouse/pull/58890) ([Pradeep Chhetri](https://github.com/chhetripradeep)).
+* Add a test for [#47988](https://github.com/ClickHouse/ClickHouse/issues/47988) [#58893](https://github.com/ClickHouse/ClickHouse/pull/58893) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Whitespaces [#58894](https://github.com/ClickHouse/ClickHouse/pull/58894) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix data race in `AggregatingTransform` [#58896](https://github.com/ClickHouse/ClickHouse/pull/58896) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update SLRUFileCachePriority.cpp [#58898](https://github.com/ClickHouse/ClickHouse/pull/58898) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add tests for [#57193](https://github.com/ClickHouse/ClickHouse/issues/57193) [#58899](https://github.com/ClickHouse/ClickHouse/pull/58899) ([Raúl Marín](https://github.com/Algunenano)).
+* Add log for already download binary in Jepsen [#58901](https://github.com/ClickHouse/ClickHouse/pull/58901) ([Antonio Andelic](https://github.com/antonio2368)).
+* fs cache: minor refactoring [#58902](https://github.com/ClickHouse/ClickHouse/pull/58902) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Checking on flaky test_parallel_replicas_custom_key_failover [#58909](https://github.com/ClickHouse/ClickHouse/pull/58909) ([Igor Nikonov](https://github.com/devcrafter)).
+* Style fix [#58913](https://github.com/ClickHouse/ClickHouse/pull/58913) ([Dmitry Novik](https://github.com/novikd)).
+* Opentelemetry spans to analyze CPU and S3 bottlenecks on inserts [#58914](https://github.com/ClickHouse/ClickHouse/pull/58914) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix fault handler in case of thread (for fault handler) cannot be spawned [#58917](https://github.com/ClickHouse/ClickHouse/pull/58917) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer: Support GROUP BY injective function elimination [#58919](https://github.com/ClickHouse/ClickHouse/pull/58919) ([Dmitry Novik](https://github.com/novikd)).
+* Cancel MasterCI in PRs [#58920](https://github.com/ClickHouse/ClickHouse/pull/58920) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix and test for azure [#58697](https://github.com/ClickHouse/ClickHouse/issues/58697) [#58921](https://github.com/ClickHouse/ClickHouse/pull/58921) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Extend performance test norm_dist.xml [#58922](https://github.com/ClickHouse/ClickHouse/pull/58922) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add regression test for parallel replicas (follow up [#58722](https://github.com/ClickHouse/ClickHouse/issues/58722), [#58844](https://github.com/ClickHouse/ClickHouse/issues/58844)) [#58923](https://github.com/ClickHouse/ClickHouse/pull/58923) ([Nikita Taranov](https://github.com/nickitat)).
+* Add a test for [#47892](https://github.com/ClickHouse/ClickHouse/issues/47892) [#58927](https://github.com/ClickHouse/ClickHouse/pull/58927) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix `FunctionToSubcolumnsPass` in debug build [#58930](https://github.com/ClickHouse/ClickHouse/pull/58930) ([Anton Popov](https://github.com/CurtizJ)).
+* Call `getMaxFileDescriptorCount` once in Keeper [#58938](https://github.com/ClickHouse/ClickHouse/pull/58938) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add missing files to digests [#58942](https://github.com/ClickHouse/ClickHouse/pull/58942) ([Raúl Marín](https://github.com/Algunenano)).
+* Analyzer: fix join column not found with compound identifiers [#58943](https://github.com/ClickHouse/ClickHouse/pull/58943) ([vdimir](https://github.com/vdimir)).
+* CI: pr_info to provide event_type for job scripts [#58947](https://github.com/ClickHouse/ClickHouse/pull/58947) ([Max K.](https://github.com/maxknv)).
+* Using the destination object for  paths generation in S3copy. [#58949](https://github.com/ClickHouse/ClickHouse/pull/58949) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Fix data race in slru (2) [#58950](https://github.com/ClickHouse/ClickHouse/pull/58950) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix flaky test_postgresql_replica_database_engine_2/test.py::test_dependent_loading [#58951](https://github.com/ClickHouse/ClickHouse/pull/58951) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* More safe way to dump system logs in tests [#58955](https://github.com/ClickHouse/ClickHouse/pull/58955) ([alesapin](https://github.com/alesapin)).
+* Add a comment about sparse checkout [#58960](https://github.com/ClickHouse/ClickHouse/pull/58960) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Follow up to [#58357](https://github.com/ClickHouse/ClickHouse/issues/58357) [#58963](https://github.com/ClickHouse/ClickHouse/pull/58963) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Better error message about tuples [#58971](https://github.com/ClickHouse/ClickHouse/pull/58971) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix timeout for prometheus exporter for HTTP/1.1 (due to keep-alive) [#58981](https://github.com/ClickHouse/ClickHouse/pull/58981) ([Azat Khuzhin](https://github.com/azat)).
+* Fix 02891_array_shingles with analyzer [#58982](https://github.com/ClickHouse/ClickHouse/pull/58982) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix script name in SQL example in executable.md [#58984](https://github.com/ClickHouse/ClickHouse/pull/58984) ([Lino Uruñuela](https://github.com/Wachynaky)).
+* Fix typo [#58986](https://github.com/ClickHouse/ClickHouse/pull/58986) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Revert flaky [#58992](https://github.com/ClickHouse/ClickHouse/pull/58992) ([Raúl Marín](https://github.com/Algunenano)).
+* Revive: Parallel replicas custom key: skip unavailable replicas [#58993](https://github.com/ClickHouse/ClickHouse/pull/58993) ([Igor Nikonov](https://github.com/devcrafter)).
+* Make performance test `test norm_dist.xml` more realistic [#58995](https://github.com/ClickHouse/ClickHouse/pull/58995) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix 02404_memory_bound_merging with analyzer (follow up [#56419](https://github.com/ClickHouse/ClickHouse/issues/56419)) [#58996](https://github.com/ClickHouse/ClickHouse/pull/58996) ([Nikita Taranov](https://github.com/nickitat)).
+* Add test for [#58930](https://github.com/ClickHouse/ClickHouse/issues/58930) [#58999](https://github.com/ClickHouse/ClickHouse/pull/58999) ([Anton Popov](https://github.com/CurtizJ)).
+* initialization ConnectionTimeouts [#59000](https://github.com/ClickHouse/ClickHouse/pull/59000) ([Sema Checherinda](https://github.com/CheSema)).
+* DiskWeb fix loading [#59006](https://github.com/ClickHouse/ClickHouse/pull/59006) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Update log level for http buffer [#59008](https://github.com/ClickHouse/ClickHouse/pull/59008) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Change log level for super imporant message in Keeper [#59010](https://github.com/ClickHouse/ClickHouse/pull/59010) ([alesapin](https://github.com/alesapin)).
+* Fix async loader stress test [#59011](https://github.com/ClickHouse/ClickHouse/pull/59011) ([Sergei Trifonov](https://github.com/serxa)).
+* Remove `StaticResourceManager` [#59013](https://github.com/ClickHouse/ClickHouse/pull/59013) ([Sergei Trifonov](https://github.com/serxa)).
+* preserve 'amz-sdk-invocation-id' and 'amz-sdk-request' headers with gcp [#59015](https://github.com/ClickHouse/ClickHouse/pull/59015) ([Sema Checherinda](https://github.com/CheSema)).
+* Update rename.md [#59017](https://github.com/ClickHouse/ClickHouse/pull/59017) ([filimonov](https://github.com/filimonov)).
+* очеп�тка [#59024](https://github.com/ClickHouse/ClickHouse/pull/59024) ([edpyt](https://github.com/edpyt)).
+* Split resource scheduler off `IO/` into `Common/Scheduler/` [#59025](https://github.com/ClickHouse/ClickHouse/pull/59025) ([Sergei Trifonov](https://github.com/serxa)).
+* Add a parameter for testing purposes [#59027](https://github.com/ClickHouse/ClickHouse/pull/59027) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix test 02932_kill_query_sleep when running with query cache [#59041](https://github.com/ClickHouse/ClickHouse/pull/59041) ([Vitaly Baranov](https://github.com/vitlibar)).
+* CI: Jepsen: fix sanity check in ci.py [#59043](https://github.com/ClickHouse/ClickHouse/pull/59043) ([Max K.](https://github.com/maxknv)).
+* CI: add ci_config classes for job and build names [#59046](https://github.com/ClickHouse/ClickHouse/pull/59046) ([Max K.](https://github.com/maxknv)).
+* remove flaky test [#59066](https://github.com/ClickHouse/ClickHouse/pull/59066) ([Sema Checherinda](https://github.com/CheSema)).
+* Followup to 57853 [#59068](https://github.com/ClickHouse/ClickHouse/pull/59068) ([Dmitry Novik](https://github.com/novikd)).
+* Follow-up to [#59027](https://github.com/ClickHouse/ClickHouse/issues/59027) [#59075](https://github.com/ClickHouse/ClickHouse/pull/59075) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix `test_parallel_replicas_invisible_parts` [#59077](https://github.com/ClickHouse/ClickHouse/pull/59077) ([Nikita Taranov](https://github.com/nickitat)).
+* Increase max_bytes_before_external_group_by for 00165_jit_aggregate_functions [#59078](https://github.com/ClickHouse/ClickHouse/pull/59078) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix stateless/run.sh [#59079](https://github.com/ClickHouse/ClickHouse/pull/59079) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* CI: hot fix for reuse [#59081](https://github.com/ClickHouse/ClickHouse/pull/59081) ([Max K.](https://github.com/maxknv)).
+* Fix server shutdown due to exception while loading metadata [#59083](https://github.com/ClickHouse/ClickHouse/pull/59083) ([Sergei Trifonov](https://github.com/serxa)).
+* Coordinator returns ranges for reading in sorted order [#59089](https://github.com/ClickHouse/ClickHouse/pull/59089) ([Nikita Taranov](https://github.com/nickitat)).
+* Raise timeout in 02294_decimal_second_errors [#59090](https://github.com/ClickHouse/ClickHouse/pull/59090) ([Raúl Marín](https://github.com/Algunenano)).
+* Add `[[nodiscard]]` to a couple of methods [#59093](https://github.com/ClickHouse/ClickHouse/pull/59093) ([Nikita Taranov](https://github.com/nickitat)).
+* Docs: Update integer and float aliases [#59100](https://github.com/ClickHouse/ClickHouse/pull/59100) ([Robert Schulze](https://github.com/rschu1ze)).
+* Avoid election timeouts during startup in Keeper [#59102](https://github.com/ClickHouse/ClickHouse/pull/59102) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add missing setting max_estimated_execution_time in  SettingsChangesHistory [#59104](https://github.com/ClickHouse/ClickHouse/pull/59104) ([Kruglov Pavel](https://github.com/Avogar)).
+* Rename some inverted index test files [#59106](https://github.com/ClickHouse/ClickHouse/pull/59106) ([Robert Schulze](https://github.com/rschu1ze)).
+* Further reduce runtime of `norm_distance.xml` [#59108](https://github.com/ClickHouse/ClickHouse/pull/59108) ([Robert Schulze](https://github.com/rschu1ze)).
+* Minor follow-up to [#53710](https://github.com/ClickHouse/ClickHouse/issues/53710) [#59109](https://github.com/ClickHouse/ClickHouse/pull/59109) ([Robert Schulze](https://github.com/rschu1ze)).
+* Update stateless/run.sh [#59116](https://github.com/ClickHouse/ClickHouse/pull/59116) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Followup 57875 [#59117](https://github.com/ClickHouse/ClickHouse/pull/59117) ([Dmitry Novik](https://github.com/novikd)).
+* Fixing build [#59130](https://github.com/ClickHouse/ClickHouse/pull/59130) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Capability check for `s3_plain` [#59145](https://github.com/ClickHouse/ClickHouse/pull/59145) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix `02015_async_inserts_stress_long` [#59146](https://github.com/ClickHouse/ClickHouse/pull/59146) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix AggregateFunctionNothing result type issues introducing it with different names [#59147](https://github.com/ClickHouse/ClickHouse/pull/59147) ([vdimir](https://github.com/vdimir)).
+* Fix url encoding issue [#59162](https://github.com/ClickHouse/ClickHouse/pull/59162) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Upgrade simdjson to v3.6.3 [#59166](https://github.com/ClickHouse/ClickHouse/pull/59166) ([Robert Schulze](https://github.com/rschu1ze)).
+* Decrease log level for one log message [#59168](https://github.com/ClickHouse/ClickHouse/pull/59168) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix broken cache for non-existing temp_path [#59172](https://github.com/ClickHouse/ClickHouse/pull/59172) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Move some headers [#59175](https://github.com/ClickHouse/ClickHouse/pull/59175) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Analyzer: Fix CTE name clash resolution [#59177](https://github.com/ClickHouse/ClickHouse/pull/59177) ([Dmitry Novik](https://github.com/novikd)).
+* Fix another place with special symbols in the URL [#59184](https://github.com/ClickHouse/ClickHouse/pull/59184) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Actions dag build filter actions refactoring [#59228](https://github.com/ClickHouse/ClickHouse/pull/59228) ([Maksim Kita](https://github.com/kitaisreal)).
+* Minor cleanup of msan usage [#59229](https://github.com/ClickHouse/ClickHouse/pull/59229) ([Robert Schulze](https://github.com/rschu1ze)).
+* Load server configs in clickhouse local [#59231](https://github.com/ClickHouse/ClickHouse/pull/59231) ([pufit](https://github.com/pufit)).
+* Make libssh build dependent on `-DENABLE_LIBRARIES` [#59242](https://github.com/ClickHouse/ClickHouse/pull/59242) ([Robert Schulze](https://github.com/rschu1ze)).
+* Disable copy constructor for MultiVersion [#59244](https://github.com/ClickHouse/ClickHouse/pull/59244) ([Vitaly Baranov](https://github.com/vitlibar)).
+* CI: fix ci configuration for nightly job [#59252](https://github.com/ClickHouse/ClickHouse/pull/59252) ([Max K.](https://github.com/maxknv)).
+* Fix 02475_bson_each_row_format flakiness (due to small parsing block) [#59253](https://github.com/ClickHouse/ClickHouse/pull/59253) ([Azat Khuzhin](https://github.com/azat)).
+* Improve pytest --pdb experience by preserving dockerd on SIGINT (v2) [#59255](https://github.com/ClickHouse/ClickHouse/pull/59255) ([Azat Khuzhin](https://github.com/azat)).
+* Fix fasttest by pinning pip dependencies [#59256](https://github.com/ClickHouse/ClickHouse/pull/59256) ([Azat Khuzhin](https://github.com/azat)).
+* Added AtomicLogger [#59273](https://github.com/ClickHouse/ClickHouse/pull/59273) ([Maksim Kita](https://github.com/kitaisreal)).
+* Update test_reload_after_fail_in_cache_dictionary for analyzer [#59274](https://github.com/ClickHouse/ClickHouse/pull/59274) ([vdimir](https://github.com/vdimir)).
+* Update run.sh [#59280](https://github.com/ClickHouse/ClickHouse/pull/59280) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add missing setting optimize_injective_functions_in_group_by to SettingsChangesHistory [#59283](https://github.com/ClickHouse/ClickHouse/pull/59283) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix perf tests (after sumMap starts to filter out -0.) [#59287](https://github.com/ClickHouse/ClickHouse/pull/59287) ([Azat Khuzhin](https://github.com/azat)).
+* Use fresh ZooKeeper client on DROP (to have higher chances on success) [#59288](https://github.com/ClickHouse/ClickHouse/pull/59288) ([Azat Khuzhin](https://github.com/azat)).
+* Additional check [#59292](https://github.com/ClickHouse/ClickHouse/pull/59292) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* No debug symbols in Rust [#59306](https://github.com/ClickHouse/ClickHouse/pull/59306) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix deadlock in `AsyncLoader::stop()` [#59308](https://github.com/ClickHouse/ClickHouse/pull/59308) ([Sergei Trifonov](https://github.com/serxa)).
+* Speed up `00165_jit_aggregate_functions` [#59312](https://github.com/ClickHouse/ClickHouse/pull/59312) ([Nikita Taranov](https://github.com/nickitat)).
+* CI: WA for issue with perf test with artifact reuse [#59325](https://github.com/ClickHouse/ClickHouse/pull/59325) ([Max K.](https://github.com/maxknv)).
+* Fix typo [#59329](https://github.com/ClickHouse/ClickHouse/pull/59329) ([Raúl Marín](https://github.com/Algunenano)).
+* Simplify query_run_metric_arrays in perf tests [#59333](https://github.com/ClickHouse/ClickHouse/pull/59333) ([Raúl Marín](https://github.com/Algunenano)).
+* IVolume constructor improve exception message [#59335](https://github.com/ClickHouse/ClickHouse/pull/59335) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix upgrade check for new setting [#59343](https://github.com/ClickHouse/ClickHouse/pull/59343) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix sccache when building without coverage [#59345](https://github.com/ClickHouse/ClickHouse/pull/59345) ([Raúl Marín](https://github.com/Algunenano)).
+* Loggers initialization fix [#59347](https://github.com/ClickHouse/ClickHouse/pull/59347) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add setting update_insert_deduplication_token_in_dependent_materialized_views to settings changes history [#59349](https://github.com/ClickHouse/ClickHouse/pull/59349) ([Maksim Kita](https://github.com/kitaisreal)).
+* Slightly better memory usage in `AsynchronousBoundedReadBuffer` [#59354](https://github.com/ClickHouse/ClickHouse/pull/59354) ([Anton Popov](https://github.com/CurtizJ)).
+* Try to make variant tests a bit faster [#59355](https://github.com/ClickHouse/ClickHouse/pull/59355) ([Kruglov Pavel](https://github.com/Avogar)).
+* Minor typos in Settings.h [#59371](https://github.com/ClickHouse/ClickHouse/pull/59371) ([Jordi Villar](https://github.com/jrdi)).
+* Rename `quantileDDSketch` to `quantileDD` [#59372](https://github.com/ClickHouse/ClickHouse/pull/59372) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/changelogs/v24.1.2.5-stable.md b/docs/changelogs/v24.1.2.5-stable.md
new file mode 100644
index 00000000000..bac25c9b9ed
--- /dev/null
+++ b/docs/changelogs/v24.1.2.5-stable.md
@@ -0,0 +1,14 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.2.5-stable (b2605dd4a5a) FIXME as compared to v24.1.1.2048-stable (5a024dfc093)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix stacktraces for binaries without debug symbols [#59444](https://github.com/ClickHouse/ClickHouse/pull/59444) ([Azat Khuzhin](https://github.com/azat)).
+
diff --git a/docs/changelogs/v24.1.3.31-stable.md b/docs/changelogs/v24.1.3.31-stable.md
new file mode 100644
index 00000000000..046ca451fbc
--- /dev/null
+++ b/docs/changelogs/v24.1.3.31-stable.md
@@ -0,0 +1,34 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.3.31-stable (135b08cbd28) FIXME as compared to v24.1.2.5-stable (b2605dd4a5a)
+
+#### Improvement
+* Backported in [#59569](https://github.com/ClickHouse/ClickHouse/issues/59569): Now dashboard understands both compressed and uncompressed state of URL's #hash (backward compatibility). Continuation of [#59124](https://github.com/ClickHouse/ClickHouse/issues/59124) . [#59548](https://github.com/ClickHouse/ClickHouse/pull/59548) ([Amos Bird](https://github.com/amosbird)).
+* Backported in [#59776](https://github.com/ClickHouse/ClickHouse/issues/59776): Added settings `split_parts_ranges_into_intersecting_and_non_intersecting_final` and `split_intersecting_parts_ranges_into_layers_final`. This settings are needed to disable optimizations for queries with `FINAL` and needed for debug only. [#59705](https://github.com/ClickHouse/ClickHouse/pull/59705) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix `ASTAlterCommand::formatImpl` in case of column specific settings… [#59445](https://github.com/ClickHouse/ClickHouse/pull/59445) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Make MAX use the same rules as permutation for complex types [#59498](https://github.com/ClickHouse/ClickHouse/pull/59498) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix corner case when passing `update_insert_deduplication_token_in_dependent_materialized_views` [#59544](https://github.com/ClickHouse/ClickHouse/pull/59544) ([Jordi Villar](https://github.com/jrdi)).
+* Fix incorrect result of arrayElement / map[] on empty value [#59594](https://github.com/ClickHouse/ClickHouse/pull/59594) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash in topK when merging empty states [#59603](https://github.com/ClickHouse/ClickHouse/pull/59603) ([Raúl Marín](https://github.com/Algunenano)).
+* Maintain function alias in RewriteSumFunctionWithSumAndCountVisitor [#59658](https://github.com/ClickHouse/ClickHouse/pull/59658) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Backport [#59650](https://github.com/ClickHouse/ClickHouse/issues/59650) to 24.1: MergeTree FINAL optimization diagnostics and settings"'. [#59701](https://github.com/ClickHouse/ClickHouse/pull/59701) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix 02720_row_policy_column_with_dots [#59453](https://github.com/ClickHouse/ClickHouse/pull/59453) ([Duc Canh Le](https://github.com/canhld94)).
+* Refactoring of dashboard state encoding [#59554](https://github.com/ClickHouse/ClickHouse/pull/59554) ([Sergei Trifonov](https://github.com/serxa)).
+* MergeTree FINAL optimization diagnostics and settings [#59650](https://github.com/ClickHouse/ClickHouse/pull/59650) ([Maksim Kita](https://github.com/kitaisreal)).
+* Pin python dependencies in stateless tests [#59663](https://github.com/ClickHouse/ClickHouse/pull/59663) ([Raúl Marín](https://github.com/Algunenano)).
+
diff --git a/docs/changelogs/v24.1.4.20-stable.md b/docs/changelogs/v24.1.4.20-stable.md
new file mode 100644
index 00000000000..8612a485f12
--- /dev/null
+++ b/docs/changelogs/v24.1.4.20-stable.md
@@ -0,0 +1,28 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.4.20-stable (f59d842b3fa) FIXME as compared to v24.1.3.31-stable (135b08cbd28)
+
+#### Improvement
+* Backported in [#59826](https://github.com/ClickHouse/ClickHouse/issues/59826): In case when `merge_max_block_size_bytes` is small enough and tables contain wide rows (strings or tuples) background merges may stuck in an endless loop. This behaviour is fixed. Follow-up for https://github.com/ClickHouse/ClickHouse/pull/59340. [#59812](https://github.com/ClickHouse/ClickHouse/pull/59812) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### Build/Testing/Packaging Improvement
+* Backported in [#59885](https://github.com/ClickHouse/ClickHouse/issues/59885): If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix digest calculation in Keeper [#59439](https://github.com/ClickHouse/ClickHouse/pull/59439) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix distributed table with a constant sharding key [#59606](https://github.com/ClickHouse/ClickHouse/pull/59606) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix query start time on non initial queries [#59662](https://github.com/ClickHouse/ClickHouse/pull/59662) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix parsing of partition expressions surrounded by parens [#59901](https://github.com/ClickHouse/ClickHouse/pull/59901) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Temporarily remove a feature that doesn't work [#59688](https://github.com/ClickHouse/ClickHouse/pull/59688) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Make ZooKeeper actually sequentialy consistent [#59735](https://github.com/ClickHouse/ClickHouse/pull/59735) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix special build reports in release branches [#59797](https://github.com/ClickHouse/ClickHouse/pull/59797) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v24.1.5.6-stable.md b/docs/changelogs/v24.1.5.6-stable.md
new file mode 100644
index 00000000000..ce46c51e2f4
--- /dev/null
+++ b/docs/changelogs/v24.1.5.6-stable.md
@@ -0,0 +1,17 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.5.6-stable (7f67181ff31) FIXME as compared to v24.1.4.20-stable (f59d842b3fa)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* UniqExactSet read crash fix [#59928](https://github.com/ClickHouse/ClickHouse/pull/59928) ([Maksim Kita](https://github.com/kitaisreal)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* CI: do not reuse builds on release branches [#59798](https://github.com/ClickHouse/ClickHouse/pull/59798) ([Max K.](https://github.com/maxknv)).
+
diff --git a/docs/changelogs/v24.1.7.18-stable.md b/docs/changelogs/v24.1.7.18-stable.md
new file mode 100644
index 00000000000..603a83a67be
--- /dev/null
+++ b/docs/changelogs/v24.1.7.18-stable.md
@@ -0,0 +1,26 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.7.18-stable (90925babd78) FIXME as compared to v24.1.6.52-stable (fa09f677bc9)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix_max_query_size_for_kql_compound_operator: [#60534](https://github.com/ClickHouse/ClickHouse/pull/60534) ([Yong Wang](https://github.com/kashwy)).
+* Fix crash with different allow_experimental_analyzer value in subqueries [#60770](https://github.com/ClickHouse/ClickHouse/pull/60770) ([Dmitry Novik](https://github.com/novikd)).
+* Fix Keeper reconfig for standalone binary [#61233](https://github.com/ClickHouse/ClickHouse/pull/61233) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#61043](https://github.com/ClickHouse/ClickHouse/issues/61043): Debug and fix markreleaseready. [#60611](https://github.com/ClickHouse/ClickHouse/pull/60611) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61168](https://github.com/ClickHouse/ClickHouse/issues/61168): Just a preparation for the merge queue support. [#61099](https://github.com/ClickHouse/ClickHouse/pull/61099) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61192](https://github.com/ClickHouse/ClickHouse/issues/61192): ... [#61185](https://github.com/ClickHouse/ClickHouse/pull/61185) ([Max K.](https://github.com/maxknv)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+
diff --git a/docs/changelogs/v24.1.8.22-stable.md b/docs/changelogs/v24.1.8.22-stable.md
new file mode 100644
index 00000000000..f780de41c40
--- /dev/null
+++ b/docs/changelogs/v24.1.8.22-stable.md
@@ -0,0 +1,32 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.1.8.22-stable (7fb8f96d3da) FIXME as compared to v24.1.7.18-stable (90925babd78)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix possible incorrect result of aggregate function `uniqExact` [#61257](https://github.com/ClickHouse/ClickHouse/pull/61257) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix consecutive keys optimization for nullable keys [#61393](https://github.com/ClickHouse/ClickHouse/pull/61393) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bug when reading system.parts using UUID (issue 61220). [#61479](https://github.com/ClickHouse/ClickHouse/pull/61479) ([Dan Wu](https://github.com/wudanzy)).
+* Fix client `-s` argument [#61530](https://github.com/ClickHouse/ClickHouse/pull/61530) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix string search with const position [#61547](https://github.com/ClickHouse/ClickHouse/pull/61547) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix crash in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#61431](https://github.com/ClickHouse/ClickHouse/issues/61431):. [#61374](https://github.com/ClickHouse/ClickHouse/pull/61374) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#61488](https://github.com/ClickHouse/ClickHouse/issues/61488): ... [#61441](https://github.com/ClickHouse/ClickHouse/pull/61441) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61642](https://github.com/ClickHouse/ClickHouse/issues/61642):. [#61592](https://github.com/ClickHouse/ClickHouse/pull/61592) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Backport [#61479](https://github.com/ClickHouse/ClickHouse/issues/61479) to 24.1: Fix bug when reading system.parts using UUID (issue 61220)."'. [#61775](https://github.com/ClickHouse/ClickHouse/pull/61775) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Speed up cctools building [#61011](https://github.com/ClickHouse/ClickHouse/pull/61011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v24.2.1.2248-stable.md b/docs/changelogs/v24.2.1.2248-stable.md
new file mode 100644
index 00000000000..6113dd51ab1
--- /dev/null
+++ b/docs/changelogs/v24.2.1.2248-stable.md
@@ -0,0 +1,462 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.2.1.2248-stable (891689a4150) FIXME as compared to v24.1.1.2048-stable (5a024dfc093)
+
+#### Backward Incompatible Change
+* Validate suspicious/experimental types in nested types. Previously we didn't validate such types (except JSON) in nested types like Array/Tuple/Map. [#59385](https://github.com/ClickHouse/ClickHouse/pull/59385) ([Kruglov Pavel](https://github.com/Avogar)).
+* The sort clause `ORDER BY ALL` (introduced with v23.12) is replaced by `ORDER BY *`. The previous syntax was too error-prone for tables with a column `all`. [#59450](https://github.com/ClickHouse/ClickHouse/pull/59450) ([Robert Schulze](https://github.com/rschu1ze)).
+* Rename the setting `extract_kvp_max_pairs_per_row` to `extract_key_value_pairs_max_pairs_per_row`. The bug (unnecessary abbreviation in the setting name) was introduced in https://github.com/ClickHouse/ClickHouse/pull/43606. Fix the documentation of this setting. [#59683](https://github.com/ClickHouse/ClickHouse/pull/59683) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Rename the setting extract_kvp_max_pairs_per_row to extract_key_value_pairs_max_pairs_per_row. The bug (unnecessary abbreviation in the setting name) was introduced in https://github.com/ClickHouse/ClickHouse/pull/43606. Fix the documentation of this setting. [#59960](https://github.com/ClickHouse/ClickHouse/pull/59960) ([jsc0218](https://github.com/jsc0218)).
+* Add sanity check for number of threads and block sizes. [#60138](https://github.com/ClickHouse/ClickHouse/pull/60138) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### New Feature
+* Added maximum sequential login failures to the quota. [#54737](https://github.com/ClickHouse/ClickHouse/pull/54737) ([Alexey Gerasimchuck](https://github.com/Demilivor)).
+* Added new syntax which allows to specify definer user in View/Materialized View. This allows to execute selects/inserts from views without explicit grants for underlying tables. [#54901](https://github.com/ClickHouse/ClickHouse/pull/54901) ([pufit](https://github.com/pufit)).
+* Backup & Restore support for AzureBlobStorage resolves [#50747](https://github.com/ClickHouse/ClickHouse/issues/50747). [#56988](https://github.com/ClickHouse/ClickHouse/pull/56988) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Implemented automatic conversion of merge tree tables of different kinds to replicated engine. Create empty `convert_to_replicated` file in table's data directory (`/clickhouse/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/`) and that table will be converted automatically on next server start. [#57798](https://github.com/ClickHouse/ClickHouse/pull/57798) ([Kirill](https://github.com/kirillgarbar)).
+* Added table function `mergeTreeIndex`. It represents the contents of index and marks files of `MergeTree` tables. It can be used for introspection. Syntax: `mergeTreeIndex(database, table, [with_marks = true])` where `database.table` is an existing table with `MergeTree` engine. [#58140](https://github.com/ClickHouse/ClickHouse/pull/58140) ([Anton Popov](https://github.com/CurtizJ)).
+* Added function `seriesOutliersTukey` to detect outliers in series data using Tukey's fences algorithm. [#58632](https://github.com/ClickHouse/ClickHouse/pull/58632) ([Bhavna Jindal](https://github.com/bhavnajindal)).
+* The user can now specify the template string directly in the query using `format_schema_rows_template` as an alternative to `format_template_row`. Closes [#31363](https://github.com/ClickHouse/ClickHouse/issues/31363). [#59088](https://github.com/ClickHouse/ClickHouse/pull/59088) ([Shaun Struwig](https://github.com/Blargian)).
+* Try to detect file format automatically during schema inference if it's unknown in `file/s3/hdfs/url/azureBlobStorage` engines. Closes [#50576](https://github.com/ClickHouse/ClickHouse/issues/50576). [#59092](https://github.com/ClickHouse/ClickHouse/pull/59092) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add function variantType that returns Enum with variant type name for each row. [#59398](https://github.com/ClickHouse/ClickHouse/pull/59398) ([Kruglov Pavel](https://github.com/Avogar)).
+* Added query `ALTER TABLE table FORGET PARTITION partition` that removes ZooKeeper nodes, related to an empty partition. [#59507](https://github.com/ClickHouse/ClickHouse/pull/59507) ([Sergei Trifonov](https://github.com/serxa)).
+* Support JWT credentials file for the NATS table engine. [#59543](https://github.com/ClickHouse/ClickHouse/pull/59543) ([Nickolaj Jepsen](https://github.com/nickolaj-jepsen)).
+* Provides new aggregate function ‘groupArrayIntersect’. Follows up: [#49862](https://github.com/ClickHouse/ClickHouse/issues/49862). [#59598](https://github.com/ClickHouse/ClickHouse/pull/59598) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Implemented system.dns_cache table, which can be useful for debugging DNS issues. [#59856](https://github.com/ClickHouse/ClickHouse/pull/59856) ([Kirill Nikiforov](https://github.com/allmazz)).
+* The codec `LZ4HC` will accept a new level 2, which is faster than the previous minimum level 3, at the expense of less compression. In previous versions, `LZ4HC(2)` and less was the same as `LZ4HC(3)`. Author: [Cyan4973](https://github.com/Cyan4973). [#60090](https://github.com/ClickHouse/ClickHouse/pull/60090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Implemented system.dns_cache table, which can be useful for debugging DNS issues. New server setting dns_cache_max_size. [#60257](https://github.com/ClickHouse/ClickHouse/pull/60257) ([Kirill Nikiforov](https://github.com/allmazz)).
+* Support single-argument version for the merge table function, as `merge(['db_name', ] 'tables_regexp')`. [#60372](https://github.com/ClickHouse/ClickHouse/pull/60372) ([豪肥肥](https://github.com/HowePa)).
+* Added new syntax which allows to specify definer user in View/Materialized View. This allows to execute selects/inserts from views without explicit grants for underlying tables. [#60439](https://github.com/ClickHouse/ClickHouse/pull/60439) ([pufit](https://github.com/pufit)).
+
+#### Performance Improvement
+* Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section. [#52230](https://github.com/ClickHouse/ClickHouse/pull/52230) ([JackyWoo](https://github.com/JackyWoo)).
+* Vectorized distance functions used in vector search. [#58866](https://github.com/ClickHouse/ClickHouse/pull/58866) ([Robert Schulze](https://github.com/rschu1ze)).
+* Continue optimizing branch miss of if function when result type is float*/decimal*/int* , follow up of https://github.com/ClickHouse/ClickHouse/pull/57885. [#59148](https://github.com/ClickHouse/ClickHouse/pull/59148) ([�扬](https://github.com/taiyang-li)).
+* Optimize if function when input type is map, speed up by ~10x. [#59413](https://github.com/ClickHouse/ClickHouse/pull/59413) ([�扬](https://github.com/taiyang-li)).
+* Improve performance of Int8 type by implementing strict aliasing. [#59485](https://github.com/ClickHouse/ClickHouse/pull/59485) ([Raúl Marín](https://github.com/Algunenano)).
+* Optimize performance of sum/avg conditionally for bigint and big decimal types by reducing branch miss. [#59504](https://github.com/ClickHouse/ClickHouse/pull/59504) ([�扬](https://github.com/taiyang-li)).
+* Improve performance of SELECTs with active mutations. [#59531](https://github.com/ClickHouse/ClickHouse/pull/59531) ([Azat Khuzhin](https://github.com/azat)).
+* Optimized function `isNotNull` with AVX2. [#59621](https://github.com/ClickHouse/ClickHouse/pull/59621) ([�扬](https://github.com/taiyang-li)).
+* Reuse the result of `FunctionFactory::instance().get("isNotNull", context)` and `FunctionFactory::instance().get("assumeNotNull", context)`. Make sure it is called once during the lifetime of `FunctionCoalesce`. [#59627](https://github.com/ClickHouse/ClickHouse/pull/59627) ([�扬](https://github.com/taiyang-li)).
+* Improve ASOF JOIN performance for sorted or almost sorted data. [#59731](https://github.com/ClickHouse/ClickHouse/pull/59731) ([Maksim Kita](https://github.com/kitaisreal)).
+* Primary key will use less amount of memory. [#60049](https://github.com/ClickHouse/ClickHouse/pull/60049) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve memory usage for primary key and some other operations. [#60050](https://github.com/ClickHouse/ClickHouse/pull/60050) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The tables' primary keys will be loaded in memory lazily on first access. This is controlled by the new MergeTree setting `primary_key_lazy_load`, which is on by default. This provides several advantages: - it will not be loaded for tables that are not used; - if there is not enough memory, an exception will be thrown on first use instead of at server startup. This provides several disadvantages: - the latency of loading the primary key will be paid on the first query rather than before accepting connections; this theoretically may introduce a thundering-herd problem. This closes [#11188](https://github.com/ClickHouse/ClickHouse/issues/11188). [#60093](https://github.com/ClickHouse/ClickHouse/pull/60093) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Vectorized function `dotProduct` which is useful for vector search. [#60202](https://github.com/ClickHouse/ClickHouse/pull/60202) ([Robert Schulze](https://github.com/rschu1ze)).
+* As is shown in Fig 1, the replacement of "&&" with "&" could generate the SIMD code. ![image](https://github.com/ClickHouse/ClickHouse/assets/26588299/a5a72ac4-6dc6-4d52-835a-4f512e55f0b9) Fig 1. Code compiled from '&&' (left) and '&' (right). [#60498](https://github.com/ClickHouse/ClickHouse/pull/60498) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
+
+#### Improvement
+* Added support for parameterized view with analyzer to not analyze create parameterized view. Refactor existing parameterized view logic to not analyze create parameterized view. [#54211](https://github.com/ClickHouse/ClickHouse/pull/54211) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Do not consider data part as broken if projection is broken. Closes [#56593](https://github.com/ClickHouse/ClickHouse/issues/56593). [#56864](https://github.com/ClickHouse/ClickHouse/pull/56864) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Add short-circuit ability for `dictGetOrDefault` function. Closes [#52098](https://github.com/ClickHouse/ClickHouse/issues/52098). [#57767](https://github.com/ClickHouse/ClickHouse/pull/57767) ([jsc0218](https://github.com/jsc0218)).
+* Running `ALTER COLUMN MATERIALIZE` on a column with `DEFAULT` or `MATERIALIZED` expression now writes the correct values: The default value for existing parts with default value or the non-default value for existing parts with non-default value. Previously, the default value was written for all existing parts. [#58023](https://github.com/ClickHouse/ClickHouse/pull/58023) ([Duc Canh Le](https://github.com/canhld94)).
+* Enabled a backoff logic (e.g. exponential). Will provide an ability for reduced CPU usage, memory usage and log file sizes. [#58036](https://github.com/ClickHouse/ClickHouse/pull/58036) ([MikhailBurdukov](https://github.com/MikhailBurdukov)).
+* Add improvement to count InitialQuery. [#58195](https://github.com/ClickHouse/ClickHouse/pull/58195) ([Unalian](https://github.com/Unalian)).
+* Support negative positional arguments. Closes [#57736](https://github.com/ClickHouse/ClickHouse/issues/57736). [#58292](https://github.com/ClickHouse/ClickHouse/pull/58292) ([flynn](https://github.com/ucasfl)).
+* Implement auto-adjustment for asynchronous insert timeouts. The following settings are introduced: async_insert_poll_timeout_ms, async_insert_use_adaptive_busy_timeout, async_insert_busy_timeout_min_ms, async_insert_busy_timeout_max_ms, async_insert_busy_timeout_increase_rate, async_insert_busy_timeout_decrease_rate. [#58486](https://github.com/ClickHouse/ClickHouse/pull/58486) ([Julia Kartseva](https://github.com/jkartseva)).
+* Allow to define `volume_priority` in `storage_configuration`. [#58533](https://github.com/ClickHouse/ClickHouse/pull/58533) ([Andrey Zvonov](https://github.com/zvonand)).
+* Add support for Date32 type in T64 codec. [#58738](https://github.com/ClickHouse/ClickHouse/pull/58738) ([Hongbin Ma](https://github.com/binmahone)).
+* Support `LEFT JOIN`, `ALL INNER JOIN`, and simple subqueries for parallel replicas (only with analyzer). New setting `parallel_replicas_prefer_local_join` chooses local `JOIN` execution (by default) vs `GLOBAL JOIN`. All tables should exist on every replica from `cluster_for_parallel_replicas`. New settings `min_external_table_block_size_rows` and `min_external_table_block_size_bytes` are used to squash small blocks that are sent for temporary tables (only with analyzer). [#58916](https://github.com/ClickHouse/ClickHouse/pull/58916) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Allow trailing commas in types with several items. [#59119](https://github.com/ClickHouse/ClickHouse/pull/59119) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* Allow parallel and distributed processing for `S3Queue` table engine. For distributed processing use setting `s3queue_total_shards_num` (by default `1`). Setting `s3queue_processing_threads_num` previously was not allowed for Ordered processing mode, now it is allowed. Warning: settings `s3queue_processing_threads_num`(processing threads per each shard) and `s3queue_total_shards_num` for ordered mode change how metadata is stored (make the number of `max_processed_file` nodes equal to `s3queue_processing_threads_num * s3queue_total_shards_num`), so they must be the same for all shards and cannot be changed once at least one shard is created. [#59167](https://github.com/ClickHouse/ClickHouse/pull/59167) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Allow concurrent table creation in `DatabaseReplicated` during `recoverLostReplica`. [#59277](https://github.com/ClickHouse/ClickHouse/pull/59277) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Settings for the Distributed table engine can now be specified in the server configuration file (similar to MergeTree settings), e.g. ``` <distributed> <flush_on_detach>false</flush_on_detach> </distributed> ```. [#59291](https://github.com/ClickHouse/ClickHouse/pull/59291) ([Azat Khuzhin](https://github.com/azat)).
+* Use MergeTree as a default table engine. It makes the usability much better, and closer to ClickHouse Cloud. [#59316](https://github.com/ClickHouse/ClickHouse/pull/59316) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Retry disconnects and expired sessions when reading `system.zookeeper`. This is helpful when reading many rows from `system.zookeeper` table especially in the presence of fault-injected disconnects. [#59388](https://github.com/ClickHouse/ClickHouse/pull/59388) ([Alexander Gololobov](https://github.com/davenger)).
+* Do not interpret numbers with leading zeroes as octals when `input_format_values_interpret_expressions=0`. [#59403](https://github.com/ClickHouse/ClickHouse/pull/59403) ([Joanna Hulboj](https://github.com/jh0x)).
+* At startup and whenever config files are changed, ClickHouse updates the hard memory limits of its total memory tracker. These limits are computed based on various server settings and cgroups limits (on Linux). Previously, setting `/sys/fs/cgroup/memory.max` (for cgroups v2) was hard-coded. As a result, cgroup v2 memory limits configured for nested groups (hierarchies), e.g. `/sys/fs/cgroup/my/nested/group/memory.max` were ignored. This is now fixed. The behavior of v1 memory limits remains unchanged. [#59435](https://github.com/ClickHouse/ClickHouse/pull/59435) ([Robert Schulze](https://github.com/rschu1ze)).
+* New profile events added to observe the time spent on calculating PK/projections/secondary indices during `INSERT`-s. [#59436](https://github.com/ClickHouse/ClickHouse/pull/59436) ([Nikita Taranov](https://github.com/nickitat)).
+* Allow to define a starting point for S3Queue with Ordered mode at creation using setting `s3queue_last_processed_path`. [#59446](https://github.com/ClickHouse/ClickHouse/pull/59446) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Keeper improvement: cache only a certain amount of logs in-memory controlled by `latest_logs_cache_size_threshold` and `commit_logs_cache_size_threshold`. [#59460](https://github.com/ClickHouse/ClickHouse/pull/59460) ([Antonio Andelic](https://github.com/antonio2368)).
+* Made comments for system tables also available in `system.tables` in `clickhouse-local`. [#59493](https://github.com/ClickHouse/ClickHouse/pull/59493) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Don't infer floats in exponential notation by default. Add a setting `input_format_try_infer_exponent_floats` that will restore previous behaviour (disabled by default). Closes [#59476](https://github.com/ClickHouse/ClickHouse/issues/59476). [#59500](https://github.com/ClickHouse/ClickHouse/pull/59500) ([Kruglov Pavel](https://github.com/Avogar)).
+* Allow alter operations to be surrounded by parenthesis. The emission of parentheses can be controlled by the `format_alter_operations_with_parentheses` config. By default in formatted queries the parentheses are emitted as we store the formatted alter operations in some places as metadata (e.g.: mutations). The new syntax clarifies some of the queries where alter operations end in a list. E.g.: `ALTER TABLE x MODIFY TTL date GROUP BY a, b, DROP COLUMN c` cannot be parsed properly with the old syntax. In the new syntax the query `ALTER TABLE x (MODIFY TTL date GROUP BY a, b), (DROP COLUMN c)` is obvious. Older versions are not able to read the new syntax, therefore using the new syntax might cause issues if newer and older version of ClickHouse are mixed in a single cluster. [#59532](https://github.com/ClickHouse/ClickHouse/pull/59532) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* The previous default value equals to 1 MB for `async_insert_max_data_size` appeared to be too small. The new one would be 10 MiB. [#59536](https://github.com/ClickHouse/ClickHouse/pull/59536) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Previously the whole result was accumulated in memory and returned as one big chunk. This change should help to reduce memory consumption when reading many rows from `system.zookeeper`, allow showing intermediate progress (how many rows have been read so far) and avoid hitting connection timeout when result set is big. [#59545](https://github.com/ClickHouse/ClickHouse/pull/59545) ([Alexander Gololobov](https://github.com/davenger)).
+* Now dashboard understands both compressed and uncompressed state of URL's #hash (backward compatibility). Continuation of [#59124](https://github.com/ClickHouse/ClickHouse/issues/59124) . [#59548](https://github.com/ClickHouse/ClickHouse/pull/59548) ([Amos Bird](https://github.com/amosbird)).
+* Bumped Intel QPL (used by codec `DEFLATE_QPL`) from v1.3.1 to v1.4.0 . Also fixed a bug for polling timeout mechanism, as we observed in same cases timeout won't work properly, if timeout happen, IAA and CPU may process buffer concurrently. So far, we'd better make sure IAA codec status is not QPL_STS_BEING_PROCESSED, then fallback to SW codec. [#59551](https://github.com/ClickHouse/ClickHouse/pull/59551) ([jasperzhu](https://github.com/jinjunzh)).
+* Keeper improvement: reduce size of data node even more. [#59592](https://github.com/ClickHouse/ClickHouse/pull/59592) ([Antonio Andelic](https://github.com/antonio2368)).
+* Do not show a warning about the server version in ClickHouse Cloud because ClickHouse Cloud handles seamless upgrades automatically. [#59657](https://github.com/ClickHouse/ClickHouse/pull/59657) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* After self-extraction temporary binary is moved instead copying. [#59661](https://github.com/ClickHouse/ClickHouse/pull/59661) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix stack unwinding on MacOS. This closes [#53653](https://github.com/ClickHouse/ClickHouse/issues/53653). [#59690](https://github.com/ClickHouse/ClickHouse/pull/59690) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Check for stack overflow in parsers even if the user misconfigured the `max_parser_depth` setting to a very high value. This closes [#59622](https://github.com/ClickHouse/ClickHouse/issues/59622). [#59697](https://github.com/ClickHouse/ClickHouse/pull/59697) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Perform synchronous inserts if dependent MV deduplication is enabled through deduplicate_blocks_in_dependent_materialized_views=1. [#59699](https://github.com/ClickHouse/ClickHouse/pull/59699) ([Julia Kartseva](https://github.com/jkartseva)).
+* Added settings `split_parts_ranges_into_intersecting_and_non_intersecting_final` and `split_intersecting_parts_ranges_into_layers_final`. This settings are needed to disable optimizations for queries with `FINAL` and needed for debug only. [#59705](https://github.com/ClickHouse/ClickHouse/pull/59705) ([Maksim Kita](https://github.com/kitaisreal)).
+* Unify xml and sql created named collection behaviour in kafka storage. [#59710](https://github.com/ClickHouse/ClickHouse/pull/59710) ([Pervakov Grigorii](https://github.com/GrigoryPervakov)).
+* In case when `merge_max_block_size_bytes` is small enough and tables contain wide rows (strings or tuples) background merges may stuck in an endless loop. This behaviour is fixed. Follow-up for https://github.com/ClickHouse/ClickHouse/pull/59340. [#59812](https://github.com/ClickHouse/ClickHouse/pull/59812) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Allow uuid in replica_path if CREATE TABLE explicitly has it. [#59908](https://github.com/ClickHouse/ClickHouse/pull/59908) ([Azat Khuzhin](https://github.com/azat)).
+* Add column `metadata_version` of ReplicatedMergeTree table in `system.tables` system table. [#59942](https://github.com/ClickHouse/ClickHouse/pull/59942) ([Maksim Kita](https://github.com/kitaisreal)).
+* Keeper improvement: send only Keeper related metrics/events for Prometheus. [#59945](https://github.com/ClickHouse/ClickHouse/pull/59945) ([Antonio Andelic](https://github.com/antonio2368)).
+* The dashboard will display metrics across different ClickHouse versions even if the structure of system tables has changed after the upgrade. [#59967](https://github.com/ClickHouse/ClickHouse/pull/59967) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow loading AZ info from a file. [#59976](https://github.com/ClickHouse/ClickHouse/pull/59976) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Keeper improvement: add retries on failures for Disk related operations. [#59980](https://github.com/ClickHouse/ClickHouse/pull/59980) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add new config setting `backups.remove_backup_files_after_failure`: ``` <clickhouse> <backups> <remove_backup_files_after_failure>true</remove_backup_files_after_failure> </backups> </clickhouse> ```. [#60002](https://github.com/ClickHouse/ClickHouse/pull/60002) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Use multiple threads while reading the metadata of tables from a backup while executing the RESTORE command. [#60040](https://github.com/ClickHouse/ClickHouse/pull/60040) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Now if `StorageBuffer` has more than 1 shard (`num_layers` > 1) background flush will happen simultaneously for all shards in multiple threads. [#60111](https://github.com/ClickHouse/ClickHouse/pull/60111) ([alesapin](https://github.com/alesapin)).
+* Support specifying users for specific S3 settings in config using `user` key. [#60144](https://github.com/ClickHouse/ClickHouse/pull/60144) ([Antonio Andelic](https://github.com/antonio2368)).
+* Copy S3 file GCP fallback to buffer copy in case GCP returned `Internal Error` with `GATEWAY_TIMEOUT` HTTP error code. [#60164](https://github.com/ClickHouse/ClickHouse/pull/60164) ([Maksim Kita](https://github.com/kitaisreal)).
+* Implement comparison operator for Variant values and proper Field inserting into Variant column. Don't allow creating `Variant` type with similar variant types by default (allow uder a setting `allow_suspicious_variant_types`) Closes [#59996](https://github.com/ClickHouse/ClickHouse/issues/59996). Closes [#59850](https://github.com/ClickHouse/ClickHouse/issues/59850). [#60198](https://github.com/ClickHouse/ClickHouse/pull/60198) ([Kruglov Pavel](https://github.com/Avogar)).
+* Short circuit execution for `ULIDStringToDateTime`. [#60211](https://github.com/ClickHouse/ClickHouse/pull/60211) ([Juan Madurga](https://github.com/jlmadurga)).
+* Added `query_id` column for tables `system.backups` and `system.backup_log`. Added error stacktrace to `error` column. [#60220](https://github.com/ClickHouse/ClickHouse/pull/60220) ([Maksim Kita](https://github.com/kitaisreal)).
+* Connections through the MySQL port now automatically run with setting `prefer_column_name_to_alias = 1` to support QuickSight out-of-the-box. Also, settings `mysql_map_string_to_text_in_show_columns` and `mysql_map_fixed_string_to_text_in_show_columns` are now enabled by default, affecting also only MySQL connections. This increases compatibility with more BI tools. [#60365](https://github.com/ClickHouse/ClickHouse/pull/60365) ([Robert Schulze](https://github.com/rschu1ze)).
+* When output format is Pretty format and a block consists of a single numeric value which exceeds one million, A readable number will be printed on table right. e.g. ``` ┌──────count()─� │ 233765663884 │ -- 233.77 billion └──────────────┘ ```. [#60379](https://github.com/ClickHouse/ClickHouse/pull/60379) ([rogeryk](https://github.com/rogeryk)).
+* Fix a race condition in JavaScript code leading to duplicate charts on top of each other. [#60392](https://github.com/ClickHouse/ClickHouse/pull/60392) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Check for stack overflow in parsers even if the user misconfigured the `max_parser_depth` setting to a very high value. This closes [#59622](https://github.com/ClickHouse/ClickHouse/issues/59622). [#60434](https://github.com/ClickHouse/ClickHouse/pull/60434) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Build/Testing/Packaging Improvement
+* Added builds and tests with coverage collection with introspection. Continuation of [#56102](https://github.com/ClickHouse/ClickHouse/issues/56102). [#58792](https://github.com/ClickHouse/ClickHouse/pull/58792) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Include `pytest-reportlog` in integration test CI runner Dockerfile to enable JSON test reports. [#58926](https://github.com/ClickHouse/ClickHouse/pull/58926) ([MyroTk](https://github.com/MyroTk)).
+* Update the rust toolchain in `corrosion-cmake` when the CMake cross-compilation toolchain variable is set. [#59309](https://github.com/ClickHouse/ClickHouse/pull/59309) ([Aris Tritas](https://github.com/aris-aiven)).
+* Add some fuzzing to ASTLiterals. [#59383](https://github.com/ClickHouse/ClickHouse/pull/59383) ([Raúl Marín](https://github.com/Algunenano)).
+* If you want to run initdb scripts every time when ClickHouse container is starting you shoud initialize environment varible CLICKHOUSE_ALWAYS_RUN_INITDB_SCRIPTS. [#59808](https://github.com/ClickHouse/ClickHouse/pull/59808) ([Alexander Nikolaev](https://github.com/AlexNik)).
+* Remove ability to disable generic clickhouse components (like server/client/...), but keep some that requires extra libraries (like ODBC or keeper). [#59857](https://github.com/ClickHouse/ClickHouse/pull/59857) ([Azat Khuzhin](https://github.com/azat)).
+* Query fuzzer will fuzz SETTINGS inside queries. [#60087](https://github.com/ClickHouse/ClickHouse/pull/60087) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add test that validates projections still work after attach partition. [#60415](https://github.com/ClickHouse/ClickHouse/pull/60415) ([Arthur Passos](https://github.com/arthurpassos)).
+* Add test that validates attach partition fails if structure differs because of materialized column. [#60418](https://github.com/ClickHouse/ClickHouse/pull/60418) ([Arthur Passos](https://github.com/arthurpassos)).
+* Add support for building ClickHouse with clang-19 (master). [#60448](https://github.com/ClickHouse/ClickHouse/pull/60448) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Speedup check-whitespaces check. [#60496](https://github.com/ClickHouse/ClickHouse/pull/60496) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Non ready set in TTL WHERE. [#57430](https://github.com/ClickHouse/ClickHouse/pull/57430) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix quantilesGK bug [#58216](https://github.com/ClickHouse/ClickHouse/pull/58216) ([�扬](https://github.com/taiyang-li)).
+* Disable parallel replicas JOIN with CTE (not analyzer) [#59239](https://github.com/ClickHouse/ClickHouse/pull/59239) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix bug with `intDiv` for decimal arguments [#59243](https://github.com/ClickHouse/ClickHouse/pull/59243) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix translate() with FixedString input [#59356](https://github.com/ClickHouse/ClickHouse/pull/59356) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix digest calculation in Keeper [#59439](https://github.com/ClickHouse/ClickHouse/pull/59439) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix stacktraces for binaries without debug symbols [#59444](https://github.com/ClickHouse/ClickHouse/pull/59444) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `ASTAlterCommand::formatImpl` in case of column specific settings… [#59445](https://github.com/ClickHouse/ClickHouse/pull/59445) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix `SELECT * FROM [...] ORDER BY ALL` with Analyzer [#59462](https://github.com/ClickHouse/ClickHouse/pull/59462) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Fix possible uncaught exception during distributed query cancellation [#59487](https://github.com/ClickHouse/ClickHouse/pull/59487) ([Azat Khuzhin](https://github.com/azat)).
+* Make MAX use the same rules as permutation for complex types [#59498](https://github.com/ClickHouse/ClickHouse/pull/59498) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix corner case when passing `update_insert_deduplication_token_in_dependent_materialized_views` [#59544](https://github.com/ClickHouse/ClickHouse/pull/59544) ([Jordi Villar](https://github.com/jrdi)).
+* Fix incorrect result of arrayElement / map[] on empty value [#59594](https://github.com/ClickHouse/ClickHouse/pull/59594) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash in topK when merging empty states [#59603](https://github.com/ClickHouse/ClickHouse/pull/59603) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix distributed table with a constant sharding key [#59606](https://github.com/ClickHouse/ClickHouse/pull/59606) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix_kql_issue_found_by_wingfuzz [#59626](https://github.com/ClickHouse/ClickHouse/pull/59626) ([Yong Wang](https://github.com/kashwy)).
+* Fix error "Read beyond last offset" for AsynchronousBoundedReadBuffer [#59630](https://github.com/ClickHouse/ClickHouse/pull/59630) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Maintain function alias in RewriteSumFunctionWithSumAndCountVisitor [#59658](https://github.com/ClickHouse/ClickHouse/pull/59658) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix query start time on non initial queries [#59662](https://github.com/ClickHouse/ClickHouse/pull/59662) ([Raúl Marín](https://github.com/Algunenano)).
+* Validate types of arguments for `minmax` skipping index [#59733](https://github.com/ClickHouse/ClickHouse/pull/59733) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix leftPad / rightPad function with FixedString input [#59739](https://github.com/ClickHouse/ClickHouse/pull/59739) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix AST fuzzer issue in function `countMatches` [#59752](https://github.com/ClickHouse/ClickHouse/pull/59752) ([Robert Schulze](https://github.com/rschu1ze)).
+* rabbitmq: fix having neither acked nor nacked messages [#59775](https://github.com/ClickHouse/ClickHouse/pull/59775) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix StorageURL doing some of the query execution in single thread [#59833](https://github.com/ClickHouse/ClickHouse/pull/59833) ([Michael Kolupaev](https://github.com/al13n321)).
+* s3queue: fix uninitialized value [#59897](https://github.com/ClickHouse/ClickHouse/pull/59897) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix parsing of partition expressions surrounded by parens [#59901](https://github.com/ClickHouse/ClickHouse/pull/59901) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix crash in JSONColumnsWithMetadata format over http [#59925](https://github.com/ClickHouse/ClickHouse/pull/59925) ([Kruglov Pavel](https://github.com/Avogar)).
+* Do not rewrite sum() to count() if return value differs in analyzer [#59926](https://github.com/ClickHouse/ClickHouse/pull/59926) ([Azat Khuzhin](https://github.com/azat)).
+* UniqExactSet read crash fix [#59928](https://github.com/ClickHouse/ClickHouse/pull/59928) ([Maksim Kita](https://github.com/kitaisreal)).
+* ReplicatedMergeTree invalid metadata_version fix [#59946](https://github.com/ClickHouse/ClickHouse/pull/59946) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix data race in `StorageDistributed` [#59987](https://github.com/ClickHouse/ClickHouse/pull/59987) ([Nikita Taranov](https://github.com/nickitat)).
+* Run init scripts when option is enabled rather than disabled [#59991](https://github.com/ClickHouse/ClickHouse/pull/59991) ([jktng](https://github.com/jktng)).
+* Fix scale conversion for DateTime64 [#60004](https://github.com/ClickHouse/ClickHouse/pull/60004) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix INSERT into SQLite with single quote (by escaping single quotes with a quote instead of backslash) [#60015](https://github.com/ClickHouse/ClickHouse/pull/60015) ([Azat Khuzhin](https://github.com/azat)).
+* Fix several logical errors in arrayFold [#60022](https://github.com/ClickHouse/ClickHouse/pull/60022) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix optimize_uniq_to_count removing the column alias [#60026](https://github.com/ClickHouse/ClickHouse/pull/60026) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix possible exception from s3queue table on drop [#60036](https://github.com/ClickHouse/ClickHouse/pull/60036) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix formatting of NOT with single literals [#60042](https://github.com/ClickHouse/ClickHouse/pull/60042) ([Raúl Marín](https://github.com/Algunenano)).
+* Use max_query_size from context in DDLLogEntry instead of hardcoded 4096 [#60083](https://github.com/ClickHouse/ClickHouse/pull/60083) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix inconsistent formatting of queries [#60095](https://github.com/ClickHouse/ClickHouse/pull/60095) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix inconsistent formatting of explain in subqueries [#60102](https://github.com/ClickHouse/ClickHouse/pull/60102) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix cosineDistance crash with Nullable [#60150](https://github.com/ClickHouse/ClickHouse/pull/60150) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow casting of bools in string representation to to true bools [#60160](https://github.com/ClickHouse/ClickHouse/pull/60160) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix system.s3queue_log [#60166](https://github.com/ClickHouse/ClickHouse/pull/60166) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix arrayReduce with nullable aggregate function name [#60188](https://github.com/ClickHouse/ClickHouse/pull/60188) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix actions execution during preliminary filtering (PK, partition pruning) [#60196](https://github.com/ClickHouse/ClickHouse/pull/60196) ([Azat Khuzhin](https://github.com/azat)).
+* Hide sensitive info for s3queue [#60233](https://github.com/ClickHouse/ClickHouse/pull/60233) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Revert "Replace `ORDER BY ALL` by `ORDER BY *`" [#60248](https://github.com/ClickHouse/ClickHouse/pull/60248) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix http exception codes. [#60252](https://github.com/ClickHouse/ClickHouse/pull/60252) ([Austin Kothig](https://github.com/kothiga)).
+* s3queue: fix bug (also fixes flaky test_storage_s3_queue/test.py::test_shards_distributed) [#60282](https://github.com/ClickHouse/ClickHouse/pull/60282) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix use-of-uninitialized-value and invalid result in hashing functions with IPv6 [#60359](https://github.com/ClickHouse/ClickHouse/pull/60359) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix OptimizeDateOrDateTimeConverterWithPreimageVisitor with null arguments [#60453](https://github.com/ClickHouse/ClickHouse/pull/60453) ([Raúl Marín](https://github.com/Algunenano)).
+* Merging [#59674](https://github.com/ClickHouse/ClickHouse/issues/59674). [#60470](https://github.com/ClickHouse/ClickHouse/pull/60470) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Correctly check keys in s3Cluster [#60477](https://github.com/ClickHouse/ClickHouse/pull/60477) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* ... [#60457](https://github.com/ClickHouse/ClickHouse/pull/60457) ([Max K.](https://github.com/maxknv)).
+* ... [#60512](https://github.com/ClickHouse/ClickHouse/pull/60512) ([Max K.](https://github.com/maxknv)).
+* Arm and amd docker build jobs use similar job names and thus overwrite job reports - aarch64 and amd64 suffixes added to fix this. [#60554](https://github.com/ClickHouse/ClickHouse/pull/60554) ([Max K.](https://github.com/maxknv)).
+* ... [#60557](https://github.com/ClickHouse/ClickHouse/pull/60557) ([Max K.](https://github.com/maxknv)).
+* BUG: build job can report success cache record on failed build Add a check relying on job report fail. [#60587](https://github.com/ClickHouse/ClickHouse/pull/60587) ([Max K.](https://github.com/maxknv)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Revert "Add new aggregation function groupArraySorted()""'. [#59003](https://github.com/ClickHouse/ClickHouse/pull/59003) ([Maksim Kita](https://github.com/kitaisreal)).
+* NO CL ENTRY:  'Revert "Update libxml2 version to address some bogus security issues"'. [#59479](https://github.com/ClickHouse/ClickHouse/pull/59479) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Poco Logger small refactoring"'. [#59509](https://github.com/ClickHouse/ClickHouse/pull/59509) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Revert "Poco Logger small refactoring""'. [#59564](https://github.com/ClickHouse/ClickHouse/pull/59564) ([Maksim Kita](https://github.com/kitaisreal)).
+* NO CL ENTRY:  'Revert "MergeTree FINAL optimization diagnostics and settings"'. [#59702](https://github.com/ClickHouse/ClickHouse/pull/59702) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Use `MergeTree` as a default table engine"'. [#59711](https://github.com/ClickHouse/ClickHouse/pull/59711) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Rename a setting"'. [#59754](https://github.com/ClickHouse/ClickHouse/pull/59754) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Less error prone interface of read buffers"'. [#59911](https://github.com/ClickHouse/ClickHouse/pull/59911) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* NO CL ENTRY:  'Revert "Update version_date.tsv and changelogs after v24.1.4.19-stable"'. [#59973](https://github.com/ClickHouse/ClickHouse/pull/59973) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* NO CL ENTRY:  'Revert "ReplicatedMergeTree invalid metadata_version fix"'. [#60058](https://github.com/ClickHouse/ClickHouse/pull/60058) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Revert "ReplicatedMergeTree invalid metadata_version fix""'. [#60078](https://github.com/ClickHouse/ClickHouse/pull/60078) ([Maksim Kita](https://github.com/kitaisreal)).
+* NO CL ENTRY:  'Revert "Implement system.dns_cache table"'. [#60085](https://github.com/ClickHouse/ClickHouse/pull/60085) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Restriction for the access key id for s3."'. [#60181](https://github.com/ClickHouse/ClickHouse/pull/60181) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Do not retry queries if container is down in integration tests"'. [#60215](https://github.com/ClickHouse/ClickHouse/pull/60215) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "Check stack size in Parser"'. [#60216](https://github.com/ClickHouse/ClickHouse/pull/60216) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "Support resource request canceling"'. [#60253](https://github.com/ClickHouse/ClickHouse/pull/60253) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Revert "Add definers for views"'. [#60350](https://github.com/ClickHouse/ClickHouse/pull/60350) ([Raúl Marín](https://github.com/Algunenano)).
+* NO CL ENTRY:  'Update build-osx.md'. [#60380](https://github.com/ClickHouse/ClickHouse/pull/60380) ([rogeryk](https://github.com/rogeryk)).
+* NO CL ENTRY:  'Revert "Fix: IAST::clone() for RENAME"'. [#60398](https://github.com/ClickHouse/ClickHouse/pull/60398) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "Add table function `mergeTreeIndex`"'. [#60428](https://github.com/ClickHouse/ClickHouse/pull/60428) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Userspace page cache"'. [#60550](https://github.com/ClickHouse/ClickHouse/pull/60550) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Analyzer: compute ALIAS columns right after reading"'. [#60570](https://github.com/ClickHouse/ClickHouse/pull/60570) ([Alexander Tokmakov](https://github.com/tavplubix)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Analyzer: support aliases and distributed JOINs in StorageMerge [#50894](https://github.com/ClickHouse/ClickHouse/pull/50894) ([Dmitry Novik](https://github.com/novikd)).
+* Userspace page cache [#53770](https://github.com/ClickHouse/ClickHouse/pull/53770) ([Michael Kolupaev](https://github.com/al13n321)).
+* Simplify optimize-push-to-prewhere from query plan [#58554](https://github.com/ClickHouse/ClickHouse/pull/58554) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Create ch/chc/chl symlinks by cmake as well (for develop mode) [#58609](https://github.com/ClickHouse/ClickHouse/pull/58609) ([Azat Khuzhin](https://github.com/azat)).
+* CI: ci cache. step 1 [#58664](https://github.com/ClickHouse/ClickHouse/pull/58664) ([Max K.](https://github.com/maxknv)).
+* Enable building JIT with UBSAN [#58952](https://github.com/ClickHouse/ClickHouse/pull/58952) ([Raúl Marín](https://github.com/Algunenano)).
+* Support resource request canceling [#59032](https://github.com/ClickHouse/ClickHouse/pull/59032) ([Sergei Trifonov](https://github.com/serxa)).
+* Analyzer: Do not resolve remote table id on initiator [#59073](https://github.com/ClickHouse/ClickHouse/pull/59073) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: Add cast for ConstantNode from constant folding [#59121](https://github.com/ClickHouse/ClickHouse/pull/59121) ([Dmitry Novik](https://github.com/novikd)).
+* Fix the default value of `async_insert_max_data_size` in EN document [#59161](https://github.com/ClickHouse/ClickHouse/pull/59161) ([Alex Cheng](https://github.com/Alex-Cheng)).
+* CI: Add ARM integration tests [#59241](https://github.com/ClickHouse/ClickHouse/pull/59241) ([Max K.](https://github.com/maxknv)).
+* Fix getting filename from read buffer wrappers [#59298](https://github.com/ClickHouse/ClickHouse/pull/59298) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update AWS SDK to 1.11.234 [#59299](https://github.com/ClickHouse/ClickHouse/pull/59299) ([Nikita Taranov](https://github.com/nickitat)).
+* Split `ISlotControl` from `ConcurrencyControl` [#59313](https://github.com/ClickHouse/ClickHouse/pull/59313) ([Sergei Trifonov](https://github.com/serxa)).
+* Some small fixes for docker images [#59337](https://github.com/ClickHouse/ClickHouse/pull/59337) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: bugfix-validate, integration, functional test scripts updates [#59348](https://github.com/ClickHouse/ClickHouse/pull/59348) ([Max K.](https://github.com/maxknv)).
+* MaterializedMySQL: Fix gtid_after_attach_test to retry on detach [#59370](https://github.com/ClickHouse/ClickHouse/pull/59370) ([Val Doroshchuk](https://github.com/valbok)).
+* Poco Logger small refactoring [#59375](https://github.com/ClickHouse/ClickHouse/pull/59375) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add sanity checks for function return types [#59379](https://github.com/ClickHouse/ClickHouse/pull/59379) ([Raúl Marín](https://github.com/Algunenano)).
+* Cleanup connection pool surroundings [#59380](https://github.com/ClickHouse/ClickHouse/pull/59380) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix ARRAY JOIN with subcolumns [#59382](https://github.com/ClickHouse/ClickHouse/pull/59382) ([vdimir](https://github.com/vdimir)).
+* Update curl submodule to be version 8.50 to address the irrelevant CVE-2023-46218 and CVE-2023-49219, which we don't care about at all. [#59384](https://github.com/ClickHouse/ClickHouse/pull/59384) ([josh-hildred](https://github.com/josh-hildred)).
+* Update libxml2 version to address some bogus security issues [#59386](https://github.com/ClickHouse/ClickHouse/pull/59386) ([josh-hildred](https://github.com/josh-hildred)).
+* Update version after release [#59393](https://github.com/ClickHouse/ClickHouse/pull/59393) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Job names [#59395](https://github.com/ClickHouse/ClickHouse/pull/59395) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: fix status and report for docker server jobs [#59396](https://github.com/ClickHouse/ClickHouse/pull/59396) ([Max K.](https://github.com/maxknv)).
+* Update version_date.tsv and changelogs after v24.1.1.2048-stable [#59397](https://github.com/ClickHouse/ClickHouse/pull/59397) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Forward declaration for PeekableReadBuffer [#59399](https://github.com/ClickHouse/ClickHouse/pull/59399) ([Azat Khuzhin](https://github.com/azat)).
+* Progress bar: use FQDN to differentiate metrics from different hosts [#59404](https://github.com/ClickHouse/ClickHouse/pull/59404) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix test test_stop_other_host_during_backup [#59432](https://github.com/ClickHouse/ClickHouse/pull/59432) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Update run.sh [#59433](https://github.com/ClickHouse/ClickHouse/pull/59433) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Post a failure status if can not run the CI [#59440](https://github.com/ClickHouse/ClickHouse/pull/59440) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Safer Rust (catch panic with catch_unwind()) [#59447](https://github.com/ClickHouse/ClickHouse/pull/59447) ([Azat Khuzhin](https://github.com/azat)).
+* More parallel insert-select pipeline [#59448](https://github.com/ClickHouse/ClickHouse/pull/59448) ([Nikita Taranov](https://github.com/nickitat)).
+* CLion says these headers are unused [#59451](https://github.com/ClickHouse/ClickHouse/pull/59451) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix 02720_row_policy_column_with_dots [#59453](https://github.com/ClickHouse/ClickHouse/pull/59453) ([Duc Canh Le](https://github.com/canhld94)).
+* Fix problem detected by UBSAN [#59461](https://github.com/ClickHouse/ClickHouse/pull/59461) ([Raúl Marín](https://github.com/Algunenano)).
+* Analyzer: Fix denny_crane [#59483](https://github.com/ClickHouse/ClickHouse/pull/59483) ([vdimir](https://github.com/vdimir)).
+* Fix `00191_aggregating_merge_tree_and_final` [#59494](https://github.com/ClickHouse/ClickHouse/pull/59494) ([Nikita Taranov](https://github.com/nickitat)).
+* Avoid running all checks when `aspell-dict.txt` was changed [#59496](https://github.com/ClickHouse/ClickHouse/pull/59496) ([Aleksandr Musorin](https://github.com/AVMusorin)).
+* Fixes for binary.html [#59499](https://github.com/ClickHouse/ClickHouse/pull/59499) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Parallel replicas: better initial replicas failover (2) [#59501](https://github.com/ClickHouse/ClickHouse/pull/59501) ([Igor Nikonov](https://github.com/devcrafter)).
+* Update version_date.tsv and changelogs after v24.1.2.5-stable [#59510](https://github.com/ClickHouse/ClickHouse/pull/59510) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.12.3.40-stable [#59511](https://github.com/ClickHouse/ClickHouse/pull/59511) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.11.5.29-stable [#59515](https://github.com/ClickHouse/ClickHouse/pull/59515) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update memory tracker periodically with cgroup memory usage [#59516](https://github.com/ClickHouse/ClickHouse/pull/59516) ([Robert Schulze](https://github.com/rschu1ze)).
+* Remove a scary message if an error is retryable [#59517](https://github.com/ClickHouse/ClickHouse/pull/59517) ([alesapin](https://github.com/alesapin)).
+* Update the peter-evans/create-pull-request action to v6 [#59520](https://github.com/ClickHouse/ClickHouse/pull/59520) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix usage of StatusType [#59527](https://github.com/ClickHouse/ClickHouse/pull/59527) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Analyzer fix test_select_access_rights/test_main.py::test_select_count [#59528](https://github.com/ClickHouse/ClickHouse/pull/59528) ([vdimir](https://github.com/vdimir)).
+* GRPCServer: do not call value() on empty optional query_info [#59533](https://github.com/ClickHouse/ClickHouse/pull/59533) ([Sema Checherinda](https://github.com/CheSema)).
+* Use ConnectionPoolPtr instead of raw pointer [#59534](https://github.com/ClickHouse/ClickHouse/pull/59534) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix data race with `AggregatedDataVariants` [#59537](https://github.com/ClickHouse/ClickHouse/pull/59537) ([Nikita Taranov](https://github.com/nickitat)).
+* Refactoring of dashboard state encoding [#59554](https://github.com/ClickHouse/ClickHouse/pull/59554) ([Sergei Trifonov](https://github.com/serxa)).
+* CI: ci_cache, enable await [#59555](https://github.com/ClickHouse/ClickHouse/pull/59555) ([Max K.](https://github.com/maxknv)).
+* Bump libssh to 0.9.8 [#59563](https://github.com/ClickHouse/ClickHouse/pull/59563) ([Robert Schulze](https://github.com/rschu1ze)).
+* MultiVersion use mutex [#59565](https://github.com/ClickHouse/ClickHouse/pull/59565) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix aws submodule reference [#59566](https://github.com/ClickHouse/ClickHouse/pull/59566) ([Raúl Marín](https://github.com/Algunenano)).
+* Add missed #include <bit> and <exception> [#59567](https://github.com/ClickHouse/ClickHouse/pull/59567) ([Mikhnenko Sasha](https://github.com/4JustMe4)).
+* CI: nightly job to update latest docker tag only [#59586](https://github.com/ClickHouse/ClickHouse/pull/59586) ([Max K.](https://github.com/maxknv)).
+* Analyzer: compute ALIAS columns right after reading [#59595](https://github.com/ClickHouse/ClickHouse/pull/59595) ([vdimir](https://github.com/vdimir)).
+* Add another sanity check for function return types [#59605](https://github.com/ClickHouse/ClickHouse/pull/59605) ([Raúl Marín](https://github.com/Algunenano)).
+* Update README.md [#59610](https://github.com/ClickHouse/ClickHouse/pull/59610) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Updated a list of trusted contributors [#59616](https://github.com/ClickHouse/ClickHouse/pull/59616) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* CI: fix ast fuzzer job report (slack bot issue) [#59629](https://github.com/ClickHouse/ClickHouse/pull/59629) ([Max K.](https://github.com/maxknv)).
+* MergeTree FINAL optimization diagnostics and settings [#59650](https://github.com/ClickHouse/ClickHouse/pull/59650) ([Maksim Kita](https://github.com/kitaisreal)).
+* Fix default path when path is not specified in config [#59654](https://github.com/ClickHouse/ClickHouse/pull/59654) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Follow up for [#59277](https://github.com/ClickHouse/ClickHouse/issues/59277) [#59659](https://github.com/ClickHouse/ClickHouse/pull/59659) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Pin python dependencies in stateless tests [#59663](https://github.com/ClickHouse/ClickHouse/pull/59663) ([Raúl Marín](https://github.com/Algunenano)).
+* Unquote FLAG_LATEST to fix issue with empty argument [#59672](https://github.com/ClickHouse/ClickHouse/pull/59672) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Temporarily remove a feature that doesn't work [#59688](https://github.com/ClickHouse/ClickHouse/pull/59688) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* ConnectionEstablisher: remove unused is_finished [#59706](https://github.com/ClickHouse/ClickHouse/pull/59706) ([Igor Nikonov](https://github.com/devcrafter)).
+* Add test for increase-always autoscaling lambda [#59709](https://github.com/ClickHouse/ClickHouse/pull/59709) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove SourceWithKeyCondition from ReadFromStorageStep [#59720](https://github.com/ClickHouse/ClickHouse/pull/59720) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Make ZooKeeper actually sequentialy consistent [#59735](https://github.com/ClickHouse/ClickHouse/pull/59735) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add assertions around FixedString code [#59737](https://github.com/ClickHouse/ClickHouse/pull/59737) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix skipping unused shards with analyzer [#59741](https://github.com/ClickHouse/ClickHouse/pull/59741) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix DB type check - now it'll refuse to create in Replicated databases [#59743](https://github.com/ClickHouse/ClickHouse/pull/59743) ([Michael Kolupaev](https://github.com/al13n321)).
+* Analyzer: Fix test_replicating_constants/test.py::test_different_versions [#59750](https://github.com/ClickHouse/ClickHouse/pull/59750) ([Dmitry Novik](https://github.com/novikd)).
+* Fix dashboard params default values [#59753](https://github.com/ClickHouse/ClickHouse/pull/59753) ([Sergei Trifonov](https://github.com/serxa)).
+* Fix logical optimizer with LowCardinality in new analyzer [#59766](https://github.com/ClickHouse/ClickHouse/pull/59766) ([Antonio Andelic](https://github.com/antonio2368)).
+* Update libuv [#59773](https://github.com/ClickHouse/ClickHouse/pull/59773) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Followup [#50894](https://github.com/ClickHouse/ClickHouse/issues/50894) [#59774](https://github.com/ClickHouse/ClickHouse/pull/59774) ([Dmitry Novik](https://github.com/novikd)).
+* CI: ci test await [#59778](https://github.com/ClickHouse/ClickHouse/pull/59778) ([Max K.](https://github.com/maxknv)).
+* Better logging for adaptive async timeouts [#59781](https://github.com/ClickHouse/ClickHouse/pull/59781) ([Julia Kartseva](https://github.com/jkartseva)).
+* Fix broken youtube embedding in ne-tormozit.md [#59782](https://github.com/ClickHouse/ClickHouse/pull/59782) ([Shaun Struwig](https://github.com/Blargian)).
+* Hide URL/S3 'headers' argument in SHOW CREATE [#59787](https://github.com/ClickHouse/ClickHouse/pull/59787) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix special build reports in release branches [#59797](https://github.com/ClickHouse/ClickHouse/pull/59797) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: do not reuse builds on release branches [#59798](https://github.com/ClickHouse/ClickHouse/pull/59798) ([Max K.](https://github.com/maxknv)).
+* Update version_date.tsv and changelogs after v24.1.3.31-stable [#59799](https://github.com/ClickHouse/ClickHouse/pull/59799) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.12.4.15-stable [#59800](https://github.com/ClickHouse/ClickHouse/pull/59800) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Analyzer: fix test_access_for_functions/test.py::test_access_rights_for_function [#59801](https://github.com/ClickHouse/ClickHouse/pull/59801) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: Fix test_wrong_db_or_table_name/test.py::test_wrong_table_name [#59806](https://github.com/ClickHouse/ClickHouse/pull/59806) ([Dmitry Novik](https://github.com/novikd)).
+* CI: await tune ups [#59807](https://github.com/ClickHouse/ClickHouse/pull/59807) ([Max K.](https://github.com/maxknv)).
+* Enforce tests with enabled analyzer in CI [#59814](https://github.com/ClickHouse/ClickHouse/pull/59814) ([Dmitry Novik](https://github.com/novikd)).
+* Handle different timestamp related aspects of zip-files [#59815](https://github.com/ClickHouse/ClickHouse/pull/59815) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix settings history azure_max_single_part_copy_size [#59819](https://github.com/ClickHouse/ClickHouse/pull/59819) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Updated a list of trusted contributors [#59844](https://github.com/ClickHouse/ClickHouse/pull/59844) ([Maksim Kita](https://github.com/kitaisreal)).
+* Add check for recursiveRemoveLowCardinality() [#59845](https://github.com/ClickHouse/ClickHouse/pull/59845) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Better warning for disabled kernel.task_delayacct [#59846](https://github.com/ClickHouse/ClickHouse/pull/59846) ([Azat Khuzhin](https://github.com/azat)).
+* Reintroduce 02590_interserver_mode_client_info_initial_query_start_time [#59851](https://github.com/ClickHouse/ClickHouse/pull/59851) ([Azat Khuzhin](https://github.com/azat)).
+* Respect CMAKE_OSX_DEPLOYMENT_TARGET for Rust targets [#59852](https://github.com/ClickHouse/ClickHouse/pull/59852) ([Azat Khuzhin](https://github.com/azat)).
+* Do not reinitialize ZooKeeperWithFaultInjection on each chunk [#59854](https://github.com/ClickHouse/ClickHouse/pull/59854) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix: check if std::function is set before calling it [#59858](https://github.com/ClickHouse/ClickHouse/pull/59858) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix long shutdown of FileLog storage [#59873](https://github.com/ClickHouse/ClickHouse/pull/59873) ([Azat Khuzhin](https://github.com/azat)).
+* tests: fix 02322_sql_insert_format flakiness [#59874](https://github.com/ClickHouse/ClickHouse/pull/59874) ([Azat Khuzhin](https://github.com/azat)).
+* Follow up for [#58554](https://github.com/ClickHouse/ClickHouse/issues/58554). Cleanup. [#59889](https://github.com/ClickHouse/ClickHouse/pull/59889) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* CI: Fix job failures due to jepsen artifacts [#59890](https://github.com/ClickHouse/ClickHouse/pull/59890) ([Max K.](https://github.com/maxknv)).
+* Add test 02988_join_using_prewhere_pushdown [#59892](https://github.com/ClickHouse/ClickHouse/pull/59892) ([vdimir](https://github.com/vdimir)).
+* Do not pull mutations if pulling replication log had been stopped [#59895](https://github.com/ClickHouse/ClickHouse/pull/59895) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `02982_comments_in_system_tables` [#59896](https://github.com/ClickHouse/ClickHouse/pull/59896) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Refactor Squashing for inserts. [#59899](https://github.com/ClickHouse/ClickHouse/pull/59899) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Do not rebuild a lambda package if it is updated [#59902](https://github.com/ClickHouse/ClickHouse/pull/59902) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix self-extracting: macOS doesn't allow to run renamed executable - copy instead [#59906](https://github.com/ClickHouse/ClickHouse/pull/59906) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Update tests with indexHint for analyzer. [#59907](https://github.com/ClickHouse/ClickHouse/pull/59907) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Petite cleanup around macros and ReplicatedMergeTree [#59909](https://github.com/ClickHouse/ClickHouse/pull/59909) ([Azat Khuzhin](https://github.com/azat)).
+* Fix: absence of closing record in query_log for failed insert over http [#59910](https://github.com/ClickHouse/ClickHouse/pull/59910) ([Igor Nikonov](https://github.com/devcrafter)).
+* Decrease logging level for http retriable errors to Warning (and fix 00157_cache_dictionary flakiness) [#59920](https://github.com/ClickHouse/ClickHouse/pull/59920) ([Azat Khuzhin](https://github.com/azat)).
+* Remove `test_distributed_backward_compatability` [#59921](https://github.com/ClickHouse/ClickHouse/pull/59921) ([Dmitry Novik](https://github.com/novikd)).
+* Commands node args should add rvalue to push_back to reduce object copy cost [#59922](https://github.com/ClickHouse/ClickHouse/pull/59922) ([xuzifu666](https://github.com/xuzifu666)).
+* tests: fix 02981_vertical_merges_memory_usage flakiness [#59923](https://github.com/ClickHouse/ClickHouse/pull/59923) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer: Update broken integration tests list [#59924](https://github.com/ClickHouse/ClickHouse/pull/59924) ([Dmitry Novik](https://github.com/novikd)).
+* CI: integration tests to mysql80 [#59939](https://github.com/ClickHouse/ClickHouse/pull/59939) ([Max K.](https://github.com/maxknv)).
+* Register StorageMergeTree exception message fix [#59941](https://github.com/ClickHouse/ClickHouse/pull/59941) ([Maksim Kita](https://github.com/kitaisreal)).
+* Replace lambdas with pointers to members to simplify stacks  [#59944](https://github.com/ClickHouse/ClickHouse/pull/59944) ([Alexander Gololobov](https://github.com/davenger)).
+* Analyzer: Fix test_user_defined_object_persistence [#59948](https://github.com/ClickHouse/ClickHouse/pull/59948) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: Fix test_mutations_with_merge_tree [#59951](https://github.com/ClickHouse/ClickHouse/pull/59951) ([Dmitry Novik](https://github.com/novikd)).
+* Cleanups [#59964](https://github.com/ClickHouse/ClickHouse/pull/59964) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v24.1.4.19-stable [#59966](https://github.com/ClickHouse/ClickHouse/pull/59966) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Less conflicts [#59968](https://github.com/ClickHouse/ClickHouse/pull/59968) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* We don't have external dictionaries from Aerospike [#59969](https://github.com/ClickHouse/ClickHouse/pull/59969) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix max num to warn message [#59972](https://github.com/ClickHouse/ClickHouse/pull/59972) ([Jordi Villar](https://github.com/jrdi)).
+* Analyzer: Fix test_settings_profile [#59975](https://github.com/ClickHouse/ClickHouse/pull/59975) ([Dmitry Novik](https://github.com/novikd)).
+* Update version_date.tsv and changelogs after v24.1.4.20-stable [#59978](https://github.com/ClickHouse/ClickHouse/pull/59978) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Analyzer: Fix test_storage_rabbitmq [#59981](https://github.com/ClickHouse/ClickHouse/pull/59981) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: Fix test_shard_level_const_function [#59983](https://github.com/ClickHouse/ClickHouse/pull/59983) ([Dmitry Novik](https://github.com/novikd)).
+* Add newlines to SettingsChangesHistory to maybe have less conflicts [#59984](https://github.com/ClickHouse/ClickHouse/pull/59984) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove context from comparison functions. [#59985](https://github.com/ClickHouse/ClickHouse/pull/59985) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Update version_date.tsv and changelogs after v24.1.5.6-stable [#59993](https://github.com/ClickHouse/ClickHouse/pull/59993) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix mark release ready [#59994](https://github.com/ClickHouse/ClickHouse/pull/59994) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Revert "Insert synchronously if dependent MV deduplication is enabled" [#59998](https://github.com/ClickHouse/ClickHouse/pull/59998) ([Julia Kartseva](https://github.com/jkartseva)).
+* Fix obviously wrong (but non significant) error in dictionaries [#60005](https://github.com/ClickHouse/ClickHouse/pull/60005) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Inhibit randomization in some tests [#60009](https://github.com/ClickHouse/ClickHouse/pull/60009) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The code should not be complex [#60010](https://github.com/ClickHouse/ClickHouse/pull/60010) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Exclude test run from a slow build [#60011](https://github.com/ClickHouse/ClickHouse/pull/60011) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix broken lambdas formatting [#60012](https://github.com/ClickHouse/ClickHouse/pull/60012) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Verify formatting consistency on the server-side [#60013](https://github.com/ClickHouse/ClickHouse/pull/60013) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Analyzer: Fix test_sql_user_defined_functions_on_cluster [#60019](https://github.com/ClickHouse/ClickHouse/pull/60019) ([Dmitry Novik](https://github.com/novikd)).
+* Fix 02981_vertical_merges_memory_usage with SharedMergeTree [#60028](https://github.com/ClickHouse/ClickHouse/pull/60028) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix 01656_test_query_log_factories_info with analyzer. [#60037](https://github.com/ClickHouse/ClickHouse/pull/60037) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Ability to detect undead ZooKeeper sessions [#60044](https://github.com/ClickHouse/ClickHouse/pull/60044) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Disable tests with coverage [#60047](https://github.com/ClickHouse/ClickHouse/pull/60047) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Print CPU flags at startup [#60075](https://github.com/ClickHouse/ClickHouse/pull/60075) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Cleanup: less confusion between config priority and balancing priority in connection pools [#60077](https://github.com/ClickHouse/ClickHouse/pull/60077) ([Igor Nikonov](https://github.com/devcrafter)).
+* Temporary table already exists exception message fix [#60080](https://github.com/ClickHouse/ClickHouse/pull/60080) ([Maksim Kita](https://github.com/kitaisreal)).
+* Refactor prewhere and primary key optimization [#60082](https://github.com/ClickHouse/ClickHouse/pull/60082) ([Amos Bird](https://github.com/amosbird)).
+* Bump curl to version 4.6.0 [#60084](https://github.com/ClickHouse/ClickHouse/pull/60084) ([josh-hildred](https://github.com/josh-hildred)).
+* Check wrong abbreviations [#60086](https://github.com/ClickHouse/ClickHouse/pull/60086) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove the check for formatting consistency from the Fuzzer [#60088](https://github.com/ClickHouse/ClickHouse/pull/60088) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Avoid overflow in settings [#60089](https://github.com/ClickHouse/ClickHouse/pull/60089) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* A small preparation for better handling of primary key in memory [#60092](https://github.com/ClickHouse/ClickHouse/pull/60092) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Move threadPoolCallbackRunner to the "Common" folder [#60097](https://github.com/ClickHouse/ClickHouse/pull/60097) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Speed up the CI [#60106](https://github.com/ClickHouse/ClickHouse/pull/60106) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Insignificant changes [#60108](https://github.com/ClickHouse/ClickHouse/pull/60108) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Do not retry queries if container is down in integration tests [#60109](https://github.com/ClickHouse/ClickHouse/pull/60109) ([Azat Khuzhin](https://github.com/azat)).
+* Better check for inconsistent formatting [#60110](https://github.com/ClickHouse/ClickHouse/pull/60110) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* skip printing meaningless log [#60123](https://github.com/ClickHouse/ClickHouse/pull/60123) ([conic](https://github.com/conicl)).
+* Implement TODO [#60124](https://github.com/ClickHouse/ClickHouse/pull/60124) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad log message [#60125](https://github.com/ClickHouse/ClickHouse/pull/60125) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix data race in `IMergeTreeDataPart` [#60139](https://github.com/ClickHouse/ClickHouse/pull/60139) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add new setting to changes history [#60141](https://github.com/ClickHouse/ClickHouse/pull/60141) ([Antonio Andelic](https://github.com/antonio2368)).
+* Analyzer: fix row level filters with PREWHERE + additional filters [#60142](https://github.com/ClickHouse/ClickHouse/pull/60142) ([vdimir](https://github.com/vdimir)).
+* Tests: query log for inserts over http [#60143](https://github.com/ClickHouse/ClickHouse/pull/60143) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix build in master [#60151](https://github.com/ClickHouse/ClickHouse/pull/60151) ([Raúl Marín](https://github.com/Algunenano)).
+* Add setting history check to stateless tests [#60154](https://github.com/ClickHouse/ClickHouse/pull/60154) ([Raúl Marín](https://github.com/Algunenano)).
+* Mini cleanup of CPUID.h [#60155](https://github.com/ClickHouse/ClickHouse/pull/60155) ([Robert Schulze](https://github.com/rschu1ze)).
+* Fix: custom key failover test flakiness [#60158](https://github.com/ClickHouse/ClickHouse/pull/60158) ([Igor Nikonov](https://github.com/devcrafter)).
+* Skip sanity checks on secondary CREATE query [#60159](https://github.com/ClickHouse/ClickHouse/pull/60159) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Remove extensively aggressive check [#60162](https://github.com/ClickHouse/ClickHouse/pull/60162) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix wrong message during compilation [#60178](https://github.com/ClickHouse/ClickHouse/pull/60178) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#44318](https://github.com/ClickHouse/ClickHouse/issues/44318) [#60179](https://github.com/ClickHouse/ClickHouse/pull/60179) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add test for 59437 [#60191](https://github.com/ClickHouse/ClickHouse/pull/60191) ([Raúl Marín](https://github.com/Algunenano)).
+* CI: hot fix for gh statuses [#60201](https://github.com/ClickHouse/ClickHouse/pull/60201) ([Max K.](https://github.com/maxknv)).
+* Limit libarchive format to what we use [#60203](https://github.com/ClickHouse/ClickHouse/pull/60203) ([San](https://github.com/santrancisco)).
+* Fix bucket region discovery [#60204](https://github.com/ClickHouse/ClickHouse/pull/60204) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix `test_backup_restore_s3/test.py::test_user_specific_auth` [#60210](https://github.com/ClickHouse/ClickHouse/pull/60210) ([Antonio Andelic](https://github.com/antonio2368)).
+* CI: combine analyzer, s3, dbreplicated into one job [#60224](https://github.com/ClickHouse/ClickHouse/pull/60224) ([Max K.](https://github.com/maxknv)).
+* Slightly better Keeper loading from snapshot [#60226](https://github.com/ClickHouse/ClickHouse/pull/60226) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix: IAST::clone() for RENAME [#60227](https://github.com/ClickHouse/ClickHouse/pull/60227) ([Igor Nikonov](https://github.com/devcrafter)).
+* Treat 2+ in allow_experimental_parallel_reading_from_replicas as 2 [#60228](https://github.com/ClickHouse/ClickHouse/pull/60228) ([Raúl Marín](https://github.com/Algunenano)).
+* CI: random job pick support [#60229](https://github.com/ClickHouse/ClickHouse/pull/60229) ([Max K.](https://github.com/maxknv)).
+* Fix analyzer - hide arguments for secret functions [#60230](https://github.com/ClickHouse/ClickHouse/pull/60230) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Backups delete suspicious file [#60231](https://github.com/ClickHouse/ClickHouse/pull/60231) ([Maksim Kita](https://github.com/kitaisreal)).
+* CI: random sanitizer for parallel repl in PR wf [#60234](https://github.com/ClickHouse/ClickHouse/pull/60234) ([Max K.](https://github.com/maxknv)).
+* CI: use aarch runner for runconfig job [#60236](https://github.com/ClickHouse/ClickHouse/pull/60236) ([Max K.](https://github.com/maxknv)).
+* Add test for 60232 [#60244](https://github.com/ClickHouse/ClickHouse/pull/60244) ([Raúl Marín](https://github.com/Algunenano)).
+* Make cloud sync required [#60245](https://github.com/ClickHouse/ClickHouse/pull/60245) ([Raúl Marín](https://github.com/Algunenano)).
+* Tests from [#60094](https://github.com/ClickHouse/ClickHouse/issues/60094) [#60256](https://github.com/ClickHouse/ClickHouse/pull/60256) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove bad check in Keeper [#60266](https://github.com/ClickHouse/ClickHouse/pull/60266) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix integration `test_backup_restore_s3` [#60269](https://github.com/ClickHouse/ClickHouse/pull/60269) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Ignore valid 'No such key errors' in stress tests [#60270](https://github.com/ClickHouse/ClickHouse/pull/60270) ([Raúl Marín](https://github.com/Algunenano)).
+* Stress test: Include the first sanitizer block message in the report [#60283](https://github.com/ClickHouse/ClickHouse/pull/60283) ([Raúl Marín](https://github.com/Algunenano)).
+* Update analyzer_tech_debt.txt [#60303](https://github.com/ClickHouse/ClickHouse/pull/60303) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Minor fixes for hashed dictionary [#60310](https://github.com/ClickHouse/ClickHouse/pull/60310) ([vdimir](https://github.com/vdimir)).
+* Install tailscale during AMI build and set it up on runners [#60316](https://github.com/ClickHouse/ClickHouse/pull/60316) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: remove Integration tests asan and release from PR wf [#60327](https://github.com/ClickHouse/ClickHouse/pull/60327) ([Max K.](https://github.com/maxknv)).
+* Fix - analyzer related - "executable" function subquery arguments. [#60339](https://github.com/ClickHouse/ClickHouse/pull/60339) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Update settings.md to correct the description for setting `max_concurrent_queries_for_user` [#60343](https://github.com/ClickHouse/ClickHouse/pull/60343) ([Alex Cheng](https://github.com/Alex-Cheng)).
+* Fix rapidjson submodule [#60346](https://github.com/ClickHouse/ClickHouse/pull/60346) ([Raúl Marín](https://github.com/Algunenano)).
+* Validate experimental and suspicious types inside nested types under a setting [#60353](https://github.com/ClickHouse/ClickHouse/pull/60353) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update 01158_zookeeper_log_long.sql [#60357](https://github.com/ClickHouse/ClickHouse/pull/60357) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Add missed #include <mutex> [#60358](https://github.com/ClickHouse/ClickHouse/pull/60358) ([Mikhnenko Sasha](https://github.com/4JustMe4)).
+* Follow up [#60082](https://github.com/ClickHouse/ClickHouse/issues/60082) [#60360](https://github.com/ClickHouse/ClickHouse/pull/60360) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove ALTER LIVE VIEW [#60370](https://github.com/ClickHouse/ClickHouse/pull/60370) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Detect io_uring in tests [#60373](https://github.com/ClickHouse/ClickHouse/pull/60373) ([Azat Khuzhin](https://github.com/azat)).
+* Expose fatal.log separately for fuzzer [#60374](https://github.com/ClickHouse/ClickHouse/pull/60374) ([Azat Khuzhin](https://github.com/azat)).
+* Minor changes for dashboard [#60387](https://github.com/ClickHouse/ClickHouse/pull/60387) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove unused method [#60388](https://github.com/ClickHouse/ClickHouse/pull/60388) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Allow to map UI handlers to different paths [#60389](https://github.com/ClickHouse/ClickHouse/pull/60389) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove old tags from integration tests [#60407](https://github.com/ClickHouse/ClickHouse/pull/60407) ([Raúl Marín](https://github.com/Algunenano)).
+* Update `liburing` to 2.5 [#60409](https://github.com/ClickHouse/ClickHouse/pull/60409) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix undefined-behavior in case of too big max_execution_time setting [#60419](https://github.com/ClickHouse/ClickHouse/pull/60419) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix wrong log message in Fuzzer [#60425](https://github.com/ClickHouse/ClickHouse/pull/60425) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix unrestricted reads from keeper [#60429](https://github.com/ClickHouse/ClickHouse/pull/60429) ([Raúl Marín](https://github.com/Algunenano)).
+* Split update_mergeable_check into two functions to force trigger the status [#60431](https://github.com/ClickHouse/ClickHouse/pull/60431) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Revert "Revert "Add table function `mergeTreeIndex`"" [#60435](https://github.com/ClickHouse/ClickHouse/pull/60435) ([Anton Popov](https://github.com/CurtizJ)).
+* Revert "Merge pull request [#56864](https://github.com/ClickHouse/ClickHouse/issues/56864) from ClickHouse/broken-projections-better-handling" [#60436](https://github.com/ClickHouse/ClickHouse/pull/60436) ([Nikita Taranov](https://github.com/nickitat)).
+* Keeper: fix moving changelog files between disks [#60442](https://github.com/ClickHouse/ClickHouse/pull/60442) ([Antonio Andelic](https://github.com/antonio2368)).
+* Replace deprecated distutils by vendored packaging [#60444](https://github.com/ClickHouse/ClickHouse/pull/60444) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Do not fail the build if ci-logs is not healthy [#60445](https://github.com/ClickHouse/ClickHouse/pull/60445) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Move setting `enable_order_by_all` out of the experimental setting section [#60449](https://github.com/ClickHouse/ClickHouse/pull/60449) ([Robert Schulze](https://github.com/rschu1ze)).
+* Minor: Replace `boost::algorithm::starts_with()` by `std::string::starts_with()` [#60450](https://github.com/ClickHouse/ClickHouse/pull/60450) ([Robert Schulze](https://github.com/rschu1ze)).
+* Minor: Replace boost::algorithm::ends_with() by std::string::ends_with() [#60454](https://github.com/ClickHouse/ClickHouse/pull/60454) ([Robert Schulze](https://github.com/rschu1ze)).
+* CI: remove input params for job scripts [#60455](https://github.com/ClickHouse/ClickHouse/pull/60455) ([Max K.](https://github.com/maxknv)).
+* Fix: 02496_remove_redundant_sorting_analyzer [#60456](https://github.com/ClickHouse/ClickHouse/pull/60456) ([Igor Nikonov](https://github.com/devcrafter)).
+* PR template fix to include ci fix category [#60461](https://github.com/ClickHouse/ClickHouse/pull/60461) ([Max K.](https://github.com/maxknv)).
+* Reduce iterations in 01383_log_broken_table [#60465](https://github.com/ClickHouse/ClickHouse/pull/60465) ([Raúl Marín](https://github.com/Algunenano)).
+* Merge [#57434](https://github.com/ClickHouse/ClickHouse/issues/57434) [#60466](https://github.com/ClickHouse/ClickHouse/pull/60466) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix bad test: looks like an obvious race condition, but I didn't check in detail. [#60471](https://github.com/ClickHouse/ClickHouse/pull/60471) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Make test slower [#60472](https://github.com/ClickHouse/ClickHouse/pull/60472) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix cgroups v1 rss parsing in CgroupsMemoryUsageObserver [#60481](https://github.com/ClickHouse/ClickHouse/pull/60481) ([Maksim Kita](https://github.com/kitaisreal)).
+* CI: fix pr check status to not fail mergeable check [#60483](https://github.com/ClickHouse/ClickHouse/pull/60483) ([Max K.](https://github.com/maxknv)).
+* Report respects skipped builds [#60488](https://github.com/ClickHouse/ClickHouse/pull/60488) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: quick style fix [#60490](https://github.com/ClickHouse/ClickHouse/pull/60490) ([Max K.](https://github.com/maxknv)).
+* Decrease logging level for http retriable errors to Info [#60508](https://github.com/ClickHouse/ClickHouse/pull/60508) ([Raúl Marín](https://github.com/Algunenano)).
+* Remove broken test while we fix it [#60547](https://github.com/ClickHouse/ClickHouse/pull/60547) ([Raúl Marín](https://github.com/Algunenano)).
+
diff --git a/docs/changelogs/v24.2.2.71-stable.md b/docs/changelogs/v24.2.2.71-stable.md
new file mode 100644
index 00000000000..b9aa5be626b
--- /dev/null
+++ b/docs/changelogs/v24.2.2.71-stable.md
@@ -0,0 +1,55 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.2.2.71-stable (9293d361e72) FIXME as compared to v24.2.1.2248-stable (891689a4150)
+
+#### Improvement
+* Backported in [#60834](https://github.com/ClickHouse/ClickHouse/issues/60834): Update tzdata to 2024a. [#60768](https://github.com/ClickHouse/ClickHouse/pull/60768) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* PartsSplitter invalid ranges for the same part [#60041](https://github.com/ClickHouse/ClickHouse/pull/60041) ([Maksim Kita](https://github.com/kitaisreal)).
+* Try to avoid calculation of scalar subqueries for CREATE TABLE. [#60464](https://github.com/ClickHouse/ClickHouse/pull/60464) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix_max_query_size_for_kql_compound_operator: [#60534](https://github.com/ClickHouse/ClickHouse/pull/60534) ([Yong Wang](https://github.com/kashwy)).
+* Reduce the number of read rows from `system.numbers` [#60546](https://github.com/ClickHouse/ClickHouse/pull/60546) ([JackyWoo](https://github.com/JackyWoo)).
+* Don't output number tips for date types [#60577](https://github.com/ClickHouse/ClickHouse/pull/60577) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Prevent setting custom metadata headers on unsupported multipart upload operations [#60748](https://github.com/ClickHouse/ClickHouse/pull/60748) ([Francisco J. Jurado Moreno](https://github.com/Beetelbrox)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash with different allow_experimental_analyzer value in subqueries [#60770](https://github.com/ClickHouse/ClickHouse/pull/60770) ([Dmitry Novik](https://github.com/novikd)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix multiple bugs in groupArraySorted [#61203](https://github.com/ClickHouse/ClickHouse/pull/61203) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix Keeper reconfig for standalone binary [#61233](https://github.com/ClickHouse/ClickHouse/pull/61233) ([Antonio Andelic](https://github.com/antonio2368)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#60758](https://github.com/ClickHouse/ClickHouse/issues/60758): Decoupled changes from [#60408](https://github.com/ClickHouse/ClickHouse/issues/60408). [#60553](https://github.com/ClickHouse/ClickHouse/pull/60553) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#60706](https://github.com/ClickHouse/ClickHouse/issues/60706): Eliminates the need to provide input args to docker server jobs to clean yml files. [#60602](https://github.com/ClickHouse/ClickHouse/pull/60602) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61045](https://github.com/ClickHouse/ClickHouse/issues/61045): Debug and fix markreleaseready. [#60611](https://github.com/ClickHouse/ClickHouse/pull/60611) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Backported in [#60721](https://github.com/ClickHouse/ClickHouse/issues/60721): Fix build_report job so that it's defined by ci_config only (not yml file). [#60613](https://github.com/ClickHouse/ClickHouse/pull/60613) ([Max K.](https://github.com/maxknv)).
+* Backported in [#60668](https://github.com/ClickHouse/ClickHouse/issues/60668): Do not await ci pending jobs on release branches decrease wait timeout to fit into gh job timeout. [#60652](https://github.com/ClickHouse/ClickHouse/pull/60652) ([Max K.](https://github.com/maxknv)).
+* Backported in [#60863](https://github.com/ClickHouse/ClickHouse/issues/60863): Set limited number of builds for "special build check" report in backports. [#60850](https://github.com/ClickHouse/ClickHouse/pull/60850) ([Max K.](https://github.com/maxknv)).
+* Backported in [#60946](https://github.com/ClickHouse/ClickHouse/issues/60946): ... [#60935](https://github.com/ClickHouse/ClickHouse/pull/60935) ([Max K.](https://github.com/maxknv)).
+* Backported in [#60972](https://github.com/ClickHouse/ClickHouse/issues/60972): ... [#60952](https://github.com/ClickHouse/ClickHouse/pull/60952) ([Max K.](https://github.com/maxknv)).
+* Backported in [#60980](https://github.com/ClickHouse/ClickHouse/issues/60980): ... [#60958](https://github.com/ClickHouse/ClickHouse/pull/60958) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61170](https://github.com/ClickHouse/ClickHouse/issues/61170): Just a preparation for the merge queue support. [#61099](https://github.com/ClickHouse/ClickHouse/pull/61099) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61181](https://github.com/ClickHouse/ClickHouse/issues/61181): ... [#61172](https://github.com/ClickHouse/ClickHouse/pull/61172) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61228](https://github.com/ClickHouse/ClickHouse/issues/61228): ... [#61183](https://github.com/ClickHouse/ClickHouse/pull/61183) ([Han Fei](https://github.com/hanfei1991)).
+* Backported in [#61194](https://github.com/ClickHouse/ClickHouse/issues/61194): ... [#61185](https://github.com/ClickHouse/ClickHouse/pull/61185) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61244](https://github.com/ClickHouse/ClickHouse/issues/61244): ... [#61214](https://github.com/ClickHouse/ClickHouse/pull/61214) ([Max K.](https://github.com/maxknv)).
+* Backported in [#61388](https://github.com/ClickHouse/ClickHouse/issues/61388):. [#61373](https://github.com/ClickHouse/ClickHouse/pull/61373) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* CI: make workflow yml abstract [#60421](https://github.com/ClickHouse/ClickHouse/pull/60421) ([Max K.](https://github.com/maxknv)).
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+* General sanity in function `seriesOutliersDetectTukey` [#60535](https://github.com/ClickHouse/ClickHouse/pull/60535) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Speed up cctools building [#61011](https://github.com/ClickHouse/ClickHouse/pull/61011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+
diff --git a/docs/changelogs/v24.3.1.2672-lts.md b/docs/changelogs/v24.3.1.2672-lts.md
new file mode 100644
index 00000000000..e5d008680a8
--- /dev/null
+++ b/docs/changelogs/v24.3.1.2672-lts.md
@@ -0,0 +1,537 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.3.1.2672-lts (2c5c589a882) FIXME as compared to v24.2.1.2248-stable (891689a4150)
+
+#### Backward Incompatible Change
+* Don't allow to set max_parallel_replicas to 0 as it doesn't make sense. Setting it to 0 could lead to unexpected logical errors. Closes [#60140](https://github.com/ClickHouse/ClickHouse/issues/60140). [#60430](https://github.com/ClickHouse/ClickHouse/pull/60430) ([Kruglov Pavel](https://github.com/Avogar)).
+* Change the column name from `duration_ms` to `duration_microseconds` in the `system.zookeeper` table to reflect the reality that the duration is in the microsecond resolution. [#60774](https://github.com/ClickHouse/ClickHouse/pull/60774) ([Duc Canh Le](https://github.com/canhld94)).
+* Reject incoming INSERT queries in case when query-level settings `async_insert` and `deduplicate_blocks_in_dependent_materialized_views` are enabled together. This behaviour is controlled by a setting `throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert` and enabled by default. This is a continuation of https://github.com/ClickHouse/ClickHouse/pull/59699 needed to unblock https://github.com/ClickHouse/ClickHouse/pull/59915. [#60888](https://github.com/ClickHouse/ClickHouse/pull/60888) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Utility `clickhouse-copier` is moved to a separate repository on GitHub: https://github.com/ClickHouse/copier. It is no longer included in the bundle but is still available as a separate download. This closes: [#60734](https://github.com/ClickHouse/ClickHouse/issues/60734) This closes: [#60540](https://github.com/ClickHouse/ClickHouse/issues/60540) This closes: [#60250](https://github.com/ClickHouse/ClickHouse/issues/60250) This closes: [#52917](https://github.com/ClickHouse/ClickHouse/issues/52917) This closes: [#51140](https://github.com/ClickHouse/ClickHouse/issues/51140) This closes: [#47517](https://github.com/ClickHouse/ClickHouse/issues/47517) This closes: [#47189](https://github.com/ClickHouse/ClickHouse/issues/47189) This closes: [#46598](https://github.com/ClickHouse/ClickHouse/issues/46598) This closes: [#40257](https://github.com/ClickHouse/ClickHouse/issues/40257) This closes: [#36504](https://github.com/ClickHouse/ClickHouse/issues/36504) This closes: [#35485](https://github.com/ClickHouse/ClickHouse/issues/35485) This closes: [#33702](https://github.com/ClickHouse/ClickHouse/issues/33702) This closes: [#26702](https://github.com/ClickHouse/ClickHouse/issues/26702) ### Documentation entry for user-facing changes. [#61058](https://github.com/ClickHouse/ClickHouse/pull/61058) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* To increase compatibility with MySQL, function `locate` now accepts arguments `(needle, haystack[, start_pos])` by default. The previous behavior `(haystack, needle, [, start_pos])` can be restored by setting `function_locate_has_mysql_compatible_argument_order = 0`. [#61092](https://github.com/ClickHouse/ClickHouse/pull/61092) ([Robert Schulze](https://github.com/rschu1ze)).
+* The obsolete in-memory data parts have been deprecated since version 23.5 and have not been supported since version 23.10. Now the remaining code is removed. Continuation of [#55186](https://github.com/ClickHouse/ClickHouse/issues/55186) and [#45409](https://github.com/ClickHouse/ClickHouse/issues/45409). It is unlikely that you have used in-memory data parts because they were available only before version 23.5 and only when you enabled them manually by specifying the corresponding SETTINGS for a MergeTree table. To check if you have in-memory data parts, run the following query: `SELECT part_type, count() FROM system.parts GROUP BY part_type ORDER BY part_type`. To disable the usage of in-memory data parts, do `ALTER TABLE ... MODIFY SETTING min_bytes_for_compact_part = DEFAULT, min_rows_for_compact_part = DEFAULT`. Before upgrading from old ClickHouse releases, first check that you don't have in-memory data parts. If there are in-memory data parts, disable them first, then wait while there are no in-memory data parts and continue the upgrade. [#61127](https://github.com/ClickHouse/ClickHouse/pull/61127) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Forbid `SimpleAggregateFunction` in `ORDER BY` of `MergeTree` tables (like `AggregateFunction` is forbidden, but they are forbidden because they are not comparable) by default (use `allow_suspicious_primary_key` to allow them). [#61399](https://github.com/ClickHouse/ClickHouse/pull/61399) ([Azat Khuzhin](https://github.com/azat)).
+* ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. This is controlled by the settings, `output_format_parquet_string_as_string`, `output_format_orc_string_as_string`, `output_format_arrow_string_as_string`. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases. Parquet/ORC/Arrow supports many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools lack support for the faster `lz4` compression method, that's why we set `zstd` by default. This is controlled by the settings `output_format_parquet_compression_method`, `output_format_orc_compression_method`, and `output_format_arrow_compression_method`. We changed the default to `zstd` for Parquet and ORC, but not Arrow (it is emphasized for low-level usages). [#61817](https://github.com/ClickHouse/ClickHouse/pull/61817) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* In the new ClickHouse version, the functions `geoDistance`, `greatCircleDistance`, and `greatCircleAngle` will use 64-bit double precision floating point data type for internal calculations and return type if all the arguments are Float64. This closes [#58476](https://github.com/ClickHouse/ClickHouse/issues/58476). In previous versions, the function always used Float32. You can switch to the old behavior by setting `geo_distance_returns_float64_on_float64_arguments` to `false` or setting `compatibility` to `24.2` or earlier. [#61848](https://github.com/ClickHouse/ClickHouse/pull/61848) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### New Feature
+* Topk/topkweighed support mode, which return count of values and it's error. [#54508](https://github.com/ClickHouse/ClickHouse/pull/54508) ([UnamedRus](https://github.com/UnamedRus)).
+* Add generate_series as a table function. This function generates table with an arithmetic progression with natural numbers. [#59390](https://github.com/ClickHouse/ClickHouse/pull/59390) ([divanik](https://github.com/divanik)).
+* Support reading and writing backups as tar archives. [#59535](https://github.com/ClickHouse/ClickHouse/pull/59535) ([josh-hildred](https://github.com/josh-hildred)).
+* Implemented support for S3Express buckets. [#59965](https://github.com/ClickHouse/ClickHouse/pull/59965) ([Nikita Taranov](https://github.com/nickitat)).
+* Allow to attach parts from a different disk * attach partition from the table on other disks using copy instead of hard link (such as instant table) * attach partition using copy when the hard link fails even on the same disk. [#60112](https://github.com/ClickHouse/ClickHouse/pull/60112) ([Unalian](https://github.com/Unalian)).
+* Added function `toMillisecond` which returns the millisecond component for values of type`DateTime` or `DateTime64`. [#60281](https://github.com/ClickHouse/ClickHouse/pull/60281) ([Shaun Struwig](https://github.com/Blargian)).
+* Make all format names case insensitive, like Tsv, or TSV, or tsv, or even rowbinary. [#60420](https://github.com/ClickHouse/ClickHouse/pull/60420) ([豪肥肥](https://github.com/HowePa)).
+* Add four properties to the `StorageMemory` (memory-engine) `min_bytes_to_keep, max_bytes_to_keep, min_rows_to_keep` and `max_rows_to_keep` - Add tests to reflect new changes - Update `memory.md` documentation - Add table `context` property to `MemorySink` to enable access to table parameter bounds. [#60612](https://github.com/ClickHouse/ClickHouse/pull/60612) ([Jake Bamrah](https://github.com/JakeBamrah)).
+* Added function `toMillisecond` which returns the millisecond component for values of type`DateTime` or `DateTime64`. [#60649](https://github.com/ClickHouse/ClickHouse/pull/60649) ([Robert Schulze](https://github.com/rschu1ze)).
+* Separate limits on number of waiting and executing queries. Added new server setting `max_waiting_queries` that limits the number of queries waiting due to `async_load_databases`. Existing limits on number of executing queries no longer count waiting queries. [#61053](https://github.com/ClickHouse/ClickHouse/pull/61053) ([Sergei Trifonov](https://github.com/serxa)).
+* Add support for `ATTACH PARTITION ALL`. [#61107](https://github.com/ClickHouse/ClickHouse/pull/61107) ([Kirill Nikiforov](https://github.com/allmazz)).
+* Add a new function, `getClientHTTPHeader`. This closes [#54665](https://github.com/ClickHouse/ClickHouse/issues/54665). Co-authored with @lingtaolf. [#61820](https://github.com/ClickHouse/ClickHouse/pull/61820) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Performance Improvement
+* Improve the performance of serialized aggregation method when involving multiple [nullable] columns. This is a general version of [#51399](https://github.com/ClickHouse/ClickHouse/issues/51399) that doesn't compromise on abstraction integrity. [#55809](https://github.com/ClickHouse/ClickHouse/pull/55809) ([Amos Bird](https://github.com/amosbird)).
+* Lazy build join output to improve performance of ALL join. [#58278](https://github.com/ClickHouse/ClickHouse/pull/58278) ([LiuNeng](https://github.com/liuneng1994)).
+* Improvements to aggregate functions ArgMin / ArgMax / any / anyLast / anyHeavy, as well as `ORDER BY {u8/u16/u32/u64/i8/i16/u32/i64) LIMIT 1` queries. [#58640](https://github.com/ClickHouse/ClickHouse/pull/58640) ([Raúl Marín](https://github.com/Algunenano)).
+* Trivial optimize on column filter. Avoid those filter columns whoes underlying data type is not number being filtered with `result_size_hint = -1`. Peak memory can be reduced to 44% of the original in some cases. [#59698](https://github.com/ClickHouse/ClickHouse/pull/59698) ([�扬](https://github.com/taiyang-li)).
+* If the table's primary key contains mostly useless columns, don't keep them in memory. This is controlled by a new setting `primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns` with the value `0.9` by default, which means: for a composite primary key, if a column changes its value for at least 0.9 of all the times, the next columns after it will be not loaded. [#60255](https://github.com/ClickHouse/ClickHouse/pull/60255) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Execute multiIf function columnarly when result_type's underlying type is number. [#60384](https://github.com/ClickHouse/ClickHouse/pull/60384) ([�扬](https://github.com/taiyang-li)).
+* Faster (almost 2x) mutexes (was slower due to ThreadFuzzer). [#60823](https://github.com/ClickHouse/ClickHouse/pull/60823) ([Azat Khuzhin](https://github.com/azat)).
+* Move connection drain from prepare to work, and drain multiple connections in parallel. [#60845](https://github.com/ClickHouse/ClickHouse/pull/60845) ([lizhuoyu5](https://github.com/lzydmxy)).
+* Optimize insertManyFrom of nullable number or nullable string. [#60846](https://github.com/ClickHouse/ClickHouse/pull/60846) ([�扬](https://github.com/taiyang-li)).
+* Optimized function `dotProduct` to omit unnecessary and expensive memory copies. [#60928](https://github.com/ClickHouse/ClickHouse/pull/60928) ([Robert Schulze](https://github.com/rschu1ze)).
+* Operations with the filesystem cache will suffer less from the lock contention. [#61066](https://github.com/ClickHouse/ClickHouse/pull/61066) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Optimize ColumnString::replicate and prevent memcpySmallAllowReadWriteOverflow15Impl from being optimized to built-in memcpy. Close [#61074](https://github.com/ClickHouse/ClickHouse/issues/61074). ColumnString::replicate speeds up by 2.46x on x86-64. [#61075](https://github.com/ClickHouse/ClickHouse/pull/61075) ([�扬](https://github.com/taiyang-li)).
+* 30x faster printing for 256-bit integers. [#61100](https://github.com/ClickHouse/ClickHouse/pull/61100) ([Raúl Marín](https://github.com/Algunenano)).
+* If a query with a syntax error contained COLUMNS matcher with a regular expression, the regular expression was compiled each time during the parser's backtracking, instead of being compiled once. This was a fundamental error. The compiled regexp was put to AST. But the letter A in AST means "abstract" which means it should not contain heavyweight objects. Parts of AST can be created and discarded during parsing, including a large number of backtracking. This leads to slowness on the parsing side and consequently allows DoS by a readonly user. But the main problem is that it prevents progress in fuzzers. [#61543](https://github.com/ClickHouse/ClickHouse/pull/61543) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a new analyzer pass to optimize in single value. [#61564](https://github.com/ClickHouse/ClickHouse/pull/61564) ([LiuNeng](https://github.com/liuneng1994)).
+
+#### Improvement
+* While running the MODIFY COLUMN query for materialized views, check the inner table's structure to ensure every column exists. [#47427](https://github.com/ClickHouse/ClickHouse/pull/47427) ([sunny](https://github.com/sunny19930321)).
+* Added table `system.keywords` which contains all the keywords from parser. Mostly needed and will be used for better fuzzing and syntax highlighting. [#51808](https://github.com/ClickHouse/ClickHouse/pull/51808) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Ordinary database engine is deprecated. You will receive a warning in clickhouse-client if your server is using it. This closes [#52229](https://github.com/ClickHouse/ClickHouse/issues/52229). [#56942](https://github.com/ClickHouse/ClickHouse/pull/56942) ([shabroo](https://github.com/shabroo)).
+* All zero copy locks related to a table have to be dropped when the table is dropped. The directory which contains these locks has to be removed also. [#57575](https://github.com/ClickHouse/ClickHouse/pull/57575) ([Sema Checherinda](https://github.com/CheSema)).
+* Allow declaring enum in external table structure. [#57857](https://github.com/ClickHouse/ClickHouse/pull/57857) ([Duc Canh Le](https://github.com/canhld94)).
+* Consider lightweight deleted rows when selecting parts to merge. [#58223](https://github.com/ClickHouse/ClickHouse/pull/58223) ([Zhuo Qiu](https://github.com/jewelzqiu)).
+* This PR makes http/https connections reusable for all uses cases. Even when response is 3xx or 4xx. [#58845](https://github.com/ClickHouse/ClickHouse/pull/58845) ([Sema Checherinda](https://github.com/CheSema)).
+* Added comments for columns for more system tables. Continuation of https://github.com/ClickHouse/ClickHouse/pull/58356. [#59016](https://github.com/ClickHouse/ClickHouse/pull/59016) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Now we can use virtual columns in PREWHERE. It's worthwhile for non-const virtual columns like `_part_offset`. [#59033](https://github.com/ClickHouse/ClickHouse/pull/59033) ([Amos Bird](https://github.com/amosbird)).
+* Add ability to skip read-only replicas for INSERT into Distributed engine (Controlled with `distributed_insert_skip_read_only_replicas` setting, by default OFF - backward compatible). [#59176](https://github.com/ClickHouse/ClickHouse/pull/59176) ([Azat Khuzhin](https://github.com/azat)).
+* Instead using a constant key, now object storage generates key for determining remove objects capability. [#59495](https://github.com/ClickHouse/ClickHouse/pull/59495) ([Sema Checherinda](https://github.com/CheSema)).
+* Add positional pread in libhdfs3. If you want to call positional read in libhdfs3, use the hdfsPread function in hdfs.h as follows. `tSize hdfsPread(hdfsFS fs, hdfsFile file, void * buffer, tSize length, tOffset position);`. [#59624](https://github.com/ClickHouse/ClickHouse/pull/59624) ([M1eyu](https://github.com/M1eyu2018)).
+* Add asynchronous WriteBuffer for AzureBlobStorage similar to S3. [#59929](https://github.com/ClickHouse/ClickHouse/pull/59929) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Allow "local" as object storage type instead of "local_blob_storage". [#60165](https://github.com/ClickHouse/ClickHouse/pull/60165) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Improved overall usability of virtual columns. Now it is allowed to use virtual columns in `PREWHERE` (it's worthwhile for non-const virtual columns like `_part_offset`). Now a builtin documentation is available for virtual columns as a comment of column in `DESCRIBE` query with enabled setting `describe_include_virtual_columns`. [#60205](https://github.com/ClickHouse/ClickHouse/pull/60205) ([Anton Popov](https://github.com/CurtizJ)).
+* Parallel flush of pending INSERT blocks of Distributed engine on `DETACH`/server shutdown and `SYSTEM FLUSH DISTRIBUTED` (Parallelism will work only if you have multi disk policy for table (like everything in Distributed engine right now)). [#60225](https://github.com/ClickHouse/ClickHouse/pull/60225) ([Azat Khuzhin](https://github.com/azat)).
+* Filter setting is improper in `joinRightColumnsSwitchNullability`, resolve [#59625](https://github.com/ClickHouse/ClickHouse/issues/59625). [#60259](https://github.com/ClickHouse/ClickHouse/pull/60259) ([lgbo](https://github.com/lgbo-ustc)).
+* Add a setting to force read-through cache for merges. [#60308](https://github.com/ClickHouse/ClickHouse/pull/60308) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Issue [#57598](https://github.com/ClickHouse/ClickHouse/issues/57598) mentions a variant behaviour regarding transaction handling. An issued COMMIT/ROLLBACK when no transaction is active is reported as an error contrary to MySQL behaviour. [#60338](https://github.com/ClickHouse/ClickHouse/pull/60338) ([PapaToemmsn](https://github.com/PapaToemmsn)).
+* Added `none_only_active` mode for `distributed_ddl_output_mode` setting. [#60340](https://github.com/ClickHouse/ClickHouse/pull/60340) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Allow configuring HTTP redirect handlers for clickhouse-server. For example, you can make `/` redirect to the Play UI. [#60390](https://github.com/ClickHouse/ClickHouse/pull/60390) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* The advanced dashboard has slightly better colors for multi-line graphs. [#60391](https://github.com/ClickHouse/ClickHouse/pull/60391) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Function `substring` now has a new alias `byteSlice`. [#60494](https://github.com/ClickHouse/ClickHouse/pull/60494) ([Robert Schulze](https://github.com/rschu1ze)).
+* Renamed server setting `dns_cache_max_size` to `dns_cache_max_entries` to reduce ambiguity. [#60500](https://github.com/ClickHouse/ClickHouse/pull/60500) ([Kirill Nikiforov](https://github.com/allmazz)).
+* `SHOW INDEX | INDEXES | INDICES | KEYS` no longer sorts by the primary key columns (which was unintuitive). [#60514](https://github.com/ClickHouse/ClickHouse/pull/60514) ([Robert Schulze](https://github.com/rschu1ze)).
+* Keeper improvement: abort during startup if an invalid snapshot is detected to avoid data loss. [#60537](https://github.com/ClickHouse/ClickHouse/pull/60537) ([Antonio Andelic](https://github.com/antonio2368)).
+* Added MergeTree read split ranges into intersecting and non intersecting fault injection using `merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_fault_probability` setting. [#60548](https://github.com/ClickHouse/ClickHouse/pull/60548) ([Maksim Kita](https://github.com/kitaisreal)).
+* The Advanced dashboard now has controls always visible on scrolling. This allows you to add a new chart without scrolling up. [#60692](https://github.com/ClickHouse/ClickHouse/pull/60692) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* String types and Enums can be used in the same context, such as: arrays, UNION queries, conditional expressions. This closes [#60726](https://github.com/ClickHouse/ClickHouse/issues/60726). [#60727](https://github.com/ClickHouse/ClickHouse/pull/60727) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update tzdata to 2024a. [#60768](https://github.com/ClickHouse/ClickHouse/pull/60768) ([Raúl Marín](https://github.com/Algunenano)).
+* Support files without format extension in Filesystem database. [#60795](https://github.com/ClickHouse/ClickHouse/pull/60795) ([Kruglov Pavel](https://github.com/Avogar)).
+* Keeper improvement: support `leadership_expiry_ms` in Keeper's settings. [#60806](https://github.com/ClickHouse/ClickHouse/pull/60806) ([Brokenice0415](https://github.com/Brokenice0415)).
+* Always infer exponential numbers in JSON formats regardless of the setting `input_format_try_infer_exponent_floats`. Add setting `input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects` that allows to use String type for ambiguous paths instead of an exception during named Tuples inference from JSON objects. [#60808](https://github.com/ClickHouse/ClickHouse/pull/60808) ([Kruglov Pavel](https://github.com/Avogar)).
+* Add support for `START TRANSACTION` syntax typically used in MySQL syntax, resolving https://github.com/ClickHouse/ClickHouse/discussions/60865. [#60886](https://github.com/ClickHouse/ClickHouse/pull/60886) ([Zach Naimon](https://github.com/ArctypeZach)).
+* Add a flag for SMJ to treat null as biggest/smallest. So the behavior can be compitable with other SQL systems, like Apache Spark. [#60896](https://github.com/ClickHouse/ClickHouse/pull/60896) ([loudongfeng](https://github.com/loudongfeng)).
+* Clickhouse version has been added to docker labels. Closes [#54224](https://github.com/ClickHouse/ClickHouse/issues/54224). [#60949](https://github.com/ClickHouse/ClickHouse/pull/60949) ([Nikolay Monkov](https://github.com/nikmonkov)).
+* Add a setting `parallel_replicas_allow_in_with_subquery = 1` which allows subqueries for IN work with parallel replicas. [#60950](https://github.com/ClickHouse/ClickHouse/pull/60950) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* DNSResolver shuffles set of resolved IPs. [#60965](https://github.com/ClickHouse/ClickHouse/pull/60965) ([Sema Checherinda](https://github.com/CheSema)).
+* Support detect output format by file exctension in `clickhouse-client` and `clickhouse-local`. [#61036](https://github.com/ClickHouse/ClickHouse/pull/61036) ([豪肥肥](https://github.com/HowePa)).
+* Check memory limit update periodically. [#61049](https://github.com/ClickHouse/ClickHouse/pull/61049) ([Han Fei](https://github.com/hanfei1991)).
+* Enable processors profiling (time spent/in and out bytes for sorting, aggregation, ...) by default. [#61096](https://github.com/ClickHouse/ClickHouse/pull/61096) ([Azat Khuzhin](https://github.com/azat)).
+* Add the function `toUInt128OrZero`, which was missed by mistake (the mistake is related to https://github.com/ClickHouse/ClickHouse/pull/945). The compatibility aliases `FROM_UNIXTIME` and `DATE_FORMAT` (they are not ClickHouse-native and only exist for MySQL compatibility) have been made case insensitive, as expected for SQL-compatibility aliases. [#61114](https://github.com/ClickHouse/ClickHouse/pull/61114) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improvements for the access checks, allowing to revoke of unpossessed rights in case the target user doesn't have the revoking grants either. Example: ```sql GRANT SELECT ON *.* TO user1; REVOKE SELECT ON system.* FROM user1;. [#61115](https://github.com/ClickHouse/ClickHouse/pull/61115) ([pufit](https://github.com/pufit)).
+* Fix an error in previeous opt: https://github.com/ClickHouse/ClickHouse/pull/59698: remove break to make sure the first filtered column has minimum size cc @jsc0218. [#61145](https://github.com/ClickHouse/ClickHouse/pull/61145) ([�扬](https://github.com/taiyang-li)).
+* Fix `has()` function with `Nullable` column (fixes [#60214](https://github.com/ClickHouse/ClickHouse/issues/60214)). [#61249](https://github.com/ClickHouse/ClickHouse/pull/61249) ([Mikhail Koviazin](https://github.com/mkmkme)).
+* Now it's possible to specify attribute `merge="true"` in config substitutions for subtrees `<include from_zk="/path" merge="true">`. In case this attribute specified, clickhouse will merge subtree with existing configuration, otherwise default behavior is append new content to configuration. [#61299](https://github.com/ClickHouse/ClickHouse/pull/61299) ([alesapin](https://github.com/alesapin)).
+* Add async metrics for virtual memory mappings: VMMaxMapCount & VMNumMaps. Closes [#60662](https://github.com/ClickHouse/ClickHouse/issues/60662). [#61354](https://github.com/ClickHouse/ClickHouse/pull/61354) ([Tuan Pham Anh](https://github.com/tuanpavn)).
+* Use `temporary_files_codec` setting in all places where we create temporary data, for example external memory sorting and external memory GROUP BY. Before it worked only in `partial_merge` JOIN algorithm. [#61456](https://github.com/ClickHouse/ClickHouse/pull/61456) ([Maksim Kita](https://github.com/kitaisreal)).
+* Remove duplicated check `containing_part.empty()`, It's already being checked here: https://github.com/ClickHouse/ClickHouse/blob/1296dac3c7e47670872c15e3f5e58f869e0bd2f2/src/Storages/MergeTree/MergeTreeData.cpp#L6141. [#61467](https://github.com/ClickHouse/ClickHouse/pull/61467) ([William Schoeffel](https://github.com/wiledusc)).
+* Add a new setting `max_parser_backtracks` which allows to limit the complexity of query parsing. [#61502](https://github.com/ClickHouse/ClickHouse/pull/61502) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Support parallel reading for azure blob storage. [#61503](https://github.com/ClickHouse/ClickHouse/pull/61503) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Less contention during dynamic resize of filesystem cache. [#61524](https://github.com/ClickHouse/ClickHouse/pull/61524) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Disallow sharded mode of StorageS3 queue, because it will be rewritten. [#61537](https://github.com/ClickHouse/ClickHouse/pull/61537) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fixed typo: from `use_leagcy_max_level` to `use_legacy_max_level`. [#61545](https://github.com/ClickHouse/ClickHouse/pull/61545) ([William Schoeffel](https://github.com/wiledusc)).
+* Remove some duplicate entries in blob_storage_log. [#61622](https://github.com/ClickHouse/ClickHouse/pull/61622) ([YenchangChan](https://github.com/YenchangChan)).
+* Enable `allow_experimental_analyzer` setting by default. [#61652](https://github.com/ClickHouse/ClickHouse/pull/61652) ([Dmitry Novik](https://github.com/novikd)).
+* Added `current_user` function as a compatibility alias for MySQL. [#61770](https://github.com/ClickHouse/ClickHouse/pull/61770) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Use managed identity for backups IO when using Azure Blob Storage. Add a setting to prevent ClickHouse from attempting to create a non-existent container, which requires permissions at the storage account level. [#61785](https://github.com/ClickHouse/ClickHouse/pull/61785) ([Daniel Pozo Escalona](https://github.com/danipozo)).
+* Enable `output_format_pretty_row_numbers` by default. It is better for usability. [#61791](https://github.com/ClickHouse/ClickHouse/pull/61791) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* In the previous version, some numbers in Pretty formats were not pretty enough. [#61794](https://github.com/ClickHouse/ClickHouse/pull/61794) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* A long value in Pretty formats won't be cut if it is the single value in the resultset, such as in the result of the `SHOW CREATE TABLE` query. [#61795](https://github.com/ClickHouse/ClickHouse/pull/61795) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Similarly to `clickhouse-local`, `clickhouse-client` will accept the `--output-format` option as a synonym to the `--format` option. This closes [#59848](https://github.com/ClickHouse/ClickHouse/issues/59848). [#61797](https://github.com/ClickHouse/ClickHouse/pull/61797) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* If stdout is a terminal and the output format is not specified, `clickhouse-client` and similar tools will use `PrettyCompact` by default, similarly to the interactive mode. `clickhouse-client` and `clickhouse-local` will handle command line arguments for input and output formats in a unified fashion. This closes [#61272](https://github.com/ClickHouse/ClickHouse/issues/61272). [#61800](https://github.com/ClickHouse/ClickHouse/pull/61800) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Underscore digit groups in Pretty formats for better readability. This is controlled by a new setting, `output_format_pretty_highlight_digit_groups`. [#61802](https://github.com/ClickHouse/ClickHouse/pull/61802) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add ability to override initial INSERT SETTINGS via SYSTEM FLUSH DISTRIBUTED. [#61832](https://github.com/ClickHouse/ClickHouse/pull/61832) ([Azat Khuzhin](https://github.com/azat)).
+* Fixed grammar from "a" to "the" in the warning message. There is only one Atomic engine, so it should be "to the new Atomic engine" instead of "to a new Atomic engine". [#61952](https://github.com/ClickHouse/ClickHouse/pull/61952) ([shabroo](https://github.com/shabroo)).
+
+#### Build/Testing/Packaging Improvement
+* Update sccache to the latest version; significantly reduce images size by reshaking the dependency trees; use the latest working odbc driver. [#59953](https://github.com/ClickHouse/ClickHouse/pull/59953) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Update python related style checkers. Continue the [#50174](https://github.com/ClickHouse/ClickHouse/issues/50174). [#60408](https://github.com/ClickHouse/ClickHouse/pull/60408) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Upgrade `prqlc` to 0.11.3. [#60616](https://github.com/ClickHouse/ClickHouse/pull/60616) ([Maximilian Roos](https://github.com/max-sixty)).
+* Attach gdb to running fuzzer process. [#60654](https://github.com/ClickHouse/ClickHouse/pull/60654) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Use explicit template instantiation more aggressively. Get rid of templates in favor of overloaded functions in some places. [#60730](https://github.com/ClickHouse/ClickHouse/pull/60730) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* The real-time query profiler now works on AArch64. In previous versions, it worked only when a program didn't spend time inside a syscall. [#60807](https://github.com/ClickHouse/ClickHouse/pull/60807) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ... Too big translation unit in `Aggregator`. [#61211](https://github.com/ClickHouse/ClickHouse/pull/61211) ([lgbo](https://github.com/lgbo-ustc)).
+* Fixed flakiness of 01603_insert_select_too_many_parts test. Closes [#61158](https://github.com/ClickHouse/ClickHouse/issues/61158). [#61259](https://github.com/ClickHouse/ClickHouse/pull/61259) ([Ilya Yatsishin](https://github.com/qoega)).
+* Now it possible to use `chassert(expression, comment)` in the codebase. [#61263](https://github.com/ClickHouse/ClickHouse/pull/61263) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Teach the fuzzer to use other numeric types. [#61317](https://github.com/ClickHouse/ClickHouse/pull/61317) ([Raúl Marín](https://github.com/Algunenano)).
+* Increase memory limit for coverage builds. [#61405](https://github.com/ClickHouse/ClickHouse/pull/61405) ([Raúl Marín](https://github.com/Algunenano)).
+* Add generic query text fuzzer in `clickhouse-local`. [#61508](https://github.com/ClickHouse/ClickHouse/pull/61508) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix function execution over const and LowCardinality with GROUP BY const for analyzer [#59986](https://github.com/ClickHouse/ClickHouse/pull/59986) ([Azat Khuzhin](https://github.com/azat)).
+* Fix finished_mutations_to_keep=0 for MergeTree (as docs says 0 is to keep everything) [#60031](https://github.com/ClickHouse/ClickHouse/pull/60031) ([Azat Khuzhin](https://github.com/azat)).
+* PartsSplitter invalid ranges for the same part [#60041](https://github.com/ClickHouse/ClickHouse/pull/60041) ([Maksim Kita](https://github.com/kitaisreal)).
+* Azure Blob Storage : Fix issues endpoint and prefix [#60251](https://github.com/ClickHouse/ClickHouse/pull/60251) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* fix LRUResource Cache bug (Hive cache) [#60262](https://github.com/ClickHouse/ClickHouse/pull/60262) ([shanfengp](https://github.com/Aed-p)).
+* Force reanalysis if parallel replicas changed [#60362](https://github.com/ClickHouse/ClickHouse/pull/60362) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix usage of plain metadata type with new disks configuration option [#60396](https://github.com/ClickHouse/ClickHouse/pull/60396) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Try to fix logical error 'Cannot capture column because it has incompatible type' in mapContainsKeyLike [#60451](https://github.com/ClickHouse/ClickHouse/pull/60451) ([Kruglov Pavel](https://github.com/Avogar)).
+* Try to avoid calculation of scalar subqueries for CREATE TABLE. [#60464](https://github.com/ClickHouse/ClickHouse/pull/60464) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix deadlock in parallel parsing when lots of rows are skipped due to errors [#60516](https://github.com/ClickHouse/ClickHouse/pull/60516) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix_max_query_size_for_kql_compound_operator: [#60534](https://github.com/ClickHouse/ClickHouse/pull/60534) ([Yong Wang](https://github.com/kashwy)).
+* Keeper fix: add timeouts when waiting for commit logs [#60544](https://github.com/ClickHouse/ClickHouse/pull/60544) ([Antonio Andelic](https://github.com/antonio2368)).
+* Reduce the number of read rows from `system.numbers` [#60546](https://github.com/ClickHouse/ClickHouse/pull/60546) ([JackyWoo](https://github.com/JackyWoo)).
+* Don't output number tips for date types [#60577](https://github.com/ClickHouse/ClickHouse/pull/60577) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix reading from MergeTree with non-deterministic functions in filter [#60586](https://github.com/ClickHouse/ClickHouse/pull/60586) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix logical error on bad compatibility setting value type [#60596](https://github.com/ClickHouse/ClickHouse/pull/60596) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix inconsistent aggregate function states in mixed x86-64 / ARM clusters [#60610](https://github.com/ClickHouse/ClickHouse/pull/60610) ([Harry Lee](https://github.com/HarryLeeIBM)).
+* fix(prql): Robust panic handler [#60615](https://github.com/ClickHouse/ClickHouse/pull/60615) ([Maximilian Roos](https://github.com/max-sixty)).
+* Fix `intDiv` for decimal and date arguments [#60672](https://github.com/ClickHouse/ClickHouse/pull/60672) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Fix: expand CTE in alter modify query [#60682](https://github.com/ClickHouse/ClickHouse/pull/60682) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Fix system.parts for non-Atomic/Ordinary database engine (i.e. Memory) [#60689](https://github.com/ClickHouse/ClickHouse/pull/60689) ([Azat Khuzhin](https://github.com/azat)).
+* Fix "Invalid storage definition in metadata file" for parameterized views [#60708](https://github.com/ClickHouse/ClickHouse/pull/60708) ([Azat Khuzhin](https://github.com/azat)).
+* Fix buffer overflow in CompressionCodecMultiple [#60731](https://github.com/ClickHouse/ClickHouse/pull/60731) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove nonsense from SQL/JSON [#60738](https://github.com/ClickHouse/ClickHouse/pull/60738) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove wrong sanitize checking in aggregate function quantileGK [#60740](https://github.com/ClickHouse/ClickHouse/pull/60740) ([�扬](https://github.com/taiyang-li)).
+* Fix insert-select + insert_deduplication_token bug by setting streams to 1 [#60745](https://github.com/ClickHouse/ClickHouse/pull/60745) ([Jordi Villar](https://github.com/jrdi)).
+* Prevent setting custom metadata headers on unsupported multipart upload operations [#60748](https://github.com/ClickHouse/ClickHouse/pull/60748) ([Francisco J. Jurado Moreno](https://github.com/Beetelbrox)).
+* Fix toStartOfInterval [#60763](https://github.com/ClickHouse/ClickHouse/pull/60763) ([Andrey Zvonov](https://github.com/zvonand)).
+* Fix crash in arrayEnumerateRanked [#60764](https://github.com/ClickHouse/ClickHouse/pull/60764) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix crash when using input() in INSERT SELECT JOIN [#60765](https://github.com/ClickHouse/ClickHouse/pull/60765) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix crash with different allow_experimental_analyzer value in subqueries [#60770](https://github.com/ClickHouse/ClickHouse/pull/60770) ([Dmitry Novik](https://github.com/novikd)).
+* Remove recursion when reading from S3 [#60849](https://github.com/ClickHouse/ClickHouse/pull/60849) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix possible stuck on error in HashedDictionaryParallelLoader [#60926](https://github.com/ClickHouse/ClickHouse/pull/60926) ([vdimir](https://github.com/vdimir)).
+* Fix async RESTORE with Replicated database [#60934](https://github.com/ClickHouse/ClickHouse/pull/60934) ([Antonio Andelic](https://github.com/antonio2368)).
+* fix csv format not support tuple [#60994](https://github.com/ClickHouse/ClickHouse/pull/60994) ([shuai.xu](https://github.com/shuai-xu)).
+* Fix deadlock in async inserts to `Log` tables via native protocol [#61055](https://github.com/ClickHouse/ClickHouse/pull/61055) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix lazy execution of default argument in dictGetOrDefault for RangeHashedDictionary [#61196](https://github.com/ClickHouse/ClickHouse/pull/61196) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix multiple bugs in groupArraySorted [#61203](https://github.com/ClickHouse/ClickHouse/pull/61203) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix Keeper reconfig for standalone binary [#61233](https://github.com/ClickHouse/ClickHouse/pull/61233) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix usage of session_token in S3 engine [#61234](https://github.com/ClickHouse/ClickHouse/pull/61234) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix possible incorrect result of aggregate function `uniqExact` [#61257](https://github.com/ClickHouse/ClickHouse/pull/61257) ([Anton Popov](https://github.com/CurtizJ)).
+* Fix bugs in show database [#61269](https://github.com/ClickHouse/ClickHouse/pull/61269) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix logical error in RabbitMQ storage with MATERIALIZED columns [#61320](https://github.com/ClickHouse/ClickHouse/pull/61320) ([vdimir](https://github.com/vdimir)).
+* Fix CREATE OR REPLACE DICTIONARY [#61356](https://github.com/ClickHouse/ClickHouse/pull/61356) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix crash in ObjectJson parsing array with nulls [#61364](https://github.com/ClickHouse/ClickHouse/pull/61364) ([vdimir](https://github.com/vdimir)).
+* Fix ATTACH query with external ON CLUSTER [#61365](https://github.com/ClickHouse/ClickHouse/pull/61365) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix consecutive keys optimization for nullable keys [#61393](https://github.com/ClickHouse/ClickHouse/pull/61393) ([Anton Popov](https://github.com/CurtizJ)).
+* fix issue of actions dag split [#61458](https://github.com/ClickHouse/ClickHouse/pull/61458) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix finishing a failed RESTORE [#61466](https://github.com/ClickHouse/ClickHouse/pull/61466) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Disable async_insert_use_adaptive_busy_timeout correctly with compatibility settings [#61468](https://github.com/ClickHouse/ClickHouse/pull/61468) ([Raúl Marín](https://github.com/Algunenano)).
+* Allow queuing in restore pool [#61475](https://github.com/ClickHouse/ClickHouse/pull/61475) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix bug when reading system.parts using UUID (issue 61220). [#61479](https://github.com/ClickHouse/ClickHouse/pull/61479) ([Dan Wu](https://github.com/wudanzy)).
+* Fix ALTER QUERY MODIFY SQL SECURITY [#61480](https://github.com/ClickHouse/ClickHouse/pull/61480) ([pufit](https://github.com/pufit)).
+* Fix crash in window view [#61526](https://github.com/ClickHouse/ClickHouse/pull/61526) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix `repeat` with non native integers [#61527](https://github.com/ClickHouse/ClickHouse/pull/61527) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix client `-s` argument [#61530](https://github.com/ClickHouse/ClickHouse/pull/61530) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Reset part level upon attach from disk on MergeTree [#61536](https://github.com/ClickHouse/ClickHouse/pull/61536) ([Arthur Passos](https://github.com/arthurpassos)).
+* Fix crash in arrayPartialReverseSort [#61539](https://github.com/ClickHouse/ClickHouse/pull/61539) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix string search with const position [#61547](https://github.com/ClickHouse/ClickHouse/pull/61547) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix addDays cause an error when used datetime64 [#61561](https://github.com/ClickHouse/ClickHouse/pull/61561) ([Shuai li](https://github.com/loneylee)).
+* disallow LowCardinality input type for JSONExtract [#61617](https://github.com/ClickHouse/ClickHouse/pull/61617) ([Julia Kartseva](https://github.com/jkartseva)).
+* Fix `system.part_log` for async insert with deduplication [#61620](https://github.com/ClickHouse/ClickHouse/pull/61620) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix Non-ready set for system.parts. [#61666](https://github.com/ClickHouse/ClickHouse/pull/61666) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Don't allow the same expression in ORDER BY with and without WITH FILL [#61667](https://github.com/ClickHouse/ClickHouse/pull/61667) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix actual_part_name for REPLACE_RANGE (`Entry actual part isn't empty yet`) [#61675](https://github.com/ClickHouse/ClickHouse/pull/61675) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Fix columns after executing MODIFY QUERY for a materialized view with internal table [#61734](https://github.com/ClickHouse/ClickHouse/pull/61734) ([Vitaly Baranov](https://github.com/vitlibar)).
+* Fix crash in `multiSearchAllPositionsCaseInsensitiveUTF8` for incorrect UTF-8 [#61749](https://github.com/ClickHouse/ClickHouse/pull/61749) ([pufit](https://github.com/pufit)).
+* Fix RANGE frame is not supported for Nullable columns. [#61766](https://github.com/ClickHouse/ClickHouse/pull/61766) ([YuanLiu](https://github.com/ditgittube)).
+* Revert "Revert "Fix bug when reading system.parts using UUID (issue 61220)."" [#61779](https://github.com/ClickHouse/ClickHouse/pull/61779) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Decoupled changes from [#60408](https://github.com/ClickHouse/ClickHouse/issues/60408). [#60553](https://github.com/ClickHouse/ClickHouse/pull/60553) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Eliminates the need to provide input args to docker server jobs to clean yml files. [#60602](https://github.com/ClickHouse/ClickHouse/pull/60602) ([Max K.](https://github.com/maxknv)).
+* Debug and fix markreleaseready. [#60611](https://github.com/ClickHouse/ClickHouse/pull/60611) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix build_report job so that it's defined by ci_config only (not yml file). [#60613](https://github.com/ClickHouse/ClickHouse/pull/60613) ([Max K.](https://github.com/maxknv)).
+* Do not await ci pending jobs on release branches decrease wait timeout to fit into gh job timeout. [#60652](https://github.com/ClickHouse/ClickHouse/pull/60652) ([Max K.](https://github.com/maxknv)).
+* Set limited number of builds for "special build check" report in backports. [#60850](https://github.com/ClickHouse/ClickHouse/pull/60850) ([Max K.](https://github.com/maxknv)).
+* ... [#60935](https://github.com/ClickHouse/ClickHouse/pull/60935) ([Max K.](https://github.com/maxknv)).
+* ... [#60947](https://github.com/ClickHouse/ClickHouse/pull/60947) ([Max K.](https://github.com/maxknv)).
+* ... [#60952](https://github.com/ClickHouse/ClickHouse/pull/60952) ([Max K.](https://github.com/maxknv)).
+* ... [#60958](https://github.com/ClickHouse/ClickHouse/pull/60958) ([Max K.](https://github.com/maxknv)).
+* ... [#61022](https://github.com/ClickHouse/ClickHouse/pull/61022) ([Max K.](https://github.com/maxknv)).
+* Just a preparation for the merge queue support. [#61099](https://github.com/ClickHouse/ClickHouse/pull/61099) ([Max K.](https://github.com/maxknv)).
+* ... [#61133](https://github.com/ClickHouse/ClickHouse/pull/61133) ([Max K.](https://github.com/maxknv)).
+* In PRs: - run typos, aspell check - always - run pylint, mypy - only if py file(s) changed in PRs - run basic source files style check - only if not all changes in py files. [#61148](https://github.com/ClickHouse/ClickHouse/pull/61148) ([Max K.](https://github.com/maxknv)).
+* ... [#61172](https://github.com/ClickHouse/ClickHouse/pull/61172) ([Max K.](https://github.com/maxknv)).
+* ... [#61183](https://github.com/ClickHouse/ClickHouse/pull/61183) ([Han Fei](https://github.com/hanfei1991)).
+* ... [#61185](https://github.com/ClickHouse/ClickHouse/pull/61185) ([Max K.](https://github.com/maxknv)).
+* TBD. [#61197](https://github.com/ClickHouse/ClickHouse/pull/61197) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* ... [#61214](https://github.com/ClickHouse/ClickHouse/pull/61214) ([Max K.](https://github.com/maxknv)).
+* ... [#61441](https://github.com/ClickHouse/ClickHouse/pull/61441) ([Max K.](https://github.com/maxknv)).
+* ![Screenshot_20240323_025055](https://github.com/ClickHouse/ClickHouse/assets/18581488/ccaab212-a1d3-4dfb-8d56-b1991760b6bf). [#61801](https://github.com/ClickHouse/ClickHouse/pull/61801) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* ... [#61877](https://github.com/ClickHouse/ClickHouse/pull/61877) ([Max K.](https://github.com/maxknv)).
+
+#### NO CL ENTRY
+
+* NO CL ENTRY:  'Revert "Revert "Use `MergeTree` as a default table engine""'. [#60524](https://github.com/ClickHouse/ClickHouse/pull/60524) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Revert "Support resource request canceling""'. [#60558](https://github.com/ClickHouse/ClickHouse/pull/60558) ([Sergei Trifonov](https://github.com/serxa)).
+* NO CL ENTRY:  'Revert "Add `toMillisecond` function"'. [#60644](https://github.com/ClickHouse/ClickHouse/pull/60644) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Synchronize parsers"'. [#60759](https://github.com/ClickHouse/ClickHouse/pull/60759) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Fix wacky primary key sorting in `SHOW INDEX`"'. [#60898](https://github.com/ClickHouse/ClickHouse/pull/60898) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "CI: make style check faster"'. [#61142](https://github.com/ClickHouse/ClickHouse/pull/61142) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Don't allow to set max_parallel_replicas to 0 as it doesn't make sense"'. [#61200](https://github.com/ClickHouse/ClickHouse/pull/61200) ([Kruglov Pavel](https://github.com/Avogar)).
+* NO CL ENTRY:  'Revert "Fix usage of session_token in S3 engine"'. [#61359](https://github.com/ClickHouse/ClickHouse/pull/61359) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "Revert "Fix usage of session_token in S3 engine""'. [#61362](https://github.com/ClickHouse/ClickHouse/pull/61362) ([Kruglov Pavel](https://github.com/Avogar)).
+* NO CL ENTRY:  'Reorder hidden and shown checks in comment, change url of Mergeable check'. [#61373](https://github.com/ClickHouse/ClickHouse/pull/61373) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* NO CL ENTRY:  'Remove unnecessary layers from clickhouse/cctools'. [#61374](https://github.com/ClickHouse/ClickHouse/pull/61374) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* NO CL ENTRY:  'Revert "Updated format settings references in the docs (datetime.md)"'. [#61435](https://github.com/ClickHouse/ClickHouse/pull/61435) ([Kruglov Pavel](https://github.com/Avogar)).
+* NO CL ENTRY:  'Revert "CI: ARM integration tests: disable tests with HDFS "'. [#61449](https://github.com/ClickHouse/ClickHouse/pull/61449) ([Max K.](https://github.com/maxknv)).
+* NO CL ENTRY:  'Revert "Analyzer: Fix virtual columns in StorageMerge"'. [#61518](https://github.com/ClickHouse/ClickHouse/pull/61518) ([Antonio Andelic](https://github.com/antonio2368)).
+* NO CL ENTRY:  'Revert "Revert "Analyzer: Fix virtual columns in StorageMerge""'. [#61528](https://github.com/ClickHouse/ClickHouse/pull/61528) ([Dmitry Novik](https://github.com/novikd)).
+* NO CL ENTRY:  'Improve build_download_helper'. [#61592](https://github.com/ClickHouse/ClickHouse/pull/61592) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* NO CL ENTRY:  'Revert "Un-flake `test_undrop_query`"'. [#61668](https://github.com/ClickHouse/ClickHouse/pull/61668) ([Robert Schulze](https://github.com/rschu1ze)).
+* NO CL ENTRY:  'Fix flaky tests (stateless, integration)'. [#61816](https://github.com/ClickHouse/ClickHouse/pull/61816) ([Nikita Fomichev](https://github.com/fm4v)).
+* NO CL ENTRY:  'Better usability of "expect" tests: less trouble with running directly'. [#61818](https://github.com/ClickHouse/ClickHouse/pull/61818) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* NO CL ENTRY:  'Revert "Fix flaky `02122_parallel_formatting_Template`"'. [#61868](https://github.com/ClickHouse/ClickHouse/pull/61868) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* NO CL ENTRY:  'Revert "Add --now option to enable and start the service" #job_Install_packages_amd64'. [#61878](https://github.com/ClickHouse/ClickHouse/pull/61878) ([Max K.](https://github.com/maxknv)).
+* NO CL ENTRY:  'Revert "disallow LowCardinality input type for JSONExtract"'. [#61960](https://github.com/ClickHouse/ClickHouse/pull/61960) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Improve query performance in case of very small blocks [#58879](https://github.com/ClickHouse/ClickHouse/pull/58879) ([Azat Khuzhin](https://github.com/azat)).
+* Analyzer: fixes for JOIN columns resolution [#59007](https://github.com/ClickHouse/ClickHouse/pull/59007) ([vdimir](https://github.com/vdimir)).
+* Fix race on `Context::async_insert_queue` [#59082](https://github.com/ClickHouse/ClickHouse/pull/59082) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* CI: support batch specification in commit message [#59738](https://github.com/ClickHouse/ClickHouse/pull/59738) ([Max K.](https://github.com/maxknv)).
+* Update storing-data.md [#60024](https://github.com/ClickHouse/ClickHouse/pull/60024) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Make max_insert_delayed_streams_for_parallel_write actually work [#60079](https://github.com/ClickHouse/ClickHouse/pull/60079) ([alesapin](https://github.com/alesapin)).
+* Analyzer: support join using column from select list [#60182](https://github.com/ClickHouse/ClickHouse/pull/60182) ([vdimir](https://github.com/vdimir)).
+* test for [#60223](https://github.com/ClickHouse/ClickHouse/issues/60223) [#60258](https://github.com/ClickHouse/ClickHouse/pull/60258) ([Denny Crane](https://github.com/den-crane)).
+* Analyzer: Refactor execution name for ConstantNode [#60313](https://github.com/ClickHouse/ClickHouse/pull/60313) ([Dmitry Novik](https://github.com/novikd)).
+* Fix database iterator waiting code [#60314](https://github.com/ClickHouse/ClickHouse/pull/60314) ([Sergei Trifonov](https://github.com/serxa)).
+* QueryCache: Don't acquire the query count mutex if not necessary [#60348](https://github.com/ClickHouse/ClickHouse/pull/60348) ([zhongyuankai](https://github.com/zhongyuankai)).
+* Fix bugfix check (due to unknown commit_logs_cache_size_threshold) [#60375](https://github.com/ClickHouse/ClickHouse/pull/60375) ([Azat Khuzhin](https://github.com/azat)).
+* Enable testing with `io_uring` back [#60383](https://github.com/ClickHouse/ClickHouse/pull/60383) ([Nikita Taranov](https://github.com/nickitat)).
+* Analyzer - improve hiding secret arguments. [#60386](https://github.com/ClickHouse/ClickHouse/pull/60386) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* CI: make workflow yml abstract [#60421](https://github.com/ClickHouse/ClickHouse/pull/60421) ([Max K.](https://github.com/maxknv)).
+* Improve test test_reload_clusters_config [#60426](https://github.com/ClickHouse/ClickHouse/pull/60426) ([Kruglov Pavel](https://github.com/Avogar)).
+* Revert "Revert "Merge pull request [#56864](https://github.com/ClickHouse/ClickHouse/issues/56864) from ClickHouse/broken-projections-better-handling"" [#60452](https://github.com/ClickHouse/ClickHouse/pull/60452) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Do not check to and from files existence in metadata_storage because it does not see uncommitted changes [#60462](https://github.com/ClickHouse/ClickHouse/pull/60462) ([Alexander Gololobov](https://github.com/davenger)).
+* Fix option ambiguous in `clickhouse-local` [#60475](https://github.com/ClickHouse/ClickHouse/pull/60475) ([豪肥肥](https://github.com/HowePa)).
+* Fix: test_parallel_replicas_custom_key_load_balancing [#60485](https://github.com/ClickHouse/ClickHouse/pull/60485) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix: progress bar for *Cluster table functions [#60491](https://github.com/ClickHouse/ClickHouse/pull/60491) ([Igor Nikonov](https://github.com/devcrafter)).
+* Analyzer: Support different ObjectJSON on shards [#60497](https://github.com/ClickHouse/ClickHouse/pull/60497) ([Dmitry Novik](https://github.com/novikd)).
+* Cancel PipelineExecutor properly in case of exception in spawnThreads [#60499](https://github.com/ClickHouse/ClickHouse/pull/60499) ([Kruglov Pavel](https://github.com/Avogar)).
+* Refactor StorageSystemOneBlock [#60510](https://github.com/ClickHouse/ClickHouse/pull/60510) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Simple cleanup while fixing progress bar [#60513](https://github.com/ClickHouse/ClickHouse/pull/60513) ([Igor Nikonov](https://github.com/devcrafter)).
+* PullingAsyncPipelineExecutor cleanup [#60515](https://github.com/ClickHouse/ClickHouse/pull/60515) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fix bad error message [#60518](https://github.com/ClickHouse/ClickHouse/pull/60518) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Synchronize Access [#60519](https://github.com/ClickHouse/ClickHouse/pull/60519) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Synchronize metrics and Keeper [#60520](https://github.com/ClickHouse/ClickHouse/pull/60520) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Enforce clang-tidy in `programs/` and `utils/` headers [#60521](https://github.com/ClickHouse/ClickHouse/pull/60521) ([Robert Schulze](https://github.com/rschu1ze)).
+* Synchronize parsers [#60522](https://github.com/ClickHouse/ClickHouse/pull/60522) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix a bunch of clang-tidy warnings in headers [#60523](https://github.com/ClickHouse/ClickHouse/pull/60523) ([Robert Schulze](https://github.com/rschu1ze)).
+* General sanity in function `seriesOutliersDetectTukey` [#60535](https://github.com/ClickHouse/ClickHouse/pull/60535) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update Chinese document for max_query_size, max_parser_depth and optimize_functions_to_subcolumns [#60541](https://github.com/ClickHouse/ClickHouse/pull/60541) ([Alex Cheng](https://github.com/Alex-Cheng)).
+* Userspace page cache again [#60552](https://github.com/ClickHouse/ClickHouse/pull/60552) ([Michael Kolupaev](https://github.com/al13n321)).
+* Traverse shadow directory for system.remote_data_paths [#60585](https://github.com/ClickHouse/ClickHouse/pull/60585) ([Aleksei Filatov](https://github.com/aalexfvk)).
+* Add test for [#58906](https://github.com/ClickHouse/ClickHouse/issues/58906) [#60597](https://github.com/ClickHouse/ClickHouse/pull/60597) ([Raúl Marín](https://github.com/Algunenano)).
+* Use python zipfile to have x-platform idempotent lambda packages [#60603](https://github.com/ClickHouse/ClickHouse/pull/60603) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* tests: suppress data-race in librdkafka statistics code [#60604](https://github.com/ClickHouse/ClickHouse/pull/60604) ([Azat Khuzhin](https://github.com/azat)).
+* Update version after release [#60605](https://github.com/ClickHouse/ClickHouse/pull/60605) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v24.2.1.2248-stable [#60607](https://github.com/ClickHouse/ClickHouse/pull/60607) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Addition to changelog [#60609](https://github.com/ClickHouse/ClickHouse/pull/60609) ([Anton Popov](https://github.com/CurtizJ)).
+*  internal: Refine rust prql code [#60617](https://github.com/ClickHouse/ClickHouse/pull/60617) ([Maximilian Roos](https://github.com/max-sixty)).
+* fix(rust): Fix skim's panic handler [#60621](https://github.com/ClickHouse/ClickHouse/pull/60621) ([Maximilian Roos](https://github.com/max-sixty)).
+* Resubmit "Analyzer: compute ALIAS columns right after reading" [#60641](https://github.com/ClickHouse/ClickHouse/pull/60641) ([vdimir](https://github.com/vdimir)).
+* Analyzer: Fix bug with join_use_nulls and PREWHERE [#60655](https://github.com/ClickHouse/ClickHouse/pull/60655) ([vdimir](https://github.com/vdimir)).
+* Add test for [#59891](https://github.com/ClickHouse/ClickHouse/issues/59891) [#60657](https://github.com/ClickHouse/ClickHouse/pull/60657) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix missed entries in system.part_log in case of fetch preferred over merges/mutations [#60659](https://github.com/ClickHouse/ClickHouse/pull/60659) ([Azat Khuzhin](https://github.com/azat)).
+* Always apply first minmax index among available skip indices [#60675](https://github.com/ClickHouse/ClickHouse/pull/60675) ([Igor Nikonov](https://github.com/devcrafter)).
+* Remove bad test `02152_http_external_tables_memory_tracking` [#60690](https://github.com/ClickHouse/ClickHouse/pull/60690) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix questionable behavior in the `parseDateTimeBestEffort` function. [#60691](https://github.com/ClickHouse/ClickHouse/pull/60691) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix flaky checks [#60694](https://github.com/ClickHouse/ClickHouse/pull/60694) ([Azat Khuzhin](https://github.com/azat)).
+* Resubmit http_external_tables_memory_tracking test [#60695](https://github.com/ClickHouse/ClickHouse/pull/60695) ([Azat Khuzhin](https://github.com/azat)).
+* Fix bugfix and upgrade checks (due to "Unknown handler type 'redirect'" error) [#60696](https://github.com/ClickHouse/ClickHouse/pull/60696) ([Azat Khuzhin](https://github.com/azat)).
+* Fix test_grant_and_revoke/test.py::test_grant_all_on_table (after syncing with cloud) [#60699](https://github.com/ClickHouse/ClickHouse/pull/60699) ([Azat Khuzhin](https://github.com/azat)).
+* Remove unit test for ColumnObject [#60709](https://github.com/ClickHouse/ClickHouse/pull/60709) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve unit tests [#60710](https://github.com/ClickHouse/ClickHouse/pull/60710) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix scheduler fairness test [#60712](https://github.com/ClickHouse/ClickHouse/pull/60712) ([Sergei Trifonov](https://github.com/serxa)).
+* Do not retry queries if container is down in integration tests (resubmit) [#60714](https://github.com/ClickHouse/ClickHouse/pull/60714) ([Azat Khuzhin](https://github.com/azat)).
+* Mark one setting as obsolete [#60715](https://github.com/ClickHouse/ClickHouse/pull/60715) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix a test with Analyzer [#60723](https://github.com/ClickHouse/ClickHouse/pull/60723) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Two tests are fixed with Analyzer [#60724](https://github.com/ClickHouse/ClickHouse/pull/60724) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove old code [#60728](https://github.com/ClickHouse/ClickHouse/pull/60728) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove more code from LIVE VIEW [#60729](https://github.com/ClickHouse/ClickHouse/pull/60729) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix `test_keeper_back_to_back/test.py::test_concurrent_watches` [#60749](https://github.com/ClickHouse/ClickHouse/pull/60749) ([Antonio Andelic](https://github.com/antonio2368)).
+* Catch exceptions on finalize in `InterserverIOHTTPHandler` [#60769](https://github.com/ClickHouse/ClickHouse/pull/60769) ([Antonio Andelic](https://github.com/antonio2368)).
+* Reduce flakiness of 02932_refreshable_materialized_views [#60771](https://github.com/ClickHouse/ClickHouse/pull/60771) ([Michael Kolupaev](https://github.com/al13n321)).
+* Use 64-bit capabilities if available [#60775](https://github.com/ClickHouse/ClickHouse/pull/60775) ([Azat Khuzhin](https://github.com/azat)).
+* Include multiline logs in fuzzer fatal.log report [#60796](https://github.com/ClickHouse/ClickHouse/pull/60796) ([Raúl Marín](https://github.com/Algunenano)).
+* Add missing clone calls related to compression [#60810](https://github.com/ClickHouse/ClickHouse/pull/60810) ([Raúl Marín](https://github.com/Algunenano)).
+* New private runners [#60811](https://github.com/ClickHouse/ClickHouse/pull/60811) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Move userspace page cache settings to the correct section of SettingsChangeHistory.h [#60812](https://github.com/ClickHouse/ClickHouse/pull/60812) ([Michael Kolupaev](https://github.com/al13n321)).
+* Update version_date.tsv and changelogs after v23.8.10.43-lts [#60851](https://github.com/ClickHouse/ClickHouse/pull/60851) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix fuzzer report [#60853](https://github.com/ClickHouse/ClickHouse/pull/60853) ([Raúl Marín](https://github.com/Algunenano)).
+* Update version_date.tsv and changelogs after v23.3.20.27-lts [#60857](https://github.com/ClickHouse/ClickHouse/pull/60857) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Refactor OptimizeDateOrDateTimeConverterWithPreimageVisitor [#60875](https://github.com/ClickHouse/ClickHouse/pull/60875) ([Zhiguo Zhou](https://github.com/ZhiguoZh)).
+* Fix race in PageCache [#60878](https://github.com/ClickHouse/ClickHouse/pull/60878) ([Michael Kolupaev](https://github.com/al13n321)).
+* Small changes in async inserts code [#60885](https://github.com/ClickHouse/ClickHouse/pull/60885) ([Nikita Taranov](https://github.com/nickitat)).
+* Remove useless verbose logging from AWS library [#60921](https://github.com/ClickHouse/ClickHouse/pull/60921) ([alesapin](https://github.com/alesapin)).
+* Throw on query timeout in ZooKeeperRetries [#60922](https://github.com/ClickHouse/ClickHouse/pull/60922) ([Antonio Andelic](https://github.com/antonio2368)).
+* Bring clickhouse-test changes from private [#60924](https://github.com/ClickHouse/ClickHouse/pull/60924) ([Raúl Marín](https://github.com/Algunenano)).
+* Add debug info to exceptions in `IMergeTreeDataPart::checkConsistency()` [#60981](https://github.com/ClickHouse/ClickHouse/pull/60981) ([Nikita Taranov](https://github.com/nickitat)).
+* Fix a typo [#60987](https://github.com/ClickHouse/ClickHouse/pull/60987) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Replace some header includes with forward declarations [#61003](https://github.com/ClickHouse/ClickHouse/pull/61003) ([Amos Bird](https://github.com/amosbird)).
+* Speed up cctools building [#61011](https://github.com/ClickHouse/ClickHouse/pull/61011) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix ASTRenameQuery::clone [#61013](https://github.com/ClickHouse/ClickHouse/pull/61013) ([vdimir](https://github.com/vdimir)).
+* Update README.md [#61021](https://github.com/ClickHouse/ClickHouse/pull/61021) ([Tyler Hannan](https://github.com/tylerhannan)).
+* Fix TableFunctionExecutable::skipAnalysisForArguments [#61037](https://github.com/ClickHouse/ClickHouse/pull/61037) ([Dmitry Novik](https://github.com/novikd)).
+* Fix: parallel replicas with PREWHERE (ubsan) [#61052](https://github.com/ClickHouse/ClickHouse/pull/61052) ([Igor Nikonov](https://github.com/devcrafter)).
+* Fast fix tests. [#61056](https://github.com/ClickHouse/ClickHouse/pull/61056) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix `test_placement_info` [#61057](https://github.com/ClickHouse/ClickHouse/pull/61057) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+* Fix: parallel replicas with CTEs, crash in EXPLAIN SYNTAX with analyzer [#61059](https://github.com/ClickHouse/ClickHouse/pull/61059) ([Igor Nikonov](https://github.com/devcrafter)).
+* Debug fuzzer failures [#61062](https://github.com/ClickHouse/ClickHouse/pull/61062) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Add regression tests for fixed issues [#61076](https://github.com/ClickHouse/ClickHouse/pull/61076) ([Antonio Andelic](https://github.com/antonio2368)).
+* Analyzer: Fix 01244_optimize_distributed_group_by_sharding_key [#61089](https://github.com/ClickHouse/ClickHouse/pull/61089) ([Dmitry Novik](https://github.com/novikd)).
+* Use global scalars cache with analyzer [#61104](https://github.com/ClickHouse/ClickHouse/pull/61104) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix removing is_active node after re-creation [#61105](https://github.com/ClickHouse/ClickHouse/pull/61105) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Update 02962_system_sync_replica_lightweight_from_modifier.sh [#61110](https://github.com/ClickHouse/ClickHouse/pull/61110) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* Simplify bridges [#61118](https://github.com/ClickHouse/ClickHouse/pull/61118) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* update cppkafka to v0.4.1 [#61119](https://github.com/ClickHouse/ClickHouse/pull/61119) ([Ilya Golshtein](https://github.com/ilejn)).
+* CI: add wf class in ci_config [#61122](https://github.com/ClickHouse/ClickHouse/pull/61122) ([Max K.](https://github.com/maxknv)).
+* QueryFuzzer: replace element randomly when AST part buffer is full [#61124](https://github.com/ClickHouse/ClickHouse/pull/61124) ([Tomer Shafir](https://github.com/tomershafir)).
+* CI: make style check fast [#61125](https://github.com/ClickHouse/ClickHouse/pull/61125) ([Max K.](https://github.com/maxknv)).
+* Better gitignore [#61128](https://github.com/ClickHouse/ClickHouse/pull/61128) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix something strange [#61129](https://github.com/ClickHouse/ClickHouse/pull/61129) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update check-large-objects.sh to be language neutral [#61130](https://github.com/ClickHouse/ClickHouse/pull/61130) ([Dan Wu](https://github.com/wudanzy)).
+* Throw memory limit exceptions to avoid OOM in some places [#61132](https://github.com/ClickHouse/ClickHouse/pull/61132) ([alesapin](https://github.com/alesapin)).
+* Fix test_distributed_directory_monitor_split_batch_on_failure flakienss [#61136](https://github.com/ClickHouse/ClickHouse/pull/61136) ([Azat Khuzhin](https://github.com/azat)).
+* Fix llvm symbolizer on CI [#61147](https://github.com/ClickHouse/ClickHouse/pull/61147) ([Azat Khuzhin](https://github.com/azat)).
+* Some clang-tidy fixes [#61150](https://github.com/ClickHouse/ClickHouse/pull/61150) ([Robert Schulze](https://github.com/rschu1ze)).
+* Revive "Less contention in the cache, part 2" [#61152](https://github.com/ClickHouse/ClickHouse/pull/61152) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Enable black back [#61159](https://github.com/ClickHouse/ClickHouse/pull/61159) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* CI: fix nightly job issue [#61160](https://github.com/ClickHouse/ClickHouse/pull/61160) ([Max K.](https://github.com/maxknv)).
+* Split `RangeHashedDictionary` [#61162](https://github.com/ClickHouse/ClickHouse/pull/61162) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Remove a few templates from Aggregator.cpp [#61171](https://github.com/ClickHouse/ClickHouse/pull/61171) ([Raúl Marín](https://github.com/Algunenano)).
+* Avoid some logical errors in experimantal Object type [#61173](https://github.com/ClickHouse/ClickHouse/pull/61173) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update ReadSettings.h [#61174](https://github.com/ClickHouse/ClickHouse/pull/61174) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* CI: ARM integration tests: disable tests with HDFS  [#61182](https://github.com/ClickHouse/ClickHouse/pull/61182) ([Max K.](https://github.com/maxknv)).
+* Disable sanitizers with 02784_parallel_replicas_automatic_decision_join [#61184](https://github.com/ClickHouse/ClickHouse/pull/61184) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix `02887_mutations_subcolumns` test flakiness  [#61198](https://github.com/ClickHouse/ClickHouse/pull/61198) ([Nikita Taranov](https://github.com/nickitat)).
+* Make variant tests a bit faster [#61199](https://github.com/ClickHouse/ClickHouse/pull/61199) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix strange log message [#61206](https://github.com/ClickHouse/ClickHouse/pull/61206) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix 01603_insert_select_too_many_parts flakiness [#61218](https://github.com/ClickHouse/ClickHouse/pull/61218) ([Azat Khuzhin](https://github.com/azat)).
+* Make every style-checker runner types scaling-out very quickly [#61231](https://github.com/ClickHouse/ClickHouse/pull/61231) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Improve `test_failed_mutations` [#61235](https://github.com/ClickHouse/ClickHouse/pull/61235) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix `test_merge_tree_load_parts/test.py::test_merge_tree_load_parts_corrupted` [#61236](https://github.com/ClickHouse/ClickHouse/pull/61236) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* fix `forget_partition` test [#61237](https://github.com/ClickHouse/ClickHouse/pull/61237) ([Sergei Trifonov](https://github.com/serxa)).
+* Print more info in `02572_system_logs_materialized_views_ignore_errors` to debug [#61246](https://github.com/ClickHouse/ClickHouse/pull/61246) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Fix runtime error in AST Fuzzer [#61248](https://github.com/ClickHouse/ClickHouse/pull/61248) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* Add retries to `02908_many_requests_to_system_replicas` [#61253](https://github.com/ClickHouse/ClickHouse/pull/61253) ([Nikita Taranov](https://github.com/nickitat)).
+* Followup fix ASTRenameQuery::clone  [#61254](https://github.com/ClickHouse/ClickHouse/pull/61254) ([vdimir](https://github.com/vdimir)).
+* Disable test 02998_primary_key_skip_columns.sql in sanitizer builds as it can be slow [#61256](https://github.com/ClickHouse/ClickHouse/pull/61256) ([Kruglov Pavel](https://github.com/Avogar)).
+* Update curl to curl with data race fix [#61264](https://github.com/ClickHouse/ClickHouse/pull/61264) ([SmitaRKulkarni](https://github.com/SmitaRKulkarni)).
+* Fix `01417_freeze_partition_verbose` [#61266](https://github.com/ClickHouse/ClickHouse/pull/61266) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Free memory earlier in inserts [#61267](https://github.com/ClickHouse/ClickHouse/pull/61267) ([Anton Popov](https://github.com/CurtizJ)).
+* Fixing test_build_sets_from_multiple_threads/test.py::test_set [#61286](https://github.com/ClickHouse/ClickHouse/pull/61286) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Analyzer: Fix virtual columns in StorageMerge [#61298](https://github.com/ClickHouse/ClickHouse/pull/61298) ([Dmitry Novik](https://github.com/novikd)).
+* Fix 01952_optimize_distributed_group_by_sharding_key with analyzer. [#61301](https://github.com/ClickHouse/ClickHouse/pull/61301) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* fix data race in poco tcp server [#61309](https://github.com/ClickHouse/ClickHouse/pull/61309) ([Sema Checherinda](https://github.com/CheSema)).
+* Don't use default cluster in test test_distibuted_settings [#61314](https://github.com/ClickHouse/ClickHouse/pull/61314) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix false positive assertion in cache [#61319](https://github.com/ClickHouse/ClickHouse/pull/61319) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix test test_input_format_parallel_parsing_memory_tracking [#61322](https://github.com/ClickHouse/ClickHouse/pull/61322) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix 01761_cast_to_enum_nullable with analyzer. [#61323](https://github.com/ClickHouse/ClickHouse/pull/61323) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Add zookeeper retries for exists check in forcefullyRemoveBrokenOutdatedPartFromZooKeeper [#61324](https://github.com/ClickHouse/ClickHouse/pull/61324) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Minor changes in stress and fuzzer reports [#61333](https://github.com/ClickHouse/ClickHouse/pull/61333) ([Raúl Marín](https://github.com/Algunenano)).
+* Un-flake `test_undrop_query` [#61348](https://github.com/ClickHouse/ClickHouse/pull/61348) ([Robert Schulze](https://github.com/rschu1ze)).
+* Tiny improvement for replication.lib [#61361](https://github.com/ClickHouse/ClickHouse/pull/61361) ([alesapin](https://github.com/alesapin)).
+* Fix bugfix check (due to "unknown object storage type: azure") [#61363](https://github.com/ClickHouse/ClickHouse/pull/61363) ([Azat Khuzhin](https://github.com/azat)).
+* Fix `01599_multiline_input_and_singleline_comments` 3 minute wait [#61371](https://github.com/ClickHouse/ClickHouse/pull/61371) ([Sergei Trifonov](https://github.com/serxa)).
+* Terminate EC2 on spot event if runner isn't running [#61377](https://github.com/ClickHouse/ClickHouse/pull/61377) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Try fix docs check [#61378](https://github.com/ClickHouse/ClickHouse/pull/61378) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Fix `heap-use-after-free` for Merge table with alias [#61380](https://github.com/ClickHouse/ClickHouse/pull/61380) ([Antonio Andelic](https://github.com/antonio2368)).
+* Disable `optimize_rewrite_sum_if_to_count_if` if return type is nullable (new analyzer) [#61389](https://github.com/ClickHouse/ClickHouse/pull/61389) ([Antonio Andelic](https://github.com/antonio2368)).
+* Analyzer: Fix planner context for subquery in StorageMerge [#61392](https://github.com/ClickHouse/ClickHouse/pull/61392) ([Dmitry Novik](https://github.com/novikd)).
+* Fix `test_failed_async_inserts` [#61394](https://github.com/ClickHouse/ClickHouse/pull/61394) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Fix test test_system_clusters_actual_information flakiness [#61395](https://github.com/ClickHouse/ClickHouse/pull/61395) ([Kruglov Pavel](https://github.com/Avogar)).
+* Remove default cluster from default config from test config [#61396](https://github.com/ClickHouse/ClickHouse/pull/61396) ([Raúl Marín](https://github.com/Algunenano)).
+* Enable clang-tidy in headers [#61406](https://github.com/ClickHouse/ClickHouse/pull/61406) ([Robert Schulze](https://github.com/rschu1ze)).
+* Add sanity check for poll_max_batch_size FileLog setting [#61408](https://github.com/ClickHouse/ClickHouse/pull/61408) ([Kruglov Pavel](https://github.com/Avogar)).
+* ThreadFuzzer: randomize sleep time [#61410](https://github.com/ClickHouse/ClickHouse/pull/61410) ([Tomer Shafir](https://github.com/tomershafir)).
+* Update version_date.tsv and changelogs after v23.8.11.28-lts [#61416](https://github.com/ClickHouse/ClickHouse/pull/61416) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.3.21.26-lts [#61418](https://github.com/ClickHouse/ClickHouse/pull/61418) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v24.1.7.18-stable [#61419](https://github.com/ClickHouse/ClickHouse/pull/61419) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v24.2.2.71-stable [#61420](https://github.com/ClickHouse/ClickHouse/pull/61420) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.12.5.81-stable [#61421](https://github.com/ClickHouse/ClickHouse/pull/61421) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Restore automerge for approved PRs [#61433](https://github.com/ClickHouse/ClickHouse/pull/61433) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Disable broken SonarCloud [#61434](https://github.com/ClickHouse/ClickHouse/pull/61434) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Fix `01599_multiline_input_and_singleline_comments` properly [#61440](https://github.com/ClickHouse/ClickHouse/pull/61440) ([Sergei Trifonov](https://github.com/serxa)).
+* Convert test 02998_system_dns_cache_table to smoke and mirrors [#61443](https://github.com/ClickHouse/ClickHouse/pull/61443) ([vdimir](https://github.com/vdimir)).
+* Check boundaries for some settings in parallel replicas [#61455](https://github.com/ClickHouse/ClickHouse/pull/61455) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Use SHARD_LOAD_QUEUE_BACKLOG for dictionaries in tests [#61462](https://github.com/ClickHouse/ClickHouse/pull/61462) ([vdimir](https://github.com/vdimir)).
+* Split `02125_lz4_compression_bug` [#61465](https://github.com/ClickHouse/ClickHouse/pull/61465) ([Antonio Andelic](https://github.com/antonio2368)).
+* Correctly process last stacktrace in `postprocess-traces.pl` [#61470](https://github.com/ClickHouse/ClickHouse/pull/61470) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix test `test_polymorphic_parts` [#61477](https://github.com/ClickHouse/ClickHouse/pull/61477) ([Anton Popov](https://github.com/CurtizJ)).
+* A definitive guide to CAST [#61491](https://github.com/ClickHouse/ClickHouse/pull/61491) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Minor rename in FileCache [#61494](https://github.com/ClickHouse/ClickHouse/pull/61494) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Remove useless code [#61498](https://github.com/ClickHouse/ClickHouse/pull/61498) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix fuzzers [#61499](https://github.com/ClickHouse/ClickHouse/pull/61499) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update jdbc.md [#61506](https://github.com/ClickHouse/ClickHouse/pull/61506) ([San](https://github.com/santrancisco)).
+* Fix error in clickhouse-client [#61507](https://github.com/ClickHouse/ClickHouse/pull/61507) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix clang-tidy build [#61519](https://github.com/ClickHouse/ClickHouse/pull/61519) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix infinite loop in function `hop` [#61523](https://github.com/ClickHouse/ClickHouse/pull/61523) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Improve tests 00159_parallel_formatting_* to to avoid timeouts [#61532](https://github.com/ClickHouse/ClickHouse/pull/61532) ([Kruglov Pavel](https://github.com/Avogar)).
+* Refactoring of reading from compact parts [#61535](https://github.com/ClickHouse/ClickHouse/pull/61535) ([Anton Popov](https://github.com/CurtizJ)).
+* Don't run 01459_manual_write_to_replicas in debug build as it's too slow [#61538](https://github.com/ClickHouse/ClickHouse/pull/61538) ([Kruglov Pavel](https://github.com/Avogar)).
+* CI: ARM integration test - skip hdfs, kerberos, kafka [#61542](https://github.com/ClickHouse/ClickHouse/pull/61542) ([Max K.](https://github.com/maxknv)).
+* More logging for loading of tables [#61546](https://github.com/ClickHouse/ClickHouse/pull/61546) ([Sergei Trifonov](https://github.com/serxa)).
+* Fixing 01584_distributed_buffer_cannot_find_column with analyzer. [#61550](https://github.com/ClickHouse/ClickHouse/pull/61550) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Wait for done mutation with more logs and asserts [#61554](https://github.com/ClickHouse/ClickHouse/pull/61554) ([alesapin](https://github.com/alesapin)).
+* Fix read_rows count with external group by [#61555](https://github.com/ClickHouse/ClickHouse/pull/61555) ([Alexander Tokmakov](https://github.com/tavplubix)).
+* queries-file should be used to specify file [#61557](https://github.com/ClickHouse/ClickHouse/pull/61557) ([danila-ermakov](https://github.com/danila-ermakov)).
+* Fix `02481_async_insert_dedup_token` [#61568](https://github.com/ClickHouse/ClickHouse/pull/61568) ([Antonio Andelic](https://github.com/antonio2368)).
+* Add a comment after [#61458](https://github.com/ClickHouse/ClickHouse/issues/61458) [#61580](https://github.com/ClickHouse/ClickHouse/pull/61580) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix clickhouse-test client option and CLICKHOUSE_URL_PARAMS interference [#61596](https://github.com/ClickHouse/ClickHouse/pull/61596) ([vdimir](https://github.com/vdimir)).
+* CI: remove compose files from integration test docker [#61597](https://github.com/ClickHouse/ClickHouse/pull/61597) ([Max K.](https://github.com/maxknv)).
+* Fix 01244_optimize_distributed_group_by_sharding_key by ordering output [#61602](https://github.com/ClickHouse/ClickHouse/pull/61602) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Remove some tests from analyzer_tech_debt [#61603](https://github.com/ClickHouse/ClickHouse/pull/61603) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Reduce header dependencies [#61604](https://github.com/ClickHouse/ClickHouse/pull/61604) ([Raúl Marín](https://github.com/Algunenano)).
+* Remove some magic_enum from headers [#61606](https://github.com/ClickHouse/ClickHouse/pull/61606) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix configs for upgrade and bugfix [#61607](https://github.com/ClickHouse/ClickHouse/pull/61607) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Add tests for multiple fuzzer issues [#61614](https://github.com/ClickHouse/ClickHouse/pull/61614) ([Raúl Marín](https://github.com/Algunenano)).
+* Try to fix `02908_many_requests_to_system_replicas` again [#61616](https://github.com/ClickHouse/ClickHouse/pull/61616) ([Nikita Taranov](https://github.com/nickitat)).
+* Verbose error message about analyzer_compatibility_join_using_top_level_identifier [#61631](https://github.com/ClickHouse/ClickHouse/pull/61631) ([vdimir](https://github.com/vdimir)).
+* Fix 00223_shard_distributed_aggregation_memory_efficient with analyzer [#61649](https://github.com/ClickHouse/ClickHouse/pull/61649) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Better fuzzer logs [#61650](https://github.com/ClickHouse/ClickHouse/pull/61650) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix flaky `02122_parallel_formatting_Template` [#61651](https://github.com/ClickHouse/ClickHouse/pull/61651) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix Aggregator when data is empty [#61654](https://github.com/ClickHouse/ClickHouse/pull/61654) ([Antonio Andelic](https://github.com/antonio2368)).
+* Restore poco SUN files [#61655](https://github.com/ClickHouse/ClickHouse/pull/61655) ([Andy Fiddaman](https://github.com/citrus-it)).
+* Another fix for `SumIfToCountIfPass` [#61656](https://github.com/ClickHouse/ClickHouse/pull/61656) ([Antonio Andelic](https://github.com/antonio2368)).
+* Keeper: fix data race during snapshot destructor call [#61657](https://github.com/ClickHouse/ClickHouse/pull/61657) ([Antonio Andelic](https://github.com/antonio2368)).
+* CI: integration tests: use runner as py module [#61658](https://github.com/ClickHouse/ClickHouse/pull/61658) ([Max K.](https://github.com/maxknv)).
+* Fix logging of autoscaling lambda, add test for effective_capacity [#61662](https://github.com/ClickHouse/ClickHouse/pull/61662) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Small change in `DatabaseOnDisk::iterateMetadataFiles()` [#61664](https://github.com/ClickHouse/ClickHouse/pull/61664) ([Nikita Taranov](https://github.com/nickitat)).
+* Build improvements by removing magic enum from header and apply some explicit template instantiation [#61665](https://github.com/ClickHouse/ClickHouse/pull/61665) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* Update the dictionary for OSSFuzz [#61672](https://github.com/ClickHouse/ClickHouse/pull/61672) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* Inhibit randomization in some tests and exclude some long tests from debug runs [#61676](https://github.com/ClickHouse/ClickHouse/pull/61676) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Add a test for [#61669](https://github.com/ClickHouse/ClickHouse/issues/61669) [#61678](https://github.com/ClickHouse/ClickHouse/pull/61678) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix use-of-uninitialized-value in HedgedConnections [#61679](https://github.com/ClickHouse/ClickHouse/pull/61679) ([Nikolay Degterinsky](https://github.com/evillique)).
+* Remove clickhouse-diagnostics from the package [#61681](https://github.com/ClickHouse/ClickHouse/pull/61681) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix use-of-uninitialized-value in parseDateTimeBestEffort [#61694](https://github.com/ClickHouse/ClickHouse/pull/61694) ([Nikolay Degterinsky](https://github.com/evillique)).
+* poco foundation: add illumos support [#61701](https://github.com/ClickHouse/ClickHouse/pull/61701) ([Andy Fiddaman](https://github.com/citrus-it)).
+* contrib/c-ares: add illumos as a platform [#61702](https://github.com/ClickHouse/ClickHouse/pull/61702) ([Andy Fiddaman](https://github.com/citrus-it)).
+* contrib/curl: Add illumos support [#61704](https://github.com/ClickHouse/ClickHouse/pull/61704) ([Andy Fiddaman](https://github.com/citrus-it)).
+* Fuzzer: Try a different way to wait for the server [#61706](https://github.com/ClickHouse/ClickHouse/pull/61706) ([Raúl Marín](https://github.com/Algunenano)).
+* Disable some tests for SMT [#61708](https://github.com/ClickHouse/ClickHouse/pull/61708) ([Raúl Marín](https://github.com/Algunenano)).
+* Fix signal handler for sanitizer signals [#61709](https://github.com/ClickHouse/ClickHouse/pull/61709) ([Antonio Andelic](https://github.com/antonio2368)).
+* Avoid `IsADirectoryError: Is a directory contrib/azure` [#61710](https://github.com/ClickHouse/ClickHouse/pull/61710) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Analyzer: fix group_by_use_nulls [#61717](https://github.com/ClickHouse/ClickHouse/pull/61717) ([Dmitry Novik](https://github.com/novikd)).
+* Analyzer: Clear list of broken integration tests [#61718](https://github.com/ClickHouse/ClickHouse/pull/61718) ([Dmitry Novik](https://github.com/novikd)).
+* CI: modify CI from PR body [#61725](https://github.com/ClickHouse/ClickHouse/pull/61725) ([Max K.](https://github.com/maxknv)).
+* Add test for [#57820](https://github.com/ClickHouse/ClickHouse/issues/57820) [#61726](https://github.com/ClickHouse/ClickHouse/pull/61726) ([Dmitry Novik](https://github.com/novikd)).
+* Revert "Revert "Un-flake test_undrop_query"" [#61727](https://github.com/ClickHouse/ClickHouse/pull/61727) ([Yarik Briukhovetskyi](https://github.com/yariks5s)).
+* FunctionsConversion: Start simplifying templates [#61733](https://github.com/ClickHouse/ClickHouse/pull/61733) ([Raúl Marín](https://github.com/Algunenano)).
+* CI: modify it [#61735](https://github.com/ClickHouse/ClickHouse/pull/61735) ([Max K.](https://github.com/maxknv)).
+* Fix segfault in SquashingTransform [#61736](https://github.com/ClickHouse/ClickHouse/pull/61736) ([Michael Kolupaev](https://github.com/al13n321)).
+* Fix DWARF format failing to skip DW_FORM_strx3 attributes [#61737](https://github.com/ClickHouse/ClickHouse/pull/61737) ([Michael Kolupaev](https://github.com/al13n321)).
+* There is no such thing as broken tests [#61739](https://github.com/ClickHouse/ClickHouse/pull/61739) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Process removed files, decouple _check_mime [#61751](https://github.com/ClickHouse/ClickHouse/pull/61751) ([Mikhail f. Shiryaev](https://github.com/Felixoid)).
+* Keeper fix: destroy `KeeperDispatcher` first [#61752](https://github.com/ClickHouse/ClickHouse/pull/61752) ([Antonio Andelic](https://github.com/antonio2368)).
+* Fix flaky `03014_async_with_dedup_part_log_rmt` [#61757](https://github.com/ClickHouse/ClickHouse/pull/61757) ([Antonio Andelic](https://github.com/antonio2368)).
+* FunctionsConversion: Remove another batch of bad templates [#61773](https://github.com/ClickHouse/ClickHouse/pull/61773) ([Raúl Marín](https://github.com/Algunenano)).
+* Revert "Fix bug when reading system.parts using UUID (issue 61220)." [#61774](https://github.com/ClickHouse/ClickHouse/pull/61774) ([János Benjamin Antal](https://github.com/antaljanosbenjamin)).
+* CI: disable grpc tests on ARM [#61778](https://github.com/ClickHouse/ClickHouse/pull/61778) ([Max K.](https://github.com/maxknv)).
+* Fix more tests with virtual columns in StorageMerge. [#61787](https://github.com/ClickHouse/ClickHouse/pull/61787) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Remove already not flaky tests with analyzer. [#61788](https://github.com/ClickHouse/ClickHouse/pull/61788) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Analyzer: Fix assert in JOIN with Distributed table [#61789](https://github.com/ClickHouse/ClickHouse/pull/61789) ([vdimir](https://github.com/vdimir)).
+* A test can be slow in debug build [#61796](https://github.com/ClickHouse/ClickHouse/pull/61796) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Updated clang-19 to master. [#61798](https://github.com/ClickHouse/ClickHouse/pull/61798) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Fix test "00002_log_and_exception_messages_formatting" [#61821](https://github.com/ClickHouse/ClickHouse/pull/61821) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* A test is too slow for debug [#61822](https://github.com/ClickHouse/ClickHouse/pull/61822) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove DataStreams [#61824](https://github.com/ClickHouse/ClickHouse/pull/61824) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Better message for logging errors [#61827](https://github.com/ClickHouse/ClickHouse/pull/61827) ([Azat Khuzhin](https://github.com/azat)).
+* Fix sanitizers suppressions [#61828](https://github.com/ClickHouse/ClickHouse/pull/61828) ([Azat Khuzhin](https://github.com/azat)).
+* Remove unused code [#61830](https://github.com/ClickHouse/ClickHouse/pull/61830) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Remove DataStreams (2) [#61831](https://github.com/ClickHouse/ClickHouse/pull/61831) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update xxhash to v0.8.2 [#61838](https://github.com/ClickHouse/ClickHouse/pull/61838) ([Shubham Ranjan](https://github.com/shubhamranjan)).
+* Fix: DISTINCT in subquery with analyzer [#61847](https://github.com/ClickHouse/ClickHouse/pull/61847) ([Igor Nikonov](https://github.com/devcrafter)).
+* Analyzer: fix limit/offset on shards [#61849](https://github.com/ClickHouse/ClickHouse/pull/61849) ([Yakov Olkhovskiy](https://github.com/yakov-olkhovskiy)).
+* Remove PoolBase::AllocateNewBypassingPool [#61866](https://github.com/ClickHouse/ClickHouse/pull/61866) ([Azat Khuzhin](https://github.com/azat)).
+* Try to fix 02901_parallel_replicas_rollup with analyzer. [#61875](https://github.com/ClickHouse/ClickHouse/pull/61875) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Add test for  [#57808](https://github.com/ClickHouse/ClickHouse/issues/57808) [#61879](https://github.com/ClickHouse/ClickHouse/pull/61879) ([Nikita Mikhaylov](https://github.com/nikitamikhaylov)).
+* CI: merge queue support [#61881](https://github.com/ClickHouse/ClickHouse/pull/61881) ([Max K.](https://github.com/maxknv)).
+* Update create.sql [#61885](https://github.com/ClickHouse/ClickHouse/pull/61885) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* no smaller unit in date_trunc [#61888](https://github.com/ClickHouse/ClickHouse/pull/61888) ([jsc0218](https://github.com/jsc0218)).
+* Move KQL trash where it is supposed to be [#61903](https://github.com/ClickHouse/ClickHouse/pull/61903) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Changelog for 24.3 [#61909](https://github.com/ClickHouse/ClickHouse/pull/61909) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v23.3.22.3-lts [#61914](https://github.com/ClickHouse/ClickHouse/pull/61914) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v23.8.12.13-lts [#61915](https://github.com/ClickHouse/ClickHouse/pull/61915) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* No "please" [#61916](https://github.com/ClickHouse/ClickHouse/pull/61916) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+* Update version_date.tsv and changelogs after v23.12.6.19-stable [#61917](https://github.com/ClickHouse/ClickHouse/pull/61917) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Update version_date.tsv and changelogs after v24.1.8.22-stable [#61918](https://github.com/ClickHouse/ClickHouse/pull/61918) ([robot-clickhouse](https://github.com/robot-clickhouse)).
+* Fix flaky test_broken_projestions/test.py::test_broken_ignored_replic… [#61932](https://github.com/ClickHouse/ClickHouse/pull/61932) ([Kseniia Sumarokova](https://github.com/kssenii)).
+* Check is Rust avaiable for build, if not, suggest a way to disable Rust support [#61938](https://github.com/ClickHouse/ClickHouse/pull/61938) ([Azat Khuzhin](https://github.com/azat)).
+* CI: new ci menu in PR body [#61948](https://github.com/ClickHouse/ClickHouse/pull/61948) ([Max K.](https://github.com/maxknv)).
+* Remove flaky test `01193_metadata_loading` [#61961](https://github.com/ClickHouse/ClickHouse/pull/61961) ([Nikita Taranov](https://github.com/nickitat)).
+
+#### Packaging Improvement
+
+* Adding the `--now` option to enable and start service automatically when installing the database server completely. [#60656](https://github.com/ClickHouse/ClickHouse/pull/60656) ([Chun-Sheng, Li](https://github.com/peter279k)).
+
diff --git a/docs/changelogs/v24.3.2.23-lts.md b/docs/changelogs/v24.3.2.23-lts.md
new file mode 100644
index 00000000000..4d59a1cedf6
--- /dev/null
+++ b/docs/changelogs/v24.3.2.23-lts.md
@@ -0,0 +1,29 @@
+---
+sidebar_position: 1
+sidebar_label: 2024
+---
+
+# 2024 Changelog
+
+### ClickHouse release v24.3.2.23-lts (8b7d910960c) FIXME as compared to v24.3.1.2672-lts (2c5c589a882)
+
+#### Bug Fix (user-visible misbehavior in an official stable release)
+
+* Fix logical error in group_by_use_nulls + grouping set + analyzer + materialize/constant [#61567](https://github.com/ClickHouse/ClickHouse/pull/61567) ([Kruglov Pavel](https://github.com/Avogar)).
+* Fix external table cannot parse data type Bool [#62115](https://github.com/ClickHouse/ClickHouse/pull/62115) ([Duc Canh Le](https://github.com/canhld94)).
+* Revert "Merge pull request [#61564](https://github.com/ClickHouse/ClickHouse/issues/61564) from liuneng1994/optimize_in_single_value" [#62135](https://github.com/ClickHouse/ClickHouse/pull/62135) ([Raúl Marín](https://github.com/Algunenano)).
+
+#### CI Fix or Improvement (changelog entry is not required)
+
+* Backported in [#62030](https://github.com/ClickHouse/ClickHouse/issues/62030):. [#61869](https://github.com/ClickHouse/ClickHouse/pull/61869) ([Nikita Fomichev](https://github.com/fm4v)).
+* Backported in [#62057](https://github.com/ClickHouse/ClickHouse/issues/62057): ... [#62044](https://github.com/ClickHouse/ClickHouse/pull/62044) ([Max K.](https://github.com/maxknv)).
+* Backported in [#62204](https://github.com/ClickHouse/ClickHouse/issues/62204):. [#62190](https://github.com/ClickHouse/ClickHouse/pull/62190) ([Konstantin Bogdanov](https://github.com/thevar1able)).
+
+#### NOT FOR CHANGELOG / INSIGNIFICANT
+
+* Fix some crashes with analyzer and group_by_use_nulls. [#61933](https://github.com/ClickHouse/ClickHouse/pull/61933) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix scalars create as select [#61998](https://github.com/ClickHouse/ClickHouse/pull/61998) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Ignore IfChainToMultiIfPass if returned type changed. [#62059](https://github.com/ClickHouse/ClickHouse/pull/62059) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Fix type for ConvertInToEqualPass [#62066](https://github.com/ClickHouse/ClickHouse/pull/62066) ([Nikolai Kochetov](https://github.com/KochetovNicolai)).
+* Revert output Pretty in tty [#62090](https://github.com/ClickHouse/ClickHouse/pull/62090) ([Alexey Milovidov](https://github.com/alexey-milovidov)).
+
diff --git a/docs/en/development/architecture.md b/docs/en/development/architecture.md
index cfdd2bbcc41..6428c0e90d5 100644
--- a/docs/en/development/architecture.md
+++ b/docs/en/development/architecture.md
@@ -166,11 +166,11 @@ For most external applications, we recommend using the HTTP interface because it
 
 ## Configuration {#configuration}
 
-ClickHouse Server is based on POCO C++ Libraries and uses `Poco::Util::AbstractConfiguration` to represent it's configuration. Configuration is held by `Poco::Util::ServerApplication` class inherited by `DaemonBase` class, which in turn is inherited by `DB::Server` class, implementing clickhouse-server itself. So config can be accessed by `ServerApplication::config()` method.
+ClickHouse Server is based on POCO C++ Libraries and uses `Poco::Util::AbstractConfiguration` to represent its configuration. Configuration is held by `Poco::Util::ServerApplication` class inherited by `DaemonBase` class, which in turn is inherited by `DB::Server` class, implementing clickhouse-server itself. So config can be accessed by `ServerApplication::config()` method.
 
 Config is read from multiple files (in XML or YAML format) and merged into single `AbstractConfiguration` by `ConfigProcessor` class. Configuration is loaded at server startup and can be reloaded later if one of config files is updated, removed or added. `ConfigReloader` class is responsible for periodic monitoring of these changes and reload procedure as well. `SYSTEM RELOAD CONFIG` query also triggers config to be reloaded.
 
-For queries and subsystems other than `Server` config is accessible using `Context::getConfigRef()` method. Every subsystem that is capable of reloading it's config without server restart should register itself in reload callback in `Server::main()` method. Note that if newer config has an error, most subsystems will ignore new config, log warning messages and keep working with previously loaded config. Due to the nature of `AbstractConfiguration` it is not possible to pass reference to specific section, so `String config_prefix` is usually used instead.
+For queries and subsystems other than `Server` config is accessible using `Context::getConfigRef()` method. Every subsystem that is capable of reloading its config without server restart should register itself in reload callback in `Server::main()` method. Note that if newer config has an error, most subsystems will ignore new config, log warning messages and keep working with previously loaded config. Due to the nature of `AbstractConfiguration` it is not possible to pass reference to specific section, so `String config_prefix` is usually used instead.
 
 ## Threads and jobs {#threads-and-jobs}
 
@@ -255,7 +255,7 @@ When we are going to read something from a part in `MergeTree`, we look at `prim
 
 When you `INSERT` a bunch of data into `MergeTree`, that bunch is sorted by primary key order and forms a new part. There are background threads that periodically select some parts and merge them into a single sorted part to keep the number of parts relatively low. That’s why it is called `MergeTree`. Of course, merging leads to “write amplification�. All parts are immutable: they are only created and deleted, but not modified. When SELECT is executed, it holds a snapshot of the table (a set of parts). After merging, we also keep old parts for some time to make a recovery after failure easier, so if we see that some merged part is probably broken, we can replace it with its source parts.
 
-`MergeTree` is not an LSM tree because it does not contain MEMTABLE and LOG: inserted data is written directly to the filesystem. This behavior makes MergeTree much more suitable to insert data in batches. Therefore frequently inserting small amounts of rows is not ideal for MergeTree. For example, a couple of rows per second is OK, but doing it a thousand times a second is not optimal for MergeTree. However, there is an async insert mode for small inserts to overcome this limitation. We did it this way for simplicity’s sake, and because we are already inserting data in batches in our applications
+`MergeTree` is not an LSM tree because it does not contain MEMTABLE and LOG: inserted data is written directly to the filesystem. This behavior makes MergeTree much more suitable to insert data in batches. Therefore, frequently inserting small amounts of rows is not ideal for MergeTree. For example, a couple of rows per second is OK, but doing it a thousand times a second is not optimal for MergeTree. However, there is an async insert mode for small inserts to overcome this limitation. We did it this way for simplicity’s sake, and because we are already inserting data in batches in our applications
 
 There are MergeTree engines that are doing additional work during background merges. Examples are `CollapsingMergeTree` and `AggregatingMergeTree`. This could be treated as special support for updates. Keep in mind that these are not real updates because users usually have no control over the time when background merges are executed, and data in a `MergeTree` table is almost always stored in more than one part, not in completely merged form.
 
@@ -276,5 +276,3 @@ Besides, each replica stores its state in ZooKeeper as the set of parts and its
 :::note
 The ClickHouse cluster consists of independent shards, and each shard consists of replicas. The cluster is **not elastic**, so after adding a new shard, data is not rebalanced between shards automatically. Instead, the cluster load is supposed to be adjusted to be uneven. This implementation gives you more control, and it is ok for relatively small clusters, such as tens of nodes. But for clusters with hundreds of nodes that we are using in production, this approach becomes a significant drawback. We should implement a table engine that spans across the cluster with dynamically replicated regions that could be split and balanced between clusters automatically.
 :::
-
-[Original article](https://clickhouse.com/docs/en/development/architecture/)
diff --git a/docs/en/development/build-cross-s390x.md b/docs/en/development/build-cross-s390x.md
index b7cda515d77..a4a83c7989b 100644
--- a/docs/en/development/build-cross-s390x.md
+++ b/docs/en/development/build-cross-s390x.md
@@ -38,7 +38,7 @@ ninja
 
 ## Running
 
-Once built, the binary can be run with, eg.:
+Once built, the binary can be run with, e.g.:
 
 ```bash
 qemu-s390x-static -L /usr/s390x-linux-gnu ./clickhouse
diff --git a/docs/en/development/build-osx.md b/docs/en/development/build-osx.md
index 39ccc9a78c3..a6c49f1f476 100644
--- a/docs/en/development/build-osx.md
+++ b/docs/en/development/build-osx.md
@@ -37,7 +37,7 @@ sudo xcode-select --install
 
 ``` bash
 brew update
-brew install ccache cmake ninja libtool gettext llvm gcc binutils grep findutils
+brew install ccache cmake ninja libtool gettext llvm gcc binutils grep findutils nasm
 ```
 
 ## Checkout ClickHouse Sources {#checkout-clickhouse-sources}
@@ -55,9 +55,7 @@ To build using Homebrew's vanilla Clang compiler (the only **recommended** way):
 cd ClickHouse
 mkdir build
 export PATH=$(brew --prefix llvm)/bin:$PATH
-export CC=$(brew --prefix llvm)/bin/clang
-export CXX=$(brew --prefix llvm)/bin/clang++
-cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -S . -B build
+cmake -G Ninja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ -S . -B build
 cmake --build build
 # The resulting binary will be created at: build/programs/clickhouse
 ```
diff --git a/docs/en/development/build.md b/docs/en/development/build.md
index b474c445604..5cbf851b785 100644
--- a/docs/en/development/build.md
+++ b/docs/en/development/build.md
@@ -14,20 +14,6 @@ Supported platforms:
 - PowerPC 64 LE (experimental)
 - RISC-V 64 (experimental)
 
-## Building in docker
-We use the docker image `clickhouse/binary-builder` for our CI builds. It contains everything necessary to build the binary and packages. There is a script `docker/packager/packager` to ease the image usage:
-
-```bash
-# define a directory for the output artifacts
-output_dir="build_results"
-# a simplest build
-./docker/packager/packager --package-type=binary --output-dir "$output_dir"
-# build debian packages
-./docker/packager/packager --package-type=deb --output-dir "$output_dir"
-# by default, debian packages use thin LTO, so we can override it to speed up the build
-CMAKE_FLAGS='-DENABLE_THINLTO=' ./docker/packager/packager --package-type=deb --output-dir "./$(git rev-parse --show-cdup)/build_results"
-```
-
 ## Building on Ubuntu
 
 The following tutorial is based on Ubuntu Linux.
@@ -37,6 +23,7 @@ The minimum recommended Ubuntu version for development is 22.04 LTS.
 ### Install Prerequisites {#install-prerequisites}
 
 ``` bash
+sudo apt-get update
 sudo apt-get install git cmake ccache python3 ninja-build nasm yasm gawk lsb-release wget software-properties-common gnupg
 ```
 
@@ -57,7 +44,7 @@ sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 
 For other Linux distributions - check the availability of LLVM's [prebuild packages](https://releases.llvm.org/download.html).
 
-As of August 2023, clang-16 or higher will work.
+As of March 2024, clang-17 or higher will work.
 GCC as a compiler is not supported.
 To build with a specific Clang version:
 
@@ -67,8 +54,8 @@ to see what version you have installed before setting this environment variable.
 :::
 
 ``` bash
-export CC=clang-17
-export CXX=clang++-17
+export CC=clang-18
+export CXX=clang++-18
 ```
 
 ### Checkout ClickHouse Sources {#checkout-clickhouse-sources}
@@ -133,3 +120,17 @@ mkdir build
 cmake -S . -B build
 cmake --build build
 ```
+
+## Building in docker
+We use the docker image `clickhouse/binary-builder` for our CI builds. It contains everything necessary to build the binary and packages. There is a script `docker/packager/packager` to ease the image usage:
+
+```bash
+# define a directory for the output artifacts
+output_dir="build_results"
+# a simplest build
+./docker/packager/packager --package-type=binary --output-dir "$output_dir"
+# build debian packages
+./docker/packager/packager --package-type=deb --output-dir "$output_dir"
+# by default, debian packages use thin LTO, so we can override it to speed up the build
+CMAKE_FLAGS='-DENABLE_THINLTO=' ./docker/packager/packager --package-type=deb --output-dir "./$(git rev-parse --show-cdup)/build_results"
+```
diff --git a/docs/en/development/building_and_benchmarking_deflate_qpl.md b/docs/en/development/building_and_benchmarking_deflate_qpl.md
index 4e01b41ab3c..b9d39b8cc2d 100644
--- a/docs/en/development/building_and_benchmarking_deflate_qpl.md
+++ b/docs/en/development/building_and_benchmarking_deflate_qpl.md
@@ -95,7 +95,7 @@ Complete below three steps mentioned in [Star Schema Benchmark](https://clickhou
 - 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
+Set up database with IAA Deflate codec
 
 ``` bash
 $ cd ./database_dir/deflate
@@ -104,7 +104,7 @@ $ [CLICKHOUSE_EXE] client
 ```
 Complete three steps same as lz4 above
 
-Set up database with with ZSTD codec
+Set up database with ZSTD codec
 
 ``` bash
 $ cd ./database_dir/zstd
diff --git a/docs/en/development/contrib.md b/docs/en/development/contrib.md
index 4b296c43db4..bbc5fbeebcb 100644
--- a/docs/en/development/contrib.md
+++ b/docs/en/development/contrib.md
@@ -13,7 +13,7 @@ ClickHouse utilizes third-party libraries for different purposes, e.g., to conne
 SELECT library_name, license_type, license_path FROM system.licenses ORDER BY library_name COLLATE 'en';
 ```
 
-(Note that the listed libraries are the ones located in the `contrib/` directory of the ClickHouse repository. Depending on the build options, some of of the libraries may have not been compiled, and as a result, their functionality may not be available at runtime.
+Note that the listed libraries are the ones located in the `contrib/` directory of the ClickHouse repository. Depending on the build options, some of the libraries may have not been compiled, and as a result, their functionality may not be available at runtime.
 
 [Example](https://play.clickhouse.com/play?user=play#U0VMRUNUIGxpYnJhcnlfbmFtZSwgbGljZW5zZV90eXBlLCBsaWNlbnNlX3BhdGggRlJPTSBzeXN0ZW0ubGljZW5zZXMgT1JERVIgQlkgbGlicmFyeV9uYW1lIENPTExBVEUgJ2VuJw==)
 
diff --git a/docs/en/development/developer-instruction.md b/docs/en/development/developer-instruction.md
index 31346c77949..42c7e5ac295 100644
--- a/docs/en/development/developer-instruction.md
+++ b/docs/en/development/developer-instruction.md
@@ -7,13 +7,13 @@ description: Prerequisites and an overview of how to build ClickHouse
 
 # Getting Started Guide for Building ClickHouse
 
-ClickHouse can be build on Linux, FreeBSD and macOS. If you use Windows, you can still build ClickHouse in a virtual machine running Linux, e.g. [VirtualBox](https://www.virtualbox.org/) with Ubuntu.
+ClickHouse can be built on Linux, FreeBSD and macOS. If you use Windows, you can still build ClickHouse in a virtual machine running Linux, e.g. [VirtualBox](https://www.virtualbox.org/) with Ubuntu.
 
 ClickHouse requires a 64-bit system to compile and run, 32-bit systems do not work.
 
 ## Creating a Repository on GitHub {#creating-a-repository-on-github}
 
-To start developing for ClickHouse you will need a [GitHub](https://www.virtualbox.org/) account. Please also generate a SSH key locally (if you don't have one already) and upload the public key to GitHub as this is a prerequisite for contributing patches.
+To start developing for ClickHouse you will need a [GitHub](https://www.virtualbox.org/) account. Please also generate an SSH key locally (if you don't have one already) and upload the public key to GitHub as this is a prerequisite for contributing patches.
 
 Next, create a fork of the [ClickHouse repository](https://github.com/ClickHouse/ClickHouse/) in your personal account by clicking the "fork" button in the upper right corner.
 
@@ -37,7 +37,7 @@ git clone git@github.com:your_github_username/ClickHouse.git  # replace placehol
 cd ClickHouse
 ```
 
-This command creates a directory `ClickHouse/` containing the source code of ClickHouse. If you specify a custom checkout directory after the URL but it is important that this path does not contain whitespaces as it may lead to problems with the build later on.
+This command creates a directory `ClickHouse/` containing the source code of ClickHouse. If you specify a custom checkout directory after the URL, but it is important that this path does not contain whitespaces as it may lead to problems with the build later on.
 
 The ClickHouse repository uses Git submodules, i.e. references to external repositories (usually 3rd party libraries used by ClickHouse). These are not checked out by default. To do so, you can either
 
@@ -45,7 +45,7 @@ The ClickHouse repository uses Git submodules, i.e. references to external repos
 
 - if `git clone` did not check out submodules, run `git submodule update --init --jobs <N>` (e.g. `<N> = 12` to parallelize the checkout) to achieve the same as the previous alternative, or
 
-- if `git clone` did not check out submodules and you like to use [sparse](https://github.blog/2020-01-17-bring-your-monorepo-down-to-size-with-sparse-checkout/) and [shallow](https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/) submodule checkout to omit unneeded files and history in submodules to save space (ca. 5 GB instead of ca. 15 GB), run `./contrib/update-submodules.sh`. Not really recommended as it generally makes working with submodules less convenient and slower.
+- if `git clone` did not check out submodules, and you like to use [sparse](https://github.blog/2020-01-17-bring-your-monorepo-down-to-size-with-sparse-checkout/) and [shallow](https://github.blog/2020-12-21-get-up-to-speed-with-partial-clone-and-shallow-clone/) submodule checkout to omit unneeded files and history in submodules to save space (ca. 5 GB instead of ca. 15 GB), run `./contrib/update-submodules.sh`. Not really recommended as it generally makes working with submodules less convenient and slower.
 
 You can check the Git status with the command: `git submodule status`.
 
@@ -91,7 +91,7 @@ If you use Arch or Gentoo, you probably know it yourself how to install CMake.
 
 ## C++ Compiler {#c-compiler}
 
-Compilers Clang starting from version 15 is supported for building ClickHouse.
+Compilers Clang starting from version 16 is supported for building ClickHouse.
 
 Clang should be used instead of gcc. Though, our continuous integration (CI) platform runs checks for about a dozen of build combinations.
 
@@ -143,7 +143,7 @@ When a large amount of RAM is available on build machine you should limit the nu
 
 On machines with 4GB of RAM, it is recommended to specify 1, for 8GB of RAM `-j 2` is recommended.
 
-If you get the message: `ninja: error: loading 'build.ninja': No such file or directory`, it means that generating a build configuration has failed and you need to inspect the message above.
+If you get the message: `ninja: error: loading 'build.ninja': No such file or directory`, it means that generating a build configuration has failed, and you need to inspect the message above.
 
 Upon the successful start of the building process, you’ll see the build progress - the number of processed tasks and the total number of tasks.
 
@@ -153,6 +153,26 @@ Upon successful build you get an executable file `ClickHouse/<build_dir>/program
 
     ls -l programs/clickhouse
 
+### Advanced Building Process {#advanced-building-process}
+
+#### Minimal Build {#minimal-build}
+
+If you are not interested in functionality provided by third-party libraries, you can further speed up the build using `cmake` options
+
+```
+cmake -DENABLE_LIBRARIES=OFF
+```
+
+In case of problems with any of the development options, you are on your own!
+
+#### Rust support {#rust-support}
+
+Rust requires internet connection, in case you don't have it, you can disable Rust support:
+
+```
+cmake -DENABLE_RUST=OFF
+```
+
 ## Running the Built Executable of ClickHouse {#running-the-built-executable-of-clickhouse}
 
 To run the server under the current user you need to navigate to `ClickHouse/programs/server/` (located outside of `build`) and run:
@@ -184,7 +204,7 @@ You can also run your custom-built ClickHouse binary with the config file from t
 
 **CLion (recommended)**
 
-If you do not know which IDE to use, we recommend that you use [CLion](https://www.jetbrains.com/clion/). CLion is commercial software but it offers a 30 day free trial. It is also free of charge for students. CLion can be used on both Linux and macOS.
+If you do not know which IDE to use, we recommend that you use [CLion](https://www.jetbrains.com/clion/). CLion is commercial software, but it offers a 30 day free trial. It is also free of charge for students. CLion can be used on both Linux and macOS.
 
 A few things to know when using CLion to develop ClickHouse:
 
@@ -250,10 +270,3 @@ Most probably some of the builds will fail at first times. This is due to the fa
 You can use GitHub integrated code browser [here](https://github.dev/ClickHouse/ClickHouse).
 
 Also, you can browse sources on [GitHub](https://github.com/ClickHouse/ClickHouse) as usual.
-
-If you are not interested in functionality provided by third-party libraries, you can further speed up the build using `cmake` options
-```
--DENABLE_LIBRARIES=0
-```
-
-In case of problems with any of the development options, you are on your own!
diff --git a/docs/en/development/tests.md b/docs/en/development/tests.md
index 1d3e7d4964e..efbce54d44b 100644
--- a/docs/en/development/tests.md
+++ b/docs/en/development/tests.md
@@ -109,6 +109,9 @@ Do not check for a particular wording of error message, it may change in the fut
 
 If you want to use distributed queries in functional tests, you can leverage `remote` table function with `127.0.0.{1..2}` addresses for the server to query itself; or you can use predefined test clusters in server configuration file like `test_shard_localhost`. Remember to add the words `shard` or `distributed` to the test name, so that it is run in CI in correct configurations, where the server is configured to support distributed queries.
 
+### Working with Temporary Files
+
+Sometimes in a shell test you may need to create a file on the fly to work with. Keep in mind that some CI checks run tests in parallel, so if you are creating or removing a temporary file in your script without a unique name this can cause some of the CI checks, such as Flaky, to fail. To get around this you should use environment variable `$CLICKHOUSE_TEST_UNIQUE_NAME` to give temporary files a name unique to the test that is running. That way you can be sure that the file you are creating during setup or removing during cleanup is the file only in use by that test and not some other test which is running in parallel. 
 
 ## Known Bugs {#known-bugs}
 
diff --git a/docs/en/engines/database-engines/mysql.md b/docs/en/engines/database-engines/mysql.md
index 20434ad124e..ac0ea5e5af1 100644
--- a/docs/en/engines/database-engines/mysql.md
+++ b/docs/en/engines/database-engines/mysql.md
@@ -4,7 +4,11 @@ sidebar_position: 50
 sidebar_label: MySQL
 ---
 
-# MySQL
+import CloudNotSupportedBadge from '@theme/badges/CloudNotSupportedBadge';
+
+# MySQL Database Engine
+
+<CloudNotSupportedBadge />
 
 Allows to connect to databases on a remote MySQL server and perform `INSERT` and `SELECT` queries to exchange data between ClickHouse and MySQL.
 
diff --git a/docs/en/engines/database-engines/postgresql.md b/docs/en/engines/database-engines/postgresql.md
index 294d1202bdd..ae323680688 100644
--- a/docs/en/engines/database-engines/postgresql.md
+++ b/docs/en/engines/database-engines/postgresql.md
@@ -10,7 +10,7 @@ Allows to connect to databases on a remote [PostgreSQL](https://www.postgresql.o
 
 Gives the real-time access to table list and table structure from remote PostgreSQL with the help of `SHOW TABLES` and `DESCRIBE TABLE` queries.
 
-Supports table structure modifications (`ALTER TABLE ... ADD|DROP COLUMN`). If `use_table_cache` parameter (see the Engine Parameters below) it set to `1`, the table structure is cached and not checked for being modified, but can be updated with `DETACH` and `ATTACH` queries.
+Supports table structure modifications (`ALTER TABLE ... ADD|DROP COLUMN`). If `use_table_cache` parameter (see the Engine Parameters below) is set to `1`, the table structure is cached and not checked for being modified, but can be updated with `DETACH` and `ATTACH` queries.
 
 ## Creating a Database {#creating-a-database}
 
diff --git a/docs/en/engines/table-engines/integrations/azureBlobStorage.md b/docs/en/engines/table-engines/integrations/azureBlobStorage.md
index c6525121667..0843ff1ac47 100644
--- a/docs/en/engines/table-engines/integrations/azureBlobStorage.md
+++ b/docs/en/engines/table-engines/integrations/azureBlobStorage.md
@@ -19,6 +19,8 @@ CREATE TABLE azure_blob_storage_table (name String, value UInt32)
 
 ### Engine parameters
 
+- `endpoint` — AzureBlobStorage endpoint URL with container & prefix. Optionally can contain account_name if the authentication method used needs it. (http://azurite1:{port}/[account_name]{container_name}/{data_prefix}) or these parameters can be provided separately using storage_account_url, account_name & container. For specifying prefix, endpoint should be used.
+- `endpoint_contains_account_name` - This flag is used to specify if endpoint contains account_name as it is only needed for certain authentication methods. (Default : true)
 - `connection_string|storage_account_url` — connection_string includes account name & key ([Create connection string](https://learn.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string?toc=%2Fazure%2Fstorage%2Fblobs%2Ftoc.json&bc=%2Fazure%2Fstorage%2Fblobs%2Fbreadcrumb%2Ftoc.json#configure-a-connection-string-for-an-azure-storage-account)) or you could also provide the storage account url here and account name & account key as separate parameters (see parameters account_name & account_key)
 - `container_name` - Container name
 - `blobpath` - file path. Supports following wildcards in readonly mode: `*`, `**`, `?`, `{abc,def}` and `{N..M}` where `N`, `M` — numbers, `'abc'`, `'def'` — strings.
diff --git a/docs/en/engines/table-engines/integrations/jdbc.md b/docs/en/engines/table-engines/integrations/jdbc.md
index a4a1e2a31ae..16ed01fecb5 100644
--- a/docs/en/engines/table-engines/integrations/jdbc.md
+++ b/docs/en/engines/table-engines/integrations/jdbc.md
@@ -6,6 +6,11 @@ sidebar_label: JDBC
 
 # JDBC
 
+:::note
+clickhouse-jdbc-bridge contains experimental codes and is no longer supported. It may contain reliability issues and security vulnerabilities. Use it at your own risk. 
+ClickHouse recommend using built-in table functions in ClickHouse which provide a better alternative for ad-hoc querying scenarios (Postgres, MySQL, MongoDB, etc).
+:::
+
 Allows ClickHouse to connect to external databases via [JDBC](https://en.wikipedia.org/wiki/Java_Database_Connectivity).
 
 To implement the JDBC connection, ClickHouse uses the separate program [clickhouse-jdbc-bridge](https://github.com/ClickHouse/clickhouse-jdbc-bridge) that should run as a daemon.
diff --git a/docs/en/engines/table-engines/integrations/mysql.md b/docs/en/engines/table-engines/integrations/mysql.md
index e50ed8caedd..e9d0a43242b 100644
--- a/docs/en/engines/table-engines/integrations/mysql.md
+++ b/docs/en/engines/table-engines/integrations/mysql.md
@@ -4,7 +4,11 @@ sidebar_position: 138
 sidebar_label: MySQL
 ---
 
-# MySQL
+import CloudAvailableBadge from '@theme/badges/CloudAvailableBadge';
+
+# MySQL Table Engine
+
+<CloudAvailableBadge />
 
 The MySQL engine allows you to perform `SELECT` and `INSERT` queries on data that is stored on a remote MySQL server.
 
@@ -16,7 +20,7 @@ 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],
     ...
-) ENGINE = MySQL('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause'])
+) ENGINE = MySQL({host:port, database, table, user, password[, replace_query, on_duplicate_clause] | named_collection[, option=value [,..]]})
 SETTINGS
     [ connection_pool_size=16, ]
     [ connection_max_tries=3, ]
@@ -42,23 +46,17 @@ The MySQL Table Engine is currently not available on the ClickHouse builds for M
 **Engine Parameters**
 
 - `host:port` — MySQL server address.
-
 - `database` — Remote database name.
-
 - `table` — Remote table name.
-
 - `user` — MySQL user.
-
 - `password` — User password.
-
 - `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.
-
     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.
-
     To specify `on_duplicate_clause` you need to pass `0` to the `replace_query` parameter. If you simultaneously pass `replace_query = 1` and `on_duplicate_clause`, ClickHouse generates an exception.
 
+Arguments also can be passed using [named collections](/docs/en/operations/named-collections.md). In this case `host` and `port` should be specified separately. This approach is recommended for production environment.
+
 Simple `WHERE` clauses such as `=, !=, >, >=, <, <=` are executed on the MySQL server.
 
 The rest of the conditions and the `LIMIT` sampling constraint are executed in ClickHouse only after the query to MySQL finishes.
@@ -71,7 +69,7 @@ CREATE TABLE test_replicas (id UInt32, name String, age UInt32, money UInt32) EN
 
 ## Usage Example {#usage-example}
 
-Table in MySQL:
+Create table in MySQL:
 
 ``` text
 mysql> CREATE TABLE `test`.`test` (
@@ -94,7 +92,7 @@ mysql> select * from test;
 1 row in set (0,00 sec)
 ```
 
-Table in ClickHouse, retrieving data from the MySQL table created above:
+Create table in ClickHouse using plain arguments:
 
 ``` sql
 CREATE TABLE mysql_table
@@ -105,6 +103,25 @@ CREATE TABLE mysql_table
 ENGINE = MySQL('localhost:3306', 'test', 'test', 'bayonet', '123')
 ```
 
+Or using [named collections](/docs/en/operations/named-collections.md):
+
+```sql
+CREATE NAMED COLLECTION creds AS
+        host = 'localhost',
+        port = 3306,
+        database = 'test',
+        user = 'bayonet',
+        password = '123';
+CREATE TABLE mysql_table
+(
+    `float_nullable` Nullable(Float32),
+    `int_id` Int32
+)
+ENGINE = MySQL(creds, table='test')
+```
+
+Retrieving data from MySQL table:
+
 ``` sql
 SELECT * FROM mysql_table
 ```
diff --git a/docs/en/engines/table-engines/integrations/nats.md b/docs/en/engines/table-engines/integrations/nats.md
index e898d1f1b82..9f7409a6893 100644
--- a/docs/en/engines/table-engines/integrations/nats.md
+++ b/docs/en/engines/table-engines/integrations/nats.md
@@ -38,6 +38,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
     [nats_username = 'user',]
     [nats_password = 'password',]
     [nats_token = 'clickhouse',]
+    [nats_credential_file = '/var/nats_credentials',]
     [nats_startup_connect_tries = '5']
     [nats_max_rows_per_message = 1,]
     [nats_handle_error_mode = 'default']
@@ -63,6 +64,7 @@ Optional parameters:
 - `nats_username` - NATS username.
 - `nats_password` - NATS password.
 - `nats_token` - NATS auth token.
+- `nats_credential_file` - Path to a NATS credentials file.
 - `nats_startup_connect_tries` - Number of connect tries at startup. Default: `5`.
 - `nats_max_rows_per_message` — The maximum number of rows written in one NATS message for row-based formats. (default : `1`).
 - `nats_handle_error_mode` — How to handle errors for RabbitMQ engine. Possible values: default (the exception will be thrown if we fail to parse a message), stream (the exception message and raw message will be saved in virtual columns `_error` and `_raw_message`).
diff --git a/docs/en/engines/table-engines/integrations/postgresql.md b/docs/en/engines/table-engines/integrations/postgresql.md
index aa3dc855537..9cc4b11243e 100644
--- a/docs/en/engines/table-engines/integrations/postgresql.md
+++ b/docs/en/engines/table-engines/integrations/postgresql.md
@@ -8,6 +8,10 @@ sidebar_label: PostgreSQL
 
 The PostgreSQL engine allows to perform `SELECT` and `INSERT` queries on data that is stored on a remote PostgreSQL server.
 
+:::note
+Currently, only PostgreSQL versions 12 and up are supported.
+:::
+
 ## Creating a Table {#creating-a-table}
 
 ``` sql
@@ -16,7 +20,7 @@ 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],
     ...
-) ENGINE = PostgreSQL('host:port', 'database', 'table', 'user', 'password'[, `schema`]);
+) ENGINE = PostgreSQL({host:port, database, table, user, password[, schema, [, on_conflict]] | named_collection[, option=value [,..]]})
 ```
 
 See a detailed description of the [CREATE TABLE](../../../sql-reference/statements/create/table.md#create-table-query) query.
@@ -35,31 +39,25 @@ The table structure can differ from the original PostgreSQL table structure:
 - `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.
+- `on_conflict` — Conflict resolution strategy. Example: `ON CONFLICT DO NOTHING`. Optional. Note: adding this option will make insertion less efficient.
 
-or via config (since version 21.11):
+[Named collections](/docs/en/operations/named-collections.md) (available since version 21.11) are recommended for production environment. Here is an example:
 
 ```
 <named_collections>
-    <postgres1>
-        <host></host>
-        <port></port>
-        <user></user>
-        <password></password>
-        <table></table>
-    </postgres1>
-    <postgres2>
-        <host></host>
-        <port></port>
-        <user></user>
-        <password></password>
-    </postgres2>
+    <postgres_creds>
+        <host>localhost</host>
+        <port>5432</port>
+        <user>postgres</user>
+        <password>****</password>
+        <schema>schema1</schema>
+    </postgres_creds>
 </named_collections>
 ```
 
 Some parameters can be overridden by key value arguments:
 ``` sql
-SELECT * FROM postgresql(postgres1, schema='schema1', table='table1');
+SELECT * FROM postgresql(postgres_creds, table='table1');
 ```
 
 ## Implementation Details {#implementation-details}
diff --git a/docs/en/engines/table-engines/integrations/rabbitmq.md b/docs/en/engines/table-engines/integrations/rabbitmq.md
index 0f3fef3d6fb..a4d0cf78066 100644
--- a/docs/en/engines/table-engines/integrations/rabbitmq.md
+++ b/docs/en/engines/table-engines/integrations/rabbitmq.md
@@ -18,8 +18,8 @@ This engine allows integrating ClickHouse with [RabbitMQ](https://www.rabbitmq.c
 ``` 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],
+    name2 [type2],
     ...
 ) ENGINE = RabbitMQ SETTINGS
     rabbitmq_host_port = 'host:port' [or rabbitmq_address = 'amqp(s)://guest:guest@localhost/vhost'],
@@ -198,6 +198,10 @@ Additional virtual columns when `kafka_handle_error_mode='stream'`:
 
 Note: `_raw_message` and `_error` virtual columns are filled only in case of exception during parsing, they are always `NULL` when message was parsed successfully.
 
+## Caveats {#caveats}
+
+Even though you may specify [default column expressions](/docs/en/sql-reference/statements/create/table.md/#default_values) (such as `DEFAULT`, `MATERIALIZED`, `ALIAS`) in the table definition, these will be ignored. Instead, the columns will be filled with their respective default values for their types.
+
 ## Data formats support {#data-formats-support}
 
 RabbitMQ engine supports all [formats](../../../interfaces/formats.md) supported in ClickHouse.
diff --git a/docs/en/engines/table-engines/integrations/redis.md b/docs/en/engines/table-engines/integrations/redis.md
index 8086a6503b8..3a07d150835 100644
--- a/docs/en/engines/table-engines/integrations/redis.md
+++ b/docs/en/engines/table-engines/integrations/redis.md
@@ -16,30 +16,32 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name
     name1 [type1],
     name2 [type2],
     ...
-) ENGINE = Redis(host:port[, db_index[, password[, pool_size]]]) PRIMARY KEY(primary_key_name);
+) ENGINE = Redis({host:port[, db_index[, password[, pool_size]]] | named_collection[, option=value [,..]] })
+PRIMARY KEY(primary_key_name);
 ```
 
 **Engine Parameters**
 
 - `host:port` — Redis server address, you can ignore port and default Redis port 6379 will be used.
-
 - `db_index` — Redis db index range from 0 to 15, default is 0.
-
 - `password` — User password, default is blank string.
-
 - `pool_size` — Redis max connection pool size, default is 16.
-
 - `primary_key_name` - any column name in the column list.
 
-- `primary` must be specified, it supports only one column in the primary key. The primary key will be serialized in binary as a Redis key.
+:::note Serialization
+`PRIMARY KEY` supports only one column. The primary key will be serialized in binary as a Redis key.
+Columns other than the primary key will be serialized in binary as Redis value in corresponding order.
+:::
 
-- columns other than the primary key will be serialized in binary as Redis value in corresponding order.
+Arguments also can be passed using [named collections](/docs/en/operations/named-collections.md). In this case `host` and `port` should be specified separately. This approach is recommended for production environment. At this moment, all parameters passed using named collections to redis are required.
 
-- queries with key equals or in filtering will be optimized to multi keys lookup from Redis. If queries without filtering key full table scan will happen which is a heavy operation.
+:::note Filtering
+Queries with `key equals` or `in filtering` will be optimized to multi keys lookup from Redis. If queries without filtering key full table scan will happen which is a heavy operation.
+:::
 
 ## Usage Example {#usage-example}
 
-Create a table in ClickHouse which allows to read data from Redis:
+Create a table in ClickHouse using `Redis` engine with plain arguments:
 
 ``` sql
 CREATE TABLE redis_table
@@ -52,6 +54,31 @@ CREATE TABLE redis_table
 ENGINE = Redis('redis1:6379') PRIMARY KEY(key);
 ```
 
+Or using [named collections](/docs/en/operations/named-collections.md):
+
+```
+<named_collections>
+    <redis_creds>
+        <host>localhost</host>
+        <port>6379</port>
+        <password>****</password>
+        <pool_size>16</pool_size>
+        <db_index>s0</db_index>
+    </redis_creds>
+</named_collections>
+```
+
+```sql
+CREATE TABLE redis_table
+(
+    `key` String,
+    `v1` UInt32,
+    `v2` String,
+    `v3` Float32
+)
+ENGINE = Redis(redis_creds) PRIMARY KEY(key);
+```
+
 Insert:
 
 ```sql
diff --git a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
index 62191d9b5e4..7a449f400fd 100644
--- a/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/aggregatingmergetree.md
@@ -68,6 +68,12 @@ In the results of `SELECT` query, the values of `AggregateFunction` type have im
 
 ## Example of an Aggregated Materialized View {#example-of-an-aggregated-materialized-view}
 
+The following examples assumes that you have a database named `test` so make sure you create that if it doesn't already exist:
+
+```sql
+CREATE DATABASE test;
+```
+
 We will create the table `test.visits` that contain the raw data:
 
 ``` sql
@@ -80,17 +86,24 @@ CREATE TABLE test.visits
 ) ENGINE = MergeTree ORDER BY (StartDate, CounterID);
 ```
 
+Next, we need to create an `AggregatingMergeTree` table that will store `AggregationFunction`s that keep track of the total number of visits and the number of unique users. 
+
 `AggregatingMergeTree` materialized view that watches the `test.visits` table, and use the `AggregateFunction` type:
 
 ``` sql
-CREATE MATERIALIZED VIEW test.mv_visits
-(
+CREATE TABLE test.agg_visits (
     StartDate DateTime64 NOT NULL,
     CounterID UInt64,
     Visits AggregateFunction(sum, Nullable(Int32)),
     Users AggregateFunction(uniq, Nullable(Int32))
 )
-ENGINE = AggregatingMergeTree() ORDER BY (StartDate, CounterID)
+ENGINE = AggregatingMergeTree() ORDER BY (StartDate, CounterID);
+```
+
+And then let's create a materialized view that populates `test.agg_visits` from `test.visits` :
+
+```sql
+CREATE MATERIALIZED VIEW test.visits_mv TO test.agg_visits
 AS SELECT
     StartDate,
     CounterID,
@@ -104,25 +117,45 @@ Inserting data into the `test.visits` table.
 
 ``` sql
 INSERT INTO test.visits (StartDate, CounterID, Sign, UserID)
- VALUES (1667446031, 1, 3, 4)
-INSERT INTO test.visits (StartDate, CounterID, Sign, UserID)
- VALUES (1667446031, 1, 6, 3)
+ VALUES (1667446031000, 1, 3, 4), (1667446031000, 1, 6, 3);
 ```
 
-The data is inserted in both the table and the materialized view `test.mv_visits`.
+The data is inserted in both `test.visits` and `test.agg_visits`.
 
 To get the aggregated data, we need to execute a query such as `SELECT ... GROUP BY ...` from the materialized view `test.mv_visits`:
 
-``` sql
+```sql
 SELECT
     StartDate,
     sumMerge(Visits) AS Visits,
     uniqMerge(Users) AS Users
-FROM test.mv_visits
+FROM test.agg_visits
 GROUP BY StartDate
 ORDER BY StartDate;
 ```
 
+```text
+┌───────────────StartDate─┬─Visits─┬─Users─�
+│ 2022-11-03 03:27:11.000 │      9 │     2 │
+└─────────────────────────┴────────┴───────┘
+```
+
+And how about if we add another couple of records to `test.visits`, but this time we'll use a different timestamp for one of the records:
+
+```sql
+INSERT INTO test.visits (StartDate, CounterID, Sign, UserID)
+ VALUES (1669446031000, 2, 5, 10), (1667446031000, 3, 7, 5);
+```
+
+If we then run the `SELECT` query again, we'll see the following output:
+
+```text
+┌───────────────StartDate─┬─Visits─┬─Users─�
+│ 2022-11-03 03:27:11.000 │     16 │     3 │
+│ 2022-11-26 07:00:31.000 │      5 │     1 │
+└─────────────────────────┴────────┴───────┘
+```
+
 ## 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/annindexes.md b/docs/en/engines/table-engines/mergetree-family/annindexes.md
index be588f1764d..78a27d3ff86 100644
--- a/docs/en/engines/table-engines/mergetree-family/annindexes.md
+++ b/docs/en/engines/table-engines/mergetree-family/annindexes.md
@@ -2,7 +2,7 @@
 
 Nearest neighborhood search is the problem of finding the M closest points for a given point in an N-dimensional vector space. The most
 straightforward approach to solve this problem is a brute force search where the distance between all points in the vector space and the
-reference point is computed. This method guarantees perfect accuracy but it is usually too slow for practical applications. Thus, nearest
+reference point is computed. This method guarantees perfect accuracy, but it is usually too slow for practical applications. Thus, nearest
 neighborhood search problems are often solved with [approximative algorithms](https://github.com/erikbern/ann-benchmarks). Approximative
 nearest neighborhood search techniques, in conjunction with [embedding
 methods](https://cloud.google.com/architecture/overview-extracting-and-serving-feature-embeddings-for-machine-learning) allow to search huge
@@ -24,7 +24,7 @@ LIMIT N
 
 `vectors` contains N-dimensional values of type [Array](../../../sql-reference/data-types/array.md) or
 [Tuple](../../../sql-reference/data-types/tuple.md), for example embeddings. Function `Distance` computes the distance between two vectors.
-Often, the the Euclidean (L2) distance is chosen as distance function but [other
+Often, the Euclidean (L2) distance is chosen as distance function but [other
 distance functions](/docs/en/sql-reference/functions/distance-functions.md) are also possible. `Point` is the reference point, e.g. `(0.17,
 0.33, ...)`, and `N` limits the number of search results.
 
@@ -109,7 +109,7 @@ clickhouse-client --param_vec='hello' --query="SELECT * FROM table_with_ann_inde
 
 **Restrictions**: Queries that contain both a `WHERE Distance(vectors, Point) < MaxDistance` and an `ORDER BY Distance(vectors, Point)`
 clause cannot use ANN indexes. Also, the approximate algorithms used to determine the nearest neighbors require a limit, hence queries
-without `LIMIT` clause cannot utilize ANN indexes. Also ANN indexes are only used if the query has a `LIMIT` value smaller than setting
+without `LIMIT` clause cannot utilize ANN indexes. Also, ANN indexes are only used if the query has a `LIMIT` value smaller than setting
 `max_limit_for_ann_queries` (default: 1 million rows). This is a safeguard to prevent large memory allocations by external libraries for
 approximate neighbor search.
 
@@ -120,9 +120,9 @@ then each indexed block will contain 16384 rows. However, data structures and al
 provided by external libraries) are inherently row-oriented. They store a compact representation of a set of rows and also return rows for
 ANN queries. This causes some rather unintuitive differences in the way ANN indexes behave compared to normal skip indexes.
 
-When a user defines a ANN index on a column, ClickHouse internally creates a ANN "sub-index" for each index block. The sub-index is "local"
+When a user defines an ANN index on a column, ClickHouse internally creates an ANN "sub-index" for each index block. The sub-index is "local"
 in the sense that it only knows about the rows of its containing index block. In the previous example and assuming that a column has 65536
-rows, we obtain four index blocks (spanning eight granules) and a ANN sub-index for each index block. A sub-index is theoretically able to
+rows, we obtain four index blocks (spanning eight granules) and an ANN sub-index for each index block. A sub-index is theoretically able to
 return the rows with the N closest points within its index block directly. However, since ClickHouse loads data from disk to memory at the
 granularity of granules, sub-indexes extrapolate matching rows to granule granularity. This is different from regular skip indexes which
 skip data at the granularity of index blocks.
@@ -231,7 +231,7 @@ The Annoy index currently does not work with per-table, non-default `index_granu
 
 ## USearch {#usearch}
 
-This type of ANN index is based on the [the USearch library](https://github.com/unum-cloud/usearch), which implements the [HNSW
+This type of ANN index is based on the [USearch library](https://github.com/unum-cloud/usearch), which implements the [HNSW
 algorithm](https://arxiv.org/abs/1603.09320), i.e., builds a hierarchical graph where each point represents a vector and the edges represent
 similarity. Such hierarchical structures can be very efficient on large collections. They may often fetch 0.05% or less data from the
 overall dataset, while still providing 99% recall. This is especially useful when working with high-dimensional vectors,
diff --git a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
index 0043e1b6748..ba4021d8422 100644
--- a/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -125,7 +125,7 @@ For each resulting data part ClickHouse saves:
 3.  The first “cancel� row, if there are more “cancel� rows than “state� rows.
 4.  None of the rows, in all other cases.
 
-Also when there are at least 2 more “state� rows than “cancel� rows, or at least 2 more “cancel� rows then “state� rows, the merge continues, but ClickHouse treats this situation as a logical error and records it in the server log. This error can occur if the same data were inserted more than once.
+Also, when there are at least 2 more “state� rows than “cancel� rows, or at least 2 more “cancel� rows then “state� rows, the merge continues, but ClickHouse treats this situation as a logical error and records it in the server log. This error can occur if the same data were inserted more than once.
 
 Thus, collapsing should not change the results of calculating statistics.
 Changes gradually collapsed so that in the end only the last state of almost every object left.
@@ -196,7 +196,7 @@ What do we see and where is collapsing?
 
 With two `INSERT` queries, we created 2 data parts. The `SELECT` query was performed in 2 threads, and we got a random order of rows. Collapsing not occurred because there was no merge of the data parts yet. ClickHouse merges data part in an unknown moment which we can not predict.
 
-Thus we need aggregation:
+Thus, we need aggregation:
 
 ``` sql
 SELECT
diff --git a/docs/en/engines/table-engines/mergetree-family/mergetree.md b/docs/en/engines/table-engines/mergetree-family/mergetree.md
index 6d60611ae4b..29672541d9d 100644
--- a/docs/en/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/en/engines/table-engines/mergetree-family/mergetree.md
@@ -39,8 +39,8 @@ If you need to update rows frequently, we recommend using the [`ReplacingMergeTr
 ``` sql
 CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 (
-    name1 [type1] [[NOT] NULL] [DEFAULT|MATERIALIZED|ALIAS|EPHEMERAL expr1] [COMMENT ...] [CODEC(codec1)] [STATISTIC(stat1)] [TTL expr1] [PRIMARY KEY],
-    name2 [type2] [[NOT] NULL] [DEFAULT|MATERIALIZED|ALIAS|EPHEMERAL expr2] [COMMENT ...] [CODEC(codec2)] [STATISTIC(stat2)] [TTL expr2] [PRIMARY KEY],
+    name1 [type1] [[NOT] NULL] [DEFAULT|MATERIALIZED|ALIAS|EPHEMERAL expr1] [COMMENT ...] [CODEC(codec1)] [STATISTIC(stat1)] [TTL expr1] [PRIMARY KEY] [SETTINGS (name = value, ...)],
+    name2 [type2] [[NOT] NULL] [DEFAULT|MATERIALIZED|ALIAS|EPHEMERAL expr2] [COMMENT ...] [CODEC(codec2)] [STATISTIC(stat2)] [TTL expr2] [PRIMARY KEY] [SETTINGS (name = value, ...)],
     ...
     INDEX index_name1 expr1 TYPE type1(...) [GRANULARITY value1],
     INDEX index_name2 expr2 TYPE type2(...) [GRANULARITY value2],
@@ -56,7 +56,7 @@ ORDER BY expr
     [DELETE|TO DISK 'xxx'|TO VOLUME 'xxx' [, ...] ]
     [WHERE conditions]
     [GROUP BY key_expr [SET v1 = aggr_func(v1) [, v2 = aggr_func(v2) ...]] ] ]
-[SETTINGS name=value, ...]
+[SETTINGS name = value, ...]
 ```
 
 For a description of parameters, see the [CREATE query description](/docs/en/sql-reference/statements/create/table.md).
@@ -508,7 +508,7 @@ Indexes of type `set` can be utilized by all functions. The other index types ar
 | [notEquals(!=, &lt;&gt;)](/docs/en/sql-reference/functions/comparison-functions.md/#notequals)             | ✔           | ✔      | ✔          | ✔          | ✔            | ✔        |
 | [like](/docs/en/sql-reference/functions/string-search-functions.md/#like)                                  | ✔           | ✔      | ✔          | ✔          | ✗            | ✔        |
 | [notLike](/docs/en/sql-reference/functions/string-search-functions.md/#notlike)                            | ✔           | ✔      | ✔          | ✔          | ✗            | ✔        |
-| [match](/docs/en/sql-reference/functions/string-search-functions.md/#match)                                | ✗           | ✗      | ✔          | ✔          | ✗            | ✗        |
+| [match](/docs/en/sql-reference/functions/string-search-functions.md/#match)                                | ✗           | ✗      | ✔          | ✔          | ✗            | ✔        |
 | [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/#multisearchany)              | ✗           | ✗      | ✔          | ✗          | ✗            | ✔        |
@@ -620,7 +620,7 @@ The `TTL` clause can’t be used for key columns.
 #### Creating a table with `TTL`:
 
 ``` sql
-CREATE TABLE example_table
+CREATE TABLE tab
 (
     d DateTime,
     a Int TTL d + INTERVAL 1 MONTH,
@@ -635,7 +635,7 @@ ORDER BY d;
 #### Adding TTL to a column of an existing table
 
 ``` sql
-ALTER TABLE example_table
+ALTER TABLE tab
     MODIFY COLUMN
     c String TTL d + INTERVAL 1 DAY;
 ```
@@ -643,7 +643,7 @@ ALTER TABLE example_table
 #### Altering TTL of the column
 
 ``` sql
-ALTER TABLE example_table
+ALTER TABLE tab
     MODIFY COLUMN
     c String TTL d + INTERVAL 1 MONTH;
 ```
@@ -681,7 +681,7 @@ If a column is not part of the `GROUP BY` expression and is not set explicitly i
 #### Creating a table with `TTL`:
 
 ``` sql
-CREATE TABLE example_table
+CREATE TABLE tab
 (
     d DateTime,
     a Int
@@ -697,7 +697,7 @@ TTL d + INTERVAL 1 MONTH DELETE,
 #### Altering `TTL` of the table:
 
 ``` sql
-ALTER TABLE example_table
+ALTER TABLE tab
     MODIFY TTL d + INTERVAL 1 DAY;
 ```
 
@@ -870,6 +870,11 @@ Tags:
 - `load_balancing` - Policy for disk balancing, `round_robin` or `least_used`.
 - `least_used_ttl_ms` - Configure timeout (in milliseconds) for the updating available space on all disks (`0` - update always, `-1` - never update, default is `60000`). Note, if the disk can be used by ClickHouse only and is not subject to a online filesystem resize/shrink you can use `-1`, in all other cases it is not recommended, since eventually it will lead to incorrect space distribution.
 - `prefer_not_to_merge` — You should not use this setting. Disables merging of data parts on this volume (this is harmful and leads to performance degradation). When this setting is enabled (don't do it), merging data on this volume is not allowed (which is bad). This allows (but you don't need it) controlling (if you want to control something, you're making a mistake) how ClickHouse works with slow disks (but ClickHouse knows better, so please don't use this setting).
+- `volume_priority` — Defines the priority (order) in which volumes are filled. Lower value means higher priority. The parameter values should be natural numbers and collectively cover the range from 1 to N (lowest priority given) without skipping any numbers.
+  * If _all_ volumes are tagged, they are prioritized in given order.
+  * If only _some_ volumes are tagged, those without the tag have the lowest priority, and they are prioritized in the order they are defined in config.
+  * If _no_ volumes are tagged, their priority is set correspondingly to their order they are declared in configuration.
+  * Two volumes cannot have the same priority value.
 
 Configuration examples:
 
@@ -919,7 +924,8 @@ In given example, the `hdd_in_order` policy implements the [round-robin](https:/
 If there are different kinds of disks available in the system, `moving_from_ssd_to_hdd` policy can be used instead. The volume `hot` consists of an SSD disk (`fast_ssd`), and the maximum size of a part that can be stored on this volume is 1GB. All the parts with the size larger than 1GB will be stored directly on the `cold` volume, which contains an HDD disk `disk1`.
 Also, once the disk `fast_ssd` gets filled by more than 80%, data will be transferred to the `disk1` by a background process.
 
-The order of volume enumeration within a storage policy is important. Once a volume is overfilled, data are moved to the next one. The order of disk enumeration is important as well because data are stored on them in turns.
+The order of volume enumeration within a storage policy is important in case at least one of the volumes listed has no explicit `volume_priority` parameter.
+Once a volume is overfilled, data are moved to the next one. The order of disk enumeration is important as well because data are stored on them in turns.
 
 When creating a table, one can apply one of the configured storage policies to it:
 
@@ -940,96 +946,6 @@ You could change storage policy after table creation with [ALTER TABLE ... MODIF
 
 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.
-:::
-
-#### Example dynamic web storage
-
-:::tip
-A [demo dataset](https://github.com/ClickHouse/web-tables-demo) is hosted in GitHub.  To prepare your own tables for web storage see the tool [clickhouse-static-files-uploader](/docs/en/operations/storing-data.md/#storing-data-on-webserver)
-:::
-
-In this `ATTACH TABLE` query the `UUID` provided matches the directory name of the data, and the endpoint is the URL for the raw GitHub content.
-
-```sql
-# highlight-next-line
-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:
@@ -1058,13 +974,11 @@ During this time, they are not moved to other volumes or disks. Therefore, until
 
 User can assign new big parts to different disks of a [JBOD](https://en.wikipedia.org/wiki/Non-RAID_drive_architectures) volume in a balanced way using the [min_bytes_to_rebalance_partition_over_jbod](/docs/en/operations/settings/merge-tree-settings.md/#min-bytes-to-rebalance-partition-over-jbod) setting.
 
-## Using S3 for Data Storage {#table_engine-mergetree-s3}
+## Using External Storage 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/gcs).
-:::
+[MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) family table engines can store data to `S3`, `AzureBlobStorage`, `HDFS` using a disk with types `s3`, `azure_blob_storage`, `hdfs` accordingly. See [configuring external storage options](/docs/en/operations/storing-data.md/#configuring-external-storage) for more details.
 
-`MergeTree` family table engines can store data to [S3](https://aws.amazon.com/s3/) using a disk with type `s3`.
+Example for [S3](https://aws.amazon.com/s3/) as external storage using a disk with type `s3`.
 
 Configuration markup:
 ``` xml
@@ -1106,251 +1020,12 @@ Configuration markup:
 </storage_configuration>
 ```
 
+Also see [configuring external storage options](/docs/en/operations/storing-data.md/#configuring-external-storage).
+
 :::note cache configuration
 ClickHouse versions 22.3 through 22.7 use a different cache configuration, see [using local cache](/docs/en/operations/storing-data.md/#using-local-cache) if you are using one of those versions.
 :::
 
-### Configuring the S3 disk
-
-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.
-
-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`.
-- `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`.
-- `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
-- `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
-- `key_template` — Define the format with which the object keys are generated. By default, Clickhouse takes `root path` from `endpoint` option and adds random generated suffix. That suffix is a dir with 3 random symbols and a file name with 29 random symbols. With that option you have a full control how to the object keys are generated. Some usage scenarios require having random symbols in the prefix or in the middle of object key. For example: `[a-z]{3}-prefix-random/constant-part/random-middle-[a-z]{3}/random-suffix-[a-z]{29}`. The value is parsed with [`re2`](https://github.com/google/re2/wiki/Syntax). Only some subset of the syntax is supported. Check if your preferred format is supported before using that option. Disk isn't initialized if clickhouse is unable to generate a key by the value of `key_template`. It requires enabled feature flag [storage_metadata_write_full_object_key](/docs/en/operations/settings/settings#storage_metadata_write_full_object_key). It forbids declaring the `root path` in `endpoint` option. It requires definition of the option `key_compatibility_prefix`.
-- `key_compatibility_prefix` — That option is required when option `key_template` is in use. In order to be able to read the objects keys which were stored in the metadata files with the metadata version lower that `VERSION_FULL_OBJECT_KEY`, the previous `root path` from the `endpoint` option should be set here.
-
-### Configuring the cache
-
-This is the cache configuration from above:
-```xml
-        <s3_cache>
-            <type>cache</type>
-            <disk>s3</disk>
-            <path>/var/lib/clickhouse/disks/s3_cache/</path>
-            <max_size>10Gi</max_size>
-        </s3_cache>
-```
-
-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.
-
-Cache parameters:
-- `path` — The path where metadata for the cache is stored.
-- `max_size` — The size (amount of disk space) 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.
-:::
-
-S3 disk can be configured as `main` or `cold` storage:
-``` xml
-<storage_configuration>
-    ...
-    <disks>
-        <s3>
-            <type>s3</type>
-            <endpoint>https://clickhouse-public-datasets.s3.amazonaws.com/my-bucket/root-path/</endpoint>
-            <access_key_id>your_access_key_id</access_key_id>
-            <secret_access_key>your_secret_access_key</secret_access_key>
-        </s3>
-    </disks>
-    <policies>
-        <s3_main>
-            <volumes>
-                <main>
-                    <disk>s3</disk>
-                </main>
-            </volumes>
-        </s3_main>
-        <s3_cold>
-            <volumes>
-                <main>
-                    <disk>default</disk>
-                </main>
-                <external>
-                    <disk>s3</disk>
-                </external>
-            </volumes>
-            <move_factor>0.2</move_factor>
-        </s3_cold>
-    </policies>
-    ...
-</storage_configuration>
-```
-
-In case of `cold` option a data can be moved to S3 if local disk free size will be smaller than `move_factor * disk_size` or by TTL move rule.
-
-## Using Azure Blob Storage for Data Storage {#table_engine-mergetree-azure-blob-storage}
-
-`MergeTree` family table engines can store data to [Azure Blob Storage](https://azure.microsoft.com/en-us/services/storage/blobs/) using a disk with type `azure_blob_storage`.
-
-As of February 2022, this feature is still a fresh addition, so expect that some Azure Blob Storage functionalities might be unimplemented.
-
-Configuration markup:
-``` xml
-<storage_configuration>
-    ...
-    <disks>
-        <blob_storage_disk>
-            <type>azure_blob_storage</type>
-            <storage_account_url>http://account.blob.core.windows.net</storage_account_url>
-            <container_name>container</container_name>
-            <account_name>account</account_name>
-            <account_key>pass123</account_key>
-            <metadata_path>/var/lib/clickhouse/disks/blob_storage_disk/</metadata_path>
-            <cache_path>/var/lib/clickhouse/disks/blob_storage_disk/cache/</cache_path>
-            <skip_access_check>false</skip_access_check>
-        </blob_storage_disk>
-    </disks>
-    ...
-</storage_configuration>
-```
-
-Connection parameters:
-* `storage_account_url` - **Required**, Azure Blob Storage account URL, like `http://account.blob.core.windows.net` or `http://azurite1:10000/devstoreaccount1`.
-* `container_name` - Target container name, defaults to `default-container`.
-* `container_already_exists` - If set to `false`, a new container `container_name` is created in the storage account, if set to `true`, disk connects to the container directly, and if left unset, disk connects to the account, checks if the container `container_name` exists, and creates it if it doesn't exist yet.
-
-Authentication parameters (the disk will try all available methods **and** Managed Identity Credential):
-* `connection_string` - For authentication using a connection string.
-* `account_name` and `account_key` - For authentication using Shared Key.
-
-Limit parameters (mainly for internal usage):
-* `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 concurrently 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>/`.
-* `skip_access_check` - If true, disk access checks will not be performed on disk start-up. Default value is `false`.
-* `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
-* `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
-
-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)).
-
-:::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.
-:::
-
-## HDFS storage {#hdfs-storage}
-
-In this sample configuration:
-- the disk is of type `hdfs`
-- the data is hosted at `hdfs://hdfs1:9000/clickhouse/`
-
-```xml
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <hdfs>
-                <type>hdfs</type>
-                <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
-                <skip_access_check>true</skip_access_check>
-            </hdfs>
-            <hdd>
-                <type>local</type>
-                <path>/</path>
-            </hdd>
-        </disks>
-        <policies>
-            <hdfs>
-                <volumes>
-                    <main>
-                        <disk>hdfs</disk>
-                    </main>
-                    <external>
-                        <disk>hdd</disk>
-                    </external>
-                </volumes>
-            </hdfs>
-        </policies>
-    </storage_configuration>
-</clickhouse>
-```
-
-## Web storage (read-only) {#web-storage}
-
-Web storage can be used for read-only purposes. An example use is for hosting sample
-data, or for migrating data.
-
-:::tip
-Storage can also be configured temporarily within a query, if a web dataset is not expected
-to be used routinely, see [dynamic storage](#dynamic-storage) and skip editing the
-configuration file.
-:::
-
-In this sample configuration:
-- the disk is of type `web`
-- the data is hosted at `http://nginx:80/test1/`
-- a cache on local storage is used
-
-```xml
-<clickhouse>
-    <storage_configuration>
-        <disks>
-            <web>
-                <type>web</type>
-                <endpoint>http://nginx:80/test1/</endpoint>
-            </web>
-            <cached_web>
-                <type>cache</type>
-                <disk>web</disk>
-                <path>cached_web_cache/</path>
-                <max_size>100000000</max_size>
-            </cached_web>
-        </disks>
-        <policies>
-            <web>
-                <volumes>
-                    <main>
-                        <disk>web</disk>
-                    </main>
-                </volumes>
-            </web>
-            <cached_web>
-                <volumes>
-                    <main>
-                        <disk>cached_web</disk>
-                    </main>
-                </volumes>
-            </cached_web>
-        </policies>
-    </storage_configuration>
-</clickhouse>
-```
-
 ## Virtual Columns {#virtual-columns}
 
 - `_part` — Name of a part.
@@ -1366,7 +1041,7 @@ In this sample configuration:
 The statistic declaration is in the columns section of the `CREATE` query for tables from the `*MergeTree*` Family when we enable `set allow_experimental_statistic = 1`.
 
 ``` sql
-CREATE TABLE example_table
+CREATE TABLE tab
 (
     a Int64 STATISTIC(tdigest),
     b Float64
@@ -1378,8 +1053,8 @@ ORDER BY a
 We can also manipulate statistics with `ALTER` statements.
 
 ```sql
-ALTER TABLE example_table ADD STATISTIC b TYPE tdigest;
-ALTER TABLE example_table DROP STATISTIC a TYPE tdigest;
+ALTER TABLE tab ADD STATISTIC b TYPE tdigest;
+ALTER TABLE tab DROP STATISTIC a TYPE tdigest;
 ```
 
 These lightweight statistics aggregate information about distribution of values in columns.
@@ -1390,3 +1065,42 @@ They can be used for query optimization when we enable `set allow_statistic_opti
 -   `tdigest`
 
     Stores distribution of values from numeric columns in [TDigest](https://github.com/tdunning/t-digest) sketch.
+
+## Column-level Settings {#column-level-settings}
+
+Certain MergeTree settings can be override at column level:
+
+- `max_compress_block_size` — Maximum size of blocks of uncompressed data before compressing for writing to a table.
+- `min_compress_block_size` — Minimum size of blocks of uncompressed data required for compression when writing the next mark.
+
+Example:
+
+```sql
+CREATE TABLE tab
+(
+    id Int64,
+    document String SETTINGS (min_compress_block_size = 16777216, max_compress_block_size = 16777216)
+)
+ENGINE = MergeTree
+ORDER BY id
+```
+
+Column-level settings can be modified or removed using [ALTER MODIFY COLUMN](/docs/en/sql-reference/statements/alter/column.md), for example:
+
+- Remove `SETTINGS` from column declaration:
+
+```sql
+ALTER TABLE tab MODIFY COLUMN document REMOVE SETTINGS;
+```
+
+- Modify a setting:
+
+```sql
+ALTER TABLE tab MODIFY COLUMN document MODIFY SETTING min_compress_block_size = 8192;
+```
+
+- Reset one or more settings, also removes the setting declaration in the column expression of the table's CREATE query.
+
+```sql
+ALTER TABLE tab MODIFY COLUMN document RESET SETTING min_compress_block_size;
+```
diff --git a/docs/en/engines/table-engines/mergetree-family/replication.md b/docs/en/engines/table-engines/mergetree-family/replication.md
index 01782ac25bd..f70e275fd4e 100644
--- a/docs/en/engines/table-engines/mergetree-family/replication.md
+++ b/docs/en/engines/table-engines/mergetree-family/replication.md
@@ -304,6 +304,24 @@ We use the term `MergeTree` to refer to all table engines in the `MergeTree fami
 
 If you had a `MergeTree` table that was manually replicated, you can convert it to a replicated table. You might need to do this if you have already collected a large amount of data in a `MergeTree` table and now you want to enable replication.
 
+`MergeTree` table can be automatically converted on server restart if `convert_to_replicated` flag is set at the table's data directory (`/var/lib/clickhouse/store/xxx/xxxyyyyy-yyyy-yyyy-yyyy-yyyyyyyyyyyy/` for `Atomic` database).
+Create empty `convert_to_replicated` file and the table will be loaded as replicated on next server restart.
+
+This query can be used to get the table's data path.
+
+```sql
+SELECT data_paths FROM system.tables WHERE table = 'table_name' AND database = 'database_name';
+```
+
+Note that ReplicatedMergeTree table will be created with values of `default_replica_path` and `default_replica_name` settings.
+To create a converted table on other replicas, you will need to explicitly specify its path in the first argument of the `ReplicatedMergeTree` engine. The following query can be used to get its path.
+
+```sql
+SELECT zookeeper_path FROM system.replicas WHERE table = 'table_name';
+```
+
+There is also a manual way to do this without server restart.
+
 If the data differs on various replicas, first sync it, or delete this data on all the replicas except one.
 
 Rename the existing MergeTree table, then create a `ReplicatedMergeTree` table with the old name.
diff --git a/docs/en/engines/table-engines/special/distributed.md b/docs/en/engines/table-engines/special/distributed.md
index de8ae0357dc..4e0ee9bfcc9 100644
--- a/docs/en/engines/table-engines/special/distributed.md
+++ b/docs/en/engines/table-engines/special/distributed.md
@@ -72,7 +72,11 @@ Specifying the `sharding_key` is necessary for the following:
 
 #### fsync_directories
 
-`fsync_directories` - do the `fsync` for directories. Guarantees that the OS refreshed directory metadata after operations related to background inserts on Distributed table (after insert, after sending the data to shard, etc).
+`fsync_directories` - do the `fsync` for directories. Guarantees that the OS refreshed directory metadata after operations related to background inserts on Distributed table (after insert, after sending the data to shard, etc.).
+
+#### skip_unavailable_shards
+
+`skip_unavailable_shards` - If true, ClickHouse silently skips unavailable shards. Shard is marked as unavailable when: 1) The shard cannot be reached due to a connection failure. 2) Shard is unresolvable through DNS. 3) Table does not exist on the shard. Default false.
 
 #### bytes_to_throw_insert
 
@@ -102,6 +106,10 @@ Specifying the `sharding_key` is necessary for the following:
 
 `background_insert_max_sleep_time_ms` - same as [distributed_background_insert_max_sleep_time_ms](../../../operations/settings/settings.md#distributed_background_insert_max_sleep_time_ms)
 
+#### flush_on_detach
+
+`flush_on_detach` - Flush data to remote nodes on DETACH/DROP/server shutdown. Default true.
+
 :::note
 **Durability settings** (`fsync_...`):
 
@@ -220,7 +228,7 @@ Second, you can perform `INSERT` statements on a `Distributed` table. In this ca
 
 Each shard can have a `<weight>` defined in the config file. By default, the weight is `1`. Data is distributed across shards in the amount proportional to the shard weight. All shard weights are summed up, then each shard's weight is divided by the total to determine each shard's proportion. For example, if there are two shards and the first has a weight of 1 while the second has a weight of 2, the first will be sent one third (1 / 3) of inserted rows and the second will be sent two thirds (2 / 3).
 
-Each shard can have the `internal_replication` parameter defined in the config file. If this parameter is set to `true`, the write operation selects the first healthy replica and writes data to it. Use this if the tables underlying the `Distributed` table are replicated tables (e.g. any of the `Replicated*MergeTree` table engines). One of the table replicas will receive the write and it will be replicated to the other replicas automatically.
+Each shard can have the `internal_replication` parameter defined in the config file. If this parameter is set to `true`, the write operation selects the first healthy replica and writes data to it. Use this if the tables underlying the `Distributed` table are replicated tables (e.g. any of the `Replicated*MergeTree` table engines). One of the table replicas will receive the write, and it will be replicated to the other replicas automatically.
 
 If `internal_replication` is set to `false` (the default), data is written to all replicas. In this case, the `Distributed` table replicates data itself. This is worse than using replicated tables because the consistency of replicas is not checked and, over time, they will contain slightly different data.
 
diff --git a/docs/en/engines/table-engines/special/memory.md b/docs/en/engines/table-engines/special/memory.md
index 5cd766a318a..f28157ebde2 100644
--- a/docs/en/engines/table-engines/special/memory.md
+++ b/docs/en/engines/table-engines/special/memory.md
@@ -6,6 +6,12 @@ sidebar_label:  Memory
 
 # Memory Table Engine
 
+:::note
+When using the Memory table engine on ClickHouse Cloud, data is not replicated across all nodes (by design). To guarantee that all queries are routed to the same node and that the Memory table engine works as expected, you can do one of the following:
+- Execute all operations in the same session
+- Use a client that uses TCP or the native interface (which enables support for sticky connections) such as [clickhouse-client](/en/interfaces/cli)
+:::
+
 The Memory engine stores data in RAM, in uncompressed form. Data is stored in exactly the same form as it is received when read. In other words, reading from this table is completely free.
 Concurrent data access is synchronized. Locks are short: read and write operations do not block each other.
 Indexes are not supported. Reading is parallelized.
@@ -15,3 +21,85 @@ When restarting a server, data disappears from the table and the table becomes e
 Normally, using this table engine is not justified. However, it can be used for tests, and for tasks where maximum speed is required on a relatively small number of rows (up to approximately 100,000,000).
 
 The Memory engine is used by the system for temporary tables with external query data (see the section “External data for processing a query�), and for implementing `GLOBAL IN` (see the section “IN operators�).
+
+Upper and lower bounds can be specified to limit Memory engine table size, effectively allowing it to act as a circular buffer (see [Engine Parameters](#engine-parameters)).
+
+## Engine Parameters {#engine-parameters}
+
+- `min_bytes_to_keep` — Minimum bytes to keep when memory table is size-capped.
+  - Default value: `0`
+  - Requires `max_bytes_to_keep`
+- `max_bytes_to_keep` — Maximum bytes to keep within memory table where oldest rows are deleted on each insertion (i.e circular buffer). Max bytes can exceed the stated limit if the oldest batch of rows to remove falls under the `min_bytes_to_keep` limit when adding a large block.
+  - Default value: `0`
+- `min_rows_to_keep` — Minimum rows to keep when memory table is size-capped.
+  - Default value: `0`
+  - Requires `max_rows_to_keep`
+- `max_rows_to_keep` — Maximum rows to keep within memory table where oldest rows are deleted on each insertion (i.e circular buffer). Max rows can exceed the stated limit if the oldest batch of rows to remove falls under the `min_rows_to_keep` limit when adding a large block.
+  - Default value: `0`
+
+## Usage {#usage}
+
+
+**Initialize settings**
+``` sql
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_rows_to_keep = 100, max_rows_to_keep = 1000;
+```
+
+**Modify settings**
+```sql
+ALTER TABLE memory MODIFY SETTING min_rows_to_keep = 100, max_rows_to_keep = 1000;
+```
+
+**Note:** Both `bytes` and `rows` capping parameters can be set at the same time, however, the lower bounds of `max` and `min` will be adhered to.
+
+## Examples {#examples}
+``` sql
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_bytes_to_keep = 4096, max_bytes_to_keep = 16384;
+
+/* 1. testing oldest block doesn't get deleted due to min-threshold - 3000 rows */
+INSERT INTO memory SELECT * FROM numbers(0, 1600); -- 8'192 bytes
+
+/* 2. adding block that doesn't get deleted */
+INSERT INTO memory SELECT * FROM numbers(1000, 100); -- 1'024 bytes
+
+/* 3. testing oldest block gets deleted - 9216 bytes - 1100 */
+INSERT INTO memory SELECT * FROM numbers(9000, 1000); -- 8'192 bytes
+
+/* 4. checking a very large block overrides all */
+INSERT INTO memory SELECT * FROM numbers(9000, 10000); -- 65'536 bytes
+
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+```
+
+``` text
+┌─total_bytes─┬─total_rows─�
+│       65536 │      10000 │
+└─────────────┴────────────┘
+```
+
+also, for rows:
+
+``` sql
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_rows_to_keep = 4000, max_rows_to_keep = 10000;
+
+/* 1. testing oldest block doesn't get deleted due to min-threshold - 3000 rows */
+INSERT INTO memory SELECT * FROM numbers(0, 1600); -- 1'600 rows
+
+/* 2. adding block that doesn't get deleted */
+INSERT INTO memory SELECT * FROM numbers(1000, 100); -- 100 rows
+
+/* 3. testing oldest block gets deleted - 9216 bytes - 1100 */
+INSERT INTO memory SELECT * FROM numbers(9000, 1000); -- 1'000 rows
+
+/* 4. checking a very large block overrides all */
+INSERT INTO memory SELECT * FROM numbers(9000, 10000); -- 10'000 rows
+
+SELECT total_bytes, total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+```
+
+``` text
+┌─total_bytes─┬─total_rows─�
+│       65536 │      10000 │
+└─────────────┴────────────┘
+```
+
diff --git a/docs/en/getting-started/example-datasets/amazon-reviews.md b/docs/en/getting-started/example-datasets/amazon-reviews.md
index 00dc553782c..c07ffa86dd9 100644
--- a/docs/en/getting-started/example-datasets/amazon-reviews.md
+++ b/docs/en/getting-started/example-datasets/amazon-reviews.md
@@ -12,7 +12,7 @@ The queries below were executed on a **Production** instance of [ClickHouse Clou
 :::
 
 
-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:
+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 *
diff --git a/docs/en/getting-started/example-datasets/cell-towers.md b/docs/en/getting-started/example-datasets/cell-towers.md
index a84eb5d561f..94fa6998f5d 100644
--- a/docs/en/getting-started/example-datasets/cell-towers.md
+++ b/docs/en/getting-started/example-datasets/cell-towers.md
@@ -29,7 +29,7 @@ Here is a preview of the dashboard created in this guide:
 
 This dataset is from [OpenCelliD](https://www.opencellid.org/) - The world's largest Open Database of Cell Towers.
 
-As of 2021, it contains more than 40 million records about cell towers (GSM, LTE, UMTS, etc.) around the world with their geographical coordinates and metadata (country code, network, etc).
+As of 2021, it contains more than 40 million records about cell towers (GSM, LTE, UMTS, etc.) around the world with their geographical coordinates and metadata (country code, network, etc.).
 
 OpenCelliD Project is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License, and we redistribute a snapshot of this dataset under the terms of the same license. The up-to-date version of the dataset is available to download after sign in.
 
@@ -75,14 +75,14 @@ This is the output of `DESCRIBE`.  Down further in this guide the field type cho
 </TabItem>
 <TabItem value="selfmanaged" label="Self-managed">
 
-1. Download the snapshot of the dataset from February 2021: [cell_towers.csv.xz](https://datasets.clickhouse.com/cell_towers.csv.xz) (729 MB).
+1. Download the snapshot of the dataset from February 2021: [cell_towers.csv.xz](https://datasets.clickhouse.com/cell_towers.csv.xz) (686 MB).
 
 2. Validate the integrity (optional step):
 ```bash
 md5sum cell_towers.csv.xz
 ```
 ```response
-8cf986f4a0d9f12c6f384a0e9192c908  cell_towers.csv.xz
+8a797f7bdb55faba93f6cbc37d47b037  cell_towers.csv.xz
 ```
 
 3. Decompress it with the following command:
@@ -132,7 +132,7 @@ SELECT radio, count() AS c FROM cell_towers GROUP BY radio ORDER BY c DESC
 ┌─radio─┬────────c─�
 │ UMTS  │ 20686487 │
 │ LTE   │ 12101148 │
-│ GSM   │  9931312 │
+│ GSM   │  9931304 │
 │ CDMA  │   556344 │
 │ NR    │      867 │
 └───────┴──────────┘
@@ -355,7 +355,7 @@ Click on **UPDATE CHART** to render the visualization.
 
 ### Add the charts to a **dashboard**
 
-This screenshot shows cell tower locations with LTE, UMTS, and GSM radios.  The charts are all created in the same way and they are added to a dashboard.
+This screenshot shows cell tower locations with LTE, UMTS, and GSM radios.  The charts are all created in the same way, and they are added to a dashboard.
 
   ![Dashboard of cell towers by radio type in mcc 204](@site/docs/en/getting-started/example-datasets/images/superset-cell-tower-dashboard.png)
 
diff --git a/docs/en/getting-started/example-datasets/covid19.md b/docs/en/getting-started/example-datasets/covid19.md
index 3a7fae89ae0..7dc4cea9be4 100644
--- a/docs/en/getting-started/example-datasets/covid19.md
+++ b/docs/en/getting-started/example-datasets/covid19.md
@@ -28,7 +28,7 @@ The CSV file has 10 columns:
 
 ```response
 ┌─name─────────────────┬─type─────────────�
-│ date                 │ Nullable(String) │
+│ date                 │ Nullable(Date)   │
 │ location_key         │ Nullable(String) │
 │ new_confirmed        │ Nullable(Int64)  │
 │ new_deceased         │ Nullable(Int64)  │
@@ -132,7 +132,7 @@ FROM covid19;
 └────────────────────────────────────────────┘
 ```
 
-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:
+7. You will notice the data has a lot of 0's for dates - either weekends or days when numbers were not reported each day. We can use a window function to smooth out the daily averages of new cases:
 
 ```sql
 SELECT
@@ -262,4 +262,4 @@ The results look like
 
 :::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 a2e0fda0cb0..4becdb50731 100644
--- a/docs/en/getting-started/example-datasets/criteo.md
+++ b/docs/en/getting-started/example-datasets/criteo.md
@@ -55,7 +55,7 @@ CREATE TABLE criteo_log (
 ) ENGINE = Log;
 ```
 
-Download the data:
+Insert the data:
 
 ``` bash
 $ for i in {00..23}; do echo $i; zcat datasets/criteo/day_${i#0}.gz | sed -r 's/^/2000-01-'${i/00/24}'\t/' | clickhouse-client --host=example-perftest01j --query="INSERT INTO criteo_log FORMAT TabSeparated"; done
diff --git a/docs/en/getting-started/example-datasets/github.md b/docs/en/getting-started/example-datasets/github.md
index 9ed8782e512..e5ffb15bb9a 100644
--- a/docs/en/getting-started/example-datasets/github.md
+++ b/docs/en/getting-started/example-datasets/github.md
@@ -23,7 +23,6 @@ As of November 8th, 2022, each TSV is approximately the following size and numbe
 
 # Table of Contents
 
-- [ClickHouse GitHub data](#clickhouse-github-data)
 - [Table of Contents](#table-of-contents)
 - [Generating the data](#generating-the-data)
 - [Downloading and inserting the data](#downloading-and-inserting-the-data)
diff --git a/docs/en/getting-started/example-datasets/laion.md b/docs/en/getting-started/example-datasets/laion.md
index 0dbaceffc13..327c1796d11 100644
--- a/docs/en/getting-started/example-datasets/laion.md
+++ b/docs/en/getting-started/example-datasets/laion.md
@@ -10,10 +10,14 @@ The embeddings and the metadata are stored in separate files in the raw data. A
 converts them to CSV and imports them into ClickHouse. You can use the following `download.sh` script for that:
 
 ```bash
-wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/img_emb/img_emb_${1}.npy          # download image embedding
-wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/text_emb/text_emb_${1}.npy        # download text embedding
-wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/metadata/metadata_${1}.parquet    # download metadata
-python3 process.py ${1} # merge files and convert to CSV
+number=${1}
+if [[ $number == '' ]]; then
+    number=1
+fi;
+wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/img_emb/img_emb_${number}.npy          # download image embedding
+wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/text_emb/text_emb_${number}.npy        # download text embedding
+wget --tries=100 https://deploy.laion.ai/8f83b608504d46bb81708ec86e912220/embeddings/metadata/metadata_${number}.parquet    # download metadata
+python3 process.py $number # merge files and convert to CSV
 ```
 Script `process.py` is defined as follows:
 
diff --git a/docs/en/getting-started/example-datasets/menus.md b/docs/en/getting-started/example-datasets/menus.md
index 32fe62865d4..5a35c1d45bc 100644
--- a/docs/en/getting-started/example-datasets/menus.md
+++ b/docs/en/getting-started/example-datasets/menus.md
@@ -18,6 +18,9 @@ Run the command:
 
 ```bash
 wget https://s3.amazonaws.com/menusdata.nypl.org/gzips/2021_08_01_07_01_17_data.tgz
+# Option: Validate the checksum
+md5sum 2021_08_01_07_01_17_data.tgz
+# Checksum should be equal to: db6126724de939a5481e3160a2d67d15
 ```
 
 Replace the link to the up to date link from http://menus.nypl.org/data if needed.
diff --git a/docs/en/getting-started/example-datasets/noaa.md b/docs/en/getting-started/example-datasets/noaa.md
new file mode 100644
index 00000000000..9a3ec7791b6
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/noaa.md
@@ -0,0 +1,342 @@
+---
+slug: /en/getting-started/example-datasets/noaa
+sidebar_label: NOAA Global Historical Climatology Network 
+sidebar_position: 1
+description: 2.5 billion rows of climate data for the last 120 yrs
+---
+
+# NOAA Global Historical Climatology Network 
+
+This dataset contains weather measurements for the last 120 years. Each row is a measurement for a point in time and station.
+
+More precisely and according to the [origin of this data](https://github.com/awslabs/open-data-docs/tree/main/docs/noaa/noaa-ghcn):
+
+> GHCN-Daily is a dataset that contains daily observations over global land areas. It contains station-based measurements from land-based stations worldwide, about two-thirds of which are for precipitation measurements only (Menne et al., 2012). GHCN-Daily is a composite of climate records from numerous sources that were merged together and subjected to a common suite of quality assurance reviews (Durre et al., 2010). The archive includes the following meteorological elements:
+
+    - Daily maximum temperature
+    - Daily minimum temperature
+    - Temperature at the time of observation
+    - Precipitation (i.e., rain, melted snow)
+    - Snowfall
+    - Snow depth
+    - Other elements where available
+
+## Downloading the data
+
+- A [pre-prepared version](#pre-prepared-data) of the data for ClickHouse, which has been cleansed, re-structured, and enriched. This data covers the years 1900 to 2022.
+- [Download the original data](#original-data) and convert to the format required by ClickHouse. Users wanting to add their own columns may wish to explore this approach.
+
+### Pre-prepared data
+
+More specifically, rows have been removed that did not fail any quality assurance checks by Noaa. The data has also been restructured from a measurement per line to a row per station id and date, i.e.
+
+```csv
+"station_id","date","tempAvg","tempMax","tempMin","precipitation","snowfall","snowDepth","percentDailySun","averageWindSpeed","maxWindSpeed","weatherType"
+"AEM00041194","2022-07-30",347,0,308,0,0,0,0,0,0,0
+"AEM00041194","2022-07-31",371,413,329,0,0,0,0,0,0,0
+"AEM00041194","2022-08-01",384,427,357,0,0,0,0,0,0,0
+"AEM00041194","2022-08-02",381,424,352,0,0,0,0,0,0,0
+```
+
+This is simpler to query and ensures the resulting table is less sparse. Finally, the data has also been enriched with latitude and longitude.
+
+This data is available in the following S3 location. Either download the data to your local filesystem (and insert using the ClickHouse client) or insert directly into ClickHouse (see [Inserting from S3](#inserting-from-s3)).
+
+To download:
+
+```bash
+wget https://datasets-documentation.s3.eu-west-3.amazonaws.com/noaa/noaa_enriched.parquet
+```
+
+### Original data
+
+The following details the steps to download and transform the original data in preparation for loading into ClickHouse.
+
+#### Download
+
+To download the original data:
+
+```bash
+for i in {1900..2023}; do wget https://noaa-ghcn-pds.s3.amazonaws.com/csv.gz/${i}.csv.gz; done
+```
+
+#### Sampling the data
+
+```bash
+$ clickhouse-local --query "SELECT * FROM '2021.csv.gz' LIMIT 10" --format PrettyCompact
+┌─c1──────────┬───────c2─┬─c3───┬──c4─┬─c5───┬─c6───┬─c7─┬───c8─�
+│ AE000041196 │ 20210101 │ TMAX │ 278 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AE000041196 │ 20210101 │ PRCP │   0 │ D    │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AE000041196 │ 20210101 │ TAVG │ 214 │ H    │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041194 │ 20210101 │ TMAX │ 266 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041194 │ 20210101 │ TMIN │ 178 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041194 │ 20210101 │ PRCP │   0 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041194 │ 20210101 │ TAVG │ 217 │ H    │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041217 │ 20210101 │ TMAX │ 262 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041217 │ 20210101 │ TMIN │ 155 │ ᴺ�ᴸᴸ │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+│ AEM00041217 │ 20210101 │ TAVG │ 202 │ H    │ ᴺ�ᴸᴸ │ S  │ ᴺ�ᴸᴸ │
+└─────────────┴──────────┴──────┴─────┴──────┴──────┴────┴──────┘
+```
+
+Summarizing the [format documentation](https://github.com/awslabs/open-data-docs/tree/main/docs/noaa/noaa-ghcn):
+
+
+Summarizing the format documentation and the columns in order:
+
+ - An 11 character station identification code. This itself encodes some useful information
+ - YEAR/MONTH/DAY = 8 character date in YYYYMMDD format (e.g. 19860529 = May 29, 1986)
+ - ELEMENT = 4 character indicator of element type. Effectively the measurement type. While there are many measurements available, we select the following:
+    - PRCP - Precipitation (tenths of mm)
+    - SNOW - Snowfall (mm)
+    - SNWD - Snow depth (mm)
+    - TMAX - Maximum temperature (tenths of degrees C)
+    - TAVG - Average temperature (tenths of a degree C)
+    - TMIN - Minimum temperature (tenths of degrees C)
+    - PSUN - Daily percent of possible sunshine (percent)
+    - AWND - Average daily wind speed (tenths of meters per second)
+    - WSFG - Peak gust wind speed (tenths of meters per second)
+    - WT** = Weather Type where ** defines the weather type. Full list of weather types here.
+- DATA VALUE = 5 character data value for ELEMENT i.e. the value of the measurement.
+- M-FLAG = 1 character Measurement Flag. This has 10 possible values. Some of these values indicate questionable data accuracy. We accept data where this is set to “P� - identified as missing presumed zero, as this is only relevant to the PRCP, SNOW and SNWD measurements.
+- Q-FLAG is the measurement quality flag with 14 possible values. We are only interested in data with an empty value i.e. it did not fail any quality assurance checks.
+- S-FLAG is the source flag for the observation. Not useful for our analysis and ignored.
+- OBS-TIME = 4-character time of observation in hour-minute format (i.e. 0700 =7:00 am). Typically not present in older data. We ignore this for our purposes.
+
+A measurement per line would result in a sparse table structure in ClickHouse. We should transform to a row per time and station, with measurements as columns. First, we limit the dataset to those rows without issues i.e. where `qFlag` is equal to an empty string.
+
+#### Clean the data
+
+Using [ClickHouse local](https://clickhouse.com/blog/extracting-converting-querying-local-files-with-sql-clickhouse-local) we can filter rows that represent measurements of interest and pass our quality requirements:
+
+```bash
+clickhouse local --query "SELECT count() 
+FROM file('*.csv.gz', CSV, 'station_id String, date String, measurement String, value Int64, mFlag String, qFlag String, sFlag String, obsTime String') WHERE qFlag = '' AND (measurement IN ('PRCP', 'SNOW', 'SNWD', 'TMAX', 'TAVG', 'TMIN', 'PSUN', 'AWND', 'WSFG') OR startsWith(measurement, 'WT'))"
+
+2679264563
+```
+
+With over 2.6 billion rows, this isn’t a fast query since it involves parsing all the files. On our 8 core  machine, this takes around 160 seconds.
+
+
+### Pivot data
+
+While the measurement per line structure can be used with ClickHouse, it will unnecessarily complicate future queries. Ideally, we need a row per station id and date, where each measurement type and associated value are a column i.e.
+
+```csv
+"station_id","date","tempAvg","tempMax","tempMin","precipitation","snowfall","snowDepth","percentDailySun","averageWindSpeed","maxWindSpeed","weatherType"
+"AEM00041194","2022-07-30",347,0,308,0,0,0,0,0,0,0
+"AEM00041194","2022-07-31",371,413,329,0,0,0,0,0,0,0
+"AEM00041194","2022-08-01",384,427,357,0,0,0,0,0,0,0
+"AEM00041194","2022-08-02",381,424,352,0,0,0,0,0,0,0
+```
+
+Using ClickHouse local and a simple `GROUP BY`, we can repivot our data to this structure. To limit memory overhead, we do this one file at a time.
+
+```bash
+for i in {1900..2022}
+do
+clickhouse-local --query "SELECT station_id,
+       toDate32(date) as date,
+       anyIf(value, measurement = 'TAVG') as tempAvg,
+       anyIf(value, measurement = 'TMAX') as tempMax,
+       anyIf(value, measurement = 'TMIN') as tempMin,
+       anyIf(value, measurement = 'PRCP') as precipitation,
+       anyIf(value, measurement = 'SNOW') as snowfall,
+       anyIf(value, measurement = 'SNWD') as snowDepth,
+       anyIf(value, measurement = 'PSUN') as percentDailySun,
+       anyIf(value, measurement = 'AWND') as averageWindSpeed,
+       anyIf(value, measurement = 'WSFG') as maxWindSpeed,
+       toUInt8OrZero(replaceOne(anyIf(measurement, startsWith(measurement, 'WT') AND value = 1), 'WT', '')) as weatherType
+FROM file('$i.csv.gz', CSV, 'station_id String, date String, measurement String, value Int64, mFlag String, qFlag String, sFlag String, obsTime String')
+ WHERE qFlag = '' AND (measurement IN ('PRCP', 'SNOW', 'SNWD', 'TMAX', 'TAVG', 'TMIN', 'PSUN', 'AWND', 'WSFG') OR startsWith(measurement, 'WT'))
+GROUP BY station_id, date
+ORDER BY station_id, date FORMAT CSV" >> "noaa.csv";
+done
+```
+
+This query produces a single 50GB file `noaa.csv`.
+
+### Enriching the data
+
+The data has no indication of location aside from a station id, which includes a prefix country code. Ideally, each station would have a latitude and longitude associated with it. To achieve this, NOAA conveniently provides the details of each station as a separate [ghcnd-stations.txt](https://github.com/awslabs/open-data-docs/tree/main/docs/noaa/noaa-ghcn#format-of-ghcnd-stationstxt-file). This file has [several columns](https://github.com/awslabs/open-data-docs/tree/main/docs/noaa/noaa-ghcn#format-of-ghcnd-stationstxt-file), of which five are useful to our future analysis: id, latitude, longitude, elevation, and name.
+
+```bash
+wget http://noaa-ghcn-pds.s3.amazonaws.com/ghcnd-stations.txt
+```
+
+```bash
+clickhouse local --query "WITH stations AS (SELECT id, lat, lon, elevation, splitByString(' GSN ',name)[1] as name FROM file('ghcnd-stations.txt', Regexp, 'id String, lat Float64, lon Float64, elevation Float32, name String'))
+SELECT station_id,
+       date,
+       tempAvg,
+       tempMax,
+       tempMin,
+       precipitation,
+       snowfall,
+       snowDepth,
+       percentDailySun,
+       averageWindSpeed,
+       maxWindSpeed,
+       weatherType,
+       tuple(lon, lat) as location,
+       elevation,
+       name
+FROM file('noaa.csv', CSV,
+          'station_id String, date Date32, tempAvg Int32, tempMax Int32, tempMin Int32, precipitation Int32, snowfall Int32, snowDepth Int32, percentDailySun Int8, averageWindSpeed Int32, maxWindSpeed Int32, weatherType UInt8') as noaa LEFT OUTER
+         JOIN stations ON noaa.station_id = stations.id INTO OUTFILE 'noaa_enriched.parquet' FORMAT Parquet SETTINGS format_regexp='^(.{11})\s+(\-?\d{1,2}\.\d{4})\s+(\-?\d{1,3}\.\d{1,4})\s+(\-?\d*\.\d*)\s+(.*)\s+(?:[\d]*)'" 
+```
+This query takes a few minutes to run and produces a 6.4 GB file, `noaa_enriched.parquet`.
+
+## Create table
+
+Create a MergeTree table in ClickHouse (from the ClickHouse client).
+
+```sql
+CREATE TABLE noaa
+(
+   `station_id` LowCardinality(String),
+   `date` Date32,
+   `tempAvg` Int32 COMMENT 'Average temperature (tenths of a degrees C)',
+   `tempMax` Int32 COMMENT 'Maximum temperature (tenths of degrees C)',
+   `tempMin` Int32 COMMENT 'Minimum temperature (tenths of degrees C)',
+   `precipitation` UInt32 COMMENT 'Precipitation (tenths of mm)',
+   `snowfall` UInt32 COMMENT 'Snowfall (mm)',
+   `snowDepth` UInt32 COMMENT 'Snow depth (mm)',
+   `percentDailySun` UInt8 COMMENT 'Daily percent of possible sunshine (percent)',
+   `averageWindSpeed` UInt32 COMMENT 'Average daily wind speed (tenths of meters per second)',
+   `maxWindSpeed` UInt32 COMMENT 'Peak gust wind speed (tenths of meters per second)',
+   `weatherType` Enum8('Normal' = 0, 'Fog' = 1, 'Heavy Fog' = 2, 'Thunder' = 3, 'Small Hail' = 4, 'Hail' = 5, 'Glaze' = 6, 'Dust/Ash' = 7, 'Smoke/Haze' = 8, 'Blowing/Drifting Snow' = 9, 'Tornado' = 10, 'High Winds' = 11, 'Blowing Spray' = 12, 'Mist' = 13, 'Drizzle' = 14, 'Freezing Drizzle' = 15, 'Rain' = 16, 'Freezing Rain' = 17, 'Snow' = 18, 'Unknown Precipitation' = 19, 'Ground Fog' = 21, 'Freezing Fog' = 22),
+   `location` Point,
+   `elevation` Float32,
+   `name` LowCardinality(String)
+) ENGINE = MergeTree() ORDER BY (station_id, date);
+
+```
+
+## Inserting into ClickHouse
+
+### Inserting from local file
+
+Data can be inserted from a local file as follows (from the ClickHouse client):
+
+```sql
+INSERT INTO noaa FROM INFILE '<path>/noaa_enriched.parquet'
+```
+
+where `<path>` represents the full path to the local file on disk. 
+
+See [here](https://clickhouse.com/blog/real-world-data-noaa-climate-data#load-the-data) for how to speed this load up.
+
+### Inserting from S3
+
+```sql
+INSERT INTO noaa SELECT *
+FROM s3('https://datasets-documentation.s3.eu-west-3.amazonaws.com/noaa/noaa_enriched.parquet')
+
+```
+For how to speed this up, see our blog post on [tuning large data loads](https://clickhouse.com/blog/supercharge-your-clickhouse-data-loads-part2).
+
+## Sample queries
+
+### Highest temperature ever
+
+```sql
+SELECT
+    tempMax / 10 AS maxTemp,
+    location,
+    name,
+    date
+FROM blogs.noaa
+WHERE tempMax > 500
+ORDER BY
+    tempMax DESC,
+    date ASC
+LIMIT 5
+
+┌─maxTemp─┬─location──────────┬─name───────────────────────────────────────────┬───────date─�
+│    56.7 │ (-116.8667,36.45) │ CA GREENLAND RCH                               │ 1913-07-10 │
+│    56.7 │ (-115.4667,32.55) │ MEXICALI (SMN)                                 │ 1949-08-20 │
+│    56.7 │ (-115.4667,32.55) │ MEXICALI (SMN)                                 │ 1949-09-18 │
+│    56.7 │ (-115.4667,32.55) │ MEXICALI (SMN)                                 │ 1952-07-17 │
+│    56.7 │ (-115.4667,32.55) │ MEXICALI (SMN)                                 │ 1952-09-04 │
+└─────────┴───────────────────┴────────────────────────────────────────────────┴────────────┘
+
+5 rows in set. Elapsed: 0.514 sec. Processed 1.06 billion rows, 4.27 GB (2.06 billion rows/s., 8.29 GB/s.)
+```
+
+Reassuringly consistent with the [documented record](https://en.wikipedia.org/wiki/List_of_weather_records#Highest_temperatures_ever_recorded) at [Furnace Creek](https://www.google.com/maps/place/36%C2%B027'00.0%22N+116%C2%B052'00.1%22W/@36.1329666,-116.1104099,8.95z/data=!4m5!3m4!1s0x0:0xf2ed901b860f4446!8m2!3d36.45!4d-116.8667) as of 2023.
+
+### Best ski resorts
+
+Using a [list of ski resorts](https://gist.githubusercontent.com/gingerwizard/dd022f754fd128fdaf270e58fa052e35/raw/622e03c37460f17ef72907afe554cb1c07f91f23/ski_resort_stats.csv) in the united states and their respective locations, we join these against the top 1000 weather stations with the most in any month in the last 5 yrs. Sorting this join by [geoDistance](https://clickhouse.com/docs/en/sql-reference/functions/geo/coordinates/#geodistance) and restricting the results to those where the distance is less than 20km, we select the top result per resort and sort this by total snow. Note we also restrict resorts to those above 1800m, as a broad indicator of good skiing conditions.
+
+```sql
+SELECT
+   resort_name,
+   total_snow / 1000 AS total_snow_m,
+   resort_location,
+   month_year
+FROM
+(
+   WITH resorts AS
+       (
+           SELECT
+               resort_name,
+               state,
+               (lon, lat) AS resort_location,
+               'US' AS code
+           FROM url('https://gist.githubusercontent.com/gingerwizard/dd022f754fd128fdaf270e58fa052e35/raw/622e03c37460f17ef72907afe554cb1c07f91f23/ski_resort_stats.csv', CSVWithNames)
+       )
+   SELECT
+       resort_name,
+       highest_snow.station_id,
+       geoDistance(resort_location.1, resort_location.2, station_location.1, station_location.2) / 1000 AS distance_km,
+       highest_snow.total_snow,
+       resort_location,
+       station_location,
+       month_year
+   FROM
+   (
+       SELECT
+           sum(snowfall) AS total_snow,
+           station_id,
+           any(location) AS station_location,
+           month_year,
+           substring(station_id, 1, 2) AS code
+       FROM noaa
+       WHERE (date > '2017-01-01') AND (code = 'US') AND (elevation > 1800)
+       GROUP BY
+           station_id,
+           toYYYYMM(date) AS month_year
+       ORDER BY total_snow DESC
+       LIMIT 1000
+   ) AS highest_snow
+   INNER JOIN resorts ON highest_snow.code = resorts.code
+   WHERE distance_km < 20
+   ORDER BY
+       resort_name ASC,
+       total_snow DESC
+   LIMIT 1 BY
+       resort_name,
+       station_id
+)
+ORDER BY total_snow DESC
+LIMIT 5
+
+┌─resort_name──────────┬─total_snow_m─┬─resort_location─┬─month_year─�
+│ Sugar Bowl, CA       │        7.799 │ (-120.3,39.27)  │     201902 │
+│ Donner Ski Ranch, CA │        7.799 │ (-120.34,39.31) │     201902 │
+│ Boreal, CA           │        7.799 │ (-120.35,39.33) │     201902 │
+│ Homewood, CA         │        4.926 │ (-120.17,39.08) │     201902 │
+│ Alpine Meadows, CA   │        4.926 │ (-120.22,39.17) │     201902 │
+└──────────────────────┴──────────────┴─────────────────┴────────────┘
+
+5 rows in set. Elapsed: 0.750 sec. Processed 689.10 million rows, 3.20 GB (918.20 million rows/s., 4.26 GB/s.)
+Peak memory usage: 67.66 MiB.
+```
+
+## Credits
+
+We would like to acknowledge the efforts of the Global Historical Climatology Network for preparing, cleansing, and distributing this data. We appreciate your efforts.
+
+Menne, M.J., I. Durre, B. Korzeniewski, S. McNeal, K. Thomas, X. Yin, S. Anthony, R. Ray, R.S. Vose, B.E.Gleason, and T.G. Houston, 2012: Global Historical Climatology Network - Daily (GHCN-Daily), Version 3. [indicate subset used following decimal, e.g. Version 3.25]. NOAA National Centers for Environmental Information. http://doi.org/10.7289/V5D21VHZ [17/08/2020]
diff --git a/docs/en/getting-started/example-datasets/nyc-taxi.md b/docs/en/getting-started/example-datasets/nyc-taxi.md
index cac75fdc45a..516a6d54248 100644
--- a/docs/en/getting-started/example-datasets/nyc-taxi.md
+++ b/docs/en/getting-started/example-datasets/nyc-taxi.md
@@ -248,6 +248,9 @@ Some of the files might not download fully. Check the file sizes and re-download
 
 ``` bash
 $ curl -O https://datasets.clickhouse.com/trips_mergetree/partitions/trips_mergetree.tar
+# Validate the checksum
+$ md5sum trips_mergetree.tar
+# Checksum should be equal to: f3b8d469b41d9a82da064ded7245d12c
 $ tar xvf trips_mergetree.tar -C /var/lib/clickhouse # path to ClickHouse data directory
 $ # check permissions of unpacked data, fix if required
 $ sudo service clickhouse-server restart
diff --git a/docs/en/getting-started/example-datasets/opensky.md b/docs/en/getting-started/example-datasets/opensky.md
index df28809495c..c0b4d96725d 100644
--- a/docs/en/getting-started/example-datasets/opensky.md
+++ b/docs/en/getting-started/example-datasets/opensky.md
@@ -7,7 +7,7 @@ title: "Crowdsourced air traffic data from The OpenSky Network 2020"
 
 The data in this dataset is derived and cleaned from the full OpenSky dataset to illustrate the development of air traffic during the COVID-19 pandemic. It spans all flights seen by the network's more than 2500 members since 1 January 2019. More data will be periodically included in the dataset until the end of the COVID-19 pandemic.
 
-Source: https://zenodo.org/record/5092942#.YRBCyTpRXYd
+Source: https://zenodo.org/records/5092942
 
 Martin Strohmeier, Xavier Olive, Jannis Luebbe, Matthias Schaefer, and Vincent Lenders
 "Crowdsourced air traffic data from the OpenSky Network 2019–2020"
@@ -19,7 +19,7 @@ https://doi.org/10.5194/essd-13-357-2021
 Run the command:
 
 ```bash
-wget -O- https://zenodo.org/record/5092942 | grep -oP 'https://zenodo.org/record/5092942/files/flightlist_\d+_\d+\.csv\.gz' | xargs wget
+wget -O- https://zenodo.org/records/5092942 | grep -oE 'https://zenodo.org/records/5092942/files/flightlist_[0-9]+_[0-9]+\.csv\.gz' | xargs wget
 ```
 
 Download will take about 2 minutes with good internet connection. There are 30 files with total size of 4.3 GB.
@@ -127,15 +127,15 @@ Average flight distance is around 1000 km.
 Query:
 
 ```sql
-SELECT avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)) FROM opensky;
+SELECT round(avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)), 2) FROM opensky;
 ```
 
 Result:
 
 ```text
-┌─avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2))─�
-│                                                 1041090.6465708319 │
-└────────────────────────────────────────────────────────────────────┘
+   ┌─round(avg(geoDistance(longitude_1, latitude_1, longitude_2, latitude_2)), 2)─�
+1. │                                                                   1041090.67 │ -- 1.04 million
+   └──────────────────────────────────────────────────────────────────────────────┘
 ```
 
 ### Most busy origin airports and the average distance seen {#busy-airports-average-distance}
diff --git a/docs/en/getting-started/example-datasets/tw-weather.md b/docs/en/getting-started/example-datasets/tw-weather.md
new file mode 100644
index 00000000000..e5f16c403d5
--- /dev/null
+++ b/docs/en/getting-started/example-datasets/tw-weather.md
@@ -0,0 +1,293 @@
+---
+slug: /en/getting-started/example-datasets/tw-weather
+sidebar_label: Taiwan Historical Weather Datasets
+sidebar_position: 1
+description: 131 million rows of weather observation data for the last 128 yrs
+---
+
+# Taiwan Historical Weather Datasets
+
+This dataset contains historical meteorological observations measurements for the last 128 years. Each row is a measurement for a point in date time and weather station.
+
+The origin of this dataset is available [here](https://github.com/Raingel/historical_weather) and the list of weather station numbers can be found [here](https://github.com/Raingel/weather_station_list).
+
+> The sources of meteorological datasets include the meteorological stations that are established by the Central Weather Administration (station code is beginning with C0, C1, and 4) and the agricultural meteorological stations belonging to the Council of Agriculture (station code other than those mentioned above):
+
+    - StationId
+    - MeasuredDate, the observation time
+    - StnPres, the station air pressure
+    - SeaPres, the sea level pressure
+    - Td, the dew point temperature
+    - RH, the relative humidity
+    - Other elements where available
+
+## Downloading the data
+
+- A [pre-processed version](#pre-processed-data) of the data for the ClickHouse, which has been cleaned, re-structured, and enriched. This dataset covers the years from 1896 to 2023.
+- [Download the original raw data](#original-raw-data) and convert to the format required by ClickHouse. Users wanting to add their own columns may wish to explore or complete their approaches.
+
+### Pre-processed data
+
+The dataset has also been re-structured from a measurement per line to a row per weather station id and measured date, i.e.
+
+```csv
+StationId,MeasuredDate,StnPres,Tx,RH,WS,WD,WSGust,WDGust,Precp,GloblRad,TxSoil0cm,TxSoil5cm,TxSoil20cm,TxSoil50cm,TxSoil100cm,SeaPres,Td,PrecpHour,SunShine,TxSoil10cm,EvapA,Visb,UVI,Cloud Amount,TxSoil30cm,TxSoil200cm,TxSoil300cm,TxSoil500cm,VaporPressure
+C0X100,2016-01-01 01:00:00,1022.1,16.1,72,1.1,8.0,,,,,,,,,,,,,,,,,,,,,,,
+C0X100,2016-01-01 02:00:00,1021.6,16.0,73,1.2,358.0,,,,,,,,,,,,,,,,,,,,,,,
+C0X100,2016-01-01 03:00:00,1021.3,15.8,74,1.5,353.0,,,,,,,,,,,,,,,,,,,,,,,
+C0X100,2016-01-01 04:00:00,1021.2,15.8,74,1.7,8.0,,,,,,,,,,,,,,,,,,,,,,,
+```
+
+It is easy to query and ensure that the resulting table has less sparse and some elements are null because they're not available to be measured in this weather station.
+
+This dataset is available in the following Google CloudStorage location. Either download the dataset to your local filesystem (and insert them with the ClickHouse client) or insert them directly into the ClickHouse (see [Inserting from URL](#inserting-from-url)).
+
+To download:
+
+```bash
+wget https://storage.googleapis.com/taiwan-weather-observaiton-datasets/preprocessed_weather_daily_1896_2023.tar.gz
+
+# Option: Validate the checksum
+md5sum preprocessed_weather_daily_1896_2023.tar.gz
+# Checksum should be equal to: 11b484f5bd9ddafec5cfb131eb2dd008
+
+tar -xzvf preprocessed_weather_daily_1896_2023.tar.gz
+daily_weather_preprocessed_1896_2023.csv
+
+# Option: Validate the checksum
+md5sum daily_weather_preprocessed_1896_2023.csv
+# Checksum should be equal to: 1132248c78195c43d93f843753881754
+```
+
+### Original raw data
+
+The following details are about the steps to download the original raw data to transform and convert as you want.
+
+#### Download
+
+To download the original raw data:
+
+```bash
+mkdir tw_raw_weather_data && cd tw_raw_weather_data
+
+wget https://storage.googleapis.com/taiwan-weather-observaiton-datasets/raw_data_weather_daily_1896_2023.tar.gz
+
+# Option: Validate the checksum
+md5sum raw_data_weather_daily_1896_2023.tar.gz
+# Checksum should be equal to: b66b9f137217454d655e3004d7d1b51a
+
+tar -xzvf raw_data_weather_daily_1896_2023.tar.gz
+466920_1928.csv
+466920_1929.csv
+466920_1930.csv
+466920_1931.csv
+...
+
+# Option: Validate the checksum
+cat *.csv | md5sum
+# Checksum should be equal to: b26db404bf84d4063fac42e576464ce1
+```
+
+#### Retrieve the Taiwan weather stations
+
+```bash
+wget -O weather_sta_list.csv https://github.com/Raingel/weather_station_list/raw/main/data/weather_sta_list.csv
+
+# Option: Convert the UTF-8-BOM to UTF-8 encoding
+sed -i '1s/^\xEF\xBB\xBF//' weather_sta_list.csv
+```
+
+## Create table schema
+
+Create the MergeTree table in ClickHouse (from the ClickHouse client).
+
+```bash
+CREATE TABLE tw_weather_data (
+    StationId String null,
+    MeasuredDate DateTime64,
+    StnPres Float64 null,
+    SeaPres Float64 null,
+    Tx Float64 null,
+    Td Float64 null,
+    RH Float64 null,
+    WS Float64 null,
+    WD Float64 null,
+    WSGust Float64 null,
+    WDGust Float64 null,
+    Precp Float64 null,
+    PrecpHour Float64 null,
+    SunShine Float64 null,
+    GloblRad Float64 null,
+    TxSoil0cm Float64 null,
+    TxSoil5cm Float64 null,
+    TxSoil10cm Float64 null,
+    TxSoil20cm Float64 null,
+    TxSoil50cm Float64 null,
+    TxSoil100cm Float64 null,
+    TxSoil30cm Float64 null,
+    TxSoil200cm Float64 null,
+    TxSoil300cm Float64 null,
+    TxSoil500cm Float64 null,
+    VaporPressure Float64 null,
+    UVI Float64 null,
+    "Cloud Amount" Float64 null,
+    EvapA Float64 null,
+    Visb Float64 null
+)
+ENGINE = MergeTree
+ORDER BY (MeasuredDate);
+```
+
+## Inserting into ClickHouse
+
+### Inserting from local file
+
+Data can be inserted from a local file as follows (from the ClickHouse client):
+
+```sql
+INSERT INTO tw_weather_data FROM INFILE '/path/to/daily_weather_preprocessed_1896_2023.csv'
+```
+
+where `/path/to` represents the specific user path to the local file on the disk.
+
+And the sample response output is as follows after inserting data into the ClickHouse:
+
+```response
+Query id: 90e4b524-6e14-4855-817c-7e6f98fbeabb
+
+Ok.
+131985329 rows in set. Elapsed: 71.770 sec. Processed 131.99 million rows, 10.06 GB (1.84 million rows/s., 140.14 MB/s.)
+Peak memory usage: 583.23 MiB.
+```
+
+### Inserting from URL
+
+```sql
+INSERT INTO tw_weather_data SELECT *
+FROM url('https://storage.googleapis.com/taiwan-weather-observaiton-datasets/daily_weather_preprocessed_1896_2023.csv', 'CSVWithNames')
+
+```
+To know how to speed this up, please see our blog post on [tuning large data loads](https://clickhouse.com/blog/supercharge-your-clickhouse-data-loads-part2).
+
+## Check data rows and sizes
+
+1. Let's see how many rows are inserted:
+
+```sql
+SELECT formatReadableQuantity(count())
+FROM tw_weather_data;
+```
+
+```response
+┌─formatReadableQuantity(count())─�
+│ 131.99 million                  │
+└─────────────────────────────────┘
+```
+
+2. Let's see how much disk space are used for this table:
+
+```sql
+SELECT
+    formatReadableSize(sum(bytes)) AS disk_size,
+    formatReadableSize(sum(data_uncompressed_bytes)) AS uncompressed_size
+FROM system.parts
+WHERE (`table` = 'tw_weather_data') AND active
+```
+
+```response
+┌─disk_size─┬─uncompressed_size─�
+│ 2.13 GiB  │ 32.94 GiB         │
+└───────────┴───────────────────┘
+```
+
+## Sample queries
+
+### Q1: Retrieve the highest dew point temperature for each weather station in the specific year
+
+```sql
+SELECT
+    StationId,
+    max(Td) AS max_td
+FROM tw_weather_data
+WHERE (year(MeasuredDate) = 2023) AND (Td IS NOT NULL)
+GROUP BY StationId
+
+┌─StationId─┬─max_td─�
+│ 466940    │      1 │
+│ 467300    │      1 │
+│ 467540    │      1 │
+│ 467490    │      1 │
+│ 467080    │      1 │
+│ 466910    │      1 │
+│ 467660    │      1 │
+│ 467270    │      1 │
+│ 467350    │      1 │
+│ 467571    │      1 │
+│ 466920    │      1 │
+│ 467650    │      1 │
+│ 467550    │      1 │
+│ 467480    │      1 │
+│ 467610    │      1 │
+│ 467050    │      1 │
+│ 467590    │      1 │
+│ 466990    │      1 │
+│ 467060    │      1 │
+│ 466950    │      1 │
+│ 467620    │      1 │
+│ 467990    │      1 │
+│ 466930    │      1 │
+│ 467110    │      1 │
+│ 466881    │      1 │
+│ 467410    │      1 │
+│ 467441    │      1 │
+│ 467420    │      1 │
+│ 467530    │      1 │
+│ 466900    │      1 │
+└───────────┴────────┘
+
+30 rows in set. Elapsed: 0.045 sec. Processed 6.41 million rows, 187.33 MB (143.92 million rows/s., 4.21 GB/s.)
+```
+
+### Q2: Raw data fetching with the specific duration time range, fields and weather station
+
+```sql
+SELECT
+    StnPres,
+    SeaPres,
+    Tx,
+    Td,
+    RH,
+    WS,
+    WD,
+    WSGust,
+    WDGust,
+    Precp,
+    PrecpHour
+FROM tw_weather_data
+WHERE (StationId = 'C0UB10') AND (MeasuredDate >= '2023-12-23') AND (MeasuredDate < '2023-12-24')
+ORDER BY MeasuredDate ASC
+LIMIT 10
+```
+
+```response
+┌─StnPres─┬─SeaPres─┬───Tx─┬───Td─┬─RH─┬──WS─┬──WD─┬─WSGust─┬─WDGust─┬─Precp─┬─PrecpHour─�
+│  1029.5 │    ᴺ�ᴸᴸ │ 11.8 │ ᴺ�ᴸᴸ │ 78 │ 2.7 │ 271 │    5.5 │    275 │ -99.8 │     -99.8 │
+│  1029.8 │    ᴺ�ᴸᴸ │ 12.3 │ ᴺ�ᴸᴸ │ 78 │ 2.7 │ 289 │    5.5 │    308 │ -99.8 │     -99.8 │
+│  1028.6 │    ᴺ�ᴸᴸ │ 12.3 │ ᴺ�ᴸᴸ │ 79 │ 2.3 │ 251 │    6.1 │    289 │ -99.8 │     -99.8 │
+│  1028.2 │    ᴺ�ᴸᴸ │   13 │ ᴺ�ᴸᴸ │ 75 │ 4.3 │ 312 │    7.5 │    316 │ -99.8 │     -99.8 │
+│  1027.8 │    ᴺ�ᴸᴸ │ 11.1 │ ᴺ�ᴸᴸ │ 89 │ 7.1 │ 310 │   11.6 │    322 │ -99.8 │     -99.8 │
+│  1027.8 │    ᴺ�ᴸᴸ │ 11.6 │ ᴺ�ᴸᴸ │ 90 │ 3.1 │ 269 │   10.7 │    295 │ -99.8 │     -99.8 │
+│  1027.9 │    ᴺ�ᴸᴸ │ 12.3 │ ᴺ�ᴸᴸ │ 89 │ 4.7 │ 296 │    8.1 │    310 │ -99.8 │     -99.8 │
+│  1028.2 │    ᴺ�ᴸᴸ │ 12.2 │ ᴺ�ᴸᴸ │ 94 │ 2.5 │ 246 │    7.1 │    283 │ -99.8 │     -99.8 │
+│  1028.4 │    ᴺ�ᴸᴸ │ 12.5 │ ᴺ�ᴸᴸ │ 94 │ 3.1 │ 265 │    4.8 │    297 │ -99.8 │     -99.8 │
+│  1028.3 │    ᴺ�ᴸᴸ │ 13.6 │ ᴺ�ᴸᴸ │ 91 │ 1.2 │ 273 │    4.4 │    256 │ -99.8 │     -99.8 │
+└─────────┴─────────┴──────┴──────┴────┴─────┴─────┴────────┴────────┴───────┴───────────┘
+
+10 rows in set. Elapsed: 0.009 sec. Processed 91.70 thousand rows, 2.33 MB (9.67 million rows/s., 245.31 MB/s.)
+```
+
+## Credits
+
+We would like to acknowledge the efforts of the Central Weather Administration and Agricultural Meteorological Observation Network (Station) of the Council of Agriculture for preparing, cleaning, and distributing this dataset. We appreciate your efforts.
+
+Ou, J.-H., Kuo, C.-H., Wu, Y.-F., Lin, G.-C., Lee, M.-H., Chen, R.-K., Chou, H.-P., Wu, H.-Y., Chu, S.-C., Lai, Q.-J., Tsai, Y.-C., Lin, C.-C., Kuo, C.-C., Liao, C.-T., Chen, Y.-N., Chu, Y.-W., Chen, C.-Y., 2023. Application-oriented deep learning model for early warning of rice blast in Taiwan. Ecological Informatics 73, 101950. https://doi.org/10.1016/j.ecoinf.2022.101950 [13/12/2022]
diff --git a/docs/en/getting-started/install.md b/docs/en/getting-started/install.md
index e8662ec16fa..e3be30bde8c 100644
--- a/docs/en/getting-started/install.md
+++ b/docs/en/getting-started/install.md
@@ -78,11 +78,8 @@ 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
-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 -rf "$GNUPGHOME"
-sudo chmod +r /usr/share/keyrings/clickhouse-keyring.gpg
+sudo apt-get install -y apt-transport-https ca-certificates curl gnupg
+curl -fsSL 'https://packages.clickhouse.com/rpm/lts/repodata/repomd.xml.key' | sudo gpg --dearmor -o /usr/share/keyrings/clickhouse-keyring.gpg
 
 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
@@ -265,7 +262,7 @@ The required version can be downloaded with `curl` or `wget` from repository htt
 After that downloaded archives should be unpacked and installed with installation scripts. Example for the latest stable version:
 
 ``` bash
-LATEST_VERSION=$(curl -s https://packages.clickhouse.com/tgz/stable/ | \
+LATEST_VERSION=$(curl -s https://raw.githubusercontent.com/ClickHouse/ClickHouse/master/utils/list-versions/version_date.tsv | \
     grep -Eo '[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+' | sort -V -r | head -n 1)
 export LATEST_VERSION
 
diff --git a/docs/en/interfaces/cli.md b/docs/en/interfaces/cli.md
index a53844e792f..1eb426af617 100644
--- a/docs/en/interfaces/cli.md
+++ b/docs/en/interfaces/cli.md
@@ -178,7 +178,7 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 - `--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. `--query` can be specified multiple times, e.g. `--query "SELECT 1" --query "SELECT 2"`. Cannot be used simultaneously with `--queries-file`.
-- `--queries-file` – file path with queries to execute. `--queries-file` can be specified multiple times, e.g. `--query queries1.sql --query queries2.sql`. Cannot be used simultaneously with `--query`.
+- `--queries-file` – file path with queries to execute. `--queries-file` can be specified multiple times, e.g. `--queries-file  queries1.sql --queries-file  queries2.sql`. 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).
@@ -197,6 +197,29 @@ You can pass parameters to `clickhouse-client` (all parameters have a default va
 Instead of `--host`, `--port`, `--user` and `--password` options, ClickHouse client also supports connection strings (see next section).
 
 
+## Aliases {#cli_aliases}
+
+- `\l` - SHOW DATABASES
+- `\d` - SHOW TABLES
+- `\c <DATABASE>` - USE DATABASE
+- `.` - repeat the last query
+
+
+## Shortkeys {#shortkeys_aliases}
+
+- `Alt (Option) + Shift + e` - open editor with current query. It is possible to set up an environment variable - `EDITOR`, by default vim is used.
+- `Alt (Option) + #` - comment line.
+- `Ctrl + r` - fuzzy history search.
+
+:::tip
+To configure the correct work of meta key (Option) on MacOS:
+
+iTerm2: Go to Preferences -> Profile -> Keys -> Left Option key and click Esc+
+:::
+
+The full list with all available shortkeys - [replxx](https://github.com/AmokHuginnsson/replxx/blob/1f149bf/src/replxx_impl.cxx#L262).
+
+
 ## Connection string {#connection_string}
 
 clickhouse-client alternatively supports connecting to clickhouse server using a connection string similar to [MongoDB](https://www.mongodb.com/docs/manual/reference/connection-string/), [PostgreSQL](https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING), [MySQL](https://dev.mysql.com/doc/refman/8.0/en/connecting-using-uri-or-key-value-pairs.html#connecting-using-uri). It has the following syntax:
@@ -220,7 +243,7 @@ If no database is specified, the `default` database will be used.
 
 If the user name, password or database was specified in the connection string, it cannot be specified using `--user`, `--password` or `--database` (and vice versa).
 
-The host component can either be an a host name and IP address. Put an IPv6 address in square brackets to specify it:
+The host component can either be a host name and IP address. Put an IPv6 address in square brackets to specify it:
 
 ```text
 clickhouse://[2001:db8::1234]
diff --git a/docs/en/interfaces/formats.md b/docs/en/interfaces/formats.md
index ed67af48af7..03cf345349e 100644
--- a/docs/en/interfaces/formats.md
+++ b/docs/en/interfaces/formats.md
@@ -7,6 +7,7 @@ title: Formats for Input and Output Data
 
 ClickHouse can accept and return data in various formats. A format supported for input can be used to parse the data provided to `INSERT`s, to perform `SELECT`s from a file-backed table such as File, URL or HDFS, or to read a dictionary. A format supported for output can be used to arrange the
 results of a `SELECT`, and to perform `INSERT`s into a file-backed table.
+All format names are case insensitive.
 
 The supported formats are:
 
@@ -33,7 +34,7 @@ The supported formats are:
 | [JSONAsString](#jsonasstring)                                                             | ✔    | ✗     |
 | [JSONStrings](#jsonstrings)                                                               | ✔    | ✔     |
 | [JSONColumns](#jsoncolumns)                                                               | ✔    | ✔     |
-| [JSONColumnsWithMetadata](#jsoncolumnsmonoblock))                                         | ✔    | ✔     |
+| [JSONColumnsWithMetadata](#jsoncolumnsmonoblock)                                          | ✔    | ✔     |
 | [JSONCompact](#jsoncompact)                                                               | ✔    | ✔     |
 | [JSONCompactStrings](#jsoncompactstrings)                                                 | ✗    | ✔     |
 | [JSONCompactColumns](#jsoncompactcolumns)                                                 | ✔    | ✔     |
@@ -78,7 +79,7 @@ The supported formats are:
 | [RowBinary](#rowbinary)                                                                   | ✔    | ✔     |
 | [RowBinaryWithNames](#rowbinarywithnamesandtypes)                                         | ✔    | ✔     |
 | [RowBinaryWithNamesAndTypes](#rowbinarywithnamesandtypes)                                 | ✔    | ✔     |
-| [RowBinaryWithDefaults](#rowbinarywithdefaults)                                           | ✔    | ✔     |
+| [RowBinaryWithDefaults](#rowbinarywithdefaults)                                           | ✔    | ✗     |
 | [Native](#native)                                                                         | ✔    | ✔     |
 | [Null](#null)                                                                             | ✗    | ✔     |
 | [XML](#xml)                                                                               | ✗    | ✔     |
@@ -253,7 +254,7 @@ This format is also available under the name `TSVRawWithNamesAndNames`.
 
 This format allows specifying a custom format string with placeholders for values with a specified escaping rule.
 
-It uses settings `format_template_resultset`, `format_template_row`, `format_template_rows_between_delimiter` and some settings of other formats (e.g. `output_format_json_quote_64bit_integers` when using `JSON` escaping, see further)
+It uses settings `format_template_resultset`, `format_template_row` (`format_template_row_format`), `format_template_rows_between_delimiter` and some settings of other formats (e.g. `output_format_json_quote_64bit_integers` when using `JSON` escaping, see further)
 
 Setting `format_template_row` specifies the path to the file containing format strings for rows with the following syntax:
 
@@ -279,9 +280,11 @@ the values of `SearchPhrase`, `c` and `price` columns, which are escaped as `Quo
 
 `Search phrase: 'bathroom interior design', count: 2166, ad price: $3;`
 
+In cases where it is challenging or not possible to deploy format output configuration for the template format to a directory on all nodes in a cluster, or if the format is trivial then `format_template_row_format` can be used to set the template string directly in the query, rather than a path to the file which contains it.
+
 The `format_template_rows_between_delimiter` setting specifies the delimiter between rows, which is printed (or expected) after every row except the last one (`\n` by default)
 
-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:
+Setting `format_template_resultset` specifies the path to the file, which contains a format string for resultset. Setting `format_template_resultset_format` can be used to set the template string for the result set directly in the query itself. 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)
@@ -1267,12 +1270,13 @@ SELECT * FROM json_each_row_nested
 - [input_format_json_read_arrays_as_strings](/docs/en/operations/settings/settings-formats.md/#input_format_json_read_arrays_as_strings) - allow to parse JSON arrays as strings in JSON input formats. Default value - `true`.
 - [input_format_json_read_objects_as_strings](/docs/en/operations/settings/settings-formats.md/#input_format_json_read_objects_as_strings) - allow to parse JSON objects as strings in JSON input formats. Default value - `true`.
 - [input_format_json_named_tuples_as_objects](/docs/en/operations/settings/settings-formats.md/#input_format_json_named_tuples_as_objects) - parse named tuple columns as JSON objects. Default value - `true`.
-- [input_format_json_try_infer_numbers_from_strings](/docs/en/operations/settings/settings-formats.md/#input_format_json_try_infer_numbers_from_strings) - Try to infer numbers from string fields while schema inference. Default value - `false`.
+- [input_format_json_try_infer_numbers_from_strings](/docs/en/operations/settings/settings-formats.md/#input_format_json_try_infer_numbers_from_strings) - try to infer numbers from string fields while schema inference. Default value - `false`.
 - [input_format_json_try_infer_named_tuples_from_objects](/docs/en/operations/settings/settings-formats.md/#input_format_json_try_infer_named_tuples_from_objects) - try to infer named tuple from JSON objects during schema inference. Default value - `true`.
 - [input_format_json_infer_incomplete_types_as_strings](/docs/en/operations/settings/settings-formats.md/#input_format_json_infer_incomplete_types_as_strings) - use type String for keys that contains only Nulls or empty objects/arrays during schema inference in JSON input formats. Default value - `true`.
 - [input_format_json_defaults_for_missing_elements_in_named_tuple](/docs/en/operations/settings/settings-formats.md/#input_format_json_defaults_for_missing_elements_in_named_tuple) - insert default values for missing elements in JSON object while parsing named tuple. Default value - `true`.
-- [input_format_json_ignore_unknown_keys_in_named_tuple](/docs/en/operations/settings/settings-formats.md/#input_format_json_ignore_unknown_keys_in_named_tuple) - Ignore unknown keys in json object for named tuples. Default value - `false`.
+- [input_format_json_ignore_unknown_keys_in_named_tuple](/docs/en/operations/settings/settings-formats.md/#input_format_json_ignore_unknown_keys_in_named_tuple) - ignore unknown keys in json object for named tuples. Default value - `false`.
 - [input_format_json_compact_allow_variable_number_of_columns](/docs/en/operations/settings/settings-formats.md/#input_format_json_compact_allow_variable_number_of_columns) - allow variable number of columns in JSONCompact/JSONCompactEachRow format, ignore extra columns and use default values on missing columns. Default value - `false`.
+- [input_format_json_throw_on_bad_escape_sequence](/docs/en/operations/settings/settings-formats.md/#input_format_json_throw_on_bad_escape_sequence) - throw an exception if JSON string contains bad escape sequence. If disabled, bad escape sequences will remain as is in the data. Default value - `true`.
 - [output_format_json_quote_64bit_integers](/docs/en/operations/settings/settings-formats.md/#output_format_json_quote_64bit_integers) - controls quoting of 64-bit integers in JSON output format. Default value - `true`.
 - [output_format_json_quote_64bit_floats](/docs/en/operations/settings/settings-formats.md/#output_format_json_quote_64bit_floats) - controls quoting of 64-bit floats in JSON output format. Default value - `false`.
 - [output_format_json_quote_denormals](/docs/en/operations/settings/settings-formats.md/#output_format_json_quote_denormals) - enables '+nan', '-nan', '+inf', '-inf' outputs in JSON output format. Default value - `false`.
@@ -1483,7 +1487,7 @@ Differs from [PrettySpaceNoEscapes](#prettyspacenoescapes) in that up to 10,000
 - [output_format_pretty_max_value_width](/docs/en/operations/settings/settings-formats.md/#output_format_pretty_max_value_width) - Maximum width of value to display in Pretty formats. If greater - it will be cut. Default value - `10000`.
 - [output_format_pretty_color](/docs/en/operations/settings/settings-formats.md/#output_format_pretty_color) - use ANSI escape sequences to paint colors in Pretty formats. Default value - `true`.
 - [output_format_pretty_grid_charset](/docs/en/operations/settings/settings-formats.md/#output_format_pretty_grid_charset) - Charset for printing grid borders. Available charsets: ASCII, UTF-8. Default value - `UTF-8`.
-- [output_format_pretty_row_numbers](/docs/en/operations/settings/settings-formats.md/#output_format_pretty_row_numbers) - Add row numbers before each row for pretty output format. Default value - `false`.
+- [output_format_pretty_row_numbers](/docs/en/operations/settings/settings-formats.md/#output_format_pretty_row_numbers) - Add row numbers before each row for pretty output format. Default value - `true`.
 
 ## RowBinary {#rowbinary}
 
@@ -2353,9 +2357,11 @@ You can select data from a ClickHouse table and save them into some file in the
 $ clickhouse-client --query="SELECT * FROM {some_table} FORMAT Arrow" > {filename.arrow}
 ```
 
-### Arrow format settings {#parquet-format-settings}
+### Arrow format settings {#arrow-format-settings}
 
 - [output_format_arrow_low_cardinality_as_dictionary](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_low_cardinality_as_dictionary) - enable output ClickHouse LowCardinality type as Dictionary Arrow type. Default value - `false`.
+- [output_format_arrow_use_64_bit_indexes_for_dictionary](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_use_64_bit_indexes_for_dictionary) - use 64-bit integer type for Dictionary indexes. Default value - `false`.
+- [output_format_arrow_use_signed_indexes_for_dictionary](/docs/en/operations/settings/settings-formats.md/#output_format_arrow_use_signed_indexes_for_dictionary) - use signed integer type for Dictionary indexes. Default value - `true`.
 - [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`.
 - [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`.
@@ -2459,7 +2465,7 @@ Result:
 
 ## Npy {#data-format-npy}
 
-This function is designed to load a NumPy array from a .npy file into ClickHouse. The NumPy file format is a binary format used for efficiently storing arrays of numerical data. During import, ClickHouse treats top level dimension as an array of rows with single column. Supported Npy data types and their corresponding type in ClickHouse: 
+This function is designed to load a NumPy array from a .npy file into ClickHouse. The NumPy file format is a binary format used for efficiently storing arrays of numerical data. During import, ClickHouse treats top level dimension as an array of rows with single column. Supported Npy data types and their corresponding type in ClickHouse:
 | Npy type | ClickHouse type |
 |:--------:|:---------------:|
 | b1       |    UInt8        |
diff --git a/docs/en/interfaces/http.md b/docs/en/interfaces/http.md
index 4eeb19cefcf..bba5cde16f1 100644
--- a/docs/en/interfaces/http.md
+++ b/docs/en/interfaces/http.md
@@ -507,16 +507,18 @@ Example:
 ``` xml
 <http_handlers>
     <rule>
-        <url><![CDATA[/query_param_with_url/\w+/(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></url>
+        <url><![CDATA[regex:/query_param_with_url/(?P<name_1>[^/]+)]]></url>
         <methods>GET</methods>
         <headers>
             <XXX>TEST_HEADER_VALUE</XXX>
-            <PARAMS_XXX><![CDATA[(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></PARAMS_XXX>
+            <PARAMS_XXX><![CDATA[regex:(?P<name_2>[^/]+)]]></PARAMS_XXX>
         </headers>
         <handler>
             <type>predefined_query_handler</type>
-            <query>SELECT value FROM system.settings WHERE name = {name_1:String}</query>
-            <query>SELECT name, value FROM system.settings WHERE name = {name_2:String}</query>
+            <query>
+                SELECT name, value FROM system.settings
+                WHERE name IN ({name_1:String}, {name_2:String})
+            </query>
         </handler>
     </rule>
     <defaults/>
@@ -524,13 +526,13 @@ Example:
 ```
 
 ``` bash
-$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:8123/query_param_with_url/1/max_threads/max_final_threads?max_threads=1&max_final_threads=2'
-1
-max_final_threads   2
+$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_final_threads' 'http://localhost:8123/query_param_with_url/max_threads?max_threads=1&max_final_threads=2'
+max_final_threads	2
+max_threads	1
 ```
 
 :::note
-In one `predefined_query_handler` only supports one `query` of an insert type.
+In one `predefined_query_handler` only one `query` is supported.
 :::
 
 ### dynamic_query_handler {#dynamic_query_handler}
diff --git a/docs/en/interfaces/postgresql.md b/docs/en/interfaces/postgresql.md
index 1146274b012..7306575a4d3 100644
--- a/docs/en/interfaces/postgresql.md
+++ b/docs/en/interfaces/postgresql.md
@@ -69,5 +69,3 @@ psql "port=9005 host=127.0.0.1 user=alice dbname=default sslcert=/path/to/certif
 ```
 
 View the [PostgreSQL docs](https://jdbc.postgresql.org/documentation/head/ssl-client.html) for more details on their SSL settings.
-
-[Original article](https://clickhouse.com/docs/en/interfaces/postgresql)
diff --git a/docs/en/interfaces/schema-inference.md b/docs/en/interfaces/schema-inference.md
index 4db1d53987a..05fae994cbe 100644
--- a/docs/en/interfaces/schema-inference.md
+++ b/docs/en/interfaces/schema-inference.md
@@ -13,7 +13,7 @@ can control it.
 
 Schema inference is used when ClickHouse needs to read the data in a specific data format and the structure is unknown.
 
-## Table functions [file](../sql-reference/table-functions/file.md), [s3](../sql-reference/table-functions/s3.md), [url](../sql-reference/table-functions/url.md), [hdfs](../sql-reference/table-functions/hdfs.md).
+## Table functions [file](../sql-reference/table-functions/file.md), [s3](../sql-reference/table-functions/s3.md), [url](../sql-reference/table-functions/url.md), [hdfs](../sql-reference/table-functions/hdfs.md), [azureBlobStorage](../sql-reference/table-functions/azureBlobStorage.md).
 
 These table functions have the optional argument `structure` with the structure of input data. If this argument is not specified or set to `auto`, the structure will be inferred from the data.
 
@@ -55,7 +55,7 @@ DESCRIBE file('hobbies.jsonl')
 └─────────┴─────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
-## Table engines [File](../engines/table-engines/special/file.md), [S3](../engines/table-engines/integrations/s3.md), [URL](../engines/table-engines/special/url.md), [HDFS](../engines/table-engines/integrations/hdfs.md)
+## Table engines [File](../engines/table-engines/special/file.md), [S3](../engines/table-engines/integrations/s3.md), [URL](../engines/table-engines/special/url.md), [HDFS](../engines/table-engines/integrations/hdfs.md), [azureBlobStorage](../engines/table-engines/integrations/azureBlobStorage.md)
 
 If the list of columns is not specified in `CREATE TABLE` query, the structure of the table will be inferred automatically from the data.
 
@@ -549,6 +549,48 @@ Result:
 └───────┴─────────────────────────────────────────────────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
+##### input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects
+
+Enabling this setting allows to use String type for ambiguous paths during named tuples inference from JSON objects (when `input_format_json_try_infer_named_tuples_from_objects` is enabled) instead of an exception.
+It allows to read JSON objects as named Tuples even if there are ambiguous paths.
+
+Disabled by default.
+
+**Examples**
+
+With disabled setting:
+```sql
+SET input_format_json_try_infer_named_tuples_from_objects = 1;
+SET input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects = 0;
+DESC format(JSONEachRow, '{"obj" : {"a" : 42}}, {"obj" : {"a" : {"b" : "Hello"}}}');
+```
+Result:
+
+```text
+Code: 636. DB::Exception: The table structure cannot be extracted from a JSONEachRow format file. Error:
+Code: 117. DB::Exception: JSON objects have ambiguous data: in some objects path 'a' has type 'Int64' and in some - 'Tuple(b String)'. You can enable setting input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects to use String type for path 'a'. (INCORRECT_DATA) (version 24.3.1.1).
+You can specify the structure manually. (CANNOT_EXTRACT_TABLE_STRUCTURE)
+```
+
+With enabled setting:
+```sql
+SET input_format_json_try_infer_named_tuples_from_objects = 1;
+SET input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects = 1;
+DESC format(JSONEachRow, '{"obj" : "a" : 42}, {"obj" : {"a" : {"b" : "Hello"}}}');
+SELECT * FROM format(JSONEachRow, '{"obj" : {"a" : 42}}, {"obj" : {"a" : {"b" : "Hello"}}}');
+```
+
+Result:
+```text
+┌─name─┬─type──────────────────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─�
+│ obj  │ Tuple(a Nullable(String))     │              │                    │         │                  │                │
+└──────┴───────────────────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+┌─obj─────────────────�
+│ ('42')              │
+│ ('{"b" : "Hello"}') │
+└─────────────────────┘
+```
+
 ##### input_format_json_read_objects_as_strings
 
 Enabling this setting allows reading nested JSON objects as strings.
@@ -1061,7 +1103,7 @@ $$)
 └──────────────┴───────────────┘
 ```
 
-## Values {#values}
+### Values {#values}
 
 In Values format ClickHouse extracts column value from the row and then parses it using
 the recursive parser similar to how literals are parsed.
@@ -1554,6 +1596,28 @@ DESC format(JSONEachRow, $$
 └──────┴──────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
 ```
 
+#### input_format_try_infer_exponent_floats
+
+If enabled, ClickHouse will try to infer floats in exponential form for text formats (except JSON where numbers in exponential form are always inferred).
+
+Disabled by default.
+
+**Example**
+
+```sql
+SET input_format_try_infer_exponent_floats = 1;
+DESC format(CSV,
+$$1.1E10
+2.3e-12
+42E00
+$$)
+```
+```response
+┌─name─┬─type──────────────┬─default_type─┬─default_expression─┬─comment─┬─codec_expression─┬─ttl_expression─�
+│ c1   │ Nullable(Float64) │              │                    │         │                  │                │
+└──────┴───────────────────┴──────────────┴────────────────────┴─────────┴──────────────────┴────────────────┘
+```
+
 ## Self describing formats {#self-describing-formats}
 
 Self-describing formats contain information about the structure of the data in the data itself,
@@ -1986,3 +2050,46 @@ Note:
 - As some of the files may not contain some columns from the resulting schema, union mode is supported only for formats that support reading subset of columns (like JSONEachRow, Parquet, TSVWithNames, etc) and won't work for other formats (like CSV, TSV, JSONCompactEachRow, etc).
 - If ClickHouse cannot infer the schema from one of the files, the exception will be thrown.
 - If you have a lot of files, reading schema from all of them can take a lot of time.
+
+
+## Automatic format detection {#automatic-format-detection}
+
+If data format is not specified and cannot be determined by the file extension, ClickHouse will try to detect the file format by its content.
+
+**Examples:**
+
+Let's say we have `data` with the following content:
+```
+"a","b"
+1,"Data1"
+2,"Data2"
+3,"Data3"
+```
+
+We can inspect and query this file without specifying format or structure:
+```sql
+:) desc file(data);
+```
+
+```text
+┌─name─┬─type─────────────�
+│ a    │ Nullable(Int64)  │
+│ b    │ Nullable(String) │
+└──────┴──────────────────┘
+```
+
+```sql
+:) select * from file(data);
+```
+
+```text
+┌─a─┬─b─────�
+│ 1 │ Data1 │
+│ 2 │ Data2 │
+│ 3 │ Data3 │
+└───┴───────┘
+```
+
+:::note
+ClickHouse can detect only some subset of formats and this detection takes some time, it's always better to specify the format explicitly.
+:::
\ No newline at end of file
diff --git a/docs/en/interfaces/third-party/gui.md b/docs/en/interfaces/third-party/gui.md
index 900764b8128..0b3ca3db3a9 100644
--- a/docs/en/interfaces/third-party/gui.md
+++ b/docs/en/interfaces/third-party/gui.md
@@ -306,3 +306,18 @@ License: [commercial](https://tablum.io/pricing) product with 3-month free perio
 
 Try it out for free [in the cloud](https://tablum.io/try).
 Learn more about the product at [TABLUM.IO](https://tablum.io/)
+
+### CKMAN {#ckman}
+
+[CKMAN] (https://www.github.com/housepower/ckman) is a tool for managing and monitoring ClickHouse clusters!
+
+Features:
+
+- Rapid and convenient automated deployment of clusters through a browser interface
+- Clusters can be scaled or scaled
+- Load balance the data of the cluster
+- Upgrade the cluster online
+- Modify the cluster configuration on the page
+- Provides cluster node monitoring and zookeeper monitoring
+- Monitor the status of tables and partitions, and monitor slow SQL statements
+- Provides an easy-to-use SQL execution page
diff --git a/docs/en/operations/allocation-profiling.md b/docs/en/operations/allocation-profiling.md
new file mode 100644
index 00000000000..64b4106a7e1
--- /dev/null
+++ b/docs/en/operations/allocation-profiling.md
@@ -0,0 +1,207 @@
+---
+slug: /en/operations/allocation-profiling
+sidebar_label: "Allocation profiling"
+title: "Allocation profiling"
+---
+
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# Allocation profiling
+
+ClickHouse uses [jemalloc](https://github.com/jemalloc/jemalloc) as its global allocator that comes with some tools for allocation sampling and profiling.  
+To make allocation profiling more convenient, `SYSTEM` commands are provided along 4LW commands in Keeper.
+
+## Sampling allocations and flushing heap profiles
+
+If we want to sample and profile allocations in `jemalloc`, we need to start ClickHouse/Keeper with profiling enabled using environment variable `MALLOC_CONF`.
+
+```sh
+MALLOC_CONF=background_thread:true,prof:true
+```
+
+`jemalloc` will sample allocation and store the information internally.
+
+We can tell `jemalloc` to flush current profile by running:
+
+<Tabs groupId="binary">
+<TabItem value="clickhouse" label="ClickHouse">
+
+    SYSTEM JEMALLOC FLUSH PROFILE
+
+</TabItem>
+<TabItem value="keeper" label="Keeper">
+
+    echo jmfp | nc localhost 9181
+
+</TabItem>
+</Tabs>
+
+By default, heap profile file will be generated in `/tmp/jemalloc_clickhouse._pid_._seqnum_.heap` where `_pid_` is the PID of ClickHouse and `_seqnum_` is the global sequence number for the current heap profile.  
+For Keeper, the default file is `/tmp/jemalloc_keeper._pid_._seqnum_.heap` following the same rules.
+
+A different location can be defined by appending the `MALLOC_CONF` environment variable with `prof_prefix` option.  
+For example, if we want to generate profiles in `/data` folder where the prefix for filename will be `my_current_profile` we can run ClickHouse/Keeper with following environment variable:
+```sh
+MALLOC_CONF=background_thread:true,prof:true,prof_prefix:/data/my_current_profile
+```
+Generated file will append to prefix PID and sequence number.
+
+## Analyzing heap profiles
+
+After we generated heap profiles, we need to analyze them.  
+For that, we need to use `jemalloc`'s tool called [jeprof](https://github.com/jemalloc/jemalloc/blob/dev/bin/jeprof.in) which can be installed in multiple ways:
+- installing `jemalloc` using system's package manager
+- cloning [jemalloc repo](https://github.com/jemalloc/jemalloc) and running autogen.sh from the root folder that will provide you with `jeprof` script inside the `bin` folder
+
+:::note
+`jeprof` uses `addr2line` to generate stacktraces which can be really slow.  
+If that’s the case, we recommend installing an [alternative implementation](https://github.com/gimli-rs/addr2line) of the tool.
+
+```
+git clone https://github.com/gimli-rs/addr2line
+cd addr2line
+cargo b --examples -r
+cp ./target/release/examples/addr2line path/to/current/addr2line
+```
+:::
+
+There are many different formats to generate from the heap profile using `jeprof`.
+We recommend to run `jeprof --help` to check usage and many different options the tool provides. 
+
+In general, `jeprof` command will look like this:
+
+```sh
+jeprof path/to/binary path/to/heap/profile --output_format [ > output_file]
+```
+
+If we want to compare which allocations happened between 2 profiles we can set the base argument:
+
+```sh
+jeprof path/to/binary --base path/to/first/heap/profile path/to/second/heap/profile --output_format [ > output_file]
+```
+
+For example:
+
+- if we want to generate a text file with each procedure written per line:
+
+```sh
+jeprof path/to/binary path/to/heap/profile --text > result.txt
+```
+
+- if we want to generate a PDF file with call-graph:
+
+```sh
+jeprof path/to/binary path/to/heap/profile --pdf > result.pdf
+```
+
+### Generating flame graph
+
+`jeprof` allows us to generate collapsed stacks for building flame graphs.
+
+We need to use `--collapsed` argument:
+
+```sh
+jeprof path/to/binary path/to/heap/profile --collapsed > result.collapsed
+```
+
+After that, we can use many different tools to visualize collapsed stacks.
+
+Most popular would be [FlameGraph](https://github.com/brendangregg/FlameGraph) which contains a script called `flamegraph.pl`:
+
+```sh
+cat result.collapsed | /path/to/FlameGraph/flamegraph.pl --color=mem --title="Allocation Flame Graph" --width 2400 > result.svg
+```
+
+Another interesting tool is [speedscope](https://www.speedscope.app/) that allows you to analyze collected stacks in a more interactive way.
+
+## Controlling allocation profiler during runtime
+
+If ClickHouse/Keeper were started with enabled profiler, they support additional commands for disabling/enabling allocation profiling during runtime.
+Using those commands, it's easier to profile only specific intervals.
+
+Disable profiler:
+
+<Tabs groupId="binary">
+<TabItem value="clickhouse" label="ClickHouse">
+
+    SYSTEM JEMALLOC DISABLE PROFILE
+
+</TabItem>
+<TabItem value="keeper" label="Keeper">
+
+    echo jmdp | nc localhost 9181
+
+</TabItem>
+</Tabs>
+
+Enable profiler:
+
+<Tabs groupId="binary">
+<TabItem value="clickhouse" label="ClickHouse">
+
+    SYSTEM JEMALLOC ENABLE PROFILE
+
+</TabItem>
+<TabItem value="keeper" label="Keeper">
+
+    echo jmep | nc localhost 9181
+
+</TabItem>
+</Tabs>
+
+It's also possible to control the initial state of the profiler by setting `prof_active` option which is enabled by default.  
+For example, if we don't want to sample allocations during startup but only after we enable the profiler, we can start ClickHouse/Keeper with following environment variable:
+```sh
+MALLOC_CONF=background_thread:true,prof:true,prof_active:false
+```
+
+and enable profiler at a later point.
+
+## Additional options for profiler
+
+`jemalloc` has many different options available related to profiler which can be controlled by modifying `MALLOC_CONF` environment variable.
+For example, interval between allocation samples can be controlled with `lg_prof_sample`.  
+If you want to dump heap profile every N bytes you can enable it using `lg_prof_interval`.  
+
+We recommend to check `jemalloc`s [reference page](https://jemalloc.net/jemalloc.3.html) for such options.
+
+## Other resources
+
+ClickHouse/Keeper expose `jemalloc` related metrics in many different ways.
+
+:::warning Warning
+It's important to be aware that none of these metrics are synchronized with each other and values may drift.
+:::
+
+### System table `asynchronous_metrics`
+
+```sql
+SELECT *
+FROM system.asynchronous_metrics
+WHERE metric ILIKE '%jemalloc%'
+FORMAT Vertical
+```
+
+[Reference](/en/operations/system-tables/asynchronous_metrics)
+
+### System table `jemalloc_bins`
+
+Contains information about memory allocations done via jemalloc allocator in different size classes (bins) aggregated from all arenas.
+
+[Reference](/en/operations/system-tables/jemalloc_bins)
+
+### Prometheus
+
+All `jemalloc` related metrics from `asynchronous_metrics` are also exposed using Prometheus endpoint in both ClickHouse and Keeper.
+
+[Reference](/en/operations/server-configuration-parameters/settings#prometheus)
+
+### `jmst` 4LW command in Keeper
+
+Keeper supports `jmst` 4LW command which returns [basic allocator statistics](https://github.com/jemalloc/jemalloc/wiki/Use-Case%3A-Basic-Allocator-Statistics).
+
+Example:
+```sh
+echo jmst | nc localhost 9181
+```
diff --git a/docs/en/operations/backup.md b/docs/en/operations/backup.md
index d45885ee816..2ba50b39934 100644
--- a/docs/en/operations/backup.md
+++ b/docs/en/operations/backup.md
@@ -80,12 +80,14 @@ The BACKUP and RESTORE statements take a list of DATABASE and TABLE names, a des
 - ASYNC: backup or restore asynchronously
 - PARTITIONS: a list of partitions to restore
 - SETTINGS:
+    - `id`: id of backup or restore operation, randomly generated UUID is used, if not specified manually. If there is already running operation with the same `id` exception is thrown.
     - [`compression_method`](/docs/en/sql-reference/statements/create/table.md/#column-compression-codecs) and compression_level
     - `password` for the file on disk
     - `base_backup`: the destination of the previous backup of this source.  For example, `Disk('backups', '1.zip')`
     - `structure_only`: if enabled, allows to only backup or restore the CREATE statements without the data of tables
     - `storage_policy`: storage policy for the tables being restored. See [Using Multiple Block Devices for Data Storage](../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-multiple-volumes). This setting is only applicable to the `RESTORE` command. The specified storage policy applies only to tables with an engine from the `MergeTree` family.
     - `s3_storage_class`: the storage class used for S3 backup. For example, `STANDARD`
+    - `azure_attempt_to_create_container`: when using Azure Blob Storage, whether the specified container will try to be created if it doesn't exist. Default: true.
 
 ### Usage examples
 
@@ -167,6 +169,28 @@ RESTORE TABLE test.table PARTITIONS '2', '3'
   FROM Disk('backups', 'filename.zip')
 ```
 
+### Backups as tar archives
+
+Backups can also be stored as tar archives. The functionality is the same as for zip, except that a password is not supported.
+
+Write a backup as a tar:
+```
+BACKUP TABLE test.table TO Disk('backups', '1.tar')
+```
+
+Corresponding restore:
+```
+RESTORE TABLE test.table FROM Disk('backups', '1.tar')
+```
+
+To change the compression method, the correct file suffix should be appended to the backup name. I.E to compress the tar archive using gzip:
+```
+BACKUP TABLE test.table TO Disk('backups', '1.tar.gz')
+```
+
+The supported compression file suffixes are `tar.gz`, `.tgz` `tar.bz2`, `tar.lzma`, `.tar.zst`, `.tzst` and `.tar.xz`.
+
+
 ### Check the status of backups
 
 The backup command returns an `id` and `status`, and that `id` can be used to get the status of the backup.  This is very useful to check the progress of long ASYNC backups.  The example below shows a failure that happened when trying to overwrite an existing backup file:
@@ -206,7 +230,7 @@ end_time:          2022-08-30 09:21:46
 1 row in set. Elapsed: 0.002 sec.
 ```
 
-Along with `system.backups` table, all backup and restore operations are also tracked in the system log table [backup_log](../operations/system-tables/backup_log.md): 
+Along with `system.backups` table, all backup and restore operations are also tracked in the system log table [backup_log](../operations/system-tables/backup_log.md):
 ```
 SELECT *
 FROM system.backup_log
@@ -222,7 +246,7 @@ event_time_microseconds: 2023-08-18 11:13:43.097414
 id:                      7678b0b3-f519-4e6e-811f-5a0781a4eb52
 name:                    Disk('backups', '1.zip')
 status:                  CREATING_BACKUP
-error:                   
+error:
 start_time:              2023-08-18 11:13:43
 end_time:                1970-01-01 03:00:00
 num_files:               0
@@ -252,7 +276,7 @@ compressed_size:         0
 files_read:              0
 bytes_read:              0
 
-2 rows in set. Elapsed: 0.075 sec. 
+2 rows in set. Elapsed: 0.075 sec.
 ```
 
 ## Configuring BACKUP/RESTORE to use an S3 Endpoint
@@ -271,7 +295,7 @@ Creating an S3 bucket is covered in [Use S3 Object Storage as a ClickHouse disk]
 
 The destination for a backup will be specified like this:
 ```
-S3('<S3 endpoint>/<directory>', '<Access key ID>', '<Secret access key>)
+S3('<S3 endpoint>/<directory>', '<Access key ID>', '<Secret access key>')
 ```
 
 ```sql
@@ -421,10 +445,6 @@ Often data that is ingested into ClickHouse is delivered through some sort of pe
 
 Some local filesystems provide snapshot functionality (for example, [ZFS](https://en.wikipedia.org/wiki/ZFS)), but they might not be the best choice for serving live queries. A possible solution is to create additional replicas with this kind of filesystem and exclude them from the [Distributed](../engines/table-engines/special/distributed.md) tables that are used for `SELECT` queries. Snapshots on such replicas will be out of reach of any queries that modify data. As a bonus, these replicas might have special hardware configurations with more disks attached per server, which would be cost-effective.
 
-### clickhouse-copier {#clickhouse-copier}
-
-[clickhouse-copier](../operations/utilities/clickhouse-copier.md) is a versatile tool that was initially created to re-shard petabyte-sized tables. It can also be used for backup and restore purposes because it reliably copies data between ClickHouse tables and clusters.
-
 For smaller volumes of data, a simple `INSERT INTO ... SELECT ...` to remote tables might work as well.
 
 ### Manipulations with Parts {#manipulations-with-parts}
@@ -451,3 +471,24 @@ To disallow concurrent backup/restore, you can use these settings respectively.
 
 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.
+
+## Configuring BACKUP/RESTORE to use an AzureBlobStorage Endpoint
+
+To write backups to an AzureBlobStorage container you need the following pieces of information:
+- AzureBlobStorage endpoint connection string / url,
+- Container,
+- Path,
+- Account name (if url is specified)
+- Account Key (if url is specified)
+
+The destination for a backup will be specified like this:
+```
+AzureBlobStorage('<connection string>/<url>', '<container>', '<path>', '<account name>', '<account key>')
+```
+
+```sql
+BACKUP TABLE data TO AzureBlobStorage('DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:10000/devstoreaccount1/;',
+    'test_container', 'data_backup');
+RESTORE TABLE data AS data_restored FROM AzureBlobStorage('DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:10000/devstoreaccount1/;',
+    'test_container', 'data_backup');
+```
diff --git a/docs/en/operations/cluster-discovery.md b/docs/en/operations/cluster-discovery.md
index a925afac916..d3a89d6887d 100644
--- a/docs/en/operations/cluster-discovery.md
+++ b/docs/en/operations/cluster-discovery.md
@@ -65,6 +65,20 @@ With Cluster Discovery, rather than defining each node explicitly, you simply sp
     <cluster_name>
         <discovery>
             <path>/clickhouse/discovery/cluster_name</path>
+
+            <!-- # Optional configuration parameters: -->
+
+            <!-- ## Authentication credentials to access all other nodes in cluster: -->
+            <!-- <user>user1</user> -->
+            <!-- <password>pass123</password> -->
+            <!-- ### Alternatively to password, interserver secret may be used: -->
+            <!-- <secret>secret123</secret> -->
+
+            <!-- ## Shard for current node (see below): -->
+            <!-- <shard>1</shard> -->
+
+            <!-- ## Observer mode (see below): -->
+            <!-- <observer/> -->
         </discovery>
     </cluster_name>
 </remote_servers>
diff --git a/docs/en/operations/configuration-files.md b/docs/en/operations/configuration-files.md
index dfe62d591e3..089704705d0 100644
--- a/docs/en/operations/configuration-files.md
+++ b/docs/en/operations/configuration-files.md
@@ -6,15 +6,66 @@ sidebar_label: Configuration Files
 
 # Configuration Files
 
-The ClickHouse server can be configured with configuration files in XML or YAML syntax. In most installation types, the ClickHouse server runs with `/etc/clickhouse-server/config.xml` as default configuration file but it is also possible to specify the location of the configuration file manually at server startup using command line option `--config-file=` or `-C`. Additional configuration files may be placed into directory `config.d/` relative to the main configuration file, for example into directory `/etc/clickhouse-server/config.d/`. Files in this directory and the main configuration are merged in a preprocessing step before the configuration is applied in ClickHouse server. Configuration files are merged in alphabetical order. To simplify updates and improve modularization, it is best practice to keep the default `config.xml` file unmodified and place additional customization into `config.d/`.
+The ClickHouse server can be configured with configuration files in XML or YAML syntax. In most installation types, the ClickHouse server runs with `/etc/clickhouse-server/config.xml` as default configuration file, but it is also possible to specify the location of the configuration file manually at server startup using command line option `--config-file=` or `-C`. Additional configuration files may be placed into directory `config.d/` relative to the main configuration file, for example into directory `/etc/clickhouse-server/config.d/`. Files in this directory and the main configuration are merged in a preprocessing step before the configuration is applied in ClickHouse server. Configuration files are merged in alphabetical order. To simplify updates and improve modularization, it is best practice to keep the default `config.xml` file unmodified and place additional customization into `config.d/`.
 
 It is possible to mix XML and YAML configuration files, for example you could have a main configuration file `config.xml` and additional configuration files `config.d/network.xml`, `config.d/timezone.yaml` and `config.d/keeper.yaml`. Mixing XML and YAML within a single configuration file is not supported. XML configuration files should use `<clickhouse>...</clickhouse>` as top-level tag. In YAML configuration files, `clickhouse:` is optional, the parser inserts it implicitly if absent.
 
-## Overriding Configuration {#override}
+## Merging Configuration {#merging}
 
-The merge of configuration files behaves as one intuitively expects: The contents of both files are combined recursively, children with the same name are replaced by the element of the more specific configuration file. The merge can be customized using attributes `replace` and `remove`.
-- Attribute `replace` means that the element is replaced by the specified one.
-- Attribute `remove` means that the element is deleted.
+Two configuration files (usually the main configuration file and another configuration files from `config.d/`) are merged as follows:
+
+- If a node (i.e. a path leading to an element) appears in both files and does not have attributes `replace` or `remove`, it is included in the merged configuration file and children from both nodes are included and merged recursively.
+- If one of both nodes contains attribute `replace`, it is included in the merged configuration file but only children from the node with attribute `replace` are included.
+- If one of both nodes contains attribute `remove`, the node is not included in the merged configuration file (if it exists already, it is deleted).
+
+Example:
+
+
+```xml
+<!-- config.xml -->
+<clickhouse>
+    <config_a>
+        <setting_1>1</setting_1>
+    </config_a>
+    <config_b>
+        <setting_2>2</setting_2>
+    </config_b>
+    <config_c>
+        <setting_3>3</setting_3>
+    </config_c>
+</clickhouse>
+```
+
+and
+
+```xml
+<!-- config.d/other_config.xml -->
+<clickhouse>
+    <config_a>
+        <setting_4>4</setting_4>
+    </config_a>
+    <config_b replace="replace">
+        <setting_5>5</setting_5>
+    </config_b>
+    <config_c remove="remove">
+        <setting_6>6</setting_6>
+    </config_c>
+</clickhouse>
+```
+
+generates merged configuration file:
+
+```xml
+<clickhouse>
+    <config_a>
+        <setting_1>1</setting_1>
+        <setting_4>4</setting_4>
+    </config_a>
+    <config_b>
+        <setting_5>5</setting_5>
+    </config_b>
+</clickhouse>
+```
 
 To specify that a value of an element should be replaced by the value of an environment variable, you can use attribute `from_env`.
 
@@ -36,7 +87,7 @@ which is equal to
 <clickhouse>
     <profiles>
         <default>
-            <max_query_size/>150000</max_query_size>
+            <max_query_size>150000</max_query_size>
         </default>
     </profiles>
 </clickhouse>
@@ -44,9 +95,11 @@ which is equal to
 
 ## Substituting Configuration {#substitution}
 
-The config can also define “substitutions�. If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/clickhouse/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)).
+The config can define substitutions. There are two types of substitutions:
 
-If you want to replace an entire element with a substitution use `include` as the element name.
+- If an element has the `incl` attribute, the corresponding substitution from the file will be used as the value. By default, the path to the file with substitutions is `/etc/metrika.xml`. This can be changed in the [include_from](../operations/server-configuration-parameters/settings.md#server_configuration_parameters-include_from) element in the server config. The substitution values are specified in `/clickhouse/substitution_name` elements in this file. If a substitution specified in `incl` does not exist, it is recorded in the log. To prevent ClickHouse from logging missing substitutions, specify the `optional="true"` attribute (for example, settings for [macros](../operations/server-configuration-parameters/settings.md#macros)).
+
+- If you want to replace an entire element with a substitution, use `include` as the element name. Substitutions can also be performed from ZooKeeper by specifying attribute `from_zk = "/path/to/node"`. In this case, the element value is replaced with the contents of the Zookeeper node at `/path/to/node`. This also works with you store an entire XML subtree as a Zookeeper node, it will be fully inserted into the source element.
 
 XML substitution example:
 
@@ -63,7 +116,7 @@ XML substitution example:
 </clickhouse>
 ```
 
-Substitutions can also be performed from ZooKeeper. To do this, specify the attribute `from_zk = "/path/to/node"`. The element value is replaced with the contents of the node at `/path/to/node` in ZooKeeper. You can also put an entire XML subtree on the ZooKeeper node and it will be fully inserted into the source element.
+If you want to merge the substituting content with the existing configuration instead of appending you can use attribute `merge="true"`, for example: `<include from_zk="/some_path" merge="true">`. In this case, the existing configuration will be merged with the content from the substitution and the existing configuration settings will be replaced with values from substitution.
 
 ## Encrypting and Hiding Configuration {#encryption}
 
@@ -125,7 +178,7 @@ Users configuration can be split into separate files similar to `config.xml` and
 Directory name is defined as `users_config` setting without `.xml` postfix concatenated with `.d`.
 Directory `users.d` is used by default, as `users_config` defaults to `users.xml`.
 
-Note that configuration files are first merged taking into account [Override](#override) settings and includes are processed after that.
+Note that configuration files are first [merged](#merging) taking into account settings, and includes are processed after that.
 
 ## XML example {#example}
 
@@ -163,7 +216,7 @@ key: value
 
 Corresponding XML:
 ``` xml
-<key>value</value>
+<key>value</key>
 ```
 
 A nested XML node is represented by a YAML map:
diff --git a/docs/en/operations/monitoring.md b/docs/en/operations/monitoring.md
index de61da6f5c4..573e8075bca 100644
--- a/docs/en/operations/monitoring.md
+++ b/docs/en/operations/monitoring.md
@@ -3,6 +3,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.
+keywords: [monitoring, observability, advanced dashboard, dashboard, observability dashboard]
 ---
 
 # Monitoring
@@ -15,11 +16,11 @@ You can monitor:
 - Utilization of hardware resources.
 - ClickHouse server metrics.
 
-## Built-in observability dashboard
+## Built-in advanced observability dashboard
 
 <img width="400" alt="Screenshot 2023-11-12 at 6 08 58 PM" src="https://github.com/ClickHouse/ClickHouse/assets/3936029/2bd10011-4a47-4b94-b836-d44557c7fdc1" />
 
-ClickHouse comes with a built-in observability dashboard feature which can be accessed by `$HOST:$PORT/dashboard` (requires user and password) that shows the following metrics:
+ClickHouse comes with a built-in advanced observability dashboard feature which can be accessed by `$HOST:$PORT/dashboard` (requires user and password) that shows the following metrics:
 - Queries/second
 - CPU usage (cores)
 - Queries running
diff --git a/docs/en/operations/named-collections.md b/docs/en/operations/named-collections.md
index 06c05929ffa..c9d94dd95ee 100644
--- a/docs/en/operations/named-collections.md
+++ b/docs/en/operations/named-collections.md
@@ -5,9 +5,9 @@ sidebar_label: "Named collections"
 title: "Named collections"
 ---
 
-Named collections provide a way to store collections of key-value pairs to be 
+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. 
+dictionaries, tables, table functions, and object storage.
 
 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
@@ -64,7 +64,7 @@ To manage named collections with DDL a user must have the `named_control_collect
 ```
 
 :::tip
-In the above example the `password_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. 
+In the above example the `password_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
@@ -296,7 +296,6 @@ host = '127.0.0.1',
 port = 5432,
 database = 'test',
 schema = 'test_schema',
-connection_pool_size = 8
 ```
 
 Example of configuration:
@@ -310,7 +309,6 @@ Example of configuration:
             <port>5432</port>
             <database>test</database>
             <schema>test_schema</schema>
-            <connection_pool_size>8</connection_pool_size>
         </mypg>
     </named_collections>
 </clickhouse>
@@ -445,4 +443,3 @@ SELECT dictGet('dict', 'b', 1);
 │ a                       │
 └─────────────────────────┘
 ```
-
diff --git a/docs/en/operations/query-cache.md b/docs/en/operations/query-cache.md
index fbff622ae38..7a920671fc2 100644
--- a/docs/en/operations/query-cache.md
+++ b/docs/en/operations/query-cache.md
@@ -31,6 +31,10 @@ This reduces maintenance effort and avoids redundancy.
 
 ## Configuration Settings and Usage
 
+:::note
+In ClickHouse Cloud, you must use [query level settings](/en/operations/settings/query-level) to edit query cache settings. Editing [config level settings](/en/operations/configuration-files) is currently not supported.
+:::
+
 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
 
@@ -63,8 +67,7 @@ SETTINGS use_query_cache = true, enable_writes_to_query_cache = false;
 
 For maximum control, it is generally recommended to provide settings `use_query_cache`, `enable_writes_to_query_cache` and
 `enable_reads_from_query_cache` only with specific queries. It is also possible to enable caching at user or profile level (e.g. via `SET
-use_query_cache = true`) but one should keep in mind that all `SELECT` queries including monitoring or debugging queries to system tables
-may return cached results then.
+use_query_cache = true`) but one should keep in mind that all `SELECT` queries may return cached results then.
 
 The query cache can be cleared using statement `SYSTEM DROP QUERY CACHE`. The content of the query cache is displayed in system table
 [system.query_cache](system-tables/query_cache.md). The number of query cache hits and misses since database start are shown as events
@@ -171,6 +174,10 @@ Also, results of queries with non-deterministic functions are not cached by defa
 To force caching of results of queries with non-deterministic functions regardless, use setting
 [query_cache_nondeterministic_function_handling](settings/settings.md#query-cache-nondeterministic-function-handling).
 
+Results of queries that involve system tables, e.g. `system.processes` or `information_schema.tables`, are not cached by default. To force
+caching of results of queries with system tables regardless, use setting
+[query_cache_system_table_handling](settings/settings.md#query-cache-system-table-handling).
+
 :::note
 Prior to ClickHouse v23.11, setting 'query_cache_store_results_of_queries_with_nondeterministic_functions = 0 / 1' controlled whether
 results of queries with non-deterministic results were cached. In newer ClickHouse versions, this setting is obsolete and has no effect.
diff --git a/docs/en/operations/server-configuration-parameters/settings.md b/docs/en/operations/server-configuration-parameters/settings.md
index 48434d992e2..f87b6144deb 100644
--- a/docs/en/operations/server-configuration-parameters/settings.md
+++ b/docs/en/operations/server-configuration-parameters/settings.md
@@ -199,6 +199,16 @@ Type: Bool
 
 Default: 0
 
+
+## dns_cache_max_entries
+
+Internal DNS cache max entries.
+
+Type: UInt64
+
+Default: 10000
+
+
 ## dns_cache_update_period
 
 Internal DNS cache update period in seconds.
@@ -369,6 +379,18 @@ Type: UInt64
 
 Default: 0
 
+## max_waiting_queries
+
+Limit on total number of concurrently waiting queries. Execution of a waiting query is blocked while required tables are loading asynchronously (see `async_load_databases`). Note that waiting queries are not counted when `max_concurrent_queries`, `max_concurrent_insert_queries`, `max_concurrent_select_queries`, `max_concurrent_queries_for_user` and `max_concurrent_queries_for_all_users` limits are checked. This correction is done to avoid hitting these limits just after server startup. Zero means unlimited.
+
+:::note
+This setting can be modified at runtime and will take effect immediately. Queries that are already running will remain unchanged.
+:::
+
+Type: UInt64
+
+Default: 0
+
 ## max_connections
 
 Max server connections.
@@ -414,7 +436,7 @@ Default: 0
 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.
+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.
 
@@ -458,13 +480,45 @@ Type: Double
 
 Default: 0.9
 
+## cgroups_memory_usage_observer_wait_time
+
+Interval in seconds during which the server's maximum allowed memory consumption is adjusted by the corresponding threshold in cgroups. (see
+settings `cgroup_memory_watcher_hard_limit_ratio` and `cgroup_memory_watcher_soft_limit_ratio`).
+
+Type: UInt64
+
+Default: 15
+
+## cgroup_memory_watcher_hard_limit_ratio
+
+Specifies the "hard" threshold with regards to the memory consumption of the server process according to cgroups after which the server's
+maximum memory consumption is adjusted to the threshold value.
+
+See settings `cgroups_memory_usage_observer_wait_time` and `cgroup_memory_watcher_soft_limit_ratio`
+
+Type: Double
+
+Default: 0.95
+
+## cgroup_memory_watcher_soft_limit_ratio
+
+Specifies the "soft" threshold with regards to the memory consumption of the server process according to cgroups after which arenas in
+jemalloc are purged.
+
+
+See settings `cgroups_memory_usage_observer_wait_time` and `cgroup_memory_watcher_hard_limit_ratio`
+
+Type: Double
+
+Default: 0.95
+
 ## max_table_size_to_drop
 
 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](../../sql-reference/statements/drop.md) query or [TRUNCATE](../../sql-reference/statements/truncate.md) 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.
+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 delete all tables without any restrictions.
@@ -472,10 +526,10 @@ The value 0 means that you can delete all tables without any restrictions.
 ``` xml
 <max_table_size_to_drop>0</max_table_size_to_drop>
 ```
-  
 
-## max\_database\_num\_to\_warn {#max-database-num-to-warn}  
-If the number of attached databases exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.    
+
+## max\_database\_num\_to\_warn {#max-database-num-to-warn}
+If the number of attached databases exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.
 Default value: 1000
 
 **Example**
@@ -483,10 +537,10 @@ Default value: 1000
 ``` xml
 <max_database_num_to_warn>50</max_database_num_to_warn>
 ```
-  
-## max\_table\_num\_to\_warn {#max-table-num-to-warn}   
-If the number of attached tables exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.  
-Default value: 5000    
+
+## max\_table\_num\_to\_warn {#max-table-num-to-warn}
+If the number of attached tables exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.
+Default value: 5000
 
 **Example**
 
@@ -495,9 +549,9 @@ Default value: 5000
 ```
 
 
-## max\_part\_num\_to\_warn {#max-part-num-to-warn}  
-If the number of active parts exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.  
-Default value: 100000  
+## max\_part\_num\_to\_warn {#max-part-num-to-warn}
+If the number of active parts exceeds the specified value, clickhouse server will add warning messages to `system.warnings` table.
+Default value: 100000
 
 **Example**
 
@@ -891,9 +945,9 @@ Hard limit is configured via system tools
 
 ## database_atomic_delay_before_drop_table_sec {#database_atomic_delay_before_drop_table_sec}
 
-Sets the delay before remove table data in seconds. If the query has `SYNC` modifier, this setting is ignored.
+The delay during which a dropped table can be restored using the [UNDROP](/docs/en/sql-reference/statements/undrop.md) statement. If `DROP TABLE` ran with a `SYNC` modifier, the setting is ignored.
 
-Default value: `480` (8 minute).
+Default value: `480` (8 minutes).
 
 ## database_catalog_unused_dir_hide_timeout_sec {#database_catalog_unused_dir_hide_timeout_sec}
 
@@ -1300,6 +1354,7 @@ Keys:
 - `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`.
+- `formatting` – Specify log format to be printed in console log (currently only `json` supported).
 
 Both log and error log file names (only file names, not directories) support date and time format specifiers.
 
@@ -1368,6 +1423,8 @@ Writing to the console can be configured. Config example:
 </logger>
 ```
 
+### syslog
+
 Writing to the syslog is also supported. Config example:
 
 ``` xml
@@ -1391,6 +1448,52 @@ Keys for syslog:
     Default value: `LOG_USER` if `address` is specified, `LOG_DAEMON` otherwise.
 - format – Message format. Possible values: `bsd` and `syslog.`
 
+### Log formats
+
+You can specify the log format that will be outputted in the console log. Currently, only JSON is supported. Here is an example of an output JSON log:
+
+```json
+{
+  "date_time": "1650918987.180175",
+  "thread_name": "#1",
+  "thread_id": "254545",
+  "level": "Trace",
+  "query_id": "",
+  "logger_name": "BaseDaemon",
+  "message": "Received signal 2",
+  "source_file": "../base/daemon/BaseDaemon.cpp; virtual void SignalListener::run()",
+  "source_line": "192"
+}
+```
+To enable JSON logging support, use the following snippet:
+
+```xml
+<logger>
+    <formatting>
+        <type>json</type>
+        <names>
+            <date_time>date_time</date_time>
+            <thread_name>thread_name</thread_name>
+            <thread_id>thread_id</thread_id>
+            <level>level</level>
+            <query_id>query_id</query_id>
+            <logger_name>logger_name</logger_name>
+            <message>message</message>
+            <source_file>source_file</source_file>
+            <source_line>source_line</source_line>
+        </names>
+    </formatting>
+</logger>
+```
+
+**Renaming keys for JSON logs**
+
+Key names can be modified by changing tag values inside the `<names>` tag. For example, to change `DATE_TIME` to `MY_DATE_TIME`, you can use `<date_time>MY_DATE_TIME</date_time>`.
+
+**Omitting keys for JSON logs**
+
+Log properties can be omitted by commenting out the property.  For example, if you do not want your log to print `query_id`, you can comment out the `<query_id>` tag.
+
 ## send_crash_reports {#send_crash_reports}
 
 Settings for opt-in sending crash reports to the ClickHouse core developers team via [Sentry](https://sentry.io).
@@ -1467,7 +1570,7 @@ 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](../../sql-reference/statements/drop.md) query or [TRUNCATE](../../sql-reference/statements/truncate.md) 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.
+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.
 
@@ -1485,7 +1588,7 @@ 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.
+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.
 
@@ -1683,7 +1786,7 @@ Default value: `0.5`.
 
 Asynchronous loading of databases and tables.
 
-If `true` all non-system databases with `Ordinary`, `Atomic` and `Replicated` engine will be loaded asynchronously after the ClickHouse server start up. See `system.asynchronous_loader` table, `tables_loader_background_pool_size` and `tables_loader_foreground_pool_size` server settings. Any query that tries to access a table, that is not yet loaded, will wait for exactly this table to be started up. If load job fails, query will rethrow an error (instead of shutting down the whole server in case of `async_load_databases = false`). The table that is waited for by at least one query will be loaded with higher priority. DDL queries on a database will wait for exactly that database to be started up.
+If `true` all non-system databases with `Ordinary`, `Atomic` and `Replicated` engine will be loaded asynchronously after the ClickHouse server start up. See `system.asynchronous_loader` table, `tables_loader_background_pool_size` and `tables_loader_foreground_pool_size` server settings. Any query that tries to access a table, that is not yet loaded, will wait for exactly this table to be started up. If load job fails, query will rethrow an error (instead of shutting down the whole server in case of `async_load_databases = false`). The table that is waited for by at least one query will be loaded with higher priority. DDL queries on a database will wait for exactly that database to be started up. Also consider setting a limit `max_waiting_queries` for the total number of waiting queries.
 
 If `false`, all databases are loaded when the server starts.
 
@@ -2866,3 +2969,30 @@ This also allows a mix of resolver types can be used.
 ### disable_tunneling_for_https_requests_over_http_proxy {#disable_tunneling_for_https_requests_over_http_proxy}
 
 By default, tunneling (i.e, `HTTP CONNECT`) is used to make `HTTPS` requests over `HTTP` proxy. This setting can be used to disable it.
+
+## max_materialized_views_count_for_table {#max_materialized_views_count_for_table}
+
+A limit on the number of materialized views attached to a table.
+Note that only directly dependent views are considered here, and the creation of one view on top of another view is not considered.
+
+Default value: `0`.
+
+## format_alter_operations_with_parentheses {#format_alter_operations_with_parentheses}
+
+If set to true, then alter operations will be surrounded by parentheses in formatted queries. This makes the parsing of formatted alter queries less ambiguous.
+
+Type: Bool
+
+Default: 0
+
+## ignore_empty_sql_security_in_create_view_query {#ignore_empty_sql_security_in_create_view_query}
+
+If true, ClickHouse doesn't write defaults for empty SQL security statement in CREATE VIEW queries.
+
+:::note
+This setting is only necessary for the migration period and will become obsolete in 24.4
+:::
+
+Type: Bool
+
+Default: 1
diff --git a/docs/en/operations/settings/merge-tree-settings.md b/docs/en/operations/settings/merge-tree-settings.md
index c7e461d15ae..9327d52227f 100644
--- a/docs/en/operations/settings/merge-tree-settings.md
+++ b/docs/en/operations/settings/merge-tree-settings.md
@@ -287,7 +287,7 @@ Default value: 0 (seconds)
 
 ## remote_fs_execute_merges_on_single_replica_time_threshold
 
-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.
+When this setting has a value greater 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.
 
 :::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.
@@ -867,3 +867,31 @@ Default value: `Never`
 Persists virtual column `_block_number` on merges.
 
 Default value: false.
+
+## exclude_deleted_rows_for_part_size_in_merge {#exclude_deleted_rows_for_part_size_in_merge}
+
+If enabled, estimated actual size of data parts (i.e., excluding those rows that have been deleted through `DELETE FROM`) will be used when selecting parts to merge. Note that this behavior is only triggered for data parts affected by `DELETE FROM` executed after this setting is enabled.
+
+Possible values:
+
+- true, false
+
+Default value: false
+
+**See Also**
+
+- [load_existing_rows_count_for_old_parts](#load_existing_rows_count_for_old_parts) setting
+
+## load_existing_rows_count_for_old_parts {#load_existing_rows_count_for_old_parts}
+
+If enabled along with [exclude_deleted_rows_for_part_size_in_merge](#exclude_deleted_rows_for_part_size_in_merge), deleted rows count for existing data parts will be calculated during table starting up. Note that it may slow down start up table loading.
+
+Possible values:
+
+- true, false
+
+Default value: false
+
+**See Also**
+
+- [exclude_deleted_rows_for_part_size_in_merge](#exclude_deleted_rows_for_part_size_in_merge) setting
diff --git a/docs/en/operations/settings/query-complexity.md b/docs/en/operations/settings/query-complexity.md
index 1cb7ec9dced..d86f18ff982 100644
--- a/docs/en/operations/settings/query-complexity.md
+++ b/docs/en/operations/settings/query-complexity.md
@@ -28,6 +28,8 @@ The maximum amount of RAM to use for running a query on a single server.
 
 The default setting is unlimited (set to `0`).
 
+Cloud default value: depends on the amount of RAM on the replica.
+
 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.
 You can use `SHOW PROCESSLIST` to see the current memory consumption for each query.
@@ -104,7 +106,9 @@ 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.
 
-Default value: 0.
+Default value: `0`.
+
+Cloud default value: half the memory amount per replica.
 
 ## max_bytes_before_external_sort {#settings-max_bytes_before_external_sort}
 
@@ -115,6 +119,8 @@ Enables or disables execution of `ORDER BY` clauses in external memory. See [ORD
 
 Default value: 0.
 
+Cloud default value: half the memory amount per replica.
+
 ## max_rows_to_sort {#max-rows-to-sort}
 
 A maximum number of rows before sorting. This allows you to limit memory consumption when sorting.
@@ -129,7 +135,11 @@ What to do if the number of rows received before sorting exceeds one of the limi
 
 ## max_result_rows {#setting-max_result_rows}
 
-Limit on the number of rows in the result. Also checked for subqueries, and on remote servers when running parts of a distributed query.
+Limit on the number of rows in the result. Also checked for subqueries, and on remote servers when running parts of a distributed query. No limit is applied when value is `0`.
+
+Default value: `0`.
+
+Cloud default value: `0`.
 
 ## max_result_bytes {#max-result-bytes}
 
@@ -137,10 +147,14 @@ Limit on the number of bytes in the result. The same as the previous setting.
 
 ## result_overflow_mode {#result-overflow-mode}
 
-What to do if the volume of the result exceeds one of the limits: ‘throw’ or ‘break’. By default, throw.
+What to do if the volume of the result exceeds one of the limits: ‘throw’ or ‘break’.
 
 Using ‘break’ is similar to using LIMIT. `Break` interrupts execution only at the block level. This means that amount of returned rows is greater than [max_result_rows](#setting-max_result_rows), multiple of [max_block_size](../../operations/settings/settings.md#setting-max_block_size) and depends on [max_threads](../../operations/settings/settings.md#max_threads).
 
+Default value: `throw`.
+
+Cloud default value: `throw`.
+
 Example:
 
 ``` sql
@@ -172,7 +186,7 @@ If you set `timeout_before_checking_execution_speed `to 0, ClickHouse will use c
 
 ## timeout_overflow_mode {#timeout-overflow-mode}
 
-What to do if the query is run longer than `max_execution_time`: `throw` or `break`. By default, `throw`.
+What to do if the query is run longer than `max_execution_time` or the estimated running time is longer than `max_estimated_execution_time`: `throw` or `break`. By default, `throw`.
 
 # max_execution_time_leaf
 
@@ -214,6 +228,10 @@ A maximum number of execution bytes per second. Checked on every data block when
 
 Checks that execution speed is not too slow (no less than ‘min_execution_speed’), after the specified time in seconds has expired.
 
+## max_estimated_execution_time {#max_estimated_execution_time}
+
+Maximum query estimate execution time in seconds. Checked on every data block when ‘timeout_before_checking_execution_speed’ expires.
+
 ## max_columns_to_read {#max-columns-to-read}
 
 A maximum number of columns that can be read from a table in a single query. If a query requires reading a greater number of columns, it throws an exception.
diff --git a/docs/en/operations/settings/settings-formats.md b/docs/en/operations/settings/settings-formats.md
index 43a73844b79..f455fcba840 100644
--- a/docs/en/operations/settings/settings-formats.md
+++ b/docs/en/operations/settings/settings-formats.md
@@ -212,6 +212,8 @@ Possible values:
 
 Default value: `'basic'`.
 
+Cloud default value: `'best_effort'`.
+
 See also:
 
 - [DateTime data type.](../../sql-reference/data-types/datetime.md)
@@ -465,7 +467,7 @@ Enabled by default.
 
 Allow to use String type for JSON keys that contain only `Null`/`{}`/`[]` in data sample during schema inference.
 In JSON formats any value can be read as String, and we can avoid errors like `Cannot determine type for column 'column_name' by first 25000 rows of data, most likely this column contains only Nulls or empty Arrays/Maps` during schema inference
-by using String type for keys with unknown types. 
+by using String type for keys with unknown types.
 
 Example:
 
@@ -649,6 +651,12 @@ This setting works only when setting `input_format_json_named_tuples_as_objects`
 
 Enabled by default.
 
+## input_format_json_throw_on_bad_escape_sequence {#input_format_json_throw_on_bad_escape_sequence}
+
+Throw an exception if JSON string contains bad escape sequence in JSON input formats. If disabled, bad escape sequences will remain as is in the data.
+
+Enabled by default.
+
 ## output_format_json_array_of_rows {#output_format_json_array_of_rows}
 
 Enables the ability to output all rows as a JSON array in the [JSONEachRow](../../interfaces/formats.md/#jsoneachrow) format.
@@ -889,7 +897,7 @@ Default value: `,`.
 
 If it is set to true, allow strings in single quotes.
 
-Enabled by default.
+Disabled by default.
 
 ### format_csv_allow_double_quotes {#format_csv_allow_double_quotes}
 
@@ -1269,6 +1277,28 @@ Possible values:
 
 Default value: `0`.
 
+### output_format_arrow_use_signed_indexes_for_dictionary {#output_format_arrow_use_signed_indexes_for_dictionary}
+
+Use signed integer types instead of unsigned in `DICTIONARY` type of the [Arrow](../../interfaces/formats.md/#data-format-arrow) format during  [LowCardinality](../../sql-reference/data-types/lowcardinality.md) output when `output_format_arrow_low_cardinality_as_dictionary` is enabled.
+
+Possible values:
+
+- 0 — Unsigned integer types are used for indexes in `DICTIONARY` type.
+- 1 — Signed integer types are used for indexes in `DICTIONARY` type.
+
+Default value: `1`.
+
+### output_format_arrow_use_64_bit_indexes_for_dictionary {#output_format_arrow_use_64_bit_indexes_for_dictionary}
+
+Use 64-bit integer type in `DICTIONARY` type of the [Arrow](../../interfaces/formats.md/#data-format-arrow) format during  [LowCardinality](../../sql-reference/data-types/lowcardinality.md) output when `output_format_arrow_low_cardinality_as_dictionary` is enabled.
+
+Possible values:
+
+- 0 — Type for indexes in `DICTIONARY` type is determined automatically.
+- 1 — 64-bit integer type is used for indexes in `DICTIONARY` type.
+
+Default value: `0`.
+
 ### output_format_arrow_string_as_string {#output_format_arrow_string_as_string}
 
 Use Arrow String type instead of Binary for String columns.
@@ -1343,7 +1373,7 @@ Default value: `1'000'000`.
 
 While importing data, when column is not found in schema default value will be used instead of error.
 
-Disabled by default.
+Enabled by default.
 
 ### input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference {#input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference}
 
@@ -1575,7 +1605,13 @@ Result:
 
 Use ANSI escape sequences to paint colors in Pretty formats.
 
-Enabled by default.
+possible values:
+
+-   `0` — Disabled. Pretty formats do not use ANSI escape sequences.
+-   `1` — Enabled. Pretty formats will use ANSI escape sequences except for `NoEscapes` formats.
+-   `auto` - Enabled if `stdout` is a terminal except for `NoEscapes` formats.
+
+Default value is `auto`.
 
 ### output_format_pretty_grid_charset {#output_format_pretty_grid_charset}
 
@@ -1606,7 +1642,7 @@ Possible values:
 - 0 — Output without row numbers.
 - 1 — Output with row numbers.
 
-Default value: `0`.
+Default value: `1`.
 
 **Example**
 
@@ -1626,12 +1662,43 @@ Result:
    └─────────────────────────┴─────────┘
 ```
 
+### output_format_pretty_single_large_number_tip_threshold {#output_format_pretty_single_large_number_tip_threshold}
+
+Print a readable number tip on the right side of the table if the block consists of a single number which exceeds
+this value (except 0).
+
+Possible values:
+
+- 0 — The readable number tip will not be printed.
+- Positive integer — The readable number tip will be printed if the single number exceeds this value.
+
+Default value: `1000000`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT 1000000000 as a;
+```
+
+Result:
+```text
+┌──────────a─�
+│ 1000000000 │ -- 1.00 billion
+└────────────┘
+```
+
 ## Template format settings {#template-format-settings}
 
 ### format_template_resultset {#format_template_resultset}
 
 Path to file which contains format string for result set (for Template format).
 
+### format_template_resultset_format {#format_template_resultset_format}
+
+Format string for result set (for Template format)
+
 ### format_template_row {#format_template_row}
 
 Path to file which contains format string for rows (for Template format).
@@ -1640,6 +1707,10 @@ Path to file which contains format string for rows (for Template format).
 
 Delimiter between rows (for Template format).
 
+### format_template_row_format {#format_template_row_format}
+
+Format string for rows (for Template format)
+
 ## CustomSeparated format settings {custom-separated-format-settings}
 
 ### format_custom_escaping_rule {#format_custom_escaping_rule}
diff --git a/docs/en/operations/settings/settings.md b/docs/en/operations/settings/settings.md
index f085fe1abcd..f9fe5f1b2d3 100644
--- a/docs/en/operations/settings/settings.md
+++ b/docs/en/operations/settings/settings.md
@@ -508,7 +508,9 @@ Possible values:
 - Any positive integer number of hops.
 - 0 — No hops allowed.
 
-Default value: 0.
+Default value: `0`.
+
+Cloud default value: `10`.
 
 ## insert_null_as_default {#insert_null_as_default}
 
@@ -753,7 +755,7 @@ By default: 1,000,000. It only works when reading from MergeTree engines.
 
 ## max_concurrent_queries_for_user {#max-concurrent-queries-for-user}
 
-The maximum number of simultaneously processed queries related to MergeTree table per user.
+The maximum number of simultaneously processed queries per user.
 
 Possible values:
 
@@ -1126,7 +1128,9 @@ Possible values:
 - 0 (or 1) — `INSERT SELECT` no parallel execution.
 - Positive integer. Bigger than 1.
 
-Default value: 0.
+Default value: `0`.
+
+Cloud default value: from `2` to `4`, depending on the service size.
 
 Parallel `INSERT SELECT` has effect only if the `SELECT` part is executed in parallel, see [max_threads](#max_threads) setting.
 Higher values will lead to higher memory usage.
@@ -1207,7 +1211,9 @@ Default value: 10000.
 
 Cancels HTTP read-only queries (e.g. SELECT) when a client closes the connection without waiting for the response.
 
-Default value: 0
+Default value: `0`.
+
+Cloud default value: `1`.
 
 ## poll_interval {#poll-interval}
 
@@ -1683,6 +1689,18 @@ Possible values:
 
 Default value: `throw`.
 
+## query_cache_system_table_handling {#query-cache-system-table-handling}
+
+Controls how the [query cache](../query-cache.md) handles `SELECT` queries against system tables, i.e. tables in databases `system.*` and `information_schema.*`.
+
+Possible values:
+
+- `'throw'` - Throw an exception and don't cache the query result.
+- `'save'` - Cache the query result.
+- `'ignore'` - Don't cache the query result and don't throw an exception.
+
+Default value: `throw`.
+
 ## query_cache_min_query_runs {#query-cache-min-query-runs}
 
 Minimum number of times a `SELECT` query must run before its result is stored in the [query cache](../query-cache.md).
@@ -1769,6 +1787,10 @@ Default value: 0 (no restriction).
 
 ## insert_quorum {#insert_quorum}
 
+:::note
+This setting is not applicable to SharedMergeTree, see [SharedMergeTree consistency](/docs/en/cloud/reference/shared-merge-tree/#consistency) for more information.
+:::
+
 Enables the quorum writes.
 
 - If `insert_quorum < 2`, the quorum writes are disabled.
@@ -1808,6 +1830,10 @@ See also:
 
 ## insert_quorum_parallel {#insert_quorum_parallel}
 
+:::note
+This setting is not applicable to SharedMergeTree, see [SharedMergeTree consistency](/docs/en/cloud/reference/shared-merge-tree/#consistency) for more information.
+:::
+
 Enables or disables parallelism for quorum `INSERT` queries. If enabled, additional `INSERT` queries can be sent while previous queries have not yet finished. If disabled, additional writes to the same table will be rejected.
 
 Possible values:
@@ -1825,6 +1851,10 @@ See also:
 
 ## select_sequential_consistency {#select_sequential_consistency}
 
+:::note
+This setting differ in behavior between SharedMergeTree and ReplicatedMergeTree, see [SharedMergeTree consistency](/docs/en/cloud/reference/shared-merge-tree/#consistency) for more information about the behavior of `select_sequential_consistency` in SharedMergeTree.
+:::
+
 Enables or disables sequential consistency for `SELECT` queries. Requires `insert_quorum_parallel` to be disabled (enabled by default).
 
 Possible values:
@@ -1922,7 +1952,7 @@ Possible values:
 - Positive integer.
 - 0 — Asynchronous insertions are disabled.
 
-Default value: `100000`.
+Default value: `1000000`.
 
 ### async_insert_max_query_number {#async-insert-max-query-number}
 
@@ -1935,7 +1965,7 @@ Possible values:
 
 Default value: `450`.
 
-### async_insert_busy_timeout_ms {#async-insert-busy-timeout-ms}
+### async_insert_busy_timeout_max_ms {#async-insert-busy-timeout-max-ms}
 
 The maximum timeout in milliseconds since the first `INSERT` query before inserting collected data.
 
@@ -1946,6 +1976,63 @@ Possible values:
 
 Default value: `200`.
 
+Cloud default value: `1000`.
+
+### async_insert_poll_timeout_ms {#async-insert-poll-timeout-ms}
+
+Timeout in milliseconds for polling data from asynchronous insert queue.
+
+Possible values:
+
+- Positive integer.
+
+Default value: `10`.
+
+### async_insert_use_adaptive_busy_timeout {#allow-experimental-async-insert-adaptive-busy-timeout}
+
+Use adaptive asynchronous insert timeout.
+
+Possible values:
+
+- 0 - Disabled.
+- 1 - Enabled.
+
+Default value: `0`.
+
+### async_insert_busy_timeout_min_ms {#async-insert-busy-timeout-min-ms}
+
+If adaptive asynchronous insert timeout is allowed through [async_insert_use_adaptive_busy_timeout](#allow-experimental-async-insert-adaptive-busy-timeout), the setting specifies the minimum value of the asynchronous insert timeout in milliseconds. It also serves as the initial value, which may be increased later by the adaptive algorithm, up to the [async_insert_busy_timeout_ms](#async_insert_busy_timeout_ms).
+
+Possible values:
+
+- Positive integer.
+
+Default value: `50`.
+
+### async_insert_busy_timeout_ms {#async-insert-busy-timeout-ms}
+
+Alias for [`async_insert_busy_timeout_max_ms`](#async_insert_busy_timeout_max_ms).
+
+### async_insert_busy_timeout_increase_rate {#async-insert-busy-timeout-increase-rate}
+
+If adaptive asynchronous insert timeout is allowed through [async_insert_use_adaptive_busy_timeout](#allow-experimental-async-insert-adaptive-busy-timeout), the setting specifies the exponential growth rate at which the adaptive asynchronous insert timeout increases.
+
+Possible values:
+
+- A positive floating-point number.
+
+Default value: `0.2`.
+
+### async_insert_busy_timeout_decrease_rate {#async-insert-busy-timeout-decrease-rate}
+
+If adaptive asynchronous insert timeout is allowed through [async_insert_use_adaptive_busy_timeout](#allow-experimental-async-insert-adaptive-busy-timeout), the setting specifies the exponential growth rate at which the adaptive asynchronous insert timeout decreases.
+
+Possible values:
+
+- A positive floating-point number.
+
+Default value: `0.2`.
+
 ### async_insert_stale_timeout_ms {#async-insert-stale-timeout-ms}
 
 The maximum timeout in milliseconds since the last `INSERT` query before dumping collected data. If enabled, the settings prolongs the [async_insert_busy_timeout_ms](#async-insert-busy-timeout-ms) with every `INSERT` query as long as [async_insert_max_data_size](#async-insert-max-data-size) is not exceeded.
@@ -1966,7 +2053,7 @@ Possible values:
 - 0 — Disabled.
 - 1 — Enabled.
 
-Default value: 1.
+Default value: 0.
 
 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)).
@@ -2040,6 +2127,32 @@ SELECT * FROM test_table
 └───┘
 ```
 
+## update_insert_deduplication_token_in_dependent_materialized_views {#update-insert-deduplication-token-in-dependent-materialized-views}
+
+Allows to update `insert_deduplication_token` with view identifier during insert in dependent materialized views, if setting `deduplicate_blocks_in_dependent_materialized_views` is enabled and `insert_deduplication_token` is set.
+
+Possible values:
+
+      0 — Disabled.
+      1 — Enabled.
+
+Default value: 0.
+
+Usage:
+
+If setting `deduplicate_blocks_in_dependent_materialized_views` is enabled, `insert_deduplication_token` is passed to dependent materialized views. But in complex INSERT flows it is possible that we want to avoid deduplication for dependent materialized views.
+
+Example:
+```
+landing -┬--> mv_1_1 ---> ds_1_1 ---> mv_2_1 --┬-> ds_2_1 ---> mv_3_1 ---> ds_3_1
+         |                                     |
+         └--> mv_1_2 ---> ds_1_2 ---> mv_2_2 --┘
+```
+
+In this example we want to avoid deduplication for two different blocks generated from `mv_2_1` and `mv_2_2` that will be inserted into `ds_2_1`. Without `update_insert_deduplication_token_in_dependent_materialized_views` setting enabled, those two different blocks will be deduplicated, because different blocks from `mv_2_1` and `mv_2_2` will have the same `insert_deduplication_token`.
+
+If setting `update_insert_deduplication_token_in_dependent_materialized_views` is enabled, during each insert into dependent materialized views `insert_deduplication_token` is updated with table identifier, so block from `mv_2_1` and block from `mv_2_2` will have different `insert_deduplication_token` and will not be deduplicated.
+
 ## insert_keeper_max_retries
 
 The setting sets the maximum number of retries for ClickHouse Keeper (or ZooKeeper) requests during insert into replicated MergeTree. Only Keeper requests which failed due to network error, Keeper session timeout, or request timeout are considered for retries.
@@ -2049,7 +2162,9 @@ Possible values:
 - Positive integer.
 - 0 — Retries are disabled
 
-Default value: 0
+Default value: 20
+
+Cloud default value: `20`.
 
 Keeper request retries are done after some timeout. The timeout is controlled by the following settings: `insert_keeper_retry_initial_backoff_ms`, `insert_keeper_retry_max_backoff_ms`.
 The first retry is done after `insert_keeper_retry_initial_backoff_ms` timeout. The consequent timeouts will be calculated as follows:
@@ -2579,6 +2694,8 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Default value: 1000000000 nanoseconds (once a second).
 
+**Temporarily disabled in ClickHouse Cloud.**
+
 See also:
 
 - System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
@@ -2602,6 +2719,8 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Default value: 1000000000 nanoseconds.
 
+**Temporarily disabled in ClickHouse Cloud.**
+
 See also:
 
 - System table [trace_log](../../operations/system-tables/trace_log.md/#system_tables-trace_log)
@@ -2710,6 +2829,17 @@ Possible values:
 
 Default value: 0.
 
+## distributed_insert_skip_read_only_replicas {#distributed_insert_skip_read_only_replicas}
+
+Enables skipping read-only replicas for INSERT queries into Distributed.
+
+Possible values:
+
+- 0 — INSERT was as usual, if it will go to read-only replica it will fail
+- 1 — Initiator will skip read-only replicas before sending data to shards.
+
+Default value: `0`
+
 ## distributed_foreground_insert {#distributed_foreground_insert}
 
 Enables or disables synchronous data insertion into a [Distributed](../../engines/table-engines/special/distributed.md/#distributed) table.
@@ -2723,6 +2853,8 @@ Possible values:
 
 Default value: `0`.
 
+Cloud default value: `1`.
+
 **See Also**
 
 - [Distributed Table Engine](../../engines/table-engines/special/distributed.md/#distributed)
@@ -3238,7 +3370,9 @@ Possible values:
 
 - a string representing any valid table engine name
 
-Default value: `None`
+Default value: `MergeTree`.
+
+Cloud default value: `SharedMergeTree`.
 
 **Example**
 
@@ -3338,7 +3472,7 @@ Has an effect only when the connection is made through the MySQL wire protocol.
 - 0 - Use `BLOB`.
 - 1 - Use `TEXT`.
 
-Default value: `0`.
+Default value: `1`.
 
 ## mysql_map_fixed_string_to_text_in_show_columns {#mysql_map_fixed_string_to_text_in_show_columns}
 
@@ -3349,7 +3483,7 @@ Has an effect only when the connection is made through the MySQL wire protocol.
 - 0 - Use `BLOB`.
 - 1 - Use `TEXT`.
 
-Default value: `0`.
+Default value: `1`.
 
 ## execute_merges_on_single_replica_time_threshold {#execute-merges-on-single-replica-time-threshold}
 
@@ -3599,7 +3733,7 @@ Default value: `0`.
 
 ## allow_experimental_live_view {#allow-experimental-live-view}
 
-Allows creation of experimental [live views](../../sql-reference/statements/create/view.md/#live-view).
+Allows creation of a deprecated LIVE VIEW.
 
 Possible values:
 
@@ -3610,21 +3744,15 @@ Default value: `0`.
 
 ## live_view_heartbeat_interval {#live-view-heartbeat-interval}
 
-Sets the heartbeat interval in seconds to indicate [live view](../../sql-reference/statements/create/view.md/#live-view) is alive .
-
-Default value: `15`.
+Deprecated.
 
 ## max_live_view_insert_blocks_before_refresh {#max-live-view-insert-blocks-before-refresh}
 
-Sets the maximum number of inserted blocks after which mergeable blocks are dropped and query for [live view](../../sql-reference/statements/create/view.md/#live-view) is re-executed.
-
-Default value: `64`.
+Deprecated.
 
 ## periodic_live_view_refresh {#periodic-live-view-refresh}
 
-Sets the interval in seconds after which periodically refreshed [live view](../../sql-reference/statements/create/view.md/#live-view) is forced to refresh.
-
-Default value: `60`.
+Deprecated.
 
 ## http_connection_timeout {#http_connection_timeout}
 
@@ -3814,6 +3942,8 @@ Possible values:
 
 Default value: `0`.
 
+Cloud default value: `1`.
+
 ## database_replicated_initial_query_timeout_sec {#database_replicated_initial_query_timeout_sec}
 
 Sets how long initial DDL query should wait for Replicated database to process previous DDL queue entries in seconds.
@@ -3847,11 +3977,14 @@ Possible values:
 - `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.
+- `none_only_active` - similar to `none`, but doesn't wait for inactive replicas of the `Replicated` database. Note: with this mode it's impossible to figure out that the query was not executed on some replica and will be executed in background.
 - `null_status_on_timeout_only_active` — similar to `null_status_on_timeout`, but doesn't wait for inactive replicas of the `Replicated` database
 - `throw_only_active` — similar to `throw`, but doesn't wait for inactive replicas of the `Replicated` database
 
 Default value: `throw`.
 
+Cloud default value: `none`.
+
 ## flatten_nested {#flatten-nested}
 
 Sets the data format of a [nested](../../sql-reference/data-types/nested-data-structures/index.md) columns.
@@ -3987,6 +4120,8 @@ Possible values:
 
 Default value: `1`.
 
+Cloud default value: `0`.
+
 :::note
 `alter_sync` is applicable to `Replicated` tables only, it does nothing to alters of not `Replicated` tables.
 :::
@@ -4168,7 +4303,7 @@ Result:
 
 ## enable_order_by_all {#enable-order-by-all}
 
-Enables or disables sorting by `ALL` columns, i.e. [ORDER BY](../../sql-reference/statements/select/order-by.md)
+Enables or disables sorting with `ORDER BY ALL` syntax, see [ORDER BY](../../sql-reference/statements/select/order-by.md).
 
 Possible values:
 
@@ -4188,7 +4323,7 @@ INSERT INTO TAB VALUES (10, 20, 30), (20, 20, 10), (30, 10, 20);
 
 SELECT * FROM TAB ORDER BY ALL; -- returns an error that ALL is ambiguous
 
-SELECT * FROM TAB ORDER BY ALL SETTINGS enable_order_by_all;
+SELECT * FROM TAB ORDER BY ALL SETTINGS enable_order_by_all = 0;
 ```
 
 Result:
@@ -4225,6 +4360,18 @@ Possible values:
 
 Default value: `0`.
 
+
+## function_locate_has_mysql_compatible_argument_order {#function-locate-has-mysql-compatible-argument-order}
+
+Controls the order of arguments in function [locate](../../sql-reference/functions/string-search-functions.md#locate).
+
+Possible values:
+
+- 0 — Function `locate` accepts arguments `(haystack, needle[, start_pos])`.
+- 1 — Function `locate` accepts arguments `(needle, haystack, [, start_pos])` (MySQL-compatible behavior)
+
+Default value: `1`.
+
 ## date_time_overflow_behavior {#date_time_overflow_behavior}
 
 Defines the behavior when [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) or integers are converted into Date, Date32, DateTime or DateTime64 but the value cannot be represented in the result type.
@@ -4642,6 +4789,8 @@ other connections are cancelled. Queries with `max_parallel_replicas > 1` are su
 
 Enabled by default.
 
+Disabled by default on Cloud.
+
 ## 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.
@@ -5165,7 +5314,7 @@ SETTINGS(dictionary_use_async_executor=1, max_threads=8);
 ## storage_metadata_write_full_object_key {#storage_metadata_write_full_object_key}
 
 When set to `true` the metadata files are written with `VERSION_FULL_OBJECT_KEY` format version. With that format full object storage key names are written to the metadata files.
-When set to `false` the metadata files are written with the previous format version, `VERSION_INLINE_DATA`. With that format only suffixes of object storage key names are are written to the metadata files. The prefix for all of object storage key names is set in configurations files at `storage_configuration.disks` section. 
+When set to `false` the metadata files are written with the previous format version, `VERSION_INLINE_DATA`. With that format only suffixes of object storage key names are written to the metadata files. The prefix for all of object storage key names is set in configurations files at `storage_configuration.disks` section.
 
 Default value: `false`.
 
@@ -5176,12 +5325,120 @@ When set to `false` than all attempts are made with identical timeouts.
 
 Default value: `true`.
 
+## allow_experimental_variant_type {#allow_experimental_variant_type}
+
+Allows creation of experimental [Variant](../../sql-reference/data-types/variant.md).
+
+Default value: `false`.
+
+## use_variant_as_common_type {#use_variant_as_common_type}
+
+Allows to use `Variant` type as a result type for [if](../../sql-reference/functions/conditional-functions.md/#if)/[multiIf](../../sql-reference/functions/conditional-functions.md/#multiif)/[array](../../sql-reference/functions/array-functions.md)/[map](../../sql-reference/functions/tuple-map-functions.md) functions when there is no common type for argument types.
+
+Example:
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT toTypeName(if(number % 2, number, range(number))) as variant_type FROM numbers(1);
+SELECT if(number % 2, number, range(number)) as variant FROM numbers(5);
+```
+
+```text
+┌─variant_type───────────────────�
+│ Variant(Array(UInt64), UInt64) │
+└────────────────────────────────┘
+┌─variant───�
+│ []        │
+│ 1         │
+│ [0,1]     │
+│ 3         │
+│ [0,1,2,3] │
+└───────────┘
+```
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT toTypeName(multiIf((number % 4) = 0, 42, (number % 4) = 1, [1, 2, 3], (number % 4) = 2, 'Hello, World!', NULL)) AS variant_type FROM numbers(1);
+SELECT multiIf((number % 4) = 0, 42, (number % 4) = 1, [1, 2, 3], (number % 4) = 2, 'Hello, World!', NULL) AS variant FROM numbers(4);
+```
+
+```text
+─variant_type─────────────────────────�
+│ Variant(Array(UInt8), String, UInt8) │
+└──────────────────────────────────────┘
+
+┌─variant───────�
+│ 42            │
+│ [1,2,3]       │
+│ Hello, World! │
+│ ᴺ�ᴸᴸ          │
+└───────────────┘
+```
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT toTypeName(array(range(number), number, 'str_' || toString(number))) as array_of_variants_type from numbers(1);
+SELECT array(range(number), number, 'str_' || toString(number)) as array_of_variants FROM numbers(3);
+```
+
+```text
+┌─array_of_variants_type────────────────────────�
+│ Array(Variant(Array(UInt64), String, UInt64)) │
+└───────────────────────────────────────────────┘
+
+┌─array_of_variants─�
+│ [[],0,'str_0']    │
+│ [[0],1,'str_1']   │
+│ [[0,1],2,'str_2'] │
+└───────────────────┘
+```
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT toTypeName(map('a', range(number), 'b', number, 'c', 'str_' || toString(number))) as map_of_variants_type from numbers(1);
+SELECT map('a', range(number), 'b', number, 'c', 'str_' || toString(number)) as map_of_variants FROM numbers(3);
+```
+
+```text
+┌─map_of_variants_type────────────────────────────────�
+│ Map(String, Variant(Array(UInt64), String, UInt64)) │
+└─────────────────────────────────────────────────────┘
+
+┌─map_of_variants───────────────�
+│ {'a':[],'b':0,'c':'str_0'}    │
+│ {'a':[0],'b':1,'c':'str_1'}   │
+│ {'a':[0,1],'b':2,'c':'str_2'} │
+└───────────────────────────────┘
+```
+
+
+Default value: `false`.
+
+## default_normal_view_sql_security {#default_normal_view_sql_security}
+
+Allows to set default `SQL SECURITY` option while creating a normal view. [More about SQL security](../../sql-reference/statements/create/view.md#sql_security).
+
+The default value is `INVOKER`.
+
+## default_materialized_view_sql_security {#default_materialized_view_sql_security}
+
+Allows to set a default value for SQL SECURITY option when creating a materialized view. [More about SQL security](../../sql-reference/statements/create/view.md#sql_security).
+
+The default value is `DEFINER`.
+
+## default_view_definer {#default_view_definer}
+
+Allows to set default `DEFINER` option while creating a view. [More about SQL security](../../sql-reference/statements/create/view.md#sql_security).
+
+The default value is `CURRENT_USER`.
+
 ## max_partition_size_to_drop
 
-Restriction on dropping partitions in query time.
+Restriction on dropping partitions in query time. The value 0 means that you can drop partitions without any restrictions.
 
 Default value: 50 GB.
-The value 0 means that you can drop partitions without any restrictions.
+
+Cloud default value: 1 TB.
 
 :::note
 This query setting overwrites its server setting equivalent, see [max_partition_size_to_drop](/docs/en/operations/server-configuration-parameters/settings.md/#max-partition-size-to-drop)
@@ -5189,11 +5446,26 @@ This query setting overwrites its server setting equivalent, see [max_partition_
 
 ## max_table_size_to_drop
 
-Restriction on deleting tables in query time.
+Restriction on deleting tables in query time. The value 0 means that you can delete all tables without any restrictions.
 
 Default value: 50 GB.
-The value 0 means that you can delete all tables without any restrictions.
+
+Cloud default value: 1 TB.
 
 :::note
 This query setting overwrites its server setting equivalent, see [max_table_size_to_drop](/docs/en/operations/server-configuration-parameters/settings.md/#max-table-size-to-drop)
 :::
+
+## iceberg_engine_ignore_schema_evolution {#iceberg_engine_ignore_schema_evolution}
+
+Allow to ignore schema evolution in Iceberg table engine and read all data using schema specified by the user on table creation or latest schema parsed from metadata on table creation.
+
+:::note
+Enabling this setting can lead to incorrect result as in case of evolved schema all data files will be read using the same schema.
+:::
+
+Default value: 'false'.
+
+## allow_suspicious_primary_key {#allow_suspicious_primary_key}
+
+Allow suspicious `PRIMARY KEY`/`ORDER BY` for MergeTree (i.e. SimpleAggregateFunction).
diff --git a/docs/en/operations/storing-data.md b/docs/en/operations/storing-data.md
index b3ef1128c42..2c642dd2f0b 100644
--- a/docs/en/operations/storing-data.md
+++ b/docs/en/operations/storing-data.md
@@ -5,26 +5,416 @@ sidebar_label: "External Disks for Storing Data"
 title: "External Disks for Storing Data"
 ---
 
-Data, processed in ClickHouse, is usually stored in the local file system — on the same machine with the ClickHouse server. That requires large-capacity disks, which can be expensive enough. To avoid that you can store the data remotely — on [Amazon S3](https://aws.amazon.com/s3/) disks or in the Hadoop Distributed File System ([HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html)).
+Data, processed in ClickHouse, is usually stored in the local file system — on the same machine with the ClickHouse server. That requires large-capacity disks, which can be expensive enough. To avoid that you can store the data remotely. Various storages are supported:
+1. [Amazon S3](https://aws.amazon.com/s3/) object storage.
+2. The Hadoop Distributed File System ([HDFS](https://hadoop.apache.org/docs/current/hadoop-project-dist/hadoop-hdfs/HdfsDesign.html))
+3. [Azure Blob Storage](https://azure.microsoft.com/en-us/products/storage/blobs).
 
-To work with data stored on `Amazon S3` disks use [S3](/docs/en/engines/table-engines/integrations/s3.md) table engine, and to work with data in the Hadoop Distributed File System — [HDFS](/docs/en/engines/table-engines/integrations/hdfs.md) table engine.
+:::note ClickHouse also has support for external table engines, which are different from external storage option described on this page as they allow to read data stored in some general file format (like Parquet), while on this page we are describing storage configuration for ClickHouse `MergeTree` family or `Log` family tables.
+1. to work with data stored on `Amazon S3` disks, use [S3](/docs/en/engines/table-engines/integrations/s3.md) table engine.
+2. to work with data in the Hadoop Distributed File System — [HDFS](/docs/en/engines/table-engines/integrations/hdfs.md) table engine.
+3. to work with data stored in Azure Blob Storage use [AzureBlobStorage](/docs/en/engines/table-engines/integrations/azureBlobStorage.md) table engine.
+:::
 
-To load data from a web server with static files use a disk with type [web](#storing-data-on-webserver).
+## Configuring external storage {#configuring-external-storage}
 
-## Configuring HDFS {#configuring-hdfs}
+[MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) and [Log](/docs/en/engines/table-engines/log-family/log.md) family table engines can store data to `S3`, `AzureBlobStorage`, `HDFS` using a disk with types `s3`, `azure_blob_storage`, `hdfs` accordingly.
 
-[MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) and [Log](/docs/en/engines/table-engines/log-family/log.md) family table engines can store data to HDFS using a disk with type `HDFS`.
+Disk configuration requires:
+1. `type` section, equal to one of `s3`, `azure_blob_storage`, `hdfs`, `local_blob_storage`, `web`.
+2. Configuration of a specific external storage type.
 
-Configuration markup:
+Starting from 24.1 clickhouse version, it is possible to use a new configuration option.
+It requires to specify:
+1. `type` equal to `object_storage`
+2. `object_storage_type`, equal to one of `s3`, `azure_blob_storage` (or just `azure` from `24.3`), `hdfs`, `local_blob_storage` (or just `local` from `24.3`), `web`.
+Optionally, `metadata_type` can be specified (it is equal to `local` by default), but it can also be set to `plain`, `web`.
+Usage of `plain` metadata type is described in [plain storage section](/docs/en/operations/storing-data.md/#storing-data-on-webserver), `web` metadata type can be used only with `web` object storage type, `local` metadata type stores metadata files locally (each metadata files contains mapping to files in object storage and some additional meta information about them).
+
+E.g. configuration option
+``` xml
+<s3>
+    <type>s3</type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3>
+```
+
+is equal to configuration (from `24.1`):
+``` xml
+<s3>
+    <type>object_storage</type>
+    <object_storage_type>s3</object_storage_type>
+    <metadata_type>local</metadata_type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3>
+```
+
+Configuration
+``` xml
+<s3_plain>
+    <type>s3_plain</type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3_plain>
+```
+
+is equal to
+``` xml
+<s3_plain>
+    <type>object_storage</type>
+    <object_storage_type>s3</object_storage_type>
+    <metadata_type>plain</metadata_type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3_plain>
+```
+
+Example of full storage configuration will look like:
+``` xml
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>s3</type>
+                <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+                <use_environment_credentials>1</use_environment_credentials>
+            </s3>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+</clickhouse>
+```
+
+Starting with 24.1 clickhouse version, it can also look like:
+``` xml
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3>
+                <type>object_storage</type>
+                <object_storage_type>s3</object_storage_type>
+                <metadata_type>local</metadata_type>
+                <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+                <use_environment_credentials>1</use_environment_credentials>
+            </s3>
+        </disks>
+        <policies>
+            <s3>
+                <volumes>
+                    <main>
+                        <disk>s3</disk>
+                    </main>
+                </volumes>
+            </s3>
+        </policies>
+    </storage_configuration>
+</clickhouse>
+```
+
+In order to make a specific kind of storage a default option for all `MergeTree` tables add the following section to configuration file:
+``` xml
+<clickhouse>
+    <merge_tree>
+        <storage_policy>s3</storage_policy>
+    </merge_tree>
+</clickhouse>
+```
+
+If you want to configure a specific storage policy only to specific table, you can define it in settings while creating the table:
+
+``` sql
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY a
+SETTINGS storage_policy = 's3';
+```
+
+You can also use `disk` instead of `storage_policy`. In this case it is not requires to have `storage_policy` section in configuration file, only `disk` section would be enough.
+
+``` sql
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY a
+SETTINGS disk = 's3';
+```
+
+## Dynamic Configuration {#dynamic-configuration}
+
+There is also a possibility to specify storage configuration without a predefined disk in configuration in a configuration file, but can be configured in the `CREATE`/`ATTACH` query settings.
+
+The following 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.
+
+```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
+```
+
+The example below adds cache to external storage.
+
+```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
+```
+
+In the settings highlighted below notice that the disk of `type=web` is nested within
+the disk of `type=cache`.
+
+:::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.
+:::
+
+A combination of config-based configuration and sql-defined configuration is also possible:
+
+```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
+```
+
+where `web` is a from a server configuration file:
 
 ``` xml
+<storage_configuration>
+    <disks>
+        <web>
+            <type>web</type>
+            <endpoint>'https://raw.githubusercontent.com/ClickHouse/web-tables-demo/main/web/'</endpoint>
+        </web>
+    </disks>
+</storage_configuration>
+```
+
+### Using S3 Storage {#s3-storage}
+
+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.
+
+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`.
+- `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`.
+- `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+- `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+- `key_template` — Define the format with which the object keys are generated. By default, Clickhouse takes `root path` from `endpoint` option and adds random generated suffix. That suffix is a dir with 3 random symbols and a file name with 29 random symbols. With that option you have a full control how to the object keys are generated. Some usage scenarios require having random symbols in the prefix or in the middle of object key. For example: `[a-z]{3}-prefix-random/constant-part/random-middle-[a-z]{3}/random-suffix-[a-z]{29}`. The value is parsed with [`re2`](https://github.com/google/re2/wiki/Syntax). Only some subset of the syntax is supported. Check if your preferred format is supported before using that option. Disk isn't initialized if clickhouse is unable to generate a key by the value of `key_template`. It requires enabled feature flag [storage_metadata_write_full_object_key](/docs/en/operations/settings/settings#storage_metadata_write_full_object_key). It forbids declaring the `root path` in `endpoint` option. It requires definition of the option `key_compatibility_prefix`.
+- `key_compatibility_prefix` — That option is required when option `key_template` is in use. In order to be able to read the objects keys which were stored in the metadata files with the metadata version lower that `VERSION_FULL_OBJECT_KEY`, the previous `root path` from the `endpoint` option should be set here.
+
+:::note
+Google Cloud Storage (GCS) is also supported using the type `s3`. See [GCS backed MergeTree](/docs/en/integrations/gcs).
+:::
+
+### Using Plain Storage {#plain-storage}
+
+In `22.10` a new disk type `s3_plain` was introduced, which provides a write-once storage. Configuration parameters are the same as for `s3` disk type.
+Unlike `s3` disk type, it stores data as is, e.g. instead of randomly-generated blob names, it uses normal file names (the same way as clickhouse stores files on local disk) and does not store any metadata locally, e.g. it is derived from data on `s3`.
+
+This disk type allows to keep a static version of the table, as it does not allow executing merges on the existing data and does not allow inserting of new data.
+A use case for this disk type is to create backups on it, which can be done via `BACKUP TABLE data TO Disk('plain_disk_name', 'backup_name')`. Afterwards you can do `RESTORE TABLE data AS data_restored FROM Disk('plain_disk_name', 'backup_name')` or using `ATTACH TABLE data (...) ENGINE = MergeTree() SETTINGS disk = 'plain_disk_name'`.
+
+Configuration:
+``` xml
+<s3_plain>
+    <type>s3_plain</type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3_plain>
+```
+
+Starting from `24.1` it is possible configure any object storage disk (`s3`, `azure`, `hdfs`, `local`) using `plain` metadata type.
+
+Configuration:
+``` xml
+<s3_plain>
+    <type>object_storage</type>
+    <object_storage_type>azure</object_storage_type>
+    <metadata_type>plain</metadata_type>
+    <endpoint>https://s3.eu-west-1.amazonaws.com/clickhouse-eu-west-1.clickhouse.com/data/</endpoint>
+    <use_environment_credentials>1</use_environment_credentials>
+</s3_plain>
+```
+
+### Using Azure Blob Storage {#azure-blob-storage}
+
+`MergeTree` family table engines can store data to [Azure Blob Storage](https://azure.microsoft.com/en-us/services/storage/blobs/) using a disk with type `azure_blob_storage`.
+
+As of February 2022, this feature is still a fresh addition, so expect that some Azure Blob Storage functionalities might be unimplemented.
+
+Configuration markup:
+``` xml
+<storage_configuration>
+    ...
+    <disks>
+        <blob_storage_disk>
+            <type>azure_blob_storage</type>
+            <storage_account_url>http://account.blob.core.windows.net</storage_account_url>
+            <container_name>container</container_name>
+            <account_name>account</account_name>
+            <account_key>pass123</account_key>
+            <metadata_path>/var/lib/clickhouse/disks/blob_storage_disk/</metadata_path>
+            <cache_path>/var/lib/clickhouse/disks/blob_storage_disk/cache/</cache_path>
+            <skip_access_check>false</skip_access_check>
+        </blob_storage_disk>
+    </disks>
+    ...
+</storage_configuration>
+```
+
+Connection parameters:
+* `storage_account_url` - **Required**, Azure Blob Storage account URL, like `http://account.blob.core.windows.net` or `http://azurite1:10000/devstoreaccount1`.
+* `container_name` - Target container name, defaults to `default-container`.
+* `container_already_exists` - If set to `false`, a new container `container_name` is created in the storage account, if set to `true`, disk connects to the container directly, and if left unset, disk connects to the account, checks if the container `container_name` exists, and creates it if it doesn't exist yet.
+
+Authentication parameters (the disk will try all available methods **and** Managed Identity Credential):
+* `connection_string` - For authentication using a connection string.
+* `account_name` and `account_key` - For authentication using Shared Key.
+
+Limit parameters (mainly for internal usage):
+* `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 concurrently 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>/`.
+* `skip_access_check` - If true, disk access checks will not be performed on disk start-up. Default value is `false`.
+* `read_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of read requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+* `write_resource` — Resource name to be used for [scheduling](/docs/en/operations/workload-scheduling.md) of write requests to this disk. Default value is empty string (IO scheduling is not enabled for this disk).
+
+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)).
+
+:::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.
+:::
+
+## Using HDFS storage {#hdfs-storage}
+
+In this sample configuration:
+- the disk is of type `hdfs`
+- the data is hosted at `hdfs://hdfs1:9000/clickhouse/`
+
+```xml
 <clickhouse>
     <storage_configuration>
         <disks>
             <hdfs>
                 <type>hdfs</type>
                 <endpoint>hdfs://hdfs1:9000/clickhouse/</endpoint>
+                <skip_access_check>true</skip_access_check>
             </hdfs>
+            <hdd>
+                <type>local</type>
+                <path>/</path>
+            </hdd>
         </disks>
         <policies>
             <hdfs>
@@ -32,26 +422,17 @@ Configuration markup:
                     <main>
                         <disk>hdfs</disk>
                     </main>
+                    <external>
+                        <disk>hdd</disk>
+                    </external>
                 </volumes>
             </hdfs>
         </policies>
     </storage_configuration>
-
-    <merge_tree>
-        <min_bytes_for_wide_part>0</min_bytes_for_wide_part>
-    </merge_tree>
 </clickhouse>
 ```
 
-Required parameters:
-
-- `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`.
-
-## Using Virtual File System for Data Encryption {#encrypted-virtual-file-system}
+### Using Data Encryption {#encrypted-virtual-file-system}
 
 You can encrypt the data stored on [S3](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#table_engine-mergetree-s3), or [HDFS](#configuring-hdfs) external disks, or on a local disk. To turn on the encryption mode, in the configuration file you must define a disk with the type `encrypted` and choose a disk on which the data will be saved. An `encrypted` disk ciphers all written files on the fly, and when you read files from an `encrypted` disk it deciphers them automatically. So you can work with an `encrypted` disk like with a normal one.
 
@@ -112,7 +493,7 @@ Example of disk configuration:
 </clickhouse>
 ```
 
-## Using local cache {#using-local-cache}
+### Using local cache {#using-local-cache}
 
 It is possible to configure local cache over disks in storage configuration starting from version 22.3.
 For versions 22.3 - 22.7 cache is supported only for `s3` disk type. For versions >= 22.8 cache is supported for any disk type: S3, Azure, Local, Encrypted, etc.
@@ -139,13 +520,13 @@ Example of configuration for versions later or equal to 22.8:
             </cache>
         </disks>
         <policies>
-            <s3-cache>
+            <s3_cache>
                 <volumes>
                     <main>
                         <disk>cache</disk>
                     </main>
                 </volumes>
-            </s3-cache>
+            </s3_cache>
         <policies>
     </storage_configuration>
 ```
@@ -165,13 +546,13 @@ Example of configuration for versions earlier than 22.8:
             </s3>
         </disks>
         <policies>
-            <s3-cache>
+            <s3_cache>
                 <volumes>
                     <main>
                         <disk>s3</disk>
                     </main>
                 </volumes>
-            </s3-cache>
+            </s3_cache>
         <policies>
     </storage_configuration>
 ```
@@ -206,7 +587,7 @@ Some of these settings will disable cache features per query/profile that are en
 
 - `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. 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. Default: `false`. Cloud default value: `true`.
 
 - `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`.
 
@@ -275,13 +656,92 @@ Cache profile events:
 
 - `CachedWriteBufferCacheWriteBytes`, `CachedWriteBufferCacheWriteMicroseconds`
 
-## Storing Data on Web Server {#storing-data-on-webserver}
-
-There is a tool `clickhouse-static-files-uploader`, which prepares a data directory for a given table (`SELECT data_paths FROM system.tables WHERE name = 'table_name'`). For each table you need, you get a directory of files. These files can be uploaded to, for example, a web server with static files. After this preparation, you can load this table into any ClickHouse server via `DiskWeb`.
+### Using static Web storage (read-only) {#web-storage}
 
 This is a read-only disk. Its data is only read and never modified. A new table is loaded to this disk via `ATTACH TABLE` query (see example below). Local disk is not actually used, each `SELECT` query will result in a `http` request to fetch required data. All modification of the table data will result in an exception, i.e. the following types of queries are not allowed: [CREATE TABLE](/docs/en/sql-reference/statements/create/table.md), [ALTER TABLE](/docs/en/sql-reference/statements/alter/index.md), [RENAME TABLE](/docs/en/sql-reference/statements/rename.md/#misc_operations-rename_table), [DETACH TABLE](/docs/en/sql-reference/statements/detach.md) and [TRUNCATE TABLE](/docs/en/sql-reference/statements/truncate.md).
+Web storage can be used for read-only purposes. An example use is for hosting sample data, or for migrating data.
+There is a tool `clickhouse-static-files-uploader`, which prepares a data directory for a given table (`SELECT data_paths FROM system.tables WHERE name = 'table_name'`). For each table you need, you get a directory of files. These files can be uploaded to, for example, a web server with static files. After this preparation, you can load this table into any ClickHouse server via `DiskWeb`.
 
-Web server storage is supported only for the [MergeTree](/docs/en/engines/table-engines/mergetree-family/mergetree.md) and [Log](/docs/en/engines/table-engines/log-family/log.md) engine families. To access the data stored on a `web` disk, use the [storage_policy](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#terms) setting when executing the query. For example, `ATTACH TABLE table_web UUID '{}' (id Int32) ENGINE = MergeTree() ORDER BY id SETTINGS storage_policy = 'web'`.
+In this sample configuration:
+- the disk is of type `web`
+- the data is hosted at `http://nginx:80/test1/`
+- a cache on local storage is used
+
+```xml
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <web>
+                <type>web</type>
+                <endpoint>http://nginx:80/test1/</endpoint>
+            </web>
+            <cached_web>
+                <type>cache</type>
+                <disk>web</disk>
+                <path>cached_web_cache/</path>
+                <max_size>100000000</max_size>
+            </cached_web>
+        </disks>
+        <policies>
+            <web>
+                <volumes>
+                    <main>
+                        <disk>web</disk>
+                    </main>
+                </volumes>
+            </web>
+            <cached_web>
+                <volumes>
+                    <main>
+                        <disk>cached_web</disk>
+                    </main>
+                </volumes>
+            </cached_web>
+        </policies>
+    </storage_configuration>
+</clickhouse>
+```
+
+:::tip
+Storage can also be configured temporarily within a query, if a web dataset is not expected
+to be used routinely, see [dynamic configuration](#dynamic-configuration) and skip editing the
+configuration file.
+:::
+
+:::tip
+A [demo dataset](https://github.com/ClickHouse/web-tables-demo) is hosted in GitHub.  To prepare your own tables for web storage see the tool [clickhouse-static-files-uploader](/docs/en/operations/storing-data.md/#storing-data-on-webserver)
+:::
+
+In this `ATTACH TABLE` query the `UUID` provided matches the directory name of the data, and the endpoint is the URL for the raw GitHub content.
+
+```sql
+# highlight-next-line
+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
+```
 
 A ready test case. You need to add this configuration to config:
 
@@ -477,7 +937,7 @@ If URL is not reachable on disk load when the server is starting up tables, then
 Use [http_max_single_read_retries](/docs/en/operations/settings/settings.md/#http-max-single-read-retries) setting to limit the maximum number of retries during a single HTTP read.
 
 
-## Zero-copy Replication (not ready for production) {#zero-copy}
+### Zero-copy Replication (not ready for production) {#zero-copy}
 
 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.
 
diff --git a/docs/en/operations/system-tables/asynchronous_loader.md b/docs/en/operations/system-tables/asynchronous_loader.md
index af9aa4ecd09..75d98e4549d 100644
--- a/docs/en/operations/system-tables/asynchronous_loader.md
+++ b/docs/en/operations/system-tables/asynchronous_loader.md
@@ -49,6 +49,6 @@ Every job has a pool associated with it and is started in this pool. Each pool h
 
 Time instants during job lifetime:
 - `schedule_time` (`DateTime64`) - Time when job was created and scheduled to be executed (usually with all its dependencies).
-- `enqueue_time` (`Nullable(DateTime64)`) - Time when job became ready and was enqueued into a ready queue of it's pool. Null if the job is not ready yet.
+- `enqueue_time` (`Nullable(DateTime64)`) - Time when job became ready and was enqueued into a ready queue of its pool. Null if the job is not ready yet.
 - `start_time` (`Nullable(DateTime64)`) - Time when worker dequeues the job from ready queue and start its execution. Null if the job is not started yet.
 - `finish_time` (`Nullable(DateTime64)`) - Time when job execution is finished. Null if the job is not finished yet.
diff --git a/docs/en/operations/system-tables/asynchronous_metric_log.md b/docs/en/operations/system-tables/asynchronous_metric_log.md
index 65b2e349707..e63ab65ba07 100644
--- a/docs/en/operations/system-tables/asynchronous_metric_log.md
+++ b/docs/en/operations/system-tables/asynchronous_metric_log.md
@@ -10,7 +10,7 @@ Columns:
 - `hostname` ([LowCardinality(String)](../../sql-reference/data-types/string.md)) — Hostname of the server executing the query.
 - `event_date` ([Date](../../sql-reference/data-types/date.md)) — Event date.
 - `event_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — Event time.
-- `name` ([String](../../sql-reference/data-types/string.md)) — Metric name.
+- `metric` ([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 fe8f963b1ec..81725b97e41 100644
--- a/docs/en/operations/system-tables/asynchronous_metrics.md
+++ b/docs/en/operations/system-tables/asynchronous_metrics.md
@@ -297,11 +297,11 @@ 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.
+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.
+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
 
@@ -393,7 +393,7 @@ The amount of free memory plus OS page cache memory on the host system, in bytes
 
 ### 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.
+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
 
@@ -493,7 +493,7 @@ Number of threads in the server of the PostgreSQL compatibility protocol.
 
 ### QueryCacheBytes
 
-Total size of the query cache cache in bytes.
+Total size of the query cache in bytes.
 
 ### QueryCacheEntries
 
@@ -549,7 +549,7 @@ Total amount of bytes (compressed, including data and indices) stored in all tab
 
 ### 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.
+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.
 
 ### TotalPrimaryKeyBytesInMemory
 
diff --git a/docs/en/operations/system-tables/clusters.md b/docs/en/operations/system-tables/clusters.md
index 63cc083e4bc..7a9f1438b87 100644
--- a/docs/en/operations/system-tables/clusters.md
+++ b/docs/en/operations/system-tables/clusters.md
@@ -19,7 +19,7 @@ Columns:
 - `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.
+- `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".
diff --git a/docs/en/operations/system-tables/crash-log.md b/docs/en/operations/system-tables/crash-log.md
index e83da3624b2..9877f674211 100644
--- a/docs/en/operations/system-tables/crash-log.md
+++ b/docs/en/operations/system-tables/crash-log.md
@@ -49,5 +49,3 @@ build_id:
 
 **See also**
 - [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/dictionaries.md b/docs/en/operations/system-tables/dictionaries.md
index 8632581144c..c4cf7ba8bfb 100644
--- a/docs/en/operations/system-tables/dictionaries.md
+++ b/docs/en/operations/system-tables/dictionaries.md
@@ -18,7 +18,7 @@ Columns:
     - `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).
+- `type` ([String](../../sql-reference/data-types/string.md)) — Type of 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.
diff --git a/docs/en/operations/system-tables/dns_cache.md b/docs/en/operations/system-tables/dns_cache.md
new file mode 100644
index 00000000000..befeb9298aa
--- /dev/null
+++ b/docs/en/operations/system-tables/dns_cache.md
@@ -0,0 +1,38 @@
+---
+slug: /en/operations/system-tables/dns_cache
+---
+# dns_cache
+
+Contains information about cached DNS records.
+
+Columns:
+
+- `hostname` ([String](../../sql-reference/data-types/string.md)) — cached hostname
+- `ip_address` ([String](../../sql-reference/data-types/string.md)) — ip address for the hostname
+- `ip_family` ([Enum](../../sql-reference/data-types/enum.md)) — family of the ip address, possible values: 
+   - 'IPv4' 
+   - 'IPv6'
+   - 'UNIX_LOCAL'
+- `cached_at` ([DateTime](../../sql-reference/data-types/datetime.md)) - when the record was cached
+
+**Example**
+
+Query:
+
+```sql
+SELECT * FROM system.dns_cache;
+```
+
+Result:
+
+| hostname | ip\_address | ip\_family | cached\_at |
+| :--- | :--- | :--- | :--- |
+| localhost | ::1 | IPv6 | 2024-02-11 17:04:40 |
+| localhost | 127.0.0.1 | IPv4 | 2024-02-11 17:04:40 |
+
+**See also**
+
+- [disable_internal_dns_cache setting](../../operations/server-configuration-parameters/settings.md#disable_internal_dns_cache)
+- [dns_cache_max_entries setting](../../operations/server-configuration-parameters/settings.md#dns_cache_max_entries)
+- [dns_cache_update_period setting](../../operations/server-configuration-parameters/settings.md#dns_cache_update_period)
+- [dns_max_consecutive_failures setting](../../operations/server-configuration-parameters/settings.md#dns_max_consecutive_failures)
diff --git a/docs/en/operations/system-tables/index.md b/docs/en/operations/system-tables/index.md
index eaf79d035a9..d9800e05ff9 100644
--- a/docs/en/operations/system-tables/index.md
+++ b/docs/en/operations/system-tables/index.md
@@ -47,7 +47,7 @@ An example:
         <engine>ENGINE = MergeTree PARTITION BY toYYYYMM(event_date) ORDER BY (event_date, event_time) SETTINGS index_granularity = 1024</engine>
         -->
         <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <max_size_rows>1048576</max_size>
+        <max_size_rows>1048576</max_size_rows>
         <reserved_size_rows>8192</reserved_size_rows>
         <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
         <flush_on_crash>false</flush_on_crash>
diff --git a/docs/en/operations/system-tables/metrics.md b/docs/en/operations/system-tables/metrics.md
index 3dec6345eb6..83ce817b7db 100644
--- a/docs/en/operations/system-tables/metrics.md
+++ b/docs/en/operations/system-tables/metrics.md
@@ -287,7 +287,7 @@ Number of threads in the HashedDictionary thread pool running a task.
 
 ### IOPrefetchThreads
 
-Number of threads in the IO prefertch thread pool.
+Number of threads in the IO prefetch thread pool.
 
 ### IOPrefetchThreadsActive
 
@@ -513,10 +513,6 @@ Part was moved to another disk and should be deleted in own destructor.
 
 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.
diff --git a/docs/en/operations/system-tables/query_thread_log.md b/docs/en/operations/system-tables/query_thread_log.md
index 0420a0392f2..a0712c78409 100644
--- a/docs/en/operations/system-tables/query_thread_log.md
+++ b/docs/en/operations/system-tables/query_thread_log.md
@@ -21,7 +21,7 @@ Columns:
 - `hostname` ([LowCardinality(String)](../../sql-reference/data-types/string.md)) — Hostname of the server executing the query.
 - `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.
+- `event_time_microseconds` ([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.
@@ -32,8 +32,7 @@ Columns:
 - `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.
+- `thread_id` ([UInt64](../../sql-reference/data-types/int-uint.md)) — OS 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:
diff --git a/docs/en/operations/system-tables/quota_usage.md b/docs/en/operations/system-tables/quota_usage.md
index 0dca7c525f2..3d4b8f62d2d 100644
--- a/docs/en/operations/system-tables/quota_usage.md
+++ b/docs/en/operations/system-tables/quota_usage.md
@@ -25,6 +25,8 @@ Columns:
 - `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of rows read from all tables and table functions participated in queries.
 - `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The total number of bytes read from all tables and table functions participated in queries.
 - `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum of bytes read from all tables and table functions.
+- `failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — The total count of sequential authentication failures. If the user entered the correct password before exceed `failed_sequential_authentications` threshold then the counter will be reset.
+- `max_failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — Maximum count of sequential authentication failures.
 - `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — The total query execution time, in seconds (wall time).
 - `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum of query execution time.
 
diff --git a/docs/en/operations/system-tables/quotas_usage.md b/docs/en/operations/system-tables/quotas_usage.md
index a04018ac2c8..960903fa25f 100644
--- a/docs/en/operations/system-tables/quotas_usage.md
+++ b/docs/en/operations/system-tables/quotas_usage.md
@@ -28,8 +28,10 @@ Columns:
 - `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum number of rows read from all tables and table functions participated in queries.
 - `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — The total number of bytes read from all tables and table functions participated in queries.
 - `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — Maximum of bytes read from all tables and table functions.
-- `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — The total query execution time, in seconds (wall time).
-- `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum of query execution time.
+- `failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — The total count of sequential authentication failures. If the user entered the correct password before exceed `failed_sequential_authentications` threshold then the counter will be reset.
+- `max_failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Maximum count of sequential authentication failures.
+- `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — The total query execution time, in seconds (wall time).
+- `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — Maximum of query execution time.
 
 ## See Also {#see-also}
 
diff --git a/docs/en/operations/system-tables/replication_queue.md b/docs/en/operations/system-tables/replication_queue.md
index dd8f6328688..d63517291a4 100644
--- a/docs/en/operations/system-tables/replication_queue.md
+++ b/docs/en/operations/system-tables/replication_queue.md
@@ -49,7 +49,7 @@ Columns:
 
 - `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 times the action was postponed.
 
 - `postpone_reason` ([String](../../sql-reference/data-types/string.md)) — The reason why the task was postponed.
 
diff --git a/docs/en/operations/system-tables/scheduler.md b/docs/en/operations/system-tables/scheduler.md
index 953db4c28f2..c4de7f76fdc 100644
--- a/docs/en/operations/system-tables/scheduler.md
+++ b/docs/en/operations/system-tables/scheduler.md
@@ -26,7 +26,9 @@ priority:          0
 is_active:         0
 active_children:   0
 dequeued_requests: 67
+canceled_requests: 0
 dequeued_cost:     4692272
+canceled_cost:     0
 busy_periods:      63
 vruntime:          938454.1999999989
 system_vruntime:   ᴺ�ᴸᴸ
@@ -54,7 +56,9 @@ Columns:
 - `is_active` (`UInt8`) - Whether this node is currently active - has resource requests to be dequeued and constraints satisfied.
 - `active_children` (`UInt64`) - The number of children in active state.
 - `dequeued_requests` (`UInt64`) - The total number of resource requests dequeued from this node.
+- `canceled_requests` (`UInt64`) - The total number of resource requests canceled from this node.
 - `dequeued_cost` (`UInt64`) - The sum of costs (e.g. size in bytes) of all requests dequeued from this node.
+- `canceled_cost` (`UInt64`) - The sum of costs (e.g. size in bytes) of all requests canceled from this node.
 - `busy_periods` (`UInt64`) - The total number of deactivations of this node.
 - `vruntime` (`Nullable(Float64)`) - For children of `fair` nodes only. Virtual runtime of a node used by SFQ algorithm to select the next child to process in a max-min fair manner.
 - `system_vruntime` (`Nullable(Float64)`) - For `fair` nodes only. Virtual runtime showing `vruntime` of the last processed resource request. Used during child activation as the new value of `vruntime`.
diff --git a/docs/en/operations/system-tables/settings_changes.md b/docs/en/operations/system-tables/settings_changes.md
new file mode 100644
index 00000000000..c097915d430
--- /dev/null
+++ b/docs/en/operations/system-tables/settings_changes.md
@@ -0,0 +1,32 @@
+---
+slug: /en/operations/system-tables/settings_changes
+---
+# settings_changes
+
+Contains information about setting changes in previous ClickHouse versions.
+
+Columns:
+
+- `version` ([String](../../sql-reference/data-types/string.md)) — The ClickHouse version in which settings were changed
+- `changes` ([Array](../../sql-reference/data-types/array.md) of [Tuple](../../sql-reference/data-types/tuple.md)) — A description of the setting changes: (setting name, previous value, new value, reason for the change)
+
+**Example**
+
+``` sql
+SELECT *
+FROM system.settings_changes
+WHERE version = '23.5'
+FORMAT Vertical
+```
+
+``` text
+Row 1:
+──────
+version: 23.5
+changes: [('input_format_parquet_preserve_order','1','0','Allow Parquet reader to reorder rows for better parallelism.'),('parallelize_output_from_storages','0','1','Allow parallelism when executing queries that read from file/url/s3/etc. This may reorder rows.'),('use_with_fill_by_sorting_prefix','0','1','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','0','1','Change an internal field name in output Parquet file schema.')]
+```
+
+**See also**
+
+- [Settings](../../operations/settings/index.md#session-settings-intro)
+- [system.settings](settings.md)
diff --git a/docs/en/operations/system-tables/settings_profile_elements.md b/docs/en/operations/system-tables/settings_profile_elements.md
index c1fc562e1e9..8955c84fab2 100644
--- a/docs/en/operations/system-tables/settings_profile_elements.md
+++ b/docs/en/operations/system-tables/settings_profile_elements.md
@@ -26,6 +26,6 @@ Columns:
 
 - `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.
+- `writability` ([Nullable](../../sql-reference/data-types/nullable.md)([Enum8](../../sql-reference/data-types/enum.md)('WRITABLE' = 0, 'CONST' = 1, 'CHANGEABLE_IN_READONLY' = 2))) — Sets the settings constraint writability kind.
 
 - `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/tables.md b/docs/en/operations/system-tables/tables.md
index 8049ab091c0..2132f69319e 100644
--- a/docs/en/operations/system-tables/tables.md
+++ b/docs/en/operations/system-tables/tables.md
@@ -27,6 +27,8 @@ Columns:
 
 - `metadata_modification_time` ([DateTime](../../sql-reference/data-types/datetime.md)) - Time of latest modification of the table metadata.
 
+- `metadata_version` ([Int32](../../sql-reference/data-types/int-uint.md)) - Metadata version for ReplicatedMergeTree table, 0 for non ReplicatedMergeTree table.
+
 - `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 ([materialized views](../../sql-reference/statements/create/view.md#materialized-view) the current table).
diff --git a/docs/en/operations/tips.md b/docs/en/operations/tips.md
index 757afff599c..119684ba68d 100644
--- a/docs/en/operations/tips.md
+++ b/docs/en/operations/tips.md
@@ -111,6 +111,14 @@ On newer Linux kernels transparent huge pages are alright.
 $ echo 'madvise' | sudo tee /sys/kernel/mm/transparent_hugepage/enabled
 ```
 
+If you want to modify the transparent huge pages setting permanently, editing the `/etc/default/grub` to add the `transparent_hugepage=never` to the `GRUB_CMDLINE_LINUX_DEFAULT` option:
+
+```bash
+$ GRUB_CMDLINE_LINUX_DEFAULT="transparent_hugepage=madvise ..."
+```
+
+After that, run the `sudo update-grub` command then reboot to take effect.
+
 ## Hypervisor configuration
 
 If you are using OpenStack, set
@@ -289,8 +297,6 @@ end script
 
 If you use antivirus software configure it to skip folders with ClickHouse datafiles (`/var/lib/clickhouse`) otherwise performance may be reduced and you may experience unexpected errors during data ingestion and background merges.
 
-[Original article](https://clickhouse.com/docs/en/operations/tips/)
-
 ## Related Content
 
 - [Getting started with ClickHouse? Here are 13 "Deadly Sins" and how to avoid them](https://clickhouse.com/blog/common-getting-started-issues-with-clickhouse)
diff --git a/docs/en/operations/utilities/clickhouse-benchmark.md b/docs/en/operations/utilities/clickhouse-benchmark.md
index 8b7d7f85552..6d5148ad965 100644
--- a/docs/en/operations/utilities/clickhouse-benchmark.md
+++ b/docs/en/operations/utilities/clickhouse-benchmark.md
@@ -45,11 +45,11 @@ clickhouse-benchmark [keys] < queries_file;
 - `-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).
+- `--port=N` — Server port. Default value: 9000. For the [comparison mode](#clickhouse-benchmark-comparison-mode) you can use multiple `--port` keys.
 - `--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`.
diff --git a/docs/en/operations/utilities/clickhouse-copier.md b/docs/en/operations/utilities/clickhouse-copier.md
deleted file mode 100644
index 0d329487504..00000000000
--- a/docs/en/operations/utilities/clickhouse-copier.md
+++ /dev/null
@@ -1,187 +0,0 @@
----
-slug: /en/operations/utilities/clickhouse-copier
-sidebar_position: 59
-sidebar_label: clickhouse-copier
----
-
-# clickhouse-copier 
-
-Copies data from the tables in one cluster to tables in another (or the same) cluster.
-
-:::note    
-To get a consistent copy, the data in the source tables and partitions should not change during the entire process.
-:::
-
-You can run multiple `clickhouse-copier` instances on different servers to perform the same job. ClickHouse Keeper, or ZooKeeper, is used for syncing the processes.
-
-After starting, `clickhouse-copier`:
-
-- Connects to ClickHouse Keeper and receives:
-
-    - Copying jobs.
-    - The state of the copying 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.
-
-`clickhouse-copier` tracks the changes in ClickHouse Keeper and applies them on the fly.
-
-To reduce network traffic, we recommend running `clickhouse-copier` on the same server where the source data is located.
-
-## Running Clickhouse-copier {#running-clickhouse-copier}
-
-The utility should be run manually:
-
-``` bash
-$ clickhouse-copier --daemon --config keeper.xml --task-path /task/path --base-dir /path/to/dir
-```
-
-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. Default is false.
-- `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}
-
-``` xml
-<clickhouse>
-    <logger>
-        <level>trace</level>
-        <size>100M</size>
-        <count>3</count>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>127.0.0.1</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</clickhouse>
-```
-
-## Configuration of Copying Tasks {#configuration-of-copying-tasks}
-
-``` xml
-<clickhouse>
-    <!-- Configuration of clusters as in an ordinary server config -->
-    <remote_servers>
-        <source_cluster>
-            <!--
-                source cluster & destination clusters accept exactly the same
-                parameters as parameters for the usual Distributed table
-                see https://clickhouse.com/docs/en/engines/table-engines/special/distributed/
-            -->
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>127.0.0.1</host>
-                        <port>9000</port>
-                        <!--
-                        <user>default</user>
-                        <password>default</password>
-                        <secure>1</secure>
-                        -->
-                    </replica>
-            </shard>
-            ...
-        </source_cluster>
-
-        <destination_cluster>
-        ...
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <distributed_foreground_insert>1</distributed_foreground_insert>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>test</database_pull>
-            <table_pull>hits</table_pull>
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>test</database_push>
-            <table_push>hits2</table_push>
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-            -->
-            <engine>
-            ENGINE=ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/hits2', '{replica}')
-            PARTITION BY toMonday(date)
-            ORDER BY (CounterID, EventDate)
-            </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-            <sharding_key>jumpConsistentHash(intHash64(UserID), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-            <where_condition>CounterID != 0</where_condition>
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-            -->
-            <enabled_partitions>
-                <partition>'2018-02-26'</partition>
-                <partition>'2018-03-05'</partition>
-                ...
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-        <table_visits>
-        ...
-        </table_visits>
-        ...
-    </tables>
-</clickhouse>
-```
-
-`clickhouse-copier` tracks the changes in `/task/path/description` and applies them on the fly. For instance, if you change the value of `max_workers`, the number of processes running tasks will also change.
diff --git a/docs/en/operations/utilities/clickhouse-local.md b/docs/en/operations/utilities/clickhouse-local.md
index c863282efc1..93a3fecf3c6 100644
--- a/docs/en/operations/utilities/clickhouse-local.md
+++ b/docs/en/operations/utilities/clickhouse-local.md
@@ -34,7 +34,7 @@ The binary you just downloaded can run all sorts of ClickHouse tools and utiliti
 
 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`, you can simple specify the file to load. The following `reviews.tsv` file contains a sampling of Amazon product reviews:
+If the file is sitting on the same machine as `clickhouse-local`, you can simply specify the file to load. The following `reviews.tsv` file contains a sampling of Amazon product reviews:
 
 ```bash
 ./clickhouse local -q "SELECT * FROM 'reviews.tsv'"
@@ -201,12 +201,12 @@ Arguments:
 
 - `-S`, `--structure` — table structure for input data.
 - `--input-format` — input format, `TSV` by default.
-- `-f`, `--file` — path to data, `stdin` by default.
+- `-F`, `--file` — path to data, `stdin` by default.
 - `-q`, `--query` — queries to execute with `;` as delimiter. `--query` can be specified multiple times, e.g. `--query "SELECT 1" --query "SELECT 2"`. Cannot be used simultaneously with `--queries-file`.
 - `--queries-file` - file path with queries to execute. `--queries-file` can be specified multiple times, e.g. `--query queries1.sql --query queries2.sql`. 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.
+- `-f`, `--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.
@@ -220,7 +220,7 @@ Arguments:
 - `--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`.
+Also, there are arguments for each ClickHouse configuration variable which are more commonly used instead of `--config-file`.
 
 
 ## Examples {#examples}
diff --git a/docs/en/operations/utilities/clickhouse-obfuscator.md b/docs/en/operations/utilities/clickhouse-obfuscator.md
index ad51e9c7776..f9a94713be7 100644
--- a/docs/en/operations/utilities/clickhouse-obfuscator.md
+++ b/docs/en/operations/utilities/clickhouse-obfuscator.md
@@ -38,7 +38,7 @@ For example, you have a column `IsMobile` in your table with values 0 and 1. In
 
 So, the user will be able to count the exact ratio of mobile traffic.
 
-Let's give another example. When you have some private data in your table, like user email and you don't want to publish any single email address.
+Let's give another example. When you have some private data in your table, like user email, and you don't want to publish any single email address.
 If your table is large enough and contains multiple different emails and no email has a very high frequency than all others, it will anonymize all data. But if you have a small number of different values in a column, it can reproduce some of them.
 You should look at the working algorithm of this tool works, and fine-tune its command line parameters.
 
diff --git a/docs/en/operations/utilities/index.md b/docs/en/operations/utilities/index.md
index 8959073d00e..912a5b9ccb1 100644
--- a/docs/en/operations/utilities/index.md
+++ b/docs/en/operations/utilities/index.md
@@ -2,13 +2,11 @@
 slug: /en/operations/utilities/
 sidebar_position: 56
 sidebar_label: List of tools and utilities
-pagination_next: 'en/operations/utilities/clickhouse-copier'
 ---
 
 # 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.
diff --git a/docs/en/sql-reference/aggregate-functions/index.md b/docs/en/sql-reference/aggregate-functions/index.md
index 5d2229fbcce..96bf0c5d93b 100644
--- a/docs/en/sql-reference/aggregate-functions/index.md
+++ b/docs/en/sql-reference/aggregate-functions/index.md
@@ -16,7 +16,9 @@ ClickHouse also supports:
 
 ## NULL Processing
 
-During aggregation, all `NULL`s are skipped. If the aggregation has several parameters it will ignore any row in which one or more of the parameters are NULL.
+During aggregation, all `NULL` arguments are skipped. If the aggregation has several arguments it will ignore any row in which one or more of them are NULL.
+
+There is an exception to this rule, which are the functions [`first_value`](../../sql-reference/aggregate-functions/reference/first_value.md), [`last_value`](../../sql-reference/aggregate-functions/reference/last_value.md) and their aliases when followed by the modifier `RESPECT NULLS`: `FIRST_VALUE(b) RESPECT NULLS`.
 
 **Examples:**
 
@@ -85,3 +87,50 @@ FROM t_null_big;
 │ [2,2,3]       │ [2,NULL,2,3,NULL]                     │
 └───────────────┴───────────────────────────────────────┘
 ```
+
+Note that aggregations are skipped when the columns are used as arguments to an aggregated function.  For example [`count`](../../sql-reference/aggregate-functions/reference/count.md) without parameters (`count()`) or with constant ones (`count(1)`) will count all rows in the block (independently of the value of the GROUP BY column as it's not an argument), while `count(column)` will only return the number of rows where column is not NULL.
+
+```sql
+SELECT
+    v,
+    count(1),
+    count(v)
+FROM
+(
+    SELECT if(number < 10, NULL, number % 3) AS v
+    FROM numbers(15)
+)
+GROUP BY v
+
+┌────v─┬─count()─┬─count(v)─�
+│ ᴺ�ᴸᴸ │      10 │        0 │
+│    0 │       1 │        1 │
+│    1 │       2 │        2 │
+│    2 │       2 │        2 │
+└──────┴─────────┴──────────┘
+```
+
+And here is an example of of first_value with `RESPECT NULLS` where we can see that NULL inputs are respected and it will return the first value read, whether it's NULL or not:
+
+```sql
+SELECT
+    col || '_' || ((col + 1) * 5 - 1) as range,
+    first_value(odd_or_null) as first,
+    first_value(odd_or_null) IGNORE NULLS as first_ignore_null,
+    first_value(odd_or_null) RESPECT NULLS as first_respect_nulls
+FROM
+(
+    SELECT
+        intDiv(number, 5) AS col,
+        if(number % 2 == 0, NULL, number) as odd_or_null
+    FROM numbers(15)
+)
+GROUP BY col
+ORDER BY col
+
+┌─range─┬─first─┬─first_ignore_null─┬─first_respect_nulls─�
+│ 0_4   │     1 │                 1 │                ᴺ�ᴸᴸ │
+│ 1_9   │     5 │                 5 │                   5 │
+│ 2_14  │    11 │                11 │                ᴺ�ᴸᴸ │
+└───────┴───────┴───────────────────┴─────────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/parametric-functions.md b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
index 3654cd157e9..38dca6b7071 100644
--- a/docs/en/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/en/sql-reference/aggregate-functions/parametric-functions.md
@@ -483,7 +483,7 @@ 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).
+- `r3`- the number of unique visitors who visited the site during a specific time period on 2020-01-01 and 2020-01-03 (`cond1` and `cond3` conditions).
 
 ## uniqUpTo(N)(x)
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/any.md b/docs/en/sql-reference/aggregate-functions/reference/any.md
index a45eb1b409f..4631060f33f 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/any.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/any.md
@@ -9,7 +9,7 @@ Selects the first encountered value of a column.
 
 By default, it ignores NULL values and returns the first NOT NULL value found in the column. As [`first_value`](../../../sql-reference/aggregate-functions/reference/first_value.md) if supports `RESPECT NULLS`, in which case it will select the first value passed, independently on whether it's NULL or not.
 
-The return type of the function is the same as the input, except for LowCardinality which is discarded). This means that given no rows as input it will return the default value of that type (0 for integers, or Null for a Nullable() column). You might use the `-OrNull` [combinator](../../../sql-reference/aggregate-functions/combinators.md) ) to modify this behaviour.
+The return type of the function is the same as the input, except for LowCardinality which is discarded. This means that given no rows as input it will return the default value of that type (0 for integers, or Null for a Nullable() column). You might use the `-OrNull` [combinator](../../../sql-reference/aggregate-functions/combinators.md) ) to modify this behaviour.
 
 The query can be executed in any order and even in a different order each time, so the result of this function is indeterminate.
 To get a determinate result, you can use the ‘min’ or ‘max’ function instead of ‘any’.
diff --git a/docs/en/sql-reference/aggregate-functions/reference/approxtopk.md b/docs/en/sql-reference/aggregate-functions/reference/approxtopk.md
new file mode 100644
index 00000000000..2bb43a9f665
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/approxtopk.md
@@ -0,0 +1,55 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/approxtopk
+sidebar_position: 212
+---
+
+# approx_top_k
+
+Returns an array of the approximately most frequent values and their counts in the specified column. The resulting array is sorted in descending order of approximate frequency of values (not by the values themselves).
+
+
+``` sql
+approx_top_k(N)(column)
+approx_top_k(N, reserved)(column)
+```
+
+This function does not provide a guaranteed result. In certain situations, errors might occur and it might return frequent values that aren’t the most frequent values.
+
+We recommend using the `N < 10` value; performance is reduced with large `N` values. Maximum value of `N = 65536`.
+
+**Parameters**
+
+- `N` — The number of elements to return. Optional. Default value: 10.
+- `reserved` — Defines, how many cells reserved for values. If uniq(column) > reserved, result of topK function will be approximate. Optional. Default value: N * 3.
+ 
+**Arguments**
+
+- `column` — The value to calculate frequency.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT approx_top_k(2)(k)
+FROM VALUES('k Char, w UInt64', ('y', 1), ('y', 1), ('x', 5), ('y', 1), ('z', 10));
+```
+
+Result:
+
+``` text
+┌─approx_top_k(2)(k)────�
+│ [('y',3,0),('x',1,0)] │
+└───────────────────────┘
+```
+
+# approx_top_count
+
+Is an alias to `approx_top_k` function
+
+**See Also**
+
+- [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+- [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
+- [approx_top_sum](../../../sql-reference/aggregate-functions/reference/approxtopsum.md)
+
diff --git a/docs/en/sql-reference/aggregate-functions/reference/approxtopsum.md b/docs/en/sql-reference/aggregate-functions/reference/approxtopsum.md
new file mode 100644
index 00000000000..aa884b26d8e
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/approxtopsum.md
@@ -0,0 +1,51 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/approxtopsum
+sidebar_position: 212
+---
+
+# approx_top_sum
+
+Returns an array of the approximately most frequent values and their counts in the specified column. The resulting array is sorted in descending order of approximate frequency of values (not by the values themselves). Additionally, the weight of the value is taken into account.
+
+``` sql
+approx_top_sum(N)(column, weight)
+approx_top_sum(N, reserved)(column, weight)
+```
+
+This function does not provide a guaranteed result. In certain situations, errors might occur and it might return frequent values that aren’t the most frequent values.
+
+We recommend using the `N < 10` value; performance is reduced with large `N` values. Maximum value of `N = 65536`.
+
+**Parameters**
+
+- `N` — The number of elements to return. Optional. Default value: 10.
+- `reserved` — Defines, how many cells reserved for values. If uniq(column) > reserved, result of topK function will be approximate. Optional. Default value: N * 3.
+ 
+**Arguments**
+
+- `column` — The value to calculate frequency.
+- `weight` — The weight. Every value is accounted `weight` times for frequency calculation. [UInt64](../../../sql-reference/data-types/int-uint.md).
+
+
+**Example**
+
+Query:
+
+``` sql
+SELECT approx_top_sum(2)(k, w)
+FROM VALUES('k Char, w UInt64', ('y', 1), ('y', 1), ('x', 5), ('y', 1), ('z', 10))
+```
+
+Result:
+
+``` text
+┌─approx_top_sum(2)(k, w)─�
+│ [('z',10,0),('x',5,0)]  │
+└─────────────────────────┘
+```
+
+**See Also**
+
+- [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+- [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
+- [approx_top_k](../../../sql-reference/aggregate-functions/reference/approxtopk.md)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/contingency.md b/docs/en/sql-reference/aggregate-functions/reference/contingency.md
index 1b53ca1528f..902c1f4af80 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/contingency.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/contingency.md
@@ -20,7 +20,7 @@ contingency(column1, column2)
 
 **Returned value**
 
-- a value between 0 to 1. The larger the result, the closer the association of the two columns.
+- a value between 0 and 1. The larger the result, the closer the association of the two columns.
 
 **Return type** is always [Float64](../../../sql-reference/data-types/float.md).
 
@@ -48,4 +48,4 @@ Result:
 ┌──────cramersV(a, b)─┬───contingency(a, b)─�
 │ 0.41171788506213564 │ 0.05812725261759165 │
 └─────────────────────┴─────────────────────┘
-```
\ No newline at end of file
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/cramersv.md b/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
index e9e2c367610..2424ff95237 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/cramersv.md
@@ -7,26 +7,33 @@ sidebar_position: 351
 
 [Cramer's V](https://en.wikipedia.org/wiki/Cram%C3%A9r%27s_V) (sometimes referred to as Cramer's phi) is a measure of association between two columns in a table. The result of the `cramersV` function 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. It may be viewed as the association between two variables as a percentage of their maximum possible variation.
 
+:::note
+For a bias corrected version of Cramer's V see: [cramersVBiasCorrected](./cramersvbiascorrected.md)
+:::
+
 **Syntax**
 
 ``` sql
 cramersV(column1, column2)
 ```
 
-**Arguments**
+**Parameters**
 
-- `column1` and `column2` are the columns to be compared
+- `column1`: first column to be compared.
+- `column2`: second column to be compared.
 
 **Returned value**
 
 - 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).
+Type: always [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
 The following two columns being compared below have no association with each other, so the result of `cramersV` is 0:
 
+Query:
+
 ``` sql
 SELECT
     cramersV(a, b)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md b/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
index f5ad3a8a937..939c04e3fdc 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/cramersvbiascorrected.md
@@ -5,31 +5,31 @@ sidebar_position: 352
 
 # cramersVBiasCorrected
 
-
 Cramer'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 Cramer's V uses the [bias correction](https://en.wikipedia.org/wiki/Cram%C3%A9r%27s_V#Bias_correction).
 
-
-
 **Syntax**
 
 ``` sql
 cramersVBiasCorrected(column1, column2)
 ```
 
-**Arguments**
+**Parameters**
 
-- `column1` and `column2` are the columns to be compared
+- `column1`: first column to be compared.
+- `column2`: second column to be compared.
 
 **Returned value**
 
 - 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).
+Type: always [Float64](../../../sql-reference/data-types/float.md).
 
 **Example**
 
 The following two columns being compared below have a small association with each other. Notice the result of `cramersVBiasCorrected` is smaller than the result of `cramersV`:
 
+Query:
+
 ``` sql
 SELECT
     cramersV(a, b),
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparrayintersect.md b/docs/en/sql-reference/aggregate-functions/reference/grouparrayintersect.md
new file mode 100644
index 00000000000..5cac88be073
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparrayintersect.md
@@ -0,0 +1,50 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/grouparrayintersect
+sidebar_position: 115
+---
+
+# groupArrayIntersect
+
+Return an intersection of given arrays (Return all items of arrays, that are in all given arrays).
+
+**Syntax**
+
+``` sql
+groupArrayIntersect(x)
+```
+
+**Arguments**
+
+- `x` — Argument (column name or expression).
+
+**Returned values**
+
+- Array that contains elements that are in all arrays.
+
+Type: [Array](../../data-types/array.md).
+
+**Examples**
+
+Consider table `numbers`:
+
+``` text
+┌─a──────────────�
+│ [1,2,4]        │
+│ [1,5,2,8,-1,0] │
+│ [1,5,7,5,8,2]  │
+└────────────────┘
+```
+
+Query with column name as argument:
+
+``` sql
+SELECT groupArrayIntersect(a) as intersection FROM numbers;
+```
+
+Result:
+
+```text
+┌─intersection──────�
+│ [1, 2]            │
+└───────────────────┘
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/grouparraysorted.md b/docs/en/sql-reference/aggregate-functions/reference/grouparraysorted.md
new file mode 100644
index 00000000000..9bee0c29e7a
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/grouparraysorted.md
@@ -0,0 +1,45 @@
+ ---
+ toc_priority: 112
+ ---
+
+ # groupArraySorted {#groupArraySorted}
+
+ Returns an array with the first N items in ascending order.
+
+ ``` sql
+ groupArraySorted(N)(column)
+ ```
+
+ **Arguments**
+
+ -   `N` – The number of elements to return.
+
+ -   `column` – The value (Integer, String, Float and other Generic types).
+
+ **Example**
+
+ Gets the first 10 numbers:
+
+ ``` sql
+ SELECT groupArraySorted(10)(number) FROM numbers(100)
+ ```
+
+ ``` text
+ ┌─groupArraySorted(10)(number)─�
+ │ [0,1,2,3,4,5,6,7,8,9]        │
+ └──────────────────────────────┘
+ ```
+
+
+ Gets all the String implementations of all numbers in column:
+
+ ``` sql
+SELECT groupArraySorted(5)(str) FROM (SELECT toString(number) as str FROM numbers(5));
+
+ ```
+
+ ``` text
+┌─groupArraySorted(5)(str)─�
+│ ['0','1','2','3','4']    │
+└──────────────────────────┘
+ ```
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/index.md b/docs/en/sql-reference/aggregate-functions/reference/index.md
index b1f2c5bacbb..b99d4b06d55 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/index.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/index.md
@@ -54,6 +54,8 @@ ClickHouse-specific aggregate functions:
 - [groupArrayMovingAvg](/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingavg.md)
 - [groupArrayMovingSum](/docs/en/sql-reference/aggregate-functions/reference/grouparraymovingsum.md)
 - [groupArraySample](./grouparraysample.md)
+- [groupArraySorted](/docs/en/sql-reference/aggregate-functions/reference/grouparraysorted.md)
+- [groupArrayIntersect](./grouparrayintersect.md)
 - [groupBitAnd](/docs/en/sql-reference/aggregate-functions/reference/groupbitand.md)
 - [groupBitOr](/docs/en/sql-reference/aggregate-functions/reference/groupbitor.md)
 - [groupBitXor](/docs/en/sql-reference/aggregate-functions/reference/groupbitxor.md)
@@ -88,6 +90,7 @@ ClickHouse-specific aggregate functions:
 - [quantileTDigestWeighted](/docs/en/sql-reference/aggregate-functions/reference/quantiletdigestweighted.md)
 - [quantileBFloat16](/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16)
 - [quantileBFloat16Weighted](/docs/en/sql-reference/aggregate-functions/reference/quantilebfloat16.md#quantilebfloat16weighted)
+- [quantileDD](/docs/en/sql-reference/aggregate-functions/reference/quantileddsketch.md#quantileddsketch)
 - [simpleLinearRegression](/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md)
 - [stochasticLinearRegression](/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md)
 - [stochasticLogisticRegression](/docs/en/sql-reference/aggregate-functions/reference/stochasticlogisticregression.md)
@@ -104,4 +107,3 @@ ClickHouse-specific aggregate functions:
 - [sparkBar](./sparkbar.md)
 - [sumCount](./sumcount.md)
 - [largestTriangleThreeBuckets](./largestTriangleThreeBuckets.md)
-
diff --git a/docs/en/sql-reference/aggregate-functions/reference/median.md b/docs/en/sql-reference/aggregate-functions/reference/median.md
index f20b23a0c8b..2a166c83dad 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/median.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/median.md
@@ -18,6 +18,7 @@ Functions:
 - `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).
+- `medianDD` — Alias for [quantileDD](../../../sql-reference/aggregate-functions/reference/quantileddsketch.md#quantileddsketch).
 
 **Example**
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/quantileddsketch.md b/docs/en/sql-reference/aggregate-functions/reference/quantileddsketch.md
new file mode 100644
index 00000000000..f9acd2e20cb
--- /dev/null
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantileddsketch.md
@@ -0,0 +1,61 @@
+---
+slug: /en/sql-reference/aggregate-functions/reference/quantileddsketch
+sidebar_position: 211
+title: quantileDD
+---
+
+Computes an approximate [quantile](https://en.wikipedia.org/wiki/Quantile) of a sample with relative-error guarantees. It works by building a [DD](https://www.vldb.org/pvldb/vol12/p2195-masson.pdf).
+
+**Syntax**
+
+``` sql
+quantileDDsketch[relative_accuracy, (level)](expr)
+```
+
+**Arguments**
+
+- `expr` — Column with numeric data. [Integer](../../../sql-reference/data-types/int-uint.md), [Float](../../../sql-reference/data-types/float.md).
+
+**Parameters**
+
+- `relative_accuracy` — Relative accuracy of the quantile. Possible values are in the range from 0 to 1. [Float](../../../sql-reference/data-types/float.md). The size of the sketch depends on the range of the data and the relative accuracy. The larger the range and the smaller the relative accuracy, the larger the sketch. The rough memory size of the of the sketch is `log(max_value/min_value)/relative_accuracy`. The recommended value is 0.001 or higher.
+
+- `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.
+
+Type: [Float64](../../../sql-reference/data-types/float.md#float32-float64).
+
+**Example**
+
+Input table has an integer and a float columns:
+
+``` text
+┌─a─┬─────b─�
+│ 1 │ 1.001 │
+│ 2 │ 1.002 │
+│ 3 │ 1.003 │
+│ 4 │ 1.004 │
+└───┴───────┘
+```
+
+Query to calculate 0.75-quantile (third quartile):
+
+``` sql
+SELECT quantileDD(0.01, 0.75)(a), quantileDD(0.01, 0.75)(b) FROM example_table;
+```
+
+Result:
+
+``` text
+┌─quantileDD(0.01, 0.75)(a)─┬─quantileDD(0.01, 0.75)(b)─�
+│               2.974233423476717 │                            1.01 │
+└─────────────────────────────────┴─────────────────────────────────┘
+```
+
+**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/quantiles.md b/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
index 38db39d2eec..e2a5bc53e32 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/quantiles.md
@@ -9,7 +9,7 @@ sidebar_position: 201
 
 Syntax: `quantiles(level1, level2, …)(x)`
 
-All the quantile functions also have corresponding quantiles functions: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantileInterpolatedWeighted`, `quantilesTDigest`, `quantilesBFloat16`. These functions calculate all the quantiles of the listed levels in one pass, and return an array of the resulting values.
+All the quantile functions also have corresponding quantiles functions: `quantiles`, `quantilesDeterministic`, `quantilesTiming`, `quantilesTimingWeighted`, `quantilesExact`, `quantilesExactWeighted`, `quantileInterpolatedWeighted`, `quantilesTDigest`, `quantilesBFloat16`, `quantilesDD`. These functions calculate all the quantiles of the listed levels in one pass, and return an array of the resulting values.
 
 ## quantilesExactExclusive
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md b/docs/en/sql-reference/aggregate-functions/reference/simplelinearregression.md
index bcff05ada47..ea3dbff8691 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 explanatory variable values.
+- `y` — Column with dependent variable values.
 
 Returned values:
 
diff --git a/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md b/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
index f7615d90790..ddac82a0977 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/stochasticlinearregression.md
@@ -5,25 +5,25 @@ sidebar_position: 221
 
 # stochasticLinearRegression
 
-This function implements stochastic linear regression. It supports custom parameters for learning rate, L2 regularization coefficient, mini-batch size and has few methods for updating weights ([Adam](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) (used by default), [simple SGD](https://en.wikipedia.org/wiki/Stochastic_gradient_descent), [Momentum](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum), [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)).
+This function implements stochastic linear regression. It supports custom parameters for learning rate, L2 regularization coefficient, mini-batch size, and has a few methods for updating weights ([Adam](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Adam) (used by default), [simple SGD](https://en.wikipedia.org/wiki/Stochastic_gradient_descent), [Momentum](https://en.wikipedia.org/wiki/Stochastic_gradient_descent#Momentum), and [Nesterov](https://mipt.ru/upload/medialibrary/d7e/41-91.pdf)).
 
 ### Parameters
 
 There are 4 customizable parameters. They are passed to the function sequentially, but there is no need to pass all four - default values will be used, however good model required some parameter tuning.
 
 ``` text
-stochasticLinearRegression(1.0, 1.0, 10, 'SGD')
+stochasticLinearRegression(0.00001, 0.1, 15, 'Adam')
 ```
 
-1.  `learning rate` is the coefficient on step length, when gradient descent step is performed. Too big learning rate may cause infinite weights of the model. Default is `0.00001`.
+1.  `learning rate` is the coefficient on step length, when the gradient descent step is performed. A learning rate that is too big may cause infinite weights of the model. Default is `0.00001`.
 2.  `l2 regularization coefficient` which may help to prevent overfitting. Default is `0.1`.
-3.  `mini-batch size` sets the number of elements, which gradients will be computed and summed to perform one step of gradient descent. Pure stochastic descent uses one element, however having small batches(about 10 elements) make gradient steps more stable. Default is `15`.
-4.  `method for updating weights`, they are: `Adam` (by default), `SGD`, `Momentum`, `Nesterov`. `Momentum` and `Nesterov` require little bit more computations and memory, however they happen to be useful in terms of speed of convergence and stability of stochastic gradient methods.
+3.  `mini-batch size` sets the number of elements, which gradients will be computed and summed to perform one step of gradient descent. Pure stochastic descent uses one element, however, having small batches (about 10 elements) makes gradient steps more stable. Default is `15`.
+4.  `method for updating weights`, they are: `Adam` (by default), `SGD`, `Momentum`, and `Nesterov`. `Momentum` and `Nesterov` require a little bit more computations and memory, however, they happen to be useful in terms of speed of convergence and stability of stochastic gradient methods.
 
 ### Usage
 
-`stochasticLinearRegression` is used in two steps: fitting the model and predicting on new data. In order to fit the model and save its state for later usage we use `-State` combinator, which basically saves the state (model weights, etc).
-To predict we use function [evalMLMethod](../../../sql-reference/functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod), which takes a state as an argument as well as features to predict on.
+`stochasticLinearRegression` is used in two steps: fitting the model and predicting on new data. In order to fit the model and save its state for later usage, we use the `-State` combinator, which saves the state (e.g. model weights).
+To predict, we use the function [evalMLMethod](../../../sql-reference/functions/machine-learning-functions.md#machine_learning_methods-evalmlmethod), which takes a state as an argument as well as features to predict on.
 
 <a name="stochasticlinearregression-usage-fitting"></a>
 
@@ -44,12 +44,12 @@ stochasticLinearRegressionState(0.1, 0.0, 5, 'SGD')(target, param1, param2)
 AS state FROM train_data;
 ```
 
-Here we also need to insert data into `train_data` table. The number of parameters is not fixed, it depends only on number of arguments, passed into `linearRegressionState`. They all must be numeric values.
-Note that the column with target value(which we would like to learn to predict) is inserted as the first argument.
+Here, we also need to insert data into the `train_data` table. The number of parameters is not fixed, it depends only on the number of arguments passed into `linearRegressionState`. They all must be numeric values.
+Note that the column with target value (which we would like to learn to predict) is inserted as the first argument.
 
 **2.** Predicting
 
-After saving a state into the table, we may use it multiple times for prediction, or even merge with other states and create new even better models.
+After saving a state into the table, we may use it multiple times for prediction or even merge with other states and create new, even better models.
 
 ``` sql
 WITH (SELECT state FROM your_model) AS model SELECT
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topk.md b/docs/en/sql-reference/aggregate-functions/reference/topk.md
index bde29275f79..dd4b2251a8a 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topk.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topk.md
@@ -11,21 +11,23 @@ Implements the [Filtered Space-Saving](https://doi.org/10.1016/j.ins.2010.08.024
 
 ``` sql
 topK(N)(column)
+topK(N, load_factor)(column)
+topK(N, load_factor, 'counts')(column)
 ```
 
 This function does not provide a guaranteed result. In certain situations, errors might occur and it might return frequent values that aren’t the most frequent values.
 
 We recommend using the `N < 10` value; performance is reduced with large `N` values. Maximum value of `N = 65536`.
 
+**Parameters**
+
+- `N` — The number of elements to return. Optional. Default value: 10.
+- `load_factor` — Defines, how many cells reserved for values. If uniq(column) > N * load_factor, result of topK function will be approximate. Optional. Default value: 3.
+- `counts` — Defines, should result contain approximate count and error value.
+ 
 **Arguments**
 
-- `N` – The number of elements to return.
-
-If the parameter is omitted, default value 10 is used.
-
-**Arguments**
-
-- `x` – The value to calculate frequency.
+- `column` — The value to calculate frequency.
 
 **Example**
 
@@ -41,3 +43,9 @@ FROM ontime
 │ [19393,19790,19805] │
 └─────────────────────┘
 ```
+
+**See Also**
+
+- [topKWeighted](../../../sql-reference/aggregate-functions/reference/topkweighted.md)
+- [approx_top_k](../../../sql-reference/aggregate-functions/reference/approxtopk.md)
+- [approx_top_sum](../../../sql-reference/aggregate-functions/reference/approxtopsum.md)
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
index 03932e88a6a..d2a469828fc 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/topkweighted.md
@@ -10,13 +10,20 @@ Returns an array of the approximately most frequent values in the specified colu
 **Syntax**
 
 ``` sql
-topKWeighted(N)(x, weight)
+topKWeighted(N)(column, weight)
+topKWeighted(N, load_factor)(column, weight)
+topKWeighted(N, load_factor, 'counts')(column, weight)
 ```
 
+**Parameters**
+
+- `N` — The number of elements to return. Optional. Default value: 10.
+- `load_factor` — Defines, how many cells reserved for values. If uniq(column) > N * load_factor, result of topK function will be approximate. Optional. Default value: 3.
+- `counts` — Defines, should result contain approximate count and error value.
+
 **Arguments**
 
-- `N` — The number of elements to return.
-- `x` — The value.
+- `column` — The value.
 - `weight` — The weight. Every value is accounted `weight` times for frequency calculation. [UInt64](../../../sql-reference/data-types/int-uint.md).
 
 **Returned value**
@@ -40,6 +47,23 @@ Result:
 └────────────────────────┘
 ```
 
+Query:
+
+``` sql
+SELECT topKWeighted(2, 10, 'counts')(k, w)
+FROM VALUES('k Char, w UInt64', ('y', 1), ('y', 1), ('x', 5), ('y', 1), ('z', 10))
+```
+
+Result:
+
+``` text
+┌─topKWeighted(2, 10, 'counts')(k, w)─�
+│ [('z',10,0),('x',5,0)]              │
+└─────────────────────────────────────┘
+```
+
 **See Also**
 
 - [topK](../../../sql-reference/aggregate-functions/reference/topk.md)
+- [approx_top_k](../../../sql-reference/aggregate-functions/reference/approxtopk.md)
+- [approx_top_sum](../../../sql-reference/aggregate-functions/reference/approxtopsum.md)
\ No newline at end of file
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
index 2f3efde859d..18f44d2fcc4 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined.md
@@ -15,9 +15,9 @@ The `uniqCombined` function is a good choice for calculating the number of diffe
 
 **Arguments**
 
-The function takes a variable number of parameters. Parameters can be `Tuple`, `Array`, `Date`, `DateTime`, `String`, or numeric types.
+- `HLL_precision`: The base-2 logarithm of the number of cells in [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). Optional, you can use the function as `uniqCombined(x[, ...])`. The default value for `HLL_precision` is 17, which is effectively 96 KiB of space (2^17 cells, 6 bits each).
+- `X`: A variable number of parameters. Parameters can be `Tuple`, `Array`, `Date`, `DateTime`, `String`, or numeric types.
 
-`HLL_precision` is the base-2 logarithm of the number of cells in [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). Optional, you can use the function as `uniqCombined(x[, ...])`. The default value for `HLL_precision` is 17, which is effectively 96 KiB of space (2^17 cells, 6 bits each).
 
 **Returned value**
 
@@ -25,26 +25,43 @@ The function takes a variable number of parameters. Parameters can be `Tuple`, `
 
 **Implementation details**
 
-Function:
+The `uniqCombined` function:
 
 - 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.
-
-        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.
-
+    - 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).
 
 :::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)
+Since it uses a 32-bit hash for non-`String` types, 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).
 :::
 
-Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function, the `uniqCombined`:
+Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function, the `uniqCombined` function:
 
 - 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.
 
+**Example**
+
+Query:
+
+```sql
+SELECT uniqCombined(number) FROM numbers(1e6);
+```
+
+Result:
+
+```response
+┌─uniqCombined(number)─�
+│              1001148 │ -- 1.00 million
+└──────────────────────┘
+```
+
+See the example section of [uniqCombined64](../../../sql-reference/aggregate-functions/reference/uniqcombined64.md#agg_function-uniqcombined64) for an example of the difference between `uniqCombined` and `uniqCombined64` for much larger inputs.
+
 **See Also**
 
 - [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
diff --git a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64.md b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64.md
index 9f010da57f2..b6e09bcaae3 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/uniqcombined64.md
@@ -5,4 +5,78 @@ sidebar_position: 193
 
 # uniqCombined64
 
-Same as [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined), but uses 64-bit hash for all data types.
+Calculates the approximate number of different argument values. It is the same as [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md#agg_function-uniqcombined), but uses a 64-bit hash for all data types rather than just for the String data type.
+
+``` sql
+uniqCombined64(HLL_precision)(x[, ...])
+```
+
+**Parameters**
+
+- `HLL_precision`: The base-2 logarithm of the number of cells in [HyperLogLog](https://en.wikipedia.org/wiki/HyperLogLog). Optionally, you can use the function as `uniqCombined64(x[, ...])`. The default value for `HLL_precision` is 17, which is effectively 96 KiB of space (2^17 cells, 6 bits each).
+- `X`: A variable number of parameters. Parameters can be `Tuple`, `Array`, `Date`, `DateTime`, `String`, or numeric types.
+
+**Returned value**
+
+- A number [UInt64](../../../sql-reference/data-types/int-uint.md)-type number.
+
+**Implementation details**
+
+The `uniqCombined64` function:
+- Calculates a hash (64-bit hash for all data types) 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.
+    - 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).
+
+:::note
+Since it uses 64-bit hash for all types, the result does not suffer from very high error for cardinalities significantly larger than `UINT_MAX` like [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md) does, which uses a 32-bit hash for non-`String` types.
+:::
+
+Compared to the [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq) function, the `uniqCombined64` function:
+
+- Consumes several times less memory.
+- Calculates with several times higher accuracy.
+
+**Example**
+
+In the example below `uniqCombined64` is run on `1e10` different numbers returning a very close approximation of the number of different argument values. 
+
+Query:
+
+```sql
+SELECT uniqCombined64(number) FROM numbers(1e10);
+```
+
+Result:
+
+```response
+┌─uniqCombined64(number)─�
+│             9998568925 │ -- 10.00 billion
+└────────────────────────┘
+```
+
+By comparison the `uniqCombined` function returns a rather poor approximation for an input this size.
+
+Query:
+
+```sql
+SELECT uniqCombined(number) FROM numbers(1e10);
+```
+
+Result:
+
+```response
+┌─uniqCombined(number)─�
+│           5545308725 │ -- 5.55 billion
+└──────────────────────┘
+```
+
+**See Also**
+
+- [uniq](../../../sql-reference/aggregate-functions/reference/uniq.md#agg_function-uniq)
+- [uniqCombined](../../../sql-reference/aggregate-functions/reference/uniqcombined.md)
+- [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/varpop.md b/docs/en/sql-reference/aggregate-functions/reference/varpop.md
index 751688b0830..2044b7e690b 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/varpop.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/varpop.md
@@ -1,16 +1,99 @@
 ---
-slug: /en/sql-reference/aggregate-functions/reference/varpop
+title: "varPop"
+slug: "/en/sql-reference/aggregate-functions/reference/varpop"
 sidebar_position: 32
 ---
 
-# varPop(x)
+This page covers the `varPop` and `varPopStable` functions available in ClickHouse.
 
-Calculates the amount `Σ((x - x̅)^2) / n`, where `n` is the sample size and `x̅`is the average value of `x`.
+## varPop
 
-In other words, dispersion for a set of values. Returns `Float64`.
+Calculates the population covariance between two data columns. The population covariance measures the degree to which two variables vary together. Calculates the amount `Σ((x - x̅)^2) / n`, where `n` is the sample size and `x̅`is the average value of `x`.
 
-Alias: `VAR_POP`.
+**Syntax**
 
-:::note
-This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `varPopStable` function. It works slower but provides a lower computational error.
-:::
\ No newline at end of file
+```sql
+covarPop(x, y)
+```
+
+**Parameters**
+
+- `x`: The first data column. [Numeric](../../../native-protocol/columns.md)
+- `y`: The second data column. [Numeric](../../../native-protocol/columns.md)
+
+**Returned value**
+
+Returns an integer of type `Float64`.
+
+**Implementation details**
+
+This function uses a numerically unstable algorithm. If you need numerical stability in calculations, use the slower but more stable [`varPopStable` function](#varPopStable).
+
+**Example**
+
+```sql
+DROP TABLE IF EXISTS test_data;
+CREATE TABLE test_data
+(
+    x Int32,
+    y Int32
+)
+ENGINE = Memory;
+
+INSERT INTO test_data VALUES (1, 2), (2, 3), (3, 5), (4, 6), (5, 8);
+
+SELECT
+    covarPop(x, y) AS covar_pop
+FROM test_data;
+```
+
+```response
+3
+```
+
+## varPopStable
+
+Calculates population covariance between two data columns using a stable, numerically accurate method to calculate the variance. This function is designed to provide reliable results even with large datasets or values that might cause numerical instability in other implementations.
+
+**Syntax**
+
+```sql
+covarPopStable(x, y)
+```
+
+**Parameters**
+
+- `x`: The first data column. [String literal](../../syntax#syntax-string-literal)
+- `y`: The second data column. [Expression](../../syntax#syntax-expressions)
+
+**Returned value**
+
+Returns an integer of type `Float64`.
+
+**Implementation details**
+
+Unlike [`varPop()`](#varPop), this function uses a stable, numerically accurate algorithm to calculate the population variance to avoid issues like catastrophic cancellation or loss of precision. This function also handles `NaN` and `Inf` values correctly, excluding them from calculations.
+
+**Example**
+
+Query:
+
+```sql
+DROP TABLE IF EXISTS test_data;
+CREATE TABLE test_data
+(
+    x Int32,
+    y Int32
+)
+ENGINE = Memory;
+
+INSERT INTO test_data VALUES (1, 2), (2, 9), (9, 5), (4, 6), (5, 8);
+
+SELECT
+    covarPopStable(x, y) AS covar_pop_stable
+FROM test_data;
+```
+
+```response
+0.5999999999999999
+```
diff --git a/docs/en/sql-reference/aggregate-functions/reference/varsamp.md b/docs/en/sql-reference/aggregate-functions/reference/varsamp.md
index 9b2b94936ec..be669a16ae8 100644
--- a/docs/en/sql-reference/aggregate-functions/reference/varsamp.md
+++ b/docs/en/sql-reference/aggregate-functions/reference/varsamp.md
@@ -1,18 +1,128 @@
 ---
+title: "varSamp"
 slug: /en/sql-reference/aggregate-functions/reference/varsamp
 sidebar_position: 33
 ---
 
-# varSamp
+This page contains information on the `varSamp` and `varSampStable` ClickHouse functions.
 
-Calculates the amount `Σ((x - x̅)^2) / (n - 1)`, where `n` is the sample size and `x̅`is the average value of `x`.
+## varSamp
 
-It represents an unbiased estimate of the variance of a random variable if passed values from its sample.
+Calculate the sample variance of a data set.
 
-Returns `Float64`. When `n <= 1`, returns `+∞`.
+**Syntax**
 
-Alias: `VAR_SAMP`.
+```sql
+varSamp(expr)
+```
 
-:::note
-This function uses a numerically unstable algorithm. If you need [numerical stability](https://en.wikipedia.org/wiki/Numerical_stability) in calculations, use the `varSampStable` function. It works slower but provides a lower computational error.
-:::
+**Parameters**
+
+- `expr`: An expression representing the data set for which you want to calculate the sample variance. [Expression](../../syntax#syntax-expressions)
+
+**Returned value**
+
+Returns a Float64 value representing the sample variance of the input data set.
+
+**Implementation details**
+
+The `varSamp()` function calculates the sample variance using the following formula:
+
+```plaintext
+∑(x - mean(x))^2 / (n - 1)
+```
+
+Where:
+
+- `x` is each individual data point in the data set.
+- `mean(x)` is the arithmetic mean of the data set.
+- `n` is the number of data points in the data set.
+
+The function assumes that the input data set represents a sample from a larger population. If you want to calculate the variance of the entire population (when you have the complete data set), you should use the [`varPop()` function](./varpop#varpop) instead.
+
+This function uses a numerically unstable algorithm. If you need numerical stability in calculations, use the slower but more stable [`varSampStable` function](#varSampStable).
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE example_table
+(
+    id UInt64,
+    value Float64
+)
+ENGINE = MergeTree
+ORDER BY id;
+
+INSERT INTO example_table VALUES (1, 10.5), (2, 12.3), (3, 9.8), (4, 11.2), (5, 10.7);
+
+SELECT varSamp(value) FROM example_table;
+```
+
+Response:
+
+```response
+0.8650000000000091
+```
+
+## varSampStable
+
+Calculate the sample variance of a data set using a numerically stable algorithm.
+
+**Syntax**
+
+```sql
+varSampStable(expr)
+```
+
+**Parameters**
+
+- `expr`: An expression representing the data set for which you want to calculate the sample variance. [Expression](../../syntax#syntax-expressions)
+
+**Returned value**
+
+The `varSampStable()` function returns a Float64 value representing the sample variance of the input data set.
+
+**Implementation details**
+
+The `varSampStable()` function calculates the sample variance using the same formula as the [`varSamp()`](#varSamp function):
+
+```plaintext
+∑(x - mean(x))^2 / (n - 1)
+```
+
+Where:
+- `x` is each individual data point in the data set.
+- `mean(x)` is the arithmetic mean of the data set.
+- `n` is the number of data points in the data set.
+
+The difference between `varSampStable()` and `varSamp()` is that `varSampStable()` is designed to provide a more deterministic and stable result when dealing with floating-point arithmetic. It uses an algorithm that minimizes the accumulation of rounding errors, which can be particularly important when dealing with large data sets or data with a wide range of values.
+
+Like `varSamp()`, the `varSampStable()` function assumes that the input data set represents a sample from a larger population. If you want to calculate the variance of the entire population (when you have the complete data set), you should use the [`varPopStable()` function](./varpop#varpopstable) instead.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE example_table
+(
+    id UInt64,
+    value Float64
+)
+ENGINE = MergeTree
+ORDER BY id;
+
+INSERT INTO example_table VALUES (1, 10.5), (2, 12.3), (3, 9.8), (4, 11.2), (5, 10.7);
+
+SELECT varSampStable(value) FROM example_table;
+```
+
+Response:
+
+```response
+0.865
+```
+
+This query calculates the sample variance of the `value` column in the `example_table` using the `varSampStable()` function. The result shows that the sample variance of the values `[10.5, 12.3, 9.8, 11.2, 10.7]` is approximately 0.865, which may differ slightly from the result of `varSamp()` due to the more precise handling of floating-point arithmetic.
diff --git a/docs/en/sql-reference/data-types/aggregatefunction.md b/docs/en/sql-reference/data-types/aggregatefunction.md
index fe6d7ebe0dc..87511a505dc 100644
--- a/docs/en/sql-reference/data-types/aggregatefunction.md
+++ b/docs/en/sql-reference/data-types/aggregatefunction.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/aggregatefunction
-sidebar_position: 53
+sidebar_position: 46
 sidebar_label: AggregateFunction
 ---
 
diff --git a/docs/en/sql-reference/data-types/array.md b/docs/en/sql-reference/data-types/array.md
index 0ee7c8de93c..e5a8ce5d18b 100644
--- a/docs/en/sql-reference/data-types/array.md
+++ b/docs/en/sql-reference/data-types/array.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/array
-sidebar_position: 52
+sidebar_position: 32
 sidebar_label: Array(T)
 ---
 
diff --git a/docs/en/sql-reference/data-types/boolean.md b/docs/en/sql-reference/data-types/boolean.md
index 70abf767a41..4c59bd947de 100644
--- a/docs/en/sql-reference/data-types/boolean.md
+++ b/docs/en/sql-reference/data-types/boolean.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/boolean
-sidebar_position: 43
+sidebar_position: 22
 sidebar_label: Boolean
 ---
 
diff --git a/docs/en/sql-reference/data-types/date.md b/docs/en/sql-reference/data-types/date.md
index 26e4610aec7..7adee3bbf3c 100644
--- a/docs/en/sql-reference/data-types/date.md
+++ b/docs/en/sql-reference/data-types/date.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/date
-sidebar_position: 47
+sidebar_position: 12
 sidebar_label: Date
 ---
 
diff --git a/docs/en/sql-reference/data-types/date32.md b/docs/en/sql-reference/data-types/date32.md
index 38a07cd817d..a08c931b7fc 100644
--- a/docs/en/sql-reference/data-types/date32.md
+++ b/docs/en/sql-reference/data-types/date32.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/date32
-sidebar_position: 48
+sidebar_position: 14
 sidebar_label: Date32
 ---
 
diff --git a/docs/en/sql-reference/data-types/datetime.md b/docs/en/sql-reference/data-types/datetime.md
index 1adff18f598..ac9a72c2641 100644
--- a/docs/en/sql-reference/data-types/datetime.md
+++ b/docs/en/sql-reference/data-types/datetime.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/datetime
-sidebar_position: 48
+sidebar_position: 16
 sidebar_label: DateTime
 ---
 
@@ -36,9 +36,9 @@ You can explicitly set a time zone for `DateTime`-type columns when creating a t
 
 The [clickhouse-client](../../interfaces/cli.md) applies the server time zone by default if a time zone isn’t explicitly set when initializing the data type. To use the client time zone, run `clickhouse-client` with the `--use_client_time_zone` parameter.
 
-ClickHouse outputs values depending on the value of the [date_time_output_format](../../operations/settings/settings.md#settings-date_time_output_format) setting. `YYYY-MM-DD hh:mm:ss` text format by default. Additionally, you can change the output with the [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) function.
+ClickHouse outputs values depending on the value of the [date_time_output_format](../../operations/settings/settings-formats.md#date_time_output_format) setting. `YYYY-MM-DD hh:mm:ss` text format by default. Additionally, you can change the output with the [formatDateTime](../../sql-reference/functions/date-time-functions.md#formatdatetime) function.
 
-When inserting data into ClickHouse, you can use different formats of date and time strings, depending on the value of the [date_time_input_format](../../operations/settings/settings.md#settings-date_time_input_format) setting.
+When inserting data into ClickHouse, you can use different formats of date and time strings, depending on the value of the [date_time_input_format](../../operations/settings/settings-formats.md#date_time_input_format) setting.
 
 ## Examples
 
@@ -147,8 +147,8 @@ Time shifts for multiple days. Some pacific islands changed their timezone offse
 - [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-formats.md#settings-date_time_input_format)
-- [The `date_time_output_format` setting](../../operations/settings/settings-formats.md#settings-date_time_output_format)
+- [The `date_time_input_format` setting](../../operations/settings/settings-formats.md#date_time_input_format)
+- [The `date_time_output_format` setting](../../operations/settings/settings-formats.md#date_time_output_format)
 - [The `timezone` server configuration parameter](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
 - [The `session_timezone` setting](../../operations/settings/settings.md#session_timezone)
 - [Operators for working with dates and times](../../sql-reference/operators/index.md#operators-datetime)
diff --git a/docs/en/sql-reference/data-types/datetime64.md b/docs/en/sql-reference/data-types/datetime64.md
index 8c7fa17ae92..ef452a723e6 100644
--- a/docs/en/sql-reference/data-types/datetime64.md
+++ b/docs/en/sql-reference/data-types/datetime64.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/datetime64
-sidebar_position: 49
+sidebar_position: 18
 sidebar_label: DateTime64
 ---
 
@@ -9,7 +9,7 @@ sidebar_label: DateTime64
 Allows to store an instant in time, that can be expressed as a calendar date and a time of a day, with defined sub-second precision
 
 Tick size (precision): 10<sup>-precision</sup> seconds. Valid range: [ 0 : 9 ].
-Typically are used - 3 (milliseconds), 6 (microseconds), 9 (nanoseconds).
+Typically, are used - 3 (milliseconds), 6 (microseconds), 9 (nanoseconds).
 
 **Syntax:**
 
diff --git a/docs/en/sql-reference/data-types/decimal.md b/docs/en/sql-reference/data-types/decimal.md
index e082eb29fbd..dfdefdff5a5 100644
--- a/docs/en/sql-reference/data-types/decimal.md
+++ b/docs/en/sql-reference/data-types/decimal.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/decimal
-sidebar_position: 42
+sidebar_position: 6
 sidebar_label: Decimal
 ---
 
@@ -10,7 +10,7 @@ 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). By default the precision is 10.
+- P - precision. Valid range: \[ 1 : 76 \]. Determines how many decimal digits number can have (including fraction). By default, the precision is 10.
 - S - scale. Valid range: \[ 0 : P \]. Determines how many decimal digits fraction can have.
 
 Decimal(P) is equivalent to Decimal(P, 0). Similarly, the syntax Decimal is equivalent to Decimal(10, 0).
diff --git a/docs/en/sql-reference/data-types/enum.md b/docs/en/sql-reference/data-types/enum.md
index 02e73a0360e..ccfeb7f3416 100644
--- a/docs/en/sql-reference/data-types/enum.md
+++ b/docs/en/sql-reference/data-types/enum.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/enum
-sidebar_position: 50
+sidebar_position: 20
 sidebar_label: Enum
 ---
 
diff --git a/docs/en/sql-reference/data-types/fixedstring.md b/docs/en/sql-reference/data-types/fixedstring.md
index a56b3fccbc1..0316df7fe34 100644
--- a/docs/en/sql-reference/data-types/fixedstring.md
+++ b/docs/en/sql-reference/data-types/fixedstring.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/sql-reference/data-types/fixedstring
-sidebar_position: 45
+sidebar_position: 10
 sidebar_label: FixedString(N)
 ---
 
-# FixedString
+# FixedString(N)
 
 A fixed-length string of `N` bytes (neither characters nor code points).
 
diff --git a/docs/en/sql-reference/data-types/float.md b/docs/en/sql-reference/data-types/float.md
index f1b99153b41..23131d5b4fe 100644
--- a/docs/en/sql-reference/data-types/float.md
+++ b/docs/en/sql-reference/data-types/float.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/float
-sidebar_position: 41
+sidebar_position: 4
 sidebar_label: Float32, Float64
 ---
 
@@ -35,8 +35,8 @@ Types are equivalent to types of C:
 
 Aliases:
 
-- `Float32` — `FLOAT`.
-- `Float64` — `DOUBLE`.
+- `Float32` — `FLOAT`, `REAL`, `SINGLE`.
+- `Float64` — `DOUBLE`, `DOUBLE PRECISION`.
 
 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.
 
diff --git a/docs/en/sql-reference/data-types/geo.md b/docs/en/sql-reference/data-types/geo.md
index 1d37b829dd5..7e3c32b3451 100644
--- a/docs/en/sql-reference/data-types/geo.md
+++ b/docs/en/sql-reference/data-types/geo.md
@@ -1,8 +1,8 @@
 ---
 slug: /en/sql-reference/data-types/geo
-sidebar_position: 62
+sidebar_position: 54
 sidebar_label: Geo
-title: "Geo Data Types"
+title: "Geometric"
 ---
 
 ClickHouse supports data types for representing geographical objects — locations, lands, etc.
diff --git a/docs/en/sql-reference/data-types/index.md b/docs/en/sql-reference/data-types/index.md
index ffd063590fa..fcb0b60d022 100644
--- a/docs/en/sql-reference/data-types/index.md
+++ b/docs/en/sql-reference/data-types/index.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/sql-reference/data-types/
 sidebar_label: List of data types
-sidebar_position: 37
+sidebar_position: 1
 ---
 
-# ClickHouse Data Types
+# Data Types in ClickHouse
 
 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.
 
diff --git a/docs/en/sql-reference/data-types/int-uint.md b/docs/en/sql-reference/data-types/int-uint.md
index b551143d92f..52d2982de19 100644
--- a/docs/en/sql-reference/data-types/int-uint.md
+++ b/docs/en/sql-reference/data-types/int-uint.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/int-uint
-sidebar_position: 40
+sidebar_position: 2
 sidebar_label: UInt8, UInt16, UInt32, UInt64, UInt128, UInt256, Int8, Int16, Int32, Int64, Int128, Int256
 ---
 
@@ -21,10 +21,10 @@ When creating tables, numeric parameters for integer numbers can be set (e.g. `T
 
 Aliases:
 
-- `Int8` — `TINYINT`, `BOOL`, `BOOLEAN`, `INT1`.
-- `Int16` — `SMALLINT`, `INT2`.
-- `Int32` — `INT`, `INT4`, `INTEGER`.
-- `Int64` — `BIGINT`.
+- `Int8` — `TINYINT`, `INT1`, `BYTE`, `TINYINT SIGNED`, `INT1 SIGNED`.
+- `Int16` — `SMALLINT`, `SMALLINT SIGNED`.
+- `Int32` — `INT`, `INTEGER`, `MEDIUMINT`, `MEDIUMINT SIGNED`, `INT SIGNED`, `INTEGER SIGNED`.
+- `Int64` — `BIGINT`, `SIGNED`, `BIGINT SIGNED`, `TIME`.
 
 ## UInt Ranges
 
@@ -34,3 +34,11 @@ Aliases:
 - `UInt64` — \[0 : 18446744073709551615\]
 - `UInt128` — \[0 : 340282366920938463463374607431768211455\]
 - `UInt256` — \[0 : 115792089237316195423570985008687907853269984665640564039457584007913129639935\]
+
+Aliases:
+
+- `UInt8` — `TINYINT UNSIGNED`, `INT1 UNSIGNED`.
+- `UInt16` — `SMALLINT UNSIGNED`.
+- `UInt32` — `MEDIUMINT UNSIGNED`, `INT UNSIGNED`, `INTEGER UNSIGNED`
+- `UInt64` — `UNSIGNED`, `BIGINT UNSIGNED`, `BIT`, `SET`
+
diff --git a/docs/en/sql-reference/data-types/ipv4.md b/docs/en/sql-reference/data-types/ipv4.md
index 288806f47b3..637ed543e08 100644
--- a/docs/en/sql-reference/data-types/ipv4.md
+++ b/docs/en/sql-reference/data-types/ipv4.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/ipv4
-sidebar_position: 59
+sidebar_position: 28
 sidebar_label: IPv4
 ---
 
diff --git a/docs/en/sql-reference/data-types/ipv6.md b/docs/en/sql-reference/data-types/ipv6.md
index 97959308b58..642a7db81fc 100644
--- a/docs/en/sql-reference/data-types/ipv6.md
+++ b/docs/en/sql-reference/data-types/ipv6.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/ipv6
-sidebar_position: 60
+sidebar_position: 30
 sidebar_label: IPv6
 ---
 
diff --git a/docs/en/sql-reference/data-types/json.md b/docs/en/sql-reference/data-types/json.md
index f727f0d75f7..39e37abad82 100644
--- a/docs/en/sql-reference/data-types/json.md
+++ b/docs/en/sql-reference/data-types/json.md
@@ -1,13 +1,13 @@
 ---
 slug: /en/sql-reference/data-types/json
-sidebar_position: 54
+sidebar_position: 26
 sidebar_label: JSON
 ---
 
 # JSON
 
 :::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.
+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.
@@ -15,7 +15,8 @@ Stores JavaScript Object Notation (JSON) documents in a single column.
 `JSON` is an alias for `Object('json')`.
 
 :::note
-The JSON data type is an experimental feature. To use it, set `allow_experimental_object_type = 1`.
+The JSON data type is an obsolete feature. Do not use it.
+If you want to use it, set `allow_experimental_object_type = 1`.
 :::
 
 ## Example
diff --git a/docs/en/sql-reference/data-types/lowcardinality.md b/docs/en/sql-reference/data-types/lowcardinality.md
index db10103282d..133ac2bd72e 100644
--- a/docs/en/sql-reference/data-types/lowcardinality.md
+++ b/docs/en/sql-reference/data-types/lowcardinality.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/sql-reference/data-types/lowcardinality
-sidebar_position: 51
-sidebar_label: LowCardinality
+sidebar_position: 42
+sidebar_label: LowCardinality(T)
 ---
 
-# LowCardinality
+# LowCardinality(T)
 
 Changes the internal representation of other data types to be dictionary-encoded.
 
diff --git a/docs/en/sql-reference/data-types/map.md b/docs/en/sql-reference/data-types/map.md
index e0c8b98f9f8..2c734969afc 100644
--- a/docs/en/sql-reference/data-types/map.md
+++ b/docs/en/sql-reference/data-types/map.md
@@ -1,12 +1,12 @@
 ---
 slug: /en/sql-reference/data-types/map
-sidebar_position: 65
-sidebar_label: Map(key, value)
+sidebar_position: 36
+sidebar_label: Map(K, V)
 ---
 
-# Map(key, value)
+# Map(K, V)
 
-`Map(key, value)` data type stores `key:value` pairs.
+`Map(K, V)` data type stores `key:value` pairs.
 
 **Parameters**
 
diff --git a/docs/en/sql-reference/data-types/multiword-types.md b/docs/en/sql-reference/data-types/multiword-types.md
deleted file mode 100644
index ebbe1d84544..00000000000
--- a/docs/en/sql-reference/data-types/multiword-types.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-slug: /en/sql-reference/data-types/multiword-types
-sidebar_position: 61
-sidebar_label: Multiword Type Names
-title: "Multiword Types"
----
-
-When creating tables, you can use data types with a name consisting of several words. This is implemented for better SQL compatibility.
-
-## Multiword Types Support
-
-| Multiword types                  | Simple types                                                 |
-|----------------------------------|--------------------------------------------------------------|
-| DOUBLE PRECISION                 | [Float64](../../sql-reference/data-types/float.md)           |
-| CHAR LARGE OBJECT                | [String](../../sql-reference/data-types/string.md)           |
-| CHAR VARYING                     | [String](../../sql-reference/data-types/string.md)           |
-| CHARACTER LARGE OBJECT           | [String](../../sql-reference/data-types/string.md)           |
-| CHARACTER VARYING                | [String](../../sql-reference/data-types/string.md)           |
-| NCHAR LARGE OBJECT               | [String](../../sql-reference/data-types/string.md)           |
-| NCHAR VARYING                    | [String](../../sql-reference/data-types/string.md)           |
-| NATIONAL CHARACTER LARGE OBJECT  | [String](../../sql-reference/data-types/string.md)           |
-| NATIONAL CHARACTER VARYING       | [String](../../sql-reference/data-types/string.md)           |
-| NATIONAL CHAR VARYING            | [String](../../sql-reference/data-types/string.md)           |
-| NATIONAL CHARACTER               | [String](../../sql-reference/data-types/string.md)           |
-| NATIONAL CHAR                    | [String](../../sql-reference/data-types/string.md)           |
-| BINARY LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)           |
-| BINARY VARYING                   | [String](../../sql-reference/data-types/string.md)           |
diff --git a/docs/en/sql-reference/data-types/nullable.md b/docs/en/sql-reference/data-types/nullable.md
index 28180f7f991..abcb87a0c1b 100644
--- a/docs/en/sql-reference/data-types/nullable.md
+++ b/docs/en/sql-reference/data-types/nullable.md
@@ -1,14 +1,14 @@
 ---
 slug: /en/sql-reference/data-types/nullable
-sidebar_position: 55
-sidebar_label: Nullable
+sidebar_position: 44
+sidebar_label: Nullable(T)
 ---
 
-# Nullable(typename)
+# Nullable(T)
 
-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`.
+Allows to store special marker ([NULL](../../sql-reference/syntax.md)) that denotes “missing value� alongside normal values allowed by `T`. 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), [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))`.
+`T` can’t be any of the 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) but composite data types can contain `Nullable` type values, e.g. `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 517a28576f0..39f8409c1e1 100644
--- a/docs/en/sql-reference/data-types/simpleaggregatefunction.md
+++ b/docs/en/sql-reference/data-types/simpleaggregatefunction.md
@@ -1,5 +1,7 @@
 ---
 slug: /en/sql-reference/data-types/simpleaggregatefunction
+sidebar_position: 48
+sidebar_label: SimpleAggregateFunction
 ---
 # SimpleAggregateFunction
 
diff --git a/docs/en/sql-reference/data-types/string.md b/docs/en/sql-reference/data-types/string.md
index f891a9303e5..8a4f346fdfc 100644
--- a/docs/en/sql-reference/data-types/string.md
+++ b/docs/en/sql-reference/data-types/string.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/string
-sidebar_position: 44
+sidebar_position: 8
 sidebar_label: String
 ---
 
@@ -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`, `CHAR LARGE OBJECT`, `CHAR VARYING`, `CHARACTER LARGE OBJECT`, `CHARACTER VARYING`, `NCHAR LARGE OBJECT`, `NCHAR VARYING`, `NATIONAL CHARACTER LARGE OBJECT`, `NATIONAL CHARACTER VARYING`, `NATIONAL CHAR VARYING`, `NATIONAL CHARACTER`, `NATIONAL CHAR`, `BINARY LARGE OBJECT`, `BINARY VARYING`,
 
 ## Encodings
 
diff --git a/docs/en/sql-reference/data-types/tuple.md b/docs/en/sql-reference/data-types/tuple.md
index 8f87eeca075..0525a3b0476 100644
--- a/docs/en/sql-reference/data-types/tuple.md
+++ b/docs/en/sql-reference/data-types/tuple.md
@@ -1,10 +1,10 @@
 ---
 slug: /en/sql-reference/data-types/tuple
-sidebar_position: 54
+sidebar_position: 34
 sidebar_label: Tuple(T1, T2, ...)
 ---
 
-# Tuple(T1, T2, …)
+# Tuple(T1, T2, ...)
 
 A tuple of elements, each having an individual [type](../../sql-reference/data-types/index.md#data_types). Tuple must contain at least one element.
 
diff --git a/docs/en/sql-reference/data-types/uuid.md b/docs/en/sql-reference/data-types/uuid.md
index 40f756b9588..75e163f5063 100644
--- a/docs/en/sql-reference/data-types/uuid.md
+++ b/docs/en/sql-reference/data-types/uuid.md
@@ -1,6 +1,6 @@
 ---
 slug: /en/sql-reference/data-types/uuid
-sidebar_position: 46
+sidebar_position: 24
 sidebar_label: UUID
 ---
 
diff --git a/docs/en/sql-reference/data-types/variant.md b/docs/en/sql-reference/data-types/variant.md
new file mode 100644
index 00000000000..3c2b6e0a362
--- /dev/null
+++ b/docs/en/sql-reference/data-types/variant.md
@@ -0,0 +1,476 @@
+---
+slug: /en/sql-reference/data-types/variant
+sidebar_position: 40
+sidebar_label: Variant(T1, T2, ...)
+---
+
+# Variant(T1, T2, ...)
+
+This type represents a union of other data types. Type `Variant(T1, T2, ..., TN)` means that each row of this type 
+has a value of either type `T1` or `T2` or ... or `TN` or none of them (`NULL` value).
+
+The order of nested types doesn't matter: Variant(T1, T2) = Variant(T2, T1).
+Nested types can be arbitrary types except Nullable(...), LowCardinality(Nullable(...)) and Variant(...) types.
+
+:::note
+It's not recommended to use similar types as variants (for example different numeric types like `Variant(UInt32, Int64)` or different date types like `Variant(Date, DateTime)`),
+because working with values of such types can lead to ambiguity. By default, creating such `Variant` type will lead to an exception, but can be enabled using setting `allow_suspicious_variant_types`
+:::
+
+:::note
+The Variant data type is an experimental feature. To use it, set `allow_experimental_variant_type = 1`.
+:::
+
+## Creating Variant
+
+Using `Variant` type in table column definition:
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT v FROM test;
+```
+
+```text
+┌─v─────────────�
+│ ᴺ�ᴸᴸ          │
+│ 42            │
+│ Hello, World! │
+│ [1,2,3]       │
+└───────────────┘
+```
+
+Using CAST from ordinary columns:
+
+```sql
+SELECT toTypeName(variant) as type_name, 'Hello, World!'::Variant(UInt64, String, Array(UInt64)) as variant;
+```
+
+```text
+┌─type_name──────────────────────────────┬─variant───────�
+│ Variant(Array(UInt64), String, UInt64) │ Hello, World! │
+└────────────────────────────────────────┴───────────────┘
+```
+
+Using functions `if/multiIf` when arguments don't have common type (setting `use_variant_as_common_type` should be enabled for it):
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT if(number % 2, number, range(number)) as variant FROM numbers(5);
+```
+
+```text
+┌─variant───�
+│ []        │
+│ 1         │
+│ [0,1]     │
+│ 3         │
+│ [0,1,2,3] │
+└───────────┘
+```
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT multiIf((number % 4) = 0, 42, (number % 4) = 1, [1, 2, 3], (number % 4) = 2, 'Hello, World!', NULL) AS variant FROM numbers(4);
+```
+
+```text
+┌─variant───────�
+│ 42            │
+│ [1,2,3]       │
+│ Hello, World! │
+│ ᴺ�ᴸᴸ          │
+└───────────────┘
+```
+
+Using functions 'array/map' if array elements/map values don't have common type (setting `use_variant_as_common_type` should be enabled for it):
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT array(range(number), number, 'str_' || toString(number)) as array_of_variants FROM numbers(3);
+```
+
+```text
+┌─array_of_variants─�
+│ [[],0,'str_0']    │
+│ [[0],1,'str_1']   │
+│ [[0,1],2,'str_2'] │
+└───────────────────┘
+```
+
+```sql
+SET use_variant_as_common_type = 1;
+SELECT map('a', range(number), 'b', number, 'c', 'str_' || toString(number)) as map_of_variants FROM numbers(3);
+```
+
+```text
+┌─map_of_variants───────────────�
+│ {'a':[],'b':0,'c':'str_0'}    │
+│ {'a':[0],'b':1,'c':'str_1'}   │
+│ {'a':[0,1],'b':2,'c':'str_2'} │
+└───────────────────────────────┘
+```
+
+## Reading Variant nested types as subcolumns
+
+Variant type supports reading a single nested type from a Variant column using the type name as a subcolumn.
+So, if you have column `variant Variant(T1, T2, T3)` you can read a subcolumn of type `T2` using syntax `variant.T2`,
+this subcolumn will have type `Nullable(T2)` if `T2` can be inside `Nullable` and `T2` otherwise. This subcolumn will
+be the same size as original `Variant` column and will contain `NULL` values (or empty values if `T2` cannot be inside `Nullable`)
+in all rows in which original `Variant` column doesn't have type `T2`.
+
+Variant subcolumns can be also read using function `variantElement(variant_column, type_name)`. 
+
+Examples:
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT v, v.String, v.UInt64, v.`Array(UInt64)` FROM test;
+```
+
+```text
+┌─v─────────────┬─v.String──────┬─v.UInt64─┬─v.Array(UInt64)─�
+│ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ          │     ᴺ�ᴸᴸ │ []              │
+│ 42            │ ᴺ�ᴸᴸ          │       42 │ []              │
+│ Hello, World! │ Hello, World! │     ᴺ�ᴸᴸ │ []              │
+│ [1,2,3]       │ ᴺ�ᴸᴸ          │     ᴺ�ᴸᴸ │ [1,2,3]         │
+└───────────────┴───────────────┴──────────┴─────────────────┘
+```
+
+```sql
+SELECT toTypeName(v.String), toTypeName(v.UInt64), toTypeName(v.`Array(UInt64)`) FROM test LIMIT 1;
+```
+
+```text
+┌─toTypeName(v.String)─┬─toTypeName(v.UInt64)─┬─toTypeName(v.Array(UInt64))─�
+│ Nullable(String)     │ Nullable(UInt64)     │ Array(UInt64)               │
+└──────────────────────┴──────────────────────┴─────────────────────────────┘
+```
+
+```sql
+SELECT v, variantElement(v, 'String'), variantElement(v, 'UInt64'), variantElement(v, 'Array(UInt64)') FROM test;
+```
+
+```text
+┌─v─────────────┬─variantElement(v, 'String')─┬─variantElement(v, 'UInt64')─┬─variantElement(v, 'Array(UInt64)')─�
+│ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ []                                 │
+│ 42            │ ᴺ�ᴸᴸ                        │                          42 │ []                                 │
+│ Hello, World! │ Hello, World!               │                        ᴺ�ᴸᴸ │ []                                 │
+│ [1,2,3]       │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ [1,2,3]                            │
+└───────────────┴─────────────────────────────┴─────────────────────────────┴────────────────────────────────────┘
+```
+
+To know what variant is stored in each row function `variantType(variant_column)` can be used. It returns `Enum` with variant type name for each row (or `'None'` if row is `NULL`).
+
+Example:
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT variantType(v) from test;
+```
+
+```text
+┌─variantType(v)─�
+│ None           │
+│ UInt64         │
+│ String         │
+│ Array(UInt64)  │
+└────────────────┘
+```
+
+```sql
+SELECT toTypeName(variantType(v)) FROM test LIMIT 1;
+```
+
+```text
+┌─toTypeName(variantType(v))──────────────────────────────────────────�
+│ Enum8('None' = -1, 'Array(UInt64)' = 0, 'String' = 1, 'UInt64' = 2) │
+└─────────────────────────────────────────────────────────────────────┘
+```
+
+## Conversion between a Variant column and other columns
+
+There are 4 possible conversions that can be performed with a column of type `Variant`.
+
+### Converting a String column to a Variant column
+
+Conversion from `String` to `Variant` is performed by parsing a value of `Variant` type from the string value:
+
+```sql
+SELECT '42'::Variant(String, UInt64) as variant, variantType(variant) as variant_type
+```
+
+```text
+┌─variant─┬─variant_type─�
+│ 42      │ UInt64       │
+└─────────┴──────────────┘
+```
+
+```sql
+SELECT '[1, 2, 3]'::Variant(String, Array(UInt64)) as variant, variantType(variant) as variant_type
+```
+
+```text
+┌─variant─┬─variant_type──�
+│ [1,2,3] │ Array(UInt64) │
+└─────────┴───────────────┘
+```
+
+```sql
+SELECT CAST(map('key1', '42', 'key2', 'true', 'key3', '2020-01-01'), 'Map(String, Variant(UInt64, Bool, Date))') as map_of_variants, mapApply((k, v) -> (k, variantType(v)), map_of_variants) as map_of_variant_types```
+```
+
+```text
+┌─map_of_variants─────────────────────────────┬─map_of_variant_types──────────────────────────�
+│ {'key1':42,'key2':true,'key3':'2020-01-01'} │ {'key1':'UInt64','key2':'Bool','key3':'Date'} │
+└─────────────────────────────────────────────┴───────────────────────────────────────────────┘
+```
+
+### Converting an ordinary column to a Variant column
+
+It is possible to convert an ordinary column with type `T` to a `Variant` column containing this type:
+
+```sql
+SELECT toTypeName(variant) as type_name, [1,2,3]::Array(UInt64)::Variant(UInt64, String, Array(UInt64)) as variant, variantType(variant) as variant_name
+ ```
+
+```text
+┌─type_name──────────────────────────────┬─variant─┬─variant_name──�
+│ Variant(Array(UInt64), String, UInt64) │ [1,2,3] │ Array(UInt64) │
+└────────────────────────────────────────┴─────────┴───────────────┘
+```
+
+Note: converting from `String` type is always performed through parsing, if you need to convert `String` column to `String` variant of a `Variant` without parsing, you can do the following:
+```sql
+SELECT '[1, 2, 3]'::Variant(String)::Variant(String, Array(UInt64), UInt64) as variant, variantType(variant) as variant_type
+```
+
+```sql
+┌─variant───┬─variant_type─�
+│ [1, 2, 3] │ String       │
+└───────────┴──────────────┘
+```
+
+### Converting a Variant column to an ordinary column
+
+It is possible to convert a `Variant` column to an ordinary column. In this case all nested variants will be converted to a destination type:
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String)) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('42.42');
+SELECT v::Nullable(Float64) FROM test;
+```
+
+```text
+┌─CAST(v, 'Nullable(Float64)')─�
+│                         ᴺ�ᴸᴸ │
+│                           42 │
+│                        42.42 │
+└──────────────────────────────┘
+```
+
+### Converting a Variant to another Variant
+
+It is possible to convert a `Variant` column to another `Variant` column, but only if the destination `Variant` column contains all nested types from the original `Variant`:
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String)) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('String');
+SELECT v::Variant(UInt64, String, Array(UInt64)) FROM test;
+```
+
+```text
+┌─CAST(v, 'Variant(UInt64, String, Array(UInt64))')─�
+│ ᴺ�ᴸᴸ                                              │
+│ 42                                                │
+│ String                                            │
+└───────────────────────────────────────────────────┘
+```
+
+
+## Reading Variant type from the data
+
+All text formats (TSV, CSV, CustomSeparated, Values, JSONEachRow, etc) supports reading `Variant` type. During data parsing ClickHouse tries to insert value into most appropriate variant type.
+
+Example:
+
+```sql
+SELECT
+    v,
+    variantElement(v, 'String') AS str,
+    variantElement(v, 'UInt64') AS num,
+    variantElement(v, 'Float64') AS float,
+    variantElement(v, 'DateTime') AS date,
+    variantElement(v, 'Array(UInt64)') AS arr
+FROM format(JSONEachRow, 'v Variant(String, UInt64, Float64, DateTime, Array(UInt64))', $$
+{"v" : "Hello, World!"},
+{"v" : 42},
+{"v" : 42.42},
+{"v" : "2020-01-01 00:00:00"},
+{"v" : [1, 2, 3]}
+$$)
+```
+
+```text
+┌─v───────────────────┬─str───────────┬──num─┬─float─┬────────────────date─┬─arr─────�
+│ Hello, World!       │ Hello, World! │ ᴺ�ᴸᴸ │  ᴺ�ᴸᴸ │                ᴺ�ᴸᴸ │ []      │
+│ 42                  │ ᴺ�ᴸᴸ          │   42 │  ᴺ�ᴸᴸ │                ᴺ�ᴸᴸ │ []      │
+│ 42.42               │ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ │ 42.42 │                ᴺ�ᴸᴸ │ []      │
+│ 2020-01-01 00:00:00 │ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ │  ᴺ�ᴸᴸ │ 2020-01-01 00:00:00 │ []      │
+│ [1,2,3]             │ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ │  ᴺ�ᴸᴸ │                ᴺ�ᴸᴸ │ [1,2,3] │
+└─────────────────────┴───────────────┴──────┴───────┴─────────────────────┴─────────┘
+```
+
+
+## Comparing values of Variant type
+
+Values of a `Variant` type can be compared only with values with the same `Variant` type.
+
+The result of operator `<` for values `v1` with underlying type `T1` and `v2` with underlying type `T2`  of a type `Variant(..., T1, ... T2, ...)` is defined as follows:
+- If `T1 = T2 = T`, the result will be `v1.T < v2.T` (underlying values will be compared).
+- If `T1 != T2`, the result will be `T1 < T2` (type names will be compared).
+
+Examples:
+```sql
+CREATE TABLE test (v1 Variant(String, UInt64, Array(UInt32)), v2 Variant(String, UInt64, Array(UInt32))) ENGINE=Memory;
+INSERT INTO test VALUES (42, 42), (42, 43), (42, 'abc'), (42, [1, 2, 3]), (42, []), (42, NULL);
+```
+
+```sql
+SELECT v2, variantType(v2) as v2_type from test order by v2;
+```
+
+```text
+┌─v2──────┬─v2_type───────�
+│ []      │ Array(UInt32) │
+│ [1,2,3] │ Array(UInt32) │
+│ abc     │ String        │
+│ 42      │ UInt64        │
+│ 43      │ UInt64        │
+│ ᴺ�ᴸᴸ    │ None          │
+└─────────┴───────────────┘
+```
+
+```sql
+SELECT v1, variantType(v1) as v1_type, v2, variantType(v2) as v2_type, v1 = v2, v1 < v2, v1 > v2 from test;
+```
+
+```text
+┌─v1─┬─v1_type─┬─v2──────┬─v2_type───────┬─equals(v1, v2)─┬─less(v1, v2)─┬─greater(v1, v2)─�
+│ 42 │ UInt64  │ 42      │ UInt64        │              1 │            0 │               0 │
+│ 42 │ UInt64  │ 43      │ UInt64        │              0 │            1 │               0 │
+│ 42 │ UInt64  │ abc     │ String        │              0 │            0 │               1 │
+│ 42 │ UInt64  │ [1,2,3] │ Array(UInt32) │              0 │            0 │               1 │
+│ 42 │ UInt64  │ []      │ Array(UInt32) │              0 │            0 │               1 │
+│ 42 │ UInt64  │ ᴺ�ᴸᴸ    │ None          │              0 │            1 │               0 │
+└────┴─────────┴─────────┴───────────────┴────────────────┴──────────────┴─────────────────┘
+
+```
+
+If you need to find the row with specific `Variant` value, you can do one of the following:
+
+- Cast value to the corresponding `Variant` type:
+
+```sql
+SELECT * FROM test WHERE v2 == [1,2,3]::Array(UInt32)::Variant(String, UInt64, Array(UInt32));
+```
+
+```text
+┌─v1─┬─v2──────�
+│ 42 │ [1,2,3] │
+└────┴─────────┘
+```
+
+- Compare `Variant` subcolumn with required type:
+
+```sql
+SELECT * FROM test WHERE v2.`Array(UInt32)` == [1,2,3] -- or using variantElement(v2, 'Array(UInt32)')
+```
+
+```text
+┌─v1─┬─v2──────�
+│ 42 │ [1,2,3] │
+└────┴─────────┘
+```
+
+Sometimes it can be useful to make additional check on variant type as subcolumns with complex types like `Array/Map/Tuple` cannot be inside `Nullable` and will have default values instead of `NULL` on rows with different types:
+
+```sql
+SELECT v2, v2.`Array(UInt32)`, variantType(v2) FROM test WHERE v2.`Array(UInt32)` == [];
+```
+
+```text
+┌─v2───┬─v2.Array(UInt32)─┬─variantType(v2)─�
+│ 42   │ []               │ UInt64          │
+│ 43   │ []               │ UInt64          │
+│ abc  │ []               │ String          │
+│ []   │ []               │ Array(UInt32)   │
+│ ᴺ�ᴸᴸ │ []               │ None            │
+└──────┴──────────────────┴─────────────────┘
+```
+
+```sql
+SELECT v2, v2.`Array(UInt32)`, variantType(v2) FROM test WHERE variantType(v2) == 'Array(UInt32)' AND v2.`Array(UInt32)` == [];
+```
+
+```text
+┌─v2─┬─v2.Array(UInt32)─┬─variantType(v2)─�
+│ [] │ []               │ Array(UInt32)   │
+└────┴──────────────────┴─────────────────┘
+```
+
+**Note:** values of variants with different numeric types are considered as different variants and not compared between each other, their type names are compared instead.
+
+Example:
+
+```sql
+SET allow_suspicious_variant_types = 1;
+CREATE TABLE test (v Variant(UInt32, Int64)) ENGINE=Memory;
+INSERT INTO test VALUES (1::UInt32), (1::Int64), (100::UInt32), (100::Int64);
+SELECT v, variantType(v) FROM test ORDER by v;
+```
+
+```text
+┌─v───┬─variantType(v)─�
+│ 1   │ Int64          │
+│ 100 │ Int64          │
+│ 1   │ UInt32         │
+│ 100 │ UInt32         │
+└─────┴────────────────┘
+```
+
+## JSONExtract functions with Variant
+
+All `JSONExtract*` functions support `Variant` type:
+
+```sql
+SELECT JSONExtract('{"a" : [1, 2, 3]}', 'a', 'Variant(UInt32, String, Array(UInt32))') AS variant, variantType(variant) AS variant_type;
+```
+
+```text
+┌─variant─┬─variant_type──�
+│ [1,2,3] │ Array(UInt32) │
+└─────────┴───────────────┘
+```
+
+```sql
+SELECT JSONExtract('{"obj" : {"a" : 42, "b" : "Hello", "c" : [1,2,3]}}', 'obj', 'Map(String, Variant(UInt32, String, Array(UInt32)))') AS map_of_variants, mapApply((k, v) -> (k, variantType(v)), map_of_variants) AS map_of_variant_types
+```
+
+```text
+┌─map_of_variants──────────────────┬─map_of_variant_types────────────────────────────�
+│ {'a':42,'b':'Hello','c':[1,2,3]} │ {'a':'UInt32','b':'String','c':'Array(UInt32)'} │
+└──────────────────────────────────┴─────────────────────────────────────────────────┘
+```
+
+```sql
+SELECT JSONExtractKeysAndValues('{"a" : 42, "b" : "Hello", "c" : [1,2,3]}', 'Variant(UInt32, String, Array(UInt32))') AS variants, arrayMap(x -> (x.1, variantType(x.2)), variants) AS variant_types
+```
+
+```text
+┌─variants───────────────────────────────┬─variant_types─────────────────────────────────────────�
+│ [('a',42),('b','Hello'),('c',[1,2,3])] │ [('a','UInt32'),('b','String'),('c','Array(UInt32)')] │
+└────────────────────────────────────────┴───────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/dictionaries/index.md b/docs/en/sql-reference/dictionaries/index.md
index 9f86aaf2502..080de94f8b7 100644
--- a/docs/en/sql-reference/dictionaries/index.md
+++ b/docs/en/sql-reference/dictionaries/index.md
@@ -1805,6 +1805,7 @@ Example of settings:
 ``` xml
 <source>
   <postgresql>
+      <host>postgresql-hostname</hoat>
       <port>5432</port>
       <user>clickhouse</user>
       <password>qwerty</password>
diff --git a/docs/en/sql-reference/distributed-ddl.md b/docs/en/sql-reference/distributed-ddl.md
index d170f3765c2..7952792cbf4 100644
--- a/docs/en/sql-reference/distributed-ddl.md
+++ b/docs/en/sql-reference/distributed-ddl.md
@@ -6,7 +6,7 @@ sidebar_label: Distributed DDL
 
 # Distributed DDL Queries (ON CLUSTER Clause)
 
-By default the `CREATE`, `DROP`, `ALTER`, and `RENAME` queries affect only the current server where they are executed. In a cluster setup, it is possible to run such queries in a distributed manner with the `ON CLUSTER` clause.
+By default, the `CREATE`, `DROP`, `ALTER`, and `RENAME` queries affect only the current server where they are executed. In a cluster setup, it is possible to run such queries in a distributed manner with the `ON CLUSTER` clause.
 
 For example, the following query creates the `all_hits` `Distributed` table on each host in `cluster`:
 
diff --git a/docs/en/sql-reference/functions/array-functions.md b/docs/en/sql-reference/functions/array-functions.md
index 1639f45e66c..67a4c026851 100644
--- a/docs/en/sql-reference/functions/array-functions.md
+++ b/docs/en/sql-reference/functions/array-functions.md
@@ -19,7 +19,7 @@ empty([x])
 An array is considered empty if it does not contain any elements.
 
 :::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;`.
+Can be optimized by enabling the [`optimize_functions_to_subcolumns` setting](../../operations/settings/settings.md#optimize-functions-to-subcolumns). 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;`.
 :::
 
 The function also works for [strings](string-functions.md#empty) or [UUID](uuid-functions.md#empty).
@@ -104,17 +104,416 @@ Can be optimized by enabling the [optimize_functions_to_subcolumns](../../operat
 
 Alias: `OCTET_LENGTH`
 
-## emptyArrayUInt8, emptyArrayUInt16, emptyArrayUInt32, emptyArrayUInt64
+## emptyArrayUInt8
 
-## emptyArrayInt8, emptyArrayInt16, emptyArrayInt32, emptyArrayInt64
+Returns an empty UInt8 array.
 
-## emptyArrayFloat32, emptyArrayFloat64
+**Syntax**
 
-## emptyArrayDate, emptyArrayDateTime
+```sql
+emptyArrayUInt8()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayUInt8();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayUInt16
+
+Returns an empty UInt16 array.
+
+**Syntax**
+
+```sql
+emptyArrayUInt16()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayUInt16();
+
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayUInt32
+
+Returns an empty UInt32 array.
+
+**Syntax**
+
+```sql
+emptyArrayUInt32()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayUInt32();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayUInt64
+
+Returns an empty UInt64 array.
+
+**Syntax**
+
+```sql
+emptyArrayUInt64()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayUInt64();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayInt8
+
+Returns an empty Int8 array.
+
+**Syntax**
+
+```sql
+emptyArrayInt8()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayInt8();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayInt16
+
+Returns an empty Int16 array.
+
+**Syntax**
+
+```sql
+emptyArrayInt16()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayInt16();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayInt32
+
+Returns an empty Int32 array.
+
+**Syntax**
+
+```sql
+emptyArrayInt32()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayInt32();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayInt64
+
+Returns an empty Int64 array.
+
+**Syntax**
+
+```sql
+emptyArrayInt64()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayInt64();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayFloat32 
+
+Returns an empty Float32 array.
+
+**Syntax**
+
+```sql
+emptyArrayFloat32()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayFloat32();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayFloat64
+
+Returns an empty Float64 array.
+
+**Syntax**
+
+```sql
+emptyArrayFloat64()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayFloat64();
+```
+
+Result:
+
+```response
+[]
+```
+
+## emptyArrayDate
+
+Returns an empty Date array.
+
+**Syntax**
+
+```sql
+emptyArrayDate()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayDate();
+```
+
+## emptyArrayDateTime
+
+Returns an empty DateTime array.
+
+**Syntax**
+
+```sql
+[]
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayDateTime();
+```
+
+Result:
+
+```response
+[]
+```
 
 ## emptyArrayString
 
-Accepts zero arguments and returns an empty array of the appropriate type.
+Returns an empty String array.
+
+**Syntax**
+
+```sql
+emptyArrayString()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+An empty array.
+
+**Examples**
+
+Query:
+
+```sql
+SELECT emptyArrayString();
+```
+
+Result:
+
+```response
+[]
+```
 
 ## emptyArrayToSingle
 
@@ -657,6 +1056,43 @@ SELECT arraySlice([1, 2, NULL, 4, 5], 2, 3) AS res;
 
 Array elements set to `NULL` are handled as normal values.
 
+## arrayShingles
+
+Generates an array of "shingles", i.e. consecutive sub-arrays with specified length of the input array.
+
+**Syntax**
+
+``` sql
+arrayShingles(array, length)
+```
+
+**Arguments**
+
+- `array` — Input array [Array](../../sql-reference/data-types/array.md).
+- `length` — The length of each shingle.
+
+**Returned value**
+
+- An array of generated shingles.
+
+Type: [Array](../../sql-reference/data-types/array.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT arrayShingles([1,2,3,4], 3) as res;
+```
+
+Result:
+
+``` text
+┌─res───────────────�
+│ [[1,2,3],[2,3,4]] │
+└───────────────────┘
+```
+
 ## arraySort(\[func,\] arr, …) {#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.
diff --git a/docs/en/sql-reference/functions/bit-functions.md b/docs/en/sql-reference/functions/bit-functions.md
index 3c07fe8bcbe..0951c783aae 100644
--- a/docs/en/sql-reference/functions/bit-functions.md
+++ b/docs/en/sql-reference/functions/bit-functions.md
@@ -167,6 +167,10 @@ Result:
 └──────────────────────────────────────────┴───────────────────────────────┘
 ```
 
+## byteSlice(s, offset, length)
+
+See function [substring](string-functions.md#substring).
+
 ## bitTest
 
 Takes any integer and converts it into [binary form](https://en.wikipedia.org/wiki/Binary_number), returns the value of a bit at specified position. The countdown starts from 0 from the right to the left.
diff --git a/docs/en/sql-reference/functions/bitmap-functions.md b/docs/en/sql-reference/functions/bitmap-functions.md
index 9b66d00656b..379be302881 100644
--- a/docs/en/sql-reference/functions/bitmap-functions.md
+++ b/docs/en/sql-reference/functions/bitmap-functions.md
@@ -372,7 +372,7 @@ Result:
 
 ## bitmapAnd
 
-Computes the logical conjunction of two two bitmaps.
+Computes the logical conjunction of two bitmaps.
 
 **Syntax**
 
diff --git a/docs/en/sql-reference/functions/date-time-functions.md b/docs/en/sql-reference/functions/date-time-functions.md
index 168c07606c1..2968b531688 100644
--- a/docs/en/sql-reference/functions/date-time-functions.md
+++ b/docs/en/sql-reference/functions/date-time-functions.md
@@ -394,8 +394,7 @@ Result:
 
 ## toYear
 
-Converts a date or date with time to the year number (AD) as `UInt16` value.
-
+Returns the year component (AD) of a date or date with time.
 
 **Syntax**
 
@@ -431,7 +430,7 @@ Result:
 
 ## toQuarter
 
-Converts a date or date with time to the quarter number (1-4) as `UInt8` value.
+Returns the quarter (1-4) of a date or date with time.
 
 **Syntax**
 
@@ -465,10 +464,9 @@ Result:
 └──────────────────────────────────────────────┘
 ```
 
-
 ## toMonth
 
-Converts a date or date with time to the month number (1-12) as `UInt8` value.
+Returns the month component (1-12) of a date or date with time.
 
 **Syntax**
 
@@ -504,7 +502,7 @@ Result:
 
 ## toDayOfYear
 
-Converts a date or date with time to the number of the day of the year (1-366) as `UInt16` value.
+Returns the number of the day within the year (1-366) of a date or date with time.
 
 **Syntax**
 
@@ -540,7 +538,7 @@ Result:
 
 ## toDayOfMonth
 
-Converts a date or date with time to the number of the day in the month (1-31) as `UInt8` value.
+Returns the number of the day within the month (1-31) of a date or date with time.
 
 **Syntax**
 
@@ -576,7 +574,7 @@ Result:
 
 ## toDayOfWeek
 
-Converts a date or date with time to the number of the day in the week as `UInt8` value.
+Returns the number of the day within the week of a date or date with time.
 
 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.
 
@@ -627,7 +625,7 @@ Result:
 
 ## toHour
 
-Converts a date with time to the number of the hour in 24-hour time (0-23) as `UInt8` value.
+Returns the hour component (0-24) of a date with time.
 
 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 exactly when it occurs - it depends on the timezone).
 
@@ -641,7 +639,7 @@ Alias: `HOUR`
 
 **Arguments**
 
-- `value` - a [Date](../data-types/date.md), [Date32](../data-types/date32.md), [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
+- `value` - a [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
 
 **Returned value**
 
@@ -665,7 +663,7 @@ Result:
 
 ## toMinute
 
-Converts a date with time to the number of the minute of the hour (0-59) as `UInt8` value.
+Returns the minute component (0-59) a date with time.
 
 **Syntax**
 
@@ -677,7 +675,7 @@ Alias: `MINUTE`
 
 **Arguments**
 
-- `value` - a [Date](../data-types/date.md), [Date32](../data-types/date32.md), [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
+- `value` - a [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
 
 **Returned value**
 
@@ -701,7 +699,7 @@ Result:
 
 ## toSecond
 
-Converts a date with time to the second in the minute (0-59) as `UInt8` value. Leap seconds are not considered.
+Returns the second component (0-59) of a date with time. Leap seconds are not considered.
 
 **Syntax**
 
@@ -713,7 +711,7 @@ Alias: `SECOND`
 
 **Arguments**
 
-- `value` - a [Date](../data-types/date.md), [Date32](../data-types/date32.md), [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
+- `value` - a [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
 
 **Returned value**
 
@@ -735,6 +733,40 @@ Result:
 └─────────────────────────────────────────────┘
 ```
 
+## toMillisecond
+
+Returns the millisecond component (0-999) of a date with time.
+
+**Syntax**
+
+```sql
+toMillisecond(value)
+```
+
+*Arguments**
+
+- `value` - [DateTime](../data-types/datetime.md) or [DateTime64](../data-types/datetime64.md)
+
+Alias: `MILLISECOND`
+
+```sql
+SELECT toMillisecond(toDateTime64('2023-04-21 10:20:30.456', 3))
+```
+
+Result:
+
+```response
+┌──toMillisecond(toDateTime64('2023-04-21 10:20:30.456', 3))─�
+│                                                        456 │
+└────────────────────────────────────────────────────────────┘
+```
+
+**Returned value**
+
+- The millisecond in the minute (0 - 59) of the given date/time
+
+Type: `UInt16`
+
 ## toUnixTimestamp
 
 Converts a string, a date or a date with time to the [Unix Timestamp](https://en.wikipedia.org/wiki/Unix_time) in `UInt32` representation.
@@ -1539,7 +1571,7 @@ Alias: `TO_DAYS`
 **Arguments**
 
 - `date` — The date to calculate the number of days passed since year zero from. [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).
-- `time_zone` — A String type const value or a expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
+- `time_zone` — A String type const value or an expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
 
 **Returned value**
 
@@ -1613,7 +1645,7 @@ Like [fromDaysSinceYearZero](#fromDaysSinceYearZero) but returns a [Date32](../.
 
 ## age
 
-Returns the `unit` component of the difference between `startdate` and `enddate`. The difference is calculated using a precision of 1 microsecond.
+Returns the `unit` component of the difference between `startdate` and `enddate`. The difference is calculated using a precision of 1 nanosecond.
 E.g. the difference between `2021-12-29` and `2022-01-01` is 3 days for `day` unit, 0 months for `month` unit, 0 years for `year` unit.
 
 For an alternative to `age`, see function `date\_diff`.
@@ -1629,16 +1661,17 @@ age('unit', startdate, enddate, [timezone])
 - `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
-    - `microsecond` `microseconds` `us` `u`
-    - `millisecond` `milliseconds` `ms`
-    - `second` `seconds` `ss` `s`
-    - `minute` `minutes` `mi` `n`
-    - `hour` `hours` `hh` `h`
-    - `day` `days` `dd` `d`
-    - `week` `weeks` `wk` `ww`
-    - `month` `months` `mm` `m`
-    - `quarter` `quarters` `qq` `q`
-    - `year` `years` `yyyy` `yy`
+    - `nanosecond`, `nanoseconds`, `ns`
+    - `microsecond`, `microseconds`, `us`, `u`
+    - `millisecond`, `milliseconds`, `ms`
+    - `second`, `seconds`, `ss`, `s`
+    - `minute`, `minutes`, `mi`, `n`
+    - `hour`, `hours`, `hh`, `h`
+    - `day`, `days`, `dd`, `d`
+    - `week`, `weeks`, `wk`, `ww`
+    - `month`, `months`, `mm`, `m`
+    - `quarter`, `quarters`, `qq`, `q`
+    - `year`, `years`, `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).
 
@@ -1706,16 +1739,17 @@ Aliases: `dateDiff`, `DATE_DIFF`, `timestampDiff`, `timestamp_diff`, `TIMESTAMP_
 - `unit` — The type of interval for result. [String](../../sql-reference/data-types/string.md).
     Possible values:
 
-    - `microsecond` `microseconds` `us` `u`
-    - `millisecond` `milliseconds` `ms`
-    - `second` `seconds` `ss` `s`
-    - `minute` `minutes` `mi` `n`
-    - `hour` `hours` `hh` `h`
-    - `day` `days` `dd` `d`
-    - `week` `weeks` `wk` `ww`
-    - `month` `months` `mm` `m`
-    - `quarter` `quarters` `qq` `q`
-    - `year` `years` `yyyy` `yy`
+    - `nanosecond`, `nanoseconds`, `ns`
+    - `microsecond`, `microseconds`, `us`, `u`
+    - `millisecond`, `milliseconds`, `ms`
+    - `second`, `seconds`, `ss`, `s`
+    - `minute`, `minutes`, `mi`, `n`
+    - `hour`, `hours`, `hh`, `h`
+    - `day`, `days`, `dd`, `d`
+    - `week`, `weeks`, `wk`, `ww`
+    - `month`, `months`, `mm`, `m`
+    - `quarter`, `quarters`, `qq`, `q`
+    - `year`, `years`, `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).
 
@@ -2193,7 +2227,7 @@ 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).
+- `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**
@@ -2262,10 +2296,43 @@ Result:
 
 ## today {#today}
 
-Accepts zero arguments and returns the current date at one of the moments of query analysis.
-The same as ‘toDate(now())’.
+Returns the current date at moment of query analysis. It is the same as ‘toDate(now())’ and has aliases: `curdate`, `current_date`.
 
-Aliases: `curdate`, `current_date`.
+**Syntax**
+
+```sql
+today()
+```
+
+**Arguments**
+
+- None
+
+**Returned value**
+
+- Current date
+
+Type: [DateTime](../../sql-reference/data-types/datetime.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT today() AS today, curdate() AS curdate, current_date() AS current_date FORMAT Pretty
+```
+
+**Result**:
+
+Running the query above on the 3rd of March 2024 would have returned the following response:
+
+```response
+�������������┳������������┳��������������┓
+┃      today ┃    curdate ┃ current_date ┃
+┡������������╇������������╇��������������┩
+│ 2024-03-03 │ 2024-03-03 │   2024-03-03 │
+└────────────┴────────────┴──────────────┘
+```
 
 ## yesterday {#yesterday}
 
@@ -2280,7 +2347,7 @@ Rounds the time to the half hour.
 
 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.
 
-This functions is the opposite of function `YYYYMMDDToDate()`.
+This function is the opposite of function `YYYYMMDDToDate()`.
 
 **Example**
 
@@ -2337,7 +2404,7 @@ Result:
 
 Converts a number containing the year, month and day number to a [Date](../../sql-reference/data-types/date.md).
 
-This functions is the opposite of function `toYYYYMMDD()`.
+This function is the opposite of function `toYYYYMMDD()`.
 
 The output is undefined if the input does not encode a valid Date value.
 
@@ -2381,7 +2448,7 @@ Converts a number containing the year, month, day, hours, minute and second numb
 
 The output is undefined if the input does not encode a valid DateTime value.
 
-This functions is the opposite of function `toYYYYMMDDhhmmss()`.
+This function is the opposite of function `toYYYYMMDDhhmmss()`.
 
 **Syntax**
 
@@ -2966,8 +3033,8 @@ toUTCTimestamp(time_val, time_zone)
 
 **Arguments**
 
-- `time_val` — A DateTime/DateTime64 type const value or a expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
-- `time_zone` — A String type const value or a expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
+- `time_val` — A DateTime/DateTime64 type const value or an expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
+- `time_zone` — A String type const value or an expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
 
 **Returned value**
 
@@ -2999,8 +3066,8 @@ fromUTCTimestamp(time_val, time_zone)
 
 **Arguments**
 
-- `time_val` — A DateTime/DateTime64 type const value or a expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
-- `time_zone` — A String type const value or a expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
+- `time_val` — A DateTime/DateTime64 type const value or an expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
+- `time_zone` — A String type const value or an expression represent the time zone. [String types](../../sql-reference/data-types/string.md)
 
 **Returned value**
 
@@ -3019,6 +3086,40 @@ Result:
 │                                                 2023-03-16 18:00:00.000 │
 └─────────────────────────────────────────────────────────────────────────┘
 ```
+## timeDiff
+
+Returns the difference between two dates or dates with time values. The difference is calculated in units of seconds. It is same as `dateDiff` and was added only for MySQL support. `dateDiff` is preferred.
+
+**Syntax**
+
+```sql
+timeDiff(first_datetime, second_datetime)
+```
+
+*Arguments**
+
+- `first_datetime` — A DateTime/DateTime64 type const value or an expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
+- `second_datetime` — A DateTime/DateTime64 type const value or an expression . [DateTime/DateTime64 types](../../sql-reference/data-types/datetime.md)
+
+**Returned value**
+
+The difference between two dates or dates with time values in seconds.
+
+**Example**
+
+Query:
+
+```sql
+timeDiff(toDateTime64('1927-01-01 00:00:00', 3), toDate32('1927-01-02'));
+```
+
+**Result**:
+
+```response
+┌─timeDiff(toDateTime64('1927-01-01 00:00:00', 3), toDate32('1927-01-02'))─�
+│                                                                    86400 │
+└──────────────────────────────────────────────────────────────────────────┘
+```
 
 ## Related content
 
diff --git a/docs/en/sql-reference/functions/distance-functions.md b/docs/en/sql-reference/functions/distance-functions.md
index 1774c22014d..5f3514049c7 100644
--- a/docs/en/sql-reference/functions/distance-functions.md
+++ b/docs/en/sql-reference/functions/distance-functions.md
@@ -81,6 +81,43 @@ Result:
 │ 2.23606797749979 │
 └──────────────────┘
 ```
+## L2SquaredNorm
+
+Calculates the square root of the sum of the squares of the vector values (the [L2Norm](#l2norm)) squared.
+
+**Syntax**
+
+```sql
+L2SquaredNorm(vector)
+```
+
+Alias: `normL2Squared`.
+
+***Arguments**
+
+- `vector` — [Tuple](../../sql-reference/data-types/tuple.md) or [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- L2-norm squared.
+
+Type: [Float](../../sql-reference/data-types/float.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT L2SquaredNorm((1, 2));
+```
+
+Result:
+
+```text
+┌─L2SquaredNorm((1, 2))─�
+│                     5 │
+└───────────────────────┘
+```
 
 ## LinfNorm
 
@@ -509,7 +546,7 @@ Result:
 
 ## cosineDistance
 
-Calculates the cosine distance between two vectors (the values of the tuples are the coordinates). The less the returned value is, the more similar are the vectors.
+Calculates the cosine distance between two vectors (the values of the tuples are the coordinates). The smaller the returned value is, the more similar are the vectors.
 
 **Syntax**
 
diff --git a/docs/en/sql-reference/functions/encoding-functions.md b/docs/en/sql-reference/functions/encoding-functions.md
index 618dd3f4b4f..4f6da764b3c 100644
--- a/docs/en/sql-reference/functions/encoding-functions.md
+++ b/docs/en/sql-reference/functions/encoding-functions.md
@@ -433,3 +433,292 @@ Result:
 │ [0,1,2,3,4,5,6,7] │
 └───────────────────┘
 ```
+
+## mortonEncode
+
+Calculates the Morton encoding (ZCurve) for a list of unsigned integers.
+
+The function has two modes of operation:
+- Simple
+- Expanded
+
+### Simple mode
+
+Accepts up to 8 unsigned integers as arguments and produces a UInt64 code.
+
+**Syntax**
+
+```sql
+mortonEncode(args)
+```
+
+**Parameters**
+
+- `args`: up to 8 [unsigned integers](../../sql-reference/data-types/int-uint.md) or columns of the aforementioned type.
+
+**Returned value**
+
+- A UInt64 code
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md)
+
+**Example**
+
+Query:
+
+```sql
+SELECT mortonEncode(1, 2, 3);
+```
+Result:
+
+```response
+53
+```
+
+### Expanded mode
+
+Accepts a range mask ([tuple](../../sql-reference/data-types/tuple.md)) as a first argument and up to 8 [unsigned integers](../../sql-reference/data-types/int-uint.md) as other arguments.
+
+Each number in the mask configures the amount of range expansion:<br/>
+1 - no expansion<br/>
+2 - 2x expansion<br/>
+3 - 3x expansion<br/>
+...<br/>
+Up to 8x expansion.<br/>
+
+**Syntax**
+
+```sql
+mortonEncode(range_mask, args)
+```
+
+**Parameters**
+- `range_mask`: 1-8.
+- `args`: up to 8 [unsigned integers](../../sql-reference/data-types/int-uint.md) or columns of the aforementioned type.
+
+Note: when using columns for `args` the provided `range_mask` tuple should still be a constant. 
+
+**Returned value**
+
+- A UInt64 code
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md)
+
+
+**Example**
+
+Range expansion can be beneficial when you need a similar distribution for arguments with wildly different ranges (or cardinality)
+For example: 'IP Address' (0...FFFFFFFF) and 'Country code' (0...FF).
+
+Query:
+
+```sql
+SELECT mortonEncode((1,2), 1024, 16);
+```
+
+Result:
+
+```response
+1572864
+```
+
+Note: tuple size must be equal to the number of the other arguments.
+
+**Example**
+
+Morton encoding for one argument is always the argument itself:
+
+Query:
+
+```sql
+SELECT mortonEncode(1);
+```
+
+Result:
+
+```response
+1
+```
+
+**Example**
+
+It is also possible to expand one argument too:
+
+Query:
+
+```sql
+SELECT mortonEncode(tuple(2), 128);
+```
+
+Result:
+
+```response
+32768
+```
+
+**Example**
+
+You can also use column names in the function.
+
+Query:
+
+First create the table and insert some data.
+
+```sql
+create table morton_numbers(
+    n1 UInt32,
+    n2 UInt32,
+    n3 UInt16,
+    n4 UInt16,
+    n5 UInt8,
+    n6 UInt8,
+    n7 UInt8,
+    n8 UInt8
+)
+Engine=MergeTree()
+ORDER BY n1 SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+insert into morton_numbers (*) values(1,2,3,4,5,6,7,8);
+```
+Use column names instead of constants as function arguments to `mortonEncode`
+
+Query:
+
+```sql
+SELECT mortonEncode(n1, n2, n3, n4, n5, n6, n7, n8) FROM morton_numbers;
+```
+
+Result:
+
+```response
+2155374165
+```
+
+**implementation details**
+
+Please note that you can fit only so many bits of information into Morton code as [UInt64](../../sql-reference/data-types/int-uint.md) has. Two arguments will have a range of maximum 2^32 (64/2) each, three arguments a range of max 2^21 (64/3) each and so on. All overflow will be clamped to zero.
+
+## mortonDecode
+
+Decodes a Morton encoding (ZCurve) into the corresponding unsigned integer tuple.
+
+As with the `mortonEncode` function, this function has two modes of operation:
+- Simple
+- Expanded
+
+### Simple mode
+
+Accepts a resulting tuple size as the first argument and the code as the second argument.
+
+**Syntax**
+
+```sql
+mortonDecode(tuple_size, code)
+```
+
+**Parameters**
+- `tuple_size`: integer value no more than 8.
+- `code`: [UInt64](../../sql-reference/data-types/int-uint.md) code.
+
+**Returned value**
+
+- [tuple](../../sql-reference/data-types/tuple.md) of the specified size.
+
+Type: [UInt64](../../sql-reference/data-types/int-uint.md)
+
+**Example**
+
+Query:
+
+```sql
+SELECT mortonDecode(3, 53);
+```
+
+Result:
+
+```response
+["1","2","3"]
+```
+
+### Expanded mode
+
+Accepts a range mask (tuple) as a first argument and the code as the second argument.
+Each number in the mask configures the amount of range shrink:<br/>
+1 - no shrink<br/>
+2 - 2x shrink<br/> 
+3 - 3x shrink<br/>
+...<br/>
+Up to 8x shrink.<br/>
+
+Range expansion can be beneficial when you need a similar distribution for arguments with wildly different ranges (or cardinality)
+For example: 'IP Address' (0...FFFFFFFF) and 'Country code' (0...FF).
+As with the encode function, this is limited to 8 numbers at most.
+
+**Example**
+
+Query:
+
+```sql
+SELECT mortonDecode(1, 1);
+```
+
+Result:
+
+```response
+["1"]
+```
+
+**Example**
+
+It is also possible to shrink one argument:
+
+Query:
+
+```sql
+SELECT mortonDecode(tuple(2), 32768);
+```
+
+Result:
+
+```response
+["128"]
+```
+
+**Example**
+
+You can also use column names in the function.
+
+First create the table and insert some data.
+
+Query:
+```sql
+create table morton_numbers(
+    n1 UInt32,
+    n2 UInt32,
+    n3 UInt16,
+    n4 UInt16,
+    n5 UInt8,
+    n6 UInt8,
+    n7 UInt8,
+    n8 UInt8
+)
+Engine=MergeTree()
+ORDER BY n1 SETTINGS index_granularity = 8192, index_granularity_bytes = '10Mi';
+insert into morton_numbers (*) values(1,2,3,4,5,6,7,8);
+```
+Use column names instead of constants as function arguments to `mortonDecode`
+
+Query:
+
+```sql
+select untuple(mortonDecode(8, mortonEncode(n1, n2, n3, n4, n5, n6, n7, n8))) from morton_numbers;
+```
+
+Result:
+
+```response
+1	2	3	4	5	6	7	8
+```
+
+
+
+
diff --git a/docs/en/sql-reference/functions/functions-for-nulls.md b/docs/en/sql-reference/functions/functions-for-nulls.md
index 91c04cfded3..4dfbf4262ed 100644
--- a/docs/en/sql-reference/functions/functions-for-nulls.md
+++ b/docs/en/sql-reference/functions/functions-for-nulls.md
@@ -10,6 +10,8 @@ sidebar_label: Nullable
 
 Returns whether the argument is [NULL](../../sql-reference/syntax.md#null).
 
+See also operator [`IS NULL`](../operators/index.md#is_null).
+
 ``` sql
 isNull(x)
 ```
@@ -54,6 +56,8 @@ Result:
 
 Returns whether the argument is not [NULL](../../sql-reference/syntax.md#null-literal).
 
+See also operator [`IS NOT NULL`](../operators/index.md#is_not_null).
+
 ``` sql
 isNotNull(x)
 ```
diff --git a/docs/en/sql-reference/functions/geo/polygon.md b/docs/en/sql-reference/functions/geo/polygon.md
index 4a8653965c2..c2572779ada 100644
--- a/docs/en/sql-reference/functions/geo/polygon.md
+++ b/docs/en/sql-reference/functions/geo/polygon.md
@@ -4,6 +4,67 @@ sidebar_label: Polygons
 title: "Functions for Working with Polygons"
 ---
 
+## WKT
+
+Returns a WKT (Well Known Text) geometric object from various [Geo Data Types](../../data-types/geo.md). Supported WKT objects are: 
+
+- POINT
+- POLYGON
+- MULTIPOLYGON
+
+**Syntax**
+
+```sql
+WKT(geo_data)
+```
+
+**Parameters**
+
+`geo_data` can be one of the following [Geo Data Types](../../data-types/geo.md) or their underlying primitive types:
+
+- [Point](../../data-types/geo.md#point)
+- [Ring](../../data-types/geo.md#ring)
+- [Polygon](../../data-types/geo.md#polygon)
+- [MultiPolygon](../../data-types/geo.md#multipolygon)
+
+**Returned value**
+
+- WKT geometric object `POINT` is returned for a Point.
+- WKT geometric object `POLYGON` is returned for a Polygon
+- WKT geometric object `MULTIPOLYGON` is returned for a MultiPolygon. 
+
+**Examples**
+
+POINT from tuple:
+
+```sql
+SELECT wkt((0., 0.));
+```
+
+```response
+POINT(0 0)
+```
+
+POLYGON from an array of tuples or an array of tuple arrays:
+
+```sql
+SELECT wkt([(0., 0.), (10., 0.), (10., 10.), (0., 10.)]);
+```
+
+```response
+POLYGON((0 0,10 0,10 10,0 10))
+```
+
+MULTIPOLYGON from an array of multi-dimensional tuple arrays:
+
+```sql
+SELECT wkt([[[(0., 0.), (10., 0.), (10., 10.), (0., 10.)], [(4., 4.), (5., 4.), (5., 5.), (4., 5.)]], [[(-10., -10.), (-10., -9.), (-9., 10.)]]]);
+```
+
+```response
+MULTIPOLYGON(((0 0,10 0,10 10,0 10,0 0),(4 4,5 4,5 5,4 5,4 4)),((-10 -10,-10 -9,-9 10,-10 -10)))
+```
+
 ## readWKTMultiPolygon
 
 Converts a WKT (Well Known Text) MultiPolygon into a MultiPolygon type.
@@ -53,6 +114,62 @@ String starting with `POLYGON`
 
 Polygon
 
+## readWKTPoint
+
+The `readWKTPoint` function in ClickHouse parses a Well-Known Text (WKT) representation of a Point geometry and returns a point in the internal ClickHouse format.
+
+### Syntax
+
+```sql
+readWKTPoint(wkt_string)
+```
+
+### Arguments
+
+- `wkt_string`: The input WKT string representing a Point geometry.
+
+### Returned value
+
+The function returns a ClickHouse internal representation of the Point geometry.
+
+### Example
+
+```sql
+SELECT readWKTPoint('POINT (1.2 3.4)');
+```
+
+```response
+(1.2,3.4)
+```
+
+## readWKTRing
+
+Parses a Well-Known Text (WKT) representation of a Polygon geometry and returns a ring (closed linestring) in the internal ClickHouse format.
+
+### Syntax
+
+```sql
+readWKTRing(wkt_string)
+```
+
+### Arguments
+
+- `wkt_string`: The input WKT string representing a Polygon geometry.
+
+### Returned value
+
+The function returns a ClickHouse internal representation of the ring (closed linestring) geometry.
+
+### Example
+
+```sql
+SELECT readWKTRing('LINESTRING (1 1, 2 2, 3 3, 1 1)');
+```
+
+```response
+[(1,1),(2,2),(3,3),(1,1)]
+```
+
 ## 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
diff --git a/docs/en/sql-reference/functions/hash-functions.md b/docs/en/sql-reference/functions/hash-functions.md
index 90c7d8c2206..1cd7eeb7c83 100644
--- a/docs/en/sql-reference/functions/hash-functions.md
+++ b/docs/en/sql-reference/functions/hash-functions.md
@@ -594,6 +594,45 @@ Calculates JumpConsistentHash form a UInt64.
 Accepts two arguments: a UInt64-type key and the number of buckets. Returns Int32.
 For more information, see the link: [JumpConsistentHash](https://arxiv.org/pdf/1406.2294.pdf)
 
+## kostikConsistentHash
+
+An O(1) time and space consistent hash algorithm by Konstantin 'kostik' Oblakov. Previously `yandexConsistentHash`. 
+
+**Syntax**
+
+```sql
+kostikConsistentHash(input, n)
+```
+
+Alias: `yandexConsistentHash` (left for backwards compatibility sake).
+
+**Parameters**
+
+- `input`: A UInt64-type key [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
+- `n`: Number of buckets. [UInt16](/docs/en/sql-reference/data-types/int-uint.md).
+
+**Returned value**
+
+- A [UInt16](/docs/en/sql-reference/data-types/int-uint.md) data type hash value.
+
+**Implementation details**
+
+It is efficient only if n <= 32768. 
+
+**Example**
+
+Query:
+
+```sql
+SELECT kostikConsistentHash(16045690984833335023, 2);
+```
+
+```response
+┌─kostikConsistentHash(16045690984833335023, 2)─�
+│                                             1 │
+└───────────────────────────────────────────────┘
+```
+
 ## murmurHash2_32, murmurHash2_64
 
 Produces a [MurmurHash2](https://github.com/aappleby/smhasher) hash value.
@@ -1153,6 +1192,42 @@ Result:
 └────────────┘
 ```
 
+## wyHash64
+
+Produces a 64-bit [wyHash64](https://github.com/wangyi-fudan/wyhash) hash value.
+
+**Syntax**
+
+```sql
+wyHash64(string)
+```
+
+**Arguments**
+
+- `string` — String. [String](/docs/en/sql-reference/data-types/string.md).
+
+**Returned value**
+
+- Hash value.
+
+Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
+
+**Example**
+
+Query:
+
+```sql
+SELECT wyHash64('ClickHouse') AS Hash;
+```
+
+Result:
+
+```response
+┌─────────────────Hash─�
+│ 12336419557878201794 │
+└──────────────────────┘
+```
+
 ## ngramMinHash
 
 Splits a ASCII string into n-grams of `ngramsize` symbols and calculates hash values for each n-gram. Uses `hashnum` minimum hashes to calculate the minimum hash and `hashnum` maximum hashes to calculate the maximum hash. Returns a tuple with these hashes. Is case sensitive.
diff --git a/docs/en/sql-reference/functions/json-functions.md b/docs/en/sql-reference/functions/json-functions.md
index 2c837ff4a42..e920ab82988 100644
--- a/docs/en/sql-reference/functions/json-functions.md
+++ b/docs/en/sql-reference/functions/json-functions.md
@@ -5,80 +5,372 @@ sidebar_label: JSON
 ---
 
 There are two sets of functions to parse JSON.
-   - `visitParam*` (`simpleJSON*`) is made to parse a special very limited subset of a JSON, but these functions are extremely fast.
+   - `simpleJSON*` (`visitParam*`) is made to parse a special very limited subset of a JSON, but these functions are extremely fast.
    - `JSONExtract*` is made to parse normal JSON.
 
-# visitParam functions
+# simpleJSON/visitParam functions
 
 ClickHouse has special functions for working with simplified JSON. All these JSON functions are based on strong assumptions about what the JSON can be, but they try to do as little as possible to get the job done.
 
 The following assumptions are made:
 
 1.  The field name (function argument) must be a constant.
-2.  The field name is somehow canonically encoded in JSON. For example: `visitParamHas('{"abc":"def"}', 'abc') = 1`, but `visitParamHas('{"\\u0061\\u0062\\u0063":"def"}', 'abc') = 0`
+2.  The field name is somehow canonically encoded in JSON. For example: `simpleJSONHas('{"abc":"def"}', 'abc') = 1`, but `simpleJSONHas('{"\\u0061\\u0062\\u0063":"def"}', 'abc') = 0`
 3.  Fields are searched for on any nesting level, indiscriminately. If there are multiple matching fields, the first occurrence is used.
 4.  The JSON does not have space characters outside of string literals.
 
-## visitParamHas(params, name)
+## simpleJSONHas
 
-Checks whether there is a field with the `name` name.
+Checks whether there is a field named `field_name`.  The result is `UInt8`.
 
-Alias: `simpleJSONHas`.
+**Syntax**
 
-## visitParamExtractUInt(params, name)
-
-Parses UInt64 from the value of the field named `name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns 0.
-
-Alias: `simpleJSONExtractUInt`.
-
-## visitParamExtractInt(params, name)
-
-The same as for Int64.
-
-Alias: `simpleJSONExtractInt`.
-
-## visitParamExtractFloat(params, name)
-
-The same as for Float64.
-
-Alias: `simpleJSONExtractFloat`.
-
-## visitParamExtractBool(params, name)
-
-Parses a true/false value. The result is UInt8.
-
-Alias: `simpleJSONExtractBool`.
-
-## visitParamExtractRaw(params, name)
-
-Returns the value of a field, including separators.
-
-Alias: `simpleJSONExtractRaw`.
-
-Examples:
-
-``` sql
-visitParamExtractRaw('{"abc":"\\n\\u0000"}', 'abc') = '"\\n\\u0000"';
-visitParamExtractRaw('{"abc":{"def":[1,2,3]}}', 'abc') = '{"def":[1,2,3]}';
+```sql
+simpleJSONHas(json, field_name)
 ```
 
-## visitParamExtractString(params, name)
+**Parameters**
 
-Parses the string in double quotes. The value is unescaped. If unescaping failed, it returns an empty string.
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
 
-Alias: `simpleJSONExtractString`.
+**Returned value**
 
-Examples:
+It returns `1` if the field exists, `0` otherwise.
 
-``` sql
-visitParamExtractString('{"abc":"\\n\\u0000"}', 'abc') = '\n\0';
-visitParamExtractString('{"abc":"\\u263a"}', 'abc') = '☺';
-visitParamExtractString('{"abc":"\\u263"}', 'abc') = '';
-visitParamExtractString('{"abc":"hello}', 'abc') = '';
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"true","qux":1}');
+
+SELECT simpleJSONHas(json, 'foo') FROM jsons;
+SELECT simpleJSONHas(json, 'bar') FROM jsons;
 ```
 
+```response
+1
+0
+```
+## simpleJSONExtractUInt
+
+Parses `UInt64` from the value of the field named `field_name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns `0`.
+
+**Syntax**
+
+```sql
+simpleJSONExtractUInt(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns the number parsed from the field if the field exists and contains a number, `0` otherwise.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"4e3"}');
+INSERT INTO jsons VALUES ('{"foo":3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractUInt(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+0
+4
+0
+3
+5
+```
+
+## simpleJSONExtractInt
+
+Parses `Int64` from the value of the field named `field_name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns `0`.
+
+**Syntax**
+
+```sql
+simpleJSONExtractInt(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns the number parsed from the field if the field exists and contains a number, `0` otherwise.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractInt(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+0
+-4
+0
+-3
+5
+```
+
+## simpleJSONExtractFloat
+
+Parses `Float64` from the value of the field named `field_name`. If this is a string field, it tries to parse a number from the beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns `0`.
+
+**Syntax**
+
+```sql
+simpleJSONExtractFloat(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns the number parsed from the field if the field exists and contains a number, `0` otherwise.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractFloat(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+0
+-4000
+0
+-3.4
+5
+```
+
+## simpleJSONExtractBool
+
+Parses a true/false value from the value of the field named `field_name`. The result is `UInt8`.
+
+**Syntax**
+
+```sql
+simpleJSONExtractBool(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns `1` if the value of the field is `true`, `0` otherwise. This means this function will return `0` including (and not only) in the following cases:
+ - If the field doesn't exists.
+ - If the field contains `true` as a string, e.g.: `{"field":"true"}`.
+ - If the field contains `1` as a numerical value.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":false,"bar":true}');
+INSERT INTO jsons VALUES ('{"foo":"true","qux":1}');
+
+SELECT simpleJSONExtractBool(json, 'bar') FROM jsons ORDER BY json;
+SELECT simpleJSONExtractBool(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+0
+1
+0
+0
+```
+
+## simpleJSONExtractRaw
+
+Returns the value of the field named `field_name` as a `String`, including separators.
+
+**Syntax**
+
+```sql
+simpleJSONExtractRaw(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns the value of the field as a [`String`](../../sql-reference/data-types/string.md#string), including separators if the field exists, or an empty `String` otherwise.
+
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":{"def":[1,2,3]}}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractRaw(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+
+"-4e3"
+-3.4
+5
+{"def":[1,2,3]}
+```
+
+## simpleJSONExtractString
+
+Parses `String` in double quotes from the value of the field named `field_name`.
+
+**Syntax**
+
+```sql
+simpleJSONExtractString(json, field_name)
+```
+
+**Parameters**
+
+- `json`: The JSON in which the field is searched for. [String](../../sql-reference/data-types/string.md#string)
+- `field_name`: The name of the field to search for. [String literal](../syntax#string)
+
+**Returned value**
+
+It returns the value of a field as a [`String`](../../sql-reference/data-types/string.md#string), including separators. The value is unescaped. It returns an empty `String`: if the field doesn't contain a double quoted string, if unescaping fails or if the field doesn't exist.
+
+**Implementation details**
+
 There is currently no support for code points in the format `\uXXXX\uYYYY` that are not from the basic multilingual plane (they are converted to CESU-8 instead of UTF-8).
 
+**Example**
+
+Query:
+
+```sql
+CREATE TABLE jsons
+(
+    `json` String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"\\n\\u0000"}');
+INSERT INTO jsons VALUES ('{"foo":"\\u263"}');
+INSERT INTO jsons VALUES ('{"foo":"\\u263a"}');
+INSERT INTO jsons VALUES ('{"foo":"hello}');
+
+SELECT simpleJSONExtractString(json, 'foo') FROM jsons ORDER BY json;
+```
+
+```response
+\n\0
+
+☺
+
+```
+
+## visitParamHas
+
+This function is [an alias of `simpleJSONHas`](./json-functions#simplejsonhas).
+
+## visitParamExtractUInt
+
+This function is [an alias of `simpleJSONExtractUInt`](./json-functions#simplejsonextractuint).
+
+## visitParamExtractInt
+
+This function is [an alias of `simpleJSONExtractInt`](./json-functions#simplejsonextractint).
+
+## visitParamExtractFloat
+
+This function is [an alias of `simpleJSONExtractFloat`](./json-functions#simplejsonextractfloat).
+
+## visitParamExtractBool
+
+This function is [an alias of `simpleJSONExtractBool`](./json-functions#simplejsonextractbool).
+
+## visitParamExtractRaw
+
+This function is [an alias of `simpleJSONExtractRaw`](./json-functions#simplejsonextractraw).
+
+## visitParamExtractString
+
+This function is [an alias of `simpleJSONExtractString`](./json-functions#simplejsonextractstring).
+
 # JSONExtract functions
 
 The following functions are based on [simdjson](https://github.com/lemire/simdjson) designed for more complex JSON parsing requirements.
diff --git a/docs/en/sql-reference/functions/math-functions.md b/docs/en/sql-reference/functions/math-functions.md
index b27668caf0c..fc659891b5c 100644
--- a/docs/en/sql-reference/functions/math-functions.md
+++ b/docs/en/sql-reference/functions/math-functions.md
@@ -299,6 +299,18 @@ sin(x)
 
 Type: [Float*](../../sql-reference/data-types/float.md).
 
+**Example**
+
+Query:
+
+```sql
+SELECT sin(1.23);
+```
+
+```response
+0.9424888019316975
+```
+
 ## cos
 
 Returns the cosine of the argument.
diff --git a/docs/en/sql-reference/functions/other-functions.md b/docs/en/sql-reference/functions/other-functions.md
index 35f9c7af2ce..e9f8bc6e547 100644
--- a/docs/en/sql-reference/functions/other-functions.md
+++ b/docs/en/sql-reference/functions/other-functions.md
@@ -17,7 +17,7 @@ Returns a named value from the [macros](../../operations/server-configuration-pa
 
 **Syntax**
 
-``` sql
+```sql
 getMacro(name);
 ```
 
@@ -35,7 +35,7 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Example `<macros>` section in the server configuration file:
 
-``` xml
+```xml
 <macros>
     <test>Value</test>
 </macros>
@@ -43,13 +43,13 @@ Example `<macros>` section in the server configuration file:
 
 Query:
 
-``` sql
+```sql
 SELECT getMacro('test');
 ```
 
 Result:
 
-``` text
+```text
 ┌─getMacro('test')─�
 │ Value            │
 └──────────────────┘
@@ -57,12 +57,12 @@ Result:
 
 The same value can be retrieved as follows:
 
-``` sql
+```sql
 SELECT * FROM system.macros
 WHERE macro = 'test';
 ```
 
-``` text
+```text
 ┌─macro─┬─substitution─�
 │ test  │ Value        │
 └───────┴──────────────┘
@@ -74,7 +74,7 @@ Returns the fully qualified domain name of the ClickHouse server.
 
 **Syntax**
 
-``` sql
+```sql
 fqdn();
 ```
 
@@ -88,13 +88,13 @@ Type: `String`.
 
 **Example**
 
-``` sql
+```sql
 SELECT FQDN();
 ```
 
 Result:
 
-``` text
+```text
 ┌─FQDN()──────────────────────────�
 │ clickhouse.ru-central1.internal │
 └─────────────────────────────────┘
@@ -104,7 +104,7 @@ Result:
 
 Extracts the tail of a string following its last slash or backslash. This function if often used to extract the filename from a path.
 
-``` sql
+```sql
 basename(expr)
 ```
 
@@ -123,13 +123,13 @@ A string that contains:
 
 Query:
 
-``` sql
+```sql
 SELECT 'some/long/path/to/file' AS a, basename(a)
 ```
 
 Result:
 
-``` text
+```text
 ┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─�
 │ some\long\path\to\file │ file                                   │
 └────────────────────────┴────────────────────────────────────────┘
@@ -137,13 +137,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT 'some\\long\\path\\to\\file' AS a, basename(a)
 ```
 
 Result:
 
-``` text
+```text
 ┌─a──────────────────────┬─basename('some\\long\\path\\to\\file')─�
 │ some\long\path\to\file │ file                                   │
 └────────────────────────┴────────────────────────────────────────┘
@@ -151,13 +151,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT 'some-file-name' AS a, basename(a)
 ```
 
 Result:
 
-``` text
+```text
 ┌─a──────────────┬─basename('some-file-name')─�
 │ some-file-name │ some-file-name             │
 └────────────────┴────────────────────────────┘
@@ -170,11 +170,11 @@ This function is used by the system to implement Pretty formats.
 
 `NULL` is represented as a string corresponding to `NULL` in `Pretty` formats.
 
-``` sql
+```sql
 SELECT visibleWidth(NULL)
 ```
 
-``` text
+```text
 ┌─visibleWidth(NULL)─�
 │                  4 │
 └────────────────────┘
@@ -256,7 +256,7 @@ SELECT key, byteSize(u8) AS `byteSize(UInt8)`, byteSize(u16) AS `byteSize(UInt16
 
 Result:
 
-``` text
+```text
 Row 1:
 ──────
 key:               1
@@ -298,13 +298,99 @@ Full columns and constants are represented differently in memory. Functions usua
 Accepts any arguments, including `NULL` and does nothing. Always returns 0.
 The argument is internally still evaluated. Useful e.g. for benchmarks.
 
-## sleep(seconds)
+## sleep
 
-Sleeps ‘seconds’ seconds for each data block. The sleep time can be specified as integer or as floating-point number.
+Used to introduce a delay or pause in the execution of a query. It is primarily used for testing and debugging purposes.
 
-## sleepEachRow(seconds)
+**Syntax**
 
-Sleeps ‘seconds’ seconds for each row. The sleep time can be specified as integer or as floating-point number.
+```sql
+sleep(seconds)
+```
+
+**Arguments**
+
+- `seconds`: [UInt*](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md) The number of seconds to pause the query execution to a maximum of 3 seconds. It can be a floating-point value to specify fractional seconds.
+
+**Returned value**
+
+This function does not return any value.
+
+**Example**
+
+```sql
+SELECT sleep(2);
+```
+
+This function does not return any value. However, if you run the function with `clickhouse client` you will see something similar to:
+
+```response
+SELECT sleep(2)
+
+Query id: 8aa9943e-a686-45e1-8317-6e8e3a5596ac
+
+┌─sleep(2)─�
+│        0 │
+└──────────┘
+
+1 row in set. Elapsed: 2.012 sec.
+```
+
+This query will pause for 2 seconds before completing. During this time, no results will be returned, and the query will appear to be hanging or unresponsive.
+
+**Implementation details**
+
+The `sleep()` function is generally not used in production environments, as it can negatively impact query performance and system responsiveness. However, it can be useful in the following scenarios:
+
+1. **Testing**: When testing or benchmarking ClickHouse, you may want to simulate delays or introduce pauses to observe how the system behaves under certain conditions.
+2. **Debugging**: If you need to examine the state of the system or the execution of a query at a specific point in time, you can use `sleep()` to introduce a pause, allowing you to inspect or collect relevant information.
+3. **Simulation**: In some cases, you may want to simulate real-world scenarios where delays or pauses occur, such as network latency or external system dependencies.
+
+It's important to use the `sleep()` function judiciously and only when necessary, as it can potentially impact the overall performance and responsiveness of your ClickHouse system.
+
+## sleepEachRow
+
+Pauses the execution of a query for a specified number of seconds for each row in the result set.
+
+**Syntax**
+
+```sql
+sleepEachRow(seconds)
+```
+
+**Arguments**
+
+- `seconds`: [UInt*](../../sql-reference/data-types/int-uint.md) or [Float*](../../sql-reference/data-types/float.md) The number of seconds to pause the query execution for each row in the result set to a maximum of 3 seconds. It can be a floating-point value to specify fractional seconds.
+
+**Returned value**
+
+This function returns the same input values as it receives, without modifying them.
+
+**Example**
+
+```sql
+SELECT number, sleepEachRow(0.5) FROM system.numbers LIMIT 5;
+```
+
+```response
+┌─number─┬─sleepEachRow(0.5)─�
+│      0 │                 0 │
+│      1 │                 0 │
+│      2 │                 0 │
+│      3 │                 0 │
+│      4 │                 0 │
+└────────┴───────────────────┘
+```
+
+But the output will be delayed, with a 0.5-second pause between each row.
+
+The `sleepEachRow()` function is primarily used for testing and debugging purposes, similar to the `sleep()` function. It allows you to simulate delays or introduce pauses in the processing of each row, which can be useful in scenarios such as:
+
+1. **Testing**: When testing or benchmarking ClickHouse's performance under specific conditions, you can use `sleepEachRow()` to simulate delays or introduce pauses for each row processed.
+2. **Debugging**: If you need to examine the state of the system or the execution of a query for each row processed, you can use `sleepEachRow()` to introduce pauses, allowing you to inspect or collect relevant information.
+3. **Simulation**: In some cases, you may want to simulate real-world scenarios where delays or pauses occur for each row processed, such as when dealing with external systems or network latencies.
+
+Like the [`sleep()` function](#sleep), it's important to use `sleepEachRow()` judiciously and only when necessary, as it can significantly impact the overall performance and responsiveness of your ClickHouse system, especially when dealing with large result sets.
 
 ## currentDatabase()
 
@@ -315,11 +401,11 @@ Useful in table engine parameters of `CREATE TABLE` queries where you need to sp
 
 Returns the name of the current user. In case of a distributed query, the name of the user who initiated the query is returned.
 
-``` sql
+```sql
 SELECT currentUser();
 ```
 
-Alias: `user()`, `USER()`.
+Aliases: `user()`, `USER()`, `current_user()`. Aliases are case insensitive.
 
 **Returned values**
 
@@ -330,13 +416,13 @@ Type: `String`.
 
 **Example**
 
-``` sql
+```sql
 SELECT currentUser();
 ```
 
 Result:
 
-``` text
+```text
 ┌─currentUser()─�
 │ default       │
 └───────────────┘
@@ -352,7 +438,7 @@ This function is mostly intended for development, debugging and demonstration.
 
 **Syntax**
 
-``` sql
+```sql
 isConstant(x)
 ```
 
@@ -371,13 +457,13 @@ Type: [UInt8](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT isConstant(x + 1) FROM (SELECT 43 AS x)
 ```
 
 Result:
 
-``` text
+```text
 ┌─isConstant(plus(x, 1))─�
 │                      1 │
 └────────────────────────┘
@@ -385,13 +471,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 WITH 3.14 AS pi SELECT isConstant(cos(pi))
 ```
 
 Result:
 
-``` text
+```text
 ┌─isConstant(cos(pi))─�
 │                   1 │
 └─────────────────────┘
@@ -399,13 +485,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT isConstant(number) FROM numbers(1)
 ```
 
 Result:
 
-``` text
+```text
 ┌─isConstant(number)─�
 │                  0 │
 └────────────────────┘
@@ -425,7 +511,7 @@ Checks whether a floating point value is finite.
 
 **Syntax**
 
-``` sql
+```sql
 ifNotFinite(x,y)
 ```
 
@@ -457,12 +543,64 @@ You can get similar result by using the [ternary operator](../../sql-reference/f
 
 Returns 1 if the Float32 and Float64 argument is NaN, otherwise this function 0.
 
-## hasColumnInTable(\[‘hostname’\[, ‘username’\[, ‘password’\]\],\] ‘database’, ‘table’, ‘column’)
+## hasColumnInTable
+
+Given the database name, the table name, and the column name as constant strings, returns 1 if the given column exists, otherwise 0.
+
+**Syntax**
+
+```sql
+hasColumnInTable(\[‘hostname’\[, ‘username’\[, ‘password’\]\],\] ‘database’, ‘table’, ‘column’)
+```
+
+**Parameters**
+
+- `database` : name of the database. [String literal](../syntax#syntax-string-literal)
+- `table` : name of the table. [String literal](../syntax#syntax-string-literal) 
+- `column` : name of the column. [String literal](../syntax#syntax-string-literal)
+- `hostname` : remote server name to perform the check on. [String literal](../syntax#syntax-string-literal)
+- `username` : username for remote server. [String literal](../syntax#syntax-string-literal)
+- `password` : password for remote server. [String literal](../syntax#syntax-string-literal)
+
+**Returned value**
+
+- `1` if the given column exists.
+- `0`, otherwise. 
+
+**Implementation details**
 
-Given the database name, the table name, and the column name as constant strings, returns 1 if the given column exists, otherwise 0. If parameter `hostname` is given, the check is performed on a remote server.
-If the table does not exist, an exception is thrown.
 For elements in a nested data structure, the function checks for the existence of a column. For the nested data structure itself, the function returns 0.
 
+**Example**
+
+Query:
+
+```sql
+SELECT hasColumnInTable('system','metrics','metric')
+```
+
+```response
+1
+```
+
+```sql
+SELECT hasColumnInTable('system','metrics','non-existing_column')
+```
+
+```response
+0
+```
+
+## hasThreadFuzzer
+
+Returns whether Thread Fuzzer is effective. It can be used in tests to prevent runs from being too long.
+
+**Syntax**
+
+```sql
+hasThreadFuzzer();
+```
+
 ## bar
 
 Builds a bar chart.
@@ -479,7 +617,7 @@ The band is drawn with accuracy to one eighth of a symbol.
 
 Example:
 
-``` sql
+```sql
 SELECT
     toHour(EventTime) AS h,
     count() AS c,
@@ -489,7 +627,7 @@ GROUP BY h
 ORDER BY h ASC
 ```
 
-``` text
+```text
 ┌──h─┬──────c─┬─bar────────────────�
 │  0 │ 292907 │ █████████▋         │
 │  1 │ 180563 │ ██████             │
@@ -547,7 +685,7 @@ For example, the first argument could have type `Int64`, while the second argume
 
 Example:
 
-``` sql
+```sql
 SELECT
     transform(SearchEngineID, [2, 3], ['Yandex', 'Google'], 'Other') AS title,
     count() AS c
@@ -557,7 +695,7 @@ GROUP BY title
 ORDER BY c DESC
 ```
 
-``` text
+```text
 ┌─title─────┬──────c─�
 │ Yandex    │ 498635 │
 │ Google    │ 229872 │
@@ -571,7 +709,7 @@ Similar to the other variation but has no ‘default’ argument. In case no mat
 
 Example:
 
-``` sql
+```sql
 SELECT
     transform(domain(Referer), ['yandex.ru', 'google.ru', 'vkontakte.ru'], ['www.yandex', 'example.com', 'vk.com']) AS s,
     count() AS c
@@ -581,7 +719,7 @@ ORDER BY count() DESC
 LIMIT 10
 ```
 
-``` text
+```text
 ┌─s──────────────┬───────c─�
 │                │ 2906259 │
 │ www.yandex     │  867767 │
@@ -601,13 +739,13 @@ Given a size (number of bytes), this function returns a readable, rounded size w
 
 Example:
 
-``` sql
+```sql
 SELECT
     arrayJoin([1, 1024, 1024*1024, 192851925]) AS filesize_bytes,
     formatReadableDecimalSize(filesize_bytes) AS filesize
 ```
 
-``` text
+```text
 ┌─filesize_bytes─┬─filesize───�
 │              1 │ 1.00 B     │
 │           1024 │ 1.02 KB   │
@@ -622,7 +760,7 @@ Given a size (number of bytes), this function returns a readable, rounded size w
 
 Example:
 
-``` sql
+```sql
 SELECT
     arrayJoin([1, 1024, 1024*1024, 192851925]) AS filesize_bytes,
     formatReadableSize(filesize_bytes) AS filesize
@@ -630,7 +768,7 @@ SELECT
 
 Alias: `FORMAT_BYTES`.
 
-``` text
+```text
 ┌─filesize_bytes─┬─filesize───�
 │              1 │ 1.00 B     │
 │           1024 │ 1.00 KiB   │
@@ -645,13 +783,13 @@ Given a number, this function returns a rounded number with suffix (thousand, mi
 
 Example:
 
-``` sql
+```sql
 SELECT
     arrayJoin([1024, 1234 * 1000, (4567 * 1000) * 1000, 98765432101234]) AS number,
     formatReadableQuantity(number) AS number_for_humans
 ```
 
-``` text
+```text
 ┌─────────number─┬─number_for_humans─�
 │           1024 │ 1.02 thousand     │
 │        1234000 │ 1.23 million      │
@@ -666,7 +804,7 @@ Given a time interval (delta) in seconds, this function returns a time delta wit
 
 **Syntax**
 
-``` sql
+```sql
 formatReadableTimeDelta(column[, maximum_unit, minimum_unit])
 ```
 
@@ -674,21 +812,22 @@ formatReadableTimeDelta(column[, maximum_unit, minimum_unit])
 
 - `column` — A column with a numeric time delta.
 - `maximum_unit` — Optional. Maximum unit to show.
-  * Acceptable values: `nanoseconds`, `microseconds`, `milliseconds`, `seconds`, `minutes`, `hours`, `days`, `months`, `years`.
-  * Default value: `years`.
+  - Acceptable values: `nanoseconds`, `microseconds`, `milliseconds`, `seconds`, `minutes`, `hours`, `days`, `months`, `years`.
+  - Default value: `years`.
 - `minimum_unit` — Optional. Minimum unit to show. All smaller units are truncated.
-  * Acceptable values: `nanoseconds`, `microseconds`, `milliseconds`, `seconds`, `minutes`, `hours`, `days`, `months`, `years`.
-  * If explicitly specified value is bigger than `maximum_unit`, an exception will be thrown.
-  * Default value: `seconds` if `maximum_unit` is `seconds` or bigger, `nanoseconds` otherwise.
+  - Acceptable values: `nanoseconds`, `microseconds`, `milliseconds`, `seconds`, `minutes`, `hours`, `days`, `months`, `years`.
+  - If explicitly specified value is bigger than `maximum_unit`, an exception will be thrown.
+  - Default value: `seconds` if `maximum_unit` is `seconds` or bigger, `nanoseconds` otherwise.
 
 **Example**
-``` sql
+
+```sql
 SELECT
     arrayJoin([100, 12345, 432546534]) AS elapsed,
     formatReadableTimeDelta(elapsed) AS time_delta
 ```
 
-``` text
+```text
 ┌────elapsed─┬─time_delta ─────────────────────────────────────────────────────�
 │        100 │ 1 minute and 40 seconds                                         │
 │      12345 │ 3 hours, 25 minutes and 45 seconds                              │
@@ -696,13 +835,13 @@ SELECT
 └────────────┴─────────────────────────────────────────────────────────────────┘
 ```
 
-``` sql
+```sql
 SELECT
     arrayJoin([100, 12345, 432546534]) AS elapsed,
     formatReadableTimeDelta(elapsed, 'minutes') AS time_delta
 ```
 
-``` text
+```text
 ┌────elapsed─┬─time_delta ─────────────────────────────────────────────────────�
 │        100 │ 1 minute and 40 seconds                                         │
 │      12345 │ 205 minutes and 45 seconds                                      │
@@ -738,7 +877,6 @@ parseTimeDelta(timestr)
 
 - `timestr` — A sequence of numbers followed by something resembling a time unit.
 
-
 **Returned value**
 
 - A floating-point number with the number of seconds.
@@ -780,8 +918,52 @@ If executed in the context of a distributed table, this function generates a nor
 
 ## version()
 
-Returns the server version as a string.
-If executed in the context of a distributed table, this function generates a normal column with values relevant to each shard. Otherwise it produces a constant value.
+Returns the current version of ClickHouse as a string in the form of:
+
+- Major version
+- Minor version
+- Patch version
+- Number of commits since the previous stable release.
+
+```plaintext
+major_version.minor_version.patch_version.number_of_commits_since_the_previous_stable_release
+```
+
+If executed in the context of a distributed table, this function generates a normal column with values relevant to each shard. Otherwise, it produces a constant value.
+
+**Syntax**
+
+```sql
+version()
+```
+
+**Arguments**
+
+None.
+
+**Returned value**
+
+Type: [String](../data-types/string)
+
+**Implementation details**
+
+None.
+
+**Example**
+
+Query:
+
+```sql
+SELECT version()
+```
+
+**Result**:
+
+```response
+┌─version()─�
+│ 24.2.1.1  │
+└───────────┘
+```
 
 ## buildId()
 
@@ -806,7 +988,7 @@ The window function that provides access to a row at a specified offset before o
 
 **Syntax**
 
-``` sql
+```sql
 neighbor(column, offset[, default_value])
 ```
 
@@ -836,13 +1018,13 @@ Type: type of data blocks affected or default value type.
 
 Query:
 
-``` sql
+```sql
 SELECT number, neighbor(number, 2) FROM system.numbers LIMIT 10;
 ```
 
 Result:
 
-``` text
+```text
 ┌─number─┬─neighbor(number, 2)─�
 │      0 │                   2 │
 │      1 │                   3 │
@@ -859,13 +1041,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT number, neighbor(number, 2, 999) FROM system.numbers LIMIT 10;
 ```
 
 Result:
 
-``` text
+```text
 ┌─number─┬─neighbor(number, 2, 999)─�
 │      0 │                        2 │
 │      1 │                        3 │
@@ -884,7 +1066,7 @@ This function can be used to compute year-over-year metric value:
 
 Query:
 
-``` sql
+```sql
 WITH toDate('2018-01-01') AS start_date
 SELECT
     toStartOfMonth(start_date + (number * 32)) AS month,
@@ -896,7 +1078,7 @@ FROM numbers(16)
 
 Result:
 
-``` text
+```text
 ┌──────month─┬─money─┬─prev_year─┬─year_over_year─�
 │ 2018-01-01 │    32 │         0 │              0 │
 │ 2018-02-01 │    63 │         0 │              0 │
@@ -933,7 +1115,7 @@ To prevent that you can create a subquery with [ORDER BY](../../sql-reference/st
 
 Example:
 
-``` sql
+```sql
 SELECT
     EventID,
     EventTime,
@@ -950,7 +1132,7 @@ FROM
 )
 ```
 
-``` text
+```text
 ┌─EventID─┬───────────EventTime─┬─delta─�
 │    1106 │ 2016-11-24 00:00:04 │     0 │
 │    1107 │ 2016-11-24 00:00:05 │     1 │
@@ -962,7 +1144,7 @@ FROM
 
 Please note that the block size affects the result. The internal state of `runningDifference` state is reset for each new block.
 
-``` sql
+```sql
 SELECT
     number,
     runningDifference(number + 1) AS diff
@@ -970,7 +1152,7 @@ FROM numbers(100000)
 WHERE diff != 1
 ```
 
-``` text
+```text
 ┌─number─┬─diff─�
 │      0 │    0 │
 └────────┴──────┘
@@ -979,7 +1161,7 @@ WHERE diff != 1
 └────────┴──────┘
 ```
 
-``` sql
+```sql
 set max_block_size=100000 -- default value is 65536!
 
 SELECT
@@ -989,7 +1171,7 @@ FROM numbers(100000)
 WHERE diff != 1
 ```
 
-``` text
+```text
 ┌─number─┬─diff─�
 │      0 │    0 │
 └────────┴──────┘
@@ -1005,21 +1187,20 @@ Calculates the number of concurrent events.
 Each event has a start time and an end time. The start time is included in the event, while the end time is excluded. Columns with a start time and an end time must be of the same data type.
 The function calculates the total number of active (concurrent) events for each event start time.
 
-
 :::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.
 :::
 
 **Syntax**
 
-``` sql
+```sql
 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).
+- `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**
 
@@ -1031,7 +1212,7 @@ Type: [UInt32](../../sql-reference/data-types/int-uint.md)
 
 Consider the table:
 
-``` text
+```text
 ┌──────start─┬────────end─�
 │ 2021-03-03 │ 2021-03-11 │
 │ 2021-03-06 │ 2021-03-12 │
@@ -1042,13 +1223,13 @@ Consider the table:
 
 Query:
 
-``` sql
+```sql
 SELECT start, runningConcurrency(start, end) FROM example_table;
 ```
 
 Result:
 
-``` text
+```text
 ┌──────start─┬─runningConcurrency(start, end)─�
 │ 2021-03-03 │                              1 │
 │ 2021-03-06 │                              2 │
@@ -1074,7 +1255,7 @@ Given a MAC address in format AA:BB:CC:DD:EE:FF (colon-separated numbers in hexa
 Returns the number of fields in [Enum](../../sql-reference/data-types/enum.md).
 An exception is thrown if the type is not `Enum`.
 
-``` sql
+```sql
 getSizeOfEnumType(value)
 ```
 
@@ -1088,11 +1269,11 @@ getSizeOfEnumType(value)
 
 **Example**
 
-``` sql
+```sql
 SELECT getSizeOfEnumType( CAST('a' AS Enum8('a' = 1, 'b' = 2) ) ) AS x
 ```
 
-``` text
+```text
 ┌─x─�
 │ 2 │
 └───┘
@@ -1102,7 +1283,7 @@ SELECT getSizeOfEnumType( CAST('a' AS Enum8('a' = 1, 'b' = 2) ) ) AS x
 
 Returns the size on disk without considering compression.
 
-``` sql
+```sql
 blockSerializedSize(value[, value[, ...]])
 ```
 
@@ -1118,13 +1299,13 @@ blockSerializedSize(value[, value[, ...]])
 
 Query:
 
-``` sql
+```sql
 SELECT blockSerializedSize(maxState(1)) as x
 ```
 
 Result:
 
-``` text
+```text
 ┌─x─�
 │ 2 │
 └───┘
@@ -1134,7 +1315,7 @@ Result:
 
 Returns the internal name of the data type that represents the value.
 
-``` sql
+```sql
 toColumnTypeName(value)
 ```
 
@@ -1150,13 +1331,13 @@ toColumnTypeName(value)
 
 Difference between `toTypeName ' and ' toColumnTypeName`:
 
-``` sql
+```sql
 SELECT toTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
 ```
 
 Result:
 
-``` text
+```text
 ┌─toTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─�
 │ DateTime                                            │
 └─────────────────────────────────────────────────────┘
@@ -1164,13 +1345,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT toColumnTypeName(CAST('2018-01-01 01:02:03' AS DateTime))
 ```
 
 Result:
 
-``` text
+```text
 ┌─toColumnTypeName(CAST('2018-01-01 01:02:03', 'DateTime'))─�
 │ Const(UInt32)                                             │
 └───────────────────────────────────────────────────────────┘
@@ -1182,7 +1363,7 @@ The example shows that the `DateTime` data type is internally stored as `Const(U
 
 Outputs a detailed description of data structures in RAM
 
-``` sql
+```sql
 dumpColumnStructure(value)
 ```
 
@@ -1196,11 +1377,11 @@ dumpColumnStructure(value)
 
 **Example**
 
-``` sql
+```sql
 SELECT dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))
 ```
 
-``` text
+```text
 ┌─dumpColumnStructure(CAST('2018-01-01 01:02:03', 'DateTime'))─�
 │ DateTime, Const(size = 1, UInt32(size = 1))                  │
 └──────────────────────────────────────────────────────────────┘
@@ -1212,7 +1393,7 @@ Returns the default value for the given data type.
 
 Does not include default values for custom columns set by the user.
 
-``` sql
+```sql
 defaultValueOfArgumentType(expression)
 ```
 
@@ -1230,13 +1411,13 @@ defaultValueOfArgumentType(expression)
 
 Query:
 
-``` sql
+```sql
 SELECT defaultValueOfArgumentType( CAST(1 AS Int8) )
 ```
 
 Result:
 
-``` text
+```text
 ┌─defaultValueOfArgumentType(CAST(1, 'Int8'))─�
 │                                           0 │
 └─────────────────────────────────────────────┘
@@ -1244,13 +1425,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT defaultValueOfArgumentType( CAST(1 AS Nullable(Int8) ) )
 ```
 
 Result:
 
-``` text
+```text
 ┌─defaultValueOfArgumentType(CAST(1, 'Nullable(Int8)'))─�
 │                                                  ᴺ�ᴸᴸ │
 └───────────────────────────────────────────────────────┘
@@ -1262,7 +1443,7 @@ Returns the default value for the given type name.
 
 Does not include default values for custom columns set by the user.
 
-``` sql
+```sql
 defaultValueOfTypeName(type)
 ```
 
@@ -1280,13 +1461,13 @@ defaultValueOfTypeName(type)
 
 Query:
 
-``` sql
+```sql
 SELECT defaultValueOfTypeName('Int8')
 ```
 
 Result:
 
-``` text
+```text
 ┌─defaultValueOfTypeName('Int8')─�
 │                              0 │
 └────────────────────────────────┘
@@ -1294,13 +1475,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT defaultValueOfTypeName('Nullable(Int8)')
 ```
 
 Result:
 
-``` text
+```text
 ┌─defaultValueOfTypeName('Nullable(Int8)')─�
 │                                     ᴺ�ᴸᴸ │
 └──────────────────────────────────────────┘
@@ -1412,7 +1593,7 @@ Creates an array with a single value.
 
 Used for the internal implementation of [arrayJoin](../../sql-reference/functions/array-join.md#functions_arrayjoin).
 
-``` sql
+```sql
 SELECT replicate(x, arr);
 ```
 
@@ -1431,13 +1612,13 @@ Type: `Array`.
 
 Query:
 
-``` sql
+```sql
 SELECT replicate(1, ['a', 'b', 'c'])
 ```
 
 Result:
 
-``` text
+```text
 ┌─replicate(1, ['a', 'b', 'c'])─�
 │ [1,1,1]                       │
 └───────────────────────────────┘
@@ -1449,7 +1630,7 @@ Returns the amount of free space in the filesystem hosting the database persiste
 
 **Syntax**
 
-``` sql
+```sql
 filesystemAvailable()
 ```
 
@@ -1463,13 +1644,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT formatReadableSize(filesystemAvailable()) AS "Available space";
 ```
 
 Result:
 
-``` text
+```text
 ┌─Available space─�
 │ 30.75 GiB       │
 └─────────────────┘
@@ -1481,7 +1662,7 @@ Returns the total amount of the free space on the filesystem hosting the databas
 
 **Syntax**
 
-``` sql
+```sql
 filesystemFree()
 ```
 
@@ -1495,13 +1676,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT formatReadableSize(filesystemFree()) AS "Free space";
 ```
 
 Result:
 
-``` text
+```text
 ┌─Free space─�
 │ 32.39 GiB  │
 └────────────┘
@@ -1513,7 +1694,7 @@ Returns the capacity of the filesystem in bytes. Needs the [path](../../operatio
 
 **Syntax**
 
-``` sql
+```sql
 filesystemCapacity()
 ```
 
@@ -1527,13 +1708,13 @@ Type: [UInt64](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT formatReadableSize(filesystemCapacity()) AS "Capacity";
 ```
 
 Result:
 
-``` text
+```text
 ┌─Capacity──�
 │ 39.32 GiB │
 └───────────┘
@@ -1545,7 +1726,7 @@ Calculates the result of an aggregate function based on a single value. This fun
 
 **Syntax**
 
-``` sql
+```sql
 initializeAggregation (aggregate_function, arg1, arg2, ..., argN)
 ```
 
@@ -1567,6 +1748,7 @@ Query:
 ```sql
 SELECT uniqMerge(state) FROM (SELECT initializeAggregation('uniqState', number % 3) AS state FROM numbers(10000));
 ```
+
 Result:
 
 ```text
@@ -1619,7 +1801,7 @@ Given a state of aggregate function, this function returns the result of aggrega
 
 **Syntax**
 
-``` sql
+```sql
 finalizeAggregation(state)
 ```
 
@@ -1724,7 +1906,7 @@ The state is reset for each new block of data.
 
 **Syntax**
 
-``` sql
+```sql
 runningAccumulate(agg_state[, grouping]);
 ```
 
@@ -1745,13 +1927,13 @@ Consider how you can use `runningAccumulate` to find the cumulative sum of numbe
 
 Query:
 
-``` sql
+```sql
 SELECT k, runningAccumulate(sum_k) AS res FROM (SELECT number as k, sumState(k) AS sum_k FROM numbers(10) GROUP BY k ORDER BY k);
 ```
 
 Result:
 
-``` text
+```text
 ┌─k─┬─res─�
 │ 0 │   0 │
 │ 1 │   1 │
@@ -1779,7 +1961,7 @@ The following example shows the `groupping` parameter usage:
 
 Query:
 
-``` sql
+```sql
 SELECT
     grouping,
     item,
@@ -1798,7 +1980,7 @@ FROM
 
 Result:
 
-``` text
+```text
 ┌─grouping─┬─item─┬─res─�
 │        0 │    0 │   0 │
 │        0 │    1 │   1 │
@@ -1830,7 +2012,7 @@ Only supports tables created with the `ENGINE = Join(ANY, LEFT, <join_keys>)` st
 
 **Syntax**
 
-``` sql
+```sql
 joinGet(join_storage_table_name, `value_column`, join_keys)
 ```
 
@@ -1852,13 +2034,13 @@ More info about `join_use_nulls` in [Join operation](../../engines/table-engines
 
 Input table:
 
-``` sql
+```sql
 CREATE DATABASE db_test
 CREATE TABLE db_test.id_val(`id` UInt32, `val` UInt32) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls = 1
 INSERT INTO db_test.id_val VALUES (1,11)(2,12)(4,13)
 ```
 
-``` text
+```text
 ┌─id─┬─val─�
 │  4 │  13 │
 │  2 │  12 │
@@ -1868,13 +2050,13 @@ INSERT INTO db_test.id_val VALUES (1,11)(2,12)(4,13)
 
 Query:
 
-``` sql
+```sql
 SELECT joinGet(db_test.id_val, 'val', toUInt32(number)) from numbers(4) SETTINGS join_use_nulls = 1
 ```
 
 Result:
 
-``` text
+```text
 ┌─joinGet(db_test.id_val, 'val', toUInt32(number))─�
 │                                                0 │
 │                                               11 │
@@ -1892,7 +2074,7 @@ This function is not available in ClickHouse Cloud.
 Evaluate an external catboost model. [CatBoost](https://catboost.ai) is an open-source gradient boosting library developed by Yandex for machine learning.
 Accepts a path to a catboost model and model arguments (features). Returns Float64.
 
-``` sql
+```sql
 SELECT feat1, ..., feat_n, catboostEvaluate('/path/to/model.bin', feat_1, ..., feat_n) AS prediction
 FROM data_table
 ```
@@ -1905,7 +2087,7 @@ Before evaluating catboost models, the `libcatboostmodel.<so|dylib>` library mus
 
 Next, specify the path to `libcatboostmodel.<so|dylib>` in the clickhouse configuration:
 
-``` xml
+```xml
 <clickhouse>
 ...
     <catboost_lib_path>/path/to/libcatboostmodel.so</catboost_lib_path>
@@ -1918,7 +2100,7 @@ At the first execution of `catboostEvaluate()`, the server starts the library br
 communicate using a HTTP interface. By default, port `9012` is used. A different port can be specified as follows - this is useful if port
 `9012` is already assigned to a different service.
 
-``` xml
+```xml
 <library_bridge>
     <port>9019</port>
 </library_bridge>
@@ -1942,13 +2124,13 @@ To use the `error_code` argument, configuration parameter `allow_custom_error_co
 
 **Example**
 
-``` sql
+```sql
 SELECT throwIf(number = 3, 'Too many') FROM numbers(10);
 ```
 
 Result:
 
-``` text
+```text
 ↙ Progress: 0.00 rows, 0.00 B (0.00 rows/s., 0.00 B/s.) Received exception from server (version 19.14.1):
 Code: 395. DB::Exception: Received from localhost:9000. DB::Exception: Too many.
 ```
@@ -1959,7 +2141,7 @@ Returns its argument. Intended for debugging and testing. Allows to cancel using
 
 **Syntax**
 
-``` sql
+```sql
 identity(x)
 ```
 
@@ -1967,13 +2149,13 @@ identity(x)
 
 Query:
 
-``` sql
+```sql
 SELECT identity(42);
 ```
 
 Result:
 
-``` text
+```text
 ┌─identity(42)─�
 │           42 │
 └──────────────┘
@@ -2020,7 +2202,7 @@ Checks whether the [Decimal](../../sql-reference/data-types/decimal.md) value is
 
 **Syntax**
 
-``` sql
+```sql
 isDecimalOverflow(d, [p])
 ```
 
@@ -2038,7 +2220,7 @@ isDecimalOverflow(d, [p])
 
 Query:
 
-``` sql
+```sql
 SELECT isDecimalOverflow(toDecimal32(1000000000, 0), 9),
        isDecimalOverflow(toDecimal32(1000000000, 0)),
        isDecimalOverflow(toDecimal32(-1000000000, 0), 9),
@@ -2047,7 +2229,7 @@ SELECT isDecimalOverflow(toDecimal32(1000000000, 0), 9),
 
 Result:
 
-``` text
+```text
 1	1	1	1
 ```
 
@@ -2057,7 +2239,7 @@ Returns number of decimal digits need to represent a value.
 
 **Syntax**
 
-``` sql
+```sql
 countDigits(x)
 ```
 
@@ -2079,7 +2261,7 @@ For `Decimal` values takes into account their scales: calculates result over und
 
 Query:
 
-``` sql
+```sql
 SELECT countDigits(toDecimal32(1, 9)), countDigits(toDecimal32(-1, 9)),
        countDigits(toDecimal64(1, 18)), countDigits(toDecimal64(-1, 18)),
        countDigits(toDecimal128(1, 38)), countDigits(toDecimal128(-1, 38));
@@ -2087,7 +2269,7 @@ SELECT countDigits(toDecimal32(1, 9)), countDigits(toDecimal32(-1, 9)),
 
 Result:
 
-``` text
+```text
 10	10	19	19	39	39
 ```
 
@@ -2099,13 +2281,13 @@ Type: [LowCardinality(String)](../../sql-reference/data-types/lowcardinality.md)
 
 **Syntax**
 
-``` sql
+```sql
 errorCodeToName(1)
 ```
 
 Result:
 
-``` text
+```text
 UNSUPPORTED_METHOD
 ```
 
@@ -2116,7 +2298,7 @@ If executed in the context of a distributed table, this function generates a nor
 
 **Syntax**
 
-``` sql
+```sql
 tcpPort()
 ```
 
@@ -2134,13 +2316,13 @@ Type: [UInt16](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT tcpPort();
 ```
 
 Result:
 
-``` text
+```text
 ┌─tcpPort()─�
 │      9000 │
 └───────────┘
@@ -2158,7 +2340,7 @@ The command [SET PROFILE](../../sql-reference/statements/set.md#query-set) could
 
 **Syntax**
 
-``` sql
+```sql
 currentProfiles()
 ```
 
@@ -2170,11 +2352,11 @@ Type: [Array](../../sql-reference/data-types/array.md)([String](../../sql-refere
 
 ## enabledProfiles
 
- Returns settings profiles, assigned to the current user both explicitly and implicitly. Explicitly assigned profiles are the same as returned by the [currentProfiles](#current-profiles) function. Implicitly assigned profiles include parent profiles of other assigned profiles, profiles assigned via granted roles, profiles assigned via their own settings, and the main default profile (see the `default_profile` section in the main server configuration file).
+Returns settings profiles, assigned to the current user both explicitly and implicitly. Explicitly assigned profiles are the same as returned by the [currentProfiles](#current-profiles) function. Implicitly assigned profiles include parent profiles of other assigned profiles, profiles assigned via granted roles, profiles assigned via their own settings, and the main default profile (see the `default_profile` section in the main server configuration file).
 
 **Syntax**
 
-``` sql
+```sql
 enabledProfiles()
 ```
 
@@ -2190,7 +2372,7 @@ Returns all the profiles specified at the current user's definition (see [CREATE
 
 **Syntax**
 
-``` sql
+```sql
 defaultProfiles()
 ```
 
@@ -2206,7 +2388,7 @@ Returns the roles assigned to the current user. The roles can be changed by the
 
 **Syntax**
 
-``` sql
+```sql
 currentRoles()
 ```
 
@@ -2222,7 +2404,7 @@ Returns the names of the current roles and the roles, granted to some of the cur
 
 **Syntax**
 
-``` sql
+```sql
 enabledRoles()
 ```
 
@@ -2238,7 +2420,7 @@ Returns the roles which are enabled by default for the current user when he logs
 
 **Syntax**
 
-``` sql
+```sql
 defaultRoles()
 ```
 
@@ -2254,7 +2436,7 @@ Returns the server port number. When the port is not used by the server, throws
 
 **Syntax**
 
-``` sql
+```sql
 getServerPort(port_name)
 ```
 
@@ -2262,16 +2444,16 @@ getServerPort(port_name)
 
 - `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**
 
@@ -2283,13 +2465,13 @@ Type: [UInt16](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT getServerPort('tcp_port');
 ```
 
 Result:
 
-``` text
+```text
 ┌─getServerPort('tcp_port')─�
 │ 9000                      │
 └───────────────────────────┘
@@ -2303,7 +2485,7 @@ In contrast to [initialQueryID](#initial-query-id) function, `queryID` can retur
 
 **Syntax**
 
-``` sql
+```sql
 queryID()
 ```
 
@@ -2317,7 +2499,7 @@ Type: [String](../../sql-reference/data-types/string.md)
 
 Query:
 
-``` sql
+```sql
 CREATE TABLE tmp (str String) ENGINE = Log;
 INSERT INTO tmp (*) VALUES ('a');
 SELECT count(DISTINCT t) FROM (SELECT queryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
@@ -2325,7 +2507,7 @@ SELECT count(DISTINCT t) FROM (SELECT queryID() AS t FROM remote('127.0.0.{1..3}
 
 Result:
 
-``` text
+```text
 ┌─count()─�
 │ 3       │
 └─────────┘
@@ -2339,7 +2521,7 @@ In contrast to [queryID](#query-id) function, `initialQueryID` returns the same
 
 **Syntax**
 
-``` sql
+```sql
 initialQueryID()
 ```
 
@@ -2353,7 +2535,7 @@ Type: [String](../../sql-reference/data-types/string.md)
 
 Query:
 
-``` sql
+```sql
 CREATE TABLE tmp (str String) ENGINE = Log;
 INSERT INTO tmp (*) VALUES ('a');
 SELECT count(DISTINCT t) FROM (SELECT initialQueryID() AS t FROM remote('127.0.0.{1..3}', currentDatabase(), 'tmp') GROUP BY queryID());
@@ -2361,7 +2543,7 @@ SELECT count(DISTINCT t) FROM (SELECT initialQueryID() AS t FROM remote('127.0.0
 
 Result:
 
-``` text
+```text
 ┌─count()─�
 │ 1       │
 └─────────┘
@@ -2374,7 +2556,7 @@ If a query is not distributed then constant value `0` is returned.
 
 **Syntax**
 
-``` sql
+```sql
 shardNum()
 ```
 
@@ -2390,7 +2572,7 @@ In the following example a configuration with two shards is used. The query is e
 
 Query:
 
-``` sql
+```sql
 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;
@@ -2398,7 +2580,7 @@ SELECT dummy, shardNum(), shardCount() FROM shard_num_example;
 
 Result:
 
-``` text
+```text
 ┌─dummy─┬─shardNum()─┬─shardCount()─�
 │     0 │          2 │            2 │
 │     0 │          1 │            2 │
@@ -2416,7 +2598,7 @@ If a query is not distributed then constant value `0` is returned.
 
 **Syntax**
 
-``` sql
+```sql
 shardCount()
 ```
 
@@ -2436,7 +2618,7 @@ Returns a string with the current OS kernel version.
 
 **Syntax**
 
-``` sql
+```sql
 getOSKernelVersion()
 ```
 
@@ -2454,13 +2636,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Query:
 
-``` sql
+```sql
 SELECT getOSKernelVersion();
 ```
 
 Result:
 
-``` text
+```text
 ┌─getOSKernelVersion()────�
 │ Linux 4.15.0-55-generic │
 └─────────────────────────┘
@@ -2472,7 +2654,7 @@ Returns the uptime of the current ZooKeeper session in seconds.
 
 **Syntax**
 
-``` sql
+```sql
 zookeeperSessionUptime()
 ```
 
@@ -2490,13 +2672,13 @@ Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
 Query:
 
-``` sql
+```sql
 SELECT zookeeperSessionUptime();
 ```
 
 Result:
 
-``` text
+```text
 ┌─zookeeperSessionUptime()─�
 │                      286 │
 └──────────────────────────┘
@@ -2508,7 +2690,7 @@ Generates random table structure in a format `column1_name column1_type, column2
 
 **Syntax**
 
-``` sql
+```sql
 generateRandomStructure([number_of_columns, seed])
 ```
 
@@ -2529,13 +2711,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Query:
 
-``` sql
+```sql
 SELECT generateRandomStructure()
 ```
 
 Result:
 
-``` text
+```text
 ┌─generateRandomStructure()─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────�
 │ c1 Decimal32(5), c2 Date, c3 Tuple(LowCardinality(String), Int128, UInt64, UInt16, UInt8, IPv6), c4 Array(UInt128), c5 UInt32, c6 IPv4, c7 Decimal256(64), c8 Decimal128(3), c9 UInt256, c10 UInt64, c11 DateTime │
 └───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
@@ -2543,13 +2725,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT generateRandomStructure(1)
 ```
 
 Result:
 
-``` text
+```text
 ┌─generateRandomStructure(1)─�
 │ c1 Map(UInt256, UInt16)    │
 └────────────────────────────┘
@@ -2557,13 +2739,13 @@ Result:
 
 Query:
 
-``` sql
+```sql
 SELECT generateRandomStructure(NULL, 33)
 ```
 
 Result:
 
-``` text
+```text
 ┌─generateRandomStructure(NULL, 33)─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────�
 │ c1 DateTime, c2 Enum8('c2V0' = 0, 'c2V1' = 1, 'c2V2' = 2, 'c2V3' = 3), c3 LowCardinality(Nullable(FixedString(30))), c4 Int16, c5 Enum8('c5V0' = 0, 'c5V1' = 1, 'c5V2' = 2, 'c5V3' = 3), c6 Nullable(UInt8), c7 String, c8 Nested(e1 IPv4, e2 UInt8, e3 UInt16, e4 UInt16, e5 Int32, e6 Map(Date, Decimal256(70))) │
 └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
@@ -2579,7 +2761,7 @@ Converts ClickHouse table structure to CapnProto schema.
 
 **Syntax**
 
-``` sql
+```sql
 structureToCapnProtoSchema(structure)
 ```
 
@@ -2590,7 +2772,7 @@ structureToCapnProtoSchema(structure)
 
 **Returned value**
 
-- CapnProto schema 
+- CapnProto schema
 
 Type: [String](../../sql-reference/data-types/string.md).
 
@@ -2598,13 +2780,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Query:
 
-``` sql
+```sql
 SELECT structureToCapnProtoSchema('column1 String, column2 UInt32, column3 Array(String)') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 @0xf96402dd754d0eb7;
 
 struct Message
@@ -2617,13 +2799,13 @@ struct Message
 
 Query:
 
-``` sql
+```sql
 SELECT structureToCapnProtoSchema('column1 Nullable(String), column2 Tuple(element1 UInt32, element2 Array(String)), column3 Map(String, String)') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 @0xd1c8320fecad2b7f;
 
 struct Message
@@ -2658,13 +2840,13 @@ struct Message
 
 Query:
 
-``` sql
+```sql
 SELECT structureToCapnProtoSchema('column1 String, column2 UInt32', 'Root') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 @0x96ab2d4ab133c6e1;
 
 struct Root
@@ -2680,7 +2862,7 @@ Converts ClickHouse table structure to Protobuf schema.
 
 **Syntax**
 
-``` sql
+```sql
 structureToProtobufSchema(structure)
 ```
 
@@ -2699,13 +2881,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Query:
 
-``` sql
+```sql
 SELECT structureToProtobufSchema('column1 String, column2 UInt32, column3 Array(String)') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 syntax = "proto3";
 
 message Message
@@ -2718,13 +2900,13 @@ message Message
 
 Query:
 
-``` sql
+```sql
 SELECT structureToProtobufSchema('column1 Nullable(String), column2 Tuple(element1 UInt32, element2 Array(String)), column3 Map(String, String)') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 syntax = "proto3";
 
 message Message
@@ -2742,13 +2924,13 @@ message Message
 
 Query:
 
-``` sql
+```sql
 SELECT structureToProtobufSchema('column1 String, column2 UInt32', 'Root') FORMAT RawBLOB
 ```
 
 Result:
 
-``` text
+```text
 syntax = "proto3";
 
 message Root
@@ -2832,13 +3014,95 @@ Result:
 └─────────────────────────────────────────────────────────────────────────┘
 ```
 
+## variantElement
+
+Extracts a column with specified type from a `Variant` column.
+
+**Syntax**
+
+```sql
+variantElement(variant, type_name, [, default_value])
+```
+
+**Arguments**
+
+- `variant` — Variant column. [Variant](../../sql-reference/data-types/variant.md).
+- `type_name` — The name of the variant type to extract. [String](../../sql-reference/data-types/string.md).
+- `default_value` - The default value that will be used if variant doesn't have variant with specified type. Can be any type. Optional.
+
+**Returned value**
+
+- Subcolumn of a `Variant` column with specified type.
+
+**Example**
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT v, variantElement(v, 'String'), variantElement(v, 'UInt64'), variantElement(v, 'Array(UInt64)') FROM test;
+```
+
+```text
+┌─v─────────────┬─variantElement(v, 'String')─┬─variantElement(v, 'UInt64')─┬─variantElement(v, 'Array(UInt64)')─�
+│ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ []                                 │
+│ 42            │ ᴺ�ᴸᴸ                        │                          42 │ []                                 │
+│ Hello, World! │ Hello, World!               │                        ᴺ�ᴸᴸ │ []                                 │
+│ [1,2,3]       │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ [1,2,3]                            │
+└───────────────┴─────────────────────────────┴─────────────────────────────┴────────────────────────────────────┘
+```
+
+## variantType
+
+Returns the variant type name for each row of `Variant` column. If row contains NULL, it returns `'None'` for it.
+
+**Syntax**
+
+```sql
+variantType(variant)
+```
+
+**Arguments**
+
+- `variant` — Variant column. [Variant](../../sql-reference/data-types/variant.md).
+
+**Returned value**
+
+- Enum8 column with variant type name for each row.
+
+**Example**
+
+```sql
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT variantType(v) FROM test;
+```
+
+```text
+┌─variantType(v)─�
+│ None           │
+│ UInt64         │
+│ String         │
+│ Array(UInt64)  │
+└────────────────┘
+```
+
+```sql
+SELECT toTypeName(variantType(v)) FROM test LIMIT 1;
+```
+
+```text
+┌─toTypeName(variantType(v))──────────────────────────────────────────�
+│ Enum8('None' = -1, 'Array(UInt64)' = 0, 'String' = 1, 'UInt64' = 2) │
+└─────────────────────────────────────────────────────────────────────┘
+```
+
 ## minSampleSizeConversion
 
 Calculates minimum required sample size for an A/B test comparing conversions (proportions) in two samples.
 
 **Syntax**
 
-``` sql
+```sql
 minSampleSizeConversion(baseline, mde, power, alpha)
 ```
 
@@ -2863,13 +3127,13 @@ A named [Tuple](../data-types/tuple.md) with 3 elements:
 
 The following query calculates the required sample size for an A/B test with baseline conversion of 25%, MDE of 3%, significance level of 5%, and the desired statistical power of 80%:
 
-``` sql
+```sql
 SELECT minSampleSizeConversion(0.25, 0.03, 0.80, 0.05) AS sample_size;
 ```
 
 Result:
 
-``` text
+```text
 ┌─sample_size───────────────────�
 │ (3396.077603219163,0.22,0.28) │
 └───────────────────────────────┘
@@ -2881,7 +3145,7 @@ Calculates minimum required sample size for an A/B test comparing means of a con
 
 **Syntax**
 
-``` sql
+```sql
 minSampleSizeContinous(baseline, sigma, mde, power, alpha)
 ```
 
@@ -2893,7 +3157,7 @@ Uses the formula described in [this article](https://towardsdatascience.com/requ
 
 - `baseline` — Baseline value of a metric. [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
 - `sigma` — Baseline standard deviation of a metric. [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
-- `mde` — Minimum detectable effect (MDE) as percentage of the baseline value (e.g. for a baseline value 112.25 the MDE 0.03 means an expected change to 112.25 ± 112.25*0.03). [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
+- `mde` — Minimum detectable effect (MDE) as percentage of the baseline value (e.g. for a baseline value 112.25 the MDE 0.03 means an expected change to 112.25 ± 112.25\*0.03). [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
 - `power` — Required statistical power of a test (1 - probability of Type II error). [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
 - `alpha` — Required significance level of a test (probability of Type I error). [Integer](../data-types/int-uint.md) or [Float](../data-types/float.md).
 
@@ -2909,14 +3173,28 @@ A named [Tuple](../data-types/tuple.md) with 3 elements:
 
 The following query calculates the required sample size for an A/B test on a metric with baseline value of 112.25, standard deviation of 21.1, MDE of 3%, significance level of 5%, and the desired statistical power of 80%:
 
-``` sql
+```sql
 SELECT minSampleSizeContinous(112.25, 21.1, 0.03, 0.80, 0.05) AS sample_size;
 ```
 
 Result:
 
-``` text
+```text
 ┌─sample_size───────────────────────────�
 │ (616.2931945826209,108.8825,115.6175) │
 └───────────────────────────────────────┘
 ```
+
+## getClientHTTPHeader
+
+Get the value of an HTTP header.
+
+If there is no such header or the current request is not performed via the HTTP interface, the function returns an empty string.
+Certain HTTP headers (e.g., `Authentication` and `X-ClickHouse-*`) are restricted.
+
+The function requires the setting `allow_get_client_http_header` to be enabled.
+The setting is not enabled by default for security reasons, because some headers, such as `Cookie`, could contain sensitive info.
+
+HTTP headers are case sensitive for this function.
+
+If the function is used in the context of a distributed query, it returns non-empty result only on the initiator node.
diff --git a/docs/en/sql-reference/functions/random-functions.md b/docs/en/sql-reference/functions/random-functions.md
index 6fd31e8d25c..2d7752ed022 100644
--- a/docs/en/sql-reference/functions/random-functions.md
+++ b/docs/en/sql-reference/functions/random-functions.md
@@ -11,79 +11,173 @@ elimination](../../sql-reference/functions/index.md#common-subexpression-elimina
 function return different random values.
 
 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
+## rand
 
-Returns a random UInt32 number, evenly distributed across the range of all possible UInt32 numbers.
+Returns a random UInt32 number with uniform distribution.
 
-Uses a linear congruential generator.
+Uses a linear congruential generator with an initial state obtained from the system, which means that while it appears random, it's not truly random and can be predictable if the initial state is known. For scenarios where true randomness is crucial, consider using alternative methods like system-level calls or integrating with external libraries.
+
+### Syntax
+
+```sql
+rand()
+```
+
+Alias: `rand32`
+
+### Arguments
+
+None.
+
+### Returned value
+
+Returns a number of type UInt32.
+
+### Example
+
+```sql
+SELECT rand();
+```
+
+```response
+1569354847 -- Note: The actual output will be a random number, not the specific number shown in the example
+```
 
 ## rand64
 
-Returns a random UInt64 number, evenly distributed across the range of all possible UInt64 numbers.
+Returns a random UInt64 integer (UInt64) number
 
-Uses a linear congruential generator.
+### Syntax
+
+```sql
+rand64()
+```
+
+### Arguments
+
+None.
+
+### Returned value
+
+Returns a number UInt64 number with uniform distribution.
+
+Uses a linear congruential generator with an initial state obtained from the system, which means that while it appears random, it's not truly random and can be predictable if the initial state is known. For scenarios where true randomness is crucial, consider using alternative methods like system-level calls or integrating with external libraries.
+
+### Example
+
+```sql
+SELECT rand64();
+```
+
+```response
+15030268859237645412 -- Note: The actual output will be a random number, not the specific number shown in the example.
+```
 
 ## randCanonical
 
-Returns a random Float64 value, evenly distributed in interval [0, 1).
+Returns a random Float64 number.
+
+### Syntax
+
+```sql
+randCanonical()
+```
+
+### Arguments
+
+None.
+
+### Returned value
+
+Returns a Float64 value between 0 (inclusive) and 1 (exclusive).
+
+### Example
+
+```sql
+SELECT randCanonical();
+```
+
+```response
+0.3452178901234567 - Note: The actual output will be a random Float64 number between 0 and 1, not the specific number shown in the example.
+```
 
 ## randConstant
 
-Like `rand` but produces a constant column with a random value.
+Generates a single constant column filled with a random value. Unlike `rand`, this function ensures the same random value appears in every row of the generated column, making it useful for scenarios requiring a consistent random seed across rows in a single query.
 
-**Example**
+### Syntax
 
-``` sql
-SELECT rand(), rand(1), rand(number), randConstant(), randConstant(1), randConstant(number)
-FROM numbers(3)
+```sql
+randConstant([x]);
 ```
 
-Result:
+### Arguments
 
-``` result
-┌─────rand()─┬────rand(1)─┬─rand(number)─┬─randConstant()─┬─randConstant(1)─┬─randConstant(number)─�
-│ 3047369878 │ 4132449925 │   4044508545 │     2740811946 │      4229401477 │           1924032898 │
-│ 2938880146 │ 1267722397 │   4154983056 │     2740811946 │      4229401477 │           1924032898 │
-│  956619638 │ 4238287282 │   1104342490 │     2740811946 │      4229401477 │           1924032898 │
-└────────────┴────────────┴──────────────┴────────────────┴─────────────────┴──────────────────────┘
+- **[x] (Optional):** An optional expression that influences the generated random value. Even if provided, the resulting value will still be constant within the same query execution. Different queries using the same expression will likely generate different constant values.
+
+### Returned value
+
+Returns a column of type UInt32 containing the same random value in each row.
+
+### Implementation details
+
+The actual output will be different for each query execution, even with the same optional expression. The optional parameter may not significantly change the generated value compared to using `randConstant` alone.
+
+### Examples
+
+```sql
+SELECT randConstant() AS random_value;
+```
+
+```response
+| random_value |
+|--------------|
+| 1234567890   |
+```
+
+```sql
+SELECT randConstant(10) AS random_value;
+```
+
+```response
+| random_value |
+|--------------|
+| 9876543210   |
 ```
 
 ## randUniform
 
-Returns a random Float64 drawn uniformly from interval [`min`, `max`) ([continuous uniform distribution](https://en.wikipedia.org/wiki/Continuous_uniform_distribution)).
+Returns a random Float64 drawn uniformly from interval [`min`, `max`].
 
-**Syntax**
+### Syntax
 
-``` sql
+```sql
 randUniform(min, max)
 ```
 
-**Arguments**
+### Arguments
 
 - `min` - `Float64` - left boundary of the range,
 - `max` - `Float64` - right boundary of the range.
 
-**Returned value**
+### Returned value
 
-- Random number.
+A random number of type [Float64](/docs/en/sql-reference/data-types/float.md).
 
-Type: [Float64](/docs/en/sql-reference/data-types/float.md).
+### Example
 
-**Example**
-
-``` sql
+```sql
 SELECT randUniform(5.5, 10) FROM numbers(5)
 ```
 
-Result:
-
-``` result
+```response
 ┌─randUniform(5.5, 10)─�
 │    8.094978491443102 │
 │   7.3181248914450885 │
@@ -99,7 +193,7 @@ Returns a random Float64 drawn from a [normal distribution](https://en.wikipedia
 
 **Syntax**
 
-``` sql
+```sql
 randNormal(mean, variance)
 ```
 
@@ -116,13 +210,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randNormal(10, 2) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌──randNormal(10, 2)─�
 │ 13.389228911709653 │
 │  8.622949707401295 │
@@ -138,7 +232,7 @@ Returns a random Float64 drawn from a [log-normal distribution](https://en.wikip
 
 **Syntax**
 
-``` sql
+```sql
 randLogNormal(mean, variance)
 ```
 
@@ -155,13 +249,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randLogNormal(100, 5) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randLogNormal(100, 5)─�
 │  1.295699673937363e48 │
 │  9.719869109186684e39 │
@@ -177,7 +271,7 @@ Returns a random UInt64 drawn from a [binomial distribution](https://en.wikipedi
 
 **Syntax**
 
-``` sql
+```sql
 randBinomial(experiments, probability)
 ```
 
@@ -194,13 +288,13 @@ Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randBinomial(100, .75) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randBinomial(100, 0.75)─�
 │                      74 │
 │                      78 │
@@ -216,7 +310,7 @@ Returns a random UInt64 drawn from a [negative binomial distribution](https://en
 
 **Syntax**
 
-``` sql
+```sql
 randNegativeBinomial(experiments, probability)
 ```
 
@@ -233,13 +327,13 @@ Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randNegativeBinomial(100, .75) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randNegativeBinomial(100, 0.75)─�
 │                              33 │
 │                              32 │
@@ -255,7 +349,7 @@ Returns a random UInt64 drawn from a [Poisson distribution](https://en.wikipedia
 
 **Syntax**
 
-``` sql
+```sql
 randPoisson(n)
 ```
 
@@ -271,13 +365,13 @@ Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randPoisson(10) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randPoisson(10)─�
 │               8 │
 │               8 │
@@ -293,7 +387,7 @@ Returns a random UInt64 drawn from a [Bernoulli distribution](https://en.wikiped
 
 **Syntax**
 
-``` sql
+```sql
 randBernoulli(probability)
 ```
 
@@ -309,13 +403,13 @@ Type: [UInt64](/docs/en/sql-reference/data-types/int-uint.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randBernoulli(.75) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randBernoulli(0.75)─�
 │                   1 │
 │                   1 │
@@ -331,7 +425,7 @@ Returns a random Float64 drawn from a [exponential distribution](https://en.wiki
 
 **Syntax**
 
-``` sql
+```sql
 randExponential(lambda)
 ```
 
@@ -347,13 +441,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randExponential(1/10) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randExponential(divide(1, 10))─�
 │              44.71628934340778 │
 │              4.211013337903262 │
@@ -369,7 +463,7 @@ Returns a random Float64 drawn from a [Chi-square distribution](https://en.wikip
 
 **Syntax**
 
-``` sql
+```sql
 randChiSquared(degree_of_freedom)
 ```
 
@@ -385,13 +479,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randChiSquared(10) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─randChiSquared(10)─�
 │ 10.015463656521543 │
 │  9.621799919882768 │
@@ -407,7 +501,7 @@ Returns a random Float64 drawn from a [Student's t-distribution](https://en.wiki
 
 **Syntax**
 
-``` sql
+```sql
 randStudentT(degree_of_freedom)
 ```
 
@@ -423,13 +517,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randStudentT(10) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌─────randStudentT(10)─�
 │   1.2217309938538725 │
 │   1.7941971681200541 │
@@ -445,7 +539,7 @@ Returns a random Float64 drawn from a [F-distribution](https://en.wikipedia.org/
 
 **Syntax**
 
-``` sql
+```sql
 randFisherF(d1, d2)
 ```
 
@@ -462,13 +556,13 @@ Type: [Float64](/docs/en/sql-reference/data-types/float.md).
 
 **Example**
 
-``` sql
+```sql
 SELECT randFisherF(10, 3) FROM numbers(5)
 ```
 
 Result:
 
-``` result
+```result
 ┌──randFisherF(10, 3)─�
 │   7.286287504216609 │
 │ 0.26590779413050386 │
@@ -484,7 +578,7 @@ Generates a string of the specified length filled with random bytes (including z
 
 **Syntax**
 
-``` sql
+```sql
 randomString(length)
 ```
 
@@ -502,13 +596,13 @@ Type: [String](../../sql-reference/data-types/string.md).
 
 Query:
 
-``` sql
+```sql
 SELECT randomString(30) AS str, length(str) AS len FROM numbers(2) FORMAT Vertical;
 ```
 
 Result:
 
-``` text
+```text
 Row 1:
 ──────
 str: 3 G  :   pT ?w Ñ‚i  k aV f6
@@ -526,7 +620,7 @@ Generates a binary string of the specified length filled with random bytes (incl
 
 **Syntax**
 
-``` sql
+```sql
 randomFixedString(length);
 ```
 
@@ -563,7 +657,7 @@ If you pass `length < 0`, the behavior of the function is undefined.
 
 **Syntax**
 
-``` sql
+```sql
 randomPrintableASCII(length)
 ```
 
@@ -579,11 +673,11 @@ Type: [String](../../sql-reference/data-types/string.md)
 
 **Example**
 
-``` sql
+```sql
 SELECT number, randomPrintableASCII(30) as str, length(str) FROM system.numbers LIMIT 3
 ```
 
-``` text
+```text
 ┌─number─┬─str────────────────────────────┬─length(randomPrintableASCII(30))─�
 │      0 │ SuiCOSTvC0csfABSw=UcSzp2.`rv8x │                               30 │
 │      1 │ 1Ag NlJ &RCN:*>HVPG;PE-nO"SUFD │                               30 │
@@ -597,7 +691,7 @@ Generates a random string of a specified length. Result string contains valid UT
 
 **Syntax**
 
-``` sql
+```sql
 randomStringUTF8(length);
 ```
 
@@ -635,11 +729,12 @@ Flips the bits of String or FixedString `s`, each with probability `prob`.
 
 **Syntax**
 
-``` sql
+```sql
 fuzzBits(s, prob)
 ```
 
 **Arguments**
+
 - `s` - `String` or `FixedString`,
 - `prob` - constant `Float32/64` between 0.0 and 1.0.
 
@@ -649,14 +744,14 @@ Fuzzed string with same type as `s`.
 
 **Example**
 
-``` sql
+```sql
 SELECT fuzzBits(materialize('abacaba'), 0.1)
 FROM numbers(3)
 ```
 
 Result:
 
-``` result
+```result
 ┌─fuzzBits(materialize('abacaba'), 0.1)─�
 │ abaaaja                               │
 │ a*cjab+                               │
diff --git a/docs/en/sql-reference/functions/string-functions.md b/docs/en/sql-reference/functions/string-functions.md
index a2f1b0d7752..d4df3e0479a 100644
--- a/docs/en/sql-reference/functions/string-functions.md
+++ b/docs/en/sql-reference/functions/string-functions.md
@@ -4,6 +4,8 @@ sidebar_position: 170
 sidebar_label: Strings
 ---
 
+import VersionBadge from '@theme/badges/VersionBadge';
+
 # Functions for Working with Strings
 
 Functions for [searching](string-search-functions.md) in strings and for [replacing](string-replace-functions.md) in strings are described separately.
@@ -97,7 +99,7 @@ Alias: `OCTET_LENGTH`
 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.
 
 Alias:
-- `CHAR_LENGTH``
+- `CHAR_LENGTH`
 - `CHARACTER_LENGTH`
 
 ## leftPad
@@ -258,8 +260,36 @@ Alias: `lcase`
 
 Converts the ASCII Latin symbols in a string to uppercase.
 
+**Syntax**
+
+``` sql
+upper(input)
+```
+
 Alias: `ucase`
 
+**Parameters**
+
+- `input`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+
+**Returned value**
+
+- A [String](/docs/en/sql-reference/data-types/string.md) data type value.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT upper('value') as Upper;
+```
+
+``` response
+┌─Upper─�
+│ VALUE │
+└───────┘
+```
+
 ## lowerUTF8
 
 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.
@@ -276,6 +306,34 @@ Does not detect the language, e.g. for Turkish the result might not be exactly c
 
 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.
 
+**Syntax**
+
+``` sql
+upperUTF8(input)
+```
+
+**Parameters**
+
+- `input`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+
+**Returned value**
+
+- A [String](/docs/en/sql-reference/data-types/string.md) data type value.
+
+**Example**
+
+Query:
+
+``` sql
+SELECT upperUTF8('München') as Upperutf8;
+```
+
+``` response
+┌─Upperutf8─�
+│ MÜNCHEN   │
+└───────────┘
+```
+
 ## isValidUTF8
 
 Returns 1, if the set of bytes constitutes valid UTF-8-encoded text, otherwise 0.
@@ -515,7 +573,7 @@ Alias: `concat_ws`
 **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).
+- exprN — expression to be concatenated. Arguments which are not of types [String](../../sql-reference/data-types/string.md) or [FixedString](../../sql-reference/data-types/fixedstring.md) are converted to strings using their default serialization. As this decreases performance, it is not recommended to use non-String/FixedString arguments.
 
 **Returned values**
 
@@ -556,6 +614,7 @@ substring(s, offset[, length])
 Alias:
 - `substr`
 - `mid`
+- `byteSlice`
 
 **Arguments**
 
@@ -585,8 +644,41 @@ Result:
 
 ## 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.
+Returns the substring of a string `s` which starts at the specified byte index `offset` for Unicode code points. Byte counting starts from `1`. If `offset` is `0`, an empty string is returned. If `offset` is negative, the substring starts `pos` characters from the end of the string, rather than from the beginning. An optional argument `length` specifies the maximum number of bytes the returned substring may have.
 
+Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+**Syntax**
+
+```sql
+substringUTF8(s, offset[, length])
+```
+
+**Arguments**
+
+- `s`: The string to calculate a substring from. [String](../../sql-reference/data-types/string.md), [FixedString](../../sql-reference/data-types/fixedstring.md) or [Enum](../../sql-reference/data-types/enum.md)
+- `offset`: The starting position of the substring in `s` . [(U)Int*](../../sql-reference/data-types/int-uint.md).
+- `length`: The maximum length of the substring. [(U)Int*](../../sql-reference/data-types/int-uint.md). Optional.
+
+**Returned value**
+
+A substring of `s` with `length` many bytes, starting at index `offset`.
+
+**Implementation details**
+
+Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+**Example**
+
+```sql
+SELECT 'Täglich grüßt das Murmeltier.' AS str,
+       substringUTF8(str, 9),
+       substringUTF8(str, 9, 5)
+```
+
+```response
+Täglich grüßt das Murmeltier.	grüßt das Murmeltier.	grüßt
+```
 
 ## substringIndex
 
@@ -621,7 +713,39 @@ Result:
 
 ## substringIndexUTF8
 
-Like `substringIndex` 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.
+Returns the substring of `s` before `count` occurrences of the delimiter `delim`, specifically 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.
+
+**Syntax**
+
+```sql
+substringIndexUTF8(s, delim, count)
+```
+
+**Arguments**
+
+- `s`: The string to extract substring from. [String](../../sql-reference/data-types/string.md).
+- `delim`: The character to split. [String](../../sql-reference/data-types/string.md).
+- `count`: The number of occurrences of the delimiter to count before extracting the substring. If count is positive, everything to the left of the final delimiter (counting from the left) is returned. If count is negative, everything to the right of the final delimiter (counting from the right) is returned. [UInt or Int](../data-types/int-uint.md)
+
+**Returned value**
+
+A substring [String](../../sql-reference/data-types/string.md) of `s` before `count` occurrences of `delim`.
+
+**Implementation details**
+
+Assumes that the string contains valid UTF-8 encoded text. If this assumption is violated, no exception is thrown and the result is undefined.
+
+**Example**
+
+```sql
+SELECT substringIndexUTF8('www.straßen-in-europa.de', '.', 2)
+```
+
+```response
+www.straßen-in-europa
+```
 
 ## appendTrailingCharIfAbsent
 
@@ -783,6 +907,8 @@ SELECT startsWith('Spider-Man', 'Spi');
 
 ## startsWithUTF8
 
+<VersionBadge minVersion='23.8' />
+
 Returns whether string `str` starts with `prefix`, the difference between `startsWithUTF8` and `startsWith` is that `startsWithUTF8` match `str` and `suffix` by UTF-8 characters.
 
 
diff --git a/docs/en/sql-reference/functions/string-replace-functions.md b/docs/en/sql-reference/functions/string-replace-functions.md
index c7bd16cad4a..60fe286de25 100644
--- a/docs/en/sql-reference/functions/string-replace-functions.md
+++ b/docs/en/sql-reference/functions/string-replace-functions.md
@@ -193,3 +193,33 @@ Result:
 ## translateUTF8
 
 Like [translate](#translate) but assumes `s`, `from` and `to` are UTF-8 encoded strings.
+
+**Syntax**
+
+``` sql
+translateUTF8(s, from, to)
+```
+
+**Parameters**
+
+- `s`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+- `from`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+- `to`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+
+**Returned value**
+
+- `s`: A string type [String](/docs/en/sql-reference/data-types/string.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT translateUTF8('Münchener Straße', 'üß', 'us') AS res;
+```
+
+``` response
+┌─res──────────────�
+│ Munchener Strase │
+└──────────────────┘
+```
diff --git a/docs/en/sql-reference/functions/string-search-functions.md b/docs/en/sql-reference/functions/string-search-functions.md
index d5dbca3f2b7..f7e56e73520 100644
--- a/docs/en/sql-reference/functions/string-search-functions.md
+++ b/docs/en/sql-reference/functions/string-search-functions.md
@@ -6,14 +6,17 @@ sidebar_label: Searching in Strings
 
 # Functions for Searching in Strings
 
-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.
+All functions in this section search case-sensitively by default. Case-insensitive search is usually provided by separate function variants.
 
-Functions in this section also assume that the searched string and the search string are single-byte encoded text. If this assumption is
+:::note
+Case-insensitive search follows the lowercase-uppercase rules of the English language. E.g. Uppercased `i` in the English language is
+`I` whereas in the Turkish language it is `Ä°` - results for languages other than English may be unexpected.
+:::
+
+Functions in this section also assume that the searched string (referred to in this section as `haystack`) and the search string (referred to in this section as `needle`) 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
+results are undefined. Note that no automatic Unicode normalization is performed, however you can use the
 [normalizeUTF8*()](https://clickhouse.com/docs/en/sql-reference/functions/string-functions/) functions for that.
 
 [General strings functions](string-functions.md) and [functions for replacing in strings](string-replace-functions.md) are described separately.
@@ -30,7 +33,6 @@ position(haystack, needle[, start_pos])
 
 Alias:
 - `position(needle IN haystack)`
-- `locate(haystack, needle[, start_pos])`.
 
 **Arguments**
 
@@ -49,12 +51,14 @@ If substring `needle` is empty, these rules apply:
 - 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`
+The same rules also apply to functions `locate`, `positionCaseInsensitive`, `positionUTF8` and `positionCaseInsensitiveUTF8`.
 
 Type: `Integer`.
 
 **Examples**
 
+Query:
+
 ``` sql
 SELECT position('Hello, world!', '!');
 ```
@@ -69,12 +73,16 @@ Result:
 
 Example with `start_pos` argument:
 
+Query:
+
 ``` sql
 SELECT
     position('Hello, world!', 'o', 1),
     position('Hello, world!', 'o', 7)
 ```
 
+Result:
+
 ``` text
 ┌─position('Hello, world!', 'o', 1)─┬─position('Hello, world!', 'o', 7)─�
 │                                 5 │                                 9 │
@@ -83,6 +91,8 @@ SELECT
 
 Example for `needle IN haystack` syntax:
 
+Query:
+
 ```sql
 SELECT 6 = position('/' IN s) FROM (SELECT 'Hello/World' AS s);
 ```
@@ -97,6 +107,8 @@ Result:
 
 Examples with empty `needle` substring:
 
+Query:
+
 ``` sql
 SELECT
     position('abc', ''),
@@ -108,15 +120,48 @@ SELECT
     position('abc', '', 5)
 ```
 
+Result:
+
 ``` text
 ┌─position('abc', '')─┬─position('abc', '', 0)─┬─position('abc', '', 1)─┬─position('abc', '', 2)─┬─position('abc', '', 3)─┬─position('abc', '', 4)─┬─position('abc', '', 5)─�
 │                   1 │                      1 │                      1 │                      2 │                      3 │                      4 │                      0 │
 └─────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┘
 ```
 
+## locate
+
+Like [position](#position) but with arguments `haystack` and `locate` switched.
+
+The behavior of this function depends on the ClickHouse version:
+- in versions < v24.3, `locate` was an alias of function `position` and accepted arguments `(haystack, needle[, start_pos])`.
+- in versions >= 24.3,, `locate` is an individual function (for better compatibility with MySQL) and accepts arguments `(needle, haystack[, start_pos])`. The previous behavior
+  can be restored using setting [function_locate_has_mysql_compatible_argument_order = false](../../operations/settings/settings.md#function-locate-has-mysql-compatible-argument-order);
+
+**Syntax**
+
+``` sql
+locate(needle, haystack[, start_pos])
+```
+
 ## positionCaseInsensitive
 
-Like [position](#position) but searches case-insensitively.
+A case insensitive invariant of [position](#position).
+
+**Example**
+
+Query:
+
+``` sql
+SELECT position('Hello, world!', 'hello');
+```
+
+Result:
+
+``` text
+┌─position('Hello, world!', 'hello')─�
+│                                  0 │
+└────────────────────────────────────┘
+```
 
 ## positionUTF8
 
@@ -126,6 +171,8 @@ Like [position](#position) but assumes `haystack` and `needle` are UTF-8 encoded
 
 Function `positionUTF8` correctly counts character `ö` (represented by two points) as a single Unicode codepoint:
 
+Query:
+
 ``` sql
 SELECT positionUTF8('Motörhead', 'r');
 ```
@@ -159,14 +206,17 @@ multiSearchAllPositions(haystack, [needle1, needle2, ..., needleN])
 **Arguments**
 
 - `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
-- `needle` — Substrings to be searched. Array
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
 
 **Returned values**
 
-- Array of the starting position in bytes and counting from 1 (if the substring was found) or 0 (if the substring was not found)
+- Array of the starting position in bytes and counting from 1, if the substring was found.
+- 0, if the substring was not found.
 
 **Example**
 
+Query:
+
 ``` sql
 SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world']);
 ```
@@ -178,45 +228,535 @@ Result:
 │ [0,13,0]                                                          │
 └───────────────────────────────────────────────────────────────────┘
 ```
+## multiSearchAllPositionsCaseInsensitive
 
-## multiSearchAllPositionsUTF8
-
-Like [multiSearchAllPositions](#multiSearchAllPositions) but assumes `haystack` and the `needle`-s are UTF-8 encoded strings.
-
-## multiSearchFirstPosition
-
-Like `position` but returns the leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
-
-Functions `multiSearchFirstPositionCaseInsensitive`, `multiSearchFirstPositionUTF8` and `multiSearchFirstPositionCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
+Like [multiSearchAllPositions](#multisearchallpositions) but ignores case.
 
 **Syntax**
 
 ```sql
-multiSearchFirstPosition(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+multiSearchAllPositionsCaseInsensitive(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Array of the starting position in bytes and counting from 1 (if the substring was found).
+- 0 if the substring was not found.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchAllPositionsCaseInsensitive('ClickHouse',['c','h']);
+```
+
+Result:
+
+```response
+["1","6"]
+```
+
+## multiSearchAllPositionsUTF8
+
+Like [multiSearchAllPositions](#multiSearchAllPositions) but assumes `haystack` and the `needle` substrings are UTF-8 encoded strings.
+
+**Syntax**
+
+```sql
+multiSearchAllPositionsUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 encoded string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — UTF-8 encoded substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Array of the starting position in bytes and counting from 1 (if the substring was found).
+- 0 if the substring was not found.
+
+**Example**
+
+Given `ClickHouse` as a UTF-8 string, find the positions of `C` (`\x43`) and `H` (`\x48`).
+
+Query:
+
+```sql
+SELECT multiSearchAllPositionsUTF8('\x43\x6c\x69\x63\x6b\x48\x6f\x75\x73\x65',['\x43','\x48']);
+```
+
+Result:
+
+```response
+["1","6"]
+```
+
+## multiSearchAllPositionsCaseInsensitiveUTF8
+
+Like [multiSearchAllPositionsUTF8](#multisearchallpositionsutf8) but ignores case.
+
+**Syntax**
+
+```sql
+multiSearchAllPositionsCaseInsensitiveUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 encoded string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — UTF-8 encoded substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Array of the starting position in bytes and counting from 1 (if the substring was found).
+- 0 if the substring was not found.
+
+**Example**
+
+Given `ClickHouse` as a UTF-8 string, find the positions of `c` (`\x63`) and `h` (`\x68`).
+
+Query:
+
+```sql
+SELECT multiSearchAllPositionsCaseInsensitiveUTF8('\x43\x6c\x69\x63\x6b\x48\x6f\x75\x73\x65',['\x63','\x68']);
+```
+
+Result:
+
+```response
+["1","6"]
+```
+
+## multiSearchFirstPosition
+
+Like [`position`](#position) but returns the leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
+
+Functions [`multiSearchFirstPositionCaseInsensitive`](#multiSearchFirstPositionCaseInsensitive), [`multiSearchFirstPositionUTF8`](#multiSearchFirstPositionUTF8) and [`multiSearchFirstPositionCaseInsensitiveUTF8`](#multiSearchFirstPositionCaseInsensitiveUTF8) provide case-insensitive and/or UTF-8 variants of this function.
+
+**Syntax**
+
+```sql
+multiSearchFirstPosition(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` —  Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
+- 0, if there was no match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchFirstPosition('Hello World',['llo', 'Wor', 'ld']);
+```
+
+Result:
+
+```response
+3
+```
+
+## multiSearchFirstPositionCaseInsensitive
+
+Like [`multiSearchFirstPosition`](#multiSearchFirstPosition) but ignores case.
+
+**Syntax**
+
+```sql
+multiSearchFirstPositionCaseInsensitive(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Array of substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
+- 0, if there was no match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchFirstPositionCaseInsensitive('HELLO WORLD',['wor', 'ld', 'ello']);
+```
+
+Result:
+
+```response
+2
+```
+
+## multiSearchFirstPositionUTF8
+
+Like [`multiSearchFirstPosition`](#multiSearchFirstPosition) but assumes `haystack` and `needle` to be UTF-8 strings.
+
+**Syntax**
+
+```sql
+multiSearchFirstPositionUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Array of UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- Leftmost offset in a `haystack` string which matches any of multiple `needle` strings.
+- 0, if there was no match.
+
+**Example**
+
+Find the leftmost offset in UTF-8 string `hello world` which matches any of the given needles.
+
+Query:
+
+```sql
+SELECT multiSearchFirstPositionUTF8('\x68\x65\x6c\x6c\x6f\x20\x77\x6f\x72\x6c\x64',['wor', 'ld', 'ello']);
+```
+
+Result:
+
+```response
+2
+```
+
+## multiSearchFirstPositionCaseInsensitiveUTF8
+
+Like [`multiSearchFirstPosition`](#multiSearchFirstPosition) but assumes `haystack` and `needle` to be UTF-8 strings and ignores case.
+
+**Syntax**
+
+```sql
+multiSearchFirstPositionCaseInsensitiveUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Array of UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md)
+
+**Returned value**
+
+- Leftmost offset in a `haystack` string which matches any of multiple `needle` strings, ignoring case.
+- 0, if there was no match.
+
+**Example**
+
+Find the leftmost offset in UTF-8 string `HELLO WORLD` which matches any of the given needles.
+
+Query:
+
+```sql
+SELECT multiSearchFirstPositionCaseInsensitiveUTF8('\x48\x45\x4c\x4c\x4f\x20\x57\x4f\x52\x4c\x44',['wor', 'ld', 'ello']);
+```
+
+Result:
+
+```response
+2
 ```
 
 ## multiSearchFirstIndex
 
 Returns the index `i` (starting from 1) of the leftmost found needle<sub>i</sub> in the string `haystack` and 0 otherwise.
 
-Functions `multiSearchFirstIndexCaseInsensitive`, `multiSearchFirstIndexUTF8` and `multiSearchFirstIndexCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
+Functions [`multiSearchFirstIndexCaseInsensitive`](#multiSearchFirstIndexCaseInsensitive), [`multiSearchFirstIndexUTF8`](#multiSearchFirstIndexUTF8) and [`multiSearchFirstIndexCaseInsensitiveUTF8`](#multiSearchFirstIndexCaseInsensitiveUTF8) provide case-insensitive and/or UTF-8 variants of this function.
 
 **Syntax**
 
 ```sql
-multiSearchFirstIndex(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+multiSearchFirstIndex(haystack, [needle1, needle2, ..., needleN])
+```
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- index (starting from 1) of the leftmost found needle.
+- 0, if there was no match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchFirstIndex('Hello World',['World','Hello']);
 ```
 
-## multiSearchAny {#multisearchany}
+Result:
+
+```response
+1
+```
+
+## multiSearchFirstIndexCaseInsensitive
+
+Returns the index `i` (starting from 1) of the leftmost found needle<sub>i</sub> in the string `haystack` and 0 otherwise. Ignores case.
+
+**Syntax**
+
+```sql
+multiSearchFirstIndexCaseInsensitive(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- index (starting from 1) of the leftmost found needle.
+- 0, if there was no match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchFirstIndexCaseInsensitive('hElLo WoRlD',['World','Hello']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchFirstIndexUTF8
+
+Returns the index `i` (starting from 1) of the leftmost found needle<sub>i</sub> in the string `haystack` and 0 otherwise. Assumes `haystack` and `needle` are UTF-8 encoded strings.
+
+**Syntax**
+
+```sql
+multiSearchFirstIndexUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Array of UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md)
+
+**Returned value**
+
+- index (starting from 1) of the leftmost found needle.
+- 0, if there was no match.
+
+**Example**
+
+Given `Hello World` as a UTF-8 string, find the first index of UTF-8 strings `Hello` and `World`.
+
+Query:
+
+```sql
+SELECT multiSearchFirstIndexUTF8('\x48\x65\x6c\x6c\x6f\x20\x57\x6f\x72\x6c\x64',['\x57\x6f\x72\x6c\x64','\x48\x65\x6c\x6c\x6f']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchFirstIndexCaseInsensitiveUTF8
+
+Returns the index `i` (starting from 1) of the leftmost found needle<sub>i</sub> in the string `haystack` and 0 otherwise. Assumes `haystack` and `needle` are UTF-8 encoded strings. Ignores case.
+
+**Syntax**
+
+```sql
+multiSearchFirstIndexCaseInsensitiveUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Array of UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- index (starting from 1) of the leftmost found needle.
+- 0, if there was no match.
+
+**Example**
+
+Given `HELLO WORLD` as a UTF-8 string, find the first index of UTF-8 strings `hello` and `world`.
+
+Query:
+
+```sql
+SELECT multiSearchFirstIndexCaseInsensitiveUTF8('\x48\x45\x4c\x4c\x4f\x20\x57\x4f\x52\x4c\x44',['\x68\x65\x6c\x6c\x6f','\x77\x6f\x72\x6c\x64']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchAny
 
 Returns 1, if at least one string needle<sub>i</sub> matches the string `haystack` and 0 otherwise.
 
-Functions `multiSearchAnyCaseInsensitive`, `multiSearchAnyUTF8` and `multiSearchAnyCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
+Functions [`multiSearchAnyCaseInsensitive`](#multiSearchAnyCaseInsensitive), [`multiSearchAnyUTF8`](#multiSearchAnyUTF8) and []`multiSearchAnyCaseInsensitiveUTF8`](#multiSearchAnyCaseInsensitiveUTF8) provide case-insensitive and/or UTF-8 variants of this function.
 
 **Syntax**
 
 ```sql
-multiSearchAny(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+multiSearchAny(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- 1, if there was at least one match.
+- 0, if there was not at least one match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchAny('ClickHouse',['C','H']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchAnyCaseInsensitive
+
+Like [multiSearchAny](#multisearchany) but ignores case.
+
+**Syntax**
+
+```sql
+multiSearchAnyCaseInsensitive(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Substrings to be searched. [Array](../../sql-reference/data-types/array.md)
+
+**Returned value**
+
+- 1, if there was at least one case-insensitive match.
+- 0, if there was not at least one case-insensitive match.
+
+**Example**
+
+Query:
+
+```sql
+SELECT multiSearchAnyCaseInsensitive('ClickHouse',['c','h']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchAnyUTF8
+
+Like [multiSearchAny](#multisearchany) but assumes `haystack` and the `needle` substrings are UTF-8 encoded strings.
+
+*Syntax**
+
+```sql
+multiSearchAnyUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md).
+
+**Returned value**
+
+- 1, if there was at least one match.
+- 0, if there was not at least one match.
+
+**Example**
+
+Given `ClickHouse` as a UTF-8 string, check if there are any `C` ('\x43') or `H` ('\x48') letters in the word.
+
+Query:
+
+```sql
+SELECT multiSearchAnyUTF8('\x43\x6c\x69\x63\x6b\x48\x6f\x75\x73\x65',['\x43','\x48']);
+```
+
+Result:
+
+```response
+1
+```
+
+## multiSearchAnyCaseInsensitiveUTF8
+
+Like [multiSearchAnyUTF8](#multiSearchAnyUTF8) but ignores case.
+
+*Syntax**
+
+```sql
+multiSearchAnyCaseInsensitiveUTF8(haystack, [needle1, needle2, ..., needleN])
+```
+
+**Parameters**
+
+- `haystack` — UTF-8 string in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — UTF-8 substrings to be searched. [Array](../../sql-reference/data-types/array.md)
+
+**Returned value**
+
+- 1, if there was at least one case-insensitive match.
+- 0, if there was not at least one case-insensitive match.
+
+**Example**
+
+Given `ClickHouse` as a UTF-8 string, check if there is any letter `h`(`\x68`) in the word, ignoring case.
+
+Query:
+
+```sql
+SELECT multiSearchAnyCaseInsensitiveUTF8('\x43\x6c\x69\x63\x6b\x48\x6f\x75\x73\x65',['\x68']);
+```
+
+Result:
+
+```response
+1
 ```
 
 ## match {#match}
@@ -465,9 +1005,9 @@ 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.
+Calculates the 4-gram distance between a `haystack` string and a `needle` string. For this, it counts the symmetric difference between two multisets of 4-grams and normalizes it by the sum of their cardinalities. Returns a [Float32](../../sql-reference/data-types/float.md/#float32-float64) between 0 and 1. The smaller the result is, the more similar the strings are to each other.
 
-Functions `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
+Functions [`ngramDistanceCaseInsensitive`](#ngramdistancecaseinsensitive), [`ngramDistanceUTF8`](#ngramdistanceutf8), [`ngramDistanceCaseInsensitiveUTF8`](#ngramdistancecaseinsensitiveutf8) provide case-insensitive and/or UTF-8 variants of this function.
 
 **Syntax**
 
@@ -475,15 +1015,170 @@ Functions `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseIns
 ngramDistance(haystack, needle)
 ```
 
+**Parameters**
+
+- `haystack`: First comparison string. [String literal](../syntax#string)
+- `needle`: Second comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the similarity between the two strings. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+**Implementation details**
+
+This function will throw an exception if constant `needle` or `haystack` arguments are more than 32Kb in size. If any non-constant `haystack` or `needle` arguments are more than 32Kb in size, then the distance is always 1.
+
+**Examples**
+
+The more similar two strings are to each other, the closer the result will be to 0 (identical).
+
+Query:
+
+```sql
+SELECT ngramDistance('ClickHouse','ClickHouse!');
+```
+
+Result:
+
+```response
+0.06666667
+```
+
+The less similar two strings are to each, the larger the result will be.
+
+
+Query:
+
+```sql
+SELECT ngramDistance('ClickHouse','House');
+```
+
+Result:
+
+```response
+0.5555556
+```
+
+## ngramDistanceCaseInsensitive
+
+Provides a case-insensitive variant of [ngramDistance](#ngramdistance).
+
+**Syntax**
+
+```sql
+ngramDistanceCaseInsensitive(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First comparison string. [String literal](../syntax#string)
+- `needle`: Second comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the similarity between the two strings. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+**Examples**
+
+With [ngramDistance](#ngramdistance) differences in case will affect the similarity value:
+
+Query:
+
+```sql
+SELECT ngramDistance('ClickHouse','clickhouse');
+```
+
+Result:
+
+```response
+0.71428573
+```
+
+With [ngramDistanceCaseInsensitive](#ngramdistancecaseinsensitive) case is ignored so two identical strings differing only in case will now return a low similarity value:
+
+Query:
+
+```sql
+SELECT ngramDistanceCaseInsensitive('ClickHouse','clickhouse');
+```
+
+Result:
+
+```response
+0
+```
+
+## ngramDistanceUTF8
+
+Provides a UTF-8 variant of [ngramDistance](#ngramdistance). Assumes that `needle` and `haystack` strings are UTF-8 encoded strings.
+
+**Syntax**
+
+```sql
+ngramDistanceUTF8(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First UTF-8 encoded comparison string. [String literal](../syntax#string)
+- `needle`: Second UTF-8 encoded comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the similarity between the two strings. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramDistanceUTF8('abcde','cde');
+```
+
+Result:
+
+```response
+0.5
+```
+
+## ngramDistanceCaseInsensitiveUTF8
+
+Provides a case-insensitive variant of [ngramDistanceUTF8](#ngramdistanceutf8).
+
+**Syntax**
+
+```sql
+ngramDistanceCaseInsensitiveUTF8(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First UTF-8 encoded comparison string. [String literal](../syntax#string)
+- `needle`: Second UTF-8 encoded comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the similarity between the two strings. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramDistanceCaseInsensitiveUTF8('abcde','CDE');
+```
+
+Result:
+
+```response
+0.5
+```
+
 ## ngramSearch
 
-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`.
+Like `ngramDistance` but calculates the non-symmetric difference between a `needle` string and a `haystack` string, i.e. the number of n-grams from the needle minus the common number of n-grams normalized by the number of `needle` n-grams. Returns a [Float32](../../sql-reference/data-types/float.md/#float32-float64) 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`](../../sql-reference/functions/string-functions#soundex).
 
-Functions `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8` provide case-insensitive and/or UTF-8 variants of this function.
-
-:::note
-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.
-:::
+Functions [`ngramSearchCaseInsensitive`](#ngramsearchcaseinsensitive), [`ngramSearchUTF8`](#ngramsearchutf8), [`ngramSearchCaseInsensitiveUTF8`](#ngramsearchcaseinsensitiveutf8) provide case-insensitive and/or UTF-8 variants of this function.
 
 **Syntax**
 
@@ -491,6 +1186,140 @@ The UTF-8 variants use the 3-gram distance. These are not perfectly fair n-gram
 ngramSearch(haystack, needle)
 ```
 
+**Parameters**
+
+- `haystack`: First comparison string. [String literal](../syntax#string)
+- `needle`: Second comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the likelihood of the `needle` being in the `haystack`. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+**Implementation details**
+
+:::note
+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.
+:::
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramSearch('Hello World','World Hello');
+```
+
+Result:
+
+```response
+0.5
+```
+
+## ngramSearchCaseInsensitive
+
+Provides a case-insensitive variant of [ngramSearch](#ngramSearch).
+
+**Syntax**
+
+```sql
+ngramSearchCaseInsensitive(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First comparison string. [String literal](../syntax#string)
+- `needle`: Second comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the likelihood of the `needle` being in the `haystack`. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+The bigger the result is, the more likely `needle` is in the `haystack`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramSearchCaseInsensitive('Hello World','hello');
+```
+
+Result:
+
+```response
+1
+```
+
+## ngramSearchUTF8
+
+Provides a UTF-8 variant of [ngramSearch](#ngramsearch) in which `needle` and `haystack` are assumed to be UTF-8 encoded strings.
+
+**Syntax**
+
+```sql
+ngramSearchUTF8(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First UTF-8 encoded comparison string. [String literal](../syntax#string)
+- `needle`: Second UTF-8 encoded comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the likelihood of the `needle` being in the `haystack`. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+The bigger the result is, the more likely `needle` is in the `haystack`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramSearchUTF8('абвгдеёжз', 'гдеёзд');
+```
+
+Result:
+
+```response
+0.5
+```
+
+## ngramSearchCaseInsensitiveUTF8
+
+Provides a case-insensitive variant of [ngramSearchUTF8](#ngramsearchutf8) in which `needle` and `haystack`.
+
+**Syntax**
+
+```sql
+ngramSearchCaseInsensitiveUTF8(haystack, needle)
+```
+
+**Parameters**
+
+- `haystack`: First UTF-8 encoded comparison string. [String literal](../syntax#string)
+- `needle`: Second UTF-8 encoded comparison string. [String literal](../syntax#string)
+
+**Returned value**
+
+- Value between 0 and 1 representing the likelihood of the `needle` being in the `haystack`. [Float32](../../sql-reference/data-types/float.md/#float32-float64)
+
+The bigger the result is, the more likely `needle` is in the `haystack`.
+
+**Example**
+
+Query:
+
+```sql
+SELECT ngramSearchCaseInsensitiveUTF8('абвГДЕёжз', '�бвгдЕ�жз');
+```
+
+Result:
+
+```response
+0.57142854
+```
+
 ## countSubstrings
 
 Returns how often substring `needle` occurs in string `haystack`.
@@ -590,9 +1419,13 @@ Result:
 └───────────────────────────────┘
 ```
 
+## countMatchesCaseInsensitive
+
+Like `countMatches(haystack, pattern)` but matching ignores the case.
+
 ## regexpExtract
 
-Extracts the first string in haystack that matches the regexp pattern and corresponds to the regex group index.
+Extracts the first string in `haystack` that matches the regexp pattern and corresponds to the regex group index.
 
 **Syntax**
 
@@ -634,7 +1467,7 @@ Result:
 
 ## hasSubsequence
 
-Returns 1 if needle is a subsequence of haystack, or 0 otherwise.
+Returns 1 if `needle` is a subsequence of `haystack`, or 0 otherwise.
 A subsequence of a string is a sequence that can be derived from the given string by deleting zero or more elements without changing the order of the remaining elements.
 
 
@@ -658,8 +1491,10 @@ Type: `UInt8`.
 
 **Examples**
 
+Query:
+
 ``` sql
-SELECT hasSubsequence('garbage', 'arg') ;
+SELECT hasSubsequence('garbage', 'arg');
 ```
 
 Result:
@@ -674,10 +1509,263 @@ Result:
 
 Like [hasSubsequence](#hasSubsequence) but searches case-insensitively.
 
+**Syntax**
+
+``` sql
+hasSubsequenceCaseInsensitive(haystack, needle)
+```
+
+**Arguments**
+
+- `haystack` — String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Subsequence to be searched. [String](../../sql-reference/syntax.md#syntax-string-literal).
+
+**Returned values**
+
+- 1, if needle is a subsequence of haystack.
+- 0, otherwise.
+
+Type: `UInt8`.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT hasSubsequenceCaseInsensitive('garbage', 'ARG');
+```
+
+Result:
+
+``` text
+┌─hasSubsequenceCaseInsensitive('garbage', 'ARG')─�
+│                                               1 │
+└─────────────────────────────────────────────────┘
+```
+
 ## hasSubsequenceUTF8
 
 Like [hasSubsequence](#hasSubsequence) but assumes `haystack` and `needle` are UTF-8 encoded strings.
 
+**Syntax**
+
+``` sql
+hasSubsequenceUTF8(haystack, needle)
+```
+
+**Arguments**
+
+- `haystack` — String in which the search is performed. UTF-8 encoded [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Subsequence to be searched. UTF-8 encoded [String](../../sql-reference/syntax.md#syntax-string-literal).
+
+**Returned values**
+
+- 1, if needle is a subsequence of haystack.
+- 0, otherwise.
+
+Type: `UInt8`.
+
+Query:
+
+**Examples**
+
+``` sql
+select hasSubsequenceUTF8('ClickHouse - �толбцова� �и�тема управлени� базами данных', '�и�тема');
+```
+
+Result:
+
+``` text
+┌─hasSubsequenceUTF8('ClickHouse - �толбцова� �и�тема управлени� базами данных', '�и�тема')─�
+│                                                                                         1 │
+└───────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
 ## hasSubsequenceCaseInsensitiveUTF8
 
 Like [hasSubsequenceUTF8](#hasSubsequenceUTF8) but searches case-insensitively.
+
+**Syntax**
+
+``` sql
+hasSubsequenceCaseInsensitiveUTF8(haystack, needle)
+```
+
+**Arguments**
+
+- `haystack` — String in which the search is performed. UTF-8 encoded [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — Subsequence to be searched. UTF-8 encoded [String](../../sql-reference/syntax.md#syntax-string-literal).
+
+**Returned values**
+
+- 1, if needle is a subsequence of haystack.
+- 0, otherwise.
+
+Type: `UInt8`.
+
+**Examples**
+
+Query:
+
+``` sql
+select hasSubsequenceCaseInsensitiveUTF8('ClickHouse - �толбцова� �и�тема управлени� базами данных', 'СИСТЕМ�');
+```
+
+Result:
+
+``` text
+┌─hasSubsequenceCaseInsensitiveUTF8('ClickHouse - �толбцова� �и�тема управлени� базами данных', 'СИСТЕМ�')─�
+│                                                                                                        1 │
+└──────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## hasToken
+
+Returns 1 if a given token is present in a haystack, or 0 otherwise.
+
+**Syntax**
+
+```sql
+hasToken(haystack, token)
+```
+
+**Parameters**
+
+- `haystack`: String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `token`: Maximal length substring between two non alphanumeric ASCII characters (or boundaries of haystack).
+
+**Returned value**
+
+- 1, if the token is present in the haystack.
+- 0, if the token is not present.
+
+**Implementation details**
+
+Token must be a constant string. Supported by tokenbf_v1 index specialization.
+
+**Example**
+
+Query:
+
+```sql
+SELECT hasToken('Hello World','Hello');
+```
+
+```response
+1
+```
+
+## hasTokenOrNull
+
+Returns 1 if a given token is present, 0 if not present, and null if the token is ill-formed.
+
+**Syntax**
+
+```sql
+hasTokenOrNull(haystack, token)
+```
+
+**Parameters**
+
+- `haystack`: String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `token`: Maximal length substring between two non alphanumeric ASCII characters (or boundaries of haystack).
+
+**Returned value**
+
+- 1, if the token is present in the haystack.
+- 0, if the token is not present in the haystack.
+- null, if the token is ill-formed.
+
+**Implementation details**
+
+Token must be a constant string. Supported by tokenbf_v1 index specialization.
+
+**Example**
+
+Where `hasToken` would throw an error for an ill-formed token, `hasTokenOrNull` returns `null` for an ill-formed token.
+
+Query:
+
+```sql
+SELECT hasTokenOrNull('Hello World','Hello,World');
+```
+
+```response
+null
+```
+
+## hasTokenCaseInsensitive
+
+Returns 1 if a given token is present in a haystack, 0 otherwise. Ignores case.
+
+**Syntax**
+
+```sql
+hasTokenCaseInsensitive(haystack, token)
+```
+
+**Parameters**
+
+- `haystack`: String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `token`: Maximal length substring between two non alphanumeric ASCII characters (or boundaries of haystack).
+
+**Returned value**
+
+- 1, if the token is present in the haystack.
+- 0, otherwise.
+
+**Implementation details**
+
+Token must be a constant string. Supported by tokenbf_v1 index specialization.
+
+**Example**
+
+Query:
+
+```sql
+SELECT hasTokenCaseInsensitive('Hello World','hello');
+```
+
+```response
+1
+```
+
+## hasTokenCaseInsensitiveOrNull
+
+Returns 1 if a given token is present in a haystack, 0 otherwise. Ignores case and returns null if the token is ill-formed.
+
+**Syntax**
+
+```sql
+hasTokenCaseInsensitiveOrNull(haystack, token)
+```
+
+**Parameters**
+
+- `haystack`: String in which the search is performed. [String](../../sql-reference/syntax.md#syntax-string-literal).
+- `token`: Maximal length substring between two non alphanumeric ASCII characters (or boundaries of haystack).
+
+**Returned value**
+
+- 1, if the token is present in the haystack.
+- 0, if token is not present.
+- null, if the token is ill-formed.
+
+**Implementation details**
+
+Token must be a constant string. Supported by tokenbf_v1 index specialization.
+
+**Example**
+
+
+Where `hasTokenCaseInsensitive` would throw an error for an ill-formed token, `hasTokenCaseInsensitiveOrNull` returns `null` for an ill-formed token.
+
+Query:
+
+```sql
+SELECT hasTokenCaseInsensitiveOrNull('Hello World','hello,world');
+```
+
+```response
+null
+```
\ No newline at end of file
diff --git a/docs/en/sql-reference/functions/time-series-functions.md b/docs/en/sql-reference/functions/time-series-functions.md
index 144d832b36a..e80a3fa9860 100644
--- a/docs/en/sql-reference/functions/time-series-functions.md
+++ b/docs/en/sql-reference/functions/time-series-functions.md
@@ -6,11 +6,67 @@ sidebar_label: Time Series
 
 # Time Series Functions
 
-Below functions are used for time series analysis.
+Below functions are used for series data analysis.
+
+## seriesOutliersDetectTukey
+
+Detects outliers in series data using [Tukey Fences](https://en.wikipedia.org/wiki/Outlier#Tukey%27s_fences).
+
+**Syntax**
+
+``` sql
+seriesOutliersDetectTukey(series);
+seriesOutliersDetectTukey(series, min_percentile, max_percentile, K);
+```
+
+**Arguments**
+
+- `series` - An array of numeric values.
+- `min_percentile` - The minimum percentile to be used to calculate inter-quantile range [(IQR)](https://en.wikipedia.org/wiki/Interquartile_range). The value must be in range [0.02,0.98]. The default is 0.25.
+- `max_percentile` - The maximum percentile to be used to calculate inter-quantile range (IQR). The value must be in range [0.02,0.98]. The default is 0.75.
+- `K` - Non-negative constant value to detect mild or stronger outliers. The default value is 1.5.
+
+At least four data points are required in `series` to detect outliers.
+
+**Returned value**
+
+- Returns an array of the same length as the input array where each value represents score of possible anomaly of corresponding element in the series. A non-zero score indicates a possible anomaly.
+
+Type: [Array](../../sql-reference/data-types/array.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4, 5, 12, 45, 12, 3, 3, 4, 5, 6]) AS print_0;
+```
+
+Result:
+
+``` text
+┌───────────print_0─────────────────�
+│[0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0] │
+└───────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6], 0.2, 0.8, 1.5) AS print_0;
+```
+
+Result:
+
+``` text
+┌─print_0──────────────────────────────�
+│ [0,0,0,0,0,0,0,0,0,19.5,0,0,0,0,0,0] │
+└──────────────────────────────────────┘
+```
 
 ## seriesPeriodDetectFFT
 
-Finds the period of the given time series data using FFT
+Finds the period of the given series data data using FFT
 FFT - [Fast Fourier transform](https://en.wikipedia.org/wiki/Fast_Fourier_transform)
 
 **Syntax**
@@ -25,7 +81,7 @@ seriesPeriodDetectFFT(series);
 
 **Returned value**
 
-- A real value equal to the period of time series
+- A real value equal to the period of series data
 - Returns NAN when number of data points are less than four.
 
 Type: [Float64](../../sql-reference/data-types/float.md).
@@ -60,7 +116,7 @@ Result:
 
 ## seriesDecomposeSTL
 
-Decomposes a time series using STL [(Seasonal-Trend Decomposition Procedure Based on Loess)](https://www.wessa.net/download/stl.pdf) into a season, a trend and a residual component. 
+Decomposes a series data using STL [(Seasonal-Trend Decomposition Procedure Based on Loess)](https://www.wessa.net/download/stl.pdf) into a season, a trend and a residual component. 
 
 **Syntax**
 
@@ -77,8 +133,8 @@ The number of data points in `series` should be at least twice the value of `per
 
 **Returned value**
 
-- An array of three arrays where the first array include seasonal components, the second array - trend,
-and the third array - residue component.
+- An array of four arrays where the first array include seasonal components, the second array - trend,
+the third array - residue component, and the fourth array - baseline(seasonal + trend) component.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -107,6 +163,10 @@ Result:
     [
         0, 0.0000019073486, -0.0000019073486, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.0000019073486, 0,
         0
+    ],
+    [
+        10.1, 20.449999, 40.340004, 10.100001, 20.45, 40.34, 10.100001, 20.45, 40.34, 10.1, 20.45, 40.34,
+        10.1, 20.45, 40.34, 10.1, 20.45, 40.34, 10.1, 20.45, 40.34, 10.100002, 20.45, 40.34
     ]]                                                                                                                   │
 └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
diff --git a/docs/en/sql-reference/functions/tuple-functions.md b/docs/en/sql-reference/functions/tuple-functions.md
index 5930239dc56..b3cec1206b8 100644
--- a/docs/en/sql-reference/functions/tuple-functions.md
+++ b/docs/en/sql-reference/functions/tuple-functions.md
@@ -542,7 +542,7 @@ Alias: `scalarProduct`.
 
 - 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).
+Type: [Int/UInt](../../sql-reference/data-types/int-uint.md) or [Float](../../sql-reference/data-types/float.md).
 
 **Example**
 
@@ -584,6 +584,278 @@ SELECT tupleConcat((1, 2), (3, 4), (true, false)) AS res
 └──────────────────────┘
 ```
 
+## tupleIntDiv
+
+Does integer division of a tuple of numerators and a tuple of denominators, and returns a tuple of the quotients.
+
+**Syntax**
+
+```sql
+tupleIntDiv(tuple_num, tuple_div)
+```
+
+**Parameters**
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `tuple_div`: Tuple of divisor values. [Tuple](../data-types/tuple) of numeric type.
+
+**Returned value**
+
+- Tuple of the quotients of `tuple_num` and `tuple_div`. [Tuple](../data-types/tuple) of integer values.
+
+**Implementation details**
+
+- If either `tuple_num` or `tuple_div` contain non-integer values then the result is calculated by rounding to the nearest integer for each non-integer numerator or divisor.
+- An error will be thrown for division by 0. 
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleIntDiv((15, 10, 5), (5, 5, 5));
+```
+
+Result:
+
+``` text
+┌─tupleIntDiv((15, 10, 5), (5, 5, 5))─�
+│ (3,2,1)                             │
+└─────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT tupleIntDiv((15, 10, 5), (5.5, 5.5, 5.5));
+```
+
+Result:
+
+``` text
+┌─tupleIntDiv((15, 10, 5), (5.5, 5.5, 5.5))─�
+│ (2,1,0)                                   │
+└───────────────────────────────────────────┘
+```
+
+## tupleIntDivOrZero
+
+Like [tupleIntDiv](#tupleintdiv) it does integer division of a tuple of numerators and a tuple of denominators, and returns a tuple of the quotients. It does not throw an error for 0 divisors, but rather returns the quotient as 0. 
+
+**Syntax**
+
+```sql
+tupleIntDivOrZero(tuple_num, tuple_div)
+```
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `tuple_div`: Tuple of divisor values. [Tuple](../data-types/tuple) of numeric type.
+
+**Returned value**
+
+- Tuple of the quotients of `tuple_num` and `tuple_div`. [Tuple](../data-types/tuple) of integer values.
+- Returns 0 for quotients where the divisor is 0.
+
+**Implementation details**
+
+- If either `tuple_num` or `tuple_div` contain non-integer values then the result is calculated by rounding to the nearest integer for each non-integer numerator or divisor as in [tupleIntDiv](#tupleintdiv).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleIntDivOrZero((5, 10, 15), (0, 0, 0));
+```
+
+Result:
+
+``` text
+┌─tupleIntDivOrZero((5, 10, 15), (0, 0, 0))─�
+│ (0,0,0)                                   │
+└───────────────────────────────────────────┘
+```
+
+## tupleIntDivByNumber
+
+Does integer division of a tuple of numerators by a given denominator, and returns a tuple of the quotients.
+
+**Syntax**
+
+```sql
+tupleIntDivByNumber(tuple_num, div)
+```
+
+**Parameters**
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `div`: The divisor value. [Numeric](../data-types/int-uint.md) type.
+
+**Returned value**
+
+- Tuple of the quotients of `tuple_num` and `div`. [Tuple](../data-types/tuple) of integer values.
+
+**Implementation details**
+
+- If either `tuple_num` or `div` contain non-integer values then the result is calculated by rounding to the nearest integer for each non-integer numerator or divisor.
+- An error will be thrown for division by 0. 
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleIntDivByNumber((15, 10, 5), 5);
+```
+
+Result:
+
+``` text
+┌─tupleIntDivByNumber((15, 10, 5), 5)─�
+│ (3,2,1)                             │
+└─────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT tupleIntDivByNumber((15.2, 10.7, 5.5), 5.8);
+```
+
+Result:
+
+``` text
+┌─tupleIntDivByNumber((15.2, 10.7, 5.5), 5.8)─�
+│ (2,1,0)                                     │
+└─────────────────────────────────────────────┘
+```
+
+## tupleIntDivOrZeroByNumber
+
+Like [tupleIntDivByNumber](#tupleintdivbynumber) it does integer division of a tuple of numerators by a given denominator, and returns a tuple of the quotients. It does not throw an error for 0 divisors, but rather returns the quotient as 0.
+
+**Syntax**
+
+```sql
+tupleIntDivOrZeroByNumber(tuple_num, div)
+```
+
+**Parameters**
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `div`: The divisor value. [Numeric](../data-types/int-uint.md) type.
+
+**Returned value**
+
+- Tuple of the quotients of `tuple_num` and `div`. [Tuple](../data-types/tuple) of integer values.
+- Returns 0 for quotients where the divisor is 0.
+
+**Implementation details**
+
+- If either `tuple_num` or `div` contain non-integer values then the result is calculated by rounding to the nearest integer for each non-integer numerator or divisor as in [tupleIntDivByNumber](#tupleintdivbynumber).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleIntDivOrZeroByNumber((15, 10, 5), 5);
+```
+
+Result:
+
+``` text
+┌─tupleIntDivOrZeroByNumber((15, 10, 5), 5)─�
+│ (3,2,1)                                   │
+└───────────────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT tupleIntDivOrZeroByNumber((15, 10, 5), 0)
+```
+
+Result:
+
+``` text
+┌─tupleIntDivOrZeroByNumber((15, 10, 5), 0)─�
+│ (0,0,0)                                   │
+└───────────────────────────────────────────┘
+```
+
+## tupleModulo
+
+Returns a tuple of the moduli (remainders) of division operations of two tuples.
+
+**Syntax**
+
+```sql
+tupleModulo(tuple_num, tuple_mod)
+```
+
+**Parameters**
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `tuple_div`: Tuple of modulus values. [Tuple](../data-types/tuple) of numeric type.
+
+**Returned value**
+
+- Tuple of the remainders of division of `tuple_num` and `tuple_div`. [Tuple](../data-types/tuple) of non-zero integer values.
+- An error is thrown for division by zero.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleModulo((15, 10, 5), (5, 3, 2));
+```
+
+Result:
+
+``` text
+┌─tupleModulo((15, 10, 5), (5, 3, 2))─�
+│ (0,1,1)                             │
+└─────────────────────────────────────┘
+```
+
+## tupleModuloByNumber
+
+Returns a tuple of the moduli (remainders) of division operations of a tuple and a given divisor.
+
+**Syntax**
+
+```sql
+tupleModuloByNumber(tuple_num, div)
+```
+
+**Parameters**
+
+- `tuple_num`: Tuple of numerator values. [Tuple](../data-types/tuple) of numeric type.
+- `div`: The divisor value. [Numeric](../data-types/int-uint.md) type.
+
+**Returned value**
+
+- Tuple of the remainders of division of `tuple_num` and `div`. [Tuple](../data-types/tuple) of non-zero integer values.
+- An error is thrown for division by zero.
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT tupleModuloByNumber((15, 10, 5), 2);
+```
+
+Result:
+
+``` text
+┌─tupleModuloByNumber((15, 10, 5), 2)─�
+│ (1,0,1)                             │
+└─────────────────────────────────────┘
+```
+
 ## Distance functions
 
 All supported functions are described in [distance functions documentation](../../sql-reference/functions/distance-functions.md).
diff --git a/docs/en/sql-reference/functions/type-conversion-functions.md b/docs/en/sql-reference/functions/type-conversion-functions.md
index 37d4ac30648..ea08ffa50e7 100644
--- a/docs/en/sql-reference/functions/type-conversion-functions.md
+++ b/docs/en/sql-reference/functions/type-conversion-functions.md
@@ -968,7 +968,7 @@ Converts a numeric value to String with the number of fractional digits in the o
 toDecimalString(number, scale)
 ```
 
-**Parameters**
+**Arguments**
 
 - `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).
@@ -1261,7 +1261,7 @@ Converts input value `x` to the specified data type `T`. Always returns [Nullabl
 accurateCastOrNull(x, T)
 ```
 
-**Parameters**
+**Arguments**
 
 - `x` — Input value.
 - `T` — The name of the returned data type.
@@ -1314,7 +1314,7 @@ Converts input value `x` to the specified data type `T`. Returns default type va
 accurateCastOrDefault(x, T)
 ```
 
-**Parameters**
+**Arguments**
 
 - `x` — Input value.
 - `T` — The name of the returned data type.
@@ -1675,7 +1675,7 @@ Same as [parseDateTimeBestEffort](#parsedatetimebesteffort) function but also pa
 parseDateTime64BestEffort(time_string [, precision [, time_zone]])
 ```
 
-**Parameters**
+**Arguments**
 
 - `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).
@@ -1990,7 +1990,7 @@ Extracts the timestamp component of a [Snowflake ID](https://en.wikipedia.org/wi
 snowflakeToDateTime(value[, time_zone])
 ```
 
-**Parameters**
+**Arguments**
 
 - `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).
@@ -2026,7 +2026,7 @@ Extracts the timestamp component of a [Snowflake ID](https://en.wikipedia.org/wi
 snowflakeToDateTime64(value[, time_zone])
 ```
 
-**Parameters**
+**Arguments**
 
 - `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).
@@ -2062,7 +2062,7 @@ Converts a [DateTime](/docs/en/sql-reference/data-types/datetime.md) value to th
 dateTimeToSnowflake(value)
 ```
 
-**Parameters**
+**Arguments**
 
 - `value` — Date with time. [DateTime](/docs/en/sql-reference/data-types/datetime.md).
 
@@ -2096,7 +2096,7 @@ Convert a [DateTime64](/docs/en/sql-reference/data-types/datetime64.md) to the f
 dateTime64ToSnowflake(value)
 ```
 
-**Parameters**
+**Arguments**
 
 - `value` — Date with time. [DateTime64](/docs/en/sql-reference/data-types/datetime64.md).
 
diff --git a/docs/en/sql-reference/functions/url-functions.md b/docs/en/sql-reference/functions/url-functions.md
index f6871c86c4f..a0b0170721c 100644
--- a/docs/en/sql-reference/functions/url-functions.md
+++ b/docs/en/sql-reference/functions/url-functions.md
@@ -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') = ''`.
+- `cutToFirstSignificantSubdomainWithWWW('https://news.clickhouse.com.tr/') = 'clickhouse.com.tr'`.
+- `cutToFirstSignificantSubdomainWithWWW('www.tr') = 'www.tr'`.
+- `cutToFirstSignificantSubdomainWithWWW('tr') = ''`.
 
 ### cutToFirstSignificantSubdomainCustom
 
@@ -155,7 +155,7 @@ Configuration example:
 cutToFirstSignificantSubdomain(URL, TLD)
 ```
 
-**Parameters**
+**Arguments**
 
 - `URL` — URL. [String](../../sql-reference/data-types/string.md).
 - `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
@@ -209,7 +209,7 @@ Configuration example:
 cutToFirstSignificantSubdomainCustomWithWWW(URL, TLD)
 ```
 
-**Parameters**
+**Arguments**
 
 - `URL` — URL. [String](../../sql-reference/data-types/string.md).
 - `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
@@ -263,7 +263,7 @@ Configuration example:
 firstSignificantSubdomainCustom(URL, TLD)
 ```
 
-**Parameters**
+**Arguments**
 
 - `URL` — URL. [String](../../sql-reference/data-types/string.md).
 - `TLD` — Custom TLD list name. [String](../../sql-reference/data-types/string.md).
diff --git a/docs/en/sql-reference/operators/index.md b/docs/en/sql-reference/operators/index.md
index 120e464e009..31bf43e8b35 100644
--- a/docs/en/sql-reference/operators/index.md
+++ b/docs/en/sql-reference/operators/index.md
@@ -353,7 +353,7 @@ For efficiency, the `and` and `or` functions accept any number of arguments. The
 
 ClickHouse supports the `IS NULL` and `IS NOT NULL` operators.
 
-### IS NULL
+### IS NULL {#is_null}
 
 - For [Nullable](../../sql-reference/data-types/nullable.md) type values, the `IS NULL` operator returns:
     - `1`, if the value is `NULL`.
@@ -374,7 +374,7 @@ SELECT x+100 FROM t_null WHERE y IS NULL
 └──────────────┘
 ```
 
-### IS NOT NULL
+### IS NOT 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`.
diff --git a/docs/en/sql-reference/statements/alter/apply-deleted-mask.md b/docs/en/sql-reference/statements/alter/apply-deleted-mask.md
index 7a11d66e739..1afc2a0ff5a 100644
--- a/docs/en/sql-reference/statements/alter/apply-deleted-mask.md
+++ b/docs/en/sql-reference/statements/alter/apply-deleted-mask.md
@@ -10,7 +10,7 @@ sidebar_label: APPLY DELETED MASK
 ALTER TABLE [db].name [ON CLUSTER cluster] APPLY DELETED MASK [IN PARTITION partition_id]
 ```
 
-The command applies mask created by [lightweight delete](/docs/en/sql-reference/statements/delete) and forcefully removes rows marked as deleted from disk. This command is a heavyweight mutation and it semantically equals to query ```ALTER TABLE [db].name DELETE WHERE _row_exists = 0```.
+The command applies mask created by [lightweight delete](/docs/en/sql-reference/statements/delete) and forcefully removes rows marked as deleted from disk. This command is a heavyweight mutation, and it semantically equals to query ```ALTER TABLE [db].name DELETE WHERE _row_exists = 0```.
 
 :::note
 It only works for tables in the [`MergeTree`](../../../engines/table-engines/mergetree-family/mergetree.md) family (including [replicated](../../../engines/table-engines/mergetree-family/replication.md) tables).
diff --git a/docs/en/sql-reference/statements/alter/column.md b/docs/en/sql-reference/statements/alter/column.md
index 2cb802c863b..a23710b12bd 100644
--- a/docs/en/sql-reference/statements/alter/column.md
+++ b/docs/en/sql-reference/statements/alter/column.md
@@ -23,10 +23,11 @@ The following actions are supported:
 - [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](#modify-column) — Changes column’s type, default expression, TTL, and column settings.
 - [MODIFY COLUMN REMOVE](#modify-column-remove) — Removes one of the column properties.
+- [MODIFY COLUMN MODIFY SETTING](#modify-column-modify-setting) - Changes column settings.
+- [MODIFY COLUMN RESET SETTING](#modify-column-reset-setting) - Reset column settings.
 - [MATERIALIZE COLUMN](#materialize-column) — Materializes the column in the parts where the column is missing.
-
 These actions are described in detail below.
 
 ## ADD COLUMN
@@ -75,7 +76,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.
 
-:::tip    
+:::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.
 :::
 
@@ -138,8 +139,8 @@ ALTER TABLE visits COMMENT COLUMN browser 'This column shows the browser used fo
 ## MODIFY COLUMN
 
 ``` sql
-MODIFY COLUMN [IF EXISTS] name [type] [default_expr] [codec] [TTL] [AFTER name_after | FIRST]
-ALTER COLUMN [IF EXISTS] name TYPE [type] [default_expr] [codec] [TTL] [AFTER name_after | FIRST]
+MODIFY COLUMN [IF EXISTS] name [type] [default_expr] [codec] [TTL] [settings] [AFTER name_after | FIRST]
+ALTER COLUMN [IF EXISTS] name TYPE [type] [default_expr] [codec] [TTL] [settings] [AFTER name_after | FIRST]
 ```
 
 This query changes the `name` column properties:
@@ -152,10 +153,14 @@ This query changes the `name` column properties:
 
 - TTL
 
+- Column-level Settings
+
 For examples of columns compression CODECS modifying, see [Column Compression Codecs](../create/table.md/#codecs).
 
 For examples of columns TTL modifying, see [Column TTL](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#mergetree-column-ttl).
 
+For examples of column-level settings modifying, see [Column-level Settings](/docs/en/engines/table-engines/mergetree-family/mergetree.md/#column-level-settings).
+
 If the `IF EXISTS` clause is specified, the query won’t return an error if the column does not exist.
 
 When changing the type, values are converted as if the [toType](/docs/en/sql-reference/functions/type-conversion-functions.md) functions were applied to them. If only the default expression is changed, the query does not do anything complex, and is completed almost instantly.
@@ -208,7 +213,7 @@ The `ALTER` query for changing columns is replicated. The instructions are saved
 
 ## MODIFY COLUMN REMOVE
 
-Removes one of the column properties: `DEFAULT`, `ALIAS`, `MATERIALIZED`, `CODEC`, `COMMENT`, `TTL`.
+Removes one of the column properties: `DEFAULT`, `ALIAS`, `MATERIALIZED`, `CODEC`, `COMMENT`, `TTL`, `SETTINGS`.
 
 Syntax:
 
@@ -228,12 +233,55 @@ ALTER TABLE table_with_ttl MODIFY COLUMN column_ttl REMOVE TTL;
 
 - [REMOVE TTL](ttl.md).
 
+
+## MODIFY COLUMN MODIFY SETTING
+
+Modify a column setting.
+
+Syntax:
+
+```sql
+ALTER TABLE table_name MODIFY COLUMN column_name MODIFY SETTING name=value,...;
+```
+
+**Example**
+
+Modify column's `max_compress_block_size` to `1MB`:
+
+```sql
+ALTER TABLE table_name MODIFY COLUMN column_name MODIFY SETTING max_compress_block_size = 1048576;
+```
+
+## MODIFY COLUMN RESET SETTING
+
+Reset a column setting, also removes the setting declaration in the column expression of the table's CREATE query.
+
+Syntax:
+
+```sql
+ALTER TABLE table_name MODIFY COLUMN column_name RESET SETTING name,...;
+```
+
+**Example**
+
+Reset column setting `max_compress_block_size` to it's default value:
+
+```sql
+ALTER TABLE table_name MODIFY COLUMN column_name RESET SETTING max_compress_block_size;
+```
+
 ## MATERIALIZE COLUMN
 
-Materializes or updates a column with an expression for a default value (`DEFAULT` or `MATERIALIZED`).
-It is used if it is necessary to add or update a column with a complicated expression, because evaluating such an expression directly on `SELECT` executing turns out to be expensive. 
+Materializes a column with a `DEFAULT` or `MATERIALIZED` value expression.
+This statement can be used to rewrite existing column data after a `DEFAULT` or `MATERIALIZED` expression has been added or updated (which only updates the metadata but does not change existing data).
 Implemented as a [mutation](/docs/en/sql-reference/statements/alter/index.md#mutations).
 
+For columns with a new or updated `MATERIALIZED` value expression, all existing rows are rewritten.
+
+For columns with a new or updated `DEFAULT` value expression, the behavior depends on the ClickHouse version:
+- In ClickHouse < v24.2, all existing rows are rewritten.
+- ClickHouse >= v24.2 distinguishes if a row value in a column with `DEFAULT` value expression was explicitly specified when it was inserted, or not, i.e. calculated from the `DEFAULT` value expression. If the value was explicitly specified, ClickHouse keeps it as is. If the value was was calculated, ClickHouse changes it to the new or updated `MATERIALIZED` value expression.
+
 Syntax:
 
 ```sql
@@ -287,7 +335,7 @@ The `ALTER` query lets you create and delete separate elements (columns) in nest
 
 There is no support for deleting columns in the primary key or the sampling key (columns that are used in the `ENGINE` expression). Changing the type for columns that are included in the primary key is only possible if this change does not cause the data to be modified (for example, you are allowed to add values to an Enum or to change a type from `DateTime` to `UInt32`).
 
-If the `ALTER` query is not sufficient to make the table changes you need, you can create a new table, copy the data to it using the [INSERT SELECT](/docs/en/sql-reference/statements/insert-into.md/#inserting-the-results-of-select) query, then switch the tables using the [RENAME](/docs/en/sql-reference/statements/rename.md/#rename-table) query and delete the old table. You can use the [clickhouse-copier](/docs/en/operations/utilities/clickhouse-copier.md) as an alternative to the `INSERT SELECT` query.
+If the `ALTER` query is not sufficient to make the table changes you need, you can create a new table, copy the data to it using the [INSERT SELECT](/docs/en/sql-reference/statements/insert-into.md/#inserting-the-results-of-select) query, then switch the tables using the [RENAME](/docs/en/sql-reference/statements/rename.md/#rename-table) query and delete the old table.
 
 The `ALTER` query blocks all reads and writes for the table. In other words, if a long `SELECT` is running at the time of the `ALTER` query, the `ALTER` query will wait for it to complete. At the same time, all new queries to the same table will wait while this `ALTER` is running.
 
diff --git a/docs/en/sql-reference/statements/alter/constraint.md b/docs/en/sql-reference/statements/alter/constraint.md
index 7a8f5809320..29675f704b5 100644
--- a/docs/en/sql-reference/statements/alter/constraint.md
+++ b/docs/en/sql-reference/statements/alter/constraint.md
@@ -15,7 +15,7 @@ ALTER TABLE [db].name [ON CLUSTER cluster] DROP CONSTRAINT constraint_name;
 
 See more on [constraints](../../../sql-reference/statements/create/table.md#constraints).
 
-Queries will add or remove metadata about constraints from table so they are processed immediately.
+Queries will add or remove metadata about constraints from table, so they are processed immediately.
 
 :::tip
 Constraint check **will not be executed** on existing data if it was added.
diff --git a/docs/en/sql-reference/statements/alter/index.md b/docs/en/sql-reference/statements/alter/index.md
index dc6668c7983..7961315c193 100644
--- a/docs/en/sql-reference/statements/alter/index.md
+++ b/docs/en/sql-reference/statements/alter/index.md
@@ -56,7 +56,9 @@ Entries for finished mutations are not deleted right away (the number of preserv
 
 For non-replicated tables, all `ALTER` queries are performed synchronously. For replicated tables, the query just adds instructions for the appropriate actions to `ZooKeeper`, and the actions themselves are performed as soon as possible. However, the query can wait for these actions to be completed on all the replicas.
 
-For all `ALTER` queries, you can use the [alter_sync](/docs/en/operations/settings/settings.md/#alter-sync) setting to set up waiting.
+For `ALTER` queries that creates mutations (e.g.: including, but not limited to `UPDATE`, `DELETE`, `MATERIALIZE INDEX`, `MATERIALIZE PROJECTION`, `MATERIALIZE COLUMN`, `APPLY DELETED MASK`, `CLEAR STATISTIC`, `MATERIALIZE STATISTIC`) the synchronicity is defined by the [mutations_sync](/docs/en/operations/settings/settings.md/#mutations_sync) setting.
+
+For other `ALTER` queries which only modify the metadata, you can use the [alter_sync](/docs/en/operations/settings/settings.md/#alter-sync) setting to set up waiting.
 
 You can specify how long (in seconds) to wait for inactive replicas to execute all `ALTER` queries with the [replication_wait_for_inactive_replica_timeout](/docs/en/operations/settings/settings.md/#replication-wait-for-inactive-replica-timeout) setting.
 
@@ -64,8 +66,6 @@ You can specify how long (in seconds) to wait for inactive replicas to execute a
 For all `ALTER` queries, if `alter_sync = 2` and some replicas are not active for more than the time, specified in the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 :::
 
-For `ALTER TABLE ... UPDATE|DELETE|MATERIALIZE INDEX|MATERIALIZE PROJECTION|MATERIALIZE COLUMN` 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 114b8d5ffe3..941dc000a02 100644
--- a/docs/en/sql-reference/statements/alter/partition.md
+++ b/docs/en/sql-reference/statements/alter/partition.md
@@ -9,6 +9,7 @@ The following operations with [partitions](/docs/en/engines/table-engines/merget
 
 - [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.
+- [FORGET PARTITION](#forget-partition) — Deletes a partition metadata from zookeeper if it's empty.
 - [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.
@@ -73,6 +74,22 @@ ALTER TABLE table_name [ON CLUSTER cluster] DROP DETACHED PARTITION|PART partiti
 Removes the specified part or all parts of the specified partition from `detached`.
 Read more about setting the partition expression in a section [How to set the partition expression](#how-to-set-partition-expression).
 
+## FORGET PARTITION
+
+``` sql
+ALTER TABLE table_name FORGET PARTITION partition_expr
+```
+
+Removes all metadata about an empty partition from ZooKeeper. Query fails if partition is not empty or unknown. Make sure to execute only for partitions that will never be used again.
+
+Read about setting the partition expression in a section [How to set the partition expression](#how-to-set-partition-expression).
+
+Example:
+
+``` sql
+ALTER TABLE mt FORGET PARTITION '20201121';
+```
+
 ## ATTACH PARTITION\|PART
 
 ``` sql
@@ -116,6 +133,8 @@ For the query to run successfully, the following conditions must be met:
 - Both tables must have the same indices and projections.
 - Both tables must have the same storage policy.
 
+If both tables have the same storage policy, use hardlink to attach partition. Otherwise, use copying the data to attach partition.
+
 ## REPLACE PARTITION
 
 ``` sql
@@ -333,6 +352,7 @@ ALTER TABLE mt DELETE IN PARTITION ID '2' WHERE p = 2;
 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`.
+- Using the keyword `ALL`. It can be used only with DROP/DETACH/ATTACH. For example, `ALTER TABLE visits ATTACH PARTITION ALL`.
 - 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'`.
diff --git a/docs/en/sql-reference/statements/alter/view.md b/docs/en/sql-reference/statements/alter/view.md
index 517e64e3e5b..e063b27424e 100644
--- a/docs/en/sql-reference/statements/alter/view.md
+++ b/docs/en/sql-reference/statements/alter/view.md
@@ -8,9 +8,7 @@ sidebar_label: VIEW
 
 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.
 
-The `allow_experimental_alter_materialized_view_structure` setting must be enabled.
-
-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.
+This command is created to change materialized view created with `TO [db.]name` clause. It does not change the structure of the underlying 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**
 
diff --git a/docs/en/sql-reference/statements/create/quota.md b/docs/en/sql-reference/statements/create/quota.md
index a6ced870c18..d16b40876c7 100644
--- a/docs/en/sql-reference/statements/create/quota.md
+++ b/docs/en/sql-reference/statements/create/quota.md
@@ -21,7 +21,7 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 
 Keys `user_name`, `ip_address`, `client_key`, `client_key, user_name` and `client_key, ip_address` correspond to the fields in the [system.quotas](../../../operations/system-tables/quotas.md) table.
 
-Parameters `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` correspond to the fields in the [system.quotas_usage](../../../operations/system-tables/quotas_usage.md) table.
+Parameters `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time`, `failed_sequential_authentications` correspond to the fields in the [system.quotas_usage](../../../operations/system-tables/quotas_usage.md) table.
 
 `ON CLUSTER` clause allows creating quotas on a cluster, see [Distributed DDL](../../../sql-reference/distributed-ddl.md).
 
diff --git a/docs/en/sql-reference/statements/create/table.md b/docs/en/sql-reference/statements/create/table.md
index 7322bc17b76..0edf158e981 100644
--- a/docs/en/sql-reference/statements/create/table.md
+++ b/docs/en/sql-reference/statements/create/table.md
@@ -514,6 +514,10 @@ ENGINE = MergeTree ORDER BY x;
 
 ## Temporary Tables
 
+:::note
+Please note that temporary tables are not replicated. As a result, there is no guarantee that data inserted into a temporary table will be available in other replicas. The primary use case where temporary tables can be useful is for querying or joining small external datasets during a single session.
+:::
+
 ClickHouse supports temporary tables which have the following characteristics:
 
 - Temporary tables disappear when the session ends, including if the connection is lost.
diff --git a/docs/en/sql-reference/statements/create/view.md b/docs/en/sql-reference/statements/create/view.md
index f6158acd9a4..073a3c0d246 100644
--- a/docs/en/sql-reference/statements/create/view.md
+++ b/docs/en/sql-reference/statements/create/view.md
@@ -13,7 +13,9 @@ Creates a new view. Views can be [normal](#normal-view), [materialized](#materia
 Syntax:
 
 ``` sql
-CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster_name] AS SELECT ...
+CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster_name] 
+[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }] 
+AS SELECT ...
 ```
 
 Normal views do not store any data. They just perform a read from another table on each access. In other words, a normal view is nothing more than a saved query. When reading from a view, this saved query is used as a subquery in the [FROM](../../../sql-reference/statements/select/from.md) clause.
@@ -52,7 +54,9 @@ SELECT * FROM view(column1=value1, column2=value2 ...)
 ## Materialized View
 
 ``` sql
-CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
+CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] 
+[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }] 
+AS SELECT ...
 ```
 
 :::tip
@@ -91,13 +95,56 @@ Views look the same as normal tables. For example, they are listed in the result
 
 To delete a view, use [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Although `DROP TABLE` works for VIEWs as well.
 
+## SQL security {#sql_security}
+
+`DEFINER` and `SQL SECURITY` allow you to specify which ClickHouse user to use when executing the view's underlying query.
+`SQL SECURITY` has three legal values: `DEFINER`, `INVOKER`, or `NONE`. You can specify any existing user or `CURRENT_USER` in the `DEFINER` clause.
+
+The following table will explain which rights are required for which user in order to select from view. 
+Note that regardless of the SQL security option, in every case it is still required to have `GRANT SELECT ON <view>` in order to read from it.
+
+| SQL security option | View                                                            | Materialized View                                                                                                 |
+|---------------------|-----------------------------------------------------------------|-------------------------------------------------------------------------------------------------------------------|
+| `DEFINER alice`     | `alice` must have a `SELECT` grant for the view's source table. | `alice` must have a `SELECT` grant for the view's source table and an `INSERT` grant for the view's target table. |
+| `INVOKER`           | User must have a `SELECT` grant for the view's source table.    | `SQL SECURITY INVOKER` can't be specified for materialized views.                                                 |
+| `NONE`              | -                                                               | -                                                                                                                 |
+
+:::note
+`SQL SECURITY NONE` is a deprecated option. Any user with the rights to create views with `SQL SECURITY NONE` will be able to execute any arbitrary query.
+Thus, it is required to have `GRANT ALLOW SQL SECURITY NONE TO <user>` in order to create a view with this option.
+:::
+
+If `DEFINER`/`SQL SECURITY` aren't specified, the default values are used:
+- `SQL SECURITY`: `INVOKER` for normal views and `DEFINER` for materialized views ([configurable by settings](../../../operations/settings/settings.md#default_normal_view_sql_security))
+- `DEFINER`: `CURRENT_USER` ([configurable by settings](../../../operations/settings/settings.md#default_view_definer))
+
+If a view is attached without `DEFINER`/`SQL SECURITY` specified, the default value is `SQL SECURITY NONE` for the materialized view and `SQL SECURITY INVOKER` for the normal view.
+
+To change SQL security for an existing view, use 
+```sql
+ALTER TABLE MODIFY SQL SECURITY { DEFINER | INVOKER | NONE } [DEFINER = { user | CURRENT_USER }]
+```
+
+### Examples sql security
+```sql
+CREATE test_view
+DEFINER = alice SQL SECURITY DEFINER
+AS SELECT ...
+```
+
+```sql
+CREATE test_view
+SQL SECURITY INVOKER
+AS SELECT ...
+```
+
 ## Live View [Deprecated]
 
 This feature is deprecated and will be removed in the future.
 
 For your convenience, the old documentation is located [here](https://pastila.nl/?00f32652/fdf07272a7b54bda7e13b919264e449f.md)
 
-## Refreshable Materialized View {#refreshable-materialized-view}
+## Refreshable Materialized View [Experimental] {#refreshable-materialized-view}
 
 ```sql
 CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name
@@ -120,7 +167,8 @@ Differences from regular non-refreshable materialized views:
 
 :::note
 Refreshable materialized views are a work in progress. Setting `allow_experimental_refreshable_materialized_view = 1` is required for creating one. Current limitations:
- * not compatible with Replicated database or table engines,
+ * not compatible with Replicated database or table engines
+ * It is not supported in ClickHouse Cloud
  * require [Atomic database engine](../../../engines/database-engines/atomic.md),
  * no retries for failed refresh - we just skip to the next scheduled refresh time,
  * no limit on number of concurrent refreshes.
diff --git a/docs/en/sql-reference/statements/detach.md b/docs/en/sql-reference/statements/detach.md
index 938a5f9c3cb..e88e625aed1 100644
--- a/docs/en/sql-reference/statements/detach.md
+++ b/docs/en/sql-reference/statements/detach.md
@@ -16,13 +16,13 @@ DETACH TABLE|VIEW|DICTIONARY|DATABASE [IF EXISTS] [db.]name [ON CLUSTER cluster]
 Detaching does not delete the data or metadata of a table, a materialized view, a dictionary or a database. If an entity was not detached `PERMANENTLY`, on the next server launch the server will read the metadata and recall the table/view/dictionary/database again. If an entity was detached `PERMANENTLY`, there will be no automatic recall.
 
 Whether a table, a dictionary or a database was detached permanently or not, in both cases you can reattach them using the [ATTACH](../../sql-reference/statements/attach.md) query.
-System log tables can be also attached back (e.g. `query_log`, `text_log`, etc). Other system tables can't be reattached. On the next server launch the server will recall those tables again.
+System log tables can be also attached back (e.g. `query_log`, `text_log`, etc.). Other system tables can't be reattached. On the next server launch the server will recall those tables again.
 
 `ATTACH MATERIALIZED VIEW` does not work with short syntax (without `SELECT`), but you can attach it using the `ATTACH TABLE` query.
 
 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.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.
+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.
 
diff --git a/docs/en/sql-reference/statements/drop.md b/docs/en/sql-reference/statements/drop.md
index 8ed00f625d6..98b849ecf3b 100644
--- a/docs/en/sql-reference/statements/drop.md
+++ b/docs/en/sql-reference/statements/drop.md
@@ -20,19 +20,22 @@ DROP DATABASE [IF EXISTS] db [ON CLUSTER cluster] [SYNC]
 
 ## DROP TABLE
 
-Deletes the table.
-In case when `IF EMPTY` clause is specified server will check if table is empty only on replica that received initial query.  
+Deletes one or more tables.
 
 :::tip
-Also see [UNDROP TABLE](/docs/en/sql-reference/statements/undrop.md)
+To undo the deletion of a table, please see [UNDROP TABLE](/docs/en/sql-reference/statements/undrop.md)
 :::
 
 Syntax:
 
 ``` sql
-DROP [TEMPORARY] TABLE [IF EXISTS] [IF EMPTY] [db.]name [ON CLUSTER cluster] [SYNC]
+DROP [TEMPORARY] TABLE [IF EXISTS] [IF EMPTY]  [db1.]name_1[, [db2.]name_2, ...] [ON CLUSTER cluster] [SYNC]
 ```
 
+Limitations:
+- If the clause `IF EMPTY` is specified, the server checks the emptiness of the table only on the replica which received the query.  
+- Deleting multiple tables at once is not an atomic operation, i.e. if the deletion of a table fails, subsequent tables will not be deleted.
+
 ## DROP DICTIONARY
 
 Deletes the dictionary.
diff --git a/docs/en/sql-reference/statements/grant.md b/docs/en/sql-reference/statements/grant.md
index e6073f3523a..a93db29e82c 100644
--- a/docs/en/sql-reference/statements/grant.md
+++ b/docs/en/sql-reference/statements/grant.md
@@ -114,6 +114,7 @@ Hierarchy of privileges:
     - `ALTER VIEW`
         - `ALTER VIEW REFRESH`
         - `ALTER VIEW MODIFY QUERY`
+        - `ALTER VIEW MODIFY SQL SECURITY`
 - [CREATE](#grant-create)
     - `CREATE DATABASE`
     - `CREATE TABLE`
@@ -201,6 +202,13 @@ Hierarchy of privileges:
     - `S3`
 - [dictGet](#grant-dictget)
 - [displaySecretsInShowAndSelect](#grant-display-secrets)
+- [NAMED COLLECTION ADMIN](#grant-named-collection-admin)
+    - `CREATE NAMED COLLECTION`
+    - `DROP NAMED COLLECTION`
+    - `ALTER NAMED COLLECTION`
+    - `SHOW NAMED COLLECTIONS`
+    - `SHOW NAMED COLLECTIONS SECRETS`
+    - `NAMED COLLECTION`
 
 Examples of how this hierarchy is treated:
 
@@ -307,6 +315,7 @@ Allows executing [ALTER](../../sql-reference/statements/alter/index.md) queries
     - `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 VIEW MODIFY SQL SECURITY`. Level: `VIEW`. Aliases: `ALTER TABLE MODIFY SQL SECURITY`
 
 Examples of how this hierarchy is treated:
 
@@ -409,6 +418,7 @@ Allows a user to execute queries that manage users, roles and row policies.
         - `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`
+    - `ALLOW SQL SECURITY NONE`. Level: `GLOBAL`. Aliases: `CREATE SQL SECURITY NONE`, `SQL SECURITY NONE`, `SECURITY NONE`
 
 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.
 
@@ -495,6 +505,25 @@ and
 [`format_display_secrets_in_show_and_select` format setting](../../operations/settings/formats#format_display_secrets_in_show_and_select)
 are turned on.
 
+### NAMED COLLECTION ADMIN
+
+Allows a certain operation on a specified named collection. Before version 23.7 it was called NAMED COLLECTION CONTROL, and after 23.7 NAMED COLLECTION ADMIN was added and NAMED COLLECTION CONTROL is preserved as an alias.
+
+- `NAMED COLLECTION ADMIN`. Level: `NAMED_COLLECTION`. Aliases: `NAMED COLLECTION CONTROL`
+    - `CREATE NAMED COLLECTION`. Level: `NAMED_COLLECTION`
+    - `DROP NAMED COLLECTION`. Level: `NAMED_COLLECTION`
+    - `ALTER NAMED COLLECTION`. Level: `NAMED_COLLECTION`
+    - `SHOW NAMED COLLECTIONS`. Level: `NAMED_COLLECTION`. Aliases: `SHOW NAMED COLLECTIONS`
+    - `SHOW NAMED COLLECTIONS SECRETS`. Level: `NAMED_COLLECTION`. Aliases: `SHOW NAMED COLLECTIONS SECRETS`
+    - `NAMED COLLECTION`. Level: `NAMED_COLLECTION`. Aliases: `NAMED COLLECTION USAGE, USE NAMED COLLECTION`
+
+Unlike all other grants (CREATE, DROP, ALTER, SHOW) grant NAMED COLLECTION was added only in 23.7, while all others were added earlier - in 22.12.
+
+**Examples**
+
+Assuming a named collection is called abc, we grant privilege CREATE NAMED COLLECTION to user john.
+- `GRANT CREATE NAMED COLLECTION ON abc TO john`
+
 ### ALL
 
 Grants all the privileges on regulated entity to a user account or a role.
diff --git a/docs/en/sql-reference/statements/insert-into.md b/docs/en/sql-reference/statements/insert-into.md
index f9d93305071..a76692cf291 100644
--- a/docs/en/sql-reference/statements/insert-into.md
+++ b/docs/en/sql-reference/statements/insert-into.md
@@ -176,7 +176,7 @@ INSERT INTO infile_globs FROM INFILE 'input_?.csv' FORMAT CSV;
 ```
 :::
 
-## Inserting into Table Function
+## Inserting using a Table Function
 
 Data can be inserted into tables referenced by [table functions](../../sql-reference/table-functions/index.md).
 
@@ -204,6 +204,26 @@ Result:
 └─────┴───────────────────────┘
 ```
 
+## Inserting into ClickHouse Cloud
+
+By default, services on ClickHouse Cloud provide multiple replicas for high availability. When you connect to a service, a connection is established to one of these replicas.
+
+After an `INSERT` succeeds, data is written to the underlying storage. However, it may take some time for replicas to receive these updates. Therefore, if you use a different connection that executes a `SELECT` query on one of these other replicas, the updated data may not yet be reflected.
+
+It is possible to use the `select_sequential_consistency` to force the replica to receive the latest updates. Here is an example of a SELECT query using this setting:
+
+```sql
+SELECT .... SETTINGS select_sequential_consistency = 1;
+```
+
+Note that using `select_sequential_consistency` will increase the load on ClickHouse Keeper (used by ClickHouse Cloud internally) and may result in slower performance depending on the load on the service. We recommend against enabling this setting unless necessary. The recommended approach is to execute read/writes in the same session or to use a client driver that uses the native protocol (and thus supports sticky connections).
+
+## Inserting into a replicated setup
+
+In a replicated setup, data will be visible on other replicas after it has been replicated. Data begins being replicated (downloaded on other replicas) immediately after an `INSERT`. This differs from ClickHouse Cloud, where data is immediately written to shared storage and replicas subscribe to metadata changes.
+
+Note that for replicated setups, `INSERTs` can sometimes take a considerable amount of time (in the order of one second) as it requires committing to ClickHouse Keeper for distributed consensus. Using S3 for storage also adds additional latency.
+
 ## Performance Considerations
 
 `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:
@@ -216,7 +236,15 @@ Performance will not decrease if:
 - 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.
+### Asynchronous inserts
+
+It is 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 use asynchronous inserts, enable the [`async_insert`](../../operations/settings/settings.md#async-insert) setting.
+
+Using `async_insert` or the [`Buffer` table engine](/en/engines/table-engines/special/buffer) results in additional buffering.
+
+### Large or long-running inserts
+
+When you are inserting large amounts of data, ClickHouse will optimize write performance through a process called "squashing". Small blocks of inserted data in memory are merged and squashed into larger blocks before being written to disk. Squashing reduces the overhead associated with each write operation. In this process, inserted data will be available to query after ClickHouse completes writing each [`max_insert_block_size`](/en/operations/settings/settings#max_insert_block_size) rows.
 
 **See Also**
 
diff --git a/docs/en/sql-reference/statements/kill.md b/docs/en/sql-reference/statements/kill.md
index 294724dfa50..b665ad85a09 100644
--- a/docs/en/sql-reference/statements/kill.md
+++ b/docs/en/sql-reference/statements/kill.md
@@ -21,6 +21,35 @@ The queries to terminate are selected from the system.processes table using the
 
 Examples:
 
+First, you'll need to get the list of incomplete queries. This SQL query provides them according to those running the longest:
+
+List from a single ClickHouse node:
+``` sql
+SELECT
+  initial_query_id,
+  query_id,
+  formatReadableTimeDelta(elapsed) AS time_delta,
+  query,
+  *
+  FROM system.processes
+  WHERE query ILIKE 'SELECT%'
+  ORDER BY time_delta DESC;
+```
+
+List from a ClickHouse cluster:
+``` sql
+SELECT
+  initial_query_id,
+  query_id,
+  formatReadableTimeDelta(elapsed) AS time_delta,
+  query,
+  *
+  FROM clusterAllReplicas(default, system.processes)
+  WHERE query ILIKE 'SELECT%'
+  ORDER BY time_delta DESC;
+```
+
+Kill the query:
 ``` sql
 -- Forcibly terminates all queries with the specified query_id:
 KILL QUERY WHERE query_id='2-857d-4a57-9ee0-327da5d60a90'
@@ -44,6 +73,11 @@ A test query (`TEST`) only checks the user’s rights and displays a list of que
 
 ## KILL MUTATION
 
+The presence of long-running or incomplete mutations often indicates that a ClickHouse service is running poorly. The asynchronous nature of mutations can cause them to consume all available resources on a system. You may need to either: 
+
+- Pause all new mutations, `INSERT`s , and `SELECT`s and allow the queue of mutations to complete.
+- Or manually kill some of these mutations by sending a `KILL` command.
+
 ``` sql
 KILL MUTATION [ON CLUSTER cluster]
   WHERE <where expression to SELECT FROM system.mutations query>
@@ -57,6 +91,39 @@ A test query (`TEST`) only checks the user’s rights and displays a list of mut
 
 Examples:
 
+Get a `count()` of the number of incomplete mutations:
+
+Count of mutations from a single ClickHouse node:
+``` sql
+SELECT count(*)
+FROM system.mutations
+WHERE is_done = 0;
+```
+
+Count of mutations from a ClickHouse cluster of replicas:
+``` sql
+SELECT count(*)
+FROM clusterAllReplicas('default', system.mutations)
+WHERE is_done = 0;
+```
+
+Query the list of incomplete mutations:
+
+List of mutations from a single ClickHouse node:
+``` sql
+SELECT mutation_id, *
+FROM system.mutations
+WHERE is_done = 0;
+```
+
+List of mutations from a ClickHouse cluster:
+``` sql
+SELECT mutation_id, *
+FROM clusterAllReplicas('default', system.mutations)
+WHERE is_done = 0;
+```
+
+Kill the mutations as needed:
 ``` sql
 -- Cancel and remove all mutations of the single table:
 KILL MUTATION WHERE database = 'default' AND table = 'table'
diff --git a/docs/en/sql-reference/statements/rename.md b/docs/en/sql-reference/statements/rename.md
index bb62cc3af1c..667ccbc6c93 100644
--- a/docs/en/sql-reference/statements/rename.md
+++ b/docs/en/sql-reference/statements/rename.md
@@ -9,10 +9,6 @@ sidebar_label: RENAME
 Renames databases, tables, or dictionaries. Several entities can be renamed in a single query.
 Note that the `RENAME` query with several entities is non-atomic operation. To swap entities names atomically, use the [EXCHANGE](./exchange.md) statement.
 
-:::note    
-The `RENAME` query is supported by the [Atomic](../../engines/database-engines/atomic.md) database engine only.
-:::
-
 **Syntax**
 
 ```sql
diff --git a/docs/en/sql-reference/statements/select/distinct.md b/docs/en/sql-reference/statements/select/distinct.md
index 10326b0ef8f..08359b035ae 100644
--- a/docs/en/sql-reference/statements/select/distinct.md
+++ b/docs/en/sql-reference/statements/select/distinct.md
@@ -5,7 +5,7 @@ sidebar_label: DISTINCT
 
 # DISTINCT Clause
 
-If `SELECT DISTINCT` is specified, only unique rows will remain in a query result. Thus only a single row will remain out of all the sets of fully matching rows in the result.
+If `SELECT DISTINCT` is specified, only unique rows will remain in a query result. Thus, only a single row will remain out of all the sets of fully matching rows in the result.
 
 You can specify the list of columns that must have unique values: `SELECT DISTINCT ON (column1, column2,...)`. If the columns are not specified, all of them are taken into consideration.
 
diff --git a/docs/en/sql-reference/statements/select/union.md b/docs/en/sql-reference/statements/select/union.md
index 92a4ed1bb20..39ed3f2aceb 100644
--- a/docs/en/sql-reference/statements/select/union.md
+++ b/docs/en/sql-reference/statements/select/union.md
@@ -83,6 +83,3 @@ Queries that are parts of `UNION/UNION ALL/UNION DISTINCT` can be run simultaneo
 
 - [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/system.md b/docs/en/sql-reference/statements/system.md
index 0fdbbeac235..b35e9426297 100644
--- a/docs/en/sql-reference/statements/system.md
+++ b/docs/en/sql-reference/statements/system.md
@@ -64,11 +64,19 @@ RELOAD FUNCTIONS [ON CLUSTER cluster_name]
 RELOAD FUNCTION [ON CLUSTER cluster_name] function_name
 ```
 
+## RELOAD ASYNCHRONOUS METRICS
+
+Re-calculates all [asynchronous metrics](../../operations/system-tables/asynchronous_metrics.md). Since asynchronous metrics are periodically updated based on setting [asynchronous_metrics_update_period_s](../../operations/server-configuration-parameters/settings.md), updating them manually using this statement is typically not necessary.
+
+```sql
+RELOAD ASYNCHRONOUS METRICS [ON CLUSTER cluster_name]
+```
+
 ## DROP DNS CACHE
 
 Clears ClickHouse’s internal DNS cache. Sometimes (for old ClickHouse versions) it is necessary to use this command when changing the infrastructure (changing the IP address of another ClickHouse server or the server used by dictionaries).
 
-For more convenient (automatic) cache management, see disable_internal_dns_cache, dns_cache_update_period parameters.
+For more convenient (automatic) cache management, see disable_internal_dns_cache, dns_cache_max_entries, dns_cache_update_period parameters.
 
 ## DROP MARK CACHE
 
@@ -180,10 +188,16 @@ SYSTEM STOP DISTRIBUTED SENDS [db.]<distributed_table_name> [ON CLUSTER cluster_
 
 Forces ClickHouse to send data to cluster nodes synchronously. If any nodes are unavailable, ClickHouse throws an exception and stops query execution. You can retry the query until it succeeds, which will happen when all nodes are back online.
 
+You can also override some settings via `SETTINGS` clause, this can be useful to avoid some temporary limitations, like `max_concurrent_queries_for_all_users` or `max_memory_usage`.
+
 ``` sql
-SYSTEM FLUSH DISTRIBUTED [db.]<distributed_table_name> [ON CLUSTER cluster_name]
+SYSTEM FLUSH DISTRIBUTED [db.]<distributed_table_name> [ON CLUSTER cluster_name] [SETTINGS ...]
 ```
 
+:::note
+Each pending block is stored in disk with settings from the initial INSERT query, so that is why sometimes you may want to override settings.
+:::
+
 ### START DISTRIBUTED SENDS
 
 Enables background data distribution when inserting data into distributed tables.
@@ -343,13 +357,14 @@ SYSTEM START PULLING REPLICATION LOG [ON CLUSTER cluster_name] [[db.]replicated_
 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 [STRICT | LIGHTWEIGHT | PULL]
+SYSTEM SYNC REPLICA [ON CLUSTER cluster_name] [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT [FROM 'srcReplica1'[, 'srcReplica2'[, ...]]] | 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. 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 `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.  
+   Additionally, the LIGHTWEIGHT modifier supports an optional FROM 'srcReplicas' clause, where 'srcReplicas' is a comma-separated list of source replica names. This extension allows for more targeted synchronization by focusing only on replication tasks originating from the specified source replicas.
  - 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.
 
 ### SYNC DATABASE REPLICA
diff --git a/docs/en/sql-reference/statements/truncate.md b/docs/en/sql-reference/statements/truncate.md
index 029815a4392..8cd5a6a1424 100644
--- a/docs/en/sql-reference/statements/truncate.md
+++ b/docs/en/sql-reference/statements/truncate.md
@@ -23,9 +23,16 @@ You can specify how long (in seconds) to wait for inactive replicas to execute `
 If the `alter_sync` is set to `2` and some replicas are not active for more than the time, specified by the `replication_wait_for_inactive_replica_timeout` setting, then an exception `UNFINISHED` is thrown.
 :::
 
+## TRUNCATE ALL TABLES
+``` sql
+TRUNCATE ALL TABLES [IF EXISTS] db [ON CLUSTER cluster]
+```
+
+Removes all data from all tables in a database.
+
 ## TRUNCATE DATABASE
 ``` sql
-TRUNCATE DATABASE [IF EXISTS] [db.]name [ON CLUSTER cluster]
+TRUNCATE DATABASE [IF EXISTS] db [ON CLUSTER cluster]
 ```
 
 Removes all tables from a database but keeps the database itself. When the clause `IF EXISTS` is omitted, the query returns an error if the database does not exist.
diff --git a/docs/en/sql-reference/statements/undrop.md b/docs/en/sql-reference/statements/undrop.md
index 40ac1ab4f99..4b138bfe679 100644
--- a/docs/en/sql-reference/statements/undrop.md
+++ b/docs/en/sql-reference/statements/undrop.md
@@ -13,13 +13,6 @@ 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)
 :::
@@ -32,60 +25,53 @@ UNDROP TABLE [db.]name [UUID '<uuid>'] [ON CLUSTER cluster]
 
 **Example**
 
-``` sql
-set allow_experimental_undrop_table_query = 1;
-```
-
 ```sql
-CREATE TABLE undropMe
+CREATE TABLE tab
 (
     `id` UInt8
 )
 ENGINE = MergeTree
-ORDER BY id
-```
+ORDER BY id;
+
+DROP TABLE tab;
 
-```sql
-DROP TABLE undropMe
-```
-```sql
 SELECT *
 FROM system.dropped_tables
-FORMAT Vertical
+FORMAT Vertical;
 ```
+
 ```response
 Row 1:
 ──────
 index:                 0
 database:              default
-table:                 undropMe
+table:                 tab
 uuid:                  aa696a1a-1d70-4e60-a841-4c80827706cc
 engine:                MergeTree
-metadata_dropped_path: /var/lib/clickhouse/metadata_dropped/default.undropMe.aa696a1a-1d70-4e60-a841-4c80827706cc.sql
+metadata_dropped_path: /var/lib/clickhouse/metadata_dropped/default.tab.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
+UNDROP TABLE tab;
+
 SELECT *
 FROM system.dropped_tables
-FORMAT Vertical
-```
+FORMAT Vertical;
+
 ```response
 Ok.
 
 0 rows in set. Elapsed: 0.001 sec. 
 ```
+
 ```sql
-DESCRIBE TABLE undropMe
-FORMAT Vertical
+DESCRIBE TABLE tab
+FORMAT Vertical;
 ```
+
 ```response
 Row 1:
 ──────
diff --git a/docs/en/sql-reference/table-functions/cluster.md b/docs/en/sql-reference/table-functions/cluster.md
index ad92ab39183..136ff72e4a9 100644
--- a/docs/en/sql-reference/table-functions/cluster.md
+++ b/docs/en/sql-reference/table-functions/cluster.md
@@ -5,7 +5,7 @@ sidebar_label: cluster
 title: "cluster, clusterAllReplicas"
 ---
 
-Allows to access all shards in an existing cluster which configured in `remote_servers` section without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. One replica of each shard is queried.
+Allows to access all shards (configured in the `remote_servers` section) of a cluster without creating a [Distributed](../../engines/table-engines/special/distributed.md) table. Only one replica of each shard is queried.
 
 `clusterAllReplicas` function — same as `cluster`, but all replicas are queried. Each replica in a cluster is used as a separate shard/connection.
 
diff --git a/docs/en/sql-reference/table-functions/executable.md b/docs/en/sql-reference/table-functions/executable.md
index d377c5d4d0c..512dc1a9f13 100644
--- a/docs/en/sql-reference/table-functions/executable.md
+++ b/docs/en/sql-reference/table-functions/executable.md
@@ -7,7 +7,7 @@ keywords: [udf, user defined function, clickhouse, executable, table, function]
 
 # executable Table Function for UDFs
 
-The `executable` table function creates a table based on the output of a user-defined function (UDF) that you define in a script that outputs rows to **stdout**. The executable script is stored in the `users_scripts` directory and can read data from any source.
+The `executable` table function creates a table based on the output of a user-defined function (UDF) that you define in a script that outputs rows to **stdout**. The executable script is stored in the `users_scripts` directory and can read data from any source. Make sure your ClickHouse server has all the required packages to run the executable script. For example, if it is a Python script, ensure that the server has the necessary Python packages installed.
 
 You can optionally include one or more input queries that stream their results to **stdin** for the script to read.
 
@@ -63,7 +63,7 @@ if __name__ == "__main__":
 Let's invoke the script and have it generate 10 random strings:
 
 ```sql
-SELECT * FROM executable('my_script.py', TabSeparated, 'id UInt32, random String', (SELECT 10))
+SELECT * FROM executable('generate_random.py', TabSeparated, 'id UInt32, random String', (SELECT 10))
 ```
 
 The response looks like:
diff --git a/docs/en/sql-reference/table-functions/fileCluster.md b/docs/en/sql-reference/table-functions/fileCluster.md
index 2646250311c..4677d2883a7 100644
--- a/docs/en/sql-reference/table-functions/fileCluster.md
+++ b/docs/en/sql-reference/table-functions/fileCluster.md
@@ -59,9 +59,7 @@ INSERT INTO TABLE FUNCTION file('file2.csv', 'CSV', 'i UInt32, s String') VALUES
 Now, read data contents of `test1.csv` and `test2.csv` via `fileCluster` table function:
 
 ```sql
-SELECT * from fileCluster(
-    'my_cluster', 'file{1,2}.csv', 'CSV', 'i UInt32, s String') ORDER BY (i, s)"""
-)
+SELECT * FROM fileCluster('my_cluster', 'file{1,2}.csv', 'CSV', 'i UInt32, s String') ORDER BY i, s
 ```
 
 ```
diff --git a/docs/en/sql-reference/table-functions/fuzzJSON.md b/docs/en/sql-reference/table-functions/fuzzJSON.md
index a64f35691f6..ab7bd7f9f1b 100644
--- a/docs/en/sql-reference/table-functions/fuzzJSON.md
+++ b/docs/en/sql-reference/table-functions/fuzzJSON.md
@@ -9,7 +9,7 @@ sidebar_label: fuzzJSON
 Perturbs a JSON string with random variations.
 
 ``` sql
-fuzzJSON({ named_collection [option=value [,..]] | json_str[, random_seed] })
+fuzzJSON({ named_collection [, option=value [,..]] | json_str[, random_seed] })
 ```
 
 **Arguments**
diff --git a/docs/en/sql-reference/table-functions/gcs.md b/docs/en/sql-reference/table-functions/gcs.md
index 5ffc20189da..80077ecdb33 100644
--- a/docs/en/sql-reference/table-functions/gcs.md
+++ b/docs/en/sql-reference/table-functions/gcs.md
@@ -16,7 +16,8 @@ If you have multiple replicas in your cluster, you can use the [s3Cluster functi
 **Syntax**
 
 ``` sql
-gcs(path [,hmac_key, hmac_secret] [,format] [,structure] [,compression])
+gcs(url [, NOSIGN | hmac_key, hmac_secret] [,format] [,structure] [,compression_method])
+gcs(named_collection[, option=value [,..]])
 ```
 
 :::tip GCS
@@ -24,10 +25,9 @@ The GCS Table Function integrates with Google Cloud Storage by using the GCS XML
 
 :::
 
-**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.
+**Parameters**
 
+- `url` — Bucket 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:
   ```
@@ -35,10 +35,21 @@ The GCS Table Function integrates with Google Cloud Storage by using the GCS XML
   ```
   and not ~~https://storage.cloud.google.com~~.
   :::
+- `NOSIGN` — If this keyword is provided in place of credentials, all the requests will not be signed.
+- `hmac_key` and `hmac_secret` — 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, ...'`.
+- `compression_method` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression method by file extension.
+
+Arguments can also be passed using [named collections](/docs/en/operations/named-collections.md). In this case `url`, `format`, `structure`, `compression_method` work in the same way, and some extra parameters are supported:
+
+ - `access_key_id` — `hmac_key`, optional.
+ - `secret_access_key` — `hmac_secret`, optional.
+ - `filename` — appended to the url if specified.
+ - `use_environment_credentials` — enabled by default, allows passing extra parameters using environment variables `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI`, `AWS_CONTAINER_CREDENTIALS_FULL_URI`, `AWS_CONTAINER_AUTHORIZATION_TOKEN`, `AWS_EC2_METADATA_DISABLED`.
+ - `no_sign_request` — disabled by default.
+ - `expiration_window_seconds` — default value is 120.
 
--   `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**
 
@@ -61,7 +72,7 @@ LIMIT 2;
 └─────────┴─────────┴─────────┘
 ```
 
-The similar but from file with `gzip` compression:
+The similar but from file with `gzip` compression method:
 
 ``` sql
 SELECT *
@@ -158,6 +169,16 @@ The below get data from all `test-data.csv.gz` files from any folder inside `my-
 SELECT * FROM gcs('https://storage.googleapis.com/my-test-bucket-768/**/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
 ```
 
+For production use cases it is recommended to use [named collections](/docs/en/operations/named-collections.md). Here is the example:
+``` sql
+
+CREATE NAMED COLLECTION creds AS
+        access_key_id = '***',
+        secret_access_key = '***';
+SELECT count(*)
+FROM gcs(creds, url='https://s3-object-url.csv')
+```
+
 ## 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.
diff --git a/docs/en/sql-reference/table-functions/generate.md b/docs/en/sql-reference/table-functions/generate.md
index 3b9b077af49..a78015e9830 100644
--- a/docs/en/sql-reference/table-functions/generate.md
+++ b/docs/en/sql-reference/table-functions/generate.md
@@ -53,7 +53,7 @@ SELECT * FROM random;
 └──────────────────────────────┴──────────────┴────────────────────────────────────────────────────────────────────┘
 ```
 
-In combination with [generateRandomStructure](../../sql-reference/functions/other-functions.md#generateRandomStructure):
+In combination with [generateRandomStructure](../../sql-reference/functions/other-functions.md#generaterandomstructure):
 
 ```sql
 SELECT * FROM generateRandom(generateRandomStructure(4, 101), 101) LIMIT 3;
diff --git a/docs/en/sql-reference/table-functions/generateSeries.md b/docs/en/sql-reference/table-functions/generateSeries.md
new file mode 100644
index 00000000000..addf539a959
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/generateSeries.md
@@ -0,0 +1,8 @@
+---
+slug: /en/sql-reference/table-functions/generateSeries
+sidebar_position: 147
+sidebar_label: generateSeries
+---
+
+### Alias To
+[generate_series](generate_series.md)
\ No newline at end of file
diff --git a/docs/en/sql-reference/table-functions/generate_series.md b/docs/en/sql-reference/table-functions/generate_series.md
new file mode 100644
index 00000000000..c5d29369627
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/generate_series.md
@@ -0,0 +1,25 @@
+---
+slug: /en/sql-reference/table-functions/generate_series
+sidebar_position: 146
+sidebar_label: generate_series
+---
+
+# generate_series
+
+`generate_series(START, STOP)` - Returns a table with the single ‘generate_series’ column (UInt64) that contains integers from start to stop inclusively.
+
+`generate_series(START, STOP, STEP)` - Returns a table with the single ‘generate_series’ column (UInt64) that contains integers from start to stop inclusively with spacing between values given by STEP. 
+
+The following queries return tables with the same content but different column names:
+
+``` sql
+SELECT * FROM numbers(10, 5);
+SELECT * FROM generate_series(10, 14);
+```
+
+And the following queries return tables with the same content but different column names (but the second option is more efficient):
+
+``` sql
+SELECT * FROM numbers(10, 11) WHERE number % 3 == (10 % 3);
+SELECT * FROM generate_series(10, 20, 3) ;
+```
\ No newline at end of file
diff --git a/docs/en/sql-reference/table-functions/jdbc.md b/docs/en/sql-reference/table-functions/jdbc.md
index fbc917c1e1a..6b801344a83 100644
--- a/docs/en/sql-reference/table-functions/jdbc.md
+++ b/docs/en/sql-reference/table-functions/jdbc.md
@@ -6,6 +6,11 @@ sidebar_label: jdbc
 
 # jdbc
 
+:::note
+clickhouse-jdbc-bridge contains experimental codes and is no longer supported. It may contain reliability issues and security vulnerabilities. Use it at your own risk. 
+ClickHouse recommend using built-in table functions in ClickHouse which provide a better alternative for ad-hoc querying scenarios (Postgres, MySQL, MongoDB, etc).
+:::
+
 `jdbc(datasource, schema, table)` - returns table that is connected via JDBC driver.
 
 This table function requires separate [clickhouse-jdbc-bridge](https://github.com/ClickHouse/clickhouse-jdbc-bridge) program to be running.
diff --git a/docs/en/sql-reference/table-functions/merge.md b/docs/en/sql-reference/table-functions/merge.md
index a1f376ba0eb..1d21bd504af 100644
--- a/docs/en/sql-reference/table-functions/merge.md
+++ b/docs/en/sql-reference/table-functions/merge.md
@@ -11,11 +11,11 @@ Creates a temporary [Merge](../../engines/table-engines/special/merge.md) table.
 **Syntax**
 
 ```sql
-merge('db_name', 'tables_regexp')
+merge(['db_name',] 'tables_regexp')
 ```
 **Arguments**
 
-- `db_name` — Possible values:
+- `db_name` — Possible values (optional, default is `currentDatabase()`):
     - database name,
     - constant expression that returns a string with a database name, for example, `currentDatabase()`,
     - `REGEXP(expression)`, where `expression` is a regular expression to match the DB names.
diff --git a/docs/en/sql-reference/table-functions/mergeTreeIndex.md b/docs/en/sql-reference/table-functions/mergeTreeIndex.md
new file mode 100644
index 00000000000..dccfd1cfc97
--- /dev/null
+++ b/docs/en/sql-reference/table-functions/mergeTreeIndex.md
@@ -0,0 +1,83 @@
+---
+slug: /en/sql-reference/table-functions/mergeTreeIndex
+sidebar_position: 77
+sidebar_label: mergeTreeIndex
+---
+
+# mergeTreeIndex
+
+Represents the contents of index and marks files of MergeTree tables. It can be used for introspection
+
+``` sql
+mergeTreeIndex(database, table, [with_marks = true])
+```
+
+**Arguments**
+
+- `database`- The database name to read index and marks from.
+- `table`- The table name to read index and marks from.
+- `with_marks` - Whether include columns with marks to the result.
+
+**Returned Value**
+
+A table object with columns with values of primary index of source table, columns with values of marks (if enabled) for all possible files in data parts of source table and virtual columns:
+
+- `part_name` - The name of data part.
+- `mark_number` - The number of current mark in data part.
+- `rows_in_granule` - The number of rows in current granule.
+
+Marks column may contain `(NULL, NULL)` value in case when column is absent in data part or marks for one of its substreams are not written (e.g. in compact parts).
+
+## Usage Example
+
+```sql
+CREATE TABLE test_table
+(
+    `id` UInt64,
+    `n` UInt64,
+    `arr` Array(UInt64)
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity = 3, min_bytes_for_wide_part = 0, min_rows_for_wide_part = 8;
+
+INSERT INTO test_table SELECT number, number, range(number % 5) FROM numbers(5);
+
+INSERT INTO test_table SELECT number, number, range(number % 5) FROM numbers(10, 10);
+```
+
+```sql
+SELECT * FROM mergeTreeIndex(currentDatabase(), test_table, with_marks = true);
+```
+
+```text
+┌─part_name─┬─mark_number─┬─rows_in_granule─┬─id─┬─id.mark─┬─n.mark──┬─arr.size0.mark─┬─arr.mark─�
+│ all_1_1_0 │           0 │               3 │  0 │ (0,0)   │ (42,0)  │ (NULL,NULL)    │ (84,0)   │
+│ all_1_1_0 │           1 │               2 │  3 │ (133,0) │ (172,0) │ (NULL,NULL)    │ (211,0)  │
+│ all_1_1_0 │           2 │               0 │  4 │ (271,0) │ (271,0) │ (NULL,NULL)    │ (271,0)  │
+└───────────┴─────────────┴─────────────────┴────┴─────────┴─────────┴────────────────┴──────────┘
+┌─part_name─┬─mark_number─┬─rows_in_granule─┬─id─┬─id.mark─┬─n.mark─┬─arr.size0.mark─┬─arr.mark─�
+│ all_2_2_0 │           0 │               3 │ 10 │ (0,0)   │ (0,0)  │ (0,0)          │ (0,0)    │
+│ all_2_2_0 │           1 │               3 │ 13 │ (0,24)  │ (0,24) │ (0,24)         │ (0,24)   │
+│ all_2_2_0 │           2 │               3 │ 16 │ (0,48)  │ (0,48) │ (0,48)         │ (0,80)   │
+│ all_2_2_0 │           3 │               1 │ 19 │ (0,72)  │ (0,72) │ (0,72)         │ (0,128)  │
+│ all_2_2_0 │           4 │               0 │ 19 │ (0,80)  │ (0,80) │ (0,80)         │ (0,160)  │
+└───────────┴─────────────┴─────────────────┴────┴─────────┴────────┴────────────────┴──────────┘
+```
+
+```sql
+DESCRIBE mergeTreeIndex(currentDatabase(), test_table, with_marks = true) SETTINGS describe_compact_output = 1;
+```
+
+```text
+┌─name────────────┬─type─────────────────────────────────────────────────────────────────────────────────────────────�
+│ part_name       │ String                                                                                           │
+│ mark_number     │ UInt64                                                                                           │
+│ rows_in_granule │ UInt64                                                                                           │
+│ id              │ UInt64                                                                                           │
+│ id.mark         │ Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64)) │
+│ n.mark          │ Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64)) │
+│ arr.size0.mark  │ Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64)) │
+│ arr.mark        │ Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64)) │
+└─────────────────┴──────────────────────────────────────────────────────────────────────────────────────────────────┘
+```
diff --git a/docs/en/sql-reference/table-functions/mysql.md b/docs/en/sql-reference/table-functions/mysql.md
index 0e5b0f54d1c..5fd9708317c 100644
--- a/docs/en/sql-reference/table-functions/mysql.md
+++ b/docs/en/sql-reference/table-functions/mysql.md
@@ -11,31 +11,25 @@ Allows `SELECT` and `INSERT` queries to be performed on data that is stored on a
 **Syntax**
 
 ``` sql
-mysql('host:port', 'database', 'table', 'user', 'password'[, replace_query, 'on_duplicate_clause'])
+mysql({host:port, database, table, user, password[, replace_query, on_duplicate_clause] | named_collection[, option=value [,..]]})
 ```
 
-**Arguments**
+**Parameters**
 
 - `host:port` — MySQL server address.
-
 - `database` — Remote database name.
-
 - `table` — Remote table name.
-
 - `user` — MySQL user.
-
 - `password` — User password.
-
 - `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).
-
     Example: `INSERT INTO t (c1,c2) VALUES ('a', 2) ON DUPLICATE KEY UPDATE c2 = c2 + 1;`
-
     `on_duplicate_clause` here is `UPDATE c2 = c2 + 1`. See the MySQL documentation to find which `on_duplicate_clause` you can use with the `ON DUPLICATE KEY` clause.
 
+Arguments also can be passed using [named collections](/docs/en/operations/named-collections.md). In this case `host` and `port` should be specified separately. This approach is recommended for production environment.
+
 Simple `WHERE` clauses such as `=, !=, >, >=, <, <=` are currently executed on the MySQL server.
 
 The rest of the conditions and the `LIMIT` sampling constraint are executed in ClickHouse only after the query to MySQL finishes.
@@ -86,6 +80,18 @@ Selecting data from ClickHouse:
 SELECT * FROM mysql('localhost:3306', 'test', 'test', 'bayonet', '123');
 ```
 
+Or using [named collections](/docs/en/operations/named-collections.md):
+
+```sql
+CREATE NAMED COLLECTION creds AS
+        host = 'localhost',
+        port = 3306,
+        database = 'test',
+        user = 'bayonet',
+        password = '123';
+SELECT * FROM mysql(creds, table='test');
+```
+
 ``` text
 ┌─int_id─┬─float─�
 │      1 │     2 │
diff --git a/docs/en/sql-reference/table-functions/numbers.md b/docs/en/sql-reference/table-functions/numbers.md
index 7d3437b7d53..e0ff19b9824 100644
--- a/docs/en/sql-reference/table-functions/numbers.md
+++ b/docs/en/sql-reference/table-functions/numbers.md
@@ -8,6 +8,7 @@ sidebar_label: numbers
 
 `numbers(N)` – Returns a table with the single ‘number’ column (UInt64) that contains integers from 0 to N-1.
 `numbers(N, M)` - Returns a table with the single ‘number’ column (UInt64) that contains integers from N to (N + M - 1).
+`numbers(N, M, S)` - Returns a table with the single ‘number’ column (UInt64) that contains integers from N to (N + M - 1) with step S.
 
 Similar to the `system.numbers` table, it can be used for testing and generating successive values, `numbers(N, M)` more efficient than `system.numbers`.
 
@@ -21,6 +22,15 @@ SELECT * FROM system.numbers WHERE number BETWEEN 0 AND 9;
 SELECT * FROM system.numbers WHERE number IN (0, 1, 2, 3, 4, 5, 6, 7, 8, 9);
 ```
 
+And the following queries are equivalent:
+
+``` sql
+SELECT number * 2 FROM numbers(10);
+SELECT (number - 10) * 2 FROM numbers(10, 10);
+SELECT * FROM numbers(0, 20, 2);
+```
+
+
 Examples:
 
 ``` sql
diff --git a/docs/en/sql-reference/table-functions/postgresql.md b/docs/en/sql-reference/table-functions/postgresql.md
index b9211d70cdb..3fd0e5805e7 100644
--- a/docs/en/sql-reference/table-functions/postgresql.md
+++ b/docs/en/sql-reference/table-functions/postgresql.md
@@ -11,10 +11,10 @@ Allows `SELECT` and `INSERT` queries to be performed on data that is stored on a
 **Syntax**
 
 ``` sql
-postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
+postgresql({host:port, database, table, user, password[, schema, [, on_conflict]] | named_collection[, option=value [,..]]})
 ```
 
-**Arguments**
+**Parameters**
 
 - `host:port` — PostgreSQL server address.
 - `database` — Remote database name.
@@ -22,6 +22,9 @@ postgresql('host:port', 'database', 'table', 'user', 'password'[, `schema`])
 - `user` — PostgreSQL user.
 - `password` — User password.
 - `schema` — Non-default table schema. Optional.
+- `on_conflict` — Conflict resolution strategy. Example: `ON CONFLICT DO NOTHING`. Optional.
+
+Arguments also can be passed using [named collections](/docs/en/operations/named-collections.md). In this case `host` and `port` should be specified separately. This approach is recommended for production environment.
 
 **Returned Value**
 
@@ -86,12 +89,24 @@ postgresql> SELECT * FROM test;
 (1 row)
 ```
 
-Selecting data from ClickHouse:
+Selecting data from ClickHouse using plain arguments:
 
 ```sql
 SELECT * FROM postgresql('localhost:5432', 'test', 'test', 'postgresql_user', 'password') WHERE str IN ('test');
 ```
 
+Or using [named collections](/docs/en/operations/named-collections.md):
+
+```sql
+CREATE NAMED COLLECTION mypg AS
+        host = 'localhost',
+        port = 5432,
+        database = 'test',
+        user = 'postgresql_user',
+        password = 'password';
+SELECT * FROM postgresql(mypg, table='test') WHERE str IN ('test');
+```
+
 ``` text
 ┌─int_id─┬─int_nullable─┬─float─┬─str──┬─float_nullable─�
 │      1 │         ᴺ�ᴸᴸ │     2 │ test │           ᴺ�ᴸᴸ │
diff --git a/docs/en/sql-reference/table-functions/redis.md b/docs/en/sql-reference/table-functions/redis.md
index 98d9a647cee..09841642210 100644
--- a/docs/en/sql-reference/table-functions/redis.md
+++ b/docs/en/sql-reference/table-functions/redis.md
@@ -34,6 +34,7 @@ redis(host:port, key, structure[, db_index[, password[, pool_size]]])
 
 - queries with key equals or in filtering will be optimized to multi keys lookup from Redis. If queries without filtering key full table scan will happen which is a heavy operation.
 
+[Named collections](/docs/en/operations/named-collections.md) are not supported for `redis` table function at the moment.
 
 **Returned Value**
 
@@ -41,17 +42,7 @@ A table object with key as Redis key, other columns packaged together as Redis v
 
 ## Usage Example {#usage-example}
 
-Create a table in ClickHouse which allows to read data from Redis:
-
-``` sql
-CREATE TABLE redis_table
-(
-    `k` String,
-    `m` String,
-    `n` UInt32
-)
-ENGINE = Redis('redis1:6379') PRIMARY KEY(k);
-```
+Read from Redis:
 
 ```sql
 SELECT * FROM redis(
@@ -61,6 +52,15 @@ SELECT * FROM redis(
 )
 ```
 
+Insert into Redis:
+
+```sql
+INSERT INTO TABLE FUNCTION redis(
+    'redis1:6379',
+    'key',
+    'key String, v1 String, v2 UInt32') values ('1', '1', 1);
+```
+
 **See Also**
 
 - [The `Redis` table engine](/docs/en/engines/table-engines/integrations/redis.md)
diff --git a/docs/en/sql-reference/table-functions/remote.md b/docs/en/sql-reference/table-functions/remote.md
index 228f4a4c7e1..f6e49099d99 100644
--- a/docs/en/sql-reference/table-functions/remote.md
+++ b/docs/en/sql-reference/table-functions/remote.md
@@ -13,10 +13,12 @@ Both functions can be used in `SELECT` and `INSERT` queries.
 ## Syntax
 
 ``` sql
-remote('addresses_expr', [db, table, 'user'[, 'password'], sharding_key])
-remote('addresses_expr', [db.table, 'user'[, 'password'], sharding_key])
-remoteSecure('addresses_expr', [db, table, 'user'[, 'password'], sharding_key])
-remoteSecure('addresses_expr', [db.table, 'user'[, 'password'], sharding_key])
+remote(addresses_expr, [db, table, user [, password], sharding_key])
+remote(addresses_expr, [db.table, user [, password], sharding_key])
+remote(named_collection[, option=value [,..]])
+remoteSecure(addresses_expr, [db, table, user [, password], sharding_key])
+remoteSecure(addresses_expr, [db.table, user [, password], sharding_key])
+remoteSecure(named_collection[, option=value [,..]])
 ```
 
 ## Parameters
@@ -39,6 +41,8 @@ remoteSecure('addresses_expr', [db.table, 'user'[, 'password'], sharding_key])
 - `password` — User password. If not specified, an empty password is used. Type: [String](../../sql-reference/data-types/string.md).
 - `sharding_key` — Sharding key to support distributing data across nodes. For example: `insert into remote('127.0.0.1:9000,127.0.0.2', db, table, 'default', rand())`. Type: [UInt32](../../sql-reference/data-types/int-uint.md).
 
+Arguments also can be passed using [named collections](/docs/en/operations/named-collections.md).
+
 ## Returned value
 
 A table located on a remote server.
@@ -82,7 +86,16 @@ example01-01-1,example01-02-1
 SELECT * FROM remote('127.0.0.1', db.remote_engine_table) LIMIT 3;
 ```
 
-### Inserting data from a remote server into a table:
+Or using [named collections](/docs/en/operations/named-collections.md):
+
+```sql
+CREATE NAMED COLLECTION creds AS
+        host = '127.0.0.1',
+        database = 'db';
+SELECT * FROM remote(creds, table='remote_engine_table') LIMIT 3;
+```
+
+### Inserting data into a table on a remote server:
 
 ``` sql
 CREATE TABLE remote_table (name String, value UInt32) ENGINE=Memory;
diff --git a/docs/en/sql-reference/table-functions/s3.md b/docs/en/sql-reference/table-functions/s3.md
index 8065f066666..970b3e52882 100644
--- a/docs/en/sql-reference/table-functions/s3.md
+++ b/docs/en/sql-reference/table-functions/s3.md
@@ -16,33 +16,41 @@ When using the `s3 table function` with [`INSERT INTO...SELECT`](../../sql-refer
 **Syntax**
 
 ``` sql
-s3(path [, NOSIGN | aws_access_key_id, aws_secret_access_key [,session_token]] [,format] [,structure] [,compression])
+s3(url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,structure] [,compression_method])
+s3(named_collection[, option=value [,..]])
 ```
 
 :::tip GCS
 The S3 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.
 
-For GCS, substitute your HMAC key and HMAC secret where you see `aws_access_key_id` and `aws_secret_access_key`.
+For GCS, substitute your HMAC key and HMAC secret where you see `access_key_id` and `secret_access_key`.
 :::
 
-**Arguments**
+**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 [here](../../engines/table-engines/integrations/s3.md#wildcards-in-path).
+`s3` table function supports the following plain parameters:
 
+- `url` — 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:
+  The GCS url 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~~.
   :::
-
-- `NOSIGN` - If this keyword is provided in place of credentials, all the requests will not be signed.
-- `access_key_id`, `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
+- `NOSIGN` — If this keyword is provided in place of credentials, all the requests will not be signed.
+- `access_key_id` and `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
 - `session_token` - Session token to use with the given keys. Optional when passing keys.
 - `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.
+- `compression_method` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression method by file extension.
+
+Arguments can also be passed using [named collections](/docs/en/operations/named-collections.md). In this case `url`, `access_key_id`, `secret_access_key`, `format`, `structure`, `compression_method` work in the same way, and some extra parameters are supported:
+
+ - `filename` — appended to the url if specified.
+ - `use_environment_credentials` — enabled by default, allows passing extra parameters using environment variables `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI`, `AWS_CONTAINER_CREDENTIALS_FULL_URI`, `AWS_CONTAINER_AUTHORIZATION_TOKEN`, `AWS_EC2_METADATA_DISABLED`.
+ - `no_sign_request` — disabled by default.
+ - `expiration_window_seconds` — default value is 120.
 
 **Returned value**
 
@@ -82,7 +90,7 @@ FROM s3(
 LIMIT 5;
 ```
 
-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.
+ClickHouse also can determine the compression method of the file. For example, if the file was zipped up with a `.csv.gz` extension, ClickHouse would decompress the file automatically.
 :::
 
 
@@ -168,7 +176,7 @@ The below get data from all `test-data.csv.gz` files from any folder inside `my-
 SELECT * FROM s3('https://clickhouse-public-datasets.s3.amazonaws.com/my-test-bucket-768/**/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
 ```
 
-Note. It is possible to specify custom URL mappers in the server configuration file. Example: 
+Note. It is possible to specify custom URL mappers in the server configuration file. Example:
 ``` sql
 SELECT * FROM s3('s3://clickhouse-public-datasets/my-test-bucket-768/**/test-data.csv.gz', 'CSV', 'name String, value UInt32', 'gzip');
 ```
@@ -190,6 +198,16 @@ Custom mapper can be added into `config.xml`:
 </url_scheme_mappers>
 ```
 
+For production use cases it is recommended to use [named collections](/docs/en/operations/named-collections.md). Here is the example:
+``` sql
+
+CREATE NAMED COLLECTION creds AS
+        access_key_id = '***',
+        secret_access_key = '***';
+SELECT count(*)
+FROM s3(creds, url='https://s3-object-url.csv')
+```
+
 ## Partitioned Write
 
 If you specify `PARTITION BY` expression when inserting data into `S3` table, a separate file is created for each partition value. Splitting the data into separate files helps to improve reading operations efficiency.
diff --git a/docs/en/sql-reference/table-functions/s3Cluster.md b/docs/en/sql-reference/table-functions/s3Cluster.md
index 080c9860519..92d9527df82 100644
--- a/docs/en/sql-reference/table-functions/s3Cluster.md
+++ b/docs/en/sql-reference/table-functions/s3Cluster.md
@@ -4,23 +4,34 @@ sidebar_position: 181
 sidebar_label: s3Cluster
 title: "s3Cluster Table Function"
 ---
+This is an extension to the [s3](/docs/en/sql-reference/table-functions/s3.md) table function.
 
 Allows processing files from [Amazon S3](https://aws.amazon.com/s3/) and Google Cloud Storage [Google Cloud Storage](https://cloud.google.com/storage/) 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**
 
 ``` sql
-s3Cluster(cluster_name, source, [,access_key_id, secret_access_key, [session_token]] [,format] [,structure])
+s3Cluster(cluster_name, url [, NOSIGN | access_key_id, secret_access_key, [session_token]] [,format] [,structure] [,compression_method])
+s3Cluster(cluster_name, named_collection[, option=value [,..]])
 ```
 
 **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`, `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
+- `url` — path 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).
+- `NOSIGN` — If this keyword is provided in place of credentials, all the requests will not be signed.
+- `access_key_id` and `secret_access_key` — Keys that specify credentials to use with given endpoint. Optional.
 - `session_token` - Session token to use with the given keys. Optional when passing keys.
 - `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_method` — Parameter is optional. Supported values: `none`, `gzip/gz`, `brotli/br`, `xz/LZMA`, `zstd/zst`. By default, it will autodetect compression method by file extension.
+
+Arguments can also be passed using [named collections](/docs/en/operations/named-collections.md). In this case `url`, `access_key_id`, `secret_access_key`, `format`, `structure`, `compression_method` work in the same way, and some extra parameters are supported:
+
+ - `filename` — appended to the url if specified.
+ - `use_environment_credentials` — enabled by default, allows passing extra parameters using environment variables `AWS_CONTAINER_CREDENTIALS_RELATIVE_URI`, `AWS_CONTAINER_CREDENTIALS_FULL_URI`, `AWS_CONTAINER_AUTHORIZATION_TOKEN`, `AWS_EC2_METADATA_DISABLED`.
+ - `no_sign_request` — disabled by default.
+ - `expiration_window_seconds` — default value is 120.
 
 **Returned value**
 
@@ -47,6 +58,18 @@ Count the total amount of rows in all files in the cluster `cluster_simple`:
 If your listing of files contains number ranges with leading zeros, use the construction with braces for each digit separately or use `?`.
 :::
 
+For production use cases it is recommended to use [named collections](/docs/en/operations/named-collections.md). Here is the example:
+``` sql
+
+CREATE NAMED COLLECTION creds AS
+        access_key_id = 'minio'
+        secret_access_key = 'minio123';
+SELECT count(*) FROM s3Cluster(
+    'cluster_simple', creds, url='https://s3-object-url.csv',
+    format='CSV', structure='name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))'
+)
+```
+
 **See Also**
 
 - [S3 engine](../../engines/table-engines/integrations/s3.md)
diff --git a/docs/en/sql-reference/transactions.md b/docs/en/sql-reference/transactions.md
index cb89a091d68..09cdc192b03 100644
--- a/docs/en/sql-reference/transactions.md
+++ b/docs/en/sql-reference/transactions.md
@@ -127,7 +127,7 @@ See the [deployment](docs/en/deployment-guides/terminology.md) documentation for
 
 #### 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. 
+Issue a `BEGIN TRANSACTION` or `START 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
diff --git a/docs/en/sql-reference/window-functions/index.md b/docs/en/sql-reference/window-functions/index.md
index 6340c369bff..32ebc6d028f 100644
--- a/docs/en/sql-reference/window-functions/index.md
+++ b/docs/en/sql-reference/window-functions/index.md
@@ -5,26 +5,31 @@ sidebar_label: Window Functions
 title: Window Functions
 ---
 
-ClickHouse supports the standard grammar for defining windows and window functions. The following features are currently supported:
+Windows functions let you perform calculations across a set of rows that are related to the current row.
+Some of the calculations that you can do are similar to those that can be done with an aggregate function, but a window function doesn't cause rows to be grouped into a single output - the individual rows are still returned.
 
-| Feature                                                                            | Support or workaround                                                                                                                                                                       |
+## Standard Window Functions
+
+ClickHouse supports the standard grammar for defining windows and window functions. The table below indicates whether a feature is currently supported.
+
+| Feature                                                                            | Supported?                                                                                                                                                                       |
 |------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| ad hoc window specification (`count(*) over (partition by id order by time desc)`) | supported                                                                                                                                                                                   |
-| expressions involving window functions, e.g. `(count(*) over ()) / 2)`             | supported                                                                                                                                                                                   |
-| `WINDOW` clause (`select ... from table window w as (partition by id)`)            | supported                                                                                                                                                                                   |
-| `ROWS` frame                                                                       | supported                                                                                                                                                                                   |
-| `RANGE` frame                                                                      | supported, the default                                                                                                                                                                      |
-| `INTERVAL` syntax for `DateTime` `RANGE OFFSET` frame                              | not supported, specify the number of seconds instead (`RANGE` works with any numeric type).                                                                                                                                 |
-| `GROUPS` frame                                                                     | not supported                                                                                                                                                                               |
-| Calculating aggregate functions over a frame (`sum(value) over (order by time)`)   | all aggregate functions are supported                                                                                                                                                       |
-| `rank()`, `dense_rank()`, `row_number()`                                           | supported                                                                                                                                                                                   |
-| `lag/lead(value, offset)`                                                          | Not supported. Workarounds:                                                                                                                                                                 |
-|                                                                                    | 1) replace with `any(value) over (.... rows between <offset> preceding and <offset> preceding)`, or `following` for `lead`                                                                  |
-|                                                                                    | 2) use `lagInFrame/leadInFrame`, which are analogous, but respect the window frame. To get behavior identical to `lag/lead`, use `rows between unbounded preceding and unbounded following` |
-| ntile(buckets) | Supported. Specify window like, (partition by x order by y rows between unbounded preceding and unrounded following). |
+| ad hoc window specification (`count(*) over (partition by id order by time desc)`) | ✅                                                                                                                                                                                  |
+| expressions involving window functions, e.g. `(count(*) over ()) / 2)`             | ✅                                                                                                                                                                                   |
+| `WINDOW` clause (`select ... from table window w as (partition by id)`)            | ✅                                                                                                                                                                                   |
+| `ROWS` frame                                                                       | ✅                                                                                                                                                                                   |
+| `RANGE` frame                                                                      | ✅ (the default)                                                                                                                                                                      |
+| `INTERVAL` syntax for `DateTime` `RANGE OFFSET` frame                              | � (specify the number of seconds instead (`RANGE` works with any numeric type).)                                                                                                                                 |
+| `GROUPS` frame                                                                     | �                                                                                                                                                                               |
+| Calculating aggregate functions over a frame (`sum(value) over (order by time)`)   | ✅ (All aggregate functions are supported)                                                                                                                                                       |
+| `rank()`, `dense_rank()`, `row_number()`                                           | ✅                                                                                                                                                                                   |
+| `lag/lead(value, offset)`                                                          | � <br/> You can use one of the following workarounds:<br/> 1) `any(value) over (.... rows between <offset> preceding and <offset> preceding)`, or `following` for `lead` <br/> 2) `lagInFrame/leadInFrame`, which are analogous, but respect the window frame. To get behavior identical to `lag/lead`, use `rows between unbounded preceding and unbounded following`                                                                 |
+| ntile(buckets) | ✅ <br/> Specify window like, (partition by x order by y rows between unbounded preceding and unrounded following). |
 
 ## ClickHouse-specific Window Functions
 
+There is also the following ClickHouse specific window function:
+
 ### nonNegativeDerivative(metric_column, timestamp_column[, INTERVAL X UNITS])
 
 Finds non-negative derivative for given `metric_column` by `timestamp_column`. 
@@ -33,40 +38,6 @@ The computed value is the following for each row:
 - `0` for 1st row,
 - ${metric_i - metric_{i-1} \over timestamp_i - timestamp_{i-1}}  * interval$ for $i_th$ row.
 
-## References
-
-### GitHub Issues
-
-The roadmap for the initial support of window functions is [in this issue](https://github.com/ClickHouse/ClickHouse/issues/18097).
-
-All GitHub issues related to window functions have the [comp-window-functions](https://github.com/ClickHouse/ClickHouse/labels/comp-window-functions) tag.
-
-### Tests
-
-These tests contain the examples of the currently supported grammar:
-
-https://github.com/ClickHouse/ClickHouse/blob/master/tests/performance/window_functions.xml
-
-https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/01591_window_functions.sql
-
-### Postgres Docs
-
-https://www.postgresql.org/docs/current/sql-select.html#SQL-WINDOW
-
-https://www.postgresql.org/docs/devel/sql-expressions.html#SYNTAX-WINDOW-FUNCTIONS
-
-https://www.postgresql.org/docs/devel/functions-window.html
-
-https://www.postgresql.org/docs/devel/tutorial-window.html
-
-### MySQL Docs
-
-https://dev.mysql.com/doc/refman/8.0/en/window-function-descriptions.html
-
-https://dev.mysql.com/doc/refman/8.0/en/window-functions-usage.html
-
-https://dev.mysql.com/doc/refman/8.0/en/window-functions-frames.html
-
 ## Syntax
 
 ```text
@@ -80,20 +51,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 expressions.
-
-### Functions
-
-These functions can be used only as a window function.
-
-- `row_number()` - Number the current row within its partition starting from 1.
-- `first_value(x)` - Return the first non-NULL value evaluated within its ordered frame.
-- `last_value(x)` -	Return the last non-NULL value evaluated within its ordered frame.
-- `nth_value(x, offset)` - Return the first non-NULL value evaluated against the nth row (offset) in its ordered frame.
-- `rank()` - Rank the current row within its partition with gaps.
-- `dense_rank()` - Rank the current row within its partition without gaps.
-- `lagInFrame(x)` - Return a value evaluated at the row that is at a specified physical offset row before the current row within the ordered frame.
-- `leadInFrame(x)` - Return a value evaluated at the row that is offset rows after the current row within the ordered frame.
+- `WINDOW` - allows multiple expressions to use the same window definition.
 
 ```text
       PARTITION
@@ -112,8 +70,119 @@ These functions can be used only as a window function.
 └─────────────────┘  <--- UNBOUNDED FOLLOWING (END of the PARTITION)
 ```
 
+### Functions
+
+These functions can be used only as a window function.
+
+- `row_number()` - Number the current row within its partition starting from 1.
+- `first_value(x)` - Return the first non-NULL value evaluated within its ordered frame.
+- `last_value(x)` -	Return the last non-NULL value evaluated within its ordered frame.
+- `nth_value(x, offset)` - Return the first non-NULL value evaluated against the nth row (offset) in its ordered frame.
+- `rank()` - Rank the current row within its partition with gaps.
+- `dense_rank()` - Rank the current row within its partition without gaps.
+- `lagInFrame(x)` - Return a value evaluated at the row that is at a specified physical offset row before the current row within the ordered frame.
+- `leadInFrame(x)` - Return a value evaluated at the row that is offset rows after the current row within the ordered frame.
+
 ## Examples
 
+Let's have a look at some examples of how window functions can be used.
+
+### Numbering rows
+
+```sql
+CREATE TABLE salaries
+(
+    `team` String,
+    `player` String,
+    `salary` UInt32,
+    `position` String
+)
+Engine = Memory;
+
+INSERT INTO salaries FORMAT Values
+    ('Port Elizabeth Barbarians', 'Gary Chen', 195000, 'F'),
+    ('New Coreystad Archdukes', 'Charles Juarez', 190000, 'F'),
+    ('Port Elizabeth Barbarians', 'Michael Stanley', 150000, 'D'),
+    ('New Coreystad Archdukes', 'Scott Harrison', 150000, 'D'),
+    ('Port Elizabeth Barbarians', 'Robert George', 195000, 'M');
+```
+
+```sql
+SELECT player, salary, 
+       row_number() OVER (ORDER BY salary) AS row
+FROM salaries;
+```
+
+```text
+┌─player──────────┬─salary─┬─row─�
+│ Michael Stanley │ 150000 │   1 │
+│ Scott Harrison  │ 150000 │   2 │
+│ Charles Juarez  │ 190000 │   3 │
+│ Gary Chen       │ 195000 │   4 │
+│ Robert George   │ 195000 │   5 │
+└─────────────────┴────────┴─────┘
+```
+
+```sql
+SELECT player, salary, 
+       row_number() OVER (ORDER BY salary) AS row,
+       rank() OVER (ORDER BY salary) AS rank,
+       dense_rank() OVER (ORDER BY salary) AS denseRank
+FROM salaries;
+```
+
+```text
+┌─player──────────┬─salary─┬─row─┬─rank─┬─denseRank─�
+│ Michael Stanley │ 150000 │   1 │    1 │         1 │
+│ Scott Harrison  │ 150000 │   2 │    1 │         1 │
+│ Charles Juarez  │ 190000 │   3 │    3 │         2 │
+│ Gary Chen       │ 195000 │   4 │    4 │         3 │
+│ Robert George   │ 195000 │   5 │    4 │         3 │
+└─────────────────┴────────┴─────┴──────┴───────────┘
+```
+
+### Aggregation functions
+
+Compare each player's salary to the average for their team.
+
+```sql
+SELECT player, salary, team,
+       avg(salary) OVER (PARTITION BY team) AS teamAvg,
+       salary - teamAvg AS diff
+FROM salaries;
+```
+
+```text
+┌─player──────────┬─salary─┬─team──────────────────────┬─teamAvg─┬───diff─�
+│ Charles Juarez  │ 190000 │ New Coreystad Archdukes   │  170000 │  20000 │
+│ Scott Harrison  │ 150000 │ New Coreystad Archdukes   │  170000 │ -20000 │
+│ Gary Chen       │ 195000 │ Port Elizabeth Barbarians │  180000 │  15000 │
+│ Michael Stanley │ 150000 │ Port Elizabeth Barbarians │  180000 │ -30000 │
+│ Robert George   │ 195000 │ Port Elizabeth Barbarians │  180000 │  15000 │
+└─────────────────┴────────┴───────────────────────────┴─────────┴────────┘
+```
+
+Compare each player's salary to the maximum for their team.
+
+```sql
+SELECT player, salary, team,
+       max(salary) OVER (PARTITION BY team) AS teamAvg,
+       salary - teamAvg AS diff
+FROM salaries;
+```
+
+```text
+┌─player──────────┬─salary─┬─team──────────────────────┬─teamAvg─┬───diff─�
+│ Charles Juarez  │ 190000 │ New Coreystad Archdukes   │  190000 │      0 │
+│ Scott Harrison  │ 150000 │ New Coreystad Archdukes   │  190000 │ -40000 │
+│ Gary Chen       │ 195000 │ Port Elizabeth Barbarians │  195000 │      0 │
+│ Michael Stanley │ 150000 │ Port Elizabeth Barbarians │  195000 │ -45000 │
+│ Robert George   │ 195000 │ Port Elizabeth Barbarians │  195000 │      0 │
+└─────────────────┴────────┴───────────────────────────┴─────────┴────────┘
+```
+
+### Partitioning by column
+
 ```sql
 CREATE TABLE wf_partition
 (
@@ -145,6 +214,8 @@ ORDER BY
 └──────────┴───────┴───────┴──────────────┘
 ```
 
+### Frame bounding
+
 ```sql
 CREATE TABLE wf_frame
 (
@@ -156,14 +227,19 @@ ENGINE = Memory;
 
 INSERT INTO wf_frame FORMAT Values
    (1,1,1), (1,2,2), (1,3,3), (1,4,4), (1,5,5);
+```
 
--- frame is bounded by bounds of a partition (BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
+```sql
+-- Frame is bounded by bounds of a partition (BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
 SELECT
     part_key,
     value,
     order,
-    groupArray(value) OVER (PARTITION BY part_key ORDER BY order ASC
-         Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS frame_values
+    groupArray(value) OVER (
+        PARTITION BY part_key 
+        ORDER BY order ASC
+        Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
+    ) AS frame_values
 FROM wf_frame
 ORDER BY
     part_key ASC,
@@ -176,7 +252,9 @@ ORDER BY
 │        1 │     4 │     4 │ [1,2,3,4,5]  │
 │        1 │     5 │     5 │ [1,2,3,4,5]  │
 └──────────┴───────┴───────┴──────────────┘
+```
 
+```sql
 -- short form - no bound expression, no order by
 SELECT
     part_key,
@@ -194,14 +272,19 @@ ORDER BY
 │        1 │     4 │     4 │ [1,2,3,4,5]  │
 │        1 │     5 │     5 │ [1,2,3,4,5]  │
 └──────────┴───────┴───────┴──────────────┘
+```
 
--- frame is bounded by the beggining of a partition and the current row
+```sql
+-- frame is bounded by the beginning of a partition and the current row
 SELECT
     part_key,
     value,
     order,
-    groupArray(value) OVER (PARTITION BY part_key ORDER BY order ASC
-          Rows BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW) AS frame_values
+    groupArray(value) OVER (
+        PARTITION BY part_key 
+        ORDER BY order ASC
+        Rows BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
+    ) AS frame_values
 FROM wf_frame
 ORDER BY
     part_key ASC,
@@ -214,8 +297,10 @@ ORDER BY
 │        1 │     4 │     4 │ [1,2,3,4]    │
 │        1 │     5 │     5 │ [1,2,3,4,5]  │
 └──────────┴───────┴───────┴──────────────┘
+```
 
--- short form (frame is bounded by the beggining of a partition and the current row)
+```sql
+-- short form (frame is bounded by the beginning of a partition and the current row)
 SELECT
     part_key,
     value,
@@ -232,8 +317,10 @@ ORDER BY
 │        1 │     4 │     4 │ [1,2,3,4]    │
 │        1 │     5 │     5 │ [1,2,3,4,5]  │
 └──────────┴───────┴───────┴──────────────┘
+```
 
--- frame is bounded by the beggining of a partition and the current row, but order is backward
+```sql
+-- frame is bounded by the beginning of a partition and the current row, but order is backward
 SELECT
     part_key,
     value,
@@ -250,14 +337,19 @@ ORDER BY
 │        1 │     4 │     4 │ [5,4]        │
 │        1 │     5 │     5 │ [5]          │
 └──────────┴───────┴───────┴──────────────┘
+```
 
+```sql
 -- sliding frame - 1 PRECEDING ROW AND CURRENT ROW
 SELECT
     part_key,
     value,
     order,
-    groupArray(value) OVER (PARTITION BY part_key ORDER BY order ASC
-          Rows BETWEEN 1 PRECEDING AND CURRENT ROW) AS frame_values
+    groupArray(value) OVER (
+        PARTITION BY part_key 
+        ORDER BY order ASC
+        Rows BETWEEN 1 PRECEDING AND CURRENT ROW
+    ) AS frame_values
 FROM wf_frame
 ORDER BY
     part_key ASC,
@@ -270,14 +362,19 @@ ORDER BY
 │        1 │     4 │     4 │ [3,4]        │
 │        1 │     5 │     5 │ [4,5]        │
 └──────────┴───────┴───────┴──────────────┘
+```
 
+```sql
 -- sliding frame - Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING 
 SELECT
     part_key,
     value,
     order,
-    groupArray(value) OVER (PARTITION BY part_key ORDER BY order ASC
-          Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS frame_values
+    groupArray(value) OVER (
+        PARTITION BY part_key 
+        ORDER BY order ASC
+        Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING
+    ) AS frame_values
 FROM wf_frame
 ORDER BY
     part_key ASC,
@@ -289,7 +386,9 @@ ORDER BY
 │        1 │     4 │     4 │ [3,4,5]      │
 │        1 │     5 │     5 │ [4,5]        │
 └──────────┴───────┴───────┴──────────────┘
+```
 
+```sql
 -- row_number does not respect the frame, so rn_1 = rn_2 = rn_3 != rn_4
 SELECT
     part_key,
@@ -303,8 +402,11 @@ SELECT
 FROM wf_frame
 WINDOW
     w1 AS (PARTITION BY part_key ORDER BY order DESC),
-    w2 AS (PARTITION BY part_key ORDER BY order DESC 
-                   Rows BETWEEN 1 PRECEDING AND CURRENT ROW)
+    w2 AS (
+        PARTITION BY part_key 
+        ORDER BY order DESC 
+        Rows BETWEEN 1 PRECEDING AND CURRENT ROW
+    )
 ORDER BY
     part_key ASC,
     value ASC;
@@ -315,7 +417,9 @@ ORDER BY
 │        1 │     4 │     4 │ [5,4]        │    2 │    2 │    2 │    2 │
 │        1 │     5 │     5 │ [5]          │    1 │    1 │    1 │    1 │
 └──────────┴───────┴───────┴──────────────┴──────┴──────┴──────┴──────┘
+```
 
+```sql
 -- first_value and last_value respect the frame
 SELECT
     groupArray(value) OVER w1 AS frame_values_1,
@@ -338,7 +442,9 @@ ORDER BY
 │ [1,2,3,4]      │             1 │            4 │ [3,4]          │             3 │            4 │
 │ [1,2,3,4,5]    │             1 │            5 │ [4,5]          │             4 │            5 │
 └────────────────┴───────────────┴──────────────┴────────────────┴───────────────┴──────────────┘
+```
 
+```sql
 -- second value within the frame
 SELECT
     groupArray(value) OVER w1 AS frame_values_1,
@@ -355,7 +461,9 @@ ORDER BY
 │ [1,2,3,4]      │            2 │
 │ [2,3,4,5]      │            3 │
 └────────────────┴──────────────┘
+```
 
+```sql
 -- second value within the frame + Null for missing values
 SELECT
     groupArray(value) OVER w1 AS frame_values_1,
@@ -376,7 +484,9 @@ ORDER BY
 
 ## Real world examples
 
-### Maximum/total salary per department.
+The following examples solve common real-world problems.
+
+### Maximum/total salary per department
 
 ```sql
 CREATE TABLE employees
@@ -394,7 +504,9 @@ INSERT INTO employees FORMAT Values
    ('IT', 'Tim', 200),
    ('IT', 'Anna', 300),
    ('IT', 'Elen', 500);
+```
 
+```sql
 SELECT
     department,
     employee_name AS emp,
@@ -411,8 +523,10 @@ FROM
         max(salary) OVER wndw AS max_salary_per_dep,
         sum(salary) OVER wndw AS total_salary_per_dep
     FROM employees
-    WINDOW wndw AS (PARTITION BY department
-          rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING)
+    WINDOW wndw AS (
+        PARTITION BY department
+        rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING
+    )
     ORDER BY
         department ASC,
         employee_name ASC
@@ -428,7 +542,7 @@ FROM
 └────────────┴──────┴────────┴────────────────────┴──────────────────────┴──────────────────┘
 ```
 
-### Cumulative sum.
+### Cumulative sum
 
 ```sql
 CREATE TABLE warehouse
@@ -446,7 +560,9 @@ INSERT INTO warehouse VALUES
     ('sku1', '2020-01-01', 1),
     ('sku1', '2020-02-01', 1),
     ('sku1', '2020-03-01', 1);
+```    
 
+```sql
 SELECT
     item,
     ts,
@@ -486,13 +602,18 @@ insert into sensors values('cpu_temp', '2020-01-01 00:00:00', 87),
                           ('cpu_temp', '2020-01-01 00:00:05', 87),
                           ('cpu_temp', '2020-01-01 00:00:06', 87),
                           ('cpu_temp', '2020-01-01 00:00:07', 87);
+```
+
+```sql
 SELECT
     metric,
     ts,
     value,
-    avg(value) OVER
-       (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN 2 PRECEDING AND CURRENT ROW)
-         AS moving_avg_temp
+    avg(value) OVER (
+        PARTITION BY metric 
+        ORDER BY ts ASC 
+        Rows BETWEEN 2 PRECEDING AND CURRENT ROW
+    ) AS moving_avg_temp
 FROM sensors
 ORDER BY
     metric ASC,
@@ -561,7 +682,9 @@ insert into sensors values('ambient_temp', '2020-01-01 00:00:00', 16),
                           ('ambient_temp', '2020-03-01 12:00:00', 16),
                           ('ambient_temp', '2020-03-01 12:00:00', 16),
                           ('ambient_temp', '2020-03-01 12:00:00', 16);
+```
 
+```sql
 SELECT
     metric,
     ts,
@@ -589,6 +712,41 @@ ORDER BY
 └──────────────┴─────────────────────┴───────┴─────────────────────────┘
 ```
 
+## References
+
+### GitHub Issues
+
+The roadmap for the initial support of window functions is [in this issue](https://github.com/ClickHouse/ClickHouse/issues/18097).
+
+All GitHub issues related to window functions have the [comp-window-functions](https://github.com/ClickHouse/ClickHouse/labels/comp-window-functions) tag.
+
+### Tests
+
+These tests contain the examples of the currently supported grammar:
+
+https://github.com/ClickHouse/ClickHouse/blob/master/tests/performance/window_functions.xml
+
+https://github.com/ClickHouse/ClickHouse/blob/master/tests/queries/0_stateless/01591_window_functions.sql
+
+### Postgres Docs
+
+https://www.postgresql.org/docs/current/sql-select.html#SQL-WINDOW
+
+https://www.postgresql.org/docs/devel/sql-expressions.html#SYNTAX-WINDOW-FUNCTIONS
+
+https://www.postgresql.org/docs/devel/functions-window.html
+
+https://www.postgresql.org/docs/devel/tutorial-window.html
+
+### MySQL Docs
+
+https://dev.mysql.com/doc/refman/8.0/en/window-function-descriptions.html
+
+https://dev.mysql.com/doc/refman/8.0/en/window-functions-usage.html
+
+https://dev.mysql.com/doc/refman/8.0/en/window-functions-frames.html
+
+
 ## 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/ru/development/architecture.md b/docs/ru/development/architecture.md
index b2e851a78cd..575799cccc4 100644
--- a/docs/ru/development/architecture.md
+++ b/docs/ru/development/architecture.md
@@ -63,7 +63,7 @@ ClickHouse — полноценна� �толбцова� СУБД. Данны
 
 Дл� байт-ориентированного ввода-вывода �уще�твуют аб�трактные кла��ы `ReadBuffer` и `WriteBuffer`. Они и�пользуют�� вме�то `iostream`. �е волнуйте�ь: каждый зрелый проект C++ и�пользует что-то другое вме�то `iostream` по уважительным причинам.
 
-`ReadBuffer` и `WriteBuffer` — �то про�то непрерывный буфер и кур�ор, указывающий на позицию в �том буфере. Реализации могут как владеть так и не владеть пам�тью буфера. Суще�твует виртуальный метод заполнени� буфера �ледующими данными (дл� `ReadBuffer`) или �бро�а буфера куда-нибудь (например `WriteBuffer`). Виртуальные методы редко вызывают��.
+`ReadBuffer` и `WriteBuffer` — �то про�то непрерывный буфер и кур�ор, указывающий на позицию в �том буфере. Реализации могут как владеть, так и не владеть пам�тью буфера. Суще�твует виртуальный метод заполнени� буфера �ледующими данными (дл� `ReadBuffer`) или �бро�а буфера куда-нибудь (например `WriteBuffer`). Виртуальные методы редко вызывают��.
 
 Реализации `ReadBuffer`/`WriteBuffer` и�пользуют�� дл� работы � файлами и файловыми де�крипторами, а также �етевыми �окетами, дл� реализации �жати� (`CompressedWriteBuffer` инициализирует�� вме�те � другим `WriteBuffer` и о�уще�твл�ет �жатие данных перед запи�ью в него), и дл� других целей – названи� `ConcatReadBuffer`, `LimitReadBuffer`, и `HashingWriteBuffer` говор�т �ами за �еб�.
 
diff --git a/docs/ru/development/developer-instruction.md b/docs/ru/development/developer-instruction.md
index c63622594e4..01ff4dd5f28 100644
--- a/docs/ru/development/developer-instruction.md
+++ b/docs/ru/development/developer-instruction.md
@@ -71,7 +71,7 @@ ClickHouse не работает и не �обирает�� на 32-битны
     Please make sure you have the correct access rights
     and the repository exists.
 
-Как правило �то означает, что от�ут�твуют ssh ключи дл� �оединени� � GitHub. Ключи ра�положены в директории `~/.ssh`. В интерфей�е GitHub, в на�тройках, необходимо загрузить публичные ключи, чтобы он их понимал.
+Как правило, �то означает, что от�ут�твуют ssh ключи дл� �оединени� � GitHub. Ключи ра�положены в директории `~/.ssh`. В интерфей�е GitHub, в на�тройках, необходимо загрузить публичные ключи, чтобы он их понимал.
 
 Вы также можете клонировать репозиторий по протоколу https:
 
@@ -199,7 +199,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 В �лучае у�пешного запу�ка, вы увидите прогре�� �борки - количе�тво обработанных задач и общее количе�тво задач.
 
-В проце��е �борки могут по�вит�� �ообщени� `libprotobuf WARNING` про protobuf файлы в библиотеке libhdfs2. Это не имеет значени�.
+В проце��е �борки могут по�вить�� �ообщени� `libprotobuf WARNING` про protobuf файлы в библиотеке libhdfs2. Это не имеет значени�.
 
 При у�пешной �борке, вы получите готовый и�полн�емый файл `ClickHouse/build/programs/clickhouse`:
 
@@ -207,7 +207,7 @@ sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
 
 ## Запу�к �обранной вер�ии ClickHouse {#zapusk-sobrannoi-versii-clickhouse}
 
-Дл� запу�ка �ервера из под текущего пользовател�, � выводом логов в терминал и � и�пользованием примеров конфигурационных файлов, ра�положенных в и�ходниках, перейдите в директорию `ClickHouse/programs/server/` (�та директори� находит�� не в директории build) и выполните:
+Дл� запу�ка �ервера из-под текущего пользовател�, � выводом логов в терминал и � и�пользованием примеров конфигурационных файлов, ра�положенных в и�ходниках, перейдите в директорию `ClickHouse/programs/server/` (�та директори� находит�� не в директории build) и выполните:
 
     ../../build/programs/clickhouse server
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
index cfafddf0bc2..4a7d81d38fc 100644
--- a/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/collapsingmergetree.md
@@ -37,7 +37,7 @@ CREATE TABLE [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster]
 
 **Секции запро�а**
 
-При �оздании таблицы � движком `CollapsingMergeTree` и�пользуют�� те же [�екции запро�а](mergetree.md#table_engine-mergetree-creating-a-table) что и при �оздании таблицы � движком `MergeTree`.
+При �оздании таблицы � движком `CollapsingMergeTree` и�пользуют�� те же [�екции запро�а](mergetree.md#table_engine-mergetree-creating-a-table), что и при �оздании таблицы � движком `MergeTree`.
 
 <details markdown="1">
 
diff --git a/docs/ru/engines/table-engines/mergetree-family/mergetree.md b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
index 9f223157ea7..faa492d4d85 100644
--- a/docs/ru/engines/table-engines/mergetree-family/mergetree.md
+++ b/docs/ru/engines/table-engines/mergetree-family/mergetree.md
@@ -679,11 +679,20 @@ 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) том, когда они до�тигают большого размера. �е и�пользуйте �тот параметр, е�ли политика имеет только один том.
--   `move_factor` — дол� до�тупного �вободного ме�та на томе, е�ли ме�та �тановит�� меньше, то данные начнут перемещение на �ледующий том, е�ли он е�ть (по умолчанию 0.1). Дл� перемещени� ку�ки �ортируют�� по размеру от большего к меньшему (по убыванию) и выбирают�� ку�ки, �овокупный размер которых до�таточен дл� �облюдени� у�лови� `move_factor`, е�ли �овокупный размер в�ех партов недо�таточен, будут перемещены в�е парты.
+- `policy_name_N` — название политики. �азвани� политик должны быть уникальны.
+- `volume_name_N` — название тома. �азвани� томов должны быть уникальны.
+- `disk` — ди�к, наход�щий�� внутри тома.
+- `max_data_part_size_bytes` — мак�имальный размер ку�ка данных, который может находить�� на любом из ди�ков �того тома. Е�ли в результате �ли�ни� размер ку�ка ожидает�� больше, чем max_data_part_size_bytes, то �тот ку�ок будет запи�ан в �ледующий том. В о�новном �та функци� позвол�ет хранить новые / мелкие ку�ки на гор�чем (SSD) томе и перемещать их на холодный (HDD) том, когда они до�тигают большого размера. �е и�пользуйте �тот параметр, е�ли политика имеет только один том.
+- `move_factor` — дол� до�тупного �вободного ме�та на томе, е�ли ме�та �тановит�� меньше, то данные начнут перемещение на �ледующий том, е�ли он е�ть (по умолчанию 0.1). Дл� перемещени� ку�ки �ортируют�� по размеру от большего к меньшему (по убыванию) и выбирают�� ку�ки, �овокупный размер которых до�таточен дл� �облюдени� у�лови� `move_factor`, е�ли �овокупный размер в�ех партов недо�таточен, будут перемещены в�е парты.
+- `perform_ttl_move_on_insert` — отключает перемещение данных � и�текшим TTL при в�тавке. По умолчанию (е�ли включено), е�ли мы в�тавл�ем ча�ть данных, котора� уже про�рочила�ь по правилу перемещени� по �року жизни, она немедленно перемещает�� на том / ди�к, указанный в правиле перемещени�. Это может значительно замедлить в�тавку в �лучае, е�ли целевой том / ди�к медленный (например, S3). Е�ли отключено, то про�роченна� ча�ть данных запи�ывает�� на том по умолчанию, а затем �разу перемещает�� на том, указанный в правиле дл� и�тёкшего TTL.
+- `load_balancing` - политика балан�ировки ди�ков, `round_robin` или `least_used`.
+- `least_used_ttl_ms` - у�танавливает таймаут (в милли�екундах) дл� обновлени� до�тупного про�тран�тва на в�ех ди�ках (`0` - обновл�ть в�егда, `-1` - никогда не обновл�ть, значение по умолчанию - `60000`). Обратите внимание, е�ли ди�к и�пользует�� только ClickHouse и не будет подвергать�� изменению размеров файловой �и�темы на лету, можно и�пользовать значение `-1`. Во в�ех о�тальных �луча�х �то не рекомендует��, так как в конечном итоге �то приведет к неправильному ра�пределению про�тран�тва.
+- `prefer_not_to_merge` — �ту на�тройку лучше не и�пользовать. Она отключает �ли�ние ча�тей данных на �том томе (что потенциально вредно и может приве�ти к замедлению). Когда �та на�тройка включена (не делайте �того), объединение данных на �том томе запрещено (что плохо). Это позвол�ет (но вам �то не нужно) контролировать (е�ли вы хотите что-то контролировать, вы делаете ошибку), как ClickHouse взаимодей�твует � медленными ди�ками (но ClickHouse лучше знает, по�тому, пожалуй�та, не и�пользуйте �ту на�тройку).
+- `volume_priority` — Определ�ет приоритет (пор�док), в котором заполн�ют�� тома. Чем меньше значение -- тем выше приоритет. Значени� параметра должны быть натуральными чи�лами и охватывать диапазон от 1 до N (N - наибольшее значение параметра из указанных) без пропу�ков.
+  * Е�ли _в�е_ тома имеют �тот параметр, они приоритизируют�� в указанном пор�дке.
+  * Е�ли его имеют лишь _некоторые_, то не имеющие �того параметра тома имеют �амый низкий приоритет. Те, у которых он указан, приоритизируют�� в �оответ�твии �о значением тега, приоритет о�тальных определ�ет�� пор�дком опи�ани� в конфигурационном файле отно�ительно друг друга.
+  * Е�ли _ни одному_ тому не при�воен �тот параметр, их пор�док определ�ет�� пор�дком опи�ани� в конфигурационном файле.
+  * Приоритет не�кольких томов не может быть одинаковым.
 
 Примеры конфигураций:
 
@@ -733,7 +742,7 @@ TTL d + INTERVAL 1 MONTH GROUP BY k1, k2 SET x = max(x), y = min(y);
 
 Е�ли �и�тема �одержит ди�ки различных типов, то может пригодить�� политика `moving_from_ssd_to_hdd`. В томе `hot` находит�� один SSD-ди�к (`fast_ssd`), а также задает�� ограничение на мак�имальный размер ку�ка, который может хранить�� на �том томе (1GB). В�е ку�ки такой таблицы больше 1GB будут запи�ывать�� �разу на том `cold`, в котором �одержит�� один HDD-ди�к `disk1`. Также при заполнении ди�ка `fast_ssd` более чем на 80% данные будут перено�ить�� на ди�к `disk1` фоновым проце��ом.
 
-Пор�док томов в политиках хранени� важен, при до�тижении у�ловий на переполнение тома данные перено��т�� на �ледующий. Пор�док ди�ков в томах так же важен, данные пишут�� по очереди на каждый из них.
+Пор�док томов в политиках хранени� важен в �лучае, е�ли приоритеты томов (`volume_priority`) не указаны �вно: при до�тижении у�ловий на переполнение тома данные перено��т�� на �ледующий. Пор�док ди�ков в томах так же важен, данные пишут�� по очереди на каждый из них.
 
 По�ле задани� конфигурации политик хранени� их можно и�пользовать, как на�тройку при �оздании таблиц:
 
diff --git a/docs/ru/engines/table-engines/special/buffer.md b/docs/ru/engines/table-engines/special/buffer.md
index 1fd8483e54d..3d2f1ee850d 100644
--- a/docs/ru/engines/table-engines/special/buffer.md
+++ b/docs/ru/engines/table-engines/special/buffer.md
@@ -42,7 +42,7 @@ CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10
 В каче�тве имени базы данных и имени таблицы можно указать пу�тые �троки в одинарных кавычках. Это обозначает от�ут�твие таблицы назначени�. В таком �лучае, при до�тижении у�ловий на �бро� данных, буфер будет про�то очищать��. Это может быть полезным, чтобы хранить в оперативке некоторое окно данных.
 
 При чтении из таблицы типа Buffer, будут обработаны данные, как наход�щие�� в буфере, так и данные из таблицы назначени� (е�ли така� е�ть).
-�о �ледует иметь ввиду, что таблица Buffer не поддерживает индек�. То е�ть, данные в буфере будут про�канированы полно�тью, что может быть медленно дл� буферов большого размера. (Дл� данных в подчинённой таблице, будет и�пользовать�� тот индек�, который она поддерживает.)
+�о �ледует иметь в виду, что таблица Buffer не поддерживает индек�. То е�ть, данные в буфере будут про�канированы полно�тью, что может быть медленно дл� буферов большого размера. (Дл� данных в подчинённой таблице, будет и�пользовать�� тот индек�, который она поддерживает.)
 
 Е�ли множе�тво �толбцов таблицы Buffer не �овпадает � множе�твом �толбцов подчинённой таблицы, то будут в�тавлено подмноже�тво �толбцов, которое при�ут�твует в обеих таблицах.
 
@@ -66,4 +66,4 @@ CREATE TABLE merge.hits_buffer AS merge.hits ENGINE = Buffer(merge, hits, 16, 10
 
 Таблицы типа Buffer и�пользуют�� в тех �луча�х, когда от большого количе�тва �ерверов по�тупает �лишком много INSERT-ов в единицу времени, и нет возможно�ти заранее �амо�то�тельно буферизовать данные перед в�тавкой, в результате чего, INSERT-ы не у�певают выполн�ть��.
 
-Заметим, что даже дл� таблиц типа Buffer не имеет �мы�ла в�тавл�ть данные по одной �троке, так как таким образом будет до�тигнута �коро�ть в�его лишь в не�колько ты��ч �трок в �екунду, тогда как при в�тавке более крупными блоками, до�тижимо более миллиона �трок в �екунду (�мотрите раздел [«Производительно�ть»](../../../introduction/performance.md).
+Заметим, что даже дл� таблиц типа Buffer не имеет �мы�ла в�тавл�ть данные по одной �троке, так как таким образом будет до�тигнута �коро�ть в�его лишь в не�колько ты��ч �трок в �екунду, тогда как при в�тавке более крупными блоками, до�тижимо более миллиона �трок в �екунду (�мотрите раздел [«Производительно�ть»](../../../introduction/performance.md)).
diff --git a/docs/ru/faq/general/ne-tormozit.md b/docs/ru/faq/general/ne-tormozit.md
index 0f888de839f..6d0803680a8 100644
--- a/docs/ru/faq/general/ne-tormozit.md
+++ b/docs/ru/faq/general/ne-tormozit.md
@@ -20,6 +20,6 @@ sidebar_position: 11
 
 Е�ли вы не видели наших футболок, по�мотрите видео о ClickHouse. �апример, вот �то:
 
-![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
+<iframe width="675" height="380" src="https://www.youtube.com/embed/bSyQahMVZ7w" frameborder="0" allow="accelerometer; autoplay; gyroscope; picture-in-picture" allowfullscreen></iframe>
 
 P.S. Эти футболки не продают��, а ра�про�тран�ют�� бе�платно на большин�тве митапов [ClickHouse](https://clickhouse.com/#meet), обычно в награду за �амые интере�ные вопро�ы или другие виды активного уча�ти�.
diff --git a/docs/ru/getting-started/tutorial.md b/docs/ru/getting-started/tutorial.md
index a2ddb103bc3..8c827137e6d 100644
--- a/docs/ru/getting-started/tutorial.md
+++ b/docs/ru/getting-started/tutorial.md
@@ -585,10 +585,6 @@ ENGINE = Distributed(perftest_3shards_1replicas, tutorial, hits_local, rand());
 INSERT INTO tutorial.hits_all SELECT * FROM tutorial.hits_v1;
 ```
 
-:::danger Внимание!
-Этот подход не годит�� дл� �егментировани� больших таблиц. Е�ть ин�трумент [clickhouse-copier](../operations/utilities/clickhouse-copier.md), �пециально предназначенный дл� перера�пределени� любых больших таблиц.
-:::
-
 Как и �ледовало ожидать, вычи�лительно �ложные запро�ы работают втрое бы�трее, е�ли они выполн�ют�� на трёх �ерверах, а не на одном.
 
 В данном �лучае мы и�пользовали кла�тер из трёх �егментов � одной репликой дл� каждого.
@@ -670,4 +666,4 @@ ENGINE = ReplicatedMergeTree(
 INSERT INTO tutorial.hits_replica SELECT * FROM tutorial.hits_local;
 ```
 
-Репликаци� работает в режиме мультима�тера. Это означает, что данные могут быть загружены на любую из реплик и �и�тема автоматиче�ки �инхронизирует данные между о�тальными репликами. Репликаци� а�инхронна, то е�ть в конкретный момент времнени не в�е реплики могут �одержать недавно добавленные данные. Как минимум одна реплика должна быть в �трою дл� приёма данных. Прочие реплики �инхронизируют�� и во��танов�т �огла�ованное �о�то�ни� как только �нова �танут активными. Заметим, что при таком подходе е�ть веро�тно�ть утраты недавно добавленных данных.
+Репликаци� работает в режиме мультима�тера. Это означает, что данные могут быть загружены на любую из реплик и �и�тема автоматиче�ки �инхронизирует данные между о�тальными репликами. Репликаци� а�инхронна, то е�ть в конкретный момент времени не в�е реплики могут �одержать недавно добавленные данные. Как минимум одна реплика должна быть в �трою дл� приёма данных. Прочие реплики �инхронизируют�� и во��танов�т �огла�ованное �о�то�ни� как только �нова �танут активными. Заметим, что при таком подходе е�ть веро�тно�ть утраты недавно добавленных данных.
diff --git a/docs/ru/index.md b/docs/ru/index.md
index 78bb382753b..29f2bbe07fb 100644
--- a/docs/ru/index.md
+++ b/docs/ru/index.md
@@ -35,13 +35,13 @@ ClickHouse — �толбцова� �и�тема управлени� база
 В примерах изображён только пор�док ра�положени� данных.
 То е�ть значени� из разных �толбцов хран�т�� отдельно, а данные одного �толбца — вме�те.
 
-Примеры �толбцовых СУБД: Vertica, Paraccel (Actian Matrix, Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise, Actian Vector), LucidDB, SAP HANA, Google Dremel, Google PowerDrill, Druid, kdb+.
+Примеры �толбцовых СУБД: Vertica, Paraccel (Actian Matrix, Amazon Redshift), Sybase IQ, Exasol, Infobright, InfiniDB, MonetDB (VectorWise, Actian Vector), LucidDB, SAP HANA и прочий треш, Google Dremel, Google PowerDrill, Druid, kdb+.
 {: .grey }
 
 Разный пор�док хранени� данных лучше подходит дл� разных �ценариев работы.
 Сценарий работы � данными — �то то, какие производ�т�� запро�ы, как ча�то и в каком �оотношении; �колько читает�� данных на запро�ы каждого вида — �трок, �толбцов, байтов; как �оотно��т�� чтени� и обновлени� данных; какой рабочий размер данных и на�колько локально он и�пользует��; и�пользуют�� ли транзакции и � какой изолированно�тью; какие требовани� к дублированию данных и логиче�кой цело�тно�ти; требовани� к задержкам на выполнение и пропу�кной �по�обно�ти запро�ов каждого вида и т. п.
 
-Чем больше нагрузка на �и�тему, тем более важной �тановит�� �пециализаци� под �ценарий работы, и тем более конкретной �тановит�� �та �пециализаци�. �е �уще�твует �и�темы, одинаково хорошо подход�щей под �уще�твенно различные �ценарии работы. Е�ли �и�тема подходит под широкое множе�тво �ценариев работы, то при до�таточно большой нагрузке, �и�тема будет �правл�ть�� �о в�еми �ценари�ми работы плохо, или �правл�ть�� хорошо только � одним из �ценариев работы.
+Чем больше нагрузка на �и�тему, тем более важной �тановит�� �пециализаци� под �ценарий работы, и тем более конкретной �тановит�� �та �пециализаци�. �е �уще�твует �и�темы, одинаково хорошо подход�щей под �уще�твенно различные �ценарии работы. Е�ли �и�тема подходит под широкое множе�тво �ценариев работы, то при до�таточно большой нагрузке �и�тема будет �правл�ть�� �о в�еми �ценари�ми работы плохо, или �правл�ть�� хорошо только � одним из �ценариев работы.
 
 ## Ключевые о�обенно�ти OLAP-�ценари� работы {#kliuchevye-osobennosti-olap-stsenariia-raboty}
 
@@ -53,11 +53,11 @@ ClickHouse — �толбцова� �и�тема управлени� база
 -   запро�ы идут �равнительно редко (обычно не более �отни в �екунду на �ервер);
 -   при выполнении про�тых запро�ов, допу�тимы задержки в районе 50 м�;
 -   значени� в �толбцах до�таточно мелкие — чи�ла и небольшие �троки (например, 60 байт на URL);
--   требует�� вы�ока� пропу�кна� �по�обно�ть при обработке одного запро�а (до миллиардов �трок в �екунду на один узел);
+-   требует�� вы�ока� пропу�кна� �по�обно�ть при обработке одного запро�а (до миллиардов �трок в �екунду на один �ервер);
 -   транзакции от�ут�твуют;
--   низкие требовани� к кон�и�тентно�ти данных;
--   в запро�е одна больша� таблица, в�е таблицы кроме одной маленькие;
--   результат выполнени� запро�а �уще�твенно меньше и�ходных данных — то е�ть данные фильтруют�� или агрегируют��; результат выполнени� помещает�� в оперативную пам�ть одного узла.
+-   низкие требовани� к �огла�ованно�ти данных;
+-   в запро�е одна больша� таблица, в�е о�тальные таблицы из запро�а — маленькие;
+-   результат выполнени� запро�а �уще�твенно меньше и�ходных данных — то е�ть данные фильтруют�� или агрегируют��; результат выполнени� помещает�� в оперативную пам�ть одного �ервера.
 
 Легко видеть, что OLAP-�ценарий работы �уще�твенно отличает�� от других ра�про�транённых �ценариев работы (например, OLTP или Key-Value �ценариев работы). Таким образом, не имеет никакого �мы�ла пытать�� и�пользовать OLTP-�и�темы или �и�темы кла��а «ключ — значение» дл� обработки аналитиче�ких запро�ов, е�ли вы хотите получить приличную производительно�ть («выше плинту�а»). �апример, е�ли вы попытаете�ь и�пользовать дл� аналитики MongoDB или Redis — вы получите анекдотиче�ки низкую производительно�ть по �равнению � OLAP-СУБД.
 
@@ -77,11 +77,11 @@ ClickHouse — �толбцова� �и�тема управлени� база
 
 ### По вводу-выводу {#po-vvodu-vyvodu}
 
-1.  Дл� выполнени� аналитиче�кого запро�а, требует�� прочитать небольшое количе�тво �толбцов таблицы. В �толбцовой БД дл� �того можно читать только нужные данные. �апример, е�ли вам требует�� только 5 �толбцов из 100, то �ледует ра��читывать на 20-кратное уменьшение ввода-вывода.
-2.  Так как данные читают�� пачками, то их проще �жимать. Данные, лежащие по �толбцам также лучше �жимают��. За �чёт �того, дополнительно уменьшает�� объём ввода-вывода.
-3.  За �чёт уменьшени� ввода-вывода, больше данных влезает в �и�темный к�ш.
+1.  Дл� выполнени� аналитиче�кого запро�а требует�� прочитать небольшое количе�тво �толбцов таблицы. В �толбцовой БД дл� �того можно читать только нужные данные. �апример, е�ли вам требует�� только 5 �толбцов из 100, то �ледует ра��читывать на 20-кратное уменьшение ввода-вывода.
+2.  Так как данные читают�� пачками, то их проще �жимать. Данные, лежащие по �толбцам, также лучше �жимают��. За �чёт �того, дополнительно уменьшает�� объём ввода-вывода.
+3.  За �чёт уменьшени� ввода-вывода больше данных влезает в �и�темный к�ш.
 
-�апример, дл� запро�а «по�читать количе�тво запи�ей дл� каждой рекламной �и�темы», требует�� прочитать один �толбец «идентификатор рекламной �и�темы», который занимает 1 байт в не�жатом виде. Е�ли большин�тво переходов было не � рекламных �и�тем, то можно ра��читывать хот� бы на де��тикратное �жатие �того �толбца. При и�пользовании бы�трого алгоритма �жати�, возможно разжатие данных �о �коро�тью более не�кольких гигабайт не�жатых данных в �екунду. То е�ть, такой запро� может выполн�ть�� �о �коро�тью около не�кольких миллиардов �трок в �екунду на одном �ервере. �а практике, така� �коро�ть дей�твительно до�тигает��.
+�апример, дл� запро�а «по�читать количе�тво запи�ей дл� каждой рекламной �и�темы» требует�� прочитать один �толбец «идентификатор рекламной �и�темы», который занимает 1 байт в не�жатом виде. Е�ли большин�тво переходов было не � рекламных �и�тем, то можно ра��читывать хот� бы на де��тикратное �жатие �того �толбца. При и�пользовании бы�трого алгоритма �жати� возможно разжатие данных �о �коро�тью более не�кольких гигабайт не�жатых данных в �екунду. То е�ть такой запро� может выполн�ть�� �о �коро�тью около не�кольких миллиардов �трок в �екунду на одном �ервере. �а практике така� �коро�ть дей�твительно до�тигает��.
 
 ### По вычи�лени�м {#po-vychisleniiam}
 
@@ -96,4 +96,4 @@ ClickHouse — �толбцова� �и�тема управлени� база
 
 В «обычных» СУБД �того не делает��, так как не имеет �мы�ла при выполнении про�тых запро�ов. Хот� е�ть и�ключени�. �апример, в MemSQL кодогенераци� и�пользует�� дл� уменьшени� времени отклика при выполнении SQL-запро�ов. Дл� �равнени�: в аналитиче�ких СУБД требует�� оптимизаци� по пропу�кной �по�обно�ти (throughput, ГБ/�), а не времени отклика (latency, �).
 
-Стоит заметить, что дл� �ффективно�ти по CPU требует��, чтобы �зык запро�ов был декларативным (SQL, MDX) или хот� бы векторным (J, K). То е�ть необходимо, чтобы запро� �одержал циклы только в не�вном виде, открыва� возможно�ти дл� оптимизации.
+Стоит заметить, что дл� �ффективно�ти по CPU требует��, чтобы �зык запро�ов был декларативным (SQL, MDX) или хот� бы векторным (J, K, APL). То е�ть необходимо, чтобы запро� �одержал циклы только в не�вном виде, открыва� возможно�ти дл� оптимизации.
diff --git a/docs/ru/interfaces/cli.md b/docs/ru/interfaces/cli.md
index 8910c258788..4d19cf50ae1 100644
--- a/docs/ru/interfaces/cli.md
+++ b/docs/ru/interfaces/cli.md
@@ -177,11 +177,11 @@ URI позвол�ет подключать�� к не�кольким хо�т
 
 
 
-Строка подключени� должна быть указана в первом аргументе clickhouse-client. Строка подключени� может комбинировать�� � другими [параметрами командной �троки] (#command-line-options) кроме `--host/-h` и `--port`.
+Строка подключени� должна быть указана в первом аргументе clickhouse-client. Строка подключени� может комбинировать�� � другими [параметрами командной �троки](#command-line-options) кроме `--host/-h` и `--port`.
 
 Дл� компонента `query_parameter` разрешены �ледующие ключи:
 
-- `secure` или �окращенно `s` - без значение. Е�ли параметр указан, то �оединение � �ервером будет о�уще�твл�ть�� по защищенному каналу (TLS). См. `secure` в [command-line-options](#command-line-options).
+- `secure` или �окращенно `s` - без значени�. Е�ли параметр указан, то �оединение � �ервером будет о�уще�твл�ть�� по защищенному каналу (TLS). См. `secure` в [command-line-options](#command-line-options).
 
 ### Кодирование URI {#connection_string_uri_percent_encoding}
 
@@ -206,7 +206,7 @@ clickhouse-client clickhouse://john:secret@127.0.0.1:9000
 clickhouse-client clickhouse://[::1]:9000
 ```
 
-Подключить�� к localhost через порт 9000  много�трочном режиме.
+Подключить�� к localhost через порт 9000 в много�трочном режиме.
 
 ``` bash
 clickhouse-client clickhouse://localhost:9000 '-m'
diff --git a/docs/ru/interfaces/formats.md b/docs/ru/interfaces/formats.md
index b4794b02743..a9280de9c7b 100644
--- a/docs/ru/interfaces/formats.md
+++ b/docs/ru/interfaces/formats.md
@@ -201,7 +201,7 @@ SELECT * FROM nestedt FORMAT TSV
 
 Этот формат позвол�ет указать произвольную форматную �троку, в которую под�тавл�ют�� значени�, �ериализованные выбранным �по�обом.
 
-Дл� �того и�пользуют�� на�тройки `format_template_resultset`, `format_template_row`, `format_template_rows_between_delimiter` и на�тройки �кранировани� других форматов (например, `output_format_json_quote_64bit_integers` при �кранировании как в `JSON`, �м. далее)
+Дл� �того и�пользуют�� на�тройки `format_template_resultset`, `format_template_row` (`format_template_row_format`), `format_template_rows_between_delimiter` и на�тройки �кранировани� других форматов (например, `output_format_json_quote_64bit_integers` при �кранировании как в `JSON`, �м. далее)
 
 �а�тройка `format_template_row` задаёт путь к файлу, �одержащему форматную �троку дл� �трок таблицы, котора� должна иметь вид:
 
@@ -227,9 +227,11 @@ SELECT * FROM nestedt FORMAT TSV
 
     `Search phrase: 'bathroom interior design', count: 2166, ad price: $3;`
 
+В тех �луча�х, когда не удобно или не возможно указать произвольную форматную �троку в файле, можно и�пользовать `format_template_row_format` указать произвольную форматную �троку в запро�е.  
+
 �а�тройка `format_template_rows_between_delimiter` задаёт разделитель между �троками, который выводит�� (или ожмдает�� при вводе) по�ле каждой �троки, кроме по�ледней. По умолчанию `\n`.
 
-�а�тройка `format_template_resultset` задаёт путь к файлу, �одержащему форматную �троку дл� результата. Форматна� �трока дл� результата имеет �интак�и� аналогичный форматной �троке дл� �трок таблицы и позвол�ет указать префик�, �уффик� и �по�об вывода дополнительной информации. Вме�то имён �толбцов в ней указывают�� �ледующие имена под�тановок:
+�а�тройка `format_template_resultset` задаёт путь к файлу, �одержащему форматную �троку дл� результата. �а�тройка `format_template_resultset_format` и�пользует�� дл� у�тановки форматной �троки дл� результата непо�ред�твенно в запро�е. Форматна� �трока дл� результата имеет �интак�и� аналогичный форматной �троке дл� �трок таблицы и позвол�ет указать префик�, �уффик� и �по�об вывода дополнительной информации. Вме�то имён �толбцов в ней указывают�� �ледующие имена под�тановок:
 
 -   `data` - �троки � данными в формате `format_template_row`, разделённые `format_template_rows_between_delimiter`. Эта под�тановка должна быть первой под�тановкой в форматной �троке.
 -   `totals` - �трока � тотальными значени�ми в формате `format_template_row` (при и�пользовании WITH TOTALS)
diff --git a/docs/ru/interfaces/http.md b/docs/ru/interfaces/http.md
index be8cfbdda6c..5f11f1b430b 100644
--- a/docs/ru/interfaces/http.md
+++ b/docs/ru/interfaces/http.md
@@ -434,16 +434,18 @@ $ curl -v 'http://localhost:8123/predefined_query'
 ``` xml
 <http_handlers>
     <rule>
-        <url><![CDATA[regex:/query_param_with_url/\w+/(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></url>
+        <url><![CDATA[regex:/query_param_with_url/(?P<name_1>[^/]+)]]></url>
         <methods>GET</methods>
         <headers>
             <XXX>TEST_HEADER_VALUE</XXX>
-            <PARAMS_XXX><![CDATA[(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></PARAMS_XXX>
+            <PARAMS_XXX><![CDATA[regex:(?P<name_2>[^/]+)]]></PARAMS_XXX>
         </headers>
         <handler>
             <type>predefined_query_handler</type>
-            <query>SELECT value FROM system.settings WHERE name = {name_1:String}</query>
-            <query>SELECT name, value FROM system.settings WHERE name = {name_2:String}</query>
+            <query>
+                SELECT name, value FROM system.settings
+                WHERE name IN ({name_1:String}, {name_2:String})
+            </query>
         </handler>
     </rule>
     <defaults/>
@@ -451,13 +453,13 @@ $ curl -v 'http://localhost:8123/predefined_query'
 ```
 
 ``` bash
-$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:8123/query_param_with_url/1/max_threads/max_final_threads?max_threads=1&max_final_threads=2'
-1
-max_final_threads   2
+$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_final_threads' 'http://localhost:8123/query_param_with_url/max_threads?max_threads=1&max_final_threads=2'
+max_final_threads	2
+max_threads	1
 ```
 
 :::note Предупреждение
-В одном `predefined_query_handler` поддерживает�� только один запро� типа `INSERT`.
+В одном `predefined_query_handler` поддерживает�� только один запро�.
 :::
 ### dynamic_query_handler {#dynamic_query_handler}
 
diff --git a/docs/ru/interfaces/third-party/gui.md b/docs/ru/interfaces/third-party/gui.md
index 34d2f0e371a..6bed32052ad 100644
--- a/docs/ru/interfaces/third-party/gui.md
+++ b/docs/ru/interfaces/third-party/gui.md
@@ -260,3 +260,19 @@ SeekTable [бе�платен](https://www.seektable.com/help/cloud-pricing) д
 
 Проте�тировать TABLUM.IO без разворачивани� на �об�твенном �ервере можно [зде�ь](https://tablum.io/try).
 Подробно о продукте �мотрите на [TABLUM.IO](https://tablum.io/)
+
+
+### CKMAN {#ckman}
+
+[CKMAN] (https://www.github.com/housepower/ckman) — ин�трумент управлени� и мониторинга кла�теров ClickHouse!
+
+О�новные возможно�ти:
+
+- Бы�трое и про�тое развертывание кла�теров через веб-интерфей�
+- Кла�теры можно ма�штабировать или ма�штабировать
+- Балан�ировка нагрузки данных кла�тера
+- Обновление кла�тера в режиме онлайн
+- Измените конфигурацию кла�тера на �транице
+- Обе�печивает мониторинг узлов кла�тера и zookeeper
+- Мониторинг �о�то�ни� таблиц и �екций, а также медленные SQL-операторы
+- Предо�тавл�ет про�тую в и�пользовании �траницу выполнени� SQL
diff --git a/docs/ru/operations/backup.md b/docs/ru/operations/backup.md
index 9ff13bbc8a6..44877ff8071 100644
--- a/docs/ru/operations/backup.md
+++ b/docs/ru/operations/backup.md
@@ -24,10 +24,6 @@ sidebar_label: "Резервное копирование данных"
 
 �екоторые локальные файловые �и�темы позвол�ют делать �нимки (например, [ZFS](https://en.wikipedia.org/wiki/ZFS)), но они могут быть не лучшим выбором дл� об�луживани� живых запро�ов. Возможным решением �вл�ет�� �оздание дополнительных реплик � такой файловой �и�темой и и�ключение их из [Distributed](../engines/table-engines/special/distributed.md) таблиц, и�пользуемых дл� запро�ов `SELECT`. Снимки на таких репликах будут недо�тупны дл� запро�ов, измен�ющих данные. В каче�тве бону�а, �ти реплики могут иметь о�обые конфигурации оборудовани� � большим количе�твом ди�ков, подключенных к �ерверу, что будет �кономиче�ки �ффективным.
 
-## clickhouse-copier {#clickhouse-copier}
-
-[clickhouse-copier](utilities/clickhouse-copier.md) — �то универ�альный ин�трумент, который изначально был �оздан дл� перешардировани� таблиц � петабайтами данных. Его также можно и�пользовать дл� резервного копировани� и во��тановлени�, по�кольку он надёжно копирует данные между таблицами и кла�терами ClickHouse.
-
 Дл� небольших объёмов данных можно примен�ть `INSERT INTO ... SELECT ...` в удалённые таблицы.
 
 ## Манипул�ции � партици�ми {#manipuliatsii-s-partitsiiami}
diff --git a/docs/ru/operations/clickhouse-keeper.md b/docs/ru/operations/clickhouse-keeper.md
index 3a931529b32..e1d21dd537c 100644
--- a/docs/ru/operations/clickhouse-keeper.md
+++ b/docs/ru/operations/clickhouse-keeper.md
@@ -38,6 +38,7 @@ ClickHouse Keeper может и�пользовать�� как равноце
 -    `dead_session_check_period_ms` — ча�тота, � которой ClickHouse Keeper провер�ет мертвые �е��ии и удал�ет их, в милли�екундах (по умолчанию: 500).
 -    `election_timeout_lower_bound_ms` — врем�, по�ле которого по�ледователь может инициировать перевыбор лидера, е�ли не получил от него контрольный �игнал (по умолчанию: 1000).
 -    `election_timeout_upper_bound_ms` — врем�, по�ле которого по�ледователь должен инициировать перевыбор лидера, е�ли не получил от него контрольный �игнал (по умолчанию: 2000).
+-    `leadership_expiry_ms` — Е�ли лидер не получает ответа от до�таточного количе�тва по�ледователей в течение �того промежутка времени, он добровольно отказывает�� от �воего руковод�тва. При на�тройке 0 автоматиче�ки у�танавливает�� 20 - кратное значение `heart_beat_interval_ms`, а при на�тройке меньше 0 лидер не отказывает�� от лидер�тва (по умолчанию 0).
 -    `force_sync` — вызывать `fsync` при каждой запи�и в журнал координации (по умолчанию: true).
 -    `four_letter_word_white_list` — �пи�ок разрешенных 4-х буквенных команд (по умолчанию: "conf,cons,crst,envi,ruok,srst,srvr,stat,wchc,wchs,dirs,mntr,isro").
 -    `fresh_log_gap` — минимальное от�тавание от лидера в количе�тве запи�ей журнала по�ле которого по�ледователь �читает �еб� актуальным (по умолчанию: 200).
@@ -69,7 +70,7 @@ ClickHouse Keeper может и�пользовать�� как равноце
 
 
 :::note
-В �лучае изменени� топологии кла�тера ClickHouse Keeper(например, замены �ервера), удо�товерьте�ь, что вы �охран�еете отношение `server_id` - `hostname`, не переи�пользуете �уще�твующие `server_id` дл� дл� новых �ерверов и не перемешиваете идентификаторы. Подобные ошибки могут �лучать��, е�ли вы и�пользуете автоматизацию при разворачивании кла�тера без логики �охранени� идентификаторов.
+В �лучае изменени� топологии кла�тера ClickHouse Keeper(например, замены �ервера), удо�товерьте�ь, что вы �охран�еете отношение `server_id` - `hostname`, не переи�пользуете �уще�твующие `server_id` дл� новых �ерверов и не перемешиваете идентификаторы. Подобные ошибки могут �лучать��, е�ли вы и�пользуете автоматизацию при разворачивании кла�тера без логики �охранени� идентификаторов.
 :::
 
 Примеры конфигурации кворума � трем� узлами можно найти в [интеграционных те�тах](https://github.com/ClickHouse/ClickHouse/tree/master/tests/integration) � префик�ом `test_keeper_`. Пример конфигурации дл� �ервера №1:
@@ -209,6 +210,7 @@ dead_session_check_period_ms=500
 heart_beat_interval_ms=500
 election_timeout_lower_bound_ms=1000
 election_timeout_upper_bound_ms=2000
+leadership_expiry_ms=0
 reserved_log_items=1000000000000000
 snapshot_distance=10000
 auto_forwarding=true
@@ -337,7 +339,7 @@ clickhouse-keeper-converter --zookeeper-logs-dir /var/lib/zookeeper/version-2 --
 
 По�ле того, как выполнили дей�тви� выше выполните �ледующие шаги.
 1. Выберете одну ноду Keeper, котора� �танет новым лидером. Учтите, что данные � �той ноды будут и�пользованы в�ем кла�тером, по�тому рекомендует�� выбрать ноду � наиболее актуальным �о�то�нием.
-2. Перед дальнейшими дей�тви�м �делайте резервную копию данных из директорий `log_storage_path` и `snapshot_storage_path`.
+2. Перед дальнейшими дей�тви�ми �делайте резервную копию данных из директорий `log_storage_path` и `snapshot_storage_path`.
 3. Измените на�тройки на в�ех нодах кла�тера, которые вы �обираете�ь и�пользовать.
 4. Отправьте команду `rcvr` на ноду, которую вы выбрали, или о�тановите ее и запу�тите заново � аргументом `--force-recovery`. Это переведет ноду в режим во��тановлени�.
 5. Запу�кайте о�тальные ноды кла�тера по одной и провер�йте, что команда `mntr` возвращает `follower` в выводе �о�то�ни� `zk_server_state` перед тем, как запу�тить �ледующую ноду.
diff --git a/docs/ru/operations/configuration-files.md b/docs/ru/operations/configuration-files.md
index 3b037521692..74f7d217fb7 100644
--- a/docs/ru/operations/configuration-files.md
+++ b/docs/ru/operations/configuration-files.md
@@ -89,7 +89,7 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 
 Вы можете и�пользовать �имметричное шифрование дл� зашифровки �лемента конфигурации, например, пол� password. Чтобы �то �делать, �начала на�тройте [кодек шифровани�](../sql-reference/statements/create/table.md#encryption-codecs), затем добавьте аттибут`encrypted_by` � именем кодека шифровани� как значение к �лементу, который надо зашифровать.
 
-В отличии от аттрибутов `from_zk`, `from_env` и `incl` (или �лемента `include`), под�тановка, т.е. ра�шифровка зашифрованного значени�, не выподн�ет�� в файле предобработки. Ра�шифровка прои�ходит только во врем� и�полнени� в �ерверном проце��е.
+В отличие от аттрибутов `from_zk`, `from_env` и `incl` (или �лемента `include`), под�тановка, т.е. ра�шифровка зашифрованного значени�, не выподн�ет�� в файле предобработки. Ра�шифровка прои�ходит только во врем� и�полнени� в �ерверном проце��е.
 
 Пример:
 
@@ -110,7 +110,7 @@ $ cat /etc/clickhouse-server/users.d/alice.xml
 </clickhouse>
 ```
 
-Чтобы получить зашифрованное значение может быть и�пользовано приложение-пример `encrypt_decrypt` .
+Чтобы получить зашифрованное значение, может быть и�пользовано приложение-пример `encrypt_decrypt` .
 
 Пример:
 
diff --git a/docs/ru/operations/settings/settings.md b/docs/ru/operations/settings/settings.md
index 2081dcc59b6..f9456e34a56 100644
--- a/docs/ru/operations/settings/settings.md
+++ b/docs/ru/operations/settings/settings.md
@@ -2776,7 +2776,7 @@ SELECT range(number) FROM system.numbers LIMIT 5 FORMAT PrettyCompactNoEscapes;
 -   0 — номера �трок не вывод�т��.
 -   1 — номера �трок вывод�т��.
 
-Значение по умолчанию: `0`.
+Значение по умолчанию: `1`.
 
 **Пример**
 
@@ -2796,6 +2796,17 @@ SELECT TOP 3 name, value FROM system.settings;
 3. │ max_block_size          │ 65505   │
    └─────────────────────────┴─────────┘
 ```
+### output_format_pretty_color {#output_format_pretty_color}
+
+Включает/выключает управл�ющие по�ледовательно�ти ANSI в форматах Pretty.
+
+Возможные значени�:
+
+-   `0` — выключена. �е и�ползует ANSI по�ледовательно�ти в форматах Pretty.
+-   `1` — включена. И�ползует ANSI по�ледовательно�ти � и�ключением форматов `NoEscapes`.
+-   `auto` - включена е�ли `stdout` �вл�ет�� терминалом � и�ключением форматов `NoEscapes`.
+
+Значение по умолчанию: `auto`
 
 ## system_events_show_zero_values {#system_events_show_zero_values}
 
@@ -3247,7 +3258,7 @@ SELECT * FROM test2;
 
 ## allow_experimental_live_view {#allow-experimental-live-view}
 
-Включает �к�периментальную возможно�ть и�пользовани� [LIVE-пред�тавлений](../../sql-reference/statements/create/view.md#live-view).
+Включает у�таревшую возможно�ть и�пользовани� [LIVE-пред�тавлений](../../sql-reference/statements/create/view.md#live-view).
 
 Возможные значени�:
 - 0 — живые пред�тавлени� не поддерживают��.
@@ -3257,21 +3268,15 @@ SELECT * FROM test2;
 
 ## live_view_heartbeat_interval {#live-view-heartbeat-interval}
 
-Задает интервал в �екундах дл� периодиче�кой проверки �уще�твовани� [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view).
-
-Значение по умолчанию: `15`.
+У�тарело.
 
 ## max_live_view_insert_blocks_before_refresh {#max-live-view-insert-blocks-before-refresh}
 
-Задает наибольшее чи�ло в�тавок, по�ле которых запро� на формирование [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view) и�полн�ет�� �нова.
-
-Значение по умолчанию: `64`.
+У�тарело.
 
 ## periodic_live_view_refresh {#periodic-live-view-refresh}
 
-Задает врем� в �екундах, по и�течении которого [LIVE VIEW](../../sql-reference/statements/create/view.md#live-view) � у�тановленным автообновлением обновл�ет��.
-
-Значение по умолчанию: `60`.
+У�тарело.
 
 ## check_query_single_value_result {#check_query_single_value_result}
 
@@ -4118,7 +4123,7 @@ SELECT sum(number) FROM numbers(10000000000) SETTINGS partial_result_on_first_ca
 ## session_timezone {#session_timezone}
 
 Задаёт значение ча�ового по��а (session_timezone) по умолчанию дл� текущей �е��ии вме�то [ча�ового по��а �ервера](../server-configuration-parameters/settings.md#server_configuration_parameters-timezone). То е�ть, в�е значени� DateTime/DateTime64, дл� которых �вно не задан ча�овой по��, будут интерпретированы как отно��щие�� к указанной зоне.
-При значении на�тройки `''` (пу�та� �трока), будет �овпадать � ча�овым по��ом �ервера. 
+При значении на�тройки `''` (пу�та� �трока), будет �овпадать � ча�овым по��ом �ервера.
 
 Функции `timeZone()` and `serverTimezone()` возвращают ча�овой по�� текущей �е��ии и �ервера �оответ�твенно.
 
diff --git a/docs/ru/operations/system-tables/grants.md b/docs/ru/operations/system-tables/grants.md
index b3ef789e95b..4485b684218 100644
--- a/docs/ru/operations/system-tables/grants.md
+++ b/docs/ru/operations/system-tables/grants.md
@@ -19,7 +19,7 @@ slug: /ru/operations/system-tables/grants
 -    `column` ([Nullable](../../sql-reference/data-types/nullable.md)([String](../../sql-reference/data-types/string.md))) — Им� �толбца, к которому предо�тавл�ет�� до�туп.
 
 -    `is_partial_revoke` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Логиче�кое значение. Показывает, были ли отменены некоторые привилегии. Возможные значени�:
-- `0` — Строка опи�ывает ча�тичный отзыв.
-- `1` — Строка опи�ывает грант.
+- `0` — Строка опи�ывает грант.
+- `1` — Строка опи�ывает ча�тичный отзыв.
 
 -    `grant_option` ([UInt8](../../sql-reference/data-types/int-uint.md#uint-ranges)) — Разрешение предо�тавлено � опцией `WITH GRANT OPTION`, подробнее �м. [GRANT](../../sql-reference/statements/grant.md#grant-privigele-syntax).
diff --git a/docs/ru/operations/system-tables/quota_usage.md b/docs/ru/operations/system-tables/quota_usage.md
index 96f6debd24e..46305e59da6 100644
--- a/docs/ru/operations/system-tables/quota_usage.md
+++ b/docs/ru/operations/system-tables/quota_usage.md
@@ -26,8 +26,11 @@ slug: /ru/operations/system-tables/quota_usage
 -   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — мак�имальное количе�тво �трок, �читываемых из в�ех таблиц и табличных функций, уча�твующих в запро�ах.
 -   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количе�тво байт, �читанных из в�ех таблиц и табличных функций, уча�твующих в запро�ах.
 -   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — мак�имальное количе�тво байт, �читываемых из в�ех таблиц и табличных функций.
--   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — общее врем� выполнени� запро�а, в �екундах.
--   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — мак�имальное врем� выполнени� запро�а.
+- `failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Общее количе�тво неудачных попыток подр�д вве�ти пароль. Е�ли пользователь ввел верный пароль до преодолени� порогового значени� `max_failed_sequential_authentications` то �четчик неудачных попыток будет �брошен.
+- `max_failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — Мак�имальное количе�тво неудачных попыток подр�д вве�ти пароль.
+-   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — общее врем� выполнени� запро�а, в �екундах.
+-   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — мак�имальное врем� выполнени� запро�а.
+
 
 ## Смотрите также {#see-also}
 
diff --git a/docs/ru/operations/system-tables/quotas_usage.md b/docs/ru/operations/system-tables/quotas_usage.md
index 27e7cdf8abe..4bc0f2e81ca 100644
--- a/docs/ru/operations/system-tables/quotas_usage.md
+++ b/docs/ru/operations/system-tables/quotas_usage.md
@@ -29,9 +29,10 @@ slug: /ru/operations/system-tables/quotas_usage
 -   `max_read_rows` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — мак�имальное количе�тво �трок, �читываемых из в�ех таблиц и табличных функций, уча�твующих в запро�ах.
 -   `read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — общее количе�тво байт, �читанных из в�ех таблиц и табличных функций, уча�твующих в запро�ах.
 -   `max_read_bytes` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/int-uint.md))) — мак�имальное количе�тво байт, �читываемых из в�ех таблиц и табличных функций.
+- `failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — Общее количе�тво неудачных попыток подр�д вве�ти пароль. Е�ли пользователь ввел верный пароль до преодолени� порогового значени� `max_failed_sequential_authentications` то �четчик неудачных попыток будет �брошен.
+- `max_failed_sequential_authentications` ([Nullable](../../sql-reference/data-types/nullable.md)([UInt64](../../sql-reference/data-types/float.md))) — Мак�имальное количе�тво неудачных попыток подр�д вве�ти пароль.
 -   `execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — общее врем� выполнени� запро�а, в �екундах.
 -   `max_execution_time` ([Nullable](../../sql-reference/data-types/nullable.md)([Float64](../../sql-reference/data-types/float.md))) — мак�имальное врем� выполнени� запро�а.
-
 ## Смотрите также {#see-also}
 
 -   [SHOW QUOTA](../../sql-reference/statements/show.md#show-quota-statement)
diff --git a/docs/ru/operations/system-tables/replication_queue.md b/docs/ru/operations/system-tables/replication_queue.md
index 60d42133153..31bd0bf50fd 100644
--- a/docs/ru/operations/system-tables/replication_queue.md
+++ b/docs/ru/operations/system-tables/replication_queue.md
@@ -49,7 +49,7 @@ slug: /ru/operations/system-tables/replication_queue
 
 -   `last_attempt_time` ([DateTime](../../sql-reference/data-types/datetime.md)) — дата и врем� по�ледней попытки выполнить задачу.
 
--   `num_postponed` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количе�тво отложенных задач.
+-   `num_postponed` ([UInt32](../../sql-reference/data-types/int-uint.md)) — количе�тво откладываний запу�ка задачи.
 
 -   `postpone_reason` ([String](../../sql-reference/data-types/string.md)) — причина, по которой была отложена задача.
 
diff --git a/docs/ru/operations/utilities/clickhouse-benchmark.md b/docs/ru/operations/utilities/clickhouse-benchmark.md
index 73de78d1c15..eb342bea9a7 100644
--- a/docs/ru/operations/utilities/clickhouse-benchmark.md
+++ b/docs/ru/operations/utilities/clickhouse-benchmark.md
@@ -50,7 +50,7 @@ clickhouse-benchmark [keys] < queries_file;
 -   `-r`, `--randomize` — и�пользовать �лучайный пор�док выполнени� запро�ов при наличии более одного входного запро�а.
 -   `-s`, `--secure` — и�пользует�� `TLS` �оединение.
 -   `-t N`, `--timelimit=N` — лимит по времени в �екундах. `clickhouse-benchmark` пере�тает отправл�ть запро�ы при до�тижении лимита по времени. Значение по умолчанию: 0 (лимит отключен).
--   `--confidence=N` — уровень довери� дл�  T-критери�. Возможные значени�: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [режиме �равнени�](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` провер�ет [двухвыборочный  t-критерий Стьюдента дл� незави�имых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test) чтобы определить, различны ли две выборки при выбранном уровне довери�.
+-   `--confidence=N` — уровень довери� дл�  T-критери�. Возможные значени�: 0 (80%), 1 (90%), 2 (95%), 3 (98%), 4 (99%), 5 (99.5%). Значение по умолчанию: 5. В [режиме �равнени�](#clickhouse-benchmark-comparison-mode) `clickhouse-benchmark` провер�ет [двухвыборочный  t-критерий Стьюдента дл� незави�имых выборок](https://en.wikipedia.org/wiki/Student%27s_t-test#Independent_two-sample_t-test), чтобы определить, различны ли две выборки при выбранном уровне довери�.
 -   `--cumulative` — выводить �тати�тику за в�е врем� работы, а не за по�ледний временной интервал.
 -   `--database=DATABASE_NAME` — им� базы данных ClickHouse. Значение по умолчанию: `default`.
 -   `--json=FILEPATH` — дополнительный вывод в формате `JSON`. Когда �тот ключ указан, `clickhouse-benchmark` выводит отчет в указанный JSON-файл.
diff --git a/docs/ru/operations/utilities/clickhouse-copier.md b/docs/ru/operations/utilities/clickhouse-copier.md
deleted file mode 100644
index da86ef2d35d..00000000000
--- a/docs/ru/operations/utilities/clickhouse-copier.md
+++ /dev/null
@@ -1,183 +0,0 @@
----
-slug: /ru/operations/utilities/clickhouse-copier
-sidebar_position: 59
-sidebar_label: clickhouse-copier
----
-
-# clickhouse-copier {#clickhouse-copier}
-
-Копирует данные из таблиц одного кла�тера в таблицы другого (или �того же) кла�тера.
-
-Можно запу�тить не�колько `clickhouse-copier` дл� разных �ерверах дл� выполнени� одного и того же задани�. Дл� �инхронизации между проце��ами и�пользует�� ZooKeeper.
-
-По�ле запу�ка, `clickhouse-copier`:
-
--   Соедин�ет�� � ZooKeeper и получает:
-
-    -   Задани� на копирование.
-    -   Со�то�ние заданий на копирование.
-
--   Выполн�ет задани�.
-
-        Каждый запущенный проце�� выбирает "ближайший" шард и�ходного кла�тера и копирует данные в кла�тер назначени�, при необходимо�ти перешардиру� их.
-
-`clickhouse-copier` от�леживает изменени� в ZooKeeper и примен�ет их «на лету».
-
-Дл� �нижени� �етевого трафика рекомендуем запу�кать `clickhouse-copier` на том же �ервере, где наход�т�� и�ходные данные.
-
-## Запу�к Clickhouse-copier {#zapusk-clickhouse-copier}
-
-Утилиту �ледует запу�кать вручную �ледующим образом:
-
-``` bash
-$ clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --base-dir /path/to/dir
-```
-
-Параметры запу�ка:
-
--   `daemon` - запу�кает `clickhouse-copier` в режиме демона.
--   `config` - путь к файлу `zookeeper.xml` � параметрами �оединени� � ZooKeeper.
--   `task-path` - путь к ноде ZooKeeper. �ода и�пользует�� дл� �инхронизации между проце��ами `clickhouse-copier` и дл� хранени� заданий. Задани� хран�т�� в `$task-path/description`.
--   `task-file` - необ�зательный путь к файлу � опи�анием конфигураци� заданий дл� загрузки в ZooKeeper.
--   `task-upload-force` - Загрузить `task-file` в ZooKeeper даже е�ли уже было загружено.
--   `base-dir` - путь к логам и в�помогательным файлам. При запу�ке `clickhouse-copier` �оздает в `$base-dir` подкаталоги `clickhouse-copier_YYYYMMHHSS_<PID>`. Е�ли параметр не указан, то каталоги будут �оздавать�� в каталоге, где `clickhouse-copier` был запущен.
-
-## Формат Zookeeper.xml {#format-zookeeper-xml}
-
-``` xml
-<clickhouse>
-    <logger>
-        <level>trace</level>
-        <size>100M</size>
-        <count>3</count>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>127.0.0.1</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</clickhouse>
-```
-
-## Конфигураци� заданий на копирование {#konfiguratsiia-zadanii-na-kopirovanie}
-
-``` xml
-<clickhouse>
-    <!-- Configuration of clusters as in an ordinary server config -->
-    <remote_servers>
-        <source_cluster>
-		    <!--
-                source cluster & destination clusters accept exactly the same
-                parameters as parameters for the usual Distributed table
-                see https://clickhouse.com/docs/ru/engines/table-engines/special/distributed/
-            -->
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>127.0.0.1</host>
-                        <port>9000</port>
-						<!--
-                        <user>default</user>
-                        <password>default</password>
-                        <secure>1</secure>
-                        -->
-                    </replica>
-            </shard>
-            ...
-        </source_cluster>
-
-        <destination_cluster>
-        ...
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <distributed_foreground_insert>1</distributed_foreground_insert>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>test</database_pull>
-            <table_pull>hits</table_pull>
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>test</database_push>
-            <table_push>hits2</table_push>
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-            -->
-            <engine>
-            ENGINE=ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/hits2', '{replica}')
-            PARTITION BY toMonday(date)
-            ORDER BY (CounterID, EventDate)
-            </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-            <sharding_key>jumpConsistentHash(intHash64(UserID), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-            <where_condition>CounterID != 0</where_condition>
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-            -->
-            <enabled_partitions>
-                <partition>'2018-02-26'</partition>
-                <partition>'2018-03-05'</partition>
-                ...
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-        <table_visits>
-        ...
-        </table_visits>
-        ...
-    </tables>
-</clickhouse>
-```
-
-`clickhouse-copier` от�леживает изменени� `/task/path/description` и примен�ет их «на лету». Е�ли вы помен�ете, например, значение `max_workers`, то количе�тво проце��ов, выполн�ющих задани�, также изменит��.
diff --git a/docs/ru/operations/utilities/index.md b/docs/ru/operations/utilities/index.md
index 9eb90a3037c..e4b01a0276d 100644
--- a/docs/ru/operations/utilities/index.md
+++ b/docs/ru/operations/utilities/index.md
@@ -7,7 +7,6 @@ sidebar_position: 56
 # Утилиты ClickHouse {#utility-clickhouse}
 
 -   [clickhouse-local](clickhouse-local.md) - позвол�ет выполн�ть SQL-запро�ы над данными без о�тановки �ервера ClickHouse, подобно утилите `awk`.
--   [clickhouse-copier](clickhouse-copier.md) - копирует (и перешардирует) данные � одного кла�тера на другой.
 -   [clickhouse-benchmark](../../operations/utilities/clickhouse-benchmark.md) — у�танавливает �оединение � �ервером ClickHouse и запу�кает цикличе�кое выполнение указанных запро�ов.
 -   [clickhouse-format](../../operations/utilities/clickhouse-format.md) — позвол�ет форматировать вход�щие запро�ы.
 -   [ClickHouse obfuscator](../../operations/utilities/clickhouse-obfuscator.md) — обфу�цирует данные.
diff --git a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
index 59a9c7f8cf1..6463f6bd95d 100644
--- a/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/ru/sql-reference/aggregate-functions/parametric-functions.md
@@ -476,7 +476,7 @@ FROM
 
 -   `r1` - количе�тво уникальных по�етителей за 2020-01-01 (`cond1`).
 -   `r2` - количе�тво уникальных по�етителей в период между 2020-01-01 и 2020-01-02 (`cond1` и `cond2`).
--   `r3` - количе�тво уникальных по�етителей в период между 2020-01-01 и 2020-01-03 (`cond1` и `cond3`).
+-   `r3` - количе�тво уникальных по�етителей в период за 2020-01-01 и 2020-01-03 (`cond1` и `cond3`).
 
 ## uniqUpTo(N)(x) {#uniquptonx}
 
diff --git a/docs/ru/sql-reference/data-types/datetime.md b/docs/ru/sql-reference/data-types/datetime.md
index 80d844a1713..34cd44d4709 100644
--- a/docs/ru/sql-reference/data-types/datetime.md
+++ b/docs/ru/sql-reference/data-types/datetime.md
@@ -33,7 +33,7 @@ ClickHouse отображает значени� в зави�имо�ти от
 
 ## Примеры {#primery}
 
-**1.** Создание таблицы � �толбцом типа `DateTime` и в�тавка данных в неё:
+**1.** Создание таблицы �о �толбцом типа `DateTime` и в�тавка данных в неё:
 
 ``` sql
 CREATE TABLE dt
@@ -120,7 +120,7 @@ FROM dt
 -   [Функции дл� работы � датой и временем](../../sql-reference/functions/date-time-functions.md)
 -   [Функции дл� работы � ма��ивами](../../sql-reference/functions/array-functions.md)
 -   [�а�тройка `date_time_input_format`](../../operations/settings/index.md#settings-date_time_input_format)
--   [�а�тройка `date_time_output_format`](../../operations/settings/index.md)
+-   [�а�тройка `date_time_output_format`](../../operations/settings/index.md#settings-date_time_output_format)
 -   [Конфигурационный параметр �ервера `timezone`](../../operations/server-configuration-parameters/settings.md#server_configuration_parameters-timezone)
 -   [Параметр `session_timezone`](../../operations/settings/settings.md#session_timezone)
 -   [Операторы дл� работы � датой и временем](../../sql-reference/operators/index.md#operators-datetime)
diff --git a/docs/ru/sql-reference/data-types/multiword-types.md b/docs/ru/sql-reference/data-types/multiword-types.md
deleted file mode 100644
index cca2d71e480..00000000000
--- a/docs/ru/sql-reference/data-types/multiword-types.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-slug: /ru/sql-reference/data-types/multiword-types
-sidebar_position: 61
-sidebar_label: Со�тавные типы
----
-
-# Со�тавные типы {#multiword-types}
-
-При �оздании таблиц вы можете и�пользовать типы данных � названием, �о�то�щим из не�кольких �лов. Такие названи� поддерживают�� дл� лучшей �овме�тимо�ти � SQL.
-
-## Поддержка �о�тавных типов {#multiword-types-support}
-
-| Со�тавные типы                      | Обычные типы                                              |
-|-------------------------------------|-----------------------------------------------------------|
-| DOUBLE PRECISION                    | [Float64](../../sql-reference/data-types/float.md)        |
-| CHAR LARGE OBJECT                   | [String](../../sql-reference/data-types/string.md)        |
-| CHAR VARYING                        | [String](../../sql-reference/data-types/string.md)        |
-| CHARACTER LARGE OBJECT              | [String](../../sql-reference/data-types/string.md)        |
-| CHARACTER VARYING                   | [String](../../sql-reference/data-types/string.md)        |
-| NCHAR LARGE OBJECT                  | [String](../../sql-reference/data-types/string.md)        |
-| NCHAR VARYING                       | [String](../../sql-reference/data-types/string.md)        |
-| NATIONAL CHARACTER LARGE OBJECT     | [String](../../sql-reference/data-types/string.md)        |
-| NATIONAL CHARACTER VARYING          | [String](../../sql-reference/data-types/string.md)        |
-| NATIONAL CHAR VARYING               | [String](../../sql-reference/data-types/string.md)        |
-| NATIONAL CHARACTER                  | [String](../../sql-reference/data-types/string.md)        |
-| NATIONAL CHAR                       | [String](../../sql-reference/data-types/string.md)        |
-| BINARY LARGE OBJECT                 | [String](../../sql-reference/data-types/string.md)        |
-| BINARY VARYING                      | [String](../../sql-reference/data-types/string.md)        |
diff --git a/docs/ru/sql-reference/functions/arithmetic-functions.md b/docs/ru/sql-reference/functions/arithmetic-functions.md
index 73bac0595e1..ca7a4566c6c 100644
--- a/docs/ru/sql-reference/functions/arithmetic-functions.md
+++ b/docs/ru/sql-reference/functions/arithmetic-functions.md
@@ -172,7 +172,7 @@ multiplyDecimal(a, b[, result_scale])
 ```
 
 :::note    
-Эта функци� работают гораздо медленнее обычной `multiply`.
+Эта функци� работает гораздо медленнее обычной `multiply`.
 В �лучае, е�ли нет необходимо�ти иметь фик�ированную точно�ть и/или нужны бы�трые вычи�лени�, �ледует и�пользовать [multiply](#multiply).
 :::
 
diff --git a/docs/ru/sql-reference/functions/array-functions.md b/docs/ru/sql-reference/functions/array-functions.md
index 659e2d3f75e..1f06bdf264a 100644
--- a/docs/ru/sql-reference/functions/array-functions.md
+++ b/docs/ru/sql-reference/functions/array-functions.md
@@ -488,7 +488,7 @@ arrayPushBack(array, single_value)
 **�ргументы**
 
 -   `array` – ма��ив.
--   `single_value` – значение добавл�емого �лемента. В ма��ив � чи�лам можно добавить только чи�ла, в ма��ив �о �троками только �троки. При добавлении чи�ел ClickHouse автоматиче�ки приводит тип `single_value` к типу данных ма��ива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в �том �лучае функци� добавит �лемент `NULL` в ма��ив, а тип �лементов ма��ива преобразует в `Nullable`.
+-   `single_value` – значение добавл�емого �лемента. В ма��ив � чи�лами можно добавить только чи�ла, в ма��ив �о �троками только �троки. При добавлении чи�ел ClickHouse автоматиче�ки приводит тип `single_value` к типу данных ма��ива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в �том �лучае функци� добавит �лемент `NULL` в ма��ив, а тип �лементов ма��ива преобразует в `Nullable`.
 
 **Пример**
 
@@ -513,7 +513,7 @@ arrayPushFront(array, single_value)
 **�ргументы**
 
 -   `array` – ма��ив.
--   `single_value` – значение добавл�емого �лемента. В ма��ив � чи�лам можно добавить только чи�ла, в ма��ив �о �троками только �троки. При добавлении чи�ел ClickHouse автоматиче�ки приводит тип `single_value` к типу данных ма��ива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в �том �лучае функци� добавит �лемент `NULL` в ма��ив, а тип �лементов ма��ива преобразует в `Nullable`.
+-   `single_value` – значение добавл�емого �лемента. В ма��ив � чи�лами можно добавить только чи�ла, в ма��ив �о �троками только �троки. При добавлении чи�ел ClickHouse автоматиче�ки приводит тип `single_value` к типу данных ма��ива. Подробнее о типах данных в ClickHouse читайте в разделе «[Типы данных](../../sql-reference/functions/array-functions.md#data_types)». Может быть равно `NULL`, в �том �лучае функци� добавит �лемент `NULL` в ма��ив, а тип �лементов ма��ива преобразует в `Nullable`.
 
 **Пример**
 
diff --git a/docs/ru/sql-reference/functions/date-time-functions.md b/docs/ru/sql-reference/functions/date-time-functions.md
index cbbb456aa80..56ae4359bf1 100644
--- a/docs/ru/sql-reference/functions/date-time-functions.md
+++ b/docs/ru/sql-reference/functions/date-time-functions.md
@@ -627,7 +627,7 @@ SELECT toDate('2016-12-27') AS date, toYearWeek(date) AS yearWeek0, toYearWeek(d
 
 ## age
 
-Вычи�л�ет компонент `unit` разницы между `startdate` и `enddate`. Разница вычи�л�ет�� � точно�тью в 1 микро�екунду.
+Вычи�л�ет компонент `unit` разницы между `startdate` и `enddate`. Разница вычи�л�ет�� � точно�тью в 1 нано�екунду.
 �апример, разница между `2021-12-29` и `2022-01-01` 3 дн� дл� единицы `day`, 0 ме��цев дл� единицы `month`, 0 лет дл� единицы `year`.
 
 **Синтак�и�**
@@ -641,6 +641,7 @@ age('unit', startdate, enddate, [timezone])
 -   `unit` — единица измерени� времени, в которой будет выражено возвращаемое значение функции. [String](../../sql-reference/data-types/string.md).
     Возможные значени�:
 
+    - `nanosecond` (возможные �окращени�: `ns`)
     - `microsecond` (возможные �окращени�: `us`, `u`)
     - `millisecond` (возможные �окращени�: `ms`)
     - `second` (возможные �окращени�: `ss`, `s`)
@@ -716,6 +717,7 @@ date_diff('unit', startdate, enddate, [timezone])
 -   `unit` — единица измерени� времени, в которой будет выражено возвращаемое значение функции. [String](../../sql-reference/data-types/string.md).
     Возможные значени�:
 
+    - `nanosecond` (возможные �окращени�: `ns`)
     - `microsecond` (возможные �окращени�: `us`, `u`)
     - `millisecond` (возможные �окращени�: `ms`)
     - `second` (возможные �окращени�: `ss`, `s`)
diff --git a/docs/ru/sql-reference/statements/alter/column.md b/docs/ru/sql-reference/statements/alter/column.md
index 385a9835eca..2ea045f4ae3 100644
--- a/docs/ru/sql-reference/statements/alter/column.md
+++ b/docs/ru/sql-reference/statements/alter/column.md
@@ -94,7 +94,7 @@ RENAME COLUMN [IF EXISTS] name to new_name
 
 Переименовывает �толбец `name` в `new_name`. Е�ли указано выражение `IF EXISTS`, то запро� не будет возвращать ошибку при у�ловии, что �толбец `name` не �уще�твует. По�кольку переименование не затрагивает физиче�кие данные колонки, запро� выполн�ет�� практиче�ки мгновенно.
 
-**З�МЕЧЕ�ИЕ**: Столбцы, �вл�ющие�� ча�тью о�новного ключа или ключа �ортировки (заданные � помощью `ORDER BY` или `PRIMARY KEY`), не могут быть переименованы. Попытка переименовать �ти �лобцы приведет к `SQL Error [524]`. 
+**З�МЕЧЕ�ИЕ**: Столбцы, �вл�ющие�� ча�тью о�новного ключа или ключа �ортировки (заданные � помощью `ORDER BY` или `PRIMARY KEY`), не могут быть переименованы. Попытка переименовать �ти �лобцы приведет к `SQL Error [524]`.
 
 Пример:
 
@@ -254,7 +254,7 @@ SELECT groupArray(x), groupArray(s) FROM tmp;
 
 От�ут�твует возможно�ть удал�ть �толбцы, вход�щие в первичный ключ или ключ дл� ��мплировани� (в общем, вход�щие в выражение `ENGINE`). Изменение типа у �толбцов, вход�щих в первичный ключ возможно только в том �лучае, е�ли �то изменение не приводит к изменению данных (например, разрешено добавление значени� в Enum или изменение типа � `DateTime` на `UInt32`).
 
-Е�ли возможно�тей запро�а `ALTER` не хватает дл� нужного изменени� таблицы, вы можете �оздать новую таблицу, �копировать туда данные � помощью запро�а [INSERT SELECT](../insert-into.md#inserting-the-results-of-select), затем помен�ть таблицы ме�тами � помощью запро�а [RENAME](../rename.md#rename-table), и удалить �тарую таблицу. В каче�тве альтернативы дл� запро�а `INSERT SELECT`, можно и�пользовать ин�трумент [clickhouse-copier](../../../sql-reference/statements/alter/index.md).
+Е�ли возможно�тей запро�а `ALTER` не хватает дл� нужного изменени� таблицы, вы можете �оздать новую таблицу, �копировать туда данные � помощью запро�а [INSERT SELECT](../insert-into.md#inserting-the-results-of-select), затем помен�ть таблицы ме�тами � помощью запро�а [RENAME](../rename.md#rename-table), и удалить �тарую таблицу.
 
 Запро� `ALTER` блокирует в�е чтени� и запи�и дл� таблицы. То е�ть е�ли на момент запро�а `ALTER` выполн�л�� долгий `SELECT`, то запро� `ALTER` �начала дождёт�� его выполнени�. И в �то врем� в�е новые запро�ы к той же таблице будут ждать, пока завершит�� �тот `ALTER`.
 
diff --git a/docs/ru/sql-reference/statements/alter/quota.md b/docs/ru/sql-reference/statements/alter/quota.md
index 709baea6af0..c14b81c9bf3 100644
--- a/docs/ru/sql-reference/statements/alter/quota.md
+++ b/docs/ru/sql-reference/statements/alter/quota.md
@@ -22,7 +22,7 @@ ALTER QUOTA [IF EXISTS] name [ON CLUSTER cluster_name]
 
 Ключи `user_name`, `ip_address`, `client_key`, `client_key, user_name` и `client_key, ip_address` �оответ�твуют пол�м таблицы [system.quotas](../../../operations/system-tables/quotas.md).
 
-Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` �оответ�твуют пол�м таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
+Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time`, `failed_sequential_authentications` �оответ�твуют пол�м таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
 
 В �екции `ON CLUSTER` можно указать кла�теры, на которых �оздает�� квота, �м. [Ра�пределенные DDL запро�ы](../../../sql-reference/distributed-ddl.md).
 
diff --git a/docs/ru/sql-reference/statements/create/quota.md b/docs/ru/sql-reference/statements/create/quota.md
index 18eba6b5b1a..398c52fdc73 100644
--- a/docs/ru/sql-reference/statements/create/quota.md
+++ b/docs/ru/sql-reference/statements/create/quota.md
@@ -20,7 +20,7 @@ CREATE QUOTA [IF NOT EXISTS | OR REPLACE] name [ON CLUSTER cluster_name]
 ```
 Ключи `user_name`, `ip_address`, `client_key`, `client_key, user_name` и `client_key, ip_address` �оответ�твуют пол�м таблицы [system.quotas](../../../operations/system-tables/quotas.md).
 
-Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time` �оответ�твуют пол�м таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
+Параметры `queries`, `query_selects`, `query_inserts`, `errors`, `result_rows`, `result_bytes`, `read_rows`, `read_bytes`, `execution_time`, `failed_sequential_authentications` �оответ�твуют пол�м таблицы [system.quotas_usage](../../../operations/system-tables/quotas_usage.md).
 
 В �екции `ON CLUSTER` можно указать кла�теры, на которых �оздает�� квота, �м. [Ра�пределенные DDL запро�ы](../../../sql-reference/distributed-ddl.md).
 
diff --git a/docs/ru/sql-reference/statements/create/view.md b/docs/ru/sql-reference/statements/create/view.md
index 543a4b21ad1..032bdc6e6d4 100644
--- a/docs/ru/sql-reference/statements/create/view.md
+++ b/docs/ru/sql-reference/statements/create/view.md
@@ -11,7 +11,9 @@ sidebar_label: "Пред�тавление"
 ## Обычные пред�тавлени� {#normal}
 
 ``` sql
-CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster_name] AS SELECT ...
+CREATE [OR REPLACE] VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER cluster_name] 
+[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }] 
+AS SELECT ...
 ```
 
 Обычные пред�тавлени� не хран�т никаких данных, они выполн�ют чтение данных из другой таблицы при каждом до�тупе. Другими �ловами, обычное пред�тавление — �то не что иное, как �охраненный запро�. При чтении данных из пред�тавлени� �тот �охраненный запро� и�пользует�� как подзапро� в �екции [FROM](../../../sql-reference/statements/select/from.md).
@@ -37,7 +39,9 @@ SELECT a, b, c FROM (SELECT ...)
 ## Материализованные пред�тавлени� {#materialized}
 
 ``` sql
-CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] AS SELECT ...
+CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]name] [ENGINE = engine] [POPULATE] 
+[DEFINER = { user | CURRENT_USER }] [SQL SECURITY { DEFINER | INVOKER | NONE }] 
+AS SELECT ...
 ```
 
 Материализованные (MATERIALIZED) пред�тавлени� хран�т данные, преобразованные �оответ�твующим запро�ом [SELECT](../../../sql-reference/statements/select/index.md).
@@ -66,6 +70,52 @@ CREATE MATERIALIZED VIEW [IF NOT EXISTS] [db.]table_name [ON CLUSTER] [TO[db.]na
 
 Чтобы удалить пред�тавление, �ледует и�пользовать [DROP VIEW](../../../sql-reference/statements/drop.md#drop-view). Впрочем, `DROP TABLE` тоже работает дл� пред�тавлений.
 
+## SQL безопа�но�ть {#sql_security}
+
+Параметры `DEFINER` и `SQL SECURITY` позвол�ют задать правило от имени какого пользовател� будут выполн�ть�� запро�ы к таблицам, на которые ��ылает�� пред�тавление.
+Дл� `SQL SECURITY` допу�тимо три значени�: `DEFINER`, `INVOKER`, или `NONE`.
+Дл� `DEFINER` можно указать им� любого �уще�твующего пользовател� или же `CURRENT_USER`.
+
+Далее приведена таблица, объ��н�юща� какие права необходимы каким пользовател�м при заданных параметрах SQL безопа�но�ти.
+Обратите внимание, что, в незави�имо�ти от заданных параметров SQL безопа�но�ти, 
+у пользовател� должно быть право `GRANT SELECT ON <view>` дл� чтени� из пред�тавлени�.
+
+| SQL security option | View                                                                                               | Materialized View                                                                          |
+|---------------------|----------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------|
+| `DEFINER alice`     | У `alice` должно быть право `SELECT` на таблицу-и�точник.                                          | У `alice` должны быть права `SELECT` на таблицу-и�точник и `INSERT` на таблицу-назначение. |
+| `INVOKER`           | У пользовател� выполн�ющего запро� к пред�тавлению должно быть право `SELECT` на таблицу-и�точник. | Тип `SQL SECURITY INVOKER` не может быть указан дл� материализованных пред�тавлений.       |
+| `NONE`              | -                                                                                                  | -                                                                                          |
+
+:::note
+Тип `SQL SECURITY NONE` не безопа�ен дл� и�пользовани�. Любой пользователь � правом �оздавать пред�тавлени� � `SQL SECURITY NONE` �может и�полн�ть любые запро�ы без проверки прав.
+По умолчанию, у пользователей нет прав указывать `SQL SECURITY NONE`, однако, при необходимо�ти, �то право можно выдать � помощью `GRANT ALLOW SQL SECURITY NONE TO <user>`.
+:::
+
+Е�ли `DEFINER`/`SQL SECURITY` не указан, будут и�пользованы значени� по умолчанию:
+- `SQL SECURITY`: `INVOKER` дл� обычных пред�тавлений и `DEFINER` дл� материализованных ([измен�ет�� в на�тройках](../../../operations/settings/settings.md#default_normal_view_sql_security))
+- `DEFINER`: `CURRENT_USER` ([измен�ет�� в на�тройках](../../../operations/settings/settings.md#default_view_definer))
+
+Е�ли пред�тавление подключает�� � помощью ключевого �лова `ATTACH` и на�тройки SQL безопа�но�ти не были заданы,
+то по умолчанию будет и�пользовать�� `SQL SECURITY NONE` дл� материализованных пред�тавлений и `SQL SECURITY INVOKER` дл� обычных.
+
+Изменить параметры SQL безопа�но�ти возможно � помощью �ледующего запро�а:
+```sql
+ALTER TABLE MODIFY SQL SECURITY { DEFINER | INVOKER | NONE } [DEFINER = { user | CURRENT_USER }]
+```
+
+### Примеры пред�тавлений � SQL безопа�но�тью
+```sql
+CREATE test_view
+DEFINER = alice SQL SECURITY DEFINER
+AS SELECT ...
+```
+
+```sql
+CREATE test_view
+SQL SECURITY INVOKER
+AS SELECT ...
+```
+
 ## LIVE-пред�тавлени� [�к�периментальный функционал] {#live-view}
 
 :::note Важно
diff --git a/docs/ru/sql-reference/statements/select/distinct.md b/docs/ru/sql-reference/statements/select/distinct.md
index 58fe16b16d9..ad310434598 100644
--- a/docs/ru/sql-reference/statements/select/distinct.md
+++ b/docs/ru/sql-reference/statements/select/distinct.md
@@ -92,7 +92,7 @@ ClickHouse поддерживает и�пользование �екций `DIS
 
 ## Обработка NULL {#null-processing}
 
-`DISTINCT` работает � [NULL](../../syntax.md#null-literal) как-будто `NULL` — обычное значение и `NULL==NULL`. Другими �ловами, в результате `DISTINCT`, различные комбинации � `NULL` в�трет�т�� только один раз. Это отличает�� от обработки `NULL` в большин�тве других контек�тов.
+`DISTINCT` работает � [NULL](../../syntax.md#null-literal) как будто `NULL` — обычное значение и `NULL==NULL`. Другими �ловами, в результате `DISTINCT`, различные комбинации � `NULL` в�трет�т�� только один раз. Это отличает�� от обработки `NULL` в большин�тве других контек�тов.
 
 ## �льтернативы {#alternatives}
 
diff --git a/docs/ru/sql-reference/statements/system.md b/docs/ru/sql-reference/statements/system.md
index b3d2eff5364..3e7d67d90ff 100644
--- a/docs/ru/sql-reference/statements/system.md
+++ b/docs/ru/sql-reference/statements/system.md
@@ -280,7 +280,7 @@ SYSTEM START REPLICATION QUEUES [ON CLUSTER cluster_name] [[db.]replicated_merge
 Ждет когда таблица �емей�тва `ReplicatedMergeTree` будет �инхронизирована � другими репликами в кла�тере, но не более `receive_timeout` �екунд:
 
 ``` sql
-SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT | PULL]
+SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT [FROM 'srcReplica1'[, 'srcReplica2'[, ...]]] | PULL]
 ```
 
 По�ле выполнени� �того запро�а таблица `[db.]replicated_merge_tree_family_table_name` загружает команды из общего реплицированного лога в �вою �об�твенную очередь репликации. Затем запро� ждет, пока реплика не обработает в�е загруженные команды. Поддерживают�� �ледующие модификаторы:
diff --git a/docs/ru/sql-reference/table-functions/cluster.md b/docs/ru/sql-reference/table-functions/cluster.md
index f148a21294a..bb22b38f8f9 100644
--- a/docs/ru/sql-reference/table-functions/cluster.md
+++ b/docs/ru/sql-reference/table-functions/cluster.md
@@ -33,7 +33,7 @@ clusterAllReplicas('cluster_name', db, table[, sharding_key])
 
 **И�пользование макро�ов**
 
-`cluster_name` может �одержать макро� — под�тановку в фигурных �кобках. Эта под�тановка замен�ет�� на �оответ�твующее значение из �екции [macros](../../operations/server-configuration-parameters/settings.md#macros) конфигурационного файла .
+`cluster_name` может �одержать макро� — под�тановку в фигурных �кобках. Эта под�тановка замен�ет�� на �оответ�твующее значение из �екции [macros](../../operations/server-configuration-parameters/settings.md#macros) конфигурационного файла.
 
 Пример:
 
diff --git a/docs/zh/engines/database-engines/materialize-mysql.md b/docs/zh/engines/database-engines/materialize-mysql.md
deleted file mode 100644
index 5d1394f9456..00000000000
--- a/docs/zh/engines/database-engines/materialize-mysql.md
+++ /dev/null
@@ -1,196 +0,0 @@
----
-slug: /zh/engines/database-engines/materialize-mysql
-sidebar_position: 29
-sidebar_label: "[experimental] MaterializedMySQL"
----
-
-# [experimental] MaterializedMySQL {#materialized-mysql}
-
-**这是一个实验性的特性，�应该在生产中使用。**
-
-创建ClickHouse数�库，包�MySQL中所有的表，以�这些表中的所有数�。
-
-ClickHouse�务器作为MySQL副本工作。它读�binlog并执行DDL和DML查询。
-
-这个功能是实验性的。
-
-## 创建数�库 {#creating-a-database}
-
-``` sql
-CREATE DATABASE [IF NOT EXISTS] db_name [ON CLUSTER cluster]
-ENGINE = MaterializeMySQL('host:port', ['database' | database], 'user', 'password') [SETTINGS ...]
-```
-
-**引擎�数**
-
--   `host:port` — MySQL�务地�
--   `database` — MySQL数�库�称
--   `user` — MySQL用户�
--   `password` — MySQL用户密�
-
-**引擎�置**
-
--   `max_rows_in_buffer` — �许数�缓存到内存中的最大行数(对于�个表和无法查询的缓存数�)。当超过行数时，数�将被物化。默认值: `65505`。
--   `max_bytes_in_buffer` —  �许在内存中缓存数�的最大字节数(对于�个表和无法查询的缓存数�)。当超过行数时，数�将被物化。默认值: `1048576`.
--   `max_rows_in_buffers` — �许数�缓存到内存中的最大行数(对于数�库和无法查询的缓存数�)。当超过行数时，数�将被物化。默认值: `65505`.
--   `max_bytes_in_buffers` — �许在内存中缓存数�的最大字节数(对于数�库和无法查询的缓存数�)。当超过行数时，数�将被物化。默认值: `1048576`.
--   `max_flush_data_time` — �许数�在内存中缓存的最大毫秒数(对于数�库和无法查询的缓存数�)。当超过这个时间时，数�将被物化。默认值: `1000`.
--   `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
-        allows_query_when_mysql_lost=true,
-        max_wait_time_when_mysql_unavailable=10000;
-```
-
-**MySQL�务器端�置**
-
-为了`MaterializeMySQL`正确的工作，有一些强制性的`MySQL`侧�置设置应该设置:
-
-- `default_authentication_plugin = mysql_native_password`，因为`MaterializeMySQL`�能使用此方法授�。
-- `gtid_mode = on`，因为��供正确的`MaterializeMySQL`�制，基于GTID的日志记录是必须的。注�，在打开这个模�`On`时，你还应该指定`enforce_gtid_consistency = on`。
-
-## 虚拟列 {#virtual-columns}
-
-当使用`MaterializeMySQL`数�库引擎时，[ReplacingMergeTree](../../engines/table-engines/mergetree-family/replacingmergetree.md)表与虚拟的`_sign`和`_version`列一起使用。
-
-- `_version` — �步版本。 类型[UInt64](../../sql-reference/data-types/int-uint.md).
-- `_sign` — 删除标记。类型 [Int8](../../sql-reference/data-types/int-uint.md). Possible values:
-    - `1` — 行�会删除,
-    - `-1` — 行被删除。
-
-## 支�的数�类型 {#data_types-support}
-
-| MySQL                   | ClickHouse                                                   |
-|-------------------------|--------------------------------------------------------------|
-| TINY                    | [Int8](../../sql-reference/data-types/int-uint.md)           |
-| SHORT                   | [Int16](../../sql-reference/data-types/int-uint.md)          |
-| INT24                   | [Int32](../../sql-reference/data-types/int-uint.md)          |
-| LONG                    | [UInt32](../../sql-reference/data-types/int-uint.md)         |
-| LONGLONG                | [UInt64](../../sql-reference/data-types/int-uint.md)         |
-| FLOAT                   | [Float32](../../sql-reference/data-types/float.md)           |
-| DOUBLE                  | [Float64](../../sql-reference/data-types/float.md)           |
-| DECIMAL, NEWDECIMAL     | [Decimal](../../sql-reference/data-types/decimal.md)         |
-| DATE, NEWDATE           | [Date](../../sql-reference/data-types/date.md)               |
-| DATETIME, TIMESTAMP     | [DateTime](../../sql-reference/data-types/datetime.md)       |
-| DATETIME2, TIMESTAMP2   | [DateTime64](../../sql-reference/data-types/datetime64.md)   |
-| ENUM                    | [Enum](../../sql-reference/data-types/enum.md)               |
-| STRING                  | [String](../../sql-reference/data-types/string.md)           |
-| VARCHAR, VAR_STRING     | [String](../../sql-reference/data-types/string.md)           |
-| BLOB                    | [String](../../sql-reference/data-types/string.md)           |
-| BINARY                  | [FixedString](../../sql-reference/data-types/fixedstring.md) |
-
-�支�其他类型。如果MySQL表包�此类类型的列，ClickHouse抛出异常"Unhandled data type"并�止�制。
-
-[Nullable](../../sql-reference/data-types/nullable.md)已�支�
-
-## 使用方� {#specifics-and-recommendations}
-
-### 兼容性�制
-
-除了数�类型的�制外，与`MySQL`数�库相比，还存在一些�制，在实现�制之�应先解决这些�制：
-
-- `MySQL`中的�个表都应该包�`PRIMARY KEY`
-
-- 对于包�`ENUM`字段值超出范围（在`ENUM`签�中指定）的行的表，�制将�起作用。
-
-### DDL查询 {#ddl-queries}
-
-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}
-
-`MaterializeMySQL`�支�直接`INSERT`, `DELETE`和`UPDATE`查询. 但是，它们是在数��制方�支�的：
-
-- MySQL的`INSERT`查询转�为`INSERT`并�带`_sign=1`.
-
-- MySQL的`DELETE`查询转�为`INSERT`并�带`_sign=-1`.
-
-- MySQL的`UPDATE`查询转�为`INSERT`并�带`_sign=-1`, `INSERT`和`_sign=1`.
-
-### 查询MaterializeMySQL表 {#select}
-
-`SELECT`查询`MaterializeMySQL`表有一些细节:
-
-- 如果`_version`在`SELECT`中没有指定，则使用[FINAL](../../sql-reference/statements/select/from.md#select-from-final)修饰符。所以�有带有`MAX(_version)`的行�会被选中。
-
-- 如果`_sign`在`SELECT`中没有指定，则默认使用`WHERE _sign=1`。因此，删除的行�会包�在结果集中。
-
-- 结果包括列中的列注释，因为它们存在于SQL数�库表中。
-
-### Index Conversion {#index-conversion}
-
-MySQL的`PRIMARY KEY`和`INDEX`��在ClickHouse表中转�为`ORDER BY`元组。
-
-ClickHouse�有一个物�顺�，由`ORDER BY`��决定。�创建一个新的物�顺�，使用[materialized views](../../sql-reference/statements/create/view.md#materialized)。
-
-**Notes**
-
-- 带有`_sign=-1`的行�会从表中物�删除。
-- `MaterializeMySQL`引擎�支�级�`UPDATE/DELETE`查询。
-- �制很容易被破�。
-- �止对数�库和表进行手工�作。
-- `MaterializeMySQL`�[optimize_on_insert](../../operations/settings/settings.md#optimize-on-insert)设置的影�。当MySQL�务器中的表�生�化时，数�会�并到`MaterializeMySQL`数�库中相应的表中。
-
-## 使用示例 {#examples-of-use}
-
-MySQL�作:
-
-``` sql
-mysql> CREATE DATABASE db;
-mysql> CREATE TABLE db.test (a INT PRIMARY KEY, b INT);
-mysql> INSERT INTO db.test VALUES (1, 11), (2, 22);
-mysql> DELETE FROM db.test WHERE a=1;
-mysql> ALTER TABLE db.test ADD COLUMN c VARCHAR(16);
-mysql> UPDATE db.test SET c='Wow!', b=222;
-mysql> SELECT * FROM test;
-```
-
-```text
-+---+------+------+
-| a |    b |    c |
-+---+------+------+
-| 2 |  222 | Wow! |
-+---+------+------+
-```
-
-ClickHouse中的数�库，与MySQL�务器交�数�:
-
-创建的数�库和表:
-
-``` sql
-CREATE DATABASE mysql ENGINE = MaterializeMySQL('localhost:3306', 'db', 'user', '***');
-SHOW TABLES FROM mysql;
-```
-
-``` text
-┌─name─�
-│ test │
-└──────┘
-```
-
-然��入数�:
-
-``` sql
-SELECT * FROM mysql.test;
-```
-
-``` text
-┌─a─┬──b─�
-│ 1 │ 11 │
-│ 2 │ 22 │
-└───┴────┘
-```
-
-删除数��，添加列并更新:
-
-``` sql
-SELECT * FROM mysql.test;
-```
-
-``` text
-┌─a─┬───b─┬─c────�
-│ 2 │ 222 │ Wow! │
-└───┴─────┴──────┘
-```
diff --git a/docs/zh/faq/general/ne-tormozit.md b/docs/zh/faq/general/ne-tormozit.md
index c4149655108..f397f6bb1d6 100644
--- a/docs/zh/faq/general/ne-tormozit.md
+++ b/docs/zh/faq/general/ne-tormozit.md
@@ -1,27 +1,27 @@
 ---
 slug: /zh/faq/general/ne-tormozit
-title: "What does \u201C\u043D\u0435 \u0442\u043E\u0440\u043C\u043E\u0437\u0438\u0442\
-  \u201D mean?"
+title: "\u201C\u043D\u0435 \u0442\u043E\u0440\u043C\u043E\u0437\u0438\u0442\
+  \u201D 是什么��？"
 toc_hidden: true
 sidebar_position: 11
 ---
 
-# What Does “�е тормозит� Mean? {#what-does-ne-tormozit-mean}
+# “�е тормозит� 是什么��？ {#what-does-ne-tormozit-mean}
 
-This question usually arises when people see official ClickHouse t-shirts. They have large words **“ClickHouse не тормозит�** on the front.
+这个问题通常出现在人们看到官方 ClickHouse T�时。它们的正��有大字**“ClickHouse не тормозит�**。
 
-Before ClickHouse became open-source, it has been developed as an in-house storage system by the largest Russian IT company, [Yandex](https://yandex.com/company/). That’s why it initially got its slogan in Russian, which is “не тормозит� (pronounced as “ne tormozit�). After the open-source release we first produced some of those t-shirts for events in Russia and it was a no-brainer to use the slogan as-is.
+在 ClickHouse 开�之�，它作为俄罗斯最大的 IT 公� [Yandex](https://yandex.com/company/) 的内部存储系统而开�。这就是为什么它最�获得了俄文��“не тормозит�（�音为“ne tormozit�）。在开��布�，我们首先为俄罗斯的活动制作了一些这样的T�，使用原�原味的��是�所当然的。
 
-One of the following batches of those t-shirts was supposed to be given away on events outside of Russia and we tried to make the English version of the slogan. Unfortunately, the Russian language is kind of elegant in terms of expressing stuff and there was a restriction of limited space on a t-shirt, so we failed to come up with good enough translation (most options appeared to be either long or inaccurate) and decided to keep the slogan in Russian even on t-shirts produced for international events. It appeared to be a great decision because people all over the world get positively surprised and curious when they see it.
+其中一批这样的T�原本打算在俄罗斯之外的活动中赠�，我们�试制作��的英文版本。�幸的是，俄语在表达方�有些优雅，而且T�上的空间有�，所以我们未能�出足够好的翻译（大多数选项�么太长，�么�够准确），并决定�使在为国际活动制作的T�上也�留俄文��。这被�明是一个�妙的决定，因为全世界的人们看到它时都会感到惊喜和好奇。
 
-So, what does it mean? Here are some ways to translate *“не тормозит�*:
+那么，它是什么��呢？以下是翻译“не тормозит�的一些方�：
 
--   If you translate it literally, it’d be something like *“ClickHouse does not press the brake pedal�*.
--   If you’d want to express it as close to how it sounds to a Russian person with IT background, it’d be something like *“If your larger system lags, it’s not because it uses ClickHouse�*.
--   Shorter, but not so precise versions could be *“ClickHouse is not slow�*, *“ClickHouse does not lag�* or just *“ClickHouse is fast�*.
+-   如果你直译，那就是“ClickHouse �踩刹车�。
+-   如果你想尽�能接近一个有 IT 背景的俄罗斯人的�觉感�，那就是“如果你的大型系统延迟，�是因为它使用了 ClickHouse�。
+-   更短，但�那么精确的版本�能是“ClickHouse �慢�，“ClickHouse ��顿�或仅仅“ClickHouse 很快�。
 
-If you haven’t seen one of those t-shirts in person, you can check them out online in many ClickHouse-related videos. For example, this one:
+如果您还没有亲眼�过这些 T�，�以在许多与 ClickHouse 相关的视频中在线查看。例如，这个：
 
 ![iframe](https://www.youtube.com/embed/bSyQahMVZ7w)
 
-P.S. These t-shirts are not for sale, they are given away for free on most [ClickHouse Meetups](https://clickhouse.com/#meet), usually for best questions or other forms of active participation.
+附言：这些 T��出售，它们在大多数 [ClickHouse �会](https://clickhouse.com/#meet)上�费赠�，通常是给出最佳问题或其他形�的积��与者。
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 a7df6aec207..ddfda87abb4 100644
--- a/docs/zh/faq/general/why-clickhouse-is-so-fast.md
+++ b/docs/zh/faq/general/why-clickhouse-is-so-fast.md
@@ -1,63 +1,63 @@
 ---
 slug: /zh/faq/general/why-clickhouse-is-so-fast
-title: Why is ClickHouse so fast?
+title: 为什么 ClickHouse 如此快速？
 toc_hidden: true
 sidebar_position: 8
 ---
 
-# Why ClickHouse Is So Fast? {#why-clickhouse-is-so-fast}
+# 为什么 ClickHouse 如此快速？ {#why-clickhouse-is-so-fast}
 
-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 �为一个真正的生产系统。
 
-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:
+ClickHouse 最�是作为一个原型构建的，它的�一任务就是尽�能快速地过滤和��数�。这正是构建典型分�报告所需�的，也是典型 [GROUP BY](../../sql-reference/statements/select/group-by.md) 查询所�的。ClickHouse 团队�出了几个高层次的决策，这些决策组�在一起使得实现这一任务�为�能：
 
-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.
+列�存储
+:   �数�通常包�数百甚至数�列，而报告�能�使用其中的几列。系统需���读��必�的列，�则大部分昂贵的�盘读��作将被浪费。
 
-Indexes
-:   ClickHouse keeps data structures in memory that allows reading not only used columns but only necessary row ranges of those columns.
+索引
+:   ClickHouse 在内存中�留数�结构，�许�仅读�使用的列，而且�读�这些列的必�行范围。
 
-Data compression
-:   Storing different values of the same column together often leads to better compression ratios (compared to row-oriented systems) because in real data column often has the same or not so many different values for neighboring rows. In addition to general-purpose compression, ClickHouse supports [specialized codecs](../../sql-reference/statements/create/table.mdx/#create-query-specialized-codecs) that can make data even more compact.
+数�压缩
+:   将�一列的��值存储在一起通常会导致更好的压缩比（与行�系统相比），因为在实际数�中列通常对相邻行有相�或�太多的��值。除了通用压缩之外，ClickHouse 还支� [专用编解�器](../../sql-reference/statements/create/table.mdx/#create-query-specialized-codecs)，�以使数�更加紧凑。
 
-Vectorized query execution
-:   ClickHouse not only stores data in columns but also processes data in columns. It leads to better CPU cache utilization and allows for [SIMD](https://en.wikipedia.org/wiki/SIMD) CPU instructions usage.
+��化查询执行
+:   ClickHouse �仅以列的形�存储数�，而且以列的形�处�数�。这导致更好的 CPU 缓存利用率，并�许使用 [SIMD](https://en.wikipedia.org/wiki/SIMD) CPU 指令。
 
-Scalability
-:   ClickHouse can leverage all available CPU cores and disks to execute even a single query. Not only on a single server but all CPU cores and disks of a cluster as well.
+�扩展性
+:   ClickHouse �以利用所有�用的 CPU 核心和�盘�执行甚至是�个查询。�仅在�个�务器上，而且在集群的所有 CPU 核心和�盘上。
 
-But many other database management systems use similar techniques. What really makes ClickHouse stand out is **attention to low-level details**. Most programming languages provide implementations for most common algorithms and data structures, but they tend to be too generic to be effective. Every task can be considered as a landscape with various characteristics, instead of just throwing in random implementation. For example, if you need a hash table, here are some key questions to consider:
+但许多其他数�库管�系统也使用类似的技术。真正使 ClickHouse 脱颖而出的是 **对底层细节的关注**。大多数编程语言为最常�的算法和数�结构�供了实现，但它们往往过于通用而无法高效。�个任务都�以被视为具有��特�的景观，而�是仅仅��投入�个实现。例如，如果您需�一个哈希表，这里有一些关键问题需�考虑：
 
--   Which hash function to choose?
--   Collision resolution algorithm: [open addressing](https://en.wikipedia.org/wiki/Open_addressing) vs [chaining](https://en.wikipedia.org/wiki/Hash_table#Separate_chaining)?
--   Memory layout: one array for keys and values or separate arrays? Will it store small or large values?
--   Fill factor: when and how to resize? How to move values around on resize?
--   Will values be removed and which algorithm will work better if they will?
--   Will we need fast probing with bitmaps, inline placement of string keys, support for non-movable values, prefetch, and batching?
+-   选择哪�哈希函数？
+-   冲�解决算法：[开放寻�](https://en.wikipedia.org/wiki/Open_addressing)还是[链接](https://en.wikipedia.org/wiki/Hash_table#Separate_chaining)？
+-   内存布局：一个数组用于键和值还是分开的数组？它会存储�值还是大值？
+-   填充因�：何时以�如何调整大�？在调整大�时如何移动值？
+-   是�会移除值，如果会，哪�算法会更好？
+-   我们是�需�使用�图进行快速探测，字符串键的内�放置，对��移动值的支�，预�和批处�？
 
-Hash table is a key data structure for `GROUP BY` implementation and ClickHouse automatically chooses one of [30+ variations](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Aggregator.h) for each specific query.
+哈希表是 `GROUP BY` 实现的关键数�结构，ClickHouse 会根��个特定查询自动选择 [30 多��体](https://github.com/ClickHouse/ClickHouse/blob/master/src/Interpreters/Aggregator.h) 中的一�。
 
-The same goes for algorithms, for example, in sorting you might consider:
+算法也是如此，例如，在排�中，您�能会考虑：
 
--   What will be sorted: an array of numbers, tuples, strings, or structures?
--   Is all data available completely in RAM?
--   Do we need a stable sort?
--   Do we need a full sort? Maybe partial sort or n-th element will suffice?
--   How to implement comparisons?
--   Are we sorting data that has already been partially sorted?
+-   将�排�的是数字数组�元组�字符串还是结构？
+-   所有数�是�完全�用于 RAM？
+-   我们需�稳定排��？
+-   我们需�完全排��？也许部分排�或第 n 个元素就足够了？
+-   如何实现比较？
+-   我们正在对已�部分排�的数�进行排��？
 
-Algorithms that they rely on characteristics of data they are working with can often do better than their generic counterparts. If it is not really known in advance, the system can try various implementations and choose the one that works best in runtime. For example, see an [article on how LZ4 decompression is implemented in ClickHouse](https://habr.com/en/company/yandex/blog/457612/).
+他们所�赖的算法根�其所处�的数�特性，往往�以比通用算法�得更好。如果事先真的�知�，系统�以�试��实现，并在�行时选择最佳的一�。例如，看一篇关于 [ClickHouse 中 LZ4 解压缩是如何实现的文章](https://habr.com/en/company/yandex/blog/457612/)。
 
-Last but not least, the ClickHouse team always monitors the Internet on people claiming that they came up with the best implementation, algorithm, or data structure to do something and tries it out. Those claims mostly appear to be false, but from time to time you’ll indeed find a gem.
+最�但�样��的是，ClickHouse 团队始终关注互�网上人们声称他们�出了最佳的实现�算法或数�结构���事，并�试它。这些声称大多是虚�的，但有时你确实会找到一颗�石。
 
-:::info Tips for building your own high-performance software
--   Keep in mind low-level details when designing your system.
--   Design based on hardware capabilities.
--   Choose data structures and abstractions based on the needs of the task.
--   Provide specializations for special cases.
--   Try new, “best� algorithms, that you read about yesterday.
--   Choose an algorithm in runtime based on statistics.
--   Benchmark on real datasets.
--   Test for performance regressions in CI.
--   Measure and observe everything.
+:::info 构建高性能软件的�示
+-   设计系统时�考虑到底层细节。
+-   基于硬件能力进行设计。
+-   根�任务的需求选择数�结构和抽象。
+-   为特殊情况�供专门化。
+-   �试您昨天阅读的关于新的“最佳�算法。
+-   根�统计数�在�行时选择算法。
+-   在真实数�集上进行基准测试。
+-   在 CI 中测试性能回归。
+-   测�并观察一切。
 :::
diff --git a/docs/zh/faq/integration/json-import.md b/docs/zh/faq/integration/json-import.md
index 2d5c687316d..730af8cc6da 100644
--- a/docs/zh/faq/integration/json-import.md
+++ b/docs/zh/faq/integration/json-import.md
@@ -1,35 +1,35 @@
 ---
 slug: /zh/faq/integration/json-import
-title: How to import JSON into ClickHouse?
+title: 如何将 JSON 导入到 ClickHouse？
 toc_hidden: true
 sidebar_position: 11
 ---
 
-# How to Import JSON Into ClickHouse? {#how-to-import-json-into-clickhouse}
+# 如何将 JSON 导入到 ClickHouse？ {#how-to-import-json-into-clickhouse}
 
-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.
+ClickHouse 支�多�[输入和输出的数�格�](../../interfaces/formats.md)。其中包括多� JSON �体，但最常用于数�导入的是 [JSONEachRow](../../interfaces/formats.md#jsoneachrow)。它期望�行一个 JSON 对象，�个对象由一个新行分隔。
 
-## Examples {#examples}
+## 示例 {#examples}
 
-Using [HTTP interface](../../interfaces/http.md):
+使用 [HTTP 接�](../../interfaces/http.md)：
 
 ``` bash
 $ echo '{"foo":"bar"}' | curl 'http://localhost:8123/?query=INSERT%20INTO%20test%20FORMAT%20JSONEachRow' --data-binary @-
 ```
 
-Using [CLI interface](../../interfaces/cli.md):
+使用 [CLI接�](../../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/index.md) instead.
+除了手动�入数�外，您�能会考虑使用 [客户端库](../../interfaces/index.md) 之一。
 
-## Useful Settings {#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.md) type.
+-   `input_format_skip_unknown_fields` �许�入 JSON，�使存在表格架构中未出现的�外字段（通过丢弃它们）。
+-   `input_format_import_nested_json` �许将嵌套 JSON 对象�入到 [Nested](../../sql-reference/data-types/nested-data-structures/nested.md) 类型的列中。
 
 :::note
-Settings are specified as `GET` parameters for the HTTP interface or as additional command-line arguments prefixed with `--` for the `CLI` interface.
+对于 HTTP 接�，设置作为 `GET` �数指定；对于 `CLI` 接�，则作为�缀为 -- 的附加命令行�数。
 :::
\ No newline at end of file
diff --git a/docs/zh/faq/integration/oracle-odbc.md b/docs/zh/faq/integration/oracle-odbc.md
index e22db1d8960..ca65f08686c 100644
--- a/docs/zh/faq/integration/oracle-odbc.md
+++ b/docs/zh/faq/integration/oracle-odbc.md
@@ -1,16 +1,16 @@
 ---
 slug: /zh/faq/integration/oracle-odbc
-title: What if I have a problem with encodings when using Oracle via ODBC?
+title: 使用 Oracle ODBC 时�到编�问题怎么办？
 toc_hidden: true
 sidebar_position: 20
 ---
 
-# What If I Have a Problem with Encodings When Using Oracle Via ODBC? {#oracle-odbc-encodings}
+# 使用 Oracle ODBC 时�到编�问题怎么办？ {#oracle-odbc-encodings}
 
-If you use Oracle as a source of ClickHouse external dictionaries via Oracle ODBC driver, you need to set the correct value for the `NLS_LANG` environment variable in `/etc/default/clickhouse`. For more information, see the [Oracle NLS_LANG FAQ](https://www.oracle.com/technetwork/products/globalization/nls-lang-099431.html).
+如果您使用 Oracle 作为 ClickHouse 外部字典的数��，并通过 Oracle ODBC 驱动程�，您需�在 `/etc/default/clickhouse` 中为 `NLS_LANG` 环境��设置正确的值。更多信�，请�阅 [Oracle NLS_LANG FAQ](https://www.oracle.com/technetwork/products/globalization/nls-lang-099431.html)。
 
-**Example**
+**示例**
 
 ``` sql
 NLS_LANG=RUSSIAN_RUSSIA.UTF8
-```
+```
\ 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 24181116bab..293ba8069fa 100644
--- a/docs/zh/faq/operations/delete-old-data.md
+++ b/docs/zh/faq/operations/delete-old-data.md
@@ -1,44 +1,44 @@
 ---
 slug: /zh/faq/operations/delete-old-data
-title: Is it possible to delete old records from a ClickHouse table?
+title: 是��以从ClickHouse表中删除旧记录？
 toc_hidden: true
 sidebar_position: 20
 ---
 
-# Is It Possible to Delete Old Records from a ClickHouse Table? {#is-it-possible-to-delete-old-records-from-a-clickhouse-table}
+# 是��以从ClickHouse表中删除旧记录？ {#is-it-possible-to-delete-old-records-from-a-clickhouse-table}
 
-The short answer is “yes�. ClickHouse has multiple mechanisms that allow freeing up disk space by removing old data. Each mechanism is aimed for different scenarios.
+简短的答案是“�以�。ClickHouse具有多�机制，�许通过删除旧数��释放�盘空间。��机制都针对��的场景。
 
 ## TTL {#ttl}
 
-ClickHouse allows to automatically drop values when some condition happens. This condition is configured as an expression based on any columns, usually just static offset for any timestamp column.
+ClickHouse �许在�些�件�生时自动删除值。这个�件被�置为基于任何列的表达�，通常�是针对任何时间戳列的���移�。
 
-The key advantage of this approach is that it does not need any external system to trigger, once TTL is configured, data removal happens automatically in background.
+这�方法的主�优势是它�需�任何外部系统�触�，一旦�置了 TTL，数�删除就会自动在���生。
 
 :::note
-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.
+TTL 也�以用�将数�移动到� [/dev/null](https://en.wikipedia.org/wiki/Null_device) 的��存储系统，例如从 SSD 到 HDD。
 :::
 
-More details on [configuring TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl).
+有关 [�置 TTL](../../engines/table-engines/mergetree-family/mergetree.md#table_engine-mergetree-ttl) 的更多详细信�。
 
 ## ALTER DELETE {#alter-delete}
 
-ClickHouse does not have real-time point deletes like in [OLTP](https://en.wikipedia.org/wiki/Online_transaction_processing) databases. The closest thing to them are mutations. They are issued as `ALTER ... DELETE` or `ALTER ... UPDATE` queries to distinguish from normal `DELETE` or `UPDATE` as they are asynchronous batch operations, not immediate modifications. The rest of syntax after `ALTER TABLE` prefix is similar.
+ClickHouse没有�[OLTP](https://en.wikipedia.org/wiki/Online_transaction_processing)数�库那样的实时点删除。最接近的东西是 `Mutation`，执行 `ALTER ... DELETE` 或 `ALTER ... UPDATE` 查询，以区别于普通的`DELETE`或`UPDATE`。因为它们是异步批处��作，而�是立�修改。`ALTER TABLE`�缀�的其余语法相似。
 
-`ALTER DELETE` can be issued to flexibly remove old data. If you need to do it regularly, the main downside will be the need to have an external system to submit the query. There are also some performance considerations since mutation rewrite complete parts even there’s only a single row to be deleted.
+`ALTER DELETE`�以�活地用�删除旧数�。如果你需�定期这样�，主�缺点将是需�有一个外部系统��交查询。还有一些性能方�的考虑，因为�使�有一行�被删除，��也会�写完整部分。
 
-This is the most common approach to make your system based on ClickHouse [GDPR](https://gdpr-info.eu)-compliant.
+这是使基于ClickHouse的系统符�[GDPR](https://gdpr-info.eu)的最常�方法。
 
-More details on [mutations](../../sql-reference/statements/alter.md/#alter-mutations).
+有关[mutations](../../sql-reference/statements/alter.md/#alter-mutations)的更多详细信�。
 
 ## DROP PARTITION {#drop-partition}
 
-`ALTER TABLE ... DROP PARTITION` provides a cost-efficient way to drop a whole partition. It’s not that flexible and needs proper partitioning scheme configured on table creation, but still covers most common cases. Like mutations need to be executed from an external system for regular use.
+`ALTER TABLE ... DROP PARTITION`�供了一��本效率高的方��删除整个分区。它�是那么�活，需�在创建表时�置适当的分区方案，但�然涵盖了大多数常�情况。� mutations 一样，需�从外部系统执行以进行常规使用。
 
-More details on [manipulating partitions](../../sql-reference/statements/alter/partition.mdx/#alter_drop-partition).
+有关[�作分区](../../sql-reference/statements/alter/partition.mdx/#alter_drop-partition)的更多详细信�。
 
 ## TRUNCATE {#truncate}
 
-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.md).
\ No newline at end of file
+有关[truncate](../../sql-reference/statements/truncate.md)的更多详细信�。
diff --git a/docs/zh/getting-started/example-datasets/opensky.mdx b/docs/zh/getting-started/example-datasets/opensky.mdx
index 92cd104e06e..b79c02ab780 100644
--- a/docs/zh/getting-started/example-datasets/opensky.mdx
+++ b/docs/zh/getting-started/example-datasets/opensky.mdx
@@ -1,4 +1,4 @@
---- 
+---
 slug: /zh/getting-started/example-datasets/opensky
 sidebar_label: 空中交通数�
 description: 该数�集中的数�是从完整的 OpenSky 数�集中�生而�的，对其中的数�进行了必�的清�，用以展示在 COVID-19 期间空中交通的�展。
@@ -53,12 +53,12 @@ CREATE TABLE opensky
 ls -1 flightlist_*.csv.gz | xargs -P100 -I{} bash -c 'gzip -c -d "{}" | clickhouse-client --date_time_input_format best_effort --query "INSERT INTO opensky FORMAT CSVWithNames"'
 ```
 
-- 这里我们将文件列表（`ls -1 flightlist_*.csv.gz`）传递给`xargs`以进行并行处�。 `xargs -P100` 指定最多使用 100 个并行工作程�，但由于我们�有 30 个文件，工作程�的数�将�有 30 个。 
-- 对于�个文件，`xargs` 将通过 `bash -c` 为�个文件�行一个脚本文件。该脚本通过使用 `{}` 表示文件���符，然� `xargs` 由命令进行填充（使用 `-I{}`）。 
-- 该脚本会将文件 (`gzip -c -d "{}"`) 解压缩到标准输出（`-c` �数），并将输出�定�到 `clickhouse-client`。 
-- 我们还�求使用扩展解�器解� [DateTime](../../sql-reference/data-types/datetime.md) 字段 ([--date_time_input_format best_effort](../../operations/settings/ settings.md#settings-date_time_input_format)) 以识别具有时区�移的 ISO-8601 格�。
+- 这里我们将文件列表（`ls -1 flightlist_*.csv.gz`）传递给`xargs`以进行并行处�。 `xargs -P100` 指定最多使用 100 个并行工作程�，但由于我们�有 30 个文件，工作程�的数�将�有 30 个。
+- 对于�个文件，`xargs` 将通过 `bash -c` 为�个文件�行一个脚本文件。该脚本通过使用 `{}` 表示文件���符，然� `xargs` 由命令进行填充（使用 `-I{}`）。
+- 该脚本会将文件 (`gzip -c -d "{}"`) 解压缩到标准输出（`-c` �数），并将输出�定�到 `clickhouse-client`。
+- 我们还�求使用扩展解�器解� [DateTime](/docs/zh/sql-reference/data-types/datetime.md) 字段 ([--date_time_input_format best_effort](/docs/zh/operations/settings/settings.md#settings-date_time_input_format)) 以识别具有时区�移的 ISO-8601 格�。
 
-最�，`clickhouse-client` 会以 [CSVWithNames](../../interfaces/formats.md#csvwithnames) 格�读�输入数�然�执行�入。 
+最�，`clickhouse-client` 会以 [CSVWithNames](/docs/zh/interfaces/formats.md#csvwithnames) 格�读�输入数�然�执行�入。
 
 并行导入需� 24 秒。
 
diff --git a/docs/zh/getting-started/tutorial.md b/docs/zh/getting-started/tutorial.md
index 989cf5f57d8..d0c9bda83ef 100644
--- a/docs/zh/getting-started/tutorial.md
+++ b/docs/zh/getting-started/tutorial.md
@@ -582,8 +582,6 @@ ENGINE = Distributed(perftest_3shards_1replicas, tutorial, hits_local, rand());
 INSERT INTO tutorial.hits_all SELECT * FROM tutorial.hits_v1;
 ```
 
-!!! warning "注�:"
-    这�方法�适�大型表的分片。 有一个�独的工具 [clickhouse-copier](../operations/utilities/clickhouse-copier.md) 这�以�新分片任�大表。
 
 正如您所期望的那样，如果计算�大的查询使用3��务器而�是一个，则�行速度快N�。
 
diff --git a/docs/zh/interfaces/http.md b/docs/zh/interfaces/http.md
index 84ca5ed0c47..f55cf41936f 100644
--- a/docs/zh/interfaces/http.md
+++ b/docs/zh/interfaces/http.md
@@ -427,29 +427,32 @@ $ curl -v 'http://localhost:8123/predefined_query'
 ``` xml
 <http_handlers>
     <rule>
-        <url><![CDATA[/query_param_with_url/\w+/(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></url>
-        <method>GET</method>
+        <url><![CDATA[regex:/query_param_with_url/(?P<name_1>[^/]+)]]></url>
+        <methods>GET</methods>
         <headers>
             <XXX>TEST_HEADER_VALUE</XXX>
-            <PARAMS_XXX><![CDATA[(?P<name_1>[^/]+)(/(?P<name_2>[^/]+))?]]></PARAMS_XXX>
+            <PARAMS_XXX><![CDATA[regex:(?P<name_2>[^/]+)]]></PARAMS_XXX>
         </headers>
         <handler>
             <type>predefined_query_handler</type>
-            <query>SELECT value FROM system.settings WHERE name = {name_1:String}</query>
-            <query>SELECT name, value FROM system.settings WHERE name = {name_2:String}</query>
+            <query>
+                SELECT name, value FROM system.settings
+                WHERE name IN ({name_1:String}, {name_2:String})
+            </query>
         </handler>
     </rule>
+    <defaults/>
 </http_handlers>
 ```
 
 ``` bash
-$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_threads' 'http://localhost:8123/query_param_with_url/1/max_threads/max_final_threads?max_threads=1&max_final_threads=2'
-1
-max_final_threads   2
+$ curl -H 'XXX:TEST_HEADER_VALUE' -H 'PARAMS_XXX:max_final_threads' 'http://localhost:8123/query_param_with_url/max_threads?max_threads=1&max_final_threads=2'
+max_final_threads	2
+max_threads	1
 ```
 
 :::warning
-在一个`predefined_query_handler`中，�支�insert类型的一个`查询`。
+在一个`predefined_query_handler`中，�支�的一个`查询`。
 :::
 
 ### 动�查询 {#dynamic_query_handler}
diff --git a/docs/zh/interfaces/third-party/gui.md b/docs/zh/interfaces/third-party/gui.md
index 9dd32efc970..6cf1b99b640 100644
--- a/docs/zh/interfaces/third-party/gui.md
+++ b/docs/zh/interfaces/third-party/gui.md
@@ -129,3 +129,18 @@ ClickHouse Web 界� [Tabix](https://github.com/tabixio/tabix).
 -   数�编辑器。
 -   �构。
 -   �索和导航。
+
+### CKMAN {#ckman}
+
+[CKMAN](https://www.github.com/housepower/ckman) 是一个用于管�和监控ClickHouse集群的�视化工具�
+
+特�：
+
+- �常快速便�的通过�览器界�自动化部署集群
+- 支�对集群进行扩缩容�作
+- 对集群的数�进行负载�衡
+- 对集群进行在线�级
+- 通过界�修改集群�置
+- �供集群节点监控，zookeeper监控
+- 监控表�分区状�，慢SQL监控
+- �供简�易�作的SQL执行页�
diff --git a/docs/zh/operations/backup.md b/docs/zh/operations/backup.md
index 6d491f9c2f7..48e852b4228 100644
--- a/docs/zh/operations/backup.md
+++ b/docs/zh/operations/backup.md
@@ -24,12 +24,6 @@ sidebar_label: "\u6570\u636E\u5907\u4EFD"
 
 �些本地文件系统�供快照功能（例如, [ZFS](https://en.wikipedia.org/wiki/ZFS)），但它们�能�是�供实时查询的最佳选择。 一个�能的解决方案是使用这�文件系统创建�外的副本，并将它们与用于`SELECT` 查询的 [分布�](../engines/table-engines/special/distributed.md) 表分离。 任何修改数�的查询都无法访问此类副本上的快照。 作为回报，这些副本�能具有特殊的硬件�置，�个�务器附加更多的�盘，这将是�济高效的。
 
-## clickhouse-copier {#clickhouse-copier}
-
-[clickhouse-copier](utilities/clickhouse-copier.md) 是一个多功能工具，最�创建它是为了用于�新切分pb大�的表。 因为它能够在ClickHouse表和集群之间��地�制数�，所以它也�用于备份和还原数�。
-
-对于较�的数��，一个简�的 `INSERT INTO ... SELECT ...` 到远程表也�以工作。
-
 ## part�作 {#manipulations-with-parts}
 
 ClickHouse�许使用 `ALTER TABLE ... FREEZE PARTITION ...` 查询以创建表分区的本地副本。 这是利用硬链接(hardlink)到 `/var/lib/clickhouse/shadow/` 文件夹中实现的，所以它通常�会因为旧数�而�用�外的�盘空间。 创建的文件副本�由ClickHouse�务器处�，所以你�以把它们留在那里：你将有一个简�的备份，�需�任何�外的外部系统，但它�然容易出现硬件问题。 出于这个原因，最好将它们远程�制到�一个�置，然�删除本地副本。 分布�文件系统和对象存储�然是一个�错的选择，但是具有足够大容�的正常附加文件�务器也�以工作（在这�情况下，传输将通过网络文件系统或者也许是 [rsync](https://en.wikipedia.org/wiki/Rsync) �进行).
diff --git a/docs/zh/operations/clickhouse-keeper.md b/docs/zh/operations/clickhouse-keeper.md
index 6d8a570aa12..e4412be2e30 100644
--- a/docs/zh/operations/clickhouse-keeper.md
+++ b/docs/zh/operations/clickhouse-keeper.md
@@ -45,6 +45,7 @@ ClickHouse Keeper 完全�以作为ZooKeeper的独立替代�或者作为Click
 -    `heart_beat_interval_ms` — ClickHouse Keeper的leader��心跳频率(毫秒)(默认为500)。
 -    `election_timeout_lower_bound_ms` — 如果follower在此间隔内没有收到leader的心跳，那么它�以�动leader选举(默认为1000).
 -    `election_timeout_upper_bound_ms` — 如果follower在此间隔内没有收到leader的心跳，那么它必须�动leader选举(默认为2000)。
+-    `leadership_expiry_ms` — 如果leader在此间隔内没有收到足够的follower回�，那么他会主动放弃领导�。当被设置为0时会自动设置为`heart_beat_interval_ms`的20�，当被设置�于0时leader�会主动放弃领导�（默认为0）。
 -    `rotate_log_storage_interval` — �个文件中存储的日志记录数�(默认100000�)。
 -    `reserved_log_items` — 在压缩之�需�存储多少�调日志记录(默认100000)。
 -    `snapshot_distance` — ClickHouse Keeper创建新快照的频率(以日志记录的数�为��)(默认100000)。
@@ -214,6 +215,7 @@ dead_session_check_period_ms=500
 heart_beat_interval_ms=500
 election_timeout_lower_bound_ms=1000
 election_timeout_upper_bound_ms=2000
+leadership_expiry_ms=0
 reserved_log_items=1000000000000000
 snapshot_distance=10000
 auto_forwarding=true
diff --git a/docs/zh/operations/settings/settings.md b/docs/zh/operations/settings/settings.md
index 1874970ac95..c3b4194ed44 100644
--- a/docs/zh/operations/settings/settings.md
+++ b/docs/zh/operations/settings/settings.md
@@ -649,11 +649,22 @@ log_query_threads=1
 
 ## max_query_size {#settings-max_query_size}
 
-查询的最大部分，�以被带到RAM用于使用SQL解�器进行解�。
-�入查询还包�由�独的�解�器（消耗O(1)RAM）处�的�入数�，这些数��包�在此�制中。
+SQL 解�器解�的查询字符串的最大字节数。 INSERT 查询的 VALUES ��中的数�由�独的�解�器（消耗 O(1) RAM）处�，并且��此�制的影�。
 
 默认值：256KiB。
 
+
+## max_parser_depth {#max_parser_depth}
+
+�制递归下�解�器中的最大递归深度。�许控制堆栈大�。
+
+�能的值：
+
+- 正整数。
+- 0 — 递归深度���制。
+
+默认值：1000。
+
 ## interactive_delay {#interactive-delay}
 
 以微秒为��的间隔，用于检查请求执行是�已被�消并��进度。
@@ -1064,6 +1075,28 @@ ClickHouse生�异常
 
 默认值：0。
 
+## optimize_functions_to_subcolumns {#optimize_functions_to_subcolumns}
+
+�用或�用通过将�些函数转�为读��列的优化。这�少了�读�的数��。
+
+这些函数�以转化为：
+
+- [length](../../sql-reference/functions/array-functions.md/#array_functions-length) 读� [size0](../../sql-reference/data-types/array.md/#array-size）�列。
+- [empty](../../sql-reference/functions/array-functions.md/#empty函数) 读� [size0](../../sql-reference/data-types/array.md/#array-size）�列。
+- [notEmpty](../../sql-reference/functions/array-functions.md/#notempty函数) 读� [size0](../../sql-reference/data-types/array.md/#array-size）�列。
+- [isNull](../../sql-reference/operators/index.md#operator-is-null) 读� [null](../../sql-reference/data-types/nullable. md/#finding-null) �列。
+- [isNotNull](../../sql-reference/operators/index.md#is-not-null) 读� [null](../../sql-reference/data-types/nullable. md/#finding-null) �列。
+- [count](../../sql-reference/aggregate-functions/reference/count.md) 读� [null](../../sql-reference/data-types/nullable.md/#finding-null) �列。
+- [mapKeys](../../sql-reference/functions/tuple-map-functions.mdx/#mapkeys) 读� [keys](../../sql-reference/data-types/map.md/#map-subcolumns) �列。
+- [mapValues](../../sql-reference/functions/tuple-map-functions.mdx/#mapvalues) 读� [values](../../sql-reference/data-types/map.md/#map-subcolumns) �列。
+
+�能的值：
+
+- 0 — �用优化。
+- 1 — 优化已�用。
+
+默认值：`0`。
+
 ## distributed_replica_error_half_life {#settings-distributed_replica_error_half_life}
 
 -   类型：秒
diff --git a/docs/zh/operations/system-tables/dictionaries.md b/docs/zh/operations/system-tables/dictionaries.md
index 105a591cf69..0cf91e45e86 100644
--- a/docs/zh/operations/system-tables/dictionaries.md
+++ b/docs/zh/operations/system-tables/dictionaries.md
@@ -20,7 +20,7 @@ machine_translated_rev: 5decc73b5dc60054f19087d3690c4eb99446a6c3
     -   `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) 查询，超时，字典�置已更改）。
     -   `FAILED_AND_RELOADING` — Could not load the dictionary as a result of an error and is loading now.
 -   `origin` ([字符串](../../sql-reference/data-types/string.md)) — Path to the configuration file that describes the dictionary.
--   `type` ([字符串](../../sql-reference/data-types/string.md)) — Type of a dictionary allocation. [在内存中存储字典](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md).
+-   `type` ([字符串](../../sql-reference/data-types/string.md)) — Type of dictionary allocation. [在内存中存储字典](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-layout.md).
 -   `key` — [密钥类型](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-key):数字键 ([UInt64](../../sql-reference/data-types/int-uint.md#uint-ranges)) or Сomposite key ([字符串](../../sql-reference/data-types/string.md)) — form “(type 1, type 2, …, type n)�.
 -   `attribute.names` ([阵列](../../sql-reference/data-types/array.md)([字符串](../../sql-reference/data-types/string.md))) — Array of [属性�称](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) 由字典�供。
 -   `attribute.types` ([阵列](../../sql-reference/data-types/array.md)([字符串](../../sql-reference/data-types/string.md))) — Corresponding array of [属性类型](../../sql-reference/dictionaries/external-dictionaries/external-dicts-dict-structure.md#ext_dict_structure-attributes) 这是由字典�供。
diff --git a/docs/zh/operations/utilities/clickhouse-copier.md b/docs/zh/operations/utilities/clickhouse-copier.md
deleted file mode 100644
index b01edd9257c..00000000000
--- a/docs/zh/operations/utilities/clickhouse-copier.md
+++ /dev/null
@@ -1,172 +0,0 @@
----
-slug: /zh/operations/utilities/clickhouse-copier
----
-# clickhouse-copier {#clickhouse-copier}
-
-将数�从一个群集中的表�制到�一个（或相�）群集中的表。
-
-您�以�行多个 `clickhouse-copier` ���务器上的实例执行相�的作业。 ZooKeeper用于�步进程。
-
-开始�, `clickhouse-copier`:
-
--   连接到ZooKeeper并且接收:
-
-    -   �制作业。
-    -   �制作业的状�。
-
--   它执行的工作。
-
-        �个正在�行的进程都会选择�集群的“最接近�分片，然�将数��制到目标集群，并在必�时�新分片数�。
-
-`clickhouse-copier` 跟踪ZooKeeper中的更改，并实时应用它们。
-
-为了�少网络��，我们建议�行 `clickhouse-copier` 在�数�所在的�一�务器上。
-
-## �行Clickhouse-copier {#running-clickhouse-copier}
-
-该实用程�应手动�行:
-
-``` bash
-clickhouse-copier --daemon --config zookeeper.xml --task-path /task/path --base-dir /path/to/dir
-```
-
-�数:
-
--   `daemon` — 在守护进程模�下�动`clickhouse-copier`。
--   `config` — `zookeeper.xml`文件的路径，其中包�用于连接ZooKeeper的�数。
--   `task-path` — ZooKeeper节点的路径。 该节点用于�步`clickhouse-copier`进程和存储任务。 任务存储在`$task-path/description`中。
--   `task-file` — �选的�必须�数, 指定一个包�任务�置的�数文件, 用于�始上传到ZooKeeper。
--   `task-upload-force` — �使节点已�存在，也强制上载`task-file`。
--   `base-dir` — 日志和辅助文件的路径。 �动时，`clickhouse-copier`在`$base-dir`中创建`clickhouse-copier_YYYYMMHHSS_<PID>`�目录。 如果�略此�数，则会在�动`clickhouse-copier`的目录中创建目录。
-
-
-
-## Zookeeper.xml格� {#format-of-zookeeper-xml}
-
-``` xml
-<clickhouse>
-    <logger>
-        <level>trace</level>
-        <size>100M</size>
-        <count>3</count>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>127.0.0.1</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-</clickhouse>
-```
-
-## �制任务的�置 {#configuration-of-copying-tasks}
-
-``` xml
-<clickhouse>
-    <!-- Configuration of clusters as in an ordinary server config -->
-    <remote_servers>
-        <source_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>127.0.0.1</host>
-                        <port>9000</port>
-                    </replica>
-            </shard>
-            ...
-        </source_cluster>
-
-        <destination_cluster>
-        ...
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <distributed_foreground_insert>1</distributed_foreground_insert>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>test</database_pull>
-            <table_pull>hits</table_pull>
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>test</database_push>
-            <table_push>hits2</table_push>
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-            -->
-            <engine>
-            ENGINE=ReplicatedMergeTree('/clickhouse/tables/{cluster}/{shard}/hits2', '{replica}')
-            PARTITION BY toMonday(date)
-            ORDER BY (CounterID, EventDate)
-            </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-            <sharding_key>jumpConsistentHash(intHash64(UserID), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-            <where_condition>CounterID != 0</where_condition>
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-            -->
-            <enabled_partitions>
-                <partition>'2018-02-26'</partition>
-                <partition>'2018-03-05'</partition>
-                ...
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-        <table_visits>
-        ...
-        </table_visits>
-        ...
-    </tables>
-</clickhouse>
-```
-
-`clickhouse-copier` 跟踪更改 `/task/path/description` 并在飞行中应用它们。 例如，如果你改�的值 `max_workers`，�行任务的进程数也会�生�化。
diff --git a/docs/zh/operations/utilities/index.md b/docs/zh/operations/utilities/index.md
index af158baf275..cebe312450c 100644
--- a/docs/zh/operations/utilities/index.md
+++ b/docs/zh/operations/utilities/index.md
@@ -4,5 +4,4 @@ slug: /zh/operations/utilities/
 # 实用工具 {#clickhouse-utility}
 
 -   [本地查询](clickhouse-local.md) —  在��止ClickHouse�务的情况下，对数�执行查询�作(类似于 `awk` 命令)。
--   [跨集群�制](clickhouse-copier.md) —  在��集群间�制数�。
 -   [性能测试](clickhouse-benchmark.md) — 连接到Clickhouse�务器，执行性能测试。
diff --git a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
index 1c7de515c58..cb1dcc35f5c 100644
--- a/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
+++ b/docs/zh/sql-reference/aggregate-functions/parametric-functions.md
@@ -472,7 +472,7 @@ FROM
 
 -   `r1`-2020-01-01期间访问该网站的独立访问者数�（ `cond1` �件）。
 -   `r2`-在2020-01-01和2020-01-02之间的特定时间段内访问该网站的唯一访问者的数� (`cond1` 和 `cond2` �件）。
--   `r3`-在2020-01-01和2020-01-03之间的特定时间段内访问该网站的唯一访问者的数� (`cond1` 和 `cond3` �件）。
+-   `r3`-在2020-01-01和2020-01-03 网站的独立访客数� (`cond1` 和 `cond3` �件）。
 
 ## uniqUpTo(N)(x) {#uniquptonx}
 
diff --git a/docs/zh/sql-reference/data-types/array.md b/docs/zh/sql-reference/data-types/array.md
index 46c40b889ad..da4cea65101 100644
--- a/docs/zh/sql-reference/data-types/array.md
+++ b/docs/zh/sql-reference/data-types/array.md
@@ -1,7 +1,7 @@
 ---
 slug: /zh/sql-reference/data-types/array
 ---
-# 阵列(T) {#data-type-array}
+# 数组(T) {#data-type-array}
 
 由 `T` 类型元素组�的数组。
 
@@ -66,3 +66,27 @@ SELECT array(1, 'a')
 Received exception from server (version 1.1.54388):
 Code: 386. DB::Exception: Received from localhost:9000, 127.0.0.1. DB::Exception: There is no supertype for types UInt8, String because some of them are String/FixedString and some of them are not.
 ```
+
+## 数组大� {#array-size}
+
+�以使用 `size0` �列找到数组的大�，而无需读�整个列。对于多维数组，您�以使用 `sizeN-1`，其中 `N` 是所需的维度。
+
+**例�**
+
+SQL查询：
+
+```sql
+CREATE TABLE t_arr (`arr` Array(Array(Array(UInt32)))) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO t_arr VALUES ([[[12, 13, 0, 1],[12]]]);
+
+SELECT arr.size0, arr.size1, arr.size2 FROM t_arr;
+```
+
+结果：
+
+``` text
+┌─arr.size0─┬─arr.size1─┬─arr.size2─�
+│         1 │ [2]       │ [[4,1]]   │
+└───────────┴───────────┴───────────┘
+```
diff --git a/docs/zh/sql-reference/data-types/multiword-types.mdx b/docs/zh/sql-reference/data-types/multiword-types.mdx
deleted file mode 100644
index 85431d47efd..00000000000
--- a/docs/zh/sql-reference/data-types/multiword-types.mdx
+++ /dev/null
@@ -1,10 +0,0 @@
----
-slug: /zh/sql-reference/data-types/multiword-types
-sidebar_position: 61
-sidebar_label: Multiword Type Names
-title: "Multiword Types"
----
-
-import Content from '@site/docs/en/sql-reference/data-types/multiword-types.md';
-
-<Content />
diff --git a/docs/zh/sql-reference/data-types/nullable.md b/docs/zh/sql-reference/data-types/nullable.md
index 94311f8298a..b1cc9dd7bae 100644
--- a/docs/zh/sql-reference/data-types/nullable.md
+++ b/docs/zh/sql-reference/data-types/nullable.md
@@ -20,6 +20,33 @@ slug: /zh/sql-reference/data-types/nullable
 
 掩�文件中的�目�许ClickHouse区分�个表行的对应数�类型的«NULL»和默认值由于有�外的文件，«Nullable»列比普通列消耗更多的存储空间
 
+## null�列 {#finding-null}
+
+通过使用 `null` �列�以在列中查找 `NULL` 值，而无需读�整个列。如果对应的值为 `NULL`，则返回 `1`，�则返回 `0`。
+
+**示例**
+
+SQL查询:
+
+``` sql
+CREATE TABLE nullable (`n` Nullable(UInt32)) ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO nullable VALUES (1) (NULL) (2) (NULL);
+
+SELECT n.null FROM nullable;
+```
+
+结果:
+
+``` text
+┌─n.null─�
+│      0 │
+│      1 │
+│      0 │
+│      1 │
+└────────┘
+```
+
 ## 用法示例 {#yong-fa-shi-li}
 
 ``` sql
diff --git a/docs/zh/sql-reference/functions/date-time-functions.md b/docs/zh/sql-reference/functions/date-time-functions.md
index e4b70322477..d6493ffe605 100644
--- a/docs/zh/sql-reference/functions/date-time-functions.md
+++ b/docs/zh/sql-reference/functions/date-time-functions.md
@@ -643,6 +643,7 @@ date_diff('unit', startdate, enddate, [timezone])
 -   `unit` — `value`对应的时间��。类型为[String](../../sql-reference/data-types/string.md)。
     �能的值：
 
+    - `nanosecond`
     - `microsecond`
     - `millisecond`
     - `second`
diff --git a/docs/zh/sql-reference/functions/string-search-functions.md b/docs/zh/sql-reference/functions/string-search-functions.md
index e4167127424..972fd84e2a1 100644
--- a/docs/zh/sql-reference/functions/string-search-functions.md
+++ b/docs/zh/sql-reference/functions/string-search-functions.md
@@ -1,128 +1,702 @@
 ---
 slug: /zh/sql-reference/functions/string-search-functions
 ---
-# 字符串�索函数 {#zi-fu-chuan-sou-suo-han-shu}
 
-下列所有函数在默认的情况下区分大�写。对于�区分大�写的�索，存在�独的�体。
+# 字符串�索函数
 
-## �置（大海�针），定�（大海�针) {#positionhaystack-needle-locatehaystack-needle}
+本节中的所有函数默认情况下都区分大�写进行�索。�区分大�写的�索通常由�独的函数�体�供。  
+请注�，�区分大�写的�索，�循英语的�写-大写规则。
+例如。英语中大写的`i`是`I`，而在土耳其语中则是`İ`, 对于英语以外的语言，结果�能会�符�预期。
 
-在字符串`haystack`中�索�串`needle`。
-返回�串的�置（以字节为��），从1开始，如果未找到�串，则返回0。
+本节中的函数还�设�索字符串和被�索字符串是�字节编�文本(例如ASCII)。如果��此�设，�会抛出异常且结果为undefined。   
+UTF-8 编�字符串的�索通常由�独的函数�体�供。�样，如果使用 UTF-8 函数�体但输入字符串�是 UTF-8 编�文本，�会抛出异常且结果为 undefined。
+需�注�，函数�会执行自动 Unicode 规范化，您�以使用[normalizeUTF8*()](https://clickhouse.com/docs/zh/sql-reference/functions/string-functions/) 函数�执行此�作。
+在[字符串函数](string-functions.md) 和 [字符串替�函数](string-replace-functions.md) 会分别说明.
 
-对于�区分大�写的�索，请使用函数`positionCaseInsensitive`。
+## position
 
-## positionUTF8(大海�针) {#positionutf8haystack-needle}
+返回字符串`haystack`中�字符串`needle`的�置（以字节为��，从 1 开始）。
 
-与`position`相�，但�置以Unicode字符返回。此函数工作在UTF-8编�的文本字符集中。如�此编�的字符集，则返回一些�预期结果（他�会抛出异常）。
+**语法**
 
-对于�区分大�写的�索，请使用函数`positionCaseInsensitiveUTF8`。
+``` sql
+position(haystack, needle[, start_pos])
+```
 
-## 多�索分�（干�堆，\[针<sub>1</sub>，针<sub>2</sub>, …, needle<sub>n</sub>\]) {#multisearchallpositionshaystack-needle1-needle2-needlen}
+别�：
+- `position(needle IN haystack)`
 
-与`position`相�，但函数返回一个数组，其中包�所有匹�needle<sub>我</sub>的�置。
+**�数**
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`multiSearchAllPositionsCaseInsensitive，multiSearchAllPositionsUTF8，multiSearchAllPositionsCaseInsensitiveUTF8`。
+- `haystack` — 被检索查询字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — 进行查询的�字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `start_pos` – 在字符串`haystack` 中开始检索的�置(从1开始)，类型为[UInt](../../sql-reference/data-types/int-uint.md)，�选。
 
-## multiSearchFirstPosition(大海�针,\[针<sub>1</sub>，针<sub>2</sub>, …, needle<sub>n</sub>\]) {#multisearchfirstpositionhaystack-needle1-needle2-needlen}
+**返回值**
 
-与`position`相�，但返回在`haystack`中与needles字符串匹�的最左�移。
+- 若�字符串存在，返回�置(以字节为��，从 1 开始）。
+- 如果�存在�字符串，返回 0。
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`multiSearchFirstPositionCaseInsensitive，multiSearchFirstPositionUTF8，multiSearchFirstPositionCaseInsensitiveUTF8`。
+如果�字符串 `needle` 为空，则：
+- 如果未指定 `start_pos`，返回 `1`
+- 如果 `start_pos = 0`，则返回 `1`
+- 如果 `start_pos >= 1` 且 `start_pos <= length(haystack) + 1`，则返回 `start_pos` 
+- �则返回 `0` 
 
-## multiSearchFirstIndex(大海�针,\[针<sub>1</sub>，针<sub>2</sub>, …, needle<sub>n</sub>\]) {#multisearchfirstindexhaystack-needle1-needle2-needlen}
+以上规则�样在这些函数中生效: [locate](#locate), [positionCaseInsensitive](#positionCaseInsensitive), [positionUTF8](#positionUTF8), [positionCaseInsensitiveUTF8](#positionCaseInsensitiveUTF8)
 
-返回在字符串`haystack`中最先查找到的needle<sub>我</sub>的索引`i`（从1开始），没有找到任何匹�项则返回0。
+数�类型: `Integer`.
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`multiSearchFirstIndexCaseInsensitive，multiSearchFirstIndexUTF8，multiSearchFirstIndexCaseInsensitiveUTF8`。
+**示例**
 
-## 多�索（大海�针，\[针<sub>1</sub>，针<sub>2</sub>, …, needle<sub>n</sub>\]) {#multisearchanyhaystack-needle1-needle2-needlen}
+``` sql
+SELECT position('Hello, world!', '!');
+```
 
-如果`haystack`中至少存在一个needle<sub>我</sub>匹�则返回1，�则返回0。
+结果：
+
+``` text
+┌─position('Hello, world!', '!')─�
+│                             13 │
+└────────────────────────────────┘
+```
+
+示例，使用�数 `start_pos` :
+
+``` sql
+SELECT
+    position('Hello, world!', 'o', 1),
+    position('Hello, world!', 'o', 7)
+```
+
+结果：
+
+``` text
+┌─position('Hello, world!', 'o', 1)─┬─position('Hello, world!', 'o', 7)─�
+│                                 5 │                                 9 │
+└───────────────────────────────────┴───────────────────────────────────┘
+```
+
+示例，`needle IN haystack`:
+
+```sql
+SELECT 6 = position('/' IN s) FROM (SELECT 'Hello/World' AS s);
+```
+
+结果：
+
+```text
+┌─equals(6, position(s, '/'))─�
+│                           1 │
+└─────────────────────────────┘
+```
+
+示例，�字符串 `needle` 为空:
+
+``` sql
+SELECT
+    position('abc', ''),
+    position('abc', '', 0),
+    position('abc', '', 1),
+    position('abc', '', 2),
+    position('abc', '', 3),
+    position('abc', '', 4),
+    position('abc', '', 5)
+```
+结果：
+``` text
+┌─position('abc', '')─┬─position('abc', '', 0)─┬─position('abc', '', 1)─┬─position('abc', '', 2)─┬─position('abc', '', 3)─┬─position('abc', '', 4)─┬─position('abc', '', 5)─�
+│                   1 │                      1 │                      1 │                      2 │                      3 │                      4 │                      0 │
+└─────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┴────────────────────────┘
+```
+
+## locate
+
+类似于 [position](#position) 但交�了 `haystack` 和 `locate` �数。
+
+此函数的行为�决于 ClickHouse 版本：
+- 在 v24.3 以下的版本中，`locate` 是函数`position`的别�，�数为 `(haystack, needle[, start_pos])`。
+- 在 v24.3 �以上的版本中,, `locate` 是独立的函数 (以更好地兼容 MySQL) ,�数为 `(needle, haystack[, start_pos])`。 之�的行为
+  �以在设置中�� [function_locate_has_mysql_compatible_argument_order = false](../../operations/settings/settings.md#function-locate-has-mysql-compatible-argument-order);
+
+**语法**
+
+``` sql
+locate(needle, haystack[, start_pos])
+```
+
+## positionCaseInsensitive
+
+类似于 [position](#position) 但是�区分大�写。
+
+## positionUTF8
+
+类似于 [position](#position) 但是�定 `haystack` 和 `needle` 是 UTF-8 编�的字符串。
+
+**示例**
+
+函数 `positionUTF8` �以正确的将字符 `ö` 计为�个 Unicode 代�点(`ö`由两个点表示):
+
+``` sql
+SELECT positionUTF8('Motörhead', 'r');
+```
+
+结果：
+
+``` text
+┌─position('Motörhead', 'r')─�
+│                          5 │
+└────────────────────────────┘
+```
+
+## positionCaseInsensitiveUTF8
+
+类似于 [positionUTF8](#positionutf8) 但是�区分大�写。
+
+## multiSearchAllPositions
+
+类似于 [position](#position) 但是返回多个在字符串 `haystack` 中 `needle` �字符串的�置的数组（以字节为��，从 1 开始）。
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`multiSearchAnyCaseInsensitive，multiSearchAnyUTF8，multiSearchAnyCaseInsensitiveUTF8`。
 
 :::note
-在所有`multiSearch*`函数中，由于实现规范，needles的数�应�于2<sup>8</sup>。
+所有以 `multiSearch*()` 开头的函数仅支�最多 2<sup>8</sup> 个`needle`.
 :::
 
-## 匹�（大海�针，模�) {#matchhaystack-pattern}
+**语法**
 
-检查字符串是�与`pattern`正则表达�匹�。`pattern`�以是一个任�的`re2`正则表达�。 `re2`正则表达�的[语法](https://github.com/google/re2/wiki/Syntax)比Perl正则表达�的语法存在更多�制。
+``` sql
+multiSearchAllPositions(haystack, [needle1, needle2, ..., needleN])
+```
 
-如果�匹�返回0，�则返回1。
+**�数**
 
-请注�，�斜�符�（`\`）用于在正则表达�中转义。由于字符串中采用相�的符��进行转义。因此，为了在正则表达�中转义符�，必须在字符串文字中写入两个�斜�（\\）。
+- `haystack` — 被检索查询字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — �字符串数组, 类型为[Array](../../sql-reference/data-types/array.md)
 
-正则表达�与字符串一起使用，就�它是一组字节一样。正则表达�中�能包�空字节。
-对于在字符串中�索�字符串的模�，最好使用LIKE或«position»，因为它们更加高效。
+**返回值**
 
-## multiMatchAny（大海�针，\[模�<sub>1</sub>，模�<sub>2</sub>, …, pattern<sub>n</sub>\]) {#multimatchanyhaystack-pattern1-pattern2-patternn}
+- �置数组，数组中的�个元素对应于 `needle` 数组中的一个元素。如果在 `haystack` 中找到�字符串，则返回的数组中的元素为�字符串的�置（以字节为��，从 1 开始）；如果未找到�字符串，则返回的数组中的元素为 0。
 
-与`match`相�，但如果所有正则表达�都�匹�，则返回0；如果任何模�匹�，则返回1。它使用[超扫�](https://github.com/intel/hyperscan)库。对于在字符串中�索�字符串的模�，最好使用«multisearchany»，因为它更高效。
+**示例**
+
+``` sql
+SELECT multiSearchAllPositions('Hello, World!', ['hello', '!', 'world']);
+```
+
+结果：
+
+``` text
+┌─multiSearchAllPositions('Hello, World!', ['hello', '!', 'world'])─�
+│ [0,13,0]                                                          │
+└───────────────────────────────────────────────────────────────────┘
+```
+
+## multiSearchAllPositionsUTF8
+
+类似于 [multiSearchAllPositions](#multiSearchAllPositions) ,但�定 `haystack` 和 `needle`-s 是 UTF-8 编�的字符串。
+
+## multiSearchFirstPosition
+
+类似于 `position` , 在字符串`haystack`中匹�多个`needle`�字符串，从左开始任一匹�的�串，返回其�置。
+
+函数 `multiSearchFirstPositionCaseInsensitive`, `multiSearchFirstPositionUTF8` 和 `multiSearchFirstPositionCaseInsensitiveUTF8` �供此函数的�区分大�写 以�/或 UTF-8 �体。
+
+**语法**
+
+```sql
+multiSearchFirstPosition(haystack, [needle1, needle2, …, needleN])
+```
+
+## multiSearchFirstIndex
+
+在字符串`haystack`中匹�最左侧的 needle<sub>i</sub> �字符串，返回其索引 `i` (从1开始)，如无法匹�则返回0。
+
+函数 `multiSearchFirstIndexCaseInsensitive`, `multiSearchFirstIndexUTF8` 和 `multiSearchFirstIndexCaseInsensitiveUTF8` �供此函数的�区分大�写以�/或 UTF-8 �体。
+
+**语法**
+
+```sql
+multiSearchFirstIndex(haystack, \[needle<sub>1</sub>, needle<sub>2</sub>, …, needle<sub>n</sub>\])
+```
+
+## multiSearchAny {#multisearchany}
+
+至少已有一个�字符串`needle`匹� `haystack` 时返回1，�则返回 0 。
+
+函数 `multiSearchAnyCaseInsensitive`, `multiSearchAnyUTF8` 和 `multiSearchAnyCaseInsensitiveUTF8` �供此函数的�区分大�写以�/或 UTF-8 �体。
+
+
+**语法**
+
+```sql
+multiSearchAny(haystack, [needle1, needle2, …, needleN])
+```
+
+## match {#match}
+
+返回字符串 `haystack` 是�匹�正则表达� `pattern` （[re2正则语法�考](https://github.com/google/re2/wiki/Syntax)
+
+匹�基于 UTF-8，例如`.` 匹� Unicode 代�点 `¥`，它使用两个字节以 UTF-8 表示。T正则表达��得包�空字节。如果 `haystack` 或`pattern`�是有效的 UTF-8，则此行为为undefined。
+与 re2 的默认行为��，`.` 会匹��行符。��用此功能，请在模���添加`(?-s)`。
+
+如果仅希望�索�字符串，�以使用函数 [like](#like)或 [position](#position) �替代，这些函数的性能比此函数更高。
+
+**语法**
+
+```sql
+match(haystack, pattern)
+```
+
+别�： `haystack REGEXP pattern operator`
+
+## multiMatchAny
+
+类似于 `match`，如果至少有一个表达� `pattern<sub>i</sub>` 匹�字符串 `haystack`，则返回1，�则返回0。
 
 :::note
-任何`haystack`字符串的长度必须�于2<sup>32\</sup>字节，�则抛出异常。这��制是因为hyperscan API而产生的。
+`multi[Fuzzy]Match*()` 函数家�使用了(Vectorscan)[https://github.com/VectorCamp/vectorscan]库. 因此，�有当 ClickHouse 编译时支�矢�扫�时，它们�会�用。
+
+�关闭所有使用矢�扫�(hyperscan)的功能，请使用设置 `SET allow_hyperscan = 0;`。
+
+由于Vectorscan的�制，`haystack` 字符串的长度必须�于2<sup>32</sup>字节。
+
+Hyperscan 通常容易�到正则表达�拒��务 (ReDoS) 攻击。有关更多信�，请��
+[https://www.usenix.org/conference/usenixsecurity22/presentation/turonova](https://www.usenix.org/conference/usenixsecurity22/presentation/turonova)  
+[https://doi.org/10.1007/s10664-021-10033-1](https://doi.org/10.1007/s10664-021-10033-1)  
+[https://doi.org/10.1145/3236024.3236027](https://doi.org/10.1145/3236024.3236027)  
+建议用户谨慎检查�供的表达�。
+
 :::
 
-## multiMatchAnyIndex（大海�针，\[模�<sub>1</sub>，模�<sub>2</sub>, …, pattern<sub>n</sub>\]) {#multimatchanyindexhaystack-pattern1-pattern2-patternn}
+如果仅希望�索�字符串，�以使用函数  [multiSearchAny](#multisearchany) �替代，这些函数的性能比此函数更高。
 
-与`multiMatchAny`相�，但返回与haystack匹�的任何内容的索引�置。
+**语法**
 
-## multiFuzzyMatchAny(干�堆,�离,\[模�<sub>1</sub>，模�<sub>2</sub>, …, pattern<sub>n</sub>\]) {#multifuzzymatchanyhaystack-distance-pattern1-pattern2-patternn}
+```sql
+multiMatchAny(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
 
-与`multiMatchAny`相�，但如果在haystack能够查找到任何模�匹�能够在指定的[编辑�离](https://en.wikipedia.org/wiki/Edit_distance)内进行匹�，则返回1。此功能也处于实验模�，�能�常慢。有关更多信�，请�阅[hyperscan文档](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching)。
+## multiMatchAnyIndex
 
-## multiFuzzyMatchAnyIndex(大海�针,�离,\[模�<sub>1</sub>，模�<sub>2</sub>, …, pattern<sub>n</sub>\]) {#multifuzzymatchanyindexhaystack-distance-pattern1-pattern2-patternn}
+类似于 `multiMatchAny` ，返回任何�串匹� `haystack` 的索引。
 
-与`multiFuzzyMatchAny`相�，但返回匹�项的匹�能容的索引�置。
+**语法**
+
+```sql
+multiMatchAnyIndex(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiMatchAllIndices
+
+类似于 `multiMatchAny`，返回一个数组，包�所有匹� `haystack` 的�字符串的索引。
+
+**语法**
+
+```sql
+multiMatchAllIndices(haystack, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiFuzzyMatchAny
+
+类似于 `multiMatchAny` ，如果任一 `pattern` 匹� `haystack`，则返回1 within a constant [edit distance](https://en.wikipedia.org/wiki/Edit_distance). 该功能�赖于实验特� [hyperscan](https://intel.github.io/hyperscan/dev-reference/compilation.html#approximate-matching) 库，并且对于�些边缘场景�能会很慢。性能�决于编辑�离`distance`的值和使用的`partten`，但与�模糊�索相比，它的开销总是更高的。
 
 :::note
-`multiFuzzyMatch*`函数�支�UTF-8正则表达�，由于hyperscan�制，这些表达�被按字节解�。
+由于 hyperscan 的�制，`multiFuzzyMatch*()` 函数��支� UTF-8 正则表达�（hyperscan以一串字节�处�）。
 :::
 
+**语法**
+
+```sql
+multiFuzzyMatchAny(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiFuzzyMatchAnyIndex
+
+类似于 `multiFuzzyMatchAny` 返回在编辑�离内与`haystack`匹�的任何索引
+
+**语法**
+
+```sql
+multiFuzzyMatchAnyIndex(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## multiFuzzyMatchAllIndices
+
+类似于 `multiFuzzyMatchAny` 返回在编辑�离内与`haystack`匹�的所有索引的数组。
+
+**语法**
+
+```sql
+multiFuzzyMatchAllIndices(haystack, distance, \[pattern<sub>1</sub>, pattern<sub>2</sub>, …, pattern<sub>n</sub>\])
+```
+
+## extract
+
+使用正则表达���字符串。如果字符串 `haystack` �匹�正则表达� `pattern` ，则返回空字符串。
+
+对于没有�模�的正则表达�，该函数使用与整个正则表达�匹�的片段。�则，它使用与第一个�模�匹�的片段。
+
+**语法**
+
+```sql
+extract(haystack, pattern)
+```
+
+## extractAll
+
+使用正则表达���字符串的所有片段。如果字符串 `haystack` �匹�正则表达� `pattern` ，则返回空字符串。
+
+返回所有匹�项组�的字符串数组。
+
+�模�的行为与函数`extract`中的行为相�。
+
+**语法**
+
+```sql
+extractAll(haystack, pattern)
+```
+
+## extractAllGroupsHorizontal
+
+使用`pattern`正则表达�匹�`haystack`字符串的所有组。
+
+返回一个元素为数组的数组，其中第一个数组包�与第一组匹�的所有片段，第二个数组包�与第二组匹�的所有片段，�此类推。
+
+这个函数相比 [extractAllGroupsVertical](#extractallgroups-vertical)更慢。
+
+**语法**
+
+``` sql
+extractAllGroupsHorizontal(haystack, pattern)
+```
+
+**�数**
+
+- `haystack` — 输入的字符串，数�类型为[String](../../sql-reference/data-types/string.md).
+- `pattern` — 正则表达�（[re2正则语法�考](https://github.com/google/re2/wiki/Syntax) ，必须包� group，�个 group 用括�括起�。 如果 `pattern` �包� group 则会抛出异常。 数�类型为[String](../../sql-reference/data-types/string.md).
+
+**返回值**
+
+- 数�类型: [Array](../../sql-reference/data-types/array.md).
+
+如果`haystack`�匹�`pattern`正则表达�，则返回一个空数组的数组。
+
+**示例**
+
+``` sql
+SELECT extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
+```
+
+结果：
+
+``` text
+┌─extractAllGroupsHorizontal('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')─�
+│ [['abc','def','ghi'],['111','222','333']]                                                │
+└──────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## extractAllGroupsVertical
+
+使用正则表达� `pattern`匹�字符串`haystack`中的所有group。返回一个数组，其中�个数组包��个group的匹�片段。片段按照在`haystack`中出现的顺�进行分组。
+
+**语法**
+
+``` sql
+extractAllGroupsVertical(haystack, pattern)
+```
+
+**�数**
+
+- `haystack` — 输入的字符串，数�类型为[String](../../sql-reference/data-types/string.md).
+- `pattern` — 正则表达�（[re2正则语法�考](https://github.com/google/re2/wiki/Syntax) ，必须包�group，�个group用括�括起�。 如果 `pattern` �包�group则会抛出异常。 数�类型为[String](../../sql-reference/data-types/string.md).
+
+**返回值**
+
+- 数�类型: [Array](../../sql-reference/data-types/array.md).
+
+如果`haystack`�匹�`pattern`正则表达�，则返回一个空数组。
+
+**示例**
+
+``` sql
+SELECT extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)');
+```
+
+结果：
+
+``` text
+┌─extractAllGroupsVertical('abc=111, def=222, ghi=333', '("[^"]+"|\\w+)=("[^"]+"|\\w+)')─�
+│ [['abc','111'],['def','222'],['ghi','333']]                                            │
+└────────────────────────────────────────────────────────────────────────────────────────┘
+```
+
+## like {#like}
+
+返回字符串 `haystack` 是�匹� LIKE 表达� `pattern`。
+
+一个 LIKE 表达��以包�普通字符和以下元字符：
+
+- `%` 表示任�数�的任�字符（包括零个字符）。
+- `_` 表示�个任�字符。
+- `\` 用于转义文字 `%`, `_` 和 `\`。
+
+匹�基于 UTF-8，例如 `_` 匹� Unicode 代�点 `¥`，它使用两个字节以 UTF-8 表示。
+
+如果 `haystack` 或 `LIKE` 表达��是有效的 UTF-8，则行为是未定义的。
+
+�会自动执行 Unicode 规范化，您�以使用[normalizeUTF8*()](https://clickhouse.com/docs/zh/sql-reference/functions/string-functions/) 函数�执行此�作。
+
+如果需�匹�字符 `%`, `_` 和 `/`（这些是 LIKE 元字符），请在其��加上�斜�：`\%`, `\_` 和 `\\`。
+如果在� `%`, `_` 或 `\` 字符�使用�斜�，则�斜�将失去其特殊�义（�被解释为字�值）。
+请注�，ClickHouse �求字符串中使用�斜� [也需�被转义](../syntax.md#string), 因此您实际上需�编写 `\\%`�`\\_` 和 `\\\\`。
+
+
+对于形�为 `%needle%` 的 LIKE 表达�，函数的性能与 `position` 函数相�。
+所有其他 LIKE 表达�都会被内部转�为正则表达�，并以与函数 `match` 相似的性能执行。
+
+**语法**
+
+```sql
+like(haystack, pattern)
+```
+
+别�： `haystack LIKE pattern` (operator)
+
+## notLike {#notlike}
+
+类似于 `like` 但是返回相�的结果。
+
+别�： `haystack NOT LIKE pattern` (operator)
+
+## ilike
+
+类似于 `like` 但是�区分大�写。
+
+别�： `haystack ILIKE pattern` (operator)
+
+## notILike
+
+类似于 `ilike` 但是返回相�的结果。
+
+别�： `haystack NOT ILIKE pattern` (operator)
+
+## ngramDistance
+
+计算字符串 `haystack`  和�字符串 `needle` 的 4-gram �离。 为此，它计算两个 4-gram 多�集之间的对称差异，并通过它们的基数之和对其进行标准化。返回 0 到 1 之间的 Float32 浮点数。返回值越�，代表字符串越相似. 如果�数 `needle` or `haystack` 是常数且大�超过 32Kb，则抛出异常。如果�数 `haystack` 或 `needle` 是�常数且大�超过 32Kb ，则返回值�为 1。
+
+函数 `ngramDistanceCaseInsensitive, ngramDistanceUTF8, ngramDistanceCaseInsensitiveUTF8` �供此函数的�区分大�写以�/或 UTF-8 �体。
+
+**语法**
+
+```sql
+ngramDistance(haystack, needle)
+```
+
+## ngramSearch
+
+类似于`ngramDistance`，但计算`needle`字符串和 `haystack` 字符串之间的�对称差异，��自 `needle` 的 n-gram 数��去由`needle`数�归一化的 n-gram 的公共数� n-gram。返回 0 到 1 之间的 Float32 浮点数。结果越大，`needle` 越有�能在 `haystack` 中。该函数对于模糊字符串�索很有用。�请�阅函数 `soundex``。
+
+函数 `ngramSearchCaseInsensitive, ngramSearchUTF8, ngramSearchCaseInsensitiveUTF8` �供此函数的�区分大�写以�/或 UTF-8 �体。
+
 :::note
-如�关闭所有hyperscan函数的使用，请设置`SET allow_hyperscan = 0;`。
+UTF-8 �体使用了 3-gram �离。这些并�是完全公平的 n-gram �离。我们使用 2 字节的哈希函数�哈希 n-gram，然�计算这些哈希表之间的(�)对称差异——�能会�生冲�。在使用 UTF-8 大�写��感格�时，我们并�使用公平的 `tolower` 函数——我们将�个�点字节的第 5 �（从零开始）和第零字节的第一个比特��置为零（如果该串的大�超过一个字节）——这对拉�字�和大部分西里尔字�都有效。
 :::
 
-## ��（大海�针，图案) {#extracthaystack-pattern}
+**语法**
 
-使用正则表达�截�字符串。如果’haystack’与’pattern’�匹�，则返回空字符串。如果正则表达�中�包��模�，它将获�与整个正则表达�匹�的�串。�则，它将获�与第一个�模�匹�的�串。
+```sql
+ngramSearch(haystack, needle)
+```
 
-## extractAll（大海�针，图案) {#extractallhaystack-pattern}
+## countSubstrings
 
-使用正则表达���字符串的所有片段。如果’haystack’与’pattern’正则表达��匹�，则返回一个空字符串。�则返回所有与正则表达�匹�的字符串数组。通常，行为与’extract’函数相�（它采用第一个�模�，如果没有�模�，则采用整个表达�）。
+返回字符串 `haystack` 中�字符串 `needle` 出现的次数。
 
-## �（干�堆，模�），干�堆�模��算符 {#likehaystack-pattern-haystack-like-pattern-operator}
+函数 `countSubstringsCaseInsensitive` 和 `countSubstringsCaseInsensitiveUTF8` �供此函数的�区分大�写以� UTF-8 �体。
 
-检查字符串是�与简�正则表达�匹�。
-正则表达��以包�的元符�有`％`和`_`。
+**语法**
 
-`%` 表示任何字节数（包括零字符）。
+``` sql
+countSubstrings(haystack, needle[, start_pos])
+```
 
-`_` 表示任何一个字节。
+**�数**
 
-�以使用�斜�（`\`）�对元符�进行转义。请�阅«match»函数说明中有关转义的说明。
+- `haystack` — 被�索的字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — 用于�索的模��字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `start_pos` – 在字符串`haystack` 中开始检索的�置(从 1 开始)，类型为[UInt](../../sql-reference/data-types/int-uint.md)，�选。
 
-对于�`％needle％`这样的正则表达�，改函数与`position`函数一样快。
-对于其他正则表达�，函数与’match’函数相�。
+**返回值**
 
-## �喜欢（干�堆，模�），干�堆�喜欢模��算符 {#notlikehaystack-pattern-haystack-not-like-pattern-operator}
+- �字符串出现的次数。
 
-与’like’函数返回相�的结果。
+数�类型: [UInt64](../../sql-reference/data-types/int-uint.md).
 
-## 大海�针) {#ngramdistancehaystack-needle}
+**示例**
 
-基于4-gram计算`haystack`和`needle`之间的�离：计算两个4-gram集�之间的对称差异，并用它们的基数和对其进行归一化。返回0到1之间的任何浮点数 – 越接近0则表示越多的字符串彼此相似。如果常�的`needle`或`haystack`超过32KB，函数将抛出异常。如果�常�的`haystack`或`needle`字符串超过32Kb，则�离始终为1。
+``` sql
+SELECT countSubstrings('aaaa', 'aa');
+```
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`ngramDistanceCaseInsensitive，ngramDistanceUTF8，ngramDistanceCaseInsensitiveUTF8`。
+结果：
 
-## ﾂ暗ｪﾂ氾环催ﾂ団ﾂ法ﾂ人) {#ngramsearchhaystack-needle}
+``` text
+┌─countSubstrings('aaaa', 'aa')─�
+│                             2 │
+└───────────────────────────────┘
+```
 
-与`ngramDistance`相�，但计算`needle`和`haystack`之间的�对称差异——`needle`的n-gram�去`needle`归一化n-gram。�用于模糊字符串�索。
+示例，使用�数 `start_pos` :
 
-对于�区分大�写的�索或/和UTF-8格�，使用函数`ngramSearchCaseInsensitive，ngramSearchUTF8，ngramSearchCaseInsensitiveUTF8`。
+```sql
+SELECT countSubstrings('abc___abc', 'abc', 4);
+```
 
-:::note
-对于UTF-8，我们使用3-gram。所有这些都�是完全公平的n-gram�离。我们使用2字节哈希�散列n-gram，然�计算这些哈希表之间的（�）对称差异 - �能会�生冲�。对于UTF-8�区分大�写的格�，我们�使用公平的`tolower`函数 - 我们将�个Unicode字符字节的第5�（从零开始）和字节的第一�归零 - 这适用于拉�语，主�用于所有西里尔字�。
-:::
+结果：
+
+``` text
+┌─countSubstrings('abc___abc', 'abc', 4)─�
+│                                      1 │
+└────────────────────────────────────────┘
+```
+
+## countMatches
+
+返回正则表达� `pattern` 在 `haystack` 中�功匹�的次数。
+
+**语法**
+
+``` sql
+countMatches(haystack, pattern)
+```
+
+**�数**
+
+- `haystack` — 输入的字符串，数�类型为[String](../../sql-reference/data-types/string.md).
+- `pattern` — 正则表达�（[re2正则语法�考](https://github.com/google/re2/wiki/Syntax)） 数�类型为[String](../../sql-reference/data-types/string.md).
+
+**返回值**
+
+- 匹�次数。
+
+数�类型: [UInt64](../../sql-reference/data-types/int-uint.md).
+
+**示例**
+
+``` sql
+SELECT countMatches('foobar.com', 'o+');
+```
+
+结果：
+
+``` text
+┌─countMatches('foobar.com', 'o+')─�
+│                                2 │
+└──────────────────────────────────┘
+```
+
+``` sql
+SELECT countMatches('aaaa', 'aa');
+```
+
+结果：
+
+``` text
+┌─countMatches('aaaa', 'aa')────�
+│                             2 │
+└───────────────────────────────┘
+```
+
+## countMatchesCaseInsensitive
+
+类似于 `countMatches(haystack, pattern)` 但是�区分大�写。
+
+## regexpExtract
+
+��匹�正则表达�模�的字符串`haystack`中的第一个字符串，并对应于正则表达�组索引。
+
+**语法**
+
+``` sql
+regexpExtract(haystack, pattern[, index])
+```
+
+别�： `REGEXP_EXTRACT(haystack, pattern[, index])`.
+
+**�数**
+
+- `haystack` — 被匹�字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `pattern` — 正则表达�，必须是常�。类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `index` – 一个大于等于 0 的整数，默认为 1 ，它代表���哪个正则表达�组。 [UInt or Int](../../sql-reference/data-types/int-uint.md) �选。
+
+**返回值**
+
+`pattern`�以包�多个正则组, `index` 代表���哪个正则表达�组。如果 `index` 为 0，则返回整个匹�的字符串。
+
+数�类型: `String`.
+
+**示例**
+
+``` sql
+SELECT
+    regexpExtract('100-200', '(\\d+)-(\\d+)', 1),
+    regexpExtract('100-200', '(\\d+)-(\\d+)', 2),
+    regexpExtract('100-200', '(\\d+)-(\\d+)', 0),
+    regexpExtract('100-200', '(\\d+)-(\\d+)');
+```
+
+结果：
+
+``` 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                                       │
+└──────────────────────────────────────────────┴──────────────────────────────────────────────┴──────────────────────────────────────────────┴───────────────────────────────────────────┘
+```
+
+## hasSubsequence
+
+如果`needle`是`haystack`的��列，返回1，�则返回0。
+��列是从给定字符串中删除零个或多个元素而�改�剩余元素的顺�得到的�列。
+
+**语法**
+
+``` sql
+hasSubsequence(haystack, needle)
+```
+
+**�数**
+
+- `haystack` — 被�索的字符串，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+- `needle` — �索��列，类型为[String](../../sql-reference/syntax.md#syntax-string-literal).
+
+**返回值**
+
+- 1, 如果`needle`是`haystack`的��列
+- 0, 如果`needle`�是`haystack`的��列
+
+数�类型: `UInt8`.
+
+**示例**
+
+``` sql
+SELECT hasSubsequence('garbage', 'arg') ;
+```
+
+结果：
+
+``` text
+┌─hasSubsequence('garbage', 'arg')─�
+│                                1 │
+└──────────────────────────────────┘
+```
+
+## hasSubsequenceCaseInsensitive
+类似于 [hasSubsequence](#hasSubsequence) 但是�区分大�写。
+
+## hasSubsequenceUTF8
+
+类似于 [hasSubsequence](#hasSubsequence) 但是�定 `haystack` 和 `needle` 是 UTF-8 编�的字符串。
+
+## hasSubsequenceCaseInsensitiveUTF8
+
+类似于 [hasSubsequenceUTF8](#hasSubsequenceUTF8) 但是�区分大�写。
diff --git a/docs/zh/sql-reference/statements/alter.md b/docs/zh/sql-reference/statements/alter.md
index 002d5102fa3..48665ae04ab 100644
--- a/docs/zh/sql-reference/statements/alter.md
+++ b/docs/zh/sql-reference/statements/alter.md
@@ -150,7 +150,7 @@ ALTER TABLE visits MODIFY COLUMN browser Array(String)
 
 �支�对primary key或者sampling key中的列（在 `ENGINE` 表达�中用到的列）进行删除�作。改�包�在primary key中的列的类型时，如果�作�会导致数�的�化（例如，往Enum中添加一个值，或者将`DateTime` 类型改� `UInt32`），那么这��作是�行的。
 
-如果 `ALTER` �作�足以完�你想�的表�动�作，你�以创建一张新的表，通过 [INSERT SELECT](../../sql-reference/statements/insert-into.md#inserting-the-results-of-select)将数�拷�进去，然�通过  [RENAME](../../sql-reference/statements/misc.md#misc_operations-rename)将新的表改�和原有表一样的�称，并删除原有的表。你�以使用 [clickhouse-copier](../../operations/utilities/clickhouse-copier.md) 代替 `INSERT SELECT`。
+如果 `ALTER` �作�足以完�你想�的表�动�作，你�以创建一张新的表，通过 [INSERT SELECT](../../sql-reference/statements/insert-into.md#inserting-the-results-of-select)将数�拷�进去，然�通过  [RENAME](../../sql-reference/statements/misc.md#misc_operations-rename)将新的表改�和原有表一样的�称，并删除原有的表。
 
  `ALTER` �作会阻塞对表的所有读写�作。���说，当一个大的 `SELECT` 语�和 `ALTER`�时执行时，`ALTER`会等待，直到 `SELECT` 执行结�。与此�时，当 `ALTER` �行时，新的 sql 语�将会等待。
 
diff --git a/docs/zh/sql-reference/statements/grant.md b/docs/zh/sql-reference/statements/grant.md
index 7e7cdbff350..fea51d590d5 100644
--- a/docs/zh/sql-reference/statements/grant.md
+++ b/docs/zh/sql-reference/statements/grant.md
@@ -280,9 +280,6 @@ GRANT INSERT(x,y) ON db.table TO john
         -   `ALTER MOVE PARTITION`. 级别: `TABLE`. 别�: `ALTER MOVE PART`, `MOVE PARTITION`, `MOVE PART`
         -   `ALTER FETCH PARTITION`. 级别: `TABLE`. 别�: `FETCH PARTITION`
         -   `ALTER FREEZE PARTITION`. 级别: `TABLE`. 别�: `FREEZE PARTITION`
-    -   `ALTER VIEW` 级别: `GROUP`
-        -   `ALTER VIEW REFRESH`. 级别: `VIEW`. 别�: `ALTER LIVE VIEW REFRESH`, `REFRESH VIEW`
-        -   `ALTER VIEW MODIFY QUERY`. 级别: `VIEW`. 别�: `ALTER TABLE MODIFY QUERY`
 
 如何对待该层级的示例：
 -   `ALTER` ��包�所有其它 `ALTER *` 的��
diff --git a/docs/zh/sql-reference/statements/system.md b/docs/zh/sql-reference/statements/system.md
index 87d077fcdb9..5b5f101ebc4 100644
--- a/docs/zh/sql-reference/statements/system.md
+++ b/docs/zh/sql-reference/statements/system.md
@@ -248,7 +248,7 @@ SYSTEM START REPLICATION QUEUES [ON CLUSTER cluster_name] [[db.]replicated_merge
 
 
 ``` sql
-SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT | PULL]
+SYSTEM SYNC REPLICA [db.]replicated_merge_tree_family_table_name [STRICT | LIGHTWEIGHT [FROM 'srcReplica1'[, 'srcReplica2'[, ...]]] | PULL]
 ```
 
 ### RESTART REPLICA {#query_language-system-restart-replica}
diff --git a/packages/build b/packages/build
index c2285b8ee7c..b2dd085d9dd 100755
--- a/packages/build
+++ b/packages/build
@@ -130,6 +130,8 @@ if [ -n "$SANITIZER" ]; then
     fi
 elif [[ $BUILD_TYPE == 'debug' ]]; then
     VERSION_POSTFIX+="+debug"
+elif [[ $BUILD_TYPE =~ 'coverage' ]]; then
+    VERSION_POSTFIX+="+coverage"
 fi
 
 if [[ "$PKG_ROOT" != "$SOURCE" ]]; then
diff --git a/packages/clickhouse-client.yaml b/packages/clickhouse-client.yaml
index 4d707b28ad9..34b42d92adf 100644
--- a/packages/clickhouse-client.yaml
+++ b/packages/clickhouse-client.yaml
@@ -49,6 +49,12 @@ contents:
   dst: /usr/bin/clickhouse-client
 - src: root/usr/bin/clickhouse-local
   dst: /usr/bin/clickhouse-local
+- src: root/usr/bin/ch
+  dst: /usr/bin/ch
+- src: root/usr/bin/chc
+  dst: /usr/bin/chc
+- src: root/usr/bin/chl
+  dst: /usr/bin/chl
 - src: root/usr/bin/clickhouse-obfuscator
   dst: /usr/bin/clickhouse-obfuscator
 # docs
diff --git a/packages/clickhouse-common-static-dbg.yaml b/packages/clickhouse-common-static-dbg.yaml
index 96de4c17d88..74b7fa8381b 100644
--- a/packages/clickhouse-common-static-dbg.yaml
+++ b/packages/clickhouse-common-static-dbg.yaml
@@ -30,10 +30,6 @@ conflicts:
 contents:
 - src: root/usr/lib/debug/usr/bin/clickhouse.debug
   dst: /usr/lib/debug/usr/bin/clickhouse.debug
-- src: root/usr/lib/debug/usr/bin/clickhouse-odbc-bridge.debug
-  dst: /usr/lib/debug/usr/bin/clickhouse-odbc-bridge.debug
-- src: root/usr/lib/debug/usr/bin/clickhouse-library-bridge.debug
-  dst: /usr/lib/debug/usr/bin/clickhouse-library-bridge.debug
 # docs
 - src: ../AUTHORS
   dst: /usr/share/doc/clickhouse-common-static-dbg/AUTHORS
diff --git a/packages/clickhouse-common-static.yaml b/packages/clickhouse-common-static.yaml
index 238126f95fd..db330f808e1 100644
--- a/packages/clickhouse-common-static.yaml
+++ b/packages/clickhouse-common-static.yaml
@@ -34,14 +34,8 @@ suggests:
 contents:
 - src: root/usr/bin/clickhouse
   dst: /usr/bin/clickhouse
-- src: root/usr/bin/clickhouse-diagnostics
-  dst: /usr/bin/clickhouse-diagnostics
 - src: root/usr/bin/clickhouse-extract-from-config
   dst: /usr/bin/clickhouse-extract-from-config
-- src: root/usr/bin/clickhouse-library-bridge
-  dst: /usr/bin/clickhouse-library-bridge
-- src: root/usr/bin/clickhouse-odbc-bridge
-  dst: /usr/bin/clickhouse-odbc-bridge
 - src: root/usr/share/bash-completion/completions
   dst: /usr/share/bash-completion/completions
 - src: root/usr/share/clickhouse
diff --git a/packages/clickhouse-library-bridge.yaml b/packages/clickhouse-library-bridge.yaml
new file mode 100644
index 00000000000..d041e7a26db
--- /dev/null
+++ b/packages/clickhouse-library-bridge.yaml
@@ -0,0 +1,35 @@
+# package sources should be placed in ${PWD}/root
+# nfpm should run from the same directory with a config
+name: "clickhouse-library-bridge"
+description: |
+  ClickHouse Library Bridge - is a separate process for loading libraries for the 'library' dictionary sources and the CatBoost library.
+    ClickHouse is a column-oriented database management system
+    that allows generating analytical data reports in real time.
+
+# Common packages config
+arch: "${DEB_ARCH}" # amd64, arm64
+platform: "linux"
+version: "${CLICKHOUSE_VERSION_STRING}"
+vendor: "ClickHouse Inc."
+homepage: "https://clickhouse.com"
+license: "Apache"
+section: "database"
+priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse
+
+# Package specific content
+contents:
+- src: root/usr/bin/clickhouse-library-bridge
+  dst: /usr/bin/clickhouse-library-bridge
+# docs
+- src: ../AUTHORS
+  dst: /usr/share/doc/clickhouse-library-bridge/AUTHORS
+- src: ../CHANGELOG.md
+  dst: /usr/share/doc/clickhouse-library-bridge/CHANGELOG.md
+- src: ../LICENSE
+  dst: /usr/share/doc/clickhouse-library-bridge/LICENSE
+- src: ../README.md
+  dst: /usr/share/doc/clickhouse-library-bridge/README.md
diff --git a/packages/clickhouse-odbc-bridge.yaml b/packages/clickhouse-odbc-bridge.yaml
new file mode 100644
index 00000000000..98c459c8c26
--- /dev/null
+++ b/packages/clickhouse-odbc-bridge.yaml
@@ -0,0 +1,35 @@
+# package sources should be placed in ${PWD}/root
+# nfpm should run from the same directory with a config
+name: "clickhouse-odbc-bridge"
+description: |
+  ClickHouse ODBC Bridge - is a separate process for loading ODBC drivers and interacting with external databases using the ODBC protocol.
+    ClickHouse is a column-oriented database management system
+    that allows generating analytical data reports in real time.
+
+# Common packages config
+arch: "${DEB_ARCH}" # amd64, arm64
+platform: "linux"
+version: "${CLICKHOUSE_VERSION_STRING}"
+vendor: "ClickHouse Inc."
+homepage: "https://clickhouse.com"
+license: "Apache"
+section: "database"
+priority: "optional"
+maintainer: "ClickHouse Dev Team <packages+linux@clickhouse.com>"
+deb:
+  fields:
+    Source: clickhouse
+
+# Package specific content
+contents:
+- src: root/usr/bin/clickhouse-odbc-bridge
+  dst: /usr/bin/clickhouse-odbc-bridge
+# docs
+- src: ../AUTHORS
+  dst: /usr/share/doc/clickhouse-odbc-bridge/AUTHORS
+- src: ../CHANGELOG.md
+  dst: /usr/share/doc/clickhouse-odbc-bridge/CHANGELOG.md
+- src: ../LICENSE
+  dst: /usr/share/doc/clickhouse-odbc-bridge/LICENSE
+- src: ../README.md
+  dst: /usr/share/doc/clickhouse-odbc-bridge/README.md
diff --git a/packages/clickhouse-server.yaml b/packages/clickhouse-server.yaml
index 7894129b8e3..dc183ead102 100644
--- a/packages/clickhouse-server.yaml
+++ b/packages/clickhouse-server.yaml
@@ -50,8 +50,6 @@ contents:
   dst: /etc/init.d/clickhouse-server
 - src: clickhouse-server.service
   dst: /lib/systemd/system/clickhouse-server.service
-- src: root/usr/bin/clickhouse-copier
-  dst: /usr/bin/clickhouse-copier
 - src: root/usr/bin/clickhouse-server
   dst: /usr/bin/clickhouse-server
 # clickhouse-keeper part
diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt
index b3a5af6d6c9..0d91de2dad8 100644
--- a/programs/CMakeLists.txt
+++ b/programs/CMakeLists.txt
@@ -7,35 +7,16 @@ endif ()
 include(${ClickHouse_SOURCE_DIR}/cmake/split_debug_symbols.cmake)
 
 # The `clickhouse` binary is a multi purpose tool that contains multiple execution modes (client, server, etc.),
-# each of them may be built and linked as a separate library.
-# If you do not know what modes you need, turn this option OFF and enable SERVER and CLIENT only.
+# So client/server/... is just a symlink to `clickhouse` binary.
+#
+# But, there are several components that requires extra libraries, like keeper
+# requires NuRaft, that regular binary does not requires, so you can disable
+# compilation of this components.
+#
+# If you do not know what modes you need, turn then all.
 option (ENABLE_CLICKHOUSE_ALL "Enable all ClickHouse modes by default" ON)
 
-option (ENABLE_CLICKHOUSE_SERVER "Server mode (main mode)" ${ENABLE_CLICKHOUSE_ALL})
-option (ENABLE_CLICKHOUSE_CLIENT "Client mode (interactive tui/shell that connects to the server)"
-    ${ENABLE_CLICKHOUSE_ALL})
-
-# https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/
-option (ENABLE_CLICKHOUSE_LOCAL "Local files fast processing mode" ${ENABLE_CLICKHOUSE_ALL})
-
-# https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/
-option (ENABLE_CLICKHOUSE_BENCHMARK "Queries benchmarking mode" ${ENABLE_CLICKHOUSE_ALL})
-
-option (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG "Configs processor (extract values etc.)" ${ENABLE_CLICKHOUSE_ALL})
-
-# https://clickhouse.com/docs/en/operations/utilities/clickhouse-compressor/
-option (ENABLE_CLICKHOUSE_COMPRESSOR "Data compressor and decompressor" ${ENABLE_CLICKHOUSE_ALL})
-
-# https://clickhouse.com/docs/en/operations/utilities/clickhouse-copier/
-option (ENABLE_CLICKHOUSE_COPIER "Inter-cluster data copying mode" ${ENABLE_CLICKHOUSE_ALL})
-
-option (ENABLE_CLICKHOUSE_FORMAT "Queries pretty-printer and formatter with syntax highlighting"
-    ${ENABLE_CLICKHOUSE_ALL})
-
 # https://clickhouse.com/docs/en/operations/utilities/clickhouse-obfuscator/
-option (ENABLE_CLICKHOUSE_OBFUSCATOR "Table data obfuscator (convert real data to benchmark-ready one)"
-    ${ENABLE_CLICKHOUSE_ALL})
-
 # https://clickhouse.com/docs/en/operations/utilities/odbc-bridge/
 # TODO Also needs NANODBC.
 if (ENABLE_ODBC AND NOT USE_MUSL)
@@ -51,18 +32,12 @@ endif ()
 # https://presentations.clickhouse.com/matemarketing_2020/
 option (ENABLE_CLICKHOUSE_GIT_IMPORT "A tool to analyze Git repositories" ${ENABLE_CLICKHOUSE_ALL})
 
-option (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER "A tool to export table data files to be later put to a static files web server" ${ENABLE_CLICKHOUSE_ALL})
-
 option (ENABLE_CLICKHOUSE_KEEPER "ClickHouse alternative to ZooKeeper" ${ENABLE_CLICKHOUSE_ALL})
 
 option (ENABLE_CLICKHOUSE_KEEPER_CONVERTER "Util allows to convert ZooKeeper logs and snapshots into clickhouse-keeper snapshot" ${ENABLE_CLICKHOUSE_ALL})
 
 option (ENABLE_CLICKHOUSE_KEEPER_CLIENT "ClickHouse Keeper Client" ${ENABLE_CLICKHOUSE_ALL})
 
-option (ENABLE_CLICKHOUSE_SU "A tool similar to 'su'" ${ENABLE_CLICKHOUSE_ALL})
-
-option (ENABLE_CLICKHOUSE_DISKS "A tool to manage disks" ${ENABLE_CLICKHOUSE_ALL})
-
 if (NOT ENABLE_NURAFT)
     # RECONFIGURE_MESSAGE_LEVEL should not be used here,
     # since ENABLE_NURAFT is set to OFF for FreeBSD and Darwin.
@@ -71,27 +46,7 @@ if (NOT ENABLE_NURAFT)
     set(ENABLE_CLICKHOUSE_KEEPER_CONVERTER OFF)
 endif()
 
-option(ENABLE_CLICKHOUSE_INSTALL "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)" ${ENABLE_CLICKHOUSE_ALL})
-
-message(STATUS "ClickHouse modes:")
-
-if (NOT ENABLE_CLICKHOUSE_SERVER)
-    message(WARNING "ClickHouse server mode is not going to be built.")
-else()
-    message(STATUS "Server mode: ON")
-endif()
-
-if (NOT ENABLE_CLICKHOUSE_CLIENT)
-    message(WARNING "ClickHouse client mode is not going to be built. You won't be able to connect to the server and run tests")
-else()
-    message(STATUS "Client mode: ON")
-endif()
-
-if (ENABLE_CLICKHOUSE_LOCAL)
-    message(STATUS "Local mode: ON")
-else()
-    message(STATUS "Local mode: OFF")
-endif()
+message(STATUS "ClickHouse extra components:")
 
 if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
     message(STATUS "Self-extracting executable: ON")
@@ -99,42 +54,6 @@ else()
     message(STATUS "Self-extracting executable: OFF")
 endif()
 
-if (ENABLE_CLICKHOUSE_BENCHMARK)
-    message(STATUS "Benchmark mode: ON")
-else()
-    message(STATUS "Benchmark mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
-    message(STATUS "Extract from config mode: ON")
-else()
-    message(STATUS "Extract from config mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_COMPRESSOR)
-    message(STATUS "Compressor mode: ON")
-else()
-    message(STATUS "Compressor mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_COPIER)
-    message(STATUS "Copier mode: ON")
-else()
-    message(STATUS "Copier mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_FORMAT)
-    message(STATUS "Format mode: ON")
-else()
-    message(STATUS "Format mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_OBFUSCATOR)
-    message(STATUS "Obfuscator mode: ON")
-else()
-    message(STATUS "Obfuscator mode: OFF")
-endif()
-
 if (ENABLE_CLICKHOUSE_ODBC_BRIDGE)
     message(STATUS "ODBC bridge mode: ON")
 else()
@@ -147,18 +66,6 @@ else()
     message(STATUS "Library bridge mode: OFF")
 endif()
 
-if (ENABLE_CLICKHOUSE_INSTALL)
-    message(STATUS "ClickHouse install: ON")
-else()
-    message(STATUS "ClickHouse install: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_GIT_IMPORT)
-    message(STATUS "ClickHouse git-import: ON")
-else()
-    message(STATUS "ClickHouse git-import: OFF")
-endif()
-
 if (ENABLE_CLICKHOUSE_KEEPER)
     message(STATUS "ClickHouse keeper mode: ON")
 else()
@@ -177,19 +84,6 @@ else()
     message(STATUS "ClickHouse keeper-client mode: OFF")
 endif()
 
-
-if (ENABLE_CLICKHOUSE_DISKS)
-    message(STATUS "Clickhouse disks mode: ON")
-else()
-    message(STATUS "ClickHouse disks mode: OFF")
-endif()
-
-if (ENABLE_CLICKHOUSE_SU)
-    message(STATUS "ClickHouse su: ON")
-else()
-    message(STATUS "ClickHouse su: OFF")
-endif()
-
 configure_file (config_tools.h.in ${CONFIG_INCLUDE_PATH}/config_tools.h)
 
 macro(clickhouse_target_link_split_lib target name)
@@ -228,7 +122,6 @@ add_subdirectory (local)
 add_subdirectory (benchmark)
 add_subdirectory (extract-from-config)
 add_subdirectory (compressor)
-add_subdirectory (copier)
 add_subdirectory (format)
 add_subdirectory (obfuscator)
 add_subdirectory (install)
@@ -272,42 +165,6 @@ endif ()
 target_link_libraries (clickhouse PRIVATE clickhouse_common_io string_utils ${HARMFUL_LIB})
 target_include_directories (clickhouse PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
-if (ENABLE_CLICKHOUSE_SERVER)
-    clickhouse_target_link_split_lib(clickhouse server)
-endif ()
-if (ENABLE_CLICKHOUSE_CLIENT)
-    clickhouse_target_link_split_lib(clickhouse client)
-endif ()
-if (ENABLE_CLICKHOUSE_LOCAL)
-    clickhouse_target_link_split_lib(clickhouse local)
-endif ()
-if (ENABLE_CLICKHOUSE_BENCHMARK)
-    clickhouse_target_link_split_lib(clickhouse benchmark)
-endif ()
-if (ENABLE_CLICKHOUSE_COPIER)
-    clickhouse_target_link_split_lib(clickhouse copier)
-endif ()
-if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
-    clickhouse_target_link_split_lib(clickhouse extract-from-config)
-endif ()
-if (ENABLE_CLICKHOUSE_COMPRESSOR)
-    clickhouse_target_link_split_lib(clickhouse compressor)
-endif ()
-if (ENABLE_CLICKHOUSE_FORMAT)
-    clickhouse_target_link_split_lib(clickhouse format)
-endif ()
-if (ENABLE_CLICKHOUSE_OBFUSCATOR)
-    clickhouse_target_link_split_lib(clickhouse obfuscator)
-endif ()
-if (ENABLE_CLICKHOUSE_GIT_IMPORT)
-    clickhouse_target_link_split_lib(clickhouse git-import)
-endif ()
-if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
-    clickhouse_target_link_split_lib(clickhouse static-files-disk-uploader)
-endif ()
-if (ENABLE_CLICKHOUSE_SU)
-    clickhouse_target_link_split_lib(clickhouse su)
-endif ()
 if (ENABLE_CLICKHOUSE_KEEPER)
     clickhouse_target_link_split_lib(clickhouse keeper)
 endif()
@@ -317,77 +174,39 @@ endif()
 if (ENABLE_CLICKHOUSE_KEEPER_CLIENT)
     clickhouse_target_link_split_lib(clickhouse keeper-client)
 endif()
-if (ENABLE_CLICKHOUSE_INSTALL)
-    clickhouse_target_link_split_lib(clickhouse install)
-endif ()
-if (ENABLE_CLICKHOUSE_DISKS)
-    clickhouse_target_link_split_lib(clickhouse disks)
-endif ()
+clickhouse_target_link_split_lib(clickhouse install)
 
 set (CLICKHOUSE_BUNDLE)
+macro(clickhouse_program_install name lib_name)
+    clickhouse_target_link_split_lib(clickhouse ${lib_name})
+    add_custom_target (${name} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse ${name} DEPENDS clickhouse)
+    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${name}" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+    list(APPEND CLICKHOUSE_BUNDLE ${name})
+
+    foreach(alias ${ARGN})
+        message(STATUS "Adding alias ${alias} for ${name}")
+        add_custom_target (${alias} ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse ${alias} DEPENDS clickhouse)
+        install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${alias}" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
+        list(APPEND CLICKHOUSE_BUNDLE ${alias})
+    endforeach()
+endmacro()
+
 if (ENABLE_CLICKHOUSE_SELF_EXTRACTING)
     list(APPEND CLICKHOUSE_BUNDLE self-extracting)
 endif ()
-if (ENABLE_CLICKHOUSE_SERVER)
-    add_custom_target (clickhouse-server ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-server DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-server" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-server)
-endif ()
-if (ENABLE_CLICKHOUSE_CLIENT)
-    add_custom_target (clickhouse-client ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-client DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-client" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-client)
-endif ()
-if (ENABLE_CLICKHOUSE_LOCAL)
-    add_custom_target (clickhouse-local ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-local DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-local" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-local)
-endif ()
-if (ENABLE_CLICKHOUSE_BENCHMARK)
-    add_custom_target (clickhouse-benchmark ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-benchmark DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-benchmark" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-benchmark)
-endif ()
-if (ENABLE_CLICKHOUSE_COPIER)
-    add_custom_target (clickhouse-copier ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-copier DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-copier" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-copier)
-endif ()
-if (ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG)
-    add_custom_target (clickhouse-extract-from-config ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-extract-from-config" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-extract-from-config)
-endif ()
-if (ENABLE_CLICKHOUSE_COMPRESSOR)
-    add_custom_target (clickhouse-compressor ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-compressor" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-compressor)
-endif ()
-if (ENABLE_CLICKHOUSE_FORMAT)
-    add_custom_target (clickhouse-format ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-format DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-format" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-format)
-endif ()
-if (ENABLE_CLICKHOUSE_OBFUSCATOR)
-    add_custom_target (clickhouse-obfuscator ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-obfuscator DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-obfuscator" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-obfuscator)
-endif ()
-if (ENABLE_CLICKHOUSE_GIT_IMPORT)
-    add_custom_target (clickhouse-git-import ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-git-import DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-git-import" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-git-import)
-endif ()
-if (ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER)
-    add_custom_target (clickhouse-static-files-disk-uploader ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-static-files-disk-uploader DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-static-files-disk-uploader" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-static-files-disk-uploader)
-endif ()
-if (ENABLE_CLICKHOUSE_SU)
-    add_custom_target (clickhouse-su ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-su DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-su" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-su)
-endif ()
+
+clickhouse_program_install(clickhouse-server server)
+clickhouse_program_install(clickhouse-client client chc)
+clickhouse_program_install(clickhouse-local local chl ch)
+clickhouse_program_install(clickhouse-benchmark benchmark)
+clickhouse_program_install(clickhouse-extract-from-config extract-from-config)
+clickhouse_program_install(clickhouse-compressor compressor)
+clickhouse_program_install(clickhouse-format format)
+clickhouse_program_install(clickhouse-obfuscator obfuscator)
+clickhouse_program_install(clickhouse-git-import git-import)
+clickhouse_program_install(clickhouse-static-files-disk-uploader static-files-disk-uploader)
+clickhouse_program_install(clickhouse-disks disks)
+clickhouse_program_install(clickhouse-su su)
 
 if (ENABLE_CLICKHOUSE_KEEPER)
     if (NOT BUILD_STANDALONE_KEEPER AND CREATE_KEEPER_SYMLINK)
@@ -417,11 +236,6 @@ if (ENABLE_CLICKHOUSE_KEEPER_CLIENT)
 
     list(APPEND CLICKHOUSE_BUNDLE clickhouse-keeper-client)
 endif ()
-if (ENABLE_CLICKHOUSE_DISKS)
-    add_custom_target (clickhouse-disks ALL COMMAND ${CMAKE_COMMAND} -E create_symlink clickhouse clickhouse-disks DEPENDS clickhouse)
-    install (FILES "${CMAKE_CURRENT_BINARY_DIR}/clickhouse-disks" DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-    list(APPEND CLICKHOUSE_BUNDLE clickhouse-disks)
-endif ()
 
 add_custom_target (clickhouse-bundle ALL DEPENDS ${CLICKHOUSE_BUNDLE})
 
@@ -454,10 +268,6 @@ if (ENABLE_TESTS)
     add_dependencies(clickhouse-bundle clickhouse-tests)
 endif()
 
-if (ENABLE_FUZZING)
-    add_compile_definitions(FUZZING_MODE=1)
-endif ()
-
 if (TARGET ch_contrib::protobuf)
     get_property(google_proto_files TARGET ch_contrib::protobuf PROPERTY google_proto_files)
     foreach (proto_file IN LISTS google_proto_files)
diff --git a/programs/bash-completion/completions/clickhouse b/programs/bash-completion/completions/clickhouse
index ff0a60c60be..3c895a66075 100644
--- a/programs/bash-completion/completions/clickhouse
+++ b/programs/bash-completion/completions/clickhouse
@@ -3,7 +3,7 @@
 function _clickhouse_get_utils()
 {
     local cmd=$1 && shift
-    "$cmd" --help |& awk '/^clickhouse.*args/ { print $2 }'
+    "$cmd" help |& awk '/^clickhouse.*args/ { print $2 }'
 }
 
 function _complete_for_clickhouse_entrypoint_bin()
diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 59fc6c0c17f..eecc352d073 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -2,7 +2,6 @@
 #include <cstdlib>
 #include <csignal>
 #include <iostream>
-#include <fstream>
 #include <iomanip>
 #include <optional>
 #include <random>
@@ -35,6 +34,7 @@
 #include <Common/StudentTTest.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ErrorCodes.h>
+#include <Core/BaseSettingsProgramOptions.h>
 
 
 /** A tool for evaluating ClickHouse performance.
@@ -568,10 +568,6 @@ public:
 }
 
 
-#ifndef __clang__
-#pragma GCC optimize("-fno-var-tracking-assignments")
-#endif
-
 int mainEntryClickHouseBenchmark(int argc, char ** argv)
 {
     using namespace DB;
@@ -628,7 +624,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         ;
 
         Settings settings;
-        settings.addProgramOptions(desc);
+        addProgramOptions(settings, desc);
 
         boost::program_options::variables_map options;
         boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
@@ -640,7 +636,8 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         {
             std::cout << "Usage: " << argv[0] << " [options] < queries.txt\n";
             std::cout << desc << "\n";
-            return 1;
+            std::cout << "\nSee also: https://clickhouse.com/docs/en/operations/utilities/clickhouse-benchmark/\n";
+            return 0;
         }
 
         print_stacktrace = options.count("stacktrace");
diff --git a/programs/client/Client.cpp b/programs/client/Client.cpp
index 4e81c0a75f6..72cad1dac07 100644
--- a/programs/client/Client.cpp
+++ b/programs/client/Client.cpp
@@ -1,4 +1,3 @@
-#include <boost/algorithm/string/join.hpp>
 #include <cstdlib>
 #include <fcntl.h>
 #include <map>
@@ -7,7 +6,6 @@
 #include <memory>
 #include <optional>
 #include <Common/ThreadStatus.h>
-#include <Common/scope_guard_safe.h>
 #include <boost/program_options.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <filesystem>
@@ -19,12 +17,13 @@
 
 #include <Access/AccessControl.h>
 
-#include <Common/config_version.h>
-#include <Common/Exception.h>
-#include <Common/formatReadable.h>
-#include <Common/TerminalSize.h>
 #include <Common/Config/ConfigProcessor.h>
 #include <Common/Config/getClientConfigPath.h>
+#include <Common/CurrentThread.h>
+#include <Common/Exception.h>
+#include <Common/TerminalSize.h>
+#include <Common/config_version.h>
+#include <Common/formatReadable.h>
 
 #include <Columns/ColumnString.h>
 #include <Poco/Util/Application.h>
@@ -45,15 +44,10 @@
 
 #include <Processors/Transforms/getSourceFromASTInsertQuery.h>
 
-#include <Interpreters/InterpreterSetQuery.h>
-
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <Formats/registerFormats.h>
-
-#ifndef __clang__
-#pragma GCC optimize("-fno-var-tracking-assignments")
-#endif
+#include <Formats/FormatFactory.h>
 
 namespace fs = std::filesystem;
 using namespace std::literals;
@@ -330,6 +324,7 @@ try
     processConfig();
     adjustSettings();
     initTTYBuffer(toProgressOption(config().getString("progress", "default")));
+    ASTAlterCommand::setFormatAlterCommandsWithParentheses(true);
 
     {
         // All that just to set DB::CurrentThread::get().getGlobalContext()
@@ -504,7 +499,7 @@ void Client::connect()
                         << "It may lack support for new features." << std::endl
                         << std::endl;
         }
-        else if (client_version_tuple > server_version_tuple)
+        else if (client_version_tuple > server_version_tuple && server_display_name != "clickhouse-cloud")
         {
             std::cout << "ClickHouse server version is older than ClickHouse client. "
                         << "It may indicate that the server is out of date and can be upgraded." << std::endl
@@ -845,83 +840,7 @@ bool Client::processWithFuzzing(const String & full_query)
             have_error = true;
         }
 
-        // Check that after the query is formatted, we can parse it back,
-        // format again and get the same result. Unfortunately, we can't
-        // compare the ASTs, which would be more sensitive to errors. This
-        // double formatting check doesn't catch all errors, e.g. we can
-        // format query incorrectly, but to a valid SQL that we can then
-        // parse and format into the same SQL.
-        // There are some complicated cases where we can generate the SQL
-        // which we can't parse:
-        // * first argument of lambda() replaced by fuzzer with
-        //   something else, leading to constructs such as
-        //   arrayMap((min(x) + 3) -> x + 1, ....)
-        // * internals of Enum replaced, leading to:
-        //   Enum(equals(someFunction(y), 3)).
-        // And there are even the cases when we can parse the query, but
-        // it's logically incorrect and its formatting is a mess, such as
-        // when `lambda()` function gets substituted into a wrong place.
-        // To avoid dealing with these cases, run the check only for the
-        // queries we were able to successfully execute.
-        // Another caveat is that sometimes WITH queries are not executed,
-        // if they are not referenced by the main SELECT, so they can still
-        // have the aforementioned problems. Disable this check for such
-        // queries, for lack of a better solution.
-        // There is also a problem that fuzzer substitutes positive Int64
-        // literals or Decimal literals, which are then parsed back as
-        // UInt64, and suddenly duplicate alias substitution starts or stops
-        // working (ASTWithAlias::formatImpl) or something like that.
-        // So we compare not even the first and second formatting of the
-        // query, but second and third.
-        // If you have to add any more workarounds to this check, just remove
-        // it altogether, it's not so useful.
-        if (ast_to_process && !have_error && !queryHasWithClause(*ast_to_process))
-        {
-            ASTPtr ast_2;
-            try
-            {
-                const auto * tmp_pos = query_to_execute.c_str();
-                ast_2 = parseQuery(tmp_pos, tmp_pos + query_to_execute.size(), false /* allow_multi_statements */);
-            }
-            catch (Exception & e)
-            {
-                if (e.code() != ErrorCodes::SYNTAX_ERROR &&
-                    e.code() != ErrorCodes::TOO_DEEP_RECURSION)
-                    throw;
-            }
-
-            if (ast_2)
-            {
-                const auto text_2 = ast_2->formatForErrorMessage();
-                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 ? ast_3->formatForErrorMessage() : "";
-
-                if (text_3 != text_2)
-                {
-                    fmt::print(stderr, "Found error: The query formatting is broken.\n");
-
-                    printChangedSettings();
-
-                    fmt::print(stderr,
-                        "Got the following (different) text after formatting the fuzzed query and parsing it back:\n'{}'\n, expected:\n'{}'\n",
-                        text_3, text_2);
-                    fmt::print(stderr, "In more detail:\n");
-                    fmt::print(stderr, "AST-1 (generated by fuzzer):\n'{}'\n", ast_to_process->dumpTree());
-                    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 ? 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");
-
-                    _exit(1);
-                }
-            }
-        }
-
-        // The server is still alive so we're going to continue fuzzing.
+        // The server is still alive, so we're going to continue fuzzing.
         // Determine what we're going to use as the starting AST.
         if (have_error)
         {
@@ -1000,6 +919,7 @@ void Client::printHelpMessage(const OptionsDescription & options_description)
     std::cout << options_description.external_description.value() << "\n";
     std::cout << options_description.hosts_and_ports_description.value() << "\n";
     std::cout << "In addition, --param_name=value can be specified for substitution of parameters for parametrized queries.\n";
+    std::cout << "\nSee also: https://clickhouse.com/docs/en/integrations/sql-clients/cli\n";
 }
 
 
@@ -1010,11 +930,12 @@ void Client::addOptions(OptionsDescription & options_description)
         ("config,c", po::value<std::string>(), "config-file path (another shorthand)")
         ("connection", po::value<std::string>(), "connection to use (from the client config), by default connection name is hostname")
         ("secure,s", "Use TLS connection")
+        ("no-secure", "Don't use TLS connection")
         ("user,u", po::value<std::string>()->default_value("default"), "user")
         ("password", po::value<std::string>(), "password")
         ("ask-password", "ask-password")
-        ("ssh-key-file", po::value<std::string>(), "File containing ssh private key needed for authentication. If not set does password authentication.")
-        ("ssh-key-passphrase", po::value<std::string>(), "Passphrase for imported ssh key.")
+        ("ssh-key-file", po::value<std::string>(), "File containing the SSH private key for authenticate with the server.")
+        ("ssh-key-passphrase", po::value<std::string>(), "Passphrase for the SSH private key specified by --ssh-key-file.")
         ("quota_key", po::value<std::string>(), "A string to differentiate quotas when the user have keyed quotas configured on server")
 
         ("max_client_network_bandwidth", po::value<int>(), "the maximum speed of data exchange over the network for the client in bytes per second.")
@@ -1151,6 +1072,8 @@ void Client::processOptions(const OptionsDescription & options_description,
         interleave_queries_files = options["interleave-queries-file"].as<std::vector<std::string>>();
     if (options.count("secure"))
         config().setBool("secure", true);
+    if (options.count("no-secure"))
+        config().setBool("no-secure", true);
     if (options.count("user") && !options["user"].defaulted())
         config().setString("user", options["user"].as<std::string>());
     if (options.count("password"))
@@ -1247,27 +1170,7 @@ void Client::processConfig()
 
     pager = config().getString("pager", "");
 
-    is_default_format = !config().has("vertical") && !config().has("format");
-    if (config().has("vertical"))
-        format = config().getString("format", "Vertical");
-    else
-        format = config().getString("format", is_interactive ? "PrettyCompact" : "TabSeparated");
-
-    format_max_block_size = config().getUInt64("format_max_block_size",
-        global_context->getSettingsRef().max_block_size);
-
-    insert_format = "Values";
-
-    /// Setting value from cmd arg overrides one from config
-    if (global_context->getSettingsRef().max_insert_block_size.changed)
-    {
-        insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
-    }
-    else
-    {
-        insert_format_max_block_size = config().getUInt64("insert_format_max_block_size",
-            global_context->getSettingsRef().max_insert_block_size);
-    }
+    setDefaultFormatsFromConfiguration();
 
     global_context->setClientName(std::string(DEFAULT_CLIENT_NAME));
     global_context->setQueryKindInitial();
@@ -1452,8 +1355,8 @@ void Client::readArguments(
 }
 
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wmissing-declarations"
 
 int mainEntryClickHouseClient(int argc, char ** argv)
 {
diff --git a/programs/compressor/Compressor.cpp b/programs/compressor/Compressor.cpp
index cc25747702a..050bb495024 100644
--- a/programs/compressor/Compressor.cpp
+++ b/programs/compressor/Compressor.cpp
@@ -100,6 +100,7 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
             std::cout << "Usage: " << argv[0] << " [options] < INPUT > OUTPUT" << std::endl;
             std::cout << "Usage: " << argv[0] << " [options] INPUT OUTPUT" << std::endl;
             std::cout << desc << std::endl;
+            std::cout << "\nSee also: https://clickhouse.com/docs/en/operations/utilities/clickhouse-compressor/\n";
             return 0;
         }
 
@@ -142,7 +143,7 @@ int mainEntryClickHouseCompressor(int argc, char ** argv)
             ParserCodec codec_parser;
 
             std::string codecs_line = boost::algorithm::join(codecs, ",");
-            auto ast = parseQuery(codec_parser, "(" + codecs_line + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+            auto ast = parseQuery(codec_parser, "(" + codecs_line + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
             codec = CompressionCodecFactory::instance().get(ast, nullptr);
         }
         else
diff --git a/programs/config_tools.h.in b/programs/config_tools.h.in
index 65ef3ca762b..50a1de5628b 100644
--- a/programs/config_tools.h.in
+++ b/programs/config_tools.h.in
@@ -2,23 +2,8 @@
 
 #pragma once
 
-#cmakedefine01 ENABLE_CLICKHOUSE_SERVER
-#cmakedefine01 ENABLE_CLICKHOUSE_CLIENT
-#cmakedefine01 ENABLE_CLICKHOUSE_LOCAL
-#cmakedefine01 ENABLE_CLICKHOUSE_BENCHMARK
-#cmakedefine01 ENABLE_CLICKHOUSE_PERFORMANCE_TEST
-#cmakedefine01 ENABLE_CLICKHOUSE_COPIER
-#cmakedefine01 ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
-#cmakedefine01 ENABLE_CLICKHOUSE_COMPRESSOR
-#cmakedefine01 ENABLE_CLICKHOUSE_FORMAT
-#cmakedefine01 ENABLE_CLICKHOUSE_OBFUSCATOR
-#cmakedefine01 ENABLE_CLICKHOUSE_GIT_IMPORT
-#cmakedefine01 ENABLE_CLICKHOUSE_INSTALL
 #cmakedefine01 ENABLE_CLICKHOUSE_ODBC_BRIDGE
 #cmakedefine01 ENABLE_CLICKHOUSE_LIBRARY_BRIDGE
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER_CLIENT
 #cmakedefine01 ENABLE_CLICKHOUSE_KEEPER_CONVERTER
-#cmakedefine01 ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
-#cmakedefine01 ENABLE_CLICKHOUSE_SU
-#cmakedefine01 ENABLE_CLICKHOUSE_DISKS
diff --git a/programs/copier/Aliases.h b/programs/copier/Aliases.h
deleted file mode 100644
index 02be3441acd..00000000000
--- a/programs/copier/Aliases.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-
-#include <Poco/Util/AbstractConfiguration.h>
-
-#include <utility>
-
-namespace DB
-{
-    using ConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
-
-    using DatabaseAndTableName = std::pair<String, String>;
-    using ListOfDatabasesAndTableNames = std::vector<DatabaseAndTableName>;
-}
diff --git a/programs/copier/CMakeLists.txt b/programs/copier/CMakeLists.txt
deleted file mode 100644
index 2c17e70bc5e..00000000000
--- a/programs/copier/CMakeLists.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-set(CLICKHOUSE_COPIER_SOURCES
-        "${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopierApp.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ClusterCopier.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/Internals.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ShardPartition.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/ShardPartitionPiece.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/StatusAccumulator.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/TaskCluster.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/TaskShard.cpp"
-        "${CMAKE_CURRENT_SOURCE_DIR}/TaskTable.cpp")
-
-set (CLICKHOUSE_COPIER_LINK
-        PRIVATE
-                clickhouse_common_zookeeper
-                clickhouse_common_config
-                clickhouse_parsers
-                clickhouse_functions
-                clickhouse_table_functions
-                clickhouse_aggregate_functions
-                string_utils
-
-        PUBLIC
-                daemon
-)
-
-set(CLICKHOUSE_COPIER_INCLUDE SYSTEM PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
-
-clickhouse_program_add(copier)
diff --git a/programs/copier/ClusterCopier.cpp b/programs/copier/ClusterCopier.cpp
deleted file mode 100644
index 59505d08f5c..00000000000
--- a/programs/copier/ClusterCopier.cpp
+++ /dev/null
@@ -1,2076 +0,0 @@
-#include "ClusterCopier.h"
-
-#include "Internals.h"
-#include "StatusAccumulator.h"
-
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/ZooKeeper/KeeperException.h>
-#include <Common/randomSeed.h>
-#include <Common/setThreadName.h>
-#include <Common/CurrentMetrics.h>
-#include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/InterpreterSelectWithUnionQuery.h>
-#include <Parsers/ASTFunction.h>
-#include <Processors/Transforms/ExpressionTransform.h>
-#include <QueryPipeline/QueryPipelineBuilder.h>
-#include <QueryPipeline/Chain.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/Executors/PushingPipelineExecutor.h>
-#include <Processors/Sources/RemoteSource.h>
-#include <Processors/QueryPlan/QueryPlan.h>
-#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-
-namespace CurrentMetrics
-{
-    extern const Metric LocalThread;
-    extern const Metric LocalThreadActive;
-    extern const Metric LocalThreadScheduled;
-}
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-    extern const int LOGICAL_ERROR;
-    extern const int UNFINISHED;
-    extern const int BAD_ARGUMENTS;
-}
-
-
-void ClusterCopier::init()
-{
-    auto zookeeper = getContext()->getZooKeeper();
-
-    task_description_watch_callback = [this] (const Coordination::WatchResponse & response)
-    {
-        if (response.error != Coordination::Error::ZOK)
-            return;
-        UInt64 version = ++task_description_version;
-        LOG_INFO(log, "Task description should be updated, local version {}", version);
-    };
-
-    task_description_path = task_zookeeper_path + "/description";
-    task_cluster = std::make_unique<TaskCluster>(task_zookeeper_path, working_database_name);
-
-    reloadTaskDescription();
-
-    task_cluster->loadTasks(*task_cluster_current_config);
-    getContext()->setClustersConfig(task_cluster_current_config, false, task_cluster->clusters_prefix);
-
-    /// Set up shards and their priority
-    task_cluster->random_engine.seed(randomSeed());
-    for (auto & task_table : task_cluster->table_tasks)
-    {
-        task_table.cluster_pull = getContext()->getCluster(task_table.cluster_pull_name);
-        task_table.cluster_push = getContext()->getCluster(task_table.cluster_push_name);
-        task_table.initShards(task_cluster->random_engine);
-    }
-
-    LOG_INFO(log, "Will process {} table tasks", task_cluster->table_tasks.size());
-
-    /// Do not initialize tables, will make deferred initialization in process()
-
-    zookeeper->createAncestors(getWorkersPathVersion() + "/");
-    zookeeper->createAncestors(getWorkersPath() + "/");
-    /// Init status node
-    zookeeper->createIfNotExists(task_zookeeper_path + "/status", "{}");
-}
-
-template <typename T>
-decltype(auto) ClusterCopier::retry(T && func, UInt64 max_tries)
-{
-    std::exception_ptr exception;
-
-    if (max_tries == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot perform zero retries");
-
-    for (UInt64 try_number = 1; try_number <= max_tries; ++try_number)
-    {
-        try
-        {
-            return func();
-        }
-        catch (...)
-        {
-            exception = std::current_exception();
-            if (try_number < max_tries)
-            {
-                tryLogCurrentException(log, "Will retry");
-                std::this_thread::sleep_for(retry_delay_ms);
-            }
-        }
-    }
-
-    std::rethrow_exception(exception);
-}
-
-
-void ClusterCopier::discoverShardPartitions(const ConnectionTimeouts & timeouts, const TaskShardPtr & task_shard)
-{
-    TaskTable & task_table = task_shard->task_table;
-
-    LOG_INFO(log, "Discover partitions of shard {}", task_shard->getDescription());
-
-    auto get_partitions = [&] () { return getShardPartitions(timeouts, *task_shard); };
-    auto existing_partitions_names = retry(get_partitions, 60);
-    Strings filtered_partitions_names;
-    Strings missing_partitions;
-
-    /// Check that user specified correct partition names
-    auto check_partition_format = [] (const DataTypePtr & type, const String & partition_text_quoted)
-    {
-        MutableColumnPtr column_dummy = type->createColumn();
-        ReadBufferFromString rb(partition_text_quoted);
-
-        try
-        {
-            type->getDefaultSerialization()->deserializeTextQuoted(*column_dummy, rb, FormatSettings());
-        }
-        catch (Exception & e)
-        {
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Partition {} has incorrect format. {}", partition_text_quoted, e.displayText());
-        }
-    };
-
-    if (task_table.has_enabled_partitions)
-    {
-        /// Process partition in order specified by <enabled_partitions/>
-        for (const String & partition_name : task_table.enabled_partitions)
-        {
-            /// Check that user specified correct partition names
-            check_partition_format(task_shard->partition_key_column.type, partition_name);
-
-            auto it = existing_partitions_names.find(partition_name);
-
-            /// Do not process partition if it is not in enabled_partitions list
-            if (it == existing_partitions_names.end())
-            {
-                missing_partitions.emplace_back(partition_name);
-                continue;
-            }
-
-            filtered_partitions_names.emplace_back(*it);
-        }
-
-        for (const String & partition_name : existing_partitions_names)
-        {
-            if (!task_table.enabled_partitions_set.contains(partition_name))
-            {
-                LOG_INFO(log, "Partition {} will not be processed, since it is not in enabled_partitions of {}", partition_name, task_table.table_id);
-            }
-        }
-    }
-    else
-    {
-        for (const String & partition_name : existing_partitions_names)
-            filtered_partitions_names.emplace_back(partition_name);
-    }
-
-    for (const String & partition_name : filtered_partitions_names)
-    {
-        const size_t number_of_splits = task_table.number_of_splits;
-        task_shard->partition_tasks.emplace(partition_name, ShardPartition(*task_shard, partition_name, number_of_splits));
-        task_shard->checked_partitions.emplace(partition_name, true);
-
-        auto shard_partition_it = task_shard->partition_tasks.find(partition_name);
-        PartitionPieces & shard_partition_pieces = shard_partition_it->second.pieces;
-
-        for (size_t piece_number = 0; piece_number < number_of_splits; ++piece_number)
-        {
-            bool res = checkPresentPartitionPiecesOnCurrentShard(timeouts, *task_shard, partition_name, piece_number);
-            shard_partition_pieces.emplace_back(shard_partition_it->second, piece_number, res);
-        }
-    }
-
-    if (!missing_partitions.empty())
-    {
-        WriteBufferFromOwnString ss;
-        for (const String & missing_partition : missing_partitions)
-            ss << " " << missing_partition;
-
-        LOG_WARNING(log, "There are no {} partitions from enabled_partitions in shard {} :{}", missing_partitions.size(), task_shard->getDescription(), ss.str());
-    }
-
-    LOG_INFO(log, "Will copy {} partitions from shard {}", task_shard->partition_tasks.size(), task_shard->getDescription());
-}
-
-void ClusterCopier::discoverTablePartitions(const ConnectionTimeouts & timeouts, TaskTable & task_table, UInt64 num_threads)
-{
-    /// Fetch partitions list from a shard
-    {
-        ThreadPool thread_pool(CurrentMetrics::LocalThread, CurrentMetrics::LocalThreadActive, CurrentMetrics::LocalThreadScheduled, num_threads ? num_threads : 2 * getNumberOfPhysicalCPUCores());
-
-        for (const TaskShardPtr & task_shard : task_table.all_shards)
-            thread_pool.scheduleOrThrowOnError([this, timeouts, task_shard]()
-            {
-                setThreadName("DiscoverPartns");
-                discoverShardPartitions(timeouts, task_shard);
-            });
-
-        LOG_INFO(log, "Waiting for {} setup jobs", thread_pool.active());
-        thread_pool.wait();
-    }
-}
-
-void ClusterCopier::uploadTaskDescription(const std::string & task_path, const std::string & task_file, const bool force)
-{
-    auto local_task_description_path = task_path + "/description";
-
-    String task_config_str;
-    {
-        ReadBufferFromFile in(task_file);
-        readStringUntilEOF(task_config_str, in);
-    }
-    if (task_config_str.empty())
-        return;
-
-    auto zookeeper = getContext()->getZooKeeper();
-
-    zookeeper->createAncestors(local_task_description_path);
-    auto code = zookeeper->tryCreate(local_task_description_path, task_config_str, zkutil::CreateMode::Persistent);
-    if (code != Coordination::Error::ZOK && force)
-        zookeeper->createOrUpdate(local_task_description_path, task_config_str, zkutil::CreateMode::Persistent);
-
-    LOG_INFO(log, "Task description {} uploaded to {} with result {} ({})",
-        ((code != Coordination::Error::ZOK && !force) ? "not " : ""), local_task_description_path, code, Coordination::errorMessage(code));
-}
-
-void ClusterCopier::reloadTaskDescription()
-{
-    auto zookeeper = getContext()->getZooKeeper();
-    task_description_watch_zookeeper = zookeeper;
-
-    Coordination::Stat stat{};
-
-    /// It will throw exception if such a node doesn't exist.
-    auto task_config_str = zookeeper->get(task_description_path, &stat);
-
-    LOG_INFO(log, "Loading task description");
-    task_cluster_current_config = getConfigurationFromXMLString(task_config_str);
-
-    /// Setup settings
-    task_cluster->reloadSettings(*task_cluster_current_config);
-    getContext()->setSettings(task_cluster->settings_common);
-}
-
-void ClusterCopier::updateConfigIfNeeded()
-{
-    UInt64 version_to_update = task_description_version;
-    bool is_outdated_version = task_description_current_version != version_to_update;
-    bool is_expired_session  = !task_description_watch_zookeeper || task_description_watch_zookeeper->expired();
-
-    if (!is_outdated_version && !is_expired_session)
-        return;
-
-    LOG_INFO(log, "Updating task description");
-    reloadTaskDescription();
-
-    task_description_current_version = version_to_update;
-}
-
-void ClusterCopier::process(const ConnectionTimeouts & timeouts)
-{
-    for (TaskTable & task_table : task_cluster->table_tasks)
-    {
-        LOG_INFO(log, "Process table task {} with {} shards, {} of them are local ones", task_table.table_id, task_table.all_shards.size(), task_table.local_shards.size());
-
-        if (task_table.all_shards.empty())
-            continue;
-
-        /// Discover partitions of each shard and total set of partitions
-        if (!task_table.has_enabled_partitions)
-        {
-            /// If there are no specified enabled_partitions, we must discover them manually
-            discoverTablePartitions(timeouts, task_table);
-
-            /// After partitions of each shard are initialized, initialize cluster partitions
-            for (const TaskShardPtr & task_shard : task_table.all_shards)
-            {
-                for (const auto & partition_elem : task_shard->partition_tasks)
-                {
-                    const String & partition_name = partition_elem.first;
-                    task_table.cluster_partitions.emplace(partition_name, ClusterPartition{});
-                }
-            }
-
-            for (auto & partition_elem : task_table.cluster_partitions)
-            {
-                const String & partition_name = partition_elem.first;
-
-                for (const TaskShardPtr & task_shard : task_table.all_shards)
-                    task_shard->checked_partitions.emplace(partition_name);
-
-                task_table.ordered_partition_names.emplace_back(partition_name);
-            }
-        }
-        else
-        {
-            /// If enabled_partitions are specified, assume that each shard has all partitions
-            /// We will refine partition set of each shard in future
-
-            for (const String & partition_name : task_table.enabled_partitions)
-            {
-                task_table.cluster_partitions.emplace(partition_name, ClusterPartition{});
-                task_table.ordered_partition_names.emplace_back(partition_name);
-            }
-        }
-
-        task_table.watch.restart();
-
-        /// Retry table processing
-        bool table_is_done = false;
-        for (UInt64 num_table_tries = 1; num_table_tries <= max_table_tries; ++num_table_tries)
-        {
-            if (tryProcessTable(timeouts, task_table))
-            {
-                table_is_done = true;
-                break;
-            }
-        }
-
-        if (!table_is_done)
-        {
-            throw Exception(ErrorCodes::UNFINISHED, "Too many tries to process table {}. Abort remaining execution",
-                            task_table.table_id);
-        }
-    }
-}
-
-/// Protected section
-
-
-/*
- * Creates task worker node and checks maximum number of workers not to exceed the limit.
- * To achieve this we have to check version of workers_version_path node and create current_worker_path
- * node atomically.
- * */
-
-zkutil::EphemeralNodeHolder::Ptr ClusterCopier::createTaskWorkerNodeAndWaitIfNeed(
-    const zkutil::ZooKeeperPtr & zookeeper,
-    const String & description,
-    bool unprioritized)
-{
-    std::chrono::milliseconds current_sleep_time = retry_delay_ms;
-    static constexpr std::chrono::milliseconds max_sleep_time(30000); // 30 sec
-
-    if (unprioritized)
-        std::this_thread::sleep_for(current_sleep_time);
-
-    String workers_version_path = getWorkersPathVersion();
-    String workers_path         = getWorkersPath();
-    String current_worker_path  = getCurrentWorkerNodePath();
-
-    UInt64 num_bad_version_errors = 0;
-
-    while (true)
-    {
-        updateConfigIfNeeded();
-
-        Coordination::Stat stat;
-        zookeeper->get(workers_version_path, &stat);
-        auto version = stat.version;
-        zookeeper->get(workers_path, &stat);
-
-        if (static_cast<UInt64>(stat.numChildren) >= task_cluster->max_workers)
-        {
-            LOG_INFO(log, "Too many workers ({}, maximum {}). Postpone processing {}", stat.numChildren, task_cluster->max_workers, description);
-
-            if (unprioritized)
-                current_sleep_time = std::min(max_sleep_time, current_sleep_time + retry_delay_ms);
-
-            std::this_thread::sleep_for(current_sleep_time);
-            num_bad_version_errors = 0;
-        }
-        else
-        {
-            Coordination::Requests ops;
-            ops.emplace_back(zkutil::makeSetRequest(workers_version_path, description, version));
-            ops.emplace_back(zkutil::makeCreateRequest(current_worker_path, description, zkutil::CreateMode::Ephemeral));
-            Coordination::Responses responses;
-            auto code = zookeeper->tryMulti(ops, responses);
-
-            if (code == Coordination::Error::ZOK || code == Coordination::Error::ZNODEEXISTS)
-                return zkutil::EphemeralNodeHolder::existing(current_worker_path, *zookeeper);
-
-            if (code == Coordination::Error::ZBADVERSION)
-            {
-                ++num_bad_version_errors;
-
-                /// Try to make fast retries
-                if (num_bad_version_errors > 3)
-                {
-                    LOG_INFO(log, "A concurrent worker has just been added, will check free worker slots again");
-                    std::chrono::milliseconds random_sleep_time(std::uniform_int_distribution<int>(1, 1000)(task_cluster->random_engine));
-                    std::this_thread::sleep_for(random_sleep_time);
-                    num_bad_version_errors = 0;
-                }
-            }
-            else
-                throw Coordination::Exception(code);
-        }
-    }
-}
-
-
-bool ClusterCopier::checkPartitionPieceIsClean(
-        const zkutil::ZooKeeperPtr & zookeeper,
-        const CleanStateClock & clean_state_clock,
-        const String & task_status_path)
-{
-    LogicalClock task_start_clock;
-
-    Coordination::Stat stat{};
-    if (zookeeper->exists(task_status_path, &stat))
-        task_start_clock = LogicalClock(stat.mzxid);
-
-    return clean_state_clock.is_clean() && (!task_start_clock.hasHappened() || clean_state_clock.discovery_zxid <= task_start_clock);
-}
-
-
-bool ClusterCopier::checkAllPiecesInPartitionAreDone(const TaskTable & task_table, const String & partition_name, const TasksShard & shards_with_partition)
-{
-    bool answer = true;
-    for (size_t piece_number = 0; piece_number < task_table.number_of_splits; ++piece_number)
-    {
-        bool piece_is_done = checkPartitionPieceIsDone(task_table, partition_name, piece_number, shards_with_partition);
-        if (!piece_is_done)
-            LOG_INFO(log, "Partition {} piece {} is not already done.", partition_name, piece_number);
-        answer &= piece_is_done;
-    }
-
-    return answer;
-}
-
-
-/* The same as function above
- * Assume that we don't know on which shards do we have partition certain piece.
- * We'll check them all (I mean shards that contain the whole partition)
- * And shards that don't have certain piece MUST mark that piece is_done true.
- * */
-bool ClusterCopier::checkPartitionPieceIsDone(const TaskTable & task_table, const String & partition_name,
-                               size_t piece_number, const TasksShard & shards_with_partition)
-{
-    LOG_INFO(log, "Check that all shards processed partition {} piece {} successfully", partition_name, piece_number);
-
-    auto zookeeper = getContext()->getZooKeeper();
-
-    /// Collect all shards that contain partition piece number piece_number.
-    Strings piece_status_paths;
-    for (const auto & shard : shards_with_partition)
-    {
-        ShardPartition & task_shard_partition = shard->partition_tasks.find(partition_name)->second;
-        ShardPartitionPiece & shard_partition_piece = task_shard_partition.pieces[piece_number];
-        piece_status_paths.emplace_back(shard_partition_piece.getShardStatusPath());
-    }
-
-    std::vector<int64_t> zxid1, zxid2;
-
-    try
-    {
-        std::vector<zkutil::ZooKeeper::FutureGet> get_futures;
-        for (const String & path : piece_status_paths)
-            get_futures.emplace_back(zookeeper->asyncGet(path));
-
-        // Check that state is Finished and remember zxid
-        for (auto & future : get_futures)
-        {
-            auto res = future.get();
-
-            TaskStateWithOwner status = TaskStateWithOwner::fromString(res.data);
-            if (status.state != TaskState::Finished)
-            {
-                LOG_INFO(log, "The task {} is being rewritten by {}. Partition piece will be rechecked", res.data, status.owner);
-                return false;
-            }
-
-            zxid1.push_back(res.stat.pzxid);
-        }
-
-        const String piece_is_dirty_flag_path = task_table.getCertainPartitionPieceIsDirtyPath(partition_name, piece_number);
-        const String piece_is_dirty_cleaned_path = task_table.getCertainPartitionPieceIsCleanedPath(partition_name, piece_number);
-        const String piece_task_status_path = task_table.getCertainPartitionPieceTaskStatusPath(partition_name, piece_number);
-
-        CleanStateClock clean_state_clock (zookeeper, piece_is_dirty_flag_path, piece_is_dirty_cleaned_path);
-
-        const bool is_clean = checkPartitionPieceIsClean(zookeeper, clean_state_clock, piece_task_status_path);
-
-
-        if (!is_clean)
-        {
-            LOG_INFO(log, "Partition {} become dirty", partition_name);
-            return false;
-        }
-
-        get_futures.clear();
-        for (const String & path : piece_status_paths)
-            get_futures.emplace_back(zookeeper->asyncGet(path));
-
-        // Remember zxid of states again
-        for (auto & future : get_futures)
-        {
-            auto res = future.get();
-            zxid2.push_back(res.stat.pzxid);
-        }
-    }
-    catch (const Coordination::Exception & e)
-    {
-        LOG_INFO(log, "A ZooKeeper error occurred while checking partition {} piece number {}. Will recheck the partition. Error: {}", partition_name, toString(piece_number), e.displayText());
-        return false;
-    }
-
-    // If all task is finished and zxid is not changed then partition could not become dirty again
-    for (UInt64 shard_num = 0; shard_num < piece_status_paths.size(); ++shard_num)
-    {
-        if (zxid1[shard_num] != zxid2[shard_num])
-        {
-            LOG_INFO(log, "The task {} is being modified now. Partition piece will be rechecked", piece_status_paths[shard_num]);
-            return false;
-        }
-    }
-
-    LOG_INFO(log, "Partition {} piece number {} is copied successfully", partition_name, toString(piece_number));
-    return true;
-}
-
-
-TaskStatus ClusterCopier::tryMoveAllPiecesToDestinationTable(const TaskTable & task_table, const String & partition_name)
-{
-    bool inject_fault = false;
-    if (move_fault_probability > 0)
-    {
-        double value = std::uniform_real_distribution<>(0, 1)(task_table.task_cluster.random_engine);
-        inject_fault = value < move_fault_probability;
-    }
-
-    LOG_INFO(log, "Try to move {} to destination table", partition_name);
-
-    auto zookeeper = getContext()->getZooKeeper();
-
-    const auto current_partition_attach_is_active = task_table.getPartitionAttachIsActivePath(partition_name);
-    const auto current_partition_attach_is_done   = task_table.getPartitionAttachIsDonePath(partition_name);
-
-    /// Create ephemeral node to mark that we are active and process the partition
-    zookeeper->createAncestors(current_partition_attach_is_active);
-    zkutil::EphemeralNodeHolderPtr partition_attach_node_holder;
-    try
-    {
-        partition_attach_node_holder = zkutil::EphemeralNodeHolder::create(current_partition_attach_is_active, *zookeeper, host_id);
-    }
-    catch (const Coordination::Exception & e)
-    {
-        if (e.code == Coordination::Error::ZNODEEXISTS)
-        {
-            LOG_INFO(log, "Someone is already moving pieces {}", current_partition_attach_is_active);
-            return TaskStatus::Active;
-        }
-
-        throw;
-    }
-
-
-    /// Exit if task has been already processed;
-    /// create blocking node to signal cleaning up if it is abandoned
-    {
-        String status_data;
-        if (zookeeper->tryGet(current_partition_attach_is_done, status_data))
-        {
-            TaskStateWithOwner status = TaskStateWithOwner::fromString(status_data);
-            if (status.state == TaskState::Finished)
-            {
-                LOG_INFO(log, "All pieces for partition from this task {} has been successfully moved to destination table by {}", current_partition_attach_is_active, status.owner);
-                return TaskStatus::Finished;
-            }
-
-            /// Task is abandoned, because previously we created ephemeral node, possibly in other copier's process.
-            /// Initialize DROP PARTITION
-            LOG_INFO(log, "Moving piece for partition {} has not been successfully finished by {}. Will try to move by myself.", current_partition_attach_is_active, status.owner);
-
-            /// Remove is_done marker.
-            zookeeper->remove(current_partition_attach_is_done);
-        }
-    }
-
-
-    /// Try start processing, create node about it
-    {
-        String start_state = TaskStateWithOwner::getData(TaskState::Started, host_id);
-        zookeeper->create(current_partition_attach_is_done, start_state, zkutil::CreateMode::Persistent);
-    }
-
-
-    /// Try to drop destination partition in original table
-    if (task_table.allow_to_drop_target_partitions)
-    {
-        DatabaseAndTableName original_table = task_table.table_push;
-
-        WriteBufferFromOwnString ss;
-        ss << "ALTER TABLE " << getQuotedTable(original_table) << ((partition_name == "'all'") ? " DROP PARTITION ID " : " DROP PARTITION ") << partition_name;
-
-        UInt64 num_shards_drop_partition = executeQueryOnCluster(task_table.cluster_push, ss.str(), task_cluster->settings_push, ClusterExecutionMode::ON_EACH_SHARD);
-        if (num_shards_drop_partition != task_table.cluster_push->getShardCount())
-            return TaskStatus::Error;
-
-        LOG_INFO(log, "Drop partition {} in original table {} have been executed successfully on {} shards of {}",
-            partition_name, getQuotedTable(original_table), num_shards_drop_partition, task_table.cluster_push->getShardCount());
-    }
-
-    /// Move partition to original destination table.
-    for (size_t current_piece_number = 0; current_piece_number < task_table.number_of_splits; ++current_piece_number)
-    {
-        LOG_INFO(log, "Trying to move partition {} piece {} to original table", partition_name, toString(current_piece_number));
-
-        ASTPtr query_alter_ast;
-        String query_alter_ast_string;
-
-        DatabaseAndTableName original_table = task_table.table_push;
-        DatabaseAndTableName helping_table = DatabaseAndTableName(original_table.first,
-                                                                  original_table.second + "_piece_" +
-                                                                  toString(current_piece_number));
-
-        Settings settings_push = task_cluster->settings_push;
-        ClusterExecutionMode execution_mode = ClusterExecutionMode::ON_EACH_NODE;
-
-        if (settings_push.alter_sync == 1)
-            execution_mode = ClusterExecutionMode::ON_EACH_SHARD;
-
-        query_alter_ast_string += " ALTER TABLE " + getQuotedTable(original_table) +
-                                  ((partition_name == "'all'") ? " ATTACH PARTITION ID " : " ATTACH PARTITION ") + partition_name +
-                                  " FROM " + getQuotedTable(helping_table);
-
-        LOG_INFO(log, "Executing ALTER query: {}", query_alter_ast_string);
-
-        try
-        {
-            /// Try attach partition on each shard
-            UInt64 num_nodes = executeQueryOnCluster(
-                task_table.cluster_push,
-                query_alter_ast_string,
-                task_cluster->settings_push,
-                execution_mode);
-
-            if (settings_push.alter_sync == 1)
-            {
-                LOG_INFO(
-                    log,
-                    "Destination tables {} have been executed alter query successfully on {} shards of {}",
-                    getQuotedTable(task_table.table_push),
-                    num_nodes,
-                    task_table.cluster_push->getShardCount());
-
-                if (num_nodes != task_table.cluster_push->getShardCount())
-                    return TaskStatus::Error;
-            }
-            else
-            {
-                LOG_INFO(log, "Number of nodes that executed ALTER query successfully : {}", toString(num_nodes));
-            }
-        }
-        catch (...)
-        {
-            LOG_INFO(log, "Error while moving partition {} piece {} to original table", partition_name, toString(current_piece_number));
-            LOG_WARNING(log, "In case of non-replicated tables it can cause duplicates.");
-            throw;
-        }
-
-        if (inject_fault)
-            throw Exception(ErrorCodes::UNFINISHED, "Copy fault injection is activated");
-    }
-
-    /// Create node to signal that we finished moving
-    /// Also increment a counter of processed partitions
-    {
-        const auto state_finished = TaskStateWithOwner::getData(TaskState::Finished, host_id);
-        const auto task_status = task_zookeeper_path + "/status";
-
-        /// Try until success
-        while (true)
-        {
-            Coordination::Stat stat;
-            auto status_json = zookeeper->get(task_status, &stat);
-            auto statuses = StatusAccumulator::fromJSON(status_json);
-
-            /// Increment status for table.
-            (*statuses)[task_table.name_in_config].processed_partitions_count += 1;
-            auto statuses_to_commit = StatusAccumulator::serializeToJSON(statuses);
-
-            Coordination::Requests ops;
-            ops.emplace_back(zkutil::makeSetRequest(current_partition_attach_is_done, state_finished, 0));
-            ops.emplace_back(zkutil::makeSetRequest(task_status, statuses_to_commit, stat.version));
-
-            Coordination::Responses responses;
-            Coordination::Error code = zookeeper->tryMulti(ops, responses);
-
-            if (code == Coordination::Error::ZOK)
-                break;
-        }
-    }
-
-    return TaskStatus::Finished;
-}
-
-/// This is needed to create internal Distributed table
-/// Removes column's TTL expression from `CREATE` query
-/// Removes MATEREALIZED or ALIAS columns not to copy additional and useless data over the network.
-/// Removes data skipping indices.
-ASTPtr ClusterCopier::removeAliasMaterializedAndTTLColumnsFromCreateQuery(const ASTPtr & query_ast, bool allow_to_copy_alias_and_materialized_columns)
-{
-    const ASTs & column_asts = query_ast->as<ASTCreateQuery &>().columns_list->columns->children;
-    auto new_columns = std::make_shared<ASTExpressionList>();
-
-    for (const ASTPtr & column_ast : column_asts)
-    {
-        const auto & column = column_ast->as<ASTColumnDeclaration &>();
-
-        /// Skip this columns
-        if (!column.default_specifier.empty() && !allow_to_copy_alias_and_materialized_columns)
-        {
-            ColumnDefaultKind kind = columnDefaultKindFromString(column.default_specifier);
-            if (kind == ColumnDefaultKind::Materialized || kind == ColumnDefaultKind::Alias)
-                continue;
-        }
-
-        /// Remove TTL on columns definition.
-        auto new_column_ast = column_ast->clone();
-        auto & new_column = new_column_ast->as<ASTColumnDeclaration &>();
-        if (new_column.ttl)
-            new_column.ttl.reset();
-
-        new_columns->children.emplace_back(new_column_ast);
-    }
-
-    ASTPtr new_query_ast = query_ast->clone();
-    auto & new_query = new_query_ast->as<ASTCreateQuery &>();
-
-    auto new_columns_list = std::make_shared<ASTColumns>();
-    new_columns_list->set(new_columns_list->columns, new_columns);
-
-    /// Skip indices and projections are not needed, because distributed table doesn't support it.
-
-    new_query.replace(new_query.columns_list, new_columns_list);
-
-    return new_query_ast;
-}
-
-/// Replaces ENGINE and table name in a create query
-std::shared_ptr<ASTCreateQuery> rewriteCreateQueryStorage(const ASTPtr & create_query_ast,
-                                                          const DatabaseAndTableName & new_table,
-                                                          const ASTPtr & new_storage_ast)
-{
-    const auto & create = create_query_ast->as<ASTCreateQuery &>();
-    auto res = std::make_shared<ASTCreateQuery>(create);
-
-    if (create.storage == nullptr || new_storage_ast == nullptr)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Storage is not specified");
-
-    res->setDatabase(new_table.first);
-    res->setTable(new_table.second);
-
-    res->children.clear();
-    res->set(res->columns_list, create.columns_list->clone());
-    res->set(res->storage, new_storage_ast->clone());
-    /// Just to make it better and don't store additional flag like `is_table_created` somewhere else
-    res->if_not_exists = true;
-
-    return res;
-}
-
-
-bool ClusterCopier::tryDropPartitionPiece(
-        ShardPartition & task_partition,
-        const size_t current_piece_number,
-        const zkutil::ZooKeeperPtr & zookeeper,
-        const CleanStateClock & clean_state_clock)
-{
-    if (is_safe_mode)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "DROP PARTITION is prohibited in safe mode");
-
-    TaskTable & task_table = task_partition.task_shard.task_table;
-    ShardPartitionPiece & partition_piece = task_partition.pieces[current_piece_number];
-
-    const String current_shards_path                  = partition_piece.getPartitionPieceShardsPath();
-    const String current_partition_active_workers_dir = partition_piece.getPartitionPieceActiveWorkersPath();
-    const String is_dirty_flag_path                   = partition_piece.getPartitionPieceIsDirtyPath();
-    const String dirty_cleaner_path                   = partition_piece.getPartitionPieceCleanerPath();
-    const String is_dirty_cleaned_path                = partition_piece.getPartitionPieceIsCleanedPath();
-
-    zkutil::EphemeralNodeHolder::Ptr cleaner_holder;
-    try
-    {
-        cleaner_holder = zkutil::EphemeralNodeHolder::create(dirty_cleaner_path, *zookeeper, host_id);
-    }
-    catch (const Coordination::Exception & e)
-    {
-        if (e.code == Coordination::Error::ZNODEEXISTS)
-        {
-            LOG_INFO(log, "Partition {} piece {} is cleaning now by somebody, sleep", task_partition.name, toString(current_piece_number));
-            std::this_thread::sleep_for(retry_delay_ms);
-            return false;
-        }
-
-        throw;
-    }
-
-    Coordination::Stat stat{};
-    if (zookeeper->exists(current_partition_active_workers_dir, &stat))
-    {
-        if (stat.numChildren != 0)
-        {
-            LOG_INFO(log, "Partition {} contains {} active workers while trying to drop it. Going to sleep.", task_partition.name, stat.numChildren);
-            std::this_thread::sleep_for(retry_delay_ms);
-            return false;
-        }
-        else
-        {
-            zookeeper->remove(current_partition_active_workers_dir);
-        }
-    }
-
-    {
-        zkutil::EphemeralNodeHolder::Ptr active_workers_lock;
-        try
-        {
-            active_workers_lock = zkutil::EphemeralNodeHolder::create(current_partition_active_workers_dir, *zookeeper, host_id);
-        }
-        catch (const Coordination::Exception & e)
-        {
-            if (e.code == Coordination::Error::ZNODEEXISTS)
-            {
-                LOG_INFO(log, "Partition {} is being filled now by somebody, sleep", task_partition.name);
-                return false;
-            }
-
-            throw;
-        }
-
-        // Lock the dirty flag
-        zookeeper->set(is_dirty_flag_path, host_id, clean_state_clock.discovery_version.value());
-        zookeeper->tryRemove(partition_piece.getPartitionPieceCleanStartPath());
-        CleanStateClock my_clock(zookeeper, is_dirty_flag_path, is_dirty_cleaned_path);
-
-        /// Remove all status nodes
-        {
-            Strings children;
-            if (zookeeper->tryGetChildren(current_shards_path, children) == Coordination::Error::ZOK)
-                for (const auto & child : children)
-                {
-                    zookeeper->removeRecursive(current_shards_path + "/" + child);
-                }
-        }
-
-
-        DatabaseAndTableName original_table = task_table.table_push;
-        DatabaseAndTableName helping_table = DatabaseAndTableName(original_table.first, original_table.second + "_piece_" + toString(current_piece_number));
-
-        String query = "ALTER TABLE " + getQuotedTable(helping_table);
-        query += ((task_partition.name == "'all'") ? " DROP PARTITION ID " : " DROP PARTITION ")  + task_partition.name + "";
-
-        /// TODO: use this statement after servers will be updated up to 1.1.54310
-        // query += " DROP PARTITION ID '" + task_partition.name + "'";
-
-        ClusterPtr & cluster_push = task_table.cluster_push;
-        Settings settings_push = task_cluster->settings_push;
-
-        /// It is important, DROP PARTITION must be done synchronously
-        settings_push.alter_sync = 2;
-
-        LOG_INFO(log, "Execute distributed DROP PARTITION: {}", query);
-        /// We have to drop partition_piece on each replica
-        size_t num_shards = executeQueryOnCluster(
-                cluster_push, query,
-                settings_push,
-                ClusterExecutionMode::ON_EACH_NODE);
-
-        LOG_INFO(log, "DROP PARTITION was successfully executed on {} nodes of a cluster.", num_shards);
-
-        /// Update the locking node
-        if (!my_clock.is_stale())
-        {
-            zookeeper->set(is_dirty_flag_path, host_id, my_clock.discovery_version.value());
-            if (my_clock.clean_state_version)
-                zookeeper->set(is_dirty_cleaned_path, host_id, my_clock.clean_state_version.value());
-            else
-                zookeeper->create(is_dirty_cleaned_path, host_id, zkutil::CreateMode::Persistent);
-        }
-        else
-        {
-            LOG_INFO(log, "Clean state is altered when dropping the partition, cowardly bailing");
-            /// clean state is stale
-            return false;
-        }
-
-        LOG_INFO(log, "Partition {} piece {} was dropped on cluster {}", task_partition.name, toString(current_piece_number), task_table.cluster_push_name);
-        if (zookeeper->tryCreate(current_shards_path, host_id, zkutil::CreateMode::Persistent) == Coordination::Error::ZNODEEXISTS)
-            zookeeper->set(current_shards_path, host_id);
-    }
-
-    LOG_INFO(log, "Partition {} piece {} is safe for work now.", task_partition.name, toString(current_piece_number));
-    return true;
-}
-
-bool ClusterCopier::tryProcessTable(const ConnectionTimeouts & timeouts, TaskTable & task_table)
-{
-    /// Create destination table
-    TaskStatus task_status = TaskStatus::Error;
-
-    task_status = tryCreateDestinationTable(timeouts, task_table);
-    /// Exit if success
-    if (task_status != TaskStatus::Finished)
-    {
-        LOG_WARNING(log, "Create destination table failed ");
-        return false;
-    }
-
-    /// Set all_partitions_count for table in Zookeeper
-    auto zookeeper = getContext()->getZooKeeper();
-    while (true)
-    {
-        Coordination::Stat stat;
-        auto status_json = zookeeper->get(task_zookeeper_path + "/status", &stat);
-        auto statuses = StatusAccumulator::fromJSON(status_json);
-
-        /// Exit if someone already set the initial value for this table.
-        if (statuses->find(task_table.name_in_config) != statuses->end())
-            break;
-        (*statuses)[task_table.name_in_config] = StatusAccumulator::TableStatus
-        {
-            /*all_partitions_count=*/task_table.ordered_partition_names.size(),
-            /*processed_partition_count=*/0
-        };
-
-        auto statuses_to_commit = StatusAccumulator::serializeToJSON(statuses);
-        auto error = zookeeper->trySet(task_zookeeper_path + "/status", statuses_to_commit, stat.version);
-        if (error == Coordination::Error::ZOK)
-            break;
-    }
-
-
-    /// An heuristic: if previous shard is already done, then check next one without sleeps due to max_workers constraint
-    bool previous_shard_is_instantly_finished = false;
-
-    /// Process each partition that is present in cluster
-    for (const String & partition_name : task_table.ordered_partition_names)
-    {
-        if (!task_table.cluster_partitions.contains(partition_name))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "There are no expected partition {}. It is a bug", partition_name);
-
-        ClusterPartition & cluster_partition = task_table.cluster_partitions[partition_name];
-
-        Stopwatch watch;
-        /// We will check all the shards of the table and check if they contain current partition.
-        TasksShard expected_shards;
-        UInt64 num_failed_shards = 0;
-
-        ++cluster_partition.total_tries;
-
-        LOG_INFO(log, "Processing partition {} for the whole cluster", partition_name);
-
-        /// Process each source shard having current partition and copy current partition
-        /// NOTE: shards are sorted by "distance" to current host
-        bool has_shard_to_process = false;
-        for (const TaskShardPtr & shard : task_table.all_shards)
-        {
-            /// Does shard have a node with current partition?
-            if (!shard->partition_tasks.contains(partition_name))
-            {
-                /// If not, did we check existence of that partition previously?
-                if (!shard->checked_partitions.contains(partition_name))
-                {
-                    auto check_shard_has_partition = [&] () { return checkShardHasPartition(timeouts, *shard, partition_name); };
-                    bool has_partition = retry(check_shard_has_partition);
-
-                    shard->checked_partitions.emplace(partition_name);
-
-                    if (has_partition)
-                    {
-                        const size_t number_of_splits = task_table.number_of_splits;
-                        shard->partition_tasks.emplace(partition_name, ShardPartition(*shard, partition_name, number_of_splits));
-                        LOG_INFO(log, "Discovered partition {} in shard {}", partition_name, shard->getDescription());
-                        /// To save references in the future.
-                        auto shard_partition_it = shard->partition_tasks.find(partition_name);
-                        PartitionPieces & shard_partition_pieces = shard_partition_it->second.pieces;
-
-                        for (size_t piece_number = 0; piece_number < number_of_splits; ++piece_number)
-                        {
-                            auto res = checkPresentPartitionPiecesOnCurrentShard(timeouts, *shard, partition_name, piece_number);
-                            shard_partition_pieces.emplace_back(shard_partition_it->second, piece_number, res);
-                        }
-                    }
-                    else
-                    {
-                        LOG_INFO(log, "Found that shard {} does not contain current partition {}", shard->getDescription(), partition_name);
-                        continue;
-                    }
-                }
-                else
-                {
-                    /// We have already checked that partition, but did not discover it
-                    previous_shard_is_instantly_finished = true;
-                    continue;
-                }
-            }
-
-            auto it_shard_partition = shard->partition_tasks.find(partition_name);
-            /// Previously when we discovered that shard does not contain current partition, we skipped it.
-            /// At this moment partition have to be present.
-            if (it_shard_partition == shard->partition_tasks.end())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "There are no such partition in a shard. This is a bug.");
-            auto & partition = it_shard_partition->second;
-
-            expected_shards.emplace_back(shard);
-
-            /// Do not sleep if there is a sequence of already processed shards to increase startup
-            bool is_unprioritized_task = !previous_shard_is_instantly_finished && shard->priority.is_remote;
-            task_status = TaskStatus::Error;
-            bool was_error = false;
-            has_shard_to_process = true;
-            for (UInt64 try_num = 1; try_num <= max_shard_partition_tries; ++try_num)
-            {
-                task_status = tryProcessPartitionTask(timeouts, partition, is_unprioritized_task);
-
-                /// Exit if success
-                if (task_status == TaskStatus::Finished)
-                    break;
-
-                was_error = true;
-
-                /// Skip if the task is being processed by someone
-                if (task_status == TaskStatus::Active)
-                    break;
-
-                /// Repeat on errors
-                std::this_thread::sleep_for(retry_delay_ms);
-            }
-
-            if (task_status == TaskStatus::Error)
-                ++num_failed_shards;
-
-            previous_shard_is_instantly_finished = !was_error;
-        }
-
-        cluster_partition.elapsed_time_seconds += watch.elapsedSeconds();
-
-        /// Check that whole cluster partition is done
-        /// Firstly check the number of failed partition tasks, then look into ZooKeeper and ensure that each partition is done
-        bool partition_copying_is_done = num_failed_shards == 0;
-        try
-        {
-            partition_copying_is_done =
-                    !has_shard_to_process
-                    || (partition_copying_is_done && checkAllPiecesInPartitionAreDone(task_table, partition_name, expected_shards));
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log);
-            partition_copying_is_done = false;
-        }
-
-
-        bool partition_moving_is_done = false;
-        /// Try to move only if all pieces were copied.
-        if (partition_copying_is_done)
-        {
-            for (UInt64 try_num = 0; try_num < max_shard_partition_piece_tries_for_alter; ++try_num)
-            {
-                try
-                {
-                    auto res = tryMoveAllPiecesToDestinationTable(task_table, partition_name);
-                    /// Exit and mark current task is done.
-                    if (res == TaskStatus::Finished)
-                    {
-                        partition_moving_is_done = true;
-                        break;
-                    }
-
-                    /// Exit if this task is active.
-                    if (res == TaskStatus::Active)
-                        break;
-
-                    /// Repeat on errors.
-                    std::this_thread::sleep_for(retry_delay_ms);
-                }
-                catch (...)
-                {
-                    tryLogCurrentException(log, "Some error occurred while moving pieces to destination table for partition " + partition_name);
-                }
-            }
-        }
-
-        if (partition_copying_is_done && partition_moving_is_done)
-        {
-            task_table.finished_cluster_partitions.emplace(partition_name);
-
-            task_table.bytes_copied += cluster_partition.bytes_copied;
-            task_table.rows_copied += cluster_partition.rows_copied;
-            double elapsed = cluster_partition.elapsed_time_seconds;
-
-            LOG_INFO(log, "It took {} seconds to copy partition {}: {} uncompressed bytes, {} rows and {} source blocks are copied",
-                elapsed, partition_name,
-                formatReadableSizeWithDecimalSuffix(cluster_partition.bytes_copied),
-                formatReadableQuantity(cluster_partition.rows_copied),
-                cluster_partition.blocks_copied);
-
-            if (cluster_partition.rows_copied)
-            {
-                LOG_INFO(log, "Average partition speed: {} per second.", formatReadableSizeWithDecimalSuffix(cluster_partition.bytes_copied / elapsed));
-            }
-
-            if (task_table.rows_copied)
-            {
-                LOG_INFO(log, "Average table {} speed: {} per second.", task_table.table_id, formatReadableSizeWithDecimalSuffix(task_table.bytes_copied / elapsed));
-            }
-        }
-    }
-
-    UInt64 required_partitions = task_table.cluster_partitions.size();
-    UInt64 finished_partitions = task_table.finished_cluster_partitions.size();
-    bool table_is_done = finished_partitions >= required_partitions;
-
-    if (!table_is_done)
-    {
-        LOG_INFO(log, "Table {} is not processed yet. Copied {} of {}, will retry", task_table.table_id, finished_partitions, required_partitions);
-    }
-    else
-    {
-        /// Delete helping tables in case that whole table is done
-        dropHelpingTables(task_table);
-    }
-
-    return table_is_done;
-}
-
-TaskStatus ClusterCopier::tryCreateDestinationTable(const ConnectionTimeouts & timeouts, TaskTable & task_table)
-{
-    /// Try create original table (if not exists) on each shard
-
-    //TaskTable & task_table = task_shard.task_table;
-    const TaskShardPtr task_shard = task_table.all_shards.at(0);
-    /// We need to update table definitions for each part, it could be changed after ALTER
-    task_shard->current_pull_table_create_query = getCreateTableForPullShard(timeouts, *task_shard);
-    try
-    {
-        auto create_query_push_ast
-            = rewriteCreateQueryStorage(task_shard->current_pull_table_create_query, task_table.table_push, task_table.engine_push_ast);
-        auto & create = create_query_push_ast->as<ASTCreateQuery &>();
-        create.if_not_exists = true;
-        InterpreterCreateQuery::prepareOnClusterQuery(create, getContext(), task_table.cluster_push_name);
-        String query = queryToString(create_query_push_ast);
-
-        LOG_INFO(log, "Create destination tables. Query: {}", query);
-        UInt64 shards = executeQueryOnCluster(task_table.cluster_push, query, task_cluster->settings_push, ClusterExecutionMode::ON_EACH_NODE);
-        LOG_INFO(
-            log,
-            "Destination tables {} have been created on {} shards of {}",
-            getQuotedTable(task_table.table_push),
-            shards,
-            task_table.cluster_push->getShardCount());
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "Error while creating original table. Maybe we are not first.");
-    }
-
-    return TaskStatus::Finished;
-}
-
-/// Job for copying partition from particular shard.
-TaskStatus ClusterCopier::tryProcessPartitionTask(const ConnectionTimeouts & timeouts, ShardPartition & task_partition, bool is_unprioritized_task)
-{
-    TaskStatus res;
-
-    try
-    {
-        res = iterateThroughAllPiecesInPartition(timeouts, task_partition, is_unprioritized_task);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "An error occurred while processing partition " + task_partition.name);
-        res = TaskStatus::Error;
-    }
-
-    /// At the end of each task check if the config is updated
-    try
-    {
-        updateConfigIfNeeded();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log, "An error occurred while updating the config");
-    }
-
-    return res;
-}
-
-TaskStatus ClusterCopier::iterateThroughAllPiecesInPartition(const ConnectionTimeouts & timeouts, ShardPartition & task_partition,
-                                                       bool is_unprioritized_task)
-{
-    const size_t total_number_of_pieces = task_partition.task_shard.task_table.number_of_splits;
-
-    TaskStatus res{TaskStatus::Finished};
-
-    bool was_failed_pieces = false;
-    bool was_active_pieces = false;
-
-    for (size_t piece_number = 0; piece_number < total_number_of_pieces; piece_number++)
-    {
-        for (UInt64 try_num = 0; try_num < max_shard_partition_tries; ++try_num)
-        {
-            LOG_INFO(log, "Attempt number {} to process partition {} piece number {} on shard number {} with index {}.",
-                try_num, task_partition.name, piece_number,
-                task_partition.task_shard.numberInCluster(),
-                task_partition.task_shard.indexInCluster());
-
-            res = processPartitionPieceTaskImpl(timeouts, task_partition, piece_number, is_unprioritized_task);
-
-            /// Exit if success
-            if (res == TaskStatus::Finished)
-                break;
-
-            /// Skip if the task is being processed by someone
-            if (res == TaskStatus::Active)
-                break;
-
-            /// Repeat on errors
-            std::this_thread::sleep_for(retry_delay_ms);
-        }
-
-        was_active_pieces |= (res == TaskStatus::Active);
-        was_failed_pieces |= (res == TaskStatus::Error);
-    }
-
-    if (was_failed_pieces)
-        return TaskStatus::Error;
-
-    if (was_active_pieces)
-        return TaskStatus::Active;
-
-    return TaskStatus::Finished;
-}
-
-
-TaskStatus ClusterCopier::processPartitionPieceTaskImpl(
-        const ConnectionTimeouts & timeouts, ShardPartition & task_partition,
-        const size_t current_piece_number, bool is_unprioritized_task)
-{
-    TaskShard & task_shard = task_partition.task_shard;
-    TaskTable & task_table = task_shard.task_table;
-    ClusterPartition & cluster_partition  = task_table.getClusterPartition(task_partition.name);
-    ShardPartitionPiece & partition_piece = task_partition.pieces[current_piece_number];
-
-    const size_t number_of_splits = task_table.number_of_splits;
-    const String primary_key_comma_separated = task_table.primary_key_comma_separated;
-
-    /// We need to update table definitions for each partition, it could be changed after ALTER
-    createShardInternalTables(timeouts, task_shard, true);
-
-    auto split_table_for_current_piece = task_shard.list_of_split_tables_on_shard[current_piece_number];
-
-    auto zookeeper = getContext()->getZooKeeper();
-
-    const String piece_is_dirty_flag_path          = partition_piece.getPartitionPieceIsDirtyPath();
-    const String piece_is_dirty_cleaned_path       = partition_piece.getPartitionPieceIsCleanedPath();
-    const String current_task_piece_is_active_path = partition_piece.getActiveWorkerPath();
-    const String current_task_piece_status_path    = partition_piece.getShardStatusPath();
-
-    /// Auxiliary functions:
-
-    /// Creates is_dirty node to initialize DROP PARTITION
-    auto create_is_dirty_node = [&] (const CleanStateClock & clock)
-    {
-        if (clock.is_stale())
-            LOG_INFO(log, "Clean state clock is stale while setting dirty flag, cowardly bailing");
-        else if (!clock.is_clean())
-            LOG_INFO(log, "Thank you, Captain Obvious");
-        else if (clock.discovery_version)
-        {
-            LOG_INFO(log, "Updating clean state clock");
-            zookeeper->set(piece_is_dirty_flag_path, host_id, clock.discovery_version.value());
-        }
-        else
-        {
-            LOG_INFO(log, "Creating clean state clock");
-            zookeeper->create(piece_is_dirty_flag_path, host_id, zkutil::CreateMode::Persistent);
-        }
-    };
-
-    /// Returns SELECT query filtering current partition and applying user filter
-    auto get_select_query = [&] (const DatabaseAndTableName & from_table, const String & fields, bool enable_splitting, String limit = "")
-    {
-        String query;
-        query += "WITH " + task_partition.name + " AS partition_key ";
-        query += "SELECT " + fields + " FROM " + getQuotedTable(from_table);
-
-        if (enable_splitting && experimental_use_sample_offset)
-            query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
-
-        /// TODO: Bad, it is better to rewrite with ASTLiteral(partition_key_field)
-        query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
-
-        if (enable_splitting && !experimental_use_sample_offset)
-            query += " AND ( cityHash64(" + primary_key_comma_separated + ") %" + toString(number_of_splits) + " = " + toString(current_piece_number) + " )";
-
-        if (!task_table.where_condition_str.empty())
-            query += " AND (" + task_table.where_condition_str + ")";
-
-        if (!limit.empty())
-            query += " LIMIT " + limit;
-
-        query += " FORMAT Native";
-
-        ParserQuery p_query(query.data() + query.size());
-
-        const auto & settings = getContext()->getSettingsRef();
-        return parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
-    };
-
-    /// Load balancing
-    auto worker_node_holder = createTaskWorkerNodeAndWaitIfNeed(zookeeper, current_task_piece_status_path, is_unprioritized_task);
-
-    LOG_INFO(log, "Processing {}", current_task_piece_status_path);
-
-    const String piece_status_path = partition_piece.getPartitionPieceShardsPath();
-
-    CleanStateClock clean_state_clock(zookeeper, piece_is_dirty_flag_path, piece_is_dirty_cleaned_path);
-
-    const bool is_clean = checkPartitionPieceIsClean(zookeeper, clean_state_clock, piece_status_path);
-
-    /// Do not start if partition piece is dirty, try to clean it
-    if (is_clean)
-    {
-        LOG_INFO(log, "Partition {} piece {} appears to be clean", task_partition.name, current_piece_number);
-        zookeeper->createAncestors(current_task_piece_status_path);
-    }
-    else
-    {
-        LOG_INFO(log, "Partition {} piece {} is dirty, try to drop it", task_partition.name, current_piece_number);
-
-        try
-        {
-            tryDropPartitionPiece(task_partition, current_piece_number, zookeeper, clean_state_clock);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log, "An error occurred when clean partition");
-        }
-
-        return TaskStatus::Error;
-    }
-
-    /// Create ephemeral node to mark that we are active and process the partition
-    zookeeper->createAncestors(current_task_piece_is_active_path);
-    zkutil::EphemeralNodeHolderPtr partition_task_node_holder;
-    try
-    {
-        partition_task_node_holder = zkutil::EphemeralNodeHolder::create(current_task_piece_is_active_path, *zookeeper, host_id);
-    }
-    catch (const Coordination::Exception & e)
-    {
-        if (e.code == Coordination::Error::ZNODEEXISTS)
-        {
-            LOG_INFO(log, "Someone is already processing {}", current_task_piece_is_active_path);
-            return TaskStatus::Active;
-        }
-
-        throw;
-    }
-
-    /// Exit if task has been already processed;
-    /// create blocking node to signal cleaning up if it is abandoned
-    {
-        String status_data;
-        if (zookeeper->tryGet(current_task_piece_status_path, status_data))
-        {
-            TaskStateWithOwner status = TaskStateWithOwner::fromString(status_data);
-            if (status.state == TaskState::Finished)
-            {
-                LOG_INFO(log, "Task {} has been successfully executed by {}", current_task_piece_status_path, status.owner);
-                return TaskStatus::Finished;
-            }
-
-            /// Task is abandoned, because previously we created ephemeral node, possibly in other copier's process.
-            /// Initialize DROP PARTITION
-            LOG_INFO(log, "Task {} has not been successfully finished by {}. Partition will be dropped and refilled.", current_task_piece_status_path, status.owner);
-
-            create_is_dirty_node(clean_state_clock);
-            return TaskStatus::Error;
-        }
-    }
-
-
-    /// Try create table (if not exists) on each shard
-    /// We have to create this table even in case that partition piece is empty
-    /// This is significant, because we will have simpler code
-    {
-        /// 1) Get columns description from any replica of destination cluster
-        /// 2) Change ENGINE, database and table name
-        /// 3) Create helping table on the whole destination cluster
-        auto & settings_push = task_cluster->settings_push;
-
-        auto connection = task_table.cluster_push->getAnyShardInfo().pool->get(timeouts, settings_push, true);
-        String create_query = getRemoteCreateTable(task_shard.task_table.table_push, *connection, settings_push);
-
-        ParserCreateQuery parser_create_query;
-        auto create_query_ast = parseQuery(parser_create_query, create_query, settings_push.max_query_size, settings_push.max_parser_depth);
-        /// Define helping table database and name for current partition piece
-        DatabaseAndTableName database_and_table_for_current_piece
-        {
-            task_table.table_push.first,
-            task_table.table_push.second + "_piece_" + toString(current_piece_number)
-        };
-
-
-        auto new_engine_push_ast = task_table.engine_push_ast;
-        if (task_table.isReplicatedTable())
-            new_engine_push_ast = task_table.rewriteReplicatedCreateQueryToPlain();
-
-        /// Take columns definition from destination table, new database and table name, and new engine (non replicated variant of MergeTree)
-        auto create_query_push_ast = rewriteCreateQueryStorage(create_query_ast, database_and_table_for_current_piece, new_engine_push_ast);
-        String query = queryToString(create_query_push_ast);
-
-        LOG_INFO(log, "Create destination tables. Query: {}", query);
-        UInt64 shards = executeQueryOnCluster(task_table.cluster_push, query, task_cluster->settings_push, ClusterExecutionMode::ON_EACH_NODE);
-        LOG_INFO(
-            log,
-            "Destination tables {} have been created on {} shards of {}",
-            getQuotedTable(task_table.table_push),
-            shards,
-            task_table.cluster_push->getShardCount());
-    }
-
-
-    /// Exit if current piece is absent on this shard. Also mark it as finished, because we will check
-    /// whether each shard have processed each partitition (and its pieces).
-    if (partition_piece.is_absent_piece)
-    {
-        String state_finished = TaskStateWithOwner::getData(TaskState::Finished, host_id);
-        auto res = zookeeper->tryCreate(current_task_piece_status_path, state_finished, zkutil::CreateMode::Persistent);
-        if (res == Coordination::Error::ZNODEEXISTS)
-            LOG_INFO(log, "Partition {} piece {} is absent on current replica of a shard. But other replicas have already marked it as done.", task_partition.name, current_piece_number);
-        if (res == Coordination::Error::ZOK)
-            LOG_INFO(log, "Partition {} piece {} is absent on current replica of a shard. Will mark it as done. Other replicas will do the same.", task_partition.name, current_piece_number);
-        return TaskStatus::Finished;
-    }
-
-    /// Check that destination partition is empty if we are first worker
-    /// NOTE: this check is incorrect if pull and push tables have different partition key!
-    String clean_start_status;
-    if (!zookeeper->tryGet(partition_piece.getPartitionPieceCleanStartPath(), clean_start_status) || clean_start_status != "ok")
-    {
-        zookeeper->createIfNotExists(partition_piece.getPartitionPieceCleanStartPath(), "");
-        auto checker = zkutil::EphemeralNodeHolder::create(partition_piece.getPartitionPieceCleanStartPath() + "/checker",
-                                                           *zookeeper, host_id);
-        // Maybe we are the first worker
-
-        ASTPtr query_select_ast = get_select_query(split_table_for_current_piece, "count()", /* enable_splitting= */ true);
-        UInt64 count;
-        {
-            auto local_context = Context::createCopy(context);
-            // Use pull (i.e. readonly) settings, but fetch data from destination servers
-            local_context->setSettings(task_cluster->settings_pull);
-            local_context->setSetting("skip_unavailable_shards", true);
-
-            InterpreterSelectWithUnionQuery select(query_select_ast, local_context, SelectQueryOptions{});
-            QueryPlan plan;
-            select.buildQueryPlan(plan);
-            auto builder = std::move(*plan.buildQueryPipeline(
-                QueryPlanOptimizationSettings::fromContext(local_context),
-                BuildQueryPipelineSettings::fromContext(local_context)));
-
-            Block block = getBlockWithAllStreamData(std::move(builder));
-            count = (block) ? block.safeGetByPosition(0).column->getUInt(0) : 0;
-        }
-
-        if (count != 0)
-        {
-            LOG_INFO(log, "Partition {} piece {} is not empty. In contains {} rows.", task_partition.name, current_piece_number, count);
-            Coordination::Stat stat_shards{};
-            zookeeper->get(partition_piece.getPartitionPieceShardsPath(), &stat_shards);
-
-            /// NOTE: partition is still fresh if dirt discovery happens before cleaning
-            if (stat_shards.numChildren == 0)
-            {
-                LOG_WARNING(log, "There are no workers for partition {} piece {}, but destination table contains {} rows. Partition will be dropped and refilled.", task_partition.name, toString(current_piece_number), count);
-
-                create_is_dirty_node(clean_state_clock);
-                return TaskStatus::Error;
-            }
-        }
-        zookeeper->set(partition_piece.getPartitionPieceCleanStartPath(), "ok");
-    }
-    /// At this point, we need to sync that the destination table is clean
-    /// before any actual work
-
-    /// Try start processing, create node about it
-    {
-        String start_state = TaskStateWithOwner::getData(TaskState::Started, host_id);
-        CleanStateClock new_clean_state_clock(zookeeper, piece_is_dirty_flag_path, piece_is_dirty_cleaned_path);
-        if (clean_state_clock != new_clean_state_clock)
-        {
-            LOG_INFO(log, "Partition {} piece {} clean state changed, cowardly bailing", task_partition.name, toString(current_piece_number));
-            return TaskStatus::Error;
-        }
-        else if (!new_clean_state_clock.is_clean())
-        {
-            LOG_INFO(log, "Partition {} piece {} is dirty and will be dropped and refilled", task_partition.name, toString(current_piece_number));
-            create_is_dirty_node(new_clean_state_clock);
-            return TaskStatus::Error;
-        }
-        zookeeper->create(current_task_piece_status_path, start_state, zkutil::CreateMode::Persistent);
-    }
-
-
-    /// Do the copying
-    {
-        bool inject_fault = false;
-        if (copy_fault_probability > 0)
-        {
-            double value = std::uniform_real_distribution<>(0, 1)(task_table.task_cluster.random_engine);
-            inject_fault = value < copy_fault_probability;
-        }
-
-        // Select all fields
-        ASTPtr query_select_ast = get_select_query(task_shard.table_read_shard, "*", /* enable_splitting= */ true, inject_fault ? "1" : "");
-
-        LOG_INFO(log, "Executing SELECT query and pull from {}: {}", task_shard.getDescription(), queryToString(query_select_ast));
-
-        ASTPtr query_insert_ast;
-        {
-            String query;
-            query += "INSERT INTO " + getQuotedTable(split_table_for_current_piece) + " FORMAT Native  ";
-
-            ParserQuery p_query(query.data() + query.size());
-            const auto & settings = getContext()->getSettingsRef();
-            query_insert_ast = parseQuery(p_query, query, settings.max_query_size, settings.max_parser_depth);
-
-            LOG_INFO(log, "Executing INSERT query: {}", query);
-        }
-
-        try
-        {
-            auto context_select = Context::createCopy(context);
-            context_select->setSettings(task_cluster->settings_pull);
-
-            auto context_insert = Context::createCopy(context);
-            context_insert->setSettings(task_cluster->settings_push);
-
-            /// Custom INSERT SELECT implementation
-            QueryPipeline input;
-            QueryPipeline output;
-            {
-                BlockIO io_insert = InterpreterFactory::instance().get(query_insert_ast, context_insert)->execute();
-
-                InterpreterSelectWithUnionQuery select(query_select_ast, context_select, SelectQueryOptions{});
-                QueryPlan plan;
-                select.buildQueryPlan(plan);
-                auto builder = std::move(*plan.buildQueryPipeline(
-                    QueryPlanOptimizationSettings::fromContext(context_select),
-                    BuildQueryPipelineSettings::fromContext(context_select)));
-
-                output = std::move(io_insert.pipeline);
-
-                /// Add converting actions to make it possible to copy blocks with slightly different schema
-                const auto & select_block = builder.getHeader();
-                const auto & insert_block = output.getHeader();
-                auto actions_dag = ActionsDAG::makeConvertingActions(
-                        select_block.getColumnsWithTypeAndName(),
-                        insert_block.getColumnsWithTypeAndName(),
-                        ActionsDAG::MatchColumnsMode::Position);
-
-                auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(getContext()));
-
-                builder.addSimpleTransform([&](const Block & header)
-                {
-                    return std::make_shared<ExpressionTransform>(header, actions);
-                });
-                input = QueryPipelineBuilder::getPipeline(std::move(builder));
-            }
-
-            /// Fail-fast optimization to abort copying when the current clean state expires
-            std::future<Coordination::ExistsResponse> future_is_dirty_checker;
-
-            Stopwatch watch(CLOCK_MONOTONIC_COARSE);
-            constexpr UInt64 check_period_milliseconds = 500;
-
-            /// Will asynchronously check that ZooKeeper connection and is_dirty flag appearing while copying data
-            auto cancel_check = [&] ()
-            {
-                if (zookeeper->expired())
-                    throw Exception(ErrorCodes::UNFINISHED, "ZooKeeper session is expired, cancel INSERT SELECT");
-
-                if (!future_is_dirty_checker.valid())
-                    future_is_dirty_checker = zookeeper->asyncExists(piece_is_dirty_flag_path);
-
-                /// check_period_milliseconds should less than average insert time of single block
-                /// Otherwise, the insertion will slow a little bit
-                if (watch.elapsedMilliseconds() >= check_period_milliseconds)
-                {
-                    Coordination::ExistsResponse status = future_is_dirty_checker.get();
-
-                    if (status.error != Coordination::Error::ZNONODE)
-                    {
-                        LogicalClock dirt_discovery_epoch (status.stat.mzxid);
-                        if (dirt_discovery_epoch == clean_state_clock.discovery_zxid)
-                            return false;
-                        throw Exception(ErrorCodes::UNFINISHED, "Partition is dirty, cancel INSERT SELECT");
-                    }
-                }
-
-                return false;
-            };
-
-            /// Update statistics
-            /// It is quite rough: bytes_copied don't take into account DROP PARTITION.
-            auto update_stats = [&cluster_partition] (const Block & block)
-            {
-                cluster_partition.bytes_copied += block.bytes();
-                cluster_partition.rows_copied += block.rows();
-                cluster_partition.blocks_copied += 1;
-            };
-
-            /// Main work is here
-            PullingPipelineExecutor pulling_executor(input);
-            PushingPipelineExecutor pushing_executor(output);
-
-            Block data;
-            bool is_cancelled = false;
-            while (pulling_executor.pull(data))
-            {
-                if (cancel_check())
-                {
-                    is_cancelled = true;
-                    pushing_executor.cancel();
-                    pushing_executor.cancel();
-                    break;
-                }
-                pushing_executor.push(data);
-                update_stats(data);
-            }
-
-            if (!is_cancelled)
-                pushing_executor.finish();
-
-            // Just in case
-            if (future_is_dirty_checker.valid())
-                future_is_dirty_checker.get();
-
-            if (inject_fault)
-                throw Exception(ErrorCodes::UNFINISHED, "Copy fault injection is activated");
-        }
-        catch (...)
-        {
-            tryLogCurrentException(log, "An error occurred during copying, partition will be marked as dirty");
-            create_is_dirty_node(clean_state_clock);
-            return TaskStatus::Error;
-        }
-    }
-
-    LOG_INFO(log, "Partition {} piece {} copied. But not moved to original destination table.", task_partition.name, toString(current_piece_number));
-
-    /// Finalize the processing, change state of current partition task (and also check is_dirty flag)
-    {
-        String state_finished = TaskStateWithOwner::getData(TaskState::Finished, host_id);
-        CleanStateClock new_clean_state_clock (zookeeper, piece_is_dirty_flag_path, piece_is_dirty_cleaned_path);
-        if (clean_state_clock != new_clean_state_clock)
-        {
-            LOG_INFO(log, "Partition {} piece {} clean state changed, cowardly bailing", task_partition.name, toString(current_piece_number));
-            return TaskStatus::Error;
-        }
-        else if (!new_clean_state_clock.is_clean())
-        {
-            LOG_INFO(log, "Partition {} piece {} became dirty and will be dropped and refilled", task_partition.name, toString(current_piece_number));
-            create_is_dirty_node(new_clean_state_clock);
-            return TaskStatus::Error;
-        }
-        zookeeper->set(current_task_piece_status_path, state_finished, 0);
-    }
-
-    return TaskStatus::Finished;
-}
-
-void ClusterCopier::dropAndCreateLocalTable(const ASTPtr & create_ast)
-{
-    const auto & create = create_ast->as<ASTCreateQuery &>();
-    dropLocalTableIfExists({create.getDatabase(), create.getTable()});
-
-    auto create_context = Context::createCopy(getContext());
-
-    InterpreterCreateQuery interpreter(create_ast, create_context);
-    interpreter.execute();
-}
-
-void ClusterCopier::dropLocalTableIfExists(const DatabaseAndTableName & table_name) const
-{
-    auto drop_ast = std::make_shared<ASTDropQuery>();
-    drop_ast->if_exists = true;
-    drop_ast->setDatabase(table_name.first);
-    drop_ast->setTable(table_name.second);
-
-    auto drop_context = Context::createCopy(getContext());
-
-    InterpreterDropQuery interpreter(drop_ast, drop_context);
-    interpreter.execute();
-}
-
-void ClusterCopier::dropHelpingTablesByPieceNumber(const TaskTable & task_table, size_t current_piece_number)
-{
-    LOG_INFO(log, "Removing helping tables piece {}", current_piece_number);
-
-    DatabaseAndTableName original_table = task_table.table_push;
-    DatabaseAndTableName helping_table
-        = DatabaseAndTableName(original_table.first, original_table.second + "_piece_" + toString(current_piece_number));
-
-    String query = "DROP TABLE IF EXISTS " + getQuotedTable(helping_table);
-
-    const ClusterPtr & cluster_push = task_table.cluster_push;
-    Settings settings_push = task_cluster->settings_push;
-
-    LOG_INFO(log, "Execute distributed DROP TABLE: {}", query);
-
-    /// We have to drop partition_piece on each replica
-    UInt64 num_nodes = executeQueryOnCluster(cluster_push, query, settings_push, ClusterExecutionMode::ON_EACH_NODE);
-
-    LOG_INFO(log, "DROP TABLE query was successfully executed on {} nodes.", toString(num_nodes));
-}
-
-void ClusterCopier::dropHelpingTables(const TaskTable & task_table)
-{
-    LOG_INFO(log, "Removing helping tables");
-    for (size_t current_piece_number = 0; current_piece_number < task_table.number_of_splits; ++current_piece_number)
-    {
-        dropHelpingTablesByPieceNumber(task_table, current_piece_number);
-    }
-}
-
-void ClusterCopier::dropParticularPartitionPieceFromAllHelpingTables(const TaskTable & task_table, const String & partition_name)
-{
-    LOG_INFO(log, "Try drop partition partition from all helping tables.");
-    for (size_t current_piece_number = 0; current_piece_number < task_table.number_of_splits; ++current_piece_number)
-    {
-        DatabaseAndTableName original_table = task_table.table_push;
-        DatabaseAndTableName helping_table = DatabaseAndTableName(original_table.first, original_table.second + "_piece_" + toString(current_piece_number));
-
-        String query = "ALTER TABLE " + getQuotedTable(helping_table) + ((partition_name == "'all'") ? " DROP PARTITION ID " : " DROP PARTITION ") + partition_name;
-
-        const ClusterPtr & cluster_push = task_table.cluster_push;
-        Settings settings_push = task_cluster->settings_push;
-
-        LOG_INFO(log, "Execute distributed DROP PARTITION: {}", query);
-        /// We have to drop partition_piece on each replica
-        UInt64 num_nodes = executeQueryOnCluster(
-                cluster_push, query,
-                settings_push,
-                ClusterExecutionMode::ON_EACH_NODE);
-
-        LOG_INFO(log, "DROP PARTITION query was successfully executed on {} nodes.", toString(num_nodes));
-    }
-    LOG_INFO(log, "All helping tables dropped partition {}", partition_name);
-}
-
-String ClusterCopier::getRemoteCreateTable(const DatabaseAndTableName & table, Connection & connection, const Settings & settings)
-{
-    auto remote_context = Context::createCopy(context);
-    remote_context->setSettings(settings);
-
-    String query = "SHOW CREATE TABLE " + getQuotedTable(table);
-
-    QueryPipelineBuilder builder;
-    builder.init(Pipe(std::make_shared<RemoteSource>(
-            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();
-}
-
-
-ASTPtr ClusterCopier::getCreateTableForPullShard(const ConnectionTimeouts & timeouts, TaskShard & task_shard)
-{
-    /// 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);
-
-    ParserCreateQuery parser_create_query;
-    const auto & settings = getContext()->getSettingsRef();
-    return parseQuery(parser_create_query, create_query_pull_str, settings.max_query_size, settings.max_parser_depth);
-}
-
-
-/// If it is implicitly asked to create split Distributed table for certain piece on current shard, we will do it.
-void ClusterCopier::createShardInternalTables(const ConnectionTimeouts & timeouts,
-        TaskShard & task_shard, bool create_split)
-{
-    TaskTable & task_table = task_shard.task_table;
-
-    /// We need to update table definitions for each part, it could be changed after ALTER
-    task_shard.current_pull_table_create_query = getCreateTableForPullShard(timeouts, task_shard);
-
-    /// Create local Distributed tables:
-    ///  a table fetching data from current shard and a table inserting data to the whole destination cluster
-    String read_shard_prefix = ".read_shard_" + toString(task_shard.indexInCluster()) + ".";
-    String split_shard_prefix = ".split.";
-    task_shard.table_read_shard = DatabaseAndTableName(working_database_name, read_shard_prefix + task_table.table_id);
-    task_shard.main_table_split_shard = DatabaseAndTableName(working_database_name, split_shard_prefix + task_table.table_id);
-
-    for (const auto & piece_number : collections::range(0, task_table.number_of_splits))
-    {
-        task_shard.list_of_split_tables_on_shard[piece_number] =
-                DatabaseAndTableName(working_database_name, split_shard_prefix + task_table.table_id + "_piece_" + toString(piece_number));
-    }
-
-    /// Create special cluster with single shard
-    String shard_read_cluster_name = read_shard_prefix + task_table.cluster_pull_name;
-    ClusterPtr cluster_pull_current_shard = task_table.cluster_pull->getClusterWithSingleShard(task_shard.indexInCluster());
-    getContext()->setCluster(shard_read_cluster_name, cluster_pull_current_shard);
-
-    auto storage_shard_ast = createASTStorageDistributed(shard_read_cluster_name, task_table.table_pull.first, task_table.table_pull.second);
-
-    auto create_query_ast = removeAliasMaterializedAndTTLColumnsFromCreateQuery(
-        task_shard.current_pull_table_create_query,
-        task_table.allow_to_copy_alias_and_materialized_columns);
-
-    auto create_table_pull_ast = rewriteCreateQueryStorage(create_query_ast, task_shard.table_read_shard, storage_shard_ast);
-    dropAndCreateLocalTable(create_table_pull_ast);
-
-    if (create_split)
-    {
-        auto create_table_split_piece_ast = rewriteCreateQueryStorage(
-                create_query_ast,
-                task_shard.main_table_split_shard,
-                task_table.main_engine_split_ast);
-
-        dropAndCreateLocalTable(create_table_split_piece_ast);
-
-        /// Create auxiliary split tables for each piece
-        for (const auto & piece_number : collections::range(0, task_table.number_of_splits))
-        {
-            const auto & storage_piece_split_ast = task_table.auxiliary_engine_split_asts[piece_number];
-
-            create_table_split_piece_ast = rewriteCreateQueryStorage(
-                    create_query_ast,
-                    task_shard.list_of_split_tables_on_shard[piece_number],
-                    storage_piece_split_ast);
-
-            dropAndCreateLocalTable(create_table_split_piece_ast);
-        }
-    }
-
-}
-
-
-std::set<String> ClusterCopier::getShardPartitions(const ConnectionTimeouts & timeouts, TaskShard & task_shard)
-{
-    std::set<String> res;
-
-    createShardInternalTables(timeouts, task_shard, false);
-
-    TaskTable & task_table = task_shard.task_table;
-
-    const String & partition_name = queryToString(task_table.engine_push_partition_key_ast);
-
-    if (partition_name == "'all'")
-    {
-        res.emplace("'all'");
-        return res;
-    }
-
-    String query;
-    {
-        WriteBufferFromOwnString wb;
-        wb << "SELECT " << partition_name << " AS partition FROM "
-           << getQuotedTable(task_shard.table_read_shard) << " GROUP BY partition ORDER BY partition DESC";
-        query = wb.str();
-    }
-
-    ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = getContext()->getSettingsRef();
-    ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
-
-    LOG_INFO(log, "Computing destination partition set, executing query: {}", query);
-
-    auto local_context = Context::createCopy(context);
-    local_context->setSettings(task_cluster->settings_pull);
-    InterpreterSelectWithUnionQuery select(query_ast, local_context, SelectQueryOptions{});
-    QueryPlan plan;
-    select.buildQueryPlan(plan);
-    auto builder = std::move(*plan.buildQueryPipeline(
-        QueryPlanOptimizationSettings::fromContext(local_context),
-        BuildQueryPipelineSettings::fromContext(local_context)));
-
-    Block block = getBlockWithAllStreamData(std::move(builder));
-
-    if (block)
-    {
-        ColumnWithTypeAndName & column = block.getByPosition(0);
-        task_shard.partition_key_column = column;
-
-        for (size_t i = 0; i < column.column->size(); ++i)
-        {
-            WriteBufferFromOwnString wb;
-            column.type->getDefaultSerialization()->serializeTextQuoted(*column.column, i, wb, FormatSettings());
-            res.emplace(wb.str());
-        }
-    }
-
-    LOG_INFO(log, "There are {} destination partitions in shard {}", res.size(), task_shard.getDescription());
-
-    return res;
-}
-
-bool ClusterCopier::checkShardHasPartition(const ConnectionTimeouts & timeouts,
-        TaskShard & task_shard, const String & partition_quoted_name)
-{
-    createShardInternalTables(timeouts, task_shard, false);
-
-    TaskTable & task_table = task_shard.task_table;
-
-    WriteBufferFromOwnString ss;
-    ss << "WITH " + partition_quoted_name + " AS partition_key ";
-    ss << "SELECT 1 FROM " << getQuotedTable(task_shard.table_read_shard);
-    ss << " WHERE (" << queryToString(task_table.engine_push_partition_key_ast) << " = partition_key)";
-    if (!task_table.where_condition_str.empty())
-        ss << " AND (" << task_table.where_condition_str << ")";
-    ss << " LIMIT 1";
-    auto query = ss.str();
-
-    ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = getContext()->getSettingsRef();
-    ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
-
-    LOG_INFO(log, "Checking shard {} for partition {} existence, executing query: {}",
-        task_shard.getDescription(), partition_quoted_name, query_ast->formatForErrorMessage());
-
-    auto local_context = Context::createCopy(context);
-    local_context->setSettings(task_cluster->settings_pull);
-    auto pipeline = InterpreterFactory::instance().get(query_ast, local_context)->execute().pipeline;
-    PullingPipelineExecutor executor(pipeline);
-    Block block;
-    executor.pull(block);
-    return block.rows() != 0;
-}
-
-bool ClusterCopier::checkPresentPartitionPiecesOnCurrentShard(const ConnectionTimeouts & timeouts,
-                           TaskShard & task_shard, const String & partition_quoted_name, size_t current_piece_number)
-{
-    createShardInternalTables(timeouts, task_shard, false);
-
-    TaskTable & task_table = task_shard.task_table;
-    const size_t number_of_splits = task_table.number_of_splits;
-    const String & primary_key_comma_separated = task_table.primary_key_comma_separated;
-
-    UNUSED(primary_key_comma_separated);
-
-    std::string query;
-
-    query += "WITH " + partition_quoted_name + " AS partition_key ";
-    query += "SELECT 1 FROM " + getQuotedTable(task_shard.table_read_shard);
-
-    if (experimental_use_sample_offset)
-        query += " SAMPLE 1/" + toString(number_of_splits) + " OFFSET " + toString(current_piece_number) + "/" + toString(number_of_splits);
-
-    query += " WHERE (" + queryToString(task_table.engine_push_partition_key_ast) + " = partition_key)";
-
-    if (!experimental_use_sample_offset)
-        query += " AND (cityHash64(" + primary_key_comma_separated + ") % "
-                 + std::to_string(number_of_splits) + " = " + std::to_string(current_piece_number) + " )";
-
-    if (!task_table.where_condition_str.empty())
-        query += " AND (" + task_table.where_condition_str + ")";
-
-    query += " LIMIT 1";
-
-    LOG_INFO(log, "Checking shard {} for partition {} piece {} existence, executing query: {}", task_shard.getDescription(), partition_quoted_name, std::to_string(current_piece_number), query);
-
-    ParserQuery parser_query(query.data() + query.size());
-    const auto & settings = getContext()->getSettingsRef();
-    ASTPtr query_ast = parseQuery(parser_query, query, settings.max_query_size, settings.max_parser_depth);
-
-    auto local_context = Context::createCopy(context);
-    local_context->setSettings(task_cluster->settings_pull);
-    auto pipeline = InterpreterFactory::instance().get(query_ast, local_context)->execute().pipeline;
-    PullingPipelineExecutor executor(pipeline);
-    Block result;
-    executor.pull(result);
-    if (result.rows() != 0)
-        LOG_INFO(log, "Partition {} piece number {} is PRESENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
-    else
-        LOG_INFO(log, "Partition {} piece number {} is ABSENT on shard {}", partition_quoted_name, std::to_string(current_piece_number), task_shard.getDescription());
-    return result.rows() != 0;
-}
-
-
-/** Executes simple query (without output streams, for example DDL queries) on each shard of the cluster
-  * Returns number of shards for which at least one replica executed query successfully
-  */
-UInt64 ClusterCopier::executeQueryOnCluster(
-        const ClusterPtr & cluster,
-        const String & query,
-        const Settings & current_settings,
-        ClusterExecutionMode execution_mode) const
-{
-    ClusterPtr cluster_for_query = cluster;
-    if (execution_mode == ClusterExecutionMode::ON_EACH_NODE)
-        cluster_for_query = cluster->getClusterWithReplicasAsShards(current_settings);
-
-    std::vector<std::shared_ptr<Connection>> connections;
-    connections.reserve(cluster->getShardCount());
-
-    std::atomic<UInt64> successfully_executed = 0;
-
-    for (const auto & replicas : cluster_for_query->getShardsAddresses())
-    {
-        for (const auto & node : replicas)
-        {
-            try
-            {
-                connections.emplace_back(std::make_shared<Connection>(
-                    node.host_name, node.port, node.default_database,
-                    node.user, node.password, ssh::SSHKey(), node.quota_key, node.cluster, node.cluster_secret,
-                    "ClusterCopier", node.compression, node.secure
-                ));
-
-                /// We execute only Alter, Create and Drop queries.
-                const auto header = Block{};
-
-                /// 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);
-
-                try
-                {
-                    remote_query_executor->sendQuery();
-                }
-                catch (...)
-                {
-                    LOG_WARNING(log, "Node with address {} seems to be unreachable.", node.host_name);
-                    continue;
-                }
-
-                while (true)
-                {
-                    auto block = remote_query_executor->readBlock();
-                    if (!block)
-                        break;
-                }
-
-                remote_query_executor->finish();
-                ++successfully_executed;
-                break;
-            }
-            catch (...)
-            {
-                LOG_WARNING(log, "An error occurred while processing query: {}", query);
-                tryLogCurrentException(log);
-                continue;
-            }
-        }
-    }
-
-    return successfully_executed.load();
-}
-
-}
diff --git a/programs/copier/ClusterCopier.h b/programs/copier/ClusterCopier.h
deleted file mode 100644
index 063b13e9078..00000000000
--- a/programs/copier/ClusterCopier.h
+++ /dev/null
@@ -1,240 +0,0 @@
-#pragma once
-
-#include "Aliases.h"
-#include "Internals.h"
-#include "TaskCluster.h"
-#include "TaskShard.h"
-#include "TaskTable.h"
-#include "ShardPartition.h"
-#include "ShardPartitionPiece.h"
-#include "ZooKeeperStaff.h"
-
-
-namespace DB
-{
-
-class ClusterCopier : WithMutableContext
-{
-public:
-    ClusterCopier(const String & task_path_,
-                  const String & host_id_,
-                  const String & proxy_database_name_,
-                  ContextMutablePtr context_,
-                  Poco::Logger * log_)
-            : WithMutableContext(context_),
-            task_zookeeper_path(task_path_),
-            host_id(host_id_),
-            working_database_name(proxy_database_name_),
-            log(log_) {}
-
-    void init();
-
-    template <typename T>
-    decltype(auto) retry(T && func, UInt64 max_tries = 100);
-
-    void discoverShardPartitions(const ConnectionTimeouts & timeouts, const TaskShardPtr & task_shard);
-
-    /// Compute set of partitions, assume set of partitions aren't changed during the processing
-    void discoverTablePartitions(const ConnectionTimeouts & timeouts, TaskTable & task_table, UInt64 num_threads = 0);
-
-    void uploadTaskDescription(const std::string & task_path, const std::string & task_file, bool force);
-
-    void reloadTaskDescription();
-
-    void updateConfigIfNeeded();
-
-    void process(const ConnectionTimeouts & timeouts);
-
-    /// Disables DROP PARTITION commands that used to clear data after errors
-    void setSafeMode(bool is_safe_mode_ = true)
-    {
-        is_safe_mode = is_safe_mode_;
-    }
-
-    void setCopyFaultProbability(double copy_fault_probability_)
-    {
-        copy_fault_probability = copy_fault_probability_;
-    }
-
-    void setMoveFaultProbability(double move_fault_probability_)
-    {
-        move_fault_probability = move_fault_probability_;
-    }
-
-    void setExperimentalUseSampleOffset(bool value)
-    {
-        experimental_use_sample_offset = value;
-    }
-
-    void setMaxTableTries(UInt64 tries)
-    {
-        max_table_tries = tries;
-    }
-    void setMaxShardPartitionTries(UInt64 tries)
-    {
-        max_shard_partition_tries = tries;
-    }
-    void setMaxShardPartitionPieceTriesForAlter(UInt64 tries)
-    {
-        max_shard_partition_piece_tries_for_alter = tries;
-    }
-    void setRetryDelayMs(std::chrono::milliseconds ms)
-    {
-        retry_delay_ms = ms;
-    }
-
-protected:
-
-    String getWorkersPath() const
-    {
-        return task_cluster->task_zookeeper_path + "/task_active_workers";
-    }
-
-    String getWorkersPathVersion() const
-    {
-        return getWorkersPath() + "_version";
-    }
-
-    String getCurrentWorkerNodePath() const
-    {
-        return getWorkersPath() + "/" + host_id;
-    }
-
-    zkutil::EphemeralNodeHolder::Ptr createTaskWorkerNodeAndWaitIfNeed(
-            const zkutil::ZooKeeperPtr & zookeeper,
-            const String & description,
-            bool unprioritized);
-
-    /*
-     * Checks that partition piece or some other entity is clean.
-     * The only requirement is that you have to pass is_dirty_flag_path and is_dirty_cleaned_path to the function.
-     * And is_dirty_flag_path is a parent of is_dirty_cleaned_path.
-     * */
-    static bool checkPartitionPieceIsClean(
-            const zkutil::ZooKeeperPtr & zookeeper,
-            const CleanStateClock & clean_state_clock,
-            const String & task_status_path);
-
-    bool checkAllPiecesInPartitionAreDone(const TaskTable & task_table, const String & partition_name, const TasksShard & shards_with_partition);
-
-    /** Checks that the whole partition of a table was copied. We should do it carefully due to dirty lock.
-     * State of some task could change during the processing.
-     * We have to ensure that all shards have the finished state and there is no dirty flag.
-     * Moreover, we have to check status twice and check zxid, because state can change during the checking.
-     */
-
-    /* The same as function above
-     * Assume that we don't know on which shards do we have partition certain piece.
-     * We'll check them all (I mean shards that contain the whole partition)
-     * And shards that don't have certain piece MUST mark that piece is_done true.
-     * */
-    bool checkPartitionPieceIsDone(const TaskTable & task_table, const String & partition_name,
-                                   size_t piece_number, const TasksShard & shards_with_partition);
-
-
-    /*Alter successful insertion to helping tables it will move all pieces to destination table*/
-    TaskStatus tryMoveAllPiecesToDestinationTable(const TaskTable & task_table, const String & partition_name);
-
-    /// Removes MATERIALIZED and ALIAS columns from create table query
-    static ASTPtr removeAliasMaterializedAndTTLColumnsFromCreateQuery(const ASTPtr & query_ast, bool allow_to_copy_alias_and_materialized_columns);
-
-    bool tryDropPartitionPiece(ShardPartition & task_partition, size_t current_piece_number,
-            const zkutil::ZooKeeperPtr & zookeeper, const CleanStateClock & clean_state_clock);
-
-    bool tryProcessTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
-
-    TaskStatus tryCreateDestinationTable(const ConnectionTimeouts & timeouts, TaskTable & task_table);
-    /// Job for copying partition from particular shard.
-    TaskStatus tryProcessPartitionTask(const ConnectionTimeouts & timeouts,
-                                       ShardPartition & task_partition,
-                                       bool is_unprioritized_task);
-
-    TaskStatus iterateThroughAllPiecesInPartition(const ConnectionTimeouts & timeouts,
-                                                  ShardPartition & task_partition,
-                                                  bool is_unprioritized_task);
-
-    TaskStatus processPartitionPieceTaskImpl(const ConnectionTimeouts & timeouts,
-                                             ShardPartition & task_partition,
-                                             size_t current_piece_number,
-                                             bool is_unprioritized_task);
-
-    void dropAndCreateLocalTable(const ASTPtr & create_ast);
-
-    void dropLocalTableIfExists(const DatabaseAndTableName & table_name) const;
-
-    void dropHelpingTables(const TaskTable & task_table);
-
-    void dropHelpingTablesByPieceNumber(const TaskTable & task_table, size_t current_piece_number);
-
-    /// Is used for usage less disk space.
-    /// After all pieces were successfully moved to original destination
-    /// table we can get rid of partition pieces (partitions in helping tables).
-    void dropParticularPartitionPieceFromAllHelpingTables(const TaskTable & task_table, const String & partition_name);
-
-    String getRemoteCreateTable(const DatabaseAndTableName & table, Connection & connection, const Settings & settings);
-
-    ASTPtr getCreateTableForPullShard(const ConnectionTimeouts & timeouts, TaskShard & task_shard);
-
-    /// If it is implicitly asked to create split Distributed table for certain piece on current shard, we will do it.
-    void createShardInternalTables(const ConnectionTimeouts & timeouts, TaskShard & task_shard, bool create_split = true);
-
-    std::set<String> getShardPartitions(const ConnectionTimeouts & timeouts, TaskShard & task_shard);
-
-    bool checkShardHasPartition(const ConnectionTimeouts & timeouts, TaskShard & task_shard, const String & partition_quoted_name);
-
-    bool checkPresentPartitionPiecesOnCurrentShard(const ConnectionTimeouts & timeouts,
-             TaskShard & task_shard, const String & partition_quoted_name, size_t current_piece_number);
-
-    /*
-     * This class is used in executeQueryOnCluster function
-     * You can execute query on each shard (no sense it is executed on each replica of a shard or not)
-     * or you can execute query on each replica on each shard.
-     * First mode is useful for INSERTS queries.
-     * */
-    enum ClusterExecutionMode
-    {
-        ON_EACH_SHARD,
-        ON_EACH_NODE
-    };
-
-    /** Executes simple query (without output streams, for example DDL queries) on each shard of the cluster
-      * Returns number of shards for which at least one replica executed query successfully
-      */
-    UInt64 executeQueryOnCluster(
-            const ClusterPtr & cluster,
-            const String & query,
-            const Settings & current_settings,
-            ClusterExecutionMode execution_mode = ClusterExecutionMode::ON_EACH_SHARD) const;
-
-private:
-    String task_zookeeper_path;
-    String task_description_path;
-    String host_id;
-    String working_database_name;
-
-    /// Auto update config stuff
-    UInt64 task_description_current_version = 1;
-    std::atomic<UInt64> task_description_version{1};
-    Coordination::WatchCallback task_description_watch_callback;
-    /// ZooKeeper session used to set the callback
-    zkutil::ZooKeeperPtr task_description_watch_zookeeper;
-
-    ConfigurationPtr task_cluster_initial_config;
-    ConfigurationPtr task_cluster_current_config;
-
-    std::unique_ptr<TaskCluster> task_cluster;
-
-    bool is_safe_mode = false;
-    double copy_fault_probability = 0.0;
-    double move_fault_probability = 0.0;
-
-    bool experimental_use_sample_offset{false};
-
-    Poco::Logger * log;
-
-    UInt64 max_table_tries = 3;
-    UInt64 max_shard_partition_tries = 3;
-    UInt64 max_shard_partition_piece_tries_for_alter = 10;
-    std::chrono::milliseconds retry_delay_ms{1000};
-};
-}
diff --git a/programs/copier/ClusterCopierApp.cpp b/programs/copier/ClusterCopierApp.cpp
deleted file mode 100644
index 53f79888573..00000000000
--- a/programs/copier/ClusterCopierApp.cpp
+++ /dev/null
@@ -1,251 +0,0 @@
-#include "ClusterCopierApp.h"
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/StatusFile.h>
-#include <Common/TerminalSize.h>
-#include <Databases/registerDatabases.h>
-#include <IO/ConnectionTimeouts.h>
-#include <Interpreters/registerInterpreters.h>
-#include <Formats/registerFormats.h>
-#include <Common/scope_guard_safe.h>
-#include <unistd.h>
-#include <filesystem>
-
-namespace fs = std::filesystem;
-
-namespace DB
-{
-
-/// ClusterCopierApp
-
-void ClusterCopierApp::initialize(Poco::Util::Application & self)
-{
-    is_help = config().has("help");
-    if (is_help)
-        return;
-
-    config_xml_path = config().getString("config-file");
-    task_path = config().getString("task-path");
-    log_level = config().getString("log-level", "info");
-    is_safe_mode = config().has("safe-mode");
-    is_status_mode = config().has("status");
-    if (config().has("copy-fault-probability"))
-        copy_fault_probability = std::max(std::min(config().getDouble("copy-fault-probability"), 1.0), 0.0);
-    if (config().has("move-fault-probability"))
-        move_fault_probability = std::max(std::min(config().getDouble("move-fault-probability"), 1.0), 0.0);
-    base_dir = (config().has("base-dir")) ? config().getString("base-dir") : fs::current_path().string();
-
-    max_table_tries = std::max<size_t>(config().getUInt("max-table-tries", 3), 1);
-    max_shard_partition_tries = std::max<size_t>(config().getUInt("max-shard-partition-tries", 3), 1);
-    max_shard_partition_piece_tries_for_alter = std::max<size_t>(config().getUInt("max-shard-partition-piece-tries-for-alter", 10), 1);
-    retry_delay_ms = std::chrono::milliseconds(std::max<size_t>(config().getUInt("retry-delay-ms", 1000), 100));
-
-    if (config().has("experimental-use-sample-offset"))
-        experimental_use_sample_offset = config().getBool("experimental-use-sample-offset");
-
-    // process_id is '<hostname>#<start_timestamp>_<pid>'
-    time_t timestamp = Poco::Timestamp().epochTime();
-    auto curr_pid = Poco::Process::id();
-
-    process_id = std::to_string(DateLUT::serverTimezoneInstance().toNumYYYYMMDDhhmmss(timestamp)) + "_" + std::to_string(curr_pid);
-    host_id = escapeForFileName(getFQDNOrHostName()) + '#' + process_id;
-    process_path = fs::weakly_canonical(fs::path(base_dir) / ("clickhouse-copier_" + process_id));
-    fs::create_directories(process_path);
-
-    /// Override variables for BaseDaemon
-    if (config().has("log-level"))
-        config().setString("logger.level", config().getString("log-level"));
-
-    if (config().has("base-dir") || !config().has("logger.log"))
-        config().setString("logger.log", fs::path(process_path) / "log.log");
-
-    if (config().has("base-dir") || !config().has("logger.errorlog"))
-        config().setString("logger.errorlog", fs::path(process_path) / "log.err.log");
-
-    Base::initialize(self);
-}
-
-
-void ClusterCopierApp::handleHelp(const std::string &, const std::string &)
-{
-    uint16_t terminal_width = 0;
-    if (isatty(STDIN_FILENO))
-        terminal_width = getTerminalWidth();
-
-    Poco::Util::HelpFormatter help_formatter(options());
-    if (terminal_width)
-        help_formatter.setWidth(terminal_width);
-    help_formatter.setCommand(commandName());
-    help_formatter.setHeader("Copies tables from one cluster to another");
-    help_formatter.setUsage("--config-file <config-file> --task-path <task-path>");
-    help_formatter.format(std::cerr);
-
-    stopOptionsProcessing();
-}
-
-
-void ClusterCopierApp::defineOptions(Poco::Util::OptionSet & options)
-{
-    Base::defineOptions(options);
-
-    options.addOption(Poco::Util::Option("task-path", "", "path to task in ZooKeeper")
-                          .argument("task-path").binding("task-path"));
-    options.addOption(Poco::Util::Option("task-file", "", "path to task file for uploading in ZooKeeper to task-path")
-                          .argument("task-file").binding("task-file"));
-    options.addOption(Poco::Util::Option("task-upload-force", "", "Force upload task-file even node already exists. Default is false.")
-                          .argument("task-upload-force").binding("task-upload-force"));
-    options.addOption(Poco::Util::Option("safe-mode", "", "disables ALTER DROP PARTITION in case of errors")
-                          .binding("safe-mode"));
-    options.addOption(Poco::Util::Option("copy-fault-probability", "", "the copying fails with specified probability (used to test partition state recovering)")
-                          .argument("copy-fault-probability").binding("copy-fault-probability"));
-    options.addOption(Poco::Util::Option("move-fault-probability", "", "the moving fails with specified probability (used to test partition state recovering)")
-                              .argument("move-fault-probability").binding("move-fault-probability"));
-    options.addOption(Poco::Util::Option("log-level", "", "sets log level")
-                          .argument("log-level").binding("log-level"));
-    options.addOption(Poco::Util::Option("base-dir", "", "base directory for copiers, consecutive copier launches will populate /base-dir/launch_id/* directories")
-                          .argument("base-dir").binding("base-dir"));
-    options.addOption(Poco::Util::Option("experimental-use-sample-offset", "", "Use SAMPLE OFFSET query instead of cityHash64(PRIMARY KEY) % n == k")
-                          .argument("experimental-use-sample-offset").binding("experimental-use-sample-offset"));
-    options.addOption(Poco::Util::Option("status", "", "Get for status for current execution").binding("status"));
-
-    options.addOption(Poco::Util::Option("max-table-tries", "", "Number of tries for the copy table task")
-                          .argument("max-table-tries").binding("max-table-tries"));
-    options.addOption(Poco::Util::Option("max-shard-partition-tries", "", "Number of tries for the copy one partition task")
-                          .argument("max-shard-partition-tries").binding("max-shard-partition-tries"));
-    options.addOption(Poco::Util::Option("max-shard-partition-piece-tries-for-alter", "", "Number of tries for final ALTER ATTACH to destination table")
-                          .argument("max-shard-partition-piece-tries-for-alter").binding("max-shard-partition-piece-tries-for-alter"));
-    options.addOption(Poco::Util::Option("retry-delay-ms", "", "Delay between task retries")
-                          .argument("retry-delay-ms").binding("retry-delay-ms"));
-
-    using Me = std::decay_t<decltype(*this)>;
-    options.addOption(Poco::Util::Option("help", "", "produce this help message").binding("help")
-                          .callback(Poco::Util::OptionCallback<Me>(this, &Me::handleHelp)));
-}
-
-
-void ClusterCopierApp::mainImpl()
-{
-    /// Status command
-    {
-        if (is_status_mode)
-        {
-            SharedContextHolder shared_context = Context::createShared();
-            auto context = Context::createGlobal(shared_context.get());
-            context->makeGlobalContext();
-            SCOPE_EXIT_SAFE(context->shutdown());
-
-            auto zookeeper = context->getZooKeeper();
-            auto status_json = zookeeper->get(task_path + "/status");
-
-            LOG_INFO(&logger(), "{}", status_json);
-            std::cout << status_json << std::endl;
-
-            context->resetZooKeeper();
-            return;
-        }
-    }
-    StatusFile status_file(process_path + "/status", StatusFile::write_full_info);
-    ThreadStatus thread_status;
-
-    auto * log = &logger();
-    LOG_INFO(log, "Starting clickhouse-copier (id {}, host_id {}, path {}, revision {})", process_id, host_id, process_path, ClickHouseRevision::getVersionRevision());
-
-    SharedContextHolder shared_context = Context::createShared();
-    auto context = Context::createGlobal(shared_context.get());
-    context->makeGlobalContext();
-    SCOPE_EXIT_SAFE(context->shutdown());
-
-    context->setConfig(loaded_config.configuration);
-    context->setApplicationType(Context::ApplicationType::LOCAL);
-    context->setPath(process_path + "/");
-
-    registerInterpreters();
-    registerFunctions();
-    registerAggregateFunctions();
-    registerTableFunctions();
-    registerDatabases();
-    registerStorages();
-    registerDictionaries();
-    registerDisks(/* global_skip_access_check= */ true);
-    registerFormats();
-
-    static const std::string default_database = "_local";
-    DatabaseCatalog::instance().attachDatabase(default_database, std::make_shared<DatabaseMemory>(default_database, context));
-    context->setCurrentDatabase(default_database);
-
-    /// Disable queries logging, since:
-    /// - There are bits that is not allowed for global context, like adding factories info (for the query_log)
-    /// - And anyway it is useless for copier.
-    context->setSetting("log_queries", false);
-
-    auto local_context = Context::createCopy(context);
-
-    /// Initialize query scope just in case.
-    CurrentThread::QueryScope query_scope(local_context);
-
-    auto copier = std::make_unique<ClusterCopier>(
-        task_path, host_id, default_database, local_context, log);
-    copier->setSafeMode(is_safe_mode);
-    copier->setCopyFaultProbability(copy_fault_probability);
-    copier->setMoveFaultProbability(move_fault_probability);
-    copier->setMaxTableTries(max_table_tries);
-    copier->setMaxShardPartitionTries(max_shard_partition_tries);
-    copier->setMaxShardPartitionPieceTriesForAlter(max_shard_partition_piece_tries_for_alter);
-    copier->setRetryDelayMs(retry_delay_ms);
-    copier->setExperimentalUseSampleOffset(experimental_use_sample_offset);
-
-    auto task_file = config().getString("task-file", "");
-    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()));
-
-    /// Reset ZooKeeper before removing ClusterCopier.
-    /// Otherwise zookeeper watch can call callback which use already removed ClusterCopier object.
-    context->resetZooKeeper();
-}
-
-
-int ClusterCopierApp::main(const std::vector<std::string> &)
-{
-    if (is_help)
-        return 0;
-
-    try
-    {
-        mainImpl();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(&Poco::Logger::root(), __PRETTY_FUNCTION__);
-        auto code = getCurrentExceptionCode();
-
-        return (code) ? code : -1;
-    }
-
-    return 0;
-}
-
-
-}
-
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
-
-int mainEntryClickHouseClusterCopier(int argc, char ** argv)
-{
-    try
-    {
-        DB::ClusterCopierApp app;
-        return app.run(argc, argv);
-    }
-    catch (...)
-    {
-        std::cerr << DB::getCurrentExceptionMessage(true) << "\n";
-        auto code = DB::getCurrentExceptionCode();
-
-        return (code) ? code : -1;
-    }
-}
diff --git a/programs/copier/ClusterCopierApp.h b/programs/copier/ClusterCopierApp.h
deleted file mode 100644
index 0ddc232381e..00000000000
--- a/programs/copier/ClusterCopierApp.h
+++ /dev/null
@@ -1,99 +0,0 @@
-#pragma once
-
-#include <Poco/Util/ServerApplication.h>
-#include <Daemon/BaseDaemon.h>
-
-#include "ClusterCopier.h"
-
-/* clickhouse cluster copier util
- * Copies tables data from one cluster to new tables of other (possibly the same) cluster in distributed fault-tolerant manner.
- *
- * See overview in the docs: docs/en/utils/clickhouse-copier.md
- *
- * Implementation details:
- *
- * cluster-copier workers pull each partition of each shard of the source cluster and push it to the destination cluster through
- * Distributed table (to perform data resharding). So, worker job is a partition of a source shard.
- * A job has three states: Active, Finished and Abandoned. Abandoned means that worker died and did not finish the job.
- *
- * If an error occurred during the copying (a worker failed or a worker did not finish the INSERT), then the whole partition (on
- * all destination servers) should be dropped and refilled. So, copying entity is a partition of all destination shards.
- * If a failure is detected a special /is_dirty node is created in ZooKeeper signalling that other workers copying the same partition
- * should stop, after a refilling procedure should start.
- *
- * ZooKeeper task node has the following structure:
- *  /task/path_root                     - path passed in --task-path parameter
- *      /description                    - contains user-defined XML config of the task
- *      /task_active_workers            - contains ephemeral nodes of all currently active workers, used to implement max_workers limitation
- *          /server_fqdn#PID_timestamp  - cluster-copier worker ID
- *          ...
- *      /tables             - directory with table tasks
- *      /cluster.db.table1  - directory of table_hits task
- *          /partition1     - directory for partition1
- *              /shards     - directory for source cluster shards
- *                  /1      - worker job for the first shard of partition1 of table test.hits
- *                            Contains info about current status (Active or Finished) and worker ID.
- *                  /2
- *                  ...
- *              /partition_active_workers
- *                  /1      - for each job in /shards a corresponding ephemeral node created in /partition_active_workers
- *                            It is used to detect Abandoned jobs (if there is Active node in /shards and there is no node in
- *                            /partition_active_workers).
- *                            Also, it is used to track active workers in the partition (when we need to refill the partition we do
- *                            not DROP PARTITION while there are active workers)
- *                  /2
- *                  ...
- *              /is_dirty   - the node is set if some worker detected that an error occurred (the INSERT is failed or an Abandoned node is
- *                            detected). If the node appeared workers in this partition should stop and start cleaning and refilling
- *                            partition procedure.
- *                            During this procedure a single 'cleaner' worker is selected. The worker waits for stopping all partition
- *                            workers, removes /shards node, executes DROP PARTITION on each destination node and removes /is_dirty node.
- *                  /cleaner- An ephemeral node used to select 'cleaner' worker. Contains ID of the worker.
- *      /cluster.db.table2
- *          ...
- */
-
-namespace DB
-{
-
-class ClusterCopierApp : public BaseDaemon
-{
-public:
-
-    void initialize(Poco::Util::Application & self) override;
-
-    void handleHelp(const std::string &, const std::string &);
-
-    void defineOptions(Poco::Util::OptionSet & options) override;
-
-    int main(const std::vector<std::string> &) override;
-
-private:
-
-    using Base = BaseDaemon;
-
-    void mainImpl();
-
-    std::string config_xml_path;
-    std::string task_path;
-    std::string log_level = "info";
-    bool is_safe_mode = false;
-    bool is_status_mode = false;
-    double copy_fault_probability = 0.0;
-    double move_fault_probability = 0.0;
-    bool is_help = false;
-
-    UInt64 max_table_tries = 3;
-    UInt64 max_shard_partition_tries = 3;
-    UInt64 max_shard_partition_piece_tries_for_alter = 10;
-    std::chrono::milliseconds retry_delay_ms{1000};
-
-    bool experimental_use_sample_offset{false};
-
-    std::string base_dir;
-    std::string process_path;
-    std::string process_id;
-    std::string host_id;
-};
-
-}
diff --git a/programs/copier/ClusterPartition.h b/programs/copier/ClusterPartition.h
deleted file mode 100644
index 22063989e22..00000000000
--- a/programs/copier/ClusterPartition.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-#include <map>
-
-namespace DB
-{
-
-/// Contains info about all shards that contain a partition
-struct ClusterPartition
-{
-    double elapsed_time_seconds = 0;
-    UInt64 bytes_copied = 0;
-    UInt64 rows_copied = 0;
-    UInt64 blocks_copied = 0;
-
-    UInt64 total_tries = 0;
-};
-
-using ClusterPartitions = std::map<String, ClusterPartition, std::greater<>>;
-
-}
diff --git a/programs/copier/Internals.cpp b/programs/copier/Internals.cpp
deleted file mode 100644
index 0cfff7e3f6c..00000000000
--- a/programs/copier/Internals.cpp
+++ /dev/null
@@ -1,280 +0,0 @@
-#include "Internals.h"
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/Transforms/SquashingChunksTransform.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/extractKeyExpressionList.h>
-#include <QueryPipeline/QueryPipelineBuilder.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-using ConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
-
-ConfigurationPtr getConfigurationFromXMLString(const std::string & xml_data)
-{
-    std::stringstream ss(xml_data);         // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    Poco::XML::InputSource input_source{ss};
-    return {new Poco::Util::XMLConfiguration{&input_source}};
-}
-
-String getQuotedTable(const String & database, const String & table)
-{
-    if (database.empty())
-        return backQuoteIfNeed(table);
-
-    return backQuoteIfNeed(database) + "." + backQuoteIfNeed(table);
-}
-
-String getQuotedTable(const DatabaseAndTableName & db_and_table)
-{
-    return getQuotedTable(db_and_table.first, db_and_table.second);
-}
-
-
-// Creates AST representing 'ENGINE = Distributed(cluster, db, table, [sharding_key])
-std::shared_ptr<ASTStorage> createASTStorageDistributed(
-        const String & cluster_name, const String & database, const String & table,
-        const ASTPtr & sharding_key_ast)
-{
-    auto args = std::make_shared<ASTExpressionList>();
-    args->children.emplace_back(std::make_shared<ASTLiteral>(cluster_name));
-    args->children.emplace_back(std::make_shared<ASTIdentifier>(database));
-    args->children.emplace_back(std::make_shared<ASTIdentifier>(table));
-    if (sharding_key_ast)
-        args->children.emplace_back(sharding_key_ast);
-
-    auto engine = std::make_shared<ASTFunction>();
-    engine->name = "Distributed";
-    engine->arguments = args;
-
-    auto storage = std::make_shared<ASTStorage>();
-    storage->set(storage->engine, engine);
-
-    return storage;
-}
-
-
-Block getBlockWithAllStreamData(QueryPipelineBuilder builder)
-{
-    builder.addTransform(std::make_shared<SquashingChunksTransform>(
-        builder.getHeader(),
-        std::numeric_limits<size_t>::max(),
-        std::numeric_limits<size_t>::max()));
-
-    auto cur_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
-    Block block;
-    PullingPipelineExecutor executor(cur_pipeline);
-    executor.pull(block);
-
-    return block;
-}
-
-bool isExtendedDefinitionStorage(const ASTPtr & storage_ast)
-{
-    const auto & storage = storage_ast->as<ASTStorage &>();
-    return storage.partition_by || storage.order_by || storage.sample_by;
-}
-
-ASTPtr extractPartitionKey(const ASTPtr & storage_ast)
-{
-    String storage_str = queryToString(storage_ast);
-
-    const auto & storage = storage_ast->as<ASTStorage &>();
-    const auto & engine = storage.engine->as<ASTFunction &>();
-
-    if (!endsWith(engine.name, "MergeTree"))
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported engine was specified in {}, only *MergeTree engines are supported", storage_str);
-    }
-
-    if (isExtendedDefinitionStorage(storage_ast))
-    {
-        if (storage.partition_by)
-            return storage.partition_by->clone();
-
-        static const char * all = "all";
-        return std::make_shared<ASTLiteral>(Field(all, strlen(all)));
-    }
-    else
-    {
-        bool is_replicated = startsWith(engine.name, "Replicated");
-        size_t min_args = is_replicated ? 3 : 1;
-
-        if (!engine.arguments)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected arguments in {}", storage_str);
-
-        ASTPtr arguments_ast = engine.arguments->clone();
-        ASTs & arguments = arguments_ast->children;
-
-        if (arguments.size() < min_args)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected at least {} arguments in {}", min_args, storage_str);
-
-        ASTPtr & month_arg = is_replicated ? arguments[2] : arguments[1];
-        return makeASTFunction("toYYYYMM", month_arg->clone());
-    }
-}
-
-ASTPtr extractPrimaryKey(const ASTPtr & storage_ast)
-{
-    String storage_str = queryToString(storage_ast);
-
-    const auto & storage = storage_ast->as<ASTStorage &>();
-    const auto & engine = storage.engine->as<ASTFunction &>();
-
-    if (!endsWith(engine.name, "MergeTree"))
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported engine was specified in {}, only *MergeTree engines are supported", storage_str);
-    }
-
-    if (!isExtendedDefinitionStorage(storage_ast))
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Is not extended deginition storage {} Will be fixed later.", storage_str);
-    }
-
-    if (storage.primary_key)
-        return storage.primary_key->clone();
-
-    return nullptr;
-}
-
-
-ASTPtr extractOrderBy(const ASTPtr & storage_ast)
-{
-    String storage_str = queryToString(storage_ast);
-
-    const auto & storage = storage_ast->as<ASTStorage &>();
-    const auto & engine = storage.engine->as<ASTFunction &>();
-
-    if (!endsWith(engine.name, "MergeTree"))
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported engine was specified in {}, only *MergeTree engines are supported", storage_str);
-    }
-
-    if (!isExtendedDefinitionStorage(storage_ast))
-    {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Is not extended deginition storage {} Will be fixed later.", storage_str);
-    }
-
-    if (storage.order_by)
-        return storage.order_by->clone();
-
-    throw Exception(ErrorCodes::BAD_ARGUMENTS, "ORDER BY cannot be empty");
-}
-
-/// Wraps only identifiers with backticks.
-std::string wrapIdentifiersWithBackticks(const ASTPtr & root)
-{
-    if (auto identifier = std::dynamic_pointer_cast<ASTIdentifier>(root))
-        return backQuote(identifier->name());
-
-    if (auto function = std::dynamic_pointer_cast<ASTFunction>(root))
-        return function->name + '(' + wrapIdentifiersWithBackticks(function->arguments) + ')';
-
-    if (auto expression_list = std::dynamic_pointer_cast<ASTExpressionList>(root))
-    {
-        Names function_arguments(expression_list->children.size());
-        for (size_t i = 0; i < expression_list->children.size(); ++i)
-            function_arguments[i] = wrapIdentifiersWithBackticks(expression_list->children[0]);
-        return boost::algorithm::join(function_arguments, ", ");
-    }
-
-    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key could be represented only as columns or functions from columns.");
-}
-
-
-Names extractPrimaryKeyColumnNames(const ASTPtr & storage_ast)
-{
-    const auto sorting_key_ast = extractOrderBy(storage_ast);
-    const auto primary_key_ast = extractPrimaryKey(storage_ast);
-
-    const auto sorting_key_expr_list = extractKeyExpressionList(sorting_key_ast);
-    const auto primary_key_expr_list = primary_key_ast
-                           ? extractKeyExpressionList(primary_key_ast) : sorting_key_expr_list->clone();
-
-    /// Maybe we have to handle VersionedCollapsing engine separately. But in our case in looks pointless.
-
-    size_t primary_key_size = primary_key_expr_list->children.size();
-    size_t sorting_key_size = sorting_key_expr_list->children.size();
-
-    if (primary_key_size > sorting_key_size)
-        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);
-
-    Names primary_key_columns;
-    NameSet primary_key_columns_set;
-
-    for (size_t i = 0; i < sorting_key_size; ++i)
-    {
-        /// Column name could be represented as a f_1(f_2(...f_n(column_name))).
-        /// Each f_i could take one or more parameters.
-        /// We will wrap identifiers with backticks to allow non-standard identifier names.
-        String sorting_key_column = sorting_key_expr_list->children[i]->getColumnName();
-
-        if (i < primary_key_size)
-        {
-            String pk_column = primary_key_expr_list->children[i]->getColumnName();
-            if (pk_column != sorting_key_column)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                "Primary key must be a prefix of the sorting key, "
-                                "but the column in the position {} is {}, not {}", i, sorting_key_column, pk_column);
-
-            if (!primary_key_columns_set.emplace(pk_column).second)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Primary key contains duplicate columns");
-
-            primary_key_columns.push_back(wrapIdentifiersWithBackticks(primary_key_expr_list->children[i]));
-        }
-    }
-
-    return primary_key_columns;
-}
-
-bool isReplicatedTableEngine(const ASTPtr & storage_ast)
-{
-    const auto & storage = storage_ast->as<ASTStorage &>();
-    const auto & engine = storage.engine->as<ASTFunction &>();
-
-    if (!endsWith(engine.name, "MergeTree"))
-    {
-        String storage_str = queryToString(storage_ast);
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported engine was specified in {}, only *MergeTree engines are supported", storage_str);
-    }
-
-    return startsWith(engine.name, "Replicated");
-}
-
-ShardPriority getReplicasPriority(const Cluster::Addresses & replicas, const std::string & local_hostname, UInt8 random)
-{
-    ShardPriority res;
-
-    if (replicas.empty())
-        return res;
-
-    res.is_remote = 1;
-    for (const auto & replica : replicas)
-    {
-        if (isLocalAddress(DNSResolver::instance().resolveHost(replica.host_name)))
-        {
-            res.is_remote = 0;
-            break;
-        }
-    }
-
-    res.hostname_difference = std::numeric_limits<size_t>::max();
-    for (const auto & replica : replicas)
-    {
-        size_t difference = getHostNamePrefixDistance(local_hostname, replica.host_name);
-        res.hostname_difference = std::min(difference, res.hostname_difference);
-    }
-
-    res.random = random;
-    return res;
-}
-
-}
diff --git a/programs/copier/Internals.h b/programs/copier/Internals.h
deleted file mode 100644
index 48f4b0fab09..00000000000
--- a/programs/copier/Internals.h
+++ /dev/null
@@ -1,198 +0,0 @@
-#pragma once
-
-#include <chrono>
-#include <optional>
-#include <Poco/Util/XMLConfiguration.h>
-#include <Poco/Logger.h>
-#include <Poco/ConsoleChannel.h>
-#include <Poco/FormattingChannel.h>
-#include <Poco/PatternFormatter.h>
-#include <Poco/UUIDGenerator.h>
-#include <Poco/Process.h>
-#include <Poco/FileChannel.h>
-#include <Poco/SplitterChannel.h>
-#include <Poco/Util/HelpFormatter.h>
-#include <boost/algorithm/string.hpp>
-#include <Common/logger_useful.h>
-#include <Common/ThreadPool.h>
-#include <Common/Exception.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/ZooKeeper/KeeperException.h>
-#include <base/getFQDNOrHostName.h>
-#include <Common/isLocalAddress.h>
-#include <Common/typeid_cast.h>
-#include <Common/ClickHouseRevision.h>
-#include <Common/formatReadable.h>
-#include <Common/DNSResolver.h>
-#include <Common/CurrentThread.h>
-#include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Common/ThreadStatus.h>
-#include <Client/Connection.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/Cluster.h>
-#include <Interpreters/InterpreterFactory.h>
-#include <Interpreters/InterpreterExistsQuery.h>
-#include <Interpreters/InterpreterShowCreateQuery.h>
-#include <Interpreters/InterpreterDropQuery.h>
-#include <Interpreters/InterpreterCreateQuery.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/NestedUtils.h>
-#include <Parsers/ParserCreateQuery.h>
-#include <Parsers/parseQuery.h>
-#include <Parsers/ParserQuery.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/queryToString.h>
-#include <Parsers/ASTDropQuery.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Formats/FormatSettings.h>
-#include <QueryPipeline/RemoteQueryExecutor.h>
-#include <IO/ConnectionTimeouts.h>
-#include <IO/Operators.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/ReadBufferFromFile.h>
-#include <Functions/registerFunctions.h>
-#include <TableFunctions/registerTableFunctions.h>
-#include <AggregateFunctions/registerAggregateFunctions.h>
-#include <Storages/registerStorages.h>
-#include <Storages/StorageDistributed.h>
-#include <Dictionaries/registerDictionaries.h>
-#include <Disks/registerDisks.h>
-#include <Databases/DatabaseMemory.h>
-
-#include "Aliases.h"
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-
-ConfigurationPtr getConfigurationFromXMLString(const std::string & xml_data);
-
-String getQuotedTable(const String & database, const String & table);
-
-String getQuotedTable(const DatabaseAndTableName & db_and_table);
-
-
-enum class TaskState
-{
-    Started = 0,
-    Finished,
-    Unknown
-};
-
-/// Used to mark status of shard partition tasks
-struct TaskStateWithOwner
-{
-    TaskStateWithOwner() = default;
-
-    TaskStateWithOwner(TaskState state_, const String & owner_) : state(state_), owner(owner_) {}
-
-    TaskState state{TaskState::Unknown};
-    String owner;
-
-    static String getData(TaskState state, const String &owner)
-    {
-        return TaskStateWithOwner(state, owner).toString();
-    }
-
-    String toString()
-    {
-        WriteBufferFromOwnString wb;
-        wb << static_cast<UInt32>(state) << "\n" << escape << owner;
-        return wb.str();
-    }
-
-    static TaskStateWithOwner fromString(const String & data)
-    {
-        ReadBufferFromString rb(data);
-        TaskStateWithOwner res;
-        UInt32 state;
-
-        rb >> state >> "\n" >> escape >> res.owner;
-
-        if (state >= static_cast<int>(TaskState::Unknown))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown state {}", data);
-
-        res.state = static_cast<TaskState>(state);
-        return res;
-    }
-};
-
-
-struct ShardPriority
-{
-    UInt8 is_remote = 1;
-    size_t hostname_difference = 0;
-    UInt8 random = 0;
-
-    static bool greaterPriority(const ShardPriority & current, const ShardPriority & other)
-    {
-        return std::forward_as_tuple(current.is_remote, current.hostname_difference, current.random)
-               < std::forward_as_tuple(other.is_remote, other.hostname_difference, other.random);
-    }
-};
-
-/// Execution status of a task.
-/// Is used for: partition copying task status, partition piece copying task status, partition moving task status.
-enum class TaskStatus
-{
-    Active,
-    Finished,
-    Error,
-};
-
-struct MultiTransactionInfo
-{
-    int32_t code;
-    Coordination::Requests requests;
-    Coordination::Responses responses;
-};
-
-// Creates AST representing 'ENGINE = Distributed(cluster, db, table, [sharding_key])
-std::shared_ptr<ASTStorage> createASTStorageDistributed(
-        const String & cluster_name, const String & database, const String & table,
-        const ASTPtr & sharding_key_ast = nullptr);
-
-Block getBlockWithAllStreamData(QueryPipelineBuilder builder);
-
-bool isExtendedDefinitionStorage(const ASTPtr & storage_ast);
-
-ASTPtr extractPartitionKey(const ASTPtr & storage_ast);
-
-/*
-* Choosing a Primary Key that Differs from the Sorting Key
-* It is possible to specify a primary key (an expression with values that are written in the index file for each mark)
-* that is different from the sorting key (an expression for sorting the rows in data parts).
-* In this case the primary key expression tuple must be a prefix of the sorting key expression tuple.
-* This feature is helpful when using the SummingMergeTree and AggregatingMergeTree table engines.
-* In a common case when using these engines, the table has two types of columns: dimensions and measures.
-* Typical queries aggregate values of measure columns with arbitrary GROUP BY and filtering by dimensions.
-* Because SummingMergeTree and AggregatingMergeTree aggregate rows with the same value of the sorting key,
-* it is natural to add all dimensions to it. As a result, the key expression consists of a long list of columns
-* and this list must be frequently updated with newly added dimensions.
-* In this case it makes sense to leave only a few columns in the primary key that will provide efficient
-* range scans and add the remaining dimension columns to the sorting key tuple.
-* ALTER of the sorting key is a lightweight operation because when a new column is simultaneously added t
-* o the table and to the sorting key, existing data parts don't need to be changed.
-* Since the old sorting key is a prefix of the new sorting key and there is no data in the newly added column,
-* the data is sorted by both the old and new sorting keys at the moment of table modification.
-*
-* */
-ASTPtr extractPrimaryKey(const ASTPtr & storage_ast);
-
-ASTPtr extractOrderBy(const ASTPtr & storage_ast);
-
-Names extractPrimaryKeyColumnNames(const ASTPtr & storage_ast);
-
-bool isReplicatedTableEngine(const ASTPtr & storage_ast);
-
-ShardPriority getReplicasPriority(const Cluster::Addresses & replicas, const std::string & local_hostname, UInt8 random);
-
-}
diff --git a/programs/copier/ShardPartition.cpp b/programs/copier/ShardPartition.cpp
deleted file mode 100644
index 4c962fc807d..00000000000
--- a/programs/copier/ShardPartition.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-#include "ShardPartition.h"
-
-#include "TaskShard.h"
-#include "TaskTable.h"
-
-namespace DB
-{
-
-ShardPartition::ShardPartition(TaskShard & parent, String name_quoted_, size_t number_of_splits)
-    : task_shard(parent)
-    , name(std::move(name_quoted_))
-{
-    pieces.reserve(number_of_splits);
-}
-
-String ShardPartition::getPartitionCleanStartPath() const
-{
-    return getPartitionPath() + "/clean_start";
-}
-
-String ShardPartition::getPartitionPieceCleanStartPath(size_t current_piece_number) const
-{
-    assert(current_piece_number < task_shard.task_table.number_of_splits);
-    return getPartitionPiecePath(current_piece_number) + "/clean_start";
-}
-
-String ShardPartition::getPartitionPath() const
-{
-    return task_shard.task_table.getPartitionPath(name);
-}
-
-String ShardPartition::getPartitionPiecePath(size_t current_piece_number) const
-{
-    assert(current_piece_number < task_shard.task_table.number_of_splits);
-    return task_shard.task_table.getPartitionPiecePath(name, current_piece_number);
-}
-
-String ShardPartition::getShardStatusPath() const
-{
-    // schema: /<root...>/tables/<table>/<partition>/shards/<shard>
-    // e.g. /root/table_test.hits/201701/shards/1
-    return getPartitionShardsPath() + "/" + toString(task_shard.numberInCluster());
-}
-
-String ShardPartition::getPartitionShardsPath() const
-{
-    return getPartitionPath() + "/shards";
-}
-
-String ShardPartition::getPartitionActiveWorkersPath() const
-{
-    return getPartitionPath() + "/partition_active_workers";
-}
-
-String ShardPartition::getActiveWorkerPath() const
-{
-    return getPartitionActiveWorkersPath() + "/" + toString(task_shard.numberInCluster());
-}
-
-String ShardPartition::getCommonPartitionIsDirtyPath() const
-{
-    return getPartitionPath() + "/is_dirty";
-}
-
-String ShardPartition::getCommonPartitionIsCleanedPath() const
-{
-    return getCommonPartitionIsDirtyPath() + "/cleaned";
-}
-
-}
diff --git a/programs/copier/ShardPartition.h b/programs/copier/ShardPartition.h
deleted file mode 100644
index 2457213733c..00000000000
--- a/programs/copier/ShardPartition.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include "ShardPartitionPiece.h"
-
-#include <base/types.h>
-
-#include <map>
-
-namespace DB
-{
-
-struct TaskShard;
-
-/// Just destination partition of a shard
-/// I don't know what this comment means.
-/// In short, when we discovered what shards contain currently processing partition,
-/// This class describes a partition (name) that is stored on the shard (parent).
-struct ShardPartition
-{
-    ShardPartition(TaskShard &parent, String name_quoted_, size_t number_of_splits = 10);
-
-    String getPartitionPath() const;
-
-    String getPartitionPiecePath(size_t current_piece_number) const;
-
-    String getPartitionCleanStartPath() const;
-
-    String getPartitionPieceCleanStartPath(size_t current_piece_number) const;
-
-    String getCommonPartitionIsDirtyPath() const;
-
-    String getCommonPartitionIsCleanedPath() const;
-
-    String getPartitionActiveWorkersPath() const;
-
-    String getActiveWorkerPath() const;
-
-    String getPartitionShardsPath() const;
-
-    String getShardStatusPath() const;
-
-    /// What partition pieces are present in current shard.
-    /// FYI: Piece is a part of partition which has modulo equals to concrete constant (less than number_of_splits obliously)
-    /// For example SELECT ... from ... WHERE partition=current_partition AND cityHash64(*) == const;
-    /// Absent pieces have field is_absent_piece equals to true.
-    PartitionPieces pieces;
-
-    TaskShard & task_shard;
-    String name;
-};
-
-using TasksPartition = std::map<String, ShardPartition, std::greater<>>;
-
-}
diff --git a/programs/copier/ShardPartitionPiece.cpp b/programs/copier/ShardPartitionPiece.cpp
deleted file mode 100644
index 36d1621e012..00000000000
--- a/programs/copier/ShardPartitionPiece.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-#include "ShardPartitionPiece.h"
-
-#include "ShardPartition.h"
-#include "TaskShard.h"
-
-#include <IO/WriteHelpers.h>
-
-namespace DB
-{
-
-ShardPartitionPiece::ShardPartitionPiece(ShardPartition & parent, size_t current_piece_number_, bool is_present_piece_)
-    : is_absent_piece(!is_present_piece_)
-    , current_piece_number(current_piece_number_)
-    , shard_partition(parent)
-{
-}
-
-String ShardPartitionPiece::getPartitionPiecePath() const
-{
-    return shard_partition.getPartitionPath() + "/piece_" + toString(current_piece_number);
-}
-
-String ShardPartitionPiece::getPartitionPieceCleanStartPath() const
-{
-    return getPartitionPiecePath() + "/clean_start";
-}
-
-String ShardPartitionPiece::getPartitionPieceIsDirtyPath() const
-{
-    return getPartitionPiecePath() + "/is_dirty";
-}
-
-String ShardPartitionPiece::getPartitionPieceIsCleanedPath() const
-{
-    return getPartitionPieceIsDirtyPath() + "/cleaned";
-}
-
-String ShardPartitionPiece::getPartitionPieceActiveWorkersPath() const
-{
-    return getPartitionPiecePath() + "/partition_piece_active_workers";
-}
-
-String ShardPartitionPiece::getActiveWorkerPath() const
-{
-    return getPartitionPieceActiveWorkersPath() + "/" + toString(shard_partition.task_shard.numberInCluster());
-}
-
-/// On what shards do we have current partition.
-String ShardPartitionPiece::getPartitionPieceShardsPath() const
-{
-    return getPartitionPiecePath() + "/shards";
-}
-
-String ShardPartitionPiece::getShardStatusPath() const
-{
-    return getPartitionPieceShardsPath() + "/" + toString(shard_partition.task_shard.numberInCluster());
-}
-
-String ShardPartitionPiece::getPartitionPieceCleanerPath() const
-{
-    return getPartitionPieceIsDirtyPath() + "/cleaner";
-}
-
-}
diff --git a/programs/copier/ShardPartitionPiece.h b/programs/copier/ShardPartitionPiece.h
deleted file mode 100644
index 453364c0fc8..00000000000
--- a/programs/copier/ShardPartitionPiece.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-
-#include <vector>
-
-namespace DB
-{
-
-struct ShardPartition;
-
-struct ShardPartitionPiece
-{
-    ShardPartitionPiece(ShardPartition & parent, size_t current_piece_number_, bool is_present_piece_);
-
-    String getPartitionPiecePath() const;
-
-    String getPartitionPieceCleanStartPath() const;
-
-    String getPartitionPieceIsDirtyPath() const;
-
-    String getPartitionPieceIsCleanedPath() const;
-
-    String getPartitionPieceActiveWorkersPath() const;
-
-    String getActiveWorkerPath() const ;
-
-    /// On what shards do we have current partition.
-    String getPartitionPieceShardsPath() const;
-
-    String getShardStatusPath() const;
-
-    String getPartitionPieceCleanerPath() const;
-
-    bool is_absent_piece;
-    const size_t current_piece_number;
-
-    ShardPartition & shard_partition;
-};
-
-using PartitionPieces = std::vector<ShardPartitionPiece>;
-
-}
diff --git a/programs/copier/StatusAccumulator.cpp b/programs/copier/StatusAccumulator.cpp
deleted file mode 100644
index 77adeac708c..00000000000
--- a/programs/copier/StatusAccumulator.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-#include "StatusAccumulator.h"
-
-#include <Poco/JSON/Parser.h>
-#include <Poco/JSON/JSON.h>
-#include <Poco/JSON/Object.h>
-#include <Poco/JSON/Stringifier.h>
-
-#include <iostream>
-
-namespace DB
-{
-
-StatusAccumulator::MapPtr StatusAccumulator::fromJSON(String state_json)
-{
-    Poco::JSON::Parser parser;
-    auto state = parser.parse(state_json).extract<Poco::JSON::Object::Ptr>();
-    MapPtr result_ptr = std::make_shared<Map>();
-    for (const auto & table_name : state->getNames())
-    {
-        auto table_status_json = state->getValue<String>(table_name);
-        auto table_status = parser.parse(table_status_json).extract<Poco::JSON::Object::Ptr>();
-        /// Map entry will be created if it is absent
-        auto & map_table_status = (*result_ptr)[table_name];
-        map_table_status.all_partitions_count += table_status->getValue<size_t>("all_partitions_count");
-        map_table_status.processed_partitions_count += table_status->getValue<size_t>("processed_partitions_count");
-    }
-    return result_ptr;
-}
-
-String StatusAccumulator::serializeToJSON(MapPtr statuses)
-{
-    Poco::JSON::Object result_json;
-    for (const auto & [table_name, table_status] : *statuses)
-    {
-        Poco::JSON::Object status_json;
-        status_json.set("all_partitions_count", table_status.all_partitions_count);
-        status_json.set("processed_partitions_count", table_status.processed_partitions_count);
-
-        result_json.set(table_name, status_json);
-    }
-    std::ostringstream oss;     // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    oss.exceptions(std::ios::failbit);
-    Poco::JSON::Stringifier::stringify(result_json, oss);
-    auto result = oss.str();
-    return result;
-}
-
-}
diff --git a/programs/copier/StatusAccumulator.h b/programs/copier/StatusAccumulator.h
deleted file mode 100644
index d420b611602..00000000000
--- a/programs/copier/StatusAccumulator.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-
-#include <memory>
-#include <unordered_map>
-
-namespace DB
-{
-
-class StatusAccumulator
-{
-public:
-    struct TableStatus
-    {
-        size_t all_partitions_count;
-        size_t processed_partitions_count;
-    };
-
-    using Map = std::unordered_map<String, TableStatus>;
-    using MapPtr = std::shared_ptr<Map>;
-
-    static MapPtr fromJSON(String state_json);
-    static String serializeToJSON(MapPtr statuses);
-};
-
-}
diff --git a/programs/copier/TaskCluster.cpp b/programs/copier/TaskCluster.cpp
deleted file mode 100644
index 0fb06616e50..00000000000
--- a/programs/copier/TaskCluster.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-#include "TaskCluster.h"
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-TaskCluster::TaskCluster(const String & task_zookeeper_path_, const String & default_local_database_)
-    : task_zookeeper_path(task_zookeeper_path_)
-    , default_local_database(default_local_database_)
-{}
-
-void DB::TaskCluster::loadTasks(const Poco::Util::AbstractConfiguration & config, const String & base_key)
-{
-    String prefix = base_key.empty() ? "" : base_key + ".";
-
-    clusters_prefix = prefix + "remote_servers";
-    if (!config.has(clusters_prefix))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "You should specify list of clusters in {}", clusters_prefix);
-
-    Poco::Util::AbstractConfiguration::Keys tables_keys;
-    config.keys(prefix + "tables", tables_keys);
-
-    for (const auto & table_key : tables_keys)
-    {
-        table_tasks.emplace_back(*this, config, prefix + "tables", table_key);
-    }
-}
-
-void DB::TaskCluster::reloadSettings(const Poco::Util::AbstractConfiguration & config, const String & base_key)
-{
-    String prefix = base_key.empty() ? "" : base_key + ".";
-
-    max_workers = config.getUInt64(prefix + "max_workers");
-
-    settings_common = Settings();
-    if (config.has(prefix + "settings"))
-        settings_common.loadSettingsFromConfig(prefix + "settings", config);
-
-    settings_common.prefer_localhost_replica = false;
-
-    settings_pull = settings_common;
-    if (config.has(prefix + "settings_pull"))
-        settings_pull.loadSettingsFromConfig(prefix + "settings_pull", config);
-
-    settings_push = settings_common;
-    if (config.has(prefix + "settings_push"))
-        settings_push.loadSettingsFromConfig(prefix + "settings_push", config);
-
-    auto set_default_value = [] (auto && setting, auto && default_value)
-    {
-        setting = setting.changed ? setting.value : default_value;
-    };
-
-    /// Override important settings
-    settings_pull.readonly = 1;
-    settings_pull.prefer_localhost_replica = false;
-    settings_push.distributed_foreground_insert = true;
-    settings_push.prefer_localhost_replica = false;
-
-    set_default_value(settings_pull.load_balancing, LoadBalancing::NEAREST_HOSTNAME);
-    set_default_value(settings_pull.max_threads, 1);
-    set_default_value(settings_pull.max_block_size, 8192UL);
-    set_default_value(settings_pull.preferred_block_size_bytes, 0);
-
-    set_default_value(settings_push.distributed_background_insert_timeout, 0);
-    set_default_value(settings_push.alter_sync, 2);
-}
-
-}
-
diff --git a/programs/copier/TaskCluster.h b/programs/copier/TaskCluster.h
deleted file mode 100644
index a7f8bc3baca..00000000000
--- a/programs/copier/TaskCluster.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include "TaskTable.h"
-
-#include <Core/Settings.h>
-#include <base/types.h>
-
-#include <Poco/Util/AbstractConfiguration.h>
-
-#include <pcg_random.hpp>
-
-namespace DB
-{
-
-struct TaskCluster
-{
-    TaskCluster(const String & task_zookeeper_path_, const String & default_local_database_);
-
-    void loadTasks(const Poco::Util::AbstractConfiguration & config, const String & base_key = "");
-
-    /// Set (or update) settings and max_workers param
-    void reloadSettings(const Poco::Util::AbstractConfiguration & config, const String & base_key = "");
-
-    /// Base node for all tasks. Its structure:
-    ///  workers/ - directory with active workers (amount of them is less or equal max_workers)
-    ///  description - node with task configuration
-    ///  table_table1/ - directories with per-partition copying status
-    String task_zookeeper_path;
-
-    /// Database used to create temporary Distributed tables
-    String default_local_database;
-
-    /// Limits number of simultaneous workers
-    UInt64 max_workers = 0;
-
-    /// Base settings for pull and push
-    Settings settings_common;
-    /// Settings used to fetch data
-    Settings settings_pull;
-    /// Settings used to insert data
-    Settings settings_push;
-
-    String clusters_prefix;
-
-    /// Subtasks
-    TasksTable table_tasks;
-
-    pcg64 random_engine;
-};
-
-}
diff --git a/programs/copier/TaskShard.cpp b/programs/copier/TaskShard.cpp
deleted file mode 100644
index d156f451a84..00000000000
--- a/programs/copier/TaskShard.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "TaskShard.h"
-
-#include "TaskTable.h"
-
-namespace DB
-{
-
-TaskShard::TaskShard(TaskTable & parent, const Cluster::ShardInfo & info_)
-    : task_table(parent)
-    , info(info_)
-{
-    list_of_split_tables_on_shard.assign(task_table.number_of_splits, DatabaseAndTableName());
-}
-
-UInt32 TaskShard::numberInCluster() const
-{
-    return info.shard_num;
-}
-
-UInt32 TaskShard::indexInCluster() const
-{
-    return info.shard_num - 1;
-}
-
-String DB::TaskShard::getDescription() const
-{
-    return fmt::format("N{} (having a replica {}, pull table {} of cluster {}",
-                       numberInCluster(), getHostNameExample(), getQuotedTable(task_table.table_pull), task_table.cluster_pull_name);
-}
-
-String DB::TaskShard::getHostNameExample() const
-{
-    const auto & replicas = task_table.cluster_pull->getShardsAddresses().at(indexInCluster());
-    return replicas.at(0).readableString();
-}
-
-}
diff --git a/programs/copier/TaskShard.h b/programs/copier/TaskShard.h
deleted file mode 100644
index 05d652077ea..00000000000
--- a/programs/copier/TaskShard.h
+++ /dev/null
@@ -1,56 +0,0 @@
-#pragma once
-
-#include "Aliases.h"
-#include "Internals.h"
-#include "ClusterPartition.h"
-#include "ShardPartition.h"
-
-
-namespace DB
-{
-
-struct TaskTable;
-
-struct TaskShard
-{
-    TaskShard(TaskTable & parent, const Cluster::ShardInfo & info_);
-
-    TaskTable & task_table;
-
-    Cluster::ShardInfo info;
-
-    UInt32 numberInCluster() const;
-
-    UInt32 indexInCluster() const;
-
-    String getDescription() const;
-
-    String getHostNameExample() const;
-
-    /// Used to sort clusters by their proximity
-    ShardPriority priority;
-
-    /// Column with unique destination partitions (computed from engine_push_partition_key expr.) in the shard
-    ColumnWithTypeAndName partition_key_column;
-
-    /// There is a task for each destination partition
-    TasksPartition partition_tasks;
-
-    /// Which partitions have been checked for existence
-    /// If some partition from this lists is exists, it is in partition_tasks
-    std::set<String> checked_partitions;
-
-    /// Last CREATE TABLE query of the table of the shard
-    ASTPtr current_pull_table_create_query;
-    ASTPtr current_push_table_create_query;
-
-    /// Internal distributed tables
-    DatabaseAndTableName table_read_shard;
-    DatabaseAndTableName main_table_split_shard;
-    ListOfDatabasesAndTableNames list_of_split_tables_on_shard;
-};
-
-using TaskShardPtr = std::shared_ptr<TaskShard>;
-using TasksShard = std::vector<TaskShardPtr>;
-
-}
diff --git a/programs/copier/TaskTable.cpp b/programs/copier/TaskTable.cpp
deleted file mode 100644
index d055ceb4c7b..00000000000
--- a/programs/copier/TaskTable.cpp
+++ /dev/null
@@ -1,222 +0,0 @@
-#include "TaskTable.h"
-
-#include "ClusterPartition.h"
-#include "TaskCluster.h"
-
-#include <Parsers/ASTFunction.h>
-#include <Common/escapeForFileName.h>
-
-#include <boost/algorithm/string/join.hpp>
-
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
-    extern const int LOGICAL_ERROR;
-}
-
-TaskTable::TaskTable(TaskCluster & parent, const Poco::Util::AbstractConfiguration & config,
-                     const String & prefix_, const String & table_key)
-        : task_cluster(parent)
-{
-    String table_prefix = prefix_ + "." + table_key + ".";
-
-    name_in_config = table_key;
-
-    number_of_splits = config.getUInt64(table_prefix + "number_of_splits", 3);
-
-    allow_to_copy_alias_and_materialized_columns = config.getBool(table_prefix + "allow_to_copy_alias_and_materialized_columns", false);
-    allow_to_drop_target_partitions = config.getBool(table_prefix + "allow_to_drop_target_partitions", false);
-
-    cluster_pull_name = config.getString(table_prefix + "cluster_pull");
-    cluster_push_name = config.getString(table_prefix + "cluster_push");
-
-    table_pull.first = config.getString(table_prefix + "database_pull");
-    table_pull.second = config.getString(table_prefix + "table_pull");
-
-    table_push.first = config.getString(table_prefix + "database_push");
-    table_push.second = config.getString(table_prefix + "table_push");
-
-    /// Used as node name in ZooKeeper
-    table_id = escapeForFileName(cluster_push_name)
-               + "." + escapeForFileName(table_push.first)
-               + "." + escapeForFileName(table_push.second);
-
-    engine_push_str = config.getString(table_prefix + "engine", "rand()");
-
-    {
-        ParserStorage parser_storage{ParserStorage::TABLE_ENGINE};
-        engine_push_ast = parseQuery(parser_storage, engine_push_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-        engine_push_partition_key_ast = extractPartitionKey(engine_push_ast);
-        primary_key_comma_separated = boost::algorithm::join(extractPrimaryKeyColumnNames(engine_push_ast), ", ");
-        is_replicated_table = isReplicatedTableEngine(engine_push_ast);
-    }
-
-    sharding_key_str = config.getString(table_prefix + "sharding_key");
-
-    auxiliary_engine_split_asts.reserve(number_of_splits);
-    {
-        ParserExpressionWithOptionalAlias parser_expression(false);
-        sharding_key_ast = parseQuery(parser_expression, sharding_key_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-        main_engine_split_ast = createASTStorageDistributed(cluster_push_name, table_push.first, table_push.second,
-                                                            sharding_key_ast);
-
-        for (const auto piece_number : collections::range(0, number_of_splits))
-        {
-            auxiliary_engine_split_asts.emplace_back
-                    (
-                            createASTStorageDistributed(cluster_push_name, table_push.first,
-                                                        table_push.second + "_piece_" + toString(piece_number), sharding_key_ast)
-                    );
-        }
-    }
-
-    where_condition_str = config.getString(table_prefix + "where_condition", "");
-    if (!where_condition_str.empty())
-    {
-        ParserExpressionWithOptionalAlias parser_expression(false);
-        where_condition_ast = parseQuery(parser_expression, where_condition_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-
-        // Will use canonical expression form
-        where_condition_str = queryToString(where_condition_ast);
-    }
-
-    String enabled_partitions_prefix = table_prefix + "enabled_partitions";
-    has_enabled_partitions = config.has(enabled_partitions_prefix);
-
-    if (has_enabled_partitions)
-    {
-        Strings keys;
-        config.keys(enabled_partitions_prefix, keys);
-
-        if (keys.empty())
-        {
-            /// Parse list of partition from space-separated string
-            String partitions_str = config.getString(table_prefix + "enabled_partitions");
-            boost::trim_if(partitions_str, isWhitespaceASCII);
-            boost::split(enabled_partitions, partitions_str, isWhitespaceASCII, boost::token_compress_on);
-        }
-        else
-        {
-            /// Parse sequence of <partition>...</partition>
-            for (const String &key : keys)
-            {
-                if (!startsWith(key, "partition"))
-                    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "Unknown key {} in {}", key, enabled_partitions_prefix);
-
-                enabled_partitions.emplace_back(config.getString(enabled_partitions_prefix + "." + key));
-            }
-        }
-
-        std::copy(enabled_partitions.begin(), enabled_partitions.end(), std::inserter(enabled_partitions_set, enabled_partitions_set.begin()));
-    }
-}
-
-
-String TaskTable::getPartitionPath(const String & partition_name) const
-{
-    return task_cluster.task_zookeeper_path             // root
-           + "/tables/" + table_id                      // tables/dst_cluster.merge.hits
-           + "/" + escapeForFileName(partition_name);   // 201701
-}
-
-String TaskTable::getPartitionAttachIsActivePath(const String & partition_name) const
-{
-    return getPartitionPath(partition_name) + "/attach_active";
-}
-
-String TaskTable::getPartitionAttachIsDonePath(const String & partition_name) const
-{
-    return getPartitionPath(partition_name) + "/attach_is_done";
-}
-
-String TaskTable::getPartitionPiecePath(const String & partition_name, size_t piece_number) const
-{
-    assert(piece_number < number_of_splits);
-    return getPartitionPath(partition_name) + "/piece_" + toString(piece_number);  // 1...number_of_splits
-}
-
-String TaskTable::getCertainPartitionIsDirtyPath(const String &partition_name) const
-{
-    return getPartitionPath(partition_name) + "/is_dirty";
-}
-
-String TaskTable::getCertainPartitionPieceIsDirtyPath(const String & partition_name, const size_t piece_number) const
-{
-    return getPartitionPiecePath(partition_name, piece_number) + "/is_dirty";
-}
-
-String TaskTable::getCertainPartitionIsCleanedPath(const String & partition_name) const
-{
-    return getCertainPartitionIsDirtyPath(partition_name) + "/cleaned";
-}
-
-String TaskTable::getCertainPartitionPieceIsCleanedPath(const String & partition_name, const size_t piece_number) const
-{
-    return getCertainPartitionPieceIsDirtyPath(partition_name, piece_number) + "/cleaned";
-}
-
-String TaskTable::getCertainPartitionTaskStatusPath(const String & partition_name) const
-{
-    return getPartitionPath(partition_name) + "/shards";
-}
-
-String TaskTable::getCertainPartitionPieceTaskStatusPath(const String & partition_name, const size_t piece_number) const
-{
-    return getPartitionPiecePath(partition_name, piece_number) + "/shards";
-}
-
-bool TaskTable::isReplicatedTable() const
-{
-    return is_replicated_table;
-}
-
-String TaskTable::getStatusAllPartitionCount() const
-{
-    return task_cluster.task_zookeeper_path + "/status/all_partitions_count";
-}
-
-String TaskTable::getStatusProcessedPartitionsCount() const
-{
-    return task_cluster.task_zookeeper_path + "/status/processed_partitions_count";
-}
-
-ASTPtr TaskTable::rewriteReplicatedCreateQueryToPlain() const
-{
-    ASTPtr prev_engine_push_ast = engine_push_ast->clone();
-
-    auto & new_storage_ast = prev_engine_push_ast->as<ASTStorage &>();
-    auto & new_engine_ast = new_storage_ast.engine->as<ASTFunction &>();
-
-    /// Remove "Replicated" from name
-    new_engine_ast.name = new_engine_ast.name.substr(10);
-
-    if (new_engine_ast.arguments)
-    {
-        auto & replicated_table_arguments = new_engine_ast.arguments->children;
-
-
-        /// In some cases of Atomic database engine usage ReplicatedMergeTree tables
-        /// could be created without arguments.
-        if (!replicated_table_arguments.empty())
-        {
-            /// Delete first two arguments of Replicated...MergeTree() table.
-            replicated_table_arguments.erase(replicated_table_arguments.begin());
-            replicated_table_arguments.erase(replicated_table_arguments.begin());
-        }
-    }
-
-    return new_storage_ast.clone();
-}
-
-ClusterPartition & TaskTable::getClusterPartition(const String & partition_name)
-{
-    auto it = cluster_partitions.find(partition_name);
-    if (it == cluster_partitions.end())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "There are no cluster partition {} in {}", partition_name, table_id);
-    return it->second;
-}
-
-}
diff --git a/programs/copier/TaskTable.h b/programs/copier/TaskTable.h
deleted file mode 100644
index 2bb7f078bc6..00000000000
--- a/programs/copier/TaskTable.h
+++ /dev/null
@@ -1,173 +0,0 @@
-#pragma once
-
-#include "Aliases.h"
-#include "TaskShard.h"
-
-
-namespace DB
-{
-
-struct ClusterPartition;
-struct TaskCluster;
-
-struct TaskTable
-{
-    TaskTable(TaskCluster & parent, const Poco::Util::AbstractConfiguration & config, const String & prefix, const String & table_key);
-
-    TaskCluster & task_cluster;
-
-    /// These functions used in checkPartitionIsDone() or checkPartitionPieceIsDone()
-    /// They are implemented here not to call task_table.tasks_shard[partition_name].second.pieces[current_piece_number] etc.
-
-    String getPartitionPath(const String & partition_name) const;
-
-    String getPartitionAttachIsActivePath(const String & partition_name) const;
-
-    String getPartitionAttachIsDonePath(const String & partition_name) const;
-
-    String getPartitionPiecePath(const String & partition_name, size_t piece_number) const;
-
-    String getCertainPartitionIsDirtyPath(const String & partition_name) const;
-
-    String getCertainPartitionPieceIsDirtyPath(const String & partition_name, size_t piece_number) const;
-
-    String getCertainPartitionIsCleanedPath(const String & partition_name) const;
-
-    String getCertainPartitionPieceIsCleanedPath(const String & partition_name, size_t piece_number) const;
-
-    String getCertainPartitionTaskStatusPath(const String & partition_name) const;
-
-    String getCertainPartitionPieceTaskStatusPath(const String & partition_name, size_t piece_number) const;
-
-    bool isReplicatedTable() const;
-
-    /// These nodes are used for check-status option
-    String getStatusAllPartitionCount() const;
-    String getStatusProcessedPartitionsCount() const;
-
-    /// Partitions will be split into number-of-splits pieces.
-    /// Each piece will be copied independently. (10 by default)
-    size_t number_of_splits;
-
-    bool allow_to_copy_alias_and_materialized_columns{false};
-    bool allow_to_drop_target_partitions{false};
-
-    String name_in_config;
-
-    /// Used as task ID
-    String table_id;
-
-    /// Column names in primary key
-    String primary_key_comma_separated;
-
-    /// Source cluster and table
-    String cluster_pull_name;
-    DatabaseAndTableName table_pull;
-
-    /// Destination cluster and table
-    String cluster_push_name;
-    DatabaseAndTableName table_push;
-
-    /// Storage of destination table
-    /// (tables that are stored on each shard of target cluster)
-    String engine_push_str;
-    ASTPtr engine_push_ast;
-    ASTPtr engine_push_partition_key_ast;
-
-    /// First argument of Replicated...MergeTree()
-    String engine_push_zk_path;
-    bool is_replicated_table;
-
-    ASTPtr rewriteReplicatedCreateQueryToPlain() const;
-
-    /*
-     * A Distributed table definition used to split data
-     * Distributed table will be created on each shard of default
-     * cluster to perform data copying and resharding
-     * */
-    String sharding_key_str;
-    ASTPtr sharding_key_ast;
-    ASTPtr main_engine_split_ast;
-
-    /*
-     * To copy partition piece form one cluster to another we have to use Distributed table.
-     * In case of usage separate table (engine_push) for each partition piece,
-     * we have to use many Distributed tables.
-     * */
-    ASTs auxiliary_engine_split_asts;
-
-    /// Additional WHERE expression to filter input data
-    String where_condition_str;
-    ASTPtr where_condition_ast;
-
-    /// Resolved clusters
-    ClusterPtr cluster_pull;
-    ClusterPtr cluster_push;
-
-    /// Filter partitions that should be copied
-    bool has_enabled_partitions = false;
-    Strings enabled_partitions;
-    NameSet enabled_partitions_set;
-
-    /**
-     * Prioritized list of shards
-     * all_shards contains information about all shards in the table.
-     * So we have to check whether particular shard have current partition or not while processing.
-     */
-    TasksShard all_shards;
-    TasksShard local_shards;
-
-    /// All partitions of the current table.
-    ClusterPartitions cluster_partitions;
-    NameSet finished_cluster_partitions;
-
-    /// Partition names to process in user-specified order
-    Strings ordered_partition_names;
-
-    ClusterPartition & getClusterPartition(const String & partition_name);
-
-    Stopwatch watch;
-    UInt64 bytes_copied = 0;
-    UInt64 rows_copied = 0;
-
-    template <typename RandomEngine>
-    void initShards(RandomEngine &&random_engine);
-};
-
-using TasksTable = std::list<TaskTable>;
-
-
-template<typename RandomEngine>
-inline void TaskTable::initShards(RandomEngine && random_engine)
-{
-    const String & fqdn_name = getFQDNOrHostName();
-    std::uniform_int_distribution<uint8_t> get_urand(0, std::numeric_limits<UInt8>::max());
-
-    // Compute the priority
-    for (const auto & shard_info : cluster_pull->getShardsInfo())
-    {
-        TaskShardPtr task_shard = std::make_shared<TaskShard>(*this, shard_info);
-        const auto & replicas = cluster_pull->getShardsAddresses().at(task_shard->indexInCluster());
-        task_shard->priority = getReplicasPriority(replicas, fqdn_name, get_urand(random_engine));
-
-        all_shards.emplace_back(task_shard);
-    }
-
-    // Sort by priority
-    std::sort(all_shards.begin(), all_shards.end(),
-              [](const TaskShardPtr & lhs, const TaskShardPtr & rhs)
-              {
-                  return ShardPriority::greaterPriority(lhs->priority, rhs->priority);
-              });
-
-    // Cut local shards
-    auto it_first_remote = std::lower_bound(all_shards.begin(), all_shards.end(), 1,
-                                            [](const TaskShardPtr & lhs, UInt8 is_remote)
-                                            {
-                                                return lhs->priority.is_remote < is_remote;
-                                            });
-
-    local_shards.assign(all_shards.begin(), it_first_remote);
-}
-
-}
diff --git a/programs/copier/ZooKeeperStaff.h b/programs/copier/ZooKeeperStaff.h
deleted file mode 100644
index 36dcfa50842..00000000000
--- a/programs/copier/ZooKeeperStaff.h
+++ /dev/null
@@ -1,221 +0,0 @@
-#pragma once
-
-/** Allows to compare two incremental counters of type UInt32 in presence of possible overflow.
-  * We assume that we compare values that are not too far away.
-  * For example, when we increment 0xFFFFFFFF, we get 0. So, 0xFFFFFFFF is less than 0.
-  */
-class WrappingUInt32
-{
-public:
-    UInt32 value;
-
-    explicit WrappingUInt32(UInt32 _value)
-            : value(_value)
-    {}
-
-    bool operator<(const WrappingUInt32 & other) const
-    {
-        return value != other.value && *this <= other;
-    }
-
-    bool operator<=(const WrappingUInt32 & other) const
-    {
-        const UInt32 HALF = static_cast<UInt32>(1) << 31;
-        return (value <= other.value && other.value - value < HALF)
-               || (value > other.value && value - other.value > HALF);
-    }
-
-    bool operator==(const WrappingUInt32 & other) const
-    {
-        return value == other.value;
-    }
-};
-
-/** Conforming Zxid definition.
-  * cf. https://github.com/apache/zookeeper/blob/631d1b284f0edb1c4f6b0fb221bf2428aec71aaa/zookeeper-docs/src/main/resources/markdown/zookeeperInternals.md#guarantees-properties-and-definitions
-  *
-  * But it is better to read this: https://zookeeper.apache.org/doc/r3.1.2/zookeeperProgrammers.html
-  *
-  * Actually here is the definition of Zxid.
-  * Every change to the ZooKeeper state receives a stamp in the form of a zxid (ZooKeeper Transaction Id).
-  * This exposes the total ordering of all changes to ZooKeeper. Each change will have a unique zxid
-  * and if zxid1 is smaller than zxid2 then zxid1 happened before zxid2.
-  */
-class Zxid
-{
-public:
-    WrappingUInt32 epoch;
-    WrappingUInt32 counter;
-    explicit Zxid(UInt64 _zxid)
-            : epoch(static_cast<UInt32>(_zxid >> 32))
-            , counter(static_cast<UInt32>(_zxid))
-    {}
-
-    bool operator<=(const Zxid & other) const
-    {
-        return (epoch < other.epoch)
-               || (epoch == other.epoch && counter <= other.counter);
-    }
-
-    bool operator==(const Zxid & other) const
-    {
-        return epoch == other.epoch && counter == other.counter;
-    }
-};
-
-/* When multiple ClusterCopiers discover that the target partition is not empty,
- * they will attempt to clean up this partition before proceeding to copying.
- *
- * Instead of purging is_dirty, the history of cleaning work is preserved and partition hygiene is established
- * based on a happens-before relation between the events.
- * This relation is encoded by LogicalClock based on the mzxid of the is_dirty ZNode and is_dirty/cleaned.
- * The fact of the partition hygiene is encoded by CleanStateClock.
- *
- * For you to know what mzxid means:
- *
- * ZooKeeper Stat Structure:
- * The Stat structure for each znode in ZooKeeper is made up of the following fields:
- *
- * -- czxid
- * The zxid of the change that caused this znode to be created.
- *
- * -- mzxid
- * The zxid of the change that last modified this znode.
- *
- * -- ctime
- * The time in milliseconds from epoch when this znode was created.
- *
- * -- mtime
- * The time in milliseconds from epoch when this znode was last modified.
- *
- * -- version
- * The number of changes to the data of this znode.
- *
- * -- cversion
- * The number of changes to the children of this znode.
- *
- * -- aversion
- * The number of changes to the ACL of this znode.
- *
- * -- ephemeralOwner
- * The session id of the owner of this znode if the znode is an ephemeral node.
- * If it is not an ephemeral node, it will be zero.
- *
- * -- dataLength
- * The length of the data field of this znode.
- *
- * -- numChildren
- * The number of children of this znode.
- * */
-
-class LogicalClock
-{
-public:
-    std::optional<Zxid> zxid;
-
-    LogicalClock() = default;
-
-    explicit LogicalClock(UInt64 _zxid)
-            : zxid(_zxid)
-    {}
-
-    bool hasHappened() const
-    {
-        return bool(zxid);
-    }
-
-    /// happens-before relation with a reasonable time bound
-    bool happensBefore(const LogicalClock & other) const
-    {
-        return !zxid
-               || (other.zxid && *zxid <= *other.zxid);
-    }
-
-    bool operator<=(const LogicalClock & other) const
-    {
-        return happensBefore(other);
-    }
-
-    /// strict equality check
-    bool operator==(const LogicalClock & other) const
-    {
-        return zxid == other.zxid;
-    }
-};
-
-
-class CleanStateClock
-{
-public:
-    LogicalClock discovery_zxid;
-    std::optional<UInt32> discovery_version;
-
-    LogicalClock clean_state_zxid;
-    std::optional<UInt32> clean_state_version;
-
-    std::shared_ptr<std::atomic_bool> stale;
-
-    bool is_clean() const
-    {
-        return !is_stale()
-            && (!discovery_zxid.hasHappened() || (clean_state_zxid.hasHappened() && discovery_zxid <= clean_state_zxid));
-    }
-
-    bool is_stale() const
-    {
-        return stale->load();
-    }
-
-    CleanStateClock(
-            const zkutil::ZooKeeperPtr & zookeeper,
-            const String & discovery_path,
-            const String & clean_state_path)
-            : stale(std::make_shared<std::atomic_bool>(false))
-    {
-        Coordination::Stat stat{};
-        String _some_data;
-        auto watch_callback =
-                [my_stale = stale] (const Coordination::WatchResponse & rsp)
-                {
-                    auto logger = &Poco::Logger::get("ClusterCopier");
-                    if (rsp.error == Coordination::Error::ZOK)
-                    {
-                        switch (rsp.type)
-                        {
-                            case Coordination::CREATED:
-                                LOG_DEBUG(logger, "CleanStateClock change: CREATED, at {}", rsp.path);
-                                my_stale->store(true);
-                                break;
-                            case Coordination::CHANGED:
-                                LOG_DEBUG(logger, "CleanStateClock change: CHANGED, at {}", rsp.path);
-                                my_stale->store(true);
-                        }
-                    }
-                };
-        if (zookeeper->tryGetWatch(discovery_path, _some_data, &stat, watch_callback))
-        {
-            discovery_zxid = LogicalClock(stat.mzxid);
-            discovery_version = stat.version;
-        }
-        if (zookeeper->tryGetWatch(clean_state_path, _some_data, &stat, watch_callback))
-        {
-            clean_state_zxid = LogicalClock(stat.mzxid);
-            clean_state_version = stat.version;
-        }
-    }
-
-    bool operator==(const CleanStateClock & other) const
-    {
-        return !is_stale()
-               && !other.is_stale()
-               && discovery_zxid == other.discovery_zxid
-               && discovery_version == other.discovery_version
-               && clean_state_zxid == other.clean_state_zxid
-               && clean_state_version == other.clean_state_version;
-    }
-
-    bool operator!=(const CleanStateClock & other) const
-    {
-        return !(*this == other);
-    }
-};
diff --git a/programs/copier/clickhouse-copier.cpp b/programs/copier/clickhouse-copier.cpp
deleted file mode 100644
index 4dabb01775b..00000000000
--- a/programs/copier/clickhouse-copier.cpp
+++ /dev/null
@@ -1 +0,0 @@
-int mainEntryClickHouseClusterCopier(int argc, char ** argv);
diff --git a/programs/diagnostics/.gitignore b/programs/diagnostics/.gitignore
deleted file mode 100644
index 5e0b0165f38..00000000000
--- a/programs/diagnostics/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-# If you prefer the allow list template instead of the deny list, see community template:
-# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
-#
-# Binaries for programs and plugins
-*.exe
-*.exe~
-*.dll
-*.so
-*.dylib
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool, specifically when used with LiteIDE
-*.out
-
-# Dependency directories (remove the comment below to include it)
-# vendor/
-
-# Go workspace file
-go.work
-
-.idea
-clickhouse-diagnostics
-output
-vendor
-bin
-profile.cov
-clickhouse-diagnostics.yml
-dist/
diff --git a/programs/diagnostics/CONTRIBUTION.md b/programs/diagnostics/CONTRIBUTION.md
deleted file mode 100644
index 00fb073cefe..00000000000
--- a/programs/diagnostics/CONTRIBUTION.md
+++ /dev/null
@@ -1,49 +0,0 @@
-# Contribution
-
-We keep things simple. Execute all commands in this folder.
-
-## Requirements
-
-- docker - tested on version 20.10.12.
-- golang >= go1.17.6
-
-## Building
-
-Creates a binary `clickhouse-diagnostics` in the local folder. Build will be versioned according to a timestamp. For a versioned release see [Releasing](#releasing).
-
-```bash
-make build
-```
-
-## Linting
-
-We use [golangci-lint](https://golangci-lint.run/). We use a container to run so no need to install.
-
-```bash
-make lint-go
-```
-
-## Running Tests
-
-```bash
-make test
-```
-
-For a coverage report,
-
-```bash
-make test-coverage
-```
-
-## Adding Collectors
-
-TODO
-
-
-## Adding Outputs
-
-TODO
-
-## Frames
-
-## Parameter Types
diff --git a/programs/diagnostics/Makefile b/programs/diagnostics/Makefile
deleted file mode 100644
index 2e85002b871..00000000000
--- a/programs/diagnostics/Makefile
+++ /dev/null
@@ -1,65 +0,0 @@
-GOCMD=go
-GOTEST=$(GOCMD) test
-BINARY_NAME=clickhouse-diagnostics
-BUILD_DIR=dist
-
-TIMESTAMP := $(shell date +%Y%m%d-%H%M)
-COMMIT := $(shell git rev-parse --short HEAD)
-MODULE := github.com/ClickHouse/ClickHouse/programs/diagnostics
-VERSION := v.dev-${TIMESTAMP}
-DEVLDFLAGS = -ldflags "-X ${MODULE}/cmd.Version=${VERSION} -X ${MODULE}/cmd.Commit=${COMMIT}"
-
-# override with env variable to test other versions e.g. 21.11.10.1
-CLICKHOUSE_VERSION ?= latest
-
-GREEN  := $(shell tput -Txterm setaf 2)
-YELLOW := $(shell tput -Txterm setaf 3)
-WHITE  := $(shell tput -Txterm setaf 7)
-CYAN   := $(shell tput -Txterm setaf 6)
-RESET  := $(shell tput -Txterm sgr0)
-
-.PHONY: all test build vendor release lint-go test-coverages dep
-
-all: help
-
-release: ## Release is delegated to goreleaser
-	$(shell goreleaser release --rm-dist)
-
-## Build:
-build: ## Build a binary for local use
-	# timestamped version
-	$(GOCMD) build ${DEVLDFLAGS} -o $(BINARY_NAME) ./cmd/clickhouse-diagnostics
-
-clean: ## Remove build related file
-	rm ${BINARY_NAME}
-	rm -f checkstyle-report.xml ./coverage.xml ./profile.cov
-
-vendor: ## Copy of all packages needed to support builds and tests in the vendor directory
-	$(GOCMD) mod vendor
-
-test: ## Run the tests of the project
-	CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race `go list ./... | grep -v ./internal/platform/test`
-
-test-no-docker: ## Don't run tests depending on dockerd
-	CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -v -race -tags no_docker `go list ./... | grep -v ./internal/platform/test`
-
-lint-go: ## Use golintci-lint
-	docker run --rm -v $(shell pwd):/app -w /app golangci/golangci-lint:latest-alpine golangci-lint run
-
-test-coverage: ## Run the tests of the project and export the coverage
-	CLICKHOUSE_VERSION=$(CLICKHOUSE_VERSION) $(GOTEST) -cover -covermode=count -coverprofile=profile.cov `go list ./... | grep -v ./internal/platform/test`
-	$(GOCMD) tool cover -func profile.cov
-
-dep:
-  $(shell go mod download)
-
-help: ## Show this help.
-	@echo ''
-	@echo 'Usage:'
-	@echo '  ${YELLOW}make${RESET} ${GREEN}<target>${RESET}'
-	@echo ''
-	@echo 'Targets:'
-	@awk 'BEGIN {FS = ":.*?## "} { \
-		if (/^[a-zA-Z_-]+:.*?##.*$$/) {printf "    ${YELLOW}%-20s${GREEN}%s${RESET}\n", $$1, $$2} \
-		else if (/^## .*$$/) {printf "  ${CYAN}%s${RESET}\n", substr($$1,4)} \
-		}' $(MAKEFILE_LIST)
diff --git a/programs/diagnostics/README.md b/programs/diagnostics/README.md
deleted file mode 100644
index f800bb0648e..00000000000
--- a/programs/diagnostics/README.md
+++ /dev/null
@@ -1,167 +0,0 @@
-# Clickhouse Diagnostics Tool
-
-## Purpose
-
-This tool provides a means of obtaining a diagnostic bundle from a ClickHouse instance. This bundle can be provided to your nearest ClickHouse support provider in order to assist with the diagnosis of issues.
-
-## Design Philosophy
-
-- **No local dependencies** to run. We compile to a platform-independent binary, hence Go.
-- **Minimize resource overhead**. Improvements always welcome.
-- **Extendable framework**. At its core, the tool provides collectors and outputs. Collectors are independent and are responsible for collecting a specific dataset e.g. system configuration. Outputs produce the diagnostic bundle in a specific format. It should be trivial to add both for contributors. See [Collectors](#collectors) and [Outputs](#outputs) for more details.
-- **Convertible output formats**. Outputs produce diagnostic bundles in different formats e.g. archive, simple report etc. Where possible, it should be possible to convert between these formats. For example, an administrator may provide a bundle as an archive to their support provider who in turn wishes to visualise this as a report or even in ClickHouse itself...
-- **Something is better than nothing**. Collectors execute independently. We never fail a collection because one fails - preferring to warn the user only. There are good reasons for a collector failure e.g. insufficient permissions or missing data.
-- **Execute anywhere** - Ideally, this tool is executed on a ClickHouse host. Some collectors e.g. configuration file collection or system information, rely on this. However, collectors will obtain as much information remotely from the database as possible if executed remotely from the cluster - warning where collection fails. **We do currently require ClickHouse to be running, connecting over the native port**.
-
-We recommend reading [Permissions, Warnings & Locality](#permissions-warnings--locality).
-
-## Usage
-
-### Collection
-
-The `collect` command allows the collection of a diagnostic bundle. In its simplest form, assuming ClickHouse is running locally on default ports with no password:
-
-```bash
-clickhouse-diagnostics collect
-```
-
-This will use the default collectors and the simple output. This output produces a timestamped archive bundle in `gz` format in a sub folder named after the host. This folder name can be controlled via the parameter `--id` or configured directly for the simple output parameter `output.simple.folder` (this allows a specific directory to be specified).
-
-Collectors, Outputs and ClickHouse connection credentials can be specified as shown below:
-
-```bash
-clickhouse-diagnostics collect --password random --username default --collector=system_db,system --output=simple --id my_cluster_name
-```
-
-This collects the system database and host information from the cluster running locally. The archive bundle will be produced under a folder `my_cluster_name`.
-
-For further details, use the in built help (the commands below are equivalent):
-
-```bash
-clickhouse-diagnostics collect --help
-./clickhouse-diagnostics help collect
-```
-
-### Help & Finding parameters for collectors & outputs
-
-Collectors and outputs have their own parameters not listed under the help for the command for the `collect` command. These can be identified using the `help` command. Specifically,
-
-For more information about a specific collector.
-
-```bash
-Use "clickhouse-diagnostics help --collector [collector]" 
-```
-
-For more information about a specific output.
-
-```bash
-Use "clickhouse-diagnostics help --output [output]" 
-```
-
-### Convert
-
-Coming soon to a cluster near you...
-
-## Collectors
-
-We currently support the following collectors. A `*` indicates this collector is enabled by default:
-
-- `system_db*` - Collects all tables in the system database, except those which have been excluded and up to a specified row limit.
-- `system*` - Collects summary OS and hardware statistics for the host.
-- `config*` - Collects the ClickHouse configuration from the local filesystem. A best effort is made using process information if ClickHouse is not installed locally. `include_path` are also considered. 
-- `db_logs*` - Collects the ClickHouse logs directly from the database.
-- `logs*` - Collects the ClickHouse logs directly from the database.
-- `summary*` - Collects summary statistics on the database based on a set of known useful queries. This represents the easiest collector to extend - contributions are welcome to this set which can be found [here](https://github.com/ClickHouse/ClickHouse/blob/master/programs/diagnostics/internal/collectors/clickhouse/queries.json).
-- `file` - Collects files based on glob patterns. Does not collect directories. To preview files which will be collected try, `clickhouse-diagnostics collect --collectors=file --collector.file.file_pattern=<glob path> --output report`
-- `command` - Collects the output of a user specified command. To preview output, `clickhouse-diagnostics collect --collectors=command --collector.command.command="<command>" --output report`
-- `zookeeper_db` - Collects information about zookeeper using the `system.zookeeper` table, recursively iterating the zookeeper tree/table. Note: changing the default parameter values can cause extremely high load to be placed on the database. Use with caution. By default, uses the glob `/clickhouse/{task_queue}/**` to match zookeeper paths and iterates to a max depth of 8.
-
-## Outputs
-
-We currently support the following outputs. The `simple` output is currently the default:
-
-- `simple` - Writes out the diagnostic bundle as files in a structured directory, optionally producing a compressed archive.
-- `report` - Writes out the diagnostic bundle to the terminal as a simple report. Supports an ascii table format or markdown.
-- `clickhouse` - **Under development**. This will allow a bundle to be stored in a cluster allowing visualization in common tooling e.g. Grafana.
-
-## Simple Output
-
-Since the `simple` output is the default we provide additional details here. 
-This output produces a timestamped archive by default in `gz` format under a directory created with either the hostname of the specified collection `--id`. As shown below, a specific folder can also be specified. Compression can also be disabled, leaving just the contents of the folder:
-
-```bash
-./clickhouse-diagnostics help --output simple
-
-Writes out the diagnostic bundle as files in a structured directory, optionally producing a compressed archive.
-
-Usage:
-  --output=simple [flags]
-
-Flags:
-      --output.simple.directory string   Directory in which to create dump. Defaults to the current directory. (default "./")
-      --output.simple.format string      Format of exported files (default "csv")
-      --output.simple.skip_archive       Don't compress output to an archive
-```
-
-The archive itself contains a folder for each collector. Each collector can potentially produce many discrete sets of data, known as frames. Each of these typically results in a single file within the collector's folder. For example, each query for the `summary` collector results in a correspondingly named file within the `summary` folder. 
-
-## Permissions, Warnings & Locality
-
-Some collectors either require specific permissions for complete collection or should be executed on a ClickHouse host. We aim to collate these requirements below:
-
-- `system_db` - This collect aims to collect all tables in the `system` database. Some tables may fail if certain features are not enabled. Specifically,[allow_introspection_functions](https://clickhouse.com/docs/en/operations/settings/settings/#settings-allow_introspection_functions) is required to collect the `stack_traces` table. [access_management](https://clickhouse.com/docs/en/operations/settings/settings-users/#access_management-user-setting) must be set for the ClickHouse user specified for collection, to permit access to access management tables e.g. `quota_usage`.
-- `db_logs`- The ClickHouse user must have access to the tables `query_log`,`query_thread_log` and `text_log`.
-- `logs` - The system user under which the tool is executed must have access to the logs directory. It must therefore also be executed on the target ClickHouse server directly for this collector work. In cases where the logs directory is not a default location e.g. `/var/log/clickhouse-server` we will attempt to establish the location from the ClickHouse configuration. This requires permissions to read the configuration files - which in most cases requires specific permissions to be granted to the run user if you are not comfortable executing the tool under sudo or the `clickhouse` user.
-- `summary`- This collector executes pre-recorded queries. Some of these read tables concerning access management, thus requiring the ClickHouse user to have the [access_management](https://clickhouse.com/docs/en/operations/settings/settings-users/#access_management-user-setting) permission.
-- `config` - This collector reads and copies the local configuration files. It thus requires permissions to read the configuration files - which in most cases requires specific permissions to be granted to the run user if you are not comfortable executing the tool under sudo or the `clickhouse` user.
-
-**If a collector cannot collect specific data because of either execution location or permissions, it will log a warning to the terminal.**
-
-## Logging
-
-All logs are output to `stderr`. `stdout` is used exclusively for outputs to print information.
-
-## Configuration file
-
-In addition to supporting parameters via the command line, a configuration file can be specified via the `--config`, `-f` flag. 
-
-By default, we look for a configuration file `clickhouse-diagnostics.yml` in the same directory as the binary. If not present, we revert to command line flags.
-
-**Values set via the command line values always take precedence over those in the configuration file.**
-
-All parameters can be set via the configuration file and can in most cases be converted to a yaml hierarchy, where periods indicate a nesting. For example,
-
-`--collector.system_db.row_limit=1`
-
-becomes
-
-```yaml
-collector:
-  system_db:
-    row_limit: 1
-```
-
-The following exceptions exist to avoid collisions:
-
-| Command | Parameter  | Configuration File |
-|---------|------------|--------------------|
-| collect | output     | collect.output     |
-| collect | collectors | collect.collectors |
-
-## FAQ
-
-1. Does the collector need root permissions?
-
-    No. However, to read some local files e.g. configurations, the tool should be executed as the `clickhouse` user.
-
-2. What ClickHouse database permissions does the collector need?
-
-    Read permissions on all system tables are required in most cases - although only specific collectors need this. [Access management permissions]((https://clickhouse.com/docs/en/operations/settings/settings-users/#access_management-user-setting)) will ensure full collection.
-
-3. Is any processing done on logs for anonimization purposes?
-
-    Currently no. ClickHouse should not log sensitive information to logs e.g. passwords.
-
-4. Is sensitive information removed from configuration files e.g. passwords?
-
-    Yes. We remove both passwords and hashed passwords. Please raise an issue if you require further information to be anonimized. We appreciate this is a sensitive topic.
diff --git a/programs/diagnostics/cmd/clickhouse-diagnostics/main.go b/programs/diagnostics/cmd/clickhouse-diagnostics/main.go
deleted file mode 100644
index 0a849a9f520..00000000000
--- a/programs/diagnostics/cmd/clickhouse-diagnostics/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import (
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd"
-)
-
-func main() {
-	cmd.Execute()
-}
diff --git a/programs/diagnostics/cmd/collect.go b/programs/diagnostics/cmd/collect.go
deleted file mode 100644
index 503d8e41fb7..00000000000
--- a/programs/diagnostics/cmd/collect.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/file"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/terminal"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"github.com/spf13/viper"
-)
-
-var id string
-var output = params.StringOptionsVar{
-	Options: outputs.GetOutputNames(),
-	Value:   "simple",
-}
-
-// access credentials
-var host string
-var port uint16
-var username string
-var password string
-
-var collectorNames = params.StringSliceOptionsVar{
-	Options: collectors.GetCollectorNames(false),
-	Values:  collectors.GetCollectorNames(true),
-}
-
-// holds the collector params passed by the cli
-var collectorParams params.ParamMap
-
-// holds the output params passed by the cli
-var outputParams params.ParamMap
-
-const collectHelpTemplate = `Usage:{{if .Runnable}}
-  {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
-  {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
-
-Aliases:
-  {{.NameAndAliases}}{{end}}{{if .HasExample}}
-
-Examples:
-{{.Example}}{{end}}{{if .HasAvailableSubCommands}}
-
-Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
-
-Flags:
-{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
-
-Global Flags:
-{{.InheritedFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}
-
-Additional help topics:
-	Use "{{.CommandPath}} [command] --help" for more information about a command.
-	Use "{{.Parent.Name}} help --collector [collector]" for more information about a specific collector.
-	Use "{{.Parent.Name}} help --output [output]" for more information about a specific output.
-`
-
-func init() {
-	collectCmd.Flags().StringVar(&id, "id", getHostName(), "Id of diagnostic bundle")
-
-	// access credentials
-	collectCmd.Flags().StringVar(&host, "host", "localhost", "ClickHouse host")
-	collectCmd.Flags().Uint16VarP(&port, "port", "p", 9000, "ClickHouse native port")
-	collectCmd.Flags().StringVarP(&username, "username", "u", "", "ClickHouse username")
-	collectCmd.Flags().StringVar(&password, "password", "", "ClickHouse password")
-	// collectors and outputs
-	collectCmd.Flags().VarP(&output, "output", "o", fmt.Sprintf("Output Format for the diagnostic Bundle, options: [%s]\n", strings.Join(output.Options, ",")))
-	collectCmd.Flags().VarP(&collectorNames, "collectors", "c", fmt.Sprintf("Collectors to use, options: [%s]\n", strings.Join(collectorNames.Options, ",")))
-
-	collectorConfigs, err := collectors.BuildConfigurationOptions()
-	if err != nil {
-		log.Fatal().Err(err).Msg("Unable to build collector configurations")
-	}
-	collectorParams = params.NewParamMap(collectorConfigs)
-
-	outputConfigs, err := outputs.BuildConfigurationOptions()
-	if err != nil {
-		log.Fatal().Err(err).Msg("Unable to build output configurations")
-	}
-	params.AddParamMapToCmd(collectorParams, collectCmd, "collector", true)
-
-	outputParams = params.NewParamMap(outputConfigs)
-	params.AddParamMapToCmd(outputParams, collectCmd, "output", true)
-
-	collectCmd.SetFlagErrorFunc(handleFlagErrors)
-	collectCmd.SetHelpTemplate(collectHelpTemplate)
-	rootCmd.AddCommand(collectCmd)
-}
-
-var collectCmd = &cobra.Command{
-	Use:   "collect",
-	Short: "Collect a diagnostic bundle",
-	Long:  `Collect a ClickHouse diagnostic bundle for a specified ClickHouse instance`,
-	PreRun: func(cmd *cobra.Command, args []string) {
-		bindFlagsToConfig(cmd)
-	},
-	Example: fmt.Sprintf(`%s collect --username default --collector=%s --output=simple`, rootCmd.Name(), strings.Join(collectorNames.Options[:2], ",")),
-	Run: func(cmd *cobra.Command, args []string) {
-		log.Info().Msgf("executing collect command with %v collectors and %s output", collectorNames.Values, output.Value)
-		outputConfig := params.ConvertParamsToConfig(outputParams)[output.Value]
-		runConfig := internal.NewRunConfiguration(id, host, port, username, password, output.Value, outputConfig, collectorNames.Values, params.ConvertParamsToConfig(collectorParams))
-		internal.Capture(runConfig)
-		os.Exit(0)
-	},
-}
-
-func getHostName() string {
-	name, err := os.Hostname()
-	if err != nil {
-		name = "clickhouse-diagnostics"
-	}
-	return name
-}
-
-// these flags are nested under the cmd name in the config file to prevent collisions
-var flagsToNest = []string{"output", "collectors"}
-
-// this saves us binding each command manually to viper
-func bindFlagsToConfig(cmd *cobra.Command) {
-	cmd.Flags().VisitAll(func(f *pflag.Flag) {
-		err := viper.BindEnv(f.Name, fmt.Sprintf("%s_%s", envPrefix,
-			strings.ToUpper(strings.Replace(f.Name, ".", "_", -1))))
-		if err != nil {
-			log.Error().Msgf("Unable to bind %s to config", f.Name)
-		}
-		configFlagName := f.Name
-		if utils.Contains(flagsToNest, f.Name) {
-			configFlagName = fmt.Sprintf("%s.%s", cmd.Use, configFlagName)
-		}
-		err = viper.BindPFlag(configFlagName, f)
-		if err != nil {
-			log.Error().Msgf("Unable to bind %s to config", f.Name)
-		}
-		// here we prefer the config value when the param is not set on the cmd line
-		if !f.Changed && viper.IsSet(configFlagName) {
-			val := viper.Get(configFlagName)
-			log.Debug().Msgf("Setting parameter %s from configuration file", f.Name)
-			err = cmd.Flags().Set(f.Name, fmt.Sprintf("%v", val))
-			if err != nil {
-				log.Error().Msgf("Unable to read \"%s\" value from config", f.Name)
-			} else {
-				log.Debug().Msgf("Set parameter \"%s\" from configuration", f.Name)
-			}
-		}
-	})
-}
diff --git a/programs/diagnostics/cmd/convert.go b/programs/diagnostics/cmd/convert.go
deleted file mode 100644
index 1d619dd05e2..00000000000
--- a/programs/diagnostics/cmd/convert.go
+++ /dev/null
@@ -1 +0,0 @@
-package cmd
diff --git a/programs/diagnostics/cmd/help.go b/programs/diagnostics/cmd/help.go
deleted file mode 100644
index 750576dda25..00000000000
--- a/programs/diagnostics/cmd/help.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
-)
-
-var cHelp = params.StringOptionsVar{
-	Options: collectors.GetCollectorNames(false),
-	Value:   "",
-}
-var oHelp = params.StringOptionsVar{
-	Options: outputs.GetOutputNames(),
-	Value:   "",
-}
-
-func init() {
-	helpCmd.Flags().VarP(&cHelp, "collector", "c", "Specify collector to get description of available flags")
-	helpCmd.Flags().VarP(&oHelp, "output", "o", "Specify output to get description of available flags")
-	helpCmd.SetUsageTemplate(`Usage:{{if .Runnable}}
-  {{.UseLine}}{{end}}{{if .HasExample}}
-
-Examples:
-{{.Example}}{{end}}
-
-Available Commands:{{range .Parent.Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
-
-Flags:
-{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}
-
-Alternatively use "{{.CommandPath}} [command] --help" for more information about a command.
-`)
-	helpCmd.SetFlagErrorFunc(handleFlagErrors)
-
-}
-
-var helpCmd = &cobra.Command{
-	Use:   "help [command]",
-	Short: "Help about any command, collector or output",
-	Long:  `Help provides help for any command, collector or output in the application.`,
-	Example: fmt.Sprintf(`%[1]v help collect
-%[1]v help --collector=config
-%[1]v help --output=simple`, rootCmd.Name()),
-	Run: func(c *cobra.Command, args []string) {
-		if len(args) != 0 {
-			//find the command on which help is requested
-			cmd, _, e := c.Root().Find(args)
-			if cmd == nil || e != nil {
-				c.Printf("Unknown help topic %#q\n", args)
-				cobra.CheckErr(c.Root().Usage())
-			} else {
-				cmd.InitDefaultHelpFlag()
-				cobra.CheckErr(cmd.Help())
-			}
-			return
-		}
-		if cHelp.Value != "" && oHelp.Value != "" {
-			log.Error().Msg("Specify either --collector or --output not both")
-			_ = c.Help()
-			os.Exit(1)
-		}
-		if cHelp.Value != "" {
-			collector, err := collectors.GetCollectorByName(cHelp.Value)
-			if err != nil {
-				log.Fatal().Err(err).Msgf("Unable to initialize collector %s", cHelp.Value)
-			}
-			configHelp(collector.Configuration(), "collector", cHelp.Value, collector.Description())
-		} else if oHelp.Value != "" {
-			output, err := outputs.GetOutputByName(oHelp.Value)
-			if err != nil {
-				log.Fatal().Err(err).Msgf("Unable to initialize output %s", oHelp.Value)
-			}
-			configHelp(output.Configuration(), "output", oHelp.Value, output.Description())
-		} else {
-			_ = c.Help()
-		}
-		os.Exit(0)
-	},
-}
-
-func configHelp(conf config.Configuration, componentType, name, description string) {
-
-	paramMap := params.NewParamMap(map[string]config.Configuration{
-		name: conf,
-	})
-	tempHelpCmd := &cobra.Command{
-		Use:           fmt.Sprintf("--%s=%s", componentType, name),
-		Short:         fmt.Sprintf("Help about the %s collector", name),
-		Long:          description,
-		SilenceErrors: true,
-		Run: func(c *cobra.Command, args []string) {
-			_ = c.Help()
-		},
-	}
-	params.AddParamMapToCmd(paramMap, tempHelpCmd, componentType, false)
-	// this is workaround to hide the help flag
-	tempHelpCmd.Flags().BoolP("help", "h", false, "Dummy help")
-	tempHelpCmd.Flags().Lookup("help").Hidden = true
-	tempHelpCmd.SetUsageTemplate(`
-{{.Long}}
-
-Usage:{{if .Runnable}}
-  {{.UseLine}}{{end}}{{if .HasExample}}
-
-Examples:
-{{.Example}}{{end}}
-
-Flags:{{if .HasAvailableLocalFlags}}
-{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{else}}
-
-	No configuration flags available
-{{end}}
-`)
-
-	_ = tempHelpCmd.Execute()
-}
diff --git a/programs/diagnostics/cmd/params/params.go b/programs/diagnostics/cmd/params/params.go
deleted file mode 100644
index c4464aab5d2..00000000000
--- a/programs/diagnostics/cmd/params/params.go
+++ /dev/null
@@ -1,281 +0,0 @@
-package params
-
-import (
-	"bytes"
-	"encoding/csv"
-	"fmt"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/spf13/cobra"
-)
-
-type cliParamType uint8
-
-const (
-	String cliParamType = iota
-	StringList
-	StringOptionsList
-	Integer
-	Boolean
-)
-
-type CliParam struct {
-	Description string
-	Default     interface{}
-	//this should always be an address to a value - as required by cobra
-	Value interface{}
-	Type  cliParamType
-}
-
-type ParamMap map[string]map[string]CliParam
-
-func NewParamMap(configs map[string]config.Configuration) ParamMap {
-	paramMap := make(ParamMap)
-	for name, configuration := range configs {
-		for _, param := range configuration.Params {
-			switch p := param.(type) {
-			case config.StringParam:
-				paramMap = paramMap.createStringParam(name, p)
-			case config.StringListParam:
-				paramMap = paramMap.createStringListParam(name, p)
-			case config.StringOptions:
-				paramMap = paramMap.createStringOptionsParam(name, p)
-			case config.IntParam:
-				paramMap = paramMap.createIntegerParam(name, p)
-			case config.BoolParam:
-				paramMap = paramMap.createBoolParam(name, p)
-			}
-		}
-	}
-	return paramMap
-}
-
-func (m ParamMap) createBoolParam(rootKey string, bParam config.BoolParam) ParamMap {
-	if _, ok := m[rootKey]; !ok {
-		m[rootKey] = make(map[string]CliParam)
-	}
-	var value bool
-	param := CliParam{
-		Description: bParam.Description(),
-		Default:     bParam.Value,
-		Value:       &value,
-		Type:        Boolean,
-	}
-	m[rootKey][bParam.Name()] = param
-	return m
-}
-
-func (m ParamMap) createStringParam(rootKey string, sParam config.StringParam) ParamMap {
-	if _, ok := m[rootKey]; !ok {
-		m[rootKey] = make(map[string]CliParam)
-	}
-	var value string
-	param := CliParam{
-		Description: sParam.Description(),
-		Default:     sParam.Value,
-		Value:       &value,
-		Type:        String,
-	}
-	m[rootKey][sParam.Name()] = param
-	return m
-}
-
-func (m ParamMap) createStringListParam(rootKey string, lParam config.StringListParam) ParamMap {
-	if _, ok := m[rootKey]; !ok {
-		m[rootKey] = make(map[string]CliParam)
-	}
-	var value []string
-	param := CliParam{
-		Description: lParam.Description(),
-		Default:     lParam.Values,
-		Value:       &value,
-		Type:        StringList,
-	}
-	m[rootKey][lParam.Name()] = param
-	return m
-}
-
-func (m ParamMap) createStringOptionsParam(rootKey string, oParam config.StringOptions) ParamMap {
-	if _, ok := m[rootKey]; !ok {
-		m[rootKey] = make(map[string]CliParam)
-	}
-	value := StringOptionsVar{
-		Options: oParam.Options,
-		Value:   oParam.Value,
-	}
-	param := CliParam{
-		Description: oParam.Description(),
-		Default:     oParam.Value,
-		Value:       &value,
-		Type:        StringOptionsList,
-	}
-	m[rootKey][oParam.Name()] = param
-	return m
-}
-
-func (m ParamMap) createIntegerParam(rootKey string, iParam config.IntParam) ParamMap {
-	if _, ok := m[rootKey]; !ok {
-		m[rootKey] = make(map[string]CliParam)
-	}
-	var value int64
-	param := CliParam{
-		Description: iParam.Description(),
-		Default:     iParam.Value,
-		Value:       &value,
-		Type:        Integer,
-	}
-	m[rootKey][iParam.Name()] = param
-	return m
-}
-
-func (c CliParam) GetConfigParam(name string) config.ConfigParam {
-	// this is a config being passed to a collector - required can be false
-	param := config.NewParam(name, c.Description, false)
-	switch c.Type {
-	case String:
-		return config.StringParam{
-			Param: param,
-			// values will be pointers
-			Value: *(c.Value.(*string)),
-		}
-	case StringList:
-		return config.StringListParam{
-			Param:  param,
-			Values: *(c.Value.(*[]string)),
-		}
-	case StringOptionsList:
-		optionsVar := *(c.Value.(*StringOptionsVar))
-		return config.StringOptions{
-			Param:   param,
-			Options: optionsVar.Options,
-			Value:   optionsVar.Value,
-		}
-	case Integer:
-		return config.IntParam{
-			Param: param,
-			Value: *(c.Value.(*int64)),
-		}
-	case Boolean:
-		return config.BoolParam{
-			Param: param,
-			Value: *(c.Value.(*bool)),
-		}
-	}
-	return param
-}
-
-type StringOptionsVar struct {
-	Options []string
-	Value   string
-}
-
-func (o StringOptionsVar) String() string {
-	return o.Value
-}
-
-func (o *StringOptionsVar) Set(p string) error {
-	isIncluded := func(opts []string, val string) bool {
-		for _, opt := range opts {
-			if val == opt {
-				return true
-			}
-		}
-		return false
-	}
-	if !isIncluded(o.Options, p) {
-		return fmt.Errorf("%s is not included in options: %v", p, o.Options)
-	}
-	o.Value = p
-	return nil
-}
-
-func (o *StringOptionsVar) Type() string {
-	return "string"
-}
-
-type StringSliceOptionsVar struct {
-	Options []string
-	Values  []string
-}
-
-func (o StringSliceOptionsVar) String() string {
-	str, _ := writeAsCSV(o.Values)
-	return "[" + str + "]"
-}
-
-func (o *StringSliceOptionsVar) Set(val string) error {
-	values, err := readAsCSV(val)
-	if err != nil {
-		return err
-	}
-	vValues := utils.Distinct(values, o.Options)
-	if len(vValues) > 0 {
-		return fmt.Errorf("%v are not included in options: %v", vValues, o.Options)
-	}
-	o.Values = values
-	return nil
-}
-
-func (o *StringSliceOptionsVar) Type() string {
-	return "stringSlice"
-}
-
-func writeAsCSV(vals []string) (string, error) {
-	b := &bytes.Buffer{}
-	w := csv.NewWriter(b)
-	err := w.Write(vals)
-	if err != nil {
-		return "", err
-	}
-	w.Flush()
-	return strings.TrimSuffix(b.String(), "\n"), nil
-}
-
-func readAsCSV(val string) ([]string, error) {
-	if val == "" {
-		return []string{}, nil
-	}
-	stringReader := strings.NewReader(val)
-	csvReader := csv.NewReader(stringReader)
-	return csvReader.Read()
-}
-
-func AddParamMapToCmd(paramMap ParamMap, cmd *cobra.Command, prefix string, hide bool) {
-	for rootKey, childMap := range paramMap {
-		for childKey, value := range childMap {
-			paramName := fmt.Sprintf("%s.%s.%s", prefix, rootKey, childKey)
-			switch value.Type {
-			case String:
-				cmd.Flags().StringVar(value.Value.(*string), paramName, value.Default.(string), value.Description)
-			case StringList:
-				cmd.Flags().StringSliceVar(value.Value.(*[]string), paramName, value.Default.([]string), value.Description)
-			case StringOptionsList:
-				cmd.Flags().Var(value.Value.(*StringOptionsVar), paramName, value.Description)
-			case Integer:
-				cmd.Flags().Int64Var(value.Value.(*int64), paramName, value.Default.(int64), value.Description)
-			case Boolean:
-				cmd.Flags().BoolVar(value.Value.(*bool), paramName, value.Default.(bool), value.Description)
-			}
-			// this ensures flags from collectors and outputs are not shown as they will pollute the output
-			if hide {
-				_ = cmd.Flags().MarkHidden(paramName)
-			}
-		}
-	}
-}
-
-func ConvertParamsToConfig(paramMap ParamMap) map[string]config.Configuration {
-	configuration := make(map[string]config.Configuration)
-	for rootKey, childMap := range paramMap {
-		if _, ok := configuration[rootKey]; !ok {
-			configuration[rootKey] = config.Configuration{}
-		}
-		for childKey, value := range childMap {
-			configParam := value.GetConfigParam(childKey)
-			configuration[rootKey] = config.Configuration{Params: append(configuration[rootKey].Params, configParam)}
-		}
-	}
-	return configuration
-}
diff --git a/programs/diagnostics/cmd/params/params_test.go b/programs/diagnostics/cmd/params/params_test.go
deleted file mode 100644
index 7671506ba59..00000000000
--- a/programs/diagnostics/cmd/params/params_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package params_test
-
-import (
-	"os"
-	"sort"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/cmd/params"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/spf13/cobra"
-	"github.com/stretchr/testify/require"
-)
-
-var conf = map[string]config.Configuration{
-	"config": {
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value:      "",
-				Param:      config.NewParam("directory", "A directory", false),
-				AllowEmpty: true,
-			},
-		},
-	},
-	"system": {
-		Params: []config.ConfigParam{
-			config.StringListParam{
-				// nil means include everything
-				Values: nil,
-				Param:  config.NewParam("include_tables", "Include tables", false),
-			},
-			config.StringListParam{
-				Values: []string{"distributed_ddl_queue", "query_thread_log", "query_log", "asynchronous_metric_log", "zookeeper"},
-				Param:  config.NewParam("exclude_tables", "Excluded tables", false),
-			},
-			config.IntParam{
-				Value: 100000,
-				Param: config.NewParam("row_limit", "Max rows", false),
-			},
-		},
-	},
-	"reader": {
-		Params: []config.ConfigParam{
-			config.StringOptions{
-				Value:   "csv",
-				Options: []string{"csv"},
-				Param:   config.NewParam("format", "Format of imported files", false),
-			},
-			config.BoolParam{
-				Value: true,
-				Param: config.NewParam("collect_archives", "Collect archives", false),
-			},
-		},
-	},
-}
-
-func TestNewParamMap(t *testing.T) {
-	// test each of the types via NewParamMap - one with each type. the keys here can represent anything e.g. a collector name
-	t.Run("test param map correctly converts types", func(t *testing.T) {
-		paramMap := params.NewParamMap(conf)
-		require.Len(t, paramMap, 3)
-		// check config
-		require.Contains(t, paramMap, "config")
-		require.Len(t, paramMap["config"], 1)
-		require.Contains(t, paramMap["config"], "directory")
-		require.IsType(t, params.CliParam{}, paramMap["config"]["directory"])
-		require.Equal(t, "A directory", paramMap["config"]["directory"].Description)
-		require.Equal(t, "", *(paramMap["config"]["directory"].Value.(*string)))
-		require.Equal(t, "", paramMap["config"]["directory"].Default)
-		require.Equal(t, params.String, paramMap["config"]["directory"].Type)
-		// check system
-		require.Contains(t, paramMap, "system")
-		require.Len(t, paramMap["system"], 3)
-		require.IsType(t, params.CliParam{}, paramMap["system"]["include_tables"])
-
-		require.Equal(t, "Include tables", paramMap["system"]["include_tables"].Description)
-		var value []string
-		require.Equal(t, &value, paramMap["system"]["include_tables"].Value)
-		require.Equal(t, value, paramMap["system"]["include_tables"].Default)
-		require.Equal(t, params.StringList, paramMap["system"]["include_tables"].Type)
-
-		require.Equal(t, "Excluded tables", paramMap["system"]["exclude_tables"].Description)
-		require.IsType(t, params.CliParam{}, paramMap["system"]["exclude_tables"])
-		require.Equal(t, &value, paramMap["system"]["exclude_tables"].Value)
-		require.Equal(t, []string{"distributed_ddl_queue", "query_thread_log", "query_log", "asynchronous_metric_log", "zookeeper"}, paramMap["system"]["exclude_tables"].Default)
-		require.Equal(t, params.StringList, paramMap["system"]["exclude_tables"].Type)
-
-		require.Equal(t, "Max rows", paramMap["system"]["row_limit"].Description)
-		require.IsType(t, params.CliParam{}, paramMap["system"]["row_limit"])
-		var iValue int64
-		require.Equal(t, &iValue, paramMap["system"]["row_limit"].Value)
-		require.Equal(t, int64(100000), paramMap["system"]["row_limit"].Default)
-		require.Equal(t, params.Integer, paramMap["system"]["row_limit"].Type)
-
-		// check reader
-		require.Contains(t, paramMap, "reader")
-		require.Len(t, paramMap["reader"], 2)
-		require.IsType(t, params.CliParam{}, paramMap["reader"]["format"])
-		require.Equal(t, "Format of imported files", paramMap["reader"]["format"].Description)
-		require.IsType(t, params.CliParam{}, paramMap["reader"]["format"])
-		oValue := params.StringOptionsVar{
-			Options: []string{"csv"},
-			Value:   "csv",
-		}
-		require.Equal(t, &oValue, paramMap["reader"]["format"].Value)
-		require.Equal(t, "csv", paramMap["reader"]["format"].Default)
-		require.Equal(t, params.StringOptionsList, paramMap["reader"]["format"].Type)
-
-		require.IsType(t, params.CliParam{}, paramMap["reader"]["collect_archives"])
-		require.Equal(t, "Collect archives", paramMap["reader"]["collect_archives"].Description)
-		require.IsType(t, params.CliParam{}, paramMap["reader"]["collect_archives"])
-		var bVar bool
-		require.Equal(t, &bVar, paramMap["reader"]["collect_archives"].Value)
-		require.Equal(t, true, paramMap["reader"]["collect_archives"].Default)
-		require.Equal(t, params.Boolean, paramMap["reader"]["collect_archives"].Type)
-
-	})
-
-}
-
-//  test GetConfigParam
-func TestConvertParamsToConfig(t *testing.T) {
-	paramMap := params.NewParamMap(conf)
-	t.Run("test we can convert a param map back to a config", func(t *testing.T) {
-		cParam := params.ConvertParamsToConfig(paramMap)
-		// these will not be equal as we have some information loss e.g. allowEmpty
-		//require.Equal(t, conf, cParam)
-		// deep equality
-		for name := range conf {
-			require.Equal(t, len(conf[name].Params), len(cParam[name].Params))
-			// sort both consistently
-			sort.Slice(conf[name].Params, func(i, j int) bool {
-				return conf[name].Params[i].Name() < conf[name].Params[j].Name()
-			})
-			sort.Slice(cParam[name].Params, func(i, j int) bool {
-				return cParam[name].Params[i].Name() < cParam[name].Params[j].Name()
-			})
-			for i, param := range conf[name].Params {
-				require.Equal(t, param.Required(), cParam[name].Params[i].Required())
-				require.Equal(t, param.Name(), cParam[name].Params[i].Name())
-				require.Equal(t, param.Description(), cParam[name].Params[i].Description())
-			}
-		}
-	})
-}
-
-// create via NewParamMap and add to command AddParamMapToCmd - check contents
-func TestAddParamMapToCmd(t *testing.T) {
-	paramMap := params.NewParamMap(conf)
-	t.Run("test we can add hidden params to a command", func(t *testing.T) {
-		testComand := &cobra.Command{
-			Use:   "test",
-			Short: "Run a test",
-			Long:  `Longer description`,
-			Run: func(cmd *cobra.Command, args []string) {
-				os.Exit(0)
-			},
-		}
-		params.AddParamMapToCmd(paramMap, testComand, "collector", true)
-		// check we get an error on one which doesn't exist
-		_, err := testComand.Flags().GetString("collector.config.random")
-		require.NotNil(t, err)
-		// check getting incorrect type
-		_, err = testComand.Flags().GetString("collector.system.include_tables")
-		require.NotNil(t, err)
-
-		// check existence of all flags
-		directory, err := testComand.Flags().GetString("collector.config.directory")
-		require.Nil(t, err)
-		require.Equal(t, "", directory)
-
-		includeTables, err := testComand.Flags().GetStringSlice("collector.system.include_tables")
-		require.Nil(t, err)
-		require.Equal(t, []string{}, includeTables)
-
-		excludeTables, err := testComand.Flags().GetStringSlice("collector.system.exclude_tables")
-		require.Nil(t, err)
-		require.Equal(t, []string{"distributed_ddl_queue", "query_thread_log", "query_log", "asynchronous_metric_log", "zookeeper"}, excludeTables)
-
-		rowLimit, err := testComand.Flags().GetInt64("collector.system.row_limit")
-		require.Nil(t, err)
-		require.Equal(t, int64(100000), rowLimit)
-
-		format, err := testComand.Flags().GetString("collector.reader.format")
-		require.Nil(t, err)
-		require.Equal(t, "csv", format)
-
-		collectArchives, err := testComand.Flags().GetBool("collector.reader.collect_archives")
-		require.Nil(t, err)
-		require.Equal(t, true, collectArchives)
-	})
-}
-
-// test StringOptionsVar
-func TestStringOptionsVar(t *testing.T) {
-
-	t.Run("test we can set", func(t *testing.T) {
-		format := params.StringOptionsVar{
-			Options: []string{"csv", "tsv", "native"},
-			Value:   "csv",
-		}
-		require.Equal(t, "csv", format.String())
-		err := format.Set("tsv")
-		require.Nil(t, err)
-		require.Equal(t, "tsv", format.String())
-	})
-
-	t.Run("test set invalid", func(t *testing.T) {
-		format := params.StringOptionsVar{
-			Options: []string{"csv", "tsv", "native"},
-			Value:   "csv",
-		}
-		require.Equal(t, "csv", format.String())
-		err := format.Set("random")
-		require.NotNil(t, err)
-		require.Equal(t, "random is not included in options: [csv tsv native]", err.Error())
-	})
-}
-
-// test StringSliceOptionsVar
-func TestStringSliceOptionsVar(t *testing.T) {
-
-	t.Run("test we can set", func(t *testing.T) {
-		formats := params.StringSliceOptionsVar{
-			Options: []string{"csv", "tsv", "native", "qsv"},
-			Values:  []string{"csv", "tsv"},
-		}
-		require.Equal(t, "[csv,tsv]", formats.String())
-		err := formats.Set("tsv,native")
-		require.Nil(t, err)
-		require.Equal(t, "[tsv,native]", formats.String())
-	})
-
-	t.Run("test set invalid", func(t *testing.T) {
-		formats := params.StringSliceOptionsVar{
-			Options: []string{"csv", "tsv", "native", "qsv"},
-			Values:  []string{"csv", "tsv"},
-		}
-		require.Equal(t, "[csv,tsv]", formats.String())
-		err := formats.Set("tsv,random")
-		require.NotNil(t, err)
-		require.Equal(t, "[random] are not included in options: [csv tsv native qsv]", err.Error())
-		err = formats.Set("msv,random")
-		require.NotNil(t, err)
-		require.Equal(t, "[msv random] are not included in options: [csv tsv native qsv]", err.Error())
-	})
-
-}
diff --git a/programs/diagnostics/cmd/root.go b/programs/diagnostics/cmd/root.go
deleted file mode 100644
index 4cf329d5438..00000000000
--- a/programs/diagnostics/cmd/root.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"net/http"
-	_ "net/http/pprof"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-)
-
-func enableDebug() {
-	if debug {
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		go func() {
-			err := http.ListenAndServe("localhost:8080", nil)
-			if err != nil {
-				log.Error().Err(err).Msg("unable to start debugger")
-			} else {
-				log.Debug().Msg("debugger has been started on port 8080")
-			}
-		}()
-	}
-}
-
-var rootCmd = &cobra.Command{
-	Use:   "clickhouse-diagnostics",
-	Short: "Capture and convert ClickHouse diagnostic bundles.",
-	Long:  `Captures ClickHouse diagnostic bundles to a number of supported formats, including file and ClickHouse itself. Converts bundles between formats.`,
-	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-		enableDebug()
-		err := initializeConfig()
-		if err != nil {
-			log.Error().Err(err)
-			os.Exit(1)
-		}
-		return nil
-	},
-	Example: `clickhouse-diagnostics collect`,
-}
-
-const (
-	colorRed = iota + 31
-	colorGreen
-	colorYellow
-	colorMagenta = 35
-
-	colorBold = 1
-)
-
-const TimeFormat = time.RFC3339
-
-var debug bool
-var configFiles []string
-
-const (
-	// The environment variable prefix of all environment variables bound to our command line flags.
-	// For example, --output is bound to CLICKHOUSE_DIAGNOSTIC_OUTPUT.
-	envPrefix = "CLICKHOUSE_DIAGNOSTIC"
-)
-
-func init() {
-	rootCmd.PersistentFlags().BoolVarP(&debug, "debug", "d", false, "Enable debug mode")
-	rootCmd.PersistentFlags().StringSliceVarP(&configFiles, "config", "f", []string{"clickhouse-diagnostics.yml", "/etc/clickhouse-diagnostics.yml"}, "Configuration file path")
-	// set a usage template to ensure flags on root are listed as global
-	rootCmd.SetUsageTemplate(`Usage:{{if .Runnable}}
-  {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
-  {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
-
-Aliases:
-  {{.NameAndAliases}}{{end}}{{if .HasExample}}
-
-Examples:
-{{.Example}}{{end}}{{if .HasAvailableSubCommands}}
-
-Available Commands:{{range .Commands}}{{if (or .IsAvailableCommand (eq .Name "help"))}}
-  {{rpad .Name .NamePadding }} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableLocalFlags}}
-
-Global Flags:
-{{.LocalFlags.FlagUsages | trimTrailingWhitespaces}}{{end}}{{if .HasAvailableInheritedFlags}}
-
-Additional help topics:{{range .Commands}}{{if .IsAdditionalHelpTopicCommand}}
-  {{rpad .CommandPath .CommandPathPadding}} {{.Short}}{{end}}{{end}}{{end}}{{if .HasAvailableSubCommands}}
-
-Use "{{.CommandPath}} [command] --help" for more information about a command.{{end}}
-`)
-	rootCmd.SetFlagErrorFunc(handleFlagErrors)
-
-}
-
-func Execute() {
-	// logs go to stderr - stdout is exclusive for outputs e.g. tables
-	output := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: TimeFormat}
-	// override the colors
-	output.FormatLevel = func(i interface{}) string {
-		var l string
-		if ll, ok := i.(string); ok {
-			switch ll {
-			case zerolog.LevelTraceValue:
-				l = colorize("TRC", colorMagenta)
-			case zerolog.LevelDebugValue:
-				l = colorize("DBG", colorMagenta)
-			case zerolog.LevelInfoValue:
-				l = colorize("INF", colorGreen)
-			case zerolog.LevelWarnValue:
-				l = colorize(colorize("WRN", colorYellow), colorBold)
-			case zerolog.LevelErrorValue:
-				l = colorize(colorize("ERR", colorRed), colorBold)
-			case zerolog.LevelFatalValue:
-				l = colorize(colorize("FTL", colorRed), colorBold)
-			case zerolog.LevelPanicValue:
-				l = colorize(colorize("PNC", colorRed), colorBold)
-			default:
-				l = colorize("???", colorBold)
-			}
-		} else {
-			if i == nil {
-				l = colorize("???", colorBold)
-			} else {
-				l = strings.ToUpper(fmt.Sprintf("%s", i))[0:3]
-			}
-		}
-		return l
-	}
-	output.FormatTimestamp = func(i interface{}) string {
-		tt := i.(string)
-		return colorize(tt, colorGreen)
-	}
-	log.Logger = log.Output(output)
-	zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	rootCmd.SetHelpCommand(helpCmd)
-	if err := rootCmd.Execute(); err != nil {
-		log.Fatal().Err(err)
-	}
-}
-
-// colorize returns the string s wrapped in ANSI code c
-func colorize(s interface{}, c int) string {
-	return fmt.Sprintf("\x1b[%dm%v\x1b[0m", c, s)
-}
-
-func handleFlagErrors(cmd *cobra.Command, err error) error {
-	fmt.Println(colorize(colorize(fmt.Sprintf("Error: %s\n", err), colorRed), colorBold))
-	_ = cmd.Help()
-	os.Exit(1)
-	return nil
-}
-
-func initializeConfig() error {
-	// we use the first config file we find
-	var configFile string
-	for _, confFile := range configFiles {
-		if ok, _ := utils.FileExists(confFile); ok {
-			configFile = confFile
-			break
-		}
-	}
-	if configFile == "" {
-		log.Warn().Msgf("config file in %s not found - config file will be ignored", configFiles)
-		return nil
-	}
-	viper.SetConfigFile(configFile)
-	if err := viper.ReadInConfig(); err != nil {
-		return errors.Wrapf(err, "Unable to read configuration file at %s", configFile)
-	}
-	return nil
-}
diff --git a/programs/diagnostics/cmd/version.go b/programs/diagnostics/cmd/version.go
deleted file mode 100644
index b1c0b44171b..00000000000
--- a/programs/diagnostics/cmd/version.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"github.com/spf13/cobra"
-)
-
-var (
-	Version = "" // set at compile time with -ldflags "-X versserv/cmd.Version=x.y.yz"
-	Commit  = ""
-)
-
-func init() {
-	rootCmd.AddCommand(versionCmd)
-}
-
-var versionCmd = &cobra.Command{
-	Use:   "version",
-	Short: "Print the version number of clickhouse-diagnostics",
-	Long:  `All software has versions. This is clickhouse-diagnostics`,
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Printf("Clickhouse Diagnostics %s (%s)\n", Version, Commit)
-	},
-}
diff --git a/programs/diagnostics/go.mod b/programs/diagnostics/go.mod
deleted file mode 100644
index 34c6b0037ae..00000000000
--- a/programs/diagnostics/go.mod
+++ /dev/null
@@ -1,89 +0,0 @@
-module github.com/ClickHouse/ClickHouse/programs/diagnostics
-
-go 1.19
-
-require (
-	github.com/ClickHouse/clickhouse-go/v2 v2.0.12
-	github.com/DATA-DOG/go-sqlmock v1.5.0
-	github.com/Masterminds/semver v1.5.0
-	github.com/bmatcuk/doublestar/v4 v4.0.2
-	github.com/docker/go-connections v0.4.0
-	github.com/elastic/gosigar v0.14.2
-	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
-	github.com/jaypipes/ghw v0.8.0
-	github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f
-	github.com/mholt/archiver/v4 v4.0.0-alpha.4
-	github.com/olekukonko/tablewriter v0.0.5
-	github.com/pkg/errors v0.9.1
-	github.com/rs/zerolog v1.26.1
-	github.com/spf13/cobra v1.3.0
-	github.com/spf13/pflag v1.0.5
-	github.com/spf13/viper v1.10.1
-	github.com/stretchr/testify v1.8.1
-	github.com/testcontainers/testcontainers-go v0.18.0
-	github.com/yargevad/filepathx v1.0.0
-	gopkg.in/yaml.v3 v3.0.1
-)
-
-require (
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/go-winio v0.5.2 // indirect
-	github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d // indirect
-	github.com/andybalholm/brotli v1.0.4 // indirect
-	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
-	github.com/dsnet/compress v0.0.1 // indirect
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
-	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.5.2 // indirect
-	github.com/golang/snappy v0.0.4 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/hashicorp/hcl v1.0.0 // indirect
-	github.com/inconshreveable/mousetrap v1.0.0 // indirect
-	github.com/jaypipes/pcidb v0.6.0 // indirect
-	github.com/klauspost/compress v1.13.6 // indirect
-	github.com/klauspost/pgzip v1.2.5 // indirect
-	github.com/kr/text v0.2.0 // indirect
-	github.com/magiconair/properties v1.8.7 // indirect
-	github.com/mattn/go-runewidth v0.0.9 // indirect
-	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/mitchellh/mapstructure v1.4.3 // indirect
-	github.com/moby/patternmatcher v0.5.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/nwaples/rardecode/v2 v2.0.0-beta.2 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
-	github.com/opencontainers/runc v1.1.3 // indirect
-	github.com/paulmach/orb v0.4.0 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
-	github.com/pierrec/lz4/v4 v4.1.14 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/shopspring/decimal v1.3.1 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
-	github.com/spf13/afero v1.8.0 // indirect
-	github.com/spf13/cast v1.4.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/therootcompany/xz v1.0.1 // indirect
-	github.com/ulikunitz/xz v0.5.10 // indirect
-	go.opentelemetry.io/otel v1.4.1 // indirect
-	go.opentelemetry.io/otel/trace v1.4.1 // indirect
-	golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad // indirect
-	google.golang.org/grpc v1.47.0 // indirect
-	google.golang.org/protobuf v1.28.0 // indirect
-	gopkg.in/ini.v1 v1.66.2 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
-	howett.net/plist v0.0.0-20181124034731-591f970eefbb // indirect
-)
diff --git a/programs/diagnostics/go.sum b/programs/diagnostics/go.sum
deleted file mode 100644
index a95dfb4fd2b..00000000000
--- a/programs/diagnostics/go.sum
+++ /dev/null
@@ -1,992 +0,0 @@
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=
-cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=
-cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=
-cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg=
-cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8=
-cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0=
-cloud.google.com/go v0.83.0/go.mod h1:Z7MJUsANfY0pYPdw0lbnivPx4/vhy/e2FEkSkF7vAVY=
-cloud.google.com/go v0.84.0/go.mod h1:RazrYuxIK6Kb7YrzzhPoLmCVzl7Sup4NrbKPg8KHSUM=
-cloud.google.com/go v0.87.0/go.mod h1:TpDYlFy7vuLzZMMZ+B6iRiELaY7z/gJPaqbMx6mlWcY=
-cloud.google.com/go v0.90.0/go.mod h1:kRX0mNRHe0e2rC6oNakvwQqzyDmg57xJ+SZU1eT2aDQ=
-cloud.google.com/go v0.93.3/go.mod h1:8utlLll2EF5XMAV15woO4lSbWQlk8rer9aLOfLh7+YI=
-cloud.google.com/go v0.94.1/go.mod h1:qAlAugsXlC+JWO+Bke5vCtc9ONxjQT3drlTTnAplMW4=
-cloud.google.com/go v0.97.0/go.mod h1:GF7l59pYBVlXQIBLx3a761cZ41F9bBH3JUlihCt2Udc=
-cloud.google.com/go v0.98.0/go.mod h1:ua6Ush4NALrHk5QXDWnjvZHN93OuF0HfuEPq9I1X0cM=
-cloud.google.com/go v0.99.0/go.mod h1:w0Xx2nLzqWJPuozYQX+hFfCSI8WioryfRDzkoI/Y2ZA=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/firestore v1.6.1/go.mod h1:asNXNOzBdyVQmEU+ggO8UPodTkEVFW5Qx+rwHnAz+EY=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/ClickHouse/clickhouse-go v1.5.3/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI=
-github.com/ClickHouse/clickhouse-go/v2 v2.0.12 h1:Nbl/NZwoM6LGJm7smNBgvtdr/rxjlIssSW3eG/Nmb9E=
-github.com/ClickHouse/clickhouse-go/v2 v2.0.12/go.mod h1:u4RoNQLLM2W6hNSPYrIESLJqaWSInZVmfM+MlaAhXcg=
-github.com/DATA-DOG/go-sqlmock v1.5.0 h1:Shsta01QNfFxHCfpW6YH2STWB0MudeXXEWMr20OEh60=
-github.com/DATA-DOG/go-sqlmock v1.5.0/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM=
-github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
-github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
-github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
-github.com/Microsoft/go-winio v0.5.2 h1:a9IhgEQBCUEk6QCdml9CiJGhAws+YwffDHEMp1VMrpA=
-github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
-github.com/Microsoft/hcsshim v0.9.6 h1:VwnDOgLeoi2du6dAznfmspNqTiwczvjv4K7NxuY9jsY=
-github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d h1:G0m3OIz70MZUWq3EgK3CesDbo8upS2Vm9/P3FtgI+Jk=
-github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
-github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
-github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
-github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
-github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
-github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
-github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
-github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
-github.com/bmatcuk/doublestar/v4 v4.0.2 h1:X0krlUVAVmtr2cRoTqR8aDMrDqnB36ht8wpWTiQ3jsA=
-github.com/bmatcuk/doublestar/v4 v4.0.2/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
-github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
-github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/checkpoint-restore/go-criu/v5 v5.3.0/go.mod h1:E/eQpaFtUKGOOSEBZgmKAcn+zUUwWxqcaKZlF54wK8E=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/cilium/ebpf v0.7.0/go.mod h1:/oI2+1shJiTGAMgl6/RgJr36Eo1jzrRcAWbcXO2usCA=
-github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6Dob7S7YxXgwXpfOuvO54S+tGdZdw9fuRZt25Ag=
-github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
-github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
-github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/cncf/xds/go v0.0.0-20211130200136-a8f946100490/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
-github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U=
-github.com/containerd/containerd v1.6.17 h1:XDnJIeJW0cLf6v7/+N+6L9kGrChHeXekZp2VHu6OpiY=
-github.com/containerd/containerd v1.6.17/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw=
-github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg=
-github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
-github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
-github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.17 h1:QeVUsEDNrLBW4tMgZHvxy18sKtr6VI492kBhUfhDJNI=
-github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
-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=
-github.com/docker/docker v23.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
-github.com/dsnet/compress v0.0.1/go.mod h1:Aw8dCMJ7RioblQeTqt88akK31OvO8Dhf5JflhBbQEHo=
-github.com/dsnet/golib v0.0.0-20171103203638-1ea166775780/go.mod h1:Lj+Z9rebOhdfkVLjJ8T6VcRQv3SXugXy999NBtR9aFY=
-github.com/elastic/gosigar v0.14.2 h1:Dg80n8cr90OZ7x+bAax/QjoW/XqTI11RmA79ZwIm9/4=
-github.com/elastic/gosigar v0.14.2/go.mod h1:iXRIGg2tLnu7LBdpqzyQfGDEidKCfWcCMS0WKyPWoMs=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
-github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
-github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0=
-github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ=
-github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/envoyproxy/protoc-gen-validate v0.6.2/go.mod h1:2t7qjJNvHPx8IjnBOzl9E9/baC+qXE/TeeyBRzgJDws=
-github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
-github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
-github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk=
-github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k=
-github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
-github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
-github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/godbus/dbus/v5 v5.0.6/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8=
-github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM=
-github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
-github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
-github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
-github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
-github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
-github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
-github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=
-github.com/gorilla/handlers v1.4.2/go.mod h1:Qkdc/uu4tH4g6mTK6auzZ766c4CA0Ng8+o/OAirnOIQ=
-github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
-github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
-github.com/hashicorp/consul/api v1.11.0/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
-github.com/hashicorp/consul/sdk v0.8.0/go.mod h1:GBvyrGALthsZObzUGsfgHZQDXjg4lOjagTIwIR1vPms=
-github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
-github.com/hashicorp/go-cleanhttp v0.5.0/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80=
-github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
-github.com/hashicorp/go-hclog v0.12.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-hclog v1.0.0/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
-github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-immutable-radix v1.3.1/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60=
-github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM=
-github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-multierror v1.1.0/go.mod h1:spPvp8C1qA32ftKqdAHm4hHTbPw+vmowP0z+KUhOZdA=
-github.com/hashicorp/go-retryablehttp v0.5.3/go.mod h1:9B5zBasrRhHXnJnui7y6sL7es7NDiJgTc6Er0maI1Xs=
-github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
-github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU=
-github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4=
-github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
-github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
-github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64=
-github.com/hashicorp/mdns v1.0.1/go.mod h1:4gW7WsVCke5TE7EPeYliwHlRUyBtfCwuFwuMg2DmyNY=
-github.com/hashicorp/mdns v1.0.4/go.mod h1:mtBihi+LeNXGtG8L9dX59gAEa12BDtBQSp4v/YAJqrc=
-github.com/hashicorp/memberlist v0.2.2/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/memberlist v0.3.0/go.mod h1:MS2lj3INKhZjWNqd3N0m3J+Jxf3DAOnAH9VT3Sh9MUE=
-github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKENpqIUyk=
-github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4=
-github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
-github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
-github.com/jaypipes/ghw v0.8.0 h1:02q1pTm9CD83vuhBsEZZhOCS128pq87uyaQeJZkp3sQ=
-github.com/jaypipes/ghw v0.8.0/go.mod h1:+gR9bjm3W/HnFi90liF+Fj9GpCe/Dsibl9Im8KmC7c4=
-github.com/jaypipes/pcidb v0.6.0 h1:VIM7GKVaW4qba30cvB67xSCgJPTzkG8Kzw/cbs5PHWU=
-github.com/jaypipes/pcidb v0.6.0/go.mod h1:L2RGk04sfRhp5wvHO0gfRAMoLY/F3PKv/nwJeVoho0o=
-github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
-github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
-github.com/klauspost/compress v1.4.1/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A=
-github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc=
-github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
-github.com/klauspost/cpuid v1.2.0/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek=
-github.com/klauspost/pgzip v1.2.5 h1:qnWYvvKqedOF2ulHpMG72XQol4ILEJ8k2wwRl/Km8oE=
-github.com/klauspost/pgzip v1.2.5/go.mod h1:Ch1tH69qFZu15pkjo5kYi6mth2Zzwzt50oCQKQE9RUs=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
-github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
-github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
-github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
-github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
-github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
-github.com/lyft/protoc-gen-star v0.5.3/go.mod h1:V0xaHgaf5oCCqmcxYcWiDfTiKsZsRc87/1qhoTACD8w=
-github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
-github.com/magiconair/properties v1.8.7 h1:IeQXZAiQcpL9mgcAe1Nu6cX9LLw6ExEHKjN0VQdvPDY=
-github.com/magiconair/properties v1.8.7/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
-github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f h1:B0OD7nYl2FPQEVrw8g2uyc1lGEzNbvrKh7fspGZcbvY=
-github.com/matishsiao/goInfo v0.0.0-20210923090445-da2e3fa8d45f/go.mod h1:aEt7p9Rvh67BYApmZwNDPpgircTO2kgdmDUoF/1QmwA=
-github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
-github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
-github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
-github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
-github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mholt/archiver/v4 v4.0.0-alpha.4 h1:QJ4UuWgavPynEX3LXxClHDRGzYcgcvTtAMp8az7spuw=
-github.com/mholt/archiver/v4 v4.0.0-alpha.4/go.mod h1:J7SYS/UTAtnO3I49RQEf+2FYZVwo7XBOh9Im43VrjNs=
-github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
-github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
-github.com/miekg/dns v1.1.41/go.mod h1:p6aan82bvRIyn+zDIv9xYNUpwa73JcSh9BKwknJysuI=
-github.com/mitchellh/cli v1.1.0/go.mod h1:xcISNoH86gajksDmfB23e/pu+B+GeFRMYmoHXxx3xhI=
-github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
-github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI=
-github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
-github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs=
-github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/mkevac/debugcharts v0.0.0-20191222103121-ae1c48aa8615/go.mod h1:Ad7oeElCZqA1Ufj0U9/liOF4BtVepxRcTvr2ey7zTvM=
-github.com/moby/patternmatcher v0.5.0 h1:YCZgJOeULcxLw1Q+sVR636pmS7sPEn1Qo2iAN6M7DBo=
-github.com/moby/patternmatcher v0.5.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f h1:J/7hjLaHLD7epG0m6TBMGmp4NQ+ibBYLfeyJWdAIFLA=
-github.com/moby/term v0.0.0-20221128092401-c43b287e0e0f/go.mod h1:15ce4BGCFxt7I5NQKT+HV0yEDxmf6fSysfEDiVo3zFM=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/nwaples/rardecode/v2 v2.0.0-beta.2 h1:e3mzJFJs4k83GXBEiTaQ5HgSc/kOK8q0rDaRO0MPaOk=
-github.com/nwaples/rardecode/v2 v2.0.0-beta.2/go.mod h1:yntwv/HfMc/Hbvtq9I19D1n58te3h6KsqCf3GxyfBGY=
-github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
-github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
-github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
-github.com/opencontainers/runc v1.1.3 h1:vIXrkId+0/J2Ymu2m7VjGvbSlAId9XNRPhn2p4b+d8w=
-github.com/opencontainers/runc v1.1.3/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
-github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI=
-github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/paulmach/orb v0.4.0 h1:ilp1MQjRapLJ1+qcays1nZpe0mvkCY+b8JU/qBKRZ1A=
-github.com/paulmach/orb v0.4.0/go.mod h1:FkcWtplUAIVqAuhAOV2d3rpbnQyliDOjOcLW9dUrfdU=
-github.com/paulmach/protoscan v0.2.1-0.20210522164731-4e53c6875432/go.mod h1:2sV+uZ/oQh66m4XJVZm5iqUZ62BN88Ex1E+TTS0nLzI=
-github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v4 v4.1.14 h1:+fL8AQEZtz/ijeNnpduH0bROTu0O3NZAlPjQxGn8LwE=
-github.com/pierrec/lz4/v4 v4.1.14/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
-github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
-github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A=
-github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
-github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.26.1 h1:/ihwxqH+4z8UxyI70wM1z9yCvkWcfz/a3mj48k/Zngc=
-github.com/rs/zerolog v1.26.1/go.mod h1:/wSSJWX7lVrsOwlbyTRSOJvqRlc+WjWlfes+CiJ+tmc=
-github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
-github.com/sagikazarmark/crypt v0.3.0/go.mod h1:uD/D+6UF4SrIR1uGEv7bBNkNqLGqUr43MRiaGWX1Nig=
-github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
-github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
-github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
-github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
-github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
-github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
-github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
-github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/afero v1.3.3/go.mod h1:5KUK8ByomD5Ti5Artl0RtHeI5pTF7MIDuXL3yY520V4=
-github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
-github.com/spf13/afero v1.8.0 h1:5MmtuhAgYeU6qpa7w7bP0dv6MBYuup0vekhSpSkoq60=
-github.com/spf13/afero v1.8.0/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo=
-github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
-github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
-github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ=
-github.com/spf13/cobra v1.3.0 h1:R7cSvGu+Vv+qX0gW5R/85dx2kmmJT5z5NM8ifdYjdn0=
-github.com/spf13/cobra v1.3.0/go.mod h1:BrRVncBjOJa/eUcVVm9CE+oC6as8k+VYr4NY7WCi9V4=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
-github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.10.0/go.mod h1:SoyBPwAtKDzypXNDFKN5kzH7ppppbGZtls1UpIy5AsM=
-github.com/spf13/viper v1.10.1 h1:nuJZuYpG7gTj/XqiUwg8bA0cp1+M2mC3J4g5luUYBKk=
-github.com/spf13/viper v1.10.1/go.mod h1:IGlFPqhNAPKRxohIzWpI5QEy4kuI7tcl5WvR+8qy1rU=
-github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
-github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
-github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
-github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
-github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
-github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww=
-github.com/testcontainers/testcontainers-go v0.18.0 h1:8RXrcIQv5xX/uBOSmZd297gzvA7F0yuRA37/918o7Yg=
-github.com/testcontainers/testcontainers-go v0.18.0/go.mod h1:rLC7hR2SWRjJZZNrUYiTKvUXCziNxzZiYtz9icTWYNQ=
-github.com/therootcompany/xz v1.0.1 h1:CmOtsn1CbtmyYiusbfmhmkpAAETj0wBIH6kCYaX+xzw=
-github.com/therootcompany/xz v1.0.1/go.mod h1:3K3UH1yCKgBneZYhuQUvJ9HPD19UEXEI0BWbMn8qNMY=
-github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
-github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
-github.com/ulikunitz/xz v0.5.10 h1:t92gobL9l3HE202wg3rlk19F6X+JOxl9BBrCCMYEYd8=
-github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14=
-github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0=
-github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
-github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
-github.com/yargevad/filepathx v1.0.0 h1:SYcT+N3tYGi+NvazubCNlvgIPbzAk7i7y2dwg3I5FYc=
-github.com/yargevad/filepathx v1.0.0/go.mod h1:BprfX/gpYNJHJfc35GjRRpVcwWXS89gGulUIU5tK3tA=
-github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.etcd.io/etcd/api/v3 v3.5.1/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
-go.etcd.io/etcd/client/pkg/v3 v3.5.1/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
-go.etcd.io/etcd/client/v2 v2.305.1/go.mod h1:pMEacxZW7o8pg4CrFE7pquyCJJzZvkvdD2RibOCCCGs=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
-go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
-go.opentelemetry.io/otel v1.4.1 h1:QbINgGDDcoQUoMJa2mMaWno49lja9sHwp6aoa2n3a4g=
-go.opentelemetry.io/otel v1.4.1/go.mod h1:StM6F/0fSwpd8dKWDCdRr7uRvEPYdW0hBSlbdTiUde4=
-go.opentelemetry.io/otel/trace v1.4.1 h1:O+16qcdTrT7zxv2J6GejTPFinSwA++cYerC5iSiF8EQ=
-go.opentelemetry.io/otel/trace v1.4.1/go.mod h1:iYEVbroFCNut9QkwEczV9vMRPHNKSSwYZjulEtsmhFc=
-go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
-go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=
-golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.0/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
-golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
-golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210805134026-6f1e6394065a/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20180810173357-98c5dad5d1a0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606203320-7fc4e5ec1444/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191115151921-52ab43148777/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210514084401-e8d321eab015/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603125802-9665404d3644/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210908233432-aa78b53d3365/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 h1:vVKdlvoWBphwdxWKrFZEuM0kGgGLxUOYcY4U/2Vjg44=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
-golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE=
-golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
-golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.7/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo=
-golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg=
-google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE=
-google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8=
-google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU=
-google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94=
-google.golang.org/api v0.47.0/go.mod h1:Wbvgpq1HddcWVtzsVLyfLp8lDg6AA241LmgIL59tHXo=
-google.golang.org/api v0.48.0/go.mod h1:71Pr1vy+TAZRPkPs/xlCf5SsU8WjuAWv1Pfjbtukyy4=
-google.golang.org/api v0.50.0/go.mod h1:4bNT5pAuq5ji4SRZm+5QIkjny9JAyVD/3gaSihNefaw=
-google.golang.org/api v0.51.0/go.mod h1:t4HdrdoNgyN5cbEfm7Lum0lcLDLiise1F8qDKX00sOU=
-google.golang.org/api v0.54.0/go.mod h1:7C4bFFOvVDGXjfDTAsgGwDgAxRDeQ4X8NvUedIt6z3k=
-google.golang.org/api v0.55.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.56.0/go.mod h1:38yMfeP1kfjsl8isn0tliTjIb1rJXcQi4UXlbqivdVE=
-google.golang.org/api v0.57.0/go.mod h1:dVPlbZyBo2/OjBpmvNdpn2GRm6rPy75jyU7bmhdrMgI=
-google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
-google.golang.org/api v0.61.0/go.mod h1:xQRti5UdCmoCEqFxcz93fTl338AVqDgyaDRuOZ3hg9I=
-google.golang.org/api v0.62.0/go.mod h1:dKmwPCydfsad4qCH08MSdgWjfHOyfpd4VtDGgRFdavw=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A=
-google.golang.org/genproto v0.0.0-20210513213006-bf773b8c8384/go.mod h1:P3QM42oQyzQSnHPnZ/vqoCdDmzH28fzWByN9asMeM8A=
-google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210608205507-b6d2f5bf0d7d/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0=
-google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
-google.golang.org/genproto v0.0.0-20210713002101-d411969a0d9a/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm1dci+enl5hChSFPOmmUF1+uAa/UsgNRWd7k=
-google.golang.org/genproto v0.0.0-20210728212813-7823e685a01f/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210805201207-89edb61ffb67/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48=
-google.golang.org/genproto v0.0.0-20210813162853-db860fec028c/go.mod h1:cFeNkxwySK631ADgubI+/XFU/xp8FD5KIVV4rj8UC5w=
-google.golang.org/genproto v0.0.0-20210821163610-241b8fcbd6c8/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210828152312-66f60bf46e71/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210831024726-fe130286e0e2/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210903162649-d08c68adba83/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210909211513-a8c4777a87af/go.mod h1:eFjDcFEctNawg4eG61bRv87N7iHBWyVhJu7u1kqDUXY=
-google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211028162531-8db9c33dc351/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211129164237-f09f9a12af12/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211206160659-862468c7d6e0/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
-google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad h1:kqrS+lhvaMHCxul6sKQvKJ8nAAhlVItmZV822hYFH/U=
-google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
-google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc=
-google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8=
-google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
-google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM=
-google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.39.1/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE=
-google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.40.1/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
-google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU=
-google.golang.org/grpc v1.47.0 h1:9n77onPX5F3qfFCqjy9dhn8PbNQsIKeVU04J9G7umt8=
-google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
-google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0 h1:w43yiav+6bVFTBQFZX0r7ipe9JQ1QsbMgHwbBziscLw=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
-gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
-gopkg.in/ini.v1 v1.66.2 h1:XfR1dOYubytKy4Shzc2LHrrGhU0lDCfDGG1yLPmpgsI=
-gopkg.in/ini.v1 v1.66.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-howett.net/plist v0.0.0-20181124034731-591f970eefbb h1:jhnBjNi9UFpfpl8YZhA9CrOqpnJdvzuiHsl/dnxl11M=
-howett.net/plist v0.0.0-20181124034731-591f970eefbb/go.mod h1:vMygbs4qMhSZSc4lCUl2OEE+rDiIIJAIdR4m7MiMcm0=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
diff --git a/programs/diagnostics/internal/collectors/clickhouse/config.go b/programs/diagnostics/internal/collectors/clickhouse/config.go
deleted file mode 100644
index 92368bce6f3..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/config.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package clickhouse
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/pkg/errors"
-)
-
-type ConfigCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewConfigCollector(m *platform.ResourceManager) *ConfigCollector {
-	return &ConfigCollector{
-		resourceManager: m,
-	}
-}
-
-const DefaultConfigLocation = "/etc/clickhouse-server/"
-const ProcessedConfigurationLocation = "/var/lib/clickhouse/preprocessed_configs"
-
-func (c ConfigCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(c.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	directory, err := config.ReadStringValue(conf, "directory")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-
-	if directory != "" {
-		// user has specified a directory - we therefore skip all other efforts to locate the config
-		frame, errs := data.NewConfigFileFrame(directory)
-		return &data.DiagnosticBundle{
-			Frames: map[string]data.Frame{
-				"user_specified": frame,
-			},
-			Errors: data.FrameErrors{Errors: errs},
-		}, nil
-	}
-	configCandidates, err := FindConfigurationFiles()
-	if err != nil {
-		return &data.DiagnosticBundle{}, errors.Wrapf(err, "Unable to find configuration files")
-	}
-	frames := make(map[string]data.Frame)
-	var frameErrors []error
-	for frameName, confDir := range configCandidates {
-		frame, errs := data.NewConfigFileFrame(confDir)
-		frameErrors = append(frameErrors, errs...)
-		frames[frameName] = frame
-	}
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: data.FrameErrors{Errors: frameErrors},
-	}, err
-}
-
-func FindConfigurationFiles() (map[string]string, error) {
-	configCandidates := map[string]string{
-		"default":      DefaultConfigLocation,
-		"preprocessed": ProcessedConfigurationLocation,
-	}
-	// we don't know specifically where the config is but try to find via processes
-	processConfigs, err := utils.FindConfigsFromClickHouseProcesses()
-	if err != nil {
-		return nil, err
-	}
-	for i, path := range processConfigs {
-		confDir := filepath.Dir(path)
-		if len(processConfigs) == 1 {
-			configCandidates["process"] = confDir
-			break
-		}
-		configCandidates[fmt.Sprintf("process_%d", i)] = confDir
-	}
-	return configCandidates, nil
-}
-
-func (c ConfigCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value:      "",
-				Param:      config.NewParam("directory", "Specify the location of the configuration files for ClickHouse Server e.g. /etc/clickhouse-server/", false),
-				AllowEmpty: true,
-			},
-		},
-	}
-}
-
-func (c ConfigCollector) Description() string {
-	return "Collects the ClickHouse configuration from the local filesystem."
-}
-
-func (c ConfigCollector) IsDefault() bool {
-	return true
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("config", func() (collectors.Collector, error) {
-		return &ConfigCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/config_test.go b/programs/diagnostics/internal/collectors/clickhouse/config_test.go
deleted file mode 100644
index 355cbb65620..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/config_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package clickhouse_test
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestConfigConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for config collector", func(t *testing.T) {
-		configCollector := clickhouse.NewConfigCollector(&platform.ResourceManager{})
-		conf := configCollector.Configuration()
-		require.Len(t, conf.Params, 1)
-		// check first param
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		directory, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.False(t, directory.Required())
-		require.Equal(t, directory.Name(), "directory")
-		require.Equal(t, "", directory.Value)
-	})
-}
-
-func TestConfigCollect(t *testing.T) {
-	configCollector := clickhouse.NewConfigCollector(&platform.ResourceManager{})
-
-	t.Run("test default file collector configuration", func(t *testing.T) {
-		diagSet, err := configCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		// we won't be able to collect the default configs preprocessed and default - even if clickhouse is installed
-		// these directories should not be readable under any permissions these tests are unrealistically executed!
-		// note: we may also pick up configs from a local clickhouse process - we thus allow a len >=2 but don't check this
-		// as its non-deterministic
-		require.GreaterOrEqual(t, len(diagSet.Frames), 2)
-		// check default key
-		require.Contains(t, diagSet.Frames, "default")
-		require.Equal(t, diagSet.Frames["default"].Name(), "/etc/clickhouse-server/")
-		require.Equal(t, diagSet.Frames["default"].Columns(), []string{"config"})
-		// collection will have failed
-		checkFrame(t, diagSet.Frames["default"], nil)
-		// check preprocessed key
-		require.Contains(t, diagSet.Frames, "preprocessed")
-		require.Equal(t, diagSet.Frames["preprocessed"].Name(), "/var/lib/clickhouse/preprocessed_configs")
-		require.Equal(t, diagSet.Frames["preprocessed"].Columns(), []string{"config"})
-		// min of 2 - might be more if a local installation of clickhouse is running
-		require.GreaterOrEqual(t, len(diagSet.Errors.Errors), 2)
-	})
-
-	t.Run("test configuration when specified", func(t *testing.T) {
-		// create some test files
-		tempDir := t.TempDir()
-		confDir := path.Join(tempDir, "conf")
-		// create an includes file
-		includesDir := path.Join(tempDir, "includes")
-		err := os.MkdirAll(includesDir, os.ModePerm)
-		require.Nil(t, err)
-		includesPath := path.Join(includesDir, "random.xml")
-		includesFile, err := os.Create(includesPath)
-		require.Nil(t, err)
-		xmlWriter := io.Writer(includesFile)
-		enc := xml.NewEncoder(xmlWriter)
-		enc.Indent("  ", "    ")
-		xmlConfig := data.XmlConfig{
-			XMLName: xml.Name{},
-			Clickhouse: data.XmlLoggerConfig{
-				XMLName:  xml.Name{},
-				ErrorLog: "/var/log/clickhouse-server/clickhouse-server.err.log",
-				Log:      "/var/log/clickhouse-server/clickhouse-server.log",
-			},
-			IncludeFrom: "",
-		}
-		err = enc.Encode(xmlConfig)
-		require.Nil(t, err)
-		// create 5 temporary config files - length is 6 for the included file
-		rows := make([][]interface{}, 6)
-		for i := 0; i < 5; i++ {
-			if i == 4 {
-				// set the includes for the last doc
-				xmlConfig.IncludeFrom = includesPath
-			}
-			// we want to check hierarchies are walked so create a simple folder for each file
-			fileDir := path.Join(confDir, fmt.Sprintf("%d", i))
-			err := os.MkdirAll(fileDir, os.ModePerm)
-			require.Nil(t, err)
-			filepath := path.Join(fileDir, fmt.Sprintf("random-%d.xml", i))
-			row := make([]interface{}, 1)
-			row[0] = data.XmlConfigFile{Path: filepath}
-			rows[i] = row
-			xmlFile, err := os.Create(filepath)
-			require.Nil(t, err)
-			// write a little xml so its valid
-			xmlConfig := xmlConfig
-			xmlWriter := io.Writer(xmlFile)
-			enc := xml.NewEncoder(xmlWriter)
-			enc.Indent("  ", "    ")
-			err = enc.Encode(xmlConfig)
-			require.Nil(t, err)
-		}
-		diagSet, err := configCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: confDir,
-					Param: config.NewParam("directory", "File locations", false),
-				},
-			},
-		})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Frames, 1)
-		require.Contains(t, diagSet.Frames, "user_specified")
-		require.Equal(t, diagSet.Frames["user_specified"].Name(), confDir)
-		require.Equal(t, diagSet.Frames["user_specified"].Columns(), []string{"config"})
-		iConf := make([]interface{}, 1)
-		iConf[0] = data.XmlConfigFile{Path: includesPath, Included: true}
-		rows[5] = iConf
-		checkFrame(t, diagSet.Frames["user_specified"], rows)
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/db_logs.go b/programs/diagnostics/internal/collectors/clickhouse/db_logs.go
deleted file mode 100644
index 3253f504c1b..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/db_logs.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package clickhouse
-
-import (
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-)
-
-type DBLogTable struct {
-	orderBy        data.OrderBy
-	excludeColumns []string
-}
-
-var DbLogTables = map[string]DBLogTable{
-	"query_log": {
-		orderBy: data.OrderBy{
-			Column: "event_time_microseconds",
-			Order:  data.Asc,
-		},
-		excludeColumns: []string{},
-	},
-	"query_thread_log": {
-		orderBy: data.OrderBy{
-			Column: "event_time_microseconds",
-			Order:  data.Asc,
-		},
-		excludeColumns: []string{},
-	},
-	"text_log": {
-		orderBy: data.OrderBy{
-			Column: "event_time_microseconds",
-			Order:  data.Asc,
-		},
-		excludeColumns: []string{},
-	},
-}
-
-// This collector collects db logs
-
-type DBLogsCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewDBLogsCollector(m *platform.ResourceManager) *DBLogsCollector {
-	return &DBLogsCollector{
-		resourceManager: m,
-	}
-}
-
-func (dc *DBLogsCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(dc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	rowLimit, err := config.ReadIntValue(conf, "row_limit")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-
-	frames := make(map[string]data.Frame)
-	var frameErrors []error
-	for logTable, tableConfig := range DbLogTables {
-		frame, err := dc.resourceManager.DbClient.ReadTable("system", logTable, tableConfig.excludeColumns, tableConfig.orderBy, rowLimit)
-		if err != nil {
-			frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to collect %s", logTable))
-		} else {
-			frames[logTable] = frame
-		}
-	}
-
-	fErrors := data.FrameErrors{
-		Errors: frameErrors,
-	}
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: fErrors,
-	}, nil
-}
-
-func (dc *DBLogsCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.IntParam{
-				Value: 100000,
-				Param: config.NewParam("row_limit", "Maximum number of log rows to collect. Negative values mean unlimited", false),
-			},
-		},
-	}
-}
-
-func (dc *DBLogsCollector) IsDefault() bool {
-	return true
-}
-
-func (dc DBLogsCollector) Description() string {
-	return "Collects the ClickHouse logs directly from the database."
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("db_logs", func() (collectors.Collector, error) {
-		return &DBLogsCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/db_logs_test.go b/programs/diagnostics/internal/collectors/clickhouse/db_logs_test.go
deleted file mode 100644
index 3fc585f3352..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/db_logs_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package clickhouse_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDbLogsConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for summary collector", func(t *testing.T) {
-		client := test.NewFakeClickhouseClient(make(map[string][]string))
-		dbLogsCollector := clickhouse.NewDBLogsCollector(&platform.ResourceManager{
-			DbClient: client,
-		})
-		conf := dbLogsCollector.Configuration()
-		require.Len(t, conf.Params, 1)
-		require.IsType(t, config.IntParam{}, conf.Params[0])
-		rowLimit, ok := conf.Params[0].(config.IntParam)
-		require.True(t, ok)
-		require.False(t, rowLimit.Required())
-		require.Equal(t, rowLimit.Name(), "row_limit")
-		require.Equal(t, int64(100000), rowLimit.Value)
-	})
-}
-
-func TestDbLogsCollect(t *testing.T) {
-	client := test.NewFakeClickhouseClient(make(map[string][]string))
-	dbLogsCollector := clickhouse.NewDBLogsCollector(&platform.ResourceManager{
-		DbClient: client,
-	})
-	queryLogColumns := []string{"type", "event_date", "event_time", "event_time_microseconds",
-		"query_start_time", "query_start_time_microseconds", "query_duration_ms", "read_rows", "read_bytes", "written_rows", "written_bytes",
-		"result_rows", "result_bytes", "memory_usage", "current_database", "query", "formatted_query", "normalized_query_hash",
-		"query_kind", "databases", "tables", "columns", "projections", "views", "exception_code", "exception", "stack_trace",
-		"is_initial_query", "user", "query_id", "address", "port", "initial_user", "initial_query_id", "initial_address", "initial_port",
-		"initial_query_start_time", "initial_query_start_time_microseconds", "interface", "os_user", "client_hostname", "client_name",
-		"client_revision", "client_version_major", "client_version_minor", "client_version_patch", "http_method", "http_user_agent",
-		"http_referer", "forwarded_for", "quota_key", "revision", "log_comment", "thread_ids", "ProfileEvents", "Settings",
-		"used_aggregate_functions", "used_aggregate_function_combinators", "used_database_engines", "used_data_type_families",
-		"used_dictionaries", "used_formats", "used_functions", "used_storages", "used_table_functions"}
-	queryLogFrame := test.NewFakeDataFrame("queryLog", queryLogColumns,
-		[][]interface{}{
-			{"QueryStart", "2021-12-13", "2021-12-13 12:53:20", "2021-12-13 12:53:20.590579", "2021-12-13 12:53:20", "2021-12-13 12:53:20.590579", "0", "0", "0", "0", "0", "0", "0", "0", "default", "SELECT DISTINCT arrayJoin(extractAll(name, '[\\w_]{2,}')) AS res FROM (SELECT name FROM system.functions UNION ALL SELECT name FROM system.table_engines UNION ALL SELECT name FROM system.formats UNION ALL SELECT name FROM system.table_functions UNION ALL SELECT name FROM system.data_type_families UNION ALL SELECT name FROM system.merge_tree_settings UNION ALL SELECT name FROM system.settings UNION ALL SELECT cluster FROM system.clusters UNION ALL SELECT macro FROM system.macros UNION ALL SELECT policy_name FROM system.storage_policies UNION ALL SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate UNION ALL SELECT name FROM system.databases LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.tables LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.dictionaries LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.columns LIMIT 10000) WHERE notEmpty(res)", "", "6666026786019643712", "Select", "['system']", "['system.aggregate_function_combinators','system.clusters','system.columns','system.data_type_families','system.databases','system.dictionaries','system.formats','system.functions','system.macros','system.merge_tree_settings','system.settings','system.storage_policies','system.table_engines','system.table_functions','system.tables']", "['system.aggregate_function_combinators.name','system.clusters.cluster','system.columns.name','system.data_type_families.name','system.databases.name','system.dictionaries.name','system.formats.name','system.functions.is_aggregate','system.functions.name','system.macros.macro','system.merge_tree_settings.name','system.settings.name','system.storage_policies.policy_name','system.table_engines.name','system.table_functions.name','system.tables.name']", "[]", "[]", "0", "", "", "1", "default", "3b5feb6d-3086-4718-adb2-17464988ff12", "::ffff:127.0.0.1", "50920", "default", "3b5feb6d-3086-4718-adb2-17464988ff12", "::ffff:127.0.0.1", "50920", "2021-12-13 12:53:30", "2021-12-13 12:53:30.590579", "1", "", "", "ClickHouse client", "54450", "21", "11", "0", "0", "", "", "", "", "54456", "", "[]", "{}", "{'load_balancing':'random','max_memory_usage':'10000000000'}", "[]", "[]", "[]", "[]", "[]", "[]", "[]", "[]", "[]"},
-			{"QueryFinish", "2021-12-13", "2021-12-13 12:53:30", "2021-12-13 12:53:30.607292", "2021-12-13 12:53:30", "2021-12-13 12:53:30.590579", "15", "4512", "255694", "0", "0", "4358", "173248", "4415230", "default", "SELECT DISTINCT arrayJoin(extractAll(name, '[\\w_]{2,}')) AS res FROM (SELECT name FROM system.functions UNION ALL SELECT name FROM system.table_engines UNION ALL SELECT name FROM system.formats UNION ALL SELECT name FROM system.table_functions UNION ALL SELECT name FROM system.data_type_families UNION ALL SELECT name FROM system.merge_tree_settings UNION ALL SELECT name FROM system.settings UNION ALL SELECT cluster FROM system.clusters UNION ALL SELECT macro FROM system.macros UNION ALL SELECT policy_name FROM system.storage_policies UNION ALL SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate UNION ALL SELECT name FROM system.databases LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.tables LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.dictionaries LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.columns LIMIT 10000) WHERE notEmpty(res)", "", "6666026786019643712", "Select", "['system']", "['system.aggregate_function_combinators','system.clusters','system.columns','system.data_type_families','system.databases','system.dictionaries','system.formats','system.functions','system.macros','system.merge_tree_settings','system.settings','system.storage_policies','system.table_engines','system.table_functions','system.tables']", "['system.aggregate_function_combinators.name','system.clusters.cluster','system.columns.name','system.data_type_families.name','system.databases.name','system.dictionaries.name','system.formats.name','system.functions.is_aggregate','system.functions.name','system.macros.macro','system.merge_tree_settings.name','system.settings.name','system.storage_policies.policy_name','system.table_engines.name','system.table_functions.name','system.tables.name']", "[]", "[]", "0", "", "", "1", "default", "3b5feb6d-3086-4718-adb2-17464988ff12", "::ffff:127.0.0.1", "50920", "default", "3b5feb6d-3086-4718-adb2-17464988ff12", "::ffff:127.0.0.1", "50920", "2021-12-13 12:53:30", "2021-12-13 12:53:30.590579", "1", "", "", "ClickHouse client", "54450", "21", "11", "0", "0", "", "", "", "", "54456", "", "[95298,95315,95587,95316,95312,95589,95318,95586,95588,95585]", "{'Query':1,'SelectQuery':1,'ArenaAllocChunks':41,'ArenaAllocBytes':401408,'FunctionExecute':62,'NetworkSendElapsedMicroseconds':463,'NetworkSendBytes':88452,'SelectedRows':4512,'SelectedBytes':255694,'RegexpCreated':6,'ContextLock':411,'RWLockAcquiredReadLocks':190,'RealTimeMicroseconds':49221,'UserTimeMicroseconds':19811,'SystemTimeMicroseconds':2817,'SoftPageFaults':1128,'OSCPUWaitMicroseconds':127,'OSCPUVirtualTimeMicroseconds':22624,'OSWriteBytes':12288,'OSWriteChars':13312}", "{'load_balancing':'random','max_memory_usage':'10000000000'}", "[]", "[]", "[]", "[]", "[]", "[]", "['concat','notEmpty','extractAll']", "[]", "[]"},
-			{"QueryStart", "2021-12-13", "2021-12-13 13:02:53", "2021-12-13 13:02:53.419528", "2021-12-13 13:02:53", "2021-12-13 13:02:53.419528", "0", "0", "0", "0", "0", "0", "0", "0", "default", "SELECT DISTINCT arrayJoin(extractAll(name, '[\\w_]{2,}')) AS res FROM (SELECT name FROM system.functions UNION ALL SELECT name FROM system.table_engines UNION ALL SELECT name FROM system.formats UNION ALL SELECT name FROM system.table_functions UNION ALL SELECT name FROM system.data_type_families UNION ALL SELECT name FROM system.merge_tree_settings UNION ALL SELECT name FROM system.settings UNION ALL SELECT cluster FROM system.clusters UNION ALL SELECT macro FROM system.macros UNION ALL SELECT policy_name FROM system.storage_policies UNION ALL SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate UNION ALL SELECT name FROM system.databases LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.tables LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.dictionaries LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.columns LIMIT 10000) WHERE notEmpty(res)", "", "6666026786019643712", "Select", "['system']", "['system.aggregate_function_combinators','system.clusters','system.columns','system.data_type_families','system.databases','system.dictionaries','system.formats','system.functions','system.macros','system.merge_tree_settings','system.settings','system.storage_policies','system.table_engines','system.table_functions','system.tables']", "['system.aggregate_function_combinators.name','system.clusters.cluster','system.columns.name','system.data_type_families.name','system.databases.name','system.dictionaries.name','system.formats.name','system.functions.is_aggregate','system.functions.name','system.macros.macro','system.merge_tree_settings.name','system.settings.name','system.storage_policies.policy_name','system.table_engines.name','system.table_functions.name','system.tables.name']", "[]", "[]", "0", "", "", "1", "default", "351b58e4-6128-47d4-a7b8-03d78c1f84c6", "::ffff:127.0.0.1", "50968", "default", "351b58e4-6128-47d4-a7b8-03d78c1f84c6", "::ffff:127.0.0.1", "50968", "2021-12-13 13:02:53", "2021-12-13 13:02:53.419528", "1", "", "", "ClickHouse client", "54450", "21", "11", "0", "0", "", "", "", "", "54456", "", "[]", "{}", "{'load_balancing':'random','max_memory_usage':'10000000000'}", "[]", "[]", "[]", "[]", "[]", "[]", "[]", "[]", "[]"},
-			{"QueryFinish", "2021-12-13", "2021-12-13 13:02:56", "2021-12-13 13:02:56.437115", "2021-12-13 13:02:56", "2021-12-13 13:02:56.419528", "16", "4629", "258376", "0", "0", "4377", "174272", "4404694", "default", "SELECT DISTINCT arrayJoin(extractAll(name, '[\\w_]{2,}')) AS res FROM (SELECT name FROM system.functions UNION ALL SELECT name FROM system.table_engines UNION ALL SELECT name FROM system.formats UNION ALL SELECT name FROM system.table_functions UNION ALL SELECT name FROM system.data_type_families UNION ALL SELECT name FROM system.merge_tree_settings UNION ALL SELECT name FROM system.settings UNION ALL SELECT cluster FROM system.clusters UNION ALL SELECT macro FROM system.macros UNION ALL SELECT policy_name FROM system.storage_policies UNION ALL SELECT concat(func.name, comb.name) FROM system.functions AS func CROSS JOIN system.aggregate_function_combinators AS comb WHERE is_aggregate UNION ALL SELECT name FROM system.databases LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.tables LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.dictionaries LIMIT 10000 UNION ALL SELECT DISTINCT name FROM system.columns LIMIT 10000) WHERE notEmpty(res)", "", "6666026786019643712", "Select", "['system']", "['system.aggregate_function_combinators','system.clusters','system.columns','system.data_type_families','system.databases','system.dictionaries','system.formats','system.functions','system.macros','system.merge_tree_settings','system.settings','system.storage_policies','system.table_engines','system.table_functions','system.tables']", "['system.aggregate_function_combinators.name','system.clusters.cluster','system.columns.name','system.data_type_families.name','system.databases.name','system.dictionaries.name','system.formats.name','system.functions.is_aggregate','system.functions.name','system.macros.macro','system.merge_tree_settings.name','system.settings.name','system.storage_policies.policy_name','system.table_engines.name','system.table_functions.name','system.tables.name']", "[]", "[]", "0", "", "", "1", "default", "351b58e4-6128-47d4-a7b8-03d78c1f84c6", "::ffff:127.0.0.1", "50968", "default", "351b58e4-6128-47d4-a7b8-03d78c1f84c6", "::ffff:127.0.0.1", "50968", "2021-12-13 13:02:53", "2021-12-13 13:02:53.419528", "1", "", "", "ClickHouse client", "54450", "21", "11", "0", "0", "", "", "", "", "54456", "", "[95298,95318,95315,95316,95312,95588,95589,95586,95585,95587]", "{'Query':1,'SelectQuery':1,'ArenaAllocChunks':41,'ArenaAllocBytes':401408,'FunctionExecute':62,'NetworkSendElapsedMicroseconds':740,'NetworkSendBytes':88794,'SelectedRows':4629,'SelectedBytes':258376,'ContextLock':411,'RWLockAcquiredReadLocks':194,'RealTimeMicroseconds':52469,'UserTimeMicroseconds':17179,'SystemTimeMicroseconds':4218,'SoftPageFaults':569,'OSCPUWaitMicroseconds':303,'OSCPUVirtualTimeMicroseconds':25087,'OSWriteBytes':12288,'OSWriteChars':12288}", "{'load_balancing':'random','max_memory_usage':'10000000000'}", "[]", "[]", "[]", "[]", "[]", "[]", "['concat','notEmpty','extractAll']", "[]", "[]"},
-		})
-
-	client.QueryResponses["SELECT * FROM system.query_log ORDER BY event_time_microseconds ASC LIMIT 100000"] = &queryLogFrame
-
-	textLogColumns := []string{"event_date", "event_time", "event_time_microseconds", "microseconds", "thread_name", "thread_id", "level", "query_id", "logger_name", "message", "revision", "source_file", "source_line"}
-	textLogFrame := test.NewFakeDataFrame("textLog", textLogColumns,
-		[][]interface{}{
-			{"2022-02-03", "2022-02-03 16:17:47", "2022-02-03 16:37:17.056950", "56950", "clickhouse-serv", "68947", "Information", "", "DNSCacheUpdater", "Update period 15 seconds", "54458", "../src/Interpreters/DNSCacheUpdater.cpp; void DB::DNSCacheUpdater::start()", "46"},
-			{"2022-02-03", "2022-02-03 16:27:47", "2022-02-03 16:37:27.057022", "57022", "clickhouse-serv", "68947", "Information", "", "Application", "Available RAM: 62.24 GiB; physical cores: 8; logical cores: 16.", "54458", "../programs/server/Server.cpp; virtual int DB::Server::main(const std::vector<std::string> &)", "1380"},
-			{"2022-02-03", "2022-02-03 16:37:47", "2022-02-03 16:37:37.057484", "57484", "clickhouse-serv", "68947", "Information", "", "Application", "Listening for http://[::1]:8123", "54458", "../programs/server/Server.cpp; virtual int DB::Server::main(const std::vector<std::string> &)", "1444"},
-			{"2022-02-03", "2022-02-03 16:47:47", "2022-02-03 16:37:47.057527", "57527", "clickhouse-serv", "68947", "Information", "", "Application", "Listening for native protocol (tcp): [::1]:9000", "54458", "../programs/server/Server.cpp; virtual int DB::Server::main(const std::vector<std::string> &)", "1444"},
-		})
-
-	client.QueryResponses["SELECT * FROM system.text_log ORDER BY event_time_microseconds ASC LIMIT 100000"] = &textLogFrame
-
-	// skip query_thread_log frame - often it doesn't exist anyway unless enabled
-	t.Run("test default db logs collection", func(t *testing.T) {
-		bundle, errs := dbLogsCollector.Collect(config.Configuration{})
-		require.Empty(t, errs)
-		require.NotNil(t, bundle)
-		require.Len(t, bundle.Frames, 2)
-		require.Contains(t, bundle.Frames, "text_log")
-		require.Contains(t, bundle.Frames, "query_log")
-		require.Len(t, bundle.Errors.Errors, 1)
-		// check query_log frame
-		require.Contains(t, bundle.Frames, "query_log")
-		require.Equal(t, queryLogColumns, bundle.Frames["query_log"].Columns())
-		checkFrame(t, bundle.Frames["query_log"], queryLogFrame.Rows)
-		//check text_log frame
-		require.Contains(t, bundle.Frames, "text_log")
-		require.Equal(t, textLogColumns, bundle.Frames["text_log"].Columns())
-		checkFrame(t, bundle.Frames["text_log"], textLogFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test db logs collection with limit", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.IntParam{
-					Value: 1,
-					Param: config.NewParam("row_limit", "Maximum number of log rows to collect. Negative values mean unlimited", false),
-				},
-			},
-		}
-		bundle, err := dbLogsCollector.Collect(conf)
-		require.Empty(t, err)
-		require.NotNil(t, bundle)
-		require.Len(t, bundle.Frames, 0)
-		require.Len(t, bundle.Errors.Errors, 3)
-		// populate client
-		client.QueryResponses["SELECT * FROM system.query_log ORDER BY event_time_microseconds ASC LIMIT 1"] = &queryLogFrame
-		client.QueryResponses["SELECT * FROM system.text_log ORDER BY event_time_microseconds ASC LIMIT 1"] = &textLogFrame
-		bundle, err = dbLogsCollector.Collect(conf)
-		require.Empty(t, err)
-		require.Len(t, bundle.Frames, 2)
-		require.Len(t, bundle.Errors.Errors, 1)
-		require.Contains(t, bundle.Frames, "text_log")
-		require.Contains(t, bundle.Frames, "query_log")
-		// check query_log frame
-		require.Contains(t, bundle.Frames, "query_log")
-		require.Equal(t, queryLogColumns, bundle.Frames["query_log"].Columns())
-		checkFrame(t, bundle.Frames["query_log"], queryLogFrame.Rows[:1])
-		//check text_log frame
-		require.Contains(t, bundle.Frames, "text_log")
-		require.Equal(t, textLogColumns, bundle.Frames["text_log"].Columns())
-		checkFrame(t, bundle.Frames["text_log"], textLogFrame.Rows[:1])
-		client.Reset()
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/logs.go b/programs/diagnostics/internal/collectors/clickhouse/logs.go
deleted file mode 100644
index 8436a392c47..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/logs.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package clickhouse
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-)
-
-// This collector collects logs
-
-type LogsCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewLogsCollector(m *platform.ResourceManager) *LogsCollector {
-	return &LogsCollector{
-		resourceManager: m,
-	}
-}
-
-var DefaultLogsLocation = filepath.Clean("/var/log/clickhouse-server/")
-
-func (lc *LogsCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(lc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	directory, err := config.ReadStringValue(conf, "directory")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	collectArchives, err := config.ReadBoolValue(conf, "collect_archives")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	logPatterns := []string{"*.log"}
-	if collectArchives {
-		logPatterns = append(logPatterns, "*.gz")
-	}
-
-	if directory != "" {
-		// user has specified a directory - we therefore skip all other efforts to locate the logs
-		frame, errs := data.NewFileDirectoryFrame(directory, logPatterns)
-		return &data.DiagnosticBundle{
-			Frames: map[string]data.Frame{
-				"user_specified": frame,
-			},
-			Errors: data.FrameErrors{Errors: errs},
-		}, nil
-	}
-	// add the default
-	frames := make(map[string]data.Frame)
-	dirFrame, frameErrors := data.NewFileDirectoryFrame(DefaultLogsLocation, logPatterns)
-	frames["default"] = dirFrame
-	logFolders, errs := FindLogFileCandidates()
-	frameErrors = append(frameErrors, errs...)
-	i := 0
-	for folder, paths := range logFolders {
-		// we will collect the default location anyway above so skip these
-		if folder != DefaultLogsLocation {
-			if collectArchives {
-				paths = append(paths, "*.gz")
-			}
-			dirFrame, errs := data.NewFileDirectoryFrame(folder, paths)
-			frames[fmt.Sprintf("logs-%d", i)] = dirFrame
-			frameErrors = append(frameErrors, errs...)
-		}
-	}
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: data.FrameErrors{Errors: frameErrors},
-	}, err
-}
-
-func (lc *LogsCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value:      "",
-				Param:      config.NewParam("directory", "Specify the location of the log files for ClickHouse Server e.g. /var/log/clickhouse-server/", false),
-				AllowEmpty: true,
-			},
-			config.BoolParam{
-				Param: config.NewParam("collect_archives", "Collect compressed log archive files", false),
-			},
-		},
-	}
-}
-
-func FindLogFileCandidates() (logFolders map[string][]string, configErrors []error) {
-	// we need the config to determine the location of the logs
-	configCandidates := make(map[string]data.ConfigFileFrame)
-	configFiles, err := FindConfigurationFiles()
-	logFolders = make(map[string][]string)
-	if err != nil {
-		configErrors = append(configErrors, err)
-		return logFolders, configErrors
-	}
-	for _, folder := range configFiles {
-		configFrame, errs := data.NewConfigFileFrame(folder)
-		configErrors = append(configErrors, errs...)
-		configCandidates[filepath.Clean(folder)] = configFrame
-	}
-
-	for _, config := range configCandidates {
-		paths, errs := config.FindLogPaths()
-		for _, path := range paths {
-			folder := filepath.Dir(path)
-			filename := filepath.Base(path)
-			if _, ok := logFolders[folder]; !ok {
-				logFolders[folder] = []string{}
-			}
-			logFolders[folder] = utils.Unique(append(logFolders[folder], filename))
-		}
-		configErrors = append(configErrors, errs...)
-	}
-	return logFolders, configErrors
-}
-
-func (lc *LogsCollector) IsDefault() bool {
-	return true
-}
-
-func (lc LogsCollector) Description() string {
-	return "Collects the ClickHouse logs directly from the database."
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("logs", func() (collectors.Collector, error) {
-		return &LogsCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/logs_test.go b/programs/diagnostics/internal/collectors/clickhouse/logs_test.go
deleted file mode 100644
index 5f0be734445..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/logs_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package clickhouse_test
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestLogsConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for logs collector", func(t *testing.T) {
-		client := test.NewFakeClickhouseClient(make(map[string][]string))
-		logsCollector := clickhouse.NewLogsCollector(&platform.ResourceManager{
-			DbClient: client,
-		})
-		conf := logsCollector.Configuration()
-		require.Len(t, conf.Params, 2)
-		// check directory
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		directory, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.False(t, directory.Required())
-		require.Equal(t, directory.Name(), "directory")
-		require.Empty(t, directory.Value)
-		// check collect_archives
-		require.IsType(t, config.BoolParam{}, conf.Params[1])
-		collectArchives, ok := conf.Params[1].(config.BoolParam)
-		require.True(t, ok)
-		require.False(t, collectArchives.Required())
-		require.Equal(t, collectArchives.Name(), "collect_archives")
-		require.False(t, collectArchives.Value)
-	})
-}
-
-func TestLogsCollect(t *testing.T) {
-
-	logsCollector := clickhouse.NewLogsCollector(&platform.ResourceManager{})
-
-	t.Run("test default logs collection", func(t *testing.T) {
-		// we can't rely on a local installation of clickhouse being present for tests - if it is present (and running)
-		// results maybe variable e.g. we may find a config. For now, we allow flexibility and test only default.
-		// TODO: we may want to test this within a container
-		bundle, err := logsCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, bundle)
-		// we will have some errors if clickhouse is installed or not. If former, permission issues - if latter missing folders.
-		require.Greater(t, len(bundle.Errors.Errors), 0)
-		require.Len(t, bundle.Frames, 1)
-		require.Contains(t, bundle.Frames, "default")
-		_, ok := bundle.Frames["default"].(data.DirectoryFileFrame)
-		require.True(t, ok)
-		// no guarantees clickhouse is installed so this bundle could have no frames
-	})
-
-	t.Run("test logs collection when directory is specified", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		logsPath := path.Join(cwd, "../../../testdata", "logs", "var", "logs")
-		bundle, err := logsCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      logsPath,
-					Param:      config.NewParam("directory", "Specify the location of the log files for ClickHouse Server e.g. /var/log/clickhouse-server/", false),
-					AllowEmpty: true,
-				},
-			},
-		})
-		require.Nil(t, err)
-		checkDirectoryBundle(t, bundle, logsPath, []string{"clickhouse-server.log", "clickhouse-server.err.log"})
-
-	})
-
-	t.Run("test logs collection of archives", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		logsPath := path.Join(cwd, "../../../testdata", "logs", "var", "logs")
-		bundle, err := logsCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      logsPath,
-					Param:      config.NewParam("directory", "Specify the location of the log files for ClickHouse Server e.g. /var/log/clickhouse-server/", false),
-					AllowEmpty: true,
-				},
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("collect_archives", "Collect compressed log archive files", false),
-				},
-			},
-		})
-		require.Nil(t, err)
-		checkDirectoryBundle(t, bundle, logsPath, []string{"clickhouse-server.log", "clickhouse-server.err.log", "clickhouse-server.log.gz"})
-	})
-
-	t.Run("test when directory does not exist", func(t *testing.T) {
-		tmpDir := t.TempDir()
-		logsPath := path.Join(tmpDir, "random")
-		bundle, err := logsCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      logsPath,
-					Param:      config.NewParam("directory", "Specify the location of the log files for ClickHouse Server e.g. /var/log/clickhouse-server/", false),
-					AllowEmpty: true,
-				},
-			},
-		})
-		// not a fatal error currently
-		require.Nil(t, err)
-		require.Len(t, bundle.Errors.Errors, 1)
-		require.Equal(t, fmt.Sprintf("directory %s does not exist", logsPath), bundle.Errors.Errors[0].Error())
-	})
-}
-
-func checkDirectoryBundle(t *testing.T, bundle *data.DiagnosticBundle, logsPath string, expectedFiles []string) {
-	require.NotNil(t, bundle)
-	require.Nil(t, bundle.Errors.Errors)
-	require.Len(t, bundle.Frames, 1)
-	require.Contains(t, bundle.Frames, "user_specified")
-	dirFrame, ok := bundle.Frames["user_specified"].(data.DirectoryFileFrame)
-	require.True(t, ok)
-	require.Equal(t, logsPath, dirFrame.Directory)
-	require.Equal(t, []string{"files"}, dirFrame.Columns())
-	i := 0
-	fullPaths := make([]string, len(expectedFiles))
-	for i, filePath := range expectedFiles {
-		fullPaths[i] = path.Join(logsPath, filePath)
-	}
-	for {
-		values, ok, err := dirFrame.Next()
-		require.Nil(t, err)
-		if !ok {
-			break
-		}
-		require.Len(t, values, 1)
-		file, ok := values[0].(data.SimpleFile)
-		require.True(t, ok)
-		require.Contains(t, fullPaths, file.FilePath())
-		i += 1
-	}
-	require.Equal(t, len(fullPaths), i)
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/queries.json b/programs/diagnostics/internal/collectors/clickhouse/queries.json
deleted file mode 100644
index f5cf4362c9e..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/queries.json
+++ /dev/null
@@ -1,153 +0,0 @@
-{
-  "queries": {
-    "version": [
-      {
-        "statement": "SELECT version()"
-      }
-    ],
-    "databases": [
-      {
-        "statement": "SELECT name, engine, tables, partitions, parts, formatReadableSize(bytes_on_disk) \"disk_size\" FROM system.databases db LEFT JOIN ( SELECT database, uniq(table) \"tables\", uniq(table, partition) \"partitions\", count() AS parts, sum(bytes_on_disk) \"bytes_on_disk\" FROM system.parts WHERE active GROUP BY database ) AS db_stats ON db.name = db_stats.database ORDER BY bytes_on_disk DESC LIMIT {{.Limit}}"
-      }
-    ],
-    "access": [
-      {
-        "statement": "SHOW ACCESS"
-      }
-    ],
-    "quotas": [
-      {
-        "statement": "SHOW QUOTA"
-      }
-    ],
-    "db_engines": [
-      {
-        "statement": "SELECT engine, count() \"count\" FROM system.databases GROUP BY engine"
-      }
-    ],
-    "table_engines": [
-      {
-        "statement": "SELECT engine, count() \"count\" FROM system.tables WHERE database != 'system' GROUP BY engine"
-      }
-    ],
-    "dictionaries": [
-      {
-        "statement": "SELECT source, type, status, count() \"count\" FROM system.dictionaries GROUP BY source, type, status ORDER BY status DESC, source"
-      }
-    ],
-    "replicated_tables_by_delay": [
-      {
-        "statement": "SELECT database, table, is_leader, is_readonly, absolute_delay, queue_size, inserts_in_queue, merges_in_queue FROM system.replicas ORDER BY absolute_delay DESC LIMIT {{.Limit}}"
-      }
-    ],
-    "replication_queue_by_oldest": [
-      {
-        "statement": "SELECT database, table, replica_name, position, node_name, type, source_replica, parts_to_merge, new_part_name, create_time, required_quorum, is_detach, is_currently_executing, num_tries, last_attempt_time, last_exception, concat( 'time: ', toString(last_postpone_time), ', number: ', toString(num_postponed), ', reason: ', postpone_reason ) postpone FROM system.replication_queue ORDER BY create_time ASC LIMIT {{.Limit}}"
-      }
-    ],
-    "replicated_fetches": [
-      {
-        "statement": "SELECT database, table, round(elapsed, 1) \"elapsed\", round(100 * progress, 1) \"progress\", partition_id, result_part_name, result_part_path, total_size_bytes_compressed, bytes_read_compressed, source_replica_path, source_replica_hostname, source_replica_port, interserver_scheme, to_detached, thread_id FROM system.replicated_fetches"
-      }
-    ],
-    "tables_by_max_partition_count": [
-      {
-        "statement": "SELECT database, table, count() \"partitions\", sum(part_count) \"parts\", max(part_count) \"max_parts_per_partition\" FROM ( SELECT database, table, partition, count() \"part_count\" FROM system.parts WHERE active GROUP BY database, table, partition ) partitions GROUP BY database, table ORDER BY max_parts_per_partition DESC LIMIT {{.Limit}}"
-      }
-    ],
-    "stack_traces": [
-      {
-        "statement": "SELECT '\\n' || arrayStringConcat( arrayMap( x, y -> concat(x, ': ', y), arrayMap(x -> addressToLine(x), trace), arrayMap(x -> demangle(addressToSymbol(x)), trace) ), '\\n' ) AS trace FROM system.stack_trace"
-      }
-    ],
-    "crash_log": [
-      {
-        "statement": "SELECT event_time, signal, thread_id, query_id, '\\n' || arrayStringConcat(trace_full, '\\n') AS trace, version FROM system.crash_log ORDER BY event_time DESC"
-      }
-    ],
-    "merges": [
-      {
-        "statement": "SELECT database, table, round(elapsed, 1) \"elapsed\", round(100 * progress, 1) \"progress\", is_mutation, partition_id, result_part_path, source_part_paths, num_parts, formatReadableSize(total_size_bytes_compressed) \"total_size_compressed\", formatReadableSize(bytes_read_uncompressed) \"read_uncompressed\", formatReadableSize(bytes_written_uncompressed) \"written_uncompressed\", columns_written, formatReadableSize(memory_usage) \"memory_usage\", thread_id FROM system.merges",
-        "constraint": ">=20.3"
-      },
-      {
-        "statement": "SELECT database, table, round(elapsed, 1) \"elapsed\", round(100 * progress, 1) \"progress\", is_mutation, partition_id, num_parts, formatReadableSize(total_size_bytes_compressed) \"total_size_compressed\", formatReadableSize(bytes_read_uncompressed) \"read_uncompressed\", formatReadableSize(bytes_written_uncompressed) \"written_uncompressed\", columns_written, formatReadableSize(memory_usage) \"memory_usage\" FROM system.merges"
-      }
-    ],
-    "mutations": [
-      {
-        "statement": "SELECT database, table, mutation_id, command, create_time, parts_to_do_names, parts_to_do, is_done, latest_failed_part, latest_fail_time, latest_fail_reason FROM system.mutations WHERE NOT is_done ORDER BY create_time DESC",
-        "constraint": ">=20.3"
-      },
-      {
-        "statement": "SELECT database, table, mutation_id, command, create_time, parts_to_do, is_done, latest_failed_part, latest_fail_time, latest_fail_reason FROM system.mutations WHERE NOT is_done ORDER BY create_time DESC"
-      }
-    ],
-    "recent_data_parts": [
-      {
-        "statement": "SELECT database, table, engine, partition_id, name, part_type, active, level, disk_name, path, marks, rows, bytes_on_disk, data_compressed_bytes, data_uncompressed_bytes, marks_bytes, modification_time, remove_time, refcount, is_frozen, min_date, max_date, min_time, max_time, min_block_number, max_block_number FROM system.parts WHERE modification_time > now() - INTERVAL 3 MINUTE ORDER BY modification_time DESC",
-        "constraint": ">=20.3"
-      },
-      {
-        "statement": "SELECT database, table, engine, partition_id, name, active, level, path, marks, rows, bytes_on_disk, data_compressed_bytes, data_uncompressed_bytes, marks_bytes, modification_time, remove_time, refcount, is_frozen, min_date, max_date, min_time, max_time, min_block_number, max_block_number FROM system.parts WHERE modification_time > now() - INTERVAL 3 MINUTE ORDER BY modification_time DESC"
-      }
-    ],
-    "detached_parts": [
-      {
-        "statement": "SELECT database, table, partition_id, name, disk, reason, min_block_number, max_block_number, level FROM system.detached_parts"
-      }
-    ],
-    "processes": [
-      {
-        "statement": "SELECT elapsed, query_id, normalizeQuery(query) AS normalized_query, is_cancelled, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, formatReadableSize(memory_usage) AS \"memory usage\", user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, thread_ids, ProfileEvents, Settings FROM system.processes ORDER BY elapsed DESC",
-        "constraint": ">=21.8"
-      },
-      {
-        "statement": "SELECT elapsed, query_id, normalizeQuery(query) AS normalized_query, is_cancelled, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, formatReadableSize(memory_usage) AS \"memory usage\", user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, thread_ids, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.processes ORDER BY elapsed DESC",
-        "constraint": ">=21.3"
-      },
-      {
-        "statement": "SELECT elapsed, query_id, normalizeQuery(query) AS normalized_query, is_cancelled, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, formatReadableSize(memory_usage) AS \"memory usage\", user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.processes ORDER BY elapsed DESC"
-      }
-    ],
-    "top_queries_by_duration": [
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents, Settings FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY query_duration_ms DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.8"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY query_duration_ms DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.3"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY query_duration_ms DESC LIMIT {{.Limit}}"
-      }
-    ],
-    "top_queries_by_memory": [
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents, Settings FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY memory_usage DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.8"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY memory_usage DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.3"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY ORDER BY memory_usage DESC LIMIT {{.Limit}}"
-      }
-    ],
-    "failed_queries": [
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents, Settings FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY AND exception != '' ORDER BY query_start_time DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.8"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, databases, tables, columns, used_aggregate_functions, used_aggregate_function_combinators, used_database_engines, used_data_type_families, used_dictionaries, used_formats, used_functions, used_storages, used_table_functions, thread_ids, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY AND exception != '' ORDER BY query_start_time DESC LIMIT {{.Limit}}",
-        "constraint": ">=21.3"
-      },
-      {
-        "statement": "SELECT type, query_start_time, query_duration_ms, query_id, query_kind, is_initial_query, normalizeQuery(query) AS normalized_query, concat( toString(read_rows), ' rows / ', formatReadableSize(read_bytes) ) AS read, concat( toString(written_rows), ' rows / ', formatReadableSize(written_bytes) ) AS written, concat( toString(result_rows), ' rows / ', formatReadableSize(result_bytes) ) AS result, formatReadableSize(memory_usage) AS \"memory usage\", exception, '\\n' || stack_trace AS stack_trace, user, initial_user, multiIf( empty(client_name), http_user_agent, concat( client_name, ' ', toString(client_version_major), '.', toString(client_version_minor), '.', toString(client_version_patch) ) ) AS client, client_hostname, ProfileEvents.Names, ProfileEvents.Values, Settings.Names, Settings.Values FROM system.query_log WHERE type != 'QueryStart' AND event_date >= today() - 1 AND event_time >= now() - INTERVAL 1 DAY AND exception != '' ORDER BY query_start_time DESC LIMIT {{.Limit}}"
-      }
-    ]
-  }
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/summary.go b/programs/diagnostics/internal/collectors/clickhouse/summary.go
deleted file mode 100644
index 0b6dd3aff20..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/summary.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package clickhouse
-
-import (
-	"bytes"
-	_ "embed"
-	"encoding/json"
-	"strings"
-	"text/template"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/Masterminds/semver"
-	"github.com/pkg/errors"
-)
-
-// This collector collects the system db from database
-
-type SummaryCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-type querySet struct {
-	Queries map[string][]query `json:"queries"`
-}
-
-type query struct {
-	Statement  string `json:"statement"`
-	Constraint string `json:"constraint"`
-}
-
-type ParameterTemplate struct {
-	Limit int64
-}
-
-//go:embed queries.json
-var queryFile []byte
-
-func NewSummaryCollector(m *platform.ResourceManager) *SummaryCollector {
-	return &SummaryCollector{
-		resourceManager: m,
-	}
-}
-
-func (sc *SummaryCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(sc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	var queries querySet
-	err = json.Unmarshal(queryFile, &queries)
-	if err != nil {
-		return &data.DiagnosticBundle{}, errors.Wrap(err, "Unable to read queries from disk")
-	}
-	limit, err := config.ReadIntValue(conf, "row_limit")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-
-	paramTemplate := ParameterTemplate{
-		Limit: limit,
-	}
-	frames := make(map[string]data.Frame)
-
-	serverVersion, err := getServerSemVersion(sc)
-	if err != nil {
-		return &data.DiagnosticBundle{}, errors.Wrapf(err, "Unable to read server version")
-	}
-
-	var frameErrors []error
-	for queryId, sqlQueries := range queries.Queries {
-		//  we find the first matching query that satisfies the current version. Empty version means ANY version is
-		// supported
-		for _, sqlQuery := range sqlQueries {
-			var queryConstraint *semver.Constraints
-			if sqlQuery.Constraint != "" {
-				queryConstraint, err = semver.NewConstraint(sqlQuery.Constraint)
-				if err != nil {
-					//we try another one
-					frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to parse version %s for query %s", sqlQuery.Constraint, queryId))
-					continue
-				}
-			}
-			if sqlQuery.Constraint == "" || queryConstraint.Check(serverVersion) {
-				tmpl, err := template.New(queryId).Parse(sqlQuery.Statement)
-				if err != nil {
-					frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to parse query %s", queryId))
-					//we try another one
-					continue
-				}
-				buf := new(bytes.Buffer)
-				err = tmpl.Execute(buf, paramTemplate)
-				if err != nil {
-					frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to process query %s template", queryId))
-					//we try another one
-					continue
-				}
-				frame, err := sc.resourceManager.DbClient.ExecuteStatement(queryId, buf.String())
-				if err != nil {
-					frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to execute query %s", queryId))
-					//we try another one
-				} else {
-					frames[queryId] = frame
-					// only 1 query executed
-					break
-				}
-			}
-		}
-
-	}
-
-	fErrors := data.FrameErrors{
-		Errors: frameErrors,
-	}
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: fErrors,
-	}, nil
-}
-
-func getServerSemVersion(sc *SummaryCollector) (*semver.Version, error) {
-	serverVersion, err := sc.resourceManager.DbClient.Version()
-	if err != nil {
-		return &semver.Version{}, err
-	}
-	//drop the build number - it is not a semantic version
-	versionComponents := strings.Split(serverVersion, ".")
-	serverVersion = strings.Join(versionComponents[:len(versionComponents)-1], ".")
-	return semver.NewVersion(serverVersion)
-}
-
-func (sc *SummaryCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.IntParam{
-				Value: 20,
-				Param: config.NewParam("row_limit", "Limit rows on supported queries.", false),
-			},
-		},
-	}
-}
-
-func (sc *SummaryCollector) IsDefault() bool {
-	return true
-}
-
-func (sc *SummaryCollector) Description() string {
-	return "Collects summary statistics on the database based on a set of known useful queries."
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("summary", func() (collectors.Collector, error) {
-		return &SummaryCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/summary_test.go b/programs/diagnostics/internal/collectors/clickhouse/summary_test.go
deleted file mode 100644
index 92945d987ed..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/summary_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package clickhouse_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSummaryConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for summary collector", func(t *testing.T) {
-		client := test.NewFakeClickhouseClient(make(map[string][]string))
-		summaryCollector := clickhouse.NewSummaryCollector(&platform.ResourceManager{
-			DbClient: client,
-		})
-		conf := summaryCollector.Configuration()
-		require.Len(t, conf.Params, 1)
-		require.IsType(t, config.IntParam{}, conf.Params[0])
-		limit, ok := conf.Params[0].(config.IntParam)
-		require.True(t, ok)
-		require.False(t, limit.Required())
-		require.Equal(t, limit.Name(), "row_limit")
-		require.Equal(t, int64(20), limit.Value)
-	})
-}
-
-func TestSummaryCollection(t *testing.T) {
-
-	client := test.NewFakeClickhouseClient(make(map[string][]string))
-	versionFrame := test.NewFakeDataFrame("version", []string{"version()"},
-		[][]interface{}{
-			{"22.1.3.7"},
-		},
-	)
-	client.QueryResponses["SELECT version()"] = &versionFrame
-	databasesFrame := test.NewFakeDataFrame("databases", []string{"name", "engine", "tables", "partitions", "parts", "disk_size"},
-		[][]interface{}{
-			{"tutorial", "Atomic", 2, 2, 2, "1.70 GiB"},
-			{"default", "Atomic", 5, 5, 6, "1.08 GiB"},
-			{"system", "Atomic", 11, 24, 70, "1.05 GiB"},
-			{"INFORMATION_SCHEMA", "Memory", 0, 0, 0, "0.00 B"},
-			{"covid19db", "Atomic", 0, 0, 0, "0.00 B"},
-			{"information_schema", "Memory", 0, 0, 0, "0.00 B"}})
-
-	client.QueryResponses["SELECT name, engine, tables, partitions, parts, formatReadableSize(bytes_on_disk) \"disk_size\" "+
-		"FROM system.databases db LEFT JOIN ( SELECT database, uniq(table) \"tables\", uniq(table, partition) \"partitions\", "+
-		"count() AS parts, sum(bytes_on_disk) \"bytes_on_disk\" FROM system.parts WHERE active GROUP BY database ) AS db_stats "+
-		"ON db.name = db_stats.database ORDER BY bytes_on_disk DESC LIMIT 20"] = &databasesFrame
-
-	summaryCollector := clickhouse.NewSummaryCollector(&platform.ResourceManager{
-		DbClient: client,
-	})
-
-	t.Run("test default summary collection", func(t *testing.T) {
-		bundle, errs := summaryCollector.Collect(config.Configuration{})
-		require.Empty(t, errs)
-		require.Len(t, bundle.Errors.Errors, 30)
-		require.NotNil(t, bundle)
-		require.Len(t, bundle.Frames, 2)
-		// check version frame
-		require.Contains(t, bundle.Frames, "version")
-		require.Equal(t, []string{"version()"}, bundle.Frames["version"].Columns())
-		checkFrame(t, bundle.Frames["version"], versionFrame.Rows)
-		//check databases frame
-		require.Contains(t, bundle.Frames, "databases")
-		require.Equal(t, []string{"name", "engine", "tables", "partitions", "parts", "disk_size"}, bundle.Frames["databases"].Columns())
-		checkFrame(t, bundle.Frames["databases"], databasesFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test summary collection with limit", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.IntParam{
-					Value: 1,
-					Param: config.NewParam("row_limit", "Limit rows on supported queries.", false),
-				},
-			},
-		}
-		bundle, errs := summaryCollector.Collect(conf)
-
-		require.Empty(t, errs)
-		require.Len(t, bundle.Errors.Errors, 31)
-		require.NotNil(t, bundle)
-		// databases will be absent due to limit
-		require.Len(t, bundle.Frames, 1)
-		// check version frame
-		require.Contains(t, bundle.Frames, "version")
-		require.Equal(t, []string{"version()"}, bundle.Frames["version"].Columns())
-		checkFrame(t, bundle.Frames["version"], versionFrame.Rows)
-
-		client.QueryResponses["SELECT name, engine, tables, partitions, parts, formatReadableSize(bytes_on_disk) \"disk_size\" "+
-			"FROM system.databases db LEFT JOIN ( SELECT database, uniq(table) \"tables\", uniq(table, partition) \"partitions\", "+
-			"count() AS parts, sum(bytes_on_disk) \"bytes_on_disk\" FROM system.parts WHERE active GROUP BY database ) AS db_stats "+
-			"ON db.name = db_stats.database ORDER BY bytes_on_disk DESC LIMIT 1"] = &databasesFrame
-		bundle, errs = summaryCollector.Collect(conf)
-		require.Empty(t, errs)
-		require.Len(t, bundle.Errors.Errors, 30)
-		require.NotNil(t, bundle)
-		require.Len(t, bundle.Frames, 2)
-		require.Contains(t, bundle.Frames, "version")
-		//check databases frame
-		require.Contains(t, bundle.Frames, "databases")
-		require.Equal(t, []string{"name", "engine", "tables", "partitions", "parts", "disk_size"}, bundle.Frames["databases"].Columns())
-		// this will parse as our mock client does not read statement (specifically the limit clause) when called with execute
-		checkFrame(t, bundle.Frames["databases"], databasesFrame.Rows)
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/system.go b/programs/diagnostics/internal/collectors/clickhouse/system.go
deleted file mode 100644
index d47cfd924f3..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/system.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package clickhouse
-
-import (
-	"fmt"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/pkg/errors"
-)
-
-// This collector collects the system db from database
-
-type SystemDatabaseCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-const SystemDatabase = "system"
-
-// ExcludeColumns columns if we need - this will be refined over time [table_name][columnA, columnB]
-var ExcludeColumns = map[string][]string{}
-
-// BannedTables - Hardcoded list. These are always excluded even if the user doesn't specify in exclude_tables.
-//Attempts to export will work but we will warn
-var BannedTables = []string{"numbers", "zeros"}
-
-// OrderBy contains a map of tables to an order by clause - by default we don't order table dumps
-var OrderBy = map[string]data.OrderBy{
-	"errors": {
-		Column: "last_error_message",
-		Order:  data.Desc,
-	},
-	"replication_queue": {
-		Column: "create_time",
-		Order:  data.Asc,
-	},
-}
-
-func NewSystemDatabaseCollector(m *platform.ResourceManager) *SystemDatabaseCollector {
-	return &SystemDatabaseCollector{
-		resourceManager: m,
-	}
-}
-
-func (sc *SystemDatabaseCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(sc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	includeTables, err := config.ReadStringListValues(conf, "include_tables")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	excludeTables, err := config.ReadStringListValues(conf, "exclude_tables")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	rowLimit, err := config.ReadIntValue(conf, "row_limit")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	excludeTables = checkBannedTables(includeTables, excludeTables)
-	ds, err := sc.readSystemAllTables(includeTables, excludeTables, rowLimit)
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	return ds, nil
-}
-
-// all banned tables are added to excluded if not present and not specified in included. Returns new exclude_tables list.
-func checkBannedTables(includeTables []string, excludeTables []string) []string {
-	for _, bannedTable := range BannedTables {
-		//if its specified we don't add to our exclude list - explicitly included tables take precedence
-		if !utils.Contains(includeTables, bannedTable) && !utils.Contains(excludeTables, bannedTable) {
-			excludeTables = append(excludeTables, bannedTable)
-		}
-	}
-	return excludeTables
-}
-
-func (sc *SystemDatabaseCollector) readSystemAllTables(include []string, exclude []string, limit int64) (*data.DiagnosticBundle, error) {
-	tableNames, err := sc.resourceManager.DbClient.ReadTableNamesForDatabase(SystemDatabase)
-	if err != nil {
-		return nil, err
-	}
-	var frameErrors []error
-	if include != nil {
-		// nil means include everything
-		tableNames = utils.Intersection(tableNames, include)
-		if len(tableNames) != len(include) {
-			// we warn that some included tables aren't present in db
-			frameErrors = append(frameErrors, fmt.Errorf("some tables specified in the include_tables are not in the system database and will not be exported: %v",
-				utils.Distinct(include, tableNames)))
-		}
-	}
-
-	// exclude tables unless specified in includes
-	excludedTables := utils.Distinct(exclude, include)
-	tableNames = utils.Distinct(tableNames, excludedTables)
-	frames := make(map[string]data.Frame)
-
-	for _, tableName := range tableNames {
-		var excludeColumns []string
-		if _, ok := ExcludeColumns[tableName]; ok {
-			excludeColumns = ExcludeColumns[tableName]
-		}
-		orderBy := data.OrderBy{}
-		if _, ok := OrderBy[tableName]; ok {
-			orderBy = OrderBy[tableName]
-		}
-		frame, err := sc.resourceManager.DbClient.ReadTable(SystemDatabase, tableName, excludeColumns, orderBy, limit)
-		if err != nil {
-			frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to collect %s", tableName))
-		} else {
-			frames[tableName] = frame
-		}
-	}
-
-	fErrors := data.FrameErrors{
-		Errors: frameErrors,
-	}
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: fErrors,
-	}, nil
-}
-
-func (sc *SystemDatabaseCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringListParam{
-				// nil means include everything
-				Values: nil,
-				Param:  config.NewParam("include_tables", "Specify list of tables to collect. Takes precedence over exclude_tables. If not specified (default) all tables except exclude_tables.", false),
-			},
-			config.StringListParam{
-				Values: []string{"licenses", "distributed_ddl_queue", "query_thread_log", "query_log", "asynchronous_metric_log", "zookeeper", "aggregate_function_combinators", "collations", "contributors", "data_type_families", "formats", "graphite_retentions", "numbers", "numbers_mt", "one", "parts_columns", "projection_parts", "projection_parts_columns", "table_engines", "time_zones", "zeros", "zeros_mt"},
-				Param:  config.NewParam("exclude_tables", "Specify list of tables to not collect.", false),
-			},
-			config.IntParam{
-				Value: 100000,
-				Param: config.NewParam("row_limit", "Maximum number of rows to collect from any table. Negative values mean unlimited.", false),
-			},
-		},
-	}
-}
-
-func (sc *SystemDatabaseCollector) IsDefault() bool {
-	return true
-}
-
-func (sc *SystemDatabaseCollector) Description() string {
-	return "Collects all tables in the system database, except those which have been excluded."
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("system_db", func() (collectors.Collector, error) {
-		return &SystemDatabaseCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/system_test.go b/programs/diagnostics/internal/collectors/clickhouse/system_test.go
deleted file mode 100644
index d1b9a6e7859..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/system_test.go
+++ /dev/null
@@ -1,366 +0,0 @@
-package clickhouse_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSystemConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for system db collector", func(t *testing.T) {
-		client := test.NewFakeClickhouseClient(make(map[string][]string))
-		systemDbCollector := clickhouse.NewSystemDatabaseCollector(&platform.ResourceManager{
-			DbClient: client,
-		})
-		conf := systemDbCollector.Configuration()
-		require.Len(t, conf.Params, 3)
-		// check first param
-		require.IsType(t, config.StringListParam{}, conf.Params[0])
-		includeTables, ok := conf.Params[0].(config.StringListParam)
-		require.True(t, ok)
-		require.False(t, includeTables.Required())
-		require.Equal(t, includeTables.Name(), "include_tables")
-		require.Nil(t, includeTables.Values)
-		// check second param
-		require.IsType(t, config.StringListParam{}, conf.Params[1])
-		excludeTables, ok := conf.Params[1].(config.StringListParam)
-		require.True(t, ok)
-		require.False(t, excludeTables.Required())
-		require.Equal(t, "exclude_tables", excludeTables.Name())
-		require.Equal(t, []string{"licenses", "distributed_ddl_queue", "query_thread_log", "query_log", "asynchronous_metric_log", "zookeeper", "aggregate_function_combinators", "collations", "contributors", "data_type_families", "formats", "graphite_retentions", "numbers", "numbers_mt", "one", "parts_columns", "projection_parts", "projection_parts_columns", "table_engines", "time_zones", "zeros", "zeros_mt"}, excludeTables.Values)
-		// check third param
-		require.IsType(t, config.IntParam{}, conf.Params[2])
-		rowLimit, ok := conf.Params[2].(config.IntParam)
-		require.True(t, ok)
-		require.False(t, rowLimit.Required())
-		require.Equal(t, "row_limit", rowLimit.Name())
-		require.Equal(t, int64(100000), rowLimit.Value)
-	})
-}
-
-func TestSystemDbCollect(t *testing.T) {
-
-	diskFrame := test.NewFakeDataFrame("disks", []string{"name", "path", "free_space", "total_space", "keep_free_space", "type"},
-		[][]interface{}{
-			{"default", "/var/lib/clickhouse", 1729659346944, 1938213220352, "", "local"},
-		},
-	)
-	clusterFrame := test.NewFakeDataFrame("clusters", []string{"cluster", "shard_num", "shard_weight", "replica_num", "host_name", "host_address", "port", "is_local", "user", "default_database", "errors_count", "slowdowns_count", "estimated_recovery_time"},
-		[][]interface{}{
-			{"events", 1, 1, 1, "dalem-local-clickhouse-blue-1", "192.168.144.2", 9000, 1, "default", "", 0, 0, 0},
-			{"events", 2, 1, 1, "dalem-local-clickhouse-blue-2", "192.168.144.4", 9000, 1, "default", "", 0, 0, 0},
-			{"events", 3, 1, 1, "dalem-local-clickhouse-blue-3", "192.168.144.3", 9000, 1, "default", "", 0, 0, 0},
-		},
-	)
-	userFrame := test.NewFakeDataFrame("users", []string{"name", "id", "storage", "auth_type", "auth_params", "host_ip", "host_names", "host_names_regexp", "host_names_like"},
-		[][]interface{}{
-			{"default", "94309d50-4f52-5250-31bd-74fecac179db,users.xml,plaintext_password", "sha256_password", []string{"::0"}, []string{}, []string{}, []string{}},
-		},
-	)
-
-	dbTables := map[string][]string{
-		clickhouse.SystemDatabase: {"disks", "clusters", "users"},
-	}
-	client := test.NewFakeClickhouseClient(dbTables)
-
-	client.QueryResponses["SELECT * FROM system.disks LIMIT 100000"] = &diskFrame
-	client.QueryResponses["SELECT * FROM system.clusters LIMIT 100000"] = &clusterFrame
-	client.QueryResponses["SELECT * FROM system.users LIMIT 100000"] = &userFrame
-	systemDbCollector := clickhouse.NewSystemDatabaseCollector(&platform.ResourceManager{
-		DbClient: client,
-	})
-
-	t.Run("test default system db collection", func(t *testing.T) {
-		diagSet, err := systemDbCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		// disks frame
-		require.Equal(t, "disks", diagSet.Frames["disks"].Name())
-		require.Equal(t, diskFrame.ColumnNames, diagSet.Frames["disks"].Columns())
-		checkFrame(t, diagSet.Frames["disks"], diskFrame.Rows)
-		// clusters frame
-		require.Equal(t, "clusters", diagSet.Frames["clusters"].Name())
-		require.Equal(t, clusterFrame.ColumnNames, diagSet.Frames["clusters"].Columns())
-		checkFrame(t, diagSet.Frames["clusters"], clusterFrame.Rows)
-		// users frame
-		require.Equal(t, "users", diagSet.Frames["users"].Name())
-		require.Equal(t, userFrame.ColumnNames, diagSet.Frames["users"].Columns())
-		checkFrame(t, diagSet.Frames["users"], userFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test when we pass an includes", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks"},
-					Param:  config.NewParam("include_tables", "Exclusion", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 1)
-		// disks frame
-		require.Equal(t, "disks", diagSet.Frames["disks"].Name())
-		require.Equal(t, diskFrame.ColumnNames, diagSet.Frames["disks"].Columns())
-		checkFrame(t, diagSet.Frames["disks"], diskFrame.Rows)
-		client.Reset()
-	})
-
-	// test excludes
-	t.Run("test when we pass an excludes", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					Values: []string{"disks"},
-					Param:  config.NewParam("exclude_tables", "Exclusion", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 2)
-		// clusters frame
-		require.Equal(t, "clusters", diagSet.Frames["clusters"].Name())
-		require.Equal(t, clusterFrame.ColumnNames, diagSet.Frames["clusters"].Columns())
-		checkFrame(t, diagSet.Frames["clusters"], clusterFrame.Rows)
-		// users frame
-		require.Equal(t, "users", diagSet.Frames["users"].Name())
-		require.Equal(t, userFrame.ColumnNames, diagSet.Frames["users"].Columns())
-		checkFrame(t, diagSet.Frames["users"], userFrame.Rows)
-		client.Reset()
-	})
-
-	// test includes which isn't in the list
-	t.Run("test when we pass an invalid includes", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks", "invalid"},
-					Param:  config.NewParam("include_tables", "Exclusion", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 1)
-		require.Equal(t, diagSet.Errors.Error(), "some tables specified in the include_tables are not in the "+
-			"system database and will not be exported: [invalid]")
-		require.Len(t, diagSet.Frames, 1)
-		// disks frame
-		require.Equal(t, "disks", diagSet.Frames["disks"].Name())
-		require.Equal(t, diskFrame.ColumnNames, diagSet.Frames["disks"].Columns())
-		checkFrame(t, diagSet.Frames["disks"], diskFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test when we use a table with excluded fields", func(t *testing.T) {
-		excludeDefault := clickhouse.ExcludeColumns
-		client.QueryResponses["SELECT * EXCEPT(keep_free_space,type) FROM system.disks LIMIT 100000"] = &diskFrame
-		clickhouse.ExcludeColumns = map[string][]string{
-			"disks": {"keep_free_space", "type"},
-		}
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks"},
-					Param:  config.NewParam("include_tables", "Exclusion", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 1)
-		// disks frame
-		require.Equal(t, "disks", diagSet.Frames["disks"].Name())
-		require.Equal(t, []string{"name", "path", "free_space", "total_space"}, diagSet.Frames["disks"].Columns())
-		eDiskFrame := test.NewFakeDataFrame("disks", []string{"name", "path", "free_space", "total_space"},
-			[][]interface{}{
-				{"default", "/var/lib/clickhouse", 1729659346944, 1938213220352},
-			},
-		)
-		checkFrame(t, diagSet.Frames["disks"], eDiskFrame.Rows)
-		clickhouse.ExcludeColumns = excludeDefault
-		client.Reset()
-	})
-
-	t.Run("test with a low row limit", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.IntParam{
-					Value: 1,
-					Param: config.NewParam("row_limit", "Maximum number of rows to collect from any table. Negative values mean unlimited.", false),
-				},
-			},
-		}
-		client.QueryResponses["SELECT * FROM system.disks LIMIT 1"] = &diskFrame
-		client.QueryResponses["SELECT * FROM system.clusters LIMIT 1"] = &clusterFrame
-		client.QueryResponses["SELECT * FROM system.users LIMIT 1"] = &userFrame
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		// clusters frame
-		require.Equal(t, "clusters", diagSet.Frames["clusters"].Name())
-		require.Equal(t, clusterFrame.ColumnNames, diagSet.Frames["clusters"].Columns())
-		lClusterFrame := test.NewFakeDataFrame("clusters", []string{"cluster", "shard_num", "shard_weight", "replica_num", "host_name", "host_address", "port", "is_local", "user", "default_database", "errors_count", "slowdowns_count", "estimated_recovery_time"},
-			[][]interface{}{
-				{"events", 1, 1, 1, "dalem-local-clickhouse-blue-1", "192.168.144.2", 9000, 1, "default", "", 0, 0, 0},
-			})
-		checkFrame(t, diagSet.Frames["clusters"], lClusterFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test with a negative low row limit", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.IntParam{
-					Value: -23,
-					Param: config.NewParam("row_limit", "Maximum number of rows to collect from any table. Negative values mean unlimited.", false),
-				},
-			},
-		}
-		client.QueryResponses["SELECT * FROM system.clusters"] = &clusterFrame
-		client.QueryResponses["SELECT * FROM system.disks"] = &diskFrame
-		client.QueryResponses["SELECT * FROM system.users"] = &userFrame
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		// disks frame
-		require.Equal(t, "disks", diagSet.Frames["disks"].Name())
-		require.Equal(t, diskFrame.ColumnNames, diagSet.Frames["disks"].Columns())
-		checkFrame(t, diagSet.Frames["disks"], diskFrame.Rows)
-		// clusters frame
-		require.Equal(t, "clusters", diagSet.Frames["clusters"].Name())
-		require.Equal(t, clusterFrame.ColumnNames, diagSet.Frames["clusters"].Columns())
-		checkFrame(t, diagSet.Frames["clusters"], clusterFrame.Rows)
-		// users frame
-		require.Equal(t, "users", diagSet.Frames["users"].Name())
-		require.Equal(t, userFrame.ColumnNames, diagSet.Frames["users"].Columns())
-		checkFrame(t, diagSet.Frames["users"], userFrame.Rows)
-		client.Reset()
-	})
-
-	t.Run("test that includes overrides excludes", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks"},
-					Param:  config.NewParam("exclude_tables", "Excluded", false),
-				},
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks", "clusters", "users"},
-					Param:  config.NewParam("include_tables", "Included", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		client.Reset()
-	})
-
-	t.Run("test banned", func(t *testing.T) {
-		bannedDefault := clickhouse.BannedTables
-		clickhouse.BannedTables = []string{"disks"}
-		diagSet, err := systemDbCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 2)
-		require.Contains(t, diagSet.Frames, "users")
-		require.Contains(t, diagSet.Frames, "clusters")
-		clickhouse.BannedTables = bannedDefault
-		client.Reset()
-	})
-
-	t.Run("test banned unless included", func(t *testing.T) {
-		bannedDefault := clickhouse.BannedTables
-		clickhouse.BannedTables = []string{"disks"}
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: []string{"disks", "clusters", "users"},
-					Param:  config.NewParam("include_tables", "Included", false),
-				},
-			},
-		}
-		diagSet, err := systemDbCollector.Collect(conf)
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		require.Contains(t, diagSet.Frames, "disks")
-		require.Contains(t, diagSet.Frames, "users")
-		require.Contains(t, diagSet.Frames, "clusters")
-		clickhouse.BannedTables = bannedDefault
-		client.Reset()
-	})
-
-	t.Run("tables are ordered if configured", func(t *testing.T) {
-		defaultOrderBy := clickhouse.OrderBy
-		clickhouse.OrderBy = map[string]data.OrderBy{
-			"clusters": {
-				Column: "shard_num",
-				Order:  data.Desc,
-			},
-		}
-		client.QueryResponses["SELECT * FROM system.clusters ORDER BY shard_num DESC LIMIT 100000"] = &clusterFrame
-		diagSet, err := systemDbCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 3)
-		clickhouse.OrderBy = defaultOrderBy
-		oClusterFrame := test.NewFakeDataFrame("clusters", []string{"cluster", "shard_num", "shard_weight", "replica_num", "host_name", "host_address", "port", "is_local", "user", "default_database", "errors_count", "slowdowns_count", "estimated_recovery_time"},
-			[][]interface{}{
-				{"events", 3, 1, 1, "dalem-local-clickhouse-blue-3", "192.168.144.3", 9000, 1, "default", "", 0, 0, 0},
-				{"events", 2, 1, 1, "dalem-local-clickhouse-blue-2", "192.168.144.4", 9000, 1, "default", "", 0, 0, 0},
-				{"events", 1, 1, 1, "dalem-local-clickhouse-blue-1", "192.168.144.2", 9000, 1, "default", "", 0, 0, 0},
-			},
-		)
-		checkFrame(t, diagSet.Frames["clusters"], oClusterFrame.Rows)
-		client.Reset()
-	})
-
-}
-
-func checkFrame(t *testing.T, frame data.Frame, rows [][]interface{}) {
-	i := 0
-	for {
-		values, ok, err := frame.Next()
-		require.Nil(t, err)
-		if !ok {
-			break
-		}
-		require.ElementsMatch(t, rows[i], values)
-		i += 1
-	}
-	require.Equal(t, i, len(rows))
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/zookeeper.go b/programs/diagnostics/internal/collectors/clickhouse/zookeeper.go
deleted file mode 100644
index 78aefeaa0c1..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/zookeeper.go
+++ /dev/null
@@ -1,153 +0,0 @@
-package clickhouse
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/bmatcuk/doublestar/v4"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-)
-
-// This collector collects the system zookeeper db
-
-type ZookeeperCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewZookeeperCollector(m *platform.ResourceManager) *ZookeeperCollector {
-	return &ZookeeperCollector{
-		resourceManager: m,
-	}
-}
-
-func (zkc *ZookeeperCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(zkc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-
-	pathPattern, err := config.ReadStringValue(conf, "path_pattern")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	defaultPattern, _ := zkc.Configuration().GetConfigParam("path_pattern")
-	if defaultPattern.(config.StringParam).Value != pathPattern {
-		log.Warn().Msgf("Using non default zookeeper glob pattern [%s] - this can potentially cause high query load", pathPattern)
-	}
-	maxDepth, err := config.ReadIntValue(conf, "max_depth")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	rowLimit, err := config.ReadIntValue(conf, "row_limit")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	// we use doublestar for globs as it provides us with ** but also allows us to identify prefix or base paths
-	if !doublestar.ValidatePattern(pathPattern) {
-		return &data.DiagnosticBundle{}, errors.Wrapf(err, "%s is not a valid pattern", pathPattern)
-	}
-	base, _ := doublestar.SplitPattern(pathPattern)
-	frames := make(map[string]data.Frame)
-	hFrame, frameErrors := zkc.collectSubFrames(base, pathPattern, rowLimit, 0, maxDepth)
-	fErrors := data.FrameErrors{
-		Errors: frameErrors,
-	}
-	frames["zookeeper_db"] = hFrame
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: fErrors,
-	}, nil
-}
-
-// recursively iterates over the zookeeper sub tables to a max depth, applying the filter and max rows per table
-func (zkc *ZookeeperCollector) collectSubFrames(path, pathPattern string, rowLimit, currentDepth, maxDepth int64) (data.HierarchicalFrame, []error) {
-	var frameErrors []error
-	var subFrames []data.HierarchicalFrame
-
-	currentDepth += 1
-	if currentDepth == maxDepth {
-		return data.HierarchicalFrame{}, frameErrors
-	}
-	match, err := doublestar.PathMatch(pathPattern, path)
-	if err != nil {
-		frameErrors = append(frameErrors, errors.Wrapf(err, "Path match failed for pattern %s with path %s", pathPattern, path))
-		return data.HierarchicalFrame{}, frameErrors
-	}
-	// we allow a single level to be examined or we never get going
-	if !match && currentDepth > 1 {
-		return data.HierarchicalFrame{}, frameErrors
-	}
-	frame, err := zkc.resourceManager.DbClient.ExecuteStatement(path, fmt.Sprintf("SELECT name FROM system.zookeeper WHERE path='%s' LIMIT %d", path, rowLimit))
-	if err != nil {
-		frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to read zookeeper table path for sub paths %s", path))
-		return data.HierarchicalFrame{}, frameErrors
-	}
-
-	// this isn't ideal, we add re-execute the query to our collection as this will be consumed by the output lazily
-	outputFrame, err := zkc.resourceManager.DbClient.ExecuteStatement(path, fmt.Sprintf("SELECT * FROM system.zookeeper WHERE path='%s' LIMIT %d", path, rowLimit))
-	if err != nil {
-		frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to read zookeeper table path %s", path))
-		return data.HierarchicalFrame{}, frameErrors
-	}
-	frameComponents := strings.Split(path, "/")
-	frameId := frameComponents[len(frameComponents)-1]
-
-	for {
-		values, ok, err := frame.Next()
-		if err != nil {
-			frameErrors = append(frameErrors, errors.Wrapf(err, "unable to read frame %s", frame.Name()))
-			return data.NewHierarchicalFrame(frameId, outputFrame, subFrames), frameErrors
-		}
-		if !ok {
-			return data.NewHierarchicalFrame(frameId, outputFrame, subFrames), frameErrors
-		}
-		subName := fmt.Sprintf("%v", values[0])
-		subPath := fmt.Sprintf("%s/%s", path, subName)
-		subFrame, errs := zkc.collectSubFrames(subPath, pathPattern, rowLimit, currentDepth, maxDepth)
-		if subFrame.Name() != "" {
-			subFrames = append(subFrames, subFrame)
-		}
-		frameErrors = append(frameErrors, errs...)
-	}
-}
-
-func (zkc *ZookeeperCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value: "/clickhouse/{task_queue}/**",
-				Param: config.NewParam("path_pattern", "Glob pattern for zookeeper path matching. Change with caution.", false),
-			},
-			config.IntParam{
-				Value: 8,
-				Param: config.NewParam("max_depth", "Max depth for zookeeper navigation.", false),
-			},
-			config.IntParam{
-				Value: 10,
-				Param: config.NewParam("row_limit", "Maximum number of rows/sub nodes to collect/expand from any zookeeper leaf. Negative values mean unlimited.", false),
-			},
-		},
-	}
-}
-
-func (zkc *ZookeeperCollector) IsDefault() bool {
-	return false
-}
-
-func (zkc *ZookeeperCollector) Description() string {
-	return "Collects Zookeeper information available within ClickHouse."
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("zookeeper_db", func() (collectors.Collector, error) {
-		return &ZookeeperCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/clickhouse/zookeeper_test.go b/programs/diagnostics/internal/collectors/clickhouse/zookeeper_test.go
deleted file mode 100644
index 3e56f6200f0..00000000000
--- a/programs/diagnostics/internal/collectors/clickhouse/zookeeper_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package clickhouse_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-func TestZookeeperConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for system zookeeper collector", func(t *testing.T) {
-		client := test.NewFakeClickhouseClient(make(map[string][]string))
-		zkCollector := clickhouse.NewZookeeperCollector(&platform.ResourceManager{
-			DbClient: client,
-		})
-		conf := zkCollector.Configuration()
-		require.Len(t, conf.Params, 3)
-		// check first param
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		pathPattern, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.False(t, pathPattern.Required())
-		require.Equal(t, pathPattern.Name(), "path_pattern")
-		require.Equal(t, "/clickhouse/{task_queue}/**", pathPattern.Value)
-		// check second param
-		require.IsType(t, config.IntParam{}, conf.Params[1])
-		maxDepth, ok := conf.Params[1].(config.IntParam)
-		require.True(t, ok)
-		require.False(t, maxDepth.Required())
-		require.Equal(t, "max_depth", maxDepth.Name())
-		require.Equal(t, int64(8), maxDepth.Value)
-		// check third param
-		require.IsType(t, config.IntParam{}, conf.Params[2])
-		rowLimit, ok := conf.Params[2].(config.IntParam)
-		require.True(t, ok)
-		require.False(t, rowLimit.Required())
-		require.Equal(t, "row_limit", rowLimit.Name())
-		require.Equal(t, int64(10), rowLimit.Value)
-	})
-}
-
-func TestZookeeperCollect(t *testing.T) {
-	level1 := test.NewFakeDataFrame("level_1", []string{"name", "value", "czxid", "mzxid", "ctime", "mtime", "version", "cversion", "aversion", "ephemeralOwner", "dataLength", "numChildren", "pzxid", "path"},
-		[][]interface{}{
-			{"name", "value", "czxid", "mzxid", "ctime", "mtime", "version", "cversion", "aversion", "ephemeralOwner", "dataLength", "numChildren", "pzxid", "path"},
-			{"task_queue", "", "4", "4", "2022-02-22 13:30:15", "2022-02-22 13:30:15", "0", "1", "0", "0", "0", "1", "5", "/clickhouse"},
-			{"copytasks", "", "525608", "525608", "2022-03-09 13:47:39", "2022-03-09 13:47:39", "0", "7", "0", "0", "0", "7", "526100", "/clickhouse"},
-		},
-	)
-	level2 := test.NewFakeDataFrame("level_2", []string{"name", "value", "czxid", "mzxid", "ctime", "mtime", "version", "cversion", "aversion", "ephemeralOwner", "dataLength", "numChildren", "pzxid", "path"},
-		[][]interface{}{
-			{"ddl", "", "5", "5", "2022-02-22 13:30:15", "2022-02-22 13:30:15", "0", "0", "0", "0", "0", "0", "5", "/clickhouse/task_queue"},
-		},
-	)
-	level3 := test.NewFakeDataFrame("level_2", []string{"name", "value", "czxid", "mzxid", "ctime", "mtime", "version", "cversion", "aversion", "ephemeralOwner", "dataLength", "numChildren", "pzxid", "path"},
-		[][]interface{}{},
-	)
-	dbTables := map[string][]string{
-		clickhouse.SystemDatabase: {"zookeeper"},
-	}
-	client := test.NewFakeClickhouseClient(dbTables)
-
-	client.QueryResponses["SELECT name FROM system.zookeeper WHERE path='/clickhouse' LIMIT 10"] = &level1
-	// can't reuse the frame as the first frame will be iterated as part of the recursive zookeeper search performed by the collector
-	cLevel1 := test.NewFakeDataFrame("level_1", level1.Columns(), level1.Rows)
-	client.QueryResponses["SELECT * FROM system.zookeeper WHERE path='/clickhouse' LIMIT 10"] = &cLevel1
-	client.QueryResponses["SELECT name FROM system.zookeeper WHERE path='/clickhouse/task_queue' LIMIT 10"] = &level2
-	cLevel2 := test.NewFakeDataFrame("level_2", level2.Columns(), level2.Rows)
-	client.QueryResponses["SELECT * FROM system.zookeeper WHERE path='/clickhouse/task_queue' LIMIT 10"] = &cLevel2
-	client.QueryResponses["SELECT name FROM system.zookeeper WHERE path='/clickhouse/task_queue/ddl' LIMIT 10"] = &level3
-	cLevel3 := test.NewFakeDataFrame("level_3", level3.Columns(), level3.Rows)
-	client.QueryResponses["SELECT * FROM system.zookeeper WHERE path='/clickhouse/task_queue/ddl' LIMIT 10"] = &cLevel3
-
-	zKCollector := clickhouse.NewZookeeperCollector(&platform.ResourceManager{
-		DbClient: client,
-	})
-
-	t.Run("test default zookeeper collection", func(t *testing.T) {
-		diagSet, err := zKCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 1)
-		require.Contains(t, diagSet.Frames, "zookeeper_db")
-		require.Equal(t, "clickhouse", diagSet.Frames["zookeeper_db"].Name())
-		require.IsType(t, data.HierarchicalFrame{}, diagSet.Frames["zookeeper_db"])
-		checkFrame(t, diagSet.Frames["zookeeper_db"], level1.Rows)
-		require.Equal(t, level1.Columns(), diagSet.Frames["zookeeper_db"].Columns())
-		hierarchicalFrame := diagSet.Frames["zookeeper_db"].(data.HierarchicalFrame)
-		require.Len(t, hierarchicalFrame.SubFrames, 1)
-		checkFrame(t, hierarchicalFrame.SubFrames[0], cLevel2.Rows)
-		require.Equal(t, cLevel2.Columns(), hierarchicalFrame.SubFrames[0].Columns())
-		hierarchicalFrame = hierarchicalFrame.SubFrames[0]
-		require.Len(t, hierarchicalFrame.SubFrames, 1)
-		checkFrame(t, hierarchicalFrame.SubFrames[0], cLevel3.Rows)
-		require.Equal(t, cLevel3.Columns(), hierarchicalFrame.SubFrames[0].Columns())
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/registry.go b/programs/diagnostics/internal/collectors/registry.go
deleted file mode 100644
index 5611f947466..00000000000
--- a/programs/diagnostics/internal/collectors/registry.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package collectors
-
-import (
-	"fmt"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-)
-
-type Collector interface {
-	Collect(config config.Configuration) (*data.DiagnosticBundle, error)
-	Configuration() config.Configuration
-	IsDefault() bool
-	Description() string
-}
-
-// Register can be called from init() on a collector in this package
-// It will automatically be added to the Collectors map to be called externally
-func Register(name string, collector CollectorFactory) {
-	if name == "diag_trace" {
-		// we use this to record errors and warnings
-		log.Fatal().Msgf("diag_trace is a reserved collector name")
-	}
-	// names must be unique
-	if _, ok := Collectors[name]; ok {
-		log.Fatal().Msgf("More than 1 collector is trying to register under the name %s. Names must be unique.", name)
-	}
-	Collectors[name] = collector
-}
-
-// CollectorFactory lets us use a closure to get instances of the collector struct
-type CollectorFactory func() (Collector, error)
-
-var Collectors = map[string]CollectorFactory{}
-
-func GetCollectorNames(defaultOnly bool) []string {
-	// can't pre-allocate as not all maybe default
-	var collectors []string
-	for collectorName := range Collectors {
-		collector, err := GetCollectorByName(collectorName)
-		if err != nil {
-			log.Fatal().Err(err)
-		}
-		if !defaultOnly || (defaultOnly && collector.IsDefault()) {
-			collectors = append(collectors, collectorName)
-		}
-	}
-	return collectors
-}
-
-func GetCollectorByName(name string) (Collector, error) {
-	if collectorFactory, ok := Collectors[name]; ok {
-		//do something here
-		collector, err := collectorFactory()
-		if err != nil {
-			return nil, errors.Wrapf(err, "collector %s could not be initialized", name)
-		}
-		return collector, nil
-	}
-	return nil, fmt.Errorf("%s is not a valid collector name", name)
-}
-
-func BuildConfigurationOptions() (map[string]config.Configuration, error) {
-	configurations := make(map[string]config.Configuration)
-	for name, collectorFactory := range Collectors {
-		collector, err := collectorFactory()
-		if err != nil {
-			return nil, errors.Wrapf(err, "collector %s could not be initialized", name)
-		}
-		configurations[name] = collector.Configuration()
-	}
-	return configurations, nil
-}
diff --git a/programs/diagnostics/internal/collectors/registry_test.go b/programs/diagnostics/internal/collectors/registry_test.go
deleted file mode 100644
index eccc5f2265d..00000000000
--- a/programs/diagnostics/internal/collectors/registry_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package collectors_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetCollectorNames(t *testing.T) {
-	t.Run("can get all collector names", func(t *testing.T) {
-		collectorNames := collectors.GetCollectorNames(false)
-		require.ElementsMatch(t, []string{"system_db", "config", "summary", "system", "logs", "db_logs", "file", "command", "zookeeper_db"}, collectorNames)
-	})
-
-	t.Run("can get default collector names", func(t *testing.T) {
-		collectorNames := collectors.GetCollectorNames(true)
-		require.ElementsMatch(t, []string{"system_db", "config", "summary", "system", "logs", "db_logs"}, collectorNames)
-	})
-}
-
-func TestGetCollectorByName(t *testing.T) {
-
-	t.Run("can get collector by name", func(t *testing.T) {
-		collector, err := collectors.GetCollectorByName("system_db")
-		require.Nil(t, err)
-		require.Equal(t, clickhouse.NewSystemDatabaseCollector(platform.GetResourceManager()), collector)
-	})
-
-	t.Run("fails on non existing collector", func(t *testing.T) {
-		collector, err := collectors.GetCollectorByName("random")
-		require.NotNil(t, err)
-		require.Equal(t, "random is not a valid collector name", err.Error())
-		require.Nil(t, collector)
-	})
-}
-
-func TestBuildConfigurationOptions(t *testing.T) {
-
-	t.Run("can get all collector configurations", func(t *testing.T) {
-		configs, err := collectors.BuildConfigurationOptions()
-		require.Nil(t, err)
-		require.Len(t, configs, 9)
-		require.Contains(t, configs, "system_db")
-		require.Contains(t, configs, "config")
-		require.Contains(t, configs, "summary")
-		require.Contains(t, configs, "system")
-		require.Contains(t, configs, "logs")
-		require.Contains(t, configs, "db_logs")
-		require.Contains(t, configs, "file")
-		require.Contains(t, configs, "command")
-		require.Contains(t, configs, "zookeeper_db")
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/system/command.go b/programs/diagnostics/internal/collectors/system/command.go
deleted file mode 100644
index ba4dd1e996c..00000000000
--- a/programs/diagnostics/internal/collectors/system/command.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package system
-
-import (
-	"bytes"
-	"os/exec"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/google/shlex"
-	"github.com/pkg/errors"
-)
-
-// This collector runs a user specified command and collects it to a file
-
-type CommandCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewCommandCollector(m *platform.ResourceManager) *CommandCollector {
-	return &CommandCollector{
-		resourceManager: m,
-	}
-}
-
-func (c *CommandCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(c.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	command, err := config.ReadStringValue(conf, "command")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	var frameErrors []error
-	// shlex to split the commands and args
-	cmdArgs, err := shlex.Split(command)
-	if err != nil || len(cmdArgs) == 0 {
-		return &data.DiagnosticBundle{}, errors.Wrap(err, "Unable to parse command")
-	}
-	cmd := exec.Command(cmdArgs[0], cmdArgs[1:]...)
-	var stdout, stderr bytes.Buffer
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-	err = cmd.Run()
-	var sError string
-	if err != nil {
-		frameErrors = append(frameErrors, errors.Wrap(err, "Unable to execute command"))
-		sError = err.Error()
-	}
-	memoryFrame := data.NewMemoryFrame("output", []string{"command", "stdout", "stderr", "error"}, [][]interface{}{
-		{command, stdout.String(), stderr.String(), sError},
-	})
-	return &data.DiagnosticBundle{
-		Errors: data.FrameErrors{Errors: frameErrors},
-		Frames: map[string]data.Frame{
-			"output": memoryFrame,
-		},
-	}, nil
-}
-
-func (c *CommandCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value:      "",
-				Param:      config.NewParam("command", "Command to execute", true),
-				AllowEmpty: false,
-			},
-		},
-	}
-}
-
-func (c *CommandCollector) IsDefault() bool {
-	return false
-}
-
-func (c *CommandCollector) Description() string {
-	return "Allows collection of the output from a user specified command"
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("command", func() (collectors.Collector, error) {
-		return &CommandCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/system/command_test.go b/programs/diagnostics/internal/collectors/system/command_test.go
deleted file mode 100644
index 7de00cdabf4..00000000000
--- a/programs/diagnostics/internal/collectors/system/command_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package system_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestCommandConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for file collector", func(t *testing.T) {
-		commandCollector := system.NewCommandCollector(&platform.ResourceManager{})
-		conf := commandCollector.Configuration()
-		require.Len(t, conf.Params, 1)
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		command, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.True(t, command.Required())
-		require.Equal(t, command.Name(), "command")
-		require.Equal(t, "", command.Value)
-	})
-}
-
-func TestCommandCollect(t *testing.T) {
-	t.Run("test simple command with args", func(t *testing.T) {
-		commandCollector := system.NewCommandCollector(&platform.ResourceManager{})
-		bundle, err := commandCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "ls -l ../../../testdata",
-					Param:      config.NewParam("command", "Command to execute", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		require.Nil(t, err)
-		require.Nil(t, bundle.Errors.Errors)
-		require.Len(t, bundle.Frames, 1)
-		require.Contains(t, bundle.Frames, "output")
-		require.Equal(t, bundle.Frames["output"].Columns(), []string{"command", "stdout", "stderr", "error"})
-		memFrame := bundle.Frames["output"].(data.MemoryFrame)
-		values, ok, err := memFrame.Next()
-		require.True(t, ok)
-		require.Nil(t, err)
-		fmt.Println(values)
-		require.Len(t, values, 4)
-		require.Equal(t, "ls -l ../../../testdata", values[0])
-		require.Contains(t, values[1], "configs")
-		require.Contains(t, values[1], "docker")
-		require.Contains(t, values[1], "log")
-		require.Equal(t, "", values[2])
-		require.Equal(t, "", values[3])
-		values, ok, err = memFrame.Next()
-		require.False(t, ok)
-		require.Nil(t, err)
-		require.Nil(t, values)
-	})
-
-	t.Run("test empty command", func(t *testing.T) {
-		commandCollector := system.NewCommandCollector(&platform.ResourceManager{})
-		bundle, err := commandCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "",
-					Param:      config.NewParam("command", "Command to execute", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		require.Equal(t, "parameter command is invalid - command cannot be empty", err.Error())
-		require.Equal(t, &data.DiagnosticBundle{}, bundle)
-	})
-
-	t.Run("test invalid command", func(t *testing.T) {
-		commandCollector := system.NewCommandCollector(&platform.ResourceManager{})
-		bundle, err := commandCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "ls --invalid ../../../testdata",
-					Param:      config.NewParam("command", "Command to execute", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		// commands may error with output - we still capture on stderr
-		require.Nil(t, err)
-		require.Len(t, bundle.Errors.Errors, 1)
-		require.Equal(t, "Unable to execute command: exit status 2", bundle.Errors.Errors[0].Error())
-		require.Len(t, bundle.Frames, 1)
-		require.Contains(t, bundle.Frames, "output")
-		require.Equal(t, bundle.Frames["output"].Columns(), []string{"command", "stdout", "stderr", "error"})
-		memFrame := bundle.Frames["output"].(data.MemoryFrame)
-		values, ok, err := memFrame.Next()
-		require.True(t, ok)
-		require.Nil(t, err)
-		require.Len(t, values, 4)
-		require.Equal(t, "ls --invalid ../../../testdata", values[0])
-		require.Equal(t, "", values[1])
-		// exact values here may vary on platform
-		require.NotEmpty(t, values[2])
-		require.NotEmpty(t, values[3])
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/system/file.go b/programs/diagnostics/internal/collectors/system/file.go
deleted file mode 100644
index cda91636c52..00000000000
--- a/programs/diagnostics/internal/collectors/system/file.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package system
-
-import (
-	"os"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-	"github.com/yargevad/filepathx"
-)
-
-// This collector collects arbitrary user files
-
-type FileCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewFileCollector(m *platform.ResourceManager) *FileCollector {
-	return &FileCollector{
-		resourceManager: m,
-	}
-}
-
-func (f *FileCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	conf, err := conf.ValidateConfig(f.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	filePattern, err := config.ReadStringValue(conf, "file_pattern")
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-
-	var frameErrors []error
-	// this util package supports recursive file matching e.g. /**/*
-	matches, err := filepathx.Glob(filePattern)
-	if err != nil {
-		return &data.DiagnosticBundle{}, errors.Wrapf(err, "Invalid file_pattern \"%s\"", filePattern)
-	}
-
-	if len(matches) == 0 {
-		frameErrors = append(frameErrors, errors.New("0 files match glob pattern"))
-		return &data.DiagnosticBundle{
-			Errors: data.FrameErrors{Errors: frameErrors},
-		}, nil
-	}
-
-	var filePaths []string
-	for _, match := range matches {
-		fi, err := os.Stat(match)
-		if err != nil {
-			frameErrors = append(frameErrors, errors.Wrapf(err, "Unable to read file %s", match))
-		}
-		if !fi.IsDir() {
-			log.Debug().Msgf("Collecting file %s", match)
-			filePaths = append(filePaths, match)
-		}
-	}
-
-	frame := data.NewFileFrame("collection", filePaths)
-
-	return &data.DiagnosticBundle{
-		Errors: data.FrameErrors{Errors: frameErrors},
-		Frames: map[string]data.Frame{
-			"collection": frame,
-		},
-	}, nil
-}
-
-func (f *FileCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value:      "",
-				Param:      config.NewParam("file_pattern", "Glob based pattern to specify files for collection", true),
-				AllowEmpty: false,
-			},
-		},
-	}
-}
-
-func (f *FileCollector) IsDefault() bool {
-	return false
-}
-
-func (f *FileCollector) Description() string {
-	return "Allows collection of user specified files"
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("file", func() (collectors.Collector, error) {
-		return &FileCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/system/file_test.go b/programs/diagnostics/internal/collectors/system/file_test.go
deleted file mode 100644
index 5b1d5b3a92f..00000000000
--- a/programs/diagnostics/internal/collectors/system/file_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package system_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFileConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for file collector", func(t *testing.T) {
-		fileCollector := system.NewFileCollector(&platform.ResourceManager{})
-		conf := fileCollector.Configuration()
-		require.Len(t, conf.Params, 1)
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		filePattern, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.True(t, filePattern.Required())
-		require.Equal(t, filePattern.Name(), "file_pattern")
-		require.Equal(t, "", filePattern.Value)
-	})
-}
-
-func TestFileCollect(t *testing.T) {
-
-	t.Run("test filter patterns work", func(t *testing.T) {
-		fileCollector := system.NewFileCollector(&platform.ResourceManager{})
-		bundle, err := fileCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "../../../testdata/**/*.xml",
-					Param:      config.NewParam("file_pattern", "Glob based pattern to specify files for collection", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		require.Nil(t, err)
-		require.Nil(t, bundle.Errors.Errors)
-		checkFileBundle(t, bundle,
-			[]string{"../../../testdata/configs/include/xml/server-include.xml",
-				"../../../testdata/configs/include/xml/user-include.xml",
-				"../../../testdata/configs/xml/config.xml",
-				"../../../testdata/configs/xml/users.xml",
-				"../../../testdata/configs/xml/users.d/default-password.xml",
-				"../../../testdata/configs/yandex_xml/config.xml",
-				"../../../testdata/docker/admin.xml",
-				"../../../testdata/docker/custom.xml"})
-	})
-
-	t.Run("invalid file patterns are detected", func(t *testing.T) {
-		fileCollector := system.NewFileCollector(&platform.ResourceManager{})
-		bundle, err := fileCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "",
-					Param:      config.NewParam("file_pattern", "Glob based pattern to specify files for collection", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		require.NotNil(t, err)
-		require.Equal(t, "parameter file_pattern is invalid - file_pattern cannot be empty", err.Error())
-		require.Equal(t, &data.DiagnosticBundle{}, bundle)
-	})
-
-	t.Run("check empty matches are reported", func(t *testing.T) {
-		fileCollector := system.NewFileCollector(&platform.ResourceManager{})
-		bundle, err := fileCollector.Collect(config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value:      "../../../testdata/**/*.random",
-					Param:      config.NewParam("file_pattern", "Glob based pattern to specify files for collection", true),
-					AllowEmpty: false,
-				},
-			},
-		})
-		require.Nil(t, err)
-		require.Nil(t, bundle.Frames)
-		require.Len(t, bundle.Errors.Errors, 1)
-		require.Equal(t, "0 files match glob pattern", bundle.Errors.Errors[0].Error())
-	})
-
-}
-
-func checkFileBundle(t *testing.T, bundle *data.DiagnosticBundle, expectedFiles []string) {
-	require.NotNil(t, bundle)
-	require.Nil(t, bundle.Errors.Errors)
-	require.Len(t, bundle.Frames, 1)
-	require.Contains(t, bundle.Frames, "collection")
-	dirFrame, ok := bundle.Frames["collection"].(data.FileFrame)
-	require.True(t, ok)
-	require.Equal(t, []string{"files"}, dirFrame.Columns())
-	i := 0
-	for {
-		values, ok, err := dirFrame.Next()
-		require.Nil(t, err)
-		if !ok {
-			break
-		}
-		require.Len(t, values, 1)
-		file, ok := values[0].(data.SimpleFile)
-		require.True(t, ok)
-		require.Contains(t, expectedFiles, file.FilePath())
-		i += 1
-	}
-	require.Equal(t, len(expectedFiles), i)
-}
diff --git a/programs/diagnostics/internal/collectors/system/system.go b/programs/diagnostics/internal/collectors/system/system.go
deleted file mode 100644
index 69d16f36b8b..00000000000
--- a/programs/diagnostics/internal/collectors/system/system.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package system
-
-import (
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/elastic/gosigar"
-	"github.com/jaypipes/ghw"
-	"github.com/matishsiao/goInfo"
-	"github.com/pkg/errors"
-)
-
-// This collector collects the system overview
-
-type SystemCollector struct {
-	resourceManager *platform.ResourceManager
-}
-
-func NewSystemCollector(m *platform.ResourceManager) *SystemCollector {
-	return &SystemCollector{
-		resourceManager: m,
-	}
-}
-
-func (sc *SystemCollector) Collect(conf config.Configuration) (*data.DiagnosticBundle, error) {
-	_, err := conf.ValidateConfig(sc.Configuration())
-	if err != nil {
-		return &data.DiagnosticBundle{}, err
-	}
-	frames := make(map[string]data.Frame)
-	var frameErrors []error
-
-	frameErrors = addStatsToFrame(frames, frameErrors, "disks", getDisk)
-	frameErrors = addStatsToFrame(frames, frameErrors, "disk_usage", getDiskUsage)
-
-	frameErrors = addStatsToFrame(frames, frameErrors, "memory", getMemory)
-	frameErrors = addStatsToFrame(frames, frameErrors, "memory_usage", getMemoryUsage)
-
-	frameErrors = addStatsToFrame(frames, frameErrors, "cpu", getCPU)
-	//frameErrors = addStatsToFrame(frames, frameErrors, "cpu_usage", getCPUUsage)
-
-	frameErrors = addStatsToFrame(frames, frameErrors, "processes", getProcessList)
-
-	frameErrors = addStatsToFrame(frames, frameErrors, "os", getHostDetails)
-
-	return &data.DiagnosticBundle{
-		Frames: frames,
-		Errors: data.FrameErrors{
-			Errors: frameErrors,
-		},
-	}, err
-}
-
-func addStatsToFrame(frames map[string]data.Frame, errors []error, name string, statFunc func() (data.MemoryFrame, error)) []error {
-	frame, err := statFunc()
-	if err != nil {
-		errors = append(errors, err)
-	}
-	frames[name] = frame
-	return errors
-}
-
-func (sc *SystemCollector) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{},
-	}
-}
-
-func (sc *SystemCollector) IsDefault() bool {
-	return true
-}
-
-func getDisk() (data.MemoryFrame, error) {
-	block, err := ghw.Block()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to list block storage")
-	}
-	var rows [][]interface{}
-	columns := []string{"name", "size", "physicalBlockSize", "driveType", "controller", "vendor", "model", "partitionName", "partitionSize", "mountPoint", "readOnly"}
-	for _, disk := range block.Disks {
-		for _, part := range disk.Partitions {
-			rows = append(rows, []interface{}{disk.Name, disk.SizeBytes, disk.PhysicalBlockSizeBytes, disk.DriveType, disk.StorageController, disk.Vendor, disk.Model, part.Name, part.SizeBytes, part.MountPoint, part.IsReadOnly})
-		}
-	}
-	return data.NewMemoryFrame("disk_usage", columns, rows), nil
-}
-
-func getDiskUsage() (data.MemoryFrame, error) {
-	fsList := gosigar.FileSystemList{}
-	err := fsList.Get()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to list filesystems for usage")
-	}
-	rows := make([][]interface{}, len(fsList.List))
-	columns := []string{"filesystem", "size", "used", "avail", "use%", "mounted on"}
-	for i, fs := range fsList.List {
-		dirName := fs.DirName
-		usage := gosigar.FileSystemUsage{}
-		err = usage.Get(dirName)
-		if err == nil {
-			rows[i] = []interface{}{fs.DevName, usage.Total, usage.Used, usage.Avail, usage.UsePercent(), dirName}
-		} else {
-			// we try to output something
-			rows[i] = []interface{}{fs.DevName, 0, 0, 0, 0, dirName}
-		}
-	}
-	return data.NewMemoryFrame("disk_usage", columns, rows), nil
-}
-
-func getMemory() (data.MemoryFrame, error) {
-	memory, err := ghw.Memory()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to read memory")
-	}
-	columns := []string{"totalPhysical", "totalUsable", "supportedPageSizes"}
-	rows := make([][]interface{}, 1)
-	rows[0] = []interface{}{memory.TotalPhysicalBytes, memory.TotalUsableBytes, memory.SupportedPageSizes}
-	return data.NewMemoryFrame("memory", columns, rows), nil
-}
-
-func getMemoryUsage() (data.MemoryFrame, error) {
-	mem := gosigar.Mem{}
-	swap := gosigar.Swap{}
-
-	err := mem.Get()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to read memory usage")
-	}
-
-	err = swap.Get()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to read swap")
-	}
-
-	columns := []string{"type", "total", "used", "free"}
-	rows := make([][]interface{}, 3)
-
-	rows[0] = []interface{}{"mem", mem.Total, mem.Used, mem.Free}
-	rows[1] = []interface{}{"buffers/cache", 0, mem.ActualUsed, mem.ActualFree}
-	rows[2] = []interface{}{"swap", swap.Total, swap.Used, swap.Free}
-	return data.NewMemoryFrame("memory_usage", columns, rows), nil
-
-}
-
-func getCPU() (data.MemoryFrame, error) {
-	cpu, err := ghw.CPU()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to list cpus")
-	}
-	columns := []string{"processor", "vendor", "model", "core", "numThreads", "logical", "capabilities"}
-	var rows [][]interface{}
-	for _, proc := range cpu.Processors {
-		for _, core := range proc.Cores {
-			rows = append(rows, []interface{}{proc.ID, proc.Vendor, proc.Model, core.ID, core.NumThreads, core.LogicalProcessors, strings.Join(proc.Capabilities, " ")})
-		}
-	}
-	return data.NewMemoryFrame("cpu", columns, rows), nil
-}
-
-// this gets cpu usage vs a listing of arch etc - see getCPU(). This needs successive values as its ticks - not currently used
-// see https://github.com/elastic/beats/blob/master/metricbeat/internal/metrics/cpu/metrics.go#L131 for inspiration
-//nolint
-func getCPUUsage() (data.MemoryFrame, error) {
-	cpuList := gosigar.CpuList{}
-	err := cpuList.Get()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to list cpus for usage")
-	}
-	columns := []string{"sys", "nice", "stolen", "irq", "idle", "softIrq", "user", "wait", "total"}
-	rows := make([][]interface{}, len(cpuList.List), len(cpuList.List))
-	for i, cpu := range cpuList.List {
-		rows[i] = []interface{}{cpu.Sys, cpu.Nice, cpu.Stolen, cpu.Irq, cpu.Idle, cpu.SoftIrq, cpu.User, cpu.Wait, cpu.Total()}
-	}
-	return data.NewMemoryFrame("cpu_usage", columns, rows), nil
-}
-
-func getProcessList() (data.MemoryFrame, error) {
-	pidList := gosigar.ProcList{}
-	err := pidList.Get()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to list processes")
-	}
-	columns := []string{"pid", "ppid", "stime", "time", "rss", "size", "faults", "minorFaults", "majorFaults", "user", "state", "priority", "nice", "command"}
-	rows := make([][]interface{}, len(pidList.List))
-	for i, pid := range pidList.List {
-		state := gosigar.ProcState{}
-		mem := gosigar.ProcMem{}
-		time := gosigar.ProcTime{}
-		args := gosigar.ProcArgs{}
-		if err := state.Get(pid); err != nil {
-			continue
-		}
-		if err := mem.Get(pid); err != nil {
-			continue
-		}
-		if err := time.Get(pid); err != nil {
-			continue
-		}
-		if err := args.Get(pid); err != nil {
-			continue
-		}
-		rows[i] = []interface{}{pid, state.Ppid, time.FormatStartTime(), time.FormatTotal(), mem.Resident, mem.Size,
-			mem.PageFaults, mem.MinorFaults, mem.MajorFaults, state.Username, state.State, state.Priority, state.Nice,
-			strings.Join(args.List, " ")}
-	}
-	return data.NewMemoryFrame("process_list", columns, rows), nil
-}
-
-func getHostDetails() (data.MemoryFrame, error) {
-	gi, err := goInfo.GetInfo()
-	if err != nil {
-		return data.MemoryFrame{}, errors.Wrapf(err, "unable to get host summary")
-	}
-	columns := []string{"hostname", "os", "goOs", "cpus", "core", "kernel", "platform"}
-	rows := [][]interface{}{
-		{gi.Hostname, gi.OS, gi.GoOS, gi.CPUs, gi.Core, gi.Kernel, gi.Platform},
-	}
-	return data.NewMemoryFrame("os", columns, rows), nil
-}
-
-func (sc *SystemCollector) Description() string {
-	return "Collects summary OS and hardware statistics for the host"
-}
-
-// here we register the collector for use
-func init() {
-	collectors.Register("system", func() (collectors.Collector, error) {
-		return &SystemCollector{
-			resourceManager: platform.GetResourceManager(),
-		}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/collectors/system/system_test.go b/programs/diagnostics/internal/collectors/system/system_test.go
deleted file mode 100644
index fb1e16bd1ed..00000000000
--- a/programs/diagnostics/internal/collectors/system/system_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package system_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestSystemConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned for system collector", func(t *testing.T) {
-		systemCollector := system.NewSystemCollector(&platform.ResourceManager{})
-		conf := systemCollector.Configuration()
-		require.Len(t, conf.Params, 0)
-		require.Equal(t, []config.ConfigParam{}, conf.Params)
-	})
-}
-
-func TestSystemCollect(t *testing.T) {
-	t.Run("test default system collection", func(t *testing.T) {
-		systemCollector := system.NewSystemCollector(&platform.ResourceManager{})
-		diagSet, err := systemCollector.Collect(config.Configuration{})
-		require.Nil(t, err)
-		require.NotNil(t, diagSet)
-		require.Len(t, diagSet.Errors.Errors, 0)
-		require.Len(t, diagSet.Frames, 7)
-		require.Contains(t, diagSet.Frames, "disks")
-		require.Contains(t, diagSet.Frames, "disk_usage")
-		require.Contains(t, diagSet.Frames, "memory")
-		require.Contains(t, diagSet.Frames, "memory_usage")
-		require.Contains(t, diagSet.Frames, "cpu")
-		require.Contains(t, diagSet.Frames, "processes")
-		require.Contains(t, diagSet.Frames, "os")
-		// responses here will vary depending on platform - mocking seems excessive so we test we have some data
-		// disks
-		require.Equal(t, []string{"name", "size", "physicalBlockSize", "driveType", "controller", "vendor", "model", "partitionName", "partitionSize", "mountPoint", "readOnly"}, diagSet.Frames["disks"].Columns())
-		diskFrames, err := countFrameRows(diagSet, "disks")
-		require.Greater(t, diskFrames, 0)
-		require.Nil(t, err)
-		// disk usage
-		require.Equal(t, []string{"filesystem", "size", "used", "avail", "use%", "mounted on"}, diagSet.Frames["disk_usage"].Columns())
-		diskUsageFrames, err := countFrameRows(diagSet, "disk_usage")
-		require.Greater(t, diskUsageFrames, 0)
-		require.Nil(t, err)
-		// memory
-		require.Equal(t, []string{"totalPhysical", "totalUsable", "supportedPageSizes"}, diagSet.Frames["memory"].Columns())
-		memoryFrames, err := countFrameRows(diagSet, "memory")
-		require.Greater(t, memoryFrames, 0)
-		require.Nil(t, err)
-		// memory_usage
-		require.Equal(t, []string{"type", "total", "used", "free"}, diagSet.Frames["memory_usage"].Columns())
-		memoryUsageFrames, err := countFrameRows(diagSet, "memory_usage")
-		require.Greater(t, memoryUsageFrames, 0)
-		require.Nil(t, err)
-		// cpu
-		require.Equal(t, []string{"processor", "vendor", "model", "core", "numThreads", "logical", "capabilities"}, diagSet.Frames["cpu"].Columns())
-		cpuFrames, err := countFrameRows(diagSet, "cpu")
-		require.Greater(t, cpuFrames, 0)
-		require.Nil(t, err)
-		// processes
-		require.Equal(t, []string{"pid", "ppid", "stime", "time", "rss", "size", "faults", "minorFaults", "majorFaults", "user", "state", "priority", "nice", "command"}, diagSet.Frames["processes"].Columns())
-		processesFrames, err := countFrameRows(diagSet, "processes")
-		require.Greater(t, processesFrames, 0)
-		require.Nil(t, err)
-		// os
-		require.Equal(t, []string{"hostname", "os", "goOs", "cpus", "core", "kernel", "platform"}, diagSet.Frames["os"].Columns())
-		osFrames, err := countFrameRows(diagSet, "os")
-		require.Greater(t, osFrames, 0)
-		require.Nil(t, err)
-	})
-}
-
-func countFrameRows(diagSet *data.DiagnosticBundle, frameName string) (int, error) {
-	frame := diagSet.Frames[frameName]
-	i := 0
-	for {
-		_, ok, err := frame.Next()
-		if !ok {
-			return i, err
-		}
-		if err != nil {
-			return i, err
-		}
-		i++
-	}
-}
diff --git a/programs/diagnostics/internal/outputs/file/simple.go b/programs/diagnostics/internal/outputs/file/simple.go
deleted file mode 100644
index 63847b3addd..00000000000
--- a/programs/diagnostics/internal/outputs/file/simple.go
+++ /dev/null
@@ -1,344 +0,0 @@
-package file
-
-import (
-	"context"
-	"encoding/csv"
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/mholt/archiver/v4"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-)
-
-const OutputName = "simple"
-
-type SubFolderGenerator func() string
-
-type SimpleOutput struct {
-	// mainly used for testing to make sub folder deterministic - which it won't be by default as it uses a timestamp
-	FolderGenerator SubFolderGenerator
-}
-
-func (o SimpleOutput) Write(id string, bundles map[string]*data.DiagnosticBundle, conf config.Configuration) (data.FrameErrors, error) {
-	conf, err := conf.ValidateConfig(o.Configuration())
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	directory, err := config.ReadStringValue(conf, "directory")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	directory, err = getWorkingDirectory(directory)
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	subFolder := strconv.FormatInt(utils.MakeTimestamp(), 10)
-	if o.FolderGenerator != nil {
-		subFolder = o.FolderGenerator()
-	}
-	skipArchive, err := config.ReadBoolValue(conf, "skip_archive")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-
-	outputDir := filepath.Join(directory, id, subFolder)
-	log.Info().Msgf("creating bundle in %s", outputDir)
-	if err := os.MkdirAll(outputDir, os.ModePerm); err != nil {
-		return data.FrameErrors{}, err
-	}
-	frameErrors := data.FrameErrors{}
-	var filePaths []string
-	for name := range bundles {
-		bundlePaths, frameError := writeDiagnosticBundle(name, bundles[name], outputDir)
-		filePaths = append(filePaths, bundlePaths...)
-		frameErrors.Errors = append(frameErrors.Errors, frameError.Errors...)
-	}
-	log.Info().Msg("bundle created")
-	if !skipArchive {
-		archiveFilename := filepath.Join(directory, id, fmt.Sprintf("%s.tar.gz", subFolder))
-		log.Info().Msgf("compressing bundle to %s", archiveFilename)
-		// produce a map containing the input paths to the archive paths - we preserve the output directory and hierarchy
-		archiveMap := createArchiveMap(filePaths, directory)
-		if err := createArchive(archiveFilename, archiveMap); err != nil {
-			return frameErrors, err
-		}
-		// we delete the original directory leaving just the archive behind
-		if err := os.RemoveAll(outputDir); err != nil {
-			return frameErrors, err
-		}
-		log.Info().Msgf("archive ready at: %s ", archiveFilename)
-	}
-	return frameErrors, nil
-}
-
-func writeDiagnosticBundle(name string, diag *data.DiagnosticBundle, baseDir string) ([]string, data.FrameErrors) {
-	diagDir := filepath.Join(baseDir, name)
-	if err := os.MkdirAll(diagDir, os.ModePerm); err != nil {
-		return nil, data.FrameErrors{Errors: []error{
-			errors.Wrapf(err, "unable to create directory for %s", name),
-		}}
-	}
-	frameErrors := data.FrameErrors{}
-	var filePaths []string
-	for frameId, frame := range diag.Frames {
-		fFilePath, errs := writeFrame(frameId, frame, diagDir)
-		filePaths = append(filePaths, fFilePath...)
-		if len(errs) > 0 {
-			// it would be nice if we could wrap this list of errors into something formal but this logs well
-			frameErrors.Errors = append(frameErrors.Errors, fmt.Errorf("unable to write frame %s for %s", frameId, name))
-			frameErrors.Errors = append(frameErrors.Errors, errs...)
-		}
-	}
-	return filePaths, frameErrors
-}
-
-func writeFrame(frameId string, frame data.Frame, baseDir string) ([]string, []error) {
-	switch f := frame.(type) {
-	case data.DatabaseFrame:
-		return writeDatabaseFrame(frameId, f, baseDir)
-	case data.ConfigFileFrame:
-		return writeConfigFrame(frameId, f, baseDir)
-	case data.DirectoryFileFrame:
-		return processDirectoryFileFrame(frameId, f, baseDir)
-	case data.FileFrame:
-		return processFileFrame(frameId, f, baseDir)
-	case data.HierarchicalFrame:
-		return writeHierarchicalFrame(frameId, f, baseDir)
-	default:
-		// for now our data frame writer supports all frames
-		return writeDatabaseFrame(frameId, frame, baseDir)
-	}
-}
-
-func writeHierarchicalFrame(frameId string, frame data.HierarchicalFrame, baseDir string) ([]string, []error) {
-	filePaths, errs := writeFrame(frameId, frame.DataFrame, baseDir)
-	for _, subFrame := range frame.SubFrames {
-		subDir := filepath.Join(baseDir, subFrame.Name())
-		if err := os.MkdirAll(subDir, os.ModePerm); err != nil {
-			errs = append(errs, err)
-			continue
-		}
-		subPaths, subErrs := writeFrame(subFrame.Name(), subFrame, subDir)
-		filePaths = append(filePaths, subPaths...)
-		errs = append(errs, subErrs...)
-	}
-	return filePaths, errs
-}
-
-func writeDatabaseFrame(frameId string, frame data.Frame, baseDir string) ([]string, []error) {
-	frameFilePath := filepath.Join(baseDir, fmt.Sprintf("%s.csv", frameId))
-	var errs []error
-	f, err := os.Create(frameFilePath)
-	if err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to create directory for frame %s", frameId))
-		return []string{}, errs
-	}
-	defer f.Close()
-	w := csv.NewWriter(f)
-	defer w.Flush()
-	if err := w.Write(frame.Columns()); err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to write columns for frame %s", frameId))
-		return []string{}, errs
-	}
-	// we don't collect an error for every line here like configs and logs - could mean a lot of unnecessary noise
-	for {
-		values, ok, err := frame.Next()
-		if err != nil {
-			errs = append(errs, errors.Wrapf(err, "unable to read frame %s", frameId))
-			return []string{}, errs
-		}
-		if !ok {
-			return []string{frameFilePath}, errs
-		}
-		sValues := make([]string, len(values))
-		for i, value := range values {
-			sValues[i] = fmt.Sprintf("%v", value)
-		}
-		if err := w.Write(sValues); err != nil {
-			errs = append(errs, errors.Wrapf(err, "unable to write row for frame %s", frameId))
-			return []string{}, errs
-		}
-	}
-}
-
-func writeConfigFrame(frameId string, frame data.ConfigFileFrame, baseDir string) ([]string, []error) {
-	var errs []error
-	frameDirectory := filepath.Join(baseDir, frameId)
-	if err := os.MkdirAll(frameDirectory, os.ModePerm); err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to create directory for frame %s", frameId))
-		return []string{}, errs
-	}
-	// this holds our files included
-	includesDirectory := filepath.Join(frameDirectory, "includes")
-	if err := os.MkdirAll(includesDirectory, os.ModePerm); err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to create includes directory for frame %s", frameId))
-		return []string{}, errs
-	}
-	for {
-		values, ok, err := frame.Next()
-		if err != nil {
-			errs = append(errs, err)
-			return []string{frameDirectory}, errs
-		}
-		if !ok {
-			return []string{frameDirectory}, errs
-		}
-		configFile := values[0].(data.ConfigFile)
-		if !configFile.IsIncluded() {
-			relPath := strings.TrimPrefix(configFile.FilePath(), frame.Directory)
-			destPath := path.Join(frameDirectory, relPath)
-			if err = configFile.Copy(destPath, true); err != nil {
-				errs = append(errs, errors.Wrapf(err, "Unable to copy file %s", configFile.FilePath()))
-			}
-		} else {
-			// include files could be anywhere - potentially multiple with the same name. We thus, recreate the directory
-			// hierarchy under includes to avoid collisions
-			destPath := path.Join(includesDirectory, configFile.FilePath())
-			if err = configFile.Copy(destPath, true); err != nil {
-				errs = append(errs, errors.Wrapf(err, "Unable to copy file %s", configFile.FilePath()))
-			}
-		}
-
-	}
-}
-
-func processDirectoryFileFrame(frameId string, frame data.DirectoryFileFrame, baseDir string) ([]string, []error) {
-	var errs []error
-	// each set of files goes under its own directory to preserve grouping
-	frameDirectory := filepath.Join(baseDir, frameId)
-	if err := os.MkdirAll(frameDirectory, os.ModePerm); err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to create directory for frame %s", frameId))
-		return []string{}, errs
-	}
-	for {
-		values, ok, err := frame.Next()
-		if err != nil {
-			errs = append(errs, err)
-			return []string{frameDirectory}, errs
-		}
-		if !ok {
-			return []string{frameDirectory}, errs
-		}
-		file := values[0].(data.SimpleFile)
-		relPath := strings.TrimPrefix(file.FilePath(), frame.Directory)
-		destPath := path.Join(frameDirectory, relPath)
-
-		if err = file.Copy(destPath, true); err != nil {
-			errs = append(errs, errors.Wrapf(err, "unable to copy file %s for frame %s", file, frameId))
-		}
-	}
-}
-
-func processFileFrame(frameId string, frame data.FileFrame, baseDir string) ([]string, []error) {
-	var errs []error
-	frameDirectory := filepath.Join(baseDir, frameId)
-	if err := os.MkdirAll(frameDirectory, os.ModePerm); err != nil {
-		errs = append(errs, errors.Wrapf(err, "unable to create directory for frame %s", frameId))
-		return []string{}, errs
-	}
-	for {
-		values, ok, err := frame.Next()
-		if err != nil {
-			errs = append(errs, err)
-		}
-		if !ok {
-			return []string{frameDirectory}, errs
-		}
-		file := values[0].(data.SimpleFile)
-		// we need an absolute path to preserve the directory hierarchy
-		dir, err := filepath.Abs(filepath.Dir(file.FilePath()))
-		if err != nil {
-			errs = append(errs, errors.Wrapf(err, "unable to determine dir for %s", file.FilePath()))
-		}
-		outputDir := filepath.Join(frameDirectory, dir)
-		if _, err := os.Stat(outputDir); os.IsNotExist(err) {
-			if err := os.MkdirAll(outputDir, os.ModePerm); err != nil {
-				errs = append(errs, errors.Wrapf(err, "unable to create directory for %s", file.FilePath()))
-			} else {
-				outputPath := filepath.Join(outputDir, filepath.Base(file.FilePath()))
-				err = file.Copy(outputPath, false)
-				if err != nil {
-					errs = append(errs, errors.Wrapf(err, "unable to copy file %s", file.FilePath()))
-				}
-			}
-		}
-	}
-}
-
-func getWorkingDirectory(path string) (string, error) {
-	if !filepath.IsAbs(path) {
-		workingPath, err := os.Getwd()
-		if err != nil {
-			return "", err
-		}
-		return filepath.Join(workingPath, path), nil
-	}
-	return path, nil
-}
-
-func createArchiveMap(filePaths []string, prefix string) map[string]string {
-	archiveMap := make(map[string]string)
-	for _, path := range filePaths {
-		archiveMap[path] = strings.TrimPrefix(path, prefix)
-	}
-	return archiveMap
-}
-
-func createArchive(outputFile string, filePaths map[string]string) error {
-	files, err := archiver.FilesFromDisk(nil, filePaths)
-	if err != nil {
-		return err
-	}
-	out, err := os.Create(outputFile)
-	if err != nil {
-		return err
-	}
-	defer out.Close()
-	format := archiver.CompressedArchive{
-		Compression: archiver.Gz{},
-		Archival:    archiver.Tar{},
-	}
-	err = format.Archive(context.Background(), out, files)
-	return err
-}
-
-func (o SimpleOutput) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value: "./",
-				Param: config.NewParam("directory", "Directory in which to create dump. Defaults to the current directory.", false),
-			},
-			config.StringOptions{
-				Value: "csv",
-				// TODO: add tsv and others here later
-				Options: []string{"csv"},
-				Param:   config.NewParam("format", "Format of exported files", false),
-			},
-			config.BoolParam{
-				Value: false,
-				Param: config.NewParam("skip_archive", "Don't compress output to an archive", false),
-			},
-		},
-	}
-}
-
-func (o SimpleOutput) Description() string {
-	return "Writes out the diagnostic bundle as files in a structured directory, optionally producing a compressed archive."
-}
-
-// here we register the output for use
-func init() {
-	outputs.Register(OutputName, func() (outputs.Output, error) {
-		return SimpleOutput{}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/outputs/file/simple_test.go b/programs/diagnostics/internal/outputs/file/simple_test.go
deleted file mode 100644
index 471a1c70cc1..00000000000
--- a/programs/diagnostics/internal/outputs/file/simple_test.go
+++ /dev/null
@@ -1,468 +0,0 @@
-package file_test
-
-import (
-	"bufio"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/file"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-)
-
-var clusterFrame = test.NewFakeDataFrame("clusters", []string{"cluster", "shard_num", "shard_weight", "replica_num", "host_name", "host_address", "port", "is_local", "user", "default_database", "errors_count", "slowdowns_count", "estimated_recovery_time"},
-	[][]interface{}{
-		{"events", 1, 1, 1, "dalem-local-clickhouse-blue-1", "192.168.144.2", 9000, 1, "default", "", 0, 0, 0},
-		{"events", 2, 1, 1, "dalem-local-clickhouse-blue-2", "192.168.144.4", 9001, 1, "default", "", 0, 0, 0},
-		{"events", 3, 1, 1, "dalem-local-clickhouse-blue-3", "192.168.144.3", 9002, 1, "default", "", 0, 0, 0},
-	},
-)
-
-var diskFrame = test.NewFakeDataFrame("disks", []string{"name", "path", "free_space", "total_space", "keep_free_space", "type"},
-	[][]interface{}{
-		{"default", "/var/lib/clickhouse", 1729659346944, 1938213220352, "", "local"},
-	},
-)
-
-var userFrame = test.NewFakeDataFrame("users", []string{"name", "id", "storage", "auth_type", "auth_params", "host_ip", "host_names", "host_names_regexp", "host_names_like"},
-	[][]interface{}{
-		{"default", "94309d50-4f52-5250-31bd-74fecac179db,users.xml,plaintext_password", "sha256_password", []string{"::0"}, []string{}, []string{}, []string{}},
-	},
-)
-
-func TestConfiguration(t *testing.T) {
-	t.Run("correct configuration is returned", func(t *testing.T) {
-		output := file.SimpleOutput{}
-		conf := output.Configuration()
-		require.Len(t, conf.Params, 3)
-		// check first directory param
-		require.IsType(t, config.StringParam{}, conf.Params[0])
-		directory, ok := conf.Params[0].(config.StringParam)
-		require.True(t, ok)
-		require.False(t, directory.Required())
-		require.Equal(t, "directory", directory.Name())
-		require.Equal(t, "./", directory.Value)
-		// check second format param
-		require.IsType(t, config.StringOptions{}, conf.Params[1])
-		format, ok := conf.Params[1].(config.StringOptions)
-		require.True(t, ok)
-		require.False(t, format.Required())
-		require.Equal(t, "format", format.Name())
-		require.Equal(t, "csv", format.Value)
-		require.Equal(t, []string{"csv"}, format.Options)
-		// check third format compress
-		require.IsType(t, config.BoolParam{}, conf.Params[2])
-		skipArchive, ok := conf.Params[2].(config.BoolParam)
-		require.True(t, ok)
-		require.False(t, format.Required())
-		require.False(t, skipArchive.Value)
-	})
-}
-
-func TestWrite(t *testing.T) {
-	bundles := map[string]*data.DiagnosticBundle{
-		"systemA": {
-			Frames: map[string]data.Frame{
-				"disk":    diskFrame,
-				"cluster": clusterFrame,
-			},
-		},
-		"systemB": {
-			Frames: map[string]data.Frame{
-				"user": userFrame,
-			},
-		},
-	}
-	t.Run("test we can write simple diagnostic sets", func(t *testing.T) {
-		tempDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: tempDir,
-				},
-				// turn compression off as the folder will be deleted by default
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", bundles, configuration)
-		require.Nil(t, err)
-		require.Equal(t, data.FrameErrors{}, frameErrors)
-		clusterFile := path.Join(tempDir, "test", "test", "systemA", "cluster.csv")
-		diskFile := path.Join(tempDir, "test", "test", "systemA", "disk.csv")
-		userFile := path.Join(tempDir, "test", "test", "systemB", "user.csv")
-		require.FileExists(t, clusterFile)
-		require.FileExists(t, diskFile)
-		require.FileExists(t, userFile)
-		diskLines, err := readFileLines(diskFile)
-		require.Nil(t, err)
-		require.Len(t, diskLines, 2)
-		usersLines, err := readFileLines(userFile)
-		require.Nil(t, err)
-		require.Len(t, usersLines, 2)
-		clusterLines, err := readFileLines(clusterFile)
-		require.Nil(t, err)
-		require.Len(t, clusterLines, 4)
-		require.Equal(t, strings.Join(clusterFrame.ColumnNames, ","), clusterLines[0])
-		require.Equal(t, "events,1,1,1,dalem-local-clickhouse-blue-1,192.168.144.2,9000,1,default,,0,0,0", clusterLines[1])
-		require.Equal(t, "events,2,1,1,dalem-local-clickhouse-blue-2,192.168.144.4,9001,1,default,,0,0,0", clusterLines[2])
-		require.Equal(t, "events,3,1,1,dalem-local-clickhouse-blue-3,192.168.144.3,9002,1,default,,0,0,0", clusterLines[3])
-		resetFrames()
-	})
-
-	t.Run("test invalid parameter", func(t *testing.T) {
-		tempDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: tempDir,
-				},
-				config.StringOptions{
-					Value:   "random",
-					Options: []string{"csv"},
-					// TODO: add tsv and others here later
-					Param: config.NewParam("format", "Format of exported files", false),
-				},
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip compressed archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", bundles, configuration)
-		require.Equal(t, data.FrameErrors{}, frameErrors)
-		require.NotNil(t, err)
-		require.Equal(t, "parameter format is invalid - random is not a valid value for format - [csv]", err.Error())
-		resetFrames()
-	})
-
-	t.Run("test compression", func(t *testing.T) {
-		tempDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: tempDir,
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", bundles, configuration)
-		require.Nil(t, err)
-		require.Equal(t, data.FrameErrors{}, frameErrors)
-		archiveFileName := path.Join(tempDir, "test", "test.tar.gz")
-		fi, err := os.Stat(archiveFileName)
-		require.Nil(t, err)
-		require.FileExists(t, archiveFileName)
-		// compression will vary so lets test range
-		require.Greater(t, int64(600), fi.Size())
-		require.Less(t, int64(200), fi.Size())
-		outputFolder := path.Join(tempDir, "test", "test")
-		// check the folder doesn't exist and is cleaned up
-		require.NoFileExists(t, outputFolder)
-		resetFrames()
-	})
-
-	t.Run("test support for directory frames", func(t *testing.T) {
-		// create 5 temporary files
-		tempDir := t.TempDir()
-		files := createRandomFiles(tempDir, 5)
-		dirFrame, errs := data.NewFileDirectoryFrame(tempDir, []string{"*.log"})
-		require.Empty(t, errs)
-		fileBundles := map[string]*data.DiagnosticBundle{
-			"systemA": {
-				Frames: map[string]data.Frame{
-					"disk":    diskFrame,
-					"cluster": clusterFrame,
-				},
-			},
-			"config": {
-				Frames: map[string]data.Frame{
-					"logs": dirFrame,
-				},
-			},
-		}
-		destDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: destDir,
-				},
-				// turn compression off as the folder will be deleted by default
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", fileBundles, configuration)
-		require.Nil(t, err)
-		require.NotNil(t, frameErrors)
-
-		// test the usual frames still work
-		clusterFile := path.Join(destDir, "test", "test", "systemA", "cluster.csv")
-		diskFile := path.Join(destDir, "test", "test", "systemA", "disk.csv")
-		require.FileExists(t, clusterFile)
-		require.FileExists(t, diskFile)
-		diskLines, err := readFileLines(diskFile)
-		require.Nil(t, err)
-		require.Len(t, diskLines, 2)
-		clusterLines, err := readFileLines(clusterFile)
-		require.Nil(t, err)
-		require.Len(t, clusterLines, 4)
-		require.Equal(t, strings.Join(clusterFrame.ColumnNames, ","), clusterLines[0])
-		require.Equal(t, "events,1,1,1,dalem-local-clickhouse-blue-1,192.168.144.2,9000,1,default,,0,0,0", clusterLines[1])
-		require.Equal(t, "events,2,1,1,dalem-local-clickhouse-blue-2,192.168.144.4,9001,1,default,,0,0,0", clusterLines[2])
-		require.Equal(t, "events,3,1,1,dalem-local-clickhouse-blue-3,192.168.144.3,9002,1,default,,0,0,0", clusterLines[3])
-		//test our directory frame
-		for _, filepath := range files {
-			// check they were copied
-			subPath := strings.TrimPrefix(filepath, tempDir)
-			// path here will be <destDir>/<id>/test>/config/logs/<sub path>
-			newPath := path.Join(destDir, "test", "test", "config", "logs", subPath)
-			require.FileExists(t, newPath)
-		}
-		resetFrames()
-	})
-
-	t.Run("test support for config frames", func(t *testing.T) {
-		xmlConfig := data.XmlConfig{
-			XMLName: xml.Name{},
-			Clickhouse: data.XmlLoggerConfig{
-				XMLName:  xml.Name{},
-				ErrorLog: "/var/log/clickhouse-server/clickhouse-server.err.log",
-				Log:      "/var/log/clickhouse-server/clickhouse-server.log",
-			},
-			IncludeFrom: "",
-		}
-		tempDir := t.TempDir()
-		confDir := path.Join(tempDir, "conf")
-		// create an includes file
-		includesDir := path.Join(tempDir, "includes")
-		err := os.MkdirAll(includesDir, os.ModePerm)
-		require.Nil(t, err)
-		includesPath := path.Join(includesDir, "random.xml")
-		includesFile, err := os.Create(includesPath)
-		require.Nil(t, err)
-		xmlWriter := io.Writer(includesFile)
-		enc := xml.NewEncoder(xmlWriter)
-		enc.Indent("  ", "    ")
-		err = enc.Encode(xmlConfig)
-		require.Nil(t, err)
-		// create 5 temporary config files
-		files := make([]string, 5)
-		// set the includes
-		xmlConfig.IncludeFrom = includesPath
-		for i := 0; i < 5; i++ {
-			// we want to check hierarchies are preserved so create a simple folder for each file
-			fileDir := path.Join(confDir, fmt.Sprintf("%d", i))
-			err := os.MkdirAll(fileDir, os.ModePerm)
-			require.Nil(t, err)
-			filepath := path.Join(fileDir, fmt.Sprintf("random-%d.xml", i))
-			files[i] = filepath
-			xmlFile, err := os.Create(filepath)
-			require.Nil(t, err)
-			// write a little xml so its valid
-			xmlWriter := io.Writer(xmlFile)
-			enc := xml.NewEncoder(xmlWriter)
-			enc.Indent("  ", "    ")
-			err = enc.Encode(xmlConfig)
-			require.Nil(t, err)
-		}
-		configFrame, errs := data.NewConfigFileFrame(confDir)
-		require.Empty(t, errs)
-		fileBundles := map[string]*data.DiagnosticBundle{
-			"systemA": {
-				Frames: map[string]data.Frame{
-					"disk":    diskFrame,
-					"cluster": clusterFrame,
-				},
-			},
-			"config": {
-				Frames: map[string]data.Frame{
-					"user_specified": configFrame,
-				},
-			},
-		}
-		destDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: destDir,
-				},
-				// turn compression off as the folder will be deleted by default
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", fileBundles, configuration)
-		require.Nil(t, err)
-		require.NotNil(t, frameErrors)
-		require.Empty(t, frameErrors.Errors)
-		//test our config frame
-		for _, filepath := range files {
-			// check they were copied
-			subPath := strings.TrimPrefix(filepath, confDir)
-			// path here will be <destDir>/<id>/test>/config/user_specified/file
-			newPath := path.Join(destDir, "test", "test", "config", "user_specified", subPath)
-			require.FileExists(t, newPath)
-		}
-		// check our includes file exits
-		// path here will be <destDir>/<id>/test>/config/user_specified/file/includes
-		require.FileExists(t, path.Join(destDir, "test", "test", "config", "user_specified", "includes", includesPath))
-		resetFrames()
-	})
-
-	t.Run("test support for file frames", func(t *testing.T) {
-		// create 5 temporary files
-		tempDir := t.TempDir()
-		files := createRandomFiles(tempDir, 5)
-		fileFrame := data.NewFileFrame("collection", files)
-		fileBundles := map[string]*data.DiagnosticBundle{
-			"systemA": {
-				Frames: map[string]data.Frame{
-					"disk":    diskFrame,
-					"cluster": clusterFrame,
-				},
-			},
-			"file": {
-				Frames: map[string]data.Frame{
-					"collection": fileFrame,
-				},
-			},
-		}
-		destDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: destDir,
-				},
-				// turn compression off as the folder will be deleted by default
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		frameErrors, err := output.Write("test", fileBundles, configuration)
-		require.Nil(t, err)
-		require.NotNil(t, frameErrors)
-		//test our directory frame
-		for _, filepath := range files {
-			// path here will be <destDir>/<id>/test>/file/collection/<sub path>
-			newPath := path.Join(destDir, "test", "test", "file", "collection", filepath)
-			require.FileExists(t, newPath)
-		}
-		resetFrames()
-	})
-
-	t.Run("test support for hierarchical frames", func(t *testing.T) {
-		bottomFrame := data.NewHierarchicalFrame("bottomLevel", userFrame, []data.HierarchicalFrame{})
-		middleFrame := data.NewHierarchicalFrame("middleLevel", diskFrame, []data.HierarchicalFrame{bottomFrame})
-		topFrame := data.NewHierarchicalFrame("topLevel", clusterFrame, []data.HierarchicalFrame{middleFrame})
-		tempDir := t.TempDir()
-		configuration := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Param: config.NewParam("directory", "A directory", true),
-					Value: tempDir,
-				},
-				// turn compression off as the folder will be deleted by default
-				config.BoolParam{
-					Value: true,
-					Param: config.NewParam("skip_archive", "Skip archive", false),
-				},
-			},
-		}
-		output := file.SimpleOutput{FolderGenerator: staticFolderName}
-		hierarchicalBundle := map[string]*data.DiagnosticBundle{
-			"systemA": {
-				Frames: map[string]data.Frame{
-					"topLevel": topFrame,
-				},
-			},
-		}
-		frameErrors, err := output.Write("test", hierarchicalBundle, configuration)
-		require.Nil(t, err)
-		require.Equal(t, data.FrameErrors{}, frameErrors)
-		topFile := path.Join(tempDir, "test", "test", "systemA", "topLevel.csv")
-		middleFile := path.Join(tempDir, "test", "test", "systemA", "middleLevel", "middleLevel.csv")
-		bottomFile := path.Join(tempDir, "test", "test", "systemA", "middleLevel", "bottomLevel", "bottomLevel.csv")
-		require.FileExists(t, topFile)
-		require.FileExists(t, middleFile)
-		require.FileExists(t, bottomFile)
-		topLines, err := readFileLines(topFile)
-		require.Nil(t, err)
-		require.Len(t, topLines, 4)
-		middleLines, err := readFileLines(middleFile)
-		require.Nil(t, err)
-		require.Len(t, middleLines, 2)
-		bottomLines, err := readFileLines(bottomFile)
-		require.Nil(t, err)
-		require.Len(t, bottomLines, 2)
-		require.Equal(t, strings.Join(clusterFrame.ColumnNames, ","), topLines[0])
-		require.Equal(t, "events,1,1,1,dalem-local-clickhouse-blue-1,192.168.144.2,9000,1,default,,0,0,0", topLines[1])
-		require.Equal(t, "events,2,1,1,dalem-local-clickhouse-blue-2,192.168.144.4,9001,1,default,,0,0,0", topLines[2])
-		require.Equal(t, "events,3,1,1,dalem-local-clickhouse-blue-3,192.168.144.3,9002,1,default,,0,0,0", topLines[3])
-		resetFrames()
-	})
-}
-
-func createRandomFiles(tempDir string, num int) []string {
-	files := make([]string, num)
-	for i := 0; i < 5; i++ {
-		// we want to check hierarchies are preserved so create a simple folder for each file
-		fileDir := path.Join(tempDir, fmt.Sprintf("%d", i))
-		os.MkdirAll(fileDir, os.ModePerm) //nolint:errcheck
-		filepath := path.Join(fileDir, fmt.Sprintf("random-%d.log", i))
-		files[i] = filepath
-		os.Create(filepath) //nolint:errcheck
-	}
-	return files
-}
-
-func resetFrames() {
-	clusterFrame.Reset()
-	userFrame.Reset()
-	diskFrame.Reset()
-}
-
-func readFileLines(filename string) ([]string, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-
-	var lines []string
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		lines = append(lines, scanner.Text())
-	}
-	return lines, scanner.Err()
-}
-
-func staticFolderName() string {
-	return "test"
-}
diff --git a/programs/diagnostics/internal/outputs/registry.go b/programs/diagnostics/internal/outputs/registry.go
deleted file mode 100644
index 0187cd9105d..00000000000
--- a/programs/diagnostics/internal/outputs/registry.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package outputs
-
-import (
-	"fmt"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-)
-
-type Output interface {
-	Write(id string, bundles map[string]*data.DiagnosticBundle, config config.Configuration) (data.FrameErrors, error)
-	Configuration() config.Configuration
-	Description() string
-	// TODO: we will need to implement this for the convert function
-	//Read(config config.Configuration) (data.DiagnosticBundle, error)
-}
-
-// Register can be called from init() on an output in this package
-// It will automatically be added to the Outputs map to be called externally
-func Register(name string, output OutputFactory) {
-	// names must be unique
-	if _, ok := Outputs[name]; ok {
-		log.Error().Msgf("More than 1 output is trying to register under the name %s. Names must be unique.", name)
-	}
-	Outputs[name] = output
-}
-
-// OutputFactory lets us use a closure to get instances of the output struct
-type OutputFactory func() (Output, error)
-
-var Outputs = map[string]OutputFactory{}
-
-func GetOutputNames() []string {
-	outputs := make([]string, len(Outputs))
-	i := 0
-	for k := range Outputs {
-		outputs[i] = k
-		i++
-	}
-	return outputs
-}
-
-func GetOutputByName(name string) (Output, error) {
-	if outputFactory, ok := Outputs[name]; ok {
-		//do something here
-		output, err := outputFactory()
-		if err != nil {
-			return nil, errors.Wrapf(err, "output %s could not be initialized", name)
-		}
-		return output, nil
-	}
-	return nil, fmt.Errorf("%s is not a valid output name", name)
-}
-
-func BuildConfigurationOptions() (map[string]config.Configuration, error) {
-	configurations := make(map[string]config.Configuration)
-	for name, collectorFactory := range Outputs {
-		output, err := collectorFactory()
-		if err != nil {
-			return nil, errors.Wrapf(err, "output %s could not be initialized", name)
-		}
-		configurations[name] = output.Configuration()
-	}
-	return configurations, nil
-}
diff --git a/programs/diagnostics/internal/outputs/registry_test.go b/programs/diagnostics/internal/outputs/registry_test.go
deleted file mode 100644
index ba8408e5a59..00000000000
--- a/programs/diagnostics/internal/outputs/registry_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package outputs_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/file"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/terminal"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetOutputNames(t *testing.T) {
-	t.Run("can get all output names", func(t *testing.T) {
-		outputNames := outputs.GetOutputNames()
-		require.ElementsMatch(t, []string{"simple", "report"}, outputNames)
-	})
-
-}
-
-func TestGetOutputByName(t *testing.T) {
-
-	t.Run("can get output by name", func(t *testing.T) {
-		output, err := outputs.GetOutputByName("simple")
-		require.Nil(t, err)
-		require.Equal(t, file.SimpleOutput{}, output)
-	})
-
-	t.Run("fails on non existing output", func(t *testing.T) {
-		output, err := outputs.GetOutputByName("random")
-		require.NotNil(t, err)
-		require.Equal(t, "random is not a valid output name", err.Error())
-		require.Nil(t, output)
-	})
-}
-
-func TestBuildConfigurationOptions(t *testing.T) {
-
-	t.Run("can get all output configurations", func(t *testing.T) {
-		outputs, err := outputs.BuildConfigurationOptions()
-		require.Nil(t, err)
-		require.Len(t, outputs, 2)
-		require.Contains(t, outputs, "simple")
-		require.Contains(t, outputs, "report")
-	})
-}
diff --git a/programs/diagnostics/internal/outputs/terminal/report.go b/programs/diagnostics/internal/outputs/terminal/report.go
deleted file mode 100644
index 8337f542457..00000000000
--- a/programs/diagnostics/internal/outputs/terminal/report.go
+++ /dev/null
@@ -1,284 +0,0 @@
-package terminal
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/olekukonko/tablewriter"
-	"github.com/pkg/errors"
-)
-
-const OutputName = "report"
-
-type ReportOutput struct {
-}
-
-func (r ReportOutput) Write(id string, bundles map[string]*data.DiagnosticBundle, conf config.Configuration) (data.FrameErrors, error) {
-	conf, err := conf.ValidateConfig(r.Configuration())
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	format, err := config.ReadStringOptionsValue(conf, "format")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	nonInteractive, err := config.ReadBoolValue(conf, "continue")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	maxRows, err := config.ReadIntValue(conf, "row_limit")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	maxColumns, err := config.ReadIntValue(conf, "column_limit")
-	if err != nil {
-		return data.FrameErrors{}, err
-	}
-	frameErrors := data.FrameErrors{}
-	for name := range bundles {
-		frameError := printDiagnosticBundle(name, bundles[name], format, !nonInteractive, int(maxRows), int(maxColumns))
-		frameErrors.Errors = append(frameErrors.Errors, frameError.Errors...)
-	}
-	return data.FrameErrors{}, nil
-}
-
-func printDiagnosticBundle(name string, diag *data.DiagnosticBundle, format string, interactive bool, maxRows, maxColumns int) data.FrameErrors {
-	frameErrors := data.FrameErrors{}
-	for frameId, frame := range diag.Frames {
-		printFrameHeader(fmt.Sprintf("%s.%s", name, frameId))
-		err := printFrame(frame, format, maxRows, maxColumns)
-		if err != nil {
-			frameErrors.Errors = append(frameErrors.Errors, err)
-		}
-		if interactive {
-			err := waitForEnter()
-			if err != nil {
-				frameErrors.Errors = append(frameErrors.Errors, err)
-			}
-		}
-	}
-	return frameErrors
-}
-
-func waitForEnter() error {
-	fmt.Println("Press the Enter Key to view the next frame report")
-	for {
-		consoleReader := bufio.NewReaderSize(os.Stdin, 1)
-		input, err := consoleReader.ReadByte()
-		if err != nil {
-			return errors.New("Unable to read user input")
-		}
-		if input == 3 {
-			//ctl +c
-			fmt.Println("Exiting...")
-			os.Exit(0)
-		}
-		if input == 10 {
-			return nil
-		}
-	}
-}
-
-func printFrame(frame data.Frame, format string, maxRows, maxColumns int) error {
-	switch f := frame.(type) {
-	case data.DatabaseFrame:
-		return printDatabaseFrame(f, format, maxRows, maxColumns)
-	case data.ConfigFileFrame:
-		return printConfigFrame(f, format)
-	case data.DirectoryFileFrame:
-		return printDirectoryFileFrame(f, format, maxRows)
-	case data.HierarchicalFrame:
-		return printHierarchicalFrame(f, format, maxRows, maxColumns)
-	default:
-		// for now our data frame writer supports all frames
-		return printDatabaseFrame(f, format, maxRows, maxColumns)
-	}
-}
-
-func createTable(format string) *tablewriter.Table {
-	table := tablewriter.NewWriter(os.Stdout)
-	if format == "markdown" {
-		table.SetBorders(tablewriter.Border{Left: true, Top: false, Right: true, Bottom: false})
-		table.SetCenterSeparator("|")
-	}
-	return table
-}
-
-func printFrameHeader(title string) {
-	titleTable := tablewriter.NewWriter(os.Stdout)
-	titleTable.SetHeader([]string{title})
-	titleTable.SetAutoWrapText(false)
-	titleTable.SetAutoFormatHeaders(true)
-	titleTable.SetHeaderAlignment(tablewriter.ALIGN_CENTER)
-	titleTable.SetRowSeparator("\n")
-	titleTable.SetHeaderLine(false)
-	titleTable.SetBorder(false)
-	titleTable.SetTablePadding("\t") // pad with tabs
-	titleTable.SetNoWhiteSpace(true)
-	titleTable.Render()
-}
-
-func printHierarchicalFrame(frame data.HierarchicalFrame, format string, maxRows, maxColumns int) error {
-	err := printDatabaseFrame(frame, format, maxRows, maxColumns)
-	if err != nil {
-		return err
-	}
-	for _, subFrame := range frame.SubFrames {
-		err = printHierarchicalFrame(subFrame, format, maxRows, maxColumns)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func printDatabaseFrame(frame data.Frame, format string, maxRows, maxColumns int) error {
-	table := createTable(format)
-	table.SetAutoWrapText(false)
-	columns := len(frame.Columns())
-	if maxColumns > 0 && maxColumns < columns {
-		columns = maxColumns
-	}
-	table.SetHeader(frame.Columns()[:columns])
-	r := 0
-	trunColumns := 0
-	for {
-		values, ok, err := frame.Next()
-		if !ok || r == maxRows {
-			table.Render()
-			if trunColumns > 0 {
-				warning(fmt.Sprintf("Truncated %d columns, more available...", trunColumns))
-			}
-			if r == maxRows {
-				warning("Truncated rows, more available...")
-			}
-			return err
-		}
-		if err != nil {
-			return err
-		}
-		columns := len(values)
-		// -1 means unlimited
-		if maxColumns > 0 && maxColumns < columns {
-			trunColumns = columns - maxColumns
-			columns = maxColumns
-		}
-		row := make([]string, columns)
-		for i, value := range values {
-			if i == columns {
-				break
-			}
-			row[i] = fmt.Sprintf("%v", value)
-		}
-		table.Append(row)
-		r++
-	}
-}
-
-// currently we dump the whole config - useless in parts
-func printConfigFrame(frame data.Frame, format string) error {
-	for {
-		values, ok, err := frame.Next()
-		if !ok {
-			return err
-		}
-		if err != nil {
-			return err
-		}
-		configFile := values[0].(data.File)
-		dat, err := os.ReadFile(configFile.FilePath())
-		if err != nil {
-			return err
-		}
-		// create a table per row - as each will be a file
-		table := createTable(format)
-		table.SetAutoWrapText(false)
-		table.SetAutoFormatHeaders(false)
-		table.ClearRows()
-		table.SetHeader([]string{configFile.FilePath()})
-		table.Append([]string{string(dat)})
-		table.Render()
-	}
-}
-
-func printDirectoryFileFrame(frame data.Frame, format string, maxRows int) error {
-	for {
-		values, ok, err := frame.Next()
-		if !ok {
-
-			return err
-		}
-		if err != nil {
-			return err
-		}
-		path := values[0].(data.SimpleFile)
-		file, err := os.Open(path.FilePath())
-		if err != nil {
-			// failure on one file causes rest to be ignored in frame...we could improve this
-			return errors.Wrapf(err, "Unable to read file %s", path.FilePath())
-		}
-		scanner := bufio.NewScanner(file)
-		i := 0
-		// create a table per row - as each will be a file
-		table := createTable(format)
-		table.SetAutoWrapText(false)
-		table.SetAutoFormatHeaders(false)
-		table.ClearRows()
-		table.SetHeader([]string{path.FilePath()})
-		for scanner.Scan() {
-			if i == maxRows {
-				fmt.Println()
-				table.Render()
-				warning("Truncated lines, more available...")
-				fmt.Print("\n")
-				break
-			}
-			table.Append([]string{scanner.Text()})
-			i++
-		}
-	}
-}
-
-// prints a warning
-func warning(s string) {
-	fmt.Printf("\x1b[%dm%v\x1b[0m%s\n", 33, "WARNING: ", s)
-}
-
-func (r ReportOutput) Configuration() config.Configuration {
-	return config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringOptions{
-				Value:   "default",
-				Options: []string{"default", "markdown"},
-				Param:   config.NewParam("format", "Format of tables. Default is terminal friendly.", false),
-			},
-			config.BoolParam{
-				Value: false,
-				Param: config.NewParam("continue", "Print report with no interaction", false),
-			},
-			config.IntParam{
-				Value: 10,
-				Param: config.NewParam("row_limit", "Max Rows to print per frame.", false),
-			},
-			config.IntParam{
-				Value: 8,
-				Param: config.NewParam("column_limit", "Max Columns to print per frame. Negative is unlimited.", false),
-			},
-		},
-	}
-}
-
-func (r ReportOutput) Description() string {
-	return "Writes out the diagnostic bundle to the terminal as a simple report."
-}
-
-// here we register the output for use
-func init() {
-	outputs.Register(OutputName, func() (outputs.Output, error) {
-		return ReportOutput{}, nil
-	})
-}
diff --git a/programs/diagnostics/internal/platform/config/models.go b/programs/diagnostics/internal/platform/config/models.go
deleted file mode 100644
index 6c76b8f149b..00000000000
--- a/programs/diagnostics/internal/platform/config/models.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-)
-
-type ConfigParam interface {
-	Name() string
-	Required() bool
-	Description() string
-	validate(defaultConfig ConfigParam) error
-}
-
-type Configuration struct {
-	Params []ConfigParam
-}
-
-type Param struct {
-	name        string
-	description string
-	required    bool
-}
-
-func NewParam(name string, description string, required bool) Param {
-	return Param{
-		name:        name,
-		description: description,
-		required:    required,
-	}
-}
-
-func (bp Param) Name() string {
-	return bp.name
-}
-
-func (bp Param) Required() bool {
-	return bp.required
-}
-
-func (bp Param) Description() string {
-	return bp.description
-}
-
-func (bp Param) validate(defaultConfig ConfigParam) error {
-	return nil
-}
-
-func (c Configuration) GetConfigParam(paramName string) (ConfigParam, error) {
-	for _, param := range c.Params {
-		if param.Name() == paramName {
-			return param, nil
-		}
-	}
-	return nil, fmt.Errorf("%s does not exist", paramName)
-}
-
-// ValidateConfig finds the intersection of a config c and a default config. Requires all possible params to be in default.
-func (c Configuration) ValidateConfig(defaultConfig Configuration) (Configuration, error) {
-	var finalParams []ConfigParam
-	for _, defaultParam := range defaultConfig.Params {
-		setParam, err := c.GetConfigParam(defaultParam.Name())
-		if err == nil {
-			// check the set value is valid
-			if err := setParam.validate(defaultParam); err != nil {
-				return Configuration{}, fmt.Errorf("parameter %s is invalid - %s", defaultParam.Name(), err.Error())
-			}
-			finalParams = append(finalParams, setParam)
-		} else if defaultParam.Required() {
-			return Configuration{}, fmt.Errorf("missing required parameter %s - %s", defaultParam.Name(), err.Error())
-		} else {
-			finalParams = append(finalParams, defaultParam)
-		}
-	}
-	return Configuration{
-		Params: finalParams,
-	}, nil
-}
-
-type StringParam struct {
-	Param
-	Value      string
-	AllowEmpty bool
-}
-
-func (sp StringParam) validate(defaultConfig ConfigParam) error {
-	dsp := defaultConfig.(StringParam)
-	if !dsp.AllowEmpty && strings.TrimSpace(sp.Value) == "" {
-		return fmt.Errorf("%s cannot be empty", sp.Name())
-	}
-	// if the parameter is not required it doesn't matter
-	return nil
-}
-
-type StringListParam struct {
-	Param
-	Values []string
-}
-
-type StringOptions struct {
-	Param
-	Options    []string
-	Value      string
-	AllowEmpty bool
-}
-
-func (so StringOptions) validate(defaultConfig ConfigParam) error {
-	dso := defaultConfig.(StringOptions)
-	if !dso.AllowEmpty && strings.TrimSpace(so.Value) == "" {
-		return fmt.Errorf("%s cannot be empty", so.Name())
-	}
-	if !utils.Contains(dso.Options, so.Value) {
-		return fmt.Errorf("%s is not a valid value for %s - %v", so.Value, so.Name(), so.Options)
-	}
-	// if the parameter is not required it doesn't matter
-	return nil
-}
-
-type IntParam struct {
-	Param
-	Value int64
-}
-
-type BoolParam struct {
-	Param
-	Value bool
-}
diff --git a/programs/diagnostics/internal/platform/config/models_test.go b/programs/diagnostics/internal/platform/config/models_test.go
deleted file mode 100644
index 916d20ec28b..00000000000
--- a/programs/diagnostics/internal/platform/config/models_test.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package config_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/stretchr/testify/require"
-)
-
-var conf = config.Configuration{
-	Params: []config.ConfigParam{
-		config.StringListParam{
-			Values: []string{"some", "values"},
-			Param:  config.NewParam("paramA", "", false),
-		},
-		config.StringParam{
-			Value: "random",
-			Param: config.NewParam("paramB", "", true),
-		},
-		config.StringParam{
-			Value:      "",
-			AllowEmpty: true,
-			Param:      config.NewParam("paramC", "", false),
-		},
-		config.StringOptions{
-			Value:      "random",
-			Options:    []string{"random", "very_random", "very_very_random"},
-			Param:      config.NewParam("paramD", "", false),
-			AllowEmpty: true,
-		},
-	},
-}
-
-func TestGetConfigParam(t *testing.T) {
-
-	t.Run("can find get config param by name", func(t *testing.T) {
-		paramA, err := conf.GetConfigParam("paramA")
-		require.Nil(t, err)
-		require.NotNil(t, paramA)
-		require.IsType(t, config.StringListParam{}, paramA)
-		stringListParam, ok := paramA.(config.StringListParam)
-		require.True(t, ok)
-		require.False(t, stringListParam.Required())
-		require.Equal(t, stringListParam.Name(), "paramA")
-		require.ElementsMatch(t, stringListParam.Values, []string{"some", "values"})
-	})
-
-	t.Run("throws error on missing element", func(t *testing.T) {
-		paramZ, err := conf.GetConfigParam("paramZ")
-		require.Nil(t, paramZ)
-		require.NotNil(t, err)
-		require.Equal(t, err.Error(), "paramZ does not exist")
-	})
-}
-
-func TestValidateConfig(t *testing.T) {
-
-	t.Run("validate adds the default and allows override", func(t *testing.T) {
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: "custom",
-					Param: config.NewParam("paramB", "", true),
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.Nil(t, err)
-		require.NotNil(t, newConf)
-		require.Len(t, newConf.Params, 4)
-		// check first param
-		require.IsType(t, config.StringListParam{}, newConf.Params[0])
-		stringListParam, ok := newConf.Params[0].(config.StringListParam)
-		require.True(t, ok)
-		require.False(t, stringListParam.Required())
-		require.Equal(t, stringListParam.Name(), "paramA")
-		require.ElementsMatch(t, stringListParam.Values, []string{"some", "values"})
-		// check second param
-		require.IsType(t, config.StringParam{}, newConf.Params[1])
-		stringParam, ok := newConf.Params[1].(config.StringParam)
-		require.True(t, ok)
-		require.True(t, stringParam.Required())
-		require.Equal(t, "paramB", stringParam.Name())
-		require.Equal(t, "custom", stringParam.Value)
-	})
-
-	t.Run("validate errors if missing param", func(t *testing.T) {
-		//missing required paramB
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					Values: []string{"some", "values"},
-					Param:  config.NewParam("paramA", "", false),
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.Nil(t, newConf.Params)
-		require.NotNil(t, err)
-		require.Equal(t, "missing required parameter paramB - paramB does not exist", err.Error())
-	})
-
-	t.Run("validate errors if invalid string value", func(t *testing.T) {
-		//missing required paramB
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: "",
-					Param: config.NewParam("paramB", "", true),
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.Nil(t, newConf.Params)
-		require.NotNil(t, err)
-		require.Equal(t, "parameter paramB is invalid - paramB cannot be empty", err.Error())
-	})
-
-	t.Run("allow empty string value if specified", func(t *testing.T) {
-		//missing required paramB
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: "",
-					Param: config.NewParam("paramC", "", true),
-				},
-				config.StringParam{
-					Value: "custom",
-					Param: config.NewParam("paramB", "", true),
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.NotNil(t, newConf.Params)
-		require.Nil(t, err)
-	})
-
-	t.Run("validate errors if invalid string options value", func(t *testing.T) {
-		//missing required paramB
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: "not_random",
-					Param: config.NewParam("paramB", "", true),
-				},
-				config.StringOptions{
-					Value: "custom",
-					// this isn't ideal we need to ensure options are set for this to validate correctly
-					Options: []string{"random", "very_random", "very_very_random"},
-					Param:   config.NewParam("paramD", "", true),
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.Nil(t, newConf.Params)
-		require.NotNil(t, err)
-		require.Equal(t, "parameter paramD is invalid - custom is not a valid value for paramD - [random very_random very_very_random]", err.Error())
-	})
-
-	t.Run("allow empty string value for StringOptions if specified", func(t *testing.T) {
-		//missing required paramB
-		customConf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringParam{
-					Value: "custom",
-					Param: config.NewParam("paramB", "", true),
-				},
-				config.StringOptions{
-					Param: config.Param{},
-					// this isn't ideal we need to ensure options are set for this to validate correctly
-					Options: []string{"random", "very_random", "very_very_random"},
-					Value:   "",
-				},
-			},
-		}
-		newConf, err := customConf.ValidateConfig(conf)
-		require.NotNil(t, newConf.Params)
-		require.Nil(t, err)
-	})
-
-	//TODO: Do we need to test if parameters of the same name but wrong type are passed??
-}
diff --git a/programs/diagnostics/internal/platform/config/utils.go b/programs/diagnostics/internal/platform/config/utils.go
deleted file mode 100644
index 5f84c38d4f4..00000000000
--- a/programs/diagnostics/internal/platform/config/utils.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package config
-
-import (
-	"fmt"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-)
-
-func ReadStringListValues(conf Configuration, paramName string) ([]string, error) {
-	param, err := conf.GetConfigParam(paramName)
-	if err != nil {
-		return nil, err
-	}
-	value, ok := param.(StringListParam)
-	if !ok {
-		value, ok = param.(StringListParam)
-		if !ok {
-			return nil, fmt.Errorf("%s must be a list of strings", paramName)
-		}
-	}
-
-	return value.Values, nil
-}
-
-func ReadStringValue(conf Configuration, paramName string) (string, error) {
-	param, err := conf.GetConfigParam(paramName)
-	if err != nil {
-		return "", err
-	}
-	value, ok := param.(StringParam)
-	if !ok {
-		return "", fmt.Errorf("%s must be a list of strings", paramName)
-	}
-	return value.Value, nil
-}
-
-func ReadIntValue(conf Configuration, paramName string) (int64, error) {
-	param, err := conf.GetConfigParam(paramName)
-	if err != nil {
-		return 0, err
-	}
-	value, ok := param.(IntParam)
-	if !ok {
-		return 9, fmt.Errorf("%s must be an unsigned integer", paramName)
-	}
-	return value.Value, nil
-}
-
-func ReadBoolValue(conf Configuration, paramName string) (bool, error) {
-	param, err := conf.GetConfigParam(paramName)
-	if err != nil {
-		return false, err
-	}
-	value, ok := param.(BoolParam)
-	if !ok {
-		return false, fmt.Errorf("%s must be a boolean", paramName)
-	}
-	return value.Value, nil
-}
-
-func ReadStringOptionsValue(conf Configuration, paramName string) (string, error) {
-	param, err := conf.GetConfigParam(paramName)
-	if err != nil {
-		return "", err
-	}
-	value, ok := param.(StringOptions)
-	if !ok {
-		return "", fmt.Errorf("%s must be a string options", paramName)
-	}
-	if !utils.Contains(value.Options, value.Value) {
-		return "", fmt.Errorf("%s is not a valid option in %v for the the parameter %s", value.Value, value.Options, paramName)
-	}
-	return value.Value, nil
-}
diff --git a/programs/diagnostics/internal/platform/config/utils_test.go b/programs/diagnostics/internal/platform/config/utils_test.go
deleted file mode 100644
index 9e03e5e69d2..00000000000
--- a/programs/diagnostics/internal/platform/config/utils_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package config_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/stretchr/testify/require"
-)
-
-func TestReadStringListValues(t *testing.T) {
-
-	t.Run("can find a string list param", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: nil,
-					Param:  config.NewParam("include_tables", "Specify list of tables to collect", false),
-				},
-				config.StringListParam{
-					Values: []string{"licenses", "settings"},
-					Param:  config.NewParam("exclude_tables", "Specify list of tables not to collect", false),
-				},
-			},
-		}
-		excludeTables, err := config.ReadStringListValues(conf, "exclude_tables")
-		require.Nil(t, err)
-		require.Equal(t, []string{"licenses", "settings"}, excludeTables)
-	})
-
-}
-
-func TestReadStringValue(t *testing.T) {
-
-	t.Run("can find a string param", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringListParam{
-					// nil means include everything
-					Values: nil,
-					Param:  config.NewParam("include_tables", "Specify list of tables to collect", false),
-				},
-				config.StringParam{
-					Value: "/tmp/dump",
-					Param: config.NewParam("directory", "Specify a directory", false),
-				},
-			},
-		}
-		directory, err := config.ReadStringValue(conf, "directory")
-		require.Nil(t, err)
-		require.Equal(t, "/tmp/dump", directory)
-	})
-
-}
-
-func TestReadIntValue(t *testing.T) {
-	t.Run("can find an integer param", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.IntParam{
-					// nil means include everything
-					Value: 10000,
-					Param: config.NewParam("row_limit", "Max Rows to collect", false),
-				},
-				config.StringListParam{
-					// nil means include everything
-					Values: nil,
-					Param:  config.NewParam("include_tables", "Specify list of tables to collect", false),
-				},
-				config.StringParam{
-					Value: "/tmp/dump",
-					Param: config.NewParam("directory", "Specify a directory", false),
-				},
-			},
-		}
-		rowLimit, err := config.ReadIntValue(conf, "row_limit")
-		require.Nil(t, err)
-		require.Equal(t, int64(10000), rowLimit)
-	})
-
-}
-
-func TestReadBoolValue(t *testing.T) {
-	t.Run("can find a boolean param", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.BoolParam{
-					// nil means include everything
-					Value: true,
-					Param: config.NewParam("compress", "Compress data", false),
-				},
-				config.StringListParam{
-					// nil means include everything
-					Values: nil,
-					Param:  config.NewParam("include_tables", "Specify list of tables to collect", false),
-				},
-				config.StringParam{
-					Value: "/tmp/dump",
-					Param: config.NewParam("directory", "Specify a directory", false),
-				},
-			},
-		}
-
-		compress, err := config.ReadBoolValue(conf, "compress")
-		require.Nil(t, err)
-		require.True(t, compress)
-	})
-}
-
-func TestReadStringOptionsValue(t *testing.T) {
-	t.Run("can find a string value in a list of options", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringOptions{
-					Param:      config.NewParam("format", "List of formats", false),
-					Options:    []string{"csv", "tsv", "binary", "json", "ndjson"},
-					Value:      "csv",
-					AllowEmpty: false,
-				},
-			},
-		}
-		format, err := config.ReadStringOptionsValue(conf, "format")
-		require.Nil(t, err)
-		require.Equal(t, "csv", format)
-	})
-
-	t.Run("errors on invalid value", func(t *testing.T) {
-		conf := config.Configuration{
-			Params: []config.ConfigParam{
-				config.StringOptions{
-					Param:      config.NewParam("format", "List of formats", false),
-					Options:    []string{"csv", "tsv", "binary", "json", "ndjson"},
-					Value:      "random",
-					AllowEmpty: false,
-				},
-			},
-		}
-		format, err := config.ReadStringOptionsValue(conf, "format")
-		require.Equal(t, "random is not a valid option in [csv tsv binary json ndjson] for the the parameter format", err.Error())
-		require.Equal(t, "", format)
-	})
-}
diff --git a/programs/diagnostics/internal/platform/data/bundle.go b/programs/diagnostics/internal/platform/data/bundle.go
deleted file mode 100644
index e4eeede659e..00000000000
--- a/programs/diagnostics/internal/platform/data/bundle.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package data
-
-import (
-	"strings"
-)
-
-// DiagnosticBundle contains the results from a Collector
-// each frame can represent a table or collection of data files. By allowing multiple frames a single DiagnosticBundle
-// can potentially contain many related tables
-type DiagnosticBundle struct {
-	Frames map[string]Frame
-	// Errors is a property to be set if the Collector has an error. This can be used to indicate a partial collection
-	// and failed frames
-	Errors FrameErrors
-}
-
-type FrameErrors struct {
-	Errors []error
-}
-
-func (fe *FrameErrors) Error() string {
-	errors := make([]string, len(fe.Errors))
-	for i := range errors {
-		errors[i] = fe.Errors[i].Error()
-	}
-	return strings.Join(errors, "\n")
-}
diff --git a/programs/diagnostics/internal/platform/data/bundle_test.go b/programs/diagnostics/internal/platform/data/bundle_test.go
deleted file mode 100644
index ff9cfc2cf56..00000000000
--- a/programs/diagnostics/internal/platform/data/bundle_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package data_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-	"github.com/stretchr/testify/require"
-)
-
-func TestBundleError(t *testing.T) {
-
-	t.Run("can get a bundle error", func(t *testing.T) {
-		errs := make([]error, 3)
-		errs[0] = errors.New("Error 1")
-		errs[1] = errors.New("Error 2")
-		errs[2] = errors.New("Error 3")
-		fErrors := data.FrameErrors{
-			Errors: errs,
-		}
-		require.Equal(t, `Error 1
-Error 2
-Error 3`, fErrors.Error())
-
-	})
-}
diff --git a/programs/diagnostics/internal/platform/data/database.go b/programs/diagnostics/internal/platform/data/database.go
deleted file mode 100644
index d49317d8719..00000000000
--- a/programs/diagnostics/internal/platform/data/database.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package data
-
-import (
-	"database/sql"
-	"fmt"
-	"reflect"
-	"strings"
-)
-
-type DatabaseFrame struct {
-	name        string
-	ColumnNames []string
-	rows        *sql.Rows
-	columnTypes []*sql.ColumnType
-	vars        []interface{}
-}
-
-func NewDatabaseFrame(name string, rows *sql.Rows) (DatabaseFrame, error) {
-	databaseFrame := DatabaseFrame{}
-	columnTypes, err := rows.ColumnTypes()
-	if err != nil {
-		return DatabaseFrame{}, err
-	}
-	databaseFrame.columnTypes = columnTypes
-	databaseFrame.name = name
-	vars := make([]interface{}, len(columnTypes))
-	columnNames := make([]string, len(columnTypes))
-	for i := range columnTypes {
-		value := reflect.Zero(columnTypes[i].ScanType()).Interface()
-		vars[i] = &value
-		columnNames[i] = columnTypes[i].Name()
-	}
-	databaseFrame.ColumnNames = columnNames
-	databaseFrame.vars = vars
-	databaseFrame.rows = rows
-	return databaseFrame, nil
-}
-
-func (f DatabaseFrame) Next() ([]interface{}, bool, error) {
-	values := make([]interface{}, len(f.columnTypes))
-	for f.rows.Next() {
-		if err := f.rows.Scan(f.vars...); err != nil {
-			return nil, false, err
-		}
-		for i := range f.columnTypes {
-			ptr := reflect.ValueOf(f.vars[i])
-			values[i] = ptr.Elem().Interface()
-		}
-		return values, true, nil //nolint
-	}
-	// TODO: raise issue as this seems to always raise an error
-	//err := f.rows.Err()
-	f.rows.Close()
-	return nil, false, nil
-}
-
-func (f DatabaseFrame) Columns() []string {
-	return f.ColumnNames
-}
-
-func (f DatabaseFrame) Name() string {
-	return f.name
-}
-
-type Order int
-
-const (
-	Asc  Order = 1
-	Desc Order = 2
-)
-
-type OrderBy struct {
-	Column string
-	Order  Order
-}
-
-func (o OrderBy) String() string {
-	if strings.TrimSpace(o.Column) == "" {
-		return ""
-	}
-	switch o.Order {
-	case Asc:
-		return fmt.Sprintf(" ORDER BY %s ASC", o.Column)
-	case Desc:
-		return fmt.Sprintf(" ORDER BY %s DESC", o.Column)
-	}
-	return ""
-}
diff --git a/programs/diagnostics/internal/platform/data/database_test.go b/programs/diagnostics/internal/platform/data/database_test.go
deleted file mode 100644
index 57d89e78efc..00000000000
--- a/programs/diagnostics/internal/platform/data/database_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package data_test
-
-import (
-	"database/sql"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/DATA-DOG/go-sqlmock"
-	"github.com/stretchr/testify/require"
-)
-
-func TestString(t *testing.T) {
-	t.Run("can order by asc", func(t *testing.T) {
-		orderBy := data.OrderBy{
-			Column: "created_at",
-			Order:  data.Asc,
-		}
-		require.Equal(t, " ORDER BY created_at ASC", orderBy.String())
-	})
-
-	t.Run("can order by desc", func(t *testing.T) {
-		orderBy := data.OrderBy{
-			Column: "created_at",
-			Order:  data.Desc,
-		}
-		require.Equal(t, " ORDER BY created_at DESC", orderBy.String())
-	})
-
-}
-
-func TestNextDatabaseFrame(t *testing.T) {
-
-	t.Run("can iterate sql rows", func(t *testing.T) {
-		rowValues := [][]interface{}{
-			{int64(1), "post_1", "hello"},
-			{int64(2), "post_2", "world"},
-			{int64(3), "post_3", "goodbye"},
-			{int64(4), "post_4", "world"},
-		}
-		mockRows := sqlmock.NewRows([]string{"id", "title", "body"})
-		for i := range rowValues {
-			mockRows.AddRow(rowValues[i][0], rowValues[i][1], rowValues[i][2])
-		}
-		rows := mockRowsToSqlRows(mockRows)
-		dbFrame, err := data.NewDatabaseFrame("test", rows)
-		require.ElementsMatch(t, dbFrame.Columns(), []string{"id", "title", "body"})
-		require.Nil(t, err)
-		i := 0
-		for {
-			values, ok, err := dbFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Len(t, values, 3)
-			require.ElementsMatch(t, values, rowValues[i])
-			i++
-		}
-		require.Equal(t, 4, i)
-	})
-
-	t.Run("can iterate empty sql rows", func(t *testing.T) {
-		mockRows := sqlmock.NewRows([]string{"id", "title", "body"})
-		rows := mockRowsToSqlRows(mockRows)
-		dbFrame, err := data.NewDatabaseFrame("test", rows)
-		require.ElementsMatch(t, dbFrame.Columns(), []string{"id", "title", "body"})
-		require.Nil(t, err)
-		i := 0
-		for {
-			_, ok, err := dbFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			i++
-		}
-		require.Equal(t, 0, i)
-	})
-}
-
-func mockRowsToSqlRows(mockRows *sqlmock.Rows) *sql.Rows {
-	db, mock, _ := sqlmock.New()
-	mock.ExpectQuery("select").WillReturnRows(mockRows)
-	rows, _ := db.Query("select")
-	return rows
-}
diff --git a/programs/diagnostics/internal/platform/data/field.go b/programs/diagnostics/internal/platform/data/field.go
deleted file mode 100644
index 5e80fc1f467..00000000000
--- a/programs/diagnostics/internal/platform/data/field.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package data
-
-type Field struct {
-	// Name of the field
-	Name string
-	// A list of fields that must implement FieldType interface
-	Values []interface{}
-}
diff --git a/programs/diagnostics/internal/platform/data/file.go b/programs/diagnostics/internal/platform/data/file.go
deleted file mode 100644
index 9760b4b6906..00000000000
--- a/programs/diagnostics/internal/platform/data/file.go
+++ /dev/null
@@ -1,444 +0,0 @@
-package data
-
-import (
-	"bufio"
-	"encoding/xml"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/pkg/errors"
-	"gopkg.in/yaml.v3"
-)
-
-type File interface {
-	Copy(destPath string, removeSensitive bool) error
-	FilePath() string
-}
-
-type SimpleFile struct {
-	Path string
-}
-
-// Copy supports removeSensitive for other file types but for a simple file this doesn't do anything
-func (s SimpleFile) Copy(destPath string, removeSensitive bool) error {
-	// simple copy easiest
-	if err := utils.CopyFile(s.FilePath(), destPath); err != nil {
-		return errors.Wrapf(err, "unable to copy file %s", s.FilePath())
-	}
-	return nil
-}
-
-func (s SimpleFile) FilePath() string {
-	return s.Path
-}
-
-func NewFileFrame(name string, filePaths []string) FileFrame {
-	i := 0
-	files := make([]File, len(filePaths))
-	for i, path := range filePaths {
-		files[i] = SimpleFile{
-			Path: path,
-		}
-	}
-	return FileFrame{
-		name:  name,
-		i:     &i,
-		files: files,
-	}
-}
-
-type FileFrame struct {
-	name  string
-	i     *int
-	files []File
-}
-
-func (f FileFrame) Next() ([]interface{}, bool, error) {
-	if len(f.files) == *(f.i) {
-		return nil, false, nil
-	}
-	file := f.files[*f.i]
-	*f.i++
-	value := make([]interface{}, 1)
-	value[0] = file
-	return value, true, nil
-}
-
-func (f FileFrame) Columns() []string {
-	return []string{"files"}
-}
-
-func (f FileFrame) Name() string {
-	return f.name
-}
-
-// DirectoryFileFrame represents a set of files under a directory
-type DirectoryFileFrame struct {
-	FileFrame
-	Directory string
-}
-
-func NewFileDirectoryFrame(directory string, exts []string) (DirectoryFileFrame, []error) {
-	filePaths, errs := utils.ListFilesInDirectory(directory, exts)
-	files := make([]File, len(filePaths))
-	for i, path := range filePaths {
-		files[i] = SimpleFile{
-			Path: path,
-		}
-	}
-	i := 0
-	return DirectoryFileFrame{
-		Directory: directory,
-		FileFrame: FileFrame{
-			files: files,
-			i:     &i,
-		},
-	}, errs
-}
-
-func (f DirectoryFileFrame) Next() ([]interface{}, bool, error) {
-	if len(f.files) == *(f.i) {
-		return nil, false, nil
-	}
-	file := f.files[*f.i]
-	*f.i++
-	value := make([]interface{}, 1)
-	value[0] = file
-	return value, true, nil
-}
-
-func (f DirectoryFileFrame) Columns() []string {
-	return []string{"files"}
-}
-
-func (f DirectoryFileFrame) Name() string {
-	return f.Directory
-}
-
-type ConfigFile interface {
-	File
-	FindLogPaths() ([]string, error)
-	FindIncludedConfig() (ConfigFile, error)
-	IsIncluded() bool
-}
-
-type ConfigFileFrame struct {
-	i         *int
-	Directory string
-	files     []ConfigFile
-}
-
-func (f ConfigFileFrame) Next() ([]interface{}, bool, error) {
-	if len(f.files) == *(f.i) {
-		return nil, false, nil
-	}
-	file := f.files[*f.i]
-	*f.i++
-	value := make([]interface{}, 1)
-	value[0] = file
-	return value, true, nil
-}
-
-func (f ConfigFileFrame) Name() string {
-	return f.Directory
-}
-
-func NewConfigFileFrame(directory string) (ConfigFileFrame, []error) {
-	files, errs := utils.ListFilesInDirectory(directory, []string{"*.xml", "*.yaml", "*.yml"})
-	// we can't predict the length because of include files
-	var configs []ConfigFile
-
-	for _, path := range files {
-		var configFile ConfigFile
-		switch ext := filepath.Ext(path); ext {
-		case ".xml":
-			configFile = XmlConfigFile{
-				Path:     path,
-				Included: false,
-			}
-		case ".yml":
-			configFile = YamlConfigFile{
-				Path:     path,
-				Included: false,
-			}
-		case ".yaml":
-			configFile = YamlConfigFile{
-				Path: path,
-			}
-		}
-		if configFile != nil {
-			configs = append(configs, configFile)
-			// add any included configs
-			iConf, err := configFile.FindIncludedConfig()
-			if err != nil {
-				errs = append(errs, err)
-			} else {
-				if iConf.FilePath() != "" {
-					configs = append(configs, iConf)
-				}
-			}
-		}
-	}
-	i := 0
-
-	return ConfigFileFrame{
-		i:         &i,
-		Directory: directory,
-		files:     configs,
-	}, errs
-}
-
-func (f ConfigFileFrame) Columns() []string {
-	return []string{"config"}
-}
-
-func (f ConfigFileFrame) FindLogPaths() (logPaths []string, errors []error) {
-	for _, configFile := range f.files {
-		paths, err := configFile.FindLogPaths()
-		if err != nil {
-			errors = append(errors, err)
-		} else {
-			logPaths = append(logPaths, paths...)
-		}
-	}
-	return logPaths, errors
-}
-
-type XmlConfigFile struct {
-	Path     string
-	Included bool
-}
-
-// these patterns will be used to remove sensitive content - matches of the pattern will be replaced with the key
-var xmlSensitivePatterns = map[string]*regexp.Regexp{
-	"<password>Replaced</password>":                       regexp.MustCompile(`<password>(.*)</password>`),
-	"<password_sha256_hex>Replaced</password_sha256_hex>": regexp.MustCompile(`<password_sha256_hex>(.*)</password_sha256_hex>`),
-	"<secret_access_key>Replaced</secret_access_key>":     regexp.MustCompile(`<secret_access_key>(.*)</secret_access_key>`),
-	"<access_key_id>Replaced</access_key_id>":             regexp.MustCompile(`<access_key_id>(.*)</access_key_id>`),
-	"<secret>Replaced</secret>":                           regexp.MustCompile(`<secret>(.*)</secret>`),
-}
-
-func (x XmlConfigFile) Copy(destPath string, removeSensitive bool) error {
-	if !removeSensitive {
-		// simple copy easiest
-		if err := utils.CopyFile(x.FilePath(), destPath); err != nil {
-			return errors.Wrapf(err, "unable to copy file %s", x.FilePath())
-		}
-		return nil
-	}
-	return sensitiveFileCopy(x.FilePath(), destPath, xmlSensitivePatterns)
-}
-
-func (x XmlConfigFile) FilePath() string {
-	return x.Path
-}
-
-func (x XmlConfigFile) IsIncluded() bool {
-	return x.Included
-}
-
-type XmlLoggerConfig struct {
-	XMLName  xml.Name `xml:"logger"`
-	ErrorLog string   `xml:"errorlog"`
-	Log      string   `xml:"log"`
-}
-
-type YandexXMLConfig struct {
-	XMLName     xml.Name        `xml:"yandex"`
-	Clickhouse  XmlLoggerConfig `xml:"logger"`
-	IncludeFrom string          `xml:"include_from"`
-}
-
-type XmlConfig struct {
-	XMLName     xml.Name        `xml:"clickhouse"`
-	Clickhouse  XmlLoggerConfig `xml:"logger"`
-	IncludeFrom string          `xml:"include_from"`
-}
-
-func (x XmlConfigFile) UnmarshallConfig() (XmlConfig, error) {
-	inputFile, err := ioutil.ReadFile(x.Path)
-
-	if err != nil {
-		return XmlConfig{}, err
-	}
-	var cConfig XmlConfig
-	err = xml.Unmarshal(inputFile, &cConfig)
-	if err == nil {
-		return XmlConfig{
-			Clickhouse:  cConfig.Clickhouse,
-			IncludeFrom: cConfig.IncludeFrom,
-		}, nil
-	}
-	// attempt to marshall as yandex file
-	var yConfig YandexXMLConfig
-	err = xml.Unmarshal(inputFile, &yConfig)
-	if err != nil {
-		return XmlConfig{}, err
-	}
-	return XmlConfig{
-		Clickhouse:  yConfig.Clickhouse,
-		IncludeFrom: yConfig.IncludeFrom,
-	}, nil
-}
-
-func (x XmlConfigFile) FindLogPaths() ([]string, error) {
-	var paths []string
-	config, err := x.UnmarshallConfig()
-	if err != nil {
-		return nil, err
-	}
-	if config.Clickhouse.Log != "" {
-		paths = append(paths, config.Clickhouse.Log)
-	}
-	if config.Clickhouse.ErrorLog != "" {
-		paths = append(paths, config.Clickhouse.ErrorLog)
-	}
-
-	return paths, nil
-}
-
-func (x XmlConfigFile) FindIncludedConfig() (ConfigFile, error) {
-	if x.Included {
-		//can't recurse
-		return XmlConfigFile{}, nil
-	}
-	config, err := x.UnmarshallConfig()
-	if err != nil {
-		return XmlConfigFile{}, err
-	}
-	// we need to convert this
-	if config.IncludeFrom != "" {
-		if filepath.IsAbs(config.IncludeFrom) {
-			return XmlConfigFile{Path: config.IncludeFrom, Included: true}, nil
-		}
-		confDir := filepath.Dir(x.FilePath())
-		return XmlConfigFile{Path: path.Join(confDir, config.IncludeFrom), Included: true}, nil
-	}
-	return XmlConfigFile{}, nil
-}
-
-type YamlConfigFile struct {
-	Path     string
-	Included bool
-}
-
-var ymlSensitivePatterns = map[string]*regexp.Regexp{
-	"password: 'Replaced'":            regexp.MustCompile(`password:\s*.*$`),
-	"password_sha256_hex: 'Replaced'": regexp.MustCompile(`password_sha256_hex:\s*.*$`),
-	"access_key_id: 'Replaced'":       regexp.MustCompile(`access_key_id:\s*.*$`),
-	"secret_access_key: 'Replaced'":   regexp.MustCompile(`secret_access_key:\s*.*$`),
-	"secret: 'Replaced'":              regexp.MustCompile(`secret:\s*.*$`),
-}
-
-func (y YamlConfigFile) Copy(destPath string, removeSensitive bool) error {
-	if !removeSensitive {
-		// simple copy easiest
-		if err := utils.CopyFile(y.FilePath(), destPath); err != nil {
-			return errors.Wrapf(err, "unable to copy file %s", y.FilePath())
-		}
-		return nil
-	}
-	return sensitiveFileCopy(y.FilePath(), destPath, ymlSensitivePatterns)
-}
-
-func (y YamlConfigFile) FilePath() string {
-	return y.Path
-}
-
-func (y YamlConfigFile) IsIncluded() bool {
-	return y.Included
-}
-
-type YamlLoggerConfig struct {
-	Log      string
-	ErrorLog string
-}
-
-type YamlConfig struct {
-	Logger       YamlLoggerConfig
-	Include_From string
-}
-
-func (y YamlConfigFile) FindLogPaths() ([]string, error) {
-	var paths []string
-	inputFile, err := ioutil.ReadFile(y.Path)
-	if err != nil {
-		return nil, err
-	}
-	var config YamlConfig
-	err = yaml.Unmarshal(inputFile, &config)
-	if err != nil {
-		return nil, err
-	}
-	if config.Logger.Log != "" {
-		paths = append(paths, config.Logger.Log)
-	}
-	if config.Logger.ErrorLog != "" {
-		paths = append(paths, config.Logger.ErrorLog)
-	}
-	return paths, nil
-}
-
-func (y YamlConfigFile) FindIncludedConfig() (ConfigFile, error) {
-	if y.Included {
-		//can't recurse
-		return YamlConfigFile{}, nil
-	}
-	inputFile, err := ioutil.ReadFile(y.Path)
-	if err != nil {
-		return YamlConfigFile{}, err
-	}
-	var config YamlConfig
-	err = yaml.Unmarshal(inputFile, &config)
-	if err != nil {
-		return YamlConfigFile{}, err
-	}
-	if config.Include_From != "" {
-		if filepath.IsAbs(config.Include_From) {
-			return YamlConfigFile{Path: config.Include_From, Included: true}, nil
-		}
-		confDir := filepath.Dir(y.FilePath())
-		return YamlConfigFile{Path: path.Join(confDir, config.Include_From), Included: true}, nil
-	}
-	return YamlConfigFile{}, nil
-}
-
-func sensitiveFileCopy(sourcePath string, destPath string, patterns map[string]*regexp.Regexp) error {
-	destDir := filepath.Dir(destPath)
-	if err := os.MkdirAll(destDir, os.ModePerm); err != nil {
-		return errors.Wrapf(err, "unable to create directory %s", destDir)
-	}
-	// currently, we don't unmarshall into a struct - we want to preserve structure and comments. Possibly could
-	// be handled but for simplicity we do a line parse for now
-	inputFile, err := os.Open(sourcePath)
-
-	if err != nil {
-		return err
-	}
-	defer inputFile.Close()
-	outputFile, err := os.Create(destPath)
-
-	if err != nil {
-		return err
-	}
-	defer outputFile.Close()
-	writer := bufio.NewWriter(outputFile)
-	scanner := bufio.NewScanner(inputFile)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		for repl, pattern := range patterns {
-			line = pattern.ReplaceAllString(line, repl)
-		}
-		_, err = writer.WriteString(line + "\n")
-		if err != nil {
-			return err
-		}
-	}
-	writer.Flush()
-	return nil
-}
diff --git a/programs/diagnostics/internal/platform/data/file_test.go b/programs/diagnostics/internal/platform/data/file_test.go
deleted file mode 100644
index 9e305b1a5da..00000000000
--- a/programs/diagnostics/internal/platform/data/file_test.go
+++ /dev/null
@@ -1,263 +0,0 @@
-package data_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNextFileDirectoryFrame(t *testing.T) {
-	t.Run("can iterate file frame", func(t *testing.T) {
-		tempDir := t.TempDir()
-		files := make([]string, 5)
-		for i := 0; i < 5; i++ {
-			fileDir := path.Join(tempDir, fmt.Sprintf("%d", i))
-			err := os.MkdirAll(fileDir, os.ModePerm)
-			require.Nil(t, err)
-			filepath := path.Join(fileDir, fmt.Sprintf("random-%d.txt", i))
-			files[i] = filepath
-			_, err = os.Create(filepath)
-			require.Nil(t, err)
-		}
-		fileFrame, errs := data.NewFileDirectoryFrame(tempDir, []string{"*.txt"})
-		require.Empty(t, errs)
-		i := 0
-		for {
-			values, ok, err := fileFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Len(t, values, 1)
-			require.Equal(t, files[i], values[0].(data.SimpleFile).Path)
-			i += 1
-		}
-		require.Equal(t, 5, i)
-	})
-
-	t.Run("can iterate file frame when empty", func(t *testing.T) {
-		// create 5 temporary files
-		tempDir := t.TempDir()
-		fileFrame, errs := data.NewFileDirectoryFrame(tempDir, []string{"*"})
-		require.Empty(t, errs)
-		i := 0
-		for {
-			_, ok, err := fileFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-		}
-		require.Equal(t, 0, i)
-	})
-}
-
-func TestNewConfigFileFrame(t *testing.T) {
-	t.Run("can iterate config file frame", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "xml"))
-		require.Empty(t, errs)
-		i := 0
-		for {
-			values, ok, err := configFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Len(t, values, 1)
-			filePath := values[0].(data.XmlConfigFile).FilePath()
-			require.True(t, strings.Contains(filePath, ".xml"))
-			i += 1
-		}
-		// 5 not 3 due to the includes
-		require.Equal(t, 5, i)
-	})
-
-	t.Run("can iterate file frame when empty", func(t *testing.T) {
-		// create 5 temporary files
-		tempDir := t.TempDir()
-		configFrame, errs := data.NewConfigFileFrame(tempDir)
-		require.Empty(t, errs)
-		i := 0
-		for {
-			_, ok, err := configFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-		}
-		require.Equal(t, 0, i)
-	})
-}
-
-func TestConfigFileFrameCopy(t *testing.T) {
-	t.Run("can copy non-sensitive xml config files", func(t *testing.T) {
-		tmrDir := t.TempDir()
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "xml"))
-		require.Empty(t, errs)
-		for {
-			values, ok, err := configFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Nil(t, err)
-			require.True(t, ok)
-			configFile := values[0].(data.XmlConfigFile)
-			newPath := path.Join(tmrDir, filepath.Base(configFile.FilePath()))
-			err = configFile.Copy(newPath, false)
-			require.FileExists(t, newPath)
-			sourceInfo, _ := os.Stat(configFile.FilePath())
-			destInfo, _ := os.Stat(newPath)
-			require.Equal(t, sourceInfo.Size(), destInfo.Size())
-			require.Nil(t, err)
-		}
-	})
-
-	t.Run("can copy sensitive xml config files", func(t *testing.T) {
-		tmrDir := t.TempDir()
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "xml"))
-		require.Empty(t, errs)
-		i := 0
-		var checkedFiles []string
-		for {
-			values, ok, err := configFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Nil(t, err)
-			require.True(t, ok)
-			configFile := values[0].(data.XmlConfigFile)
-			fileName := filepath.Base(configFile.FilePath())
-			newPath := path.Join(tmrDir, fileName)
-			err = configFile.Copy(newPath, true)
-			require.FileExists(t, newPath)
-			require.Nil(t, err)
-			bytes, err := ioutil.ReadFile(newPath)
-			require.Nil(t, err)
-			s := string(bytes)
-			checkedFiles = append(checkedFiles, fileName)
-			if fileName == "users.xml" || fileName == "default-password.xml" || fileName == "user-include.xml" {
-				require.True(t, strings.Contains(s, "<password>Replaced</password>") ||
-					strings.Contains(s, "<password_sha256_hex>Replaced</password_sha256_hex>"))
-				require.NotContains(t, s, "<password>REPLACE_ME</password>")
-				require.NotContains(t, s, "<password_sha256_hex>REPLACE_ME</password_sha256_hex>")
-			} else if fileName == "config.xml" {
-				require.True(t, strings.Contains(s, "<access_key_id>Replaced</access_key_id>"))
-				require.True(t, strings.Contains(s, "<secret_access_key>Replaced</secret_access_key>"))
-				require.True(t, strings.Contains(s, "<secret>Replaced</secret>"))
-				require.NotContains(t, s, "<access_key_id>REPLACE_ME</access_key_id>")
-				require.NotContains(t, s, "<secret_access_key>REPLACE_ME</secret_access_key>")
-				require.NotContains(t, s, "<secret>REPLACE_ME</secret>")
-			}
-			i++
-		}
-		require.ElementsMatch(t, []string{"users.xml", "default-password.xml", "user-include.xml", "config.xml", "server-include.xml"}, checkedFiles)
-		require.Equal(t, 5, i)
-	})
-
-	t.Run("can copy sensitive yaml config files", func(t *testing.T) {
-		tmrDir := t.TempDir()
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "yaml"))
-		require.Empty(t, errs)
-		i := 0
-		var checkedFiles []string
-		for {
-			values, ok, err := configFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.Nil(t, err)
-			require.True(t, ok)
-			configFile := values[0].(data.YamlConfigFile)
-			fileName := filepath.Base(configFile.FilePath())
-			newPath := path.Join(tmrDir, fileName)
-			err = configFile.Copy(newPath, true)
-			require.FileExists(t, newPath)
-			require.Nil(t, err)
-			bytes, err := ioutil.ReadFile(newPath)
-			require.Nil(t, err)
-			s := string(bytes)
-			checkedFiles = append(checkedFiles, fileName)
-			if fileName == "users.yaml" || fileName == "default-password.yaml" || fileName == "user-include.yaml" {
-				require.True(t, strings.Contains(s, "password: 'Replaced'") ||
-					strings.Contains(s, "password_sha256_hex: 'Replaced'"))
-				require.NotContains(t, s, "password: 'REPLACE_ME'")
-				require.NotContains(t, s, "password_sha256_hex: \"REPLACE_ME\"")
-			} else if fileName == "config.yaml" {
-				require.True(t, strings.Contains(s, "access_key_id: 'Replaced'"))
-				require.True(t, strings.Contains(s, "secret_access_key: 'Replaced'"))
-				require.True(t, strings.Contains(s, "secret: 'Replaced'"))
-				require.NotContains(t, s, "access_key_id: 'REPLACE_ME'")
-				require.NotContains(t, s, "secret_access_key: REPLACE_ME")
-				require.NotContains(t, s, "secret: REPLACE_ME")
-			}
-			i++
-		}
-		require.ElementsMatch(t, []string{"users.yaml", "default-password.yaml", "user-include.yaml", "config.yaml", "server-include.yaml"}, checkedFiles)
-		require.Equal(t, 5, i)
-	})
-}
-
-func TestConfigFileFrameFindLogPaths(t *testing.T) {
-	t.Run("can find xml log paths", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "xml"))
-		require.Empty(t, errs)
-		paths, errs := configFrame.FindLogPaths()
-		require.Empty(t, errs)
-		require.ElementsMatch(t, []string{"/var/log/clickhouse-server/clickhouse-server.log",
-			"/var/log/clickhouse-server/clickhouse-server.err.log"}, paths)
-	})
-
-	t.Run("can handle empty log paths", func(t *testing.T) {
-		configFrame, errs := data.NewConfigFileFrame(t.TempDir())
-		require.Empty(t, errs)
-		paths, errs := configFrame.FindLogPaths()
-		require.Empty(t, errs)
-		require.Empty(t, paths)
-	})
-
-	t.Run("can find yaml log paths", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "yaml"))
-		require.Empty(t, errs)
-		paths, errs := configFrame.FindLogPaths()
-		require.Empty(t, errs)
-		require.ElementsMatch(t, []string{"/var/log/clickhouse-server/clickhouse-server.log",
-			"/var/log/clickhouse-server/clickhouse-server.err.log"}, paths)
-	})
-}
-
-// test the legacy format for ClickHouse xml config files with a yandex root tag
-func TestYandexConfigFile(t *testing.T) {
-	t.Run("can find xml log paths with yandex root", func(t *testing.T) {
-		cwd, err := os.Getwd()
-		require.Nil(t, err)
-		configFrame, errs := data.NewConfigFileFrame(path.Join(cwd, "../../../testdata", "configs", "yandex_xml"))
-		require.Empty(t, errs)
-		paths, errs := configFrame.FindLogPaths()
-		require.Empty(t, errs)
-		require.ElementsMatch(t, []string{"/var/log/clickhouse-server/clickhouse-server.log",
-			"/var/log/clickhouse-server/clickhouse-server.err.log"}, paths)
-	})
-}
diff --git a/programs/diagnostics/internal/platform/data/frame.go b/programs/diagnostics/internal/platform/data/frame.go
deleted file mode 100644
index 65978430109..00000000000
--- a/programs/diagnostics/internal/platform/data/frame.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package data
-
-type BaseFrame struct {
-	Name string
-}
-
-type Frame interface {
-	Next() ([]interface{}, bool, error)
-	Columns() []string
-	Name() string
-}
diff --git a/programs/diagnostics/internal/platform/data/memory.go b/programs/diagnostics/internal/platform/data/memory.go
deleted file mode 100644
index 25da25cf251..00000000000
--- a/programs/diagnostics/internal/platform/data/memory.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package data
-
-type MemoryFrame struct {
-	i           *int
-	ColumnNames []string
-	Rows        [][]interface{}
-	name        string
-}
-
-func NewMemoryFrame(name string, columns []string, rows [][]interface{}) MemoryFrame {
-	i := 0
-	return MemoryFrame{
-		i:           &i,
-		Rows:        rows,
-		ColumnNames: columns,
-		name:        name,
-	}
-}
-
-func (f MemoryFrame) Next() ([]interface{}, bool, error) {
-	if f.Rows == nil || len(f.Rows) == *(f.i) {
-		return nil, false, nil
-	}
-	value := f.Rows[*f.i]
-	*f.i++
-	return value, true, nil
-}
-
-func (f MemoryFrame) Columns() []string {
-	return f.ColumnNames
-}
-
-func (f MemoryFrame) Name() string {
-	return f.name
-}
diff --git a/programs/diagnostics/internal/platform/data/memory_test.go b/programs/diagnostics/internal/platform/data/memory_test.go
deleted file mode 100644
index fcc02e37d32..00000000000
--- a/programs/diagnostics/internal/platform/data/memory_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package data_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/stretchr/testify/require"
-)
-
-func TestNextMemoryFrame(t *testing.T) {
-	t.Run("can iterate memory frame", func(t *testing.T) {
-		columns := []string{"Filesystem", "Size", "Used", "Avail", "Use%", "Mounted on"}
-		rows := [][]interface{}{
-			{"sysfs", 0, 0, 0, 0, "/sys"},
-			{"proc", 0, 0, 0, 0, "/proc"},
-			{"udev", 33357840384, 0, 33357840384, 0, "/dev"},
-			{"devpts", 0, 0, 0, 0, "/dev/pts"},
-			{"tmpfs", 6682607616, 2228224, 6680379392, 1, "/run"},
-			{"/dev/mapper/system-root", 1938213220352, 118136926208, 1721548947456, 7.000000000000001, "/"},
-		}
-		memoryFrame := data.NewMemoryFrame("disks", columns, rows)
-		i := 0
-		for {
-			values, ok, err := memoryFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-			require.ElementsMatch(t, values, rows[i])
-			require.Len(t, values, 6)
-			i += 1
-		}
-		require.Equal(t, 6, i)
-	})
-
-	t.Run("can iterate memory frame when empty", func(t *testing.T) {
-		memoryFrame := data.NewMemoryFrame("test", []string{}, [][]interface{}{})
-		i := 0
-		for {
-			_, ok, err := memoryFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-		}
-		require.Equal(t, 0, i)
-	})
-
-	t.Run("can iterate memory frame when empty", func(t *testing.T) {
-		memoryFrame := data.MemoryFrame{}
-		i := 0
-		for {
-			_, ok, err := memoryFrame.Next()
-			require.Nil(t, err)
-			if !ok {
-				break
-			}
-		}
-		require.Equal(t, 0, i)
-	})
-}
diff --git a/programs/diagnostics/internal/platform/data/misc.go b/programs/diagnostics/internal/platform/data/misc.go
deleted file mode 100644
index a03213c4f46..00000000000
--- a/programs/diagnostics/internal/platform/data/misc.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package data
-
-func NewHierarchicalFrame(name string, frame Frame, subFrames []HierarchicalFrame) HierarchicalFrame {
-	return HierarchicalFrame{
-		name:      name,
-		DataFrame: frame,
-		SubFrames: subFrames,
-	}
-}
-
-type HierarchicalFrame struct {
-	name      string
-	DataFrame Frame
-	SubFrames []HierarchicalFrame
-}
-
-func (hf HierarchicalFrame) Name() string {
-	return hf.name
-}
-
-func (hf HierarchicalFrame) Columns() []string {
-	return hf.DataFrame.Columns()
-}
-
-func (hf HierarchicalFrame) Next() ([]interface{}, bool, error) {
-	return hf.DataFrame.Next()
-}
diff --git a/programs/diagnostics/internal/platform/database/native.go b/programs/diagnostics/internal/platform/database/native.go
deleted file mode 100644
index 45b9af0349e..00000000000
--- a/programs/diagnostics/internal/platform/database/native.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package database
-
-import (
-	"database/sql"
-	"fmt"
-	"net/url"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	_ "github.com/ClickHouse/clickhouse-go/v2"
-	"github.com/pkg/errors"
-)
-
-type ClickhouseNativeClient struct {
-	host       string
-	connection *sql.DB
-}
-
-func NewNativeClient(host string, port uint16, username string, password string) (*ClickhouseNativeClient, error) {
-	// debug output ?debug=true
-	connection, err := sql.Open("clickhouse", fmt.Sprintf("clickhouse://%s:%s@%s:%d/", url.QueryEscape(username), url.QueryEscape(password), host, port))
-	if err != nil {
-		return &ClickhouseNativeClient{}, err
-	}
-	if err := connection.Ping(); err != nil {
-		return &ClickhouseNativeClient{}, err
-	}
-	return &ClickhouseNativeClient{
-		host:       host,
-		connection: connection,
-	}, nil
-}
-
-func (c *ClickhouseNativeClient) Ping() error {
-	return c.connection.Ping()
-}
-
-func (c *ClickhouseNativeClient) ReadTable(databaseName string, tableName string, excludeColumns []string, orderBy data.OrderBy, limit int64) (data.Frame, error) {
-	exceptClause := ""
-	if len(excludeColumns) > 0 {
-		exceptClause = fmt.Sprintf("EXCEPT(%s) ", strings.Join(excludeColumns, ","))
-	}
-	limitClause := ""
-	if limit >= 0 {
-		limitClause = fmt.Sprintf(" LIMIT %d", limit)
-	}
-	rows, err := c.connection.Query(fmt.Sprintf("SELECT * %sFROM %s.%s%s%s", exceptClause, databaseName, tableName, orderBy.String(), limitClause))
-	if err != nil {
-		return data.DatabaseFrame{}, err
-	}
-	return data.NewDatabaseFrame(fmt.Sprintf("%s.%s", databaseName, tableName), rows)
-}
-
-func (c *ClickhouseNativeClient) ReadTableNamesForDatabase(databaseName string) ([]string, error) {
-	rows, err := c.connection.Query(fmt.Sprintf("SHOW TABLES FROM %s", databaseName))
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-	var tableNames []string
-	var name string
-	for rows.Next() {
-		if err := rows.Scan(&name); err != nil {
-			return nil, err
-		}
-		tableNames = append(tableNames, name)
-	}
-	return tableNames, nil
-}
-
-func (c *ClickhouseNativeClient) ExecuteStatement(id string, statement string) (data.Frame, error) {
-	rows, err := c.connection.Query(statement)
-	if err != nil {
-		return data.DatabaseFrame{}, err
-	}
-	return data.NewDatabaseFrame(id, rows)
-}
-
-func (c *ClickhouseNativeClient) Version() (string, error) {
-	frame, err := c.ExecuteStatement("version", "SELECT version() as version")
-	if err != nil {
-		return "", err
-	}
-	values, ok, err := frame.Next()
-	if err != nil {
-		return "", err
-	}
-	if !ok {
-		return "", errors.New("unable to read ClickHouse version")
-	}
-	if len(values) != 1 {
-		return "", errors.New("unable to read ClickHouse version - no rows returned")
-	}
-	return values[0].(string), nil
-}
diff --git a/programs/diagnostics/internal/platform/database/native_test.go b/programs/diagnostics/internal/platform/database/native_test.go
deleted file mode 100644
index 7028a4b4800..00000000000
--- a/programs/diagnostics/internal/platform/database/native_test.go
+++ /dev/null
@@ -1,289 +0,0 @@
-//go:build !no_docker
-
-package database_test
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/database"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/docker/go-connections/nat"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-func createClickHouseContainer(t *testing.T, ctx context.Context) (testcontainers.Container, nat.Port) {
-	// create a ClickHouse container
-	cwd, err := os.Getwd()
-	if err != nil {
-		// can't test without current directory
-		panic(err)
-	}
-
-	// for now, we test against a hardcoded database-server version but we should make this a property
-	req := testcontainers.ContainerRequest{
-		Image:        fmt.Sprintf("clickhouse/clickhouse-server:%s", test.GetClickHouseTestVersion()),
-		ExposedPorts: []string{"9000/tcp"},
-		WaitingFor:   wait.ForLog("Ready for connections"),
-		Mounts: testcontainers.ContainerMounts{
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../../../testdata/docker/custom.xml"),
-				},
-				Target: "/etc/clickhouse-server/config.d/custom.xml",
-			},
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../../../testdata/docker/admin.xml"),
-				},
-				Target: "/etc/clickhouse-server/users.d/admin.xml",
-			},
-		},
-	}
-	clickhouseContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	})
-	if err != nil {
-		// can't test without container
-		panic(err)
-	}
-
-	p, _ := clickhouseContainer.MappedPort(ctx, "9000")
-	if err != nil {
-		// can't test without container's port
-		panic(err)
-	}
-
-	t.Setenv("CLICKHOUSE_DB_PORT", p.Port())
-
-	return clickhouseContainer, p
-}
-
-func getClient(t *testing.T, mappedPort int) *database.ClickhouseNativeClient {
-	clickhouseClient, err := database.NewNativeClient("localhost", uint16(mappedPort), "", "")
-	if err != nil {
-		t.Fatalf("unable to build client : %v", err)
-	}
-	return clickhouseClient
-}
-
-func TestReadTableNamesForDatabase(t *testing.T) {
-	ctx := context.Background()
-	clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-	defer clickhouseContainer.Terminate(ctx) //nolint
-
-	clickhouseClient := getClient(t, mappedPort.Int())
-	t.Run("client can read tables for a database", func(t *testing.T) {
-		tables, err := clickhouseClient.ReadTableNamesForDatabase("system")
-		require.Nil(t, err)
-		require.GreaterOrEqual(t, len(tables), 70)
-		require.Contains(t, tables, "merge_tree_settings")
-	})
-}
-
-func TestReadTable(t *testing.T) {
-	t.Run("client can get all rows for system.disks table", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		// we read the table system.disks as this should contain only 1 row
-		frame, err := clickhouseClient.ReadTable("system", "disks", []string{}, data.OrderBy{}, 10)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [9]string{"name", "path", "free_space", "total_space", "unreserved_space", "keep_free_space", "type", "is_encrypted", "cache_path"})
-		i := 0
-		for {
-			values, ok, err := frame.Next()
-			if i == 0 {
-				require.Nil(t, err)
-				require.True(t, ok)
-				require.Equal(t, "default", values[0])
-				require.Equal(t, "/var/lib/clickhouse/", values[1])
-				require.Greater(t, values[2], uint64(0))
-				require.Greater(t, values[3], uint64(0))
-				require.Greater(t, values[4], uint64(0))
-				require.Equal(t, values[5], uint64(0))
-				require.Equal(t, "local", values[6])
-				require.Equal(t, values[7], uint8(0))
-				require.Equal(t, values[8], "")
-			} else {
-				require.False(t, ok)
-				break
-			}
-			i += 1
-		}
-	})
-
-	t.Run("client can get all rows for system.databases table", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		// we read the table system.databases as this should be small and consistent on fresh db instances
-		frame, err := clickhouseClient.ReadTable("system", "databases", []string{}, data.OrderBy{}, 10)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [6]string{"name", "engine", "data_path", "metadata_path", "uuid", "comment"})
-		expectedRows := [4][3]string{{"INFORMATION_SCHEMA", "Memory", "/var/lib/clickhouse/"},
-			{"default", "Atomic", "/var/lib/clickhouse/store/"},
-			{"information_schema", "Memory", "/var/lib/clickhouse/"},
-			{"system", "Atomic", "/var/lib/clickhouse/store/"}}
-		i := 0
-		for {
-			values, ok, err := frame.Next()
-
-			if i < 4 {
-				require.Nil(t, err)
-				require.True(t, ok)
-				require.Equal(t, expectedRows[i][0], values[0])
-				require.Equal(t, expectedRows[i][1], values[1])
-				require.Equal(t, expectedRows[i][2], values[2])
-				require.NotNil(t, values[3])
-				require.NotNil(t, values[4])
-				require.Equal(t, "", values[5])
-			} else {
-				require.False(t, ok)
-				break
-			}
-			i += 1
-		}
-	})
-
-	t.Run("client can get all rows for system.databases table with except", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		frame, err := clickhouseClient.ReadTable("system", "databases", []string{"data_path", "comment"}, data.OrderBy{}, 10)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [4]string{"name", "engine", "metadata_path", "uuid"})
-	})
-
-	t.Run("client can limit rows for system.databases", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		frame, err := clickhouseClient.ReadTable("system", "databases", []string{}, data.OrderBy{}, 1)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [6]string{"name", "engine", "data_path", "metadata_path", "uuid", "comment"})
-		expectedRows := [1][3]string{{"INFORMATION_SCHEMA", "Memory", "/var/lib/clickhouse/"}}
-		i := 0
-		for {
-			values, ok, err := frame.Next()
-			if i == 0 {
-				require.Nil(t, err)
-				require.True(t, ok)
-				require.Equal(t, expectedRows[i][0], values[0])
-				require.Equal(t, expectedRows[i][1], values[1])
-				require.Equal(t, expectedRows[i][2], values[2])
-				require.NotNil(t, values[3])
-				require.NotNil(t, values[4])
-				require.Equal(t, "", values[5])
-			} else {
-				require.False(t, ok)
-				break
-			}
-			i += 1
-		}
-	})
-
-	t.Run("client can order rows for system.databases", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		frame, err := clickhouseClient.ReadTable("system", "databases", []string{}, data.OrderBy{
-			Column: "engine",
-			Order:  data.Asc,
-		}, 10)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [6]string{"name", "engine", "data_path", "metadata_path", "uuid", "comment"})
-		expectedRows := [4][3]string{
-			{"default", "Atomic", "/var/lib/clickhouse/store/"},
-			{"system", "Atomic", "/var/lib/clickhouse/store/"},
-			{"INFORMATION_SCHEMA", "Memory", "/var/lib/clickhouse/"},
-			{"information_schema", "Memory", "/var/lib/clickhouse/"},
-		}
-		i := 0
-		for {
-			values, ok, err := frame.Next()
-
-			if i < 4 {
-				require.Nil(t, err)
-				require.True(t, ok)
-				require.Equal(t, expectedRows[i][0], values[0])
-				require.Equal(t, expectedRows[i][1], values[1])
-				require.Equal(t, expectedRows[i][2], values[2])
-				require.NotNil(t, values[3])
-				require.NotNil(t, values[4])
-				require.Equal(t, "", values[5])
-			} else {
-				require.False(t, ok)
-				break
-			}
-			i += 1
-		}
-	})
-}
-
-func TestExecuteStatement(t *testing.T) {
-	t.Run("client can execute any statement", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		statement := "SELECT path, count(*) as count FROM system.disks GROUP BY path;"
-		frame, err := clickhouseClient.ExecuteStatement("engines", statement)
-		require.Nil(t, err)
-		require.ElementsMatch(t, frame.Columns(), [2]string{"path", "count"})
-		expectedRows := [1][2]interface{}{
-			{"/var/lib/clickhouse/", uint64(1)},
-		}
-		i := 0
-		for {
-			values, ok, err := frame.Next()
-			if !ok {
-				require.Nil(t, err)
-				break
-			}
-			require.Nil(t, err)
-			require.Equal(t, expectedRows[i][0], values[0])
-			require.Equal(t, expectedRows[i][1], values[1])
-			i++
-		}
-		fmt.Println(i)
-	})
-}
-
-func TestVersion(t *testing.T) {
-	t.Run("client can read version", func(t *testing.T) {
-		ctx := context.Background()
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		clickhouseClient := getClient(t, mappedPort.Int())
-
-		version, err := clickhouseClient.Version()
-		require.Nil(t, err)
-		require.NotEmpty(t, version)
-	})
-}
diff --git a/programs/diagnostics/internal/platform/manager.go b/programs/diagnostics/internal/platform/manager.go
deleted file mode 100644
index b4435b62ea2..00000000000
--- a/programs/diagnostics/internal/platform/manager.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package platform
-
-import (
-	"errors"
-	"sync"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/database"
-)
-
-var once sync.Once
-var dbInit sync.Once
-
-// manages all resources that collectors and outputs may wish to ensure inc. db connections
-
-type DBClient interface {
-	ReadTableNamesForDatabase(databaseName string) ([]string, error)
-	ReadTable(databaseName string, tableName string, excludeColumns []string, orderBy data.OrderBy, limit int64) (data.Frame, error)
-	ExecuteStatement(id string, statement string) (data.Frame, error)
-	Version() (string, error)
-}
-
-var manager *ResourceManager
-
-type ResourceManager struct {
-	DbClient DBClient
-}
-
-func GetResourceManager() *ResourceManager {
-	once.Do(func() {
-		manager = &ResourceManager{}
-	})
-	return manager
-}
-
-func (m *ResourceManager) Connect(host string, port uint16, username string, password string) error {
-	var err error
-	var clientInstance DBClient
-	init := false
-	dbInit.Do(func() {
-		clientInstance, err = database.NewNativeClient(host, port, username, password)
-		manager.DbClient = clientInstance
-		init = true
-	})
-	if !init {
-		return errors.New("connect can only be called once")
-	}
-	return err
-}
diff --git a/programs/diagnostics/internal/platform/manager_test.go b/programs/diagnostics/internal/platform/manager_test.go
deleted file mode 100644
index e6c50c6e505..00000000000
--- a/programs/diagnostics/internal/platform/manager_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-//go:build !no_docker
-
-package platform_test
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/docker/go-connections/nat"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-// create a ClickHouse container
-func createClickHouseContainer(t *testing.T, ctx context.Context) (testcontainers.Container, nat.Port) {
-	cwd, err := os.Getwd()
-	if err != nil {
-		fmt.Println("unable to read current directory", err)
-		os.Exit(1)
-	}
-	// for now, we test against a hardcoded database-server version but we should make this a property
-	req := testcontainers.ContainerRequest{
-		Image:        fmt.Sprintf("clickhouse/clickhouse-server:%s", test.GetClickHouseTestVersion()),
-		ExposedPorts: []string{"9000/tcp"},
-		WaitingFor:   wait.ForLog("Ready for connections"),
-		Mounts: testcontainers.ContainerMounts{
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../../testdata/docker/custom.xml"),
-				},
-				Target: "/etc/clickhouse-server/config.d/custom.xml",
-			},
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../../testdata/docker/admin.xml"),
-				},
-				Target: "/etc/clickhouse-server/users.d/admin.xml",
-			},
-		},
-	}
-	clickhouseContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	})
-	if err != nil {
-		// can't test without container
-		panic(err)
-	}
-
-	p, err := clickhouseContainer.MappedPort(ctx, "9000")
-	if err != nil {
-		// can't test without a port
-		panic(err)
-	}
-
-	return clickhouseContainer, p
-}
-
-func TestConnect(t *testing.T) {
-	t.Run("can only connect once", func(t *testing.T) {
-		ctx := context.Background()
-
-		clickhouseContainer, mappedPort := createClickHouseContainer(t, ctx)
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		t.Setenv("CLICKHOUSE_DB_PORT", mappedPort.Port())
-
-		port := mappedPort.Int()
-
-		// get before connection
-		manager := platform.GetResourceManager()
-		require.Nil(t, manager.DbClient)
-		// init connection
-		err := manager.Connect("localhost", uint16(port), "", "")
-		require.Nil(t, err)
-		require.NotNil(t, manager.DbClient)
-		// try and re-fetch connection
-		err = manager.Connect("localhost", uint16(port), "", "")
-		require.NotNil(t, err)
-		require.Equal(t, "connect can only be called once", err.Error())
-	})
-
-}
-
-func TestGetResourceManager(t *testing.T) {
-	t.Run("get resource manager", func(t *testing.T) {
-		manager := platform.GetResourceManager()
-		require.NotNil(t, manager)
-		manager2 := platform.GetResourceManager()
-		require.NotNil(t, manager2)
-		require.Equal(t, &manager, &manager2)
-	})
-
-}
diff --git a/programs/diagnostics/internal/platform/test/data.go b/programs/diagnostics/internal/platform/test/data.go
deleted file mode 100644
index 7710e9a69a1..00000000000
--- a/programs/diagnostics/internal/platform/test/data.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package test
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/pkg/errors"
-)
-
-type fakeClickhouseClient struct {
-	tables         map[string][]string
-	QueryResponses map[string]*FakeDataFrame
-}
-
-func NewFakeClickhouseClient(tables map[string][]string) fakeClickhouseClient {
-	queryResponses := make(map[string]*FakeDataFrame)
-	return fakeClickhouseClient{
-		tables:         tables,
-		QueryResponses: queryResponses,
-	}
-}
-
-func (f fakeClickhouseClient) ReadTableNamesForDatabase(databaseName string) ([]string, error) {
-	if _, ok := f.tables[databaseName]; ok {
-		return f.tables[databaseName], nil
-	}
-	return nil, fmt.Errorf("database %s does not exist", databaseName)
-}
-
-func (f fakeClickhouseClient) ReadTable(databaseName string, tableName string, excludeColumns []string, orderBy data.OrderBy, limit int64) (data.Frame, error) {
-
-	exceptClause := ""
-	if len(excludeColumns) > 0 {
-		exceptClause = fmt.Sprintf("EXCEPT(%s) ", strings.Join(excludeColumns, ","))
-	}
-	limitClause := ""
-	if limit >= 0 {
-		limitClause = fmt.Sprintf(" LIMIT %d", limit)
-	}
-	query := fmt.Sprintf("SELECT * %sFROM %s.%s%s%s", exceptClause, databaseName, tableName, orderBy.String(), limitClause)
-	frame, error := f.ExecuteStatement(fmt.Sprintf("read_table_%s.%s", databaseName, tableName), query)
-	if error != nil {
-		return frame, error
-	}
-	fFrame := *(frame.(*FakeDataFrame))
-	fFrame = fFrame.FilterColumns(excludeColumns)
-	fFrame = fFrame.Order(orderBy)
-	fFrame = fFrame.Limit(limit)
-	return fFrame, nil
-}
-
-func (f fakeClickhouseClient) ExecuteStatement(id string, statement string) (data.Frame, error) {
-	if frame, ok := f.QueryResponses[statement]; ok {
-		return frame, nil
-	}
-	return FakeDataFrame{}, errors.New(fmt.Sprintf("No recorded response for %s", statement))
-}
-
-func (f fakeClickhouseClient) Version() (string, error) {
-	return "21.12.3", nil
-}
-
-func (f fakeClickhouseClient) Reset() {
-	for key, frame := range f.QueryResponses {
-		frame.Reset()
-		f.QueryResponses[key] = frame
-	}
-}
-
-type FakeDataFrame struct {
-	i           *int
-	Rows        [][]interface{}
-	ColumnNames []string
-	name        string
-}
-
-func NewFakeDataFrame(name string, columns []string, rows [][]interface{}) FakeDataFrame {
-	i := 0
-	return FakeDataFrame{
-		i:           &i,
-		Rows:        rows,
-		ColumnNames: columns,
-		name:        name,
-	}
-}
-
-func (f FakeDataFrame) Next() ([]interface{}, bool, error) {
-	if len(f.Rows) == *(f.i) {
-		return nil, false, nil
-	}
-	value := f.Rows[*f.i]
-	*f.i++
-	return value, true, nil
-}
-
-func (f FakeDataFrame) Columns() []string {
-	return f.ColumnNames
-}
-
-func (f FakeDataFrame) Name() string {
-	return f.name
-}
-
-func (f *FakeDataFrame) Reset() {
-	i := 0
-	f.i = &i
-}
-
-func (f FakeDataFrame) FilterColumns(excludeColumns []string) FakeDataFrame {
-	// get columns we can remove
-	rColumns := utils.Intersection(f.ColumnNames, excludeColumns)
-	rIndexes := make([]int, len(rColumns))
-	// find the indexes of the columns to remove
-	for i, column := range rColumns {
-		rIndexes[i] = utils.IndexOf(f.ColumnNames, column)
-	}
-	newRows := make([][]interface{}, len(f.Rows))
-	for r, row := range f.Rows {
-		newRow := row
-		for i, index := range rIndexes {
-			newRow = utils.Remove(newRow, index-i)
-		}
-		newRows[r] = newRow
-	}
-	f.Rows = newRows
-	f.ColumnNames = utils.Distinct(f.ColumnNames, excludeColumns)
-	return f
-}
-
-func (f FakeDataFrame) Limit(rowLimit int64) FakeDataFrame {
-	if rowLimit >= 0 {
-		if int64(len(f.Rows)) > rowLimit {
-			f.Rows = f.Rows[:rowLimit]
-		}
-	}
-	return f
-}
-
-func (f FakeDataFrame) Order(orderBy data.OrderBy) FakeDataFrame {
-	if orderBy.Column == "" {
-		return f
-	}
-	cIndex := utils.IndexOf(f.ColumnNames, orderBy.Column)
-	sort.Slice(f.Rows, func(i, j int) bool {
-		left := f.Rows[i][cIndex]
-		right := f.Rows[j][cIndex]
-		if iLeft, ok := left.(int); ok {
-			if orderBy.Order == data.Asc {
-				return iLeft < right.(int)
-			}
-			return iLeft > right.(int)
-		} else {
-			// we aren't a full db - revert to string order
-			sLeft := left.(string)
-			sRight := right.(string)
-			if orderBy.Order == data.Asc {
-				return sLeft < sRight
-			}
-			return sLeft > sRight
-		}
-	})
-	return f
-}
diff --git a/programs/diagnostics/internal/platform/test/env.go b/programs/diagnostics/internal/platform/test/env.go
deleted file mode 100644
index 36b03772ab0..00000000000
--- a/programs/diagnostics/internal/platform/test/env.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package test
-
-import "os"
-
-const defaultClickHouseVersion = "latest"
-
-func GetClickHouseTestVersion() string {
-	return GetEnv("CLICKHOUSE_VERSION", defaultClickHouseVersion)
-}
-
-func GetEnv(key, fallback string) string {
-	if value, ok := os.LookupEnv(key); ok {
-		return value
-	}
-	return fallback
-}
diff --git a/programs/diagnostics/internal/platform/utils/file.go b/programs/diagnostics/internal/platform/utils/file.go
deleted file mode 100644
index 71af4b32658..00000000000
--- a/programs/diagnostics/internal/platform/utils/file.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"io"
-	"io/fs"
-	"os"
-	"path/filepath"
-
-	"github.com/pkg/errors"
-)
-
-func FileExists(name string) (bool, error) {
-	f, err := os.Stat(name)
-	if err == nil {
-		if !f.IsDir() {
-			return true, nil
-		}
-		return false, fmt.Errorf("%s is a directory", name)
-	}
-	if errors.Is(err, os.ErrNotExist) {
-		return false, nil
-	}
-	return false, err
-}
-
-func DirExists(name string) (bool, error) {
-	f, err := os.Stat(name)
-	if err == nil {
-		if f.IsDir() {
-			return true, nil
-		}
-		return false, fmt.Errorf("%s is a file", name)
-	}
-	if errors.Is(err, os.ErrNotExist) {
-		return false, nil
-	}
-	return false, err
-}
-
-func CopyFile(sourceFilename string, destFilename string) error {
-	exists, err := FileExists(sourceFilename)
-	if err != nil {
-		return err
-	}
-	if !exists {
-		return fmt.Errorf("%s does not exist", sourceFilename)
-	}
-	source, err := os.Open(sourceFilename)
-	if err != nil {
-		return err
-	}
-	defer source.Close()
-	destDir := filepath.Dir(destFilename)
-	if err := os.MkdirAll(destDir, os.ModePerm); err != nil {
-		return errors.Wrapf(err, "unable to create directory %s", destDir)
-	}
-
-	destination, err := os.Create(destFilename)
-	if err != nil {
-		return err
-	}
-	defer destination.Close()
-	_, err = io.Copy(destination, source)
-	return err
-}
-
-// patterns passed are an OR - any can be satisfied and the file will be listed
-
-func ListFilesInDirectory(directory string, patterns []string) ([]string, []error) {
-	var files []string
-	exists, err := DirExists(directory)
-	if err != nil {
-		return files, []error{err}
-	}
-	if !exists {
-		return files, []error{fmt.Errorf("directory %s does not exist", directory)}
-	}
-	var pathErrors []error
-	_ = filepath.Walk(directory, func(path string, info fs.FileInfo, err error) error {
-		if err != nil {
-			pathErrors = append(pathErrors, err)
-		} else if !info.IsDir() {
-			for _, pattern := range patterns {
-				if matched, err := filepath.Match(pattern, filepath.Base(path)); err != nil {
-					pathErrors = append(pathErrors, err)
-				} else if matched {
-					files = append(files, path)
-				}
-			}
-		}
-		return nil
-	})
-	return files, pathErrors
-}
diff --git a/programs/diagnostics/internal/platform/utils/file_test.go b/programs/diagnostics/internal/platform/utils/file_test.go
deleted file mode 100644
index 8d0430090c9..00000000000
--- a/programs/diagnostics/internal/platform/utils/file_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package utils_test
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/stretchr/testify/require"
-)
-
-func TestFileExists(t *testing.T) {
-	t.Run("returns true for file", func(t *testing.T) {
-		tempDir := t.TempDir()
-		filepath := path.Join(tempDir, "random.txt")
-		_, err := os.Create(filepath)
-		require.Nil(t, err)
-		exists, err := utils.FileExists(filepath)
-		require.True(t, exists)
-		require.Nil(t, err)
-	})
-
-	t.Run("doesn't return true for not existence file", func(t *testing.T) {
-		tempDir := t.TempDir()
-		file := path.Join(tempDir, "random.txt")
-		exists, err := utils.FileExists(file)
-		require.False(t, exists)
-		require.Nil(t, err)
-	})
-
-	t.Run("doesn't return true for directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		exists, err := utils.FileExists(tempDir)
-		require.False(t, exists)
-		require.NotNil(t, err)
-		require.Equal(t, fmt.Sprintf("%s is a directory", tempDir), err.Error())
-	})
-}
-
-func TestDirExists(t *testing.T) {
-	t.Run("doesn't return true for file", func(t *testing.T) {
-		tempDir := t.TempDir()
-		filepath := path.Join(tempDir, "random.txt")
-		_, err := os.Create(filepath)
-		require.Nil(t, err)
-		exists, err := utils.DirExists(filepath)
-		require.False(t, exists)
-		require.NotNil(t, err)
-		require.Equal(t, fmt.Sprintf("%s is a file", filepath), err.Error())
-	})
-
-	t.Run("returns true for directory", func(t *testing.T) {
-		tempDir := t.TempDir()
-		exists, err := utils.DirExists(tempDir)
-		require.True(t, exists)
-		require.Nil(t, err)
-	})
-
-	t.Run("doesn't return true random directory", func(t *testing.T) {
-		exists, err := utils.FileExists(fmt.Sprintf("%d", utils.MakeTimestamp()))
-		require.False(t, exists)
-		require.Nil(t, err)
-	})
-}
-
-func TestCopyFile(t *testing.T) {
-	t.Run("can copy file", func(t *testing.T) {
-		tempDir := t.TempDir()
-		sourcePath := path.Join(tempDir, "random.txt")
-		_, err := os.Create(sourcePath)
-		require.Nil(t, err)
-		destPath := path.Join(tempDir, "random-2.txt")
-		err = utils.CopyFile(sourcePath, destPath)
-		require.Nil(t, err)
-	})
-
-	t.Run("can copy nested file", func(t *testing.T) {
-		tempDir := t.TempDir()
-		sourcePath := path.Join(tempDir, "random.txt")
-		_, err := os.Create(sourcePath)
-		require.Nil(t, err)
-		destPath := path.Join(tempDir, "sub_dir", "random-2.txt")
-		err = utils.CopyFile(sourcePath, destPath)
-		require.Nil(t, err)
-	})
-
-	t.Run("fails when file does not exist", func(t *testing.T) {
-		tempDir := t.TempDir()
-		sourcePath := path.Join(tempDir, "random.txt")
-		destPath := path.Join(tempDir, "random-2.txt")
-		err := utils.CopyFile(sourcePath, destPath)
-		require.NotNil(t, err)
-		require.Equal(t, fmt.Sprintf("%s does not exist", sourcePath), err.Error())
-	})
-}
-
-func TestListFilesInDirectory(t *testing.T) {
-	tempDir := t.TempDir()
-	files := make([]string, 5)
-	for i := 0; i < 5; i++ {
-		fileDir := path.Join(tempDir, fmt.Sprintf("%d", i))
-		err := os.MkdirAll(fileDir, os.ModePerm)
-		require.Nil(t, err)
-		ext := ".txt"
-		if i%2 == 0 {
-			ext = ".csv"
-		}
-		filepath := path.Join(fileDir, fmt.Sprintf("random-%d%s", i, ext))
-		files[i] = filepath
-		_, err = os.Create(filepath)
-		require.Nil(t, err)
-	}
-
-	t.Run("can list all files", func(t *testing.T) {
-		mFiles, errs := utils.ListFilesInDirectory(tempDir, []string{"*"})
-		require.Len(t, mFiles, 5)
-		require.Empty(t, errs)
-	})
-
-	t.Run("can list by extension", func(t *testing.T) {
-		mFiles, errs := utils.ListFilesInDirectory(tempDir, []string{"*.csv"})
-		require.Len(t, mFiles, 3)
-		require.Empty(t, errs)
-		require.ElementsMatch(t, []string{files[0], files[2], files[4]}, mFiles)
-	})
-
-	t.Run("can list on multiple extensions files", func(t *testing.T) {
-		mFiles, errs := utils.ListFilesInDirectory(tempDir, []string{"*.csv", "*.txt"})
-		require.Len(t, mFiles, 5)
-		require.Empty(t, errs)
-	})
-
-}
diff --git a/programs/diagnostics/internal/platform/utils/process.go b/programs/diagnostics/internal/platform/utils/process.go
deleted file mode 100644
index 7b27c215eea..00000000000
--- a/programs/diagnostics/internal/platform/utils/process.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package utils
-
-import (
-	"github.com/elastic/gosigar"
-	"strings"
-)
-
-func FindClickHouseProcesses() ([]gosigar.ProcArgs, error) {
-	pids := gosigar.ProcList{}
-	err := pids.Get()
-	if err != nil {
-		return nil, err
-	}
-	var clickhousePs []gosigar.ProcArgs
-	for _, pid := range pids.List {
-		args := gosigar.ProcArgs{}
-		if err := args.Get(pid); err != nil {
-			continue
-		}
-		if len(args.List) > 0 {
-			if strings.Contains(args.List[0], "clickhouse-server") {
-				clickhousePs = append(clickhousePs, args)
-			}
-		}
-	}
-	return clickhousePs, nil
-}
-
-func FindConfigsFromClickHouseProcesses() ([]string, error) {
-	clickhouseProcesses, err := FindClickHouseProcesses()
-	if err != nil {
-		return nil, err
-	}
-	var configs []string
-	if len(clickhouseProcesses) > 0 {
-		// we have candidate matches
-		for _, ps := range clickhouseProcesses {
-			for _, arg := range ps.List {
-				if strings.Contains(arg, "--config") {
-					configFile := strings.ReplaceAll(arg, "--config-file=", "")
-					// containers receive config with --config
-					configFile = strings.ReplaceAll(configFile, "--config=", "")
-					configs = append(configs, configFile)
-				}
-			}
-		}
-	}
-	return configs, err
-}
diff --git a/programs/diagnostics/internal/platform/utils/process_test.go b/programs/diagnostics/internal/platform/utils/process_test.go
deleted file mode 100644
index 9baaa559752..00000000000
--- a/programs/diagnostics/internal/platform/utils/process_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-//go:build !no_docker
-
-package utils_test
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-func getProcessesInContainer(t *testing.T, container testcontainers.Container) ([]string, error) {
-	result, reader, err := container.Exec(context.Background(), []string{"ps", "-aux"})
-	if err != nil {
-		return nil, err
-	}
-	require.Zero(t, result)
-	require.NotNil(t, reader)
-
-	b, err := io.ReadAll(reader)
-	if err != nil {
-		return nil, err
-	}
-	require.NotNil(t, b)
-
-	lines := strings.Split(string(b), "\n")
-
-	// discard PS header
-	return lines[1:], nil
-}
-
-func TestFindClickHouseProcessesAndConfigs(t *testing.T) {
-
-	t.Run("can find ClickHouse processes and configs", func(t *testing.T) {
-		// create a ClickHouse container
-		ctx := context.Background()
-		cwd, err := os.Getwd()
-		if err != nil {
-			fmt.Println("unable to read current directory", err)
-			os.Exit(1)
-		}
-
-		// run a ClickHouse container that guarantees that it runs only for the duration of the test
-		req := testcontainers.ContainerRequest{
-			Image:        fmt.Sprintf("clickhouse/clickhouse-server:%s", test.GetClickHouseTestVersion()),
-			ExposedPorts: []string{"9000/tcp"},
-			WaitingFor:   wait.ForLog("Ready for connections"),
-			Mounts: testcontainers.ContainerMounts{
-				{
-					Source: testcontainers.GenericBindMountSource{
-						HostPath: path.Join(cwd, "../../../testdata/docker/custom.xml"),
-					},
-					Target: "/etc/clickhouse-server/config.d/custom.xml",
-				},
-			},
-		}
-		clickhouseContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-			ContainerRequest: req,
-			Started:          true,
-		})
-		if err != nil {
-			// can't test without container
-			panic(err)
-		}
-
-		p, _ := clickhouseContainer.MappedPort(ctx, "9000")
-
-		t.Setenv("CLICKHOUSE_DB_PORT", p.Port())
-
-		defer clickhouseContainer.Terminate(ctx) //nolint
-
-		lines, err := getProcessesInContainer(t, clickhouseContainer)
-		require.Nil(t, err)
-		require.NotEmpty(t, lines)
-
-		for _, line := range lines {
-			parts := strings.Fields(line)
-			if len(parts) < 11 {
-				continue
-			}
-			if !strings.Contains(parts[10], "clickhouse-server") {
-				continue
-			}
-
-			require.Equal(t, "/usr/bin/clickhouse-server", parts[10])
-			require.Equal(t, "--config-file=/etc/clickhouse-server/config.xml", parts[11])
-		}
-	})
-}
diff --git a/programs/diagnostics/internal/platform/utils/slices.go b/programs/diagnostics/internal/platform/utils/slices.go
deleted file mode 100644
index cf5a5f97ce8..00000000000
--- a/programs/diagnostics/internal/platform/utils/slices.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package utils
-
-// Intersection of elements in s1 and s2
-func Intersection(s1, s2 []string) (inter []string) {
-	hash := make(map[string]bool)
-	for _, e := range s1 {
-		hash[e] = false
-	}
-	for _, e := range s2 {
-		// If elements present in the hashmap then append intersection list.
-		if val, ok := hash[e]; ok {
-			if !val {
-				// only add once
-				inter = append(inter, e)
-				hash[e] = true
-			}
-		}
-	}
-	return inter
-}
-
-// Distinct returns elements in s1, not in s2
-func Distinct(s1, s2 []string) (distinct []string) {
-	hash := make(map[string]bool)
-	for _, e := range s2 {
-		hash[e] = true
-	}
-	for _, e := range s1 {
-		if _, ok := hash[e]; !ok {
-			distinct = append(distinct, e)
-		}
-	}
-	return distinct
-}
-
-// Unique func Unique(s1 []string) (unique []string) returns unique elements in s1
-func Unique(s1 []string) (unique []string) {
-	hash := make(map[string]bool)
-	for _, e := range s1 {
-		if _, ok := hash[e]; !ok {
-			unique = append(unique, e)
-		}
-		hash[e] = true
-	}
-	return unique
-}
-
-func Contains(s []string, e string) bool {
-	for _, a := range s {
-		if a == e {
-			return true
-		}
-	}
-	return false
-}
-
-func IndexOf(s []string, e string) int {
-	for i, a := range s {
-		if a == e {
-			return i
-		}
-	}
-	return -1
-}
-
-func Remove(slice []interface{}, s int) []interface{} {
-	return append(slice[:s], slice[s+1:]...)
-}
diff --git a/programs/diagnostics/internal/platform/utils/slices_test.go b/programs/diagnostics/internal/platform/utils/slices_test.go
deleted file mode 100644
index ea5c1c81dcc..00000000000
--- a/programs/diagnostics/internal/platform/utils/slices_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package utils_test
-
-import (
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/stretchr/testify/require"
-)
-
-func TestIntersection(t *testing.T) {
-	t.Run("can perform intersection", func(t *testing.T) {
-		setA := []string{"A", "b", "C", "D", "E"}
-		setB := []string{"A", "B", "F", "C", "G"}
-		setC := utils.Intersection(setA, setB)
-		require.Len(t, setC, 2)
-		require.ElementsMatch(t, []string{"A", "C"}, setC)
-	})
-}
-
-func TestDistinct(t *testing.T) {
-	t.Run("can perform distinct", func(t *testing.T) {
-		setA := []string{"A", "b", "C", "D", "E"}
-		setB := []string{"A", "B", "F", "C", "G"}
-		setC := utils.Distinct(setA, setB)
-		require.Len(t, setC, 3)
-		require.ElementsMatch(t, []string{"b", "D", "E"}, setC)
-	})
-
-	t.Run("can perform distinct on empty", func(t *testing.T) {
-		setA := []string{"A", "b", "C", "D", "E"}
-		var setB []string
-		setC := utils.Distinct(setA, setB)
-		require.Len(t, setC, 5)
-		require.ElementsMatch(t, []string{"A", "b", "C", "D", "E"}, setC)
-	})
-}
-
-func TestContains(t *testing.T) {
-	t.Run("can perform contains", func(t *testing.T) {
-		setA := []string{"A", "b", "C", "D", "E"}
-		require.True(t, utils.Contains(setA, "A"))
-		require.True(t, utils.Contains(setA, "b"))
-		require.True(t, utils.Contains(setA, "C"))
-		require.True(t, utils.Contains(setA, "D"))
-		require.True(t, utils.Contains(setA, "E"))
-		require.False(t, utils.Contains(setA, "B"))
-	})
-}
-
-func TestUnique(t *testing.T) {
-
-	t.Run("can perform unique", func(t *testing.T) {
-		setA := []string{"A", "b", "D", "D", "E", "E", "A"}
-		setC := utils.Unique(setA)
-		require.Len(t, setC, 4)
-		require.ElementsMatch(t, []string{"A", "b", "D", "E"}, setC)
-	})
-
-	t.Run("can perform unique on empty", func(t *testing.T) {
-		var setA []string
-		setC := utils.Unique(setA)
-		require.Len(t, setC, 0)
-	})
-}
diff --git a/programs/diagnostics/internal/platform/utils/time.go b/programs/diagnostics/internal/platform/utils/time.go
deleted file mode 100644
index 622e92b873a..00000000000
--- a/programs/diagnostics/internal/platform/utils/time.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package utils
-
-import "time"
-
-func MakeTimestamp() int64 {
-	return time.Now().UnixNano() / int64(time.Millisecond)
-}
diff --git a/programs/diagnostics/internal/runner.go b/programs/diagnostics/internal/runner.go
deleted file mode 100644
index 9386a1d178b..00000000000
--- a/programs/diagnostics/internal/runner.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package internal
-
-import (
-	c "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	o "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/data"
-	"github.com/pkg/errors"
-	"github.com/rs/zerolog/log"
-)
-
-type runConfiguration struct {
-	id               string
-	host             string
-	port             uint16
-	username         string
-	password         string
-	output           string
-	collectors       []string
-	collectorConfigs map[string]config.Configuration
-	outputConfig     config.Configuration
-}
-
-func NewRunConfiguration(id string, host string, port uint16, username string, password string, output string, outputConfig config.Configuration,
-	collectors []string, collectorConfigs map[string]config.Configuration) *runConfiguration {
-	config := runConfiguration{
-		id:               id,
-		host:             host,
-		port:             port,
-		username:         username,
-		password:         password,
-		collectors:       collectors,
-		output:           output,
-		collectorConfigs: collectorConfigs,
-		outputConfig:     outputConfig,
-	}
-	return &config
-}
-
-func Capture(config *runConfiguration) {
-	bundles, err := collect(config)
-	if err != nil {
-		log.Fatal().Err(err).Msg("unable to perform collection")
-	}
-	log.Info().Msgf("collectors initialized")
-	if err = output(config, bundles); err != nil {
-		log.Fatal().Err(err).Msg("unable to create output")
-	}
-	log.Info().Msgf("bundle export complete")
-}
-
-func collect(config *runConfiguration) (map[string]*data.DiagnosticBundle, error) {
-	resourceManager := platform.GetResourceManager()
-	err := resourceManager.Connect(config.host, config.port, config.username, config.password)
-	if err != nil {
-		// if we can't connect this is fatal
-		log.Fatal().Err(err).Msg("Unable to connect to database")
-	}
-	//grab the required connectors - we pass what we can
-	bundles := make(map[string]*data.DiagnosticBundle)
-	log.Info().Msgf("connection established")
-	//these store our collection errors and will be output in the bundle
-	var collectorErrors [][]interface{}
-	for _, collectorName := range config.collectors {
-		collectorConfig := config.collectorConfigs[collectorName]
-		log.Info().Msgf("initializing %s collector", collectorName)
-		collector, err := c.GetCollectorByName(collectorName)
-		if err != nil {
-			log.Error().Err(err).Msgf("Unable to fetch collector %s", collectorName)
-			collectorErrors = append(collectorErrors, []interface{}{err.Error()})
-			continue
-		}
-		bundle, err := collector.Collect(collectorConfig)
-		if err != nil {
-			log.Error().Err(err).Msgf("Error in collector %s", collectorName)
-			collectorErrors = append(collectorErrors, []interface{}{err.Error()})
-			// this indicates a fatal error in the collector
-			continue
-		}
-		for _, fError := range bundle.Errors.Errors {
-			err = errors.Wrapf(fError, "Failure to collect frame in collector %s", collectorName)
-			collectorErrors = append(collectorErrors, []interface{}{err.Error()})
-			log.Warn().Msg(err.Error())
-		}
-		bundles[collectorName] = bundle
-	}
-	bundles["diag_trace"] = buildTraceBundle(collectorErrors)
-	return bundles, nil
-}
-
-func output(config *runConfiguration, bundles map[string]*data.DiagnosticBundle) error {
-	log.Info().Msgf("attempting to export bundle using %s output...", config.output)
-	output, err := o.GetOutputByName(config.output)
-	if err != nil {
-		return err
-	}
-	frameErrors, err := output.Write(config.id, bundles, config.outputConfig)
-	// we report over failing hard on frame errors - up to the output to determine what is fatal via error
-	for _, fError := range frameErrors.Errors {
-		log.Warn().Msgf("failure to write frame in output %s - %s", config.output, fError)
-	}
-	return err
-}
-
-func buildTraceBundle(collectorErrors [][]interface{}) *data.DiagnosticBundle {
-	errorBundle := data.DiagnosticBundle{
-		Frames: map[string]data.Frame{
-			"errors": data.NewMemoryFrame("errors", []string{"errors"}, collectorErrors),
-		},
-		Errors: data.FrameErrors{},
-	}
-	// add any other metrics from collection
-	return &errorBundle
-}
diff --git a/programs/diagnostics/internal/runner_test.go b/programs/diagnostics/internal/runner_test.go
deleted file mode 100644
index 2369f8b3007..00000000000
--- a/programs/diagnostics/internal/runner_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-//go:build !no_docker
-
-package internal_test
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/clickhouse"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/collectors/system"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs"
-	_ "github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/outputs/file"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/config"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/test"
-	"github.com/ClickHouse/ClickHouse/programs/diagnostics/internal/platform/utils"
-	"github.com/stretchr/testify/require"
-	"github.com/testcontainers/testcontainers-go"
-	"github.com/testcontainers/testcontainers-go/wait"
-)
-
-// Execute a full default capture, with simple output, and check if a bundle is produced and it's not empty
-func TestCapture(t *testing.T) {
-	// create a ClickHouse container
-	ctx := context.Background()
-	cwd, err := os.Getwd()
-
-	if err != nil {
-		// can't test without container
-		panic(err)
-	}
-	// for now, we test against a hardcoded database-server version but we should make this a property
-	req := testcontainers.ContainerRequest{
-		Image:        fmt.Sprintf("clickhouse/clickhouse-server:%s", test.GetClickHouseTestVersion()),
-		ExposedPorts: []string{"9000/tcp"},
-		WaitingFor:   wait.ForLog("Ready for connections"),
-		Mounts: testcontainers.ContainerMounts{
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../testdata/docker/custom.xml"),
-				},
-				Target: "/etc/clickhouse-server/config.d/custom.xml",
-			},
-			{
-				Source: testcontainers.GenericBindMountSource{
-					HostPath: path.Join(cwd, "../testdata/docker/admin.xml"),
-				},
-				Target: "/etc/clickhouse-server/users.d/admin.xml",
-			},
-		},
-	}
-	clickhouseContainer, err := testcontainers.GenericContainer(ctx, testcontainers.GenericContainerRequest{
-		ContainerRequest: req,
-		Started:          true,
-	})
-	if err != nil {
-		// can't test without container
-		panic(err)
-	}
-
-	p, _ := clickhouseContainer.MappedPort(ctx, "9000")
-
-	t.Setenv("CLICKHOUSE_DB_PORT", p.Port())
-	defer clickhouseContainer.Terminate(ctx) //nolint
-
-	tmrDir := t.TempDir()
-	port := p.Int()
-
-	// test a simple output exists
-	_, err = outputs.GetOutputByName("simple")
-	require.Nil(t, err)
-	// this relies on the simple out not changing its params - test will likely fail if so
-	outputConfig := config.Configuration{
-		Params: []config.ConfigParam{
-			config.StringParam{
-				Value: tmrDir,
-				Param: config.NewParam("directory", "Directory in which to create dump. Defaults to the current directory.", false),
-			},
-			config.StringOptions{
-				Value:   "csv",
-				Options: []string{"csv"},
-				Param:   config.NewParam("format", "Format of exported files", false),
-			},
-			config.BoolParam{
-				Value: true,
-				Param: config.NewParam("skip_archive", "Don't compress output to an archive", false),
-			},
-		},
-	}
-	// test default collectors
-	collectorNames := collectors.GetCollectorNames(true)
-	// grab all configs - only default will be used because of collectorNames
-	collectorConfigs, err := collectors.BuildConfigurationOptions()
-	require.Nil(t, err)
-	conf := internal.NewRunConfiguration("random", "localhost", uint16(port), "", "", "simple", outputConfig, collectorNames, collectorConfigs)
-	internal.Capture(conf)
-	outputDir := path.Join(tmrDir, "random")
-	_, err = os.Stat(outputDir)
-	require.Nil(t, err)
-	require.True(t, !os.IsNotExist(err))
-	files, err := ioutil.ReadDir(outputDir)
-	require.Nil(t, err)
-	require.Len(t, files, 1)
-	outputDir = path.Join(outputDir, files[0].Name())
-	// check we have a folder per collector i.e. collectorNames + diag_trace
-	files, err = ioutil.ReadDir(outputDir)
-	require.Nil(t, err)
-	require.Len(t, files, len(collectorNames)+1)
-	expectedFolders := append(collectorNames, "diag_trace")
-	for _, file := range files {
-		require.True(t, file.IsDir())
-		utils.Contains(expectedFolders, file.Name())
-	}
-	// we don't test the specific collector outputs but make sure something was written to system
-	systemFolder := path.Join(outputDir, "system")
-	files, err = ioutil.ReadDir(systemFolder)
-	require.Nil(t, err)
-	require.Greater(t, len(files), 0)
-	// test diag_trace
-	diagFolder := path.Join(outputDir, "diag_trace")
-	files, err = ioutil.ReadDir(diagFolder)
-	require.Nil(t, err)
-	require.Equal(t, 1, len(files))
-	require.FileExists(t, path.Join(diagFolder, "errors.csv"))
-}
diff --git a/programs/diagnostics/testdata/configs/include/xml/server-include.xml b/programs/diagnostics/testdata/configs/include/xml/server-include.xml
deleted file mode 100644
index 30e6587c935..00000000000
--- a/programs/diagnostics/testdata/configs/include/xml/server-include.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<clickhouse>
-    <network_max>5000000</network_max>
-    <test_profile>
-        <test_p>
-        </test_p>
-    </test_profile>
-    <pg_port>9008</pg_port>
-</clickhouse>
\ No newline at end of file
diff --git a/programs/diagnostics/testdata/configs/include/xml/user-include.xml b/programs/diagnostics/testdata/configs/include/xml/user-include.xml
deleted file mode 100644
index b12b34a56bb..00000000000
--- a/programs/diagnostics/testdata/configs/include/xml/user-include.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<clickhouse>
-    <test_user>
-        <networks>
-            <ip>::/0</ip>
-        </networks>
-        <profile>default</profile>
-        <quota>default</quota>
-        <password_sha256_hex>REPLACE_ME</password_sha256_hex>
-        <access_management>1</access_management>
-    </test_user>
-    <another_user>
-        <networks>
-            <ip>::/0</ip>
-        </networks>
-        <profile>default</profile>
-        <quota>default</quota>
-        <passwird>REPLACE_ME</passwird>
-        <access_management>1</access_management>
-    </another_user>
-</clickhouse>
diff --git a/programs/diagnostics/testdata/configs/include/yaml/server-include.yaml b/programs/diagnostics/testdata/configs/include/yaml/server-include.yaml
deleted file mode 100644
index 903d7b6f733..00000000000
--- a/programs/diagnostics/testdata/configs/include/yaml/server-include.yaml
+++ /dev/null
@@ -1 +0,0 @@
-network_max: 5000000
diff --git a/programs/diagnostics/testdata/configs/include/yaml/user-include.yaml b/programs/diagnostics/testdata/configs/include/yaml/user-include.yaml
deleted file mode 100644
index 23b592507fa..00000000000
--- a/programs/diagnostics/testdata/configs/include/yaml/user-include.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-test_user:
-  password: 'REPLACE_ME'
-  networks:
-    ip: '::/0'
-  profile: default
-  quota: default
-  access_management: 1
diff --git a/programs/diagnostics/testdata/configs/xml/config.xml b/programs/diagnostics/testdata/configs/xml/config.xml
deleted file mode 100644
index ae09d207091..00000000000
--- a/programs/diagnostics/testdata/configs/xml/config.xml
+++ /dev/null
@@ -1,1195 +0,0 @@
-<!--
-  NOTE: User and query level settings are set up in "users.xml" file.
-  If you have accidentally specified user-level settings here, server won't start.
-  You can either move the settings to the right place inside "users.xml" file
-   or add <skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings> here.
--->
-<clickhouse>
-    <include_from>../include/xml/server-include.xml</include_from>
-    <logger>
-        <!-- Possible levels [1]:
-
-          - none (turns off logging)
-          - fatal
-          - critical
-          - error
-          - warning
-          - notice
-          - information
-          - debug
-          - trace
-          - test (not for production usage)
-
-            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
-        -->
-        <level>trace</level>
-        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
-        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
-        <!-- Rotation policy
-             See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
-          -->
-        <size>1000M</size>
-        <count>10</count>
-        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
-
-        <!-- Per level overrides (legacy):
-
-        For example to suppress logging of the ConfigReloader you can use:
-        NOTE: levels.logger is reserved, see below.
-        -->
-        <!--
-        <levels>
-          <ConfigReloader>none</ConfigReloader>
-        </levels>
-        -->
-
-        <!-- Per level overrides:
-
-        For example to suppress logging of the RBAC for default user you can use:
-        (But please note that the logger name maybe changed from version to version, even after minor upgrade)
-        -->
-        <!--
-        <levels>
-          <logger>
-            <name>ContextAccess (default)</name>
-            <level>none</level>
-          </logger>
-          <logger>
-            <name>DatabaseOrdinary (test)</name>
-            <level>none</level>
-          </logger>
-        </levels>
-        -->
-    </logger>
-    <!-- Add headers to response in options request. OPTIONS method is used in CORS preflight requests. -->
-    <!-- It is off by default. Next headers are obligate for CORS.-->
-    <!-- http_options_response>
-        <header>
-            <name>Access-Control-Allow-Origin</name>
-            <value>*</value>
-        </header>
-        <header>
-            <name>Access-Control-Allow-Headers</name>
-            <value>origin, x-requested-with</value>
-        </header>
-        <header>
-            <name>Access-Control-Allow-Methods</name>
-            <value>POST, GET, OPTIONS</value>
-        </header>
-        <header>
-            <name>Access-Control-Max-Age</name>
-            <value>86400</value>
-        </header>
-    </http_options_response -->
-
-    <!-- It is the name that will be shown in the clickhouse-client.
-         By default, anything with "production" will be highlighted in red in query prompt.
-    -->
-    <!--display_name>production</display_name-->
-
-    <!-- Port for HTTP API. See also 'https_port' for secure connections.
-         This interface is also used by ODBC and JDBC drivers (DataGrip, Dbeaver, ...)
-         and by most of web interfaces (embedded UI, Grafana, Redash, ...).
-      -->
-    <http_port>8123</http_port>
-
-    <!-- Port for interaction by native protocol with:
-         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
-         - clickhouse-server with other clickhouse-servers for distributed query processing;
-         - ClickHouse drivers and applications supporting native protocol
-         (this protocol is also informally called as "the TCP protocol");
-         See also 'tcp_port_secure' for secure connections.
-    -->
-    <tcp_port>9000</tcp_port>
-
-    <!-- Compatibility with MySQL protocol.
-         ClickHouse will pretend to be MySQL for applications connecting to this port.
-    -->
-    <mysql_port>9004</mysql_port>
-
-    <!-- Compatibility with PostgreSQL protocol.
-         ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
-    -->
-    <postgresql_port>9005</postgresql_port>
-
-    <!-- HTTP API with TLS (HTTPS).
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-    -->
-    <!-- <https_port>8443</https_port> -->
-
-    <!-- Native interface with TLS.
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-    -->
-    <!-- <tcp_port_secure>9440</tcp_port_secure> -->
-
-    <!-- Native interface wrapped with PROXYv1 protocol
-         PROXYv1 header sent for every connection.
-         ClickHouse will extract information about proxy-forwarded client address from the header.
-    -->
-    <!-- <tcp_with_proxy_port>9011</tcp_with_proxy_port> -->
-
-    <!-- Port for communication between replicas. Used for data exchange.
-         It provides low-level data access between servers.
-         This port should not be accessible from untrusted networks.
-         See also 'interserver_http_credentials'.
-         Data transferred over connections to this port should not go through untrusted networks.
-         See also 'interserver_https_port'.
-      -->
-    <interserver_http_port>9009</interserver_http_port>
-
-    <!-- Port for communication between replicas with TLS.
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-         See also 'interserver_http_credentials'.
-      -->
-    <!-- <interserver_https_port>9010</interserver_https_port> -->
-
-    <!-- Hostname that is used by other replicas to request this server.
-         If not specified, than it is determined analogous to 'hostname -f' command.
-         This setting could be used to switch replication to another network interface
-         (the server may be connected to multiple networks via multiple addresses)
-      -->
-    <!--
-    <interserver_http_host>example.yandex.ru</interserver_http_host>
-    -->
-
-    <!-- You can specify credentials for authenthication between replicas.
-         This is required when interserver_https_port is accessible from untrusted networks,
-         and also recommended to avoid SSRF attacks from possibly compromised services in your network.
-      -->
-    <!--<interserver_http_credentials>
-        <user>interserver</user>
-        <password></password>
-    </interserver_http_credentials>-->
-
-    <!-- Listen specified address.
-         Use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere.
-         Notes:
-         If you open connections from wildcard address, make sure that at least one of the following measures applied:
-         - server is protected by firewall and not accessible from untrusted networks;
-         - all users are restricted to subset of network addresses (see users.xml);
-         - all users have strong passwords, only secure (TLS) interfaces are accessible, or connections are only made via TLS interfaces.
-         - users without password have readonly access.
-         See also: https://www.shodan.io/search?query=clickhouse
-      -->
-    <!-- <listen_host>::</listen_host> -->
-
-    <!-- Same for hosts without support for IPv6: -->
-    <!-- <listen_host>0.0.0.0</listen_host> -->
-
-    <!-- Default values - try listen localhost on IPv4 and IPv6. -->
-    <!--
-    <listen_host>::1</listen_host>
-    <listen_host>127.0.0.1</listen_host>
-    -->
-
-    <!-- Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen. -->
-    <!-- <listen_try>0</listen_try> -->
-
-    <!-- Allow multiple servers to listen on the same address:port. This is not recommended.
-      -->
-    <!-- <listen_reuse_port>0</listen_reuse_port> -->
-
-    <!-- <listen_backlog>4096</listen_backlog> -->
-
-    <max_connections>4096</max_connections>
-
-    <!-- For 'Connection: keep-alive' in HTTP 1.1 -->
-    <keep_alive_timeout>3</keep_alive_timeout>
-
-    <!-- gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API) -->
-    <!-- <grpc_port>9100</grpc_port> -->
-    <grpc>
-        <enable_ssl>false</enable_ssl>
-
-        <!-- The following two files are used only if enable_ssl=1 -->
-        <ssl_cert_file>/path/to/ssl_cert_file</ssl_cert_file>
-        <ssl_key_file>/path/to/ssl_key_file</ssl_key_file>
-
-        <!-- Whether server will request client for a certificate -->
-        <ssl_require_client_auth>false</ssl_require_client_auth>
-
-        <!-- The following file is used only if ssl_require_client_auth=1 -->
-        <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
-
-        <!-- Default compression algorithm (applied if client doesn't specify another algorithm, see result_compression in QueryInfo).
-             Supported algorithms: none, deflate, gzip, stream_gzip -->
-        <compression>deflate</compression>
-
-        <!-- Default compression level (applied if client doesn't specify another level, see result_compression in QueryInfo).
-             Supported levels: none, low, medium, high -->
-        <compression_level>medium</compression_level>
-
-        <!-- Send/receive message size limits in bytes. -1 means unlimited -->
-        <max_send_message_size>-1</max_send_message_size>
-        <max_receive_message_size>-1</max_receive_message_size>
-
-        <!-- Enable if you want very detailed logs -->
-        <verbose_logs>false</verbose_logs>
-    </grpc>
-
-    <!-- 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/server.crt</certificateFile>
-            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
-            <!-- dhparams are optional. You can delete the <dhParamsFile> element.
-                 To generate dhparams, use the following command:
-                  openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096
-                 Only file format with BEGIN DH PARAMETERS is supported.
-              -->
-            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
-            <verificationMode>none</verificationMode>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-        </server>
-
-        <client> <!-- Used for connecting to https dictionary source and secured Zookeeper communication -->
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
-            <invalidCertificateHandler>
-                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
-                <name>RejectCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-
-    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
-    <!--
-    <http_server_default_response><![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>
-    -->
-
-    <!-- Maximum number of concurrent queries. -->
-    <max_concurrent_queries>100</max_concurrent_queries>
-
-    <!-- Maximum memory usage (resident set size) for server process.
-         Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.
-         If the value is larger than "max_server_memory_usage_to_ram_ratio" of available physical RAM, it will be cut down.
-
-         The constraint is checked on query execution time.
-         If a query tries to allocate memory and the current memory usage plus allocation is greater
-          than specified threshold, exception will be thrown.
-
-         It is not practical to set this constraint to small values like just a few gigabytes,
-          because memory allocator will keep this amount of memory in caches and the server will deny service of queries.
-      -->
-    <max_server_memory_usage>0</max_server_memory_usage>
-
-    <!-- Maximum number of threads in the Global thread pool.
-    This will default to a maximum of 10000 threads if not specified.
-    This setting will be useful in scenarios where there are a large number
-    of distributed queries that are running concurrently but are idling most
-    of the time, in which case a higher number of threads might be required.
-    -->
-
-    <max_thread_pool_size>10000</max_thread_pool_size>
-
-    <!-- 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>
-
-    <!-- Simple server-wide memory profiler. Collect a stack trace at every peak allocation step (in bytes).
-         Data will be stored in system.trace_log table with query_id = empty string.
-         Zero means disabled.
-      -->
-    <total_memory_profiler_step>4194304</total_memory_profiler_step>
-
-    <!-- Collect random allocations and deallocations and write them into system.trace_log with 'MemorySample' trace_type.
-         The probability is for every alloc/free regardless to the size of the allocation.
-         Note that sampling happens only when the amount of untracked memory exceeds the untracked memory limit,
-          which is 4 MiB by default but can be lowered if 'total_memory_profiler_step' is lowered.
-         You may want to set 'total_memory_profiler_step' to 1 for extra fine grained sampling.
-      -->
-    <total_memory_tracker_sample_probability>0</total_memory_tracker_sample_probability>
-
-    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
-         correct maximum value. -->
-    <!-- <max_open_files>262144</max_open_files> -->
-
-    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
-         In bytes. Cache is single for server. Memory is allocated only on demand.
-         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
-         Uncompressed cache is advantageous only for very short queries and in rare cases.
-
-         Note: uncompressed cache can be pointless for lz4, because memory bandwidth
-         is slower than multi-core decompression on some server configurations.
-         Enabling it can sometimes paradoxically make queries slower.
-      -->
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-
-    <!-- Approximate size of mark cache, used in tables of MergeTree family.
-         In bytes. Cache is single for server. Memory is allocated only on demand.
-         You should not lower this value.
-      -->
-    <mark_cache_size>5368709120</mark_cache_size>
-
-
-    <!-- If you enable the `min_bytes_to_use_mmap_io` setting,
-         the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
-         It makes sense only for large files and helps only if data reside in page cache.
-         To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
-         and to reuse mappings from several threads and queries,
-         the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
-         The amount of data in mapped files can be monitored
-         in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
-         and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
-         and also in system.events, system.processes, system.query_log, system.query_thread_log, system.query_views_log by the
-         CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
-         Note that the amount of data in mapped files does not consume memory directly and is not accounted
-         in query or server memory usage - because this memory can be discarded similar to OS page cache.
-         The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
-         also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
-      -->
-    <mmap_cache_size>1000</mmap_cache_size>
-
-    <!-- Cache size in bytes for compiled expressions.-->
-    <compiled_expression_cache_size>134217728</compiled_expression_cache_size>
-
-    <!-- Cache size in elements for compiled expressions.-->
-    <compiled_expression_cache_elements_size>10000</compiled_expression_cache_elements_size>
-
-    <!-- Path to data directory, with trailing slash. -->
-    <path>/var/lib/clickhouse/</path>
-
-    <!-- Path to temporary data for processing hard queries. -->
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-
-    <!-- Policy from the <storage_configuration> for the temporary files.
-         If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
-
-         Notes:
-         - move_factor              is ignored
-         - keep_free_space_bytes    is ignored
-         - max_data_part_size_bytes is ignored
-         - you must have exactly one volume in that policy
-    -->
-    <!-- <tmp_policy>tmp</tmp_policy> -->
-
-    <!-- Directory with user provided files that are accessible by 'file' table function. -->
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-
-    <!-- LDAP server definitions. -->
-    <ldap_servers>
-        <!-- List LDAP servers with their connection parameters here to later 1) use them as authenticators for dedicated local users,
-              who have 'ldap' authentication mechanism specified instead of 'password', or to 2) use them as remote user directories.
-             Parameters:
-                host - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
-                port - LDAP server port, default is 636 if enable_tls is set to true, 389 otherwise.
-                bind_dn - template used to construct the DN to bind to.
-                        The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
-                         user name during each authentication attempt.
-                user_dn_detection - section with LDAP search parameters for detecting the actual user DN of the bound user.
-                        This is mainly used in search filters for further role mapping when the server is Active Directory. The
-                         resulting user DN will be used when replacing '{user_dn}' substrings wherever they are allowed. By default,
-                         user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected
-                         user DN value.
-                    base_dn - template used to construct the base DN for the LDAP search.
-                            The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
-                             of the template with the actual user name and bind DN during the LDAP search.
-                    scope - scope of the LDAP search.
-                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-                    search_filter - template used to construct the search filter for the LDAP search.
-                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
-                             substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
-                            Note, that the special characters must be escaped properly in XML.
-                verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
-                         to be successfully authenticated for all consecutive requests without contacting the LDAP server.
-                        Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
-                enable_tls - flag to trigger use of secure connection to the LDAP server.
-                        Specify 'no' for plain text (ldap://) protocol (not recommended).
-                        Specify 'yes' for LDAP over SSL/TLS (ldaps://) protocol (recommended, the default).
-                        Specify 'starttls' for legacy StartTLS protocol (plain text (ldap://) protocol, upgraded to TLS).
-                tls_minimum_protocol_version - the minimum protocol version of SSL/TLS.
-                        Accepted values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2' (the default).
-                tls_require_cert - SSL/TLS peer certificate verification behavior.
-                        Accepted values are: 'never', 'allow', 'try', 'demand' (the default).
-                tls_cert_file - path to certificate file.
-                tls_key_file - path to certificate key file.
-                tls_ca_cert_file - path to CA certificate file.
-                tls_ca_cert_dir - path to the directory containing CA certificates.
-                tls_cipher_suite - allowed cipher suite (in OpenSSL notation).
-             Example:
-                <my_ldap_server>
-                    <host>localhost</host>
-                    <port>636</port>
-                    <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>
-                    <verification_cooldown>300</verification_cooldown>
-                    <enable_tls>yes</enable_tls>
-                    <tls_minimum_protocol_version>tls1.2</tls_minimum_protocol_version>
-                    <tls_require_cert>demand</tls_require_cert>
-                    <tls_cert_file>/path/to/tls_cert_file</tls_cert_file>
-                    <tls_key_file>/path/to/tls_key_file</tls_key_file>
-                    <tls_ca_cert_file>/path/to/tls_ca_cert_file</tls_ca_cert_file>
-                    <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
-                    <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
-                </my_ldap_server>
-             Example (typical Active Directory with configured user DN detection for further role mapping):
-                <my_ad_server>
-                    <host>localhost</host>
-                    <port>389</port>
-                    <bind_dn>EXAMPLE\{user_name}</bind_dn>
-                    <user_dn_detection>
-                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
-                        <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
-                    </user_dn_detection>
-                    <enable_tls>no</enable_tls>
-                </my_ad_server>
-        -->
-    </ldap_servers>
-
-    <!-- To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
-          to authenticate via Kerberos, define a single 'kerberos' section here.
-         Parameters:
-            principal - canonical service principal name, that will be acquired and used when accepting security contexts.
-                    This parameter is optional, if omitted, the default principal will be used.
-                    This parameter cannot be specified together with 'realm' parameter.
-            realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
-                    This parameter is optional, if omitted, no additional filtering by realm will be applied.
-                    This parameter cannot be specified together with 'principal' parameter.
-         Example:
-            <kerberos />
-         Example:
-            <kerberos>
-                <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
-            </kerberos>
-         Example:
-            <kerberos>
-                <realm>EXAMPLE.COM</realm>
-            </kerberos>
-    -->
-
-    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
-    <user_directories>
-        <users_xml>
-            <!-- Path to configuration file with predefined users. -->
-            <path>users.xml</path>
-        </users_xml>
-        <local_directory>
-            <!-- Path to folder where users created by SQL commands are stored. -->
-            <path>/var/lib/clickhouse/access/</path>
-        </local_directory>
-
-        <!-- To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
-              with the following parameters:
-                server - one of LDAP server names defined in 'ldap_servers' config section above.
-                        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 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
-                         CREATE ROLE command.
-                        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.
-                    scope - scope of the LDAP search.
-                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-                    search_filter - template used to construct the search filter for the LDAP search.
-                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', '{user_dn}', and
-                             '{base_dn}' substrings of the template with the actual user name, bind DN, user DN, and base DN during
-                             each LDAP search.
-                            Note, that the special characters must be escaped properly in XML.
-                    attribute - attribute name whose values will be returned by the LDAP search. 'cn', by default.
-                    prefix - prefix, that will be expected to be in front of each string in the original list of strings returned by
-                             the LDAP search. Prefix will be removed from the original strings and resulting strings will be treated
-                             as local role names. Empty, by default.
-             Example:
-                <ldap>
-                    <server>my_ldap_server</server>
-                    <roles>
-                        <my_local_role1 />
-                        <my_local_role2 />
-                    </roles>
-                    <role_mapping>
-                        <base_dn>ou=groups,dc=example,dc=com</base_dn>
-                        <scope>subtree</scope>
-                        <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
-                        <attribute>cn</attribute>
-                        <prefix>clickhouse_</prefix>
-                    </role_mapping>
-                </ldap>
-             Example (typical Active Directory with role mapping that relies on the detected user DN):
-                <ldap>
-                    <server>my_ad_server</server>
-                    <role_mapping>
-                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
-                        <attribute>CN</attribute>
-                        <scope>subtree</scope>
-                        <search_filter>(&amp;(objectClass=group)(member={user_dn}))</search_filter>
-                        <prefix>clickhouse_</prefix>
-                    </role_mapping>
-                </ldap>
-        -->
-    </user_directories>
-
-    <!-- Default profile of settings. -->
-    <default_profile>default</default_profile>
-
-    <!-- Comma-separated list of prefixes for user-defined settings. -->
-    <custom_settings_prefixes></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> -->
-
-    <!-- Buffer profile of settings.
-         This settings are used by Buffer storage to flush data to the underlying table.
-         Default: used from system_profile directive.
-    -->
-    <!-- <buffer_profile>default</buffer_profile> -->
-
-    <!-- Default database. -->
-    <default_database>default</default_database>
-
-    <!-- Server time zone could be set here.
-
-         Time zone is used when converting between String and DateTime types,
-          when printing DateTime in text formats and parsing DateTime from text,
-          it is used in date and time related functions, if specific time zone was not passed as an argument.
-
-         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
-         If not specified, system time zone at server startup is used.
-
-         Please note, that server could display time zone alias instead of specified name.
-         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
-    -->
-    <!-- <timezone>Europe/Moscow</timezone> -->
-
-    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
-         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
-    -->
-    <!-- <umask>022</umask> -->
-
-    <!-- Perform mlockall after startup to lower first queries latency
-          and to prevent clickhouse executable from being paged out under high IO load.
-         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
-    -->
-    <mlock_executable>true</mlock_executable>
-
-    <!-- Reallocate memory for machine code ("text") using huge pages. Highly experimental. -->
-    <remap_executable>false</remap_executable>
-
-    <![CDATA[
-         Uncomment below in order to use JDBC table engine and function.
-
-         To install and run JDBC bridge in background:
-         * [Debian/Ubuntu]
-           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-           apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-           clickhouse-jdbc-bridge &
-
-         * [CentOS/RHEL]
-           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-           yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-           clickhouse-jdbc-bridge &
-
-         Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
-    ]]>
-    <!--
-    <jdbc_bridge>
-        <host>127.0.0.1</host>
-        <port>9019</port>
-    </jdbc_bridge>
-    -->
-
-    <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.com/docs/en/operations/table_engines/distributed/
-      -->
-    <remote_servers>
-        <!-- Test only shard config for testing distributed storage -->
-        <test_shard_localhost>
-            <!-- Inter-server per-cluster secret for Distributed queries
-                 default: no secret (no authentication will be performed)
-
-                 If set, then Distributed queries will be validated on shards, so at least:
-                 - such cluster should exist on the shard,
-                 - such cluster should have the same secret.
-
-                 And also (and which is more important), the initial_user will
-                 be used as current user for the query.
-
-                 Right now the protocol is pretty simple and it only takes into account:
-                 - cluster name
-                 - query
-
-                 Also it will be nice if the following will be implemented:
-                 - source hostname (see interserver_http_host), but then it will depends from DNS,
-                   it can use IP address instead, but then the you need to get correct on the initiator node.
-                 - target hostname / ip address (same notes as for source hostname)
-                 - time-based security tokens
-            -->
-            <secret>REPLACE_ME</secret>
-
-            <shard>
-                <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
-                <!-- <internal_replication>false</internal_replication> -->
-                <!-- Optional. Shard weight when writing data. Default: 1. -->
-                <!-- <weight>1</weight> -->
-                <replica>
-                    <host>localhost</host>
-                    <port>9000</port>
-                    <!-- Optional. Priority of the replica for load_balancing. Default: 1 (less value has more priority). -->
-                    <!-- <priority>1</priority> -->
-                </replica>
-            </shard>
-        </test_shard_localhost>
-    </remote_servers>
-
-    <!-- The list of hosts allowed to use in URL-related storage engines and table functions.
-        If this section is not present in configuration, all hosts are allowed.
-    -->
-    <!--<remote_url_allow_hosts>-->
-    <!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
-        Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
-                If port is explicitly specified in URL, the host:port is checked as a whole.
-                If host specified here without port, any port with this host allowed.
-                "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
-        If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
-        If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
-        Host should be specified using the host xml tag:
-                <host>yandex.ru</host>
-    -->
-
-    <!-- Regular expression can be specified. RE2 engine is used for regexps.
-        Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
-        (forgetting to do so is a common source of error).
-    -->
-    <!--</remote_url_allow_hosts>-->
-
-    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
-         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
-      -->
-
-    <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
-         Optional. If you don't use replicated tables, you could omit that.
-
-         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
-      -->
-
-    <!--
-    <zookeeper>
-        <node>
-            <host>example1</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>example2</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>example3</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-    -->
-
-    <!-- Substitutions for parameters of replicated tables.
-          Optional. If you don't use replicated tables, you could omit that.
-
-         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
-      -->
-    <!--
-    <macros>
-        <shard>01</shard>
-        <replica>example01-01-1</replica>
-    </macros>
-    -->
-
-
-    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
-    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-
-
-    <!-- Maximum session timeout, in seconds. Default: 3600. -->
-    <max_session_timeout>3600</max_session_timeout>
-
-    <!-- Default session timeout, in seconds. Default: 60. -->
-    <default_session_timeout>60</default_session_timeout>
-
-    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
-    <!--
-        interval - send every X second
-        root_path - prefix for keys
-        hostname_in_path - append hostname to root_path (default = true)
-        metrics - send data from table system.metrics
-        events - send data from table system.events
-        asynchronous_metrics - send data from table system.asynchronous_metrics
-    -->
-    <!--
-    <graphite>
-        <host>localhost</host>
-        <port>42000</port>
-        <timeout>0.1</timeout>
-        <interval>60</interval>
-        <root_path>one_min</root_path>
-        <hostname_in_path>true</hostname_in_path>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <events_cumulative>false</events_cumulative>
-        <asynchronous_metrics>true</asynchronous_metrics>
-    </graphite>
-    <graphite>
-        <host>localhost</host>
-        <port>42000</port>
-        <timeout>0.1</timeout>
-        <interval>1</interval>
-        <root_path>one_sec</root_path>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <events_cumulative>false</events_cumulative>
-        <asynchronous_metrics>false</asynchronous_metrics>
-    </graphite>
-    -->
-
-    <!-- Query log. Used only for queries with setting log_queries = 1. -->
-    <query_log>
-        <!-- What table to insert data. If table is not exist, it will be created.
-             When query log structure is changed after system update,
-              then old table will be renamed and new table will be created automatically.
-        -->
-        <database>system</database>
-        <table>query_log</table>
-        <!--
-            PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
-            Example:
-                event_date
-                toMonday(event_date)
-                toYYYYMM(event_date)
-                toStartOfHour(event_time)
-        -->
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <!--
-            Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
-            Example:
-                event_date + INTERVAL 1 WEEK
-                event_date + INTERVAL 7 DAY DELETE
-                event_date + INTERVAL 2 WEEK TO DISK 'bbb'
-
-        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
-        -->
-
-        <!-- 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>
-          -->
-
-        <!-- Interval of flushing data. -->
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_log>
-
-    <!-- Trace log. Stores stack traces collected by query profilers.
-         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
-    <trace_log>
-        <database>system</database>
-        <table>trace_log</table>
-
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </trace_log>
-
-    <!-- Query thread log. Has information about all threads participated in query execution.
-         Used only for queries with setting log_query_threads = 1. -->
-    <query_thread_log>
-        <database>system</database>
-        <table>query_thread_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_thread_log>
-
-    <!-- Query views log. Has information about all dependent views associated with a query.
-         Used only for queries with setting log_query_views = 1. -->
-    <query_views_log>
-        <database>system</database>
-        <table>query_views_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_views_log>
-
-    <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </part_log>
-
-    <!-- Uncomment to write text log into table.
-         Text log contains all information from usual server log but stores it in structured and efficient way.
-         The level of the messages that goes to the table can be limited (<level>), if not specified all messages will go to the table.
-    <text_log>
-        <database>system</database>
-        <table>text_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <level></level>
-    </text_log>
-    -->
-
-    <!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
-    <metric_log>
-        <database>system</database>
-        <table>metric_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
-    </metric_log>
-
-    <!--
-        Asynchronous metric log contains values of metrics from
-        system.asynchronous_metrics.
-    -->
-    <asynchronous_metric_log>
-        <database>system</database>
-        <table>asynchronous_metric_log</table>
-        <!--
-            Asynchronous metrics are updated once a minute, so there is
-            no need to flush more often.
-        -->
-        <flush_interval_milliseconds>7000</flush_interval_milliseconds>
-    </asynchronous_metric_log>
-
-    <!--
-        OpenTelemetry log contains OpenTelemetry trace spans.
-    -->
-    <opentelemetry_span_log>
-        <!--
-            The default table creation code is insufficient, this <engine> spec
-            is a workaround. There is no 'event_time' for this log, but two times,
-            start and finish. It is sorted by finish time, to avoid inserting
-            data too far away in the past (probably we can sometimes insert a span
-            that is seconds earlier than the last span in the table, due to a race
-            between several spans inserted in parallel). This gives the spans a
-            global order that we can use to e.g. retry insertion into some external
-            system.
-        -->
-        <engine>
-            engine MergeTree
-            partition by toYYYYMM(finish_date)
-            order by (finish_date, finish_time_us, trace_id)
-        </engine>
-        <database>system</database>
-        <table>opentelemetry_span_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </opentelemetry_span_log>
-
-
-    <!-- Crash log. Stores stack traces for fatal errors.
-         This table is normally empty. -->
-    <crash_log>
-        <database>system</database>
-        <table>crash_log</table>
-
-        <partition_by/>
-        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
-    </crash_log>
-
-    <!-- Session log. Stores user log in (successful or not) and log out events. -->
-    <session_log>
-        <database>system</database>
-        <table>session_log</table>
-
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </session_log>
-
-    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.com/docs/en/dicts/internal_dicts/
-    -->
-
-    <!-- Path to file with region hierarchy. -->
-    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
-
-    <!-- Path to directory with files containing names of regions -->
-    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
-
-
-    <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
-    <!-- Custom TLD lists.
-         Format: <name>/path/to/file</name>
-
-         Changes will not be applied w/o server restart.
-         Path to the list is under top_level_domains_path (see above).
-    -->
-    <top_level_domains_lists>
-        <!--
-        <public_suffix_list>/path/to/public_suffix_list.dat</public_suffix_list>
-        -->
-    </top_level_domains_lists>
-
-    <!-- Configuration of external dictionaries. See:
-         https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
-    -->
-    <dictionaries_config>*_dictionary.xml</dictionaries_config>
-
-    <!-- Configuration of user defined executable functions -->
-    <user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
-
-    <!-- Uncomment if you want data to be compressed 30-100% better.
-         Don't do that if you just started using ClickHouse.
-      -->
-    <!--
-    <compression>
-        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
-        <case>
-
-            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
-            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
-            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
-
-            <!- - What compression method to use. - ->
-            <method>zstd</method>
-        </case>
-    </compression>
-    -->
-
-    <!-- Configuration of encryption. The server executes a command to
-         obtain an encryption key at startup if such a command is
-         defined, or encryption codecs will be disabled otherwise. The
-         command is executed through /bin/sh and is expected to write
-         a Base64-encoded key to the stdout. -->
-    <encryption_codecs>
-        <!-- aes_128_gcm_siv -->
-        <!-- Example of getting hex key from env -->
-        <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
-        <!--key_hex from_env="..."></key_hex -->
-
-        <!-- Example of multiple hex keys. They can be imported from env or be written down in config-->
-        <!-- the code should use these keys and throw an exception if their length is not 16 bytes -->
-        <!-- key_hex id="0">...</key_hex -->
-        <!-- key_hex id="1" from_env=".."></key_hex -->
-        <!-- key_hex id="2">...</key_hex -->
-        <!-- current_key_id>2</current_key_id -->
-
-        <!-- Example of getting hex key from config -->
-        <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
-        <!-- key>...</key -->
-
-        <!-- example of adding nonce -->
-        <!-- nonce>...</nonce -->
-
-        <!-- /aes_128_gcm_siv -->
-    </encryption_codecs>
-
-    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
-         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
-    <distributed_ddl>
-        <!-- Path in ZooKeeper to queue with DDL queries -->
-        <path>/clickhouse/task_queue/ddl</path>
-
-        <!-- Settings from this profile will be used to execute DDL queries -->
-        <!-- <profile>default</profile> -->
-
-        <!-- Controls how much ON CLUSTER queries can be run simultaneously. -->
-        <!-- <pool_size>1</pool_size> -->
-
-        <!--
-             Cleanup settings (active tasks will not be removed)
-        -->
-
-        <!-- Controls task TTL (default 1 week) -->
-        <!-- <task_max_lifetime>604800</task_max_lifetime> -->
-
-        <!-- Controls how often cleanup should be performed (in seconds) -->
-        <!-- <cleanup_delay_period>60</cleanup_delay_period> -->
-
-        <!-- Controls how many tasks could be in the queue -->
-        <!-- <max_tasks_in_queue>1000</max_tasks_in_queue> -->
-    </distributed_ddl>
-
-    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
-    <!--
-    <merge_tree>
-        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
-    </merge_tree>
-    -->
-
-    <!-- Protection from accidental DROP.
-         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
-         If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
-         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
-         The same for max_partition_size_to_drop.
-         Uncomment to disable protection.
-    -->
-    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
-    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
-
-    <!-- Example of parameters for GraphiteMergeTree table engine -->
-    <graphite_rollup_example>
-        <pattern>
-            <regexp>click_cost</regexp>
-            <function>any</function>
-            <retention>
-                <age>0</age>
-                <precision>3600</precision>
-            </retention>
-            <retention>
-                <age>86400</age>
-                <precision>60</precision>
-            </retention>
-        </pattern>
-        <default>
-            <function>max</function>
-            <retention>
-                <age>0</age>
-                <precision>60</precision>
-            </retention>
-            <retention>
-                <age>3600</age>
-                <precision>300</precision>
-            </retention>
-            <retention>
-                <age>86400</age>
-                <precision>3600</precision>
-            </retention>
-        </default>
-    </graphite_rollup_example>
-
-    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
-         The directory will be created if it doesn't exist.
-      -->
-    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
-
-    <!-- Default query masking rules, matching lines would be replaced with something else in the logs
-        (both text logs and system.query_log).
-        name - name for the rule (optional)
-        regexp - RE2 compatible regular expression (mandatory)
-        replace - substitution string for sensitive data (optional, by default - six asterisks)
-    -->
-    <query_masking_rules>
-        <rule>
-            <name>hide encrypt/decrypt arguments</name>
-            <regexp>((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)</regexp>
-            <!-- or more secure, but also more invasive:
-                (aes_\w+)\s*\(.*\)
-            -->
-            <replace>\1(???)</replace>
-        </rule>
-    </query_masking_rules>
-
-    <!-- Uncomment to use custom http handlers.
-        rules are checked from top to bottom, first match runs the handler
-            url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
-            methods - to match request method, you can use commas to separate multiple method matches(optional)
-            headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
-        handler is request handler
-            type - supported types: static, dynamic_query_handler, predefined_query_handler
-            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 params
-            status - use with static type, response status code
-            content_type - use with static type, response 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 send to client.
-
-    <http_handlers>
-        <rule>
-            <url>/</url>
-            <methods>POST,GET</methods>
-            <headers><pragma>no-cache</pragma></headers>
-            <handler>
-                <type>dynamic_query_handler</type>
-                <query_param_name>query</query_param_name>
-            </handler>
-        </rule>
-
-        <rule>
-            <url>/predefined_query</url>
-            <methods>POST,GET</methods>
-            <handler>
-                <type>predefined_query_handler</type>
-                <query>SELECT * FROM system.settings</query>
-            </handler>
-        </rule>
-
-        <rule>
-            <handler>
-                <type>static</type>
-                <status>200</status>
-                <content_type>text/plain; charset=UTF-8</content_type>
-                <response_content>config://http_server_default_response</response_content>
-            </handler>
-        </rule>
-    </http_handlers>
-    -->
-
-    <send_crash_reports>
-        <!-- Changing <enabled> to true allows sending crash reports to -->
-        <!-- the ClickHouse core developers team via Sentry https://sentry.io -->
-        <!-- Doing so at least in pre-production environments is highly appreciated -->
-        <enabled>false</enabled>
-        <!-- Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report -->
-        <anonymize>false</anonymize>
-        <!-- Default endpoint should be changed to different Sentry DSN only if you have -->
-        <!-- some in-house engineers or hired consultants who're going to debug ClickHouse issues for you -->
-        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
-    </send_crash_reports>
-
-    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
-    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-
-    <!-- You can also configure rocksdb like this: -->
-    <!--
-    <rocksdb>
-        <options>
-            <max_background_jobs>8</max_background_jobs>
-        </options>
-        <column_family_options>
-            <num_levels>2</num_levels>
-        </column_family_options>
-        <tables>
-            <table>
-                <name>TABLE</name>
-                <options>
-                    <max_background_jobs>8</max_background_jobs>
-                </options>
-                <column_family_options>
-                    <num_levels>2</num_levels>
-                </column_family_options>
-            </table>
-        </tables>
-    </rocksdb>
-    -->
-    <storage_configuration>
-        <disks>
-            <s3>
-                <type>s3</type>
-                <endpoint>https://storage.yandexcloud.net/my-bucket/root-path/</endpoint>
-                <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>
-                </proxy>
-                <connect_timeout_ms>10000</connect_timeout_ms>
-                <request_timeout_ms>5000</request_timeout_ms>
-                <retry_attempts>10</retry_attempts>
-                <single_read_retries>4</single_read_retries>
-                <min_bytes_for_seek>1000</min_bytes_for_seek>
-                <metadata_path>/var/lib/clickhouse/disks/s3/</metadata_path>
-                <skip_access_check>false</skip_access_check>
-            </s3>
-        </disks>
-    </storage_configuration>
-</clickhouse>
diff --git a/programs/diagnostics/testdata/configs/xml/users.d/default-password.xml b/programs/diagnostics/testdata/configs/xml/users.d/default-password.xml
deleted file mode 100644
index 242a6a4b02e..00000000000
--- a/programs/diagnostics/testdata/configs/xml/users.d/default-password.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<clickhouse>
-    <users>
-        <default>
-            <password remove="1"/>
-            <password_sha256_hex>REPLACE_ME</password_sha256_hex>
-        </default>
-    </users>
-</clickhouse>
\ No newline at end of file
diff --git a/programs/diagnostics/testdata/configs/xml/users.xml b/programs/diagnostics/testdata/configs/xml/users.xml
deleted file mode 100644
index cd5f17e922e..00000000000
--- a/programs/diagnostics/testdata/configs/xml/users.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<clickhouse>
-    <!-- See also the files in users.d directory where the settings can be overridden. -->
-    <!-- Profiles of settings. -->
-    <include_from>../include/xml/user-include.xml</include_from>
-
-    <profiles>
-        <!-- Default settings. -->
-        <default>
-            <!-- Maximum memory usage for processing single query, in bytes. -->
-            <max_memory_usage>10000000000</max_memory_usage>
-
-            <load_balancing>random</load_balancing>
-            <log_query_threads>1</log_query_threads>
-        </default>
-        <!-- Profile that allows only read queries. -->
-        <readonly>
-            <readonly>1</readonly>
-        </readonly>
-    </profiles>
-    <!-- Users and ACL. -->
-    <users>
-        <test_user>
-            <include incl="test_user"></include>
-        </test_user>
-        <!-- If user name was not specified, 'default' user is used. -->
-        <default>
-            <password>REPLACE_ME</password>
-            <networks>
-                <ip>::/0</ip>
-            </networks>
-            <!-- Settings profile for user. -->
-            <profile>default</profile>
-            <!-- Quota for user. -->
-            <quota>default</quota>
-            <!-- User can create other users and grant rights to them. -->
-            <!-- <access_management>1</access_management> -->
-        </default>
-    </users>
-    <!-- Quotas. -->
-    <quotas>
-        <!-- Name of quota. -->
-        <default>
-            <!-- Limits for time interval. You could specify many intervals with different limits. -->
-            <interval>
-                <!-- Length of interval. -->
-                <duration>3600</duration>
-
-                <!-- No limits. Just calculate resource usage for time interval. -->
-                <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/programs/diagnostics/testdata/configs/yaml/config.yaml b/programs/diagnostics/testdata/configs/yaml/config.yaml
deleted file mode 100644
index 354065a8a9b..00000000000
--- a/programs/diagnostics/testdata/configs/yaml/config.yaml
+++ /dev/null
@@ -1,927 +0,0 @@
-# This is an example of a configuration file "config.xml" rewritten in YAML
-# You can read this documentation for detailed information about YAML configuration:
-# https://clickhouse.com/docs/en/operations/configuration-files/
-
-# NOTE: User and query level settings are set up in "users.yaml" file.
-# If you have accidentally specified user-level settings here, server won't start.
-# You can either move the settings to the right place inside "users.xml" file
-# or add skip_check_for_incorrect_settings: 1 here.
-include_from: "../include/yaml/server-include.yaml"
-logger:
-  # Possible levels [1]:
-  # - none (turns off logging)
-  # - fatal
-  # - critical
-  # - error
-  # - warning
-  # - notice
-  # - information
-  # - debug
-  # - trace
-  # [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
-  level: trace
-  log: /var/log/clickhouse-server/clickhouse-server.log
-  errorlog: /var/log/clickhouse-server/clickhouse-server.err.log
-  # Rotation policy
-  # See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
-  size: 1000M
-  count: 10
-  # console: 1
-  # Default behavior is autodetection (log to console if not daemon mode and is tty)
-
-  # Per level overrides (legacy):
-  # For example to suppress logging of the ConfigReloader you can use:
-  # NOTE: levels.logger is reserved, see below.
-  # levels:
-  #     ConfigReloader: none
-
-  # Per level overrides:
-  # For example to suppress logging of the RBAC for default user you can use:
-  # (But please note that the logger name maybe changed from version to version, even after minor upgrade)
-  # levels:
-  #     - logger:
-  #         name: 'ContextAccess (default)'
-  #         level: none
-  #     - logger:
-  #         name: 'DatabaseOrdinary (test)'
-  #         level: none
-
-# It is the name that will be shown in the clickhouse-client.
-# By default, anything with "production" will be highlighted in red in query prompt.
-# display_name: production
-
-# Port for HTTP API. See also 'https_port' for secure connections.
-# This interface is also used by ODBC and JDBC drivers (DataGrip, Dbeaver, ...)
-# and by most of web interfaces (embedded UI, Grafana, Redash, ...).
-http_port: 8123
-
-# Port for interaction by native protocol with:
-# - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
-# - clickhouse-server with other clickhouse-servers for distributed query processing;
-# - ClickHouse drivers and applications supporting native protocol
-# (this protocol is also informally called as "the TCP protocol");
-# See also 'tcp_port_secure' for secure connections.
-tcp_port: 9000
-
-# Compatibility with MySQL protocol.
-# ClickHouse will pretend to be MySQL for applications connecting to this port.
-mysql_port: 9004
-
-# Compatibility with PostgreSQL protocol.
-# ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
-postgresql_port: 9005
-
-# HTTP API with TLS (HTTPS).
-# You have to configure certificate to enable this interface.
-# See the openSSL section below.
-# https_port: 8443
-
-# Native interface with TLS.
-# You have to configure certificate to enable this interface.
-# See the openSSL section below.
-# tcp_port_secure: 9440
-
-# Native interface wrapped with PROXYv1 protocol
-# PROXYv1 header sent for every connection.
-# ClickHouse will extract information about proxy-forwarded client address from the header.
-# tcp_with_proxy_port: 9011
-
-# Port for communication between replicas. Used for data exchange.
-# It provides low-level data access between servers.
-# This port should not be accessible from untrusted networks.
-# See also 'interserver_http_credentials'.
-# Data transferred over connections to this port should not go through untrusted networks.
-# See also 'interserver_https_port'.
-interserver_http_port: 9009
-
-# Port for communication between replicas with TLS.
-# You have to configure certificate to enable this interface.
-# See the openSSL section below.
-# See also 'interserver_http_credentials'.
-# interserver_https_port: 9010
-
-# Hostname that is used by other replicas to request this server.
-# If not specified, than it is determined analogous to 'hostname -f' command.
-# This setting could be used to switch replication to another network interface
-# (the server may be connected to multiple networks via multiple addresses)
-# interserver_http_host: example.yandex.ru
-
-# You can specify credentials for authenthication between replicas.
-# This is required when interserver_https_port is accessible from untrusted networks,
-# and also recommended to avoid SSRF attacks from possibly compromised services in your network.
-# interserver_http_credentials:
-#     user: interserver
-#     password: ''
-
-# Listen specified address.
-# Use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere.
-# Notes:
-# If you open connections from wildcard address, make sure that at least one of the following measures applied:
-# - server is protected by firewall and not accessible from untrusted networks;
-# - all users are restricted to subset of network addresses (see users.xml);
-# - all users have strong passwords, only secure (TLS) interfaces are accessible, or connections are only made via TLS interfaces.
-# - users without password have readonly access.
-# See also: https://www.shodan.io/search?query=clickhouse
-# listen_host: '::'
-
-# Same for hosts without support for IPv6:
-# listen_host: 0.0.0.0
-
-# Default values - try listen localhost on IPv4 and IPv6.
-# listen_host: '::1'
-# listen_host: 127.0.0.1
-
-# Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen.
-# listen_try: 0
-
-# Allow multiple servers to listen on the same address:port. This is not recommended.
-# listen_reuse_port: 0
-
-# listen_backlog: 64
-max_connections: 4096
-
-# For 'Connection: keep-alive' in HTTP 1.1
-keep_alive_timeout: 3
-
-# gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API)
-# grpc_port: 9100
-grpc:
-  enable_ssl: false
-
-  # The following two files are used only if enable_ssl=1
-  ssl_cert_file: /path/to/ssl_cert_file
-  ssl_key_file: /path/to/ssl_key_file
-
-  # Whether server will request client for a certificate
-  ssl_require_client_auth: false
-
-  # The following file is used only if ssl_require_client_auth=1
-  ssl_ca_cert_file: /path/to/ssl_ca_cert_file
-
-  # Default compression algorithm (applied if client doesn't specify another algorithm).
-  # Supported algorithms: none, deflate, gzip, stream_gzip
-  compression: deflate
-
-  # Default compression level (applied if client doesn't specify another level).
-  # Supported levels: none, low, medium, high
-  compression_level: medium
-
-  # Send/receive message size limits in bytes. -1 means unlimited
-  max_send_message_size: -1
-  max_receive_message_size: -1
-
-  # Enable if you want very detailed logs
-  verbose_logs: false
-
-# 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/server.crt
-    privateKeyFile: /etc/clickhouse-server/server.key
-
-    # dhparams are optional. You can delete the dhParamsFile: element.
-    # To generate dhparams, use the following command:
-    # openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096
-    # Only file format with BEGIN DH PARAMETERS is supported.
-    dhParamsFile: /etc/clickhouse-server/dhparam.pem
-    verificationMode: none
-    loadDefaultCAFile: true
-    cacheSessions: true
-    disableProtocols: 'sslv2,sslv3'
-    preferServerCiphers: true
-  client:
-    # Used for connecting to https dictionary source and secured Zookeeper communication
-    loadDefaultCAFile: true
-    cacheSessions: true
-    disableProtocols: 'sslv2,sslv3'
-    preferServerCiphers: true
-
-    # Use for self-signed: verificationMode: none
-    invalidCertificateHandler:
-      # Use for self-signed: name: AcceptCertificateHandler
-      name: RejectCertificateHandler
-
-# Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123
-# http_server_default_response: |-
-#     <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>
-
-# Maximum number of concurrent queries.
-max_concurrent_queries: 100
-
-# Maximum memory usage (resident set size) for server process.
-# Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.
-# If the value is larger than "max_server_memory_usage_to_ram_ratio" of available physical RAM, it will be cut down.
-
-# The constraint is checked on query execution time.
-# If a query tries to allocate memory and the current memory usage plus allocation is greater
-# than specified threshold, exception will be thrown.
-
-# It is not practical to set this constraint to small values like just a few gigabytes,
-# because memory allocator will keep this amount of memory in caches and the server will deny service of queries.
-max_server_memory_usage: 0
-
-# Maximum number of threads in the Global thread pool.
-# This will default to a maximum of 10000 threads if not specified.
-# This setting will be useful in scenarios where there are a large number
-# of distributed queries that are running concurrently but are idling most
-# of the time, in which case a higher number of threads might be required.
-max_thread_pool_size: 10000
-
-# On memory constrained environments you may have to set this to value larger than 1.
-max_server_memory_usage_to_ram_ratio: 0.9
-
-# Simple server-wide memory profiler. Collect a stack trace at every peak allocation step (in bytes).
-# Data will be stored in system.trace_log table with query_id = empty string.
-# Zero means disabled.
-total_memory_profiler_step: 4194304
-
-# Collect random allocations and deallocations and write them into system.trace_log with 'MemorySample' trace_type.
-# The probability is for every alloc/free regardless to the size of the allocation.
-# Note that sampling happens only when the amount of untracked memory exceeds the untracked memory limit,
-# which is 4 MiB by default but can be lowered if 'total_memory_profiler_step' is lowered.
-# You may want to set 'total_memory_profiler_step' to 1 for extra fine grained sampling.
-total_memory_tracker_sample_probability: 0
-
-# Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
-# correct maximum value.
-# max_open_files: 262144
-
-# Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
-# In bytes. Cache is single for server. Memory is allocated only on demand.
-# Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
-# Uncompressed cache is advantageous only for very short queries and in rare cases.
-
-# Note: uncompressed cache can be pointless for lz4, because memory bandwidth
-# is slower than multi-core decompression on some server configurations.
-# Enabling it can sometimes paradoxically make queries slower.
-uncompressed_cache_size: 8589934592
-
-# Approximate size of mark cache, used in tables of MergeTree family.
-# In bytes. Cache is single for server. Memory is allocated only on demand.
-# You should not lower this value.
-mark_cache_size: 5368709120
-
-# If you enable the `min_bytes_to_use_mmap_io` setting,
-# the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
-# It makes sense only for large files and helps only if data reside in page cache.
-# To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
-# and to reuse mappings from several threads and queries,
-# the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
-# The amount of data in mapped files can be monitored
-# in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
-# and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
-# and also in system.events, system.processes, system.query_log, system.query_thread_log, system.query_views_log by the
-# CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
-# Note that the amount of data in mapped files does not consume memory directly and is not accounted
-# in query or server memory usage - because this memory can be discarded similar to OS page cache.
-# The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
-# also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
-mmap_cache_size: 1000
-
-# Cache size in bytes for compiled expressions.
-compiled_expression_cache_size: 134217728
-
-# Cache size in elements for compiled expressions.
-compiled_expression_cache_elements_size: 10000
-
-# Path to data directory, with trailing slash.
-path: /var/lib/clickhouse/
-
-# Path to temporary data for processing hard queries.
-tmp_path: /var/lib/clickhouse/tmp/
-
-# Policy from the <storage_configuration> for the temporary files.
-# If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
-
-# Notes:
-# - move_factor              is ignored
-# - keep_free_space_bytes    is ignored
-# - max_data_part_size_bytes is ignored
-# - you must have exactly one volume in that policy
-# tmp_policy: tmp
-
-# Directory with user provided files that are accessible by 'file' table function.
-user_files_path: /var/lib/clickhouse/user_files/
-
-# LDAP server definitions.
-ldap_servers: ''
-
-# List LDAP servers with their connection parameters here to later 1) use them as authenticators for dedicated local users,
-# who have 'ldap' authentication mechanism specified instead of 'password', or to 2) use them as remote user directories.
-# Parameters:
-# host - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
-# port - LDAP server port, default is 636 if enable_tls is set to true, 389 otherwise.
-# bind_dn - template used to construct the DN to bind to.
-# The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
-# user name during each authentication attempt.
-# user_dn_detection - section with LDAP search parameters for detecting the actual user DN of the bound user.
-# This is mainly used in search filters for further role mapping when the server is Active Directory. The
-# resulting user DN will be used when replacing '{user_dn}' substrings wherever they are allowed. By default,
-# user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected
-# user DN value.
-# base_dn - template used to construct the base DN for the LDAP search.
-# The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
-# of the template with the actual user name and bind DN during the LDAP search.
-# scope - scope of the LDAP search.
-# Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-# search_filter - template used to construct the search filter for the LDAP search.
-# The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
-# substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
-# Note, that the special characters must be escaped properly in XML.
-# verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
-# to be successfully authenticated for all consecutive requests without contacting the LDAP server.
-# Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
-# enable_tls - flag to trigger use of secure connection to the LDAP server.
-# Specify 'no' for plain text (ldap://) protocol (not recommended).
-# Specify 'yes' for LDAP over SSL/TLS (ldaps://) protocol (recommended, the default).
-# Specify 'starttls' for legacy StartTLS protocol (plain text (ldap://) protocol, upgraded to TLS).
-# tls_minimum_protocol_version - the minimum protocol version of SSL/TLS.
-# Accepted values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2' (the default).
-# tls_require_cert - SSL/TLS peer certificate verification behavior.
-# Accepted values are: 'never', 'allow', 'try', 'demand' (the default).
-# tls_cert_file - path to certificate file.
-# tls_key_file - path to certificate key file.
-# tls_ca_cert_file - path to CA certificate file.
-# tls_ca_cert_dir - path to the directory containing CA certificates.
-# tls_cipher_suite - allowed cipher suite (in OpenSSL notation).
-# Example:
-# my_ldap_server:
-#     host: localhost
-#     port: 636
-#     bind_dn: 'uid={user_name},ou=users,dc=example,dc=com'
-#     verification_cooldown: 300
-#     enable_tls: yes
-#     tls_minimum_protocol_version: tls1.2
-#     tls_require_cert: demand
-#     tls_cert_file: /path/to/tls_cert_file
-#     tls_key_file: /path/to/tls_key_file
-#     tls_ca_cert_file: /path/to/tls_ca_cert_file
-#     tls_ca_cert_dir: /path/to/tls_ca_cert_dir
-#     tls_cipher_suite: ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384
-
-# Example (typical Active Directory with configured user DN detection for further role mapping):
-# my_ad_server:
-#     host: localhost
-#     port: 389
-#     bind_dn: 'EXAMPLE\{user_name}'
-#     user_dn_detection:
-#         base_dn: CN=Users,DC=example,DC=com
-#         search_filter: '(&amp;(objectClass=user)(sAMAccountName={user_name}))'
-#     enable_tls: no
-
-# To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
-# to authenticate via Kerberos, define a single 'kerberos' section here.
-# Parameters:
-# principal - canonical service principal name, that will be acquired and used when accepting security contexts.
-# This parameter is optional, if omitted, the default principal will be used.
-# This parameter cannot be specified together with 'realm' parameter.
-# realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
-# This parameter is optional, if omitted, no additional filtering by realm will be applied.
-# This parameter cannot be specified together with 'principal' parameter.
-# Example:
-# kerberos: ''
-
-# Example:
-# kerberos:
-#     principal: HTTP/clickhouse.example.com@EXAMPLE.COM
-
-# Example:
-# kerberos:
-#     realm: EXAMPLE.COM
-
-# Sources to read users, roles, access rights, profiles of settings, quotas.
-user_directories:
-  users_xml:
-    # Path to configuration file with predefined users.
-    path: users.yaml
-  local_directory:
-    # Path to folder where users created by SQL commands are stored.
-    path: /var/lib/clickhouse/access/
-
-#   # To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
-#   # with the following parameters:
-#   # server - one of LDAP server names defined in 'ldap_servers' config section above.
-#   # 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 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
-#   # CREATE ROLE command.
-#   # 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.
-#   # scope - scope of the LDAP search.
-#   # Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-#   # search_filter - template used to construct the search filter for the LDAP search.
-#   # The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', '{user_dn}', and
-#   # '{base_dn}' substrings of the template with the actual user name, bind DN, user DN, and base DN during
-#   # each LDAP search.
-#   # Note, that the special characters must be escaped properly in XML.
-#   # attribute - attribute name whose values will be returned by the LDAP search. 'cn', by default.
-#   # prefix - prefix, that will be expected to be in front of each string in the original list of strings returned by
-#   # the LDAP search. Prefix will be removed from the original strings and resulting strings will be treated
-#   # as local role names. Empty, by default.
-#   # Example:
-#   # ldap:
-#   #     server: my_ldap_server
-#   #     roles:
-#   #         my_local_role1: ''
-#   #         my_local_role2: ''
-#   #     role_mapping:
-#   #         base_dn: 'ou=groups,dc=example,dc=com'
-#   #         scope: subtree
-#   #         search_filter: '(&amp;(objectClass=groupOfNames)(member={bind_dn}))'
-#   #         attribute: cn
-#   #         prefix: clickhouse_
-#   # Example (typical Active Directory with role mapping that relies on the detected user DN):
-#   # ldap:
-#   #     server: my_ad_server
-#   #     role_mapping:
-#   #         base_dn: 'CN=Users,DC=example,DC=com'
-#   #         attribute: CN
-#   #         scope: subtree
-#   #         search_filter: '(&amp;(objectClass=group)(member={user_dn}))'
-#   #         prefix: clickhouse_
-
-# Default profile of settings.
-default_profile: default
-
-# Comma-separated list of prefixes for user-defined settings.
-# custom_settings_prefixes: ''
-# System profile of settings. This settings are used by internal processes (Distributed DDL worker and so on).
-# system_profile: default
-
-# Buffer profile of settings.
-# This settings are used by Buffer storage to flush data to the underlying table.
-# Default: used from system_profile directive.
-# buffer_profile: default
-
-# Default database.
-default_database: default
-
-# Server time zone could be set here.
-
-# Time zone is used when converting between String and DateTime types,
-# when printing DateTime in text formats and parsing DateTime from text,
-# it is used in date and time related functions, if specific time zone was not passed as an argument.
-
-# Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
-# If not specified, system time zone at server startup is used.
-
-# Please note, that server could display time zone alias instead of specified name.
-# Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
-# timezone: Europe/Moscow
-
-# You can specify umask here (see "man umask"). Server will apply it on startup.
-# Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
-# umask: 022
-
-# Perform mlockall after startup to lower first queries latency
-# and to prevent clickhouse executable from being paged out under high IO load.
-# Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
-mlock_executable: true
-
-# Reallocate memory for machine code ("text") using huge pages. Highly experimental.
-remap_executable: false
-
-# Uncomment below in order to use JDBC table engine and function.
-# To install and run JDBC bridge in background:
-# * [Debian/Ubuntu]
-# export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-# export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-# wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-# apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-# clickhouse-jdbc-bridge &
-# * [CentOS/RHEL]
-# export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-# export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-# wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-# yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-# clickhouse-jdbc-bridge &
-# Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
-
-# jdbc_bridge:
-#     host: 127.0.0.1
-#     port: 9019
-
-# Configuration of clusters that could be used in Distributed tables.
-# https://clickhouse.com/docs/en/operations/table_engines/distributed/
-remote_servers:
-  # Test only shard config for testing distributed storage
-  test_shard_localhost:
-    # Inter-server per-cluster secret for Distributed queries
-    # default: no secret (no authentication will be performed)
-
-    # If set, then Distributed queries will be validated on shards, so at least:
-    # - such cluster should exist on the shard,
-    # - such cluster should have the same secret.
-
-    # And also (and which is more important), the initial_user will
-    # be used as current user for the query.
-
-    # Right now the protocol is pretty simple and it only takes into account:
-    # - cluster name
-    # - query
-
-    # Also it will be nice if the following will be implemented:
-    # - source hostname (see interserver_http_host), but then it will depends from DNS,
-    # it can use IP address instead, but then the you need to get correct on the initiator node.
-    # - target hostname / ip address (same notes as for source hostname)
-    # - time-based security tokens
-    secret: 'REPLACE_ME'
-    shard:
-      # Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas).
-      # internal_replication: false
-      # Optional. Shard weight when writing data. Default: 1.
-      # weight: 1
-      replica:
-        host: localhost
-        port: 9000
-        # Optional. Priority of the replica for load_balancing. Default: 1 (less value has more priority).
-        # priority: 1
-
-# The list of hosts allowed to use in URL-related storage engines and table functions.
-# If this section is not present in configuration, all hosts are allowed.
-# remote_url_allow_hosts:
-
-# Host should be specified exactly as in URL. The name is checked before DNS resolution.
-# Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
-# If port is explicitly specified in URL, the host:port is checked as a whole.
-# If host specified here without port, any port with this host allowed.
-# "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
-# If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
-# If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
-
-# Regular expression can be specified. RE2 engine is used for regexps.
-# Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
-# (forgetting to do so is a common source of error).
-
-# If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
-# By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-# Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
-
-# ZooKeeper is used to store metadata about replicas, when using Replicated tables.
-# Optional. If you don't use replicated tables, you could omit that.
-# See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
-
-# zookeeper:
-#     - node:
-#         host: example1
-#         port: 2181
-#     - node:
-#         host: example2
-#         port: 2181
-#     - node:
-#         host: example3
-#         port: 2181
-
-# Substitutions for parameters of replicated tables.
-# Optional. If you don't use replicated tables, you could omit that.
-# See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
-# macros:
-#     shard: 01
-#     replica: example01-01-1
-
-# Reloading interval for embedded dictionaries, in seconds. Default: 3600.
-builtin_dictionaries_reload_interval: 3600
-
-# Maximum session timeout, in seconds. Default: 3600.
-max_session_timeout: 3600
-
-# Default session timeout, in seconds. Default: 60.
-default_session_timeout: 60
-
-# Sending data to Graphite for monitoring. Several sections can be defined.
-# interval - send every X second
-# root_path - prefix for keys
-# hostname_in_path - append hostname to root_path (default = true)
-# metrics - send data from table system.metrics
-# events - send data from table system.events
-# asynchronous_metrics - send data from table system.asynchronous_metrics
-
-# graphite:
-#     host: localhost
-#     port: 42000
-#     timeout: 0.1
-#     interval: 60
-#     root_path: one_min
-#     hostname_in_path: true
-
-#     metrics: true
-#     events: true
-#     events_cumulative: false
-#     asynchronous_metrics: true
-
-# graphite:
-#     host: localhost
-#     port: 42000
-#     timeout: 0.1
-#     interval: 1
-#     root_path: one_sec
-
-#     metrics: true
-#     events: true
-#     events_cumulative: false
-#     asynchronous_metrics: false
-
-# Serve endpoint for Prometheus monitoring.
-# endpoint - mertics path (relative to root, statring with "/")
-# port - port to setup server. If not defined or 0 than http_port used
-# metrics - send data from table system.metrics
-# events - send data from table system.events
-# asynchronous_metrics - send data from table system.asynchronous_metrics
-
-# prometheus:
-#     endpoint: /metrics
-#     port: 9363
-
-#     metrics: true
-#     events: true
-#     asynchronous_metrics: true
-
-# Query log. Used only for queries with setting log_queries = 1.
-query_log:
-  # What table to insert data. If table is not exist, it will be created.
-  # When query log structure is changed after system update,
-  # then old table will be renamed and new table will be created automatically.
-  database: system
-  table: query_log
-
-  # PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
-  # Example:
-  # event_date
-  # toMonday(event_date)
-  # toYYYYMM(event_date)
-  # toStartOfHour(event_time)
-  partition_by: toYYYYMM(event_date)
-
-  # Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
-  # Example:
-  # event_date + INTERVAL 1 WEEK
-  # event_date + INTERVAL 7 DAY DELETE
-  # event_date + INTERVAL 2 WEEK TO DISK 'bbb'
-
-  # ttl: 'event_date + INTERVAL 30 DAY DELETE'
-
-  # 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'
-
-  # Interval of flushing data.
-  flush_interval_milliseconds: 7500
-
-# Trace log. Stores stack traces collected by query profilers.
-# See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings.
-trace_log:
-  database: system
-  table: trace_log
-  partition_by: toYYYYMM(event_date)
-  flush_interval_milliseconds: 7500
-
-# Query thread log. Has information about all threads participated in query execution.
-# Used only for queries with setting log_query_threads = 1.
-query_thread_log:
-  database: system
-  table: query_thread_log
-  partition_by: toYYYYMM(event_date)
-  flush_interval_milliseconds: 7500
-
-# Query views log. Has information about all dependent views associated with a query.
-# Used only for queries with setting log_query_views = 1.
-query_views_log:
-  database: system
-  table: query_views_log
-  partition_by: toYYYYMM(event_date)
-  flush_interval_milliseconds: 7500
-
-# Uncomment if use part log.
-# Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).
-part_log:
-  database: system
-  table: part_log
-  partition_by: toYYYYMM(event_date)
-  flush_interval_milliseconds: 7500
-
-# Uncomment to write text log into table.
-# Text log contains all information from usual server log but stores it in structured and efficient way.
-# The level of the messages that goes to the table can be limited (<level>), if not specified all messages will go to the table.
-# text_log:
-#     database: system
-#     table: text_log
-#     flush_interval_milliseconds: 7500
-#     level: ''
-
-# Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval.
-metric_log:
-  database: system
-  table: metric_log
-  flush_interval_milliseconds: 7500
-  collect_interval_milliseconds: 1000
-
-# Asynchronous metric log contains values of metrics from
-# system.asynchronous_metrics.
-asynchronous_metric_log:
-  database: system
-  table: asynchronous_metric_log
-
-  # Asynchronous metrics are updated once a minute, so there is
-  # no need to flush more often.
-  flush_interval_milliseconds: 60000
-
-# OpenTelemetry log contains OpenTelemetry trace spans.
-opentelemetry_span_log:
-
-  # The default table creation code is insufficient, this <engine> spec
-  # is a workaround. There is no 'event_time' for this log, but two times,
-  # start and finish. It is sorted by finish time, to avoid inserting
-  # data too far away in the past (probably we can sometimes insert a span
-  # that is seconds earlier than the last span in the table, due to a race
-  # between several spans inserted in parallel). This gives the spans a
-  # global order that we can use to e.g. retry insertion into some external
-  # system.
-  engine: |-
-    engine MergeTree
-         partition by toYYYYMM(finish_date)
-         order by (finish_date, finish_time_us, trace_id)
-  database: system
-  table: opentelemetry_span_log
-  flush_interval_milliseconds: 7500
-
-# Crash log. Stores stack traces for fatal errors.
-# This table is normally empty.
-crash_log:
-  database: system
-  table: crash_log
-  partition_by: ''
-  flush_interval_milliseconds: 1000
-
-# Parameters for embedded dictionaries, used in Yandex.Metrica.
-# See https://clickhouse.com/docs/en/dicts/internal_dicts/
-
-# Path to file with region hierarchy.
-# path_to_regions_hierarchy_file: /opt/geo/regions_hierarchy.txt
-
-# Path to directory with files containing names of regions
-# path_to_regions_names_files: /opt/geo/
-
-
-# top_level_domains_path: /var/lib/clickhouse/top_level_domains/
-# Custom TLD lists.
-# Format: name: /path/to/file
-
-# Changes will not be applied w/o server restart.
-# Path to the list is under top_level_domains_path (see above).
-top_level_domains_lists: ''
-
-# public_suffix_list: /path/to/public_suffix_list.dat
-
-# Configuration of external dictionaries. See:
-# https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
-dictionaries_config: '*_dictionary.xml'
-
-# Uncomment if you want data to be compressed 30-100% better.
-# Don't do that if you just started using ClickHouse.
-
-# compression:
-#     # Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used.
-#     case:
-#         Conditions. All must be satisfied. Some conditions may be omitted.
-#         # min_part_size: 10000000000    # Min part size in bytes.
-#         # min_part_size_ratio: 0.01     # Min size of part relative to whole table size.
-#         # What compression method to use.
-#         method: zstd
-
-# Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
-# Works only if ZooKeeper is enabled. Comment it if such functionality isn't required.
-distributed_ddl:
-  # Path in ZooKeeper to queue with DDL queries
-  path: /clickhouse/task_queue/ddl
-
-  # Settings from this profile will be used to execute DDL queries
-  # profile: default
-
-  # Controls how much ON CLUSTER queries can be run simultaneously.
-  # pool_size: 1
-
-  # Cleanup settings (active tasks will not be removed)
-
-  # Controls task TTL (default 1 week)
-  # task_max_lifetime: 604800
-
-  # Controls how often cleanup should be performed (in seconds)
-  # cleanup_delay_period: 60
-
-  # Controls how many tasks could be in the queue
-  # max_tasks_in_queue: 1000
-
-# Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h
-# merge_tree:
-#     max_suspicious_broken_parts: 5
-
-# Protection from accidental DROP.
-# If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
-# If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
-# By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
-# The same for max_partition_size_to_drop.
-# Uncomment to disable protection.
-
-# max_table_size_to_drop: 0
-# max_partition_size_to_drop: 0
-
-# Example of parameters for GraphiteMergeTree table engine
-graphite_rollup_example:
-  pattern:
-    regexp: click_cost
-    function: any
-    retention:
-      - age: 0
-        precision: 3600
-      - age: 86400
-        precision: 60
-  default:
-    function: max
-    retention:
-      - age: 0
-        precision: 60
-      - age: 3600
-        precision: 300
-      - age: 86400
-        precision: 3600
-
-# Directory in <clickhouse-path> containing schema files for various input formats.
-# The directory will be created if it doesn't exist.
-format_schema_path: /var/lib/clickhouse/format_schemas/
-
-# Default query masking rules, matching lines would be replaced with something else in the logs
-# (both text logs and system.query_log).
-# name - name for the rule (optional)
-# regexp - RE2 compatible regular expression (mandatory)
-# replace - substitution string for sensitive data (optional, by default - six asterisks)
-query_masking_rules:
-  rule:
-    name: hide encrypt/decrypt arguments
-    regexp: '((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:''(?:\\''|.)+''|.*?)\s*\)'
-    # or more secure, but also more invasive:
-    # (aes_\w+)\s*\(.*\)
-    replace: \1(???)
-
-# Uncomment to use custom http handlers.
-# rules are checked from top to bottom, first match runs the handler
-# url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
-# methods - to match request method, you can use commas to separate multiple method matches(optional)
-# headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
-# handler is request handler
-# type - supported types: static, dynamic_query_handler, predefined_query_handler
-# 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 params
-# status - use with static type, response status code
-# content_type - use with static type, response 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 send to client.
-
-# http_handlers:
-#     - rule:
-#         url: /
-#         methods: POST,GET
-#         headers:
-#           pragma: no-cache
-#         handler:
-#           type: dynamic_query_handler
-#           query_param_name: query
-#     - rule:
-#         url: /predefined_query
-#         methods: POST,GET
-#         handler:
-#           type: predefined_query_handler
-#           query: 'SELECT * FROM system.settings'
-#     - rule:
-#         handler:
-#           type: static
-#           status: 200
-#           content_type: 'text/plain; charset=UTF-8'
-#           response_content: config://http_server_default_response
-
-send_crash_reports:
-  # Changing <enabled> to true allows sending crash reports to
-  # the ClickHouse core developers team via Sentry https://sentry.io
-  # Doing so at least in pre-production environments is highly appreciated
-  enabled: false
-  # Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report
-  anonymize: false
-  # Default endpoint should be changed to different Sentry DSN only if you have
-  # some in-house engineers or hired consultants who're going to debug ClickHouse issues for you
-  endpoint: 'https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277'
-  # Uncomment to disable ClickHouse internal DNS caching.
-  # disable_internal_dns_cache: 1
-
-storage_configuration:
-  disks:
-    s3:
-      secret_access_key: REPLACE_ME
-      access_key_id: 'REPLACE_ME'
diff --git a/programs/diagnostics/testdata/configs/yaml/users.d/default-password.yaml b/programs/diagnostics/testdata/configs/yaml/users.d/default-password.yaml
deleted file mode 100644
index c27bb7cb071..00000000000
--- a/programs/diagnostics/testdata/configs/yaml/users.d/default-password.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-# Users and ACL.
-users:
-  # If user name was not specified, 'default' user is used.
-  default:
-
-    password_sha256_hex: "REPLACE_ME"
diff --git a/programs/diagnostics/testdata/configs/yaml/users.yaml b/programs/diagnostics/testdata/configs/yaml/users.yaml
deleted file mode 100644
index 82f2d67f2a4..00000000000
--- a/programs/diagnostics/testdata/configs/yaml/users.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-include_from: "../include/yaml/user-include.yaml"
-# Profiles of settings.
-profiles:
-  # Default settings.
-  default:
-    # Maximum memory usage for processing single query, in bytes.
-    max_memory_usage: 10000000000
-    load_balancing: random
-
-    # Profile that allows only read queries.
-  readonly:
-    readonly: 1
-
-# Users and ACL.
-users:
-  # If user name was not specified, 'default' user is used.
-  default:
-
-    password: 'REPLACE_ME'
-
-    networks:
-      ip: '::/0'
-
-    # Settings profile for user.
-    profile: default
-
-    # Quota for user.
-    quota: default
-
-    # User can create other users and grant rights to them.
-    # access_management: 1
-
-# Quotas.
-quotas:
-  # Name of quota.
-  default:
-    # Limits for time interval. You could specify many intervals with different limits.
-    interval:
-      # Length of interval.
-      duration: 3600
-
-      # No limits. Just calculate resource usage for time interval.
-      queries: 0
-      errors: 0
-      result_rows: 0
-      read_rows: 0
-      execution_time: 0
diff --git a/programs/diagnostics/testdata/configs/yandex_xml/config.xml b/programs/diagnostics/testdata/configs/yandex_xml/config.xml
deleted file mode 100644
index 181f52a92f8..00000000000
--- a/programs/diagnostics/testdata/configs/yandex_xml/config.xml
+++ /dev/null
@@ -1,1167 +0,0 @@
-<!--
-  NOTE: User and query level settings are set up in "users.xml" file.
-  If you have accidentally specified user-level settings here, server won't start.
-  You can either move the settings to the right place inside "users.xml" file
-   or add <skip_check_for_incorrect_settings>1</skip_check_for_incorrect_settings> here.
--->
-<yandex>
-    <include_from>../include/xml/server-include.xml</include_from>
-    <logger>
-        <!-- Possible levels [1]:
-
-          - none (turns off logging)
-          - fatal
-          - critical
-          - error
-          - warning
-          - notice
-          - information
-          - debug
-          - trace
-          - test (not for production usage)
-
-            [1]: https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/Logger.h#L105-L114
-        -->
-        <level>trace</level>
-        <log>/var/log/clickhouse-server/clickhouse-server.log</log>
-        <errorlog>/var/log/clickhouse-server/clickhouse-server.err.log</errorlog>
-        <!-- Rotation policy
-             See https://github.com/pocoproject/poco/blob/poco-1.9.4-release/Foundation/include/Poco/FileChannel.h#L54-L85
-          -->
-        <size>1000M</size>
-        <count>10</count>
-        <!-- <console>1</console> --> <!-- Default behavior is autodetection (log to console if not daemon mode and is tty) -->
-
-        <!-- Per level overrides (legacy):
-
-        For example to suppress logging of the ConfigReloader you can use:
-        NOTE: levels.logger is reserved, see below.
-        -->
-        <!--
-        <levels>
-          <ConfigReloader>none</ConfigReloader>
-        </levels>
-        -->
-
-        <!-- Per level overrides:
-
-        For example to suppress logging of the RBAC for default user you can use:
-        (But please note that the logger name maybe changed from version to version, even after minor upgrade)
-        -->
-        <!--
-        <levels>
-          <logger>
-            <name>ContextAccess (default)</name>
-            <level>none</level>
-          </logger>
-          <logger>
-            <name>DatabaseOrdinary (test)</name>
-            <level>none</level>
-          </logger>
-        </levels>
-        -->
-    </logger>
-    <!-- Add headers to response in options request. OPTIONS method is used in CORS preflight requests. -->
-    <!-- It is off by default. Next headers are obligate for CORS.-->
-    <!-- http_options_response>
-        <header>
-            <name>Access-Control-Allow-Origin</name>
-            <value>*</value>
-        </header>
-        <header>
-            <name>Access-Control-Allow-Headers</name>
-            <value>origin, x-requested-with</value>
-        </header>
-        <header>
-            <name>Access-Control-Allow-Methods</name>
-            <value>POST, GET, OPTIONS</value>
-        </header>
-        <header>
-            <name>Access-Control-Max-Age</name>
-            <value>86400</value>
-        </header>
-    </http_options_response -->
-
-    <!-- It is the name that will be shown in the clickhouse-client.
-         By default, anything with "production" will be highlighted in red in query prompt.
-    -->
-    <!--display_name>production</display_name-->
-
-    <!-- Port for HTTP API. See also 'https_port' for secure connections.
-         This interface is also used by ODBC and JDBC drivers (DataGrip, Dbeaver, ...)
-         and by most of web interfaces (embedded UI, Grafana, Redash, ...).
-      -->
-    <http_port>8123</http_port>
-
-    <!-- Port for interaction by native protocol with:
-         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
-         - clickhouse-server with other clickhouse-servers for distributed query processing;
-         - ClickHouse drivers and applications supporting native protocol
-         (this protocol is also informally called as "the TCP protocol");
-         See also 'tcp_port_secure' for secure connections.
-    -->
-    <tcp_port>9000</tcp_port>
-
-    <!-- Compatibility with MySQL protocol.
-         ClickHouse will pretend to be MySQL for applications connecting to this port.
-    -->
-    <mysql_port>9004</mysql_port>
-
-    <!-- Compatibility with PostgreSQL protocol.
-         ClickHouse will pretend to be PostgreSQL for applications connecting to this port.
-    -->
-    <postgresql_port>9005</postgresql_port>
-
-    <!-- HTTP API with TLS (HTTPS).
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-    -->
-    <!-- <https_port>8443</https_port> -->
-
-    <!-- Native interface with TLS.
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-    -->
-    <!-- <tcp_port_secure>9440</tcp_port_secure> -->
-
-    <!-- Native interface wrapped with PROXYv1 protocol
-         PROXYv1 header sent for every connection.
-         ClickHouse will extract information about proxy-forwarded client address from the header.
-    -->
-    <!-- <tcp_with_proxy_port>9011</tcp_with_proxy_port> -->
-
-    <!-- Port for communication between replicas. Used for data exchange.
-         It provides low-level data access between servers.
-         This port should not be accessible from untrusted networks.
-         See also 'interserver_http_credentials'.
-         Data transferred over connections to this port should not go through untrusted networks.
-         See also 'interserver_https_port'.
-      -->
-    <interserver_http_port>9009</interserver_http_port>
-
-    <!-- Port for communication between replicas with TLS.
-         You have to configure certificate to enable this interface.
-         See the openSSL section below.
-         See also 'interserver_http_credentials'.
-      -->
-    <!-- <interserver_https_port>9010</interserver_https_port> -->
-
-    <!-- Hostname that is used by other replicas to request this server.
-         If not specified, than it is determined analogous to 'hostname -f' command.
-         This setting could be used to switch replication to another network interface
-         (the server may be connected to multiple networks via multiple addresses)
-      -->
-    <!--
-    <interserver_http_host>example.yandex.ru</interserver_http_host>
-    -->
-
-    <!-- You can specify credentials for authenthication between replicas.
-         This is required when interserver_https_port is accessible from untrusted networks,
-         and also recommended to avoid SSRF attacks from possibly compromised services in your network.
-      -->
-    <!--<interserver_http_credentials>
-        <user>interserver</user>
-        <password></password>
-    </interserver_http_credentials>-->
-
-    <!-- Listen specified address.
-         Use :: (wildcard IPv6 address), if you want to accept connections both with IPv4 and IPv6 from everywhere.
-         Notes:
-         If you open connections from wildcard address, make sure that at least one of the following measures applied:
-         - server is protected by firewall and not accessible from untrusted networks;
-         - all users are restricted to subset of network addresses (see users.xml);
-         - all users have strong passwords, only secure (TLS) interfaces are accessible, or connections are only made via TLS interfaces.
-         - users without password have readonly access.
-         See also: https://www.shodan.io/search?query=clickhouse
-      -->
-    <!-- <listen_host>::</listen_host> -->
-
-    <!-- Same for hosts without support for IPv6: -->
-    <!-- <listen_host>0.0.0.0</listen_host> -->
-
-    <!-- Default values - try listen localhost on IPv4 and IPv6. -->
-    <!--
-    <listen_host>::1</listen_host>
-    <listen_host>127.0.0.1</listen_host>
-    -->
-
-    <!-- Don't exit if IPv6 or IPv4 networks are unavailable while trying to listen. -->
-    <!-- <listen_try>0</listen_try> -->
-
-    <!-- Allow multiple servers to listen on the same address:port. This is not recommended.
-      -->
-    <!-- <listen_reuse_port>0</listen_reuse_port> -->
-
-    <!-- <listen_backlog>4096</listen_backlog> -->
-
-    <max_connections>4096</max_connections>
-
-    <!-- For 'Connection: keep-alive' in HTTP 1.1 -->
-    <keep_alive_timeout>3</keep_alive_timeout>
-
-    <!-- gRPC protocol (see src/Server/grpc_protos/clickhouse_grpc.proto for the API) -->
-    <!-- <grpc_port>9100</grpc_port> -->
-    <grpc>
-        <enable_ssl>false</enable_ssl>
-
-        <!-- The following two files are used only if enable_ssl=1 -->
-        <ssl_cert_file>/path/to/ssl_cert_file</ssl_cert_file>
-        <ssl_key_file>/path/to/ssl_key_file</ssl_key_file>
-
-        <!-- Whether server will request client for a certificate -->
-        <ssl_require_client_auth>false</ssl_require_client_auth>
-
-        <!-- The following file is used only if ssl_require_client_auth=1 -->
-        <ssl_ca_cert_file>/path/to/ssl_ca_cert_file</ssl_ca_cert_file>
-
-        <!-- Default compression algorithm (applied if client doesn't specify another algorithm, see result_compression in QueryInfo).
-             Supported algorithms: none, deflate, gzip, stream_gzip -->
-        <compression>deflate</compression>
-
-        <!-- Default compression level (applied if client doesn't specify another level, see result_compression in QueryInfo).
-             Supported levels: none, low, medium, high -->
-        <compression_level>medium</compression_level>
-
-        <!-- Send/receive message size limits in bytes. -1 means unlimited -->
-        <max_send_message_size>-1</max_send_message_size>
-        <max_receive_message_size>-1</max_receive_message_size>
-
-        <!-- Enable if you want very detailed logs -->
-        <verbose_logs>false</verbose_logs>
-    </grpc>
-
-    <!-- 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/server.crt</certificateFile>
-            <privateKeyFile>/etc/clickhouse-server/server.key</privateKeyFile>
-            <!-- dhparams are optional. You can delete the <dhParamsFile> element.
-                 To generate dhparams, use the following command:
-                  openssl dhparam -out /etc/clickhouse-server/dhparam.pem 4096
-                 Only file format with BEGIN DH PARAMETERS is supported.
-              -->
-            <dhParamsFile>/etc/clickhouse-server/dhparam.pem</dhParamsFile>
-            <verificationMode>none</verificationMode>
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-        </server>
-
-        <client> <!-- Used for connecting to https dictionary source and secured Zookeeper communication -->
-            <loadDefaultCAFile>true</loadDefaultCAFile>
-            <cacheSessions>true</cacheSessions>
-            <disableProtocols>sslv2,sslv3</disableProtocols>
-            <preferServerCiphers>true</preferServerCiphers>
-            <!-- Use for self-signed: <verificationMode>none</verificationMode> -->
-            <invalidCertificateHandler>
-                <!-- Use for self-signed: <name>AcceptCertificateHandler</name> -->
-                <name>RejectCertificateHandler</name>
-            </invalidCertificateHandler>
-        </client>
-    </openSSL>
-
-    <!-- Default root page on http[s] server. For example load UI from https://tabix.io/ when opening http://localhost:8123 -->
-    <!--
-    <http_server_default_response><![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>
-    -->
-
-    <!-- Maximum number of concurrent queries. -->
-    <max_concurrent_queries>100</max_concurrent_queries>
-
-    <!-- Maximum memory usage (resident set size) for server process.
-         Zero value or unset means default. Default is "max_server_memory_usage_to_ram_ratio" of available physical RAM.
-         If the value is larger than "max_server_memory_usage_to_ram_ratio" of available physical RAM, it will be cut down.
-
-         The constraint is checked on query execution time.
-         If a query tries to allocate memory and the current memory usage plus allocation is greater
-          than specified threshold, exception will be thrown.
-
-         It is not practical to set this constraint to small values like just a few gigabytes,
-          because memory allocator will keep this amount of memory in caches and the server will deny service of queries.
-      -->
-    <max_server_memory_usage>0</max_server_memory_usage>
-
-    <!-- Maximum number of threads in the Global thread pool.
-    This will default to a maximum of 10000 threads if not specified.
-    This setting will be useful in scenarios where there are a large number
-    of distributed queries that are running concurrently but are idling most
-    of the time, in which case a higher number of threads might be required.
-    -->
-
-    <max_thread_pool_size>10000</max_thread_pool_size>
-
-    <!-- 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>
-
-    <!-- Simple server-wide memory profiler. Collect a stack trace at every peak allocation step (in bytes).
-         Data will be stored in system.trace_log table with query_id = empty string.
-         Zero means disabled.
-      -->
-    <total_memory_profiler_step>4194304</total_memory_profiler_step>
-
-    <!-- Collect random allocations and deallocations and write them into system.trace_log with 'MemorySample' trace_type.
-         The probability is for every alloc/free regardless to the size of the allocation.
-         Note that sampling happens only when the amount of untracked memory exceeds the untracked memory limit,
-          which is 4 MiB by default but can be lowered if 'total_memory_profiler_step' is lowered.
-         You may want to set 'total_memory_profiler_step' to 1 for extra fine grained sampling.
-      -->
-    <total_memory_tracker_sample_probability>0</total_memory_tracker_sample_probability>
-
-    <!-- Set limit on number of open files (default: maximum). This setting makes sense on Mac OS X because getrlimit() fails to retrieve
-         correct maximum value. -->
-    <!-- <max_open_files>262144</max_open_files> -->
-
-    <!-- Size of cache of uncompressed blocks of data, used in tables of MergeTree family.
-         In bytes. Cache is single for server. Memory is allocated only on demand.
-         Cache is used when 'use_uncompressed_cache' user setting turned on (off by default).
-         Uncompressed cache is advantageous only for very short queries and in rare cases.
-
-         Note: uncompressed cache can be pointless for lz4, because memory bandwidth
-         is slower than multi-core decompression on some server configurations.
-         Enabling it can sometimes paradoxically make queries slower.
-      -->
-    <uncompressed_cache_size>8589934592</uncompressed_cache_size>
-
-    <!-- Approximate size of mark cache, used in tables of MergeTree family.
-         In bytes. Cache is single for server. Memory is allocated only on demand.
-         You should not lower this value.
-      -->
-    <mark_cache_size>5368709120</mark_cache_size>
-
-
-    <!-- If you enable the `min_bytes_to_use_mmap_io` setting,
-         the data in MergeTree tables can be read with mmap to avoid copying from kernel to userspace.
-         It makes sense only for large files and helps only if data reside in page cache.
-         To avoid frequent open/mmap/munmap/close calls (which are very expensive due to consequent page faults)
-         and to reuse mappings from several threads and queries,
-         the cache of mapped files is maintained. Its size is the number of mapped regions (usually equal to the number of mapped files).
-         The amount of data in mapped files can be monitored
-         in system.metrics, system.metric_log by the MMappedFiles, MMappedFileBytes metrics
-         and in system.asynchronous_metrics, system.asynchronous_metrics_log by the MMapCacheCells metric,
-         and also in system.events, system.processes, system.query_log, system.query_thread_log, system.query_views_log by the
-         CreatedReadBufferMMap, CreatedReadBufferMMapFailed, MMappedFileCacheHits, MMappedFileCacheMisses events.
-         Note that the amount of data in mapped files does not consume memory directly and is not accounted
-         in query or server memory usage - because this memory can be discarded similar to OS page cache.
-         The cache is dropped (the files are closed) automatically on removal of old parts in MergeTree,
-         also it can be dropped manually by the SYSTEM DROP MMAP CACHE query.
-      -->
-    <mmap_cache_size>1000</mmap_cache_size>
-
-    <!-- Cache size in bytes for compiled expressions.-->
-    <compiled_expression_cache_size>134217728</compiled_expression_cache_size>
-
-    <!-- Cache size in elements for compiled expressions.-->
-    <compiled_expression_cache_elements_size>10000</compiled_expression_cache_elements_size>
-
-    <!-- Path to data directory, with trailing slash. -->
-    <path>/var/lib/clickhouse/</path>
-
-    <!-- Path to temporary data for processing hard queries. -->
-    <tmp_path>/var/lib/clickhouse/tmp/</tmp_path>
-
-    <!-- Policy from the <storage_configuration> for the temporary files.
-         If not set <tmp_path> is used, otherwise <tmp_path> is ignored.
-
-         Notes:
-         - move_factor              is ignored
-         - keep_free_space_bytes    is ignored
-         - max_data_part_size_bytes is ignored
-         - you must have exactly one volume in that policy
-    -->
-    <!-- <tmp_policy>tmp</tmp_policy> -->
-
-    <!-- Directory with user provided files that are accessible by 'file' table function. -->
-    <user_files_path>/var/lib/clickhouse/user_files/</user_files_path>
-
-    <!-- LDAP server definitions. -->
-    <ldap_servers>
-        <!-- List LDAP servers with their connection parameters here to later 1) use them as authenticators for dedicated local users,
-              who have 'ldap' authentication mechanism specified instead of 'password', or to 2) use them as remote user directories.
-             Parameters:
-                host - LDAP server hostname or IP, this parameter is mandatory and cannot be empty.
-                port - LDAP server port, default is 636 if enable_tls is set to true, 389 otherwise.
-                bind_dn - template used to construct the DN to bind to.
-                        The resulting DN will be constructed by replacing all '{user_name}' substrings of the template with the actual
-                         user name during each authentication attempt.
-                user_dn_detection - section with LDAP search parameters for detecting the actual user DN of the bound user.
-                        This is mainly used in search filters for further role mapping when the server is Active Directory. The
-                         resulting user DN will be used when replacing '{user_dn}' substrings wherever they are allowed. By default,
-                         user DN is set equal to bind DN, but once search is performed, it will be updated with to the actual detected
-                         user DN value.
-                    base_dn - template used to construct the base DN for the LDAP search.
-                            The resulting DN will be constructed by replacing all '{user_name}' and '{bind_dn}' substrings
-                             of the template with the actual user name and bind DN during the LDAP search.
-                    scope - scope of the LDAP search.
-                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-                    search_filter - template used to construct the search filter for the LDAP search.
-                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', and '{base_dn}'
-                             substrings of the template with the actual user name, bind DN, and base DN during the LDAP search.
-                            Note, that the special characters must be escaped properly in XML.
-                verification_cooldown - a period of time, in seconds, after a successful bind attempt, during which a user will be assumed
-                         to be successfully authenticated for all consecutive requests without contacting the LDAP server.
-                        Specify 0 (the default) to disable caching and force contacting the LDAP server for each authentication request.
-                enable_tls - flag to trigger use of secure connection to the LDAP server.
-                        Specify 'no' for plain text (ldap://) protocol (not recommended).
-                        Specify 'yes' for LDAP over SSL/TLS (ldaps://) protocol (recommended, the default).
-                        Specify 'starttls' for legacy StartTLS protocol (plain text (ldap://) protocol, upgraded to TLS).
-                tls_minimum_protocol_version - the minimum protocol version of SSL/TLS.
-                        Accepted values are: 'ssl2', 'ssl3', 'tls1.0', 'tls1.1', 'tls1.2' (the default).
-                tls_require_cert - SSL/TLS peer certificate verification behavior.
-                        Accepted values are: 'never', 'allow', 'try', 'demand' (the default).
-                tls_cert_file - path to certificate file.
-                tls_key_file - path to certificate key file.
-                tls_ca_cert_file - path to CA certificate file.
-                tls_ca_cert_dir - path to the directory containing CA certificates.
-                tls_cipher_suite - allowed cipher suite (in OpenSSL notation).
-             Example:
-                <my_ldap_server>
-                    <host>localhost</host>
-                    <port>636</port>
-                    <bind_dn>uid={user_name},ou=users,dc=example,dc=com</bind_dn>
-                    <verification_cooldown>300</verification_cooldown>
-                    <enable_tls>yes</enable_tls>
-                    <tls_minimum_protocol_version>tls1.2</tls_minimum_protocol_version>
-                    <tls_require_cert>demand</tls_require_cert>
-                    <tls_cert_file>/path/to/tls_cert_file</tls_cert_file>
-                    <tls_key_file>/path/to/tls_key_file</tls_key_file>
-                    <tls_ca_cert_file>/path/to/tls_ca_cert_file</tls_ca_cert_file>
-                    <tls_ca_cert_dir>/path/to/tls_ca_cert_dir</tls_ca_cert_dir>
-                    <tls_cipher_suite>ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:AES256-GCM-SHA384</tls_cipher_suite>
-                </my_ldap_server>
-             Example (typical Active Directory with configured user DN detection for further role mapping):
-                <my_ad_server>
-                    <host>localhost</host>
-                    <port>389</port>
-                    <bind_dn>EXAMPLE\{user_name}</bind_dn>
-                    <user_dn_detection>
-                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
-                        <search_filter>(&amp;(objectClass=user)(sAMAccountName={user_name}))</search_filter>
-                    </user_dn_detection>
-                    <enable_tls>no</enable_tls>
-                </my_ad_server>
-        -->
-    </ldap_servers>
-
-    <!-- To enable Kerberos authentication support for HTTP requests (GSS-SPNEGO), for those users who are explicitly configured
-          to authenticate via Kerberos, define a single 'kerberos' section here.
-         Parameters:
-            principal - canonical service principal name, that will be acquired and used when accepting security contexts.
-                    This parameter is optional, if omitted, the default principal will be used.
-                    This parameter cannot be specified together with 'realm' parameter.
-            realm - a realm, that will be used to restrict authentication to only those requests whose initiator's realm matches it.
-                    This parameter is optional, if omitted, no additional filtering by realm will be applied.
-                    This parameter cannot be specified together with 'principal' parameter.
-         Example:
-            <kerberos />
-         Example:
-            <kerberos>
-                <principal>HTTP/clickhouse.example.com@EXAMPLE.COM</principal>
-            </kerberos>
-         Example:
-            <kerberos>
-                <realm>EXAMPLE.COM</realm>
-            </kerberos>
-    -->
-
-    <!-- Sources to read users, roles, access rights, profiles of settings, quotas. -->
-    <user_directories>
-        <users_xml>
-            <!-- Path to configuration file with predefined users. -->
-            <path>users.xml</path>
-        </users_xml>
-        <local_directory>
-            <!-- Path to folder where users created by SQL commands are stored. -->
-            <path>/var/lib/clickhouse/access/</path>
-        </local_directory>
-
-        <!-- To add an LDAP server as a remote user directory of users that are not defined locally, define a single 'ldap' section
-              with the following parameters:
-                server - one of LDAP server names defined in 'ldap_servers' config section above.
-                        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 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
-                         CREATE ROLE command.
-                        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.
-                    scope - scope of the LDAP search.
-                            Accepted values are: 'base', 'one_level', 'children', 'subtree' (the default).
-                    search_filter - template used to construct the search filter for the LDAP search.
-                            The resulting filter will be constructed by replacing all '{user_name}', '{bind_dn}', '{user_dn}', and
-                             '{base_dn}' substrings of the template with the actual user name, bind DN, user DN, and base DN during
-                             each LDAP search.
-                            Note, that the special characters must be escaped properly in XML.
-                    attribute - attribute name whose values will be returned by the LDAP search. 'cn', by default.
-                    prefix - prefix, that will be expected to be in front of each string in the original list of strings returned by
-                             the LDAP search. Prefix will be removed from the original strings and resulting strings will be treated
-                             as local role names. Empty, by default.
-             Example:
-                <ldap>
-                    <server>my_ldap_server</server>
-                    <roles>
-                        <my_local_role1 />
-                        <my_local_role2 />
-                    </roles>
-                    <role_mapping>
-                        <base_dn>ou=groups,dc=example,dc=com</base_dn>
-                        <scope>subtree</scope>
-                        <search_filter>(&amp;(objectClass=groupOfNames)(member={bind_dn}))</search_filter>
-                        <attribute>cn</attribute>
-                        <prefix>clickhouse_</prefix>
-                    </role_mapping>
-                </ldap>
-             Example (typical Active Directory with role mapping that relies on the detected user DN):
-                <ldap>
-                    <server>my_ad_server</server>
-                    <role_mapping>
-                        <base_dn>CN=Users,DC=example,DC=com</base_dn>
-                        <attribute>CN</attribute>
-                        <scope>subtree</scope>
-                        <search_filter>(&amp;(objectClass=group)(member={user_dn}))</search_filter>
-                        <prefix>clickhouse_</prefix>
-                    </role_mapping>
-                </ldap>
-        -->
-    </user_directories>
-
-    <!-- Default profile of settings. -->
-    <default_profile>default</default_profile>
-
-    <!-- Comma-separated list of prefixes for user-defined settings. -->
-    <custom_settings_prefixes></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> -->
-
-    <!-- Buffer profile of settings.
-         This settings are used by Buffer storage to flush data to the underlying table.
-         Default: used from system_profile directive.
-    -->
-    <!-- <buffer_profile>default</buffer_profile> -->
-
-    <!-- Default database. -->
-    <default_database>default</default_database>
-
-    <!-- Server time zone could be set here.
-
-         Time zone is used when converting between String and DateTime types,
-          when printing DateTime in text formats and parsing DateTime from text,
-          it is used in date and time related functions, if specific time zone was not passed as an argument.
-
-         Time zone is specified as identifier from IANA time zone database, like UTC or Africa/Abidjan.
-         If not specified, system time zone at server startup is used.
-
-         Please note, that server could display time zone alias instead of specified name.
-         Example: W-SU is an alias for Europe/Moscow and Zulu is an alias for UTC.
-    -->
-    <!-- <timezone>Europe/Moscow</timezone> -->
-
-    <!-- You can specify umask here (see "man umask"). Server will apply it on startup.
-         Number is always parsed as octal. Default umask is 027 (other users cannot read logs, data files, etc; group can only read).
-    -->
-    <!-- <umask>022</umask> -->
-
-    <!-- Perform mlockall after startup to lower first queries latency
-          and to prevent clickhouse executable from being paged out under high IO load.
-         Enabling this option is recommended but will lead to increased startup time for up to a few seconds.
-    -->
-    <mlock_executable>true</mlock_executable>
-
-    <!-- Reallocate memory for machine code ("text") using huge pages. Highly experimental. -->
-    <remap_executable>false</remap_executable>
-
-    <![CDATA[
-         Uncomment below in order to use JDBC table engine and function.
-
-         To install and run JDBC bridge in background:
-         * [Debian/Ubuntu]
-           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-           apt install --no-install-recommends -f ./clickhouse-jdbc-bridge_$PKG_VER-1_all.deb
-           clickhouse-jdbc-bridge &
-
-         * [CentOS/RHEL]
-           export MVN_URL=https://repo1.maven.org/maven2/ru/yandex/clickhouse/clickhouse-jdbc-bridge
-           export PKG_VER=$(curl -sL $MVN_URL/maven-metadata.xml | grep '<release>' | sed -e 's|.*>\(.*\)<.*|\1|')
-           wget https://github.com/ClickHouse/clickhouse-jdbc-bridge/releases/download/v$PKG_VER/clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-           yum localinstall -y clickhouse-jdbc-bridge-$PKG_VER-1.noarch.rpm
-           clickhouse-jdbc-bridge &
-
-         Please refer to https://github.com/ClickHouse/clickhouse-jdbc-bridge#usage for more information.
-    ]]>
-    <!--
-    <jdbc_bridge>
-        <host>127.0.0.1</host>
-        <port>9019</port>
-    </jdbc_bridge>
-    -->
-
-    <!-- Configuration of clusters that could be used in Distributed tables.
-         https://clickhouse.com/docs/en/operations/table_engines/distributed/
-      -->
-    <remote_servers>
-        <!-- Test only shard config for testing distributed storage -->
-        <test_shard_localhost>
-            <!-- Inter-server per-cluster secret for Distributed queries
-                 default: no secret (no authentication will be performed)
-
-                 If set, then Distributed queries will be validated on shards, so at least:
-                 - such cluster should exist on the shard,
-                 - such cluster should have the same secret.
-
-                 And also (and which is more important), the initial_user will
-                 be used as current user for the query.
-
-                 Right now the protocol is pretty simple and it only takes into account:
-                 - cluster name
-                 - query
-
-                 Also it will be nice if the following will be implemented:
-                 - source hostname (see interserver_http_host), but then it will depends from DNS,
-                   it can use IP address instead, but then the you need to get correct on the initiator node.
-                 - target hostname / ip address (same notes as for source hostname)
-                 - time-based security tokens
-            -->
-            <!-- <secret></secret> -->
-
-            <shard>
-                <!-- Optional. Whether to write data to just one of the replicas. Default: false (write data to all replicas). -->
-                <!-- <internal_replication>false</internal_replication> -->
-                <!-- Optional. Shard weight when writing data. Default: 1. -->
-                <!-- <weight>1</weight> -->
-                <replica>
-                    <host>localhost</host>
-                    <port>9000</port>
-                    <!-- Optional. Priority of the replica for load_balancing. Default: 1 (less value has more priority). -->
-                    <!-- <priority>1</priority> -->
-                </replica>
-            </shard>
-        </test_shard_localhost>
-    </remote_servers>
-
-    <!-- The list of hosts allowed to use in URL-related storage engines and table functions.
-        If this section is not present in configuration, all hosts are allowed.
-    -->
-    <!--<remote_url_allow_hosts>-->
-    <!-- Host should be specified exactly as in URL. The name is checked before DNS resolution.
-        Example: "yandex.ru", "yandex.ru." and "www.yandex.ru" are different hosts.
-                If port is explicitly specified in URL, the host:port is checked as a whole.
-                If host specified here without port, any port with this host allowed.
-                "yandex.ru" -> "yandex.ru:443", "yandex.ru:80" etc. is allowed, but "yandex.ru:80" -> only "yandex.ru:80" is allowed.
-        If the host is specified as IP address, it is checked as specified in URL. Example: "[2a02:6b8:a::a]".
-        If there are redirects and support for redirects is enabled, every redirect (the Location field) is checked.
-        Host should be specified using the host xml tag:
-                <host>yandex.ru</host>
-    -->
-
-    <!-- Regular expression can be specified. RE2 engine is used for regexps.
-        Regexps are not aligned: don't forget to add ^ and $. Also don't forget to escape dot (.) metacharacter
-        (forgetting to do so is a common source of error).
-    -->
-    <!--</remote_url_allow_hosts>-->
-
-    <!-- If element has 'incl' attribute, then for it's value will be used corresponding substitution from another file.
-         By default, path to file with substitutions is /etc/metrika.xml. It could be changed in config in 'include_from' element.
-         Values for substitutions are specified in /clickhouse/name_of_substitution elements in that file.
-      -->
-
-    <!-- ZooKeeper is used to store metadata about replicas, when using Replicated tables.
-         Optional. If you don't use replicated tables, you could omit that.
-
-         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/
-      -->
-
-    <!--
-    <zookeeper>
-        <node>
-            <host>example1</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>example2</host>
-            <port>2181</port>
-        </node>
-        <node>
-            <host>example3</host>
-            <port>2181</port>
-        </node>
-    </zookeeper>
-    -->
-
-    <!-- Substitutions for parameters of replicated tables.
-          Optional. If you don't use replicated tables, you could omit that.
-
-         See https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/replication/#creating-replicated-tables
-      -->
-    <!--
-    <macros>
-        <shard>01</shard>
-        <replica>example01-01-1</replica>
-    </macros>
-    -->
-
-
-    <!-- Reloading interval for embedded dictionaries, in seconds. Default: 3600. -->
-    <builtin_dictionaries_reload_interval>3600</builtin_dictionaries_reload_interval>
-
-
-    <!-- Maximum session timeout, in seconds. Default: 3600. -->
-    <max_session_timeout>3600</max_session_timeout>
-
-    <!-- Default session timeout, in seconds. Default: 60. -->
-    <default_session_timeout>60</default_session_timeout>
-
-    <!-- Sending data to Graphite for monitoring. Several sections can be defined. -->
-    <!--
-        interval - send every X second
-        root_path - prefix for keys
-        hostname_in_path - append hostname to root_path (default = true)
-        metrics - send data from table system.metrics
-        events - send data from table system.events
-        asynchronous_metrics - send data from table system.asynchronous_metrics
-    -->
-    <!--
-    <graphite>
-        <host>localhost</host>
-        <port>42000</port>
-        <timeout>0.1</timeout>
-        <interval>60</interval>
-        <root_path>one_min</root_path>
-        <hostname_in_path>true</hostname_in_path>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <events_cumulative>false</events_cumulative>
-        <asynchronous_metrics>true</asynchronous_metrics>
-    </graphite>
-    <graphite>
-        <host>localhost</host>
-        <port>42000</port>
-        <timeout>0.1</timeout>
-        <interval>1</interval>
-        <root_path>one_sec</root_path>
-
-        <metrics>true</metrics>
-        <events>true</events>
-        <events_cumulative>false</events_cumulative>
-        <asynchronous_metrics>false</asynchronous_metrics>
-    </graphite>
-    -->
-
-    <!-- Query log. Used only for queries with setting log_queries = 1. -->
-    <query_log>
-        <!-- What table to insert data. If table is not exist, it will be created.
-             When query log structure is changed after system update,
-              then old table will be renamed and new table will be created automatically.
-        -->
-        <database>system</database>
-        <table>query_log</table>
-        <!--
-            PARTITION BY expr: https://clickhouse.com/docs/en/table_engines/mergetree-family/custom_partitioning_key/
-            Example:
-                event_date
-                toMonday(event_date)
-                toYYYYMM(event_date)
-                toStartOfHour(event_time)
-        -->
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <!--
-            Table TTL specification: https://clickhouse.com/docs/en/engines/table-engines/mergetree-family/mergetree/#mergetree-table-ttl
-            Example:
-                event_date + INTERVAL 1 WEEK
-                event_date + INTERVAL 7 DAY DELETE
-                event_date + INTERVAL 2 WEEK TO DISK 'bbb'
-
-        <ttl>event_date + INTERVAL 30 DAY DELETE</ttl>
-        -->
-
-        <!-- 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>
-          -->
-
-        <!-- Interval of flushing data. -->
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_log>
-
-    <!-- Trace log. Stores stack traces collected by query profilers.
-         See query_profiler_real_time_period_ns and query_profiler_cpu_time_period_ns settings. -->
-    <trace_log>
-        <database>system</database>
-        <table>trace_log</table>
-
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </trace_log>
-
-    <!-- Query thread log. Has information about all threads participated in query execution.
-         Used only for queries with setting log_query_threads = 1. -->
-    <query_thread_log>
-        <database>system</database>
-        <table>query_thread_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_thread_log>
-
-    <!-- Query views log. Has information about all dependent views associated with a query.
-         Used only for queries with setting log_query_views = 1. -->
-    <query_views_log>
-        <database>system</database>
-        <table>query_views_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </query_views_log>
-
-    <!-- Uncomment if use part log.
-         Part log contains information about all actions with parts in MergeTree tables (creation, deletion, merges, downloads).-->
-    <part_log>
-        <database>system</database>
-        <table>part_log</table>
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </part_log>
-
-    <!-- Uncomment to write text log into table.
-         Text log contains all information from usual server log but stores it in structured and efficient way.
-         The level of the messages that goes to the table can be limited (<level>), if not specified all messages will go to the table.
-    <text_log>
-        <database>system</database>
-        <table>text_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <level></level>
-    </text_log>
-    -->
-
-    <!-- Metric log contains rows with current values of ProfileEvents, CurrentMetrics collected with "collect_interval_milliseconds" interval. -->
-    <metric_log>
-        <database>system</database>
-        <table>metric_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-        <collect_interval_milliseconds>1000</collect_interval_milliseconds>
-    </metric_log>
-
-    <!--
-        Asynchronous metric log contains values of metrics from
-        system.asynchronous_metrics.
-    -->
-    <asynchronous_metric_log>
-        <database>system</database>
-        <table>asynchronous_metric_log</table>
-        <!--
-            Asynchronous metrics are updated once a minute, so there is
-            no need to flush more often.
-        -->
-        <flush_interval_milliseconds>7000</flush_interval_milliseconds>
-    </asynchronous_metric_log>
-
-    <!--
-        OpenTelemetry log contains OpenTelemetry trace spans.
-    -->
-    <opentelemetry_span_log>
-        <!--
-            The default table creation code is insufficient, this <engine> spec
-            is a workaround. There is no 'event_time' for this log, but two times,
-            start and finish. It is sorted by finish time, to avoid inserting
-            data too far away in the past (probably we can sometimes insert a span
-            that is seconds earlier than the last span in the table, due to a race
-            between several spans inserted in parallel). This gives the spans a
-            global order that we can use to e.g. retry insertion into some external
-            system.
-        -->
-        <engine>
-            engine MergeTree
-            partition by toYYYYMM(finish_date)
-            order by (finish_date, finish_time_us, trace_id)
-        </engine>
-        <database>system</database>
-        <table>opentelemetry_span_log</table>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </opentelemetry_span_log>
-
-
-    <!-- Crash log. Stores stack traces for fatal errors.
-         This table is normally empty. -->
-    <crash_log>
-        <database>system</database>
-        <table>crash_log</table>
-
-        <partition_by />
-        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
-    </crash_log>
-
-    <!-- Session log. Stores user log in (successful or not) and log out events. -->
-    <session_log>
-        <database>system</database>
-        <table>session_log</table>
-
-        <partition_by>toYYYYMM(event_date)</partition_by>
-        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
-    </session_log>
-
-    <!-- Parameters for embedded dictionaries, used in Yandex.Metrica.
-         See https://clickhouse.com/docs/en/dicts/internal_dicts/
-    -->
-
-    <!-- Path to file with region hierarchy. -->
-    <!-- <path_to_regions_hierarchy_file>/opt/geo/regions_hierarchy.txt</path_to_regions_hierarchy_file> -->
-
-    <!-- Path to directory with files containing names of regions -->
-    <!-- <path_to_regions_names_files>/opt/geo/</path_to_regions_names_files> -->
-
-
-    <!-- <top_level_domains_path>/var/lib/clickhouse/top_level_domains/</top_level_domains_path> -->
-    <!-- Custom TLD lists.
-         Format: <name>/path/to/file</name>
-
-         Changes will not be applied w/o server restart.
-         Path to the list is under top_level_domains_path (see above).
-    -->
-    <top_level_domains_lists>
-        <!--
-        <public_suffix_list>/path/to/public_suffix_list.dat</public_suffix_list>
-        -->
-    </top_level_domains_lists>
-
-    <!-- Configuration of external dictionaries. See:
-         https://clickhouse.com/docs/en/sql-reference/dictionaries/external-dictionaries/external-dicts
-    -->
-    <dictionaries_config>*_dictionary.xml</dictionaries_config>
-
-    <!-- Configuration of user defined executable functions -->
-    <user_defined_executable_functions_config>*_function.xml</user_defined_executable_functions_config>
-
-    <!-- Uncomment if you want data to be compressed 30-100% better.
-         Don't do that if you just started using ClickHouse.
-      -->
-    <!--
-    <compression>
-        <!- - Set of variants. Checked in order. Last matching case wins. If nothing matches, lz4 will be used. - ->
-        <case>
-
-            <!- - Conditions. All must be satisfied. Some conditions may be omitted. - ->
-            <min_part_size>10000000000</min_part_size>        <!- - Min part size in bytes. - ->
-            <min_part_size_ratio>0.01</min_part_size_ratio>   <!- - Min size of part relative to whole table size. - ->
-
-            <!- - What compression method to use. - ->
-            <method>zstd</method>
-        </case>
-    </compression>
-    -->
-
-    <!-- Configuration of encryption. The server executes a command to
-         obtain an encryption key at startup if such a command is
-         defined, or encryption codecs will be disabled otherwise. The
-         command is executed through /bin/sh and is expected to write
-         a Base64-encoded key to the stdout. -->
-    <encryption_codecs>
-        <!-- aes_128_gcm_siv -->
-        <!-- Example of getting hex key from env -->
-        <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
-        <!--key_hex from_env="..."></key_hex -->
-
-        <!-- Example of multiple hex keys. They can be imported from env or be written down in config-->
-        <!-- the code should use these keys and throw an exception if their length is not 16 bytes -->
-        <!-- key_hex id="0">...</key_hex -->
-        <!-- key_hex id="1" from_env=".."></key_hex -->
-        <!-- key_hex id="2">...</key_hex -->
-        <!-- current_key_id>2</current_key_id -->
-
-        <!-- Example of getting hex key from config -->
-        <!-- the code should use this key and throw an exception if its length is not 16 bytes -->
-        <!-- key>...</key -->
-
-        <!-- example of adding nonce -->
-        <!-- nonce>...</nonce -->
-
-        <!-- /aes_128_gcm_siv -->
-    </encryption_codecs>
-
-    <!-- Allow to execute distributed DDL queries (CREATE, DROP, ALTER, RENAME) on cluster.
-         Works only if ZooKeeper is enabled. Comment it if such functionality isn't required. -->
-    <distributed_ddl>
-        <!-- Path in ZooKeeper to queue with DDL queries -->
-        <path>/clickhouse/task_queue/ddl</path>
-
-        <!-- Settings from this profile will be used to execute DDL queries -->
-        <!-- <profile>default</profile> -->
-
-        <!-- Controls how much ON CLUSTER queries can be run simultaneously. -->
-        <!-- <pool_size>1</pool_size> -->
-
-        <!--
-             Cleanup settings (active tasks will not be removed)
-        -->
-
-        <!-- Controls task TTL (default 1 week) -->
-        <!-- <task_max_lifetime>604800</task_max_lifetime> -->
-
-        <!-- Controls how often cleanup should be performed (in seconds) -->
-        <!-- <cleanup_delay_period>60</cleanup_delay_period> -->
-
-        <!-- Controls how many tasks could be in the queue -->
-        <!-- <max_tasks_in_queue>1000</max_tasks_in_queue> -->
-    </distributed_ddl>
-
-    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
-    <!--
-    <merge_tree>
-        <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
-    </merge_tree>
-    -->
-
-    <!-- Protection from accidental DROP.
-         If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
-         If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
-         By default max_table_size_to_drop is 50GB; max_table_size_to_drop=0 allows to DROP any tables.
-         The same for max_partition_size_to_drop.
-         Uncomment to disable protection.
-    -->
-    <!-- <max_table_size_to_drop>0</max_table_size_to_drop> -->
-    <!-- <max_partition_size_to_drop>0</max_partition_size_to_drop> -->
-
-    <!-- Example of parameters for GraphiteMergeTree table engine -->
-    <graphite_rollup_example>
-        <pattern>
-            <regexp>click_cost</regexp>
-            <function>any</function>
-            <retention>
-                <age>0</age>
-                <precision>3600</precision>
-            </retention>
-            <retention>
-                <age>86400</age>
-                <precision>60</precision>
-            </retention>
-        </pattern>
-        <default>
-            <function>max</function>
-            <retention>
-                <age>0</age>
-                <precision>60</precision>
-            </retention>
-            <retention>
-                <age>3600</age>
-                <precision>300</precision>
-            </retention>
-            <retention>
-                <age>86400</age>
-                <precision>3600</precision>
-            </retention>
-        </default>
-    </graphite_rollup_example>
-
-    <!-- Directory in <clickhouse-path> containing schema files for various input formats.
-         The directory will be created if it doesn't exist.
-      -->
-    <format_schema_path>/var/lib/clickhouse/format_schemas/</format_schema_path>
-
-    <!-- Default query masking rules, matching lines would be replaced with something else in the logs
-        (both text logs and system.query_log).
-        name - name for the rule (optional)
-        regexp - RE2 compatible regular expression (mandatory)
-        replace - substitution string for sensitive data (optional, by default - six asterisks)
-    -->
-    <query_masking_rules>
-        <rule>
-            <name>hide encrypt/decrypt arguments</name>
-            <regexp>((?:aes_)?(?:encrypt|decrypt)(?:_mysql)?)\s*\(\s*(?:'(?:\\'|.)+'|.*?)\s*\)</regexp>
-            <!-- or more secure, but also more invasive:
-                (aes_\w+)\s*\(.*\)
-            -->
-            <replace>\1(???)</replace>
-        </rule>
-    </query_masking_rules>
-
-    <!-- Uncomment to use custom http handlers.
-        rules are checked from top to bottom, first match runs the handler
-            url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
-            methods - to match request method, you can use commas to separate multiple method matches(optional)
-            headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
-        handler is request handler
-            type - supported types: static, dynamic_query_handler, predefined_query_handler
-            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 params
-            status - use with static type, response status code
-            content_type - use with static type, response 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 send to client.
-
-    <http_handlers>
-        <rule>
-            <url>/</url>
-            <methods>POST,GET</methods>
-            <headers><pragma>no-cache</pragma></headers>
-            <handler>
-                <type>dynamic_query_handler</type>
-                <query_param_name>query</query_param_name>
-            </handler>
-        </rule>
-
-        <rule>
-            <url>/predefined_query</url>
-            <methods>POST,GET</methods>
-            <handler>
-                <type>predefined_query_handler</type>
-                <query>SELECT * FROM system.settings</query>
-            </handler>
-        </rule>
-
-        <rule>
-            <handler>
-                <type>static</type>
-                <status>200</status>
-                <content_type>text/plain; charset=UTF-8</content_type>
-                <response_content>config://http_server_default_response</response_content>
-            </handler>
-        </rule>
-    </http_handlers>
-    -->
-
-    <send_crash_reports>
-        <!-- Changing <enabled> to true allows sending crash reports to -->
-        <!-- the ClickHouse core developers team via Sentry https://sentry.io -->
-        <!-- Doing so at least in pre-production environments is highly appreciated -->
-        <enabled>false</enabled>
-        <!-- Change <anonymize> to true if you don't feel comfortable attaching the server hostname to the crash report -->
-        <anonymize>false</anonymize>
-        <!-- Default endpoint should be changed to different Sentry DSN only if you have -->
-        <!-- some in-house engineers or hired consultants who're going to debug ClickHouse issues for you -->
-        <endpoint>https://6f33034cfe684dd7a3ab9875e57b1c8d@o388870.ingest.sentry.io/5226277</endpoint>
-    </send_crash_reports>
-
-    <!-- Uncomment to disable ClickHouse internal DNS caching. -->
-    <!-- <disable_internal_dns_cache>1</disable_internal_dns_cache> -->
-
-    <!-- You can also configure rocksdb like this: -->
-    <!--
-    <rocksdb>
-        <options>
-            <max_background_jobs>8</max_background_jobs>
-        </options>
-        <column_family_options>
-            <num_levels>2</num_levels>
-        </column_family_options>
-        <tables>
-            <table>
-                <name>TABLE</name>
-                <options>
-                    <max_background_jobs>8</max_background_jobs>
-                </options>
-                <column_family_options>
-                    <num_levels>2</num_levels>
-                </column_family_options>
-            </table>
-        </tables>
-    </rocksdb>
-    -->
-</yandex>
diff --git a/programs/diagnostics/testdata/docker/admin.xml b/programs/diagnostics/testdata/docker/admin.xml
deleted file mode 100644
index 76aa670dcfe..00000000000
--- a/programs/diagnostics/testdata/docker/admin.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<clickhouse>
-    <!-- Profiles of settings. -->
-    <profiles>
-        <!-- Default settings. -->
-        <default>
-            <!-- Allows us to create replicated databases. -->
-            <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
-        </default>
-    </profiles>
-    <users>
-        <default>
-            <access_management>1</access_management>
-        </default>
-    </users>
-</clickhouse>
\ No newline at end of file
diff --git a/programs/diagnostics/testdata/docker/custom.xml b/programs/diagnostics/testdata/docker/custom.xml
deleted file mode 100644
index bc1051178ca..00000000000
--- a/programs/diagnostics/testdata/docker/custom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<clickhouse>
-    <listen_host>::</listen_host>
-    <listen_host>0.0.0.0</listen_host>
-    <listen_try>1</listen_try>
-    <logger>
-        <console>1</console>
-    </logger>
-</clickhouse>
diff --git a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.err.log b/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.err.log
deleted file mode 100644
index 1a1768fe87e..00000000000
--- a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.err.log
+++ /dev/null
@@ -1,10 +0,0 @@
-2021.12.13 10:12:26.940169 [ 38398 ] {} <Warning> Access(local directory): File /var/lib/clickhouse/access/users.list doesn't exist
-2021.12.13 10:12:26.940204 [ 38398 ] {} <Warning> Access(local directory): Recovering lists in directory /var/lib/clickhouse/access/
-2021.12.13 10:12:40.649453 [ 38445 ] {} <Error> Access(user directories): from: 127.0.0.1, user: default: Authentication failed: Code: 193. DB::Exception: Invalid credentials. (WRONG_PASSWORD), Stack trace (when copying this message, always include the lines below):
-
-0. DB::Exception::Exception(std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> > const&, int, bool) @ 0x9b722d4 in /usr/bin/clickhouse
-1. DB::IAccessStorage::throwInvalidCredentials() @ 0x119d9b27 in /usr/bin/clickhouse
-2. DB::IAccessStorage::loginImpl(DB::Credentials const&, Poco::Net::IPAddress const&, DB::ExternalAuthenticators const&) const @ 0x119d98d7 in /usr/bin/clickhouse
-3. DB::IAccessStorage::login(DB::Credentials const&, Poco::Net::IPAddress const&, DB::ExternalAuthenticators const&, bool) const @ 0x119d9084 in /usr/bin/clickhouse
-4. DB::MultipleAccessStorage::loginImpl(DB::Credentials const&, Poco::Net::IPAddress const&, DB::ExternalAuthenticators const&) const @ 0x119ff93c in /usr/bin/clickhouse
-5. DB::IAccessStorage::login(DB::Credentials const&, Poco::Net::IPAddress const&, DB::ExternalAuthenticators const&, bool) const @ 0x119d9084 in /usr/bin/clickhouse
diff --git a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log b/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log
deleted file mode 100644
index f6abe7764ba..00000000000
--- a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log
+++ /dev/null
@@ -1,10 +0,0 @@
-2022.02.02 14:49:32.458680 [ 200404 ] {} <Debug> DiskLocal: Reserving 2.47 MiB on disk `default`, having unreserved 1.56 TiB.
-2022.02.02 14:49:32.459086 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Debug> MergeTask::PrepareStage: Merging 2 parts: from 202202_147058_147549_343 to 202202_147550_147550_0 into Wide
-2022.02.02 14:49:32.459201 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Debug> MergeTask::PrepareStage: Selected MergeAlgorithm: Horizontal
-2022.02.02 14:49:32.459262 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Debug> MergeTreeSequentialSource: Reading 159 marks from part 202202_147058_147549_343, total 1289014 rows starting from the beginning of the part
-2022.02.02 14:49:32.459614 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Debug> MergeTreeSequentialSource: Reading 2 marks from part 202202_147550_147550_0, total 2618 rows starting from the beginning of the part
-2022.02.02 14:49:32.507755 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Debug> MergeTask::MergeProjectionsStage: Merge sorted 1291632 rows, containing 5 columns (5 merged, 0 gathered) in 0.048711404 sec., 26516008.448452853 rows/sec., 639.52 MiB/sec.
-2022.02.02 14:49:32.508332 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Trace> system.asynchronous_metric_log (de87df8b-2250-439c-9e87-df8b2250339c): Renaming temporary part tmp_merge_202202_147058_147550_344 to 202202_147058_147550_344.
-2022.02.02 14:49:32.508406 [ 200359 ] {de87df8b-2250-439c-9e87-df8b2250339c::202202_147058_147550_344} <Trace> system.asynchronous_metric_log (de87df8b-2250-439c-9e87-df8b2250339c) (MergerMutator): Merged 2 parts: from 202202_147058_147549_343 to 202202_147550_147550_0
-2022.02.02 14:49:32.508440 [ 200359 ] {} <Debug> MemoryTracker: Peak memory usage Mutate/Merge: 16.31 MiB.
-2022.02.02 14:49:33.000148 [ 200388 ] {} <Trace> AsynchronousMetrics: MemoryTracking: was 774.16 MiB, peak 2.51 GiB, will set to 772.30 MiB (RSS), difference: -1.86 MiB
diff --git a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log.gz b/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log.gz
deleted file mode 100644
index 136bf5913aa..00000000000
--- a/programs/diagnostics/testdata/logs/var/logs/clickhouse-server.log.gz
+++ /dev/null
@@ -1 +0,0 @@
-dummy hz file for tests
diff --git a/programs/disks/CMakeLists.txt b/programs/disks/CMakeLists.txt
index 9477854a58b..f0949fcfceb 100644
--- a/programs/disks/CMakeLists.txt
+++ b/programs/disks/CMakeLists.txt
@@ -11,6 +11,10 @@ set (CLICKHOUSE_DISKS_SOURCES
     CommandRemove.cpp
     CommandWrite.cpp)
 
+if (CLICKHOUSE_CLOUD)
+    set (CLICKHOUSE_DISKS_SOURCES ${CLICKHOUSE_DISKS_SOURCES} CommandPackedIO.cpp)
+endif ()
+
 set (CLICKHOUSE_DISKS_LINK
     PRIVATE
         boost::program_options
diff --git a/programs/disks/CommandRead.cpp b/programs/disks/CommandRead.cpp
index 85041faf22c..0f3ac7ab98c 100644
--- a/programs/disks/CommandRead.cpp
+++ b/programs/disks/CommandRead.cpp
@@ -61,7 +61,6 @@ public:
             auto out = disk->writeFile(relative_path_output);
             copyData(*in, *out);
             out->finalize();
-            return;
         }
         else
         {
diff --git a/programs/disks/DisksApp.cpp b/programs/disks/DisksApp.cpp
index ded324fd0da..6c768799221 100644
--- a/programs/disks/DisksApp.cpp
+++ b/programs/disks/DisksApp.cpp
@@ -65,6 +65,9 @@ void DisksApp::addOptions(
     positional_options_description.add("command_name", 1);
 
     supported_commands = {"list-disks", "list", "move", "remove", "link", "copy", "write", "read", "mkdir"};
+#ifdef CLICKHOUSE_CLOUD
+    supported_commands.insert("packed-io");
+#endif
 
     command_descriptions.emplace("list-disks", makeCommandListDisks());
     command_descriptions.emplace("list", makeCommandList());
@@ -75,6 +78,9 @@ void DisksApp::addOptions(
     command_descriptions.emplace("write", makeCommandWrite());
     command_descriptions.emplace("read", makeCommandRead());
     command_descriptions.emplace("mkdir", makeCommandMkDir());
+#ifdef CLICKHOUSE_CLOUD
+    command_descriptions.emplace("packed-io", makeCommandPackedIO());
+#endif
 }
 
 void DisksApp::processOptions()
@@ -89,6 +95,11 @@ void DisksApp::processOptions()
         config().setString("log-level", options["log-level"].as<String>());
 }
 
+DisksApp::~DisksApp()
+{
+    global_context->shutdown();
+}
+
 void DisksApp::init(std::vector<String> & common_arguments)
 {
     stopOptionsProcessing();
@@ -134,6 +145,7 @@ void DisksApp::parseAndCheckOptions(
         .options(options_description_)
         .positional(positional_options_description)
         .allow_unregistered();
+
     po::parsed_options parsed = parser.run();
     po::store(parsed, options);
 
@@ -154,13 +166,13 @@ int DisksApp::main(const std::vector<String> & /*args*/)
     {
         String config_path = config().getString("config-file", getDefaultConfigFileName());
         ConfigProcessor config_processor(config_path, false, false);
-        config_processor.setConfigPath(fs::path(config_path).parent_path());
+        ConfigProcessor::setConfigPath(fs::path(config_path).parent_path());
         auto loaded_config = config_processor.loadConfig();
         config().add(loaded_config.configuration.duplicate(), false, false);
     }
     else
     {
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No config-file specifiged");
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "No config-file specified");
     }
 
     if (config().has("save-logs"))
@@ -199,8 +211,8 @@ int DisksApp::main(const std::vector<String> & /*args*/)
         po::parsed_options parsed = parser.run();
         po::store(parsed, options);
         po::notify(options);
-        args = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::include_positional);
 
+        args = po::collect_unrecognized(parsed.options, po::collect_unrecognized_mode::include_positional);
         command->processOptions(config(), options);
     }
     else
diff --git a/programs/disks/DisksApp.h b/programs/disks/DisksApp.h
index 0b596921707..51bc3f58dc4 100644
--- a/programs/disks/DisksApp.h
+++ b/programs/disks/DisksApp.h
@@ -21,6 +21,7 @@ class DisksApp : public Poco::Util::Application, public Loggers
 {
 public:
     DisksApp() = default;
+    ~DisksApp() override;
 
     void init(std::vector<String> & common_arguments);
 
@@ -52,9 +53,9 @@ protected:
     std::vector<String> command_arguments;
 
     std::unordered_set<String> supported_commands;
-
     std::unordered_map<String, CommandPtr> command_descriptions;
 
     po::variables_map options;
 };
+
 }
diff --git a/programs/disks/ICommand.h b/programs/disks/ICommand.h
index da106e1084e..efe350fe87b 100644
--- a/programs/disks/ICommand.h
+++ b/programs/disks/ICommand.h
@@ -63,3 +63,4 @@ DB::CommandPtr makeCommandRead();
 DB::CommandPtr makeCommandRemove();
 DB::CommandPtr makeCommandWrite();
 DB::CommandPtr makeCommandMkDir();
+DB::CommandPtr makeCommandPackedIO();
diff --git a/programs/extract-from-config/ExtractFromConfig.cpp b/programs/extract-from-config/ExtractFromConfig.cpp
index 7c3e80aa78f..61d451664e3 100644
--- a/programs/extract-from-config/ExtractFromConfig.cpp
+++ b/programs/extract-from-config/ExtractFromConfig.cpp
@@ -91,8 +91,8 @@ static std::vector<std::string> extractFromConfig(
 
         zkutil::validateZooKeeperConfig(*bootstrap_configuration);
 
-        zkutil::ZooKeeperPtr zookeeper = std::make_shared<zkutil::ZooKeeper>(
-            *bootstrap_configuration, bootstrap_configuration->has("zookeeper") ? "zookeeper" : "keeper", nullptr);
+        zkutil::ZooKeeperPtr zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(
+            *bootstrap_configuration, bootstrap_configuration->has("zookeeper") ? "zookeeper" : "keeper");
 
         zkutil::ZooKeeperNodeCache zk_node_cache([&] { return zookeeper; });
         config_xml = processor.processConfig(&has_zk_includes, &zk_node_cache);
@@ -109,8 +109,8 @@ static std::vector<std::string> extractFromConfig(
     return {configuration->getString(key)};
 }
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wmissing-declarations"
 
 int mainEntryClickHouseExtractFromConfig(int argc, char ** argv)
 {
diff --git a/programs/format/Format.cpp b/programs/format/Format.cpp
index a1c51565ae3..d4b975ce1e8 100644
--- a/programs/format/Format.cpp
+++ b/programs/format/Format.cpp
@@ -17,6 +17,7 @@
 #include <Common/ErrorCodes.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/TerminalSize.h>
+#include <Core/BaseSettingsProgramOptions.h>
 
 #include <Interpreters/Context.h>
 #include <Functions/FunctionFactory.h>
@@ -70,8 +71,8 @@ void skipSpacesAndComments(const char*& pos, const char* end, bool print_comment
 
 }
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wmissing-declarations"
 
 extern const char * auto_time_zones[];
 
@@ -102,7 +103,7 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
         {
             std::string_view name = field.getName();
             if (name == "max_parser_depth" || name == "max_query_size")
-                cmd_settings.addProgramOption(desc, name, field);
+                addProgramOption(cmd_settings, desc, name, field);
         }
 
         boost::program_options::variables_map options;
@@ -234,9 +235,9 @@ int mainEntryClickHouseFormat(int argc, char ** argv)
                 size_t approx_query_length = multiple ? find_first_symbols<';'>(pos, end) - pos : end - pos;
 
                 ASTPtr res = parseQueryAndMovePosition(
-                    parser, pos, end, "query", multiple, cmd_settings.max_query_size, cmd_settings.max_parser_depth);
+                    parser, pos, end, "query", multiple, cmd_settings.max_query_size, cmd_settings.max_parser_depth, cmd_settings.max_parser_backtracks);
 
-                std::unique_ptr<ReadBuffer> insert_query_payload = nullptr;
+                std::unique_ptr<ReadBuffer> insert_query_payload;
                 /// If the query is INSERT ... VALUES, then we will try to parse the data.
                 if (auto * insert_query = res->as<ASTInsertQuery>(); insert_query && insert_query->data)
                 {
diff --git a/programs/git-import/git-import.cpp b/programs/git-import/git-import.cpp
index 16244232bee..fdabeacd46e 100644
--- a/programs/git-import/git-import.cpp
+++ b/programs/git-import/git-import.cpp
@@ -172,6 +172,7 @@ clickhouse-client --query "INSERT INTO git.commits FORMAT TSV" < commits.tsv
 clickhouse-client --query "INSERT INTO git.file_changes FORMAT TSV" < file_changes.tsv
 clickhouse-client --query "INSERT INTO git.line_changes FORMAT TSV" < line_changes.tsv
 
+Check out this presentation: https://presentations.clickhouse.com/matemarketing_2020/
 )";
 
 namespace po = boost::program_options;
diff --git a/programs/install/Install.cpp b/programs/install/Install.cpp
index 52f30098b38..20c1a0ad4a8 100644
--- a/programs/install/Install.cpp
+++ b/programs/install/Install.cpp
@@ -79,10 +79,6 @@ namespace ErrorCodes
 
 }
 
-/// ANSI escape sequence for intense color in terminal.
-#define HILITE "\033[1m"
-#define END_HILITE "\033[0m"
-
 #if defined(OS_DARWIN)
 /// Until createUser() and createGroup() are implemented, only sudo-less installations are supported/default for macOS.
 static constexpr auto DEFAULT_CLICKHOUSE_SERVER_USER = "";
@@ -216,6 +212,16 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 {
     try
     {
+        const char * start_hilite = "";
+        const char * end_hilite = "";
+
+        if (isatty(STDOUT_FILENO))
+        {
+            /// ANSI escape sequence for intense color in terminal.
+            start_hilite = "\033[1m";
+            end_hilite = "\033[0m";
+        }
+
         po::options_description desc;
         desc.add_options()
             ("help,h", "produce help message")
@@ -236,9 +242,10 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
         if (options.count("help"))
         {
+            std::cout << "Install ClickHouse without .deb/.rpm/.tgz packages (having the binary only)\n\n";
             std::cout << "Usage: " << formatWithSudo(std::string(argv[0]) + " install [options]", getuid() != 0) << '\n';
             std::cout << desc << '\n';
-            return 1;
+            return 0;
         }
 
         /// We need to copy binary to the binary directory.
@@ -426,7 +433,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
             "clickhouse-client",
             "clickhouse-local",
             "clickhouse-benchmark",
-            "clickhouse-copier",
             "clickhouse-obfuscator",
             "clickhouse-git-import",
             "clickhouse-compressor",
@@ -656,7 +662,6 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "        <server>\n"
                     "            <certificateFile>" << (config_dir / "server.crt").string() << "</certificateFile>\n"
                     "            <privateKeyFile>" << (config_dir / "server.key").string() << "</privateKeyFile>\n"
-                    "            <dhParamsFile>" << (config_dir / "dhparam.pem").string() << "</dhParamsFile>\n"
                     "        </server>\n"
                     "    </openSSL>\n"
                     "</clickhouse>\n";
@@ -707,7 +712,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         {
             fmt::print("Users config file {} already exists, will keep it and extract users info from it.\n", users_config_file.string());
 
-            /// Check if password for default user already specified.
+            /// Check if password for the default user already specified.
             ConfigProcessor processor(users_config_file.string(), /* throw_on_bad_incl = */ false, /* log_to_console = */ false);
             ConfigurationPtr configuration(new Poco::Util::XMLConfiguration(processor.processConfig()));
 
@@ -799,13 +804,13 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
         /// Set up password for default user.
         if (has_password_for_default_user)
         {
-            fmt::print(HILITE "Password for default user is already specified. To remind or reset, see {} and {}." END_HILITE "\n",
-                       users_config_file.string(), users_d.string());
+            fmt::print("{}Password for the default user is already specified. To remind or reset, see {} and {}.{}\n",
+                start_hilite, users_config_file.string(), users_d.string(), end_hilite);
         }
         else if (!can_ask_password)
         {
-            fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
-                       users_config_file.string(), users_d.string());
+            fmt::print("{}Password for the default user is an empty string. See {} and {} to change it.{}\n",
+                start_hilite, users_config_file.string(), users_d.string(), end_hilite);
         }
         else
         {
@@ -814,7 +819,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
 
             char buf[1000] = {};
             std::string password;
-            if (auto * result = readpassphrase("Enter password for default user: ", buf, sizeof(buf), 0))
+            if (auto * result = readpassphrase("Enter password for the default user: ", buf, sizeof(buf), 0))
                 password = result;
 
             if (!password.empty())
@@ -839,7 +844,7 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</clickhouse>\n";
                 out.sync();
                 out.finalize();
-                fmt::print(HILITE "Password for default user is saved in file {}." END_HILITE "\n", password_file);
+                fmt::print("{}Password for the default user is saved in file {}.{}\n", start_hilite, password_file, end_hilite);
 #else
                 out << "<clickhouse>\n"
                     "    <users>\n"
@@ -850,13 +855,13 @@ int mainEntryClickHouseInstall(int argc, char ** argv)
                     "</clickhouse>\n";
                 out.sync();
                 out.finalize();
-                fmt::print(HILITE "Password for default user is saved in plaintext in file {}." END_HILITE "\n", password_file);
+                fmt::print("{}Password for the default user is saved in plaintext in file {}.{}\n", start_hilite, password_file, end_hilite);
 #endif
                 has_password_for_default_user = true;
             }
             else
-                fmt::print(HILITE "Password for default user is empty string. See {} and {} to change it." END_HILITE "\n",
-                           users_config_file.string(), users_d.string());
+                fmt::print("{}Password for the default user is an empty string. See {} and {} to change it.{}\n",
+                    start_hilite, users_config_file.string(), users_d.string(), end_hilite);
         }
 
         /** Set capabilities for the binary.
diff --git a/programs/keeper-client/Commands.cpp b/programs/keeper-client/Commands.cpp
index ab9252dd62e..2ec43ae15d0 100644
--- a/programs/keeper-client/Commands.cpp
+++ b/programs/keeper-client/Commands.cpp
@@ -2,6 +2,7 @@
 #include "Commands.h"
 #include <queue>
 #include "KeeperClient.h"
+#include "Parsers/CommonParsers.h"
 
 
 namespace DB
@@ -106,16 +107,16 @@ bool CreateCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> &
 
     int mode = zkutil::CreateMode::Persistent;
 
-    if (ParserKeyword{"PERSISTENT"}.ignore(pos, expected))
+    if (ParserKeyword(Keyword::PERSISTENT).ignore(pos, expected))
         mode = zkutil::CreateMode::Persistent;
-    else if (ParserKeyword{"EPHEMERAL"}.ignore(pos, expected))
+    else if (ParserKeyword(Keyword::EPHEMERAL).ignore(pos, expected))
         mode = zkutil::CreateMode::Ephemeral;
-    else if (ParserKeyword{"EPHEMERAL SEQUENTIAL"}.ignore(pos, expected))
+    else if (ParserKeyword(Keyword::EPHEMERAL_SEQUENTIAL).ignore(pos, expected))
         mode = zkutil::CreateMode::EphemeralSequential;
-    else if (ParserKeyword{"PERSISTENT SEQUENTIAL"}.ignore(pos, expected))
+    else if (ParserKeyword(Keyword::PERSISTENT_SEQUENTIAL).ignore(pos, expected))
         mode = zkutil::CreateMode::PersistentSequential;
 
-    node->args.push_back(mode);
+    node->args.push_back(std::move(mode));
 
     return true;
 }
@@ -382,12 +383,16 @@ void RMRCommand::execute(const ASTKeeperQuery * query, KeeperClient * client) co
 
 bool ReconfigCommand::parse(IParser::Pos & pos, std::shared_ptr<ASTKeeperQuery> & node, DB::Expected & expected) const
 {
+    ParserKeyword s_add(Keyword::ADD);
+    ParserKeyword s_remove(Keyword::REMOVE);
+    ParserKeyword s_set(Keyword::SET);
+
     ReconfigCommand::Operation operation;
-    if (ParserKeyword{"ADD"}.ignore(pos, expected))
+    if (s_add.ignore(pos, expected))
         operation = ReconfigCommand::Operation::ADD;
-    else if (ParserKeyword{"REMOVE"}.ignore(pos, expected))
+    else if (s_remove.ignore(pos, expected))
         operation = ReconfigCommand::Operation::REMOVE;
-    else if (ParserKeyword{"SET"}.ignore(pos, expected))
+    else if (s_set.ignore(pos, expected))
         operation = ReconfigCommand::Operation::SET;
     else
         return false;
@@ -413,13 +418,13 @@ void ReconfigCommand::execute(const DB::ASTKeeperQuery * query, DB::KeeperClient
     switch (operation)
     {
         case static_cast<UInt8>(ReconfigCommand::Operation::ADD):
-            joining = query->args[1].safeGet<DB::String>();
+            joining = query->args[1].safeGet<String>();
             break;
         case static_cast<UInt8>(ReconfigCommand::Operation::REMOVE):
-            leaving = query->args[1].safeGet<DB::String>();
+            leaving = query->args[1].safeGet<String>();
             break;
         case static_cast<UInt8>(ReconfigCommand::Operation::SET):
-            new_members = query->args[1].safeGet<DB::String>();
+            new_members = query->args[1].safeGet<String>();
             break;
         default:
             UNREACHABLE();
diff --git a/programs/keeper-client/KeeperClient.cpp b/programs/keeper-client/KeeperClient.cpp
index 7ed4499efbd..52d825f30e6 100644
--- a/programs/keeper-client/KeeperClient.cpp
+++ b/programs/keeper-client/KeeperClient.cpp
@@ -44,7 +44,7 @@ String KeeperClient::executeFourLetterCommand(const String & command)
 std::vector<String> KeeperClient::getCompletions(const String & prefix) const
 {
     Tokens tokens(prefix.data(), prefix.data() + prefix.size(), 0, false);
-    IParser::Pos pos(tokens, 0);
+    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     if (pos->type != TokenType::BareWord)
         return registered_commands_and_four_letter_words;
@@ -278,6 +278,7 @@ bool KeeperClient::processQueryText(const String & text)
                 /* allow_multi_statements = */ true,
                 /* max_query_size = */ 0,
                 /* max_parser_depth = */ 0,
+                /* max_parser_backtracks = */ 0,
                 /* skip_insignificant = */ false);
 
             if (!res)
@@ -367,7 +368,7 @@ int KeeperClient::main(const std::vector<String> & /* args */)
     DB::ConfigProcessor config_processor(config().getString("config-file", "config.xml"));
 
     /// This will handle a situation when clickhouse is running on the embedded config, but config.d folder is also present.
-    config_processor.registerEmbeddedConfig("config.xml", "<clickhouse/>");
+    ConfigProcessor::registerEmbeddedConfig("config.xml", "<clickhouse/>");
     auto clickhouse_config = config_processor.loadConfig();
 
     Poco::Util::AbstractConfiguration::Keys keys;
@@ -375,7 +376,7 @@ int KeeperClient::main(const std::vector<String> & /* args */)
 
     if (!config().has("host") && !config().has("port") && !keys.empty())
     {
-        LOG_INFO(&Poco::Logger::get("KeeperClient"), "Found keeper node in the config.xml, will use it for connection");
+        LOG_INFO(getLogger("KeeperClient"), "Found keeper node in the config.xml, will use it for connection");
 
         for (const auto & key : keys)
         {
@@ -400,7 +401,7 @@ int KeeperClient::main(const std::vector<String> & /* args */)
     zk_args.connection_timeout_ms = config().getInt("connection-timeout", 10) * 1000;
     zk_args.session_timeout_ms = config().getInt("session-timeout", 10) * 1000;
     zk_args.operation_timeout_ms = config().getInt("operation-timeout", 10) * 1000;
-    zookeeper = std::make_unique<zkutil::ZooKeeper>(zk_args);
+    zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(zk_args);
 
     if (config().has("no-confirmation") || config().has("query"))
         ask_confirmation = false;
diff --git a/programs/keeper-converter/KeeperConverter.cpp b/programs/keeper-converter/KeeperConverter.cpp
index 20448aafa2f..7518227a070 100644
--- a/programs/keeper-converter/KeeperConverter.cpp
+++ b/programs/keeper-converter/KeeperConverter.cpp
@@ -1,9 +1,10 @@
 #include <iostream>
-#include <optional>
 #include <boost/program_options.hpp>
 
+#include <Coordination/CoordinationSettings.h>
 #include <Coordination/KeeperSnapshotManager.h>
 #include <Coordination/ZooKeeperDataReader.h>
+#include <Coordination/KeeperContext.h>
 #include <Common/TerminalSize.h>
 #include <Poco/ConsoleChannel.h>
 #include <Poco/AutoPtr.h>
@@ -28,7 +29,7 @@ int mainEntryClickHouseKeeperConverter(int argc, char ** argv)
     po::store(po::command_line_parser(argc, argv).options(desc).run(), options);
     Poco::AutoPtr<Poco::ConsoleChannel> console_channel(new Poco::ConsoleChannel);
 
-    Poco::Logger * logger = &Poco::Logger::get("KeeperConverter");
+    LoggerPtr logger = getLogger("KeeperConverter");
     logger->setChannel(console_channel);
 
     if (options.count("help"))
@@ -40,7 +41,7 @@ int mainEntryClickHouseKeeperConverter(int argc, char ** argv)
 
     try
     {
-        auto keeper_context = std::make_shared<KeeperContext>(true);
+        auto keeper_context = std::make_shared<KeeperContext>(true, std::make_shared<CoordinationSettings>());
         keeper_context->setDigestEnabled(true);
         keeper_context->setSnapshotDisk(std::make_shared<DiskLocal>("Keeper-snapshots", options["output-dir"].as<std::string>()));
 
diff --git a/programs/keeper/CMakeLists.txt b/programs/keeper/CMakeLists.txt
index ff7c8e75f1c..70e0f229fd4 100644
--- a/programs/keeper/CMakeLists.txt
+++ b/programs/keeper/CMakeLists.txt
@@ -39,8 +39,9 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperContext.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperStateManager.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperStorage.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperConstants.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperAsynchronousMetrics.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/pathUtils.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/KeeperCommon.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/SessionExpiryQueue.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/SummingStateMachine.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Coordination/WriteBufferFromNuraftBuffer.cpp
@@ -69,6 +70,7 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/ServerType.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTPRequestHandlerFactoryMain.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/KeeperReadinessHandler.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/CloudPlacementInfo.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTP/HTTPServer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTP/ReadHeaders.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Server/HTTP/HTTPServerConnection.cpp
@@ -127,15 +129,17 @@ if (BUILD_STANDALONE_KEEPER)
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/DiskObjectStorage.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/ObjectStorageIteratorAsync.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/ObjectStorageIterator.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/StoredObject.cpp
 
-        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/registerDiskS3.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/S3Capabilities.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/diskSettings.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/ObjectStorageFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/MetadataStorageFactory.cpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/ObjectStorages/RegisterDiskObjectStorage.cpp
 
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/IO/createReadBufferFromFileBase.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/../../src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
diff --git a/programs/keeper/Keeper.cpp b/programs/keeper/Keeper.cpp
index 109884ec899..a558ed64bf9 100644
--- a/programs/keeper/Keeper.cpp
+++ b/programs/keeper/Keeper.cpp
@@ -10,10 +10,12 @@
 #include <IO/UseSSL.h>
 #include <Core/ServerUUID.h>
 #include <Common/logger_useful.h>
+#include <Common/CgroupsMemoryUsageObserver.h>
 #include <Common/ErrorHandlers.h>
 #include <Common/assertProcessUserMatchesDataOwner.h>
 #include <Common/makeSocketAddress.h>
 #include <Server/waitServersToFinish.h>
+#include <Server/CloudPlacementInfo.h>
 #include <base/getMemoryAmount.h>
 #include <base/scope_guard.h>
 #include <base/safeExit.h>
@@ -31,9 +33,10 @@
 #include <Coordination/KeeperAsynchronousMetrics.h>
 
 #include <Server/HTTP/HTTPServer.h>
-#include <Server/TCPServer.h>
 #include <Server/HTTPHandlerFactory.h>
 #include <Server/KeeperReadinessHandler.h>
+#include <Server/PrometheusMetricsWriter.h>
+#include <Server/TCPServer.h>
 
 #include "Core/Defines.h"
 #include "config.h"
@@ -352,6 +355,11 @@ try
 
     std::string include_from_path = config().getString("include_from", "/etc/metrika.xml");
 
+    if (config().has(DB::PlacementInfo::PLACEMENT_CONFIG_PREFIX))
+    {
+        PlacementInfo::PlacementInfo::instance().initialize(config());
+    }
+
     GlobalThreadPool::initialize(
         config().getUInt("max_thread_pool_size", 100),
         config().getUInt("max_thread_pool_free_size", 1000),
@@ -482,19 +490,28 @@ try
 
         /// Prometheus (if defined and not setup yet with http_port)
         port_name = "prometheus.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);
-            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(my_http_context), createPrometheusMainHandlerFactory(*this, config_getter(), async_metrics, "PrometheusHandler-factory"), server_pool, socket, http_params));
-        });
+        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);
+                socket.setReceiveTimeout(my_http_context->getReceiveTimeout());
+                socket.setSendTimeout(my_http_context->getSendTimeout());
+                auto metrics_writer = std::make_shared<KeeperPrometheusMetricsWriter>(config, "prometheus", async_metrics);
+                servers->emplace_back(
+                    listen_host,
+                    port_name,
+                    "Prometheus: http://" + address.toString(),
+                    std::make_unique<HTTPServer>(
+                        std::move(my_http_context),
+                        createPrometheusMainHandlerFactory(*this, config_getter(), metrics_writer, "PrometheusHandler-factory"),
+                        server_pool,
+                        socket,
+                        http_params));
+            });
 
         /// HTTP control endpoints
         port_name = "keeper_server.http_control.port";
@@ -544,7 +561,7 @@ try
     auto main_config_reloader = std::make_unique<ConfigReloader>(
         config_path,
         extra_paths,
-        config().getString("path", ""),
+        config().getString("path", KEEPER_DEFAULT_PATH),
         std::move(unused_cache),
         unused_event,
         [&](ConfigurationPtr config, bool /* initial_loading */)
@@ -607,6 +624,25 @@ try
     buildLoggers(config(), logger());
     main_config_reloader->start();
 
+    std::optional<CgroupsMemoryUsageObserver> cgroups_memory_usage_observer;
+    try
+    {
+        auto wait_time = config().getUInt64("keeper_server.cgroups_memory_observer_wait_time", 15);
+        if (wait_time != 0)
+        {
+            cgroups_memory_usage_observer.emplace(std::chrono::seconds(wait_time));
+            /// Not calling cgroups_memory_usage_observer->setLimits() here (as for the normal ClickHouse server) because Keeper controls
+            /// its memory usage by other means (via setting 'max_memory_usage_soft_limit').
+            cgroups_memory_usage_observer->setOnMemoryAmountAvailableChangedFn([&]() { main_config_reloader->reload(); });
+            cgroups_memory_usage_observer->startThread();
+        }
+    }
+    catch (Exception &)
+    {
+        tryLogCurrentException(log, "Disabling cgroup memory observer because of an error during initialization");
+    }
+
+
     LOG_INFO(log, "Ready for connections.");
 
     waitForTerminationRequest();
@@ -624,7 +660,7 @@ catch (...)
 
 void Keeper::logRevision() const
 {
-    LOG_INFO(&Poco::Logger::get("Application"),
+    LOG_INFO(getLogger("Application"),
         "Starting ClickHouse Keeper {} (revision: {}, git hash: {}, build id: {}), PID {}",
         VERSION_STRING,
         ClickHouseRevision::getVersionRevision(),
diff --git a/programs/library-bridge/CMakeLists.txt b/programs/library-bridge/CMakeLists.txt
index dd0bf67cb64..2fca10ce4d7 100644
--- a/programs/library-bridge/CMakeLists.txt
+++ b/programs/library-bridge/CMakeLists.txt
@@ -11,6 +11,7 @@ set (CLICKHOUSE_LIBRARY_BRIDGE_SOURCES
     LibraryBridgeHandlers.cpp
     SharedLibrary.cpp
     library-bridge.cpp
+    createFunctionBaseCast.cpp
 )
 
 clickhouse_add_executable(clickhouse-library-bridge ${CLICKHOUSE_LIBRARY_BRIDGE_SOURCES})
@@ -23,9 +24,4 @@ target_link_libraries(clickhouse-library-bridge PRIVATE
 
 set_target_properties(clickhouse-library-bridge PROPERTIES RUNTIME_OUTPUT_DIRECTORY ..)
 
-if (SPLIT_DEBUG_SYMBOLS)
-    clickhouse_split_debug_symbols(TARGET clickhouse-library-bridge DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/../${SPLITTED_DEBUG_SYMBOLS_DIR} BINARY_PATH ../clickhouse-library-bridge)
-else()
-    clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse-library-bridge DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/../${SPLITTED_DEBUG_SYMBOLS_DIR})
-    install(TARGETS clickhouse-library-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-endif()
+install(TARGETS clickhouse-library-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
diff --git a/programs/library-bridge/CatBoostLibraryHandlerFactory.cpp b/programs/library-bridge/CatBoostLibraryHandlerFactory.cpp
index 6ee078f6c5c..7ce896636e7 100644
--- a/programs/library-bridge/CatBoostLibraryHandlerFactory.cpp
+++ b/programs/library-bridge/CatBoostLibraryHandlerFactory.cpp
@@ -13,7 +13,7 @@ CatBoostLibraryHandlerFactory & CatBoostLibraryHandlerFactory::instance()
 }
 
 CatBoostLibraryHandlerFactory::CatBoostLibraryHandlerFactory()
-    : log(&Poco::Logger::get("CatBoostLibraryHandlerFactory"))
+    : log(getLogger("CatBoostLibraryHandlerFactory"))
 {
 }
 
diff --git a/programs/library-bridge/CatBoostLibraryHandlerFactory.h b/programs/library-bridge/CatBoostLibraryHandlerFactory.h
index 6ba3fe84ec9..e29834cbe79 100644
--- a/programs/library-bridge/CatBoostLibraryHandlerFactory.h
+++ b/programs/library-bridge/CatBoostLibraryHandlerFactory.h
@@ -31,7 +31,7 @@ private:
     /// map: model path --> catboost library handler
     std::unordered_map<String, CatBoostLibraryHandlerPtr> library_handlers TSA_GUARDED_BY(mutex);
     std::mutex mutex;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp b/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
index 70cd6fca375..4fa5c991f0f 100644
--- a/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
+++ b/programs/library-bridge/ExternalDictionaryLibraryAPI.cpp
@@ -9,40 +9,40 @@ const char DICT_LOGGER_NAME[] = "LibraryDictionarySourceExternal";
 
 void ExternalDictionaryLibraryAPI::log(LogLevel level, CString msg)
 {
-    auto & logger = Poco::Logger::get(DICT_LOGGER_NAME);
+    auto logger = getLogger(DICT_LOGGER_NAME);
     switch (level)
     {
         case LogLevel::TRACE:
-            if (logger.trace())
-                logger.trace(msg);
+            if (logger->trace())
+                logger->trace(msg);
             break;
         case LogLevel::DEBUG:
-            if (logger.debug())
-                logger.debug(msg);
+            if (logger->debug())
+                logger->debug(msg);
             break;
         case LogLevel::INFORMATION:
-            if (logger.information())
-                logger.information(msg);
+            if (logger->information())
+                logger->information(msg);
             break;
         case LogLevel::NOTICE:
-            if (logger.notice())
-                logger.notice(msg);
+            if (logger->notice())
+                logger->notice(msg);
             break;
         case LogLevel::WARNING:
-            if (logger.warning())
-                logger.warning(msg);
+            if (logger->warning())
+                logger->warning(msg);
             break;
         case LogLevel::ERROR:
-            if (logger.error())
-                logger.error(msg);
+            if (logger->error())
+                logger->error(msg);
             break;
         case LogLevel::CRITICAL:
-            if (logger.critical())
-                logger.critical(msg);
+            if (logger->critical())
+                logger->critical(msg);
             break;
         case LogLevel::FATAL:
-            if (logger.fatal())
-                logger.fatal(msg);
+            if (logger->fatal())
+                logger->fatal(msg);
             break;
     }
 }
diff --git a/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp
index 6acd9af20ed..1b2b57beeb1 100644
--- a/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp
+++ b/programs/library-bridge/ExternalDictionaryLibraryHandlerFactory.cpp
@@ -26,7 +26,7 @@ void ExternalDictionaryLibraryHandlerFactory::create(
 
     if (library_handlers.contains(dictionary_id))
     {
-        LOG_WARNING(&Poco::Logger::get("ExternalDictionaryLibraryHandlerFactory"), "Library handler with dictionary id {} already exists", dictionary_id);
+        LOG_WARNING(getLogger("ExternalDictionaryLibraryHandlerFactory"), "Library handler with dictionary id {} already exists", dictionary_id);
         return;
     }
 
diff --git a/programs/library-bridge/ExternalDictionaryLibraryUtils.h b/programs/library-bridge/ExternalDictionaryLibraryUtils.h
index c9d03d27f75..e6bf8f2a4c3 100644
--- a/programs/library-bridge/ExternalDictionaryLibraryUtils.h
+++ b/programs/library-bridge/ExternalDictionaryLibraryUtils.h
@@ -35,7 +35,7 @@ public:
     ExternalDictionaryLibraryAPI::CStrings strings; // will pass pointer to lib
 
 private:
-    std::unique_ptr<ExternalDictionaryLibraryAPI::CString[]> ptr_holder = nullptr;
+    std::unique_ptr<ExternalDictionaryLibraryAPI::CString[]> ptr_holder;
     Container strings_holder;
 };
 
diff --git a/programs/library-bridge/LibraryBridge.h b/programs/library-bridge/LibraryBridge.h
index 04860a042a3..a8d15a87e07 100644
--- a/programs/library-bridge/LibraryBridge.h
+++ b/programs/library-bridge/LibraryBridge.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Interpreters/Context.h>
+#include <Interpreters/Context_fwd.h>
 #include <Bridge/IBridge.h>
 #include "LibraryBridgeHandlerFactory.h"
 
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
index 4af1f8355e8..e5ab22f2d40 100644
--- a/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.cpp
@@ -12,7 +12,7 @@ LibraryBridgeHandlerFactory::LibraryBridgeHandlerFactory(
     size_t keep_alive_timeout_,
     ContextPtr context_)
     : WithContext(context_)
-    , log(&Poco::Logger::get(name_))
+    , log(getLogger(name_))
     , name(name_)
     , keep_alive_timeout(keep_alive_timeout_)
 {
diff --git a/programs/library-bridge/LibraryBridgeHandlerFactory.h b/programs/library-bridge/LibraryBridgeHandlerFactory.h
index 7565052c4cb..5b0f088bc29 100644
--- a/programs/library-bridge/LibraryBridgeHandlerFactory.h
+++ b/programs/library-bridge/LibraryBridgeHandlerFactory.h
@@ -19,7 +19,7 @@ public:
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     const std::string name;
     const size_t keep_alive_timeout;
 };
diff --git a/programs/library-bridge/LibraryBridgeHandlers.cpp b/programs/library-bridge/LibraryBridgeHandlers.cpp
index b0b465460e0..26d887cfc98 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.cpp
+++ b/programs/library-bridge/LibraryBridgeHandlers.cpp
@@ -1,6 +1,5 @@
 #include "LibraryBridgeHandlers.h"
 
-#include "CatBoostLibraryHandler.h"
 #include "CatBoostLibraryHandlerFactory.h"
 #include "Common/ProfileEvents.h"
 #include "ExternalDictionaryLibraryHandler.h"
@@ -11,10 +10,8 @@
 #include <IO/ReadHelpers.h>
 #include <Common/BridgeProtocolVersion.h>
 #include <IO/WriteHelpers.h>
-#include <Poco/Net/HTMLForm.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
-#include <Poco/ThreadPool.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
 #include <Processors/Formats/IInputFormat.h>
@@ -47,7 +44,7 @@ namespace
         if (!response.sent())
             *response.send() << message << '\n';
 
-        LOG_WARNING(&Poco::Logger::get("LibraryBridge"), fmt::runtime(message));
+        LOG_WARNING(getLogger("LibraryBridge"), fmt::runtime(message));
     }
 
     std::shared_ptr<Block> parseColumns(String && column_string)
@@ -92,7 +89,7 @@ static void writeData(Block data, OutputFormatPtr format)
 ExternalDictionaryLibraryBridgeRequestHandler::ExternalDictionaryLibraryBridgeRequestHandler(size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
     , keep_alive_timeout(keep_alive_timeout_)
-    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeRequestHandler"))
+    , log(getLogger("ExternalDictionaryLibraryBridgeRequestHandler"))
 {
 }
 
@@ -380,7 +377,7 @@ void ExternalDictionaryLibraryBridgeRequestHandler::handleRequest(HTTPServerRequ
 ExternalDictionaryLibraryBridgeExistsHandler::ExternalDictionaryLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
     , keep_alive_timeout(keep_alive_timeout_)
-    , log(&Poco::Logger::get("ExternalDictionaryLibraryBridgeExistsHandler"))
+    , log(getLogger("ExternalDictionaryLibraryBridgeExistsHandler"))
 {
 }
 
@@ -419,7 +416,7 @@ CatBoostLibraryBridgeRequestHandler::CatBoostLibraryBridgeRequestHandler(
     size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
     , keep_alive_timeout(keep_alive_timeout_)
-    , log(&Poco::Logger::get("CatBoostLibraryBridgeRequestHandler"))
+    , log(getLogger("CatBoostLibraryBridgeRequestHandler"))
 {
 }
 
@@ -623,7 +620,7 @@ void CatBoostLibraryBridgeRequestHandler::handleRequest(HTTPServerRequest & requ
 CatBoostLibraryBridgeExistsHandler::CatBoostLibraryBridgeExistsHandler(size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
     , keep_alive_timeout(keep_alive_timeout_)
-    , log(&Poco::Logger::get("CatBoostLibraryBridgeExistsHandler"))
+    , log(getLogger("CatBoostLibraryBridgeExistsHandler"))
 {
 }
 
diff --git a/programs/library-bridge/LibraryBridgeHandlers.h b/programs/library-bridge/LibraryBridgeHandlers.h
index 4f08d7a6084..1db71eb24cb 100644
--- a/programs/library-bridge/LibraryBridgeHandlers.h
+++ b/programs/library-bridge/LibraryBridgeHandlers.h
@@ -26,7 +26,7 @@ private:
     static constexpr inline auto FORMAT = "RowBinary";
 
     const size_t keep_alive_timeout;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
@@ -40,7 +40,7 @@ public:
 
 private:
     const size_t keep_alive_timeout;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
@@ -69,7 +69,7 @@ public:
 
 private:
     const size_t keep_alive_timeout;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
@@ -83,7 +83,7 @@ public:
 
 private:
     const size_t keep_alive_timeout;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/programs/library-bridge/createFunctionBaseCast.cpp b/programs/library-bridge/createFunctionBaseCast.cpp
new file mode 100644
index 00000000000..dcdd47d79ce
--- /dev/null
+++ b/programs/library-bridge/createFunctionBaseCast.cpp
@@ -0,0 +1,23 @@
+#include <memory>
+#include <Functions/CastOverloadResolver.h>
+#include <Core/ColumnsWithTypeAndName.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+class IFunctionBase;
+using FunctionBasePtr = std::shared_ptr<const IFunctionBase>;
+
+FunctionBasePtr createFunctionBaseCast(
+    ContextPtr, const char *, const ColumnsWithTypeAndName &, const DataTypePtr &, std::optional<CastDiagnostic>, CastType)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Type conversions are not implemented for Library Bridge");
+}
+
+}
diff --git a/programs/local/CMakeLists.txt b/programs/local/CMakeLists.txt
index 565b67d0020..1aaa2859898 100644
--- a/programs/local/CMakeLists.txt
+++ b/programs/local/CMakeLists.txt
@@ -25,9 +25,3 @@ endif()
 
 # Always use internal readpassphrase
 target_link_libraries(clickhouse-local-lib PRIVATE readpassphrase)
-
-if (ENABLE_FUZZING)
-    add_compile_definitions(FUZZING_MODE=1)
-    set (WITH_COVERAGE ON)
-    target_link_libraries(clickhouse-local-lib PRIVATE ${LIB_FUZZING_ENGINE})
-endif ()
diff --git a/programs/local/LocalServer.cpp b/programs/local/LocalServer.cpp
index c9841277b6d..72920fbd855 100644
--- a/programs/local/LocalServer.cpp
+++ b/programs/local/LocalServer.cpp
@@ -4,7 +4,6 @@
 #include <Common/logger_useful.h>
 #include <Common/formatReadable.h>
 #include <base/getMemoryAmount.h>
-#include <base/errnoToString.h>
 #include <Poco/Util/XMLConfiguration.h>
 #include <Poco/String.h>
 #include <Poco/Logger.h>
@@ -22,8 +21,6 @@
 #include <Interpreters/loadMetadata.h>
 #include <Interpreters/registerInterpreters.h>
 #include <base/getFQDNOrHostName.h>
-#include <Common/scope_guard_safe.h>
-#include <Interpreters/Session.h>
 #include <Access/AccessControl.h>
 #include <Common/PoolId.h>
 #include <Common/Exception.h>
@@ -34,7 +31,6 @@
 #include <Common/quoteString.h>
 #include <Common/randomSeed.h>
 #include <Common/ThreadPool.h>
-#include <Loggers/Loggers.h>
 #include <Loggers/OwnFormattingChannel.h>
 #include <Loggers/OwnPatternFormatter.h>
 #include <IO/ReadBufferFromFile.h>
@@ -42,7 +38,6 @@
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/UseSSL.h>
 #include <IO/SharedThreadPools.h>
-#include <Parsers/IAST.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Common/ErrorHandlers.h>
 #include <Functions/UserDefined/IUserDefinedSQLObjectsStorage.h>
@@ -61,10 +56,6 @@
 
 #include "config.h"
 
-#if defined(FUZZING_MODE)
-    #include <Functions/getFuzzerData.h>
-#endif
-
 #if USE_AZURE_BLOB_STORAGE
 #   include <azure/storage/common/internal/xml_wrapper.hpp>
 #endif
@@ -131,7 +122,7 @@ void LocalServer::initialize(Poco::Util::Application & self)
     {
         const auto config_path = config().getString("config-file", "config.xml");
         ConfigProcessor config_processor(config_path, false, true);
-        config_processor.setConfigPath(fs::path(config_path).parent_path());
+        ConfigProcessor::setConfigPath(fs::path(config_path).parent_path());
         auto loaded_config = config_processor.loadConfig();
         config().add(loaded_config.configuration.duplicate(), PRIO_DEFAULT, false);
     }
@@ -221,7 +212,7 @@ void LocalServer::tryInitPath()
     {
         // The path is not provided explicitly - use a unique path in the system temporary directory
         // (or in the current dir if temporary don't exist)
-        Poco::Logger * log = &logger();
+        LoggerRawPtr log = &logger();
         std::filesystem::path parent_folder;
         std::filesystem::path default_path;
 
@@ -249,7 +240,7 @@ void LocalServer::tryInitPath()
         default_path = parent_folder / fmt::format("clickhouse-local-{}-{}-{}", getpid(), time(nullptr), randomSeed());
 
         if (exists(default_path))
-            throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Unsuccessful attempt to create working directory: {} exist!", default_path.string());
+            throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "Unsuccessful attempt to create working directory: {} already exists.", default_path.string());
 
         create_directory(default_path);
         temporary_directory_to_delete = default_path;
@@ -290,6 +281,11 @@ void LocalServer::cleanup()
     {
         connection.reset();
 
+        /// Suggestions are loaded async in a separate thread and it can use global context.
+        /// We should reset it before resetting global_context.
+        if (suggest)
+            suggest.reset();
+
         if (global_context)
         {
             global_context->shutdown();
@@ -316,39 +312,28 @@ void LocalServer::cleanup()
 }
 
 
-static bool checkIfStdinIsRegularFile()
-{
-    struct stat file_stat;
-    return fstat(STDIN_FILENO, &file_stat) == 0 && S_ISREG(file_stat.st_mode);
-}
-
 std::string LocalServer::getInitialCreateTableQuery()
 {
-    if (!config().has("table-structure") && !config().has("table-file") && !config().has("table-data-format") && (!checkIfStdinIsRegularFile() || queries.empty()))
+    if (!config().has("table-structure") && !config().has("table-file") && !config().has("table-data-format") && (!isRegularFile(STDIN_FILENO) || queries.empty()))
         return {};
 
     auto table_name = backQuoteIfNeed(config().getString("table-name", "table"));
     auto table_structure = config().getString("table-structure", "auto");
 
     String table_file;
-    String format_from_file_name;
     if (!config().has("table-file") || config().getString("table-file") == "-")
     {
         /// Use Unix tools stdin naming convention
         table_file = "stdin";
-        format_from_file_name = FormatFactory::instance().getFormatFromFileDescriptor(STDIN_FILENO);
     }
     else
     {
         /// Use regular file
         auto file_name = config().getString("table-file");
         table_file = quoteString(file_name);
-        format_from_file_name = FormatFactory::instance().getFormatFromFileName(file_name, false);
     }
 
-    auto data_format = backQuoteIfNeed(
-        config().getString("table-data-format", config().getString("format", format_from_file_name.empty() ? "TSV" : format_from_file_name)));
-
+    String data_format = backQuoteIfNeed(default_input_format);
 
     if (table_structure == "auto")
         table_structure = "";
@@ -461,25 +446,10 @@ try
         }
     }
 
-#if defined(FUZZING_MODE)
-    static bool first_time = true;
-    if (first_time)
-    {
-
-    if (queries_files.empty() && queries.empty())
-    {
-        std::cerr << "\033[31m" << "ClickHouse compiled in fuzzing mode." << "\033[0m" << std::endl;
-        std::cerr << "\033[31m" << "You have to provide a query with --query or --queries-file option." << "\033[0m" << std::endl;
-        std::cerr << "\033[31m" << "The query have to use function getFuzzerData() inside." << "\033[0m" << std::endl;
-        exit(1);
-    }
-
-    is_interactive = false;
-#else
     is_interactive = stdin_is_a_tty
         && (config().hasOption("interactive")
             || (queries.empty() && !config().has("table-structure") && queries_files.empty() && !config().has("table-file")));
-#endif
+
     if (!is_interactive)
     {
         /// We will terminate process on error
@@ -501,6 +471,7 @@ try
     processConfig();
     adjustSettings();
     initTTYBuffer(toProgressOption(config().getString("progress", "default")));
+    ASTAlterCommand::setFormatAlterCommandsWithParentheses(true);
 
     applyCmdSettings(global_context);
 
@@ -524,15 +495,13 @@ try
 
     connect();
 
-#ifdef FUZZING_MODE
-    first_time = false;
-    }
-#endif
-
     String initial_query = getInitialCreateTableQuery();
     if (!initial_query.empty())
         processQueryText(initial_query);
 
+#if defined(FUZZING_MODE)
+    runLibFuzzer();
+#else
     if (is_interactive && !delayed_interactive)
     {
         runInteractive();
@@ -544,10 +513,8 @@ try
         if (delayed_interactive)
             runInteractive();
     }
-
-#ifndef FUZZING_MODE
-    cleanup();
 #endif
+
     return Application::EXIT_OK;
 }
 catch (const DB::Exception & e)
@@ -626,25 +593,13 @@ void LocalServer::processConfig()
 
     tryInitPath();
 
-    Poco::Logger * log = &logger();
+    LoggerRawPtr log = &logger();
 
     /// Maybe useless
     if (config().has("macros"))
         global_context->setMacros(std::make_unique<Macros>(config(), "macros", log));
 
-    format = config().getString("output-format", config().getString("format", is_interactive ? "PrettyCompact" : "TSV"));
-    insert_format = "Values";
-
-    /// Setting value from cmd arg overrides one from config
-    if (global_context->getSettingsRef().max_insert_block_size.changed)
-    {
-        insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
-    }
-    else
-    {
-        insert_format_max_block_size = config().getUInt64("insert_format_max_block_size",
-            global_context->getSettingsRef().max_insert_block_size);
-    }
+    setDefaultFormatsFromConfiguration();
 
     /// Sets external authenticators config (LDAP, Kerberos).
     global_context->setExternalAuthenticatorsConfig(config());
@@ -808,22 +763,11 @@ void LocalServer::processConfig()
 
 void LocalServer::printHelpMessage([[maybe_unused]] const OptionsDescription & options_description)
 {
-#if defined(FUZZING_MODE)
-    std::cout <<
-        "usage: clickhouse <clickhouse-local arguments> -- <libfuzzer arguments>\n"
-        "Note: It is important not to use only one letter keys with single dash for \n"
-        "for clickhouse-local arguments. It may work incorrectly.\n"
-
-        "ClickHouse is build with coverage guided fuzzer (libfuzzer) inside it.\n"
-        "You have to provide a query which contains getFuzzerData function.\n"
-        "This will take the data from fuzzing engine, pass it to getFuzzerData function and execute a query.\n"
-        "Each time the data will be different, and it will last until some segfault or sanitizer assertion is found. \n";
-#else
     std::cout << getHelpHeader() << "\n";
     std::cout << options_description.main_description.value() << "\n";
     std::cout << getHelpFooter() << "\n";
     std::cout << "In addition, --param_name=value can be specified for substitution of parameters for parametrized queries.\n";
-#endif
+    std::cout << "\nSee also: https://clickhouse.com/docs/en/operations/utilities/clickhouse-local/\n";
 }
 
 
@@ -834,10 +778,9 @@ void LocalServer::addOptions(OptionsDescription & options_description)
 
         /// If structure argument is omitted then initial query is not generated
         ("structure,S", po::value<std::string>(), "structure of the initial table (list of column and type names)")
-        ("file,f", po::value<std::string>(), "path to file with data of the initial table (stdin if not specified)")
+        ("file,F", po::value<std::string>(), "path to file with data of the initial table (stdin if not specified)")
 
         ("input-format", po::value<std::string>(), "input format of the initial table data")
-        ("output-format", po::value<std::string>(), "default output format")
 
         ("logger.console", po::value<bool>()->implicit_value(true), "Log to console")
         ("logger.log", po::value<std::string>(), "Log file name")
@@ -899,6 +842,7 @@ void LocalServer::readArguments(int argc, char ** argv, Arguments & common_argum
     for (int arg_num = 1; arg_num < argc; ++arg_num)
     {
         std::string_view arg = argv[arg_num];
+
         /// Parameter arg after underline.
         if (arg.starts_with("--param_"))
         {
@@ -931,14 +875,16 @@ void LocalServer::readArguments(int argc, char ** argv, Arguments & common_argum
             addMultiquery(arg, common_arguments);
         }
         else
+        {
             common_arguments.emplace_back(arg);
+        }
     }
 }
 
 }
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wmissing-declarations"
 
 int mainEntryClickHouseLocal(int argc, char ** argv)
 {
@@ -966,69 +912,3 @@ int mainEntryClickHouseLocal(int argc, char ** argv)
         return code ? code : 1;
     }
 }
-
-#if defined(FUZZING_MODE)
-
-// linked from programs/main.cpp
-bool isClickhouseApp(const std::string & app_suffix, std::vector<char *> & argv);
-
-std::optional<DB::LocalServer> fuzz_app;
-
-extern "C" int LLVMFuzzerInitialize(int * pargc, char *** pargv)
-{
-    std::vector<char *> argv(*pargv, *pargv + (*pargc + 1));
-
-    if (!isClickhouseApp("local", argv))
-    {
-        std::cerr << "\033[31m" << "ClickHouse compiled in fuzzing mode, only clickhouse local is available." << "\033[0m" << std::endl;
-        exit(1);
-    }
-
-    /// As a user you can add flags to clickhouse binary in fuzzing mode as follows
-    /// clickhouse local <set of clickhouse-local specific flag> -- <set of libfuzzer flags>
-
-    char **p = &(*pargv)[1];
-
-    auto it = argv.begin() + 1;
-    for (; *it; ++it)
-        if (strcmp(*it, "--") == 0)
-        {
-            ++it;
-            break;
-        }
-
-    while (*it)
-        if (strncmp(*it, "--", 2) != 0)
-        {
-            *(p++) = *it;
-            it = argv.erase(it);
-        }
-        else
-            ++it;
-
-    *pargc = static_cast<int>(p - &(*pargv)[0]);
-    *p = nullptr;
-
-    /// Initialize clickhouse-local app
-    fuzz_app.emplace();
-    fuzz_app->init(static_cast<int>(argv.size() - 1), argv.data());
-
-    return 0;
-}
-
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
-{
-    try
-    {
-        auto input = String(reinterpret_cast<const char *>(data), size);
-        DB::FunctionGetFuzzerData::update(input);
-        fuzz_app->run();
-    }
-    catch (...)
-    {
-    }
-
-    return 0;
-}
-#endif
diff --git a/programs/main.cpp b/programs/main.cpp
index 7d07112de66..9ad8b016c82 100644
--- a/programs/main.cpp
+++ b/programs/main.cpp
@@ -1,6 +1,7 @@
 #include <csignal>
 #include <csetjmp>
 #include <unistd.h>
+#include <fcntl.h>
 
 #include <new>
 #include <iostream>
@@ -19,64 +20,22 @@
 #include <Common/IO.h>
 
 #include <base/phdr_cache.h>
+#include <base/coverage.h>
 
 
 /// Universal executable for various clickhouse applications
-#if ENABLE_CLICKHOUSE_SERVER
 int mainEntryClickHouseServer(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_CLIENT
 int mainEntryClickHouseClient(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_LOCAL
 int mainEntryClickHouseLocal(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_BENCHMARK
 int mainEntryClickHouseBenchmark(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
 int mainEntryClickHouseExtractFromConfig(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_COMPRESSOR
 int mainEntryClickHouseCompressor(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_FORMAT
 int mainEntryClickHouseFormat(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_COPIER
-int mainEntryClickHouseClusterCopier(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_OBFUSCATOR
 int mainEntryClickHouseObfuscator(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_GIT_IMPORT
 int mainEntryClickHouseGitImport(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_KEEPER
-int mainEntryClickHouseKeeper(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_KEEPER_CONVERTER
-int mainEntryClickHouseKeeperConverter(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_KEEPER_CLIENT
-int mainEntryClickHouseKeeperClient(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
 int mainEntryClickHouseStaticFilesDiskUploader(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_SU
 int mainEntryClickHouseSU(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_INSTALL
-int mainEntryClickHouseInstall(int argc, char ** argv);
-int mainEntryClickHouseStart(int argc, char ** argv);
-int mainEntryClickHouseStop(int argc, char ** argv);
-int mainEntryClickHouseStatus(int argc, char ** argv);
-int mainEntryClickHouseRestart(int argc, char ** argv);
-#endif
-#if ENABLE_CLICKHOUSE_DISKS
 int mainEntryClickHouseDisks(int argc, char ** argv);
-#endif
 
 int mainEntryClickHouseHashBinary(int, char **)
 {
@@ -86,46 +45,46 @@ int mainEntryClickHouseHashBinary(int, char **)
     return 0;
 }
 
+#if ENABLE_CLICKHOUSE_KEEPER
+int mainEntryClickHouseKeeper(int argc, char ** argv);
+#endif
+#if ENABLE_CLICKHOUSE_KEEPER_CONVERTER
+int mainEntryClickHouseKeeperConverter(int argc, char ** argv);
+#endif
+#if ENABLE_CLICKHOUSE_KEEPER_CLIENT
+int mainEntryClickHouseKeeperClient(int argc, char ** argv);
+#endif
+
+// install
+int mainEntryClickHouseInstall(int argc, char ** argv);
+int mainEntryClickHouseStart(int argc, char ** argv);
+int mainEntryClickHouseStop(int argc, char ** argv);
+int mainEntryClickHouseStatus(int argc, char ** argv);
+int mainEntryClickHouseRestart(int argc, char ** argv);
+
 namespace
 {
 
 using MainFunc = int (*)(int, char**);
 
-#if !defined(FUZZING_MODE)
-
 /// Add an item here to register new application
 std::pair<std::string_view, MainFunc> clickhouse_applications[] =
 {
-#if ENABLE_CLICKHOUSE_LOCAL
     {"local", mainEntryClickHouseLocal},
-#endif
-#if ENABLE_CLICKHOUSE_CLIENT
     {"client", mainEntryClickHouseClient},
-#endif
-#if ENABLE_CLICKHOUSE_BENCHMARK
     {"benchmark", mainEntryClickHouseBenchmark},
-#endif
-#if ENABLE_CLICKHOUSE_SERVER
     {"server", mainEntryClickHouseServer},
-#endif
-#if ENABLE_CLICKHOUSE_EXTRACT_FROM_CONFIG
     {"extract-from-config", mainEntryClickHouseExtractFromConfig},
-#endif
-#if ENABLE_CLICKHOUSE_COMPRESSOR
     {"compressor", mainEntryClickHouseCompressor},
-#endif
-#if ENABLE_CLICKHOUSE_FORMAT
     {"format", mainEntryClickHouseFormat},
-#endif
-#if ENABLE_CLICKHOUSE_COPIER
-    {"copier", mainEntryClickHouseClusterCopier},
-#endif
-#if ENABLE_CLICKHOUSE_OBFUSCATOR
     {"obfuscator", mainEntryClickHouseObfuscator},
-#endif
-#if ENABLE_CLICKHOUSE_GIT_IMPORT
     {"git-import", mainEntryClickHouseGitImport},
-#endif
+    {"static-files-disk-uploader", mainEntryClickHouseStaticFilesDiskUploader},
+    {"su", mainEntryClickHouseSU},
+    {"hash-binary", mainEntryClickHouseHashBinary},
+    {"disks", mainEntryClickHouseDisks},
+
+    // keeper
 #if ENABLE_CLICKHOUSE_KEEPER
     {"keeper", mainEntryClickHouseKeeper},
 #endif
@@ -135,34 +94,13 @@ std::pair<std::string_view, MainFunc> clickhouse_applications[] =
 #if ENABLE_CLICKHOUSE_KEEPER_CLIENT
     {"keeper-client", mainEntryClickHouseKeeperClient},
 #endif
-#if ENABLE_CLICKHOUSE_INSTALL
+
+    // install
     {"install", mainEntryClickHouseInstall},
     {"start", mainEntryClickHouseStart},
     {"stop", mainEntryClickHouseStop},
     {"status", mainEntryClickHouseStatus},
     {"restart", mainEntryClickHouseRestart},
-#endif
-#if ENABLE_CLICKHOUSE_STATIC_FILES_DISK_UPLOADER
-    {"static-files-disk-uploader", mainEntryClickHouseStaticFilesDiskUploader},
-#endif
-#if ENABLE_CLICKHOUSE_SU
-    {"su", mainEntryClickHouseSU},
-#endif
-    {"hash-binary", mainEntryClickHouseHashBinary},
-#if ENABLE_CLICKHOUSE_DISKS
-    {"disks", mainEntryClickHouseDisks},
-#endif
-};
-
-/// Add an item here to register a new short name
-std::pair<std::string_view, std::string_view> clickhouse_short_names[] =
-{
-#if ENABLE_CLICKHOUSE_LOCAL
-    {"chl", "local"},
-#endif
-#if ENABLE_CLICKHOUSE_CLIENT
-    {"chc", "client"},
-#endif
 };
 
 int printHelp(int, char **)
@@ -172,7 +110,13 @@ int printHelp(int, char **)
         std::cerr << "clickhouse " << application.first << " [args] " << std::endl;
     return -1;
 }
-#endif
+
+/// Add an item here to register a new short name
+std::pair<std::string_view, std::string_view> clickhouse_short_names[] =
+{
+    {"chl", "local"},
+    {"chc", "client"},
+};
 
 
 enum class InstructionFail
@@ -338,7 +282,7 @@ struct Checker
 ;
 
 
-#if !defined(FUZZING_MODE) && !defined(USE_MUSL)
+#if !defined(USE_MUSL)
 /// NOTE: We will migrate to full static linking or our own dynamic loader to make this code obsolete.
 void checkHarmfulEnvironmentVariables(char ** argv)
 {
@@ -392,6 +336,50 @@ void checkHarmfulEnvironmentVariables(char ** argv)
 }
 #endif
 
+
+#if defined(SANITIZE_COVERAGE)
+__attribute__((no_sanitize("coverage")))
+void dumpCoverage()
+{
+    /// A user can request to dump the coverage information into files at exit.
+    /// This is useful for non-server applications such as clickhouse-format or clickhouse-client,
+    /// that cannot introspect it with SQL functions at runtime.
+
+    /// The CLICKHOUSE_WRITE_COVERAGE environment variable defines a prefix for a filename 'prefix.pid'
+    /// containing the list of addresses of covered .
+
+    /// The format is even simpler than Clang's "sancov": an array of 64-bit addresses, native byte order, no header.
+
+    if (const char * coverage_filename_prefix = getenv("CLICKHOUSE_WRITE_COVERAGE")) // NOLINT(concurrency-mt-unsafe)
+    {
+        auto dump = [](const std::string & name, auto span)
+        {
+            /// Write only non-zeros.
+            std::vector<uintptr_t> data;
+            data.reserve(span.size());
+            for (auto addr : span)
+                if (addr)
+                    data.push_back(addr);
+
+            int fd = ::open(name.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0400);
+            if (-1 == fd)
+            {
+                writeError("Cannot open a file to write the coverage data\n");
+            }
+            else
+            {
+                if (!writeRetry(fd, reinterpret_cast<const char *>(data.data()), data.size() * sizeof(data[0])))
+                    writeError("Cannot write the coverage data to a file\n");
+                if (0 != ::close(fd))
+                    writeError("Cannot close the file with coverage data\n");
+            }
+        };
+
+        dump(fmt::format("{}.{}", coverage_filename_prefix, getpid()), getCumulativeCoverage());
+    }
+}
+#endif
+
 }
 
 bool isClickhouseApp(std::string_view app_suffix, std::vector<char *> & argv)
@@ -456,13 +444,8 @@ extern "C"
 ///
 /// extern bool inside_main;
 /// class C { C() { assert(inside_main); } };
-#ifndef FUZZING_MODE
 bool inside_main = false;
-#else
-bool inside_main = true;
-#endif
 
-#if !defined(FUZZING_MODE)
 int main(int argc_, char ** argv_)
 {
     inside_main = true;
@@ -504,7 +487,7 @@ int main(int argc_, char ** argv_)
     /// Interpret binary without argument or with arguments starts with dash
     /// ('-') as clickhouse-local for better usability:
     ///
-    ///     clickhouse # dumps help
+    ///     clickhouse help # dumps help
     ///     clickhouse -q 'select 1' # use local
     ///     clickhouse # spawn local
     ///     clickhouse local # spawn local
@@ -512,6 +495,11 @@ int main(int argc_, char ** argv_)
     if (main_func == printHelp && !argv.empty() && (argv.size() == 1 || argv[1][0] == '-'))
         main_func = mainEntryClickHouseLocal;
 
-    return main_func(static_cast<int>(argv.size()), argv.data());
-}
+    int exit_code = main_func(static_cast<int>(argv.size()), argv.data());
+
+#if defined(SANITIZE_COVERAGE)
+    dumpCoverage();
 #endif
+
+    return exit_code;
+}
diff --git a/programs/obfuscator/Obfuscator.cpp b/programs/obfuscator/Obfuscator.cpp
index 7e09d5e8046..b2bf942af4e 100644
--- a/programs/obfuscator/Obfuscator.cpp
+++ b/programs/obfuscator/Obfuscator.cpp
@@ -1204,8 +1204,8 @@ public:
 
 }
 
-#pragma GCC diagnostic ignored "-Wunused-function"
-#pragma GCC diagnostic ignored "-Wmissing-declarations"
+#pragma clang diagnostic ignored "-Wunused-function"
+#pragma clang diagnostic ignored "-Wmissing-declarations"
 
 int mainEntryClickHouseObfuscator(int argc, char ** argv)
 try
@@ -1310,7 +1310,7 @@ try
             throw ErrnoException(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Input must be seekable file (it will be read twice)");
 
         SingleReadBufferIterator read_buffer_iterator(std::move(file));
-        schema_columns = readSchemaFromFormat(input_format, {}, read_buffer_iterator, false, context_const);
+        schema_columns = readSchemaFromFormat(input_format, {}, read_buffer_iterator, context_const);
     }
     else
     {
diff --git a/programs/odbc-bridge/CMakeLists.txt b/programs/odbc-bridge/CMakeLists.txt
index 56373601b95..83839cc21ac 100644
--- a/programs/odbc-bridge/CMakeLists.txt
+++ b/programs/odbc-bridge/CMakeLists.txt
@@ -4,8 +4,8 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
     ColumnInfoHandler.cpp
     IdentifierQuoteHandler.cpp
     MainHandler.cpp
-    ODBCBlockInputStream.cpp
-    ODBCBlockOutputStream.cpp
+    ODBCSource.cpp
+    ODBCSink.cpp
     ODBCBridge.cpp
     ODBCHandlerFactory.cpp
     PingHandler.cpp
@@ -13,6 +13,7 @@ set (CLICKHOUSE_ODBC_BRIDGE_SOURCES
     getIdentifierQuote.cpp
     odbc-bridge.cpp
     validateODBCConnectionString.cpp
+    createFunctionBaseCast.cpp
 )
 
 clickhouse_add_executable(clickhouse-odbc-bridge ${CLICKHOUSE_ODBC_BRIDGE_SOURCES})
@@ -29,12 +30,7 @@ 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 (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()
-    clickhouse_make_empty_debug_info_for_nfpm(TARGET clickhouse-odbc-bridge DESTINATION_DIR ${CMAKE_CURRENT_BINARY_DIR}/../${SPLITTED_DEBUG_SYMBOLS_DIR})
-    install(TARGETS clickhouse-odbc-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
-endif()
+install(TARGETS clickhouse-odbc-bridge RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse)
 
 if(ENABLE_TESTS)
     add_subdirectory(tests)
diff --git a/programs/odbc-bridge/ColumnInfoHandler.cpp b/programs/odbc-bridge/ColumnInfoHandler.cpp
index 774883657b7..5ff985b3d12 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.cpp
+++ b/programs/odbc-bridge/ColumnInfoHandler.cpp
@@ -8,13 +8,12 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Parsers/ParserQueryWithOutput.h>
-#include <Parsers/parseQuery.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Poco/NumberParser.h>
+#include <Interpreters/Context.h>
 #include <Common/logger_useful.h>
-#include <base/scope_guard.h>
 #include <Common/BridgeProtocolVersion.h>
 #include <Common/quoteString.h>
 #include "getIdentifierQuote.h"
diff --git a/programs/odbc-bridge/ColumnInfoHandler.h b/programs/odbc-bridge/ColumnInfoHandler.h
index e3087701182..610fb128c9d 100644
--- a/programs/odbc-bridge/ColumnInfoHandler.h
+++ b/programs/odbc-bridge/ColumnInfoHandler.h
@@ -5,7 +5,6 @@
 #if USE_ODBC
 
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/Context.h>
 #include <Server/HTTP/HTTPRequestHandler.h>
 #include <Poco/Logger.h>
 
@@ -18,7 +17,7 @@ class ODBCColumnsInfoHandler : public HTTPRequestHandler, WithContext
 public:
     ODBCColumnsInfoHandler(size_t keep_alive_timeout_, ContextPtr context_)
         : WithContext(context_)
-        , log(&Poco::Logger::get("ODBCColumnsInfoHandler"))
+        , log(getLogger("ODBCColumnsInfoHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
     {
     }
@@ -26,7 +25,7 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     size_t keep_alive_timeout;
 };
 
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.cpp b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
index a23efb112de..cf5acdc4534 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.cpp
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.cpp
@@ -7,13 +7,10 @@
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Parsers/ParserQueryWithOutput.h>
-#include <Parsers/parseQuery.h>
 #include <Poco/Net/HTTPServerRequest.h>
 #include <Poco/Net/HTTPServerResponse.h>
 #include <Common/BridgeProtocolVersion.h>
 #include <Common/logger_useful.h>
-#include <base/scope_guard.h>
 #include "getIdentifierQuote.h"
 #include "validateODBCConnectionString.h"
 #include "ODBCPooledConnectionFactory.h"
diff --git a/programs/odbc-bridge/IdentifierQuoteHandler.h b/programs/odbc-bridge/IdentifierQuoteHandler.h
index ff5c02ca07b..7b78c5b4b93 100644
--- a/programs/odbc-bridge/IdentifierQuoteHandler.h
+++ b/programs/odbc-bridge/IdentifierQuoteHandler.h
@@ -16,7 +16,7 @@ class IdentifierQuoteHandler : public HTTPRequestHandler, WithContext
 public:
     IdentifierQuoteHandler(size_t keep_alive_timeout_, ContextPtr context_)
         : WithContext(context_)
-        , log(&Poco::Logger::get("IdentifierQuoteHandler"))
+        , log(getLogger("IdentifierQuoteHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
     {
     }
@@ -24,7 +24,7 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     size_t keep_alive_timeout;
 };
 
diff --git a/programs/odbc-bridge/MainHandler.cpp b/programs/odbc-bridge/MainHandler.cpp
index e350afa2b10..2cf1576ccd7 100644
--- a/programs/odbc-bridge/MainHandler.cpp
+++ b/programs/odbc-bridge/MainHandler.cpp
@@ -1,8 +1,8 @@
 #include "MainHandler.h"
 
 #include "validateODBCConnectionString.h"
-#include "ODBCBlockInputStream.h"
-#include "ODBCBlockOutputStream.h"
+#include "ODBCSource.h"
+#include "ODBCSink.h"
 #include "getIdentifierQuote.h"
 #include <DataTypes/DataTypeFactory.h>
 #include <Formats/FormatFactory.h>
diff --git a/programs/odbc-bridge/MainHandler.h b/programs/odbc-bridge/MainHandler.h
index 7977245ff82..ed0c6b2e28c 100644
--- a/programs/odbc-bridge/MainHandler.h
+++ b/programs/odbc-bridge/MainHandler.h
@@ -24,7 +24,7 @@ public:
         ContextPtr context_,
         const String & mode_)
         : WithContext(context_)
-        , log(&Poco::Logger::get("ODBCHandler"))
+        , log(getLogger("ODBCHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
         , mode(mode_)
     {
@@ -33,7 +33,7 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     size_t keep_alive_timeout;
     String mode;
diff --git a/programs/odbc-bridge/ODBCHandlerFactory.cpp b/programs/odbc-bridge/ODBCHandlerFactory.cpp
index dd21358df8c..eebb0c24c7a 100644
--- a/programs/odbc-bridge/ODBCHandlerFactory.cpp
+++ b/programs/odbc-bridge/ODBCHandlerFactory.cpp
@@ -11,7 +11,7 @@ namespace DB
 
 ODBCBridgeHandlerFactory::ODBCBridgeHandlerFactory(const std::string & name_, size_t keep_alive_timeout_, ContextPtr context_)
     : WithContext(context_)
-    , log(&Poco::Logger::get(name_))
+    , log(getLogger(name_))
     , name(name_)
     , keep_alive_timeout(keep_alive_timeout_)
 {
diff --git a/programs/odbc-bridge/ODBCHandlerFactory.h b/programs/odbc-bridge/ODBCHandlerFactory.h
index 3e3da7c9f24..4aaf1b55453 100644
--- a/programs/odbc-bridge/ODBCHandlerFactory.h
+++ b/programs/odbc-bridge/ODBCHandlerFactory.h
@@ -22,7 +22,7 @@ public:
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string name;
     size_t keep_alive_timeout;
 };
diff --git a/programs/odbc-bridge/ODBCPooledConnectionFactory.h b/programs/odbc-bridge/ODBCPooledConnectionFactory.h
index a10055c6659..c4e3d4c12c6 100644
--- a/programs/odbc-bridge/ODBCPooledConnectionFactory.h
+++ b/programs/odbc-bridge/ODBCPooledConnectionFactory.h
@@ -40,7 +40,6 @@ public:
 
     explicit ConnectionHolder(const String & connection_string_)
         : pool(nullptr)
-        , connection()
         , connection_string(connection_string_)
     {
         updateConnection();
@@ -97,7 +96,7 @@ T execute(nanodbc::ConnectionHolderPtr connection_holder, std::function<T(nanodb
         /// https://docs.microsoft.com/ru-ru/sql/odbc/reference/appendixes/appendix-a-odbc-error-codes?view=sql-server-ver15
         bool is_retriable = e.state().starts_with("08") || e.state().starts_with("24") || e.state().starts_with("25");
         LOG_ERROR(
-            &Poco::Logger::get("ODBCConnection"),
+            getLogger("ODBCConnection"),
             "ODBC query failed with error: {}, state: {}, native code: {}{}",
             e.what(), e.state(), e.native(), is_retriable ? ", will retry" : "");
 
@@ -143,7 +142,7 @@ public:
     {
         std::lock_guard lock(mutex);
 
-        if (!factory.count(connection_string))
+        if (!factory.contains(connection_string))
             factory.emplace(std::make_pair(connection_string, std::make_shared<nanodbc::Pool>(pool_size)));
 
         auto & pool = factory[connection_string];
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.cpp b/programs/odbc-bridge/ODBCSink.cpp
similarity index 91%
rename from programs/odbc-bridge/ODBCBlockOutputStream.cpp
rename to programs/odbc-bridge/ODBCSink.cpp
index eb5901ad3e1..ea2e88690ce 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.cpp
+++ b/programs/odbc-bridge/ODBCSink.cpp
@@ -1,6 +1,5 @@
-#include "ODBCBlockOutputStream.h"
+#include "ODBCSink.h"
 
-#include <Common/logger_useful.h>
 #include <IO/WriteBufferFromString.h>
 #include <Interpreters/Context.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -19,7 +18,7 @@ ODBCSink::ODBCSink(
     ContextPtr local_context_,
     IdentifierQuotingStyle quoting_)
     : ISink(sample_block_)
-    , log(&Poco::Logger::get("ODBCSink"))
+    , log(getLogger("ODBCSink"))
     , connection_holder(std::move(connection_holder_))
     , db_name(remote_database_name_)
     , table_name(remote_table_name_)
diff --git a/programs/odbc-bridge/ODBCBlockOutputStream.h b/programs/odbc-bridge/ODBCSink.h
similarity index 97%
rename from programs/odbc-bridge/ODBCBlockOutputStream.h
rename to programs/odbc-bridge/ODBCSink.h
index f5e7b4e3a2d..06edce92e1a 100644
--- a/programs/odbc-bridge/ODBCBlockOutputStream.h
+++ b/programs/odbc-bridge/ODBCSink.h
@@ -30,7 +30,7 @@ protected:
     void consume(Chunk chunk) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     nanodbc::ConnectionHolderPtr connection_holder;
     std::string db_name;
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.cpp b/programs/odbc-bridge/ODBCSource.cpp
similarity index 53%
rename from programs/odbc-bridge/ODBCBlockInputStream.cpp
rename to programs/odbc-bridge/ODBCSource.cpp
index 3aa3d9a652b..7f0d47f7e2e 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.cpp
+++ b/programs/odbc-bridge/ODBCSource.cpp
@@ -1,15 +1,10 @@
-#include "ODBCBlockInputStream.h"
+#include "ODBCSource.h"
 #include <vector>
 #include <IO/ReadBufferFromString.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeDateTime64.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnsNumber.h>
 #include <Common/assert_cast.h>
 #include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Common/logger_useful.h>
 
 
 namespace DB
@@ -23,7 +18,7 @@ namespace ErrorCodes
 ODBCSource::ODBCSource(
     nanodbc::ConnectionHolderPtr connection_holder, const std::string & query_str, const Block & sample_block, const UInt64 max_block_size_)
     : ISource(sample_block)
-    , log(&Poco::Logger::get("ODBCSource"))
+    , log(getLogger("ODBCSource"))
     , max_block_size{max_block_size_}
     , query(query_str)
 {
@@ -54,21 +49,7 @@ Chunk ODBCSource::generate()
             const auto & sample = description.sample_block.getByPosition(idx);
 
             if (!result.is_null(idx))
-            {
-                bool is_nullable = description.types[idx].second;
-
-                if (is_nullable)
-                {
-                    ColumnNullable & column_nullable = assert_cast<ColumnNullable &>(*columns[idx]);
-                    const auto & data_type = assert_cast<const DataTypeNullable &>(*sample.type);
-                    insertValue(column_nullable.getNestedColumn(), data_type.getNestedType(), description.types[idx].first, result, idx);
-                    column_nullable.getNullMapData().emplace_back(0);
-                }
-                else
-                {
-                    insertValue(*columns[idx], sample.type, description.types[idx].first, result, idx);
-                }
-            }
+                insertValue(*columns[idx], removeNullable(sample.type), description.types[idx].first, result, idx);
             else
                 insertDefaultValue(*columns[idx], *sample.column);
         }
@@ -87,59 +68,60 @@ void ODBCSource::insertValue(
     switch (type)
     {
         case ValueType::vtUInt8:
-            assert_cast<ColumnUInt8 &>(column).insertValue(row.get<uint16_t>(idx));
+            column.insert(row.get<uint16_t>(idx));
             break;
         case ValueType::vtUInt16:
-            assert_cast<ColumnUInt16 &>(column).insertValue(row.get<uint16_t>(idx));
+            column.insert(row.get<uint16_t>(idx));
             break;
         case ValueType::vtUInt32:
-            assert_cast<ColumnUInt32 &>(column).insertValue(row.get<uint32_t>(idx));
+            column.insert(row.get<uint32_t>(idx));
             break;
         case ValueType::vtUInt64:
-            assert_cast<ColumnUInt64 &>(column).insertValue(row.get<uint64_t>(idx));
+            column.insert(row.get<uint64_t>(idx));
             break;
         case ValueType::vtInt8:
-            assert_cast<ColumnInt8 &>(column).insertValue(row.get<int16_t>(idx));
+            column.insert(row.get<int16_t>(idx));
             break;
         case ValueType::vtInt16:
-            assert_cast<ColumnInt16 &>(column).insertValue(row.get<int16_t>(idx));
+            column.insert(row.get<int16_t>(idx));
             break;
         case ValueType::vtInt32:
-            assert_cast<ColumnInt32 &>(column).insertValue(row.get<int32_t>(idx));
+            column.insert(row.get<int32_t>(idx));
             break;
         case ValueType::vtInt64:
-            assert_cast<ColumnInt64 &>(column).insertValue(row.get<int64_t>(idx));
+            column.insert(row.get<int64_t>(idx));
             break;
         case ValueType::vtFloat32:
-            assert_cast<ColumnFloat32 &>(column).insertValue(row.get<float>(idx));
+            column.insert(row.get<float>(idx));
             break;
         case ValueType::vtFloat64:
-            assert_cast<ColumnFloat64 &>(column).insertValue(row.get<double>(idx));
+            column.insert(row.get<double>(idx));
             break;
-        case ValueType::vtFixedString:[[fallthrough]];
+        case ValueType::vtFixedString:
         case ValueType::vtEnum8:
         case ValueType::vtEnum16:
         case ValueType::vtString:
-            assert_cast<ColumnString &>(column).insert(row.get<std::string>(idx));
+            column.insert(row.get<std::string>(idx));
             break;
         case ValueType::vtUUID:
         {
             auto value = row.get<std::string>(idx);
-            assert_cast<ColumnUInt128 &>(column).insert(parse<UUID>(value.data(), value.size()));
+            column.insert(parse<UUID>(value.data(), value.size()));
             break;
         }
         case ValueType::vtDate:
-            assert_cast<ColumnUInt16 &>(column).insertValue(UInt16{LocalDate{row.get<std::string>(idx)}.getDayNum()});
+            column.insert(UInt16{LocalDate{row.get<std::string>(idx)}.getDayNum()});
             break;
         case ValueType::vtDateTime:
         {
             auto value = row.get<std::string>(idx);
             ReadBufferFromString in(value);
             time_t time = 0;
-            readDateTimeText(time, in, assert_cast<const DataTypeDateTime *>(data_type.get())->getTimeZone());
+            const DataTypeDateTime & datetime_type = assert_cast<const DataTypeDateTime &>(*data_type);
+            readDateTimeText(time, in, datetime_type.getTimeZone());
             if (time < 0)
                 time = 0;
-            assert_cast<ColumnUInt32 &>(column).insertValue(static_cast<UInt32>(time));
+            column.insert(static_cast<UInt32>(time));
             break;
         }
         case ValueType::vtDateTime64:
@@ -147,14 +129,14 @@ void ODBCSource::insertValue(
             auto value = row.get<std::string>(idx);
             ReadBufferFromString in(value);
             DateTime64 time = 0;
-            const auto * datetime_type = assert_cast<const DataTypeDateTime64 *>(data_type.get());
-            readDateTime64Text(time, datetime_type->getScale(), in, datetime_type->getTimeZone());
-            assert_cast<DataTypeDateTime64::ColumnType &>(column).insertValue(time);
+            const DataTypeDateTime64 & datetime_type = assert_cast<const DataTypeDateTime64 &>(*data_type);
+            readDateTime64Text(time, datetime_type.getScale(), in, datetime_type.getTimeZone());
+            column.insert(time);
             break;
         }
-        case ValueType::vtDecimal32: [[fallthrough]];
-        case ValueType::vtDecimal64: [[fallthrough]];
-        case ValueType::vtDecimal128: [[fallthrough]];
+        case ValueType::vtDecimal32:
+        case ValueType::vtDecimal64:
+        case ValueType::vtDecimal128:
         case ValueType::vtDecimal256:
         {
             auto value = row.get<std::string>(idx);
diff --git a/programs/odbc-bridge/ODBCBlockInputStream.h b/programs/odbc-bridge/ODBCSource.h
similarity index 97%
rename from programs/odbc-bridge/ODBCBlockInputStream.h
rename to programs/odbc-bridge/ODBCSource.h
index 79d5816ad01..dedd98f930f 100644
--- a/programs/odbc-bridge/ODBCBlockInputStream.h
+++ b/programs/odbc-bridge/ODBCSource.h
@@ -30,7 +30,7 @@ private:
         column.insertFrom(sample_column, 0);
     }
 
-    Poco::Logger * log;
+    LoggerPtr log;
     const UInt64 max_block_size;
     ExternalResultDescription description;
 
diff --git a/programs/odbc-bridge/SchemaAllowedHandler.h b/programs/odbc-bridge/SchemaAllowedHandler.h
index aa0b04b1d31..8dc725dbb33 100644
--- a/programs/odbc-bridge/SchemaAllowedHandler.h
+++ b/programs/odbc-bridge/SchemaAllowedHandler.h
@@ -19,7 +19,7 @@ class SchemaAllowedHandler : public HTTPRequestHandler, WithContext
 public:
     SchemaAllowedHandler(size_t keep_alive_timeout_, ContextPtr context_)
         : WithContext(context_)
-        , log(&Poco::Logger::get("SchemaAllowedHandler"))
+        , log(getLogger("SchemaAllowedHandler"))
         , keep_alive_timeout(keep_alive_timeout_)
     {
     }
@@ -27,7 +27,7 @@ public:
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     size_t keep_alive_timeout;
 };
 
diff --git a/programs/odbc-bridge/createFunctionBaseCast.cpp b/programs/odbc-bridge/createFunctionBaseCast.cpp
new file mode 100644
index 00000000000..dcdd47d79ce
--- /dev/null
+++ b/programs/odbc-bridge/createFunctionBaseCast.cpp
@@ -0,0 +1,23 @@
+#include <memory>
+#include <Functions/CastOverloadResolver.h>
+#include <Core/ColumnsWithTypeAndName.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+class IFunctionBase;
+using FunctionBasePtr = std::shared_ptr<const IFunctionBase>;
+
+FunctionBasePtr createFunctionBaseCast(
+    ContextPtr, const char *, const ColumnsWithTypeAndName &, const DataTypePtr &, std::optional<CastDiagnostic>, CastType)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Type conversions are not implemented for Library Bridge");
+}
+
+}
diff --git a/programs/odbc-bridge/getIdentifierQuote.cpp b/programs/odbc-bridge/getIdentifierQuote.cpp
index 793e398363c..15bd055e615 100644
--- a/programs/odbc-bridge/getIdentifierQuote.cpp
+++ b/programs/odbc-bridge/getIdentifierQuote.cpp
@@ -26,7 +26,7 @@ std::string getIdentifierQuote(nanodbc::ConnectionHolderPtr connection_holder)
     }
     catch (...)
     {
-        LOG_WARNING(&Poco::Logger::get("ODBCGetIdentifierQuote"), "Cannot fetch identifier quote. Default double quote is used. Reason: {}", getCurrentExceptionMessage(false));
+        LOG_WARNING(getLogger("ODBCGetIdentifierQuote"), "Cannot fetch identifier quote. Default double quote is used. Reason: {}", getCurrentExceptionMessage(false));
         return "\"";
     }
 
diff --git a/programs/server/.gitignore b/programs/server/.gitignore
index ddc480e4b29..34a774bde9d 100644
--- a/programs/server/.gitignore
+++ b/programs/server/.gitignore
@@ -2,6 +2,7 @@
 /metadata_dropped
 /data
 /store
+/disks
 /access
 /flags
 /dictionaries_lib
diff --git a/programs/server/Server.cpp b/programs/server/Server.cpp
index a996ed6e34c..a048bebc45b 100644
--- a/programs/server/Server.cpp
+++ b/programs/server/Server.cpp
@@ -24,6 +24,7 @@
 #include <Common/MemoryTracker.h>
 #include <Common/ClickHouseRevision.h>
 #include <Common/DNSResolver.h>
+#include <Common/CgroupsMemoryUsageObserver.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ConcurrencyControl.h>
 #include <Common/Macros.h>
@@ -35,6 +36,7 @@
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/getExecutablePath.h>
 #include <Common/ProfileEvents.h>
+#include <Common/Scheduler/IResourceManager.h>
 #include <Common/ThreadProfileEvents.h>
 #include <Common/ThreadStatus.h>
 #include <Common/getMappedArea.h>
@@ -44,6 +46,8 @@
 #include <Common/assertProcessUserMatchesDataOwner.h>
 #include <Common/makeSocketAddress.h>
 #include <Common/FailPoint.h>
+#include <Common/CPUID.h>
+#include <Common/HTTPConnectionPool.h>
 #include <Server/waitServersToFinish.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
 #include <Core/ServerUUID.h>
@@ -76,8 +80,8 @@
 #include <Databases/registerDatabases.h>
 #include <Dictionaries/registerDictionaries.h>
 #include <Disks/registerDisks.h>
-#include <IO/Resource/registerSchedulerNodes.h>
-#include <IO/Resource/registerResourceManagers.h>
+#include <Common/Scheduler/Nodes/registerSchedulerNodes.h>
+#include <Common/Scheduler/Nodes/registerResourceManagers.h>
 #include <Common/Config/ConfigReloader.h>
 #include <Server/HTTPHandlerFactory.h>
 #include "MetricsTransmitter.h"
@@ -97,6 +101,7 @@
 #include <Server/ProtocolServerAdapter.h>
 #include <Server/KeeperReadinessHandler.h>
 #include <Server/HTTP/HTTPServer.h>
+#include <Server/CloudPlacementInfo.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <Core/ServerSettings.h>
 #include <filesystem>
@@ -181,7 +186,7 @@ static bool jemallocOptionEnabled(const char *name)
     return value;
 }
 #else
-static bool jemallocOptionEnabled(const char *) { return 0; }
+static bool jemallocOptionEnabled(const char *) { return false; }
 #endif
 
 int mainEntryClickHouseServer(int argc, char ** argv)
@@ -365,7 +370,7 @@ void Server::createServer(
 namespace
 {
 
-void setOOMScore(int value, Poco::Logger * log)
+void setOOMScore(int value, LoggerRawPtr log)
 {
     try
     {
@@ -450,7 +455,7 @@ void checkForUsersNotInMainConfig(
     const Poco::Util::AbstractConfiguration & config,
     const std::string & config_path,
     const std::string & users_config_path,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     if (config.getBool("skip_check_for_incorrect_settings", false))
         return;
@@ -557,7 +562,7 @@ static void sanityChecks(Server & server)
     {
         const char * filename = "/proc/sys/kernel/task_delayacct";
         if (readNumber(filename) == 0)
-            server.context()->addWarningMessage("Delay accounting is not enabled, OSIOWaitMicroseconds will not be gathered. Check " + String(filename));
+            server.context()->addWarningMessage("Delay accounting is not enabled, OSIOWaitMicroseconds will not be gathered. You can enable it using `echo 1 > " + String(filename) + "` or by using sysctl.");
     }
     catch (...) // NOLINT(bugprone-empty-catch)
     {
@@ -621,6 +626,8 @@ try
     ServerSettings server_settings;
     server_settings.loadSettingsFromConfig(config());
 
+    ASTAlterCommand::setFormatAlterCommandsWithParentheses(server_settings.format_alter_operations_with_parentheses);
+
     StackTrace::setShowAddresses(server_settings.show_addresses_in_stack_traces);
 
 #if USE_HDFS
@@ -711,7 +718,23 @@ try
         getNumberOfPhysicalCPUCores(),  // on ARM processors it can show only enabled at current moment cores
         std::thread::hardware_concurrency());
 
-    sanityChecks(*this);
+#if defined(__x86_64__)
+    String cpu_info;
+#define COLLECT_FLAG(X) \
+    if (CPU::have##X()) \
+    {                   \
+        if (!cpu_info.empty()) \
+            cpu_info += ", ";  \
+        cpu_info += #X; \
+    }
+
+    CPU_ID_ENUMERATE(COLLECT_FLAG)
+#undef COLLECT_FLAG
+
+    LOG_INFO(log, "Available CPU instruction sets: {}", cpu_info);
+#endif
+
+    bool will_have_trace_collector = hasPHDRCache() && config().has("trace_log");
 
     // Initialize global thread pool. Do it before we fetch configs from zookeeper
     // nodes (`from_zk`), because ZooKeeper interface uses the pool. We will
@@ -719,7 +742,9 @@ try
     GlobalThreadPool::initialize(
         server_settings.max_thread_pool_size,
         server_settings.max_thread_pool_free_size,
-        server_settings.thread_pool_queue_size);
+        server_settings.thread_pool_queue_size,
+        will_have_trace_collector ? server_settings.global_profiler_real_time_period_ns : 0,
+        will_have_trace_collector ? server_settings.global_profiler_cpu_time_period_ns : 0);
     /// Wait for all threads to avoid possible use-after-free (for example logging objects can be already destroyed).
     SCOPE_EXIT({
         Stopwatch watch;
@@ -826,6 +851,13 @@ try
         0, // We don't need any threads one all the parts will be deleted
         server_settings.max_parts_cleaning_thread_pool_size);
 
+    auto max_database_replicated_create_table_thread_pool_size = server_settings.max_database_replicated_create_table_thread_pool_size ?
+        server_settings.max_database_replicated_create_table_thread_pool_size : getNumberOfPhysicalCPUCores();
+    getDatabaseReplicatedCreateTablesThreadPool().initialize(
+        max_database_replicated_create_table_thread_pool_size,
+        0, // We don't need any threads once all the tables will be created
+        max_database_replicated_create_table_thread_pool_size);
+
     /// Initialize global local cache for remote filesystem.
     if (config().has("local_cache_for_remote_fs"))
     {
@@ -875,6 +907,7 @@ try
         config_processor.savePreprocessedConfig(loaded_config, config().getString("path", DBMS_DEFAULT_PATH));
         config().removeConfiguration(old_configuration.get());
         config().add(loaded_config.configuration.duplicate(), PRIO_DEFAULT, false);
+        global_context->setConfig(loaded_config.configuration);
     }
 
     Settings::checkNoSettingNamesAtTopLevel(config(), config_path);
@@ -882,6 +915,9 @@ try
     /// We need to reload server settings because config could be updated via zookeeper.
     server_settings.loadSettingsFromConfig(config());
 
+    /// NOTE: Do sanity checks after we loaded all possible substitutions (for the configuration) from ZK
+    sanityChecks(*this);
+
 #if defined(OS_LINUX)
     std::string executable_path = getExecutablePath();
 
@@ -1200,6 +1236,13 @@ try
     }
     global_context->setMarkCache(mark_cache_policy, mark_cache_size, mark_cache_size_ratio);
 
+    size_t page_cache_size = server_settings.page_cache_size;
+    if (page_cache_size != 0)
+        global_context->setPageCache(
+            server_settings.page_cache_chunk_size, server_settings.page_cache_mmap_size,
+            page_cache_size, server_settings.page_cache_use_madv_free,
+            server_settings.page_cache_use_transparent_huge_pages);
+
     String index_uncompressed_cache_policy = server_settings.index_uncompressed_cache_policy;
     size_t index_uncompressed_cache_size = server_settings.index_uncompressed_cache_size;
     double index_uncompressed_cache_size_ratio = server_settings.index_uncompressed_cache_size_ratio;
@@ -1255,6 +1298,18 @@ try
         SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(config(), "query_masking_rules"));
     }
 
+    std::optional<CgroupsMemoryUsageObserver> cgroups_memory_usage_observer;
+    try
+    {
+        auto wait_time = server_settings.cgroups_memory_usage_observer_wait_time;
+        if (wait_time != 0)
+            cgroups_memory_usage_observer.emplace(std::chrono::seconds(wait_time));
+    }
+    catch (Exception &)
+    {
+        tryLogCurrentException(log, "Disabling cgroup memory observer because of an error during initialization");
+    }
+
     const std::string cert_path = config().getString("openSSL.server.certificateFile", "");
     const std::string key_path = config().getString("openSSL.server.privateKeyFile", "");
 
@@ -1267,7 +1322,7 @@ try
     auto main_config_reloader = std::make_unique<ConfigReloader>(
         config_path,
         extra_paths,
-        config().getString("path", ""),
+        config().getString("path", DBMS_DEFAULT_PATH),
         std::move(main_config_zk_node_cache),
         main_config_zk_changed_event,
         [&](ConfigurationPtr config, bool initial_loading)
@@ -1308,6 +1363,15 @@ try
             total_memory_tracker.setDescription("(total)");
             total_memory_tracker.setMetric(CurrentMetrics::MemoryTracking);
 
+            if (cgroups_memory_usage_observer)
+            {
+                double hard_limit_ratio = new_server_settings.cgroup_memory_watcher_hard_limit_ratio;
+                double soft_limit_ratio = new_server_settings.cgroup_memory_watcher_soft_limit_ratio;
+                cgroups_memory_usage_observer->setMemoryUsageLimits(
+                    static_cast<uint64_t>(max_server_memory_usage * hard_limit_ratio),
+                    static_cast<uint64_t>(max_server_memory_usage * soft_limit_ratio));
+            }
+
             size_t merges_mutations_memory_usage_soft_limit = new_server_settings.merges_mutations_memory_usage_soft_limit;
 
             size_t default_merges_mutations_server_memory_usage = static_cast<size_t>(current_physical_server_memory * new_server_settings.merges_mutations_memory_usage_to_ram_ratio);
@@ -1366,7 +1430,7 @@ try
             global_context->setMaxDatabaseNumToWarn(new_server_settings.max_database_num_to_warn);
             global_context->setMaxPartNumToWarn(new_server_settings.max_part_num_to_warn);
 
-            ConcurrencyControl::SlotCount concurrent_threads_soft_limit = ConcurrencyControl::Unlimited;
+            SlotCount concurrent_threads_soft_limit = UnlimitedSlots;
             if (new_server_settings.concurrent_threads_soft_limit_num > 0 && new_server_settings.concurrent_threads_soft_limit_num < concurrent_threads_soft_limit)
                 concurrent_threads_soft_limit = new_server_settings.concurrent_threads_soft_limit_num;
             if (new_server_settings.concurrent_threads_soft_limit_ratio_to_cores > 0)
@@ -1380,6 +1444,7 @@ try
             global_context->getProcessList().setMaxSize(new_server_settings.max_concurrent_queries);
             global_context->getProcessList().setMaxInsertQueriesAmount(new_server_settings.max_concurrent_insert_queries);
             global_context->getProcessList().setMaxSelectQueriesAmount(new_server_settings.max_concurrent_select_queries);
+            global_context->getProcessList().setMaxWaitingQueriesAmount(new_server_settings.max_waiting_queries);
 
             if (config->has("keeper_server"))
                 global_context->updateKeeperConfiguration(*config);
@@ -1467,6 +1532,8 @@ try
 
                 global_context->reloadAuxiliaryZooKeepersConfigIfChanged(config);
 
+                global_context->reloadQueryMaskingRulesIfChanged(config);
+
                 std::lock_guard lock(servers_lock);
                 updateServers(*config, server_pool, async_metrics, servers, servers_to_start_before_tables);
             }
@@ -1489,6 +1556,23 @@ try
 
             FileCacheFactory::instance().updateSettingsFromConfig(*config);
 
+            HTTPConnectionPools::instance().setLimits(
+                HTTPConnectionPools::Limits{
+                    new_server_settings.disk_connections_soft_limit,
+                    new_server_settings.disk_connections_warn_limit,
+                    new_server_settings.disk_connections_store_limit,
+                },
+                HTTPConnectionPools::Limits{
+                    new_server_settings.storage_connections_soft_limit,
+                    new_server_settings.storage_connections_warn_limit,
+                    new_server_settings.storage_connections_store_limit,
+                },
+                HTTPConnectionPools::Limits{
+                    new_server_settings.http_connections_soft_limit,
+                    new_server_settings.http_connections_warn_limit,
+                    new_server_settings.http_connections_store_limit,
+                });
+
             ProfileEvents::increment(ProfileEvents::MainConfigLoads);
 
             /// Must be the last.
@@ -1642,6 +1726,12 @@ try
         throw;
     }
 
+    if (cgroups_memory_usage_observer)
+    {
+        cgroups_memory_usage_observer->setOnMemoryAmountAvailableChangedFn([&]() { main_config_reloader->reload(); });
+        cgroups_memory_usage_observer->startThread();
+    }
+
     /// Reload config in SYSTEM RELOAD CONFIG query.
     global_context->setConfigReloadCallback([&]()
     {
@@ -1723,6 +1813,8 @@ try
     }
     else
     {
+        DNSResolver::instance().setCacheMaxEntries(server_settings.dns_cache_max_entries);
+
         /// Initialize a watcher periodically updating DNS cache
         dns_cache_updater = std::make_unique<DNSCacheUpdater>(
             global_context, server_settings.dns_cache_update_period, server_settings.dns_max_consecutive_failures);
@@ -1738,6 +1830,17 @@ try
     LOG_INFO(log, "Loading metadata from {}", path_str);
 
     LoadTaskPtrs load_metadata_tasks;
+
+    // Make sure that if exception is thrown during startup async, new async loading jobs are not going to be called.
+    // This is important for the case when exception is thrown from loading of metadata with `async_load_databases = false`
+    // to avoid simultaneously running table startups and destructing databases.
+    SCOPE_EXIT_SAFE(
+        LOG_INFO(log, "Stopping AsyncLoader.");
+
+        // Waits for all currently running jobs to finish and do not run any other pending jobs.
+        global_context->getAsyncLoader().stop();
+    );
+
     try
     {
         auto & database_catalog = DatabaseCatalog::instance();
@@ -1810,7 +1913,6 @@ try
         {
             total_memory_tracker.setSampleMaxAllocationSize(server_settings.total_memory_profiler_sample_max_allocation_size);
         }
-
     }
 #endif
 
@@ -1825,10 +1927,6 @@ try
         " when two different stack unwinding methods will interfere with each other.");
 #endif
 
-#if !defined(__x86_64__)
-    LOG_INFO(log, "Query Profiler and TraceCollector is only tested on x86_64. It also known to not work under qemu-user.");
-#endif
-
     if (!hasPHDRCache())
         LOG_INFO(log, "Query Profiler and TraceCollector are disabled because they require PHDR cache to be created"
             " (otherwise the function 'dl_iterate_phdr' is not lock free and not async-signal safe).");
@@ -1886,6 +1984,7 @@ try
 
         /// Must be done after initialization of `servers`, because async_metrics will access `servers` variable from its thread.
         async_metrics.start();
+        global_context->setAsynchronousMetrics(&async_metrics);
 
         main_config_reloader->start();
         access_control.startPeriodicReloading();
@@ -1939,6 +2038,11 @@ try
                                          load_metadata_tasks);
         }
 
+        if (config().has(DB::PlacementInfo::PLACEMENT_CONFIG_PREFIX))
+        {
+            PlacementInfo::PlacementInfo::instance().initialize(config());
+        }
+
         /// Do not keep tasks in server, they should be kept inside databases. Used here to make dependent tasks only.
         load_metadata_tasks.clear();
         load_metadata_tasks.shrink_to_fit();
@@ -2002,6 +2106,12 @@ try
             else
                 LOG_INFO(log, "Closed all listening sockets.");
 
+            /// Wait for unfinished backups and restores.
+            /// This must be done after closing listening sockets (no more backups/restores) but before ProcessList::killAllQueries
+            /// (because killAllQueries() will cancel all running backups/restores).
+            if (server_settings.shutdown_wait_backups_and_restores)
+                global_context->waitAllBackupsAndRestores();
+
             /// Killing remaining queries.
             if (!server_settings.shutdown_wait_unfinished_queries)
                 global_context->getProcessList().killAllQueries();
@@ -2470,7 +2580,7 @@ void Server::stopServers(
     const ServerType & server_type
 ) const
 {
-    Poco::Logger * log = &logger();
+    LoggerRawPtr log = &logger();
 
     /// Remove servers once all their connections are closed
     auto check_server = [&log](const char prefix[], auto & server)
@@ -2509,7 +2619,7 @@ void Server::updateServers(
     std::vector<ProtocolServerAdapter> & servers,
     std::vector<ProtocolServerAdapter> & servers_to_start_before_tables)
 {
-    Poco::Logger * log = &logger();
+    LoggerRawPtr log = &logger();
 
     const auto listen_hosts = getListenHosts(config);
     const auto interserver_listen_hosts = getInterserverListenHosts(config);
diff --git a/programs/server/binary.html b/programs/server/binary.html
index 988dd33a72a..eec39cd4463 100644
--- a/programs/server/binary.html
+++ b/programs/server/binary.html
@@ -60,10 +60,29 @@
         /// If it is hosted on server, assume that it is the address of ClickHouse.
         if (location.protocol != 'file:') {
             host = location.origin;
-            user = 'default';
             add_http_cors_header = false;
         }
 
+        if (window.location.search) {
+            const params = new URLSearchParams(window.location.search);
+            if (params.has('host')) { host = params.get('host'); }
+            if (params.has('user')) { user = params.get('user'); }
+            if (params.has('password')) { password = params.get('password'); }
+        }
+
+        let url = `${host}?allow_introspection_functions=1`;
+
+        if (add_http_cors_header) {
+            url += '&add_http_cors_header=1';
+        }
+
+        if (user) {
+            url += `&user=${encodeURIComponent(user)}`;
+        }
+        if (password) {
+            url += `&password=${encodeURIComponent(password)}`;
+        }
+
         let map = L.map('space', {
             crs: L.CRS.Simple,
             center: [-512, 512],
@@ -97,24 +116,11 @@
             const key = `${coords.z}-${coords.x}-${coords.y}`;
             let buf = cached_tiles[key];
             if (!buf) {
-                let url = `${host}?default_format=RowBinary&allow_introspection_functions=1`;
+                let request_url = `${url}&default_format=RowBinary` +
+                    `&param_z=${coords.z}&param_x=${coords.x}&param_y=${coords.y}` +
+                    `&enable_http_compression=1&network_compression_method=zstd&network_zstd_compression_level=6`;
 
-                if (add_http_cors_header) {
-                    // For debug purposes, you may set add_http_cors_header from a browser console
-                    url += '&add_http_cors_header=1';
-                }
-
-                if (user) {
-                    url += `&user=${encodeURIComponent(user)}`;
-                }
-                if (password) {
-                    url += `&password=${encodeURIComponent(password)}`;
-                }
-
-                url += `&param_z=${coords.z}&param_x=${coords.x}&param_y=${coords.y}`;
-                url += `&enable_http_compression=1&network_compression_method=zstd&network_zstd_compression_level=6`;
-
-                const response = await fetch(url, { method: 'POST', body: sql });
+                const response = await fetch(request_url, { method: 'POST', body: sql });
 
                 if (!response.ok) {
                     const text = await response.text();
@@ -232,7 +238,7 @@
 
             const addr_hex = '0x' + addr_int.toString(16);
             const response = fetch(
-                `http://localhost:8123/?default_format=JSON`,
+                `${url}&default_format=JSON`,
                 {
                     method: 'POST',
                     body: `SELECT encodeXMLComponent(demangle(addressToSymbol(${addr_int}::UInt64))) AS name,
diff --git a/programs/server/config.d/filesystem_cache_log.xml b/programs/server/config.d/filesystem_cache_log.xml
new file mode 120000
index 00000000000..aa89e44c64f
--- /dev/null
+++ b/programs/server/config.d/filesystem_cache_log.xml
@@ -0,0 +1 @@
+../../../tests/config/config.d/filesystem_cache_log.xml
\ No newline at end of file
diff --git a/programs/server/config.d/filesystem_caches_path.xml b/programs/server/config.d/filesystem_caches_path.xml
new file mode 100644
index 00000000000..87555d1f81c
--- /dev/null
+++ b/programs/server/config.d/filesystem_caches_path.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+    <filesystem_caches_path>/tmp/filesystem_caches/</filesystem_caches_path>
+    <custom_cached_disks_base_directory replace="replace">/tmp/filesystem_caches/</custom_cached_disks_base_directory>
+</clickhouse>
diff --git a/programs/server/config.d/handlers.yaml b/programs/server/config.d/handlers.yaml
new file mode 120000
index 00000000000..86dfc38179b
--- /dev/null
+++ b/programs/server/config.d/handlers.yaml
@@ -0,0 +1 @@
+../../../tests/config/config.d/handlers.yaml
\ No newline at end of file
diff --git a/programs/server/config.xml b/programs/server/config.xml
index e1428b17084..e92381eeb1e 100644
--- a/programs/server/config.xml
+++ b/programs/server/config.xml
@@ -96,7 +96,7 @@
             <to>https://{bucket}.s3.amazonaws.com</to>
         </s3>
         <gs>
-            <to>https://{bucket}.storage.googleapis.com</to>
+            <to>https://storage.googleapis.com/{bucket}</to>
         </gs>
         <oss>
             <to>https://{bucket}.oss.aliyuncs.com</to>
@@ -135,7 +135,7 @@
     <http_port>8123</http_port>
 
     <!-- Port for interaction by native protocol with:
-         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
+         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark);
          - clickhouse-server with other clickhouse-servers for distributed query processing;
          - ClickHouse drivers and applications supporting native protocol
          (this protocol is also informally called as "the TCP protocol");
@@ -440,6 +440,9 @@
     <!-- Cache size in elements for compiled expressions.-->
     <compiled_expression_cache_elements_size>10000</compiled_expression_cache_elements_size>
 
+    <!-- Cache path for custom (created from SQL) cached disks -->
+    <custom_cached_disks_base_directory>/var/lib/clickhouse/caches/</custom_cached_disks_base_directory>
+
     <validate_tcp_client_information>false</validate_tcp_client_information>
 
     <!-- Path to data directory, with trailing slash. -->
@@ -749,7 +752,7 @@
     <!-- 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.
+         The "SQL_" prefix is introduced for compatibility with MySQL - these settings are being set by Tableau.
     -->
     <custom_settings_prefixes>SQL_</custom_settings_prefixes>
 
@@ -934,6 +937,11 @@
     </macros>
     -->
 
+    <!--
+    <default_replica_path>/clickhouse/tables/{database}/{table}</default_replica_path>
+    <default_replica_name>{replica}</default_replica_name>
+    -->
+
     <!-- Replica group name for database Replicated.
           The cluster created by Replicated database will consist of replicas in the same group.
           DDL queries will only wail for the replicas in the same group.
@@ -1384,13 +1392,27 @@
         <!-- <host_name>replica</host_name> -->
     </distributed_ddl>
 
-    <!-- Settings to fine tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!-- Settings to fine-tune MergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
     <!--
     <merge_tree>
         <max_suspicious_broken_parts>5</max_suspicious_broken_parts>
     </merge_tree>
     -->
 
+    <!-- Settings to fine-tune ReplicatedMergeTree tables. See documentation in source code, in MergeTreeSettings.h -->
+    <!--
+    <replicated_merge_tree>
+        <max_replicated_fetches_network_bandwidth>1000000000</max_replicated_fetches_network_bandwidth>
+    </replicated_merge_tree>
+    -->
+
+    <!-- Settings to fine-tune Distributed tables. See documentation in source code, in DistributedSettings.h -->
+    <!--
+    <distributed>
+        <flush_on_detach>false</flush_on_detach>
+    </distributed>
+    -->
+
     <!-- Protection from accidental DROP.
          If size of a MergeTree table is greater than max_table_size_to_drop (in bytes) than table could not be dropped with any DROP query.
          If you want do delete one table and don't want to change clickhouse-server config, you could create special file <clickhouse-path>/flags/force_drop_table and make DROP once.
@@ -1455,17 +1477,23 @@
     </query_masking_rules> -->
 
     <!-- Uncomment to use custom http handlers.
+
         rules are checked from top to bottom, first match runs the handler
             url - to match request URL, you can use 'regex:' prefix to use regex match(optional)
+            empty_query_string - check that there is no query string in the URL
             methods - to match request method, you can use commas to separate multiple method matches(optional)
             headers - to match request headers, match each child element(child element name is header name), you can use 'regex:' prefix to use regex match(optional)
+
         handler is request handler
-            type - supported types: static, dynamic_query_handler, predefined_query_handler
+            type - supported types: static, dynamic_query_handler, predefined_query_handler, redirect
             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 params
             status - use with static type, response status code
             content_type - use with static type, response 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 send to client.
+            url - a location for redirect
+
+        Along with a list of rules, you can specify <defaults/> which means - enable all the default handlers.
 
     <http_handlers>
         <rule>
@@ -1559,6 +1587,15 @@
         <max_entry_size_in_rows>30000000</max_entry_size_in_rows>
     </query_cache>
 
+    <backups>
+        <allowed_path>backups</allowed_path>
+
+        <!-- If the BACKUP command fails and this setting is true then the files
+             copied before the failure will be removed automatically.
+        -->
+        <remove_backup_files_after_failure>true</remove_backup_files_after_failure>
+    </backups>
+
     <!-- This allows to disable exposing addresses in stack traces for security reasons.
          Please be aware that it does not improve security much, but makes debugging much harder.
          The addresses that are small offsets from zero will be displayed nevertheless to show nullptr dereferences.
diff --git a/programs/server/config.yaml.example b/programs/server/config.yaml.example
index b472b6f4a45..9fc188e97aa 100644
--- a/programs/server/config.yaml.example
+++ b/programs/server/config.yaml.example
@@ -55,7 +55,7 @@ logger:
 http_port: 8123
 
 # Port for interaction by native protocol with:
-# - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
+# - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark);
 # - clickhouse-server with other clickhouse-servers for distributed query processing;
 # - ClickHouse drivers and applications supporting native protocol
 # (this protocol is also informally called as "the TCP protocol");
diff --git a/programs/server/dashboard.html b/programs/server/dashboard.html
index 04fdfb2d3ca..901211e8ad9 100644
--- a/programs/server/dashboard.html
+++ b/programs/server/dashboard.html
@@ -5,10 +5,12 @@
     <title>ClickHouse Dashboard</title>
     <link rel="icon" href="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSI1NCIgaGVpZ2h0PSI0OCIgdmlld0JveD0iMCAwIDkgOCI+PHN0eWxlPi5ve2ZpbGw6I2ZjMH0ucntmaWxsOnJlZH08L3N0eWxlPjxwYXRoIGQ9Ik0wLDcgaDEgdjEgaC0xIHoiIGNsYXNzPSJyIi8+PHBhdGggZD0iTTAsMCBoMSB2NyBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNMiwwIGgxIHY4IGgtMSB6IiBjbGFzcz0ibyIvPjxwYXRoIGQ9Ik00LDAgaDEgdjggaC0xIHoiIGNsYXNzPSJvIi8+PHBhdGggZD0iTTYsMCBoMSB2OCBoLTEgeiIgY2xhc3M9Im8iLz48cGF0aCBkPSJNOCwzLjI1IGgxIHYxLjUgaC0xIHoiIGNsYXNzPSJvIi8+PC9zdmc+">
     <script src="https://cdn.jsdelivr.net/npm/uplot@1.6.21/dist/uPlot.iife.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/lz-string@1.5.0/libs/lz-string.min.js"></script>
     <style>
         :root {
             --color: black;
-            --background: linear-gradient(to bottom, #00CCFF, #00D0D0);
+            --background-color-1: #00CCFF;
+            --background: linear-gradient(to bottom, var(--background-color-1), #00D0D0);
             --chart-background: white;
             --shadow-color: rgba(0, 0, 0, 0.25);
             --moving-shadow-color: rgba(0, 0, 0, 0.5);
@@ -32,7 +34,8 @@
 
         [data-theme="dark"] {
             --color: white;
-            --background: #151C2C;
+            --background-color-1: #151C2C;
+            --background: var(--background-color-1);
             --chart-background: #1b2834;
             --shadow-color: rgba(0, 0, 0, 0);
             --moving-shadow-color: rgba(255, 255, 255, 0.25);
@@ -84,11 +87,10 @@
             gap: 1rem;
         }
         .chart {
-            flex: 1 40%;
-            min-width: 20rem;
+            flex: 1 1 40rem;
             min-height: 16rem;
             background: var(--chart-background);
-            box-shadow: 0 0 1rem var(--shadow-color);
+            box-shadow: 1px 1px 0 var(--shadow-color);
             overflow: hidden;
             position: relative;
         }
@@ -119,6 +121,18 @@
             display: flex;
             flex-flow: column nowrap;
             justify-content: center;
+
+            position: sticky;
+            top: -1rem;
+            margin-top: -1rem;
+            margin-left: -1rem;
+            margin-right: -1rem;
+            border-top: 1rem solid var(--background-color-1);
+            border-left: 1rem solid var(--background-color-1);
+            border-right: 1rem solid var(--background-color-1);
+            box-sizing: content-box;
+            z-index: 1000;
+            background: var(--background-color-1);
         }
 
         .inputs.unconnected {
@@ -194,7 +208,7 @@
         }
 
         .inputs input {
-            box-shadow: 0 0 1rem var(--shadow-color);
+            box-shadow: 1px 1px 0 var(--shadow-color);
             padding: 0.25rem;
         }
 
@@ -254,8 +268,6 @@
             font-weight: bold;
             user-select: none;
             cursor: pointer;
-            padding-left: 0.5rem;
-            padding-right: 0.5rem;
             background: var(--new-chart-background-color);
             color: var(--new-chart-text-color);
             float: right;
@@ -274,7 +286,6 @@
             width: 36%;
         }
 
-
         #global-error {
             align-self: center;
             width: 60%;
@@ -297,7 +308,7 @@
             background: var(--param-background-color);
             color: var(--param-text-color);
             display: inline-block;
-            box-shadow: 0 0 1rem var(--shadow-color);
+            box-shadow: 1px 1px 0 var(--shadow-color);
             margin-bottom: 1rem;
         }
 
@@ -484,24 +495,16 @@
   *
   * TODO:
   * - zoom on the graphs should work on touch devices;
-  * - compress the state for URL's #hash;
   * - footer with "about" or a link to source code;
   * - allow to configure a table on a server to save the dashboards;
   * - if a query returned one value, display this value instead of a diagram;
   * - if a query returned something unusual, display the table;
   */
 
-let host = 'https://play.clickhouse.com/';
-let user = 'explorer';
+let host = location.protocol != 'file:' ? location.origin : 'http://localhost:8123/';
+let user = 'default';
 let password = '';
-let add_http_cors_header = true;
-
-/// If it is hosted on server, assume that it is the address of ClickHouse.
-if (location.protocol != 'file:') {
-    host = location.origin;
-    user = 'default';
-    add_http_cors_header = false;
-}
+let add_http_cors_header = (location.protocol != 'file:');
 
 const errorCodeMessageMap = {
     516: 'Error authenticating with database. Please check your connection params and try again.'
@@ -521,61 +524,27 @@ const errorMessages = [
 
 
 /// Query to fill `queries` list for the dashboard
-let search_query = `SELECT title, query FROM system.dashboards WHERE dashboard = 'overview'`;
+let search_query = `SELECT title, query FROM system.dashboards WHERE dashboard = 'Overview'`;
 let customized = false;
 let queries = [];
 
 /// Query parameters with predefined default values.
 /// All other parameters will be automatically found in the queries.
-let params = {
+let default_params = {
     'rounding': '60',
     'seconds': '86400'
 };
+let params = default_params;
 
 /// Palette generation for charts
-function generatePalette(baseColor, numColors) {
-    const baseHSL = hexToHsl(baseColor);
-    const hueStep = 360 / numColors;
-    const palette = [];
+function generatePalette(numColors) {
+    palette = [];
     for (let i = 0; i < numColors; i++) {
-        const hue = Math.round((baseHSL.h + i * hueStep) % 360);
-        const color = `hsl(${hue}, ${baseHSL.s}%, ${baseHSL.l}%)`;
-        palette.push(color);
+        palette.push(`oklch(${theme != 'dark' ? 0.75 : 0.5}, 0.15, ${360 * i / numColors})`);
     }
     return palette;
 }
 
-/// Helper function to convert hex color to HSL
-function hexToHsl(hex) {
-    hex = hex.replace(/^#/, '');
-    const bigint = parseInt(hex, 16);
-    const r = (bigint >> 16) & 255;
-    const g = (bigint >> 8) & 255;
-    const b = bigint & 255;
-    const r_norm = r / 255;
-    const g_norm = g / 255;
-    const b_norm = b / 255;
-    const max = Math.max(r_norm, g_norm, b_norm);
-    const min = Math.min(r_norm, g_norm, b_norm);
-    const l = (max + min) / 2;
-    let s = 0;
-    if (max !== min) {
-        s = l > 0.5 ? (max - min) / (2 - max - min) : (max - min) / (max + min);
-    }
-    let h = 0;
-    if (max !== min) {
-        if (max === r_norm) {
-            h = (g_norm - b_norm) / (max - min) + (g_norm < b_norm ? 6 : 0);
-        } else if (max === g_norm) {
-            h = (b_norm - r_norm) / (max - min) + 2;
-        } else {
-            h = (r_norm - g_norm) / (max - min) + 4;
-        }
-    }
-    h = Math.round(h * 60);
-    return { h, s: Math.round(s * 100), l: Math.round(l * 100) };
-}
-
 let theme = 'light';
 
 function setTheme(new_theme) {
@@ -594,13 +563,19 @@ let plots = [];
 let charts = document.getElementById('charts');
 
 /// This is not quite correct (we cannot really parse SQL with regexp) but tolerable.
-const query_param_regexp = /\{(\w+):[^}]+\}/g;
+const query_param_regexp = /\{(\w+):([^}]+)\}/g;
 
 /// Automatically parse more parameters from the queries.
 function findParamsInQuery(query, new_params) {
+    const typeDefault = (type) => type.includes('Int') ? '0'
+        : (type.includes('Float') ? '0.0'
+        : (type.includes('Bool') ? 'false'
+        : (type.includes('Date') ? new Date().toISOString().slice(0, 10)
+        : (type.includes('UUID') ? '00000000-0000-0000-0000-000000000000'
+        : ''))));
     for (let match of query.matchAll(query_param_regexp)) {
         const name = match[1];
-        new_params[name] = params[name] || '';
+        new_params[name] = params[name] || default_params[name] || typeDefault(match[2]);
     }
 }
 
@@ -1211,7 +1186,7 @@ async function draw(idx, chart, url_params, query) {
     // Treat every column as series
     const series_count = reply.meta.length;
     const fill = series_count == 2 ? fill_color : undefined;
-    const palette = generatePalette(line_color, series_count);
+    const palette = series_count == 2 ? [line_color] : generatePalette(series_count);
     let max_value = Number.NEGATIVE_INFINITY;
     for (let i = 1; i < series_count; i++) {
         let label = reply.meta[i].name;
@@ -1266,8 +1241,11 @@ function hideError() {
 }
 
 let firstLoad = true;
-
+let is_drawing = false; // Prevent race condition leading to duplicate/dangling charts.
 async function drawAll() {
+    if (is_drawing) return;
+    is_drawing = true;
+
     let params = getParamsForURL();
     const chartsArray = document.getElementsByClassName('chart');
 
@@ -1294,12 +1272,12 @@ async function drawAll() {
             document.getElementById('edit').style.display = 'inline-block';
             document.getElementById('search-span').style.display = '';
             hideError();
-        }
-        else {
-            const charts = document.getElementById('charts')
-            charts.style.height = '0px';
+        } else {
+            document.getElementById('charts').style.height = '0px';
         }
     });
+
+    is_drawing = false;
 }
 
 function resize() {
@@ -1380,11 +1358,13 @@ document.getElementById('params').onsubmit = function(event) {
     event.preventDefault();
 }
 
+const decodeState = (x) => JSON.parse(LZString.decompressFromEncodedURIComponent(x) || atob(x));
+const encodeState = (x) => LZString.compressToEncodedURIComponent(JSON.stringify(x));
 
 function saveState() {
     const state = { host, user, queries, params, search_query, customized };
     history.pushState(state, '',
-        window.location.pathname + (window.location.search || '') + '#' + btoa(JSON.stringify(state)));
+        window.location.pathname + (window.location.search || '') + '#' + encodeState(state));
 }
 
 async function searchQueries() {
@@ -1450,7 +1430,8 @@ window.onpopstate = function(event) {
 if (window.location.hash) {
     try {
         let search_query_, customized_;
-        ({host, user, queries, params, search_query_, customized_} = JSON.parse(atob(window.location.hash.substring(1))));
+        ({host, user, queries, params, search_query_, customized_} = decodeState(window.location.hash.substring(1)));
+
         // For compatibility with old URLs' hashes
         search_query = search_query_ !== undefined ? search_query_ : search_query;
         customized = customized_ !== undefined ? customized_ : true;
diff --git a/programs/server/js/lz-string.js b/programs/server/js/lz-string.js
new file mode 100644
index 00000000000..534b61ff6b6
--- /dev/null
+++ b/programs/server/js/lz-string.js
@@ -0,0 +1 @@
+var LZString=function(){var r=String.fromCharCode,o="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",n="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+-$",e={};function t(r,o){if(!e[r]){e[r]={};for(var n=0;n<r.length;n++)e[r][r.charAt(n)]=n}return e[r][o]}var i={compressToBase64:function(r){if(null==r)return"";var n=i._compress(r,6,function(r){return o.charAt(r)});switch(n.length%4){default:case 0:return n;case 1:return n+"===";case 2:return n+"==";case 3:return n+"="}},decompressFromBase64:function(r){return null==r?"":""==r?null:i._decompress(r.length,32,function(n){return t(o,r.charAt(n))})},compressToUTF16:function(o){return null==o?"":i._compress(o,15,function(o){return r(o+32)})+" "},decompressFromUTF16:function(r){return null==r?"":""==r?null:i._decompress(r.length,16384,function(o){return r.charCodeAt(o)-32})},compressToUint8Array:function(r){for(var o=i.compress(r),n=new Uint8Array(2*o.length),e=0,t=o.length;e<t;e++){var s=o.charCodeAt(e);n[2*e]=s>>>8,n[2*e+1]=s%256}return n},decompressFromUint8Array:function(o){if(null==o)return i.decompress(o);for(var n=new Array(o.length/2),e=0,t=n.length;e<t;e++)n[e]=256*o[2*e]+o[2*e+1];var s=[];return n.forEach(function(o){s.push(r(o))}),i.decompress(s.join(""))},compressToEncodedURIComponent:function(r){return null==r?"":i._compress(r,6,function(r){return n.charAt(r)})},decompressFromEncodedURIComponent:function(r){return null==r?"":""==r?null:(r=r.replace(/ /g,"+"),i._decompress(r.length,32,function(o){return t(n,r.charAt(o))}))},compress:function(o){return i._compress(o,16,function(o){return r(o)})},_compress:function(r,o,n){if(null==r)return"";var e,t,i,s={},u={},a="",p="",c="",l=2,f=3,h=2,d=[],m=0,v=0;for(i=0;i<r.length;i+=1)if(a=r.charAt(i),Object.prototype.hasOwnProperty.call(s,a)||(s[a]=f++,u[a]=!0),p=c+a,Object.prototype.hasOwnProperty.call(s,p))c=p;else{if(Object.prototype.hasOwnProperty.call(u,c)){if(c.charCodeAt(0)<256){for(e=0;e<h;e++)m<<=1,v==o-1?(v=0,d.push(n(m)),m=0):v++;for(t=c.charCodeAt(0),e=0;e<8;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;e<h;e++)m=m<<1|t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=c.charCodeAt(0),e=0;e<16;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}0==--l&&(l=Math.pow(2,h),h++),delete u[c]}else for(t=s[c],e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;0==--l&&(l=Math.pow(2,h),h++),s[p]=f++,c=String(a)}if(""!==c){if(Object.prototype.hasOwnProperty.call(u,c)){if(c.charCodeAt(0)<256){for(e=0;e<h;e++)m<<=1,v==o-1?(v=0,d.push(n(m)),m=0):v++;for(t=c.charCodeAt(0),e=0;e<8;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}else{for(t=1,e=0;e<h;e++)m=m<<1|t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t=0;for(t=c.charCodeAt(0),e=0;e<16;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1}0==--l&&(l=Math.pow(2,h),h++),delete u[c]}else for(t=s[c],e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;0==--l&&(l=Math.pow(2,h),h++)}for(t=2,e=0;e<h;e++)m=m<<1|1&t,v==o-1?(v=0,d.push(n(m)),m=0):v++,t>>=1;for(;;){if(m<<=1,v==o-1){d.push(n(m));break}v++}return d.join("")},decompress:function(r){return null==r?"":""==r?null:i._decompress(r.length,32768,function(o){return r.charCodeAt(o)})},_decompress:function(o,n,e){var t,i,s,u,a,p,c,l=[],f=4,h=4,d=3,m="",v=[],g={val:e(0),position:n,index:1};for(t=0;t<3;t+=1)l[t]=t;for(s=0,a=Math.pow(2,2),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;switch(s){case 0:for(s=0,a=Math.pow(2,8),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;c=r(s);break;case 1:for(s=0,a=Math.pow(2,16),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;c=r(s);break;case 2:return""}for(l[3]=c,i=c,v.push(c);;){if(g.index>o)return"";for(s=0,a=Math.pow(2,d),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;switch(c=s){case 0:for(s=0,a=Math.pow(2,8),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;l[h++]=r(s),c=h-1,f--;break;case 1:for(s=0,a=Math.pow(2,16),p=1;p!=a;)u=g.val&g.position,g.position>>=1,0==g.position&&(g.position=n,g.val=e(g.index++)),s|=(u>0?1:0)*p,p<<=1;l[h++]=r(s),c=h-1,f--;break;case 2:return v.join("")}if(0==f&&(f=Math.pow(2,d),d++),l[c])m=l[c];else{if(c!==h)return null;m=i+i.charAt(0)}v.push(m),l[h++]=i+m.charAt(0),i=m,0==--f&&(f=Math.pow(2,d),d++)}}};return i}();"function"==typeof define&&define.amd?define(function(){return LZString}):"undefined"!=typeof module&&null!=module?module.exports=LZString:"undefined"!=typeof angular&&null!=angular&&angular.module("LZString",[]).factory("LZString",function(){return LZString});
diff --git a/programs/server/play.html b/programs/server/play.html
index e6662693bd7..507a96382a7 100644
--- a/programs/server/play.html
+++ b/programs/server/play.html
@@ -993,7 +993,16 @@
     function renderError(response)
     {
         clear();
-        document.getElementById('error').innerText = response ? response : "No response.";
+
+        let message = response;
+        try {
+            let json = JSON.parse(response);
+            if (json.exception) {
+                message = json.exception;
+            }
+        } catch (e) {}
+
+        document.getElementById('error').innerText = message ? message : "No response.";
         document.getElementById('error').style.display = 'block';
         document.getElementById('logo-container').style.display = 'none';
     }
diff --git a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
index d54a2d2da6e..dfe68c819fc 100644
--- a/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
+++ b/programs/static-files-disk-uploader/static-files-disk-uploader.cpp
@@ -65,7 +65,7 @@ void processFile(const fs::path & file_path, const fs::path & dst_path, bool tes
 
         /// test mode for integration tests.
         if (test_mode)
-            dst_buf = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_file_path), Poco::Net::HTTPRequest::HTTP_PUT);
+            dst_buf = std::make_shared<WriteBufferFromHTTP>(HTTPConnectionGroupType::HTTP, Poco::URI(dst_file_path), Poco::Net::HTTPRequest::HTTP_PUT);
         else
             dst_buf = std::make_shared<WriteBufferFromFile>(dst_file_path);
 
@@ -88,7 +88,7 @@ void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_
     {
         dst_path /= "store";
         auto files_root = dst_path / prefix;
-        root_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(files_root / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+        root_meta = std::make_shared<WriteBufferFromHTTP>(HTTPConnectionGroupType::HTTP, Poco::URI(files_root / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
     }
     else
     {
@@ -112,7 +112,7 @@ void processTableFiles(const fs::path & data_path, fs::path dst_path, bool test_
             if (test_mode)
             {
                 auto files_root = dst_path / prefix;
-                directory_meta = std::make_shared<WriteBufferFromHTTP>(Poco::URI(dst_path / directory_prefix / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
+                directory_meta = std::make_shared<WriteBufferFromHTTP>(HTTPConnectionGroupType::HTTP, Poco::URI(dst_path / directory_prefix / ".index"), Poco::Net::HTTPRequest::HTTP_PUT);
             }
             else
             {
diff --git a/programs/su/su.cpp b/programs/su/su.cpp
index a8f61fb32b6..33d929898f4 100644
--- a/programs/su/su.cpp
+++ b/programs/su/su.cpp
@@ -107,6 +107,7 @@ try
 
     if (argc < 3)
     {
+        std::cout << "A tool similar to 'su'" << std::endl;
         std::cout << "Usage: ./clickhouse su user:group ..." << std::endl;
         exit(0); // NOLINT(concurrency-mt-unsafe)
     }
diff --git a/.pylintrc b/pyproject.toml
similarity index 68%
rename from .pylintrc
rename to pyproject.toml
index b672cbfdfad..3d05abd9ec2 100644
--- a/.pylintrc
+++ b/pyproject.toml
@@ -1,6 +1,4 @@
-# vim: ft=config
-
-[BASIC]
+[tool.pylint.BASIC]
 max-module-lines=2000
 # due to SQL
 max-line-length=200
@@ -9,11 +7,13 @@ max-branches=50
 max-nested-blocks=10
 max-statements=200
 
-[FORMAT]
-ignore-long-lines = (# )?<?https?://\S+>?$
+[tool.pylint.FORMAT]
+#ignore-long-lines = (# )?<?https?://\S+>?$
 
-[MESSAGES CONTROL]
-disable = missing-docstring,
+[tool.pylint.'MESSAGES CONTROL']
+          # pytest.mark.parametrize is not callable (not-callable)
+disable = '''
+          missing-docstring,
           too-few-public-methods,
           invalid-name,
           too-many-arguments,
@@ -26,18 +26,15 @@ disable = missing-docstring,
           wildcard-import,
           unused-wildcard-import,
           singleton-comparison,
-          # pytest.mark.parametrize is not callable (not-callable)
           not-callable,
-          # https://github.com/PyCQA/pylint/issues/3882
-          # [Python 3.9] Value 'Optional' is unsubscriptable (unsubscriptable-object) (also Union)
-          unsubscriptable-object,
-          # Drop them one day:
           redefined-outer-name,
           broad-except,
           bare-except,
           no-else-return,
           global-statement
+          '''
 
-[SIMILARITIES]
+[tool.pylint.SIMILARITIES]
 # due to SQL
 min-similarity-lines=1000
+
diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt
index 66694ee16f8..cebfd36a24a 100644
--- a/rust/CMakeLists.txt
+++ b/rust/CMakeLists.txt
@@ -14,6 +14,11 @@ macro(configure_rustc)
         set(RUST_CFLAGS "${RUST_CFLAGS} --sysroot ${CMAKE_SYSROOT}")
     endif()
 
+    if (CMAKE_OSX_DEPLOYMENT_TARGET)
+        set(RUST_CXXFLAGS "${RUST_CXXFLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+        set(RUST_CFLAGS "${RUST_CFLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    endif()
+
     if (USE_MUSL)
         set(RUST_CXXFLAGS "${RUST_CXXFLAGS} -D_LIBCPP_HAS_MUSL_LIBC=1")
     endif ()
@@ -25,14 +30,23 @@ macro(configure_rustc)
         set(RUSTCWRAPPER "")
     endif()
 
-    set(RUSTFLAGS "[]")
+    set(RUSTFLAGS)
+    if (CMAKE_OSX_DEPLOYMENT_TARGET)
+        list(APPEND RUSTFLAGS "-C" "link-arg=-mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    endif()
+
     set(RUST_CARGO_BUILD_STD "")
     # For more info: https://doc.rust-lang.org/beta/unstable-book/compiler-flags/sanitizer.html#memorysanitizer
     if (SANITIZE STREQUAL "memory")
         set(RUST_CARGO_BUILD_STD "build-std = [\"std\", \"panic_abort\", \"core\", \"alloc\"]")
-        set(RUSTFLAGS "[\"-Zsanitizer=memory\", \"-Zsanitizer-memory-track-origins\"]")
+        list(APPEND RUSTFLAGS "-Zsanitizer=memory" "-Zsanitizer-memory-track-origins")
     endif()
 
+    list(TRANSFORM RUSTFLAGS PREPEND "\"")
+    list(TRANSFORM RUSTFLAGS APPEND "\"")
+    list(JOIN RUSTFLAGS "," RUSTFLAGS)
+    set(RUSTFLAGS "[${RUSTFLAGS}]")
+
     message(STATUS "RUST_CFLAGS: ${RUST_CFLAGS}")
     message(STATUS "RUST_CXXFLAGS: ${RUST_CXXFLAGS}")
     message(STATUS "RUSTFLAGS: ${RUSTFLAGS}")
@@ -85,6 +99,19 @@ function(add_rust_subdirectory src)
     message(STATUS "Copy ${src} to ${dst}")
     file(COPY "${src}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}"
         PATTERN target EXCLUDE)
+
+    # Check is Rust available or not.
+    #
+    # `cargo update --dry-run` will not update anything, but will check the internet connectivity.
+    execute_process(COMMAND ${Rust_CARGO_CACHED} update --dry-run
+        WORKING_DIRECTORY "${dst}"
+        RESULT_VARIABLE CARGO_UPDATE_RESULT
+        OUTPUT_VARIABLE CARGO_UPDATE_STDOUT
+        ERROR_VARIABLE CARGO_UPDATE_STDERR)
+    if (CARGO_UPDATE_RESULT)
+        message(FATAL_ERROR "Rust (${Rust_CARGO_CACHED}) support is not available (likely there is no internet connectivity):\n${CARGO_UPDATE_STDERR}\nYou can disable Rust support with -DENABLE_RUST=OFF")
+    endif()
+
     add_subdirectory("${dst}" "${dst}")
 
     # cmake -E copy* do now know how to exclude files
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 86bbec5579f..a242a8243b5 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -6,7 +6,8 @@ version = 3
 name = "_ch_rust_prql"
 version = "0.1.0"
 dependencies = [
- "prql-compiler",
+ "anstream",
+ "prqlc",
  "serde_json",
 ]
 
@@ -79,16 +80,15 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.3.2"
+version = "0.6.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
+checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
- "is-terminal",
  "utf8parse",
 ]
 
@@ -113,33 +113,33 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "1.0.2"
+version = "3.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c677ab05e09154296dd37acecd46420c17b9713e8366facafa8fc0885167cf4c"
+checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
 dependencies = [
  "anstyle",
- "windows-sys 0.48.0",
+ "windows-sys",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
 dependencies = [
  "backtrace",
 ]
 
 [[package]]
 name = "ariadne"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72fe02fc62033df9ba41cba57ee19acf5e742511a140c7dbc3a873e19a19a1bd"
+checksum = "dd002a6223f12c7a95cdd4b1cb3a0149d22d37f7a9ecdb2cb691a071fe236c29"
 dependencies = [
  "unicode-width",
  "yansi",
@@ -213,16 +213,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "chrono"
-version = "0.4.31"
+version = "0.4.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
+checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b"
 dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "js-sys",
  "num-traits",
  "wasm-bindgen",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.0",
 ]
 
 [[package]]
@@ -368,7 +368,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -385,7 +385,7 @@ checksum = "5c6888cd161769d65134846d4d4981d5a6654307cc46ec83fb917e530aea5f84"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -509,18 +509,14 @@ dependencies = [
  "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
-name = "errno"
-version = "0.3.8"
+name = "equivalent"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
-dependencies = [
- "libc",
- "windows-sys 0.52.0",
-]
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "fnv"
@@ -570,12 +566,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
-[[package]]
-name = "hermit-abi"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-
 [[package]]
 name = "iana-time-zone"
 version = "0.1.58"
@@ -606,23 +596,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
 [[package]]
-name = "is-terminal"
-version = "0.4.9"
+name = "indexmap"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
 dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys 0.48.0",
-]
-
-[[package]]
-name = "itertools"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
-dependencies = [
- "either",
+ "equivalent",
+ "hashbrown",
 ]
 
 [[package]]
@@ -681,12 +661,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
-
 [[package]]
 name = "log"
 version = "0.4.20"
@@ -725,9 +699,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -778,9 +752,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.1"
+version = "0.32.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
 dependencies = [
  "memchr",
 ]
@@ -805,45 +779,35 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.70"
+version = "1.0.78"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
-name = "prql-ast"
-version = "0.9.5"
+name = "prqlc"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d91522f9f16d055409b9ffec55693a96e3424fe5d8e7c8331adcf6d7ee363a"
-dependencies = [
- "enum-as-inner",
- "semver",
- "serde",
- "strum",
-]
-
-[[package]]
-name = "prql-compiler"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4d56865532fcf1abaa31fbb6da6fd9e90edc441c5c78bfe2870ee75187c7a3c"
+checksum = "4beb05b6b71ce096fa56d73006ab1c42a8d11bf190d193fa511a134f7730ec43"
 dependencies = [
  "anstream",
  "anyhow",
  "ariadne",
+ "chrono",
  "csv",
  "enum-as-inner",
- "itertools 0.11.0",
+ "itertools",
  "log",
  "once_cell",
- "prql-ast",
- "prql-parser",
+ "prqlc-ast",
+ "prqlc-parser",
  "regex",
  "semver",
  "serde",
  "serde_json",
+ "serde_yaml",
  "sqlformat",
  "sqlparser",
  "strum",
@@ -851,15 +815,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "prql-parser"
-version = "0.9.5"
+name = "prqlc-ast"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9360352e413390cfd26345f49279622b87581a3b748340d3f42d4d616c2a1ec1"
+checksum = "c98923b046bc48046e3846b14a5fde5a059f681c7c367bd0ab96ebd3ecc33a71"
+dependencies = [
+ "anyhow",
+ "enum-as-inner",
+ "semver",
+ "serde",
+ "strum",
+]
+
+[[package]]
+name = "prqlc-parser"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "855ad9aba599ef608efc88a30ebd731155997d9bbe780639eb175de060b6cddc"
 dependencies = [
  "chumsky",
- "itertools 0.11.0",
- "prql-ast",
+ "itertools",
+ "prqlc-ast",
  "semver",
+ "stacker",
 ]
 
 [[package]]
@@ -873,9 +851,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
 dependencies = [
  "proc-macro2",
 ]
@@ -922,9 +900,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.2"
+version = "1.10.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -934,9 +912,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.3"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
+checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -955,19 +933,6 @@ version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
 
-[[package]]
-name = "rustix"
-version = "0.38.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72e572a5e8ca657d7366229cdde4bd14c4eb5499a9573d4d366fe1b599daa316"
-dependencies = [
- "bitflags 2.4.1",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -988,44 +953,57 @@ checksum = "a3cf7c11c38cb994f3d40e8a8cde3bbd1f72a435e4c49e85d6553d8312306152"
 
 [[package]]
 name = "semver"
-version = "1.0.20"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
+checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.197"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.114"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
 dependencies = [
  "itoa",
  "ryu",
  "serde",
 ]
 
+[[package]]
+name = "serde_yaml"
+version = "0.9.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
 [[package]]
 name = "skim"
 version = "0.10.4"
@@ -1057,16 +1035,16 @@ version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
 dependencies = [
- "itertools 0.12.0",
+ "itertools",
  "nom",
  "unicode_categories",
 ]
 
 [[package]]
 name = "sqlparser"
-version = "0.37.0"
+version = "0.43.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ae05a8250b968a3f7db93155a84d68b2e6cea1583949af5ca5b5170c76c075"
+checksum = "f95c4bae5aba7cd30bd506f7140026ade63cff5afd778af8854026f9606bf5d4"
 dependencies = [
  "log",
  "serde",
@@ -1093,24 +1071,24 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
 [[package]]
 name = "strum"
-version = "0.25.0"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+checksum = "723b93e8addf9aa965ebe2d11da6d7540fa2283fcea14b3371ff055f7ba13f5f"
 dependencies = [
  "strum_macros",
 ]
 
 [[package]]
 name = "strum_macros"
-version = "0.25.3"
+version = "0.26.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+checksum = "7a3417fc93d76740d974a01654a09777cb500428cc874ca9f45edfe0c4d4cd18"
 dependencies = [
  "heck",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1126,9 +1104,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.41"
+version = "2.0.52"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44c8b28c477cc3bf0e7966561e3460130e1255f7a1cf71931075f1c5e7a7e269"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1172,7 +1150,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
 
 [[package]]
@@ -1244,6 +1222,12 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e"
 
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -1304,7 +1288,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
  "wasm-bindgen-shared",
 ]
 
@@ -1326,7 +1310,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -1377,15 +1361,6 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets 0.48.5",
-]
-
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
@@ -1532,5 +1507,5 @@ checksum = "b3c129550b3e6de3fd0ba67ba5c81818f9805e58b8d7fee80a3a59d2c9fc601a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.41",
+ "syn 2.0.52",
 ]
diff --git a/rust/prql/Cargo.toml b/rust/prql/Cargo.toml
index f29aa4aaef9..514b5176d48 100644
--- a/rust/prql/Cargo.toml
+++ b/rust/prql/Cargo.toml
@@ -3,17 +3,16 @@ edition = "2021"
 name = "_ch_rust_prql"
 version = "0.1.0"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
 [dependencies]
-prql-compiler = "0.9.3"
+anstream = {version = "0.6.12"}
+prqlc = {version = "0.11.3", default-features = false}
 serde_json = "1.0"
 
 [lib]
 crate-type = ["staticlib"]
 
 [profile.release]
-debug = true
+debug = false
 
 [profile.release-thinlto]
 inherits = "release"
diff --git a/rust/prql/src/lib.rs b/rust/prql/src/lib.rs
index fb71d62d527..2e5b2061fcb 100644
--- a/rust/prql/src/lib.rs
+++ b/rust/prql/src/lib.rs
@@ -1,6 +1,7 @@
-use prql_compiler::sql::Dialect;
-use prql_compiler::{Options, Target};
+use prqlc::sql::Dialect;
+use prqlc::{Options, Target};
 use std::ffi::{c_char, CString};
+use std::panic;
 use std::slice;
 
 fn set_output(result: String, out: *mut *mut u8, out_size: *mut u64) {
@@ -13,6 +14,44 @@ fn set_output(result: String, out: *mut *mut u8, out_size: *mut u64) {
     *out_ptr = CString::new(result).unwrap().into_raw() as *mut u8;
 }
 
+/// Converts a PRQL query from a raw C string to SQL, returning an error code if the conversion fails.
+pub unsafe extern "C" fn prql_to_sql_impl(
+    query: *const u8,
+    size: u64,
+    out: *mut *mut u8,
+    out_size: *mut u64,
+) -> i64 {
+    let query_vec = slice::from_raw_parts(query, size.try_into().unwrap()).to_vec();
+    let Ok(query_str) = String::from_utf8(query_vec) else {
+        set_output(
+            "The PRQL query must be UTF-8 encoded!".to_string(),
+            out,
+            out_size,
+        );
+        return 1;
+    };
+
+    let opts = Options {
+        format: true,
+        target: Target::Sql(Some(Dialect::ClickHouse)),
+        signature_comment: false,
+        color: false,
+    };
+
+    if let Ok(sql_str) = prqlc::compile(&query_str, &opts) {
+        // NOTE: Over at PRQL we're considering to un-deprecate & re-enable the
+        // `color: false` option. If that happens, we can remove the `strip_str`
+        // here, which strips color codes from the output.
+        use anstream::adapter::strip_str;
+        let sql_str = strip_str(&sql_str).to_string();
+        set_output(sql_str, out, out_size);
+        0
+    } else {
+        set_output("PRQL compilation failed!".to_string(), out, out_size);
+        1
+    }
+}
+
 #[no_mangle]
 pub unsafe extern "C" fn prql_to_sql(
     query: *const u8,
@@ -20,37 +59,50 @@ pub unsafe extern "C" fn prql_to_sql(
     out: *mut *mut u8,
     out_size: *mut u64,
 ) -> i64 {
-    let query_vec = unsafe { slice::from_raw_parts(query, size.try_into().unwrap()) }.to_vec();
-    let maybe_prql_query = String::from_utf8(query_vec);
-    if maybe_prql_query.is_err() {
-        set_output(
-            String::from("The PRQL query must be UTF-8 encoded!"),
-            out,
-            out_size,
-        );
-        return 1;
-    }
-    let prql_query = maybe_prql_query.unwrap();
-    let opts = &Options {
-        format: true,
-        target: Target::Sql(Some(Dialect::ClickHouse)),
-        signature_comment: false,
-        color: false,
-    };
-    let (is_err, res) = match prql_compiler::compile(&prql_query, &opts) {
-        Ok(sql_str) => (false, sql_str),
-        Err(err) => (true, err.to_string()),
-    };
-
-    set_output(res, out, out_size);
-
-    match is_err {
-        true => 1,
-        false => 0,
-    }
+    // NOTE: using cxxbridge we can return proper Result<> type.
+    panic::catch_unwind(|| prql_to_sql_impl(query, size, out, out_size)).unwrap_or_else(|_| {
+        set_output("prqlc panicked".to_string(), out, out_size);
+        1
+    })
 }
 
 #[no_mangle]
 pub unsafe extern "C" fn prql_free_pointer(ptr_to_free: *mut u8) {
     std::mem::drop(CString::from_raw(ptr_to_free as *mut c_char));
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::ffi::{CStr, CString};
+
+    /// A test helper to offer a rust interface to the C bindings
+    fn run_compile(query: &str) -> (String, i64) {
+        let query_cstr = CString::new(query).unwrap();
+        let query_ptr = query_cstr.as_ptr() as *const u8;
+        let query_size = query_cstr.to_bytes_with_nul().len() as u64 - 1; // Excluding the null terminator
+
+        let mut out: *mut u8 = std::ptr::null_mut();
+        let mut out_size = 0_u64;
+
+        unsafe {
+            let success = prql_to_sql(query_ptr, query_size, &mut out, &mut out_size);
+            let output = CStr::from_ptr(out as *const i8)
+                .to_str()
+                .unwrap()
+                .to_string();
+            prql_free_pointer(out);
+            (output, success)
+        }
+    }
+
+    #[test]
+    fn test_prql_to_sql() {
+        assert!(run_compile("from x").0.contains("SELECT"));
+        assert!(run_compile("asdf").1 == 1);
+        // In prqlc 0.11.3, this is a panic, so that allows us to test that the
+        // panic is caught. When we upgrade prqlc, it won't be a panic any
+        // longer.
+        assert!(run_compile("x -> y").1 == 1);
+    }
+}
diff --git a/rust/skim/Cargo.toml b/rust/skim/Cargo.toml
index 22af40c3e33..0839b888d8b 100644
--- a/rust/skim/Cargo.toml
+++ b/rust/skim/Cargo.toml
@@ -17,7 +17,7 @@ cxx-build = "1.0.83"
 crate-type = ["staticlib"]
 
 [profile.release]
-debug = true
+debug = false
 
 [profile.release-thinlto]
 inherits = "release"
diff --git a/rust/skim/src/lib.rs b/rust/skim/src/lib.rs
index 2221ed63df4..58d5be51baa 100644
--- a/rust/skim/src/lib.rs
+++ b/rust/skim/src/lib.rs
@@ -1,6 +1,7 @@
-use skim::prelude::*;
-use term::terminfo::TermInfo;
 use cxx::{CxxString, CxxVector};
+use skim::prelude::*;
+use std::panic;
+use term::terminfo::TermInfo;
 
 #[cxx::bridge]
 mod ffi {
@@ -15,7 +16,7 @@ struct Item {
 }
 impl Item {
     fn new(text: String) -> Self {
-        return Self{
+        Self {
             // Text that will be printed by skim, and will be used for matching.
             //
             // Text that will be shown should not contains new lines since in this case skim may
@@ -23,20 +24,20 @@ impl Item {
             text_no_newlines: text.replace("\n", " "),
             // This will be used when the match had been selected.
             orig_text: text,
-        };
+        }
     }
 }
 impl SkimItem for Item {
     fn text(&self) -> Cow<str> {
-        return Cow::Borrowed(&self.text_no_newlines);
+        Cow::Borrowed(&self.text_no_newlines)
     }
 
     fn output(&self) -> Cow<str> {
-        return Cow::Borrowed(&self.orig_text);
+        Cow::Borrowed(&self.orig_text)
     }
 }
 
-fn skim(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, String> {
+fn skim_impl(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, String> {
     // Let's check is terminal available. To avoid panic.
     if let Err(err) = TermInfo::from_env() {
         return Err(format!("{}", err));
@@ -87,5 +88,21 @@ fn skim(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, Stri
     if output.selected_items.is_empty() {
         return Err("No items had been selected".to_string());
     }
-    return Ok(output.selected_items[0].output().to_string());
+    Ok(output.selected_items[0].output().to_string())
+}
+
+fn skim(prefix: &CxxString, words: &CxxVector<CxxString>) -> Result<String, String> {
+    match panic::catch_unwind(|| skim_impl(prefix, words)) {
+        Err(err) => {
+            let e = if let Some(s) = err.downcast_ref::<String>() {
+                format!("{}", s)
+            } else if let Some(s) = err.downcast_ref::<&str>() {
+                format!("{}", s)
+            } else {
+                format!("Unknown panic type: {:?}", err.type_id())
+            };
+            Err(format!("Rust panic: {:?}", e))
+        }
+        Ok(res) => res,
+    }
 }
diff --git a/src/Access/AccessBackup.cpp b/src/Access/AccessBackup.cpp
index 800a54e69b3..1110b9c4b21 100644
--- a/src/Access/AccessBackup.cpp
+++ b/src/Access/AccessBackup.cpp
@@ -16,6 +16,8 @@
 #include <IO/ReadBufferFromString.h>
 #include <Poco/UUIDGenerator.h>
 #include <base/insertAtEnd.h>
+
+#include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
 
 namespace fs = std::filesystem;
@@ -297,7 +299,7 @@ namespace
 
 
 std::pair<String, BackupEntryPtr> makeBackupEntryForAccess(
-    const std::vector<std::pair<UUID, AccessEntityPtr>> access_entities,
+    const std::vector<std::pair<UUID, AccessEntityPtr>> & access_entities,
     const String & data_path_in_backup,
     size_t counter,
     const AccessControl & access_control)
@@ -326,7 +328,7 @@ void AccessRestorerFromBackup::addDataPath(const String & data_path)
         return;
 
     fs::path data_path_in_backup_fs = data_path;
-    Strings filenames = backup->listFiles(data_path);
+    Strings filenames = backup->listFiles(data_path, /*recursive*/ false);
     if (filenames.empty())
         return;
 
diff --git a/src/Access/AccessBackup.h b/src/Access/AccessBackup.h
index 99f22b6c6a8..1aaac589ccb 100644
--- a/src/Access/AccessBackup.h
+++ b/src/Access/AccessBackup.h
@@ -21,7 +21,7 @@ struct RestoreSettings;
 
 /// Makes a backup of access entities of a specified type.
 std::pair<String, BackupEntryPtr> makeBackupEntryForAccess(
-    const std::vector<std::pair<UUID, AccessEntityPtr>> access_entities,
+    const std::vector<std::pair<UUID, AccessEntityPtr>> & access_entities,
     const String & data_path_in_backup,
     size_t counter,
     const AccessControl & access_control);
diff --git a/src/Access/AccessControl.cpp b/src/Access/AccessControl.cpp
index 5de405d9f8f..d02af01126a 100644
--- a/src/Access/AccessControl.cpp
+++ b/src/Access/AccessControl.cpp
@@ -47,7 +47,7 @@ namespace
         const Poco::Util::AbstractConfiguration & config,
         const std::string & config_path,
         const std::string & users_config_path,
-        Poco::Logger * log)
+        LoggerPtr log)
     {
         if (config.getBool("skip_check_for_incorrect_settings", false))
             return;
@@ -559,12 +559,33 @@ AccessChangesNotifier & AccessControl::getChangesNotifier()
 }
 
 
-AuthResult AccessControl::authenticate(const Credentials & credentials, const Poco::Net::IPAddress & address) const
+AuthResult AccessControl::authenticate(const Credentials & credentials, const Poco::Net::IPAddress & address, const String & forwarded_address) const
 {
+    // NOTE: In the case where the user has never been logged in using LDAP,
+    // Then user_id is not generated, and the authentication quota will always be nullptr.
+    auto authentication_quota = getAuthenticationQuota(credentials.getUserName(), address, forwarded_address);
+    if (authentication_quota)
+    {
+        /// Reserve a single try from the quota to check whether we have another authentication try.
+        /// This is required for correct behavior in this situation:
+        /// User has 1 login failures quota.
+        /// * At the first login with an invalid password: Increase the quota counter. 1 (used) > 1 (max) is false.
+        ///   Then try to authenticate the user and throw an AUTHENTICATION_FAILED error.
+        /// * In case of the second try: increase quota counter, 2 (used) > 1 (max), then throw QUOTA_EXCEED
+        ///   and don't let the user authenticate.
+        ///
+        /// The authentication failures counter will be reset after successful authentication.
+        authentication_quota->used(QuotaType::FAILED_SEQUENTIAL_AUTHENTICATIONS, 1);
+    }
+
     try
     {
-        return MultipleAccessStorage::authenticate(credentials, address, *external_authenticators, allow_no_password,
-                                                   allow_plaintext_password);
+        const auto auth_result = MultipleAccessStorage::authenticate(credentials, address, *external_authenticators, allow_no_password,
+                                                                     allow_plaintext_password);
+        if (authentication_quota)
+            authentication_quota->reset(QuotaType::FAILED_SEQUENTIAL_AUTHENTICATIONS);
+
+        return auth_result;
     }
     catch (...)
     {
@@ -763,7 +784,34 @@ std::shared_ptr<const EnabledQuota> AccessControl::getEnabledQuota(
     const String & forwarded_address,
     const String & custom_quota_key) const
 {
-    return quota_cache->getEnabledQuota(user_id, user_name, enabled_roles, address, forwarded_address, custom_quota_key);
+    return quota_cache->getEnabledQuota(user_id, user_name, enabled_roles, address, forwarded_address, custom_quota_key, true);
+}
+
+std::shared_ptr<const EnabledQuota> AccessControl::getAuthenticationQuota(
+    const String & user_name, const Poco::Net::IPAddress & address, const std::string & forwarded_address) const
+{
+    auto user_id = find<User>(user_name);
+    UserPtr user;
+    if (user_id && (user = tryRead<User>(*user_id)))
+    {
+        const auto new_current_roles = user->granted_roles.findGranted(user->default_roles);
+        const auto roles_info = getEnabledRolesInfo(new_current_roles, {});
+
+        // client_key is not received at the moment of authentication during TCP connection
+        // if key type is set to QuotaKeyType::CLIENT_KEY
+        // QuotaCache::QuotaInfo::calculateKey will throw exception without throw_if_client_key_empty = false
+        String quota_key;
+        bool throw_if_client_key_empty = false;
+        return quota_cache->getEnabledQuota(*user_id,
+                                            user->getName(),
+                                            roles_info->enabled_roles,
+                                            address,
+                                            forwarded_address,
+                                            quota_key,
+                                            throw_if_client_key_empty);
+    }
+    else
+        return nullptr;
 }
 
 
diff --git a/src/Access/AccessControl.h b/src/Access/AccessControl.h
index 76431ab4928..1af74e02fb7 100644
--- a/src/Access/AccessControl.h
+++ b/src/Access/AccessControl.h
@@ -118,7 +118,7 @@ public:
     scope_guard subscribeForChanges(const UUID & id, const OnChangedHandler & handler) const;
     scope_guard subscribeForChanges(const std::vector<UUID> & ids, const OnChangedHandler & handler) const;
 
-    AuthResult authenticate(const Credentials & credentials, const Poco::Net::IPAddress & address) const;
+    AuthResult authenticate(const Credentials & credentials, const Poco::Net::IPAddress & address, const String & forwarded_address) const;
 
     /// Makes a backup of access entities.
     void restoreFromBackup(RestorerFromBackup & restorer) override;
@@ -133,20 +133,20 @@ public:
     /// This function also enables custom prefixes to be used.
     void setCustomSettingsPrefixes(const Strings & prefixes);
     void setCustomSettingsPrefixes(const String & comma_separated_prefixes);
-    bool isSettingNameAllowed(const std::string_view name) const;
-    void checkSettingNameIsAllowed(const std::string_view name) const;
+    bool isSettingNameAllowed(std::string_view name) const;
+    void checkSettingNameIsAllowed(std::string_view name) const;
 
     /// Allows implicit user creation without password (by default it's allowed).
     /// In other words, allow 'CREATE USER' queries without 'IDENTIFIED WITH' clause.
-    void setImplicitNoPasswordAllowed(const bool allow_implicit_no_password_);
+    void setImplicitNoPasswordAllowed(bool allow_implicit_no_password_);
     bool isImplicitNoPasswordAllowed() const;
 
     /// Allows users without password (by default it's allowed).
-    void setNoPasswordAllowed(const bool allow_no_password_);
+    void setNoPasswordAllowed(bool allow_no_password_);
     bool isNoPasswordAllowed() const;
 
     /// Allows users with plaintext password (by default it's allowed).
-    void setPlaintextPasswordAllowed(const bool allow_plaintext_password_);
+    void setPlaintextPasswordAllowed(bool allow_plaintext_password_);
     bool isPlaintextPasswordAllowed() const;
 
     /// Default password type when the user does not specify it.
@@ -164,7 +164,7 @@ public:
     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
+    /// For example, if there are 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.
     void setEnabledUsersWithoutRowPoliciesCanReadRows(bool enable) { users_without_row_policies_can_read_rows = enable; }
     bool isEnabledUsersWithoutRowPoliciesCanReadRows() const { return users_without_row_policies_can_read_rows; }
@@ -206,6 +206,11 @@ public:
         const String & forwarded_address,
         const String & custom_quota_key) const;
 
+    std::shared_ptr<const EnabledQuota> getAuthenticationQuota(
+        const String & user_name,
+        const Poco::Net::IPAddress & address,
+        const std::string & forwarded_address) const;
+
     std::vector<QuotaUsage> getAllQuotasUsage() const;
 
     std::shared_ptr<const EnabledSettings> getEnabledSettings(
diff --git a/src/Access/AccessEntityIO.cpp b/src/Access/AccessEntityIO.cpp
index 80bb63b04bf..b0dfd74c53b 100644
--- a/src/Access/AccessEntityIO.cpp
+++ b/src/Access/AccessEntityIO.cpp
@@ -62,7 +62,7 @@ AccessEntityPtr deserializeAccessEntityImpl(const String & definition)
     const char * end = begin + definition.size();
     while (pos < end)
     {
-        queries.emplace_back(parseQueryAndMovePosition(parser, pos, end, "", true, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH));
+        queries.emplace_back(parseQueryAndMovePosition(parser, pos, end, "", true, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS));
         while (isWhitespaceASCII(*pos) || *pos == ';')
             ++pos;
     }
diff --git a/src/Access/AccessRights.cpp b/src/Access/AccessRights.cpp
index 520a11bd696..a87e9361e8e 100644
--- a/src/Access/AccessRights.cpp
+++ b/src/Access/AccessRights.cpp
@@ -1,6 +1,8 @@
 #include <Access/AccessRights.h>
-#include <Common/logger_useful.h>
 #include <base/sort.h>
+#include <Common/Exception.h>
+#include <Common/logger_useful.h>
+
 #include <boost/container/small_vector.hpp>
 #include <boost/range/adaptor/map.hpp>
 #include <unordered_map>
@@ -408,6 +410,65 @@ public:
 
     friend bool operator!=(const Node & left, const Node & right) { return !(left == right); }
 
+    bool contains(const Node & other)
+    {
+        if (min_flags_with_children.contains(other.max_flags_with_children))
+            return true;
+
+        if (!flags.contains(other.flags))
+            return false;
+
+        /// Let's assume that the current node has the following rights:
+        ///
+        /// SELECT ON *.* TO user1;
+        /// REVOKE SELECT ON system.* FROM user1;
+        /// REVOKE SELECT ON mydb.* FROM user1;
+        ///
+        /// And the other node has the rights:
+        ///
+        /// SELECT ON *.* TO user2;
+        /// REVOKE SELECT ON system.* FROM user2;
+        ///
+        /// First, we check that each child from the other node is present in the current node:
+        ///
+        /// SELECT ON *.* TO user1;  -- checked
+        /// REVOKE SELECT ON system.* FROM user1; -- checked
+        if (other.children)
+        {
+            for (const auto & [name, node] : *other.children)
+            {
+                const auto & child = tryGetChild(name);
+                if (child == nullptr)
+                {
+                    if (!flags.contains(node.flags))
+                        return false;
+                }
+                else
+                {
+                    if (!child->contains(node))
+                        return false;
+                }
+            }
+        }
+
+        if (!children)
+            return true;
+
+        /// Then we check that each of our children has no other rights revoked.
+        ///
+        /// REVOKE SELECT ON mydb.* FROM user1; -- check failed, returning false
+        for (const auto & [name, node] : *children)
+        {
+            if (other.children && other.children->contains(name))
+                continue;
+
+            if (!node.flags.contains(other.flags))
+                return false;
+        }
+
+        return true;
+    }
+
     void makeUnion(const Node & other)
     {
         makeUnionRec(other);
@@ -443,7 +504,7 @@ public:
             optimizeTree();
     }
 
-    void logTree(Poco::Logger * log, const String & title) const
+    void logTree(LoggerPtr log, const String & title) const
     {
         LOG_TRACE(log, "Tree({}): level={}, name={}, flags={}, min_flags={}, max_flags={}, num_children={}",
             title, level, node_name ? *node_name : "NULL", flags.toString(),
@@ -1004,6 +1065,24 @@ bool AccessRights::isGrantedImpl(const AccessFlags & flags, const Args &... args
         return helper(root);
 }
 
+template <bool grant_option>
+bool AccessRights::containsImpl(const AccessRights & other) const
+{
+    auto helper = [&](const std::unique_ptr<Node> & root_node) -> bool
+    {
+        if (!root_node)
+            return !other.root;
+        if (!other.root)
+            return true;
+        return root_node->contains(*other.root);
+    };
+    if constexpr (grant_option)
+        return helper(root_with_grant_option);
+    else
+        return helper(root);
+}
+
+
 template <bool grant_option>
 bool AccessRights::isGrantedImplHelper(const AccessRightsElement & element) const
 {
@@ -1068,6 +1147,8 @@ bool AccessRights::hasGrantOption(const AccessFlags & flags, std::string_view da
 bool AccessRights::hasGrantOption(const AccessRightsElement & element) const { return isGrantedImpl<true>(element); }
 bool AccessRights::hasGrantOption(const AccessRightsElements & elements) const { return isGrantedImpl<true>(elements); }
 
+bool AccessRights::contains(const AccessRights & access_rights) const { return containsImpl<false>(access_rights); }
+bool AccessRights::containsWithGrantOption(const AccessRights & access_rights) const { return containsImpl<true>(access_rights); }
 
 bool operator ==(const AccessRights & left, const AccessRights & right)
 {
@@ -1158,7 +1239,7 @@ AccessRights AccessRights::getFullAccess()
 
 void AccessRights::logTree() const
 {
-    auto * log = &Poco::Logger::get("AccessRights");
+    auto log = getLogger("AccessRights");
     if (root)
     {
         root->logTree(log, "");
diff --git a/src/Access/AccessRights.h b/src/Access/AccessRights.h
index 5efffc0037a..bfb4b7c68c3 100644
--- a/src/Access/AccessRights.h
+++ b/src/Access/AccessRights.h
@@ -95,6 +95,10 @@ public:
     bool hasGrantOption(const AccessRightsElement & element) const;
     bool hasGrantOption(const AccessRightsElements & elements) const;
 
+    /// Checks if a given `access_rights` is a subset for the current access rights.
+    bool contains(const AccessRights & access_rights) const;
+    bool containsWithGrantOption(const AccessRights & access_rights) const;
+
     /// Merges two sets of access rights together.
     /// It's used to combine access rights from multiple roles.
     void makeUnion(const AccessRights & other);
@@ -153,6 +157,9 @@ private:
     template <bool grant_option>
     bool isGrantedImpl(const AccessRightsElements & elements) const;
 
+    template <bool grant_option>
+    bool containsImpl(const AccessRights & other) const;
+
     template <bool grant_option>
     bool isGrantedImplHelper(const AccessRightsElement & element) const;
 
diff --git a/src/Access/Authentication.cpp b/src/Access/Authentication.cpp
index 372334bb152..bf1fe3feec3 100644
--- a/src/Access/Authentication.cpp
+++ b/src/Access/Authentication.cpp
@@ -4,11 +4,12 @@
 #include <Access/ExternalAuthenticators.h>
 #include <Access/LDAPClient.h>
 #include <Access/GSSAcceptor.h>
-#include <Common/Exception.h>
 #include <Poco/SHA1Engine.h>
+#include <Common/Exception.h>
+#include <Common/SSHWrapper.h>
 #include <Common/typeid_cast.h>
-#include <Common/SSH/Wrappers.h>
 
+#include "config.h"
 
 namespace DB
 {
@@ -73,8 +74,8 @@ namespace
         return checkPasswordDoubleSHA1MySQL(scramble, scrambled_password, Util::encodeDoubleSHA1(password_plaintext));
     }
 
-#if USE_SSL
-    bool checkSshSignature(const std::vector<ssh::SSHKey> & keys, std::string_view signature, std::string_view original)
+#if USE_SSH
+    bool checkSshSignature(const std::vector<SSHKey> & keys, std::string_view signature, std::string_view original)
     {
         for (const auto & key: keys)
             if (key.isPublic() && key.verifySignature(signature, original))
@@ -114,7 +115,11 @@ bool Authentication::areCredentialsValid(
                 throw Authentication::Require<BasicCredentials>("ClickHouse X.509 Authentication");
 
             case AuthenticationType::SSH_KEY:
-                throw Authentication::Require<SshCredentials>("Ssh Keys Authentication");
+#if USE_SSH
+                throw Authentication::Require<SshCredentials>("SSH Keys Authentication");
+#else
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
+#endif
 
             case AuthenticationType::MAX:
                 break;
@@ -145,7 +150,11 @@ bool Authentication::areCredentialsValid(
                 throw Authentication::Require<BasicCredentials>("ClickHouse X.509 Authentication");
 
             case AuthenticationType::SSH_KEY:
-                throw Authentication::Require<SshCredentials>("Ssh Keys Authentication");
+#if USE_SSH
+                throw Authentication::Require<SshCredentials>("SSH Keys Authentication");
+#else
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
+#endif
 
             case AuthenticationType::MAX:
                 break;
@@ -178,7 +187,11 @@ bool Authentication::areCredentialsValid(
                 throw Authentication::Require<BasicCredentials>("ClickHouse X.509 Authentication");
 
             case AuthenticationType::SSH_KEY:
-                throw Authentication::Require<SshCredentials>("Ssh Keys Authentication");
+#if USE_SSH
+                throw Authentication::Require<SshCredentials>("SSH Keys Authentication");
+#else
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
+#endif
 
             case AuthenticationType::BCRYPT_PASSWORD:
                 return checkPasswordBcrypt(basic_credentials->getPassword(), auth_data.getPasswordHashBinary());
@@ -216,13 +229,18 @@ bool Authentication::areCredentialsValid(
                 return auth_data.getSSLCertificateCommonNames().contains(ssl_certificate_credentials->getCommonName());
 
             case AuthenticationType::SSH_KEY:
-                throw Authentication::Require<SshCredentials>("Ssh Keys Authentication");
+#if USE_SSH
+                throw Authentication::Require<SshCredentials>("SSH Keys Authentication");
+#else
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
+#endif
 
             case AuthenticationType::MAX:
                 break;
         }
     }
 
+#if USE_SSH
     if (const auto * ssh_credentials = typeid_cast<const SshCredentials *>(&credentials))
     {
         switch (auth_data.getType())
@@ -243,15 +261,12 @@ bool Authentication::areCredentialsValid(
                 throw Authentication::Require<SSLCertificateCredentials>("ClickHouse X.509 Authentication");
 
             case AuthenticationType::SSH_KEY:
-#if USE_SSL
                 return checkSshSignature(auth_data.getSSHKeys(), ssh_credentials->getSignature(), ssh_credentials->getOriginal());
-#else
-                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without OpenSSL");
-#endif
             case AuthenticationType::MAX:
                 break;
         }
     }
+#endif
 
     if ([[maybe_unused]] const auto * always_allow_credentials = typeid_cast<const AlwaysAllowCredentials *>(&credentials))
         return true;
diff --git a/src/Access/AuthenticationData.cpp b/src/Access/AuthenticationData.cpp
index 1036e1e027e..a4c25b438e8 100644
--- a/src/Access/AuthenticationData.cpp
+++ b/src/Access/AuthenticationData.cpp
@@ -105,7 +105,10 @@ 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)
-        && (lhs.ssh_keys == rhs.ssh_keys) && (lhs.http_auth_scheme == rhs.http_auth_scheme)
+#if USE_SSH
+        && (lhs.ssh_keys == rhs.ssh_keys)
+#endif
+        && (lhs.http_auth_scheme == rhs.http_auth_scheme)
         && (lhs.http_auth_server_name == rhs.http_auth_server_name);
 }
 
@@ -320,13 +323,13 @@ std::shared_ptr<ASTAuthenticationData> AuthenticationData::toAST() const
         }
         case AuthenticationType::SSH_KEY:
         {
-#if USE_SSL
+#if USE_SSH
             for (const auto & key : getSSHKeys())
                 node->children.push_back(std::make_shared<ASTPublicSSHKey>(key.getBase64(), key.getKeyType()));
 
             break;
 #else
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without OpenSSL");
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
 #endif
         }
         case AuthenticationType::HTTP:
@@ -353,9 +356,9 @@ AuthenticationData AuthenticationData::fromAST(const ASTAuthenticationData & que
     /// For this type of authentication we have ASTPublicSSHKey as children for ASTAuthenticationData
     if (query.type && query.type == AuthenticationType::SSH_KEY)
     {
-#if USE_SSL
+#if USE_SSH
         AuthenticationData auth_data(*query.type);
-        std::vector<ssh::SSHKey> keys;
+        std::vector<SSHKey> keys;
 
         size_t args_size = query.children.size();
         for (size_t i = 0; i < args_size; ++i)
@@ -366,7 +369,7 @@ AuthenticationData AuthenticationData::fromAST(const ASTAuthenticationData & que
 
             try
             {
-                keys.emplace_back(ssh::SSHKeyFactory::makePublicFromBase64(key_base64, type));
+                keys.emplace_back(SSHKeyFactory::makePublicKeyFromBase64(key_base64, type));
             }
             catch (const std::invalid_argument &)
             {
@@ -377,7 +380,7 @@ AuthenticationData AuthenticationData::fromAST(const ASTAuthenticationData & que
         auth_data.setSSHKeys(std::move(keys));
         return auth_data;
 #else
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without OpenSSL");
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
 #endif
     }
 
diff --git a/src/Access/AuthenticationData.h b/src/Access/AuthenticationData.h
index feef4d71d66..c97e0327b56 100644
--- a/src/Access/AuthenticationData.h
+++ b/src/Access/AuthenticationData.h
@@ -2,14 +2,16 @@
 
 #include <Access/Common/AuthenticationType.h>
 #include <Access/Common/HTTPAuthenticationScheme.h>
+#include <Common/SSHWrapper.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/Access/ASTAuthenticationData.h>
-#include <Common/SSH/Wrappers.h>
 
 #include <vector>
 #include <base/types.h>
 #include <boost/container/flat_set.hpp>
 
+#include "config.h"
+
 namespace DB
 {
 
@@ -59,8 +61,10 @@ public:
     const boost::container::flat_set<String> & getSSLCertificateCommonNames() const { return ssl_certificate_common_names; }
     void setSSLCertificateCommonNames(boost::container::flat_set<String> common_names_);
 
-    const std::vector<ssh::SSHKey> & getSSHKeys() const { return ssh_keys; }
-    void setSSHKeys(std::vector<ssh::SSHKey> && ssh_keys_) { ssh_keys = std::forward<std::vector<ssh::SSHKey>>(ssh_keys_); }
+#if USE_SSH
+    const std::vector<SSHKey> & getSSHKeys() const { return ssh_keys; }
+    void setSSHKeys(std::vector<SSHKey> && ssh_keys_) { ssh_keys = std::forward<std::vector<SSHKey>>(ssh_keys_); }
+#endif
 
     HTTPAuthenticationScheme getHTTPAuthenticationScheme() const { return http_auth_scheme; }
     void setHTTPAuthenticationScheme(HTTPAuthenticationScheme scheme) { http_auth_scheme = scheme; }
@@ -94,7 +98,9 @@ private:
     String kerberos_realm;
     boost::container::flat_set<String> ssl_certificate_common_names;
     String salt;
-    std::vector<ssh::SSHKey> ssh_keys;
+#if USE_SSH
+    std::vector<SSHKey> ssh_keys;
+#endif
     /// HTTP authentication properties
     String http_auth_server_name;
     HTTPAuthenticationScheme http_auth_scheme = HTTPAuthenticationScheme::BASIC;
diff --git a/src/Access/Common/AccessFlags.cpp b/src/Access/Common/AccessFlags.cpp
index 8612fc2309e..d3b6d5a9818 100644
--- a/src/Access/Common/AccessFlags.cpp
+++ b/src/Access/Common/AccessFlags.cpp
@@ -1,7 +1,6 @@
 #include <Access/Common/AccessFlags.h>
 #include <Access/Common/AccessType.h>
 #include <Common/Exception.h>
-#include <base/types.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
@@ -103,6 +102,7 @@ namespace
         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 & getUserNameFlags() const { return all_flags_for_target[USER_NAME]; }
         const Flags & getAllFlagsGrantableOnGlobalLevel() const { return getAllFlags(); }
         const Flags & getAllFlagsGrantableOnGlobalWithParameterLevel() const { return getGlobalWithParameterFlags(); }
         const Flags & getAllFlagsGrantableOnDatabaseLevel() const { return all_flags_grantable_on_database_level; }
@@ -121,6 +121,7 @@ namespace
             COLUMN,
             DICTIONARY,
             NAMED_COLLECTION,
+            USER_NAME,
         };
 
         struct Node;
@@ -300,7 +301,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_global_with_parameter_level = all_flags_for_target[NAMED_COLLECTION] | all_flags_for_target[USER_NAME];
             all_flags_grantable_on_database_level = all_flags_for_target[DATABASE] | all_flags_grantable_on_table_level;
         }
 
@@ -351,7 +352,7 @@ 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>(NAMED_COLLECTION) + 1];
+        Flags all_flags_for_target[static_cast<size_t>(USER_NAME) + 1];
         Flags all_flags_grantable_on_database_level;
         Flags all_flags_grantable_on_table_level;
         Flags all_flags_grantable_on_global_with_parameter_level;
@@ -371,7 +372,11 @@ std::unordered_map<AccessFlags::ParameterType, AccessFlags> AccessFlags::splitIn
     if (named_collection_flags)
         result.emplace(ParameterType::NAMED_COLLECTION, named_collection_flags);
 
-    auto other_flags = (~AccessFlags::allNamedCollectionFlags()) & *this;
+    auto user_flags = AccessFlags::allUserNameFlags() & *this;
+    if (user_flags)
+        result.emplace(ParameterType::USER_NAME, user_flags);
+
+    auto other_flags = (~named_collection_flags & ~user_flags) & *this;
     if (other_flags)
         result.emplace(ParameterType::NONE, other_flags);
 
@@ -387,6 +392,9 @@ AccessFlags::ParameterType AccessFlags::getParameterType() const
     if (AccessFlags::allNamedCollectionFlags().contains(*this))
         return AccessFlags::NAMED_COLLECTION;
 
+    if (AccessFlags::allUserNameFlags().contains(*this))
+        return AccessFlags::USER_NAME;
+
     throw Exception(ErrorCodes::MIXED_ACCESS_PARAMETER_TYPES, "Having mixed parameter types: {}", toString());
 }
 
@@ -405,6 +413,7 @@ AccessFlags AccessFlags::allTableFlags() { return Helper::instance().getTableFla
 AccessFlags AccessFlags::allColumnFlags() { return Helper::instance().getColumnFlags(); }
 AccessFlags AccessFlags::allDictionaryFlags() { return Helper::instance().getDictionaryFlags(); }
 AccessFlags AccessFlags::allNamedCollectionFlags() { return Helper::instance().getNamedCollectionFlags(); }
+AccessFlags AccessFlags::allUserNameFlags() { return Helper::instance().getUserNameFlags(); }
 AccessFlags AccessFlags::allFlagsGrantableOnGlobalLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnGlobalWithParameterLevel() { return Helper::instance().getAllFlagsGrantableOnGlobalWithParameterLevel(); }
 AccessFlags AccessFlags::allFlagsGrantableOnDatabaseLevel() { return Helper::instance().getAllFlagsGrantableOnDatabaseLevel(); }
diff --git a/src/Access/Common/AccessFlags.h b/src/Access/Common/AccessFlags.h
index c9672da7d92..a684731055c 100644
--- a/src/Access/Common/AccessFlags.h
+++ b/src/Access/Common/AccessFlags.h
@@ -57,6 +57,7 @@ public:
     {
         NONE,
         NAMED_COLLECTION,
+        USER_NAME,
     };
     ParameterType getParameterType() const;
     std::unordered_map<ParameterType, AccessFlags> splitIntoParameterTypes() const;
@@ -103,6 +104,9 @@ public:
     /// Returns all the flags related to a named collection.
     static AccessFlags allNamedCollectionFlags();
 
+    /// Returns all the flags related to a user.
+    static AccessFlags allUserNameFlags();
+
     /// Returns all the flags which could be granted on the global level.
     /// The same as allFlags().
     static AccessFlags allFlagsGrantableOnGlobalLevel();
diff --git a/src/Access/Common/AccessType.h b/src/Access/Common/AccessType.h
index 6bbb9acc0c1..83b50ce96c3 100644
--- a/src/Access/Common/AccessType.h
+++ b/src/Access/Common/AccessType.h
@@ -12,7 +12,7 @@ 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/NAMED_COLLECTION/DATABASE/TABLE/DICTIONARY/VIEW/COLUMNS),
+/// node_type either specifies access type's level (GLOBAL/NAMED_COLLECTION/USER_NAME/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.
@@ -80,13 +80,13 @@ enum class AccessType
     M(ALTER_TABLE, "", GROUP, ALTER) \
     M(ALTER_DATABASE, "", GROUP, ALTER) \
     \
-    M(ALTER_VIEW_REFRESH, "ALTER LIVE VIEW REFRESH, REFRESH VIEW", VIEW, ALTER_VIEW) \
     M(ALTER_VIEW_MODIFY_QUERY, "ALTER TABLE MODIFY QUERY", VIEW, ALTER_VIEW) \
     M(ALTER_VIEW_MODIFY_REFRESH, "ALTER TABLE MODIFY QUERY", VIEW, ALTER_VIEW) \
+    M(ALTER_VIEW_MODIFY_SQL_SECURITY, "ALTER TABLE MODIFY SQL SECURITY", VIEW, ALTER_VIEW) \
     M(ALTER_VIEW, "", GROUP, ALTER) /* allows to execute ALTER VIEW REFRESH, ALTER VIEW MODIFY QUERY, ALTER VIEW MODIFY REFRESH;
                                        implicitly enabled by the grant ALTER_TABLE */\
     \
-    M(ALTER, "", GROUP, ALL) /* allows to execute ALTER {TABLE|LIVE VIEW} */\
+    M(ALTER, "", GROUP, ALL) /* allows to execute ALTER TABLE */\
     \
     M(CREATE_DATABASE, "", DATABASE, CREATE) /* allows to execute {CREATE|ATTACH} DATABASE */\
     M(CREATE_TABLE, "", TABLE, CREATE) /* allows to execute {CREATE|ATTACH} {TABLE|VIEW} */\
@@ -139,6 +139,7 @@ enum class AccessType
     M(CREATE_SETTINGS_PROFILE, "CREATE PROFILE", GLOBAL, ACCESS_MANAGEMENT) \
     M(ALTER_SETTINGS_PROFILE, "ALTER PROFILE", GLOBAL, ACCESS_MANAGEMENT) \
     M(DROP_SETTINGS_PROFILE, "DROP PROFILE", GLOBAL, ACCESS_MANAGEMENT) \
+    M(ALLOW_SQL_SECURITY_NONE, "CREATE SQL SECURITY NONE, ALLOW SQL SECURITY NONE, SQL SECURITY NONE, SECURITY NONE", GLOBAL, ACCESS_MANAGEMENT) \
     M(SHOW_USERS, "SHOW CREATE USER", GLOBAL, SHOW_ACCESS) \
     M(SHOW_ROLES, "SHOW CREATE ROLE", GLOBAL, SHOW_ACCESS) \
     M(SHOW_ROW_POLICIES, "SHOW POLICIES, SHOW CREATE ROW POLICY, SHOW CREATE POLICY", TABLE, SHOW_ACCESS) \
@@ -150,16 +151,20 @@ enum class AccessType
     M(SHOW_NAMED_COLLECTIONS_SECRETS, "SHOW NAMED COLLECTIONS SECRETS", NAMED_COLLECTION, NAMED_COLLECTION_ADMIN) \
     M(NAMED_COLLECTION, "NAMED COLLECTION USAGE, USE NAMED COLLECTION", NAMED_COLLECTION, NAMED_COLLECTION_ADMIN) \
     M(NAMED_COLLECTION_ADMIN, "NAMED COLLECTION CONTROL", NAMED_COLLECTION, ALL) \
+    M(SET_DEFINER, "", USER_NAME, 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) \
+    M(SYSTEM_DROP_DNS_CACHE, "SYSTEM DROP DNS, DROP DNS CACHE, DROP DNS", GLOBAL, SYSTEM_DROP_CACHE)  \
+    M(SYSTEM_DROP_CONNECTIONS_CACHE, "SYSTEM DROP CONNECTIONS CACHE, DROP CONNECTIONS CACHE", GLOBAL, SYSTEM_DROP_CACHE)  \
     M(SYSTEM_DROP_MARK_CACHE, "SYSTEM DROP MARK, DROP MARK CACHE, DROP MARKS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_UNCOMPRESSED_CACHE, "SYSTEM DROP UNCOMPRESSED, DROP UNCOMPRESSED CACHE, DROP UNCOMPRESSED", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_MMAP_CACHE, "SYSTEM DROP MMAP, DROP MMAP CACHE, DROP MMAP", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_QUERY_CACHE, "SYSTEM DROP QUERY, DROP QUERY CACHE, DROP QUERY", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_COMPILED_EXPRESSION_CACHE, "SYSTEM DROP COMPILED EXPRESSION, DROP COMPILED EXPRESSION CACHE, DROP COMPILED EXPRESSIONS", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_FILESYSTEM_CACHE, "SYSTEM DROP FILESYSTEM CACHE, DROP FILESYSTEM CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
+    M(SYSTEM_DROP_DISTRIBUTED_CACHE, "SYSTEM DROP DISTRIBUTED CACHE, DROP DISTRIBUTED CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_SYNC_FILESYSTEM_CACHE, "SYSTEM REPAIR FILESYSTEM CACHE, REPAIR FILESYSTEM CACHE, SYNC FILESYSTEM CACHE", GLOBAL, SYSTEM) \
+    M(SYSTEM_DROP_PAGE_CACHE, "SYSTEM DROP PAGE CACHE, DROP PAGE CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_SCHEMA_CACHE, "SYSTEM DROP SCHEMA CACHE, DROP SCHEMA CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_FORMAT_SCHEMA_CACHE, "SYSTEM DROP FORMAT SCHEMA CACHE, DROP FORMAT SCHEMA CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
     M(SYSTEM_DROP_S3_CLIENT_CACHE, "SYSTEM DROP S3 CLIENT, DROP S3 CLIENT CACHE", GLOBAL, SYSTEM_DROP_CACHE) \
@@ -170,6 +175,7 @@ enum class AccessType
     M(SYSTEM_RELOAD_MODEL, "SYSTEM RELOAD MODELS, RELOAD MODEL, RELOAD MODELS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_FUNCTION, "SYSTEM RELOAD FUNCTIONS, RELOAD FUNCTION, RELOAD FUNCTIONS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD_EMBEDDED_DICTIONARIES, "RELOAD EMBEDDED DICTIONARIES", GLOBAL, SYSTEM_RELOAD) /* implicitly enabled by the grant SYSTEM_RELOAD_DICTIONARY ON *.* */\
+    M(SYSTEM_RELOAD_ASYNCHRONOUS_METRICS, "RELOAD ASYNCHRONOUS METRICS", GLOBAL, SYSTEM_RELOAD) \
     M(SYSTEM_RELOAD, "", GROUP, SYSTEM) \
     M(SYSTEM_RESTART_DISK, "SYSTEM RESTART DISK", GLOBAL, SYSTEM) \
     M(SYSTEM_MERGES, "SYSTEM STOP MERGES, SYSTEM START MERGES, STOP MERGES, START MERGES", TABLE, SYSTEM) \
@@ -183,6 +189,7 @@ enum class AccessType
     M(SYSTEM_REPLICATED_SENDS, "SYSTEM STOP REPLICATED SENDS, SYSTEM START REPLICATED SENDS, STOP REPLICATED SENDS, START REPLICATED SENDS", TABLE, SYSTEM_SENDS) \
     M(SYSTEM_SENDS, "SYSTEM STOP SENDS, SYSTEM START SENDS, STOP SENDS, START SENDS", GROUP, SYSTEM) \
     M(SYSTEM_REPLICATION_QUEUES, "SYSTEM STOP REPLICATION QUEUES, SYSTEM START REPLICATION QUEUES, STOP REPLICATION QUEUES, START REPLICATION QUEUES", TABLE, SYSTEM) \
+    M(SYSTEM_VIRTUAL_PARTS_UPDATE, "SYSTEM STOP VIRTUAL PARTS UPDATE, SYSTEM START VIRTUAL PARTS UPDATE, STOP VIRTUAL PARTS UPDATE, START VIRTUAL PARTS UPDATE", TABLE, SYSTEM) \
     M(SYSTEM_DROP_REPLICA, "DROP REPLICA", TABLE, SYSTEM) \
     M(SYSTEM_SYNC_REPLICA, "SYNC REPLICA", TABLE, SYSTEM) \
     M(SYSTEM_REPLICA_READINESS, "SYSTEM REPLICA READY, SYSTEM REPLICA UNREADY", GLOBAL, SYSTEM) \
@@ -198,7 +205,7 @@ 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_FAILPOINT, "SYSTEM ENABLE FAILPOINT, SYSTEM DISABLE FAILPOINT, SYSTEM WAIT FAILPOINT", GLOBAL, SYSTEM) \
     M(SYSTEM_LISTEN, "SYSTEM START LISTEN, SYSTEM STOP LISTEN", GLOBAL, SYSTEM) \
     M(SYSTEM_JEMALLOC, "SYSTEM JEMALLOC PURGE, SYSTEM JEMALLOC ENABLE PROFILE, SYSTEM JEMALLOC DISABLE PROFILE, SYSTEM JEMALLOC FLUSH PROFILE", GLOBAL, SYSTEM) \
     M(SYSTEM, "", GROUP, ALL) /* allows to execute SYSTEM {SHUTDOWN|RELOAD CONFIG|...} */ \
diff --git a/src/Access/Common/AllowedClientHosts.cpp b/src/Access/Common/AllowedClientHosts.cpp
index 801ccd3748b..bee0cdd7264 100644
--- a/src/Access/Common/AllowedClientHosts.cpp
+++ b/src/Access/Common/AllowedClientHosts.cpp
@@ -55,7 +55,7 @@ namespace
     {
         IPAddress addr_v6 = toIPv6(address);
 
-        auto host_addresses = DNSResolver::instance().resolveHostAll(host);
+        auto host_addresses = DNSResolver::instance().resolveHostAllInOriginOrder(host);
 
         for (const auto & addr : host_addresses)
         {
@@ -514,7 +514,7 @@ bool AllowedClientHosts::contains(const IPAddress & client_address) const
                 throw;
             /// Try to ignore DNS errors: if host cannot be resolved, skip it and try next.
             LOG_WARNING(
-                &Poco::Logger::get("AddressPatterns"),
+                getLogger("AddressPatterns"),
                 "Failed to check if the allowed client hosts contain address {}. {}, code = {}",
                 client_address.toString(), e.displayText(), e.code());
             return false;
@@ -556,7 +556,7 @@ bool AllowedClientHosts::contains(const IPAddress & client_address) const
                 throw;
             /// Try to ignore DNS errors: if host cannot be resolved, skip it and try next.
             LOG_WARNING(
-                &Poco::Logger::get("AddressPatterns"),
+                getLogger("AddressPatterns"),
                 "Failed to check if the allowed client hosts contain address {}. {}, code = {}",
                 client_address.toString(), e.displayText(), e.code());
             return false;
diff --git a/src/Access/Common/AuthenticationType.cpp b/src/Access/Common/AuthenticationType.cpp
index a61dc33fc0e..2cc126ad9b7 100644
--- a/src/Access/Common/AuthenticationType.cpp
+++ b/src/Access/Common/AuthenticationType.cpp
@@ -13,63 +13,63 @@ namespace ErrorCodes
 
 const AuthenticationTypeInfo & AuthenticationTypeInfo::get(AuthenticationType type_)
 {
-    static constexpr auto make_info = [](const char * raw_name_, bool is_password_ = false)
+    static constexpr auto make_info = [](Keyword keyword_, bool is_password_ = false)
     {
-        String init_name = raw_name_;
+        String init_name = String(toStringView(keyword_));
         boost::to_lower(init_name);
-        return AuthenticationTypeInfo{raw_name_, std::move(init_name), is_password_};
+        return AuthenticationTypeInfo{keyword_, std::move(init_name), is_password_};
     };
 
     switch (type_)
     {
         case AuthenticationType::NO_PASSWORD:
         {
-            static const auto info = make_info("NO_PASSWORD");
+            static const auto info = make_info(Keyword::NO_PASSWORD);
             return info;
         }
         case AuthenticationType::PLAINTEXT_PASSWORD:
         {
-            static const auto info = make_info("PLAINTEXT_PASSWORD", true);
+            static const auto info = make_info(Keyword::PLAINTEXT_PASSWORD, true);
             return info;
         }
         case AuthenticationType::SHA256_PASSWORD:
         {
-            static const auto info = make_info("SHA256_PASSWORD", true);
+            static const auto info = make_info(Keyword::SHA256_PASSWORD, true);
             return info;
         }
         case AuthenticationType::DOUBLE_SHA1_PASSWORD:
         {
-            static const auto info = make_info("DOUBLE_SHA1_PASSWORD", true);
+            static const auto info = make_info(Keyword::DOUBLE_SHA1_PASSWORD, true);
             return info;
         }
         case AuthenticationType::LDAP:
         {
-            static const auto info = make_info("LDAP");
+            static const auto info = make_info(Keyword::LDAP);
             return info;
         }
         case AuthenticationType::KERBEROS:
         {
-            static const auto info = make_info("KERBEROS");
+            static const auto info = make_info(Keyword::KERBEROS);
             return info;
         }
         case AuthenticationType::SSL_CERTIFICATE:
         {
-            static const auto info = make_info("SSL_CERTIFICATE");
+            static const auto info = make_info(Keyword::SSL_CERTIFICATE);
             return info;
         }
         case AuthenticationType::BCRYPT_PASSWORD:
         {
-            static const auto info = make_info("BCRYPT_PASSWORD", true);
+            static const auto info = make_info(Keyword::BCRYPT_PASSWORD, true);
             return info;
         }
         case AuthenticationType::SSH_KEY:
         {
-            static const auto info = make_info("SSH_KEY");
+            static const auto info = make_info(Keyword::SSH_KEY);
             return info;
         }
         case AuthenticationType::HTTP:
         {
-            static const auto info = make_info("HTTP");
+            static const auto info = make_info(Keyword::HTTP);
             return info;
         }
         case AuthenticationType::MAX:
diff --git a/src/Access/Common/AuthenticationType.h b/src/Access/Common/AuthenticationType.h
index e81b9e6e439..506c8abd3b1 100644
--- a/src/Access/Common/AuthenticationType.h
+++ b/src/Access/Common/AuthenticationType.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <base/types.h>
+#include <Parsers/CommonParsers.h>
 
 namespace DB
 {
@@ -33,8 +34,8 @@ enum class AuthenticationType
     /// Password is encrypted in bcrypt hash.
     BCRYPT_PASSWORD,
 
-    /// Server sends a random string named `challenge` which client needs to encrypt with private key.
-    /// The check is performed on server side by decrypting the data and comparing with the original string.
+    /// Server sends a random string named `challenge` to the client. The client encrypts it with its SSH private key.
+    /// The server decrypts the result using the SSH public key registered for the user and compares with the original string.
     SSH_KEY,
 
     /// Authentication through HTTP protocol
@@ -45,7 +46,7 @@ enum class AuthenticationType
 
 struct AuthenticationTypeInfo
 {
-    const char * const raw_name;
+    Keyword keyword; // Keyword used in parser
     const String name; /// Lowercased with underscores, e.g. "sha256_password".
     bool is_password;
     static const AuthenticationTypeInfo & get(AuthenticationType type_);
@@ -53,7 +54,7 @@ struct AuthenticationTypeInfo
 
 inline String toString(AuthenticationType type_)
 {
-    return AuthenticationTypeInfo::get(type_).raw_name;
+    return String(toStringView(AuthenticationTypeInfo::get(type_).keyword));
 }
 
 }
diff --git a/src/Access/Common/QuotaDefs.cpp b/src/Access/Common/QuotaDefs.cpp
index 4136fd52a00..2a22b80f65d 100644
--- a/src/Access/Common/QuotaDefs.cpp
+++ b/src/Access/Common/QuotaDefs.cpp
@@ -2,6 +2,7 @@
 #include <Common/Exception.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <base/range.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -49,66 +50,135 @@ String QuotaTypeInfo::valueToStringWithName(QuotaValue value) const
 
 const QuotaTypeInfo & QuotaTypeInfo::get(QuotaType type)
 {
-    static constexpr auto make_info = [](const char * raw_name_, UInt64 output_denominator_)
+    static constexpr auto make_info = [](const char * raw_name_, String current_usage_description_, String max_allowed_usage_description_, UInt64 output_denominator_)
     {
         String init_name = raw_name_;
         boost::to_lower(init_name);
         String init_keyword = raw_name_;
         boost::replace_all(init_keyword, "_", " ");
         bool init_output_as_float = (output_denominator_ != 1);
-        return QuotaTypeInfo{raw_name_, std::move(init_name), std::move(init_keyword), init_output_as_float, output_denominator_};
+        return QuotaTypeInfo
+        {
+            .raw_name = raw_name_,
+            .name = std::move(init_name),
+            .keyword = std::move(init_keyword),
+            .current_usage_description = std::move(current_usage_description_),
+            .max_allowed_usage_description = std::move(max_allowed_usage_description_),
+            .output_as_float = init_output_as_float,
+            .output_denominator = output_denominator_
+        };
     };
 
     switch (type)
     {
         case QuotaType::QUERIES:
         {
-            static const auto info = make_info("QUERIES", 1);
+            static const auto info = make_info(
+                "QUERIES",
+                "The current number of executed queries.",
+                "The maximum allowed number of queries of all types allowed to be executed.",
+                1
+            );
             return info;
         }
         case QuotaType::QUERY_SELECTS:
         {
-            static const auto info = make_info("QUERY_SELECTS", 1);
+            static const auto info = make_info(
+                "QUERY_SELECTS",
+                "The current number of executed SELECT queries.",
+                "The maximum allowed number of SELECT queries allowed to be executed.",
+                1
+            );
             return info;
         }
         case QuotaType::QUERY_INSERTS:
         {
-            static const auto info = make_info("QUERY_INSERTS", 1);
+            static const auto info = make_info(
+                "QUERY_INSERTS",
+                "The current number of executed INSERT queries.",
+                "The maximum allowed number of INSERT queries allowed to be executed.",
+                1
+            );
             return info;
         }
         case QuotaType::ERRORS:
         {
-            static const auto info = make_info("ERRORS", 1);
+            static const auto info = make_info(
+                "ERRORS",
+                "The current number of queries resulted in an error.",
+                "The maximum number of queries resulted in an error allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::RESULT_ROWS:
         {
-            static const auto info = make_info("RESULT_ROWS", 1);
+            static const auto info = make_info(
+                "RESULT_ROWS",
+                "The current total number of rows in the result set of all queries within the current period of time.",
+                "The maximum total number of rows in the result set of all queries allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::RESULT_BYTES:
         {
-            static const auto info = make_info("RESULT_BYTES", 1);
+            static const auto info = make_info(
+                "RESULT_BYTES",
+                "The current total number of bytes in the result set of all queries within the current period of time.",
+                "The maximum total number of bytes in the result set of all queries allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::READ_ROWS:
         {
-            static const auto info = make_info("READ_ROWS", 1);
+            static const auto info = make_info(
+                "READ_ROWS",
+                "The current total number of rows read during execution of all queries within the current period of time.",
+                "The maximum number of rows to read during execution of all queries allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::READ_BYTES:
         {
-            static const auto info = make_info("READ_BYTES", 1);
+            static const auto info = make_info(
+                "READ_BYTES",
+                "The current total number of bytes read during execution of all queries within the current period of time.",
+                "The maximum number of bytes to read during execution of all queries allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::EXECUTION_TIME:
         {
-            static const auto info = make_info("EXECUTION_TIME", 1000000000 /* execution_time is stored in nanoseconds */);
+            static const auto info = make_info(
+                "EXECUTION_TIME",
+                "The current total amount of time (in nanoseconds) spent to execute queries within the current period of time",
+                "The maximum amount of time (in nanoseconds) allowed for all queries to execute within the specified period of time",
+                1000000000 /* execution_time is stored in nanoseconds */
+            );
             return info;
         }
         case QuotaType::WRITTEN_BYTES:
         {
-            static const auto info = make_info("WRITTEN_BYTES", 1);
+            static const auto info = make_info(
+                "WRITTEN_BYTES",
+                "The current total number of bytes written during execution of all queries within the current period of time.",
+                "The maximum number of bytes to written during execution of all queries allowed within the specified period of time.",
+                1
+            );
+            return info;
+        }
+        case QuotaType::FAILED_SEQUENTIAL_AUTHENTICATIONS:
+        {
+            static const auto info = make_info(
+                "FAILED_SEQUENTIAL_AUtheNTICATIONS",
+                "The current number of consecutive authentication failures within the current period of time.",
+                "The maximum number of consecutive authentication failures allowed within the specified period of time.",
+                1
+            );
             return info;
         }
         case QuotaType::MAX: break;
diff --git a/src/Access/Common/QuotaDefs.h b/src/Access/Common/QuotaDefs.h
index dfe2b56ef31..6618f01c8f9 100644
--- a/src/Access/Common/QuotaDefs.h
+++ b/src/Access/Common/QuotaDefs.h
@@ -11,16 +11,17 @@ using QuotaValue = UInt64;
 /// Kinds of resource what we wish to quota.
 enum class QuotaType
 {
-    QUERIES,        /// Number of queries.
-    QUERY_SELECTS,  /// Number of select queries.
-    QUERY_INSERTS,  /// Number of insert queries.
-    ERRORS,         /// Number of queries with exceptions.
-    RESULT_ROWS,    /// Number of rows returned as result.
-    RESULT_BYTES,   /// Number of bytes returned as result.
-    READ_ROWS,      /// Number of rows read from tables.
-    READ_BYTES,     /// Number of bytes read from tables.
-    EXECUTION_TIME, /// Total amount of query execution time in nanoseconds.
-    WRITTEN_BYTES,  /// Number of bytes written to tables.
+    QUERIES,                                /// Number of queries.
+    QUERY_SELECTS,                          /// Number of select queries.
+    QUERY_INSERTS,                          /// Number of insert queries.
+    ERRORS,                                 /// Number of queries with exceptions.
+    RESULT_ROWS,                            /// Number of rows returned as result.
+    RESULT_BYTES,                           /// Number of bytes returned as result.
+    READ_ROWS,                              /// Number of rows read from tables.
+    READ_BYTES,                             /// Number of bytes read from tables.
+    EXECUTION_TIME,                         /// Total amount of query execution time in nanoseconds.
+    WRITTEN_BYTES,                          /// Number of bytes written to tables.
+    FAILED_SEQUENTIAL_AUTHENTICATIONS,      /// Number of recent failed authentications.
 
     MAX
 };
@@ -32,6 +33,8 @@ struct QuotaTypeInfo
     const char * const raw_name = "";
     const String name;    /// Lowercased with underscores, e.g. "result_rows".
     const String keyword; /// Uppercased with spaces, e.g. "RESULT ROWS".
+    const String current_usage_description;
+    const String max_allowed_usage_description;
     const bool output_as_float = false;
     const UInt64 output_denominator = 1;
     String valueToString(QuotaValue value) const;
diff --git a/src/Access/Common/RowPolicyDefs.cpp b/src/Access/Common/RowPolicyDefs.cpp
index b1f882fe971..a9509b6dd76 100644
--- a/src/Access/Common/RowPolicyDefs.cpp
+++ b/src/Access/Common/RowPolicyDefs.cpp
@@ -33,7 +33,7 @@ String toString(RowPolicyFilterType type)
 
 const RowPolicyFilterTypeInfo & RowPolicyFilterTypeInfo::get(RowPolicyFilterType type_)
 {
-    static constexpr auto make_info = [](const char * raw_name_)
+    static constexpr auto make_info = [](const char * raw_name_, const String & comment_)
     {
         String init_name = raw_name_;
         boost::to_lower(init_name);
@@ -41,14 +41,17 @@ const RowPolicyFilterTypeInfo & RowPolicyFilterTypeInfo::get(RowPolicyFilterType
         String init_command = init_name.substr(0, underscore_pos);
         boost::to_upper(init_command);
         bool init_is_check = (std::string_view{init_name}.substr(underscore_pos + 1) == "check");
-        return RowPolicyFilterTypeInfo{raw_name_, std::move(init_name), std::move(init_command), init_is_check};
+        return RowPolicyFilterTypeInfo{raw_name_, std::move(init_name), std::move(init_command), comment_, init_is_check};
     };
 
     switch (type_)
     {
         case RowPolicyFilterType::SELECT_FILTER:
         {
-            static const auto info = make_info("SELECT_FILTER");
+            static const auto info = make_info(
+                "SELECT_FILTER",
+                "Expression which is used for filtering in SELECT queries."
+            );
             return info;
         }
 #if 0 /// Row-level security for INSERT, UPDATE, DELETE is not implemented yet.
diff --git a/src/Access/Common/RowPolicyDefs.h b/src/Access/Common/RowPolicyDefs.h
index 7ffc99e1272..bf2f632e98b 100644
--- a/src/Access/Common/RowPolicyDefs.h
+++ b/src/Access/Common/RowPolicyDefs.h
@@ -52,6 +52,7 @@ struct RowPolicyFilterTypeInfo
     const char * const raw_name;
     const String name;    /// Lowercased with underscores, e.g. "select_filter".
     const String command; /// Uppercased without last word, e.g. "SELECT".
+    const String description;
     const bool is_check;  /// E.g. false for SELECT_FILTER.
     static const RowPolicyFilterTypeInfo & get(RowPolicyFilterType type);
 };
diff --git a/src/Access/Common/SQLSecurityDefs.h b/src/Access/Common/SQLSecurityDefs.h
new file mode 100644
index 00000000000..adc9b700c53
--- /dev/null
+++ b/src/Access/Common/SQLSecurityDefs.h
@@ -0,0 +1,11 @@
+#pragma once
+#include <Core/Types.h>
+
+
+/// SQL security enum. Used in ASTSQLSecurity::type. For more info, please refer to the docs/sql-reference/statements/create/view.md#sql_security
+enum class SQLSecurityType : uint8_t
+{
+    INVOKER,  /// All queries will be executed with the current user's context.
+    DEFINER, /// All queries will be executed with the specified user's context.
+    NONE, /// All queries will be executed with the global context.
+};
diff --git a/src/Access/ContextAccess.cpp b/src/Access/ContextAccess.cpp
index 567b131c00e..0943e797e3f 100644
--- a/src/Access/ContextAccess.cpp
+++ b/src/Access/ContextAccess.cpp
@@ -298,7 +298,7 @@ void ContextAccess::setUser(const UserPtr & user_) const
     }
 
     user_name = user->getName();
-    trace_log = &Poco::Logger::get("ContextAccess (" + user_name + ")");
+    trace_log = getLogger("ContextAccess (" + user_name + ")");
 
     std::vector<UUID> current_roles, current_roles_with_admin_option;
     if (params.use_default_roles)
diff --git a/src/Access/ContextAccess.h b/src/Access/ContextAccess.h
index caf903b85bd..237c423d261 100644
--- a/src/Access/ContextAccess.h
+++ b/src/Access/ContextAccess.h
@@ -185,9 +185,10 @@ private:
 
     mutable std::atomic<bool> initialized = false; // can be removed after Bug 5504 is resolved
     mutable std::atomic<bool> user_was_dropped = false;
-    mutable std::atomic<Poco::Logger *> trace_log = nullptr;
 
     mutable std::mutex mutex;
+    /// TODO: Fix race
+    mutable LoggerPtr trace_log;
     mutable UserPtr user TSA_GUARDED_BY(mutex);
     mutable String user_name TSA_GUARDED_BY(mutex);
     mutable scope_guard subscription_for_user_change TSA_GUARDED_BY(mutex);
diff --git a/src/Access/ContextAccessParams.cpp b/src/Access/ContextAccessParams.cpp
index ec839a37b1a..07374e9bbf5 100644
--- a/src/Access/ContextAccessParams.cpp
+++ b/src/Access/ContextAccessParams.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 
 ContextAccessParams::ContextAccessParams(
-    const std::optional<UUID> user_id_,
+    std::optional<UUID> user_id_,
     bool full_access_,
     bool use_default_roles_,
     const std::shared_ptr<const std::vector<UUID>> & current_roles_,
diff --git a/src/Access/ContextAccessParams.h b/src/Access/ContextAccessParams.h
index 8b68fa44ed4..07503a3af6d 100644
--- a/src/Access/ContextAccessParams.h
+++ b/src/Access/ContextAccessParams.h
@@ -15,7 +15,7 @@ class ContextAccessParams
 {
 public:
     ContextAccessParams(
-        const std::optional<UUID> user_id_,
+        std::optional<UUID> user_id_,
         bool full_access_,
         bool use_default_roles_,
         const std::shared_ptr<const std::vector<UUID>> & current_roles_,
diff --git a/src/Access/Credentials.h b/src/Access/Credentials.h
index 77b90eaaebc..d04f8a66541 100644
--- a/src/Access/Credentials.h
+++ b/src/Access/Credentials.h
@@ -3,6 +3,7 @@
 #include <base/types.h>
 #include <memory>
 
+#include "config.h"
 
 namespace DB
 {
@@ -86,10 +87,11 @@ class MySQLNative41Credentials : public CredentialsWithScramble
     using CredentialsWithScramble::CredentialsWithScramble;
 };
 
+#if USE_SSH
 class SshCredentials : public Credentials
 {
 public:
-    explicit SshCredentials(const String& user_name_, const String& signature_, const String& original_)
+    SshCredentials(const String & user_name_, const String & signature_, const String & original_)
         : Credentials(user_name_), signature(signature_), original(original_)
     {
         is_ready = true;
@@ -117,5 +119,6 @@ private:
     String signature;
     String original;
 };
+#endif
 
 }
diff --git a/src/Access/DiskAccessStorage.cpp b/src/Access/DiskAccessStorage.cpp
index 190c7567b85..3c20ef3d102 100644
--- a/src/Access/DiskAccessStorage.cpp
+++ b/src/Access/DiskAccessStorage.cpp
@@ -47,7 +47,7 @@ namespace
     }
 
 
-    AccessEntityPtr tryReadEntityFile(const String & file_path, Poco::Logger & log)
+    AccessEntityPtr tryReadEntityFile(const String & file_path, LoggerPtr log)
     {
         try
         {
@@ -55,7 +55,7 @@ namespace
         }
         catch (...)
         {
-            tryLogCurrentException(&log);
+            tryLogCurrentException(log);
             return nullptr;
         }
     }
@@ -378,7 +378,7 @@ void DiskAccessStorage::reloadAllAndRebuildLists()
             continue;
 
         const auto access_entity_file_path = getEntityFilePath(directory_path, id);
-        auto entity = tryReadEntityFile(access_entity_file_path, *getLogger());
+        auto entity = tryReadEntityFile(access_entity_file_path, getLogger());
         if (!entity)
             continue;
 
diff --git a/src/Access/EnabledQuota.cpp b/src/Access/EnabledQuota.cpp
index a61e795f741..98cce586a54 100644
--- a/src/Access/EnabledQuota.cpp
+++ b/src/Access/EnabledQuota.cpp
@@ -105,6 +105,16 @@ struct EnabledQuota::Impl
         std::uniform_int_distribution<Int64> distribution{0, count - 1};
         return std::chrono::system_clock::duration(distribution(thread_local_rng));
     }
+
+    static void resetQuotaValue(const Intervals & intervals, QuotaType quota_type, QuotaValue value, std::chrono::system_clock::time_point current_time)
+    {
+        const auto quota_type_i = static_cast<size_t>(quota_type);
+        for (const auto & interval : intervals.intervals)
+        {
+            interval.used[quota_type_i] = value;
+            interval.getEndOfInterval(current_time);
+        }
+    }
 };
 
 
@@ -285,6 +295,12 @@ void EnabledQuota::checkExceeded(QuotaType quota_type) const
 }
 
 
+void EnabledQuota::reset(QuotaType quota_type) const
+{
+    const auto loaded = intervals.load();
+    Impl::resetQuotaValue(*loaded, quota_type, 0, std::chrono::system_clock::now());
+}
+
 std::optional<QuotaUsage> EnabledQuota::getUsage() const
 {
     auto loaded = intervals.load();
diff --git a/src/Access/EnabledQuota.h b/src/Access/EnabledQuota.h
index ed1e06fa1f2..c4665da5dc6 100644
--- a/src/Access/EnabledQuota.h
+++ b/src/Access/EnabledQuota.h
@@ -52,6 +52,8 @@ public:
     void checkExceeded() const;
     void checkExceeded(QuotaType quota_type) const;
 
+    void reset(QuotaType quota_type) const;
+
     /// Returns the information about quota consumption.
     std::optional<QuotaUsage> getUsage() const;
 
diff --git a/src/Access/ExternalAuthenticators.cpp b/src/Access/ExternalAuthenticators.cpp
index 981a7aafc6f..77812ac5eb5 100644
--- a/src/Access/ExternalAuthenticators.cpp
+++ b/src/Access/ExternalAuthenticators.cpp
@@ -242,7 +242,10 @@ HTTPAuthClientParams parseHTTPAuthParams(const Poco::Util::AbstractConfiguration
     size_t connection_timeout_ms = config.getInt(prefix + ".connection_timeout_ms", 1000);
     size_t receive_timeout_ms = config.getInt(prefix + ".receive_timeout_ms", 1000);
     size_t send_timeout_ms = config.getInt(prefix + ".send_timeout_ms", 1000);
-    http_auth_params.timeouts = ConnectionTimeouts{connection_timeout_ms, receive_timeout_ms, send_timeout_ms};
+    http_auth_params.timeouts = ConnectionTimeouts()
+        .withConnectionTimeout(Poco::Timespan(connection_timeout_ms * 1000))
+        .withReceiveTimeout(Poco::Timespan(receive_timeout_ms * 1000))
+        .withSendTimeout(Poco::Timespan(send_timeout_ms * 1000));
 
     http_auth_params.max_tries = config.getInt(prefix + ".max_tries", 3);
     http_auth_params.retry_initial_backoff_ms = config.getInt(prefix + ".retry_initial_backoff_ms", 50);
@@ -276,7 +279,7 @@ void ExternalAuthenticators::reset()
     resetImpl();
 }
 
-void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfiguration & config, Poco::Logger * log)
+void ExternalAuthenticators::setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log)
 {
     std::lock_guard lock(mutex);
     resetImpl();
diff --git a/src/Access/ExternalAuthenticators.h b/src/Access/ExternalAuthenticators.h
index 46c51f0d2f3..3a710e6df26 100644
--- a/src/Access/ExternalAuthenticators.h
+++ b/src/Access/ExternalAuthenticators.h
@@ -36,7 +36,7 @@ class ExternalAuthenticators
 {
 public:
     void reset();
-    void setConfiguration(const Poco::Util::AbstractConfiguration & config, Poco::Logger * log);
+    void setConfiguration(const Poco::Util::AbstractConfiguration & config, LoggerPtr log);
 
     // The name and readiness of the credentials must be verified before calling these.
     bool checkLDAPCredentials(const String & server, const BasicCredentials & credentials,
diff --git a/src/Access/GSSAcceptor.cpp b/src/Access/GSSAcceptor.cpp
index 02946f0d74d..cfa1af6a200 100644
--- a/src/Access/GSSAcceptor.cpp
+++ b/src/Access/GSSAcceptor.cpp
@@ -328,7 +328,7 @@ void GSSAcceptorContext::initHandles()
     }
 }
 
-String GSSAcceptorContext::processToken(const String & input_token, Poco::Logger * log)
+String GSSAcceptorContext::processToken(const String & input_token, LoggerPtr log)
 {
     std::lock_guard lock(gss_global_mutex);
 
@@ -455,7 +455,7 @@ void GSSAcceptorContext::initHandles()
 {
 }
 
-String GSSAcceptorContext::processToken(const String &, Poco::Logger *)
+String GSSAcceptorContext::processToken(const String &, LoggerPtr)
 {
     throw Exception(ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME, "ClickHouse was built without GSS-API/Kerberos support");
 }
diff --git a/src/Access/GSSAcceptor.h b/src/Access/GSSAcceptor.h
index ba448ae474e..225e03056ac 100644
--- a/src/Access/GSSAcceptor.h
+++ b/src/Access/GSSAcceptor.h
@@ -3,6 +3,7 @@
 #include "config.h"
 
 #include <Access/Credentials.h>
+#include <Common/Logger.h>
 #include <base/types.h>
 #include <memory>
 
@@ -33,7 +34,7 @@ public:
     };
 
     explicit GSSAcceptorContext(const Params & params_);
-    virtual ~GSSAcceptorContext() override;
+    ~GSSAcceptorContext() override;
 
     GSSAcceptorContext(const GSSAcceptorContext &) = delete;
     GSSAcceptorContext(GSSAcceptorContext &&) = delete;
@@ -42,7 +43,7 @@ public:
 
     const String & getRealm() const;
     bool isFailed() const;
-    MAYBE_NORETURN String processToken(const String & input_token, Poco::Logger * log);
+    MAYBE_NORETURN String processToken(const String & input_token, LoggerPtr log);
 
 private:
     void reset();
diff --git a/src/Access/HTTPAuthClient.h b/src/Access/HTTPAuthClient.h
index 5a8a3031a84..a8b56cf05a7 100644
--- a/src/Access/HTTPAuthClient.h
+++ b/src/Access/HTTPAuthClient.h
@@ -24,7 +24,7 @@ class HTTPAuthClient
 public:
     using Result = TResponseParser::Result;
 
-    HTTPAuthClient(const HTTPAuthClientParams & params, const TResponseParser & parser_ = TResponseParser{})
+    explicit HTTPAuthClient(const HTTPAuthClientParams & params, const TResponseParser & parser_ = TResponseParser{})
         : timeouts{params.timeouts}
         , max_tries{params.max_tries}
         , retry_initial_backoff_ms{params.retry_initial_backoff_ms}
@@ -36,7 +36,7 @@ public:
 
     Result authenticateRequest(Poco::Net::HTTPRequest & request) const
     {
-        auto session = makeHTTPSession(uri, timeouts);
+        auto session = makeHTTPSession(HTTPConnectionGroupType::HTTP, uri, timeouts);
         Poco::Net::HTTPResponse response;
 
         auto milliseconds_to_wait = retry_initial_backoff_ms;
diff --git a/src/Access/IAccessStorage.cpp b/src/Access/IAccessStorage.cpp
index 222f38b41b6..1d6b8d99cd5 100644
--- a/src/Access/IAccessStorage.cpp
+++ b/src/Access/IAccessStorage.cpp
@@ -6,6 +6,7 @@
 #include <Backups/BackupEntriesCollector.h>
 #include <Common/Exception.h>
 #include <Common/quoteString.h>
+#include <Common/callOnce.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
 #include <Poco/UUIDGenerator.h>
@@ -615,7 +616,7 @@ UUID IAccessStorage::generateRandomID()
 }
 
 
-void IAccessStorage::clearConflictsInEntitiesList(std::vector<std::pair<UUID, AccessEntityPtr>> & entities, const Poco::Logger * log_)
+void IAccessStorage::clearConflictsInEntitiesList(std::vector<std::pair<UUID, AccessEntityPtr>> & entities, LoggerPtr log_)
 {
     std::unordered_map<UUID, size_t> positions_by_id;
     std::unordered_map<std::string_view, size_t> positions_by_type_and_name[static_cast<size_t>(AccessEntityType::MAX)];
@@ -671,12 +672,13 @@ void IAccessStorage::clearConflictsInEntitiesList(std::vector<std::pair<UUID, Ac
 }
 
 
-Poco::Logger * IAccessStorage::getLogger() const
+LoggerPtr IAccessStorage::getLogger() const
 {
-    Poco::Logger * ptr = log.load();
-    if (!ptr)
-        log.store(ptr = &Poco::Logger::get("Access(" + storage_name + ")"), std::memory_order_relaxed);
-    return ptr;
+    callOnce(log_initialized, [&] {
+        log = ::getLogger("Access(" + storage_name + ")");
+    });
+
+    return log;
 }
 
 
diff --git a/src/Access/IAccessStorage.h b/src/Access/IAccessStorage.h
index 797318438e1..b00c8bac849 100644
--- a/src/Access/IAccessStorage.h
+++ b/src/Access/IAccessStorage.h
@@ -6,12 +6,15 @@
 #include <Parsers/IParser.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Common/SettingsChanges.h>
+#include <Common/callOnce.h>
 
 #include <atomic>
 #include <functional>
 #include <optional>
 #include <vector>
 
+#include <boost/noncopyable.hpp>
+
 
 namespace Poco { class Logger; }
 namespace Poco::Net { class IPAddress; }
@@ -30,7 +33,7 @@ struct AuthResult
 {
     UUID user_id;
     /// Session settings received from authentication server (if any)
-    SettingsChanges settings;
+    SettingsChanges settings{};
 };
 
 /// Contains entities, i.e. instances of classes derived from IAccessEntity.
@@ -225,9 +228,9 @@ protected:
         SettingsChanges & settings) const;
     virtual bool isAddressAllowed(const User & user, const Poco::Net::IPAddress & address) const;
     static UUID generateRandomID();
-    Poco::Logger * getLogger() const;
+    LoggerPtr getLogger() const;
     static String formatEntityTypeWithName(AccessEntityType type, const String & name) { return AccessEntityTypeInfo::get(type).formatEntityNameWithType(name); }
-    static void clearConflictsInEntitiesList(std::vector<std::pair<UUID, AccessEntityPtr>> & entities, const Poco::Logger * log_);
+    static void clearConflictsInEntitiesList(std::vector<std::pair<UUID, AccessEntityPtr>> & entities, LoggerPtr log_);
     [[noreturn]] void throwNotFound(const UUID & id) const;
     [[noreturn]] void throwNotFound(AccessEntityType type, const String & name) const;
     [[noreturn]] static void throwBadCast(const UUID & id, AccessEntityType type, const String & name, AccessEntityType required_type);
@@ -246,7 +249,9 @@ protected:
 
 private:
     const String storage_name;
-    mutable std::atomic<Poco::Logger *> log = nullptr;
+
+    mutable OnceFlag log_initialized;
+    mutable LoggerPtr log = nullptr;
 };
 
 
diff --git a/src/Access/KerberosInit.cpp b/src/Access/KerberosInit.cpp
index 772938ad9b2..3cda1c8e13c 100644
--- a/src/Access/KerberosInit.cpp
+++ b/src/Access/KerberosInit.cpp
@@ -63,7 +63,7 @@ String KerberosInit::fmtError(krb5_error_code code) const
 
 void KerberosInit::init(const String & keytab_file, const String & principal, const String & cache_name)
 {
-    auto * log = &Poco::Logger::get("KerberosInit");
+    auto log = getLogger("KerberosInit");
     LOG_TRACE(log,"Trying to authenticate with Kerberos v5");
 
     krb5_error_code ret;
diff --git a/src/Access/LDAPAccessStorage.cpp b/src/Access/LDAPAccessStorage.cpp
index c271cd39845..b1f10cd2d49 100644
--- a/src/Access/LDAPAccessStorage.cpp
+++ b/src/Access/LDAPAccessStorage.cpp
@@ -204,7 +204,7 @@ void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchR
 }
 
 
-void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, const std::size_t external_roles_hash) const
+void LDAPAccessStorage::assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, std::size_t external_roles_hash) const
 {
     const auto & user_name = user.getName();
     auto & granted_roles = user.granted_roles;
diff --git a/src/Access/LDAPAccessStorage.h b/src/Access/LDAPAccessStorage.h
index b01f58c724a..d5da64e4111 100644
--- a/src/Access/LDAPAccessStorage.h
+++ b/src/Access/LDAPAccessStorage.h
@@ -33,29 +33,29 @@ public:
     static constexpr char STORAGE_TYPE[] = "ldap";
 
     explicit LDAPAccessStorage(const String & storage_name_, AccessControl & access_control_, const Poco::Util::AbstractConfiguration & config, const String & prefix);
-    virtual ~LDAPAccessStorage() override = default;
+    ~LDAPAccessStorage() override = default;
 
     String getLDAPServerName() const;
 
     // IAccessStorage implementations.
-    virtual const char * getStorageType() const override;
-    virtual String getStorageParamsJSON() const override;
-    virtual bool isReadOnly() const override { return true; }
-    virtual bool exists(const UUID & id) const override;
+    const char * getStorageType() const override;
+    String getStorageParamsJSON() const override;
+    bool isReadOnly() const override { return true; }
+    bool exists(const UUID & id) const override;
 
 private: // IAccessStorage implementations.
-    virtual std::optional<UUID> findImpl(AccessEntityType type, const String & name) const override;
-    virtual std::vector<UUID> findAllImpl(AccessEntityType type) const override;
-    virtual AccessEntityPtr readImpl(const UUID & id, bool throw_if_not_exists) const override;
-    virtual std::optional<std::pair<String, AccessEntityType>> readNameWithTypeImpl(const UUID & id, bool throw_if_not_exists) const override;
-    virtual std::optional<AuthResult> authenticateImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool throw_if_user_not_exists, bool allow_no_password, bool allow_plaintext_password) const override;
+    std::optional<UUID> findImpl(AccessEntityType type, const String & name) const override;
+    std::vector<UUID> findAllImpl(AccessEntityType type) const override;
+    AccessEntityPtr readImpl(const UUID & id, bool throw_if_not_exists) const override;
+    std::optional<std::pair<String, AccessEntityType>> readNameWithTypeImpl(const UUID & id, bool throw_if_not_exists) const override;
+    std::optional<AuthResult> authenticateImpl(const Credentials & credentials, const Poco::Net::IPAddress & address, const ExternalAuthenticators & external_authenticators, bool throw_if_user_not_exists, bool allow_no_password, bool allow_plaintext_password) const override;
 
     void setConfiguration(const Poco::Util::AbstractConfiguration & config, const String & prefix);
     void processRoleChange(const UUID & id, const AccessEntityPtr & entity);
 
     void applyRoleChangeNoLock(bool grant, const UUID & role_id, const String & role_name);
     void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles) const;
-    void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, const std::size_t external_roles_hash) const;
+    void assignRolesNoLock(User & user, const LDAPClient::SearchResultsList & external_roles, std::size_t external_roles_hash) const;
     void updateAssignedRolesNoLock(const UUID & id, const String & user_name, const LDAPClient::SearchResultsList & external_roles) const;
     std::set<String> mapExternalRolesNoLock(const LDAPClient::SearchResultsList & external_roles) const;
     bool areLDAPCredentialsValidNoLock(const User & user, const Credentials & credentials,
diff --git a/src/Access/LDAPClient.cpp b/src/Access/LDAPClient.cpp
index 7926298061d..3a0b82b9a76 100644
--- a/src/Access/LDAPClient.cpp
+++ b/src/Access/LDAPClient.cpp
@@ -532,7 +532,7 @@ LDAPClient::SearchResults LDAPClient::search(const SearchParams & search_params)
 
                     for (size_t i = 0; referrals[i]; ++i)
                     {
-                        LOG_WARNING(&Poco::Logger::get("LDAPClient"), "Received reference during LDAP search but not following it: {}", referrals[i]);
+                        LOG_WARNING(getLogger("LDAPClient"), "Received reference during LDAP search but not following it: {}", referrals[i]);
                     }
                 }
 
diff --git a/src/Access/MultipleAccessStorage.cpp b/src/Access/MultipleAccessStorage.cpp
index aa9329d488c..03d690de0bd 100644
--- a/src/Access/MultipleAccessStorage.cpp
+++ b/src/Access/MultipleAccessStorage.cpp
@@ -179,7 +179,7 @@ ConstStoragePtr MultipleAccessStorage::getStorage(const UUID & id) const
     return const_cast<MultipleAccessStorage *>(this)->getStorage(id);
 }
 
-StoragePtr MultipleAccessStorage::findStorageByName(const DB::String & storage_name)
+StoragePtr MultipleAccessStorage::findStorageByName(const String & storage_name)
 {
     auto storages = getStoragesInternal();
     for (const auto & storage : *storages)
@@ -192,13 +192,13 @@ StoragePtr MultipleAccessStorage::findStorageByName(const DB::String & storage_n
 }
 
 
-ConstStoragePtr MultipleAccessStorage::findStorageByName(const DB::String & storage_name) const
+ConstStoragePtr MultipleAccessStorage::findStorageByName(const String & storage_name) const
 {
     return const_cast<MultipleAccessStorage *>(this)->findStorageByName(storage_name);
 }
 
 
-StoragePtr MultipleAccessStorage::getStorageByName(const DB::String & storage_name)
+StoragePtr MultipleAccessStorage::getStorageByName(const String & storage_name)
 {
     auto storage = findStorageByName(storage_name);
     if (storage)
@@ -208,12 +208,12 @@ StoragePtr MultipleAccessStorage::getStorageByName(const DB::String & storage_na
 }
 
 
-ConstStoragePtr MultipleAccessStorage::getStorageByName(const DB::String & storage_name) const
+ConstStoragePtr MultipleAccessStorage::getStorageByName(const String & storage_name) const
 {
     return const_cast<MultipleAccessStorage *>(this)->getStorageByName(storage_name);
 }
 
-StoragePtr MultipleAccessStorage::findExcludingStorage(AccessEntityType type, const DB::String & name, DB::MultipleAccessStorage::StoragePtr exclude) const
+StoragePtr MultipleAccessStorage::findExcludingStorage(AccessEntityType type, const String & name, DB::MultipleAccessStorage::StoragePtr exclude) const
 {
     auto storages = getStoragesInternal();
     for (const auto & storage : *storages)
diff --git a/src/Access/QuotaCache.cpp b/src/Access/QuotaCache.cpp
index 3c25c8833f3..dc49e9680ad 100644
--- a/src/Access/QuotaCache.cpp
+++ b/src/Access/QuotaCache.cpp
@@ -30,7 +30,7 @@ void QuotaCache::QuotaInfo::setQuota(const QuotaPtr & quota_, const UUID & quota
 }
 
 
-String QuotaCache::QuotaInfo::calculateKey(const EnabledQuota & enabled) const
+String QuotaCache::QuotaInfo::calculateKey(const EnabledQuota & enabled, bool throw_if_client_key_empty) const
 {
     const auto & params = enabled.params;
     switch (quota->key_type)
@@ -55,8 +55,15 @@ String QuotaCache::QuotaInfo::calculateKey(const EnabledQuota & enabled) const
         {
             if (!params.client_key.empty())
                 return params.client_key;
-            throw Exception(ErrorCodes::QUOTA_REQUIRES_CLIENT_KEY, "Quota {} (for user {}) requires a client supplied key.",
-                quota->getName(), params.user_name);
+
+            if (throw_if_client_key_empty)
+                throw Exception(
+                    ErrorCodes::QUOTA_REQUIRES_CLIENT_KEY,
+                    "Quota {} (for user {}) requires a client supplied key.",
+                    quota->getName(),
+                    params.user_name);
+            else
+                return ""; // Authentication quota has no client key at time of authentication.
         }
         case QuotaKeyType::CLIENT_KEY_OR_USER_NAME:
         {
@@ -165,7 +172,14 @@ QuotaCache::QuotaCache(const AccessControl & access_control_)
 QuotaCache::~QuotaCache() = default;
 
 
-std::shared_ptr<const EnabledQuota> QuotaCache::getEnabledQuota(const UUID & user_id, const String & user_name, const boost::container::flat_set<UUID> & enabled_roles, const Poco::Net::IPAddress & client_address, const String & forwarded_address, const String & client_key)
+std::shared_ptr<const EnabledQuota> QuotaCache::getEnabledQuota(
+    const UUID & user_id,
+    const String & user_name,
+    const boost::container::flat_set<UUID> & enabled_roles,
+    const Poco::Net::IPAddress & client_address,
+    const String & forwarded_address,
+    const String & client_key,
+    bool throw_if_client_key_empty)
 {
     std::lock_guard lock{mutex};
     ensureAllQuotasRead();
@@ -188,11 +202,10 @@ std::shared_ptr<const EnabledQuota> QuotaCache::getEnabledQuota(const UUID & use
 
     auto res = std::shared_ptr<EnabledQuota>(new EnabledQuota(params));
     enabled_quotas.emplace(std::move(params), res);
-    chooseQuotaToConsumeFor(*res);
+    chooseQuotaToConsumeFor(*res, throw_if_client_key_empty);
     return res;
 }
 
-
 void QuotaCache::ensureAllQuotasRead()
 {
     /// `mutex` is already locked.
@@ -257,13 +270,13 @@ void QuotaCache::chooseQuotaToConsume()
             i = enabled_quotas.erase(i);
         else
         {
-            chooseQuotaToConsumeFor(*elem);
+            chooseQuotaToConsumeFor(*elem, true);
             ++i;
         }
     }
 }
 
-void QuotaCache::chooseQuotaToConsumeFor(EnabledQuota & enabled)
+void QuotaCache::chooseQuotaToConsumeFor(EnabledQuota & enabled, bool throw_if_client_key_empty)
 {
     /// `mutex` is already locked.
     boost::shared_ptr<const Intervals> intervals;
@@ -271,7 +284,7 @@ void QuotaCache::chooseQuotaToConsumeFor(EnabledQuota & enabled)
     {
         if (info.roles->match(enabled.params.user_id, enabled.params.enabled_roles))
         {
-            String key = info.calculateKey(enabled);
+            String key = info.calculateKey(enabled, throw_if_client_key_empty);
             intervals = info.getOrBuildIntervals(key);
             break;
         }
diff --git a/src/Access/QuotaCache.h b/src/Access/QuotaCache.h
index 883ddfe47a8..97cf2d19c2f 100644
--- a/src/Access/QuotaCache.h
+++ b/src/Access/QuotaCache.h
@@ -28,7 +28,8 @@ public:
         const boost::container::flat_set<UUID> & enabled_roles,
         const Poco::Net::IPAddress & address,
         const String & forwarded_address,
-        const String & client_key);
+        const String & client_key,
+        bool throw_if_client_key_empty);
 
     std::vector<QuotaUsage> getAllQuotasUsage() const;
 
@@ -41,7 +42,7 @@ private:
         QuotaInfo(const QuotaPtr & quota_, const UUID & quota_id_) { setQuota(quota_, quota_id_); }
         void setQuota(const QuotaPtr & quota_, const UUID & quota_id_);
 
-        String calculateKey(const EnabledQuota & enabled_quota) const;
+        String calculateKey(const EnabledQuota & enabled_quota, bool throw_if_client_key_empty) const;
         boost::shared_ptr<const Intervals> getOrBuildIntervals(const String & key);
         boost::shared_ptr<const Intervals> rebuildIntervals(const String & key, std::chrono::system_clock::time_point current_time);
         void rebuildAllIntervals();
@@ -56,7 +57,7 @@ private:
     void quotaAddedOrChanged(const UUID & quota_id, const std::shared_ptr<const Quota> & new_quota);
     void quotaRemoved(const UUID & quota_id);
     void chooseQuotaToConsume();
-    void chooseQuotaToConsumeFor(EnabledQuota & enabled_quota);
+    void chooseQuotaToConsumeFor(EnabledQuota & enabled_quota, bool throw_if_client_key_empty);
 
     const AccessControl & access_control;
     mutable std::mutex mutex;
diff --git a/src/Access/RowPolicyCache.cpp b/src/Access/RowPolicyCache.cpp
index bb9da674477..c1c4928d0da 100644
--- a/src/Access/RowPolicyCache.cpp
+++ b/src/Access/RowPolicyCache.cpp
@@ -86,12 +86,12 @@ void RowPolicyCache::PolicyInfo::setPolicy(const RowPolicyPtr & policy_)
         try
         {
             ParserExpression parser;
-            parsed_filters[filter_type_i] = parseQuery(parser, filter, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+            parsed_filters[filter_type_i] = parseQuery(parser, filter, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
         }
         catch (...)
         {
             tryLogCurrentException(
-                &Poco::Logger::get("RowPolicy"),
+                getLogger("RowPolicy"),
                 String("Could not parse the condition ") + toString(filter_type) + " of row policy "
                     + backQuote(policy->getName()));
         }
diff --git a/src/Access/SettingsAuthResponseParser.cpp b/src/Access/SettingsAuthResponseParser.cpp
index 62d15f1dcfc..a90ae61f93a 100644
--- a/src/Access/SettingsAuthResponseParser.cpp
+++ b/src/Access/SettingsAuthResponseParser.cpp
@@ -37,7 +37,7 @@ SettingsAuthResponseParser::parse(const Poco::Net::HTTPResponse & response, std:
     }
     catch (...)
     {
-        LOG_INFO(&Poco::Logger::get("HTTPAuthentication"), "Failed to parse settings from authentication response. Skip it.");
+        LOG_INFO(getLogger("HTTPAuthentication"), "Failed to parse settings from authentication response. Skip it.");
     }
     return result;
 }
diff --git a/src/Access/User.cpp b/src/Access/User.cpp
index 91477e5f3aa..ef5cf722113 100644
--- a/src/Access/User.cpp
+++ b/src/Access/User.cpp
@@ -1,4 +1,5 @@
 #include <Access/User.h>
+#include <Common/StringUtils/StringUtils.h>
 #include <Core/Protocol.h>
 #include <base/insertAtEnd.h>
 
@@ -30,7 +31,7 @@ void User::setName(const String & name_)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "User name is empty");
     if (name_ == EncodedUserInfo::USER_INTERSERVER_MARKER)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "User name '{}' is reserved", name_);
-    if (startsWith(name_, EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER))
+    if (name_.starts_with(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "User name '{}' is reserved", name_);
     name = name_;
 }
diff --git a/src/Access/UsersConfigAccessStorage.cpp b/src/Access/UsersConfigAccessStorage.cpp
index 2b0fb3f9b2e..e3c45eb45ae 100644
--- a/src/Access/UsersConfigAccessStorage.cpp
+++ b/src/Access/UsersConfigAccessStorage.cpp
@@ -1,6 +1,5 @@
 #include <Access/UsersConfigAccessStorage.h>
 #include <Access/Quota.h>
-#include <Common/SSH/Wrappers.h>
 #include <Access/RowPolicy.h>
 #include <Access/User.h>
 #include <Access/Role.h>
@@ -10,6 +9,7 @@
 #include <Access/AccessChangesNotifier.h>
 #include <Dictionaries/IDictionary.h>
 #include <Common/Config/ConfigReloader.h>
+#include <Common/SSHWrapper.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/quoteString.h>
 #include <Common/transformEndianness.h>
@@ -66,7 +66,7 @@ namespace
 
         String error_message;
         const char * pos = string_query.data();
-        auto ast = tryParseQuery(parser, pos, pos + string_query.size(), error_message, false, "", false, 0, 0);
+        auto ast = tryParseQuery(parser, pos, pos + string_query.size(), error_message, false, "", false, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
 
         if (!ast)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Failed to parse grant query. Error: {}", error_message);
@@ -209,12 +209,12 @@ namespace
         }
         else if (has_ssh_keys)
         {
-#if USE_SSL
+#if USE_SSH
             user->auth_data = AuthenticationData{AuthenticationType::SSH_KEY};
 
             Poco::Util::AbstractConfiguration::Keys entries;
             config.keys(ssh_keys_config, entries);
-            std::vector<ssh::SSHKey> keys;
+            std::vector<SSHKey> keys;
             for (const String& entry : entries)
             {
                 const auto conf_pref = ssh_keys_config + "." + entry + ".";
@@ -237,7 +237,7 @@ namespace
 
                     try
                     {
-                        keys.emplace_back(ssh::SSHKeyFactory::makePublicFromBase64(base64_key, type));
+                        keys.emplace_back(SSHKeyFactory::makePublicKeyFromBase64(base64_key, type));
                     }
                     catch (const std::invalid_argument &)
                     {
@@ -249,7 +249,7 @@ namespace
             }
             user->auth_data.setSSHKeys(std::move(keys));
 #else
-            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without OpenSSL");
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
 #endif
         }
         else if (has_http_auth)
diff --git a/src/Access/tests/gtest_access_rights_ops.cpp b/src/Access/tests/gtest_access_rights_ops.cpp
index a7594503992..97acef1c9eb 100644
--- a/src/Access/tests/gtest_access_rights_ops.cpp
+++ b/src/Access/tests/gtest_access_rights_ops.cpp
@@ -51,9 +51,10 @@ TEST(AccessRights, Union)
               "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 PULLING REPLICATION LOG, SYSTEM CLEANUP, SYSTEM VIEWS, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, "
+              "SYSTEM MOVES, SYSTEM PULLING REPLICATION LOG, SYSTEM CLEANUP, SYSTEM VIEWS, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM VIRTUAL PARTS UPDATE, "
               "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.*, GRANT NAMED COLLECTION ADMIN ON db1");
+              "SYSTEM RESTORE REPLICA, SYSTEM WAIT LOADING PARTS, SYSTEM SYNC DATABASE REPLICA, SYSTEM FLUSH DISTRIBUTED, dictGet ON db1.*, "
+              "GRANT SET DEFINER ON db1, GRANT NAMED COLLECTION ADMIN ON db1");
 }
 
 
diff --git a/src/AggregateFunctions/AggregateFunctionAny.cpp b/src/AggregateFunctions/AggregateFunctionAny.cpp
index a6010ff07c3..f727ab04aa9 100644
--- a/src/AggregateFunctions/AggregateFunctionAny.cpp
+++ b/src/AggregateFunctions/AggregateFunctionAny.cpp
@@ -1,5 +1,5 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/HelpersMinMaxAny.h>
+#include <AggregateFunctions/SingleValueData.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <base/defines.h>
@@ -11,219 +11,347 @@ struct Settings;
 
 namespace ErrorCodes
 {
-    extern const int INCORRECT_DATA;
-    extern const int LOGICAL_ERROR;
+extern const int NOT_IMPLEMENTED;
 }
 
 namespace
 {
-struct AggregateFunctionAnyRespectNullsData
+
+template <typename Data>
+class AggregateFunctionAny final : public IAggregateFunctionDataHelper<Data, AggregateFunctionAny<Data>>
 {
-    enum Status : UInt8
-    {
-        NotSet = 1,
-        SetNull = 2,
-        SetOther = 3
-    };
-
-    Status status = Status::NotSet;
-    Field value;
-
-    bool isSet() const { return status != Status::NotSet; }
-    void setNull() { status = Status::SetNull; }
-    void setOther() { status = Status::SetOther; }
-};
-
-template <bool First>
-class AggregateFunctionAnyRespectNulls final
-    : public IAggregateFunctionDataHelper<AggregateFunctionAnyRespectNullsData, AggregateFunctionAnyRespectNulls<First>>
-{
-public:
-    using Data = AggregateFunctionAnyRespectNullsData;
-
+private:
     SerializationPtr serialization;
-    const bool returns_nullable_type = false;
 
-    explicit AggregateFunctionAnyRespectNulls(const DataTypePtr & type)
-        : IAggregateFunctionDataHelper<Data, AggregateFunctionAnyRespectNulls<First>>({type}, {}, type)
-        , serialization(type->getDefaultSerialization())
-        , returns_nullable_type(type->isNullable())
+public:
+    explicit AggregateFunctionAny(const DataTypes & argument_types_)
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionAny<Data>>(argument_types_, {}, argument_types_[0])
+        , serialization(this->result_type->getDefaultSerialization())
     {
     }
 
-    String getName() const override
-    {
-        if constexpr (First)
-            return "any_respect_nulls";
-        else
-            return "anyLast_respect_nulls";
-    }
+    String getName() const override { return "any"; }
 
-    bool allocatesMemoryInArena() const override { return false; }
-
-    void addNull(AggregateDataPtr __restrict place) const
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
     {
-        chassert(returns_nullable_type);
-        auto & d = this->data(place);
-        if (First && d.isSet())
-            return;
-        d.setNull();
-    }
-
-    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
-    {
-        if (columns[0]->isNullable())
-        {
-            if (columns[0]->isNullAt(row_num))
-                return addNull(place);
-        }
-        auto & d = this->data(place);
-        if (First && d.isSet())
-            return;
-        d.setOther();
-        columns[0]->get(row_num, d.value);
-    }
-
-    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
-    {
-        if (columns[0]->isNullable())
-            addNull(place);
-        else
-            add(place, columns, 0, arena);
+        if (!this->data(place).has())
+            this->data(place).set(*columns[0], row_num, arena);
     }
 
     void addBatchSinglePlace(
-        size_t row_begin, size_t row_end, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos)
-        const override
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
     {
+        if (this->data(place).has() || row_begin >= row_end)
+            return;
+
         if (if_argument_pos >= 0)
         {
-            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-            size_t size = row_end - row_begin;
-            for (size_t i = 0; i < size; ++i)
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            for (size_t i = row_begin; i < row_end; i++)
             {
-                size_t pos = First ? row_begin + i : row_end - 1 - i;
-                if (flags[pos])
+                if (if_map.data()[i] != 0)
                 {
-                    add(place, columns, pos, arena);
-                    break;
+                    this->data(place).set(*columns[0], i, arena);
+                    return;
                 }
             }
         }
-        else if (row_begin < row_end)
+        else
         {
-            size_t pos = First ? row_begin : row_end - 1;
-            add(place, columns, pos, arena);
+            this->data(place).set(*columns[0], row_begin, arena);
         }
     }
 
     void addBatchSinglePlaceNotNull(
-        size_t, size_t, AggregateDataPtr __restrict, const IColumn **, const UInt8 *, Arena *, ssize_t) const override
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        const UInt8 * __restrict null_map,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
     {
-        /// This should not happen since it means somebody else has preprocessed the data (NULLs or IFs) and might
-        /// have discarded values that we need (NULLs)
-        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionAnyRespectNulls::addBatchSinglePlaceNotNull called");
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
-    {
-        auto & d = this->data(place);
-        if (First && d.isSet())
+        if (this->data(place).has() || row_begin >= row_end)
             return;
 
-        auto & other = this->data(rhs);
-        if (other.isSet())
+        if (if_argument_pos >= 0)
         {
-            d.status = other.status;
-            d.value = other.value;
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (if_map.data()[i] != 0 && null_map[i] == 0)
+                {
+                    this->data(place).set(*columns[0], i, arena);
+                    return;
+                }
+            }
         }
+        else
+        {
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (null_map[i] == 0)
+                {
+                    this->data(place).set(*columns[0], i, arena);
+                    return;
+                }
+            }
+        }
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        if (!this->data(place).has())
+            this->data(place).set(*columns[0], 0, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if (!this->data(place).has())
+            this->data(place).set(this->data(rhs), arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        auto & d = this->data(place);
-        UInt8 k = d.status;
-
-        writeBinaryLittleEndian<UInt8>(k, buf);
-        if (k == Data::Status::SetOther)
-            serialization->serializeBinary(d.value, buf, {});
+        this->data(place).write(buf, *serialization);
     }
 
-    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
     {
-        auto & d = this->data(place);
-        UInt8 k = Data::Status::NotSet;
-        readBinaryLittleEndian<UInt8>(k, buf);
-        d.status = static_cast<Data::Status>(k);
-        if (d.status == Data::Status::NotSet)
-            return;
-        else if (d.status == Data::Status::SetNull)
-        {
-            if (!returns_nullable_type)
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect type (NULL) in non-nullable {}State", getName());
-            return;
-        }
-        else if (d.status == Data::Status::SetOther)
-            serialization->deserializeBinary(d.value, buf, {});
-        else
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect type ({}) in {}State", static_cast<Int8>(k), getName());
+        this->data(place).read(buf, *serialization, arena);
     }
 
+    bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
+
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        auto & d = this->data(place);
-        if (d.status == Data::Status::SetOther)
-            to.insert(d.value);
-        else
-            to.insertDefault();
+        this->data(place).insertResultInto(to);
     }
 
-    AggregateFunctionPtr getOwnNullAdapter(
-        const AggregateFunctionPtr & original_function,
-        const DataTypes & /*arguments*/,
-        const Array & /*params*/,
-        const AggregateFunctionProperties & /*properties*/) const override
+#if USE_EMBEDDED_COMPILER
+    bool isCompilable() const override
     {
-        return original_function;
+        if constexpr (!Data::is_compilable)
+            return false;
+        else
+            return Data::isCompilable(*this->argument_types[0]);
     }
+
+    void compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileCreate(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileAny(builder, aggregate_data_ptr, arguments[0].value);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void
+    compileMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileAnyMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            return Data::compileGetResult(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+#endif
 };
 
-
-template <bool First>
-IAggregateFunction * createAggregateFunctionSingleValueRespectNulls(
-    const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+AggregateFunctionPtr
+createAggregateFunctionAny(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    assertNoParameters(name, parameters);
-    assertUnary(name, argument_types);
-
-    return new AggregateFunctionAnyRespectNulls<First>(argument_types[0]);
+    return AggregateFunctionPtr(
+        createAggregateFunctionSingleValue<AggregateFunctionAny, /* unary */ true>(name, argument_types, parameters, settings));
 }
 
-AggregateFunctionPtr createAggregateFunctionAny(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionAnyData>(name, argument_types, parameters, settings));
-}
 
-AggregateFunctionPtr createAggregateFunctionAnyRespectNulls(
+template <typename Data>
+class AggregateFunctionAnyLast final : public IAggregateFunctionDataHelper<Data, AggregateFunctionAnyLast<Data>>
+{
+private:
+    SerializationPtr serialization;
+
+public:
+    explicit AggregateFunctionAnyLast(const DataTypes & argument_types_)
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionAnyLast<Data>>(argument_types_, {}, argument_types_[0])
+        , serialization(this->result_type->getDefaultSerialization())
+    {
+    }
+
+    String getName() const override { return "anyLast"; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        this->data(place).set(*columns[0], row_num, arena);
+    }
+
+    void addBatchSinglePlace(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (row_begin >= row_end)
+            return;
+
+        size_t batch_size = row_end - row_begin;
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            for (size_t i = 0; i < batch_size; i++)
+            {
+                size_t pos = (row_end - 1) - i;
+                if (if_map.data()[pos] != 0)
+                {
+                    this->data(place).set(*columns[0], pos, arena);
+                    return;
+                }
+            }
+        }
+        else
+        {
+            this->data(place).set(*columns[0], row_end - 1, arena);
+        }
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        const UInt8 * __restrict null_map,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (row_begin >= row_end)
+            return;
+
+        size_t batch_size = row_end - row_begin;
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            for (size_t i = 0; i < batch_size; i++)
+            {
+                size_t pos = (row_end - 1) - i;
+                if (if_map.data()[pos] != 0 && null_map[pos] == 0)
+                {
+                    this->data(place).set(*columns[0], pos, arena);
+                    return;
+                }
+            }
+        }
+        else
+        {
+            for (size_t i = 0; i < batch_size; i++)
+            {
+                size_t pos = (row_end - 1) - i;
+                if (null_map[pos] == 0)
+                {
+                    this->data(place).set(*columns[0], pos, arena);
+                    return;
+                }
+            }
+        }
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        this->data(place).set(*columns[0], 0, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        this->data(place).set(this->data(rhs), arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        this->data(place).write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        this->data(place).read(buf, *serialization, arena);
+    }
+
+    bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        this->data(place).insertResultInto(to);
+    }
+
+#if USE_EMBEDDED_COMPILER
+    bool isCompilable() const override
+    {
+        if constexpr (!Data::is_compilable)
+            return false;
+        else
+            return Data::isCompilable(*this->argument_types[0]);
+    }
+
+    void compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileCreate(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileAnyLast(builder, aggregate_data_ptr, arguments[0].value);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void
+    compileMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileAnyLastMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            return Data::compileGetResult(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+#endif
+};
+
+AggregateFunctionPtr createAggregateFunctionAnyLast(
     const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValueRespectNulls<true>(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));
-}
-
-AggregateFunctionPtr createAggregateFunctionAnyLastRespectNulls(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionSingleValueRespectNulls<false>(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));
+    return AggregateFunctionPtr(
+        createAggregateFunctionSingleValue<AggregateFunctionAnyLast, /* unary */ true>(name, argument_types, parameters, settings));
 }
 
 }
@@ -231,27 +359,11 @@ AggregateFunctionPtr createAggregateFunctionAnyHeavy(const std::string & name, c
 void registerAggregateFunctionsAny(AggregateFunctionFactory & factory)
 {
     AggregateFunctionProperties default_properties = {.returns_default_when_only_null = false, .is_order_dependent = true};
-    AggregateFunctionProperties default_properties_for_respect_nulls
-        = {.returns_default_when_only_null = false, .is_order_dependent = true, .is_window_function = true};
 
     factory.registerFunction("any", {createAggregateFunctionAny, default_properties});
     factory.registerAlias("any_value", "any", AggregateFunctionFactory::CaseInsensitive);
     factory.registerAlias("first_value", "any", AggregateFunctionFactory::CaseInsensitive);
-
-    factory.registerFunction("any_respect_nulls", {createAggregateFunctionAnyRespectNulls, default_properties_for_respect_nulls});
-    factory.registerAlias("any_value_respect_nulls", "any_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
-    factory.registerAlias("first_value_respect_nulls", "any_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
-
     factory.registerFunction("anyLast", {createAggregateFunctionAnyLast, default_properties});
     factory.registerAlias("last_value", "anyLast", AggregateFunctionFactory::CaseInsensitive);
-
-    factory.registerFunction("anyLast_respect_nulls", {createAggregateFunctionAnyLastRespectNulls, default_properties_for_respect_nulls});
-    factory.registerAlias("last_value_respect_nulls", "anyLast_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
-
-    factory.registerFunction("anyHeavy", {createAggregateFunctionAnyHeavy, default_properties});
-
-    factory.registerNullsActionTransformation("any", "any_respect_nulls");
-    factory.registerNullsActionTransformation("anyLast", "anyLast_respect_nulls");
 }
-
 }
diff --git a/src/AggregateFunctions/AggregateFunctionAnyHeavy.cpp b/src/AggregateFunctions/AggregateFunctionAnyHeavy.cpp
new file mode 100644
index 00000000000..ffddd46f2e3
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionAnyHeavy.cpp
@@ -0,0 +1,168 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/SingleValueData.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <base/defines.h>
+
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+/** Implement 'heavy hitters' algorithm.
+  * Selects most frequent value if its frequency is more than 50% in each thread of execution.
+  * Otherwise, selects some arbitrary value.
+  * http://www.cs.umd.edu/~samir/498/karp.pdf
+  */
+struct AggregateFunctionAnyHeavyData
+{
+    using Self = AggregateFunctionAnyHeavyData;
+
+private:
+    SingleValueDataBaseMemoryBlock v_data;
+    UInt64 counter = 0;
+
+public:
+    [[noreturn]] explicit AggregateFunctionAnyHeavyData()
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionAnyHeavyData initialized empty");
+    }
+
+    explicit AggregateFunctionAnyHeavyData(TypeIndex value_type) { generateSingleValueFromTypeIndex(value_type, v_data); }
+
+    ~AggregateFunctionAnyHeavyData() { data().~SingleValueDataBase(); }
+
+    SingleValueDataBase & data() { return v_data.get(); }
+    const SingleValueDataBase & data() const { return v_data.get(); }
+
+    void add(const IColumn & column, size_t row_num, Arena * arena)
+    {
+        if (data().isEqualTo(column, row_num))
+        {
+            ++counter;
+        }
+        else if (counter == 0)
+        {
+            data().set(column, row_num, arena);
+            ++counter;
+        }
+        else
+        {
+            --counter;
+        }
+    }
+
+    void add(const Self & to, Arena * arena)
+    {
+        if (!to.data().has())
+            return;
+
+        if (data().isEqualTo(to.data()))
+            counter += to.counter;
+        else if (!data().has() || counter < to.counter)
+            data().set(to.data(), arena);
+        else
+            counter -= to.counter;
+    }
+
+    void addManyDefaults(const IColumn & column, size_t length, Arena * arena)
+    {
+        for (size_t i = 0; i < length; ++i)
+            add(column, 0, arena);
+    }
+
+    void write(WriteBuffer & buf, const ISerialization & serialization) const
+    {
+        data().write(buf, serialization);
+        writeBinaryLittleEndian(counter, buf);
+    }
+
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena * arena)
+    {
+        data().read(buf, serialization, arena);
+        readBinaryLittleEndian(counter, buf);
+    }
+
+    void insertResultInto(IColumn & to) const { data().insertResultInto(to); }
+};
+
+
+class AggregateFunctionAnyHeavy final : public IAggregateFunctionDataHelper<AggregateFunctionAnyHeavyData, AggregateFunctionAnyHeavy>
+{
+private:
+    SerializationPtr serialization;
+    const TypeIndex value_type_index;
+
+public:
+    explicit AggregateFunctionAnyHeavy(const DataTypePtr & type)
+        : IAggregateFunctionDataHelper<AggregateFunctionAnyHeavyData, AggregateFunctionAnyHeavy>({type}, {}, type)
+        , serialization(type->getDefaultSerialization())
+        , value_type_index(WhichDataType(type).idx)
+    {
+    }
+
+    void create(AggregateDataPtr __restrict place) const override { new (place) AggregateFunctionAnyHeavyData(value_type_index); }
+
+    String getName() const override { return "anyHeavy"; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        data(place).add(*columns[0], row_num, arena);
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        data(place).addManyDefaults(*columns[0], 0, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        data(place).add(data(rhs), arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        data(place).write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        data(place).read(buf, *serialization, arena);
+    }
+
+    bool allocatesMemoryInArena() const override { return singleValueTypeAllocatesMemoryInArena(value_type_index); }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        data(place).insertResultInto(to);
+    }
+};
+
+
+AggregateFunctionPtr
+createAggregateFunctionAnyHeavy(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    const DataTypePtr & res_type = argument_types[0];
+    return AggregateFunctionPtr(new AggregateFunctionAnyHeavy(res_type));
+}
+
+}
+
+void registerAggregateFunctionAnyHeavy(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties default_properties = {.returns_default_when_only_null = false, .is_order_dependent = true};
+    factory.registerFunction("anyHeavy", {createAggregateFunctionAnyHeavy, default_properties});
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionAnyRespectNulls.cpp b/src/AggregateFunctions/AggregateFunctionAnyRespectNulls.cpp
new file mode 100644
index 00000000000..7275409c151
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionAnyRespectNulls.cpp
@@ -0,0 +1,235 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/SingleValueData.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <base/defines.h>
+
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+extern const int INCORRECT_DATA;
+extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+struct AggregateFunctionAnyRespectNullsData
+{
+    enum class Status : UInt8
+    {
+        NotSet = 1,
+        SetNull = 2,
+        SetOther = 3
+    };
+
+    Status status = Status::NotSet;
+    Field value;
+
+    bool isSet() const { return status != Status::NotSet; }
+    void setNull() { status = Status::SetNull; }
+    void setOther() { status = Status::SetOther; }
+};
+
+template <bool First>
+class AggregateFunctionAnyRespectNulls final
+    : public IAggregateFunctionDataHelper<AggregateFunctionAnyRespectNullsData, AggregateFunctionAnyRespectNulls<First>>
+{
+public:
+    using Data = AggregateFunctionAnyRespectNullsData;
+
+    SerializationPtr serialization;
+    const bool returns_nullable_type = false;
+
+    explicit AggregateFunctionAnyRespectNulls(const DataTypePtr & type)
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionAnyRespectNulls<First>>({type}, {}, type)
+        , serialization(type->getDefaultSerialization())
+        , returns_nullable_type(type->isNullable())
+    {
+    }
+
+    String getName() const override
+    {
+        if constexpr (First)
+            return "any_respect_nulls";
+        else
+            return "anyLast_respect_nulls";
+    }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void addNull(AggregateDataPtr __restrict place) const
+    {
+        chassert(returns_nullable_type);
+        auto & d = this->data(place);
+        if (First && d.isSet())
+            return;
+        d.setNull();
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        if (columns[0]->isNullable())
+        {
+            if (columns[0]->isNullAt(row_num))
+                return addNull(place);
+        }
+        auto & d = this->data(place);
+        if (First && d.isSet())
+            return;
+        d.setOther();
+        columns[0]->get(row_num, d.value);
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        if (columns[0]->isNullable())
+            addNull(place);
+        else
+            add(place, columns, 0, arena);
+    }
+
+    void addBatchSinglePlace(
+        size_t row_begin, size_t row_end, AggregateDataPtr place, const IColumn ** columns, Arena * arena, ssize_t if_argument_pos)
+        const override
+    {
+        if (if_argument_pos >= 0)
+        {
+            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            size_t size = row_end - row_begin;
+            for (size_t i = 0; i < size; ++i)
+            {
+                size_t pos = First ? row_begin + i : row_end - 1 - i;
+                if (flags[pos])
+                {
+                    add(place, columns, pos, arena);
+                    break;
+                }
+            }
+        }
+        else if (row_begin < row_end)
+        {
+            size_t pos = First ? row_begin : row_end - 1;
+            add(place, columns, pos, arena);
+        }
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t, size_t, AggregateDataPtr __restrict, const IColumn **, const UInt8 *, Arena *, ssize_t) const override
+    {
+        /// This should not happen since it means somebody else has preprocessed the data (NULLs or IFs) and might
+        /// have discarded values that we need (NULLs)
+        throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionAnyRespectNulls::addBatchSinglePlaceNotNull called");
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        auto & d = this->data(place);
+        if (First && d.isSet())
+            return;
+
+        auto & other = this->data(rhs);
+        if (other.isSet())
+        {
+            d.status = other.status;
+            d.value = other.value;
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        auto & d = this->data(place);
+        UInt8 k = static_cast<UInt8>(d.status);
+
+        writeBinaryLittleEndian<UInt8>(k, buf);
+        if (d.status == Data::Status::SetOther)
+            serialization->serializeBinary(d.value, buf, {});
+    }
+
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
+    {
+        auto & d = this->data(place);
+        UInt8 k = 0;
+        readBinaryLittleEndian<UInt8>(k, buf);
+        d.status = static_cast<Data::Status>(k);
+        if (d.status == Data::Status::NotSet)
+            return;
+        else if (d.status == Data::Status::SetNull)
+        {
+            if (!returns_nullable_type)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect type (NULL) in non-nullable {}State", getName());
+            return;
+        }
+        else if (d.status == Data::Status::SetOther)
+        {
+            serialization->deserializeBinary(d.value, buf, {});
+            return;
+        }
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect type ({}) in {}State", static_cast<Int8>(k), getName());
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        auto & d = this->data(place);
+        if (d.status == Data::Status::SetOther)
+            to.insert(d.value);
+        else
+            to.insertDefault();
+    }
+
+    AggregateFunctionPtr getOwnNullAdapter(
+        const AggregateFunctionPtr & original_function,
+        const DataTypes & /*arguments*/,
+        const Array & /*params*/,
+        const AggregateFunctionProperties & /*properties*/) const override
+    {
+        return original_function;
+    }
+};
+
+
+template <bool First>
+IAggregateFunction * createAggregateFunctionSingleValueRespectNulls(
+    const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    return new AggregateFunctionAnyRespectNulls<First>(argument_types[0]);
+}
+
+AggregateFunctionPtr createAggregateFunctionAnyRespectNulls(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(createAggregateFunctionSingleValueRespectNulls<true>(name, argument_types, parameters, settings));
+}
+
+AggregateFunctionPtr createAggregateFunctionAnyLastRespectNulls(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(createAggregateFunctionSingleValueRespectNulls<false>(name, argument_types, parameters, settings));
+}
+
+}
+
+void registerAggregateFunctionsAnyRespectNulls(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties default_properties_for_respect_nulls
+        = {.returns_default_when_only_null = false, .is_order_dependent = true, .is_window_function = true};
+
+    factory.registerFunction("any_respect_nulls", {createAggregateFunctionAnyRespectNulls, default_properties_for_respect_nulls});
+    factory.registerAlias("any_value_respect_nulls", "any_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("first_value_respect_nulls", "any_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
+
+    factory.registerFunction("anyLast_respect_nulls", {createAggregateFunctionAnyLastRespectNulls, default_properties_for_respect_nulls});
+    factory.registerAlias("last_value_respect_nulls", "anyLast_respect_nulls", AggregateFunctionFactory::CaseInsensitive);
+
+    /// Must happen after registering any and anyLast
+    factory.registerNullsActionTransformation("any", "any_respect_nulls");
+    factory.registerNullsActionTransformation("anyLast", "anyLast_respect_nulls");
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/AggregateFunctionArgMinMax.h
deleted file mode 100644
index e1ba2d10abc..00000000000
--- a/src/AggregateFunctions/AggregateFunctionArgMinMax.h
+++ /dev/null
@@ -1,107 +0,0 @@
-#pragma once
-
-#include <base/StringRef.h>
-#include <DataTypes/IDataType.h>
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <AggregateFunctions/AggregateFunctionMinMaxAny.h> // SingleValueDataString used in embedded compiler
-
-
-namespace DB
-{
-struct Settings;
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int CORRUPTED_DATA;
-}
-
-
-/// For possible values for template parameters, see 'AggregateFunctionMinMaxAny.h'.
-template <typename ResultData, typename ValueData>
-struct AggregateFunctionArgMinMaxData
-{
-    using ResultData_t = ResultData;
-    using ValueData_t = ValueData;
-
-    ResultData result;  // the argument at which the minimum/maximum value is reached.
-    ValueData value;    // value for which the minimum/maximum is calculated.
-
-    static bool allocatesMemoryInArena()
-    {
-        return ResultData::allocatesMemoryInArena() || ValueData::allocatesMemoryInArena();
-    }
-};
-
-/// Returns the first arg value found for the minimum/maximum value. Example: argMax(arg, value).
-template <typename Data>
-class AggregateFunctionArgMinMax final : public IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>
-{
-private:
-    const DataTypePtr & type_val;
-    const SerializationPtr serialization_res;
-    const SerializationPtr serialization_val;
-
-    using Base = IAggregateFunctionDataHelper<Data, AggregateFunctionArgMinMax<Data>>;
-
-public:
-    AggregateFunctionArgMinMax(const DataTypePtr & type_res_, const DataTypePtr & type_val_)
-        : Base({type_res_, type_val_}, {}, type_res_)
-        , type_val(this->argument_types[1])
-        , serialization_res(type_res_->getDefaultSerialization())
-        , serialization_val(type_val->getDefaultSerialization())
-    {
-        if (!type_val->isComparable())
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of second argument of "
-                            "aggregate function {} because the values of that data type are not comparable",
-                            type_val->getName(), getName());
-    }
-
-    String getName() const override
-    {
-        return StringRef(Data::ValueData_t::name()) == StringRef("min") ? "argMin" : "argMax";
-    }
-
-    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
-    {
-        if (this->data(place).value.changeIfBetter(*columns[1], row_num, arena))
-            this->data(place).result.change(*columns[0], row_num, arena);
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
-    {
-        if (this->data(place).value.changeIfBetter(this->data(rhs).value, arena))
-            this->data(place).result.change(this->data(rhs).result, arena);
-    }
-
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
-    {
-        this->data(place).result.write(buf, *serialization_res);
-        this->data(place).value.write(buf, *serialization_val);
-    }
-
-    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
-    {
-        this->data(place).result.read(buf, *serialization_res, arena);
-        this->data(place).value.read(buf, *serialization_val, arena);
-        if (unlikely(this->data(place).value.has() != this->data(place).result.has()))
-            throw Exception(
-                ErrorCodes::CORRUPTED_DATA,
-                "Invalid state of the aggregate function {}: has_value ({}) != has_result ({})",
-                getName(),
-                this->data(place).value.has(),
-                this->data(place).result.has());
-    }
-
-    bool allocatesMemoryInArena() const override
-    {
-        return Data::allocatesMemoryInArena();
-    }
-
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
-    {
-        this->data(place).result.insertResultInto(to);
-    }
-};
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionCount.cpp b/src/AggregateFunctions/AggregateFunctionCount.cpp
index ec91685dbe6..25f991ab693 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.cpp
+++ b/src/AggregateFunctions/AggregateFunctionCount.cpp
@@ -5,6 +5,12 @@
 
 namespace DB
 {
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
 struct Settings;
 
 AggregateFunctionPtr AggregateFunctionCount::getOwnNullAdapter(
@@ -19,7 +25,9 @@ namespace
 AggregateFunctionPtr createAggregateFunctionCount(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
 {
     assertNoParameters(name, parameters);
-    assertArityAtMost<1>(name, argument_types);
+
+    if (argument_types.size() > 1)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires zero or one argument", name);
 
     return std::make_shared<AggregateFunctionCount>(argument_types);
 }
diff --git a/src/AggregateFunctions/AggregateFunctionCount.h b/src/AggregateFunctions/AggregateFunctionCount.h
index 36a8617ba91..f5d6030a777 100644
--- a/src/AggregateFunctions/AggregateFunctionCount.h
+++ b/src/AggregateFunctions/AggregateFunctionCount.h
@@ -219,7 +219,7 @@ public:
         : IAggregateFunctionDataHelper<AggregateFunctionCountData, AggregateFunctionCountNotNullUnary>({argument}, params, createResultType())
     {
         if (!argument->isNullable())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: not Nullable data type passed to AggregateFunctionCountNotNullUnary");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not Nullable data type passed to AggregateFunctionCountNotNullUnary");
     }
 
     String getName() const override { return "count"; }
diff --git a/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
index 8582c8c56fc..3d7d6eff608 100644
--- a/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
+++ b/src/AggregateFunctions/AggregateFunctionExponentialMovingAverage.cpp
@@ -54,30 +54,30 @@ public:
     {
         const auto & value = columns[0]->getFloat64(row_num);
         const auto & time = columns[1]->getFloat64(row_num);
-        this->data(place).add(value, time, half_decay);
+        data(place).add(value, time, half_decay);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
-        this->data(place).merge(this->data(rhs), half_decay);
+        data(place).merge(data(rhs), half_decay);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        writeBinary(this->data(place).value, buf);
-        writeBinary(this->data(place).time, buf);
+        writeBinary(data(place).value, buf);
+        writeBinary(data(place).time, buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
     {
-        readBinary(this->data(place).value, buf);
-        readBinary(this->data(place).time, buf);
+        readBinary(data(place).value, buf);
+        readBinary(data(place).time, buf);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
         auto & column = assert_cast<ColumnVector<Float64> &>(to);
-        column.getData().push_back(this->data(place).get(half_decay));
+        column.getData().push_back(data(place).get(half_decay));
     }
 };
 
diff --git a/src/AggregateFunctions/AggregateFunctionFactory.cpp b/src/AggregateFunctions/AggregateFunctionFactory.cpp
index b6ba562045d..6555ae63128 100644
--- a/src/AggregateFunctions/AggregateFunctionFactory.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFactory.cpp
@@ -1,11 +1,11 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
-
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
+#include <Common/CurrentThread.h>
 
 static constexpr size_t MAX_AGGREGATE_FUNCTION_NAME_LENGTH = 1000;
 
@@ -100,7 +100,7 @@ AggregateFunctionPtr AggregateFunctionFactory::get(
     {
         AggregateFunctionCombinatorPtr combinator = AggregateFunctionCombinatorFactory::instance().tryFindSuffix("Null");
         if (!combinator)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: cannot find aggregate function combinator "
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find aggregate function combinator "
                             "to apply a function to Nullable arguments.");
 
         DataTypes nested_types = combinator->transformArguments(types_without_low_cardinality);
@@ -123,7 +123,7 @@ AggregateFunctionPtr AggregateFunctionFactory::get(
     auto with_original_arguments = getImpl(name, action, types_without_low_cardinality, parameters, out_properties, false);
 
     if (!with_original_arguments)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: AggregateFunctionFactory returned nullptr");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionFactory returned nullptr");
     return with_original_arguments;
 }
 
diff --git a/src/AggregateFunctions/AggregateFunctionFlameGraph.cpp b/src/AggregateFunctions/AggregateFunctionFlameGraph.cpp
index f6aafd9a9b1..33e318b6c2f 100644
--- a/src/AggregateFunctions/AggregateFunctionFlameGraph.cpp
+++ b/src/AggregateFunctions/AggregateFunctionFlameGraph.cpp
@@ -252,7 +252,6 @@ void dumpFlameGraph(
     fillColumn(chars, offsets, out.str());
 }
 
-// NOLINTBEGIN(clang-analyzer-optin.performance.Padding)
 struct AggregateFunctionFlameGraphData
 {
     struct Entry
@@ -469,7 +468,6 @@ struct AggregateFunctionFlameGraphData
         DB::dumpFlameGraph(tree.dump(max_depth, min_bytes), chars, offsets);
     }
 };
-// NOLINTEND(clang-analyzer-optin.performance.Padding)
 
 /// Aggregate function which builds a flamegraph using the list of stacktraces.
 /// The output is an array of strings which can be used by flamegraph.pl util.
@@ -561,7 +559,7 @@ public:
             ptr = ptrs[row_num];
         }
 
-        this->data(place).add(ptr, allocated, trace_values.data() + prev_offset, trace_size, arena);
+        data(place).add(ptr, allocated, trace_values.data() + prev_offset, trace_size, arena);
     }
 
     void addManyDefaults(
@@ -574,7 +572,7 @@ public:
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
-        this->data(place).merge(this->data(rhs), arena);
+        data(place).merge(data(rhs), arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict, WriteBuffer &, std::optional<size_t> /* version */) const override
@@ -592,7 +590,7 @@ public:
         auto & array = assert_cast<ColumnArray &>(to);
         auto & str = assert_cast<ColumnString &>(array.getData());
 
-        this->data(place).dumpFlameGraph(str.getChars(), str.getOffsets(), 0, 0);
+        data(place).dumpFlameGraph(str.getChars(), str.getOffsets(), 0, 0);
 
         array.getOffsets().push_back(str.size());
     }
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
index 6c6397e35d5..63002652166 100644
--- a/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
+++ b/src/AggregateFunctions/AggregateFunctionGroupArray.cpp
@@ -89,10 +89,10 @@ struct GroupArraySamplerData
         chassert(lim != 0);
 
         /// With a large number of values, we will generate random numbers several times slower.
-        if (lim <= static_cast<UInt64>(rng.max()))
+        if (lim <= static_cast<UInt64>(pcg32_fast::max()))
             return rng() % lim;
         else
-            return (static_cast<UInt64>(rng()) * (static_cast<UInt64>(rng.max()) + 1ULL) + static_cast<UInt64>(rng())) % lim;
+            return (static_cast<UInt64>(rng()) * (static_cast<UInt64>(pcg32::max()) + 1ULL) + static_cast<UInt64>(rng())) % lim;
     }
 
     void randomShuffle()
@@ -182,11 +182,14 @@ public:
 
         if constexpr (Trait::sampler == Sampler::NONE)
         {
-            if (limit_num_elems && cur_elems.value.size() >= max_elems)
+            if constexpr (limit_num_elems)
             {
-                if constexpr (Trait::last)
-                    cur_elems.value[(cur_elems.total_values - 1) % max_elems] = row_value;
-                return;
+                if (cur_elems.value.size() >= max_elems)
+                {
+                    if constexpr (Trait::last)
+                        cur_elems.value[(cur_elems.total_values - 1) % max_elems] = row_value;
+                    return;
+                }
             }
 
             cur_elems.value.push_back(row_value, arena);
@@ -236,7 +239,7 @@ public:
 
     void mergeNoSampler(Data & cur_elems, const Data & rhs_elems, Arena * arena) const
     {
-        if (!limit_num_elems)
+        if constexpr (!limit_num_elems)
         {
             if (rhs_elems.value.size())
                 cur_elems.value.insertByOffsets(rhs_elems.value, 0, rhs_elems.value.size(), arena);
@@ -291,8 +294,17 @@ public:
         const UInt64 size = value.size();
         checkArraySize(size, max_elems);
         writeVarUInt(size, buf);
-        for (const auto & element : value)
-            writeBinaryLittleEndian(element, buf);
+
+
+        if constexpr (std::endian::native == std::endian::little)
+        {
+            buf.write(reinterpret_cast<const char *>(value.data()), size * sizeof(value[0]));
+        }
+        else
+        {
+            for (const auto & element : value)
+                writeBinaryLittleEndian(element, buf);
+        }
 
         if constexpr (Trait::last)
             writeBinaryLittleEndian(this->data(place).total_values, buf);
@@ -315,8 +327,16 @@ public:
         auto & value = this->data(place).value;
 
         value.resize_exact(size, arena);
-        for (auto & element : value)
-            readBinaryLittleEndian(element, buf);
+
+        if constexpr (std::endian::native == std::endian::little)
+        {
+            buf.readStrict(reinterpret_cast<char *>(value.data()), size * sizeof(value[0]));
+        }
+        else
+        {
+            for (auto & element : value)
+                readBinaryLittleEndian(element, buf);
+        }
 
         if constexpr (Trait::last)
             readBinaryLittleEndian(this->data(place).total_values, buf);
@@ -440,7 +460,7 @@ struct GroupArrayNodeGeneral : public GroupArrayNodeBase<GroupArrayNodeGeneral>
         return node;
     }
 
-    void insertInto(IColumn & column) { column.deserializeAndInsertFromArena(data()); }
+    void insertInto(IColumn & column) { std::ignore = column.deserializeAndInsertFromArena(data()); }
 };
 
 template <typename Node, bool has_sampler>
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
new file mode 100644
index 00000000000..903adf5c547
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionGroupArrayIntersect.cpp
@@ -0,0 +1,439 @@
+#include <cassert>
+#include <memory>
+
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadHelpersArena.h>
+
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeString.h>
+
+#include <Columns/ColumnArray.h>
+
+#include <Common/HashTable/HashSet.h>
+#include <Common/HashTable/HashTableKeyHolder.h>
+#include <Common/assert_cast.h>
+
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/KeyHolderHelpers.h>
+
+#include <Core/Field.h>
+
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+struct Settings;
+
+
+template <typename T>
+struct AggregateFunctionGroupArrayIntersectData
+{
+    using Set = HashSet<T>;
+
+    Set value;
+    UInt64 version = 0;
+};
+
+
+/// Puts all values to the hash set. Returns an array of unique values. Implemented for numeric types.
+template <typename T>
+class AggregateFunctionGroupArrayIntersect
+    : public IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectData<T>, AggregateFunctionGroupArrayIntersect<T>>
+{
+
+private:
+    using State = AggregateFunctionGroupArrayIntersectData<T>;
+
+public:
+    AggregateFunctionGroupArrayIntersect(const DataTypePtr & argument_type, const Array & parameters_)
+        : IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectData<T>,
+          AggregateFunctionGroupArrayIntersect<T>>({argument_type}, parameters_, argument_type) {}
+
+    AggregateFunctionGroupArrayIntersect(const DataTypePtr & argument_type, const Array & parameters_, const DataTypePtr & result_type_)
+        : IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectData<T>,
+          AggregateFunctionGroupArrayIntersect<T>>({argument_type}, parameters_, result_type_) {}
+
+    String getName() const override { return "GroupArrayIntersect"; }
+
+    bool allocatesMemoryInArena() const override { return false; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
+    {
+        auto & version = this->data(place).version;
+        auto & set = this->data(place).value;
+
+        const auto data_column = assert_cast<const ColumnArray &>(*columns[0]).getDataPtr();
+        const auto & offsets = assert_cast<const ColumnArray &>(*columns[0]).getOffsets();
+        const size_t offset = offsets[static_cast<ssize_t>(row_num) - 1];
+        const auto arr_size = offsets[row_num] - offset;
+
+        ++version;
+        if (version == 1)
+        {
+            for (size_t i = 0; i < arr_size; ++i)
+                set.insert(static_cast<T>((*data_column)[offset + i].get<T>()));
+        }
+        else if (!set.empty())
+        {
+            typename State::Set new_set;
+            for (size_t i = 0; i < arr_size; ++i)
+            {
+                typename State::Set::LookupResult set_value = set.find(static_cast<T>((*data_column)[offset + i].get<T>()));
+                if (set_value != nullptr)
+                    new_set.insert(static_cast<T>((*data_column)[offset + i].get<T>()));
+            }
+            set = std::move(new_set);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
+    {
+        auto & set = this->data(place).value;
+        const auto & rhs_set = this->data(rhs).value;
+
+        if (this->data(rhs).version == 0)
+            return;
+
+        UInt64 version = this->data(place).version++;
+        if (version == 0)
+        {
+            for (auto & rhs_elem : rhs_set)
+                set.insert(rhs_elem.getValue());
+            return;
+        }
+
+        if (!set.empty())
+        {
+            auto create_new_set = [](auto & lhs_val, auto & rhs_val)
+            {
+                typename State::Set new_set;
+                for (auto & lhs_elem : lhs_val)
+                {
+                    auto res = rhs_val.find(lhs_elem.getValue());
+                    if (res != nullptr)
+                        new_set.insert(lhs_elem.getValue());
+                }
+                return new_set;
+            };
+            auto new_set = rhs_set.size() < set.size() ? create_new_set(rhs_set, set) : create_new_set(set, rhs_set);
+            set = std::move(new_set);
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        auto & set = this->data(place).value;
+        auto version = this->data(place).version;
+
+        writeVarUInt(version, buf);
+        writeVarUInt(set.size(), buf);
+
+        for (const auto & elem : set)
+            writeIntBinary(elem.getValue(), buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
+    {
+        readVarUInt(this->data(place).version, buf);
+        this->data(place).value.read(buf);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        ColumnArray & arr_to = assert_cast<ColumnArray &>(to);
+        ColumnArray::Offsets & offsets_to = arr_to.getOffsets();
+
+        const auto & set = this->data(place).value;
+        offsets_to.push_back(offsets_to.back() + set.size());
+
+        typename ColumnVector<T>::Container & data_to = assert_cast<ColumnVector<T> &>(arr_to.getData()).getData();
+        size_t old_size = data_to.size();
+        data_to.resize(old_size + set.size());
+
+        size_t i = 0;
+        for (auto it = set.begin(); it != set.end(); ++it, ++i)
+            data_to[old_size + i] = it->getValue();
+    }
+};
+
+
+/// Generic implementation, it uses serialized representation as object descriptor.
+struct AggregateFunctionGroupArrayIntersectGenericData
+{
+    using Set = HashSet<StringRef>;
+
+    Set value;
+    UInt64 version = 0;
+};
+
+/** Template parameter with true value should be used for columns that store their elements in memory continuously.
+ *  For such columns GroupArrayIntersect() can be implemented more efficiently (especially for small numeric arrays).
+ */
+template <bool is_plain_column = false>
+class AggregateFunctionGroupArrayIntersectGeneric
+    : public IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectGenericData,
+        AggregateFunctionGroupArrayIntersectGeneric<is_plain_column>>
+{
+    const DataTypePtr & input_data_type;
+
+    using State = AggregateFunctionGroupArrayIntersectGenericData;
+
+public:
+    AggregateFunctionGroupArrayIntersectGeneric(const DataTypePtr & input_data_type_, const Array & parameters_)
+        : IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectGenericData, AggregateFunctionGroupArrayIntersectGeneric<is_plain_column>>({input_data_type_}, parameters_, input_data_type_)
+        , input_data_type(this->argument_types[0]) {}
+
+    AggregateFunctionGroupArrayIntersectGeneric(const DataTypePtr & input_data_type_, const Array & parameters_, const DataTypePtr & result_type_)
+        : IAggregateFunctionDataHelper<AggregateFunctionGroupArrayIntersectGenericData, AggregateFunctionGroupArrayIntersectGeneric<is_plain_column>>({input_data_type_}, parameters_, result_type_)
+        , input_data_type(result_type_) {}
+
+    String getName() const override { return "GroupArrayIntersect"; }
+
+    bool allocatesMemoryInArena() const override { return true; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        auto & set = this->data(place).value;
+        auto & version = this->data(place).version;
+        bool inserted;
+        State::Set::LookupResult it;
+
+        const auto data_column = assert_cast<const ColumnArray &>(*columns[0]).getDataPtr();
+        const auto & offsets = assert_cast<const ColumnArray &>(*columns[0]).getOffsets();
+        const size_t offset = offsets[static_cast<ssize_t>(row_num) - 1];
+        const auto arr_size = offsets[row_num] - offset;
+
+        ++version;
+        if (version == 1)
+        {
+            for (size_t i = 0; i < arr_size; ++i)
+            {
+                if constexpr (is_plain_column)
+                    set.emplace(ArenaKeyHolder{data_column->getDataAt(offset + i), *arena}, it, inserted);
+                else
+                {
+                    const char * begin = nullptr;
+                    StringRef serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin);
+                    assert(serialized.data != nullptr);
+                    set.emplace(SerializedKeyHolder{serialized, *arena}, it, inserted);
+                }
+            }
+        }
+        else if (!set.empty())
+        {
+            typename State::Set new_set;
+            for (size_t i = 0; i < arr_size; ++i)
+            {
+                if constexpr (is_plain_column)
+                {
+                    it = set.find(data_column->getDataAt(offset + i));
+                    if (it != nullptr)
+                        new_set.emplace(ArenaKeyHolder{data_column->getDataAt(offset + i), *arena}, it, inserted);
+                }
+                else
+                {
+                    const char * begin = nullptr;
+                    StringRef serialized = data_column->serializeValueIntoArena(offset + i, *arena, begin);
+                    assert(serialized.data != nullptr);
+                    it = set.find(serialized);
+
+                    if (it != nullptr)
+                        new_set.emplace(SerializedKeyHolder{serialized, *arena}, it, inserted);
+                }
+            }
+            set = std::move(new_set);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        auto & set = this->data(place).value;
+        const auto & rhs_value = this->data(rhs).value;
+
+        if (this->data(rhs).version == 0)
+            return;
+
+        UInt64 version = this->data(place).version++;
+        if (version == 0)
+        {
+            bool inserted;
+            State::Set::LookupResult it;
+            for (auto & rhs_elem : rhs_value)
+            {
+                set.emplace(ArenaKeyHolder{rhs_elem.getValue(), *arena}, it, inserted);
+            }
+        }
+        else if (!set.empty())
+        {
+            auto create_new_map = [](auto & lhs_val, auto & rhs_val)
+            {
+                typename State::Set new_map;
+                for (auto & lhs_elem : lhs_val)
+                {
+                    auto val = rhs_val.find(lhs_elem.getValue());
+                    if (val != nullptr)
+                        new_map.insert(lhs_elem.getValue());
+                }
+                return new_map;
+            };
+            auto new_map = rhs_value.size() < set.size() ? create_new_map(rhs_value, set) : create_new_map(set, rhs_value);
+            set = std::move(new_map);
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        auto & set = this->data(place).value;
+        auto & version = this->data(place).version;
+        writeVarUInt(version, buf);
+        writeVarUInt(set.size(), buf);
+
+        for (const auto & elem : set)
+            writeStringBinary(elem.getValue(), buf);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        auto & set = this->data(place).value;
+        auto & version = this->data(place).version;
+        size_t size;
+        readVarUInt(version, buf);
+        readVarUInt(size, buf);
+        set.reserve(size);
+        UInt64 elem_version;
+        for (size_t i = 0; i < size; ++i)
+        {
+            auto key = readStringBinaryInto(*arena, buf);
+            readVarUInt(elem_version, buf);
+            set.insert(key);
+        }
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        ColumnArray & arr_to = assert_cast<ColumnArray &>(to);
+        ColumnArray::Offsets & offsets_to = arr_to.getOffsets();
+        IColumn & data_to = arr_to.getData();
+
+        auto & set = this->data(place).value;
+
+        offsets_to.push_back(offsets_to.back() + set.size());
+
+        for (auto & elem : set)
+        {
+            if constexpr (is_plain_column)
+                data_to.insertData(elem.getValue().data, elem.getValue().size);
+            else
+                std::ignore = data_to.deserializeAndInsertFromArena(elem.getValue().data);
+        }
+    }
+};
+
+namespace
+{
+
+/// Substitute return type for Date and DateTime
+class AggregateFunctionGroupArrayIntersectDate : public AggregateFunctionGroupArrayIntersect<DataTypeDate::FieldType>
+{
+public:
+    explicit AggregateFunctionGroupArrayIntersectDate(const DataTypePtr & argument_type, const Array & parameters_)
+        : AggregateFunctionGroupArrayIntersect<DataTypeDate::FieldType>(argument_type, parameters_, createResultType()) {}
+    static DataTypePtr createResultType() { return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDate>()); }
+};
+
+class AggregateFunctionGroupArrayIntersectDateTime : public AggregateFunctionGroupArrayIntersect<DataTypeDateTime::FieldType>
+{
+public:
+    explicit AggregateFunctionGroupArrayIntersectDateTime(const DataTypePtr & argument_type, const Array & parameters_)
+        : AggregateFunctionGroupArrayIntersect<DataTypeDateTime::FieldType>(argument_type, parameters_, createResultType()) {}
+    static DataTypePtr createResultType() { return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()); }
+};
+
+class AggregateFunctionGroupArrayIntersectDate32 : public AggregateFunctionGroupArrayIntersect<DataTypeDate32::FieldType>
+{
+public:
+    explicit AggregateFunctionGroupArrayIntersectDate32(const DataTypePtr & argument_type, const Array & parameters_)
+        : AggregateFunctionGroupArrayIntersect<DataTypeDate32::FieldType>(argument_type, parameters_, createResultType()) {}
+    static DataTypePtr createResultType() { return std::make_shared<DataTypeArray>(std::make_shared<DataTypeDate32>()); }
+};
+
+IAggregateFunction * createWithExtraTypes(const DataTypePtr & argument_type, const Array & parameters)
+{
+    WhichDataType which(argument_type);
+    if (which.idx == TypeIndex::Date) return new AggregateFunctionGroupArrayIntersectDate(argument_type, parameters);
+    else if (which.idx == TypeIndex::DateTime) return new AggregateFunctionGroupArrayIntersectDateTime(argument_type, parameters);
+    else if (which.idx == TypeIndex::Date32) return new AggregateFunctionGroupArrayIntersectDate32(argument_type, parameters);
+    else if (which.idx == TypeIndex::DateTime64)
+    {
+        const auto * datetime64_type = dynamic_cast<const DataTypeDateTime64 *>(argument_type.get());
+        const auto return_type = std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime64>(datetime64_type->getScale()));
+
+        return new AggregateFunctionGroupArrayIntersectGeneric<true>(argument_type, parameters, return_type);
+    }
+    else
+    {
+        /// Check that we can use plain version of AggregateFunctionGroupArrayIntersectGeneric
+        if (argument_type->isValueUnambiguouslyRepresentedInContiguousMemoryRegion())
+            return new AggregateFunctionGroupArrayIntersectGeneric<true>(argument_type, parameters);
+        else
+            return new AggregateFunctionGroupArrayIntersectGeneric<false>(argument_type, parameters);
+    }
+}
+
+inline AggregateFunctionPtr createAggregateFunctionGroupArrayIntersectImpl(const std::string & name, const DataTypePtr & argument_type, const Array & parameters)
+{
+    const auto & nested_type = dynamic_cast<const DataTypeArray &>(*argument_type).getNestedType();
+    AggregateFunctionPtr res(createWithNumericType<AggregateFunctionGroupArrayIntersect, const DataTypePtr &>(*nested_type, argument_type, parameters));
+    if (!res)
+    {
+        res = AggregateFunctionPtr(createWithExtraTypes(argument_type, parameters));
+    }
+
+    if (!res)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
+                        argument_type->getName(), name);
+
+    return res;
+}
+
+AggregateFunctionPtr createAggregateFunctionGroupArrayIntersect(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertUnary(name, argument_types);
+
+    if (!WhichDataType(argument_types.at(0)).isArray())
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function groupArrayIntersect accepts only array type argument.");
+
+    if (!parameters.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                        "Incorrect number of parameters for aggregate function {}, should be 0", name);
+
+    return createAggregateFunctionGroupArrayIntersectImpl(name, argument_types[0], parameters);
+}
+
+}
+
+void registerAggregateFunctionGroupArrayIntersect(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = false, .is_order_dependent = true };
+
+    factory.registerFunction("groupArrayIntersect", { createAggregateFunctionGroupArrayIntersect, properties });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp b/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp
new file mode 100644
index 00000000000..1ee29c362cd
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionGroupArraySorted.cpp
@@ -0,0 +1,416 @@
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+
+#include <base/sort.h>
+#include <algorithm>
+#include <type_traits>
+#include <utility>
+
+#include <Common/RadixSort.h>
+#include <Common/Exception.h>
+#include <Common/ArenaAllocator.h>
+#include <Common/assert_cast.h>
+
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadBufferFromString.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVector.h>
+
+#include <Columns/IColumn.h>
+#include <Columns/ColumnConst.h>
+
+namespace DB
+{
+
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int TOO_LARGE_ARRAY_SIZE;
+}
+
+namespace
+{
+
+enum class GroupArraySortedStrategy
+{
+    heap,
+    sort
+};
+
+constexpr size_t group_array_sorted_sort_strategy_max_elements_threshold = 1000000;
+
+template <typename T, GroupArraySortedStrategy strategy>
+struct GroupArraySortedData
+{
+    using Allocator = MixedAlignedArenaAllocator<alignof(T), 4096>;
+    using Array = PODArray<T, 32, Allocator>;
+
+    static constexpr size_t partial_sort_max_elements_factor = 2;
+
+    static constexpr bool is_value_generic_field = std::is_same_v<T, Field>;
+
+    Array values;
+
+    static bool compare(const T & lhs, const T & rhs)
+    {
+        if constexpr (is_value_generic_field)
+        {
+            return lhs < rhs;
+        }
+        else
+        {
+            return CompareHelper<T>::less(lhs, rhs, -1);
+        }
+    }
+
+    struct Comparator
+    {
+        bool operator()(const T & lhs, const T & rhs)
+        {
+            return compare(lhs, rhs);
+        }
+    };
+
+    ALWAYS_INLINE void heapReplaceTop()
+    {
+        size_t size = values.size();
+        if (size < 2)
+            return;
+
+        size_t child_index = 1;
+
+        if (values.size() > 2 && compare(values[1], values[2]))
+            ++child_index;
+
+        /// Check if we are in order
+        if (compare(values[child_index], values[0]))
+            return;
+
+        size_t current_index = 0;
+        auto current = values[current_index];
+
+        do
+        {
+            /// We are not in heap-order, swap the parent with it's largest child.
+            values[current_index] = values[child_index];
+            current_index = child_index;
+
+            // Recompute the child based off of the updated parent
+            child_index = 2 * child_index + 1;
+
+            if (child_index >= size)
+                break;
+
+            if ((child_index + 1) < size && compare(values[child_index], values[child_index + 1]))
+            {
+                /// Right child exists and is greater than left child.
+                ++child_index;
+            }
+
+            /// Check if we are in order.
+        } while (!compare(values[child_index], current));
+
+        values[current_index] = current;
+    }
+
+    ALWAYS_INLINE void sortAndLimit(size_t max_elements, Arena * arena)
+    {
+        if constexpr (is_value_generic_field)
+        {
+            ::sort(values.begin(), values.end(), Comparator());
+        }
+        else
+        {
+            bool try_sort = trySort(values.begin(), values.end(), Comparator());
+            if (!try_sort)
+                RadixSort<RadixSortNumTraits<T>>::executeLSD(values.data(), values.size());
+        }
+
+        if (values.size() > max_elements)
+            values.resize(max_elements, arena);
+    }
+
+    ALWAYS_INLINE void partialSortAndLimitIfNeeded(size_t max_elements, Arena * arena)
+    {
+        if (values.size() < max_elements * partial_sort_max_elements_factor)
+            return;
+
+        ::nth_element(values.begin(), values.begin() + max_elements, values.end(), Comparator());
+        values.resize(max_elements, arena);
+    }
+
+    ALWAYS_INLINE void addElement(T && element, size_t max_elements, Arena * arena)
+    {
+        if constexpr (strategy == GroupArraySortedStrategy::heap)
+        {
+            if (values.size() >= max_elements)
+            {
+                /// Element is greater or equal than current max element, it cannot be in k min elements
+                if (!compare(element, values[0]))
+                    return;
+
+                values[0] = std::move(element);
+                heapReplaceTop();
+                return;
+            }
+
+            values.push_back(std::move(element), arena);
+            std::push_heap(values.begin(), values.end(), Comparator());
+        }
+        else
+        {
+            values.push_back(std::move(element), arena);
+            partialSortAndLimitIfNeeded(max_elements, arena);
+        }
+    }
+
+    ALWAYS_INLINE void insertResultInto(IColumn & to, size_t max_elements, Arena * arena)
+    {
+        auto & result_array = assert_cast<ColumnArray &>(to);
+        auto & result_array_offsets = result_array.getOffsets();
+
+        sortAndLimit(max_elements, arena);
+
+        result_array_offsets.push_back(result_array_offsets.back() + values.size());
+
+        if (values.empty())
+            return;
+
+        if constexpr (is_value_generic_field)
+        {
+            auto & result_array_data = result_array.getData();
+            for (auto & value : values)
+                result_array_data.insert(value);
+        }
+        else
+        {
+            auto & result_array_data = assert_cast<ColumnVector<T> &>(result_array.getData()).getData();
+
+            size_t result_array_data_insert_begin = result_array_data.size();
+            result_array_data.resize(result_array_data_insert_begin + values.size());
+
+            for (size_t i = 0; i < values.size(); ++i)
+                result_array_data[result_array_data_insert_begin + i] = values[i];
+        }
+    }
+};
+
+template <typename T>
+using GroupArraySortedDataHeap = GroupArraySortedData<T, GroupArraySortedStrategy::heap>;
+
+template <typename T>
+using GroupArraySortedDataSort = GroupArraySortedData<T, GroupArraySortedStrategy::sort>;
+
+constexpr UInt64 aggregate_function_group_array_sorted_max_element_size = 0xFFFFFF;
+
+template <typename Data, typename T>
+class GroupArraySorted final
+    : public IAggregateFunctionDataHelper<Data, GroupArraySorted<Data, T>>
+{
+public:
+    explicit GroupArraySorted(
+        const DataTypePtr & data_type_, const Array & parameters_, UInt64 max_elements_)
+        : IAggregateFunctionDataHelper<Data, GroupArraySorted<Data, T>>(
+            {data_type_}, parameters_, std::make_shared<DataTypeArray>(data_type_))
+        , max_elements(max_elements_)
+        , serialization(data_type_->getDefaultSerialization())
+    {
+        if (max_elements > aggregate_function_group_array_sorted_max_element_size)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Too large limit parameter for groupArraySorted aggregate function, it should not exceed {}",
+                aggregate_function_group_array_sorted_max_element_size);
+    }
+
+    String getName() const override { return "groupArraySorted"; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        if constexpr (std::is_same_v<T, Field>)
+        {
+            auto row_value = (*columns[0])[row_num];
+            this->data(place).addElement(std::move(row_value), max_elements, arena);
+        }
+        else
+        {
+            auto row_value = assert_cast<const ColumnVector<T> &>(*columns[0]).getData()[row_num];
+            this->data(place).addElement(std::move(row_value), max_elements, arena);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        auto & rhs_values = this->data(rhs).values;
+        for (auto rhs_element : rhs_values)
+            this->data(place).addElement(std::move(rhs_element), max_elements, arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        auto & values = this->data(place).values;
+        size_t size = values.size();
+        writeVarUInt(size, buf);
+
+        if constexpr (std::is_same_v<T, Field>)
+        {
+            for (const Field & element : values)
+            {
+                if (element.isNull())
+                {
+                    writeBinary(false, buf);
+                }
+                else
+                {
+                    writeBinary(true, buf);
+                    serialization->serializeBinary(element, buf, {});
+                }
+            }
+        }
+        else
+        {
+            if constexpr (std::endian::native == std::endian::little)
+            {
+                buf.write(reinterpret_cast<const char *>(values.data()), size * sizeof(values[0]));
+            }
+            else
+            {
+                for (const auto & element : values)
+                    writeBinaryLittleEndian(element, buf);
+            }
+        }
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        size_t size = 0;
+        readVarUInt(size, buf);
+
+        if (unlikely(size > max_elements))
+            throw Exception(ErrorCodes::TOO_LARGE_ARRAY_SIZE, "Too large array size, it should not exceed {}", max_elements);
+
+        auto & values = this->data(place).values;
+        values.resize_exact(size, arena);
+
+        if constexpr (std::is_same_v<T, Field>)
+        {
+            for (Field & element : values)
+            {
+                /// We must initialize the Field type since some internal functions (like operator=) use them
+                new (&element) Field;
+                bool has_value = false;
+                readBinary(has_value, buf);
+                if (has_value)
+                    serialization->deserializeBinary(element, buf, {});
+            }
+        }
+        else
+        {
+            if constexpr (std::endian::native == std::endian::little)
+            {
+                buf.readStrict(reinterpret_cast<char *>(values.data()), size * sizeof(values[0]));
+            }
+            else
+            {
+                for (auto & element : values)
+                    readBinaryLittleEndian(element, buf);
+            }
+        }
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        this->data(place).insertResultInto(to, max_elements, arena);
+    }
+
+    bool allocatesMemoryInArena() const override { return true; }
+
+private:
+    UInt64 max_elements;
+    SerializationPtr serialization;
+};
+
+template <typename T>
+using GroupArraySortedHeap = GroupArraySorted<GroupArraySortedDataHeap<T>, T>;
+
+template <typename T>
+using GroupArraySortedSort = GroupArraySorted<GroupArraySortedDataSort<T>, T>;
+
+template <template <typename> class AggregateFunctionTemplate, typename ... TArgs>
+AggregateFunctionPtr createWithNumericOrTimeType(const IDataType & argument_type, TArgs && ... args)
+{
+    WhichDataType which(argument_type);
+
+    if (which.idx == TypeIndex::Date) return std::make_shared<AggregateFunctionTemplate<UInt16>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::DateTime) return std::make_shared<AggregateFunctionTemplate<UInt32>>(std::forward<TArgs>(args)...);
+    if (which.idx == TypeIndex::IPv4) return std::make_shared<AggregateFunctionTemplate<IPv4>>(std::forward<TArgs>(args)...);
+
+    return AggregateFunctionPtr(createWithNumericType<AggregateFunctionTemplate, TArgs...>(argument_type, std::forward<TArgs>(args)...));
+}
+
+template <template <typename> class AggregateFunctionTemplate, typename ... TArgs>
+inline AggregateFunctionPtr createAggregateFunctionGroupArraySortedImpl(const DataTypePtr & argument_type, const Array & parameters, TArgs ... args)
+{
+    if (auto res = createWithNumericOrTimeType<AggregateFunctionTemplate>(*argument_type, argument_type, parameters, std::forward<TArgs>(args)...))
+        return AggregateFunctionPtr(res);
+
+    return std::make_shared<AggregateFunctionTemplate<Field>>(argument_type, parameters, std::forward<TArgs>(args)...);
+}
+
+AggregateFunctionPtr createAggregateFunctionGroupArray(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertUnary(name, argument_types);
+
+    UInt64 max_elems = std::numeric_limits<UInt64>::max();
+
+    if (parameters.empty())
+    {
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter for aggregate function {} should have limit argument", name);
+    }
+    else if (parameters.size() == 1)
+    {
+        auto type = parameters[0].getType();
+        if (type != Field::Types::Int64 && type != Field::Types::UInt64)
+               throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter for aggregate function {} should be positive number", name);
+
+        if ((type == Field::Types::Int64 && parameters[0].get<Int64>() < 0) ||
+            (type == Field::Types::UInt64 && parameters[0].get<UInt64>() == 0))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Parameter for aggregate function {} should be positive number", name);
+
+        max_elems = parameters[0].get<UInt64>();
+    }
+    else
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Function {} does not support this number of arguments", name);
+
+    if (max_elems > group_array_sorted_sort_strategy_max_elements_threshold)
+        return createAggregateFunctionGroupArraySortedImpl<GroupArraySortedSort>(argument_types[0], parameters, max_elems);
+
+    return createAggregateFunctionGroupArraySortedImpl<GroupArraySortedHeap>(argument_types[0], parameters, max_elems);
+}
+
+}
+
+void registerAggregateFunctionGroupArraySorted(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = false, .is_order_dependent = false };
+
+    factory.registerFunction("groupArraySorted", { createAggregateFunctionGroupArray, properties });
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
index 882150325be..e1224fae2fb 100644
--- a/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionKolmogorovSmirnovTest.cpp
@@ -293,32 +293,32 @@ public:
         Float64 value = columns[0]->getFloat64(row_num);
         UInt8 is_second = columns[1]->getUInt(row_num);
         if (is_second)
-            this->data(place).addY(value, arena);
+            data(place).addY(value, arena);
         else
-            this->data(place).addX(value, arena);
+            data(place).addX(value, arena);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
-        this->data(place).merge(this->data(rhs), arena);
+        data(place).merge(data(rhs), arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf);
+        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);
+        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)
+        if (!data(place).size_x || !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);
+        auto [d_statistic, p_value] = data(place).getResult(alternative, method);
 
         /// Because p-value is a probability.
         p_value = std::min(1.0, std::max(0.0, p_value));
diff --git a/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp b/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
index d5abdbc12fb..b24b6c8996f 100644
--- a/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
+++ b/src/AggregateFunctions/AggregateFunctionLargestTriangleThreeBuckets.cpp
@@ -242,7 +242,7 @@ public:
     {
         Float64 x = getFloat64DataFromColumn(columns[0], row_num, this->x_type);
         Float64 y = getFloat64DataFromColumn(columns[1], row_num, this->y_type);
-        this->data(place).add(x, y, arena);
+        data(place).add(x, y, arena);
     }
 
     Float64 getFloat64DataFromColumn(const IColumn * column, size_t row_num, TypeIndex type_index) const
@@ -264,25 +264,25 @@ public:
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
-        auto & a = this->data(place);
-        const auto & b = this->data(rhs);
+        auto & a = data(place);
+        const auto & b = data(rhs);
 
         a.merge(b, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf);
+        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);
+        data(place).read(buf, arena);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
     {
-        auto res = this->data(place).getResult(total_buckets, arena);
+        auto res = data(place).getResult(total_buckets, arena);
 
         auto & col = assert_cast<ColumnArray &>(to);
         auto & col_offsets = assert_cast<ColumnArray::ColumnOffsets &>(col.getOffsetsColumn());
diff --git a/src/AggregateFunctions/AggregateFunctionMLMethod.h b/src/AggregateFunctions/AggregateFunctionMLMethod.h
index d2200243012..cfb8550d829 100644
--- a/src/AggregateFunctions/AggregateFunctionMLMethod.h
+++ b/src/AggregateFunctions/AggregateFunctionMLMethod.h
@@ -157,7 +157,7 @@ public:
 
     void update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & bias, Float64 learning_rate, const std::vector<Float64> & batch_gradient) override;
 
-    virtual void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
+    void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
 
     void write(WriteBuffer & buf) const override;
 
@@ -189,7 +189,7 @@ public:
 
     void update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & bias, Float64 learning_rate, const std::vector<Float64> & batch_gradient) override;
 
-    virtual void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
+    void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
 
     void write(WriteBuffer & buf) const override;
 
@@ -204,7 +204,7 @@ private:
 class Adam : public IWeightsUpdater
 {
 public:
-    Adam(size_t num_params)
+    explicit Adam(size_t num_params)
     {
         beta1_powered = beta1;
         beta2_powered = beta2;
@@ -226,7 +226,7 @@ public:
 
     void update(UInt64 batch_size, std::vector<Float64> & weights, Float64 & bias, Float64 learning_rate, const std::vector<Float64> & batch_gradient) override;
 
-    virtual void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
+    void merge(const IWeightsUpdater & rhs, Float64 frac, Float64 rhs_frac) override;
 
     void write(WriteBuffer & buf) const override;
 
diff --git a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
index a70da7b35d5..e7bc5df335f 100644
--- a/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
+++ b/src/AggregateFunctions/AggregateFunctionMannWhitney.cpp
@@ -205,35 +205,35 @@ public:
         UInt8 is_second = columns[1]->getUInt(row_num);
 
         if (is_second)
-            this->data(place).addY(value, arena);
+            data(place).addY(value, arena);
         else
-            this->data(place).addX(value, arena);
+            data(place).addX(value, arena);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
-        auto & a = this->data(place);
-        const auto & b = this->data(rhs);
+        auto & a = data(place);
+        const auto & b = data(rhs);
 
         a.merge(b, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf);
+        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);
+        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)
+        if (!data(place).size_x || !data(place).size_y)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Aggregate function {} require both samples to be non empty", getName());
 
-        auto [u_statistic, p_value] = this->data(place).getResult(alternative, continuity_correction);
+        auto [u_statistic, p_value] = data(place).getResult(alternative, continuity_correction);
 
         /// Because p-value is a probability.
         p_value = std::min(1.0, std::max(0.0, p_value));
diff --git a/src/AggregateFunctions/AggregateFunctionMax.cpp b/src/AggregateFunctions/AggregateFunctionMax.cpp
deleted file mode 100644
index e9cd651b8db..00000000000
--- a/src/AggregateFunctions/AggregateFunctionMax.cpp
+++ /dev/null
@@ -1,238 +0,0 @@
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-#include <AggregateFunctions/HelpersMinMaxAny.h>
-#include <Common/Concepts.h>
-#include <Common/findExtreme.h>
-
-namespace DB
-{
-struct Settings;
-
-namespace
-{
-
-template <typename Data>
-class AggregateFunctionsSingleValueMax final : public AggregateFunctionsSingleValue<Data>
-{
-    using Parent = AggregateFunctionsSingleValue<Data>;
-
-public:
-    explicit AggregateFunctionsSingleValueMax(const DataTypePtr & type) : Parent(type) { }
-
-    /// Specializations for native numeric types
-    void addBatchSinglePlace(
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr __restrict place,
-        const IColumn ** __restrict columns,
-        Arena * arena,
-        ssize_t if_argument_pos) const override;
-
-    void addBatchSinglePlaceNotNull(
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr __restrict place,
-        const IColumn ** __restrict columns,
-        const UInt8 * __restrict null_map,
-        Arena * arena,
-        ssize_t if_argument_pos) const override;
-};
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define SPECIALIZE(TYPE) \
-template <> \
-void AggregateFunctionsSingleValueMax<typename DB::AggregateFunctionMaxData<SingleValueDataFixed<TYPE>>>::addBatchSinglePlace( \
-    size_t row_begin, \
-    size_t row_end, \
-    AggregateDataPtr __restrict place, \
-    const IColumn ** __restrict columns, \
-    Arena *, \
-    ssize_t if_argument_pos) const \
-{ \
-    const auto & column = assert_cast<const DB::AggregateFunctionMaxData<SingleValueDataFixed<TYPE>>::ColVecType &>(*columns[0]); \
-    std::optional<TYPE> opt; \
-    if (if_argument_pos >= 0) \
-    { \
-        const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData(); \
-        opt = findExtremeMaxIf(column.getData().data(), flags.data(), row_begin, row_end); \
-    } \
-    else \
-        opt = findExtremeMax(column.getData().data(), row_begin, row_end); \
-    if (opt.has_value()) \
-        this->data(place).changeIfGreater(opt.value()); \
-}
-// NOLINTEND(bugprone-macro-parentheses)
-
-FOR_BASIC_NUMERIC_TYPES(SPECIALIZE)
-#undef SPECIALIZE
-
-template <typename Data>
-void AggregateFunctionsSingleValueMax<Data>::addBatchSinglePlace(
-    size_t row_begin,
-    size_t row_end,
-    AggregateDataPtr __restrict place,
-    const IColumn ** __restrict columns,
-    Arena * arena,
-    ssize_t if_argument_pos) const
-{
-    if constexpr (!is_any_of<typename Data::Impl, SingleValueDataString, SingleValueDataGeneric>)
-    {
-        /// Leave other numeric types (large integers, decimals, etc) to keep doing the comparison as it's
-        /// faster than doing a permutation
-        return Parent::addBatchSinglePlace(row_begin, row_end, place, columns, arena, if_argument_pos);
-    }
-
-    constexpr int nan_direction_hint = 1;
-    auto const & column = *columns[0];
-    if (if_argument_pos >= 0)
-    {
-        size_t index = row_begin;
-        const auto & if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-        while (if_flags[index] == 0 && index < row_end)
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((if_flags[i] != 0) && (column.compareAt(i, index, column, nan_direction_hint) > 0))
-                index = i;
-        }
-        this->data(place).changeIfGreater(column, index, arena);
-    }
-    else
-    {
-        if (row_begin >= row_end)
-            return;
-
-        /// TODO: Introduce row_begin and row_end to getPermutation
-        if (row_begin != 0 || row_end != column.size())
-        {
-            size_t index = row_begin;
-            for (size_t i = index + 1; i < row_end; i++)
-            {
-                if (column.compareAt(i, index, column, nan_direction_hint) > 0)
-                    index = i;
-            }
-            this->data(place).changeIfGreater(column, index, arena);
-        }
-        else
-        {
-            constexpr IColumn::PermutationSortDirection direction = IColumn::PermutationSortDirection::Descending;
-            constexpr IColumn::PermutationSortStability stability = IColumn::PermutationSortStability::Unstable;
-            IColumn::Permutation permutation;
-            constexpr UInt64 limit = 1;
-            column.getPermutation(direction, stability, limit, nan_direction_hint, permutation);
-            this->data(place).changeIfGreater(column, permutation[0], arena);
-        }
-    }
-}
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define SPECIALIZE(TYPE) \
-template <> \
-void AggregateFunctionsSingleValueMax<typename DB::AggregateFunctionMaxData<SingleValueDataFixed<TYPE>>>::addBatchSinglePlaceNotNull( \
-    size_t row_begin, \
-    size_t row_end, \
-    AggregateDataPtr __restrict place, \
-    const IColumn ** __restrict columns, \
-    const UInt8 * __restrict null_map, \
-    Arena *, \
-    ssize_t if_argument_pos) const \
-{ \
-    const auto & column = assert_cast<const DB::AggregateFunctionMaxData<SingleValueDataFixed<TYPE>>::ColVecType &>(*columns[0]); \
-    std::optional<TYPE> opt; \
-    if (if_argument_pos >= 0) \
-    { \
-        const auto * if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData().data(); \
-        auto final_flags = std::make_unique<UInt8[]>(row_end); \
-        for (size_t i = row_begin; i < row_end; ++i) \
-            final_flags[i] = (!null_map[i]) & !!if_flags[i]; \
-        opt = findExtremeMaxIf(column.getData().data(), final_flags.get(), row_begin, row_end); \
-    } \
-    else \
-        opt = findExtremeMaxNotNull(column.getData().data(), null_map, row_begin, row_end); \
-    if (opt.has_value()) \
-        this->data(place).changeIfGreater(opt.value()); \
-}
-// NOLINTEND(bugprone-macro-parentheses)
-
-FOR_BASIC_NUMERIC_TYPES(SPECIALIZE)
-#undef SPECIALIZE
-
-template <typename Data>
-void AggregateFunctionsSingleValueMax<Data>::addBatchSinglePlaceNotNull(
-    size_t row_begin,
-    size_t row_end,
-    AggregateDataPtr __restrict place,
-    const IColumn ** __restrict columns,
-    const UInt8 * __restrict null_map,
-    Arena * arena,
-    ssize_t if_argument_pos) const
-{
-    if constexpr (!is_any_of<typename Data::Impl, SingleValueDataString, SingleValueDataGeneric>)
-    {
-        /// Leave other numeric types (large integers, decimals, etc) to keep doing the comparison as it's
-        /// faster than doing a permutation
-        return Parent::addBatchSinglePlaceNotNull(row_begin, row_end, place, columns, null_map, arena, if_argument_pos);
-    }
-
-    constexpr int nan_direction_hint = 1;
-    auto const & column = *columns[0];
-    if (if_argument_pos >= 0)
-    {
-        size_t index = row_begin;
-        const auto & if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-        while ((if_flags[index] == 0 || null_map[index] != 0) && (index < row_end))
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((if_flags[i] != 0) && (null_map[i] == 0) && (column.compareAt(i, index, column, nan_direction_hint) > 0))
-                index = i;
-        }
-        this->data(place).changeIfGreater(column, index, arena);
-    }
-    else
-    {
-        size_t index = row_begin;
-        while ((null_map[index] != 0) && (index < row_end))
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((null_map[i] == 0) && (column.compareAt(i, index, column, nan_direction_hint) > 0))
-                index = i;
-        }
-        this->data(place).changeIfGreater(column, index, arena);
-    }
-}
-
-AggregateFunctionPtr createAggregateFunctionMax(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValueMax, AggregateFunctionMaxData>(name, argument_types, parameters, settings));
-}
-
-AggregateFunctionPtr createAggregateFunctionArgMax(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMaxData>(name, argument_types, parameters, settings));
-}
-
-}
-
-void registerAggregateFunctionsMax(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("max", createAggregateFunctionMax, AggregateFunctionFactory::CaseInsensitive);
-
-    /// The functions below depend on the order of data.
-    AggregateFunctionProperties properties = { .returns_default_when_only_null = false, .is_order_dependent = true };
-    factory.registerFunction("argMax", { createAggregateFunctionArgMax, properties });
-}
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionMin.cpp b/src/AggregateFunctions/AggregateFunctionMin.cpp
deleted file mode 100644
index d767bd5c563..00000000000
--- a/src/AggregateFunctions/AggregateFunctionMin.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-#include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-#include <AggregateFunctions/HelpersMinMaxAny.h>
-#include <Common/Concepts.h>
-#include <Common/findExtreme.h>
-
-
-namespace DB
-{
-struct Settings;
-
-namespace
-{
-
-template <typename Data>
-class AggregateFunctionsSingleValueMin final : public AggregateFunctionsSingleValue<Data>
-{
-    using Parent = AggregateFunctionsSingleValue<Data>;
-
-public:
-    explicit AggregateFunctionsSingleValueMin(const DataTypePtr & type) : Parent(type) { }
-
-    /// Specializations for native numeric types
-    void addBatchSinglePlace(
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr __restrict place,
-        const IColumn ** __restrict columns,
-        Arena * arena,
-        ssize_t if_argument_pos) const override;
-
-    void addBatchSinglePlaceNotNull(
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr __restrict place,
-        const IColumn ** __restrict columns,
-        const UInt8 * __restrict null_map,
-        Arena * arena,
-        ssize_t if_argument_pos) const override;
-};
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define SPECIALIZE(TYPE) \
-    template <> \
-    void AggregateFunctionsSingleValueMin<typename DB::AggregateFunctionMinData<SingleValueDataFixed<TYPE>>>::addBatchSinglePlace( \
-        size_t row_begin, \
-        size_t row_end, \
-        AggregateDataPtr __restrict place, \
-        const IColumn ** __restrict columns, \
-        Arena *, \
-        ssize_t if_argument_pos) const \
-    { \
-        const auto & column = assert_cast<const DB::AggregateFunctionMinData<SingleValueDataFixed<TYPE>>::ColVecType &>(*columns[0]); \
-        std::optional<TYPE> opt; \
-        if (if_argument_pos >= 0) \
-        { \
-            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData(); \
-            opt = findExtremeMinIf(column.getData().data(), flags.data(), row_begin, row_end); \
-        } \
-        else \
-            opt = findExtremeMin(column.getData().data(), row_begin, row_end); \
-        if (opt.has_value()) \
-            this->data(place).changeIfLess(opt.value()); \
-    }
-// NOLINTEND(bugprone-macro-parentheses)
-
-FOR_BASIC_NUMERIC_TYPES(SPECIALIZE)
-#undef SPECIALIZE
-
-template <typename Data>
-void AggregateFunctionsSingleValueMin<Data>::addBatchSinglePlace(
-    size_t row_begin,
-    size_t row_end,
-    AggregateDataPtr __restrict place,
-    const IColumn ** __restrict columns,
-    Arena * arena,
-    ssize_t if_argument_pos) const
-{
-    if constexpr (!is_any_of<typename Data::Impl, SingleValueDataString, SingleValueDataGeneric>)
-    {
-        /// Leave other numeric types (large integers, decimals, etc) to keep doing the comparison as it's
-        /// faster than doing a permutation
-        return Parent::addBatchSinglePlace(row_begin, row_end, place, columns, arena, if_argument_pos);
-    }
-
-    constexpr int nan_direction_hint = 1;
-    auto const & column = *columns[0];
-    if (if_argument_pos >= 0)
-    {
-        size_t index = row_begin;
-        const auto & if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-        while (if_flags[index] == 0 && index < row_end)
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((if_flags[i] != 0) && (column.compareAt(i, index, column, nan_direction_hint) < 0))
-                index = i;
-        }
-        this->data(place).changeIfLess(column, index, arena);
-    }
-    else
-    {
-        if (row_begin >= row_end)
-            return;
-
-        /// TODO: Introduce row_begin and row_end to getPermutation
-        if (row_begin != 0 || row_end != column.size())
-        {
-            size_t index = row_begin;
-            for (size_t i = index + 1; i < row_end; i++)
-            {
-                if (column.compareAt(i, index, column, nan_direction_hint) < 0)
-                    index = i;
-            }
-            this->data(place).changeIfLess(column, index, arena);
-        }
-        else
-        {
-            constexpr IColumn::PermutationSortDirection direction = IColumn::PermutationSortDirection::Ascending;
-            constexpr IColumn::PermutationSortStability stability = IColumn::PermutationSortStability::Unstable;
-            IColumn::Permutation permutation;
-            constexpr UInt64 limit = 1;
-            column.getPermutation(direction, stability, limit, nan_direction_hint, permutation);
-            this->data(place).changeIfLess(column, permutation[0], arena);
-        }
-    }
-}
-
-// NOLINTBEGIN(bugprone-macro-parentheses)
-#define SPECIALIZE(TYPE) \
-    template <> \
-    void AggregateFunctionsSingleValueMin<typename DB::AggregateFunctionMinData<SingleValueDataFixed<TYPE>>>::addBatchSinglePlaceNotNull( \
-        size_t row_begin, \
-        size_t row_end, \
-        AggregateDataPtr __restrict place, \
-        const IColumn ** __restrict columns, \
-        const UInt8 * __restrict null_map, \
-        Arena *, \
-        ssize_t if_argument_pos) const \
-    { \
-        const auto & column = assert_cast<const DB::AggregateFunctionMinData<SingleValueDataFixed<TYPE>>::ColVecType &>(*columns[0]); \
-        std::optional<TYPE> opt; \
-        if (if_argument_pos >= 0) \
-        { \
-            const auto * if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData().data(); \
-            auto final_flags = std::make_unique<UInt8[]>(row_end); \
-            for (size_t i = row_begin; i < row_end; ++i) \
-                final_flags[i] = (!null_map[i]) & !!if_flags[i]; \
-            opt = findExtremeMinIf(column.getData().data(), final_flags.get(), row_begin, row_end); \
-        } \
-        else \
-            opt = findExtremeMinNotNull(column.getData().data(), null_map, row_begin, row_end); \
-        if (opt.has_value()) \
-            this->data(place).changeIfLess(opt.value()); \
-    }
-// NOLINTEND(bugprone-macro-parentheses)
-
-FOR_BASIC_NUMERIC_TYPES(SPECIALIZE)
-#undef SPECIALIZE
-
-template <typename Data>
-void AggregateFunctionsSingleValueMin<Data>::addBatchSinglePlaceNotNull(
-    size_t row_begin,
-    size_t row_end,
-    AggregateDataPtr __restrict place,
-    const IColumn ** __restrict columns,
-    const UInt8 * __restrict null_map,
-    Arena * arena,
-    ssize_t if_argument_pos) const
-{
-    if constexpr (!is_any_of<typename Data::Impl, SingleValueDataString, SingleValueDataGeneric>)
-    {
-        /// Leave other numeric types (large integers, decimals, etc) to keep doing the comparison as it's
-        /// faster than doing a permutation
-        return Parent::addBatchSinglePlaceNotNull(row_begin, row_end, place, columns, null_map, arena, if_argument_pos);
-    }
-
-    constexpr int nan_direction_hint = 1;
-    auto const & column = *columns[0];
-    if (if_argument_pos >= 0)
-    {
-        size_t index = row_begin;
-        const auto & if_flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-        while ((if_flags[index] == 0 || null_map[index] != 0) && (index < row_end))
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((if_flags[i] != 0) && (null_map[index] == 0) && (column.compareAt(i, index, column, nan_direction_hint) < 0))
-                index = i;
-        }
-        this->data(place).changeIfLess(column, index, arena);
-    }
-    else
-    {
-        size_t index = row_begin;
-        while ((null_map[index] != 0) && (index < row_end))
-            index++;
-        if (index >= row_end)
-            return;
-
-        for (size_t i = index + 1; i < row_end; i++)
-        {
-            if ((null_map[i] == 0) && (column.compareAt(i, index, column, nan_direction_hint) < 0))
-                index = i;
-        }
-        this->data(place).changeIfLess(column, index, arena);
-    }
-}
-
-AggregateFunctionPtr createAggregateFunctionMin(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValueMin, AggregateFunctionMinData>(
-        name, argument_types, parameters, settings));
-}
-
-AggregateFunctionPtr createAggregateFunctionArgMin(
-    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
-{
-    return AggregateFunctionPtr(createAggregateFunctionArgMinMax<AggregateFunctionMinData>(name, argument_types, parameters, settings));
-}
-
-}
-
-void registerAggregateFunctionsMin(AggregateFunctionFactory & factory)
-{
-    factory.registerFunction("min", createAggregateFunctionMin, AggregateFunctionFactory::CaseInsensitive);
-
-    /// The functions below depend on the order of data.
-    AggregateFunctionProperties properties = { .returns_default_when_only_null = false, .is_order_dependent = true };
-    factory.registerFunction("argMin", { createAggregateFunctionArgMin, properties });
-}
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h b/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
deleted file mode 100644
index dec70861543..00000000000
--- a/src/AggregateFunctions/AggregateFunctionMinMaxAny.h
+++ /dev/null
@@ -1,1449 +0,0 @@
-#pragma once
-
-#include <IO/WriteHelpers.h>
-#include <IO/ReadHelpers.h>
-
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnNullable.h>
-#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>
-
-#include "config.h"
-
-#if USE_EMBEDDED_COMPILER
-#    include <llvm/IR/IRBuilder.h>
-#    include <DataTypes/Native.h>
-#endif
-
-namespace DB
-{
-struct Settings;
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NOT_IMPLEMENTED;
-    extern const int TOO_LARGE_STRING_SIZE;
-    extern const int LOGICAL_ERROR;
-}
-
-/** Aggregate functions that store one of passed values.
-  * For example: min, max, any, anyLast.
-  */
-
-
-/// For numeric values.
-template <typename T>
-struct SingleValueDataFixed
-{
-    using Self = SingleValueDataFixed;
-    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{};
-
-    static constexpr bool result_is_nullable = false;
-    static constexpr bool should_skip_null_arguments = true;
-    static constexpr bool is_any = false;
-
-    bool has() const
-    {
-        return has_value;
-    }
-
-    void insertResultInto(IColumn & to) const
-    {
-        if (has())
-            assert_cast<ColVecType &>(to).getData().push_back(value);
-        else
-            assert_cast<ColVecType &>(to).insertDefault();
-    }
-
-    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
-    {
-        writeBinary(has(), buf);
-        if (has())
-            writeBinaryLittleEndian(value, buf);
-    }
-
-    void read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena *)
-    {
-        readBinary(has_value, buf);
-        if (has())
-            readBinaryLittleEndian(value, buf);
-    }
-
-
-    void change(const IColumn & column, size_t row_num, Arena *)
-    {
-        has_value = true;
-        value = assert_cast<const ColVecType &>(column).getData()[row_num];
-    }
-
-    /// Assuming to.has()
-    void change(const Self & to, Arena *)
-    {
-        has_value = true;
-        value = to.value;
-    }
-
-    bool changeFirstTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeFirstTime(const Self & to, Arena * arena)
-    {
-        if (!has() && to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeEveryTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        change(column, row_num, arena);
-        return true;
-    }
-
-    bool changeEveryTime(const Self & to, Arena * arena)
-    {
-        if (to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfLess(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has() || assert_cast<const ColVecType &>(column).getData()[row_num] < value)
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfLess(const Self & to, Arena * arena)
-    {
-        if (to.has() && (!has() || to.value < value))
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    void changeIfLess(T from)
-    {
-        if (!has() || from < value)
-        {
-            has_value = true;
-            value = from;
-        }
-    }
-
-    bool changeIfGreater(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has() || assert_cast<const ColVecType &>(column).getData()[row_num] > value)
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfGreater(const Self & to, Arena * arena)
-    {
-        if (to.has() && (!has() || to.value > value))
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    void changeIfGreater(T & from)
-    {
-        if (!has() || from > value)
-        {
-            has_value = true;
-            value = from;
-        }
-    }
-
-    bool isEqualTo(const Self & to) const
-    {
-        return has() && to.value == value;
-    }
-
-    bool isEqualTo(const IColumn & column, size_t row_num) const
-    {
-        return has() && assert_cast<const ColVecType &>(column).getData()[row_num] == value;
-    }
-
-    static bool allocatesMemoryInArena()
-    {
-        return false;
-    }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = true;
-
-    static llvm::Value * getValuePtrFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        static constexpr size_t value_offset_from_structure = offsetof(SingleValueDataFixed<T>, value);
-        auto * value_ptr = b.CreateConstInBoundsGEP1_64(b.getInt8Ty(), aggregate_data_ptr, value_offset_from_structure);
-
-        return value_ptr;
-    }
-
-    static llvm::Value * getValueFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * type = toNativeType<T>(builder);
-        auto * value_ptr = getValuePtrFromAggregateDataPtr(builder, aggregate_data_ptr);
-
-        return b.CreateLoad(type, value_ptr);
-    }
-
-    static void compileChange(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_ptr = aggregate_data_ptr;
-        b.CreateStore(b.getInt1(true), has_value_ptr);
-
-        auto * value_ptr = getValuePtrFromAggregateDataPtr(b, aggregate_data_ptr);
-        b.CreateStore(value_to_check, value_ptr);
-    }
-
-    static void compileChangeMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        auto * value_src = getValueFromAggregateDataPtr(builder, aggregate_data_src_ptr);
-
-        compileChange(builder, aggregate_data_dst_ptr, value_src);
-    }
-
-    static void compileChangeFirstTime(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_ptr = aggregate_data_ptr;
-        auto * has_value_value = b.CreateLoad(b.getInt1Ty(), has_value_ptr);
-
-        auto * head = b.GetInsertBlock();
-
-        auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
-        auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
-        auto * if_should_not_change = llvm::BasicBlock::Create(head->getContext(), "if_should_not_change", head->getParent());
-
-        b.CreateCondBr(has_value_value, if_should_not_change, if_should_change);
-
-        b.SetInsertPoint(if_should_not_change);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(if_should_change);
-        compileChange(builder, aggregate_data_ptr, value_to_check);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(join_block);
-    }
-
-    static void compileChangeFirstTimeMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_dst_ptr = aggregate_data_dst_ptr;
-        auto * has_value_dst = b.CreateLoad(b.getInt1Ty(), has_value_dst_ptr);
-
-        auto * has_value_src_ptr = aggregate_data_src_ptr;
-        auto * has_value_src = b.CreateLoad(b.getInt1Ty(), has_value_src_ptr);
-
-        auto * head = b.GetInsertBlock();
-
-        auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
-        auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
-        auto * if_should_not_change = llvm::BasicBlock::Create(head->getContext(), "if_should_not_change", head->getParent());
-
-        b.CreateCondBr(b.CreateAnd(b.CreateNot(has_value_dst), has_value_src), if_should_change, if_should_not_change);
-
-        b.SetInsertPoint(if_should_change);
-        compileChangeMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(if_should_not_change);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(join_block);
-    }
-
-    static void compileChangeEveryTime(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        compileChange(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeEveryTimeMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_src_ptr = aggregate_data_src_ptr;
-        auto * has_value_src = b.CreateLoad(b.getInt1Ty(), has_value_src_ptr);
-
-        auto * head = b.GetInsertBlock();
-
-        auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
-        auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
-        auto * if_should_not_change = llvm::BasicBlock::Create(head->getContext(), "if_should_not_change", head->getParent());
-
-        b.CreateCondBr(has_value_src, if_should_change, if_should_not_change);
-
-        b.SetInsertPoint(if_should_change);
-        compileChangeMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(if_should_not_change);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(join_block);
-    }
-
-    template <bool is_less>
-    static void compileChangeComparison(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_ptr = aggregate_data_ptr;
-        auto * has_value_value = b.CreateLoad(b.getInt1Ty(), has_value_ptr);
-
-        auto * value = getValueFromAggregateDataPtr(b, aggregate_data_ptr);
-
-        auto * head = b.GetInsertBlock();
-
-        auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
-        auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
-        auto * if_should_not_change = llvm::BasicBlock::Create(head->getContext(), "if_should_not_change", head->getParent());
-
-        auto is_signed = std::numeric_limits<T>::is_signed;
-
-        llvm::Value * should_change_after_comparison = nullptr;
-
-        if constexpr (is_less)
-        {
-            if (value_to_check->getType()->isIntegerTy())
-                should_change_after_comparison = is_signed ? b.CreateICmpSLT(value_to_check, value) : b.CreateICmpULT(value_to_check, value);
-            else
-                should_change_after_comparison = b.CreateFCmpOLT(value_to_check, value);
-        }
-        else
-        {
-            if (value_to_check->getType()->isIntegerTy())
-                should_change_after_comparison = is_signed ? b.CreateICmpSGT(value_to_check, value) : b.CreateICmpUGT(value_to_check, value);
-            else
-                should_change_after_comparison = b.CreateFCmpOGT(value_to_check, value);
-        }
-
-        b.CreateCondBr(b.CreateOr(b.CreateNot(has_value_value), should_change_after_comparison), if_should_change, if_should_not_change);
-
-        b.SetInsertPoint(if_should_change);
-        compileChange(builder, aggregate_data_ptr, value_to_check);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(if_should_not_change);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(join_block);
-    }
-
-    template <bool is_less>
-    static void compileChangeComparisonMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        auto * has_value_dst_ptr = aggregate_data_dst_ptr;
-        auto * has_value_dst = b.CreateLoad(b.getInt1Ty(), has_value_dst_ptr);
-
-        auto * value_dst = getValueFromAggregateDataPtr(b, aggregate_data_dst_ptr);
-
-        auto * has_value_src_ptr = aggregate_data_src_ptr;
-        auto * has_value_src = b.CreateLoad(b.getInt1Ty(), has_value_src_ptr);
-
-        auto * value_src = getValueFromAggregateDataPtr(b, aggregate_data_src_ptr);
-
-        auto * head = b.GetInsertBlock();
-
-        auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
-        auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
-        auto * if_should_not_change = llvm::BasicBlock::Create(head->getContext(), "if_should_not_change", head->getParent());
-
-        auto is_signed = std::numeric_limits<T>::is_signed;
-
-        llvm::Value * should_change_after_comparison = nullptr;
-
-        if constexpr (is_less)
-        {
-            if (value_src->getType()->isIntegerTy())
-                should_change_after_comparison = is_signed ? b.CreateICmpSLT(value_src, value_dst) : b.CreateICmpULT(value_src, value_dst);
-            else
-                should_change_after_comparison = b.CreateFCmpOLT(value_src, value_dst);
-        }
-        else
-        {
-            if (value_src->getType()->isIntegerTy())
-                should_change_after_comparison = is_signed ? b.CreateICmpSGT(value_src, value_dst) : b.CreateICmpUGT(value_src, value_dst);
-            else
-                should_change_after_comparison = b.CreateFCmpOGT(value_src, value_dst);
-        }
-
-        b.CreateCondBr(b.CreateAnd(has_value_src, b.CreateOr(b.CreateNot(has_value_dst), should_change_after_comparison)), if_should_change, if_should_not_change);
-
-        b.SetInsertPoint(if_should_change);
-        compileChangeMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(if_should_not_change);
-        b.CreateBr(join_block);
-
-        b.SetInsertPoint(join_block);
-    }
-
-    static void compileChangeIfLess(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        static constexpr bool is_less = true;
-        compileChangeComparison<is_less>(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfLessMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        static constexpr bool is_less = true;
-        compileChangeComparisonMerge<is_less>(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-    static void compileChangeIfGreater(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        static constexpr bool is_less = false;
-        compileChangeComparison<is_less>(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfGreaterMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        static constexpr bool is_less = false;
-        compileChangeComparisonMerge<is_less>(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-    static llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
-    {
-        return getValueFromAggregateDataPtr(builder, aggregate_data_ptr);
-    }
-
-#endif
-};
-
-struct Compatibility
-{
-    /// Old versions used to store terminating null-character in SingleValueDataString.
-    /// Then -WithTerminatingZero methods were removed from IColumn interface,
-    /// because these methods are quite dangerous and easy to misuse. It introduced incompatibility.
-    /// See https://github.com/ClickHouse/ClickHouse/pull/41431 and https://github.com/ClickHouse/ClickHouse/issues/42916
-    /// Here we keep these functions for compatibility.
-    /// It's safe because there's no way unsanitized user input (without \0 at the end) can reach these functions.
-
-    static StringRef getDataAtWithTerminatingZero(const ColumnString & column, size_t n)
-    {
-        auto res = column.getDataAt(n);
-        /// ColumnString always reserves extra byte for null-character after string.
-        /// But getDataAt returns StringRef without the null-character. Let's add it.
-        chassert(res.data[res.size] == '\0');
-        ++res.size;
-        return res;
-    }
-
-    static void insertDataWithTerminatingZero(ColumnString & column, const char * pos, size_t length)
-    {
-        /// String already has terminating null-character.
-        /// But insertData will add another one unconditionally. Trim existing null-character to avoid duplication.
-        chassert(0 < length);
-        chassert(pos[length - 1] == '\0');
-        column.insertData(pos, length - 1);
-    }
-};
-
-/** For strings. Short strings are stored in the object itself, and long strings are allocated separately.
-  * NOTE It could also be suitable for arrays of numbers.
-  */
-struct SingleValueDataString
-{
-private:
-    using Self = SingleValueDataString;
-
-    /// 0 size indicates that there is no value. Empty string must has terminating '\0' and, therefore, size of empty string is 1
-    UInt32 size = 0;
-    UInt32 capacity = 0;    /// power of two or zero
-    char * large_data;
-
-public:
-    static constexpr UInt32 AUTOMATIC_STORAGE_SIZE = 64;
-    static constexpr UInt32 MAX_SMALL_STRING_SIZE = AUTOMATIC_STORAGE_SIZE - sizeof(size) - sizeof(capacity) - sizeof(large_data);
-    static constexpr UInt32 MAX_STRING_SIZE = std::numeric_limits<Int32>::max();
-
-private:
-    char small_data[MAX_SMALL_STRING_SIZE]; /// Including the terminating zero.
-
-public:
-    static constexpr bool result_is_nullable = false;
-    static constexpr bool should_skip_null_arguments = true;
-    static constexpr bool is_any = false;
-
-    bool has() const
-    {
-        return size;
-    }
-
-private:
-    char * getDataMutable()
-    {
-        return size <= MAX_SMALL_STRING_SIZE ? small_data : large_data;
-    }
-
-    const char * getData() const
-    {
-        const char * data_ptr = size <= MAX_SMALL_STRING_SIZE ? small_data : large_data;
-        /// It must always be terminated with null-character
-        chassert(0 < size);
-        chassert(data_ptr[size - 1] == '\0');
-        return data_ptr;
-    }
-
-    StringRef getStringRef() const
-    {
-        return StringRef(getData(), size);
-    }
-
-public:
-    void insertResultInto(IColumn & to) const
-    {
-        if (has())
-            Compatibility::insertDataWithTerminatingZero(assert_cast<ColumnString &>(to), getData(), size);
-        else
-            assert_cast<ColumnString &>(to).insertDefault();
-    }
-
-    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
-    {
-        if (unlikely(MAX_STRING_SIZE < size))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "String size is too big ({}), it's a bug", size);
-
-        /// For serialization we use signed Int32 (for historical reasons), -1 means "no value"
-        Int32 size_to_write = size ? size : -1;
-        writeBinaryLittleEndian(size_to_write, buf);
-        if (has())
-            buf.write(getData(), size);
-    }
-
-    void allocateLargeDataIfNeeded(UInt32 size_to_reserve, Arena * arena)
-    {
-        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 ({}), 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
-            capacity = static_cast<UInt32>(rounded_capacity);
-
-            /// Don't free large_data here.
-            large_data = arena->alloc(capacity);
-        }
-    }
-
-    void read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena * arena)
-    {
-        /// For serialization we use signed Int32 (for historical reasons), -1 means "no value"
-        Int32 rhs_size_signed;
-        readBinaryLittleEndian(rhs_size_signed, buf);
-
-        if (rhs_size_signed < 0)
-        {
-            /// Don't free large_data here.
-            size = 0;
-            return;
-        }
-
-        UInt32 rhs_size = rhs_size_signed;
-        if (rhs_size <= MAX_SMALL_STRING_SIZE)
-        {
-            /// Don't free large_data here.
-            size = rhs_size;
-            buf.readStrict(small_data, size);
-        }
-        else
-        {
-            /// Reserve one byte more for null-character
-            allocateLargeDataIfNeeded(rhs_size + 1, arena);
-            size = rhs_size;
-            buf.readStrict(large_data, size);
-        }
-
-        /// Check if the string we read is null-terminated (getDataMutable does not have the assertion)
-        if (0 < size && getDataMutable()[size - 1] == '\0')
-            return;
-
-        /// It's not null-terminated, but it must be (for historical reasons). There are two variants:
-        /// - The value was serialized by one of the incompatible versions of ClickHouse. We had some range of versions
-        ///   that used to serialize SingleValueDataString without terminating '\0'. Let's just append it.
-        /// - An attacker sent crafted data. Sanitize it and append '\0'.
-        /// In all other cases the string must be already null-terminated.
-
-        /// NOTE We cannot add '\0' unconditionally, because it will be duplicated.
-        /// NOTE It's possible that a string that actually ends with '\0' was written by one of the incompatible versions.
-        ///      Unfortunately, we cannot distinguish it from normal string written by normal version.
-        ///      So such strings will be trimmed.
-
-        if (size == MAX_SMALL_STRING_SIZE)
-        {
-            /// Special case: We have to move value to large_data
-            allocateLargeDataIfNeeded(size + 1, arena);
-            memcpy(large_data, small_data, size);
-        }
-
-        /// We have enough space to append
-        ++size;
-        getDataMutable()[size - 1] = '\0';
-    }
-
-    /// Assuming to.has()
-    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 ({}), maximum: {}",
-                            value.size, MAX_STRING_SIZE);
-
-        UInt32 value_size = static_cast<UInt32>(value.size);
-
-        if (value_size <= MAX_SMALL_STRING_SIZE)
-        {
-            /// Don't free large_data here.
-            size = value_size;
-
-            if (size > 0)
-                memcpy(small_data, value.data, size);
-        }
-        else
-        {
-            allocateLargeDataIfNeeded(value_size, arena);
-            size = value_size;
-            memcpy(large_data, value.data, size);
-        }
-    }
-
-    void change(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        changeImpl(Compatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num), arena);
-    }
-
-    void change(const Self & to, Arena * arena)
-    {
-        changeImpl(to.getStringRef(), arena);
-    }
-
-    bool changeFirstTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeFirstTime(const Self & to, Arena * arena)
-    {
-        if (!has() && to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeEveryTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        change(column, row_num, arena);
-        return true;
-    }
-
-    bool changeEveryTime(const Self & to, Arena * arena)
-    {
-        if (to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfLess(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has() || Compatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) < getStringRef())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfLess(const Self & to, Arena * arena)
-    {
-        if (to.has() && (!has() || to.getStringRef() < getStringRef()))
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfGreater(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has() || Compatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) > getStringRef())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfGreater(const Self & to, Arena * arena)
-    {
-        if (to.has() && (!has() || to.getStringRef() > getStringRef()))
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool isEqualTo(const Self & to) const
-    {
-        return has() && to.getStringRef() == getStringRef();
-    }
-
-    bool isEqualTo(const IColumn & column, size_t row_num) const
-    {
-        return has() && Compatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) == getStringRef();
-    }
-
-    static bool allocatesMemoryInArena()
-    {
-        return true;
-    }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = false;
-
-#endif
-
-};
-
-static_assert(
-    sizeof(SingleValueDataString) == SingleValueDataString::AUTOMATIC_STORAGE_SIZE,
-    "Incorrect size of SingleValueDataString struct");
-
-
-/// For any other value types.
-struct SingleValueDataGeneric
-{
-private:
-    using Self = SingleValueDataGeneric;
-    Field value;
-
-public:
-    static constexpr bool result_is_nullable = false;
-    static constexpr bool should_skip_null_arguments = true;
-    static constexpr bool is_any = false;
-
-    bool has() const { return !value.isNull(); }
-
-    void insertResultInto(IColumn & to) const
-    {
-        if (has())
-            to.insert(value);
-        else
-            to.insertDefault();
-    }
-
-    void write(WriteBuffer & buf, const ISerialization & serialization) const
-    {
-        if (!value.isNull())
-        {
-            writeBinary(true, buf);
-            serialization.serializeBinary(value, buf, {});
-        }
-        else
-            writeBinary(false, buf);
-    }
-
-    void read(ReadBuffer & buf, const ISerialization & serialization, Arena *)
-    {
-        bool is_not_null;
-        readBinary(is_not_null, buf);
-
-        if (is_not_null)
-            serialization.deserializeBinary(value, buf, {});
-    }
-
-    void change(const IColumn & column, size_t row_num, Arena *) { column.get(row_num, value); }
-
-    void change(const Self & to, Arena *) { value = to.value; }
-
-    bool changeFirstTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeFirstTime(const Self & to, Arena * arena)
-    {
-        if (!has() && to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeEveryTime(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        change(column, row_num, arena);
-        return true;
-    }
-
-    bool changeEveryTime(const Self & to, Arena * arena)
-    {
-        if (to.has())
-        {
-            change(to, arena);
-            return true;
-        }
-        else
-            return false;
-    }
-
-    bool changeIfLess(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (!has())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-        {
-            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())
-            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)
-    {
-        if (!has())
-        {
-            change(column, row_num, arena);
-            return true;
-        }
-        else
-        {
-            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())
-            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 { return has() && value == column[row_num]; }
-
-    bool isEqualTo(const Self & to) const { return has() && to.value == value; }
-
-    static bool allocatesMemoryInArena()
-    {
-        return false;
-    }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = false;
-
-#endif
-
-};
-
-
-/** What is the difference between the aggregate functions min, max, any, anyLast
-  *  (the condition that the stored value is replaced by a new one,
-  *   as well as, of course, the name).
-  */
-
-template <typename Data>
-struct AggregateFunctionMinData : Data
-{
-    using Self = AggregateFunctionMinData;
-    using Impl = Data;
-
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeIfLess(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeIfLess(to, arena); }
-    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfLess(column, 0, arena); }
-
-    static const char * name() { return "min"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = Data::is_compilable;
-
-    static void compileChangeIfBetter(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        Data::compileChangeIfLess(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfBetterMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        Data::compileChangeIfLessMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-#endif
-};
-
-template <typename Data>
-struct AggregateFunctionMaxData : Data
-{
-    using Self = AggregateFunctionMaxData;
-    using Impl = Data;
-
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeIfGreater(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeIfGreater(to, arena); }
-    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfGreater(column, 0, arena); }
-
-    static const char * name() { return "max"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = Data::is_compilable;
-
-    static void compileChangeIfBetter(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        Data::compileChangeIfGreater(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfBetterMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        Data::compileChangeIfGreaterMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-#endif
-};
-
-template <typename Data>
-struct AggregateFunctionAnyData : Data
-{
-    using Self = AggregateFunctionAnyData;
-    static constexpr bool is_any = true;
-
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeFirstTime(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeFirstTime(to, arena); }
-    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeFirstTime(column, 0, arena); }
-
-    static const char * name() { return "any"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = Data::is_compilable;
-
-    static void compileChangeIfBetter(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        Data::compileChangeFirstTime(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfBetterMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        Data::compileChangeFirstTimeMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-#endif
-};
-
-template <typename Data>
-struct AggregateFunctionAnyLastData : Data
-{
-    using Self = AggregateFunctionAnyLastData;
-
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)     { return this->changeEveryTime(column, row_num, arena); }
-    bool changeIfBetter(const Self & to, Arena * arena)                            { return this->changeEveryTime(to, arena); }
-    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeEveryTime(column, 0, arena); }
-
-    static const char * name() { return "anyLast"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = Data::is_compilable;
-
-    static void compileChangeIfBetter(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
-    {
-        Data::compileChangeEveryTime(builder, aggregate_data_ptr, value_to_check);
-    }
-
-    static void compileChangeIfBetterMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
-    {
-        Data::compileChangeEveryTimeMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-    }
-
-#endif
-};
-
-
-/** The aggregate function 'singleValueOrNull' is used to implement subquery operators,
-  * such as x = ALL (SELECT ...)
-  * It checks if there is only one unique non-NULL value in the data.
-  * If there is only one unique value - returns it.
-  * If there are zero or at least two distinct values - returns NULL.
-  */
-template <typename Data>
-struct AggregateFunctionSingleValueOrNullData : Data
-{
-    using Self = AggregateFunctionSingleValueOrNullData;
-
-    static constexpr bool result_is_nullable = true;
-
-    bool first_value = true;
-    bool is_null = false;
-
-    void changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (first_value)
-        {
-            first_value = false;
-            this->change(column, row_num, arena);
-        }
-        else if (!this->isEqualTo(column, row_num))
-        {
-            is_null = true;
-        }
-    }
-
-    void changeIfBetter(const Self & to, Arena * arena)
-    {
-        if (!to.has())
-            return;
-
-        if (first_value && !to.first_value)
-        {
-            first_value = false;
-            this->change(to, arena);
-        }
-        else if (!this->isEqualTo(to))
-        {
-            is_null = true;
-        }
-    }
-
-    void addManyDefaults(const IColumn & column, size_t /*length*/, Arena * arena) { this->changeIfBetter(column, 0, arena); }
-
-    void insertResultInto(IColumn & to) const
-    {
-        if (is_null || first_value)
-        {
-            to.insertDefault();
-        }
-        else
-        {
-            ColumnNullable & col = typeid_cast<ColumnNullable &>(to);
-            col.getNullMapColumn().insertDefault();
-            this->Data::insertResultInto(col.getNestedColumn());
-        }
-    }
-
-    static const char * name() { return "singleValueOrNull"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = false;
-
-#endif
-};
-
-/** Implement 'heavy hitters' algorithm.
-  * Selects most frequent value if its frequency is more than 50% in each thread of execution.
-  * Otherwise, selects some arbitrary value.
-  * http://www.cs.umd.edu/~samir/498/karp.pdf
-  */
-template <typename Data>
-struct AggregateFunctionAnyHeavyData : Data
-{
-    UInt64 counter = 0;
-
-    using Self = AggregateFunctionAnyHeavyData;
-
-    bool changeIfBetter(const IColumn & column, size_t row_num, Arena * arena)
-    {
-        if (this->isEqualTo(column, row_num))
-        {
-            ++counter;
-        }
-        else
-        {
-            if (counter == 0)
-            {
-                this->change(column, row_num, arena);
-                ++counter;
-                return true;
-            }
-            else
-                --counter;
-        }
-        return false;
-    }
-
-    bool changeIfBetter(const Self & to, Arena * arena)
-    {
-        if (!to.has())
-            return false;
-
-        if (this->isEqualTo(to))
-        {
-            counter += to.counter;
-        }
-        else
-        {
-            if ((!this->has() && to.has()) || counter < to.counter)
-            {
-                this->change(to, arena);
-                return true;
-            }
-            else
-                counter -= to.counter;
-        }
-        return false;
-    }
-
-    void addManyDefaults(const IColumn & column, size_t length, Arena * arena)
-    {
-        for (size_t i = 0; i < length; ++i)
-            changeIfBetter(column, 0, arena);
-    }
-
-    void write(WriteBuffer & buf, const ISerialization & serialization) const
-    {
-        Data::write(buf, serialization);
-        writeBinaryLittleEndian(counter, buf);
-    }
-
-    void read(ReadBuffer & buf, const ISerialization & serialization, Arena * arena)
-    {
-        Data::read(buf, serialization, arena);
-        readBinaryLittleEndian(counter, buf);
-    }
-
-    static const char * name() { return "anyHeavy"; }
-
-#if USE_EMBEDDED_COMPILER
-
-    static constexpr bool is_compilable = false;
-
-#endif
-
-};
-
-
-template <typename Data>
-class AggregateFunctionsSingleValue : public IAggregateFunctionDataHelper<Data, AggregateFunctionsSingleValue<Data>>
-{
-    static constexpr bool is_any = Data::is_any;
-
-private:
-    SerializationPtr serialization;
-
-public:
-    explicit AggregateFunctionsSingleValue(const DataTypePtr & type)
-        : IAggregateFunctionDataHelper<Data, AggregateFunctionsSingleValue<Data>>({type}, {}, createResultType(type))
-        , serialization(type->getDefaultSerialization())
-    {
-        if (StringRef(Data::name()) == StringRef("min")
-            || StringRef(Data::name()) == StringRef("max"))
-        {
-            if (!type->isComparable())
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type {} of argument of aggregate function {} because the values of that data type are not comparable",
-                    type->getName(),
-                    Data::name());
-        }
-    }
-
-    String getName() const override { return Data::name(); }
-
-    static DataTypePtr createResultType(const DataTypePtr & type_)
-    {
-        if constexpr (Data::result_is_nullable)
-            return makeNullable(type_);
-        return type_;
-    }
-
-    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
-    {
-        this->data(place).changeIfBetter(*columns[0], row_num, arena);
-    }
-
-    void addManyDefaults(
-        AggregateDataPtr __restrict place,
-        const IColumn ** columns,
-        size_t length,
-        Arena * arena) const override
-    {
-        this->data(place).addManyDefaults(*columns[0], length, arena);
-    }
-
-    void addBatchSinglePlace(
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr place,
-        const IColumn ** columns,
-        Arena * arena,
-        ssize_t if_argument_pos) const override
-    {
-        if constexpr (is_any)
-            if (this->data(place).has())
-                return;
-        if (if_argument_pos >= 0)
-        {
-            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-            for (size_t i = row_begin; i < row_end; ++i)
-            {
-                if (flags[i])
-                {
-                    this->data(place).changeIfBetter(*columns[0], i, arena);
-                    if constexpr (is_any)
-                        break;
-                }
-            }
-        }
-        else
-        {
-            for (size_t i = row_begin; i < row_end; ++i)
-            {
-                this->data(place).changeIfBetter(*columns[0], i, arena);
-                if constexpr (is_any)
-                    break;
-            }
-        }
-    }
-
-    void addBatchSinglePlaceNotNull( /// NOLINT
-        size_t row_begin,
-        size_t row_end,
-        AggregateDataPtr place,
-        const IColumn ** columns,
-        const UInt8 * null_map,
-        Arena * arena,
-        ssize_t if_argument_pos = -1) const override
-    {
-        if constexpr (is_any)
-            if (this->data(place).has())
-                return;
-
-        if (if_argument_pos >= 0)
-        {
-            const auto & flags = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
-            for (size_t i = row_begin; i < row_end; ++i)
-            {
-                if (!null_map[i] && flags[i])
-                {
-                    this->data(place).changeIfBetter(*columns[0], i, arena);
-                    if constexpr (is_any)
-                        break;
-                }
-            }
-        }
-        else
-        {
-            for (size_t i = row_begin; i < row_end; ++i)
-            {
-                if (!null_map[i])
-                {
-                    this->data(place).changeIfBetter(*columns[0], i, arena);
-                    if constexpr (is_any)
-                        break;
-                }
-            }
-        }
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
-    {
-        this->data(place).changeIfBetter(this->data(rhs), arena);
-    }
-
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
-    {
-        this->data(place).write(buf, *serialization);
-    }
-
-    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
-    {
-        this->data(place).read(buf, *serialization, arena);
-    }
-
-    bool allocatesMemoryInArena() const override
-    {
-        return Data::allocatesMemoryInArena();
-    }
-
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
-    {
-        this->data(place).insertResultInto(to);
-    }
-
-    AggregateFunctionPtr getOwnNullAdapter(
-        const AggregateFunctionPtr & original_function,
-        const DataTypes & /*arguments*/,
-        const Array & /*params*/,
-        const AggregateFunctionProperties & /*properties*/) const override
-    {
-        if (Data::result_is_nullable && !Data::should_skip_null_arguments)
-            return original_function;
-        return nullptr;
-    }
-
-#if USE_EMBEDDED_COMPILER
-
-    bool isCompilable() const override
-    {
-        if constexpr (!Data::is_compilable)
-            return false;
-
-        return canBeNativeType(*this->argument_types[0]);
-    }
-
-
-    void compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
-    {
-        llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
-
-        b.CreateMemSet(aggregate_data_ptr, llvm::ConstantInt::get(b.getInt8Ty(), 0), this->sizeOfData(), llvm::assumeAligned(this->alignOfData()));
-    }
-
-    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
-    {
-        if constexpr (Data::is_compilable)
-        {
-            Data::compileChangeIfBetter(builder, aggregate_data_ptr, arguments[0].value);
-        }
-        else
-        {
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
-        }
-    }
-
-    void compileMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr) const override
-    {
-        if constexpr (Data::is_compilable)
-        {
-            Data::compileChangeIfBetterMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
-        }
-        else
-        {
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
-        }
-    }
-
-    llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
-    {
-        if constexpr (Data::is_compilable)
-        {
-            return Data::compileGetResult(builder, aggregate_data_ptr);
-        }
-        else
-        {
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
-        }
-    }
-
-#endif
-};
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionNothing.cpp b/src/AggregateFunctions/AggregateFunctionNothing.cpp
index ebeffffc71e..abdcf3dd1da 100644
--- a/src/AggregateFunctions/AggregateFunctionNothing.cpp
+++ b/src/AggregateFunctions/AggregateFunctionNothing.cpp
@@ -10,12 +10,28 @@ struct Settings;
 
 void registerAggregateFunctionNothing(AggregateFunctionFactory & factory)
 {
-    factory.registerFunction("nothing", [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-    {
-        assertNoParameters(name, parameters);
+    factory.registerFunction(NameAggregateFunctionNothing::name,
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            assertNoParameters(name, parameters);
+            return std::make_shared<AggregateFunctionNothing>(argument_types, parameters);
+        });
 
-        auto result_type = argument_types.empty() ? std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>()) : argument_types.front();
-        return std::make_shared<AggregateFunctionNothing>(argument_types, parameters, result_type);
+    factory.registerFunction(NameAggregateFunctionNothingNull::name,
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            assertNoParameters(name, parameters);
+            return std::make_shared<AggregateFunctionNothingNull>(argument_types, parameters);
+        });
+
+
+    factory.registerFunction(NameAggregateFunctionNothingUInt64::name, {
+        [](const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+        {
+            assertNoParameters(name, parameters);
+            return std::make_shared<AggregateFunctionNothingUInt64>(argument_types, parameters);
+        },
+        AggregateFunctionProperties{ .returns_default_when_only_null = true }
     });
 }
 
diff --git a/src/AggregateFunctions/AggregateFunctionNothing.h b/src/AggregateFunctions/AggregateFunctionNothing.h
index 8c1b95c26b0..46366ded043 100644
--- a/src/AggregateFunctions/AggregateFunctionNothing.h
+++ b/src/AggregateFunctions/AggregateFunctionNothing.h
@@ -6,7 +6,8 @@
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include "DataTypes/IDataType.h"
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypesNumber.h>
 
 
 namespace DB
@@ -18,20 +19,42 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
 }
 
+/// Returns the same type as the first argument
+struct NameAggregateFunctionNothing { static constexpr auto name = "nothing"; };
+/// Always returns Nullable(Nothing)
+struct NameAggregateFunctionNothingNull { static constexpr auto name = "nothingNull"; };
+/// Always returns UInt64
+struct NameAggregateFunctionNothingUInt64 { static constexpr auto name = "nothingUInt64"; };
+
+template <typename Name> class AggregateFunctionNothingImpl;
+
+using AggregateFunctionNothing = AggregateFunctionNothingImpl<NameAggregateFunctionNothing>;
+using AggregateFunctionNothingNull = AggregateFunctionNothingImpl<NameAggregateFunctionNothingNull>;
+using AggregateFunctionNothingUInt64 = AggregateFunctionNothingImpl<NameAggregateFunctionNothingUInt64>;
+
 
 /** Aggregate function that takes arbitrary number of arbitrary arguments and does nothing.
   */
-class AggregateFunctionNothing final : public IAggregateFunctionHelper<AggregateFunctionNothing>
+template <typename Name>
+class AggregateFunctionNothingImpl final : public IAggregateFunctionHelper<AggregateFunctionNothingImpl<Name>>
 {
-public:
-    AggregateFunctionNothing(const DataTypes & arguments, const Array & params, const DataTypePtr & result_type_)
-        : IAggregateFunctionHelper<AggregateFunctionNothing>(arguments, params, result_type_) {}
-
-    String getName() const override
+    static DataTypePtr getReturnType(const DataTypes & arguments [[maybe_unused]])
     {
-        return "nothing";
+        if constexpr (std::is_same_v<Name, NameAggregateFunctionNothingUInt64>)
+            return std::make_shared<DataTypeUInt64>();
+        else if constexpr (std::is_same_v<Name, NameAggregateFunctionNothingNull>)
+            return std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>());
+        return arguments.empty() ? std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>()) : arguments.front();
     }
 
+public:
+    AggregateFunctionNothingImpl(const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionHelper<AggregateFunctionNothingImpl<Name>>(arguments, params, getReturnType(arguments))
+    {
+    }
+
+    String getName() const override { return Name::name; }
+
     bool allocatesMemoryInArena() const override { return false; }
 
     void create(AggregateDataPtr __restrict) const override
@@ -75,7 +98,8 @@ public:
         [[maybe_unused]] char symbol;
         readChar(symbol, buf);
         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));
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect state of aggregate function '{}', it should contain exactly one zero byte, while it is {}",
+                getName(), static_cast<UInt32>(symbol));
     }
 
     void insertResultInto(AggregateDataPtr __restrict, IColumn & to, Arena *) const override
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.cpp b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
index 110f6c6b4d6..4d37ec69d26 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.cpp
@@ -14,6 +14,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
 }
@@ -116,8 +117,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantile.h b/src/AggregateFunctions/AggregateFunctionQuantile.h
index 21e174a9e7f..127dc06b642 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantile.h
+++ b/src/AggregateFunctions/AggregateFunctionQuantile.h
@@ -31,7 +31,7 @@ namespace ErrorCodes
 
 template <typename> class QuantileTiming;
 template <typename> class QuantileGK;
-
+template <typename> class QuantileDD;
 
 /** Generic aggregate function for calculation of quantiles.
   * It depends on quantile calculation data structure. Look at Quantile*.h for various implementations.
@@ -64,6 +64,7 @@ private:
     using ColVecType = ColumnVectorOrDecimal<Value>;
 
     static constexpr bool returns_float = !(std::is_same_v<FloatReturnType, void>);
+    static constexpr bool is_quantile_ddsketch = std::is_same_v<Data, QuantileDD<Value>>;
     static_assert(!is_decimal<Value> || !returns_float);
 
     QuantileLevels<Float64> levels;
@@ -74,6 +75,9 @@ private:
     /// Used for the approximate version of the algorithm (Greenwald-Khanna)
     ssize_t accuracy = 10000;
 
+    /// Used for the quantile sketch
+    Float64 relative_accuracy = 0.01;
+
     DataTypePtr & argument_type;
 
 public:
@@ -87,7 +91,51 @@ public:
         if (!returns_many && levels.size() > 1)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires one level parameter or less", getName());
 
-        if constexpr (has_accuracy_parameter)
+        if constexpr (has_second_arg)
+        {
+            assertBinary(Name::name, argument_types_);
+            if (!isUInt(argument_types_[1]))
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Second argument (weight) for function {} must be unsigned integer, but it has type {}",
+                    Name::name,
+                    argument_types_[1]->getName());
+        }
+        else
+        {
+            assertUnary(Name::name, argument_types_);
+        }
+
+        if constexpr (is_quantile_ddsketch)
+        {
+            if (params.empty())
+                throw Exception(
+                    ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one param", getName());
+
+            const auto & relative_accuracy_field = params[0];
+            if (relative_accuracy_field.getType() != Field::Types::Float64)
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Aggregate function {} requires relative accuracy parameter with Float64 type", getName());
+
+            relative_accuracy = relative_accuracy_field.get<Float64>();
+
+            if (relative_accuracy <= 0 || relative_accuracy >= 1 || isNaN(relative_accuracy))
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Aggregate function {} requires relative accuracy parameter with value between 0 and 1 but is {}",
+                    getName(),
+                    relative_accuracy);
+            // Throw exception if the relative accuracy is too small.
+            // This is to avoid the case where the user specifies a relative accuracy that is too small
+            // and the sketch is not able to allocate enough memory to satisfy the accuracy requirement.
+            if (relative_accuracy < 1e-6)
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Aggregate function {} requires relative accuracy parameter with value greater than 1e-6 but is {}",
+                    getName(),
+                    relative_accuracy);
+        }
+        else if constexpr (has_accuracy_parameter)
         {
             if (params.empty())
                 throw Exception(
@@ -116,7 +164,9 @@ public:
 
     void create(AggregateDataPtr __restrict place) const override /// NOLINT
     {
-        if constexpr (has_accuracy_parameter)
+        if constexpr (is_quantile_ddsketch)
+            new (place) Data(relative_accuracy);
+        else if constexpr (has_accuracy_parameter)
             new (place) Data(accuracy);
         else
             new (place) Data;
@@ -147,6 +197,10 @@ public:
     {
         /// Return normalized state type: quantiles*(1)(...)
         Array params{1};
+        if constexpr (is_quantile_ddsketch)
+            params = {relative_accuracy, 1};
+        else if constexpr (has_accuracy_parameter)
+            params = {accuracy, 1};
         AggregateFunctionProperties properties;
         return std::make_shared<DataTypeAggregateFunction>(
             AggregateFunctionFactory::instance().get(
@@ -233,22 +287,6 @@ public:
                 static_cast<ColVecType &>(to).getData().push_back(data.get(level));
         }
     }
-
-    static void assertSecondArg(const DataTypes & types)
-    {
-        if constexpr (has_second_arg)
-        {
-            assertBinary(Name::name, types);
-            if (!isUInt(types[1]))
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Second argument (weight) for function {} must be unsigned integer, but it has type {}",
-                    Name::name,
-                    types[1]->getName());
-        }
-        else
-            assertUnary(Name::name, types);
-    }
 };
 
 struct NameQuantile { static constexpr auto name = "quantile"; };
@@ -295,4 +333,7 @@ struct NameQuantilesBFloat16Weighted { static constexpr auto name = "quantilesBF
 struct NameQuantileGK { static constexpr auto name = "quantileGK"; };
 struct NameQuantilesGK { static constexpr auto name = "quantilesGK"; };
 
+struct NameQuantileDD { static constexpr auto name = "quantileDD"; };
+struct NameQuantilesDD { static constexpr auto name = "quantilesDD"; };
+
 }
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileBFloat16.cpp b/src/AggregateFunctions/AggregateFunctionQuantileBFloat16.cpp
index c211ba03136..75ed099129a 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileBFloat16.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileBFloat16.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileBFloat16Weighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileBFloat16Weighted.cpp
index 702848ee4fa..6d881b77c16 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileBFloat16Weighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileBFloat16Weighted.cpp
@@ -1,7 +1,6 @@
 #include <AggregateFunctions/AggregateFunctionQuantile.h>
 #include <AggregateFunctions/QuantileBFloat16Histogram.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/Helpers.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <Core/Field.h>
@@ -13,6 +12,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +26,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileDD.cpp b/src/AggregateFunctions/AggregateFunctionQuantileDD.cpp
new file mode 100644
index 00000000000..f3d6b26ee75
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionQuantileDD.cpp
@@ -0,0 +1,62 @@
+#include <AggregateFunctions/AggregateFunctionQuantile.h>
+#include <AggregateFunctions/QuantileDD.h>
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/Helpers.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <Core/Field.h>
+
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+}
+
+namespace
+{
+
+template <typename Value, bool float_return> using FuncQuantileDD = AggregateFunctionQuantile<Value, QuantileDD<Value>, NameQuantileDD, false, std::conditional_t<float_return, Float64, void>, false, true>;
+template <typename Value, bool float_return> using FuncQuantilesDD = AggregateFunctionQuantile<Value, QuantileDD<Value>, NameQuantilesDD, false, std::conditional_t<float_return, Float64, void>, true, true>;
+
+
+template <template <typename, bool> class Function>
+AggregateFunctionPtr createAggregateFunctionQuantile(
+    const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
+{
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
+
+    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);
+
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
+                    argument_type->getName(), name);
+}
+
+}
+
+void registerAggregateFunctionsQuantileDD(AggregateFunctionFactory & factory)
+{
+    /// For aggregate functions returning array we cannot return NULL on empty set.
+    AggregateFunctionProperties properties = { .returns_default_when_only_null = true };
+
+    factory.registerFunction(NameQuantileDD::name, createAggregateFunctionQuantile<FuncQuantileDD>);
+    factory.registerFunction(NameQuantilesDD::name, { createAggregateFunctionQuantile<FuncQuantilesDD>, properties });
+
+    /// 'median' is an alias for 'quantile'
+    factory.registerAlias("medianDD", NameQuantileDD::name);
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp b/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
index f9f114d69e4..fc186a25afb 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileDeterministic.cpp
@@ -14,6 +14,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
 }
@@ -116,8 +117,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
index 3098c498ce9..8b7b5f88976 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExact.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -27,8 +28,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactExclusive.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactExclusive.cpp
index 64ae5f01f58..080134eb919 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactExclusive.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactExclusive.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactHigh.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactHigh.cpp
index a224b8fc10f..b44df755158 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactHigh.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactHigh.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -27,8 +28,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
@@ -39,12 +40,12 @@ AggregateFunctionPtr createAggregateFunctionQuantile(
 #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::DateTime64) return std::make_shared<Function<DateTime64, 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);
 
     throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument for aggregate function {}",
                     argument_type->getName(), name);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactInclusive.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactInclusive.cpp
index 96703c271d8..d8287be86ca 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactInclusive.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactInclusive.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactLow.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactLow.cpp
index 221281a7bb3..d192ed175da 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactLow.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactLow.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
index e5066fe9c3d..469abdf45a2 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileExactWeighted.cpp
@@ -16,6 +16,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
 }
@@ -216,8 +217,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileGK.cpp b/src/AggregateFunctions/AggregateFunctionQuantileGK.cpp
index 2c0b3e55136..e455f2f4123 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileGK.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileGK.cpp
@@ -16,7 +16,9 @@ namespace DB
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int INCORRECT_DATA;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
 }
@@ -30,12 +32,12 @@ 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
+        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_) {}
+        Stats(T value_, Int64 g_, Int64 delta_) : value(value_), g(g_), delta(delta_) { }
     };
 
     struct QueryResult
@@ -49,20 +51,20 @@ public:
 
     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_)
+    ApproxSampler(const ApproxSampler & other)
+        : relative_error(other.relative_error)
+        , compress_threshold(other.compress_threshold)
+        , count(other.count)
+        , compressed(other.compressed)
+        , sampled(other.sampled.begin(), other.sampled.end())
+        , backup_sampled(other.backup_sampled.begin(), other.backup_sampled.end())
+        , head_sampled(other.head_sampled.begin(), other.head_sampled.end())
     {
-        sampled.reserve(compress_threshold);
-        backup_sampled.reserve(compress_threshold);
+    }
 
-        head_sampled.reserve(default_head_size);
+    explicit ApproxSampler(double relative_error_)
+        : relative_error(relative_error_), compress_threshold(default_compress_threshold), count(0), compressed(false)
+    {
     }
 
     bool isCompressed() const { return compressed; }
@@ -95,9 +97,9 @@ public:
         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;
+        Int64 target_error = current_max / 2;
 
-        size_t index= 0;
+        size_t index = 0;
         auto min_rank = sampled[0].g;
         for (size_t i = 0; i < size; ++i)
         {
@@ -118,7 +120,6 @@ public:
                 result[indices[i]] = res.value;
             }
         }
-
     }
 
     void compress()
@@ -144,7 +145,7 @@ public:
             count = other.count;
             compressed = other.compressed;
 
-            sampled.resize(other.sampled.size());
+            sampled.resize_exact(other.sampled.size());
             memcpy(sampled.data(), other.sampled.data(), sizeof(Stats) * other.sampled.size());
             return;
         }
@@ -180,7 +181,7 @@ public:
             compress();
 
             backup_sampled.clear();
-            backup_sampled.reserve(sampled.size() + other.sampled.size());
+            backup_sampled.reserve_exact(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));
@@ -256,16 +257,23 @@ public:
     void read(ReadBuffer & buf)
     {
         readBinaryLittleEndian(compress_threshold, buf);
+        if (compress_threshold != default_compress_threshold)
+            throw Exception(
+                ErrorCodes::INCORRECT_DATA,
+                "The compress threshold {} isn't the expected one {}",
+                compress_threshold,
+                default_compress_threshold);
+
         readBinaryLittleEndian(relative_error, buf);
         readBinaryLittleEndian(count, buf);
 
         size_t sampled_len = 0;
         readBinaryLittleEndian(sampled_len, buf);
-        sampled.resize(sampled_len);
+        sampled.resize_exact(sampled_len);
 
         for (size_t i = 0; i < sampled_len; ++i)
         {
-            auto stats = sampled[i];
+            auto & stats = sampled[i];
             readBinaryLittleEndian(stats.value, buf);
             readBinaryLittleEndian(stats.g, buf);
             readBinaryLittleEndian(stats.delta, buf);
@@ -291,7 +299,7 @@ private:
                 min_rank += curr_sample.g;
             }
         }
-        return {sampled.size()-1, 0, sampled.back().value};
+        return {sampled.size() - 1, 0, sampled.back().value};
     }
 
     void withHeadBufferInserted()
@@ -306,7 +314,7 @@ private:
             ::sort(head_sampled.begin(), head_sampled.end());
 
         backup_sampled.clear();
-        backup_sampled.reserve(sampled.size() + head_sampled.size());
+        backup_sampled.reserve_exact(sampled.size() + head_sampled.size());
 
         size_t sample_idx = 0;
         size_t ops_idx = 0;
@@ -389,12 +397,11 @@ private:
 
     double relative_error;
     size_t compress_threshold;
-    size_t count = 0;
+    size_t count;
     bool compressed;
 
     PaddedPODArray<Stats> sampled;
     PaddedPODArray<Stats> backup_sampled;
-
     PaddedPODArray<T> head_sampled;
 
     static constexpr size_t default_compress_threshold = 10000;
@@ -406,17 +413,14 @@ class QuantileGK
 {
 private:
     using Data = ApproxSampler<Value>;
-    mutable Data data;
+    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);
-    }
+    void add(const Value & x) { data.insert(x); }
 
     template <typename Weight>
     void add(const Value &, const Weight &)
@@ -429,22 +433,34 @@ public:
         if (!data.isCompressed())
             data.compress();
 
-        data.merge(rhs.data);
+        if (rhs.data.isCompressed())
+            data.merge(rhs.data);
+        else
+        {
+            /// We can't modify rhs, so copy it and compress
+            Data rhs_data_copy(rhs.data);
+            rhs_data_copy.compress();
+            data.merge(rhs_data_copy);
+        }
     }
 
     void serialize(WriteBuffer & buf) const
     {
-        /// Always compress before serialization
-        if (!data.isCompressed())
-            data.compress();
-
-        data.write(buf);
+        if (data.isCompressed())
+            data.write(buf);
+        else
+        {
+            /// We can't modify rhs, so copy it and compress
+            Data data_copy(data);
+            data_copy.compress();
+            data_copy.write(buf);
+        }
     }
 
     void deserialize(ReadBuffer & buf)
     {
         data.read(buf);
-
+        /// Serialized data is always compressed
         data.setCompressed();
     }
 
@@ -481,7 +497,6 @@ public:
     }
 };
 
-
 template <typename Value, bool _> using FuncQuantileGK = AggregateFunctionQuantile<Value, QuantileGK<Value>, NameQuantileGK, false, void, false, true>;
 template <typename Value, bool _> using FuncQuantilesGK = AggregateFunctionQuantile<Value, QuantileGK<Value>, NameQuantilesGK, false, void, true, true>;
 
@@ -489,8 +504,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileInterpolatedWeighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileInterpolatedWeighted.cpp
index 2b8b72a549a..231123c5363 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileInterpolatedWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileInterpolatedWeighted.cpp
@@ -15,6 +15,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
 }
@@ -320,8 +321,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileTDigest.cpp b/src/AggregateFunctions/AggregateFunctionQuantileTDigest.cpp
index e3896ffb0d7..7421e3b649f 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileTDigest.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileTDigest.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileTDigestWeighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileTDigestWeighted.cpp
index 56d5fd36412..226c441a152 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileTDigestWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileTDigestWeighted.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileTiming.cpp b/src/AggregateFunctions/AggregateFunctionQuantileTiming.cpp
index b3fbd50b6e2..1bb77892c0d 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileTiming.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileTiming.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionQuantileTimingWeighted.cpp b/src/AggregateFunctions/AggregateFunctionQuantileTimingWeighted.cpp
index 7bbba728313..cc9db79176b 100644
--- a/src/AggregateFunctions/AggregateFunctionQuantileTimingWeighted.cpp
+++ b/src/AggregateFunctions/AggregateFunctionQuantileTimingWeighted.cpp
@@ -13,6 +13,7 @@ struct Settings;
 
 namespace ErrorCodes
 {
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
@@ -26,8 +27,8 @@ 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);
+    if (argument_types.empty())
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at least one argument", name);
 
     const DataTypePtr & argument_type = argument_types[0];
     WhichDataType which(argument_type);
diff --git a/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp b/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
index d338808c717..0c4726734ce 100644
--- a/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
+++ b/src/AggregateFunctions/AggregateFunctionRankCorrelation.cpp
@@ -66,31 +66,31 @@ public:
     {
         Float64 new_x = columns[0]->getFloat64(row_num);
         Float64 new_y = columns[1]->getFloat64(row_num);
-        this->data(place).addX(new_x, arena);
-        this->data(place).addY(new_y, arena);
+        data(place).addX(new_x, arena);
+        data(place).addY(new_y, arena);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
     {
-        auto & a = this->data(place);
-        const auto & b = this->data(rhs);
+        auto & a = data(place);
+        const auto & b = data(rhs);
 
         a.merge(b, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).write(buf);
+        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);
+        data(place).read(buf, arena);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
     {
-        auto answer = this->data(place).getResult();
+        auto answer = data(place).getResult();
 
         auto & column = static_cast<ColumnVector<Float64> &>(to);
         column.getData().push_back(answer);
diff --git a/src/AggregateFunctions/AggregateFunctionRetention.cpp b/src/AggregateFunctions/AggregateFunctionRetention.cpp
index a004f3527a2..e9b46e62c14 100644
--- a/src/AggregateFunctions/AggregateFunctionRetention.cpp
+++ b/src/AggregateFunctions/AggregateFunctionRetention.cpp
@@ -1,16 +1,16 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/FactoryHelpers.h>
-
-#include <unordered_set>
 #include <Columns/ColumnArray.h>
 #include <Common/assert_cast.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeArray.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <bitset>
+#include <base/range.h>
 
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <bitset>
+#include <unordered_set>
 
 
 namespace DB
@@ -102,24 +102,24 @@ public:
             auto event = assert_cast<const ColumnVector<UInt8> *>(columns[i])->getData()[row_num];
             if (event)
             {
-                this->data(place).add(i);
+                data(place).add(i);
             }
         }
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
-        this->data(place).merge(this->data(rhs));
+        data(place).merge(data(rhs));
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).serialize(buf);
+        data(place).serialize(buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
     {
-        this->data(place).deserialize(buf);
+        data(place).deserialize(buf);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
@@ -130,13 +130,13 @@ public:
         ColumnArray::Offset current_offset = data_to.size();
         data_to.resize(current_offset + events_size);
 
-        const bool first_flag = this->data(place).events.test(0);
+        const bool first_flag = data(place).events.test(0);
         data_to[current_offset] = first_flag;
         ++current_offset;
 
         for (size_t i = 1; i < events_size; ++i)
         {
-            data_to[current_offset] = (first_flag && this->data(place).events.test(i));
+            data_to[current_offset] = (first_flag && data(place).events.test(i));
             ++current_offset;
         }
 
diff --git a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
index ff9259e3aac..bc3d4da5e39 100644
--- a/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSequenceMatch.cpp
@@ -10,6 +10,8 @@
 #include <Common/assert_cast.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <base/range.h>
+
 #include <bitset>
 #include <stack>
 
diff --git a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
index 75d2fe595d8..ce2f7ee195d 100644
--- a/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSimpleLinearRegression.cpp
@@ -123,22 +123,22 @@ public:
         Float64 x = columns[0]->getFloat64(row_num);
         Float64 y = columns[1]->getFloat64(row_num);
 
-        this->data(place).add(x, y);
+        data(place).add(x, y);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
-        this->data(place).merge(this->data(rhs));
+        data(place).merge(data(rhs));
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).serialize(buf);
+        data(place).serialize(buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
     {
-        this->data(place).deserialize(buf);
+        data(place).deserialize(buf);
     }
 
     static DataTypePtr createResultType()
@@ -168,8 +168,8 @@ public:
         IColumn & to,
         Arena *) const override
     {
-        Float64 k = this->data(place).getK();
-        Float64 b = this->data(place).getB(k);
+        Float64 k = data(place).getK();
+        Float64 b = data(place).getB(k);
 
         auto & col_tuple = assert_cast<ColumnTuple &>(to);
         auto & col_k = assert_cast<ColumnVector<Float64> &>(col_tuple.getColumn(0));
diff --git a/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp b/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
index cd897dfcf6e..0625e37d1b0 100644
--- a/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
+++ b/src/AggregateFunctions/AggregateFunctionSingleValueOrNull.cpp
@@ -1,19 +1,193 @@
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/HelpersMinMaxAny.h>
 #include <AggregateFunctions/FactoryHelpers.h>
-#include "registerAggregateFunctions.h"
+#include <AggregateFunctions/SingleValueData.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeNullable.h>
 
 
 namespace DB
 {
 struct Settings;
 
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
+/** The aggregate function 'singleValueOrNull' is used to implement subquery operators,
+  * such as x = ALL (SELECT ...)
+  * It checks if there is only one unique non-NULL value in the data.
+  * If there is only one unique value - returns it.
+  * If there are zero or at least two distinct values - returns NULL.
+  */
 
-AggregateFunctionPtr createAggregateFunctionSingleValueOrNull(const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+struct AggregateFunctionSingleValueOrNullData
 {
-    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionsSingleValue, AggregateFunctionSingleValueOrNullData>(name, argument_types, parameters, settings));
+    using Self = AggregateFunctionSingleValueOrNullData;
+
+private:
+    SingleValueDataBaseMemoryBlock v_data;
+    bool first_value = true;
+    bool is_null = false;
+
+public:
+    [[noreturn]] explicit AggregateFunctionSingleValueOrNullData()
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionSingleValueOrNullData initialized empty");
+    }
+
+    explicit AggregateFunctionSingleValueOrNullData(TypeIndex value_type) { generateSingleValueFromTypeIndex(value_type, v_data); }
+
+    ~AggregateFunctionSingleValueOrNullData() { data().~SingleValueDataBase(); }
+
+    SingleValueDataBase & data() { return v_data.get(); }
+    const SingleValueDataBase & data() const { return v_data.get(); }
+
+    bool isNull() const { return is_null; }
+
+    void add(const IColumn & column, size_t row_num, Arena * arena)
+    {
+        if (first_value)
+        {
+            first_value = false;
+            data().set(column, row_num, arena);
+        }
+        else if (!data().isEqualTo(column, row_num))
+        {
+            is_null = true;
+        }
+    }
+
+    void add(const Self & to, Arena * arena)
+    {
+        if (!to.data().has())
+            return;
+
+        if (first_value && !to.first_value)
+        {
+            first_value = false;
+            data().set(to.data(), arena);
+        }
+        else if (!data().isEqualTo(to.data()))
+        {
+            is_null = true;
+        }
+    }
+
+    /// TODO: Methods write and read lose data (first_value and is_null)
+    /// Fixing it requires a breaking change (but it's probably necessary)
+    void write(WriteBuffer & buf, const ISerialization & serialization) const { data().write(buf, serialization); }
+
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena * arena) { data().read(buf, serialization, arena); }
+
+    void insertResultInto(IColumn & to) const
+    {
+        if (is_null || first_value)
+        {
+            to.insertDefault();
+        }
+        else
+        {
+            ColumnNullable & col = typeid_cast<ColumnNullable &>(to);
+            col.getNullMapColumn().insertDefault();
+            data().insertResultInto(col.getNestedColumn());
+        }
+    }
+};
+
+
+class AggregateFunctionSingleValueOrNull final
+    : public IAggregateFunctionDataHelper<AggregateFunctionSingleValueOrNullData, AggregateFunctionSingleValueOrNull>
+{
+private:
+    SerializationPtr serialization;
+    const TypeIndex value_type_index;
+
+public:
+    explicit AggregateFunctionSingleValueOrNull(const DataTypePtr & type)
+        : IAggregateFunctionDataHelper<AggregateFunctionSingleValueOrNullData, AggregateFunctionSingleValueOrNull>(
+            {type}, {}, makeNullable(type))
+        , serialization(type->getDefaultSerialization())
+        , value_type_index(WhichDataType(type).idx)
+    {
+    }
+
+    void create(AggregateDataPtr __restrict place) const override { new (place) AggregateFunctionSingleValueOrNullData(value_type_index); }
+
+    String getName() const override { return "singleValueOrNull"; }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        data(place).add(*columns[0], row_num, arena);
+    }
+
+    void addBatchSinglePlace(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (data(place).isNull())
+            return;
+        IAggregateFunctionDataHelper<Data, AggregateFunctionSingleValueOrNull>::addBatchSinglePlace(
+            row_begin, row_end, place, columns, arena, if_argument_pos);
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        const UInt8 * __restrict null_map,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (data(place).isNull())
+            return;
+        IAggregateFunctionDataHelper<Data, AggregateFunctionSingleValueOrNull>::addBatchSinglePlaceNotNull(
+            row_begin, row_end, place, columns, null_map, arena, if_argument_pos);
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        data(place).add(*columns[0], 0, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        data(place).add(data(rhs), arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        data(place).write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        data(place).read(buf, *serialization, arena);
+    }
+
+    bool allocatesMemoryInArena() const override { return singleValueTypeAllocatesMemoryInArena(value_type_index); }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        data(place).insertResultInto(to);
+    }
+};
+
+AggregateFunctionPtr createAggregateFunctionSingleValueOrNull(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    assertUnary(name, argument_types);
+
+    const DataTypePtr & res_type = argument_types[0];
+    return AggregateFunctionPtr(new AggregateFunctionSingleValueOrNull(res_type));
 }
 
 }
@@ -22,6 +196,4 @@ void registerAggregateFunctionSingleValueOrNull(AggregateFunctionFactory & facto
 {
     factory.registerFunction("singleValueOrNull", createAggregateFunctionSingleValueOrNull);
 }
-
-
 }
diff --git a/src/AggregateFunctions/AggregateFunctionStatistics.cpp b/src/AggregateFunctions/AggregateFunctionStatistics.cpp
index e9d9b7409ca..15fede94fe7 100644
--- a/src/AggregateFunctions/AggregateFunctionStatistics.cpp
+++ b/src/AggregateFunctions/AggregateFunctionStatistics.cpp
@@ -150,13 +150,13 @@ private:
 
     Float64 getResult(ConstAggregateDataPtr __restrict place) const
     {
-        const auto & data = this->data(place);
+        const auto & dt = data(place);
         switch (kind)
         {
-            case VarKind::varSampStable: return getVarSamp(data.m2, data.count);
-            case VarKind::stddevSampStable: return getStddevSamp(data.m2, data.count);
-            case VarKind::varPopStable: return getVarPop(data.m2, data.count);
-            case VarKind::stddevPopStable: return getStddevPop(data.m2, data.count);
+            case VarKind::varSampStable: return getVarSamp(dt.m2, dt.count);
+            case VarKind::stddevSampStable: return getStddevSamp(dt.m2, dt.count);
+            case VarKind::varPopStable: return getVarPop(dt.m2, dt.count);
+            case VarKind::stddevPopStable: return getStddevPop(dt.m2, dt.count);
         }
     }
 
@@ -182,22 +182,22 @@ public:
 
     void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena *) const override
     {
-        this->data(place).update(*columns[0], row_num);
+        data(place).update(*columns[0], row_num);
     }
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
-        this->data(place).mergeWith(this->data(rhs));
+        data(place).mergeWith(data(rhs));
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
     {
-        this->data(place).serialize(buf);
+        data(place).serialize(buf);
     }
 
     void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena *) const override
     {
-        this->data(place).deserialize(buf);
+        data(place).deserialize(buf);
     }
 
     void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
diff --git a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
index f9a60c0c0b4..cb20d54b2a8 100644
--- a/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
+++ b/src/AggregateFunctions/AggregateFunctionStatisticsSimple.h
@@ -234,9 +234,6 @@ 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 *)
@@ -273,5 +270,3 @@ AggregateFunctionPtr createAggregateFunctionStatisticsBinary(
 }
 
 }
-
-}
diff --git a/src/AggregateFunctions/AggregateFunctionSum.h b/src/AggregateFunctions/AggregateFunctionSum.h
index 5781ab69c6b..58aaddf357a 100644
--- a/src/AggregateFunctions/AggregateFunctionSum.h
+++ b/src/AggregateFunctions/AggregateFunctionSum.h
@@ -146,9 +146,7 @@ struct AggregateFunctionSumData
         size_t count = end - start;
         const auto * end_ptr = ptr + count;
 
-        if constexpr (
-            (is_integer<T> && !is_big_int_v<T>)
-            || (is_decimal<T> && !std::is_same_v<T, Decimal256> && !std::is_same_v<T, Decimal128>))
+        if constexpr ((is_integer<T> || is_decimal<T>) && !is_over_big_int<T>)
         {
             /// For integers we can vectorize the operation if we replace the null check using a multiplication (by 0 for null, 1 for not null)
             /// https://quick-bench.com/q/MLTnfTvwC2qZFVeWHfOBR3U7a8I
@@ -163,8 +161,39 @@ struct AggregateFunctionSumData
             Impl::add(sum, local_sum);
             return;
         }
+        else if constexpr (is_over_big_int<T>)
+        {
+            /// Use a mask to discard or keep the value to reduce branch miss.
+            /// Notice that for (U)Int128 or Decimal128, MaskType is Int8 instead of Int64, otherwise extra branches will be introduced by compiler (for unknown reason) and performance will be worse.
+            using MaskType = std::conditional_t<sizeof(T) == 16, Int8, Int64>;
+            alignas(64) const MaskType masks[2] = {0, -1};
+            T local_sum{};
+            while (ptr < end_ptr)
+            {
+                Value v = *ptr;
+                if constexpr (!add_if_zero)
+                {
+                    if constexpr (is_integer<T>)
+                        v &= masks[!!*condition_map];
+                    else
+                        v.value &= masks[!!*condition_map];
+                }
+                else
+                {
+                    if constexpr (is_integer<T>)
+                        v &= masks[!*condition_map];
+                    else
+                        v.value &= masks[!*condition_map];
+                }
 
-        if constexpr (std::is_floating_point_v<T>)
+                Impl::add(local_sum, v);
+                ++ptr;
+                ++condition_map;
+            }
+            Impl::add(sum, local_sum);
+            return;
+        }
+        else if constexpr (std::is_floating_point_v<T>)
         {
             /// For floating point we use a similar trick as above, except that now we  reinterpret the floating point number as an unsigned
             /// integer of the same size and use a mask instead (0 to discard, 0xFF..FF to keep)
diff --git a/src/AggregateFunctions/AggregateFunctionTopK.cpp b/src/AggregateFunctions/AggregateFunctionTopK.cpp
index 745fa9a6f23..d0e4f507d46 100644
--- a/src/AggregateFunctions/AggregateFunctionTopK.cpp
+++ b/src/AggregateFunctions/AggregateFunctionTopK.cpp
@@ -5,12 +5,14 @@
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeIPv4andIPv6.h>
+#include <DataTypes/DataTypesNumber.h>
 
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadHelpersArena.h>
 
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypeString.h>
 
 #include <Columns/ColumnArray.h>
@@ -19,6 +21,7 @@
 #include <Common/assert_cast.h>
 
 #include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/KeyHolderHelpers.h>
 
 
 namespace DB
@@ -30,6 +33,7 @@ namespace ErrorCodes
 {
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
 }
@@ -57,23 +61,53 @@ protected:
     using State = AggregateFunctionTopKData<T>;
     UInt64 threshold;
     UInt64 reserved;
+    bool include_counts;
+    bool is_approx_top_k;
 
 public:
-    AggregateFunctionTopK(UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params)
-        : IAggregateFunctionDataHelper<AggregateFunctionTopKData<T>, AggregateFunctionTopK<T, is_weighted>>(argument_types_, params, createResultType(argument_types_))
-        , threshold(threshold_), reserved(load_factor * threshold)
+    AggregateFunctionTopK(UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params)
+        : IAggregateFunctionDataHelper<AggregateFunctionTopKData<T>, AggregateFunctionTopK<T, is_weighted>>(argument_types_, params, createResultType(argument_types_, include_counts_))
+        , threshold(threshold_), reserved(reserved_), include_counts(include_counts_), is_approx_top_k(is_approx_top_k_)
     {}
 
-    AggregateFunctionTopK(UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params, const DataTypePtr & result_type_)
+        AggregateFunctionTopK(UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params, const DataTypePtr & result_type_)
         : IAggregateFunctionDataHelper<AggregateFunctionTopKData<T>, AggregateFunctionTopK<T, is_weighted>>(argument_types_, params, result_type_)
-        , threshold(threshold_), reserved(load_factor * threshold)
+        , threshold(threshold_), reserved(reserved_), include_counts(include_counts_), is_approx_top_k(is_approx_top_k_)
     {}
 
-    String getName() const override { return is_weighted ? "topKWeighted" : "topK"; }
-
-    static DataTypePtr createResultType(const DataTypes & argument_types_)
+    String getName() const override
     {
-        return std::make_shared<DataTypeArray>(argument_types_[0]);
+        if (is_approx_top_k)
+            return  is_weighted ? "approx_top_sum" : "approx_top_k";
+        else
+            return  is_weighted ? "topKWeighted" : "topK";
+    }
+
+    static DataTypePtr createResultType(const DataTypes & argument_types_, bool include_counts_)
+    {
+        if (include_counts_)
+        {
+            DataTypes types
+            {
+                argument_types_[0],
+                std::make_shared<DataTypeUInt64>(),
+                std::make_shared<DataTypeUInt64>(),
+            };
+
+            Strings names
+            {
+                "item",
+                "count",
+                "error",
+            };
+
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(
+                std::move(types),
+                std::move(names)
+            ));
+        }
+        else
+            return std::make_shared<DataTypeArray>(argument_types_[0]);
     }
 
     bool allocatesMemoryInArena() const override { return false; }
@@ -121,13 +155,40 @@ public:
 
         offsets_to.push_back(offsets_to.back() + size);
 
-        typename ColumnVector<T>::Container & data_to = assert_cast<ColumnVector<T> &>(arr_to.getData()).getData();
-        size_t old_size = data_to.size();
-        data_to.resize(old_size + size);
+        IColumn & data_to = arr_to.getData();
 
-        size_t i = 0;
-        for (auto it = result_vec.begin(); it != result_vec.end(); ++it, ++i)
-            data_to[old_size + i] = it->key;
+        if (include_counts)
+        {
+            auto & column_tuple = assert_cast<ColumnTuple &>(data_to);
+
+            auto & column_key = assert_cast<ColumnVector<T> &>(column_tuple.getColumn(0)).getData();
+            auto & column_count = assert_cast<ColumnVector<UInt64> &>(column_tuple.getColumn(1)).getData();
+            auto & column_error = assert_cast<ColumnVector<UInt64> &>(column_tuple.getColumn(2)).getData();
+            size_t old_size = column_key.size();
+            column_key.resize(old_size + size);
+            column_count.resize(old_size + size);
+            column_error.resize(old_size + size);
+
+            size_t i = 0;
+            for (auto it = result_vec.begin(); it != result_vec.end(); ++it, ++i)
+            {
+                column_key[old_size + i] = it->key;
+                column_count[old_size + i] = it->count;
+                column_error[old_size + i] = it->error;
+            }
+
+        } else
+        {
+
+            auto & column_key = assert_cast<ColumnVector<T> &>(data_to).getData();
+            size_t old_size = column_key.size();
+            column_key.resize(old_size + size);
+            size_t i = 0;
+            for (auto it = result_vec.begin(); it != result_vec.end(); ++it, ++i)
+            {
+                column_key[old_size + i] = it->key;
+            }
+        }
     }
 };
 
@@ -152,20 +213,50 @@ private:
 
     UInt64 threshold;
     UInt64 reserved;
-
-    static void deserializeAndInsert(StringRef str, IColumn & data_to);
+    bool include_counts;
+    bool is_approx_top_k;
 
 public:
     AggregateFunctionTopKGeneric(
-        UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params)
-        : IAggregateFunctionDataHelper<AggregateFunctionTopKGenericData, AggregateFunctionTopKGeneric<is_plain_column, is_weighted>>(argument_types_, params, createResultType(argument_types_))
-        , threshold(threshold_), reserved(load_factor * threshold) {}
+        UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params)
+        : IAggregateFunctionDataHelper<AggregateFunctionTopKGenericData, AggregateFunctionTopKGeneric<is_plain_column, is_weighted>>(argument_types_, params, createResultType(argument_types_, include_counts_))
+        , threshold(threshold_), reserved(reserved_), include_counts(include_counts_), is_approx_top_k(is_approx_top_k_) {}
 
-    String getName() const override { return is_weighted ? "topKWeighted" : "topK"; }
-
-    static DataTypePtr createResultType(const DataTypes & argument_types_)
+    String getName() const override
     {
-        return std::make_shared<DataTypeArray>(argument_types_[0]);
+        if (is_approx_top_k)
+            return  is_weighted ? "approx_top_sum" : "approx_top_k";
+        else
+            return  is_weighted ? "topKWeighted" : "topK";
+    }
+
+    static DataTypePtr createResultType(const DataTypes & argument_types_, bool include_counts_)
+    {
+        if (include_counts_)
+        {
+            DataTypes types
+            {
+                argument_types_[0],
+                std::make_shared<DataTypeUInt64>(),
+                std::make_shared<DataTypeUInt64>(),
+            };
+
+            Strings names
+            {
+                "item",
+                "count",
+                "error",
+            };
+
+            return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(
+                std::move(types),
+                std::move(names)
+            ));
+
+        } else
+        {
+            return std::make_shared<DataTypeArray>(argument_types_[0]);
+        }
     }
 
     bool allocatesMemoryInArena() const override
@@ -235,6 +326,9 @@ public:
 
     void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena *) const override
     {
+        if (!this->data(rhs).value.size())
+            return;
+
         auto & set = this->data(place).value;
         if (set.capacity() != reserved)
             set.resize(reserved);
@@ -245,17 +339,32 @@ public:
     {
         ColumnArray & arr_to = assert_cast<ColumnArray &>(to);
         ColumnArray::Offsets & offsets_to = arr_to.getOffsets();
+
+        const typename State::Set & set = this->data(place).value;
+        auto result_vec = set.topK(threshold);
+        size_t size = result_vec.size();
+        offsets_to.push_back(offsets_to.back() + size);
+
         IColumn & data_to = arr_to.getData();
 
-        auto result_vec = this->data(place).value.topK(threshold);
-        offsets_to.push_back(offsets_to.back() + result_vec.size());
-
-        for (auto & elem : result_vec)
+        if (include_counts)
         {
-            if constexpr (is_plain_column)
-                data_to.insertData(elem.key.data, elem.key.size);
-            else
-                data_to.deserializeAndInsertFromArena(elem.key.data);
+            auto & column_tuple = assert_cast<ColumnTuple &>(data_to);
+            IColumn & column_key = column_tuple.getColumn(0);
+            IColumn & column_count = column_tuple.getColumn(1);
+            IColumn & column_error = column_tuple.getColumn(2);
+            for (auto &elem : result_vec)
+            {
+                column_count.insert(elem.count);
+                column_error.insert(elem.error);
+                deserializeAndInsert<is_plain_column>(elem.key, column_key);
+            }
+        } else
+        {
+            for (auto & elem : result_vec)
+            {
+                deserializeAndInsert<is_plain_column>(elem.key, data_to);
+            }
         }
     }
 };
@@ -268,13 +377,14 @@ class AggregateFunctionTopKDate : public AggregateFunctionTopK<DataTypeDate::Fie
 public:
     using AggregateFunctionTopK<DataTypeDate::FieldType, is_weighted>::AggregateFunctionTopK;
 
-    AggregateFunctionTopKDate(UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params)
+    AggregateFunctionTopKDate(UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params)
         : AggregateFunctionTopK<DataTypeDate::FieldType, is_weighted>(
             threshold_,
-            load_factor,
+            reserved_,
+            include_counts_,
+            is_approx_top_k_,
             argument_types_,
-            params,
-            std::make_shared<DataTypeArray>(std::make_shared<DataTypeDate>()))
+            params)
     {}
 };
 
@@ -284,13 +394,14 @@ class AggregateFunctionTopKDateTime : public AggregateFunctionTopK<DataTypeDateT
 public:
     using AggregateFunctionTopK<DataTypeDateTime::FieldType, is_weighted>::AggregateFunctionTopK;
 
-    AggregateFunctionTopKDateTime(UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params)
+    AggregateFunctionTopKDateTime(UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params)
         : AggregateFunctionTopK<DataTypeDateTime::FieldType, is_weighted>(
             threshold_,
-            load_factor,
+            reserved_,
+            include_counts_,
+            is_approx_top_k_,
             argument_types_,
-            params,
-            std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()))
+            params)
     {}
 };
 
@@ -300,40 +411,41 @@ class AggregateFunctionTopKIPv4 : public AggregateFunctionTopK<DataTypeIPv4::Fie
 public:
     using AggregateFunctionTopK<DataTypeIPv4::FieldType, is_weighted>::AggregateFunctionTopK;
 
-    AggregateFunctionTopKIPv4(UInt64 threshold_, UInt64 load_factor, const DataTypes & argument_types_, const Array & params)
+    AggregateFunctionTopKIPv4(UInt64 threshold_, UInt64 reserved_, bool include_counts_, bool is_approx_top_k_, const DataTypes & argument_types_, const Array & params)
         : AggregateFunctionTopK<DataTypeIPv4::FieldType, is_weighted>(
             threshold_,
-            load_factor,
+            reserved_,
+            include_counts_,
+            is_approx_top_k_,
             argument_types_,
-            params,
-            std::make_shared<DataTypeArray>(std::make_shared<DataTypeIPv4>()))
+            params)
     {}
 };
 
 
 template <bool is_weighted>
-IAggregateFunction * createWithExtraTypes(const DataTypes & argument_types, UInt64 threshold, UInt64 load_factor, const Array & params)
+IAggregateFunction * createWithExtraTypes(const DataTypes & argument_types, UInt64 threshold, UInt64 reserved, bool include_counts, bool is_approx_top_k, const Array & params)
 {
     if (argument_types.empty())
         throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Got empty arguments list");
 
     WhichDataType which(argument_types[0]);
     if (which.idx == TypeIndex::Date)
-        return new AggregateFunctionTopKDate<is_weighted>(threshold, load_factor, argument_types, params);
+        return new AggregateFunctionTopKDate<is_weighted>(threshold, reserved, include_counts, is_approx_top_k, argument_types, params);
     if (which.idx == TypeIndex::DateTime)
-        return new AggregateFunctionTopKDateTime<is_weighted>(threshold, load_factor, argument_types, params);
+        return new AggregateFunctionTopKDateTime<is_weighted>(threshold, reserved, include_counts, is_approx_top_k, argument_types, params);
     if (which.idx == TypeIndex::IPv4)
-        return new AggregateFunctionTopKIPv4<is_weighted>(threshold, load_factor, argument_types, params);
+        return new AggregateFunctionTopKIPv4<is_weighted>(threshold, reserved, include_counts, is_approx_top_k, argument_types, params);
 
     /// Check that we can use plain version of AggregateFunctionTopKGeneric
     if (argument_types[0]->isValueUnambiguouslyRepresentedInContiguousMemoryRegion())
-        return new AggregateFunctionTopKGeneric<true, is_weighted>(threshold, load_factor, argument_types, params);
+        return new AggregateFunctionTopKGeneric<true, is_weighted>(threshold, reserved, include_counts, is_approx_top_k, argument_types, params);
     else
-        return new AggregateFunctionTopKGeneric<false, is_weighted>(threshold, load_factor, argument_types, params);
+        return new AggregateFunctionTopKGeneric<false, is_weighted>(threshold, reserved, include_counts, is_approx_top_k, argument_types, params);
 }
 
 
-template <bool is_weighted>
+template <bool is_weighted, bool is_approx_top_k>
 AggregateFunctionPtr createAggregateFunctionTopK(const std::string & name, const DataTypes & argument_types, const Array & params, const Settings *)
 {
     if (!is_weighted)
@@ -349,40 +461,65 @@ AggregateFunctionPtr createAggregateFunctionTopK(const std::string & name, const
 
     UInt64 threshold = 10;  /// default values
     UInt64 load_factor = 3;
+    bool include_counts = is_approx_top_k;
+    UInt64 reserved = threshold * load_factor;
 
     if (!params.empty())
     {
-        if (params.size() > 2)
+        if (params.size() > 3)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                            "Aggregate function '{}' requires two parameters or less", name);
-
-        if (params.size() == 2)
-        {
-            load_factor = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[1]);
-
-            if (load_factor < 1)
-                throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
-                                "Too small parameter 'load_factor' for aggregate function '{}' (got {}, minimum is 1)", name, load_factor);
-        }
+                            "Aggregate function '{}' requires three parameters or less", name);
 
         threshold = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[0]);
 
-        if (threshold > DB::TOP_K_MAX_SIZE || load_factor > DB::TOP_K_MAX_SIZE || threshold * load_factor > DB::TOP_K_MAX_SIZE)
-            throw Exception(
-                ErrorCodes::ARGUMENT_OUT_OF_BOUND,
-                "Too large parameter(s) for aggregate function '{}' (maximum is {})",
-                name,
-                toString(DB::TOP_K_MAX_SIZE));
+        if (params.size() >= 2)
+        {
+            if (is_approx_top_k)
+            {
+                reserved = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[1]);
 
-        if (threshold == 0)
+                if (reserved < 1)
+                    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                                    "Too small parameter 'reserved' for aggregate function '{}' (got {}, minimum is 1)", name, reserved);
+            } else
+            {
+                load_factor = applyVisitor(FieldVisitorConvertToNumber<UInt64>(), params[1]);
+
+                if (load_factor < 1)
+                    throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                                    "Too small parameter 'load_factor' for aggregate function '{}' (got {}, minimum is 1)", name, load_factor);
+            }
+        }
+
+        if (params.size() == 3)
+        {
+            String option = params.at(2).safeGet<String>();
+
+            if (option == "counts")
+                include_counts = true;
+            else
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Aggregate function {} doesn't support a parameter: {}", name, option);
+
+        }
+
+        if (!is_approx_top_k)
+        {
+            reserved = threshold * load_factor;
+        }
+
+        if (reserved > DB::TOP_K_MAX_SIZE || load_factor > DB::TOP_K_MAX_SIZE || threshold > DB::TOP_K_MAX_SIZE)
+            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND,
+                            "Too large parameter(s) for aggregate function '{}' (maximum is {})", name, toString(TOP_K_MAX_SIZE));
+
+        if (threshold == 0 || reserved == 0)
             throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Parameter 0 is illegal for aggregate function '{}'", name);
     }
 
     AggregateFunctionPtr res(createWithNumericType<AggregateFunctionTopK, is_weighted>(
-        *argument_types[0], threshold, load_factor, argument_types, params));
+        *argument_types[0], threshold, reserved, include_counts, is_approx_top_k, argument_types, params));
 
     if (!res)
-        res = AggregateFunctionPtr(createWithExtraTypes<is_weighted>(argument_types, threshold, load_factor, params));
+        res = AggregateFunctionPtr(createWithExtraTypes<is_weighted>(argument_types, threshold, reserved, include_counts, is_approx_top_k, params));
 
     if (!res)
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
@@ -396,8 +533,11 @@ void registerAggregateFunctionTopK(AggregateFunctionFactory & factory)
 {
     AggregateFunctionProperties properties = { .returns_default_when_only_null = false, .is_order_dependent = true };
 
-    factory.registerFunction("topK", { createAggregateFunctionTopK<false>, properties });
-    factory.registerFunction("topKWeighted", { createAggregateFunctionTopK<true>, properties });
+    factory.registerFunction("topK", { createAggregateFunctionTopK<false, false>, properties });
+    factory.registerFunction("topKWeighted", { createAggregateFunctionTopK<true, false>, properties });
+    factory.registerFunction("approx_top_k", { createAggregateFunctionTopK<false, true>, properties }, AggregateFunctionFactory::CaseInsensitive);
+    factory.registerFunction("approx_top_sum", { createAggregateFunctionTopK<true, true>, properties }, AggregateFunctionFactory::CaseInsensitive);
+    factory.registerAlias("approx_top_count", "approx_top_k", AggregateFunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/AggregateFunctions/AggregateFunctionUniq.h b/src/AggregateFunctions/AggregateFunctionUniq.h
index f20fb8cb933..cef23f766c7 100644
--- a/src/AggregateFunctions/AggregateFunctionUniq.h
+++ b/src/AggregateFunctions/AggregateFunctionUniq.h
@@ -350,7 +350,7 @@ struct Adder
 
         if constexpr (Data::is_able_to_parallelize_merge)
         {
-            if (data.set.isSingleLevel() && data.set.size() > 100'000)
+            if (data.set.isSingleLevel() && data.set.worthConvertingToTwoLevel(data.set.size()))
                 data.set.convertToTwoLevel();
         }
     }
@@ -457,9 +457,9 @@ public:
         detail::Adder<T, Data>::add(this->data(place), columns, num_args, row_begin, row_end, flags, null_map);
     }
 
-    bool isParallelizeMergePrepareNeeded() const override { return is_parallelize_merge_prepare_needed;}
+    bool isParallelizeMergePrepareNeeded() const override { return is_parallelize_merge_prepare_needed; }
 
-    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
         if constexpr (is_parallelize_merge_prepare_needed)
         {
@@ -469,7 +469,7 @@ public:
             for (size_t i = 0; i < data_vec.size(); ++i)
                 data_vec[i] = &this->data(places[i]).set;
 
-            DataSet::parallelizeMergePrepare(data_vec, thread_pool);
+            DataSet::parallelizeMergePrepare(data_vec, thread_pool, is_cancelled);
         }
         else
         {
@@ -483,11 +483,12 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return is_able_to_parallelize_merge; }
+    bool canOptimizeEqualKeysRanges() const override { return !is_able_to_parallelize_merge; }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena *) const override
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena *) const override
     {
         if constexpr (is_able_to_parallelize_merge)
-            this->data(place).set.merge(this->data(rhs).set, &thread_pool);
+            this->data(place).set.merge(this->data(rhs).set, &thread_pool, &is_cancelled);
         else
             this->data(place).set.merge(this->data(rhs).set);
     }
@@ -576,11 +577,12 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return is_able_to_parallelize_merge; }
+    bool canOptimizeEqualKeysRanges() const override { return !is_able_to_parallelize_merge; }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena *) const override
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena *) const override
     {
         if constexpr (is_able_to_parallelize_merge)
-            this->data(place).set.merge(this->data(rhs).set, &thread_pool);
+            this->data(place).set.merge(this->data(rhs).set, &thread_pool, &is_cancelled);
         else
             this->data(place).set.merge(this->data(rhs).set);
     }
diff --git a/src/AggregateFunctions/AggregateFunctionUniqCombined.h b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
index 10774442610..6d5486a3b09 100644
--- a/src/AggregateFunctions/AggregateFunctionUniqCombined.h
+++ b/src/AggregateFunctions/AggregateFunctionUniqCombined.h
@@ -42,9 +42,6 @@ struct UniqCombinedHashTableGrower : public HashTableGrowerWithPrecalculation<>
     void increaseSize() { increaseSizeDegree(1); }
 };
 
-namespace
-{
-
 template <typename T, UInt8 K, typename HashValueType>
 struct AggregateFunctionUniqCombinedData
 {
@@ -268,8 +265,6 @@ AggregateFunctionPtr createAggregateFunctionWithK(const DataTypes & argument_typ
         return std::make_shared<typename WithK<K, HashValueType>::template AggregateFunctionVariadic<false, false>>(argument_types, params);
 }
 
-}
-
 template <UInt8 K>
 AggregateFunctionPtr createAggregateFunctionWithHashType(bool use_64_bit_hash, const DataTypes & argument_types, const Array & params)
 {
diff --git a/src/AggregateFunctions/AggregateFunctionsArgMinArgMax.cpp b/src/AggregateFunctions/AggregateFunctionsArgMinArgMax.cpp
new file mode 100644
index 00000000000..e8f40120152
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionsArgMinArgMax.cpp
@@ -0,0 +1,236 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/SingleValueData.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/IDataType.h>
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+
+extern const int CORRUPTED_DATA;
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+template <class ValueType>
+struct AggregateFunctionArgMinMaxData
+{
+private:
+    SingleValueDataBaseMemoryBlock result_data;
+    ValueType value_data;
+
+public:
+    SingleValueDataBase & result() { return result_data.get(); }
+    const SingleValueDataBase & result() const { return result_data.get(); }
+    ValueType & value() { return value_data; }
+    const ValueType & value() const { return value_data; }
+
+    [[noreturn]] explicit AggregateFunctionArgMinMaxData()
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "AggregateFunctionArgMinMaxData initialized empty");
+    }
+
+    explicit AggregateFunctionArgMinMaxData(TypeIndex result_type) : value_data()
+    {
+        generateSingleValueFromTypeIndex(result_type, result_data);
+    }
+
+    ~AggregateFunctionArgMinMaxData() { result().~SingleValueDataBase(); }
+};
+
+static_assert(
+    sizeof(AggregateFunctionArgMinMaxData<Int8>) <= 2 * SingleValueDataBase::MAX_STORAGE_SIZE,
+    "Incorrect size of AggregateFunctionArgMinMaxData struct");
+
+/// Returns the first arg value found for the minimum/maximum value. Example: argMin(arg, value).
+template <typename ValueData, bool isMin>
+class AggregateFunctionArgMinMax final
+    : public IAggregateFunctionDataHelper<AggregateFunctionArgMinMaxData<ValueData>, AggregateFunctionArgMinMax<ValueData, isMin>>
+{
+private:
+    const DataTypePtr & type_val;
+    const SerializationPtr serialization_res;
+    const SerializationPtr serialization_val;
+    const TypeIndex result_type_index;
+
+    using Base = IAggregateFunctionDataHelper<AggregateFunctionArgMinMaxData<ValueData>, AggregateFunctionArgMinMax<ValueData, isMin>>;
+
+public:
+    explicit AggregateFunctionArgMinMax(const DataTypes & argument_types_)
+        : Base(argument_types_, {}, argument_types_[0])
+        , type_val(this->argument_types[1])
+        , serialization_res(this->argument_types[0]->getDefaultSerialization())
+        , serialization_val(this->argument_types[1]->getDefaultSerialization())
+        , result_type_index(WhichDataType(this->argument_types[0]).idx)
+    {
+        if (!type_val->isComparable())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of second argument of aggregate function {} because the values of that data type are not comparable",
+                type_val->getName(),
+                getName());
+    }
+
+    void create(AggregateDataPtr __restrict place) const override /// NOLINT
+    {
+        new (place) AggregateFunctionArgMinMaxData<ValueData>(result_type_index);
+    }
+
+    String getName() const override
+    {
+        if constexpr (isMin)
+            return "argMin";
+        else
+            return "argMax";
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        if constexpr (isMin)
+        {
+            if (this->data(place).value().setIfSmaller(*columns[1], row_num, arena))
+                this->data(place).result().set(*columns[0], row_num, arena);
+        }
+        else
+        {
+            if (this->data(place).value().setIfGreater(*columns[1], row_num, arena))
+                this->data(place).result().set(*columns[0], row_num, arena);
+        }
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        add(place, columns, 0, arena);
+    }
+
+    void addBatchSinglePlace(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        std::optional<size_t> idx;
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            if constexpr (isMin)
+                idx = this->data(place).value().getSmallestIndexNotNullIf(*columns[1], nullptr, if_map.data(), row_begin, row_end);
+            else
+                idx = this->data(place).value().getGreatestIndexNotNullIf(*columns[1], nullptr, if_map.data(), row_begin, row_end);
+        }
+        else
+        {
+            if constexpr (isMin)
+                idx = this->data(place).value().getSmallestIndex(*columns[1], row_begin, row_end);
+            else
+                idx = this->data(place).value().getGreatestIndex(*columns[1], row_begin, row_end);
+        }
+
+        if (idx)
+            add(place, columns, *idx, arena);
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        const UInt8 * __restrict null_map,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        std::optional<size_t> idx;
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            if constexpr (isMin)
+                idx = this->data(place).value().getSmallestIndexNotNullIf(*columns[1], null_map, if_map.data(), row_begin, row_end);
+            else
+                idx = this->data(place).value().getGreatestIndexNotNullIf(*columns[1], null_map, if_map.data(), row_begin, row_end);
+        }
+        else
+        {
+            if constexpr (isMin)
+                idx = this->data(place).value().getSmallestIndexNotNullIf(*columns[1], null_map, nullptr, row_begin, row_end);
+            else
+                idx = this->data(place).value().getGreatestIndexNotNullIf(*columns[1], null_map, nullptr, row_begin, row_end);
+        }
+
+        if (idx)
+            add(place, columns, *idx, arena);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if constexpr (isMin)
+        {
+            if (this->data(place).value().setIfSmaller(this->data(rhs).value(), arena))
+                this->data(place).result().set(this->data(rhs).result(), arena);
+        }
+        else
+        {
+            if (this->data(place).value().setIfGreater(this->data(rhs).value(), arena))
+                this->data(place).result().set(this->data(rhs).result(), arena);
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        this->data(place).result().write(buf, *serialization_res);
+        this->data(place).value().write(buf, *serialization_val);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        this->data(place).result().read(buf, *serialization_res, arena);
+        this->data(place).value().read(buf, *serialization_val, arena);
+        if (unlikely(this->data(place).value().has() != this->data(place).result().has()))
+            throw Exception(
+                ErrorCodes::CORRUPTED_DATA,
+                "Invalid state of the aggregate function {}: has_value ({}) != has_result ({})",
+                getName(),
+                this->data(place).value().has(),
+                this->data(place).result().has());
+    }
+
+    bool allocatesMemoryInArena() const override
+    {
+        return singleValueTypeAllocatesMemoryInArena(result_type_index) || ValueData::allocatesMemoryInArena();
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        this->data(place).result().insertResultInto(to);
+    }
+};
+
+template <bool isMin>
+AggregateFunctionPtr createAggregateFunctionArgMinMax(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(createAggregateFunctionSingleValue<AggregateFunctionArgMinMax, /* unary */ false, isMin>(
+        name, argument_types, parameters, settings));
+}
+
+}
+
+void registerAggregateFunctionsArgMinArgMax(AggregateFunctionFactory & factory)
+{
+    AggregateFunctionProperties properties = {.returns_default_when_only_null = false, .is_order_dependent = true};
+    factory.registerFunction("argMin", {createAggregateFunctionArgMinMax<true>, properties});
+    factory.registerFunction("argMax", {createAggregateFunctionArgMinMax<false>, properties});
+}
+
+}
diff --git a/src/AggregateFunctions/AggregateFunctionsMinMax.cpp b/src/AggregateFunctions/AggregateFunctionsMinMax.cpp
new file mode 100644
index 00000000000..03e21c15a75
--- /dev/null
+++ b/src/AggregateFunctions/AggregateFunctionsMinMax.cpp
@@ -0,0 +1,202 @@
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/SingleValueData.h>
+#include <Common/Concepts.h>
+#include <Common/findExtreme.h>
+
+
+namespace DB
+{
+struct Settings;
+
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int NOT_IMPLEMENTED;
+}
+
+namespace
+{
+
+template <typename Data, bool isMin>
+class AggregateFunctionMinMax final : public IAggregateFunctionDataHelper<Data, AggregateFunctionMinMax<Data, isMin>>
+{
+private:
+    SerializationPtr serialization;
+
+public:
+    explicit AggregateFunctionMinMax(const DataTypes & argument_types_)
+        : IAggregateFunctionDataHelper<Data, AggregateFunctionMinMax<Data, isMin>>(argument_types_, {}, argument_types_[0])
+        , serialization(this->result_type->getDefaultSerialization())
+    {
+        if (!this->result_type->isComparable())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of argument of aggregate function {} because the values of that data type are not comparable",
+                this->result_type->getName(),
+                getName());
+    }
+
+    String getName() const override
+    {
+        if constexpr (isMin)
+            return "min";
+        else
+            return "max";
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        if constexpr (isMin)
+            this->data(place).setIfSmaller(*columns[0], row_num, arena);
+        else
+            this->data(place).setIfGreater(*columns[0], row_num, arena);
+    }
+
+    void addManyDefaults(AggregateDataPtr __restrict place, const IColumn ** columns, size_t, Arena * arena) const override
+    {
+        add(place, columns, 0, arena);
+    }
+
+    void addBatchSinglePlace(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            if constexpr (isMin)
+                this->data(place).setSmallestNotNullIf(*columns[0], nullptr, if_map.data(), row_begin, row_end, arena);
+            else
+                this->data(place).setGreatestNotNullIf(*columns[0], nullptr, if_map.data(), row_begin, row_end, arena);
+        }
+        else
+        {
+            if constexpr (isMin)
+                this->data(place).setSmallest(*columns[0], row_begin, row_end, arena);
+            else
+                this->data(place).setGreatest(*columns[0], row_begin, row_end, arena);
+        }
+    }
+
+    void addBatchSinglePlaceNotNull(
+        size_t row_begin,
+        size_t row_end,
+        AggregateDataPtr __restrict place,
+        const IColumn ** __restrict columns,
+        const UInt8 * __restrict null_map,
+        Arena * arena,
+        ssize_t if_argument_pos) const override
+    {
+        if (if_argument_pos >= 0)
+        {
+            const auto & if_map = assert_cast<const ColumnUInt8 &>(*columns[if_argument_pos]).getData();
+            if constexpr (isMin)
+                this->data(place).setSmallestNotNullIf(*columns[0], null_map, if_map.data(), row_begin, row_end, arena);
+            else
+                this->data(place).setGreatestNotNullIf(*columns[0], null_map, if_map.data(), row_begin, row_end, arena);
+        }
+        else
+        {
+            if constexpr (isMin)
+                this->data(place).setSmallestNotNullIf(*columns[0], null_map, nullptr, row_begin, row_end, arena);
+            else
+                this->data(place).setGreatestNotNullIf(*columns[0], null_map, nullptr, row_begin, row_end, arena);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if constexpr (isMin)
+            this->data(place).setIfSmaller(this->data(rhs), arena);
+        else
+            this->data(place).setIfGreater(this->data(rhs), arena);
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> /* version */) const override
+    {
+        this->data(place).write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr place, ReadBuffer & buf, std::optional<size_t> /* version */, Arena * arena) const override
+    {
+        this->data(place).read(buf, *serialization, arena);
+    }
+
+    bool allocatesMemoryInArena() const override { return Data::allocatesMemoryInArena(); }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena *) const override
+    {
+        this->data(place).insertResultInto(to);
+    }
+
+#if USE_EMBEDDED_COMPILER
+    bool isCompilable() const override
+    {
+        if constexpr (!Data::is_compilable)
+            return false;
+        else
+            return Data::isCompilable(*this->argument_types[0]);
+    }
+
+    void compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            Data::compileCreate(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void compileAdd(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, const ValuesWithType & arguments) const override
+    {
+        if constexpr (Data::is_compilable)
+            if constexpr (isMin)
+                Data::compileMin(builder, aggregate_data_ptr, arguments[0].value);
+            else
+                Data::compileMax(builder, aggregate_data_ptr, arguments[0].value);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    void
+    compileMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            if constexpr (isMin)
+                Data::compileMinMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+            else
+                Data::compileMaxMerge(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+
+    llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr) const override
+    {
+        if constexpr (Data::is_compilable)
+            return Data::compileGetResult(builder, aggregate_data_ptr);
+        else
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "{} is not JIT-compilable", getName());
+    }
+#endif
+};
+
+template <bool isMin>
+AggregateFunctionPtr createAggregateFunctionMinMax(
+    const std::string & name, const DataTypes & argument_types, const Array & parameters, const Settings * settings)
+{
+    return AggregateFunctionPtr(
+        createAggregateFunctionSingleValue<AggregateFunctionMinMax, /* unary */ true, isMin>(name, argument_types, parameters, settings));
+}
+}
+
+void registerAggregateFunctionsMinMax(AggregateFunctionFactory & factory)
+{
+    factory.registerFunction("min", createAggregateFunctionMinMax<true>, AggregateFunctionFactory::CaseInsensitive);
+    factory.registerFunction("max", createAggregateFunctionMinMax<false>, AggregateFunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp
deleted file mode 100644
index 38e19a0b8da..00000000000
--- a/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-#include "AggregateFunctionArgMinMax.h"
-#include "AggregateFunctionCombinatorFactory.h"
-
-#include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeString.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-}
-
-namespace
-{
-template <template <typename> class Data>
-class AggregateFunctionCombinatorArgMinMax final : public IAggregateFunctionCombinator
-{
-public:
-    String getName() const override { return Data<SingleValueDataGeneric>::name(); }
-
-    DataTypes transformArguments(const DataTypes & arguments) const override
-    {
-        if (arguments.empty())
-            throw Exception(
-                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                "Incorrect number of arguments for aggregate function with {} suffix",
-                getName());
-
-        return DataTypes(arguments.begin(), arguments.end() - 1);
-    }
-
-    AggregateFunctionPtr transformAggregateFunction(
-        const AggregateFunctionPtr & nested_function,
-        const AggregateFunctionProperties &,
-        const DataTypes & arguments,
-        const Array & params) const override
-    {
-        const DataTypePtr & argument_type = arguments.back();
-        WhichDataType which(argument_type);
-#define DISPATCH(TYPE) \
-    if (which.idx == TypeIndex::TYPE) \
-        return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<TYPE>>>>(nested_function, arguments, params); /// NOLINT
-        FOR_NUMERIC_TYPES(DISPATCH)
-#undef DISPATCH
-
-        if (which.idx == TypeIndex::Date)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DataTypeDate::FieldType>>>>(
-                nested_function, arguments, params);
-        if (which.idx == TypeIndex::DateTime)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(
-                nested_function, arguments, params);
-        if (which.idx == TypeIndex::DateTime64)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<DateTime64>>>>(nested_function, arguments, params);
-        if (which.idx == TypeIndex::Decimal32)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal32>>>>(nested_function, arguments, params);
-        if (which.idx == TypeIndex::Decimal64)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal64>>>>(nested_function, arguments, params);
-        if (which.idx == TypeIndex::Decimal128)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal128>>>>(nested_function, arguments, params);
-        if (which.idx == TypeIndex::Decimal256)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataFixed<Decimal256>>>>(nested_function, arguments, params);
-        if (which.idx == TypeIndex::String)
-            return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataString>>>(nested_function, arguments, params);
-
-        return std::make_shared<AggregateFunctionArgMinMax<Data<SingleValueDataGeneric>>>(nested_function, arguments, params);
-    }
-};
-
-template <typename Data>
-struct AggregateFunctionArgMinDataCapitalized : AggregateFunctionMinData<Data>
-{
-    static const char * name() { return "ArgMin"; }
-};
-
-template <typename Data>
-struct AggregateFunctionArgMaxDataCapitalized : AggregateFunctionMaxData<Data>
-{
-    static const char * name() { return "ArgMax"; }
-};
-
-}
-
-void registerAggregateFunctionCombinatorMinMax(AggregateFunctionCombinatorFactory & factory)
-{
-    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorArgMinMax<AggregateFunctionArgMinDataCapitalized>>());
-    factory.registerCombinator(std::make_shared<AggregateFunctionCombinatorArgMinMax<AggregateFunctionArgMaxDataCapitalized>>());
-}
-
-}
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h b/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h
deleted file mode 100644
index af20cd985fc..00000000000
--- a/src/AggregateFunctions/Combinators/AggregateFunctionArgMinMax.h
+++ /dev/null
@@ -1,111 +0,0 @@
-#pragma once
-
-#include <AggregateFunctions/IAggregateFunction.h>
-
-namespace DB
-{
-
-template <typename Key>
-class AggregateFunctionArgMinMax final : public IAggregateFunctionHelper<AggregateFunctionArgMinMax<Key>>
-{
-private:
-    AggregateFunctionPtr nested_function;
-    SerializationPtr serialization;
-    size_t key_col;
-    size_t key_offset;
-
-    Key & key(AggregateDataPtr __restrict place) const { return *reinterpret_cast<Key *>(place + key_offset); }
-    const Key & key(ConstAggregateDataPtr __restrict place) const { return *reinterpret_cast<const Key *>(place + key_offset); }
-
-public:
-    AggregateFunctionArgMinMax(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
-        : IAggregateFunctionHelper<AggregateFunctionArgMinMax<Key>>{arguments, params, nested_function_->getResultType()}
-        , nested_function{nested_function_}
-        , serialization(arguments.back()->getDefaultSerialization())
-        , key_col{arguments.size() - 1}
-        , key_offset{(nested_function->sizeOfData() + alignof(Key) - 1) / alignof(Key) * alignof(Key)}
-    {
-    }
-
-    String getName() const override { return nested_function->getName() + Key::name(); }
-
-    bool isState() const override { return nested_function->isState(); }
-
-    bool isVersioned() const override { return nested_function->isVersioned(); }
-
-    size_t getVersionFromRevision(size_t revision) const override { return nested_function->getVersionFromRevision(revision); }
-
-    size_t getDefaultVersion() const override { return nested_function->getDefaultVersion(); }
-
-    bool allocatesMemoryInArena() const override { return nested_function->allocatesMemoryInArena() || Key::allocatesMemoryInArena(); }
-
-    bool hasTrivialDestructor() const override { return nested_function->hasTrivialDestructor(); }
-
-    size_t sizeOfData() const override { return key_offset + sizeof(Key); }
-
-    size_t alignOfData() const override { return nested_function->alignOfData(); }
-
-    void create(AggregateDataPtr __restrict place) const override
-    {
-        nested_function->create(place);
-        new (place + key_offset) Key;
-    }
-
-    void destroy(AggregateDataPtr __restrict place) const noexcept override { nested_function->destroy(place); }
-
-    void destroyUpToState(AggregateDataPtr __restrict place) const noexcept override { nested_function->destroyUpToState(place); }
-
-    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
-    {
-        if (key(place).changeIfBetter(*columns[key_col], row_num, arena))
-        {
-            nested_function->destroy(place);
-            nested_function->create(place);
-            nested_function->add(place, columns, row_num, arena);
-        }
-        else if (key(place).isEqualTo(*columns[key_col], row_num))
-        {
-            nested_function->add(place, columns, row_num, arena);
-        }
-    }
-
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
-    {
-        if (key(place).changeIfBetter(key(rhs), arena))
-        {
-            nested_function->destroy(place);
-            nested_function->create(place);
-            nested_function->merge(place, rhs, arena);
-        }
-        else if (key(place).isEqualTo(key(rhs)))
-        {
-            nested_function->merge(place, rhs, arena);
-        }
-    }
-
-    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
-    {
-        nested_function->serialize(place, buf, version);
-        key(place).write(buf, *serialization);
-    }
-
-    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena * arena) const override
-    {
-        nested_function->deserialize(place, buf, version, arena);
-        key(place).read(buf, *serialization, arena);
-    }
-
-    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
-    {
-        nested_function->insertResultInto(place, to, arena);
-    }
-
-    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
-    {
-        nested_function->insertMergeResultInto(place, to, arena);
-    }
-
-    AggregateFunctionPtr getNestedFunction() const override { return nested_function; }
-};
-
-}
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionArray.h b/src/AggregateFunctions/Combinators/AggregateFunctionArray.h
index 7f38453f86b..1940985f8e3 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionArray.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionArray.h
@@ -142,10 +142,16 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return nested_func->isAbleToParallelizeMerge(); }
+    bool canOptimizeEqualKeysRanges() const override { return nested_func->canOptimizeEqualKeysRanges(); }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
-        nested_func->merge(place, rhs, thread_pool, arena);
+        nested_func->parallelizeMergePrepare(places, thread_pool, is_cancelled);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    {
+        nested_func->merge(place, rhs, thread_pool, is_cancelled, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorsArgMinArgMax.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorsArgMinArgMax.cpp
new file mode 100644
index 00000000000..71c2bab6f6b
--- /dev/null
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionCombinatorsArgMinArgMax.cpp
@@ -0,0 +1,212 @@
+#include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
+#include <AggregateFunctions/SingleValueData.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+
+struct AggregateFunctionCombinatorArgMinArgMaxData
+{
+private:
+    SingleValueDataBaseMemoryBlock v_data;
+
+public:
+    explicit AggregateFunctionCombinatorArgMinArgMaxData(TypeIndex value_type) { generateSingleValueFromTypeIndex(value_type, v_data); }
+
+    ~AggregateFunctionCombinatorArgMinArgMaxData() { data().~SingleValueDataBase(); }
+
+    SingleValueDataBase & data() { return v_data.get(); }
+    const SingleValueDataBase & data() const { return v_data.get(); }
+};
+
+template <bool isMin>
+class AggregateFunctionCombinatorArgMinArgMax final : public IAggregateFunctionHelper<AggregateFunctionCombinatorArgMinArgMax<isMin>>
+{
+    using Key = AggregateFunctionCombinatorArgMinArgMaxData;
+
+private:
+    AggregateFunctionPtr nested_function;
+    SerializationPtr serialization;
+    const size_t key_col;
+    const size_t key_offset;
+    const TypeIndex key_type_index;
+
+    AggregateFunctionCombinatorArgMinArgMaxData & data(AggregateDataPtr __restrict place) const /// NOLINT
+    {
+        return *reinterpret_cast<Key *>(place + key_offset);
+    }
+    const AggregateFunctionCombinatorArgMinArgMaxData & data(ConstAggregateDataPtr __restrict place) const
+    {
+        return *reinterpret_cast<const Key *>(place + key_offset);
+    }
+
+public:
+    AggregateFunctionCombinatorArgMinArgMax(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
+        : IAggregateFunctionHelper<AggregateFunctionCombinatorArgMinArgMax<isMin>>{arguments, params, nested_function_->getResultType()}
+        , nested_function{nested_function_}
+        , serialization(arguments.back()->getDefaultSerialization())
+        , key_col{arguments.size() - 1}
+        , key_offset{((nested_function->sizeOfData() + alignof(Key) - 1) / alignof(Key)) * alignof(Key)}
+        , key_type_index(WhichDataType(arguments[key_col]).idx)
+    {
+        if (!arguments[key_col]->isComparable())
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} for combinator {} because the values of that data type are not comparable",
+                arguments[key_col]->getName(),
+                getName());
+    }
+
+    String getName() const override
+    {
+        if constexpr (isMin)
+            return "ArgMin";
+        else
+            return "ArgMax";
+    }
+
+    bool isState() const override { return nested_function->isState(); }
+
+    bool isVersioned() const override { return nested_function->isVersioned(); }
+
+    size_t getVersionFromRevision(size_t revision) const override { return nested_function->getVersionFromRevision(revision); }
+
+    size_t getDefaultVersion() const override { return nested_function->getDefaultVersion(); }
+
+    bool allocatesMemoryInArena() const override
+    {
+        return nested_function->allocatesMemoryInArena() || singleValueTypeAllocatesMemoryInArena(key_type_index);
+    }
+
+    bool hasTrivialDestructor() const override
+    {
+        return nested_function->hasTrivialDestructor() && /*false*/ std::is_trivially_destructible_v<SingleValueDataBase>;
+    }
+
+    size_t sizeOfData() const override { return key_offset + sizeof(Key); }
+
+    size_t alignOfData() const override { return std::max(nested_function->alignOfData(), alignof(SingleValueDataBaseMemoryBlock)); }
+
+    void create(AggregateDataPtr __restrict place) const override
+    {
+        nested_function->create(place);
+        new (place + key_offset) Key(key_type_index);
+    }
+
+    void destroy(AggregateDataPtr __restrict place) const noexcept override
+    {
+        data(place).~Key();
+        nested_function->destroy(place);
+    }
+
+    void destroyUpToState(AggregateDataPtr __restrict place) const noexcept override
+    {
+        data(place).~Key();
+        nested_function->destroyUpToState(place);
+    }
+
+    void add(AggregateDataPtr __restrict place, const IColumn ** columns, size_t row_num, Arena * arena) const override
+    {
+        if ((isMin && data(place).data().setIfSmaller(*columns[key_col], row_num, arena))
+            || (!isMin && data(place).data().setIfGreater(*columns[key_col], row_num, arena)))
+        {
+            nested_function->destroy(place);
+            nested_function->create(place);
+            nested_function->add(place, columns, row_num, arena);
+        }
+        else if (data(place).data().isEqualTo(*columns[key_col], row_num))
+        {
+            nested_function->add(place, columns, row_num, arena);
+        }
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, Arena * arena) const override
+    {
+        if ((isMin && data(place).data().setIfSmaller(data(rhs).data(), arena))
+            || (!isMin && data(place).data().setIfGreater(data(rhs).data(), arena)))
+        {
+            nested_function->destroy(place);
+            nested_function->create(place);
+            nested_function->merge(place, rhs, arena);
+        }
+        else if (data(place).data().isEqualTo(data(rhs).data()))
+        {
+            nested_function->merge(place, rhs, arena);
+        }
+    }
+
+    void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
+    {
+        nested_function->serialize(place, buf, version);
+        data(place).data().write(buf, *serialization);
+    }
+
+    void deserialize(AggregateDataPtr __restrict place, ReadBuffer & buf, std::optional<size_t> version, Arena * arena) const override
+    {
+        nested_function->deserialize(place, buf, version, arena);
+        data(place).data().read(buf, *serialization, arena);
+    }
+
+    void insertResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_function->insertResultInto(place, to, arena);
+    }
+
+    void insertMergeResultInto(AggregateDataPtr __restrict place, IColumn & to, Arena * arena) const override
+    {
+        nested_function->insertMergeResultInto(place, to, arena);
+    }
+
+    AggregateFunctionPtr getNestedFunction() const override { return nested_function; }
+};
+
+template <bool isMin>
+class CombinatorArgMinArgMax final : public IAggregateFunctionCombinator
+{
+public:
+    String getName() const override
+    {
+        if constexpr (isMin)
+            return "ArgMin";
+        else
+            return "ArgMax";
+    }
+
+    DataTypes transformArguments(const DataTypes & arguments) const override
+    {
+        if (arguments.empty())
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Incorrect number of arguments for aggregate function with {} suffix",
+                getName());
+
+        return DataTypes(arguments.begin(), arguments.end() - 1);
+    }
+
+    AggregateFunctionPtr transformAggregateFunction(
+        const AggregateFunctionPtr & nested_function,
+        const AggregateFunctionProperties &,
+        const DataTypes & arguments,
+        const Array & params) const override
+    {
+        return std::make_shared<AggregateFunctionCombinatorArgMinArgMax<isMin>>(nested_function, arguments, params);
+    }
+};
+
+}
+
+void registerAggregateFunctionCombinatorsArgMinArgMax(AggregateFunctionCombinatorFactory & factory)
+{
+    factory.registerCombinator(std::make_shared<CombinatorArgMinArgMax<true>>());
+    factory.registerCombinator(std::make_shared<CombinatorArgMinArgMax<false>>());
+}
+
+}
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp
index 20a4bde6bb4..9b5ee79a533 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionIf.cpp
@@ -249,7 +249,7 @@ public:
         : Base(std::move(nested_function_), arguments, params), number_of_arguments(arguments.size())
     {
         if (number_of_arguments == 1)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: single argument is passed to AggregateFunctionIfNullVariadic");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Single argument is passed to AggregateFunctionIfNullVariadic");
 
         if (number_of_arguments > MAX_ARGS)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionIf.h b/src/AggregateFunctions/Combinators/AggregateFunctionIf.h
index e81f2203e7b..a893fc91780 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionIf.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionIf.h
@@ -165,10 +165,16 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return nested_func->isAbleToParallelizeMerge(); }
+    bool canOptimizeEqualKeysRanges() const override { return nested_func->canOptimizeEqualKeysRanges(); }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
-        nested_func->merge(place, rhs, thread_pool, arena);
+        nested_func->parallelizeMergePrepare(places, thread_pool, is_cancelled);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    {
+        nested_func->merge(place, rhs, thread_pool, is_cancelled, arena);
     }
 
     void mergeBatch(
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionMerge.h b/src/AggregateFunctions/Combinators/AggregateFunctionMerge.h
index 5b9e8e606af..4a39ec0ab87 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionMerge.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionMerge.h
@@ -111,10 +111,16 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return nested_func->isAbleToParallelizeMerge(); }
+    bool canOptimizeEqualKeysRanges() const override { return nested_func->canOptimizeEqualKeysRanges(); }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
-        nested_func->merge(place, rhs, thread_pool, arena);
+        nested_func->parallelizeMergePrepare(places, thread_pool, is_cancelled);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    {
+        nested_func->merge(place, rhs, thread_pool, is_cancelled, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp b/src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp
index 7a1f18a8904..7ffacd3af16 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionNull.cpp
@@ -111,9 +111,9 @@ public:
               * To address this, we handle `nothing` in a special way in `FunctionNode::toASTImpl`.
               */
             if (properties.returns_default_when_only_null)
-                return std::make_shared<AggregateFunctionNothing>(arguments, params, std::make_shared<DataTypeUInt64>());
+                return std::make_shared<AggregateFunctionNothingUInt64>(arguments, params);
             else
-                return std::make_shared<AggregateFunctionNothing>(arguments, params, std::make_shared<DataTypeNullable>(std::make_shared<DataTypeNothing>()));
+                return std::make_shared<AggregateFunctionNothingNull>(arguments, params);
         }
 
         assert(nested_function);
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionNull.h b/src/AggregateFunctions/Combinators/AggregateFunctionNull.h
index 6b6580bf4c4..9d13b77664d 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionNull.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionNull.h
@@ -43,8 +43,8 @@ template <bool result_is_nullable, bool serialize_flag, typename Derived>
 class AggregateFunctionNullBase : public IAggregateFunctionHelper<Derived>
 {
 protected:
-    AggregateFunctionPtr nested_function;
-    size_t prefix_size;
+    const AggregateFunctionPtr nested_function;
+    const size_t prefix_size;
 
     /** In addition to data for nested aggregate function, we keep a flag
       *  indicating - was there at least one non-NULL value accumulated.
@@ -55,12 +55,18 @@ protected:
 
     AggregateDataPtr nestedPlace(AggregateDataPtr __restrict place) const noexcept
     {
-        return place + prefix_size;
+        if constexpr (result_is_nullable)
+            return place + prefix_size;
+        else
+            return place;
     }
 
     ConstAggregateDataPtr nestedPlace(ConstAggregateDataPtr __restrict place) const noexcept
     {
-        return place + prefix_size;
+        if constexpr (result_is_nullable)
+            return place + prefix_size;
+        else
+            return place;
     }
 
     static void initFlag(AggregateDataPtr __restrict place) noexcept
@@ -87,11 +93,8 @@ public:
     AggregateFunctionNullBase(AggregateFunctionPtr nested_function_, const DataTypes & arguments, const Array & params)
         : IAggregateFunctionHelper<Derived>(arguments, params, createResultType(nested_function_))
         , nested_function{nested_function_}
+        , prefix_size(result_is_nullable ? nested_function->alignOfData() : 0)
     {
-        if constexpr (result_is_nullable)
-            prefix_size = nested_function->alignOfData();
-        else
-            prefix_size = 0;
     }
 
     String getName() const override
@@ -149,10 +152,20 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return nested_function->isAbleToParallelizeMerge(); }
+    bool canOptimizeEqualKeysRanges() const override { return nested_function->canOptimizeEqualKeysRanges(); }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
-        nested_function->merge(nestedPlace(place), nestedPlace(rhs), thread_pool, arena);
+        AggregateDataPtrs nested_places(places.begin(), places.end());
+        for (auto & nested_place : nested_places)
+            nested_place = nestedPlace(nested_place);
+
+        nested_function->parallelizeMergePrepare(nested_places, thread_pool, is_cancelled);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    {
+        nested_function->merge(nestedPlace(place), nestedPlace(rhs), thread_pool, is_cancelled, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
@@ -429,7 +442,7 @@ public:
         , number_of_arguments(arguments.size())
     {
         if (number_of_arguments == 1)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: single argument is passed to AggregateFunctionNullVariadic");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Single argument is passed to AggregateFunctionNullVariadic");
 
         if (number_of_arguments > MAX_ARGS)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
@@ -478,7 +491,7 @@ public:
         std::vector<const UInt8 *> nullable_filters;
         const IColumn * nested_columns[number_of_arguments];
 
-        std::unique_ptr<UInt8[]> final_flags = nullptr;
+        std::unique_ptr<UInt8[]> final_flags;
         const UInt8 * final_flags_ptr = nullptr;
 
         if (if_argument_pos >= 0)
@@ -517,7 +530,7 @@ public:
             }
         }
 
-        chassert(nullable_filters.size() > 0);
+        chassert(!nullable_filters.empty());
         bool found_one = false;
         if (nullable_filters.size() == 1)
         {
diff --git a/src/AggregateFunctions/Combinators/AggregateFunctionState.h b/src/AggregateFunctions/Combinators/AggregateFunctionState.h
index 8335d21cb1e..5f2eb647c92 100644
--- a/src/AggregateFunctions/Combinators/AggregateFunctionState.h
+++ b/src/AggregateFunctions/Combinators/AggregateFunctionState.h
@@ -92,10 +92,16 @@ public:
     }
 
     bool isAbleToParallelizeMerge() const override { return nested_func->isAbleToParallelizeMerge(); }
+    bool canOptimizeEqualKeysRanges() const override { return nested_func->canOptimizeEqualKeysRanges(); }
 
-    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, Arena * arena) const override
+    void parallelizeMergePrepare(AggregateDataPtrs & places, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled) const override
     {
-        nested_func->merge(place, rhs, thread_pool, arena);
+        nested_func->parallelizeMergePrepare(places, thread_pool, is_cancelled);
+    }
+
+    void merge(AggregateDataPtr __restrict place, ConstAggregateDataPtr rhs, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled, Arena * arena) const override
+    {
+        nested_func->merge(place, rhs, thread_pool, is_cancelled, arena);
     }
 
     void serialize(ConstAggregateDataPtr __restrict place, WriteBuffer & buf, std::optional<size_t> version) const override
diff --git a/src/AggregateFunctions/DDSketch.h b/src/AggregateFunctions/DDSketch.h
new file mode 100644
index 00000000000..dae935bd43d
--- /dev/null
+++ b/src/AggregateFunctions/DDSketch.h
@@ -0,0 +1,257 @@
+#pragma once
+
+#include <memory> // for std::unique_ptr
+#include <cmath>
+#include <stdexcept>
+#include <limits>
+#include <iostream>
+#include <base/types.h>
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+
+#include <AggregateFunctions/DDSketch/Mapping.h>
+#include <AggregateFunctions/DDSketch/Store.h>
+#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int INCORRECT_DATA;
+}
+
+class DDSketchDenseLogarithmic
+{
+public:
+    explicit DDSketchDenseLogarithmic(Float64 relative_accuracy = 0.01)
+        : mapping(std::make_unique<DDSketchLogarithmicMapping>(relative_accuracy)),
+          store(std::make_unique<DDSketchDenseStore>()),
+          negative_store(std::make_unique<DDSketchDenseStore>()),
+          zero_count(0.0),
+          count(0.0)
+    {
+    }
+
+    DDSketchDenseLogarithmic(std::unique_ptr<DDSketchLogarithmicMapping> mapping_,
+             std::unique_ptr<DDSketchDenseStore> store_,
+             std::unique_ptr<DDSketchDenseStore> negative_store_,
+             Float64 zero_count_)
+        : mapping(std::move(mapping_)),
+          store(std::move(store_)),
+          negative_store(std::move(negative_store_)),
+          zero_count(zero_count_),
+          count(store->count + negative_store->count + zero_count_)
+    {
+    }
+
+    void add(Float64 val, Float64 weight = 1.0)
+    {
+        if (weight <= 0.0)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "weight must be a positive Float64");
+        }
+
+        if (val > mapping->getMinPossible())
+        {
+            store->add(mapping->key(val), weight);
+        }
+        else if (val < -mapping->getMinPossible())
+        {
+            negative_store->add(mapping->key(-val), weight);
+        }
+        else
+        {
+            zero_count += weight;
+        }
+
+        count += weight;
+    }
+
+    Float64 get(Float64 quantile) const
+    {
+        if (quantile < 0 || quantile > 1 || count == 0)
+        {
+            return std::numeric_limits<Float64>::quiet_NaN(); // Return NaN if the conditions are not met
+        }
+
+        Float64 rank = quantile * (count - 1);
+        Float64 quantile_value;
+        if (rank < negative_store->count)
+        {
+            Float64 reversed_rank = negative_store->count - rank - 1;
+            int key = negative_store->keyAtRank(reversed_rank, false);
+            quantile_value = -mapping->value(key);
+        }
+        else if (rank < zero_count + negative_store->count)
+        {
+            quantile_value = 0;
+        }
+        else
+        {
+            int key = store->keyAtRank(rank - zero_count - negative_store->count, true);
+            quantile_value = mapping->value(key);
+        }
+        return quantile_value;
+    }
+
+    void copy(const DDSketchDenseLogarithmic& other)
+    {
+        Float64 rel_acc = (other.mapping->getGamma() - 1) / (other.mapping->getGamma() + 1);
+        mapping = std::make_unique<DDSketchLogarithmicMapping>(rel_acc);
+        store = std::make_unique<DDSketchDenseStore>();
+        negative_store = std::make_unique<DDSketchDenseStore>();
+        store->copy(other.store.get());
+        negative_store->copy(other.negative_store.get());
+        zero_count = other.zero_count;
+        count = other.count;
+    }
+
+    void merge(const DDSketchDenseLogarithmic& other)
+    {
+        if (mapping->getGamma() != other.mapping->getGamma())
+        {
+            // modify the one with higher precision to match the one with lower precision
+            if (mapping->getGamma() > other.mapping->getGamma())
+            {
+                DDSketchDenseLogarithmic new_sketch = other.changeMapping(mapping->getGamma());
+                this->merge(new_sketch);
+                return;
+            }
+            else
+            {
+                DDSketchDenseLogarithmic new_sketch = changeMapping(other.mapping->getGamma());
+                copy(new_sketch);
+            }
+        }
+
+        // If the other sketch is empty, do nothing
+        if (other.count == 0)
+        {
+            return;
+        }
+
+        // If this sketch is empty, copy the other sketch
+        if (count == 0)
+        {
+            copy(other);
+            return;
+        }
+
+        count += other.count;
+        zero_count += other.zero_count;
+
+        store->merge(other.store.get());
+        negative_store->merge(other.negative_store.get());
+    }
+
+    /// NOLINTBEGIN(readability-static-accessed-through-instance)
+
+    void serialize(WriteBuffer& buf) const
+    {
+        // Write the mapping
+        writeBinary(enc.FlagIndexMappingBaseLogarithmic.byte, buf);
+        mapping->serialize(buf);
+
+        // Write the positive and negative stores
+        writeBinary(enc.FlagTypePositiveStore, buf);
+        store->serialize(buf);
+
+        writeBinary(enc.FlagTypeNegativeStore, buf);
+        negative_store->serialize(buf);
+
+        // Write the zero count
+        writeBinary(enc.FlagZeroCountVarFloat.byte, buf);
+        writeBinary(zero_count, buf);
+    }
+
+    void deserialize(ReadBuffer& buf)
+    {
+        // Read the mapping
+        UInt8 flag = 0;
+        readBinary(flag, buf);
+        if (flag != enc.FlagIndexMappingBaseLogarithmic.byte)
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid flag for mapping");
+        }
+        mapping->deserialize(buf);
+
+        // Read the positive and negative stores
+        readBinary(flag, buf);
+        if (flag != enc.FlagTypePositiveStore)
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid flag for positive store");
+        }
+        store->deserialize(buf);
+
+        readBinary(flag, buf);
+        if (flag != enc.FlagTypeNegativeStore)
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid flag for negative store");
+        }
+        negative_store->deserialize(buf);
+
+        // Read the zero count
+        readBinary(flag, buf);
+        if (flag != enc.FlagZeroCountVarFloat.byte)
+        {
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Invalid flag for zero count");
+        }
+        readBinary(zero_count, buf);
+        count = static_cast<Float64>(negative_store->count + zero_count + store->count);
+    }
+
+    /// NOLINTEND(readability-static-accessed-through-instance)
+
+private:
+    std::unique_ptr<DDSketchLogarithmicMapping> mapping;
+    std::unique_ptr<DDSketchDenseStore> store;
+    std::unique_ptr<DDSketchDenseStore> negative_store;
+    Float64 zero_count;
+    Float64 count;
+    DDSketchEncoding enc;
+
+
+    DDSketchDenseLogarithmic changeMapping(Float64 new_gamma) const
+    {
+        auto new_mapping = std::make_unique<DDSketchLogarithmicMapping>((new_gamma - 1) / (new_gamma + 1));
+
+        auto new_positive_store = std::make_unique<DDSketchDenseStore>();
+        auto new_negative_store = std::make_unique<DDSketchDenseStore>();
+
+        auto remap_store = [this, &new_mapping](DDSketchDenseStore& old_store, std::unique_ptr<DDSketchDenseStore>& target_store)
+        {
+            for (int i = 0; i < old_store.length(); ++i)
+            {
+                int old_index = i + old_store.offset;
+                Float64 old_bin_count = old_store.bins[i];
+
+                Float64 in_lower_bound = this->mapping->lowerBound(old_index);
+                Float64 in_upper_bound = this->mapping->lowerBound(old_index + 1);
+                Float64 in_size = in_upper_bound - in_lower_bound;
+
+                int new_index = new_mapping->key(in_lower_bound);
+                // Distribute counts to new bins
+                for (; new_mapping->lowerBound(new_index) < in_upper_bound; ++new_index)
+                {
+                    Float64 out_lower_bound = new_mapping->lowerBound(new_index);
+                    Float64 out_upper_bound = new_mapping->lowerBound(new_index + 1);
+                    Float64 lower_intersection_bound = std::max(out_lower_bound, in_lower_bound);
+                    Float64 higher_intersection_bound = std::min(out_upper_bound, in_upper_bound);
+                    Float64 intersection_size = higher_intersection_bound - lower_intersection_bound;
+                    Float64 proportion = intersection_size / in_size;
+                    target_store->add(new_index, proportion * old_bin_count);
+                }
+            }
+        };
+
+        remap_store(*store, new_positive_store);
+        remap_store(*negative_store, new_negative_store);
+
+        return DDSketchDenseLogarithmic(std::move(new_mapping), std::move(new_positive_store), std::move(new_negative_store), zero_count);
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/DDSketch/DDSketchEncoding.h b/src/AggregateFunctions/DDSketch/DDSketchEncoding.h
new file mode 100644
index 00000000000..477bc3f5449
--- /dev/null
+++ b/src/AggregateFunctions/DDSketch/DDSketchEncoding.h
@@ -0,0 +1,101 @@
+#pragma once
+
+#include <vector>
+#include <stdexcept>
+
+/**
+  * An encoded DDSketch comprises multiple contiguous blocks (sequences of bytes).
+  * Each block is prefixed with a flag that indicates what the block contains and how the data is encoded in the block.
+  * A flag is a single byte, which itself contains two parts:
+  * - the flag type (the 2 least significant bits),
+  * - the subflag (the 6 most significant bits).
+  *
+  * There are four flag types, for:
+  * - sketch features,
+  * - index mapping,
+  * - positive value store,
+  * - negative value store.
+  *
+  * The meaning of the subflag depends on the flag type:
+  * - for the sketch feature flag type, it indicates what feature is encoded,
+  * - for the index mapping flag type, it indicates what mapping is encoded and how,
+  * - for the store flag types, it indicates how bins are encoded.
+  */
+namespace DB
+{
+class DDSketchEncoding
+{
+private:
+    static constexpr UInt8 numBitsForType = 2;
+    static constexpr UInt8 flagTypeMask = (1 << numBitsForType) - 1;
+    static constexpr UInt8 subFlagMask = ~flagTypeMask;
+    static constexpr UInt8 flagTypeSketchFeatures = 0b00;
+
+public:
+    class Flag
+    {
+    public:
+        UInt8 byte;
+        Flag(UInt8 t, UInt8 s) : byte(t | s) { }
+        [[maybe_unused]] UInt8 Type() const { return byte & flagTypeMask; }
+        [[maybe_unused]] UInt8 SubFlag() const { return byte & subFlagMask; }
+    };
+
+    // FLAG TYPES
+    static constexpr UInt8 FlagTypeIndexMapping = 0b10;
+    static constexpr UInt8 FlagTypePositiveStore = 0b01;
+    static constexpr UInt8 FlagTypeNegativeStore = 0b11;
+
+    // SKETCH FEATURES
+
+    // Encoding format:
+    // - [byte] flag
+    // - [varfloat64] count of the zero bin
+    const Flag FlagZeroCountVarFloat = Flag(flagTypeSketchFeatures, 1 << numBitsForType);
+
+    // INDEX MAPPING
+    // Encoding format:
+    // - [byte] flag
+    // - [float64LE] gamma
+    // - [float64LE] index offset
+    const Flag FlagIndexMappingBaseLogarithmic = Flag(FlagTypeIndexMapping, 0 << numBitsForType);
+
+    // BINS
+    // Encoding format:
+    // - [byte] flag
+    // - [uvarint64] number of bins N
+    // - [varint64] index of first bin
+    // - [varfloat64] count of first bin
+    // - [varint64] difference between the index of the second bin and the index
+    // of the first bin
+    // - [varfloat64] count of second bin
+    // - ...
+    // - [varint64] difference between the index of the N-th bin and the index
+    // of the (N-1)-th bin
+    // - [varfloat64] count of N-th bin
+    static constexpr UInt8 BinEncodingIndexDeltasAndCounts = 1 << numBitsForType;
+
+    // Encoding format:
+    // - [byte] flag
+    // - [uvarint64] number of bins N
+    // - [varint64] index of first bin
+    // - [varint64] difference between the index of the second bin and the index
+    // of the first bin
+    // - ...
+    // - [varint64] difference between the index of the N-th bin and the index
+    // of the (N-1)-th bin
+    static constexpr UInt8 BinEncodingIndexDeltas = 2 << numBitsForType;
+
+    // Encoding format:
+    // - [byte] flag
+    // - [uvarint64] number of bins N
+    // - [varint64] index of first bin
+    // - [varint64] difference between two successive indexes
+    // - [varfloat64] count of first bin
+    // - [varfloat64] count of second bin
+    // - ...
+    // - [varfloat64] count of N-th bin
+    static constexpr UInt8 BinEncodingContiguousCounts = 3 << numBitsForType;
+};
+
+}
diff --git a/src/AggregateFunctions/DDSketch/Mapping.h b/src/AggregateFunctions/DDSketch/Mapping.h
new file mode 100644
index 00000000000..0d1ff785d59
--- /dev/null
+++ b/src/AggregateFunctions/DDSketch/Mapping.h
@@ -0,0 +1,110 @@
+#pragma once
+
+#include <base/types.h>
+#include <cmath>
+#include <stdexcept>
+#include <limits>
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
+class DDSketchLogarithmicMapping
+{
+public:
+    explicit DDSketchLogarithmicMapping(Float64 relative_accuracy_, Float64 offset_ = 0.0)
+        : relative_accuracy(relative_accuracy_), offset(offset_)
+    {
+        if (relative_accuracy <= 0 || relative_accuracy >= 1)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Relative accuracy must be between 0 and 1 but is {}", relative_accuracy);
+        }
+
+        gamma = (1 + relative_accuracy) / (1 - relative_accuracy);
+        multiplier = 1 / std::log(gamma);
+        min_possible = std::numeric_limits<Float64>::min() * gamma;
+        max_possible = std::numeric_limits<Float64>::max() / gamma;
+    }
+
+    ~DDSketchLogarithmicMapping() = default;
+
+    int key(Float64 value) const
+    {
+        if (value < min_possible || value > max_possible)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Value {} is out of range [{}, {}]", value, min_possible, max_possible);
+        }
+        return static_cast<int>(logGamma(value) + offset);
+    }
+
+    Float64 value(int key) const
+    {
+        return lowerBound(key) * (1 + relative_accuracy);
+    }
+
+    Float64 logGamma(Float64 value) const
+    {
+        return std::log(value) * multiplier;
+    }
+
+    Float64 powGamma(Float64 value) const
+    {
+        return std::exp(value / multiplier);
+    }
+
+    Float64 lowerBound(int index) const
+    {
+        return powGamma(static_cast<Float64>(index) - offset);
+    }
+
+    Float64 getGamma() const
+    {
+        return gamma;
+    }
+
+    Float64 getMinPossible() const
+    {
+        return min_possible;
+    }
+
+    [[maybe_unused]] Float64 getMaxPossible() const
+    {
+        return max_possible;
+    }
+
+    void serialize(WriteBuffer& buf) const
+    {
+        writeBinary(gamma, buf);
+        writeBinary(offset, buf);
+    }
+
+    void deserialize(ReadBuffer& buf)
+    {
+        readBinary(gamma, buf);
+        readBinary(offset, buf);
+        if (gamma <= 1.0)
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid gamma value after deserialization: {}", gamma);
+        }
+        multiplier = 1 / std::log(gamma);
+        min_possible = std::numeric_limits<Float64>::min() * gamma;
+        max_possible = std::numeric_limits<Float64>::max() / gamma;
+    }
+
+protected:
+    Float64 relative_accuracy;
+    Float64 gamma;
+    Float64 min_possible;
+    Float64 max_possible;
+    Float64 multiplier;
+    Float64 offset;
+};
+
+}
diff --git a/src/AggregateFunctions/DDSketch/Store.h b/src/AggregateFunctions/DDSketch/Store.h
new file mode 100644
index 00000000000..f12c3875dcf
--- /dev/null
+++ b/src/AggregateFunctions/DDSketch/Store.h
@@ -0,0 +1,264 @@
+#pragma once
+
+#include <base/types.h>
+#include <vector>
+#include <cmath>
+#include <limits>
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <AggregateFunctions/DDSketch/DDSketchEncoding.h>
+
+
+// We start with 128 bins and grow the number of bins by 128
+// each time we need to extend the range of the bins.
+// This is done to avoid reallocating the bins vector too often.
+constexpr UInt32 CHUNK_SIZE = 128;
+
+namespace DB
+{
+
+class DDSketchDenseStore
+{
+public:
+    Float64 count = 0;
+    int min_key = std::numeric_limits<int>::max();
+    int max_key = std::numeric_limits<int>::min();
+    int offset = 0;
+    std::vector<Float64> bins;
+
+    explicit DDSketchDenseStore(UInt32 chunk_size_ = CHUNK_SIZE) : chunk_size(chunk_size_) {}
+
+    void copy(DDSketchDenseStore* other)
+    {
+        bins = other->bins;
+        count = other->count;
+        min_key = other->min_key;
+        max_key = other->max_key;
+        offset = other->offset;
+    }
+
+    int length() const
+    {
+        return static_cast<int>(bins.size());
+    }
+
+    void add(int key, Float64 weight)
+    {
+        int idx = getIndex(key);
+        bins[idx] += weight;
+        count += weight;
+    }
+
+    int keyAtRank(Float64 rank, bool lower)
+    {
+        Float64 running_ct = 0.0;
+        for (size_t i = 0; i < bins.size(); ++i)
+        {
+            running_ct += bins[i];
+            if ((lower && running_ct > rank) || (!lower && running_ct >= rank + 1))
+            {
+                return static_cast<int>(i) + offset;
+            }
+        }
+        return max_key;
+    }
+
+    void merge(DDSketchDenseStore* other)
+    {
+        if (other->count == 0) return;
+
+        if (count == 0)
+        {
+            copy(other);
+            return;
+        }
+
+        if (other->min_key < min_key || other->max_key > max_key)
+        {
+            extendRange(other->min_key, other->max_key);
+        }
+
+        for (int key = other->min_key; key <= other->max_key; ++key)
+        {
+            bins[key - offset] += other->bins[key - other->offset];
+        }
+
+        count += other->count;
+    }
+
+    /// NOLINTBEGIN(readability-static-accessed-through-instance)
+
+    void serialize(WriteBuffer& buf) const
+    {
+
+        // Calculate the size of the dense and sparse encodings to choose the smallest one
+        UInt64 num_bins = 0, num_non_empty_bins = 0;
+        if (count != 0)
+        {
+            num_bins = max_key - min_key + 1;
+        }
+
+        size_t sparse_encoding_overhead = 0;
+        for (int index = min_key; index <= max_key; ++index)
+        {
+            if (bins[index - offset] != 0)
+            {
+                num_non_empty_bins++;
+                sparse_encoding_overhead += 2; // 2 bytes for index delta
+            }
+        }
+
+        size_t dense_encoding_overhead = (num_bins - num_non_empty_bins) * estimatedFloatSize(0.0);
+
+        // Choose the smallest encoding and write to buffer
+        if (dense_encoding_overhead <= sparse_encoding_overhead)
+        {
+            // Write the dense encoding
+            writeBinary(enc.BinEncodingContiguousCounts, buf); // Flag for dense encoding
+            writeVarUInt(num_bins, buf);
+            writeVarInt(min_key, buf);
+            writeVarInt(1, buf); // indexDelta in dense encoding
+            for (int index = min_key; index <= max_key; ++index)
+            {
+                writeFloatBinary(bins[index - offset], buf);
+            }
+        }
+        else
+        {
+            // Write the sparse encoding
+            writeBinary(enc.BinEncodingIndexDeltasAndCounts, buf); // Flag for sparse encoding
+            writeVarUInt(num_non_empty_bins, buf);
+            int previous_index = 0;
+            for (int index = min_key; index <= max_key; ++index)
+            {
+                Float64 bin_count = bins[index - offset];
+                if (bin_count != 0)
+                {
+                    writeVarInt(index - previous_index, buf);
+                    writeFloatBinary(bin_count, buf);
+                    previous_index = index;
+                }
+            }
+        }
+    }
+
+    void deserialize(ReadBuffer& buf)
+    {
+        UInt8 encoding_mode;
+        readBinary(encoding_mode, buf);
+        if (encoding_mode == enc.BinEncodingContiguousCounts)
+        {
+            UInt64 num_bins;
+            readVarUInt(num_bins, buf);
+            int start_key;
+            readVarInt(start_key, buf);
+            int index_delta;
+            readVarInt(index_delta, buf);
+
+            for (UInt64 i = 0; i < num_bins; ++i)
+            {
+                Float64 bin_count;
+                readFloatBinary(bin_count, buf);
+                add(start_key, bin_count);
+                start_key += index_delta;
+            }
+        }
+        else
+        {
+            UInt64 num_non_empty_bins;
+            readVarUInt(num_non_empty_bins, buf);
+            int previous_index = 0;
+            for (UInt64 i = 0; i < num_non_empty_bins; ++i)
+            {
+                int index_delta;
+                readVarInt(index_delta, buf);
+                Float64 bin_count;
+                readFloatBinary(bin_count, buf);
+                previous_index += index_delta;
+                add(previous_index, bin_count);
+            }
+        }
+    }
+
+    /// NOLINTEND(readability-static-accessed-through-instance)
+
+private:
+    UInt32 chunk_size;
+    DDSketchEncoding enc;
+
+    int getIndex(int key)
+    {
+        if (key < min_key || key > max_key)
+        {
+            extendRange(key, key);
+        }
+        return key - offset;
+    }
+
+    UInt32 getNewLength(int new_min_key, int new_max_key) const
+    {
+        int desired_length = new_max_key - new_min_key + 1;
+        return static_cast<UInt32>(chunk_size * std::ceil(static_cast<Float64>(desired_length) / chunk_size)); // Fixed float conversion
+    }
+
+    void extendRange(int key, int second_key)
+    {
+        int new_min_key = std::min({key, min_key});
+        int new_max_key = std::max({second_key, max_key});
+
+        if (length() == 0)
+        {
+            bins = std::vector<Float64>(getNewLength(new_min_key, new_max_key), 0.0);
+            offset = new_min_key;
+            adjust(new_min_key, new_max_key);
+        }
+        else if (new_min_key >= offset && new_max_key < offset + length())
+        {
+            min_key = new_min_key;
+            max_key = new_max_key;
+        }
+        else
+        {
+            UInt32 new_length = getNewLength(new_min_key, new_max_key);
+            if (new_length > bins.size())
+            {
+                bins.resize(new_length);
+                bins.resize(bins.capacity());
+            }
+            adjust(new_min_key, new_max_key);
+        }
+    }
+
+    void adjust(int new_min_key, int new_max_key)
+    {
+        centerBins(new_min_key, new_max_key);
+        min_key = new_min_key;
+        max_key = new_max_key;
+    }
+
+    void shiftBins(int shift)
+    {
+        int new_offset = offset - shift;
+        if (new_offset > offset)
+            std::rotate(bins.begin(), bins.begin() + (new_offset - offset) % bins.size(), bins.end());
+        else
+            std::rotate(bins.begin(), bins.end() - (offset - new_offset) % bins.size(), bins.end());
+        offset = new_offset;
+    }
+
+    void centerBins(int new_min_key, int new_max_key)
+    {
+        int margins = length() - (new_max_key - new_min_key + 1);
+        int new_offset = new_min_key - margins / 2;
+        shiftBins(offset - new_offset);
+    }
+
+    size_t estimatedFloatSize(Float64 value) const
+    {
+        // Assuming IEEE 754 double-precision binary floating-point format: binary64
+        return sizeof(value);
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/FactoryHelpers.h b/src/AggregateFunctions/FactoryHelpers.h
index 3cfc202013d..8169c521e77 100644
--- a/src/AggregateFunctions/FactoryHelpers.h
+++ b/src/AggregateFunctions/FactoryHelpers.h
@@ -33,21 +33,4 @@ inline void assertBinary(const std::string & name, const DataTypes & argument_ty
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires two arguments", name);
 }
 
-template<std::size_t maximal_arity>
-inline void assertArityAtMost(const std::string & name, const DataTypes & argument_types)
-{
-    if (argument_types.size() <= maximal_arity)
-        return;
-
-    if constexpr (maximal_arity == 0)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} cannot have arguments", name);
-
-    if constexpr (maximal_arity == 1)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires zero or one argument",
-                        name);
-
-    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Aggregate function {} requires at most {} arguments",
-                    name, maximal_arity);
-}
-
 }
diff --git a/src/AggregateFunctions/HelpersMinMaxAny.h b/src/AggregateFunctions/HelpersMinMaxAny.h
deleted file mode 100644
index 1e3912c67b4..00000000000
--- a/src/AggregateFunctions/HelpersMinMaxAny.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#pragma once
-
-#include <AggregateFunctions/AggregateFunctionMinMaxAny.h>
-#include <AggregateFunctions/AggregateFunctionArgMinMax.h>
-#include <AggregateFunctions/FactoryHelpers.h>
-#include <AggregateFunctions/Helpers.h>
-
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeString.h>
-
-namespace DB
-{
-struct Settings;
-
-/// min, max, any, anyLast, anyHeavy, etc...
-template <template <typename> class AggregateFunctionTemplate, template <typename, bool...> class Data>
-static IAggregateFunction *
-createAggregateFunctionSingleValue(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    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
-    FOR_NUMERIC_TYPES(DISPATCH)
-#undef DISPATCH
-
-    if (which.idx == TypeIndex::Date)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DataTypeDate::FieldType>>>(argument_type);
-    if (which.idx == TypeIndex::DateTime)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DataTypeDateTime::FieldType>>>(argument_type);
-    if (which.idx == TypeIndex::DateTime64)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<DateTime64>>>(argument_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return new AggregateFunctionTemplate<Data<SingleValueDataFixed<Decimal32>>>(argument_type);
-    if (which.idx == TypeIndex::Decimal64)
-        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);
-}
-
-/// argMin, argMax
-template <template <typename> class MinMaxData, typename ResData>
-static IAggregateFunction * createAggregateFunctionArgMinMaxSecond(const DataTypePtr & res_type, const DataTypePtr & val_type)
-{
-    WhichDataType which(val_type);
-
-#define DISPATCH(TYPE) \
-    if (which.idx == TypeIndex::TYPE) \
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<TYPE>>>>(res_type, val_type); /// NOLINT
-    FOR_NUMERIC_TYPES(DISPATCH)
-#undef DISPATCH
-
-    if (which.idx == TypeIndex::Date)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDate::FieldType>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::DateTime)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DataTypeDateTime::FieldType>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::DateTime64)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<DateTime64>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return new AggregateFunctionArgMinMax<AggregateFunctionArgMinMaxData<ResData, MinMaxData<SingleValueDataFixed<Decimal32>>>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal64)
-        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);
-}
-
-template <template <typename> class MinMaxData>
-static IAggregateFunction * createAggregateFunctionArgMinMax(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
-{
-    assertNoParameters(name, parameters);
-    assertBinary(name, argument_types);
-
-    const DataTypePtr & res_type = argument_types[0];
-    const DataTypePtr & val_type = argument_types[1];
-
-    WhichDataType which(res_type);
-#define DISPATCH(TYPE) \
-    if (which.idx == TypeIndex::TYPE) \
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<TYPE>>(res_type, val_type); /// NOLINT
-    FOR_NUMERIC_TYPES(DISPATCH)
-#undef DISPATCH
-
-    if (which.idx == TypeIndex::Date)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDate::FieldType>>(res_type, val_type);
-    if (which.idx == TypeIndex::DateTime)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DataTypeDateTime::FieldType>>(res_type, val_type);
-    if (which.idx == TypeIndex::DateTime64)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<DateTime64>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal32)
-        return createAggregateFunctionArgMinMaxSecond<MinMaxData, SingleValueDataFixed<Decimal32>>(res_type, val_type);
-    if (which.idx == TypeIndex::Decimal64)
-        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);
-}
-
-}
diff --git a/src/AggregateFunctions/IAggregateFunction.h b/src/AggregateFunctions/IAggregateFunction.h
index 94bb121893d..ee227db6d9d 100644
--- a/src/AggregateFunctions/IAggregateFunction.h
+++ b/src/AggregateFunctions/IAggregateFunction.h
@@ -1,17 +1,18 @@
 #pragma once
 
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
 #include <Columns/ColumnSparse.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnsNumber.h>
 #include <Core/Block.h>
 #include <Core/ColumnNumbers.h>
 #include <Core/Field.h>
+#include <Core/IResolvedFunction.h>
 #include <Core/ValuesWithType.h>
 #include <Interpreters/Context_fwd.h>
 #include <base/types.h>
 #include <Common/Exception.h>
 #include <Common/ThreadPool_fwd.h>
-#include <Core/IResolvedFunction.h>
 
 #include "config.h"
 
@@ -46,13 +47,6 @@ class IWindowFunction;
 using DataTypePtr = std::shared_ptr<const IDataType>;
 using DataTypes = std::vector<DataTypePtr>;
 
-using AggregateDataPtr = char *;
-using AggregateDataPtrs = std::vector<AggregateDataPtr>;
-using ConstAggregateDataPtr = const char *;
-
-class IAggregateFunction;
-using AggregateFunctionPtr = std::shared_ptr<const IAggregateFunction>;
-
 struct AggregateFunctionProperties;
 
 /** Aggregate functions interface.
@@ -151,7 +145,7 @@ public:
 
     virtual bool isParallelizeMergePrepareNeeded() const { return false; }
 
-    virtual void parallelizeMergePrepare(AggregateDataPtrs & /*places*/, ThreadPool & /*thread_pool*/) const
+    virtual void parallelizeMergePrepare(AggregateDataPtrs & /*places*/, ThreadPool & /*thread_pool*/, std::atomic<bool> & /*is_cancelled*/) const
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "parallelizeMergePrepare() with thread pool parameter isn't implemented for {} ", getName());
     }
@@ -162,9 +156,13 @@ public:
     /// Tells if merge() with thread pool parameter could be used.
     virtual bool isAbleToParallelizeMerge() const { return false; }
 
+    /// Return true if it is allowed to replace call of `addBatch`
+    /// to `addBatchSinglePlace` for ranges of consecutive equal keys.
+    virtual bool canOptimizeEqualKeysRanges() const { return true; }
+
     /// Should be used only if isAbleToParallelizeMerge() returned true.
     virtual void
-    merge(AggregateDataPtr __restrict /*place*/, ConstAggregateDataPtr /*rhs*/, ThreadPool & /*thread_pool*/, Arena * /*arena*/) const
+    merge(AggregateDataPtr __restrict /*place*/, ConstAggregateDataPtr /*rhs*/, ThreadPool & /*thread_pool*/, std::atomic<bool> & /*is_cancelled*/, Arena * /*arena*/) const
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "merge() with thread pool parameter isn't implemented for {} ", getName());
     }
diff --git a/src/AggregateFunctions/IAggregateFunction_fwd.h b/src/AggregateFunctions/IAggregateFunction_fwd.h
new file mode 100644
index 00000000000..7c78e32c652
--- /dev/null
+++ b/src/AggregateFunctions/IAggregateFunction_fwd.h
@@ -0,0 +1,14 @@
+#pragma once
+
+#include <memory>
+#include <vector>
+
+namespace DB
+{
+using AggregateDataPtr = char *;
+using AggregateDataPtrs = std::vector<AggregateDataPtr>;
+using ConstAggregateDataPtr = const char *;
+
+class IAggregateFunction;
+using AggregateFunctionPtr = std::shared_ptr<const IAggregateFunction>;
+}
diff --git a/src/AggregateFunctions/KeyHolderHelpers.h b/src/AggregateFunctions/KeyHolderHelpers.h
index 812e681e409..b48c396046b 100644
--- a/src/AggregateFunctions/KeyHolderHelpers.h
+++ b/src/AggregateFunctions/KeyHolderHelpers.h
@@ -29,7 +29,7 @@ static void deserializeAndInsert(StringRef str, IColumn & data_to)
     if constexpr (is_plain_column)
         data_to.insertData(str.data, str.size);
     else
-        data_to.deserializeAndInsertFromArena(str.data);
+        std::ignore = data_to.deserializeAndInsertFromArena(str.data);
 }
 
 }
diff --git a/src/AggregateFunctions/QuantileDD.h b/src/AggregateFunctions/QuantileDD.h
new file mode 100644
index 00000000000..1d063c7a014
--- /dev/null
+++ b/src/AggregateFunctions/QuantileDD.h
@@ -0,0 +1,108 @@
+#pragma once
+
+#include <base/types.h>
+#include <base/sort.h>
+#include <AggregateFunctions/DDSketch.h>
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+
+
+namespace DB
+{
+
+/**
+ * A DDSketch is a fully-mergeable quantile sketch with relative-error guarantees. That is, for any value x,
+ * the value returned by the sketch is guaranteed to be in the (1 +- epsilon) * x range. The sketch is
+ * parameterized by a relative accuracy epsilon, which is the maximum relative error of any quantile estimate.
+ *
+ * The sketch is implemented as a set of logarithmically-spaced bins. Each bin is a pair of a value and a count.
+ *
+ * The sketch is fully mergeable, meaning that the merge of two sketches is equivalent to the sketch of the
+ * union of the input datasets. The memory size of the sketch depends on the range that is covered by
+ * the input values: the larger that range, the more bins are needed to keep track of the input values.
+ * As a rough estimate, if working on durations using DDSketches.unboundedDense(0.02) (relative accuracy of 2%),
+ * about 2kB (275 bins) are needed to cover values between 1 millisecond and 1 minute, and about 6kB (802 bins)
+ * to cover values between 1 nanosecond and 1 day.
+ *
+ * This implementation maintains the binary compatibility with the DDSketch ProtoBuf format
+ * https://github.com/DataDog/sketches-java/blob/master/src/protobuf/proto/DDSketch.proto.
+ * Which enables sending the pre-aggregated sketches to the ClickHouse server and calculating the quantiles
+ * during the query time. See DDSketchEncoding.h for byte-level details.
+ *
+*/
+
+template <typename Value>
+class QuantileDD
+{
+public:
+    using Weight = UInt64;
+
+    QuantileDD() = default;
+
+    explicit QuantileDD(Float64 relative_accuracy) : data(relative_accuracy) { }
+
+    void add(const Value & x)
+    {
+        add(x, 1);
+    }
+
+    void add(const Value & x, Weight w)
+    {
+        if (!isNaN(x))
+            data.add(x, w);
+    }
+
+    void merge(const QuantileDD &other)
+    {
+        data.merge(other.data);
+    }
+
+    void serialize(WriteBuffer & buf) const
+    {
+        data.serialize(buf);
+    }
+
+    void deserialize(ReadBuffer & buf)
+    {
+        data.deserialize(buf);
+    }
+
+    Value get(Float64 level) const
+    {
+        return getImpl<Value>(level);
+    }
+
+    void getMany(const Float64 * levels, const size_t * indices, size_t size, Value * result) const
+    {
+        getManyImpl(levels, indices, size, result);
+    }
+
+    Float64 getFloat(Float64 level) const
+    {
+        return getImpl<Float64>(level);
+    }
+
+    void getManyFloat(const Float64 * levels, const size_t * indices, size_t size, Float64 * result) const
+    {
+        getManyImpl(levels, indices, size, result);
+    }
+
+private:
+    DDSketchDenseLogarithmic data;
+
+    template <typename T>
+    T getImpl(Float64 level) const
+    {
+        return static_cast<T>(data.get(level));
+    }
+
+    template <typename T>
+    void getManyImpl(const Float64 * levels, const size_t *, size_t num_levels, T * result) const
+    {
+        for (size_t i = 0; i < num_levels; ++i)
+            result[i] = getImpl<T>(levels[i]);
+    }
+};
+
+}
diff --git a/src/AggregateFunctions/QuantileExact.h b/src/AggregateFunctions/QuantileExact.h
index a92d1979bab..94e321083a7 100644
--- a/src/AggregateFunctions/QuantileExact.h
+++ b/src/AggregateFunctions/QuantileExact.h
@@ -150,7 +150,7 @@ struct QuantileExactExclusive : public QuantileExact<Value>
                 return static_cast<Float64>(*std::min_element(array.begin(), array.end()));
 
             ::nth_element(array.begin(), array.begin() + n - 1, array.end());
-            auto nth_elem = std::min_element(array.begin() + n, array.end());
+            auto * nth_elem = std::min_element(array.begin() + n, array.end());
 
             return static_cast<Float64>(array[n - 1]) + (h - n) * static_cast<Float64>(*nth_elem - array[n - 1]);
         }
@@ -179,7 +179,7 @@ struct QuantileExactExclusive : public QuantileExact<Value>
                 else
                 {
                     ::nth_element(array.begin() + prev_n, array.begin() + n - 1, array.end());
-                    auto nth_elem = std::min_element(array.begin() + n, array.end());
+                    auto * nth_elem = std::min_element(array.begin() + n, array.end());
 
                     result[indices[i]] = static_cast<Float64>(array[n - 1]) + (h - n) * static_cast<Float64>(*nth_elem - array[n - 1]);
                     prev_n = n - 1;
@@ -214,7 +214,7 @@ struct QuantileExactInclusive : public QuantileExact<Value>
             else if (n < 1)
                 return static_cast<Float64>(*std::min_element(array.begin(), array.end()));
             ::nth_element(array.begin(), array.begin() + n - 1, array.end());
-            auto nth_elem = std::min_element(array.begin() + n, array.end());
+            auto * nth_elem = std::min_element(array.begin() + n, array.end());
 
             return static_cast<Float64>(array[n - 1]) + (h - n) * static_cast<Float64>(*nth_elem - array[n - 1]);
         }
@@ -241,7 +241,7 @@ struct QuantileExactInclusive : public QuantileExact<Value>
                 else
                 {
                     ::nth_element(array.begin() + prev_n, array.begin() + n - 1, array.end());
-                    auto nth_elem = std::min_element(array.begin() + n, array.end());
+                    auto * nth_elem = std::min_element(array.begin() + n, array.end());
 
                     result[indices[i]] = static_cast<Float64>(array[n - 1]) + (h - n) * (static_cast<Float64>(*nth_elem) - array[n - 1]);
                     prev_n = n - 1;
diff --git a/src/AggregateFunctions/ReservoirSampler.h b/src/AggregateFunctions/ReservoirSampler.h
index 37fc05a2e4c..7b6ef1b2dc0 100644
--- a/src/AggregateFunctions/ReservoirSampler.h
+++ b/src/AggregateFunctions/ReservoirSampler.h
@@ -258,10 +258,10 @@ private:
         chassert(limit > 0);
 
         /// With a large number of values, we will generate random numbers several times slower.
-        if (limit <= static_cast<UInt64>(rng.max()))
+        if (limit <= static_cast<UInt64>(pcg32_fast::max()))
             return rng() % limit;
         else
-            return (static_cast<UInt64>(rng()) * (static_cast<UInt64>(rng.max()) + 1ULL) + static_cast<UInt64>(rng())) % limit;
+            return (static_cast<UInt64>(rng()) * (static_cast<UInt64>(pcg32_fast::max()) + 1ULL) + static_cast<UInt64>(rng())) % limit;
     }
 
     void sortIfNeeded()
diff --git a/src/AggregateFunctions/ReservoirSamplerDeterministic.h b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
index daed0b98ca3..b7032a01884 100644
--- a/src/AggregateFunctions/ReservoirSamplerDeterministic.h
+++ b/src/AggregateFunctions/ReservoirSamplerDeterministic.h
@@ -191,7 +191,7 @@ public:
             /// TODO: After implementation of "versioning aggregate function state",
             /// change the serialization format.
             Element elem;
-            memset(&elem, 0, sizeof(elem));
+            memset(&elem, 0, sizeof(elem)); /// NOLINT(bugprone-undefined-memory-manipulation)
             elem = samples[i];
 
             DB::transformEndianness<std::endian::little>(elem);
diff --git a/src/AggregateFunctions/SingleValueData.cpp b/src/AggregateFunctions/SingleValueData.cpp
new file mode 100644
index 00000000000..a14caf00f73
--- /dev/null
+++ b/src/AggregateFunctions/SingleValueData.cpp
@@ -0,0 +1,1419 @@
+#include <AggregateFunctions/SingleValueData.h>
+#include <Columns/ColumnString.h>
+#include <IO/ReadHelpers.h>
+#include <IO/WriteHelpers.h>
+#include <Common/Arena.h>
+#include <Common/assert_cast.h>
+#include <Common/findExtreme.h>
+
+#if USE_EMBEDDED_COMPILER
+#    include <DataTypes/Native.h>
+#    include <llvm/IR/IRBuilder.h>
+#endif
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+extern const int TOO_LARGE_STRING_SIZE;
+}
+
+namespace
+{
+
+std::unique_ptr<UInt8[]>
+mergeIfAndNullFlags(const UInt8 * __restrict null_map, const UInt8 * __restrict if_flags, size_t row_begin, size_t row_end)
+{
+    auto final_flags = std::make_unique<UInt8[]>(row_end);
+    for (size_t i = row_begin; i < row_end; ++i)
+        final_flags[i] = (!null_map[i]) & !!if_flags[i];
+    return final_flags;
+}
+
+}
+
+std::optional<size_t> SingleValueDataBase::getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    static constexpr int nan_null_direction_hint = 1;
+
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    /// TODO: Introduce row_begin and row_end to getPermutation
+    if (row_begin != 0 || row_end != column.size())
+    {
+        size_t index = row_begin;
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((column.compareAt(i, index, column, nan_null_direction_hint) < 0))
+                index = i;
+        return {index};
+    }
+    else
+    {
+        constexpr IColumn::PermutationSortDirection direction = IColumn::PermutationSortDirection::Ascending;
+        constexpr IColumn::PermutationSortStability stability = IColumn::PermutationSortStability::Unstable;
+        IColumn::Permutation permutation;
+        constexpr UInt64 limit = 1;
+        column.getPermutation(direction, stability, limit, nan_null_direction_hint, permutation);
+        return {permutation[0]};
+    }
+}
+
+std::optional<size_t> SingleValueDataBase::getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    static constexpr int nan_null_direction_hint = -1;
+
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    /// TODO: Introduce row_begin and row_end to getPermutation
+    if (row_begin != 0 || row_end != column.size())
+    {
+        size_t index = row_begin;
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((column.compareAt(i, index, column, nan_null_direction_hint) > 0))
+                index = i;
+        return {index};
+    }
+    else
+    {
+        constexpr IColumn::PermutationSortDirection direction = IColumn::PermutationSortDirection::Descending;
+        constexpr IColumn::PermutationSortStability stability = IColumn::PermutationSortStability::Unstable;
+        IColumn::Permutation permutation;
+        constexpr UInt64 limit = 1;
+        column.getPermutation(direction, stability, limit, nan_null_direction_hint, permutation);
+        return {permutation[0]};
+    }
+}
+
+std::optional<size_t> SingleValueDataBase::getSmallestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    static constexpr int nan_null_direction_hint = 1;
+
+    size_t index = row_begin;
+    while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+        index++;
+    if (index >= row_end)
+        return std::nullopt;
+
+    for (size_t i = index + 1; i < row_end; i++)
+        if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0) && (column.compareAt(i, index, column, nan_null_direction_hint) < 0))
+            index = i;
+    return {index};
+}
+
+std::optional<size_t> SingleValueDataBase::getGreatestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    static constexpr int nan_null_direction_hint = -1;
+
+    size_t index = row_begin;
+    while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+        index++;
+    if (index >= row_end)
+        return std::nullopt;
+
+    for (size_t i = index + 1; i < row_end; i++)
+        if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0) && (column.compareAt(i, index, column, nan_null_direction_hint) > 0))
+            index = i;
+    return {index};
+}
+
+void SingleValueDataBase::setSmallest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena)
+{
+    auto index = getSmallestIndex(column, row_begin, row_end);
+    if (index)
+        setIfSmaller(column, *index, arena);
+}
+
+void SingleValueDataBase::setGreatest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena)
+{
+    auto index = getGreatestIndex(column, row_begin, row_end);
+    if (index)
+        setIfGreater(column, *index, arena);
+}
+
+void SingleValueDataBase::setSmallestNotNullIf(
+    const IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    Arena * arena)
+{
+    auto index = getSmallestIndexNotNullIf(column, null_map, if_map, row_begin, row_end);
+    if (index)
+        setIfSmaller(column, *index, arena);
+}
+
+void SingleValueDataBase::setGreatestNotNullIf(
+    const IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    Arena * arena)
+{
+    auto index = getGreatestIndexNotNullIf(column, null_map, if_map, row_begin, row_end);
+    if (index)
+        setIfGreater(column, *index, arena);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::insertResultInto(IColumn & to) const
+{
+    /// value is set to 0 in the constructor (also with JIT), so no need to check has_data()
+    chassert(has() || value == T{});
+    assert_cast<ColVecType &>(to).getData().push_back(value);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::write(WriteBuffer & buf, const ISerialization &) const
+{
+    writeBinary(has(), buf);
+    if (has())
+        writeBinaryLittleEndian(value, buf);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::read(ReadBuffer & buf, const ISerialization &, Arena *)
+{
+    readBinary(has_value, buf);
+    if (has())
+        readBinaryLittleEndian(value, buf);
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::isEqualTo(const IColumn & column, size_t index) const
+{
+    return has() && assert_cast<const ColVecType &>(column).getData()[index] == value;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::isEqualTo(const SingleValueDataFixed<T> & to) const
+{
+    return has() && to.value == value;
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::set(const IColumn & column, size_t row_num, Arena *)
+{
+    has_value = true;
+    value = assert_cast<const ColVecType &>(column).getData()[row_num];
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::set(const SingleValueDataFixed<T> & to, Arena *)
+{
+    if (to.has())
+    {
+        has_value = true;
+        value = to.value;
+    }
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfSmaller(const T & to)
+{
+    if (!has_value || to < value)
+    {
+        has_value = true;
+        value = to;
+        return true;
+    }
+    return false;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfGreater(const T & to)
+{
+    if (!has_value || to > value)
+    {
+        has_value = true;
+        value = to;
+        return true;
+    }
+    return false;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfSmaller(const SingleValueDataFixed<T> & to, Arena * arena)
+{
+    if (to.has() && (!has() || to.value < value))
+    {
+        set(to, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfGreater(const SingleValueDataFixed<T> & to, Arena * arena)
+{
+    if (to.has() && (!has() || to.value > value))
+    {
+        set(to, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfSmaller(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has() || assert_cast<const ColVecType &>(column).getData()[row_num] < value)
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+template <typename T>
+bool SingleValueDataFixed<T>::setIfGreater(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has() || assert_cast<const ColVecType &>(column).getData()[row_num] > value)
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::setSmallest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena)
+{
+    if (row_begin >= row_end)
+        return;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt = findExtremeMin(vec.getData().data(), row_begin, row_end);
+        if (opt.has_value())
+            setIfSmaller(*opt);
+    }
+    else
+    {
+        for (size_t i = row_begin; i < row_end; i++)
+            setIfSmaller(column, i, arena);
+    }
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::setGreatest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena)
+{
+    if (row_begin >= row_end)
+        return;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt = findExtremeMax(vec.getData().data(), row_begin, row_end);
+        if (opt.has_value())
+            setIfGreater(*opt);
+    }
+    else
+    {
+        for (size_t i = row_begin; i < row_end; i++)
+            setIfGreater(column, i, arena);
+    }
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::setSmallestNotNullIf(
+    const IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    Arena * arena)
+{
+    chassert(if_map || null_map);
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt;
+        if (!if_map)
+            opt = findExtremeMinNotNull(vec.getData().data(), null_map, row_begin, row_end);
+        else if (!null_map)
+            opt = findExtremeMinIf(vec.getData().data(), if_map, row_begin, row_end);
+        else
+        {
+            auto final_flags = mergeIfAndNullFlags(null_map, if_map, row_begin, row_end);
+            opt = findExtremeMinIf(vec.getData().data(), if_map, row_begin, row_end);
+        }
+
+        if (opt.has_value())
+            setIfSmaller(*opt);
+    }
+    else
+    {
+        size_t index = row_begin;
+        while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+            index++;
+        if (index >= row_end)
+            return;
+
+        setIfSmaller(column, index, arena);
+
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0))
+                setIfSmaller(column, i, arena);
+    }
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::setGreatestNotNullIf(
+    const IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    Arena * arena)
+{
+    chassert(if_map || null_map);
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt;
+        if (!if_map)
+            opt = findExtremeMaxNotNull(vec.getData().data(), null_map, row_begin, row_end);
+        else if (!null_map)
+            opt = findExtremeMaxIf(vec.getData().data(), if_map, row_begin, row_end);
+        else
+        {
+            auto final_flags = mergeIfAndNullFlags(null_map, if_map, row_begin, row_end);
+            opt = findExtremeMaxIf(vec.getData().data(), if_map, row_begin, row_end);
+        }
+
+        if (opt.has_value())
+            setIfGreater(*opt);
+    }
+    else
+    {
+        size_t index = row_begin;
+        while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+            index++;
+        if (index >= row_end)
+            return;
+
+        setIfGreater(column, index, arena);
+
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0))
+                setIfGreater(column, i, arena);
+    }
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataFixed<T>::getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        return findExtremeMinIndex(vec.getData().data(), row_begin, row_end);
+    }
+    else
+    {
+        size_t index = row_begin;
+        for (size_t i = index + 1; i < row_end; i++)
+            if (vec.getData()[i] < vec.getData()[index])
+                index = i;
+        return index;
+    }
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataFixed<T>::getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        return findExtremeMaxIndex(vec.getData().data(), row_begin, row_end);
+    }
+    else
+    {
+        size_t index = row_begin;
+        for (size_t i = index + 1; i < row_end; i++)
+            if (vec.getData()[i] > vec.getData()[index])
+                index = i;
+        return index;
+    }
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataFixed<T>::getSmallestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt;
+        if (!if_map)
+        {
+            opt = findExtremeMinNotNull(vec.getData().data(), null_map, row_begin, row_end);
+            if (!opt.has_value())
+                return opt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (!null_map[i] && vec[i] == *opt)
+                    return {i};
+            }
+        }
+        else if (!null_map)
+        {
+            opt = findExtremeMinIf(vec.getData().data(), if_map, row_begin, row_end);
+            if (!opt.has_value())
+                return opt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (if_map[i] && vec[i] == *opt)
+                    return {i};
+            }
+        }
+        else
+        {
+            auto final_flags = mergeIfAndNullFlags(null_map, if_map, row_begin, row_end);
+            opt = findExtremeMinIf(vec.getData().data(), final_flags.get(), row_begin, row_end);
+            if (!opt.has_value())
+                return std::nullopt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (final_flags[i] && vec[i] == *opt)
+                    return {i};
+            }
+        }
+        UNREACHABLE();
+    }
+    else
+    {
+        size_t index = row_begin;
+        while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+            index++;
+        if (index >= row_end)
+            return std::nullopt;
+
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0) && (vec[i] < vec[index]))
+                index = i;
+        return {index};
+    }
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataFixed<T>::getGreatestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    if (row_begin >= row_end)
+        return std::nullopt;
+
+    const auto & vec = assert_cast<const ColVecType &>(column);
+
+    if constexpr (has_find_extreme_implementation<T>)
+    {
+        std::optional<T> opt;
+        if (!if_map)
+        {
+            opt = findExtremeMaxNotNull(vec.getData().data(), null_map, row_begin, row_end);
+            if (!opt.has_value())
+                return opt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (!null_map[i] && vec[i] == *opt)
+                    return {i};
+            }
+            return opt;
+        }
+        else if (!null_map)
+        {
+            opt = findExtremeMaxIf(vec.getData().data(), if_map, row_begin, row_end);
+            if (!opt.has_value())
+                return opt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (if_map[i] && vec[i] == *opt)
+                    return {i};
+            }
+            return opt;
+        }
+        else
+        {
+            auto final_flags = mergeIfAndNullFlags(null_map, if_map, row_begin, row_end);
+            opt = findExtremeMaxIf(vec.getData().data(), final_flags.get(), row_begin, row_end);
+            if (!opt.has_value())
+                return std::nullopt;
+            for (size_t i = row_begin; i < row_end; i++)
+            {
+                if (final_flags[i] && vec[i] == *opt)
+                    return {i};
+            }
+        }
+        UNREACHABLE();
+    }
+    else
+    {
+        size_t index = row_begin;
+        while ((index < row_end) && ((if_map && if_map[index] == 0) || (null_map && null_map[index] != 0)))
+            index++;
+        if (index >= row_end)
+            return std::nullopt;
+
+        for (size_t i = index + 1; i < row_end; i++)
+            if ((!if_map || if_map[i] != 0) && (!null_map || null_map[i] == 0) && (vec[i] > vec[index]))
+                index = i;
+        return {index};
+    }
+}
+
+
+#if USE_EMBEDDED_COMPILER
+
+template <typename T>
+bool SingleValueDataFixed<T>::isCompilable(const IDataType & type)
+{
+    return canBeNativeType(type);
+}
+
+template <typename T>
+llvm::Value * SingleValueDataFixed<T>::getValuePtrFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    auto * value_ptr = b.CreateConstInBoundsGEP1_64(b.getInt8Ty(), aggregate_data_ptr, value_offset);
+    return value_ptr;
+}
+
+template <typename T>
+llvm::Value * SingleValueDataFixed<T>::getValueFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    auto * type = toNativeType<T>(builder);
+    auto * value_ptr = getValuePtrFromAggregateDataPtr(builder, aggregate_data_ptr);
+    return b.CreateLoad(type, value_ptr);
+}
+
+template <typename T>
+llvm::Value * SingleValueDataFixed<T>::getHasValuePtrFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    auto * has_value_ptr = b.CreateConstInBoundsGEP1_64(b.getInt8Ty(), aggregate_data_ptr, has_value_offset);
+    return has_value_ptr;
+}
+
+template <typename T>
+llvm::Value * SingleValueDataFixed<T>::getHasValueFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    auto * has_value_ptr = getHasValuePtrFromAggregateDataPtr(builder, aggregate_data_ptr);
+    return b.CreateLoad(b.getInt1Ty(), has_value_ptr);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+    /// We initialize everything to 0 so both has_data and value are initialized
+    /// Note that getResult uses the knowledge that value is 0 with no data, both with and without JIT,
+    /// to skip a check
+    b.CreateMemSet(
+        b.CreateConstInBoundsGEP1_64(b.getInt8Ty(), aggregate_data_ptr, 0),
+        llvm::ConstantInt::get(b.getInt8Ty(), 0),
+        sizeof(SingleValueDataFixed<T>),
+        llvm::assumeAligned(alignof(SingleValueDataFixed<T>)));
+}
+
+template <typename T>
+llvm::Value * SingleValueDataFixed<T>::compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr)
+{
+    /// value is set to 0 in the constructor, so no need to check has_data()
+    return getValueFromAggregateDataPtr(builder, aggregate_data_ptr);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileSetValueFromNumber(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * has_value_ptr = getHasValuePtrFromAggregateDataPtr(builder, aggregate_data_ptr);
+    b.CreateStore(b.getTrue(), has_value_ptr);
+
+    auto * value_ptr = getValuePtrFromAggregateDataPtr(b, aggregate_data_ptr);
+    b.CreateStore(value_to_check, value_ptr);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileSetValueFromAggregation(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    auto * value_src = getValueFromAggregateDataPtr(builder, aggregate_data_src_ptr);
+    compileSetValueFromNumber(builder, aggregate_data_ptr, value_src);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileAny(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * head = b.GetInsertBlock();
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+    auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
+
+    auto * has_value_value = getHasValueFromAggregateDataPtr(b, aggregate_data_ptr);
+    b.CreateCondBr(has_value_value, join_block, if_should_change);
+
+    b.SetInsertPoint(if_should_change);
+    compileSetValueFromNumber(builder, aggregate_data_ptr, value_to_check);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileAnyMerge(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * head = b.GetInsertBlock();
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+    auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
+
+    auto * has_value_dst = getHasValueFromAggregateDataPtr(b, aggregate_data_dst_ptr);
+    auto * has_value_src = getHasValueFromAggregateDataPtr(b, aggregate_data_src_ptr);
+    b.CreateCondBr(b.CreateAnd(b.CreateNot(has_value_dst), has_value_src), if_should_change, join_block);
+
+    b.SetInsertPoint(if_should_change);
+    compileSetValueFromAggregation(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileAnyLast(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    compileSetValueFromNumber(builder, aggregate_data_ptr, value_to_check);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileAnyLastMerge(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * head = b.GetInsertBlock();
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+    auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
+
+    auto * has_value_src = getHasValueFromAggregateDataPtr(b, aggregate_data_src_ptr);
+    b.CreateCondBr(has_value_src, if_should_change, join_block);
+
+    b.SetInsertPoint(if_should_change);
+    compileSetValueFromAggregation(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+}
+
+template <typename T>
+template <bool isMin>
+void SingleValueDataFixed<T>::compileMinMax(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * has_value_value = getHasValueFromAggregateDataPtr(b, aggregate_data_ptr);
+    auto * value = getValueFromAggregateDataPtr(b, aggregate_data_ptr);
+
+    auto * head = b.GetInsertBlock();
+
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+    auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
+
+    constexpr auto is_signed = std::numeric_limits<T>::is_signed;
+
+    llvm::Value * should_change_after_comparison = nullptr;
+
+    if constexpr (isMin)
+    {
+        if (value_to_check->getType()->isIntegerTy())
+            should_change_after_comparison = is_signed ? b.CreateICmpSLT(value_to_check, value) : b.CreateICmpULT(value_to_check, value);
+        else
+            should_change_after_comparison = b.CreateFCmpOLT(value_to_check, value);
+    }
+    else
+    {
+        if (value_to_check->getType()->isIntegerTy())
+            should_change_after_comparison = is_signed ? b.CreateICmpSGT(value_to_check, value) : b.CreateICmpUGT(value_to_check, value);
+        else
+            should_change_after_comparison = b.CreateFCmpOGT(value_to_check, value);
+    }
+
+    b.CreateCondBr(b.CreateOr(b.CreateNot(has_value_value), should_change_after_comparison), if_should_change, join_block);
+
+    b.SetInsertPoint(if_should_change);
+    compileSetValueFromNumber(builder, aggregate_data_ptr, value_to_check);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+}
+
+
+template <typename T>
+template <bool isMin>
+void SingleValueDataFixed<T>::compileMinMaxMerge(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    llvm::IRBuilder<> & b = static_cast<llvm::IRBuilder<> &>(builder);
+
+    auto * has_value_dst = getHasValueFromAggregateDataPtr(b, aggregate_data_dst_ptr);
+    auto * value_dst = getValueFromAggregateDataPtr(b, aggregate_data_dst_ptr);
+
+    auto * has_value_src = getHasValueFromAggregateDataPtr(b, aggregate_data_src_ptr);
+    auto * value_src = getValueFromAggregateDataPtr(b, aggregate_data_src_ptr);
+
+    auto * head = b.GetInsertBlock();
+
+    auto * join_block = llvm::BasicBlock::Create(head->getContext(), "join_block", head->getParent());
+    auto * if_should_change = llvm::BasicBlock::Create(head->getContext(), "if_should_change", head->getParent());
+
+    constexpr auto is_signed = std::numeric_limits<T>::is_signed;
+
+    llvm::Value * should_change_after_comparison = nullptr;
+
+    if constexpr (isMin)
+    {
+        if (value_src->getType()->isIntegerTy())
+            should_change_after_comparison = is_signed ? b.CreateICmpSLT(value_src, value_dst) : b.CreateICmpULT(value_src, value_dst);
+        else
+            should_change_after_comparison = b.CreateFCmpOLT(value_src, value_dst);
+    }
+    else
+    {
+        if (value_src->getType()->isIntegerTy())
+            should_change_after_comparison = is_signed ? b.CreateICmpSGT(value_src, value_dst) : b.CreateICmpUGT(
+                    value_src, value_dst);
+        else
+            should_change_after_comparison = b.CreateFCmpOGT(value_src, value_dst);
+    }
+
+    b.CreateCondBr(
+        b.CreateAnd(has_value_src, b.CreateOr(b.CreateNot(has_value_dst), should_change_after_comparison)), if_should_change, join_block);
+
+    b.SetInsertPoint(if_should_change);
+    compileSetValueFromAggregation(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+    b.CreateBr(join_block);
+
+    b.SetInsertPoint(join_block);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileMin(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    return compileMinMax<true>(builder, aggregate_data_ptr, value_to_check);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileMinMerge(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    return compileMinMaxMerge<true>(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileMax(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check)
+{
+    return compileMinMax<false>(builder, aggregate_data_ptr, value_to_check);
+}
+
+template <typename T>
+void SingleValueDataFixed<T>::compileMaxMerge(
+    llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr)
+{
+    return compileMinMaxMerge<false>(builder, aggregate_data_dst_ptr, aggregate_data_src_ptr);
+}
+
+#endif
+
+
+#define DISPATCH(TYPE) template struct SingleValueDataFixed<TYPE>;
+
+FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+
+template <typename T>
+SingleValueDataNumeric<T>::SingleValueDataNumeric()
+{
+    new (&memory) SingleValueDataFixed<T>;
+}
+
+/// No need to deallocate or do anything, since SingleValueDataFixed<T> uses only static storage
+template <typename T>
+SingleValueDataNumeric<T>::~SingleValueDataNumeric() = default;
+
+template <typename T>
+bool SingleValueDataNumeric<T>::has() const
+{
+    return memory.get().has();
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::insertResultInto(IColumn & to) const
+{
+    return memory.get().insertResultInto(to);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::write(DB::WriteBuffer & buf, const DB::ISerialization & serialization) const
+{
+    return memory.get().write(buf, serialization);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::read(DB::ReadBuffer & buf, const DB::ISerialization & serialization, DB::Arena * arena)
+{
+    return memory.get().read(buf, serialization, arena);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::isEqualTo(const DB::IColumn & column, size_t index) const
+{
+    return memory.get().isEqualTo(column, index);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::isEqualTo(const DB::SingleValueDataBase & to) const
+{
+    auto const & other = assert_cast<const Self &>(to);
+    return memory.get().isEqualTo(other.memory.get());
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::set(const DB::IColumn & column, size_t row_num, DB::Arena * arena)
+{
+    return memory.get().set(column, row_num, arena);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::set(const DB::SingleValueDataBase & to, DB::Arena * arena)
+{
+    auto const & other = assert_cast<const Self &>(to);
+    return memory.get().set(other.memory.get(), arena);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::setIfSmaller(const DB::SingleValueDataBase & to, DB::Arena * arena)
+{
+    auto const & other = assert_cast<const Self &>(to);
+    return memory.get().setIfSmaller(other.memory.get(), arena);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::setIfGreater(const DB::SingleValueDataBase & to, DB::Arena * arena)
+{
+    auto const & other = assert_cast<const Self &>(to);
+    return memory.get().setIfGreater(other.memory.get(), arena);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::setIfSmaller(const DB::IColumn & column, size_t row_num, DB::Arena * arena)
+{
+    return memory.get().setIfSmaller(column, row_num, arena);
+}
+
+template <typename T>
+bool SingleValueDataNumeric<T>::setIfGreater(const DB::IColumn & column, size_t row_num, DB::Arena * arena)
+{
+    return memory.get().setIfGreater(column, row_num, arena);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::setSmallest(const DB::IColumn & column, size_t row_begin, size_t row_end, DB::Arena * arena)
+{
+    return memory.get().setSmallest(column, row_begin, row_end, arena);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::setGreatest(const DB::IColumn & column, size_t row_begin, size_t row_end, DB::Arena * arena)
+{
+    return memory.get().setGreatest(column, row_begin, row_end, arena);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::setSmallestNotNullIf(
+    const DB::IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    DB::Arena * arena)
+{
+    return memory.get().setSmallestNotNullIf(column, null_map, if_map, row_begin, row_end, arena);
+}
+
+template <typename T>
+void SingleValueDataNumeric<T>::setGreatestNotNullIf(
+    const DB::IColumn & column,
+    const UInt8 * __restrict null_map,
+    const UInt8 * __restrict if_map,
+    size_t row_begin,
+    size_t row_end,
+    DB::Arena * arena)
+{
+    return memory.get().setGreatestNotNullIf(column, null_map, if_map, row_begin, row_end, arena);
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataNumeric<T>::getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    return memory.get().getSmallestIndex(column, row_begin, row_end);
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataNumeric<T>::getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const
+{
+    return memory.get().getGreatestIndex(column, row_begin, row_end);
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataNumeric<T>::getSmallestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    return memory.get().getSmallestIndexNotNullIf(column, null_map, if_map, row_begin, row_end);
+}
+
+template <typename T>
+std::optional<size_t> SingleValueDataNumeric<T>::getGreatestIndexNotNullIf(
+    const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const
+{
+    return memory.get().getGreatestIndexNotNullIf(column, null_map, if_map, row_begin, row_end);
+}
+
+#define DISPATCH(TYPE) template struct SingleValueDataNumeric<TYPE>;
+
+FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+namespace
+{
+
+struct StringValueCompatibility
+{
+    /// Old versions used to store terminating null-character in SingleValueDataString.
+    /// Then -WithTerminatingZero methods were removed from IColumn interface,
+    /// because these methods are quite dangerous and easy to misuse. It introduced incompatibility.
+    /// See https://github.com/ClickHouse/ClickHouse/pull/41431 and https://github.com/ClickHouse/ClickHouse/issues/42916
+    /// Here we keep these functions for compatibility.
+    /// It's safe because there's no way unsanitized user input (without \0 at the end) can reach these functions.
+
+    static StringRef getDataAtWithTerminatingZero(const ColumnString & column, size_t n)
+    {
+        auto res = column.getDataAt(n);
+        /// ColumnString always reserves extra byte for null-character after string.
+        /// But getDataAt returns StringRef without the null-character. Let's add it.
+        chassert(res.data[res.size] == '\0');
+        ++res.size;
+        return res;
+    }
+
+    static void insertDataWithTerminatingZero(ColumnString & column, const char * pos, size_t length)
+    {
+        /// String already has terminating null-character.
+        /// But insertData will add another one unconditionally. Trim existing null-character to avoid duplication.
+        chassert(0 < length);
+        chassert(pos[length - 1] == '\0');
+        column.insertData(pos, length - 1);
+    }
+};
+
+}
+
+char * SingleValueDataString::getDataMutable()
+{
+    return size <= MAX_SMALL_STRING_SIZE ? small_data : large_data;
+}
+
+const char * SingleValueDataString::getData() const
+{
+    const char * data_ptr = size <= MAX_SMALL_STRING_SIZE ? small_data : large_data;
+    /// It must always be terminated with null-character
+    chassert(0 < size);
+    chassert(data_ptr[size - 1] == '\0');
+    return data_ptr;
+}
+
+StringRef SingleValueDataString::getStringRef() const
+{
+    return StringRef(getData(), size);
+}
+
+void SingleValueDataString::allocateLargeDataIfNeeded(UInt32 size_to_reserve, Arena * arena)
+{
+    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 ({}), 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
+        capacity = static_cast<UInt32>(rounded_capacity);
+
+        /// Don't free large_data here.
+        large_data = arena->alloc(capacity);
+    }
+}
+
+void SingleValueDataString::changeImpl(StringRef value, Arena * arena)
+{
+    if (unlikely(MAX_STRING_SIZE < 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);
+
+    if (value_size <= MAX_SMALL_STRING_SIZE)
+    {
+        /// Don't free large_data here.
+        size = value_size;
+
+        if (size > 0)
+            memcpy(small_data, value.data, size);
+    }
+    else
+    {
+        allocateLargeDataIfNeeded(value_size, arena);
+        size = value_size;
+        memcpy(large_data, value.data, size);
+    }
+}
+
+void SingleValueDataString::insertResultInto(DB::IColumn & to) const
+{
+    if (has())
+        StringValueCompatibility::insertDataWithTerminatingZero(assert_cast<ColumnString &>(to), getData(), size);
+    else
+        assert_cast<ColumnString &>(to).insertDefault();
+}
+
+void SingleValueDataString::write(WriteBuffer & buf, const ISerialization & /*serialization*/) const
+{
+    if (unlikely(MAX_STRING_SIZE < size))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "String size is too big ({}), it's a bug", size);
+
+    /// For serialization we use signed Int32 (for historical reasons), -1 means "no value"
+    Int32 size_to_write = size ? size : -1;
+    writeBinaryLittleEndian(size_to_write, buf);
+    if (has())
+        buf.write(getData(), size);
+}
+
+void SingleValueDataString::read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena * arena)
+{
+    /// For serialization we use signed Int32 (for historical reasons), -1 means "no value"
+    Int32 rhs_size_signed;
+    readBinaryLittleEndian(rhs_size_signed, buf);
+
+    if (rhs_size_signed < 0)
+    {
+        /// Don't free large_data here.
+        size = 0;
+        return;
+    }
+
+    UInt32 rhs_size = rhs_size_signed;
+    if (rhs_size <= MAX_SMALL_STRING_SIZE)
+    {
+        /// Don't free large_data here.
+        size = rhs_size;
+        buf.readStrict(small_data, size);
+    }
+    else
+    {
+        /// Reserve one byte more for null-character
+        allocateLargeDataIfNeeded(rhs_size + 1, arena);
+        size = rhs_size;
+        buf.readStrict(large_data, size);
+    }
+
+    /// Check if the string we read is null-terminated (getDataMutable does not have the assertion)
+    if (0 < size && getDataMutable()[size - 1] == '\0')
+        return;
+
+    /// It's not null-terminated, but it must be (for historical reasons). There are two variants:
+    /// - The value was serialized by one of the incompatible versions of ClickHouse. We had some range of versions
+    ///   that used to serialize SingleValueDataString without terminating '\0'. Let's just append it.
+    /// - An attacker sent crafted data. Sanitize it and append '\0'.
+    /// In all other cases the string must be already null-terminated.
+
+    /// NOTE We cannot add '\0' unconditionally, because it will be duplicated.
+    /// NOTE It's possible that a string that actually ends with '\0' was written by one of the incompatible versions.
+    ///      Unfortunately, we cannot distinguish it from normal string written by normal version.
+    ///      So such strings will be trimmed.
+
+    if (size == MAX_SMALL_STRING_SIZE)
+    {
+        /// Special case: We have to move value to large_data
+        allocateLargeDataIfNeeded(size + 1, arena);
+        memcpy(large_data, small_data, size);
+    }
+
+    /// We have enough space to append
+    ++size;
+    getDataMutable()[size - 1] = '\0';
+}
+
+bool SingleValueDataString::isEqualTo(const DB::IColumn & column, size_t row_num) const
+{
+    return has()
+        && StringValueCompatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) == getStringRef();
+}
+
+bool SingleValueDataString::isEqualTo(const SingleValueDataBase & other) const
+{
+    auto const & to = assert_cast<const Self &>(other);
+    return has() && to.getStringRef() == getStringRef();
+}
+
+void SingleValueDataString::set(const IColumn & column, size_t row_num, Arena * arena)
+{
+    changeImpl(StringValueCompatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num), arena);
+}
+
+void SingleValueDataString::set(const SingleValueDataBase & other, Arena * arena)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (to.has())
+        changeImpl(to.getStringRef(), arena);
+}
+
+bool SingleValueDataString::setIfSmaller(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has()
+        || StringValueCompatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) < getStringRef())
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool SingleValueDataString::setIfSmaller(const SingleValueDataBase & other, Arena * arena)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (to.has() && (!has() || to.getStringRef() < getStringRef()))
+    {
+        changeImpl(to.getStringRef(), arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+
+bool SingleValueDataString::setIfGreater(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has()
+        || StringValueCompatibility::getDataAtWithTerminatingZero(assert_cast<const ColumnString &>(column), row_num) > getStringRef())
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+bool SingleValueDataString::setIfGreater(const SingleValueDataBase & other, Arena * arena)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (to.has() && (!has() || to.getStringRef() > getStringRef()))
+    {
+        changeImpl(to.getStringRef(), arena);
+        return true;
+    }
+    else
+        return false;
+}
+
+void SingleValueDataGeneric::insertResultInto(IColumn & to) const
+{
+    if (has())
+        to.insert(value);
+    else
+        to.insertDefault();
+}
+
+void SingleValueDataGeneric::write(WriteBuffer & buf, const ISerialization & serialization) const
+{
+    if (!value.isNull())
+    {
+        writeBinary(true, buf);
+        serialization.serializeBinary(value, buf, {});
+    }
+    else
+        writeBinary(false, buf);
+}
+
+void SingleValueDataGeneric::read(ReadBuffer & buf, const ISerialization & serialization, Arena *)
+{
+    bool is_not_null;
+    readBinary(is_not_null, buf);
+
+    if (is_not_null)
+        serialization.deserializeBinary(value, buf, {});
+}
+
+bool SingleValueDataGeneric::isEqualTo(const IColumn & column, size_t row_num) const
+{
+    return has() && value == column[row_num];
+}
+
+bool SingleValueDataGeneric::isEqualTo(const DB::SingleValueDataBase & other) const
+{
+    auto const & to = assert_cast<const Self &>(other);
+    return has() && to.value == value;
+}
+
+void SingleValueDataGeneric::set(const IColumn & column, size_t row_num, Arena *)
+{
+    column.get(row_num, value);
+}
+
+void SingleValueDataGeneric::set(const SingleValueDataBase & other, Arena *)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (other.has())
+        value = to.value;
+}
+
+bool SingleValueDataGeneric::setIfSmaller(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has())
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+    {
+        Field new_value;
+        column.get(row_num, new_value);
+        if (new_value < value)
+        {
+            value = new_value;
+            return true;
+        }
+        else
+            return false;
+    }
+}
+
+bool SingleValueDataGeneric::setIfSmaller(const SingleValueDataBase & other, Arena *)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (to.has() && (!has() || to.value < value))
+    {
+        value = to.value;
+        return true;
+    }
+    else
+        return false;
+}
+
+bool SingleValueDataGeneric::setIfGreater(const IColumn & column, size_t row_num, Arena * arena)
+{
+    if (!has())
+    {
+        set(column, row_num, arena);
+        return true;
+    }
+    else
+    {
+        Field new_value;
+        column.get(row_num, new_value);
+        if (new_value > value)
+        {
+            value = new_value;
+            return true;
+        }
+        else
+            return false;
+    }
+}
+
+bool SingleValueDataGeneric::setIfGreater(const SingleValueDataBase & other, Arena *)
+{
+    auto const & to = assert_cast<const Self &>(other);
+    if (to.has() && (!has() || to.value > value))
+    {
+        value = to.value;
+        return true;
+    }
+    else
+        return false;
+}
+
+void generateSingleValueFromTypeIndex(TypeIndex idx, SingleValueDataBaseMemoryBlock & data)
+{
+#define DISPATCH(TYPE) \
+    if (idx == TypeIndex::TYPE) \
+    { \
+        static_assert(sizeof(SingleValueDataNumeric<TYPE>) <= sizeof(SingleValueDataBaseMemoryBlock::memory)); \
+        static_assert(alignof(SingleValueDataNumeric<TYPE>) <= alignof(SingleValueDataBaseMemoryBlock)); \
+        new (&data.memory) SingleValueDataNumeric<TYPE>; \
+        return; \
+    }
+
+    FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    if (idx == TypeIndex::Date)
+    {
+        static_assert(sizeof(SingleValueDataNumeric<DataTypeDate::FieldType>) <= sizeof(SingleValueDataBaseMemoryBlock::memory));
+        static_assert(alignof(SingleValueDataNumeric<DataTypeDate::FieldType>) <= alignof(SingleValueDataBaseMemoryBlock));
+        new (&data.memory) SingleValueDataNumeric<DataTypeDate::FieldType>;
+        return;
+    }
+    if (idx == TypeIndex::DateTime)
+    {
+        static_assert(sizeof(SingleValueDataNumeric<DataTypeDateTime::FieldType>) <= sizeof(SingleValueDataBaseMemoryBlock::memory));
+        static_assert(alignof(SingleValueDataNumeric<DataTypeDateTime::FieldType>) <= alignof(SingleValueDataBaseMemoryBlock));
+        new (&data.memory) SingleValueDataNumeric<DataTypeDateTime::FieldType>;
+        return;
+    }
+    if (idx == TypeIndex::String)
+    {
+        static_assert(sizeof(SingleValueDataString) <= sizeof(SingleValueDataBaseMemoryBlock::memory));
+        static_assert(alignof(SingleValueDataString) <= alignof(SingleValueDataBaseMemoryBlock));
+        new (&data.memory) SingleValueDataString;
+        return;
+    }
+    static_assert(sizeof(SingleValueDataGeneric) <= sizeof(SingleValueDataBaseMemoryBlock::memory));
+    static_assert(alignof(SingleValueDataGeneric) <= alignof(SingleValueDataBaseMemoryBlock));
+    new (&data.memory) SingleValueDataGeneric;
+}
+
+bool singleValueTypeAllocatesMemoryInArena(TypeIndex idx)
+{
+    return idx == TypeIndex::String;
+}
+}
diff --git a/src/AggregateFunctions/SingleValueData.h b/src/AggregateFunctions/SingleValueData.h
new file mode 100644
index 00000000000..cde13b128e5
--- /dev/null
+++ b/src/AggregateFunctions/SingleValueData.h
@@ -0,0 +1,394 @@
+#pragma once
+
+#include <AggregateFunctions/FactoryHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnDecimal.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <base/StringRef.h>
+
+namespace DB
+{
+class Arena;
+class ReadBuffer;
+struct Settings;
+class WriteBuffer;
+
+/// Base class for Aggregation data that stores one of passed values: min, any, argMax...
+/// It's setup as a virtual class so we can avoid templates when we need to extend them (argMax, SingleValueOrNull)
+struct SingleValueDataBase
+{
+    /// Any subclass (numeric, string, generic) must be smaller than MAX_STORAGE_SIZE
+    /// We use this knowledge to create composite data classes that use them directly by reserving a 'memory_block'
+    /// For example argMin holds 1 of these (for the result), while keeping a template for the value
+    static constexpr UInt32 MAX_STORAGE_SIZE = 64;
+
+    virtual ~SingleValueDataBase() = default;
+    virtual bool has() const = 0;
+    virtual void insertResultInto(IColumn &) const = 0;
+    virtual void write(WriteBuffer &, const ISerialization &) const = 0;
+    virtual void read(ReadBuffer &, const ISerialization &, Arena *) = 0;
+
+    virtual bool isEqualTo(const IColumn & column, size_t row_num) const = 0;
+    virtual bool isEqualTo(const SingleValueDataBase &) const = 0;
+    virtual void set(const IColumn &, size_t row_num, Arena *) = 0;
+    virtual void set(const SingleValueDataBase &, Arena *) = 0;
+    virtual bool setIfSmaller(const IColumn &, size_t row_num, Arena *) = 0;
+    virtual bool setIfSmaller(const SingleValueDataBase &, Arena *) = 0;
+    virtual bool setIfGreater(const IColumn &, size_t row_num, Arena *) = 0;
+    virtual bool setIfGreater(const SingleValueDataBase &, Arena *) = 0;
+
+    /// Given a column, sets the internal value to the smallest or greatest value from the column
+    /// Used to implement batch min/max
+    virtual void setSmallest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena);
+    virtual void setGreatest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena);
+    virtual void setSmallestNotNullIf(const IColumn &, const UInt8 * __restrict, const UInt8 * __restrict, size_t, size_t, Arena *);
+    virtual void setGreatestNotNullIf(const IColumn &, const UInt8 * __restrict, const UInt8 * __restrict, size_t, size_t, Arena *);
+
+    /// Given a column returns the index of the smallest or greatest value in it
+    /// Doesn't return anything if the column is empty
+    /// There are used to implement argMin / argMax
+    virtual std::optional<size_t> getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const;
+    virtual std::optional<size_t> getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const;
+    virtual std::optional<size_t> getSmallestIndexNotNullIf(
+        const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const;
+    virtual std::optional<size_t> getGreatestIndexNotNullIf(
+        const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const;
+};
+
+
+#define FOR_SINGLE_VALUE_NUMERIC_TYPES(M) \
+    M(UInt8) \
+    M(UInt16) \
+    M(UInt32) \
+    M(UInt64) \
+    M(UInt128) \
+    M(UInt256) \
+    M(Int8) \
+    M(Int16) \
+    M(Int32) \
+    M(Int64) \
+    M(Int128) \
+    M(Int256) \
+    M(Float32) \
+    M(Float64) \
+    M(Decimal32) \
+    M(Decimal64) \
+    M(Decimal128) \
+    M(Decimal256) \
+    M(DateTime64)
+
+/// For numeric values (without inheritance, for performance sensitive functions and JIT)
+template <typename T>
+struct SingleValueDataFixed
+{
+    static constexpr bool is_compilable = true;
+    using Self = SingleValueDataFixed;
+    using ColVecType = ColumnVectorOrDecimal<T>;
+
+    T value = T{};
+    /// We need to remember if at least one value has been passed.
+    /// This is necessary for AggregateFunctionIf, merging states, JIT (where simple add is used), etc
+    bool has_value = false;
+
+    bool has() const { return has_value; }
+    void insertResultInto(IColumn & to) const;
+    void write(WriteBuffer & buf, const ISerialization &) const;
+    void read(ReadBuffer & buf, const ISerialization &, Arena *);
+    bool isEqualTo(const IColumn & column, size_t index) const;
+    bool isEqualTo(const Self & to) const;
+
+    void set(const IColumn & column, size_t row_num, Arena *);
+    void set(const Self & to, Arena *);
+
+    bool setIfSmaller(const T & to);
+    bool setIfGreater(const T & to);
+
+    bool setIfSmaller(const Self & to, Arena * arena);
+    bool setIfGreater(const Self & to, Arena * arena);
+    bool setIfSmaller(const IColumn & column, size_t row_num, Arena * arena);
+    bool setIfGreater(const IColumn & column, size_t row_num, Arena * arena);
+    void setSmallest(const IColumn & column, size_t row_begin, size_t row_end, Arena *);
+    void setGreatest(const IColumn & column, size_t row_begin, size_t row_end, Arena *);
+    void setSmallestNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end,
+        Arena *);
+    void setGreatestNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end,
+        Arena *);
+
+    std::optional<size_t> getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const;
+    std::optional<size_t> getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const;
+    std::optional<size_t> getSmallestIndexNotNullIf(
+        const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const;
+    std::optional<size_t> getGreatestIndexNotNullIf(
+        const IColumn & column, const UInt8 * __restrict null_map, const UInt8 * __restrict if_map, size_t row_begin, size_t row_end) const;
+
+    static bool allocatesMemoryInArena() { return false; }
+
+#if USE_EMBEDDED_COMPILER
+    static constexpr size_t has_value_offset = offsetof(Self, has_value);
+    static constexpr size_t value_offset = offsetof(Self, value);
+
+    static bool isCompilable(const IDataType & type);
+    static llvm::Value * getValuePtrFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+    static llvm::Value * getValueFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+    static llvm::Value * getHasValuePtrFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+    static llvm::Value * getHasValueFromAggregateDataPtr(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+
+    static void compileCreate(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+    static llvm::Value * compileGetResult(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr);
+
+    static void compileSetValueFromNumber(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    static void
+    compileSetValueFromAggregation(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * aggregate_data_src_ptr);
+
+    static void compileAny(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    static void compileAnyMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr);
+
+    static void compileAnyLast(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    static void
+    compileAnyLastMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr);
+
+    template <bool isMin>
+    static void compileMinMax(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    template <bool isMin>
+    static void
+    compileMinMaxMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr);
+    static void compileMin(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    static void compileMinMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr);
+    static void compileMax(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_ptr, llvm::Value * value_to_check);
+    static void compileMaxMerge(llvm::IRBuilderBase & builder, llvm::Value * aggregate_data_dst_ptr, llvm::Value * aggregate_data_src_ptr);
+#endif
+};
+
+#define DISPATCH(TYPE) \
+    extern template struct SingleValueDataFixed<TYPE>; \
+    static_assert( \
+        sizeof(SingleValueDataFixed<TYPE>) <= SingleValueDataBase::MAX_STORAGE_SIZE, "Incorrect size of SingleValueDataFixed struct");
+
+FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+/// For numeric values inheriting from SingleValueDataBase
+template <typename T>
+struct SingleValueDataNumeric final : public SingleValueDataBase
+{
+    using Self = SingleValueDataNumeric<T>;
+    using Base = SingleValueDataFixed<T>;
+
+private:
+    /// 32 bytes for types of 256 bits, + 8 bytes for the virtual table pointer.
+    static constexpr size_t base_memory_reserved_size = 40;
+    struct alignas(alignof(Base)) PrivateMemory
+    {
+        char memory[base_memory_reserved_size];
+        Base & get() { return *reinterpret_cast<Base *>(memory); }
+        const Base & get() const { return *reinterpret_cast<const Base *>(memory); }
+    };
+    static_assert(sizeof(Base) <= base_memory_reserved_size);
+
+    PrivateMemory memory;
+
+public:
+    static constexpr bool is_compilable = false;
+
+    SingleValueDataNumeric();
+    ~SingleValueDataNumeric() override;
+
+    bool has() const override;
+    void insertResultInto(IColumn & to) const override;
+    void write(WriteBuffer & buf, const ISerialization & serialization) const override;
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena * arena) override;
+    bool isEqualTo(const IColumn & column, size_t index) const override;
+    bool isEqualTo(const SingleValueDataBase & to) const override;
+
+    void set(const IColumn & column, size_t row_num, Arena * arena) override;
+    void set(const SingleValueDataBase & to, Arena * arena) override;
+
+    bool setIfSmaller(const SingleValueDataBase & to, Arena * arena) override;
+    bool setIfGreater(const SingleValueDataBase & to, Arena * arena) override;
+    bool setIfSmaller(const IColumn & column, size_t row_num, Arena * arena) override;
+    bool setIfGreater(const IColumn & column, size_t row_num, Arena * arena) override;
+    void setSmallest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena) override;
+    void setGreatest(const IColumn & column, size_t row_begin, size_t row_end, Arena * arena) override;
+    void setSmallestNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end,
+        Arena * arena) override;
+    void setGreatestNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end,
+        Arena * arena) override;
+
+    std::optional<size_t> getSmallestIndex(const IColumn & column, size_t row_begin, size_t row_end) const override;
+    std::optional<size_t> getGreatestIndex(const IColumn & column, size_t row_begin, size_t row_end) const override;
+    std::optional<size_t> getSmallestIndexNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end) const override;
+    std::optional<size_t> getGreatestIndexNotNullIf(
+        const IColumn & column,
+        const UInt8 * __restrict null_map,
+        const UInt8 * __restrict if_map,
+        size_t row_begin,
+        size_t row_end) const override;
+
+    static bool allocatesMemoryInArena() { return false; }
+};
+
+#define DISPATCH(TYPE) \
+    extern template struct SingleValueDataNumeric<TYPE>; \
+    static_assert( \
+        sizeof(SingleValueDataNumeric<TYPE>) <= SingleValueDataBase::MAX_STORAGE_SIZE, "Incorrect size of SingleValueDataNumeric struct");
+
+FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+
+/** For strings. Short strings are stored in the object itself, and long strings are allocated separately.
+  * NOTE It could also be suitable for arrays of numbers.
+//  */
+struct SingleValueDataString final : public SingleValueDataBase
+{
+    static constexpr bool is_compilable = false;
+    using Self = SingleValueDataString;
+
+    /// 0 size indicates that there is no value. Empty string must have terminating '\0' and, therefore, size of empty string is 1
+    UInt32 size = 0;
+    UInt32 capacity = 0; /// power of two or zero
+    char * large_data; /// Always allocated in an arena
+
+    //// TODO: Maybe instead of a virtual class we need to go with a std::variant of the 3 to avoid reserving space for the vtable
+    static constexpr UInt32 MAX_SMALL_STRING_SIZE
+        = SingleValueDataBase::MAX_STORAGE_SIZE - sizeof(size) - sizeof(capacity) - sizeof(large_data) - sizeof(SingleValueDataBase);
+    static constexpr UInt32 MAX_STRING_SIZE = std::numeric_limits<Int32>::max();
+
+private:
+    char small_data[MAX_SMALL_STRING_SIZE]; /// Including the terminating zero.
+
+    char * getDataMutable();
+    const char * getData() const;
+    StringRef getStringRef() const;
+    void allocateLargeDataIfNeeded(UInt32 size_to_reserve, Arena * arena);
+    void changeImpl(StringRef value, Arena * arena);
+
+public:
+    bool has() const override { return size != 0; }
+    void insertResultInto(IColumn & to) const override;
+    void write(WriteBuffer & buf, const ISerialization & /*serialization*/) const override;
+    void read(ReadBuffer & buf, const ISerialization & /*serialization*/, Arena * arena) override;
+
+    bool isEqualTo(const IColumn & column, size_t row_num) const override;
+    bool isEqualTo(const SingleValueDataBase &) const override;
+    void set(const IColumn & column, size_t row_num, Arena * arena) override;
+    void set(const SingleValueDataBase &, Arena * arena) override;
+
+    bool setIfSmaller(const IColumn & column, size_t row_num, Arena * arena) override;
+    bool setIfSmaller(const SingleValueDataBase &, Arena * arena) override;
+
+    bool setIfGreater(const IColumn & column, size_t row_num, Arena * arena) override;
+    bool setIfGreater(const SingleValueDataBase &, Arena * arena) override;
+
+    static bool allocatesMemoryInArena() { return true; }
+};
+
+static_assert(sizeof(SingleValueDataString) == SingleValueDataBase::MAX_STORAGE_SIZE, "Incorrect size of SingleValueDataString struct");
+
+
+/// For any other value types.
+struct SingleValueDataGeneric final : public SingleValueDataBase
+{
+    static constexpr bool is_compilable = false;
+
+private:
+    using Self = SingleValueDataGeneric;
+    Field value;
+
+public:
+    bool has() const override { return !value.isNull(); }
+    void insertResultInto(IColumn & to) const override;
+    void write(WriteBuffer & buf, const ISerialization & serialization) const override;
+    void read(ReadBuffer & buf, const ISerialization & serialization, Arena *) override;
+
+    bool isEqualTo(const IColumn & column, size_t row_num) const override;
+    bool isEqualTo(const SingleValueDataBase & other) const override;
+    void set(const IColumn & column, size_t row_num, Arena *) override;
+    void set(const SingleValueDataBase & other, Arena *) override;
+
+    bool setIfSmaller(const IColumn & column, size_t row_num, Arena * arena) override;
+    bool setIfSmaller(const SingleValueDataBase & other, Arena *) override;
+    bool setIfGreater(const IColumn & column, size_t row_num, Arena * arena) override;
+    bool setIfGreater(const SingleValueDataBase & other, Arena *) override;
+
+    static bool allocatesMemoryInArena() { return false; }
+};
+
+static_assert(sizeof(SingleValueDataGeneric) <= SingleValueDataBase::MAX_STORAGE_SIZE, "Incorrect size of SingleValueDataGeneric struct");
+
+/// min, max, any, anyLast, anyHeavy, etc...
+template <template <typename, bool...> class AggregateFunctionTemplate, bool unary, bool... isMin>
+static IAggregateFunction *
+createAggregateFunctionSingleValue(const String & name, const DataTypes & argument_types, const Array & parameters, const Settings *)
+{
+    assertNoParameters(name, parameters);
+    if constexpr (unary)
+        assertUnary(name, argument_types);
+    else
+        assertBinary(name, argument_types);
+
+    const DataTypePtr & value_type = unary ? argument_types[0] : argument_types[1];
+    WhichDataType which(value_type);
+#define DISPATCH(TYPE) \
+    if (which.idx == TypeIndex::TYPE) \
+        return new AggregateFunctionTemplate<SingleValueDataFixed<TYPE>, isMin...>(argument_types); /// NOLINT
+    FOR_SINGLE_VALUE_NUMERIC_TYPES(DISPATCH)
+#undef DISPATCH
+
+    if (which.idx == TypeIndex::Date)
+        return new AggregateFunctionTemplate<SingleValueDataFixed<DataTypeDate::FieldType>, isMin...>(argument_types);
+    if (which.idx == TypeIndex::DateTime)
+        return new AggregateFunctionTemplate<SingleValueDataFixed<DataTypeDateTime::FieldType>, isMin...>(argument_types);
+    if (which.idx == TypeIndex::String)
+        return new AggregateFunctionTemplate<SingleValueDataString, isMin...>(argument_types);
+
+    return new AggregateFunctionTemplate<SingleValueDataGeneric, isMin...>(argument_types);
+}
+
+/// Helper to allocate enough memory to store any derived class
+struct SingleValueDataBaseMemoryBlock
+{
+    std::aligned_union_t<
+        SingleValueDataBase::MAX_STORAGE_SIZE,
+        SingleValueDataNumeric<Decimal256>, /// We check all types in generateSingleValueFromTypeIndex
+        SingleValueDataString,
+        SingleValueDataGeneric>
+        memory;
+    SingleValueDataBase & get() { return *reinterpret_cast<SingleValueDataBase *>(&memory); }
+    const SingleValueDataBase & get() const { return *reinterpret_cast<const SingleValueDataBase *>(&memory); }
+};
+
+static_assert(alignof(SingleValueDataBaseMemoryBlock) == 8);
+
+/// For Data classes that want to compose on top of SingleValueDataBase values, like argMax or singleValueOrNull
+/// It will build the object based on the type idx on the memory block provided
+void generateSingleValueFromTypeIndex(TypeIndex idx, SingleValueDataBaseMemoryBlock & data);
+
+bool singleValueTypeAllocatesMemoryInArena(TypeIndex idx);
+}
diff --git a/src/AggregateFunctions/UniqExactSet.h b/src/AggregateFunctions/UniqExactSet.h
index 06157405cc5..2ae8c3a8386 100644
--- a/src/AggregateFunctions/UniqExactSet.h
+++ b/src/AggregateFunctions/UniqExactSet.h
@@ -11,10 +11,16 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int TOO_LARGE_ARRAY_SIZE;
+}
+
 template <typename SingleLevelSet, typename TwoLevelSet>
 class UniqExactSet
 {
     static_assert(std::is_same_v<typename SingleLevelSet::value_type, typename TwoLevelSet::value_type>);
+    static_assert(std::is_same_v<typename SingleLevelSet::Cell::State, HashTableNoState>);
 
 public:
     using value_type = typename SingleLevelSet::value_type;
@@ -31,10 +37,10 @@ public:
     /// In merge, if one of the lhs and rhs is twolevelset and the other is singlelevelset, then the singlelevelset will need to convertToTwoLevel().
     /// It's not in parallel and will cost extra large time if the thread_num is large.
     /// This method will convert all the SingleLevelSet to TwoLevelSet in parallel if the hashsets are not all singlelevel or not all twolevel.
-    static void parallelizeMergePrepare(const std::vector<UniqExactSet *> & data_vec, ThreadPool & thread_pool)
+    static void parallelizeMergePrepare(const std::vector<UniqExactSet *> & data_vec, ThreadPool & thread_pool, std::atomic<bool> & is_cancelled)
     {
-        unsigned long single_level_set_num = 0;
-        unsigned long all_single_hash_size = 0;
+        UInt64 single_level_set_num = 0;
+        UInt64 all_single_hash_size = 0;
 
         for (auto ele : data_vec)
         {
@@ -57,7 +63,7 @@ public:
             try
             {
                 auto data_vec_atomic_index = std::make_shared<std::atomic_uint32_t>(0);
-                auto thread_func = [data_vec, data_vec_atomic_index, thread_group = CurrentThread::getGroup()]()
+                auto thread_func = [data_vec, data_vec_atomic_index, &is_cancelled, thread_group = CurrentThread::getGroup()]()
                 {
                     SCOPE_EXIT_SAFE(
                         if (thread_group)
@@ -70,6 +76,9 @@ public:
 
                     while (true)
                     {
+                        if (is_cancelled.load(std::memory_order_seq_cst))
+                            return;
+
                         const auto i = data_vec_atomic_index->fetch_add(1);
                         if (i >= data_vec.size())
                             return;
@@ -90,7 +99,7 @@ public:
         }
     }
 
-    auto merge(const UniqExactSet & other, ThreadPool * thread_pool = nullptr)
+    auto merge(const UniqExactSet & other, ThreadPool * thread_pool = nullptr, std::atomic<bool> * is_cancelled = nullptr)
     {
         if (isSingleLevel() && other.isTwoLevel())
             convertToTwoLevel();
@@ -107,7 +116,9 @@ public:
             if (!thread_pool)
             {
                 for (size_t i = 0; i < rhs.NUM_BUCKETS; ++i)
+                {
                     lhs.impls[i].merge(rhs.impls[i]);
+                }
             }
             else
             {
@@ -115,7 +126,7 @@ public:
                 {
                     auto next_bucket_to_merge = std::make_shared<std::atomic_uint32_t>(0);
 
-                    auto thread_func = [&lhs, &rhs, next_bucket_to_merge, thread_group = CurrentThread::getGroup()]()
+                    auto thread_func = [&lhs, &rhs, next_bucket_to_merge, is_cancelled, thread_group = CurrentThread::getGroup()]()
                     {
                         SCOPE_EXIT_SAFE(
                             if (thread_group)
@@ -127,6 +138,9 @@ public:
 
                         while (true)
                         {
+                            if (is_cancelled->load(std::memory_order_seq_cst))
+                                return;
+
                             const auto bucket = next_bucket_to_merge->fetch_add(1);
                             if (bucket >= rhs.NUM_BUCKETS)
                                 return;
@@ -147,7 +161,36 @@ public:
         }
     }
 
-    void read(ReadBuffer & in) { asSingleLevel().read(in); }
+    void read(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);
+
+        if (worthConvertingToTwoLevel(new_size))
+        {
+            two_level_set = std::make_shared<TwoLevelSet>(new_size);
+            for (size_t i = 0; i < new_size; ++i)
+            {
+                typename SingleLevelSet::Cell x;
+                x.read(in);
+                asTwoLevel().insert(x.getValue());
+            }
+        }
+        else
+        {
+            asSingleLevel().reserve(new_size);
+
+            for (size_t i = 0; i < new_size; ++i)
+            {
+                typename SingleLevelSet::Cell x;
+                x.read(in);
+                asSingleLevel().insert(x.getValue());
+            }
+        }
+    }
 
     void write(WriteBuffer & out) const
     {
@@ -166,6 +209,8 @@ public:
         return two_level_set ? two_level_set : std::make_shared<TwoLevelSet>(asSingleLevel());
     }
 
+    static bool worthConvertingToTwoLevel(size_t size) { return size > 100'000; }
+
     void convertToTwoLevel()
     {
         two_level_set = getTwoLevelSet();
diff --git a/src/AggregateFunctions/examples/CMakeLists.txt b/src/AggregateFunctions/examples/CMakeLists.txt
index b11f8d37d69..a9033fd8508 100644
--- a/src/AggregateFunctions/examples/CMakeLists.txt
+++ b/src/AggregateFunctions/examples/CMakeLists.txt
@@ -1,2 +1,5 @@
 clickhouse_add_executable (quantile-t-digest quantile-t-digest.cpp)
 target_link_libraries (quantile-t-digest PRIVATE dbms clickhouse_aggregate_functions)
+
+clickhouse_add_executable (group_array_sorted group_array_sorted.cpp)
+target_link_libraries (group_array_sorted PRIVATE dbms clickhouse_aggregate_functions)
diff --git a/src/AggregateFunctions/examples/group_array_sorted.cpp b/src/AggregateFunctions/examples/group_array_sorted.cpp
new file mode 100644
index 00000000000..06592892c35
--- /dev/null
+++ b/src/AggregateFunctions/examples/group_array_sorted.cpp
@@ -0,0 +1,205 @@
+#include <algorithm>
+#include <type_traits>
+#include <utility>
+#include <iostream>
+
+#include "pcg_random.hpp"
+
+#include <Columns/ColumnVector.h>
+#include <Common/ArenaAllocator.h>
+#include <Common/RadixSort.h>
+#include <Columns/ColumnArray.h>
+
+
+using namespace DB;
+
+template <typename T>
+struct GroupArraySortedDataHeap
+{
+    using Allocator = MixedAlignedArenaAllocator<alignof(T), 4096>;
+    using Array = PODArray<T, 32, Allocator>;
+
+    Array values;
+
+    static bool compare(const T & lhs, const T & rhs)
+    {
+        return lhs < rhs;
+    }
+
+    struct Comparator
+    {
+        bool operator()(const T & lhs, const T & rhs)
+        {
+            return compare(lhs, rhs);
+        }
+    };
+
+    ALWAYS_INLINE void replaceTop()
+    {
+        size_t size = values.size();
+        if (size < 2)
+            return;
+
+        size_t child_index = 1;
+
+        if (values.size() > 2 && compare(values[1], values[2]))
+            ++child_index;
+
+        /// Check if we are in order
+        if (compare(values[child_index], values[0]))
+            return;
+
+        size_t current_index = 0;
+        auto current = values[current_index];
+
+        do
+        {
+            /// We are not in heap-order, swap the parent with it's largest child.
+            values[current_index] = values[child_index];
+            current_index = child_index;
+
+            // Recompute the child based off of the updated parent
+            child_index = 2 * child_index + 1;
+
+            if (child_index >= size)
+                break;
+
+            if ((child_index + 1) < size && compare(values[child_index], values[child_index + 1]))
+            {
+                /// Right child exists and is greater than left child.
+                ++child_index;
+            }
+
+            /// Check if we are in order.
+        } while (!compare(values[child_index], current));
+
+        values[current_index] = current;
+    }
+
+    ALWAYS_INLINE void addElement(const T & element, size_t max_elements, Arena * arena)
+    {
+        if (values.size() >= max_elements)
+        {
+            /// Element is greater or equal than current max element, it cannot be in k min elements
+            if (!compare(element, values[0]))
+                return;
+
+            values[0] = element;
+            replaceTop();
+            return;
+        }
+
+        values.push_back(element, arena);
+        std::push_heap(values.begin(), values.end(), Comparator());
+    }
+
+    ALWAYS_INLINE void dump()
+    {
+        while (!values.empty())
+        {
+            std::pop_heap(values.begin(), values.end(), Comparator());
+            std::cerr << values.back() << ' ';
+            values.pop_back();
+        }
+
+        std::cerr << '\n';
+    }
+};
+
+template <typename T>
+struct GroupArraySortedDataSort
+{
+    using Allocator = MixedAlignedArenaAllocator<alignof(T), 4096>;
+    using Array = PODArray<T, 32, Allocator>;
+
+    Array values;
+
+    static bool compare(const T & lhs, const T & rhs)
+    {
+        return lhs < rhs;
+    }
+
+    struct Comparator
+    {
+        bool operator()(const T & lhs, const T & rhs)
+        {
+            return compare(lhs, rhs);
+        }
+    };
+
+    ALWAYS_INLINE void sortAndLimit(size_t max_elements, Arena * arena)
+    {
+        RadixSort<RadixSortNumTraits<T>>::executeLSD(values.data(), values.size());
+        values.resize(max_elements, arena);
+    }
+
+    ALWAYS_INLINE void partialSortAndLimitIfNeeded(size_t max_elements, Arena * arena)
+    {
+        if (values.size() < max_elements * 4)
+            return;
+
+        std::nth_element(values.begin(), values.begin() + max_elements, values.end(), Comparator());
+        values.resize(max_elements, arena);
+    }
+
+    ALWAYS_INLINE void addElement(const T & element, size_t max_elements, Arena * arena)
+    {
+        values.push_back(element, arena);
+        partialSortAndLimitIfNeeded(max_elements, arena);
+    }
+};
+
+template <typename SortedData>
+NO_INLINE void benchmark(size_t elements, size_t max_elements)
+{
+    Stopwatch watch;
+    watch.start();
+
+    SortedData data;
+    pcg64_fast rng;
+
+    Arena arena;
+
+    for (size_t i = 0; i < elements; ++i)
+    {
+        uint64_t value = rng();
+        data.addElement(value, max_elements, &arena);
+    }
+
+    watch.stop();
+    std::cerr << "Elapsed " << watch.elapsedMilliseconds() << " milliseconds" << '\n';
+}
+
+int main(int argc, char ** argv)
+{
+    (void)(argc);
+    (void)(argv);
+
+    if (argc != 4)
+    {
+        std::cerr << "./group_array_sorted method elements max_elements" << '\n';
+        return 1;
+    }
+
+    std::string method = std::string(argv[1]);
+    uint64_t elements = std::atol(argv[2]); /// NOLINT
+    uint64_t max_elements = std::atol(argv[3]); /// NOLINT
+
+    std::cerr << "Method " << method << " elements " << elements << " max elements " << max_elements << '\n';
+
+    if (method == "heap")
+    {
+        benchmark<GroupArraySortedDataHeap<UInt64>>(elements, max_elements);
+    }
+    else if (method == "sort")
+    {
+        benchmark<GroupArraySortedDataSort<UInt64>>(elements, max_elements);
+    }
+    else
+    {
+        std::cerr << "Invalid method " << method << '\n';
+        return 1;
+    }
+
+    return 0;
+}
diff --git a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
index 290da81944d..425364efb9c 100644
--- a/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
+++ b/src/AggregateFunctions/fuzzers/aggregate_function_state_deserialization_fuzzer.cpp
@@ -27,6 +27,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 
         auto initialize = [&]() mutable
         {
+            if (context)
+                return true;
+
             shared_context = Context::createShared();
             context = Context::createGlobal(shared_context.get());
             context->makeGlobalContext();
diff --git a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
index db1efe224d1..593be1e0a79 100644
--- a/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
+++ b/src/AggregateFunctions/parseAggregateFunctionParameters.cpp
@@ -81,7 +81,8 @@ void getAggregateFunctionNameAndParametersArray(
     ParserExpressionList params_parser(false);
     ASTPtr args_ast = parseQuery(params_parser,
         parameters_str.data(), parameters_str.data() + parameters_str.size(),
-        "parameters of aggregate function in " + error_context, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        "parameters of aggregate function in " + error_context,
+        0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     if (args_ast->children.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Incorrect list of parameters to aggregate function {}",
diff --git a/src/AggregateFunctions/registerAggregateFunctions.cpp b/src/AggregateFunctions/registerAggregateFunctions.cpp
index 96ba94aed91..58e657d3723 100644
--- a/src/AggregateFunctions/registerAggregateFunctions.cpp
+++ b/src/AggregateFunctions/registerAggregateFunctions.cpp
@@ -15,8 +15,10 @@ void registerAggregateFunctionCount(AggregateFunctionFactory &);
 void registerAggregateFunctionDeltaSum(AggregateFunctionFactory &);
 void registerAggregateFunctionDeltaSumTimestamp(AggregateFunctionFactory &);
 void registerAggregateFunctionGroupArray(AggregateFunctionFactory &);
+void registerAggregateFunctionGroupArraySorted(AggregateFunctionFactory & factory);
 void registerAggregateFunctionGroupUniqArray(AggregateFunctionFactory &);
 void registerAggregateFunctionGroupArrayInsertAt(AggregateFunctionFactory &);
+void registerAggregateFunctionGroupArrayIntersect(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantile(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileDeterministic(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileExact(AggregateFunctionFactory &);
@@ -31,14 +33,17 @@ void registerAggregateFunctionsQuantileTimingWeighted(AggregateFunctionFactory &
 void registerAggregateFunctionsQuantileTDigest(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileTDigestWeighted(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileBFloat16(AggregateFunctionFactory &);
+void registerAggregateFunctionsQuantileDD(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileBFloat16Weighted(AggregateFunctionFactory &);
 void registerAggregateFunctionsQuantileApprox(AggregateFunctionFactory &);
 void registerAggregateFunctionsSequenceMatch(AggregateFunctionFactory &);
 void registerAggregateFunctionWindowFunnel(AggregateFunctionFactory &);
 void registerAggregateFunctionRate(AggregateFunctionFactory &);
-void registerAggregateFunctionsMin(AggregateFunctionFactory &);
-void registerAggregateFunctionsMax(AggregateFunctionFactory &);
+void registerAggregateFunctionsMinMax(AggregateFunctionFactory &);
+void registerAggregateFunctionsArgMinArgMax(AggregateFunctionFactory &);
 void registerAggregateFunctionsAny(AggregateFunctionFactory &);
+void registerAggregateFunctionAnyHeavy(AggregateFunctionFactory &);
+void registerAggregateFunctionsAnyRespectNulls(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsStable(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsSecondMoment(AggregateFunctionFactory &);
 void registerAggregateFunctionsStatisticsThirdMoment(AggregateFunctionFactory &);
@@ -96,7 +101,7 @@ void registerAggregateFunctionCombinatorOrFill(AggregateFunctionCombinatorFactor
 void registerAggregateFunctionCombinatorResample(AggregateFunctionCombinatorFactory &);
 void registerAggregateFunctionCombinatorDistinct(AggregateFunctionCombinatorFactory &);
 void registerAggregateFunctionCombinatorMap(AggregateFunctionCombinatorFactory & factory);
-void registerAggregateFunctionCombinatorMinMax(AggregateFunctionCombinatorFactory & factory);
+void registerAggregateFunctionCombinatorsArgMinArgMax(AggregateFunctionCombinatorFactory & factory);
 
 void registerWindowFunctions(AggregateFunctionFactory & factory);
 
@@ -111,8 +116,10 @@ void registerAggregateFunctions()
         registerAggregateFunctionDeltaSum(factory);
         registerAggregateFunctionDeltaSumTimestamp(factory);
         registerAggregateFunctionGroupArray(factory);
+        registerAggregateFunctionGroupArraySorted(factory);
         registerAggregateFunctionGroupUniqArray(factory);
         registerAggregateFunctionGroupArrayInsertAt(factory);
+        registerAggregateFunctionGroupArrayIntersect(factory);
         registerAggregateFunctionsQuantile(factory);
         registerAggregateFunctionsQuantileDeterministic(factory);
         registerAggregateFunctionsQuantileExact(factory);
@@ -127,14 +134,17 @@ void registerAggregateFunctions()
         registerAggregateFunctionsQuantileTDigest(factory);
         registerAggregateFunctionsQuantileTDigestWeighted(factory);
         registerAggregateFunctionsQuantileBFloat16(factory);
+        registerAggregateFunctionsQuantileDD(factory);
         registerAggregateFunctionsQuantileBFloat16Weighted(factory);
         registerAggregateFunctionsQuantileApprox(factory);
         registerAggregateFunctionsSequenceMatch(factory);
         registerAggregateFunctionWindowFunnel(factory);
         registerAggregateFunctionRate(factory);
-        registerAggregateFunctionsMin(factory);
-        registerAggregateFunctionsMax(factory);
+        registerAggregateFunctionsMinMax(factory);
+        registerAggregateFunctionsArgMinArgMax(factory);
         registerAggregateFunctionsAny(factory);
+        registerAggregateFunctionAnyHeavy(factory);
+        registerAggregateFunctionsAnyRespectNulls(factory);
         registerAggregateFunctionsStatisticsStable(factory);
         registerAggregateFunctionsStatisticsSecondMoment(factory);
         registerAggregateFunctionsStatisticsThirdMoment(factory);
@@ -197,7 +207,7 @@ void registerAggregateFunctions()
         registerAggregateFunctionCombinatorResample(factory);
         registerAggregateFunctionCombinatorDistinct(factory);
         registerAggregateFunctionCombinatorMap(factory);
-        registerAggregateFunctionCombinatorMinMax(factory);
+        registerAggregateFunctionCombinatorsArgMinArgMax(factory);
     }
 }
 
diff --git a/src/Analyzer/ArrayJoinNode.cpp b/src/Analyzer/ArrayJoinNode.cpp
index ee6bd80150d..5ae097b1c12 100644
--- a/src/Analyzer/ArrayJoinNode.cpp
+++ b/src/Analyzer/ArrayJoinNode.cpp
@@ -1,14 +1,12 @@
 #include <Analyzer/ArrayJoinNode.h>
-
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/Utils.h>
+#include <IO/Operators.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
-#include <IO/Operators.h>
-
-#include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTExpressionList.h>
-
-#include <Analyzer/Utils.h>
-#include <Analyzer/ColumnNode.h>
+#include <Parsers/ASTTablesInSelectQuery.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/ColumnNode.cpp b/src/Analyzer/ColumnNode.cpp
index 3d9f5d1640e..fa8c59f50f3 100644
--- a/src/Analyzer/ColumnNode.cpp
+++ b/src/Analyzer/ColumnNode.cpp
@@ -1,14 +1,12 @@
 #include <Analyzer/ColumnNode.h>
-
-#include <Common/SipHash.h>
-
+#include <Analyzer/TableNode.h>
+#include <IO/Operators.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
-#include <IO/Operators.h>
-
 #include <Parsers/ASTIdentifier.h>
+#include <Common/SipHash.h>
+#include <Common/assert_cast.h>
 
-#include <Analyzer/TableNode.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/ColumnNode.h b/src/Analyzer/ColumnNode.h
index b320df788c5..46e7c8eb500 100644
--- a/src/Analyzer/ColumnNode.h
+++ b/src/Analyzer/ColumnNode.h
@@ -108,6 +108,11 @@ public:
       */
     QueryTreeNodePtr getColumnSourceOrNull() const;
 
+    void setColumnSource(const QueryTreeNodePtr & source)
+    {
+        getSourceWeakPointer() = source;
+    }
+
     QueryTreeNodeType getNodeType() const override
     {
         return QueryTreeNodeType::COLUMN;
diff --git a/src/Analyzer/ColumnTransformers.cpp b/src/Analyzer/ColumnTransformers.cpp
index 40e1e019d50..3a6b9e3b291 100644
--- a/src/Analyzer/ColumnTransformers.cpp
+++ b/src/Analyzer/ColumnTransformers.cpp
@@ -1,18 +1,18 @@
 #include <Analyzer/ColumnTransformers.h>
 
 #include <Common/SipHash.h>
+#include <Common/re2.h>
 
 #include <IO/WriteBuffer.h>
-#include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 
 #include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTAsterisk.h>
 #include <Parsers/ASTColumnsTransformers.h>
 
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/LambdaNode.h>
 
+
 namespace DB
 {
 
@@ -133,7 +133,7 @@ ExceptColumnTransformerNode::ExceptColumnTransformerNode(std::shared_ptr<re2::RE
 bool ExceptColumnTransformerNode::isColumnMatching(const std::string & column_name) const
 {
     if (column_matcher)
-        return RE2::PartialMatch(column_name, *column_matcher);
+        return re2::RE2::PartialMatch(column_name, *column_matcher);
 
     for (const auto & name : except_column_names)
         if (column_name == name)
diff --git a/src/Analyzer/ColumnTransformers.h b/src/Analyzer/ColumnTransformers.h
index 43f32318fc9..8fa8e28f194 100644
--- a/src/Analyzer/ColumnTransformers.h
+++ b/src/Analyzer/ColumnTransformers.h
@@ -3,7 +3,12 @@
 #include <Analyzer/Identifier.h>
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/ListNode.h>
-#include <Common/re2.h>
+
+
+namespace re2
+{
+    class RE2;
+}
 
 namespace DB
 {
@@ -102,8 +107,6 @@ enum class ApplyColumnTransformerType
 /// Get apply column transformer type name
 const char * toString(ApplyColumnTransformerType type);
 
-class ApplyColumnTransformerNode;
-using ApplyColumnTransformerNodePtr = std::shared_ptr<ApplyColumnTransformerNode>;
 
 /// Apply column transformer
 class ApplyColumnTransformerNode final : public IColumnTransformerNode
@@ -158,8 +161,6 @@ enum class ExceptColumnTransformerType
 
 const char * toString(ExceptColumnTransformerType type);
 
-class ExceptColumnTransformerNode;
-using ExceptColumnTransformerNodePtr = std::shared_ptr<ExceptColumnTransformerNode>;
 
 /** Except column transformer.
   * Strict EXCEPT column transformer must use all column names during matched nodes transformation.
@@ -230,8 +231,6 @@ private:
     static constexpr size_t children_size = 0;
 };
 
-class ReplaceColumnTransformerNode;
-using ReplaceColumnTransformerNodePtr = std::shared_ptr<ReplaceColumnTransformerNode>;
 
 /** Replace column transformer.
   * Strict replace column transformer must use all replacements during matched nodes transformation.
diff --git a/src/Analyzer/ConstantNode.cpp b/src/Analyzer/ConstantNode.cpp
index cb05e6ed4e3..e26500a9886 100644
--- a/src/Analyzer/ConstantNode.cpp
+++ b/src/Analyzer/ConstantNode.cpp
@@ -1,5 +1,7 @@
 #include <Analyzer/ConstantNode.h>
 
+#include <Analyzer/FunctionNode.h>
+
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/SipHash.h>
@@ -38,52 +40,9 @@ ConstantNode::ConstantNode(Field value_)
     : ConstantNode(value_, applyVisitor(FieldToDataType(), value_))
 {}
 
-void ConstantNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const
-{
-    buffer << std::string(indent, ' ') << "CONSTANT id: " << format_state.getNodeId(this);
-
-    if (hasAlias())
-        buffer << ", alias: " << getAlias();
-
-    buffer << ", constant_value: " << constant_value->getValue().dump();
-    buffer << ", constant_value_type: " << constant_value->getType()->getName();
-
-    if (getSourceExpression())
-    {
-        buffer << '\n' << std::string(indent + 2, ' ') << "EXPRESSION" << '\n';
-        getSourceExpression()->dumpTreeImpl(buffer, format_state, indent + 4);
-    }
-}
-
-bool ConstantNode::isEqualImpl(const IQueryTreeNode & rhs) const
-{
-    const auto & rhs_typed = assert_cast<const ConstantNode &>(rhs);
-    return *constant_value == *rhs_typed.constant_value && value_string == rhs_typed.value_string;
-}
-
-void ConstantNode::updateTreeHashImpl(HashState & hash_state) const
-{
-    auto type_name = constant_value->getType()->getName();
-    hash_state.update(type_name.size());
-    hash_state.update(type_name);
-
-    hash_state.update(value_string.size());
-    hash_state.update(value_string);
-}
-
-QueryTreeNodePtr ConstantNode::cloneImpl() const
-{
-    return std::make_shared<ConstantNode>(constant_value, source_expression);
-}
-
-ASTPtr ConstantNode::toASTImpl(const ConvertToASTOptions & options) const
+bool ConstantNode::requiresCastCall() 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());
@@ -128,7 +87,75 @@ ASTPtr ConstantNode::toASTImpl(const ConvertToASTOptions & options) const
         }
     }
 
-    if (need_to_add_cast_function)
+    // Add cast if constant was created as a result of constant folding.
+    // Constant folding may lead to type transformation and literal on shard
+    // may have a different type.
+    return need_to_add_cast_function || source_expression != nullptr;
+}
+
+bool ConstantNode::receivedFromInitiatorServer() const
+{
+    if (!hasSourceExpression())
+        return false;
+
+    auto * cast_function = getSourceExpression()->as<FunctionNode>();
+    if (!cast_function || cast_function->getFunctionName() != "_CAST")
+        return false;
+    return true;
+}
+
+void ConstantNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const
+{
+    buffer << std::string(indent, ' ') << "CONSTANT id: " << format_state.getNodeId(this);
+
+    if (hasAlias())
+        buffer << ", alias: " << getAlias();
+
+    buffer << ", constant_value: ";
+    if (mask_id)
+        buffer << "[HIDDEN id: " << mask_id << "]";
+    else
+        buffer << constant_value->getValue().dump();
+
+    buffer << ", constant_value_type: " << constant_value->getType()->getName();
+
+    if (!mask_id && getSourceExpression())
+    {
+        buffer << '\n' << std::string(indent + 2, ' ') << "EXPRESSION" << '\n';
+        getSourceExpression()->dumpTreeImpl(buffer, format_state, indent + 4);
+    }
+}
+
+bool ConstantNode::isEqualImpl(const IQueryTreeNode & rhs) const
+{
+    const auto & rhs_typed = assert_cast<const ConstantNode &>(rhs);
+    return *constant_value == *rhs_typed.constant_value && value_string == rhs_typed.value_string;
+}
+
+void ConstantNode::updateTreeHashImpl(HashState & hash_state) const
+{
+    auto type_name = constant_value->getType()->getName();
+    hash_state.update(type_name.size());
+    hash_state.update(type_name);
+
+    hash_state.update(value_string.size());
+    hash_state.update(value_string);
+}
+
+QueryTreeNodePtr ConstantNode::cloneImpl() const
+{
+    return std::make_shared<ConstantNode>(constant_value, source_expression);
+}
+
+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;
+
+    if (requiresCastCall())
     {
         auto constant_type_name_ast = std::make_shared<ASTLiteral>(constant_value->getType()->getName());
         return makeASTFunction("_CAST", std::move(constant_value_ast), std::move(constant_type_name_ast));
diff --git a/src/Analyzer/ConstantNode.h b/src/Analyzer/ConstantNode.h
index 51c98a4a3b3..98a8eb78277 100644
--- a/src/Analyzer/ConstantNode.h
+++ b/src/Analyzer/ConstantNode.h
@@ -4,6 +4,7 @@
 
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/ConstantValue.h>
+#include <DataTypes/DataTypeNullable.h>
 
 namespace DB
 {
@@ -75,6 +76,22 @@ public:
         return constant_value->getType();
     }
 
+    /// Check if conversion to AST requires wrapping with _CAST function.
+    bool requiresCastCall() const;
+
+    /// Check if constant is a result of _CAST function constant folding.
+    bool receivedFromInitiatorServer() const;
+
+    void setMaskId(size_t id)
+    {
+        mask_id = id;
+    }
+
+    void convertToNullable() override
+    {
+        constant_value = std::make_shared<ConstantValue>(constant_value->getValue(), makeNullableSafe(constant_value->getType()));
+    }
+
     void dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, size_t indent) const override;
 
 protected:
@@ -90,6 +107,7 @@ private:
     ConstantValuePtr constant_value;
     String value_string;
     QueryTreeNodePtr source_expression;
+    size_t mask_id = 0;
 
     static constexpr size_t children_size = 0;
 };
diff --git a/src/Analyzer/FunctionNode.cpp b/src/Analyzer/FunctionNode.cpp
index 1f4ec36a8fa..e902ac2274e 100644
--- a/src/Analyzer/FunctionNode.cpp
+++ b/src/Analyzer/FunctionNode.cpp
@@ -210,18 +210,6 @@ ASTPtr FunctionNode::toASTImpl(const ConvertToASTOptions & options) const
     function_ast->name = function_name;
     function_ast->nulls_action = nulls_action;
 
-    if (function_name == "nothing")
-    {
-        /** Inside AggregateFunctionCombinatorNull we may replace functions with `NULL` in arguments with `nothing`.
-          * Result type of `nothing` depends on `returns_default_when_only_null` property of nested function.
-          * If we convert `nothing` to AST, we will lose this information, so we use original function name instead.
-          */
-        const auto & original_ast = getOriginalAST();
-        const auto & original_function_ast = original_ast ? original_ast->as<ASTFunction>() : nullptr;
-        if (original_function_ast)
-            function_ast->name = original_function_ast->name;
-    }
-
     if (isWindowFunction())
     {
         function_ast->is_window_function = true;
@@ -236,7 +224,7 @@ ASTPtr FunctionNode::toASTImpl(const ConvertToASTOptions & options) const
         new_options.add_cast_for_constants = false;
 
     /// Avoid cast for `IN tuple(...)` expression.
-    /// Tuples colud be quite big, and adding a type may significantly increase query size.
+    /// Tuples could be quite big, and adding a type may significantly increase query size.
     /// It should be safe because set type for `column IN tuple` is deduced from `column` type.
     if (isNameOfInFunction(function_name) && argument_nodes.size() > 1 &&  argument_nodes[1]->getNodeType() == QueryTreeNodeType::CONSTANT)
         new_options.add_cast_for_constants = false;
diff --git a/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h b/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h
new file mode 100644
index 00000000000..439ddffe5e5
--- /dev/null
+++ b/src/Analyzer/FunctionSecretArgumentsFinderTreeNode.h
@@ -0,0 +1,372 @@
+#pragma once
+
+#include <Parsers/FunctionSecretArgumentsFinder.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/IQueryTreeNode.h>
+#include <Analyzer/IdentifierNode.h>
+#include <Analyzer/ListNode.h>
+#include <Common/KnownObjectNames.h>
+#include <Core/QualifiedTableName.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+
+namespace DB
+{
+
+
+/// Finds arguments of a specified function which should not be displayed for most users for security reasons.
+/// That involves passwords and secret keys.
+class FunctionSecretArgumentsFinderTreeNode
+{
+public:
+    explicit FunctionSecretArgumentsFinderTreeNode(const FunctionNode & function_) : function(function_), arguments(function.getArguments())
+    {
+        if (arguments.getNodes().empty())
+            return;
+
+        findFunctionSecretArguments();
+    }
+
+    struct Result
+    {
+        /// Result constructed by default means no arguments will be hidden.
+        size_t start = static_cast<size_t>(-1);
+        size_t count = 0; /// Mostly it's either 0 or 1. There are only a few cases where `count` can be greater than 1 (e.g. see `encrypt`).
+                            /// In all known cases secret arguments are consecutive
+        bool are_named = false; /// Arguments like `password = 'password'` are considered as named arguments.
+        /// E.g. "headers" in `url('..', headers('foo' = '[HIDDEN]'))`
+        std::vector<std::string> nested_maps;
+
+        bool hasSecrets() const
+        {
+            return count != 0 || !nested_maps.empty();
+        }
+    };
+
+    FunctionSecretArgumentsFinder::Result getResult() const { return result; }
+
+private:
+    const FunctionNode & function;
+    const ListNode & arguments;
+    FunctionSecretArgumentsFinder::Result result;
+
+    void markSecretArgument(size_t index, bool argument_is_named = false)
+    {
+        if (index >= arguments.getNodes().size())
+            return;
+        if (!result.count)
+        {
+            result.start = index;
+            result.are_named = argument_is_named;
+        }
+        chassert(index >= result.start); /// We always check arguments consecutively
+        result.count = index + 1 - result.start;
+        if (!argument_is_named)
+            result.are_named = false;
+    }
+
+    void findFunctionSecretArguments()
+    {
+        const auto & name = function.getFunctionName();
+
+        if ((name == "mysql") || (name == "postgresql") || (name == "mongodb"))
+        {
+            /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
+            /// postgresql('host:port', 'database', 'table', 'user', 'password', ...)
+            /// mongodb('host:port', 'database', 'collection', 'user', 'password', ...)
+            findMySQLFunctionSecretArguments();
+        }
+        else if ((name == "s3") || (name == "cosn") || (name == "oss") ||
+                    (name == "deltaLake") || (name == "hudi") || (name == "iceberg"))
+        {
+            /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+            findS3FunctionSecretArguments(/* is_cluster_function= */ false);
+        }
+        else if (name == "s3Cluster")
+        {
+            /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+            findS3FunctionSecretArguments(/* is_cluster_function= */ true);
+        }
+        else if ((name == "remote") || (name == "remoteSecure"))
+        {
+            /// remote('addresses_expr', 'db', 'table', 'user', 'password', ...)
+            findRemoteFunctionSecretArguments();
+        }
+        else if ((name == "encrypt") || (name == "decrypt") ||
+                    (name == "aes_encrypt_mysql") || (name == "aes_decrypt_mysql") ||
+                    (name == "tryDecrypt"))
+        {
+            /// encrypt('mode', 'plaintext', 'key' [, iv, aad])
+            findEncryptionFunctionSecretArguments();
+        }
+        else if (name == "url")
+        {
+            findURLSecretArguments();
+        }
+    }
+
+    void findMySQLFunctionSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// mysql(named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 1);
+        }
+        else
+        {
+            /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
+            markSecretArgument(4);
+        }
+    }
+
+    /// Returns the number of arguments excluding "headers" and "extra_credentials" (which should
+    /// always be at the end). Marks "headers" as secret, if found.
+    size_t excludeS3OrURLNestedMaps()
+    {
+        const auto & nodes = arguments.getNodes();
+        size_t count = nodes.size();
+        while (count > 0)
+        {
+            const FunctionNode * f = nodes.at(count - 1)->as<FunctionNode>();
+            if (!f)
+                break;
+            if (f->getFunctionName() == "headers")
+                result.nested_maps.push_back(f->getFunctionName());
+            else if (f->getFunctionName() != "extra_credentials")
+                break;
+            count -= 1;
+        }
+        return count;
+    }
+
+    void findS3FunctionSecretArguments(bool is_cluster_function)
+    {
+        /// s3Cluster('cluster_name', 'url', ...) has 'url' as its second argument.
+        size_t url_arg_idx = is_cluster_function ? 1 : 0;
+
+        if (!is_cluster_function && isNamedCollectionName(0))
+        {
+            /// s3(named_collection, ..., secret_access_key = 'secret_access_key', ...)
+            findSecretNamedArgument("secret_access_key", 1);
+            return;
+        }
+
+        /// We should check other arguments first because we don't need to do any replacement in case of
+        /// s3('url', NOSIGN, 'format' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
+        /// s3('url', 'format', 'structure' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
+        size_t count = excludeS3OrURLNestedMaps();
+        if ((url_arg_idx + 3 <= count) && (count <= url_arg_idx + 4))
+        {
+            String second_arg;
+            if (tryGetStringFromArgument(url_arg_idx + 1, &second_arg))
+            {
+                if (boost::iequals(second_arg, "NOSIGN"))
+                    return; /// The argument after 'url' is "NOSIGN".
+
+                if (second_arg == "auto" || KnownFormatNames::instance().exists(second_arg))
+                    return; /// The argument after 'url' is a format: s3('url', 'format', ...)
+            }
+        }
+
+        /// We're going to replace 'aws_secret_access_key' with '[HIDDEN]' for the following signatures:
+        /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+        /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', 'format', 'compression')
+        if (url_arg_idx + 2 < count)
+            markSecretArgument(url_arg_idx + 2);
+    }
+
+    void findURLSecretArguments()
+    {
+        if (!isNamedCollectionName(0))
+            excludeS3OrURLNestedMaps();
+    }
+
+    bool tryGetStringFromArgument(size_t arg_idx, String * res, bool allow_identifier = true) const
+    {
+        if (arg_idx >= arguments.getNodes().size())
+            return false;
+
+        return tryGetStringFromArgument(arguments.getNodes()[arg_idx], res, allow_identifier);
+    }
+
+    static bool tryGetStringFromArgument(const QueryTreeNodePtr argument, String * res, bool allow_identifier = true)
+    {
+        if (const auto * literal = argument->as<ConstantNode>())
+        {
+            if (literal->getValue().getType() != Field::Types::String)
+                return false;
+            if (res)
+                *res = literal->getValue().safeGet<String>();
+            return true;
+        }
+
+        if (allow_identifier)
+        {
+            if (const auto * id = argument->as<IdentifierNode>())
+            {
+                if (res)
+                    *res = id->getIdentifier().getFullName();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void findRemoteFunctionSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// remote(named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 1);
+            return;
+        }
+
+        /// We're going to replace 'password' with '[HIDDEN'] for the following signatures:
+        /// remote('addresses_expr', db.table, 'user' [, 'password'] [, sharding_key])
+        /// remote('addresses_expr', 'db', 'table', 'user' [, 'password'] [, sharding_key])
+        /// remote('addresses_expr', table_function(), 'user' [, 'password'] [, sharding_key])
+
+        /// But we should check the number of arguments first because we don't need to do any replacements in case of
+        /// remote('addresses_expr', db.table)
+        if (arguments.getNodes().size() < 3)
+            return;
+
+        size_t arg_num = 1;
+
+        /// Skip 1 or 2 arguments with table_function() or db.table or 'db', 'table'.
+        const auto * table_function = arguments.getNodes()[arg_num]->as<FunctionNode>();
+        if (table_function && KnownTableFunctionNames::instance().exists(table_function->getFunctionName()))
+        {
+            ++arg_num;
+        }
+        else
+        {
+            std::optional<String> database;
+            std::optional<QualifiedTableName> qualified_table_name;
+            if (!tryGetDatabaseNameOrQualifiedTableName(arg_num, database, qualified_table_name))
+            {
+                /// We couldn't evaluate the argument so we don't know whether it is 'db.table' or just 'db'.
+                /// Hence we can't figure out whether we should skip one argument 'user' or two arguments 'table', 'user'
+                /// before the argument 'password'. So it's safer to wipe two arguments just in case.
+                /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
+                /// before wiping it (because the `password` argument is always a literal string).
+                if (tryGetStringFromArgument(arg_num + 2, nullptr, /* allow_identifier= */ false))
+                {
+                    /// Wipe either `password` or `user`.
+                    markSecretArgument(arg_num + 2);
+                }
+                if (tryGetStringFromArgument(arg_num + 3, nullptr, /* allow_identifier= */ false))
+                {
+                    /// Wipe either `password` or `sharding_key`.
+                    markSecretArgument(arg_num + 3);
+                }
+                return;
+            }
+
+            /// Skip the current argument (which is either a database name or a qualified table name).
+            ++arg_num;
+            if (database)
+            {
+                /// Skip the 'table' argument if the previous argument was a database name.
+                ++arg_num;
+            }
+        }
+
+        /// Skip username.
+        ++arg_num;
+
+        /// Do our replacement:
+        /// remote('addresses_expr', db.table, 'user', 'password', ...) -> remote('addresses_expr', db.table, 'user', '[HIDDEN]', ...)
+        /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
+        /// before wiping it (because the `password` argument is always a literal string).
+        bool can_be_password = tryGetStringFromArgument(arg_num, nullptr, /* allow_identifier= */ false);
+        if (can_be_password)
+            markSecretArgument(arg_num);
+    }
+
+    /// Tries to get either a database name or a qualified table name from an argument.
+    /// Empty string is also allowed (it means the default database).
+    /// The function is used by findRemoteFunctionSecretArguments() to determine how many arguments to skip before a password.
+    bool tryGetDatabaseNameOrQualifiedTableName(
+        size_t arg_idx,
+        std::optional<String> & res_database,
+        std::optional<QualifiedTableName> & res_qualified_table_name) const
+    {
+        res_database.reset();
+        res_qualified_table_name.reset();
+
+        String str;
+        if (!tryGetStringFromArgument(arg_idx, &str, /* allow_identifier= */ true))
+            return false;
+
+        if (str.empty())
+        {
+            res_database = "";
+            return true;
+        }
+
+        auto qualified_table_name = QualifiedTableName::tryParseFromString(str);
+        if (!qualified_table_name)
+            return false;
+
+        if (qualified_table_name->database.empty())
+            res_database = std::move(qualified_table_name->table);
+        else
+            res_qualified_table_name = std::move(qualified_table_name);
+        return true;
+    }
+
+    void findEncryptionFunctionSecretArguments()
+    {
+        if (arguments.getNodes().empty())
+            return;
+
+        /// We replace all arguments after 'mode' with '[HIDDEN]':
+        /// encrypt('mode', 'plaintext', 'key' [, iv, aad]) -> encrypt('mode', '[HIDDEN]')
+        result.start = 1;
+        result.count = arguments.getNodes().size() - 1;
+    }
+
+
+    /// Whether a specified argument can be the name of a named collection?
+    bool isNamedCollectionName(size_t arg_idx) const
+    {
+        if (arguments.getNodes().size() <= arg_idx)
+            return false;
+
+        const auto * identifier = arguments.getNodes()[arg_idx]->as<IdentifierNode>();
+        return identifier != nullptr;
+    }
+
+    /// Looks for a secret argument with a specified name. This function looks for arguments in format `key=value` where the key is specified.
+    void findSecretNamedArgument(const std::string_view & key, size_t start = 0)
+    {
+        for (size_t i = start; i < arguments.getNodes().size(); ++i)
+        {
+            const auto & argument = arguments.getNodes()[i];
+            const auto * equals_func = argument->as<FunctionNode>();
+            if (!equals_func || (equals_func->getFunctionName() != "equals"))
+                continue;
+
+            const auto * expr_list = equals_func->getArguments().as<ListNode>();
+            if (!expr_list)
+                continue;
+
+            const auto & equal_args = expr_list->getNodes();
+            if (equal_args.size() != 2)
+                continue;
+
+            String found_key;
+            if (!tryGetStringFromArgument(equal_args[0], &found_key))
+                continue;
+
+            if (found_key == key)
+                markSecretArgument(i, /* argument_is_named= */ true);
+        }
+    }
+};
+
+}
diff --git a/src/Analyzer/HashUtils.h b/src/Analyzer/HashUtils.h
index 3727ea1ea14..eb6aac88fe9 100644
--- a/src/Analyzer/HashUtils.h
+++ b/src/Analyzer/HashUtils.h
@@ -11,35 +11,37 @@ namespace DB
   * Example of usage:
   * std::unordered_map<QueryTreeNodeConstRawPtrWithHash, std::string> map;
   */
-template <typename QueryTreeNodePtrType>
+template <typename QueryTreeNodePtrType, bool compare_aliases = true>
 struct QueryTreeNodeWithHash
 {
     QueryTreeNodeWithHash(QueryTreeNodePtrType node_) /// NOLINT
         : node(std::move(node_))
-        , hash(node->getTreeHash())
+        , hash(node->getTreeHash({.compare_aliases = compare_aliases}))
     {}
 
     QueryTreeNodePtrType node = nullptr;
     CityHash_v1_0_2::uint128 hash;
 };
 
-template <typename T>
-inline bool operator==(const QueryTreeNodeWithHash<T> & lhs, const QueryTreeNodeWithHash<T> & rhs)
+template <typename T, bool compare_aliases>
+inline bool operator==(const QueryTreeNodeWithHash<T, compare_aliases> & lhs, const QueryTreeNodeWithHash<T, compare_aliases> & rhs)
 {
-    return lhs.hash == rhs.hash && lhs.node->isEqual(*rhs.node);
+    return lhs.hash == rhs.hash && lhs.node->isEqual(*rhs.node, {.compare_aliases = compare_aliases});
 }
 
-template <typename T>
-inline bool operator!=(const QueryTreeNodeWithHash<T> & lhs, const QueryTreeNodeWithHash<T> & rhs)
+template <typename T, bool compare_aliases>
+inline bool operator!=(const QueryTreeNodeWithHash<T, compare_aliases> & lhs, const QueryTreeNodeWithHash<T, compare_aliases> & rhs)
 {
     return !(lhs == rhs);
 }
 
 using QueryTreeNodePtrWithHash = QueryTreeNodeWithHash<QueryTreeNodePtr>;
+using QueryTreeNodePtrWithHashWithoutAlias = QueryTreeNodeWithHash<QueryTreeNodePtr, /*compare_aliases*/ false>;
 using QueryTreeNodeRawPtrWithHash = QueryTreeNodeWithHash<IQueryTreeNode *>;
 using QueryTreeNodeConstRawPtrWithHash = QueryTreeNodeWithHash<const IQueryTreeNode *>;
 
 using QueryTreeNodePtrWithHashSet = std::unordered_set<QueryTreeNodePtrWithHash>;
+using QueryTreeNodePtrWithHashWithoutAliasSet = std::unordered_set<QueryTreeNodePtrWithHashWithoutAlias>;
 using QueryTreeNodeConstRawPtrWithHashSet = std::unordered_set<QueryTreeNodeConstRawPtrWithHash>;
 
 template <typename Value>
@@ -50,10 +52,10 @@ using QueryTreeNodeConstRawPtrWithHashMap = std::unordered_map<QueryTreeNodeCons
 
 }
 
-template <typename T>
-struct std::hash<DB::QueryTreeNodeWithHash<T>>
+template <typename T, bool compare_aliases>
+struct std::hash<DB::QueryTreeNodeWithHash<T, compare_aliases>>
 {
-    size_t operator()(const DB::QueryTreeNodeWithHash<T> & node_with_hash) const
+    size_t operator()(const DB::QueryTreeNodeWithHash<T, compare_aliases> & node_with_hash) const
     {
         return node_with_hash.hash.low64;
     }
diff --git a/src/Analyzer/IQueryTreeNode.cpp b/src/Analyzer/IQueryTreeNode.cpp
index d61cb0ffab1..7815b93c3ac 100644
--- a/src/Analyzer/IQueryTreeNode.cpp
+++ b/src/Analyzer/IQueryTreeNode.cpp
@@ -164,7 +164,7 @@ bool IQueryTreeNode::isEqual(const IQueryTreeNode & rhs, CompareOptions compare_
     return true;
 }
 
-IQueryTreeNode::Hash IQueryTreeNode::getTreeHash() const
+IQueryTreeNode::Hash IQueryTreeNode::getTreeHash(CompareOptions compare_options) const
 {
     /** Compute tree hash with this node as root.
       *
@@ -201,7 +201,7 @@ IQueryTreeNode::Hash IQueryTreeNode::getTreeHash() const
         }
 
         hash_state.update(static_cast<size_t>(node_to_process->getNodeType()));
-        if (!node_to_process->alias.empty())
+        if (compare_options.compare_aliases && !node_to_process->alias.empty())
         {
             hash_state.update(node_to_process->alias.size());
             hash_state.update(node_to_process->alias);
diff --git a/src/Analyzer/IQueryTreeNode.h b/src/Analyzer/IQueryTreeNode.h
index b07aa2d31b0..92e34616c4d 100644
--- a/src/Analyzer/IQueryTreeNode.h
+++ b/src/Analyzer/IQueryTreeNode.h
@@ -114,7 +114,7 @@ public:
       * Alias of query tree node is part of query tree hash.
       * Original AST is not part of query tree hash.
       */
-    Hash getTreeHash() const;
+    Hash getTreeHash(CompareOptions compare_options = { .compare_aliases = true }) const;
 
     /// Get a deep copy of the query tree
     QueryTreeNodePtr clone() const;
diff --git a/src/Analyzer/IQueryTreePass.h b/src/Analyzer/IQueryTreePass.h
index 4293934c32d..d4499c3271c 100644
--- a/src/Analyzer/IQueryTreePass.h
+++ b/src/Analyzer/IQueryTreePass.h
@@ -31,7 +31,7 @@ public:
     virtual String getDescription() = 0;
 
     /// Run pass over query tree
-    virtual void run(QueryTreeNodePtr query_tree_node, ContextPtr context) = 0;
+    virtual void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) = 0;
 
 };
 
diff --git a/src/Analyzer/JoinNode.cpp b/src/Analyzer/JoinNode.cpp
index 9b61c8b19d0..53a003ec3c0 100644
--- a/src/Analyzer/JoinNode.cpp
+++ b/src/Analyzer/JoinNode.cpp
@@ -1,16 +1,14 @@
 #include <Analyzer/JoinNode.h>
 #include <Analyzer/ListNode.h>
-
+#include <Analyzer/Utils.h>
+#include <IO/Operators.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
-#include <IO/Operators.h>
-
-#include <Parsers/ASTSubquery.h>
-#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-
-#include <Analyzer/Utils.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
diff --git a/src/Analyzer/MatcherNode.cpp b/src/Analyzer/MatcherNode.cpp
index ae2b654ab13..f573b83e538 100644
--- a/src/Analyzer/MatcherNode.cpp
+++ b/src/Analyzer/MatcherNode.cpp
@@ -4,7 +4,6 @@
 #include <Common/SipHash.h>
 
 #include <IO/WriteBuffer.h>
-#include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
 
 #include <Parsers/ASTIdentifier.h>
@@ -14,9 +13,15 @@
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTColumnsTransformers.h>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int CANNOT_COMPILE_REGEXP;
+}
+
 const char * toString(MatcherNodeType matcher_node_type)
 {
     switch (matcher_node_type)
@@ -48,20 +53,20 @@ MatcherNode::MatcherNode(Identifier qualified_identifier_, ColumnTransformersNod
 {
 }
 
-MatcherNode::MatcherNode(std::shared_ptr<re2::RE2> columns_matcher_, ColumnTransformersNodes column_transformers_)
+MatcherNode::MatcherNode(String pattern_, ColumnTransformersNodes column_transformers_)
     : MatcherNode(MatcherNodeType::COLUMNS_REGEXP,
         {} /*qualified_identifier*/,
         {} /*columns_identifiers*/,
-        std::move(columns_matcher_),
+        std::move(pattern_),
         std::move(column_transformers_))
 {
 }
 
-MatcherNode::MatcherNode(Identifier qualified_identifier_, std::shared_ptr<re2::RE2> columns_matcher_, ColumnTransformersNodes column_transformers_)
+MatcherNode::MatcherNode(Identifier qualified_identifier_, String pattern_, ColumnTransformersNodes column_transformers_)
     : MatcherNode(MatcherNodeType::COLUMNS_REGEXP,
         std::move(qualified_identifier_),
         {} /*columns_identifiers*/,
-        std::move(columns_matcher_),
+        std::move(pattern_),
         std::move(column_transformers_))
 {
 }
@@ -87,14 +92,21 @@ MatcherNode::MatcherNode(Identifier qualified_identifier_, Identifiers columns_i
 MatcherNode::MatcherNode(MatcherNodeType matcher_type_,
     Identifier qualified_identifier_,
     Identifiers columns_identifiers_,
-    std::shared_ptr<re2::RE2> columns_matcher_,
+    std::optional<String> pattern_,
     ColumnTransformersNodes column_transformers_)
     : IQueryTreeNode(children_size)
     , matcher_type(matcher_type_)
     , qualified_identifier(qualified_identifier_)
     , columns_identifiers(columns_identifiers_)
-    , columns_matcher(columns_matcher_)
 {
+    if (pattern_)
+    {
+        columns_matcher = std::make_shared<re2::RE2>(*pattern_, re2::RE2::Quiet);
+        if (!columns_matcher->ok())
+            throw DB::Exception(ErrorCodes::CANNOT_COMPILE_REGEXP,
+                "COLUMNS pattern {} cannot be compiled: {}", *pattern_, columns_matcher->error());
+    }
+
     auto column_transformers_list_node = std::make_shared<ListNode>();
 
     auto & column_transformers_nodes = column_transformers_list_node->getNodes();
diff --git a/src/Analyzer/MatcherNode.h b/src/Analyzer/MatcherNode.h
index 87ee5ee92bb..d6f077e224b 100644
--- a/src/Analyzer/MatcherNode.h
+++ b/src/Analyzer/MatcherNode.h
@@ -6,6 +6,7 @@
 #include <Parsers/ASTAsterisk.h>
 #include <Common/re2.h>
 
+
 namespace DB
 {
 
@@ -58,10 +59,10 @@ public:
     explicit MatcherNode(Identifier qualified_identifier_, ColumnTransformersNodes column_transformers_ = {});
 
     /// Variant unqualified COLUMNS('regexp')
-    explicit MatcherNode(std::shared_ptr<re2::RE2> columns_matcher_, ColumnTransformersNodes column_transformers_ = {});
+    explicit MatcherNode(String pattern_, ColumnTransformersNodes column_transformers_ = {});
 
     /// Variant qualified COLUMNS('regexp')
-    explicit MatcherNode(Identifier qualified_identifier_, std::shared_ptr<re2::RE2> columns_matcher_, ColumnTransformersNodes column_transformers_ = {});
+    explicit MatcherNode(Identifier qualified_identifier_, String pattern_, ColumnTransformersNodes column_transformers_ = {});
 
     /// Variant unqualified COLUMNS(column_name_1, ...)
     explicit MatcherNode(Identifiers columns_identifiers_, ColumnTransformersNodes column_transformers_ = {});
@@ -81,12 +82,6 @@ public:
         return matcher_type == MatcherNodeType::ASTERISK;
     }
 
-    /// Returns true if matcher is columns regexp or columns list matcher, false otherwise
-    bool isColumnsMatcher() const
-    {
-        return matcher_type == MatcherNodeType::COLUMNS_REGEXP || matcher_type == MatcherNodeType::COLUMNS_LIST;
-    }
-
     /// Returns true if matcher is qualified, false otherwise
     bool isQualified() const
     {
@@ -152,7 +147,7 @@ private:
     explicit MatcherNode(MatcherNodeType matcher_type_,
         Identifier qualified_identifier_,
         Identifiers columns_identifiers_,
-        std::shared_ptr<re2::RE2> columns_matcher_,
+        std::optional<String> pattern_,
         ColumnTransformersNodes column_transformers_);
 
     MatcherNodeType matcher_type;
diff --git a/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp
new file mode 100644
index 00000000000..a419bbcc133
--- /dev/null
+++ b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.cpp
@@ -0,0 +1,186 @@
+#include <Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.h>
+
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+
+#include <Analyzer/ArrayJoinNode.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/UnionNode.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+
+/// Try to eliminate min/max/any/anyLast.
+class EliminateFunctionVisitor : public InDepthQueryTreeVisitorWithContext<EliminateFunctionVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<EliminateFunctionVisitor>;
+    using Base::Base;
+
+    using GroupByKeysStack = std::vector<QueryTreeNodePtrWithHashSet>;
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        if (!getSettings().optimize_aggregators_of_group_by_keys)
+            return;
+
+        /// Collect group by keys.
+        auto * query_node = node->as<QueryNode>();
+        if (!query_node)
+            return;
+
+        if (!query_node->hasGroupBy())
+        {
+            group_by_keys_stack.push_back({});
+        }
+        else if (query_node->isGroupByWithTotals() || query_node->isGroupByWithCube() || query_node->isGroupByWithRollup())
+        {
+            /// Keep aggregator if group by is with totals/cube/rollup.
+            group_by_keys_stack.push_back({});
+        }
+        else
+        {
+            QueryTreeNodePtrWithHashSet group_by_keys;
+            for (auto & group_key : query_node->getGroupBy().getNodes())
+            {
+                /// For grouping sets case collect only keys that are presented in every set.
+                if (auto * list = group_key->as<ListNode>())
+                {
+                    QueryTreeNodePtrWithHashSet common_keys_set;
+                    for (auto & group_elem : list->getNodes())
+                    {
+                        if (group_by_keys.contains(group_elem))
+                            common_keys_set.insert(group_elem);
+                    }
+                    group_by_keys = std::move(common_keys_set);
+                }
+                else
+                {
+                    group_by_keys.insert(group_key);
+                }
+            }
+            group_by_keys_stack.push_back(std::move(group_by_keys));
+        }
+    }
+
+    /// Now we visit all nodes in QueryNode, we should remove group_by_keys from stack.
+    void leaveImpl(QueryTreeNodePtr & node)
+    {
+        if (!getSettings().optimize_aggregators_of_group_by_keys)
+            return;
+
+        if (node->getNodeType() == QueryTreeNodeType::FUNCTION)
+        {
+            if (aggregationCanBeEliminated(node, group_by_keys_stack.back()))
+                node = node->as<FunctionNode>()->getArguments().getNodes()[0];
+        }
+        else if (node->getNodeType() == QueryTreeNodeType::QUERY)
+        {
+            group_by_keys_stack.pop_back();
+        }
+    }
+
+    static bool needChildVisit(VisitQueryTreeNodeType & parent [[maybe_unused]], VisitQueryTreeNodeType & child)
+    {
+        /// Skip ArrayJoin.
+        return !child->as<ArrayJoinNode>();
+    }
+
+private:
+
+    struct NodeWithInfo
+    {
+        QueryTreeNodePtr node;
+        bool parents_are_only_deterministic = false;
+    };
+
+    bool aggregationCanBeEliminated(QueryTreeNodePtr & node, const QueryTreeNodePtrWithHashSet & group_by_keys)
+    {
+        if (group_by_keys.empty())
+            return false;
+
+        auto * function = node->as<FunctionNode>();
+        if (!function || !function->isAggregateFunction())
+            return false;
+
+        if (!(function->getFunctionName() == "min"
+                || function->getFunctionName() == "max"
+                || function->getFunctionName() == "any"
+                || function->getFunctionName() == "anyLast"))
+            return false;
+
+        std::vector<NodeWithInfo> candidates;
+        auto & function_arguments = function->getArguments().getNodes();
+        if (function_arguments.size() != 1)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected a single argument of function '{}' but received {}", function->getFunctionName(), function_arguments.size());
+
+        if (!function->getResultType()->equals(*function_arguments[0]->getResultType()))
+            return false;
+
+        candidates.push_back({ function_arguments[0], true });
+
+        /// 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();
+            candidates.pop_back();
+
+            bool found = group_by_keys.contains(candidate);
+
+            switch (candidate->getNodeType())
+            {
+                case QueryTreeNodeType::FUNCTION:
+                {
+                    auto * func = candidate->as<FunctionNode>();
+                    auto & arguments = func->getArguments().getNodes();
+                    if (arguments.empty())
+                        return false;
+
+                    if (!found)
+                    {
+                        bool is_deterministic_function = parents_are_only_deterministic &&
+                            func->getFunctionOrThrow()->isDeterministicInScopeOfQuery();
+                        for (auto it = arguments.rbegin(); it != arguments.rend(); ++it)
+                            candidates.push_back({ *it, is_deterministic_function });
+                    }
+                    break;
+                }
+                case QueryTreeNodeType::COLUMN:
+                    if (!found)
+                        return false;
+                    break;
+                case QueryTreeNodeType::CONSTANT:
+                    if (!parents_are_only_deterministic)
+                        return false;
+                    break;
+                default:
+                    return false;
+            }
+        }
+
+        return true;
+    }
+
+    GroupByKeysStack group_by_keys_stack;
+};
+
+}
+
+void AggregateFunctionOfGroupByKeysPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
+{
+    EliminateFunctionVisitor eliminator(context);
+    eliminator.visit(query_tree_node);
+}
+
+};
diff --git a/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.h b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.h
new file mode 100644
index 00000000000..2f4c237cc9a
--- /dev/null
+++ b/src/Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+/** Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section.
+  *
+  * Example: SELECT max(column) FROM table GROUP BY column;
+  * Result: SELECT column FROM table GROUP BY column;
+  */
+class AggregateFunctionOfGroupByKeysPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "AggregateFunctionOfGroupByKeys"; }
+
+    String getDescription() override
+    {
+        return "Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section.";
+    }
+
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
+
+};
+
+}
+
diff --git a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
index baecb372c2d..f96ba22eb7a 100644
--- a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
+++ b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.cpp
@@ -194,7 +194,7 @@ private:
 
 }
 
-void AggregateFunctionsArithmericOperationsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void AggregateFunctionsArithmericOperationsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     AggregateFunctionsArithmericOperationsVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.h b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.h
index a89d2f87ad9..d510b62f9be 100644
--- a/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.h
+++ b/src/Analyzer/Passes/AggregateFunctionsArithmericOperationsPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Extract arithmeric operations from aggregate functions."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
index a95bcea4fac..62db502e1dc 100644
--- a/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
+++ b/src/Analyzer/Passes/ArrayExistsToHasPass.cpp
@@ -1,6 +1,7 @@
 #include <Analyzer/Passes/ArrayExistsToHasPass.h>
 
 #include <Functions/FunctionFactory.h>
+#include <Functions/array/has.h>
 
 #include <Interpreters/Context.h>
 
@@ -83,7 +84,8 @@ public:
             return;
         }
 
-        auto has_function = FunctionFactory::instance().get("has", getContext());
+        auto has_function = createInternalFunctionHasOverloadResolver();
+
         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()));
@@ -92,7 +94,7 @@ public:
 
 }
 
-void RewriteArrayExistsToHasPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void RewriteArrayExistsToHasPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     RewriteArrayExistsToHasVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/ArrayExistsToHasPass.h b/src/Analyzer/Passes/ArrayExistsToHasPass.h
index 8f4623116e3..4795b61c625 100644
--- a/src/Analyzer/Passes/ArrayExistsToHasPass.h
+++ b/src/Analyzer/Passes/ArrayExistsToHasPass.h
@@ -20,7 +20,7 @@ public:
 
     String getDescription() override { return "Rewrite arrayExists(func, arr) functions to has(arr, elem) when logically equivalent"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
index 2c89ec9dc20..9bd044dd89c 100644
--- a/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
+++ b/src/Analyzer/Passes/AutoFinalOnQueryPass.cpp
@@ -1,4 +1,4 @@
-#include "AutoFinalOnQueryPass.h"
+#include <Analyzer/Passes/AutoFinalOnQueryPass.h>
 
 #include <Storages/IStorage.h>
 
@@ -67,7 +67,7 @@ private:
 
 }
 
-void AutoFinalOnQueryPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void AutoFinalOnQueryPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     auto visitor = AutoFinalOnQueryPassVisitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/AutoFinalOnQueryPass.h b/src/Analyzer/Passes/AutoFinalOnQueryPass.h
index 3489597108c..d595b98d349 100644
--- a/src/Analyzer/Passes/AutoFinalOnQueryPass.h
+++ b/src/Analyzer/Passes/AutoFinalOnQueryPass.h
@@ -25,7 +25,7 @@ public:
         return "Automatically applies final modifier to table expressions in queries if it is supported and if user level final setting is set";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/CNF.cpp b/src/Analyzer/Passes/CNF.cpp
index aa6ee539934..71549f9e71d 100644
--- a/src/Analyzer/Passes/CNF.cpp
+++ b/src/Analyzer/Passes/CNF.cpp
@@ -10,6 +10,7 @@
 #include <IO/Operators.h>
 
 #include <Functions/FunctionFactory.h>
+#include <Functions/logical.h>
 
 #include <Common/checkStackSize.h>
 
@@ -79,7 +80,7 @@ public:
 
         if (name == "and" || name == "or")
         {
-            auto function_resolver = FunctionFactory::instance().get(name, current_context);
+            auto function_resolver = name == "and" ? createInternalFunctionAndOverloadResolver() : createInternalFunctionOrOverloadResolver();
 
             const auto & arguments = function_node->getArguments().getNodes();
             if (arguments.size() > 2)
@@ -110,10 +111,10 @@ private:
 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))
+    explicit PushNotVisitor()
+        : not_function_resolver(createInternalFunctionNotOverloadResolver())
+        , or_function_resolver(createInternalFunctionOrOverloadResolver())
+        , and_function_resolver(createInternalFunctionAndOverloadResolver())
     {}
 
     void visit(QueryTreeNodePtr & node, bool add_negation)
@@ -162,10 +163,10 @@ private:
 class PushOrVisitor
 {
 public:
-    PushOrVisitor(ContextPtr context, size_t max_atoms_)
+    explicit PushOrVisitor(size_t max_atoms_)
         : max_atoms(max_atoms_)
-        , and_resolver(FunctionFactory::instance().get("and", context))
-        , or_resolver(FunctionFactory::instance().get("or", context))
+        , and_resolver(createInternalFunctionAndOverloadResolver())
+        , or_resolver(createInternalFunctionOrOverloadResolver())
     {}
 
     bool visit(QueryTreeNodePtr & node, size_t num_atoms)
@@ -513,11 +514,11 @@ std::optional<CNF> CNF::tryBuildCNF(const QueryTreeNodePtr & node, ContextPtr co
     }
 
     {
-        PushNotVisitor visitor(context);
+        PushNotVisitor visitor;
         visitor.visit(node_cloned, false);
     }
 
-    if (PushOrVisitor visitor(context, max_atoms);
+    if (PushOrVisitor visitor(max_atoms);
         !visitor.visit(node_cloned, atom_count))
             return std::nullopt;
 
@@ -542,7 +543,7 @@ CNF CNF::toCNF(const QueryTreeNodePtr & node, ContextPtr context, size_t max_gro
     return *cnf;
 }
 
-QueryTreeNodePtr CNF::toQueryTree(ContextPtr context) const
+QueryTreeNodePtr CNF::toQueryTree() const
 {
     if (statements.empty())
         return nullptr;
@@ -550,9 +551,9 @@ QueryTreeNodePtr CNF::toQueryTree(ContextPtr context) const
     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);
+    auto not_resolver = createInternalFunctionNotOverloadResolver();
+    auto or_resolver = createInternalFunctionOrOverloadResolver();
+    auto and_resolver = createInternalFunctionAndOverloadResolver();
 
     const auto function_node_from_atom = [&](const auto & atom) -> QueryTreeNodePtr
     {
diff --git a/src/Analyzer/Passes/CNF.h b/src/Analyzer/Passes/CNF.h
index ec639cd6679..9325d97d2f2 100644
--- a/src/Analyzer/Passes/CNF.h
+++ b/src/Analyzer/Passes/CNF.h
@@ -54,7 +54,7 @@ public:
     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;
+    QueryTreeNodePtr toQueryTree() const;
 
     const auto & getStatements() const
     {
diff --git a/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp b/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
index 7c38ba81c70..f8233f473f8 100644
--- a/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
+++ b/src/Analyzer/Passes/ComparisonTupleEliminationPass.cpp
@@ -213,7 +213,7 @@ private:
 
 }
 
-void ComparisonTupleEliminationPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void ComparisonTupleEliminationPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     ComparisonTupleEliminationPassVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/ComparisonTupleEliminationPass.h b/src/Analyzer/Passes/ComparisonTupleEliminationPass.h
index 954a9d6a2f0..7f4245e2d95 100644
--- a/src/Analyzer/Passes/ComparisonTupleEliminationPass.h
+++ b/src/Analyzer/Passes/ComparisonTupleEliminationPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Rewrite tuples comparison into equivalent comparison of tuples arguments"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
index 1fada88a21c..eb897ef8746 100644
--- a/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
+++ b/src/Analyzer/Passes/ConvertOrLikeChainPass.cpp
@@ -11,6 +11,8 @@
 #include <DataTypes/DataTypesNumber.h>
 
 #include <Functions/FunctionFactory.h>
+#include <Functions/multiMatchAny.h>
+#include <Functions/logical.h>
 
 #include <Interpreters/Context.h>
 
@@ -132,10 +134,12 @@ private:
 
 }
 
-void ConvertOrLikeChainPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void ConvertOrLikeChainPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
-    auto or_function_resolver = FunctionFactory::instance().get("or", context);
-    auto match_function_resolver = FunctionFactory::instance().get("multiMatchAny", context);
+    const auto & settings = context->getSettingsRef();
+    auto match_function_resolver = createInternalMultiMatchAnyOverloadResolver(settings.allow_hyperscan, settings.max_hyperscan_regexp_length, settings.max_hyperscan_regexp_total_length, settings.reject_expensive_hyperscan_regexps);
+    auto or_function_resolver = createInternalFunctionOrOverloadResolver();
+
     ConvertOrLikeChainVisitor visitor(std::move(or_function_resolver), std::move(match_function_resolver), std::move(context));
     visitor.visit(query_tree_node);
 }
diff --git a/src/Analyzer/Passes/ConvertOrLikeChainPass.h b/src/Analyzer/Passes/ConvertOrLikeChainPass.h
index 0f734bfa73d..90bccaa0e8d 100644
--- a/src/Analyzer/Passes/ConvertOrLikeChainPass.h
+++ b/src/Analyzer/Passes/ConvertOrLikeChainPass.h
@@ -14,7 +14,7 @@ public:
 
     String getDescription() override { return "Replaces all the 'or's with {i}like to multiMatchAny"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
index 724448ad742..96bc62212fd 100644
--- a/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
+++ b/src/Analyzer/Passes/ConvertQueryToCNFPass.cpp
@@ -8,14 +8,12 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/Passes/CNF.h>
 #include <Analyzer/Utils.h>
+#include <Analyzer/HashUtils.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"
+#include <Interpreters/ComparisonGraph.h>
 
 namespace DB
 {
@@ -341,7 +339,7 @@ void addIndexConstraint(Analyzer::CNF & cnf, const QueryTreeNodes & table_expres
         {
             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->getArguments().getNodes().push_back(Analyzer::CNF{std::move(and_group)}.toQueryTree());
             index_hint_node->resolveAsFunction(FunctionFactory::instance().get("indexHint", context));
             new_group.insert({false, QueryTreeNodePtrWithHash{std::move(index_hint_node)}});
 
@@ -678,7 +676,7 @@ void optimizeNode(QueryTreeNodePtr & node, const QueryTreeNodes & table_expressi
     if (settings.optimize_using_constraints)
         optimizeWithConstraints(*cnf, table_expressions, context);
 
-    auto new_node = cnf->toQueryTree(context);
+    auto new_node = cnf->toQueryTree();
     node = std::move(new_node);
 }
 
@@ -720,7 +718,7 @@ public:
 
 }
 
-void ConvertLogicalExpressionToCNFPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void ConvertLogicalExpressionToCNFPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     const auto & settings = context->getSettingsRef();
     if (!settings.convert_query_to_cnf)
diff --git a/src/Analyzer/Passes/ConvertQueryToCNFPass.h b/src/Analyzer/Passes/ConvertQueryToCNFPass.h
index 5ed874db006..60943c04d78 100644
--- a/src/Analyzer/Passes/ConvertQueryToCNFPass.h
+++ b/src/Analyzer/Passes/ConvertQueryToCNFPass.h
@@ -12,7 +12,7 @@ public:
 
     String getDescription() override { return "Convert logical expression to CNF and apply optimizations using constraints"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/CountDistinctPass.cpp b/src/Analyzer/Passes/CountDistinctPass.cpp
index 07a031fe4e8..3307c440f42 100644
--- a/src/Analyzer/Passes/CountDistinctPass.cpp
+++ b/src/Analyzer/Passes/CountDistinctPass.cpp
@@ -87,7 +87,7 @@ public:
 
 }
 
-void CountDistinctPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void CountDistinctPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     CountDistinctVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/CountDistinctPass.h b/src/Analyzer/Passes/CountDistinctPass.h
index cac5033c98f..33728b0228c 100644
--- a/src/Analyzer/Passes/CountDistinctPass.h
+++ b/src/Analyzer/Passes/CountDistinctPass.h
@@ -20,7 +20,7 @@ public:
         return "Optimize single countDistinct into count over subquery";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
index b5ece1a4c49..d0a5656d334 100644
--- a/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
+++ b/src/Analyzer/Passes/CrossToInnerJoinPass.cpp
@@ -12,6 +12,7 @@
 
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
+#include <Functions/logical.h>
 
 #include <Common/logger_useful.h>
 
@@ -256,7 +257,7 @@ private:
         for (const auto & node : nodes)
             function_node->getArguments().getNodes().push_back(node);
 
-        const auto & function = FunctionFactory::instance().get("and", getContext());
+        const auto & function = createInternalFunctionAndOverloadResolver();
         function_node->resolveAsFunction(function->build(function_node->getArgumentColumns()));
         return function_node;
     }
@@ -264,7 +265,7 @@ private:
 
 }
 
-void CrossToInnerJoinPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void CrossToInnerJoinPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     CrossToInnerJoinVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/CrossToInnerJoinPass.h b/src/Analyzer/Passes/CrossToInnerJoinPass.h
index 127d26dc41d..b0437c562ac 100644
--- a/src/Analyzer/Passes/CrossToInnerJoinPass.h
+++ b/src/Analyzer/Passes/CrossToInnerJoinPass.h
@@ -22,7 +22,7 @@ public:
         return "Replace CROSS JOIN with INNER JOIN";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
index cd635f87e0e..6248f462979 100644
--- a/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
+++ b/src/Analyzer/Passes/FunctionToSubcolumnsPass.cpp
@@ -49,6 +49,9 @@ public:
         if (!first_argument_column_node)
             return;
 
+        if (first_argument_column_node->getColumnName() == "__grouping_set")
+            return;
+
         auto column_source = first_argument_column_node->getColumnSource();
         auto * table_node = column_source->as<TableNode>();
 
@@ -72,6 +75,7 @@ public:
                 {
                     /// Replace `length(array_argument)` with `array_argument.size0`
                     column.name += ".size0";
+                    column.type = std::make_shared<DataTypeUInt64>();
 
                     node = std::make_shared<ColumnNode>(column, column_source);
                 }
@@ -106,6 +110,7 @@ public:
                 {
                     /// Replace `isNull(nullable_argument)` with `nullable_argument.null`
                     column.name += ".null";
+                    column.type = std::make_shared<DataTypeUInt8>();
 
                     node = std::make_shared<ColumnNode>(column, column_source);
                 }
@@ -176,6 +181,23 @@ public:
 
                 node = std::make_shared<ColumnNode>(column, column_source);
             }
+            else if (function_name == "variantElement" && isVariant(column_type) && second_argument_constant_node)
+            {
+                /// Replace `variantElement(variant_argument, type_name)` with `variant_argument.type_name`.
+                const auto & variant_element_constant_value = second_argument_constant_node->getValue();
+                String subcolumn_name;
+
+                if (variant_element_constant_value.getType() != Field::Types::String)
+                    return;
+
+                subcolumn_name = variant_element_constant_value.get<const String &>();
+
+                column.name += '.';
+                column.name += subcolumn_name;
+                column.type = function_node->getResultType();
+
+                node = std::make_shared<ColumnNode>(column, column_source);
+            }
             else if (function_name == "mapContains" && column_type.isMap())
             {
                 const auto & data_type_map = assert_cast<const DataTypeMap &>(*column.type);
@@ -202,7 +224,7 @@ private:
 
 }
 
-void FunctionToSubcolumnsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void FunctionToSubcolumnsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     FunctionToSubcolumnsVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/FunctionToSubcolumnsPass.h b/src/Analyzer/Passes/FunctionToSubcolumnsPass.h
index 0e1d2583e7b..d4edcc5b922 100644
--- a/src/Analyzer/Passes/FunctionToSubcolumnsPass.h
+++ b/src/Analyzer/Passes/FunctionToSubcolumnsPass.h
@@ -24,7 +24,7 @@ public:
 
     String getDescription() override { return "Rewrite function to subcolumns, for example tupleElement(column, subcolumn) into column.subcolumn"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/FuseFunctionsPass.cpp b/src/Analyzer/Passes/FuseFunctionsPass.cpp
index 443e13b7d9d..ac4678fb362 100644
--- a/src/Analyzer/Passes/FuseFunctionsPass.cpp
+++ b/src/Analyzer/Passes/FuseFunctionsPass.cpp
@@ -256,7 +256,7 @@ void tryFuseQuantiles(QueryTreeNodePtr query_tree_node, ContextPtr context)
 
 }
 
-void FuseFunctionsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void FuseFunctionsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     tryFuseSumCountAvg(query_tree_node, context);
     tryFuseQuantiles(query_tree_node, context);
diff --git a/src/Analyzer/Passes/FuseFunctionsPass.h b/src/Analyzer/Passes/FuseFunctionsPass.h
index a92b77b1115..2fd85da4747 100644
--- a/src/Analyzer/Passes/FuseFunctionsPass.h
+++ b/src/Analyzer/Passes/FuseFunctionsPass.h
@@ -20,7 +20,7 @@ public:
 
     String getDescription() override { return "Replaces several calls of aggregate functions of the same family into one call"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
index 577bca8d1ae..085519c7220 100644
--- a/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
+++ b/src/Analyzer/Passes/GroupingFunctionsResolvePass.cpp
@@ -146,7 +146,7 @@ void resolveGroupingFunctions(QueryTreeNodePtr & query_node, ContextPtr context)
     if (query_node_typed.hasGroupBy())
     {
         /// It is expected by execution layer that if there are only 1 grouping set it will be removed
-        if (query_node_typed.isGroupByWithGroupingSets() && query_node_typed.getGroupBy().getNodes().size() == 1)
+        if (query_node_typed.isGroupByWithGroupingSets() && query_node_typed.getGroupBy().getNodes().size() == 1 && !context->getSettingsRef().group_by_use_nulls)
         {
             auto grouping_set_list_node = query_node_typed.getGroupBy().getNodes().front();
             auto & grouping_set_list_node_typed = grouping_set_list_node->as<ListNode &>();
@@ -227,19 +227,20 @@ void resolveGroupingFunctions(QueryTreeNodePtr & query_node, ContextPtr context)
     visitor.visit(query_node);
 }
 
-class GroupingFunctionsResolveVisitor : public InDepthQueryTreeVisitor<GroupingFunctionsResolveVisitor>
+class GroupingFunctionsResolveVisitor : public InDepthQueryTreeVisitorWithContext<GroupingFunctionsResolveVisitor>
 {
+    using Base = InDepthQueryTreeVisitorWithContext<GroupingFunctionsResolveVisitor>;
 public:
     explicit GroupingFunctionsResolveVisitor(ContextPtr context_)
-        : context(std::move(context_))
+        : Base(std::move(context_))
     {}
 
-    void visitImpl(QueryTreeNodePtr & node)
+    void enterImpl(QueryTreeNodePtr & node)
     {
         if (node->getNodeType() != QueryTreeNodeType::QUERY)
             return;
 
-        resolveGroupingFunctions(node, context);
+        resolveGroupingFunctions(node, getContext());
     }
 
 private:
@@ -248,7 +249,7 @@ private:
 
 }
 
-void GroupingFunctionsResolvePass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void GroupingFunctionsResolvePass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     GroupingFunctionsResolveVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/GroupingFunctionsResolvePass.h b/src/Analyzer/Passes/GroupingFunctionsResolvePass.h
index 070c8dd9389..cd932f76977 100644
--- a/src/Analyzer/Passes/GroupingFunctionsResolvePass.h
+++ b/src/Analyzer/Passes/GroupingFunctionsResolvePass.h
@@ -24,7 +24,7 @@ public:
 
     String getDescription() override { return "Resolve GROUPING functions based on GROUP BY modifiers"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
index b0018d474d5..beb2247607e 100644
--- a/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
+++ b/src/Analyzer/Passes/IfChainToMultiIfPass.cpp
@@ -5,6 +5,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/FunctionNode.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/multiIf.h>
 
 namespace DB
 {
@@ -64,6 +65,12 @@ public:
         auto multi_if_function = std::make_shared<FunctionNode>("multiIf");
         multi_if_function->getArguments().getNodes() = std::move(multi_if_arguments);
         multi_if_function->resolveAsFunction(multi_if_function_ptr->build(multi_if_function->getArgumentColumns()));
+
+        /// Ignore if returned type changed.
+        /// Example : SELECT now64(if(Null, NULL, if(Null, nan, toFloat64(number))), Null) FROM numbers(2)
+        if (!multi_if_function->getResultType()->equals(*function_node->getResultType()))
+            return;
+
         node = std::move(multi_if_function);
     }
 
@@ -73,9 +80,10 @@ private:
 
 }
 
-void IfChainToMultiIfPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void IfChainToMultiIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
-    auto multi_if_function_ptr = FunctionFactory::instance().get("multiIf", context);
+    const auto & settings = context->getSettingsRef();
+    auto multi_if_function_ptr = createInternalMultiIfOverloadResolver(settings.allow_execute_multiif_columnar, settings.allow_experimental_variant_type, settings.use_variant_as_common_type);
     IfChainToMultiIfPassVisitor visitor(std::move(multi_if_function_ptr), std::move(context));
     visitor.visit(query_tree_node);
 }
diff --git a/src/Analyzer/Passes/IfChainToMultiIfPass.h b/src/Analyzer/Passes/IfChainToMultiIfPass.h
index 43f3fb8831d..9e7335d93e4 100644
--- a/src/Analyzer/Passes/IfChainToMultiIfPass.h
+++ b/src/Analyzer/Passes/IfChainToMultiIfPass.h
@@ -18,7 +18,7 @@ public:
 
     String getDescription() override { return "Optimize if chain to multiIf"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/IfConstantConditionPass.cpp b/src/Analyzer/Passes/IfConstantConditionPass.cpp
index fedd7ddc932..6b24eb1d539 100644
--- a/src/Analyzer/Passes/IfConstantConditionPass.cpp
+++ b/src/Analyzer/Passes/IfConstantConditionPass.cpp
@@ -57,7 +57,7 @@ public:
 
 }
 
-void IfConstantConditionPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void IfConstantConditionPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     IfConstantConditionVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/IfConstantConditionPass.h b/src/Analyzer/Passes/IfConstantConditionPass.h
index 7817e67aa5e..7548fc702bc 100644
--- a/src/Analyzer/Passes/IfConstantConditionPass.h
+++ b/src/Analyzer/Passes/IfConstantConditionPass.h
@@ -21,7 +21,7 @@ public:
 
     String getDescription() override { return "Optimize if, multiIf for constant condition."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
index 76b14c1a867..29b392a0951 100644
--- a/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
+++ b/src/Analyzer/Passes/IfTransformStringsToEnumPass.cpp
@@ -190,7 +190,7 @@ public:
 
 }
 
-void IfTransformStringsToEnumPass::run(QueryTreeNodePtr query, ContextPtr context)
+void IfTransformStringsToEnumPass::run(QueryTreeNodePtr & query, ContextPtr context)
 {
     ConvertStringsToEnumVisitor visitor(std::move(context));
     visitor.visit(query);
diff --git a/src/Analyzer/Passes/IfTransformStringsToEnumPass.h b/src/Analyzer/Passes/IfTransformStringsToEnumPass.h
index a4a014967e0..522087aafae 100644
--- a/src/Analyzer/Passes/IfTransformStringsToEnumPass.h
+++ b/src/Analyzer/Passes/IfTransformStringsToEnumPass.h
@@ -33,7 +33,7 @@ public:
 
     String getDescription() override { return "Replaces string-type arguments in If and Transform to enum"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
index 59b3b036698..5f08bb9035e 100644
--- a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
+++ b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.cpp
@@ -404,12 +404,12 @@ private:
 
             auto operand_type = and_operands[0]->getResultType();
             auto function_type = function_node.getResultType();
-            assert(!function_type->isNullable());
+            chassert(!function_type->isNullable());
             if (!function_type->equals(*operand_type))
             {
                 /// Result of equality operator can be low cardinality, while AND always returns UInt8.
                 /// In that case we replace `(lc = 1) AND (lc = 1)` with `(lc = 1) AS UInt8`
-                assert(function_type->equals(*removeLowCardinality(operand_type)));
+                chassert(function_type->equals(*removeLowCardinality(operand_type)));
                 node = createCastFunction(std::move(and_operands[0]), function_type, getContext());
             }
             else
@@ -427,7 +427,7 @@ private:
     void tryReplaceOrEqualsChainWithIn(QueryTreeNodePtr & node)
     {
         auto & function_node = node->as<FunctionNode &>();
-        assert(function_node.getFunctionName() == "or");
+        chassert(function_node.getFunctionName() == "or");
 
         QueryTreeNodes or_operands;
 
@@ -486,7 +486,7 @@ private:
             /// first we create tuple from RHS of equals functions
             for (const auto & equals : equals_functions)
             {
-                is_any_nullable |= equals->getResultType()->isNullable();
+                is_any_nullable |= removeLowCardinality(equals->getResultType())->isNullable();
 
                 const auto * equals_function = equals->as<FunctionNode>();
                 assert(equals_function && equals_function->getFunctionName() == "equals");
@@ -554,7 +554,7 @@ private:
     }
 };
 
-void LogicalExpressionOptimizerPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+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
index 658f6d767c4..7f885323269 100644
--- a/src/Analyzer/Passes/LogicalExpressionOptimizerPass.h
+++ b/src/Analyzer/Passes/LogicalExpressionOptimizerPass.h
@@ -109,7 +109,7 @@ public:
             "replace chains of equality functions inside an OR with a single IN operator";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/MultiIfToIfPass.cpp b/src/Analyzer/Passes/MultiIfToIfPass.cpp
index d837795866a..c42ea61b34a 100644
--- a/src/Analyzer/Passes/MultiIfToIfPass.cpp
+++ b/src/Analyzer/Passes/MultiIfToIfPass.cpp
@@ -3,6 +3,7 @@
 #include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/FunctionNode.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/if.h>
 
 namespace DB
 {
@@ -52,9 +53,10 @@ private:
 
 }
 
-void MultiIfToIfPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void MultiIfToIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
-    auto if_function_ptr = FunctionFactory::instance().get("if", context);
+    const auto & settings = context->getSettingsRef();
+    auto if_function_ptr = createInternalFunctionIfOverloadResolver(settings.allow_experimental_variant_type, settings.use_variant_as_common_type);
     MultiIfToIfVisitor visitor(std::move(if_function_ptr), std::move(context));
     visitor.visit(query_tree_node);
 }
diff --git a/src/Analyzer/Passes/MultiIfToIfPass.h b/src/Analyzer/Passes/MultiIfToIfPass.h
index 2213f3713ed..e3c03913aaa 100644
--- a/src/Analyzer/Passes/MultiIfToIfPass.h
+++ b/src/Analyzer/Passes/MultiIfToIfPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Optimize multiIf with single condition to if."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
index 6b801925a6e..0d6f3fc2d87 100644
--- a/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
+++ b/src/Analyzer/Passes/NormalizeCountVariantsPass.cpp
@@ -7,6 +7,7 @@
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Interpreters/Context.h>
+#include <DataTypes/DataTypesNumber.h>
 
 namespace DB
 {
@@ -32,6 +33,11 @@ public:
         if (function_node->getArguments().getNodes().size() != 1)
             return;
 
+        /// forbid the optimization if return value of sum() and count() differs:
+        /// count() returns only UInt64 type, while sum() could return Nullable().
+        if (!function_node->getResultType()->equals(DataTypeUInt64()))
+            return;
+
         auto & first_argument = function_node->getArguments().getNodes()[0];
         auto * first_argument_constant_node = first_argument->as<ConstantNode>();
         if (!first_argument_constant_node)
@@ -64,7 +70,7 @@ private:
 
 }
 
-void NormalizeCountVariantsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void NormalizeCountVariantsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     NormalizeCountVariantsVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/NormalizeCountVariantsPass.h b/src/Analyzer/Passes/NormalizeCountVariantsPass.h
index 78a114f4a85..6cf9f34619a 100644
--- a/src/Analyzer/Passes/NormalizeCountVariantsPass.h
+++ b/src/Analyzer/Passes/NormalizeCountVariantsPass.h
@@ -20,7 +20,7 @@ public:
 
     String getDescription() override { return "Optimize count(literal), sum(1) into count()."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
index 774c07ef1d4..0c37749c706 100644
--- a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
+++ b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.cpp
@@ -2,10 +2,10 @@
 
 #include <Functions/FunctionFactory.h>
 
-#include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/FunctionNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
 #include <Common/DateLUT.h>
 #include <Common/DateLUTImpl.h>
 
@@ -14,20 +14,19 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
+extern const int LOGICAL_ERROR;
 }
 
 namespace
 {
 
-class OptimizeDateOrDateTimeConverterWithPreimageVisitor : public InDepthQueryTreeVisitorWithContext<OptimizeDateOrDateTimeConverterWithPreimageVisitor>
+class OptimizeDateOrDateTimeConverterWithPreimageVisitor
+    : public InDepthQueryTreeVisitorWithContext<OptimizeDateOrDateTimeConverterWithPreimageVisitor>
 {
 public:
     using Base = InDepthQueryTreeVisitorWithContext<OptimizeDateOrDateTimeConverterWithPreimageVisitor>;
 
-    explicit OptimizeDateOrDateTimeConverterWithPreimageVisitor(ContextPtr context)
-        : Base(std::move(context))
-    {}
+    explicit OptimizeDateOrDateTimeConverterWithPreimageVisitor(ContextPtr context) : Base(std::move(context)) { }
 
     static bool needChildVisit(QueryTreeNodePtr & node, QueryTreeNodePtr & /*child*/)
     {
@@ -41,9 +40,7 @@ public:
         };
 
         if (const auto * function = node->as<FunctionNode>())
-        {
             return !relations.contains(function->getFunctionName());
-        }
 
         return true;
     }
@@ -59,11 +56,16 @@ public:
             {"greaterOrEquals", "lessOrEquals"},
         };
 
+        if (!getSettings().optimize_time_filter_with_preimage)
+            return;
+
         const auto * function = node->as<FunctionNode>();
 
-        if (!function || !swap_relations.contains(function->getFunctionName())) return;
+        if (!function || !swap_relations.contains(function->getFunctionName()))
+            return;
 
-        if (function->getArguments().getNodes().size() != 2) return;
+        if (function->getArguments().getNodes().size() != 2)
+            return;
 
         size_t func_id = function->getArguments().getNodes().size();
 
@@ -72,147 +74,136 @@ public:
             if (const auto * func = function->getArguments().getNodes()[i]->as<FunctionNode>())
             {
                 func_id = i;
+                break;
             }
         }
 
-        if (func_id == function->getArguments().getNodes().size()) return;
+        if (func_id == function->getArguments().getNodes().size())
+            return;
 
         size_t literal_id = 1 - func_id;
         const auto * literal = function->getArguments().getNodes()[literal_id]->as<ConstantNode>();
 
-        if (!literal || literal->getValue().getType() != Field::Types::UInt64) return;
+        if (!literal || !literal->getResultType()->isValueRepresentedByUnsignedInteger())
+            return;
 
-        String comparator = literal_id > func_id ? function->getFunctionName(): swap_relations.at(function->getFunctionName());
+        String comparator = literal_id > func_id ? function->getFunctionName() : swap_relations.at(function->getFunctionName());
 
         const auto * func_node = function->getArguments().getNodes()[func_id]->as<FunctionNode>();
         /// Currently we only handle single-argument functions.
-        if (!func_node || func_node->getArguments().getNodes().size() != 1) return;
+        if (!func_node || func_node->getArguments().getNodes().size() != 1)
+            return;
 
-        const auto * column_id = func_node->getArguments().getNodes()[0]->as<ColumnNode>();
-        if (!column_id) return;
+        const auto & argument_node = func_node->getArguments().getNodes()[0];
+        const auto * column_id = argument_node->as<ColumnNode>();
+        if (!column_id)
+            return;
+
+        if (column_id->getColumnName() == "__grouping_set")
+            return;
 
         const auto * column_type = column_id->getColumnType().get();
-        if (!isDateOrDate32(column_type) && !isDateTime(column_type) && !isDateTime64(column_type)) return;
+        if (!isDateOrDate32(column_type) && !isDateTime(column_type) && !isDateTime64(column_type))
+            return;
 
         const auto & converter = FunctionFactory::instance().tryGet(func_node->getFunctionName(), getContext());
-        if (!converter) return;
+        if (!converter)
+            return;
 
         ColumnsWithTypeAndName args;
         args.emplace_back(column_id->getColumnType(), "tmp");
         auto converter_base = converter->build(args);
-        if (!converter_base || !converter_base->hasInformationAboutPreimage()) return;
+        if (!converter_base || !converter_base->hasInformationAboutPreimage())
+            return;
 
         auto preimage_range = converter_base->getPreimage(*(column_id->getColumnType()), literal->getValue());
-        if (!preimage_range) return;
+        if (!preimage_range)
+            return;
 
-        const auto new_node = generateOptimizedDateFilter(comparator, *column_id, *preimage_range);
+        const auto new_node = generateOptimizedDateFilter(comparator, argument_node, *preimage_range);
 
-        if (!new_node) return;
+        if (!new_node)
+            return;
 
         node = new_node;
     }
 
 private:
-    QueryTreeNodePtr generateOptimizedDateFilter(const String & comparator, const ColumnNode & column_node, const std::pair<Field, Field>& range) const
+    QueryTreeNodePtr generateOptimizedDateFilter(
+        const String & comparator, const QueryTreeNodePtr & column_node, const std::pair<Field, Field> & range) const
     {
         const DateLUTImpl & date_lut = DateLUT::instance("UTC");
 
         String start_date_or_date_time;
         String end_date_or_date_time;
 
-        if (isDateOrDate32(column_node.getColumnType().get()))
+        const auto & column_node_typed = column_node->as<ColumnNode &>();
+        const auto & column_type = column_node_typed.getColumnType().get();
+        if (isDateOrDate32(column_type))
         {
             start_date_or_date_time = date_lut.dateToString(range.first.get<DateLUTImpl::Time>());
             end_date_or_date_time = date_lut.dateToString(range.second.get<DateLUTImpl::Time>());
         }
-        else if (isDateTime(column_node.getColumnType().get()) || isDateTime64(column_node.getColumnType().get()))
+        else if (isDateTime(column_type) || isDateTime64(column_type))
         {
             start_date_or_date_time = date_lut.timeToString(range.first.get<DateLUTImpl::Time>());
             end_date_or_date_time = date_lut.timeToString(range.second.get<DateLUTImpl::Time>());
         }
-        else [[unlikely]] return {};
+        else [[unlikely]]
+            return {};
 
         if (comparator == "equals")
         {
-            const auto lhs = std::make_shared<FunctionNode>("greaterOrEquals");
-            lhs->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            lhs->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(start_date_or_date_time));
-            resolveOrdinaryFunctionNode(*lhs, lhs->getFunctionName());
-
-            const auto rhs = std::make_shared<FunctionNode>("less");
-            rhs->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            rhs->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(end_date_or_date_time));
-            resolveOrdinaryFunctionNode(*rhs, rhs->getFunctionName());
-
-            const auto new_date_filter = std::make_shared<FunctionNode>("and");
-            new_date_filter->getArguments().getNodes() = {lhs, rhs};
-            resolveOrdinaryFunctionNode(*new_date_filter, new_date_filter->getFunctionName());
-
-            return new_date_filter;
+            return createFunctionNode(
+                "and",
+                createFunctionNode("greaterOrEquals", column_node, std::make_shared<ConstantNode>(start_date_or_date_time)),
+                createFunctionNode("less", column_node, std::make_shared<ConstantNode>(end_date_or_date_time)));
         }
         else if (comparator == "notEquals")
         {
-            const auto lhs = std::make_shared<FunctionNode>("less");
-            lhs->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            lhs->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(start_date_or_date_time));
-            resolveOrdinaryFunctionNode(*lhs, lhs->getFunctionName());
-
-            const auto rhs = std::make_shared<FunctionNode>("greaterOrEquals");
-            rhs->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            rhs->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(end_date_or_date_time));
-            resolveOrdinaryFunctionNode(*rhs, rhs->getFunctionName());
-
-            const auto new_date_filter = std::make_shared<FunctionNode>("or");
-            new_date_filter->getArguments().getNodes() = {lhs, rhs};
-            resolveOrdinaryFunctionNode(*new_date_filter, new_date_filter->getFunctionName());
-
-            return new_date_filter;
+            return createFunctionNode(
+                "or",
+                createFunctionNode("less", column_node, std::make_shared<ConstantNode>(start_date_or_date_time)),
+                createFunctionNode("greaterOrEquals", column_node, std::make_shared<ConstantNode>(end_date_or_date_time)));
         }
         else if (comparator == "greater")
         {
-            const auto new_date_filter = std::make_shared<FunctionNode>("greaterOrEquals");
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(end_date_or_date_time));
-            resolveOrdinaryFunctionNode(*new_date_filter, new_date_filter->getFunctionName());
-
-            return new_date_filter;
+            return createFunctionNode("greaterOrEquals", column_node, std::make_shared<ConstantNode>(end_date_or_date_time));
         }
         else if (comparator == "lessOrEquals")
         {
-            const auto new_date_filter = std::make_shared<FunctionNode>("less");
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(end_date_or_date_time));
-            resolveOrdinaryFunctionNode(*new_date_filter, new_date_filter->getFunctionName());
-
-            return new_date_filter;
+            return createFunctionNode("less", column_node, std::make_shared<ConstantNode>(end_date_or_date_time));
         }
         else if (comparator == "less" || comparator == "greaterOrEquals")
         {
-            const auto new_date_filter = std::make_shared<FunctionNode>(comparator);
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ColumnNode>(column_node.getColumn(), column_node.getColumnSource()));
-            new_date_filter->getArguments().getNodes().push_back(std::make_shared<ConstantNode>(start_date_or_date_time));
-            resolveOrdinaryFunctionNode(*new_date_filter, new_date_filter->getFunctionName());
-
-            return new_date_filter;
+            return createFunctionNode(comparator, column_node, std::make_shared<ConstantNode>(start_date_or_date_time));
         }
         else [[unlikely]]
         {
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
                 "Expected equals, notEquals, less, lessOrEquals, greater, greaterOrEquals. Actual {}",
                 comparator);
         }
     }
 
-    void resolveOrdinaryFunctionNode(FunctionNode & function_node, const String & function_name) const
+    template <typename... Args>
+    QueryTreeNodePtr createFunctionNode(const String & function_name, Args &&... args) const
     {
         auto function = FunctionFactory::instance().get(function_name, getContext());
-        function_node.resolveAsFunction(function->build(function_node.getArgumentColumns()));
+        const auto function_node = std::make_shared<FunctionNode>(function_name);
+        auto & new_arguments = function_node->getArguments().getNodes();
+        new_arguments.reserve(sizeof...(args));
+        (new_arguments.push_back(std::forward<Args>(args)), ...);
+        function_node->resolveAsFunction(function->build(function_node->getArgumentColumns()));
+
+        return function_node;
     }
 };
 
 }
 
-void OptimizeDateOrDateTimeConverterWithPreimagePass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void OptimizeDateOrDateTimeConverterWithPreimagePass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     OptimizeDateOrDateTimeConverterWithPreimageVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.h b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.h
index c29f18e330b..f93cd9223e4 100644
--- a/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.h
+++ b/src/Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Replace predicate having Date/DateTime converters with their preimages"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
index 2e3f207fdeb..fd8c3e6ee6c 100644
--- a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
+++ b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.cpp
@@ -31,6 +31,12 @@ public:
         if (!getSettings().optimize_group_by_function_keys)
             return;
 
+        /// When group_by_use_nulls = 1 removing keys from GROUP BY can lead
+        /// to unexpected types in some functions.
+        /// See example in https://github.com/ClickHouse/ClickHouse/pull/61567#issuecomment-2018007887
+        if (getSettings().group_by_use_nulls)
+            return;
+
         auto * query = node->as<QueryNode>();
         if (!query)
             return;
@@ -73,12 +79,14 @@ private:
             candidates.push_back({ *it, is_deterministic });
 
         /// Using DFS we traverse function tree and try to find if it uses other keys as function arguments.
+        bool found_at_least_one_usage = false;
         while (!candidates.empty())
         {
             auto [candidate, parents_are_only_deterministic] = candidates.back();
             candidates.pop_back();
 
             bool found = group_by_keys.contains(candidate);
+            found_at_least_one_usage |= found;
 
             switch (candidate->getNodeType())
             {
@@ -92,7 +100,7 @@ private:
                     if (!found)
                     {
                         bool is_deterministic_function = parents_are_only_deterministic &&
-                            function->getFunctionOrThrow()->isDeterministicInScopeOfQuery();
+                            func->getFunctionOrThrow()->isDeterministicInScopeOfQuery();
                         for (auto it = arguments.rbegin(); it != arguments.rend(); ++it)
                             candidates.push_back({ *it, is_deterministic_function });
                     }
@@ -111,7 +119,7 @@ private:
             }
         }
 
-        return true;
+        return found_at_least_one_usage;
     }
 
     static void optimizeGroupingSet(QueryTreeNodes & grouping_set)
@@ -130,7 +138,7 @@ private:
     }
 };
 
-void OptimizeGroupByFunctionKeysPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void OptimizeGroupByFunctionKeysPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     OptimizeGroupByFunctionKeysVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.h b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.h
index 632960c45bb..fd5eadcb796 100644
--- a/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.h
+++ b/src/Analyzer/Passes/OptimizeGroupByFunctionKeysPass.h
@@ -16,7 +16,7 @@ public:
 
     String getDescription() override { return "Eliminates functions of other keys in GROUP BY section."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
new file mode 100644
index 00000000000..a30ad2a1590
--- /dev/null
+++ b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.cpp
@@ -0,0 +1,113 @@
+#include <Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/IQueryTreeNode.h>
+#include <DataTypes/IDataType.h>
+#include <Interpreters/ExternalDictionariesLoader.h>
+
+namespace DB
+{
+
+namespace
+{
+
+class OptimizeGroupByInjectiveFunctionsVisitor : public InDepthQueryTreeVisitorWithContext<OptimizeGroupByInjectiveFunctionsVisitor>
+{
+    using Base = InDepthQueryTreeVisitorWithContext<OptimizeGroupByInjectiveFunctionsVisitor>;
+public:
+    explicit OptimizeGroupByInjectiveFunctionsVisitor(ContextPtr context)
+        : Base(std::move(context))
+    {}
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        if (!getSettings().optimize_injective_functions_in_group_by)
+            return;
+
+        /// Don't optimize injective functions when group_by_use_nulls=true,
+        /// because in this case we make initial group by keys Nullable
+        /// and eliminating some functions can cause issues with arguments Nullability
+        /// during their execution. See examples in https://github.com/ClickHouse/ClickHouse/pull/61567#issuecomment-2008181143
+        if (getSettings().group_by_use_nulls)
+            return;
+
+        auto * query = node->as<QueryNode>();
+        if (!query)
+            return;
+
+        if (!query->hasGroupBy())
+            return;
+
+        if (query->isGroupByWithCube() || query->isGroupByWithRollup())
+            return;
+
+        auto & group_by = query->getGroupBy().getNodes();
+        if (query->isGroupByWithGroupingSets())
+        {
+            for (auto & set : group_by)
+            {
+                auto & grouping_set = set->as<ListNode>()->getNodes();
+                optimizeGroupingSet(grouping_set);
+            }
+        }
+        else
+            optimizeGroupingSet(group_by);
+    }
+
+private:
+    void optimizeGroupingSet(QueryTreeNodes & grouping_set)
+    {
+        auto context = getContext();
+
+        QueryTreeNodes new_group_by_keys;
+        new_group_by_keys.reserve(grouping_set.size());
+        for (auto & group_by_elem : grouping_set)
+        {
+            std::queue<QueryTreeNodePtr> nodes_to_process;
+            nodes_to_process.push(group_by_elem);
+
+            while (!nodes_to_process.empty())
+            {
+                auto node_to_process = nodes_to_process.front();
+                nodes_to_process.pop();
+
+                auto const * function_node = node_to_process->as<FunctionNode>();
+                if (!function_node)
+                {
+                    // Constant aggregation keys are removed in PlannerExpressionAnalysis.cpp
+                    new_group_by_keys.push_back(node_to_process);
+                    continue;
+                }
+
+                // Aggregate functions are not allowed in GROUP BY clause
+                auto function = function_node->getFunctionOrThrow();
+                bool can_be_eliminated = function->isInjective(function_node->getArgumentColumns());
+
+                if (can_be_eliminated)
+                {
+                    for (auto const & argument : function_node->getArguments())
+                    {
+                        // We can skip constants here because aggregation key is already not a constant.
+                        if (argument->getNodeType() != QueryTreeNodeType::CONSTANT)
+                            nodes_to_process.push(argument);
+                    }
+                }
+                else
+                    new_group_by_keys.push_back(node_to_process);
+            }
+        }
+
+        grouping_set = std::move(new_group_by_keys);
+    }
+};
+
+}
+
+void OptimizeGroupByInjectiveFunctionsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
+{
+    OptimizeGroupByInjectiveFunctionsVisitor visitor(std::move(context));
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.h b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.h
new file mode 100644
index 00000000000..b3ba9033b92
--- /dev/null
+++ b/src/Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.h
@@ -0,0 +1,20 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+/* Eliminates injective functions in GROUP BY section.
+ */
+class OptimizeGroupByInjectiveFunctionsPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "OptimizeGroupByInjectiveFunctionsPass"; }
+
+    String getDescription() override { return "Replaces injective functions by it's arguments in GROUP BY section."; }
+
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
+};
+
+}
diff --git a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
index 875d0c8b5fb..b13af7f00ae 100644
--- a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
+++ b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.cpp
@@ -124,7 +124,7 @@ private:
 
 }
 
-void OptimizeRedundantFunctionsInOrderByPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void OptimizeRedundantFunctionsInOrderByPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     OptimizeRedundantFunctionsInOrderByVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.h b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.h
index 609a6360d27..4a63c78022b 100644
--- a/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.h
+++ b/src/Analyzer/Passes/OptimizeRedundantFunctionsInOrderByPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "If ORDER BY has argument x followed by f(x) transforms it to ORDER BY x."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.cpp b/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.cpp
index 3632c41028b..26ca5984b49 100644
--- a/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.cpp
+++ b/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.cpp
@@ -70,7 +70,7 @@ private:
 
 }
 
-void OrderByLimitByDuplicateEliminationPass::run(QueryTreeNodePtr query_tree_node, ContextPtr)
+void OrderByLimitByDuplicateEliminationPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr)
 {
     OrderByLimitByDuplicateEliminationVisitor visitor;
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.h b/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.h
index 11a025af5b9..de5e1898a4c 100644
--- a/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.h
+++ b/src/Analyzer/Passes/OrderByLimitByDuplicateEliminationPass.h
@@ -20,7 +20,7 @@ public:
 
     String getDescription() override { return "Remove duplicate columns from ORDER BY, LIMIT BY."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/OrderByTupleEliminationPass.cpp b/src/Analyzer/Passes/OrderByTupleEliminationPass.cpp
index f70ec27ba5d..7c106082124 100644
--- a/src/Analyzer/Passes/OrderByTupleEliminationPass.cpp
+++ b/src/Analyzer/Passes/OrderByTupleEliminationPass.cpp
@@ -50,7 +50,7 @@ public:
 
 }
 
-void OrderByTupleEliminationPass::run(QueryTreeNodePtr query_tree_node, ContextPtr)
+void OrderByTupleEliminationPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr)
 {
     OrderByTupleEliminationVisitor visitor;
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/OrderByTupleEliminationPass.h b/src/Analyzer/Passes/OrderByTupleEliminationPass.h
index 5665561e227..45c8a756795 100644
--- a/src/Analyzer/Passes/OrderByTupleEliminationPass.h
+++ b/src/Analyzer/Passes/OrderByTupleEliminationPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Remove tuple from ORDER BY."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/QueryAnalysisPass.cpp b/src/Analyzer/Passes/QueryAnalysisPass.cpp
index 4ad9581b5b6..ffbf008a6b3 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.cpp
+++ b/src/Analyzer/Passes/QueryAnalysisPass.cpp
@@ -3,6 +3,7 @@
 #include <Common/checkStackSize.h>
 #include <Common/NamePrompter.h>
 #include <Common/ProfileEvents.h>
+#include <Analyzer/FunctionSecretArgumentsFinderTreeNode.h>
 
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
@@ -47,6 +48,7 @@
 #include <Interpreters/SelectQueryOptions.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 
@@ -80,9 +82,12 @@
 #include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/Identifier.h>
 
+#include <boost/algorithm/string.hpp>
+
 namespace ProfileEvents
 {
     extern const Event ScalarSubqueriesGlobalCacheHit;
+    extern const Event ScalarSubqueriesLocalCacheHit;
     extern const Event ScalarSubqueriesCacheMiss;
 }
 
@@ -121,6 +126,7 @@ namespace ErrorCodes
     extern const int FUNCTION_CANNOT_HAVE_PARAMETERS;
     extern const int SYNTAX_ERROR;
     extern const int UNEXPECTED_EXPRESSION;
+    extern const int INVALID_IDENTIFIER;
 }
 
 /** Query analyzer implementation overview. Please check documentation in QueryAnalysisPass.h first.
@@ -423,6 +429,7 @@ struct TableExpressionData
     bool should_qualify_columns = true;
     NamesAndTypes column_names_and_types;
     ColumnNameToColumnNodeMap column_name_to_column_node;
+    std::unordered_set<std::string> subcolumn_names; /// Subset columns that are subcolumns of other columns
     std::unordered_set<std::string, StringTransparentHash, std::equal_to<>> column_identifier_first_parts;
 
     bool hasFullIdentifierName(IdentifierView identifier_view) const
@@ -702,7 +709,10 @@ struct IdentifierResolveScope
         {
             subquery_depth = parent_scope->subquery_depth;
             context = parent_scope->context;
+            projection_mask_map = parent_scope->projection_mask_map;
         }
+        else
+            projection_mask_map = std::make_shared<std::map<IQueryTreeNode::Hash, size_t>>();
 
         if (auto * union_node = scope_node->as<UnionNode>())
         {
@@ -714,6 +724,11 @@ struct IdentifierResolveScope
             group_by_use_nulls = context->getSettingsRef().group_by_use_nulls &&
                 (query_node->isGroupByWithGroupingSets() || query_node->isGroupByWithRollup() || query_node->isGroupByWithCube());
         }
+
+        if (context)
+            join_use_nulls = context->getSettingsRef().join_use_nulls;
+        else if (parent_scope)
+            join_use_nulls = parent_scope->join_use_nulls;
     }
 
     QueryTreeNodePtr scope_node;
@@ -761,13 +776,28 @@ struct IdentifierResolveScope
     /// Table expression node to data
     std::unordered_map<QueryTreeNodePtr, TableExpressionData> table_expression_node_to_data;
 
-    QueryTreeNodePtrWithHashSet nullable_group_by_keys;
+    QueryTreeNodePtrWithHashWithoutAliasSet nullable_group_by_keys;
+    /// Here we count the number of nullable GROUP BY keys we met resolving expression.
+    /// E.g. for a query `SELECT tuple(tuple(number)) FROM numbers(10) GROUP BY (number, tuple(number)) with cube`
+    /// both `number` and `tuple(number)` would be in nullable_group_by_keys.
+    /// But when we resolve `tuple(tuple(number))` we should figure out that `tuple(number)` is already a key,
+    /// and we should not convert `number` to nullable.
+    size_t found_nullable_group_by_key_in_scope = 0;
+
+    /** It's possible that after a JOIN, a column in the projection has a type different from the column in the source table.
+      * (For example, after join_use_nulls or USING column casted to supertype)
+      * However, the column in the projection still refers to the table as its source.
+      * This map is used to revert these columns back to their original columns in the source table.
+      */
+    QueryTreeNodePtrWithHashMap<QueryTreeNodePtr> join_columns_with_changed_types;
 
     /// 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;
+    /// Join retutns NULLs instead of default values
+    bool join_use_nulls = false;
 
     /// JOINs count
     size_t joins_count = 0;
@@ -780,6 +810,17 @@ struct IdentifierResolveScope
       */
     QueryTreeNodePtr expression_join_tree_node;
 
+    /// Node hash to mask id map
+    std::shared_ptr<std::map<IQueryTreeNode::Hash, size_t>> projection_mask_map;
+
+    struct ResolvedFunctionsCache
+    {
+        FunctionOverloadResolverPtr resolver;
+        FunctionBasePtr function_base;
+    };
+
+    std::map<IQueryTreeNode::Hash, ResolvedFunctionsCache> functions_cache;
+
     [[maybe_unused]] const IdentifierResolveScope * getNearestQueryScope() const
     {
         const IdentifierResolveScope * scope_to_check = this;
@@ -1064,7 +1105,9 @@ private:
 class QueryAnalyzer
 {
 public:
-    void resolve(QueryTreeNodePtr node, const QueryTreeNodePtr & table_expression, ContextPtr context)
+    explicit QueryAnalyzer(bool only_analyze_) : only_analyze(only_analyze_) {}
+
+    void resolve(QueryTreeNodePtr & node, const QueryTreeNodePtr & table_expression, ContextPtr context)
     {
         IdentifierResolveScope scope(node, nullptr /*parent_scope*/);
 
@@ -1207,11 +1250,13 @@ private:
 
     static void validateJoinTableExpressionWithoutAlias(const QueryTreeNodePtr & join_node, const QueryTreeNodePtr & table_expression_node, IdentifierResolveScope & scope);
 
+    static void checkDuplicateTableNamesOrAlias(const QueryTreeNodePtr & join_node, QueryTreeNodePtr & left_table_expr, QueryTreeNodePtr & right_table_expr, IdentifierResolveScope & scope);
+
     static std::pair<bool, UInt64> recursivelyCollectMaxOrdinaryExpressions(QueryTreeNodePtr & node, QueryTreeNodes & into);
 
     static void expandGroupByAll(QueryNode & query_tree_node_typed);
 
-    static void expandOrderByAll(QueryNode & query_tree_node_typed);
+    void expandOrderByAll(QueryNode & query_tree_node_typed, const Settings & settings);
 
     static std::string
     rewriteAggregateFunctionNameIfNeeded(const std::string & aggregate_function_name, NullsAction action, const ContextPtr & context);
@@ -1253,7 +1298,11 @@ private:
         return {};
     }
 
-    static void convertJoinedColumnTypeToNullIfNeeded(QueryTreeNodePtr & resolved_identifier, const JoinKind & join_kind, std::optional<JoinTableSide> resolved_side)
+    static QueryTreeNodePtr convertJoinedColumnTypeToNullIfNeeded(
+        const QueryTreeNodePtr & resolved_identifier,
+        const JoinKind & join_kind,
+        std::optional<JoinTableSide> resolved_side,
+        IdentifierResolveScope & scope)
     {
         if (resolved_identifier->getNodeType() == QueryTreeNodeType::COLUMN &&
             JoinCommon::canBecomeNullable(resolved_identifier->getResultType()) &&
@@ -1261,9 +1310,21 @@ private:
             (isLeft(join_kind) && resolved_side && *resolved_side == JoinTableSide::Right) ||
             (isRight(join_kind) && resolved_side && *resolved_side == JoinTableSide::Left)))
         {
-            auto & resolved_column = resolved_identifier->as<ColumnNode &>();
-            resolved_column.setColumnType(makeNullableOrLowCardinalityNullable(resolved_column.getColumnType()));
+            auto nullable_resolved_identifier = resolved_identifier->clone();
+            auto & resolved_column = nullable_resolved_identifier->as<ColumnNode &>();
+            auto new_result_type = makeNullableOrLowCardinalityNullable(resolved_column.getColumnType());
+            resolved_column.setColumnType(new_result_type);
+            if (resolved_column.hasExpression())
+            {
+                auto & resolved_expression = resolved_column.getExpression();
+                if (!resolved_expression->getResultType()->equals(*new_result_type))
+                    resolved_expression = buildCastFunction(resolved_expression, new_result_type, scope.context, true);
+            }
+            if (!nullable_resolved_identifier->isEqual(*resolved_identifier))
+                scope.join_columns_with_changed_types[nullable_resolved_identifier] = resolved_identifier;
+            return nullable_resolved_identifier;
         }
+        return nullptr;
     }
 
     /// Resolve identifier functions
@@ -1303,6 +1364,12 @@ private:
         const QueryTreeNodePtr & table_expression_node,
         IdentifierResolveScope & scope);
 
+    QueryTreeNodePtr matchArrayJoinSubcolumns(
+        const QueryTreeNodePtr & array_join_column_inner_expression,
+        const ColumnNode & array_join_column_expression_typed,
+        const QueryTreeNodePtr & resolved_expression,
+        IdentifierResolveScope & scope);
+
     QueryTreeNodePtr tryResolveExpressionFromArrayJoinExpressions(const QueryTreeNodePtr & resolved_expression,
         const QueryTreeNodePtr & table_expression_node,
         IdentifierResolveScope & scope);
@@ -1347,6 +1414,8 @@ private:
         const NamesAndTypes & matched_columns,
         const IdentifierResolveScope & scope);
 
+    void updateMatchedColumnsFromJoinUsing(QueryTreeNodesWithNames & result_matched_column_nodes_with_names, const QueryTreeNodePtr & source_table_expression, IdentifierResolveScope & scope);
+
     QueryTreeNodesWithNames resolveQualifiedMatcher(QueryTreeNodePtr & matcher_node, IdentifierResolveScope & scope);
 
     QueryTreeNodesWithNames resolveUnqualifiedMatcher(QueryTreeNodePtr & matcher_node, IdentifierResolveScope & scope);
@@ -1368,6 +1437,8 @@ private:
 
     ProjectionNames resolveSortNodeList(QueryTreeNodePtr & sort_node_list, IdentifierResolveScope & scope);
 
+    void resolveGroupByNode(QueryNode & query_node_typed, IdentifierResolveScope & scope);
+
     void resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpolate_node_list, IdentifierResolveScope & scope);
 
     void resolveWindowNodeList(QueryTreeNodePtr & window_node_list, IdentifierResolveScope & scope);
@@ -1393,6 +1464,8 @@ private:
     /// Lambdas that are currently in resolve process
     std::unordered_set<IQueryTreeNode *> lambdas_in_resolve_process;
 
+    std::unordered_set<std::string_view> cte_in_resolve_process;
+
     /// Function name to user defined lambda map
     std::unordered_map<std::string, QueryTreeNodePtr> function_name_to_user_defined_lambda;
 
@@ -1412,8 +1485,10 @@ private:
     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;
+    std::unordered_map<QueryTreeNodePtrWithHash, Block> scalar_subquery_to_scalar_value_local;
+    std::unordered_map<QueryTreeNodePtrWithHash, Block> scalar_subquery_to_scalar_value_global;
 
+    const bool only_analyze;
 };
 
 /// Utility functions implementation
@@ -1865,8 +1940,7 @@ std::vector<String> QueryAnalyzer::collectIdentifierTypoHints(const Identifier &
     for (const auto & valid_identifier : valid_identifiers)
         prompting_strings.push_back(valid_identifier.getFullName());
 
-    NamePrompter<1> prompter;
-    return prompter.getHints(unresolved_identifier.getFullName(), prompting_strings);
+    return NamePrompter<1>::getHints(unresolved_identifier.getFullName(), prompting_strings);
 }
 
 /** Wrap expression node in tuple element function calls for nested paths.
@@ -1918,6 +1992,24 @@ QueryTreeNodePtr QueryAnalyzer::tryGetLambdaFromSQLUserDefinedFunctions(const st
     return result_node;
 }
 
+bool subtreeHasViewSource(const IQueryTreeNode * node, const Context & context)
+{
+    if (!node)
+        return false;
+
+    if (const auto * table_node = node->as<TableNode>())
+    {
+        if (table_node->getStorageID().getFullNameNotQuoted() == context.getViewSource()->getStorageID().getFullNameNotQuoted())
+            return true;
+    }
+
+    for (const auto & child : node->getChildren())
+        if (subtreeHasViewSource(child.get(), context))
+            return true;
+
+    return false;
+}
+
 /// Evaluate scalar subquery and perform constant folding if scalar subquery does not have constant value
 void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, IdentifierResolveScope & scope)
 {
@@ -1937,12 +2029,26 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
     node_without_alias->removeAlias();
 
     QueryTreeNodePtrWithHash node_with_hash(node_without_alias);
-    auto scalar_value_it = scalar_subquery_to_scalar_value.find(node_with_hash);
+    auto str_hash = DB::toString(node_with_hash.hash);
 
-    if (scalar_value_it != scalar_subquery_to_scalar_value.end())
+    bool can_use_global_scalars = !only_analyze && !(context->getViewSource() && subtreeHasViewSource(node_without_alias.get(), *context));
+
+    auto & scalars_cache = can_use_global_scalars ? scalar_subquery_to_scalar_value_global : scalar_subquery_to_scalar_value_local;
+
+    if (scalars_cache.contains(node_with_hash))
     {
+        if (can_use_global_scalars)
+            ProfileEvents::increment(ProfileEvents::ScalarSubqueriesGlobalCacheHit);
+        else
+            ProfileEvents::increment(ProfileEvents::ScalarSubqueriesLocalCacheHit);
+
+        scalar_block = scalars_cache.at(node_with_hash);
+    }
+    else if (context->hasQueryContext() && can_use_global_scalars && context->getQueryContext()->hasScalar(str_hash))
+    {
+        scalar_block = context->getQueryContext()->getScalar(str_hash);
+        scalar_subquery_to_scalar_value_global.emplace(node_with_hash, scalar_block);
         ProfileEvents::increment(ProfileEvents::ScalarSubqueriesGlobalCacheHit);
-        scalar_block = scalar_value_it->second;
     }
     else
     {
@@ -1958,87 +2064,106 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
         subquery_context->setSetting("use_structure_from_insertion_table_in_table_functions", false);
 
         auto options = SelectQueryOptions(QueryProcessingStage::Complete, scope.subquery_depth, true /*is_subquery*/);
+        options.only_analyze = only_analyze;
         auto interpreter = std::make_unique<InterpreterSelectQueryAnalyzer>(node->toAST(), subquery_context, subquery_context->getViewSource(), options);
 
-        auto io = interpreter->execute();
-
-        PullingAsyncPipelineExecutor executor(io.pipeline);
-        io.pipeline.setProgressCallback(context->getProgressCallback());
-        io.pipeline.setProcessListElement(context->getProcessListElement());
-
-        Block block;
-
-        while (block.rows() == 0 && executor.pull(block))
+        if (only_analyze)
         {
-        }
-
-        if (block.rows() == 0)
-        {
-            auto types = interpreter->getSampleBlock().getDataTypes();
-            if (types.size() != 1)
-                types = {std::make_shared<DataTypeTuple>(types)};
-
-            auto & type = types[0];
-            if (!type->isNullable())
+            /// If query is only analyzed, then constants are not correct.
+            scalar_block = interpreter->getSampleBlock();
+            for (auto & column : scalar_block)
             {
-                if (!type->canBeInsideNullable())
-                    throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY,
-                        "Scalar subquery returned empty result of type {} which cannot be Nullable",
-                        type->getName());
-
-                type = makeNullable(type);
+                if (column.column->empty())
+                {
+                    auto mut_col = column.column->cloneEmpty();
+                    mut_col->insertDefault();
+                    column.column = std::move(mut_col);
+                }
             }
-
-            auto scalar_column = type->createColumn();
-            scalar_column->insert(Null());
-            scalar_block.insert({std::move(scalar_column), type, "null"});
         }
         else
         {
-            if (block.rows() != 1)
-                throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
+            auto io = interpreter->execute();
+            PullingAsyncPipelineExecutor executor(io.pipeline);
+            io.pipeline.setProgressCallback(context->getProgressCallback());
+            io.pipeline.setProcessListElement(context->getProcessListElement());
 
-            Block tmp_block;
-            while (tmp_block.rows() == 0 && executor.pull(tmp_block))
+            Block block;
+
+            while (block.rows() == 0 && executor.pull(block))
             {
             }
 
-            if (tmp_block.rows() != 0)
-                throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
-
-            block = materializeBlock(block);
-            size_t columns = block.columns();
-
-            if (columns == 1)
+            if (block.rows() == 0)
             {
-                auto & column = block.getByPosition(0);
-                /// Here we wrap type to nullable if we can.
-                /// It is needed cause if subquery return no rows, it's result will be Null.
-                /// In case of many columns, do not check it cause tuple can't be nullable.
-                if (!column.type->isNullable() && column.type->canBeInsideNullable())
+                auto types = interpreter->getSampleBlock().getDataTypes();
+                if (types.size() != 1)
+                    types = {std::make_shared<DataTypeTuple>(types)};
+
+                auto & type = types[0];
+                if (!type->isNullable())
                 {
-                    column.type = makeNullable(column.type);
-                    column.column = makeNullable(column.column);
+                    if (!type->canBeInsideNullable())
+                        throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY,
+                            "Scalar subquery returned empty result of type {} which cannot be Nullable",
+                            type->getName());
+
+                    type = makeNullable(type);
                 }
 
-                scalar_block = block;
+                auto scalar_column = type->createColumn();
+                scalar_column->insert(Null());
+                scalar_block.insert({std::move(scalar_column), type, "null"});
             }
             else
             {
-                /** Make unique column names for tuple.
-                  *
-                  * Example: SELECT (SELECT 2 AS x, x)
-                  */
-                makeUniqueColumnNamesInBlock(block);
+                if (block.rows() != 1)
+                    throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
 
-                scalar_block.insert({
-                    ColumnTuple::create(block.getColumns()),
-                    std::make_shared<DataTypeTuple>(block.getDataTypes(), block.getNames()),
-                    "tuple"});
+                Block tmp_block;
+                while (tmp_block.rows() == 0 && executor.pull(tmp_block))
+                {
+                }
+
+                if (tmp_block.rows() != 0)
+                    throw Exception(ErrorCodes::INCORRECT_RESULT_OF_SCALAR_SUBQUERY, "Scalar subquery returned more than one row");
+
+                block = materializeBlock(block);
+                size_t columns = block.columns();
+
+                if (columns == 1)
+                {
+                    auto & column = block.getByPosition(0);
+                    /// Here we wrap type to nullable if we can.
+                    /// It is needed cause if subquery return no rows, it's result will be Null.
+                    /// In case of many columns, do not check it cause tuple can't be nullable.
+                    if (!column.type->isNullable() && column.type->canBeInsideNullable())
+                    {
+                        column.type = makeNullable(column.type);
+                        column.column = makeNullable(column.column);
+                    }
+
+                    scalar_block = block;
+                }
+                else
+                {
+                    /** Make unique column names for tuple.
+                    *
+                    * Example: SELECT (SELECT 2 AS x, x)
+                    */
+                    makeUniqueColumnNamesInBlock(block);
+
+                    scalar_block.insert({
+                        ColumnTuple::create(block.getColumns()),
+                        std::make_shared<DataTypeTuple>(block.getDataTypes(), block.getNames()),
+                        "tuple"});
+                }
             }
         }
 
-        scalar_subquery_to_scalar_value.emplace(node_with_hash, scalar_block);
+        scalars_cache.emplace(node_with_hash, scalar_block);
+        if (can_use_global_scalars && context->hasQueryContext())
+            context->getQueryContext()->addScalar(str_hash, scalar_block);
     }
 
     const auto & scalar_column_with_type = scalar_block.safeGetByPosition(0);
@@ -2058,10 +2183,13 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
         !nearest_query_scope)
     {
         auto constant_value = std::make_shared<ConstantValue>(std::move(scalar_value), scalar_type);
-        auto constant_node = std::make_shared<ConstantNode>(std::move(constant_value), node);
+        auto constant_node = std::make_shared<ConstantNode>(constant_value, node);
 
         if (constant_node->getValue().isNull())
+        {
             node = buildCastFunction(constant_node, constant_node->getResultType(), context);
+            node = std::make_shared<ConstantNode>(std::move(constant_value), node);
+        }
         else
             node = std::move(constant_node);
 
@@ -2071,7 +2199,7 @@ void QueryAnalyzer::evaluateScalarSubqueryIfNeeded(QueryTreeNodePtr & node, Iden
     auto & nearest_query_scope_query_node = nearest_query_scope->scope_node->as<QueryNode &>();
     auto & mutable_context = nearest_query_scope_query_node.getMutableContext();
 
-    auto scalar_query_hash_string = DB::toString(node_with_hash.hash);
+    auto scalar_query_hash_string = DB::toString(node_with_hash.hash) + (only_analyze ? "_analyze" : "");
 
     if (mutable_context->hasQueryContext())
         mutable_context->getQueryContext()->addScalar(scalar_query_hash_string, scalar_block);
@@ -2157,21 +2285,45 @@ void QueryAnalyzer::replaceNodesWithPositionalArguments(QueryTreeNodePtr & node_
             node_to_replace = &sort_node->getExpression();
 
         auto * constant_node = (*node_to_replace)->as<ConstantNode>();
-        if (!constant_node || constant_node->getValue().getType() != Field::Types::UInt64)
+
+        if (!constant_node
+            || (constant_node->getValue().getType() != Field::Types::UInt64 && constant_node->getValue().getType() != Field::Types::Int64))
             continue;
 
-        UInt64 positional_argument_number = constant_node->getValue().get<UInt64>();
-        if (positional_argument_number == 0 || positional_argument_number > projection_nodes.size())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+        UInt64 pos;
+        if (constant_node->getValue().getType() == Field::Types::UInt64)
+        {
+            pos = constant_node->getValue().get<UInt64>();
+        }
+        else // Int64
+        {
+            auto value = constant_node->getValue().get<Int64>();
+            if (value > 0)
+                pos = value;
+            else
+            {
+                if (static_cast<size_t>(std::abs(value)) > projection_nodes.size())
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Negative positional argument number {} is out of bounds. Expected in range [-{}, -1]. In scope {}",
+                        value,
+                        projection_nodes.size(),
+                        scope.scope_node->formatASTForErrorMessage());
+                pos = projection_nodes.size() + value + 1;
+            }
+        }
+
+        if (!pos || pos > projection_nodes.size())
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
                 "Positional argument number {} is out of bounds. Expected in range [1, {}]. In scope {}",
-                positional_argument_number,
+                pos,
                 projection_nodes.size(),
                 scope.scope_node->formatASTForErrorMessage());
 
-        --positional_argument_number;
-        *node_to_replace = projection_nodes[positional_argument_number]->clone();
-        if (auto it = resolved_expressions.find(projection_nodes[positional_argument_number]);
-            it != resolved_expressions.end())
+        --pos;
+        *node_to_replace = projection_nodes[pos]->clone();
+        if (auto it = resolved_expressions.find(projection_nodes[pos]); it != resolved_expressions.end())
         {
             resolved_expressions[*node_to_replace] = it->second;
         }
@@ -2243,12 +2395,16 @@ void QueryAnalyzer::validateJoinTableExpressionWithoutAlias(const QueryTreeNodeP
     if (table_expression_has_alias)
         return;
 
+    if (join_node->as<JoinNode &>().getKind() == JoinKind::Paste)
+        return;
+
     auto * query_node = table_expression_node->as<QueryNode>();
     auto * union_node = table_expression_node->as<UnionNode>();
     if ((query_node && !query_node->getCTEName().empty()) || (union_node && !union_node->getCTEName().empty()))
         return;
 
     auto table_expression_node_type = table_expression_node->getNodeType();
+
     if (table_expression_node_type == QueryTreeNodeType::TABLE_FUNCTION ||
         table_expression_node_type == QueryTreeNodeType::QUERY ||
         table_expression_node_type == QueryTreeNodeType::UNION)
@@ -2314,15 +2470,22 @@ std::pair<bool, UInt64> QueryAnalyzer::recursivelyCollectMaxOrdinaryExpressions(
   */
 void QueryAnalyzer::expandGroupByAll(QueryNode & query_tree_node_typed)
 {
+    if (!query_tree_node_typed.isGroupByAll())
+        return;
+
     auto & group_by_nodes = query_tree_node_typed.getGroupBy().getNodes();
     auto & projection_list = query_tree_node_typed.getProjection();
 
     for (auto & node : projection_list.getNodes())
         recursivelyCollectMaxOrdinaryExpressions(node, group_by_nodes);
+    query_tree_node_typed.setIsGroupByAll(false);
 }
 
-void QueryAnalyzer::expandOrderByAll(QueryNode & query_tree_node_typed)
+void QueryAnalyzer::expandOrderByAll(QueryNode & query_tree_node_typed, const Settings & settings)
 {
+    if (!settings.enable_order_by_all || !query_tree_node_typed.isOrderByAll())
+        return;
+
     auto * all_node = query_tree_node_typed.getOrderBy().getNodes()[0]->as<SortNode>();
     if (!all_node)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Select analyze for not sort node.");
@@ -2333,21 +2496,32 @@ void QueryAnalyzer::expandOrderByAll(QueryNode & query_tree_node_typed)
 
     for (auto & node : projection_nodes)
     {
-        if (auto * identifier_node = node->as<IdentifierNode>(); identifier_node != nullptr)
-            if (Poco::toUpper(identifier_node->getIdentifier().getFullName()) == "ALL" || Poco::toUpper(identifier_node->getAlias()) == "ALL")
-                throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION,
-                    "Cannot use ORDER BY ALL to sort a column with name 'all', please disable setting `enable_order_by_all` and try again");
+        /// Detect and reject ambiguous statements:
+        /// E.g. for a table with columns "all", "a", "b":
+        /// - SELECT all, a, b ORDER BY all;        -- should we sort by all columns in SELECT or by column "all"?
+        /// - SELECT a, b AS all ORDER BY all;      -- like before but "all" as alias
+        /// - SELECT func(...) AS all ORDER BY all; -- like before but "all" as function
+        /// - SELECT a, b ORDER BY all;             -- tricky in other way: does the user want to sort by columns in SELECT clause or by not SELECTed column "all"?
 
-        if (auto * function_node = node->as<FunctionNode>(); function_node != nullptr)
-            if (Poco::toUpper(function_node->getAlias()) == "ALL")
+        auto resolved_expression_it = resolved_expressions.find(node);
+        if (resolved_expression_it != resolved_expressions.end())
+        {
+            auto projection_names = resolved_expression_it->second;
+            if (projection_names.size() != 1)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Expression nodes list expected 1 projection names. Actual {}",
+                                projection_names.size());
+            if (boost::iequals(projection_names[0], "all"))
                 throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION,
                                 "Cannot use ORDER BY ALL to sort a column with name 'all', please disable setting `enable_order_by_all` and try again");
+        }
 
         auto sort_node = std::make_shared<SortNode>(node, all_node->getSortDirection(), all_node->getNullsSortDirection());
         list_node->getNodes().push_back(sort_node);
     }
 
     query_tree_node_typed.getOrderByNode() = list_node;
+    query_tree_node_typed.setIsOrderByAll(false);
 }
 
 std::string QueryAnalyzer::rewriteAggregateFunctionNameIfNeeded(
@@ -2423,7 +2597,7 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveTableIdentifierFromDatabaseCatalog(con
 {
     size_t parts_size = table_identifier.getPartsSize();
     if (parts_size < 1 || parts_size > 2)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+        throw Exception(ErrorCodes::INVALID_IDENTIFIER,
             "Expected table identifier to contain 1 or 2 parts. Actual '{}'",
             table_identifier.getFullName());
 
@@ -2739,7 +2913,13 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromAliases(const Identifier
     {
         if (identifier_lookup.isExpressionLookup())
         {
-            return tryResolveIdentifierFromCompoundExpression(identifier_lookup.identifier, 1 /*identifier_bind_size*/, it->second, {}, scope);
+            return tryResolveIdentifierFromCompoundExpression(
+                identifier_lookup.identifier,
+                1 /*identifier_bind_size*/,
+                it->second,
+                {} /* compound_expression_source */,
+                scope,
+                identifier_resolve_settings.allow_to_check_join_tree /* can_be_not_found */);
         }
         else if (identifier_lookup.isFunctionLookup() || identifier_lookup.isTableExpressionLookup())
         {
@@ -2820,7 +3000,7 @@ bool QueryAnalyzer::tryBindIdentifierToTableExpression(const IdentifierLookup &
     {
         size_t parts_size = identifier_lookup.identifier.getPartsSize();
         if (parts_size != 1 && parts_size != 2)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            throw Exception(ErrorCodes::INVALID_IDENTIFIER,
                 "Expected identifier '{}' to contain 1 or 2 parts to be resolved as table expression. In scope {}",
                 identifier_lookup.identifier.getFullName(),
                 table_expression_node->formatASTForErrorMessage());
@@ -2893,8 +3073,23 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromStorage(
     QueryTreeNodePtr result_expression;
     bool match_full_identifier = false;
 
-    auto it = table_expression_data.column_name_to_column_node.find(identifier_without_column_qualifier.getFullName());
-    if (it != table_expression_data.column_name_to_column_node.end())
+    const auto & identifier_full_name = identifier_without_column_qualifier.getFullName();
+    auto it = table_expression_data.column_name_to_column_node.find(identifier_full_name);
+    bool can_resolve_directly_from_storage = it != table_expression_data.column_name_to_column_node.end();
+    if (can_resolve_directly_from_storage && table_expression_data.subcolumn_names.contains(identifier_full_name))
+    {
+        /** In the case when we have an ARRAY JOIN, we should not resolve subcolumns directly from storage.
+          * For example, consider the following SQL query:
+          * SELECT ProfileEvents.Values FROM system.query_log ARRAY JOIN ProfileEvents
+          * In this case, ProfileEvents.Values should also be array joined, not directly resolved from storage.
+          */
+        auto * nearest_query_scope = scope.getNearestQueryScope();
+        auto * nearest_query_scope_query_node = nearest_query_scope ? nearest_query_scope->scope_node->as<QueryNode>() : nullptr;
+        if (nearest_query_scope_query_node && nearest_query_scope_query_node->getJoinTree()->getNodeType() == QueryTreeNodeType::ARRAY_JOIN)
+            can_resolve_directly_from_storage = false;
+    }
+
+    if (can_resolve_directly_from_storage)
     {
         match_full_identifier = true;
         result_expression = it->second;
@@ -2979,6 +3174,8 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromStorage(
 
     if (!result_expression)
     {
+        if (can_be_not_found)
+            return {};
         std::unordered_set<Identifier> valid_identifiers;
         collectTableExpressionValidIdentifiersForTypoCorrection(identifier,
             table_expression_node,
@@ -3048,7 +3245,7 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromTableExpression(const Id
     {
         size_t parts_size = identifier_lookup.identifier.getPartsSize();
         if (parts_size != 1 && parts_size != 2)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+            throw Exception(ErrorCodes::INVALID_IDENTIFIER,
                 "Expected identifier '{}' to contain 1 or 2 parts to be resolved as table expression. In scope {}",
                 identifier_lookup.identifier.getFullName(),
                 table_expression_node->formatASTForErrorMessage());
@@ -3104,6 +3301,104 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromTableExpression(const Id
     return {};
 }
 
+QueryTreeNodePtr checkIsMissedObjectJSONSubcolumn(const QueryTreeNodePtr & left_resolved_identifier,
+                                                  const QueryTreeNodePtr & right_resolved_identifier)
+{
+    if (left_resolved_identifier && right_resolved_identifier && left_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT
+        && right_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
+    {
+        auto & left_resolved_column = left_resolved_identifier->as<ConstantNode &>();
+        auto & right_resolved_column = right_resolved_identifier->as<ConstantNode &>();
+        if (left_resolved_column.getValueStringRepresentation() == "NULL" && right_resolved_column.getValueStringRepresentation() == "NULL")
+            return left_resolved_identifier;
+    }
+    else if (left_resolved_identifier && left_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
+    {
+        auto & left_resolved_column = left_resolved_identifier->as<ConstantNode &>();
+        if (left_resolved_column.getValueStringRepresentation() == "NULL")
+            return left_resolved_identifier;
+    }
+    else if (right_resolved_identifier && right_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
+    {
+        auto & right_resolved_column = right_resolved_identifier->as<ConstantNode &>();
+        if (right_resolved_column.getValueStringRepresentation() == "NULL")
+            return right_resolved_identifier;
+    }
+    return {};
+}
+
+/// Used to replace columns that changed type because of JOIN to their original type
+class ReplaceColumnsVisitor : public InDepthQueryTreeVisitor<ReplaceColumnsVisitor>
+{
+public:
+    explicit ReplaceColumnsVisitor(const QueryTreeNodePtrWithHashMap<QueryTreeNodePtr> & replacement_map_, const ContextPtr & context_)
+        : replacement_map(replacement_map_)
+        , context(context_)
+    {}
+
+    /// Apply replacement transitively, because column may change it's type twice, one to have a supertype and then because of `joun_use_nulls`
+    static QueryTreeNodePtr findTransitiveReplacement(QueryTreeNodePtr node, const QueryTreeNodePtrWithHashMap<QueryTreeNodePtr> & replacement_map_)
+    {
+        auto it = replacement_map_.find(node);
+        QueryTreeNodePtr result_node = nullptr;
+        for (; it != replacement_map_.end(); it = replacement_map_.find(result_node))
+        {
+            if (result_node && result_node->isEqual(*it->second))
+            {
+                Strings map_dump;
+                for (const auto & [k, v]: replacement_map_)
+                    map_dump.push_back(fmt::format("{} -> {} (is_equals: {}, is_same: {})",
+                        k.node->dumpTree(), v->dumpTree(), k.node->isEqual(*v), k.node == v));
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Infinite loop in query tree replacement map: {}", fmt::join(map_dump, "; "));
+            }
+            chassert(it->second);
+
+            result_node = it->second;
+        }
+        return result_node;
+    }
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        if (auto replacement_node = findTransitiveReplacement(node, replacement_map))
+            node = replacement_node;
+
+        if (auto * function_node = node->as<FunctionNode>(); function_node && function_node->isResolved())
+            rerunFunctionResolve(function_node, context);
+    }
+
+    /// We want to re-run resolve for function _after_ its arguments are replaced
+    bool shouldTraverseTopToBottom() const { return false; }
+
+    bool needChildVisit(QueryTreeNodePtr & /* parent */, QueryTreeNodePtr & child)
+    {
+        /// Visit only expressions, but not subqueries
+        return child->getNodeType() == QueryTreeNodeType::IDENTIFIER
+            || child->getNodeType() == QueryTreeNodeType::LIST
+            || child->getNodeType() == QueryTreeNodeType::FUNCTION
+            || child->getNodeType() == QueryTreeNodeType::COLUMN;
+    }
+
+private:
+    const QueryTreeNodePtrWithHashMap<QueryTreeNodePtr> & replacement_map;
+    const ContextPtr & context;
+};
+
+/// Compare resolved identifiers considering columns that become nullable after JOIN
+bool resolvedIdenfiersFromJoinAreEquals(
+    const QueryTreeNodePtr & left_resolved_identifier,
+    const QueryTreeNodePtr & right_resolved_identifier,
+    const IdentifierResolveScope & scope)
+{
+    auto left_original_node = ReplaceColumnsVisitor::findTransitiveReplacement(left_resolved_identifier, scope.join_columns_with_changed_types);
+    const auto & left_resolved_to_compare = left_original_node ? left_original_node : left_resolved_identifier;
+
+    auto right_original_node = ReplaceColumnsVisitor::findTransitiveReplacement(right_resolved_identifier, scope.join_columns_with_changed_types);
+    const auto & right_resolved_to_compare = right_original_node ? right_original_node : right_resolved_identifier;
+
+    return left_resolved_to_compare->isEqual(*right_resolved_to_compare, IQueryTreeNode::CompareOptions{.compare_aliases = false});
+}
+
 QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLookup & identifier_lookup,
     const QueryTreeNodePtr & table_expression_node,
     IdentifierResolveScope & scope)
@@ -3139,45 +3434,93 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLoo
         }
     }
 
+    auto check_nested_column_not_in_using = [&join_using_column_name_to_column_node, &identifier_lookup](const QueryTreeNodePtr & node)
+    {
+        /** tldr: When an identifier is resolved into the function `nested` or `getSubcolumn`, and
+          * some column in its argument is in the USING list and its type has to be updated, we throw an error to avoid overcomplication.
+          *
+          * Identifiers can be resolved into functions in case of nested or subcolumns.
+          * For example `t.t.t` can be resolved into `getSubcolumn(t, 't.t')` function in case of `t` is `Tuple`.
+          * So, `t` in USING list is resolved from JOIN itself and has supertype of columns from left and right table.
+          * But `t` in `getSubcolumn` argument is still resolved from table and we need to update its type.
+          *
+          * Example:
+          *
+          * SELECT t.t FROM (
+          *     SELECT ((1, 's'), 's') :: Tuple(t Tuple(t UInt32, s1 String), s1 String) as t
+          * ) AS a FULL JOIN (
+          *     SELECT ((1, 's'), 's') :: Tuple(t Tuple(t Int32, s2 String), s2 String) as t
+          * ) AS b USING t;
+          *
+          * Result type of `t` is `Tuple(Tuple(Int64, String), String)` (different type and no names for subcolumns),
+          * so it may be tricky to have a correct type for `t.t` that is resolved into getSubcolumn(t, 't').
+          *
+          * It can be more complicated in case of Nested subcolumns, in that case in query:
+          *     SELECT t FROM ... JOIN ... USING (t.t)
+          * Here, `t` is resolved into function `nested(['t', 's'], t.t, t.s) so, `t.t` should be from JOIN and `t.s` should be from table.
+          *
+          * Updating type accordingly is pretty complicated, so just forbid such cases.
+          *
+          * While it still may work for storages that support selecting subcolumns directly without `getSubcolumn` function:
+          *     SELECT t, t.t, toTypeName(t), toTypeName(t.t) FROM t1 AS a FULL JOIN t2 AS b USING t.t;
+          * We just support it as a best-effort: `t` will have original type from table, but `t.t` will have super-type from JOIN.
+          * Probably it's good to prohibit such cases as well, but it's not clear how to check it in general case.
+          */
+        if (node->getNodeType() != QueryTreeNodeType::FUNCTION)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected node type {}, expected function node", node->getNodeType());
+
+        const auto & function_argument_nodes = node->as<FunctionNode &>().getArguments().getNodes();
+        for (const auto & argument_node : function_argument_nodes)
+        {
+            if (argument_node->getNodeType() == QueryTreeNodeType::COLUMN)
+            {
+                const auto & column_name = argument_node->as<ColumnNode &>().getColumnName();
+                if (join_using_column_name_to_column_node.contains(column_name))
+                    throw Exception(ErrorCodes::AMBIGUOUS_IDENTIFIER,
+                        "Cannot select subcolumn for identifier '{}' while joining using column '{}'",
+                            identifier_lookup.identifier, column_name);
+            }
+            else if (argument_node->getNodeType() == QueryTreeNodeType::CONSTANT)
+            {
+                continue;
+            }
+            else
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected node type {} for argument node in {}",
+                    argument_node->getNodeType(), node->formatASTForErrorMessage());
+            }
+        }
+    };
+
     std::optional<JoinTableSide> resolved_side;
     QueryTreeNodePtr resolved_identifier;
 
     JoinKind join_kind = from_join_node.getKind();
-    bool join_use_nulls = scope.context->getSettingsRef().join_use_nulls;
 
     /// If columns from left or right table were missed Object(Nullable('json')) subcolumns, they will be replaced
     /// to ConstantNode(NULL), which can't be cast to ColumnNode, so we resolve it here.
-    if (left_resolved_identifier && right_resolved_identifier && left_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT
-        && right_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
-    {
-        auto & left_resolved_column = left_resolved_identifier->as<ConstantNode &>();
-        auto & right_resolved_column = right_resolved_identifier->as<ConstantNode &>();
-        if (left_resolved_column.getValueStringRepresentation() == "NULL" && right_resolved_column.getValueStringRepresentation() == "NULL")
-            return left_resolved_identifier;
-    }
-    else if (left_resolved_identifier && left_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
-    {
-        resolved_side = JoinTableSide::Left;
-        auto & left_resolved_column = left_resolved_identifier->as<ConstantNode &>();
-        if (left_resolved_column.getValueStringRepresentation() == "NULL")
-            return left_resolved_identifier;
-    }
-    else if (right_resolved_identifier && right_resolved_identifier->getNodeType() == QueryTreeNodeType::CONSTANT)
-    {
-        resolved_side = JoinTableSide::Right;
-        auto & right_resolved_column = right_resolved_identifier->as<ConstantNode &>();
-        if (right_resolved_column.getValueStringRepresentation() == "NULL")
-            return right_resolved_identifier;
-    }
+    if (auto missed_subcolumn_identifier = checkIsMissedObjectJSONSubcolumn(left_resolved_identifier, right_resolved_identifier))
+        return missed_subcolumn_identifier;
 
     if (left_resolved_identifier && right_resolved_identifier)
     {
-        auto & left_resolved_column = left_resolved_identifier->as<ColumnNode &>();
-        auto & right_resolved_column = right_resolved_identifier->as<ColumnNode &>();
+        auto using_column_node_it = join_using_column_name_to_column_node.end();
+        if (left_resolved_identifier->getNodeType() == QueryTreeNodeType::COLUMN && right_resolved_identifier->getNodeType() == QueryTreeNodeType::COLUMN)
+        {
+            auto & left_resolved_column = left_resolved_identifier->as<ColumnNode &>();
+            auto & right_resolved_column = right_resolved_identifier->as<ColumnNode &>();
+            if (left_resolved_column.getColumnName() == right_resolved_column.getColumnName())
+                using_column_node_it = join_using_column_name_to_column_node.find(left_resolved_column.getColumnName());
+        }
+        else
+        {
+            if (left_resolved_identifier->getNodeType() != QueryTreeNodeType::COLUMN)
+                check_nested_column_not_in_using(left_resolved_identifier);
+            if (right_resolved_identifier->getNodeType() != QueryTreeNodeType::COLUMN)
+                check_nested_column_not_in_using(right_resolved_identifier);
+        }
 
-        auto using_column_node_it = join_using_column_name_to_column_node.find(left_resolved_column.getColumnName());
-        if (using_column_node_it != join_using_column_name_to_column_node.end()
-            && left_resolved_column.getColumnName() == right_resolved_column.getColumnName())
+        if (using_column_node_it != join_using_column_name_to_column_node.end())
         {
             JoinTableSide using_column_inner_column_table_side = isRight(join_kind) ? JoinTableSide::Right : JoinTableSide::Left;
             auto & using_column_node = using_column_node_it->second->as<ColumnNode &>();
@@ -3190,9 +3533,13 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLoo
             auto & result_column = result_column_node->as<ColumnNode &>();
             result_column.setColumnType(using_column_node.getColumnType());
 
+            const auto & join_using_left_column = using_expression_list.getNodes().at(0);
+            if (!result_column_node->isEqual(*join_using_left_column))
+                scope.join_columns_with_changed_types[result_column_node] = join_using_left_column;
+
             resolved_identifier = std::move(result_column_node);
         }
-        else if (left_resolved_identifier->isEqual(*right_resolved_identifier, IQueryTreeNode::CompareOptions{.compare_aliases = false}))
+        else if (resolvedIdenfiersFromJoinAreEquals(left_resolved_identifier, right_resolved_identifier, scope))
         {
             const auto & identifier_path_part = identifier_lookup.identifier.front();
             auto * left_resolved_identifier_column = left_resolved_identifier->as<ColumnNode>();
@@ -3252,54 +3599,136 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveIdentifierFromJoin(const IdentifierLoo
     else if (left_resolved_identifier)
     {
         resolved_side = JoinTableSide::Left;
-        auto & left_resolved_column = left_resolved_identifier->as<ColumnNode &>();
-
         resolved_identifier = left_resolved_identifier;
 
-        auto using_column_node_it = join_using_column_name_to_column_node.find(left_resolved_column.getColumnName());
-        if (using_column_node_it != join_using_column_name_to_column_node.end() &&
-            !using_column_node_it->second->getColumnType()->equals(*left_resolved_column.getColumnType()))
+        if (left_resolved_identifier->getNodeType() != QueryTreeNodeType::COLUMN)
         {
-            auto left_resolved_column_clone = std::static_pointer_cast<ColumnNode>(left_resolved_column.clone());
-            left_resolved_column_clone->setColumnType(using_column_node_it->second->getColumnType());
-            resolved_identifier = std::move(left_resolved_column_clone);
+            check_nested_column_not_in_using(left_resolved_identifier);
         }
         else
         {
-            resolved_identifier = left_resolved_identifier;
+            auto & left_resolved_column = left_resolved_identifier->as<ColumnNode &>();
+            auto using_column_node_it = join_using_column_name_to_column_node.find(left_resolved_column.getColumnName());
+            if (using_column_node_it != join_using_column_name_to_column_node.end() &&
+                !using_column_node_it->second->getColumnType()->equals(*left_resolved_column.getColumnType()))
+            {
+                auto left_resolved_column_clone = std::static_pointer_cast<ColumnNode>(left_resolved_column.clone());
+                left_resolved_column_clone->setColumnType(using_column_node_it->second->getColumnType());
+                resolved_identifier = std::move(left_resolved_column_clone);
+
+                if (!resolved_identifier->isEqual(*using_column_node_it->second))
+                    scope.join_columns_with_changed_types[resolved_identifier] = using_column_node_it->second;
+            }
         }
     }
     else if (right_resolved_identifier)
     {
         resolved_side = JoinTableSide::Right;
-        auto & right_resolved_column = right_resolved_identifier->as<ColumnNode &>();
+        resolved_identifier = right_resolved_identifier;
 
-        auto using_column_node_it = join_using_column_name_to_column_node.find(right_resolved_column.getColumnName());
-        if (using_column_node_it != join_using_column_name_to_column_node.end() &&
-            !using_column_node_it->second->getColumnType()->equals(*right_resolved_column.getColumnType()))
+        if (right_resolved_identifier->getNodeType() != QueryTreeNodeType::COLUMN)
         {
-            auto right_resolved_column_clone = std::static_pointer_cast<ColumnNode>(right_resolved_column.clone());
-            right_resolved_column_clone->setColumnType(using_column_node_it->second->getColumnType());
-            resolved_identifier = std::move(right_resolved_column_clone);
+            check_nested_column_not_in_using(right_resolved_identifier);
         }
         else
         {
-            resolved_identifier = right_resolved_identifier;
+            auto & right_resolved_column = right_resolved_identifier->as<ColumnNode &>();
+            auto using_column_node_it = join_using_column_name_to_column_node.find(right_resolved_column.getColumnName());
+            if (using_column_node_it != join_using_column_name_to_column_node.end() &&
+                !using_column_node_it->second->getColumnType()->equals(*right_resolved_column.getColumnType()))
+            {
+                auto right_resolved_column_clone = std::static_pointer_cast<ColumnNode>(right_resolved_column.clone());
+                right_resolved_column_clone->setColumnType(using_column_node_it->second->getColumnType());
+                resolved_identifier = std::move(right_resolved_column_clone);
+                if (!resolved_identifier->isEqual(*using_column_node_it->second))
+                    scope.join_columns_with_changed_types[resolved_identifier] = using_column_node_it->second;
+            }
         }
     }
 
     if (join_node_in_resolve_process || !resolved_identifier)
         return resolved_identifier;
 
-    if (join_use_nulls)
+    if (scope.join_use_nulls)
     {
-        resolved_identifier = resolved_identifier->clone();
-        convertJoinedColumnTypeToNullIfNeeded(resolved_identifier, join_kind, resolved_side);
+        auto projection_name_it = node_to_projection_name.find(resolved_identifier);
+        auto nullable_resolved_identifier = convertJoinedColumnTypeToNullIfNeeded(resolved_identifier, join_kind, resolved_side, scope);
+        if (nullable_resolved_identifier)
+        {
+            resolved_identifier = nullable_resolved_identifier;
+            /// Set the same projection name for new nullable node
+            if (projection_name_it != node_to_projection_name.end())
+            {
+                node_to_projection_name.emplace(resolved_identifier, projection_name_it->second);
+            }
+        }
     }
 
     return resolved_identifier;
 }
 
+QueryTreeNodePtr QueryAnalyzer::matchArrayJoinSubcolumns(
+    const QueryTreeNodePtr & array_join_column_inner_expression,
+    const ColumnNode & array_join_column_expression_typed,
+    const QueryTreeNodePtr & resolved_expression,
+    IdentifierResolveScope & scope)
+{
+    const auto * resolved_function = resolved_expression->as<FunctionNode>();
+    if (!resolved_function || resolved_function->getFunctionName() != "getSubcolumn")
+        return {};
+
+    const auto * array_join_parent_column = array_join_column_inner_expression.get();
+
+    /** If both resolved and array-joined expressions are subcolumns, try to match them:
+      * For example, in `SELECT t.map.values FROM (SELECT * FROM tbl) ARRAY JOIN t.map`
+      * Identifier `t.map.values` is resolved into `getSubcolumn(t, 'map.values')` and t.map is resolved into `getSubcolumn(t, 'map')`
+      * Since we need to perform array join on `getSubcolumn(t, 'map')`, `t.map.values` should become `getSubcolumn(getSubcolumn(t, 'map'), 'values')`
+      *
+      * Note: It doesn't work when subcolumn in ARRAY JOIN is transformed by another expression, for example
+      * SELECT c.map, c.map.values FROM (SELECT * FROM tbl) ARRAY JOIN mapApply(x -> x, t.map);
+      */
+    String array_join_subcolumn_prefix;
+    auto * array_join_column_inner_expression_function = array_join_column_inner_expression->as<FunctionNode>();
+    if (array_join_column_inner_expression_function &&
+        array_join_column_inner_expression_function->getFunctionName() == "getSubcolumn")
+    {
+        const auto & argument_nodes = array_join_column_inner_expression_function->getArguments().getNodes();
+        if (argument_nodes.size() == 2 && argument_nodes.at(1)->getNodeType() == QueryTreeNodeType::CONSTANT)
+        {
+            const auto & constant_node = argument_nodes.at(1)->as<ConstantNode &>();
+            const auto & constant_node_value = constant_node.getValue();
+            if (constant_node_value.getType() == Field::Types::String)
+            {
+                array_join_subcolumn_prefix = constant_node_value.get<String>() + ".";
+                array_join_parent_column = argument_nodes.at(0).get();
+            }
+        }
+    }
+
+    const auto & argument_nodes = resolved_function->getArguments().getNodes();
+    if (argument_nodes.size() != 2 && !array_join_parent_column->isEqual(*argument_nodes.at(0)))
+        return {};
+
+    const auto * second_argument = argument_nodes.at(1)->as<ConstantNode>();
+    if (!second_argument || second_argument->getValue().getType() != Field::Types::String)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected constant string as second argument of getSubcolumn function {}", resolved_function->dumpTree());
+
+    const auto & resolved_subcolumn_path = second_argument->getValue().get<String &>();
+    if (!startsWith(resolved_subcolumn_path, array_join_subcolumn_prefix))
+        return {};
+
+    auto get_subcolumn_function = std::make_shared<FunctionNode>("getSubcolumn");
+    get_subcolumn_function->getArguments().getNodes().push_back(
+        std::make_shared<ColumnNode>(array_join_column_expression_typed.getColumn(), array_join_column_expression_typed.getColumnSource()));
+    get_subcolumn_function->getArguments().getNodes().push_back(
+        std::make_shared<ConstantNode>(resolved_subcolumn_path.substr(array_join_subcolumn_prefix.size())));
+
+    QueryTreeNodePtr function_query_node = get_subcolumn_function;
+    resolveFunction(function_query_node, scope);
+
+    return function_query_node;
+}
+
 QueryTreeNodePtr QueryAnalyzer::tryResolveExpressionFromArrayJoinExpressions(const QueryTreeNodePtr & resolved_expression,
     const QueryTreeNodePtr & table_expression_node,
     IdentifierResolveScope & scope)
@@ -3368,8 +3797,12 @@ QueryTreeNodePtr QueryAnalyzer::tryResolveExpressionFromArrayJoinExpressions(con
                 array_join_column_expression_typed.getColumnSource());
             break;
         }
-    }
 
+        /// When we select subcolumn of array joined column it also should be array joined
+        array_join_resolved_expression = matchArrayJoinSubcolumns(array_join_column_inner_expression, array_join_column_expression_typed, resolved_expression, scope);
+        if (array_join_resolved_expression)
+            break;
+    }
     return array_join_resolved_expression;
 }
 
@@ -3559,9 +3992,15 @@ IdentifierResolveResult QueryAnalyzer::tryResolveIdentifierInParentScopes(const
             }
             else if (resolved_identifier->as<ConstantNode>())
             {
-                lookup_result.resolved_identifier = resolved_identifier;
                 return lookup_result;
             }
+            else if (auto * resolved_function = resolved_identifier->as<FunctionNode>())
+            {
+                /// Special case: scalar subquery was executed and replaced by __getScalar function.
+                /// Handle it as a constant.
+                if (resolved_function->getFunctionName() == "__getScalar")
+                    return lookup_result;
+            }
 
             throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
                 "Resolve identifier '{}' from parent scope only supported for constants and CTE. Actual {} node type {}. In scope {}",
@@ -3628,7 +4067,12 @@ IdentifierResolveResult QueryAnalyzer::tryResolveIdentifier(const IdentifierLook
         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;
+        {
+            if (!it->second.resolve_result.isResolvedFromCTEs() || !cte_in_resolve_process.contains(identifier_lookup.identifier.getFullName()))
+            {
+                return it->second.resolve_result;
+            }
+        }
     }
     else
     {
@@ -3685,8 +4129,23 @@ IdentifierResolveResult QueryAnalyzer::tryResolveIdentifier(const IdentifierLook
 
     if (!resolve_result.resolved_identifier && identifier_lookup.isTableExpressionLookup())
     {
-        auto cte_query_node_it = scope.cte_name_to_query_node.find(identifier_lookup.identifier.getFullName());
-        if (cte_query_node_it != scope.cte_name_to_query_node.end())
+        auto full_name = identifier_lookup.identifier.getFullName();
+        auto cte_query_node_it = scope.cte_name_to_query_node.find(full_name);
+
+        /// CTE may reference table expressions with the same name, e.g.:
+        ///
+        /// WITH test1 AS (SELECT * FROM test1) SELECT * FROM test1;
+        ///
+        /// Since we don't support recursive CTEs, `test1` identifier inside of CTE
+        /// references to table <default database name>.test1.
+        /// This means that the example above is equivalent to the following query:
+        ///
+        /// SELECT * FROM test1;
+        ///
+        /// To accomplish this behaviour it's not allowed to resolve identifiers to
+        /// CTE that is being resolved.
+        if (cte_query_node_it != scope.cte_name_to_query_node.end()
+            && !cte_in_resolve_process.contains(full_name))
         {
             resolve_result.resolved_identifier = cte_query_node_it->second;
             resolve_result.resolve_place = IdentifierResolvePlace::CTE;
@@ -3867,6 +4326,95 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::getMatchedColumnNodesWithN
     return matched_column_nodes_with_names;
 }
 
+bool hasTableExpressionInJoinTree(const QueryTreeNodePtr & join_tree_node, const QueryTreeNodePtr & table_expression)
+{
+    QueryTreeNodes nodes_to_process;
+    nodes_to_process.push_back(join_tree_node);
+
+    while (!nodes_to_process.empty())
+    {
+        auto node_to_process = std::move(nodes_to_process.back());
+        nodes_to_process.pop_back();
+        if (node_to_process == table_expression)
+            return true;
+
+        if (node_to_process->getNodeType() == QueryTreeNodeType::JOIN)
+        {
+            const auto & join_node = node_to_process->as<JoinNode &>();
+            nodes_to_process.push_back(join_node.getLeftTableExpression());
+            nodes_to_process.push_back(join_node.getRightTableExpression());
+        }
+    }
+    return false;
+}
+
+/// Columns that resolved from matcher can also match columns from JOIN USING.
+/// In that case we update type to type of column in USING section.
+/// TODO: It's not completely correct for qualified matchers, so t1.* should be resolved to left table column type.
+/// But in planner we do not distinguish such cases.
+void QueryAnalyzer::updateMatchedColumnsFromJoinUsing(
+    QueryTreeNodesWithNames & result_matched_column_nodes_with_names,
+    const QueryTreeNodePtr & source_table_expression,
+    IdentifierResolveScope & scope)
+{
+    auto * nearest_query_scope = scope.getNearestQueryScope();
+    auto * nearest_query_scope_query_node = nearest_query_scope ? nearest_query_scope->scope_node->as<QueryNode>() : nullptr;
+
+    /// If there are no parent query scope or query scope does not have join tree
+    if (!nearest_query_scope_query_node || !nearest_query_scope_query_node->getJoinTree())
+    {
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "There are no table sources. In scope {}",
+            scope.scope_node->formatASTForErrorMessage());
+    }
+
+    const auto & join_tree = nearest_query_scope_query_node->getJoinTree();
+
+    const auto * join_node = join_tree->as<JoinNode>();
+    if (join_node && join_node->isUsingJoinExpression())
+    {
+        const auto & join_using_list = join_node->getJoinExpression()->as<ListNode &>();
+        const auto & join_using_nodes = join_using_list.getNodes();
+
+        for (auto & [matched_column_node, _] : result_matched_column_nodes_with_names)
+        {
+            auto & matched_column_node_typed = matched_column_node->as<ColumnNode &>();
+            const auto & matched_column_name = matched_column_node_typed.getColumnName();
+
+            for (const auto & join_using_node : join_using_nodes)
+            {
+                auto & join_using_column_node = join_using_node->as<ColumnNode &>();
+                const auto & join_using_column_name = join_using_column_node.getColumnName();
+
+                if (matched_column_name != join_using_column_name)
+                    continue;
+
+                const auto & join_using_column_nodes_list = join_using_column_node.getExpressionOrThrow()->as<ListNode &>();
+                const auto & join_using_column_nodes = join_using_column_nodes_list.getNodes();
+
+                auto it = node_to_projection_name.find(matched_column_node);
+
+                if (hasTableExpressionInJoinTree(join_node->getLeftTableExpression(), source_table_expression))
+                    matched_column_node = join_using_column_nodes.at(0);
+                else if (hasTableExpressionInJoinTree(join_node->getRightTableExpression(), source_table_expression))
+                    matched_column_node = join_using_column_nodes.at(1);
+                else
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot find column {} in JOIN USING section {}",
+                        matched_column_node->dumpTree(), join_node->dumpTree());
+
+                matched_column_node = matched_column_node->clone();
+                if (it != node_to_projection_name.end())
+                    node_to_projection_name.emplace(matched_column_node, it->second);
+
+                matched_column_node->as<ColumnNode &>().setColumnType(join_using_column_node.getResultType());
+                if (!matched_column_node->isEqual(*join_using_column_nodes.at(0)))
+                    scope.join_columns_with_changed_types[matched_column_node] = join_using_column_nodes.at(0);
+            }
+        }
+    }
+}
+
 /** Resolve qualified tree matcher.
   *
   * First try to match qualified identifier to expression. If qualified identifier matched expression node then
@@ -3984,6 +4532,8 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveQualifiedMatcher(Qu
         matched_columns,
         scope);
 
+    updateMatchedColumnsFromJoinUsing(result_matched_column_nodes_with_names, table_expression_node, scope);
+
     return result_matched_column_nodes_with_names;
 }
 
@@ -4088,6 +4638,28 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveUnqualifiedMatcher(
                     const auto & join_using_column_nodes_list = join_using_column_node.getExpressionOrThrow()->as<ListNode &>();
                     const auto & join_using_column_nodes = join_using_column_nodes_list.getNodes();
 
+                    /** If column doesn't exists in the table, then do not match column from USING clause.
+                      * Example: SELECT a + 1 AS id, * FROM (SELECT 1 AS a) AS t1 JOIN (SELECT 2 AS id) AS t2 USING (id);
+                      * In this case `id` is not present in the left table expression,
+                      * so asterisk should return `id` from the right table expression.
+                      */
+                    auto is_column_from_parent_scope = [&scope](const QueryTreeNodePtr & using_node_from_table)
+                    {
+                        const auto & using_column_from_table = using_node_from_table->as<ColumnNode &>();
+                        auto table_expression_data_it = scope.table_expression_node_to_data.find(using_column_from_table.getColumnSource());
+                        if (table_expression_data_it != scope.table_expression_node_to_data.end())
+                        {
+                            const auto & table_expression_data = table_expression_data_it->second;
+                            const auto & column_name = using_column_from_table.getColumnName();
+                            return !table_expression_data.column_name_to_column_node.contains(column_name);
+                        }
+                        return false;
+                    };
+
+                    if (is_column_from_parent_scope(join_using_column_nodes.at(0)) ||
+                        is_column_from_parent_scope(join_using_column_nodes.at(1)))
+                        continue;
+
                     QueryTreeNodePtr matched_column_node;
 
                     if (isRight(join_node->getKind()))
@@ -4097,6 +4669,8 @@ QueryAnalyzer::QueryTreeNodesWithNames QueryAnalyzer::resolveUnqualifiedMatcher(
 
                     matched_column_node = matched_column_node->clone();
                     matched_column_node->as<ColumnNode &>().setColumnType(join_using_column_node.getResultType());
+                    if (!matched_column_node->isEqual(*join_using_column_nodes.at(0)))
+                        scope.join_columns_with_changed_types[matched_column_node] = join_using_column_nodes.at(0);
 
                     table_expression_column_names_to_skip.insert(join_using_column_name);
                     matched_expression_nodes_with_column_names.emplace_back(std::move(matched_column_node), join_using_column_name);
@@ -4193,7 +4767,7 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
     else
         matched_expression_nodes_with_names = resolveUnqualifiedMatcher(matcher_node, scope);
 
-    if (scope.context->getSettingsRef().join_use_nulls)
+    if (scope.join_use_nulls)
     {
         /** If we are resolving matcher came from the result of JOIN and `join_use_nulls` is set,
           * we need to convert joined column type to Nullable.
@@ -4209,7 +4783,17 @@ ProjectionNames QueryAnalyzer::resolveMatcher(QueryTreeNodePtr & matcher_node, I
             for (auto & [node, node_name] : matched_expression_nodes_with_names)
             {
                 auto join_identifier_side = getColumnSideFromJoinTree(node, *nearest_scope_join_node);
-                convertJoinedColumnTypeToNullIfNeeded(node, nearest_scope_join_node->getKind(), join_identifier_side);
+                auto projection_name_it = node_to_projection_name.find(node);
+                auto nullable_node = convertJoinedColumnTypeToNullIfNeeded(node, nearest_scope_join_node->getKind(), join_identifier_side, scope);
+                if (nullable_node)
+                {
+                    node = nullable_node;
+                    /// Set the same projection name for new nullable node
+                    if (projection_name_it != node_to_projection_name.end())
+                    {
+                        node_to_projection_name.emplace(node, projection_name_it->second);
+                    }
+                }
             }
         }
     }
@@ -4768,7 +5352,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         {
             size_t parts_size = identifier.getPartsSize();
             if (parts_size < 1 || parts_size > 2)
-                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                throw Exception(ErrorCodes::INVALID_IDENTIFIER,
                     "Expected {} function first argument identifier to contain 1 or 2 parts. Actual '{}'. In scope {}",
                     function_name,
                     identifier.getFullName(),
@@ -4878,13 +5462,31 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
     }
 
     /// 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*/);
 
+    /// Mask arguments if needed
+    if (!scope.context->getSettingsRef().format_display_secrets_in_show_and_select)
+    {
+        if (FunctionSecretArgumentsFinder::Result secret_arguments = FunctionSecretArgumentsFinderTreeNode(*function_node_ptr).getResult(); secret_arguments.count)
+        {
+            auto & argument_nodes = function_node_ptr->getArgumentsNode()->as<ListNode &>().getNodes();
+
+            for (size_t n = secret_arguments.start; n < secret_arguments.start + secret_arguments.count; ++n)
+            {
+                if (auto * constant = argument_nodes[n]->as<ConstantNode>())
+                {
+                    auto mask = scope.projection_mask_map->insert({constant->getTreeHash(), scope.projection_mask_map->size() + 1}).first->second;
+                    constant->setMaskId(mask);
+                    arguments_projection_names[n] = "[HIDDEN id: " + std::to_string(mask) + "]";
+                }
+            }
+        }
+    }
+
     auto & function_node = *function_node_ptr;
 
     /// Replace right IN function argument if it is table or table function with subquery that read ordinary columns
@@ -5197,12 +5799,23 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         return result_projection_names;
     }
 
-    FunctionOverloadResolverPtr function = UserDefinedExecutableFunctionFactory::instance().tryGet(function_name, scope.context, parameters);
+    FunctionOverloadResolverPtr function = UserDefinedExecutableFunctionFactory::instance().tryGet(function_name, scope.context, parameters); /// NOLINT(readability-static-accessed-through-instance)
     bool is_executable_udf = true;
 
+    IdentifierResolveScope::ResolvedFunctionsCache * function_cache = nullptr;
+
     if (!function)
     {
-        function = FunctionFactory::instance().tryGet(function_name, scope.context);
+        /// This is a hack to allow a query like `select randConstant(), randConstant(), randConstant()`.
+        /// Function randConstant() would return the same value for the same arguments (in scope).
+
+        auto hash = function_node_ptr->getTreeHash();
+        function_cache = &scope.functions_cache[hash];
+        if (!function_cache->resolver)
+            function_cache->resolver = FunctionFactory::instance().tryGet(function_name, scope.context);
+
+        function = function_cache->resolver;
+
         is_executable_udf = false;
     }
 
@@ -5216,7 +5829,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
         {
             std::vector<std::string> possible_function_names;
 
-            auto function_names = UserDefinedExecutableFunctionFactory::instance().getRegisteredNames(scope.context);
+            auto function_names = UserDefinedExecutableFunctionFactory::instance().getRegisteredNames(scope.context); /// NOLINT(readability-static-accessed-through-instance)
             possible_function_names.insert(possible_function_names.end(), function_names.begin(), function_names.end());
 
             function_names = UserDefinedSQLFunctionFactory::instance().getAllRegisteredNames();
@@ -5234,8 +5847,7 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                     possible_function_names.push_back(name);
             }
 
-            NamePrompter<2> name_prompter;
-            auto hints = name_prompter.getHints(function_name, possible_function_names);
+            auto hints = NamePrompter<2>::getHints(function_name, possible_function_names);
 
             throw Exception(ErrorCodes::UNKNOWN_FUNCTION,
                 "Function with name '{}' does not exists. In scope {}{}",
@@ -5426,11 +6038,21 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
 
     try
     {
-        auto function_base = function->build(argument_columns);
+        FunctionBasePtr function_base;
+        if (function_cache)
+        {
+            auto & cached_function = function_cache->function_base;
+            if (!cached_function)
+                cached_function = function->build(argument_columns);
+
+            function_base = cached_function;
+        }
+        else
+            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";
+            function_name == "shardCount" || function_name == "hostName" || function_name == "tcpPort";
 
         /** If function is suitable for constant folding try to convert it to constant.
           * Example: SELECT plus(1, 1);
@@ -5453,11 +6075,21 @@ ProjectionNames QueryAnalyzer::resolveFunction(QueryTreeNodePtr & node, Identifi
                 column = function_base->getConstantResultForNonConstArguments(argument_columns, result_type);
             }
 
+            if (column && column->getDataType() != result_type->getColumnType())
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Unexpected return type from {}. Expected {}. Got {}",
+                    function->getName(),
+                    result_type->getColumnType(),
+                    column->getDataType());
+
             /** 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) && !typeid_cast<const ColumnConst *>(column.get())->getDataColumn().isDummy() &&
-                (!hasAggregateFunctionNodes(node) && !hasFunctionNode(node, "arrayJoin")))
+                !hasAggregateFunctionNodes(node) && !hasFunctionNode(node, "arrayJoin") &&
+                /// Sanity check: do not convert large columns to constants
+                column->byteSize() < 1_MiB)
             {
                 /// Replace function node with result constant node
                 Field column_constant_value;
@@ -5529,6 +6161,12 @@ ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, Id
         return resolved_expression_it->second;
     }
 
+    bool is_nullable_group_by_key = scope.nullable_group_by_keys.contains(node) && !scope.expressions_in_resolve_process_stack.hasAggregateFunction();
+    if (is_nullable_group_by_key)
+        ++scope.found_nullable_group_by_key_in_scope;
+
+    SCOPE_EXIT(scope.found_nullable_group_by_key_in_scope -= is_nullable_group_by_key);
+
     String node_alias = node->getAlias();
     ProjectionNames result_projection_names;
 
@@ -5624,6 +6262,8 @@ ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, Id
                         subquery_node = resolved_identifier_node->as<QueryNode>();
                         union_node = resolved_identifier_node->as<UnionNode>();
 
+                        std::string_view cte_name = subquery_node ? subquery_node->getCTEName() : union_node->getCTEName();
+
                         if (subquery_node)
                             subquery_node->setIsCTE(false);
                         else
@@ -5632,10 +6272,21 @@ ProjectionNames QueryAnalyzer::resolveExpressionNode(QueryTreeNodePtr & node, Id
                         IdentifierResolveScope subquery_scope(resolved_identifier_node, &scope /*parent_scope*/);
                         subquery_scope.subquery_depth = scope.subquery_depth + 1;
 
+                        /// CTE is being resolved, it's required to forbid to resolve to it again
+                        /// because recursive CTEs are not supported, e.g.:
+                        ///
+                        /// WITH test1 AS (SELECT i + 1, j + 1 FROM test1) SELECT toInt64(4) i, toInt64(5) j FROM numbers(3) WHERE (i, j) IN test1;
+                        ///
+                        /// In this example argument of function `in` is being resolve here. If CTE `test1` is not forbidden,
+                        /// `test1` is resolved to CTE (not to the table) in `initializeQueryJoinTreeNode` function.
+                        cte_in_resolve_process.insert(cte_name);
+
                         if (subquery_node)
                             resolveQuery(resolved_identifier_node, subquery_scope);
                         else
                             resolveUnion(resolved_identifier_node, subquery_scope);
+
+                        cte_in_resolve_process.erase(cte_name);
                     }
                 }
             }
@@ -5807,7 +6458,7 @@ 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())
+    if (is_nullable_group_by_key && scope.found_nullable_group_by_key_in_scope == 1)
     {
         node = node->clone();
         node->convertToNullable();
@@ -6005,6 +6656,80 @@ ProjectionNames QueryAnalyzer::resolveSortNodeList(QueryTreeNodePtr & sort_node_
     return result_projection_names;
 }
 
+namespace
+{
+
+void expandTuplesInList(QueryTreeNodes & key_list)
+{
+    QueryTreeNodes expanded_keys;
+    expanded_keys.reserve(key_list.size());
+    for (auto const & key : key_list)
+    {
+        if (auto * function = key->as<FunctionNode>(); function != nullptr && function->getFunctionName() == "tuple")
+        {
+            std::copy(function->getArguments().begin(), function->getArguments().end(), std::back_inserter(expanded_keys));
+        }
+        else
+            expanded_keys.push_back(key);
+    }
+    key_list = std::move(expanded_keys);
+}
+
+}
+
+/** Resolve GROUP BY clause.
+  */
+void QueryAnalyzer::resolveGroupByNode(QueryNode & query_node_typed, IdentifierResolveScope & scope)
+{
+    const auto & settings = scope.context->getSettingsRef();
+
+    if (query_node_typed.isGroupByWithGroupingSets())
+    {
+        QueryTreeNodes nullable_group_by_keys;
+        for (auto & grouping_sets_keys_list_node : query_node_typed.getGroupBy().getNodes())
+        {
+            if (settings.enable_positional_arguments)
+                replaceNodesWithPositionalArguments(grouping_sets_keys_list_node, query_node_typed.getProjection().getNodes(), scope);
+
+            // Remove redundant calls to `tuple` function. It simplifies checking if expression is an aggregation key.
+            // It's required to support queries like: SELECT number FROM numbers(3) GROUP BY (number, number % 2)
+            auto & group_by_list = grouping_sets_keys_list_node->as<ListNode &>().getNodes();
+            expandTuplesInList(group_by_list);
+
+            if (scope.group_by_use_nulls)
+                for (const auto & group_by_elem : group_by_list)
+                    nullable_group_by_keys.push_back(group_by_elem->clone());
+
+            resolveExpressionNodeList(grouping_sets_keys_list_node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+        }
+
+        for (auto & nullable_group_by_key : nullable_group_by_keys)
+            scope.nullable_group_by_keys.insert(std::move(nullable_group_by_key));
+    }
+    else
+    {
+        if (settings.enable_positional_arguments)
+            replaceNodesWithPositionalArguments(query_node_typed.getGroupByNode(), query_node_typed.getProjection().getNodes(), scope);
+
+        // Remove redundant calls to `tuple` function. It simplifies checking if expression is an aggregation key.
+        // It's required to support queries like: SELECT number FROM numbers(3) GROUP BY (number, number % 2)
+        auto & group_by_list = query_node_typed.getGroupBy().getNodes();
+        expandTuplesInList(group_by_list);
+
+        QueryTreeNodes nullable_group_by_keys;
+        if (scope.group_by_use_nulls)
+        {
+            for (const auto & group_by_elem : query_node_typed.getGroupBy().getNodes())
+                nullable_group_by_keys.push_back(group_by_elem->clone());
+        }
+
+        resolveExpressionNodeList(query_node_typed.getGroupByNode(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        for (auto & nullable_group_by_key : nullable_group_by_keys)
+            scope.nullable_group_by_keys.insert(std::move(nullable_group_by_key));
+    }
+}
+
 /** Resolve interpolate columns nodes list.
   */
 void QueryAnalyzer::resolveInterpolateColumnsNodeList(QueryTreeNodePtr & interpolate_node_list, IdentifierResolveScope & scope)
@@ -6297,12 +7022,13 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
           */
         for (const auto & column_name_and_type : table_expression_data.column_names_and_types)
         {
+            for (const auto & subcolumn : columns_description.getSubcolumns(column_name_and_type.name))
+                table_expression_data.subcolumn_names.insert(subcolumn.name);
             const auto & column_default = columns_description.getDefault(column_name_and_type.name);
 
             if (column_default && column_default->kind == ColumnDefaultKind::Alias)
             {
                 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);
@@ -6335,7 +7061,9 @@ void QueryAnalyzer::initializeTableExpressionData(const QueryTreeNodePtr & table
                 alias_column_resolve_scope,
                 false /*allow_lambda_expression*/,
                 false /*allow_table_expression*/);
-
+            auto & resolved_expression = alias_column_to_resolve->getExpression();
+            if (!resolved_expression->getResultType()->equals(*alias_column_to_resolve->getResultType()))
+                resolved_expression = buildCastFunction(resolved_expression, alias_column_to_resolve->getResultType(), scope.context, true);
             column_name_to_column_node = std::move(alias_column_resolve_scope.column_name_to_column_node);
             column_name_to_column_node[alias_column_to_resolve_name] = alias_column_to_resolve;
         }
@@ -6404,6 +7132,28 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
     TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().tryGet(table_function_name, scope_context);
     if (!table_function_ptr)
     {
+        String database_name = scope_context->getCurrentDatabase();
+        String table_name;
+
+        auto function_ast = table_function_node->toAST();
+        Identifier table_identifier{table_function_name};
+        if (table_identifier.getPartsSize() == 1)
+        {
+            table_name = table_identifier[0];
+        }
+        else if (table_identifier.getPartsSize() == 2)
+        {
+            database_name = table_identifier[0];
+            table_name = table_identifier[1];
+        }
+
+        auto parametrized_view_storage = scope_context->getQueryContext()->buildParametrizedViewStorage(function_ast, database_name, table_name);
+        if (parametrized_view_storage)
+        {
+            table_function_node = std::make_shared<TableNode>(parametrized_view_storage, scope_context);
+            return;
+        }
+
         auto hints = TableFunctionFactory::instance().getHints(table_function_name);
         if (!hints.empty())
             throw Exception(ErrorCodes::UNKNOWN_FUNCTION,
@@ -6632,7 +7382,7 @@ void QueryAnalyzer::resolveTableFunction(QueryTreeNodePtr & table_function_node,
                             ColumnDescription column = insert_columns.get(*insert_column_name_it);
                             /// Change ephemeral columns to default columns.
                             column.default_desc.kind = ColumnDefaultKind::Default;
-                            structure_hint.add(insert_columns.get(*insert_column_name_it));
+                            structure_hint.add(std::move(column));
                         }
                     }
 
@@ -6777,6 +7527,39 @@ void QueryAnalyzer::resolveArrayJoin(QueryTreeNodePtr & array_join_node, Identif
     }
 }
 
+void QueryAnalyzer::checkDuplicateTableNamesOrAlias(const QueryTreeNodePtr & join_node, QueryTreeNodePtr & left_table_expr, QueryTreeNodePtr & right_table_expr, IdentifierResolveScope & scope)
+{
+    Names column_names;
+    if (!scope.context->getSettingsRef().joined_subquery_requires_alias)
+        return;
+
+    if (join_node->as<JoinNode &>().getKind() != JoinKind::Paste)
+        return;
+
+    auto * left_node = left_table_expr->as<QueryNode>();
+    auto * right_node = right_table_expr->as<QueryNode>();
+
+    if (!left_node && !right_node)
+        return;
+
+    if (left_node)
+        for (const auto & name_and_type : left_node->getProjectionColumns())
+            column_names.push_back(name_and_type.name);
+    if (right_node)
+        for (const auto & name_and_type : right_node->getProjectionColumns())
+            column_names.push_back(name_and_type.name);
+
+    if (column_names.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Names of projection columns cannot be empty");
+
+    std::sort(column_names.begin(), column_names.end());
+    for (size_t i = 0; i < column_names.size() - 1; i++) // Check if there is no any duplicates because it will lead to broken result
+        if (column_names[i] == column_names[i+1])
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Name of columns and aliases should be unique for this query (you can add/change aliases to avoid duplication)"
+                            "While processing '{}'", join_node->formatASTForErrorMessage());
+}
+
 /// Resolve join node in scope
 void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveScope & scope, QueryExpressionsAliasVisitor & expressions_visitor)
 {
@@ -6788,6 +7571,9 @@ void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveS
     resolveQueryJoinTreeNode(join_node_typed.getRightTableExpression(), scope, expressions_visitor);
     validateJoinTableExpressionWithoutAlias(join_node, join_node_typed.getRightTableExpression(), scope);
 
+    if (!join_node_typed.getLeftTableExpression()->hasAlias() && !join_node_typed.getRightTableExpression()->hasAlias())
+        checkDuplicateTableNamesOrAlias(join_node, join_node_typed.getLeftTableExpression(), join_node_typed.getRightTableExpression(), scope);
+
     if (join_node_typed.isOnJoinExpression())
     {
         expressions_visitor.visit(join_node_typed.getJoinExpression());
@@ -6819,14 +7605,92 @@ void QueryAnalyzer::resolveJoin(QueryTreeNodePtr & join_node, IdentifierResolveS
 
             join_using_identifiers.insert(identifier_full_name);
 
+            const auto & settings = scope.context->getSettingsRef();
+
+            /** While resolving JOIN USING identifier, try to resolve identifier from parent subquery projection.
+              * Example: SELECT a + 1 AS b FROM (SELECT 1 AS a) t1 JOIN (SELECT 2 AS b) USING b
+              * In this case `b` is not in the left table expression, but it is in the parent subquery projection.
+              */
+            auto try_resolve_identifier_from_query_projection = [this](const String & identifier_full_name_,
+                                                                       const QueryTreeNodePtr & left_table_expression,
+                                                                       const IdentifierResolveScope & scope_) -> QueryTreeNodePtr
+            {
+                const QueryNode * query_node = scope_.scope_node ? scope_.scope_node->as<QueryNode>() : nullptr;
+                if (!query_node)
+                    return nullptr;
+
+                const auto & projection_list = query_node->getProjection();
+                for (const auto & projection_node : projection_list.getNodes())
+                {
+                    if (projection_node->hasAlias() && identifier_full_name_ == projection_node->getAlias())
+                    {
+                        auto left_subquery = std::make_shared<QueryNode>(query_node->getMutableContext());
+                        left_subquery->getProjection().getNodes().push_back(projection_node->clone());
+                        left_subquery->getJoinTree() = left_table_expression;
+
+                        IdentifierResolveScope left_subquery_scope(left_subquery, nullptr /*parent_scope*/);
+                        resolveQuery(left_subquery, left_subquery_scope);
+
+                        const auto & resolved_nodes = left_subquery->getProjection().getNodes();
+                        if (resolved_nodes.size() == 1)
+                        {
+                            /// Create ColumnNode with expression from parent projection
+                            return std::make_shared<ColumnNode>(
+                                NameAndTypePair{identifier_full_name_, resolved_nodes.front()->getResultType()},
+                                resolved_nodes.front(), left_table_expression);
+                        }
+                    }
+                }
+                return nullptr;
+            };
+
+            QueryTreeNodePtr result_left_table_expression = nullptr;
+            /** With `analyzer_compatibility_join_using_top_level_identifier` alias in projection has higher priority than column from left table.
+              * But if aliased expression cannot be resolved from left table, we get UNKNOW_IDENTIFIER error,
+              * despite the fact that column from USING could be resolved from left table.
+              * It's compatibility with a default behavior for old analyzer.
+              */
+            if (settings.analyzer_compatibility_join_using_top_level_identifier)
+                result_left_table_expression = try_resolve_identifier_from_query_projection(identifier_full_name, join_node_typed.getLeftTableExpression(), scope);
+
             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)
+                result_left_table_expression = tryResolveIdentifierFromJoinTreeNode(identifier_lookup, join_node_typed.getLeftTableExpression(), scope);
+
+            /** Here we may try to resolve identifier from projection in case it's not resolved from left table expression
+              * and analyzer_compatibility_join_using_top_level_identifier is disabled.
+              * For now we do not do this, because not all corner cases are clear.
+              * But let's at least mention it in error message
+              */
+            /// if (!settings.analyzer_compatibility_join_using_top_level_identifier && !result_left_table_expression)
+            ///     result_left_table_expression = try_resolve_identifier_from_query_projection(identifier_full_name, join_node_typed.getLeftTableExpression(), scope);
+
+            if (!result_left_table_expression)
+            {
+                String extra_message;
+                const QueryNode * query_node = scope.scope_node ? scope.scope_node->as<QueryNode>() : nullptr;
+                if (settings.analyzer_compatibility_join_using_top_level_identifier && query_node)
+                {
+                    for (const auto & projection_node : query_node->getProjection().getNodes())
+                    {
+                        if (projection_node->hasAlias() && identifier_full_name == projection_node->getAlias())
+                        {
+                            extra_message = fmt::format(
+                                ", but alias '{}' is present in SELECT list."
+                                " You may try to SET analyzer_compatibility_join_using_top_level_identifier = 1, to allow to use it in USING clause",
+                                projection_node->formatASTForErrorMessage());
+                            break;
+                        }
+                    }
+                }
+
                 throw Exception(ErrorCodes::UNKNOWN_IDENTIFIER,
-                    "JOIN {} using identifier '{}' cannot be resolved from left table expression. In scope {}",
+                    "JOIN {} using identifier '{}' cannot be resolved from left table expression{}. In scope {}",
                     join_node_typed.formatASTForErrorMessage(),
                     identifier_full_name,
+                    extra_message,
                     scope.scope_node->formatASTForErrorMessage());
+            }
 
             if (result_left_table_expression->getNodeType() != QueryTreeNodeType::COLUMN)
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
@@ -6992,6 +7856,10 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
             max_subquery_depth);
 
     auto & query_node_typed = query_node->as<QueryNode &>();
+
+    if (query_node_typed.isCTE())
+        cte_in_resolve_process.insert(query_node_typed.getCTEName());
+
     const auto & settings = scope.context->getSettingsRef();
 
     bool is_rollup_or_cube = query_node_typed.isGroupByWithRollup() || query_node_typed.isGroupByWithCube();
@@ -7013,9 +7881,6 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
     if (query_node_typed.hasHaving() && query_node_typed.isGroupByWithTotals() && is_rollup_or_cube)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "WITH TOTALS and WITH ROLLUP or CUBE are not supported together in presence of HAVING");
 
-    if (settings.enable_order_by_all && query_node_typed.isOrderByAll())
-        expandOrderByAll(query_node_typed);
-
     /// Initialize aliases in query node scope
     QueryExpressionsAliasVisitor visitor(scope);
 
@@ -7149,47 +8014,28 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
                 scope.scope_node->formatASTForErrorMessage());
     }
 
-    if (query_node_typed.getPrewhere())
-        resolveExpressionNode(query_node_typed.getPrewhere(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+    if (auto & prewhere_node = query_node_typed.getPrewhere())
+    {
+        resolveExpressionNode(prewhere_node, scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
+
+        /** Expressions in PREWHERE with JOIN should not change their type.
+          * Example: SELECT * FROM t1 JOIN t2 USING (a) PREWHERE a = 1
+          * Column `a` in PREWHERE should be resolved from the left table
+          * and should not change its type to Nullable or to the supertype of `a` from t1 and t2.
+          * Here's a more complicated example where the column is somewhere inside an expression:
+          * SELECT a + 1 as b FROM t1 JOIN t2 USING (id) PREWHERE b = 1
+          * The expression `a + 1 as b` in the projection and in PREWHERE should have different `a`.
+          */
+        prewhere_node = prewhere_node->clone();
+        ReplaceColumnsVisitor replace_visitor(scope.join_columns_with_changed_types, scope.context);
+        replace_visitor.visit(prewhere_node);
+    }
 
     if (query_node_typed.getWhere())
         resolveExpressionNode(query_node_typed.getWhere(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
 
     if (query_node_typed.hasGroupBy())
-    {
-        if (query_node_typed.isGroupByWithGroupingSets())
-        {
-            for (auto & grouping_sets_keys_list_node : query_node_typed.getGroupBy().getNodes())
-            {
-                if (settings.enable_positional_arguments)
-                    replaceNodesWithPositionalArguments(grouping_sets_keys_list_node, query_node_typed.getProjection().getNodes(), scope);
-
-                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
-        {
-            if (settings.enable_positional_arguments)
-                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);
-            }
-        }
-    }
+        resolveGroupByNode(query_node_typed, scope);
 
     if (query_node_typed.hasHaving())
         resolveExpressionNode(query_node_typed.getHaving(), scope, false /*allow_lambda_expression*/, false /*allow_table_expression*/);
@@ -7202,6 +8048,7 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
         if (settings.enable_positional_arguments)
             replaceNodesWithPositionalArguments(query_node_typed.getOrderByNode(), query_node_typed.getProjection().getNodes(), scope);
 
+        expandOrderByAll(query_node_typed, settings);
         resolveSortNodeList(query_node_typed.getOrderByNode(), scope);
     }
 
@@ -7302,8 +8149,7 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
         node->removeAlias();
     }
 
-    if (query_node_typed.isGroupByAll())
-        expandGroupByAll(query_node_typed);
+    expandGroupByAll(query_node_typed);
 
     validateFilters(query_node);
     validateAggregates(query_node, { .group_by_use_nulls = scope.group_by_use_nulls });
@@ -7332,11 +8178,18 @@ void QueryAnalyzer::resolveQuery(const QueryTreeNodePtr & query_node, Identifier
         node->removeAlias();
 
     query_node_typed.resolveProjectionColumns(std::move(projection_columns));
+
+    if (query_node_typed.isCTE())
+        cte_in_resolve_process.erase(query_node_typed.getCTEName());
 }
 
 void QueryAnalyzer::resolveUnion(const QueryTreeNodePtr & union_node, IdentifierResolveScope & scope)
 {
     auto & union_node_typed = union_node->as<UnionNode &>();
+
+    if (union_node_typed.isCTE())
+        cte_in_resolve_process.insert(union_node_typed.getCTEName());
+
     auto & queries_nodes = union_node_typed.getQueries().getNodes();
 
     for (auto & query_node : queries_nodes)
@@ -7360,17 +8213,23 @@ void QueryAnalyzer::resolveUnion(const QueryTreeNodePtr & union_node, Identifier
                 scope.scope_node->formatASTForErrorMessage());
         }
     }
+
+    if (union_node_typed.isCTE())
+        cte_in_resolve_process.erase(union_node_typed.getCTEName());
 }
 
 }
 
-QueryAnalysisPass::QueryAnalysisPass(QueryTreeNodePtr table_expression_)
+QueryAnalysisPass::QueryAnalysisPass(QueryTreeNodePtr table_expression_, bool only_analyze_)
     : table_expression(std::move(table_expression_))
+    , only_analyze(only_analyze_)
 {}
 
-void QueryAnalysisPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+QueryAnalysisPass::QueryAnalysisPass(bool only_analyze_) : only_analyze(only_analyze_) {}
+
+void QueryAnalysisPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
-    QueryAnalyzer analyzer;
+    QueryAnalyzer analyzer(only_analyze);
     analyzer.resolve(query_tree_node, table_expression, context);
     createUniqueTableAliases(query_tree_node, table_expression, context);
 }
diff --git a/src/Analyzer/Passes/QueryAnalysisPass.h b/src/Analyzer/Passes/QueryAnalysisPass.h
index fa8778ebf76..e0a42a530b0 100644
--- a/src/Analyzer/Passes/QueryAnalysisPass.h
+++ b/src/Analyzer/Passes/QueryAnalysisPass.h
@@ -71,13 +71,13 @@ public:
     /** Construct query analysis pass for query or union analysis.
       * Available columns are extracted from query node join tree.
       */
-    QueryAnalysisPass() = default;
+    explicit QueryAnalysisPass(bool only_analyze_ = false);
 
     /** Construct query analysis pass for expression or list of expressions analysis.
       * Available expression columns are extracted from table expression.
       * Table expression node must have query, union, table, table function type.
       */
-    explicit QueryAnalysisPass(QueryTreeNodePtr table_expression_);
+    explicit QueryAnalysisPass(QueryTreeNodePtr table_expression_, bool only_analyze_ = false);
 
     String getName() override
     {
@@ -89,10 +89,11 @@ public:
         return "Resolve type for each query expression. Replace identifiers, matchers with query expressions. Perform constant folding. Evaluate scalar subqueries.";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 private:
     QueryTreeNodePtr table_expression;
+    const bool only_analyze;
 };
 
 }
diff --git a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
index 1d00f6e5dee..78228f8f472 100644
--- a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
+++ b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.cpp
@@ -52,6 +52,9 @@ public:
             return;
 
         auto & column_node = node->as<ColumnNode &>();
+        if (column_node.getColumnName() == "__grouping_set")
+            return;
+
         auto column_source_node = column_node.getColumnSource();
         auto column_source_node_type = column_source_node->getNodeType();
 
@@ -129,7 +132,7 @@ void updateUsedProjectionIndexes(const QueryTreeNodePtr & query_or_union_node, s
 
 }
 
-void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     std::vector<QueryTreeNodePtr> nodes_to_visit;
     nodes_to_visit.push_back(query_tree_node);
@@ -145,6 +148,13 @@ void RemoveUnusedProjectionColumnsPass::run(QueryTreeNodePtr query_tree_node, Co
 
         for (auto & [query_or_union_node, used_columns] : visitor.query_or_union_node_to_used_columns)
         {
+            /// can't remove columns from distinct, see example - 03023_remove_unused_column_distinct.sql
+            if (auto * query_node = query_or_union_node->as<QueryNode>())
+            {
+                if (query_node->isDistinct())
+                    continue;
+            }
+
             auto used_projection_indexes = convertUsedColumnNamesToUsedProjectionIndexes(query_or_union_node, used_columns);
             updateUsedProjectionIndexes(query_or_union_node, used_projection_indexes);
 
diff --git a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.h b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.h
index 2c6768ed4bf..557d816544f 100644
--- a/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.h
+++ b/src/Analyzer/Passes/RemoveUnusedProjectionColumnsPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Remove unused projection columns in subqueries."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
index 9c89670f3c6..9f3e6aa4482 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.cpp
@@ -109,7 +109,7 @@ private:
 }
 
 
-void RewriteAggregateFunctionWithIfPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void RewriteAggregateFunctionWithIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     RewriteAggregateFunctionWithIfVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.h b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.h
index be8ad3ac34d..0a2fc1ba423 100644
--- a/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.h
+++ b/src/Analyzer/Passes/RewriteAggregateFunctionWithIfPass.h
@@ -20,7 +20,7 @@ public:
         return "Rewrite aggregate functions with if expression as argument when logically equivalent";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp
new file mode 100644
index 00000000000..917256bf4b1
--- /dev/null
+++ b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.cpp
@@ -0,0 +1,135 @@
+#include <Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.h>
+
+#include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/Utils.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+namespace
+{
+
+class RewriteSumFunctionWithSumAndCountVisitor : public InDepthQueryTreeVisitorWithContext<RewriteSumFunctionWithSumAndCountVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<RewriteSumFunctionWithSumAndCountVisitor>;
+    using Base::Base;
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        if (!getSettings().optimize_arithmetic_operations_in_aggregate_functions)
+            return;
+
+        static const std::unordered_set<String> func_supported = {
+            "plus",
+            "minus"
+        };
+
+        auto * function_node = node->as<FunctionNode>();
+        if (!function_node || Poco::toLower(function_node->getFunctionName()) != "sum")
+            return;
+
+        const auto & function_nodes = function_node->getArguments().getNodes();
+        if (function_nodes.size() != 1)
+            return;
+
+        const auto * func_plus_minus_node = function_nodes[0]->as<FunctionNode>();
+        if (!func_plus_minus_node || !func_supported.contains(Poco::toLower(func_plus_minus_node->getFunctionName())))
+            return;
+
+        const auto & func_plus_minus_nodes = func_plus_minus_node->getArguments().getNodes();
+        if (func_plus_minus_nodes.size() != 2)
+            return;
+
+        size_t column_id;
+        if (func_plus_minus_nodes[0]->as<ColumnNode>() && func_plus_minus_nodes[1]->as<ConstantNode>())
+            column_id = 0;
+        else if (func_plus_minus_nodes[0]->as<ConstantNode>() && func_plus_minus_nodes[1]->as<ColumnNode>())
+            column_id = 1;
+        else
+            return;
+
+        size_t literal_id = 1 - column_id;
+        const auto * literal = func_plus_minus_nodes[literal_id]->as<ConstantNode>();
+        if (!literal)
+            return;
+
+        const auto literal_type = literal->getResultType();
+        if (!literal_type || !WhichDataType(literal_type).isNumber())
+            return;
+
+        const auto * column_node = func_plus_minus_nodes[column_id]->as<ColumnNode>();
+        if (!column_node)
+            return;
+
+        const auto column_type = column_node->getColumnType();
+        if (!column_type || !isNumber(column_type))
+            return;
+
+        const auto lhs = std::make_shared<FunctionNode>("sum");
+        lhs->getArguments().getNodes().push_back(func_plus_minus_nodes[column_id]);
+        resolveAsAggregateFunctionNode(*lhs, column_type);
+
+        const auto rhs_count = std::make_shared<FunctionNode>("count");
+        rhs_count->getArguments().getNodes().push_back(func_plus_minus_nodes[column_id]);
+        resolveAsAggregateFunctionNode(*rhs_count, column_type);
+
+        const auto rhs = std::make_shared<FunctionNode>("multiply");
+        rhs->getArguments().getNodes().push_back(func_plus_minus_nodes[literal_id]);
+        rhs->getArguments().getNodes().push_back(rhs_count);
+        resolveOrdinaryFunctionNode(*rhs, rhs->getFunctionName());
+
+        auto new_node = std::make_shared<FunctionNode>(Poco::toLower(func_plus_minus_node->getFunctionName()));
+        if (column_id == 0)
+            new_node->getArguments().getNodes() = {lhs, rhs};
+        else if (column_id == 1)
+            new_node->getArguments().getNodes() = {rhs, lhs};
+        resolveOrdinaryFunctionNode(*new_node, new_node->getFunctionName());
+
+        if (!new_node)
+            return;
+
+        QueryTreeNodePtr res = std::move(new_node);
+
+        if (!res->getResultType()->equals(*function_node->getResultType()))
+            res = createCastFunction(res, function_node->getResultType(), getContext());
+
+        node = std::move(res);
+
+    }
+
+private:
+    void resolveOrdinaryFunctionNode(FunctionNode & function_node, const String & function_name) const
+    {
+        const auto function = FunctionFactory::instance().get(function_name, getContext());
+        function_node.resolveAsFunction(function->build(function_node.getArgumentColumns()));
+    }
+
+    static inline void resolveAsAggregateFunctionNode(FunctionNode & function_node, const DataTypePtr & argument_type)
+    {
+        AggregateFunctionProperties properties;
+        const auto aggregate_function = AggregateFunctionFactory::instance().get(function_node.getFunctionName(),
+            NullsAction::EMPTY,
+            {argument_type},
+            {},
+            properties);
+
+        function_node.resolveAsAggregateFunction(aggregate_function);
+    }
+
+};
+
+}
+
+void RewriteSumFunctionWithSumAndCountPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
+{
+    RewriteSumFunctionWithSumAndCountVisitor visitor(std::move(context));
+    visitor.visit(query_tree_node);
+}
+
+}
diff --git a/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.h b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.h
new file mode 100644
index 00000000000..4615532e3d9
--- /dev/null
+++ b/src/Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <Analyzer/IQueryTreePass.h>
+
+namespace DB
+{
+
+/**
+ * Rewrites `sum(column +/- literal)` into two individual functions
+ * `sum(column)` and `literal * count(column)`.
+ * sum(column + literal) -> sum(column) + literal * count(column)
+ * sum(literal + column) -> literal * count(column) + sum(column)
+ * sum(column - literal) -> sum(column) - literal * count(column)
+ * sum(literal - column) -> literal * count(column) - sum(column)
+ */
+class RewriteSumFunctionWithSumAndCountPass final : public IQueryTreePass
+{
+public:
+    String getName() override { return "RewriteSumFunctionWithSumAndCountPass"; }
+
+    String getDescription() override { return "Rewrite sum(column +/- literal) into sum(column) and literal * count(column)"; }
+
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
+
+};
+
+}
diff --git a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
index 52c30b7b35d..82e3281121c 100644
--- a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
+++ b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.cpp
@@ -58,7 +58,7 @@ public:
 
 }
 
-void ShardNumColumnToFunctionPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+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
index 71a038bcf39..248f4e29bbe 100644
--- a/src/Analyzer/Passes/ShardNumColumnToFunctionPass.h
+++ b/src/Analyzer/Passes/ShardNumColumnToFunctionPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Rewrite _shard_num column into shardNum() function"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/SumIfToCountIfPass.cpp b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
index c6b1c6eb851..1a4712aa697 100644
--- a/src/Analyzer/Passes/SumIfToCountIfPass.cpp
+++ b/src/Analyzer/Passes/SumIfToCountIfPass.cpp
@@ -54,10 +54,10 @@ public:
             if (!constant_node)
                 return;
 
-            const auto & constant_value_literal = constant_node->getValue();
-            if (!isInt64OrUInt64FieldType(constant_value_literal.getType()))
+            if (auto constant_type = constant_node->getResultType(); !isNativeInteger(constant_type))
                 return;
 
+            const auto & constant_value_literal = constant_node->getValue();
             if (getSettings().aggregate_functions_null_for_empty)
                 return;
 
@@ -97,13 +97,15 @@ public:
         if (!if_true_condition_constant_node || !if_false_condition_constant_node)
             return;
 
+        if (auto constant_type = if_true_condition_constant_node->getResultType(); !isNativeInteger(constant_type))
+            return;
+
+        if (auto constant_type = if_false_condition_constant_node->getResultType(); !isNativeInteger(constant_type))
+            return;
+
         const auto & if_true_condition_constant_value_literal = if_true_condition_constant_node->getValue();
         const auto & if_false_condition_constant_value_literal = if_false_condition_constant_node->getValue();
 
-        if (!isInt64OrUInt64FieldType(if_true_condition_constant_value_literal.getType()) ||
-            !isInt64OrUInt64FieldType(if_false_condition_constant_value_literal.getType()))
-            return;
-
         auto if_true_condition_value = if_true_condition_constant_value_literal.get<UInt64>();
         auto if_false_condition_value = if_false_condition_constant_value_literal.get<UInt64>();
 
@@ -178,7 +180,7 @@ private:
 
 }
 
-void SumIfToCountIfPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void SumIfToCountIfPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     SumIfToCountIfVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/SumIfToCountIfPass.h b/src/Analyzer/Passes/SumIfToCountIfPass.h
index f3ba47f1c2c..439d80c6306 100644
--- a/src/Analyzer/Passes/SumIfToCountIfPass.h
+++ b/src/Analyzer/Passes/SumIfToCountIfPass.h
@@ -23,7 +23,7 @@ public:
 
     String getDescription() override { return "Rewrite sum(if) and sumIf into countIf"; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
index a8382930506..d087fe1c7b9 100644
--- a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
+++ b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.cpp
@@ -89,7 +89,7 @@ public:
 
 }
 
-void UniqInjectiveFunctionsEliminationPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void UniqInjectiveFunctionsEliminationPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     UniqInjectiveFunctionsEliminationVisitor visitor(std::move(context));
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h
index a0f07dfb7b5..c143fe2c39c 100644
--- a/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h
+++ b/src/Analyzer/Passes/UniqInjectiveFunctionsEliminationPass.h
@@ -17,7 +17,7 @@ public:
 
     String getDescription() override { return "Remove injective functions from uniq functions arguments."; }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 
 };
 
diff --git a/src/Analyzer/Passes/UniqToCountPass.cpp b/src/Analyzer/Passes/UniqToCountPass.cpp
index 27527d9f5e7..b801865c9a5 100644
--- a/src/Analyzer/Passes/UniqToCountPass.cpp
+++ b/src/Analyzer/Passes/UniqToCountPass.cpp
@@ -1,4 +1,4 @@
-#include "UniqToCountPass.h"
+#include <Analyzer/Passes/UniqToCountPass.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/IAggregateFunction.h>
@@ -29,7 +29,8 @@ NamesAndTypes extractProjectionColumnsForGroupBy(const QueryNode * query_node)
         return {};
 
     NamesAndTypes result;
-    for (const auto & group_by_ele : query_node->getGroupByNode()->getChildren())
+    const auto & group_by_elements = query_node->getGroupByNode()->getChildren();
+    for (const auto & group_by_element : group_by_elements)
     {
         const auto & projection_columns = query_node->getProjectionColumns();
         const auto & projection_nodes = query_node->getProjection().getNodes();
@@ -38,10 +39,18 @@ NamesAndTypes extractProjectionColumnsForGroupBy(const QueryNode * query_node)
 
         for (size_t i = 0; i < projection_columns.size(); i++)
         {
-            if (projection_nodes[i]->isEqual(*group_by_ele))
+            if (projection_nodes[i]->isEqual(*group_by_element))
+            {
                 result.push_back(projection_columns[i]);
+                break;
+            }
         }
     }
+    /// If some group by keys are not matched, we cannot apply optimization,
+    /// because prefix of group by keys may not be unique.
+    if (result.size() != group_by_elements.size())
+        return {};
+
     return result;
 }
 
@@ -185,7 +194,7 @@ public:
 };
 
 
-void UniqToCountPass::run(QueryTreeNodePtr query_tree_node, ContextPtr context)
+void UniqToCountPass::run(QueryTreeNodePtr & query_tree_node, ContextPtr context)
 {
     UniqToCountVisitor visitor(context);
     visitor.visit(query_tree_node);
diff --git a/src/Analyzer/Passes/UniqToCountPass.h b/src/Analyzer/Passes/UniqToCountPass.h
index 4992d524e5e..5be9f0fae71 100644
--- a/src/Analyzer/Passes/UniqToCountPass.h
+++ b/src/Analyzer/Passes/UniqToCountPass.h
@@ -24,7 +24,7 @@ public:
         return "Rewrite uniq and its variants(except uniqUpTo) to count if subquery has distinct or group by clause.";
     }
 
-    void run(QueryTreeNodePtr query_tree_node, ContextPtr context) override;
+    void run(QueryTreeNodePtr & query_tree_node, ContextPtr context) override;
 };
 
 }
diff --git a/src/Analyzer/QueryNode.cpp b/src/Analyzer/QueryNode.cpp
index 738b1ac62e8..bc7a29247e4 100644
--- a/src/Analyzer/QueryNode.cpp
+++ b/src/Analyzer/QueryNode.cpp
@@ -119,6 +119,9 @@ void QueryNode::dumpTreeImpl(WriteBuffer & buffer, FormatState & format_state, s
     if (is_group_by_all)
         buffer << ", is_group_by_all: " << is_group_by_all;
 
+    if (is_order_by_all)
+        buffer << ", is_order_by_all: " << is_order_by_all;
+
     std::string group_by_type;
     if (is_group_by_with_rollup)
         group_by_type = "rollup";
@@ -257,6 +260,7 @@ bool QueryNode::isEqualImpl(const IQueryTreeNode & rhs) const
         is_group_by_with_cube == rhs_typed.is_group_by_with_cube &&
         is_group_by_with_grouping_sets == rhs_typed.is_group_by_with_grouping_sets &&
         is_group_by_all == rhs_typed.is_group_by_all &&
+        is_order_by_all == rhs_typed.is_order_by_all &&
         cte_name == rhs_typed.cte_name &&
         projection_columns == rhs_typed.projection_columns &&
         settings_changes == rhs_typed.settings_changes;
@@ -288,6 +292,7 @@ void QueryNode::updateTreeHashImpl(HashState & state) const
     state.update(is_group_by_with_cube);
     state.update(is_group_by_with_grouping_sets);
     state.update(is_group_by_all);
+    state.update(is_order_by_all);
 
     state.update(settings_changes.size());
 
@@ -306,18 +311,19 @@ QueryTreeNodePtr QueryNode::cloneImpl() const
 {
     auto result_query_node = std::make_shared<QueryNode>(context);
 
-    result_query_node->is_subquery = is_subquery;
-    result_query_node->is_cte = is_cte;
-    result_query_node->is_distinct = is_distinct;
-    result_query_node->is_limit_with_ties = is_limit_with_ties;
-    result_query_node->is_group_by_with_totals = is_group_by_with_totals;
-    result_query_node->is_group_by_with_rollup = is_group_by_with_rollup;
-    result_query_node->is_group_by_with_cube = is_group_by_with_cube;
+    result_query_node->is_subquery                    = is_subquery;
+    result_query_node->is_cte                         = is_cte;
+    result_query_node->is_distinct                    = is_distinct;
+    result_query_node->is_limit_with_ties             = is_limit_with_ties;
+    result_query_node->is_group_by_with_totals        = is_group_by_with_totals;
+    result_query_node->is_group_by_with_rollup        = is_group_by_with_rollup;
+    result_query_node->is_group_by_with_cube          = is_group_by_with_cube;
     result_query_node->is_group_by_with_grouping_sets = is_group_by_with_grouping_sets;
-    result_query_node->is_group_by_all = is_group_by_all;
-    result_query_node->cte_name = cte_name;
-    result_query_node->projection_columns = projection_columns;
-    result_query_node->settings_changes = settings_changes;
+    result_query_node->is_group_by_all                = is_group_by_all;
+    result_query_node->is_order_by_all                = is_order_by_all;
+    result_query_node->cte_name                       = cte_name;
+    result_query_node->projection_columns             = projection_columns;
+    result_query_node->settings_changes               = settings_changes;
 
     return result_query_node;
 }
@@ -332,6 +338,7 @@ ASTPtr QueryNode::toASTImpl(const ConvertToASTOptions & options) const
     select_query->group_by_with_cube = is_group_by_with_cube;
     select_query->group_by_with_grouping_sets = is_group_by_with_grouping_sets;
     select_query->group_by_all = is_group_by_all;
+    select_query->order_by_all = is_order_by_all;
 
     if (hasWith())
         select_query->setExpression(ASTSelectQuery::Expression::WITH, getWith().toAST(options));
@@ -414,11 +421,8 @@ ASTPtr QueryNode::toASTImpl(const ConvertToASTOptions & options) const
 
     if (is_subquery)
     {
-        auto subquery = std::make_shared<ASTSubquery>();
-
+        auto subquery = std::make_shared<ASTSubquery>(std::move(result_select_query));
         subquery->cte_name = cte_name;
-        subquery->children.push_back(std::move(result_select_query));
-
         return subquery;
     }
 
diff --git a/src/Analyzer/QueryNode.h b/src/Analyzer/QueryNode.h
index d8b8741afb2..6f9067908dd 100644
--- a/src/Analyzer/QueryNode.h
+++ b/src/Analyzer/QueryNode.h
@@ -99,6 +99,11 @@ public:
         return settings_changes;
     }
 
+    void clearSettingsChanges()
+    {
+        settings_changes.clear();
+    }
+
     /// Returns true if query node is subquery, false otherwise
     bool isSubquery() const
     {
diff --git a/src/Analyzer/QueryTreeBuilder.cpp b/src/Analyzer/QueryTreeBuilder.cpp
index 4e2d0ad10a8..a4f20472432 100644
--- a/src/Analyzer/QueryTreeBuilder.cpp
+++ b/src/Analyzer/QueryTreeBuilder.cpp
@@ -2,10 +2,7 @@
 
 #include <Common/FieldVisitorToString.h>
 
-#include <DataTypes/IDataType.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Parsers/ParserSelectQuery.h>
+#include <DataTypes/FieldToDataType.h>
 #include <Parsers/ParserSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSelectIntersectExceptQuery.h>
@@ -32,13 +29,11 @@
 #include <Analyzer/MatcherNode.h>
 #include <Analyzer/ColumnTransformers.h>
 #include <Analyzer/ConstantNode.h>
-#include <Analyzer/ColumnNode.h>
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/LambdaNode.h>
 #include <Analyzer/SortNode.h>
 #include <Analyzer/InterpolateNode.h>
 #include <Analyzer/WindowNode.h>
-#include <Analyzer/TableNode.h>
 #include <Analyzer/TableFunctionNode.h>
 #include <Analyzer/QueryNode.h>
 #include <Analyzer/ArrayJoinNode.h>
@@ -49,7 +44,6 @@
 
 #include <Interpreters/StorageID.h>
 #include <Interpreters/Context.h>
-#include <Functions/FunctionFactory.h>
 
 
 namespace DB
@@ -450,8 +444,8 @@ QueryTreeNodePtr QueryTreeBuilder::buildSortList(const ASTPtr & order_by_express
             nulls_sort_direction = order_by_element.nulls_direction == 1 ? SortDirection::ASCENDING : SortDirection::DESCENDING;
 
         std::shared_ptr<Collator> collator;
-        if (order_by_element.collation)
-            collator = std::make_shared<Collator>(order_by_element.collation->as<ASTLiteral &>().value.get<String &>());
+        if (order_by_element.getCollation())
+            collator = std::make_shared<Collator>(order_by_element.getCollation()->as<ASTLiteral &>().value.get<String &>());
 
         const auto & sort_expression_ast = order_by_element.children.at(0);
         auto sort_expression = buildExpression(sort_expression_ast, context);
@@ -461,12 +455,12 @@ QueryTreeNodePtr QueryTreeBuilder::buildSortList(const ASTPtr & order_by_express
             std::move(collator),
             order_by_element.with_fill);
 
-        if (order_by_element.fill_from)
-            sort_node->getFillFrom() = buildExpression(order_by_element.fill_from, context);
-        if (order_by_element.fill_to)
-            sort_node->getFillTo() = buildExpression(order_by_element.fill_to, context);
-        if (order_by_element.fill_step)
-            sort_node->getFillStep() = buildExpression(order_by_element.fill_step, context);
+        if (order_by_element.getFillFrom())
+            sort_node->getFillFrom() = buildExpression(order_by_element.getFillFrom(), context);
+        if (order_by_element.getFillTo())
+            sort_node->getFillTo() = buildExpression(order_by_element.getFillTo(), context);
+        if (order_by_element.getFillStep())
+            sort_node->getFillStep() = buildExpression(order_by_element.getFillStep(), context);
 
         list_node->getNodes().push_back(std::move(sort_node));
     }
@@ -557,11 +551,14 @@ QueryTreeNodePtr QueryTreeBuilder::buildExpression(const ASTPtr & expression, co
     }
     else if (const auto * ast_literal = expression->as<ASTLiteral>())
     {
-        result = std::make_shared<ConstantNode>(ast_literal->value);
+        if (context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type)
+            result = std::make_shared<ConstantNode>(ast_literal->value, applyVisitor(FieldToDataType<LeastSupertypeOnError::Variant>(), ast_literal->value));
+        else
+            result = std::make_shared<ConstantNode>(ast_literal->value);
     }
     else if (const auto * function = expression->as<ASTFunction>())
     {
-        if (function->is_lambda_function)
+        if (function->is_lambda_function || isASTLambdaFunction(*function))
         {
             const auto & lambda_arguments_and_expression = function->arguments->as<ASTExpressionList &>().children;
             auto & lambda_arguments_tuple = lambda_arguments_and_expression.at(0)->as<ASTFunction &>();
@@ -657,7 +654,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildExpression(const ASTPtr & expression, co
     else if (const auto * columns_regexp_matcher = expression->as<ASTColumnsRegexpMatcher>())
     {
         auto column_transformers = buildColumnTransformers(columns_regexp_matcher->transformers, context);
-        result = std::make_shared<MatcherNode>(columns_regexp_matcher->getMatcher(), std::move(column_transformers));
+        result = std::make_shared<MatcherNode>(columns_regexp_matcher->getPattern(), std::move(column_transformers));
     }
     else if (const auto * columns_list_matcher = expression->as<ASTColumnsListMatcher>())
     {
@@ -677,7 +674,7 @@ QueryTreeNodePtr QueryTreeBuilder::buildExpression(const ASTPtr & expression, co
     {
         auto & qualified_identifier = qualified_columns_regexp_matcher->qualifier->as<ASTIdentifier &>();
         auto column_transformers = buildColumnTransformers(qualified_columns_regexp_matcher->transformers, context);
-        result = std::make_shared<MatcherNode>(Identifier(qualified_identifier.name_parts), qualified_columns_regexp_matcher->getMatcher(), std::move(column_transformers));
+        result = std::make_shared<MatcherNode>(Identifier(qualified_identifier.name_parts), qualified_columns_regexp_matcher->getPattern(), std::move(column_transformers));
     }
     else if (const auto * qualified_columns_list_matcher = expression->as<ASTQualifiedColumnsListMatcher>())
     {
diff --git a/src/Analyzer/QueryTreePassManager.cpp b/src/Analyzer/QueryTreePassManager.cpp
index 0ec29a2155b..9c07884a464 100644
--- a/src/Analyzer/QueryTreePassManager.cpp
+++ b/src/Analyzer/QueryTreePassManager.cpp
@@ -3,6 +3,7 @@
 #include <memory>
 
 #include <Common/Exception.h>
+#include "Analyzer/Passes/OptimizeGroupByInjectiveFunctionsPass.h"
 
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
@@ -18,6 +19,7 @@
 #include <Analyzer/Utils.h>
 #include <Analyzer/Passes/QueryAnalysisPass.h>
 #include <Analyzer/Passes/RemoveUnusedProjectionColumnsPass.h>
+#include <Analyzer/Passes/RewriteSumFunctionWithSumAndCountPass.h>
 #include <Analyzer/Passes/CountDistinctPass.h>
 #include <Analyzer/Passes/UniqToCountPass.h>
 #include <Analyzer/Passes/FunctionToSubcolumnsPass.h>
@@ -44,6 +46,7 @@
 #include <Analyzer/Passes/CrossToInnerJoinPass.h>
 #include <Analyzer/Passes/ShardNumColumnToFunctionPass.h>
 #include <Analyzer/Passes/ConvertQueryToCNFPass.h>
+#include <Analyzer/Passes/AggregateFunctionOfGroupByKeysPass.h>
 #include <Analyzer/Passes/OptimizeDateOrDateTimeConverterWithPreimagePass.h>
 
 
@@ -59,7 +62,7 @@ namespace ErrorCodes
 namespace
 {
 
-#ifndef NDEBUG
+#if defined(ABORT_ON_LOGICAL_ERROR)
 
 /** This visitor checks if Query Tree structure is valid after each pass
   * in debug build.
@@ -162,9 +165,6 @@ private:
 
 /** ClickHouse query tree pass manager.
   *
-  * TODO: Support setting optimize_substitute_columns.
-  * TODO: Support GROUP BY injective function elimination.
-  * TODO: Support setting optimize_aggregators_of_group_by_keys.
   * TODO: Support setting optimize_monotonous_functions_in_order_by.
   * TODO: Add optimizations based on function semantics. Example: SELECT * FROM test_table WHERE id != id. (id is not nullable column).
   */
@@ -184,12 +184,18 @@ void QueryTreePassManager::run(QueryTreeNodePtr query_tree_node)
     for (size_t i = 0; i < passes_size; ++i)
     {
         passes[i]->run(query_tree_node, current_context);
-#ifndef NDEBUG
+#if defined(ABORT_ON_LOGICAL_ERROR)
         ValidationChecker(passes[i]->getName()).visit(query_tree_node);
 #endif
     }
 }
 
+void QueryTreePassManager::runOnlyResolve(QueryTreeNodePtr query_tree_node)
+{
+    // Run only QueryAnalysisPass and GroupingFunctionsResolvePass passes.
+    run(query_tree_node, 2);
+}
+
 void QueryTreePassManager::run(QueryTreeNodePtr query_tree_node, size_t up_to_pass_index)
 {
     size_t passes_size = passes.size();
@@ -203,7 +209,7 @@ void QueryTreePassManager::run(QueryTreeNodePtr query_tree_node, size_t up_to_pa
     for (size_t i = 0; i < up_to_pass_index; ++i)
     {
         passes[i]->run(query_tree_node, current_context);
-#ifndef NDEBUG
+#if defined(ABORT_ON_LOGICAL_ERROR)
         ValidationChecker(passes[i]->getName()).visit(query_tree_node);
 #endif
     }
@@ -240,14 +246,17 @@ void QueryTreePassManager::dump(WriteBuffer & buffer, size_t up_to_pass_index)
     }
 }
 
-void addQueryTreePasses(QueryTreePassManager & manager)
+void addQueryTreePasses(QueryTreePassManager & manager, bool only_analyze)
 {
-    manager.addPass(std::make_unique<QueryAnalysisPass>());
+    manager.addPass(std::make_unique<QueryAnalysisPass>(only_analyze));
+    manager.addPass(std::make_unique<GroupingFunctionsResolvePass>());
+
     manager.addPass(std::make_unique<RemoveUnusedProjectionColumnsPass>());
     manager.addPass(std::make_unique<FunctionToSubcolumnsPass>());
 
     manager.addPass(std::make_unique<ConvertLogicalExpressionToCNFPass>());
 
+    manager.addPass(std::make_unique<RewriteSumFunctionWithSumAndCountPass>());
     manager.addPass(std::make_unique<CountDistinctPass>());
     manager.addPass(std::make_unique<UniqToCountPass>());
     manager.addPass(std::make_unique<RewriteAggregateFunctionWithIfPass>());
@@ -255,9 +264,13 @@ void addQueryTreePasses(QueryTreePassManager & manager)
     manager.addPass(std::make_unique<RewriteArrayExistsToHasPass>());
     manager.addPass(std::make_unique<NormalizeCountVariantsPass>());
 
+    /// should before AggregateFunctionsArithmericOperationsPass
+    manager.addPass(std::make_unique<AggregateFunctionOfGroupByKeysPass>());
+
     manager.addPass(std::make_unique<AggregateFunctionsArithmericOperationsPass>());
     manager.addPass(std::make_unique<UniqInjectiveFunctionsEliminationPass>());
     manager.addPass(std::make_unique<OptimizeGroupByFunctionKeysPass>());
+    manager.addPass(std::make_unique<OptimizeGroupByInjectiveFunctionsPass>());
 
     manager.addPass(std::make_unique<MultiIfToIfPass>());
     manager.addPass(std::make_unique<IfConstantConditionPass>());
@@ -278,7 +291,6 @@ void addQueryTreePasses(QueryTreePassManager & manager)
 
     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/QueryTreePassManager.h b/src/Analyzer/QueryTreePassManager.h
index 3c67fc36178..0a0d72a6698 100644
--- a/src/Analyzer/QueryTreePassManager.h
+++ b/src/Analyzer/QueryTreePassManager.h
@@ -27,6 +27,9 @@ public:
     /// Run query tree passes on query tree
     void run(QueryTreeNodePtr query_tree_node);
 
+    /// Run only query tree passes responsible to name resolution.
+    void runOnlyResolve(QueryTreeNodePtr query_tree_node);
+
     /** Run query tree passes on query tree up to up_to_pass_index.
       * Throws exception if up_to_pass_index is greater than passes size.
       */
@@ -44,6 +47,6 @@ private:
     std::vector<QueryTreePassPtr> passes;
 };
 
-void addQueryTreePasses(QueryTreePassManager & manager);
+void addQueryTreePasses(QueryTreePassManager & manager, bool only_analyze = false);
 
 }
diff --git a/src/Analyzer/SetUtils.h b/src/Analyzer/SetUtils.h
index c35b45dce59..aef906a6576 100644
--- a/src/Analyzer/SetUtils.h
+++ b/src/Analyzer/SetUtils.h
@@ -1,14 +1,15 @@
 #pragma once
 
-#include <Core/Settings.h>
+#include <Core/Block.h>
 
-#include <DataTypes/IDataType.h>
-
-#include <QueryPipeline/SizeLimits.h>
+#include <memory>
 
 namespace DB
 {
 
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+
 class Set;
 using SetPtr = std::shared_ptr<Set>;
 
diff --git a/src/Analyzer/SortNode.cpp b/src/Analyzer/SortNode.cpp
index 8e9913af442..b9d93511b84 100644
--- a/src/Analyzer/SortNode.cpp
+++ b/src/Analyzer/SortNode.cpp
@@ -120,17 +120,18 @@ ASTPtr SortNode::toASTImpl(const ConvertToASTOptions & options) const
 
     result->nulls_direction_was_explicitly_specified = nulls_sort_direction.has_value();
 
-    result->with_fill = with_fill;
-    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)
-    {
-        result->children.push_back(std::make_shared<ASTLiteral>(Field(collator->getLocale())));
-        result->collation = result->children.back();
-    }
+        result->setCollation(std::make_shared<ASTLiteral>(Field(collator->getLocale())));
+
+    result->with_fill = with_fill;
+    if (hasFillFrom())
+        result->setFillFrom(getFillFrom()->toAST(options));
+    if (hasFillTo())
+        result->setFillTo(getFillTo()->toAST(options));
+    if (hasFillStep())
+        result->setFillStep(getFillStep()->toAST(options));
 
     return result;
 }
diff --git a/src/Analyzer/UnionNode.cpp b/src/Analyzer/UnionNode.cpp
index 5d2ac128abe..c6003126554 100644
--- a/src/Analyzer/UnionNode.cpp
+++ b/src/Analyzer/UnionNode.cpp
@@ -185,11 +185,8 @@ ASTPtr UnionNode::toASTImpl(const ConvertToASTOptions & options) const
 
     if (is_subquery)
     {
-        auto subquery = std::make_shared<ASTSubquery>();
-
+        auto subquery = std::make_shared<ASTSubquery>(std::move(select_with_union_query));
         subquery->cte_name = cte_name;
-        subquery->children.push_back(std::move(select_with_union_query));
-
         return subquery;
     }
 
diff --git a/src/Analyzer/Utils.cpp b/src/Analyzer/Utils.cpp
index 53fcf534f64..2882c4e0c02 100644
--- a/src/Analyzer/Utils.cpp
+++ b/src/Analyzer/Utils.cpp
@@ -326,7 +326,69 @@ void addTableExpressionOrJoinIntoTablesInSelectQuery(ASTPtr & tables_in_select_q
     }
 }
 
-QueryTreeNodes extractTableExpressions(const QueryTreeNodePtr & join_tree_node, bool add_array_join)
+QueryTreeNodes extractAllTableReferences(const QueryTreeNodePtr & tree)
+{
+    QueryTreeNodes result;
+
+    QueryTreeNodes nodes_to_process;
+    nodes_to_process.push_back(tree);
+
+    while (!nodes_to_process.empty())
+    {
+        auto node_to_process = std::move(nodes_to_process.back());
+        nodes_to_process.pop_back();
+
+        auto node_type = node_to_process->getNodeType();
+
+        switch (node_type)
+        {
+            case QueryTreeNodeType::TABLE:
+            {
+                result.push_back(std::move(node_to_process));
+                break;
+            }
+            case QueryTreeNodeType::QUERY:
+            {
+                nodes_to_process.push_back(node_to_process->as<QueryNode>()->getJoinTree());
+                break;
+            }
+            case QueryTreeNodeType::UNION:
+            {
+                for (const auto & union_node : node_to_process->as<UnionNode>()->getQueries().getNodes())
+                    nodes_to_process.push_back(union_node);
+                break;
+            }
+            case QueryTreeNodeType::TABLE_FUNCTION:
+            {
+                // Arguments of table function can't contain TableNodes.
+                break;
+            }
+            case QueryTreeNodeType::ARRAY_JOIN:
+            {
+                nodes_to_process.push_back(node_to_process->as<ArrayJoinNode>()->getTableExpression());
+                break;
+            }
+            case QueryTreeNodeType::JOIN:
+            {
+                auto & join_node = node_to_process->as<JoinNode &>();
+                nodes_to_process.push_back(join_node.getRightTableExpression());
+                nodes_to_process.push_back(join_node.getLeftTableExpression());
+                break;
+            }
+            default:
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Unexpected node type for table expression. "
+                                "Expected table, table function, query, union, join or array join. Actual {}",
+                                node_to_process->getNodeTypeName());
+            }
+        }
+    }
+
+    return result;
+}
+
+QueryTreeNodes extractTableExpressions(const QueryTreeNodePtr & join_tree_node, bool add_array_join, bool recursive)
 {
     QueryTreeNodes result;
 
@@ -344,15 +406,28 @@ QueryTreeNodes extractTableExpressions(const QueryTreeNodePtr & join_tree_node,
         {
             case QueryTreeNodeType::TABLE:
                 [[fallthrough]];
-            case QueryTreeNodeType::QUERY:
-                [[fallthrough]];
-            case QueryTreeNodeType::UNION:
-                [[fallthrough]];
             case QueryTreeNodeType::TABLE_FUNCTION:
             {
                 result.push_back(std::move(node_to_process));
                 break;
             }
+            case QueryTreeNodeType::QUERY:
+            {
+                if (recursive)
+                    nodes_to_process.push_back(node_to_process->as<QueryNode>()->getJoinTree());
+                result.push_back(std::move(node_to_process));
+                break;
+            }
+            case QueryTreeNodeType::UNION:
+            {
+                if (recursive)
+                {
+                    for (const auto & union_node : node_to_process->as<UnionNode>()->getQueries().getNodes())
+                        nodes_to_process.push_back(union_node);
+                }
+                result.push_back(std::move(node_to_process));
+                break;
+            }
             case QueryTreeNodeType::ARRAY_JOIN:
             {
                 auto & array_join_node = node_to_process->as<ArrayJoinNode &>();
@@ -626,7 +701,7 @@ void rerunFunctionResolve(FunctionNode * function_node, ContextPtr context)
     }
     else if (function_node->isAggregateFunction())
     {
-        if (name == "nothing")
+        if (name == "nothing" || name == "nothingUInt64" || name == "nothingNull")
             return;
         function_node->resolveAsAggregateFunction(resolveAggregateFunction(function_node));
     }
@@ -685,4 +760,26 @@ QueryTreeNodePtr createCastFunction(QueryTreeNodePtr node, DataTypePtr result_ty
     return function_node;
 }
 
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(QueryTreeNodePtr table_node, const ContextPtr & context)
+{
+    const auto & storage_snapshot = table_node->as<TableNode>()->getStorageSnapshot();
+    auto columns_to_select = storage_snapshot->getColumns(GetColumnsOptions(GetColumnsOptions::Ordinary));
+    size_t columns_to_select_size = columns_to_select.size();
+    auto column_nodes_to_select = std::make_shared<ListNode>();
+    column_nodes_to_select->getNodes().reserve(columns_to_select_size);
+    NamesAndTypes projection_columns;
+    projection_columns.reserve(columns_to_select_size);
+    for (auto & column : columns_to_select)
+    {
+        column_nodes_to_select->getNodes().emplace_back(std::make_shared<ColumnNode>(column, table_node));
+        projection_columns.emplace_back(column.name, column.type);
+    }
+    auto subquery_for_table = std::make_shared<QueryNode>(Context::createCopy(context));
+    subquery_for_table->setIsSubquery(true);
+    subquery_for_table->getProjectionNode() = std::move(column_nodes_to_select);
+    subquery_for_table->getJoinTree() = std::move(table_node);
+    subquery_for_table->resolveProjectionColumns(std::move(projection_columns));
+    return subquery_for_table;
+}
+
 }
diff --git a/src/Analyzer/Utils.h b/src/Analyzer/Utils.h
index d3eb6ba3cc2..1b4a7d5ef3c 100644
--- a/src/Analyzer/Utils.h
+++ b/src/Analyzer/Utils.h
@@ -50,10 +50,13 @@ std::optional<bool> tryExtractConstantFromConditionNode(const QueryTreeNodePtr &
   */
 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, bool add_array_join = false);
+/// Extract all TableNodes from the query tree.
+QueryTreeNodes extractAllTableReferences(const QueryTreeNodePtr & tree);
 
-/// Extract left table expression from join tree
+/// Extract table, table function, query, union from join tree.
+QueryTreeNodes extractTableExpressions(const QueryTreeNodePtr & join_tree_node, bool add_array_join = false, bool recursive = false);
+
+/// Extract left table expression from join tree.
 QueryTreeNodePtr extractLeftTableExpression(const QueryTreeNodePtr & join_tree_node);
 
 /** Build table expressions stack that consists from table, table function, query, union, join, array join from join tree.
@@ -102,4 +105,7 @@ NameSet collectIdentifiersFullNames(const QueryTreeNodePtr & node);
 /// Wrap node into `_CAST` function
 QueryTreeNodePtr createCastFunction(QueryTreeNodePtr node, DataTypePtr result_type, ContextPtr context);
 
+/// Build subquery which we execute for `IN table` function.
+QueryTreeNodePtr buildSubqueryToReadColumnsFromTableExpression(QueryTreeNodePtr table_node, const ContextPtr & context);
+
 }
diff --git a/src/Analyzer/WindowNode.cpp b/src/Analyzer/WindowNode.cpp
index 0fbe7c51bc7..af830815fd5 100644
--- a/src/Analyzer/WindowNode.cpp
+++ b/src/Analyzer/WindowNode.cpp
@@ -1,11 +1,9 @@
 #include <Analyzer/WindowNode.h>
-
-#include <Common/SipHash.h>
-
-#include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
-
+#include <IO/WriteBufferFromString.h>
 #include <Parsers/ASTWindowDefinition.h>
+#include <Common/SipHash.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
diff --git a/src/Backups/BackupCoordinationFileInfos.h b/src/Backups/BackupCoordinationFileInfos.h
index b0d302b1767..fd60c2252e4 100644
--- a/src/Backups/BackupCoordinationFileInfos.h
+++ b/src/Backups/BackupCoordinationFileInfos.h
@@ -19,7 +19,7 @@ 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_) {}
+    explicit BackupCoordinationFileInfos(bool plain_backup_) : plain_backup(plain_backup_) {}
 
     /// Adds file infos for the specified host.
     void addFileInfos(BackupFileInfos && file_infos, const String & host_id);
diff --git a/src/Backups/BackupCoordinationLocal.cpp b/src/Backups/BackupCoordinationLocal.cpp
index fb91bae2303..9964de2ad6e 100644
--- a/src/Backups/BackupCoordinationLocal.cpp
+++ b/src/Backups/BackupCoordinationLocal.cpp
@@ -9,7 +9,7 @@ namespace DB
 {
 
 BackupCoordinationLocal::BackupCoordinationLocal(bool plain_backup_)
-    : log(&Poco::Logger::get("BackupCoordinationLocal")), file_infos(plain_backup_)
+    : log(getLogger("BackupCoordinationLocal")), file_infos(plain_backup_)
 {
 }
 
diff --git a/src/Backups/BackupCoordinationLocal.h b/src/Backups/BackupCoordinationLocal.h
index f73cbbe29a8..e0aa5dc67a4 100644
--- a/src/Backups/BackupCoordinationLocal.h
+++ b/src/Backups/BackupCoordinationLocal.h
@@ -21,7 +21,7 @@ namespace DB
 class BackupCoordinationLocal : public IBackupCoordination
 {
 public:
-    BackupCoordinationLocal(bool plain_backup_);
+    explicit BackupCoordinationLocal(bool plain_backup_);
     ~BackupCoordinationLocal() override;
 
     void setStage(const String & new_stage, const String & message) override;
@@ -57,7 +57,7 @@ public:
     bool hasConcurrentBackups(const std::atomic<size_t> & num_active_backups) const override;
 
 private:
-    Poco::Logger * const log;
+    LoggerPtr const log;
 
     BackupCoordinationReplicatedTables TSA_GUARDED_BY(replicated_tables_mutex) replicated_tables;
     BackupCoordinationReplicatedAccess TSA_GUARDED_BY(replicated_access_mutex) replicated_access;
diff --git a/src/Backups/BackupCoordinationRemote.cpp b/src/Backups/BackupCoordinationRemote.cpp
index b659887e0da..455f45a7a77 100644
--- a/src/Backups/BackupCoordinationRemote.cpp
+++ b/src/Backups/BackupCoordinationRemote.cpp
@@ -1,6 +1,7 @@
 #include <Backups/BackupCoordinationRemote.h>
 
 #include <base/hex.h>
+#include <boost/algorithm/string/split.hpp>
 
 #include <Access/Common/AccessEntityType.h>
 #include <Backups/BackupCoordinationReplicatedAccess.h>
@@ -14,6 +15,8 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
 
+#include <boost/algorithm/string.hpp>
+
 
 namespace DB
 {
@@ -162,7 +165,8 @@ BackupCoordinationRemote::BackupCoordinationRemote(
     const Strings & all_hosts_,
     const String & current_host_,
     bool plain_backup_,
-    bool is_internal_)
+    bool is_internal_,
+    QueryStatusPtr process_list_element_)
     : root_zookeeper_path(root_zookeeper_path_)
     , zookeeper_path(root_zookeeper_path_ + "/backup-" + backup_uuid_)
     , keeper_settings(keeper_settings_)
@@ -172,11 +176,12 @@ BackupCoordinationRemote::BackupCoordinationRemote(
     , current_host_index(findCurrentHostIndex(all_hosts, current_host))
     , plain_backup(plain_backup_)
     , is_internal(is_internal_)
-    , log(&Poco::Logger::get("BackupCoordinationRemote"))
+    , log(getLogger("BackupCoordinationRemote"))
     , with_retries(
         log,
         get_zookeeper_,
         keeper_settings,
+        process_list_element_,
         [my_zookeeper_path = zookeeper_path, my_current_host = current_host, my_is_internal = is_internal]
         (WithRetries::FaultyKeeper & zk)
         {
diff --git a/src/Backups/BackupCoordinationRemote.h b/src/Backups/BackupCoordinationRemote.h
index f3b6bff3a68..ce891699bd2 100644
--- a/src/Backups/BackupCoordinationRemote.h
+++ b/src/Backups/BackupCoordinationRemote.h
@@ -30,7 +30,8 @@ public:
         const Strings & all_hosts_,
         const String & current_host_,
         bool plain_backup_,
-        bool is_internal_);
+        bool is_internal_,
+        QueryStatusPtr process_list_element_);
 
     ~BackupCoordinationRemote() override;
 
@@ -101,7 +102,7 @@ private:
     const size_t current_host_index;
     const bool plain_backup;
     const bool is_internal;
-    Poco::Logger * const log;
+    LoggerPtr const log;
 
     /// The order of these two fields matters, because stage_sync holds a reference to with_retries object
     mutable WithRetries with_retries;
diff --git a/src/Backups/BackupCoordinationStageSync.cpp b/src/Backups/BackupCoordinationStageSync.cpp
index 2eba3440be9..17ef163ce35 100644
--- a/src/Backups/BackupCoordinationStageSync.cpp
+++ b/src/Backups/BackupCoordinationStageSync.cpp
@@ -24,7 +24,7 @@ namespace ErrorCodes
 BackupCoordinationStageSync::BackupCoordinationStageSync(
     const String & root_zookeeper_path_,
     WithRetries & with_retries_,
-    Poco::Logger * log_)
+    LoggerPtr log_)
     : zookeeper_path(root_zookeeper_path_ + "/stage")
     , with_retries(with_retries_)
     , log(log_)
diff --git a/src/Backups/BackupCoordinationStageSync.h b/src/Backups/BackupCoordinationStageSync.h
index e34fbcc099b..a06c5c61041 100644
--- a/src/Backups/BackupCoordinationStageSync.h
+++ b/src/Backups/BackupCoordinationStageSync.h
@@ -12,7 +12,7 @@ public:
     BackupCoordinationStageSync(
         const String & root_zookeeper_path_,
         WithRetries & with_retries_,
-        Poco::Logger * log_);
+        LoggerPtr 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, const bool & all_hosts = false);
@@ -36,7 +36,7 @@ private:
     String zookeeper_path;
     /// A reference to the field of parent object - BackupCoordinationRemote or RestoreCoordinationRemote
     WithRetries & with_retries;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Backups/BackupEntriesCollector.cpp b/src/Backups/BackupEntriesCollector.cpp
index 564a518689a..2efb6bf84ad 100644
--- a/src/Backups/BackupEntriesCollector.cpp
+++ b/src/Backups/BackupEntriesCollector.cpp
@@ -1,21 +1,25 @@
+#include <Access/Common/AccessEntityType.h>
+#include <Backups/BackupCoordinationStage.h>
 #include <Backups/BackupEntriesCollector.h>
 #include <Backups/BackupEntryFromMemory.h>
-#include <Backups/IBackupCoordination.h>
-#include <Backups/BackupCoordinationStage.h>
 #include <Backups/BackupUtils.h>
 #include <Backups/DDLAdjustingForBackupVisitor.h>
+#include <Backups/IBackupCoordination.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/formatAST.h>
 #include <Storages/IStorage.h>
-#include <Access/Common/AccessEntityType.h>
 #include <base/chrono_io.h>
 #include <base/insertAtEnd.h>
+#include <base/scope_guard.h>
 #include <base/sleep.h>
 #include <Common/escapeForFileName.h>
+
+#include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
-#include <base/scope_guard.h>
+
 #include <filesystem>
 
 namespace fs = std::filesystem;
@@ -87,6 +91,7 @@ BackupEntriesCollector::BackupEntriesCollector(
     , backup_coordination(backup_coordination_)
     , read_settings(read_settings_)
     , context(context_)
+    , process_list_element(context->getProcessListElement())
     , on_cluster_first_sync_timeout(context->getConfigRef().getUInt64("backups.on_cluster_first_sync_timeout", 180000))
     , collect_metadata_timeout(context->getConfigRef().getUInt64(
           "backups.collect_metadata_timeout", context->getConfigRef().getUInt64("backups.consistent_metadata_snapshot_timeout", 600000)))
@@ -96,7 +101,7 @@ BackupEntriesCollector::BackupEntriesCollector(
     , max_sleep_before_next_attempt_to_collect_metadata(
           context->getConfigRef().getUInt64("backups.max_sleep_before_next_attempt_to_collect_metadata", 5000))
     , compare_collected_metadata(context->getConfigRef().getBool("backups.compare_collected_metadata", true))
-    , log(&Poco::Logger::get("BackupEntriesCollector"))
+    , log(getLogger("BackupEntriesCollector"))
     , global_zookeeper_retries_info(
           context->getSettingsRef().backup_restore_keeper_max_retries,
           context->getSettingsRef().backup_restore_keeper_retry_initial_backoff_ms,
@@ -158,8 +163,9 @@ BackupEntries BackupEntriesCollector::run()
 Strings BackupEntriesCollector::setStage(const String & new_stage, const String & message)
 {
     LOG_TRACE(log, "Setting stage: {}", new_stage);
-    current_stage = new_stage;
+    checkIsQueryCancelled();
 
+    current_stage = new_stage;
     backup_coordination->setStage(new_stage, message);
 
     if (new_stage == Stage::formatGatheringMetadata(0))
@@ -179,6 +185,12 @@ Strings BackupEntriesCollector::setStage(const String & new_stage, const String
     }
 }
 
+void BackupEntriesCollector::checkIsQueryCancelled() const
+{
+    if (process_list_element)
+        process_list_element->checkTimeLimit();
+}
+
 /// Calculates the root path for collecting backup entries,
 /// it's either empty or has the format "shards/<shard_num>/replicas/<replica_num>/".
 void BackupEntriesCollector::calculateRootPathInBackup()
@@ -413,6 +425,8 @@ void BackupEntriesCollector::gatherDatabaseMetadata(
     bool all_tables,
     const std::set<DatabaseAndTableName> & except_table_names)
 {
+    checkIsQueryCancelled();
+
     auto it = database_infos.find(database_name);
     if (it == database_infos.end())
     {
@@ -491,6 +505,8 @@ void BackupEntriesCollector::gatherDatabaseMetadata(
 
 void BackupEntriesCollector::gatherTablesMetadata()
 {
+    checkIsQueryCancelled();
+
     table_infos.clear();
     for (const auto & [database_name, database_info] : database_infos)
     {
@@ -552,6 +568,8 @@ std::vector<std::pair<ASTPtr, StoragePtr>> BackupEntriesCollector::findTablesInD
     const auto & database_info = database_infos.at(database_name);
     const auto & database = database_info.database;
 
+    checkIsQueryCancelled();
+
     auto filter_by_table_name = [my_database_info = &database_info](const String & table_name)
     {
         /// We skip inner tables of materialized views.
@@ -629,8 +647,12 @@ void BackupEntriesCollector::lockTablesForReading()
     for (auto & [table_name, table_info] : table_infos)
     {
         auto storage = table_info.storage;
-        if (storage)
-            table_info.table_lock = storage->tryLockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout);
+        if (!storage)
+            continue;
+
+        checkIsQueryCancelled();
+
+        table_info.table_lock = storage->tryLockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout);
     }
 
     std::erase_if(
@@ -734,6 +756,7 @@ void BackupEntriesCollector::makeBackupEntriesForDatabasesDefs()
             continue; /// We store CREATE DATABASE queries only if there was BACKUP DATABASE specified.
 
         LOG_TRACE(log, "Adding the definition of database {} to backup", backQuoteIfNeed(database_name));
+        checkIsQueryCancelled();
 
         ASTPtr new_create_query = database_info.create_database_query;
         adjustCreateQueryForBackup(new_create_query, context->getGlobalContext(), nullptr);
@@ -750,6 +773,7 @@ void BackupEntriesCollector::makeBackupEntriesForTablesDefs()
     for (auto & [table_name, table_info] : table_infos)
     {
         LOG_TRACE(log, "Adding the definition of {} to backup", tableNameWithTypeToString(table_name.database, table_name.table, false));
+        checkIsQueryCancelled();
 
         ASTPtr new_create_query = table_info.create_table_query;
         adjustCreateQueryForBackup(new_create_query, context->getGlobalContext(), &table_info.replicated_table_shared_id);
@@ -802,6 +826,7 @@ void BackupEntriesCollector::makeBackupEntriesForTableData(const QualifiedTableN
     }
 
     LOG_TRACE(log, "Collecting data of {} for backup", tableNameWithTypeToString(table_name.database, table_name.table, false));
+    checkIsQueryCancelled();
 
     try
     {
@@ -861,13 +886,17 @@ void BackupEntriesCollector::addPostTask(std::function<void()> task)
 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())
     {
+        checkIsQueryCancelled();
+
         auto task = std::move(post_tasks.front());
         post_tasks.pop();
         std::move(task)();
     }
+
     LOG_TRACE(log, "All post tasks successfully executed");
 }
 
diff --git a/src/Backups/BackupEntriesCollector.h b/src/Backups/BackupEntriesCollector.h
index 45d1ba1652a..01e8d594334 100644
--- a/src/Backups/BackupEntriesCollector.h
+++ b/src/Backups/BackupEntriesCollector.h
@@ -6,7 +6,7 @@
 #include <Parsers/ASTBackupQuery.h>
 #include <Storages/IStorage_fwd.h>
 #include <Storages/TableLockHolder.h>
-#include <Storages/MergeTree/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <filesystem>
 #include <queue>
 
@@ -22,6 +22,9 @@ class IDatabase;
 using DatabasePtr = std::shared_ptr<IDatabase>;
 struct StorageID;
 enum class AccessEntityType;
+class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
+
 
 /// Collects backup entries for all databases and tables which should be put to a backup.
 class BackupEntriesCollector : private boost::noncopyable
@@ -97,11 +100,15 @@ private:
 
     Strings setStage(const String & new_stage, const String & message = "");
 
+    /// Throws an exception if the BACKUP query was cancelled.
+    void checkIsQueryCancelled() const;
+
     const ASTBackupQuery::Elements backup_query_elements;
     const BackupSettings backup_settings;
     std::shared_ptr<IBackupCoordination> backup_coordination;
     const ReadSettings read_settings;
     ContextPtr context;
+    QueryStatusPtr process_list_element;
 
     /// The time a BACKUP ON CLUSTER or RESTORE ON CLUSTER command will wait until all the nodes receive the BACKUP (or RESTORE) query and start working.
     /// This setting is similar to `distributed_ddl_task_timeout`.
@@ -122,7 +129,7 @@ private:
     /// Whether we should collect the metadata after a successful attempt one more time and check that nothing has changed.
     const bool compare_collected_metadata;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     /// Unfortunately we can use ZooKeeper for collecting information for backup
     /// and we need to retry...
     ZooKeeperRetriesInfo global_zookeeper_retries_info;
diff --git a/src/Backups/BackupEntryFromMemory.h b/src/Backups/BackupEntryFromMemory.h
index d8bc0eb966d..2e942989464 100644
--- a/src/Backups/BackupEntryFromMemory.h
+++ b/src/Backups/BackupEntryFromMemory.h
@@ -17,7 +17,12 @@ public:
     std::unique_ptr<SeekableReadBuffer> getReadBuffer(const ReadSettings &) const override;
     UInt64 getSize() const override { return data.size(); }
 
-    DataSourceDescription getDataSourceDescription() const override { return DataSourceDescription{DataSourceType::RAM, "", false, false}; }
+    DataSourceDescription getDataSourceDescription() const override
+    {
+        DataSourceDescription res;
+        res.type = DataSourceType::RAM;
+        return res;
+    }
 
 private:
     const String data;
diff --git a/src/Backups/BackupFactory.cpp b/src/Backups/BackupFactory.cpp
index 898ac7bc490..31e87a21fc2 100644
--- a/src/Backups/BackupFactory.cpp
+++ b/src/Backups/BackupFactory.cpp
@@ -33,11 +33,13 @@ void BackupFactory::registerBackupEngine(const String & engine_name, const Creat
 
 void registerBackupEnginesFileAndDisk(BackupFactory &);
 void registerBackupEngineS3(BackupFactory &);
+void registerBackupEngineAzureBlobStorage(BackupFactory &);
 
 void registerBackupEngines(BackupFactory & factory)
 {
     registerBackupEnginesFileAndDisk(factory);
     registerBackupEngineS3(factory);
+    registerBackupEngineAzureBlobStorage(factory);
 }
 
 BackupFactory::BackupFactory()
diff --git a/src/Backups/BackupFactory.h b/src/Backups/BackupFactory.h
index f0c64486da4..4e752508577 100644
--- a/src/Backups/BackupFactory.h
+++ b/src/Backups/BackupFactory.h
@@ -40,6 +40,7 @@ public:
         bool deduplicate_files = true;
         bool allow_s3_native_copy = true;
         bool use_same_s3_credentials_for_base_backup = false;
+        bool azure_attempt_to_create_container = true;
         ReadSettings read_settings;
         WriteSettings write_settings;
     };
diff --git a/src/Backups/BackupFileInfo.cpp b/src/Backups/BackupFileInfo.cpp
index 2f3942f89c4..f14b955149e 100644
--- a/src/Backups/BackupFileInfo.cpp
+++ b/src/Backups/BackupFileInfo.cpp
@@ -7,6 +7,8 @@
 #include <Common/scope_guard_safe.h>
 #include <Common/setThreadName.h>
 #include <Common/ThreadPool.h>
+#include <Interpreters/ProcessList.h>
+
 #include <base/hex.h>
 
 
@@ -100,7 +102,7 @@ BackupFileInfo buildFileInfoForBackupEntry(
     const BackupEntryPtr & backup_entry,
     const BackupPtr & base_backup,
     const ReadSettings & read_settings,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     auto adjusted_path = removeLeadingSlash(file_name);
 
@@ -127,7 +129,7 @@ BackupFileInfo buildFileInfoForBackupEntry(
     }
 
     if (!log)
-        log = &Poco::Logger::get("FileInfoFromBackupEntry");
+        log = getLogger("FileInfoFromBackupEntry");
 
     std::optional<SizeAndChecksum> base_backup_file_info = getInfoAboutFileFromBaseBackupIfExists(base_backup, adjusted_path);
 
@@ -203,7 +205,7 @@ BackupFileInfo buildFileInfoForBackupEntry(
     return info;
 }
 
-BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, const ReadSettings & read_settings, ThreadPool & thread_pool)
+BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, const ReadSettings & read_settings, ThreadPool & thread_pool, QueryStatusPtr process_list_element)
 {
     BackupFileInfos infos;
     infos.resize(backup_entries.size());
@@ -214,7 +216,7 @@ BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entr
     std::exception_ptr exception;
 
     auto thread_group = CurrentThread::getGroup();
-    Poco::Logger * log = &Poco::Logger::get("FileInfosFromBackupEntries");
+    LoggerPtr log = getLogger("FileInfosFromBackupEntries");
 
     for (size_t i = 0; i != backup_entries.size(); ++i)
     {
@@ -225,7 +227,7 @@ BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entr
             ++num_active_jobs;
         }
 
-        auto job = [&mutex, &num_active_jobs, &event, &exception, &infos, &backup_entries, &read_settings, &base_backup, &thread_group, i, log]()
+        auto job = [&mutex, &num_active_jobs, &event, &exception, &infos, &backup_entries, &read_settings, &base_backup, &thread_group, &process_list_element, i, log]()
         {
             SCOPE_EXIT_SAFE({
                 std::lock_guard lock{mutex};
@@ -250,6 +252,9 @@ BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entr
                         return;
                 }
 
+                if (process_list_element)
+                    process_list_element->checkTimeLimit();
+
                 infos[i] = buildFileInfoForBackupEntry(name, entry, base_backup, read_settings, log);
             }
             catch (...)
diff --git a/src/Backups/BackupFileInfo.h b/src/Backups/BackupFileInfo.h
index 009fee091e0..a1405a9cafb 100644
--- a/src/Backups/BackupFileInfo.h
+++ b/src/Backups/BackupFileInfo.h
@@ -2,8 +2,7 @@
 
 #include <Core/Types.h>
 #include <Common/ThreadPool_fwd.h>
-
-namespace Poco { class Logger; }
+#include <Common/Logger.h>
 
 namespace DB
 {
@@ -14,6 +13,8 @@ using BackupPtr = std::shared_ptr<const IBackup>;
 using BackupEntryPtr = std::shared_ptr<const IBackupEntry>;
 using BackupEntries = std::vector<std::pair<String, BackupEntryPtr>>;
 struct ReadSettings;
+class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 
 
 /// Information about a file stored in a backup.
@@ -75,9 +76,9 @@ struct BackupFileInfo
 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, const ReadSettings & read_settings, Poco::Logger * log);
+BackupFileInfo buildFileInfoForBackupEntry(const String & file_name, const BackupEntryPtr & backup_entry, const BackupPtr & base_backup, const ReadSettings & read_settings, LoggerPtr log);
 
 /// Builds a vector of BackupFileInfos for specified backup entries.
-BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, const ReadSettings & read_settings, ThreadPool & thread_pool);
+BackupFileInfos buildFileInfosForBackupEntries(const BackupEntries & backup_entries, const BackupPtr & base_backup, const ReadSettings & read_settings, ThreadPool & thread_pool, QueryStatusPtr process_list_element);
 
 }
diff --git a/src/Backups/BackupIO_AzureBlobStorage.cpp b/src/Backups/BackupIO_AzureBlobStorage.cpp
new file mode 100644
index 00000000000..b9b208e321c
--- /dev/null
+++ b/src/Backups/BackupIO_AzureBlobStorage.cpp
@@ -0,0 +1,320 @@
+#include <Backups/BackupIO_AzureBlobStorage.h>
+
+#if USE_AZURE_BLOB_STORAGE
+#include <Common/quoteString.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <Interpreters/Context.h>
+#include <IO/SharedThreadPools.h>
+#include <IO/HTTPHeaderEntries.h>
+#include <Storages/StorageAzureBlobCluster.h>
+#include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
+#include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
+#include <IO/AzureBlobStorage/copyAzureBlobStorageFile.h>
+#include <Disks/IDisk.h>
+#include <Disks/DiskType.h>
+
+#include <Poco/Util/AbstractConfiguration.h>
+
+#include <filesystem>
+
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int AZURE_BLOB_STORAGE_ERROR;
+    extern const int LOGICAL_ERROR;
+}
+
+BackupReaderAzureBlobStorage::BackupReaderAzureBlobStorage(
+    StorageAzureBlob::Configuration configuration_,
+    const ReadSettings & read_settings_,
+    const WriteSettings & write_settings_,
+    const ContextPtr & context_)
+    : BackupReaderDefault(read_settings_, write_settings_, getLogger("BackupReaderAzureBlobStorage"))
+    , data_source_description{DataSourceType::ObjectStorage, ObjectStorageType::Azure, MetadataStorageType::None, configuration_.container, false, false}
+    , configuration(configuration_)
+{
+    auto client_ptr = StorageAzureBlob::createClient(configuration, /* is_read_only */ false);
+    object_storage = std::make_unique<AzureObjectStorage>("BackupReaderAzureBlobStorage",
+                                                          std::move(client_ptr),
+                                                          StorageAzureBlob::createSettings(context_),
+                                                          configuration_.container);
+    client = object_storage->getAzureBlobStorageClient();
+    settings = object_storage->getSettings();
+}
+
+BackupReaderAzureBlobStorage::~BackupReaderAzureBlobStorage() = default;
+
+bool BackupReaderAzureBlobStorage::fileExists(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    return object_storage->exists(StoredObject(key));
+}
+
+UInt64 BackupReaderAzureBlobStorage::getFileSize(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    ObjectMetadata object_metadata = object_storage->getObjectMetadata(key);
+    return object_metadata.size_bytes;
+}
+
+std::unique_ptr<SeekableReadBuffer> BackupReaderAzureBlobStorage::readFile(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    return std::make_unique<ReadBufferFromAzureBlobStorage>(
+        client, key, read_settings, settings->max_single_read_retries,
+        settings->max_single_download_retries);
+}
+
+void BackupReaderAzureBlobStorage::copyFileToDisk(const String & path_in_backup, size_t file_size, bool encrypted_in_backup,
+                                    DiskPtr destination_disk, const String & destination_path, WriteMode write_mode)
+{
+    auto destination_data_source_description = destination_disk->getDataSourceDescription();
+    if ((destination_data_source_description.type == DataSourceType::ObjectStorage)
+        && (destination_data_source_description.object_storage_type == ObjectStorageType::Azure)
+        && (destination_data_source_description.is_encrypted == encrypted_in_backup))
+    {
+        LOG_TRACE(log, "Copying {} from AzureBlobStorage to disk {}", path_in_backup, destination_disk->getName());
+        auto write_blob_function = [&](const Strings & blob_path, WriteMode mode, const std::optional<ObjectAttributes> &) -> 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);
+
+            copyAzureBlobStorageFile(
+                client,
+                destination_disk->getObjectStorage()->getAzureBlobStorageClient(),
+                configuration.container,
+                fs::path(configuration.blob_path) / path_in_backup,
+                0,
+                file_size,
+                /* dest_container */ blob_path[1],
+                /* dest_path */ blob_path[0],
+                settings,
+                read_settings,
+                threadPoolCallbackRunner<void>(getBackupsIOThreadPool().get(), "BackupRDAzure"),
+                /* for_disk_azure_blob_storage= */ 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);
+}
+
+
+BackupWriterAzureBlobStorage::BackupWriterAzureBlobStorage(
+    StorageAzureBlob::Configuration configuration_,
+    const ReadSettings & read_settings_,
+    const WriteSettings & write_settings_,
+    const ContextPtr & context_,
+    bool attempt_to_create_container)
+    : BackupWriterDefault(read_settings_, write_settings_, getLogger("BackupWriterAzureBlobStorage"))
+    , data_source_description{DataSourceType::ObjectStorage, ObjectStorageType::Azure, MetadataStorageType::None, configuration_.container, false, false}
+    , configuration(configuration_)
+{
+    auto client_ptr = StorageAzureBlob::createClient(configuration, /* is_read_only */ false, attempt_to_create_container);
+    object_storage = std::make_unique<AzureObjectStorage>("BackupWriterAzureBlobStorage",
+                                                          std::move(client_ptr),
+                                                          StorageAzureBlob::createSettings(context_),
+                                                          configuration_.container);
+    client = object_storage->getAzureBlobStorageClient();
+    settings = object_storage->getSettings();
+}
+
+void BackupWriterAzureBlobStorage::copyFileFromDisk(const String & path_in_backup, DiskPtr src_disk, const String & src_path,
+                                      bool copy_encrypted, UInt64 start_pos, UInt64 length)
+{
+    /// Use the native copy as a more optimal way to copy a file from AzureBlobStorage to AzureBlobStorage if it's possible.
+    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))
+    {
+        /// getBlobPath() can return more than 3 elements if the file is stored as multiple objects in AzureBlobStorage container.
+        /// In this case we can't use the native copy.
+        if (auto blob_path = src_disk->getBlobPath(src_path); blob_path.size() == 2)
+        {
+            LOG_TRACE(log, "Copying file {} from disk {} to AzureBlobStorag", src_path, src_disk->getName());
+            copyAzureBlobStorageFile(
+                src_disk->getObjectStorage()->getAzureBlobStorageClient(),
+                client,
+                /* src_container */ blob_path[1],
+                /* src_path */ blob_path[0],
+                start_pos,
+                length,
+                configuration.container,
+                fs::path(configuration.blob_path) / path_in_backup,
+                settings,
+                read_settings,
+                threadPoolCallbackRunner<void>(getBackupsIOThreadPool().get(), "BackupWRAzure"));
+            return; /// copied!
+        }
+    }
+
+    /// Fallback to copy through buffers.
+    BackupWriterDefault::copyFileFromDisk(path_in_backup, src_disk, src_path, copy_encrypted, start_pos, length);
+}
+
+void BackupWriterAzureBlobStorage::copyFile(const String & destination, const String & source, size_t size)
+{
+    LOG_TRACE(log, "Copying file inside backup from {} to {} ", source, destination);
+    copyAzureBlobStorageFile(
+       client,
+       client,
+       configuration.container,
+       fs::path(source),
+       0,
+       size,
+       /* dest_container */ configuration.container,
+       /* dest_path */ destination,
+       settings,
+       read_settings,
+       threadPoolCallbackRunner<void>(getBackupsIOThreadPool().get(), "BackupWRAzure"),
+       /* for_disk_azure_blob_storage= */ true);
+}
+
+void BackupWriterAzureBlobStorage::copyDataToFile(const String & path_in_backup, const CreateReadBufferFunction & create_read_buffer, UInt64 start_pos, UInt64 length)
+{
+    copyDataToAzureBlobStorageFile(create_read_buffer, start_pos, length, client, configuration.container, path_in_backup, settings,
+                     threadPoolCallbackRunner<void>(getBackupsIOThreadPool().get(), "BackupWRAzure"));
+}
+
+BackupWriterAzureBlobStorage::~BackupWriterAzureBlobStorage() = default;
+
+bool BackupWriterAzureBlobStorage::fileExists(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    return object_storage->exists(StoredObject(key));
+}
+
+UInt64 BackupWriterAzureBlobStorage::getFileSize(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    RelativePathsWithMetadata children;
+    object_storage->listObjects(key,children,/*max_keys*/0);
+    if (children.empty())
+        throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Object must exist");
+    return children[0].metadata.size_bytes;
+}
+
+std::unique_ptr<ReadBuffer> BackupWriterAzureBlobStorage::readFile(const String & file_name, size_t /*expected_file_size*/)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+
+    return std::make_unique<ReadBufferFromAzureBlobStorage>(
+        client, key, read_settings, settings->max_single_read_retries,
+        settings->max_single_download_retries);
+}
+
+std::unique_ptr<WriteBuffer> BackupWriterAzureBlobStorage::writeFile(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    return std::make_unique<WriteBufferFromAzureBlobStorage>(
+        client,
+        key,
+        DBMS_DEFAULT_BUFFER_SIZE,
+        write_settings,
+        settings);
+}
+
+void BackupWriterAzureBlobStorage::removeFile(const String & file_name)
+{
+    String key;
+    if (startsWith(file_name, "."))
+    {
+        key= configuration.blob_path + file_name;
+    }
+    else
+    {
+        key = file_name;
+    }
+    StoredObject object(key);
+    object_storage->removeObjectIfExists(object);
+}
+
+void BackupWriterAzureBlobStorage::removeFiles(const Strings & file_names)
+{
+    StoredObjects objects;
+    for (const auto & file_name : file_names)
+        objects.emplace_back(file_name);
+
+    object_storage->removeObjectsIfExist(objects);
+
+}
+
+void BackupWriterAzureBlobStorage::removeFilesBatch(const Strings & file_names)
+{
+    StoredObjects objects;
+    for (const auto & file_name : file_names)
+        objects.emplace_back(file_name);
+
+    object_storage->removeObjectsIfExist(objects);
+}
+
+}
+
+#endif
diff --git a/src/Backups/BackupIO_AzureBlobStorage.h b/src/Backups/BackupIO_AzureBlobStorage.h
new file mode 100644
index 00000000000..f0b9aace4d4
--- /dev/null
+++ b/src/Backups/BackupIO_AzureBlobStorage.h
@@ -0,0 +1,68 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AZURE_BLOB_STORAGE
+#include <Backups/BackupIO_Default.h>
+#include <Disks/DiskType.h>
+#include <Storages/StorageAzureBlobCluster.h>
+#include <Interpreters/Context_fwd.h>
+
+
+namespace DB
+{
+
+/// Represents a backup stored to Azure
+class BackupReaderAzureBlobStorage : public BackupReaderDefault
+{
+public:
+    BackupReaderAzureBlobStorage(StorageAzureBlob::Configuration configuration_, const ReadSettings & read_settings_, const WriteSettings & write_settings_, const ContextPtr & context_);
+    ~BackupReaderAzureBlobStorage() 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;
+
+    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:
+    const DataSourceDescription data_source_description;
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> client;
+    StorageAzureBlob::Configuration configuration;
+    std::unique_ptr<AzureObjectStorage> object_storage;
+    std::shared_ptr<const AzureObjectStorageSettings> settings;
+};
+
+class BackupWriterAzureBlobStorage : public BackupWriterDefault
+{
+public:
+    BackupWriterAzureBlobStorage(StorageAzureBlob::Configuration configuration_, const ReadSettings & read_settings_, const WriteSettings & write_settings_, const ContextPtr & context_, bool attempt_to_create_container);
+    ~BackupWriterAzureBlobStorage() override;
+
+    bool fileExists(const String & file_name) override;
+    UInt64 getFileSize(const String & file_name) override;
+    std::unique_ptr<WriteBuffer> writeFile(const String & 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 copyFile(const String & destination, const String & source, size_t size) override;
+
+    void removeFile(const String & file_name) override;
+    void removeFiles(const Strings & file_names) override;
+
+private:
+    std::unique_ptr<ReadBuffer> readFile(const String & file_name, size_t expected_file_size) override;
+    void removeFilesBatch(const Strings & file_names);
+    const DataSourceDescription data_source_description;
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> client;
+    StorageAzureBlob::Configuration configuration;
+    std::unique_ptr<AzureObjectStorage> object_storage;
+    std::shared_ptr<const AzureObjectStorageSettings> settings;
+};
+
+}
+
+#endif
diff --git a/src/Backups/BackupIO_Default.cpp b/src/Backups/BackupIO_Default.cpp
index 5ac522695ce..77fd4532c8f 100644
--- a/src/Backups/BackupIO_Default.cpp
+++ b/src/Backups/BackupIO_Default.cpp
@@ -10,7 +10,7 @@
 namespace DB
 {
 
-BackupReaderDefault::BackupReaderDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, Poco::Logger * log_)
+BackupReaderDefault::BackupReaderDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, LoggerPtr log_)
     : log(log_)
     , read_settings(read_settings_)
     , write_settings(write_settings_)
@@ -36,7 +36,7 @@ void BackupReaderDefault::copyFileToDisk(const String & path_in_backup, size_t f
     write_buffer->finalize();
 }
 
-BackupWriterDefault::BackupWriterDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, Poco::Logger * log_)
+BackupWriterDefault::BackupWriterDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, LoggerPtr log_)
     : log(log_)
     , read_settings(read_settings_)
     , write_settings(write_settings_)
diff --git a/src/Backups/BackupIO_Default.h b/src/Backups/BackupIO_Default.h
index b4888fecd2f..4dba0324703 100644
--- a/src/Backups/BackupIO_Default.h
+++ b/src/Backups/BackupIO_Default.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Backups/BackupIO.h>
+#include <Common/Logger.h>
 #include <IO/ReadSettings.h>
 #include <IO/WriteSettings.h>
 
@@ -18,7 +19,7 @@ enum class WriteMode;
 class BackupReaderDefault : public IBackupReader
 {
 public:
-    BackupReaderDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, Poco::Logger * log_);
+    BackupReaderDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, LoggerPtr log_);
     ~BackupReaderDefault() override = default;
 
     /// The function copyFileToDisk() can be much faster than reading the file with readFile() and then writing it to some disk.
@@ -33,7 +34,7 @@ public:
     size_t getWriteBufferSize() const override { return write_buffer_size; }
 
 protected:
-    Poco::Logger * const log;
+    LoggerPtr const log;
     const ReadSettings read_settings;
 
     /// The write settings are used to write to the source disk in copyFileToDisk().
@@ -45,7 +46,7 @@ protected:
 class BackupWriterDefault : public IBackupWriter
 {
 public:
-    BackupWriterDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, Poco::Logger * log_);
+    BackupWriterDefault(const ReadSettings & read_settings_, const WriteSettings & write_settings_, LoggerPtr log_);
     ~BackupWriterDefault() override = default;
 
     bool fileContentsEqual(const String & file_name, const String & expected_file_contents) override;
@@ -60,7 +61,7 @@ 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;
+    LoggerPtr const log;
 
     /// The read settings are used to read from the source disk in copyFileFromDisk().
     const ReadSettings read_settings;
diff --git a/src/Backups/BackupIO_Disk.cpp b/src/Backups/BackupIO_Disk.cpp
index 91e8b97bc20..27b594f6bb8 100644
--- a/src/Backups/BackupIO_Disk.cpp
+++ b/src/Backups/BackupIO_Disk.cpp
@@ -9,7 +9,7 @@ namespace DB
 {
 
 BackupReaderDisk::BackupReaderDisk(const DiskPtr & disk_, const String & root_path_, const ReadSettings & read_settings_, const WriteSettings & write_settings_)
-    : BackupReaderDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupReaderDisk"))
+    : BackupReaderDefault(read_settings_, write_settings_, getLogger("BackupReaderDisk"))
     , disk(disk_)
     , root_path(root_path_)
     , data_source_description(disk->getDataSourceDescription())
@@ -57,7 +57,7 @@ void BackupReaderDisk::copyFileToDisk(const String & path_in_backup, size_t file
 
 
 BackupWriterDisk::BackupWriterDisk(const DiskPtr & disk_, const String & root_path_, const ReadSettings & read_settings_, const WriteSettings & write_settings_)
-    : BackupWriterDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupWriterDisk"))
+    : BackupWriterDefault(read_settings_, write_settings_, getLogger("BackupWriterDisk"))
     , disk(disk_)
     , root_path(root_path_)
     , data_source_description(disk->getDataSourceDescription())
diff --git a/src/Backups/BackupIO_Disk.h b/src/Backups/BackupIO_Disk.h
index 575ec3f5707..3d3253877bd 100644
--- a/src/Backups/BackupIO_Disk.h
+++ b/src/Backups/BackupIO_Disk.h
@@ -1,7 +1,9 @@
 #pragma once
 
 #include <Backups/BackupIO_Default.h>
+#include <Common/Logger.h>
 #include <Disks/DiskType.h>
+
 #include <filesystem>
 
 
diff --git a/src/Backups/BackupIO_File.cpp b/src/Backups/BackupIO_File.cpp
index 5384637a969..35544a526f1 100644
--- a/src/Backups/BackupIO_File.cpp
+++ b/src/Backups/BackupIO_File.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 BackupReaderFile::BackupReaderFile(const String & root_path_, const ReadSettings & read_settings_, const WriteSettings & write_settings_)
-    : BackupReaderDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupReaderFile"))
+    : BackupReaderDefault(read_settings_, write_settings_, getLogger("BackupReaderFile"))
     , root_path(root_path_)
     , data_source_description(DiskLocal::getLocalDataSourceDescription(root_path))
 {
@@ -75,7 +75,7 @@ void BackupReaderFile::copyFileToDisk(const String & path_in_backup, size_t file
 
 
 BackupWriterFile::BackupWriterFile(const String & root_path_, const ReadSettings & read_settings_, const WriteSettings & write_settings_)
-    : BackupWriterDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupWriterFile"))
+    : BackupWriterDefault(read_settings_, write_settings_, getLogger("BackupWriterFile"))
     , root_path(root_path_)
     , data_source_description(DiskLocal::getLocalDataSourceDescription(root_path))
 {
diff --git a/src/Backups/BackupIO_S3.cpp b/src/Backups/BackupIO_S3.cpp
index d143d813a2f..4b7e3d1e775 100644
--- a/src/Backups/BackupIO_S3.cpp
+++ b/src/Backups/BackupIO_S3.cpp
@@ -2,7 +2,7 @@
 
 #if USE_AWS_S3
 #include <Common/quoteString.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <Interpreters/Context.h>
 #include <IO/SharedThreadPools.h>
 #include <IO/ReadBufferFromS3.h>
@@ -73,6 +73,7 @@ namespace
             .use_virtual_addressing = s3_uri.is_virtual_hosted_style,
             .disable_checksum = local_settings.s3_disable_checksum,
             .gcs_issue_compose_request = context->getConfigRef().getBool("s3.gcs_issue_compose_request", false),
+            .is_s3express_bucket = S3::isS3ExpressEndpoint(s3_uri.endpoint),
         };
 
         return S3::ClientFactory::instance().create(
@@ -123,11 +124,12 @@ BackupReaderS3::BackupReaderS3(
     bool allow_s3_native_copy,
     const ReadSettings & read_settings_,
     const WriteSettings & write_settings_,
-    const ContextPtr & context_)
-    : BackupReaderDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupReaderS3"))
+    const ContextPtr & context_,
+    bool is_internal_backup)
+    : BackupReaderDefault(read_settings_, write_settings_, getLogger("BackupReaderS3"))
     , s3_uri(s3_uri_)
-    , data_source_description{DataSourceType::S3, s3_uri.endpoint, false, false}
-    , s3_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString()))
+    , data_source_description{DataSourceType::ObjectStorage, ObjectStorageType::S3, MetadataStorageType::None, s3_uri.endpoint, false, false}
+    , s3_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString(), context_->getUserName(), /*ignore_user=*/is_internal_backup))
 {
     auto & request_settings = s3_settings.request_settings;
     request_settings.updateFromSettings(context_->getSettingsRef());
@@ -213,11 +215,12 @@ BackupWriterS3::BackupWriterS3(
     const String & storage_class_name,
     const ReadSettings & read_settings_,
     const WriteSettings & write_settings_,
-    const ContextPtr & context_)
-    : BackupWriterDefault(read_settings_, write_settings_, &Poco::Logger::get("BackupWriterS3"))
+    const ContextPtr & context_,
+    bool is_internal_backup)
+    : BackupWriterDefault(read_settings_, write_settings_, getLogger("BackupWriterS3"))
     , s3_uri(s3_uri_)
-    , data_source_description{DataSourceType::S3, s3_uri.endpoint, false, false}
-    , s3_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString()))
+    , data_source_description{DataSourceType::ObjectStorage, ObjectStorageType::S3, MetadataStorageType::None, s3_uri.endpoint, false, false}
+    , s3_settings(context_->getStorageS3Settings().getSettings(s3_uri.uri.toString(), context_->getUserName(), /*ignore_user=*/is_internal_backup))
 {
     auto & request_settings = s3_settings.request_settings;
     request_settings.updateFromSettings(context_->getSettingsRef());
diff --git a/src/Backups/BackupIO_S3.h b/src/Backups/BackupIO_S3.h
index 8ab8e1fb566..f81eb975df3 100644
--- a/src/Backups/BackupIO_S3.h
+++ b/src/Backups/BackupIO_S3.h
@@ -4,6 +4,7 @@
 
 #if USE_AWS_S3
 #include <Backups/BackupIO_Default.h>
+#include <Common/Logger.h>
 #include <Disks/DiskType.h>
 #include <IO/S3Common.h>
 #include <Storages/StorageS3Settings.h>
@@ -17,7 +18,15 @@ namespace DB
 class BackupReaderS3 : public BackupReaderDefault
 {
 public:
-    BackupReaderS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, bool allow_s3_native_copy, const ReadSettings & read_settings_, const WriteSettings & write_settings_, const ContextPtr & context_);
+    BackupReaderS3(
+        const S3::URI & s3_uri_,
+        const String & access_key_id_,
+        const String & secret_access_key_,
+        bool allow_s3_native_copy,
+        const ReadSettings & read_settings_,
+        const WriteSettings & write_settings_,
+        const ContextPtr & context_,
+        bool is_internal_backup);
     ~BackupReaderS3() override;
 
     bool fileExists(const String & file_name) override;
@@ -40,7 +49,16 @@ private:
 class BackupWriterS3 : public BackupWriterDefault
 {
 public:
-    BackupWriterS3(const S3::URI & s3_uri_, const String & access_key_id_, const String & secret_access_key_, bool allow_s3_native_copy, const String & storage_class_name, const ReadSettings & read_settings_, const WriteSettings & write_settings_, const ContextPtr & context_);
+    BackupWriterS3(
+        const S3::URI & s3_uri_,
+        const String & access_key_id_,
+        const String & secret_access_key_,
+        bool allow_s3_native_copy,
+        const String & storage_class_name,
+        const ReadSettings & read_settings_,
+        const WriteSettings & write_settings_,
+        const ContextPtr & context_,
+        bool is_internal_backup);
     ~BackupWriterS3() override;
 
     bool fileExists(const String & file_name) override;
diff --git a/src/Backups/BackupImpl.cpp b/src/Backups/BackupImpl.cpp
index 9ac68bc2437..8c0989b8202 100644
--- a/src/Backups/BackupImpl.cpp
+++ b/src/Backups/BackupImpl.cpp
@@ -105,7 +105,7 @@ BackupImpl::BackupImpl(
     , version(INITIAL_BACKUP_VERSION)
     , base_backup_info(base_backup_info_)
     , use_same_s3_credentials_for_base_backup(use_same_s3_credentials_for_base_backup_)
-    , log(&Poco::Logger::get("BackupImpl"))
+    , log(getLogger("BackupImpl"))
 {
     open();
 }
@@ -136,7 +136,7 @@ BackupImpl::BackupImpl(
     , base_backup_info(base_backup_info_)
     , deduplicate_files(deduplicate_files_)
     , use_same_s3_credentials_for_base_backup(use_same_s3_credentials_for_base_backup_)
-    , log(&Poco::Logger::get("BackupImpl"))
+    , log(getLogger("BackupImpl"))
 {
     open();
 }
@@ -144,6 +144,13 @@ BackupImpl::BackupImpl(
 
 BackupImpl::~BackupImpl()
 {
+    if ((open_mode == OpenMode::WRITE) && !is_internal_backup && !writing_finalized && !std::uncaught_exceptions() && !std::current_exception())
+    {
+        /// It is suspicious to destroy BackupImpl without finalization while writing a backup when there is no exception.
+        LOG_ERROR(log, "BackupImpl is not finalized when destructor is called. Stack trace: {}", StackTrace().toString());
+        chassert(false && "BackupImpl is not finalized when destructor is called.");
+    }
+
     try
     {
         close();
@@ -195,10 +202,6 @@ void BackupImpl::close()
 {
     std::lock_guard lock{mutex};
     closeArchive(/* finalize= */ false);
-
-    if (!is_internal_backup && writer && !writing_finalized)
-        removeAllFilesAfterFailure();
-
     writer.reset();
     reader.reset();
     coordination.reset();
@@ -924,7 +927,7 @@ void BackupImpl::writeFile(const BackupFileInfo & info, BackupEntryPtr entry)
 
     const auto write_info_to_archive = [&](const auto & file_name)
     {
-        auto out = archive_writer->writeFile(file_name);
+        auto out = archive_writer->writeFile(file_name, info.size);
         auto read_buffer = entry->getReadBuffer(writer->getReadSettings());
         if (info.base_size != 0)
             read_buffer->seek(info.base_size, SEEK_SET);
@@ -939,12 +942,12 @@ void BackupImpl::writeFile(const BackupFileInfo & info, BackupEntryPtr entry)
     }
     else if (src_disk && from_immutable_file)
     {
-        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);
+        LOG_INFO(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, "Writing backup for file {} from {}: data file #{}", info.data_file_name, src_file_desc, info.data_file_index);
+        LOG_INFO(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);
     }
@@ -1005,14 +1008,18 @@ void BackupImpl::setCompressedSize()
 }
 
 
-void BackupImpl::removeAllFilesAfterFailure()
+void BackupImpl::tryRemoveAllFiles()
 {
+    if (open_mode != OpenMode::WRITE)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Backup is not opened for writing");
+
     if (is_internal_backup)
-        return; /// Let the initiator remove unnecessary files.
+        return;
 
     try
     {
-        LOG_INFO(log, "Removing all files of backup {} after failure", backup_name_for_logging);
+        LOG_INFO(log, "Removing all files of backup {}", backup_name_for_logging);
+        closeArchive(/* finalize= */ false);
 
         Strings files_to_remove;
         if (use_archive)
diff --git a/src/Backups/BackupImpl.h b/src/Backups/BackupImpl.h
index b369fe00171..6fed5fe758b 100644
--- a/src/Backups/BackupImpl.h
+++ b/src/Backups/BackupImpl.h
@@ -81,8 +81,9 @@ public:
     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_archive; }
+    void finalizeWriting() override;
+    void tryRemoveAllFiles() override;
 
 private:
     void open();
@@ -107,8 +108,6 @@ private:
     bool checkLockFile(bool throw_if_failed) const;
     void removeLockFile();
 
-    void removeAllFilesAfterFailure();
-
     /// Calculates and sets `compressed_size`.
     void setCompressedSize();
 
@@ -153,7 +152,7 @@ private:
     bool writing_finalized = false;
     bool deduplicate_files = true;
     bool use_same_s3_credentials_for_base_backup = false;
-    const Poco::Logger * log;
+    const LoggerPtr log;
 };
 
 }
diff --git a/src/Backups/BackupInfo.cpp b/src/Backups/BackupInfo.cpp
index 2bff400d4fe..461f613ecd2 100644
--- a/src/Backups/BackupInfo.cpp
+++ b/src/Backups/BackupInfo.cpp
@@ -25,7 +25,7 @@ String BackupInfo::toString() const
 BackupInfo BackupInfo::fromString(const String & str)
 {
     ParserIdentifierWithOptionalParameters parser;
-    ASTPtr ast = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr ast = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     return fromAST(*ast);
 }
 
diff --git a/src/Backups/BackupOperationInfo.h b/src/Backups/BackupOperationInfo.h
index e57b57d75f1..21b5284458c 100644
--- a/src/Backups/BackupOperationInfo.h
+++ b/src/Backups/BackupOperationInfo.h
@@ -20,6 +20,9 @@ struct BackupOperationInfo
     /// Base Backup Operation name, a string like "Disk('backups', 'my_base_backup')"
     String base_backup_name;
 
+    /// Query ID of a query that started backup
+    String query_id;
+
     /// This operation is internal and should not be shown in system.backups
     bool internal = false;
 
diff --git a/src/Backups/BackupSettings.cpp b/src/Backups/BackupSettings.cpp
index 68d825e9468..06f49dfa448 100644
--- a/src/Backups/BackupSettings.cpp
+++ b/src/Backups/BackupSettings.cpp
@@ -28,10 +28,13 @@ namespace ErrorCodes
     M(Bool, deduplicate_files) \
     M(Bool, allow_s3_native_copy) \
     M(Bool, use_same_s3_credentials_for_base_backup) \
+    M(Bool, azure_attempt_to_create_container) \
     M(Bool, read_from_filesystem_cache) \
     M(UInt64, shard_num) \
     M(UInt64, replica_num) \
     M(Bool, check_parts) \
+    M(Bool, check_projection_parts) \
+    M(Bool, allow_backup_broken_projections) \
     M(Bool, internal) \
     M(String, host_id) \
     M(OptionalUUID, backup_uuid)
diff --git a/src/Backups/BackupSettings.h b/src/Backups/BackupSettings.h
index f26b992b348..eccf4e90ce7 100644
--- a/src/Backups/BackupSettings.h
+++ b/src/Backups/BackupSettings.h
@@ -26,7 +26,7 @@ struct BackupSettings
     String password;
 
     /// S3 storage class.
-    String s3_storage_class = "";
+    String s3_storage_class;
 
     /// If this is set to true then only create queries will be written to backup,
     /// without the data of tables.
@@ -47,6 +47,9 @@ struct BackupSettings
     /// Whether base backup to S3 should inherit credentials from the BACKUP query.
     bool use_same_s3_credentials_for_base_backup = false;
 
+    /// Whether a new Azure container should be created if it does not exist (requires permissions at storage account level)
+    bool azure_attempt_to_create_container = true;
+
     /// Allow to use the filesystem cache in passive mode - benefit from the existing cache entries,
     /// but don't put more entries into the cache.
     bool read_from_filesystem_cache = true;
@@ -62,6 +65,12 @@ struct BackupSettings
     /// Check checksums of the data parts before writing them to a backup.
     bool check_parts = true;
 
+    /// Check checksums of the projection data parts before writing them to a backup.
+    bool check_projection_parts = true;
+
+    /// Allow to create backup with broken projections.
+    bool allow_backup_broken_projections = false;
+
     /// Internal, should not be specified by user.
     /// Whether this backup is a part of a distributed backup created by BACKUP ON CLUSTER.
     bool internal = false;
diff --git a/src/Backups/BackupStatus.cpp b/src/Backups/BackupStatus.cpp
index 53adaa577ea..1eefc54f746 100644
--- a/src/Backups/BackupStatus.cpp
+++ b/src/Backups/BackupStatus.cpp
@@ -21,12 +21,16 @@ std::string_view toString(BackupStatus backup_status)
             return "BACKUP_CREATED";
         case BackupStatus::BACKUP_FAILED:
             return "BACKUP_FAILED";
+        case BackupStatus::BACKUP_CANCELLED:
+            return "BACKUP_CANCELLED";
         case BackupStatus::RESTORING:
             return "RESTORING";
         case BackupStatus::RESTORED:
             return "RESTORED";
         case BackupStatus::RESTORE_FAILED:
             return "RESTORE_FAILED";
+        case BackupStatus::RESTORE_CANCELLED:
+            return "RESTORE_CANCELLED";
         default:
             break;
     }
diff --git a/src/Backups/BackupStatus.h b/src/Backups/BackupStatus.h
index 0afe6efe899..aeec1417b54 100644
--- a/src/Backups/BackupStatus.h
+++ b/src/Backups/BackupStatus.h
@@ -18,6 +18,10 @@ enum class BackupStatus
     RESTORED,
     RESTORE_FAILED,
 
+    /// Statuses used after a BACKUP or RESTORE operation was cancelled.
+    BACKUP_CANCELLED,
+    RESTORE_CANCELLED,
+
     MAX,
 };
 
diff --git a/src/Backups/BackupsWorker.cpp b/src/Backups/BackupsWorker.cpp
index bb8d3d3cc60..9a3e1052e0b 100644
--- a/src/Backups/BackupsWorker.cpp
+++ b/src/Backups/BackupsWorker.cpp
@@ -18,6 +18,7 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Parsers/ASTBackupQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Common/CurrentThread.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
 #include <Common/logger_useful.h>
@@ -26,6 +27,8 @@
 #include <Common/scope_guard_safe.h>
 #include <Common/ThreadPool.h>
 
+#include <boost/range/adaptor/map.hpp>
+
 
 namespace CurrentMetrics
 {
@@ -45,6 +48,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int CONCURRENT_ACCESS_NOT_SUPPORTED;
+    extern const int QUERY_WAS_CANCELLED;
 }
 
 using OperationID = BackupOperationID;
@@ -73,7 +77,8 @@ namespace
                 all_hosts,
                 backup_settings.host_id,
                 !backup_settings.deduplicate_files,
-                backup_settings.internal);
+                backup_settings.internal,
+                context->getProcessListElement());
         }
         else
         {
@@ -110,7 +115,8 @@ namespace
                 toString(*restore_settings.restore_uuid),
                 all_hosts,
                 restore_settings.host_id,
-                restore_settings.internal);
+                restore_settings.internal,
+                context->getProcessListElement());
         }
         else
         {
@@ -150,17 +156,52 @@ namespace
         }
     }
 
-    bool isFinalStatus(BackupStatus status)
+    bool isFinishedSuccessfully(BackupStatus status)
     {
-        return (status == BackupStatus::BACKUP_CREATED) || (status == BackupStatus::BACKUP_FAILED) || (status == BackupStatus::RESTORED)
-            || (status == BackupStatus::RESTORE_FAILED);
+        return (status == BackupStatus::BACKUP_CREATED) || (status == BackupStatus::RESTORED);
     }
 
-    bool isErrorStatus(BackupStatus status)
+    bool isFailed(BackupStatus status)
     {
         return (status == BackupStatus::BACKUP_FAILED) || (status == BackupStatus::RESTORE_FAILED);
     }
 
+    bool isCancelled(BackupStatus status)
+    {
+        return (status == BackupStatus::BACKUP_CANCELLED) || (status == BackupStatus::RESTORE_CANCELLED);
+    }
+
+    bool isFailedOrCancelled(BackupStatus status)
+    {
+        return isFailed(status) || isCancelled(status);
+    }
+
+    bool isFinalStatus(BackupStatus status)
+    {
+        return isFinishedSuccessfully(status) || isFailedOrCancelled(status);
+    }
+
+    bool isBackupStatus(BackupStatus status)
+    {
+        return (status == BackupStatus::CREATING_BACKUP) || (status == BackupStatus::BACKUP_CREATED) || (status == BackupStatus::BACKUP_FAILED) || (status == BackupStatus::BACKUP_CANCELLED);
+    }
+
+    BackupStatus getBackupStatusFromCurrentException()
+    {
+        if (getCurrentExceptionCode() == ErrorCodes::QUERY_WAS_CANCELLED)
+            return BackupStatus::BACKUP_CANCELLED;
+        else
+            return BackupStatus::BACKUP_FAILED;
+    }
+
+    BackupStatus getRestoreStatusFromCurrentException()
+    {
+        if (getCurrentExceptionCode() == ErrorCodes::QUERY_WAS_CANCELLED)
+            return BackupStatus::RESTORE_CANCELLED;
+        else
+            return BackupStatus::RESTORE_FAILED;
+    }
+
     /// Used to change num_active_backups.
     size_t getNumActiveBackupsChange(BackupStatus status)
     {
@@ -233,8 +274,8 @@ enum class BackupsWorker::ThreadPoolId
     /// "RESTORE ASYNC" waits in background while the data of all tables are restored.
     RESTORE_ASYNC,
 
-    /// Restores the data of tables.
-    RESTORE_TABLES_DATA,
+    /// Restores from backups.
+    RESTORE,
 };
 
 
@@ -282,13 +323,13 @@ public:
 
             case ThreadPoolId::RESTORE_ASYNC:
             case ThreadPoolId::RESTORE_ASYNC_ON_CLUSTER:
-            case ThreadPoolId::RESTORE_TABLES_DATA:
+            case ThreadPoolId::RESTORE:
             {
                 metric_threads = CurrentMetrics::RestoreThreads;
                 metric_active_threads = CurrentMetrics::RestoreThreadsActive;
                 metric_active_threads = CurrentMetrics::RestoreThreadsScheduled;
                 max_threads = num_restore_threads;
-                use_queue = (thread_pool_id != ThreadPoolId::RESTORE_TABLES_DATA);
+                use_queue = true;
                 break;
             }
         }
@@ -309,7 +350,7 @@ public:
         auto wait_sequence = {
             ThreadPoolId::RESTORE_ASYNC_ON_CLUSTER,
             ThreadPoolId::RESTORE_ASYNC,
-            ThreadPoolId::RESTORE_TABLES_DATA,
+            ThreadPoolId::RESTORE,
             ThreadPoolId::BACKUP_ASYNC_ON_CLUSTER,
             ThreadPoolId::BACKUP_ASYNC,
             ThreadPoolId::BACKUP_COPY_FILES,
@@ -337,13 +378,16 @@ private:
 };
 
 
-BackupsWorker::BackupsWorker(ContextPtr global_context, size_t num_backup_threads, size_t num_restore_threads, bool allow_concurrent_backups_, bool allow_concurrent_restores_)
+BackupsWorker::BackupsWorker(ContextMutablePtr global_context, size_t num_backup_threads, size_t num_restore_threads)
     : thread_pools(std::make_unique<ThreadPools>(num_backup_threads, num_restore_threads))
-    , allow_concurrent_backups(allow_concurrent_backups_)
-    , allow_concurrent_restores(allow_concurrent_restores_)
-    , log(&Poco::Logger::get("BackupsWorker"))
+    , allow_concurrent_backups(global_context->getConfigRef().getBool("backups.allow_concurrent_backups", true))
+    , allow_concurrent_restores(global_context->getConfigRef().getBool("backups.allow_concurrent_restores", true))
+    , remove_backup_files_after_failure(global_context->getConfigRef().getBool("backups.remove_backup_files_after_failure", true))
+    , test_inject_sleep(global_context->getConfigRef().getBool("backups.test_inject_sleep", false))
+    , log(getLogger("BackupsWorker"))
+    , backup_log(global_context->getBackupLog())
+    , process_list(global_context->getProcessList())
 {
-    backup_log = global_context->getBackupLog();
 }
 
 
@@ -371,6 +415,9 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
     auto backup_query = std::static_pointer_cast<ASTBackupQuery>(query->clone());
     auto backup_settings = BackupSettings::fromBackupQuery(*backup_query);
 
+    auto backup_info = BackupInfo::fromAST(*backup_query->backup_name);
+    String backup_name_for_logging = backup_info.toStringForLogging();
+
     if (!backup_settings.backup_uuid)
         backup_settings.backup_uuid = UUIDHelpers::generateV4();
 
@@ -384,23 +431,43 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
         backup_id = toString(*backup_settings.backup_uuid);
 
     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.
-        backup_coordination = makeBackupCoordination(context, backup_settings, /* remote= */ true);
-    }
+    BackupMutablePtr backup;
 
-    auto backup_info = BackupInfo::fromAST(*backup_query->backup_name);
-    String backup_name_for_logging = backup_info.toStringForLogging();
-    String base_backup_name;
-    if (backup_settings.base_backup_info)
-        base_backup_name = backup_settings.base_backup_info->toStringForLogging();
+    /// Called in exception handlers below. This lambda function can be called on a separate thread, so it can't capture local variables by reference.
+    auto on_exception = [this](BackupMutablePtr & backup_, const OperationID & backup_id_, const String & backup_name_for_logging_,
+                               const BackupSettings & backup_settings_, const std::shared_ptr<IBackupCoordination> & backup_coordination_)
+    {
+        /// Something bad happened, the backup has not built.
+        tryLogCurrentException(log, fmt::format("Failed to make {} {}", (backup_settings_.internal ? "internal backup" : "backup"), backup_name_for_logging_));
+        setStatusSafe(backup_id_, getBackupStatusFromCurrentException());
+        sendCurrentExceptionToCoordination(backup_coordination_);
+
+        if (backup_ && remove_backup_files_after_failure)
+            backup_->tryRemoveAllFiles();
+        backup_.reset();
+    };
 
     try
     {
-        addInfo(backup_id, backup_name_for_logging, base_backup_name, backup_settings.internal, BackupStatus::CREATING_BACKUP);
+        String base_backup_name;
+        if (backup_settings.base_backup_info)
+            base_backup_name = backup_settings.base_backup_info->toStringForLogging();
+
+        addInfo(backup_id,
+            backup_name_for_logging,
+            base_backup_name,
+            context->getCurrentQueryId(),
+            backup_settings.internal,
+            context->getProcessListElement(),
+            BackupStatus::CREATING_BACKUP);
+
+        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.
+            backup_coordination = makeBackupCoordination(context, backup_settings, /* remote= */ true);
+        }
 
         /// Prepare context to use.
         ContextPtr context_in_use = context;
@@ -408,8 +475,9 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
         bool on_cluster = !backup_query->cluster.empty();
         if (on_cluster || backup_settings.async)
         {
-            /// For ON CLUSTER queries we will need to change some settings.
-            /// For ASYNC queries we have to clone the context anyway.
+            /// We have to clone the query context here because:
+            /// if this is an "ON CLUSTER" query we need to change some settings, and
+            /// if this is an "ASYNC" query it's going to be executed in another thread.
             context_in_use = mutable_context = Context::createCopy(context);
             mutable_context->makeQueryContext();
         }
@@ -417,24 +485,49 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
         if (backup_settings.async)
         {
             auto & thread_pool = getThreadPool(on_cluster ? ThreadPoolId::BACKUP_ASYNC_ON_CLUSTER : ThreadPoolId::BACKUP_ASYNC);
+
+            /// process_list_element_holder is used to make an element in ProcessList live while BACKUP is working asynchronously.
+            auto process_list_element = context_in_use->getProcessListElement();
+
             thread_pool.scheduleOrThrowOnError(
-                [this, backup_query, backup_id, backup_name_for_logging, backup_info, backup_settings, backup_coordination, context_in_use, mutable_context]
+                [this,
+                 backup_query,
+                 backup_id,
+                 backup_name_for_logging,
+                 backup_info,
+                 backup_settings,
+                 backup_coordination,
+                 context_in_use,
+                 mutable_context,
+                 on_exception,
+                 process_list_element_holder = process_list_element ? process_list_element->getProcessListEntry() : nullptr]
                 {
-                    doBackup(
-                        backup_query,
-                        backup_id,
-                        backup_name_for_logging,
-                        backup_info,
-                        backup_settings,
-                        backup_coordination,
-                        context_in_use,
-                        mutable_context,
-                        /* called_async= */ true);
+                    BackupMutablePtr backup_async;
+                    try
+                    {
+                        setThreadName("BackupWorker");
+                        CurrentThread::QueryScope query_scope(context_in_use);
+                        doBackup(
+                            backup_async,
+                            backup_query,
+                            backup_id,
+                            backup_name_for_logging,
+                            backup_info,
+                            backup_settings,
+                            backup_coordination,
+                            context_in_use,
+                            mutable_context);
+                    }
+                    catch (...)
+                    {
+                        on_exception(backup_async, backup_id, backup_name_for_logging, backup_settings, backup_coordination);
+                    }
                 });
         }
         else
         {
             doBackup(
+                backup,
                 backup_query,
                 backup_id,
                 backup_name_for_logging,
@@ -442,24 +535,21 @@ OperationID BackupsWorker::startMakingBackup(const ASTPtr & query, const Context
                 backup_settings,
                 backup_coordination,
                 context_in_use,
-                mutable_context,
-                /* called_async= */ false);
+                mutable_context);
         }
 
         return backup_id;
     }
     catch (...)
     {
-        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);
+        on_exception(backup, backup_id, backup_name_for_logging, backup_settings, backup_coordination);
         throw;
     }
 }
 
 
 void BackupsWorker::doBackup(
+    BackupMutablePtr & backup,
     const std::shared_ptr<ASTBackupQuery> & backup_query,
     const OperationID & backup_id,
     const String & backup_name_for_logging,
@@ -467,156 +557,139 @@ void BackupsWorker::doBackup(
     BackupSettings backup_settings,
     std::shared_ptr<IBackupCoordination> backup_coordination,
     const ContextPtr & context,
-    ContextMutablePtr mutable_context,
-    bool called_async)
+    ContextMutablePtr mutable_context)
 {
-    std::optional<CurrentThread::QueryScope> query_scope;
-    try
+    bool on_cluster = !backup_query->cluster.empty();
+    assert(!on_cluster || mutable_context);
+
+    /// Checks access rights if this is not ON CLUSTER query.
+    /// (If this is ON CLUSTER query executeDDLQueryOnCluster() will check access rights later.)
+    auto required_access = getRequiredAccessToBackup(backup_query->elements);
+    if (!on_cluster)
+        context->checkAccess(required_access);
+
+    ClusterPtr cluster;
+    if (on_cluster)
     {
-        if (called_async)
-        {
-            query_scope.emplace(mutable_context);
-            setThreadName("BackupWorker");
-        }
-
-        bool on_cluster = !backup_query->cluster.empty();
-
-        assert(mutable_context || (!on_cluster && !called_async));
-
-        /// Checks access rights if this is not ON CLUSTER query.
-        /// (If this is ON CLUSTER query executeDDLQueryOnCluster() will check access rights later.)
-        auto required_access = getRequiredAccessToBackup(backup_query->elements);
-        if (!on_cluster)
-            context->checkAccess(required_access);
-
-        ClusterPtr cluster;
-        if (on_cluster)
-        {
-            backup_query->cluster = context->getMacros()->expand(backup_query->cluster);
-            cluster = context->getCluster(backup_query->cluster);
-            backup_settings.cluster_host_ids = cluster->getHostIDs();
-        }
-
-        /// Make a backup coordination.
-        if (!backup_coordination)
-            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'");
-
-        /// Opens a backup for writing.
-        BackupFactory::CreateParams backup_create_params;
-        backup_create_params.open_mode = IBackup::OpenMode::WRITE;
-        backup_create_params.context = context;
-        backup_create_params.backup_info = backup_info;
-        backup_create_params.base_backup_info = backup_settings.base_backup_info;
-        backup_create_params.compression_method = backup_settings.compression_method;
-        backup_create_params.compression_level = backup_settings.compression_level;
-        backup_create_params.password = backup_settings.password;
-        backup_create_params.s3_storage_class = backup_settings.s3_storage_class;
-        backup_create_params.is_internal_backup = backup_settings.internal;
-        backup_create_params.backup_coordination = backup_coordination;
-        backup_create_params.backup_uuid = backup_settings.backup_uuid;
-        backup_create_params.deduplicate_files = backup_settings.deduplicate_files;
-        backup_create_params.allow_s3_native_copy = backup_settings.allow_s3_native_copy;
-        backup_create_params.use_same_s3_credentials_for_base_backup = backup_settings.use_same_s3_credentials_for_base_backup;
-        backup_create_params.read_settings = getReadSettingsForBackup(context, backup_settings);
-        backup_create_params.write_settings = getWriteSettingsForBackup(context);
-        BackupMutablePtr backup = BackupFactory::instance().createBackup(backup_create_params);
-
-        /// Write the backup.
-        if (on_cluster)
-        {
-            DDLQueryOnClusterParams params;
-            params.cluster = cluster;
-            params.only_shard_num = backup_settings.shard_num;
-            params.only_replica_num = backup_settings.replica_num;
-            params.access_to_check = required_access;
-            backup_settings.copySettingsToQuery(*backup_query);
-
-            // executeDDLQueryOnCluster() will return without waiting for completion
-            mutable_context->setSetting("distributed_ddl_task_timeout", Field{0});
-            mutable_context->setSetting("distributed_ddl_output_mode", Field{"none"});
-            executeDDLQueryOnCluster(backup_query, mutable_context, params);
-
-            /// Wait until all the hosts have written their backup entries.
-            backup_coordination->waitForStage(Stage::COMPLETED);
-            backup_coordination->setStage(Stage::COMPLETED,"");
-        }
-        else
-        {
-            backup_query->setCurrentDatabase(context->getCurrentDatabase());
-
-            /// Prepare backup entries.
-            BackupEntries backup_entries;
-            {
-                BackupEntriesCollector backup_entries_collector(
-                    backup_query->elements, backup_settings, backup_coordination,
-                    backup_create_params.read_settings, context, getThreadPool(ThreadPoolId::BACKUP_MAKE_FILES_LIST));
-                backup_entries = backup_entries_collector.run();
-            }
-
-            /// Write the backup entries to the backup.
-            buildFileInfosForBackupEntries(backup, backup_entries, backup_create_params.read_settings, 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(Stage::COMPLETED,"");
-        }
-
-        size_t num_files = 0;
-        UInt64 total_size = 0;
-        size_t num_entries = 0;
-        UInt64 uncompressed_size = 0;
-        UInt64 compressed_size = 0;
-
-        /// Finalize backup (write its metadata).
-        if (!backup_settings.internal)
-        {
-            backup->finalizeWriting();
-            num_files = backup->getNumFiles();
-            total_size = backup->getTotalSize();
-            num_entries = backup->getNumEntries();
-            uncompressed_size = backup->getUncompressedSize();
-            compressed_size = backup->getCompressedSize();
-        }
-
-        /// Close the backup.
-        backup.reset();
-
-        LOG_INFO(log, "{} {} was created successfully", (backup_settings.internal ? "Internal backup" : "Backup"), backup_name_for_logging);
-        /// 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);
-        /// NOTE: setStatus is called after setNumFilesAndSize in order to have actual information in a backup log record
-        setStatus(backup_id, BackupStatus::BACKUP_CREATED);
+        backup_query->cluster = context->getMacros()->expand(backup_query->cluster);
+        cluster = context->getCluster(backup_query->cluster);
+        backup_settings.cluster_host_ids = cluster->getHostIDs();
     }
-    catch (...)
+
+    /// Make a backup coordination.
+    if (!backup_coordination)
+        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'");
+
+    /// Opens a backup for writing.
+    BackupFactory::CreateParams backup_create_params;
+    backup_create_params.open_mode = IBackup::OpenMode::WRITE;
+    backup_create_params.context = context;
+    backup_create_params.backup_info = backup_info;
+    backup_create_params.base_backup_info = backup_settings.base_backup_info;
+    backup_create_params.compression_method = backup_settings.compression_method;
+    backup_create_params.compression_level = backup_settings.compression_level;
+    backup_create_params.password = backup_settings.password;
+    backup_create_params.s3_storage_class = backup_settings.s3_storage_class;
+    backup_create_params.is_internal_backup = backup_settings.internal;
+    backup_create_params.backup_coordination = backup_coordination;
+    backup_create_params.backup_uuid = backup_settings.backup_uuid;
+    backup_create_params.deduplicate_files = backup_settings.deduplicate_files;
+    backup_create_params.allow_s3_native_copy = backup_settings.allow_s3_native_copy;
+    backup_create_params.use_same_s3_credentials_for_base_backup = backup_settings.use_same_s3_credentials_for_base_backup;
+    backup_create_params.azure_attempt_to_create_container = backup_settings.azure_attempt_to_create_container;
+    backup_create_params.read_settings = getReadSettingsForBackup(context, backup_settings);
+    backup_create_params.write_settings = getWriteSettingsForBackup(context);
+    backup = BackupFactory::instance().createBackup(backup_create_params);
+
+    /// Write the backup.
+    if (on_cluster)
     {
-        /// Something bad happened, the backup has not built.
-        if (called_async)
-        {
-            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);
-        }
-        else
-        {
-            /// setStatus() and sendCurrentExceptionToCoordination() will be called by startMakingBackup().
-            throw;
-        }
+        DDLQueryOnClusterParams params;
+        params.cluster = cluster;
+        params.only_shard_num = backup_settings.shard_num;
+        params.only_replica_num = backup_settings.replica_num;
+        params.access_to_check = required_access;
+        backup_settings.copySettingsToQuery(*backup_query);
+
+        // executeDDLQueryOnCluster() will return without waiting for completion
+        mutable_context->setSetting("distributed_ddl_task_timeout", Field{0});
+        mutable_context->setSetting("distributed_ddl_output_mode", Field{"none"});
+        executeDDLQueryOnCluster(backup_query, mutable_context, params);
+
+        /// Wait until all the hosts have written their backup entries.
+        backup_coordination->waitForStage(Stage::COMPLETED);
+        backup_coordination->setStage(Stage::COMPLETED,"");
     }
+    else
+    {
+        backup_query->setCurrentDatabase(context->getCurrentDatabase());
+
+        /// Prepare backup entries.
+        BackupEntries backup_entries;
+        {
+            BackupEntriesCollector backup_entries_collector(
+                backup_query->elements, backup_settings, backup_coordination,
+                backup_create_params.read_settings, context, getThreadPool(ThreadPoolId::BACKUP_MAKE_FILES_LIST));
+            backup_entries = backup_entries_collector.run();
+        }
+
+        /// Write the backup entries to the backup.
+        chassert(backup);
+        chassert(backup_coordination);
+        chassert(context);
+        buildFileInfosForBackupEntries(backup, backup_entries, backup_create_params.read_settings, backup_coordination, context->getProcessListElement());
+        writeBackupEntries(backup, std::move(backup_entries), backup_id, backup_coordination, backup_settings.internal, context->getProcessListElement());
+
+        /// We have written our backup entries, we need to tell other hosts (they could be waiting for it).
+        backup_coordination->setStage(Stage::COMPLETED,"");
+    }
+
+    size_t num_files = 0;
+    UInt64 total_size = 0;
+    size_t num_entries = 0;
+    UInt64 uncompressed_size = 0;
+    UInt64 compressed_size = 0;
+
+    /// Finalize backup (write its metadata).
+    if (!backup_settings.internal)
+    {
+        backup->finalizeWriting();
+        num_files = backup->getNumFiles();
+        total_size = backup->getTotalSize();
+        num_entries = backup->getNumEntries();
+        uncompressed_size = backup->getUncompressedSize();
+        compressed_size = backup->getCompressedSize();
+    }
+
+    /// Close the backup.
+    backup.reset();
+
+    LOG_INFO(log, "{} {} was created successfully", (backup_settings.internal ? "Internal backup" : "Backup"), backup_name_for_logging);
+    /// 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);
+    /// NOTE: setStatus is called after setNumFilesAndSize in order to have actual information in a backup log record
+    setStatus(backup_id, BackupStatus::BACKUP_CREATED);
 }
 
 
-void BackupsWorker::buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, const ReadSettings & read_settings, std::shared_ptr<IBackupCoordination> backup_coordination)
+void BackupsWorker::buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, const ReadSettings & read_settings, std::shared_ptr<IBackupCoordination> backup_coordination, QueryStatusPtr process_list_element)
 {
     backup_coordination->setStage(Stage::BUILDING_FILE_INFOS, "");
     backup_coordination->waitForStage(Stage::BUILDING_FILE_INFOS);
-    backup_coordination->addFileInfos(::DB::buildFileInfosForBackupEntries(backup_entries, backup->getBaseBackup(), read_settings, getThreadPool(ThreadPoolId::BACKUP_MAKE_FILES_LIST)));
+    backup_coordination->addFileInfos(::DB::buildFileInfosForBackupEntries(backup_entries, backup->getBaseBackup(), read_settings, getThreadPool(ThreadPoolId::BACKUP_MAKE_FILES_LIST), process_list_element));
 }
 
 
-void BackupsWorker::writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, const OperationID & backup_id, std::shared_ptr<IBackupCoordination> backup_coordination, bool internal)
+void BackupsWorker::writeBackupEntries(
+    BackupMutablePtr backup,
+    BackupEntries && backup_entries,
+    const OperationID & backup_id,
+    std::shared_ptr<IBackupCoordination> backup_coordination,
+    bool internal,
+    QueryStatusPtr process_list_element)
 {
     LOG_TRACE(log, "{}, num backup entries={}", Stage::WRITING_BACKUP, backup_entries.size());
     backup_coordination->setStage(Stage::WRITING_BACKUP, "");
@@ -677,7 +750,13 @@ void BackupsWorker::writeBackupEntries(BackupMutablePtr backup, BackupEntries &&
                         return;
                 }
 
+                if (process_list_element)
+                    process_list_element->checkTimeLimit();
+
                 backup->writeFile(file_info, std::move(entry));
+
+                maybeSleepForTesting();
+
                 // Update metadata
                 if (!internal)
                 {
@@ -690,7 +769,6 @@ void BackupsWorker::writeBackupEntries(BackupMutablePtr backup, BackupEntries &&
                             backup->getCompressedSize(),
                             0, 0);
                 }
-
             }
             catch (...)
             {
@@ -723,6 +801,9 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
     auto restore_query = std::static_pointer_cast<ASTBackupQuery>(query->clone());
     auto restore_settings = RestoreSettings::fromRestoreQuery(*restore_query);
 
+    auto backup_info = BackupInfo::fromAST(*restore_query->backup_name);
+    String backup_name_for_logging = backup_info.toStringForLogging();
+
     if (!restore_settings.restore_uuid)
         restore_settings.restore_uuid = UUIDHelpers::generateV4();
 
@@ -736,31 +817,47 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
         restore_id = toString(*restore_settings.restore_uuid);
 
     std::shared_ptr<IRestoreCoordination> restore_coordination;
-    if (restore_settings.internal)
+
+    /// Called in exception handlers below. This lambda function can be called on a separate thread, so it can't capture local variables by reference.
+    auto on_exception = [this](const OperationID & restore_id_, const String & backup_name_for_logging_,
+                               const RestoreSettings & restore_settings_, const std::shared_ptr<IRestoreCoordination> & restore_coordination_)
     {
-        /// 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.
-        restore_coordination = makeRestoreCoordination(context, restore_settings, /* remote= */ true);
-    }
+        /// Something bad happened, some data were not restored.
+        tryLogCurrentException(log, fmt::format("Failed to restore from {} {}", (restore_settings_.internal ? "internal backup" : "backup"), backup_name_for_logging_));
+        setStatusSafe(restore_id_, getRestoreStatusFromCurrentException());
+        sendCurrentExceptionToCoordination(restore_coordination_);
+    };
 
     try
     {
-        auto backup_info = BackupInfo::fromAST(*restore_query->backup_name);
-        String backup_name_for_logging = backup_info.toStringForLogging();
         String base_backup_name;
         if (restore_settings.base_backup_info)
             base_backup_name = restore_settings.base_backup_info->toStringForLogging();
 
-        addInfo(restore_id, backup_name_for_logging, base_backup_name, restore_settings.internal, BackupStatus::RESTORING);
+        addInfo(restore_id,
+            backup_name_for_logging,
+            base_backup_name,
+            context->getCurrentQueryId(),
+            restore_settings.internal,
+            context->getProcessListElement(),
+            BackupStatus::RESTORING);
+
+        if (restore_settings.internal)
+        {
+            /// 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.
+            restore_coordination = makeRestoreCoordination(context, restore_settings, /* remote= */ true);
+        }
 
         /// Prepare context to use.
         ContextMutablePtr context_in_use = context;
         bool on_cluster = !restore_query->cluster.empty();
         if (restore_settings.async || on_cluster)
         {
-            /// For ON CLUSTER queries we will need to change some settings.
-            /// For ASYNC queries we have to clone the context anyway.
+            /// We have to clone the query context here because:
+            /// if this is an "ON CLUSTER" query we need to change some settings, and
+            /// if this is an "ASYNC" query it's going to be executed in another thread.
             context_in_use = Context::createCopy(context);
             context_in_use->makeQueryContext();
         }
@@ -768,18 +865,39 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
         if (restore_settings.async)
         {
             auto & thread_pool = getThreadPool(on_cluster ? ThreadPoolId::RESTORE_ASYNC_ON_CLUSTER : ThreadPoolId::RESTORE_ASYNC);
+
+            /// process_list_element_holder is used to make an element in ProcessList live while RESTORE is working asynchronously.
+            auto process_list_element = context_in_use->getProcessListElement();
+
             thread_pool.scheduleOrThrowOnError(
-                [this, restore_query, restore_id, backup_name_for_logging, backup_info, restore_settings, restore_coordination, context_in_use]
+                [this,
+                 restore_query,
+                 restore_id,
+                 backup_name_for_logging,
+                 backup_info,
+                 restore_settings,
+                 restore_coordination,
+                 context_in_use,
+                 on_exception,
+                 process_list_element_holder = process_list_element ? process_list_element->getProcessListEntry() : nullptr]
                 {
-                    doRestore(
-                        restore_query,
-                        restore_id,
-                        backup_name_for_logging,
-                        backup_info,
-                        restore_settings,
-                        restore_coordination,
-                        context_in_use,
-                        /* called_async= */ true);
+                    try
+                    {
+                        setThreadName("RestorerWorker");
+                        CurrentThread::QueryScope query_scope(context_in_use);
+                        doRestore(
+                            restore_query,
+                            restore_id,
+                            backup_name_for_logging,
+                            backup_info,
+                            restore_settings,
+                            restore_coordination,
+                            context_in_use);
+                    }
+                    catch (...)
+                    {
+                        on_exception(restore_id, backup_name_for_logging, restore_settings, restore_coordination);
+                    }
                 });
         }
         else
@@ -791,17 +909,14 @@ OperationID BackupsWorker::startRestoring(const ASTPtr & query, ContextMutablePt
                 backup_info,
                 restore_settings,
                 restore_coordination,
-                context_in_use,
-                /* called_async= */ false);
+                context_in_use);
         }
 
         return restore_id;
     }
     catch (...)
     {
-        /// Something bad happened, the backup has not built.
-        setStatusSafe(restore_id, BackupStatus::RESTORE_FAILED);
-        sendCurrentExceptionToCoordination(restore_coordination);
+        on_exception(restore_id, backup_name_for_logging, restore_settings, restore_coordination);
         throw;
     }
 }
@@ -814,214 +929,128 @@ void BackupsWorker::doRestore(
     const BackupInfo & backup_info,
     RestoreSettings restore_settings,
     std::shared_ptr<IRestoreCoordination> restore_coordination,
-    ContextMutablePtr context,
-    bool called_async)
+    ContextMutablePtr context)
 {
-    std::optional<CurrentThread::QueryScope> query_scope;
-    try
+    /// Open the backup for reading.
+    BackupFactory::CreateParams backup_open_params;
+    backup_open_params.open_mode = IBackup::OpenMode::READ;
+    backup_open_params.context = context;
+    backup_open_params.backup_info = backup_info;
+    backup_open_params.base_backup_info = restore_settings.base_backup_info;
+    backup_open_params.password = restore_settings.password;
+    backup_open_params.allow_s3_native_copy = restore_settings.allow_s3_native_copy;
+    backup_open_params.use_same_s3_credentials_for_base_backup = restore_settings.use_same_s3_credentials_for_base_backup;
+    backup_open_params.read_settings = getReadSettingsForRestore(context);
+    backup_open_params.write_settings = getWriteSettingsForRestore(context);
+    backup_open_params.is_internal_backup = restore_settings.internal;
+    BackupPtr backup = BackupFactory::instance().createBackup(backup_open_params);
+
+    String current_database = context->getCurrentDatabase();
+    /// 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)
     {
-        if (called_async)
-        {
-            query_scope.emplace(context);
-            setThreadName("RestoreWorker");
-        }
-
-        /// Open the backup for reading.
-        BackupFactory::CreateParams backup_open_params;
-        backup_open_params.open_mode = IBackup::OpenMode::READ;
-        backup_open_params.context = context;
-        backup_open_params.backup_info = backup_info;
-        backup_open_params.base_backup_info = restore_settings.base_backup_info;
-        backup_open_params.password = restore_settings.password;
-        backup_open_params.allow_s3_native_copy = restore_settings.allow_s3_native_copy;
-        backup_open_params.use_same_s3_credentials_for_base_backup = restore_settings.use_same_s3_credentials_for_base_backup;
-        backup_open_params.read_settings = getReadSettingsForRestore(context);
-        backup_open_params.write_settings = getWriteSettingsForRestore(context);
-        BackupPtr backup = BackupFactory::instance().createBackup(backup_open_params);
-
-        String current_database = context->getCurrentDatabase();
-        /// 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)
-        {
-            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.
-            auto addresses = cluster->filterAddressesByShardOrReplica(restore_settings.shard_num, restore_settings.replica_num);
-            for (const auto * address : addresses)
-            {
-                restore_settings.host_id = address->toString();
-                auto restore_elements = restore_query->elements;
-                String addr_database = address->default_database.empty() ? current_database : address->default_database;
-                for (auto & element : restore_elements)
-                    element.setCurrentDatabase(addr_database);
-                RestorerFromBackup dummy_restorer{restore_elements, restore_settings, nullptr, backup, context};
-                dummy_restorer.run(RestorerFromBackup::CHECK_ACCESS_ONLY);
-            }
-        }
-
-        /// Do RESTORE.
-        if (on_cluster)
-        {
-
-            DDLQueryOnClusterParams params;
-            params.cluster = cluster;
-            params.only_shard_num = restore_settings.shard_num;
-            params.only_replica_num = restore_settings.replica_num;
-            restore_settings.copySettingsToQuery(*restore_query);
-
-            // executeDDLQueryOnCluster() will return without waiting for completion
-            context->setSetting("distributed_ddl_task_timeout", Field{0});
-            context->setSetting("distributed_ddl_output_mode", Field{"none"});
-
-            executeDDLQueryOnCluster(restore_query, context, params);
-
-            /// Wait until all the hosts have written their backup entries.
-            restore_coordination->waitForStage(Stage::COMPLETED);
-            restore_coordination->setStage(Stage::COMPLETED,"");
-        }
-        else
-        {
-            restore_query->setCurrentDatabase(current_database);
-
-            /// Restore metadata and prepare data restoring tasks.
-            DataRestoreTasks data_restore_tasks;
-            {
-                RestorerFromBackup restorer{restore_query->elements, restore_settings, restore_coordination,
-                                            backup, context};
-                data_restore_tasks = restorer.run(RestorerFromBackup::RESTORE);
-            }
-
-            /// Execute the data restoring tasks.
-            restoreTablesData(restore_id, backup, std::move(data_restore_tasks), getThreadPool(ThreadPoolId::RESTORE_TABLES_DATA));
-
-            /// We have restored everything, we need to tell other hosts (they could be waiting for it).
-            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);
+        restore_query->cluster = context->getMacros()->expand(restore_query->cluster);
+        cluster = context->getCluster(restore_query->cluster);
+        restore_settings.cluster_host_ids = cluster->getHostIDs();
     }
-    catch (...)
+
+    /// 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)
     {
-        /// Something bad happened, the backup has not built.
-        if (called_async)
+        /// 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.
+        auto addresses = cluster->filterAddressesByShardOrReplica(restore_settings.shard_num, restore_settings.replica_num);
+        for (const auto * address : addresses)
         {
-            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);
-        }
-        else
-        {
-            /// setStatus() and sendCurrentExceptionToCoordination() will be called by startRestoring().
-            throw;
+            restore_settings.host_id = address->toString();
+            auto restore_elements = restore_query->elements;
+            String addr_database = address->default_database.empty() ? current_database : address->default_database;
+            for (auto & element : restore_elements)
+                element.setCurrentDatabase(addr_database);
+            RestorerFromBackup dummy_restorer{restore_elements, restore_settings, nullptr, backup, context, getThreadPool(ThreadPoolId::RESTORE), {}};
+            dummy_restorer.run(RestorerFromBackup::CHECK_ACCESS_ONLY);
         }
     }
-}
 
-
-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)
+    /// Do RESTORE.
+    if (on_cluster)
     {
+
+        DDLQueryOnClusterParams params;
+        params.cluster = cluster;
+        params.only_shard_num = restore_settings.shard_num;
+        params.only_replica_num = restore_settings.replica_num;
+        restore_settings.copySettingsToQuery(*restore_query);
+
+        // executeDDLQueryOnCluster() will return without waiting for completion
+        context->setSetting("distributed_ddl_task_timeout", Field{0});
+        context->setSetting("distributed_ddl_output_mode", Field{"none"});
+
+        executeDDLQueryOnCluster(restore_query, context, params);
+
+        /// Wait until all the hosts have written their backup entries.
+        restore_coordination->waitForStage(Stage::COMPLETED);
+        restore_coordination->setStage(Stage::COMPLETED,"");
+    }
+    else
+    {
+        restore_query->setCurrentDatabase(current_database);
+
+        auto after_task_callback = [&]
         {
-            std::unique_lock lock{mutex};
-            if (exception)
-                break;
-            ++num_active_jobs;
-        }
-
-        auto job = [&]()
-        {
-            SCOPE_EXIT_SAFE(
-                std::lock_guard lock{mutex};
-                if (!--num_active_jobs)
-                    event.notify_all();
-                CurrentThread::detachFromGroupIfNotDetached();
-            );
-
-            try
-            {
-                if (thread_group)
-                    CurrentThread::attachToGroup(thread_group);
-
-                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();
-            }
+            maybeSleepForTesting();
+            setNumFilesAndSize(restore_id, backup->getNumFiles(), backup->getTotalSize(), backup->getNumEntries(),
+                               backup->getUncompressedSize(), backup->getCompressedSize(), backup->getNumReadFiles(), backup->getNumReadBytes());
         };
 
-        thread_pool.scheduleOrThrowOnError(job);
+        /// Restore from the backup.
+        RestorerFromBackup restorer{restore_query->elements, restore_settings, restore_coordination,
+                                    backup, context, getThreadPool(ThreadPoolId::RESTORE), after_task_callback};
+        restorer.run(RestorerFromBackup::RESTORE);
     }
 
-    {
-        std::unique_lock lock{mutex};
-        event.wait(lock, [&] { return !num_active_jobs; });
-        if (exception)
-            std::rethrow_exception(exception);
-    }
+    LOG_INFO(log, "Restored from {} {} successfully", (restore_settings.internal ? "internal backup" : "backup"), backup_name_for_logging);
+    setStatus(restore_id, BackupStatus::RESTORED);
 }
 
 
-void BackupsWorker::addInfo(const OperationID & id, const String & name, const String & base_backup_name, bool internal, BackupStatus status)
+void BackupsWorker::addInfo(const OperationID & id, const String & name, const String & base_backup_name, const String & query_id,
+                            bool internal, QueryStatusPtr process_list_element, BackupStatus status)
 {
-    BackupOperationInfo info;
+    ExtendedOperationInfo extended_info;
+    auto & info = extended_info.info;
     info.id = id;
     info.name = name;
     info.base_backup_name = base_backup_name;
+    info.query_id = query_id;
     info.internal = internal;
     info.status = status;
     info.start_time = std::chrono::system_clock::now();
 
-    if (isFinalStatus(status))
+    bool is_final_status = isFinalStatus(status);
+
+    if (process_list_element)
+    {
+        info.profile_counters = process_list_element->getInfo(/* get_thread_list= */ false, /* get_profile_events= */ true, /* get_settings= */ false).profile_counters;
+        if (!is_final_status)
+            extended_info.process_list_element = process_list_element;
+    }
+
+    if (is_final_status)
         info.end_time = info.start_time;
 
     std::lock_guard lock{infos_mutex};
@@ -1030,7 +1059,7 @@ void BackupsWorker::addInfo(const OperationID & id, const String & name, const S
     if (it != infos.end())
     {
         /// It's better not allow to overwrite the current status if it's in progress.
-        auto current_status = it->second.status;
+        auto current_status = it->second.info.status;
         if (!isFinalStatus(current_status))
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot start a backup or restore: ID {} is already in use", id);
     }
@@ -1038,7 +1067,7 @@ void BackupsWorker::addInfo(const OperationID & id, const String & name, const S
     if (backup_log)
         backup_log->add(BackupLogElement{info});
 
-    infos[id] = std::move(info);
+    infos[id] = std::move(extended_info);
 
     num_active_backups += getNumActiveBackupsChange(status);
     num_active_restores += getNumActiveRestoresChange(status);
@@ -1057,18 +1086,26 @@ void BackupsWorker::setStatus(const String & id, BackupStatus status, bool throw
             return;
     }
 
-    auto & info = it->second;
+    auto & extended_info = it->second;
+    auto & info = extended_info.info;
+
     auto old_status = info.status;
-
     info.status = status;
-    info.profile_counters = std::make_shared<ProfileEvents::Counters::Snapshot>(CurrentThread::getProfileEvents().getPartiallyAtomicSnapshot());
+    bool is_final_status = isFinalStatus(status);
 
-    if (isFinalStatus(status))
+    if (extended_info.process_list_element)
+    {
+        info.profile_counters = extended_info.process_list_element->getInfo(/* get_thread_list= */ false, /* get_profile_events= */ true, /* get_settings= */ false).profile_counters;
+        if (is_final_status)
+            extended_info.process_list_element = nullptr;
+    }
+
+    if (is_final_status)
         info.end_time = std::chrono::system_clock::now();
 
-    if (isErrorStatus(status))
+    if (isFailedOrCancelled(status))
     {
-        info.error_message = getCurrentExceptionMessage(false);
+        info.error_message = getCurrentExceptionMessage(true /*with_stacktrace*/);
         info.exception = std::current_exception();
     }
 
@@ -1077,6 +1114,9 @@ void BackupsWorker::setStatus(const String & id, BackupStatus status, bool throw
 
     num_active_backups += getNumActiveBackupsChange(status) - getNumActiveBackupsChange(old_status);
     num_active_restores += getNumActiveRestoresChange(status) - getNumActiveRestoresChange(old_status);
+
+    if (status != old_status)
+        status_changed.notify_all();
 }
 
 
@@ -1090,7 +1130,7 @@ void BackupsWorker::setNumFilesAndSize(const OperationID & id, size_t num_files,
     if (it == infos.end())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
 
-    auto & info = it->second;
+    auto & info = it->second.info;
     info.num_files = num_files;
     info.total_size = total_size;
     info.num_entries = num_entries;
@@ -1101,37 +1141,120 @@ void BackupsWorker::setNumFilesAndSize(const OperationID & id, size_t num_files,
 }
 
 
-void BackupsWorker::wait(const OperationID & id, bool rethrow_exception)
+void BackupsWorker::maybeSleepForTesting() const
+{
+    if (test_inject_sleep)
+        sleepForSeconds(1);
+}
+
+
+void BackupsWorker::wait(const OperationID & backup_or_restore_id, bool rethrow_exception)
 {
     std::unique_lock lock{infos_mutex};
     status_changed.wait(lock, [&]
     {
-        auto it = infos.find(id);
+        auto it = infos.find(backup_or_restore_id);
         if (it == infos.end())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
-        const auto & info = it->second;
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", backup_or_restore_id);
+        const auto & info = it->second.info;
         auto current_status = info.status;
-        if (rethrow_exception && isErrorStatus(current_status))
+        if (rethrow_exception && isFailedOrCancelled(current_status))
             std::rethrow_exception(info.exception);
-        return isFinalStatus(current_status);
+        if (isFinalStatus(current_status))
+            return true;
+        LOG_INFO(log, "Waiting {} {}", isBackupStatus(info.status) ? "backup" : "restore", info.name);
+        return false;
     });
 }
 
+void BackupsWorker::waitAll()
+{
+    std::vector<OperationID> current_operations;
+    {
+        std::lock_guard lock{infos_mutex};
+        for (const auto & [id, extended_info] : infos)
+            if (!isFinalStatus(extended_info.info.status))
+                current_operations.push_back(id);
+    }
+
+    if (current_operations.empty())
+        return;
+
+    LOG_INFO(log, "Waiting for running backups and restores to finish");
+
+    for (const auto & id : current_operations)
+        wait(id, /* rethrow_exception= */ false);
+
+    LOG_INFO(log, "Backups and restores finished");
+}
+
+void BackupsWorker::cancel(const BackupOperationID & backup_or_restore_id, bool wait_)
+{
+    QueryStatusPtr process_list_element;
+    {
+        std::unique_lock lock{infos_mutex};
+        auto it = infos.find(backup_or_restore_id);
+        if (it == infos.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", backup_or_restore_id);
+
+        const auto & extended_info = it->second;
+        const auto & info = extended_info.info;
+        if (isFinalStatus(info.status) || !extended_info.process_list_element)
+            return;
+
+        LOG_INFO(log, "Cancelling {} {}", isBackupStatus(info.status) ? "backup" : "restore", info.name);
+        process_list_element = extended_info.process_list_element;
+    }
+
+    process_list.sendCancelToQuery(process_list_element);
+
+    if (wait_)
+        wait(backup_or_restore_id, /* rethrow_exception= */ false);
+}
+
+
+void BackupsWorker::cancelAll(bool wait_)
+{
+    std::vector<OperationID> current_operations;
+    {
+        std::lock_guard lock{infos_mutex};
+        for (const auto & [id, extended_info] : infos)
+            if (!isFinalStatus(extended_info.info.status))
+                current_operations.push_back(id);
+    }
+
+    if (current_operations.empty())
+        return;
+
+    LOG_INFO(log, "Cancelling running backups and restores");
+
+    for (const auto & id : current_operations)
+        cancel(id, /* wait= */ false);
+
+    if (wait_)
+        for (const auto & id : current_operations)
+            wait(id, /* rethrow_exception= */ false);
+
+    LOG_INFO(log, "Backups and restores finished or stopped");
+}
+
+
 BackupOperationInfo BackupsWorker::getInfo(const OperationID & id) const
 {
     std::lock_guard lock{infos_mutex};
     auto it = infos.find(id);
     if (it == infos.end())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown backup ID {}", id);
-    return it->second;
+    return it->second.info;
 }
 
 std::vector<BackupOperationInfo> BackupsWorker::getAllInfos() const
 {
     std::vector<BackupOperationInfo> res_infos;
     std::lock_guard lock{infos_mutex};
-    for (const auto & info : infos | boost::adaptors::map_values)
+    for (const auto & extended_info : infos | boost::adaptors::map_values)
     {
+        const auto & info = extended_info.info;
         if (!info.internal)
             res_infos.push_back(info);
     }
@@ -1140,14 +1263,11 @@ std::vector<BackupOperationInfo> BackupsWorker::getAllInfos() const
 
 void BackupsWorker::shutdown()
 {
-    bool has_active_backups_and_restores = (num_active_backups || num_active_restores);
-    if (has_active_backups_and_restores)
-        LOG_INFO(log, "Waiting for {} backups and {} restores to be finished", num_active_backups, num_active_restores);
+    /// Cancel running backups and restores.
+    cancelAll(/* wait= */ true);
 
+    /// Wait for our thread pools (it must be done before destroying them).
     thread_pools->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 e2bd076314f..836f6d7ae2d 100644
--- a/src/Backups/BackupsWorker.h
+++ b/src/Backups/BackupsWorker.h
@@ -26,25 +26,43 @@ using BackupEntries = std::vector<std::pair<String, std::shared_ptr<const IBacku
 using DataRestoreTasks = std::vector<std::function<void()>>;
 struct ReadSettings;
 class BackupLog;
+class ThreadGroup;
+using ThreadGroupPtr = std::shared_ptr<ThreadGroup>;
+class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
+class ProcessList;
+
 
 /// Manager of backups and restores: executes backups and restores' threads in the background.
 /// Keeps information about backups and restores started in this session.
 class BackupsWorker
 {
 public:
-    BackupsWorker(ContextPtr global_context, size_t num_backup_threads, size_t num_restore_threads, bool allow_concurrent_backups_, bool allow_concurrent_restores_);
+    BackupsWorker(ContextMutablePtr global_context, size_t num_backup_threads, size_t num_restore_threads);
     ~BackupsWorker();
 
     /// Waits until all tasks have been completed.
     void shutdown();
 
     /// Starts executing a BACKUP or RESTORE query. Returns ID of the operation.
+    /// For asynchronous operations the function throws no exceptions on failure usually,
+    /// call getInfo() on a returned operation id to check for errors.
     BackupOperationID start(const ASTPtr & backup_or_restore_query, ContextMutablePtr context);
 
-    /// Waits until a BACKUP or RESTORE query started by start() is finished.
+    /// Waits until the specified backup or restore operation finishes or stops.
     /// The function returns immediately if the operation is already finished.
     void wait(const BackupOperationID & backup_or_restore_id, bool rethrow_exception = true);
 
+    /// Waits until all running backup and restore operations finish or stop.
+    void waitAll();
+
+    /// Cancels the specified backup or restore operation.
+    /// The function does nothing if this operation has already finished.
+    void cancel(const BackupOperationID & backup_or_restore_id, bool wait_ = true);
+
+    /// Cancels all running backup and restore operations.
+    void cancelAll(bool wait_ = true);
+
     BackupOperationInfo getInfo(const BackupOperationID & id) const;
     std::vector<BackupOperationInfo> getAllInfos() const;
 
@@ -52,6 +70,7 @@ private:
     BackupOperationID startMakingBackup(const ASTPtr & query, const ContextPtr & context);
 
     void doBackup(
+        BackupMutablePtr & backup,
         const std::shared_ptr<ASTBackupQuery> & backup_query,
         const BackupOperationID & backup_id,
         const String & backup_name_for_logging,
@@ -59,14 +78,13 @@ private:
         BackupSettings backup_settings,
         std::shared_ptr<IBackupCoordination> backup_coordination,
         const ContextPtr & context,
-        ContextMutablePtr mutable_context,
-        bool called_async);
+        ContextMutablePtr mutable_context);
 
     /// Builds file infos for specified backup entries.
-    void buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, const ReadSettings & read_settings, std::shared_ptr<IBackupCoordination> backup_coordination);
+    void buildFileInfosForBackupEntries(const BackupPtr & backup, const BackupEntries & backup_entries, const ReadSettings & read_settings, std::shared_ptr<IBackupCoordination> backup_coordination, QueryStatusPtr process_list_element);
 
     /// Write backup entries to an opened backup.
-    void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, const BackupOperationID & backup_id, std::shared_ptr<IBackupCoordination> backup_coordination, bool internal);
+    void writeBackupEntries(BackupMutablePtr backup, BackupEntries && backup_entries, const BackupOperationID & backup_id, std::shared_ptr<IBackupCoordination> backup_coordination, bool internal, QueryStatusPtr process_list_element);
 
     BackupOperationID startRestoring(const ASTPtr & query, ContextMutablePtr context);
 
@@ -77,13 +95,13 @@ private:
         const BackupInfo & backup_info,
         RestoreSettings restore_settings,
         std::shared_ptr<IRestoreCoordination> restore_coordination,
-        ContextMutablePtr context,
-        bool called_async);
+        ContextMutablePtr context);
 
     /// Run data restoring tasks which insert data to tables.
-    void restoreTablesData(const BackupOperationID & restore_id, BackupPtr backup, DataRestoreTasks && tasks, ThreadPool & thread_pool);
+    void restoreTablesData(const BackupOperationID & restore_id, BackupPtr backup, DataRestoreTasks && tasks, ThreadPool & thread_pool, QueryStatusPtr process_list_element);
 
-    void addInfo(const BackupOperationID & id, const String & name, const String & base_backup_name, bool internal, BackupStatus status);
+    void addInfo(const BackupOperationID & id, const String & name, const String & base_backup_name, const String & query_id,
+                bool internal, QueryStatusPtr process_list_element, BackupStatus status);
     void setStatus(const BackupOperationID & id, BackupStatus status, bool throw_if_error = true);
     void setStatusSafe(const String & id, BackupStatus status) { setStatus(id, status, false); }
     void setNumFilesAndSize(const BackupOperationID & id, size_t num_files, UInt64 total_size, size_t num_entries,
@@ -92,19 +110,34 @@ private:
     enum class ThreadPoolId;
     ThreadPool & getThreadPool(ThreadPoolId thread_pool_id);
 
+    /// Waits for some time if `test_inject_sleep` is true.
+    void maybeSleepForTesting() const;
+
     class ThreadPools;
     std::unique_ptr<ThreadPools> thread_pools;
 
     const bool allow_concurrent_backups;
     const bool allow_concurrent_restores;
-    Poco::Logger * log;
+    const bool remove_backup_files_after_failure;
+    const bool test_inject_sleep;
+
+    LoggerPtr log;
+
+    struct ExtendedOperationInfo
+    {
+        BackupOperationInfo info;
+        QueryStatusPtr process_list_element; /// to cancel this operation if we want to
+    };
+
+    std::unordered_map<BackupOperationID, ExtendedOperationInfo> infos;
 
-    std::unordered_map<BackupOperationID, BackupOperationInfo> infos;
-    std::shared_ptr<BackupLog> backup_log;
     std::condition_variable status_changed;
     std::atomic<size_t> num_active_backups = 0;
     std::atomic<size_t> num_active_restores = 0;
     mutable std::mutex infos_mutex;
+
+    std::shared_ptr<BackupLog> backup_log;
+    ProcessList & process_list;
 };
 
 }
diff --git a/src/Backups/DDLAdjustingForBackupVisitor.cpp b/src/Backups/DDLAdjustingForBackupVisitor.cpp
index 0bff3cc9f4e..5ea91094b75 100644
--- a/src/Backups/DDLAdjustingForBackupVisitor.cpp
+++ b/src/Backups/DDLAdjustingForBackupVisitor.cpp
@@ -57,9 +57,9 @@ namespace
                 if (size_t uuid_pos = zookeeper_path_arg.find(table_uuid_str); uuid_pos != String::npos)
                     zookeeper_path_arg.replace(uuid_pos, table_uuid_str.size(), "{uuid}");
             }
-            const auto & config = data.global_context->getConfigRef();
-            if ((zookeeper_path_arg == StorageReplicatedMergeTree::getDefaultZooKeeperPath(config))
-                && (replica_name_arg == StorageReplicatedMergeTree::getDefaultReplicaName(config))
+            const auto & server_settings = data.global_context->getServerSettings();
+            if ((zookeeper_path_arg == server_settings.default_replica_path.value)
+                && (replica_name_arg == server_settings.default_replica_name.value)
                 && ((engine_args.size() == 2) || !engine_args[2]->as<ASTLiteral>()))
             {
                 engine_args.erase(engine_args.begin(), engine_args.begin() + 2);
diff --git a/src/Backups/IBackup.h b/src/Backups/IBackup.h
index 783cad29b63..6f366a58103 100644
--- a/src/Backups/IBackup.h
+++ b/src/Backups/IBackup.h
@@ -80,7 +80,7 @@ public:
 
     /// Returns names of entries stored in a specified directory in the backup.
     /// If `directory` is empty or '/' the functions returns entries in the backup's root.
-    virtual Strings listFiles(const String & directory, bool recursive = false) const = 0;
+    virtual Strings listFiles(const String & directory, bool recursive) const = 0;
 
     /// Checks if a specified directory contains any files.
     /// The function returns the same as `!listFiles(directory).empty()`.
@@ -108,20 +108,21 @@ public:
     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 String & file_name, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) 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;
+    virtual size_t copyFileToDisk(const SizeAndChecksum & size_and_checksum, DiskPtr destination_disk, const String & destination_path, WriteMode write_mode) const = 0;
 
     /// Puts a new entry to the backup.
     virtual void writeFile(const BackupFileInfo & file_info, BackupEntryPtr entry) = 0;
 
+    /// Whether it's possible to add new entries to the backup in multiple threads.
+    virtual bool supportsWritingInMultipleThreads() const = 0;
+
     /// Finalizes writing the backup, should be called after all entries have been successfully written.
     virtual void finalizeWriting() = 0;
 
-    /// Whether it's possible to add new entries to the backup in multiple threads.
-    virtual bool supportsWritingInMultipleThreads() const = 0;
+    /// Try to remove all files copied to the backup. Used after an exception or it the backup was cancelled.
+    virtual void tryRemoveAllFiles() = 0;
 };
 
 using BackupPtr = std::shared_ptr<const IBackup>;
diff --git a/src/Backups/RestoreCoordinationLocal.cpp b/src/Backups/RestoreCoordinationLocal.cpp
index cf606151b53..4a91b8d95a5 100644
--- a/src/Backups/RestoreCoordinationLocal.cpp
+++ b/src/Backups/RestoreCoordinationLocal.cpp
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-RestoreCoordinationLocal::RestoreCoordinationLocal() : log(&Poco::Logger::get("RestoreCoordinationLocal"))
+RestoreCoordinationLocal::RestoreCoordinationLocal() : log(getLogger("RestoreCoordinationLocal"))
 {
 }
 
diff --git a/src/Backups/RestoreCoordinationLocal.h b/src/Backups/RestoreCoordinationLocal.h
index 7f6ffe1eeec..5e51b719d63 100644
--- a/src/Backups/RestoreCoordinationLocal.h
+++ b/src/Backups/RestoreCoordinationLocal.h
@@ -51,7 +51,7 @@ public:
     bool hasConcurrentRestores(const std::atomic<size_t> & num_active_restores) const override;
 
 private:
-    Poco::Logger * const log;
+    LoggerPtr 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;
diff --git a/src/Backups/RestoreCoordinationRemote.cpp b/src/Backups/RestoreCoordinationRemote.cpp
index 190634de4a9..84106737fc9 100644
--- a/src/Backups/RestoreCoordinationRemote.cpp
+++ b/src/Backups/RestoreCoordinationRemote.cpp
@@ -21,7 +21,8 @@ RestoreCoordinationRemote::RestoreCoordinationRemote(
     const String & restore_uuid_,
     const Strings & all_hosts_,
     const String & current_host_,
-    bool is_internal_)
+    bool is_internal_,
+    QueryStatusPtr process_list_element_)
     : get_zookeeper(get_zookeeper_)
     , root_zookeeper_path(root_zookeeper_path_)
     , keeper_settings(keeper_settings_)
@@ -31,11 +32,12 @@ RestoreCoordinationRemote::RestoreCoordinationRemote(
     , current_host(current_host_)
     , current_host_index(BackupCoordinationRemote::findCurrentHostIndex(all_hosts, current_host))
     , is_internal(is_internal_)
-    , log(&Poco::Logger::get("RestoreCoordinationRemote"))
+    , log(getLogger("RestoreCoordinationRemote"))
     , with_retries(
         log,
         get_zookeeper_,
         keeper_settings,
+        process_list_element_,
         [my_zookeeper_path = zookeeper_path, my_current_host = current_host, my_is_internal = is_internal]
         (WithRetries::FaultyKeeper & zk)
         {
diff --git a/src/Backups/RestoreCoordinationRemote.h b/src/Backups/RestoreCoordinationRemote.h
index 5ff0e6de002..9c299865cfa 100644
--- a/src/Backups/RestoreCoordinationRemote.h
+++ b/src/Backups/RestoreCoordinationRemote.h
@@ -21,7 +21,8 @@ public:
         const String & restore_uuid_,
         const Strings & all_hosts_,
         const String & current_host_,
-        bool is_internal_);
+        bool is_internal_,
+        QueryStatusPtr process_list_element_);
 
     ~RestoreCoordinationRemote() override;
 
@@ -72,7 +73,7 @@ private:
     const String current_host;
     const size_t current_host_index;
     const bool is_internal;
-    Poco::Logger * const log;
+    LoggerPtr const log;
 
     mutable WithRetries with_retries;
     std::optional<BackupCoordinationStageSync> stage_sync;
diff --git a/src/Backups/RestorerFromBackup.cpp b/src/Backups/RestorerFromBackup.cpp
index a33773f19ab..d8383fdbb1d 100644
--- a/src/Backups/RestorerFromBackup.cpp
+++ b/src/Backups/RestorerFromBackup.cpp
@@ -16,6 +16,7 @@
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/ProcessList.h>
 #include <Databases/IDatabase.h>
 #include <Databases/DDLDependencyVisitor.h>
 #include <Storages/IStorage.h>
@@ -23,7 +24,11 @@
 #include <Common/escapeForFileName.h>
 #include <base/insertAtEnd.h>
 #include <boost/algorithm/string/join.hpp>
+
+#include <boost/range/adaptor/map.hpp>
+
 #include <filesystem>
+#include <ranges>
 
 namespace fs = std::filesystem;
 
@@ -79,22 +84,36 @@ RestorerFromBackup::RestorerFromBackup(
     const RestoreSettings & restore_settings_,
     std::shared_ptr<IRestoreCoordination> restore_coordination_,
     const BackupPtr & backup_,
-    const ContextMutablePtr & context_)
+    const ContextMutablePtr & context_,
+    ThreadPool & thread_pool_,
+    const std::function<void()> & after_task_callback_)
     : restore_query_elements(restore_query_elements_)
     , restore_settings(restore_settings_)
     , restore_coordination(restore_coordination_)
     , backup(backup_)
     , context(context_)
+    , process_list_element(context->getProcessListElement())
+    , after_task_callback(after_task_callback_)
     , on_cluster_first_sync_timeout(context->getConfigRef().getUInt64("backups.on_cluster_first_sync_timeout", 180000))
     , create_table_timeout(context->getConfigRef().getUInt64("backups.create_table_timeout", 300000))
-    , log(&Poco::Logger::get("RestorerFromBackup"))
+    , log(getLogger("RestorerFromBackup"))
     , tables_dependencies("RestorerFromBackup")
+    , thread_pool(thread_pool_)
 {
 }
 
-RestorerFromBackup::~RestorerFromBackup() = default;
+RestorerFromBackup::~RestorerFromBackup()
+{
+    /// If an exception occurs we can come here to the destructor having some tasks still unfinished.
+    /// We have to wait until they finish.
+    if (getNumFutures() > 0)
+    {
+        LOG_INFO(log, "Waiting for {} tasks to finish", getNumFutures());
+        waitFutures();
+    }
+}
 
-RestorerFromBackup::DataRestoreTasks RestorerFromBackup::run(Mode mode)
+void RestorerFromBackup::run(Mode mode)
 {
     /// run() can be called onle once.
     if (!current_stage.empty())
@@ -113,31 +132,89 @@ RestorerFromBackup::DataRestoreTasks RestorerFromBackup::run(Mode mode)
     /// Find all the databases and tables which we will read from the backup.
     setStage(Stage::FINDING_TABLES_IN_BACKUP);
     findDatabasesAndTablesInBackup();
+    waitFutures();
 
     /// Check access rights.
     checkAccessForObjectsFoundInBackup();
 
     if (mode == Mode::CHECK_ACCESS_ONLY)
-        return {};
+        return;
 
     /// Create databases using the create queries read from the backup.
     setStage(Stage::CREATING_DATABASES);
     createDatabases();
+    waitFutures();
 
     /// Create tables using the create queries read from the backup.
     setStage(Stage::CREATING_TABLES);
     removeUnresolvedDependencies();
     createTables();
+    waitFutures();
 
     /// All what's left is to insert data to tables.
-    /// No more data restoring tasks are allowed after this point.
     setStage(Stage::INSERTING_DATA_TO_TABLES);
-    return getDataRestoreTasks();
+    insertDataToTables();
+    waitFutures();
+    runDataRestoreTasks();
+
+    /// Restored successfully!
+    setStage(Stage::COMPLETED);
+}
+
+void RestorerFromBackup::waitFutures()
+{
+    std::exception_ptr error;
+
+    for (;;)
+    {
+        std::vector<std::future<void>> futures_to_wait;
+        {
+            std::lock_guard lock{mutex};
+            std::swap(futures_to_wait, futures);
+        }
+
+        if (futures_to_wait.empty())
+            break;
+
+        /// Wait for all tasks.
+        for (auto & future : futures_to_wait)
+            future.wait();
+
+        /// Check if there is an exception.
+        for (auto & future : futures_to_wait)
+        {
+            try
+            {
+                future.get();
+            }
+            catch (...)
+            {
+                if (!error)
+                    error = std::current_exception();
+                exception_caught = true;
+            }
+        }
+    }
+
+    if (error)
+        std::rethrow_exception(error);
+}
+
+size_t RestorerFromBackup::getNumFutures() const
+{
+    std::lock_guard lock{mutex};
+    return futures.size();
 }
 
 void RestorerFromBackup::setStage(const String & new_stage, const String & message)
 {
     LOG_TRACE(log, "Setting stage: {}", new_stage);
+
+    if (getNumFutures() != 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot change the stage while some tasks ({}) are still running", getNumFutures());
+
+    checkIsQueryCancelled();
+
     current_stage = new_stage;
 
     if (restore_coordination)
@@ -150,6 +227,38 @@ void RestorerFromBackup::setStage(const String & new_stage, const String & messa
     }
 }
 
+void RestorerFromBackup::schedule(std::function<void()> && task_, const char * thread_name_)
+{
+    if (exception_caught)
+        return;
+
+    checkIsQueryCancelled();
+
+    auto future = scheduleFromThreadPool<void>(
+        [this, task = std::move(task_)]() mutable
+        {
+            if (exception_caught)
+                return;
+            checkIsQueryCancelled();
+
+            std::move(task)();
+
+            if (after_task_callback)
+                after_task_callback();
+        },
+        thread_pool,
+        thread_name_);
+
+    std::lock_guard lock{mutex};
+    futures.push_back(std::move(future));
+}
+
+void RestorerFromBackup::checkIsQueryCancelled() const
+{
+    if (process_list_element)
+        process_list_element->checkTimeLimit();
+}
+
 void RestorerFromBackup::findRootPathsInBackup()
 {
     size_t shard_num = 1;
@@ -167,7 +276,7 @@ void RestorerFromBackup::findRootPathsInBackup()
     root_paths_in_backup.push_back(root_path);
 
     /// Add shard-related part to the root path.
-    Strings shards_in_backup = backup->listFiles(root_path / "shards");
+    Strings shards_in_backup = backup->listFiles(root_path / "shards", /*recursive*/ false);
     if (shards_in_backup.empty())
     {
         if (restore_settings.shard_num_in_backup > 1)
@@ -189,7 +298,7 @@ void RestorerFromBackup::findRootPathsInBackup()
     }
 
     /// Add replica-related part to the root path.
-    Strings replicas_in_backup = backup->listFiles(root_path / "replicas");
+    Strings replicas_in_backup = backup->listFiles(root_path / "replicas", /*recursive*/ false);
     if (replicas_in_backup.empty())
     {
         if (restore_settings.replica_num_in_backup > 1)
@@ -231,8 +340,6 @@ void RestorerFromBackup::findRootPathsInBackup()
 
 void RestorerFromBackup::findDatabasesAndTablesInBackup()
 {
-    database_infos.clear();
-    table_infos.clear();
     for (const auto & element : restore_query_elements)
     {
         switch (element.type)
@@ -260,10 +367,17 @@ void RestorerFromBackup::findDatabasesAndTablesInBackup()
         }
     }
 
-    LOG_INFO(log, "Will restore {} databases and {} tables", database_infos.size(), table_infos.size());
+    LOG_INFO(log, "Will restore {} databases and {} tables", getNumDatabases(), getNumTables());
 }
 
 void RestorerFromBackup::findTableInBackup(const QualifiedTableName & table_name_in_backup, const std::optional<ASTs> & partitions)
+{
+    schedule(
+        [this, table_name_in_backup, partitions]() { findTableInBackupImpl(table_name_in_backup, partitions); },
+        "Restore_FindTbl");
+}
+
+void RestorerFromBackup::findTableInBackupImpl(const QualifiedTableName & table_name_in_backup, const std::optional<ASTs> & partitions)
 {
     bool is_temporary_table = (table_name_in_backup.database == DatabaseCatalog::TEMPORARY_DATABASE);
 
@@ -313,33 +427,41 @@ void RestorerFromBackup::findTableInBackup(const QualifiedTableName & table_name
     readStringUntilEOF(create_query_str, *read_buffer);
     read_buffer.reset();
     ParserCreateQuery create_parser;
-    ASTPtr create_table_query = parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr create_table_query = parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     applyCustomStoragePolicy(create_table_query);
     renameDatabaseAndTableNameInCreateQuery(create_table_query, renaming_map, context->getGlobalContext());
+    String create_table_query_str = serializeAST(*create_table_query);
 
     QualifiedTableName table_name = renaming_map.getNewTableName(table_name_in_backup);
 
+    bool is_predefined_table = DatabaseCatalog::instance().isPredefinedTable(StorageID{table_name.database, table_name.table});
+    auto table_dependencies = getDependenciesFromCreateQuery(context, table_name, create_table_query);
+    bool table_has_data = backup->hasFiles(data_path_in_backup);
+
+    std::lock_guard lock{mutex};
+
     if (auto it = table_infos.find(table_name); it != table_infos.end())
     {
         const TableInfo & table_info = it->second;
-        if (table_info.create_table_query && (serializeAST(*table_info.create_table_query) != serializeAST(*create_table_query)))
+        if (table_info.create_table_query && (table_info.create_table_query_str != create_table_query_str))
         {
             throw Exception(
                 ErrorCodes::CANNOT_RESTORE_TABLE,
                 "Extracted two different create queries for the same {}: {} and {}",
                 tableNameWithTypeToString(table_name.database, table_name.table, false),
-                serializeAST(*table_info.create_table_query),
-                serializeAST(*create_table_query));
+                table_info.create_table_query_str,
+                create_table_query_str);
         }
     }
 
     TableInfo & res_table_info = table_infos[table_name];
     res_table_info.create_table_query = create_table_query;
-    res_table_info.is_predefined_table = DatabaseCatalog::instance().isPredefinedTable(StorageID{table_name.database, table_name.table});
-    res_table_info.has_data = backup->hasFiles(data_path_in_backup);
+    res_table_info.create_table_query_str = create_table_query_str;
+    res_table_info.is_predefined_table = is_predefined_table;
+    res_table_info.has_data = table_has_data;
     res_table_info.data_path_in_backup = data_path_in_backup;
 
-    tables_dependencies.addDependencies(table_name, getDependenciesFromCreateQuery(context, table_name, create_table_query));
+    tables_dependencies.addDependencies(table_name, table_dependencies);
 
     if (partitions)
     {
@@ -369,6 +491,13 @@ void RestorerFromBackup::findTableInBackup(const QualifiedTableName & table_name
 }
 
 void RestorerFromBackup::findDatabaseInBackup(const String & database_name_in_backup, const std::set<DatabaseAndTableName> & except_table_names)
+{
+    schedule(
+        [this, database_name_in_backup, except_table_names]() { findDatabaseInBackupImpl(database_name_in_backup, except_table_names); },
+        "Restore_FindDB");
+}
+
+void RestorerFromBackup::findDatabaseInBackupImpl(const String & database_name_in_backup, const std::set<DatabaseAndTableName> & except_table_names)
 {
     std::optional<fs::path> metadata_path;
     std::unordered_set<String> table_names_in_backup;
@@ -388,7 +517,7 @@ void RestorerFromBackup::findDatabaseInBackup(const String & database_name_in_ba
         if (!metadata_path && !try_metadata_path.empty() && backup->fileExists(try_metadata_path))
             metadata_path = try_metadata_path;
 
-        Strings file_names = backup->listFiles(try_tables_metadata_path);
+        Strings file_names = backup->listFiles(try_tables_metadata_path, /*recursive*/ false);
         for (const String & file_name : file_names)
         {
             if (!file_name.ends_with(".sql"))
@@ -408,24 +537,30 @@ void RestorerFromBackup::findDatabaseInBackup(const String & database_name_in_ba
         readStringUntilEOF(create_query_str, *read_buffer);
         read_buffer.reset();
         ParserCreateQuery create_parser;
-        ASTPtr create_database_query = parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        ASTPtr create_database_query = parseQuery(create_parser, create_query_str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
         renameDatabaseAndTableNameInCreateQuery(create_database_query, renaming_map, context->getGlobalContext());
+        String create_database_query_str = serializeAST(*create_database_query);
 
         String database_name = renaming_map.getNewDatabaseName(database_name_in_backup);
+        bool is_predefined_database = DatabaseCatalog::isPredefinedDatabase(database_name);
+
+        std::lock_guard lock{mutex};
+
         DatabaseInfo & database_info = database_infos[database_name];
 
-        if (database_info.create_database_query && (serializeAST(*database_info.create_database_query) != serializeAST(*create_database_query)))
+        if (database_info.create_database_query && (database_info.create_database_query_str != create_database_query_str))
         {
             throw Exception(
                 ErrorCodes::CANNOT_RESTORE_DATABASE,
                 "Extracted two different create queries for the same database {}: {} and {}",
                 backQuoteIfNeed(database_name),
-                serializeAST(*database_info.create_database_query),
-                serializeAST(*create_database_query));
+                database_info.create_database_query_str,
+                create_database_query_str);
         }
 
         database_info.create_database_query = create_database_query;
-        database_info.is_predefined_database = DatabaseCatalog::isPredefinedDatabase(database_name);
+        database_info.create_database_query_str = create_database_query_str;
+        database_info.is_predefined_database = is_predefined_database;
     }
 
     for (const String & table_name_in_backup : table_names_in_backup)
@@ -443,7 +578,7 @@ void RestorerFromBackup::findEverythingInBackup(const std::set<String> & except_
 
     for (const auto & root_path_in_backup : root_paths_in_backup)
     {
-        Strings file_names = backup->listFiles(root_path_in_backup / "metadata");
+        Strings file_names = backup->listFiles(root_path_in_backup / "metadata", /*recursive*/ false);
         for (String & file_name : file_names)
         {
             if (file_name.ends_with(".sql"))
@@ -464,79 +599,95 @@ void RestorerFromBackup::findEverythingInBackup(const std::set<String> & except_
     }
 }
 
+size_t RestorerFromBackup::getNumDatabases() const
+{
+    std::lock_guard lock{mutex};
+    return database_infos.size();
+}
+
+size_t RestorerFromBackup::getNumTables() const
+{
+    std::lock_guard lock{mutex};
+    return table_infos.size();
+}
+
 void RestorerFromBackup::checkAccessForObjectsFoundInBackup() const
 {
     AccessRightsElements required_access;
-    for (const auto & [database_name, database_info] : database_infos)
+
     {
-        if (database_info.is_predefined_database)
-            continue;
-
-        AccessFlags flags;
-
-        if (restore_settings.create_database != RestoreDatabaseCreationMode::kMustExist)
-            flags |= AccessType::CREATE_DATABASE;
-
-        if (!flags)
-            flags = AccessType::SHOW_DATABASES;
-
-        required_access.emplace_back(flags, database_name);
-    }
-
-    for (const auto & [table_name, table_info] : table_infos)
-    {
-        if (table_info.is_predefined_table)
+        std::lock_guard lock{mutex};
+        for (const auto & [database_name, database_info] : database_infos)
         {
-            if (isSystemFunctionsTableName(table_name))
+            if (database_info.is_predefined_database)
+                continue;
+
+            AccessFlags flags;
+
+            if (restore_settings.create_database != RestoreDatabaseCreationMode::kMustExist)
+                flags |= AccessType::CREATE_DATABASE;
+
+            if (!flags)
+                flags = AccessType::SHOW_DATABASES;
+
+            required_access.emplace_back(flags, database_name);
+        }
+
+        for (const auto & [table_name, table_info] : table_infos)
+        {
+            if (table_info.is_predefined_table)
             {
-                /// CREATE_FUNCTION privilege is required to restore the "system.functions" table.
-                if (!restore_settings.structure_only && table_info.has_data)
-                    required_access.emplace_back(AccessType::CREATE_FUNCTION);
+                if (isSystemFunctionsTableName(table_name))
+                {
+                    /// CREATE_FUNCTION privilege is required to restore the "system.functions" table.
+                    if (!restore_settings.structure_only && table_info.has_data)
+                        required_access.emplace_back(AccessType::CREATE_FUNCTION);
+                }
+                /// Privileges required to restore ACL system tables are checked separately
+                /// (see access_restore_task->getRequiredAccess() below).
+                continue;
             }
-            /// Privileges required to restore ACL system tables are checked separately
-            /// (see access_restore_task->getRequiredAccess() below).
-            continue;
-        }
 
-        if (table_name.database == DatabaseCatalog::TEMPORARY_DATABASE)
-        {
+            if (table_name.database == DatabaseCatalog::TEMPORARY_DATABASE)
+            {
+                if (restore_settings.create_table != RestoreTableCreationMode::kMustExist)
+                    required_access.emplace_back(AccessType::CREATE_TEMPORARY_TABLE);
+                continue;
+            }
+
+            AccessFlags flags;
+            const ASTCreateQuery & create = table_info.create_table_query->as<const ASTCreateQuery &>();
+
             if (restore_settings.create_table != RestoreTableCreationMode::kMustExist)
-                required_access.emplace_back(AccessType::CREATE_TEMPORARY_TABLE);
-            continue;
+            {
+                if (create.is_dictionary)
+                    flags |= AccessType::CREATE_DICTIONARY;
+                else if (create.is_ordinary_view || create.is_materialized_view || create.is_live_view)
+                    flags |= AccessType::CREATE_VIEW;
+                else
+                    flags |= AccessType::CREATE_TABLE;
+            }
+
+            if (!restore_settings.structure_only && table_info.has_data)
+            {
+                flags |= AccessType::INSERT;
+            }
+
+            if (!flags)
+            {
+                if (create.is_dictionary)
+                    flags = AccessType::SHOW_DICTIONARIES;
+                else
+                    flags = AccessType::SHOW_TABLES;
+            }
+
+            required_access.emplace_back(flags, table_name.database, table_name.table);
         }
 
-        AccessFlags flags;
-        const ASTCreateQuery & create = table_info.create_table_query->as<const ASTCreateQuery &>();
-
-        if (restore_settings.create_table != RestoreTableCreationMode::kMustExist)
-        {
-            if (create.is_dictionary)
-                flags |= AccessType::CREATE_DICTIONARY;
-            else if (create.is_ordinary_view || create.is_materialized_view || create.is_live_view)
-                flags |= AccessType::CREATE_VIEW;
-            else
-                flags |= AccessType::CREATE_TABLE;
-        }
-
-        if (!restore_settings.structure_only && table_info.has_data)
-        {
-            flags |= AccessType::INSERT;
-        }
-
-        if (!flags)
-        {
-            if (create.is_dictionary)
-                flags = AccessType::SHOW_DICTIONARIES;
-            else
-                flags = AccessType::SHOW_TABLES;
-        }
-
-        required_access.emplace_back(flags, table_name.database, table_name.table);
+        if (access_restorer)
+            insertAtEnd(required_access, access_restorer->getRequiredAccess());
     }
 
-    if (access_restorer)
-        insertAtEnd(required_access, access_restorer->getRequiredAccess());
-
     /// We convert to AccessRights and back to check access rights in a predictable way
     /// (some elements could be duplicated or not sorted).
     required_access = AccessRights{required_access}.getElements();
@@ -546,7 +697,14 @@ void RestorerFromBackup::checkAccessForObjectsFoundInBackup() const
 
 void RestorerFromBackup::createDatabases()
 {
-    for (const auto & database_name : database_infos | boost::adaptors::map_keys)
+    Strings database_names;
+    {
+        std::lock_guard lock{mutex};
+        database_names.reserve(database_infos.size());
+        std::ranges::copy(database_infos | boost::adaptors::map_keys, std::back_inserter(database_names));
+    }
+
+    for (const auto & database_name : database_names)
     {
         createDatabase(database_name);
         checkDatabase(database_name);
@@ -558,11 +716,15 @@ void RestorerFromBackup::createDatabase(const String & database_name) const
     if (restore_settings.create_database == RestoreDatabaseCreationMode::kMustExist)
         return;
 
+    std::lock_guard lock{mutex};
+
     /// Predefined databases always exist.
     const auto & database_info = database_infos.at(database_name);
     if (database_info.is_predefined_database)
         return;
 
+    checkIsQueryCancelled();
+
     auto create_database_query = typeid_cast<std::shared_ptr<ASTCreateQuery>>(database_info.create_database_query->clone());
 
     /// Generate a new UUID for a database.
@@ -591,7 +753,9 @@ void RestorerFromBackup::createDatabase(const String & database_name) const
 
 void RestorerFromBackup::checkDatabase(const String & database_name)
 {
+    std::lock_guard lock{mutex};
     auto & database_info = database_infos.at(database_name);
+
     try
     {
         DatabasePtr database = DatabaseCatalog::instance().getDatabase(database_name);
@@ -641,8 +805,9 @@ void RestorerFromBackup::applyCustomStoragePolicy(ASTPtr query_ptr)
 
 void RestorerFromBackup::removeUnresolvedDependencies()
 {
-    auto need_exclude_dependency = [this](const StorageID & table_id)
-    {
+    std::lock_guard lock{mutex};
+
+    auto need_exclude_dependency = [&](const StorageID & table_id) TSA_REQUIRES(mutex) -> bool {
         /// Table will be restored.
         if (table_infos.contains(table_id.getQualifiedName()))
             return false;
@@ -688,14 +853,18 @@ void RestorerFromBackup::removeUnresolvedDependencies()
 void RestorerFromBackup::createTables()
 {
     /// We need to create tables considering their dependencies.
-    tables_dependencies.log();
-    auto tables_to_create = tables_dependencies.getTablesSortedByDependency();
+    std::vector<StorageID> tables_to_create;
+    {
+        std::lock_guard lock{mutex};
+        tables_dependencies.log();
+        tables_to_create = tables_dependencies.getTablesSortedByDependency();
+    }
+
     for (const auto & table_id : tables_to_create)
     {
         auto table_name = table_id.getQualifiedName();
         createTable(table_name);
         checkTable(table_name);
-        insertDataToTable(table_name);
     }
 }
 
@@ -704,11 +873,15 @@ void RestorerFromBackup::createTable(const QualifiedTableName & table_name)
     if (restore_settings.create_table == RestoreTableCreationMode::kMustExist)
         return;
 
+    std::lock_guard lock{mutex};
+
     /// Predefined tables always exist.
     auto & table_info = table_infos.at(table_name);
     if (table_info.is_predefined_table)
         return;
 
+    checkIsQueryCancelled();
+
     auto create_table_query = typeid_cast<std::shared_ptr<ASTCreateQuery>>(table_info.create_table_query->clone());
 
     /// Generate a new UUID for a table (the same table on different hosts must use the same UUID, `restore_coordination` will make it so).
@@ -744,6 +917,7 @@ void RestorerFromBackup::createTable(const QualifiedTableName & table_name)
 
 void RestorerFromBackup::checkTable(const QualifiedTableName & table_name)
 {
+    std::lock_guard lock{mutex};
     auto & table_info = table_infos.at(table_name);
 
     try
@@ -782,18 +956,44 @@ void RestorerFromBackup::checkTable(const QualifiedTableName & table_name)
     }
 }
 
+void RestorerFromBackup::insertDataToTables()
+{
+    std::vector<QualifiedTableName> table_names;
+    {
+        std::lock_guard lock{mutex};
+        table_names.reserve(table_infos.size());
+        std::ranges::copy(table_infos | boost::adaptors::map_keys, std::back_inserter(table_names));
+    }
+
+    for (const auto & table_name : table_names)
+        insertDataToTable(table_name);
+}
+
 void RestorerFromBackup::insertDataToTable(const QualifiedTableName & table_name)
 {
     if (restore_settings.structure_only)
         return;
 
-    auto & table_info = table_infos.at(table_name);
-    auto storage = table_info.storage;
+    StoragePtr storage;
+    String data_path_in_backup;
+    std::optional<ASTs> partitions;
+    {
+        std::lock_guard lock{mutex};
+        auto & table_info = table_infos.at(table_name);
+        storage = table_info.storage;
+        data_path_in_backup = table_info.data_path_in_backup;
+        partitions = table_info.partitions;
+    }
 
+    schedule(
+        [this, table_name, storage, data_path_in_backup, partitions]() { insertDataToTableImpl(table_name, storage, data_path_in_backup, partitions); },
+        "Restore_TblData");
+}
+
+void RestorerFromBackup::insertDataToTableImpl(const QualifiedTableName & table_name, StoragePtr storage, const String & data_path_in_backup, const std::optional<ASTs> & partitions)
+{
     try
     {
-        const auto & data_path_in_backup = table_info.data_path_in_backup;
-        const auto & partitions = table_info.partitions;
         if (partitions && !storage->supportsBackupPartition())
         {
             throw Exception(
@@ -812,45 +1012,47 @@ void RestorerFromBackup::insertDataToTable(const QualifiedTableName & table_name
 
 void RestorerFromBackup::addDataRestoreTask(DataRestoreTask && new_task)
 {
-    if (current_stage == Stage::INSERTING_DATA_TO_TABLES)
+    if (current_stage != Stage::INSERTING_DATA_TO_TABLES)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Adding of data-restoring tasks is not allowed");
+
+    std::lock_guard lock{mutex};
     data_restore_tasks.push_back(std::move(new_task));
 }
 
 void RestorerFromBackup::addDataRestoreTasks(DataRestoreTasks && new_tasks)
 {
-    if (current_stage == Stage::INSERTING_DATA_TO_TABLES)
+    if (current_stage != Stage::INSERTING_DATA_TO_TABLES)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Adding of data-restoring tasks is not allowed");
+
+    std::lock_guard lock{mutex};
     insertAtEnd(data_restore_tasks, std::move(new_tasks));
 }
 
-RestorerFromBackup::DataRestoreTasks RestorerFromBackup::getDataRestoreTasks()
+void RestorerFromBackup::runDataRestoreTasks()
 {
-    if (data_restore_tasks.empty())
-        return {};
-
-    LOG_TRACE(log, "Will insert data to tables");
-
-    /// Storages and table locks must exist while we're executing data restoring tasks.
-    auto storages = std::make_shared<std::vector<StoragePtr>>();
-    auto table_locks = std::make_shared<std::vector<TableLockHolder>>();
-    storages->reserve(table_infos.size());
-    table_locks->reserve(table_infos.size());
-    for (const auto & table_info : table_infos | boost::adaptors::map_values)
+    /// Iterations are required here because data restore tasks are allowed to call addDataRestoreTask() and add other data restore tasks.
+    for (;;)
     {
-        storages->push_back(table_info.storage);
-        table_locks->push_back(table_info.table_lock);
+        std::vector<DataRestoreTask> tasks_to_run;
+        {
+            std::lock_guard lock{mutex};
+            std::swap(tasks_to_run, data_restore_tasks);
+        }
+
+        if (tasks_to_run.empty())
+            break;
+
+        for (auto & task : tasks_to_run)
+            schedule(std::move(task), "Restore_TblTask");
+
+        waitFutures();
     }
-
-    DataRestoreTasks res_tasks;
-    for (const auto & task : data_restore_tasks)
-        res_tasks.push_back([task, storages, table_locks] { task(); });
-
-    return res_tasks;
 }
 
 std::vector<std::pair<UUID, AccessEntityPtr>> RestorerFromBackup::getAccessEntitiesToRestore()
 {
+    std::lock_guard lock{mutex};
+
     if (!access_restorer || access_restored)
         return {};
 
diff --git a/src/Backups/RestorerFromBackup.h b/src/Backups/RestorerFromBackup.h
index 194478bd8b4..238569ac755 100644
--- a/src/Backups/RestorerFromBackup.h
+++ b/src/Backups/RestorerFromBackup.h
@@ -7,6 +7,7 @@
 #include <Storages/TableLockHolder.h>
 #include <Storages/IStorage_fwd.h>
 #include <Interpreters/Context_fwd.h>
+#include <Common/ThreadPool_fwd.h>
 #include <filesystem>
 
 
@@ -21,6 +22,8 @@ using DatabasePtr = std::shared_ptr<IDatabase>;
 class AccessRestorerFromBackup;
 struct IAccessEntity;
 using AccessEntityPtr = std::shared_ptr<const IAccessEntity>;
+class QueryStatus;
+using QueryStatusPtr = std::shared_ptr<QueryStatus>;
 
 
 /// Restores the definition of databases and tables and prepares tasks to restore the data of the tables.
@@ -32,7 +35,9 @@ public:
         const RestoreSettings & restore_settings_,
         std::shared_ptr<IRestoreCoordination> restore_coordination_,
         const BackupPtr & backup_,
-        const ContextMutablePtr & context_);
+        const ContextMutablePtr & context_,
+        ThreadPool & thread_pool_,
+        const std::function<void()> & after_task_callback_);
 
     ~RestorerFromBackup();
 
@@ -49,7 +54,7 @@ public:
     using DataRestoreTasks = std::vector<DataRestoreTask>;
 
     /// Restores the metadata of databases and tables and returns tasks to restore the data of tables.
-    DataRestoreTasks run(Mode mode);
+    void run(Mode mode);
 
     BackupPtr getBackup() const { return backup; }
     const RestoreSettings & getRestoreSettings() const { return restore_settings; }
@@ -74,9 +79,11 @@ private:
     std::shared_ptr<IRestoreCoordination> restore_coordination;
     BackupPtr backup;
     ContextMutablePtr context;
+    QueryStatusPtr process_list_element;
+    std::function<void()> after_task_callback;
     std::chrono::milliseconds on_cluster_first_sync_timeout;
     std::chrono::milliseconds create_table_timeout;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     Strings all_hosts;
     DDLRenamingMap renaming_map;
@@ -86,9 +93,14 @@ private:
 
     void findDatabasesAndTablesInBackup();
     void findTableInBackup(const QualifiedTableName & table_name_in_backup, const std::optional<ASTs> & partitions);
+    void findTableInBackupImpl(const QualifiedTableName & table_name_in_backup, const std::optional<ASTs> & partitions);
     void findDatabaseInBackup(const String & database_name_in_backup, const std::set<DatabaseAndTableName> & except_table_names);
+    void findDatabaseInBackupImpl(const String & database_name_in_backup, const std::set<DatabaseAndTableName> & except_table_names);
     void findEverythingInBackup(const std::set<String> & except_database_names, const std::set<DatabaseAndTableName> & except_table_names);
 
+    size_t getNumDatabases() const;
+    size_t getNumTables() const;
+
     void checkAccessForObjectsFoundInBackup() const;
 
     void createDatabases();
@@ -101,15 +113,32 @@ private:
     void createTables();
     void createTable(const QualifiedTableName & table_name);
     void checkTable(const QualifiedTableName & table_name);
-    void insertDataToTable(const QualifiedTableName & table_name);
 
-    DataRestoreTasks getDataRestoreTasks();
+    void insertDataToTables();
+    void insertDataToTable(const QualifiedTableName & table_name);
+    void insertDataToTableImpl(const QualifiedTableName & table_name, StoragePtr storage, const String & data_path_in_backup, const std::optional<ASTs> & partitions);
+
+    void runDataRestoreTasks();
 
     void setStage(const String & new_stage, const String & message = "");
 
+    /// Schedule a task from the thread pool and start executing it.
+    void schedule(std::function<void()> && task_, const char * thread_name_);
+
+    /// Returns the number of currently scheduled or executing tasks.
+    size_t getNumFutures() const;
+
+    /// Waits until all tasks are processed (including the tasks scheduled while we're waiting).
+    /// Throws an exception if any of the tasks throws an exception.
+    void waitFutures();
+
+    /// Throws an exception if the RESTORE query was cancelled.
+    void checkIsQueryCancelled() const;
+
     struct DatabaseInfo
     {
         ASTPtr create_database_query;
+        String create_database_query_str;
         bool is_predefined_database = false;
         DatabasePtr database;
     };
@@ -117,6 +146,7 @@ private:
     struct TableInfo
     {
         ASTPtr create_table_query;
+        String create_table_query_str;
         bool is_predefined_table = false;
         bool has_data = false;
         std::filesystem::path data_path_in_backup;
@@ -127,12 +157,18 @@ private:
     };
 
     String current_stage;
-    std::unordered_map<String, DatabaseInfo> database_infos;
-    std::map<QualifiedTableName, TableInfo> table_infos;
-    TablesDependencyGraph tables_dependencies;
-    std::vector<DataRestoreTask> data_restore_tasks;
-    std::unique_ptr<AccessRestorerFromBackup> access_restorer;
-    bool access_restored = false;
+
+    std::unordered_map<String, DatabaseInfo> database_infos TSA_GUARDED_BY(mutex);
+    std::map<QualifiedTableName, TableInfo> table_infos TSA_GUARDED_BY(mutex);
+    TablesDependencyGraph tables_dependencies TSA_GUARDED_BY(mutex);
+    std::vector<DataRestoreTask> data_restore_tasks TSA_GUARDED_BY(mutex);
+    std::unique_ptr<AccessRestorerFromBackup> access_restorer TSA_GUARDED_BY(mutex);
+    bool access_restored TSA_GUARDED_BY(mutex) = false;
+
+    std::vector<std::future<void>> futures TSA_GUARDED_BY(mutex);
+    std::atomic<bool> exception_caught = false;
+    ThreadPool & thread_pool;
+    mutable std::mutex mutex;
 };
 
 }
diff --git a/src/Backups/WithRetries.cpp b/src/Backups/WithRetries.cpp
index 55809dc6958..66851fa42ce 100644
--- a/src/Backups/WithRetries.cpp
+++ b/src/Backups/WithRetries.cpp
@@ -21,10 +21,11 @@ WithRetries::KeeperSettings WithRetries::KeeperSettings::fromContext(ContextPtr
 }
 
 WithRetries::WithRetries(
-    Poco::Logger * log_, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings_, RenewerCallback callback_)
+    LoggerPtr log_, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings_, QueryStatusPtr process_list_element_, RenewerCallback callback_)
     : log(log_)
     , get_zookeeper(get_zookeeper_)
     , settings(settings_)
+    , process_list_element(process_list_element_)
     , callback(callback_)
     , global_zookeeper_retries_info(
           settings.keeper_max_retries, settings.keeper_retry_initial_backoff_ms, settings.keeper_retry_max_backoff_ms)
@@ -32,7 +33,7 @@ WithRetries::WithRetries(
 
 WithRetries::RetriesControlHolder::RetriesControlHolder(const WithRetries * parent, const String & name)
     : info(parent->global_zookeeper_retries_info)
-    , retries_ctl(name, parent->log, info, nullptr)
+    , retries_ctl(name, parent->log, info, parent->process_list_element)
     , faulty_zookeeper(parent->getFaultyZooKeeper())
 {}
 
diff --git a/src/Backups/WithRetries.h b/src/Backups/WithRetries.h
index 8f4a730e6a1..f795a963911 100644
--- a/src/Backups/WithRetries.h
+++ b/src/Backups/WithRetries.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Storages/MergeTree/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Common/ZooKeeper/Common.h>
 #include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
 
@@ -52,7 +52,7 @@ public:
     };
 
     RetriesControlHolder createRetriesControlHolder(const String & name);
-    WithRetries(Poco::Logger * log, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings, RenewerCallback callback);
+    WithRetries(LoggerPtr log, zkutil::GetZooKeeper get_zookeeper_, const KeeperSettings & settings, QueryStatusPtr process_list_element_, RenewerCallback callback);
 
     /// Used to re-establish new connection inside a retry loop.
     void renewZooKeeper(FaultyKeeper my_faulty_zookeeper) const;
@@ -62,9 +62,11 @@ private:
     /// This will provide a special wrapper which is useful for testing
     FaultyKeeper getFaultyZooKeeper() const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     zkutil::GetZooKeeper get_zookeeper;
     KeeperSettings settings;
+    QueryStatusPtr process_list_element;
+
     /// 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.
diff --git a/src/Backups/registerBackupEngineAzureBlobStorage.cpp b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
new file mode 100644
index 00000000000..dbe5b555c31
--- /dev/null
+++ b/src/Backups/registerBackupEngineAzureBlobStorage.cpp
@@ -0,0 +1,173 @@
+#include "config.h"
+
+#include <Backups/BackupFactory.h>
+#include <Common/Exception.h>
+
+#if USE_AZURE_BLOB_STORAGE
+#include <Backups/BackupIO_AzureBlobStorage.h>
+#include <Storages/StorageAzureBlob.h>
+#include <Backups/BackupImpl.h>
+#include <IO/Archives/hasRegisteredArchiveFileExtension.h>
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <filesystem>
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+#if USE_AZURE_BLOB_STORAGE
+namespace
+{
+    String removeFileNameFromURL(String & url)
+    {
+        Poco::URI url2{url};
+        String path = url2.getPath();
+        size_t slash_pos = path.find_last_of('/');
+        String file_name = path.substr(slash_pos + 1);
+        path.resize(slash_pos + 1);
+        url2.setPath(path);
+        url = url2.toString();
+        return file_name;
+    }
+}
+#endif
+
+void registerBackupEngineAzureBlobStorage(BackupFactory & factory)
+{
+    auto creator_fn = []([[maybe_unused]] const BackupFactory::CreateParams & params) -> std::unique_ptr<IBackup>
+    {
+#if USE_AZURE_BLOB_STORAGE
+        const String & id_arg = params.backup_info.id_arg;
+        const auto & args = params.backup_info.args;
+
+        StorageAzureBlob::Configuration configuration;
+
+        if (!id_arg.empty())
+        {
+            const auto & config = params.context->getConfigRef();
+            auto config_prefix = "named_collections." + id_arg;
+
+            if (!config.has(config_prefix))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no collection named `{}` in config", id_arg);
+
+            if (config.has(config_prefix + ".connection_string"))
+            {
+                configuration.connection_url = config.getString(config_prefix + ".connection_string");
+                configuration.is_connection_string = true;
+                configuration.container = config.getString(config_prefix + ".container");
+            }
+            else
+            {
+                configuration.connection_url = config.getString(config_prefix + ".storage_account_url");
+                configuration.is_connection_string = false;
+                configuration.container =  config.getString(config_prefix + ".container");
+                configuration.account_name = config.getString(config_prefix + ".account_name");
+                configuration.account_key =  config.getString(config_prefix + ".account_key");
+            }
+
+            if (args.size() > 1)
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Backup AzureBlobStorage requires 1 or 2 arguments: named_collection, [filename]");
+
+            if (args.size() == 1)
+                configuration.blob_path = args[0].safeGet<String>();
+
+        }
+        else
+        {
+            if (args.size() == 3)
+            {
+                configuration.connection_url = args[0].safeGet<String>();
+                configuration.is_connection_string = !configuration.connection_url.starts_with("http");
+
+                configuration.container =  args[1].safeGet<String>();
+                configuration.blob_path = args[2].safeGet<String>();
+            }
+            else if (args.size() == 5)
+            {
+                configuration.connection_url = args[0].safeGet<String>();
+                configuration.is_connection_string = false;
+
+                configuration.container =  args[1].safeGet<String>();
+                configuration.blob_path = args[2].safeGet<String>();
+                configuration.account_name = args[3].safeGet<String>();
+                configuration.account_key = args[4].safeGet<String>();
+
+            }
+            else
+            {
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                                    "Backup AzureBlobStorage requires 3 or 5 arguments: connection string>/<url, container, path, [account name], [account key]");
+            }
+        }
+
+        BackupImpl::ArchiveParams archive_params;
+        if (hasRegisteredArchiveFileExtension(configuration.blob_path))
+        {
+            if (params.is_internal_backup)
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Using archives with backups on clusters is disabled");
+
+            archive_params.archive_name = removeFileNameFromURL(configuration.blob_path);
+            archive_params.compression_method = params.compression_method;
+            archive_params.compression_level = params.compression_level;
+            archive_params.password = params.password;
+        }
+        else
+        {
+            if (!params.password.empty())
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Password is not applicable, backup cannot be encrypted");
+        }
+
+
+        if (params.open_mode == IBackup::OpenMode::READ)
+        {
+            auto reader = std::make_shared<BackupReaderAzureBlobStorage>(configuration,
+                                                           params.read_settings,
+                                                           params.write_settings,
+                                                           params.context);
+
+            return std::make_unique<BackupImpl>(
+                params.backup_info,
+                archive_params,
+                params.base_backup_info,
+                reader,
+                params.context,
+                /* use_same_s3_credentials_for_base_backup*/ false);
+        }
+        else
+        {
+            auto writer = std::make_shared<BackupWriterAzureBlobStorage>(configuration,
+                                                           params.read_settings,
+                                                           params.write_settings,
+                                                           params.context,
+                                                           params.azure_attempt_to_create_container);
+
+            return std::make_unique<BackupImpl>(
+                params.backup_info,
+                archive_params,
+                params.base_backup_info,
+                writer,
+                params.context,
+                params.is_internal_backup,
+                params.backup_coordination,
+                params.backup_uuid,
+                params.deduplicate_files,
+                /* use_same_s3_credentials_for_base_backup */ false);
+        }
+#else
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "AzureBlobStorage support is disabled");
+#endif
+    };
+
+    factory.registerBackupEngine("AzureBlobStorage", creator_fn);
+}
+
+}
diff --git a/src/Backups/registerBackupEngineS3.cpp b/src/Backups/registerBackupEngineS3.cpp
index 86941040021..c34dbe273f5 100644
--- a/src/Backups/registerBackupEngineS3.cpp
+++ b/src/Backups/registerBackupEngineS3.cpp
@@ -15,8 +15,6 @@
 
 namespace DB
 {
-namespace fs = std::filesystem;
-
 namespace ErrorCodes
 {
     extern const int BAD_ARGUMENTS;
@@ -65,13 +63,13 @@ void registerBackupEngineS3(BackupFactory & factory)
             secret_access_key = config.getString(config_prefix + ".secret_access_key", "");
 
             if (config.has(config_prefix + ".filename"))
-                s3_uri = fs::path(s3_uri) / config.getString(config_prefix + ".filename");
+                s3_uri = std::filesystem::path(s3_uri) / config.getString(config_prefix + ".filename");
 
             if (args.size() > 1)
                 throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Backup S3 requires 1 or 2 arguments: named_collection, [filename]");
 
             if (args.size() == 1)
-                s3_uri = fs::path(s3_uri) / args[0].safeGet<String>();
+                s3_uri = std::filesystem::path(s3_uri) / args[0].safeGet<String>();
         }
         else
         {
@@ -112,7 +110,8 @@ void registerBackupEngineS3(BackupFactory & factory)
                                                            params.allow_s3_native_copy,
                                                            params.read_settings,
                                                            params.write_settings,
-                                                           params.context);
+                                                           params.context,
+                                                           params.is_internal_backup);
 
             return std::make_unique<BackupImpl>(
                 params.backup_info,
@@ -131,7 +130,8 @@ void registerBackupEngineS3(BackupFactory & factory)
                                                            params.s3_storage_class,
                                                            params.read_settings,
                                                            params.write_settings,
-                                                           params.context);
+                                                           params.context,
+                                                           params.is_internal_backup);
 
             return std::make_unique<BackupImpl>(
                 params.backup_info,
diff --git a/src/BridgeHelper/CatBoostLibraryBridgeHelper.cpp b/src/BridgeHelper/CatBoostLibraryBridgeHelper.cpp
index 4db1eb720ac..bb9d890a691 100644
--- a/src/BridgeHelper/CatBoostLibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/CatBoostLibraryBridgeHelper.cpp
@@ -58,8 +58,12 @@ bool CatBoostLibraryBridgeHelper::bridgeHandShake()
     String result;
     try
     {
-        ReadWriteBufferFromHTTP buf(getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, http_timeouts, credentials);
-        readString(result, buf);
+        auto buf = BuilderRWBufferFromHTTP(getPingURI())
+                       .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                       .withTimeouts(http_timeouts)
+                       .create(credentials);
+
+        readString(result, *buf);
     }
     catch (...)
     {
@@ -79,29 +83,29 @@ ExternalModelInfos CatBoostLibraryBridgeHelper::listModels()
 {
     startBridgeSync();
 
-    ReadWriteBufferFromHTTP buf(
-        createRequestURI(CATBOOST_LIST_METHOD),
-        Poco::Net::HTTPRequest::HTTP_POST,
-        [](std::ostream &) {},
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(createRequestURI(CATBOOST_LIST_METHOD))
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .create(credentials);
 
     ExternalModelInfos result;
 
     UInt64 num_rows;
-    readIntBinary(num_rows, buf);
+    readIntBinary(num_rows, *buf);
 
     for (UInt64 i = 0; i < num_rows; ++i)
     {
         ExternalModelInfo info;
 
-        readStringBinary(info.model_path, buf);
-        readStringBinary(info.model_type, buf);
+        readStringBinary(info.model_path, *buf);
+        readStringBinary(info.model_type, *buf);
 
         UInt64 t;
-        readIntBinary(t, buf);
+        readIntBinary(t, *buf);
         info.loading_start_time = std::chrono::system_clock::from_time_t(t);
 
-        readIntBinary(t, buf);
+        readIntBinary(t, *buf);
         info.loading_duration = std::chrono::milliseconds(t);
 
         result.push_back(info);
@@ -116,17 +120,19 @@ void CatBoostLibraryBridgeHelper::removeModel()
 
     assert(model_path);
 
-    ReadWriteBufferFromHTTP buf(
-        createRequestURI(CATBOOST_REMOVEMODEL_METHOD),
-        Poco::Net::HTTPRequest::HTTP_POST,
-        [this](std::ostream & os)
-        {
-            os << "model_path=" << escapeForFileName(*model_path);
-        },
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(createRequestURI(CATBOOST_REMOVEMODEL_METHOD))
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .withOutCallback(
+                       [this](std::ostream & os)
+                       {
+                           os << "model_path=" << escapeForFileName(*model_path);
+                       })
+                   .create(credentials);
 
     String result;
-    readStringBinary(result, buf);
+    readStringBinary(result, *buf);
     assert(result == "1");
 }
 
@@ -134,14 +140,14 @@ void CatBoostLibraryBridgeHelper::removeAllModels()
 {
     startBridgeSync();
 
-    ReadWriteBufferFromHTTP buf(
-        createRequestURI(CATBOOST_REMOVEALLMODELS_METHOD),
-        Poco::Net::HTTPRequest::HTTP_POST,
-        [](std::ostream &){},
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(createRequestURI(CATBOOST_REMOVEALLMODELS_METHOD))
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .create(credentials);
 
     String result;
-    readStringBinary(result, buf);
+    readStringBinary(result, *buf);
     assert(result == "1");
 }
 
@@ -151,18 +157,20 @@ size_t CatBoostLibraryBridgeHelper::getTreeCount()
 
     assert(model_path && library_path);
 
-    ReadWriteBufferFromHTTP buf(
-        createRequestURI(CATBOOST_GETTREECOUNT_METHOD),
-        Poco::Net::HTTPRequest::HTTP_POST,
-        [this](std::ostream & os)
-        {
-            os << "library_path=" << escapeForFileName(*library_path) << "&";
-            os << "model_path=" << escapeForFileName(*model_path);
-        },
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(createRequestURI(CATBOOST_GETTREECOUNT_METHOD))
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .withOutCallback(
+                        [this](std::ostream & os)
+                        {
+                           os << "library_path=" << escapeForFileName(*library_path) << "&";
+                           os << "model_path=" << escapeForFileName(*model_path);
+                        })
+                   .create(credentials);
 
     size_t result;
-    readIntBinary(result, buf);
+    readIntBinary(result, *buf);
     return result;
 }
 
@@ -177,17 +185,19 @@ ColumnPtr CatBoostLibraryBridgeHelper::evaluate(const ColumnsWithTypeAndName & c
 
     assert(model_path);
 
-    ReadWriteBufferFromHTTP buf(
-        createRequestURI(CATBOOST_LIB_EVALUATE_METHOD),
-        Poco::Net::HTTPRequest::HTTP_POST,
-        [this, serialized = string_write_buf.str()](std::ostream & os)
-        {
-            os << "model_path=" << escapeForFileName(*model_path) << "&";
-            os << "data=" << escapeForFileName(serialized);
-        },
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(createRequestURI(CATBOOST_LIB_EVALUATE_METHOD))
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .withOutCallback(
+                       [this, serialized = string_write_buf.str()](std::ostream & os)
+                       {
+                           os << "model_path=" << escapeForFileName(*model_path) << "&";
+                           os << "data=" << escapeForFileName(serialized);
+                       })
+                   .create(credentials);
 
-    NativeReader deserializer(buf, /*server_revision*/ 0);
+    NativeReader deserializer(*buf, /*server_revision*/ 0);
     Block block_read = deserializer.read();
 
     return block_read.getColumns()[0];
diff --git a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
index fcb8ebd1f22..a37d2bd396f 100644
--- a/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/ExternalDictionaryLibraryBridgeHelper.cpp
@@ -71,8 +71,12 @@ bool ExternalDictionaryLibraryBridgeHelper::bridgeHandShake()
     String result;
     try
     {
-        ReadWriteBufferFromHTTP buf(getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, http_timeouts, credentials);
-        readString(result, buf);
+        auto buf = BuilderRWBufferFromHTTP(getPingURI())
+                       .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                       .withTimeouts(http_timeouts)
+                       .create(credentials);
+
+        readString(result, *buf);
     }
     catch (...)
     {
@@ -247,30 +251,28 @@ QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadKeys(const Block & requ
 
 bool ExternalDictionaryLibraryBridgeHelper::executeRequest(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback) const
 {
-    ReadWriteBufferFromHTTP buf(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        std::move(out_stream_callback),
-        http_timeouts, credentials);
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(http_timeouts)
+                   .withOutCallback(std::move(out_stream_callback))
+                   .create(credentials);
 
     bool res;
-    readBoolText(res, buf);
+    readBoolText(res, *buf);
     return res;
 }
 
 
 QueryPipeline ExternalDictionaryLibraryBridgeHelper::loadBase(const Poco::URI & uri, ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback)
 {
-    auto read_buf_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        std::move(out_stream_callback),
-        http_timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        getContext()->getReadSettings(),
-        HTTPHeaderEntries{});
+    auto read_buf_ptr = BuilderRWBufferFromHTTP(uri)
+                            .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                            .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                            .withSettings(getContext()->getReadSettings())
+                            .withTimeouts(http_timeouts)
+                            .withOutCallback(std::move(out_stream_callback))
+                            .create(credentials);
 
     auto source = FormatFactory::instance().getInput(ExternalDictionaryLibraryBridgeHelper::DEFAULT_FORMAT, *read_buf_ptr, sample_block, getContext(), DEFAULT_BLOCK_SIZE);
     source->addBuffer(std::move(read_buf_ptr));
diff --git a/src/BridgeHelper/IBridgeHelper.h b/src/BridgeHelper/IBridgeHelper.h
index 272d97c8a78..6812bd04a03 100644
--- a/src/BridgeHelper/IBridgeHelper.h
+++ b/src/BridgeHelper/IBridgeHelper.h
@@ -51,7 +51,7 @@ protected:
 
     virtual const Poco::Util::AbstractConfiguration & getConfig() const = 0;
 
-    virtual Poco::Logger * getLog() const = 0;
+    virtual LoggerPtr getLog() const = 0;
 
     virtual Poco::Timespan getHTTPTimeout() const = 0;
 
diff --git a/src/BridgeHelper/LibraryBridgeHelper.cpp b/src/BridgeHelper/LibraryBridgeHelper.cpp
index e83707595b9..84bfe096e79 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.cpp
+++ b/src/BridgeHelper/LibraryBridgeHelper.cpp
@@ -8,7 +8,7 @@ namespace DB
 LibraryBridgeHelper::LibraryBridgeHelper(ContextPtr context_)
     : IBridgeHelper(context_)
     , config(context_->getConfigRef())
-    , log(&Poco::Logger::get("LibraryBridgeHelper"))
+    , log(getLogger("LibraryBridgeHelper"))
     , http_timeout(context_->getGlobalContext()->getSettingsRef().http_receive_timeout.value)
     , bridge_host(config.getString("library_bridge.host", DEFAULT_HOST))
     , bridge_port(config.getUInt("library_bridge.port", DEFAULT_PORT))
diff --git a/src/BridgeHelper/LibraryBridgeHelper.h b/src/BridgeHelper/LibraryBridgeHelper.h
index 1723d1f8fb4..8940f9d1c9e 100644
--- a/src/BridgeHelper/LibraryBridgeHelper.h
+++ b/src/BridgeHelper/LibraryBridgeHelper.h
@@ -31,7 +31,7 @@ protected:
 
     const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
 
-    Poco::Logger * getLog() const override { return log; }
+    LoggerPtr getLog() const override { return log; }
 
     Poco::Timespan getHTTPTimeout() const override { return http_timeout; }
 
@@ -40,7 +40,7 @@ protected:
     static constexpr inline size_t DEFAULT_PORT = 9012;
 
     const Poco::Util::AbstractConfiguration & config;
-    Poco::Logger * log;
+    LoggerPtr log;
     const Poco::Timespan http_timeout;
     std::string bridge_host;
     size_t bridge_port;
diff --git a/src/BridgeHelper/XDBCBridgeHelper.h b/src/BridgeHelper/XDBCBridgeHelper.h
index 060de74b5b1..838be42357a 100644
--- a/src/BridgeHelper/XDBCBridgeHelper.h
+++ b/src/BridgeHelper/XDBCBridgeHelper.h
@@ -65,7 +65,7 @@ public:
             const std::string & connection_string_,
             bool use_connection_pooling_)
         : IXDBCBridgeHelper(context_->getGlobalContext())
-        , log(&Poco::Logger::get(BridgeHelperMixin::getName() + "BridgeHelper"))
+        , log(getLogger(BridgeHelperMixin::getName() + "BridgeHelper"))
         , connection_string(connection_string_)
         , use_connection_pooling(use_connection_pooling_)
         , http_timeout(http_timeout_)
@@ -97,8 +97,12 @@ protected:
     {
         try
         {
-            ReadWriteBufferFromHTTP buf(getPingURI(), Poco::Net::HTTPRequest::HTTP_GET, {}, getHTTPTimeouts(), credentials);
-            return checkString(PING_OK_ANSWER, buf);
+            auto buf = BuilderRWBufferFromHTTP(getPingURI())
+                           .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                           .withTimeouts(getHTTPTimeouts())
+                           .create(credentials);
+
+            return checkString(PING_OK_ANSWER, *buf);
         }
         catch (...)
         {
@@ -123,7 +127,7 @@ protected:
 
     const Poco::Util::AbstractConfiguration & getConfig() const override { return config; }
 
-    Poco::Logger * getLog() const override { return log; }
+    LoggerPtr getLog() const override { return log; }
 
     bool startBridgeManually() const override { return BridgeHelperMixin::startBridgeManually(); }
 
@@ -146,7 +150,7 @@ protected:
 private:
     using Configuration = Poco::Util::AbstractConfiguration;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string connection_string;
     bool use_connection_pooling;
     Poco::Timespan http_timeout;
@@ -198,10 +202,14 @@ protected:
             uri.addQueryParameter("connection_string", getConnectionString());
             uri.addQueryParameter("use_connection_pooling", toString(use_connection_pooling));
 
-            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, getHTTPTimeouts(), credentials);
+            auto buf = BuilderRWBufferFromHTTP(uri)
+                           .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                           .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                           .withTimeouts(getHTTPTimeouts())
+                           .create(credentials);
 
-            bool res;
-            readBoolText(res, buf);
+            bool res = false;
+            readBoolText(res, *buf);
             is_schema_allowed = res;
         }
 
@@ -220,10 +228,14 @@ protected:
             uri.addQueryParameter("connection_string", getConnectionString());
             uri.addQueryParameter("use_connection_pooling", toString(use_connection_pooling));
 
-            ReadWriteBufferFromHTTP buf(uri, Poco::Net::HTTPRequest::HTTP_POST, {}, getHTTPTimeouts(), credentials);
+            auto buf = BuilderRWBufferFromHTTP(uri)
+                           .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                           .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                           .withTimeouts(getHTTPTimeouts())
+                           .create(credentials);
 
             std::string character;
-            readStringBinary(character, buf);
+            readStringBinary(character, *buf);
             if (character.length() > 1)
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Failed to parse quoting style from '{}' for service {}",
                     character, BridgeHelperMixin::serviceAlias());
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 083b959c4b6..da17bc1f41f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -83,11 +83,12 @@ add_subdirectory (Formats)
 
 add_headers_and_sources(clickhouse_common_io Common)
 add_headers_and_sources(clickhouse_common_io Common/HashTable)
-add_headers_and_sources(clickhouse_common_io Common/SSH)
+add_headers_and_sources(clickhouse_common_io Common/Scheduler)
+add_headers_and_sources(clickhouse_common_io Common/Scheduler/Nodes)
 add_headers_and_sources(clickhouse_common_io IO)
 add_headers_and_sources(clickhouse_common_io IO/Archives)
-add_headers_and_sources(clickhouse_common_io IO/Resource)
 add_headers_and_sources(clickhouse_common_io IO/S3)
+add_headers_and_sources(clickhouse_common_io IO/AzureBlobStorage)
 list (REMOVE_ITEM clickhouse_common_io_sources Common/malloc.cpp Common/new_delete.cpp)
 
 
@@ -97,7 +98,6 @@ add_headers_and_sources(clickhouse_compression Core)
 #Included these specific files to avoid linking grpc
 add_glob(clickhouse_compression_headers Server/ServerType.h)
 add_glob(clickhouse_compression_sources Server/ServerType.cpp)
-add_headers_and_sources(clickhouse_compression Common/SSH)
 add_library(clickhouse_compression ${clickhouse_compression_headers} ${clickhouse_compression_sources})
 
 
@@ -140,6 +140,7 @@ endif()
 
 if (TARGET ch_contrib::azure_sdk)
     add_headers_and_sources(dbms Disks/ObjectStorages/AzureBlobStorage)
+    add_headers_and_sources(dbms IO/AzureBlobStorage)
 endif()
 
 if (TARGET ch_contrib::hdfs)
@@ -171,6 +172,8 @@ endif ()
 
 add_library(clickhouse_common_io ${clickhouse_common_io_headers} ${clickhouse_common_io_sources})
 
+set_source_files_properties(Common/ThreadFuzzer.cpp PROPERTIES COMPILE_FLAGS "-fomit-frame-pointer -momit-leaf-frame-pointer")
+
 add_library (clickhouse_malloc OBJECT Common/malloc.cpp)
 set_source_files_properties(Common/malloc.cpp PROPERTIES COMPILE_FLAGS "-fno-builtin")
 
@@ -293,12 +296,14 @@ if (TARGET ch_contrib::gwp_asan)
 endif()
 
 # Otherwise it will slow down stack traces printing too much.
-set_source_files_properties(
-        Common/Elf.cpp
-        Common/Dwarf.cpp
-        Common/SymbolIndex.cpp
-        Common/ThreadFuzzer.cpp
-        PROPERTIES COMPILE_FLAGS "-O2 ${WITHOUT_COVERAGE_FLAGS}")
+if ("${CMAKE_BUILD_TYPE_UC}" STREQUAL "DEBUG")
+    set_source_files_properties(
+            Common/Elf.cpp
+            Common/Dwarf.cpp
+            Common/SymbolIndex.cpp
+            Common/ThreadFuzzer.cpp
+            PROPERTIES COMPILE_FLAGS "-O2 ${WITHOUT_COVERAGE_FLAGS}")
+endif()
 
 target_link_libraries (clickhouse_common_io
         PRIVATE
@@ -363,8 +368,7 @@ if (TARGET ch_contrib::crc32-vpmsum)
  endif()
 
 if (TARGET ch_contrib::ssh)
- target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::ssh)
- target_link_libraries(clickhouse_compression PUBLIC ch_contrib::ssh)
+    target_link_libraries(clickhouse_common_io PUBLIC ch_contrib::ssh)
 endif()
 
 dbms_target_link_libraries(PUBLIC ch_contrib::abseil_swiss_tables)
@@ -493,6 +497,7 @@ if (TARGET ch_contrib::aws_s3)
 endif()
 
 if (TARGET ch_contrib::azure_sdk)
+    target_link_libraries (clickhouse_common_io PUBLIC ch_contrib::azure_sdk)
     dbms_target_link_libraries (PRIVATE ch_contrib::azure_sdk)
 endif()
 
@@ -500,6 +505,10 @@ if (TARGET ch_contrib::s2)
     dbms_target_link_libraries (PUBLIC ch_contrib::s2)
 endif()
 
+if (TARGET ch_contrib::vectorscan)
+    dbms_target_link_libraries (PRIVATE ch_contrib::vectorscan)
+endif()
+
 if (TARGET ch_contrib::brotli)
     target_link_libraries (clickhouse_common_io PRIVATE ch_contrib::brotli)
 endif()
diff --git a/src/Client/ClientBase.cpp b/src/Client/ClientBase.cpp
index e099aac0de9..db910de07f3 100644
--- a/src/Client/ClientBase.cpp
+++ b/src/Client/ClientBase.cpp
@@ -7,8 +7,8 @@
 
 #include <base/argsToConfig.h>
 #include <base/safeExit.h>
-#include <base/scope_guard.h>
 #include <Core/Block.h>
+#include <Core/BaseSettingsProgramOptions.h>
 #include <Core/Protocol.h>
 #include <Common/DateLUT.h>
 #include <Common/MemoryTracker.h>
@@ -16,7 +16,6 @@
 #include <Common/Exception.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/typeid_cast.h>
-#include <Common/UTF8Helpers.h>
 #include <Common/TerminalSize.h>
 #include <Common/clearPasswordFromCommandLine.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -70,6 +69,7 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/split.hpp>
 #include <iostream>
 #include <filesystem>
 #include <limits>
@@ -345,7 +345,7 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_mu
     if (dialect == Dialect::kusto)
         parser = std::make_unique<ParserKQLStatement>(end, global_context->getSettings().allow_settings_after_format_in_insert);
     else if (dialect == Dialect::prql)
-        parser = std::make_unique<ParserPRQLQuery>(max_length, settings.max_parser_depth);
+        parser = std::make_unique<ParserPRQLQuery>(max_length, settings.max_parser_depth, settings.max_parser_backtracks);
     else
         parser = std::make_unique<ParserQuery>(end, global_context->getSettings().allow_settings_after_format_in_insert);
 
@@ -353,9 +353,9 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_mu
     {
         String message;
         if (dialect == Dialect::kusto)
-            res = tryParseKQLQuery(*parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth);
+            res = tryParseKQLQuery(*parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth, settings.max_parser_backtracks, true);
         else
-            res = tryParseQuery(*parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth);
+            res = tryParseQuery(*parser, pos, end, message, true, "", allow_multi_statements, max_length, settings.max_parser_depth, settings.max_parser_backtracks, true);
 
         if (!res)
         {
@@ -366,9 +366,9 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_mu
     else
     {
         if (dialect == Dialect::kusto)
-            res = parseKQLQueryAndMovePosition(*parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth);
+            res = parseKQLQueryAndMovePosition(*parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth, settings.max_parser_backtracks);
         else
-            res = parseQueryAndMovePosition(*parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth);
+            res = parseQueryAndMovePosition(*parser, pos, end, "", allow_multi_statements, max_length, settings.max_parser_depth, settings.max_parser_backtracks);
     }
 
     if (is_interactive)
@@ -385,12 +385,12 @@ ASTPtr ClientBase::parseQuery(const char *& pos, const char * end, bool allow_mu
 
 
 /// Consumes trailing semicolons and tries to consume the same-line trailing comment.
-void ClientBase::adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth)
+void ClientBase::adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth, uint32_t max_parser_backtracks)
 {
     // We have to skip the trailing semicolon that might be left
     // after VALUES parsing or just after a normal semicolon-terminated query.
     Tokens after_query_tokens(this_query_end, all_queries_end);
-    IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth);
+    IParser::Pos after_query_iterator(after_query_tokens, max_parser_depth, max_parser_backtracks);
     while (after_query_iterator.isValid() && after_query_iterator->type == TokenType::Semicolon)
     {
         this_query_end = after_query_iterator->end;
@@ -564,7 +564,7 @@ try
             out_buf = &std_out;
         }
 
-        String current_format = format;
+        String current_format = default_output_format;
 
         select_into_file = false;
         select_into_file_and_stdout = false;
@@ -632,9 +632,9 @@ try
             }
             else if (query_with_output->out_file)
             {
-                const auto & format_name = FormatFactory::instance().getFormatFromFileName(out_file);
-                if (!format_name.empty())
-                    current_format = format_name;
+                auto format_name = FormatFactory::instance().tryGetFormatFromFileName(out_file);
+                if (format_name)
+                    current_format = *format_name;
             }
         }
 
@@ -712,16 +712,106 @@ void ClientBase::adjustSettings()
         settings.input_format_values_allow_data_after_semicolon.changed = false;
     }
 
-    /// If pager is specified then output_format_pretty_max_rows is ignored, this should be handled by pager.
-    if (!pager.empty() && !global_context->getSettingsRef().output_format_pretty_max_rows.changed)
+    /// Do not limit pretty format output in case of --pager specified.
+    if (!pager.empty())
     {
-        settings.output_format_pretty_max_rows = std::numeric_limits<UInt64>::max();
-        settings.output_format_pretty_max_rows.changed = false;
+        if (!global_context->getSettingsRef().output_format_pretty_max_rows.changed)
+        {
+            settings.output_format_pretty_max_rows = std::numeric_limits<UInt64>::max();
+            settings.output_format_pretty_max_rows.changed = false;
+        }
+
+        if (!global_context->getSettingsRef().output_format_pretty_max_value_width.changed)
+        {
+            settings.output_format_pretty_max_value_width = std::numeric_limits<UInt64>::max();
+            settings.output_format_pretty_max_value_width.changed = false;
+        }
     }
 
     global_context->setSettings(settings);
 }
 
+bool ClientBase::isRegularFile(int fd)
+{
+    struct stat file_stat;
+    return fstat(fd, &file_stat) == 0 && S_ISREG(file_stat.st_mode);
+}
+
+void ClientBase::setDefaultFormatsFromConfiguration()
+{
+    if (config().has("output-format"))
+    {
+        default_output_format = config().getString("output-format");
+        is_default_format = false;
+    }
+    else if (config().has("format"))
+    {
+        default_output_format = config().getString("format");
+        is_default_format = false;
+    }
+    else if (config().has("vertical"))
+    {
+        default_output_format = "Vertical";
+        is_default_format = false;
+    }
+    else if (isRegularFile(STDOUT_FILENO))
+    {
+        std::optional<String> format_from_file_name = FormatFactory::instance().tryGetFormatFromFileDescriptor(STDOUT_FILENO);
+        if (format_from_file_name)
+            default_output_format = *format_from_file_name;
+        else
+            default_output_format = "TSV";
+    }
+    else if (is_interactive)
+    {
+        default_output_format = "PrettyCompact";
+    }
+    else
+    {
+        default_output_format = "TSV";
+    }
+
+    if (config().has("input-format"))
+    {
+        default_input_format = config().getString("input-format");
+    }
+    else if (config().has("format"))
+    {
+        default_input_format = config().getString("format");
+    }
+    else if (config().getString("table-file", "-") != "-")
+    {
+        auto file_name = config().getString("table-file");
+        std::optional<String> format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(file_name);
+        if (format_from_file_name)
+            default_input_format = *format_from_file_name;
+        else
+            default_input_format = "TSV";
+    }
+    else
+    {
+        std::optional<String> format_from_file_name = FormatFactory::instance().tryGetFormatFromFileDescriptor(STDIN_FILENO);
+        if (format_from_file_name)
+            default_input_format = *format_from_file_name;
+        else
+            default_input_format = "TSV";
+    }
+
+    format_max_block_size = config().getUInt64("format_max_block_size",
+        global_context->getSettingsRef().max_block_size);
+
+    /// Setting value from cmd arg overrides one from config
+    if (global_context->getSettingsRef().max_insert_block_size.changed)
+    {
+        insert_format_max_block_size = global_context->getSettingsRef().max_insert_block_size;
+    }
+    else
+    {
+        insert_format_max_block_size = config().getUInt64("insert_format_max_block_size",
+            global_context->getSettingsRef().max_insert_block_size);
+    }
+}
+
 void ClientBase::initTTYBuffer(ProgressOption progress)
 {
     if (tty_buf)
@@ -1508,7 +1598,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
 
         String current_format = parsed_insert_query->format;
         if (current_format.empty())
-            current_format = FormatFactory::instance().getFormatFromFileName(in_file, true);
+            current_format = FormatFactory::instance().getFormatFromFileName(in_file);
 
         /// Create temporary storage file, to support globs and parallel reading
         /// StorageFile doesn't support ephemeral/materialized/alias columns.
@@ -1605,7 +1695,7 @@ void ClientBase::sendData(Block & sample, const ColumnsDescription & columns_des
 
 void ClientBase::sendDataFrom(ReadBuffer & buf, Block & sample, const ColumnsDescription & columns_description, ASTPtr parsed_query, bool have_more_data)
 {
-    String current_format = insert_format;
+    String current_format = "Values";
 
     /// Data format can be specified in the INSERT query.
     if (const auto * insert = parsed_query->as<ASTInsertQuery>())
@@ -1883,7 +1973,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
         }
 
         /// INSERT query for which data transfer is needed (not an INSERT SELECT or input()) is processed separately.
-        if (insert && (!insert->select || input_function) && !insert->watch && !is_async_insert_with_inlined_data)
+        if (insert && (!insert->select || input_function) && !is_async_insert_with_inlined_data)
         {
             if (input_function && insert->format.empty())
                 throw Exception(ErrorCodes::INVALID_USAGE_OF_INPUT, "FORMAT must be specified for function input()");
@@ -1915,7 +2005,7 @@ void ClientBase::processParsedSingleQuery(const String & full_query, const Strin
             for (const auto & [name, value] : set_query->query_parameters)
                 query_parameters.insert_or_assign(name, value);
 
-            global_context->addQueryParameters(set_query->query_parameters);
+            global_context->addQueryParameters(NameToNameMap{set_query->query_parameters.begin(), set_query->query_parameters.end()});
         }
         if (const auto * use_query = parsed_query->as<ASTUseQuery>())
         {
@@ -1984,6 +2074,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
         return MultiQueryProcessingStage::QUERIES_END;
 
     unsigned max_parser_depth = static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth);
+    unsigned max_parser_backtracks = static_cast<unsigned>(global_context->getSettingsRef().max_parser_backtracks);
 
     // If there are only comments left until the end of file, we just
     // stop. The parser can't handle this situation because it always
@@ -1994,7 +2085,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     // and it makes more sense to treat them as such.
     {
         Tokens tokens(this_query_begin, all_queries_end);
-        IParser::Pos token_iterator(tokens, max_parser_depth);
+        IParser::Pos token_iterator(tokens, max_parser_depth, max_parser_backtracks);
         if (!token_iterator.isValid())
             return MultiQueryProcessingStage::QUERIES_END;
     }
@@ -2015,7 +2106,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
         if (ignore_error)
         {
             Tokens tokens(this_query_begin, all_queries_end);
-            IParser::Pos token_iterator(tokens, max_parser_depth);
+            IParser::Pos token_iterator(tokens, max_parser_depth, max_parser_backtracks);
             while (token_iterator->type != TokenType::Semicolon && token_iterator.isValid())
                 ++token_iterator;
             this_query_begin = token_iterator->end;
@@ -2055,7 +2146,7 @@ MultiQueryProcessingStage ClientBase::analyzeMultiQueryText(
     // after we have processed the query. But even this guess is
     // beneficial so that we see proper trailing comments in "echo" and
     // server log.
-    adjustQueryEnd(this_query_end, all_queries_end, max_parser_depth);
+    adjustQueryEnd(this_query_end, all_queries_end, max_parser_depth, max_parser_backtracks);
     return MultiQueryProcessingStage::EXECUTE_QUERY;
 }
 
@@ -2251,7 +2342,8 @@ bool ClientBase::executeMultiQuery(const String & all_queries_text)
                     this_query_end = insert_ast->end;
                     adjustQueryEnd(
                         this_query_end, all_queries_end,
-                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth));
+                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_depth),
+                        static_cast<unsigned>(global_context->getSettingsRef().max_parser_backtracks));
                 }
 
                 // Report error.
@@ -2629,6 +2721,46 @@ void ClientBase::runNonInteractive()
 }
 
 
+#if defined(FUZZING_MODE)
+extern "C" int LLVMFuzzerRunDriver(int * argc, char *** argv, int (*callback)(const uint8_t * data, size_t size));
+ClientBase * app;
+
+void ClientBase::runLibFuzzer()
+{
+    app = this;
+    std::vector<String> fuzzer_args_holder;
+
+    if (const char * fuzzer_args_env = getenv("FUZZER_ARGS")) // NOLINT(concurrency-mt-unsafe)
+        boost::split(fuzzer_args_holder, fuzzer_args_env, isWhitespaceASCII, boost::token_compress_on);
+
+    std::vector<char *> fuzzer_args;
+    fuzzer_args.push_back(argv0);
+    for (auto & arg : fuzzer_args_holder)
+        fuzzer_args.emplace_back(arg.data());
+
+    int fuzzer_argc = fuzzer_args.size();
+    char ** fuzzer_argv = fuzzer_args.data();
+
+    LLVMFuzzerRunDriver(&fuzzer_argc, &fuzzer_argv, [](const uint8_t * data, size_t size)
+    {
+        try
+        {
+            String query(reinterpret_cast<const char *>(data), size);
+            app->processQueryText(query);
+        }
+        catch (...)
+        {
+            return -1;
+        }
+
+        return 0;
+    });
+}
+#else
+void ClientBase::runLibFuzzer() {}
+#endif
+
+
 void ClientBase::clearTerminal()
 {
     /// Clear from cursor until end of screen.
@@ -2712,9 +2844,9 @@ private:
 void ClientBase::parseAndCheckOptions(OptionsDescription & options_description, po::variables_map & options, Arguments & arguments)
 {
     if (allow_repeated_settings)
-        cmd_settings.addProgramOptionsAsMultitokens(options_description.main_description.value());
+        addProgramOptionsAsMultitokens(cmd_settings, options_description.main_description.value());
     else
-        cmd_settings.addProgramOptions(options_description.main_description.value());
+        addProgramOptions(cmd_settings, options_description.main_description.value());
 
     if (allow_merge_tree_settings)
     {
@@ -2735,9 +2867,9 @@ void ClientBase::parseAndCheckOptions(OptionsDescription & options_description,
                     return;
 
                 if (allow_repeated_settings)
-                    cmd_merge_tree_settings.addProgramOptionAsMultitoken(main_options, name, setting);
+                    addProgramOptionAsMultitoken(cmd_merge_tree_settings, main_options, name, setting);
                 else
-                    cmd_merge_tree_settings.addProgramOption(main_options, name, setting);
+                    addProgramOption(cmd_merge_tree_settings, main_options, name, setting);
             };
 
             const auto & setting_name = setting.getName();
@@ -2798,6 +2930,8 @@ void ClientBase::init(int argc, char ** argv)
     Arguments common_arguments = {""}; /// 0th argument is ignored.
     std::vector<Arguments> hosts_and_ports_arguments;
 
+    if (argc)
+        argv0 = argv[0];
     readArguments(argc, argv, common_arguments, external_tables_arguments, hosts_and_ports_arguments);
 
     /// Support for Unicode dashes
@@ -2848,7 +2982,9 @@ void ClientBase::init(int argc, char ** argv)
 
         ("suggestion_limit", po::value<int>()->default_value(10000), "Suggestion limit for how many databases, tables and columns to fetch.")
 
-        ("format,f", po::value<std::string>(), "default output format")
+        ("format,f", po::value<std::string>(), "default output format (and input format for clickhouse-local)")
+        ("output-format", po::value<std::string>(), "default output format (this option has preference over --format)")
+
         ("vertical,E", "vertical output format, same as --format=Vertical or FORMAT Vertical or \\G at end of command")
         ("highlight", po::value<bool>()->default_value(true), "enable or disable basic syntax highlight in interactive command line")
 
@@ -2862,6 +2998,8 @@ void ClientBase::init(int argc, char ** argv)
         ("interactive", "Process queries-file or --query query and start interactive mode")
         ("pager", po::value<std::string>(), "Pipe all output into this command (less or similar)")
         ("max_memory_usage_in_client", po::value<std::string>(), "Set memory limit in client/local server")
+
+        ("fuzzer-args", po::value<std::string>(), "Command line arguments for the LLVM's libFuzzer driver. Only relevant if the application is compiled with libFuzzer.")
     ;
 
     addOptions(options_description);
@@ -2929,6 +3067,8 @@ void ClientBase::init(int argc, char ** argv)
         config().setBool("ignore-error", true);
     if (options.count("format"))
         config().setString("format", options["format"].as<std::string>());
+    if (options.count("output-format"))
+        config().setString("output-format", options["output-format"].as<std::string>());
     if (options.count("vertical"))
         config().setBool("vertical", true);
     if (options.count("stacktrace"))
diff --git a/src/Client/ClientBase.h b/src/Client/ClientBase.h
index dd08e7c059b..9ec87ababfc 100644
--- a/src/Client/ClientBase.h
+++ b/src/Client/ClientBase.h
@@ -78,6 +78,9 @@ protected:
     void runInteractive();
     void runNonInteractive();
 
+    char * argv0 = nullptr;
+    void runLibFuzzer();
+
     virtual bool processWithFuzzing(const String &)
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Query processing with fuzzing is not implemented");
@@ -94,7 +97,7 @@ protected:
     void processParsedSingleQuery(const String & full_query, const String & query_to_execute,
         ASTPtr parsed_query, std::optional<bool> echo_query_ = {}, bool report_error = false);
 
-    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth);
+    static void adjustQueryEnd(const char *& this_query_end, const char * all_queries_end, uint32_t max_parser_depth, uint32_t max_parser_backtracks);
     ASTPtr parseQuery(const char *& pos, const char * end, bool allow_multi_statements) const;
     static void setupSignalHandler();
 
@@ -182,9 +185,13 @@ protected:
     static bool isSyncInsertWithData(const ASTInsertQuery & insert_query, const ContextPtr & context);
     bool processMultiQueryFromFile(const String & file_name);
 
+    static bool isRegularFile(int fd);
+
     /// Adjust some settings after command line options and config had been processed.
     void adjustSettings();
 
+    void setDefaultFormatsFromConfiguration();
+
     void initTTYBuffer(ProgressOption progress);
 
     /// Should be one of the first, to be destroyed the last,
@@ -215,12 +222,13 @@ protected:
 
     String pager;
 
-    String format; /// Query results output format.
+    String default_output_format; /// Query results output format.
+    String default_input_format; /// Tables' format for clickhouse-local.
+
     bool select_into_file = false; /// If writing result INTO OUTFILE. It affects progress rendering.
     bool select_into_file_and_stdout = false; /// If writing result INTO OUTFILE AND STDOUT. It affects progress rendering.
     bool is_default_format = true; /// false, if format is set in the config or command line.
     size_t format_max_block_size = 0; /// Max block size for console output.
-    String insert_format; /// Format of INSERT data that is read from stdin in batch mode.
     size_t insert_format_max_block_size = 0; /// Max block size when reading INSERT data.
     size_t max_client_network_bandwidth = 0; /// The maximum speed of data exchange over the network for the client in bytes per second.
 
diff --git a/src/Client/Connection.cpp b/src/Client/Connection.cpp
index 352d2a53892..4cc6c0b61af 100644
--- a/src/Client/Connection.cpp
+++ b/src/Client/Connection.cpp
@@ -67,7 +67,7 @@ Connection::~Connection() = default;
 Connection::Connection(const String & host_, UInt16 port_,
     const String & default_database_,
     const String & user_, const String & password_,
-    const ssh::SSHKey & ssh_private_key_,
+    [[maybe_unused]] const SSHKey & ssh_private_key_,
     const String & quota_key_,
     const String & cluster_,
     const String & cluster_secret_,
@@ -76,7 +76,9 @@ Connection::Connection(const String & host_, UInt16 port_,
     Protocol::Secure secure_)
     : host(host_), port(port_), default_database(default_database_)
     , user(user_), password(password_)
+#if USE_SSH
     , ssh_private_key(ssh_private_key_)
+#endif
     , quota_key(quota_key_)
     , cluster(cluster_)
     , cluster_secret(cluster_secret_)
@@ -141,7 +143,7 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
                         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->impl()->error(err); // Throws an exception /// NOLINT(readability-static-accessed-through-instance)
 
                     socket->setBlocking(true);
                 }
@@ -153,6 +155,12 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
                 current_resolved_address = *it;
                 break;
             }
+            catch (DB::NetException &)
+            {
+                if (++it == addresses.end())
+                    throw;
+                continue;
+            }
             catch (Poco::Net::NetException &)
             {
                 if (++it == addresses.end())
@@ -199,6 +207,17 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         LOG_TRACE(log_wrapper.get(), "Connected to {} server version {}.{}.{}.",
             server_name, server_version_major, server_version_minor, server_version_patch);
     }
+    catch (DB::NetException & e)
+    {
+        disconnect();
+
+        /// Remove this possible stale entry from cache
+        DNSResolver::instance().removeHostFromCache(host);
+
+        /// Add server address to exception. Exception will preserve stack trace.
+        e.addMessage("({})", getDescription());
+        throw;
+    }
     catch (Poco::Net::NetException & e)
     {
         disconnect();
@@ -206,7 +225,7 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         /// Remove this possible stale entry from cache
         DNSResolver::instance().removeHostFromCache(host);
 
-        /// Add server address to exception. Also Exception will remember stack trace. It's a pity that more precise exception type is lost.
+        /// Add server address to exception. Also Exception will remember new stack trace. It's a pity that more precise exception type is lost.
         throw NetException(ErrorCodes::NETWORK_ERROR, "{} ({})", e.displayText(), getDescription());
     }
     catch (Poco::TimeoutException & e)
@@ -216,7 +235,7 @@ void Connection::connect(const ConnectionTimeouts & timeouts)
         /// Remove this possible stale entry from cache
         DNSResolver::instance().removeHostFromCache(host);
 
-        /// Add server address to exception. Also Exception will remember stack trace. It's a pity that more precise exception type is lost.
+        /// Add server address to exception. Also Exception will remember new stack trace. It's a pity that more precise exception type is lost.
         /// This exception can only be thrown from socket->connect(), so add information about connection timeout.
         const auto & connection_timeout = static_cast<bool>(secure) ? timeouts.secure_connection_timeout : timeouts.connection_timeout;
         throw NetException(
@@ -259,17 +278,6 @@ void Connection::disconnect()
 }
 
 
-String Connection::packStringForSshSign(String challenge)
-{
-    String message;
-    message.append(std::to_string(DBMS_TCP_PROTOCOL_VERSION));
-    message.append(default_database);
-    message.append(user);
-    message.append(challenge);
-    return message;
-}
-
-
 void Connection::sendHello()
 {
     /** Disallow control characters in user controlled parameters
@@ -316,11 +324,11 @@ void Connection::sendHello()
                         "Inter-server secret support is disabled, because ClickHouse was built without SSL library");
 #endif
     }
-#if USE_SSL
-    /// Just inform server that we will authenticate using SSH keys.
+#if USE_SSH
     else if (!ssh_private_key.isEmpty())
     {
-        writeStringBinary(fmt::format("{}{}", EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER, user), *out);
+        /// Inform server that we will authenticate using SSH keys.
+        writeStringBinary(String(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER) + user, *out);
         writeStringBinary(password, *out);
 
         performHandshakeForSSHAuth();
@@ -344,9 +352,9 @@ void Connection::sendAddendum()
 }
 
 
+#if USE_SSH
 void Connection::performHandshakeForSSHAuth()
 {
-#if USE_SSL
     String challenge;
     {
         writeVarUInt(Protocol::Client::SSHChallengeRequest, *out);
@@ -371,12 +379,23 @@ void Connection::performHandshakeForSSHAuth()
     }
 
     writeVarUInt(Protocol::Client::SSHChallengeResponse, *out);
-    String to_sign = packStringForSshSign(challenge);
+
+    auto pack_string_for_ssh_sign = [&](String challenge_)
+    {
+        String message;
+        message.append(std::to_string(DBMS_TCP_PROTOCOL_VERSION));
+        message.append(default_database);
+        message.append(user);
+        message.append(challenge_);
+        return message;
+    };
+
+    String to_sign = pack_string_for_ssh_sign(challenge);
     String signature = ssh_private_key.signString(to_sign);
     writeStringBinary(signature, *out);
     out->next();
-#endif
 }
+#endif
 
 
 void Connection::receiveHello(const Poco::Timespan & handshake_timeout)
diff --git a/src/Client/Connection.h b/src/Client/Connection.h
index 2f209fc92d0..2cd325afed2 100644
--- a/src/Client/Connection.h
+++ b/src/Client/Connection.h
@@ -1,9 +1,9 @@
 #pragma once
 
-
 #include <Poco/Net/StreamSocket.h>
 
-#include <Common/SSH/Wrappers.h>
+#include <Common/callOnce.h>
+#include <Common/SSHWrapper.h>
 #include <Client/IServerConnection.h>
 #include <Core/Defines.h>
 
@@ -18,7 +18,6 @@
 
 #include <Storages/MergeTree/RequestResponse.h>
 
-#include <atomic>
 #include <optional>
 
 #include "config.h"
@@ -53,7 +52,7 @@ public:
     Connection(const String & host_, UInt16 port_,
         const String & default_database_,
         const String & user_, const String & password_,
-        const ssh::SSHKey & ssh_private_key_,
+        const SSHKey & ssh_private_key_,
         const String & quota_key_,
         const String & cluster_,
         const String & cluster_secret_,
@@ -170,7 +169,9 @@ private:
     String default_database;
     String user;
     String password;
-    ssh::SSHKey ssh_private_key;
+#if USE_SSH
+    SSHKey ssh_private_key;
+#endif
     String quota_key;
 
     /// For inter-server authorization
@@ -244,16 +245,18 @@ private:
         {
         }
 
-        Poco::Logger * get()
+        LoggerPtr get()
         {
-            if (!log)
-                log = &Poco::Logger::get("Connection (" + parent.getDescription() + ")");
+            callOnce(log_initialized, [&] {
+                log = getLogger("Connection (" + parent.getDescription() + ")");
+            });
 
             return log;
         }
 
     private:
-        std::atomic<Poco::Logger *> log;
+        OnceFlag log_initialized;
+        LoggerPtr log;
         Connection & parent;
     };
 
@@ -263,9 +266,10 @@ private:
 
     void connect(const ConnectionTimeouts & timeouts);
     void sendHello();
-    String packStringForSshSign(String challenge);
 
+#if USE_SSH
     void performHandshakeForSSHAuth();
+#endif
 
     void sendAddendum();
     void receiveHello(const Poco::Timespan & handshake_timeout);
diff --git a/src/Client/ConnectionEstablisher.cpp b/src/Client/ConnectionEstablisher.cpp
index e5b1347add5..303105751ad 100644
--- a/src/Client/ConnectionEstablisher.cpp
+++ b/src/Client/ConnectionEstablisher.cpp
@@ -22,19 +22,17 @@ namespace ErrorCodes
 }
 
 ConnectionEstablisher::ConnectionEstablisher(
-    IConnectionPool * pool_,
+    ConnectionPoolPtr pool_,
     const ConnectionTimeouts * timeouts_,
     const Settings & settings_,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     const QualifiedTableName * table_to_check_)
-    : pool(pool_), timeouts(timeouts_), settings(settings_), log(log_), table_to_check(table_to_check_), is_finished(false)
+    : pool(std::move(pool_)), timeouts(timeouts_), settings(settings_), log(log_), table_to_check(table_to_check_)
 {
 }
 
 void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::string & fail_message)
 {
-    is_finished = false;
-    SCOPE_EXIT(is_finished = true);
     try
     {
         ProfileEvents::increment(ProfileEvents::DistributedConnectionTries);
@@ -72,6 +70,12 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
         ProfileEvents::increment(ProfileEvents::DistributedConnectionUsable);
         result.is_usable = true;
 
+        if (table_status_it->second.is_readonly)
+        {
+            result.is_readonly = true;
+            LOG_TRACE(log, "Table {}.{} is readonly on server {}", table_to_check->database, table_to_check->table, result.entry->getDescription());
+        }
+
         const UInt64 max_allowed_delay = settings.max_replica_delay_for_distributed_queries;
         if (!max_allowed_delay)
         {
@@ -79,14 +83,13 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
             return;
         }
 
-        UInt32 delay = table_status_it->second.absolute_delay;
-
+        const UInt32 delay = table_status_it->second.absolute_delay;
         if (delay < max_allowed_delay)
             result.is_up_to_date = true;
         else
         {
             result.is_up_to_date = false;
-            result.staleness = delay;
+            result.delay = delay;
 
             LOG_TRACE(log, "Server {} has unacceptable replica delay for table {}.{}: {}", result.entry->getDescription(), table_to_check->database, table_to_check->table, delay);
             ProfileEvents::increment(ProfileEvents::DistributedConnectionStaleReplica);
@@ -111,12 +114,13 @@ void ConnectionEstablisher::run(ConnectionEstablisher::TryResult & result, std::
 #if defined(OS_LINUX)
 
 ConnectionEstablisherAsync::ConnectionEstablisherAsync(
-    IConnectionPool * pool_,
+    ConnectionPoolPtr pool_,
     const ConnectionTimeouts * timeouts_,
     const Settings & settings_,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     const QualifiedTableName * table_to_check_)
-    : AsyncTaskExecutor(std::make_unique<Task>(*this)), connection_establisher(pool_, timeouts_, settings_, log_, table_to_check_)
+    : AsyncTaskExecutor(std::make_unique<Task>(*this))
+    , connection_establisher(std::move(pool_), timeouts_, settings_, log_, table_to_check_)
 {
     epoll.add(timeout_descriptor.getDescriptor());
 }
diff --git a/src/Client/ConnectionEstablisher.h b/src/Client/ConnectionEstablisher.h
index 880e44c8a1a..a3a01e63246 100644
--- a/src/Client/ConnectionEstablisher.h
+++ b/src/Client/ConnectionEstablisher.h
@@ -1,11 +1,8 @@
 #pragma once
 
-#include <variant>
-
 #include <Common/AsyncTaskExecutor.h>
 #include <Common/Epoll.h>
 #include <Common/Fiber.h>
-#include <Common/FiberStack.h>
 #include <Common/TimerDescriptor.h>
 #include <Common/PoolWithFailoverBase.h>
 #include <Client/ConnectionPool.h>
@@ -20,10 +17,10 @@ class ConnectionEstablisher
 public:
     using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
 
-    ConnectionEstablisher(IConnectionPool * pool_,
+    ConnectionEstablisher(ConnectionPoolPtr pool_,
                           const ConnectionTimeouts * timeouts_,
                           const Settings & settings_,
-                          Poco::Logger * log,
+                          LoggerPtr log,
                           const QualifiedTableName * table_to_check = nullptr);
 
     /// Establish connection and save it in result, write possible exception message in fail_message.
@@ -32,16 +29,13 @@ public:
     /// Set async callback that will be called when reading from socket blocks.
     void setAsyncCallback(AsyncCallback async_callback_) { async_callback = std::move(async_callback_); }
 
-    bool isFinished() const { return is_finished; }
-
 private:
-    IConnectionPool * pool;
+    ConnectionPoolPtr pool;
     const ConnectionTimeouts * timeouts;
     const Settings & settings;
-    Poco::Logger * log;
+    LoggerPtr log;
     const QualifiedTableName * table_to_check;
 
-    bool is_finished;
     AsyncCallback async_callback = {};
 };
 
@@ -58,10 +52,10 @@ class ConnectionEstablisherAsync : public AsyncTaskExecutor
 public:
     using TryResult = PoolWithFailoverBase<IConnectionPool>::TryResult;
 
-    ConnectionEstablisherAsync(IConnectionPool * pool_,
+    ConnectionEstablisherAsync(ConnectionPoolPtr pool_,
                                const ConnectionTimeouts * timeouts_,
                                const Settings & settings_,
-                               Poco::Logger * log_,
+                               LoggerPtr log_,
                                const QualifiedTableName * table_to_check_ = nullptr);
 
     /// Get file descriptor that can be added in epoll and be polled,
diff --git a/src/Client/ConnectionParameters.cpp b/src/Client/ConnectionParameters.cpp
index 1da3065f38f..774f3375f63 100644
--- a/src/Client/ConnectionParameters.cpp
+++ b/src/Client/ConnectionParameters.cpp
@@ -1,11 +1,10 @@
 #include "ConnectionParameters.h"
-#include <fstream>
+
 #include <Core/Defines.h>
 #include <Core/Protocol.h>
 #include <Core/Types.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Poco/Util/AbstractConfiguration.h>
-#include <Common/SSH/Wrappers.h>
 #include <Common/Exception.h>
 #include <Common/isLocalAddress.h>
 #include <Common/DNSResolver.h>
@@ -23,15 +22,30 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
 }
 
+namespace
+{
+
+bool enableSecureConnection(const Poco::Util::AbstractConfiguration & config, const std::string & connection_host)
+{
+    if (config.getBool("secure", false))
+        return true;
+
+    if (config.getBool("no-secure", false))
+        return false;
+
+    bool is_clickhouse_cloud = connection_host.ends_with(".clickhouse.cloud") || connection_host.ends_with(".clickhouse-staging.com");
+    return is_clickhouse_cloud;
+}
+
+}
+
 ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfiguration & config,
                                            std::string connection_host,
                                            std::optional<UInt16> connection_port)
     : host(connection_host)
     , port(connection_port.value_or(getPortFromConfig(config, connection_host)))
 {
-    bool is_secure = config.getBool("secure", false);
-    bool is_clickhouse_cloud = connection_host.ends_with(".clickhouse.cloud") || connection_host.ends_with(".clickhouse-staging.com");
-    security = (is_secure || is_clickhouse_cloud) ? Protocol::Secure::Enable : Protocol::Secure::Disable;
+    security = enableSecureConnection(config, connection_host) ? Protocol::Secure::Enable : Protocol::Secure::Disable;
 
     default_database = config.getString("database", "");
 
@@ -64,7 +78,7 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
     }
     else
     {
-#if USE_SSL
+#if USE_SSH
         std::string filename = config.getString("ssh-key-file");
         std::string passphrase;
         if (config.has("ssh-key-passphrase"))
@@ -73,19 +87,19 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
         }
         else
         {
-            std::string prompt{"Enter your private key passphrase (leave empty for no passphrase): "};
+            std::string prompt{"Enter your SSH private key passphrase (leave empty for no passphrase): "};
             char buf[1000] = {};
             if (auto * result = readpassphrase(prompt.c_str(), buf, sizeof(buf), 0))
                 passphrase = result;
         }
 
-        ssh::SSHKey key = ssh::SSHKeyFactory::makePrivateFromFile(filename, passphrase);
+        SSHKey key = SSHKeyFactory::makePrivateKeyFromFile(filename, passphrase);
         if (!key.isPrivate())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Found public key in file: {} but expected private", filename);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "File {} did not contain a private key (is it a public key?)", filename);
 
         ssh_private_key = std::move(key);
 #else
-        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without OpenSSL");
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "SSH is disabled, because ClickHouse is built without libssh");
 #endif
     }
 
@@ -100,17 +114,22 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
     /// At the same time, I want clickhouse-local to always work, regardless.
     /// TODO: get rid of glibc, or replace getaddrinfo to c-ares.
 
-    compression = config.getBool("compression", host != "localhost" && !isLocalAddress(DNSResolver::instance().resolveHost(host)))
+    compression = config.getBool("compression", host != "localhost" && !isLocalAddress(DNSResolver::instance().resolveHostAllInOriginOrder(host).front()))
                   ? Protocol::Compression::Enable : Protocol::Compression::Disable;
 
-    timeouts = ConnectionTimeouts(
-            Poco::Timespan(config.getInt("connect_timeout", DBMS_DEFAULT_CONNECT_TIMEOUT_SEC), 0),
-            Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0),
-            Poco::Timespan(config.getInt("receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0),
-            Poco::Timespan(config.getInt("tcp_keep_alive_timeout", 0), 0),
-            Poco::Timespan(config.getInt("handshake_timeout_ms", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC * 1000), 0));
-
-    timeouts.sync_request_timeout = Poco::Timespan(config.getInt("sync_request_timeout", DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC), 0);
+    timeouts = ConnectionTimeouts()
+            .withConnectionTimeout(
+                Poco::Timespan(config.getInt("connect_timeout", DBMS_DEFAULT_CONNECT_TIMEOUT_SEC), 0))
+            .withSendTimeout(
+                Poco::Timespan(config.getInt("send_timeout", DBMS_DEFAULT_SEND_TIMEOUT_SEC), 0))
+            .withReceiveTimeout(
+                Poco::Timespan(config.getInt("receive_timeout", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC), 0))
+            .withTCPKeepAliveTimeout(
+                Poco::Timespan(config.getInt("tcp_keep_alive_timeout", DEFAULT_TCP_KEEP_ALIVE_TIMEOUT), 0))
+            .withHandshakeTimeout(
+                Poco::Timespan(config.getInt("handshake_timeout_ms", DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC * 1000) * 1000))
+            .withSyncRequestTimeout(
+                Poco::Timespan(config.getInt("sync_request_timeout", DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC), 0));
 }
 
 ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfiguration & config,
@@ -122,10 +141,9 @@ ConnectionParameters::ConnectionParameters(const Poco::Util::AbstractConfigurati
 UInt16 ConnectionParameters::getPortFromConfig(const Poco::Util::AbstractConfiguration & config,
                                                std::string connection_host)
 {
-    bool is_secure = config.getBool("secure", false);
-    bool is_clickhouse_cloud = connection_host.ends_with(".clickhouse.cloud") || connection_host.ends_with(".clickhouse-staging.com");
+    bool is_secure = enableSecureConnection(config, connection_host);
     return config.getInt("port",
-        config.getInt(is_secure || is_clickhouse_cloud ? "tcp_port_secure" : "tcp_port",
-            is_secure || is_clickhouse_cloud ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT));
+        config.getInt(is_secure ? "tcp_port_secure" : "tcp_port",
+            is_secure ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT));
 }
 }
diff --git a/src/Client/ConnectionParameters.h b/src/Client/ConnectionParameters.h
index 5f375f09c83..f23522d48b3 100644
--- a/src/Client/ConnectionParameters.h
+++ b/src/Client/ConnectionParameters.h
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <string>
+#include <Common/SSHWrapper.h>
 #include <Core/Protocol.h>
 #include <IO/ConnectionTimeouts.h>
-#include <Common/SSH/Wrappers.h>
+
+#include <string>
 
 namespace Poco::Util
 {
@@ -20,7 +21,7 @@ struct ConnectionParameters
     std::string user;
     std::string password;
     std::string quota_key;
-    ssh::SSHKey ssh_private_key;
+    SSHKey ssh_private_key;
     Protocol::Secure security = Protocol::Secure::Disable;
     Protocol::Compression compression = Protocol::Compression::Enable;
     ConnectionTimeouts timeouts;
diff --git a/src/Client/ConnectionPool.h b/src/Client/ConnectionPool.h
index d663c052abc..d35c2552461 100644
--- a/src/Client/ConnectionPool.h
+++ b/src/Client/ConnectionPool.h
@@ -27,6 +27,12 @@ class IConnectionPool : private boost::noncopyable
 public:
     using Entry = PoolBase<Connection>::Entry;
 
+    IConnectionPool() = default;
+    IConnectionPool(String host_, UInt16 port_, Priority config_priority_)
+        : host(host_), port(port_), address(host + ":" + toString(port_)), config_priority(config_priority_)
+    {
+    }
+
     virtual ~IConnectionPool() = default;
 
     /// Selects the connection to work.
@@ -36,7 +42,16 @@ public:
                       const Settings & settings,
                       bool force_connected = true) = 0;
 
-    virtual Priority getPriority() const { return Priority{1}; }
+    const std::string & getHost() const { return host; }
+    UInt16 getPort() const { return port; }
+    const String & getAddress() const { return address; }
+    Priority getConfigPriority() const { return config_priority; }
+
+protected:
+    const String host;
+    const UInt16 port = 0;
+    const String address;
+    const Priority config_priority;
 };
 
 using ConnectionPoolPtr = std::shared_ptr<IConnectionPool>;
@@ -50,33 +65,31 @@ public:
     using Entry = IConnectionPool::Entry;
     using Base = PoolBase<Connection>;
 
-    ConnectionPool(unsigned max_connections_,
-            const String & host_,
-            UInt16 port_,
-            const String & default_database_,
-            const String & user_,
-            const String & password_,
-            const String & quota_key_,
-            const String & cluster_,
-            const String & cluster_secret_,
-            const String & client_name_,
-            Protocol::Compression compression_,
-            Protocol::Secure secure_,
-            Priority priority_ = Priority{1})
-       : Base(max_connections_,
-        &Poco::Logger::get("ConnectionPool (" + host_ + ":" + toString(port_) + ")")),
-        host(host_),
-        port(port_),
-        default_database(default_database_),
-        user(user_),
-        password(password_),
-        quota_key(quota_key_),
-        cluster(cluster_),
-        cluster_secret(cluster_secret_),
-        client_name(client_name_),
-        compression(compression_),
-        secure(secure_),
-        priority(priority_)
+    ConnectionPool(
+        unsigned max_connections_,
+        const String & host_,
+        UInt16 port_,
+        const String & default_database_,
+        const String & user_,
+        const String & password_,
+        const String & quota_key_,
+        const String & cluster_,
+        const String & cluster_secret_,
+        const String & client_name_,
+        Protocol::Compression compression_,
+        Protocol::Secure secure_,
+        Priority config_priority_ = Priority{1})
+        : IConnectionPool(host_, port_, config_priority_)
+        , Base(max_connections_, getLogger("ConnectionPool (" + host_ + ":" + toString(port_) + ")"))
+        , default_database(default_database_)
+        , user(user_)
+        , password(password_)
+        , quota_key(quota_key_)
+        , cluster(cluster_)
+        , cluster_secret(cluster_secret_)
+        , client_name(client_name_)
+        , compression(compression_)
+        , secure(secure_)
     {
     }
 
@@ -99,34 +112,23 @@ public:
         return entry;
     }
 
-    const std::string & getHost() const
-    {
-        return host;
-    }
     std::string getDescription() const
     {
         return host + ":" + toString(port);
     }
 
-    Priority getPriority() const override
-    {
-        return priority;
-    }
-
 protected:
     /** Creates a new object to put in the pool. */
     ConnectionPtr allocObject() override
     {
         return std::make_shared<Connection>(
             host, port,
-            default_database, user, password, ssh::SSHKey(), quota_key,
+            default_database, user, password, SSHKey(), quota_key,
             cluster, cluster_secret,
             client_name, compression, secure);
     }
 
 private:
-    String host;
-    UInt16 port;
     String default_database;
     String user;
     String password;
@@ -139,7 +141,6 @@ private:
     String client_name;
     Protocol::Compression compression; /// Whether to compress data when interacting with the server.
     Protocol::Secure secure;           /// Whether to encrypt data when interacting with the server.
-    Priority priority;                 /// priority from <remote_servers>
 };
 
 /**
diff --git a/src/Client/ConnectionPoolWithFailover.cpp b/src/Client/ConnectionPoolWithFailover.cpp
index 43166659b18..fb895d17763 100644
--- a/src/Client/ConnectionPoolWithFailover.cpp
+++ b/src/Client/ConnectionPoolWithFailover.cpp
@@ -29,7 +29,7 @@ ConnectionPoolWithFailover::ConnectionPoolWithFailover(
         LoadBalancing load_balancing,
         time_t decrease_error_period_,
         size_t max_error_cap_)
-    : Base(std::move(nested_pools_), decrease_error_period_, max_error_cap_, &Poco::Logger::get("ConnectionPoolWithFailover"))
+    : Base(std::move(nested_pools_), decrease_error_period_, max_error_cap_, getLogger("ConnectionPoolWithFailover"))
     , get_priority_load_balancing(load_balancing)
 {
     const std::string & local_hostname = getFQDNOrHostName();
@@ -52,7 +52,7 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
     settings.distributed_replica_max_ignored_errors = 0;
     settings.fallback_to_stale_replicas_for_distributed_queries = true;
 
-    return get(timeouts, settings, true);
+    return get(timeouts, settings, /* force_connected= */ true);
 }
 
 IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts & timeouts,
@@ -63,9 +63,9 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
         throw DB::Exception(DB::ErrorCodes::ALL_CONNECTION_TRIES_FAILED,
                             "Cannot get connection from ConnectionPoolWithFailover cause nested pools are empty");
 
-    TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
+    TryGetEntryFunc try_get_entry = [&](const NestedPoolPtr & pool, std::string & fail_message)
     {
-        return tryGetEntry(pool, timeouts, fail_message, settings, {});
+        return tryGetEntry(pool, timeouts, fail_message, settings);
     };
 
     const size_t offset = settings.load_balancing_first_offset % nested_pools.size();
@@ -79,14 +79,6 @@ IConnectionPool::Entry ConnectionPoolWithFailover::get(const ConnectionTimeouts
     return Base::get(max_ignored_errors, fallback_to_stale_replicas, try_get_entry, get_priority);
 }
 
-Priority ConnectionPoolWithFailover::getPriority() const
-{
-    return (*std::max_element(nested_pools.begin(), nested_pools.end(), [](const auto & a, const auto & b)
-    {
-        return a->getPriority() < b->getPriority();
-    }))->getPriority();
-}
-
 ConnectionPoolWithFailover::Status ConnectionPoolWithFailover::getStatus() const
 {
     const auto [states, pools, error_decrease_time] = getPoolExtendedStates();
@@ -126,7 +118,7 @@ std::vector<IConnectionPool::Entry> ConnectionPoolWithFailover::getMany(
     std::optional<bool> skip_unavailable_endpoints,
     GetPriorityForLoadBalancing::Func priority_func)
 {
-    TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
+    TryGetEntryFunc try_get_entry = [&](const NestedPoolPtr & pool, std::string & fail_message)
     { return tryGetEntry(pool, timeouts, fail_message, settings, nullptr, async_callback); };
 
     std::vector<TryResult> results = getManyImpl(settings, pool_mode, try_get_entry, skip_unavailable_endpoints, priority_func);
@@ -143,7 +135,7 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     const Settings & settings,
     PoolMode pool_mode)
 {
-    TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
+    TryGetEntryFunc try_get_entry = [&](const NestedPoolPtr & pool, std::string & fail_message)
     {
         return tryGetEntry(pool, timeouts, fail_message, settings);
     };
@@ -160,12 +152,27 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     std::optional<bool> skip_unavailable_endpoints,
     GetPriorityForLoadBalancing::Func priority_func)
 {
-    TryGetEntryFunc try_get_entry = [&](NestedPool & pool, std::string & fail_message)
+    TryGetEntryFunc try_get_entry = [&](const NestedPoolPtr & pool, std::string & fail_message)
     { return tryGetEntry(pool, timeouts, fail_message, settings, &table_to_check, async_callback); };
 
     return getManyImpl(settings, pool_mode, try_get_entry, skip_unavailable_endpoints, priority_func);
 }
 
+std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::getManyCheckedForInsert(
+    const ConnectionTimeouts & timeouts,
+    const Settings & settings,
+    PoolMode pool_mode,
+    const QualifiedTableName & table_to_check)
+{
+    TryGetEntryFunc try_get_entry = [&](const NestedPoolPtr & pool, std::string & fail_message)
+    { return tryGetEntry(pool, timeouts, fail_message, settings, &table_to_check, /*async_callback=*/ {}); };
+
+    return getManyImpl(settings, pool_mode, try_get_entry,
+        /*skip_unavailable_endpoints=*/ std::nullopt,
+        /*priority_func=*/ {},
+        settings.distributed_insert_skip_read_only_replicas);
+}
+
 ConnectionPoolWithFailover::Base::GetPriorityFunc ConnectionPoolWithFailover::makeGetPriorityFunc(const Settings & settings)
 {
     const size_t offset = settings.load_balancing_first_offset % nested_pools.size();
@@ -179,7 +186,8 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     PoolMode pool_mode,
     const TryGetEntryFunc & try_get_entry,
     std::optional<bool> skip_unavailable_endpoints,
-    GetPriorityForLoadBalancing::Func priority_func)
+    GetPriorityForLoadBalancing::Func priority_func,
+    bool skip_read_only_replicas)
 {
     if (nested_pools.empty())
         throw DB::Exception(
@@ -199,11 +207,17 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
         max_entries = nested_pools.size();
     }
     else if (pool_mode == PoolMode::GET_ONE)
+    {
         max_entries = 1;
+    }
     else if (pool_mode == PoolMode::GET_MANY)
+    {
         max_entries = settings.max_parallel_replicas;
+    }
     else
+    {
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Unknown pool allocation mode");
+    }
 
     if (!priority_func)
         priority_func = makeGetPriorityFunc(settings);
@@ -211,12 +225,12 @@ std::vector<ConnectionPoolWithFailover::TryResult> ConnectionPoolWithFailover::g
     UInt64 max_ignored_errors = settings.distributed_replica_max_ignored_errors.value;
     bool fallback_to_stale_replicas = settings.fallback_to_stale_replicas_for_distributed_queries.value;
 
-    return Base::getMany(min_entries, max_entries, max_tries, max_ignored_errors, fallback_to_stale_replicas, try_get_entry, priority_func);
+    return Base::getMany(min_entries, max_entries, max_tries, max_ignored_errors, fallback_to_stale_replicas, skip_read_only_replicas, try_get_entry, priority_func);
 }
 
 ConnectionPoolWithFailover::TryResult
 ConnectionPoolWithFailover::tryGetEntry(
-        IConnectionPool & pool,
+        const ConnectionPoolPtr & pool,
         const ConnectionTimeouts & timeouts,
         std::string & fail_message,
         const Settings & settings,
@@ -226,7 +240,7 @@ ConnectionPoolWithFailover::tryGetEntry(
 #if defined(OS_LINUX)
     if (async_callback)
     {
-        ConnectionEstablisherAsync connection_establisher_async(&pool, &timeouts, settings, log, table_to_check);
+        ConnectionEstablisherAsync connection_establisher_async(pool, &timeouts, settings, log, table_to_check);
         while (true)
         {
             connection_establisher_async.resume();
@@ -246,20 +260,20 @@ ConnectionPoolWithFailover::tryGetEntry(
     }
 #endif
 
-    ConnectionEstablisher connection_establisher(&pool, &timeouts, settings, log, table_to_check);
+    ConnectionEstablisher connection_establisher(pool, &timeouts, settings, log, table_to_check);
     TryResult result;
     connection_establisher.run(result, fail_message);
     return result;
 }
 
 std::vector<ConnectionPoolWithFailover::Base::ShuffledPool>
-ConnectionPoolWithFailover::getShuffledPools(const Settings & settings, GetPriorityForLoadBalancing::Func priority_func)
+ConnectionPoolWithFailover::getShuffledPools(const Settings & settings, GetPriorityForLoadBalancing::Func priority_func, bool use_slowdown_count)
 {
     if (!priority_func)
         priority_func = makeGetPriorityFunc(settings);
 
     UInt64 max_ignored_errors = settings.distributed_replica_max_ignored_errors.value;
-    return Base::getShuffledPools(max_ignored_errors, priority_func);
+    return Base::getShuffledPools(max_ignored_errors, priority_func, use_slowdown_count);
 }
 
 }
diff --git a/src/Client/ConnectionPoolWithFailover.h b/src/Client/ConnectionPoolWithFailover.h
index eaef717a2d6..a363a50244e 100644
--- a/src/Client/ConnectionPoolWithFailover.h
+++ b/src/Client/ConnectionPoolWithFailover.h
@@ -49,8 +49,6 @@ public:
               const Settings & settings,
               bool force_connected) override; /// From IConnectionPool
 
-    Priority getPriority() const override; /// From IConnectionPool
-
     /** Allocates up to the specified number of connections to work.
       * Connections provide access to different replicas of one shard.
       */
@@ -79,19 +77,25 @@ public:
         AsyncCallback async_callback = {},
         std::optional<bool> skip_unavailable_endpoints = std::nullopt,
         GetPriorityForLoadBalancing::Func priority_func = {});
+    /// The same as getManyChecked(), but respects distributed_insert_skip_read_only_replicas setting.
+    std::vector<TryResult> getManyCheckedForInsert(
+        const ConnectionTimeouts & timeouts,
+        const Settings & settings,
+        PoolMode pool_mode,
+        const QualifiedTableName & table_to_check);
 
     struct NestedPoolStatus
     {
         const Base::NestedPoolPtr pool;
-        size_t error_count;
-        size_t slowdown_count;
+        size_t error_count = 0;
+        size_t slowdown_count = 0;
         std::chrono::seconds estimated_recovery_time;
     };
 
     using Status = std::vector<NestedPoolStatus>;
     Status getStatus() const;
 
-    std::vector<Base::ShuffledPool> getShuffledPools(const Settings & settings, GetPriorityFunc priority_func = {});
+    std::vector<Base::ShuffledPool> getShuffledPools(const Settings & settings, GetPriorityFunc priority_func = {}, bool use_slowdown_count = false);
 
     size_t getMaxErrorCup() const { return Base::max_error_cap; }
 
@@ -109,13 +113,14 @@ private:
         PoolMode pool_mode,
         const TryGetEntryFunc & try_get_entry,
         std::optional<bool> skip_unavailable_endpoints = std::nullopt,
-        GetPriorityForLoadBalancing::Func priority_func = {});
+        GetPriorityForLoadBalancing::Func priority_func = {},
+        bool skip_read_only_replicas = false);
 
     /// Try to get a connection from the pool and check that it is good.
     /// If table_to_check is not null and the check is enabled in settings, check that replication delay
     /// for this table is not too large.
     TryResult tryGetEntry(
-            IConnectionPool & pool,
+            const ConnectionPoolPtr & pool,
             const ConnectionTimeouts & timeouts,
             std::string & fail_message,
             const Settings & settings,
diff --git a/src/Client/HedgedConnections.cpp b/src/Client/HedgedConnections.cpp
index 7ea13a7dffc..fb4d9a6bdcc 100644
--- a/src/Client/HedgedConnections.cpp
+++ b/src/Client/HedgedConnections.cpp
@@ -67,7 +67,6 @@ HedgedConnections::HedgedConnections(
     }
 
     active_connection_count = connections.size();
-    offsets_with_disabled_changing_replica = 0;
     pipeline_for_new_replicas.add([throttler_](ReplicaState & replica_) { replica_.connection->setThrottler(throttler_); });
 }
 
@@ -177,6 +176,10 @@ void HedgedConnections::sendQuery(
     {
         Settings modified_settings = settings;
 
+        /// Queries in foreign languages are transformed to ClickHouse-SQL. Ensure the setting before sending.
+        modified_settings.dialect = Dialect::clickhouse;
+        modified_settings.dialect.changed = false;
+
         if (disable_two_level_aggregation)
         {
             /// Disable two-level aggregation due to version incompatibility.
diff --git a/src/Client/HedgedConnections.h b/src/Client/HedgedConnections.h
index 5bc274332db..7f538804e5a 100644
--- a/src/Client/HedgedConnections.h
+++ b/src/Client/HedgedConnections.h
@@ -178,12 +178,12 @@ private:
     std::queue<int> offsets_queue;
 
     /// The current number of valid connections to the replicas of this shard.
-    size_t active_connection_count;
+    size_t active_connection_count = 0;
 
     /// We count offsets in which we can't change replica anymore,
     /// it's needed to cancel choosing new replicas when we
     /// disabled replica changing in all offsets.
-    size_t offsets_with_disabled_changing_replica;
+    size_t offsets_with_disabled_changing_replica = 0;
 
     Pipeline pipeline_for_new_replicas;
 
diff --git a/src/Client/HedgedConnectionsFactory.cpp b/src/Client/HedgedConnectionsFactory.cpp
index f7b5ceedc96..0fa2bc12924 100644
--- a/src/Client/HedgedConnectionsFactory.cpp
+++ b/src/Client/HedgedConnectionsFactory.cpp
@@ -34,15 +34,17 @@ HedgedConnectionsFactory::HedgedConnectionsFactory(
     : pool(pool_)
     , timeouts(timeouts_)
     , table_to_check(table_to_check_)
-    , log(&Poco::Logger::get("HedgedConnectionsFactory"))
+    , log(getLogger("HedgedConnectionsFactory"))
     , max_tries(max_tries_)
     , fallback_to_stale_replicas(fallback_to_stale_replicas_)
     , max_parallel_replicas(max_parallel_replicas_)
     , skip_unavailable_shards(skip_unavailable_shards_)
 {
-    shuffled_pools = pool->getShuffledPools(settings_, priority_func);
-    for (auto shuffled_pool : shuffled_pools)
-        replicas.emplace_back(std::make_unique<ConnectionEstablisherAsync>(shuffled_pool.pool, &timeouts, settings_, log, table_to_check.get()));
+    shuffled_pools = pool->getShuffledPools(settings_, priority_func, /* use_slowdown_count */ true);
+
+    for (const auto & shuffled_pool : shuffled_pools)
+        replicas.emplace_back(
+            std::make_unique<ConnectionEstablisherAsync>(shuffled_pool.pool, &timeouts, settings_, log, table_to_check.get()));
 }
 
 HedgedConnectionsFactory::~HedgedConnectionsFactory()
@@ -80,7 +82,7 @@ std::vector<Connection *> HedgedConnectionsFactory::getManyConnections(PoolMode
         }
         case PoolMode::GET_MANY:
         {
-            max_entries = max_parallel_replicas;
+            max_entries = std::min(max_parallel_replicas, shuffled_pools.size());
             break;
         }
     }
@@ -413,7 +415,7 @@ 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().delay < replicas[rhs].connection_establisher->getResult().delay;
         });
 
     replicas[indexes[0]].is_ready = true;
diff --git a/src/Client/HedgedConnectionsFactory.h b/src/Client/HedgedConnectionsFactory.h
index f187e9b2abb..c5bcbdf0689 100644
--- a/src/Client/HedgedConnectionsFactory.h
+++ b/src/Client/HedgedConnectionsFactory.h
@@ -133,7 +133,7 @@ private:
     std::shared_ptr<QualifiedTableName> table_to_check;
     int last_used_index = -1;
     Epoll epoll;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string fail_messages;
 
     /// The maximum number of attempts to connect to replicas.
@@ -158,8 +158,8 @@ private:
     /// checking the number of requested replicas that are still in process).
     size_t requested_connections_count = 0;
 
-    const size_t max_parallel_replicas = 0;
-    const bool skip_unavailable_shards = 0;
+    const size_t max_parallel_replicas = 1;
+    const bool skip_unavailable_shards = false;
 };
 
 }
diff --git a/src/Client/IConnections.h b/src/Client/IConnections.h
index ee17d198fc3..ebc71511834 100644
--- a/src/Client/IConnections.h
+++ b/src/Client/IConnections.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <compare>
-
 #include <Client/Connection.h>
 #include <Storages/MergeTree/RequestResponse.h>
 
diff --git a/src/Client/LocalConnection.cpp b/src/Client/LocalConnection.cpp
index dbb115f44ef..afcaa4d6098 100644
--- a/src/Client/LocalConnection.cpp
+++ b/src/Client/LocalConnection.cpp
@@ -1,13 +1,14 @@
 #include "LocalConnection.h"
+#include <Core/Protocol.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/executeQuery.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Executors/PullingAsyncPipelineExecutor.h>
-#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/Executors/PushingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Storages/IStorage.h>
 #include <Common/ConcurrentBoundedQueue.h>
 #include <Common/CurrentThread.h>
-#include <Core/Protocol.h>
 
 
 namespace DB
diff --git a/src/Client/LocalConnection.h b/src/Client/LocalConnection.h
index fb8f9003364..9c2d0a81d8d 100644
--- a/src/Client/LocalConnection.h
+++ b/src/Client/LocalConnection.h
@@ -132,14 +132,6 @@ public:
     void setThrottler(const ThrottlerPtr &) override {}
 
 private:
-    void initBlockInput();
-
-    void processOrdinaryQuery();
-
-    void processOrdinaryQueryWithProcessors();
-
-    void updateState();
-
     bool pullBlock(Block & block);
 
     void finishQuery();
diff --git a/src/Client/MultiplexedConnections.cpp b/src/Client/MultiplexedConnections.cpp
index c7d7d0143c8..5d0fc8fd39e 100644
--- a/src/Client/MultiplexedConnections.cpp
+++ b/src/Client/MultiplexedConnections.cpp
@@ -126,6 +126,10 @@ void MultiplexedConnections::sendQuery(
 
     Settings modified_settings = settings;
 
+    /// Queries in foreign languages are transformed to ClickHouse-SQL. Ensure the setting before sending.
+    modified_settings.dialect = Dialect::clickhouse;
+    modified_settings.dialect.changed = false;
+
     for (auto & replica : replica_states)
     {
         if (!replica.connection)
@@ -320,7 +324,7 @@ Packet MultiplexedConnections::receivePacketUnlocked(AsyncCallback async_callbac
     ReplicaState & state = getReplicaForReading();
     current_connection = state.connection;
     if (current_connection == nullptr)
-        throw Exception(ErrorCodes::NO_AVAILABLE_REPLICA, "Logical error: no available replica");
+        throw Exception(ErrorCodes::NO_AVAILABLE_REPLICA, "No available replica");
 
     Packet packet;
     try
diff --git a/src/Client/PacketReceiver.h b/src/Client/PacketReceiver.h
index deedf5cccdc..829634cf9ca 100644
--- a/src/Client/PacketReceiver.h
+++ b/src/Client/PacketReceiver.h
@@ -5,7 +5,6 @@
 #include <variant>
 
 #include <Client/IConnections.h>
-#include <Common/FiberStack.h>
 #include <Common/Fiber.h>
 #include <Common/Epoll.h>
 #include <Common/TimerDescriptor.h>
@@ -53,7 +52,7 @@ private:
 
     struct Task : public AsyncTask
     {
-        Task(PacketReceiver & receiver_) : receiver(receiver_) {}
+        explicit Task(PacketReceiver & receiver_) : receiver(receiver_) {}
 
         PacketReceiver & receiver;
 
diff --git a/src/Client/QueryFuzzer.cpp b/src/Client/QueryFuzzer.cpp
index 629d36e7960..7be01686258 100644
--- a/src/Client/QueryFuzzer.cpp
+++ b/src/Client/QueryFuzzer.cpp
@@ -232,7 +232,7 @@ ASTPtr QueryFuzzer::getRandomColumnLike()
         return nullptr;
     }
 
-    ASTPtr new_ast = column_like[fuzz_rand() % column_like.size()]->clone();
+    ASTPtr new_ast = column_like[fuzz_rand() % column_like.size()].second->clone();
     new_ast->setAlias("");
 
     return new_ast;
@@ -272,7 +272,7 @@ void QueryFuzzer::replaceWithTableLike(ASTPtr & ast)
         return;
     }
 
-    ASTPtr new_ast = table_like[fuzz_rand() % table_like.size()]->clone();
+    ASTPtr new_ast = table_like[fuzz_rand() % table_like.size()].second->clone();
 
     std::string old_alias = ast->tryGetAlias();
     new_ast->setAlias(old_alias);
@@ -569,7 +569,8 @@ void QueryFuzzer::fuzzColumnDeclaration(ASTColumnDeclaration & column)
         auto data_type = fuzzDataType(DataTypeFactory::instance().get(column.type));
 
         ParserDataType parser;
-        column.type = parseQuery(parser, data_type->getName(), DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        column.type = parseQuery(parser, data_type->getName(),
+            DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     }
 }
 
@@ -821,7 +822,8 @@ static ASTPtr tryParseInsertQuery(const String & full_query)
     ParserInsertQuery parser(end, false);
     String message;
 
-    return tryParseQuery(parser, pos, end, message, false, "", false, DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    return tryParseQuery(parser, pos, end, message, false, "", false,
+        DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
 }
 
 ASTs QueryFuzzer::getInsertQueriesForFuzzedTables(const String & full_query)
@@ -903,6 +905,112 @@ void QueryFuzzer::notifyQueryFailed(ASTPtr ast)
         remove_fuzzed_table(insert->getTable());
 }
 
+ASTPtr QueryFuzzer::fuzzLiteralUnderExpressionList(ASTPtr child)
+{
+    auto * l = child->as<ASTLiteral>();
+    chassert(l);
+    auto type = l->value.getType();
+    if (type == Field::Types::Which::String && fuzz_rand() % 7 == 0)
+    {
+        String value = l->value.get<String>();
+        child = makeASTFunction(
+            "toFixedString", std::make_shared<ASTLiteral>(value), std::make_shared<ASTLiteral>(static_cast<UInt64>(value.size())));
+    }
+    else if (type == Field::Types::Which::UInt64 && fuzz_rand() % 7 == 0)
+    {
+        child = makeASTFunction(fuzz_rand() % 2 == 0 ? "toUInt128" : "toUInt256", std::make_shared<ASTLiteral>(l->value.get<UInt64>()));
+    }
+    else if (type == Field::Types::Which::Int64 && fuzz_rand() % 7 == 0)
+    {
+        child = makeASTFunction(fuzz_rand() % 2 == 0 ? "toInt128" : "toInt256", std::make_shared<ASTLiteral>(l->value.get<Int64>()));
+    }
+    else if (type == Field::Types::Which::Float64 && fuzz_rand() % 7 == 0)
+    {
+        int decimal = fuzz_rand() % 4;
+        if (decimal == 0)
+            child = makeASTFunction(
+                "toDecimal32",
+                std::make_shared<ASTLiteral>(l->value.get<Float64>()),
+                std::make_shared<ASTLiteral>(static_cast<UInt64>(fuzz_rand() % 9)));
+        else if (decimal == 1)
+            child = makeASTFunction(
+                "toDecimal64",
+                std::make_shared<ASTLiteral>(l->value.get<Float64>()),
+                std::make_shared<ASTLiteral>(static_cast<UInt64>(fuzz_rand() % 18)));
+        else if (decimal == 2)
+            child = makeASTFunction(
+                "toDecimal128",
+                std::make_shared<ASTLiteral>(l->value.get<Float64>()),
+                std::make_shared<ASTLiteral>(static_cast<UInt64>(fuzz_rand() % 38)));
+        else
+            child = makeASTFunction(
+                "toDecimal256",
+                std::make_shared<ASTLiteral>(l->value.get<Float64>()),
+                std::make_shared<ASTLiteral>(static_cast<UInt64>(fuzz_rand() % 76)));
+    }
+
+    if (fuzz_rand() % 7 == 0)
+        child = makeASTFunction("toNullable", child);
+
+    if (fuzz_rand() % 7 == 0)
+        child = makeASTFunction("toLowCardinality", child);
+
+    if (fuzz_rand() % 7 == 0)
+        child = makeASTFunction("materialize", child);
+
+    return child;
+}
+
+/// Tries to remove the functions added in fuzzLiteralUnderExpressionList
+/// Note that it removes them even if the child is not a literal
+ASTPtr QueryFuzzer::reverseLiteralFuzzing(ASTPtr child)
+{
+    if (auto * function = child.get()->as<ASTFunction>())
+    {
+        const std::unordered_set<String> can_be_reverted{
+            "materialize",
+            "toDecimal32", /// Keeping the first parameter only should be ok (valid query most of the time)
+            "toDecimal64",
+            "toDecimal128",
+            "toDecimal256",
+            "toFixedString", /// Same as toDecimal
+            "toInt128",
+            "toInt256",
+            "toLowCardinality",
+            "toNullable",
+            "toUInt128",
+            "toUInt256"};
+        if (can_be_reverted.contains(function->name) && function->children.size() == 1)
+        {
+            if (fuzz_rand() % 7 == 0)
+                return function->children[0];
+        }
+    }
+
+    return nullptr;
+}
+
+
+void QueryFuzzer::fuzzExpressionList(ASTExpressionList & expr_list)
+{
+    for (auto & child : expr_list.children)
+    {
+        if (auto * literal = typeid_cast<ASTLiteral *>(child.get()))
+        {
+            if (fuzz_rand() % 13 == 0)
+                child = fuzzLiteralUnderExpressionList(child);
+        }
+        else
+        {
+            auto new_child = reverseLiteralFuzzing(child);
+            if (new_child)
+                child = new_child;
+            else
+                fuzz(child);
+        }
+    }
+}
+
 void QueryFuzzer::fuzz(ASTs & asts)
 {
     for (auto & ast : asts)
@@ -989,7 +1097,7 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
     }
     else if (auto * expr_list = typeid_cast<ASTExpressionList *>(ast.get()))
     {
-        fuzz(expr_list->children);
+        fuzzExpressionList(*expr_list);
     }
     else if (auto * order_by_element = typeid_cast<ASTOrderByElement *>(ast.get()))
     {
@@ -1106,23 +1214,13 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
 
         fuzz(select->children);
     }
-    /*
-     * The time to fuzz the settings has not yet come.
-     * Apparently we don't have any infractructure to validate the values of
-     * the settings, and the first query with max_block_size = -1 breaks
-     * because of overflows here and there.
-     *//*
-     * else if (auto * set = typeid_cast<ASTSetQuery *>(ast.get()))
-     * {
-     *      for (auto & c : set->changes)
-     *      {
-     *          if (fuzz_rand() % 50 == 0)
-     *          {
-     *              c.value = fuzzField(c.value);
-     *          }
-     *      }
-     * }
-     */
+    else if (auto * set = typeid_cast<ASTSetQuery *>(ast.get()))
+    {
+        /// Fuzz settings
+        for (auto & c : set->changes)
+            if (fuzz_rand() % 50 == 0)
+                c.value = fuzzField(c.value);
+    }
     else if (auto * literal = typeid_cast<ASTLiteral *>(ast.get()))
     {
         // There is a caveat with fuzzing the children: many ASTs also keep the
@@ -1131,9 +1229,8 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
         // are ASTPtr -- this is redundant ownership, but hides the error if the
         // child field is replaced. Others can be ASTLiteral * or the like, which
         // leads to segfault if the pointed-to AST is replaced.
-        // Replacing children is safe in case of ASTExpressionList. In a more
-        // general case, we can change the value of ASTLiteral, which is what we
-        // do here.
+        // Replacing children is safe in case of ASTExpressionList (done in fuzzExpressionList). In a more
+        // general case, we can change the value of ASTLiteral, which is what we do here
         if (fuzz_rand() % 11 == 0)
         {
             literal->value = fuzzField(literal->value);
@@ -1163,57 +1260,46 @@ void QueryFuzzer::fuzz(ASTPtr & ast)
     }
 }
 
+#define AST_FUZZER_PART_TYPE_CAP 1000
+
 /*
  * This functions collects various parts of query that we can then substitute
  * to a query being fuzzed.
- *
- * TODO: we just stop remembering new parts after our corpus reaches certain size.
- * This is boring, should implement a random replacement of existing parst with
- * small probability. Do this after we add this fuzzer to CI and fix all the
- * problems it can routinely find even in this boring version.
  */
 void QueryFuzzer::collectFuzzInfoMain(ASTPtr ast)
 {
     collectFuzzInfoRecurse(ast);
-
-    aliases.clear();
-    for (const auto & alias : aliases_set)
-    {
-        aliases.push_back(alias);
-    }
-
-    column_like.clear();
-    for (const auto & [name, value] : column_like_map)
-    {
-        column_like.push_back(value);
-    }
-
-    table_like.clear();
-    for (const auto & [name, value] : table_like_map)
-    {
-        table_like.push_back(value);
-    }
 }
 
 void QueryFuzzer::addTableLike(ASTPtr ast)
 {
-    if (table_like_map.size() > 1000)
+    if (table_like_map.size() > AST_FUZZER_PART_TYPE_CAP)
     {
-        table_like_map.clear();
+        const auto iter = std::next(table_like.begin(), fuzz_rand() % table_like.size());
+        const auto ast_del = *iter;
+        table_like.erase(iter);
+        table_like_map.erase(ast_del.first);
     }
 
     const auto name = ast->formatForErrorMessage();
     if (name.size() < 200)
     {
-        table_like_map.insert({name, ast});
+        const auto res = table_like_map.insert({name, ast});
+        if (res.second)
+        {
+            table_like.push_back({name, ast});
+        }
     }
 }
 
 void QueryFuzzer::addColumnLike(ASTPtr ast)
 {
-    if (column_like_map.size() > 1000)
+    if (column_like_map.size() > AST_FUZZER_PART_TYPE_CAP)
     {
-        column_like_map.clear();
+        const auto iter = std::next(column_like.begin(), fuzz_rand() % column_like.size());
+        const auto ast_del = *iter;
+        column_like.erase(iter);
+        column_like_map.erase(ast_del.first);
     }
 
     const auto name = ast->formatForErrorMessage();
@@ -1228,22 +1314,16 @@ void QueryFuzzer::addColumnLike(ASTPtr ast)
     }
     if (name.size() < 200)
     {
-        column_like_map.insert({name, ast});
+        const auto res = column_like_map.insert({name, ast});
+        if (res.second)
+        {
+            column_like.push_back({name, ast});
+        }
     }
 }
 
 void QueryFuzzer::collectFuzzInfoRecurse(ASTPtr ast)
 {
-    if (auto * impl = dynamic_cast<ASTWithAlias *>(ast.get()))
-    {
-        if (aliases_set.size() > 1000)
-        {
-            aliases_set.clear();
-        }
-
-        aliases_set.insert(impl->alias);
-    }
-
     if (typeid_cast<ASTLiteral *>(ast.get()))
     {
         addColumnLike(ast);
diff --git a/src/Client/QueryFuzzer.h b/src/Client/QueryFuzzer.h
index 18c7b8a9241..6165e589cae 100644
--- a/src/Client/QueryFuzzer.h
+++ b/src/Client/QueryFuzzer.h
@@ -50,14 +50,12 @@ struct QueryFuzzer
     // we are currently fuzzing. We add some part from each new query we are asked
     // to fuzz, and keep this state between queries, so the fuzzing output becomes
     // more interesting over time, as the queries mix.
-    std::unordered_set<std::string> aliases_set;
-    std::vector<std::string> aliases;
-
+    // The hash tables are used for collection, and the vectors are used for random access.
     std::unordered_map<std::string, ASTPtr> column_like_map;
-    std::vector<ASTPtr> column_like;
+    std::vector<std::pair<std::string, ASTPtr>> column_like;
 
     std::unordered_map<std::string, ASTPtr> table_like_map;
-    std::vector<ASTPtr> table_like;
+    std::vector<std::pair<std::string, ASTPtr>> table_like;
 
     // Some debug fields for detecting problematic ASTs with loops.
     // These are reset for each fuzzMain call.
@@ -95,6 +93,9 @@ struct QueryFuzzer
     void fuzzExplainSettings(ASTSetQuery & settings_ast, ASTExplainQuery::ExplainKind kind);
     void fuzzColumnDeclaration(ASTColumnDeclaration & column);
     void fuzzTableName(ASTTableExpression & table);
+    ASTPtr fuzzLiteralUnderExpressionList(ASTPtr child);
+    ASTPtr reverseLiteralFuzzing(ASTPtr child);
+    void fuzzExpressionList(ASTExpressionList & expr_list);
     void fuzz(ASTs & asts);
     void fuzz(ASTPtr & ast);
     void collectFuzzInfoMain(ASTPtr ast);
diff --git a/src/Client/Suggest.cpp b/src/Client/Suggest.cpp
index eb98c3a5740..03df582de10 100644
--- a/src/Client/Suggest.cpp
+++ b/src/Client/Suggest.cpp
@@ -2,7 +2,6 @@
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Combinators/AggregateFunctionCombinatorFactory.h>
-#include <Core/Settings.h>
 #include <Columns/ColumnString.h>
 #include <Common/typeid_cast.h>
 #include <Common/Macros.h>
diff --git a/src/Client/TestHint.h b/src/Client/TestHint.h
index 982cd10dce0..eaf854be5df 100644
--- a/src/Client/TestHint.h
+++ b/src/Client/TestHint.h
@@ -53,7 +53,7 @@ class TestHint
 {
 public:
     using ErrorVector = std::vector<int>;
-    TestHint(const String & query_);
+    explicit TestHint(const String & query_);
 
     const auto & serverErrors() const { return server_errors; }
     const auto & clientErrors() const { return client_errors; }
@@ -77,12 +77,12 @@ private:
     {
         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())
+        if (!actual_server_error && !server_errors.empty())
             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())
+        if (!actual_client_error && !client_errors.empty())
             return false;
 
         return true;
@@ -90,7 +90,7 @@ private:
 
     bool lostExpectedError(int actual_server_error, int actual_client_error) const
     {
-        return (server_errors.size() && !actual_server_error) || (client_errors.size() && !actual_client_error);
+        return (!server_errors.empty() && !actual_server_error) || (!client_errors.empty() && !actual_client_error);
     }
 };
 
diff --git a/src/Columns/CMakeLists.txt b/src/Columns/CMakeLists.txt
index f676f415eea..1febe4f71d7 100644
--- a/src/Columns/CMakeLists.txt
+++ b/src/Columns/CMakeLists.txt
@@ -1,3 +1,7 @@
 if (ENABLE_EXAMPLES)
     add_subdirectory (examples)
 endif ()
+
+if (ENABLE_BENCHMARKS)
+    add_subdirectory(benchmarks)
+endif()
diff --git a/src/Columns/Collator.cpp b/src/Columns/Collator.cpp
index 434a30c0450..f6a3bb40d25 100644
--- a/src/Columns/Collator.cpp
+++ b/src/Columns/Collator.cpp
@@ -8,10 +8,8 @@
 #    include <unicode/ucol.h>
 #    include <unicode/unistr.h>
 #else
-#    if defined(__clang__)
-#        pragma clang diagnostic ignored "-Wunused-private-field"
-#        pragma clang diagnostic ignored "-Wmissing-noreturn"
-#    endif
+#    pragma clang diagnostic ignored "-Wunused-private-field"
+#    pragma clang diagnostic ignored "-Wmissing-noreturn"
 #endif
 
 #include <Common/Exception.h>
diff --git a/src/Columns/ColumnAggregateFunction.cpp b/src/Columns/ColumnAggregateFunction.cpp
index 2018015b46d..f7e6b1a1ccc 100644
--- a/src/Columns/ColumnAggregateFunction.cpp
+++ b/src/Columns/ColumnAggregateFunction.cpp
@@ -1,7 +1,10 @@
 #include <Columns/ColumnAggregateFunction.h>
+
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnsCommon.h>
 #include <Columns/MaskOperations.h>
 #include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromArena.h>
 #include <IO/WriteBufferFromString.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
@@ -108,6 +111,11 @@ ConstArenas concatArenas(const ConstArenas & array, ConstArenaPtr arena)
 
 }
 
+std::string ColumnAggregateFunction::getName() const
+{
+    return "AggregateFunction(" + func->getName() + ")";
+}
+
 MutableColumnPtr ColumnAggregateFunction::convertToValues(MutableColumnPtr column)
 {
     /** If the aggregate function returns an unfinalized/unfinished state,
@@ -303,7 +311,7 @@ ColumnPtr ColumnAggregateFunction::filter(const Filter & filter, ssize_t result_
     auto & res_data = res->data;
 
     if (result_size_hint)
-        res_data.reserve(result_size_hint > 0 ? result_size_hint : size);
+        res_data.reserve_exact(result_size_hint > 0 ? result_size_hint : size);
 
     for (size_t i = 0; i < size; ++i)
         if (filter[i])
@@ -337,7 +345,7 @@ ColumnPtr ColumnAggregateFunction::indexImpl(const PaddedPODArray<Type> & indexe
     assert(limit <= indexes.size());
     auto res = createView();
 
-    res->data.resize(limit);
+    res->data.resize_exact(limit);
     for (size_t i = 0; i < limit; ++i)
         res->data[i] = data[indexes[i]];
 
@@ -518,6 +526,23 @@ void ColumnAggregateFunction::insert(const Field & x)
     func->deserialize(data.back(), read_buffer, version, &arena);
 }
 
+bool ColumnAggregateFunction::tryInsert(const DB::Field & x)
+{
+    if (x.getType() != Field::Types::AggregateFunctionState)
+        return false;
+
+    const auto & field_name = x.get<const AggregateFunctionStateData &>().name;
+    if (type_string != field_name)
+        return false;
+
+    ensureOwnership();
+    Arena & arena = createOrGetArena();
+    pushBackAndCreateState(data, arena, func.get());
+    ReadBufferFromString read_buffer(x.get<const AggregateFunctionStateData &>().data);
+    func->deserialize(data.back(), read_buffer, version, &arena);
+    return true;
+}
+
 void ColumnAggregateFunction::insertDefault()
 {
     ensureOwnership();
@@ -525,7 +550,7 @@ void ColumnAggregateFunction::insertDefault()
     pushBackAndCreateState(data, arena, func.get());
 }
 
-StringRef ColumnAggregateFunction::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin, const UInt8 *) const
+StringRef ColumnAggregateFunction::serializeValueIntoArena(size_t n, Arena & arena, const char *& begin) const
 {
     WriteBufferFromArena out(arena, begin);
     func->serialize(data[n], out, version);
@@ -584,7 +609,7 @@ ColumnPtr ColumnAggregateFunction::replicate(const IColumn::Offsets & offsets) c
 
     auto res = createView();
     auto & res_data = res->data;
-    res_data.reserve(offsets.back());
+    res_data.reserve_exact(offsets.back());
 
     IColumn::Offset prev_offset = 0;
     for (size_t i = 0; i < size; ++i)
@@ -626,18 +651,13 @@ void ColumnAggregateFunction::getPermutation(PermutationSortDirection /*directio
                                             size_t /*limit*/, int /*nan_direction_hint*/, IColumn::Permutation & res) const
 {
     size_t s = data.size();
-    res.resize(s);
+    res.resize_exact(s);
     iota(res.data(), s, IColumn::Permutation::value_type(0));
 }
 
 void ColumnAggregateFunction::updatePermutation(PermutationSortDirection, PermutationSortStability,
                                             size_t, int, Permutation &, EqualRanges&) const {}
 
-void ColumnAggregateFunction::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 void ColumnAggregateFunction::getExtremes(Field & min, Field & max) const
 {
     /// Place serialized default values into min/max.
@@ -673,7 +693,7 @@ ColumnAggregateFunction::MutablePtr ColumnAggregateFunction::createView() const
 }
 
 ColumnAggregateFunction::ColumnAggregateFunction(const ColumnAggregateFunction & src_)
-    : COWHelper<IColumn, ColumnAggregateFunction>(src_),
+    : COWHelper<IColumnHelper<ColumnAggregateFunction>, ColumnAggregateFunction>(src_),
     foreign_arenas(concatArenas(src_.foreign_arenas, src_.my_arena)),
     func(src_.func), src(src_.getPtr()), data(src_.data.begin(), src_.data.end())
 {
diff --git a/src/Columns/ColumnAggregateFunction.h b/src/Columns/ColumnAggregateFunction.h
index e37a8a5f109..a75b27e835c 100644
--- a/src/Columns/ColumnAggregateFunction.h
+++ b/src/Columns/ColumnAggregateFunction.h
@@ -1,17 +1,9 @@
 #pragma once
 
-#include <AggregateFunctions/IAggregateFunction.h>
-
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
 #include <Columns/IColumn.h>
-#include <Common/PODArray.h>
-
 #include <Core/Field.h>
-
-#include <IO/ReadBufferFromString.h>
-#include <IO/WriteBuffer.h>
-#include <IO/WriteHelpers.h>
-
-#include <Functions/FunctionHelpers.h>
+#include <Common/PODArray.h>
 
 namespace DB
 {
@@ -26,6 +18,12 @@ using ArenaPtr = std::shared_ptr<Arena>;
 using ConstArenaPtr = std::shared_ptr<const Arena>;
 using ConstArenas = std::vector<ConstArenaPtr>;
 
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+
+struct ColumnWithTypeAndName;
+using ColumnsWithTypeAndName = std::vector<ColumnWithTypeAndName>;
+
 
 /** Column of states of aggregate functions.
   * Presented as an array of pointers to the states of aggregate functions (data).
@@ -51,13 +49,13 @@ using ConstArenas = std::vector<ConstArenaPtr>;
   *  specifying which individual values should be destroyed and which ones should not.
   * Clearly, this method would have a substantially non-zero price.
   */
-class ColumnAggregateFunction final : public COWHelper<IColumn, ColumnAggregateFunction>
+class ColumnAggregateFunction final : public COWHelper<IColumnHelper<ColumnAggregateFunction>, ColumnAggregateFunction>
 {
 public:
     using Container = PaddedPODArray<AggregateDataPtr>;
 
 private:
-    friend class COWHelper<IColumn, ColumnAggregateFunction>;
+    friend class COWHelper<IColumnHelper<ColumnAggregateFunction>, ColumnAggregateFunction>;
 
     /// Arenas used by function states that are created elsewhere. We own these
     /// arenas in the sense of extending their lifetime, but do not modify them.
@@ -121,7 +119,7 @@ public:
     /// This method is made static and receive MutableColumnPtr object to explicitly destroy it.
     static MutableColumnPtr convertToValues(MutableColumnPtr column);
 
-    std::string getName() const override { return "AggregateFunction(" + func->getName() + ")"; }
+    std::string getName() const override;
     const char * getFamilyName() const override { return "AggregateFunction"; }
     TypeIndex getDataType() const override { return TypeIndex::AggregateFunction; }
 
@@ -160,9 +158,11 @@ public:
 
     void insert(const Field & x) override;
 
+    bool tryInsert(const Field & x) override;
+
     void insertDefault() override;
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
 
     const char * deserializeAndInsertFromArena(const char * src_arena) override;
 
@@ -201,8 +201,6 @@ public:
 
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
 
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     int compareAt(size_t, size_t, const IColumn &, int) const override
     {
         return 0;
diff --git a/src/Columns/ColumnArray.cpp b/src/Columns/ColumnArray.cpp
index 1cb8188bce6..7b268b80116 100644
--- a/src/Columns/ColumnArray.cpp
+++ b/src/Columns/ColumnArray.cpp
@@ -8,7 +8,6 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
 #include <Columns/MaskOperations.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <Common/Exception.h>
 #include <Common/Arena.h>
 #include <Common/SipHash.h>
@@ -109,7 +108,7 @@ MutableColumnPtr ColumnArray::cloneResized(size_t to_size) const
             offset = getOffsets().back();
         }
 
-        res->getOffsets().resize(to_size);
+        res->getOffsets().resize_exact(to_size);
         for (size_t i = from_size; i < to_size; ++i)
             res->getOffsets()[i] = offset;
     }
@@ -205,7 +204,7 @@ void ColumnArray::insertData(const char * pos, size_t length)
 }
 
 
-StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     size_t array_size = sizeAt(n);
     size_t offset = offsetAt(n);
@@ -226,6 +225,19 @@ StringRef ColumnArray::serializeValueIntoArena(size_t n, Arena & arena, char con
 }
 
 
+char * ColumnArray::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    size_t array_size = sizeAt(n);
+    size_t offset = offsetAt(n);
+
+    memcpy(memory, &array_size, sizeof(array_size));
+    memory += sizeof(array_size);
+    for (size_t i = 0; i < array_size; ++i)
+        memory = getData().serializeValueIntoMemory(offset + i, memory);
+    return memory;
+}
+
+
 const char * ColumnArray::deserializeAndInsertFromArena(const char * pos)
 {
     size_t array_size = unalignedLoad<size_t>(pos);
@@ -305,6 +317,25 @@ void ColumnArray::insert(const Field & x)
     getOffsets().push_back(getOffsets().back() + size);
 }
 
+bool ColumnArray::tryInsert(const Field & x)
+{
+    if (x.getType() != Field::Types::Which::Array)
+        return false;
+
+    const Array & array = x.get<const Array &>();
+    size_t size = array.size();
+    for (size_t i = 0; i < size; ++i)
+    {
+        if (!getData().tryInsert(array[i]))
+        {
+            getData().popBack(i);
+            return false;
+        }
+    }
+
+    getOffsets().push_back(getOffsets().back() + size);
+    return true;
+}
 
 void ColumnArray::insertFrom(const IColumn & src_, size_t n)
 {
@@ -371,19 +402,6 @@ int ColumnArray::compareAtWithCollation(size_t n, size_t m, const IColumn & rhs_
     return compareAtImpl(n, m, rhs_, nan_direction_hint, &collator);
 }
 
-void ColumnArray::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnArray>(assert_cast<const ColumnArray &>(rhs), rhs_row_num, row_indexes,
-                                        compare_results, direction, nan_direction_hint);
-}
-
-bool ColumnArray::hasEqualValues() const
-{
-    return hasEqualValuesImpl<ColumnArray>();
-}
-
 struct ColumnArray::ComparatorBase
 {
     const ColumnArray & parent;
@@ -423,10 +441,16 @@ struct ColumnArray::ComparatorCollationBase
 
 void ColumnArray::reserve(size_t n)
 {
-    getOffsets().reserve(n);
+    getOffsets().reserve_exact(n);
     getData().reserve(n); /// The average size of arrays is not taken into account here. Or it is considered to be no more than 1.
 }
 
+void ColumnArray::shrinkToFit()
+{
+    getOffsets().shrink_to_fit();
+    getData().shrinkToFit();
+}
+
 void ColumnArray::ensureOwnership()
 {
     getData().ensureOwnership();
@@ -548,6 +572,21 @@ void ColumnArray::insertRangeFrom(const IColumn & src, size_t start, size_t leng
 }
 
 
+MutableColumnPtr ColumnArray::getDataInRange(size_t start, size_t length) const
+{
+    if (start + length > getOffsets().size())
+        throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND, "Parameter out of bound in ColumnArray::getDataPtrForRange method. "
+            "[start({}) + length({}) > offsets.size({})]", start, length, getOffsets().size());
+
+    size_t start_offset = offsetAt(start);
+    size_t end_offset = offsetAt(start + length);
+
+    auto res = getData().cloneEmpty();
+    res->insertRangeFrom(getData(), start_offset, end_offset - start_offset);
+    return res;
+}
+
+
 ColumnPtr ColumnArray::filter(const Filter & filt, ssize_t result_size_hint) const
 {
     if (typeid_cast<const ColumnUInt8 *>(data.get()))
@@ -603,7 +642,7 @@ void ColumnArray::expand(const IColumn::Filter & mask, bool inverted)
 
     ssize_t index = mask.size() - 1;
     ssize_t from = offsets_data.size() - 1;
-    offsets_data.resize(mask.size());
+    offsets_data.resize_exact(mask.size());
     UInt64 last_offset = offsets_data[from];
     while (index >= 0)
     {
@@ -663,9 +702,9 @@ ColumnPtr ColumnArray::filterString(const Filter & filt, ssize_t result_size_hin
 
     if (result_size_hint < 0)    /// Other cases are not considered.
     {
-        res_chars.reserve(src_chars.size());
-        res_string_offsets.reserve(src_string_offsets.size());
-        res_offsets.reserve(col_size);
+        res_chars.reserve_exact(src_chars.size());
+        res_string_offsets.reserve_exact(src_string_offsets.size());
+        res_offsets.reserve_exact(col_size);
     }
 
     Offset prev_src_offset = 0;
@@ -739,7 +778,7 @@ ColumnPtr ColumnArray::filterGeneric(const Filter & filt, ssize_t result_size_hi
 
     Offsets & res_offsets = res->getOffsets();
     if (result_size_hint)
-        res_offsets.reserve(result_size_hint > 0 ? result_size_hint : size);
+        res_offsets.reserve_exact(result_size_hint > 0 ? result_size_hint : size);
 
     size_t current_offset = 0;
     for (size_t i = 0; i < size; ++i)
@@ -789,7 +828,7 @@ ColumnPtr ColumnArray::filterTuple(const Filter & filt, ssize_t result_size_hint
     size_t tuple_size = tuple.tupleSize();
 
     if (tuple_size == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: empty tuple");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty tuple");
 
     Columns temporary_arrays(tuple_size);
     for (size_t i = 0; i < tuple_size; ++i)
@@ -826,12 +865,12 @@ ColumnPtr ColumnArray::indexImpl(const PaddedPODArray<T> & indexes, size_t limit
     /// Convert indexes to UInt64 in case of overflow.
     auto nested_indexes_column = ColumnUInt64::create();
     PaddedPODArray<UInt64> & nested_indexes = nested_indexes_column->getData();
-    nested_indexes.reserve(getOffsets().back());
+    nested_indexes.reserve_exact(getOffsets().back());
 
     auto res = ColumnArray::create(data->cloneEmpty());
 
     Offsets & res_offsets = res->getOffsets();
-    res_offsets.resize(limit);
+    res_offsets.resize_exact(limit);
     size_t current_offset = 0;
 
     for (size_t i = 0; i < limit; ++i)
@@ -948,22 +987,6 @@ ColumnPtr ColumnArray::compress() const
         });
 }
 
-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);
-}
-
-
 ColumnPtr ColumnArray::replicate(const Offsets & replicate_offsets) const
 {
     if (replicate_offsets.empty())
@@ -1039,8 +1062,8 @@ ColumnPtr ColumnArray::replicateNumber(const Offsets & replicate_offsets) const
     typename ColVecType::Container & res_data = typeid_cast<ColVecType &>(res_arr.getData()).getData();
     Offsets & res_offsets = res_arr.getOffsets();
 
-    res_data.reserve(data->size() / col_size * replicate_offsets.back());
-    res_offsets.reserve(replicate_offsets.back());
+    res_data.reserve_exact(data->size() / col_size * replicate_offsets.back());
+    res_offsets.reserve_exact(replicate_offsets.back());
 
     Offset prev_replicate_offset = 0;
     Offset prev_data_offset = 0;
@@ -1093,9 +1116,9 @@ ColumnPtr ColumnArray::replicateString(const Offsets & replicate_offsets) const
     Offsets & res_string_offsets = typeid_cast<ColumnString &>(res_arr.getData()).getOffsets();
     Offsets & res_offsets = res_arr.getOffsets();
 
-    res_chars.reserve(src_chars.size() / col_size * replicate_offsets.back());
-    res_string_offsets.reserve(src_string_offsets.size() / col_size * replicate_offsets.back());
-    res_offsets.reserve(replicate_offsets.back());
+    res_chars.reserve_exact(src_chars.size() / col_size * replicate_offsets.back());
+    res_string_offsets.reserve_exact(src_string_offsets.size() / col_size * replicate_offsets.back());
+    res_offsets.reserve_exact(replicate_offsets.back());
 
     Offset prev_replicate_offset = 0;
 
@@ -1162,7 +1185,7 @@ ColumnPtr ColumnArray::replicateConst(const Offsets & replicate_offsets) const
 
     auto res_column_offsets = ColumnOffsets::create();
     Offsets & res_offsets = res_column_offsets->getData();
-    res_offsets.reserve(replicate_offsets.back());
+    res_offsets.reserve_exact(replicate_offsets.back());
 
     Offset prev_replicate_offset = 0;
     Offset prev_data_offset = 0;
@@ -1242,7 +1265,7 @@ ColumnPtr ColumnArray::replicateTuple(const Offsets & replicate_offsets) const
     size_t tuple_size = tuple.tupleSize();
 
     if (tuple_size == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: empty tuple");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty tuple");
 
     Columns temporary_arrays(tuple_size);
     for (size_t i = 0; i < tuple_size; ++i)
@@ -1258,11 +1281,6 @@ ColumnPtr ColumnArray::replicateTuple(const Offsets & replicate_offsets) const
         assert_cast<const ColumnArray &>(*temporary_arrays.front()).getOffsetsPtr());
 }
 
-void ColumnArray::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 size_t ColumnArray::getNumberOfDimensions() const
 {
     const auto * nested_array = checkAndGetColumn<ColumnArray>(*data);
diff --git a/src/Columns/ColumnArray.h b/src/Columns/ColumnArray.h
index 2a9bfa405e5..230d8830265 100644
--- a/src/Columns/ColumnArray.h
+++ b/src/Columns/ColumnArray.h
@@ -15,10 +15,10 @@ namespace DB
   * In memory, it is represented as one column of a nested type, whose size is equal to the sum of the sizes of all arrays,
   *  and as an array of offsets in it, which allows you to get each element.
   */
-class ColumnArray final : public COWHelper<IColumn, ColumnArray>
+class ColumnArray final : public COWHelper<IColumnHelper<ColumnArray>, ColumnArray>
 {
 private:
-    friend class COWHelper<IColumn, ColumnArray>;
+    friend class COWHelper<IColumnHelper<ColumnArray>, ColumnArray>;
 
     /** Create an array column with specified values and offsets. */
     ColumnArray(MutableColumnPtr && nested_column, MutableColumnPtr && offsets_column);
@@ -48,7 +48,7 @@ public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
-    using Base = COWHelper<IColumn, ColumnArray>;
+    using Base = COWHelper<IColumnHelper<ColumnArray>, ColumnArray>;
 
     static Ptr create(const ColumnPtr & nested_column, const ColumnPtr & offsets_column)
     {
@@ -77,7 +77,8 @@ public:
     StringRef getDataAt(size_t n) const override;
     bool isDefaultAt(size_t n) const override;
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t, char * memory) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
@@ -85,6 +86,7 @@ public:
     void updateHashFast(SipHash & hash) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertFrom(const IColumn & src_, size_t n) override;
     void insertDefault() override;
     void popBack(size_t n) override;
@@ -94,11 +96,7 @@ public:
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     template <typename Type> ColumnPtr indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const;
     int compareAt(size_t n, size_t m, const IColumn & rhs_, int nan_direction_hint) const override;
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs_, int nan_direction_hint, const Collator & collator) const override;
-    bool hasEqualValues() const override;
     void getPermutation(PermutationSortDirection direction, PermutationSortStability stability,
                             size_t limit, int nan_direction_hint, Permutation & res) const override;
     void updatePermutation(PermutationSortDirection direction, PermutationSortStability stability,
@@ -108,6 +106,7 @@ public:
     void updatePermutationWithCollation(const Collator & collator, PermutationSortDirection direction, PermutationSortStability stability,
                                     size_t limit, int nan_direction_hint, Permutation & res, EqualRanges& equal_ranges) const override;
     void reserve(size_t n) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -142,12 +141,9 @@ public:
     const ColumnPtr & getOffsetsPtr() const { return offsets; }
     ColumnPtr & getOffsetsPtr() { return offsets; }
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override
-    {
-        return scatterImpl<ColumnArray>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
+    /// Returns a copy of the data column's part corresponding to a specified range of rows.
+    /// For example, `getDataInRange(0, size())` is the same as `getDataPtr()->clone()`.
+    MutableColumnPtr getDataInRange(size_t start, size_t length) const;
 
     ColumnPtr compress() const override;
 
@@ -172,11 +168,6 @@ public:
         return false;
     }
 
-    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 { data->finalize(); }
     bool isFinalized() const override { return data->isFinalized(); }
 
diff --git a/src/Columns/ColumnCompressed.h b/src/Columns/ColumnCompressed.h
index b780fbbf37a..6763410b46d 100644
--- a/src/Columns/ColumnCompressed.h
+++ b/src/Columns/ColumnCompressed.h
@@ -30,7 +30,7 @@ namespace ErrorCodes
   *
   * Also in-memory compression allows to keep more data in RAM.
   */
-class ColumnCompressed : public COWHelper<IColumn, ColumnCompressed>
+class ColumnCompressed : public COWHelper<IColumnHelper<ColumnCompressed>, ColumnCompressed>
 {
 public:
     using Lazy = std::function<ColumnPtr()>;
@@ -84,11 +84,13 @@ public:
     StringRef getDataAt(size_t) const override { throwMustBeDecompressed(); }
     bool isDefaultAt(size_t) const override { throwMustBeDecompressed(); }
     void insert(const Field &) override { throwMustBeDecompressed(); }
+    bool tryInsert(const Field &) override { throwMustBeDecompressed(); }
     void insertRangeFrom(const IColumn &, size_t, size_t) override { throwMustBeDecompressed(); }
     void insertData(const char *, size_t) override { throwMustBeDecompressed(); }
     void insertDefault() override { throwMustBeDecompressed(); }
     void popBack(size_t) override { throwMustBeDecompressed(); }
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const UInt8 *) const override { throwMustBeDecompressed(); }
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeDecompressed(); }
+    char * serializeValueIntoMemory(size_t, char *) const override { throwMustBeDecompressed(); }
     const char * deserializeAndInsertFromArena(const char *) override { throwMustBeDecompressed(); }
     const char * skipSerializedInArena(const char *) const override { throwMustBeDecompressed(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwMustBeDecompressed(); }
diff --git a/src/Columns/ColumnConst.cpp b/src/Columns/ColumnConst.cpp
index 9aa0f5cfa49..f2cea83db0e 100644
--- a/src/Columns/ColumnConst.cpp
+++ b/src/Columns/ColumnConst.cpp
@@ -128,7 +128,7 @@ MutableColumns ColumnConst::scatter(ColumnIndex num_columns, const Selector & se
 void ColumnConst::getPermutation(PermutationSortDirection /*direction*/, PermutationSortStability /*stability*/,
                                 size_t /*limit*/, int /*nan_direction_hint*/, Permutation & res) const
 {
-    res.resize(s);
+    res.resize_exact(s);
     iota(res.data(), s, IColumn::Permutation::value_type(0));
 }
 
@@ -159,4 +159,26 @@ void ColumnConst::compareColumn(
     std::fill(compare_results.begin(), compare_results.end(), res);
 }
 
+ColumnConst::Ptr createColumnConst(const ColumnPtr & column, Field value)
+{
+    auto data = column->cloneEmpty();
+    data->insert(value);
+    return ColumnConst::create(std::move(data), 1);
+}
+
+ColumnConst::Ptr createColumnConst(const ColumnPtr & column, size_t const_value_index)
+{
+    auto data = column->cloneEmpty();
+    data->insertFrom(*column, const_value_index);
+    return ColumnConst::create(std::move(data), 1);
+}
+
+ColumnConst::Ptr createColumnConstWithDefaultValue(const ColumnPtr & column)
+{
+    auto data = column->cloneEmpty();
+    data->insertDefault();
+    return ColumnConst::create(std::move(data), 1);
+}
+
+
 }
diff --git a/src/Columns/ColumnConst.h b/src/Columns/ColumnConst.h
index dc84e0c2402..4a3d40ca0d2 100644
--- a/src/Columns/ColumnConst.h
+++ b/src/Columns/ColumnConst.h
@@ -20,10 +20,10 @@ namespace ErrorCodes
 /** ColumnConst contains another column with single element,
   *  but looks like a column with arbitrary amount of same elements.
   */
-class ColumnConst final : public COWHelper<IColumn, ColumnConst>
+class ColumnConst final : public COWHelper<IColumnHelper<ColumnConst>, ColumnConst>
 {
 private:
-    friend class COWHelper<IColumn, ColumnConst>;
+    friend class COWHelper<IColumnHelper<ColumnConst>, ColumnConst>;
 
     WrappedPtr data;
     size_t s;
@@ -131,6 +131,15 @@ public:
         ++s;
     }
 
+    bool tryInsert(const Field & field) override
+    {
+        auto tmp = data->cloneEmpty();
+        if (!tmp->tryInsert(field))
+            return false;
+        ++s;
+        return true;
+    }
+
     void insertData(const char *, size_t) override
     {
         ++s;
@@ -141,6 +150,8 @@ public:
         ++s;
     }
 
+    void insertManyFrom(const IColumn & /*src*/, size_t /* position */, size_t length) override { s += length; }
+
     void insertDefault() override
     {
         ++s;
@@ -151,11 +162,16 @@ public:
         s -= n;
     }
 
-    StringRef serializeValueIntoArena(size_t, Arena & arena, char const *& begin, const UInt8 *) const override
+    StringRef serializeValueIntoArena(size_t, Arena & arena, char const *& begin) const override
     {
         return data->serializeValueIntoArena(0, arena, begin);
     }
 
+    char * serializeValueIntoMemory(size_t, char * memory) const override
+    {
+        return data->serializeValueIntoMemory(0, memory);
+    }
+
     const char * deserializeAndInsertFromArena(const char * pos) override
     {
         const auto * res = data->deserializeAndInsertFromArena(pos);
@@ -263,7 +279,7 @@ public:
         if (!data->isDefaultAt(0))
         {
             size_t to = limit && from + limit < size() ? from + limit : size();
-            indices.reserve(indices.size() + to - from);
+            indices.reserve_exact(indices.size() + to - from);
             for (size_t i = from; i < to; ++i)
                 indices.push_back(i);
         }
@@ -292,4 +308,9 @@ public:
     bool isCollationSupported() const override { return data->isCollationSupported(); }
 };
 
+ColumnConst::Ptr createColumnConst(const ColumnPtr & column, Field value);
+ColumnConst::Ptr createColumnConst(const ColumnPtr & column, size_t const_value_index);
+ColumnConst::Ptr createColumnConstWithDefaultValue(const ColumnPtr  &column);
+
+
 }
diff --git a/src/Columns/ColumnDecimal.cpp b/src/Columns/ColumnDecimal.cpp
index 20fc5d8e1fe..c29cc201fed 100644
--- a/src/Columns/ColumnDecimal.cpp
+++ b/src/Columns/ColumnDecimal.cpp
@@ -42,46 +42,6 @@ int ColumnDecimal<T>::compareAt(size_t n, size_t m, const IColumn & rhs_, int) c
     return decimalLess<T>(b, a, other.scale, scale) ? 1 : (decimalLess<T>(a, b, scale, other.scale) ? -1 : 0);
 }
 
-template <is_decimal T>
-void ColumnDecimal<T>::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                     PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                     int direction, int nan_direction_hint) const
-{
-    return this->template doCompareColumn<ColumnDecimal<T>>(static_cast<const Self &>(rhs), rhs_row_num, row_indexes,
-                                                         compare_results, direction, nan_direction_hint);
-}
-
-template <is_decimal T>
-bool ColumnDecimal<T>::hasEqualValues() const
-{
-    return this->template hasEqualValuesImpl<ColumnDecimal<T>>();
-}
-
-template <is_decimal T>
-StringRef ColumnDecimal<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const
-{
-    constexpr size_t null_bit_size = sizeof(UInt8);
-    StringRef res;
-    char * pos;
-    if (null_bit)
-    {
-        res.size = * null_bit ? null_bit_size : null_bit_size + sizeof(T);
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-        memcpy(pos, null_bit, null_bit_size);
-        if (*null_bit) return res;
-        pos += null_bit_size;
-    }
-    else
-    {
-        res.size = sizeof(T);
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-    }
-    memcpy(pos, &data[n], sizeof(T));
-    return res;
-}
-
 template <is_decimal T>
 const char * ColumnDecimal<T>::deserializeAndInsertFromArena(const char * pos)
 {
@@ -159,7 +119,7 @@ void ColumnDecimal<T>::getPermutation(IColumn::PermutationSortDirection directio
     };
 
     size_t data_size = data.size();
-    res.resize(data_size);
+    res.resize_exact(data_size);
 
     if (limit >= data_size)
         limit = 0;
@@ -318,7 +278,7 @@ MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
     if (size > 0)
     {
         auto & new_col = static_cast<Self &>(*res);
-        new_col.data.resize(size);
+        new_col.data.resize_exact(size);
 
         size_t count = std::min(this->size(), size);
 
@@ -334,6 +294,16 @@ MutableColumnPtr ColumnDecimal<T>::cloneResized(size_t size) const
     return res;
 }
 
+template <is_decimal T>
+bool ColumnDecimal<T>::tryInsert(const Field & x)
+{
+    DecimalField<T> value;
+    if (!x.tryGet<DecimalField<T>>(value))
+        return false;
+    data.push_back(value);
+    return true;
+}
+
 template <is_decimal T>
 void ColumnDecimal<T>::insertData(const char * src, size_t /*length*/)
 {
@@ -369,7 +339,7 @@ ColumnPtr ColumnDecimal<T>::filter(const IColumn::Filter & filt, ssize_t result_
     Container & res_data = res->getData();
 
     if (result_size_hint)
-        res_data.reserve(result_size_hint > 0 ? result_size_hint : size);
+        res_data.reserve_exact(result_size_hint > 0 ? result_size_hint : size);
 
     const UInt8 * filt_pos = filt.data();
     const UInt8 * filt_end = filt_pos + size;
@@ -445,7 +415,7 @@ ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
         return res;
 
     typename Self::Container & res_data = res->getData();
-    res_data.reserve(offsets.back());
+    res_data.reserve_exact(offsets.back());
 
     IColumn::Offset prev_offset = 0;
     for (size_t i = 0; i < size; ++i)
@@ -460,12 +430,6 @@ ColumnPtr ColumnDecimal<T>::replicate(const IColumn::Offsets & offsets) const
     return res;
 }
 
-template <is_decimal T>
-void ColumnDecimal<T>::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 template <is_decimal T>
 ColumnPtr ColumnDecimal<T>::compress() const
 {
diff --git a/src/Columns/ColumnDecimal.h b/src/Columns/ColumnDecimal.h
index fb24ae4554b..e0ea26744dc 100644
--- a/src/Columns/ColumnDecimal.h
+++ b/src/Columns/ColumnDecimal.h
@@ -1,14 +1,12 @@
 #pragma once
 
-#include <cmath>
-
 #include <base/sort.h>
 #include <base/TypeName.h>
 #include <Core/Field.h>
 #include <Core/DecimalFunctions.h>
 #include <Core/TypeId.h>
 #include <Common/typeid_cast.h>
-#include <Columns/ColumnVectorHelper.h>
+#include <Columns/ColumnFixedSizeHelper.h>
 #include <Columns/IColumn.h>
 #include <Columns/IColumnImpl.h>
 
@@ -18,11 +16,11 @@ namespace DB
 
 /// A ColumnVector for Decimals
 template <is_decimal T>
-class ColumnDecimal final : public COWHelper<ColumnVectorHelper, ColumnDecimal<T>>
+class ColumnDecimal final : public COWHelper<IColumnHelper<ColumnDecimal<T>, ColumnFixedSizeHelper>, ColumnDecimal<T>>
 {
 private:
     using Self = ColumnDecimal;
-    friend class COWHelper<ColumnVectorHelper, Self>;
+    friend class COWHelper<IColumnHelper<Self, ColumnFixedSizeHelper>, Self>;
 
 public:
     using ValueType = T;
@@ -54,13 +52,22 @@ public:
     size_t byteSizeAt(size_t) const override { return sizeof(data[0]); }
     size_t allocatedBytes() const override { return data.allocated_bytes(); }
     void protect() override { data.protect(); }
-    void reserve(size_t n) override { data.reserve(n); }
+    void reserve(size_t n) override { data.reserve_exact(n); }
+    void shrinkToFit() override { data.shrink_to_fit(); }
 
     void insertFrom(const IColumn & src, size_t n) override { data.push_back(static_cast<const Self &>(src).getData()[n]); }
+
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override
+    {
+        ValueType v = assert_cast<const Self &>(src).getData()[position];
+        data.resize_fill(data.size() + length, v);
+    }
+
     void insertData(const char * src, size_t /*length*/) override;
     void insertDefault() override { data.push_back(T()); }
     void insertManyDefaults(size_t length) override { data.resize_fill(data.size() + length); }
     void insert(const Field & x) override { data.push_back(x.get<T>()); }
+    bool tryInsert(const Field & x) override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 
     void popBack(size_t n) override
@@ -80,17 +87,12 @@ public:
 
     Float64 getFloat64(size_t n) const final { return DecimalUtils::convertTo<Float64>(data[n], scale); }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
     int compareAt(size_t n, size_t m, const IColumn & rhs_, int nan_direction_hint) const override;
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
-    bool hasEqualValues() const override;
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                         size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
     void updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
@@ -117,13 +119,6 @@ public:
     ColumnPtr replicate(const IColumn::Offsets & offsets) const override;
     void getExtremes(Field & min, Field & max) const override;
 
-    MutableColumns scatter(IColumn::ColumnIndex num_columns, const IColumn::Selector & selector) const override
-    {
-        return this->template scatterImpl<Self>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     bool structureEquals(const IColumn & rhs) const override
     {
         if (auto rhs_concrete = typeid_cast<const ColumnDecimal<T> *>(&rhs))
@@ -131,21 +126,6 @@ public:
         return false;
     }
 
-    double getRatioOfDefaultRows(double sample_ratio) const override
-    {
-        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);
-    }
-
     ColumnPtr compress() const override;
 
     void insertValue(const T value) { data.push_back(value); }
diff --git a/src/Columns/ColumnVectorHelper.h b/src/Columns/ColumnFixedSizeHelper.h
similarity index 92%
rename from src/Columns/ColumnVectorHelper.h
rename to src/Columns/ColumnFixedSizeHelper.h
index b8ea6ca427f..0a42c034e42 100644
--- a/src/Columns/ColumnVectorHelper.h
+++ b/src/Columns/ColumnFixedSizeHelper.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-/** Allows to access internal array of ColumnVector or ColumnFixedString without cast to concrete type.
+/** Allows to access internal array of fixed-size column without cast to concrete type.
   * We will inherit ColumnVector and ColumnFixedString from this class instead of IColumn.
   * Assumes data layout of ColumnVector, ColumnFixedString and PODArray.
   *
@@ -22,7 +22,7 @@ namespace DB
   * To allow functional tests to work under UBSan we have to separate some base class that will present the memory layout in explicit way,
   *  and we will do static_cast to this class.
   */
-class ColumnVectorHelper : public IColumn
+class ColumnFixedSizeHelper : public IColumn
 {
 public:
     template <size_t ELEMENT_SIZE>
diff --git a/src/Columns/ColumnFixedString.cpp b/src/Columns/ColumnFixedString.cpp
index a18e5c522a1..b55f68d4687 100644
--- a/src/Columns/ColumnFixedString.cpp
+++ b/src/Columns/ColumnFixedString.cpp
@@ -2,7 +2,6 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
 
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteHelpers.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/Hash.h>
@@ -39,7 +38,7 @@ MutableColumnPtr ColumnFixedString::cloneResized(size_t size) const
     if (size > 0)
     {
         auto & new_col = assert_cast<ColumnFixedString &>(*new_col_holder);
-        new_col.chars.resize(size * n);
+        new_col.chars.resize_exact(size * n);
 
         size_t count = std::min(this->size(), size);
         memcpy(new_col.chars.data(), chars.data(), count * n * sizeof(chars[0]));
@@ -63,6 +62,17 @@ void ColumnFixedString::insert(const Field & x)
     insertData(s.data(), s.size());
 }
 
+bool ColumnFixedString::tryInsert(const Field & x)
+{
+    if (x.getType() != Field::Types::Which::String)
+        return false;
+    const String & s = x.get<const String &>();
+    if (s.size() > n)
+        return false;
+    insertData(s.data(), s.size());
+    return true;
+}
+
 void ColumnFixedString::insertFrom(const IColumn & src_, size_t index)
 {
     const ColumnFixedString & src = assert_cast<const ColumnFixedString &>(src_);
@@ -75,6 +85,20 @@ void ColumnFixedString::insertFrom(const IColumn & src_, size_t index)
     memcpySmallAllowReadWriteOverflow15(chars.data() + old_size, &src.chars[n * index], n);
 }
 
+void ColumnFixedString::insertManyFrom(const IColumn & src, size_t position, size_t length)
+{
+    const ColumnFixedString & src_concrete = assert_cast<const ColumnFixedString &>(src);
+    if (n != src_concrete.getN())
+        throw Exception(ErrorCodes::SIZE_OF_FIXED_STRING_DOESNT_MATCH, "Size of FixedString doesn't match");
+
+    const size_t old_size = chars.size();
+    const size_t new_size = old_size + n * length;
+    chars.resize(new_size);
+
+    for (size_t offset = old_size; offset < new_size; offset += n)
+        memcpySmallAllowReadWriteOverflow15(&chars[offset], &src_concrete.chars[n * position], n);
+}
+
 void ColumnFixedString::insertData(const char * pos, size_t length)
 {
     if (length > n)
@@ -86,30 +110,6 @@ void ColumnFixedString::insertData(const char * pos, size_t length)
     memset(chars.data() + old_size + length, 0, n - length);
 }
 
-StringRef ColumnFixedString::serializeValueIntoArena(size_t index, Arena & arena, char const *& begin, const UInt8 * null_bit) const
-{
-    constexpr size_t null_bit_size = sizeof(UInt8);
-    StringRef res;
-    char * pos;
-    if (null_bit)
-    {
-        res.size = * null_bit ? null_bit_size : null_bit_size + n;
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-        memcpy(pos, null_bit, null_bit_size);
-        if (*null_bit) return res;
-        pos += null_bit_size;
-    }
-    else
-    {
-        res.size = n;
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-    }
-    memcpy(pos, &chars[n * index], n);
-    return res;
-}
-
 const char * ColumnFixedString::deserializeAndInsertFromArena(const char * pos)
 {
     size_t old_size = chars.size();
@@ -203,6 +203,7 @@ void ColumnFixedString::updatePermutation(IColumn::PermutationSortDirection dire
 void ColumnFixedString::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     const ColumnFixedString & src_concrete = assert_cast<const ColumnFixedString &>(src);
+    chassert(this->n == src_concrete.n);
 
     if (start + length > src_concrete.size())
         throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND, "Parameters start = {}, length = {} are out of bound "
@@ -223,7 +224,7 @@ ColumnPtr ColumnFixedString::filter(const IColumn::Filter & filt, ssize_t result
     auto res = ColumnFixedString::create(n);
 
     if (result_size_hint)
-        res->chars.reserve(result_size_hint > 0 ? result_size_hint * n : chars.size());
+        res->chars.reserve_exact(result_size_hint > 0 ? result_size_hint * n : chars.size());
 
     const UInt8 * filt_pos = filt.data();
     const UInt8 * filt_end = filt_pos + col_size;
@@ -363,11 +364,6 @@ ColumnPtr ColumnFixedString::replicate(const Offsets & offsets) const
     return res;
 }
 
-void ColumnFixedString::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 void ColumnFixedString::getExtremes(Field & min, Field & max) const
 {
     min = String();
diff --git a/src/Columns/ColumnFixedString.h b/src/Columns/ColumnFixedString.h
index 445432b7b28..56d42e8b34e 100644
--- a/src/Columns/ColumnFixedString.h
+++ b/src/Columns/ColumnFixedString.h
@@ -6,7 +6,7 @@
 #include <Common/assert_cast.h>
 #include <Columns/IColumn.h>
 #include <Columns/IColumnImpl.h>
-#include <Columns/ColumnVectorHelper.h>
+#include <Columns/ColumnFixedSizeHelper.h>
 #include <Core/Field.h>
 
 
@@ -16,10 +16,10 @@ namespace DB
 /** A column of values of "fixed-length string" type.
   * If you insert a smaller string, it will be padded with zero bytes.
   */
-class ColumnFixedString final : public COWHelper<ColumnVectorHelper, ColumnFixedString>
+class ColumnFixedString final : public COWHelper<IColumnHelper<ColumnFixedString, ColumnFixedSizeHelper>, ColumnFixedString>
 {
 public:
-    friend class COWHelper<ColumnVectorHelper, ColumnFixedString>;
+    friend class COWHelper<IColumnHelper<ColumnFixedString, ColumnFixedSizeHelper>, ColumnFixedString>;
 
     using Chars = PaddedPODArray<UInt8>;
 
@@ -96,8 +96,12 @@ public:
 
     void insert(const Field & x) override;
 
+    bool tryInsert(const Field & x) override;
+
     void insertFrom(const IColumn & src_, size_t index) override;
 
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
+
     void insertData(const char * pos, size_t length) override;
 
     void insertDefault() override
@@ -105,7 +109,7 @@ public:
         chars.resize_fill(chars.size() + n);
     }
 
-    virtual void insertManyDefaults(size_t length) override
+    void insertManyDefaults(size_t length) override
     {
         chars.resize_fill(chars.size() + n * length);
     }
@@ -115,8 +119,6 @@ public:
         chars.resize_assume_reserved(chars.size() - n * elems);
     }
 
-    StringRef serializeValueIntoArena(size_t index, Arena & arena, char const *& begin, const UInt8 *) const override;
-
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
     const char * skipSerializedInArena(const char * pos) const override;
@@ -130,22 +132,10 @@ public:
     int compareAt(size_t p1, size_t p2, const IColumn & rhs_, int /*nan_direction_hint*/) const override
     {
         const ColumnFixedString & rhs = assert_cast<const ColumnFixedString &>(rhs_);
+        chassert(this->n == rhs.n);
         return memcmpSmallAllowOverflow15(chars.data() + p1 * n, rhs.chars.data() + p2 * n, n);
     }
 
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override
-    {
-        return doCompareColumn<ColumnFixedString>(assert_cast<const ColumnFixedString &>(rhs), rhs_row_num, row_indexes,
-                                               compare_results, direction, nan_direction_hint);
-    }
-
-    bool hasEqualValues() const override
-    {
-        return hasEqualValuesImpl<ColumnFixedString>();
-    }
-
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                     size_t limit, int nan_direction_hint, Permutation & res) const override;
 
@@ -167,18 +157,16 @@ public:
 
     ColumnPtr replicate(const Offsets & offsets) const override;
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override
-    {
-        return scatterImpl<ColumnFixedString>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     ColumnPtr compress() const override;
 
     void reserve(size_t size) override
     {
-        chars.reserve(n * size);
+        chars.reserve_exact(n * size);
+    }
+
+    void shrinkToFit() override
+    {
+        chars.shrink_to_fit();
     }
 
     void resize(size_t size)
@@ -195,21 +183,6 @@ public:
         return false;
     }
 
-    double getRatioOfDefaultRows(double sample_ratio) const override
-    {
-        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);
-    }
-
     bool canBeInsideNullable() const override { return true; }
 
     bool isFixedAndContiguous() const override { return true; }
diff --git a/src/Columns/ColumnFunction.cpp b/src/Columns/ColumnFunction.cpp
index d8eea26b7d5..0ab9d15ad50 100644
--- a/src/Columns/ColumnFunction.cpp
+++ b/src/Columns/ColumnFunction.cpp
@@ -308,6 +308,13 @@ ColumnWithTypeAndName ColumnFunction::reduce() const
         ProfileEvents::increment(ProfileEvents::CompiledFunctionExecute);
 
     res.column = function->execute(columns, res.type, elements_size);
+    if (res.column->getDataType() != res.type->getColumnType())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Unexpected return type from {}. Expected {}. Got {}",
+            function->getName(),
+            res.type->getColumnType(),
+            res.column->getDataType());
     if (recursively_convert_result_to_full_column_if_low_cardinality)
     {
         res.column = recursiveRemoveLowCardinality(res.column);
diff --git a/src/Columns/ColumnFunction.h b/src/Columns/ColumnFunction.h
index efcdc4e4419..6fdc6679d3e 100644
--- a/src/Columns/ColumnFunction.h
+++ b/src/Columns/ColumnFunction.h
@@ -19,10 +19,10 @@ using FunctionBasePtr = std::shared_ptr<const IFunctionBase>;
 /** A column containing a lambda expression.
   * Contains an expression and captured columns, but not input arguments.
   */
-class ColumnFunction final : public COWHelper<IColumn, ColumnFunction>
+class ColumnFunction final : public COWHelper<IColumnHelper<ColumnFunction>, ColumnFunction>
 {
 private:
-    friend class COWHelper<IColumn, ColumnFunction>;
+    friend class COWHelper<IColumnHelper<ColumnFunction>, ColumnFunction>;
 
     ColumnFunction(
         size_t size,
@@ -84,6 +84,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert into {}", getName());
     }
 
+    bool tryInsert(const Field &) override
+    {
+        return false;
+    }
+
     void insertDefault() override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert into {}", getName());
@@ -97,7 +102,7 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert into {}", getName());
     }
 
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const UInt8 *) const override
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot serialize from {}", getName());
     }
diff --git a/src/Columns/ColumnLowCardinality.cpp b/src/Columns/ColumnLowCardinality.cpp
index 41358a4e538..a3696c78669 100644
--- a/src/Columns/ColumnLowCardinality.cpp
+++ b/src/Columns/ColumnLowCardinality.cpp
@@ -2,7 +2,6 @@
 
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <DataTypes/NumberTraits.h>
 #include <Common/HashTable/HashMap.h>
 #include <Common/WeakHash.h>
@@ -137,7 +136,19 @@ ColumnLowCardinality::ColumnLowCardinality(MutableColumnPtr && column_unique_, M
 void ColumnLowCardinality::insert(const Field & x)
 {
     compactIfSharedDictionary();
-    idx.insertPosition(dictionary.getColumnUnique().uniqueInsert(x));
+    idx.insertPosition(getDictionary().uniqueInsert(x));
+}
+
+bool ColumnLowCardinality::tryInsert(const Field & x)
+{
+    compactIfSharedDictionary();
+
+    size_t index;
+    if (!dictionary.getColumnUnique().tryUniqueInsert(x, index))
+        return false;
+
+    idx.insertPosition(index);
+    return true;
 }
 
 void ColumnLowCardinality::insertDefault()
@@ -163,14 +174,14 @@ void ColumnLowCardinality::insertFrom(const IColumn & src, size_t n)
     {
         compactIfSharedDictionary();
         const auto & nested = *low_cardinality_src->getDictionary().getNestedColumn();
-        idx.insertPosition(dictionary.getColumnUnique().uniqueInsertFrom(nested, position));
+        idx.insertPosition(getDictionary().uniqueInsertFrom(nested, position));
     }
 }
 
 void ColumnLowCardinality::insertFromFullColumn(const IColumn & src, size_t n)
 {
     compactIfSharedDictionary();
-    idx.insertPosition(dictionary.getColumnUnique().uniqueInsertFrom(src, n));
+    idx.insertPosition(getDictionary().uniqueInsertFrom(src, n));
 }
 
 void ColumnLowCardinality::insertRangeFrom(const IColumn & src, size_t start, size_t length)
@@ -197,7 +208,7 @@ void ColumnLowCardinality::insertRangeFrom(const IColumn & src, size_t start, si
         auto src_nested = low_cardinality_src->getDictionary().getNestedColumn();
         auto used_keys = src_nested->index(*idx_map, 0);
 
-        auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(*used_keys, 0, used_keys->size());
+        auto inserted_indexes = getDictionary().uniqueInsertRangeFrom(*used_keys, 0, used_keys->size());
         idx.insertPositionsRange(*inserted_indexes->index(*sub_idx, 0), 0, length);
     }
 }
@@ -205,7 +216,7 @@ void ColumnLowCardinality::insertRangeFrom(const IColumn & src, size_t start, si
 void ColumnLowCardinality::insertRangeFromFullColumn(const IColumn & src, size_t start, size_t length)
 {
     compactIfSharedDictionary();
-    auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(src, start, length);
+    auto inserted_indexes = getDictionary().uniqueInsertRangeFrom(src, start, length);
     idx.insertPositionsRange(*inserted_indexes, 0, length);
 }
 
@@ -245,27 +256,50 @@ void ColumnLowCardinality::insertRangeFromDictionaryEncodedColumn(const IColumn
 {
     checkPositionsAreLimited(positions, keys.size());
     compactIfSharedDictionary();
-    auto inserted_indexes = dictionary.getColumnUnique().uniqueInsertRangeFrom(keys, 0, keys.size());
+    auto inserted_indexes = getDictionary().uniqueInsertRangeFrom(keys, 0, keys.size());
     idx.insertPositionsRange(*inserted_indexes->index(positions, 0), 0, positions.size());
 }
 
 void ColumnLowCardinality::insertData(const char * pos, size_t length)
 {
     compactIfSharedDictionary();
-    idx.insertPosition(dictionary.getColumnUnique().uniqueInsertData(pos, length));
+    idx.insertPosition(getDictionary().uniqueInsertData(pos, length));
 }
 
-StringRef ColumnLowCardinality::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnLowCardinality::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     return getDictionary().serializeValueIntoArena(getIndexes().getUInt(n), arena, begin);
 }
 
+char * ColumnLowCardinality::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    return getDictionary().serializeValueIntoMemory(getIndexes().getUInt(n), memory);
+}
+
+void ColumnLowCardinality::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+{
+    /// nullable is handled internally.
+    chassert(is_null == nullptr);
+    if (empty())
+        return;
+
+    size_t rows = size();
+    if (sizes.empty())
+        sizes.resize_fill(rows);
+    else if (sizes.size() != rows)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of sizes: {} doesn't match rows_num: {}. It is a bug", sizes.size(), rows);
+
+    PaddedPODArray<UInt64> dict_sizes;
+    getDictionary().collectSerializedValueSizes(dict_sizes, nullptr);
+    idx.collectSerializedValueSizes(sizes, dict_sizes);
+}
+
 const char * ColumnLowCardinality::deserializeAndInsertFromArena(const char * pos)
 {
     compactIfSharedDictionary();
 
     const char * new_pos;
-    idx.insertPosition(dictionary.getColumnUnique().uniqueDeserializeAndInsertFromArena(pos, new_pos));
+    idx.insertPosition(getDictionary().uniqueDeserializeAndInsertFromArena(pos, new_pos));
 
     return new_pos;
 }
@@ -296,11 +330,6 @@ void ColumnLowCardinality::updateHashFast(SipHash & hash) const
     getDictionary().getNestedColumn()->updateHashFast(hash);
 }
 
-void ColumnLowCardinality::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 MutableColumnPtr ColumnLowCardinality::cloneResized(size_t size) const
 {
     auto unique_ptr = dictionary.getColumnUniquePtr();
@@ -342,15 +371,6 @@ int ColumnLowCardinality::compareAtWithCollation(size_t n, size_t m, const IColu
     return compareAtImpl(n, m, rhs, nan_direction_hint, &collator);
 }
 
-void ColumnLowCardinality::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                         PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                         int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnLowCardinality>(
-            assert_cast<const ColumnLowCardinality &>(rhs), rhs_row_num, row_indexes,
-            compare_results, direction, nan_direction_hint);
-}
-
 bool ColumnLowCardinality::hasEqualValues() const
 {
     if (getDictionary().size() <= 1)
@@ -490,7 +510,7 @@ 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));
-    auto new_column_unique = Dictionary::compact(dictionary.getColumnUnique(), sub_positions);
+    auto new_column_unique = Dictionary::compact(getDictionary(), sub_positions);
     return ColumnLowCardinality::create(std::move(new_column_unique), std::move(sub_positions));
 }
 
@@ -800,6 +820,20 @@ void ColumnLowCardinality::Index::updateWeakHash(WeakHash32 & hash, WeakHash32 &
     callForType(std::move(update_weak_hash), size_of_type);
 }
 
+void ColumnLowCardinality::Index::collectSerializedValueSizes(
+    PaddedPODArray<UInt64> & sizes, const PaddedPODArray<UInt64> & dict_sizes) const
+{
+    auto func = [&](auto x)
+    {
+        using CurIndexType = decltype(x);
+        auto & data = getPositionsData<CurIndexType>();
+
+        size_t rows = sizes.size();
+        for (size_t i = 0; i < rows; ++i)
+            sizes[i] += dict_sizes[data[i]];
+    };
+    callForType(std::move(func), size_of_type);
+}
 
 ColumnLowCardinality::Dictionary::Dictionary(MutableColumnPtr && column_unique_, bool is_shared)
     : column_unique(std::move(column_unique_)), shared(is_shared)
diff --git a/src/Columns/ColumnLowCardinality.h b/src/Columns/ColumnLowCardinality.h
index 91bd5945fd9..e65cce4a1fb 100644
--- a/src/Columns/ColumnLowCardinality.h
+++ b/src/Columns/ColumnLowCardinality.h
@@ -1,9 +1,10 @@
 #pragma once
+
+#include <Columns/ColumnsNumber.h>
 #include <Columns/IColumn.h>
 #include <Columns/IColumnUnique.h>
-#include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
-#include "ColumnsNumber.h"
+#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -23,9 +24,9 @@ namespace ErrorCodes
  *
  * @note The indices column always contains the default value (empty StringRef) with the first index.
  */
-class ColumnLowCardinality final : public COWHelper<IColumn, ColumnLowCardinality>
+class ColumnLowCardinality final : public COWHelper<IColumnHelper<ColumnLowCardinality>, ColumnLowCardinality>
 {
-    friend class COWHelper<IColumn, ColumnLowCardinality>;
+    friend class COWHelper<IColumnHelper<ColumnLowCardinality>, ColumnLowCardinality>;
 
     ColumnLowCardinality(MutableColumnPtr && column_unique, MutableColumnPtr && indexes, bool is_shared = false);
     ColumnLowCardinality(const ColumnLowCardinality & other) = default;
@@ -34,7 +35,7 @@ public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
-    using Base = COWHelper<IColumn, ColumnLowCardinality>;
+    using Base = COWHelper<IColumnHelper<ColumnLowCardinality>, ColumnLowCardinality>;
     static Ptr create(const ColumnPtr & column_unique_, const ColumnPtr & indexes_, bool is_shared = false)
     {
         return ColumnLowCardinality::create(column_unique_->assumeMutable(), indexes_->assumeMutable(), is_shared);
@@ -74,6 +75,7 @@ public:
     }
 
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertDefault() override;
 
     void insertFrom(const IColumn & src, size_t n) override;
@@ -87,7 +89,10 @@ public:
 
     void popBack(size_t n) override { idx.popBack(n); }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
+
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
@@ -124,10 +129,6 @@ public:
 
     int compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const override;
 
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
-
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator &) const override;
 
     bool hasEqualValues() const override;
@@ -151,14 +152,13 @@ public:
 
     std::vector<MutableColumnPtr> scatter(ColumnIndex num_columns, const Selector & selector) const override;
 
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     void getExtremes(Field & min, Field & max) const override
     {
         return dictionary.getColumnUnique().getNestedColumn()->index(getIndexes(), 0)->getExtremes(min, max); /// TODO: optimize
     }
 
     void reserve(size_t n) override { idx.reserve(n); }
+    void shrinkToFit() override { idx.shrinkToFit(); }
 
     /// Don't count the dictionary size as it can be shared between different blocks.
     size_t byteSize() const override { return idx.getPositions()->byteSize(); }
@@ -295,6 +295,7 @@ public:
 
         void popBack(size_t n) { positions->popBack(n); }
         void reserve(size_t n) { positions->reserve(n); }
+        void shrinkToFit() { positions->shrinkToFit(); }
 
         UInt64 getMaxPositionForCurrentType() const;
 
@@ -312,6 +313,8 @@ public:
 
         void updateWeakHash(WeakHash32 & hash, WeakHash32 & dict_hash) const;
 
+        void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const PaddedPODArray<UInt64> & dict_sizes) const;
+
     private:
         WrappedPtr positions;
         size_t size_of_type = 0;
diff --git a/src/Columns/ColumnMap.cpp b/src/Columns/ColumnMap.cpp
index ddcde43ca23..57e8ba685b4 100644
--- a/src/Columns/ColumnMap.cpp
+++ b/src/Columns/ColumnMap.cpp
@@ -1,7 +1,5 @@
 #include <Columns/ColumnMap.h>
 #include <Columns/ColumnCompressed.h>
-#include <Columns/IColumnImpl.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 #include <Common/typeid_cast.h>
@@ -102,6 +100,15 @@ void ColumnMap::insert(const Field & x)
     nested->insert(Array(map.begin(), map.end()));
 }
 
+bool ColumnMap::tryInsert(const Field & x)
+{
+    if (x.getType() != Field::Types::Which::Map)
+        return false;
+
+    const auto & map = x.get<const Map &>();
+    return nested->tryInsert(Array(map.begin(), map.end()));
+}
+
 void ColumnMap::insertDefault()
 {
     nested->insertDefault();
@@ -111,11 +118,16 @@ void ColumnMap::popBack(size_t n)
     nested->popBack(n);
 }
 
-StringRef ColumnMap::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnMap::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     return nested->serializeValueIntoArena(n, arena, begin);
 }
 
+char * ColumnMap::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    return nested->serializeValueIntoMemory(n, memory);
+}
+
 const char * ColumnMap::deserializeAndInsertFromArena(const char * pos)
 {
     return nested->deserializeAndInsertFromArena(pos);
@@ -141,6 +153,16 @@ void ColumnMap::updateHashFast(SipHash & hash) const
     nested->updateHashFast(hash);
 }
 
+void ColumnMap::insertFrom(const IColumn & src, size_t n)
+{
+    nested->insertFrom(assert_cast<const ColumnMap &>(src).getNestedColumn(), n);
+}
+
+void ColumnMap::insertManyFrom(const IColumn & src, size_t position, size_t length)
+{
+    assert_cast<ColumnArray &>(*nested).insertManyFrom(assert_cast<const ColumnMap &>(src).getNestedColumn(), position, length);
+}
+
 void ColumnMap::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
     nested->insertRangeFrom(
@@ -194,19 +216,6 @@ int ColumnMap::compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direct
     return nested->compareAt(n, m, rhs_map.getNestedColumn(), nan_direction_hint);
 }
 
-void ColumnMap::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnMap>(assert_cast<const ColumnMap &>(rhs), rhs_row_num, row_indexes,
-                                        compare_results, direction, nan_direction_hint);
-}
-
-bool ColumnMap::hasEqualValues() const
-{
-    return hasEqualValuesImpl<ColumnMap>();
-}
-
 void ColumnMap::getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                             size_t limit, int nan_direction_hint, IColumn::Permutation & res) const
 {
@@ -219,16 +228,16 @@ void ColumnMap::updatePermutation(IColumn::PermutationSortDirection direction, I
     nested->updatePermutation(direction, stability, limit, nan_direction_hint, res, equal_ranges);
 }
 
-void ColumnMap::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 void ColumnMap::reserve(size_t n)
 {
     nested->reserve(n);
 }
 
+void ColumnMap::shrinkToFit()
+{
+    nested->shrinkToFit();
+}
+
 void ColumnMap::ensureOwnership()
 {
     nested->ensureOwnership();
@@ -291,21 +300,6 @@ bool ColumnMap::structureEquals(const IColumn & rhs) const
     return false;
 }
 
-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);
-}
-
 ColumnPtr ColumnMap::compress() const
 {
     auto compressed = nested->compress();
diff --git a/src/Columns/ColumnMap.h b/src/Columns/ColumnMap.h
index fde8a7e0e67..60aa69e7bf6 100644
--- a/src/Columns/ColumnMap.h
+++ b/src/Columns/ColumnMap.h
@@ -10,10 +10,10 @@ namespace DB
 
 /** Column, that stores a nested Array(Tuple(key, value)) column.
  */
-class ColumnMap final : public COWHelper<IColumn, ColumnMap>
+class ColumnMap final : public COWHelper<IColumnHelper<ColumnMap>, ColumnMap>
 {
 private:
-    friend class COWHelper<IColumn, ColumnMap>;
+    friend class COWHelper<IColumnHelper<ColumnMap>, ColumnMap>;
 
     WrappedPtr nested;
 
@@ -25,7 +25,7 @@ public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
-    using Base = COWHelper<IColumn, ColumnMap>;
+    using Base = COWHelper<IColumnHelper<ColumnMap>, ColumnMap>;
 
     static Ptr create(const ColumnPtr & keys, const ColumnPtr & values, const ColumnPtr & offsets)
     {
@@ -56,14 +56,18 @@ public:
     StringRef getDataAt(size_t n) const override;
     void insertData(const char * pos, size_t length) override;
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertDefault() override;
     void popBack(size_t n) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
     void updateWeakHash32(WeakHash32 & hash) const override;
     void updateHashFast(SipHash & hash) const override;
+    void insertFrom(const IColumn & src_, size_t n) override;
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
     void expand(const Filter & mask, bool inverted) override;
@@ -71,18 +75,14 @@ public:
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     ColumnPtr replicate(const Offsets & offsets) const override;
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
-    void gather(ColumnGathererStream & gatherer_stream) override;
     int compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const override;
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
-    bool hasEqualValues() const override;
     void getExtremes(Field & min, Field & max) const override;
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                         size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
     void updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                         size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override;
     void reserve(size_t n) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -91,9 +91,6 @@ public:
     void forEachSubcolumn(MutableColumnCallback callback) override;
     void forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback) 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 4ee6bb3d586..fa5fdfb8c21 100644
--- a/src/Columns/ColumnNullable.cpp
+++ b/src/Columns/ColumnNullable.cpp
@@ -1,19 +1,12 @@
 #include <Common/Arena.h>
 #include <Common/SipHash.h>
-#include <Common/NaNUtils.h>
-#include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/WeakHash.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnsDateTime.h>
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnCompressed.h>
 #include <Columns/ColumnLowCardinality.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 
 #if USE_EMBEDDED_COMPILER
 #include <DataTypes/Native.h>
@@ -28,7 +21,6 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int ILLEGAL_COLUMN;
-    extern const int SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT;
     extern const int NOT_IMPLEMENTED;
 }
 
@@ -38,7 +30,6 @@ ColumnNullable::ColumnNullable(MutableColumnPtr && nested_column_, MutableColumn
 {
     /// ColumnNullable cannot have constant nested column. But constant argument could be passed. Materialize it.
     nested_column = getNestedColumn().convertToFullColumnIfConst();
-    nested_type = nested_column->getDataType();
 
     if (!getNestedColumn().canBeInsideNullable())
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "{} cannot be inside Nullable column", getNestedColumn().getName());
@@ -97,7 +88,7 @@ MutableColumnPtr ColumnNullable::cloneResized(size_t new_size) const
 
     if (new_size > 0)
     {
-        new_null_map->getData().resize(new_size);
+        new_null_map->getData().resize_exact(new_size);
 
         size_t count = std::min(size(), new_size);
         memcpy(new_null_map->getData().data(), getNullMapData().data(), count * sizeof(getNullMapData()[0]));
@@ -139,77 +130,35 @@ void ColumnNullable::insertData(const char * pos, size_t length)
     }
 }
 
-StringRef ColumnNullable::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnNullable::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     const auto & arr = getNullMapData();
     static constexpr auto s = sizeof(arr[0]);
-    char * pos;
 
-    switch (nested_type)
-    {
-        case TypeIndex::UInt8:
-            return static_cast<const ColumnUInt8 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UInt16:
-            return static_cast<const ColumnUInt16 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UInt32:
-            return static_cast<const ColumnUInt32 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UInt64:
-            return static_cast<const ColumnUInt64 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UInt128:
-            return static_cast<const ColumnUInt128 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UInt256:
-            return static_cast<const ColumnUInt256 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int8:
-            return static_cast<const ColumnInt8 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int16:
-            return static_cast<const ColumnInt16 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int32:
-            return static_cast<const ColumnInt32 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int64:
-            return static_cast<const ColumnInt64 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int128:
-            return static_cast<const ColumnInt128 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Int256:
-            return static_cast<const ColumnInt256 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Float32:
-            return static_cast<const ColumnFloat32 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Float64:
-            return static_cast<const ColumnFloat64 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Date:
-            return static_cast<const ColumnDate *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Date32:
-            return static_cast<const ColumnDate32 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::DateTime:
-            return static_cast<const ColumnDateTime *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::DateTime64:
-            return static_cast<const ColumnDateTime64 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::String:
-            return static_cast<const ColumnString *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::FixedString:
-            return static_cast<const ColumnFixedString *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Decimal32:
-            return static_cast<const ColumnDecimal<Decimal32> *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Decimal64:
-            return static_cast<const ColumnDecimal<Decimal64> *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Decimal128:
-            return static_cast<const ColumnDecimal<Decimal128> *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::Decimal256:
-            return static_cast<const ColumnDecimal<Decimal256> *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::UUID:
-            return static_cast<const ColumnUUID *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::IPv4:
-            return static_cast<const ColumnIPv4 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        case TypeIndex::IPv6:
-            return static_cast<const ColumnIPv6 *>(nested_column.get())->serializeValueIntoArena(n, arena, begin, &arr[n]);
-        default:
-            pos = arena.allocContinue(s, begin);
-            memcpy(pos, &arr[n], s);
-            if (arr[n])
-                return StringRef(pos, s);
-            auto nested_ref = getNestedColumn().serializeValueIntoArena(n, arena, begin);
-            /// serializeValueIntoArena may reallocate memory. Have to use ptr from nested_ref.data and move it back.
-            return StringRef(nested_ref.data - s, nested_ref.size + s);
-    }
+    auto * pos = arena.allocContinue(s, begin);
+    memcpy(pos, &arr[n], s);
+
+    if (arr[n])
+        return StringRef(pos, s);
+
+    auto nested_ref = getNestedColumn().serializeValueIntoArena(n, arena, begin);
+
+    /// serializeValueIntoArena may reallocate memory. Have to use ptr from nested_ref.data and move it back.
+    return StringRef(nested_ref.data - s, nested_ref.size + s);
+}
+
+char * ColumnNullable::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    const auto & arr = getNullMapData();
+    static constexpr auto s = sizeof(arr[0]);
+
+    memcpy(memory, &arr[n], s);
+    ++memory;
+
+    if (arr[n])
+        return memory;
+
+    return getNestedColumn().serializeValueIntoMemory(n, memory);
 }
 
 const char * ColumnNullable::deserializeAndInsertFromArena(const char * pos)
@@ -259,6 +208,22 @@ void ColumnNullable::insert(const Field & x)
     }
 }
 
+bool ColumnNullable::tryInsert(const Field & x)
+{
+    if (x.isNull())
+    {
+        getNestedColumn().insertDefault();
+        getNullMapData().push_back(1);
+        return true;
+    }
+
+    if (!getNestedColumn().tryInsert(x))
+        return false;
+
+    getNullMapData().push_back(0);
+    return true;
+}
+
 void ColumnNullable::insertFrom(const IColumn & src, size_t n)
 {
     const ColumnNullable & src_concrete = assert_cast<const ColumnNullable &>(src);
@@ -266,6 +231,14 @@ void ColumnNullable::insertFrom(const IColumn & src, size_t n)
     getNullMapData().push_back(src_concrete.getNullMapData()[n]);
 }
 
+
+void ColumnNullable::insertManyFrom(const IColumn & src, size_t position, size_t length)
+{
+    const ColumnNullable & src_concrete = assert_cast<const ColumnNullable &>(src);
+    getNestedColumn().insertManyFrom(src_concrete.getNestedColumn(), position, length);
+    getNullMapColumn().insertManyFrom(src_concrete.getNullMapColumn(), position, length);
+}
+
 void ColumnNullable::insertFromNotNullable(const IColumn & src, size_t n)
 {
     getNestedColumn().insertFrom(src, n);
@@ -405,19 +378,6 @@ int ColumnNullable::compareAtWithCollation(size_t n, size_t m, const IColumn & r
     return compareAtImpl(n, m, rhs_, null_direction_hint, &collator);
 }
 
-void ColumnNullable::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                   PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                   int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnNullable>(assert_cast<const ColumnNullable &>(rhs), rhs_row_num, row_indexes,
-                                           compare_results, direction, nan_direction_hint);
-}
-
-bool ColumnNullable::hasEqualValues() const
-{
-    return hasEqualValuesImpl<ColumnNullable>();
-}
-
 void ColumnNullable::getPermutationImpl(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                                     size_t limit, int null_direction_hint, Permutation & res, const Collator * collator) const
 {
@@ -667,17 +627,18 @@ void ColumnNullable::updatePermutationWithCollation(const Collator & collator, I
     updatePermutationImpl(direction, stability, limit, null_direction_hint, res, equal_ranges, &collator);
 }
 
-void ColumnNullable::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 void ColumnNullable::reserve(size_t n)
 {
     getNestedColumn().reserve(n);
     getNullMapData().reserve(n);
 }
 
+void ColumnNullable::shrinkToFit()
+{
+    getNestedColumn().shrinkToFit();
+    getNullMapData().shrink_to_fit();
+}
+
 void ColumnNullable::ensureOwnership()
 {
     getNestedColumn().ensureOwnership();
@@ -823,28 +784,25 @@ void ColumnNullable::applyNullMap(const ColumnNullable & other)
 void ColumnNullable::checkConsistency() const
 {
     if (null_map->size() != getNestedColumn().size())
-        throw Exception(ErrorCodes::SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT,
-                        "Logical error: Sizes of nested column and null map of Nullable column are not equal");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Sizes of nested column and null map of Nullable column are not equal");
 }
 
-ColumnPtr ColumnNullable::createWithOffsets(const IColumn::Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const
+ColumnPtr ColumnNullable::createWithOffsets(const IColumn::Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const
 {
     ColumnPtr new_values;
     ColumnPtr new_null_map;
 
-    if (default_field.getType() == Field::Types::Null)
+    const ColumnNullable & nullable_column_with_default_value = assert_cast<const ColumnNullable &>(column_with_default_value.getDataColumn());
+    if (nullable_column_with_default_value.isNullAt(0))
     {
-        auto default_column = nested_column->cloneEmpty();
-        default_column->insertDefault();
-
         /// Value in main column, when null map is 1 is implementation defined. So, take any value.
-        new_values = nested_column->createWithOffsets(offsets, (*default_column)[0], total_rows, shift);
-        new_null_map = null_map->createWithOffsets(offsets, Field(1u), total_rows, shift);
+        new_values = nested_column->createWithOffsets(offsets, *createColumnConstWithDefaultValue(nested_column), total_rows, shift);
+        new_null_map = null_map->createWithOffsets(offsets, *createColumnConst(null_map, Field(1u)), total_rows, shift);
     }
     else
     {
-        new_values = nested_column->createWithOffsets(offsets, default_field, total_rows, shift);
-        new_null_map = null_map->createWithOffsets(offsets, Field(0u), total_rows, shift);
+        new_values = nested_column->createWithOffsets(offsets, *ColumnConst::create(nullable_column_with_default_value.getNestedColumnPtr(), 1), total_rows, shift);
+        new_null_map = null_map->createWithOffsets(offsets, *createColumnConst(null_map, Field(0u)), total_rows, shift);
     }
 
     return ColumnNullable::create(new_values, new_null_map);
@@ -890,10 +848,7 @@ ColumnPtr makeNullable(const ColumnPtr & column)
 
 ColumnPtr makeNullableOrLowCardinalityNullable(const ColumnPtr & column)
 {
-    if (isColumnNullable(*column))
-        return column;
-
-    if (isColumnLowCardinalityNullable(*column))
+    if (isColumnNullableOrLowCardinalityNullable(*column))
         return column;
 
     if (isColumnConst(*column))
@@ -919,4 +874,21 @@ ColumnPtr makeNullableSafe(const ColumnPtr & column)
     return column;
 }
 
+ColumnPtr makeNullableOrLowCardinalityNullableSafe(const ColumnPtr & column)
+{
+    if (isColumnNullableOrLowCardinalityNullable(*column))
+        return column;
+
+    if (isColumnConst(*column))
+        return ColumnConst::create(makeNullableOrLowCardinalityNullableSafe(assert_cast<const ColumnConst &>(*column).getDataColumnPtr()), column->size());
+
+    if (column->lowCardinality())
+        return assert_cast<const ColumnLowCardinality &>(*column).cloneNullable();
+
+    if (column->canBeInsideNullable())
+        return makeNullable(column);
+
+    return column;
+}
+
 }
diff --git a/src/Columns/ColumnNullable.h b/src/Columns/ColumnNullable.h
index b57fdf3064d..ef4bf4fa41b 100644
--- a/src/Columns/ColumnNullable.h
+++ b/src/Columns/ColumnNullable.h
@@ -1,12 +1,10 @@
 #pragma once
 
 #include <Columns/IColumn.h>
-#include <Columns/IColumnImpl.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 
-#include "Core/TypeId.h"
 #include "config.h"
 
 
@@ -27,10 +25,10 @@ using ConstNullMapPtr = const NullMap *;
 /// over a bitmap because columns are usually stored on disk as compressed
 /// files. In this regard, using a bitmap instead of a byte map would
 /// greatly complicate the implementation with little to no benefits.
-class ColumnNullable final : public COWHelper<IColumn, ColumnNullable>
+class ColumnNullable final : public COWHelper<IColumnHelper<ColumnNullable>, ColumnNullable>
 {
 private:
-    friend class COWHelper<IColumn, ColumnNullable>;
+    friend class COWHelper<IColumnHelper<ColumnNullable>, ColumnNullable>;
 
     ColumnNullable(MutableColumnPtr && nested_column_, MutableColumnPtr && null_map_);
     ColumnNullable(const ColumnNullable &) = default;
@@ -39,7 +37,7 @@ public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
-    using Base = COWHelper<IColumn, ColumnNullable>;
+    using Base = COWHelper<IColumnHelper<ColumnNullable>, ColumnNullable>;
     static Ptr create(const ColumnPtr & nested_column_, const ColumnPtr & null_map_)
     {
         return ColumnNullable::create(nested_column_->assumeMutable(), null_map_->assumeMutable());
@@ -63,12 +61,15 @@ public:
     StringRef getDataAt(size_t) const override;
     /// Will insert null value if pos=nullptr
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char * pos) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertFrom(const IColumn & src, size_t n) override;
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
 
     void insertFromNotNullable(const IColumn & src, size_t n);
     void insertRangeFromNotNullable(const IColumn & src, size_t start, size_t length);
@@ -95,11 +96,7 @@ public:
 
 #endif
 
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int null_direction_hint, const Collator &) const override;
-    bool hasEqualValues() const override;
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                         size_t limit, int null_direction_hint, Permutation & res) const override;
     void updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
@@ -109,6 +106,7 @@ public:
     void updatePermutationWithCollation(const Collator & collator, IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                         size_t limit, int null_direction_hint, Permutation & res, EqualRanges& equal_ranges) const override;
     void reserve(size_t n) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -122,13 +120,6 @@ public:
     // Special function for nullable minmax index
     void getExtremesNullLast(Field & min, Field & max) const;
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override
-    {
-        return scatterImpl<ColumnNullable>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     ColumnPtr compress() const override;
 
     void forEachSubcolumn(MutableColumnCallback callback) override
@@ -152,22 +143,7 @@ public:
         return false;
     }
 
-    double getRatioOfDefaultRows(double sample_ratio) const override
-    {
-        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);
-    }
-
-    ColumnPtr createWithOffsets(const Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const override;
+    ColumnPtr createWithOffsets(const Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const override;
 
     bool isNullable() const override { return true; }
     bool isFixedAndContiguous() const override { return false; }
@@ -213,8 +189,6 @@ public:
 private:
     WrappedPtr nested_column;
     WrappedPtr null_map;
-    // optimize serializeValueIntoArena
-    TypeIndex nested_type;
 
     template <bool negative>
     void applyNullMapImpl(const NullMap & map);
@@ -231,5 +205,6 @@ private:
 ColumnPtr makeNullable(const ColumnPtr & column);
 ColumnPtr makeNullableSafe(const ColumnPtr & column);
 ColumnPtr makeNullableOrLowCardinalityNullable(const ColumnPtr & column);
+ColumnPtr makeNullableOrLowCardinalityNullableSafe(const ColumnPtr & column);
 
 }
diff --git a/src/Columns/ColumnObject.cpp b/src/Columns/ColumnObject.cpp
index f7176568a1b..90ef974010c 100644
--- a/src/Columns/ColumnObject.cpp
+++ b/src/Columns/ColumnObject.cpp
@@ -2,6 +2,7 @@
 #include <Columns/ColumnObject.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
 #include <Common/iota.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/getLeastSupertype.h>
@@ -11,7 +12,6 @@
 #include <Interpreters/castColumn.h>
 #include <Interpreters/convertFieldToType.h>
 #include <Common/HashTable/HashSet.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <numeric>
 
 
@@ -20,12 +20,12 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
-    extern const int ILLEGAL_COLUMN;
+    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int DUPLICATE_COLUMN;
+    extern const int EXPERIMENTAL_FEATURE_ERROR;
+    extern const int ILLEGAL_COLUMN;
     extern const int NUMBER_OF_DIMENSIONS_MISMATCHED;
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
-    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 namespace
@@ -247,7 +247,7 @@ void ColumnObject::Subcolumn::checkTypes() const
         prefix_types.push_back(current_type);
         auto prefix_common_type = getLeastSupertype(prefix_types);
         if (!prefix_common_type->equals(*current_type))
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
                 "Data type {} of column at position {} cannot represent all columns from i-th prefix",
                 current_type->getName(), i);
     }
@@ -334,7 +334,18 @@ void ColumnObject::Subcolumn::insert(Field field, FieldInfo info)
     if (type_changed || info.need_convert)
         field = convertFieldToTypeOrThrow(field, *least_common_type.get());
 
-    data.back()->insert(field);
+    if (!data.back()->tryInsert(field))
+    {
+        /** Normalization of the field above is pretty complicated (it uses several FieldVisitors),
+          * so in the case of a bug, we may get mismatched types.
+          * The `IColumn::insert` method does not check the type of the inserted field, and it can lead to a segmentation fault.
+          * Therefore, we use the safer `tryInsert` method to get an exception instead of a segmentation fault.
+          */
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+            "Cannot insert field {} to column {}",
+            field.dump(), data.back()->dumpStructure());
+    }
+
     ++num_rows;
 }
 
@@ -475,7 +486,7 @@ void ColumnObject::Subcolumn::finalize()
             {
                 auto values = part->index(*offsets, offsets->size());
                 values = castColumn({values, from_type, ""}, to_type);
-                part = values->createWithOffsets(offsets_data, to_type->getDefault(), part_size, /*shift=*/ 0);
+                part = values->createWithOffsets(offsets_data, *createColumnConstWithDefaultValue(result_column->getPtr()), part_size, /*shift=*/ 0);
             }
         }
 
@@ -635,7 +646,7 @@ void ColumnObject::checkConsistency() const
     {
         if (num_rows != leaf->data.size())
         {
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Sizes of subcolumns are inconsistent in ColumnObject."
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Sizes of subcolumns are inconsistent in ColumnObject."
                 " Subcolumn '{}' has {} rows, but expected size is {}",
                 leaf->path.getPath(), leaf->data.size(), num_rows);
         }
@@ -715,6 +726,15 @@ void ColumnObject::insert(const Field & field)
     ++num_rows;
 }
 
+bool ColumnObject::tryInsert(const Field & field)
+{
+    if (field.getType() != Field::Types::Which::Object)
+        return false;
+
+    insert(field);
+    return true;
+}
+
 void ColumnObject::insertDefault()
 {
     for (auto & entry : subcolumns)
@@ -842,14 +862,6 @@ void ColumnObject::getPermutation(PermutationSortDirection, PermutationSortStabi
     iota(res.data(), res.size(), size_t(0));
 }
 
-void ColumnObject::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                 PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                 int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnObject>(assert_cast<const ColumnObject &>(rhs), rhs_row_num, row_indexes,
-                                        compare_results, direction, nan_direction_hint);
-}
-
 void ColumnObject::getExtremes(Field & min, Field & max) const
 {
     if (num_rows == 0)
@@ -864,16 +876,6 @@ void ColumnObject::getExtremes(Field & min, Field & max) const
     }
 }
 
-MutableColumns ColumnObject::scatter(ColumnIndex num_columns, const Selector & selector) const
-{
-    return scatterImpl<ColumnObject>(num_columns, selector);
-}
-
-void ColumnObject::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 const ColumnObject::Subcolumn & ColumnObject::getSubcolumn(const PathInData & key) const
 {
     if (const auto * node = subcolumns.findLeaf(key))
@@ -928,7 +930,7 @@ void ColumnObject::addSubcolumn(const PathInData & key, size_t new_size)
 void ColumnObject::addNestedSubcolumn(const PathInData & key, const FieldInfo & field_info, size_t new_size)
 {
     if (!key.hasNested())
-        throw Exception(ErrorCodes::LOGICAL_ERROR,
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
             "Cannot add Nested subcolumn, because path doesn't contain Nested");
 
     bool inserted = false;
@@ -938,7 +940,7 @@ void ColumnObject::addNestedSubcolumn(const PathInData & key, const FieldInfo &
     if (nested_node)
     {
         /// Find any leaf of Nested subcolumn.
-        const auto * leaf = subcolumns.findLeaf(nested_node, [&](const auto &) { return true; });
+        const auto * leaf = Subcolumns::findLeaf(nested_node, [&](const auto &) { return true; });
         assert(leaf);
 
         /// Recreate subcolumn with default values and the same sizes of arrays.
@@ -981,7 +983,7 @@ const ColumnObject::Subcolumns::Node * ColumnObject::getLeafOfTheSameNested(cons
     while (current_node)
     {
         /// Try to find the first Nested up to the current node.
-        const auto * node_nested = subcolumns.findParent(current_node,
+        const auto * node_nested = Subcolumns::findParent(current_node,
             [](const auto & candidate) { return candidate.isNested(); });
 
         if (!node_nested)
@@ -991,7 +993,7 @@ const ColumnObject::Subcolumns::Node * ColumnObject::getLeafOfTheSameNested(cons
         /// for the last rows.
         /// If there are no leaves, skip current node and find
         /// the next node up to the current.
-        leaf = subcolumns.findLeaf(node_nested,
+        leaf = Subcolumns::findLeaf(node_nested,
             [&](const auto & candidate)
             {
                 return candidate.data.size() > old_size;
diff --git a/src/Columns/ColumnObject.h b/src/Columns/ColumnObject.h
index 36a33a8f10f..e2936b27994 100644
--- a/src/Columns/ColumnObject.h
+++ b/src/Columns/ColumnObject.h
@@ -1,12 +1,10 @@
 #pragma once
 
+#include <Columns/IColumn.h>
 #include <Core/Field.h>
 #include <Core/Names.h>
-#include <Columns/IColumn.h>
-#include <Common/PODArray.h>
-#include <Common/HashTable/HashMap.h>
-#include <DataTypes/Serializations/JSONDataParser.h>
 #include <DataTypes/Serializations/SubcolumnsTree.h>
+#include <Common/PODArray.h>
 
 #include <DataTypes/IDataType.h>
 
@@ -48,7 +46,7 @@ FieldInfo getFieldInfo(const Field & field);
  *  a trie-like structure. ColumnObject is not suitable for writing into tables
  *  and it should be converted to Tuple with fixed set of subcolumns before that.
  */
-class ColumnObject final : public COWHelper<IColumn, ColumnObject>
+class ColumnObject final : public COWHelper<IColumnHelper<ColumnObject>, ColumnObject>
 {
 public:
     /** Class that represents one subcolumn.
@@ -209,6 +207,7 @@ public:
     void forEachSubcolumn(MutableColumnCallback callback) override;
     void forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback) override;
     void insert(const Field & field) override;
+    bool tryInsert(const Field & field) override;
     void insertDefault() override;
     void insertFrom(const IColumn & src, size_t n) override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
@@ -228,23 +227,17 @@ public:
 
     /// Order of rows in ColumnObject is undefined.
     void getPermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation & res) const override;
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
-
     void updatePermutation(PermutationSortDirection, PermutationSortStability, size_t, int, Permutation &, EqualRanges &) const override {}
     int compareAt(size_t, size_t, const IColumn &, int) const override { return 0; }
     void getExtremes(Field & min, Field & max) const override;
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
-    void gather(ColumnGathererStream & gatherer) override;
-
     /// All other methods throw exception.
 
     StringRef getDataAt(size_t) const override { throwMustBeConcrete(); }
     bool isDefaultAt(size_t) const override { throwMustBeConcrete(); }
     void insertData(const char *, size_t) override { throwMustBeConcrete(); }
-    StringRef serializeValueIntoArena(size_t, Arena &, char const *&, const UInt8 *) const override { throwMustBeConcrete(); }
+    StringRef serializeValueIntoArena(size_t, Arena &, char const *&) const override { throwMustBeConcrete(); }
+    char * serializeValueIntoMemory(size_t, char *) const override { throwMustBeConcrete(); }
     const char * deserializeAndInsertFromArena(const char *) override { throwMustBeConcrete(); }
     const char * skipSerializedInArena(const char *) const override { throwMustBeConcrete(); }
     void updateHashWithValue(size_t, SipHash &) const override { throwMustBeConcrete(); }
diff --git a/src/Columns/ColumnSparse.cpp b/src/Columns/ColumnSparse.cpp
index 02e6e9e56b4..3c08ebbf8b4 100644
--- a/src/Columns/ColumnSparse.cpp
+++ b/src/Columns/ColumnSparse.cpp
@@ -1,12 +1,14 @@
-#include <Columns/ColumnCompressed.h>
 #include <Columns/ColumnSparse.h>
-#include <Columns/ColumnTuple.h>
+
+#include <Columns/ColumnCompressed.h>
+#include <Columns/ColumnConst.h>
 #include <Columns/ColumnsCommon.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
+#include <Columns/ColumnTuple.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/SipHash.h>
 #include <Common/WeakHash.h>
 #include <Common/iota.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 #include <algorithm>
 #include <bit>
@@ -130,7 +132,7 @@ StringRef ColumnSparse::getDataAt(size_t n) const
 
 ColumnPtr ColumnSparse::convertToFullColumnIfSparse() const
 {
-    return values->createWithOffsets(getOffsetsData(), (*values)[0], _size, /*shift=*/ 1);
+    return values->createWithOffsets(getOffsetsData(), *createColumnConst(values, 0), _size, /*shift=*/ 1);
 }
 
 void ColumnSparse::insertSingleValue(const Inserter & inserter)
@@ -151,11 +153,16 @@ void ColumnSparse::insertData(const char * pos, size_t length)
     insertSingleValue([&](IColumn & column) { column.insertData(pos, length); });
 }
 
-StringRef ColumnSparse::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnSparse::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     return values->serializeValueIntoArena(getValueIndex(n), arena, begin);
 }
 
+char * ColumnSparse::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    return values->serializeValueIntoMemory(getValueIndex(n), memory);
+}
+
 const char * ColumnSparse::deserializeAndInsertFromArena(const char * pos)
 {
     const char * res = nullptr;
@@ -233,6 +240,15 @@ void ColumnSparse::insert(const Field & x)
     insertSingleValue([&](IColumn & column) { column.insert(x); });
 }
 
+bool ColumnSparse::tryInsert(const Field & x)
+{
+    if (!values->tryInsert(x))
+        return false;
+
+    insertSingleValue([&](IColumn &) {}); /// Value already inserted, use no-op inserter.
+    return true;
+}
+
 void ColumnSparse::insertFrom(const IColumn & src, size_t n)
 {
     if (const auto * src_sparse = typeid_cast<const ColumnSparse *>(&src))
@@ -301,7 +317,7 @@ ColumnPtr ColumnSparse::filter(const Filter & filt, ssize_t) const
     auto & res_offsets_data = assert_cast<ColumnUInt64 &>(*res_offsets).getData();
 
     Filter values_filter;
-    values_filter.reserve(values->size());
+    values_filter.reserve_exact(values->size());
     values_filter.push_back(1);
     size_t values_result_size_hint = 1;
 
@@ -330,7 +346,7 @@ ColumnPtr ColumnSparse::filter(const Filter & filt, ssize_t) const
     }
 
     auto res_values = values->filter(values_filter, values_result_size_hint);
-    return this->create(res_values, std::move(res_offsets), res_offset);
+    return create(res_values, std::move(res_offsets), res_offset);
 }
 
 void ColumnSparse::expand(const Filter & mask, bool inverted)
@@ -631,7 +647,7 @@ ColumnPtr ColumnSparse::replicate(const Offsets & replicate_offsets) const
         if (!offset_it.isDefault())
         {
             size_t replicate_size = replicate_offsets[i] - replicate_offsets[i - 1];
-            res_offsets_data.reserve(res_offsets_data.size() + replicate_size);
+            res_offsets_data.reserve_exact(res_offsets_data.size() + replicate_size);
             for (size_t row = replicate_offsets[i - 1]; row < replicate_offsets[i]; ++row)
             {
                 res_offsets_data.push_back(row);
@@ -720,16 +736,6 @@ UInt64 ColumnSparse::getNumberOfDefaultRows() const
     return _size - offsets->size();
 }
 
-MutableColumns ColumnSparse::scatter(ColumnIndex num_columns, const Selector & selector) const
-{
-    return scatterImpl<ColumnSparse>(num_columns, selector);
-}
-
-void ColumnSparse::gather(ColumnGathererStream & gatherer_stream)
-{
-    gatherer_stream.gather(*this);
-}
-
 ColumnPtr ColumnSparse::compress() const
 {
     auto values_compressed = values->compress();
diff --git a/src/Columns/ColumnSparse.h b/src/Columns/ColumnSparse.h
index 48c7422dd27..c1bd614102c 100644
--- a/src/Columns/ColumnSparse.h
+++ b/src/Columns/ColumnSparse.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Columns/IColumn.h>
-#include <Columns/IColumnImpl.h>
 #include <Columns/ColumnsNumber.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
@@ -18,10 +17,10 @@ namespace DB
  *  values contains also one default value at 0 position to make
  *  implementation of execution of functions and sorting more convenient.
  */
-class ColumnSparse final : public COWHelper<IColumn, ColumnSparse>
+class ColumnSparse final : public COWHelper<IColumnHelper<ColumnSparse>, ColumnSparse>
 {
 private:
-    friend class COWHelper<IColumn, ColumnSparse>;
+    friend class COWHelper<IColumnHelper<ColumnSparse>, ColumnSparse>;
 
     explicit ColumnSparse(MutableColumnPtr && values_);
     ColumnSparse(MutableColumnPtr && values_, MutableColumnPtr && offsets_, size_t size_);
@@ -31,7 +30,7 @@ public:
     static constexpr auto DEFAULT_ROWS_SEARCH_SAMPLE_RATIO = 0.1;
     static constexpr auto DEFAULT_RATIO_FOR_SPARSE_SERIALIZATION = 0.95;
 
-    using Base = COWHelper<IColumn, ColumnSparse>;
+    using Base = COWHelper<IColumnHelper<ColumnSparse>, ColumnSparse>;
     static Ptr create(const ColumnPtr & values_, const ColumnPtr & offsets_, size_t size_)
     {
         return Base::create(values_->assumeMutable(), offsets_->assumeMutable(), size_);
@@ -78,11 +77,13 @@ public:
 
     /// Will insert null value if pos=nullptr
     void insertData(const char * pos, size_t length) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char *) const override;
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertFrom(const IColumn & src, size_t n) override;
     void insertDefault() override;
     void insertManyDefaults(size_t length) override;
@@ -134,10 +135,6 @@ public:
     double getRatioOfDefaultRows(double sample_ratio) const override;
     UInt64 getNumberOfDefaultRows() const override;
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     ColumnPtr compress() const override;
 
     void forEachSubcolumn(MutableColumnCallback callback) override;
diff --git a/src/Columns/ColumnString.cpp b/src/Columns/ColumnString.cpp
index 50fe90ad8ef..37de17e41ba 100644
--- a/src/Columns/ColumnString.cpp
+++ b/src/Columns/ColumnString.cpp
@@ -4,7 +4,6 @@
 #include <Columns/ColumnsCommon.h>
 #include <Columns/ColumnCompressed.h>
 #include <Columns/MaskOperations.h>
-#include <Processors/Transforms/ColumnGathererTransform.h>
 #include <Common/Arena.h>
 #include <Common/HashTable/Hash.h>
 #include <Common/WeakHash.h>
@@ -27,7 +26,7 @@ namespace ErrorCodes
 
 
 ColumnString::ColumnString(const ColumnString & src)
-    : COWHelper<IColumn, ColumnString>(src),
+    : COWHelper<IColumnHelper<ColumnString>, ColumnString>(src),
     offsets(src.offsets.begin(), src.offsets.end()),
     chars(src.chars.begin(), src.chars.end())
 {
@@ -39,6 +38,27 @@ ColumnString::ColumnString(const ColumnString & src)
             last_offset, chars.size());
 }
 
+void ColumnString::insertManyFrom(const IColumn & src, size_t position, size_t length)
+{
+    const ColumnString & src_concrete = assert_cast<const ColumnString &>(src);
+    const UInt8 * src_buf = &src_concrete.chars[src_concrete.offsets[position - 1]];
+    const size_t src_buf_size
+        = src_concrete.offsets[position] - src_concrete.offsets[position - 1]; /// -1th index is Ok, see PaddedPODArray.
+
+    const size_t old_size = chars.size();
+    const size_t new_size = old_size + src_buf_size * length;
+    chars.resize(new_size);
+
+    const size_t old_rows = offsets.size();
+    offsets.resize(old_rows + length);
+
+    for (size_t current_offset = old_size; current_offset < new_size; current_offset += src_buf_size)
+        memcpySmallAllowReadWriteOverflow15(&chars[current_offset], src_buf, src_buf_size);
+
+    for (size_t i = 0, current_offset = old_size + src_buf_size; i < length; ++i, current_offset += src_buf_size)
+        offsets[old_rows + i] = current_offset;
+}
+
 
 MutableColumnPtr ColumnString::cloneResized(size_t to_size) const
 {
@@ -71,8 +91,8 @@ MutableColumnPtr ColumnString::cloneResized(size_t to_size) const
         /// Empty strings are just zero terminating bytes.
 
         res->chars.resize_fill(res->chars.size() + to_size - from_size);
+        res->offsets.resize_exact(to_size);
 
-        res->offsets.resize(to_size);
         for (size_t i = from_size; i < to_size; ++i)
         {
             ++offset;
@@ -213,34 +233,69 @@ ColumnPtr ColumnString::permute(const Permutation & perm, size_t limit) const
 }
 
 
-StringRef ColumnString::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const
+void ColumnString::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
 {
-    size_t string_size = sizeAt(n);
-    size_t offset = offsetAt(n);
-    constexpr size_t null_bit_size = sizeof(UInt8);
-    StringRef res;
-    char * pos;
-    if (null_bit)
+    if (empty())
+        return;
+
+    size_t rows = size();
+    if (sizes.empty())
+        sizes.resize_fill(rows);
+    else if (sizes.size() != rows)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of sizes: {} doesn't match rows_num: {}. It is a bug", sizes.size(), rows);
+
+    if (is_null)
     {
-        res.size = * null_bit ? null_bit_size : null_bit_size + sizeof(string_size) + string_size;
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-        memcpy(pos, null_bit, null_bit_size);
-        if (*null_bit) return res;
-        pos += null_bit_size;
+        for (size_t i = 0; i < rows; ++i)
+        {
+            if (is_null[i])
+            {
+                ++sizes[i];
+            }
+            else
+            {
+                size_t string_size = sizeAt(i);
+                sizes[i] += sizeof(string_size) + string_size + 1 /* null byte */;
+            }
+        }
     }
     else
     {
-        res.size = sizeof(string_size) + string_size;
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
+        for (size_t i = 0; i < rows; ++i)
+        {
+            size_t string_size = sizeAt(i);
+            sizes[i] += sizeof(string_size) + string_size;
+        }
     }
+}
+
+
+StringRef ColumnString::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+{
+    size_t string_size = sizeAt(n);
+    size_t offset = offsetAt(n);
+
+    StringRef res;
+    res.size = sizeof(string_size) + string_size;
+    char * pos = arena.allocContinue(res.size, begin);
     memcpy(pos, &string_size, sizeof(string_size));
     memcpy(pos + sizeof(string_size), &chars[offset], string_size);
+    res.data = pos;
 
     return res;
 }
 
+char * ColumnString::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    size_t string_size = sizeAt(n);
+    size_t offset = offsetAt(n);
+
+    memcpy(memory, &string_size, sizeof(string_size));
+    memory += sizeof(string_size);
+    memcpy(memory, &chars[offset], string_size);
+    return memory + string_size;
+}
+
 const char * ColumnString::deserializeAndInsertFromArena(const char * pos)
 {
     const size_t string_size = unalignedLoad<size_t>(pos);
@@ -303,20 +358,6 @@ ColumnPtr ColumnString::indexImpl(const PaddedPODArray<Type> & indexes, size_t l
     return res;
 }
 
-void ColumnString::compareColumn(
-    const IColumn & rhs, size_t rhs_row_num,
-    PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-    int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnString>(assert_cast<const ColumnString &>(rhs), rhs_row_num, row_indexes,
-                                         compare_results, direction, nan_direction_hint);
-}
-
-bool ColumnString::hasEqualValues() const
-{
-    return hasEqualValuesImpl<ColumnString>();
-}
-
 struct ColumnString::ComparatorBase
 {
     const ColumnString & parent;
@@ -440,6 +481,7 @@ void ColumnString::updatePermutationWithCollation(const Collator & collator, Per
             DefaultPartialSort());
 }
 
+
 ColumnPtr ColumnString::replicate(const Offsets & replicate_offsets) const
 {
     size_t col_size = size();
@@ -451,49 +493,50 @@ ColumnPtr ColumnString::replicate(const Offsets & replicate_offsets) const
     if (0 == col_size)
         return res;
 
-    Chars & res_chars = res->chars;
     Offsets & res_offsets = res->offsets;
-    res_chars.reserve(chars.size() / col_size * replicate_offsets.back());
-    res_offsets.reserve(replicate_offsets.back());
-
-    Offset prev_replicate_offset = 0;
-    Offset prev_string_offset = 0;
-    Offset current_new_offset = 0;
+    res_offsets.resize_exact(replicate_offsets.back());
 
+    Chars & res_chars = res->chars;
+    size_t res_chars_size = 0;
     for (size_t i = 0; i < col_size; ++i)
     {
-        size_t size_to_replicate = replicate_offsets[i] - prev_replicate_offset;
-        size_t string_size = offsets[i] - prev_string_offset;
+        size_t size_to_replicate = replicate_offsets[i] - replicate_offsets[i - 1];
+        size_t string_size = offsets[i] - offsets[i - 1];
+        res_chars_size += size_to_replicate * string_size;
+    }
+    res_chars.resize_exact(res_chars_size);
 
+    size_t curr_row = 0;
+    size_t curr_offset = 0;
+    for (size_t i = 0; i < col_size; ++i)
+    {
+        const size_t size_to_replicate = replicate_offsets[i] - replicate_offsets[i - 1];
+        const size_t string_size = offsets[i] - offsets[i-1];
+        const UInt8 * src = &chars[offsets[i - 1]];
         for (size_t j = 0; j < size_to_replicate; ++j)
         {
-            current_new_offset += string_size;
-            res_offsets.push_back(current_new_offset);
-
-            res_chars.resize(res_chars.size() + string_size);
             memcpySmallAllowReadWriteOverflow15(
-                &res_chars[res_chars.size() - string_size], &chars[prev_string_offset], string_size);
-        }
+                &res_chars[curr_offset], src, string_size);
 
-        prev_replicate_offset = replicate_offsets[i];
-        prev_string_offset = offsets[i];
+            curr_offset += string_size;
+            res_offsets[curr_row] = curr_offset;
+            ++curr_row;
+        }
     }
 
     return res;
 }
 
-
-void ColumnString::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
-
 void ColumnString::reserve(size_t n)
 {
-    offsets.reserve(n);
+    offsets.reserve_exact(n);
 }
 
+void ColumnString::shrinkToFit()
+{
+    chars.shrink_to_fit();
+    offsets.shrink_to_fit();
+}
 
 void ColumnString::getExtremes(Field & min, Field & max) const
 {
diff --git a/src/Columns/ColumnString.h b/src/Columns/ColumnString.h
index 345513248fd..2d1d69ced73 100644
--- a/src/Columns/ColumnString.h
+++ b/src/Columns/ColumnString.h
@@ -23,14 +23,14 @@ class Arena;
 
 /** Column for String values.
   */
-class ColumnString final : public COWHelper<IColumn, ColumnString>
+class ColumnString final : public COWHelper<IColumnHelper<ColumnString>, ColumnString>
 {
 public:
     using Char = UInt8;
     using Chars = PaddedPODArray<UInt8>;
 
 private:
-    friend class COWHelper<IColumn, ColumnString>;
+    friend class COWHelper<IColumnHelper<ColumnString>, ColumnString>;
 
     /// Maps i'th position to offset to i+1'th element. Last offset maps to the end of all chars (is the size of all chars).
     Offsets offsets;
@@ -128,6 +128,15 @@ public:
         offsets.push_back(new_size);
     }
 
+    bool tryInsert(const Field & x) override
+    {
+        if (x.getType() != Field::Types::Which::String)
+            return false;
+
+        insert(x);
+        return true;
+    }
+
     void insertFrom(const IColumn & src_, size_t n) override
     {
         const ColumnString & src = assert_cast<const ColumnString &>(src_);
@@ -151,6 +160,8 @@ public:
         }
     }
 
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
+
     void insertData(const char * pos, size_t length) override
     {
         const size_t old_size = chars.size();
@@ -170,7 +181,10 @@ public:
         offsets.resize_assume_reserved(offsets.size() - n);
     }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
 
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
@@ -225,12 +239,6 @@ public:
         return memcmpSmallAllowOverflow15(chars.data() + offsetAt(n), sizeAt(n) - 1, rhs.chars.data() + rhs.offsetAt(m), rhs.sizeAt(m) - 1);
     }
 
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
-
-    bool hasEqualValues() const override;
-
     /// Variant of compareAt for string comparison with respect of collation.
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs_, int, const Collator & collator) const override;
 
@@ -249,20 +257,13 @@ public:
 
     ColumnPtr replicate(const Offsets & replicate_offsets) const override;
 
-    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override
-    {
-        return scatterImpl<ColumnString>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     ColumnPtr compress() const override;
 
     void reserve(size_t n) override;
+    void shrinkToFit() override;
 
     void getExtremes(Field & min, Field & max) const override;
 
-
     bool canBeInsideNullable() const override { return true; }
 
     bool structureEquals(const IColumn & rhs) const override
@@ -270,21 +271,6 @@ public:
         return typeid(rhs) == typeid(ColumnString);
     }
 
-    double getRatioOfDefaultRows(double sample_ratio) const override
-    {
-        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);
-    }
-
     Chars & getChars() { return chars; }
     const Chars & getChars() const { return chars; }
 
diff --git a/src/Columns/ColumnStringHelpers.h b/src/Columns/ColumnStringHelpers.h
index 97b52506ae0..8c0faf724e4 100644
--- a/src/Columns/ColumnStringHelpers.h
+++ b/src/Columns/ColumnStringHelpers.h
@@ -37,9 +37,9 @@ class WriteHelper
             column.resize(rows);
         else
         {
-            column.getOffsets().reserve(rows);
+            column.getOffsets().reserve_exact(rows);
             /// Using coefficient 2 for initial size is arbitrary.
-            column.getChars().resize(rows * 2);
+            column.getChars().reserve_exact(rows * 2);
         }
         return column;
     }
diff --git a/src/Columns/ColumnTuple.cpp b/src/Columns/ColumnTuple.cpp
index 356bb0493d2..062bdadf9d2 100644
--- a/src/Columns/ColumnTuple.cpp
+++ b/src/Columns/ColumnTuple.cpp
@@ -3,15 +3,15 @@
 #include <Columns/ColumnCompressed.h>
 #include <Columns/IColumnImpl.h>
 #include <Core/Field.h>
+#include <Common/WeakHash.h>
+#include <Common/assert_cast.h>
+#include <Common/iota.h>
+#include <Common/typeid_cast.h>
 #include <DataTypes/Serializations/SerializationInfoTuple.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
 #include <base/sort.h>
-#include <Common/WeakHash.h>
-#include <Common/assert_cast.h>
-#include <Common/iota.h>
-#include <Common/typeid_cast.h>
 
 
 namespace DB
@@ -148,6 +148,31 @@ void ColumnTuple::insert(const Field & x)
         columns[i]->insert(tuple[i]);
 }
 
+bool ColumnTuple::tryInsert(const Field & x)
+{
+    if (x.getType() != Field::Types::Which::Tuple)
+        return false;
+
+    const auto & tuple = x.get<const Tuple &>();
+
+    const size_t tuple_size = columns.size();
+    if (tuple.size() != tuple_size)
+        return false;
+
+    for (size_t i = 0; i < tuple_size; ++i)
+    {
+        if (!columns[i]->tryInsert(tuple[i]))
+        {
+            for (size_t j = 0; j != i; ++j)
+                columns[i]->popBack(1);
+
+            return false;
+        }
+    }
+
+    return true;
+}
+
 void ColumnTuple::insertFrom(const IColumn & src_, size_t n)
 {
     const ColumnTuple & src = assert_cast<const ColumnTuple &>(src_);
@@ -160,6 +185,18 @@ void ColumnTuple::insertFrom(const IColumn & src_, size_t n)
         columns[i]->insertFrom(*src.columns[i], n);
 }
 
+void ColumnTuple::insertManyFrom(const IColumn & src, size_t position, size_t length)
+{
+    const ColumnTuple & src_tuple = assert_cast<const ColumnTuple &>(src);
+
+    const size_t tuple_size = columns.size();
+    if (src_tuple.columns.size() != tuple_size)
+        throw Exception(ErrorCodes::CANNOT_INSERT_VALUE_OF_DIFFERENT_SIZE_INTO_TUPLE, "Cannot insert value of different size into tuple");
+
+    for (size_t i = 0; i < tuple_size; ++i)
+        columns[i]->insertManyFrom(*src_tuple.columns[i], position, length);
+}
+
 void ColumnTuple::insertDefault()
 {
     for (auto & column : columns)
@@ -172,7 +209,7 @@ void ColumnTuple::popBack(size_t n)
         column->popBack(n);
 }
 
-StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     StringRef res(begin, 0);
     for (const auto & column : columns)
@@ -185,6 +222,14 @@ StringRef ColumnTuple::serializeValueIntoArena(size_t n, Arena & arena, char con
     return res;
 }
 
+char * ColumnTuple::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    for (const auto & column : columns)
+        memory = column->serializeValueIntoMemory(n, memory);
+
+    return memory;
+}
+
 const char * ColumnTuple::deserializeAndInsertFromArena(const char * pos)
 {
     for (auto & column : columns)
@@ -326,24 +371,11 @@ int ColumnTuple::compareAt(size_t n, size_t m, const IColumn & rhs, int nan_dire
     return compareAtImpl(n, m, rhs, nan_direction_hint);
 }
 
-void ColumnTuple::compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                                PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                                int direction, int nan_direction_hint) const
-{
-    return doCompareColumn<ColumnTuple>(assert_cast<const ColumnTuple &>(rhs), rhs_row_num, row_indexes,
-                                        compare_results, direction, nan_direction_hint);
-}
-
 int ColumnTuple::compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator & collator) const
 {
     return compareAtImpl(n, m, rhs, nan_direction_hint, &collator);
 }
 
-bool ColumnTuple::hasEqualValues() const
-{
-    return hasEqualValuesImpl<ColumnTuple>();
-}
-
 template <bool positive>
 struct ColumnTuple::Less
 {
@@ -432,11 +464,6 @@ void ColumnTuple::updatePermutationWithCollation(const Collator & collator, ICol
     updatePermutationImpl(direction, stability, limit, nan_direction_hint, res, equal_ranges, &collator);
 }
 
-void ColumnTuple::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 void ColumnTuple::reserve(size_t n)
 {
     const size_t tuple_size = columns.size();
@@ -444,6 +471,13 @@ void ColumnTuple::reserve(size_t n)
         getColumn(i).reserve(n);
 }
 
+void ColumnTuple::shrinkToFit()
+{
+    const size_t tuple_size = columns.size();
+    for (size_t i = 0; i < tuple_size; ++i)
+        getColumn(i).shrinkToFit();
+}
+
 void ColumnTuple::ensureOwnership()
 {
     const size_t tuple_size = columns.size();
@@ -560,21 +594,6 @@ ColumnPtr ColumnTuple::compress() const
         });
 }
 
-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);
-}
-
 void ColumnTuple::finalize()
 {
     for (auto & column : columns)
diff --git a/src/Columns/ColumnTuple.h b/src/Columns/ColumnTuple.h
index 79099f4c098..5b626155754 100644
--- a/src/Columns/ColumnTuple.h
+++ b/src/Columns/ColumnTuple.h
@@ -12,10 +12,10 @@ namespace DB
   * Mixed constant/non-constant columns is prohibited in tuple
   *  for implementation simplicity.
   */
-class ColumnTuple final : public COWHelper<IColumn, ColumnTuple>
+class ColumnTuple final : public COWHelper<IColumnHelper<ColumnTuple>, ColumnTuple>
 {
 private:
-    friend class COWHelper<IColumn, ColumnTuple>;
+    friend class COWHelper<IColumnHelper<ColumnTuple>, ColumnTuple>;
 
     using TupleColumns = std::vector<WrappedPtr>;
     TupleColumns columns;
@@ -30,7 +30,7 @@ public:
     /** Create immutable column using immutable arguments. This arguments may be shared with other columns.
       * Use IColumn::mutate in order to make mutable column and mutate shared nested columns.
       */
-    using Base = COWHelper<IColumn, ColumnTuple>;
+    using Base = COWHelper<IColumnHelper<ColumnTuple>, ColumnTuple>;
     static Ptr create(const Columns & columns);
     static Ptr create(const TupleColumns & columns);
     static Ptr create(Columns && arg) { return create(arg); }
@@ -58,10 +58,13 @@ public:
     StringRef getDataAt(size_t n) const override;
     void insertData(const char * pos, size_t length) override;
     void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
     void insertFrom(const IColumn & src_, size_t n) override;
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
     void insertDefault() override;
     void popBack(size_t n) override;
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
     const char * deserializeAndInsertFromArena(const char * pos) override;
     const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash) const override;
@@ -74,13 +77,8 @@ public:
     ColumnPtr index(const IColumn & indexes, size_t limit) const override;
     ColumnPtr replicate(const Offsets & offsets) const override;
     MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
-    void gather(ColumnGathererStream & gatherer_stream) override;
     int compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const override;
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override;
     int compareAtWithCollation(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint, const Collator & collator) const override;
-    bool hasEqualValues() const override;
     void getExtremes(Field & min, Field & max) const override;
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                     size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
@@ -91,6 +89,7 @@ public:
     void updatePermutationWithCollation(const Collator & collator, IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                     size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges& equal_ranges) const override;
     void reserve(size_t n) override;
+    void shrinkToFit() override;
     void ensureOwnership() override;
     size_t byteSize() const override;
     size_t byteSizeAt(size_t n) const override;
@@ -101,9 +100,6 @@ public:
     bool structureEquals(const IColumn & rhs) const override;
     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.cpp b/src/Columns/ColumnUnique.cpp
new file mode 100644
index 00000000000..edfee69a752
--- /dev/null
+++ b/src/Columns/ColumnUnique.cpp
@@ -0,0 +1,25 @@
+#include <Columns/ColumnUnique.h>
+
+namespace DB
+{
+
+/// Explicit template instantiations.
+template class ColumnUnique<ColumnInt8>;
+template class ColumnUnique<ColumnUInt8>;
+template class ColumnUnique<ColumnInt16>;
+template class ColumnUnique<ColumnUInt16>;
+template class ColumnUnique<ColumnInt32>;
+template class ColumnUnique<ColumnUInt32>;
+template class ColumnUnique<ColumnInt64>;
+template class ColumnUnique<ColumnUInt64>;
+template class ColumnUnique<ColumnInt128>;
+template class ColumnUnique<ColumnUInt128>;
+template class ColumnUnique<ColumnInt256>;
+template class ColumnUnique<ColumnUInt256>;
+template class ColumnUnique<ColumnFloat32>;
+template class ColumnUnique<ColumnFloat64>;
+template class ColumnUnique<ColumnString>;
+template class ColumnUnique<ColumnFixedString>;
+template class ColumnUnique<ColumnDateTime64>;
+
+}
diff --git a/src/Columns/ColumnUnique.h b/src/Columns/ColumnUnique.h
index bd93dda988f..a8873140817 100644
--- a/src/Columns/ColumnUnique.h
+++ b/src/Columns/ColumnUnique.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Columns/IColumnUnique.h>
-#include <Columns/IColumnImpl.h>
 #include <Columns/ReverseIndex.h>
 
 #include <Columns/ColumnVector.h>
@@ -16,6 +15,8 @@
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 #include <Common/FieldVisitors.h>
+#include "Columns/ColumnsDateTime.h"
+#include "Columns/ColumnsNumber.h"
 
 #include <base/range.h>
 #include <base/unaligned.h>
@@ -56,6 +57,7 @@ public:
     void nestedRemoveNullable() override;
 
     size_t uniqueInsert(const Field & x) override;
+    bool tryUniqueInsert(const Field & x, size_t & index) override;
     size_t uniqueInsertFrom(const IColumn & src, size_t n) override;
     MutableColumnPtr uniqueInsertRangeFrom(const IColumn & src, size_t start, size_t length) override;
     IColumnUnique::IndexesWithOverflow uniqueInsertRangeWithOverflow(const IColumn & src, size_t start, size_t length,
@@ -79,7 +81,9 @@ public:
     Float32 getFloat32(size_t n) const override { return getNestedColumn()->getFloat32(n); }
     bool getBool(size_t n) const override { return getNestedColumn()->getBool(n); }
     bool isNullAt(size_t n) const override { return is_nullable && n == getNullValueIndex(); }
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const override;
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
     const char * skipSerializedInArena(const char * pos) const override;
     void updateHashWithValue(size_t n, SipHash & hash_func) const override
     {
@@ -346,6 +350,26 @@ size_t ColumnUnique<ColumnType>::uniqueInsert(const Field & x)
     return uniqueInsertData(single_value_data.data, single_value_data.size);
 }
 
+template <typename ColumnType>
+bool ColumnUnique<ColumnType>::tryUniqueInsert(const Field & x, size_t & index)
+{
+    if (x.isNull())
+    {
+        if (!is_nullable)
+            return false;
+        index = getNullValueIndex();
+        return true;
+    }
+
+    auto single_value_column = column_holder->cloneEmpty();
+    if (!single_value_column->tryInsert(x))
+        return false;
+
+    auto single_value_data = single_value_column->getDataAt(0);
+    index = uniqueInsertData(single_value_data.data, single_value_data.size);
+    return true;
+}
+
 template <typename ColumnType>
 size_t ColumnUnique<ColumnType>::uniqueInsertFrom(const IColumn & src, size_t n)
 {
@@ -373,7 +397,21 @@ size_t ColumnUnique<ColumnType>::uniqueInsertData(const char * pos, size_t lengt
 }
 
 template <typename ColumnType>
-StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 *) const
+void ColumnUnique<ColumnType>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+{
+    /// nullable is handled internally.
+    chassert(is_null == nullptr);
+    if (IColumn::empty())
+        return;
+
+    if (is_nullable)
+        column_holder->collectSerializedValueSizes(sizes, assert_cast<const ColumnUInt8 &>(*nested_null_mask).getData().data());
+    else
+        column_holder->collectSerializedValueSizes(sizes, nullptr);
+}
+
+template <typename ColumnType>
+StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
 {
     if (is_nullable)
     {
@@ -396,6 +434,22 @@ StringRef ColumnUnique<ColumnType>::serializeValueIntoArena(size_t n, Arena & ar
     return column_holder->serializeValueIntoArena(n, arena, begin);
 }
 
+template <typename ColumnType>
+char * ColumnUnique<ColumnType>::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    if (is_nullable)
+    {
+        UInt8 flag = (n == getNullValueIndex() ? 1 : 0);
+        unalignedStore<UInt8>(memory, flag);
+        ++memory;
+
+        if (n == getNullValueIndex())
+            return memory;
+    }
+
+    return column_holder->serializeValueIntoMemory(n, memory);
+}
+
 template <typename ColumnType>
 size_t ColumnUnique<ColumnType>::uniqueDeserializeAndInsertFromArena(const char * pos, const char *& new_pos)
 {
@@ -617,7 +671,7 @@ IColumnUnique::IndexesWithOverflow ColumnUnique<ColumnType>::uniqueInsertRangeWi
     size_t max_dictionary_size)
 {
     auto overflowed_keys = column_holder->cloneEmpty();
-    auto overflowed_keys_ptr = typeid_cast<ColumnType *>(overflowed_keys.get());
+    auto * overflowed_keys_ptr = typeid_cast<ColumnType *>(overflowed_keys.get());
     if (!overflowed_keys_ptr)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid keys type for ColumnUnique.");
 
@@ -684,4 +738,23 @@ UInt128 ColumnUnique<ColumnType>::IncrementalHash::getHash(const ColumnType & co
     return cur_hash;
 }
 
+
+extern template class ColumnUnique<ColumnInt8>;
+extern template class ColumnUnique<ColumnUInt8>;
+extern template class ColumnUnique<ColumnInt16>;
+extern template class ColumnUnique<ColumnUInt16>;
+extern template class ColumnUnique<ColumnInt32>;
+extern template class ColumnUnique<ColumnUInt32>;
+extern template class ColumnUnique<ColumnInt64>;
+extern template class ColumnUnique<ColumnUInt64>;
+extern template class ColumnUnique<ColumnInt128>;
+extern template class ColumnUnique<ColumnUInt128>;
+extern template class ColumnUnique<ColumnInt256>;
+extern template class ColumnUnique<ColumnUInt256>;
+extern template class ColumnUnique<ColumnFloat32>;
+extern template class ColumnUnique<ColumnFloat64>;
+extern template class ColumnUnique<ColumnString>;
+extern template class ColumnUnique<ColumnFixedString>;
+extern template class ColumnUnique<ColumnDateTime64>;
+
 }
diff --git a/src/Columns/ColumnVariant.cpp b/src/Columns/ColumnVariant.cpp
new file mode 100644
index 00000000000..31e9b0964f4
--- /dev/null
+++ b/src/Columns/ColumnVariant.cpp
@@ -0,0 +1,1429 @@
+#include <Columns/ColumnVariant.h>
+
+#include <Columns/ColumnCompressed.h>
+#include <Columns/ColumnsCommon.h>
+#include <Core/Field.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
+#include <Common/WeakHash.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+#include <Common/Arena.h>
+#include <Common/SipHash.h>
+#include <Common/HashTable/Hash.h>
+#include <DataTypes/Serializations/SerializationInfoTuple.h>
+#include <Columns/MaskOperations.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
+    extern const int PARAMETER_OUT_OF_BOUND;
+    extern const int SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT;
+    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+}
+
+std::string ColumnVariant::getName() const
+{
+    WriteBufferFromOwnString res;
+    res << "Variant(";
+    bool is_first = true;
+    for (const auto & local_variant : global_to_local_discriminators)
+    {
+        if (!is_first)
+            res << ", ";
+        is_first = false;
+        res << variants[local_variant]->getName();
+    }
+    res << ")";
+    return res.str();
+}
+
+
+void ColumnVariant::initIdentityGlobalToLocalDiscriminatorsMapping()
+{
+    local_to_global_discriminators.reserve(variants.size());
+    global_to_local_discriminators.reserve(variants.size());
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        local_to_global_discriminators.push_back(i);
+        global_to_local_discriminators.push_back(i);
+    }
+}
+
+ColumnVariant::ColumnVariant(MutableColumns && variants_) : ColumnVariant(std::move(variants_), {})
+{
+}
+
+ColumnVariant::ColumnVariant(MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_)
+{
+    /// Empty local_to_global_discriminators mapping means that variants are already in the global order.
+    if (!local_to_global_discriminators_.empty() && local_to_global_discriminators_.size() != variants_.size())
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "The number of values in local_to_global_discriminators mapping ({}) doesn't match the number of variants ({})",
+            local_to_global_discriminators_.size(),
+            variants_.size());
+
+    /// As variants are empty, column with local discriminators will be also empty and we can reorder variants according to global discriminators.
+    variants.resize(variants_.size());
+    for (size_t i = 0; i != variants_.size(); ++i)
+    {
+        if (isColumnConst(*variants_[i]))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "ColumnVariant cannot have ColumnConst as its element");
+
+        if (!variants_[i]->empty())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not empty column passed to ColumnVariant, but no local_discriminators passed");
+
+        if (!local_to_global_discriminators_.empty() && local_to_global_discriminators_[i] > variants_.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid global discriminator {}. The number of variants: {}", UInt64(local_to_global_discriminators_[i]), variants_.size());
+
+        if (local_to_global_discriminators_.empty())
+            variants[i] = std::move(variants_[i]);
+        else
+            variants[local_to_global_discriminators_[i]] = std::move(variants_[i]);
+    }
+
+    local_discriminators = ColumnDiscriminators::create();
+    offsets = ColumnOffsets::create();
+
+    /// Now global and local discriminators are the same.
+    initIdentityGlobalToLocalDiscriminatorsMapping();
+}
+
+ColumnVariant::ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumns && variants_) : ColumnVariant(std::move(local_discriminators_), nullptr, std::move(variants_), {})
+{
+}
+
+ColumnVariant::ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_) : ColumnVariant(std::move(local_discriminators_), nullptr, std::move(variants_), local_to_global_discriminators_)
+{
+}
+
+ColumnVariant::ColumnVariant(DB::MutableColumnPtr local_discriminators_, DB::MutableColumnPtr offsets_, DB::MutableColumns && variants_) : ColumnVariant(std::move(local_discriminators_), std::move(offsets_), std::move(variants_), {})
+{
+}
+
+ColumnVariant::ColumnVariant(DB::MutableColumnPtr local_discriminators_, DB::MutableColumnPtr offsets_, DB::MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_)
+{
+    if (variants_.size() > MAX_NESTED_COLUMNS)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Variant type with more than {} nested types is not allowed", ColumnVariant::MAX_NESTED_COLUMNS);
+
+    local_discriminators = std::move(local_discriminators_);
+    const ColumnDiscriminators * discriminators_concrete = typeid_cast<const ColumnDiscriminators *>(local_discriminators.get());
+    if (!discriminators_concrete)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "discriminator column must be a ColumnUInt8");
+
+    variants.reserve(variants_.size());
+    size_t total_size = 0;
+    for (auto & variant : variants_)
+    {
+        if (isColumnConst(*variant))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "ColumnVariant cannot have ColumnConst as its element");
+
+        total_size += variant->size();
+        variants.push_back(std::move(variant));
+    }
+
+    /// We can have more discriminators than values in columns
+    /// (because of NULL discriminators), but not less.
+    if (total_size > local_discriminators->size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Nested columns sizes are inconsistent with local_discriminators column size. Total column sizes: {}, local_discriminators size: {}", total_size, local_discriminators->size());
+
+    if (offsets_)
+    {
+        if (!typeid_cast<const ColumnOffsets *>(offsets_.get()))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "offsets column must be a ColumnUInt64");
+
+        offsets = std::move(offsets_);
+    }
+    else
+    {
+        /// If no offsets column was provided, construct offsets based on discriminators.
+        offsets = ColumnOffsets::create();
+        Offsets & offsets_data = typeid_cast<ColumnOffsets *>(offsets.get())->getData();
+        offsets_data.reserve(discriminators_concrete->size());
+        /// If we have only NULLs, offsets column will not contain any real offsets.
+        if (hasOnlyNulls())
+        {
+            offsets_data.resize(discriminators_concrete->size());
+        }
+        /// If we have only one non empty variant and no NULLs,
+        /// offsets column will contain just sequential offsets 0, 1, 2, ...
+        else if (getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+        {
+            for (size_t i = 0; i != discriminators_concrete->size(); ++i)
+                offsets_data.push_back(i);
+        }
+        /// Otherwise we should iterate through discriminators and
+        /// remember current offset for each variant column.
+        else
+        {
+            std::vector<Offset> nested_offsets;
+            nested_offsets.resize(variants.size());
+            for (Discriminator discr : discriminators_concrete->getData())
+            {
+                if (discr == NULL_DISCRIMINATOR)
+                    offsets_data.emplace_back();
+                else
+                    offsets_data.push_back(nested_offsets[discr]++);
+            }
+        }
+    }
+
+    /// Empty global_discriminators means that variants are already in global order.
+    if (local_to_global_discriminators_.empty())
+    {
+        initIdentityGlobalToLocalDiscriminatorsMapping();
+    }
+    else
+    {
+        if (local_to_global_discriminators_.size() != variants.size())
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "The number of values in local_to_global_discriminators mapping ({}) doesn't match the number of variants ({})",
+                local_to_global_discriminators_.size(),
+                variants.size());
+
+        local_to_global_discriminators = local_to_global_discriminators_;
+        global_to_local_discriminators.resize(local_to_global_discriminators.size());
+        /// Create mapping global discriminator -> local discriminator
+        for (size_t i = 0; i != local_to_global_discriminators.size(); ++i)
+        {
+            if (local_to_global_discriminators[i] > variants.size())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid global discriminator {}. The number of variants: {}", UInt64(local_to_global_discriminators[i]), variants_.size());
+
+            global_to_local_discriminators[local_to_global_discriminators[i]] = i;
+        }
+    }
+}
+
+namespace
+{
+
+MutableColumns getVariantsAssumeMutable(const Columns & variants)
+{
+    MutableColumns mutable_variants;
+
+    for (const auto & variant : variants)
+    {
+        if (isColumnConst(*variant))
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "ColumnVariant cannot have ColumnConst as its element");
+        mutable_variants.emplace_back(variant->assumeMutable());
+    }
+
+    return mutable_variants;
+}
+
+}
+
+ColumnVariant::Ptr ColumnVariant::create(const Columns & variants, const std::vector<Discriminator> & local_to_global_discriminators)
+{
+    return ColumnVariant::create(getVariantsAssumeMutable(variants), local_to_global_discriminators);
+}
+
+ColumnVariant::Ptr ColumnVariant::create(const DB::ColumnPtr & local_discriminators, const DB::Columns & variants, const std::vector<Discriminator> & local_to_global_discriminators)
+{
+    return ColumnVariant::create(local_discriminators->assumeMutable(), getVariantsAssumeMutable(variants), local_to_global_discriminators);
+}
+
+ColumnVariant::Ptr ColumnVariant::create(const DB::ColumnPtr & local_discriminators, const DB::ColumnPtr & offsets, const DB::Columns & variants, const std::vector<Discriminator> & local_to_global_discriminators)
+{
+    return ColumnVariant::create(local_discriminators->assumeMutable(), offsets->assumeMutable(), getVariantsAssumeMutable(variants), local_to_global_discriminators);
+}
+
+MutableColumnPtr ColumnVariant::cloneEmpty() const
+{
+    MutableColumns new_variants;
+    new_variants.reserve(variants.size());
+    for (const auto & variant : variants)
+        new_variants.emplace_back(variant->cloneEmpty());
+
+    return ColumnVariant::create(std::move(new_variants), local_to_global_discriminators);
+}
+
+MutableColumnPtr ColumnVariant::cloneResized(size_t new_size) const
+{
+    if (new_size == 0)
+        return cloneEmpty();
+
+    const size_t num_variants = variants.size();
+    size_t size = local_discriminators->size();
+    /// If new size is bigger than the old one, just clone column and append default values.
+    if (new_size >= size)
+    {
+        MutableColumns new_variants;
+        new_variants.reserve(num_variants);
+        for (const auto & variant : variants)
+            new_variants.emplace_back(IColumn::mutate(variant));
+
+        auto res = ColumnVariant::create(IColumn::mutate(local_discriminators), IColumn::mutate(offsets), std::move(new_variants), local_to_global_discriminators);
+        res->insertManyDefaults(new_size - size);
+        return res;
+    }
+
+    /// If new size is less than current size, we should find the new size for all variants.
+
+    /// Optimization for case when we have only NULLs. In this case we should just resize discriminators and offsets.
+    if (hasOnlyNulls())
+    {
+        MutableColumns new_variants;
+        new_variants.reserve(num_variants);
+        for (const auto & variant : variants)
+            new_variants.emplace_back(IColumn::mutate(variant));
+
+        return ColumnVariant::create(local_discriminators->cloneResized(new_size), offsets->cloneResized(new_size), std::move(new_variants), local_to_global_discriminators);
+    }
+
+    /// Optimization for case when there is only 1 non-empty variant and no NULLs.
+    /// In this case we can simply call cloneResized on this single variant, discriminators and offsets.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        MutableColumns new_variants;
+        new_variants.reserve(num_variants);
+        for (size_t i = 0; i != variants.size(); ++i)
+        {
+            if (i == *non_empty_local_discr)
+                new_variants.emplace_back(variants[i]->cloneResized(new_size));
+            else
+                new_variants.emplace_back(variants[i]->cloneEmpty());
+        }
+
+        return ColumnVariant::create(local_discriminators->cloneResized(new_size), offsets->cloneResized(new_size), std::move(new_variants), local_to_global_discriminators);
+    }
+
+    const auto & local_discriminators_data = getLocalDiscriminators();
+    const auto & offsets_data = getOffsets();
+
+    /// We can find all variants sizes by scanning all new_size local_discriminators and calculating sizes for all new variants.
+    /// But instead we are trying to optimize it using offsets column:
+    /// For all non-empty variants we are trying to find last occurrence of its discriminator in local_discriminators[:new_size] or
+    /// first occurrence in local_discriminators[new_size:] depending on what range is smaller. The same row in offsets column will
+    /// contain the desired size (or size - 1) of variant.
+    /// All empty variants will remain empty.
+    /// Not sure how good this optimization is, feel free to remove it and use simpler version without using offsets.
+
+    MutableColumns new_variants(num_variants);
+    std::vector<UInt8> seen_variants(num_variants, 0);
+    size_t number_of_seen_variants = 0;
+    /// First, check which variants are empty. They will remain empty.
+    for (Discriminator i = 0; i != num_variants; ++i)
+    {
+        if (variants[i]->empty())
+        {
+            seen_variants[i] = 1;
+            ++number_of_seen_variants;
+            new_variants[i] = variants[i]->cloneEmpty();
+        }
+    }
+
+    /// Now, choose what range is smaller and use it.
+    /// [0, new_size)
+    if (2 * new_size <= size)
+    {
+        for (ssize_t i = new_size - 1; i > -1; --i)
+        {
+            Discriminator discr = local_discriminators_data[i];
+            if (discr != NULL_DISCRIMINATOR)
+            {
+                /// If this is the first occurrence of this discriminator,
+                /// we can get new size for this variant.
+                if (!seen_variants[discr])
+                {
+                    seen_variants[discr] = 1;
+                    ++number_of_seen_variants;
+                    new_variants[discr] = variants[discr]->cloneResized(offsets_data[i] + 1);
+                    /// Break if we found sizes for all variants.
+                    if (number_of_seen_variants == num_variants)
+                        break;
+                }
+            }
+        }
+
+        /// All variants that weren't found in range [0, new_size] will be empty in the result column.
+        if (number_of_seen_variants != num_variants)
+        {
+            for (size_t discr = 0; discr != num_variants; ++discr)
+                if (!seen_variants[discr])
+                    new_variants[discr] = variants[discr]->cloneEmpty();
+        }
+    }
+    /// [new_size, size)
+    else
+    {
+        for (size_t i = new_size; i < size; ++i)
+        {
+            Discriminator discr = local_discriminators_data[i];
+            if (discr != NULL_DISCRIMINATOR)
+            {
+                /// If this is the first occurrence of this discriminator,
+                /// we can get new size for this variant.
+                if (!seen_variants[discr])
+                {
+                    seen_variants[discr] = 1;
+                    ++number_of_seen_variants;
+                    new_variants[discr] = variants[discr]->cloneResized(offsets_data[i]);
+                    /// Break if we found sizes for all variants.
+                    if (number_of_seen_variants == num_variants)
+                        break;
+                }
+            }
+        }
+
+        if (number_of_seen_variants != num_variants)
+        {
+            /// All variants that weren't found in range [new_size, size) will not change their sizes.
+            for (size_t discr = 0; discr != num_variants; ++discr)
+                if (!seen_variants[discr])
+                    new_variants[discr] = IColumn::mutate(variants[discr]);
+        }
+    }
+
+    return ColumnVariant::create(local_discriminators->cloneResized(new_size), offsets->cloneResized(new_size), std::move(new_variants), local_to_global_discriminators);
+}
+
+Field ColumnVariant::operator[](size_t n) const
+{
+    Discriminator discr = localDiscriminatorAt(n);
+    if (discr == NULL_DISCRIMINATOR)
+        return Null();
+    return (*variants[discr])[offsetAt(n)];
+}
+
+void ColumnVariant::get(size_t n, Field & res) const
+{
+    Discriminator discr = localDiscriminatorAt(n);
+    if (discr == NULL_DISCRIMINATOR)
+        res = Null();
+    else
+        variants[discr]->get(offsetAt(n), res);
+}
+
+bool ColumnVariant::isDefaultAt(size_t n) const
+{
+    return localDiscriminatorAt(n) == NULL_DISCRIMINATOR;
+}
+
+bool ColumnVariant::isNullAt(size_t n) const
+{
+    return localDiscriminatorAt(n) == NULL_DISCRIMINATOR;
+}
+
+StringRef ColumnVariant::getDataAt(size_t) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method getDataAt is not supported for {}", getName());
+}
+
+void ColumnVariant::insertData(const char *, size_t)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertData is not supported for {}", getName());
+}
+
+void ColumnVariant::insert(const Field & x)
+{
+    if (!tryInsert(x))
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot insert field {} into column {}", toString(x), getName());
+}
+
+bool ColumnVariant::tryInsert(const DB::Field & x)
+{
+    if (x.isNull())
+    {
+        insertDefault();
+        return true;
+    }
+
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        if (variants[i]->tryInsert(x))
+        {
+            getLocalDiscriminators().push_back(i);
+            getOffsets().push_back(variants[i]->size() - 1);
+            return true;
+        }
+    }
+
+    return false;
+}
+
+void ColumnVariant::insertFrom(const IColumn & src_, size_t n)
+{
+    const ColumnVariant & src = assert_cast<const ColumnVariant &>(src_);
+
+    const size_t num_variants = variants.size();
+    if (src.variants.size() != num_variants)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert value of Variant type with different number of types");
+
+    /// Remember that src column can have different local variants order.
+    Discriminator global_discr = src.globalDiscriminatorAt(n);
+    Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
+    getLocalDiscriminators().push_back(local_discr);
+    if (local_discr == NULL_DISCRIMINATOR)
+    {
+        getOffsets().emplace_back();
+    }
+    else
+    {
+        getOffsets().push_back(variants[local_discr]->size());
+        variants[local_discr]->insertFrom(src.getVariantByGlobalDiscriminator(global_discr), src.offsetAt(n));
+    }
+}
+
+void ColumnVariant::insertIntoVariant(const DB::Field & x, Discriminator global_discr)
+{
+    if (global_discr > variants.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid global discriminator: {}. The number of variants is {}", size_t(global_discr), variants.size());
+    auto & variant = getVariantByGlobalDiscriminator(global_discr);
+    variant.insert(x);
+    getLocalDiscriminators().push_back(localDiscriminatorByGlobal(global_discr));
+    getOffsets().push_back(variant.size() - 1);
+}
+
+void ColumnVariant::insertRangeFrom(const IColumn & src_, size_t start, size_t length)
+{
+    const size_t num_variants = variants.size();
+    const auto & src = assert_cast<const ColumnVariant &>(src_);
+    if (src.variants.size() != num_variants)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert value of Variant type with different number of types");
+
+    if (start + length > src.getLocalDiscriminators().size())
+        throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND, "Parameter out of bound in ColumnVariant::insertRangeFrom method. "
+                                                            "[start({}) + length({}) > local_discriminators.size({})]", start, length, src.getLocalDiscriminators().size());
+
+    /// If src column contains only NULLs, just insert NULLs.
+    if (src.hasOnlyNulls())
+    {
+        insertManyDefaults(length);
+        return;
+    }
+
+    /// Optimization for case when there is only 1 non-empty variant and no NULLs in src column.
+    /// In this case we can simply call insertRangeFrom on this single variant.
+    if (auto non_empty_src_local_discr = src.getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        auto local_discr = localDiscriminatorByGlobal(src.globalDiscriminatorByLocal(*non_empty_src_local_discr));
+        size_t offset = variants[local_discr]->size();
+        variants[local_discr]->insertRangeFrom(*src.variants[*non_empty_src_local_discr], start, length);
+        getLocalDiscriminators().resize_fill(local_discriminators->size() + length, local_discr);
+        auto & offsets_data = getOffsets();
+        offsets_data.reserve(offsets_data.size() + length);
+        for (size_t i = 0; i != length; ++i)
+            offsets_data.push_back(offset++);
+        return;
+    }
+
+    /// Iterate through src local_discriminators in range [start, start + length],
+    /// collect ranges we need to insert for all variants and update offsets.
+    /// nested_ranges[i].first - offset in src.variants[i]
+    /// nested_ranges[i].second - length in src.variants[i]
+    std::vector<std::pair<size_t, size_t>> nested_ranges(num_variants, {0, 0});
+    auto & offsets_data = getOffsets();
+    offsets_data.reserve(offsets_data.size() + length);
+    auto & local_discriminators_data = getLocalDiscriminators();
+    local_discriminators_data.reserve(local_discriminators_data.size() + length);
+    const auto & src_offsets_data = src.getOffsets();
+    const auto & src_local_discriminators_data = src.getLocalDiscriminators();
+    for (size_t i = start; i != start + length; ++i)
+    {
+        /// We insert from src.variants[src_local_discr] to variants[local_discr]
+        Discriminator src_local_discr = src_local_discriminators_data[i];
+        Discriminator local_discr = localDiscriminatorByGlobal(src.globalDiscriminatorByLocal(src_local_discr));
+        local_discriminators_data.push_back(local_discr);
+        if (local_discr == NULL_DISCRIMINATOR)
+        {
+            offsets_data.emplace_back();
+        }
+        else
+        {
+            /// If we see this discriminator for the first time, set its range start.
+            if (!nested_ranges[src_local_discr].second)
+                nested_ranges[src_local_discr].first = src_offsets_data[i];
+            /// Update offsets column with correct offset.
+            offsets_data.push_back(variants[local_discr]->size() + nested_ranges[src_local_discr].second);
+            ++nested_ranges[src_local_discr].second;
+        }
+    }
+
+    for (size_t src_local_discr = 0; src_local_discr != nested_ranges.size(); ++src_local_discr)
+    {
+        auto [nested_start, nested_length] = nested_ranges[src_local_discr];
+        auto local_discr = localDiscriminatorByGlobal(src.globalDiscriminatorByLocal(src_local_discr));
+        if (nested_length)
+            variants[local_discr]->insertRangeFrom(*src.variants[src_local_discr], nested_start, nested_length);
+    }
+}
+
+void ColumnVariant::insertManyFrom(const DB::IColumn & src_, size_t position, size_t length)
+{
+    const size_t num_variants = variants.size();
+    const auto & src = assert_cast<const ColumnVariant &>(src_);
+    if (src.variants.size() != num_variants)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert value of Variant type with different number of types");
+
+    /// Remember that src column can have different local variants order.
+    Discriminator src_local_discr = src.localDiscriminatorAt(position);
+    Discriminator local_discr = localDiscriminatorByGlobal(src.globalDiscriminatorByLocal(src_local_discr));
+    auto & local_discriminators_data = getLocalDiscriminators();
+    local_discriminators_data.resize_fill(local_discriminators_data.size() + length, local_discr);
+
+    auto & offsets_data = getOffsets();
+    if (local_discr == NULL_DISCRIMINATOR)
+    {
+        offsets_data.resize_fill(offsets_data.size() + length);
+    }
+    else
+    {
+        size_t prev_offset = variants[local_discr]->size();
+        offsets_data.reserve(offsets_data.size() + length);
+        for (size_t i = 0; i != length; ++i)
+            offsets_data.push_back(prev_offset + i);
+
+        variants[local_discr]->insertManyFrom(*src.variants[src_local_discr], src.offsetAt(position), length);
+    }
+}
+
+void ColumnVariant::insertDefault()
+{
+    getLocalDiscriminators().push_back(NULL_DISCRIMINATOR);
+    getOffsets().emplace_back();
+}
+
+void ColumnVariant::insertManyDefaults(size_t length)
+{
+    size_t size = local_discriminators->size();
+    getLocalDiscriminators().resize_fill(size + length, NULL_DISCRIMINATOR);
+    getOffsets().resize_fill(size + length);
+}
+
+void ColumnVariant::popBack(size_t n)
+{
+    /// If we have only NULLs, just pop back from local_discriminators and offsets.
+    if (hasOnlyNulls())
+    {
+        local_discriminators->popBack(n);
+        offsets->popBack(n);
+        return;
+    }
+
+    /// Optimization for case when there is only 1 non-empty variant and no NULLs.
+    /// In this case we can just popBack n elements from this variant.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        variants[*non_empty_local_discr]->popBack(n);
+        local_discriminators->popBack(n);
+        offsets->popBack(n);
+        return;
+    }
+
+    /// Calculate how many rows we need to pop from each variant
+    auto & local_discriminators_data = getLocalDiscriminators();
+    size_t size = local_discriminators_data.size();
+    const size_t num_variants = variants.size();
+    std::vector<size_t> nested_n(num_variants, 0);
+    for (size_t i = size - n; i < size; ++i)
+    {
+        Discriminator discr = local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+            ++nested_n[discr];
+    }
+
+    for (size_t i = 0; i != num_variants; ++i)
+    {
+        if (nested_n[i])
+            variants[i]->popBack(nested_n[i]);
+    }
+
+    local_discriminators->popBack(n);
+    offsets->popBack(n);
+}
+
+StringRef ColumnVariant::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+{
+    /// During any serialization/deserialization we should always use global discriminators.
+    Discriminator global_discr = globalDiscriminatorAt(n);
+    char * pos = arena.allocContinue(sizeof(global_discr), begin);
+    memcpy(pos, &global_discr, sizeof(global_discr));
+    StringRef res(pos, sizeof(global_discr));
+
+    if (global_discr == NULL_DISCRIMINATOR)
+        return res;
+
+    auto value_ref = variants[localDiscriminatorByGlobal(global_discr)]->serializeValueIntoArena(offsetAt(n), arena, begin);
+    res.data = value_ref.data - res.size;
+    res.size += value_ref.size;
+
+    return res;
+}
+
+const char * ColumnVariant::deserializeAndInsertFromArena(const char * pos)
+{
+    /// During any serialization/deserialization we should always use global discriminators.
+    Discriminator global_discr = unalignedLoad<Discriminator>(pos);
+    pos += sizeof(global_discr);
+    Discriminator local_discr = localDiscriminatorByGlobal(global_discr);
+    getLocalDiscriminators().push_back(local_discr);
+    if (local_discr == NULL_DISCRIMINATOR)
+    {
+        getOffsets().emplace_back();
+        return pos;
+    }
+
+    getOffsets().push_back(variants[local_discr]->size());
+    return variants[local_discr]->deserializeAndInsertFromArena(pos);
+}
+
+const char * ColumnVariant::skipSerializedInArena(const char * pos) const
+{
+    Discriminator global_discr = unalignedLoad<Discriminator>(pos);
+    pos += sizeof(global_discr);
+    if (global_discr == NULL_DISCRIMINATOR)
+        return pos;
+
+    return variants[localDiscriminatorByGlobal(global_discr)]->skipSerializedInArena(pos);
+}
+
+void ColumnVariant::updateHashWithValue(size_t n, SipHash & hash) const
+{
+    Discriminator global_discr = globalDiscriminatorAt(n);
+    hash.update(global_discr);
+    if (global_discr != NULL_DISCRIMINATOR)
+        variants[localDiscriminatorByGlobal(global_discr)]->updateHashWithValue(offsetAt(n), hash);
+}
+
+void ColumnVariant::updateWeakHash32(WeakHash32 & hash) const
+{
+    auto s = size();
+
+    if (hash.getData().size() != s)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of WeakHash32 does not match size of column: "
+                                                   "column size is {}, hash size is {}", std::to_string(s), std::to_string(hash.getData().size()));
+
+    /// If we have only NULLs, keep hash unchanged.
+    if (hasOnlyNulls())
+        return;
+
+    /// Optimization for case when there is only 1 non-empty variant and no NULLs.
+    /// In this case we can just calculate weak hash for this variant.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        variants[*non_empty_local_discr]->updateWeakHash32(hash);
+        return;
+    }
+
+    /// Calculate weak hash for all variants.
+    std::vector<WeakHash32> nested_hashes;
+    for (const auto & variant : variants)
+    {
+        WeakHash32 nested_hash(variant->size());
+        variant->updateWeakHash32(nested_hash);
+        nested_hashes.emplace_back(std::move(nested_hash));
+    }
+
+    /// For each row hash is a hash of corresponding row from corresponding variant.
+    auto & hash_data = hash.getData();
+    const auto & local_discriminators_data = getLocalDiscriminators();
+    const auto & offsets_data = getOffsets();
+    for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+    {
+        Discriminator discr = local_discriminators_data[i];
+        /// Update hash only for non-NULL values
+        if (discr != NULL_DISCRIMINATOR)
+        {
+            auto nested_hash = nested_hashes[local_discriminators_data[i]].getData()[offsets_data[i]];
+            hash_data[i] = static_cast<UInt32>(hashCRC32(nested_hash, hash_data[i]));
+        }
+    }
+}
+
+void ColumnVariant::updateHashFast(SipHash & hash) const
+{
+    local_discriminators->updateHashFast(hash);
+    for (const auto & variant : variants)
+        variant->updateHashFast(hash);
+}
+
+ColumnPtr ColumnVariant::filter(const Filter & filt, ssize_t result_size_hint) const
+{
+    if (size() != filt.size())
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH, "Size of filter ({}) doesn't match size of column ({})", filt.size(), size());
+
+    /// If we have only NULLs, just filter local_discriminators column.
+    if (hasOnlyNulls())
+    {
+        Columns new_variants(variants.begin(), variants.end());
+        auto new_discriminators = local_discriminators->filter(filt, result_size_hint);
+        /// In case of all NULL values offsets doesn't contain any useful values, just resize it.
+        ColumnPtr new_offsets = offsets->cloneResized(new_discriminators->size());
+        return ColumnVariant::create(new_discriminators, new_offsets, new_variants, local_to_global_discriminators);
+    }
+
+    /// Optimization for case when there is only 1 non-empty variant and no NULLs.
+    /// In this case we can just filter this variant and resize discriminators/offsets.
+    if (auto non_empty_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        Columns new_variants(variants.begin(), variants.end());
+        new_variants[*non_empty_discr] = variants[*non_empty_discr]->filter(filt, result_size_hint);
+        size_t new_size = new_variants[*non_empty_discr]->size();
+        ColumnPtr new_discriminators = local_discriminators->cloneResized(new_size);
+        ColumnPtr new_offsets = offsets->cloneResized(new_size);
+        return ColumnVariant::create(new_discriminators, new_offsets, new_variants, local_to_global_discriminators);
+    }
+
+    /// We should create filter for each variant
+    /// according to local_discriminators and given filter.
+    const size_t num_variants = variants.size();
+    std::vector<Filter> nested_filters(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+        nested_filters[i].reserve_exact(variants[i]->size());
+
+    /// As we will iterate through local_discriminators anyway, we can count
+    /// result size for each variant.
+    std::vector<ssize_t> variant_result_size_hints(num_variants);
+
+    const auto & local_discriminators_data = getLocalDiscriminators();
+    for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+    {
+        Discriminator discr = local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+        {
+            nested_filters[local_discriminators_data[i]].push_back(filt[i]);
+            variant_result_size_hints[local_discriminators_data[i]] += !!(filt[i]);
+        }
+    }
+
+    Columns new_variants;
+    new_variants.reserve(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+    {
+        /// It make sense to call filter() on variant only if the result size is not 0.
+        if (variant_result_size_hints[i])
+            new_variants.emplace_back(variants[i]->filter(nested_filters[i], variant_result_size_hints[i]));
+        else
+            new_variants.emplace_back(variants[i]->cloneEmpty());
+    }
+
+    /// We cannot use filtered offsets column, as it will be incorrect.
+    /// It will be reconstructed on ColumnVariant creation according to new local_discriminators.
+    return ColumnVariant::create(local_discriminators->filter(filt, result_size_hint), new_variants, local_to_global_discriminators);
+}
+
+void ColumnVariant::expand(const Filter & mask, bool inverted)
+{
+    /// Expand local_discriminators using NULL_DISCRIMINATOR for 0-rows.
+    expandDataByMask(getLocalDiscriminators(), mask, inverted, NULL_DISCRIMINATOR);
+    expandDataByMask(getOffsets(), mask, inverted);
+}
+
+ColumnPtr ColumnVariant::permute(const Permutation & perm, size_t limit) const
+{
+    /// If we have only NULLs, permutation will take no effect, just return resized column.
+    if (hasOnlyNulls())
+    {
+        if (limit)
+            return cloneResized(limit);
+
+        /// If no limit, we can just return current immutable column.
+        return this->getPtr();
+    }
+
+    /// Optimization when we have only one non empty variant and no NULLs.
+    /// In this case local_discriminators column is filled with identical values and offsets column
+    /// filled with sequential numbers. In this case we can just apply permutation to this
+    /// single non-empty variant and cut local_discriminators and offsets columns to the result size.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        MutableColumns new_variants;
+        const size_t num_variants = variants.size();
+        new_variants.reserve(num_variants);
+        for (size_t i = 0; i != num_variants; ++i)
+        {
+            if (i == *non_empty_local_discr)
+                new_variants.emplace_back(variants[*non_empty_local_discr]->permute(perm, limit)->assumeMutable());
+            else
+                new_variants.emplace_back(variants[i]->assumeMutable());
+        }
+
+        size_t new_size = new_variants[*non_empty_local_discr]->size();
+        return ColumnVariant::create(local_discriminators->cloneResized(new_size), offsets->cloneResized(new_size), std::move(new_variants), local_to_global_discriminators);
+    }
+
+    return permuteImpl(*this, perm, limit);
+}
+
+ColumnPtr ColumnVariant::index(const IColumn & indexes, size_t limit) const
+{
+    /// If we have only NULLs, index will take no effect, just return resized column.
+    if (hasOnlyNulls())
+        return cloneResized(limit);
+
+    /// Optimization when we have only one non empty variant and no NULLs.
+    /// In this case local_discriminators column is filled with identical values and offsets column
+    /// filled with sequential numbers. So we can just apply indexes to this
+    /// single non-empty variant and cut local_discriminators and offsets columns to the result size.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        MutableColumns new_variants;
+        const size_t num_variants = variants.size();
+        new_variants.reserve(num_variants);
+        for (size_t i = 0; i != num_variants; ++i)
+        {
+            if (i == *non_empty_local_discr)
+                new_variants.emplace_back(variants[*non_empty_local_discr]->index(indexes, limit)->assumeMutable());
+            else
+                new_variants.emplace_back(variants[i]->assumeMutable());
+        }
+
+        size_t new_size = new_variants[*non_empty_local_discr]->size();
+        return ColumnVariant::create(local_discriminators->cloneResized(new_size), offsets->cloneResized(new_size), std::move(new_variants), local_to_global_discriminators);
+    }
+
+    return selectIndexImpl(*this, indexes, limit);
+}
+
+template <typename Type>
+ColumnPtr ColumnVariant::indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const
+{
+    /// First, apply indexes for local_discriminators and offsets.
+    ColumnPtr new_local_discriminators = assert_cast<const ColumnDiscriminators &>(*local_discriminators).indexImpl(indexes, limit);
+    ColumnPtr new_offsets = assert_cast<const ColumnOffsets &>(*offsets).indexImpl(indexes, limit);
+    const auto & new_local_discriminators_data =  assert_cast<const ColumnDiscriminators &>(*new_local_discriminators).getData();
+    const auto & new_offsets_data = assert_cast<const ColumnOffsets &>(*new_offsets).getData();
+    /// Then, create permutation for each variant.
+    const size_t num_variants = variants.size();
+    std::vector<Permutation> nested_perms(num_variants);
+    /// If there is no limit, we know the size of each permutation
+    /// in advance and can use reserve.
+    if (limit == 0)
+    {
+        for (size_t i = 0; i != num_variants; ++i)
+            nested_perms[i].reserve_exact(variants[i]->size());
+    }
+
+    for (size_t i = 0; i != new_local_discriminators_data.size(); ++i)
+    {
+        Discriminator discr = new_local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+            nested_perms[discr].push_back(new_offsets_data[i]);
+    }
+
+    Columns new_variants;
+    new_variants.reserve(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+    {
+        size_t nested_limit = nested_perms[i].size() == variants[i]->size() ? 0 : nested_perms[i].size();
+        new_variants.emplace_back(variants[i]->permute(nested_perms[i], nested_limit));
+    }
+
+    /// We cannot use new_offsets column as an offset column, because it became invalid after variants permutation.
+    /// New offsets column will be created in constructor.
+    return ColumnVariant::create(new_local_discriminators, new_variants, local_to_global_discriminators);
+}
+
+ColumnPtr ColumnVariant::replicate(const Offsets & replicate_offsets) const
+{
+    if (size() != replicate_offsets.size())
+        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH, "Size of offsets {} doesn't match size of column {}", replicate_offsets.size(), size());
+
+    if (empty())
+        return cloneEmpty();
+
+    /// If we have only NULLs, just resize column to the new size.
+    if (hasOnlyNulls())
+        return cloneResized(replicate_offsets.back());
+
+    const size_t num_variants = variants.size();
+
+    /// Optimization when we have only one non empty variant and no NULLs.
+    /// In this case local_discriminators column is filled with identical values and offsets column
+    /// filled with sequential numbers. So we can just replicate this one non empty variant,
+    /// then resize local_discriminators to the result size and fill offsets column.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        MutableColumns new_variants;
+        new_variants.reserve(num_variants);
+        for (size_t i = 0; i != num_variants; ++i)
+        {
+            if (i == *non_empty_local_discr)
+                new_variants.emplace_back(variants[*non_empty_local_discr]->replicate(replicate_offsets)->assumeMutable());
+            else
+                new_variants.emplace_back(variants[i]->cloneEmpty());
+        }
+
+        size_t new_size = new_variants[*non_empty_local_discr]->size();
+        /// Create and fill new local_discriminators column with non_empty_index discriminator.
+        auto new_local_discriminators = IColumn::mutate(local_discriminators);
+        assert_cast<ColumnDiscriminators &>(*new_local_discriminators).getData().resize_fill(new_size, *non_empty_local_discr);
+        /// Create and fill new offsets column with sequential indexes.
+        auto new_offsets = IColumn::mutate(offsets);
+        auto & new_offsets_data = assert_cast<ColumnOffsets &>(*new_offsets).getData();
+        size_t old_size = offsets->size();
+        if (new_size > old_size)
+        {
+            new_offsets_data.reserve_exact(new_size);
+            for (size_t i = old_size; i < new_size; ++i)
+                new_offsets_data.push_back(i);
+        }
+        else
+        {
+            new_offsets_data.resize(new_size);
+        }
+
+        return ColumnVariant::create(std::move(new_local_discriminators), std::move(new_offsets), std::move(new_variants), local_to_global_discriminators);
+    }
+
+    /// Create replicate offsets for each variant according to
+    /// local_discriminators column.
+    std::vector<Offsets> nested_replicated_offsets(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+        nested_replicated_offsets[i].reserve_exact(variants[i]->size());
+
+    const auto & local_discriminators_data = getLocalDiscriminators();
+    for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+    {
+        Discriminator discr = local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+        {
+            size_t repeat_count = replicate_offsets[i] - replicate_offsets[i - 1];
+            nested_replicated_offsets[discr].push_back(nested_replicated_offsets[discr].back() + repeat_count);
+        }
+    }
+
+    auto new_local_discriminators = local_discriminators->replicate(replicate_offsets);
+    Columns new_variants;
+    new_variants.reserve(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+        new_variants.emplace_back(variants[i]->replicate(nested_replicated_offsets[i]));
+
+    /// New offsets column will be created in constructor.
+    return ColumnVariant::create(new_local_discriminators, new_variants, local_to_global_discriminators);
+}
+
+MutableColumns ColumnVariant::scatter(ColumnIndex num_columns, const Selector & selector) const
+{
+    const size_t num_variants = variants.size();
+
+    /// If we have only NULLs, we need to scatter only local_discriminators.
+    if (hasOnlyNulls())
+    {
+        auto scattered_local_discriminators = local_discriminators->scatter(num_columns, selector);
+        MutableColumns result;
+        result.reserve(num_columns);
+        for (size_t i = 0; i != num_columns; ++i)
+        {
+            MutableColumns new_variants;
+            new_variants.reserve(num_variants);
+            for (const auto & variant : variants)
+                new_variants.emplace_back(IColumn::mutate(variant));
+
+            result.emplace_back(ColumnVariant::create(std::move(scattered_local_discriminators[i]), std::move(new_variants), local_to_global_discriminators));
+        }
+
+        return result;
+    }
+
+    /// Optimization when we have only one non empty variant and no NULLs.
+    /// In this case we can just scatter local_discriminators and this non empty variant.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        auto scattered_local_discriminators = local_discriminators->scatter(num_columns, selector);
+        auto scattered_non_empty_variant = variants[*non_empty_local_discr]->scatter(num_columns, selector);
+        MutableColumns result;
+        result.reserve(num_columns);
+        for (size_t i = 0; i != num_columns; ++i)
+        {
+            MutableColumns scattered_nested_variants(num_variants);
+            for (size_t j = 0; j != num_variants; ++j)
+            {
+                if (j == *non_empty_local_discr)
+                    scattered_nested_variants[j] = std::move(scattered_non_empty_variant[i]);
+                else
+                    scattered_nested_variants[j] = IColumn::mutate(variants[j]);
+            }
+
+            result.emplace_back(ColumnVariant::create(std::move(scattered_local_discriminators[i]), std::move(scattered_nested_variants), local_to_global_discriminators));
+        }
+
+        return result;
+    }
+
+    /// Create selector for each variant according to local_discriminators.
+    std::vector<Selector> nested_selectors(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+        nested_selectors[i].reserve_exact(variants[i]->size());
+
+    const auto & local_discriminators_data = getLocalDiscriminators();
+    for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+    {
+        Discriminator discr = local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+            nested_selectors[discr].push_back(selector[i]);
+    }
+
+    auto scattered_local_discriminators = local_discriminators->scatter(num_columns, selector);
+    std::vector<MutableColumns> nested_scattered_variants;
+    nested_scattered_variants.reserve(num_variants);
+    for (size_t i = 0; i != num_variants; ++i)
+        nested_scattered_variants.emplace_back(variants[i]->scatter(num_columns, nested_selectors[i]));
+
+    MutableColumns result;
+    result.reserve(num_columns);
+    for (size_t i = 0; i != num_columns; ++i)
+    {
+        MutableColumns new_variants;
+        new_variants.reserve(num_variants);
+        for (size_t j = 0; j != num_variants; ++j)
+            new_variants.emplace_back(std::move(nested_scattered_variants[j][i]));
+        result.emplace_back(ColumnVariant::create(std::move(scattered_local_discriminators[i]), std::move(new_variants), local_to_global_discriminators));
+    }
+
+    return result;
+}
+
+bool ColumnVariant::hasEqualValues() const
+{
+    if (local_discriminators->empty() || hasOnlyNulls())
+        return true;
+
+    return local_discriminators->hasEqualValues() && variants[localDiscriminatorAt(0)]->hasEqualValues();
+}
+
+int ColumnVariant::compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const
+{
+    const auto & rhs_variant = assert_cast<const ColumnVariant &>(rhs);
+    Discriminator left_discr = globalDiscriminatorAt(n);
+    Discriminator right_discr = rhs_variant.globalDiscriminatorAt(m);
+
+    /// Check if we have NULLs and return result based on nan_direction_hint.
+    if (left_discr == NULL_DISCRIMINATOR && right_discr == NULL_DISCRIMINATOR)
+        return 0;
+    else if (left_discr == NULL_DISCRIMINATOR)
+        return nan_direction_hint;
+    else if (right_discr == NULL_DISCRIMINATOR)
+        return -nan_direction_hint;
+
+    /// If rows have different discriminators, row with least discriminator is considered the least.
+    if (left_discr != right_discr)
+        return left_discr < right_discr ? -1 : 1;
+
+    /// If rows have the same discriminators, compare actual values from corresponding variants.
+    return getVariantByGlobalDiscriminator(left_discr).compareAt(offsetAt(n), rhs_variant.offsetAt(m), rhs_variant.getVariantByGlobalDiscriminator(right_discr), nan_direction_hint);
+}
+
+struct ColumnVariant::ComparatorBase
+{
+    const ColumnVariant & parent;
+    int nan_direction_hint;
+
+    ComparatorBase(const ColumnVariant & parent_, int nan_direction_hint_)
+        : parent(parent_), nan_direction_hint(nan_direction_hint_)
+    {
+    }
+
+    ALWAYS_INLINE int compare(size_t lhs, size_t rhs) const
+    {
+        int res = parent.compareAt(lhs, rhs, parent, nan_direction_hint);
+
+        return res;
+    }
+};
+
+void ColumnVariant::getPermutation(PermutationSortDirection direction, PermutationSortStability stability, size_t limit, int nan_direction_hint, Permutation & res) const
+{
+    if (direction == IColumn::PermutationSortDirection::Ascending && stability == IColumn::PermutationSortStability::Unstable)
+        getPermutationImpl(limit, res, ComparatorAscendingUnstable(*this, nan_direction_hint), DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Ascending && stability == IColumn::PermutationSortStability::Stable)
+        getPermutationImpl(limit, res, ComparatorAscendingStable(*this, nan_direction_hint), DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Descending && stability == IColumn::PermutationSortStability::Unstable)
+        getPermutationImpl(limit, res, ComparatorDescendingUnstable(*this, nan_direction_hint), DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Descending && stability == IColumn::PermutationSortStability::Stable)
+        getPermutationImpl(limit, res, ComparatorDescendingStable(*this, nan_direction_hint), DefaultSort(), DefaultPartialSort());
+}
+
+void ColumnVariant::updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability, size_t limit, int nan_direction_hint, IColumn::Permutation & res, DB::EqualRanges & equal_ranges) const
+{
+    auto comparator_equal = ComparatorEqual(*this, nan_direction_hint);
+
+    if (direction == IColumn::PermutationSortDirection::Ascending && stability == IColumn::PermutationSortStability::Unstable)
+        updatePermutationImpl(limit, res, equal_ranges, ComparatorAscendingUnstable(*this, nan_direction_hint), comparator_equal, DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Ascending && stability == IColumn::PermutationSortStability::Stable)
+        updatePermutationImpl(limit, res, equal_ranges, ComparatorAscendingStable(*this, nan_direction_hint), comparator_equal, DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Descending && stability == IColumn::PermutationSortStability::Unstable)
+        updatePermutationImpl(limit, res, equal_ranges, ComparatorDescendingUnstable(*this, nan_direction_hint), comparator_equal, DefaultSort(), DefaultPartialSort());
+    else if (direction == IColumn::PermutationSortDirection::Descending && stability == IColumn::PermutationSortStability::Stable)
+        updatePermutationImpl(limit, res, equal_ranges, ComparatorDescendingStable(*this, nan_direction_hint), comparator_equal, DefaultSort(), DefaultPartialSort());
+}
+
+void ColumnVariant::reserve(size_t n)
+{
+    local_discriminators->reserve(n);
+    offsets->reserve(n);
+}
+
+void ColumnVariant::ensureOwnership()
+{
+    const size_t num_variants = variants.size();
+    for (size_t i = 0; i < num_variants; ++i)
+        getVariantByLocalDiscriminator(i).ensureOwnership();
+}
+
+size_t ColumnVariant::byteSize() const
+{
+    size_t res = local_discriminators->byteSize() + offsets->byteSize();
+    for (const auto & variant : variants)
+        res += variant->byteSize();
+    return res;
+}
+
+size_t ColumnVariant::byteSizeAt(size_t n) const
+{
+    size_t res = sizeof(Offset) + sizeof(Discriminator);
+    Discriminator discr = localDiscriminatorAt(n);
+    if (discr == NULL_DISCRIMINATOR)
+        return res;
+
+    return res + variants[discr]->byteSizeAt(offsetAt(n));
+}
+
+size_t ColumnVariant::allocatedBytes() const
+{
+    size_t res = local_discriminators->allocatedBytes() + offsets->allocatedBytes();
+    for (const auto & variant : variants)
+        res += variant->allocatedBytes();
+    return res;
+}
+
+void ColumnVariant::protect()
+{
+    local_discriminators->protect();
+    offsets->protect();
+    for (auto & variant : variants)
+        variant->protect();
+}
+
+void ColumnVariant::getExtremes(Field & min, Field & max) const
+{
+    min = Null();
+    max = Null();
+}
+
+void ColumnVariant::forEachSubcolumn(MutableColumnCallback callback)
+{
+    callback(local_discriminators);
+    callback(offsets);
+    for (auto & variant : variants)
+        callback(variant);
+}
+
+void ColumnVariant::forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback)
+{
+    callback(*local_discriminators);
+    local_discriminators->forEachSubcolumnRecursively(callback);
+    callback(*offsets);
+    offsets->forEachSubcolumnRecursively(callback);
+
+    for (auto & variant : variants)
+    {
+        callback(*variant);
+        variant->forEachSubcolumnRecursively(callback);
+    }
+}
+
+bool ColumnVariant::structureEquals(const IColumn & rhs) const
+{
+    const auto * rhs_variant = typeid_cast<const ColumnVariant *>(&rhs);
+    if (!rhs_variant)
+        return false;
+
+    const size_t num_variants = variants.size();
+    if (num_variants != rhs_variant->variants.size())
+        return false;
+
+    for (size_t i = 0; i < num_variants; ++i)
+        if (!variants[i]->structureEquals(rhs_variant->getVariantByGlobalDiscriminator(globalDiscriminatorByLocal(i))))
+            return false;
+
+    return true;
+}
+
+ColumnPtr ColumnVariant::compress() const
+{
+    ColumnPtr local_discriminators_compressed = local_discriminators->compress();
+    ColumnPtr offsets_compressed = offsets->compress();
+    size_t byte_size = local_discriminators_compressed->byteSize() + offsets_compressed->byteSize();
+    Columns compressed;
+    compressed.reserve(variants.size());
+    for (const auto & variant : variants)
+    {
+        auto compressed_variant = variant->compress();
+        byte_size += compressed_variant->byteSize();
+        compressed.emplace_back(std::move(compressed_variant));
+    }
+
+    return ColumnCompressed::create(size(), byte_size,
+        [my_local_discriminators_compressed = std::move(local_discriminators_compressed), my_offsets_compressed = std::move(offsets_compressed), my_compressed = std::move(compressed), my_local_to_global_discriminators = this->local_to_global_discriminators]() mutable
+        {
+            for (auto & variant : my_compressed)
+                variant = variant->decompress();
+            return ColumnVariant::create(my_local_discriminators_compressed->decompress(), my_offsets_compressed->decompress(), my_compressed, my_local_to_global_discriminators);
+        });
+}
+
+double ColumnVariant::getRatioOfDefaultRows(double) const
+{
+    UInt64 num_defaults = getNumberOfDefaultRows();
+    return static_cast<double>(num_defaults) / local_discriminators->size();
+}
+
+UInt64 ColumnVariant::getNumberOfDefaultRows() const
+{
+    size_t total_variant_sizes = 0;
+    for (const auto & variant : variants)
+        total_variant_sizes += variant->size();
+    return local_discriminators->size() - total_variant_sizes;
+}
+
+void ColumnVariant::getIndicesOfNonDefaultRows(Offsets & indices, size_t from, size_t limit) const
+{
+    size_t to = limit && from + limit < size() ? from + limit : size();
+    indices.reserve(indices.size() + to - from);
+
+    for (size_t i = from; i < to; ++i)
+    {
+        if (!isDefaultAt(i))
+            indices.push_back(i);
+    }
+}
+
+void ColumnVariant::finalize()
+{
+    for (auto & variant : variants)
+        variant->finalize();
+}
+
+bool ColumnVariant::isFinalized() const
+{
+    return std::all_of(variants.begin(), variants.end(), [](const auto & variant) { return variant->isFinalized(); });
+}
+
+std::optional<ColumnVariant::Discriminator> ColumnVariant::getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls() const
+{
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        if (variants[i]->size() == local_discriminators->size())
+            return i;
+        if (!variants[i]->empty())
+            return std::nullopt;
+    }
+
+    return std::nullopt;
+}
+
+void ColumnVariant::applyNullMap(const ColumnVector<UInt8>::Container & null_map)
+{
+    applyNullMapImpl<false>(null_map);
+}
+
+void ColumnVariant::applyNegatedNullMap(const ColumnVector<UInt8>::Container & null_map)
+{
+    applyNullMapImpl<true>(null_map);
+}
+
+template <bool inverted>
+void ColumnVariant::applyNullMapImpl(const ColumnVector<UInt8>::Container & null_map)
+{
+    if (null_map.size() != local_discriminators->size())
+        throw Exception(ErrorCodes::SIZES_OF_NESTED_COLUMNS_ARE_INCONSISTENT,
+                        "Logical error: Sizes of discriminators column and null map data are not equal");
+
+    /// If we have only NULLs, nothing to do.
+    if (hasOnlyNulls())
+    {
+        return;
+    }
+
+    /// If we have only 1 non empty column and no NULLs, we can just filter that
+    /// variant according to the null_map.
+    if (auto non_empty_local_discr = getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        auto & local_discriminators_data = getLocalDiscriminators();
+        auto & offsets_data = getOffsets();
+        size_t size_hint = 0;
+
+        if constexpr (inverted)
+        {
+            for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+            {
+                if (null_map[i])
+                    offsets_data[i] = size_hint++;
+                else
+                    local_discriminators_data[i] = NULL_DISCRIMINATOR;
+            }
+            variants[*non_empty_local_discr] = variants[*non_empty_local_discr]->filter(null_map, size_hint);
+        }
+        else
+        {
+            ColumnVector<UInt8>::Container filter;
+            filter.reserve_exact(null_map.size());
+            for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+            {
+               if (null_map[i])
+               {
+                    filter.push_back(0);
+                    local_discriminators_data[i] = NULL_DISCRIMINATOR;
+               }
+               else
+               {
+                   filter.push_back(1);
+                   offsets_data[i] = size_hint++;
+               }
+            }
+            variants[*non_empty_local_discr] = variants[*non_empty_local_discr]->filter(filter, size_hint);
+        }
+
+        return;
+    }
+
+    /// In general case we should iterate through null_map + discriminators,
+    /// create filter for each variant and update offsets column.
+    std::vector<Filter> variant_filters;
+    variant_filters.resize(variants.size());
+    std::vector<size_t> variant_new_sizes;
+    variant_new_sizes.resize(variants.size(), 0);
+
+    auto & local_discriminators_data = getLocalDiscriminators();
+    auto & offsets_data = getOffsets();
+    for (size_t i = 0; i != local_discriminators_data.size(); ++i)
+    {
+        auto & discr = local_discriminators_data[i];
+        if (discr != NULL_DISCRIMINATOR)
+        {
+            if (null_map[i] ^ inverted)
+            {
+                auto & variant_filter = variant_filters[discr];
+                /// We create filters lazily.
+                if (variant_filter.empty())
+                   variant_filter.resize_fill(variants[discr]->size(), 1);
+                variant_filter[offsets_data[i]] = 0;
+                discr = NULL_DISCRIMINATOR;
+            }
+            else
+            {
+                offsets_data[i] = variant_new_sizes[discr]++;
+            }
+        }
+    }
+
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        if (!variant_filters[i].empty())
+            variants[i] = variants[i]->filter(variant_filters[i], variant_new_sizes[i]);
+    }
+}
+
+}
diff --git a/src/Columns/ColumnVariant.h b/src/Columns/ColumnVariant.h
new file mode 100644
index 00000000000..4aa2c9058cc
--- /dev/null
+++ b/src/Columns/ColumnVariant.h
@@ -0,0 +1,300 @@
+#pragma once
+
+#include <Columns/IColumn.h>
+#include <Columns/ColumnVector.h>
+
+
+namespace DB
+{
+
+/**
+ * Column for storing Variant(...) type values.
+ * Variant type represents a union of other data types.
+ * For example, type Variant(T1, T2, ..., TN) means that each row of this type
+ * has a value of either type T1 or T2 or ... or TN or none of them (NULL value)
+ *
+ * ColumnVariant stores:
+ *   - The discriminators column, which determines which variant is stored in each row.
+ *   - The offsets column, which determines the offset in the corresponding variant column in each row.
+ *   - The list of variant columns with only real values (so the sizes of variant columns can be different).
+ * Discriminator is an index of a variant in the variants list, it also has special value called NULL_DISCRIMINATOR
+ * that indicates that the value in the row is NULL.
+ *
+ * We want to be able to extend Variant column for free without rewriting the data, but as we don't care about the
+ * order of variants during Variant creation (we want Variant(T1, T2) to be the same as Variant(T2, T1)), we support
+ * some global order of nested types inside Variant during type creation, so after extension the order of variant types
+ * (and so their discriminators) can change. For example: Variant(T1, T3) -> Variant(T1, T2, T3).
+ * To avoid full rewrite of discriminators column on Variant extension, we differentiate local order of variants
+ * inside a column and global order of variants created during type creation. So, ColumnVariant stores only local
+ * discriminators and additionally stores the mapping between global and local discriminators.
+ * So, when we need to extend Variant column with new variant, we can just append it to a list of variant columns
+ * with new local discriminator and update mapping from global to local orders.
+ *
+ * Note that two instances of ColumnVariant can have different local orders, so we should always use global
+ * discriminators during inter-column interactions.
+ *
+ * Let's take an example with type Variant(UInt32, String, Array(UInt32)):
+ * During type creation we will sort types by their names and get the global order: Array(UInt32), String, UInt32.
+ * So, type Array(UInt32) will have global discriminator 0, String - 1 and UInt32 - 2.
+ * Let's say we have a column with local order (String, UInt32, Array(UInt32)) and values:
+ * 'Hello', 42, NULL, 'World', 43, [1, 2, 3], NULL, 44
+ *
+ * Let's see how these values will be stored in ColumnVariant:
+ *
+ * local_to_global_discriminators: {0 : 1, 1 : 2, 2 : 0}
+ * global_to_local_discriminators: {0 : 2, 1 : 0, 2 : 1}
+ * local_discriminators    offsets    String    UInt32    Array(UInt32)
+ *         0                  0       'Hello'     42        [1, 2, 3]
+ *         1                  0       'World'     43
+ *  NULL_DISCRIMINATOR        0                   44
+ *         0                  1
+ *         1                  1
+ *         2                  0
+ *  NULL_DISCRIMINATOR        0
+ *         1                  2
+ *
+ */
+class ColumnVariant final : public COWHelper<IColumnHelper<ColumnVariant>, ColumnVariant>
+{
+public:
+    using Discriminator = UInt8;
+    using Discriminators = PaddedPODArray<Discriminator>;
+    using ColumnDiscriminators = ColumnVector<Discriminator>;
+    using ColumnOffsets = ColumnVector<Offset>;
+
+    static constexpr UInt8 NULL_DISCRIMINATOR = std::numeric_limits<Discriminator>::max(); /// 255
+    static constexpr size_t MAX_NESTED_COLUMNS = std::numeric_limits<Discriminator>::max(); /// 255
+
+    struct ComparatorBase;
+
+    using ComparatorAscendingUnstable = ComparatorAscendingUnstableImpl<ComparatorBase>;
+    using ComparatorAscendingStable = ComparatorAscendingStableImpl<ComparatorBase>;
+    using ComparatorDescendingUnstable = ComparatorDescendingUnstableImpl<ComparatorBase>;
+    using ComparatorDescendingStable = ComparatorDescendingStableImpl<ComparatorBase>;
+    using ComparatorEqual = ComparatorEqualImpl<ComparatorBase>;
+
+private:
+    friend class COWHelper<IColumnHelper<ColumnVariant>, ColumnVariant>;
+
+    using NestedColumns = std::vector<WrappedPtr>;
+
+    /// Create an empty column with provided variants.
+    /// Variants are in global order.
+    explicit ColumnVariant(MutableColumns && variants_);
+    /// Variants are in local order according to provided mapping.
+    explicit ColumnVariant(MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+
+    /// Create column from discriminators column and list of variant columns.
+    /// Offsets column should be constructed according to the discriminators.
+    /// Variants are in global order.
+    ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumns && variants_);
+    /// Variants are in local order according to provided mapping.
+    ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+
+    /// Create column from discriminators column, offsets column and list of variant columns.
+    /// Variants are in global order.
+    ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumnPtr offsets_, MutableColumns && variants_);
+    /// Variants are in local order according to provided mapping.
+    ColumnVariant(MutableColumnPtr local_discriminators_, MutableColumnPtr offsets_, MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+
+    ColumnVariant(const ColumnVariant &) = default;
+
+public:
+    /** Create immutable column using immutable arguments. This arguments may be shared with other variants.
+      * Use IColumn::mutate in order to make mutable column and mutate shared nested variants.
+      */
+    using Base = COWHelper<IColumnHelper<ColumnVariant>, ColumnVariant>;
+    static Ptr create(const Columns & variants_) { return create(variants_, {}); }
+    static Ptr create(const Columns & variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+    static Ptr create(const ColumnPtr & local_discriminators_, const Columns & variants_) { return create(local_discriminators_, variants_, {}); }
+    static Ptr create(const ColumnPtr & local_discriminators_, const Columns & variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+    static Ptr create(const ColumnPtr & local_discriminators_, const DB::ColumnPtr & offsets_, const Columns & variants_) { return create(local_discriminators_, offsets_, variants_, {}); }
+    static Ptr create(const ColumnPtr & local_discriminators_, const DB::ColumnPtr & offsets_, const Columns & variants_, const std::vector<Discriminator> & local_to_global_discriminators_);
+
+    static MutablePtr create(MutableColumns && variants_)
+    {
+        return Base::create(std::move(variants_));
+    }
+
+    static MutablePtr create(MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_)
+    {
+        return Base::create(std::move(variants_), local_to_global_discriminators_);
+    }
+
+    static MutablePtr create(MutableColumnPtr local_discriminators_, MutableColumns && variants_)
+    {
+        return Base::create(std::move(local_discriminators_), std::move(variants_));
+    }
+
+    static MutablePtr create(MutableColumnPtr local_discriminators_, MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_)
+    {
+        return Base::create(std::move(local_discriminators_), std::move(variants_), local_to_global_discriminators_);
+    }
+
+    static MutablePtr create(MutableColumnPtr local_discriminators_, MutableColumnPtr offsets_, MutableColumns && variants_)
+    {
+        return Base::create(std::move(local_discriminators_), std::move(offsets_), std::move(variants_));
+    }
+
+    static MutablePtr create(MutableColumnPtr local_discriminators_, MutableColumnPtr offsets_, MutableColumns && variants_, const std::vector<Discriminator> & local_to_global_discriminators_)
+    {
+        return Base::create(std::move(local_discriminators_), std::move(offsets_), std::move(variants_), local_to_global_discriminators_);
+    }
+
+    std::string getName() const override;
+    const char * getFamilyName() const override { return "Variant"; }
+    TypeIndex getDataType() const override { return TypeIndex::Variant; }
+
+    MutableColumnPtr cloneEmpty() const override;
+    MutableColumnPtr cloneResized(size_t size) const override;
+
+    size_t ALWAYS_INLINE offsetAt(size_t i) const { return getOffsets()[i]; }
+    Discriminator ALWAYS_INLINE localDiscriminatorAt(size_t i) const { return getLocalDiscriminators()[i]; }
+    Discriminator ALWAYS_INLINE globalDiscriminatorAt(size_t i) const { return globalDiscriminatorByLocal(getLocalDiscriminators()[i]); }
+
+    Discriminator ALWAYS_INLINE globalDiscriminatorByLocal(Discriminator local_discr) const
+    {
+        /// NULL_DISCRIMINATOR is always the same in local and global orders.
+        return local_discr == NULL_DISCRIMINATOR ? NULL_DISCRIMINATOR : local_to_global_discriminators[local_discr];
+    }
+
+    Discriminator ALWAYS_INLINE localDiscriminatorByGlobal(Discriminator global_discr) const
+    {
+        /// NULL_DISCRIMINATOR is always the same in local and global orders.
+        return global_discr == NULL_DISCRIMINATOR ? NULL_DISCRIMINATOR : global_to_local_discriminators[global_discr];
+    }
+
+    size_t size() const override
+    {
+        return offsets->size();
+    }
+
+    Field operator[](size_t n) const override;
+    void get(size_t n, Field & res) const override;
+
+    bool isDefaultAt(size_t n) const override;
+    bool isNullAt(size_t n) const override;
+    StringRef getDataAt(size_t n) const override;
+    void insertData(const char * pos, size_t length) override;
+    void insert(const Field & x) override;
+    bool tryInsert(const Field & x) override;
+    void insertIntoVariant(const Field & x, Discriminator global_discr);
+    void insertFrom(const IColumn & src_, size_t n) override;
+    void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
+    void insertManyFrom(const IColumn & src, size_t position, size_t length) override;
+    void insertDefault() override;
+    void insertManyDefaults(size_t length) override;
+    void popBack(size_t n) override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+    const char * deserializeAndInsertFromArena(const char * pos) override;
+    const char * skipSerializedInArena(const char * pos) const override;
+    void updateHashWithValue(size_t n, SipHash & hash) const override;
+    void updateWeakHash32(WeakHash32 & hash) const override;
+    void updateHashFast(SipHash & hash) const override;
+    ColumnPtr filter(const Filter & filt, ssize_t result_size_hint) const override;
+    void expand(const Filter & mask, bool inverted) override;
+    ColumnPtr permute(const Permutation & perm, size_t limit) const override;
+    ColumnPtr index(const IColumn & indexes, size_t limit) const override;
+    template <typename Type>
+    ColumnPtr indexImpl(const PaddedPODArray<Type> & indexes, size_t limit) const;
+    ColumnPtr replicate(const Offsets & replicate_offsets) const override;
+    MutableColumns scatter(ColumnIndex num_columns, const Selector & selector) const override;
+    int compareAt(size_t n, size_t m, const IColumn & rhs, int nan_direction_hint) const override;
+    bool hasEqualValues() const override;
+    void getExtremes(Field & min, Field & max) const override;
+    void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
+                        size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
+
+    void updatePermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
+                           size_t limit, int nan_direction_hint, IColumn::Permutation & res, EqualRanges & equal_ranges) const override;
+
+    void reserve(size_t n) override;
+    void ensureOwnership() override;
+    size_t byteSize() const override;
+    size_t byteSizeAt(size_t n) const override;
+    size_t allocatedBytes() const override;
+    void protect() override;
+    void forEachSubcolumn(MutableColumnCallback callback) override;
+    void forEachSubcolumnRecursively(RecursiveMutableColumnCallback callback) override;
+    bool structureEquals(const IColumn & rhs) 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;
+
+    const IColumn & getVariantByLocalDiscriminator(size_t discr) const { return *variants[discr]; }
+    const IColumn & getVariantByGlobalDiscriminator(size_t discr) const { return *variants[global_to_local_discriminators.at(discr)]; }
+    IColumn & getVariantByLocalDiscriminator(size_t discr) { return *variants[discr]; }
+    IColumn & getVariantByGlobalDiscriminator(size_t discr) { return *variants[global_to_local_discriminators.at(discr)]; }
+
+    const ColumnPtr & getVariantPtrByLocalDiscriminator(size_t discr) const { return variants[discr]; }
+    const ColumnPtr & getVariantPtrByGlobalDiscriminator(size_t discr) const { return variants[global_to_local_discriminators.at(discr)]; }
+    ColumnPtr & getVariantPtrByLocalDiscriminator(size_t discr) { return variants[discr]; }
+    ColumnPtr & getVariantPtrByGlobalDiscriminator(size_t discr) { return variants[global_to_local_discriminators.at(discr)]; }
+
+    const IColumn & getLocalDiscriminatorsColumn() const { return *local_discriminators; }
+    IColumn & getLocalDiscriminatorsColumn() { return *local_discriminators; }
+
+    const ColumnPtr & getLocalDiscriminatorsPtr() const { return local_discriminators; }
+    ColumnPtr & getLocalDiscriminatorsPtr() { return local_discriminators; }
+
+    const Discriminators & ALWAYS_INLINE getLocalDiscriminators() const { return assert_cast<const ColumnDiscriminators &>(*local_discriminators).getData(); }
+    Discriminators & ALWAYS_INLINE getLocalDiscriminators() { return assert_cast<ColumnDiscriminators &>(*local_discriminators).getData(); }
+
+    const IColumn & getOffsetsColumn() const { return *offsets; }
+    IColumn & getOffsetsColumn() { return *offsets; }
+
+    const ColumnPtr & getOffsetsPtr() const { return offsets; }
+    ColumnPtr & getOffsetsPtr() { return offsets; }
+
+    const Offsets & ALWAYS_INLINE getOffsets() const { return assert_cast<const ColumnOffsets &>(*offsets).getData(); }
+    Offsets & ALWAYS_INLINE getOffsets() { return assert_cast<ColumnOffsets &>(*offsets).getData(); }
+
+    size_t getNumVariants() const { return variants.size(); }
+
+    bool hasOnlyNulls() const
+    {
+        /// If all variants are empty, we have only NULL values.
+        return std::all_of(variants.begin(), variants.end(), [](const WrappedPtr & v){ return v->empty(); });
+    }
+
+    /// Check if local and global order is the same.
+    bool hasGlobalVariantsOrder() const
+    {
+        for (size_t i = 0; i != local_to_global_discriminators.size(); ++i)
+        {
+            if (local_to_global_discriminators[i] != i)
+                return false;
+        }
+
+        return true;
+    }
+
+    /// Check if we have only 1 non-empty variant and no NULL values,
+    /// and if so, return the discriminator of this non-empty column.
+    std::optional<Discriminator> getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls() const;
+
+    /// Apply null map to a Variant column.
+    /// Replace corresponding discriminators with NULL_DISCRIMINATOR
+    /// and filter out rows in variants if needed.
+    void applyNullMap(const ColumnVector<UInt8>::Container & null_map);
+    void applyNegatedNullMap(const ColumnVector<UInt8>::Container & null_map);
+
+private:
+    void initIdentityGlobalToLocalDiscriminatorsMapping();
+
+    template <bool inverted>
+    void applyNullMapImpl(const ColumnVector<UInt8>::Container & null_map);
+
+    WrappedPtr local_discriminators;
+    WrappedPtr offsets;
+    NestedColumns variants;
+
+    std::vector<Discriminator> global_to_local_discriminators;
+    std::vector<Discriminator> local_to_global_discriminators;
+};
+
+
+}
diff --git a/src/Columns/ColumnVector.cpp b/src/Columns/ColumnVector.cpp
index b1cf449dfde..4e3b9963107 100644
--- a/src/Columns/ColumnVector.cpp
+++ b/src/Columns/ColumnVector.cpp
@@ -2,6 +2,7 @@
 
 #include <Columns/ColumnCompressed.h>
 #include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnConst.h>
 #include <Columns/MaskOperations.h>
 #include <Columns/RadixSortHelper.h>
 #include <IO/WriteHelpers.h>
@@ -19,6 +20,7 @@
 #include <Common/TargetSpecific.h>
 #include <Common/WeakHash.h>
 #include <Common/assert_cast.h>
+#include <Common/findExtreme.h>
 #include <Common/iota.h>
 
 #include <bit>
@@ -50,31 +52,6 @@ namespace ErrorCodes
     extern const int NOT_IMPLEMENTED;
 }
 
-template <typename T>
-StringRef ColumnVector<T>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const
-{
-    constexpr size_t null_bit_size = sizeof(UInt8);
-    StringRef res;
-    char * pos;
-    if (null_bit)
-    {
-        res.size = * null_bit ? null_bit_size : null_bit_size + sizeof(T);
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-        memcpy(pos, null_bit, null_bit_size);
-        if (*null_bit) return res;
-        pos += null_bit_size;
-    }
-    else
-    {
-        res.size = sizeof(T);
-        pos = arena.allocContinue(res.size, begin);
-        res.data = pos;
-    }
-    unalignedStore<T>(pos, data[n]);
-    return res;
-}
-
 template <typename T>
 const char * ColumnVector<T>::deserializeAndInsertFromArena(const char * pos)
 {
@@ -237,7 +214,7 @@ void ColumnVector<T>::getPermutation(IColumn::PermutationSortDirection direction
                                     size_t limit, int nan_direction_hint, IColumn::Permutation & res) const
 {
     size_t data_size = data.size();
-    res.resize(data_size);
+    res.resize_exact(data_size);
 
     if (data_size == 0)
         return;
@@ -247,6 +224,26 @@ void ColumnVector<T>::getPermutation(IColumn::PermutationSortDirection direction
 
     iota(res.data(), data_size, IColumn::Permutation::value_type(0));
 
+    if constexpr (has_find_extreme_implementation<T> && !std::is_floating_point_v<T>)
+    {
+        /// Disabled for:floating point
+        /// * floating point: We don't deal with nan_direction_hint
+        /// * stability::Stable: We might return any value, not the first
+        if ((limit == 1) && (stability == IColumn::PermutationSortStability::Unstable))
+        {
+            std::optional<size_t> index;
+            if (direction == IColumn::PermutationSortDirection::Ascending)
+                index = findExtremeMinIndex(data.data(), 0, data.size());
+            else
+                index = findExtremeMaxIndex(data.data(), 0, data.size());
+            if (index)
+            {
+                res.data()[0] = *index;
+                return;
+            }
+        }
+    }
+
     if constexpr (is_arithmetic_v<T> && !is_big_int_v<T>)
     {
         if (!limit)
@@ -424,7 +421,7 @@ MutableColumnPtr ColumnVector<T>::cloneResized(size_t size) const
     if (size > 0)
     {
         auto & new_col = static_cast<Self &>(*res);
-        new_col.data.resize(size);
+        new_col.data.resize_exact(size);
 
         size_t count = std::min(this->size(), size);
         memcpy(new_col.data.data(), data.data(), count * sizeof(data[0]));
@@ -463,6 +460,28 @@ Float32 ColumnVector<T>::getFloat32(size_t n [[maybe_unused]]) const
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot get the value of {} as Float32", TypeName<T>);
 }
 
+template <typename T>
+bool ColumnVector<T>::tryInsert(const DB::Field & x)
+{
+    NearestFieldType<T> value;
+    if (!x.tryGet<NearestFieldType<T>>(value))
+    {
+        if constexpr (std::is_same_v<T, UInt8>)
+        {
+            /// It's also possible to insert boolean values into UInt8 column.
+            bool boolean_value;
+            if (x.tryGet<bool>(boolean_value))
+            {
+                data.push_back(static_cast<T>(boolean_value));
+                return true;
+            }
+        }
+        return false;
+    }
+    data.push_back(static_cast<T>(value));
+    return true;
+}
+
 template <typename T>
 void ColumnVector<T>::insertRangeFrom(const IColumn & src, size_t start, size_t length)
 {
@@ -628,8 +647,8 @@ inline void doFilterAligned(const UInt8 *& filt_pos, const UInt8 *& filt_end_ali
         filt_pos += SIMD_ELEMENTS;
         data_pos += SIMD_ELEMENTS;
     }
-    /// resize to the real size.
-    res_data.resize(current_offset);
+    /// Resize to the real size.
+    res_data.resize_exact(current_offset);
 }
 )
 
@@ -644,7 +663,7 @@ ColumnPtr ColumnVector<T>::filter(const IColumn::Filter & filt, ssize_t result_s
     Container & res_data = res->getData();
 
     if (result_size_hint)
-        res_data.reserve(result_size_hint > 0 ? result_size_hint : size);
+        res_data.reserve_exact(result_size_hint > 0 ? result_size_hint : size);
 
     const UInt8 * filt_pos = filt.data();
     const UInt8 * filt_end = filt_pos + size;
@@ -861,12 +880,6 @@ ColumnPtr ColumnVector<T>::replicate(const IColumn::Offsets & offsets) const
     return res;
 }
 
-template <typename T>
-void ColumnVector<T>::gather(ColumnGathererStream & gatherer)
-{
-    gatherer.gather(*this);
-}
-
 template <typename T>
 void ColumnVector<T>::getExtremes(Field & min, Field & max) const
 {
@@ -940,7 +953,7 @@ ColumnPtr ColumnVector<T>::compress() const
 }
 
 template <typename T>
-ColumnPtr ColumnVector<T>::createWithOffsets(const IColumn::Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const
+ColumnPtr ColumnVector<T>::createWithOffsets(const IColumn::Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const
 {
     if (offsets.size() + shift != size())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
@@ -949,7 +962,7 @@ ColumnPtr ColumnVector<T>::createWithOffsets(const IColumn::Offsets & offsets, c
     auto res = this->create();
     auto & res_data = res->getData();
 
-    T default_value = static_cast<T>(default_field.safeGet<T>());
+    T default_value = assert_cast<const ColumnVector<T> &>(column_with_default_value.getDataColumn()).getElement(0);
     res_data.resize_fill(total_rows, default_value);
     for (size_t i = 0; i < offsets.size(); ++i)
         res_data[offsets[i]] = data[i + shift];
diff --git a/src/Columns/ColumnVector.h b/src/Columns/ColumnVector.h
index fab2d5f06aa..39ee1d931bd 100644
--- a/src/Columns/ColumnVector.h
+++ b/src/Columns/ColumnVector.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <cmath>
+#include <Columns/ColumnFixedSizeHelper.h>
 #include <Columns/IColumn.h>
 #include <Columns/IColumnImpl.h>
-#include <Columns/ColumnVectorHelper.h>
-#include <base/unaligned.h>
-#include <Core/Field.h>
-#include <Common/assert_cast.h>
 #include <Common/TargetSpecific.h>
+#include <Common/assert_cast.h>
+#include <Core/CompareHelper.h>
+#include <Core/Field.h>
 #include <Core/TypeId.h>
 #include <base/TypeName.h>
+#include <base/unaligned.h>
 
 #include "config.h"
 
@@ -26,101 +26,16 @@ namespace ErrorCodes
 }
 
 
-/** Stuff for comparing numbers.
-  * Integer values are compared as usual.
-  * Floating-point numbers are compared this way that NaNs always end up at the end
-  *  (if you don't do this, the sort would not work at all).
-  */
-template <class T, class U = T>
-struct CompareHelper
-{
-    static constexpr bool less(T a, U b, int /*nan_direction_hint*/) { return a < b; }
-    static constexpr bool greater(T a, U b, int /*nan_direction_hint*/) { return a > b; }
-    static constexpr bool equals(T a, U b, int /*nan_direction_hint*/) { return a == b; }
-
-    /** Compares two numbers. Returns a number less than zero, equal to zero, or greater than zero if a < b, a == b, a > b, respectively.
-      * If one of the values is NaN, then
-      * - if nan_direction_hint == -1 - NaN are considered less than all numbers;
-      * - if nan_direction_hint == 1 - NaN are considered to be larger than all numbers;
-      * Essentially: nan_direction_hint == -1 says that the comparison is for sorting in descending order.
-      */
-    static constexpr int compare(T a, U b, int /*nan_direction_hint*/)
-    {
-        return a > b ? 1 : (a < b ? -1 : 0);
-    }
-};
-
-template <class T>
-struct FloatCompareHelper
-{
-    static constexpr bool less(T a, T b, int nan_direction_hint)
-    {
-        const bool isnan_a = std::isnan(a);
-        const bool isnan_b = std::isnan(b);
-
-        if (isnan_a && isnan_b)
-            return false;
-        if (isnan_a)
-            return nan_direction_hint < 0;
-        if (isnan_b)
-            return nan_direction_hint > 0;
-
-        return a < b;
-    }
-
-    static constexpr bool greater(T a, T b, int nan_direction_hint)
-    {
-        const bool isnan_a = std::isnan(a);
-        const bool isnan_b = std::isnan(b);
-
-        if (isnan_a && isnan_b)
-            return false;
-        if (isnan_a)
-            return nan_direction_hint > 0;
-        if (isnan_b)
-            return nan_direction_hint < 0;
-
-        return a > b;
-    }
-
-    static constexpr bool equals(T a, T b, int nan_direction_hint)
-    {
-        return compare(a, b, nan_direction_hint) == 0;
-    }
-
-    static constexpr int compare(T a, T b, int nan_direction_hint)
-    {
-        const bool isnan_a = std::isnan(a);
-        const bool isnan_b = std::isnan(b);
-
-        if (unlikely(isnan_a || isnan_b))
-        {
-            if (isnan_a && isnan_b)
-                return 0;
-
-            return isnan_a
-                ? nan_direction_hint
-                : -nan_direction_hint;
-        }
-
-        return (T(0) < (a - b)) - ((a - b) < T(0));
-    }
-};
-
-template <typename U> struct CompareHelper<Float32, U> : public FloatCompareHelper<Float32> {};
-template <typename U> struct CompareHelper<Float64, U> : public FloatCompareHelper<Float64> {};
-
-
 /** A template for columns that use a simple array to store.
  */
 template <typename T>
-class ColumnVector final : public COWHelper<ColumnVectorHelper, ColumnVector<T>>
+class ColumnVector final : public COWHelper<IColumnHelper<ColumnVector<T>, ColumnFixedSizeHelper>, ColumnVector<T>>
 {
     static_assert(!is_decimal<T>);
 
 private:
     using Self = ColumnVector;
-    friend class COWHelper<ColumnVectorHelper, Self>;
+    friend class COWHelper<IColumnHelper<Self, ColumnFixedSizeHelper>, Self>;
 
     struct less;
     struct less_stable;
@@ -185,8 +100,6 @@ public:
         data.resize_assume_reserved(data.size() - n);
     }
 
-    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit) const override;
-
     const char * deserializeAndInsertFromArena(const char * pos) override;
 
     const char * skipSerializedInArena(const char * pos) const override;
@@ -242,19 +155,6 @@ public:
 
 #endif
 
-    void compareColumn(const IColumn & rhs, size_t rhs_row_num,
-                       PaddedPODArray<UInt64> * row_indexes, PaddedPODArray<Int8> & compare_results,
-                       int direction, int nan_direction_hint) const override
-    {
-        return this->template doCompareColumn<Self>(assert_cast<const Self &>(rhs), rhs_row_num, row_indexes,
-                                                    compare_results, direction, nan_direction_hint);
-    }
-
-    bool hasEqualValues() const override
-    {
-        return this->template hasEqualValuesImpl<Self>();
-    }
-
     void getPermutation(IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability,
                     size_t limit, int nan_direction_hint, IColumn::Permutation & res) const override;
 
@@ -263,7 +163,12 @@ public:
 
     void reserve(size_t n) override
     {
-        data.reserve(n);
+        data.reserve_exact(n);
+    }
+
+    void shrinkToFit() override
+    {
+        data.shrink_to_fit();
     }
 
     const char * getFamilyName() const override { return TypeName<T>.data(); }
@@ -319,6 +224,8 @@ public:
         data.push_back(static_cast<T>(x.get<T>()));
     }
 
+    bool tryInsert(const DB::Field & x) override;
+
     void insertRangeFrom(const IColumn & src, size_t start, size_t length) override;
 
     ColumnPtr filter(const IColumn::Filter & filt, ssize_t result_size_hint) const override;
@@ -336,13 +243,6 @@ public:
 
     void getExtremes(Field & min, Field & max) const override;
 
-    MutableColumns scatter(IColumn::ColumnIndex num_columns, const IColumn::Selector & selector) const override
-    {
-        return this->template scatterImpl<Self>(num_columns, selector);
-    }
-
-    void gather(ColumnGathererStream & gatherer_stream) override;
-
     bool canBeInsideNullable() const override { return true; }
     bool isFixedAndContiguous() const override { return true; }
     size_t sizeOfValueIfFixed() const override { return sizeof(T); }
@@ -364,22 +264,7 @@ public:
         return typeid(rhs) == typeid(ColumnVector<T>);
     }
 
-    double getRatioOfDefaultRows(double sample_ratio) const override
-    {
-        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);
-    }
-
-    ColumnPtr createWithOffsets(const IColumn::Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const override;
+    ColumnPtr createWithOffsets(const IColumn::Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const override;
 
     ColumnPtr compress() const override;
 
diff --git a/src/Columns/ColumnsCommon.cpp b/src/Columns/ColumnsCommon.cpp
index 4ac84e10750..591c56a00bd 100644
--- a/src/Columns/ColumnsCommon.cpp
+++ b/src/Columns/ColumnsCommon.cpp
@@ -133,7 +133,7 @@ namespace
 
         void reserve(ssize_t result_size_hint, size_t src_size)
         {
-            res_offsets.reserve(result_size_hint > 0 ? result_size_hint : src_size);
+            res_offsets.reserve_exact(result_size_hint > 0 ? result_size_hint : src_size);
         }
 
         void insertOne(size_t array_size)
@@ -205,9 +205,9 @@ namespace
             result_offsets_builder.reserve(result_size_hint, size);
 
             if (result_size_hint < 0)
-                res_elems.reserve(src_elems.size());
+                res_elems.reserve_exact(src_elems.size());
             else if (result_size_hint < 1000000000 && src_elems.size() < 1000000000)    /// Avoid overflow.
-                res_elems.reserve((result_size_hint * src_elems.size() + size - 1) / size);
+                res_elems.reserve_exact((result_size_hint * src_elems.size() + size - 1) / size);
         }
 
         const UInt8 * filt_pos = filt.data();
diff --git a/src/Columns/FilterDescription.cpp b/src/Columns/FilterDescription.cpp
index 9e967a85c59..62d2babe17a 100644
--- a/src/Columns/FilterDescription.cpp
+++ b/src/Columns/FilterDescription.cpp
@@ -106,7 +106,7 @@ SparseFilterDescription::SparseFilterDescription(const IColumn & column)
         throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
             "Illegal type {} of column for sparse filter. Must be Sparse(UInt8)", column.getName());
 
-    filter_indices = &column_sparse->getOffsetsColumn();
+    filter_indices = &assert_cast<const ColumnUInt64 &>(column_sparse->getOffsetsColumn());
 }
 
 }
diff --git a/src/Columns/FilterDescription.h b/src/Columns/FilterDescription.h
index 18c95d24b9d..63457b8b544 100644
--- a/src/Columns/FilterDescription.h
+++ b/src/Columns/FilterDescription.h
@@ -2,6 +2,7 @@
 
 #include <Columns/IColumn.h>
 #include <Columns/ColumnsCommon.h>
+#include <Columns/ColumnsNumber.h>
 
 
 namespace DB
@@ -22,9 +23,15 @@ struct ConstantFilterDescription
 
 struct IFilterDescription
 {
+    /// has_one can be pre-compute during creating the filter description in some cases
+    Int64 has_one = -1;
     virtual ColumnPtr filter(const IColumn & column, ssize_t result_size_hint) const = 0;
     virtual size_t countBytesInFilter() const = 0;
     virtual ~IFilterDescription() = default;
+    bool hasOne() { return has_one >= 0 ? has_one : hasOneImpl();}
+protected:
+    /// Calculate if filter has a non-zero from the filter values, may update has_one
+    virtual bool hasOneImpl() = 0;
 };
 
 /// Obtain a filter from non constant Column, that may have type: UInt8, Nullable(UInt8).
@@ -37,15 +44,19 @@ struct FilterDescription final : public IFilterDescription
 
     ColumnPtr filter(const IColumn & column, ssize_t result_size_hint) const override { return column.filter(*data, result_size_hint); }
     size_t countBytesInFilter() const override { return DB::countBytesInFilter(*data); }
+protected:
+    bool hasOneImpl() override { return data ? (has_one = !memoryIsZero(data->data(), 0, data->size())) : false; }
 };
 
 struct SparseFilterDescription final : public IFilterDescription
 {
-    const IColumn * filter_indices = nullptr;
+    const ColumnUInt64 * filter_indices = nullptr;
     explicit SparseFilterDescription(const IColumn & column);
 
     ColumnPtr filter(const IColumn & column, ssize_t) const override { return column.index(*filter_indices, 0); }
     size_t countBytesInFilter() const override { return filter_indices->size(); }
+protected:
+    bool hasOneImpl() override { return filter_indices && !filter_indices->empty(); }
 };
 
 struct ColumnWithTypeAndName;
diff --git a/src/Columns/IColumn.cpp b/src/Columns/IColumn.cpp
index 7923bca6354..18974e49760 100644
--- a/src/Columns/IColumn.cpp
+++ b/src/Columns/IColumn.cpp
@@ -1,11 +1,27 @@
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
 #include <Columns/IColumn.h>
-#include <Columns/ColumnNullable.h>
+
+#include <Columns/IColumnDummy.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnCompressed.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnFunction.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnObject.h>
+#include <Columns/ColumnSparse.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnVector.h>
 #include <Core/Field.h>
 #include <DataTypes/Serializations/SerializationInfo.h>
-
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
+#include <Processors/Transforms/ColumnGathererTransform.h>
 
 namespace DB
 {
@@ -34,11 +50,15 @@ void IColumn::insertFrom(const IColumn & src, size_t n)
     insert(src[n]);
 }
 
-ColumnPtr IColumn::createWithOffsets(const Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const
+ColumnPtr IColumn::createWithOffsets(const Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const
 {
     if (offsets.size() + shift != size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR,
-            "Incompatible sizes of offsets ({}), shift ({}) and size of column {}", offsets.size(), shift, size());
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Incompatible sizes of offsets ({}), shift ({}) and size of column {}",
+            offsets.size(),
+            shift,
+            size());
 
     auto res = cloneEmpty();
     res->reserve(total_rows);
@@ -50,14 +70,14 @@ ColumnPtr IColumn::createWithOffsets(const Offsets & offsets, const Field & defa
         current_offset = offsets[i];
 
         if (offsets_diff > 1)
-            res->insertMany(default_field, offsets_diff - 1);
+            res->insertManyFrom(column_with_default_value.getDataColumn(), 0, offsets_diff - 1);
 
         res->insertFrom(*this, i + shift);
     }
 
     ssize_t offsets_diff = static_cast<ssize_t>(total_rows) - current_offset;
     if (offsets_diff > 1)
-        res->insertMany(default_field, offsets_diff - 1);
+        res->insertManyFrom(column_with_default_value.getDataColumn(), 0, offsets_diff - 1);
 
     return res;
 }
@@ -83,9 +103,365 @@ bool isColumnNullable(const IColumn & column)
     return checkColumn<ColumnNullable>(column);
 }
 
+bool isColumnNullableOrLowCardinalityNullable(const IColumn & column)
+{
+    return isColumnNullable(column) || isColumnLowCardinalityNullable(column);
+}
+
 bool isColumnConst(const IColumn & column)
 {
     return checkColumn<ColumnConst>(column);
 }
 
+template <typename Derived, typename Parent>
+MutableColumns IColumnHelper<Derived, Parent>::scatter(IColumn::ColumnIndex num_columns, const IColumn::Selector & selector) const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t num_rows = self.size();
+
+    if (num_rows != selector.size())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of selector: {} doesn't match size of column: {}", selector.size(), num_rows);
+
+    MutableColumns columns(num_columns);
+    for (auto & column : columns)
+        column = self.cloneEmpty();
+
+    {
+        size_t reserve_size = static_cast<size_t>(num_rows * 1.1 / num_columns);    /// 1.1 is just a guess. Better to use n-sigma rule.
+
+        if (reserve_size > 1)
+            for (auto & column : columns)
+                column->reserve(reserve_size);
+    }
+
+    for (size_t i = 0; i < num_rows; ++i)
+        static_cast<Derived &>(*columns[selector[i]]).insertFrom(*this, i);
+
+    return columns;
+}
+
+template <typename Derived, typename Parent>
+void IColumnHelper<Derived, Parent>::gather(ColumnGathererStream & gatherer)
+{
+    gatherer.gather(static_cast<Derived &>(*this));
+}
+
+template <typename Derived, bool reversed>
+void compareImpl(
+    const Derived & lhs,
+    const Derived & rhs,
+    size_t rhs_row_num,
+    PaddedPODArray<UInt64> * row_indexes [[maybe_unused]],
+    PaddedPODArray<Int8> & compare_results,
+    int nan_direction_hint)
+{
+    size_t num_rows = lhs.size();
+    if (compare_results.empty())
+        compare_results.resize(num_rows);
+    else if (compare_results.size() != num_rows)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Size of compare_results: {} doesn't match rows_num: {}",
+            compare_results.size(),
+            num_rows);
+
+    for (size_t row = 0; row < num_rows; ++row)
+    {
+        int res = lhs.compareAt(row, rhs_row_num, rhs, nan_direction_hint);
+        assert(res == 1 || res == -1 || res == 0);
+        compare_results[row] = static_cast<Int8>(res);
+
+        if constexpr (reversed)
+            compare_results[row] = -compare_results[row];
+    }
+}
+
+template <typename Derived, bool reversed>
+void compareWithIndexImpl(
+    const Derived & lhs,
+    const Derived & rhs,
+    size_t rhs_row_num,
+    PaddedPODArray<UInt64> * row_indexes [[maybe_unused]],
+    PaddedPODArray<Int8> & compare_results,
+    int nan_direction_hint)
+{
+    size_t num_rows = lhs.size();
+    if (compare_results.empty())
+        compare_results.resize(num_rows);
+    else if (compare_results.size() != num_rows)
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Size of compare_results: {} doesn't match rows_num: {}",
+            compare_results.size(),
+            num_rows);
+
+    UInt64 * next_index = row_indexes->data();
+    for (auto row : *row_indexes)
+    {
+        int res = lhs.compareAt(row, rhs_row_num, rhs, nan_direction_hint);
+        assert(res == 1 || res == -1 || res == 0);
+        compare_results[row] = static_cast<Int8>(res);
+
+        if constexpr (reversed)
+            compare_results[row] = -compare_results[row];
+
+        if (compare_results[row] == 0)
+        {
+            *next_index = row;
+            ++next_index;
+        }
+    }
+
+    size_t equal_row_indexes_size = next_index - row_indexes->data();
+    row_indexes->resize(equal_row_indexes_size);
+}
+
+template <typename Derived, typename Parent>
+void IColumnHelper<Derived, Parent>::compareColumn(
+    const IColumn & rhs_base,
+    size_t rhs_row_num,
+    PaddedPODArray<UInt64> * row_indexes,
+    PaddedPODArray<Int8> & compare_results,
+    int direction,
+    int nan_direction_hint) const
+{
+    const auto & lhs = static_cast<const Derived &>(*this);
+    const auto & rhs = static_cast<const Derived &>(rhs_base);
+    if (direction < 0)
+    {
+        if (row_indexes)
+            compareWithIndexImpl<Derived, true>(lhs, rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
+        else
+            compareImpl<Derived, true>(lhs, rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
+    }
+    else if (row_indexes)
+    {
+        compareWithIndexImpl<Derived, false>(lhs, rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
+    }
+    else
+    {
+        compareImpl<Derived, false>(lhs, rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
+    }
+}
+
+template <typename Derived, typename Parent>
+bool IColumnHelper<Derived, Parent>::hasEqualValues() const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t num_rows = self.size();
+    for (size_t i = 1; i < num_rows; ++i)
+    {
+        if (self.compareAt(i, 0, self, 0) != 0)
+            return false;
+    }
+    return true;
+}
+
+template <typename Derived, typename Parent>
+double IColumnHelper<Derived, Parent>::getRatioOfDefaultRows(double sample_ratio) const
+{
+    if (sample_ratio <= 0.0 || sample_ratio > 1.0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Value of 'sample_ratio' must be in interval (0.0; 1.0], but got: {}", sample_ratio);
+
+    static constexpr auto max_number_of_rows_for_full_search = 1000;
+
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t num_rows = self.size();
+    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 || num_rows <= max_number_of_rows_for_full_search)
+    {
+        for (size_t i = 0; i < num_rows; ++i)
+            res += self.isDefaultAt(i);
+        num_checked_rows = num_rows;
+    }
+    else if (num_sampled_rows != 0)
+    {
+        for (size_t i = 0; i < num_rows; ++i)
+        {
+            if (num_checked_rows * num_rows <= i * num_sampled_rows)
+            {
+                res += self.isDefaultAt(i);
+                ++num_checked_rows;
+            }
+        }
+    }
+
+    if (num_checked_rows == 0)
+        return 0.0;
+
+    return static_cast<double>(res) / num_checked_rows;
+}
+
+template <typename Derived, typename Parent>
+UInt64 IColumnHelper<Derived, Parent>::getNumberOfDefaultRows() const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    UInt64 res = 0;
+    size_t num_rows = self.size();
+    for (size_t i = 0; i < num_rows; ++i)
+        res += self.isDefaultAt(i);
+    return res;
+}
+
+template <typename Derived, typename Parent>
+void IColumnHelper<Derived, Parent>::getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t to = limit && from + limit < self.size() ? from + limit : self.size();
+    indices.reserve_exact(indices.size() + to - from);
+
+    for (size_t i = from; i < to; ++i)
+    {
+        if (!self.isDefaultAt(i))
+            indices.push_back(i);
+    }
+}
+
+template <typename Derived, typename Parent>
+StringRef
+IColumnHelper<Derived, Parent>::serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null) const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    if (is_null)
+    {
+        char * memory;
+        if (is_null[n])
+        {
+            memory = arena.allocContinue(1, begin);
+            *memory = 1;
+            return {memory, 1};
+        }
+
+        size_t sz = self.byteSizeAt(n) + 1 /* null byte */;
+        memory = arena.allocContinue(sz, begin);
+        *memory = 0;
+        self.serializeValueIntoMemory(n, memory + 1);
+        return {memory, sz};
+    }
+    else
+    {
+        return self.serializeValueIntoArena(n, arena, begin);
+    }
+}
+
+template <typename Derived, typename Parent>
+StringRef IColumnHelper<Derived, Parent>::serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const
+{
+    if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
+        return IColumn::serializeValueIntoArena(n, arena, begin);
+
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t sz = self.byteSizeAt(n);
+    char * memory = arena.allocContinue(sz, begin);
+    self.serializeValueIntoMemory(n, memory);
+    return {memory, sz};
+}
+
+template <typename Derived, typename Parent>
+char * IColumnHelper<Derived, Parent>::serializeValueIntoMemoryWithNull(size_t n, char * memory, const UInt8 * is_null) const
+{
+    const auto & self = static_cast<const Derived &>(*this);
+    if (is_null)
+    {
+        *memory = is_null[n];
+        ++memory;
+        if (is_null[n])
+            return memory;
+    }
+
+    return self.serializeValueIntoMemory(n, memory);
+}
+
+template <typename Derived, typename Parent>
+char * IColumnHelper<Derived, Parent>::serializeValueIntoMemory(size_t n, char * memory) const
+{
+    if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
+        return IColumn::serializeValueIntoMemory(n, memory);
+
+    const auto & self = static_cast<const Derived &>(*this);
+    auto raw_data = self.getDataAt(n);
+    memcpy(memory, raw_data.data, raw_data.size);
+    return memory + raw_data.size;
+}
+
+template <typename Derived, typename Parent>
+void IColumnHelper<Derived, Parent>::collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const
+{
+    if constexpr (!std::is_base_of_v<ColumnFixedSizeHelper, Derived>)
+        return IColumn::collectSerializedValueSizes(sizes, is_null);
+
+    const auto & self = static_cast<const Derived &>(*this);
+    size_t rows = self.size();
+    if (sizes.empty())
+        sizes.resize_fill(rows);
+    else if (sizes.size() != rows)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of sizes: {} doesn't match rows_num: {}. It is a bug", sizes.size(), rows);
+
+    if (rows == 0)
+        return;
+
+    size_t element_size = self.byteSizeAt(0);
+    if (is_null)
+    {
+        for (size_t i = 0; i < rows; ++i)
+        {
+            if (is_null[i])
+                ++sizes[i];
+            else
+                sizes[i] += element_size + 1 /* null byte */;
+        }
+    }
+    else
+    {
+        for (auto & sz : sizes)
+            sz += element_size;
+    }
+}
+
+template class IColumnHelper<ColumnVector<UInt8>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UInt16>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UInt32>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UInt64>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UInt128>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UInt256>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int8>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int16>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int32>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int64>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int128>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Int256>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Float32>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<Float64>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<UUID>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<IPv4>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnVector<IPv6>, ColumnFixedSizeHelper>;
+
+template class IColumnHelper<ColumnDecimal<Decimal32>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnDecimal<Decimal64>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnDecimal<Decimal128>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnDecimal<Decimal256>, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnDecimal<DateTime64>, ColumnFixedSizeHelper>;
+
+template class IColumnHelper<ColumnFixedString, ColumnFixedSizeHelper>;
+template class IColumnHelper<ColumnString, IColumn>;
+
+template class IColumnHelper<ColumnLowCardinality, IColumn>;
+template class IColumnHelper<ColumnNullable, IColumn>;
+template class IColumnHelper<ColumnConst, IColumn>;
+template class IColumnHelper<ColumnArray, IColumn>;
+template class IColumnHelper<ColumnTuple, IColumn>;
+template class IColumnHelper<ColumnMap, IColumn>;
+template class IColumnHelper<ColumnSparse, IColumn>;
+template class IColumnHelper<ColumnObject, IColumn>;
+template class IColumnHelper<ColumnAggregateFunction, IColumn>;
+template class IColumnHelper<ColumnFunction, IColumn>;
+template class IColumnHelper<ColumnCompressed, IColumn>;
+template class IColumnHelper<ColumnVariant, IColumn>;
+
+template class IColumnHelper<IColumnDummy, IColumn>;
+
 }
diff --git a/src/Columns/IColumn.h b/src/Columns/IColumn.h
index f012eeca61f..cea8d7c9f55 100644
--- a/src/Columns/IColumn.h
+++ b/src/Columns/IColumn.h
@@ -34,6 +34,7 @@ class Arena;
 class ColumnGathererStream;
 class Field;
 class WeakHash32;
+class ColumnConst;
 
 /*
  * Represents a set of equal ranges in previous column to perform sorting in current column.
@@ -165,6 +166,10 @@ public:
     /// Is used to transform raw strings to Blocks (for example, inside input format parsers)
     virtual void insert(const Field & x) = 0;
 
+    /// Appends new value at the end of the column if it has appropriate type and
+    /// returns true if insert is successful and false otherwise.
+    virtual bool tryInsert(const Field & x) = 0;
+
     /// Appends n-th element from other column with the same type.
     /// Is used in merge-sort and merges. It could be implemented in inherited classes more optimally than default implementation.
     virtual void insertFrom(const IColumn & src, size_t n);
@@ -218,15 +223,46 @@ public:
       *  For example, to obtain unambiguous representation of Array of strings, strings data should be interleaved with their sizes.
       * Parameter begin should be used with Arena::allocContinue.
       */
-    virtual StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin, const UInt8 * null_bit = nullptr) const = 0;
+    virtual StringRef serializeValueIntoArena(size_t /* n */, Arena & /* arena */, char const *& /* begin */) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoArena is not supported for {}", getName());
+    }
+
+    /// Same as above but serialize into already allocated continuous memory.
+    /// Return pointer to the end of the serialization data.
+    virtual char * serializeValueIntoMemory(size_t /* n */, char * /* memory */) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoMemory is not supported for {}", getName());
+    }
+
+    /// Nullable variant to avoid calling virtualized method inside ColumnNullable.
+    virtual StringRef
+    serializeValueIntoArenaWithNull(size_t /* n */, Arena & /* arena */, char const *& /* begin */, const UInt8 * /* is_null */) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoArenaWithNull is not supported for {}", getName());
+    }
+
+    virtual char * serializeValueIntoMemoryWithNull(size_t /* n */, char * /* memory */, const UInt8 * /* is_null */) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeValueIntoMemoryWithNull is not supported for {}", getName());
+    }
+
+    /// Calculate all the sizes of serialized data in column, then added to `sizes`.
+    /// If `is_null` is not nullptr, also take null bit into account.
+    /// This is currently used to facilitate the allocation of memory for an entire continuous row
+    /// in a single step. For more details, refer to the HashMethodSerialized implementation.
+    virtual void collectSerializedValueSizes(PaddedPODArray<UInt64> & /* sizes */, const UInt8 * /* is_null */) const
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method collectSerializedValueSizes is not supported for {}", getName());
+    }
 
     /// Deserializes a value that was serialized using IColumn::serializeValueIntoArena method.
     /// Returns pointer to the position after the read data.
-    virtual const char * deserializeAndInsertFromArena(const char * pos) = 0;
+    [[nodiscard]] virtual const char * deserializeAndInsertFromArena(const char * pos) = 0;
 
     /// Skip previously serialized value that was serialized using IColumn::serializeValueIntoArena method.
     /// Returns a pointer to the position after the deserialized data.
-    virtual const char * skipSerializedInArena(const char *) const = 0;
+    [[nodiscard]] virtual const char * skipSerializedInArena(const char *) const = 0;
 
     /// Update state of hash function with value of n-th element.
     /// On subsequent calls of this method for sequence of column values of arbitrary types,
@@ -399,10 +435,7 @@ public:
 
     /// Requests the removal of unused capacity.
     /// It is a non-binding request to reduce the capacity of the underlying container to its size.
-    virtual MutablePtr shrinkToFit() const
-    {
-        return cloneResized(size());
-    }
+    virtual void shrinkToFit() {}
 
     /// If we have another column as a source (owner of data), copy all data to ourself and reset source.
     virtual void ensureOwnership() {}
@@ -462,10 +495,10 @@ public:
 
     /// Returns column with @total_size elements.
     /// In result column values from current column are at positions from @offsets.
-    /// Other values are filled by @default_value.
+    /// Other values are filled by value from @column_with_default_value.
     /// @shift means how much rows to skip from the beginning of current column.
     /// Used to create full column from sparse.
-    [[nodiscard]] virtual Ptr createWithOffsets(const Offsets & offsets, const Field & default_field, size_t total_rows, size_t shift) const;
+    [[nodiscard]] virtual Ptr createWithOffsets(const Offsets & offsets, const ColumnConst & column_with_default_value, size_t total_rows, size_t shift) const;
 
     /// Compress column in memory to some representation that allows to decompress it back.
     /// Return itself if compression is not applicable for this column type.
@@ -572,43 +605,18 @@ public:
     [[nodiscard]] String dumpStructure() const;
 
 protected:
-    /// Template is to devirtualize calls to insertFrom method.
-    /// In derived classes (that use final keyword), implement scatter method as call to scatterImpl.
-    template <typename Derived>
-    std::vector<MutablePtr> scatterImpl(ColumnIndex num_columns, const Selector & selector) const;
-
-    template <typename Derived, bool reversed, bool use_indexes>
-    void compareImpl(const Derived & rhs, size_t rhs_row_num,
-                     PaddedPODArray<UInt64> * row_indexes,
-                     PaddedPODArray<Int8> & compare_results,
-                     int nan_direction_hint) const;
-
-    template <typename Derived>
-    void doCompareColumn(const Derived & rhs, size_t rhs_row_num,
-                         PaddedPODArray<UInt64> * row_indexes,
-                         PaddedPODArray<Int8> & compare_results,
-                         int direction, int nan_direction_hint) const;
-
-    template <typename Derived>
-    bool hasEqualValuesImpl() const;
-
-    /// Template is to devirtualize calls to 'isDefaultAt' method.
-    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;
-
     template <typename Compare, typename Sort, typename PartialSort>
-    void getPermutationImpl(size_t limit, Permutation & res, Compare compare,
-                        Sort full_sort, PartialSort partial_sort) const;
+    void getPermutationImpl(size_t limit, Permutation & res, Compare compare, Sort full_sort, PartialSort partial_sort) const;
 
     template <typename Compare, typename Equals, typename Sort, typename PartialSort>
-    void updatePermutationImpl(size_t limit, Permutation & res, EqualRanges & equal_ranges, Compare compare, Equals equals,
-                        Sort full_sort, PartialSort partial_sort) const;
+    void updatePermutationImpl(
+        size_t limit,
+        Permutation & res,
+        EqualRanges & equal_ranges,
+        Compare compare,
+        Equals equals,
+        Sort full_sort,
+        PartialSort partial_sort) const;
 };
 
 using ColumnPtr = IColumn::Ptr;
@@ -625,7 +633,7 @@ struct IsMutableColumns;
 template <typename Arg, typename ... Args>
 struct IsMutableColumns<Arg, Args ...>
 {
-    static const bool value = std::is_assignable<MutableColumnPtr &&, Arg>::value && IsMutableColumns<Args ...>::value;
+    static const bool value = std::is_assignable_v<MutableColumnPtr &&, Arg> && IsMutableColumns<Args ...>::value;
 };
 
 template <>
@@ -662,4 +670,50 @@ bool isColumnConst(const IColumn & column);
 /// True if column's an ColumnNullable instance. It's just a syntax sugar for type check.
 bool isColumnNullable(const IColumn & column);
 
+/// True if column's is ColumnNullable or ColumnLowCardinality with nullable nested column.
+bool isColumnNullableOrLowCardinalityNullable(const IColumn & column);
+
+/// Implement methods to devirtualize some calls of IColumn in final descendents.
+/// `typename Parent` is needed because some columns don't inherit IColumn directly.
+/// See ColumnFixedSizeHelper for example.
+template <typename Derived, typename Parent = IColumn>
+class IColumnHelper : public Parent
+{
+    /// Devirtualize insertFrom.
+    MutableColumns scatter(IColumn::ColumnIndex num_columns, const IColumn::Selector & selector) const override;
+
+    /// Devirtualize insertFrom and insertRangeFrom.
+    void gather(ColumnGathererStream & gatherer) override;
+
+    /// Devirtualize compareAt.
+    void compareColumn(
+        const IColumn & rhs_base,
+        size_t rhs_row_num,
+        PaddedPODArray<UInt64> * row_indexes,
+        PaddedPODArray<Int8> & compare_results,
+        int direction,
+        int nan_direction_hint) const override;
+
+    /// Devirtualize compareAt.
+    bool hasEqualValues() const override;
+
+    /// Devirtualize isDefaultAt.
+    double getRatioOfDefaultRows(double sample_ratio) const override;
+
+    /// Devirtualize isDefaultAt.
+    UInt64 getNumberOfDefaultRows() const override;
+
+    /// Devirtualize isDefaultAt.
+    void getIndicesOfNonDefaultRows(IColumn::Offsets & indices, size_t from, size_t limit) const override;
+
+    /// Devirtualize byteSizeAt.
+    void collectSerializedValueSizes(PaddedPODArray<UInt64> & sizes, const UInt8 * is_null) const override;
+
+    /// Move common implementations into the same translation unit to ensure they are properly inlined.
+    char * serializeValueIntoMemoryWithNull(size_t n, char * memory, const UInt8 * is_null) const override;
+    StringRef serializeValueIntoArenaWithNull(size_t n, Arena & arena, char const *& begin, const UInt8 * is_null) const override;
+    char * serializeValueIntoMemory(size_t n, char * memory) const override;
+    StringRef serializeValueIntoArena(size_t n, Arena & arena, char const *& begin) const override;
+};
+
 }
diff --git a/src/Columns/IColumnDummy.cpp b/src/Columns/IColumnDummy.cpp
index 7c237536f94..6a85880751e 100644
--- a/src/Columns/IColumnDummy.cpp
+++ b/src/Columns/IColumnDummy.cpp
@@ -35,7 +35,7 @@ bool IColumnDummy::isDefaultAt(size_t) const
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "isDefaultAt is not implemented for {}", getName());
 }
 
-StringRef IColumnDummy::serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin, const UInt8 *) const
+StringRef IColumnDummy::serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const
 {
     /// Has to put one useless byte into Arena, because serialization into zero number of bytes is ambiguous.
     char * res = arena.allocContinue(1, begin);
diff --git a/src/Columns/IColumnDummy.h b/src/Columns/IColumnDummy.h
index 27876e28c7f..27f420fbc71 100644
--- a/src/Columns/IColumnDummy.h
+++ b/src/Columns/IColumnDummy.h
@@ -11,7 +11,7 @@ class Arena;
 /** Base class for columns-constants that contain a value that is not in the `Field`.
   * Not a full-fledged column and is used in a special way.
   */
-class IColumnDummy : public IColumn
+class IColumnDummy : public IColumnHelper<IColumnDummy>
 {
 public:
     IColumnDummy() : s(0) {}
@@ -36,6 +36,7 @@ public:
     Field operator[](size_t) const override;
     void get(size_t, Field &) const override;
     void insert(const Field &) override;
+    bool tryInsert(const Field &) override { return false; }
     bool isDefaultAt(size_t) const override;
 
     StringRef getDataAt(size_t) const override
@@ -48,8 +49,10 @@ public:
         ++s;
     }
 
-    StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin, const UInt8 *) const override;
+    StringRef serializeValueIntoArena(size_t /*n*/, Arena & arena, char const *& begin) const override;
+
     const char * deserializeAndInsertFromArena(const char * pos) override;
+
     const char * skipSerializedInArena(const char * pos) const override;
 
     void updateHashWithValue(size_t /*n*/, SipHash & /*hash*/) const override
diff --git a/src/Columns/IColumnImpl.h b/src/Columns/IColumnImpl.h
index 8e0bf0014f2..a5f88a27af0 100644
--- a/src/Columns/IColumnImpl.h
+++ b/src/Columns/IColumnImpl.h
@@ -2,7 +2,7 @@
 /**
   * This file implements template methods of IColumn that depend on other types
   * we don't want to include.
-  * Currently, this is only the scatterImpl method that depends on PODArray
+  * Currently, getPermutationImpl and updatePermutationImpl depend on PODArray
   * implementation.
   */
 
@@ -15,11 +15,6 @@
 
 namespace DB
 {
-namespace ErrorCodes
-{
-    extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
-    extern const int LOGICAL_ERROR;
-}
 
 struct DefaultSort
 {
@@ -39,186 +34,6 @@ struct DefaultPartialSort
     }
 };
 
-template <typename Derived>
-std::vector<IColumn::MutablePtr> IColumn::scatterImpl(ColumnIndex num_columns,
-                                             const Selector & selector) const
-{
-    size_t num_rows = size();
-
-    if (num_rows != selector.size())
-        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH, "Size of selector: {} doesn't match size of column: {}",
-                selector.size(), num_rows);
-
-    std::vector<MutablePtr> columns(num_columns);
-    for (auto & column : columns)
-        column = cloneEmpty();
-
-    {
-        size_t reserve_size = static_cast<size_t>(num_rows * 1.1 / num_columns);    /// 1.1 is just a guess. Better to use n-sigma rule.
-
-        if (reserve_size > 1)
-            for (auto & column : columns)
-                column->reserve(reserve_size);
-    }
-
-    for (size_t i = 0; i < num_rows; ++i)
-        static_cast<Derived &>(*columns[selector[i]]).insertFrom(*this, i);
-
-    return columns;
-}
-
-template <typename Derived, bool reversed, bool use_indexes>
-void IColumn::compareImpl(const Derived & rhs, size_t rhs_row_num,
-                          PaddedPODArray<UInt64> * row_indexes [[maybe_unused]],
-                          PaddedPODArray<Int8> & compare_results,
-                          int nan_direction_hint) const
-{
-    size_t num_rows = size();
-    size_t num_indexes = num_rows;
-    UInt64 * indexes [[maybe_unused]];
-    UInt64 * next_index [[maybe_unused]];
-
-    if constexpr (use_indexes)
-    {
-        num_indexes = row_indexes->size();
-        indexes = row_indexes->data();
-        next_index = indexes;
-    }
-
-    compare_results.resize(num_rows);
-
-    if (compare_results.empty())
-        compare_results.resize(num_rows);
-    else if (compare_results.size() != num_rows)
-        throw Exception(ErrorCodes::SIZES_OF_COLUMNS_DOESNT_MATCH, "Size of compare_results: {} doesn't match rows_num: {}",
-                compare_results.size(), num_rows);
-
-    for (size_t i = 0; i < num_indexes; ++i)
-    {
-        UInt64 row = i;
-
-        if constexpr (use_indexes)
-            row = indexes[i];
-
-        int res = static_cast<const Derived *>(this)->compareAt(row, rhs_row_num, rhs, nan_direction_hint);
-        assert(res == 1 || res == -1 || res == 0);
-        compare_results[row] = static_cast<Int8>(res);
-
-        if constexpr (reversed)
-            compare_results[row] = -compare_results[row];
-
-        if constexpr (use_indexes)
-        {
-            if (compare_results[row] == 0)
-            {
-                *next_index = row;
-                ++next_index;
-            }
-        }
-    }
-
-    if constexpr (use_indexes)
-    {
-        size_t equal_row_indexes_size = next_index - row_indexes->data();
-        row_indexes->resize(equal_row_indexes_size);
-    }
-}
-
-template <typename Derived>
-void IColumn::doCompareColumn(const Derived & rhs, size_t rhs_row_num,
-                              PaddedPODArray<UInt64> * row_indexes,
-                              PaddedPODArray<Int8> & compare_results,
-                              int direction, int nan_direction_hint) const
-{
-    if (direction < 0)
-    {
-        if (row_indexes)
-            compareImpl<Derived, true, true>(rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
-        else
-            compareImpl<Derived, true, false>(rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
-    }
-    else
-    {
-        if (row_indexes)
-            compareImpl<Derived, false, true>(rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
-        else
-            compareImpl<Derived, false, false>(rhs, rhs_row_num, row_indexes, compare_results, nan_direction_hint);
-    }
-}
-
-template <typename Derived>
-bool IColumn::hasEqualValuesImpl() const
-{
-    size_t num_rows = size();
-    for (size_t i = 1; i < num_rows; ++i)
-    {
-        if (compareAt(i, 0, static_cast<const Derived &>(*this), false) != 0)
-            return false;
-    }
-    return true;
-}
-
-template <typename Derived>
-double IColumn::getRatioOfDefaultRowsImpl(double sample_ratio) const
-{
-    if (sample_ratio <= 0.0 || sample_ratio > 1.0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR,
-            "Value of 'sample_ratio' must be in interval (0.0; 1.0], but got: {}", sample_ratio);
-
-    static constexpr auto max_number_of_rows_for_full_search = 1000;
-
-    size_t num_rows = size();
-    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 || 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);
-        num_checked_rows = num_rows;
-    }
-    else if (num_sampled_rows != 0)
-    {
-        for (size_t i = 0; i < num_rows; ++i)
-        {
-            if (num_checked_rows * num_rows <= i * num_sampled_rows)
-            {
-                res += static_cast<const Derived &>(*this).isDefaultAt(i);
-                ++num_checked_rows;
-            }
-        }
-    }
-
-    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
-{
-    size_t to = limit && from + limit < size() ? from + limit : size();
-    indices.reserve(indices.size() + to - from);
-
-    for (size_t i = from; i < to; ++i)
-    {
-        if (!static_cast<const Derived &>(*this).isDefaultAt(i))
-            indices.push_back(i);
-    }
-}
-
 template <typename ComparatorBase, IColumn::PermutationSortDirection direction, IColumn::PermutationSortStability stability>
 struct ComparatorHelperImpl : public ComparatorBase
 {
diff --git a/src/Columns/IColumnUnique.h b/src/Columns/IColumnUnique.h
index b28e40465f0..a455ddb155a 100644
--- a/src/Columns/IColumnUnique.h
+++ b/src/Columns/IColumnUnique.h
@@ -37,6 +37,10 @@ public:
     /// Is used to transform raw strings to Blocks (for example, inside input format parsers)
     virtual size_t uniqueInsert(const Field & x) = 0;
 
+    /// Appends new value at the end of column if value has appropriate type (column's size is increased by 1).
+    /// Return true if value is inserted and set @index to inserted value index and false otherwise.
+    virtual bool tryUniqueInsert(const Field & x, size_t & index) = 0;
+
     virtual size_t uniqueInsertFrom(const IColumn & src, size_t n) = 0;
     /// Appends range of elements from other column.
     /// Could be used to concatenate columns.
@@ -76,6 +80,11 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insert is not supported for ColumnUnique.");
     }
 
+    bool tryInsert(const Field &) override
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method tryInsert is not supported for ColumnUnique.");
+    }
+
     void insertRangeFrom(const IColumn &, size_t, size_t) override
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertRangeFrom is not supported for ColumnUnique.");
@@ -173,7 +182,7 @@ public:
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method hasEqualValues is not supported for ColumnUnique.");
     }
 
-    /** Given some value (usually, of type @e ColumnType) @p value that is convertible to DB::StringRef, obtains its
+    /** Given some value (usually, of type @e ColumnType) @p value that is convertible to StringRef, obtains its
      * index in the DB::ColumnUnique::reverse_index hashtable.
      *
      * The reverse index (StringRef => UInt64) is built lazily, so there are two variants:
diff --git a/src/Columns/MaskOperations.cpp b/src/Columns/MaskOperations.cpp
index b84268356a7..8f5299cf6e8 100644
--- a/src/Columns/MaskOperations.cpp
+++ b/src/Columns/MaskOperations.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 template <typename T>
-void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted)
+void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted, T default_value)
 {
     if (mask.size() < data.size())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Mask size should be no less than data size.");
@@ -38,7 +38,7 @@ void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & ma
             --from;
         }
         else
-            data[index] = T();
+            data[index] = default_value;
 
         --index;
     }
@@ -49,7 +49,7 @@ void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & ma
 
 /// Explicit instantiations - not to place the implementation of the function above in the header file.
 #define INSTANTIATE(TYPE) \
-template void expandDataByMask<TYPE>(PaddedPODArray<TYPE> &, const PaddedPODArray<UInt8> &, bool);
+template void expandDataByMask<TYPE>(PaddedPODArray<TYPE> &, const PaddedPODArray<UInt8> &, bool, TYPE);
 
 INSTANTIATE(UInt8)
 INSTANTIATE(UInt16)
@@ -78,7 +78,7 @@ INSTANTIATE(IPv6)
 #undef INSTANTIATE
 
 template <bool inverted, bool column_is_short, typename Container>
-size_t extractMaskNumericImpl(
+static size_t extractMaskNumericImpl(
     PaddedPODArray<UInt8> & mask,
     const Container & data,
     UInt8 null_value,
@@ -97,8 +97,7 @@ size_t extractMaskNumericImpl(
     size_t mask_size = mask.size();
     size_t data_size = data.size();
 
-    size_t i = 0;
-    for (; i != mask_size && data_index != data_size; ++i)
+    for (size_t i = 0; i != mask_size && data_index != data_size; ++i)
     {
         // Change mask only where value is 1.
         if (!mask[i])
@@ -142,7 +141,7 @@ size_t extractMaskNumericImpl(
 }
 
 template <bool inverted, typename NumericType>
-bool extractMaskNumeric(
+static bool extractMaskNumeric(
     PaddedPODArray<UInt8> & mask,
     const ColumnPtr & column,
     UInt8 null_value,
@@ -167,7 +166,7 @@ bool extractMaskNumeric(
 }
 
 template <bool inverted>
-MaskInfo extractMaskFromConstOrNull(
+static MaskInfo extractMaskFromConstOrNull(
     PaddedPODArray<UInt8> & mask,
     const ColumnPtr & column,
     UInt8 null_value,
@@ -196,7 +195,7 @@ MaskInfo extractMaskFromConstOrNull(
 }
 
 template <bool inverted>
-MaskInfo extractMaskImpl(
+static MaskInfo extractMaskImpl(
     PaddedPODArray<UInt8> & mask,
     const ColumnPtr & col,
     UInt8 null_value,
diff --git a/src/Columns/MaskOperations.h b/src/Columns/MaskOperations.h
index e43b4588258..e6c3291794b 100644
--- a/src/Columns/MaskOperations.h
+++ b/src/Columns/MaskOperations.h
@@ -13,7 +13,7 @@ namespace DB
 /// If inverted is true, we will work with inverted mask. This function is used in implementations of
 /// expand() method in IColumn interface.
 template <typename T>
-void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted);
+void expandDataByMask(PaddedPODArray<T> & data, const PaddedPODArray<UInt8> & mask, bool inverted, T default_value = T());
 
 struct MaskInfo
 {
@@ -58,7 +58,12 @@ void inverseMask(PaddedPODArray<UInt8> & mask, MaskInfo & mask_info);
 
 /// If given column is lazy executed argument (ColumnFunction with isShortCircuitArgument() = true),
 /// filter it by mask and then reduce. If inverted is true, we will work with inverted mask.
-void maskedExecute(ColumnWithTypeAndName & column, const PaddedPODArray<UInt8> & mask, const MaskInfo & mask_info);
+/// mask_info is used for for optimization in cases when we have all zeros or all ones in mask, so
+/// in general case this info is not used and we can skip it.
+void maskedExecute(
+    ColumnWithTypeAndName & column,
+    const PaddedPODArray<UInt8> & mask,
+    const MaskInfo & mask_info = {true, true});
 
 /// If given column is lazy executed argument, reduce it. If empty is true,
 /// create an empty column with the execution result type.
diff --git a/src/Columns/ReverseIndex.h b/src/Columns/ReverseIndex.h
index 2e59cea2c22..e2c422a0b3b 100644
--- a/src/Columns/ReverseIndex.h
+++ b/src/Columns/ReverseIndex.h
@@ -86,7 +86,7 @@ struct ReverseIndexHashTableCell
     {
         /// Careful: apparently this uses SFINAE to redefine isZero for all types
         /// except the IndexType, for which the default ZeroTraits::isZero is used.
-        static_assert(!std::is_same_v<typename std::decay<T>::type, typename std::decay<IndexType>::type>);
+        static_assert(!std::is_same_v<typename std::decay_t<T>, typename std::decay_t<IndexType>>);
         return false;
     }
 
diff --git a/src/Columns/benchmarks/CMakeLists.txt b/src/Columns/benchmarks/CMakeLists.txt
new file mode 100644
index 00000000000..47f5dfe4c59
--- /dev/null
+++ b/src/Columns/benchmarks/CMakeLists.txt
@@ -0,0 +1,4 @@
+clickhouse_add_executable(column_insert_many_from benchmark_column_insert_many_from.cpp)
+target_link_libraries (column_insert_many_from PRIVATE
+    ch_contrib::gbenchmark_all
+    dbms)
\ No newline at end of file
diff --git a/src/Columns/benchmarks/benchmark_column_insert_many_from.cpp b/src/Columns/benchmarks/benchmark_column_insert_many_from.cpp
new file mode 100644
index 00000000000..325cf5559cd
--- /dev/null
+++ b/src/Columns/benchmarks/benchmark_column_insert_many_from.cpp
@@ -0,0 +1,102 @@
+#include <cstddef>
+#include <Columns/IColumn.h>
+#include <Core/Block.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/IDataType.h>
+#include <base/types.h>
+#include <benchmark/benchmark.h>
+
+using namespace DB;
+
+static constexpr size_t ROWS = 65536;
+
+static ColumnPtr mockColumn(const DataTypePtr & type, size_t rows)
+{
+    const auto * type_array = typeid_cast<const DataTypeArray *>(type.get());
+    if (type_array)
+    {
+        auto data_col = mockColumn(type_array->getNestedType(), rows);
+        auto offset_col = ColumnArray::ColumnOffsets::create(rows);
+        auto & offsets = offset_col->getData();
+        for (size_t i = 0; i < data_col->size(); ++i)
+            offsets[i] = offsets[i - 1] + (rand() % 10);
+        auto new_data_col = data_col->replicate(offsets);
+
+        return ColumnArray::create(new_data_col, std::move(offset_col));
+    }
+
+    auto type_not_nullable = removeNullable(type);
+    auto column = type->createColumn();
+    for (size_t i = 0; i < rows; ++i)
+    {
+        if (i % 100)
+            column->insertDefault();
+        else if (isInt(type_not_nullable))
+            column->insert(i);
+        else if (isFloat(type_not_nullable))
+        {
+            double d = i * 1.0;
+            column->insert(d);
+        }
+        else if (isString(type_not_nullable))
+        {
+            String s = "helloworld";
+            column->insert(s);
+        }
+        else
+            column->insertDefault();
+    }
+    return std::move(column);
+}
+
+
+static NO_INLINE void insertManyFrom(IColumn & dst, const IColumn & src)
+{
+    size_t size = src.size();
+    dst.insertManyFrom(src, size / 2, size);
+}
+
+
+template <const std::string & str_type>
+static void BM_insertManyFrom(benchmark::State & state)
+{
+    auto type = DataTypeFactory::instance().get(str_type);
+    auto src = mockColumn(type, ROWS);
+
+    for (auto _ : state)
+    {
+        state.PauseTiming();
+        auto dst = type->createColumn();
+        dst->reserve(ROWS);
+        state.ResumeTiming();
+
+        insertManyFrom(*dst, *src);
+        benchmark::DoNotOptimize(dst);
+    }
+}
+
+static const String type_int64 = "Int64";
+static const String type_nullable_int64 = "Nullable(Int64)";
+static const String type_string = "String";
+static const String type_nullable_string = "Nullable(String)";
+static const String type_decimal = "Decimal128(3)";
+static const String type_nullable_decimal = "Nullable(Decimal128(3))";
+
+static const String type_array_int64 = "Array(Int64)";
+static const String type_array_nullable_int64 = "Array(Nullable(Int64))";
+static const String type_array_string = "Array(String)";
+static const String type_array_nullable_string = "Array(Nullable(String))";
+
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_int64);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_nullable_int64);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_string);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_nullable_string);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_decimal);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_nullable_decimal);
+
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_array_int64);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_array_nullable_int64);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_array_string);
+BENCHMARK_TEMPLATE(BM_insertManyFrom, type_array_nullable_string);
diff --git a/src/Columns/getLeastSuperColumn.cpp b/src/Columns/getLeastSuperColumn.cpp
index 6ec5ca7a9c1..4f4a5f2b9b8 100644
--- a/src/Columns/getLeastSuperColumn.cpp
+++ b/src/Columns/getLeastSuperColumn.cpp
@@ -21,7 +21,7 @@ static bool sameConstants(const IColumn & a, const IColumn & b)
 ColumnWithTypeAndName getLeastSuperColumn(const std::vector<const ColumnWithTypeAndName *> & columns)
 {
     if (columns.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no src columns for supercolumn");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No src columns for supercolumn");
 
     ColumnWithTypeAndName result = *columns[0];
 
diff --git a/src/Columns/tests/gtest_column_object.cpp b/src/Columns/tests/gtest_column_object.cpp
deleted file mode 100644
index bef16e4fb56..00000000000
--- a/src/Columns/tests/gtest_column_object.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-#include <Common/FieldVisitorsAccurateComparison.h>
-#include <DataTypes/getLeastSupertype.h>
-#include <DataTypes/ObjectUtils.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <Interpreters/castColumn.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Columns/ColumnObject.h>
-#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>
-#include <gtest/gtest.h>
-#include <random>
-
-using namespace DB;
-
-static pcg64 rng(randomSeed());
-
-Field getRandomField(size_t type)
-{
-    switch (type)
-    {
-        case 0:
-            return rng();
-        case 1:
-            return std::uniform_real_distribution<>(0.0, 1.0)(rng);
-        case 2:
-            return std::string(rng() % 10, 'a' + rng() % 26);
-        default:
-            return Field();
-    }
-}
-
-std::pair<ColumnObject::Subcolumn, std::vector<Field>> generate(size_t size)
-{
-    bool has_defaults = rng() % 3 == 0;
-    size_t num_defaults = has_defaults ? rng() % size : 0;
-
-    ColumnObject::Subcolumn subcolumn(num_defaults, false);
-    std::vector<Field> fields;
-
-    while (subcolumn.size() < size)
-    {
-        size_t part_size = rng() % (size - subcolumn.size()) + 1;
-        size_t field_type = rng() % 3;
-
-        for (size_t i = 0; i < part_size; ++i)
-        {
-            fields.push_back(getRandomField(field_type));
-            subcolumn.insert(fields.back());
-        }
-    }
-
-    std::vector<Field> result_fields;
-    for (size_t i = 0; i < num_defaults; ++i)
-        result_fields.emplace_back();
-
-    result_fields.insert(result_fields.end(), fields.begin(), fields.end());
-    return {std::move(subcolumn), std::move(result_fields)};
-}
-
-void checkFieldsAreEqual(ColumnObject::Subcolumn subcolumn, const std::vector<Field> & fields)
-{
-    ASSERT_EQ(subcolumn.size(), fields.size());
-    for (size_t i = 0; i < subcolumn.size(); ++i)
-    {
-        Field field;
-        subcolumn.get(i, field); // Also check 'get' method.
-        if (!applyVisitor(FieldVisitorAccurateEquals(), field, fields[i]))
-        {
-            std::cerr << fmt::format("Wrong value at position {}, expected {}, got {}",
-                i, applyVisitor(FieldVisitorToString(), fields[i]), applyVisitor(FieldVisitorToString(), field));
-            ASSERT_TRUE(false);
-        }
-    }
-}
-
-constexpr size_t T = 1000;
-constexpr size_t N = 1000;
-
-TEST(ColumnObject, InsertRangeFrom)
-{
-    for (size_t t = 0; t < T; ++t)
-    {
-        auto [subcolumn_dst, fields_dst] = generate(N);
-        auto [subcolumn_src, fields_src] = generate(N);
-
-        ASSERT_EQ(subcolumn_dst.size(), fields_dst.size());
-        ASSERT_EQ(subcolumn_src.size(), fields_src.size());
-
-        const auto & type_dst = subcolumn_dst.getLeastCommonType();
-        const auto & type_src = subcolumn_src.getLeastCommonType();
-        auto type_res = getLeastSupertypeOrString(DataTypes{type_dst, type_src});
-
-        size_t from = rng() % subcolumn_src.size();
-        size_t to = rng() % subcolumn_src.size();
-        if (from > to)
-            std::swap(from, to);
-        ++to;
-
-        for (auto & field : fields_dst)
-        {
-            if (field.isNull())
-                field = type_res->getDefault();
-            else
-                field = convertFieldToTypeOrThrow(field, *type_res);
-        }
-
-        for (size_t i = from; i < to; ++i)
-        {
-            if (fields_src[i].isNull())
-                fields_dst.push_back(type_res->getDefault());
-            else
-                fields_dst.push_back(convertFieldToTypeOrThrow(fields_src[i], *type_res));
-
-        }
-
-        subcolumn_dst.insertRangeFrom(subcolumn_src, from, to - from);
-        checkFieldsAreEqual(subcolumn_dst, fields_dst);
-    }
-}
-
-TEST(ColumnObject, Unflatten)
-{
-    auto check_empty_tuple = [](const auto & type, const auto & column)
-    {
-        const auto & type_tuple = assert_cast<const DataTypeTuple &>(*type);
-        const auto & column_tuple = assert_cast<const ColumnTuple &>(*column);
-
-        ASSERT_EQ(type_tuple.getElements().size(), 1);
-        ASSERT_EQ(type_tuple.getElements()[0]->getName(), "UInt8");
-        ASSERT_EQ(type_tuple.getElementNames()[0], ColumnObject::COLUMN_NAME_DUMMY);
-
-        ASSERT_EQ(column_tuple.getColumns().size(), 1);
-        ASSERT_EQ(column_tuple.getColumns()[0]->getName(), "UInt8");
-    };
-
-    {
-        auto column_object = ColumnObject::create(false);
-        auto [column, type] = unflattenObjectToTuple(*column_object);
-
-        check_empty_tuple(type, column);
-        ASSERT_EQ(column->size(), 0);
-    }
-
-    {
-        auto column_object = ColumnObject::create(false);
-        column_object->insertManyDefaults(5);
-        auto [column, type] = unflattenObjectToTuple(*column_object);
-
-        check_empty_tuple(type, column);
-        ASSERT_EQ(column->size(), 5);
-    }
-}
diff --git a/src/Columns/tests/gtest_column_unique.cpp b/src/Columns/tests/gtest_column_unique.cpp
index ab2cb42b603..15208da70fb 100644
--- a/src/Columns/tests/gtest_column_unique.cpp
+++ b/src/Columns/tests/gtest_column_unique.cpp
@@ -117,7 +117,7 @@ void column_unique_unique_deserialize_from_arena_impl(ColumnType & column, const
         const char * pos = nullptr;
         for (size_t i = 0; i < num_values; ++i)
         {
-            auto ref = column_unique_pattern->serializeValueIntoArena(idx->getUInt(i), arena, pos, nullptr);
+            auto ref = column_unique_pattern->serializeValueIntoArena(idx->getUInt(i), arena, pos);
             const char * new_pos;
             column_unique->uniqueDeserializeAndInsertFromArena(ref.data, new_pos);
             ASSERT_EQ(new_pos - ref.data, ref.size) << "Deserialized data has different sizes at position " << i;
@@ -140,8 +140,8 @@ void column_unique_unique_deserialize_from_arena_impl(ColumnType & column, const
         const char * pos_lc = nullptr;
         for (size_t i = 0; i < num_values; ++i)
         {
-            auto ref_string = column.serializeValueIntoArena(i, arena_string, pos_string, nullptr);
-            auto ref_lc = column_unique->serializeValueIntoArena(idx->getUInt(i), arena_lc, pos_lc, nullptr);
+            auto ref_string = column.serializeValueIntoArena(i, arena_string, pos_string);
+            auto ref_lc = column_unique->serializeValueIntoArena(idx->getUInt(i), arena_lc, pos_lc);
             ASSERT_EQ(ref_string, ref_lc) << "Serialized data is different from pattern at position " << i;
         }
     }
diff --git a/src/Columns/tests/gtest_column_variant.cpp b/src/Columns/tests/gtest_column_variant.cpp
new file mode 100644
index 00000000000..25f276b9600
--- /dev/null
+++ b/src/Columns/tests/gtest_column_variant.cpp
@@ -0,0 +1,692 @@
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <gtest/gtest.h>
+
+using namespace DB;
+
+TEST(ColumnVariant, CreateFromEmptyColumns)
+{
+    MutableColumns columns;
+    columns.push_back(ColumnUInt32::create());
+    columns.push_back(ColumnString::create());
+    auto column = ColumnVariant::create(std::move(columns));
+    ASSERT_TRUE(column->empty() && column->getLocalDiscriminators().empty() && column->getOffsets().empty());
+}
+
+TEST(ColumnVariant, CreateFromEmptyColumnsWithLocalOrder)
+{
+    MutableColumns columns;
+    columns.push_back(ColumnUInt32::create());
+    columns.push_back(ColumnString::create());
+    std::vector<ColumnVariant::Discriminator> local_to_global_discriminators;
+    local_to_global_discriminators.push_back(1);
+    local_to_global_discriminators.push_back(0);
+    auto column = ColumnVariant::create(std::move(columns), local_to_global_discriminators);
+    ASSERT_TRUE(column->empty() && column->getLocalDiscriminators().empty() && column->getOffsets().empty());
+    ASSERT_EQ(column->localDiscriminatorByGlobal(0), 0);
+    ASSERT_EQ(column->localDiscriminatorByGlobal(1), 1);
+    ASSERT_EQ(column->globalDiscriminatorByLocal(0), 0);
+    ASSERT_EQ(column->globalDiscriminatorByLocal(1), 1);
+}
+
+MutableColumns createColumns1()
+{
+    MutableColumns columns;
+    auto column1 = ColumnUInt64::create();
+    column1->insertValue(42);
+    columns.push_back(std::move(column1));
+    auto column2 = ColumnString::create();
+    column2->insertData("Hello", 5);
+    column2->insertData("World", 5);
+    columns.push_back(std::move(column2));
+    auto column3 = ColumnUInt32::create();
+    columns.push_back(std::move(column3));
+    return columns;
+}
+
+MutableColumnPtr createDiscriminators1()
+{
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    return discriminators_column;
+}
+
+void reorderColumns(const std::vector<ColumnVariant::Discriminator> & local_to_global_order, MutableColumns & columns)
+{
+    MutableColumns res;
+    for (auto global_discr : local_to_global_order)
+        res.push_back(std::move(columns[global_discr]));
+    columns = std::move(res);
+}
+
+template <typename Ptr>
+void reorderDiscriminators(const std::vector<ColumnVariant::Discriminator> & local_to_global_order, Ptr & discriminators)
+{
+    std::vector<ColumnVariant::Discriminator> global_to_local_order(local_to_global_order.size());
+    for (size_t i = 0; i != local_to_global_order.size(); ++i)
+        global_to_local_order[local_to_global_order[i]] = i;
+
+    auto & discriminators_data = assert_cast<ColumnVariant::ColumnDiscriminators *>(discriminators.get())->getData();
+    for (auto & discr : discriminators_data)
+    {
+        if (discr != ColumnVariant::NULL_DISCRIMINATOR)
+            discr = global_to_local_order[discr];
+    }
+}
+
+MutableColumnPtr createOffsets1()
+{
+    auto offsets = ColumnVariant::ColumnOffsets::create();
+    offsets->insertValue(0);
+    offsets->insertValue(0);
+    offsets->insertValue(0);
+    offsets->insertValue(1);
+    offsets->insertValue(0);
+    return offsets;
+}
+
+std::vector<ColumnVariant::Discriminator> createLocalToGlobalOrder1()
+{
+    std::vector<ColumnVariant::Discriminator> local_to_global_discriminators;
+    local_to_global_discriminators.push_back(1);
+    local_to_global_discriminators.push_back(2);
+    local_to_global_discriminators.push_back(0);
+    return local_to_global_discriminators;
+}
+
+void checkColumnVariant1(ColumnVariant * column)
+{
+    const auto & offsets = column->getOffsets();
+    ASSERT_EQ(column->size(), 5);
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ(offsets[1], 0);
+    ASSERT_EQ(offsets[3], 1);
+    ASSERT_TRUE(column->isDefaultAt(2) && column->isDefaultAt(4));
+    ASSERT_EQ((*column)[0].get<UInt32>(), 42);
+    ASSERT_EQ((*column)[1].get<String>(), "Hello");
+    ASSERT_TRUE((*column)[2].isNull());
+    ASSERT_EQ((*column)[3].get<String>(), "World");
+    ASSERT_TRUE((*column)[4].isNull());
+}
+
+void checkColumnVariant1Order(ColumnVariant * column)
+{
+    ASSERT_EQ(column->localDiscriminatorByGlobal(0), 2);
+    ASSERT_EQ(column->localDiscriminatorByGlobal(1), 0);
+    ASSERT_EQ(column->localDiscriminatorByGlobal(2), 1);
+    ASSERT_EQ(column->globalDiscriminatorByLocal(0), 1);
+    ASSERT_EQ(column->globalDiscriminatorByLocal(1), 2);
+    ASSERT_EQ(column->globalDiscriminatorByLocal(2), 0);
+    ASSERT_EQ(column->localDiscriminatorAt(0), 2);
+    ASSERT_EQ(column->localDiscriminatorAt(1), 0);
+    ASSERT_EQ(column->localDiscriminatorAt(2), ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(column->localDiscriminatorAt(3), 0);
+    ASSERT_EQ(column->localDiscriminatorAt(4), ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(column->globalDiscriminatorAt(0), 0);
+    ASSERT_EQ(column->globalDiscriminatorAt(1), 1);
+    ASSERT_EQ(column->globalDiscriminatorAt(2), ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(column->globalDiscriminatorAt(3), 1);
+    ASSERT_EQ(column->globalDiscriminatorAt(4), ColumnVariant::NULL_DISCRIMINATOR);
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsAndColumns)
+{
+    auto columns = createColumns1();
+    auto discriminators = createDiscriminators1();
+    auto column = ColumnVariant::create(std::move(discriminators), std::move(columns));
+    checkColumnVariant1(column.get());
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsAndColumnsWithLocalOrder)
+{
+    auto local_to_global_order = createLocalToGlobalOrder1();
+    auto columns = createColumns1();
+    reorderColumns(local_to_global_order, columns);
+    auto discriminators = createDiscriminators1();
+    reorderDiscriminators(local_to_global_order, discriminators);
+    auto column = ColumnVariant::create(std::move(discriminators), std::move(columns), createLocalToGlobalOrder1());
+    checkColumnVariant1(column.get());
+    checkColumnVariant1Order(column.get());
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsOffsetsAndColumns)
+{
+    auto columns = createColumns1();
+    auto discriminators = createDiscriminators1();
+    auto offsets = createOffsets1();
+    auto column = ColumnVariant::create(std::move(discriminators), std::move(offsets), std::move(columns));
+    checkColumnVariant1(column.get());
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsOffsetsAndColumnsWithLocalOrder)
+{
+    auto local_to_global_order = createLocalToGlobalOrder1();
+    auto columns = createColumns1();
+    reorderColumns(local_to_global_order, columns);
+    auto discriminators = createDiscriminators1();
+    reorderDiscriminators(local_to_global_order, discriminators);
+    auto offsets = createOffsets1();
+    auto column = ColumnVariant::create(std::move(discriminators), std::move(offsets), std::move(columns), createLocalToGlobalOrder1());
+    checkColumnVariant1(column.get());
+    checkColumnVariant1Order(column.get());
+}
+
+ColumnVariant::MutablePtr createVariantWithOneFullColumNoNulls(size_t size, bool change_order)
+{
+    MutableColumns columns;
+    auto column1 = ColumnUInt64::create();
+    for (size_t i = 0; i != size; ++i)
+        column1->insertValue(i);
+    columns.push_back(std::move(column1));
+    auto column2 = ColumnString::create();
+    columns.push_back(std::move(column2));
+    auto column3 = ColumnUInt32::create();
+    columns.push_back(std::move(column3));
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    for (size_t i = 0; i != size; ++i)
+        discriminators_column->insertValue(0);
+    if (change_order)
+    {
+        auto local_to_global_order = createLocalToGlobalOrder1();
+        reorderColumns(local_to_global_order, columns);
+        reorderDiscriminators(local_to_global_order, discriminators_column);
+        return ColumnVariant::create(std::move(discriminators_column), std::move(columns), createLocalToGlobalOrder1());
+    }
+    return ColumnVariant::create(std::move(discriminators_column), std::move(columns));
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsAndOneFullColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(3, false);
+    const auto & offsets = column->getOffsets();
+    ASSERT_EQ(column->size(), 3);
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ(offsets[1], 1);
+    ASSERT_EQ(offsets[2], 2);
+    ASSERT_EQ((*column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*column)[1].get<UInt64>(), 1);
+    ASSERT_EQ((*column)[2].get<UInt64>(), 2);
+}
+
+TEST(ColumnVariant, CreateFromDiscriminatorsAndOneFullColumnNoNullsWithLocalOrder)
+{
+    auto column = createVariantWithOneFullColumNoNulls(3, true);
+    const auto & offsets = column->getOffsets();
+    ASSERT_EQ(column->size(), 3);
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ(offsets[1], 1);
+    ASSERT_EQ(offsets[2], 2);
+    ASSERT_EQ((*column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*column)[1].get<UInt64>(), 1);
+    ASSERT_EQ((*column)[2].get<UInt64>(), 2);
+    ASSERT_EQ(column->localDiscriminatorAt(0), 2);
+    ASSERT_EQ(column->localDiscriminatorAt(1), 2);
+    ASSERT_EQ(column->localDiscriminatorAt(2), 2);
+    ASSERT_EQ(column->globalDiscriminatorAt(0), 0);
+    ASSERT_EQ(column->globalDiscriminatorAt(0), 0);
+    ASSERT_EQ(column->globalDiscriminatorAt(0), 0);
+}
+
+TEST(ColumnVariant, CloneResizedToEmpty)
+{
+    auto column = ColumnVariant::create(createDiscriminators1(), createOffsets1(), createColumns1());
+    auto resized_column = column->cloneResized(0);
+    ASSERT_TRUE(resized_column->empty());
+}
+
+TEST(ColumnVariant, CloneResizedToLarge)
+{
+    auto column = ColumnVariant::create(createDiscriminators1(), createOffsets1(), createColumns1());
+    auto resized_column = column->cloneResized(7);
+    const auto * resized_column_variant = assert_cast<const ColumnVariant *>(resized_column.get());
+    ASSERT_EQ(resized_column_variant->size(), 7);
+    const auto & offsets = resized_column_variant->getOffsets();
+    for (size_t i = 0; i != 7; ++i)
+    {
+        if (i == 3)
+            ASSERT_EQ(offsets[i], 1);
+        else
+            ASSERT_EQ(offsets[i], 0);
+    }
+
+    const auto & discriminators = resized_column_variant->getLocalDiscriminators();
+    std::vector<size_t> null_indexes = {2, 4, 5, 6};
+    for (size_t i : null_indexes)
+        ASSERT_EQ(discriminators[i], ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(0).size(), 1);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(1).size(), 2);
+}
+
+TEST(ColumnVariant, CloneResizedWithOneFullColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(5, false);
+    auto resized_column = column->cloneResized(3);
+    const auto * resized_column_variant = assert_cast<const ColumnVariant *>(resized_column.get());
+    ASSERT_EQ(resized_column_variant->size(), 3);
+    const auto & offsets = resized_column_variant->getOffsets();
+    for (size_t i = 0; i != 3; ++i)
+        ASSERT_EQ(offsets[i], i);
+    const auto & discriminators = resized_column_variant->getLocalDiscriminators();
+    for (size_t i = 0; i != 3; ++i)
+        ASSERT_EQ(discriminators[i], 0);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(0).size(), 3);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(1).size(), 0);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(2).size(), 0);
+}
+
+MutableColumns createColumns2()
+{
+    MutableColumns columns;
+    auto column1 = ColumnUInt64::create();
+    column1->insertValue(42);
+    column1->insertValue(43);
+    column1->insertValue(44);
+    columns.push_back(std::move(column1));
+    auto column2 = ColumnString::create();
+    column2->insertData("Hello", 5);
+    column2->insertData("World", 5);
+    columns.push_back(std::move(column2));
+    auto column3 = ColumnUInt8::create();
+    columns.push_back(std::move(column3));
+    return columns;
+}
+
+TEST(ColumnVariant, CloneResizedGeneral1)
+{
+    ///   D     c1    c2    c3
+    ///   0     42   Hello
+    ///   1     43   World
+    ///  NULL   44
+    ///   0
+    ///   1
+    ///  NULL
+    ///   0
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    auto column = ColumnVariant::create(std::move(discriminators_column), createColumns2());
+    auto resized_column = column->cloneResized(4);
+    const auto * resized_column_variant = assert_cast<const ColumnVariant *>(resized_column.get());
+    ASSERT_EQ(resized_column_variant->size(), 4);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(0).size(), 2);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(1).size(), 1);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(2).size(), 0);
+    const auto & discriminators = resized_column_variant->getLocalDiscriminators();
+    ASSERT_EQ(discriminators[0], 0);
+    ASSERT_EQ(discriminators[1], 1);
+    ASSERT_EQ(discriminators[2], ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(discriminators[3], 0);
+    const auto & offsets = resized_column_variant->getOffsets();
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ(offsets[1], 0);
+    ASSERT_EQ(offsets[3], 1);
+    ASSERT_EQ((*resized_column_variant)[0].get<UInt64>(), 42);
+    ASSERT_EQ((*resized_column_variant)[1].get<String>(), "Hello");
+    ASSERT_EQ((*resized_column_variant)[3].get<UInt64>(), 43);
+}
+
+TEST(ColumnVariant, CloneResizedGeneral2)
+{
+    ///   D     c1    c2    c3
+    ///   0     42   Hello
+    ///  NULL   43   World
+    ///  NULL   44
+    ///   0
+    ///   1
+    ///   1
+    ///   0
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(0);
+    auto column = ColumnVariant::create(std::move(discriminators_column), createColumns2());
+    auto resized_column = column->cloneResized(3);
+    const auto * resized_column_variant = assert_cast<const ColumnVariant *>(resized_column.get());
+    ASSERT_EQ(resized_column_variant->size(), 3);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(0).size(), 1);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(1).size(), 0);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(2).size(), 0);
+    const auto & discriminators = resized_column_variant->getLocalDiscriminators();
+    ASSERT_EQ(discriminators[0], 0);
+    ASSERT_EQ(discriminators[1], ColumnVariant::NULL_DISCRIMINATOR);
+    ASSERT_EQ(discriminators[2], ColumnVariant::NULL_DISCRIMINATOR);
+    const auto & offsets = resized_column_variant->getOffsets();
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ((*resized_column_variant)[0].get<UInt64>(), 42);
+}
+
+TEST(ColumnVariant, CloneResizedGeneral3)
+{
+    ///   D     c1    c2    c3
+    ///   0     42   Hello
+    ///   1     43   World
+    ///   1     44
+    ///   0
+    ///  NULL
+    ///  NULL
+    ///   0
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    auto column = ColumnVariant::create(std::move(discriminators_column), createColumns2());
+    auto resized_column = column->cloneResized(5);
+    const auto * resized_column_variant = assert_cast<const ColumnVariant *>(resized_column.get());
+    ASSERT_EQ(resized_column_variant->size(), 5);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(0).size(), 2);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(1).size(), 2);
+    ASSERT_EQ(resized_column_variant->getVariantByLocalDiscriminator(2).size(), 0);
+    const auto & discriminators = resized_column_variant->getLocalDiscriminators();
+    ASSERT_EQ(discriminators[0], 0);
+    ASSERT_EQ(discriminators[1], 1);
+    ASSERT_EQ(discriminators[2], 1);
+    ASSERT_EQ(discriminators[3], 0);
+    const auto & offsets = resized_column_variant->getOffsets();
+    ASSERT_EQ(offsets[0], 0);
+    ASSERT_EQ(offsets[1], 0);
+    ASSERT_EQ(offsets[2], 1);
+    ASSERT_EQ(offsets[3], 1);
+    ASSERT_EQ((*resized_column_variant)[0].get<UInt64>(), 42);
+    ASSERT_EQ((*resized_column_variant)[1].get<String>(), "Hello");
+    ASSERT_EQ((*resized_column_variant)[2].get<String>(), "World");
+    ASSERT_EQ((*resized_column_variant)[3].get<UInt64>(), 43);
+}
+
+MutableColumnPtr createDiscriminators2()
+{
+    auto discriminators_column = ColumnVariant::ColumnDiscriminators::create();
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    discriminators_column->insertValue(1);
+    discriminators_column->insertValue(ColumnVariant::NULL_DISCRIMINATOR);
+    discriminators_column->insertValue(0);
+    return discriminators_column;
+}
+
+std::vector<ColumnVariant::Discriminator> createLocalToGlobalOrder2()
+{
+    std::vector<ColumnVariant::Discriminator> local_to_global_discriminators;
+    local_to_global_discriminators.push_back(2);
+    local_to_global_discriminators.push_back(0);
+    local_to_global_discriminators.push_back(1);
+    return local_to_global_discriminators;
+}
+
+ColumnVariant::MutablePtr createVariantColumn1(bool reorder)
+{
+    auto columns = createColumns1();
+    auto discriminators = createDiscriminators1();
+    if (!reorder)
+        return ColumnVariant::create(std::move(discriminators), std::move(columns));
+    auto local_to_global_order = createLocalToGlobalOrder1();
+    reorderColumns(local_to_global_order, columns);
+    reorderDiscriminators(local_to_global_order, discriminators);
+    return ColumnVariant::create(std::move(discriminators), std::move(columns), local_to_global_order);
+}
+
+ColumnVariant::MutablePtr createVariantColumn2(bool reorder)
+{
+    auto columns = createColumns2();
+    auto discriminators = createDiscriminators2();
+    if (!reorder)
+        return ColumnVariant::create(std::move(discriminators), std::move(columns));
+    auto local_to_global_order = createLocalToGlobalOrder2();
+    reorderColumns(local_to_global_order, columns);
+    reorderDiscriminators(local_to_global_order, discriminators);
+    return ColumnVariant::create(std::move(discriminators), std::move(columns), local_to_global_order);
+}
+
+TEST(ColumnVariant, InsertFrom)
+{
+    for (bool change_order : {false, true})
+    {
+        auto column_to = createVariantColumn1(change_order);
+        auto column_from = createVariantColumn2(change_order);
+        column_to->insertFrom(*column_from, 3);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(5), 0);
+        ASSERT_EQ((*column_to)[5].get<UInt64>(), 43);
+    }
+}
+
+TEST(ColumnVariant, InsertRangeFromOneColumnNoNulls)
+{
+    for (bool change_order : {false, true})
+    {
+        auto column_to = createVariantColumn2(change_order);
+        auto column_from = createVariantWithOneFullColumNoNulls(5, change_order);
+        column_to->insertRangeFrom(*column_from, 2, 2);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(7), 0);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(8), 0);
+        ASSERT_EQ((*column_to)[7].get<UInt64>(), 2);
+        ASSERT_EQ((*column_to)[8].get<UInt64>(), 3);
+    }
+}
+
+TEST(ColumnVariant, InsertRangeFromGeneral)
+{
+    for (bool change_order : {false, true})
+    {
+        auto column_to = createVariantColumn1(change_order);
+        auto column_from = createVariantColumn2(change_order);
+        column_to->insertRangeFrom(*column_from, 1, 4);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(5), 1);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(6), ColumnVariant::NULL_DISCRIMINATOR);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(7), 0);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(8), 1);
+        ASSERT_EQ((*column_to)[5].get<String>(), "Hello");
+        ASSERT_EQ((*column_to)[7].get<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[8].get<String>(), "World");
+    }
+}
+
+TEST(ColumnVariant, InsertManyFrom)
+{
+    for (bool change_order : {false, true})
+    {
+        auto column_to = createVariantColumn1(change_order);
+        auto column_from = createVariantColumn2(change_order);
+        column_to->insertManyFrom(*column_from, 3, 2);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(5), 0);
+        ASSERT_EQ(column_to->globalDiscriminatorAt(6), 0);
+        ASSERT_EQ((*column_to)[5].get<UInt64>(), 43);
+        ASSERT_EQ((*column_to)[6].get<UInt64>(), 43);
+    }
+}
+
+TEST(ColumnVariant, PopBackOneColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(5, false);
+    column->popBack(3);
+    ASSERT_EQ(column->size(), 2);
+    ASSERT_EQ(column->getVariantByLocalDiscriminator(0).size(), 2);
+    ASSERT_EQ((*column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*column)[1].get<UInt64>(), 1);
+}
+
+TEST(ColumnVariant, PopBackGeneral)
+{
+    auto column = ColumnVariant::create(createDiscriminators2(), createColumns2());
+    column->popBack(4);
+    ASSERT_EQ(column->size(), 3);
+    ASSERT_EQ(column->getVariantByLocalDiscriminator(0).size(), 1);
+    ASSERT_EQ(column->getVariantByLocalDiscriminator(1).size(), 1);
+    ASSERT_EQ((*column)[0].get<UInt64>(), 42);
+    ASSERT_EQ((*column)[1].get<String>(), "Hello");
+    ASSERT_TRUE((*column)[2].isNull());
+}
+
+TEST(ColumnVariant, FilterOneColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(3, false);
+    IColumn::Filter filter;
+    filter.push_back(1);
+    filter.push_back(0);
+    filter.push_back(1);
+    auto filtered_column = column->filter(filter, -1);
+    ASSERT_EQ(filtered_column->size(), 2);
+    ASSERT_EQ((*filtered_column)[0].get<UInt64>(), 0);
+    ASSERT_EQ((*filtered_column)[1].get<UInt64>(), 2);
+}
+
+TEST(ColumnVariant, FilterGeneral)
+{
+    auto column = ColumnVariant::create(createDiscriminators2(), createColumns2());
+    IColumn::Filter filter;
+    filter.push_back(0);
+    filter.push_back(1);
+    filter.push_back(1);
+    filter.push_back(0);
+    filter.push_back(0);
+    filter.push_back(1);
+    filter.push_back(0);
+    auto filtered_column = column->filter(filter, -1);
+    ASSERT_EQ(filtered_column->size(), 3);
+    ASSERT_EQ((*filtered_column)[0].get<String>(), "Hello");
+    ASSERT_TRUE((*filtered_column)[1].isNull());
+    ASSERT_TRUE((*filtered_column)[2].isNull());
+}
+
+TEST(ColumnVariant, PermuteAndIndexOneColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(4, false);
+    IColumn::Permutation permutation;
+    permutation.push_back(1);
+    permutation.push_back(3);
+    permutation.push_back(2);
+    permutation.push_back(0);
+    auto permuted_column = column->permute(permutation, 3);
+    ASSERT_EQ(permuted_column->size(), 3);
+    ASSERT_EQ((*permuted_column)[0].get<UInt64>(), 1);
+    ASSERT_EQ((*permuted_column)[1].get<UInt64>(), 3);
+    ASSERT_EQ((*permuted_column)[2].get<UInt64>(), 2);
+
+    auto index = ColumnUInt64::create();
+    index->getData().push_back(1);
+    index->getData().push_back(3);
+    index->getData().push_back(2);
+    index->getData().push_back(0);
+    auto indexed_column = column->index(*index, 3);
+    ASSERT_EQ(indexed_column->size(), 3);
+    ASSERT_EQ((*indexed_column)[0].get<UInt64>(), 1);
+    ASSERT_EQ((*indexed_column)[1].get<UInt64>(), 3);
+    ASSERT_EQ((*indexed_column)[2].get<UInt64>(), 2);
+}
+
+TEST(ColumnVariant, PermuteGeneral)
+{
+    auto column = ColumnVariant::create(createDiscriminators2(), createColumns2());
+    IColumn::Permutation permutation;
+    permutation.push_back(3);
+    permutation.push_back(4);
+    permutation.push_back(1);
+    permutation.push_back(5);
+    auto permuted_column = column->permute(permutation, 4);
+    ASSERT_EQ(permuted_column->size(), 4);
+    ASSERT_EQ((*permuted_column)[0].get<UInt64>(), 43);
+    ASSERT_EQ((*permuted_column)[1].get<String>(), "World");
+    ASSERT_EQ((*permuted_column)[2].get<String>(), "Hello");
+    ASSERT_TRUE((*permuted_column)[3].isNull());
+}
+
+TEST(ColumnVariant, ReplicateOneColumnNoNull)
+{
+    auto column = createVariantWithOneFullColumNoNulls(3, false);
+    IColumn::Offsets offsets;
+    offsets.push_back(0);
+    offsets.push_back(3);
+    offsets.push_back(6);
+    auto replicated_column = column->replicate(offsets);
+    ASSERT_EQ(replicated_column->size(), 6);
+    ASSERT_EQ((*replicated_column)[0].get<UInt64>(), 1);
+    ASSERT_EQ((*replicated_column)[1].get<UInt64>(), 1);
+    ASSERT_EQ((*replicated_column)[2].get<UInt64>(), 1);
+    ASSERT_EQ((*replicated_column)[3].get<UInt64>(), 2);
+    ASSERT_EQ((*replicated_column)[4].get<UInt64>(), 2);
+    ASSERT_EQ((*replicated_column)[5].get<UInt64>(), 2);
+}
+
+TEST(ColumnVariant, ReplicateGeneral)
+{
+    auto column = ColumnVariant::create(createDiscriminators1(), createColumns1());
+    IColumn::Offsets offsets;
+    offsets.push_back(1);
+    offsets.push_back(3);
+    offsets.push_back(5);
+    offsets.push_back(5);
+    offsets.push_back(7);
+    auto replicated_column = column->replicate(offsets);
+    ASSERT_EQ(replicated_column->size(), 7);
+    ASSERT_EQ((*replicated_column)[0].get<UInt64>(), 42);
+    ASSERT_EQ((*replicated_column)[1].get<String>(), "Hello");
+    ASSERT_EQ((*replicated_column)[2].get<String>(), "Hello");
+    ASSERT_TRUE((*replicated_column)[3].isNull());
+    ASSERT_TRUE((*replicated_column)[4].isNull());
+    ASSERT_TRUE((*replicated_column)[5].isNull());
+    ASSERT_TRUE((*replicated_column)[6].isNull());
+}
+
+TEST(ColumnVariant, ScatterOneColumnNoNulls)
+{
+    auto column = createVariantWithOneFullColumNoNulls(5, false);
+    IColumn::Selector selector;
+    selector.push_back(0);
+    selector.push_back(1);
+    selector.push_back(2);
+    selector.push_back(0);
+    selector.push_back(1);
+    auto columns = column->scatter(3, selector);
+    ASSERT_EQ(columns[0]->size(), 2);
+    ASSERT_EQ((*columns[0])[0].get<UInt64>(), 0);
+    ASSERT_EQ((*columns[0])[1].get<UInt64>(), 3);
+    ASSERT_EQ(columns[1]->size(), 2);
+    ASSERT_EQ((*columns[1])[0].get<UInt64>(), 1);
+    ASSERT_EQ((*columns[1])[1].get<UInt64>(), 4);
+    ASSERT_EQ(columns[2]->size(), 1);
+    ASSERT_EQ((*columns[2])[0].get<UInt64>(), 2);
+}
+
+TEST(ColumnVariant, ScatterGeneral)
+{
+    auto column = ColumnVariant::create(createDiscriminators2(), createColumns2());
+    IColumn::Selector selector;
+    selector.push_back(0);
+    selector.push_back(0);
+    selector.push_back(2);
+    selector.push_back(0);
+    selector.push_back(1);
+    selector.push_back(2);
+    selector.push_back(1);
+
+    auto columns = column->scatter(3, selector);
+    ASSERT_EQ(columns[0]->size(), 3);
+    ASSERT_EQ((*columns[0])[0].get<UInt64>(), 42);
+    ASSERT_EQ((*columns[0])[1].get<String>(), "Hello");
+    ASSERT_EQ((*columns[0])[2].get<UInt64>(), 43);
+    ASSERT_EQ(columns[1]->size(), 2);
+    ASSERT_EQ((*columns[1])[0].get<String>(), "World");
+    ASSERT_EQ((*columns[1])[1].get<UInt64>(), 44);
+    ASSERT_EQ(columns[2]->size(), 2);
+    ASSERT_TRUE((*columns[2])[0].isNull());
+    ASSERT_TRUE((*columns[2])[1].isNull());
+}
diff --git a/src/Columns/tests/gtest_weak_hash_32.cpp b/src/Columns/tests/gtest_weak_hash_32.cpp
index 44337e5d3f0..2c95998761b 100644
--- a/src/Columns/tests/gtest_weak_hash_32.cpp
+++ b/src/Columns/tests/gtest_weak_hash_32.cpp
@@ -1,12 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnTuple.h>
 
@@ -14,7 +12,6 @@
 #include <DataTypes/DataTypesNumber.h>
 
 #include <Common/WeakHash.h>
-#include <base/hex.h>
 
 #include <unordered_map>
 #include <iostream>
diff --git a/src/Common/Allocator.cpp b/src/Common/Allocator.cpp
index 24a96c1c85b..e80c125c2a0 100644
--- a/src/Common/Allocator.cpp
+++ b/src/Common/Allocator.cpp
@@ -50,7 +50,7 @@ void prefaultPages([[maybe_unused]] void * buf_, [[maybe_unused]] size_t len_)
     auto [buf, len] = adjustToPageSize(buf_, len_, page_size);
     if (::madvise(buf, len, MADV_POPULATE_WRITE) < 0)
         LOG_TRACE(
-            LogFrequencyLimiter(&Poco::Logger::get("Allocator"), 1),
+            LogFrequencyLimiter(getLogger("Allocator"), 1),
             "Attempt to populate pages failed: {} (EINVAL is expected for kernels < 5.14)",
             errnoToString(errno));
 #endif
diff --git a/src/Common/AllocatorWithMemoryTracking.h b/src/Common/AllocatorWithMemoryTracking.h
index b43870e05b2..52bfe1cc3fa 100644
--- a/src/Common/AllocatorWithMemoryTracking.h
+++ b/src/Common/AllocatorWithMemoryTracking.h
@@ -26,10 +26,10 @@ struct AllocatorWithMemoryTracking
 
     [[nodiscard]] T * allocate(size_t n)
     {
-        if (n > std::numeric_limits<size_t>::max() / sizeof(T))
+        if (n > std::numeric_limits<size_t>::max() / sizeof(T)) /// NOLINT(bugprone-sizeof-expression)
             throw std::bad_alloc();
 
-        size_t bytes = n * sizeof(T);
+        size_t bytes = n * sizeof(T); /// NOLINT(bugprone-sizeof-expression)
         auto trace = CurrentMemoryTracker::alloc(bytes);
 
         T * p = static_cast<T *>(malloc(bytes));
@@ -43,7 +43,7 @@ struct AllocatorWithMemoryTracking
 
     void deallocate(T * p, size_t n) noexcept
     {
-        size_t bytes = n * sizeof(T);
+        size_t bytes = n * sizeof(T); /// NOLINT(bugprone-sizeof-expression)
 
         free(p);
         auto trace = CurrentMemoryTracker::free(bytes);
diff --git a/src/Common/Arena.h b/src/Common/Arena.h
index 917bef0d6e8..db0e4883553 100644
--- a/src/Common/Arena.h
+++ b/src/Common/Arena.h
@@ -47,11 +47,9 @@ private:
 
         std::unique_ptr<MemoryChunk> prev;
 
-        MemoryChunk()
-        {
-        }
+        MemoryChunk() = default;
 
-        void swap(MemoryChunk & other)
+        void swap(MemoryChunk & other) noexcept
         {
             std::swap(begin, other.begin);
             std::swap(pos, other.pos);
@@ -59,18 +57,18 @@ private:
             prev.swap(other.prev);
         }
 
-        MemoryChunk(MemoryChunk && other)
+        MemoryChunk(MemoryChunk && other) noexcept
         {
             *this = std::move(other);
         }
 
-        MemoryChunk & operator=(MemoryChunk && other)
+        MemoryChunk & operator=(MemoryChunk && other) noexcept
         {
             swap(other);
             return *this;
         }
 
-        MemoryChunk(size_t size_)
+        explicit MemoryChunk(size_t size_)
         {
             ProfileEvents::increment(ProfileEvents::ArenaAllocChunks);
             ProfileEvents::increment(ProfileEvents::ArenaAllocBytes, size_);
diff --git a/src/Common/AsyncLoader.cpp b/src/Common/AsyncLoader.cpp
index 0e0fa25e7a1..3bec30893b9 100644
--- a/src/Common/AsyncLoader.cpp
+++ b/src/Common/AsyncLoader.cpp
@@ -2,6 +2,8 @@
 
 #include <limits>
 #include <optional>
+#include <magic_enum.hpp>
+#include <fmt/format.h>
 #include <base/defines.h>
 #include <base/scope_guard.h>
 #include <Common/ErrorCodes.h>
@@ -34,15 +36,38 @@ namespace ErrorCodes
 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)
+void logAboutProgress(LoggerPtr log, size_t processed, size_t total, AtomicStopwatch & watch)
 {
-    if (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS))
+    if (total && (processed % PRINT_MESSAGE_EACH_N_OBJECTS == 0 || watch.compareAndRestart(PRINT_MESSAGE_EACH_N_SECONDS)))
     {
-        LOG_INFO(log, "Processed: {}%", processed * 100.0 / total);
+        LOG_INFO(log, "Processed: {:.1f}%", static_cast<double>(processed) * 100.0 / total);
         watch.restart();
     }
 }
 
+AsyncLoader::Pool::Pool(const AsyncLoader::PoolInitializer & init)
+    : name(init.name)
+    , priority(init.priority)
+    , thread_pool(std::make_unique<ThreadPool>(
+        init.metric_threads,
+        init.metric_active_threads,
+        init.metric_scheduled_threads,
+        /* max_threads = */ std::numeric_limits<size_t>::max(), // Unlimited number of threads, we do worker management ourselves
+        /* max_free_threads = */ 0, // We do not require free threads
+        /* queue_size = */0)) // Unlimited queue to avoid blocking during worker spawning
+    , max_threads(init.max_threads > 0 ? init.max_threads : getNumberOfPhysicalCPUCores())
+{}
+
+AsyncLoader::Pool::Pool(Pool&& o) noexcept
+    : name(o.name)
+    , priority(o.priority)
+    , thread_pool(std::move(o.thread_pool))
+    , ready_queue(std::move(o.ready_queue))
+    , max_threads(o.max_threads)
+    , workers(o.workers)
+    , suspended_workers(o.suspended_workers.load()) // All these constructors are needed because std::atomic is neither copy-constructible, nor move-constructible. We never move pools after init, so it is safe.
+{}
+
 void cancelOnDependencyFailure(const LoadJobPtr & self, const LoadJobPtr & dependency, std::exception_ptr & cancel)
 {
     cancel = std::make_exception_ptr(Exception(ErrorCodes::ASYNC_LOAD_CANCELED,
@@ -84,39 +109,43 @@ size_t LoadJob::waitersCount() const
     return waiters;
 }
 
-size_t LoadJob::ok()
+void LoadJob::ok()
 {
     std::unique_lock lock{mutex};
     load_status = LoadStatus::OK;
-    return finish();
+    finish();
 }
 
-size_t LoadJob::failed(const std::exception_ptr & ptr)
+void LoadJob::failed(const std::exception_ptr & ptr)
 {
     std::unique_lock lock{mutex};
     load_status = LoadStatus::FAILED;
     load_exception = ptr;
-    return finish();
+    finish();
 }
 
-size_t LoadJob::canceled(const std::exception_ptr & ptr)
+void LoadJob::canceled(const std::exception_ptr & ptr)
 {
     std::unique_lock lock{mutex};
     load_status = LoadStatus::CANCELED;
     load_exception = ptr;
-    return finish();
+    finish();
 }
 
-size_t LoadJob::finish()
+void LoadJob::finish()
 {
-    // To ensure functions are destructed before `AsyncLoader::wait()` return
+    // To ensure functions are destructed before `AsyncLoader::wait()` returns
     func = {};
     dependency_failure = {};
 
     finish_time = std::chrono::system_clock::now();
     if (waiters > 0)
         finished.notify_all();
-    return std::exchange(suspended_waiters, 0);
+    else
+    {
+        on_waiters_increment = {};
+        on_waiters_decrement = {};
+    }
 }
 
 void LoadJob::scheduled(UInt64 job_id_)
@@ -134,7 +163,7 @@ void LoadJob::enqueued()
 
 void LoadJob::execute(AsyncLoader & loader, size_t pool, const LoadJobPtr & self)
 {
-    execution_pool_id = pool;
+    execution_pool_id.store(pool);
     start_time = std::chrono::system_clock::now();
     func(loader, self);
 }
@@ -173,38 +202,35 @@ void LoadTask::remove()
     }
 }
 
-void LoadTask::detach()
-{
-    jobs.clear();
-    goal_jobs.clear();
-}
-
-
-AsyncLoader::AsyncLoader(std::vector<PoolInitializer> pool_initializers, bool log_failures_, bool log_progress_)
+AsyncLoader::AsyncLoader(std::vector<PoolInitializer> pool_initializers, bool log_failures_, bool log_progress_, bool log_events_)
     : log_failures(log_failures_)
     , log_progress(log_progress_)
-    , log(&Poco::Logger::get("AsyncLoader"))
+    , log_events(log_events_)
+    , log(getLogger("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.metric_scheduled_threads,
-                /* max_threads = */ std::numeric_limits<size_t>::max(), // Unlimited number of threads, we do worker management ourselves
-                /* max_free_threads = */ 0, // We do not require free threads
-                /* queue_size = */0), // Unlimited queue to avoid blocking during worker spawning
-            .ready_queue = {},
-            .max_threads = init.max_threads > 0 ? init.max_threads : getNumberOfPhysicalCPUCores()
-        });
+        pools.push_back(Pool(init));
 }
 
 AsyncLoader::~AsyncLoader()
 {
-    stop();
+    // All `LoadTask` objects should be destructed before AsyncLoader destruction because they hold a reference.
+    // To make sure we check for all pending jobs to be finished.
+    std::unique_lock lock{mutex};
+    if (scheduled_jobs.empty() && finished_jobs.empty())
+        return;
+
+    std::vector<String> scheduled;
+    std::vector<String> finished;
+    scheduled.reserve(scheduled_jobs.size());
+    finished.reserve(finished_jobs.size());
+    for (const auto & [job, _] : scheduled_jobs)
+        scheduled.push_back(job->name);
+    for (const auto & job : finished_jobs)
+        finished.push_back(job->name);
+    LOG_ERROR(log, "Bug. Destruction with pending ({}) and finished ({}) load jobs.", fmt::join(scheduled, ", "), fmt::join(finished, ", "));
+    abort();
 }
 
 void AsyncLoader::start()
@@ -226,6 +252,17 @@ void AsyncLoader::wait()
         for (auto & p : pools)
             p.thread_pool->wait();
         lock.lock();
+
+        // If there is no way for all jobs to finish, throw LOGICAL_ERROR instead of deadlock
+        if (!scheduled_jobs.empty() && !hasWorker(lock))
+        {
+            std::vector<String> names;
+            names.reserve(scheduled_jobs.size());
+            for (const auto & [job, _] : scheduled_jobs)
+                names.push_back(job->name);
+            LOG_ERROR(log, "Waiting for load jobs to finish while being stopped: {}.", fmt::join(names, ", "));
+            abort();
+        }
     }
 }
 
@@ -233,10 +270,12 @@ void AsyncLoader::stop()
 {
     {
         std::unique_lock lock{mutex};
-        is_running = false;
-        // NOTE: there is no need to notify because workers never wait
+        is_running = false; // NOTE: there is no need to notify because workers never wait
     }
-    wait();
+
+    // Wait for all currently running jobs to finish (and do NOT wait all pending jobs)
+    for (auto & p : pools)
+        p.thread_pool->wait();
 }
 
 void AsyncLoader::schedule(LoadTask & task)
@@ -295,6 +334,8 @@ void AsyncLoader::schedule(const LoadJobSet & jobs_to_schedule)
             ALLOW_ALLOCATIONS_IN_SCOPE;
             scheduled_jobs.try_emplace(job);
             job->scheduled(++last_job_id);
+            if (log_events)
+                LOG_DEBUG(log, "Schedule load job '{}' into {}", job->name, getPoolName(job->pool()));
         });
     }
 
@@ -498,6 +539,11 @@ std::vector<AsyncLoader::JobState> AsyncLoader::getJobStates() const
     return result;
 }
 
+size_t AsyncLoader::suspendedWorkersCount(size_t pool_id)
+{
+    return pools[pool_id].suspended_workers.load();
+}
+
 void AsyncLoader::checkCycle(const LoadJobSet & jobs, std::unique_lock<std::mutex> & lock)
 {
     LoadJobSet left = jobs;
@@ -538,19 +584,19 @@ void AsyncLoader::finish(const LoadJobPtr & job, LoadStatus status, std::excepti
     chassert(scheduled_jobs.contains(job)); // Job was pending
 
     // Notify waiters
-    size_t resumed_workers = 0; // Number of workers resumed in the execution pool of the job
     if (status == LoadStatus::OK)
-        resumed_workers = job->ok();
+        job->ok();
     else if (status == LoadStatus::FAILED)
-        resumed_workers = job->failed(reason);
+        job->failed(reason);
     else if (status == LoadStatus::CANCELED)
-        resumed_workers = job->canceled(reason);
+        job->canceled(reason);
 
-    // Adjust suspended workers count
-    if (resumed_workers)
+    if (log_events)
     {
-        Pool & pool = pools[job->executionPool()];
-        pool.suspended_workers -= resumed_workers;
+        NOEXCEPT_SCOPE({
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            LOG_DEBUG(log, "Finish load job '{}' with status {}", job->name, magic_enum::enum_name(status));
+        });
     }
 
     Info & info = scheduled_jobs[job];
@@ -568,30 +614,24 @@ void AsyncLoader::finish(const LoadJobPtr & job, LoadStatus status, std::excepti
     // Update dependent jobs
     for (const auto & dpt : dependent)
     {
-        if (auto dpt_info = scheduled_jobs.find(dpt); dpt_info != scheduled_jobs.end())
-        {
-            dpt_info->second.dependencies_left--;
-            if (!dpt_info->second.isBlocked())
-                enqueue(dpt_info->second, dpt, lock);
+        auto dpt_info = scheduled_jobs.find(dpt);
+        if (dpt_info == scheduled_jobs.end())
+            continue;
+        dpt_info->second.dependencies_left--;
+        if (!dpt_info->second.isBlocked())
+            enqueue(dpt_info->second, dpt, lock);
 
-            if (status != LoadStatus::OK)
-            {
-                std::exception_ptr cancel;
-                NOEXCEPT_SCOPE({
-                    ALLOW_ALLOCATIONS_IN_SCOPE;
-                    if (dpt->dependency_failure)
-                        dpt->dependency_failure(dpt, job, cancel);
-                });
-                // Recurse into dependent job if it should be canceled
-                if (cancel)
-                    finish(dpt, LoadStatus::CANCELED, cancel, lock);
-            }
-        }
-        else
+        if (status != LoadStatus::OK)
         {
-            // Job has already been canceled. Do not enter twice into the same job during finish recursion.
-            // This happens in {A<-B; A<-C; B<-D; C<-D} graph for D if A is failed or canceled.
-            chassert(status == LoadStatus::CANCELED);
+            std::exception_ptr cancel;
+            NOEXCEPT_SCOPE({
+                ALLOW_ALLOCATIONS_IN_SCOPE;
+                if (dpt->dependency_failure)
+                    dpt->dependency_failure(dpt, job, cancel);
+            });
+            // Recurse into dependent job if it should be canceled
+            if (cancel)
+                finish(dpt, LoadStatus::CANCELED, cancel, lock);
         }
     }
 
@@ -637,9 +677,14 @@ void AsyncLoader::prioritize(const LoadJobPtr & job, size_t new_pool_id, std::un
     }
 
     job->pool_id.store(new_pool_id);
-    // TODO(serxa): we should adjust suspended_workers and suspended_waiters here.
-    // Otherwise suspended_workers we be left inconsistent. Fix it and add a test.
-    // Scenario: schedule a job A, wait for it from a job B in the same pool, prioritize A
+
+    if (log_events)
+    {
+        NOEXCEPT_SCOPE({
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            LOG_DEBUG(log, "Prioritize load job '{}': {} -> {}", job->name, old_pool.name, new_pool.name);
+        });
+    }
 
     // Recurse into dependencies
     for (const auto & dep : job->dependencies)
@@ -697,6 +742,8 @@ void AsyncLoader::wait(std::unique_lock<std::mutex> & job_lock, const LoadJobPtr
     if (job->job_id == 0)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Load job '{}' waits for not scheduled load job '{}'", current_load_job->name, job->name);
 
+    scope_guard suspended_lock;
+
     // Deadlock detection and resolution
     if (current_load_job && job->load_status == LoadStatus::PENDING)
     {
@@ -719,38 +766,52 @@ void AsyncLoader::wait(std::unique_lock<std::mutex> & job_lock, const LoadJobPtr
         if (worker_pool == job->pool_id)
         {
             job_lock.unlock(); // Avoid reverse locking order
-            workerIsSuspendedByWait(worker_pool, job);
+            std::unique_lock lock{mutex};
             job_lock.lock();
+
+            // Rechecks are required because we have reacquired mutexes
+            if (job->load_status != LoadStatus::PENDING)
+                return; // Job is already done, no wait required
+
+            if (worker_pool == job->pool_id)
+            {
+                // To resolve "blocked pool" deadlocks we spawn a new worker for every suspended worker, if required
+                // This can lead to a visible excess of `max_threads` specified for a pool,
+                // but actual number of NOT suspended workers may exceed `max_threads` ONLY in intermittent state.
+                Pool & pool = pools[worker_pool];
+                pool.suspended_workers.fetch_add(1);
+                suspended_lock = [&pool] { chassert(pool.suspended_workers.load()); pool.suspended_workers.fetch_sub(1); };
+                if (canSpawnWorker(pool, lock))
+                    spawn(pool, lock);
+            }
         }
     }
 
+    if (job->load_status != LoadStatus::PENDING) // Shortcut just to avoid incrementing ProfileEvents
+        return;
+
+    if (log_events)
+        LOG_DEBUG(log, "Wait load job '{}' in {}", job->name, getPoolName(job->pool_id));
+
+    if (job->on_waiters_increment)
+        job->on_waiters_increment(job);
+
+    // WARNING: it is important not to throw below this point to avoid `on_waiters_increment` call w/o matching `on_waiters_decrement` call
+
     Stopwatch watch;
     job->waiters++;
     job->finished.wait(job_lock, [&] { return job->load_status != LoadStatus::PENDING; });
     job->waiters--;
     ProfileEvents::increment(ProfileEvents::AsyncLoaderWaitMicroseconds, watch.elapsedMicroseconds());
-}
 
-void AsyncLoader::workerIsSuspendedByWait(size_t pool_id, const LoadJobPtr & job)
-{
-    std::unique_lock lock{mutex};
-    std::unique_lock job_lock{job->mutex};
+    if (job->on_waiters_decrement)
+        job->on_waiters_decrement(job);
 
-    if (job->load_status != LoadStatus::PENDING)
-        return; // Job is already done, worker can continue execution
-
-    // To resolve "blocked pool" deadlocks we spawn a new worker for every suspended worker, if required
-    // This can lead to a visible excess of `max_threads` specified for a pool,
-    // but actual number of NOT suspended workers may exceed `max_threads` ONLY in intermittent state.
-    Pool & pool = pools[pool_id];
-    pool.suspended_workers++;
-    job->suspended_waiters++;
-    if (canSpawnWorker(pool, lock))
-        spawn(pool, lock);
-
-    // TODO(serxa): it is a good idea to propagate `job` and all its dependencies in `pool.ready_queue` by introducing
-    // key {suspended_waiters, ready_seqno} instead of plain `ready_seqno`, to force newly spawn workers to work on jobs
-    // that are being waited. But it doesn't affect correctness. So let's not complicate it for time being.
+    if (job->waiters == 0)
+    {
+        job->on_waiters_increment = {};
+        job->on_waiters_decrement = {};
+    }
 }
 
 bool AsyncLoader::canSpawnWorker(Pool & pool, std::unique_lock<std::mutex> &)
@@ -758,7 +819,7 @@ bool AsyncLoader::canSpawnWorker(Pool & pool, std::unique_lock<std::mutex> &)
     // TODO(serxa): optimization: we should not spawn new worker on the first enqueue during `finish()` because current worker will take this job.
     return is_running
         && !pool.ready_queue.empty()
-        && pool.workers < pool.max_threads + pool.suspended_workers
+        && pool.workers < pool.max_threads + pool.suspended_workers.load()
         && (!current_priority || *current_priority >= pool.priority);
 }
 
@@ -766,10 +827,24 @@ bool AsyncLoader::canWorkerLive(Pool & pool, std::unique_lock<std::mutex> &)
 {
     return is_running
         && !pool.ready_queue.empty()
-        && pool.workers <= pool.max_threads + pool.suspended_workers
+        && pool.workers <= pool.max_threads + pool.suspended_workers.load()
         && (!current_priority || *current_priority >= pool.priority);
 }
 
+void AsyncLoader::setCurrentPriority(std::unique_lock<std::mutex> &, std::optional<Priority> priority)
+{
+    if (log_events && current_priority != priority)
+    {
+        NOEXCEPT_SCOPE({
+            ALLOW_ALLOCATIONS_IN_SCOPE;
+            LOG_DEBUG(log, "Change current priority: {} -> {}",
+                current_priority ? std::to_string(*current_priority) : "none",
+                priority ? std::to_string(*priority) : "none");
+        });
+    }
+    current_priority = priority;
+}
+
 void AsyncLoader::updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> & lock)
 {
     // Find current priority.
@@ -780,7 +855,7 @@ void AsyncLoader::updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> & l
         if (pool.isActive() && (!priority || *priority > pool.priority))
             priority = pool.priority;
     }
-    current_priority = priority;
+    setCurrentPriority(lock, priority);
 
     // Spawn workers in all pools with current priority
     for (Pool & pool : pools)
@@ -790,12 +865,14 @@ void AsyncLoader::updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> & l
     }
 }
 
-void AsyncLoader::spawn(Pool & pool, std::unique_lock<std::mutex> &)
+void AsyncLoader::spawn(Pool & pool, std::unique_lock<std::mutex> & lock)
 {
+    setCurrentPriority(lock, pool.priority); // canSpawnWorker() ensures this would not decrease current_priority
     pool.workers++;
-    current_priority = pool.priority; // canSpawnWorker() ensures this would not decrease current_priority
     NOEXCEPT_SCOPE({
         ALLOW_ALLOCATIONS_IN_SCOPE;
+        if (log_events)
+            LOG_DEBUG(log, "Spawn loader worker #{} in {}", pool.workers, pool.name);
         pool.thread_pool->scheduleOrThrowOnError([this, &pool] { worker(pool); });
     });
 }
@@ -823,6 +900,13 @@ void AsyncLoader::worker(Pool & pool)
 
             if (!canWorkerLive(pool, lock))
             {
+                if (log_events)
+                {
+                    NOEXCEPT_SCOPE({
+                        ALLOW_ALLOCATIONS_IN_SCOPE;
+                        LOG_DEBUG(log, "Stop worker in {}", pool.name);
+                    });
+                }
                 if (--pool.workers == 0)
                     updateCurrentPriorityAndSpawn(lock); // It will spawn lower priority workers if needed
                 return;
@@ -833,6 +917,14 @@ void AsyncLoader::worker(Pool & pool)
             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
+
+            if (log_events)
+            {
+                NOEXCEPT_SCOPE({
+                    ALLOW_ALLOCATIONS_IN_SCOPE;
+                    LOG_DEBUG(log, "Execute load job '{}' in {}", job->name, pool.name);
+                });
+            }
         }
 
         ALLOW_ALLOCATIONS_IN_SCOPE;
@@ -840,7 +932,7 @@ void AsyncLoader::worker(Pool & pool)
         try
         {
             current_load_job = job.get();
-            SCOPE_EXIT({ current_load_job = nullptr; }); // Note that recursive job execution is not supported
+            SCOPE_EXIT({ current_load_job = nullptr; }); // Note that recursive job execution is not supported, but jobs can wait one another
             job->execute(*this, pool_id, job);
             exception_from_job = {};
         }
diff --git a/src/Common/AsyncLoader.h b/src/Common/AsyncLoader.h
index 85de309b153..b254c9f2482 100644
--- a/src/Common/AsyncLoader.h
+++ b/src/Common/AsyncLoader.h
@@ -15,6 +15,7 @@
 #include <Common/Priority.h>
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool_fwd.h>
+#include <Common/Logger.h>
 
 
 namespace Poco { class Logger; }
@@ -40,7 +41,7 @@ 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);
+void logAboutProgress(LoggerPtr log, size_t processed, size_t total, AtomicStopwatch & watch);
 
 // Execution status of a load job.
 enum class LoadStatus
@@ -58,7 +59,8 @@ enum class LoadStatus
 class LoadJob : private boost::noncopyable
 {
 public:
-    template <class LoadJobSetType, class Func, class DFFunc>
+    // NOTE: makeLoadJob() helper should be used instead of direct ctor call
+    template <class LoadJobSetType, class DFFunc, class Func>
     LoadJob(LoadJobSetType && dependencies_, String name_, size_t pool_id_, DFFunc && dependency_failure_, Func && func_)
         : dependencies(std::forward<LoadJobSetType>(dependencies_))
         , name(std::move(name_))
@@ -68,6 +70,19 @@ public:
         , func(std::forward<Func>(func_))
     {}
 
+    // NOTE: makeLoadJob() helper should be used instead of direct ctor call
+    template <class LoadJobSetType, class WIFunc, class WDFunc, class DFFunc, class Func>
+    LoadJob(LoadJobSetType && dependencies_, String name_, size_t pool_id_, WIFunc && on_waiters_increment_, WDFunc && on_waiters_decrement_, DFFunc && dependency_failure_, Func && func_)
+        : dependencies(std::forward<LoadJobSetType>(dependencies_))
+        , name(std::move(name_))
+        , execution_pool_id(pool_id_)
+        , pool_id(pool_id_)
+        , on_waiters_increment(std::forward<WIFunc>(on_waiters_increment_))
+        , on_waiters_decrement(std::forward<WDFunc>(on_waiters_decrement_))
+        , dependency_failure(std::forward<DFFunc>(dependency_failure_))
+        , func(std::forward<Func>(func_))
+    {}
+
     // Current job status.
     LoadStatus status() const;
     std::exception_ptr exception() const;
@@ -98,10 +113,10 @@ public:
 private:
     friend class AsyncLoader;
 
-    [[nodiscard]] size_t ok();
-    [[nodiscard]] size_t failed(const std::exception_ptr & ptr);
-    [[nodiscard]] size_t canceled(const std::exception_ptr & ptr);
-    [[nodiscard]] size_t finish();
+    void ok();
+    void failed(const std::exception_ptr & ptr);
+    void canceled(const std::exception_ptr & ptr);
+    void finish();
 
     void scheduled(UInt64 job_id_);
     void enqueued();
@@ -111,6 +126,13 @@ private:
     std::atomic<size_t> execution_pool_id;
     std::atomic<size_t> pool_id;
 
+    // Handlers that is called by every new waiting thread, just before going to sleep.
+    // If `on_waiters_increment` throws, then wait is canceled, and corresponding `on_waiters_decrement` will never be called.
+    // It can be used for counting and limits on number of waiters.
+    // Note that implementations are called under `LoadJob::mutex` and should be fast.
+    std::function<void(const LoadJobPtr & self)> on_waiters_increment;
+    std::function<void(const LoadJobPtr & self)> on_waiters_decrement;
+
     // Handler for failed or canceled dependencies.
     // If job needs to be canceled on `dependency` failure, then function should set `cancel` to a specific reason.
     // Note that implementation should be fast and cannot use AsyncLoader, because it is called under `AsyncLoader::mutex`.
@@ -122,8 +144,7 @@ private:
 
     mutable std::mutex mutex;
     mutable std::condition_variable finished;
-    mutable size_t waiters = 0; // All waiters, including suspended
-    mutable size_t suspended_waiters = 0;
+    mutable size_t waiters = 0;
     LoadStatus load_status{LoadStatus::PENDING};
     std::exception_ptr load_exception;
 
@@ -140,8 +161,50 @@ void cancelOnDependencyFailure(const LoadJobPtr & self, const LoadJobPtr & depen
 void ignoreDependencyFailure(const LoadJobPtr & self, const LoadJobPtr & dependency, std::exception_ptr & cancel);
 
 template <class F> concept LoadJobDependencyFailure = std::invocable<F, const LoadJobPtr &, const LoadJobPtr &, std::exception_ptr &>;
+template <class F> concept LoadJobOnWaiters = std::invocable<F, const LoadJobPtr &>;
 template <class F> concept LoadJobFunc = std::invocable<F, AsyncLoader &, const LoadJobPtr &>;
 
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobDependencyFailure auto && dependency_failure, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), 0, on_waiters_increment, on_waiters_decrement, std::forward<decltype(dependency_failure)>(dependency_failure), std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobDependencyFailure auto && dependency_failure, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), 0, on_waiters_increment, on_waiters_decrement, std::forward<decltype(dependency_failure)>(dependency_failure), std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, size_t pool_id, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobDependencyFailure auto && dependency_failure, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), pool_id, on_waiters_increment, on_waiters_decrement, std::forward<decltype(dependency_failure)>(dependency_failure), std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, size_t pool_id, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobDependencyFailure auto && dependency_failure, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), pool_id, on_waiters_increment, on_waiters_decrement, std::forward<decltype(dependency_failure)>(dependency_failure), std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), 0, on_waiters_increment, on_waiters_decrement, cancelOnDependencyFailure, std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), 0, on_waiters_increment, on_waiters_decrement, cancelOnDependencyFailure, std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(LoadJobSet && dependencies, size_t pool_id, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), pool_id, on_waiters_increment, on_waiters_decrement, cancelOnDependencyFailure, std::forward<decltype(func)>(func));
+}
+
+LoadJobPtr makeLoadJob(const LoadJobSet & dependencies, size_t pool_id, String name, LoadJobOnWaiters auto && on_waiters_increment, LoadJobOnWaiters auto && on_waiters_decrement, LoadJobFunc auto && func)
+{
+    return std::make_shared<LoadJob>(dependencies, std::move(name), pool_id, on_waiters_increment, on_waiters_decrement, cancelOnDependencyFailure, std::forward<decltype(func)>(func));
+}
+
+
 LoadJobPtr makeLoadJob(LoadJobSet && dependencies, String name, LoadJobDependencyFailure auto && dependency_failure, LoadJobFunc auto && func)
 {
     return std::make_shared<LoadJob>(std::move(dependencies), std::move(name), 0, std::forward<decltype(dependency_failure)>(dependency_failure), std::forward<decltype(func)>(func));
@@ -198,10 +261,6 @@ public:
     // 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; }
@@ -282,6 +341,20 @@ inline LoadTaskPtr makeLoadTask(AsyncLoader & loader, LoadJobSet && jobs, LoadJo
 // 8)  The job is destructed.
 class AsyncLoader : private boost::noncopyable
 {
+public:
+    using Metric = CurrentMetrics::Metric;
+
+    // Helper struct for AsyncLoader construction
+    struct PoolInitializer
+    {
+        String name;
+        Metric metric_threads;
+        Metric metric_active_threads;
+        Metric metric_scheduled_threads;
+        size_t max_threads; // Zero means use all CPU cores
+        Priority priority;
+    };
+
 private:
     // Thread pool for job execution.
     // Pools control the following aspects of job execution:
@@ -296,8 +369,10 @@ private:
         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 executing workers
-        size_t suspended_workers = 0; // Number of workers that are blocked by `wait()` call on a job executing in the same pool (for deadlock resolution)
+        std::atomic<size_t> suspended_workers{0}; // Number of workers that are blocked by `wait()` call on a job executing in the same pool (for deadlock resolution)
 
+        explicit Pool(const PoolInitializer & init);
+        Pool(Pool&& o) noexcept;
         bool isActive() const { return workers > 0 || !ready_queue.empty(); }
     };
 
@@ -315,22 +390,8 @@ private:
     };
 
 public:
-    using Metric = CurrentMetrics::Metric;
+    AsyncLoader(std::vector<PoolInitializer> pool_initializers, bool log_failures_, bool log_progress_, bool log_events_);
 
-    // Helper struct for AsyncLoader construction
-    struct PoolInitializer
-    {
-        String name;
-        Metric metric_threads;
-        Metric metric_active_threads;
-        Metric metric_scheduled_threads;
-        size_t max_threads; // Zero means use all CPU cores
-        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();
 
@@ -360,12 +421,16 @@ public:
     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.
+    // Jobs from pools with priority higher than `new_pool` are not changed.
     void prioritize(const LoadJobPtr & job, size_t new_pool);
 
     // Sync wait for a pending job to be finished: OK, FAILED or CANCELED status.
     // Throws if job is FAILED or CANCELED unless `no_throw` is set. Returns or throws immediately if called on non-pending job.
-    // If job was not scheduled, it will be implicitly scheduled before the wait (deadlock auto-resolution).
+    // Waiting for a not scheduled job is considered to be LOGICAL_ERROR, use waitLoad() helper instead to make sure the job is scheduled.
+    // There are more rules if `wait()` is called from another job:
+    //  1) waiting on a dependent job is considered to be LOGICAL_ERROR;
+    //  2) waiting on a job in the same pool might lead to more workers spawned in that pool to resolve "blocked pool" deadlock;
+    //  3) waiting on a job with lower priority lead to priority inheritance to avoid priority inversion.
     void wait(const LoadJobPtr & job, bool no_throw = false);
 
     // Remove finished jobs, cancel scheduled jobs, wait for executing jobs to finish and remove them.
@@ -393,9 +458,7 @@ public:
 
     // For introspection and debug only, see `system.asynchronous_loader` table.
     std::vector<JobState> getJobStates() const;
-
-    // For deadlock resolution. Should not be used directly.
-    void workerIsSuspendedByWait(size_t pool_id, const LoadJobPtr & job);
+    size_t suspendedWorkersCount(size_t pool_id);
 
 private:
     void checkCycle(const LoadJobSet & jobs, std::unique_lock<std::mutex> & lock);
@@ -407,6 +470,7 @@ private:
     void wait(std::unique_lock<std::mutex> & job_lock, const LoadJobPtr & job);
     bool canSpawnWorker(Pool & pool, std::unique_lock<std::mutex> & lock);
     bool canWorkerLive(Pool & pool, std::unique_lock<std::mutex> & lock);
+    void setCurrentPriority(std::unique_lock<std::mutex> & lock, std::optional<Priority> priority);
     void updateCurrentPriorityAndSpawn(std::unique_lock<std::mutex> & lock);
     void spawn(Pool & pool, std::unique_lock<std::mutex> & lock);
     void worker(Pool & pool);
@@ -415,7 +479,8 @@ private:
     // 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;
+    const bool log_events; // Log all important events: job start/end, waits, prioritizations
+    LoggerPtr log;
 
     mutable std::mutex mutex; // Guards all the fields below.
     bool is_running = true;
diff --git a/src/Common/AsyncTaskExecutor.h b/src/Common/AsyncTaskExecutor.h
index 3123990c1cd..5837955572e 100644
--- a/src/Common/AsyncTaskExecutor.h
+++ b/src/Common/AsyncTaskExecutor.h
@@ -46,7 +46,7 @@ public:
 class AsyncTaskExecutor
 {
 public:
-    AsyncTaskExecutor(std::unique_ptr<AsyncTask> task_);
+    explicit AsyncTaskExecutor(std::unique_ptr<AsyncTask> task_);
 
     /// Resume task execution. This method returns when task is completed or suspended.
     void resume();
diff --git a/src/Common/AsynchronousMetrics.cpp b/src/Common/AsynchronousMetrics.cpp
index 31cf1962251..ab54b180fbf 100644
--- a/src/Common/AsynchronousMetrics.cpp
+++ b/src/Common/AsynchronousMetrics.cpp
@@ -9,6 +9,7 @@
 #include <IO/MMappedFileCache.h>
 #include <IO/ReadHelpers.h>
 #include <base/errnoToString.h>
+#include <base/find_symbols.h>
 #include <base/getPageSize.h>
 #include <sys/resource.h>
 #include <chrono>
@@ -58,7 +59,7 @@ AsynchronousMetrics::AsynchronousMetrics(
     int update_period_seconds,
     const ProtocolServerMetricsFunc & protocol_server_metrics_func_)
     : update_period(update_period_seconds)
-    , log(&Poco::Logger::get("AsynchronousMetrics"))
+    , log(getLogger("AsynchronousMetrics"))
     , protocol_server_metrics_func(protocol_server_metrics_func_)
 {
 #if defined(OS_LINUX)
@@ -90,6 +91,9 @@ AsynchronousMetrics::AsynchronousMetrics(
         openFileIfExists("/sys/fs/cgroup/cpu/cpu.cfs_quota_us", cgroupcpu_cfs_quota);
     }
 
+    openFileIfExists("/proc/sys/vm/max_map_count", vm_max_map_count);
+    openFileIfExists("/proc/self/maps", vm_maps);
+
     openSensors();
     openBlockDevices();
     openEDAC();
@@ -98,7 +102,7 @@ AsynchronousMetrics::AsynchronousMetrics(
 }
 
 #if defined(OS_LINUX)
-void AsynchronousMetrics::openSensors()
+void AsynchronousMetrics::openSensors() TSA_REQUIRES(data_mutex)
 {
     LOG_TRACE(log, "Scanning /sys/class/thermal");
 
@@ -125,7 +129,7 @@ void AsynchronousMetrics::openSensors()
         catch (const ErrnoException & e)
         {
             LOG_WARNING(
-                &Poco::Logger::get("AsynchronousMetrics"),
+                getLogger("AsynchronousMetrics"),
                 "Thermal monitor '{}' exists but could not be read: {}.",
                 thermal_device_index,
                 errnoToString(e.getErrno()));
@@ -136,7 +140,7 @@ void AsynchronousMetrics::openSensors()
     }
 }
 
-void AsynchronousMetrics::openBlockDevices()
+void AsynchronousMetrics::openBlockDevices() TSA_REQUIRES(data_mutex)
 {
     LOG_TRACE(log, "Scanning /sys/block");
 
@@ -163,7 +167,7 @@ void AsynchronousMetrics::openBlockDevices()
     }
 }
 
-void AsynchronousMetrics::openEDAC()
+void AsynchronousMetrics::openEDAC() TSA_REQUIRES(data_mutex)
 {
     LOG_TRACE(log, "Scanning /sys/devices/system/edac");
 
@@ -194,7 +198,7 @@ void AsynchronousMetrics::openEDAC()
     }
 }
 
-void AsynchronousMetrics::openSensorsChips()
+void AsynchronousMetrics::openSensorsChips() TSA_REQUIRES(data_mutex)
 {
     LOG_TRACE(log, "Scanning /sys/class/hwmon");
 
@@ -254,7 +258,7 @@ void AsynchronousMetrics::openSensorsChips()
             catch (const ErrnoException & e)
             {
                 LOG_WARNING(
-                    &Poco::Logger::get("AsynchronousMetrics"),
+                    getLogger("AsynchronousMetrics"),
                     "Hardware monitor '{}', sensor '{}' exists but could not be read: {}.",
                     hwmon_name,
                     sensor_index,
@@ -281,7 +285,7 @@ void AsynchronousMetrics::stop()
     try
     {
         {
-            std::lock_guard lock{mutex};
+            std::lock_guard lock(thread_mutex);
             quit = true;
         }
 
@@ -306,11 +310,14 @@ AsynchronousMetrics::~AsynchronousMetrics()
 
 AsynchronousMetricValues AsynchronousMetrics::getValues() const
 {
-    std::lock_guard lock{mutex};
+    std::lock_guard lock(data_mutex);
     return values;
 }
 
-static auto get_next_update_time(std::chrono::seconds update_period)
+namespace
+{
+
+auto get_next_update_time(std::chrono::seconds update_period)
 {
     using namespace std::chrono;
 
@@ -334,6 +341,8 @@ static auto get_next_update_time(std::chrono::seconds update_period)
     return time_next;
 }
 
+}
+
 void AsynchronousMetrics::run()
 {
     setThreadName("AsyncMetrics");
@@ -344,9 +353,9 @@ void AsynchronousMetrics::run()
 
         {
             // Wait first, so that the first metric collection is also on even time.
-            std::unique_lock lock{mutex};
+            std::unique_lock lock(thread_mutex);
             if (wait_cond.wait_until(lock, next_update_time,
-                [this] { return quit; }))
+                [this] TSA_REQUIRES(thread_mutex) { return quit; }))
             {
                 break;
             }
@@ -364,6 +373,9 @@ void AsynchronousMetrics::run()
 }
 
 #if USE_JEMALLOC
+namespace
+{
+
 uint64_t updateJemallocEpoch()
 {
     uint64_t value = 0;
@@ -373,7 +385,7 @@ uint64_t updateJemallocEpoch()
 }
 
 template <typename Value>
-static Value saveJemallocMetricImpl(
+Value saveJemallocMetricImpl(
     AsynchronousMetricValues & values,
     const std::string & jemalloc_full_name,
     const std::string & clickhouse_full_name)
@@ -386,7 +398,7 @@ static Value saveJemallocMetricImpl(
 }
 
 template<typename Value>
-static Value saveJemallocMetric(AsynchronousMetricValues & values,
+Value saveJemallocMetric(AsynchronousMetricValues & values,
     const std::string & metric_name)
 {
     return saveJemallocMetricImpl<Value>(values,
@@ -395,13 +407,15 @@ static Value saveJemallocMetric(AsynchronousMetricValues & values,
 }
 
 template<typename Value>
-static Value saveAllArenasMetric(AsynchronousMetricValues & values,
+Value saveAllArenasMetric(AsynchronousMetricValues & values,
     const std::string & metric_name)
 {
     return saveJemallocMetricImpl<Value>(values,
         fmt::format("stats.arenas.{}.{}", MALLCTL_ARENAS_ALL, metric_name),
         fmt::format("jemalloc.arenas.all.{}", metric_name));
 }
+
+}
 #endif
 
 
@@ -547,21 +561,23 @@ AsynchronousMetrics::NetworkInterfaceStatValues::operator-(const AsynchronousMet
 #endif
 
 
-void AsynchronousMetrics::update(TimePoint update_time)
+void AsynchronousMetrics::update(TimePoint update_time, bool force_update)
 {
     Stopwatch watch;
 
     AsynchronousMetricValues new_values;
 
+    std::lock_guard lock(data_mutex);
+
     auto current_time = std::chrono::system_clock::now();
-    auto time_after_previous_update = current_time - previous_update_time;
+    auto time_since_previous_update = current_time - previous_update_time;
     previous_update_time = update_time;
 
     double update_interval = 0.;
     if (first_run)
         update_interval = update_period.count();
     else
-        update_interval = std::chrono::duration_cast<std::chrono::microseconds>(time_after_previous_update).count() / 1e6;
+        update_interval = std::chrono::duration_cast<std::chrono::microseconds>(time_since_previous_update).count() / 1e6;
     new_values["AsynchronousMetricsUpdateInterval"] = { update_interval, "Metrics update interval" };
 
     /// This is also a good indicator of system responsiveness.
@@ -655,7 +671,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
                     ReadableSize(rss),
                     ReadableSize(difference));
 
-            total_memory_tracker.setRSS(rss, free_memory_in_allocator_arenas);
+            MemoryTracker::setRSS(rss, free_memory_in_allocator_arenas);
         }
     }
 
@@ -815,7 +831,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
             if (-1 == hz)
                 throw ErrnoException(ErrorCodes::CANNOT_SYSCONF, "Cannot call 'sysconf' to obtain system HZ");
 
-            double multiplier = 1.0 / hz / (std::chrono::duration_cast<std::chrono::nanoseconds>(time_after_previous_update).count() / 1e9);
+            double multiplier = 1.0 / hz / (std::chrono::duration_cast<std::chrono::nanoseconds>(time_since_previous_update).count() / 1e9);
             size_t num_cpus = 0;
 
             ProcStatValuesOther current_other_values{};
@@ -1411,6 +1427,55 @@ void AsynchronousMetrics::update(TimePoint update_time)
         }
     }
 
+    if (vm_max_map_count)
+    {
+        try
+        {
+            vm_max_map_count->rewind();
+
+            uint64_t max_map_count = 0;
+            readText(max_map_count, *vm_max_map_count);
+            new_values["VMMaxMapCount"] = { max_map_count, "The maximum number of memory mappings a process may have (/proc/sys/vm/max_map_count)."};
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/sys/vm/max_map_count", vm_max_map_count);
+        }
+    }
+
+    if (vm_maps)
+    {
+        try
+        {
+            vm_maps->rewind();
+
+            uint64_t num_maps = 0;
+            while (!vm_maps->eof())
+            {
+                char * next_pos = find_first_symbols<'\n'>(vm_maps->position(), vm_maps->buffer().end());
+                vm_maps->position() = next_pos;
+
+                if (!vm_maps->hasPendingData())
+                    continue;
+
+                if (*vm_maps->position() == '\n')
+                {
+                    ++num_maps;
+                    ++vm_maps->position();
+                }
+            }
+            new_values["VMNumMaps"] = { num_maps,
+                "The current number of memory mappings of the process (/proc/self/maps)."
+                " If it is close to the maximum (VMMaxMapCount), you should increase the limit for vm.max_map_count in /etc/sysctl.conf"};
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+            openFileIfExists("/proc/self/maps", vm_maps);
+        }
+    }
+
     try
     {
         for (size_t i = 0, size = thermal.size(); i < size; ++i)
@@ -1572,7 +1637,7 @@ void AsynchronousMetrics::update(TimePoint update_time)
 
     /// Add more metrics as you wish.
 
-    updateImpl(new_values, update_time, current_time);
+    updateImpl(update_time, current_time, force_update, first_run, new_values);
 
     new_values["AsynchronousMetricsCalculationTimeSpent"] = { watch.elapsedSeconds(), "Time in seconds spent for calculation of asynchronous metrics (this is the overhead of asynchronous metrics)." };
 
@@ -1581,7 +1646,6 @@ void AsynchronousMetrics::update(TimePoint update_time)
     first_run = false;
 
     // Finally, update the current metrics.
-    std::lock_guard lock(mutex);
     values = new_values;
 }
 
diff --git a/src/Common/AsynchronousMetrics.h b/src/Common/AsynchronousMetrics.h
index e3b5142553b..4b3d28e80c5 100644
--- a/src/Common/AsynchronousMetrics.h
+++ b/src/Common/AsynchronousMetrics.h
@@ -56,8 +56,13 @@ struct ProtocolServerMetrics
   */
 class AsynchronousMetrics
 {
+protected:
+    using Duration = std::chrono::seconds;
+    using TimePoint = std::chrono::system_clock::time_point;
+
 public:
     using ProtocolServerMetricsFunc = std::function<std::vector<ProtocolServerMetrics>()>;
+
     AsynchronousMetrics(
         int update_period_seconds,
         const ProtocolServerMetricsFunc & protocol_server_metrics_func_);
@@ -69,62 +74,69 @@ public:
 
     void stop();
 
+    void update(TimePoint update_time, bool force_update = false);
+
     /// Returns copy of all values.
     AsynchronousMetricValues getValues() const;
 
 protected:
-    using Duration = std::chrono::seconds;
-    using TimePoint = std::chrono::system_clock::time_point;
-
     const Duration update_period;
 
-    /// Some values are incremental and we have to calculate the difference.
-    /// On first run we will only collect the values to subtract later.
-    bool first_run = true;
-    TimePoint previous_update_time;
-
-    Poco::Logger * log;
+    LoggerPtr log;
 private:
-    virtual void updateImpl(AsynchronousMetricValues & new_values, TimePoint update_time, TimePoint current_time) = 0;
+    virtual void updateImpl(TimePoint update_time, TimePoint current_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values) = 0;
     virtual void logImpl(AsynchronousMetricValues &) {}
 
     ProtocolServerMetricsFunc protocol_server_metrics_func;
 
-    mutable std::mutex mutex;
+    std::unique_ptr<ThreadFromGlobalPool> thread;
+
+    mutable std::mutex thread_mutex;
     std::condition_variable wait_cond;
-    bool quit {false};
-    AsynchronousMetricValues values;
+    bool quit TSA_GUARDED_BY(thread_mutex) = false;
+
+    mutable std::mutex data_mutex;
+
+    /// Some values are incremental and we have to calculate the difference.
+    /// On first run we will only collect the values to subtract later.
+    bool first_run TSA_GUARDED_BY(data_mutex) = true;
+    TimePoint previous_update_time TSA_GUARDED_BY(data_mutex);
+
+    AsynchronousMetricValues values TSA_GUARDED_BY(data_mutex);
 
 #if defined(OS_LINUX) || defined(OS_FREEBSD)
-    MemoryStatisticsOS memory_stat;
+    MemoryStatisticsOS memory_stat TSA_GUARDED_BY(data_mutex);
 #endif
 
 #if defined(OS_LINUX)
-    std::optional<ReadBufferFromFilePRead> meminfo;
-    std::optional<ReadBufferFromFilePRead> loadavg;
-    std::optional<ReadBufferFromFilePRead> proc_stat;
-    std::optional<ReadBufferFromFilePRead> cpuinfo;
-    std::optional<ReadBufferFromFilePRead> file_nr;
-    std::optional<ReadBufferFromFilePRead> uptime;
-    std::optional<ReadBufferFromFilePRead> net_dev;
+    std::optional<ReadBufferFromFilePRead> meminfo TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> loadavg TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> proc_stat TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> cpuinfo TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> file_nr TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> uptime TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> net_dev TSA_GUARDED_BY(data_mutex);
 
-    std::optional<ReadBufferFromFilePRead> cgroupmem_limit_in_bytes;
-    std::optional<ReadBufferFromFilePRead> cgroupmem_usage_in_bytes;
-    std::optional<ReadBufferFromFilePRead> cgroupcpu_cfs_period;
-    std::optional<ReadBufferFromFilePRead> cgroupcpu_cfs_quota;
-    std::optional<ReadBufferFromFilePRead> cgroupcpu_max;
+    std::optional<ReadBufferFromFilePRead> cgroupmem_limit_in_bytes TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> cgroupmem_usage_in_bytes TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> cgroupcpu_cfs_period TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> cgroupcpu_cfs_quota TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> cgroupcpu_max TSA_GUARDED_BY(data_mutex);
 
-    std::vector<std::unique_ptr<ReadBufferFromFilePRead>> thermal;
+    std::optional<ReadBufferFromFilePRead> vm_max_map_count TSA_GUARDED_BY(data_mutex);
+    std::optional<ReadBufferFromFilePRead> vm_maps TSA_GUARDED_BY(data_mutex);
+
+    std::vector<std::unique_ptr<ReadBufferFromFilePRead>> thermal TSA_GUARDED_BY(data_mutex);
 
     std::unordered_map<String /* device name */,
         std::unordered_map<String /* label name */,
-            std::unique_ptr<ReadBufferFromFilePRead>>> hwmon_devices;
+            std::unique_ptr<ReadBufferFromFilePRead>>> hwmon_devices TSA_GUARDED_BY(data_mutex);
 
     std::vector<std::pair<
         std::unique_ptr<ReadBufferFromFilePRead> /* correctable errors */,
-        std::unique_ptr<ReadBufferFromFilePRead> /* uncorrectable errors */>> edac;
+        std::unique_ptr<ReadBufferFromFilePRead> /* uncorrectable errors */>> edac TSA_GUARDED_BY(data_mutex);
 
-    std::unordered_map<String /* device name */, std::unique_ptr<ReadBufferFromFilePRead>> block_devs;
+    std::unordered_map<String /* device name */, std::unique_ptr<ReadBufferFromFilePRead>> block_devs TSA_GUARDED_BY(data_mutex);
 
     /// TODO: socket statistics.
 
@@ -154,9 +166,9 @@ private:
         ProcStatValuesOther operator-(const ProcStatValuesOther & other) const;
     };
 
-    ProcStatValuesCPU proc_stat_values_all_cpus{};
-    ProcStatValuesOther proc_stat_values_other{};
-    std::vector<ProcStatValuesCPU> proc_stat_values_per_cpu;
+    ProcStatValuesCPU proc_stat_values_all_cpus TSA_GUARDED_BY(data_mutex) {};
+    ProcStatValuesOther proc_stat_values_other TSA_GUARDED_BY(data_mutex) {};
+    std::vector<ProcStatValuesCPU> proc_stat_values_per_cpu TSA_GUARDED_BY(data_mutex);
 
     /// https://www.kernel.org/doc/Documentation/block/stat.txt
     struct BlockDeviceStatValues
@@ -181,7 +193,7 @@ private:
         BlockDeviceStatValues operator-(const BlockDeviceStatValues & other) const;
     };
 
-    std::unordered_map<String /* device name */, BlockDeviceStatValues> block_device_stats;
+    std::unordered_map<String /* device name */, BlockDeviceStatValues> block_device_stats TSA_GUARDED_BY(data_mutex);
 
     struct NetworkInterfaceStatValues
     {
@@ -197,9 +209,9 @@ private:
         NetworkInterfaceStatValues operator-(const NetworkInterfaceStatValues & other) const;
     };
 
-    std::unordered_map<String /* device name */, NetworkInterfaceStatValues> network_interface_stats;
+    std::unordered_map<String /* device name */, NetworkInterfaceStatValues> network_interface_stats TSA_GUARDED_BY(data_mutex);
 
-    Stopwatch block_devices_rescan_delay;
+    Stopwatch block_devices_rescan_delay TSA_GUARDED_BY(data_mutex);
 
     void openSensors();
     void openBlockDevices();
@@ -207,10 +219,7 @@ private:
     void openEDAC();
 #endif
 
-    std::unique_ptr<ThreadFromGlobalPool> thread;
-
     void run();
-    void update(TimePoint update_time);
 };
 
 }
diff --git a/src/Common/AtomicLogger.h b/src/Common/AtomicLogger.h
new file mode 100644
index 00000000000..0ece9e8a09a
--- /dev/null
+++ b/src/Common/AtomicLogger.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include <memory>
+
+#include <base/types.h>
+#include <Common/Logger.h>
+#include <Common/SharedLockGuard.h>
+#include <Common/SharedMutex.h>
+
+namespace DB
+{
+
+/** AtomicLogger allows to atomically change logger.
+  * Standard library does not have atomic_shared_ptr, and we do not use std::atomic* operations,
+  * because standard library implementation uses fixed table of mutexes, and it is better to avoid contention here.
+  */
+class AtomicLogger
+{
+public:
+    explicit AtomicLogger(LoggerPtr logger_)
+        : logger(std::move(logger_))
+    {}
+
+    explicit AtomicLogger(const std::string & log_name)
+        : AtomicLogger(::getLogger(log_name))
+    {}
+
+    void store(LoggerPtr new_logger)
+    {
+        std::lock_guard lock(log_mutex);
+        logger = std::move(new_logger);
+    }
+
+    void store(const std::string & new_log_name)
+    {
+        auto new_logger = ::getLogger(new_log_name);
+        store(std::move(new_logger));
+    }
+
+    LoggerPtr load() const
+    {
+        DB::SharedLockGuard lock(log_mutex);
+        return logger;
+    }
+
+    String loadName() const
+    {
+        DB::SharedLockGuard lock(log_mutex);
+        return logger->name();
+    }
+private:
+    mutable DB::SharedMutex log_mutex;
+    LoggerPtr logger;
+};
+
+}
diff --git a/src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp b/src/Common/BufferAllocationPolicy.cpp
similarity index 58%
rename from src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp
rename to src/Common/BufferAllocationPolicy.cpp
index 6347c1acfd7..9f9665be9b9 100644
--- a/src/IO/WriteBufferFromS3BufferAllocationPolicy.cpp
+++ b/src/Common/BufferAllocationPolicy.cpp
@@ -1,22 +1,18 @@
-#include "config.h"
-
-#if USE_AWS_S3
-
-#include <IO/WriteBufferFromS3.h>
+#include "BufferAllocationPolicy.h"
 
 #include <memory>
 
-namespace
+namespace DB
 {
 
-class FixedSizeBufferAllocationPolicy : public DB::WriteBufferFromS3::IBufferAllocationPolicy
+class FixedSizeBufferAllocationPolicy : public BufferAllocationPolicy
 {
     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)
+    explicit FixedSizeBufferAllocationPolicy(const BufferAllocationPolicy::Settings & settings_)
+        : buffer_size(settings_.strict_size)
     {
         chassert(buffer_size > 0);
     }
@@ -36,7 +32,7 @@ public:
 };
 
 
-class ExpBufferAllocationPolicy : public DB::WriteBufferFromS3::IBufferAllocationPolicy
+class ExpBufferAllocationPolicy : public DB::BufferAllocationPolicy
 {
     const size_t first_size = 0;
     const size_t second_size = 0;
@@ -49,12 +45,12 @@ class ExpBufferAllocationPolicy : public DB::WriteBufferFromS3::IBufferAllocatio
     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)
+    explicit ExpBufferAllocationPolicy(const BufferAllocationPolicy::Settings & settings_)
+        : first_size(std::max(settings_.max_single_size, settings_.min_size))
+        , second_size(settings_.min_size)
+        , multiply_factor(settings_.multiply_factor)
+        , multiply_threshold(settings_.multiply_parts_count_threshold)
+        , max_size(settings_.max_size)
     {
         chassert(first_size > 0);
         chassert(second_size > 0);
@@ -92,16 +88,12 @@ public:
     }
 };
 
-}
 
-namespace DB
+BufferAllocationPolicy::~BufferAllocationPolicy() = default;
+
+BufferAllocationPolicyPtr BufferAllocationPolicy::create(BufferAllocationPolicy::Settings settings_)
 {
-
-WriteBufferFromS3::IBufferAllocationPolicy::~IBufferAllocationPolicy() = default;
-
-WriteBufferFromS3::IBufferAllocationPolicyPtr WriteBufferFromS3::ChooseBufferPolicy(const S3Settings::RequestSettings::PartUploadSettings & settings_)
-{
-    if (settings_.strict_upload_part_size > 0)
+    if (settings_.strict_size > 0)
         return std::make_unique<FixedSizeBufferAllocationPolicy>(settings_);
     else
         return std::make_unique<ExpBufferAllocationPolicy>(settings_);
@@ -109,4 +101,3 @@ WriteBufferFromS3::IBufferAllocationPolicyPtr WriteBufferFromS3::ChooseBufferPol
 
 }
 
-#endif
diff --git a/src/Common/BufferAllocationPolicy.h b/src/Common/BufferAllocationPolicy.h
new file mode 100644
index 00000000000..7017891f9e2
--- /dev/null
+++ b/src/Common/BufferAllocationPolicy.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include "config.h"
+
+#include "logger_useful.h"
+
+#include <list>
+
+namespace DB
+{
+
+class BufferAllocationPolicy;
+using BufferAllocationPolicyPtr = std::unique_ptr<BufferAllocationPolicy>;
+
+///  Buffer number starts with 0
+class BufferAllocationPolicy
+{
+public:
+
+    struct Settings
+    {
+        size_t strict_size = 0;
+        size_t min_size = 16 * 1024 * 1024;
+        size_t max_size = 5ULL * 1024 * 1024 * 1024;
+        size_t multiply_factor = 2;
+        size_t multiply_parts_count_threshold = 500;
+        size_t max_single_size = 32 * 1024 * 1024; /// Max size for a single buffer/block
+    };
+
+    virtual size_t getBufferNumber() const = 0;
+    virtual size_t getBufferSize() const = 0;
+    virtual void nextBuffer() = 0;
+    virtual ~BufferAllocationPolicy() = 0;
+
+    static BufferAllocationPolicyPtr create(Settings settings_);
+
+};
+
+}
diff --git a/src/Common/CpuId.h b/src/Common/CPUID.h
similarity index 50%
rename from src/Common/CpuId.h
rename to src/Common/CPUID.h
index 1d15867289d..d7a714ec5af 100644
--- a/src/Common/CpuId.h
+++ b/src/Common/CPUID.h
@@ -2,7 +2,7 @@
 
 #include <base/types.h>
 
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__)
 #include <cpuid.h>
 #endif
 
@@ -11,10 +11,10 @@
 
 namespace DB
 {
-namespace Cpu
+namespace CPU
 {
 
-#if (defined(__x86_64__) || defined(__i386__))
+#if (defined(__x86_64__))
 /// Our version is independent of -mxsave option, because we do dynamic dispatch.
 inline UInt64 our_xgetbv(UInt32 xcr) noexcept
 {
@@ -30,7 +30,7 @@ inline UInt64 our_xgetbv(UInt32 xcr) noexcept
 
 inline bool cpuid(UInt32 op, UInt32 sub_op, UInt32 * res) noexcept /// NOLINT
 {
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__)
     __cpuid_count(op, sub_op, res[0], res[1], res[2], res[3]);
     return true;
 #else
@@ -45,7 +45,7 @@ inline bool cpuid(UInt32 op, UInt32 sub_op, UInt32 * res) noexcept /// NOLINT
 
 inline bool cpuid(UInt32 op, UInt32 * res) noexcept /// NOLINT
 {
-#if defined(__x86_64__) || defined(__i386__)
+#if defined(__x86_64__)
     __cpuid(op, res[0], res[1], res[2], res[3]);
     return true;
 #else
@@ -57,6 +57,249 @@ inline bool cpuid(UInt32 op, UInt32 * res) noexcept /// NOLINT
 #endif
 }
 
+union CPUInfo
+{
+    UInt32 info[4];
+
+    struct Registers
+    {
+        UInt32 eax;
+        UInt32 ebx;
+        UInt32 ecx;
+        UInt32 edx;
+    } registers;
+
+    inline explicit CPUInfo(UInt32 op) noexcept { cpuid(op, info); }
+
+    inline CPUInfo(UInt32 op, UInt32 sub_op) noexcept { cpuid(op, sub_op, info); }
+};
+
+inline bool haveRDTSCP() noexcept
+{
+    return (CPUInfo(0x80000001).registers.edx >> 27) & 1u;
+}
+
+inline bool haveSSE() noexcept
+{
+    return (CPUInfo(0x1).registers.edx >> 25) & 1u;
+}
+
+inline bool haveSSE2() noexcept
+{
+    return (CPUInfo(0x1).registers.edx >> 26) & 1u;
+}
+
+inline bool haveSSE3() noexcept
+{
+    return CPUInfo(0x1).registers.ecx & 1u;
+}
+
+inline bool havePCLMUL() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 1) & 1u;
+}
+
+inline bool haveSSSE3() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 9) & 1u;
+}
+
+inline bool haveSSE41() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 19) & 1u;
+}
+
+inline bool haveSSE42() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 20) & 1u;
+}
+
+inline bool haveF16C() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 29) & 1u;
+}
+
+inline bool havePOPCNT() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 23) & 1u;
+}
+
+inline bool haveAES() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 25) & 1u;
+}
+
+inline bool haveXSAVE() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 26) & 1u;
+}
+
+inline bool haveOSXSAVE() noexcept
+{
+    return (CPUInfo(0x1).registers.ecx >> 27) & 1u;
+}
+
+inline bool haveAVX() noexcept
+{
+#if defined(__x86_64__)
+    // http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
+    // https://bugs.chromium.org/p/chromium/issues/detail?id=375968
+    return haveOSXSAVE()                           // implies haveXSAVE()
+           && (our_xgetbv(0) & 6u) == 6u              // XMM state and YMM state are enabled by OS
+           && ((CPUInfo(0x1).registers.ecx >> 28) & 1u); // AVX bit
+#else
+    return false;
+#endif
+}
+
+inline bool haveFMA() noexcept
+{
+    return haveAVX() && ((CPUInfo(0x1).registers.ecx >> 12) & 1u);
+}
+
+inline bool haveAVX2() noexcept
+{
+    return haveAVX() && ((CPUInfo(0x7, 0).registers.ebx >> 5) & 1u);
+}
+
+inline bool haveBMI1() noexcept
+{
+    return (CPUInfo(0x7, 0).registers.ebx >> 3) & 1u;
+}
+
+inline bool haveBMI2() noexcept
+{
+    return (CPUInfo(0x7, 0).registers.ebx >> 8) & 1u;
+}
+
+inline bool haveAVX512F() noexcept
+{
+#if defined(__x86_64__)
+    // https://software.intel.com/en-us/articles/how-to-detect-knl-instruction-support
+    return haveOSXSAVE()                           // implies haveXSAVE()
+           && (our_xgetbv(0) & 6u) == 6u              // XMM state and YMM state are enabled by OS
+           && ((our_xgetbv(0) >> 5) & 7u) == 7u       // ZMM state is enabled by OS
+           && CPUInfo(0x0).registers.eax >= 0x7          // leaf 7 is present
+           && ((CPUInfo(0x7, 0).registers.ebx >> 16) & 1u); // AVX512F bit
+#else
+    return false;
+#endif
+}
+
+inline bool haveAVX512DQ() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 17) & 1u);
+}
+
+inline bool haveRDSEED() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 18) & 1u);
+}
+
+inline bool haveADX() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 19) & 1u);
+}
+
+inline bool haveAVX512IFMA() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 21) & 1u);
+}
+
+inline bool havePCOMMIT() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 22) & 1u);
+}
+
+inline bool haveCLFLUSHOPT() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 23) & 1u);
+}
+
+inline bool haveCLWB() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 24) & 1u);
+}
+
+inline bool haveAVX512PF() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 26) & 1u);
+}
+
+inline bool haveAVX512ER() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 27) & 1u);
+}
+
+inline bool haveAVX512CD() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 28) & 1u);
+}
+
+inline bool haveSHA() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ebx >> 29) & 1u);
+}
+
+inline bool haveAVX512BW() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 30) & 1u);
+}
+
+inline bool haveAVX512VL() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ebx >> 31) & 1u);
+}
+
+inline bool havePREFETCHWT1() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x7, 0).registers.ecx >> 0) & 1u);
+}
+
+inline bool haveAVX512VBMI() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ecx >> 1) & 1u);
+}
+
+inline bool haveAVX512VBMI2() noexcept
+{
+    return haveAVX512F() && ((CPUInfo(0x7, 0).registers.ecx >> 6) & 1u);
+}
+
+inline bool haveRDRAND() noexcept
+{
+    return CPUInfo(0x0).registers.eax >= 0x7 && ((CPUInfo(0x1).registers.ecx >> 30) & 1u);
+}
+
+inline bool haveAMX() noexcept
+{
+#if defined(__x86_64__)
+    // http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
+    return haveOSXSAVE()                           // implies haveXSAVE()
+           && ((our_xgetbv(0) >> 17) & 0x3) == 0x3;        // AMX state are enabled by OS
+#else
+    return false;
+#endif
+}
+
+inline bool haveAMXBF16() noexcept
+{
+    return haveAMX()
+            && ((CPUInfo(0x7, 0).registers.edx >> 22) & 1u);  // AMX-BF16 bit
+}
+
+inline bool haveAMXTILE() noexcept
+{
+    return haveAMX()
+            && ((CPUInfo(0x7, 0).registers.edx >> 24) & 1u);  // AMX-TILE bit
+}
+
+inline bool haveAMXINT8() noexcept
+{
+    return haveAMX()
+            && ((CPUInfo(0x7, 0).registers.edx >> 25) & 1u);  // AMX-INT8 bit
+}
+
 #define CPU_ID_ENUMERATE(OP) \
     OP(SSE)                  \
     OP(SSE2)                 \
@@ -98,254 +341,7 @@ inline bool cpuid(UInt32 op, UInt32 * res) noexcept /// NOLINT
     OP(AMXTILE)              \
     OP(AMXINT8)
 
-union CpuInfo
-{
-    UInt32 info[4];
-
-    struct Registers
-    {
-        UInt32 eax;
-        UInt32 ebx;
-        UInt32 ecx;
-        UInt32 edx;
-    } registers;
-
-    inline explicit CpuInfo(UInt32 op) noexcept { cpuid(op, info); }
-
-    inline CpuInfo(UInt32 op, UInt32 sub_op) noexcept { cpuid(op, sub_op, info); }
-};
-
-#define DEF_NAME(X) inline bool have##X() noexcept;
-    CPU_ID_ENUMERATE(DEF_NAME)
-#undef DEF_NAME
-
-bool haveRDTSCP() noexcept
-{
-    return (CpuInfo(0x80000001).registers.edx >> 27) & 1u;
-}
-
-bool haveSSE() noexcept
-{
-    return (CpuInfo(0x1).registers.edx >> 25) & 1u;
-}
-
-bool haveSSE2() noexcept
-{
-    return (CpuInfo(0x1).registers.edx >> 26) & 1u;
-}
-
-bool haveSSE3() noexcept
-{
-    return CpuInfo(0x1).registers.ecx & 1u;
-}
-
-bool havePCLMUL() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 1) & 1u;
-}
-
-bool haveSSSE3() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 9) & 1u;
-}
-
-bool haveSSE41() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 19) & 1u;
-}
-
-bool haveSSE42() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 20) & 1u;
-}
-
-bool haveF16C() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 29) & 1u;
-}
-
-bool havePOPCNT() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 23) & 1u;
-}
-
-bool haveAES() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 25) & 1u;
-}
-
-bool haveXSAVE() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 26) & 1u;
-}
-
-bool haveOSXSAVE() noexcept
-{
-    return (CpuInfo(0x1).registers.ecx >> 27) & 1u;
-}
-
-bool haveAVX() noexcept
-{
-#if defined(__x86_64__) || defined(__i386__)
-    // http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
-    // https://bugs.chromium.org/p/chromium/issues/detail?id=375968
-    return haveOSXSAVE()                           // implies haveXSAVE()
-           && (our_xgetbv(0) & 6u) == 6u              // XMM state and YMM state are enabled by OS
-           && ((CpuInfo(0x1).registers.ecx >> 28) & 1u); // AVX bit
-#else
-    return false;
-#endif
-}
-
-bool haveFMA() noexcept
-{
-    return haveAVX() && ((CpuInfo(0x1).registers.ecx >> 12) & 1u);
-}
-
-bool haveAVX2() noexcept
-{
-    return haveAVX() && ((CpuInfo(0x7, 0).registers.ebx >> 5) & 1u);
-}
-
-bool haveBMI1() noexcept
-{
-    return (CpuInfo(0x7, 0).registers.ebx >> 3) & 1u;
-}
-
-bool haveBMI2() noexcept
-{
-    return (CpuInfo(0x7, 0).registers.ebx >> 8) & 1u;
-}
-
-bool haveAVX512F() noexcept
-{
-#if defined(__x86_64__) || defined(__i386__)
-    // https://software.intel.com/en-us/articles/how-to-detect-knl-instruction-support
-    return haveOSXSAVE()                           // implies haveXSAVE()
-           && (our_xgetbv(0) & 6u) == 6u              // XMM state and YMM state are enabled by OS
-           && ((our_xgetbv(0) >> 5) & 7u) == 7u       // ZMM state is enabled by OS
-           && CpuInfo(0x0).registers.eax >= 0x7          // leaf 7 is present
-           && ((CpuInfo(0x7, 0).registers.ebx >> 16) & 1u); // AVX512F bit
-#else
-    return false;
-#endif
-}
-
-bool haveAVX512DQ() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 17) & 1u);
-}
-
-bool haveRDSEED() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 18) & 1u);
-}
-
-bool haveADX() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 19) & 1u);
-}
-
-bool haveAVX512IFMA() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 21) & 1u);
-}
-
-bool havePCOMMIT() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 22) & 1u);
-}
-
-bool haveCLFLUSHOPT() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 23) & 1u);
-}
-
-bool haveCLWB() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 24) & 1u);
-}
-
-bool haveAVX512PF() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 26) & 1u);
-}
-
-bool haveAVX512ER() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 27) & 1u);
-}
-
-bool haveAVX512CD() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 28) & 1u);
-}
-
-bool haveSHA() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ebx >> 29) & 1u);
-}
-
-bool haveAVX512BW() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 30) & 1u);
-}
-
-bool haveAVX512VL() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ebx >> 31) & 1u);
-}
-
-bool havePREFETCHWT1() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x7, 0).registers.ecx >> 0) & 1u);
-}
-
-bool haveAVX512VBMI() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 1) & 1u);
-}
-
-bool haveAVX512VBMI2() noexcept
-{
-    return haveAVX512F() && ((CpuInfo(0x7, 0).registers.ecx >> 6) & 1u);
-}
-
-bool haveRDRAND() noexcept
-{
-    return CpuInfo(0x0).registers.eax >= 0x7 && ((CpuInfo(0x1).registers.ecx >> 30) & 1u);
-}
-
-inline bool haveAMX() noexcept
-{
-#if defined(__x86_64__) || defined(__i386__)
-    // http://www.intel.com/content/dam/www/public/us/en/documents/manuals/64-ia-32-architectures-optimization-manual.pdf
-    return haveOSXSAVE()                           // implies haveXSAVE()
-           && ((our_xgetbv(0) >> 17) & 0x3) == 0x3;        // AMX state are enabled by OS
-#else
-    return false;
-#endif
-}
-
-bool haveAMXBF16() noexcept
-{
-    return haveAMX()
-            && ((CpuInfo(0x7, 0).registers.edx >> 22) & 1u);  // AMX-BF16 bit
-}
-
-bool haveAMXTILE() noexcept
-{
-    return haveAMX()
-            && ((CpuInfo(0x7, 0).registers.edx >> 24) & 1u);  // AMX-TILE bit
-}
-
-bool haveAMXINT8() noexcept
-{
-    return haveAMX()
-            && ((CpuInfo(0x7, 0).registers.edx >> 25) & 1u);  // AMX-INT8 bit
-}
-
-struct CpuFlagsCache
+struct CPUFlagsCache
 {
 #define DEF_NAME(X) static inline bool have_##X = have##X();
     CPU_ID_ENUMERATE(DEF_NAME)
@@ -354,4 +350,3 @@ struct CpuFlagsCache
 
 }
 }
-
diff --git a/src/Common/CalendarTimeInterval.cpp b/src/Common/CalendarTimeInterval.cpp
index b218e1d3c7c..43b0b030be0 100644
--- a/src/Common/CalendarTimeInterval.cpp
+++ b/src/Common/CalendarTimeInterval.cpp
@@ -16,26 +16,26 @@ CalendarTimeInterval::CalendarTimeInterval(const CalendarTimeInterval::Intervals
     {
         switch (kind.kind)
         {
-            case IntervalKind::Nanosecond:
-            case IntervalKind::Microsecond:
-            case IntervalKind::Millisecond:
+            case IntervalKind::Kind::Nanosecond:
+            case IntervalKind::Kind::Microsecond:
+            case IntervalKind::Kind::Millisecond:
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Sub-second intervals are not supported here");
 
-            case IntervalKind::Second:
-            case IntervalKind::Minute:
-            case IntervalKind::Hour:
-            case IntervalKind::Day:
-            case IntervalKind::Week:
+            case IntervalKind::Kind::Second:
+            case IntervalKind::Kind::Minute:
+            case IntervalKind::Kind::Hour:
+            case IntervalKind::Kind::Day:
+            case IntervalKind::Kind::Week:
                 seconds += val * kind.toAvgSeconds();
                 break;
 
-            case IntervalKind::Month:
+            case IntervalKind::Kind::Month:
                 months += val;
                 break;
-            case IntervalKind::Quarter:
+            case IntervalKind::Kind::Quarter:
                 months += val * 3;
                 break;
-            case IntervalKind::Year:
+            case IntervalKind::Kind::Year:
                 months += val * 12;
                 break;
         }
@@ -57,8 +57,8 @@ CalendarTimeInterval::Intervals CalendarTimeInterval::toIntervals() const
         }
         chassert(x == 0);
     };
-    greedy(months, {{IntervalKind::Year, 12}, {IntervalKind::Month, 1}});
-    greedy(seconds, {{IntervalKind::Week, 3600*24*7}, {IntervalKind::Day, 3600*24}, {IntervalKind::Hour, 3600}, {IntervalKind::Minute, 60}, {IntervalKind::Second, 1}});
+    greedy(months, {{IntervalKind::Kind::Year, 12}, {IntervalKind::Kind::Month, 1}});
+    greedy(seconds, {{IntervalKind::Kind::Week, 3600*24*7}, {IntervalKind::Kind::Day, 3600*24}, {IntervalKind::Kind::Hour, 3600}, {IntervalKind::Kind::Minute, 60}, {IntervalKind::Kind::Second, 1}});
     return res;
 }
 
diff --git a/src/Common/CgroupsMemoryUsageObserver.cpp b/src/Common/CgroupsMemoryUsageObserver.cpp
new file mode 100644
index 00000000000..dd68bd0da64
--- /dev/null
+++ b/src/Common/CgroupsMemoryUsageObserver.cpp
@@ -0,0 +1,338 @@
+#include <Common/CgroupsMemoryUsageObserver.h>
+
+#if defined(OS_LINUX)
+
+#include <Common/setThreadName.h>
+#include <Common/logger_useful.h>
+#include <Common/formatReadable.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadBufferFromFileDescriptor.h>
+#include <IO/ReadHelpers.h>
+#include <base/cgroupsv2.h>
+#include <base/getMemoryAmount.h>
+#include <base/sleep.h>
+
+#include <filesystem>
+#include <optional>
+
+#include "config.h"
+#if USE_JEMALLOC
+#    include <jemalloc/jemalloc.h>
+#define STRINGIFY_HELPER(x) #x
+#define STRINGIFY(x) STRINGIFY_HELPER(x)
+#endif
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int CANNOT_CLOSE_FILE;
+    extern const int CANNOT_OPEN_FILE;
+    extern const int FILE_DOESNT_EXIST;
+    extern const int INCORRECT_DATA;
+}
+
+CgroupsMemoryUsageObserver::CgroupsMemoryUsageObserver(std::chrono::seconds wait_time_)
+    : log(getLogger("CgroupsMemoryUsageObserver"))
+    , wait_time(wait_time_)
+    , memory_usage_file(log)
+{
+    LOG_INFO(log, "Initialized cgroups memory limit observer, wait time is {} sec", wait_time.count());
+}
+
+CgroupsMemoryUsageObserver::~CgroupsMemoryUsageObserver()
+{
+    stopThread();
+}
+
+void CgroupsMemoryUsageObserver::setMemoryUsageLimits(uint64_t hard_limit_, uint64_t soft_limit_)
+{
+    std::lock_guard<std::mutex> limit_lock(limit_mutex);
+
+    if (hard_limit_ == hard_limit && soft_limit_ == soft_limit)
+        return;
+
+    hard_limit = hard_limit_;
+    soft_limit = soft_limit_;
+
+    on_hard_limit = [this, hard_limit_](bool up)
+    {
+        if (up)
+        {
+            LOG_WARNING(log, "Exceeded hard memory limit ({})", ReadableSize(hard_limit_));
+
+            /// Update current usage in memory tracker. Also reset free_memory_in_allocator_arenas to zero though we don't know if they are
+            /// really zero. Trying to avoid OOM ...
+            MemoryTracker::setRSS(hard_limit_, 0);
+        }
+        else
+        {
+            LOG_INFO(log, "Dropped below hard memory limit ({})", ReadableSize(hard_limit_));
+        }
+    };
+
+    on_soft_limit = [this, soft_limit_](bool up)
+    {
+        if (up)
+        {
+            LOG_WARNING(log, "Exceeded sort memory limit ({})", ReadableSize(soft_limit_));
+
+#if USE_JEMALLOC
+            LOG_INFO(log, "Purging jemalloc arenas");
+            mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
+#endif
+            /// Reset current usage in memory tracker. Expect zero for free_memory_in_allocator_arenas as we just purged them.
+            uint64_t memory_usage = memory_usage_file.readMemoryUsage();
+            MemoryTracker::setRSS(memory_usage, 0);
+
+            LOG_INFO(log, "Purged jemalloc arenas. Current memory usage is {}", ReadableSize(memory_usage));
+        }
+        else
+        {
+            LOG_INFO(log, "Dropped below soft memory limit ({})", ReadableSize(soft_limit_));
+        }
+    };
+
+    LOG_INFO(log, "Set new limits, soft limit: {}, hard limit: {}", ReadableSize(soft_limit_), ReadableSize(hard_limit_));
+}
+
+void CgroupsMemoryUsageObserver::setOnMemoryAmountAvailableChangedFn(OnMemoryAmountAvailableChangedFn on_memory_amount_available_changed_)
+{
+    std::lock_guard<std::mutex> memory_amount_available_changed_lock(memory_amount_available_changed_mutex);
+    on_memory_amount_available_changed = on_memory_amount_available_changed_;
+}
+
+namespace
+{
+
+/// Caveats:
+/// - All of the logic in this file assumes that the current process is the only process in the
+///   containing cgroup (or more precisely: the only process with significant memory consumption).
+///   If this is not the case, then other processe's memory consumption may affect the internal
+///   memory tracker ...
+/// - Cgroups v1 and v2 allow nested cgroup hierarchies. As v1 is deprecated for over half a
+///   decade and will go away at some point, hierarchical detection is only implemented for v2.
+/// - I did not test what happens if a host has v1 and v2 simultaneously enabled. I believe such
+///   systems existed only for a short transition period.
+
+std::optional<std::string> getCgroupsV2FileName()
+{
+    if (!cgroupsV2Enabled())
+        return {};
+
+    if (!cgroupsV2MemoryControllerEnabled())
+        return {};
+
+    String cgroup = cgroupV2OfProcess();
+    auto current_cgroup = cgroup.empty() ? default_cgroups_mount : (default_cgroups_mount / cgroup);
+
+    /// Return the bottom-most nested current memory file. If there is no such file at the current
+    /// level, try again at the parent level as memory settings are inherited.
+    while (current_cgroup != default_cgroups_mount.parent_path())
+    {
+        auto path = current_cgroup / "memory.current";
+        if (std::filesystem::exists(path))
+            return {path};
+        current_cgroup = current_cgroup.parent_path();
+    }
+    return {};
+}
+
+std::optional<std::string> getCgroupsV1FileName()
+{
+    auto path = default_cgroups_mount / "memory/memory.stat";
+    if (!std::filesystem::exists(path))
+        return {};
+    return {path};
+}
+
+std::pair<std::string, CgroupsMemoryUsageObserver::CgroupsVersion> getCgroupsFileName()
+{
+    auto v2_file_name = getCgroupsV2FileName();
+    if (v2_file_name.has_value())
+        return {*v2_file_name, CgroupsMemoryUsageObserver::CgroupsVersion::V2};
+
+    auto v1_file_name = getCgroupsV1FileName();
+    if (v1_file_name.has_value())
+        return {*v1_file_name, CgroupsMemoryUsageObserver::CgroupsVersion::V1};
+
+    throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "Cannot find cgroups v1 or v2 current memory file");
+}
+
+}
+
+CgroupsMemoryUsageObserver::MemoryUsageFile::MemoryUsageFile(LoggerPtr log_)
+    : log(log_)
+{
+    std::tie(file_name, version) = getCgroupsFileName();
+
+    LOG_INFO(log, "Will read the current memory usage from '{}' (cgroups version: {})", file_name, (version == CgroupsVersion::V1) ? "v1" : "v2");
+
+    fd = ::open(file_name.data(), O_RDONLY);
+    if (fd == -1)
+        ErrnoException::throwFromPath(
+            (errno == ENOENT) ? ErrorCodes::FILE_DOESNT_EXIST : ErrorCodes::CANNOT_OPEN_FILE,
+            file_name, "Cannot open file '{}'", file_name);
+}
+
+CgroupsMemoryUsageObserver::MemoryUsageFile::~MemoryUsageFile()
+{
+    assert(fd != -1);
+    if (::close(fd) != 0)
+    {
+        try
+        {
+            ErrnoException::throwFromPath(
+                ErrorCodes::CANNOT_CLOSE_FILE,
+                file_name, "Cannot close file '{}'", file_name);
+        }
+        catch (const ErrnoException &)
+        {
+            tryLogCurrentException(log, __PRETTY_FUNCTION__);
+        }
+    }
+}
+
+uint64_t CgroupsMemoryUsageObserver::MemoryUsageFile::readMemoryUsage() const
+{
+    /// File read is probably not read is thread-safe, just to be sure
+    std::lock_guard lock(mutex);
+
+    ReadBufferFromFileDescriptor buf(fd);
+    buf.rewind();
+
+    uint64_t mem_usage = 0;
+
+    switch (version)
+    {
+        case CgroupsVersion::V1:
+        {
+            /// Format is
+            ///   kernel 5
+            ///   rss 15
+            ///   [...]
+            std::string key;
+            bool found_rss = false;
+
+            while (!buf.eof())
+            {
+                readStringUntilWhitespace(key, buf);
+                if (key != "rss")
+                {
+                    std::string dummy;
+                    readStringUntilNewlineInto(dummy, buf);
+                    buf.ignore();
+                    continue;
+                }
+
+                assertChar(' ', buf);
+                readIntText(mem_usage, buf);
+                found_rss = true;
+                break;
+            }
+
+            if (!found_rss)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot find 'rss' in '{}'", file_name);
+
+            break;
+        }
+        case CgroupsVersion::V2:
+        {
+            readIntText(mem_usage, buf);
+            break;
+        }
+    }
+
+    LOG_TRACE(log, "Read current memory usage {} from cgroups", ReadableSize(mem_usage));
+
+    return mem_usage;
+}
+
+void CgroupsMemoryUsageObserver::startThread()
+{
+    if (!thread.joinable())
+    {
+        thread = ThreadFromGlobalPool(&CgroupsMemoryUsageObserver::runThread, this);
+        LOG_INFO(log, "Started cgroup current memory usage observer thread");
+    }
+}
+
+void CgroupsMemoryUsageObserver::stopThread()
+{
+    {
+        std::lock_guard lock(thread_mutex);
+        if (!thread.joinable())
+            return;
+        quit = true;
+    }
+
+    cond.notify_one();
+    thread.join();
+
+    LOG_INFO(log, "Stopped cgroup current memory usage observer thread");
+}
+
+void CgroupsMemoryUsageObserver::runThread()
+{
+    setThreadName("CgrpMemUsgObsr");
+
+    last_available_memory_amount = getMemoryAmount();
+    LOG_INFO(log, "Memory amount initially available to the process is {}", ReadableSize(last_available_memory_amount));
+
+    std::unique_lock lock(thread_mutex);
+    while (true)
+    {
+        if (cond.wait_for(lock, wait_time, [this] { return quit; }))
+            break;
+
+        try
+        {
+            uint64_t available_memory_amount = getMemoryAmount();
+            if (available_memory_amount != last_available_memory_amount)
+            {
+                LOG_INFO(log, "Memory amount available to the process changed from {} to {}", ReadableSize(last_available_memory_amount), ReadableSize(available_memory_amount));
+                last_available_memory_amount = available_memory_amount;
+                std::lock_guard<std::mutex> memory_amount_available_changed_lock(memory_amount_available_changed_mutex);
+                on_memory_amount_available_changed();
+            }
+
+            std::lock_guard<std::mutex> limit_lock(limit_mutex);
+            if (soft_limit > 0 && hard_limit > 0)
+            {
+                uint64_t memory_usage = memory_usage_file.readMemoryUsage();
+                if (memory_usage > hard_limit)
+                {
+                    if (last_memory_usage <= hard_limit)
+                        on_hard_limit(true);
+                }
+                else
+                {
+                    if (last_memory_usage > hard_limit)
+                        on_hard_limit(false);
+                }
+
+                if (memory_usage > soft_limit)
+                {
+                    if (last_memory_usage <= soft_limit)
+                        on_soft_limit(true);
+                }
+                else
+                {
+                    if (last_memory_usage > soft_limit)
+                        on_soft_limit(false);
+                }
+                last_memory_usage = memory_usage;
+            }
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, __PRETTY_FUNCTION__);
+        }
+    }
+}
+
+}
+
+#endif
diff --git a/src/Common/CgroupsMemoryUsageObserver.h b/src/Common/CgroupsMemoryUsageObserver.h
new file mode 100644
index 00000000000..51c5cd08124
--- /dev/null
+++ b/src/Common/CgroupsMemoryUsageObserver.h
@@ -0,0 +1,104 @@
+#pragma once
+
+#include <Common/ThreadPool.h>
+
+#include <chrono>
+#include <mutex>
+
+namespace DB
+{
+
+/// Does two things:
+/// 1. Periodically reads the memory usage of the process from Linux cgroups.
+///    You can specify soft or hard memory limits:
+///    - When the soft memory limit is hit, drop jemalloc cache.
+///    - When the hard memory limit is hit, update MemoryTracking metric to throw memory exceptions faster.
+///    The goal of this is to avoid that the process hits the maximum allowed memory limit at which there is a good
+///    chance that the Limux OOM killer terminates it. All of this is done is because internal memory tracking in
+///    ClickHouse can unfortunately under-estimate the actually used memory.
+/// 2. Periodically reads the the maximum memory available to the process (which can change due to cgroups settings).
+///    You can specify a callback to react on changes. The callback typically reloads the configuration, i.e. Server
+///    or Keeper configuration file. This reloads settings 'max_server_memory_usage' (Server) and 'max_memory_usage_soft_limit'
+///    (Keeper) from which various other internal limits are calculated, including the soft and hard limits for (1.).
+///    The goal of this is to provide elasticity when the container is scaled-up/scaled-down. The mechanism (polling
+///    cgroups) is quite implicit, unfortunately there is currently no better way to communicate memory threshold changes
+///    to the database.
+#if defined(OS_LINUX)
+class CgroupsMemoryUsageObserver
+{
+public:
+    using OnMemoryLimitFn = std::function<void(bool)>;
+    using OnMemoryAmountAvailableChangedFn = std::function<void()>;
+
+    enum class CgroupsVersion
+    {
+        V1,
+        V2
+    };
+
+    explicit CgroupsMemoryUsageObserver(std::chrono::seconds wait_time_);
+    ~CgroupsMemoryUsageObserver();
+
+    void setMemoryUsageLimits(uint64_t hard_limit_, uint64_t soft_limit_);
+    void setOnMemoryAmountAvailableChangedFn(OnMemoryAmountAvailableChangedFn on_memory_amount_available_changed_);
+
+    void startThread();
+
+private:
+    LoggerPtr log;
+
+    const std::chrono::seconds wait_time;
+
+    std::mutex limit_mutex;
+    size_t hard_limit TSA_GUARDED_BY(limit_mutex) = 0;
+    size_t soft_limit TSA_GUARDED_BY(limit_mutex) = 0;
+    OnMemoryLimitFn on_hard_limit TSA_GUARDED_BY(limit_mutex);
+    OnMemoryLimitFn on_soft_limit TSA_GUARDED_BY(limit_mutex);
+
+    std::mutex memory_amount_available_changed_mutex;
+    OnMemoryAmountAvailableChangedFn on_memory_amount_available_changed TSA_GUARDED_BY(memory_amount_available_changed_mutex);
+
+    uint64_t last_memory_usage = 0;        /// how much memory does the process use
+    uint64_t last_available_memory_amount; /// how much memory can the process use
+
+    /// Represents the cgroup virtual file that shows the memory consumption of the process's cgroup.
+    struct MemoryUsageFile
+    {
+    public:
+        explicit MemoryUsageFile(LoggerPtr log_);
+        ~MemoryUsageFile();
+        uint64_t readMemoryUsage() const;
+    private:
+        LoggerPtr log;
+        mutable std::mutex mutex;
+        int fd TSA_GUARDED_BY(mutex) = -1;
+        CgroupsVersion version;
+        std::string file_name;
+    };
+
+    MemoryUsageFile memory_usage_file;
+
+    void stopThread();
+
+    void runThread();
+
+    std::mutex thread_mutex;
+    std::condition_variable cond;
+    ThreadFromGlobalPool thread;
+    bool quit = false;
+};
+
+#else
+class CgroupsMemoryUsageObserver
+{
+    using OnMemoryAmountAvailableChangedFn = std::function<void()>;
+public:
+    explicit CgroupsMemoryUsageObserver(std::chrono::seconds) {}
+
+    void setMemoryUsageLimits(uint64_t, uint64_t) {}
+    void setOnMemoryAmountAvailableChangedFn(OnMemoryAmountAvailableChangedFn) {}
+    void startThread() {}
+};
+#endif
+
+}
diff --git a/src/Common/ColumnsHashing.h b/src/Common/ColumnsHashing.h
index 5ac6ca15812..25d2ddc684d 100644
--- a/src/Common/ColumnsHashing.h
+++ b/src/Common/ColumnsHashing.h
@@ -685,25 +685,75 @@ struct HashMethodKeysFixed
   * That is, for example, for strings, it contains first the serialized length of the string, and then the bytes.
   * Therefore, when aggregating by several strings, there is no ambiguity.
   */
-template <typename Value, typename Mapped>
+template <typename Value, typename Mapped, bool nullable, bool prealloc>
 struct HashMethodSerialized
-    : public columns_hashing_impl::HashMethodBase<HashMethodSerialized<Value, Mapped>, Value, Mapped, false>
+    : public columns_hashing_impl::HashMethodBase<HashMethodSerialized<Value, Mapped, nullable, prealloc>, Value, Mapped, false>
 {
-    using Self = HashMethodSerialized<Value, Mapped>;
+    using Self = HashMethodSerialized<Value, Mapped, nullable, prealloc>;
     using Base = columns_hashing_impl::HashMethodBase<Self, Value, Mapped, false>;
 
     static constexpr bool has_cheap_key_calculation = false;
 
     ColumnRawPtrs key_columns;
     size_t keys_size;
+    std::vector<const UInt8 *> null_maps;
+    PaddedPODArray<UInt64> row_sizes;
 
     HashMethodSerialized(const ColumnRawPtrs & key_columns_, const Sizes & /*key_sizes*/, const HashMethodContextPtr &)
-        : key_columns(key_columns_), keys_size(key_columns_.size()) {}
+        : key_columns(key_columns_), keys_size(key_columns_.size())
+    {
+        if constexpr (nullable)
+        {
+            null_maps.resize(keys_size);
+            for (size_t i = 0; i < keys_size; ++i)
+            {
+                if (const auto * nullable_column = dynamic_cast<const ColumnNullable *>(key_columns[i]))
+                {
+                    null_maps[i] = nullable_column->getNullMapData().data();
+                    key_columns[i] = nullable_column->getNestedColumnPtr().get();
+                }
+            }
+        }
+
+        if constexpr (prealloc)
+        {
+            null_maps.resize(keys_size);
+            for (size_t i = 0; i < keys_size; ++i)
+                key_columns[i]->collectSerializedValueSizes(row_sizes, null_maps[i]);
+        }
+    }
 
     friend class columns_hashing_impl::HashMethodBase<Self, Value, Mapped, false>;
 
     ALWAYS_INLINE SerializedKeyHolder getKeyHolder(size_t row, Arena & pool) const
     {
+        if constexpr (prealloc)
+        {
+            const char * begin = nullptr;
+
+            char * memory = pool.allocContinue(row_sizes[row], begin);
+            StringRef key(memory, row_sizes[row]);
+            for (size_t j = 0; j < keys_size; ++j)
+            {
+                if constexpr (nullable)
+                    memory = key_columns[j]->serializeValueIntoMemoryWithNull(row, memory, null_maps[j]);
+                else
+                    memory = key_columns[j]->serializeValueIntoMemory(row, memory);
+            }
+
+            return SerializedKeyHolder{key, pool};
+        }
+        else if constexpr (nullable)
+        {
+            const char * begin = nullptr;
+
+            size_t sum_size = 0;
+            for (size_t j = 0; j < keys_size; ++j)
+                sum_size += key_columns[j]->serializeValueIntoArenaWithNull(row, pool, begin, null_maps[j]).size;
+
+            return SerializedKeyHolder{{begin, sum_size}, pool};
+        }
+
         return SerializedKeyHolder{
             serializeKeysToPoolContiguous(row, keys_size, key_columns, pool),
             pool};
diff --git a/src/Common/ColumnsHashingImpl.h b/src/Common/ColumnsHashingImpl.h
index 7116160e94c..6b3cc24d870 100644
--- a/src/Common/ColumnsHashingImpl.h
+++ b/src/Common/ColumnsHashingImpl.h
@@ -46,29 +46,45 @@ struct LastElementCacheStats
 namespace columns_hashing_impl
 {
 
-template <typename Value, bool consecutive_keys_optimization_>
-struct LastElementCache
+struct LastElementCacheBase
 {
-    static constexpr bool consecutive_keys_optimization = consecutive_keys_optimization_;
-
-    Value value;
     bool empty = true;
     bool found = false;
     UInt64 misses = 0;
 
-    bool check(const Value & value_) const { return value == value_; }
+    void onNewValue(bool is_found)
+    {
+        empty = false;
+        found = is_found;
+        ++misses;
+    }
+
+    bool hasOnlyOneValue() const { return found && misses == 1; }
+};
+
+template <typename Value, bool nullable> struct LastElementCache;
+
+template <typename Value>
+struct LastElementCache<Value, true> : public LastElementCacheBase
+{
+    Value value{};
+    bool is_null = false;
+
+    template <typename Key>
+    bool check(const Key & key) const { return !is_null && value.first == key; }
+
+    bool check(const Value & rhs) const { return !is_null && value == rhs; }
+};
+
+template <typename Value>
+struct LastElementCache<Value, false> : public LastElementCacheBase
+{
+    Value value{};
 
     template <typename Key>
     bool check(const Key & key) const { return value.first == key; }
 
-    bool hasOnlyOneValue() const { return found && misses == 1; }
-    UInt64 getMisses() const { return misses; }
-};
-
-template <typename Data>
-struct LastElementCache<Data, false>
-{
-    static constexpr bool consecutive_keys_optimization = false;
+    bool check(const Value & rhs) const { return value == rhs; }
 };
 
 template <typename Mapped>
@@ -162,7 +178,7 @@ public:
     using EmplaceResult = EmplaceResultImpl<Mapped>;
     using FindResult = FindResultImpl<Mapped, need_offset>;
     static constexpr bool has_mapped = !std::is_same_v<Mapped, void>;
-    using Cache = LastElementCache<Value, consecutive_keys_optimization>;
+    using Cache = LastElementCache<Value, nullable>;
 
     static HashMethodContextPtr createContext(const HashMethodContext::Settings &) { return nullptr; }
 
@@ -173,6 +189,15 @@ public:
         {
             if (isNullAt(row))
             {
+                if constexpr (consecutive_keys_optimization)
+                {
+                    if (!cache.is_null)
+                    {
+                        cache.onNewValue(true);
+                        cache.is_null = true;
+                    }
+                }
+
                 bool has_null_key = data.hasNullKeyData();
                 data.hasNullKeyData() = true;
 
@@ -194,10 +219,21 @@ public:
         {
             if (isNullAt(row))
             {
+                bool has_null_key = data.hasNullKeyData();
+
+                if constexpr (consecutive_keys_optimization)
+                {
+                    if (!cache.is_null)
+                    {
+                        cache.onNewValue(has_null_key);
+                        cache.is_null = true;
+                    }
+                }
+
                 if constexpr (has_mapped)
-                    return FindResult(&data.getNullKeyData(), data.hasNullKeyData(), 0);
+                    return FindResult(&data.getNullKeyData(), has_null_key, 0);
                 else
-                    return FindResult(data.hasNullKeyData(), 0);
+                    return FindResult(has_null_key, 0);
             }
         }
 
@@ -232,7 +268,7 @@ public:
     ALWAYS_INLINE UInt64 getCacheMissesSinceLastReset() const
     {
         if constexpr (consecutive_keys_optimization)
-            return cache.getMisses();
+            return cache.misses;
         return 0;
     }
 
@@ -304,9 +340,10 @@ protected:
 
         if constexpr (consecutive_keys_optimization)
         {
-            cache.found = true;
-            cache.empty = false;
-            ++cache.misses;
+            cache.onNewValue(true);
+
+            if constexpr (nullable)
+                cache.is_null = false;
 
             if constexpr (has_mapped)
             {
@@ -347,17 +384,16 @@ protected:
 
         if constexpr (consecutive_keys_optimization)
         {
-            cache.found = it != nullptr;
-            cache.empty = false;
-            ++cache.misses;
+            cache.onNewValue(it != nullptr);
+
+            if constexpr (nullable)
+                cache.is_null = false;
 
             if constexpr (has_mapped)
             {
                 cache.value.first = key;
                 if (it)
-                {
                     cache.value.second = it->getMapped();
-                }
             }
             else
             {
diff --git a/src/Common/ConcurrencyControl.cpp b/src/Common/ConcurrencyControl.cpp
index c9fe51550dc..0893cfce955 100644
--- a/src/Common/ConcurrencyControl.cpp
+++ b/src/Common/ConcurrencyControl.cpp
@@ -12,10 +12,10 @@ namespace ErrorCodes
 
 ConcurrencyControl::Slot::~Slot()
 {
-    allocation->release();
+    static_cast<ConcurrencyControl::Allocation&>(*allocation).release();
 }
 
-ConcurrencyControl::Slot::Slot(AllocationPtr && allocation_)
+ConcurrencyControl::Slot::Slot(SlotAllocationPtr && allocation_)
     : allocation(std::move(allocation_))
 {
 }
@@ -27,7 +27,7 @@ ConcurrencyControl::Allocation::~Allocation()
     parent.free(this);
 }
 
-[[nodiscard]] ConcurrencyControl::SlotPtr ConcurrencyControl::Allocation::tryAcquire()
+[[nodiscard]] AcquiredSlotPtr ConcurrencyControl::Allocation::tryAcquire()
 {
     SlotCount value = granted.load();
     while (value)
@@ -35,15 +35,21 @@ ConcurrencyControl::Allocation::~Allocation()
         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 AcquiredSlotPtr(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
+SlotCount ConcurrencyControl::Allocation::grantedCount() const
 {
-    return granted;
+    return granted.load();
+}
+
+SlotCount ConcurrencyControl::Allocation::allocatedCount() const
+{
+    std::unique_lock lock{mutex};
+    return allocated;
 }
 
 ConcurrencyControl::Allocation::Allocation(ConcurrencyControl & parent_, SlotCount limit_, SlotCount granted_, Waiters::iterator waiter_)
@@ -87,7 +93,7 @@ ConcurrencyControl::~ConcurrencyControl()
         abort();
 }
 
-[[nodiscard]] ConcurrencyControl::AllocationPtr ConcurrencyControl::allocate(SlotCount min, SlotCount max)
+[[nodiscard]] SlotAllocationPtr ConcurrencyControl::allocate(SlotCount min, SlotCount max)
 {
     if (min > max)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "ConcurrencyControl: invalid allocation requirements");
@@ -100,13 +106,13 @@ ConcurrencyControl::~ConcurrencyControl()
 
     // Create allocation and start waiting if more slots are required
     if (granted < max)
-        return AllocationPtr(new Allocation(*this, max, granted,
+        return SlotAllocationPtr(new Allocation(*this, max, granted,
             waiters.insert(cur_waiter, nullptr /* pointer is set by Allocation ctor */)));
     else
-        return AllocationPtr(new Allocation(*this, max, granted));
+        return SlotAllocationPtr(new Allocation(*this, max, granted));
 }
 
-void ConcurrencyControl::setMaxConcurrency(ConcurrencyControl::SlotCount value)
+void ConcurrencyControl::setMaxConcurrency(SlotCount value)
 {
     std::unique_lock lock{mutex};
     max_concurrency = std::max<SlotCount>(1, value); // never allow max_concurrency to be zero
@@ -162,7 +168,7 @@ void ConcurrencyControl::schedule(std::unique_lock<std::mutex> &)
     }
 }
 
-ConcurrencyControl::SlotCount ConcurrencyControl::available(std::unique_lock<std::mutex> &) const
+SlotCount ConcurrencyControl::available(std::unique_lock<std::mutex> &) const
 {
     if (cur_concurrency < max_concurrency)
         return max_concurrency - cur_concurrency;
diff --git a/src/Common/ConcurrencyControl.h b/src/Common/ConcurrencyControl.h
index 7e20384aa2a..ba94502962c 100644
--- a/src/Common/ConcurrencyControl.h
+++ b/src/Common/ConcurrencyControl.h
@@ -7,6 +7,7 @@
 #include <base/types.h>
 #include <boost/core/noncopyable.hpp>
 
+#include <Common/ISlotControl.h>
 
 namespace DB
 {
@@ -34,41 +35,35 @@ namespace DB
  * Oversubscription is possible: total amount of allocated slots can exceed `setMaxConcurrency(limit)`
  * because `min` amount of slots is allocated for each query unconditionally.
  */
-class ConcurrencyControl : boost::noncopyable
+class ConcurrencyControl : public ISlotControl
 {
 public:
     struct Allocation;
-    using AllocationPtr = std::shared_ptr<Allocation>;
-    using SlotCount = UInt64;
     using Waiters = std::list<Allocation *>;
 
-    static constexpr SlotCount Unlimited = std::numeric_limits<SlotCount>::max();
-
     // Scoped guard for acquired slot, see Allocation::tryAcquire()
-    struct Slot : boost::noncopyable
+    struct Slot : public IAcquiredSlot
     {
-        ~Slot();
+        ~Slot() override;
 
     private:
         friend struct Allocation; // for ctor
 
-        explicit Slot(AllocationPtr && allocation_);
+        explicit Slot(SlotAllocationPtr && allocation_);
 
-        AllocationPtr allocation;
+        SlotAllocationPtr allocation;
     };
 
-    // FIXME: have to be unique_ptr, but ThreadFromGlobalPool does not support move semantics yet
-    using SlotPtr = std::shared_ptr<Slot>;
-
     // Manages group of slots for a single query, see ConcurrencyControl::allocate(min, max)
-    struct Allocation : std::enable_shared_from_this<Allocation>, boost::noncopyable
+    struct Allocation : public ISlotAllocation
     {
-        ~Allocation();
+        ~Allocation() override;
 
         // Take one already granted slot if available. Lock-free iff there is no granted slot.
-        [[nodiscard]] SlotPtr tryAcquire();
+        [[nodiscard]] AcquiredSlotPtr tryAcquire() override;
 
-        SlotCount grantedCount() const;
+        SlotCount grantedCount() const override;
+        SlotCount allocatedCount() const override;
 
     private:
         friend struct Slot; // for release()
@@ -94,7 +89,7 @@ public:
         ConcurrencyControl & parent;
         const SlotCount limit;
 
-        std::mutex mutex; // the following values must be accessed under this mutex
+        mutable std::mutex mutex; // the following values must be accessed under this mutex
         SlotCount allocated; // allocated total (including already `released`)
         SlotCount released = 0;
 
@@ -103,17 +98,16 @@ public:
         const Waiters::iterator waiter; // iterator to itself in Waiters list; valid iff allocated < limit
     };
 
-public:
     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();
+    ~ConcurrencyControl() override;
 
     // 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);
+    [[nodiscard]] SlotAllocationPtr allocate(SlotCount min, SlotCount max) override;
 
     void setMaxConcurrency(SlotCount value);
 
@@ -134,7 +128,7 @@ private:
     std::mutex mutex;
     Waiters waiters;
     Waiters::iterator cur_waiter; // round-robin pointer
-    SlotCount max_concurrency = Unlimited;
+    SlotCount max_concurrency = UnlimitedSlots;
     SlotCount cur_concurrency = 0;
 };
 
diff --git a/src/Common/Config/AbstractConfigurationComparison.cpp b/src/Common/Config/AbstractConfigurationComparison.cpp
index c00a1efeebe..607b583cf31 100644
--- a/src/Common/Config/AbstractConfigurationComparison.cpp
+++ b/src/Common/Config/AbstractConfigurationComparison.cpp
@@ -19,6 +19,62 @@ namespace
         result += subkey;
         return result;
     }
+
+    bool isSameConfigurationImpl(const Poco::Util::AbstractConfiguration & left, const String & left_key,
+                                 const Poco::Util::AbstractConfiguration & right, const String & right_key,
+                                 const std::unordered_set<std::string_view> * ignore_keys)
+    {
+        if (&left == &right && left_key == right_key)
+            return true;
+
+        /// Get the subkeys of the left and right configurations.
+        Poco::Util::AbstractConfiguration::Keys left_subkeys;
+        Poco::Util::AbstractConfiguration::Keys right_subkeys;
+        left.keys(left_key, left_subkeys);
+        right.keys(right_key, right_subkeys);
+
+        if (ignore_keys)
+        {
+            std::erase_if(left_subkeys, [&](const String & key) { return ignore_keys->contains(key); });
+            std::erase_if(right_subkeys, [&](const String & key) { return ignore_keys->contains(key); });
+
+#if defined(ABORT_ON_LOGICAL_ERROR)
+            /// Compound `ignore_keys` are not yet implemented.
+            for (const auto & ignore_key : *ignore_keys)
+                chassert(ignore_key.find('.') == std::string_view::npos);
+#endif
+        }
+
+        /// Check that the right configuration has the same set of subkeys as the left configuration.
+        if (left_subkeys.size() != right_subkeys.size())
+            return false;
+
+        if (left_subkeys.empty())
+        {
+            if (left.hasProperty(left_key))
+            {
+                return right.hasProperty(right_key) && (left.getRawString(left_key) == right.getRawString(right_key));
+            }
+            else
+            {
+                return !right.hasProperty(right_key);
+            }
+        }
+        else
+        {
+            /// Go through all the subkeys and compare corresponding parts of the configurations.
+            std::unordered_set<std::string_view> left_subkeys_set{left_subkeys.begin(), left_subkeys.end()};
+            for (const auto & subkey : right_subkeys)
+            {
+                if (!left_subkeys_set.contains(subkey))
+                    return false;
+
+                if (!isSameConfigurationImpl(left, concatKeyAndSubKey(left_key, subkey), right, concatKeyAndSubKey(right_key, subkey), nullptr))
+                    return false;
+            }
+            return true;
+        }
+    }
 }
 
 
@@ -32,6 +88,14 @@ bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const P
     return isSameConfiguration(left, key, right, key);
 }
 
+bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
+                         const Poco::Util::AbstractConfiguration & right, const String & right_key,
+                         const std::unordered_set<std::string_view> & ignore_keys)
+{
+    const auto * ignore_keys_ptr = !ignore_keys.empty() ? &ignore_keys : nullptr;
+    return isSameConfigurationImpl(left, left_key, right, right_key, ignore_keys_ptr);
+}
+
 bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration & left, const Poco::Util::AbstractConfiguration & right, const String & root, const String & name)
 {
     if (&left == &right)
@@ -49,44 +113,4 @@ bool isSameConfigurationWithMultipleKeys(const Poco::Util::AbstractConfiguration
     return true;
 }
 
-bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
-                         const Poco::Util::AbstractConfiguration & right, const String & right_key)
-{
-    if (&left == &right && left_key == right_key)
-        return true;
-
-    bool has_property = left.hasProperty(left_key);
-    if (has_property != right.hasProperty(right_key))
-        return false;
-    if (has_property)
-    {
-        /// The left and right configurations contains values so we can compare them.
-        if (left.getRawString(left_key) != right.getRawString(right_key))
-            return false;
-    }
-
-    /// Get the subkeys of the left and right configurations.
-    Poco::Util::AbstractConfiguration::Keys subkeys;
-    left.keys(left_key, subkeys);
-
-    {
-        /// Check that the right configuration has the same set of subkeys as the left configuration.
-        Poco::Util::AbstractConfiguration::Keys right_subkeys;
-        right.keys(right_key, right_subkeys);
-        std::unordered_set<std::string_view> left_subkeys{subkeys.begin(), subkeys.end()};
-        if ((left_subkeys.size() != right_subkeys.size()) || (left_subkeys.size() != subkeys.size()))
-            return false;
-        for (const auto & right_subkey : right_subkeys)
-            if (!left_subkeys.contains(right_subkey))
-                return false;
-    }
-
-    /// Go through all the subkeys and compare corresponding parts of the configurations.
-    for (const auto & subkey : subkeys)
-        if (!isSameConfiguration(left, concatKeyAndSubKey(left_key, subkey), right, concatKeyAndSubKey(right_key, subkey)))
-            return false;
-
-    return true;
-}
-
 }
diff --git a/src/Common/Config/AbstractConfigurationComparison.h b/src/Common/Config/AbstractConfigurationComparison.h
index 75e0b77b1ca..e8f65a4afcc 100644
--- a/src/Common/Config/AbstractConfigurationComparison.h
+++ b/src/Common/Config/AbstractConfigurationComparison.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <base/types.h>
+#include <unordered_set>
 
 namespace Poco::Util
 {
@@ -10,6 +11,8 @@ namespace Poco::Util
 namespace DB
 {
     /// Returns true if two configurations contains the same keys and values.
+    /// NOTE: These functions assume no configuration has items having both children and a value
+    /// (i.e. items like "<test>value<child1/></test>").
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left,
                              const Poco::Util::AbstractConfiguration & right);
 
@@ -30,8 +33,11 @@ namespace DB
                              const String & key);
 
     /// Returns true if specified subviews of the two configurations contains the same keys and values.
+    /// If `ignore_keys` is specified then the function skips those keys while comparing
+    /// (even if their values differ, they're considered to be the same.)
     bool isSameConfiguration(const Poco::Util::AbstractConfiguration & left, const String & left_key,
-                             const Poco::Util::AbstractConfiguration & right, const String & right_key);
+                             const Poco::Util::AbstractConfiguration & right, const String & right_key,
+                             const std::unordered_set<std::string_view> & ignore_keys = {});
 
     inline bool operator==(const Poco::Util::AbstractConfiguration & left, const Poco::Util::AbstractConfiguration & right)
     {
diff --git a/src/Common/Config/ConfigHelper.cpp b/src/Common/Config/ConfigHelper.cpp
index 69fe42de86c..6de63fe78d7 100644
--- a/src/Common/Config/ConfigHelper.cpp
+++ b/src/Common/Config/ConfigHelper.cpp
@@ -1,5 +1,7 @@
 #include <Common/Config/ConfigHelper.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Poco/Util/XMLConfiguration.h>
+
 
 namespace DB
 {
@@ -7,6 +9,33 @@ namespace DB
 namespace ConfigHelper
 {
 
+namespace
+{
+    void cloneImpl(Poco::Util::AbstractConfiguration & dest, const Poco::Util::AbstractConfiguration & src, const std::string & prefix = "")
+    {
+        std::vector<std::string> keys;
+        src.keys(prefix, keys);
+        if (!keys.empty())
+        {
+            std::string prefix_with_dot = prefix + ".";
+            for (const auto & key : keys)
+                cloneImpl(dest, src, prefix_with_dot + key);
+        }
+        else if (!prefix.empty())
+        {
+            dest.setString(prefix, src.getRawString(prefix));
+        }
+    }
+}
+
+
+Poco::AutoPtr<Poco::Util::AbstractConfiguration> clone(const Poco::Util::AbstractConfiguration & src)
+{
+    Poco::AutoPtr<Poco::Util::AbstractConfiguration> res(new Poco::Util::XMLConfiguration());
+    cloneImpl(*res, src);
+    return res;
+}
+
 bool getBool(const Poco::Util::AbstractConfiguration & config, const std::string & key, bool default_, bool empty_as)
 {
     if (!config.has(key))
diff --git a/src/Common/Config/ConfigHelper.h b/src/Common/Config/ConfigHelper.h
index a1b630fa726..513438bd859 100644
--- a/src/Common/Config/ConfigHelper.h
+++ b/src/Common/Config/ConfigHelper.h
@@ -1,18 +1,23 @@
 #pragma once
 
+#include <Poco/AutoPtr.h>
 #include <string>
 
-namespace Poco
+
+namespace Poco::Util
 {
-    namespace Util
-    {
-        class AbstractConfiguration;
-    }
+    class AbstractConfiguration;
 }
 
+
 namespace DB::ConfigHelper
 {
 
+/// Clones a configuration.
+/// NOTE: This function assumes the source configuration doesn't have items having both children and a value
+/// (i.e. items like "<test>value<child1/></test>").
+Poco::AutoPtr<Poco::Util::AbstractConfiguration> clone(const Poco::Util::AbstractConfiguration & src);
+
 /// The behavior is like `config.getBool(key, default_)`,
 /// except when the tag is empty (aka. self-closing), `empty_as` will be used instead of throwing Poco::Exception.
 bool getBool(const Poco::Util::AbstractConfiguration & config, const std::string & key, bool default_ = false, bool empty_as = true);
diff --git a/src/Common/Config/ConfigProcessor.cpp b/src/Common/Config/ConfigProcessor.cpp
index 92e66fee489..60407c6a174 100644
--- a/src/Common/Config/ConfigProcessor.cpp
+++ b/src/Common/Config/ConfigProcessor.cpp
@@ -77,23 +77,17 @@ ConfigProcessor::ConfigProcessor(
     , name_pool(new Poco::XML::NamePool(65521))
     , dom_parser(name_pool)
 {
-    if (log_to_console && !Poco::Logger::has("ConfigProcessor"))
+    if (log_to_console && !hasLogger("ConfigProcessor"))
     {
         channel_ptr = new Poco::ConsoleChannel;
-        log = &Poco::Logger::create("ConfigProcessor", channel_ptr.get(), Poco::Message::PRIO_TRACE);
+        log = createLogger("ConfigProcessor", channel_ptr.get(), Poco::Message::PRIO_TRACE);
     }
     else
     {
-        log = &Poco::Logger::get("ConfigProcessor");
+        log = getLogger("ConfigProcessor");
     }
 }
 
-ConfigProcessor::~ConfigProcessor()
-{
-    if (channel_ptr) /// This means we have created a new console logger in the constructor.
-        Poco::Logger::destroy("ConfigProcessor");
-}
-
 static std::unordered_map<std::string, std::string_view> embedded_configs;
 
 void ConfigProcessor::registerEmbeddedConfig(std::string name, std::string_view content)
@@ -433,6 +427,8 @@ void ConfigProcessor::doIncludesRecursive(
 
     /// Replace the original contents, not add to it.
     bool replace = attributes->getNamedItem("replace");
+    /// Merge with the original contents
+    bool merge = attributes->getNamedItem("merge");
 
     bool included_something = false;
 
@@ -456,7 +452,6 @@ void ConfigProcessor::doIncludesRecursive(
         }
         else
         {
-            /// Replace the whole node not just contents.
             if (node->nodeName() == "include")
             {
                 const NodeListPtr children = node_to_include->childNodes();
@@ -464,8 +459,18 @@ void ConfigProcessor::doIncludesRecursive(
                 for (Node * child = children->item(0); child; child = next_child)
                 {
                     next_child = child->nextSibling();
-                    NodePtr new_node = config->importNode(child, true);
-                    node->parentNode()->insertBefore(new_node, node);
+
+                    /// Recursively replace existing nodes in merge mode
+                    if (merge)
+                    {
+                        NodePtr new_node = config->importNode(child->parentNode(), true);
+                        mergeRecursive(config, node->parentNode(), new_node);
+                    }
+                    else  /// Append to existing node by default
+                    {
+                        NodePtr new_node = config->importNode(child, true);
+                        node->parentNode()->insertBefore(new_node, node);
+                    }
                 }
 
                 node->parentNode()->removeChild(node);
@@ -783,9 +788,9 @@ ConfigProcessor::LoadedConfig ConfigProcessor::loadConfig(bool allow_zk_includes
 }
 
 ConfigProcessor::LoadedConfig ConfigProcessor::loadConfigWithZooKeeperIncludes(
-        zkutil::ZooKeeperNodeCache & zk_node_cache,
-        const zkutil::EventPtr & zk_changed_event,
-        bool fallback_to_preprocessed)
+    zkutil::ZooKeeperNodeCache & zk_node_cache,
+    const zkutil::EventPtr & zk_changed_event,
+    bool fallback_to_preprocessed)
 {
     XMLDocumentPtr config_xml;
     bool has_zk_includes;
diff --git a/src/Common/Config/ConfigProcessor.h b/src/Common/Config/ConfigProcessor.h
index 98592d8846e..5712c36d737 100644
--- a/src/Common/Config/ConfigProcessor.h
+++ b/src/Common/Config/ConfigProcessor.h
@@ -7,6 +7,8 @@
 #include <vector>
 #include <memory>
 
+#include <Common/Logger.h>
+
 #include <Poco/DOM/Document.h>
 #include <Poco/DOM/DOMParser.h>
 #include <Poco/DOM/DOMWriter.h>
@@ -44,8 +46,6 @@ public:
         bool log_to_console = false,
         const Substitutions & substitutions = Substitutions());
 
-    ~ConfigProcessor();
-
     /// Perform config includes and substitutions and return the resulting XML-document.
     ///
     /// Suppose path is "/path/file.xml"
@@ -125,7 +125,7 @@ private:
 
     bool throw_on_bad_incl;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     Poco::AutoPtr<Poco::Channel> channel_ptr;
 
     Substitutions substitutions;
diff --git a/src/Common/Config/ConfigReloader.h b/src/Common/Config/ConfigReloader.h
index 2529c7a5236..13a797bad08 100644
--- a/src/Common/Config/ConfigReloader.h
+++ b/src/Common/Config/ConfigReloader.h
@@ -69,7 +69,7 @@ private:
 
     static constexpr auto reload_interval = std::chrono::seconds(2);
 
-    Poco::Logger * log = &Poco::Logger::get("ConfigReloader");
+    LoggerPtr log = getLogger("ConfigReloader");
 
     std::string config_path;
     std::vector<std::string> extra_paths;
diff --git a/src/Common/CurrentMetrics.cpp b/src/Common/CurrentMetrics.cpp
index 724b6ab62f7..0f25397a961 100644
--- a/src/Common/CurrentMetrics.cpp
+++ b/src/Common/CurrentMetrics.cpp
@@ -2,6 +2,8 @@
 
 
 /// Available metrics. Add something here as you wish.
+/// If the metric is generic (i.e. not server specific)
+/// it should be also added to src/Coordination/KeeperConstant.cpp
 #define APPLY_FOR_BUILTIN_METRICS(M) \
     M(Query, "Number of executing queries") \
     M(Merge, "Number of executing background merges") \
@@ -87,7 +89,7 @@
     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(MarksLoaderThreadsScheduled, "Number of queued or active jobs in the thread pool for loading marks.") \
-    M(IOPrefetchThreads, "Number of threads in the IO prefertch thread pool.") \
+    M(IOPrefetchThreads, "Number of threads in the IO prefetch thread pool.") \
     M(IOPrefetchThreadsActive, "Number of threads in the IO prefetch thread pool running a task.") \
     M(IOPrefetchThreadsScheduled, "Number of queued or active jobs in the IO prefetch thread pool.") \
     M(IOWriterThreads, "Number of threads in the IO writer thread pool.") \
@@ -143,6 +145,8 @@
     M(AsynchronousInsertThreads, "Number of threads in the AsynchronousInsert thread pool.") \
     M(AsynchronousInsertThreadsActive, "Number of threads in the AsynchronousInsert thread pool running a task.") \
     M(AsynchronousInsertThreadsScheduled, "Number of queued or active jobs in the AsynchronousInsert thread pool.") \
+    M(AsynchronousInsertQueueSize, "Number of pending tasks in the AsynchronousInsert queue.") \
+    M(AsynchronousInsertQueueBytes, "Number of pending bytes in the AsynchronousInsert queue.") \
     M(StartupSystemTablesThreads, "Number of threads in the StartupSystemTables thread pool.") \
     M(StartupSystemTablesThreadsActive, "Number of threads in the StartupSystemTables thread pool running a task.") \
     M(StartupSystemTablesThreadsScheduled, "Number of queued or active jobs in the StartupSystemTables thread pool.") \
@@ -176,6 +180,9 @@
     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(MergeTreePartsCleanerThreadsScheduled, "Number of queued or active jobs in the MergeTree parts cleaner thread pool.") \
+    M(DatabaseReplicatedCreateTablesThreads, "Number of threads in the threadpool for table creation in DatabaseReplicated.") \
+    M(DatabaseReplicatedCreateTablesThreadsActive, "Number of active threads in the threadpool for table creation in DatabaseReplicated.") \
+    M(DatabaseReplicatedCreateTablesThreadsScheduled, "Number of queued or active jobs in the threadpool for table creation in DatabaseReplicated.") \
     M(IDiskCopierThreads, "Number of threads for copying data between disks of different types.") \
     M(IDiskCopierThreadsActive, "Number of threads for copying data between disks of different types running a task.") \
     M(IDiskCopierThreadsScheduled, "Number of queued or active jobs for copying data between disks of different types.") \
@@ -219,7 +226,6 @@
     M(PartsDeleteOnDestroy, "Part was moved to another disk and should be deleted in own destructor.") \
     M(PartsWide, "Wide parts.") \
     M(PartsCompact, "Compact parts.") \
-    M(PartsInMemory, "In-memory parts.") \
     M(MMappedFiles, "Total number of mmapped files.") \
     M(MMappedFileBytes, "Sum size of mmapped file regions.") \
     M(AsynchronousReadWait, "Number of threads waiting for asynchronous read.") \
@@ -255,6 +261,31 @@
     M(ActiveTimersInQueryProfiler, "Number of Active thread local timers in QueryProfiler") \
     M(RefreshableViews, "Number materialized views with periodic refreshing (REFRESH)") \
     M(RefreshingViews, "Number of materialized views currently executing a refresh") \
+    M(StorageBufferFlushThreads, "Number of threads for background flushes in StorageBuffer") \
+    M(StorageBufferFlushThreadsActive, "Number of threads for background flushes in StorageBuffer running a task") \
+    M(StorageBufferFlushThreadsScheduled, "Number of queued or active threads for background flushes in StorageBuffer") \
+    M(SharedMergeTreeThreads, "Number of threads in the thread pools in internals of SharedMergeTree") \
+    M(SharedMergeTreeThreadsActive, "Number of threads in the thread pools in internals of SharedMergeTree running a task") \
+    M(SharedMergeTreeThreadsScheduled, "Number of queued or active threads in the thread pools in internals of SharedMergeTree") \
+    M(SharedMergeTreeFetch, "Number of fetches in progress") \
+    M(CacheWarmerBytesInProgress, "Total size of remote file segments waiting to be asynchronously loaded into filesystem cache.") \
+    M(DistrCacheOpenedConnections, "Number of open connections to Distributed Cache") \
+    M(DistrCacheUsedConnections, "Number of currently used connections to Distributed Cache") \
+    M(DistrCacheReadRequests, "Number of executed Read requests to Distributed Cache") \
+    M(DistrCacheWriteRequests, "Number of executed Write requests to Distributed Cache") \
+    M(DistrCacheServerConnections, "Number of open connections to ClickHouse server from Distributed Cache") \
+    \
+    M(StorageConnectionsStored, "Total count of sessions stored in the session pool for storages") \
+    M(StorageConnectionsTotal, "Total count of all sessions: stored in the pool and actively used right now for storages") \
+    \
+    M(DiskConnectionsStored, "Total count of sessions stored in the session pool for disks") \
+    M(DiskConnectionsTotal, "Total count of all sessions: stored in the pool and actively used right now for disks") \
+    \
+    M(HTTPConnectionsStored, "Total count of sessions stored in the session pool for http hosts") \
+    M(HTTPConnectionsTotal, "Total count of all sessions: stored in the pool and actively used right now for http hosts") \
+    \
+    M(AddressesActive, "Total count of addresses which are used for creation connections with connection pools") \
+
 
 #ifdef APPLY_FOR_EXTERNAL_METRICS
     #define APPLY_FOR_METRICS(M) APPLY_FOR_BUILTIN_METRICS(M) APPLY_FOR_EXTERNAL_METRICS(M)
diff --git a/src/Common/CurrentMetrics.h b/src/Common/CurrentMetrics.h
index a1ef254485d..2c64fd29bbb 100644
--- a/src/Common/CurrentMetrics.h
+++ b/src/Common/CurrentMetrics.h
@@ -24,7 +24,7 @@ namespace CurrentMetrics
 {
     /// Metric identifier (index in array).
     using Metric = StrongTypedef<size_t, struct MetricTag>;
-    using Value = DB::Int64;
+    using Value = Int64;
 
     /// Get name of metric by identifier. Returns statically allocated string.
     const char * getName(Metric event);
diff --git a/src/Common/CurrentThreadHelpers.cpp b/src/Common/CurrentThreadHelpers.cpp
new file mode 100644
index 00000000000..cbfb50bf3b1
--- /dev/null
+++ b/src/Common/CurrentThreadHelpers.cpp
@@ -0,0 +1,16 @@
+#include <Common/CurrentThread.h>
+#include <Common/CurrentThreadHelpers.h>
+
+namespace DB
+{
+
+bool currentThreadHasGroup()
+{
+    return DB::CurrentThread::getGroup() != nullptr;
+}
+
+LogsLevel currentThreadLogsLevel()
+{
+    return DB::CurrentThread::get().getClientLogsLevel();
+}
+}
diff --git a/src/Common/CurrentThreadHelpers.h b/src/Common/CurrentThreadHelpers.h
new file mode 100644
index 00000000000..01a180e74d2
--- /dev/null
+++ b/src/Common/CurrentThreadHelpers.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include <Core/LogsLevel.h>
+
+namespace DB
+{
+bool currentThreadHasGroup();
+LogsLevel currentThreadLogsLevel();
+}
diff --git a/src/Common/DNSResolver.cpp b/src/Common/DNSResolver.cpp
index 9cb352da0ba..4b577a251af 100644
--- a/src/Common/DNSResolver.cpp
+++ b/src/Common/DNSResolver.cpp
@@ -1,16 +1,14 @@
 #include "DNSResolver.h"
 #include <Common/CacheBase.h>
 #include <Common/Exception.h>
+#include <Common/NetException.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>
 #include <Poco/Net/DNS.h>
 #include <Poco/Net/NetException.h>
 #include <Poco/NumberParser.h>
-#include <arpa/inet.h>
 #include <atomic>
 #include <optional>
 #include <string_view>
@@ -104,14 +102,14 @@ DNSResolver::IPAddresses hostByName(const std::string & host)
     }
     catch (const Poco::Net::DNSException & e)
     {
-        LOG_WARNING(&Poco::Logger::get("DNSResolver"), "Cannot resolve host ({}), error {}: {}.", host, e.code(), e.name());
+        LOG_WARNING(getLogger("DNSResolver"), "Cannot resolve host ({}), error {}: {}.", host, e.code(), e.name());
         addresses.clear();
     }
 
     if (addresses.empty())
     {
         ProfileEvents::increment(ProfileEvents::DNSError);
-        throw Exception(ErrorCodes::DNS_ERROR, "Not found address of host: {}", host);
+        throw DB::NetException(ErrorCodes::DNS_ERROR, "Not found address of host: {}", host);
     }
 
     return addresses;
@@ -141,10 +139,10 @@ DNSResolver::IPAddresses resolveIPAddressImpl(const std::string & host)
     return addresses;
 }
 
-DNSResolver::IPAddresses resolveIPAddressWithCache(CacheBase<std::string, DNSResolver::IPAddresses> & cache, const std::string & host)
+DNSResolver::IPAddresses resolveIPAddressWithCache(CacheBase<std::string, DNSResolver::CacheEntry> & cache, const std::string & host)
 {
-    auto [result, _ ] = cache.getOrSet(host, [&host]() { return std::make_shared<DNSResolver::IPAddresses>(resolveIPAddressImpl(host)); });
-    return *result;
+    auto [result, _ ] = cache.getOrSet(host, [&host]() {return std::make_shared<DNSResolver::CacheEntry>(resolveIPAddressImpl(host), std::chrono::system_clock::now());});
+    return result->addresses;
 }
 
 std::unordered_set<String> reverseResolveImpl(const Poco::Net::IPAddress & address)
@@ -179,8 +177,8 @@ struct DNSResolver::Impl
     using HostWithConsecutiveFailures = std::unordered_map<String, UInt32>;
     using AddressWithConsecutiveFailures = std::unordered_map<Poco::Net::IPAddress, UInt32>;
 
-    CacheBase<std::string, DNSResolver::IPAddresses> cache_host{100};
-    CacheBase<Poco::Net::IPAddress, std::unordered_set<std::string>> cache_address{100};
+    CacheBase<std::string, DNSResolver::CacheEntry> cache_host{1024};
+    CacheBase<Poco::Net::IPAddress, std::unordered_set<std::string>> cache_address{1024};
 
     std::mutex drop_mutex;
     std::mutex update_mutex;
@@ -201,14 +199,14 @@ struct DNSResolver::Impl
 };
 
 
-DNSResolver::DNSResolver() : impl(std::make_unique<DNSResolver::Impl>()), log(&Poco::Logger::get("DNSResolver")) {}
+DNSResolver::DNSResolver() : impl(std::make_unique<DNSResolver::Impl>()), log(getLogger("DNSResolver")) {}
 
 Poco::Net::IPAddress DNSResolver::resolveHost(const std::string & host)
 {
-    return pickAddress(resolveHostAll(host));
+    return pickAddress(resolveHostAll(host)); // random order -> random pick
 }
 
-DNSResolver::IPAddresses DNSResolver::resolveHostAll(const std::string & host)
+DNSResolver::IPAddresses DNSResolver::resolveHostAllInOriginOrder(const std::string & host)
 {
     if (impl->disable_cache)
         return resolveIPAddressImpl(host);
@@ -217,6 +215,13 @@ DNSResolver::IPAddresses DNSResolver::resolveHostAll(const std::string & host)
     return resolveIPAddressWithCache(impl->cache_host, host);
 }
 
+DNSResolver::IPAddresses DNSResolver::resolveHostAll(const std::string & host)
+{
+    auto addresses = resolveHostAllInOriginOrder(host);
+    std::shuffle(addresses.begin(), addresses.end(), thread_local_rng);
+    return addresses;
+}
+
 Poco::Net::SocketAddress DNSResolver::resolveAddress(const std::string & host_and_port)
 {
     if (impl->disable_cache)
@@ -292,6 +297,12 @@ void DNSResolver::setDisableCacheFlag(bool is_disabled)
     impl->disable_cache = is_disabled;
 }
 
+void DNSResolver::setCacheMaxEntries(UInt64 cache_max_entries)
+{
+    impl->cache_address.setMaxSizeInBytes(cache_max_entries);
+    impl->cache_host.setMaxSizeInBytes(cache_max_entries);
+}
+
 String DNSResolver::getHostName()
 {
     if (impl->disable_cache)
@@ -411,7 +422,7 @@ bool DNSResolver::updateHost(const String & host)
     const auto old_value = resolveIPAddressWithCache(impl->cache_host, host);
     auto new_value = resolveIPAddressImpl(host);
     const bool result = old_value != new_value;
-    impl->cache_host.set(host, std::make_shared<DNSResolver::IPAddresses>(std::move(new_value)));
+    impl->cache_host.set(host, std::make_shared<DNSResolver::CacheEntry>(std::move(new_value), std::chrono::system_clock::now()));
     return result;
 }
 
@@ -438,6 +449,19 @@ void DNSResolver::addToNewAddresses(const Poco::Net::IPAddress & address)
     impl->new_addresses.insert({address, consecutive_failures});
 }
 
+std::vector<std::pair<std::string, DNSResolver::CacheEntry>> DNSResolver::cacheEntries() const
+{
+    std::lock_guard lock(impl->drop_mutex);
+    std::vector<std::pair<std::string, DNSResolver::CacheEntry>> entries;
+
+    for (auto & [key, entry] : impl->cache_host.dump())
+    {
+        entries.emplace_back(std::move(key), *entry);
+    }
+
+    return entries;
+}
+
 DNSResolver::~DNSResolver() = default;
 
 DNSResolver & DNSResolver::instance()
diff --git a/src/Common/DNSResolver.h b/src/Common/DNSResolver.h
index 1017607a5bd..1ddd9d3b991 100644
--- a/src/Common/DNSResolver.h
+++ b/src/Common/DNSResolver.h
@@ -20,7 +20,11 @@ class DNSResolver : private boost::noncopyable
 {
 public:
     using IPAddresses = std::vector<Poco::Net::IPAddress>;
-    using IPAddressesPtr = std::shared_ptr<IPAddresses>;
+    using CacheEntry = struct
+    {
+        IPAddresses addresses;
+        std::chrono::system_clock::time_point cached_at;
+    };
 
     static DNSResolver & instance();
 
@@ -30,6 +34,9 @@ public:
     Poco::Net::IPAddress resolveHost(const std::string & host);
 
     /// Accepts host names like 'example.com' or '127.0.0.1' or '::1' and resolves all its IPs
+    /// resolveHostAllInOriginOrder returns addresses with the same order as system call returns it
+    IPAddresses resolveHostAllInOriginOrder(const std::string & host);
+    /// resolveHostAll returns addresses in random order
     IPAddresses resolveHostAll(const std::string & host);
 
     /// Accepts host names like 'example.com:port' or '127.0.0.1:port' or '[::1]:port' and resolves its IP and port
@@ -48,6 +55,9 @@ public:
     /// Disables caching
     void setDisableCacheFlag(bool is_disabled = true);
 
+    /// Set a limit of entries in cache
+    void setCacheMaxEntries(UInt64 cache_max_entries);
+
     /// Drops all caches
     void dropCache();
 
@@ -58,6 +68,9 @@ public:
     /// Returns true if IP of any host has been changed or an element was dropped (too many failures)
     bool updateCache(UInt32 max_consecutive_failures);
 
+    /// Returns a copy of cache entries
+    std::vector<std::pair<std::string, CacheEntry>> cacheEntries() const;
+
     ~DNSResolver();
 
 private:
@@ -73,7 +86,7 @@ private:
 
     struct Impl;
     std::unique_ptr<Impl> impl;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Updates cached value and returns true it has been changed.
     bool updateHost(const String & host);
diff --git a/src/Common/DateLUT.cpp b/src/Common/DateLUT.cpp
index 2b261a28469..3a20fb1a125 100644
--- a/src/Common/DateLUT.cpp
+++ b/src/Common/DateLUT.cpp
@@ -1,13 +1,15 @@
 #include "DateLUT.h"
 
+#include <Interpreters/Context.h>
+#include <Common/CurrentThread.h>
+#include <Common/filesystemHelpers.h>
+
 #include <Poco/DigestStream.h>
 #include <Poco/Exception.h>
 #include <Poco/SHA1Engine.h>
-#include <Common/filesystemHelpers.h>
 
 #include <filesystem>
 #include <fstream>
-#include <Interpreters/Context.h>
 
 
 namespace
@@ -140,6 +142,38 @@ std::string determineDefaultTimeZone()
 
 }
 
+const DateLUTImpl & DateLUT::instance()
+{
+    const auto & date_lut = getInstance();
+
+    if (DB::CurrentThread::isInitialized())
+    {
+        std::string timezone_from_context;
+        const DB::ContextPtr query_context = DB::CurrentThread::get().getQueryContext();
+
+        if (query_context)
+        {
+            timezone_from_context = extractTimezoneFromContext(query_context);
+
+            if (!timezone_from_context.empty())
+                return date_lut.getImplementation(timezone_from_context);
+        }
+
+        /// On the server side, timezone is passed in query_context,
+        /// but on CH-client side we have no query context,
+        /// and each time we modify client's global context
+        const DB::ContextPtr global_context = DB::CurrentThread::get().getGlobalContext();
+        if (global_context)
+        {
+            timezone_from_context = extractTimezoneFromContext(global_context);
+
+            if (!timezone_from_context.empty())
+                return date_lut.getImplementation(timezone_from_context);
+        }
+    }
+    return serverTimezoneInstance();
+}
+
 DateLUT::DateLUT()
 {
     /// Initialize the pointer to the default DateLUTImpl.
diff --git a/src/Common/DateLUT.h b/src/Common/DateLUT.h
index 2045d4895e7..d0b85ea9895 100644
--- a/src/Common/DateLUT.h
+++ b/src/Common/DateLUT.h
@@ -1,17 +1,23 @@
 #pragma once
 
-#include "DateLUTImpl.h"
-
 #include <base/defines.h>
+#include <base/types.h>
 
 #include <boost/noncopyable.hpp>
-#include "Common/CurrentThread.h"
 
 #include <atomic>
 #include <memory>
 #include <mutex>
 #include <unordered_map>
 
+namespace DB
+{
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+}
+
+class DateLUTImpl;
+
 
 /// This class provides lazy initialization and lookup of singleton DateLUTImpl objects for a given timezone.
 class DateLUT : private boost::noncopyable
@@ -20,38 +26,7 @@ public:
     /// Return DateLUTImpl instance for session timezone.
     /// session_timezone is a session-level setting.
     /// If setting is not set, returns the server timezone.
-    static ALWAYS_INLINE const DateLUTImpl & instance()
-    {
-        const auto & date_lut = getInstance();
-
-        if (DB::CurrentThread::isInitialized())
-        {
-            std::string timezone_from_context;
-            const DB::ContextPtr query_context = DB::CurrentThread::get().getQueryContext();
-
-            if (query_context)
-            {
-                timezone_from_context = extractTimezoneFromContext(query_context);
-
-                if (!timezone_from_context.empty())
-                    return date_lut.getImplementation(timezone_from_context);
-            }
-
-            /// On the server side, timezone is passed in query_context,
-            /// but on CH-client side we have no query context,
-            /// and each time we modify client's global context
-            const DB::ContextPtr global_context = DB::CurrentThread::get().getGlobalContext();
-            if (global_context)
-            {
-                timezone_from_context = extractTimezoneFromContext(global_context);
-
-                if (!timezone_from_context.empty())
-                    return date_lut.getImplementation(timezone_from_context);
-            }
-
-        }
-        return serverTimezoneInstance();
-    }
+    static const DateLUTImpl & instance();
 
     static ALWAYS_INLINE const DateLUTImpl & instance(const std::string & time_zone)
     {
diff --git a/src/Common/DateLUTImpl.cpp b/src/Common/DateLUTImpl.cpp
index bb677b3a62d..341e571e4eb 100644
--- a/src/Common/DateLUTImpl.cpp
+++ b/src/Common/DateLUTImpl.cpp
@@ -1,8 +1,5 @@
-#include "DateLUTImpl.h"
-
-#include <cctz/civil_time.h>
-#include <cctz/time_zone.h>
-#include <cctz/zone_info_source.h>
+#include <Core/DecimalFunctions.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/Exception.h>
 
 #include <algorithm>
@@ -11,6 +8,10 @@
 #include <cstring>
 #include <memory>
 
+#include <cctz/civil_time.h>
+#include <cctz/time_zone.h>
+#include <cctz/zone_info_source.h>
+
 
 namespace DB
 {
@@ -214,6 +215,29 @@ DateLUTImpl::DateLUTImpl(const std::string & time_zone_)
     }
 }
 
+unsigned int DateLUTImpl::toMillisecond(const DB::DateTime64 & datetime, Int64 scale_multiplier) const
+{
+    constexpr Int64 millisecond_multiplier = 1'000;
+    constexpr Int64 microsecond_multiplier = 1'000 * millisecond_multiplier;
+    constexpr Int64 divider = microsecond_multiplier / millisecond_multiplier;
+
+    auto components = DB::DecimalUtils::splitWithScaleMultiplier(datetime, scale_multiplier);
+
+    if (datetime.value < 0 && components.fractional)
+    {
+        components.fractional = scale_multiplier + (components.whole ? Int64(-1) : Int64(1)) * components.fractional;
+        --components.whole;
+    }
+    Int64 fractional = components.fractional;
+    if (scale_multiplier > microsecond_multiplier)
+        fractional = fractional / (scale_multiplier / microsecond_multiplier);
+    else if (scale_multiplier < microsecond_multiplier)
+        fractional = fractional * (microsecond_multiplier / scale_multiplier);
+
+    UInt16 millisecond = static_cast<UInt16>(fractional / divider);
+    return millisecond;
+}
+
 
 /// Prefer to load timezones from blobs linked to the binary.
 /// The blobs are provided by "tzdata" library.
diff --git a/src/Common/DateLUTImpl.h b/src/Common/DateLUTImpl.h
index 0e72b489ace..01cbae3d447 100644
--- a/src/Common/DateLUTImpl.h
+++ b/src/Common/DateLUTImpl.h
@@ -9,7 +9,6 @@
 #include <string>
 #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.
@@ -50,6 +49,11 @@ enum class WeekDayMode
     WeekStartsSunday1 = 3
 };
 
+namespace DB
+{
+class DateTime64;
+}
+
 /** Lookup table to conversion of time to date, and to month / year / day of week / day of month and so on.
   * First time was implemented for OLAPServer, that needed to do billions of such transformations.
   */
@@ -255,7 +259,7 @@ private:
 
     static LUTIndex toLUTIndex(ExtendedDayNum d)
     {
-        return normalizeLUTIndex(static_cast<Int64>(d + daynum_offset_epoch));
+        return normalizeLUTIndex(static_cast<Int64>(d + daynum_offset_epoch)); /// NOLINT
     }
 
     LUTIndex toLUTIndex(Time t) const
@@ -280,9 +284,9 @@ private:
         static_assert(std::is_integral_v<DateOrTime> && std::is_integral_v<Divisor>);
         assert(divisor > 0);
 
-        if (likely(offset_is_whole_number_of_hours_during_epoch))
+        if (offset_is_whole_number_of_hours_during_epoch) [[likely]]
         {
-            if (likely(x >= 0))
+            if (x >= 0) [[likely]]
                 return static_cast<DateOrTime>(x / divisor * divisor);
 
             /// Integer division for negative numbers rounds them towards zero (up).
@@ -576,10 +580,10 @@ public:
 
     unsigned toSecond(Time t) const
     {
-        if (likely(offset_is_whole_number_of_minutes_during_epoch))
+        if (offset_is_whole_number_of_minutes_during_epoch) [[likely]]
         {
             Time res = t % 60;
-            if (likely(res >= 0))
+            if (res >= 0) [[likely]]
                 return static_cast<unsigned>(res);
             return static_cast<unsigned>(res) + 60;
         }
@@ -593,6 +597,8 @@ public:
         return time % 60;
     }
 
+    unsigned toMillisecond(const DB::DateTime64 & datetime, Int64 scale_multiplier) const;
+
     unsigned toMinute(Time t) const
     {
         if (t >= 0 && offset_is_whole_number_of_hours_during_epoch)
@@ -1122,9 +1128,9 @@ public:
     DateOrTime toStartOfMinuteInterval(DateOrTime t, UInt64 minutes) const
     {
         Int64 divisor = 60 * minutes;
-        if (likely(offset_is_whole_number_of_minutes_during_epoch))
+        if (offset_is_whole_number_of_minutes_during_epoch) [[likely]]
         {
-            if (likely(t >= 0))
+            if (t >= 0) [[likely]]
                 return static_cast<DateOrTime>(t / divisor * divisor);
             return static_cast<DateOrTime>((t + 1 - divisor) / divisor * divisor);
         }
@@ -1339,7 +1345,7 @@ public:
 
     UInt8 saturateDayOfMonth(Int16 year, UInt8 month, UInt8 day_of_month) const
     {
-        if (likely(day_of_month <= 28))
+        if (day_of_month <= 28) [[likely]]
             return day_of_month;
 
         UInt8 days_in_month = daysInMonth(year, month);
diff --git a/src/Common/Dwarf.cpp b/src/Common/Dwarf.cpp
index a405f73e35e..99da3b75429 100644
--- a/src/Common/Dwarf.cpp
+++ b/src/Common/Dwarf.cpp
@@ -2067,8 +2067,8 @@ Dwarf::LineNumberVM::StepResult Dwarf::LineNumberVM::step(std::string_view & pro
     if (opcode != 0)
     { // standard opcode
         // Only interpret opcodes that are recognized by the version we're parsing;
-        // the others are vendor extensions and we should ignore them.
-        switch (opcode) // NOLINT(bugprone-switch-missing-default-case)
+        // the others are vendor extensions, and we should ignore them.
+        switch (opcode)
         {
             case DW_LNS_copy:
                 basicBlock_ = false;
@@ -2121,6 +2121,7 @@ Dwarf::LineNumberVM::StepResult Dwarf::LineNumberVM::step(std::string_view & pro
                 }
                 isa_ = readULEB(program);
                 return CONTINUE;
+            default:
         }
 
         // Unrecognized standard opcode, slurp the appropriate number of LEB
diff --git a/src/Common/ElapsedTimeProfileEventIncrement.h b/src/Common/ElapsedTimeProfileEventIncrement.h
index b30afd24a4c..731295a4cfd 100644
--- a/src/Common/ElapsedTimeProfileEventIncrement.h
+++ b/src/Common/ElapsedTimeProfileEventIncrement.h
@@ -14,12 +14,13 @@ enum Time
     Seconds,
 };
 
-template <Time time>
+template <Time unit>
 struct ProfileEventTimeIncrement
 {
     explicit ProfileEventTimeIncrement<time>(ProfileEvents::Event event_)
         : event(event_), watch(CLOCK_MONOTONIC) {}
 
+    template <Time time = unit>
     UInt64 elapsed()
     {
         if constexpr (time == Time::Nanoseconds)
diff --git a/src/Common/EnvironmentProxyConfigurationResolver.cpp b/src/Common/EnvironmentProxyConfigurationResolver.cpp
index 58507904ce9..f2c60afa1a8 100644
--- a/src/Common/EnvironmentProxyConfigurationResolver.cpp
+++ b/src/Common/EnvironmentProxyConfigurationResolver.cpp
@@ -50,7 +50,7 @@ ProxyConfiguration EnvironmentProxyConfigurationResolver::resolve()
     auto scheme = uri.getScheme();
     auto port = uri.getPort();
 
-    LOG_TRACE(&Poco::Logger::get("EnvironmentProxyConfigurationResolver"), "Use proxy from environment: {}://{}:{}", scheme, host, port);
+    LOG_TRACE(getLogger("EnvironmentProxyConfigurationResolver"), "Use proxy from environment: {}://{}:{}", scheme, host, port);
 
     return ProxyConfiguration {
         host,
diff --git a/src/Common/EnvironmentProxyConfigurationResolver.h b/src/Common/EnvironmentProxyConfigurationResolver.h
index fdd090e2492..6bc9d8a368c 100644
--- a/src/Common/EnvironmentProxyConfigurationResolver.h
+++ b/src/Common/EnvironmentProxyConfigurationResolver.h
@@ -11,7 +11,7 @@ namespace DB
 class EnvironmentProxyConfigurationResolver : public ProxyConfigurationResolver
 {
 public:
-    EnvironmentProxyConfigurationResolver(Protocol request_protocol, bool disable_tunneling_for_https_requests_over_http_proxy_ = false);
+    explicit EnvironmentProxyConfigurationResolver(Protocol request_protocol, bool disable_tunneling_for_https_requests_over_http_proxy_ = false);
 
     ProxyConfiguration resolve() override;
     void errorReport(const ProxyConfiguration &) override {}
diff --git a/src/Common/Epoll.h b/src/Common/Epoll.h
index 5eadd5a7a65..a200f0c2fb4 100644
--- a/src/Common/Epoll.h
+++ b/src/Common/Epoll.h
@@ -2,8 +2,6 @@
 #if defined(OS_LINUX)
 
 #include <sys/epoll.h>
-#include <vector>
-#include <functional>
 #include <boost/noncopyable.hpp>
 #include <Poco/Logger.h>
 
diff --git a/src/Common/ErrorCodes.cpp b/src/Common/ErrorCodes.cpp
index 577a83e40b9..97a339b2bac 100644
--- a/src/Common/ErrorCodes.cpp
+++ b/src/Common/ErrorCodes.cpp
@@ -379,7 +379,6 @@
     M(467, CANNOT_PARSE_BOOL) \
     M(468, CANNOT_PTHREAD_ATTR) \
     M(469, VIOLATED_CONSTRAINT) \
-    M(470, QUERY_IS_NOT_SUPPORTED_IN_LIVE_VIEW) \
     M(471, INVALID_SETTING_VALUE) \
     M(472, READONLY_SETTING) \
     M(473, DEADLOCK_AVOIDED) \
@@ -590,6 +589,18 @@
     M(708, ILLEGAL_STATISTIC) \
     M(709, CANNOT_GET_REPLICATED_DATABASE_SNAPSHOT) \
     M(710, FAULT_INJECTED) \
+    M(711, FILECACHE_ACCESS_DENIED) \
+    M(712, TOO_MANY_MATERIALIZED_VIEWS) \
+    M(713, BROKEN_PROJECTION) \
+    M(714, UNEXPECTED_CLUSTER) \
+    M(715, CANNOT_DETECT_FORMAT) \
+    M(716, CANNOT_FORGET_PARTITION) \
+    M(717, EXPERIMENTAL_FEATURE_ERROR) \
+    M(718, TOO_SLOW_PARSING) \
+    M(719, QUERY_CACHE_USED_WITH_SYSTEM_TABLE) \
+    \
+    M(900, DISTRIBUTED_CACHE_ERROR) \
+    M(901, CANNOT_USE_DISTRIBUTED_CACHE) \
     \
     M(999, KEEPER_EXCEPTION) \
     M(1000, POCO_EXCEPTION) \
diff --git a/src/Common/ErrorHandlers.h b/src/Common/ErrorHandlers.h
index 301377bff83..a4a7c4683aa 100644
--- a/src/Common/ErrorHandlers.h
+++ b/src/Common/ErrorHandlers.h
@@ -27,7 +27,7 @@ public:
     void exception()                        override { logException(); }
 
 private:
-    Poco::Logger * log = &Poco::Logger::get("ServerErrorHandler");
+    LoggerPtr log = getLogger("ServerErrorHandler");
 
     void logException()
     {
diff --git a/src/Common/Exception.cpp b/src/Common/Exception.cpp
index e1f010cc740..7d38fdafddb 100644
--- a/src/Common/Exception.cpp
+++ b/src/Common/Exception.cpp
@@ -1,26 +1,27 @@
-#include "Exception.h"
-
-#include <algorithm>
-#include <cstdlib>
-#include <cstring>
-#include <filesystem>
-#include <cxxabi.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <base/demangle.h>
-#include <Poco/String.h>
+#include <Common/AtomicLogger.h>
 #include <Common/ErrorCodes.h>
+#include <Common/Exception.h>
 #include <Common/LockMemoryExceptionInThread.h>
 #include <Common/MemorySanitizer.h>
 #include <Common/SensitiveDataMasker.h>
+#include <Common/config_version.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/formatReadable.h>
 #include <Common/logger_useful.h>
 
-#include <Common/config_version.h>
+#include <algorithm>
+#include <cstdlib>
+#include <cstring>
+#include <filesystem>
+#include <cxxabi.h>
+
+#include <Poco/String.h>
 
 namespace fs = std::filesystem;
 
@@ -69,14 +70,14 @@ void handle_error_code([[maybe_unused]] const std::string & msg, int code, bool
 Exception::MessageMasked::MessageMasked(const std::string & msg_)
     : msg(msg_)
 {
-    if (auto * masker = SensitiveDataMasker::getInstance())
+    if (auto masker = SensitiveDataMasker::getInstance())
         masker->wipeSensitiveData(msg);
 }
 
 Exception::MessageMasked::MessageMasked(std::string && msg_)
     : msg(std::move(msg_))
 {
-    if (auto * masker = SensitiveDataMasker::getInstance())
+    if (auto masker = SensitiveDataMasker::getInstance())
         masker->wipeSensitiveData(msg);
 }
 
@@ -235,8 +236,9 @@ void tryLogCurrentException(const char * log_name, const std::string & start_of_
     /// MemoryTracker until the exception will be logged.
     LockMemoryExceptionInThread lock_memory_tracker(VariableContext::Global);
 
-    /// Poco::Logger::get can allocate memory too
-    tryLogCurrentExceptionImpl(&Poco::Logger::get(log_name), start_of_message);
+    /// getLogger can allocate memory too
+    auto logger = getLogger(log_name);
+    tryLogCurrentExceptionImpl(logger.get(), start_of_message);
 }
 
 void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_message)
@@ -251,6 +253,16 @@ void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_
     tryLogCurrentExceptionImpl(logger, start_of_message);
 }
 
+void tryLogCurrentException(LoggerPtr logger, const std::string & start_of_message)
+{
+    tryLogCurrentException(logger.get(), start_of_message);
+}
+
+void tryLogCurrentException(const AtomicLogger & logger, const std::string & start_of_message)
+{
+    tryLogCurrentException(logger.load(), start_of_message);
+}
+
 static void getNoSpaceLeftInfoMessage(std::filesystem::path path, String & msg)
 {
     path = std::filesystem::absolute(path);
@@ -511,7 +523,7 @@ void tryLogException(std::exception_ptr e, const char * log_name, const std::str
     }
 }
 
-void tryLogException(std::exception_ptr e, Poco::Logger * logger, const std::string & start_of_message)
+void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message)
 {
     try
     {
@@ -523,6 +535,11 @@ void tryLogException(std::exception_ptr e, Poco::Logger * logger, const std::str
     }
 }
 
+void tryLogException(std::exception_ptr e, const AtomicLogger & logger, const std::string & start_of_message)
+{
+    tryLogException(e, logger.load(), start_of_message);
+}
+
 std::string getExceptionMessage(const Exception & e, bool with_stacktrace, bool check_embedded_stacktrace)
 {
     return getExceptionMessageAndPattern(e, with_stacktrace, check_embedded_stacktrace).text;
diff --git a/src/Common/Exception.h b/src/Common/Exception.h
index 6f30fde3876..97af8d1ffc3 100644
--- a/src/Common/Exception.h
+++ b/src/Common/Exception.h
@@ -1,18 +1,20 @@
 #pragma once
 
-#include <cerrno>
-#include <vector>
-#include <memory>
-
-#include <Poco/Exception.h>
-
 #include <base/defines.h>
 #include <base/errnoToString.h>
+#include <base/int8_to_string.h>
 #include <base/scope_guard.h>
+#include <Common/Logger.h>
 #include <Common/LoggingFormatStringHelpers.h>
 #include <Common/StackTrace.h>
 
+#include <cerrno>
+#include <exception>
+#include <memory>
+#include <vector>
+
 #include <fmt/format.h>
+#include <Poco/Exception.h>
 
 
 namespace Poco { class Logger; }
@@ -20,6 +22,8 @@ namespace Poco { class Logger; }
 namespace DB
 {
 
+class AtomicLogger;
+
 [[noreturn]] void abortOnFailedAssertion(const String & description);
 
 /// This flag can be set for testing purposes - to check that no exceptions are thrown.
@@ -199,7 +203,7 @@ public:
     {
         auto e = ErrnoException(fmt::format(fmt.fmt_str, std::forward<Args>(args)...), code, with_errno);
         e.message_format_string = fmt.message_format_string;
-        throw e;
+        throw e; /// NOLINT
     }
 
     template <typename... Args>
@@ -208,7 +212,7 @@ public:
         auto e = ErrnoException(fmt::format(fmt.fmt_str, std::forward<Args>(args)...), code, errno);
         e.message_format_string = fmt.message_format_string;
         e.path = path;
-        throw e;
+        throw e; /// NOLINT
     }
 
     template <typename... Args>
@@ -218,7 +222,7 @@ public:
         auto e = ErrnoException(fmt::format(fmt.fmt_str, std::forward<Args>(args)...), code, with_errno);
         e.message_format_string = fmt.message_format_string;
         e.path = path;
-        throw e;
+        throw e; /// NOLINT
     }
 
     ErrnoException * clone() const override { return new ErrnoException(*this); }
@@ -240,8 +244,11 @@ using Exceptions = std::vector<std::exception_ptr>;
 /** Try to write an exception to the log (and forget about it).
   * Can be used in destructors in the catch-all block.
   */
+/// TODO: Logger leak constexpr overload
 void tryLogCurrentException(const char * log_name, const std::string & start_of_message = "");
 void tryLogCurrentException(Poco::Logger * logger, const std::string & start_of_message = "");
+void tryLogCurrentException(LoggerPtr logger, const std::string & start_of_message = "");
+void tryLogCurrentException(const AtomicLogger & logger, const std::string & start_of_message = "");
 
 
 /** Prints current exception in canonical format.
@@ -284,9 +291,10 @@ struct ExecutionStatus
     bool tryDeserializeText(const std::string & data);
 };
 
-
+/// TODO: Logger leak constexpr overload
 void tryLogException(std::exception_ptr e, const char * log_name, const std::string & start_of_message = "");
-void tryLogException(std::exception_ptr e, Poco::Logger * logger, const std::string & start_of_message = "");
+void tryLogException(std::exception_ptr e, LoggerPtr logger, const std::string & start_of_message = "");
+void tryLogException(std::exception_ptr e, const AtomicLogger & logger, const std::string & start_of_message = "");
 
 std::string getExceptionMessage(const Exception & e, bool with_stacktrace, bool check_embedded_stacktrace = false);
 PreformattedMessage getExceptionMessageAndPattern(const Exception & e, bool with_stacktrace, bool check_embedded_stacktrace = false);
diff --git a/src/Common/ExternalLoaderStatus.cpp b/src/Common/ExternalLoaderStatus.cpp
new file mode 100644
index 00000000000..d9c9b37cc43
--- /dev/null
+++ b/src/Common/ExternalLoaderStatus.cpp
@@ -0,0 +1,19 @@
+#include <Common/ExternalLoaderStatus.h>
+
+#include <base/EnumReflection.h>
+
+namespace DB
+{
+
+std::vector<std::pair<String, Int8>> getExternalLoaderStatusEnumAllPossibleValues()
+{
+    std::vector<std::pair<String, Int8>> out;
+    out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
+
+    for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
+        out.emplace_back(std::string{str}, static_cast<Int8>(value));
+
+    return out;
+}
+
+}
diff --git a/src/Common/ExternalLoaderStatus.h b/src/Common/ExternalLoaderStatus.h
index ff0758fd3b2..b6e98073fea 100644
--- a/src/Common/ExternalLoaderStatus.h
+++ b/src/Common/ExternalLoaderStatus.h
@@ -1,30 +1,20 @@
 #pragma once
 
 #include <vector>
-#include <base/EnumReflection.h>
 #include <base/types.h>
 
 namespace DB
 {
-    enum class ExternalLoaderStatus : Int8
-    {
-        NOT_LOADED, /// Object hasn't been tried to load. This is an initial state.
-        LOADED, /// Object has been loaded successfully.
-        FAILED, /// Object has been failed to load.
-        LOADING, /// Object is being loaded right now for the first time.
-        FAILED_AND_RELOADING, /// Object was failed to load before and it's being reloaded right now.
-        LOADED_AND_RELOADING, /// Object was loaded successfully before and it's being reloaded right now.
-        NOT_EXIST, /// Object with this name wasn't found in the configuration.
-    };
+enum class ExternalLoaderStatus : int8_t
+{
+    NOT_LOADED, /// Object hasn't been tried to load. This is an initial state.
+    LOADED, /// Object has been loaded successfully.
+    FAILED, /// Object has been failed to load.
+    LOADING, /// Object is being loaded right now for the first time.
+    FAILED_AND_RELOADING, /// Object was failed to load before and it's being reloaded right now.
+    LOADED_AND_RELOADING, /// Object was loaded successfully before and it's being reloaded right now.
+    NOT_EXIST, /// Object with this name wasn't found in the configuration.
+};
 
-    inline std::vector<std::pair<String, Int8>> getStatusEnumAllPossibleValues()
-    {
-        std::vector<std::pair<String, Int8>> out;
-        out.reserve(magic_enum::enum_count<ExternalLoaderStatus>());
-
-        for (const auto & [value, str] : magic_enum::enum_entries<ExternalLoaderStatus>())
-            out.emplace_back(std::string{str}, static_cast<Int8>(value));
-
-        return out;
-    }
+std::vector<std::pair<String, Int8>> getExternalLoaderStatusEnumAllPossibleValues();
 }
diff --git a/src/Common/FailPoint.cpp b/src/Common/FailPoint.cpp
index f29aee0cdcc..2434c6004ad 100644
--- a/src/Common/FailPoint.cpp
+++ b/src/Common/FailPoint.cpp
@@ -6,7 +6,6 @@
 #include <chrono>
 #include <condition_variable>
 #include <mutex>
-#include <optional>
 
 namespace DB
 {
@@ -40,11 +39,22 @@ static struct InitFiu
     REGULAR(replicated_merge_tree_commit_zk_fail_when_recovering_from_hw_fault) \
     REGULAR(use_delayed_remote_source) \
     REGULAR(cluster_discovery_faults) \
+    ONCE(smt_commit_merge_mutate_zk_fail_after_op) \
+    ONCE(smt_commit_merge_mutate_zk_fail_before_op) \
+    ONCE(smt_commit_write_zk_fail_after_op) \
+    ONCE(smt_commit_write_zk_fail_before_op) \
+    ONCE(smt_commit_merge_change_version_before_op) \
+    ONCE(smt_merge_mutate_intention_freeze_in_destructor) \
+    ONCE(meta_in_keeper_create_metadata_failure) \
+    REGULAR(cache_warmer_stall) \
     REGULAR(check_table_query_delay_for_part) \
     REGULAR(dummy_failpoint) \
     REGULAR(prefetched_reader_pool_failpoint) \
-    PAUSEABLE_ONCE(dummy_pausable_failpoint_once) \
-    PAUSEABLE(dummy_pausable_failpoint)
+    PAUSEABLE_ONCE(replicated_merge_tree_insert_retry_pause) \
+    PAUSEABLE_ONCE(finish_set_quorum_failed_parts) \
+    PAUSEABLE_ONCE(finish_clean_quorum_failed_parts) \
+    PAUSEABLE(dummy_pausable_failpoint) \
+    ONCE(execute_query_calling_empty_set_result_func_on_exception)
 
 namespace FailPoints
 {
diff --git a/src/Common/FailPoint.h b/src/Common/FailPoint.h
index b9eb13903a6..b3e1214d597 100644
--- a/src/Common/FailPoint.h
+++ b/src/Common/FailPoint.h
@@ -5,20 +5,15 @@
 #include <Core/Types.h>
 #include <Poco/Util/AbstractConfiguration.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
diff --git a/src/Common/Fiber.h b/src/Common/Fiber.h
index f48ace149f4..8b88bd323ef 100644
--- a/src/Common/Fiber.h
+++ b/src/Common/Fiber.h
@@ -17,7 +17,7 @@ private:
     template <typename T> friend class FiberLocal;
 
 public:
-    template< typename StackAlloc, typename Fn>
+    template <typename StackAlloc, typename Fn>
     Fiber(StackAlloc && salloc, Fn && fn) : impl(std::allocator_arg_t(), std::forward<StackAlloc>(salloc), RoutineImpl(std::forward<Fn>(fn)))
     {
     }
@@ -46,6 +46,12 @@ public:
         current_fiber = parent_fiber;
     }
 
+    static FiberPtr & getCurrentFiber()
+    {
+        thread_local static FiberPtr current_fiber;
+        return current_fiber;
+    }
+
 private:
     template <typename Fn>
     struct RoutineImpl
@@ -74,12 +80,6 @@ private:
         Fn fn;
     };
 
-    static FiberPtr & getCurrentFiber()
-    {
-        thread_local static FiberPtr current_fiber;
-        return current_fiber;
-    }
-
     /// Special wrapper to store data in uniquer_ptr.
     struct DataWrapper
     {
@@ -146,4 +146,3 @@ private:
 
     T main_instance;
 };
-
diff --git a/src/Common/FieldVisitorConvertToNumber.cpp b/src/Common/FieldVisitorConvertToNumber.cpp
new file mode 100644
index 00000000000..75b3fbfe02a
--- /dev/null
+++ b/src/Common/FieldVisitorConvertToNumber.cpp
@@ -0,0 +1,23 @@
+#include <Common/FieldVisitorConvertToNumber.h>
+#include "base/Decimal.h"
+
+namespace DB
+{
+
+/// Explicit template instantiations.
+template class FieldVisitorConvertToNumber<Int8>;
+template class FieldVisitorConvertToNumber<UInt8>;
+template class FieldVisitorConvertToNumber<Int16>;
+template class FieldVisitorConvertToNumber<UInt16>;
+template class FieldVisitorConvertToNumber<Int32>;
+template class FieldVisitorConvertToNumber<UInt32>;
+template class FieldVisitorConvertToNumber<Int64>;
+template class FieldVisitorConvertToNumber<UInt64>;
+template class FieldVisitorConvertToNumber<Int128>;
+template class FieldVisitorConvertToNumber<UInt128>;
+template class FieldVisitorConvertToNumber<Int256>;
+template class FieldVisitorConvertToNumber<UInt256>;
+template class FieldVisitorConvertToNumber<Float32>;
+template class FieldVisitorConvertToNumber<Float64>;
+
+}
diff --git a/src/Common/FieldVisitorConvertToNumber.h b/src/Common/FieldVisitorConvertToNumber.h
index bf8c8c8638e..86e03cb5d77 100644
--- a/src/Common/FieldVisitorConvertToNumber.h
+++ b/src/Common/FieldVisitorConvertToNumber.h
@@ -91,7 +91,7 @@ public:
         if constexpr (std::is_floating_point_v<T>)
             return x.getValue().template convertTo<T>() / x.getScaleMultiplier().template convertTo<T>();
         else
-            return (x.getValue() / x.getScaleMultiplier()). template convertTo<T>();
+            return (x.getValue() / x.getScaleMultiplier()).template convertTo<T>();
     }
 
     T operator() (const AggregateFunctionStateData &) const
@@ -117,4 +117,19 @@ public:
     T operator() (const bool & x) const { return T(x); }
 };
 
+extern template class FieldVisitorConvertToNumber<Int8>;
+extern template class FieldVisitorConvertToNumber<UInt8>;
+extern template class FieldVisitorConvertToNumber<Int16>;
+extern template class FieldVisitorConvertToNumber<UInt16>;
+extern template class FieldVisitorConvertToNumber<Int32>;
+extern template class FieldVisitorConvertToNumber<UInt32>;
+extern template class FieldVisitorConvertToNumber<Int64>;
+extern template class FieldVisitorConvertToNumber<UInt64>;
+extern template class FieldVisitorConvertToNumber<Int128>;
+extern template class FieldVisitorConvertToNumber<UInt128>;
+extern template class FieldVisitorConvertToNumber<Int256>;
+extern template class FieldVisitorConvertToNumber<UInt256>;
+extern template class FieldVisitorConvertToNumber<Float32>;
+extern template class FieldVisitorConvertToNumber<Float64>;
+
 }
diff --git a/src/Common/FileChecker.cpp b/src/Common/FileChecker.cpp
index 049dee459a7..5ecbe44530b 100644
--- a/src/Common/FileChecker.cpp
+++ b/src/Common/FileChecker.cpp
@@ -10,6 +10,8 @@
 #include <IO/ReadHelpers.h>
 #include <base/JSON.h>
 
+#include <boost/range/adaptor/map.hpp>
+
 
 namespace fs = std::filesystem;
 
@@ -29,7 +31,7 @@ FileChecker::FileChecker(const String & file_info_path_) : FileChecker(nullptr,
 
 FileChecker::FileChecker(DiskPtr disk_, const String & file_info_path_)
     : disk(std::move(disk_))
-    , log(&Poco::Logger::get("FileChecker"))
+    , log(getLogger("FileChecker"))
 {
     setPath(file_info_path_);
     try
diff --git a/src/Common/FileChecker.h b/src/Common/FileChecker.h
index 41b151e51b0..e2478f79767 100644
--- a/src/Common/FileChecker.h
+++ b/src/Common/FileChecker.h
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <Storages/CheckResults.h>
+#include <Common/Logger.h>
 #include <map>
 #include <base/types.h>
+#include <memory>
 #include <mutex>
 
 namespace Poco { class Logger; }
@@ -17,7 +19,7 @@ using DiskPtr = std::shared_ptr<IDisk>;
 class FileChecker
 {
 public:
-    FileChecker(const String & file_info_path_);
+    explicit FileChecker(const String & file_info_path_);
     FileChecker(DiskPtr disk_, const String & file_info_path_);
 
     void setPath(const String & file_info_path_);
@@ -48,7 +50,7 @@ public:
 
     struct DataValidationTasks
     {
-        DataValidationTasks(const std::map<String, size_t> & map_)
+        explicit DataValidationTasks(const std::map<String, size_t> & map_)
             : map(map_), it(map.begin())
         {}
 
@@ -83,7 +85,7 @@ private:
     size_t getRealFileSize(const String & path_) const;
 
     const DiskPtr disk;
-    const Poco::Logger * log;
+    const LoggerPtr log;
 
     String files_info_path;
     std::map<String, size_t> map;
diff --git a/src/Common/FileRenamer.h b/src/Common/FileRenamer.h
index 91f74f09032..6a39cb27090 100644
--- a/src/Common/FileRenamer.h
+++ b/src/Common/FileRenamer.h
@@ -25,7 +25,7 @@ class FileRenamer
 public:
     FileRenamer();
 
-    FileRenamer(const String & renaming_rule);
+    explicit FileRenamer(const String & renaming_rule);
 
     String generateNewFilename(const String & filename) const;
 
diff --git a/src/Common/FrequencyHolder.cpp b/src/Common/FrequencyHolder.cpp
index 7dc1f622aeb..a2548686586 100644
--- a/src/Common/FrequencyHolder.cpp
+++ b/src/Common/FrequencyHolder.cpp
@@ -34,7 +34,7 @@ FrequencyHolder::FrequencyHolder()
 
 void FrequencyHolder::loadEncodingsFrequency()
 {
-    Poco::Logger * log = &Poco::Logger::get("EncodingsFrequency");
+    LoggerPtr log = getLogger("EncodingsFrequency");
 
     LOG_TRACE(log, "Loading embedded charset frequencies");
 
@@ -92,7 +92,7 @@ void FrequencyHolder::loadEncodingsFrequency()
 
 void FrequencyHolder::loadEmotionalDict()
 {
-    Poco::Logger * log = &Poco::Logger::get("EmotionalDict");
+    LoggerPtr log = getLogger("EmotionalDict");
     LOG_TRACE(log, "Loading embedded emotional dictionary");
 
     std::string_view resource(reinterpret_cast<const char *>(gresource_tonality_ru_zstData), gresource_tonality_ru_zstSize);
@@ -130,7 +130,7 @@ void FrequencyHolder::loadEmotionalDict()
 
 void FrequencyHolder::loadProgrammingFrequency()
 {
-    Poco::Logger * log = &Poco::Logger::get("ProgrammingFrequency");
+    LoggerPtr log = getLogger("ProgrammingFrequency");
 
     LOG_TRACE(log, "Loading embedded programming languages frequencies loading");
 
diff --git a/src/Common/FrequencyHolder.h b/src/Common/FrequencyHolder.h
index 73675ed9814..64207dc5423 100644
--- a/src/Common/FrequencyHolder.h
+++ b/src/Common/FrequencyHolder.h
@@ -47,7 +47,6 @@ public:
         HashMap<UInt16, Float64> map;
     };
 
-public:
     using Map = HashMap<StringRef, Float64>;
     using Container = std::vector<Language>;
 
diff --git a/src/Common/FunctionDocumentation.cpp b/src/Common/FunctionDocumentation.cpp
index 2aad23b90b7..7b554539a4f 100644
--- a/src/Common/FunctionDocumentation.cpp
+++ b/src/Common/FunctionDocumentation.cpp
@@ -1,5 +1,7 @@
 #include <Common/FunctionDocumentation.h>
 
+#include <boost/algorithm/string.hpp>
+
 namespace DB
 {
 
@@ -31,14 +33,7 @@ std::string FunctionDocumentation::examplesAsString() const
 
 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;
+    return boost::algorithm::join(categories, ", ");
 }
 
 }
diff --git a/src/Common/HTTPConnectionPool.cpp b/src/Common/HTTPConnectionPool.cpp
new file mode 100644
index 00000000000..167aeee68f3
--- /dev/null
+++ b/src/Common/HTTPConnectionPool.cpp
@@ -0,0 +1,896 @@
+#include <Common/HTTPConnectionPool.h>
+#include <Common/HostResolvePool.h>
+
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/logger_useful.h>
+#include <Common/Exception.h>
+#include <Common/ErrorCodes.h>
+#include <Common/ProxyConfiguration.h>
+#include <Common/MemoryTrackerSwitcher.h>
+#include <Common/SipHash.h>
+
+#include <Poco/Net/HTTPChunkedStream.h>
+#include <Poco/Net/HTTPClientSession.h>
+#include <Poco/Net/HTTPFixedLengthStream.h>
+#include <Poco/Net/HTTPRequest.h>
+#include <Poco/Net/HTTPResponse.h>
+#include <Poco/Net/HTTPStream.h>
+#include <Poco/Net/NetException.h>
+#include <Poco/Timespan.h>
+
+#include <queue>
+
+#include "config.h"
+
+#if USE_SSL
+#include <Poco/Net/HTTPSClientSession.h>
+#endif
+
+
+namespace ProfileEvents
+{
+    extern const Event StorageConnectionsCreated;
+    extern const Event StorageConnectionsReused;
+    extern const Event StorageConnectionsReset;
+    extern const Event StorageConnectionsPreserved;
+    extern const Event StorageConnectionsExpired;
+    extern const Event StorageConnectionsErrors;
+    extern const Event StorageConnectionsElapsedMicroseconds;
+
+    extern const Event DiskConnectionsCreated;
+    extern const Event DiskConnectionsReused;
+    extern const Event DiskConnectionsReset;
+    extern const Event DiskConnectionsPreserved;
+    extern const Event DiskConnectionsExpired;
+    extern const Event DiskConnectionsErrors;
+    extern const Event DiskConnectionsElapsedMicroseconds;
+
+    extern const Event HTTPConnectionsCreated;
+    extern const Event HTTPConnectionsReused;
+    extern const Event HTTPConnectionsReset;
+    extern const Event HTTPConnectionsPreserved;
+    extern const Event HTTPConnectionsExpired;
+    extern const Event HTTPConnectionsErrors;
+    extern const Event HTTPConnectionsElapsedMicroseconds;
+}
+
+
+namespace CurrentMetrics
+{
+    extern const Metric StorageConnectionsStored;
+    extern const Metric StorageConnectionsTotal;
+
+    extern const Metric DiskConnectionsStored;
+    extern const Metric DiskConnectionsTotal;
+
+    extern const Metric HTTPConnectionsStored;
+    extern const Metric HTTPConnectionsTotal;
+}
+
+namespace
+{
+    Poco::Net::HTTPClientSession::ProxyConfig proxyConfigurationToPocoProxyConfig(const DB::ProxyConfiguration & proxy_configuration)
+    {
+        Poco::Net::HTTPClientSession::ProxyConfig poco_proxy_config;
+
+        poco_proxy_config.host = proxy_configuration.host;
+        poco_proxy_config.port = proxy_configuration.port;
+        poco_proxy_config.protocol = DB::ProxyConfiguration::protocolToString(proxy_configuration.protocol);
+        poco_proxy_config.tunnel = proxy_configuration.tunneling;
+        poco_proxy_config.originalRequestProtocol = DB::ProxyConfiguration::protocolToString(proxy_configuration.original_request_protocol);
+
+        return poco_proxy_config;
+    }
+
+
+    constexpr size_t roundUp(size_t x, size_t rounding)
+    {
+        chassert(rounding > 0);
+        return (x + rounding) / rounding * rounding;
+    }
+    static_assert(roundUp(10000, 100) == 10100);
+    static_assert(roundUp(10001, 100) == 10100);
+    static_assert(roundUp(10099, 100) == 10100);
+    static_assert(roundUp(10100, 100) == 10200);
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int UNSUPPORTED_URI_SCHEME;
+}
+
+
+IHTTPConnectionPoolForEndpoint::Metrics getMetricsForStorageConnectionPool()
+{
+    return IHTTPConnectionPoolForEndpoint::Metrics{
+        .created = ProfileEvents::StorageConnectionsCreated,
+        .reused = ProfileEvents::StorageConnectionsReused,
+        .reset = ProfileEvents::StorageConnectionsReset,
+        .preserved = ProfileEvents::StorageConnectionsPreserved,
+        .expired = ProfileEvents::StorageConnectionsExpired,
+        .errors = ProfileEvents::StorageConnectionsErrors,
+        .elapsed_microseconds = ProfileEvents::StorageConnectionsElapsedMicroseconds,
+        .stored_count = CurrentMetrics::StorageConnectionsStored,
+        .active_count = CurrentMetrics::StorageConnectionsTotal,
+    };
+}
+
+
+IHTTPConnectionPoolForEndpoint::Metrics getMetricsForDiskConnectionPool()
+{
+    return IHTTPConnectionPoolForEndpoint::Metrics{
+        .created = ProfileEvents::DiskConnectionsCreated,
+        .reused = ProfileEvents::DiskConnectionsReused,
+        .reset = ProfileEvents::DiskConnectionsReset,
+        .preserved = ProfileEvents::DiskConnectionsPreserved,
+        .expired = ProfileEvents::DiskConnectionsExpired,
+        .errors = ProfileEvents::DiskConnectionsErrors,
+        .elapsed_microseconds = ProfileEvents::DiskConnectionsElapsedMicroseconds,
+        .stored_count = CurrentMetrics::DiskConnectionsStored,
+        .active_count = CurrentMetrics::DiskConnectionsTotal,
+    };
+}
+
+
+IHTTPConnectionPoolForEndpoint::Metrics getMetricsForHTTPConnectionPool()
+{
+    return IHTTPConnectionPoolForEndpoint::Metrics{
+        .created = ProfileEvents::HTTPConnectionsCreated,
+        .reused = ProfileEvents::HTTPConnectionsReused,
+        .reset = ProfileEvents::HTTPConnectionsReset,
+        .preserved = ProfileEvents::HTTPConnectionsPreserved,
+        .expired = ProfileEvents::HTTPConnectionsExpired,
+        .errors = ProfileEvents::HTTPConnectionsErrors,
+        .elapsed_microseconds = ProfileEvents::HTTPConnectionsElapsedMicroseconds,
+        .stored_count = CurrentMetrics::HTTPConnectionsStored,
+        .active_count = CurrentMetrics::HTTPConnectionsTotal,
+    };
+}
+
+
+IHTTPConnectionPoolForEndpoint::Metrics getConnectionPoolMetrics(HTTPConnectionGroupType type)
+{
+    switch (type)
+    {
+        case HTTPConnectionGroupType::STORAGE:
+            return getMetricsForStorageConnectionPool();
+        case HTTPConnectionGroupType::DISK:
+            return getMetricsForDiskConnectionPool();
+        case HTTPConnectionGroupType::HTTP:
+            return getMetricsForHTTPConnectionPool();
+    }
+}
+
+
+class ConnectionGroup
+{
+public:
+    using Ptr = std::shared_ptr<ConnectionGroup>;
+
+    explicit ConnectionGroup(HTTPConnectionGroupType type_) : type(type_), metrics(getConnectionPoolMetrics(type_)) { }
+
+    void setLimits(HTTPConnectionPools::Limits limits_)
+    {
+        std::lock_guard lock(mutex);
+        limits = std::move(limits_);
+        mute_warning_until = 0;
+    }
+
+    bool isSoftLimitReached() const
+    {
+        std::lock_guard lock(mutex);
+        return total_connections_in_group >= limits.soft_limit;
+    }
+
+    bool isStoreLimitReached() const
+    {
+        std::lock_guard lock(mutex);
+        return total_connections_in_group >= limits.store_limit;
+    }
+
+    void atConnectionCreate()
+    {
+        std::lock_guard lock(mutex);
+
+        ++total_connections_in_group;
+
+        if (total_connections_in_group >= limits.warning_limit && total_connections_in_group >= mute_warning_until)
+        {
+            mute_warning_until = roundUp(total_connections_in_group, HTTPConnectionPools::Limits::warning_step);
+            LOG_WARNING(log, "Too many active sessions in group {}, count {}, warning limit {}, next warning at {}",
+                        type, total_connections_in_group, limits.warning_limit, mute_warning_until);
+        }
+    }
+
+    void atConnectionDestroy()
+    {
+        std::lock_guard lock(mutex);
+
+        --total_connections_in_group;
+
+        const size_t gap = 20;
+        const size_t reduced_warning_limit = limits.warning_limit > gap ? limits.warning_limit - gap : 1;
+        if (mute_warning_until > 0 && total_connections_in_group < reduced_warning_limit)
+        {
+            LOG_WARNING(log, "Sessions count is OK in the group {}, count {}", type, total_connections_in_group);
+            mute_warning_until = 0;
+        }
+    }
+
+    HTTPConnectionGroupType getType() const { return type; }
+
+    const IHTTPConnectionPoolForEndpoint::Metrics & getMetrics() const { return metrics; }
+
+private:
+    const HTTPConnectionGroupType type;
+    const IHTTPConnectionPoolForEndpoint::Metrics metrics;
+
+    LoggerPtr log = getLogger("ConnectionGroup");
+
+    mutable std::mutex mutex;
+    HTTPConnectionPools::Limits limits TSA_GUARDED_BY(mutex) = HTTPConnectionPools::Limits();
+    size_t total_connections_in_group TSA_GUARDED_BY(mutex) = 0;
+    size_t mute_warning_until TSA_GUARDED_BY(mutex) = 0;
+};
+
+
+class IExtendedPool : public IHTTPConnectionPoolForEndpoint
+{
+public:
+    using Ptr = std::shared_ptr<IExtendedPool>;
+
+    virtual HTTPConnectionGroupType getGroupType() const = 0;
+    virtual size_t wipeExpired() = 0;
+};
+
+
+// EndpointConnectionPool manage connections to the endpoint
+// Features:
+// - it uses HostResolver for address selecting. See Common/HostResolver.h for more info.
+// - it minimizes number of `Session::connect()`/`Session::reconnect()` calls
+//   - stores only connected and ready to use sessions
+//   - connection could be reused even when limits are reached
+// - soft limit, warn limit, store limit
+// - `Session::reconnect()` uses the pool as well
+// - comprehensive sensors
+// - session is reused according its inner state, automatically
+
+
+template <class Session>
+class EndpointConnectionPool : public std::enable_shared_from_this<EndpointConnectionPool<Session>>, public IExtendedPool
+{
+private:
+    friend class HTTPConnectionPools;
+
+    using WeakPtr = std::weak_ptr<EndpointConnectionPool<Session>>;
+
+    class PooledConnection : public Session
+    {
+    public:
+        using Ptr = std::shared_ptr<PooledConnection>;
+
+        using Session::mustReconnect;
+
+        void markAsExpired()
+        {
+            isExpired = true;
+        }
+
+        void reconnect() override
+        {
+            Session::close();
+
+            if (auto lock = pool.lock())
+            {
+                auto timeouts = getTimeouts(*this);
+                auto new_connection = lock->getConnection(timeouts);
+                Session::assign(*new_connection);
+                Session::setKeepAliveRequest(Session::getKeepAliveRequest() + 1);
+            }
+            else
+            {
+                auto timer = CurrentThread::getProfileEvents().timer(metrics.elapsed_microseconds);
+                Session::reconnect();
+                ProfileEvents::increment(metrics.created);
+            }
+        }
+
+        String getTarget() const
+        {
+            if (!Session::getProxyConfig().host.empty())
+                return fmt::format("{}:{} over proxy {}",
+                                   Session::getHost(),
+                                   Session::getPort(),
+                                   Session::getProxyConfig().host);
+            return fmt::format("{}:{}",
+                               Session::getHost(),
+                               Session::getPort());
+        }
+
+        Poco::Timespan idleTime()
+        {
+            Poco::Timestamp now;
+            return now - Session::getLastRequest();
+        }
+
+        void flushRequest() override
+        {
+            if (bool(request_stream))
+            {
+                request_stream->flush();
+
+                if (auto * fixed_steam = dynamic_cast<Poco::Net::HTTPFixedLengthOutputStream *>(request_stream))
+                {
+                    request_stream_completed = fixed_steam->isComplete();
+                }
+                else if (auto * chunked_steam = dynamic_cast<Poco::Net::HTTPChunkedOutputStream *>(request_stream))
+                {
+                    chunked_steam->rdbuf()->close();
+                    request_stream_completed = chunked_steam->isComplete();
+                }
+                else if (auto * http_stream = dynamic_cast<Poco::Net::HTTPOutputStream *>(request_stream))
+                {
+                    request_stream_completed = http_stream->isComplete();
+                }
+                else
+                {
+                    request_stream_completed = false;
+                }
+            }
+            request_stream = nullptr;
+
+            Session::flushRequest();
+        }
+
+        std::ostream & sendRequest(Poco::Net::HTTPRequest & request) override
+        {
+            auto idle = idleTime();
+            std::ostream & result = Session::sendRequest(request);
+            result.exceptions(std::ios::badbit);
+
+            request_stream = &result;
+            request_stream_completed = false;
+
+            response_stream = nullptr;
+            response_stream_completed = false;
+
+            return result;
+        }
+
+        std::istream & receiveResponse(Poco::Net::HTTPResponse & response) override
+        {
+            std::istream & result = Session::receiveResponse(response);
+            result.exceptions(std::ios::badbit);
+
+            response_stream = &result;
+            response_stream_completed = false;
+
+            return result;
+        }
+
+        void reset() override
+        {
+            request_stream = nullptr;
+            request_stream_completed = false;
+
+            response_stream = nullptr;
+            response_stream_completed = false;
+
+            Session::reset();
+        }
+
+        ~PooledConnection() override
+        {
+            if (bool(response_stream))
+            {
+                if (auto * fixed_steam = dynamic_cast<Poco::Net::HTTPFixedLengthInputStream *>(response_stream))
+                {
+                    response_stream_completed = fixed_steam->isComplete();
+                }
+                else if (auto * chunked_steam = dynamic_cast<Poco::Net::HTTPChunkedInputStream *>(response_stream))
+                {
+                    response_stream_completed = chunked_steam->isComplete();
+                }
+                else if (auto * http_stream = dynamic_cast<Poco::Net::HTTPInputStream *>(response_stream))
+                {
+                    response_stream_completed = http_stream->isComplete();
+                }
+                else
+                {
+                    response_stream_completed = false;
+                }
+            }
+            response_stream = nullptr;
+
+            group->atConnectionDestroy();
+
+            if (!isExpired)
+                if (auto lock = pool.lock())
+                    lock->atConnectionDestroy(*this);
+
+            CurrentMetrics::sub(metrics.active_count);
+        }
+
+    private:
+        friend class EndpointConnectionPool;
+
+        template <class... Args>
+        explicit PooledConnection(
+                EndpointConnectionPool::WeakPtr pool_,
+                ConnectionGroup::Ptr group_,
+                IHTTPConnectionPoolForEndpoint::Metrics metrics_,
+                Args &&... args)
+            : Session(std::forward<Args>(args)...)
+            , pool(std::move(pool_))
+            , group(group_)
+            , metrics(std::move(metrics_))
+        {
+            CurrentMetrics::add(metrics.active_count);
+            group->atConnectionCreate();
+        }
+
+        template <class... Args>
+        static Ptr create(Args &&... args)
+        {
+            /// Pool is global, we shouldn't attribute this memory to query/user.
+            MemoryTrackerSwitcher switcher{&total_memory_tracker};
+
+            struct make_shared_enabler : public PooledConnection
+            {
+                explicit make_shared_enabler(Args &&... args) : PooledConnection(std::forward<Args>(args)...) { }
+            };
+            return std::make_shared<make_shared_enabler>(std::forward<Args>(args)...);
+        }
+
+        void doConnect()
+        {
+            Session::reconnect();
+        }
+
+        bool isCompleted() const
+        {
+            return request_stream_completed && response_stream_completed;
+        }
+
+        EndpointConnectionPool::WeakPtr pool;
+        ConnectionGroup::Ptr group;
+        IHTTPConnectionPoolForEndpoint::Metrics metrics;
+        bool isExpired = false;
+
+        LoggerPtr log = getLogger("PooledConnection");
+
+        std::ostream * request_stream = nullptr;
+        std::istream * response_stream = nullptr;
+
+        bool request_stream_completed = true;
+        bool response_stream_completed = true;
+    };
+
+    using Connection = PooledConnection;
+    using ConnectionPtr = PooledConnection::Ptr;
+
+    struct GreaterByLastRequest
+    {
+        static bool operator()(const ConnectionPtr & l, const ConnectionPtr & r)
+        {
+            return l->getLastRequest() + l->getKeepAliveTimeout() > r->getLastRequest() + r->getKeepAliveTimeout();
+        }
+    };
+
+    using ConnectionsMinHeap = std::priority_queue<ConnectionPtr, std::vector<ConnectionPtr>, GreaterByLastRequest>;
+
+public:
+    template <class... Args>
+    static Ptr create(Args &&... args)
+    {
+        struct make_shared_enabler : public EndpointConnectionPool<Session>
+        {
+            explicit make_shared_enabler(Args &&... args) : EndpointConnectionPool<Session>(std::forward<Args>(args)...) { }
+        };
+        return std::make_shared<make_shared_enabler>(std::forward<Args>(args)...);
+    }
+
+    ~EndpointConnectionPool() override
+    {
+        CurrentMetrics::sub(group->getMetrics().stored_count, stored_connections.size());
+    }
+
+    String getTarget() const
+    {
+        if (!proxy_configuration.isEmpty())
+            return fmt::format("{} over proxy {}",
+                               host, proxy_configuration.host);
+        return host;
+    }
+
+    IHTTPConnectionPoolForEndpoint::ConnectionPtr getConnection(const ConnectionTimeouts & timeouts) override
+    {
+        std::vector<ConnectionPtr> expired_connections;
+
+        SCOPE_EXIT({
+            MemoryTrackerSwitcher switcher{&total_memory_tracker};
+            expired_connections.clear();
+        });
+
+        {
+            std::lock_guard lock(mutex);
+            expired_connections.reserve(stored_connections.size());
+
+            wipeExpiredImpl(expired_connections);
+
+            if (!stored_connections.empty())
+            {
+                auto it = stored_connections.top();
+                stored_connections.pop();
+
+                setTimeouts(*it, timeouts);
+
+                ProfileEvents::increment(getMetrics().reused, 1);
+                CurrentMetrics::sub(getMetrics().stored_count, 1);
+
+                return it;
+            }
+        }
+
+        return prepareNewConnection(timeouts);
+    }
+
+    const IHTTPConnectionPoolForEndpoint::Metrics & getMetrics() const override
+    {
+        return group->getMetrics();
+    }
+
+    HTTPConnectionGroupType getGroupType() const override
+    {
+        return group->getType();
+    }
+
+    size_t wipeExpired() override
+    {
+        std::vector<ConnectionPtr> expired_connections;
+
+        SCOPE_EXIT({
+            MemoryTrackerSwitcher switcher{&total_memory_tracker};
+            expired_connections.clear();
+        });
+
+        std::lock_guard lock(mutex);
+        return wipeExpiredImpl(expired_connections);
+    }
+
+    size_t wipeExpiredImpl(std::vector<ConnectionPtr> & expired_connections) TSA_REQUIRES(mutex)
+    {
+        SCOPE_EXIT({
+            CurrentMetrics::sub(getMetrics().stored_count, expired_connections.size());
+            ProfileEvents::increment(getMetrics().expired, expired_connections.size());
+        });
+
+        auto isSoftLimitReached = group->isSoftLimitReached();
+        while (!stored_connections.empty())
+        {
+            auto connection = stored_connections.top();
+
+            if (!isExpired(connection, isSoftLimitReached))
+                return stored_connections.size();
+
+            stored_connections.pop();
+            connection->markAsExpired();
+            expired_connections.push_back(connection);
+        }
+
+        return stored_connections.size();
+    }
+
+private:
+    EndpointConnectionPool(ConnectionGroup::Ptr group_, String host_, UInt16 port_, bool https_, ProxyConfiguration proxy_configuration_)
+        : host(std::move(host_))
+        , port(port_)
+        , https(https_)
+        , proxy_configuration(std::move(proxy_configuration_))
+        , group(group_)
+    {
+    }
+
+    WeakPtr getWeakFromThis() { return EndpointConnectionPool::weak_from_this(); }
+
+    bool isExpired(ConnectionPtr connection, bool isSoftLimitReached) TSA_REQUIRES(mutex)
+    {
+        if (isSoftLimitReached)
+            return connection->isKeepAliveExpired(0.1);
+        return connection->isKeepAliveExpired(0.8);
+    }
+
+
+    ConnectionPtr prepareNewConnection(const ConnectionTimeouts & timeouts)
+    {
+        auto connection = PooledConnection::create(this->getWeakFromThis(), group, getMetrics(), host, port);
+
+        connection->setKeepAlive(true);
+        setTimeouts(*connection, timeouts);
+
+        if (!proxy_configuration.isEmpty())
+        {
+            connection->setProxyConfig(proxyConfigurationToPocoProxyConfig(proxy_configuration));
+        }
+
+        auto address = HostResolversPool::instance().getResolver(host)->resolve();
+        connection->setResolvedHost(*address);
+
+        try
+        {
+            auto timer = CurrentThread::getProfileEvents().timer(getMetrics().elapsed_microseconds);
+            connection->doConnect();
+        }
+        catch (...)
+        {
+            address.setFail();
+            ProfileEvents::increment(getMetrics().errors);
+            connection->reset();
+            throw;
+        }
+
+        ProfileEvents::increment(getMetrics().created);
+        return connection;
+    }
+
+    void atConnectionDestroy(PooledConnection & connection)
+    {
+        if (connection.getKeepAliveRequest() >= connection.getKeepAliveMaxRequests())
+        {
+            ProfileEvents::increment(getMetrics().expired, 1);
+            return;
+        }
+
+        if (!connection.connected() || connection.mustReconnect() || !connection.isCompleted() || connection.buffered()
+            || group->isStoreLimitReached())
+        {
+            ProfileEvents::increment(getMetrics().reset, 1);
+            return;
+        }
+
+        auto connection_to_store = PooledConnection::create(this->getWeakFromThis(), group, getMetrics(), host, port);
+        connection_to_store->assign(connection);
+
+        {
+            MemoryTrackerSwitcher switcher{&total_memory_tracker};
+            std::lock_guard lock(mutex);
+            stored_connections.push(connection_to_store);
+        }
+
+        CurrentMetrics::add(getMetrics().stored_count, 1);
+        ProfileEvents::increment(getMetrics().preserved, 1);
+    }
+
+
+    const std::string host;
+    const UInt16 port;
+    const bool https;
+    const ProxyConfiguration proxy_configuration;
+    const ConnectionGroup::Ptr group;
+
+    std::mutex mutex;
+    ConnectionsMinHeap stored_connections TSA_GUARDED_BY(mutex);
+};
+
+struct EndpointPoolKey
+{
+    HTTPConnectionGroupType connection_group;
+    String target_host;
+    UInt16 target_port;
+    bool is_target_https;
+    ProxyConfiguration proxy_config;
+
+    bool operator==(const EndpointPoolKey & rhs) const
+    {
+        return std::tie(
+                   connection_group,
+                   target_host,
+                   target_port,
+                   is_target_https,
+                   proxy_config.host,
+                   proxy_config.port,
+                   proxy_config.protocol,
+                   proxy_config.tunneling,
+                   proxy_config.original_request_protocol)
+            == std::tie(
+                   rhs.connection_group,
+                   rhs.target_host,
+                   rhs.target_port,
+                   rhs.is_target_https,
+                   rhs.proxy_config.host,
+                   rhs.proxy_config.port,
+                   rhs.proxy_config.protocol,
+                   rhs.proxy_config.tunneling,
+                   rhs.proxy_config.original_request_protocol);
+    }
+};
+
+struct Hasher
+{
+    size_t operator()(const EndpointPoolKey & k) const
+    {
+        SipHash s;
+        s.update(k.connection_group);
+        s.update(k.target_host);
+        s.update(k.target_port);
+        s.update(k.is_target_https);
+        s.update(k.proxy_config.host);
+        s.update(k.proxy_config.port);
+        s.update(k.proxy_config.protocol);
+        s.update(k.proxy_config.tunneling);
+        s.update(k.proxy_config.original_request_protocol);
+        return s.get64();
+    }
+};
+
+IExtendedPool::Ptr
+createConnectionPool(ConnectionGroup::Ptr group, std::string host, UInt16 port, bool secure, ProxyConfiguration proxy_configuration)
+{
+    if (secure)
+    {
+#if USE_SSL
+        return EndpointConnectionPool<Poco::Net::HTTPSClientSession>::create(
+            group, std::move(host), port, secure, std::move(proxy_configuration));
+#else
+        throw Exception(
+            ErrorCodes::SUPPORT_IS_DISABLED, "Inter-server secret support is disabled, because ClickHouse was built without SSL library");
+#endif
+    }
+    else
+    {
+        return EndpointConnectionPool<Poco::Net::HTTPClientSession>::create(
+            group, std::move(host), port, secure, std::move(proxy_configuration));
+    }
+}
+
+class HTTPConnectionPools::Impl
+{
+private:
+    const size_t DEFAULT_WIPE_TIMEOUT_SECONDS = 10 * 60;
+    const Poco::Timespan wipe_timeout = Poco::Timespan(DEFAULT_WIPE_TIMEOUT_SECONDS, 0);
+
+    ConnectionGroup::Ptr disk_group = std::make_shared<ConnectionGroup>(HTTPConnectionGroupType::DISK);
+    ConnectionGroup::Ptr storage_group = std::make_shared<ConnectionGroup>(HTTPConnectionGroupType::STORAGE);
+    ConnectionGroup::Ptr http_group = std::make_shared<ConnectionGroup>(HTTPConnectionGroupType::HTTP);
+
+    /// If multiple mutexes are held simultaneously,
+    /// they should be locked in this order:
+    /// HTTPConnectionPools::mutex, then EndpointConnectionPool::mutex, then ConnectionGroup::mutex.
+    std::mutex mutex;
+
+    std::unordered_map<EndpointPoolKey, IExtendedPool::Ptr, Hasher> endpoints_pool TSA_GUARDED_BY(mutex);
+    Poco::Timestamp last_wipe_time TSA_GUARDED_BY(mutex);
+
+public:
+    IHTTPConnectionPoolForEndpoint::Ptr getPool(HTTPConnectionGroupType type, const Poco::URI & uri, const ProxyConfiguration & proxy_configuration)
+    {
+        Poco::Timestamp now;
+
+        std::lock_guard lock(mutex);
+
+        if (now - last_wipe_time > wipe_timeout)
+        {
+            wipeExpired();
+            last_wipe_time = now;
+        }
+
+        return getPoolImpl(type, uri, proxy_configuration);
+    }
+
+    void setLimits(HTTPConnectionPools::Limits disk, HTTPConnectionPools::Limits storage, HTTPConnectionPools::Limits http)
+    {
+        disk_group->setLimits(std::move(disk));
+        storage_group->setLimits(std::move(storage));
+        http_group->setLimits(std::move(http));
+    }
+
+    void dropCache()
+    {
+        std::lock_guard lock(mutex);
+        endpoints_pool.clear();
+    }
+
+protected:
+    ConnectionGroup::Ptr & getGroup(HTTPConnectionGroupType type)
+    {
+        switch (type)
+        {
+            case HTTPConnectionGroupType::DISK:
+                return disk_group;
+            case HTTPConnectionGroupType::STORAGE:
+                return storage_group;
+            case HTTPConnectionGroupType::HTTP:
+                return http_group;
+        }
+    }
+
+    IExtendedPool::Ptr getPoolImpl(HTTPConnectionGroupType type, const Poco::URI & uri, const ProxyConfiguration & proxy_configuration)
+        TSA_REQUIRES(mutex)
+    {
+        auto [host, port, secure] = getHostPortSecure(uri, proxy_configuration);
+        auto key = EndpointPoolKey{type, host, port, secure, proxy_configuration};
+
+        auto it = endpoints_pool.find(key);
+        if (it != endpoints_pool.end())
+            return it->second;
+
+        it = endpoints_pool.emplace(key, createConnectionPool(getGroup(type), std::move(host), port, secure, proxy_configuration)).first;
+
+        return it->second;
+    }
+
+    void wipeExpired() TSA_REQUIRES(mutex)
+    {
+        std::vector<EndpointPoolKey> keys_to_drop;
+
+        for (auto & [key, pool] : endpoints_pool)
+        {
+            auto left_connections = pool->wipeExpired();
+            if (left_connections == 0 && pool->getGroupType() != HTTPConnectionGroupType::DISK)
+                keys_to_drop.push_back(key);
+        }
+
+        for (const auto & key : keys_to_drop)
+            endpoints_pool.erase(key);
+    }
+
+    static bool useSecureConnection(const Poco::URI & uri, const ProxyConfiguration & proxy_configuration)
+    {
+        if (uri.getScheme() == "http")
+            return false;
+
+        if (uri.getScheme() != "https")
+            throw Exception(ErrorCodes::UNSUPPORTED_URI_SCHEME, "Unsupported scheme in URI '{}'", uri.toString());
+
+        if (!proxy_configuration.isEmpty())
+        {
+            if (ProxyConfiguration::Protocol::HTTP == proxy_configuration.protocol && !proxy_configuration.tunneling)
+            {
+                // If it is an HTTPS request, proxy server is HTTP and user opted for tunneling off, we must not create an HTTPS request.
+                // The desired flow is: HTTP request to the proxy server, then proxy server will initiate an HTTPS request to the target server.
+                // There is a weak link in the security, but that's what the user opted for.
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    static std::tuple<std::string, UInt16, bool> getHostPortSecure(const Poco::URI & uri, const ProxyConfiguration & proxy_configuration)
+    {
+        return std::make_tuple(uri.getHost(), uri.getPort(), useSecureConnection(uri, proxy_configuration));
+    }
+};
+
+HTTPConnectionPools::HTTPConnectionPools()
+    : impl(std::make_unique<HTTPConnectionPools::Impl>())
+{
+}
+
+HTTPConnectionPools & HTTPConnectionPools::instance()
+{
+    static HTTPConnectionPools instance;
+    return instance;
+}
+
+void HTTPConnectionPools::setLimits(HTTPConnectionPools::Limits disk, HTTPConnectionPools::Limits storage, HTTPConnectionPools::Limits http)
+{
+    impl->setLimits(std::move(disk), std::move(storage), std::move(http));
+}
+
+void HTTPConnectionPools::dropCache()
+{
+    impl->dropCache();
+}
+
+IHTTPConnectionPoolForEndpoint::Ptr
+HTTPConnectionPools::getPool(HTTPConnectionGroupType type, const Poco::URI & uri, const ProxyConfiguration & proxy_configuration)
+{
+    return impl->getPool(type, uri, proxy_configuration);
+}
+}
diff --git a/src/Common/HTTPConnectionPool.h b/src/Common/HTTPConnectionPool.h
new file mode 100644
index 00000000000..a883a18ab8e
--- /dev/null
+++ b/src/Common/HTTPConnectionPool.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include <IO/ConnectionTimeouts.h>
+
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/ProxyConfiguration.h>
+#include <Common/logger_useful.h>
+
+#include <base/defines.h>
+
+#include <Poco/Timespan.h>
+#include <Poco/Net/HTTPClientSession.h>
+
+#include <mutex>
+#include <memory>
+
+namespace DB
+{
+
+class IHTTPConnectionPoolForEndpoint
+{
+public:
+    struct Metrics
+    {
+        const ProfileEvents::Event created = ProfileEvents::end();
+        const ProfileEvents::Event reused = ProfileEvents::end();
+        const ProfileEvents::Event reset = ProfileEvents::end();
+        const ProfileEvents::Event preserved = ProfileEvents::end();
+        const ProfileEvents::Event expired = ProfileEvents::end();
+        const ProfileEvents::Event errors = ProfileEvents::end();
+        const ProfileEvents::Event elapsed_microseconds = ProfileEvents::end();
+
+        const CurrentMetrics::Metric stored_count = CurrentMetrics::end();
+        const CurrentMetrics::Metric active_count = CurrentMetrics::end();
+    };
+
+    using Ptr =  std::shared_ptr<IHTTPConnectionPoolForEndpoint>;
+    using Connection = Poco::Net::HTTPClientSession;
+    using ConnectionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
+
+    /// can throw Poco::Net::Exception, DB::NetException, DB::Exception
+    virtual ConnectionPtr getConnection(const ConnectionTimeouts & timeouts) = 0;
+    virtual const Metrics & getMetrics() const = 0;
+    virtual ~IHTTPConnectionPoolForEndpoint() = default;
+
+    IHTTPConnectionPoolForEndpoint(const IHTTPConnectionPoolForEndpoint &) = delete;
+    IHTTPConnectionPoolForEndpoint & operator=(const IHTTPConnectionPoolForEndpoint &) = delete;
+
+protected:
+    IHTTPConnectionPoolForEndpoint() = default;
+
+};
+
+enum class HTTPConnectionGroupType
+{
+    DISK,
+    STORAGE,
+    HTTP,
+};
+
+class HTTPConnectionPools
+{
+public:
+    struct Limits
+    {
+        size_t soft_limit = 100;
+        size_t warning_limit = 1000;
+        size_t store_limit = 10000;
+
+        static constexpr size_t warning_step = 100;
+    };
+
+    HTTPConnectionPools(const HTTPConnectionPools &) = delete;
+    HTTPConnectionPools & operator=(const HTTPConnectionPools &) = delete;
+
+private:
+    HTTPConnectionPools();
+
+public:
+    static HTTPConnectionPools & instance();
+
+    void setLimits(Limits disk, Limits storage, Limits http);
+    void dropCache();
+
+    IHTTPConnectionPoolForEndpoint::Ptr getPool(HTTPConnectionGroupType type, const Poco::URI & uri, const ProxyConfiguration & proxy_configuration);
+
+private:
+    class Impl;
+    std::unique_ptr<Impl> impl;
+};
+
+}
diff --git a/src/Common/HashTable/FixedHashMap.h b/src/Common/HashTable/FixedHashMap.h
index e835a6fba94..537f37a9e6c 100644
--- a/src/Common/HashTable/FixedHashMap.h
+++ b/src/Common/HashTable/FixedHashMap.h
@@ -109,6 +109,9 @@ public:
 
     using Base::Base;
 
+    FixedHashMap() = default;
+    FixedHashMap(size_t ) {} /// NOLINT
+
     template <typename Func, bool>
     void ALWAYS_INLINE mergeToViaEmplace(Self & that, Func && func)
     {
diff --git a/src/Common/HashTable/Hash.h b/src/Common/HashTable/Hash.h
index 260a942003d..fb6afcde133 100644
--- a/src/Common/HashTable/Hash.h
+++ b/src/Common/HashTable/Hash.h
@@ -24,7 +24,7 @@
 /** Taken from MurmurHash. This is Murmur finalizer.
   * Faster than intHash32 when inserting into the hash table UInt64 -> UInt64, where the key is the visitor ID.
   */
-inline DB::UInt64 intHash64(DB::UInt64 x)
+inline UInt64 intHash64(UInt64 x)
 {
     x ^= x >> 33;
     x *= 0xff51afd7ed558ccdULL;
@@ -60,7 +60,7 @@ inline DB::UInt64 intHash64(DB::UInt64 x)
 /// NOTE: Intel intrinsic can be confusing.
 /// - https://code.google.com/archive/p/sse-intrinsics/wikis/PmovIntrinsicBug.wiki
 /// - https://stackoverflow.com/questions/15752770/mm-crc32-u64-poorly-defined
-inline DB::UInt64 intHashCRC32(DB::UInt64 x)
+inline UInt64 intHashCRC32(UInt64 x)
 {
 #ifdef __SSE4_2__
     return _mm_crc32_u64(-1ULL, x);
@@ -76,7 +76,7 @@ inline DB::UInt64 intHashCRC32(DB::UInt64 x)
     return intHash64(x);
 #endif
 }
-inline DB::UInt64 intHashCRC32(DB::UInt64 x, DB::UInt64 updated_value)
+inline UInt64 intHashCRC32(UInt64 x, UInt64 updated_value)
 {
 #ifdef __SSE4_2__
     return _mm_crc32_u64(updated_value, x);
@@ -93,14 +93,14 @@ inline DB::UInt64 intHashCRC32(DB::UInt64 x, DB::UInt64 updated_value)
 }
 
 template <typename T>
-requires std::has_unique_object_representations_v<T> && (sizeof(T) % sizeof(DB::UInt64) == 0)
-inline DB::UInt64 intHashCRC32(const T & x, DB::UInt64 updated_value)
+requires std::has_unique_object_representations_v<T> && (sizeof(T) % sizeof(UInt64) == 0)
+inline UInt64 intHashCRC32(const T & x, UInt64 updated_value)
 {
     const auto * begin = reinterpret_cast<const char *>(&x);
     for (size_t i = 0; i < sizeof(T); i += sizeof(UInt64))
     {
-        updated_value = intHashCRC32(unalignedLoad<DB::UInt64>(begin), updated_value);
-        begin += sizeof(DB::UInt64);
+        updated_value = intHashCRC32(unalignedLoad<UInt64>(begin), updated_value);
+        begin += sizeof(UInt64);
     }
 
     return updated_value;
@@ -108,7 +108,7 @@ inline DB::UInt64 intHashCRC32(const T & x, DB::UInt64 updated_value)
 
 template <std::floating_point T>
 requires(sizeof(T) <= sizeof(UInt64))
-inline DB::UInt64 intHashCRC32(T x, DB::UInt64 updated_value)
+inline UInt64 intHashCRC32(T x, UInt64 updated_value)
 {
     static_assert(std::numeric_limits<T>::is_iec559);
 
@@ -126,7 +126,7 @@ inline DB::UInt64 intHashCRC32(T x, DB::UInt64 updated_value)
     return intHashCRC32(repr, updated_value);
 }
 
-inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 updated_value)
+inline UInt32 updateWeakHash32(const UInt8 * pos, size_t size, UInt32 updated_value)
 {
     if (size < 8)
     {
@@ -206,12 +206,12 @@ inline UInt32 updateWeakHash32(const DB::UInt8 * pos, size_t size, DB::UInt32 up
     {
         /// If string size is not divisible by 8.
         /// Lets' assume the string was 'abcdefghXYZ', so it's tail is 'XYZ'.
-        DB::UInt8 tail_size = end - pos;
+        UInt8 tail_size = end - pos;
         /// Load tailing 8 bytes. Word is 'defghXYZ'.
         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));
+        word &= (~UInt64(0)) << UInt8(8 * (8 - tail_size));
         /// Use least byte to store tail length.
         word |= tail_size;
         /// Now word is '\3\0\0\0\0XYZ'
@@ -225,11 +225,11 @@ template <typename T>
 requires (sizeof(T) <= sizeof(UInt64))
 inline size_t DefaultHash64(T key)
 {
-    DB::UInt64 out {0};
+    UInt64 out {0};
     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));
+        std::memcpy(reinterpret_cast<char*>(&out) + sizeof(UInt64) - sizeof(T), &key, sizeof(T));
     return intHash64(out);
 }
 
@@ -284,9 +284,9 @@ template <typename T> struct HashCRC32;
 
 template <typename T>
 requires (sizeof(T) <= sizeof(UInt64))
-inline size_t hashCRC32(T key, DB::UInt64 updated_value = -1)
+inline size_t hashCRC32(T key, UInt64 updated_value = -1)
 {
-    DB::UInt64 out {0};
+    UInt64 out {0};
     if constexpr (std::endian::native == std::endian::little)
         std::memcpy(&out, &key, sizeof(T));
     else
@@ -296,7 +296,7 @@ inline size_t hashCRC32(T key, DB::UInt64 updated_value = -1)
 
 template <typename T>
 requires (sizeof(T) > sizeof(UInt64))
-inline size_t hashCRC32(T key, DB::UInt64 updated_value = -1)
+inline size_t hashCRC32(T key, UInt64 updated_value = -1)
 {
     return intHashCRC32(key, updated_value);
 }
@@ -310,20 +310,20 @@ template <> struct HashCRC32<T>\
     }\
 };
 
-DEFINE_HASH(DB::UInt8)
-DEFINE_HASH(DB::UInt16)
-DEFINE_HASH(DB::UInt32)
-DEFINE_HASH(DB::UInt64)
-DEFINE_HASH(DB::UInt128)
-DEFINE_HASH(DB::UInt256)
-DEFINE_HASH(DB::Int8)
-DEFINE_HASH(DB::Int16)
-DEFINE_HASH(DB::Int32)
-DEFINE_HASH(DB::Int64)
-DEFINE_HASH(DB::Int128)
-DEFINE_HASH(DB::Int256)
-DEFINE_HASH(DB::Float32)
-DEFINE_HASH(DB::Float64)
+DEFINE_HASH(UInt8)
+DEFINE_HASH(UInt16)
+DEFINE_HASH(UInt32)
+DEFINE_HASH(UInt64)
+DEFINE_HASH(UInt128)
+DEFINE_HASH(UInt256)
+DEFINE_HASH(Int8)
+DEFINE_HASH(Int16)
+DEFINE_HASH(Int32)
+DEFINE_HASH(Int64)
+DEFINE_HASH(Int128)
+DEFINE_HASH(Int256)
+DEFINE_HASH(Float32)
+DEFINE_HASH(Float64)
 DEFINE_HASH(DB::UUID)
 DEFINE_HASH(DB::IPv4)
 DEFINE_HASH(DB::IPv6)
@@ -464,10 +464,10 @@ struct UInt256HashCRC32 : public UInt256Hash {};
 #endif
 
 template <>
-struct DefaultHash<DB::UInt128> : public UInt128Hash {};
+struct DefaultHash<UInt128> : public UInt128Hash {};
 
 template <>
-struct DefaultHash<DB::UInt256> : public UInt256Hash {};
+struct DefaultHash<UInt256> : public UInt256Hash {};
 
 template <>
 struct DefaultHash<DB::UUID> : public UUIDHash {};
@@ -501,8 +501,8 @@ struct TrivialHash
   * NOTE As mentioned, this function is slower than intHash64.
   * But occasionally, it is faster, when written in a loop and loop is vectorized.
   */
-template <DB::UInt64 salt>
-inline DB::UInt32 intHash32(DB::UInt64 key)
+template <UInt64 salt>
+inline UInt32 intHash32(UInt64 key)
 {
     key ^= salt;
 
@@ -518,7 +518,7 @@ inline DB::UInt32 intHash32(DB::UInt64 key)
 
 
 /// For containers.
-template <typename T, DB::UInt64 salt = 0>
+template <typename T, UInt64 salt = 0>
 struct IntHash32
 {
     size_t operator() (const T & key) const
@@ -533,11 +533,11 @@ struct IntHash32
         }
         else if constexpr (sizeof(T) <= sizeof(UInt64))
         {
-            DB::UInt64 out {0};
+            UInt64 out {0};
             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));
+                std::memcpy(reinterpret_cast<char*>(&out) + sizeof(UInt64) - sizeof(T), &key, sizeof(T));
             return intHash32<salt>(out);
         }
 
diff --git a/src/Common/HashTable/HashMap.h b/src/Common/HashTable/HashMap.h
index 5f4cb396822..dc601bf1319 100644
--- a/src/Common/HashTable/HashMap.h
+++ b/src/Common/HashTable/HashMap.h
@@ -207,7 +207,7 @@ public:
     void ALWAYS_INLINE mergeToViaEmplace(Self & that, Func && func)
     {
         DB::PrefetchingHelper prefetching;
-        size_t prefetch_look_ahead = prefetching.getInitialLookAheadValue();
+        size_t prefetch_look_ahead = DB::PrefetchingHelper::getInitialLookAheadValue();
 
         size_t i = 0;
         auto prefetch_it = advanceIterator(this->begin(), prefetch_look_ahead);
@@ -216,10 +216,10 @@ public:
         {
             if constexpr (prefetch)
             {
-                if (i == prefetching.iterationsToMeasure())
+                if (i == DB::PrefetchingHelper::iterationsToMeasure())
                 {
                     prefetch_look_ahead = prefetching.calcPrefetchLookAhead();
-                    prefetch_it = advanceIterator(prefetch_it, prefetch_look_ahead - prefetching.getInitialLookAheadValue());
+                    prefetch_it = advanceIterator(prefetch_it, prefetch_look_ahead - DB::PrefetchingHelper::getInitialLookAheadValue());
                 }
 
                 if (prefetch_it != end)
diff --git a/src/Common/HashTable/HashTable.h b/src/Common/HashTable/HashTable.h
index f23c4ca15dd..9050b7ef6d7 100644
--- a/src/Common/HashTable/HashTable.h
+++ b/src/Common/HashTable/HashTable.h
@@ -92,7 +92,8 @@ inline bool bitEquals(T && a, T && b)
     using RealT = std::decay_t<T>;
 
     if constexpr (std::is_floating_point_v<RealT>)
-        return 0 == memcmp(&a, &b, sizeof(RealT));  /// Note that memcmp with constant size is compiler builtin.
+        /// Note that memcmp with constant size is compiler builtin.
+        return 0 == memcmp(&a, &b, sizeof(RealT)); /// NOLINT
     else
         return a == b;
 }
@@ -644,7 +645,7 @@ protected:
 
         /// Copy to a new location and zero the old one.
         x.setHash(hash_value);
-        memcpy(static_cast<void*>(&buf[place_value]), &x, sizeof(x));
+        memcpy(static_cast<void*>(&buf[place_value]), &x, sizeof(x)); /// NOLINT(bugprone-undefined-memory-manipulation)
         x.setZero();
 
         /// Then the elements that previously were in collision with this can move to the old place.
diff --git a/src/Common/HashTable/StringHashMap.h b/src/Common/HashTable/StringHashMap.h
index 828a54d357a..2599422ff3c 100644
--- a/src/Common/HashTable/StringHashMap.h
+++ b/src/Common/HashTable/StringHashMap.h
@@ -12,7 +12,7 @@ struct StringHashMapCell : public HashMapCell<Key, TMapped, StringHashTableHash,
     using Base::Base;
     static constexpr bool need_zero_value_storage = false;
     // external
-    StringRef getKey() const { return toStringRef(this->value.first); } /// NOLINT
+    StringRef getKey() const { return toStringView(this->value.first); } /// NOLINT
     // internal
     static const Key & getKey(const value_type & value_) { return value_.first; }
 };
@@ -32,7 +32,7 @@ struct StringHashMapCell<StringKey16, TMapped> : public HashMapCell<StringKey16,
     void setZero() { this->value.first.items[1] = 0; }
 
     // external
-    StringRef getKey() const { return toStringRef(this->value.first); } /// NOLINT
+    StringRef getKey() const { return toStringView(this->value.first); } /// NOLINT
     // internal
     static const StringKey16 & getKey(const value_type & value_) { return value_.first; }
 };
@@ -53,7 +53,7 @@ struct StringHashMapCell<StringKey24, TMapped> : public HashMapCell<StringKey24,
     void setZero() { this->value.first.c = 0; }
 
     // external
-    StringRef getKey() const { return toStringRef(this->value.first); } /// NOLINT
+    StringRef getKey() const { return toStringView(this->value.first); } /// NOLINT
     // internal
     static const StringKey24 & getKey(const value_type & value_) { return value_.first; }
 };
diff --git a/src/Common/HashTable/StringHashTable.h b/src/Common/HashTable/StringHashTable.h
index 16dbe4c808a..30137d4ca6e 100644
--- a/src/Common/HashTable/StringHashTable.h
+++ b/src/Common/HashTable/StringHashTable.h
@@ -9,7 +9,7 @@
 
 
 using StringKey8 = UInt64;
-using StringKey16 = DB::UInt128;
+using StringKey16 = UInt128;
 struct StringKey24
 {
     UInt64 a;
@@ -19,7 +19,7 @@ struct StringKey24
     bool operator==(const StringKey24 rhs) const { return a == rhs.a && b == rhs.b && c == rhs.c; }
 };
 
-inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n)
+inline StringRef ALWAYS_INLINE toStringView(const StringKey8 & n)
 {
     assert(n != 0);
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -28,7 +28,7 @@ inline StringRef ALWAYS_INLINE toStringRef(const StringKey8 & n)
     return {reinterpret_cast<const char *>(&n), 8ul - (std::countl_zero(n) >> 3)};
 #endif
 }
-inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n)
+inline StringRef ALWAYS_INLINE toStringView(const StringKey16 & n)
 {
     assert(n.items[1] != 0);
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -37,7 +37,7 @@ inline StringRef ALWAYS_INLINE toStringRef(const StringKey16 & n)
     return {reinterpret_cast<const char *>(&n), 16ul - (std::countl_zero(n.items[1]) >> 3)};
 #endif
 }
-inline StringRef ALWAYS_INLINE toStringRef(const StringKey24 & n)
+inline StringRef ALWAYS_INLINE toStringView(const StringKey24 & n)
 {
     assert(n.c != 0);
 #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -71,6 +71,28 @@ struct StringHashTableHash
         res = _mm_crc32_u64(res, key.c);
         return res;
     }
+#elif defined(__aarch64__) && defined(__ARM_FEATURE_CRC32)
+    size_t ALWAYS_INLINE operator()(StringKey8 key) const
+    {
+        size_t res = -1ULL;
+        res = __crc32cd(static_cast<UInt32>(res), key);
+        return res;
+    }
+    size_t ALWAYS_INLINE operator()(StringKey16 key) const
+    {
+        size_t res = -1ULL;
+        res = __crc32cd(static_cast<UInt32>(res), key.items[0]);
+        res = __crc32cd(static_cast<UInt32>(res), key.items[1]);
+        return res;
+    }
+    size_t ALWAYS_INLINE operator()(StringKey24 key) const
+    {
+        size_t res = -1ULL;
+        res = __crc32cd(static_cast<UInt32>(res), key.a);
+        res = __crc32cd(static_cast<UInt32>(res), key.b);
+        res = __crc32cd(static_cast<UInt32>(res), key.c);
+        return res;
+    }
 #elif defined(__s390x__) && __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
     size_t ALWAYS_INLINE operator()(StringKey8 key) const
     {
diff --git a/src/Common/HashTable/TwoLevelStringHashTable.h b/src/Common/HashTable/TwoLevelStringHashTable.h
index 54c208c5b60..1ce6b3d02e3 100644
--- a/src/Common/HashTable/TwoLevelStringHashTable.h
+++ b/src/Common/HashTable/TwoLevelStringHashTable.h
@@ -38,6 +38,7 @@ public:
     Impl impls[NUM_BUCKETS];
 
     TwoLevelStringHashTable() = default;
+    TwoLevelStringHashTable(size_t ) {} /// NOLINT
 
     template <typename Source>
     explicit TwoLevelStringHashTable(const Source & src)
diff --git a/src/Common/HostResolvePool.cpp b/src/Common/HostResolvePool.cpp
new file mode 100644
index 00000000000..6db28edc07e
--- /dev/null
+++ b/src/Common/HostResolvePool.cpp
@@ -0,0 +1,298 @@
+#include <Common/HostResolvePool.h>
+
+#include <Common/DNSResolver.h>
+#include <Common/Exception.h>
+#include <Common/NetException.h>
+#include <Common/ErrorCodes.h>
+#include <Common/thread_local_rng.h>
+#include <Common/MemoryTrackerSwitcher.h>
+
+#include <mutex>
+
+namespace ProfileEvents
+{
+    extern const Event AddressesDiscovered;
+    extern const Event AddressesExpired;
+    extern const Event AddressesMarkedAsFailed;
+}
+
+namespace CurrentMetrics
+{
+    extern const Metric AddressesActive;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int DNS_ERROR;
+}
+
+HostResolverMetrics HostResolver::getMetrics()
+{
+    return HostResolverMetrics{
+        .discovered = ProfileEvents::AddressesDiscovered,
+        .expired = ProfileEvents::AddressesExpired,
+        .failed = ProfileEvents::AddressesMarkedAsFailed,
+        .active_count = CurrentMetrics::AddressesActive,
+    };
+}
+
+HostResolver::WeakPtr HostResolver::getWeakFromThis()
+{
+    return weak_from_this();
+}
+
+HostResolver::HostResolver(String host_, Poco::Timespan history_)
+    : host(std::move(host_))
+    , history(history_)
+    , resolve_function([](const String & host_to_resolve) { return DNSResolver::instance().resolveHostAll(host_to_resolve); })
+{
+    update();
+}
+
+HostResolver::HostResolver(
+    ResolveFunction && resolve_function_, String host_, Poco::Timespan history_)
+    : host(std::move(host_)), history(history_), resolve_function(std::move(resolve_function_))
+{
+    update();
+}
+
+HostResolver::~HostResolver()
+{
+    std::lock_guard lock(mutex);
+    CurrentMetrics::sub(metrics.active_count, records.size());
+    records.clear();
+}
+
+void HostResolver::Entry::setFail()
+{
+    fail = true;
+
+    if (auto lock = pool.lock())
+        lock->setFail(address);
+}
+
+HostResolver::Entry::~Entry()
+{
+    if (!fail)
+    {
+        if (auto lock = pool.lock())
+            lock->setSuccess(address);
+    }
+}
+
+void HostResolver::update()
+{
+    MemoryTrackerSwitcher switcher{&total_memory_tracker};
+
+    auto next_gen = resolve_function(host);
+    if (next_gen.empty())
+        throw NetException(ErrorCodes::DNS_ERROR, "no endpoints resolved for host {}", host);
+
+    std::sort(next_gen.begin(), next_gen.end());
+
+    Poco::Timestamp now;
+
+    std::lock_guard lock(mutex);
+    updateImpl(now, next_gen);
+}
+
+void HostResolver::reset()
+{
+    std::lock_guard lock(mutex);
+
+    CurrentMetrics::sub(metrics.active_count, records.size());
+    records.clear();
+}
+
+void HostResolver::updateWeights()
+{
+    updateWeightsImpl();
+
+    if (getTotalWeight() == 0 && !records.empty())
+    {
+        for (auto & rec : records)
+            rec.failed = false;
+
+        updateWeightsImpl();
+    }
+
+    chassert((getTotalWeight() > 0 && !records.empty()) || records.empty());
+}
+
+HostResolver::Entry HostResolver::resolve()
+{
+    if (isUpdateNeeded())
+        update();
+
+    std::lock_guard lock(mutex);
+    return Entry(*this, selectBest());
+}
+
+void HostResolver::setSuccess(const Poco::Net::IPAddress & address)
+{
+    std::lock_guard lock(mutex);
+
+    auto it = find(address);
+    if (it == records.end())
+        return;
+
+    auto old_weight = it->getWeight();
+    ++it->usage;
+    auto new_weight = it->getWeight();
+
+    if (old_weight != new_weight)
+        updateWeights();
+}
+
+void HostResolver::setFail(const Poco::Net::IPAddress & address)
+{
+    Poco::Timestamp now;
+
+    {
+        std::lock_guard lock(mutex);
+
+        auto it = find(address);
+        if (it == records.end())
+            return;
+
+        it->failed = true;
+        it->fail_time = now;
+    }
+
+    ProfileEvents::increment(metrics.failed);
+    update();
+}
+
+Poco::Net::IPAddress HostResolver::selectBest()
+{
+    chassert(!records.empty());
+    auto random_weight_picker = std::uniform_int_distribution<size_t>(0, getTotalWeight() - 1);
+    size_t weight = random_weight_picker(thread_local_rng);
+    auto it = std::partition_point(records.begin(), records.end(), [&](const Record & rec) { return rec.weight_prefix_sum <= weight; });
+    chassert(it != records.end());
+    return it->address;
+}
+
+HostResolver::Records::iterator HostResolver::find(const Poco::Net::IPAddress & addr) TSA_REQUIRES(mutex)
+{
+    auto it = std::lower_bound(
+        records.begin(), records.end(), addr, [](const Record & rec, const Poco::Net::IPAddress & value) { return rec.address < value; });
+
+    if (it != records.end() && it->address != addr)
+        return records.end();
+
+    return it;
+}
+
+bool HostResolver::isUpdateNeeded()
+{
+    Poco::Timestamp now;
+
+    std::lock_guard lock(mutex);
+    return last_resolve_time + history < now || records.empty();
+}
+
+void HostResolver::updateImpl(Poco::Timestamp now, std::vector<Poco::Net::IPAddress> & next_gen)
+    TSA_REQUIRES(mutex)
+{
+    const auto last_effective_resolve = now - history;
+
+    Records merged;
+    merged.reserve(records.size() + next_gen.size());
+
+    auto it_before = records.begin();
+    auto it_next = next_gen.begin();
+
+    while (it_before != records.end() || it_next != next_gen.end())
+    {
+        if (it_next == next_gen.end() || (it_before != records.end() && it_before->address < *it_next))
+        {
+            if (it_before->resolve_time >= last_effective_resolve)
+                merged.push_back(*it_before);
+            else
+            {
+                CurrentMetrics::sub(metrics.active_count, 1);
+                ProfileEvents::increment(metrics.expired, 1);
+            }
+            ++it_before;
+        }
+        else if (it_before == records.end() || (it_next != next_gen.end() && *it_next < it_before->address))
+        {
+            CurrentMetrics::add(metrics.active_count, 1);
+            ProfileEvents::increment(metrics.discovered, 1);
+            merged.push_back(Record(*it_next, now));
+            ++it_next;
+        }
+        else
+        {
+            merged.push_back(*it_before);
+            merged.back().resolve_time = now;
+
+            ++it_before;
+            ++it_next;
+        }
+    }
+
+    for (auto & rec : merged)
+        if (rec.failed && rec.fail_time < last_effective_resolve)
+            rec.failed = false;
+
+    chassert(std::is_sorted(merged.begin(), merged.end()));
+
+    last_resolve_time = now;
+    records.swap(merged);
+
+    if (records.empty())
+        throw NetException(ErrorCodes::DNS_ERROR, "no endpoints resolved for host {}", host);
+
+    updateWeights();
+}
+
+size_t HostResolver::getTotalWeight() const
+{
+    if (records.empty())
+        return 0;
+    return records.back().weight_prefix_sum;
+}
+
+
+void HostResolver::updateWeightsImpl()
+{
+    size_t total_weight_next = 0;
+
+    for (auto & rec: records)
+    {
+        total_weight_next += rec.getWeight();
+        rec.weight_prefix_sum = total_weight_next;
+    }
+}
+
+HostResolversPool & HostResolversPool::instance()
+{
+    static HostResolversPool instance;
+    return instance;
+}
+
+void HostResolversPool::dropCache()
+{
+    std::lock_guard lock(mutex);
+    host_pools.clear();
+}
+
+HostResolver::Ptr HostResolversPool::getResolver(const String & host)
+{
+    std::lock_guard lock(mutex);
+
+    auto it = host_pools.find(host);
+    if (it != host_pools.end())
+        return it->second;
+
+    it = host_pools.emplace(host, HostResolver::create(host)).first;
+
+    return it->second;
+}
+
+}
diff --git a/src/Common/HostResolvePool.h b/src/Common/HostResolvePool.h
new file mode 100644
index 00000000000..ec4594bc8dd
--- /dev/null
+++ b/src/Common/HostResolvePool.h
@@ -0,0 +1,217 @@
+#pragma once
+
+#include <Common/CurrentMetrics.h>
+#include <Common/HTTPConnectionPool.h>
+#include <Common/ProfileEvents.h>
+#include <Common/logger_useful.h>
+
+#include <base/defines.h>
+
+#include <Poco/Net/IPAddress.h>
+
+#include <mutex>
+#include <memory>
+
+// That class resolves host into multiply addresses
+// Features:
+// - balance address usage.
+//    `selectBest()` chooses the address by random with weights.
+//    The more ip is used the lesser weight it has. When new address is happened, it takes more weight.
+//    But still not all requests are assigned to the new address.
+// - join resolve results
+//    In case when host is resolved into different set of addresses, this class join all that addresses and use them.
+//    An address expires after `history_` time.
+// - failed address pessimization
+//    If an address marked with `setFail()` it is marked as faulty. Such address won't be selected until either
+//    a) it still occurs in resolve set after `history_` time or b) all other addresses are pessimized as well.
+// - resolve schedule
+//    Addresses are resolved through `DB::DNSResolver::instance()`.
+//    Usually it does not happen more often than once in `history_` time.
+//    But also new resolve performed each `setFail()` call.
+
+namespace DB
+{
+
+struct HostResolverMetrics
+{
+    const ProfileEvents::Event discovered = ProfileEvents::end();
+    const ProfileEvents::Event expired = ProfileEvents::end();
+    const ProfileEvents::Event failed = ProfileEvents::end();
+
+    const CurrentMetrics::Metric active_count = CurrentMetrics::end();
+};
+
+constexpr size_t DEFAULT_RESOLVE_TIME_HISTORY_SECONDS = 2*60;
+
+
+class HostResolver : public std::enable_shared_from_this<HostResolver>
+{
+private:
+    using WeakPtr = std::weak_ptr<HostResolver>;
+
+public:
+    using Ptr = std::shared_ptr<HostResolver>;
+
+    template<class... Args>
+    static Ptr create(Args&&... args)
+    {
+        struct make_shared_enabler : public HostResolver
+        {
+            explicit make_shared_enabler(Args&&... args) : HostResolver(std::forward<Args>(args)...) {}
+        };
+        return std::make_shared<make_shared_enabler>(std::forward<Args>(args)...);
+    }
+
+    virtual ~HostResolver();
+
+    class Entry
+    {
+    public:
+        Entry(Entry && entry) = default;
+        Entry(Entry & entry) = delete;
+
+        // no access as r-value
+        const String * operator->() && = delete;
+        const String * operator->() const && = delete;
+        const String & operator*() && = delete;
+        const String & operator*() const && = delete;
+
+        const String * operator->() & { return &resolved_host; }
+        const String * operator->() const & { return &resolved_host; }
+        const String & operator*() & { return resolved_host; }
+        const String & operator*() const & { return resolved_host; }
+
+        void setFail();
+        ~Entry();
+
+    private:
+        friend class HostResolver;
+
+        Entry(HostResolver & pool_, Poco::Net::IPAddress address_)
+            : pool(pool_.getWeakFromThis())
+            , address(address_)
+            , resolved_host(address.toString())
+        { }
+
+        HostResolver::WeakPtr pool;
+        const Poco::Net::IPAddress address;
+        const String resolved_host;
+
+        bool fail = false;
+    };
+
+    /// can throw NetException(ErrorCodes::DNS_ERROR, ...), Exception(ErrorCodes::BAD_ARGUMENTS, ...)
+    Entry resolve();
+    void update();
+    void reset();
+
+    static HostResolverMetrics getMetrics();
+
+protected:
+    explicit HostResolver(
+        String host_,
+        Poco::Timespan history_ = Poco::Timespan(DEFAULT_RESOLVE_TIME_HISTORY_SECONDS, 0));
+
+    using ResolveFunction = std::function<std::vector<Poco::Net::IPAddress> (const String & host)>;
+    HostResolver(ResolveFunction && resolve_function_,
+                    String host_,
+                    Poco::Timespan history_);
+
+    friend class Entry;
+    WeakPtr getWeakFromThis();
+
+    void setSuccess(const Poco::Net::IPAddress & address);
+    void setFail(const Poco::Net::IPAddress & address);
+
+    struct Record
+    {
+        Record(Poco::Net::IPAddress address_, Poco::Timestamp resolve_time_)
+            : address(address_)
+            , resolve_time(resolve_time_)
+        {}
+
+        Record(Record && rec) = default;
+        Record& operator=(Record && s) = default;
+
+        Record(const Record & rec) = default;
+        Record& operator=(const Record & s) = default;
+
+        Poco::Net::IPAddress address;
+        Poco::Timestamp resolve_time;
+        size_t usage = 0;
+        bool failed = false;
+        Poco::Timestamp fail_time = 0;
+
+        size_t weight_prefix_sum;
+
+        bool operator <(const Record & r) const
+        {
+            return address < r.address;
+        }
+
+        size_t getWeight() const
+        {
+            if (failed)
+                return 0;
+
+            /// There is no goal to make usage's distribution ideally even
+            /// The goal is to chose more often new address, but still use old addresses as well
+            /// when all addresses have usage counter greater than 10000,
+            /// no more corrections are needed, just random choice is ok
+            if (usage > 10000)
+                return 1;
+            if (usage > 1000)
+                return 5;
+            if (usage > 100)
+                return 8;
+            return 10;
+        }
+    };
+
+    using Records = std::vector<Record>;
+
+    Poco::Net::IPAddress selectBest() TSA_REQUIRES(mutex);
+    Records::iterator find(const Poco::Net::IPAddress & address) TSA_REQUIRES(mutex);
+    bool isUpdateNeeded();
+
+    void updateImpl(Poco::Timestamp now, std::vector<Poco::Net::IPAddress> & next_gen) TSA_REQUIRES(mutex);
+    void updateWeights() TSA_REQUIRES(mutex);
+    void updateWeightsImpl() TSA_REQUIRES(mutex);
+    size_t getTotalWeight() const TSA_REQUIRES(mutex);
+
+    const String host;
+    const Poco::Timespan history;
+    const HostResolverMetrics metrics = getMetrics();
+
+    // for tests purpose
+    const ResolveFunction resolve_function;
+
+    std::mutex mutex;
+
+    Poco::Timestamp last_resolve_time TSA_GUARDED_BY(mutex);
+    Records records TSA_GUARDED_BY(mutex);
+
+    Poco::Logger * log = &Poco::Logger::get("ConnectionPool");
+};
+
+class HostResolversPool
+{
+private:
+    HostResolversPool() = default;
+
+public:
+    HostResolversPool(const HostResolversPool &) = delete;
+    HostResolversPool & operator=(const HostResolversPool &) = delete;
+
+    static HostResolversPool & instance();
+
+    void dropCache();
+
+    HostResolver::Ptr getResolver(const String & host);
+private:
+    std::mutex mutex;
+    std::unordered_map<String, HostResolver::Ptr> host_pools TSA_GUARDED_BY(mutex);
+};
+
+}
+
diff --git a/src/Common/ICachePolicyUserQuota.h b/src/Common/ICachePolicyUserQuota.h
index 6fa4f7947cb..d6555785f4a 100644
--- a/src/Common/ICachePolicyUserQuota.h
+++ b/src/Common/ICachePolicyUserQuota.h
@@ -25,6 +25,9 @@ public:
     /// Is the user allowed to write a new entry into the cache?
     virtual bool approveWrite(const UUID & user_id, size_t entry_size_in_bytes) const = 0;
 
+    /// Clears the policy contents
+    virtual void clear() = 0;
+
     virtual ~ICachePolicyUserQuota() = default;
 };
 
@@ -38,6 +41,7 @@ public:
     void increaseActual(const UUID & /*user_id*/, size_t /*entry_size_in_bytes*/) override {}
     void decreaseActual(const UUID & /*user_id*/, size_t /*entry_size_in_bytes*/) override {}
     bool approveWrite(const UUID & /*user_id*/, size_t /*entry_size_in_bytes*/) const override { return true; }
+    void clear() override {}
 };
 
 
diff --git a/src/Common/ISlotControl.h b/src/Common/ISlotControl.h
new file mode 100644
index 00000000000..daeb956f5a8
--- /dev/null
+++ b/src/Common/ISlotControl.h
@@ -0,0 +1,76 @@
+#pragma once
+
+#include <limits>
+#include <memory>
+#include <base/types.h>
+#include <boost/core/noncopyable.hpp>
+
+
+namespace DB
+{
+
+// Interfaces for abstract "slot" allocation and control.
+// Slot is a virtual entity existing in a limited amount (CPUs or memory chunks, etc).
+//
+// Every slot can be in one of the following states:
+//  * free: slot is available to be allocated.
+//  * allocated: slot is allocated to a specific ISlotAllocation.
+//
+// Allocated slots can be in one of the following states:
+//  * granted: allocated, but not yet acquired.
+//  * acquired: a granted slot becomes acquired by using IAcquiredSlot.
+//
+// Example for CPU (see ConcurrencyControl.h). Every slot represents one CPU in the system.
+// Slot allocation is a request to allocate specific number of CPUs for a specific query.
+// Acquired slot is an entity that is held by a thread as long as it is running. This allows
+// total number of threads in the system to be limited and the distribution process to be controlled.
+//
+// TODO:
+// - for preemption - ability to return granted slot back and reacquire it later.
+// - for memory allocations - variable size of slots (in bytes).
+
+/// Number of slots
+using SlotCount = UInt64;
+
+/// Unlimited number of slots
+constexpr SlotCount UnlimitedSlots = std::numeric_limits<SlotCount>::max();
+
+/// Acquired slot holder. Slot is considered to be acquired as long as the object exists.
+class IAcquiredSlot : public std::enable_shared_from_this<IAcquiredSlot>, boost::noncopyable
+{
+public:
+    virtual ~IAcquiredSlot() = default;
+};
+
+using AcquiredSlotPtr = std::shared_ptr<IAcquiredSlot>;
+
+/// Request for allocation of slots from ISlotControl.
+/// Allows for more slots to be acquired and the whole request to be canceled.
+class ISlotAllocation : public std::enable_shared_from_this<ISlotAllocation>, boost::noncopyable
+{
+public:
+    virtual ~ISlotAllocation() = default;
+
+    /// Take one already granted slot if available.
+    [[nodiscard]] virtual AcquiredSlotPtr tryAcquire() = 0;
+
+    /// Returns the number of granted slots for given allocation (i.e. available to be acquired)
+    virtual SlotCount grantedCount() const = 0;
+
+    /// Returns the total number of slots allocated at the moment (acquired and granted)
+    virtual SlotCount allocatedCount() const = 0;
+};
+
+using SlotAllocationPtr = std::shared_ptr<ISlotAllocation>;
+
+class ISlotControl : boost::noncopyable
+{
+public:
+    virtual ~ISlotControl() = default;
+
+    // Allocate at least `min` and at most `max` slots.
+    // If not all `max` slots were successfully allocated, a "subscription" for later allocation is created
+    [[nodiscard]] virtual SlotAllocationPtr allocate(SlotCount min, SlotCount max) = 0;
+};
+
+}
diff --git a/src/Common/IntervalKind.cpp b/src/Common/IntervalKind.cpp
index 9c653eefedb..22c7db504c3 100644
--- a/src/Common/IntervalKind.cpp
+++ b/src/Common/IntervalKind.cpp
@@ -1,6 +1,8 @@
 #include <Common/IntervalKind.h>
 #include <Common/Exception.h>
 
+#include <base/EnumReflection.h>
+
 
 namespace DB
 {
@@ -10,6 +12,11 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+std::string_view IntervalKind::toString() const
+{
+    return magic_enum::enum_name(kind);
+}
+
 Int64 IntervalKind::toAvgNanoseconds() const
 {
     static constexpr Int64 NANOSECONDS_PER_MICROSECOND = 1000;
@@ -18,11 +25,11 @@ Int64 IntervalKind::toAvgNanoseconds() const
 
     switch (kind)
     {
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Millisecond:
             return NANOSECONDS_PER_MILLISECOND;
-        case IntervalKind::Microsecond:
+        case IntervalKind::Kind::Microsecond:
             return NANOSECONDS_PER_MICROSECOND;
-        case IntervalKind::Nanosecond:
+        case IntervalKind::Kind::Nanosecond:
             return 1;
         default:
             return toAvgSeconds() * NANOSECONDS_PER_SECOND;
@@ -35,17 +42,17 @@ Int32 IntervalKind::toAvgSeconds() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
-        case IntervalKind::Microsecond:
-        case IntervalKind::Millisecond: return 0;
-        case IntervalKind::Second: return 1;
-        case IntervalKind::Minute: return 60;
-        case IntervalKind::Hour: return 3600;
-        case IntervalKind::Day: return 86400;
-        case IntervalKind::Week: return 604800;
-        case IntervalKind::Month: return 2629746;   /// Exactly 1/12 of a year.
-        case IntervalKind::Quarter: return 7889238; /// Exactly 1/4 of a year.
-        case IntervalKind::Year: return 31556952;   /// The average length of a Gregorian year is equal to 365.2425 days
+        case IntervalKind::Kind::Nanosecond:
+        case IntervalKind::Kind::Microsecond:
+        case IntervalKind::Kind::Millisecond: return 0;
+        case IntervalKind::Kind::Second: return 1;
+        case IntervalKind::Kind::Minute: return 60;
+        case IntervalKind::Kind::Hour: return 3600;
+        case IntervalKind::Kind::Day: return 86400;
+        case IntervalKind::Kind::Week: return 604800;
+        case IntervalKind::Kind::Month: return 2629746;   /// Exactly 1/12 of a year.
+        case IntervalKind::Kind::Quarter: return 7889238; /// Exactly 1/4 of a year.
+        case IntervalKind::Kind::Year: return 31556952;   /// The average length of a Gregorian year is equal to 365.2425 days
     }
     UNREACHABLE();
 }
@@ -54,21 +61,21 @@ Float64 IntervalKind::toSeconds() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
+        case IntervalKind::Kind::Nanosecond:
             return 0.000000001;
-        case IntervalKind::Microsecond:
+        case IntervalKind::Kind::Microsecond:
             return 0.000001;
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Millisecond:
             return 0.001;
-        case IntervalKind::Second:
+        case IntervalKind::Kind::Second:
             return 1;
-        case IntervalKind::Minute:
+        case IntervalKind::Kind::Minute:
             return 60;
-        case IntervalKind::Hour:
+        case IntervalKind::Kind::Hour:
             return 3600;
-        case IntervalKind::Day:
+        case IntervalKind::Kind::Day:
             return 86400;
-        case IntervalKind::Week:
+        case IntervalKind::Kind::Week:
             return 604800;
         default:
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Not possible to get precise number of seconds in non-precise interval");
@@ -80,17 +87,17 @@ bool IntervalKind::isFixedLength() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
-        case IntervalKind::Microsecond:
-        case IntervalKind::Millisecond:
-        case IntervalKind::Second:
-        case IntervalKind::Minute:
-        case IntervalKind::Hour:
-        case IntervalKind::Day:
-        case IntervalKind::Week: return true;
-        case IntervalKind::Month:
-        case IntervalKind::Quarter:
-        case IntervalKind::Year: return false;
+        case IntervalKind::Kind::Nanosecond:
+        case IntervalKind::Kind::Microsecond:
+        case IntervalKind::Kind::Millisecond:
+        case IntervalKind::Kind::Second:
+        case IntervalKind::Kind::Minute:
+        case IntervalKind::Kind::Hour:
+        case IntervalKind::Kind::Day:
+        case IntervalKind::Kind::Week: return true;
+        case IntervalKind::Kind::Month:
+        case IntervalKind::Kind::Quarter:
+        case IntervalKind::Kind::Year: return false;
     }
     UNREACHABLE();
 }
@@ -100,21 +107,21 @@ IntervalKind IntervalKind::fromAvgSeconds(Int64 num_seconds)
     if (num_seconds)
     {
         if (!(num_seconds % 31556952))
-            return IntervalKind::Year;
+            return IntervalKind::Kind::Year;
         if (!(num_seconds % 7889238))
-            return IntervalKind::Quarter;
+            return IntervalKind::Kind::Quarter;
         if (!(num_seconds % 2629746))
-            return IntervalKind::Month;
+            return IntervalKind::Kind::Month;
         if (!(num_seconds % 604800))
-            return IntervalKind::Week;
+            return IntervalKind::Kind::Week;
         if (!(num_seconds % 86400))
-            return IntervalKind::Day;
+            return IntervalKind::Kind::Day;
         if (!(num_seconds % 3600))
-            return IntervalKind::Hour;
+            return IntervalKind::Kind::Hour;
         if (!(num_seconds % 60))
-            return IntervalKind::Minute;
+            return IntervalKind::Kind::Minute;
     }
-    return IntervalKind::Second;
+    return IntervalKind::Kind::Second;
 }
 
 
@@ -122,17 +129,17 @@ const char * IntervalKind::toKeyword() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond: return "NANOSECOND";
-        case IntervalKind::Microsecond: return "MICROSECOND";
-        case IntervalKind::Millisecond: return "MILLISECOND";
-        case IntervalKind::Second: return "SECOND";
-        case IntervalKind::Minute: return "MINUTE";
-        case IntervalKind::Hour: return "HOUR";
-        case IntervalKind::Day: return "DAY";
-        case IntervalKind::Week: return "WEEK";
-        case IntervalKind::Month: return "MONTH";
-        case IntervalKind::Quarter: return "QUARTER";
-        case IntervalKind::Year: return "YEAR";
+        case IntervalKind::Kind::Nanosecond: return "NANOSECOND";
+        case IntervalKind::Kind::Microsecond: return "MICROSECOND";
+        case IntervalKind::Kind::Millisecond: return "MILLISECOND";
+        case IntervalKind::Kind::Second: return "SECOND";
+        case IntervalKind::Kind::Minute: return "MINUTE";
+        case IntervalKind::Kind::Hour: return "HOUR";
+        case IntervalKind::Kind::Day: return "DAY";
+        case IntervalKind::Kind::Week: return "WEEK";
+        case IntervalKind::Kind::Month: return "MONTH";
+        case IntervalKind::Kind::Quarter: return "QUARTER";
+        case IntervalKind::Kind::Year: return "YEAR";
     }
     UNREACHABLE();
 }
@@ -142,17 +149,17 @@ const char * IntervalKind::toLowercasedKeyword() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond: return "nanosecond";
-        case IntervalKind::Microsecond: return "microsecond";
-        case IntervalKind::Millisecond: return "millisecond";
-        case IntervalKind::Second: return "second";
-        case IntervalKind::Minute: return "minute";
-        case IntervalKind::Hour: return "hour";
-        case IntervalKind::Day: return "day";
-        case IntervalKind::Week: return "week";
-        case IntervalKind::Month: return "month";
-        case IntervalKind::Quarter: return "quarter";
-        case IntervalKind::Year: return "year";
+        case IntervalKind::Kind::Nanosecond: return "nanosecond";
+        case IntervalKind::Kind::Microsecond: return "microsecond";
+        case IntervalKind::Kind::Millisecond: return "millisecond";
+        case IntervalKind::Kind::Second: return "second";
+        case IntervalKind::Kind::Minute: return "minute";
+        case IntervalKind::Kind::Hour: return "hour";
+        case IntervalKind::Kind::Day: return "day";
+        case IntervalKind::Kind::Week: return "week";
+        case IntervalKind::Kind::Month: return "month";
+        case IntervalKind::Kind::Quarter: return "quarter";
+        case IntervalKind::Kind::Year: return "year";
     }
     UNREACHABLE();
 }
@@ -162,27 +169,27 @@ const char * IntervalKind::toDateDiffUnit() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
+        case IntervalKind::Kind::Nanosecond:
             return "nanosecond";
-        case IntervalKind::Microsecond:
+        case IntervalKind::Kind::Microsecond:
             return "microsecond";
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Millisecond:
             return "millisecond";
-        case IntervalKind::Second:
+        case IntervalKind::Kind::Second:
             return "second";
-        case IntervalKind::Minute:
+        case IntervalKind::Kind::Minute:
             return "minute";
-        case IntervalKind::Hour:
+        case IntervalKind::Kind::Hour:
             return "hour";
-        case IntervalKind::Day:
+        case IntervalKind::Kind::Day:
             return "day";
-        case IntervalKind::Week:
+        case IntervalKind::Kind::Week:
             return "week";
-        case IntervalKind::Month:
+        case IntervalKind::Kind::Month:
             return "month";
-        case IntervalKind::Quarter:
+        case IntervalKind::Kind::Quarter:
             return "quarter";
-        case IntervalKind::Year:
+        case IntervalKind::Kind::Year:
             return "year";
     }
     UNREACHABLE();
@@ -193,27 +200,27 @@ const char * IntervalKind::toNameOfFunctionToIntervalDataType() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
+        case IntervalKind::Kind::Nanosecond:
             return "toIntervalNanosecond";
-        case IntervalKind::Microsecond:
+        case IntervalKind::Kind::Microsecond:
             return "toIntervalMicrosecond";
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Millisecond:
             return "toIntervalMillisecond";
-        case IntervalKind::Second:
+        case IntervalKind::Kind::Second:
             return "toIntervalSecond";
-        case IntervalKind::Minute:
+        case IntervalKind::Kind::Minute:
             return "toIntervalMinute";
-        case IntervalKind::Hour:
+        case IntervalKind::Kind::Hour:
             return "toIntervalHour";
-        case IntervalKind::Day:
+        case IntervalKind::Kind::Day:
             return "toIntervalDay";
-        case IntervalKind::Week:
+        case IntervalKind::Kind::Week:
             return "toIntervalWeek";
-        case IntervalKind::Month:
+        case IntervalKind::Kind::Month:
             return "toIntervalMonth";
-        case IntervalKind::Quarter:
+        case IntervalKind::Kind::Quarter:
             return "toIntervalQuarter";
-        case IntervalKind::Year:
+        case IntervalKind::Kind::Year:
             return "toIntervalYear";
     }
     UNREACHABLE();
@@ -224,30 +231,30 @@ const char * IntervalKind::toNameOfFunctionExtractTimePart() const
 {
     switch (kind)
     {
-        case IntervalKind::Nanosecond:
+        case IntervalKind::Kind::Nanosecond:
             return "toNanosecond";
-        case IntervalKind::Microsecond:
+        case IntervalKind::Kind::Microsecond:
             return "toMicrosecond";
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Millisecond:
             return "toMillisecond";
-        case IntervalKind::Second:
+        case IntervalKind::Kind::Second:
             return "toSecond";
-        case IntervalKind::Minute:
+        case IntervalKind::Kind::Minute:
             return "toMinute";
-        case IntervalKind::Hour:
+        case IntervalKind::Kind::Hour:
             return "toHour";
-        case IntervalKind::Day:
+        case IntervalKind::Kind::Day:
             return "toDayOfMonth";
-        case IntervalKind::Week:
+        case IntervalKind::Kind::Week:
             // TODO: SELECT toRelativeWeekNum(toDate('2017-06-15')) - toRelativeWeekNum(toStartOfYear(toDate('2017-06-15')))
-            // else if (ParserKeyword("WEEK").ignore(pos, expected))
+            // else if (ParserKeyword(Keyword::WEEK).ignore(pos, expected))
             //    function_name = "toRelativeWeekNum";
             throw Exception(ErrorCodes::SYNTAX_ERROR, "The syntax 'EXTRACT(WEEK FROM date)' is not supported, cannot extract the number of a week");
-        case IntervalKind::Month:
+        case IntervalKind::Kind::Month:
             return "toMonth";
-        case IntervalKind::Quarter:
+        case IntervalKind::Kind::Quarter:
             return "toQuarter";
-        case IntervalKind::Year:
+        case IntervalKind::Kind::Year:
             return "toYear";
     }
     UNREACHABLE();
@@ -258,57 +265,57 @@ bool IntervalKind::tryParseString(const std::string & kind, IntervalKind::Kind &
 {
     if ("nanosecond" == kind)
     {
-        result = IntervalKind::Nanosecond;
+        result = IntervalKind::Kind::Nanosecond;
         return true;
     }
     if ("microsecond" == kind)
     {
-        result = IntervalKind::Microsecond;
+        result = IntervalKind::Kind::Microsecond;
         return true;
     }
     if ("millisecond" == kind)
     {
-        result = IntervalKind::Millisecond;
+        result = IntervalKind::Kind::Millisecond;
         return true;
     }
     if ("second" == kind)
     {
-        result = IntervalKind::Second;
+        result = IntervalKind::Kind::Second;
         return true;
     }
     if ("minute" == kind)
     {
-        result = IntervalKind::Minute;
+        result = IntervalKind::Kind::Minute;
         return true;
     }
     if ("hour" == kind)
     {
-        result = IntervalKind::Hour;
+        result = IntervalKind::Kind::Hour;
         return true;
     }
     if ("day" == kind)
     {
-        result = IntervalKind::Day;
+        result = IntervalKind::Kind::Day;
         return true;
     }
     if ("week" == kind)
     {
-        result = IntervalKind::Week;
+        result = IntervalKind::Kind::Week;
         return true;
     }
     if ("month" == kind)
     {
-        result = IntervalKind::Month;
+        result = IntervalKind::Kind::Month;
         return true;
     }
     if ("quarter" == kind)
     {
-        result = IntervalKind::Quarter;
+        result = IntervalKind::Kind::Quarter;
         return true;
     }
     if ("year" == kind)
     {
-        result = IntervalKind::Year;
+        result = IntervalKind::Kind::Year;
         return true;
     }
     return false;
diff --git a/src/Common/IntervalKind.h b/src/Common/IntervalKind.h
index 0f45d0ac169..497dc83be0b 100644
--- a/src/Common/IntervalKind.h
+++ b/src/Common/IntervalKind.h
@@ -1,14 +1,13 @@
 #pragma once
 
 #include <base/types.h>
-#include <base/EnumReflection.h>
 
 namespace DB
 {
 /// Kind of a temporal interval.
 struct IntervalKind
 {
-    enum Kind
+    enum class Kind
     {
         Nanosecond,
         Microsecond,
@@ -22,12 +21,12 @@ struct IntervalKind
         Quarter,
         Year,
     };
-    Kind kind = Second;
+    Kind kind = Kind::Second;
 
-    IntervalKind(Kind kind_ = Second) : kind(kind_) {} /// NOLINT
+    IntervalKind(Kind kind_ = Kind::Second) : kind(kind_) {} /// NOLINT
     operator Kind() const { return kind; } /// NOLINT
 
-    constexpr std::string_view toString() const { return magic_enum::enum_name(kind); }
+    std::string_view toString() const;
 
     /// Returns number of nanoseconds in one interval.
     /// For `Month`, `Quarter` and `Year` the function returns an average number of nanoseconds.
diff --git a/src/Common/Jemalloc.cpp b/src/Common/Jemalloc.cpp
index a8b9d70e731..6514639e700 100644
--- a/src/Common/Jemalloc.cpp
+++ b/src/Common/Jemalloc.cpp
@@ -2,6 +2,7 @@
 
 #if USE_JEMALLOC
 
+#include <Common/Exception.h>
 #include <Common/Stopwatch.h>
 #include <Common/logger_useful.h>
 #include <jemalloc/jemalloc.h>
@@ -25,7 +26,7 @@ namespace ErrorCodes
 
 void purgeJemallocArenas()
 {
-    LOG_TRACE(&Poco::Logger::get("SystemJemalloc"), "Purging unused memory");
+    LOG_TRACE(getLogger("SystemJemalloc"), "Purging unused memory");
     Stopwatch watch;
     mallctl("arena." STRINGIFY(MALLCTL_ARENAS_ALL) ".purge", nullptr, nullptr, nullptr, 0);
     ProfileEvents::increment(ProfileEvents::MemoryAllocatorPurge);
@@ -53,12 +54,12 @@ void setJemallocProfileActive(bool value)
     mallctl("prof.active", &active, &active_size, nullptr, 0);
     if (active == value)
     {
-        LOG_TRACE(&Poco::Logger::get("SystemJemalloc"), "Profiling is already {}", active ? "enabled" : "disabled");
+        LOG_TRACE(getLogger("SystemJemalloc"), "Profiling is already {}", active ? "enabled" : "disabled");
         return;
     }
 
     mallctl("prof.active", nullptr, nullptr, &value, sizeof(bool));
-    LOG_TRACE(&Poco::Logger::get("SystemJemalloc"), "Profiling is {}", value ? "enabled" : "disabled");
+    LOG_TRACE(getLogger("SystemJemalloc"), "Profiling is {}", value ? "enabled" : "disabled");
 }
 
 std::string flushJemallocProfile(const std::string & file_prefix)
@@ -69,7 +70,7 @@ std::string flushJemallocProfile(const std::string & file_prefix)
     int n = mallctl("opt.prof_prefix", &prefix_buffer, &prefix_size, nullptr, 0);
     if (!n && std::string_view(prefix_buffer) != "jeprof")
     {
-        LOG_TRACE(&Poco::Logger::get("SystemJemalloc"), "Flushing memory profile with prefix {}", prefix_buffer);
+        LOG_TRACE(getLogger("SystemJemalloc"), "Flushing memory profile with prefix {}", prefix_buffer);
         mallctl("prof.dump", nullptr, nullptr, nullptr, 0);
         return prefix_buffer;
     }
@@ -78,7 +79,7 @@ std::string flushJemallocProfile(const std::string & file_prefix)
     std::string profile_dump_path = fmt::format("{}.{}.{}.heap", file_prefix, getpid(), profile_counter.fetch_add(1));
     const auto * profile_dump_path_str = profile_dump_path.c_str();
 
-    LOG_TRACE(&Poco::Logger::get("SystemJemalloc"), "Flushing memory profile to {}", profile_dump_path_str);
+    LOG_TRACE(getLogger("SystemJemalloc"), "Flushing memory profile to {}", profile_dump_path_str);
     mallctl("prof.dump", nullptr, nullptr, &profile_dump_path_str, sizeof(profile_dump_path_str));
     return profile_dump_path;
 }
diff --git a/src/Common/LRUResourceCache.h b/src/Common/LRUResourceCache.h
index 1fe3075a2a3..60b4053bff5 100644
--- a/src/Common/LRUResourceCache.h
+++ b/src/Common/LRUResourceCache.h
@@ -221,7 +221,7 @@ private:
         {
             std::lock_guard lock(mutex);
             auto it = cells.find(key);
-            if (it != cells.end() && !it->second.expired)
+            if (it != cells.end())
             {
                 if (!it->second.expired)
                 {
@@ -235,7 +235,7 @@ private:
                 else
                 {
                     // should not reach here
-                    LOG_ERROR(&Poco::Logger::get("LRUResourceCache"), "element is in invalid status.");
+                    LOG_ERROR(getLogger("LRUResourceCache"), "element is in invalid status.");
                     abort();
                 }
             }
@@ -306,7 +306,7 @@ private:
         auto it = cells.find(key);
         if (it == cells.end() || it->second.reference_count == 0)
         {
-            LOG_ERROR(&Poco::Logger::get("LRUResourceCache"), "try to release an invalid element");
+            LOG_ERROR(getLogger("LRUResourceCache"), "try to release an invalid element");
             abort();
         }
 
@@ -359,7 +359,7 @@ private:
             auto cell_it = cells.find(key);
             if (cell_it == cells.end())
             {
-                LOG_ERROR(&Poco::Logger::get("LRUResourceCache"), "LRUResourceCache became inconsistent. There must be a bug in it.");
+                LOG_ERROR(getLogger("LRUResourceCache"), "LRUResourceCache became inconsistent. There must be a bug in it.");
                 abort();
             }
 
@@ -379,7 +379,7 @@ private:
 
         if (loss_weight > current_weight + weight)
         {
-            LOG_ERROR(&Poco::Logger::get("LRUResourceCache"), "LRUResourceCache became inconsistent. There must be a bug in it.");
+            LOG_ERROR(getLogger("LRUResourceCache"), "LRUResourceCache became inconsistent. There must be a bug in it.");
             abort();
         }
 
diff --git a/src/Common/LocalDate.h b/src/Common/LocalDate.h
index 2331a40fd12..f1abc98c8e2 100644
--- a/src/Common/LocalDate.h
+++ b/src/Common/LocalDate.h
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <cstring>
-#include <string>
 #include <exception>
+#include <string>
 #include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 
 
 /** Stores a calendar date in broken-down form (year, month, day-in-month).
diff --git a/src/Common/Logger.cpp b/src/Common/Logger.cpp
new file mode 100644
index 00000000000..c8d557bc3a3
--- /dev/null
+++ b/src/Common/Logger.cpp
@@ -0,0 +1,27 @@
+#include <Poco/Logger.h>
+#include <Common/Logger.h>
+
+LoggerPtr getLogger(const std::string & name)
+{
+    return Poco::Logger::getShared(name);
+}
+
+LoggerPtr createLogger(const std::string & name, Poco::Channel * channel, Poco::Message::Priority level)
+{
+    return Poco::Logger::createShared(name, channel, level);
+}
+
+LoggerRawPtr getRawLogger(const std::string & name)
+{
+    return &Poco::Logger::get(name);
+}
+
+LoggerRawPtr createRawLogger(const std::string & name, Poco::Channel * channel, Poco::Message::Priority level)
+{
+    return &Poco::Logger::create(name, channel, level);
+}
+
+bool hasLogger(const std::string & name)
+{
+    return Poco::Logger::has(name);
+}
diff --git a/src/Common/Logger.h b/src/Common/Logger.h
new file mode 100644
index 00000000000..b4688eb0a9c
--- /dev/null
+++ b/src/Common/Logger.h
@@ -0,0 +1,66 @@
+#pragma once
+
+#include <base/defines.h>
+
+#include <memory>
+
+#include <Poco/Logger.h>
+#include <Poco/Message.h>
+
+namespace Poco
+{
+class Channel;
+class Logger;
+using LoggerPtr = std::shared_ptr<Logger>;
+}
+
+using LoggerPtr = std::shared_ptr<Poco::Logger>;
+using LoggerRawPtr = Poco::Logger *;
+
+/** RAII wrappers around Poco/Logger.h.
+  *
+  * You should use this functions in case Logger instance lifetime needs to be properly
+  * managed, because otherwise it will leak memory.
+  *
+  * For example when Logger is created when table is created and Logger contains table name.
+  * Then it must be destroyed when underlying table is destroyed.
+  */
+
+/** Get Logger with specified name. If the Logger does not exists, it is created.
+  * Logger is destroyed, when last shared ptr that refers to Logger with specified name is destroyed.
+  */
+LoggerPtr getLogger(const std::string & name);
+
+/** Get Logger with specified name. If the Logger does not exists, it is created.
+  * This overload was added for specific purpose, when logger is constructed from constexpr string.
+  * Logger is destroyed only during program shutdown.
+  */
+template <size_t n>
+ALWAYS_INLINE LoggerPtr getLogger(const char (&name)[n])
+{
+    return Poco::Logger::getShared(name, false /*should_be_owned_by_shared_ptr_if_created*/);
+}
+
+/** Create Logger with specified name, channel and logging level.
+  * If Logger already exists, throws exception.
+  * Logger is destroyed, when last shared ptr that refers to Logger with specified name is destroyed.
+  */
+LoggerPtr createLogger(const std::string & name, Poco::Channel * channel, Poco::Message::Priority level = Poco::Message::PRIO_INFORMATION);
+
+/** Create raw Poco::Logger that will not be destroyed before program termination.
+  * This can be used in cases when specific Logger instance can be singletone.
+  *
+  * For example you need to pass Logger into low-level libraries as raw pointer, and using
+  * RAII wrapper is inconvenient.
+  *
+  * Generally you should always use getLogger functions.
+  */
+
+LoggerRawPtr getRawLogger(const std::string & name);
+
+LoggerRawPtr createRawLogger(const std::string & name, Poco::Channel * channel, Poco::Message::Priority level = Poco::Message::PRIO_INFORMATION);
+
+/** Returns true, if currently Logger with specified name is created.
+  * Otherwise, returns false.
+  */
+bool hasLogger(const std::string & name);
diff --git a/src/Common/LoggingFormatStringHelpers.cpp b/src/Common/LoggingFormatStringHelpers.cpp
index 074c8dd2803..3e90526f76d 100644
--- a/src/Common/LoggingFormatStringHelpers.cpp
+++ b/src/Common/LoggingFormatStringHelpers.cpp
@@ -1,4 +1,5 @@
 #include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/LoggingFormatStringHelpers.h>
 #include <Common/SipHash.h>
 #include <Common/thread_local_rng.h>
@@ -80,8 +81,8 @@ void LogFrequencyLimiterIml::cleanup(time_t too_old_threshold_s)
 std::mutex LogSeriesLimiter::mutex;
 time_t LogSeriesLimiter::last_cleanup = 0;
 
-LogSeriesLimiter::LogSeriesLimiter(Poco::Logger * logger_, size_t allowed_count_, time_t interval_s_)
-    : logger(logger_)
+LogSeriesLimiter::LogSeriesLimiter(LoggerPtr logger_, size_t allowed_count_, time_t interval_s_)
+    : logger(std::move(logger_))
 {
     if (allowed_count_ == 0)
     {
@@ -130,13 +131,12 @@ LogSeriesLimiter::LogSeriesLimiter(Poco::Logger * logger_, size_t allowed_count_
     if (last_time + interval_s_ <= now)
     {
         debug_message = fmt::format(
-            " (LogSeriesLimiter: on interval from {} to {} accepted series {} / {} for the logger {} : {})",
+            " (LogSeriesLimiter: on interval from {} to {} accepted series {} / {} for the logger {})",
             DateLUT::instance().timeToString(last_time),
             DateLUT::instance().timeToString(now),
             accepted_count,
             total_count,
-            logger->name(),
-            double(name_hash));
+            logger->name());
 
         register_as_first();
         return;
diff --git a/src/Common/LoggingFormatStringHelpers.h b/src/Common/LoggingFormatStringHelpers.h
index ef7ec0c6144..678948424da 100644
--- a/src/Common/LoggingFormatStringHelpers.h
+++ b/src/Common/LoggingFormatStringHelpers.h
@@ -8,7 +8,7 @@
 #include <Poco/Logger.h>
 #include <Poco/Message.h>
 #include <base/EnumReflection.h>
-
+#include <Common/Logger.h>
 
 struct PreformattedMessage;
 consteval void formatStringCheckArgsNumImpl(std::string_view str, size_t nargs);
@@ -21,12 +21,12 @@ struct FormatStringHelperImpl
     std::string_view message_format_string;
     fmt::format_string<Args...> fmt_str;
     template<typename T>
-    consteval FormatStringHelperImpl(T && str) : message_format_string(tryGetStaticFormatString(str)), fmt_str(std::forward<T>(str))
+    consteval FormatStringHelperImpl(T && str) : message_format_string(tryGetStaticFormatString(str)), fmt_str(std::forward<T>(str)) /// NOLINT
     {
         formatStringCheckArgsNumImpl(message_format_string, sizeof...(Args));
     }
     template<typename T>
-    FormatStringHelperImpl(fmt::basic_runtime<T> && str) : message_format_string(), fmt_str(std::forward<fmt::basic_runtime<T>>(str)) {}
+    FormatStringHelperImpl(fmt::basic_runtime<T> && str) : fmt_str(std::forward<fmt::basic_runtime<T>>(str)) {} /// NOLINT
 
     PreformattedMessage format(Args && ...args) const;
 };
@@ -43,9 +43,9 @@ struct PreformattedMessage
     template <typename... Args>
     static PreformattedMessage create(FormatStringHelper<Args...> fmt, Args &&... args);
 
-    operator const std::string & () const { return text; }
-    operator std::string () && { return std::move(text); }
-    operator fmt::format_string<> () const { UNREACHABLE(); }
+    operator const std::string & () const { return text; } /// NOLINT
+    operator std::string () && { return std::move(text); } /// NOLINT
+    operator fmt::format_string<> () const { UNREACHABLE(); } /// NOLINT
 
     void apply(std::string & out_text, std::string_view & out_format_string) const &
     {
@@ -203,10 +203,10 @@ class LogFrequencyLimiterIml
     static time_t last_cleanup;
     static std::mutex mutex;
 
-    Poco::Logger * logger;
+    LoggerPtr 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(LoggerPtr logger_, time_t min_interval_s_) : logger(std::move(logger_)), min_interval_s(min_interval_s_) {}
 
     LogFrequencyLimiterIml & operator -> () { return *this; }
     bool is(Poco::Message::Priority priority) { return logger->is(priority); }
@@ -218,7 +218,7 @@ public:
     /// 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; }
+    LoggerPtr getLogger() { return logger; }
 };
 
 /// This wrapper helps to avoid too noisy log messages from similar objects.
@@ -240,11 +240,11 @@ class LogSeriesLimiter
         return records;
     }
 
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
     bool accepted = false;
     String debug_message;
 public:
-    LogSeriesLimiter(Poco::Logger * logger_, size_t allowed_count_, time_t interval_s_);
+    LogSeriesLimiter(LoggerPtr logger_, size_t allowed_count_, time_t interval_s_);
 
     LogSeriesLimiter & operator -> () { return *this; }
     bool is(Poco::Message::Priority priority) { return logger->is(priority); }
@@ -253,18 +253,18 @@ public:
 
     void log(Poco::Message & message);
 
-    Poco::Logger * getLogger() { return logger; }
+    LoggerPtr 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;
+    LoggerPtr 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_, LoggerPtr logger_) : out_str(out_str_), logger(std::move(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; }
diff --git a/src/Common/Macros.cpp b/src/Common/Macros.cpp
index 0035e7abfe8..1d95037b38b 100644
--- a/src/Common/Macros.cpp
+++ b/src/Common/Macros.cpp
@@ -38,6 +38,10 @@ Macros::Macros(const Poco::Util::AbstractConfiguration & config, const String &
     }
 }
 
+Macros::Macros(const Poco::Util::AbstractConfiguration & config, const String & root_key, LoggerPtr log)
+    : Macros(config, root_key, log.get())
+{}
+
 Macros::Macros(std::map<String, String> map)
 {
     macros = std::move(map);
@@ -171,15 +175,6 @@ String Macros::expand(const String & s) const
     return expand(s, info);
 }
 
-String Macros::expand(const String & s, const StorageID & table_id, bool allow_uuid) const
-{
-    MacroExpansionInfo info;
-    info.table_id = table_id;
-    if (!allow_uuid)
-        info.table_id.uuid = UUIDHelpers::Nil;
-    return expand(s, info);
-}
-
 Names Macros::expand(const Names & source_names, size_t level) const
 {
     Names result_names;
diff --git a/src/Common/Macros.h b/src/Common/Macros.h
index 9fe5717effc..4f72932bdfd 100644
--- a/src/Common/Macros.h
+++ b/src/Common/Macros.h
@@ -26,6 +26,7 @@ class Macros
 {
 public:
     Macros() = default;
+    Macros(const Poco::Util::AbstractConfiguration & config, const String & key, LoggerPtr log = nullptr);
     Macros(const Poco::Util::AbstractConfiguration & config, const String & key, Poco::Logger * log = nullptr);
     explicit Macros(std::map<String, String> map);
 
@@ -56,8 +57,6 @@ public:
 
     String expand(const String & s) const;
 
-    String expand(const String & s, const StorageID & table_id, bool allow_uuid) const;
-
 
     /** Apply expand for the list.
       */
diff --git a/src/Common/MatchGenerator.cpp b/src/Common/MatchGenerator.cpp
index f047c21b470..9078a5d181f 100644
--- a/src/Common/MatchGenerator.cpp
+++ b/src/Common/MatchGenerator.cpp
@@ -1,18 +1,14 @@
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#  pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
-#  pragma clang diagnostic ignored "-Wnested-anon-types"
-#  pragma clang diagnostic ignored "-Wunused-parameter"
-#  pragma clang diagnostic ignored "-Wshadow-field-in-constructor"
-#  pragma clang diagnostic ignored "-Wdtor-name"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
+#pragma clang diagnostic ignored "-Wnested-anon-types"
+#pragma clang diagnostic ignored "-Wunused-parameter"
+#pragma clang diagnostic ignored "-Wshadow-field-in-constructor"
+#pragma clang diagnostic ignored "-Wdtor-name"
 #include <re2/re2.h>
 #include <re2/regexp.h>
 #include <re2/walker-inl.h>
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 #ifdef LOG_INFO
 #undef LOG_INFO
diff --git a/src/Common/MemorySanitizer.h b/src/Common/MemorySanitizer.h
index d1b8fd07f33..5d72e0b8f73 100644
--- a/src/Common/MemorySanitizer.h
+++ b/src/Common/MemorySanitizer.h
@@ -2,10 +2,8 @@
 
 #include <base/defines.h>
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-id-macro"
-#endif
 
 #undef __msan_unpoison
 #undef __msan_test_shadow
@@ -13,6 +11,9 @@
 #undef __msan_unpoison_string
 
 #define __msan_unpoison(X, Y) /// NOLINT
+/// Given a pointer and **its size**, unpoisons 15 bytes **at the end**
+/// See memcmpSmall.h / memcpySmall.h
+#define __msan_unpoison_overflow_15(X, Y) /// NOLINT
 #define __msan_test_shadow(X, Y) (false) /// NOLINT
 #define __msan_print_shadow(X, Y) /// NOLINT
 #define __msan_unpoison_string(X) /// NOLINT
@@ -24,9 +25,9 @@
 #        undef __msan_print_shadow
 #        undef __msan_unpoison_string
 #        include <sanitizer/msan_interface.h>
+#        undef __msan_unpoison_overflow_15
+#        define __msan_unpoison_overflow_15(PTR, PTR_SIZE) __msan_unpoison(&(PTR)[(PTR_SIZE)], 15)
 #    endif
 #endif
 
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
diff --git a/src/Common/MemoryTracker.cpp b/src/Common/MemoryTracker.cpp
index 0c78e769ec1..28cfa98666a 100644
--- a/src/Common/MemoryTracker.cpp
+++ b/src/Common/MemoryTracker.cpp
@@ -84,7 +84,7 @@ inline std::string_view toDescription(OvercommitResult result)
     }
 }
 
-bool shouldTrackAllocation(DB::Float64 probability, void * ptr)
+bool shouldTrackAllocation(Float64 probability, void * ptr)
 {
     return intHash64(uintptr_t(ptr)) < std::numeric_limits<uint64_t>::max() * probability;
 }
@@ -155,14 +155,14 @@ void MemoryTracker::logPeakMemoryUsage()
     auto peak_bytes = peak.load(std::memory_order::relaxed);
     if (peak_bytes < 128 * 1024)
         return;
-    LOG_DEBUG(&Poco::Logger::get("MemoryTracker"),
+    LOG_DEBUG(getLogger("MemoryTracker"),
         "Peak memory usage{}: {}.", (description ? " " + std::string(description) : ""), ReadableSize(peak_bytes));
 }
 
 void MemoryTracker::logMemoryUsage(Int64 current) const
 {
     const auto * description = description_ptr.load(std::memory_order_relaxed);
-    LOG_DEBUG(&Poco::Logger::get("MemoryTracker"),
+    LOG_DEBUG(getLogger("MemoryTracker"),
         "Current memory usage{}: {}.", (description ? " " + std::string(description) : ""), ReadableSize(current));
 }
 
@@ -170,7 +170,7 @@ void MemoryTracker::injectFault() const
 {
     if (!memoryTrackerCanThrow(level, true))
     {
-        LOG_WARNING(&Poco::Logger::get("MemoryTracker"),
+        LOG_WARNING(getLogger("MemoryTracker"),
                     "Cannot inject fault at specific point. Uncaught exceptions: {}, stack trace:\n{}",
                     std::uncaught_exceptions(), StackTrace().toString());
         return;
@@ -201,7 +201,7 @@ void MemoryTracker::debugLogBigAllocationWithoutCheck(Int64 size [[maybe_unused]
         return;
 
     MemoryTrackerBlockerInThread blocker(VariableContext::Global);
-    LOG_TEST(&Poco::Logger::get("MemoryTracker"), "Too big allocation ({} bytes) without checking memory limits, "
+    LOG_TEST(getLogger("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
diff --git a/src/Common/MortonUtils.h b/src/Common/MortonUtils.h
index 591621f7a47..c55b36c6354 100644
--- a/src/Common/MortonUtils.h
+++ b/src/Common/MortonUtils.h
@@ -27,7 +27,7 @@
   */
 
 
-namespace
+namespace impl
 {
     /// After the most significant bit 1, set all subsequent less significant bits to 1 as well.
     inline UInt64 toMask(UInt64 n)
@@ -85,7 +85,7 @@ void intervalBinaryPartition(UInt64 first, UInt64 last, F && callback)
     /// split = 15:   00001111
 
     UInt64 diff = first ^ last;
-    UInt64 mask = toMask(diff) >> 1;
+    UInt64 mask = impl::toMask(diff) >> 1;
 
     /// The current interval represents a whole range with fixed prefix.
     if ((first & mask) == 0 && (last & mask) == mask)
diff --git a/src/Common/MultiVersion.h b/src/Common/MultiVersion.h
index 4796d6c9ec2..680e224f869 100644
--- a/src/Common/MultiVersion.h
+++ b/src/Common/MultiVersion.h
@@ -2,6 +2,7 @@
 
 #include <atomic>
 #include <memory>
+#include <mutex>
 #include <base/defines.h>
 
 
@@ -20,6 +21,9 @@
   * }   // now we finish own current version; if the version is outdated and no one else is using it - it will be destroyed.
   *
   * All methods are thread-safe.
+  *
+  * Standard library does not have atomic_shared_ptr, and we do not use std::atomic* operations on shared_ptr,
+  * because standard library implementation uses fixed table of mutexes, and it is better to avoid contention here.
   */
 template <typename T>
 class MultiVersion
@@ -36,21 +40,43 @@ public:
     {
     }
 
+    /// There is no copy constructor because only one MultiVersion should own the same object.
+    MultiVersion(MultiVersion && src) { *this = std::move(src); } /// NOLINT
+
+    MultiVersion & operator=(MultiVersion && src) /// NOLINT
+    {
+        if (this != &src)
+        {
+            Version version;
+
+            {
+                std::lock_guard<std::mutex> lock(src.mutex);
+                src.current_version.swap(version);
+            }
+
+            std::lock_guard<std::mutex> lock(mutex);
+            current_version = std::move(version);
+        }
+
+        return *this;
+    }
+
     /// Obtain current version for read-only usage. Returns shared_ptr, that manages lifetime of version.
     Version get() const
     {
-        return std::atomic_load(&current_version);
+        std::lock_guard<std::mutex> lock(mutex);
+        return current_version;
     }
 
-    /// TODO: replace atomic_load/store() on shared_ptr (which is deprecated as of C++20) by C++20 std::atomic<std::shared_ptr>.
-    /// Clang 15 currently does not support it.
-
     /// Update an object with new version.
     void set(std::unique_ptr<const T> && value)
     {
-        std::atomic_store(&current_version, Version{std::move(value)});
+        Version version{std::move(value)};
+        std::lock_guard<std::mutex> lock(mutex);
+        current_version = std::move(version);
     }
 
 private:
+    mutable std::mutex mutex;
     Version current_version;
 };
diff --git a/src/Common/NaNUtils.h b/src/Common/NaNUtils.h
index 1c5a619e919..2ff3e2f5661 100644
--- a/src/Common/NaNUtils.h
+++ b/src/Common/NaNUtils.h
@@ -25,6 +25,18 @@ inline bool isFinite(T x)
         return true;
 }
 
+template <typename T>
+bool canConvertTo(Float64 x)
+{
+    if constexpr (std::is_floating_point_v<T>)
+        return true;
+    if (!isFinite(x))
+        return false;
+    if (x > Float64(std::numeric_limits<T>::max()) || x < Float64(std::numeric_limits<T>::lowest()))
+        return false;
+
+    return true;
+}
 
 template <typename T>
 T NaNOrZero()
diff --git a/src/Common/NamedCollections/NamedCollectionUtils.cpp b/src/Common/NamedCollections/NamedCollectionUtils.cpp
index d62d54b9f37..317ca3c84ac 100644
--- a/src/Common/NamedCollections/NamedCollectionUtils.cpp
+++ b/src/Common/NamedCollections/NamedCollectionUtils.cpp
@@ -17,6 +17,7 @@
 #include <Common/NamedCollections/NamedCollections.h>
 #include <Common/NamedCollections/NamedCollectionConfiguration.h>
 
+#include <filesystem>
 
 namespace fs = std::filesystem;
 
@@ -135,7 +136,7 @@ public:
             else
             {
                 LOG_WARNING(
-                    &Poco::Logger::get("NamedCollectionsLoadFromSQL"),
+                    getLogger("NamedCollectionsLoadFromSQL"),
                     "Unexpected file {} in named collections directory",
                     current_path.filename().string());
             }
@@ -302,7 +303,7 @@ private:
         readStringUntilEOF(query, in);
 
         ParserCreateNamedCollectionQuery parser;
-        auto ast = parseQuery(parser, query, "in file " + path, 0, settings.max_parser_depth);
+        auto ast = parseQuery(parser, query, "in file " + path, 0, settings.max_parser_depth, settings.max_parser_backtracks);
         const auto & create_query = ast->as<const ASTCreateNamedCollectionQuery &>();
         return create_query;
     }
@@ -345,7 +346,7 @@ void loadFromConfigUnlocked(const Poco::Util::AbstractConfiguration & config, st
 {
     auto named_collections = LoadFromConfig(config).getAll();
     LOG_TRACE(
-        &Poco::Logger::get("NamedCollectionsUtils"),
+        getLogger("NamedCollectionsUtils"),
         "Loaded {} collections from config", named_collections.size());
 
     NamedCollectionFactory::instance().add(std::move(named_collections));
@@ -372,7 +373,7 @@ void loadFromSQLUnlocked(ContextPtr context, std::unique_lock<std::mutex> &)
 {
     auto named_collections = LoadFromSQL(context).getAll();
     LOG_TRACE(
-        &Poco::Logger::get("NamedCollectionsUtils"),
+        getLogger("NamedCollectionsUtils"),
         "Loaded {} collections from SQL", named_collections.size());
 
     NamedCollectionFactory::instance().add(std::move(named_collections));
diff --git a/src/Common/NetException.h b/src/Common/NetException.h
index 0ec3a7c423f..09c51949501 100644
--- a/src/Common/NetException.h
+++ b/src/Common/NetException.h
@@ -29,7 +29,7 @@ public:
     }
 
     NetException * clone() const override { return new NetException(*this); }
-    void rethrow() const override { throw *this; }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 
 private:
     const char * name() const noexcept override { return "DB::NetException"; }
diff --git a/src/Common/NetlinkMetricsProvider.cpp b/src/Common/NetlinkMetricsProvider.cpp
index 23173f31689..172fede525a 100644
--- a/src/Common/NetlinkMetricsProvider.cpp
+++ b/src/Common/NetlinkMetricsProvider.cpp
@@ -22,10 +22,8 @@
 #include <linux/taskstats.h>
 #include <linux/capability.h>
 
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
-    #pragma clang diagnostic ignored "-Wnested-anon-types"
-#endif
+#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
+#pragma clang diagnostic ignored "-Wnested-anon-types"
 
 /// Basic idea is motivated by "iotop" tool.
 /// More info: https://www.kernel.org/doc/Documentation/accounting/taskstats.txt
@@ -216,7 +214,7 @@ bool checkPermissionsImpl()
         {
             /// This error happens all the time when running inside Docker - consider it ok,
             /// don't create noise with this error.
-            LOG_DEBUG(&Poco::Logger::get(__PRETTY_FUNCTION__), getCurrentExceptionMessageAndPattern(/* with_stacktrace */ false));
+            LOG_DEBUG(getLogger(__PRETTY_FUNCTION__), getCurrentExceptionMessageAndPattern(/* with_stacktrace */ false));
         }
         else
         {
diff --git a/src/Common/OpenTelemetryTraceContext.h b/src/Common/OpenTelemetryTraceContext.h
index ab30e3ff07d..13e0d174ba6 100644
--- a/src/Common/OpenTelemetryTraceContext.h
+++ b/src/Common/OpenTelemetryTraceContext.h
@@ -181,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, SpanKind _kind = INTERNAL);
+    explicit 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 8a580469278..b6852964efe 100644
--- a/src/Common/OptimizedRegularExpression.cpp
+++ b/src/Common/OptimizedRegularExpression.cpp
@@ -463,7 +463,7 @@ catch (...)
     is_trivial = false;
     required_substring_is_prefix = false;
     alternatives.clear();
-    LOG_ERROR(&Poco::Logger::get("OptimizeRegularExpression"), "Analyze RegularExpression failed, got error: {}", DB::getCurrentExceptionMessage(false));
+    LOG_ERROR(getLogger("OptimizeRegularExpression"), "Analyze RegularExpression failed, got error: {}", DB::getCurrentExceptionMessage(false));
 }
 
 OptimizedRegularExpression::OptimizedRegularExpression(const std::string & regexp_, int options)
diff --git a/src/Common/PODArray.cpp b/src/Common/PODArray.cpp
index dd1fed08cb5..a8195f15241 100644
--- a/src/Common/PODArray.cpp
+++ b/src/Common/PODArray.cpp
@@ -22,7 +22,7 @@ void protectMemoryRegion(void * addr, size_t len, int prot)
 }
 #endif
 
-size_t byte_size(size_t num_elements, size_t element_size)
+ALWAYS_INLINE size_t byte_size(size_t num_elements, size_t element_size)
 {
     size_t amount;
     if (__builtin_mul_overflow(num_elements, element_size, &amount))
@@ -30,7 +30,7 @@ size_t byte_size(size_t num_elements, size_t element_size)
     return amount;
 }
 
-size_t minimum_memory_for_elements(size_t num_elements, size_t element_size, size_t pad_left, size_t pad_right)
+ALWAYS_INLINE size_t minimum_memory_for_elements(size_t num_elements, size_t element_size, size_t pad_left, size_t pad_right)
 {
     size_t amount;
     if (__builtin_add_overflow(byte_size(num_elements, element_size), pad_left + pad_right, &amount))
diff --git a/src/Common/PODArray.h b/src/Common/PODArray.h
index 6a048d1c6c0..02281eb776a 100644
--- a/src/Common/PODArray.h
+++ b/src/Common/PODArray.h
@@ -6,6 +6,7 @@
 #include <Common/PODArray_fwd.h>
 #include <base/getPageSize.h>
 #include <boost/noncopyable.hpp>
+#include <cstdlib>
 #include <cstring>
 #include <cstddef>
 #include <cassert>
@@ -24,7 +25,7 @@
   */
 template <typename T, typename U>
 constexpr bool memcpy_can_be_used_for_assignment = std::is_same_v<T, U>
-    || (std::is_integral_v<T> && std::is_integral_v<U> && sizeof(T) == sizeof(U));
+    || (std::is_integral_v<T> && std::is_integral_v<U> && sizeof(T) == sizeof(U)); /// NOLINT(misc-redundant-expression)
 
 namespace DB
 {
@@ -238,6 +239,12 @@ public:
         resize_assume_reserved(n);
     }
 
+    template <typename ... TAllocatorParams>
+    void shrink_to_fit(TAllocatorParams &&... allocator_params)
+    {
+        realloc(PODArrayDetails::minimum_memory_for_elements(size(), ELEMENT_SIZE, pad_left, pad_right), std::forward<TAllocatorParams>(allocator_params)...);
+    }
+
     void resize_assume_reserved(const size_t n) /// NOLINT
     {
         c_end = c_start + PODArrayDetails::byte_size(n, ELEMENT_SIZE);
@@ -294,6 +301,8 @@ public:
     }
 };
 
+/// NOLINTBEGIN(bugprone-sizeof-expression)
+
 template <typename T, size_t initial_bytes, typename TAllocator, size_t pad_right_, size_t pad_left_>
 class PODArray : public PODArrayBase<sizeof(T), initial_bytes, TAllocator, pad_right_, pad_left_>
 {
@@ -551,7 +560,7 @@ public:
     }
 
     template <typename... TAllocatorParams>
-    void swap(PODArray & rhs, TAllocatorParams &&... allocator_params)
+    void swap(PODArray & rhs, TAllocatorParams &&... allocator_params) /// NOLINT(performance-noexcept-swap)
     {
 #ifndef NDEBUG
         this->unprotect();
@@ -748,8 +757,10 @@ public:
     }
 };
 
+/// NOLINTEND(bugprone-sizeof-expression)
+
 template <typename T, size_t initial_bytes, typename TAllocator, size_t pad_right_, size_t pad_left_>
-void swap(PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & lhs, PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & rhs)
+void swap(PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & lhs, PODArray<T, initial_bytes, TAllocator, pad_right_, pad_left_> & rhs) /// NOLINT
 {
     lhs.swap(rhs);
 }
diff --git a/src/Common/PageCache.cpp b/src/Common/PageCache.cpp
new file mode 100644
index 00000000000..d4598d4683b
--- /dev/null
+++ b/src/Common/PageCache.cpp
@@ -0,0 +1,692 @@
+#include "PageCache.h"
+
+#include <unistd.h>
+#include <sys/mman.h>
+#include <Common/logger_useful.h>
+#include <Common/formatReadable.h>
+#include <Common/ProfileEvents.h>
+#include <Common/SipHash.h>
+#include <base/hex.h>
+#include <base/errnoToString.h>
+#include <base/getPageSize.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+
+namespace ProfileEvents
+{
+    extern const Event PageCacheChunkMisses;
+    extern const Event PageCacheChunkShared;
+    extern const Event PageCacheChunkDataHits;
+    extern const Event PageCacheChunkDataPartialHits;
+    extern const Event PageCacheChunkDataMisses;
+    extern const Event PageCacheBytesUnpinnedRoundedToPages;
+    extern const Event PageCacheBytesUnpinnedRoundedToHugePages;
+}
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int SYSTEM_ERROR;
+    extern const int MEMORY_LIMIT_EXCEEDED;
+    extern const int CANNOT_ALLOCATE_MEMORY;
+    extern const int INVALID_SETTING_VALUE;
+    extern const int FILE_DOESNT_EXIST;
+}
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wunknown-warning-option"
+#pragma clang diagnostic ignored "-Wreadability-make-member-function-const"
+
+PinnedPageChunk::PinnedPageChunk(PinnedPageChunk && c) noexcept
+    : cache(std::exchange(c.cache, nullptr)), chunk(std::exchange(c.chunk, nullptr)) {}
+
+PinnedPageChunk & PinnedPageChunk::operator=(PinnedPageChunk && c) noexcept
+{
+    if (cache)
+        cache->removeRef(chunk);
+    cache = std::exchange(c.cache, nullptr);
+    chunk = std::exchange(c.chunk, nullptr);
+    return *this;
+}
+
+PinnedPageChunk::~PinnedPageChunk() noexcept
+{
+    if (cache)
+        cache->removeRef(chunk);
+}
+
+PinnedPageChunk::PinnedPageChunk(PageCache * cache_, PageChunk * chunk_) noexcept : cache(cache_), chunk(chunk_) {}
+
+const PageChunk * PinnedPageChunk::getChunk() const { return chunk; }
+
+bool PinnedPageChunk::markPagePopulated(size_t page_idx)
+{
+    bool r = chunk->pages_populated.set(page_idx);
+    return r;
+}
+
+void PinnedPageChunk::markPrefixPopulated(size_t bytes)
+{
+    for (size_t i = 0; i < (bytes + chunk->page_size - 1) / chunk->page_size; ++i)
+        markPagePopulated(i);
+}
+
+bool PinnedPageChunk::isPrefixPopulated(size_t bytes) const
+{
+    for (size_t i = 0; i < (bytes + chunk->page_size - 1) / chunk->page_size; ++i)
+        if (!chunk->pages_populated.get(i))
+            return false;
+    return true;
+}
+
+AtomicBitSet::AtomicBitSet() = default;
+
+void AtomicBitSet::init(size_t nn)
+{
+    n = nn;
+    v = std::make_unique<std::atomic<UInt8>[]>((n + 7) / 8);
+}
+
+bool AtomicBitSet::get(size_t i) const
+{
+    return (v[i / 8] & (1 << (i % 8))) != 0;
+}
+
+bool AtomicBitSet::any() const
+{
+    for (size_t i = 0; i < (n + 7) / 8; ++i)
+        if (v[i])
+            return true;
+    return false;
+}
+
+bool AtomicBitSet::set(size_t i) const
+{
+    UInt8 prev = v[i / 8].fetch_or(1 << (i % 8));
+    return (prev & (1 << (i % 8))) == 0;
+}
+
+bool AtomicBitSet::set(size_t i, bool val) const
+{
+    if (val)
+        return set(i);
+    else
+        return unset(i);
+}
+
+bool AtomicBitSet::unset(size_t i) const
+{
+    UInt8 prev = v[i / 8].fetch_and(~(1 << (i % 8)));
+    return (prev & (1 << (i % 8))) != 0;
+}
+
+void AtomicBitSet::unsetAll() const
+{
+    for (size_t i = 0; i < (n + 7) / 8; ++i)
+        v[i].store(0, std::memory_order_relaxed);
+}
+
+PageCache::PageCache(size_t bytes_per_chunk, size_t bytes_per_mmap, size_t bytes_total, bool use_madv_free_, bool use_huge_pages_)
+    : bytes_per_page(getPageSize())
+    , use_madv_free(use_madv_free_)
+    , use_huge_pages(use_huge_pages_)
+    , rng(randomSeed())
+{
+    if (bytes_per_chunk == 0 || bytes_per_mmap == 0)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Userspace page cache chunk size and mmap size can't be zero.");
+
+    if (use_huge_pages)
+    {
+        use_huge_pages = false;
+        bool print_warning = false;
+#ifdef OS_LINUX
+        try
+        {
+            ReadBufferFromFile in("/sys/kernel/mm/transparent_hugepage/hpage_pmd_size");
+            size_t huge_page_size;
+            readIntText(huge_page_size, in);
+
+            if (huge_page_size == 0 || huge_page_size % bytes_per_page != 0)
+                throw Exception(ErrorCodes::SYSTEM_ERROR, "Invalid huge page size reported by the OS: {}", huge_page_size);
+
+            /// THP can be configured to be 2 MiB or 1 GiB in size. 1 GiB is way too big for us.
+            if (huge_page_size <= (16 << 20))
+            {
+                pages_per_big_page = huge_page_size / bytes_per_page;
+                use_huge_pages = true;
+            }
+            else
+            {
+                LOG_WARNING(&Poco::Logger::get("PageCache"), "The OS huge page size is too large for our purposes: {} KiB. Using regular pages. Userspace page cache will be relatively slow.", huge_page_size);
+            }
+        }
+        catch (Exception & e)
+        {
+            if (e.code() != ErrorCodes::FILE_DOESNT_EXIST)
+                throw;
+            print_warning = true;
+        }
+#else
+        print_warning = true;
+#endif
+        if (print_warning)
+            LOG_WARNING(&Poco::Logger::get("PageCache"), "The OS doesn't support transparent huge pages. Userspace page cache will be relatively slow.");
+    }
+
+    pages_per_chunk = ((bytes_per_chunk - 1) / (bytes_per_page * pages_per_big_page) + 1) * pages_per_big_page;
+    chunks_per_mmap_target = (bytes_per_mmap - 1) / (bytes_per_page * pages_per_chunk) + 1;
+    max_mmaps = (bytes_total - 1) / (bytes_per_page * pages_per_chunk * chunks_per_mmap_target) + 1;
+}
+
+PageCache::~PageCache()
+{
+    chassert(getPinnedSize() == 0);
+}
+
+size_t PageCache::pageSize() const { return bytes_per_page; }
+size_t PageCache::chunkSize() const { return bytes_per_page * pages_per_chunk; }
+size_t PageCache::maxChunks() const { return chunks_per_mmap_target * max_mmaps; }
+
+size_t PageCache::getPinnedSize() const
+{
+    std::lock_guard lock(global_mutex);
+    return (total_chunks - lru.size()) * bytes_per_page * pages_per_chunk;
+}
+
+PageCache::MemoryStats PageCache::getResidentSetSize() const
+{
+    MemoryStats stats;
+#ifdef OS_LINUX
+    if (use_madv_free)
+    {
+        std::unordered_set<UInt64> cache_mmap_addrs;
+        {
+            std::lock_guard lock(global_mutex);
+            for (const auto & m : mmaps)
+                cache_mmap_addrs.insert(reinterpret_cast<UInt64>(m.ptr));
+        }
+
+        ReadBufferFromFile in("/proc/self/smaps");
+
+        /// Parse the smaps contents, which is text consisting of entries like this:
+        ///
+        /// 117ba4a00000-117be4a00000 rw-p 00000000 00:00 0
+        /// Size:            1048576 kB
+        /// KernelPageSize:        4 kB
+        /// MMUPageSize:           4 kB
+        /// Rss:              539516 kB
+        /// Pss:              539516 kB
+        /// ...
+
+        auto read_token = [&]
+        {
+            String res;
+            while (!in.eof())
+            {
+                char c = *in.position();
+                if (c == '\n' || c == '\t' || c == ' ' || c == '-')
+                    break;
+                res += c;
+                ++in.position();
+            }
+            return res;
+        };
+
+        auto skip_whitespace = [&]
+        {
+            while (!in.eof())
+            {
+                char c = *in.position();
+                if (c != ' ' && c != '\t')
+                    break;
+                ++in.position();
+            }
+        };
+
+        bool current_range_is_cache = false;
+        size_t total_rss = 0;
+        size_t total_lazy_free = 0;
+        while (!in.eof())
+        {
+            String s = read_token();
+            if (!in.eof() && *in.position() == '-')
+            {
+                if (s.size() < 16)
+                    s.insert(0, 16 - s.size(), '0');
+                UInt64 addr = unhexUInt<UInt64>(s.c_str());
+                current_range_is_cache = cache_mmap_addrs.contains(addr);
+            }
+            else if (s == "Rss:" || s == "LazyFree")
+            {
+                skip_whitespace();
+                size_t val;
+                readIntText(val, in);
+                skip_whitespace();
+                String unit = read_token();
+                if (unit != "kB")
+                    throw Exception(ErrorCodes::SYSTEM_ERROR, "Unexpected units in /proc/self/smaps: {}", unit);
+                size_t bytes = val * 1024;
+
+                if (s == "Rss:")
+                {
+                    total_rss += bytes;
+                    if (current_range_is_cache)
+                        stats.page_cache_rss += bytes;
+                }
+                else
+                    total_lazy_free += bytes;
+            }
+            skipToNextLineOrEOF(in);
+        }
+        stats.unreclaimable_rss = total_rss - std::min(total_lazy_free, total_rss);
+
+        return stats;
+    }
+#endif
+
+    std::lock_guard lock(global_mutex);
+    stats.page_cache_rss = bytes_per_page * pages_per_chunk * total_chunks;
+    return stats;
+}
+
+PinnedPageChunk PageCache::getOrSet(PageCacheKey key, bool detached_if_missing, bool inject_eviction)
+{
+    PageChunk * chunk;
+    /// Make sure we increment exactly one of the counters about the fate of a chunk lookup.
+    bool incremented_profile_events = false;
+
+    {
+        std::lock_guard lock(global_mutex);
+
+        auto * it = chunk_by_key.find(key);
+        if (it == chunk_by_key.end())
+        {
+            chunk = getFreeChunk();
+            chassert(!chunk->key.has_value());
+
+            if (!detached_if_missing)
+            {
+                chunk->key = key;
+                chunk_by_key.insert({key, chunk});
+            }
+
+            ProfileEvents::increment(ProfileEvents::PageCacheChunkMisses);
+            incremented_profile_events = true;
+        }
+        else
+        {
+            chunk = it->getMapped();
+            size_t prev_pin_count = chunk->pin_count.fetch_add(1);
+
+            if (prev_pin_count == 0)
+            {
+                /// Not eligible for LRU eviction while pinned.
+                chassert(chunk->is_linked());
+                lru.erase(lru.iterator_to(*chunk));
+
+                if (detached_if_missing)
+                {
+                    /// Peek the first page to see if it's evicted.
+                    /// (Why not use the full probing procedure instead, restoreChunkFromLimbo()?
+                    ///  Right here we can't do it because of how the two mutexes are organized.
+                    ///  And we want to do the check+detach before unlocking global_mutex, because
+                    ///  otherwise we may detach a chunk pinned by someone else, which may be unexpected
+                    ///  for that someone else. Or maybe the latter is fine, dropCache() already does it.)
+                    if (chunk->pages_populated.get(0) && reinterpret_cast<volatile std::atomic<char>*>(chunk->data)->load(std::memory_order_relaxed) == 0)
+                        evictChunk(chunk);
+                }
+
+                if (inject_eviction && chunk->key.has_value() && rng() % 10 == 0)
+                {
+                    /// Simulate eviction of the chunk or some of its pages.
+                    if (rng() % 2 == 0)
+                        evictChunk(chunk);
+                    else
+                        for (size_t i = 0; i < 20; ++i)
+                            chunk->pages_populated.unset(rng() % (chunk->size / chunk->page_size));
+                }
+            }
+            else
+            {
+                ProfileEvents::increment(ProfileEvents::PageCacheChunkShared);
+                incremented_profile_events = true;
+            }
+        }
+    }
+
+    {
+        std::lock_guard chunk_lock(chunk->chunk_mutex);
+
+        if (chunk->pages_state == PageChunkState::Limbo)
+        {
+            auto [pages_restored, pages_evicted] = restoreChunkFromLimbo(chunk, chunk_lock);
+            chunk->pages_state = PageChunkState::Stable;
+
+            if (!incremented_profile_events)
+            {
+                if (pages_evicted == 0)
+                    ProfileEvents::increment(ProfileEvents::PageCacheChunkDataHits);
+                else if (pages_evicted < pages_restored)
+                    ProfileEvents::increment(ProfileEvents::PageCacheChunkDataPartialHits);
+                else
+                    ProfileEvents::increment(ProfileEvents::PageCacheChunkDataMisses);
+            }
+        }
+    }
+
+    return PinnedPageChunk(this, chunk);
+}
+
+void PageCache::removeRef(PageChunk * chunk) noexcept
+{
+    /// Fast path if this is not the last reference.
+    size_t prev_pin_count = chunk->pin_count.load();
+    if (prev_pin_count > 1 && chunk->pin_count.compare_exchange_strong(prev_pin_count, prev_pin_count - 1))
+        return;
+
+    {
+        std::lock_guard lock(global_mutex);
+
+        prev_pin_count = chunk->pin_count.fetch_sub(1);
+        if (prev_pin_count > 1)
+            return;
+
+        chassert(!chunk->is_linked());
+        if (chunk->key.has_value())
+            lru.push_back(*chunk);
+        else
+            /// Unpinning detached chunk. We'd rather reuse it soon, so put it at the front.
+            lru.push_front(*chunk);
+    }
+
+    {
+        std::lock_guard chunk_lock(chunk->chunk_mutex);
+
+        /// Need to be extra careful here because we unlocked global_mutex above, so other
+        /// getOrSet()/removeRef() calls could have happened during this brief period.
+        if (use_madv_free && chunk->pages_state == PageChunkState::Stable && chunk->pin_count.load() == 0)
+        {
+            sendChunkToLimbo(chunk, chunk_lock);
+            chunk->pages_state = PageChunkState::Limbo;
+        }
+    }
+}
+
+static void logUnexpectedSyscallError(std::string name)
+{
+    std::string message = fmt::format("{} failed: {}", name, errnoToString());
+    LOG_WARNING(&Poco::Logger::get("PageCache"), "{}", message);
+#if defined(ABORT_ON_LOGICAL_ERROR)
+    volatile bool true_ = true;
+    if (true_) // suppress warning about missing [[noreturn]]
+        abortOnFailedAssertion(message);
+#endif
+}
+
+void PageCache::sendChunkToLimbo(PageChunk * chunk [[maybe_unused]], std::lock_guard<std::mutex> & /* chunk_mutex */) const noexcept
+{
+#ifdef MADV_FREE // if we're not on a very old version of Linux
+    chassert(chunk->size == bytes_per_page * pages_per_chunk);
+    size_t populated_pages = 0;
+    size_t populated_big_pages = 0;
+    for (size_t big_page_idx = 0; big_page_idx < pages_per_chunk / pages_per_big_page; ++big_page_idx)
+    {
+        bool big_page_populated = false;
+        for (size_t sub_idx = 0; sub_idx < pages_per_big_page; ++sub_idx)
+        {
+            size_t idx = big_page_idx * pages_per_big_page + sub_idx;
+            if (!chunk->pages_populated.get(idx))
+                continue;
+            big_page_populated = true;
+            populated_pages += 1;
+
+            auto & byte = reinterpret_cast<volatile std::atomic<char> &>(chunk->data[idx * bytes_per_page]);
+            chunk->first_bit_of_each_page.set(idx, (byte.load(std::memory_order_relaxed) & 1) != 0);
+            byte.fetch_or(1, std::memory_order_relaxed);
+        }
+        if (big_page_populated)
+            populated_big_pages += 1;
+    }
+    int r = madvise(chunk->data, chunk->size, MADV_FREE);
+    if (r != 0)
+        logUnexpectedSyscallError("madvise(MADV_FREE)");
+
+    ProfileEvents::increment(ProfileEvents::PageCacheBytesUnpinnedRoundedToPages, bytes_per_page * populated_pages);
+    ProfileEvents::increment(ProfileEvents::PageCacheBytesUnpinnedRoundedToHugePages, bytes_per_page * pages_per_big_page * populated_big_pages);
+#endif
+}
+
+std::pair<size_t, size_t> PageCache::restoreChunkFromLimbo(PageChunk * chunk, std::lock_guard<std::mutex> & /* chunk_mutex */) const noexcept
+{
+    static_assert(sizeof(std::atomic<char>) == 1, "char is not atomic?");
+    // Make sure our strategic memory reads/writes are not reordered or optimized out.
+    auto * data = reinterpret_cast<volatile std::atomic<char> *>(chunk->data);
+    size_t pages_restored = 0;
+    size_t pages_evicted = 0;
+    for (size_t idx = 0; idx < chunk->size / bytes_per_page; ++idx)
+    {
+        if (!chunk->pages_populated.get(idx))
+            continue;
+
+        /// After MADV_FREE, it's guaranteed that:
+        ///  * writing to the page makes it non-freeable again (reading doesn't),
+        ///  * after the write, the page contents are either fully intact or fully zero-filled,
+        ///  * even before the write, reads return either intact data (if the page wasn't freed) or zeroes (if it was, and the read page-faulted).
+        /// (And when doing the write there's no way to tell whether it page-faulted or not, AFAICT; that would make our life much easier!)
+        ///
+        /// With that in mind, we do the following dance to bring the page back from the MADV_FREE limbo:
+        ///  0. [in advance] Before doing MADV_FREE, make sure the page's first byte is not zero.
+        ///     We do it by setting the lowest bit of the first byte to 1, after saving the original value of that bit into a bitset.
+        ///  1. Read the second byte.
+        ///  2. Write the second byte back. This makes the page non-freeable.
+        ///  3. Read the first byte.
+        ///    3a. If it's zero, the page was freed.
+        ///        Set the second byte to 0, to keep the buffer zero-filled if the page was freed
+        ///        between steps 1 and 2.
+        ///    3b. If it's nonzero, the page is intact.
+        ///        Restore the lowest bit of the first byte to the saved original value from the bitset.
+
+        char second_byte = data[idx * bytes_per_page + 1].load(std::memory_order_relaxed);
+        data[idx * bytes_per_page + 1].store(second_byte, std::memory_order_relaxed);
+
+        char first_byte = data[idx * bytes_per_page].load(std::memory_order_relaxed);
+        if (first_byte == 0)
+        {
+            pages_evicted += 1;
+            data[idx * bytes_per_page + 1].store(0, std::memory_order_relaxed);
+            chunk->pages_populated.unset(idx);
+        }
+        else
+        {
+            pages_restored += 1;
+            chassert(first_byte & 1);
+            if (!chunk->first_bit_of_each_page.get(idx))
+                data[idx * bytes_per_page].fetch_and(~1, std::memory_order_relaxed);
+        }
+    }
+    return {pages_restored, pages_evicted};
+}
+
+PageChunk * PageCache::getFreeChunk()
+{
+    if (lru.empty() || (mmaps.size() < max_mmaps && lru.front().key.has_value()))
+        addMmap();
+    if (lru.empty())
+        throw Exception(ErrorCodes::MEMORY_LIMIT_EXCEEDED, "All chunks in the entire page cache ({:.3} GiB) are pinned.",
+            bytes_per_page * pages_per_chunk * total_chunks * 1. / (1l << 30));
+
+    PageChunk * chunk = &lru.front();
+    lru.erase(lru.iterator_to(*chunk));
+
+    size_t prev_pin_count = chunk->pin_count.fetch_add(1);
+    chassert(prev_pin_count == 0);
+
+    evictChunk(chunk);
+
+    return chunk;
+}
+
+void PageCache::evictChunk(PageChunk * chunk)
+{
+    if (chunk->key.has_value())
+    {
+        size_t erased = chunk_by_key.erase(chunk->key.value());
+        chassert(erased);
+        chunk->key.reset();
+    }
+
+    chunk->state.reset();
+
+    /// This is tricky. We're not holding the chunk_mutex, so another thread might be running
+    /// sendChunkToLimbo() or even restoreChunkFromLimbo() on this chunk right now.
+    ///
+    /// Nevertheless, it's correct and sufficient to clear pages_populated here because sendChunkToLimbo()
+    /// and restoreChunkFromLimbo() only touch pages_populated (only unsetting the bits),
+    /// first_bit_of_each_page, and the data; and we don't care about first_bit_of_each_page and the data.
+    ///
+    /// This is precarious, but I don't have better ideas. Note that this clearing (or something else)
+    /// must be done before unlocking the global_mutex because otherwise another call to getOrSet() might
+    /// return this chunk before we clear it.
+    chunk->pages_populated.unsetAll();
+}
+
+void PageCache::addMmap()
+{
+    /// ASLR by hand.
+    void * address_hint = reinterpret_cast<void *>(std::uniform_int_distribution<size_t>(0x100000000000UL, 0x700000000000UL)(rng));
+
+    mmaps.emplace_back(bytes_per_page, pages_per_chunk, pages_per_big_page, chunks_per_mmap_target, address_hint, use_huge_pages);
+
+    size_t num_chunks = mmaps.back().num_chunks;
+    total_chunks += num_chunks;
+    for (size_t i = 0; i < num_chunks; ++i)
+        /// Link in reverse order, so they get assigned in increasing order. Not important, just seems nice.
+        lru.push_front(mmaps.back().chunks[num_chunks - 1 - i]);
+}
+
+void PageCache::dropCache()
+{
+    std::lock_guard lock(global_mutex);
+
+    /// Detach and free unpinned chunks.
+    bool logged_error = false;
+    for (PageChunk & chunk : lru)
+    {
+        evictChunk(&chunk);
+
+        if (use_madv_free)
+        {
+            /// This might happen in parallel with sendChunkToLimbo() or restoreChunkFromLimbo(), but it's ok.
+            int r = madvise(chunk.data, chunk.size, MADV_DONTNEED);
+            if (r != 0 && !logged_error)
+            {
+                logUnexpectedSyscallError("madvise(MADV_DONTNEED)");
+                logged_error = true;
+            }
+        }
+    }
+
+    /// Detach pinned chunks.
+    for (auto [key, chunk] : chunk_by_key)
+    {
+        chassert(chunk->key == key);
+        chassert(chunk->pin_count > 0); // otherwise it would have been evicted above
+        chunk->key.reset();
+    }
+    chunk_by_key.clear();
+}
+
+PageCache::Mmap::Mmap(size_t bytes_per_page_, size_t pages_per_chunk_, size_t pages_per_big_page_, size_t num_chunks_, void * address_hint, bool use_huge_pages_)
+{
+    num_chunks = num_chunks_;
+    size = bytes_per_page_ * pages_per_chunk_ * num_chunks;
+
+    size_t alignment = bytes_per_page_ * pages_per_big_page_;
+    address_hint = reinterpret_cast<void*>(reinterpret_cast<UInt64>(address_hint) / alignment * alignment);
+
+    auto temp_chunks = std::make_unique<PageChunk[]>(num_chunks);
+
+    int flags = MAP_PRIVATE | MAP_ANONYMOUS;
+#ifdef OS_LINUX
+    flags |= MAP_NORESERVE;
+#endif
+    ptr = mmap(address_hint, size, PROT_READ | PROT_WRITE, flags, -1, 0);
+    if (MAP_FAILED == ptr)
+        throw ErrnoException(ErrorCodes::CANNOT_ALLOCATE_MEMORY, fmt::format("Cannot mmap {}.", ReadableSize(size)));
+    if (reinterpret_cast<UInt64>(ptr) % bytes_per_page_ != 0)
+    {
+        munmap(ptr, size);
+        throw Exception(ErrorCodes::SYSTEM_ERROR, "mmap returned unaligned address: {}", ptr);
+    }
+
+    void * chunks_start = ptr;
+
+#ifdef OS_LINUX
+    if (madvise(ptr, size, MADV_DONTDUMP) != 0)
+        logUnexpectedSyscallError("madvise(MADV_DONTDUMP)");
+    if (madvise(ptr, size, MADV_DONTFORK) != 0)
+        logUnexpectedSyscallError("madvise(MADV_DONTFORK)");
+
+    if (use_huge_pages_)
+    {
+        if (reinterpret_cast<UInt64>(ptr) % alignment != 0)
+        {
+            LOG_DEBUG(&Poco::Logger::get("PageCache"), "mmap() returned address not aligned on huge page boundary.");
+            chunks_start = reinterpret_cast<void*>((reinterpret_cast<UInt64>(ptr) / alignment + 1) * alignment);
+            chassert(reinterpret_cast<UInt64>(chunks_start) % alignment == 0);
+            num_chunks -= 1;
+        }
+
+        if (madvise(ptr, size, MADV_HUGEPAGE) != 0)
+            LOG_WARNING(&Poco::Logger::get("PageCache"),
+                "madvise(MADV_HUGEPAGE) failed: {}. Userspace page cache will be relatively slow.", errnoToString());
+    }
+#else
+    (void)use_huge_pages_;
+#endif
+
+    chunks = std::move(temp_chunks);
+    for (size_t i = 0; i < num_chunks; ++i)
+    {
+        PageChunk * chunk = &chunks[i];
+        chunk->data = reinterpret_cast<char *>(chunks_start) + bytes_per_page_ * pages_per_chunk_ * i;
+        chunk->size = bytes_per_page_ * pages_per_chunk_;
+        chunk->page_size = bytes_per_page_;
+        chunk->big_page_size = bytes_per_page_ * pages_per_big_page_;
+        chunk->pages_populated.init(pages_per_chunk_);
+        chunk->first_bit_of_each_page.init(pages_per_chunk_);
+    }
+}
+
+PageCache::Mmap::Mmap(Mmap && m) noexcept : ptr(std::exchange(m.ptr, nullptr)), size(std::exchange(m.size, 0)), chunks(std::move(m.chunks)), num_chunks(std::exchange(m.num_chunks, 0)) {}
+
+PageCache::Mmap::~Mmap() noexcept
+{
+    if (ptr && 0 != munmap(ptr, size))
+        logUnexpectedSyscallError("munmap");
+}
+
+void FileChunkState::reset() {}
+
+PageCacheKey FileChunkAddress::hash() const
+{
+    SipHash hash(offset);
+    hash.update(path.data(), path.size());
+    if (!file_version.empty())
+    {
+        hash.update("\0", 1);
+        hash.update(file_version.data(), file_version.size());
+    }
+    return hash.get128();
+}
+
+std::string FileChunkAddress::toString() const
+{
+    return fmt::format("{}:{}{}{}", path, offset, file_version.empty() ? "" : ":", file_version);
+}
+
+#pragma clang diagnostic pop
+
+}
diff --git a/src/Common/PageCache.h b/src/Common/PageCache.h
new file mode 100644
index 00000000000..04411e6fc24
--- /dev/null
+++ b/src/Common/PageCache.h
@@ -0,0 +1,299 @@
+#pragma once
+
+#include <boost/intrusive/list.hpp>
+#include <pcg_random.hpp>
+#include <Common/randomSeed.h>
+#include <Core/Types.h>
+#include <Common/HashTable/HashMap.h>
+
+/// "Userspace page cache"
+/// A cache for contents of remote files.
+/// Uses MADV_FREE to allow Linux to evict pages from our cache under memory pressure.
+/// Typically takes up almost all of the available memory, similar to the actual page cache.
+///
+/// Intended for caching data retrieved from distributed cache, but can be used for other things too,
+/// just replace FileChunkState with a discriminated union, or something, if needed.
+///
+/// There are two fixed-size units of caching here:
+///  * OS pages, typically 4 KiB each.
+///  * Page chunks, 2 MiB each (configurable with page_cache_block_size setting).
+///
+/// Each file is logically split into aligned 2 MiB blocks, which are mapped to page chunks inside the cache.
+/// They are cached independently from each other.
+///
+/// Each page chunk has a contiguous 2 MiB buffer that can be pinned and directly used e.g. by ReadBuffers.
+/// While pinned (by at least one PinnedPageChunk), the pages are not reclaimable by the OS.
+///
+/// Inside each page chunk, any subset of pages may be populated. Unpopulated pages may or not be
+/// mapped to any physical RAM. We maintain a bitmask that keeps track of which pages are populated.
+/// Pages become unpopulated if they're reclaimed by the OS (when the page chunk is not pinned),
+/// or if we just never populate them in the first place (e.g. if a file is shorter than 2 MiB we
+/// still create a 2 MiB page chunk, but use only a prefix of it).
+///
+/// There are two separate eviction mechanisms at play:
+///  * LRU eviction of page chunks in PageCache.
+///  * OS reclaiming pages on memory pressure. We have no control over the eviction policy.
+///    It probably picks the pages in the same order in which they were marked with MADV_FREE, so
+///    effectively in the same LRU order as our policy in PageCache.
+/// When using PageCache in oversubscribed fashion, using all available memory and relying on OS eviction,
+/// the PageCache's eviction policy mostly doesn't matter. It just needs to be similar enough to the OS's
+/// policy that we rarely evict chunks with unevicted pages.
+///
+/// We mmap memory directly instead of using allocator because this enables:
+///  * knowing how much RAM the cache is using, via /proc/self/smaps,
+///  * MADV_HUGEPAGE (use transparent huge pages - this makes MADV_FREE 10x less slow),
+///  * MAP_NORESERVE (don't reserve swap space - otherwise large mmaps usually fail),
+///  * MADV_DONTDUMP (don't include in core dumps),
+///  * page-aligned addresses without padding.
+///
+/// madvise(MADV_FREE) call is slow: ~6 GiB/s (doesn't scale with more threads). Enabling transparent
+/// huge pages (MADV_HUGEPAGE) makes it 10x less slow, so we do that. That makes the physical RAM allocation
+/// work at 2 MiB granularity instead of 4 KiB, so the cache becomes less suitable for small files.
+/// If this turns out to be a problem, we may consider allowing different mmaps to have different flags,
+/// some having no huge pages.
+/// Note that we do our bookkeeping at small-page granularity even if huge pages are enabled.
+///
+/// It's unfortunate that Linux's MADV_FREE eviction doesn't use the two-list strategy like the real
+/// page cache (IIUC, MADV_FREE puts the pages at the head of the inactive list, and they can never
+/// get to the active list).
+/// If this turns out to be a problem, we could make PageCache do chunk eviction based on observed
+/// system memory usage, so that most eviction is done by us, and the MADV_FREE eviction kicks in
+/// only as a last resort. Then we can make PageCache's eviction policy arbitrarily more sophisticated.
+
+namespace DB
+{
+
+/// Hash of FileChunkAddress.
+using PageCacheKey = UInt128;
+
+/// Identifies a chunk of a file or object.
+/// We assume that contents of such file/object don't change (without file_version changing), so
+/// cache invalidation is needed.
+struct FileChunkAddress
+{
+    /// Path, usually prefixed with storage system name and anything else needed to make it unique.
+    /// E.g. "s3:<bucket>/<path>"
+    std::string path;
+    /// Optional string with ETag, or file modification time, or anything else.
+    std::string file_version{};
+    size_t offset = 0;
+
+    PageCacheKey hash() const;
+
+    std::string toString() const;
+};
+
+struct AtomicBitSet
+{
+    size_t n = 0;
+    std::unique_ptr<std::atomic<UInt8>[]> v;
+
+    AtomicBitSet();
+
+    void init(size_t n);
+
+    bool get(size_t i) const;
+    bool any() const;
+    /// These return true if the bit was changed, false if it already had the target value.
+    /// (These methods are logically not const, but clang insists that I make them const, and
+    ///  '#pragma clang diagnostic ignored' doesn't seem to work.)
+    bool set(size_t i) const;
+    bool set(size_t i, bool val) const;
+    bool unset(size_t i) const;
+    void unsetAll() const;
+};
+
+enum class PageChunkState
+{
+    /// Pages are not reclaimable by the OS, the buffer has correct contents.
+    Stable,
+    /// Pages are reclaimable by the OS, the buffer contents are altered (first bit of each page set to 1).
+    Limbo,
+};
+
+/// (This is a separate struct just in case we want to use this cache for other things in future.
+///  Then this struct would be the customization point, while the rest of PageChunk can stay unchanged.)
+struct FileChunkState
+{
+    std::mutex download_mutex;
+
+    void reset();
+};
+
+using PageChunkLRUListHook = boost::intrusive::list_base_hook<>;
+
+/// Cache entry.
+struct PageChunk : public PageChunkLRUListHook
+{
+    char * data;
+    size_t size; // in bytes
+    /// Page size for use in pages_populated and first_bit_of_each_page. Same as PageCache::pageSize().
+    size_t page_size;
+
+    /// Actual eviction granularity. Just for information. If huge pages are used, huge page size, otherwise page_size.
+    size_t big_page_size;
+
+    mutable FileChunkState state;
+
+    AtomicBitSet pages_populated;
+
+private:
+    friend class PinnedPageChunk;
+    friend class PageCache;
+
+    /// If nullopt, the chunk is "detached", i.e. not associated with any key.
+    /// Detached chunks may still be pinned. Chunk may get detached even while pinned, in particular when dropping cache.
+    /// Protected by global_mutex.
+    std::optional<PageCacheKey> key;
+
+    /// Refcount for usage of this chunk. When zero, the pages are reclaimable by the OS, and
+    /// the PageChunk itself is evictable (linked into PageCache::lru).
+    std::atomic<size_t> pin_count {0};
+
+    /// Bit mask containing the first bit of data from each page. Needed for the weird probing procedure when un-MADV_FREE-ing the pages.
+    AtomicBitSet first_bit_of_each_page;
+
+    /// Locked when changing pages_state, along with the corresponding expensive MADV_FREE/un-MADV_FREE operation.
+    mutable std::mutex chunk_mutex;
+
+    /// Normally pin_count == 0  <=>  state == PageChunkState::Limbo,
+    ///          pin_count >  0  <=>  state == PageChunkState::Stable.
+    /// This separate field is needed because of synchronization: pin_count is changed with global_mutex locked,
+    /// this field is changed with chunk_mutex locked, and we never have to lock both mutexes at once.
+    PageChunkState pages_state = PageChunkState::Stable;
+};
+
+class PageCache;
+
+/// Handle for a cache entry. Neither the entry nor its pages can get evicted while there's at least one PinnedPageChunk pointing to it.
+class PinnedPageChunk
+{
+public:
+    const PageChunk * getChunk() const;
+
+    /// Sets the bit in pages_populated. Returns true if it actually changed (i.e. was previously 0).
+    bool markPagePopulated(size_t page_idx);
+
+    /// Calls markPagePopulated() for pages 0..ceil(bytes/page_size).
+    void markPrefixPopulated(size_t bytes);
+
+    bool isPrefixPopulated(size_t bytes) const;
+
+    PinnedPageChunk() = default;
+    ~PinnedPageChunk() noexcept;
+
+    PinnedPageChunk(PinnedPageChunk &&) noexcept;
+    PinnedPageChunk & operator=(PinnedPageChunk &&) noexcept;
+
+private:
+    friend class PageCache;
+
+    PageCache * cache = nullptr;
+    PageChunk * chunk = nullptr;
+
+    PinnedPageChunk(PageCache * cache_, PageChunk * chunk_) noexcept;
+};
+
+class PageCache
+{
+public:
+    PageCache(size_t bytes_per_chunk, size_t bytes_per_mmap, size_t bytes_total, bool use_madv_free, bool use_huge_pages);
+    ~PageCache();
+
+    /// Get or insert a chunk for the given key.
+    ///
+    /// If detached_if_missing = true, and the key is not present in the cache, the returned chunk
+    /// won't be associated with the key and will be evicted as soon as it's unpinned.
+    /// It's like "get if exists, otherwise return null", but instead of null we return a usable
+    /// temporary buffer, for convenience. Pinning and page eviction make the story more complicated:
+    ///  * If the chunk for this key is pinned, we return it even if it's not fully populated
+    ///    (because PageCache doesn't know what "fully populated" means).
+    ///  * If the chunk exists, but some of its pages were evicted, we detach it. (Currently we only
+    ///    check the first page here.)
+    PinnedPageChunk getOrSet(PageCacheKey key, bool detached_if_missing, bool inject_eviction);
+
+    /// OS page size, e.g. 4 KiB on x86, 4 KiB or 64 KiB on aarch64.
+    ///
+    /// If transparent huge pages are enabled, this is still the regular page size, and all our bookkeeping
+    /// is still based on regular page size (e.g. pages_populated), because (a) it's cheap anyway,
+    /// and (b) I'm not sure if Linux guarantees that MADV_FREE reclamation always happens at huge page
+    /// granularity, and wouldn't want to rely on this even if it does.
+    size_t pageSize() const;
+    size_t chunkSize() const;
+    size_t maxChunks() const;
+
+    struct MemoryStats
+    {
+        /// How many bytes of actual RAM are used for the cache pages. Doesn't include metadata
+        /// and overhead (e.g. PageChunk structs).
+        size_t page_cache_rss = 0;
+        /// Resident set size for the whole process, excluding any MADV_FREE pages (PageCache's or not).
+        /// This can be used as a more useful memory usage number for clickhouse server, instead of RSS.
+        /// Populated only if MADV_FREE is used, otherwise zero.
+        std::optional<size_t> unreclaimable_rss;
+    };
+
+    /// Reads /proc/self/smaps, so not very fast.
+    MemoryStats getResidentSetSize() const;
+
+    /// Total length of memory ranges currently pinned by PinnedPageChunk-s, including unpopulated pages.
+    size_t getPinnedSize() const;
+
+    /// Clears the key -> chunk mapping. Frees memory (MADV_DONTNEED) of all chunks that are not pinned.
+    /// Doesn't unmap any virtual memory. Detaches but doesn't free the pinned chunks.
+    /// Locks the global mutex for the duration of the operation, which may block queries for hundreds of milliseconds.
+    void dropCache();
+
+private:
+    friend class PinnedPageChunk;
+
+    struct Mmap
+    {
+        void * ptr = nullptr;
+        size_t size = 0;
+
+        std::unique_ptr<PageChunk[]> chunks;
+        size_t num_chunks = 0; // might be smaller than chunks_per_mmap_target because of alignment
+
+        Mmap(Mmap &&) noexcept;
+        Mmap(size_t bytes_per_page, size_t pages_per_chunk, size_t pages_per_big_page, size_t num_chunks, void * address_hint, bool use_huge_pages_);
+        ~Mmap() noexcept;
+    };
+
+    size_t bytes_per_page;
+    size_t pages_per_chunk;
+    size_t chunks_per_mmap_target;
+    size_t max_mmaps;
+    size_t pages_per_big_page = 1; // if huge pages are used, huge_page_size/page_size, otherwise 1
+    bool use_madv_free = true;
+    bool use_huge_pages = true;
+
+    mutable std::mutex global_mutex;
+
+    pcg64 rng TSA_GUARDED_BY(global_mutex);
+
+    std::vector<Mmap> mmaps TSA_GUARDED_BY(global_mutex);
+    size_t total_chunks TSA_GUARDED_BY(global_mutex) = 0;
+
+    /// All non-pinned chunks, including ones not assigned to any file. Least recently used is begin().
+    boost::intrusive::list<PageChunk, boost::intrusive::base_hook<PageChunkLRUListHook>, boost::intrusive::constant_time_size<true>> lru TSA_GUARDED_BY(global_mutex);
+
+    HashMap<PageCacheKey, PageChunk *> chunk_by_key TSA_GUARDED_BY(global_mutex);
+
+    /// Get a usable chunk, doing eviction or allocation if needed.
+    /// Caller is responsible for clearing pages_populated.
+    PageChunk * getFreeChunk() TSA_REQUIRES(global_mutex);
+    void addMmap() TSA_REQUIRES(global_mutex);
+    void evictChunk(PageChunk * chunk) TSA_REQUIRES(global_mutex);
+
+    void removeRef(PageChunk * chunk) noexcept;
+
+    /// These may run in parallel with getFreeChunk(), so be very careful about which fields of the PageChunk we touch here.
+    void sendChunkToLimbo(PageChunk * chunk, std::lock_guard<std::mutex> & /* chunk_mutex */) const noexcept;
+    /// Returns {pages_restored, pages_evicted}.
+    std::pair<size_t, size_t> restoreChunkFromLimbo(PageChunk * chunk, std::lock_guard<std::mutex> & /* chunk_mutex */) const noexcept;
+};
+
+using PageCachePtr = std::shared_ptr<PageCache>;
+
+}
diff --git a/src/Common/PipeFDs.cpp b/src/Common/PipeFDs.cpp
index f2a913467a9..ceadbb2f983 100644
--- a/src/Common/PipeFDs.cpp
+++ b/src/Common/PipeFDs.cpp
@@ -97,7 +97,7 @@ void LazyPipeFDs::setNonBlockingReadWrite()
 void LazyPipeFDs::tryIncreaseSize(int desired_size)
 {
 #if defined(OS_LINUX)
-    Poco::Logger * log = &Poco::Logger::get("Pipe");
+    LoggerPtr log = getLogger("Pipe");
 
     /** Increase pipe size to avoid slowdown during fine-grained trace collection.
       */
diff --git a/src/Common/PoolBase.h b/src/Common/PoolBase.h
index 5575b56f299..d6fc1656eca 100644
--- a/src/Common/PoolBase.h
+++ b/src/Common/PoolBase.h
@@ -1,11 +1,9 @@
 #pragma once
 
-#include <condition_variable>
 #include <mutex>
-#include <type_traits>
-#include <variant>
-#include <boost/noncopyable.hpp>
+#include <condition_variable>
 #include <Poco/Timespan.h>
+#include <boost/noncopyable.hpp>
 
 #include <Common/logger_useful.h>
 #include <Common/Exception.h>
@@ -17,6 +15,14 @@ namespace ProfileEvents
     extern const Event ConnectionPoolIsFullMicroseconds;
 }
 
+namespace DB
+{
+    namespace ErrorCodes
+    {
+        extern const int LOGICAL_ERROR;
+    }
+}
+
 /** A class from which you can inherit and get a pool of something. Used for database connection pools.
   * Descendant class must provide a method for creating a new object to place in the pool.
   */
@@ -29,22 +35,6 @@ public:
     using ObjectPtr = std::shared_ptr<Object>;
     using Ptr = std::shared_ptr<PoolBase<TObject>>;
 
-    enum class BehaviourOnLimit
-    {
-        /**
-         * Default behaviour - when limit on pool size is reached, callers will wait until object will be returned back in pool.
-         */
-        Wait,
-
-        /**
-         * If no free objects in pool - allocate a new object, but not store it in pool.
-         * This behaviour is needed when we simply don't want to waste time waiting or if we cannot guarantee that query could be processed using fixed amount of connections.
-         * For example, when we read from table on s3, one GetObject request corresponds to the whole FileSystemCache segment. This segments are shared between different
-         * reading tasks, so in general case connection could be taken from pool by one task and returned back by another one. And these tasks are processed completely independently.
-         */
-        AllocateNewBypassingPool,
-    };
-
 private:
 
     /** The object with the flag, whether it is currently used. */
@@ -99,53 +89,37 @@ public:
         Object & operator*() && = delete;
         const Object & operator*() const && = delete;
 
-        Object * operator->() &             { return castToObjectPtr(); }
-        const Object * operator->() const & { return castToObjectPtr(); }
-        Object & operator*() &              { return *castToObjectPtr(); }
-        const Object & operator*() const &  { return *castToObjectPtr(); }
+        Object * operator->() &             { return &*data->data.object; }
+        const Object * operator->() const & { return &*data->data.object; }
+        Object & operator*() &              { return *data->data.object; }
+        const Object & operator*() const &  { return *data->data.object; }
 
         /**
          * Expire an object to make it reallocated later.
          */
         void expire()
         {
-            if (data.index() == 1)
-                std::get<1>(data)->data.is_expired = true;
+            data->data.is_expired = true;
         }
 
-        bool isNull() const { return data.index() == 0 ? !std::get<0>(data) : !std::get<1>(data); }
+        bool isNull() const { return data == nullptr; }
+
+        PoolBase * getPool() const
+        {
+            if (!data)
+                throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Attempt to get pool from uninitialized entry");
+            return &data->data.pool;
+        }
 
     private:
-        /**
-         * Plain object will be stored instead of PoolEntryHelper if fallback was made in get() (see BehaviourOnLimit::AllocateNewBypassingPool).
-         */
-        std::variant<ObjectPtr, std::shared_ptr<PoolEntryHelper>> data;
+        std::shared_ptr<PoolEntryHelper> data;
 
-        explicit Entry(ObjectPtr && object) : data(std::move(object)) { }
-
-        explicit Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) { }
-
-        auto castToObjectPtr() const
-        {
-            return std::visit(
-                [](const auto & ptr)
-                {
-                    using T = std::decay_t<decltype(ptr)>;
-                    if constexpr (std::is_same_v<ObjectPtr, T>)
-                        return ptr.get();
-                    else
-                        return ptr->data.object.get();
-                },
-                data);
-        }
+        explicit Entry(PooledObject & object) : data(std::make_shared<PoolEntryHelper>(object)) {}
     };
 
     virtual ~PoolBase() = default;
 
-    /** Allocates the object.
-     *  If 'behaviour_on_limit' is Wait - wait for free object in pool for 'timeout'. With 'timeout' < 0, the timeout is infinite.
-     *  If 'behaviour_on_limit' is AllocateNewBypassingPool and there is no free object - a new object will be created but not stored in the pool.
-     */
+    /** Allocates the object. Wait for free object in pool for 'timeout'. With 'timeout' < 0, the timeout is infinite. */
     Entry get(Poco::Timespan::TimeDiff timeout)
     {
         std::unique_lock lock(mutex);
@@ -176,9 +150,6 @@ public:
                 return Entry(*items.back());
             }
 
-            if (behaviour_on_limit == BehaviourOnLimit::AllocateNewBypassingPool)
-                return Entry(allocObject());
-
             Stopwatch blocked;
             if (timeout < 0)
             {
@@ -213,8 +184,6 @@ private:
     /** The maximum size of the pool. */
     unsigned max_items;
 
-    BehaviourOnLimit behaviour_on_limit;
-
     /** Pool. */
     Objects items;
 
@@ -223,10 +192,10 @@ private:
     std::condition_variable available;
 
 protected:
-    Poco::Logger * log;
+    LoggerPtr log;
 
-    PoolBase(unsigned max_items_, Poco::Logger * log_, BehaviourOnLimit behaviour_on_limit_ = BehaviourOnLimit::Wait)
-        : max_items(max_items_), behaviour_on_limit(behaviour_on_limit_), log(log_)
+    PoolBase(unsigned max_items_, LoggerPtr log_)
+       : max_items(max_items_), log(log_)
     {
         items.reserve(max_items);
     }
diff --git a/src/Common/PoolWithFailoverBase.h b/src/Common/PoolWithFailoverBase.h
index f960d551996..8365e818840 100644
--- a/src/Common/PoolWithFailoverBase.h
+++ b/src/Common/PoolWithFailoverBase.h
@@ -30,6 +30,7 @@ namespace ProfileEvents
 {
     extern const Event DistributedConnectionFailTry;
     extern const Event DistributedConnectionFailAtAll;
+    extern const Event DistributedConnectionSkipReadOnlyReplica;
 }
 
 /// This class provides a pool with fault tolerance. It is used for pooling of connections to replicated DB.
@@ -58,7 +59,7 @@ public:
             NestedPools nested_pools_,
             time_t decrease_error_period_,
             size_t max_error_cap_,
-            Poco::Logger * log_)
+            LoggerPtr log_)
         : nested_pools(std::move(nested_pools_))
         , decrease_error_period(decrease_error_period_)
         , max_error_cap(max_error_cap_)
@@ -66,33 +67,22 @@ public:
         , log(log_)
     {
         for (size_t i = 0;i < nested_pools.size(); ++i)
-            shared_pool_states[i].config_priority = nested_pools[i]->getPriority();
+            shared_pool_states[i].config_priority = nested_pools[i]->getConfigPriority();
     }
 
     struct TryResult
     {
         TryResult() = default;
 
-        explicit TryResult(Entry entry_)
-            : entry(std::move(entry_))
-            , is_usable(true)
-            , is_up_to_date(true)
-        {
-        }
+        void reset() { *this = {}; }
 
-        void reset()
-        {
-            entry = Entry();
-            is_usable = false;
-            is_up_to_date = false;
-            staleness = 0.0;
-        }
-
-        Entry entry;
-        bool is_usable = false; /// If false, the entry is unusable for current request
-                                /// (but may be usable for other requests, so error counts are not incremented)
-        bool is_up_to_date = false; /// If true, the entry is a connection to up-to-date replica.
-        double staleness = 0.0; /// Helps choosing the "least stale" option when all replicas are stale.
+        Entry entry; /// use isNull() to check if connection is established
+        bool is_usable = false; /// if connection is established, then can be false only with table check
+                                /// if table is not present on remote peer, -> it'll be false
+        bool is_up_to_date = false; /// If true, the entry is a connection to up-to-date replica
+                                    /// Depends on max_replica_delay_for_distributed_queries setting
+        UInt32 delay = 0; /// Helps choosing the "least stale" option when all replicas are stale.
+        bool is_readonly = false;   /// Table is in read-only mode, INSERT can ignore such replicas.
     };
 
     struct PoolState;
@@ -101,7 +91,7 @@ public:
 
     struct ShuffledPool
     {
-        NestedPool * pool{};
+        NestedPoolPtr pool{};
         const PoolState * state{}; // WARNING: valid only during initial ordering, dangling
         size_t index = 0;
         size_t error_count = 0;
@@ -110,7 +100,7 @@ public:
 
     /// This functor must be provided by a client. It must perform a single try that takes a connection
     /// from the provided pool and checks that it is good.
-    using TryGetEntryFunc = std::function<TryResult(NestedPool & pool, std::string & fail_message)>;
+    using TryGetEntryFunc = std::function<TryResult(const NestedPoolPtr & pool, std::string & fail_message)>;
 
     /// The client can provide this functor to affect load balancing - the index of a pool is passed to
     /// this functor. The pools with lower result value will be tried first.
@@ -123,6 +113,7 @@ public:
             size_t min_entries, size_t max_entries, size_t max_tries,
             size_t max_ignored_errors,
             bool fallback_to_stale_replicas,
+            bool skip_read_only_replicas,
             const TryGetEntryFunc & try_get_entry,
             const GetPriorityFunc & get_priority);
 
@@ -139,7 +130,7 @@ protected:
 
     void updateErrorCounts(PoolStates & states, time_t & last_decrease_time) const;
 
-    std::vector<ShuffledPool> getShuffledPools(size_t max_ignored_errors, const GetPriorityFunc & get_priority);
+    std::vector<ShuffledPool> getShuffledPools(size_t max_ignored_errors, const GetPriorityFunc & get_priority, bool use_slowdown_count = false);
 
     inline void updateSharedErrorCounts(std::vector<ShuffledPool> & shuffled_pools);
 
@@ -159,14 +150,14 @@ protected:
     /// The time when error counts were last decreased.
     time_t last_error_decrease_time = 0;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
 template <typename TNestedPool>
 std::vector<typename PoolWithFailoverBase<TNestedPool>::ShuffledPool>
 PoolWithFailoverBase<TNestedPool>::getShuffledPools(
-    size_t max_ignored_errors, const PoolWithFailoverBase::GetPriorityFunc & get_priority)
+    size_t max_ignored_errors, const PoolWithFailoverBase::GetPriorityFunc & get_priority, bool use_slowdown_count)
 {
     /// Update random numbers and error counts.
     PoolStates pool_states = updatePoolStates(max_ignored_errors);
@@ -181,13 +172,13 @@ PoolWithFailoverBase<TNestedPool>::getShuffledPools(
     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, /* error_count = */ 0, /* slowdown_count = */ 0});
+        shuffled_pools.emplace_back(ShuffledPool{.pool = nested_pools[i], .state = &pool_states[i], .index = i});
 
     ::sort(
         shuffled_pools.begin(), shuffled_pools.end(),
-        [](const ShuffledPool & lhs, const ShuffledPool & rhs)
+        [use_slowdown_count](const ShuffledPool & lhs, const ShuffledPool & rhs)
         {
-            return PoolState::compare(*lhs.state, *rhs.state);
+            return PoolState::compare(*lhs.state, *rhs.state, use_slowdown_count);
         });
 
     return shuffled_pools;
@@ -211,8 +202,12 @@ PoolWithFailoverBase<TNestedPool>::get(size_t max_ignored_errors, bool fallback_
     const TryGetEntryFunc & try_get_entry, const GetPriorityFunc & get_priority)
 {
     std::vector<TryResult> results = getMany(
-        1 /* min entries */, 1 /* max entries */, 1 /* max tries */,
-        max_ignored_errors, fallback_to_stale_replicas,
+        /* min_entries= */ 1,
+        /* max_entries= */ 1,
+        /* max_tries= */ 1,
+        max_ignored_errors,
+        fallback_to_stale_replicas,
+        /* skip_read_only_replicas= */ false,
         try_get_entry, get_priority);
     if (results.empty() || results[0].entry.isNull())
         throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR,
@@ -226,6 +221,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
         size_t min_entries, size_t max_entries, size_t max_tries,
         size_t max_ignored_errors,
         bool fallback_to_stale_replicas,
+        bool skip_read_only_replicas,
         const TryGetEntryFunc & try_get_entry,
         const GetPriorityFunc & get_priority)
 {
@@ -267,7 +263,7 @@ PoolWithFailoverBase<TNestedPool>::getMany(
                 continue;
 
             std::string fail_message;
-            result = try_get_entry(*shuffled_pool.pool, fail_message);
+            result = try_get_entry(shuffled_pool.pool, fail_message);
 
             if (!fail_message.empty())
                 fail_messages += fail_message + '\n';
@@ -277,9 +273,14 @@ PoolWithFailoverBase<TNestedPool>::getMany(
                 ++entries_count;
                 if (result.is_usable)
                 {
-                    ++usable_count;
-                    if (result.is_up_to_date)
-                        ++up_to_date_count;
+                    if (skip_read_only_replicas && result.is_readonly)
+                        ProfileEvents::increment(ProfileEvents::DistributedConnectionSkipReadOnlyReplica);
+                    else
+                    {
+                        ++usable_count;
+                        if (result.is_up_to_date)
+                            ++up_to_date_count;
+                    }
                 }
             }
             else
@@ -302,15 +303,15 @@ PoolWithFailoverBase<TNestedPool>::getMany(
         throw DB::NetException(DB::ErrorCodes::ALL_CONNECTION_TRIES_FAILED,
                 "All connection tries failed. Log: \n\n{}\n", fail_messages);
 
-    std::erase_if(try_results, [](const TryResult & r) { return r.entry.isNull() || !r.is_usable; });
+    std::erase_if(try_results, [&](const TryResult & r) { return r.entry.isNull() || !r.is_usable || (skip_read_only_replicas && r.is_readonly); });
 
     /// Sort so that preferred items are near the beginning.
     std::stable_sort(
             try_results.begin(), try_results.end(),
             [](const TryResult & left, const TryResult & right)
             {
-                return std::forward_as_tuple(!left.is_up_to_date, left.staleness)
-                    < std::forward_as_tuple(!right.is_up_to_date, right.staleness);
+                return std::forward_as_tuple(!left.is_up_to_date, left.delay)
+                    < std::forward_as_tuple(!right.is_up_to_date, right.delay);
             });
 
     if (fallback_to_stale_replicas)
@@ -350,10 +351,14 @@ struct PoolWithFailoverBase<TNestedPool>::PoolState
         random = rng();
     }
 
-    static bool compare(const PoolState & lhs, const PoolState & rhs)
+    static bool compare(const PoolState & lhs, const PoolState & rhs, bool use_slowdown_count)
     {
-        return std::forward_as_tuple(lhs.error_count, lhs.slowdown_count, lhs.config_priority, lhs.priority, lhs.random)
-             < std::forward_as_tuple(rhs.error_count, rhs.slowdown_count, rhs.config_priority, rhs.priority, rhs.random);
+        if (use_slowdown_count)
+            return std::forward_as_tuple(lhs.error_count, lhs.slowdown_count, lhs.config_priority, lhs.priority, lhs.random)
+                < std::forward_as_tuple(rhs.error_count, rhs.slowdown_count, rhs.config_priority, rhs.priority, rhs.random);
+        else
+            return std::forward_as_tuple(lhs.error_count, lhs.config_priority, lhs.priority, lhs.random)
+                < std::forward_as_tuple(rhs.error_count, rhs.config_priority, rhs.priority, rhs.random);
     }
 
 private:
diff --git a/src/Common/ProfileEvents.cpp b/src/Common/ProfileEvents.cpp
index 8782f895f3f..33ccb4e9f02 100644
--- a/src/Common/ProfileEvents.cpp
+++ b/src/Common/ProfileEvents.cpp
@@ -4,10 +4,13 @@
 
 
 /// Available events. Add something here as you wish.
+/// If the event is generic (i.e. not server specific)
+/// it should be also added to src/Coordination/KeeperConstant.cpp
 #define APPLY_FOR_BUILTIN_EVENTS(M) \
     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(InitialQuery, "Same as Query, but only counts initial queries (see is_initial_query).")\
     M(QueriesWithSubqueries, "Count queries with all subqueries") \
     M(SelectQueriesWithSubqueries, "Count SELECT queries with all subqueries") \
     M(InsertQueriesWithSubqueries, "Count INSERT queries with all subqueries") \
@@ -60,6 +63,15 @@
     M(MarkCacheMisses, "Number of times an entry has not been found in the mark cache, so we had to load a mark file in memory, which is a costly operation, adding to query latency.") \
     M(QueryCacheHits, "Number of times a query result has been found in the query cache (and query computation was avoided). Only updated for SELECT queries with SETTING use_query_cache = 1.") \
     M(QueryCacheMisses, "Number of times a query result has not been found in the query cache (and required query computation). Only updated for SELECT queries with SETTING use_query_cache = 1.") \
+    /* Each page cache chunk access increments exactly one of the following 5 PageCacheChunk* counters. */ \
+    /* Something like hit rate: (PageCacheChunkShared + PageCacheChunkDataHits) / [sum of all 5]. */ \
+    M(PageCacheChunkMisses, "Number of times a chunk has not been found in the userspace page cache.") \
+    M(PageCacheChunkShared, "Number of times a chunk has been found in the userspace page cache, already in use by another thread.") \
+    M(PageCacheChunkDataHits, "Number of times a chunk has been found in the userspace page cache, not in use, with all pages intact.") \
+    M(PageCacheChunkDataPartialHits, "Number of times a chunk has been found in the userspace page cache, not in use, but some of its pages were evicted by the OS.") \
+    M(PageCacheChunkDataMisses, "Number of times a chunk has been found in the userspace page cache, not in use, but all its pages were evicted by the OS.") \
+    M(PageCacheBytesUnpinnedRoundedToPages, "Total size of populated pages in chunks that became evictable in PageCache. Rounded up to whole pages.") \
+    M(PageCacheBytesUnpinnedRoundedToHugePages, "See PageCacheBytesUnpinnedRoundedToPages, but rounded to huge pages. Use the ratio between the two as a measure of memory waste from using huge pages.") \
     M(CreatedReadBufferOrdinary, "Number of times ordinary read buffer was created for reading data (while choosing among other read methods).") \
     M(CreatedReadBufferDirectIO, "Number of times a read buffer with O_DIRECT was created for reading data (while choosing among other read methods).") \
     M(CreatedReadBufferDirectIOFailed, "Number of times a read buffer with O_DIRECT was attempted to be created for reading data (while choosing among other read methods), but the OS did not allow it (due to lack of filesystem support or other reasons) and we fallen back to the ordinary reading method.") \
@@ -89,6 +101,8 @@
     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(PartsWithAppliedMutationsOnFly, "Total number of parts for which there was any mutation applied on fly") \
+    M(MutationsAppliedOnFlyInAllParts, "The sum of number of applied mutations on-fly for part among all read parts") \
     \
     M(QueryMaskingRulesMatch, "Number of times query masking rules was successfully matched.") \
     \
@@ -142,6 +156,7 @@
     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(DistributedConnectionSkipReadOnlyReplica, "Number of replicas skipped during INSERT into Distributed table due to replicas being read-only") \
     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.") \
@@ -197,6 +212,15 @@
     M(MergeTreeDataWriterBlocks, "Number of blocks INSERTed to MergeTree tables. Each block forms a data part of level zero.") \
     M(MergeTreeDataWriterBlocksAlreadySorted, "Number of blocks INSERTed to MergeTree tables that appeared to be already sorted.") \
     \
+    M(MergeTreeDataWriterSkipIndicesCalculationMicroseconds, "Time spent calculating skip indices") \
+    M(MergeTreeDataWriterStatisticsCalculationMicroseconds, "Time spent calculating statistics") \
+    M(MergeTreeDataWriterSortingBlocksMicroseconds, "Time spent sorting blocks") \
+    M(MergeTreeDataWriterMergingBlocksMicroseconds, "Time spent merging input blocks (for special MergeTree engines)") \
+    M(MergeTreeDataWriterProjectionsCalculationMicroseconds, "Time spent calculating projections") \
+    M(MergeTreeDataProjectionWriterSortingBlocksMicroseconds, "Time spent sorting blocks (for projection it might be a key different from table's sorting key)") \
+    M(MergeTreeDataProjectionWriterMergingBlocksMicroseconds, "Time spent merging blocks") \
+    M(MutateTaskProjectionsCalculationMicroseconds, "Time spent calculating projections") \
+    \
     M(InsertedWideParts, "Number of parts inserted in Wide format.") \
     M(InsertedCompactParts, "Number of parts inserted in Compact format.") \
     M(MergedIntoWideParts, "Number of parts merged into Wide format.") \
@@ -299,8 +323,14 @@ The server successfully detected this situation and will download merged part fr
     M(ParallelReplicasProcessingPartsMicroseconds, "Time spent processing data parts") \
     M(ParallelReplicasStealingLeftoversMicroseconds, "Time spent collecting orphaned segments") \
     M(ParallelReplicasCollectingOwnedSegmentsMicroseconds, "Time spent collecting segments meant by hash") \
+    M(ParallelReplicasNumRequests, "Number of requests to the initiator.") \
+    M(ParallelReplicasDeniedRequests, "Number of completely denied requests to the initiator") \
+    M(CacheWarmerBytesDownloaded, "Amount of data fetched into filesystem cache by dedicated background threads.") \
+    M(CacheWarmerDataPartsDownloaded, "Number of data parts that were fully fetched by CacheWarmer.") \
+    M(IgnoredColdParts, "See setting ignore_cold_parts_seconds. Number of times read queries ignored very new parts that weren't pulled into cache by CacheWarmer yet.") \
+    M(PreferredWarmedUnmergedParts, "See setting prefer_warmed_unmerged_parts_seconds. Number of times read queries used outdated pre-merge parts that are in cache instead of merged part that wasn't pulled into cache by CacheWarmer yet.") \
     \
-    M(PerfCpuCycles, "Total cycles. Be wary of what happens during CPU frequency scaling.")  \
+    M(PerfCPUCycles, "Total cycles. Be wary of what happens during CPU frequency scaling.")  \
     M(PerfInstructions, "Retired instructions. Be careful, these can be affected by various issues, most notably hardware interrupt counts.") \
     M(PerfCacheReferences, "Cache accesses. Usually, this indicates Last Level Cache accesses, but this may vary depending on your CPU. This may include prefetches and coherency messages; again this depends on the design of your CPU.") \
     M(PerfCacheMisses, "Cache misses. Usually this indicates Last Level Cache misses; this is intended to be used in conjunction with the PERFCOUNTHWCACHEREFERENCES event to calculate cache miss rates.") \
@@ -309,12 +339,12 @@ The server successfully detected this situation and will download merged part fr
     M(PerfBusCycles, "Bus cycles, which can be different from total cycles.") \
     M(PerfStalledCyclesFrontend, "Stalled cycles during issue.") \
     M(PerfStalledCyclesBackend, "Stalled cycles during retirement.") \
-    M(PerfRefCpuCycles, "Total cycles; not affected by CPU frequency scaling.") \
+    M(PerfRefCPUCycles, "Total cycles; not affected by CPU frequency scaling.") \
     \
-    M(PerfCpuClock, "The CPU clock, a high-resolution per-CPU timer") \
+    M(PerfCPUClock, "The CPU clock, a high-resolution per-CPU timer") \
     M(PerfTaskClock, "A clock count specific to the task that is running") \
     M(PerfContextSwitches, "Number of context switches") \
-    M(PerfCpuMigrations, "Number of times the process has migrated to a new CPU") \
+    M(PerfCPUMigrations, "Number of times the process has migrated to a new CPU") \
     M(PerfAlignmentFaults, "Number of alignment faults. These happen when unaligned memory accesses happen; the kernel can handle these but it reduces performance. This happens only on some architectures (never on x86).") \
     M(PerfEmulationFaults, "Number of emulation faults. The kernel sometimes traps on unimplemented instructions and emulates them for user space. This can negatively impact performance.") \
     M(PerfMinEnabledTime, "For all events, minimum time that an event was enabled. Used to track event multiplexing influence") \
@@ -326,8 +356,6 @@ The server successfully detected this situation and will download merged part fr
     M(PerfLocalMemoryReferences, "Local NUMA node memory reads") \
     M(PerfLocalMemoryMisses, "Local NUMA node memory read misses") \
     \
-    M(CreatedHTTPConnections, "Total amount of created HTTP connections (counter increase every time connection is created).") \
-    \
     M(CannotWriteToWriteBufferDiscard, "Number of stack traces dropped by query profiler or signal handler because pipe is full or cannot write to pipe.") \
     M(QueryProfilerSignalOverruns, "Number of times we drop processing of a query profiler signal due to overrun plus the number of signals that OS has not delivered due to overrun.") \
     M(QueryProfilerConcurrencyOverruns, "Number of times we drop processing of a query profiler signal due to too many concurrent query profilers in other threads, which may indicate overload.") \
@@ -375,6 +403,10 @@ The server successfully detected this situation and will download merged part fr
     M(S3PutObject, "Number of S3 API PutObject calls.") \
     M(S3GetObject, "Number of S3 API GetObject calls.") \
     \
+    M(AzureUploadPart, "Number of Azure blob storage API UploadPart calls") \
+    M(DiskAzureUploadPart, "Number of Disk Azure blob storage API UploadPart calls") \
+    M(AzureCopyObject, "Number of Azure blob storage API CopyObject calls") \
+    M(DiskAzureCopyObject, "Number of Disk Azure blob storage API CopyObject calls") \
     M(AzureDeleteObjects, "Number of Azure blob storage API DeleteObject(s) calls.") \
     M(AzureListObjects, "Number of Azure blob storage API ListObjects calls.") \
     \
@@ -403,8 +435,6 @@ The server successfully detected this situation and will download merged part fr
     M(ReadBufferFromS3ResetSessions, "Number of HTTP sessions that were reset in ReadBufferFromS3.") \
     M(ReadBufferFromS3PreservedSessions, "Number of HTTP sessions that were preserved in ReadBufferFromS3.") \
     \
-    M(ReadWriteBufferFromHTTPPreservedSessions, "Number of HTTP sessions that were preserved in ReadWriteBufferFromHTTP.") \
-    \
     M(WriteBufferFromS3Microseconds, "Time spent on writing to S3.") \
     M(WriteBufferFromS3Bytes, "Bytes written to S3.") \
     M(WriteBufferFromS3RequestsErrors, "Number of exceptions while writing to S3.") \
@@ -426,7 +456,8 @@ The server successfully detected this situation and will download merged part fr
     M(FilesystemCacheLoadMetadataMicroseconds, "Time spent loading filesystem cache metadata") \
     M(FilesystemCacheEvictedBytes, "Number of bytes evicted from filesystem cache") \
     M(FilesystemCacheEvictedFileSegments, "Number of file segments evicted from filesystem cache") \
-    M(FilesystemCacheEvictionSkippedFileSegments, "Number of file segments skipped for eviction because of being unreleasable") \
+    M(FilesystemCacheEvictionSkippedFileSegments, "Number of file segments skipped for eviction because of being in unreleasable state") \
+    M(FilesystemCacheEvictionSkippedEvictingFileSegments, "Number of file segments skipped for eviction because of being in evicting state") \
     M(FilesystemCacheEvictionTries, "Number of filesystem cache eviction attempts") \
     M(FilesystemCacheLockKeyMicroseconds, "Lock cache key time") \
     M(FilesystemCacheLockMetadataMicroseconds, "Lock filesystem cache metadata time") \
@@ -442,6 +473,8 @@ The server successfully detected this situation and will download merged part fr
     M(FileSegmentUseMicroseconds, "File segment use() time") \
     M(FileSegmentRemoveMicroseconds, "File segment remove() time") \
     M(FileSegmentHolderCompleteMicroseconds, "File segments holder complete() time") \
+    M(FileSegmentFailToIncreasePriority, "Number of times the priority was not increased due to a high contention on the cache lock") \
+    M(FilesystemCacheFailToReserveSpaceBecauseOfLockContention, "Number of times space reservation was skipped due to a high contention on the cache lock") \
     M(FilesystemCacheHoldFileSegments, "Filesystem cache file segments count, which were hold") \
     M(FilesystemCacheUnusedHoldFileSegments, "Filesystem cache file segments count, which were hold, but not used (because of seek or LIMIT n, etc)") \
     \
@@ -499,6 +532,22 @@ The server successfully detected this situation and will download merged part fr
     \
     M(AggregationPreallocatedElementsInHashTables, "How many elements were preallocated in hash tables for aggregation.") \
     M(AggregationHashTablesInitializedAsTwoLevel, "How many hash tables were inited as two-level for aggregation.") \
+    M(AggregationOptimizedEqualRangesOfKeys, "For how many blocks optimization of equal ranges of keys was applied") \
+    \
+    M(MetadataFromKeeperCacheHit, "Number of times an object storage metadata request was answered from cache without making request to Keeper") \
+    M(MetadataFromKeeperCacheMiss, "Number of times an object storage metadata request had to be answered from Keeper") \
+    M(MetadataFromKeeperCacheUpdateMicroseconds, "Total time spent in updating the cache including waiting for responses from Keeper") \
+    M(MetadataFromKeeperUpdateCacheOneLevel, "Number of times a cache update for one level of directory tree was done") \
+    M(MetadataFromKeeperTransactionCommit, "Number of times metadata transaction commit was attempted") \
+    M(MetadataFromKeeperTransactionCommitRetry, "Number of times metadata transaction commit was retried") \
+    M(MetadataFromKeeperCleanupTransactionCommit, "Number of times metadata transaction commit for deleted objects cleanup was attempted") \
+    M(MetadataFromKeeperCleanupTransactionCommitRetry, "Number of times metadata transaction commit for deleted objects cleanup was retried") \
+    M(MetadataFromKeeperOperations, "Number of times a request was made to Keeper") \
+    M(MetadataFromKeeperIndividualOperations, "Number of paths read or written by single or multi requests to Keeper") \
+    M(MetadataFromKeeperReconnects, "Number of times a reconnect to Keeper was done") \
+    M(MetadataFromKeeperBackgroundCleanupObjects, "Number of times a old deleted object clean up was performed by background task") \
+    M(MetadataFromKeeperBackgroundCleanupTransactions, "Number of times old transaction idempotency token was cleaned up by background task") \
+    M(MetadataFromKeeperBackgroundCleanupErrors, "Number of times an error was encountered in background cleanup task") \
     \
     M(KafkaRebalanceRevocations, "Number of partition revocations (the first stage of consumer group rebalance)") \
     M(KafkaRebalanceAssignments, "Number of partition assignments (the final stage of consumer group rebalance)") \
@@ -591,9 +640,32 @@ The server successfully detected this situation and will download merged part fr
     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(AsyncLoaderWaitMicroseconds, "Total time a query was waiting for async loader jobs.") \
     \
+    M(DistrCacheServerSwitches, "Number of server switches between distributed cache servers in read/write-through cache") \
+    M(DistrCacheReadMicroseconds, "Time spent reading from distributed cache") \
+    M(DistrCacheFallbackReadMicroseconds, "Time spend reading from fallback buffer instead of distribted cache") \
+    M(DistrCachePrecomputeRangesMicroseconds, "Time spent to precompute read ranges") \
+    M(DistrCacheNextImplMicroseconds, "Time spend in ReadBufferFromDistributedCache::nextImpl") \
+    M(DistrCacheOpenedConnections, "The number of open connections to distributed cache") \
+    M(DistrCacheReusedConnections, "The number of reused connections to distributed cache") \
+    M(DistrCacheHoldConnections, "The number of used connections to distributed cache") \
+    \
+    M(DistrCacheGetResponseMicroseconds, "Time spend to wait for response from distributed cache") \
+    M(DistrCacheStartRangeMicroseconds, "Time spent to start a new read range with distributed cache") \
+    M(DistrCacheLockRegistryMicroseconds, "Time spent to take DistributedCacheRegistry lock") \
+    M(DistrCacheUnusedPackets, "Number of skipped unused packets from distributed cache") \
+    M(DistrCachePackets, "Total number of packets received from distributed cache") \
+    M(DistrCacheUnusedPacketsBytes, "The number of bytes in Data packets which were ignored") \
+    M(DistrCacheRegistryUpdateMicroseconds, "Time spent updating distributed cache registry") \
+    M(DistrCacheRegistryUpdates, "Number of distributed cache registry updates") \
+    \
+    M(DistrCacheConnectMicroseconds, "The time spent to connect to distributed cache") \
+    M(DistrCacheConnectAttempts, "The number of connection attempts to distributed cache") \
+    M(DistrCacheGetClient, "Number of client access times") \
+    \
+    M(DistrCacheServerProcessRequestMicroseconds, "Time spent processing request on DistributedCache server side") \
+    \
     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") \
@@ -616,6 +688,46 @@ The server successfully detected this situation and will download merged part fr
     M(InterfacePostgreSQLReceiveBytes, "Number of bytes received through PostgreSQL interfaces") \
     \
     M(ParallelReplicasUsedCount, "Number of replicas used to execute a query with task-based parallel replicas") \
+    \
+    M(KeeperLogsEntryReadFromLatestCache, "Number of log entries in Keeper being read from latest logs cache") \
+    M(KeeperLogsEntryReadFromCommitCache, "Number of log entries in Keeper being read from commit logs cache") \
+    M(KeeperLogsEntryReadFromFile, "Number of log entries in Keeper being read directly from the changelog file") \
+    M(KeeperLogsPrefetchedEntries, "Number of log entries in Keeper being prefetched from the changelog file") \
+    \
+    M(ParallelReplicasAvailableCount, "Number of replicas available to execute a query with task-based parallel replicas") \
+    M(ParallelReplicasUnavailableCount, "Number of replicas which was chosen, but found to be unavailable during query execution with task-based parallel replicas") \
+    \
+    M(StorageConnectionsCreated, "Number of created connections for storages") \
+    M(StorageConnectionsReused, "Number of reused connections for storages") \
+    M(StorageConnectionsReset, "Number of reset connections for storages") \
+    M(StorageConnectionsPreserved, "Number of preserved connections for storages") \
+    M(StorageConnectionsExpired, "Number of expired connections for storages") \
+    M(StorageConnectionsErrors, "Number of cases when creation of a connection for storage is failed") \
+    M(StorageConnectionsElapsedMicroseconds, "Total time spend on creating connections for storages")                                                                                                                                                                                                                                               \
+    \
+    M(DiskConnectionsCreated, "Number of created connections for disk") \
+    M(DiskConnectionsReused, "Number of reused connections for disk") \
+    M(DiskConnectionsReset, "Number of reset connections for disk") \
+    M(DiskConnectionsPreserved, "Number of preserved connections for disk") \
+    M(DiskConnectionsExpired, "Number of expired connections for disk") \
+    M(DiskConnectionsErrors, "Number of cases when creation of a connection for disk is failed") \
+    M(DiskConnectionsElapsedMicroseconds, "Total time spend on creating connections for disk") \
+    \
+    M(HTTPConnectionsCreated, "Number of created http connections") \
+    M(HTTPConnectionsReused, "Number of reused http connections") \
+    M(HTTPConnectionsReset, "Number of reset http connections") \
+    M(HTTPConnectionsPreserved, "Number of preserved http connections") \
+    M(HTTPConnectionsExpired, "Number of expired http connections") \
+    M(HTTPConnectionsErrors, "Number of cases when creation of a http connection failed") \
+    M(HTTPConnectionsElapsedMicroseconds, "Total time spend on creating http connections") \
+    \
+    M(AddressesDiscovered, "Total count of new addresses in dns resolve results for http connections") \
+    M(AddressesExpired, "Total count of expired addresses which is no longer presented in dns resolve results for http connections") \
+    M(AddressesMarkedAsFailed, "Total count of addresses which has been marked as faulty due to connection errors for http connections") \
+    \
+    M(ReadWriteBufferFromHTTPRequestsSent, "Number of HTTP requests sent by ReadWriteBufferFromHTTP") \
+    M(ReadWriteBufferFromHTTPBytes, "Total size of payload bytes received and sent by ReadWriteBufferFromHTTP. Doesn't include HTTP headers.") \
+
 
 #ifdef APPLY_FOR_EXTERNAL_EVENTS
     #define APPLY_FOR_EVENTS(M) APPLY_FOR_BUILTIN_EVENTS(M) APPLY_FOR_EXTERNAL_EVENTS(M)
diff --git a/src/Common/ProfileEventsScope.cpp b/src/Common/ProfileEventsScope.cpp
index 92f75f4f5b0..1ba5f7f165c 100644
--- a/src/Common/ProfileEventsScope.cpp
+++ b/src/Common/ProfileEventsScope.cpp
@@ -1,3 +1,4 @@
+#include <Common/CurrentThread.h>
 #include <Common/ProfileEventsScope.h>
 
 namespace DB
diff --git a/src/Common/ProfileEventsScope.h b/src/Common/ProfileEventsScope.h
index 0444531d02b..8eabfcb55c0 100644
--- a/src/Common/ProfileEventsScope.h
+++ b/src/Common/ProfileEventsScope.h
@@ -1,7 +1,8 @@
 #pragma once
 
 #include <Common/ProfileEvents.h>
-#include <Common/CurrentThread.h>
+
+#include <boost/noncopyable.hpp>
 
 namespace DB
 {
diff --git a/src/Common/ProxyConfiguration.h b/src/Common/ProxyConfiguration.h
index 53e569bf6e4..289ae2b6813 100644
--- a/src/Common/ProxyConfiguration.h
+++ b/src/Common/ProxyConfiguration.h
@@ -44,11 +44,13 @@ struct ProxyConfiguration
         }
     }
 
-    std::string host;
-    Protocol protocol;
-    uint16_t port;
-    bool tunneling;
-    Protocol original_request_protocol;
+    std::string host = std::string{};
+    Protocol protocol = Protocol::HTTP;
+    uint16_t port = 0;
+    bool tunneling = false;
+    Protocol original_request_protocol = Protocol::HTTP;
+
+    bool isEmpty() const { return host.empty(); }
 };
 
 }
diff --git a/src/Common/ProxyConfigurationResolverProvider.cpp b/src/Common/ProxyConfigurationResolverProvider.cpp
index 96ebb934643..d15b4d98615 100644
--- a/src/Common/ProxyConfigurationResolverProvider.cpp
+++ b/src/Common/ProxyConfigurationResolverProvider.cpp
@@ -36,7 +36,7 @@ namespace
         auto proxy_port = configuration.getUInt(resolver_prefix + ".proxy_port");
         auto cache_ttl = configuration.getUInt(resolver_prefix + ".proxy_cache_time", 10);
 
-        LOG_DEBUG(&Poco::Logger::get("ProxyConfigurationResolverProvider"), "Configured remote proxy resolver: {}, Scheme: {}, Port: {}",
+        LOG_DEBUG(getLogger("ProxyConfigurationResolverProvider"), "Configured remote proxy resolver: {}, Scheme: {}, Port: {}",
                   endpoint.toString(), proxy_scheme, proxy_port);
 
         auto server_configuration = RemoteProxyConfigurationResolver::RemoteServerConfiguration {
@@ -71,7 +71,7 @@ namespace
 
                 uris.push_back(proxy_uri);
 
-                LOG_DEBUG(&Poco::Logger::get("ProxyConfigurationResolverProvider"), "Configured proxy: {}", proxy_uri.toString());
+                LOG_DEBUG(getLogger("ProxyConfigurationResolverProvider"), "Configured proxy: {}", proxy_uri.toString());
             }
         }
 
diff --git a/src/Common/ProxyListConfigurationResolver.cpp b/src/Common/ProxyListConfigurationResolver.cpp
index 68d676643d6..c9b8923929a 100644
--- a/src/Common/ProxyListConfigurationResolver.cpp
+++ b/src/Common/ProxyListConfigurationResolver.cpp
@@ -26,8 +26,6 @@ ProxyConfiguration ProxyListConfigurationResolver::resolve()
 
     auto & proxy = proxies[index];
 
-    LOG_DEBUG(&Poco::Logger::get("ProxyListConfigurationResolver"), "Use proxy: {}", proxies[index].toString());
-
     return ProxyConfiguration {
         proxy.getHost(),
         ProxyConfiguration::protocolFromString(proxy.getScheme()),
diff --git a/src/Common/ProxyListConfigurationResolver.h b/src/Common/ProxyListConfigurationResolver.h
index 01e8d50c79d..95e0073d779 100644
--- a/src/Common/ProxyListConfigurationResolver.h
+++ b/src/Common/ProxyListConfigurationResolver.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <atomic>
 #include <base/types.h>
 
 #include <Common/ProxyConfigurationResolver.h>
diff --git a/src/Common/QueryProfiler.cpp b/src/Common/QueryProfiler.cpp
index 16c8d4e223f..ca79b9433b5 100644
--- a/src/Common/QueryProfiler.cpp
+++ b/src/Common/QueryProfiler.cpp
@@ -1,15 +1,16 @@
 #include "QueryProfiler.h"
 
 #include <IO/WriteHelpers.h>
-#include <Common/TraceSender.h>
+#include <base/defines.h>
+#include <base/errnoToString.h>
+#include <base/phdr_cache.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
+#include <Common/MemoryTracker.h>
 #include <Common/StackTrace.h>
-#include <Common/thread_local_rng.h>
+#include <Common/TraceSender.h>
 #include <Common/logger_useful.h>
-#include <base/defines.h>
-#include <base/phdr_cache.h>
-#include <base/errnoToString.h>
+#include <Common/thread_local_rng.h>
 
 #include <random>
 
@@ -105,7 +106,7 @@ namespace ErrorCodes
 
 #ifndef __APPLE__
 Timer::Timer()
-    : log(&Poco::Logger::get("Timer"))
+    : log(getLogger("Timer"))
 {}
 
 void Timer::createIfNecessary(UInt64 thread_id, int clock_type, int pause_signal)
@@ -210,23 +211,13 @@ void Timer::cleanup()
 #endif
 
 template <typename ProfilerImpl>
-QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(UInt64 thread_id, int clock_type, UInt32 period, int pause_signal_)
-    : log(&Poco::Logger::get("QueryProfiler"))
+QueryProfilerBase<ProfilerImpl>::QueryProfilerBase([[maybe_unused]] UInt64 thread_id, [[maybe_unused]] int clock_type, [[maybe_unused]] UInt32 period, [[maybe_unused]] int pause_signal_)
+    : log(getLogger("QueryProfiler"))
     , pause_signal(pause_signal_)
 {
 #if defined(SANITIZER)
-    UNUSED(thread_id);
-    UNUSED(clock_type);
-    UNUSED(period);
-    UNUSED(pause_signal);
-
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "QueryProfiler disabled because they cannot work under sanitizers");
 #elif defined(__APPLE__)
-    UNUSED(thread_id);
-    UNUSED(clock_type);
-    UNUSED(period);
-    UNUSED(pause_signal);
-
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "QueryProfiler cannot work on OSX");
 #else
     /// Sanity check.
@@ -260,6 +251,20 @@ QueryProfilerBase<ProfilerImpl>::QueryProfilerBase(UInt64 thread_id, int clock_t
 #endif
 }
 
+
+template <typename ProfilerImpl>
+void QueryProfilerBase<ProfilerImpl>::setPeriod([[maybe_unused]] UInt32 period_)
+{
+#if defined(SANITIZER)
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "QueryProfiler disabled because they cannot work under sanitizers");
+#elif defined(__APPLE__)
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "QueryProfiler cannot work on OSX");
+#else
+    timer.set(period_);
+#endif
+
+}
+
 template <typename ProfilerImpl>
 QueryProfilerBase<ProfilerImpl>::~QueryProfilerBase()
 {
diff --git a/src/Common/QueryProfiler.h b/src/Common/QueryProfiler.h
index 87432a4b699..ea4cc73bca6 100644
--- a/src/Common/QueryProfiler.h
+++ b/src/Common/QueryProfiler.h
@@ -7,6 +7,8 @@
 
 #include "config.h"
 
+#include <Common/Logger.h>
+
 
 namespace Poco
 {
@@ -43,7 +45,7 @@ public:
     void cleanup();
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     std::optional<timer_t> timer_id;
 };
 #endif
@@ -55,10 +57,12 @@ public:
     QueryProfilerBase(UInt64 thread_id, int clock_type, UInt32 period, int pause_signal_);
     ~QueryProfilerBase();
 
+    void setPeriod(UInt32 period_);
+
 private:
     void cleanup();
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
 #ifndef __APPLE__
     inline static thread_local Timer timer = Timer();
diff --git a/src/Common/RadixSort.h b/src/Common/RadixSort.h
index 739bec8d9dd..a30e19d8212 100644
--- a/src/Common/RadixSort.h
+++ b/src/Common/RadixSort.h
@@ -15,6 +15,7 @@
 
 #include <base/bit_cast.h>
 #include <base/extended_types.h>
+#include <base/sort.h>
 #include <Core/Defines.h>
 
 
@@ -114,6 +115,11 @@ struct RadixSortFloatTraits
     {
         return x < y;
     }
+
+    static bool greater(Key x, Key y)
+    {
+        return x > y;
+    }
 };
 
 
@@ -148,6 +154,11 @@ struct RadixSortUIntTraits
     {
         return x < y;
     }
+
+    static bool greater(Key x, Key y)
+    {
+        return x > y;
+    }
 };
 
 
@@ -182,6 +193,11 @@ struct RadixSortIntTraits
     {
         return x < y;
     }
+
+    static bool greater(Key x, Key y)
+    {
+        return x > y;
+    }
 };
 
 
@@ -214,6 +230,22 @@ private:
     static KeyBits keyToBits(Key x) { return bit_cast<KeyBits>(x); }
     static Key bitsToKey(KeyBits x) { return bit_cast<Key>(x); }
 
+    struct LessComparator
+    {
+        ALWAYS_INLINE bool operator()(Element & lhs, Element & rhs)
+        {
+            return Traits::less(Traits::extractKey(lhs), Traits::extractKey(rhs));
+        }
+    };
+
+    struct GreaterComparator
+    {
+        ALWAYS_INLINE bool operator()(Element & lhs, Element & rhs)
+        {
+            return Traits::greater(Traits::extractKey(lhs), Traits::extractKey(rhs));
+        }
+    };
+
     static ALWAYS_INLINE KeyBits getPart(size_t N, KeyBits x)
     {
         if (Traits::Transform::transform_is_simple)
@@ -504,6 +536,24 @@ private:
             radixSortMSDInternal<PASS>(arr, size, limit);
     }
 
+    template <bool DIRECT_WRITE_TO_DESTINATION, typename Comparator>
+    static void executeLSDWithTrySortInternal(Element * arr, size_t size, bool reverse, Comparator comparator, Result * destination)
+    {
+        bool try_sort = ::trySort(arr, arr + size, comparator);
+        if (try_sort)
+        {
+            if constexpr (DIRECT_WRITE_TO_DESTINATION)
+            {
+                for (size_t i = 0; i < size; ++i)
+                    destination[i] = Traits::extractResult(arr[i]);
+            }
+
+            return;
+        }
+
+        radixSortLSDInternal<DIRECT_WRITE_TO_DESTINATION>(arr, size, reverse, destination);
+    }
+
 public:
     /** Least significant digit radix sort (stable).
       * This function will sort inplace (modify 'arr')
@@ -529,6 +579,38 @@ public:
         radixSortLSDInternal<true>(arr, size, reverse, destination);
     }
 
+    /** Tries to fast sort elements for common sorting patterns (unstable).
+      * If fast sort cannot be performed, execute least significant digit radix sort.
+      */
+    static void executeLSDWithTrySort(Element * arr, size_t size)
+    {
+        return executeLSDWithTrySort(arr, size, false);
+    }
+
+    static void executeLSDWithTrySort(Element * arr, size_t size, bool reverse)
+    {
+        return executeLSDWithTrySort(arr, size, reverse, nullptr);
+    }
+
+    static void executeLSDWithTrySort(Element * arr, size_t size, bool reverse, Result * destination)
+    {
+        if (reverse)
+        {
+
+            if (destination)
+                return executeLSDWithTrySortInternal<true>(arr, size, reverse, GreaterComparator(), destination);
+            else
+                return executeLSDWithTrySortInternal<false>(arr, size, reverse, GreaterComparator(), destination);
+        }
+        else
+        {
+            if (destination)
+                return executeLSDWithTrySortInternal<true>(arr, size, reverse, LessComparator(), destination);
+            else
+                return executeLSDWithTrySortInternal<false>(arr, size, reverse, LessComparator(), destination);
+        }
+    }
+
     /* Most significant digit radix sort
      * Is not stable, but allows partial sorting.
      * And it's more cache-friendly and usually faster than LSD variant.
diff --git a/src/Common/RemoteProxyConfigurationResolver.cpp b/src/Common/RemoteProxyConfigurationResolver.cpp
index 0650637d9e8..ef972a8e318 100644
--- a/src/Common/RemoteProxyConfigurationResolver.cpp
+++ b/src/Common/RemoteProxyConfigurationResolver.cpp
@@ -27,7 +27,7 @@ RemoteProxyConfigurationResolver::RemoteProxyConfigurationResolver(
 
 ProxyConfiguration RemoteProxyConfigurationResolver::resolve()
 {
-    auto * logger = &Poco::Logger::get("RemoteProxyConfigurationResolver");
+    auto logger = getLogger("RemoteProxyConfigurationResolver");
 
     auto & [endpoint, proxy_protocol, proxy_port, cache_ttl_] = remote_server_configuration;
 
@@ -50,11 +50,10 @@ ProxyConfiguration RemoteProxyConfigurationResolver::resolve()
 
     /// 1 second is enough for now.
     /// TODO: Make timeouts configurable.
-    ConnectionTimeouts timeouts(
-        Poco::Timespan(1000000), /// Connection timeout.
-        Poco::Timespan(1000000), /// Send timeout.
-        Poco::Timespan(1000000)  /// Receive timeout.
-    );
+    auto timeouts = ConnectionTimeouts()
+        .withConnectionTimeout(1)
+        .withSendTimeout(1)
+        .withReceiveTimeout(1);
 
     try
     {
@@ -70,7 +69,7 @@ ProxyConfiguration RemoteProxyConfigurationResolver::resolve()
         {
             auto resolved_endpoint = endpoint;
             resolved_endpoint.setHost(resolved_hosts[i].toString());
-            session = makeHTTPSession(resolved_endpoint, timeouts);
+            session = makeHTTPSession(HTTPConnectionGroupType::HTTP, resolved_endpoint, timeouts);
 
             try
             {
diff --git a/src/Common/SSH/Wrappers.cpp b/src/Common/SSHWrapper.cpp
similarity index 62%
rename from src/Common/SSH/Wrappers.cpp
rename to src/Common/SSHWrapper.cpp
index b38dd1f4036..0ed266f215c 100644
--- a/src/Common/SSH/Wrappers.cpp
+++ b/src/Common/SSHWrapper.cpp
@@ -1,14 +1,23 @@
-#include <Common/SSH/Wrappers.h>
-# if USE_SSL
+#include <Common/SSHWrapper.h>
+
+# if USE_SSH
 #    include <stdexcept>
 
-#    pragma GCC diagnostic push
-#    pragma GCC diagnostic ignored "-Wreserved-macro-identifier"
-#    pragma GCC diagnostic ignored "-Wreserved-identifier"
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wreserved-macro-identifier"
+#    pragma clang diagnostic ignored "-Wreserved-identifier"
 
 #    include <libssh/libssh.h>
 
-#    pragma GCC diagnostic pop
+#    pragma clang diagnostic pop
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LIBSSH_ERROR;
+}
 
 namespace
 {
@@ -18,17 +27,19 @@ class SSHString
 public:
     explicit SSHString(std::string_view input)
     {
-        string = ssh_string_new(input.size());
-        ssh_string_fill(string, input.data(), input.size());
+        if (string = ssh_string_new(input.size()); string == nullptr)
+            throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't create SSHString");
+        if (int rc = ssh_string_fill(string, input.data(), input.size()); rc != SSH_OK)
+            throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't create SSHString");
     }
 
-    explicit SSHString(ssh_string c_other) { string = c_other; }
+    explicit SSHString(ssh_string other) { string = other; }
 
     ssh_string get() { return string; }
 
     String toString()
     {
-        return String(ssh_string_get_char(string), ssh_string_len(string));
+        return {ssh_string_get_char(string), ssh_string_len(string)};
     }
 
     ~SSHString()
@@ -42,46 +53,28 @@ private:
 
 }
 
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LIBSSH_ERROR;
-}
-
-namespace ssh
-{
-
-SSHKey SSHKeyFactory::makePrivateFromFile(String filename, String passphrase)
+SSHKey SSHKeyFactory::makePrivateKeyFromFile(String filename, String passphrase)
 {
     ssh_key key;
-    int rc = ssh_pki_import_privkey_file(filename.c_str(), passphrase.c_str(), nullptr, nullptr, &key);
-    if (rc != SSH_OK)
-    {
+    if (int rc = ssh_pki_import_privkey_file(filename.c_str(), passphrase.c_str(), nullptr, nullptr, &key); rc != SSH_OK)
         throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't import SSH private key from file");
-    }
     return SSHKey(key);
 }
 
-SSHKey SSHKeyFactory::makePublicFromFile(String filename)
+SSHKey SSHKeyFactory::makePublicKeyFromFile(String filename)
 {
     ssh_key key;
-    int rc = ssh_pki_import_pubkey_file(filename.c_str(), &key);
-    if (rc != SSH_OK)
+    if (int rc = ssh_pki_import_pubkey_file(filename.c_str(), &key); rc != SSH_OK)
         throw Exception(ErrorCodes::LIBSSH_ERROR, "Can't import SSH public key from file");
-
     return SSHKey(key);
 }
 
-SSHKey SSHKeyFactory::makePublicFromBase64(String base64_key, String type_name)
+SSHKey SSHKeyFactory::makePublicKeyFromBase64(String base64_key, String type_name)
 {
     ssh_key key;
     auto key_type = ssh_key_type_from_name(type_name.c_str());
-    int rc = ssh_pki_import_pubkey_base64(base64_key.c_str(), key_type, &key);
-    if (rc != SSH_OK)
+    if (int rc = ssh_pki_import_pubkey_base64(base64_key.c_str(), key_type, &key); rc != SSH_OK)
         throw Exception(ErrorCodes::LIBSSH_ERROR, "Bad SSH public key provided");
-
     return SSHKey(key);
 }
 
@@ -90,6 +83,12 @@ SSHKey::SSHKey(const SSHKey & other)
     key = ssh_key_dup(other.key);
 }
 
+SSHKey::SSHKey(SSHKey && other) noexcept
+{
+    key = other.key;
+    other.key = nullptr;
+}
+
 SSHKey & SSHKey::operator=(const SSHKey & other)
 {
     ssh_key_free(key);
@@ -119,13 +118,11 @@ bool SSHKey::isEqual(const SSHKey & other) const
 String SSHKey::signString(std::string_view input) const
 {
     SSHString input_str(input);
-    ssh_string c_output = nullptr;
-    int rc = pki_sign_string(key, input_str.get(), &c_output);
-    if (rc != SSH_OK)
+    ssh_string output = nullptr;
+    if (int rc = pki_sign_string(key, input_str.get(), &output); rc != SSH_OK)
         throw Exception(ErrorCodes::LIBSSH_ERROR, "Error singing with ssh key");
-
-    SSHString output(c_output);
-    return output.toString();
+    SSHString output_str(output);
+    return output_str.toString();
 }
 
 bool SSHKey::verifySignature(std::string_view signature, std::string_view original) const
@@ -149,18 +146,15 @@ namespace
 {
     struct CStringDeleter
     {
-        [[maybe_unused]] void operator()(char * ptr) const { std::free(ptr); }
+        void operator()(char * ptr) const { std::free(ptr); }
     };
 }
 
 String SSHKey::getBase64() const
 {
     char * buf = nullptr;
-    int rc = ssh_pki_export_pubkey_base64(key, &buf);
-
-    if (rc != SSH_OK)
+    if (int rc = ssh_pki_export_pubkey_base64(key, &buf); rc != SSH_OK)
         throw DB::Exception(DB::ErrorCodes::LIBSSH_ERROR, "Failed to export public key to base64");
-
     /// Create a String from cstring, which makes a copy of the first one and requires freeing memory after it
     /// This is to safely manage buf memory
     std::unique_ptr<char, CStringDeleter> buf_ptr(buf);
@@ -177,7 +171,6 @@ SSHKey::~SSHKey()
     ssh_key_free(key); // it's safe free from libssh
 }
 
-}
 }
 
 #endif
diff --git a/src/Common/SSH/Wrappers.h b/src/Common/SSHWrapper.h
similarity index 73%
rename from src/Common/SSH/Wrappers.h
rename to src/Common/SSHWrapper.h
index 9036fac3163..b6f0c577edc 100644
--- a/src/Common/SSH/Wrappers.h
+++ b/src/Common/SSHWrapper.h
@@ -1,20 +1,18 @@
 #pragma once
-#include <Common/Exception.h>
-#include "config.h"
-#if USE_SSL
-#    include <string_view>
-#    include <base/types.h>
 
+#include <Common/Exception.h>
+
+#include <string_view>
+#include <base/types.h>
+
+#include "config.h"
+
+#if USE_SSH
 using ssh_key = struct ssh_key_struct *;
 
 namespace DB
 {
 
-namespace ssh
-{
-
-class SSHKeyFactory;
-
 class SSHKey
 {
 public:
@@ -22,11 +20,7 @@ public:
     ~SSHKey();
 
     SSHKey(const SSHKey & other);
-    SSHKey(SSHKey && other) noexcept
-    {
-        key = other.key;
-        other.key = nullptr;
-    }
+    SSHKey(SSHKey && other) noexcept;
     SSHKey & operator=(const SSHKey & other);
     SSHKey & operator=(SSHKey && other) noexcept;
 
@@ -43,7 +37,7 @@ public:
     String getBase64() const;
     String getKeyType() const;
 
-    friend SSHKeyFactory;
+    friend class SSHKeyFactory;
 private:
     explicit SSHKey(ssh_key key_) : key(key_) { }
     ssh_key key = nullptr;
@@ -56,17 +50,14 @@ public:
     /// The check whether the path is allowed to read for ClickHouse has
     /// (e.g. a file is inside `user_files` directory)
     /// to be done outside of this functions.
-    static SSHKey makePrivateFromFile(String filename, String passphrase);
-    static SSHKey makePublicFromFile(String filename);
-    static SSHKey makePublicFromBase64(String base64_key, String type_name);
+    static SSHKey makePrivateKeyFromFile(String filename, String passphrase);
+    static SSHKey makePublicKeyFromFile(String filename);
+    static SSHKey makePublicKeyFromBase64(String base64_key, String type_name);
 };
 
-}
 }
 
 #else
-namespace ssh
-{
 class SSHKey
 {
 public:
@@ -74,5 +65,4 @@ public:
     [[ noreturn ]] bool isEmpty() { std::terminate(); }
     [[ noreturn ]] String signString(std::string_view) const { std::terminate(); }
 };
-}
 #endif
diff --git a/src/IO/IResourceManager.h b/src/Common/Scheduler/IResourceManager.h
similarity index 89%
rename from src/IO/IResourceManager.h
rename to src/Common/Scheduler/IResourceManager.h
index 39fede0e19f..8a7077ac3d5 100644
--- a/src/IO/IResourceManager.h
+++ b/src/Common/Scheduler/IResourceManager.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ResourceLink.h>
+#include <Common/Scheduler/ResourceLink.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -12,6 +12,9 @@
 namespace DB
 {
 
+class ISchedulerNode;
+using SchedulerNodePtr = std::shared_ptr<ISchedulerNode>;
+
 /*
  * Instance of derived class holds everything required for resource consumption,
  * including resources currently registered at `SchedulerRoot`. This is required to avoid
@@ -21,7 +24,7 @@ namespace DB
 class IClassifier : private boost::noncopyable
 {
 public:
-    virtual ~IClassifier() {}
+    virtual ~IClassifier() = default;
 
     /// Returns ResourceLink that should be used to access resource.
     /// Returned link is valid until classifier destruction.
@@ -38,7 +41,7 @@ using ClassifierPtr = std::shared_ptr<IClassifier>;
 class IResourceManager : private boost::noncopyable
 {
 public:
-    virtual ~IResourceManager() {}
+    virtual ~IResourceManager() = default;
 
     /// Initialize or reconfigure manager.
     virtual void updateConfiguration(const Poco::Util::AbstractConfiguration & config) = 0;
diff --git a/src/IO/ISchedulerConstraint.h b/src/Common/Scheduler/ISchedulerConstraint.h
similarity index 98%
rename from src/IO/ISchedulerConstraint.h
rename to src/Common/Scheduler/ISchedulerConstraint.h
index 05bed7c3df8..a976206de74 100644
--- a/src/IO/ISchedulerConstraint.h
+++ b/src/Common/Scheduler/ISchedulerConstraint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerNode.h>
 
 namespace DB
 {
diff --git a/src/IO/ISchedulerNode.h b/src/Common/Scheduler/ISchedulerNode.h
similarity index 98%
rename from src/IO/ISchedulerNode.h
rename to src/Common/Scheduler/ISchedulerNode.h
index e6e6bacbf9e..20c1f4332da 100644
--- a/src/IO/ISchedulerNode.h
+++ b/src/Common/Scheduler/ISchedulerNode.h
@@ -6,7 +6,7 @@
 #include <base/defines.h>
 #include <base/types.h>
 
-#include <IO/ResourceRequest.h>
+#include <Common/Scheduler/ResourceRequest.h>
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Poco/Util/XMLConfiguration.h>
 
@@ -387,7 +387,9 @@ public:
 
     /// Introspection
     std::atomic<UInt64> dequeued_requests{0};
+    std::atomic<UInt64> canceled_requests{0};
     std::atomic<ResourceCost> dequeued_cost{0};
+    std::atomic<ResourceCost> canceled_cost{0};
     std::atomic<UInt64> busy_periods{0};
 };
 
diff --git a/src/IO/ISchedulerQueue.h b/src/Common/Scheduler/ISchedulerQueue.h
similarity index 80%
rename from src/IO/ISchedulerQueue.h
rename to src/Common/Scheduler/ISchedulerQueue.h
index 2e190a529e3..532f4bf6c63 100644
--- a/src/IO/ISchedulerQueue.h
+++ b/src/Common/Scheduler/ISchedulerQueue.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <IO/ISchedulerNode.h>
-#include <IO/ResourceBudget.h>
-#include <IO/ResourceRequest.h>
+#include <Common/Scheduler/ISchedulerNode.h>
+#include <Common/Scheduler/ResourceBudget.h>
+#include <Common/Scheduler/ResourceRequest.h>
 
 #include <memory>
 
@@ -50,6 +50,12 @@ public:
     /// Should be called outside of scheduling subsystem, implementation must be thread-safe.
     virtual void enqueueRequest(ResourceRequest * request) = 0;
 
+    /// Cancel previously enqueued request.
+    /// Returns `false` and does nothing given unknown or already executed request.
+    /// Returns `true` if requests has been found and canceled.
+    /// Should be called outside of scheduling subsystem, implementation must be thread-safe.
+    virtual bool cancelRequest(ResourceRequest * request) = 0;
+
     /// For introspection
     ResourceCost getBudget() const
     {
diff --git a/src/IO/Resource/ClassifiersConfig.cpp b/src/Common/Scheduler/Nodes/ClassifiersConfig.cpp
similarity index 95%
rename from src/IO/Resource/ClassifiersConfig.cpp
rename to src/Common/Scheduler/Nodes/ClassifiersConfig.cpp
index 7dc4d517138..192f97645a0 100644
--- a/src/IO/Resource/ClassifiersConfig.cpp
+++ b/src/Common/Scheduler/Nodes/ClassifiersConfig.cpp
@@ -1,4 +1,4 @@
-#include <IO/Resource/ClassifiersConfig.h>
+#include <Common/Scheduler/Nodes/ClassifiersConfig.h>
 
 #include <Common/Exception.h>
 
diff --git a/src/IO/Resource/ClassifiersConfig.h b/src/Common/Scheduler/Nodes/ClassifiersConfig.h
similarity index 100%
rename from src/IO/Resource/ClassifiersConfig.h
rename to src/Common/Scheduler/Nodes/ClassifiersConfig.h
diff --git a/src/IO/Resource/DynamicResourceManager.cpp b/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
similarity index 97%
rename from src/IO/Resource/DynamicResourceManager.cpp
rename to src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
index b9803d8079d..3ab85c81428 100644
--- a/src/IO/Resource/DynamicResourceManager.cpp
+++ b/src/Common/Scheduler/Nodes/DynamicResourceManager.cpp
@@ -1,8 +1,8 @@
-#include <IO/Resource/DynamicResourceManager.h>
+#include <Common/Scheduler/Nodes/DynamicResourceManager.h>
 
-#include <IO/SchedulerNodeFactory.h>
-#include <IO/ResourceManagerFactory.h>
-#include <IO/ISchedulerQueue.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
+#include <Common/Scheduler/ResourceManagerFactory.h>
+#include <Common/Scheduler/ISchedulerQueue.h>
 
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
diff --git a/src/IO/Resource/DynamicResourceManager.h b/src/Common/Scheduler/Nodes/DynamicResourceManager.h
similarity index 95%
rename from src/IO/Resource/DynamicResourceManager.h
rename to src/Common/Scheduler/Nodes/DynamicResourceManager.h
index 3372d40a285..4b0a3a48b61 100644
--- a/src/IO/Resource/DynamicResourceManager.h
+++ b/src/Common/Scheduler/Nodes/DynamicResourceManager.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <IO/IResourceManager.h>
-#include <IO/SchedulerRoot.h>
-#include <IO/Resource/ClassifiersConfig.h>
+#include <Common/Scheduler/IResourceManager.h>
+#include <Common/Scheduler/SchedulerRoot.h>
+#include <Common/Scheduler/Nodes/ClassifiersConfig.h>
 
 #include <mutex>
 
@@ -85,7 +85,6 @@ private:
         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/Common/Scheduler/Nodes/FairPolicy.cpp
similarity index 55%
rename from src/IO/Resource/FairPolicy.cpp
rename to src/Common/Scheduler/Nodes/FairPolicy.cpp
index 248ff04cbd7..84e8b3c4bbd 100644
--- a/src/IO/Resource/FairPolicy.cpp
+++ b/src/Common/Scheduler/Nodes/FairPolicy.cpp
@@ -1,6 +1,6 @@
-#include <IO/Resource/FairPolicy.h>
+#include <Common/Scheduler/Nodes/FairPolicy.h>
 
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/FairPolicy.h b/src/Common/Scheduler/Nodes/FairPolicy.h
similarity index 72%
rename from src/IO/Resource/FairPolicy.h
rename to src/Common/Scheduler/Nodes/FairPolicy.h
index a8608b5bea3..0a4e55c253b 100644
--- a/src/IO/Resource/FairPolicy.h
+++ b/src/Common/Scheduler/Nodes/FairPolicy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerNode.h>
 
 #include <Common/Stopwatch.h>
 
@@ -134,56 +134,65 @@ public:
 
     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
+        // Cycle is required to do deactivations in the case of canceled requests, when dequeueRequest returns `nullptr`
+        while (true)
         {
-            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--;
+            if (heap_size == 0)
+                return {nullptr, false};
 
-            // 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;
-        }
+            // Recursively pull request from child
+            auto [request, child_active] = items.front().child->dequeueRequest();
+            std::pop_heap(items.begin(), items.begin() + heap_size);
+            Item & current = items[heap_size - 1];
 
-        // 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)
+            if (request)
             {
-                last_reset_ns = ns;
-                for (Item & item : items)
-                    item.vruntime = 0;
-                max_vruntime = 0;
-            }
-            system_vruntime = max_vruntime;
-            busy_periods++;
-        }
+                // SFQ fairness invariant: system vruntime equals last served request start-time
+                assert(current.vruntime >= system_vruntime);
+                system_vruntime = current.vruntime;
 
-        dequeued_requests++;
-        dequeued_cost += request->cost;
-        return {request, heap_size > 0};
+                // 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;
+                busy_periods++;
+            }
+
+            if (request)
+            {
+                dequeued_requests++;
+                dequeued_cost += request->cost;
+                return {request, heap_size > 0};
+            }
+        }
     }
 
     bool isActive() override
@@ -239,7 +248,6 @@ private:
             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.
diff --git a/src/IO/Resource/FifoQueue.cpp b/src/Common/Scheduler/Nodes/FifoQueue.cpp
similarity index 55%
rename from src/IO/Resource/FifoQueue.cpp
rename to src/Common/Scheduler/Nodes/FifoQueue.cpp
index f4b0e9c3328..f096a1aff93 100644
--- a/src/IO/Resource/FifoQueue.cpp
+++ b/src/Common/Scheduler/Nodes/FifoQueue.cpp
@@ -1,6 +1,6 @@
-#include <IO/Resource/FifoQueue.h>
+#include <Common/Scheduler/Nodes/FifoQueue.h>
 
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/FifoQueue.h b/src/Common/Scheduler/Nodes/FifoQueue.h
similarity index 68%
rename from src/IO/Resource/FifoQueue.h
rename to src/Common/Scheduler/Nodes/FifoQueue.h
index e95e817719a..45ed32343ff 100644
--- a/src/IO/Resource/FifoQueue.h
+++ b/src/Common/Scheduler/Nodes/FifoQueue.h
@@ -2,7 +2,7 @@
 
 #include <Common/Stopwatch.h>
 
-#include <IO/ISchedulerQueue.h>
+#include <Common/Scheduler/ISchedulerQueue.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -39,8 +39,7 @@ public:
 
     void enqueueRequest(ResourceRequest * request) override
     {
-        std::unique_lock lock(mutex);
-        request->enqueue_ns = clock_gettime_ns();
+        std::lock_guard lock(mutex);
         queue_cost += request->cost;
         bool was_empty = requests.empty();
         requests.push_back(request);
@@ -50,7 +49,7 @@ public:
 
     std::pair<ResourceRequest *, bool> dequeueRequest() override
     {
-        std::unique_lock lock(mutex);
+        std::lock_guard lock(mutex);
         if (requests.empty())
             return {nullptr, false};
         ResourceRequest * result = requests.front();
@@ -63,9 +62,29 @@ public:
         return {result, !requests.empty()};
     }
 
+    bool cancelRequest(ResourceRequest * request) override
+    {
+        std::lock_guard lock(mutex);
+        // TODO(serxa): reimplement queue as intrusive list of ResourceRequest to make this O(1) instead of O(N)
+        for (auto i = requests.begin(), e = requests.end(); i != e; ++i)
+        {
+            if (*i == request)
+            {
+                requests.erase(i);
+                if (requests.empty())
+                    busy_periods++;
+                queue_cost -= request->cost;
+                canceled_requests++;
+                canceled_cost += request->cost;
+                return true;
+            }
+        }
+        return false;
+    }
+
     bool isActive() override
     {
-        std::unique_lock lock(mutex);
+        std::lock_guard lock(mutex);
         return !requests.empty();
     }
 
@@ -98,14 +117,14 @@ public:
 
     std::pair<UInt64, Int64> getQueueLengthAndCost()
     {
-        std::unique_lock lock(mutex);
+        std::lock_guard lock(mutex);
         return {requests.size(), queue_cost};
     }
 
 private:
     std::mutex mutex;
     Int64 queue_cost = 0;
-    std::deque<ResourceRequest *> requests;
+    std::deque<ResourceRequest *> requests; // TODO(serxa): reimplement it using intrusive list to avoid allocations/deallocations and O(N) during cancel
 };
 
 }
diff --git a/src/IO/Resource/PriorityPolicy.cpp b/src/Common/Scheduler/Nodes/PriorityPolicy.cpp
similarity index 56%
rename from src/IO/Resource/PriorityPolicy.cpp
rename to src/Common/Scheduler/Nodes/PriorityPolicy.cpp
index bee9a6d5dde..f4bdc1cddb7 100644
--- a/src/IO/Resource/PriorityPolicy.cpp
+++ b/src/Common/Scheduler/Nodes/PriorityPolicy.cpp
@@ -1,6 +1,6 @@
-#include <IO/Resource/PriorityPolicy.h>
+#include <Common/Scheduler/Nodes/PriorityPolicy.h>
 
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/PriorityPolicy.h b/src/Common/Scheduler/Nodes/PriorityPolicy.h
similarity index 78%
rename from src/IO/Resource/PriorityPolicy.h
rename to src/Common/Scheduler/Nodes/PriorityPolicy.h
index ee34c38f7e5..22a5155cfeb 100644
--- a/src/IO/Resource/PriorityPolicy.h
+++ b/src/Common/Scheduler/Nodes/PriorityPolicy.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerNode.h>
 
 #include <algorithm>
 #include <unordered_map>
@@ -35,7 +35,7 @@ class PriorityPolicy : public ISchedulerNode
     };
 
 public:
-    PriorityPolicy(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
+    explicit PriorityPolicy(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
         : ISchedulerNode(event_queue_, config, config_prefix)
     {}
 
@@ -102,25 +102,31 @@ public:
 
     std::pair<ResourceRequest *, bool> dequeueRequest() override
     {
-        if (items.empty())
-            return {nullptr, false};
-
-        // Recursively pull request from child
-        auto [request, child_active] = items.front().child->dequeueRequest();
-        assert(request != nullptr);
-
-        // Deactivate child if it is empty
-        if (!child_active)
+        // Cycle is required to do deactivations in the case of canceled requests, when dequeueRequest returns `nullptr`
+        while (true)
         {
-            std::pop_heap(items.begin(), items.end());
-            items.pop_back();
             if (items.empty())
-                busy_periods++;
-        }
+                return {nullptr, false};
 
-        dequeued_requests++;
-        dequeued_cost += request->cost;
-        return {request, !items.empty()};
+            // Recursively pull request from child
+            auto [request, child_active] = items.front().child->dequeueRequest();
+
+            // Deactivate child if it is empty
+            if (!child_active)
+            {
+                std::pop_heap(items.begin(), items.end());
+                items.pop_back();
+                if (items.empty())
+                    busy_periods++;
+            }
+
+            if (request)
+            {
+                dequeued_requests++;
+                dequeued_cost += request->cost;
+                return {request, !items.empty()};
+            }
+        }
     }
 
     bool isActive() override
diff --git a/src/IO/SchedulerNodeFactory.h b/src/Common/Scheduler/Nodes/SchedulerNodeFactory.h
similarity index 97%
rename from src/IO/SchedulerNodeFactory.h
rename to src/Common/Scheduler/Nodes/SchedulerNodeFactory.h
index 5c31534a9b8..e69fd21e139 100644
--- a/src/IO/SchedulerNodeFactory.h
+++ b/src/Common/Scheduler/Nodes/SchedulerNodeFactory.h
@@ -3,7 +3,7 @@
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
 
-#include <IO/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerNode.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
diff --git a/src/IO/Resource/SemaphoreConstraint.cpp b/src/Common/Scheduler/Nodes/SemaphoreConstraint.cpp
similarity index 58%
rename from src/IO/Resource/SemaphoreConstraint.cpp
rename to src/Common/Scheduler/Nodes/SemaphoreConstraint.cpp
index 2135fd65a84..cc55d35df0a 100644
--- a/src/IO/Resource/SemaphoreConstraint.cpp
+++ b/src/Common/Scheduler/Nodes/SemaphoreConstraint.cpp
@@ -1,6 +1,6 @@
-#include <IO/Resource/SemaphoreConstraint.h>
+#include <Common/Scheduler/Nodes/SemaphoreConstraint.h>
 
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/SemaphoreConstraint.h b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
similarity index 95%
rename from src/IO/Resource/SemaphoreConstraint.h
rename to src/Common/Scheduler/Nodes/SemaphoreConstraint.h
index f0053ded0af..10fce536f5d 100644
--- a/src/IO/Resource/SemaphoreConstraint.h
+++ b/src/Common/Scheduler/Nodes/SemaphoreConstraint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ISchedulerConstraint.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
 
 #include <mutex>
 #include <limits>
@@ -18,7 +18,7 @@ class SemaphoreConstraint : public ISchedulerConstraint
     static constexpr Int64 default_max_requests = std::numeric_limits<Int64>::max();
     static constexpr Int64 default_max_cost = std::numeric_limits<Int64>::max();
 public:
-    SemaphoreConstraint(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
+    explicit SemaphoreConstraint(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
         : ISchedulerConstraint(event_queue_, config, config_prefix)
         , max_requests(config.getInt64(config_prefix + ".max_requests", default_max_requests))
         , max_cost(config.getInt64(config_prefix + ".max_cost", config.getInt64(config_prefix + ".max_bytes", default_max_cost)))
diff --git a/src/IO/Resource/ThrottlerConstraint.cpp b/src/Common/Scheduler/Nodes/ThrottlerConstraint.cpp
similarity index 58%
rename from src/IO/Resource/ThrottlerConstraint.cpp
rename to src/Common/Scheduler/Nodes/ThrottlerConstraint.cpp
index 0ced2b1ab3e..d31c0f7e2a9 100644
--- a/src/IO/Resource/ThrottlerConstraint.cpp
+++ b/src/Common/Scheduler/Nodes/ThrottlerConstraint.cpp
@@ -1,6 +1,6 @@
-#include <IO/Resource/ThrottlerConstraint.h>
+#include <Common/Scheduler/Nodes/ThrottlerConstraint.h>
 
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/ThrottlerConstraint.h b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
similarity index 96%
rename from src/IO/Resource/ThrottlerConstraint.h
rename to src/Common/Scheduler/Nodes/ThrottlerConstraint.h
index 7de53fe0728..f4a5795bb2b 100644
--- a/src/IO/Resource/ThrottlerConstraint.h
+++ b/src/Common/Scheduler/Nodes/ThrottlerConstraint.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ISchedulerConstraint.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
 
 #include <chrono>
 #include <mutex>
@@ -20,7 +20,7 @@ class ThrottlerConstraint : public ISchedulerConstraint
 public:
     static constexpr double default_burst_seconds = 1.0;
 
-    ThrottlerConstraint(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
+    explicit ThrottlerConstraint(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
         : ISchedulerConstraint(event_queue_, config, config_prefix)
         , max_speed(config.getDouble(config_prefix + ".max_speed", 0))
         , max_burst(config.getDouble(config_prefix + ".max_burst", default_burst_seconds * max_speed))
diff --git a/src/IO/Resource/registerResourceManagers.cpp b/src/Common/Scheduler/Nodes/registerResourceManagers.cpp
similarity index 53%
rename from src/IO/Resource/registerResourceManagers.cpp
rename to src/Common/Scheduler/Nodes/registerResourceManagers.cpp
index 5217bcdfbec..c5d5ba5b981 100644
--- a/src/IO/Resource/registerResourceManagers.cpp
+++ b/src/Common/Scheduler/Nodes/registerResourceManagers.cpp
@@ -1,17 +1,15 @@
-#include <IO/Resource/registerResourceManagers.h>
-#include <IO/ResourceManagerFactory.h>
+#include <Common/Scheduler/Nodes/registerResourceManagers.h>
+#include <Common/Scheduler/ResourceManagerFactory.h>
 
 namespace DB
 {
 
 void registerDynamicResourceManager(ResourceManagerFactory &);
-void registerStaticResourceManager(ResourceManagerFactory &);
 
 void registerResourceManagers()
 {
     auto & factory = ResourceManagerFactory::instance();
     registerDynamicResourceManager(factory);
-    registerStaticResourceManager(factory);
 }
 
 }
diff --git a/src/IO/Resource/registerResourceManagers.h b/src/Common/Scheduler/Nodes/registerResourceManagers.h
similarity index 100%
rename from src/IO/Resource/registerResourceManagers.h
rename to src/Common/Scheduler/Nodes/registerResourceManagers.h
diff --git a/src/IO/Resource/registerSchedulerNodes.cpp b/src/Common/Scheduler/Nodes/registerSchedulerNodes.cpp
similarity index 75%
rename from src/IO/Resource/registerSchedulerNodes.cpp
rename to src/Common/Scheduler/Nodes/registerSchedulerNodes.cpp
index 612885e26b7..1c2b645607b 100644
--- a/src/IO/Resource/registerSchedulerNodes.cpp
+++ b/src/Common/Scheduler/Nodes/registerSchedulerNodes.cpp
@@ -1,8 +1,8 @@
-#include <IO/Resource/registerSchedulerNodes.h>
+#include <Common/Scheduler/Nodes/registerSchedulerNodes.h>
 
-#include <IO/ISchedulerNode.h>
-#include <IO/ISchedulerConstraint.h>
-#include <IO/SchedulerNodeFactory.h>
+#include <Common/Scheduler/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
 
 namespace DB
 {
diff --git a/src/IO/Resource/registerSchedulerNodes.h b/src/Common/Scheduler/Nodes/registerSchedulerNodes.h
similarity index 100%
rename from src/IO/Resource/registerSchedulerNodes.h
rename to src/Common/Scheduler/Nodes/registerSchedulerNodes.h
diff --git a/src/IO/Resource/tests/ResourceTest.h b/src/Common/Scheduler/Nodes/tests/ResourceTest.h
similarity index 92%
rename from src/IO/Resource/tests/ResourceTest.h
rename to src/Common/Scheduler/Nodes/tests/ResourceTest.h
index 072e2dda47c..ea3f9edf765 100644
--- a/src/IO/Resource/tests/ResourceTest.h
+++ b/src/Common/Scheduler/Nodes/tests/ResourceTest.h
@@ -1,14 +1,14 @@
 #pragma once
 
-#include <IO/IResourceManager.h>
-#include <IO/SchedulerRoot.h>
-#include <IO/ResourceGuard.h>
-#include <IO/SchedulerNodeFactory.h>
-#include <IO/Resource/PriorityPolicy.h>
-#include <IO/Resource/FifoQueue.h>
-#include <IO/Resource/SemaphoreConstraint.h>
-#include <IO/Resource/registerSchedulerNodes.h>
-#include <IO/Resource/registerResourceManagers.h>
+#include <Common/Scheduler/IResourceManager.h>
+#include <Common/Scheduler/SchedulerRoot.h>
+#include <Common/Scheduler/ResourceGuard.h>
+#include <Common/Scheduler/Nodes/SchedulerNodeFactory.h>
+#include <Common/Scheduler/Nodes/PriorityPolicy.h>
+#include <Common/Scheduler/Nodes/FifoQueue.h>
+#include <Common/Scheduler/Nodes/SemaphoreConstraint.h>
+#include <Common/Scheduler/Nodes/registerSchedulerNodes.h>
+#include <Common/Scheduler/Nodes/registerResourceManagers.h>
 
 #include <Poco/Util/XMLConfiguration.h>
 
@@ -75,7 +75,7 @@ struct ResourceTestBase
 
 struct ConstraintTest : public SemaphoreConstraint
 {
-    ConstraintTest(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
+    explicit ConstraintTest(EventQueue * event_queue_, const Poco::Util::AbstractConfiguration & config = emptyConfig(), const String & config_prefix = {})
         : SemaphoreConstraint(event_queue_, config, config_prefix)
     {}
 
@@ -282,7 +282,7 @@ struct ResourceTestManager : public ResourceTestBase
         return link_data[link];
     }
 
-    // Use at least two threads for each queue to avoid queue being deactivated:
+    // Use exactly two threads for each queue to avoid queue being deactivated (happens with 1 thread) and reordering (happens with >2 threads):
     // while the first request is executing, the second request is in queue - holding it active.
     // use onEnqueue() and onExecute() functions for this purpose.
     void onEnqueue(ResourceLink link)
diff --git a/src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp b/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
similarity index 93%
rename from src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp
rename to src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
index 949a1ee0264..1901a4fd120 100644
--- a/src/IO/Resource/tests/gtest_resource_manager_hierarchical.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_dynamic_resource_manager.cpp
@@ -1,8 +1,8 @@
 #include <gtest/gtest.h>
 
-#include <IO/Resource/tests/ResourceTest.h>
+#include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
-#include <IO/Resource/DynamicResourceManager.h>
+#include <Common/Scheduler/Nodes/DynamicResourceManager.h>
 #include <Poco/Util/XMLConfiguration.h>
 
 using namespace DB;
@@ -10,7 +10,7 @@ using namespace DB;
 using ResourceTest = ResourceTestManager<DynamicResourceManager>;
 using TestGuard = ResourceTest::Guard;
 
-TEST(IOResourceDynamicResourceManager, Smoke)
+TEST(SchedulerDynamicResourceManager, Smoke)
 {
     ResourceTest t;
 
@@ -38,14 +38,13 @@ TEST(IOResourceDynamicResourceManager, Smoke)
     {
         ResourceGuard gA(cA->get("res1"), ResourceGuard::PostponeLocking);
         gA.lock();
-        gA.setFailure();
         gA.unlock();
 
         ResourceGuard gB(cB->get("res1"));
     }
 }
 
-TEST(IOResourceDynamicResourceManager, Fairness)
+TEST(SchedulerDynamicResourceManager, 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.
@@ -56,7 +55,7 @@ TEST(IOResourceDynamicResourceManager, Fairness)
         EXPECT_NEAR(cur_unfairness, 0, 1);
     };
 
-    constexpr size_t threads_per_queue = 3;
+    constexpr size_t threads_per_queue = 2;
     int requests_per_thread = 100;
     ResourceTest t(2 * threads_per_queue + 1);
 
diff --git a/src/IO/Resource/tests/gtest_resource_class_fair.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
similarity index 93%
rename from src/IO/Resource/tests/gtest_resource_class_fair.cpp
rename to src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
index 89ec2ac7c32..4f0e8c80734 100644
--- a/src/IO/Resource/tests/gtest_resource_class_fair.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_fair.cpp
@@ -1,14 +1,14 @@
 #include <gtest/gtest.h>
 
-#include <IO/Resource/tests/ResourceTest.h>
+#include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
-#include <IO/Resource/FairPolicy.h>
+#include <Common/Scheduler/Nodes/FairPolicy.h>
 
 using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-TEST(IOResourceFairPolicy, Factory)
+TEST(SchedulerFairPolicy, Factory)
 {
     ResourceTest t;
 
@@ -17,7 +17,7 @@ TEST(IOResourceFairPolicy, Factory)
     EXPECT_TRUE(dynamic_cast<FairPolicy *>(fair.get()) != nullptr);
 }
 
-TEST(IOResourceFairPolicy, FairnessWeights)
+TEST(SchedulerFairPolicy, FairnessWeights)
 {
     ResourceTest t;
 
@@ -41,7 +41,7 @@ TEST(IOResourceFairPolicy, FairnessWeights)
     t.consumed("B", 20);
 }
 
-TEST(IOResourceFairPolicy, Activation)
+TEST(SchedulerFairPolicy, Activation)
 {
     ResourceTest t;
 
@@ -77,7 +77,7 @@ TEST(IOResourceFairPolicy, Activation)
     t.consumed("B", 10);
 }
 
-TEST(IOResourceFairPolicy, FairnessMaxMin)
+TEST(SchedulerFairPolicy, FairnessMaxMin)
 {
     ResourceTest t;
 
@@ -101,7 +101,7 @@ TEST(IOResourceFairPolicy, FairnessMaxMin)
     t.consumed("A", 20);
 }
 
-TEST(IOResourceFairPolicy, HierarchicalFairness)
+TEST(SchedulerFairPolicy, HierarchicalFairness)
 {
     ResourceTest t;
 
diff --git a/src/IO/Resource/tests/gtest_resource_class_priority.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
similarity index 89%
rename from src/IO/Resource/tests/gtest_resource_class_priority.cpp
rename to src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
index 83902453ed4..a447b7f6780 100644
--- a/src/IO/Resource/tests/gtest_resource_class_priority.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_class_priority.cpp
@@ -1,14 +1,14 @@
 #include <gtest/gtest.h>
 
-#include <IO/Resource/tests/ResourceTest.h>
+#include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
-#include <IO/Resource/PriorityPolicy.h>
+#include <Common/Scheduler/Nodes/PriorityPolicy.h>
 
 using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-TEST(IOResourcePriorityPolicy, Factory)
+TEST(SchedulerPriorityPolicy, Factory)
 {
     ResourceTest t;
 
@@ -17,7 +17,7 @@ TEST(IOResourcePriorityPolicy, Factory)
     EXPECT_TRUE(dynamic_cast<PriorityPolicy *>(prio.get()) != nullptr);
 }
 
-TEST(IOResourcePriorityPolicy, Priorities)
+TEST(SchedulerPriorityPolicy, Priorities)
 {
     ResourceTest t;
 
@@ -51,7 +51,7 @@ TEST(IOResourcePriorityPolicy, Priorities)
     t.consumed("C", 0);
 }
 
-TEST(IOResourcePriorityPolicy, Activation)
+TEST(SchedulerPriorityPolicy, Activation)
 {
     ResourceTest t;
 
@@ -92,7 +92,7 @@ TEST(IOResourcePriorityPolicy, Activation)
     t.consumed("C", 0);
 }
 
-TEST(IOResourcePriorityPolicy, SinglePriority)
+TEST(SchedulerPriorityPolicy, SinglePriority)
 {
     ResourceTest t;
 
diff --git a/src/IO/Resource/tests/gtest_resource_scheduler.cpp b/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
similarity index 55%
rename from src/IO/Resource/tests/gtest_resource_scheduler.cpp
rename to src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
index da2ffb2dd25..f8196d15819 100644
--- a/src/IO/Resource/tests/gtest_resource_scheduler.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_resource_scheduler.cpp
@@ -1,9 +1,10 @@
 #include <gtest/gtest.h>
 
-#include <IO/SchedulerRoot.h>
+#include <Common/Scheduler/SchedulerRoot.h>
 
-#include <IO/Resource/tests/ResourceTest.h>
+#include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
+#include <barrier>
 #include <future>
 
 using namespace DB;
@@ -73,7 +74,23 @@ struct ResourceHolder
     }
 };
 
-TEST(IOSchedulerRoot, Smoke)
+struct MyRequest : public ResourceRequest
+{
+    std::function<void()> on_execute;
+
+    explicit MyRequest(ResourceCost cost_, std::function<void()> on_execute_)
+        : ResourceRequest(cost_)
+        , on_execute(on_execute_)
+    {}
+
+    void execute() override
+    {
+        if (on_execute)
+            on_execute();
+    }
+};
+
+TEST(SchedulerRoot, Smoke)
 {
     ResourceTest t;
 
@@ -111,3 +128,49 @@ TEST(IOSchedulerRoot, Smoke)
         EXPECT_TRUE(fc2->requests.contains(&rg.request));
     }
 }
+
+TEST(SchedulerRoot, Cancel)
+{
+    ResourceTest t;
+
+    ResourceHolder r1(t);
+    auto * fc1 = r1.add<ConstraintTest>("/", "<max_requests>1</max_requests>");
+    r1.add<PriorityPolicy>("/prio");
+    auto a = r1.addQueue("/prio/A", "<priority>1</priority>");
+    auto b = r1.addQueue("/prio/B", "<priority>2</priority>");
+    r1.registerResource();
+
+    std::barrier destruct_sync(2);
+    std::barrier sync(2);
+    std::thread consumer1([&]
+    {
+        MyRequest request(1,[&]
+        {
+            sync.arrive_and_wait(); // (A)
+            EXPECT_TRUE(fc1->requests.contains(&request));
+            sync.arrive_and_wait(); // (B)
+            request.finish();
+            destruct_sync.arrive_and_wait(); // (C)
+        });
+        a.queue->enqueueRequest(&request);
+        destruct_sync.arrive_and_wait(); // (C)
+    });
+
+    std::thread consumer2([&]
+    {
+        MyRequest request(1,[&]
+        {
+            FAIL() << "This request must be canceled, but instead executes";
+        });
+        sync.arrive_and_wait(); // (A) wait for request of consumer1 to be inside execute, so that constraint is in violated state and our request will not be executed immediately
+        b.queue->enqueueRequest(&request);
+        bool canceled = b.queue->cancelRequest(&request);
+        EXPECT_TRUE(canceled);
+        sync.arrive_and_wait(); // (B) release request of consumer1 to be finished
+    });
+
+    consumer1.join();
+    consumer2.join();
+
+    EXPECT_TRUE(fc1->requests.empty());
+}
diff --git a/src/IO/Resource/tests/gtest_throttler_constraint.cpp b/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
similarity index 90%
rename from src/IO/Resource/tests/gtest_throttler_constraint.cpp
rename to src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
index e6d83d0d0ca..9703227ccfc 100644
--- a/src/IO/Resource/tests/gtest_throttler_constraint.cpp
+++ b/src/Common/Scheduler/Nodes/tests/gtest_throttler_constraint.cpp
@@ -1,18 +1,18 @@
 #include <chrono>
 #include <gtest/gtest.h>
 
-#include <IO/Resource/tests/ResourceTest.h>
+#include <Common/Scheduler/Nodes/tests/ResourceTest.h>
 
-#include <IO/Resource/FairPolicy.h>
-#include <IO/Resource/ThrottlerConstraint.h>
-#include "IO/ISchedulerNode.h"
-#include "IO/ResourceRequest.h"
+#include <Common/Scheduler/Nodes/FairPolicy.h>
+#include <Common/Scheduler/Nodes/ThrottlerConstraint.h>
+#include "Common/Scheduler/ISchedulerNode.h"
+#include "Common/Scheduler/ResourceRequest.h"
 
 using namespace DB;
 
 using ResourceTest = ResourceTestClass;
 
-TEST(IOResourceThrottlerConstraint, LeakyBucketConstraint)
+TEST(SchedulerThrottlerConstraint, LeakyBucketConstraint)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -42,7 +42,7 @@ TEST(IOResourceThrottlerConstraint, LeakyBucketConstraint)
     t.consumed("A", 10);
 }
 
-TEST(IOResourceThrottlerConstraint, Unlimited)
+TEST(SchedulerThrottlerConstraint, Unlimited)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -59,7 +59,7 @@ TEST(IOResourceThrottlerConstraint, Unlimited)
     }
 }
 
-TEST(IOResourceThrottlerConstraint, Pacing)
+TEST(SchedulerThrottlerConstraint, Pacing)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -79,7 +79,7 @@ TEST(IOResourceThrottlerConstraint, Pacing)
     }
 }
 
-TEST(IOResourceThrottlerConstraint, BucketFilling)
+TEST(SchedulerThrottlerConstraint, BucketFilling)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -113,7 +113,7 @@ TEST(IOResourceThrottlerConstraint, BucketFilling)
     t.consumed("A", 3);
 }
 
-TEST(IOResourceThrottlerConstraint, PeekAndAvgLimits)
+TEST(SchedulerThrottlerConstraint, PeekAndAvgLimits)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
@@ -141,7 +141,7 @@ TEST(IOResourceThrottlerConstraint, PeekAndAvgLimits)
     }
 }
 
-TEST(IOResourceThrottlerConstraint, ThrottlerAndFairness)
+TEST(SchedulerThrottlerConstraint, ThrottlerAndFairness)
 {
     ResourceTest t;
     EventQueue::TimePoint start = std::chrono::system_clock::now();
diff --git a/src/Common/Scheduler/ResouceLink.cpp b/src/Common/Scheduler/ResouceLink.cpp
new file mode 100644
index 00000000000..2da5dba62dc
--- /dev/null
+++ b/src/Common/Scheduler/ResouceLink.cpp
@@ -0,0 +1,25 @@
+#include <Common/Scheduler/ISchedulerQueue.h>
+#include <Common/Scheduler/ResourceLink.h>
+#include <Common/Scheduler/ResourceRequest.h>
+
+namespace DB
+{
+void ResourceLink::adjust(ResourceCost estimated_cost, ResourceCost real_cost) const
+{
+    if (queue)
+        queue->adjustBudget(estimated_cost, real_cost);
+}
+
+void ResourceLink::consumed(ResourceCost cost) const
+{
+    if (queue)
+        queue->consumeBudget(cost);
+}
+
+void ResourceLink::accumulate(DB::ResourceCost cost) const
+{
+    if (queue)
+        queue->accumulateBudget(cost);
+}
+}
+
diff --git a/src/IO/ResourceBudget.h b/src/Common/Scheduler/ResourceBudget.h
similarity index 97%
rename from src/IO/ResourceBudget.h
rename to src/Common/Scheduler/ResourceBudget.h
index 0adad45ba91..118720fae39 100644
--- a/src/IO/ResourceBudget.h
+++ b/src/Common/Scheduler/ResourceBudget.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <IO/ResourceRequest.h>
+#include <Common/Scheduler/ResourceRequest.h>
 #include <atomic>
 
 namespace DB
diff --git a/src/IO/ResourceGuard.h b/src/Common/Scheduler/ResourceGuard.h
similarity index 91%
rename from src/IO/ResourceGuard.h
rename to src/Common/Scheduler/ResourceGuard.h
index 92f25b40f6b..3c29f588fba 100644
--- a/src/IO/ResourceGuard.h
+++ b/src/Common/Scheduler/ResourceGuard.h
@@ -2,9 +2,10 @@
 
 #include <base/types.h>
 
-#include <IO/ResourceRequest.h>
-#include <IO/ResourceLink.h>
-#include <IO/ISchedulerConstraint.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
+#include <Common/Scheduler/ISchedulerQueue.h>
+#include <Common/Scheduler/ResourceRequest.h>
+#include <Common/Scheduler/ResourceLink.h>
 
 #include <condition_variable>
 #include <mutex>
@@ -71,8 +72,7 @@ public:
             // lock(mutex) is not required because `Dequeued` request cannot be used by the scheduler thread
             chassert(state == Dequeued);
             state = Finished;
-            if (constraint)
-                constraint->finishRequest(this);
+            ResourceRequest::finish();
         }
 
         static Request & local()
@@ -126,12 +126,6 @@ public:
         }
     }
 
-    /// Mark request as unsuccessful; by default request is considered to be successful
-    void setFailure()
-    {
-        request.successful = false;
-    }
-
     ResourceLink link;
     Request & request;
 };
diff --git a/src/Common/Scheduler/ResourceLink.h b/src/Common/Scheduler/ResourceLink.h
new file mode 100644
index 00000000000..450d9bc1efa
--- /dev/null
+++ b/src/Common/Scheduler/ResourceLink.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <base/types.h>
+
+namespace DB
+{
+class ISchedulerQueue;
+using ResourceCost = Int64;
+
+/*
+ * Everything required for resource consumption. Connection to a specific resource queue.
+ */
+struct ResourceLink
+{
+    ISchedulerQueue * queue = nullptr;
+    bool operator==(const ResourceLink &) const = default;
+
+    void adjust(ResourceCost estimated_cost, ResourceCost real_cost) const;
+
+    void consumed(ResourceCost cost) const;
+
+    void accumulate(ResourceCost cost) const;
+};
+
+}
diff --git a/src/IO/ResourceManagerFactory.h b/src/Common/Scheduler/ResourceManagerFactory.h
similarity index 95%
rename from src/IO/ResourceManagerFactory.h
rename to src/Common/Scheduler/ResourceManagerFactory.h
index 8e972f05640..52f271e51b1 100644
--- a/src/IO/ResourceManagerFactory.h
+++ b/src/Common/Scheduler/ResourceManagerFactory.h
@@ -3,7 +3,7 @@
 #include <Common/ErrorCodes.h>
 #include <Common/Exception.h>
 
-#include <IO/IResourceManager.h>
+#include <Common/Scheduler/IResourceManager.h>
 
 #include <boost/noncopyable.hpp>
 
diff --git a/src/Common/Scheduler/ResourceRequest.cpp b/src/Common/Scheduler/ResourceRequest.cpp
new file mode 100644
index 00000000000..26e8084cdfa
--- /dev/null
+++ b/src/Common/Scheduler/ResourceRequest.cpp
@@ -0,0 +1,13 @@
+#include <Common/Scheduler/ResourceRequest.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
+
+namespace DB
+{
+
+void ResourceRequest::finish()
+{
+    if (constraint)
+        constraint->finishRequest(this);
+}
+
+}
diff --git a/src/IO/ResourceRequest.h b/src/Common/Scheduler/ResourceRequest.h
similarity index 74%
rename from src/IO/ResourceRequest.h
rename to src/Common/Scheduler/ResourceRequest.h
index 3d2230746f9..f3153ad382c 100644
--- a/src/IO/ResourceRequest.h
+++ b/src/Common/Scheduler/ResourceRequest.h
@@ -14,9 +14,6 @@ class ISchedulerConstraint;
 using ResourceCost = Int64;
 constexpr ResourceCost ResourceCostMax = std::numeric_limits<int>::max();
 
-/// Timestamps (nanoseconds since epoch)
-using ResourceNs = UInt64;
-
 /*
  * Request for a resource consumption. The main moving part of the scheduling subsystem.
  * Resource requests processing workflow:
@@ -31,7 +28,7 @@ using ResourceNs = UInt64;
  *  3) Scheduler calls ISchedulerNode::dequeueRequest() that returns the request.
  *  4) Callback ResourceRequest::execute() is called to provide access to the resource.
  *  5) The resource consumption is happening outside of the scheduling subsystem.
- *  6) request->constraint->finishRequest() is called when consumption is finished.
+ *  6) ResourceRequest::finish() is called when consumption is finished.
  *
  * Steps (5) and (6) can be omitted if constraint is not used by the resource.
  *
@@ -39,7 +36,10 @@ using ResourceNs = UInt64;
  * Request ownership is done outside of the scheduling subsystem.
  * After (6) request can be destructed safely.
  *
- * Request cancelling is not supported yet.
+ * Request can also be canceled before (3) using ISchedulerQueue::cancelRequest().
+ * Returning false means it is too late for request to be canceled. It should be processed in a regular way.
+ * Returning true means successful cancel and therefore steps (4) and (5) are not going to happen
+ * and step (6) MUST be omitted.
  */
 class ResourceRequest
 {
@@ -48,32 +48,20 @@ public:
     /// NOTE: If cost is not known in advance, ResourceBudget should be used (note that every ISchedulerQueue has it)
     ResourceCost cost;
 
-    /// Request outcome
-    /// Should be filled during resource consumption
-    bool successful;
-
     /// Scheduler node to be notified on consumption finish
     /// Auto-filled during request enqueue/dequeue
     ISchedulerConstraint * constraint;
 
-    /// Timestamps for introspection
-    ResourceNs enqueue_ns;
-    ResourceNs execute_ns;
-    ResourceNs finish_ns;
-
     explicit ResourceRequest(ResourceCost cost_ = 1)
     {
         reset(cost_);
     }
 
+    /// ResourceRequest object may be reused again after reset()
     void reset(ResourceCost cost_)
     {
         cost = cost_;
-        successful = true;
         constraint = nullptr;
-        enqueue_ns = 0;
-        execute_ns = 0;
-        finish_ns = 0;
     }
 
     virtual ~ResourceRequest() = default;
@@ -83,6 +71,12 @@ public:
     /// just triggering start of a consumption, not doing the consumption itself
     /// (e.g. setting an std::promise or creating a job in a thread pool)
     virtual void execute() = 0;
+
+    /// Stop resource consumption and notify resource scheduler.
+    /// Should be called when resource consumption is finished by consumer.
+    /// ResourceRequest should not be destructed or reset before calling to `finish()`.
+    /// WARNING: this function MUST not be called if request was canceled.
+    void finish();
 };
 
 }
diff --git a/src/IO/SchedulerRoot.h b/src/Common/Scheduler/SchedulerRoot.h
similarity index 88%
rename from src/IO/SchedulerRoot.h
rename to src/Common/Scheduler/SchedulerRoot.h
index 68aa14a289d..7af42fdbbea 100644
--- a/src/IO/SchedulerRoot.h
+++ b/src/Common/Scheduler/SchedulerRoot.h
@@ -5,8 +5,8 @@
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 
-#include <IO/ISchedulerNode.h>
-#include <IO/ISchedulerConstraint.h>
+#include <Common/Scheduler/ISchedulerNode.h>
+#include <Common/Scheduler/ISchedulerConstraint.h>
 
 #include <Poco/Util/XMLConfiguration.h>
 
@@ -145,22 +145,27 @@ public:
 
     std::pair<ResourceRequest *, bool> dequeueRequest() override
     {
-        if (current == nullptr) // No active resources
-            return {nullptr, false};
+        while (true)
+        {
+            if (current == nullptr) // No active resources
+                return {nullptr, false};
 
-        // Dequeue request from current resource
-        auto [request, resource_active] = current->root->dequeueRequest();
-        assert(request != nullptr);
+            // Dequeue request from current resource
+            auto [request, resource_active] = current->root->dequeueRequest();
 
-        // Deactivate resource if required
-        if (!resource_active)
-            deactivate(current);
-        else
-            current = current->next; // Just move round-robin pointer
+            // Deactivate resource if required
+            if (!resource_active)
+                deactivate(current);
+            else
+                current = current->next; // Just move round-robin pointer
 
-        dequeued_requests++;
-        dequeued_cost += request->cost;
-        return {request, current != nullptr};
+            if (request == nullptr) // Possible in case of request cancel, just retry
+                continue;
+
+            dequeued_requests++;
+            dequeued_cost += request->cost;
+            return {request, current != nullptr};
+        }
     }
 
     bool isActive() override
@@ -226,7 +231,6 @@ private:
         value->next = nullptr;
     }
 
-private:
     void schedulerThread()
     {
         while (!stop_flag.load())
@@ -245,11 +249,9 @@ private:
 
     void execute(ResourceRequest * request)
     {
-        request->execute_ns = clock_gettime_ns();
         request->execute();
     }
 
-private:
     TResource * current = nullptr; // round-robin pointer
     std::unordered_map<ISchedulerNode *, TResource> children; // resources by pointer
     std::atomic<bool> stop_flag = false;
diff --git a/src/Common/SensitiveDataMasker.cpp b/src/Common/SensitiveDataMasker.cpp
index 7c9abf11fea..8c29b899841 100644
--- a/src/Common/SensitiveDataMasker.cpp
+++ b/src/Common/SensitiveDataMasker.cpp
@@ -60,7 +60,7 @@ public:
         , replacement(replacement_string)
     {
         if (!regexp.ok())
-            throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP,
+            throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP,
                 "SensitiveDataMasker: cannot compile re2: {}, error: {}. "
                 "Look at https://github.com/google/re2/wiki/Syntax for reference.",
                 regexp_string_, regexp.error());
@@ -85,20 +85,25 @@ public:
 
 SensitiveDataMasker::~SensitiveDataMasker() = default;
 
-std::unique_ptr<SensitiveDataMasker> SensitiveDataMasker::sensitive_data_masker = nullptr;
+SensitiveDataMasker::MaskerMultiVersion SensitiveDataMasker::sensitive_data_masker{};
 
-void SensitiveDataMasker::setInstance(std::unique_ptr<SensitiveDataMasker> sensitive_data_masker_)
+void SensitiveDataMasker::setInstance(std::unique_ptr<SensitiveDataMasker>&& sensitive_data_masker_)
 {
+
     if (!sensitive_data_masker_)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: the 'sensitive_data_masker' is not set");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The 'sensitive_data_masker' is not set");
 
     if (sensitive_data_masker_->rulesCount() > 0)
     {
-        sensitive_data_masker = std::move(sensitive_data_masker_);
+        sensitive_data_masker.set(std::move(sensitive_data_masker_));
+    }
+    else
+    {
+        sensitive_data_masker.set(nullptr);
     }
 }
 
-SensitiveDataMasker * SensitiveDataMasker::getInstance()
+SensitiveDataMasker::MaskerMultiVersion::Version SensitiveDataMasker::getInstance()
 {
     return sensitive_data_masker.get();
 }
@@ -107,7 +112,7 @@ SensitiveDataMasker::SensitiveDataMasker(const Poco::Util::AbstractConfiguration
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_prefix, keys);
-    Poco::Logger * logger = &Poco::Logger::get("SensitiveDataMaskerConfigRead");
+    LoggerPtr logger = getLogger("SensitiveDataMaskerConfigRead");
 
     std::set<std::string> used_names;
 
@@ -197,7 +202,7 @@ std::string wipeSensitiveDataAndCutToLength(const std::string & str, size_t max_
 {
     std::string res = str;
 
-    if (auto * masker = SensitiveDataMasker::getInstance())
+    if (auto masker = SensitiveDataMasker::getInstance())
         masker->wipeSensitiveData(res);
 
     size_t length = res.length();
diff --git a/src/Common/SensitiveDataMasker.h b/src/Common/SensitiveDataMasker.h
index de5cc125dcc..a153575cdbd 100644
--- a/src/Common/SensitiveDataMasker.h
+++ b/src/Common/SensitiveDataMasker.h
@@ -2,7 +2,7 @@
 
 #include <memory>
 #include <vector>
-#include <cstdint>
+#include "Common/MultiVersion.h"
 
 namespace Poco
 {
@@ -45,7 +45,8 @@ class SensitiveDataMasker
 private:
     class MaskingRule;
     std::vector<std::unique_ptr<MaskingRule>> all_masking_rules;
-    static std::unique_ptr<SensitiveDataMasker> sensitive_data_masker;
+    using MaskerMultiVersion = MultiVersion<SensitiveDataMasker>;
+    static MaskerMultiVersion sensitive_data_masker;
 
 public:
     SensitiveDataMasker(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
@@ -56,8 +57,8 @@ public:
 
     /// setInstance is not thread-safe and should be called once in single-thread mode.
     /// https://github.com/ClickHouse/ClickHouse/pull/6810#discussion_r321183367
-    static void setInstance(std::unique_ptr<SensitiveDataMasker> sensitive_data_masker_);
-    static SensitiveDataMasker * getInstance();
+    static void setInstance(std::unique_ptr<SensitiveDataMasker>&& sensitive_data_masker_);
+    static MaskerMultiVersion::Version getInstance();
 
     /// Used in tests.
     void addMaskingRule(const std::string & name, const std::string & regexp_string, const std::string & replacement_string);
diff --git a/src/Common/ShellCommand.cpp b/src/Common/ShellCommand.cpp
index f4efc9e3526..98a21b43d76 100644
--- a/src/Common/ShellCommand.cpp
+++ b/src/Common/ShellCommand.cpp
@@ -54,9 +54,9 @@ ShellCommand::ShellCommand(pid_t pid_, int & in_fd_, int & out_fd_, int & err_fd
 {
 }
 
-Poco::Logger * ShellCommand::getLogger()
+LoggerPtr ShellCommand::getLogger()
 {
-    return &Poco::Logger::get("ShellCommand");
+    return ::getLogger("ShellCommand");
 }
 
 ShellCommand::~ShellCommand()
diff --git a/src/Common/ShellCommand.h b/src/Common/ShellCommand.h
index da65d2ae494..5ebc1daefa1 100644
--- a/src/Common/ShellCommand.h
+++ b/src/Common/ShellCommand.h
@@ -97,7 +97,7 @@ private:
 
     bool tryWaitProcessWithTimeout(size_t timeout_in_seconds);
 
-    static Poco::Logger * getLogger();
+    static LoggerPtr getLogger();
 
     /// Print command name and the list of arguments to log. NOTE: No escaping of arguments is performed.
     static void logCommand(const char * filename, char * const argv[]);
diff --git a/src/Common/SipHash.h b/src/Common/SipHash.h
index 5f27fdaa4b6..c89ee2c9d90 100644
--- a/src/Common/SipHash.h
+++ b/src/Common/SipHash.h
@@ -149,7 +149,7 @@ public:
 
         /// Pad the remainder, which is missing up to an 8-byte word.
         current_word = 0;
-        switch (end - data)
+        switch (end - data) /// NOLINT(bugprone-switch-missing-default-case)
         {
             case 7: current_bytes[CURRENT_BYTES_IDX(6)] = data[6]; [[fallthrough]];
             case 6: current_bytes[CURRENT_BYTES_IDX(5)] = data[5]; [[fallthrough]];
@@ -209,7 +209,7 @@ public:
     {
         if (!is_reference_128)
             throw DB::Exception(
-                DB::ErrorCodes::LOGICAL_ERROR, "Logical error: can't call get128Reference when is_reference_128 is not set");
+                DB::ErrorCodes::LOGICAL_ERROR, "Can't call get128Reference when is_reference_128 is not set");
         finalize();
         const auto lo = v0 ^ v1 ^ v2 ^ v3;
         v1 ^= 0xdd;
diff --git a/src/Common/SpaceSaving.h b/src/Common/SpaceSaving.h
index 8dc0ee074c0..7a740ae6c9b 100644
--- a/src/Common/SpaceSaving.h
+++ b/src/Common/SpaceSaving.h
@@ -206,6 +206,9 @@ public:
      */
     void merge(const Self & rhs)
     {
+        if (!rhs.size())
+            return;
+
         UInt64 m1 = 0;
         UInt64 m2 = 0;
 
diff --git a/src/Common/StackTrace.cpp b/src/Common/StackTrace.cpp
index fe513199ac2..78ab43e8991 100644
--- a/src/Common/StackTrace.cpp
+++ b/src/Common/StackTrace.cpp
@@ -4,6 +4,7 @@
 #include <base/constexpr_helpers.h>
 #include <base/demangle.h>
 
+#include <Common/scope_guard_safe.h>
 #include <Common/Dwarf.h>
 #include <Common/Elf.h>
 #include <Common/MemorySanitizer.h>
@@ -17,12 +18,18 @@
 #include <filesystem>
 #include <map>
 #include <mutex>
-#include <sstream>
 #include <unordered_map>
 #include <fmt/format.h>
 #include <libunwind.h>
 
-#include "config.h"
+#include <boost/algorithm/string/split.hpp>
+
+#if defined(OS_DARWIN)
+/// This header contains functions like `backtrace` and `backtrace_symbols`
+/// Which will be used for stack unwinding on Mac.
+/// Read: https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man3/backtrace.3.html
+#include "execinfo.h"
+#endif
 
 namespace
 {
@@ -32,6 +39,10 @@ std::atomic<bool> show_addresses = true;
 
 bool shouldShowAddress(const void * addr)
 {
+    /// Likely inline frame
+    if (!addr)
+        return false;
+
     /// 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,
@@ -203,20 +214,24 @@ 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)
+void StackTrace::forEachFrame(
+    const StackTrace::FramePointers & frame_pointers,
+    size_t offset,
+    size_t size,
+    std::function<void(const Frame &)> callback,
+    bool fatal)
 {
 #if defined(__ELF__) && !defined(OS_FREEBSD)
     const DB::SymbolIndex & symbol_index = DB::SymbolIndex::instance();
     std::unordered_map<std::string, DB::Dwarf> dwarfs;
 
-    for (size_t i = 0; i < offset; ++i)
-        frames[i].virtual_addr = frame_pointers[i];
+    using enum DB::Dwarf::LocationInfoMode;
+    const auto mode = fatal ? FULL_WITH_INLINE : FAST;
 
     for (size_t i = offset; i < size; ++i)
     {
-        StackTrace::Frame & current_frame = frames[i];
+        StackTrace::Frame current_frame;
+        std::vector<DB::Dwarf::SymbolizedFrame> inline_frames;
         current_frame.virtual_addr = frame_pointers[i];
         const auto * object = symbol_index.findObject(current_frame.virtual_addr);
         uintptr_t virtual_offset = object ? uintptr_t(object->address_begin) : 0;
@@ -230,26 +245,68 @@ void StackTrace::symbolize(
                 auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
 
                 DB::Dwarf::LocationInfo location;
-                std::vector<DB::Dwarf::SymbolizedFrame> inline_frames;
                 if (dwarf_it->second.findAddress(
-                        uintptr_t(current_frame.physical_addr), location, DB::Dwarf::LocationInfoMode::FAST, inline_frames))
+                        uintptr_t(current_frame.physical_addr), location, mode, inline_frames))
                 {
                     current_frame.file = location.file.toString();
                     current_frame.line = location.line;
                 }
             }
         }
-        else
-            current_frame.object = "?";
 
         if (const auto * symbol = symbol_index.findSymbol(current_frame.virtual_addr))
             current_frame.symbol = demangle(symbol->name);
-        else
-            current_frame.symbol = "?";
+
+        for (const auto & frame : inline_frames)
+        {
+            StackTrace::Frame current_inline_frame;
+            const String file_for_inline_frame = frame.location.file.toString();
+
+            current_inline_frame.file = "inlined from " + file_for_inline_frame;
+            current_inline_frame.line = frame.location.line;
+            current_inline_frame.symbol = frame.name;
+
+            callback(current_inline_frame);
+        }
+
+        callback(current_frame);
+    }
+#elif defined(OS_DARWIN)
+    UNUSED(fatal);
+
+    /// This function returns an array of string in a special (a little bit weird format)
+    /// The frame number, library name, address in hex, mangled symbol name, `+` sign, the offset.
+    char** strs = ::backtrace_symbols(frame_pointers.data(), static_cast<int>(size));
+    SCOPE_EXIT_SAFE({free(strs);});
+
+    for (size_t i = offset; i < size; ++i)
+    {
+        StackTrace::Frame current_frame;
+
+        std::vector<std::string> split;
+        boost::split(split, strs[i], isWhitespaceASCII);
+        split.erase(
+            std::remove_if(
+                split.begin(), split.end(),
+                [](const std::string & x) { return x.empty(); }),
+            split.end());
+        assert(split.size() == 6);
+
+        current_frame.virtual_addr = frame_pointers[i];
+        current_frame.physical_addr = frame_pointers[i];
+        current_frame.object = split[1];
+        current_frame.symbol = split[3];
+        callback(current_frame);
     }
 #else
-    for (size_t i = 0; i < size; ++i)
-        frames[i].virtual_addr = frame_pointers[i];
+    UNUSED(fatal);
+
+    for (size_t i = offset; i < size; ++i)
+    {
+        StackTrace::Frame current_frame;
+        current_frame.virtual_addr = frame_pointers[i];
+        callback(current_frame);
+    }
 #endif
 }
 
@@ -283,7 +340,11 @@ StackTrace::StackTrace(const ucontext_t & signal_context)
 
 void StackTrace::tryCapture()
 {
+#if defined(OS_DARWIN)
+    size = backtrace(frame_pointers.data(), capacity);
+#else
     size = unw_backtrace(frame_pointers.data(), capacity);
+#endif
     __msan_unpoison(frame_pointers.data(), size * sizeof(frame_pointers[0]));
 }
 
@@ -294,16 +355,19 @@ constexpr std::pair<std::string_view, std::string_view> replacements[]
 // Demangle @c symbol_name if it's not from __functional header (as such functions don't provide any useful
 // information but pollute stack traces).
 // Replace parts from @c replacements with shorter aliases
-String demangleAndCollapseNames(std::string_view file, const char * const symbol_name)
+String demangleAndCollapseNames(std::optional<std::string_view> file, const char * const symbol_name)
 {
     if (!symbol_name)
         return "?";
 
-    std::string_view file_copy = file;
-    if (auto trim_pos = file.find_last_of('/'); trim_pos != file.npos)
-        file_copy.remove_suffix(file.size() - trim_pos);
-    if (file_copy.ends_with("functional"))
-        return "?";
+    if (file.has_value())
+    {
+        std::string_view file_copy = file.value();
+        if (auto trim_pos = file_copy.find_last_of('/'); trim_pos != std::string_view::npos)
+            file_copy.remove_suffix(file_copy.size() - trim_pos);
+        if (file_copy.ends_with("functional"))
+            return "?";
+    }
 
     String haystack = demangle(symbol_name);
 
@@ -349,72 +413,49 @@ toStringEveryLineImpl([[maybe_unused]] bool fatal, const StackTraceRefTriple & s
     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;
-
-    const DB::SymbolIndex & symbol_index = DB::SymbolIndex::instance();
-    std::unordered_map<String, DB::Dwarf> dwarfs;
-
-    for (size_t i = stack_trace.offset; i < stack_trace.size; ++i)
+    size_t frame_index = stack_trace.offset;
+#if (defined(__ELF__) && !defined(OS_FREEBSD)) || defined(OS_DARWIN)
+    size_t inline_frame_index = 0;
+    auto callback_wrapper = [&](const StackTrace::Frame & frame)
     {
-        std::vector<DB::Dwarf::SymbolizedFrame> inline_frames;
-        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 << ". ";
 
-        String file;
-        if (std::error_code ec; object && std::filesystem::exists(object->name, ec) && !ec)
+        /// Inline frame
+        if (!frame.virtual_addr)
         {
-            auto dwarf_it = dwarfs.try_emplace(object->name, object->elf).first;
-
-            DB::Dwarf::LocationInfo location;
-
-            if (dwarf_it->second.findAddress(uintptr_t(physical_addr), location, mode, inline_frames))
-            {
-                file = location.file.toString();
-                out << file << ":" << location.line << ": ";
-            }
+            out << frame_index << "." << inline_frame_index++ << ". ";
+        }
+        else
+        {
+            out << frame_index++ << ". ";
+            inline_frame_index = 0;
         }
 
-        if (const auto * const symbol = symbol_index.findSymbol(virtual_addr))
-            out << demangleAndCollapseNames(file, symbol->name);
+        if (frame.file.has_value() && frame.line.has_value())
+            out << *frame.file << ':' << *frame.line << ": ";
+
+        if (frame.symbol.has_value())
+            out << demangleAndCollapseNames(frame.file, frame.symbol->data());
         else
             out << "?";
 
-        if (shouldShowAddress(physical_addr))
+        if (shouldShowAddress(frame.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];
-            const String file_for_inline_frame = frame.location.file.toString();
-            callback(fmt::format(
-                "{}.{}. inlined from {}:{}: {}",
-                i,
-                j + 1,
-                file_for_inline_frame,
-                frame.location.line,
-                demangleAndCollapseNames(file_for_inline_frame, frame.name)));
+            DB::writePointerHex(frame.physical_addr, out);
         }
 
         callback(out.str());
-    }
+    };
 #else
-    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));
+    auto callback_wrapper = [&](const StackTrace::Frame & frame)
+    {
+        if (frame.virtual_addr && shouldShowAddress(frame.virtual_addr))
+            callback(fmt::format("{}. {}", frame_index++, frame.virtual_addr));
+    };
 #endif
+
+    StackTrace::forEachFrame(stack_trace.pointers, stack_trace.offset, stack_trace.size, callback_wrapper, fatal);
 }
 
 void StackTrace::toStringEveryLine(std::function<void(std::string_view)> callback) const
@@ -437,7 +478,17 @@ void StackTrace::toStringEveryLine(void ** frame_pointers_raw, size_t offset, si
     toStringEveryLineImpl(true, {frame_pointers, offset, size}, std::move(callback));
 }
 
-using StackTraceCache = std::map<StackTraceTriple, String, std::less<>>;
+struct CacheEntry
+{
+    std::optional<String> stacktrace_string;
+    bool to_string_in_progress = false;
+
+    std::condition_variable cv;
+};
+
+using CacheEntryPtr = std::shared_ptr<CacheEntry>;
+
+using StackTraceCache = std::map<StackTraceTriple, CacheEntryPtr, std::less<>>;
 
 static StackTraceCache & cacheInstance()
 {
@@ -449,23 +500,63 @@ static std::mutex stacktrace_cache_mutex;
 
 String toStringCached(const StackTrace::FramePointers & pointers, size_t offset, size_t size)
 {
+    const StackTraceRefTriple key{pointers, offset, 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};
-
+    std::unique_lock lock{stacktrace_cache_mutex};
+    CacheEntryPtr cache_entry;
     StackTraceCache & cache = cacheInstance();
-    const StackTraceRefTriple key{pointers, offset, size};
-
     if (auto it = cache.find(key); it != cache.end())
-        return it->second;
+    {
+        cache_entry = it->second;
+    }
     else
+    {
+        auto [new_it, inserted] = cache.emplace(StackTraceTriple{pointers, offset, size}, std::make_shared<CacheEntry>());
+        chassert(inserted);
+        cache_entry = new_it->second;
+    }
+
+    if (!cache_entry->to_string_in_progress && cache_entry->stacktrace_string.has_value())
+        return *cache_entry->stacktrace_string;
+
+    if (cache_entry->to_string_in_progress)
+    {
+        cache_entry->cv.wait(lock, [&]{ return !cache_entry->to_string_in_progress; });
+
+        if (cache_entry->stacktrace_string.has_value())
+            return *cache_entry->stacktrace_string;
+    }
+
+    cache_entry->to_string_in_progress = true;
+
+    lock.unlock();
+
+    String stacktrace_string;
+    try
     {
         DB::WriteBufferFromOwnString out;
         toStringEveryLineImpl(false, key, [&](std::string_view str) { out << str << '\n'; });
-
-        return cache.emplace(StackTraceTriple{pointers, offset, size}, out.str()).first->second;
+        stacktrace_string = out.str();
     }
+    catch (...)
+    {
+        lock.lock();
+        cache_entry->to_string_in_progress = false;
+        lock.unlock();
+        cache_entry->cv.notify_one();
+        throw;
+    }
+
+    lock.lock();
+    cache_entry->to_string_in_progress = false;
+    cache_entry->stacktrace_string = stacktrace_string;
+    lock.unlock();
+
+    cache_entry->cv.notify_all();
+    return stacktrace_string;
 }
 
 std::string StackTrace::toString() const
diff --git a/src/Common/StackTrace.h b/src/Common/StackTrace.h
index 656f543d837..a16d889a67a 100644
--- a/src/Common/StackTrace.h
+++ b/src/Common/StackTrace.h
@@ -11,9 +11,7 @@
 
 #ifdef OS_DARWIN
 // ucontext is not available without _XOPEN_SOURCE
-#   ifdef __clang__
-#       pragma clang diagnostic ignored "-Wreserved-id-macro"
-#   endif
+#   pragma clang diagnostic ignored "-Wreserved-id-macro"
 #   define _XOPEN_SOURCE 700
 #endif
 #include <ucontext.h>
@@ -62,7 +60,14 @@ public:
 
     static std::string toString(void ** 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);
+
+    /// @param fatal - if true, will process inline frames (slower)
+    static void forEachFrame(
+        const FramePointers & frame_pointers,
+        size_t offset,
+        size_t size,
+        std::function<void(const Frame &)> callback,
+        bool fatal);
 
     void toStringEveryLine(std::function<void(std::string_view)> callback) const;
     static void toStringEveryLine(const FramePointers & frame_pointers, std::function<void(std::string_view)> callback);
diff --git a/src/Common/StatusFile.cpp b/src/Common/StatusFile.cpp
index 0a9aa2f2739..56eb1d4d0cb 100644
--- a/src/Common/StatusFile.cpp
+++ b/src/Common/StatusFile.cpp
@@ -56,9 +56,9 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
         }
 
         if (!contents.empty())
-            LOG_INFO(&Poco::Logger::get("StatusFile"), "Status file {} already exists - unclean restart. Contents:\n{}", path, contents);
+            LOG_INFO(getLogger("StatusFile"), "Status file {} already exists - unclean restart. Contents:\n{}", path, contents);
         else
-            LOG_INFO(&Poco::Logger::get("StatusFile"), "Status file {} already exists and is empty - probably unclean hardware restart.", path);
+            LOG_INFO(getLogger("StatusFile"), "Status file {} already exists and is empty - probably unclean hardware restart.", path);
     }
 
     fd = ::open(path.c_str(), O_WRONLY | O_CREAT | O_CLOEXEC, 0666);
@@ -99,10 +99,10 @@ StatusFile::StatusFile(std::string path_, FillFunction fill_)
 StatusFile::~StatusFile()
 {
     if (0 != close(fd))
-        LOG_ERROR(&Poco::Logger::get("StatusFile"), "Cannot close file {}, {}", path, errnoToString());
+        LOG_ERROR(getLogger("StatusFile"), "Cannot close file {}, {}", path, errnoToString());
 
     if (0 != unlink(path.c_str()))
-        LOG_ERROR(&Poco::Logger::get("StatusFile"), "Cannot unlink file {}, {}", path, errnoToString());
+        LOG_ERROR(getLogger("StatusFile"), "Cannot unlink file {}, {}", path, errnoToString());
 }
 
 }
diff --git a/src/Common/SymbolIndex.cpp b/src/Common/SymbolIndex.cpp
index 8e8ffa4d8b7..a2d58fc7e8c 100644
--- a/src/Common/SymbolIndex.cpp
+++ b/src/Common/SymbolIndex.cpp
@@ -1,6 +1,9 @@
 #if defined(__ELF__) && !defined(OS_FREEBSD)
 
 #include <Common/SymbolIndex.h>
+#include <Common/MemorySanitizer.h>
+#include <base/hex.h>
+#include <base/sort.h>
 
 #include <algorithm>
 #include <optional>
@@ -10,8 +13,6 @@
 
 #include <filesystem>
 
-#include <base/sort.h>
-
 /**
 
 ELF object can contain three different places with symbol names and addresses:
@@ -55,21 +56,6 @@ Otherwise you will get only exported symbols from program headers.
 
 */
 
-#if defined(__clang__)
-#   pragma clang diagnostic ignored "-Wreserved-id-macro"
-#   pragma clang diagnostic ignored "-Wunused-macros"
-#endif
-
-#define __msan_unpoison_string(X) // NOLINT
-#define __msan_unpoison(X, Y) // NOLINT
-#if defined(ch_has_feature)
-#    if ch_has_feature(memory_sanitizer)
-#        undef __msan_unpoison_string
-#        undef __msan_unpoison
-#        include <sanitizer/msan_interface.h>
-#    endif
-#endif
-
 
 namespace DB
 {
diff --git a/src/Common/SystemLogBase.cpp b/src/Common/SystemLogBase.cpp
index d82b582fee6..4dee6d905d9 100644
--- a/src/Common/SystemLogBase.cpp
+++ b/src/Common/SystemLogBase.cpp
@@ -39,7 +39,7 @@ ISystemLog::~ISystemLog() = default;
 
 template <typename LogElement>
 SystemLogQueue<LogElement>::SystemLogQueue(const SystemLogQueueSettings & settings_)
-    : log(&Poco::Logger::get("SystemLogQueue (" + settings_.database + "." +settings_.table + ")"))
+    : log(getLogger("SystemLogQueue (" + settings_.database + "." +settings_.table + ")"))
     , settings(settings_)
 
 {
diff --git a/src/Common/SystemLogBase.h b/src/Common/SystemLogBase.h
index 1ced313b36a..95906c63349 100644
--- a/src/Common/SystemLogBase.h
+++ b/src/Common/SystemLogBase.h
@@ -101,7 +101,7 @@ class SystemLogQueue
     using Index = uint64_t;
 
 public:
-    SystemLogQueue(const SystemLogQueueSettings & settings_);
+    explicit SystemLogQueue(const SystemLogQueueSettings & settings_);
 
     void shutdown();
 
@@ -121,7 +121,7 @@ private:
     /// Data shared between callers of add()/flush()/shutdown(), and the saving thread
     std::mutex mutex;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     // Queue is bounded. But its size is quite large to not block in all normal cases.
     std::vector<LogElement> queue;
@@ -153,7 +153,7 @@ class SystemLogBase : public ISystemLog
 public:
     using Self = SystemLogBase;
 
-    SystemLogBase(
+    explicit SystemLogBase(
         const SystemLogQueueSettings & settings_,
         std::shared_ptr<SystemLogQueue<LogElement>> queue_ = nullptr);
 
diff --git a/src/Common/TLDListsHolder.cpp b/src/Common/TLDListsHolder.cpp
index 623b88f83a5..c3991b86983 100644
--- a/src/Common/TLDListsHolder.cpp
+++ b/src/Common/TLDListsHolder.cpp
@@ -55,7 +55,7 @@ void TLDListsHolder::parseConfig(const std::string & top_level_domains_path, con
     Poco::Util::AbstractConfiguration::Keys config_keys;
     config.keys("top_level_domains_lists", config_keys);
 
-    Poco::Logger * log = &Poco::Logger::get("TLDListsHolder");
+    LoggerPtr log = getLogger("TLDListsHolder");
 
     for (const auto & key : config_keys)
     {
diff --git a/src/Common/TTLCachePolicy.h b/src/Common/TTLCachePolicy.h
index 338cc543385..8960b742c74 100644
--- a/src/Common/TTLCachePolicy.h
+++ b/src/Common/TTLCachePolicy.h
@@ -38,12 +38,12 @@ public:
     bool approveWrite(const UUID & user_id, size_t entry_size_in_bytes) const override
     {
         auto it_actual = actual.find(user_id);
-        Resources actual_for_user{.size_in_bytes = 0, .num_items = 0}; /// assume zero actual resource consumption is user isn't found
+        Resources actual_for_user{.size_in_bytes = 0, .num_items = 0}; /// if no user is found, the default is no resource consumption
         if (it_actual != actual.end())
             actual_for_user = it_actual->second;
 
         auto it_quota = quotas.find(user_id);
-        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
+        Resources quota_for_user{.size_in_bytes = std::numeric_limits<size_t>::max(), .num_items = std::numeric_limits<size_t>::max()}; /// if no user is found, the default is no threshold
         if (it_quota != quotas.end())
             quota_for_user = it_quota->second;
 
@@ -54,16 +54,21 @@ public:
             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)
+        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)
+        if (actual_for_user.num_items + 1 > quota_for_user.num_items)
             return false;
 
         return true;
     }
 
+    void clear() override
+    {
+        actual.clear();
+    }
+
     struct Resources
     {
         size_t size_in_bytes = 0;
@@ -125,6 +130,7 @@ public:
     void clear() override
     {
         cache.clear();
+        Base::user_quotas->clear();
     }
 
     void remove(const Key & key) override
diff --git a/src/Common/TargetSpecific.cpp b/src/Common/TargetSpecific.cpp
index b115d3a8734..49f396c0926 100644
--- a/src/Common/TargetSpecific.cpp
+++ b/src/Common/TargetSpecific.cpp
@@ -1,7 +1,7 @@
 #include <base/defines.h>
 #include <Common/TargetSpecific.h>
 
-#include <Common/CpuId.h>
+#include <Common/CPUID.h>
 
 namespace DB
 {
@@ -9,25 +9,25 @@ namespace DB
 UInt32 getSupportedArchs()
 {
     UInt32 result = 0;
-    if (Cpu::CpuFlagsCache::have_SSE42)
+    if (CPU::CPUFlagsCache::have_SSE42)
         result |= static_cast<UInt32>(TargetArch::SSE42);
-    if (Cpu::CpuFlagsCache::have_AVX)
+    if (CPU::CPUFlagsCache::have_AVX)
         result |= static_cast<UInt32>(TargetArch::AVX);
-    if (Cpu::CpuFlagsCache::have_AVX2)
+    if (CPU::CPUFlagsCache::have_AVX2)
         result |= static_cast<UInt32>(TargetArch::AVX2);
-    if (Cpu::CpuFlagsCache::have_AVX512F)
+    if (CPU::CPUFlagsCache::have_AVX512F)
         result |= static_cast<UInt32>(TargetArch::AVX512F);
-    if (Cpu::CpuFlagsCache::have_AVX512BW)
+    if (CPU::CPUFlagsCache::have_AVX512BW)
         result |= static_cast<UInt32>(TargetArch::AVX512BW);
-    if (Cpu::CpuFlagsCache::have_AVX512VBMI)
+    if (CPU::CPUFlagsCache::have_AVX512VBMI)
         result |= static_cast<UInt32>(TargetArch::AVX512VBMI);
-    if (Cpu::CpuFlagsCache::have_AVX512VBMI2)
+    if (CPU::CPUFlagsCache::have_AVX512VBMI2)
         result |= static_cast<UInt32>(TargetArch::AVX512VBMI2);
-    if (Cpu::CpuFlagsCache::have_AMXBF16)
+    if (CPU::CPUFlagsCache::have_AMXBF16)
         result |= static_cast<UInt32>(TargetArch::AMXBF16);
-    if (Cpu::CpuFlagsCache::have_AMXTILE)
+    if (CPU::CPUFlagsCache::have_AMXTILE)
         result |= static_cast<UInt32>(TargetArch::AMXTILE);
-    if (Cpu::CpuFlagsCache::have_AMXINT8)
+    if (CPU::CPUFlagsCache::have_AMXINT8)
         result |= static_cast<UInt32>(TargetArch::AMXINT8);
     return result;
 }
diff --git a/src/Common/TargetSpecific.h b/src/Common/TargetSpecific.h
index e03036747f9..f9523f667b2 100644
--- a/src/Common/TargetSpecific.h
+++ b/src/Common/TargetSpecific.h
@@ -102,13 +102,11 @@ String toString(TargetArch arch);
 /// NOLINTNEXTLINE
 #define USE_MULTITARGET_CODE 1
 
-#if defined(__clang__)
-
 #define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2")))
 #define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi")))
 #define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw")))
 #define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f")))
-#define AVX2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2")))
+#define AVX2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,bmi2")))
 #define AVX_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx"))
 #define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt")))
 #define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
@@ -122,7 +120,7 @@ String toString(TargetArch arch);
 #   define BEGIN_AVX512F_SPECIFIC_CODE \
         _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f\"))),apply_to=function)")
 #   define BEGIN_AVX2_SPECIFIC_CODE \
-        _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2\"))),apply_to=function)")
+        _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,bmi2\"))),apply_to=function)")
 #   define BEGIN_AVX_SPECIFIC_CODE \
         _Pragma("clang attribute push(__attribute__((target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx\"))),apply_to=function)")
 #   define BEGIN_SSE42_SPECIFIC_CODE \
@@ -134,45 +132,7 @@ String toString(TargetArch arch);
  * To prevent this warning we define this function inside every macros with pragmas.
  */
 #   define DUMMY_FUNCTION_DEFINITION [[maybe_unused]] void _dummy_function_definition();
-#else
 
-#define AVX512VBMI2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native")))
-#define AVX512VBMI_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native")))
-#define AVX512BW_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,tune=native")))
-#define AVX512_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,tune=native")))
-#define AVX2_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,tune=native")))
-#define AVX_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt,avx,tune=native")))
-#define SSE42_FUNCTION_SPECIFIC_ATTRIBUTE __attribute__((target("sse,sse2,sse3,ssse3,sse4,popcnt",tune=native)))
-#define DEFAULT_FUNCTION_SPECIFIC_ATTRIBUTE
-
-#   define BEGIN_AVX512VBMI2_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,avx512vbmi2,tune=native\")")
-#   define BEGIN_AVX512VBMI_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,avx512vl,avx512vbmi,tune=native\")")
-#   define BEGIN_AVX512BW_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,avx512bw,tune=native\")")
-#   define BEGIN_AVX512F_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,avx512f,tune=native\")")
-#   define BEGIN_AVX2_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,avx2,tune=native\")")
-#   define BEGIN_AVX_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,avx,tune=native\")")
-#   define BEGIN_SSE42_SPECIFIC_CODE \
-        _Pragma("GCC push_options") \
-        _Pragma("GCC target(\"sse,sse2,sse3,ssse3,sse4,popcnt,tune=native\")")
-#   define END_TARGET_SPECIFIC_CODE \
-        _Pragma("GCC pop_options")
-
-/* GCC doesn't show such warning, we don't need to define anything.
- */
-#   define DUMMY_FUNCTION_DEFINITION
-#endif
 
 #define DECLARE_SSE42_SPECIFIC_CODE(...) \
 BEGIN_SSE42_SPECIFIC_CODE \
diff --git a/src/Common/ThreadFuzzer.cpp b/src/Common/ThreadFuzzer.cpp
index 0868613d880..d1e252a8184 100644
--- a/src/Common/ThreadFuzzer.cpp
+++ b/src/Common/ThreadFuzzer.cpp
@@ -15,6 +15,7 @@
 #include <Common/logger_useful.h>
 
 #include <Common/Exception.h>
+#include <Common/MemoryTracker.h>
 #include <Common/thread_local_rng.h>
 
 #include <Common/ThreadFuzzer.h>
@@ -51,7 +52,11 @@ ThreadFuzzer::ThreadFuzzer()
 {
     initConfiguration();
     if (!isEffective())
+    {
+        /// It has no effect - disable it
+        stop();
         return;
+    }
     setup();
 }
 
@@ -82,12 +87,12 @@ static std::atomic<int> num_cpus = 0;
         static std::atomic<double> NAME##_before_yield_probability = 0; \
         static std::atomic<double> NAME##_before_migrate_probability = 0; \
         static std::atomic<double> NAME##_before_sleep_probability = 0; \
-        static std::atomic<double> NAME##_before_sleep_time_us = 0; \
+        static std::atomic<double> NAME##_before_sleep_time_us_max = 0; \
 \
         static std::atomic<double> NAME##_after_yield_probability = 0; \
         static std::atomic<double> NAME##_after_migrate_probability = 0; \
         static std::atomic<double> NAME##_after_sleep_probability = 0; \
-        static std::atomic<double> NAME##_after_sleep_time_us = 0;
+        static std::atomic<double> NAME##_after_sleep_time_us_max = 0;
 
 FOR_EACH_WRAPPED_FUNCTION(DEFINE_WRAPPER_PARAMS)
 
@@ -106,7 +111,7 @@ void ThreadFuzzer::initConfiguration()
     initFromEnv(yield_probability, "THREAD_FUZZER_YIELD_PROBABILITY");
     initFromEnv(migrate_probability, "THREAD_FUZZER_MIGRATE_PROBABILITY");
     initFromEnv(sleep_probability, "THREAD_FUZZER_SLEEP_PROBABILITY");
-    initFromEnv(sleep_time_us, "THREAD_FUZZER_SLEEP_TIME_US");
+    initFromEnv(sleep_time_us_max, "THREAD_FUZZER_SLEEP_TIME_US_MAX");
     initFromEnv(explicit_sleep_probability, "THREAD_FUZZER_EXPLICIT_SLEEP_PROBABILITY");
     initFromEnv(explicit_memory_exception_probability, "THREAD_FUZZER_EXPLICIT_MEMORY_EXCEPTION_PROBABILITY");
 
@@ -115,13 +120,12 @@ void ThreadFuzzer::initConfiguration()
         initFromEnv(NAME##_before_yield_probability, "THREAD_FUZZER_" #NAME "_BEFORE_YIELD_PROBABILITY"); \
         initFromEnv(NAME##_before_migrate_probability, "THREAD_FUZZER_" #NAME "_BEFORE_MIGRATE_PROBABILITY"); \
         initFromEnv(NAME##_before_sleep_probability, "THREAD_FUZZER_" #NAME "_BEFORE_SLEEP_PROBABILITY"); \
-        initFromEnv(NAME##_before_sleep_time_us, "THREAD_FUZZER_" #NAME "_BEFORE_SLEEP_TIME_US"); \
+        initFromEnv(NAME##_before_sleep_time_us_max, "THREAD_FUZZER_" #NAME "_BEFORE_SLEEP_TIME_US_MAX"); \
 \
         initFromEnv(NAME##_after_yield_probability, "THREAD_FUZZER_" #NAME "_AFTER_YIELD_PROBABILITY"); \
         initFromEnv(NAME##_after_migrate_probability, "THREAD_FUZZER_" #NAME "_AFTER_MIGRATE_PROBABILITY"); \
         initFromEnv(NAME##_after_sleep_probability, "THREAD_FUZZER_" #NAME "_AFTER_SLEEP_PROBABILITY"); \
-        initFromEnv(NAME##_after_sleep_time_us, "THREAD_FUZZER_" #NAME "_AFTER_SLEEP_TIME_US");
-
+        initFromEnv(NAME##_after_sleep_time_us_max, "THREAD_FUZZER_" #NAME "_AFTER_SLEEP_TIME_US_MAX");
     FOR_EACH_WRAPPED_FUNCTION(INIT_WRAPPER_PARAMS)
 
 #    undef INIT_WRAPPER_PARAMS
@@ -142,7 +146,7 @@ bool ThreadFuzzer::isEffective() const
             return true; \
         if (NAME##_before_sleep_probability.load(std::memory_order_relaxed) > 0.0) \
             return true; \
-        if (NAME##_before_sleep_time_us.load(std::memory_order_relaxed) > 0.0) \
+        if (NAME##_before_sleep_time_us_max.load(std::memory_order_relaxed) > 0.0) \
             return true; \
 \
         if (NAME##_after_yield_probability.load(std::memory_order_relaxed) > 0.0) \
@@ -151,7 +155,7 @@ bool ThreadFuzzer::isEffective() const
             return true; \
         if (NAME##_after_sleep_probability.load(std::memory_order_relaxed) > 0.0) \
             return true; \
-        if (NAME##_after_sleep_time_us.load(std::memory_order_relaxed) > 0.0) \
+        if (NAME##_after_sleep_time_us_max.load(std::memory_order_relaxed) > 0.0) \
             return true;
 
     FOR_EACH_WRAPPED_FUNCTION(CHECK_WRAPPER_PARAMS)
@@ -162,7 +166,7 @@ bool ThreadFuzzer::isEffective() const
     return cpu_time_period_us != 0
         && (yield_probability > 0
             || migrate_probability > 0
-            || (sleep_probability > 0 && sleep_time_us > 0));
+            || (sleep_probability > 0 && sleep_time_us_max > 0));
 }
 
 void ThreadFuzzer::stop()
@@ -172,6 +176,8 @@ void ThreadFuzzer::stop()
 
 void ThreadFuzzer::start()
 {
+    if (!instance().isEffective())
+        return;
     started.store(true, std::memory_order_relaxed);
 }
 
@@ -180,11 +186,11 @@ bool ThreadFuzzer::isStarted()
     return started.load(std::memory_order_relaxed);
 }
 
-static void injection(
+static void injectionImpl(
     double yield_probability,
     double migrate_probability,
     double sleep_probability,
-    double sleep_time_us [[maybe_unused]])
+    double sleep_time_us_max)
 {
     DENY_ALLOCATIONS_IN_SCOPE;
     if (!ThreadFuzzer::isStarted())
@@ -215,17 +221,30 @@ static void injection(
 #endif
 
     if (sleep_probability > 0
-        && sleep_time_us > 0
+        && sleep_time_us_max > 0
         && std::bernoulli_distribution(sleep_probability)(thread_local_rng))
     {
-        sleepForNanoseconds(static_cast<uint64_t>(sleep_time_us * 1000));
+        sleepForNanoseconds((thread_local_rng() % static_cast<uint64_t>(sleep_time_us_max)) * 1000); /*may sleep(0)*/
     }
 }
 
+static ALWAYS_INLINE void injection(
+    double yield_probability,
+    double migrate_probability,
+    double sleep_probability,
+    double sleep_time_us_max)
+{
+    DENY_ALLOCATIONS_IN_SCOPE;
+    if (!ThreadFuzzer::isStarted())
+        return;
+
+    injectionImpl(yield_probability, migrate_probability, sleep_probability, sleep_time_us_max);
+}
+
 void ThreadFuzzer::maybeInjectSleep()
 {
     auto & fuzzer = ThreadFuzzer::instance();
-    injection(fuzzer.yield_probability, fuzzer.migrate_probability, fuzzer.explicit_sleep_probability, fuzzer.sleep_time_us);
+    injection(fuzzer.yield_probability, fuzzer.migrate_probability, fuzzer.explicit_sleep_probability, fuzzer.sleep_time_us_max);
 }
 
 /// Sometimes maybeInjectSleep() is not enough and we need to inject an exception.
@@ -246,7 +265,7 @@ void ThreadFuzzer::signalHandler(int)
     DENY_ALLOCATIONS_IN_SCOPE;
     auto saved_errno = errno;
     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.sleep_probability, fuzzer.sleep_time_us_max);
     errno = saved_errno;
 }
 
@@ -286,17 +305,17 @@ void ThreadFuzzer::setup() const
 
 #if THREAD_FUZZER_WRAP_PTHREAD
 #define INJECTION_BEFORE(NAME) \
-    injection(                                                             \
+    injectionImpl(                                                         \
         NAME##_before_yield_probability.load(std::memory_order_relaxed),   \
         NAME##_before_migrate_probability.load(std::memory_order_relaxed), \
         NAME##_before_sleep_probability.load(std::memory_order_relaxed),   \
-        NAME##_before_sleep_time_us.load(std::memory_order_relaxed));
+        NAME##_before_sleep_time_us_max.load(std::memory_order_relaxed));
 #define INJECTION_AFTER(NAME) \
-    injection(                                                             \
+    injectionImpl(                                                         \
         NAME##_after_yield_probability.load(std::memory_order_relaxed),    \
         NAME##_after_migrate_probability.load(std::memory_order_relaxed),  \
         NAME##_after_sleep_probability.load(std::memory_order_relaxed),    \
-        NAME##_after_sleep_time_us.load(std::memory_order_relaxed));
+        NAME##_after_sleep_time_us_max.load(std::memory_order_relaxed));
 
 /// ThreadFuzzer intercepts pthread_mutex_lock()/pthread_mutex_unlock().
 ///
@@ -383,13 +402,16 @@ static void * getFunctionAddress(const char * name)
     static constinit RET(*real_##NAME)(__VA_ARGS__) = nullptr;                    \
     extern "C" RET NAME(__VA_ARGS__)                                              \
     {                                                                             \
-        INJECTION_BEFORE(NAME);                                                   \
+        bool thread_fuzzer_enabled = ThreadFuzzer::isStarted();                   \
+        if (thread_fuzzer_enabled)                                                \
+            INJECTION_BEFORE(NAME);                                               \
         if (unlikely(!real_##NAME)) {                                             \
             real_##NAME =                                                         \
                 reinterpret_cast<RET(*)(__VA_ARGS__)>(getFunctionAddress(#NAME)); \
         }                                                                         \
         auto && ret{real_##NAME(arg)};                                            \
-        INJECTION_AFTER(NAME);                                                    \
+        if (thread_fuzzer_enabled)                                                \
+            INJECTION_AFTER(NAME);                                                \
         return ret;                                                               \
     }
 FOR_EACH_WRAPPED_FUNCTION(MAKE_WRAPPER_USING_DLSYM)
@@ -399,10 +421,17 @@ FOR_EACH_WRAPPED_FUNCTION(MAKE_WRAPPER_USING_DLSYM)
     extern "C" RET __##NAME(__VA_ARGS__);                   \
     extern "C" RET NAME(__VA_ARGS__)                        \
     {                                                       \
-        INJECTION_BEFORE(NAME);                             \
-        auto && ret{__##NAME(arg)};                         \
-        INJECTION_AFTER(NAME);                              \
-        return ret;                                         \
+        if (!ThreadFuzzer::isStarted())                     \
+        {                                                   \
+            return __##NAME(arg);                           \
+        }                                                   \
+        else                                                \
+        {                                                   \
+            INJECTION_BEFORE(NAME);                         \
+            auto && ret{__##NAME(arg)};                     \
+            INJECTION_AFTER(NAME);                          \
+            return ret;                                     \
+        }                                                   \
     }
 FOR_EACH_WRAPPED_FUNCTION(MAKE_WRAPPER_USING_INTERNAL_SYMBOLS)
 #undef MAKE_WRAPPER_USING_INTERNAL_SYMBOLS
diff --git a/src/Common/ThreadFuzzer.h b/src/Common/ThreadFuzzer.h
index 9dd55fe7995..e8f1fe606f0 100644
--- a/src/Common/ThreadFuzzer.h
+++ b/src/Common/ThreadFuzzer.h
@@ -1,6 +1,7 @@
 #pragma once
 #include <cstdint>
 #include <atomic>
+#include <base/defines.h>
 
 namespace DB
 {
@@ -15,7 +16,7 @@ namespace DB
   * THREAD_FUZZER_YIELD_PROBABILITY   - probability to do 'sched_yield'.
   * THREAD_FUZZER_MIGRATE_PROBABILITY - probability to set CPU affinity to random CPU core.
   * THREAD_FUZZER_SLEEP_PROBABILITY   - probability to sleep.
-  * THREAD_FUZZER_SLEEP_TIME_US       - amount of time to sleep in microseconds.
+  * THREAD_FUZZER_SLEEP_TIME_US_MAX   - max amount of time to sleep in microseconds, actual sleep time is randomized.
   *
   * ThreadFuzzer will do nothing if environment variables are not set accordingly.
   *
@@ -32,16 +33,14 @@ namespace DB
   *
   * Notes:
   * - it can be also implemented with instrumentation (example: LLVM Xray) instead of signals.
-  * - we should also make the sleep time random.
-  * - sleep and migration obviously helps, but the effect of yield is unclear.
   *
   * In addition, we allow to inject glitches around thread synchronization functions.
   * Example:
   *
   * THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_PROBABILITY=0.001
-  * THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US=10000
+  * THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US_MAX=10000
   * THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_PROBABILITY=0.001
-  * THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US=10000
+  * THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US_MAX=10000
   */
 class ThreadFuzzer
 {
@@ -56,7 +55,7 @@ public:
 
     static void stop();
     static void start();
-    static bool isStarted();
+    static bool ALWAYS_INLINE isStarted();
 
     static void maybeInjectSleep();
     static void maybeInjectMemoryLimitException();
@@ -66,7 +65,8 @@ private:
     double yield_probability = 0;
     double migrate_probability = 0;
     double sleep_probability = 0;
-    double sleep_time_us = 0;
+    double sleep_time_us_max = 0;
+
     double explicit_sleep_probability = 0;
     double explicit_memory_exception_probability = 0;
 
diff --git a/src/Common/ThreadPool.cpp b/src/Common/ThreadPool.cpp
index 3c2e6228421..eaee070c44f 100644
--- a/src/Common/ThreadPool.cpp
+++ b/src/Common/ThreadPool.cpp
@@ -490,8 +490,9 @@ void ThreadPoolImpl<Thread>::worker(typename std::list<Thread>::iterator thread_
 
 
 template class ThreadPoolImpl<std::thread>;
-template class ThreadPoolImpl<ThreadFromGlobalPoolImpl<false>>;
-template class ThreadFromGlobalPoolImpl<true>;
+template class ThreadPoolImpl<ThreadFromGlobalPoolImpl<false, true>>;
+template class ThreadFromGlobalPoolImpl<true, true>;
+template class ThreadFromGlobalPoolImpl<true, false>;
 
 std::unique_ptr<GlobalThreadPool> GlobalThreadPool::the_instance;
 
@@ -500,7 +501,9 @@ GlobalThreadPool::GlobalThreadPool(
     size_t max_threads_,
     size_t max_free_threads_,
     size_t queue_size_,
-    const bool shutdown_on_exception_)
+    const bool shutdown_on_exception_,
+    UInt64 global_profiler_real_time_period_ns_,
+    UInt64 global_profiler_cpu_time_period_ns_)
     : FreeThreadPool(
         CurrentMetrics::GlobalThread,
         CurrentMetrics::GlobalThreadActive,
@@ -509,10 +512,12 @@ GlobalThreadPool::GlobalThreadPool(
         max_free_threads_,
         queue_size_,
         shutdown_on_exception_)
+    , global_profiler_real_time_period_ns(global_profiler_real_time_period_ns_)
+    , global_profiler_cpu_time_period_ns(global_profiler_cpu_time_period_ns_)
 {
 }
 
-void GlobalThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size)
+void GlobalThreadPool::initialize(size_t max_threads, size_t max_free_threads, size_t queue_size, UInt64 global_profiler_real_time_period_ns, UInt64 global_profiler_cpu_time_period_ns)
 {
     if (the_instance)
     {
@@ -520,7 +525,7 @@ void GlobalThreadPool::initialize(size_t max_threads, size_t max_free_threads, s
             "The global thread pool is initialized twice");
     }
 
-    the_instance.reset(new GlobalThreadPool(max_threads, max_free_threads, queue_size, false /*shutdown_on_exception*/));
+    the_instance.reset(new GlobalThreadPool(max_threads, max_free_threads, queue_size, false /*shutdown_on_exception*/, global_profiler_real_time_period_ns, global_profiler_cpu_time_period_ns));
 }
 
 GlobalThreadPool & GlobalThreadPool::instance()
diff --git a/src/Common/ThreadPool.h b/src/Common/ThreadPool.h
index 31e4eabf63b..528f782caf2 100644
--- a/src/Common/ThreadPool.h
+++ b/src/Common/ThreadPool.h
@@ -172,10 +172,21 @@ class GlobalThreadPool : public FreeThreadPool, private boost::noncopyable
         size_t max_threads_,
         size_t max_free_threads_,
         size_t queue_size_,
-        bool shutdown_on_exception_);
+        bool shutdown_on_exception_,
+        UInt64 global_profiler_real_time_period_ns_,
+        UInt64 global_profiler_cpu_time_period_ns_);
 
 public:
-    static void initialize(size_t max_threads = 10000, size_t max_free_threads = 1000, size_t queue_size = 10000);
+    UInt64 global_profiler_real_time_period_ns;
+    UInt64 global_profiler_cpu_time_period_ns;
+
+    static void initialize(
+        size_t max_threads = 10000,
+        size_t max_free_threads = 1000,
+        size_t queue_size = 10000,
+        UInt64 global_profiler_real_time_period_ns_ = 0,
+        UInt64 global_profiler_cpu_time_period_ns_ = 0);
+
     static GlobalThreadPool & instance();
     static void shutdown();
 };
@@ -187,7 +198,7 @@ public:
   * NOTE: User code should use 'ThreadFromGlobalPool' declared below instead of directly using this class.
   *
   */
-template <bool propagate_opentelemetry_context = true>
+template <bool propagate_opentelemetry_context = true, bool global_trace_collector_allowed = true>
 class ThreadFromGlobalPoolImpl : boost::noncopyable
 {
 public:
@@ -197,11 +208,15 @@ public:
     explicit ThreadFromGlobalPoolImpl(Function && func, Args &&... args)
         : state(std::make_shared<State>())
     {
+        UInt64 global_profiler_real_time_period = GlobalThreadPool::instance().global_profiler_real_time_period_ns;
+        UInt64 global_profiler_cpu_time_period = GlobalThreadPool::instance().global_profiler_cpu_time_period_ns;
         /// NOTE:
         /// - 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([
             my_state = state,
+            global_profiler_real_time_period,
+            global_profiler_cpu_time_period,
             my_func = std::forward<Function>(func),
             my_args = std::make_tuple(std::forward<Args>(args)...)]() mutable /// mutable is needed to destroy capture
         {
@@ -220,6 +235,12 @@ public:
             /// 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;
+            if constexpr (global_trace_collector_allowed)
+            {
+                if (unlikely(global_profiler_real_time_period != 0 || global_profiler_cpu_time_period != 0))
+                    thread_status.initGlobalProfiler(global_profiler_real_time_period, global_profiler_cpu_time_period);
+            }
+
             std::apply(function, arguments);
         },
         {}, // default priority
@@ -305,11 +326,12 @@ protected:
 /// you need to use class, or you need to use ThreadFromGlobalPool below.
 ///
 /// See the comments of ThreadPool below to know how it works.
-using ThreadFromGlobalPoolNoTracingContextPropagation = ThreadFromGlobalPoolImpl<false>;
+using ThreadFromGlobalPoolNoTracingContextPropagation = ThreadFromGlobalPoolImpl<false, true>;
 
 /// An alias of thread that execute jobs/tasks on global thread pool by implicit passing tracing context on current thread to underlying worker as parent tracing context.
 /// If jobs/tasks are directly scheduled by using APIs of this class, you need to use this class or you need to use class above.
-using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true>;
+using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true, true>;
+using ThreadFromGlobalPoolWithoutTraceCollector = ThreadFromGlobalPoolImpl<true, false>;
 
 /// Recommended thread pool for the case when multiple thread pools are created and destroyed.
 ///
diff --git a/src/IO/WriteBufferFromS3TaskTracker.cpp b/src/Common/ThreadPoolTaskTracker.cpp
similarity index 87%
rename from src/IO/WriteBufferFromS3TaskTracker.cpp
rename to src/Common/ThreadPoolTaskTracker.cpp
index bce122dd6c8..10207eb6296 100644
--- a/src/IO/WriteBufferFromS3TaskTracker.cpp
+++ b/src/Common/ThreadPoolTaskTracker.cpp
@@ -1,8 +1,6 @@
 #include "config.h"
 
-#if USE_AWS_S3
-
-#include <IO/WriteBufferFromS3TaskTracker.h>
+#include "ThreadPoolTaskTracker.h"
 
 namespace ProfileEvents
 {
@@ -12,19 +10,19 @@ namespace ProfileEvents
 namespace DB
 {
 
-WriteBufferFromS3::TaskTracker::TaskTracker(ThreadPoolCallbackRunner<void> scheduler_, size_t max_tasks_inflight_, LogSeriesLimiterPtr limitedLog_)
+TaskTracker::TaskTracker(ThreadPoolCallbackRunner<void> scheduler_, size_t max_tasks_inflight_, LogSeriesLimiterPtr limitedLog_)
     : is_async(bool(scheduler_))
     , scheduler(scheduler_ ? std::move(scheduler_) : syncRunner())
     , max_tasks_inflight(max_tasks_inflight_)
     , limitedLog(limitedLog_)
 {}
 
-WriteBufferFromS3::TaskTracker::~TaskTracker()
+TaskTracker::~TaskTracker()
 {
     safeWaitAll();
 }
 
-ThreadPoolCallbackRunner<void> WriteBufferFromS3::TaskTracker::syncRunner()
+ThreadPoolCallbackRunner<void> TaskTracker::syncRunner()
 {
     return [](Callback && callback, int64_t) mutable -> std::future<void>
     {
@@ -35,7 +33,7 @@ ThreadPoolCallbackRunner<void> WriteBufferFromS3::TaskTracker::syncRunner()
     };
 }
 
-void WriteBufferFromS3::TaskTracker::waitAll()
+void TaskTracker::waitAll()
 {
     /// Exceptions are propagated
     for (auto & future : futures)
@@ -48,7 +46,7 @@ void WriteBufferFromS3::TaskTracker::waitAll()
     finished_futures.clear();
 }
 
-void WriteBufferFromS3::TaskTracker::safeWaitAll()
+void TaskTracker::safeWaitAll()
 {
     for (auto & future : futures)
     {
@@ -71,7 +69,7 @@ void WriteBufferFromS3::TaskTracker::safeWaitAll()
     finished_futures.clear();
 }
 
-void WriteBufferFromS3::TaskTracker::waitIfAny()
+void TaskTracker::waitIfAny()
 {
     if (futures.empty())
         return;
@@ -99,7 +97,7 @@ void WriteBufferFromS3::TaskTracker::waitIfAny()
     ProfileEvents::increment(ProfileEvents::WriteBufferFromS3WaitInflightLimitMicroseconds, watch.elapsedMicroseconds());
 }
 
-void WriteBufferFromS3::TaskTracker::add(Callback && func)
+void 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`.
@@ -134,7 +132,7 @@ void WriteBufferFromS3::TaskTracker::add(Callback && func)
     waitTilInflightShrink();
 }
 
-void WriteBufferFromS3::TaskTracker::waitTilInflightShrink()
+void TaskTracker::waitTilInflightShrink()
 {
     if (!max_tasks_inflight)
         return;
@@ -166,11 +164,10 @@ void WriteBufferFromS3::TaskTracker::waitTilInflightShrink()
     ProfileEvents::increment(ProfileEvents::WriteBufferFromS3WaitInflightLimitMicroseconds, watch.elapsedMicroseconds());
 }
 
-bool WriteBufferFromS3::TaskTracker::isAsync() const
+bool TaskTracker::isAsync() const
 {
     return is_async;
 }
 
 }
 
-#endif
diff --git a/src/IO/WriteBufferFromS3TaskTracker.h b/src/Common/ThreadPoolTaskTracker.h
similarity index 88%
rename from src/IO/WriteBufferFromS3TaskTracker.h
rename to src/Common/ThreadPoolTaskTracker.h
index 815e041ae52..72591648d30 100644
--- a/src/IO/WriteBufferFromS3TaskTracker.h
+++ b/src/Common/ThreadPoolTaskTracker.h
@@ -1,20 +1,16 @@
 #pragma once
 
 #include "config.h"
+#include "threadPoolCallbackRunner.h"
+#include "IO/WriteBufferFromS3.h"
 
-#if USE_AWS_S3
-
-#include "WriteBufferFromS3.h"
-
-#include <Common/logger_useful.h>
+#include "logger_useful.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.
@@ -22,7 +18,7 @@ namespace DB
 /// 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
+class TaskTracker
 {
 public:
     using Callback = std::function<void()>;
@@ -68,5 +64,3 @@ private:
 };
 
 }
-
-#endif
diff --git a/src/Common/ThreadPool_fwd.h b/src/Common/ThreadPool_fwd.h
index 2782acc9c51..fea4e59f087 100644
--- a/src/Common/ThreadPool_fwd.h
+++ b/src/Common/ThreadPool_fwd.h
@@ -3,11 +3,12 @@
 template <typename Thread>
 class ThreadPoolImpl;
 
-template <bool propagate_opentelemetry_context>
+template <bool propagate_opentelemetry_context, bool global_trace_collector_allowed>
 class ThreadFromGlobalPoolImpl;
 
-using ThreadFromGlobalPoolNoTracingContextPropagation = ThreadFromGlobalPoolImpl<false>;
+using ThreadFromGlobalPoolNoTracingContextPropagation = ThreadFromGlobalPoolImpl<false, true>;
 
-using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true>;
+using ThreadFromGlobalPool = ThreadFromGlobalPoolImpl<true, true>;
+using ThreadFromGlobalPoolWithoutTraceCollector = ThreadFromGlobalPoolImpl<true, false>;
 
 using ThreadPool = ThreadPoolImpl<ThreadFromGlobalPoolNoTracingContextPropagation>;
diff --git a/src/Common/ThreadProfileEvents.cpp b/src/Common/ThreadProfileEvents.cpp
index 256f53df011..6a63d484cd9 100644
--- a/src/Common/ThreadProfileEvents.cpp
+++ b/src/Common/ThreadProfileEvents.cpp
@@ -6,10 +6,8 @@
 #include "ProcfsMetricsProvider.h"
 #include "hasLinuxCapability.h"
 
-#include <filesystem>
 #include <fstream>
 #include <optional>
-#include <unordered_set>
 
 #include <fcntl.h>
 #include <unistd.h>
@@ -36,7 +34,7 @@ namespace ProfileEvents
     extern const Event OSReadBytes;
     extern const Event OSWriteBytes;
 
-    extern const Event PerfCpuCycles;
+    extern const Event PerfCPUCycles;
     extern const Event PerfInstructions;
     extern const Event PerfCacheReferences;
     extern const Event PerfCacheMisses;
@@ -45,12 +43,12 @@ namespace ProfileEvents
     extern const Event PerfBusCycles;
     extern const Event PerfStalledCyclesFrontend;
     extern const Event PerfStalledCyclesBackend;
-    extern const Event PerfRefCpuCycles;
+    extern const Event PerfRefCPUCycles;
 
-    extern const Event PerfCpuClock;
+    extern const Event PerfCPUClock;
     extern const Event PerfTaskClock;
     extern const Event PerfContextSwitches;
-    extern const Event PerfCpuMigrations;
+    extern const Event PerfCPUMigrations;
     extern const Event PerfAlignmentFaults;
     extern const Event PerfEmulationFaults;
     extern const Event PerfMinEnabledTime;
@@ -218,7 +216,7 @@ thread_local PerfEventsCounters current_thread_counters;
 
 // descriptions' source: http://man7.org/linux/man-pages/man2/perf_event_open.2.html
 static const PerfEventInfo raw_events_info[] = {
-    HARDWARE_EVENT(PERF_COUNT_HW_CPU_CYCLES, PerfCpuCycles),
+    HARDWARE_EVENT(PERF_COUNT_HW_CPU_CYCLES, PerfCPUCycles),
     HARDWARE_EVENT(PERF_COUNT_HW_INSTRUCTIONS, PerfInstructions),
     HARDWARE_EVENT(PERF_COUNT_HW_CACHE_REFERENCES, PerfCacheReferences),
     HARDWARE_EVENT(PERF_COUNT_HW_CACHE_MISSES, PerfCacheMisses),
@@ -227,13 +225,13 @@ static const PerfEventInfo raw_events_info[] = {
     HARDWARE_EVENT(PERF_COUNT_HW_BUS_CYCLES, PerfBusCycles),
     HARDWARE_EVENT(PERF_COUNT_HW_STALLED_CYCLES_FRONTEND, PerfStalledCyclesFrontend),
     HARDWARE_EVENT(PERF_COUNT_HW_STALLED_CYCLES_BACKEND, PerfStalledCyclesBackend),
-    HARDWARE_EVENT(PERF_COUNT_HW_REF_CPU_CYCLES, PerfRefCpuCycles),
+    HARDWARE_EVENT(PERF_COUNT_HW_REF_CPU_CYCLES, PerfRefCPUCycles),
 
     // `cpu-clock` is a bit broken according to this: https://stackoverflow.com/a/56967896
-    SOFTWARE_EVENT(PERF_COUNT_SW_CPU_CLOCK, PerfCpuClock),
+    SOFTWARE_EVENT(PERF_COUNT_SW_CPU_CLOCK, PerfCPUClock),
     SOFTWARE_EVENT(PERF_COUNT_SW_TASK_CLOCK, PerfTaskClock),
     SOFTWARE_EVENT(PERF_COUNT_SW_CONTEXT_SWITCHES, PerfContextSwitches),
-    SOFTWARE_EVENT(PERF_COUNT_SW_CPU_MIGRATIONS, PerfCpuMigrations),
+    SOFTWARE_EVENT(PERF_COUNT_SW_CPU_MIGRATIONS, PerfCPUMigrations),
     SOFTWARE_EVENT(PERF_COUNT_SW_ALIGNMENT_FAULTS, PerfAlignmentFaults),
     SOFTWARE_EVENT(PERF_COUNT_SW_EMULATION_FAULTS, PerfEmulationFaults),
 
@@ -300,7 +298,7 @@ static void enablePerfEvent(int event_fd)
 {
     if (ioctl(event_fd, PERF_EVENT_IOC_ENABLE, 0))
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Can't enable perf event with file descriptor {}: '{}' ({})",
             event_fd, errnoToString(), errno);
     }
@@ -310,7 +308,7 @@ static void disablePerfEvent(int event_fd)
 {
     if (ioctl(event_fd, PERF_EVENT_IOC_DISABLE, 0))
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Can't disable perf event with file descriptor {}: '{}' ({})",
             event_fd, errnoToString(), errno);
     }
@@ -320,7 +318,7 @@ static void releasePerfEvent(int event_fd)
 {
     if (close(event_fd))
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Can't close perf event file descriptor {}: {} ({})",
             event_fd, errnoToString(), errno);
     }
@@ -333,12 +331,12 @@ static bool validatePerfEventDescriptor(int & fd)
 
     if (errno == EBADF)
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Event descriptor {} was closed from the outside; reopening", fd);
     }
     else
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Error while checking availability of event descriptor {}: {} ({})",
             fd, errnoToString(), errno);
 
@@ -416,7 +414,7 @@ bool PerfEventsCounters::processThreadLocalChanges(const std::string & needed_ev
     bool has_cap_sys_admin = hasLinuxCapability(CAP_SYS_ADMIN);
     if (perf_event_paranoid >= 3 && !has_cap_sys_admin)
     {
-        LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+        LOG_WARNING(getLogger("PerfEvents"),
             "Not enough permissions to record perf events: "
             "perf_event_paranoid = {} and CAP_SYS_ADMIN = 0",
             perf_event_paranoid);
@@ -444,7 +442,7 @@ bool PerfEventsCounters::processThreadLocalChanges(const std::string & needed_ev
             // ENOENT means that the event is not supported. Don't log it, because
             // this is called for each thread and would be too verbose. Log other
             // error codes because they might signify an error.
-            LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+            LOG_WARNING(getLogger("PerfEvents"),
                 "Failed to open perf event {} (event_type={}, event_config={}): "
                 "'{}' ({})", event_info.settings_name, event_info.event_type,
                 event_info.event_config, errnoToString(), errno);
@@ -484,7 +482,7 @@ std::vector<size_t> PerfEventsCounters::eventIndicesFromString(const std::string
         }
         else
         {
-            LOG_ERROR(&Poco::Logger::get("PerfEvents"),
+            LOG_ERROR(getLogger("PerfEvents"),
                 "Unknown perf event name '{}' specified in settings", event_name);
         }
     }
@@ -531,7 +529,7 @@ void PerfEventsCounters::finalizeProfileEvents(ProfileEvents::Counters & profile
 
         if (bytes_read != bytes_to_read)
         {
-            LOG_WARNING(&Poco::Logger::get("PerfEvents"),
+            LOG_WARNING(getLogger("PerfEvents"),
                 "Can't read event value from file descriptor {}: '{}' ({})",
                 fd, errnoToString(), errno);
             current_values[i] = {};
diff --git a/src/Common/ThreadStatus.cpp b/src/Common/ThreadStatus.cpp
index c99823b2dfa..ad96018a17e 100644
--- a/src/Common/ThreadStatus.cpp
+++ b/src/Common/ThreadStatus.cpp
@@ -76,7 +76,7 @@ ThreadStatus::ThreadStatus(bool check_current_thread_on_destruction_)
     last_rusage = std::make_unique<RUsageCounters>();
 
     memory_tracker.setDescription("(for thread)");
-    log = &Poco::Logger::get("ThreadStatus");
+    log = getLogger("ThreadStatus");
 
     current_thread = this;
 
@@ -96,7 +96,7 @@ ThreadStatus::ThreadStatus(bool check_current_thread_on_destruction_)
         stack_t altstack_description{};
         altstack_description.ss_sp = alt_stack.getData();
         altstack_description.ss_flags = 0;
-        altstack_description.ss_size = alt_stack.getSize();
+        altstack_description.ss_size = ThreadStack::getSize();
 
         if (0 != sigaltstack(&altstack_description, nullptr))
         {
@@ -124,6 +124,26 @@ ThreadStatus::ThreadStatus(bool check_current_thread_on_destruction_)
 #endif
 }
 
+void ThreadStatus::initGlobalProfiler([[maybe_unused]] UInt64 global_profiler_real_time_period, [[maybe_unused]] UInt64 global_profiler_cpu_time_period)
+{
+#if !defined(SANITIZER) && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD) && !defined(__APPLE__)
+    try
+    {
+        if (global_profiler_real_time_period > 0)
+            query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
+                /* period= */ static_cast<UInt32>(global_profiler_real_time_period));
+
+        if (global_profiler_cpu_time_period > 0)
+            query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
+                /* period= */ static_cast<UInt32>(global_profiler_cpu_time_period));
+    }
+    catch (...)
+    {
+        tryLogCurrentException("ThreadStatus", "Cannot initialize GlobalProfiler");
+    }
+#endif
+}
+
 ThreadGroupPtr ThreadStatus::getThreadGroup() const
 {
     chassert(current_thread == this);
@@ -196,8 +216,9 @@ bool ThreadStatus::isQueryCanceled() const
     if (!thread_group)
         return false;
 
-    chassert(local_data.query_is_canceled_predicate);
-    return local_data.query_is_canceled_predicate();
+    if (local_data.query_is_canceled_predicate)
+        return local_data.query_is_canceled_predicate();
+    return false;
 }
 
 ThreadStatus::~ThreadStatus()
diff --git a/src/Common/ThreadStatus.h b/src/Common/ThreadStatus.h
index b8bdebf10ed..0c02ab8fdb0 100644
--- a/src/Common/ThreadStatus.h
+++ b/src/Common/ThreadStatus.h
@@ -1,12 +1,12 @@
 #pragma once
 
-#include <Core/SettingsEnums.h>
-#include <Interpreters/Context_fwd.h>
+#include <Core/LogsLevel.h>
 #include <IO/Progress.h>
+#include <Interpreters/Context_fwd.h>
+#include <base/StringRef.h>
 #include <Common/MemoryTracker.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Stopwatch.h>
-#include <base/StringRef.h>
 
 #include <boost/noncopyable.hpp>
 
@@ -66,7 +66,7 @@ class ThreadGroup
 public:
     ThreadGroup();
     using FatalErrorCallback = std::function<void()>;
-    ThreadGroup(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_ = {});
+    explicit ThreadGroup(ContextPtr query_context_, FatalErrorCallback fatal_error_callback_ = {});
 
     /// The first thread created this thread group
     const UInt64 master_thread_id;
@@ -236,7 +236,7 @@ private:
     using Deleter = std::function<void()>;
     Deleter deleter;
 
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
 
     bool check_current_thread_on_destruction;
 
@@ -307,6 +307,8 @@ public:
 
     void flushUntrackedMemory();
 
+    void initGlobalProfiler(UInt64 global_profiler_real_time_period, UInt64 global_profiler_cpu_time_period);
+
 private:
     void applyGlobalSettings();
     void applyQuerySettings();
diff --git a/src/Common/TransactionID.h b/src/Common/TransactionID.h
index 3ab86f7589c..97d0072bc14 100644
--- a/src/Common/TransactionID.h
+++ b/src/Common/TransactionID.h
@@ -16,7 +16,7 @@ class MergeTreeTransaction;
 /// or transaction object is not needed and not passed intentionally.
 #ifndef NO_TRANSACTION_PTR
 #define NO_TRANSACTION_PTR std::shared_ptr<MergeTreeTransaction>(nullptr)
-#define NO_TRANSACTION_RAW static_cast<MergeTreeTransaction *>(nullptr)
+#define NO_TRANSACTION_RAW static_cast<MergeTreeTransaction *>(nullptr) /// NOLINT(bugprone-macro-parentheses)
 #endif
 
 /// Commit Sequence Number
diff --git a/src/Common/Volnitsky.h b/src/Common/Volnitsky.h
index 3360c197984..6513bdb8bc3 100644
--- a/src/Common/Volnitsky.h
+++ b/src/Common/Volnitsky.h
@@ -191,7 +191,8 @@ namespace VolnitskyTraits
                         if (length_l != length_r)
                             return false;
 
-                        assert(length_l >= 2 && length_r >= 2);
+                        if (length_l < 2 || length_r < 2)
+                            return false;  /// Some part of the given ngram contains an invalid UTF-8 sequence.
 
                         chars.c0 = seq_l[seq_ngram_offset];
                         chars.c1 = seq_l[seq_ngram_offset + 1];
@@ -253,7 +254,9 @@ namespace VolnitskyTraits
                     if (size_l != size_u)
                         return false;
 
-                    assert(size_l >= 1 && size_u >= 1);
+                    if (size_l == 0 || size_u == 0)
+                        return false;  /// Some part of the given ngram contains an invalid UTF-8 sequence.
+
                     chars.c1 = seq_l[0];
                     putNGramBase(n, offset);
 
@@ -276,7 +279,8 @@ namespace VolnitskyTraits
                     if (size_l != size_u)
                         return false;
 
-                    assert(size_l > seq_ngram_offset && size_u > seq_ngram_offset);
+                    if (size_l <= seq_ngram_offset || size_u <= seq_ngram_offset)
+                        return false;  /// Some part of the given ngram contains an invalid UTF-8 sequence.
 
                     chars.c0 = seq_l[seq_ngram_offset];
                     putNGramBase(n, offset);
@@ -302,10 +306,8 @@ namespace VolnitskyTraits
                     if (size_first_l != size_first_u || size_second_l != size_second_u)
                         return false;
 
-                    assert(size_first_l > seq_ngram_offset);
-                    assert(size_first_u > seq_ngram_offset);
-                    assert(size_second_l > 0);
-                    assert(size_second_u > 0);
+                    if (size_first_l <= seq_ngram_offset || size_first_u <= seq_ngram_offset || size_second_l == 0 || size_second_u == 0)
+                        return false;
 
                     auto c0l = first_l_seq[seq_ngram_offset];
                     auto c0u = first_u_seq[seq_ngram_offset];
@@ -399,7 +401,7 @@ public:
         if (fallback || fallback_searcher.force_fallback)
             return;
 
-        hash = std::unique_ptr<VolnitskyTraits::Offset[]>(new VolnitskyTraits::Offset[VolnitskyTraits::hash_size]{});
+        hash = std::make_unique<VolnitskyTraits::Offset[]>(VolnitskyTraits::hash_size);
 
         auto callback = [this](const VolnitskyTraits::Ngram ngram, const int offset) { return this->putNGramBase(ngram, offset); };
         /// ssize_t is used here because unsigned can't be used with condition like `i >= 0`, unsigned always >= 0
diff --git a/src/Common/XMLUtils.cpp b/src/Common/XMLUtils.cpp
index db84e00adce..8dbafdaed58 100644
--- a/src/Common/XMLUtils.cpp
+++ b/src/Common/XMLUtils.cpp
@@ -6,7 +6,6 @@
 namespace DB::XMLUtils
 {
 
-using namespace Poco;
 using namespace Poco::XML;
 
 using XMLDocumentPtr = Poco::AutoPtr<Document>;
@@ -26,16 +25,16 @@ Node * getRootNode(Document * document)
 
 
 /// This class is used to access protected parseXXX static methods from AbstractConfiguration
-class ParseHelper : private Util::AbstractConfiguration
+class ParseHelper : private Poco::Util::AbstractConfiguration
 {
 public:
     ParseHelper() = delete;
 
-    using Util::AbstractConfiguration::parseInt;
-    using Util::AbstractConfiguration::parseUInt;
-    using Util::AbstractConfiguration::parseInt64;
-    using Util::AbstractConfiguration::parseUInt64;
-    using Util::AbstractConfiguration::parseBool;
+    using Poco::Util::AbstractConfiguration::parseInt;
+    using Poco::Util::AbstractConfiguration::parseUInt;
+    using Poco::Util::AbstractConfiguration::parseInt64;
+    using Poco::Util::AbstractConfiguration::parseUInt64;
+    using Poco::Util::AbstractConfiguration::parseBool;
 
     static std::string parseString(const std::string & s)
     {
diff --git a/src/Common/ZooKeeper/IKeeper.cpp b/src/Common/ZooKeeper/IKeeper.cpp
index 6c47ea68b84..7d2602bde1e 100644
--- a/src/Common/ZooKeeper/IKeeper.cpp
+++ b/src/Common/ZooKeeper/IKeeper.cpp
@@ -23,7 +23,7 @@ namespace ProfileEvents
 namespace Coordination
 {
 
-void Exception::incrementErrorMetrics(const Error code_)
+void Exception::incrementErrorMetrics(Error code_)
 {
     if (Coordination::isUserError(code_))
         ProfileEvents::increment(ProfileEvents::ZooKeeperUserExceptions);
@@ -33,14 +33,14 @@ void Exception::incrementErrorMetrics(const Error code_)
         ProfileEvents::increment(ProfileEvents::ZooKeeperOtherExceptions);
 }
 
-Exception::Exception(const std::string & msg, const Error code_, int)
+Exception::Exception(const std::string & msg, Error code_, int)
     : DB::Exception(msg, DB::ErrorCodes::KEEPER_EXCEPTION)
     , code(code_)
 {
     incrementErrorMetrics(code);
 }
 
-Exception::Exception(PreformattedMessage && msg, const Error code_)
+Exception::Exception(PreformattedMessage && msg, Error code_)
     : DB::Exception(std::move(msg), DB::ErrorCodes::KEEPER_EXCEPTION)
     , code(code_)
 {
@@ -48,7 +48,7 @@ Exception::Exception(PreformattedMessage && msg, const Error code_)
     incrementErrorMetrics(code);
 }
 
-Exception::Exception(const Error code_)
+Exception::Exception(Error code_)
     : Exception(code_, "Coordination error: {}", errorMessage(code_))
 {
 }
diff --git a/src/Common/ZooKeeper/IKeeper.h b/src/Common/ZooKeeper/IKeeper.h
index 76cdfe9f230..ec49c94808e 100644
--- a/src/Common/ZooKeeper/IKeeper.h
+++ b/src/Common/ZooKeeper/IKeeper.h
@@ -8,6 +8,7 @@
 #include <vector>
 #include <memory>
 #include <cstdint>
+#include <span>
 #include <functional>
 
 /** Generic interface for ZooKeeper-like services.
@@ -465,37 +466,37 @@ class Exception : public DB::Exception
 {
 private:
     /// Delegate constructor, used to minimize repetition; last parameter used for overload resolution.
-    Exception(const std::string & msg, const Error code_, int); /// NOLINT
-    Exception(PreformattedMessage && msg, const Error code_);
+    Exception(const std::string & msg, Error code_, int); /// NOLINT
+    Exception(PreformattedMessage && msg, Error code_);
 
     /// Message must be a compile-time constant
     template <typename T>
     requires std::is_convertible_v<T, String>
-    Exception(T && message, const Error code_) : DB::Exception(std::forward<T>(message), DB::ErrorCodes::KEEPER_EXCEPTION, /* remote_= */ false), code(code_)
+    Exception(T && message, Error code_) : DB::Exception(std::forward<T>(message), DB::ErrorCodes::KEEPER_EXCEPTION, /* remote_= */ false), code(code_)
     {
         incrementErrorMetrics(code);
     }
 
-    static void incrementErrorMetrics(const Error code_);
+    static void incrementErrorMetrics(Error code_);
 
 public:
-    explicit Exception(const Error code_); /// NOLINT
+    explicit Exception(Error code_); /// NOLINT
     Exception(const Exception & exc);
 
     template <typename... Args>
-    Exception(const Error code_, FormatStringHelper<Args...> fmt, Args &&... args)
+    Exception(Error code_, FormatStringHelper<Args...> fmt, Args &&... args)
         : DB::Exception(DB::ErrorCodes::KEEPER_EXCEPTION, std::move(fmt), std::forward<Args>(args)...)
         , code(code_)
     {
         incrementErrorMetrics(code);
     }
 
-    inline static Exception createDeprecated(const std::string & msg, const Error code_)
+    inline static Exception createDeprecated(const std::string & msg, Error code_)
     {
         return Exception(msg, code_, 0);
     }
 
-    inline static Exception fromPath(const Error code_, const std::string & path)
+    inline static Exception fromPath(Error code_, const std::string & path)
     {
         return Exception(code_, "Coordination error: {}, path {}", errorMessage(code_), path);
     }
@@ -503,7 +504,7 @@ public:
     /// Message must be a compile-time constant
     template <typename T>
     requires std::is_convertible_v<T, String>
-    inline static Exception fromMessage(const Error code_, T && message)
+    inline static Exception fromMessage(Error code_, T && message)
     {
         return Exception(std::forward<T>(message), code_);
     }
@@ -622,6 +623,10 @@ public:
         int32_t version,
         ReconfigCallback callback) = 0;
 
+    virtual void multi(
+        std::span<const RequestPtr> requests,
+        MultiCallback callback) = 0;
+
     virtual void multi(
         const Requests & requests,
         MultiCallback callback) = 0;
diff --git a/src/Common/ZooKeeper/TestKeeper.cpp b/src/Common/ZooKeeper/TestKeeper.cpp
index a25329ad7c0..fce29a21e15 100644
--- a/src/Common/ZooKeeper/TestKeeper.cpp
+++ b/src/Common/ZooKeeper/TestKeeper.cpp
@@ -157,6 +157,10 @@ struct TestKeeperReconfigRequest final : ReconfigRequest, TestKeeperRequest
 struct TestKeeperMultiRequest final : MultiRequest, TestKeeperRequest
 {
     explicit TestKeeperMultiRequest(const Requests & generic_requests)
+        : TestKeeperMultiRequest(std::span(generic_requests))
+    {}
+
+    explicit TestKeeperMultiRequest(std::span<const RequestPtr> generic_requests)
     {
         requests.reserve(generic_requests.size());
 
@@ -883,6 +887,13 @@ void TestKeeper::reconfig(
 void TestKeeper::multi(
         const Requests & requests,
         MultiCallback callback)
+{
+    return multi(std::span(requests), std::move(callback));
+}
+
+void TestKeeper::multi(
+        std::span<const RequestPtr> requests,
+        MultiCallback callback)
 {
     TestKeeperMultiRequest request(requests);
 
diff --git a/src/Common/ZooKeeper/TestKeeper.h b/src/Common/ZooKeeper/TestKeeper.h
index 36db5accff1..2774055652c 100644
--- a/src/Common/ZooKeeper/TestKeeper.h
+++ b/src/Common/ZooKeeper/TestKeeper.h
@@ -101,6 +101,10 @@ public:
             const Requests & requests,
             MultiCallback callback) override;
 
+    void multi(
+            std::span<const RequestPtr> requests,
+            MultiCallback callback) override;
+
     void finalize(const String & reason) override;
 
     bool isFeatureEnabled(DB::KeeperFeatureFlag) const override
diff --git a/src/Common/ZooKeeper/ZooKeeper.cpp b/src/Common/ZooKeeper/ZooKeeper.cpp
index 70b8df5cd2c..ca0a211c716 100644
--- a/src/Common/ZooKeeper/ZooKeeper.cpp
+++ b/src/Common/ZooKeeper/ZooKeeper.cpp
@@ -16,6 +16,7 @@
 #include <base/find_symbols.h>
 #include <base/sort.h>
 #include <base/getFQDNOrHostName.h>
+#include <Core/ServerUUID.h>
 #include "Common/ZooKeeper/IKeeper.h"
 #include <Common/DNSResolver.h>
 #include <Common/StringUtils/StringUtils.h>
@@ -60,7 +61,7 @@ void ZooKeeper::init(ZooKeeperArgs args_)
 
 {
     args = std::move(args_);
-    log = &Poco::Logger::get("ZooKeeper");
+    log = getLogger("ZooKeeper");
 
     if (args.implementation == "zookeeper")
     {
@@ -375,7 +376,7 @@ void ZooKeeper::createAncestors(const std::string & path)
         }
 
         Coordination::Responses responses;
-        Coordination::Error code = multiImpl(create_ops, responses);
+        Coordination::Error code = multiImpl(create_ops, responses, /*check_session_valid*/ false);
 
         if (code == Coordination::Error::ZOK)
             return;
@@ -638,12 +639,22 @@ Coordination::Error ZooKeeper::trySet(const std::string & path, const std::strin
 }
 
 
-Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests, Coordination::Responses & responses)
+Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid)
 {
     if (requests.empty())
         return Coordination::Error::ZOK;
 
-    auto future_result = asyncTryMultiNoThrow(requests);
+    std::future<Coordination::MultiResponse> future_result;
+    if (check_session_valid)
+    {
+        Coordination::Requests new_requests = requests;
+        addCheckSessionOp(new_requests);
+        future_result = asyncTryMultiNoThrow(new_requests);
+    }
+    else
+    {
+        future_result = asyncTryMultiNoThrow(requests);
+    }
 
     if (future_result.wait_for(std::chrono::milliseconds(args.operation_timeout_ms)) != std::future_status::ready)
     {
@@ -655,21 +666,35 @@ Coordination::Error ZooKeeper::multiImpl(const Coordination::Requests & requests
         auto response = future_result.get();
         Coordination::Error code = response.error;
         responses = response.responses;
+
+        if (check_session_valid)
+        {
+            if (code != Coordination::Error::ZOK && !Coordination::isHardwareError(code) && getFailedOpIndex(code, responses) == requests.size())
+            {
+                impl->finalize(fmt::format("Session was killed: {}", requests.back()->getPath()));
+                code = Coordination::Error::ZSESSIONMOVED;
+            }
+            responses.pop_back();
+            /// For some reason, for hardware errors we set ZOK codes for all responses.
+            /// In other cases, if the multi-request status is not ZOK, then the last response status must indicate an error too
+            chassert(code == Coordination::Error::ZOK || Coordination::isHardwareError(code) || responses.back()->error != Coordination::Error::ZOK);
+        }
+
         return code;
     }
 }
 
-Coordination::Responses ZooKeeper::multi(const Coordination::Requests & requests)
+Coordination::Responses ZooKeeper::multi(const Coordination::Requests & requests, bool check_session_valid)
 {
     Coordination::Responses responses;
-    Coordination::Error code = multiImpl(requests, responses);
+    Coordination::Error code = multiImpl(requests, responses, check_session_valid);
     KeeperMultiException::check(code, requests, responses);
     return responses;
 }
 
-Coordination::Error ZooKeeper::tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses)
+Coordination::Error ZooKeeper::tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid)
 {
-    Coordination::Error code = multiImpl(requests, responses);
+    Coordination::Error code = multiImpl(requests, responses, check_session_valid);
     if (code != Coordination::Error::ZOK && !Coordination::isUserError(code))
         throw KeeperException(code);
     return code;
@@ -935,12 +960,40 @@ Coordination::ReconfigResponse ZooKeeper::reconfig(
     return future_result.get();
 }
 
+ZooKeeperPtr ZooKeeper::create(const Poco::Util::AbstractConfiguration & config, const std::string & config_name, std::shared_ptr<DB::ZooKeeperLog> zk_log_)
+{
+    auto res = std::shared_ptr<ZooKeeper>(new ZooKeeper(config, config_name, zk_log_));
+    res->initSession();
+    return res;
+}
 
 ZooKeeperPtr ZooKeeper::startNewSession() const
 {
-    return std::make_shared<ZooKeeper>(args, zk_log);
+    auto res = std::shared_ptr<ZooKeeper>(new ZooKeeper(args, zk_log));
+    res->initSession();
+    return res;
 }
 
+void ZooKeeper::initSession()
+{
+    String session_path = fs::path(args.sessions_path) / args.zookeeper_name / toString(DB::ServerUUID::get());
+    Coordination::Stat stat;
+    if (trySet(session_path, "", -1, &stat) == Coordination::Error::ZOK)
+    {
+        session_node_version = stat.version;
+        return;
+    }
+
+    createAncestors(session_path);
+    create(session_path, "", zkutil::CreateMode::Persistent);
+    session_node_version = 0;
+}
+
+void ZooKeeper::addCheckSessionOp(Coordination::Requests & requests) const
+{
+    String session_path = fs::path(args.sessions_path) / args.zookeeper_name / toString(DB::ServerUUID::get());
+    requests.push_back(zkutil::makeCheckRequest(session_path, session_node_version));
+}
 
 bool ZooKeeper::expired()
 {
@@ -1213,6 +1266,11 @@ std::future<Coordination::RemoveResponse> ZooKeeper::asyncTryRemoveNoThrow(const
 }
 
 std::future<Coordination::MultiResponse> ZooKeeper::asyncTryMultiNoThrow(const Coordination::Requests & ops)
+{
+    return asyncTryMultiNoThrow(std::span(ops));
+}
+
+std::future<Coordination::MultiResponse> ZooKeeper::asyncTryMultiNoThrow(std::span<const Coordination::RequestPtr> ops)
 {
     auto promise = std::make_shared<std::promise<Coordination::MultiResponse>>();
     auto future = promise->get_future();
@@ -1243,11 +1301,11 @@ std::future<Coordination::MultiResponse> ZooKeeper::asyncMulti(const Coordinatio
     return future;
 }
 
-Coordination::Error ZooKeeper::tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses)
+Coordination::Error ZooKeeper::tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid)
 {
     try
     {
-        return multiImpl(requests, responses);
+        return multiImpl(requests, responses, check_session_valid);
     }
     catch (const Coordination::Exception & e)
     {
@@ -1455,7 +1513,7 @@ Coordination::RequestPtr makeExistsRequest(const std::string & path)
     return request;
 }
 
-std::string normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, Poco::Logger * log)
+std::string normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, LoggerPtr log)
 {
     if (!zookeeper_path.empty() && zookeeper_path.back() == '/')
         zookeeper_path.resize(zookeeper_path.size() - 1);
@@ -1491,7 +1549,7 @@ String extractZooKeeperName(const String & path)
     return default_zookeeper_name;
 }
 
-String extractZooKeeperPath(const String & path, bool check_starts_with_slash, Poco::Logger * log)
+String extractZooKeeperPath(const String & path, bool check_starts_with_slash, LoggerPtr log)
 {
     if (path.empty())
         throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "ZooKeeper path should not be empty");
diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index 1f29af0797b..42c77e5ca72 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -152,7 +152,7 @@ private:
 
     struct ResponsesWithFutures
     {
-        ResponsesWithFutures(FutureResponses future_responses_) : future_responses(std::move(future_responses_))
+        ResponsesWithFutures(FutureResponses future_responses_) : future_responses(std::move(future_responses_)) /// NOLINT(google-explicit-constructor)
         {
             cached_responses.resize(future_responses.size());
         }
@@ -198,11 +198,6 @@ class ZooKeeper
     /// ZooKeeperWithFaultInjection wants access to `impl` pointer to reimplement some async functions with faults
     friend class DB::ZooKeeperWithFaultInjection;
 
-public:
-
-    using Ptr = std::shared_ptr<ZooKeeper>;
-    using ErrorsList = std::initializer_list<Coordination::Error>;
-
     explicit ZooKeeper(const ZooKeeperArgs & args_, std::shared_ptr<DB::ZooKeeperLog> zk_log_ = nullptr);
 
     /** Config of the form:
@@ -227,10 +222,27 @@ public:
             <identity>user:password</identity>
         </zookeeper>
     */
-    ZooKeeper(const Poco::Util::AbstractConfiguration & config, const std::string & config_name, std::shared_ptr<DB::ZooKeeperLog> zk_log_);
+    ZooKeeper(const Poco::Util::AbstractConfiguration & config, const std::string & config_name, std::shared_ptr<DB::ZooKeeperLog> zk_log_ = nullptr);
+
+    /// See addCheckSessionOp
+    void initSession();
+
+public:
+        using Ptr = std::shared_ptr<ZooKeeper>;
+        using ErrorsList = std::initializer_list<Coordination::Error>;
 
     std::vector<ShuffleHost> shuffleHosts() const;
 
+    static Ptr create(const Poco::Util::AbstractConfiguration & config,
+                      const std::string & config_name,
+                      std::shared_ptr<DB::ZooKeeperLog> zk_log_);
+
+    template <typename... Args>
+    static Ptr createWithoutKillingPreviousSessions(Args &&... args)
+    {
+        return std::shared_ptr<ZooKeeper>(new ZooKeeper(std::forward<Args>(args)...));
+    }
+
     /// Creates a new session with the same parameters. This method can be used for reconnecting
     /// after the session has expired.
     /// This object remains unchanged, and the new session is returned.
@@ -427,13 +439,14 @@ public:
 
     /// Performs several operations in a transaction.
     /// Throws on every error.
-    Coordination::Responses multi(const Coordination::Requests & requests);
+    /// For check_session_valid see addCheckSessionOp
+    Coordination::Responses multi(const Coordination::Requests & requests, bool check_session_valid = false);
     /// Throws only if some operation has returned an "unexpected" error - an error that would cause
     /// the corresponding try- method to throw.
     /// On exception, `responses` may or may not be populated.
-    Coordination::Error tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses);
+    Coordination::Error tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid = false);
     /// Throws nothing (even session expired errors)
-    Coordination::Error tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses);
+    Coordination::Error tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid = false);
 
     std::string sync(const std::string & path);
 
@@ -537,6 +550,7 @@ public:
     FutureMulti asyncMulti(const Coordination::Requests & ops);
     /// Like the previous one but don't throw any exceptions on future.get()
     FutureMulti asyncTryMultiNoThrow(const Coordination::Requests & ops);
+    FutureMulti asyncTryMultiNoThrow(std::span<const Coordination::RequestPtr> ops);
 
     using FutureSync = std::future<Coordination::SyncResponse>;
     FutureSync asyncSync(const std::string & path);
@@ -587,6 +601,22 @@ public:
 
     const DB::KeeperFeatureFlags * getKeeperFeatureFlags() const { return impl->getKeeperFeatureFlags(); }
 
+    /// Checks that our session was not killed, and allows to avoid applying a request from an old lost session.
+    /// Imagine a "connection-loss-on-commit" situation like this:
+    /// - We have written some write requests to the socket and immediately disconnected (e.g. due to "Operation timeout")
+    /// - The requests were sent, but the destination [Zoo]Keeper host will receive it later (it doesn't know about our requests yet)
+    /// - We don't know the status of our requests
+    /// - We connect to another [Zoo]Keeper replica with a new session, and do some reads
+    ///   to find out the status of our requests. We see that they were not committed.
+    /// - The packets from our old session finally arrive to the destination [Zoo]Keeper host. The requests get processed.
+    /// - Changes are committed (although, we have already seen that they are not)
+    ///
+    /// We need a way to reject requests from old sessions somehow.
+    ///
+    /// So we update the version of /clickhouse/sessions/server_uuid node when starting a new session.
+    /// And there's an option to check this version when committing something.
+    void addCheckSessionOp(Coordination::Requests & requests) const;
+
 private:
     void init(ZooKeeperArgs args_);
 
@@ -602,7 +632,7 @@ private:
         Coordination::Stat * stat,
         Coordination::WatchCallbackPtr watch_callback,
         Coordination::ListRequestType list_request_type);
-    Coordination::Error multiImpl(const Coordination::Requests & requests, Coordination::Responses & responses);
+    Coordination::Error multiImpl(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid);
     Coordination::Error existsImpl(const std::string & path, Coordination::Stat * stat_, Coordination::WatchCallback watch_callback);
     Coordination::Error syncImpl(const std::string & path, std::string & returned_path);
 
@@ -650,10 +680,12 @@ private:
 
     ZooKeeperArgs args;
 
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
     std::shared_ptr<DB::ZooKeeperLog> zk_log;
 
     AtomicStopwatch session_uptime;
+
+    int32_t session_node_version;
 };
 
 
@@ -729,7 +761,7 @@ public:
             else
             {
                 ProfileEvents::increment(ProfileEvents::CannotRemoveEphemeralNode);
-                LOG_DEBUG(&Poco::Logger::get("EphemeralNodeHolder"), "Cannot remove {} since session has been expired", path);
+                LOG_DEBUG(getLogger("EphemeralNodeHolder"), "Cannot remove {} since session has been expired", path);
             }
         }
         catch (...)
@@ -749,11 +781,11 @@ private:
 
 using EphemeralNodeHolderPtr = EphemeralNodeHolder::Ptr;
 
-String normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, Poco::Logger * log = nullptr);
+String normalizeZooKeeperPath(std::string zookeeper_path, bool check_starts_with_slash, LoggerPtr log = nullptr);
 
 String extractZooKeeperName(const String & path);
 
-String extractZooKeeperPath(const String & path, bool check_starts_with_slash, Poco::Logger * log = nullptr);
+String extractZooKeeperPath(const String & path, bool check_starts_with_slash, LoggerPtr log = nullptr);
 
 String getSequentialNodeName(const String & prefix, UInt64 number);
 
diff --git a/src/Common/ZooKeeper/ZooKeeperArgs.cpp b/src/Common/ZooKeeper/ZooKeeperArgs.cpp
index 539ecdd0204..40bd9d79a03 100644
--- a/src/Common/ZooKeeper/ZooKeeperArgs.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperArgs.cpp
@@ -132,6 +132,8 @@ void ZooKeeperArgs::initFromKeeperServerSection(const Poco::Util::AbstractConfig
 
 void ZooKeeperArgs::initFromKeeperSection(const Poco::Util::AbstractConfiguration & config, const std::string & config_name)
 {
+    zookeeper_name = config_name;
+
     Poco::Util::AbstractConfiguration::Keys keys;
     config.keys(config_name, keys);
 
@@ -193,6 +195,10 @@ void ZooKeeperArgs::initFromKeeperSection(const Poco::Util::AbstractConfiguratio
         {
             chroot = config.getString(config_name + "." + key);
         }
+        else if (key == "sessions_path")
+        {
+            sessions_path = config.getString(config_name + "." + key);
+        }
         else if (key == "implementation")
         {
             implementation = config.getString(config_name + "." + key);
diff --git a/src/Common/ZooKeeper/ZooKeeperArgs.h b/src/Common/ZooKeeper/ZooKeeperArgs.h
index ff44a1b191b..27ba173c0c3 100644
--- a/src/Common/ZooKeeper/ZooKeeperArgs.h
+++ b/src/Common/ZooKeeper/ZooKeeperArgs.h
@@ -25,15 +25,17 @@ struct ZooKeeperArgs
     ZooKeeperArgs(const Poco::Util::AbstractConfiguration & config, const String & config_name);
 
     /// hosts_string -- comma separated [secure://]host:port list
-    ZooKeeperArgs(const String & hosts_string);
+    ZooKeeperArgs(const String & hosts_string); /// NOLINT(google-explicit-constructor)
     ZooKeeperArgs() = default;
     bool operator == (const ZooKeeperArgs &) const = default;
 
+    String zookeeper_name = "zookeeper";
     String implementation = "zookeeper";
     Strings hosts;
     String auth_scheme;
     String identity;
     String chroot;
+    String sessions_path = "/clickhouse/sessions";
     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;
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.cpp b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
index 592d142e925..4634eae7759 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.cpp
@@ -156,6 +156,12 @@ std::string ZooKeeperAuthRequest::toStringImpl() const
 
 void ZooKeeperCreateRequest::writeImpl(WriteBuffer & out) const
 {
+    /// See https://github.com/ClickHouse/clickhouse-private/issues/3029
+    if (path.starts_with("/clickhouse/tables/") && path.find("/parts/") != std::string::npos)
+    {
+        LOG_TRACE(getLogger(__PRETTY_FUNCTION__), "Creating part at path {}", path);
+    }
+
     Coordination::write(path, out);
     Coordination::write(data, out);
     Coordination::write(acls, out);
@@ -480,6 +486,10 @@ OpNum ZooKeeperMultiRequest::getOpNum() const
 }
 
 ZooKeeperMultiRequest::ZooKeeperMultiRequest(const Requests & generic_requests, const ACLs & default_acls)
+    : ZooKeeperMultiRequest(std::span{generic_requests}, default_acls)
+{}
+
+ZooKeeperMultiRequest::ZooKeeperMultiRequest(std::span<const Coordination::RequestPtr> generic_requests, const ACLs & default_acls)
 {
     /// Convert nested Requests to ZooKeeperRequests.
     /// Note that deep copy is required to avoid modifying path in presence of chroot prefix.
@@ -929,7 +939,7 @@ ZooKeeperRequest::~ZooKeeperRequest()
     constexpr UInt64 max_request_time_ns = 1000000000ULL; /// 1 sec
     if (max_request_time_ns < elapsed_ns)
     {
-        LOG_TEST(&Poco::Logger::get(__PRETTY_FUNCTION__), "Processing of request xid={} took {} ms", xid, elapsed_ns / 1000000UL);
+        LOG_TEST(getLogger(__PRETTY_FUNCTION__), "Processing of request xid={} took {} ms", xid, elapsed_ns / 1000000UL);
     }
 }
 
@@ -950,7 +960,7 @@ ZooKeeperResponse::~ZooKeeperResponse()
     constexpr UInt64 max_request_time_ns = 1000000000ULL; /// 1 sec
     if (max_request_time_ns < elapsed_ns)
     {
-        LOG_TEST(&Poco::Logger::get(__PRETTY_FUNCTION__), "Processing of response xid={} took {} ms", xid, elapsed_ns / 1000000UL);
+        LOG_TEST(getLogger(__PRETTY_FUNCTION__), "Processing of response xid={} took {} ms", xid, elapsed_ns / 1000000UL);
     }
 }
 
diff --git a/src/Common/ZooKeeper/ZooKeeperCommon.h b/src/Common/ZooKeeper/ZooKeeperCommon.h
index 5289be7a816..a1bd9b582e9 100644
--- a/src/Common/ZooKeeper/ZooKeeperCommon.h
+++ b/src/Common/ZooKeeper/ZooKeeperCommon.h
@@ -7,17 +7,13 @@
 #include <boost/noncopyable.hpp>
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
-#include <map>
 #include <unordered_map>
-#include <mutex>
-#include <chrono>
 #include <vector>
 #include <memory>
-#include <thread>
-#include <atomic>
 #include <cstdint>
 #include <optional>
 #include <functional>
+#include <span>
 
 
 namespace Coordination
@@ -516,6 +512,7 @@ struct ZooKeeperMultiRequest final : MultiRequest, ZooKeeperRequest
     ZooKeeperMultiRequest() = default;
 
     ZooKeeperMultiRequest(const Requests & generic_requests, const ACLs & default_acls);
+    ZooKeeperMultiRequest(std::span<const Coordination::RequestPtr> generic_requests, const ACLs & default_acls);
 
     void writeImpl(WriteBuffer & out) const override;
     void readImpl(ReadBuffer & in) override;
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.cpp b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
index d732b900d37..2185d32e47a 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.cpp
@@ -1,7 +1,8 @@
 #include <Common/ZooKeeper/ZooKeeperConstants.h>
-#include <Common/thread_local_rng.h>
-#include <Common/ZooKeeper/ZooKeeperImpl.h>
 
+#include <Compression/CompressedReadBuffer.h>
+#include <Compression/CompressedWriteBuffer.h>
+#include <Compression/CompressionFactory.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -10,17 +11,17 @@
 #include <Interpreters/Context.h>
 #include <base/getThreadId.h>
 #include <base/sleep.h>
+#include <Common/CurrentThread.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/ZooKeeper/ZooKeeperImpl.h>
 #include <Common/logger_useful.h>
 #include <Common/setThreadName.h>
-#include <Compression/CompressedReadBuffer.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <Compression/CompressionFactory.h>
+#include <Common/thread_local_rng.h>
 
 #include "Coordination/KeeperConstants.h"
 #include "config.h"
@@ -342,7 +343,7 @@ ZooKeeper::ZooKeeper(
     std::shared_ptr<ZooKeeperLog> zk_log_)
     : args(args_)
 {
-    log = &Poco::Logger::get("ZooKeeperClient");
+    log = getLogger("ZooKeeperClient");
     std::atomic_store(&zk_log, std::move(zk_log_));
 
     if (!args.chroot.empty())
@@ -812,7 +813,7 @@ void ZooKeeper::receiveEvent()
 
     RequestInfo request_info;
     ZooKeeperResponsePtr response;
-    UInt64 elapsed_ms = 0;
+    UInt64 elapsed_microseconds = 0;
 
     maybeInjectRecvFault();
 
@@ -875,8 +876,8 @@ void ZooKeeper::receiveEvent()
             CurrentMetrics::sub(CurrentMetrics::ZooKeeperRequest);
         }
 
-        elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
-        ProfileEvents::increment(ProfileEvents::ZooKeeperWaitMicroseconds, elapsed_ms);
+        elapsed_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
+        ProfileEvents::increment(ProfileEvents::ZooKeeperWaitMicroseconds, elapsed_microseconds);
     }
 
     try
@@ -935,7 +936,7 @@ void ZooKeeper::receiveEvent()
                                 length, actual_length);
         }
 
-        logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_ms);
+        logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_microseconds);
     }
     catch (...)
     {
@@ -954,7 +955,7 @@ void ZooKeeper::receiveEvent()
             if (request_info.callback)
                 request_info.callback(*response);
 
-            logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_ms);
+            logOperationIfNeeded(request_info.request, response, /* finalize= */ false, elapsed_microseconds);
         }
         catch (...)
         {
@@ -1048,14 +1049,14 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
                     ? Error::ZCONNECTIONLOSS
                     : Error::ZSESSIONEXPIRED;
                 response->xid = request_info.request->xid;
-                UInt64 elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
+                UInt64 elapsed_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - request_info.time).count();
 
                 if (request_info.callback)
                 {
                     try
                     {
                         request_info.callback(*response);
-                        logOperationIfNeeded(request_info.request, response, true, elapsed_ms);
+                        logOperationIfNeeded(request_info.request, response, true, elapsed_microseconds);
                     }
                     catch (...)
                     {
@@ -1115,8 +1116,8 @@ void ZooKeeper::finalize(bool error_send, bool error_receive, const String & rea
                     try
                     {
                         info.callback(*response);
-                        UInt64 elapsed_ms = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - info.time).count();
-                        logOperationIfNeeded(info.request, response, true, elapsed_ms);
+                        UInt64 elapsed_microseconds = std::chrono::duration_cast<std::chrono::microseconds>(clock::now() - info.time).count();
+                        logOperationIfNeeded(info.request, response, true, elapsed_microseconds);
                     }
                     catch (...)
                     {
@@ -1454,6 +1455,13 @@ void ZooKeeper::reconfig(
 void ZooKeeper::multi(
     const Requests & requests,
     MultiCallback callback)
+{
+    multi(std::span(requests), std::move(callback));
+}
+
+void ZooKeeper::multi(
+    std::span<const RequestPtr> requests,
+    MultiCallback callback)
 {
     ZooKeeperMultiRequest request(requests, default_acls);
 
@@ -1491,7 +1499,7 @@ void ZooKeeper::setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_)
 }
 
 #ifdef ZOOKEEPER_LOG
-void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response, bool finalize, UInt64 elapsed_ms)
+void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response, bool finalize, UInt64 elapsed_microseconds)
 {
     auto maybe_zk_log = std::atomic_load(&zk_log);
     if (!maybe_zk_log)
@@ -1529,7 +1537,7 @@ void ZooKeeper::logOperationIfNeeded(const ZooKeeperRequestPtr & request, const
         elem.event_time = event_time;
         elem.address = socket_address;
         elem.session_id = session_id;
-        elem.duration_ms = elapsed_ms;
+        elem.duration_microseconds = elapsed_microseconds;
         if (request)
         {
             elem.thread_id = request->thread_id;
diff --git a/src/Common/ZooKeeper/ZooKeeperImpl.h b/src/Common/ZooKeeper/ZooKeeperImpl.h
index 13e1dc9e3cd..cf331a03d06 100644
--- a/src/Common/ZooKeeper/ZooKeeperImpl.h
+++ b/src/Common/ZooKeeper/ZooKeeperImpl.h
@@ -194,6 +194,10 @@ public:
         int32_t version,
         ReconfigCallback callback) final;
 
+    void multi(
+        std::span<const RequestPtr> requests,
+        MultiCallback callback) override;
+
     void multi(
         const Requests & requests,
         MultiCallback callback) override;
@@ -287,7 +291,7 @@ private:
     class ThreadReference
     {
     public:
-        const ThreadReference & operator = (ThreadFromGlobalPool && thread_)
+        ThreadReference & operator = (ThreadFromGlobalPool && thread_)
         {
             std::lock_guard<std::mutex> l(lock);
             thread = std::move(thread_);
@@ -308,7 +312,7 @@ private:
     ThreadReference send_thread;
     ThreadReference receive_thread;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     void connect(
         const Nodes & node,
@@ -339,7 +343,7 @@ private:
     void flushWriteBuffer();
     ReadBuffer & getReadBuffer();
 
-    void logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response = nullptr, bool finalize = false, UInt64 elapsed_ms = 0);
+    void logOperationIfNeeded(const ZooKeeperRequestPtr & request, const ZooKeeperResponsePtr & response = nullptr, bool finalize = false, UInt64 elapsed_microseconds = 0);
 
     void initFeatureFlags();
 
diff --git a/src/Common/ZooKeeper/ZooKeeperLock.cpp b/src/Common/ZooKeeper/ZooKeeperLock.cpp
index 6ee1c380efb..b90bcfd2b55 100644
--- a/src/Common/ZooKeeper/ZooKeeperLock.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperLock.cpp
@@ -26,7 +26,7 @@ ZooKeeperLock::ZooKeeperLock(
     : zookeeper(zookeeper_)
     , lock_path(fs::path(lock_prefix_) / lock_name_)
     , lock_message(lock_message_)
-    , log(&Poco::Logger::get("zkutil::Lock"))
+    , log(getLogger("zkutil::Lock"))
 {
     zookeeper->createIfNotExists(lock_prefix_, "");
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperLock.h b/src/Common/ZooKeeper/ZooKeeperLock.h
index 146527c6c94..6271afaf6e2 100644
--- a/src/Common/ZooKeeper/ZooKeeperLock.h
+++ b/src/Common/ZooKeeper/ZooKeeperLock.h
@@ -46,7 +46,7 @@ private:
 
     std::string lock_path;
     std::string lock_message;
-    Poco::Logger * log;
+    LoggerPtr log;
     bool locked = false;
 
 };
diff --git a/src/Storages/MergeTree/ZooKeeperRetries.h b/src/Common/ZooKeeper/ZooKeeperRetries.h
similarity index 91%
rename from src/Storages/MergeTree/ZooKeeperRetries.h
rename to src/Common/ZooKeeper/ZooKeeperRetries.h
index 22282345220..39782d08b33 100644
--- a/src/Storages/MergeTree/ZooKeeperRetries.h
+++ b/src/Common/ZooKeeper/ZooKeeperRetries.h
@@ -5,8 +5,6 @@
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/logger_useful.h>
 
-#include <memory>
-
 namespace DB
 {
 
@@ -30,7 +28,7 @@ struct ZooKeeperRetriesInfo
 class ZooKeeperRetriesControl
 {
 public:
-    ZooKeeperRetriesControl(std::string name_, Poco::Logger * logger_, ZooKeeperRetriesInfo retries_info_, QueryStatusPtr elem)
+    ZooKeeperRetriesControl(std::string name_, LoggerPtr logger_, ZooKeeperRetriesInfo retries_info_, QueryStatusPtr elem)
         : name(std::move(name_)), logger(logger_), retries_info(retries_info_), process_list_element(elem)
     {
     }
@@ -122,7 +120,7 @@ public:
 
         iteration_succeeded = false;
         user_error.code = code;
-        user_error.message = std::move(message);
+        user_error.message = message;
         user_error.exception = exception;
         keeper_error = KeeperError{};
     }
@@ -147,11 +145,16 @@ public:
         user_error = UserError{};
     }
 
+    void setKeeperError(const zkutil::KeeperException & exception)
+    {
+        setKeeperError(std::make_exception_ptr(exception), exception.code, exception.message());
+    }
+
     void stopRetries() { stop_retries = true; }
 
     bool isLastRetry() const { return total_failures >= retries_info.max_retries; }
 
-    bool isRetry() const { return current_iteration > 1; }
+    bool isRetry() const { return current_iteration > 0; }
 
     const std::string & getLastKeeperErrorMessage() const { return keeper_error.message; }
 
@@ -160,7 +163,7 @@ public:
 
     const std::string & getName() const { return name; }
 
-    Poco::Logger * getLogger() const { return logger; }
+    LoggerPtr getLogger() const { return logger; }
 
 private:
     struct KeeperError
@@ -180,6 +183,12 @@ private:
 
     bool canTry()
     {
+        if (unconditional_retry)
+        {
+            unconditional_retry = false;
+            return true;
+        }
+
         if (iteration_succeeded)
         {
             if (logger && total_failures > 0)
@@ -209,8 +218,8 @@ private:
             return false;
         }
 
-        if (process_list_element && !process_list_element->checkTimeLimitSoft())
-            return false;
+        if (process_list_element)
+            process_list_element->checkTimeLimit();
 
         /// retries
         logLastError("will retry due to error");
@@ -263,7 +272,7 @@ private:
 
 
     std::string name;
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
     ZooKeeperRetriesInfo retries_info;
     UInt64 total_failures = 0;
     UserError user_error;
@@ -275,6 +284,10 @@ private:
 
     UInt64 current_iteration = 0;
     UInt64 current_backoff_ms = 0;
+
+public:
+    /// This is used in SharedMergeTree
+    bool unconditional_retry = false;
 };
 
 }
diff --git a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.cpp b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.cpp
index 72923ca0487..e6c3be50e61 100644
--- a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.cpp
+++ b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.cpp
@@ -9,7 +9,7 @@ ZooKeeperWithFaultInjection::ZooKeeperWithFaultInjection(
     double fault_injection_probability,
     UInt64 fault_injection_seed,
     std::string name_,
-    Poco::Logger * logger_)
+    LoggerPtr logger_)
     : keeper(keeper_)
     , fault_policy(std::make_unique<RandomFaultInjection>(fault_injection_probability, fault_injection_seed))
     , name(std::move(name_))
@@ -336,14 +336,14 @@ Coordination::Error ZooKeeperWithFaultInjection::tryCreate(const std::string & p
     return tryCreate(path, data, mode, path_created);
 }
 
-Coordination::Responses ZooKeeperWithFaultInjection::multi(const Coordination::Requests & requests)
+Coordination::Responses ZooKeeperWithFaultInjection::multi(const Coordination::Requests & requests, bool check_session_valid)
 {
     return executeWithFaultSync(
         __func__,
         !requests.empty() ? requests.front()->getPath() : "",
         [&]()
         {
-            auto responses = keeper->multi(requests);
+            auto responses = keeper->multi(requests, check_session_valid);
             if (unlikely(fault_policy))
                 multiResponseSaveEphemeralNodePaths(requests, responses);
             return responses;
@@ -420,14 +420,14 @@ void ZooKeeperWithFaultInjection::deleteEphemeralNodeIfContentMatches(
         __func__, path, [&]() { return keeper->deleteEphemeralNodeIfContentMatches(path, fast_delete_if_equal_value); });
 }
 
-Coordination::Error ZooKeeperWithFaultInjection::tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses)
+Coordination::Error ZooKeeperWithFaultInjection::tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid)
 {
     return executeWithFaultSync(
         __func__,
         !requests.empty() ? requests.front()->getPath() : "",
         [&]()
         {
-            auto code = keeper->tryMulti(requests, responses);
+            auto code = keeper->tryMulti(requests, responses, check_session_valid);
             if (unlikely(fault_policy) && code == Coordination::Error::ZOK)
                 multiResponseSaveEphemeralNodePaths(requests, responses);
             return code;
@@ -435,11 +435,11 @@ Coordination::Error ZooKeeperWithFaultInjection::tryMulti(const Coordination::Re
 }
 
 Coordination::Error
-ZooKeeperWithFaultInjection::tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses)
+ZooKeeperWithFaultInjection::tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid)
 {
     try
     {
-        return tryMulti(requests, responses);
+        return tryMulti(requests, responses, check_session_valid);
     }
     catch (const Coordination::Exception & e)
     {
diff --git a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
index 57e1f0f3b87..89ee4365c58 100644
--- a/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
+++ b/src/Common/ZooKeeper/ZooKeeperWithFaultInjection.h
@@ -62,7 +62,7 @@ class ZooKeeperWithFaultInjection
 
     std::unique_ptr<RandomFaultInjection> fault_policy;
     std::string name;
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
     const UInt64 seed = 0;
 
     std::vector<std::string> session_ephemeral_nodes;
@@ -87,7 +87,7 @@ public:
         double fault_injection_probability,
         UInt64 fault_injection_seed,
         std::string name_,
-        Poco::Logger * logger_);
+        LoggerPtr logger_);
 
     explicit ZooKeeperWithFaultInjection(zkutil::ZooKeeper::Ptr const & keeper_) : keeper(keeper_) { }
     static ZooKeeperWithFaultInjection::Ptr createInstance(
@@ -95,7 +95,7 @@ public:
         UInt64 fault_injection_seed,
         zkutil::ZooKeeper::Ptr const & zookeeper,
         std::string name,
-        Poco::Logger * logger)
+        LoggerPtr logger)
     {
         /// validate all parameters here, constructor just accept everything
         if (fault_injection_probability < 0.0)
@@ -212,7 +212,7 @@ public:
 
     Coordination::Error tryCreate(const std::string & path, const std::string & data, int32_t mode);
 
-    Coordination::Responses multi(const Coordination::Requests & requests);
+    Coordination::Responses multi(const Coordination::Requests & requests, bool check_session_valid = false);
 
     void createIfNotExists(const std::string & path, const std::string & data);
 
@@ -242,9 +242,9 @@ public:
 
     void deleteEphemeralNodeIfContentMatches(const std::string & path, const std::string & fast_delete_if_equal_value);
 
-    Coordination::Error tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses);
+    Coordination::Error tryMulti(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid = false);
 
-    Coordination::Error tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses);
+    Coordination::Error tryMultiNoThrow(const Coordination::Requests & requests, Coordination::Responses & responses, bool check_session_valid = false);
 
     ///
     /// mirror ZooKeeper interface: Async functions
diff --git a/src/Common/ZooKeeper/examples/zkutil_test_async.cpp b/src/Common/ZooKeeper/examples/zkutil_test_async.cpp
index eafa0e27691..7a9498542d2 100644
--- a/src/Common/ZooKeeper/examples/zkutil_test_async.cpp
+++ b/src/Common/ZooKeeper/examples/zkutil_test_async.cpp
@@ -5,9 +5,9 @@
 int main(int argc, char ** argv)
 try
 {
-    zkutil::ZooKeeper zookeeper{zkutil::ZooKeeperArgs("localhost:2181")};
+    auto zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(zkutil::ZooKeeperArgs("localhost:2181"));
 
-    auto nodes = zookeeper.getChildren("/tmp");
+    auto nodes = zookeeper->getChildren("/tmp");
 
     if (argc < 2)
     {
@@ -26,7 +26,7 @@ try
                 std::vector<std::future<Coordination::GetResponse>> futures;
                 futures.reserve(nodes.size());
                 for (auto & node : nodes)
-                    futures.push_back(zookeeper.asyncGet("/tmp/" + node));
+                    futures.push_back(zookeeper->asyncGet("/tmp/" + node));
 
                 for (auto & future : futures)
                     std::cerr << (future.get().data.empty() ? ',' : '.');
diff --git a/src/Common/ZooKeeper/examples/zkutil_test_commands.cpp b/src/Common/ZooKeeper/examples/zkutil_test_commands.cpp
index 095a0dde2e7..6e834644cdc 100644
--- a/src/Common/ZooKeeper/examples/zkutil_test_commands.cpp
+++ b/src/Common/ZooKeeper/examples/zkutil_test_commands.cpp
@@ -16,34 +16,34 @@ try
         return 1;
     }
 
-    ZooKeeper zk{zkutil::ZooKeeperArgs(argv[1])};
+    auto zk = ZooKeeper::createWithoutKillingPreviousSessions(zkutil::ZooKeeperArgs(argv[1]));
 
     std::cout << "create path" << std::endl;
-    zk.create("/test", "old", zkutil::CreateMode::Persistent);
+    zk->create("/test", "old", zkutil::CreateMode::Persistent);
     Coordination::Stat stat;
     zkutil::EventPtr watch = std::make_shared<Poco::Event>();
 
     std::cout << "get path" << std::endl;
-    zk.get("/test", &stat, watch);
+    zk->get("/test", &stat, watch);
     std::cout << "set path" << std::endl;
-    zk.set("/test", "new");
+    zk->set("/test", "new");
     watch->wait();
     std::cout << "watch happened" << std::endl;
     std::cout << "remove path" << std::endl;
 
     std::cout << "list path" << std::endl;
-    Strings children = zk.getChildren("/");
+    Strings children = zk->getChildren("/");
     for (const auto & name : children)
         std::cerr << "\t" << name << "\n";
 
-    zk.remove("/test");
+    zk->remove("/test");
 
     Coordination::Requests ops;
     ops.emplace_back(zkutil::makeCreateRequest("/test", "multi1", CreateMode::Persistent));
     ops.emplace_back(zkutil::makeSetRequest("/test", "multi2", -1));
     ops.emplace_back(zkutil::makeRemoveRequest("/test", -1));
     std::cout << "multi" << std::endl;
-    Coordination::Responses res = zk.multi(ops);
+    Coordination::Responses res = zk->multi(ops);
     std::cout << "path created: " << dynamic_cast<const Coordination::CreateResponse &>(*res[0]).path_created << std::endl;
 
     return 0;
diff --git a/src/Common/benchmarks/integer_hash_tables_and_hashes.cpp b/src/Common/benchmarks/integer_hash_tables_and_hashes.cpp
index 0bf13ef91ed..e6c09905ab8 100644
--- a/src/Common/benchmarks/integer_hash_tables_and_hashes.cpp
+++ b/src/Common/benchmarks/integer_hash_tables_and_hashes.cpp
@@ -26,10 +26,8 @@
 #include <pcg-random/pcg_random.hpp>
 #include <Common/randomSeed.h>
 
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wused-but-marked-unused"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
 #include <xxhash.h>
 
 using Key = UInt64;
@@ -385,6 +383,4 @@ OK_GOOGLE(TestRndInput, HashMap, TwoRoundsTwoVarsHash, elements_to_insert)
 OK_GOOGLE(TestRndInput, HashMap, WyHash, elements_to_insert)
 OK_GOOGLE(TestRndInput, HashMap, XXH3Hash, elements_to_insert)
 
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
diff --git a/src/Common/checkStackSize.cpp b/src/Common/checkStackSize.cpp
index 8c2a0aaed7f..c88554ca8fe 100644
--- a/src/Common/checkStackSize.cpp
+++ b/src/Common/checkStackSize.cpp
@@ -1,8 +1,8 @@
+#include <base/getThreadId.h>
+#include <base/defines.h> /// THREAD_SANITIZER
 #include <Common/checkStackSize.h>
 #include <Common/Exception.h>
-#include <base/getThreadId.h>
-#include <base/scope_guard.h>
-#include <base/defines.h> /// THREAD_SANITIZER
+#include <Common/Fiber.h>
 #include <sys/resource.h>
 #include <pthread.h>
 #include <unistd.h>
@@ -114,6 +114,10 @@ __attribute__((__weak__)) void checkStackSize()
 {
     using namespace DB;
 
+    /// Not implemented for coroutines.
+    if (Fiber::getCurrentFiber())
+        return;
+
     if (!stack_address)
         max_stack_size = getStackSize(&stack_address);
 
@@ -136,7 +140,7 @@ __attribute__((__weak__)) void checkStackSize()
 
     /// We assume that stack grows towards lower addresses. And that it starts to grow from the end of a chunk of memory of max_stack_size.
     if (int_frame_address > int_stack_address + max_stack_size)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: frame address is greater than stack begin address");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Frame address is greater than stack begin address");
 
     size_t stack_size = int_stack_address + max_stack_size - int_frame_address;
     size_t max_stack_size_allowed = static_cast<size_t>(max_stack_size * STACK_SIZE_FREE_RATIO);
diff --git a/src/Common/config.h.in b/src/Common/config.h.in
index 5b3388a3b7d..8e513dca145 100644
--- a/src/Common/config.h.in
+++ b/src/Common/config.h.in
@@ -5,6 +5,7 @@
 #cmakedefine01 USE_CPUID
 #cmakedefine01 USE_BASE64
 #cmakedefine01 USE_SSL
+#cmakedefine01 USE_SSH
 #cmakedefine01 USE_HDFS
 #cmakedefine01 USE_AWS_S3
 #cmakedefine01 USE_AZURE_BLOB_STORAGE
diff --git a/src/Common/examples/chaos_sanitizer.cpp b/src/Common/examples/chaos_sanitizer.cpp
index 76e22411a2e..175c3e8d767 100644
--- a/src/Common/examples/chaos_sanitizer.cpp
+++ b/src/Common/examples/chaos_sanitizer.cpp
@@ -12,7 +12,7 @@
 /** Proves that ThreadFuzzer helps to find concurrency bugs.
   *
   * for i in {1..10}; do ./chaos_sanitizer 1000000; done
-  * for i in {1..10}; do THREAD_FUZZER_CPU_TIME_PERIOD_US=1000 THREAD_FUZZER_SLEEP_PROBABILITY=0.1 THREAD_FUZZER_SLEEP_TIME_US=100000 ./chaos_sanitizer 1000000; done
+  * for i in {1..10}; do THREAD_FUZZER_CPU_TIME_PERIOD_US=1000 THREAD_FUZZER_SLEEP_PROBABILITY=0.1 THREAD_FUZZER_SLEEP_TIME_US_MAX=100000 ./chaos_sanitizer 1000000; done
   */
 int main(int argc, char ** argv)
 {
diff --git a/src/Common/examples/parallel_aggregation.cpp b/src/Common/examples/parallel_aggregation.cpp
index 20f5f1c5224..7094690a3a8 100644
--- a/src/Common/examples/parallel_aggregation.cpp
+++ b/src/Common/examples/parallel_aggregation.cpp
@@ -205,7 +205,7 @@ static void aggregate4(Map & local_map, MapTwoLevel & global_map, Mutex * mutexe
                 else
                 {
                     size_t hash_value = global_map.hash(*it);
-                    size_t bucket = global_map.getBucketFromHash(hash_value);
+                    size_t bucket = MapTwoLevel::getBucketFromHash(hash_value);
 
                     if (mutexes[bucket].try_lock())
                     {
diff --git a/src/Common/examples/small_table.cpp b/src/Common/examples/small_table.cpp
index 0e8a419e13d..6f63c815879 100644
--- a/src/Common/examples/small_table.cpp
+++ b/src/Common/examples/small_table.cpp
@@ -33,7 +33,7 @@ int main(int, char **)
     }
 
     {
-        using Cont = SmallSet<DB::UInt128, 16>;
+        using Cont = SmallSet<UInt128, 16>;
         Cont cont;
 
         DB::WriteBufferFromOwnString wb;
diff --git a/src/Common/findExtreme.cpp b/src/Common/findExtreme.cpp
index 032ac75b79b..ce3bbb86d7c 100644
--- a/src/Common/findExtreme.cpp
+++ b/src/Common/findExtreme.cpp
@@ -2,23 +2,28 @@
 #include <Common/TargetSpecific.h>
 #include <Common/findExtreme.h>
 
+#include <limits>
+#include <type_traits>
+
 namespace DB
 {
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 struct MinComparator
 {
     static ALWAYS_INLINE inline const T & cmp(const T & a, const T & b) { return std::min(a, b); }
 };
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 struct MaxComparator
 {
     static ALWAYS_INLINE inline const T & cmp(const T & a, const T & b) { return std::max(a, b); }
 };
 
 MULTITARGET_FUNCTION_AVX2_SSE42(
-    MULTITARGET_FUNCTION_HEADER(template <is_any_native_number T, typename ComparatorClass, bool add_all_elements, bool add_if_cond_zero> static std::optional<T> NO_INLINE),
+    MULTITARGET_FUNCTION_HEADER(
+        template <has_find_extreme_implementation T, typename ComparatorClass, bool add_all_elements, bool add_if_cond_zero>
+        static std::optional<T> NO_INLINE),
     findExtremeImpl,
     MULTITARGET_FUNCTION_BODY((const T * __restrict ptr, const UInt8 * __restrict condition_map [[maybe_unused]], size_t row_begin, size_t row_end) /// NOLINT
     {
@@ -65,24 +70,57 @@ MULTITARGET_FUNCTION_AVX2_SSE42(
                 for (size_t unroll_it = 0; unroll_it < unroll_block; unroll_it++)
                     ret = ComparatorClass::cmp(ret, partial_min[unroll_it]);
             }
-        }
 
-        for (; i < count; i++)
+            for (; i < count; i++)
+            {
+                if (add_all_elements || !condition_map[i] == add_if_cond_zero)
+                    ret = ComparatorClass::cmp(ret, ptr[i]);
+            }
+            return ret;
+        }
+        else
         {
-            if (add_all_elements || !condition_map[i] == add_if_cond_zero)
-                ret = ComparatorClass::cmp(ret, ptr[i]);
+            /// Only native integers
+            for (; i < count; i++)
+            {
+                constexpr bool is_min = std::same_as<ComparatorClass, MinComparator<T>>;
+                if constexpr (add_all_elements)
+                {
+                    ret = ComparatorClass::cmp(ret, ptr[i]);
+                }
+                else if constexpr (is_min)
+                {
+                    /// keep_number will be 0 or 1
+                    bool keep_number = !condition_map[i] == add_if_cond_zero;
+                    /// If keep_number = ptr[i] * 1 + 0 * max = ptr[i]
+                    /// If not keep_number = ptr[i] * 0 + 1 * max = max
+                    T final = ptr[i] * T{keep_number} + T{!keep_number} * std::numeric_limits<T>::max();
+                    ret = ComparatorClass::cmp(ret, final);
+                }
+                else
+                {
+                    static_assert(std::same_as<ComparatorClass, MaxComparator<T>>);
+                    /// keep_number will be 0 or 1
+                    bool keep_number = !condition_map[i] == add_if_cond_zero;
+                    /// If keep_number = ptr[i] * 1 + 0 * lowest = ptr[i]
+                    /// If not keep_number = ptr[i] * 0 + 1 * lowest = lowest
+                    T final = ptr[i] * T{keep_number} + T{!keep_number} * std::numeric_limits<T>::lowest();
+                    ret = ComparatorClass::cmp(ret, final);
+                }
+            }
+            return ret;
         }
-
-        return ret;
     }
 ))
 
 /// Given a vector of T finds the extreme (MIN or MAX) value
-template <is_any_native_number T, class ComparatorClass, bool add_all_elements, bool add_if_cond_zero>
+template <has_find_extreme_implementation T, class ComparatorClass, bool add_all_elements, bool add_if_cond_zero>
 static std::optional<T>
 findExtreme(const T * __restrict ptr, const UInt8 * __restrict condition_map [[maybe_unused]], size_t start, size_t end)
 {
 #if USE_MULTITARGET_CODE
+    /// In some cases the compiler if able to apply the condition and still generate SIMD, so we still build both
+    /// conditional and unconditional functions with multiple architectures
     /// We see no benefit from using AVX512BW or AVX512F (over AVX2), so we only declare SSE and AVX2
     if (isArchSupported(TargetArch::AVX2))
         return findExtremeImplAVX2<T, ComparatorClass, add_all_elements, add_if_cond_zero>(ptr, condition_map, start, end);
@@ -93,50 +131,90 @@ findExtreme(const T * __restrict ptr, const UInt8 * __restrict condition_map [[m
     return findExtremeImpl<T, ComparatorClass, add_all_elements, add_if_cond_zero>(ptr, condition_map, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMin(const T * __restrict ptr, size_t start, size_t end)
 {
     return findExtreme<T, MinComparator<T>, true, false>(ptr, nullptr, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMinNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end)
 {
     return findExtreme<T, MinComparator<T>, false, true>(ptr, condition_map, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMinIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end)
 {
     return findExtreme<T, MinComparator<T>, false, false>(ptr, condition_map, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMax(const T * __restrict ptr, size_t start, size_t end)
 {
     return findExtreme<T, MaxComparator<T>, true, false>(ptr, nullptr, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMaxNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end)
 {
     return findExtreme<T, MaxComparator<T>, false, true>(ptr, condition_map, start, end);
 }
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMaxIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end)
 {
     return findExtreme<T, MaxComparator<T>, false, false>(ptr, condition_map, start, end);
 }
 
+template <has_find_extreme_implementation T>
+std::optional<size_t> findExtremeMinIndex(const T * __restrict ptr, size_t start, size_t end)
+{
+    /// This is implemented based on findNumericExtreme and not the other way around (or independently) because getting
+    /// the MIN or MAX value of an array is possible with SIMD, but getting the index isn't.
+    /// So what we do is use SIMD to find the lowest value and then iterate again over the array to find its position
+    std::optional<T> opt = findExtremeMin(ptr, start, end);
+    if (!opt)
+        return std::nullopt;
+
+    /// Some minimal heuristics for the case the input is sorted
+    if (*opt == ptr[start])
+        return {start};
+    for (size_t i = end - 1; i > start; i--)
+        if (ptr[i] == *opt)
+            return {i};
+    return std::nullopt;
+}
+
+template <has_find_extreme_implementation T>
+std::optional<size_t> findExtremeMaxIndex(const T * __restrict ptr, size_t start, size_t end)
+{
+    std::optional<T> opt = findExtremeMax(ptr, start, end);
+    if (!opt)
+        return std::nullopt;
+
+    /// Some minimal heuristics for the case the input is sorted
+    if (*opt == ptr[start])
+        return {start};
+    for (size_t i = end - 1; i > start; i--)
+        if (ptr[i] == *opt)
+            return {i};
+    return std::nullopt;
+}
 
 #define INSTANTIATION(T) \
     template std::optional<T> findExtremeMin(const T * __restrict ptr, size_t start, size_t end); \
-    template std::optional<T> findExtremeMinNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
-    template std::optional<T> findExtremeMinIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    template std::optional<T> findExtremeMinNotNull( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    template std::optional<T> findExtremeMinIf( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
     template std::optional<T> findExtremeMax(const T * __restrict ptr, size_t start, size_t end); \
-    template std::optional<T> findExtremeMaxNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
-    template std::optional<T> findExtremeMaxIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
+    template std::optional<T> findExtremeMaxNotNull( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    template std::optional<T> findExtremeMaxIf( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    template std::optional<size_t> findExtremeMinIndex(const T * __restrict ptr, size_t start, size_t end); \
+    template std::optional<size_t> findExtremeMaxIndex(const T * __restrict ptr, size_t start, size_t end);
 
 FOR_BASIC_NUMERIC_TYPES(INSTANTIATION)
 #undef INSTANTIATION
diff --git a/src/Common/findExtreme.h b/src/Common/findExtreme.h
index b38c24697c0..68e7360d6e2 100644
--- a/src/Common/findExtreme.h
+++ b/src/Common/findExtreme.h
@@ -11,35 +11,47 @@
 namespace DB
 {
 template <typename T>
-concept is_any_native_number = (is_any_of<T, Int8, Int16, Int32, Int64, UInt8, UInt16, UInt32, UInt64, Float32, Float64>);
+concept has_find_extreme_implementation = (is_any_of<T, Int8, Int16, Int32, Int64, UInt8, UInt16, UInt32, UInt64, Float32, Float64>);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMin(const T * __restrict ptr, size_t start, size_t end);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMinNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMinIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMax(const T * __restrict ptr, size_t start, size_t end);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMaxNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
 
-template <is_any_native_number T>
+template <has_find_extreme_implementation T>
 std::optional<T> findExtremeMaxIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
 
+template <has_find_extreme_implementation T>
+std::optional<size_t> findExtremeMinIndex(const T * __restrict ptr, size_t start, size_t end);
+
+template <has_find_extreme_implementation T>
+std::optional<size_t> findExtremeMaxIndex(const T * __restrict ptr, size_t start, size_t end);
+
 #define EXTERN_INSTANTIATION(T) \
     extern template std::optional<T> findExtremeMin(const T * __restrict ptr, size_t start, size_t end); \
-    extern template std::optional<T> findExtremeMinNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
-    extern template std::optional<T> findExtremeMinIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    extern template std::optional<T> findExtremeMinNotNull( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    extern template std::optional<T> findExtremeMinIf( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
     extern template std::optional<T> findExtremeMax(const T * __restrict ptr, size_t start, size_t end); \
-    extern template std::optional<T> findExtremeMaxNotNull(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
-    extern template std::optional<T> findExtremeMaxIf(const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end);
+    extern template std::optional<T> findExtremeMaxNotNull( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    extern template std::optional<T> findExtremeMaxIf( \
+        const T * __restrict ptr, const UInt8 * __restrict condition_map, size_t start, size_t end); \
+    extern template std::optional<size_t> findExtremeMinIndex(const T * __restrict ptr, size_t start, size_t end); \
+    extern template std::optional<size_t> findExtremeMaxIndex(const T * __restrict ptr, size_t start, size_t end);
 
-    FOR_BASIC_NUMERIC_TYPES(EXTERN_INSTANTIATION)
+FOR_BASIC_NUMERIC_TYPES(EXTERN_INSTANTIATION)
 #undef EXTERN_INSTANTIATION
 
 }
diff --git a/src/Common/formatIPv6.h b/src/Common/formatIPv6.h
index f2a9ee960f3..3451eda6b3c 100644
--- a/src/Common/formatIPv6.h
+++ b/src/Common/formatIPv6.h
@@ -1,13 +1,12 @@
 #pragma once
 
-#include <base/types.h>
-#include <cstring>
 #include <algorithm>
+#include <cstring>
 #include <type_traits>
 #include <utility>
-#include <base/range.h>
-#include <base/unaligned.h>
 #include <base/hex.h>
+#include <base/types.h>
+#include <base/unaligned.h>
 #include <Common/StringUtils/StringUtils.h>
 
 constexpr size_t IPV4_BINARY_LENGTH = 4;
@@ -131,7 +130,7 @@ inline bool parseIPv4whole(const char * src, unsigned char * dst)
 * @return            - true if parsed successfully, false otherwise.
 */
 template <typename T, typename EOFfunction>
-requires (std::is_same<typename std::remove_cv<T>::type, char>::value)
+requires (std::is_same_v<typename std::remove_cv_t<T>, char>)
 inline bool parseIPv6(T * &src, EOFfunction eof, unsigned char * dst, int32_t first_block = -1)
 {
     const auto clear_dst = [dst]()
@@ -305,7 +304,7 @@ inline bool parseIPv6whole(const char * src, unsigned char * dst)
 * @return    - true if parsed successfully, false otherwise.
 */
 template <typename T, typename EOFfunction>
-requires (std::is_same<typename std::remove_cv<T>::type, char>::value)
+requires (std::is_same_v<typename std::remove_cv_t<T>, char>)
 inline bool parseIPv6orIPv4(T * &src, EOFfunction eof, unsigned char * dst)
 {
     const auto clear_dst = [dst]()
diff --git a/src/Common/formatReadable.cpp b/src/Common/formatReadable.cpp
index c72733323d3..7e126a72c33 100644
--- a/src/Common/formatReadable.cpp
+++ b/src/Common/formatReadable.cpp
@@ -13,8 +13,6 @@ namespace DB
     }
 }
 
-// I wanted to make this ALWAYS_INLINE to prevent flappy performance tests,
-// but GCC complains it may not be inlined.
 static void formatReadable(double size, DB::WriteBuffer & out,
     int precision, const char ** units, size_t units_size, double delimiter)
 {
@@ -25,7 +23,12 @@ static void formatReadable(double size, DB::WriteBuffer & out,
     DB::DoubleConverter<false>::BufferType buffer;
     double_conversion::StringBuilder builder{buffer, sizeof(buffer)};
 
-    const auto result = DB::DoubleConverter<false>::instance().ToFixed(size, precision, &builder);
+    const auto & converter = DB::DoubleConverter<false>::instance();
+
+    auto result = converter.ToFixed(size, precision, &builder);
+
+    if (!result)
+        result = converter.ToShortest(size, &builder);
 
     if (!result)
         throw DB::Exception(DB::ErrorCodes::CANNOT_PRINT_FLOAT_OR_DOUBLE_NUMBER, "Cannot print float or double number");
@@ -65,7 +68,11 @@ std::string formatReadableSizeWithDecimalSuffix(double value, int precision)
 
 void formatReadableQuantity(double value, DB::WriteBuffer & out, int precision)
 {
-    const char * units[] = {"", " thousand", " million", " billion", " trillion", " quadrillion"};
+    const char * units[] = {"", " thousand", " million", " billion", " trillion", " quadrillion",
+        " quintillion", " sextillion", " septillion", " octillion", " nonillion", " decillion",
+        " undecillion", " duodecillion", " tredecillion", " quattuordecillion", " quindecillion",
+        " sexdecillion", " septendecillion", " octodecillion", " novemdecillion", " vigintillion"};
+
     formatReadable(value, out, precision, units, sizeof(units) / sizeof(units[0]), 1000);
 }
 
diff --git a/src/Common/getMaxFileDescriptorCount.cpp b/src/Common/getMaxFileDescriptorCount.cpp
index 8ea55a23386..a2449f80889 100644
--- a/src/Common/getMaxFileDescriptorCount.cpp
+++ b/src/Common/getMaxFileDescriptorCount.cpp
@@ -1,36 +1,19 @@
-#include <IO/ReadHelpers.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/ReadBufferFromFile.h>
-#include <Common/ShellCommand.h>
 #include <Common/getMaxFileDescriptorCount.h>
-#include <filesystem>
+#include <sys/resource.h>
 
-int getMaxFileDescriptorCount()
+std::optional<size_t> getMaxFileDescriptorCount()
 {
-    namespace fs = std::filesystem;
-    int result = -1;
 #if defined(OS_LINUX) || defined(OS_DARWIN)
-    using namespace DB;
-
-    if (fs::exists("/proc/sys/fs/file-max"))
+    /// We want to calculate it only once.
+    static auto result = []() -> std::optional<size_t>
     {
-        ReadBufferFromFile reader("/proc/sys/fs/file-max");
-        readIntText(result, reader);
-    }
-    else
-    {
-        auto command = ShellCommand::execute("ulimit -n");
-        try
-        {
-            readIntText(result, command->out);
-            command->wait();
-        }
-        catch (...) // NOLINT(bugprone-empty-catch)
-        {
-        }
-    }
-
-#endif
-
+        rlimit rlim;
+        if (0 != getrlimit(RLIMIT_NOFILE, &rlim))
+            return std::nullopt;
+        return rlim.rlim_max;
+    }();
     return result;
+#else
+    return std::nullopt;
+#endif
 }
diff --git a/src/Common/getMaxFileDescriptorCount.h b/src/Common/getMaxFileDescriptorCount.h
index 6cc5df0d14c..bf0620fb6f9 100644
--- a/src/Common/getMaxFileDescriptorCount.h
+++ b/src/Common/getMaxFileDescriptorCount.h
@@ -1,6 +1,8 @@
 #pragma once
 
-/// Get process max file descriptor count
-/// @return -1 if os does not support ulimit command or some error occurs
-int getMaxFileDescriptorCount();
+#include <optional>
+
+/// Get process max file descriptor count
+/// @return std::nullopt if os does not support getrlimit command or some error occurs
+std::optional<size_t> getMaxFileDescriptorCount();
 
diff --git a/src/Common/getNumberOfPhysicalCPUCores.cpp b/src/Common/getNumberOfPhysicalCPUCores.cpp
index 8fbb32e911f..7e18a93e6ed 100644
--- a/src/Common/getNumberOfPhysicalCPUCores.cpp
+++ b/src/Common/getNumberOfPhysicalCPUCores.cpp
@@ -1,7 +1,5 @@
 #include "getNumberOfPhysicalCPUCores.h"
-#include <filesystem>
 
-#include "config.h"
 #if defined(OS_LINUX)
 #    include <cmath>
 #    include <fstream>
@@ -9,8 +7,10 @@
 
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/split.hpp>
+#include <base/cgroupsv2.h>
 #include <base/range.h>
 
+#include <filesystem>
 #include <thread>
 #include <set>
 
@@ -34,33 +34,21 @@ int32_t readFrom(const std::filesystem::path & filename, int default_value)
 uint32_t getCGroupLimitedCPUCores(unsigned default_cpu_count)
 {
     uint32_t quota_count = default_cpu_count;
-    std::filesystem::path prefix = "/sys/fs/cgroup";
     /// cgroupsv2
-    std::ifstream contr_file(prefix / "cgroup.controllers");
-    if (contr_file.is_open())
+    if (cgroupsV2Enabled())
     {
         /// First, we identify the cgroup the process belongs
-        std::ifstream cgroup_name_file("/proc/self/cgroup");
-        if (!cgroup_name_file.is_open())
+        std::string cgroup = cgroupV2OfProcess();
+        if (cgroup.empty())
             return default_cpu_count;
 
-        // cgroup_name_file always starts with '0::/' for v2
-        cgroup_name_file.ignore(4);
-        std::string cgroup_name;
-        cgroup_name_file >> cgroup_name;
-
-        std::filesystem::path current_cgroup;
-        if (cgroup_name.empty())
-            current_cgroup = prefix;
-        else
-            current_cgroup = prefix / cgroup_name;
+        auto current_cgroup = cgroup.empty() ? default_cgroups_mount : (default_cgroups_mount / cgroup);
 
         // Looking for cpu.max in directories from the current cgroup to the top level
         // It does not stop on the first time since the child could have a greater value than parent
-        while (current_cgroup != prefix.parent_path())
+        while (current_cgroup != default_cgroups_mount.parent_path())
         {
             std::ifstream cpu_max_file(current_cgroup / "cpu.max");
-            current_cgroup = current_cgroup.parent_path();
             if (cpu_max_file.is_open())
             {
                 std::string cpu_limit_str;
@@ -72,10 +60,11 @@ uint32_t getCGroupLimitedCPUCores(unsigned default_cpu_count)
                     quota_count = std::min(static_cast<uint32_t>(ceil(cpu_limit / cpu_period)), quota_count);
                 }
             }
+            current_cgroup = current_cgroup.parent_path();
         }
-        current_cgroup = prefix / cgroup_name;
+        current_cgroup = default_cgroups_mount / cgroup;
         // Looking for cpuset.cpus.effective in directories from the current cgroup to the top level
-        while (current_cgroup != prefix.parent_path())
+        while (current_cgroup != default_cgroups_mount.parent_path())
         {
             std::ifstream cpuset_cpus_file(current_cgroup / "cpuset.cpus.effective");
             current_cgroup = current_cgroup.parent_path();
@@ -113,8 +102,8 @@ uint32_t getCGroupLimitedCPUCores(unsigned default_cpu_count)
     /// cgroupsv1
     /// Return the number of milliseconds per period process is guaranteed to run.
     /// -1 for no quota
-    int cgroup_quota = readFrom(prefix / "cpu/cpu.cfs_quota_us", -1);
-    int cgroup_period = readFrom(prefix / "cpu/cpu.cfs_period_us", -1);
+    int cgroup_quota = readFrom(default_cgroups_mount / "cpu/cpu.cfs_quota_us", -1);
+    int cgroup_period = readFrom(default_cgroups_mount / "cpu/cpu.cfs_period_us", -1);
     if (cgroup_quota > -1 && cgroup_period > 0)
         quota_count = static_cast<uint32_t>(ceil(static_cast<float>(cgroup_quota) / static_cast<float>(cgroup_period)));
 
@@ -178,24 +167,24 @@ catch (...)
 
 unsigned getNumberOfPhysicalCPUCoresImpl()
 {
-    unsigned cpu_count = std::thread::hardware_concurrency(); /// logical cores (with SMT/HyperThreading)
+    unsigned cores = std::thread::hardware_concurrency(); /// logical cores (with SMT/HyperThreading)
 
+#if defined(__x86_64__) && defined(OS_LINUX)
     /// Most x86_64 CPUs have 2-way SMT (Hyper-Threading).
     /// Aarch64 and RISC-V don't have SMT so far.
     /// POWER has SMT and it can be multi-way (e.g. 8-way), but we don't know how ClickHouse really behaves, so use all of them.
-
-#if defined(__x86_64__) && defined(OS_LINUX)
+    ///
     /// On really big machines, SMT is detrimental to performance (+ ~5% overhead in ClickBench). On such machines, we limit ourself to the physical cores.
     /// Few cores indicate it is a small machine, runs in a VM or is a limited cloud instance --> it is reasonable to use all the cores.
-    if (cpu_count >= 32)
-        cpu_count = physical_concurrency();
+    if (cores >= 32)
+        cores = physical_concurrency();
 #endif
 
 #if defined(OS_LINUX)
-    cpu_count = getCGroupLimitedCPUCores(cpu_count);
+    cores = getCGroupLimitedCPUCores(cores);
 #endif
 
-    return cpu_count;
+    return cores;
 }
 
 }
@@ -203,6 +192,6 @@ unsigned getNumberOfPhysicalCPUCoresImpl()
 unsigned getNumberOfPhysicalCPUCores()
 {
     /// Calculate once.
-    static auto res = getNumberOfPhysicalCPUCoresImpl();
-    return res;
+    static auto cores = getNumberOfPhysicalCPUCoresImpl();
+    return cores;
 }
diff --git a/src/Common/hasLinuxCapability.cpp b/src/Common/hasLinuxCapability.cpp
index bf236eb5c56..6a4570a498c 100644
--- a/src/Common/hasLinuxCapability.cpp
+++ b/src/Common/hasLinuxCapability.cpp
@@ -5,6 +5,8 @@
 #include <syscall.h>
 #include <unistd.h>
 #include <linux/capability.h>
+#include <cstdint>
+#include <base/types.h>
 #include <Common/Exception.h>
 
 
@@ -16,25 +18,48 @@ namespace ErrorCodes
     extern const int NETLINK_ERROR;
 }
 
-static __user_cap_data_struct getCapabilities()
+struct Capabilities
+{
+    UInt64 effective;
+    UInt64 permitted;
+    UInt64 inheritable;
+};
+
+static Capabilities getCapabilities()
 {
     /// See man getcap.
     __user_cap_header_struct request{};
-    request.version = _LINUX_CAPABILITY_VERSION_1; /// It's enough to check just single CAP_NET_ADMIN capability we are interested.
+    request.version = _LINUX_CAPABILITY_VERSION_3;
     request.pid = getpid();
 
-    __user_cap_data_struct response{};
+    Capabilities ret{};
+    __user_cap_data_struct response[2] = {};
 
     /// Avoid dependency on 'libcap'.
-    if (0 != syscall(SYS_capget, &request, &response))
-        throw ErrnoException(ErrorCodes::NETLINK_ERROR, "Cannot do 'capget' syscall");
+    if (0 == syscall(SYS_capget, &request, response))
+    {
+        ret.effective   = static_cast<UInt64>(response[1].effective) << 32   | response[0].effective;
+        ret.permitted   = static_cast<UInt64>(response[1].permitted) << 32   | response[0].permitted;
+        ret.inheritable = static_cast<UInt64>(response[1].inheritable) << 32 | response[0].inheritable;
+        return ret;
+    }
 
-    return response;
+    /// Does not supports V3, fallback to V1.
+    /// It's enough to check just single CAP_NET_ADMIN capability we are interested.
+    if (errno == EINVAL && 0 == syscall(SYS_capget, &request, response))
+    {
+        ret.effective = response[0].effective;
+        ret.permitted = response[0].permitted;
+        ret.inheritable = response[0].inheritable;
+        return ret;
+    }
+
+    throw ErrnoException(ErrorCodes::NETLINK_ERROR, "Cannot do 'capget' syscall");
 }
 
 bool hasLinuxCapability(int cap)
 {
-    static __user_cap_data_struct capabilities = getCapabilities();
+    static Capabilities capabilities = getCapabilities();
     return (1 << cap) & capabilities.effective;
 }
 
diff --git a/src/Common/intExp.h b/src/Common/intExp.h
index 69b0f09975a..25ae2a8a4b6 100644
--- a/src/Common/intExp.h
+++ b/src/Common/intExp.h
@@ -4,15 +4,7 @@
 #include <limits>
 
 #include <base/extended_types.h>
-
-// Also defined in Core/Defines.h
-#if !defined(NO_SANITIZE_UNDEFINED)
-#if defined(__clang__)
-    #define NO_SANITIZE_UNDEFINED __attribute__((__no_sanitize__("undefined")))
-#else
-    #define NO_SANITIZE_UNDEFINED
-#endif
-#endif
+#include <base/defines.h>
 
 
 /// On overflow, the function returns unspecified value.
diff --git a/src/Common/iota.cpp b/src/Common/iota.cpp
index 98f18eb195b..82fe86618c9 100644
--- a/src/Common/iota.cpp
+++ b/src/Common/iota.cpp
@@ -27,10 +27,39 @@ void iota(T * begin, size_t count, T first_value)
     return iotaImpl(begin, count, first_value);
 }
 
+MULTITARGET_FUNCTION_AVX2_SSE42(
+    MULTITARGET_FUNCTION_HEADER(template <iota_supported_types T> void NO_INLINE),
+    iotaWithStepImpl, MULTITARGET_FUNCTION_BODY((T * begin, size_t count, T first_value, T step) /// NOLINT
+    {
+        for (size_t i = 0; i < count; i++)
+            *(begin + i) = static_cast<T>(first_value + i * step);
+    })
+)
+
+template <iota_supported_types T>
+void iotaWithStep(T * begin, size_t count, T first_value, T step)
+{
+#if USE_MULTITARGET_CODE
+    if (isArchSupported(TargetArch::AVX2))
+        return iotaWithStepImplAVX2(begin, count, first_value, step);
+
+    if (isArchSupported(TargetArch::SSE42))
+        return iotaWithStepImplSSE42(begin, count, first_value, step);
+#endif
+    return iotaWithStepImpl(begin, count, first_value, step);
+}
+
 template void iota(UInt8 * begin, size_t count, UInt8 first_value);
 template void iota(UInt32 * begin, size_t count, UInt32 first_value);
 template void iota(UInt64 * begin, size_t count, UInt64 first_value);
 #if defined(OS_DARWIN)
 template void iota(size_t * begin, size_t count, size_t first_value);
 #endif
+
+template void iotaWithStep(UInt8 * begin, size_t count, UInt8 first_value, UInt8 step);
+template void iotaWithStep(UInt32 * begin, size_t count, UInt32 first_value, UInt32 step);
+template void iotaWithStep(UInt64 * begin, size_t count, UInt64 first_value, UInt64 step);
+#if defined(OS_DARWIN)
+template void iotaWithStep(size_t * begin, size_t count, size_t first_value, size_t step);
+#endif
 }
diff --git a/src/Common/iota.h b/src/Common/iota.h
index 7910274d15d..7ddf61736b9 100644
--- a/src/Common/iota.h
+++ b/src/Common/iota.h
@@ -31,4 +31,14 @@ extern template void iota(UInt64 * begin, size_t count, UInt64 first_value);
 #if defined(OS_DARWIN)
 extern template void iota(size_t * begin, size_t count, size_t first_value);
 #endif
+
+template <iota_supported_types T>
+void iotaWithStep(T * begin, size_t count, T first_value, T step);
+
+extern template void iotaWithStep(UInt8 * begin, size_t count, UInt8 first_value, UInt8 step);
+extern template void iotaWithStep(UInt32 * begin, size_t count, UInt32 first_value, UInt32 step);
+extern template void iotaWithStep(UInt64 * begin, size_t count, UInt64 first_value, UInt64 step);
+#if defined(OS_DARWIN)
+extern template void iotaWithStep(size_t * begin, size_t count, size_t first_value, size_t step);
+#endif
 }
diff --git a/src/Common/logger_useful.h b/src/Common/logger_useful.h
index d9fe5ac9190..9d6ebaddcc6 100644
--- a/src/Common/logger_useful.h
+++ b/src/Common/logger_useful.h
@@ -5,11 +5,11 @@
 #include <fmt/format.h>
 #include <Poco/Logger.h>
 #include <Poco/Message.h>
-#include <Common/CurrentThread.h>
-#include <Common/ProfileEvents.h>
+#include <Common/AtomicLogger.h>
+#include <Common/CurrentThreadHelpers.h>
+#include <Common/Logger.h>
 #include <Common/LoggingFormatStringHelpers.h>
-
-namespace Poco { class Logger; }
+#include <Common/ProfileEvents.h>
 
 
 #define LogToStr(x, y) std::make_unique<LogToStrImpl>(x, y)
@@ -17,13 +17,14 @@ namespace Poco { class Logger; }
 
 using LogSeriesLimiterPtr = std::shared_ptr<LogSeriesLimiter>;
 
-namespace
+namespace impl
 {
-    [[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; }
-    [[maybe_unused]] LogSeriesLimiterPtr getLogger(LogSeriesLimiterPtr & logger) { return logger; }
+    [[maybe_unused]] inline LoggerPtr getLoggerHelper(const LoggerPtr & logger) { return logger; }
+    [[maybe_unused]] inline LoggerPtr getLoggerHelper(const DB::AtomicLogger & logger) { return logger.load(); }
+    [[maybe_unused]] inline const ::Poco::Logger * getLoggerHelper(const ::Poco::Logger * logger) { return logger; }
+    [[maybe_unused]] inline std::unique_ptr<LogToStrImpl> getLoggerHelper(std::unique_ptr<LogToStrImpl> && logger) { return logger; }
+    [[maybe_unused]] inline std::unique_ptr<LogFrequencyLimiterIml> getLoggerHelper(std::unique_ptr<LogFrequencyLimiterIml> && logger) { return logger; }
+    [[maybe_unused]] inline LogSeriesLimiterPtr getLoggerHelper(LogSeriesLimiterPtr & logger) { return logger; }
 }
 
 #define LOG_IMPL_FIRST_ARG(X, ...) X
@@ -62,9 +63,8 @@ namespace
 
 #define LOG_IMPL(logger, priority, PRIORITY, ...) do                                                                \
 {                                                                                                                   \
-    auto _logger = ::getLogger(logger);                                                                             \
-    const bool _is_clients_log = (DB::CurrentThread::getGroup() != nullptr) &&                                      \
-        (DB::CurrentThread::get().getClientLogsLevel() >= (priority));                                              \
+    auto _logger = ::impl::getLoggerHelper(logger);                                                                 \
+    const bool _is_clients_log = DB::currentThreadHasGroup() && DB::currentThreadLogsLevel() >= (priority);         \
     if (!_is_clients_log && !_logger->is((PRIORITY)))                                                               \
         break;                                                                                                      \
                                                                                                                     \
@@ -104,6 +104,18 @@ namespace
             (PRIORITY), _file_function.c_str(), __LINE__, _format_string);                                          \
         _channel->log(_poco_message);                                                                               \
     }                                                                                                               \
+    catch (const Poco::Exception & logger_exception)                                                                \
+    {                                                                                                               \
+        ::write(STDERR_FILENO, static_cast<const void *>(MESSAGE_FOR_EXCEPTION_ON_LOGGING), sizeof(MESSAGE_FOR_EXCEPTION_ON_LOGGING)); \
+        const std::string & logger_exception_message = logger_exception.message();                                  \
+        ::write(STDERR_FILENO, static_cast<const void *>(logger_exception_message.data()), logger_exception_message.size()); \
+    }                                                                                                               \
+    catch (const std::exception & logger_exception)                                                                 \
+    {                                                                                                               \
+        ::write(STDERR_FILENO, static_cast<const void *>(MESSAGE_FOR_EXCEPTION_ON_LOGGING), sizeof(MESSAGE_FOR_EXCEPTION_ON_LOGGING)); \
+        const char * logger_exception_message = logger_exception.what();                                            \
+        ::write(STDERR_FILENO, static_cast<const void *>(logger_exception_message), strlen(logger_exception_message)); \
+    }                                                                                                               \
     catch (...)                                                                                                     \
     {                                                                                                               \
         ::write(STDERR_FILENO, static_cast<const void *>(MESSAGE_FOR_EXCEPTION_ON_LOGGING), sizeof(MESSAGE_FOR_EXCEPTION_ON_LOGGING)); \
diff --git a/src/Common/makeSocketAddress.cpp b/src/Common/makeSocketAddress.cpp
index b5df6a4ef03..ba5bb53cd20 100644
--- a/src/Common/makeSocketAddress.cpp
+++ b/src/Common/makeSocketAddress.cpp
@@ -33,4 +33,9 @@ Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t po
     return socket_address;
 }
 
+Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t port, LoggerPtr log)
+{
+    return makeSocketAddress(host, port, log.get());
+}
+
 }
diff --git a/src/Common/makeSocketAddress.h b/src/Common/makeSocketAddress.h
index 9c7d10a0471..439a4ef1e9b 100644
--- a/src/Common/makeSocketAddress.h
+++ b/src/Common/makeSocketAddress.h
@@ -1,5 +1,7 @@
 #pragma once
+
 #include <Poco/Net/SocketAddress.h>
+#include <Common/Logger.h>
 
 namespace Poco { class Logger; }
 
@@ -8,4 +10,6 @@ namespace DB
 
 Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t port, Poco::Logger * log);
 
+Poco::Net::SocketAddress makeSocketAddress(const std::string & host, uint16_t port, LoggerPtr log);
+
 }
diff --git a/src/Common/memcmpSmall.h b/src/Common/memcmpSmall.h
index 36d5d7efab8..103eabb5b8d 100644
--- a/src/Common/memcmpSmall.h
+++ b/src/Common/memcmpSmall.h
@@ -7,6 +7,7 @@
 #include <base/simd.h>
 
 #include <Core/Defines.h>
+#include <Common/MemorySanitizer.h>
 
 
 namespace detail
@@ -26,9 +27,8 @@ inline int cmp(T a, T b)
 
 
 /// We can process uninitialized memory in the functions below.
-/// Results don't depend on the values inside uninitialized memory but Memory Sanitizer cannot see it.
-/// Disable optimized functions if compile with Memory Sanitizer.
-#if defined(__AVX512BW__) && defined(__AVX512VL__) && !defined(MEMORY_SANITIZER)
+/// Results don't depend on the values inside uninitialized memory
+#if defined(__AVX512BW__) && defined(__AVX512VL__)
 #    include <immintrin.h>
 
 
@@ -42,6 +42,9 @@ inline int cmp(T a, T b)
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -74,6 +77,9 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 template <typename Char>
 inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -144,6 +150,9 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t size)
 {
+    __msan_unpoison_overflow_15(a, size);
+    __msan_unpoison_overflow_15(b, size);
+
     for (size_t offset = 0; offset < size; offset += 16)
     {
         uint16_t mask = _mm_cmp_epi8_mask(
@@ -174,6 +183,9 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
     if (a_size != b_size)
         return false;
 
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     for (size_t offset = 0; offset < a_size; offset += 16)
     {
         uint16_t mask = _mm_cmp_epi8_mask(
@@ -246,6 +258,7 @@ inline bool memequal16(const void * a, const void * b)
 /** Compare memory region to zero */
 inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 {
+    __msan_unpoison_overflow_15(reinterpret_cast<const char *>(data), size);
     const __m128i zero16 = _mm_setzero_si128();
 
     for (size_t offset = 0; offset < size; offset += 16)
@@ -263,7 +276,7 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
     return true;
 }
 
-#elif defined(__SSE2__) && !defined(MEMORY_SANITIZER)
+#elif defined(__SSE2__)
 #    include <emmintrin.h>
 
 
@@ -277,6 +290,9 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -309,6 +325,9 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 template <typename Char>
 inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -380,6 +399,9 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t size)
 {
+    __msan_unpoison_overflow_15(a, size);
+    __msan_unpoison_overflow_15(b, size);
+
     for (size_t offset = 0; offset < size; offset += 16)
     {
         uint16_t mask = _mm_movemask_epi8(_mm_cmpeq_epi8(
@@ -410,6 +432,9 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
     if (a_size != b_size)
         return false;
 
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     for (size_t offset = 0; offset < a_size; offset += 16)
     {
         uint16_t mask = _mm_movemask_epi8(_mm_cmpeq_epi8(
@@ -483,6 +508,8 @@ inline bool memequal16(const void * a, const void * b)
 /** Compare memory region to zero */
 inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 {
+    __msan_unpoison_overflow_15(reinterpret_cast<const char *>(data), size);
+
     const __m128i zero16 = _mm_setzero_si128();
 
     for (size_t offset = 0; offset < size; offset += 16)
@@ -509,6 +536,9 @@ inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -534,6 +564,9 @@ inline int memcmpSmallAllowOverflow15(const Char * a, size_t a_size, const Char
 template <typename Char>
 inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_size, const Char * b, size_t b_size)
 {
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     size_t min_size = std::min(a_size, b_size);
 
     for (size_t offset = 0; offset < min_size; offset += 16)
@@ -599,6 +632,9 @@ inline int memcmpSmallLikeZeroPaddedAllowOverflow15(const Char * a, size_t a_siz
 template <typename Char>
 inline int memcmpSmallAllowOverflow15(const Char * a, const Char * b, size_t size)
 {
+    __msan_unpoison_overflow_15(a, size);
+    __msan_unpoison_overflow_15(b, size);
+
     for (size_t offset = 0; offset < size; offset += 16)
     {
         uint64_t mask = getNibbleMask(vceqq_u8(
@@ -625,6 +661,9 @@ inline bool memequalSmallAllowOverflow15(const Char * a, size_t a_size, const Ch
     if (a_size != b_size)
         return false;
 
+    __msan_unpoison_overflow_15(a, a_size);
+    __msan_unpoison_overflow_15(b, b_size);
+
     for (size_t offset = 0; offset < a_size; offset += 16)
     {
         uint64_t mask = getNibbleMask(vceqq_u8(
@@ -683,6 +722,7 @@ inline bool memequal16(const void * a, const void * b)
 
 inline bool memoryIsZeroSmallAllowOverflow15(const void * data, size_t size)
 {
+    __msan_unpoison_overflow_15(reinterpret_cast<const char *>(data), size);
     for (size_t offset = 0; offset < size; offset += 16)
     {
         uint64_t mask = getNibbleMask(vceqzq_u8(vld1q_u8(reinterpret_cast<const unsigned char *>(data) + offset)));
diff --git a/src/Common/memcpySmall.h b/src/Common/memcpySmall.h
index 0c2aee96250..90648254d76 100644
--- a/src/Common/memcpySmall.h
+++ b/src/Common/memcpySmall.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Common/MemorySanitizer.h>
+
 #include <cstring>
 #include <sys/types.h> /// ssize_t
 
@@ -38,6 +40,7 @@ namespace detail
 {
     inline void memcpySmallAllowReadWriteOverflow15Impl(char * __restrict dst, const char * __restrict src, ssize_t n)
     {
+        __msan_unpoison_overflow_15(src, n);
         while (n > 0)
         {
             _mm_storeu_si128(reinterpret_cast<__m128i *>(dst),
@@ -46,6 +49,9 @@ namespace detail
             dst += 16;
             src += 16;
             n -= 16;
+
+            /// Avoid clang loop-idiom optimization, which transforms _mm_storeu_si128 to built-in memcpy
+            __asm__ __volatile__("" : : : "memory");
         }
     }
 }
@@ -64,6 +70,7 @@ namespace detail
 {
 inline void memcpySmallAllowReadWriteOverflow15Impl(char * __restrict dst, const char * __restrict src, ssize_t n)
 {
+    __msan_unpoison_overflow_15(src, n);
     while (n > 0)
     {
         vst1q_s8(reinterpret_cast<signed char *>(dst), vld1q_s8(reinterpret_cast<const signed char *>(src)));
diff --git a/src/Common/memory.h b/src/Common/memory.h
index a4c9d46e21b..a828ba7a38e 100644
--- a/src/Common/memory.h
+++ b/src/Common/memory.h
@@ -215,7 +215,7 @@ inline ALWAYS_INLINE size_t untrackMemory(void * ptr [[maybe_unused]], Allocatio
 #endif
         trace = CurrentMemoryTracker::free(actual_size);
     }
-    catch (...)
+    catch (...) /// NOLINT(bugprone-empty-catch)
     {
     }
 
diff --git a/src/Common/mysqlxx/Query.cpp b/src/Common/mysqlxx/Query.cpp
index e30ed2b75c8..babfc8c7c41 100644
--- a/src/Common/mysqlxx/Query.cpp
+++ b/src/Common/mysqlxx/Query.cpp
@@ -52,7 +52,7 @@ void Query::executeImpl()
 {
     MYSQL* mysql_driver = conn->getDriver();
 
-    LOG_TRACE(&Poco::Logger::get("mysqlxx::Query"), "Running MySQL query using connection {}", mysql_thread_id(mysql_driver));
+    LOG_TRACE(getLogger("mysqlxx::Query"), "Running MySQL query using connection {}", mysql_thread_id(mysql_driver));
     if (mysql_real_query(mysql_driver, query.data(), query.size()))
     {
         const auto err_no = mysql_errno(mysql_driver);
diff --git a/src/Common/mysqlxx/mysqlxx/Pool.h b/src/Common/mysqlxx/mysqlxx/Pool.h
index bb4d0cefbdc..6e509d8bdd6 100644
--- a/src/Common/mysqlxx/mysqlxx/Pool.h
+++ b/src/Common/mysqlxx/mysqlxx/Pool.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Common/Logger.h>
+
 #include <list>
 #include <memory>
 #include <mutex>
@@ -202,7 +204,7 @@ public:
     void removeConnection(Connection * connection);
 
 protected:
-    Poco::Logger * log = &Poco::Logger::get("mysqlxx::Pool");
+    LoggerPtr log = getLogger("mysqlxx::Pool");
 
     /// Number of MySQL connections which are created at launch.
     unsigned default_connections;
diff --git a/src/Common/mysqlxx/mysqlxx/Transaction.h b/src/Common/mysqlxx/mysqlxx/Transaction.h
index 38c175d69d5..4f06042eb06 100644
--- a/src/Common/mysqlxx/mysqlxx/Transaction.h
+++ b/src/Common/mysqlxx/mysqlxx/Transaction.h
@@ -27,7 +27,7 @@ public:
             if (!finished)
                 rollback();
         }
-        catch (...)
+        catch (...) /// NOLINT(bugprone-empty-catch)
         {
         }
     }
diff --git a/src/Common/mysqlxx/mysqlxx/Types.h b/src/Common/mysqlxx/mysqlxx/Types.h
index 883eb41989e..b58ed20d740 100644
--- a/src/Common/mysqlxx/mysqlxx/Types.h
+++ b/src/Common/mysqlxx/mysqlxx/Types.h
@@ -36,7 +36,7 @@ using Int64 = int64_t;
 using UInt32 = uint32_t;
 using Int32 = int32_t;
 
-using MYSQL_LENGTH = unsigned long;
+using MYSQL_LENGTH = unsigned long; /// NOLINT
 using MYSQL_LENGTHS = MYSQL_LENGTH *;
 using MYSQL_FIELDS = MYSQL_FIELD *;
 
diff --git a/src/Common/parseRemoteDescription.cpp b/src/Common/parseRemoteDescription.cpp
index 7b2045b9de1..df3820b11f9 100644
--- a/src/Common/parseRemoteDescription.cpp
+++ b/src/Common/parseRemoteDescription.cpp
@@ -179,7 +179,7 @@ std::vector<std::pair<String, uint16_t>> parseRemoteDescriptionForExternalDataba
         size_t colon = address.find(':');
         if (colon == String::npos)
         {
-            LOG_WARNING(&Poco::Logger::get("ParseRemoteDescription"), "Port is not found for host: {}. Using default port {}", address, default_port);
+            LOG_WARNING(getLogger("ParseRemoteDescription"), "Port is not found for host: {}. Using default port {}", address, default_port);
             result.emplace_back(std::make_pair(address, default_port));
         }
         else
diff --git a/src/Common/randomDelay.cpp b/src/Common/randomDelay.cpp
new file mode 100644
index 00000000000..7f6f3084919
--- /dev/null
+++ b/src/Common/randomDelay.cpp
@@ -0,0 +1,39 @@
+#include <Common/randomDelay.h>
+
+#include <Common/logger_useful.h>
+#include <Common/randomNumber.h>
+#include <base/sleep.h>
+
+
+void randomDelayForMaxMilliseconds(uint64_t milliseconds, LoggerPtr log, const char * start_of_message)
+{
+    if (milliseconds)
+    {
+        auto count = randomNumber() % milliseconds;
+
+        if (log)
+        {
+            if (start_of_message && !*start_of_message)
+                start_of_message = nullptr;
+
+            LOG_TEST(log, "{}{}Sleeping for {} milliseconds",
+                     (start_of_message ? start_of_message : ""),
+                     (start_of_message ? ": " : ""),
+                     count);
+        }
+
+        sleepForMilliseconds(count);
+
+        if (log)
+        {
+            LOG_TEST(log, "{}{}Awaking after sleeping",
+                     (start_of_message ? start_of_message : ""),
+                     (start_of_message ? ": " : ""));
+        }
+    }
+}
+
+void randomDelayForMaxSeconds(uint64_t seconds, LoggerPtr log, const char * start_of_message)
+{
+    randomDelayForMaxMilliseconds(seconds * 1000, log, start_of_message);
+}
diff --git a/src/Common/randomDelay.h b/src/Common/randomDelay.h
new file mode 100644
index 00000000000..99f218cc8a1
--- /dev/null
+++ b/src/Common/randomDelay.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#include <Common/Logger.h>
+
+/// Sleeps for random duration between 0 and a specified number of milliseconds, optionally outputs a logging message about that.
+/// This function can be used to add random delays in tests.
+void randomDelayForMaxMilliseconds(uint64_t milliseconds, LoggerPtr log = nullptr, const char * start_of_message = nullptr);
+void randomDelayForMaxSeconds(uint64_t seconds, LoggerPtr log = nullptr, const char * start_of_message = nullptr);
diff --git a/src/Common/randomSeed.cpp b/src/Common/randomSeed.cpp
index e9616abf7ca..e9329d35005 100644
--- a/src/Common/randomSeed.cpp
+++ b/src/Common/randomSeed.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
 }
 
 
-DB::UInt64 randomSeed()
+UInt64 randomSeed()
 {
     struct timespec times;
     if (clock_gettime(CLOCK_MONOTONIC, &times))
diff --git a/src/Common/randomSeed.h b/src/Common/randomSeed.h
index 99b8a88f982..8fb81e1f0bd 100644
--- a/src/Common/randomSeed.h
+++ b/src/Common/randomSeed.h
@@ -4,4 +4,4 @@
 #include <base/types.h>
 
 /** Returns a number suitable as seed for PRNG. Use clock_gettime, pid and so on. */
-DB::UInt64 randomSeed();
+UInt64 randomSeed();
diff --git a/src/Common/re2.h b/src/Common/re2.h
index c81b7157e91..ef1d2ba2a16 100644
--- a/src/Common/re2.h
+++ b/src/Common/re2.h
@@ -1,11 +1,6 @@
 #pragma once
 
-
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #include <re2/re2.h>
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
diff --git a/src/Common/tests/gtest_DateLUTImpl.cpp b/src/Common/tests/gtest_DateLUTImpl.cpp
index 3d3a3f04941..d1d10dafb63 100644
--- a/src/Common/tests/gtest_DateLUTImpl.cpp
+++ b/src/Common/tests/gtest_DateLUTImpl.cpp
@@ -1,3 +1,9 @@
+#if !defined(SANITIZER)
+
+/// This test is slow due to exhaustive checking of time zones.
+/// Better to replace with randomization.
+/// Also, recommended to replace with a functional test for better maintainability.
+
 #include <Common/DateLUT.h>
 #include <Common/DateLUTImpl.h>
 
@@ -10,9 +16,7 @@
 
 
 /// For the expansion of gtest macros.
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wused-but-marked-unused"
-#endif
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
 
 // All timezones present at build time and embedded into ClickHouse binary.
 extern const char * auto_time_zones[];
@@ -548,3 +552,5 @@ INSTANTIATE_TEST_SUITE_P(AllTimezones_Year1970,
 //            {0, 0 + 11 * 3600 * 24 + 12, 11},
         }))
 );
+
+#endif
diff --git a/src/Common/tests/gtest_async_loader.cpp b/src/Common/tests/gtest_async_loader.cpp
index ea8485fee92..174997ddf14 100644
--- a/src/Common/tests/gtest_async_loader.cpp
+++ b/src/Common/tests/gtest_async_loader.cpp
@@ -50,7 +50,7 @@ struct AsyncLoaderTest
     pcg64 rng{randomSeed()};
 
     explicit AsyncLoaderTest(std::vector<Initializer> initializers)
-        : loader(getPoolInitializers(initializers), /* log_failures = */ false, /* log_progress = */ false)
+        : loader(getPoolInitializers(initializers), /* log_failures = */ false, /* log_progress = */ false, /* log_events = */ false)
     {
         loader.stop(); // All tests call `start()` manually to better control ordering
     }
@@ -427,9 +427,7 @@ TEST(AsyncLoader, CancelExecutingTask)
     }
 }
 
-// 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)
+TEST(AsyncLoader, JobFailure)
 {
     AsyncLoaderTest t;
     t.loader.start();
@@ -622,7 +620,13 @@ TEST(AsyncLoader, CustomDependencyFailure)
     auto dependent_job1 = makeLoadJob({ collect_job }, "dependent_job1", dependent_job_func);
     auto dependent_job2 = makeLoadJob({ collect_job }, "dependent_job2", dependent_job_func);
     auto dependent_job3 = makeLoadJob({ collect_job }, "dependent_job3", dependent_job_func);
-    auto task = t.schedule({ dependent_job1, dependent_job2, dependent_job3 }); // Other jobs should be discovery automatically
+    auto task = t.schedule({
+            dependent_job1, dependent_job2, dependent_job3,
+            collect_job,
+            late_dep1, late_dep2, late_dep3,
+            good_dep1, good_dep2, good_dep3,
+            evil_dep1, evil_dep2, evil_dep3,
+        });
 
     t.loader.wait(collect_job, true);
     canceled_sync.arrive_and_wait(); // (A)
@@ -639,6 +643,72 @@ TEST(AsyncLoader, CustomDependencyFailure)
     ASSERT_EQ(good_count.load(), 3);
 }
 
+TEST(AsyncLoader, WaitersLimit)
+{
+    AsyncLoaderTest t(16);
+
+    std::atomic<int> waiters_total{0};
+    int waiters_limit = 5;
+    auto waiters_inc = [&] (const LoadJobPtr &) {
+        int value = waiters_total.load();
+        while (true)
+        {
+            if (value >= waiters_limit)
+                throw Exception(ErrorCodes::ASYNC_LOAD_FAILED, "Too many waiters: {}", value);
+            if (waiters_total.compare_exchange_strong(value, value + 1))
+                break;
+        }
+    };
+    auto waiters_dec = [&] (const LoadJobPtr &) {
+        waiters_total.fetch_sub(1);
+    };
+
+    std::barrier sync(2);
+    t.loader.start();
+
+    auto job_func = [&] (AsyncLoader &, const LoadJobPtr &) {
+        sync.arrive_and_wait(); // (A)
+    };
+
+    auto job = makeLoadJob({}, "job", waiters_inc, waiters_dec, job_func);
+    auto task = t.schedule({job});
+
+    std::atomic<int> failure{0};
+    std::atomic<int> success{0};
+    std::vector<std::thread> waiters;
+    waiters.reserve(10);
+    auto waiter = [&] {
+        try
+        {
+            t.loader.wait(job);
+            success.fetch_add(1);
+        }
+        catch(...)
+        {
+            failure.fetch_add(1);
+        }
+    };
+
+    for (int i = 0; i < 10; i++)
+        waiters.emplace_back(waiter);
+
+    while (failure.load() != 5)
+        std::this_thread::yield();
+
+    ASSERT_EQ(job->waitersCount(), 5);
+
+    sync.arrive_and_wait(); // (A)
+
+    for (auto & thread : waiters)
+        thread.join();
+
+    ASSERT_EQ(success.load(), 5);
+    ASSERT_EQ(failure.load(), 5);
+    ASSERT_EQ(waiters_total.load(), 0);
+
+    t.loader.wait();
+}
+
 TEST(AsyncLoader, TestConcurrency)
 {
     AsyncLoaderTest t(10);
@@ -886,6 +956,55 @@ TEST(AsyncLoader, DynamicPriorities)
     }
 }
 
+TEST(AsyncLoader, JobPrioritizedWhileWaited)
+{
+    AsyncLoaderTest t({
+        {.max_threads = 2, .priority{0}},
+        {.max_threads = 1, .priority{-1}},
+    });
+
+    std::barrier sync(2);
+
+    LoadJobPtr job_to_wait; // and then to prioritize
+
+    auto running_job_func = [&] (AsyncLoader &, const LoadJobPtr &)
+    {
+        sync.arrive_and_wait();
+    };
+
+    auto dependent_job_func = [&] (AsyncLoader &, const LoadJobPtr &)
+    {
+    };
+
+    auto waiting_job_func = [&] (AsyncLoader & loader, const LoadJobPtr &)
+    {
+        loader.wait(job_to_wait);
+    };
+
+    std::vector<LoadJobPtr> jobs;
+    jobs.push_back(makeLoadJob({}, 0, "running", running_job_func));
+    jobs.push_back(makeLoadJob({jobs[0]}, 0, "dependent", dependent_job_func));
+    jobs.push_back(makeLoadJob({}, 0, "waiting", waiting_job_func));
+    auto task = t.schedule({ jobs.begin(), jobs.end() });
+
+    job_to_wait = jobs[1];
+
+    t.loader.start();
+
+    while (job_to_wait->waitersCount() == 0)
+        std::this_thread::yield();
+
+    ASSERT_EQ(t.loader.suspendedWorkersCount(0), 1);
+
+    t.loader.prioritize(job_to_wait, 1);
+    sync.arrive_and_wait();
+
+    t.loader.wait();
+    t.loader.stop();
+    ASSERT_EQ(t.loader.suspendedWorkersCount(1), 0);
+    ASSERT_EQ(t.loader.suspendedWorkersCount(0), 0);
+}
+
 TEST(AsyncLoader, RandomIndependentTasks)
 {
     AsyncLoaderTest t(16);
@@ -973,8 +1092,10 @@ TEST(AsyncLoader, SetMaxThreads)
     };
 
     // Generate enough independent jobs
+    std::vector<LoadTaskPtr> tasks;
+    tasks.reserve(1000);
     for (int i = 0; i < 1000; i++)
-        t.schedule({makeLoadJob({}, "job", job_func)})->detach();
+        tasks.push_back(t.schedule({makeLoadJob({}, "job", job_func)}));
 
     t.loader.start();
     while (sync_index < syncs.size())
diff --git a/src/Common/tests/gtest_concurrency_control.cpp b/src/Common/tests/gtest_concurrency_control.cpp
index 8e5b89a72a0..5e579317ade 100644
--- a/src/Common/tests/gtest_concurrency_control.cpp
+++ b/src/Common/tests/gtest_concurrency_control.cpp
@@ -15,7 +15,7 @@ struct ConcurrencyControlTest
 {
     ConcurrencyControl cc;
 
-    explicit ConcurrencyControlTest(ConcurrencyControl::SlotCount limit = ConcurrencyControl::Unlimited)
+    explicit ConcurrencyControlTest(SlotCount limit = UnlimitedSlots)
     {
         cc.setMaxConcurrency(limit);
     }
@@ -25,7 +25,7 @@ TEST(ConcurrencyControl, Unlimited)
 {
     ConcurrencyControlTest t; // unlimited number of slots
     auto slots = t.cc.allocate(0, 100500);
-    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    std::vector<AcquiredSlotPtr> acquired;
     while (auto slot = slots->tryAcquire())
         acquired.emplace_back(std::move(slot));
     ASSERT_TRUE(acquired.size() == 100500);
@@ -34,14 +34,14 @@ TEST(ConcurrencyControl, Unlimited)
 TEST(ConcurrencyControl, Fifo)
 {
     ConcurrencyControlTest t(1); // use single slot
-    std::vector<ConcurrencyControl::AllocationPtr> allocations;
+    std::vector<SlotAllocationPtr> allocations;
     constexpr int count = 42;
     allocations.reserve(count);
     for (int i = 0; i < count; i++)
         allocations.emplace_back(t.cc.allocate(0, 1));
     for (int i = 0; i < count; i++)
     {
-        ConcurrencyControl::SlotPtr holder;
+        AcquiredSlotPtr holder;
         for (int j = 0; j < count; j++)
         {
             auto slot = allocations[j]->tryAcquire();
@@ -60,11 +60,11 @@ TEST(ConcurrencyControl, Fifo)
 TEST(ConcurrencyControl, Oversubscription)
 {
     ConcurrencyControlTest t(10);
-    std::vector<ConcurrencyControl::AllocationPtr> allocations;
+    std::vector<SlotAllocationPtr> allocations;
     allocations.reserve(10);
     for (int i = 0; i < 10; i++)
         allocations.emplace_back(t.cc.allocate(1, 2));
-    std::vector<ConcurrencyControl::SlotPtr> slots;
+    std::vector<AcquiredSlotPtr> slots;
     // Normal allocation using maximum amount of slots
     for (int i = 0; i < 5; i++)
     {
@@ -90,7 +90,7 @@ TEST(ConcurrencyControl, ReleaseUnacquiredSlots)
 {
     ConcurrencyControlTest t(10);
     {
-        std::vector<ConcurrencyControl::AllocationPtr> allocations;
+        std::vector<SlotAllocationPtr> allocations;
         allocations.reserve(10);
         for (int i = 0; i < 10; i++)
             allocations.emplace_back(t.cc.allocate(1, 2));
@@ -98,7 +98,7 @@ TEST(ConcurrencyControl, ReleaseUnacquiredSlots)
     }
     // Check that slots were actually released
     auto allocation = t.cc.allocate(0, 20);
-    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    std::vector<AcquiredSlotPtr> acquired;
     while (auto slot = allocation->tryAcquire())
         acquired.emplace_back(std::move(slot));
     ASSERT_TRUE(acquired.size() == 10);
@@ -110,7 +110,7 @@ TEST(ConcurrencyControl, DestroyNotFullyAllocatedAllocation)
     for (int i = 0; i < 3; i++)
     {
         auto allocation = t.cc.allocate(5, 20);
-        std::vector<ConcurrencyControl::SlotPtr> acquired;
+        std::vector<AcquiredSlotPtr> acquired;
         while (auto slot = allocation->tryAcquire())
             acquired.emplace_back(std::move(slot));
         ASSERT_TRUE(acquired.size() == 10);
@@ -122,7 +122,7 @@ TEST(ConcurrencyControl, DestroyAllocationBeforeSlots)
     ConcurrencyControlTest t(10);
     for (int i = 0; i < 3; i++)
     {
-        std::vector<ConcurrencyControl::SlotPtr> acquired;
+        std::vector<AcquiredSlotPtr> acquired;
         auto allocation = t.cc.allocate(5, 20);
         while (auto slot = allocation->tryAcquire())
             acquired.emplace_back(std::move(slot));
@@ -135,7 +135,7 @@ TEST(ConcurrencyControl, GrantReleasedToTheSameAllocation)
 {
     ConcurrencyControlTest t(3);
     auto allocation = t.cc.allocate(0, 10);
-    std::list<ConcurrencyControl::SlotPtr> acquired;
+    std::list<AcquiredSlotPtr> acquired;
     while (auto slot = allocation->tryAcquire())
         acquired.emplace_back(std::move(slot));
     ASSERT_TRUE(acquired.size() == 3); // 0 1 2
@@ -183,7 +183,7 @@ TEST(ConcurrencyControl, SetSlotCount)
 {
     ConcurrencyControlTest t(10);
     auto allocation = t.cc.allocate(5, 30);
-    std::vector<ConcurrencyControl::SlotPtr> acquired;
+    std::vector<AcquiredSlotPtr> acquired;
     while (auto slot = allocation->tryAcquire())
         acquired.emplace_back(std::move(slot));
     ASSERT_TRUE(acquired.size() == 10);
@@ -200,7 +200,7 @@ TEST(ConcurrencyControl, SetSlotCount)
     ASSERT_TRUE(acquired.size() == 5);
 
     // Check that newly added slots are equally distributed over waiting allocations
-    std::vector<ConcurrencyControl::SlotPtr> acquired2;
+    std::vector<AcquiredSlotPtr> acquired2;
     auto allocation2 = t.cc.allocate(0, 30);
     ASSERT_TRUE(!allocation->tryAcquire());
     t.cc.setMaxConcurrency(15); // 10 slots added: 5 to the first allocation and 5 to the second one
@@ -224,7 +224,7 @@ TEST(ConcurrencyControl, MultipleThreads)
 
     auto run_query = [&] (size_t max_threads)
     {
-        ConcurrencyControl::AllocationPtr slots = t.cc.allocate(1, max_threads);
+        SlotAllocationPtr slots = t.cc.allocate(1, max_threads);
         std::mutex threads_mutex;
         std::vector<std::thread> threads;
         threads.reserve(max_threads);
diff --git a/src/Common/tests/gtest_connection_pool.cpp b/src/Common/tests/gtest_connection_pool.cpp
new file mode 100644
index 00000000000..cc091d12bb0
--- /dev/null
+++ b/src/Common/tests/gtest_connection_pool.cpp
@@ -0,0 +1,910 @@
+#include <IO/ReadWriteBufferFromHTTP.h>
+#include <Common/HTTPConnectionPool.h>
+
+#include <Poco/URI.h>
+#include <Poco/Net/MessageHeader.h>
+#include <Poco/Net/HTTPServerRequest.h>
+#include <Poco/Net/HTTPServerResponse.h>
+#include <Poco/Net/HTTPServer.h>
+#include <Poco/Net/HTTPServerParams.h>
+#include <Poco/Net/HTTPRequestHandler.h>
+#include <Poco/Net/HTTPRequestHandlerFactory.h>
+
+#include <thread>
+#include <gtest/gtest.h>
+
+namespace
+{
+
+template<class T>
+class SafeHandler
+{
+public:
+    using Ptr = std::shared_ptr<SafeHandler<T>>;
+
+    SafeHandler() = default;
+    SafeHandler(SafeHandler<T>&) = delete;
+    SafeHandler& operator=(SafeHandler<T>&) = delete;
+
+    T get()
+    {
+        std::lock_guard lock(mutex);
+        return obj;
+    }
+
+    void set(T && options_)
+    {
+        std::lock_guard lock(mutex);
+        obj = std::move(options_);
+    }
+
+protected:
+    std::mutex mutex;
+    T obj = {};
+};
+
+struct RequestOptions
+{
+    size_t slowdown_receive = 0;
+    int overwrite_keep_alive_timeout = 0;
+    int overwrite_keep_alive_max_requests = 10;
+};
+
+size_t stream_copy_n(std::istream & in, std::ostream & out, std::size_t count = std::numeric_limits<size_t>::max())
+{
+    const size_t buffer_size = 4096;
+    char buffer[buffer_size];
+
+    size_t total_read = 0;
+
+    while (count > buffer_size)
+    {
+        in.read(buffer, buffer_size);
+        size_t read = in.gcount();
+        out.write(buffer, read);
+        count -= read;
+        total_read += read;
+
+        if (read == 0)
+            return total_read;
+    }
+
+    in.read(buffer, count);
+    size_t read = in.gcount();
+    out.write(buffer, read);
+    total_read += read;
+
+    return total_read;
+}
+
+class MockRequestHandler : public Poco::Net::HTTPRequestHandler
+{
+public:
+    explicit MockRequestHandler(SafeHandler<RequestOptions>::Ptr options_)
+        : options(options_)
+    {
+    }
+
+    void handleRequest(Poco::Net::HTTPServerRequest & request, Poco::Net::HTTPServerResponse & response) override
+    {
+        int value = request.getKeepAliveTimeout();
+        ASSERT_GT(value, 0);
+
+        auto params = options->get();
+
+        if (params.overwrite_keep_alive_timeout > 0)
+            response.setKeepAliveTimeout(params.overwrite_keep_alive_timeout, params.overwrite_keep_alive_max_requests);
+
+        response.setStatus(Poco::Net::HTTPResponse::HTTP_OK);
+        auto size = request.getContentLength();
+        if (size > 0)
+            response.setContentLength(size); // ContentLength is required for keep alive
+        else
+            response.setChunkedTransferEncoding(true); // or chunk encoding
+
+        if (params.slowdown_receive > 0)
+            sleepForSeconds(params.slowdown_receive);
+
+        stream_copy_n(request.stream(), response.send(), size);
+    }
+
+    SafeHandler<RequestOptions>::Ptr options;
+};
+
+class HTTPRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory
+{
+public:
+    explicit HTTPRequestHandlerFactory(SafeHandler<RequestOptions>::Ptr options_)
+        : options(options_)
+    {
+    }
+
+    Poco::Net::HTTPRequestHandler * createRequestHandler(const Poco::Net::HTTPServerRequest &) override
+    {
+        return new MockRequestHandler(options);
+    }
+
+    SafeHandler<RequestOptions>::Ptr options;
+};
+
+}
+
+using HTTPSession = Poco::Net::HTTPClientSession;
+using HTTPSessionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
+
+class ConnectionPoolTest : public testing::Test {
+protected:
+    ConnectionPoolTest()
+    {
+        options = std::make_shared<SafeHandler<RequestOptions>>();
+
+        startServer();
+    }
+
+    void SetUp() override {
+        timeouts = DB::ConnectionTimeouts();
+        DB::HTTPConnectionPools::Limits def_limits{};
+        DB::HTTPConnectionPools::instance().setLimits(def_limits, def_limits, def_limits);
+
+        options->set(RequestOptions());
+
+        DB::HTTPConnectionPools::instance().dropCache();
+        DB::CurrentThread::getProfileEvents().reset();
+        // Code here will be called immediately after the constructor (right
+        // before each test).
+    }
+
+    void TearDown() override {
+        // Code here will be called immediately after each test (right
+        // before the destructor).
+    }
+
+    DB::IHTTPConnectionPoolForEndpoint::Ptr getPool()
+    {
+        auto uri = Poco::URI(getServerUrl());
+        return DB::HTTPConnectionPools::instance().getPool(DB::HTTPConnectionGroupType::HTTP, uri, DB::ProxyConfiguration{});
+    }
+
+    std::string getServerUrl() const
+    {
+        return "http://" + server_data.server->socket().address().toString();
+    }
+
+    void startServer()
+    {
+        server_data.reset();
+        server_data.handler_factory = new HTTPRequestHandlerFactory(options);
+        server_data.server =  std::make_unique<Poco::Net::HTTPServer>(
+            server_data.handler_factory, server_data.port);
+
+        server_data.server->start();
+    }
+
+    Poco::Net::HTTPServer & getServer() const
+    {
+        return *server_data.server;
+    }
+
+    void setSlowDown(size_t seconds)
+    {
+        auto opt = options->get();
+        opt.slowdown_receive = seconds;
+        options->set(std::move(opt));
+    }
+
+    void setOverWriteKeepAlive(size_t seconds, int max_requests)
+    {
+        auto opt = options->get();
+        opt.overwrite_keep_alive_timeout = int(seconds);
+        opt.overwrite_keep_alive_max_requests= max_requests;
+        options->set(std::move(opt));
+    }
+
+    DB::ConnectionTimeouts timeouts;
+    SafeHandler<RequestOptions>::Ptr options;
+
+    struct ServerData
+    {
+        // just some port to avoid collisions with others tests
+        UInt16 port = 9871;
+
+        HTTPRequestHandlerFactory::Ptr handler_factory;
+        std::unique_ptr<Poco::Net::HTTPServer> server;
+
+        ServerData() = default;
+        ServerData(ServerData &&) = default;
+        ServerData & operator =(ServerData &&) = delete;
+
+        void reset()
+        {
+            if (server)
+                server->stop();
+
+            server = nullptr;
+            handler_factory = nullptr;
+        }
+
+        ~ServerData() {
+            reset();
+        }
+    };
+
+    ServerData server_data;
+};
+
+
+void wait_until(std::function<bool()> pred)
+{
+    while (!pred())
+        sleepForMilliseconds(10);
+}
+
+void echoRequest(String data, HTTPSession & session)
+{
+    {
+        Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_PUT, "/", "HTTP/1.1"); // HTTP/1.1 is required for keep alive
+        request.setContentLength(data.size());
+        std::ostream & ostream = session.sendRequest(request);
+        ostream << data;
+    }
+
+    {
+        std::stringstream result;
+        Poco::Net::HTTPResponse response;
+        std::istream & istream = session.receiveResponse(response);
+        ASSERT_EQ(response.getStatus(), Poco::Net::HTTPResponse::HTTP_OK);
+
+        stream_copy_n(istream, result);
+        ASSERT_EQ(data, result.str());
+    }
+}
+
+TEST_F(ConnectionPoolTest, CanConnect)
+{
+    auto pool = getPool();
+    auto connection = pool->getConnection(timeouts);
+
+    ASSERT_TRUE(connection->connected());
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[pool->getMetrics().created]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(pool->getMetrics().active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(pool->getMetrics().stored_count));
+
+    wait_until([&] () { return getServer().currentConnections() == 1; });
+    ASSERT_EQ(1, getServer().currentConnections());
+    ASSERT_EQ(1, getServer().totalConnections());
+
+    connection->reset();
+
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+    ASSERT_EQ(0, getServer().currentConnections());
+    ASSERT_EQ(1, getServer().totalConnections());
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[pool->getMetrics().created]);
+}
+
+TEST_F(ConnectionPoolTest, CanRequest)
+{
+    auto pool = getPool();
+    auto connection = pool->getConnection(timeouts);
+
+    echoRequest("Hello", *connection);
+
+    ASSERT_EQ(1, getServer().totalConnections());
+    ASSERT_EQ(1, getServer().currentConnections());
+
+    connection->reset();
+
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+    ASSERT_EQ(0, getServer().currentConnections());
+    ASSERT_EQ(1, getServer().totalConnections());
+
+    auto metrics = pool->getMetrics();
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, CanPreserve)
+{
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+
+    wait_until([&] () { return getServer().currentConnections() == 1; });
+    ASSERT_EQ(1, getServer().currentConnections());
+}
+
+TEST_F(ConnectionPoolTest, CanReuse)
+{
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+    }
+
+    {
+        auto connection = pool->getConnection(timeouts);
+
+        ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+        ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+
+        wait_until([&] () { return getServer().currentConnections() == 1; });
+        ASSERT_EQ(1, getServer().currentConnections());
+
+        echoRequest("Hello", *connection);
+
+        ASSERT_EQ(1, getServer().totalConnections());
+        ASSERT_EQ(1, getServer().currentConnections());
+
+        ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+        ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+        ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+        ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+
+        connection->reset();
+    }
+
+    ASSERT_EQ(0, CurrentMetrics::get(pool->getMetrics().active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(pool->getMetrics().stored_count));
+
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+    ASSERT_EQ(0, getServer().currentConnections());
+    ASSERT_EQ(1, getServer().totalConnections());
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+}
+
+TEST_F(ConnectionPoolTest, CanReuse10)
+{
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    for (int i = 0; i < 10; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+    }
+
+    {
+        auto connection = pool->getConnection(timeouts);
+        connection->reset(); // reset just not to wait its expiration here
+    }
+
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+    ASSERT_EQ(0, getServer().currentConnections());
+    ASSERT_EQ(1, getServer().totalConnections());
+
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, CanReuse5)
+{
+    auto ka = Poco::Timespan(1, 0); // 1 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    std::vector<DB::HTTPSessionPtr> connections;
+    connections.reserve(5);
+    for (int i = 0; i < 5; ++i)
+    {
+        connections.push_back(pool->getConnection(timeouts));
+    }
+    connections.clear();
+
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(5, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(5, CurrentMetrics::get(metrics.stored_count));
+
+    wait_until([&] () { return getServer().currentConnections() == 5; });
+    ASSERT_EQ(5, getServer().currentConnections());
+    ASSERT_EQ(5, getServer().totalConnections());
+
+    for (int i = 0; i < 5; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+    }
+
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(5, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(5, CurrentMetrics::get(metrics.stored_count));
+
+    /// wait until all connections are timeouted
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+
+    {
+        // just to trigger pool->wipeExpired();
+        auto connection = pool->getConnection(timeouts);
+        connection->reset();
+    }
+
+    ASSERT_EQ(6, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(5, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, CanReconnectAndCreate)
+{
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    std::vector<HTTPSessionPtr> in_use;
+
+    const size_t count = 3;
+    for (int i = 0; i < count; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        in_use.push_back(connection);
+    }
+
+    ASSERT_EQ(count, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(count, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+
+    auto connection = std::move(in_use.back());
+    in_use.pop_back();
+
+    echoRequest("Hello", *connection);
+
+    connection->abort(); // further usage requires reconnect, new connection
+
+    echoRequest("Hello", *connection);
+
+    ASSERT_EQ(count+1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(count, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, CanReconnectAndReuse)
+{
+    auto ka = Poco::Timespan(1, 0); // 1 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    std::vector<HTTPSessionPtr> in_use;
+
+    const size_t count = 3;
+    for (int i = 0; i < count; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        /// make some request in order to show to the server the keep alive headers
+        echoRequest("Hello", *connection);
+        in_use.push_back(std::move(connection));
+    }
+    in_use.clear();
+
+    for (int i = 0; i < count; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        in_use.push_back(std::move(connection));
+    }
+
+    auto connection = std::move(in_use.back());
+    in_use.pop_back();
+    in_use.clear(); // other connection will be reused
+
+    echoRequest("Hello", *connection);
+
+    connection->abort(); // further usage requires reconnect, reuse connection from pool
+
+    echoRequest("Hello", *connection);
+
+    connection->reset();
+
+    wait_until([&] () { return getServer().currentConnections() == 0; });
+    ASSERT_EQ(0, getServer().currentConnections());
+    ASSERT_EQ(count, getServer().totalConnections());
+
+    ASSERT_EQ(count, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(count + count - 1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(count + 1, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(count-1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(count-2, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, ReceiveTimeout)
+{
+    setSlowDown(2);
+    timeouts.withReceiveTimeout(1);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+        ASSERT_ANY_THROW(
+            echoRequest("Hello", *connection);
+        );
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+
+    {
+        timeouts.withReceiveTimeout(3);
+        auto connection = pool->getConnection(timeouts);
+        ASSERT_NO_THROW(
+            echoRequest("Hello", *connection);
+        );
+    }
+
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+
+    {
+        /// timeouts have effect for reused session
+        timeouts.withReceiveTimeout(1);
+        auto connection = pool->getConnection(timeouts);
+        ASSERT_ANY_THROW(
+            echoRequest("Hello", *connection);
+        );
+    }
+
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, ReadWriteBufferFromHTTP)
+{
+    std::string_view message = "Hello ReadWriteBufferFromHTTP";
+    auto uri = Poco::URI(getServerUrl());
+    auto metrics = DB::HTTPConnectionPools::instance().getPool(DB::HTTPConnectionGroupType::HTTP, uri, DB::ProxyConfiguration{})->getMetrics();
+
+    Poco::Net::HTTPBasicCredentials empty_creds;
+    auto buf_from_http = DB::BuilderRWBufferFromHTTP(uri)
+                             .withConnectionGroup(DB::HTTPConnectionGroupType::HTTP)
+                             .withOutCallback(
+                                 [&] (std::ostream & in)
+                                 {
+                                     in << message;
+                                 })
+                             .withDelayInit(false)
+                             .create(empty_creds);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+
+    char buf[256];
+    std::fill(buf, buf + sizeof(buf), 0);
+
+    buf_from_http->readStrict(buf, message.size());
+    ASSERT_EQ(std::string_view(buf), message);
+    ASSERT_TRUE(buf_from_http->eof());
+
+    buf_from_http.reset();
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, HardLimit)
+{
+    DB::HTTPConnectionPools::Limits zero_limits {0, 0, 0};
+    DB::HTTPConnectionPools::instance().setLimits(zero_limits, zero_limits, zero_limits);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, NoReceiveCall)
+{
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+
+        {
+            auto data = String("Hello");
+            Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_PUT, "/", "HTTP/1.1"); // HTTP/1.1 is required for keep alive
+            request.setContentLength(data.size());
+            std::ostream & ostream = connection->sendRequest(request);
+            ostream << data;
+        }
+
+        connection->flushRequest();
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, ReconnectedWhenConnectionIsHoldTooLong)
+{
+    auto ka = Poco::Timespan(1, 0); // 1 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+
+        echoRequest("Hello", *connection);
+
+        auto fake_ka = Poco::Timespan(30 * 1000 * 1000); // 30 seconds
+        timeouts.withHTTPKeepAliveTimeout(fake_ka);
+        DB::setTimeouts(*connection, timeouts); // new keep alive timeout has no effect
+
+        wait_until([&] () { return getServer().currentConnections() == 0; });
+
+        ASSERT_EQ(1, connection->connected());
+        ASSERT_EQ(1, connection->getKeepAlive());
+        ASSERT_EQ(1000, connection->getKeepAliveTimeout().totalMilliseconds());
+        ASSERT_EQ(1, connection->isKeepAliveExpired(connection->getKeepAliveReliability()));
+
+        echoRequest("Hello", *connection);
+    }
+
+
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, ReconnectedWhenConnectionIsNearlyExpired)
+{
+    auto ka = Poco::Timespan(1, 0); // 1 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        {
+            auto connection = pool->getConnection(timeouts);
+            echoRequest("Hello", *connection);
+        }
+
+        sleepForMilliseconds(900);
+
+        {
+            auto connection = pool->getConnection(timeouts);
+            echoRequest("Hello", *connection);
+        }
+    }
+
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, ServerOverwriteKeepAlive)
+{
+    auto ka = Poco::Timespan(30, 0); // 30 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, timeouts.http_keep_alive_timeout.totalSeconds());
+        ASSERT_EQ(30, connection->getKeepAliveTimeout().totalSeconds());
+    }
+
+    {
+        setOverWriteKeepAlive(1, 10);
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, timeouts.http_keep_alive_timeout.totalSeconds());
+        ASSERT_EQ(1, connection->getKeepAliveTimeout().totalSeconds());
+    }
+
+    {
+        // server do not overwrite it in the following requests but client has to remember last agreed value
+        setOverWriteKeepAlive(0, 0);
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, timeouts.http_keep_alive_timeout.totalSeconds());
+        ASSERT_EQ(1, connection->getKeepAliveTimeout().totalSeconds());
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(3, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(2, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+}
+
+TEST_F(ConnectionPoolTest, MaxRequests)
+{
+    auto ka = Poco::Timespan(30, 0); // 30 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+    auto max_requests = 5;
+    timeouts.http_keep_alive_max_requests = max_requests;
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    for (int i = 1; i <= max_requests - 1; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, connection->getKeepAliveTimeout().totalSeconds());
+        ASSERT_EQ(max_requests, connection->getKeepAliveMaxRequests());
+        ASSERT_EQ(i, connection->getKeepAliveRequest());
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(max_requests-1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(max_requests-2, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(1, CurrentMetrics::get(metrics.stored_count));
+
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, connection->getKeepAliveTimeout().totalSeconds());
+        ASSERT_EQ(max_requests, connection->getKeepAliveMaxRequests());
+        ASSERT_EQ(max_requests, connection->getKeepAliveRequest());
+    }
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(max_requests-1, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(max_requests-1, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
+
+
+TEST_F(ConnectionPoolTest, ServerOverwriteMaxRequests)
+{
+    auto ka = Poco::Timespan(30, 0); // 30 seconds
+    timeouts.withHTTPKeepAliveTimeout(ka);
+
+    auto pool = getPool();
+    auto metrics = pool->getMetrics();
+
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(30, connection->getKeepAliveTimeout().totalSeconds());
+        ASSERT_EQ(1000, connection->getKeepAliveMaxRequests());
+        ASSERT_EQ(1, connection->getKeepAliveRequest());
+    }
+
+    auto max_requests = 3;
+    setOverWriteKeepAlive(5, max_requests);
+
+    for (int i = 2; i <= 10*max_requests; ++i)
+    {
+        auto connection = pool->getConnection(timeouts);
+        echoRequest("Hello", *connection);
+        ASSERT_EQ(5, connection->getKeepAliveTimeout().totalSeconds());
+        ASSERT_EQ(max_requests, connection->getKeepAliveMaxRequests());
+        ASSERT_EQ(((i-1) % max_requests) + 1, connection->getKeepAliveRequest());
+    }
+
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.created]);
+    ASSERT_EQ(10*max_requests-10, DB::CurrentThread::getProfileEvents()[metrics.preserved]);
+    ASSERT_EQ(10*max_requests-10, DB::CurrentThread::getProfileEvents()[metrics.reused]);
+    ASSERT_EQ(0, DB::CurrentThread::getProfileEvents()[metrics.reset]);
+    ASSERT_EQ(10, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(0, CurrentMetrics::get(metrics.stored_count));
+}
diff --git a/src/Common/tests/gtest_generate_random_by_regexp.cpp b/src/Common/tests/gtest_generate_random_by_regexp.cpp
index 063257bdfd7..acf49cc30eb 100644
--- a/src/Common/tests/gtest_generate_random_by_regexp.cpp
+++ b/src/Common/tests/gtest_generate_random_by_regexp.cpp
@@ -64,38 +64,3 @@ TEST(GenerateRandomString, FullRange)
             std::cerr << " +1 ";
     std::cerr << "all possible letters, ok" << std::endl;
 }
-
-UInt64 elapsed(DB::ObjectStorageKeysGeneratorPtr generator)
-{
-    String path = "some_path";
-
-    Stopwatch watch;
-
-    for (int i = 0; i < 100000; ++i)
-    {
-        [[ maybe_unused ]] auto result = generator->generate(path).serialize();
-    }
-
-    return watch.elapsedMicroseconds();
-}
-
-TEST(ObjectStorageKey, Performance)
-{
-    auto elapsed_old = elapsed(DB::createObjectStorageKeysGeneratorByPrefix(
-            "xx-xx-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/mergetree/"));
-    std::cerr << "old: " << elapsed_old << std::endl;
-
-    auto elapsed_new = elapsed(DB::createObjectStorageKeysGeneratorByTemplate(
-            "xx-xx-xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx/mergetree/[a-z]{3}/[a-z]{29}"));
-    std::cerr << "new: " << elapsed_new << std::endl;
-
-    if (elapsed_new > elapsed_old)
-    {
-        if (elapsed_new > elapsed_old)
-            std::cerr << "slow ratio: +" << float(elapsed_new) / elapsed_old << std::endl;
-        else
-            std::cerr << "fast ratio: " << float(elapsed_old) / elapsed_new << std::endl;
-        ASSERT_LT(elapsed_new, 1.5 * elapsed_old);
-    }
-
-}
diff --git a/src/Common/tests/gtest_global_context.cpp b/src/Common/tests/gtest_global_context.cpp
index ec86c953c5b..0c1556766a9 100644
--- a/src/Common/tests/gtest_global_context.cpp
+++ b/src/Common/tests/gtest_global_context.cpp
@@ -10,9 +10,3 @@ ContextHolder & getMutableContext()
     static ContextHolder holder;
     return holder;
 }
-
-void destroyContext()
-{
-    auto & holder = getMutableContext();
-    return holder.destroy();
-}
diff --git a/src/Common/tests/gtest_global_context.h b/src/Common/tests/gtest_global_context.h
index f846a0dbe4f..7ae8bb32f70 100644
--- a/src/Common/tests/gtest_global_context.h
+++ b/src/Common/tests/gtest_global_context.h
@@ -28,5 +28,3 @@ struct ContextHolder
 const ContextHolder & getContext();
 
 ContextHolder & getMutableContext();
-
-void destroyContext();
diff --git a/src/Common/tests/gtest_log.cpp b/src/Common/tests/gtest_log.cpp
index e755c22ba75..6d2bd56ad77 100644
--- a/src/Common/tests/gtest_log.cpp
+++ b/src/Common/tests/gtest_log.cpp
@@ -9,13 +9,14 @@
 #include <Poco/NullChannel.h>
 #include <Poco/StreamChannel.h>
 #include <sstream>
+#include <thread>
 
 
 TEST(Logger, Log)
 {
     Poco::Logger::root().setLevel("none");
     Poco::Logger::root().setChannel(Poco::AutoPtr<Poco::NullChannel>(new Poco::NullChannel()));
-    Poco::Logger * log = &Poco::Logger::get("Log");
+    LoggerPtr log = getLogger("Log");
 
     /// This test checks that we don't pass this string to fmtlib, because it is the only argument.
     EXPECT_NO_THROW(LOG_INFO(log, fmt::runtime("Hello {} World")));
@@ -27,12 +28,11 @@ TEST(Logger, TestLog)
 
         std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         auto my_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(oss));
-        auto * log = &Poco::Logger::create("TestLogger", my_channel.get());
+        auto log = createLogger("TestLogger", my_channel.get());
         log->setLevel("test");
         LOG_TEST(log, "Hello World");
 
         EXPECT_EQ(oss.str(), "Hello World\n");
-        Poco::Logger::destroy("TestLogger");
     }
 
     {   /// Test logs invisible for other levels
@@ -40,13 +40,11 @@ TEST(Logger, TestLog)
         {
             std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
             auto my_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(oss));
-            auto * log = &Poco::Logger::create(std::string{level} + "_Logger", my_channel.get());
+            auto log = createLogger(std::string{level} + "_Logger", my_channel.get());
             log->setLevel(level);
             LOG_TEST(log, "Hello World");
 
             EXPECT_EQ(oss.str(), "");
-
-            Poco::Logger::destroy(std::string{level} + "_Logger");
         }
     }
 
@@ -84,7 +82,7 @@ TEST(Logger, SideEffects)
 {
     std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     auto my_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(oss));
-    auto * log = &Poco::Logger::create("Logger", my_channel.get());
+    auto log = createLogger("Logger", my_channel.get());
     log->setLevel("trace");
 
     /// Ensure that parameters are evaluated only once
@@ -103,3 +101,75 @@ TEST(Logger, SideEffects)
 
     LOG_TRACE(log, "test no throw {}", getLogMessageParamOrThrow());
 }
+
+TEST(Logger, SharedRawLogger)
+{
+    {
+        std::ostringstream stream; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        auto stream_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(stream));
+
+        auto shared_logger = getLogger("Logger_1");
+        shared_logger->setChannel(stream_channel.get());
+        shared_logger->setLevel("trace");
+
+        LOG_TRACE(shared_logger, "SharedLogger1Log1");
+        LOG_TRACE(getRawLogger("Logger_1"), "RawLogger1Log");
+        LOG_TRACE(shared_logger, "SharedLogger1Log2");
+
+        auto actual = stream.str();
+        EXPECT_EQ(actual, "SharedLogger1Log1\nRawLogger1Log\nSharedLogger1Log2\n");
+    }
+    {
+        std::ostringstream stream; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        auto stream_channel = Poco::AutoPtr<Poco::StreamChannel>(new Poco::StreamChannel(stream));
+
+        auto * raw_logger = getRawLogger("Logger_2");
+        raw_logger->setChannel(stream_channel.get());
+        raw_logger->setLevel("trace");
+
+        LOG_TRACE(getLogger("Logger_2"), "SharedLogger2Log1");
+        LOG_TRACE(raw_logger, "RawLogger2Log");
+        LOG_TRACE(getLogger("Logger_2"), "SharedLogger2Log2");
+
+        auto actual = stream.str();
+        EXPECT_EQ(actual, "SharedLogger2Log1\nRawLogger2Log\nSharedLogger2Log2\n");
+    }
+}
+
+TEST(Logger, SharedLoggersThreadSafety)
+{
+    static size_t threads_count = std::thread::hardware_concurrency();
+    static constexpr size_t loggers_count = 10;
+    static constexpr size_t logger_get_count = 1000;
+
+    Poco::Logger::root();
+
+    std::vector<std::string> names;
+
+    Poco::Logger::names(names);
+    size_t loggers_size_before = names.size();
+
+    std::vector<std::thread> threads;
+
+    for (size_t thread_index = 0; thread_index < threads_count; ++thread_index)
+    {
+        threads.emplace_back([]()
+        {
+            for (size_t logger_index = 0; logger_index < loggers_count; ++logger_index)
+            {
+                for (size_t iteration = 0; iteration < logger_get_count; ++iteration)
+                {
+                    getLogger("Logger_" + std::to_string(logger_index));
+                }
+            }
+        });
+    }
+
+    for (auto & thread : threads)
+        thread.join();
+
+    Poco::Logger::names(names);
+    size_t loggers_size_after = names.size();
+
+    EXPECT_EQ(loggers_size_before, loggers_size_after);
+}
diff --git a/src/Common/tests/gtest_lru_resource_cache.cpp b/src/Common/tests/gtest_lru_resource_cache.cpp
index bc037824ff8..94490d1e86d 100644
--- a/src/Common/tests/gtest_lru_resource_cache.cpp
+++ b/src/Common/tests/gtest_lru_resource_cache.cpp
@@ -45,6 +45,33 @@ struct MyWeight
     size_t operator()(const int & x) const { return static_cast<size_t>(x); }
 };
 
+TEST(LRUResourceCache, remove2)
+{
+    using MyCache = DB::LRUResourceCache<int, int, MyWeight>;
+    auto mcache = MyCache(10, 10);
+    for (int i = 1; i < 5; ++i)
+    {
+        auto load_int = [&] { return std::make_shared<int>(i); };
+        mcache.getOrSet(i, load_int);
+    }
+
+    auto n = mcache.size();
+    ASSERT_EQ(n, 4);
+    auto w = mcache.weight();
+    ASSERT_EQ(w, 10);
+    auto holder4 = mcache.get(4);
+    ASSERT_TRUE(holder4 != nullptr);
+    mcache.tryRemove(4);
+    auto holder_reget_4 = mcache.get(4);
+    ASSERT_TRUE(holder_reget_4 == nullptr);
+    mcache.getOrSet(4, [&]() { return std::make_shared<int>(4); });
+    holder4.reset();
+    auto holder1 = mcache.getOrSet(1, [&]() { return std::make_shared<int>(1); });
+    ASSERT_TRUE(holder1 != nullptr);
+    auto holder7 = mcache.getOrSet(7, [&] { return std::make_shared<int>(7); });
+    ASSERT_TRUE(holder7 != nullptr);
+}
+
 TEST(LRUResourceCache, evictOnWweight)
 {
     using MyCache = DB::LRUResourceCache<int, int, MyWeight>;
diff --git a/src/Common/tests/gtest_poolbase.cpp b/src/Common/tests/gtest_poolbase.cpp
index 20c3281c964..879b1b16620 100644
--- a/src/Common/tests/gtest_poolbase.cpp
+++ b/src/Common/tests/gtest_poolbase.cpp
@@ -18,7 +18,7 @@ public:
     using Ptr = PoolBase<PoolObject>::Ptr;
 
     int last_destroy_value = 0;
-    MyPoolBase() : PoolBase<PoolObject>(100, &Poco::Logger::get("MyPoolBase")) { }
+    MyPoolBase() : PoolBase<PoolObject>(100, getLogger("MyPoolBase")) { }
 
 protected:
     ObjectPtr allocObject() override { return std::make_shared<Object>(); }
diff --git a/src/Common/tests/gtest_proxy_configuration_resolver_provider.cpp b/src/Common/tests/gtest_proxy_configuration_resolver_provider.cpp
index 9a7447b02e4..d5d6f86f661 100644
--- a/src/Common/tests/gtest_proxy_configuration_resolver_provider.cpp
+++ b/src/Common/tests/gtest_proxy_configuration_resolver_provider.cpp
@@ -4,6 +4,8 @@
 #include <Common/tests/gtest_global_context.h>
 #include <Common/tests/gtest_helper_functions.h>
 
+#include <Poco/Util/MapConfiguration.h>
+
 using ConfigurationPtr = Poco::AutoPtr<Poco::Util::AbstractConfiguration>;
 
 class ProxyConfigurationResolverProviderTests : public ::testing::Test
diff --git a/src/Common/tests/gtest_resolve_pool.cpp b/src/Common/tests/gtest_resolve_pool.cpp
new file mode 100644
index 00000000000..eef4635e7b1
--- /dev/null
+++ b/src/Common/tests/gtest_resolve_pool.cpp
@@ -0,0 +1,279 @@
+#include <IO/WriteBufferFromFile.h>
+#include <base/sleep.h>
+#include <Common/CurrentThread.h>
+#include <Common/HostResolvePool.h>
+
+#include <thread>
+#include <gtest/gtest.h>
+
+class ResolvePoolMock : public DB::HostResolver
+{
+public:
+    using ResolveFunction = DB::HostResolver::ResolveFunction;
+
+    ResolvePoolMock(String host_, Poco::Timespan history_, ResolveFunction && func)
+    : DB::HostResolver(std::move(func), std::move(host_), history_)
+    {
+    }
+};
+
+class ResolvePoolTest : public testing::Test
+{
+protected:
+    ResolvePoolTest()
+    {
+        DB::HostResolversPool::instance().dropCache();
+    }
+
+    void SetUp() override {
+        DB::CurrentThread::getProfileEvents().reset();
+
+        ASSERT_EQ(0, CurrentMetrics::get(metrics.active_count));
+
+        addresses = std::set<String>{"127.0.0.1", "127.0.0.2", "127.0.0.3"};
+        // Code here will be called immediately after the constructor (right
+        // before each test).
+    }
+
+    void TearDown() override {
+        // Code here will be called immediately after each test (right
+        // before the destructor).
+    }
+
+    DB::HostResolver::Ptr make_resolver(size_t history_ms = 200)
+    {
+        auto resolve_func = [&] (const String &)
+        {
+            std::vector<Poco::Net::IPAddress> result;
+            result.reserve(addresses.size());
+            for (const auto & item : addresses)
+            {
+                result.push_back(Poco::Net::IPAddress(item));
+            }
+            return result;
+        };
+
+
+        return std::make_shared<ResolvePoolMock>("some_host", Poco::Timespan(history_ms * 1000), std::move(resolve_func));
+    }
+
+    DB::HostResolverMetrics metrics = DB::HostResolver::getMetrics();
+    std::set<String> addresses;
+};
+
+TEST_F(ResolvePoolTest, CanResolve)
+{
+    auto resolver = make_resolver();
+    auto address = resolver->resolve();
+
+    ASSERT_TRUE(addresses.contains(*address));
+
+    ASSERT_EQ(addresses.size(), DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+    ASSERT_EQ(addresses.size(), CurrentMetrics::get(metrics.active_count));
+}
+
+TEST_F(ResolvePoolTest, CanResolveAll)
+{
+    auto resolver = make_resolver();
+
+    std::set<String> results;
+    while (results.size() != addresses.size())
+    {
+        auto next_addr = resolver->resolve();
+        results.insert(*next_addr);
+    }
+
+    ASSERT_EQ(addresses.size(), DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+}
+
+size_t getSum(std::map<String, size_t> container)
+{
+    size_t sum = 0;
+    for (auto & [_, val] : container)
+    {
+        sum += val;
+    }
+    return sum;
+}
+
+size_t getMin(std::map<String, size_t> container)
+{
+    if (container.empty())
+        return 0;
+
+    size_t min_val = container.begin()->second;
+    for (auto & [_, val] : container)
+    {
+        min_val = std::min(min_val, val);
+    }
+    return min_val;
+}
+
+double getMean(std::map<String, size_t> container)
+{
+    return 1.0 * getSum(container) / container.size();
+}
+
+double getMaxDiff(std::map<String, size_t> container, double ref_val)
+{
+    double diff = 0.0;
+    for (auto & [_, val] : container)
+    {
+        diff = std::max(std::fabs(val - ref_val), diff);
+    }
+
+    return diff;
+}
+
+TEST_F(ResolvePoolTest, CanResolveEvenly)
+{
+    auto resolver = make_resolver();
+
+    std::map<String, size_t> results;
+
+    for (size_t i = 0; i < 50000; ++i)
+    {
+        auto next_addr = resolver->resolve();
+        if (results.contains(*next_addr))
+        {
+            results[*next_addr] += 1;
+        }
+        else
+        {
+            results[*next_addr] = 1;
+        }
+    }
+
+    auto mean = getMean(results);
+    auto diff = getMaxDiff(results, mean);
+
+    ASSERT_GT(0.3 * mean, diff);
+}
+
+TEST_F(ResolvePoolTest, CanMerge)
+{
+    auto resolver = make_resolver(100000);
+    auto address = resolver->resolve();
+
+    ASSERT_TRUE(addresses.contains(*address));
+
+    ASSERT_EQ(addresses.size(), DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+
+    auto old_addresses = addresses;
+    addresses = std::set<String>{"127.0.0.4", "127.0.0.5"};
+
+
+    resolver->update();
+    ASSERT_EQ(addresses.size() + old_addresses.size(), DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+    ASSERT_EQ(addresses.size() + old_addresses.size(), CurrentMetrics::get(metrics.active_count));
+
+    std::set<String> results;
+    while (results.size() != addresses.size() + old_addresses.size())
+    {
+        auto next_addr = resolver->resolve();
+        results.insert(*next_addr);
+    }
+}
+
+TEST_F(ResolvePoolTest, CanGainEven)
+{
+    auto resolver = make_resolver();
+    auto address = resolver->resolve();
+
+    std::map<String, size_t> results;
+    for (size_t i = 0; i < 40000; ++i)
+    {
+        auto next_addr = resolver->resolve();
+        if (results.contains(*next_addr))
+        {
+            results[*next_addr] += 1;
+        }
+        else
+        {
+            results[*next_addr] = 1;
+        }
+    }
+
+    ASSERT_GT(getMin(results), 10000);
+
+    addresses.insert("127.0.0.4");
+    addresses.insert("127.0.0.5");
+
+    resolver->update();
+
+    /// return mostly new addresses
+    for (size_t i = 0; i < 3000; ++i)
+    {
+        auto next_addr = resolver->resolve();
+        if (results.contains(*next_addr))
+        {
+            results[*next_addr] += 1;
+        }
+        else
+        {
+            results[*next_addr] = 1;
+        }
+    }
+
+    ASSERT_EQ(results.size(), 5);
+
+    ASSERT_GT(getMin(results), 1000);
+}
+
+TEST_F(ResolvePoolTest, CanFail)
+{
+    auto resolver = make_resolver(10000);
+
+    auto failed_addr = resolver->resolve();
+    failed_addr.setFail();
+
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.failed]);
+    ASSERT_EQ(addresses.size(), CurrentMetrics::get(metrics.active_count));
+    ASSERT_EQ(addresses.size(), DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+
+    for (size_t i = 0; i < 1000; ++i)
+    {
+        auto next_addr = resolver->resolve();
+
+        ASSERT_TRUE(addresses.contains(*next_addr));
+        ASSERT_NE(*next_addr, *failed_addr);
+    }
+}
+
+TEST_F(ResolvePoolTest, CanFailAndHeal)
+{
+    auto resolver = make_resolver();
+
+    auto failed_addr = resolver->resolve();
+    failed_addr.setFail();
+
+    while (true)
+    {
+        auto next_addr = resolver->resolve();
+        if (*failed_addr == *next_addr)
+            break;
+    }
+}
+
+
+TEST_F(ResolvePoolTest, CanExpire)
+{
+    auto resolver = make_resolver();
+
+    auto expired_addr = resolver->resolve();
+    ASSERT_TRUE(addresses.contains(*expired_addr));
+
+    addresses.erase(*expired_addr);
+    sleepForSeconds(1);
+
+    for (size_t i = 0; i < 1000; ++i)
+    {
+        auto next_addr = resolver->resolve();
+
+        ASSERT_TRUE(addresses.contains(*next_addr));
+        ASSERT_NE(*next_addr, *expired_addr);
+    }
+
+    ASSERT_EQ(addresses.size() + 1, DB::CurrentThread::getProfileEvents()[metrics.discovered]);
+    ASSERT_EQ(1, DB::CurrentThread::getProfileEvents()[metrics.expired]);
+}
diff --git a/src/Common/tests/gtest_thread_fuzzer.cpp b/src/Common/tests/gtest_thread_fuzzer.cpp
new file mode 100644
index 00000000000..ac2ccebebc6
--- /dev/null
+++ b/src/Common/tests/gtest_thread_fuzzer.cpp
@@ -0,0 +1,36 @@
+#include <optional>
+#include <thread>
+#include <vector>
+#include <gtest/gtest.h>
+#include <Common/ThreadFuzzer.h>
+#include <Common/Stopwatch.h>
+
+TEST(ThreadFuzzer, mutex)
+{
+    /// Initialize ThreadFuzzer::started
+    DB::ThreadFuzzer::instance().isEffective();
+
+    std::mutex mutex;
+    std::atomic<size_t> elapsed_ns = 0;
+
+    auto func = [&]()
+    {
+        Stopwatch watch;
+        for (size_t i = 0; i < 1e6; ++i)
+        {
+            mutex.lock();
+            mutex.unlock();
+        }
+        elapsed_ns += watch.elapsedNanoseconds();
+    };
+
+    std::vector<std::optional<std::thread>> threads(10);
+
+    for (auto & thread : threads)
+        thread.emplace(func);
+
+    for (auto & thread : threads)
+        thread->join();
+
+    std::cout << "elapsed: " << elapsed_ns/1e9 << "\n";
+}
diff --git a/src/Interpreters/threadPoolCallbackRunner.h b/src/Common/threadPoolCallbackRunner.h
similarity index 97%
rename from src/Interpreters/threadPoolCallbackRunner.h
rename to src/Common/threadPoolCallbackRunner.h
index 2b943110273..6f7892ae4bb 100644
--- a/src/Interpreters/threadPoolCallbackRunner.h
+++ b/src/Common/threadPoolCallbackRunner.h
@@ -57,7 +57,7 @@ template <typename Result, typename T>
 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);
+    return schedule(std::move(task), priority); /// NOLINT
 }
 
 }
diff --git a/src/Compression/CachedCompressedReadBuffer.cpp b/src/Compression/CachedCompressedReadBuffer.cpp
index 0febfca75cc..3476f436eeb 100644
--- a/src/Compression/CachedCompressedReadBuffer.cpp
+++ b/src/Compression/CachedCompressedReadBuffer.cpp
@@ -38,7 +38,7 @@ void CachedCompressedReadBuffer::prefetch(Priority priority)
 bool CachedCompressedReadBuffer::nextImpl()
 {
     /// Let's check for the presence of a decompressed block in the cache, grab the ownership of this block, if it exists.
-    UInt128 key = cache->hash(path, file_pos);
+    UInt128 key = UncompressedCache::hash(path, file_pos);
 
     owned_cell = cache->getOrSet(key, [&]()
     {
diff --git a/src/Compression/CompressionCodecDeflateQpl.cpp b/src/Compression/CompressionCodecDeflateQpl.cpp
index ee0356adde5..7e0653c69f8 100644
--- a/src/Compression/CompressionCodecDeflateQpl.cpp
+++ b/src/Compression/CompressionCodecDeflateQpl.cpp
@@ -6,14 +6,15 @@
 #include <Compression/CompressionFactory.h>
 #include <Compression/CompressionInfo.h>
 #include <Poco/Logger.h>
-#include <Common/randomSeed.h>
-#include <Common/logger_useful.h>
-#include "libaccel_config.h"
 #include <Common/MemorySanitizer.h>
+#include <Common/logger_useful.h>
+#include <Common/randomSeed.h>
 #include <base/scope_guard.h>
 #include <base/getPageSize.h>
-#include <immintrin.h>
 
+#include "libaccel_config.h"
+
+#include <immintrin.h>
 
 namespace DB
 {
@@ -33,7 +34,7 @@ DeflateQplJobHWPool::DeflateQplJobHWPool()
     : max_hw_jobs(0)
     , random_engine(randomSeed())
 {
-    Poco::Logger * log = &Poco::Logger::get("DeflateQplJobHWPool");
+    LoggerPtr log = getLogger("DeflateQplJobHWPool");
     const char * qpl_version = qpl_get_library_version();
 
     // loop all configured workqueue size to get maximum job number.
@@ -141,7 +142,7 @@ void DeflateQplJobHWPool::unLockJob(UInt32 index)
 }
 
 HardwareCodecDeflateQpl::HardwareCodecDeflateQpl(SoftwareCodecDeflateQpl & sw_codec_)
-    : log(&Poco::Logger::get("HardwareCodecDeflateQpl"))
+    : log(getLogger("HardwareCodecDeflateQpl"))
     , sw_codec(sw_codec_)
 {
 }
@@ -222,15 +223,12 @@ Int32 HardwareCodecDeflateQpl::doDecompressDataSynchronous(const char * source,
         LOG_WARNING(log, "DeflateQpl HW codec failed, falling back to SW codec. (Details: doDecompressDataSynchronous->qpl_submit_job with error code: {} - please refer to qpl_status in ./contrib/qpl/include/qpl/c_api/status.h)", static_cast<UInt32>(status));
         return RET_ERROR;
     }
-
     /// Busy waiting till job complete.
-    UInt32 num_checks = 0;
     do
     {
         _tpause(1, __rdtsc() + 1000);
         status = qpl_check_job(job_ptr);
-        ++num_checks;
-    } while (status == QPL_STS_BEING_PROCESSED && num_checks < MAX_CHECKS);
+    } while (status == QPL_STS_BEING_PROCESSED);
 
     if (status != QPL_STS_OK)
     {
@@ -279,7 +277,6 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
 {
     auto n_jobs_processing = decomp_async_job_map.size();
     std::map<UInt32, qpl_job *>::iterator it = decomp_async_job_map.begin();
-    UInt32 num_checks = 0;
 
     while (n_jobs_processing)
     {
@@ -289,7 +286,7 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
         job_ptr = it->second;
 
         auto status = qpl_check_job(job_ptr);
-        if ((status == QPL_STS_BEING_PROCESSED) && (num_checks < MAX_CHECKS))
+        if (status == QPL_STS_BEING_PROCESSED)
         {
             it++;
         }
@@ -315,7 +312,6 @@ void HardwareCodecDeflateQpl::flushAsynchronousDecompressRequests()
         {
             it = decomp_async_job_map.begin();
             _tpause(1, __rdtsc() + 1000);
-            ++num_checks;
         }
     }
 }
@@ -416,9 +412,7 @@ UInt32 CompressionCodecDeflateQpl::doCompressData(const char * source, UInt32 so
 {
 /// QPL library is using AVX-512 with some shuffle operations.
 /// Memory sanitizer don't understand if there was uninitialized memory in SIMD register but it was not used in the result of shuffle.
-#if defined(MEMORY_SANITIZER)
     __msan_unpoison(dest, getMaxCompressedDataSize(source_size));
-#endif
     Int32 res = HardwareCodecDeflateQpl::RET_ERROR;
     if (DeflateQplJobHWPool::instance().isJobPoolReady())
         res = hw_codec->doCompressData(source, source_size, dest, getMaxCompressedDataSize(source_size));
@@ -439,9 +433,7 @@ void CompressionCodecDeflateQpl::doDecompressData(const char * source, UInt32 so
 {
 /// QPL library is using AVX-512 with some shuffle operations.
 /// Memory sanitizer don't understand if there was uninitialized memory in SIMD register but it was not used in the result of shuffle.
-#if defined(MEMORY_SANITIZER)
     __msan_unpoison(dest, uncompressed_size);
-#endif
 /// Device IOTLB miss has big perf. impact for IAA accelerators.
 /// To avoid page fault, we need touch buffers related to accelerator in advance.
     touchBufferWithZeroFilling(dest, uncompressed_size);
diff --git a/src/Compression/CompressionCodecDeflateQpl.h b/src/Compression/CompressionCodecDeflateQpl.h
index 3d9a9b13921..86fd9051bd8 100644
--- a/src/Compression/CompressionCodecDeflateQpl.h
+++ b/src/Compression/CompressionCodecDeflateQpl.h
@@ -26,7 +26,7 @@ public:
 
     qpl_job * acquireJob(UInt32 & job_id);
     void releaseJob(UInt32 job_id);
-    const bool & isJobPoolReady() { return job_pool_ready; }
+    const bool & isJobPoolReady() const { return job_pool_ready; }
 
 private:
     bool tryLockJob(UInt32 index);
@@ -65,10 +65,8 @@ class HardwareCodecDeflateQpl
 public:
     /// RET_ERROR stands for hardware codec fail, needs fallback to software codec.
     static constexpr Int32 RET_ERROR = -1;
-    /// Maximum times to check if hardware job complete, otherwise fallback to software codec.
-    static constexpr UInt32 MAX_CHECKS = UINT16_MAX;
 
-    HardwareCodecDeflateQpl(SoftwareCodecDeflateQpl & sw_codec_);
+    explicit HardwareCodecDeflateQpl(SoftwareCodecDeflateQpl & sw_codec_);
     ~HardwareCodecDeflateQpl();
 
     Int32 doCompressData(const char * source, UInt32 source_size, char * dest, UInt32 dest_size) const;
@@ -88,7 +86,7 @@ private:
     /// For each submission, push job ID && job object into this map;
     /// For flush, pop out job ID && job object from this map. Use job ID to release job lock and use job object to check job status till complete.
     std::map<UInt32, qpl_job *> decomp_async_job_map;
-    Poco::Logger * log;
+    LoggerPtr log;
     /// Provides a fallback in case of errors.
     SoftwareCodecDeflateQpl & sw_codec;
 };
diff --git a/src/Compression/CompressionCodecEncrypted.cpp b/src/Compression/CompressionCodecEncrypted.cpp
index 8d945417fc1..3b7f4824069 100644
--- a/src/Compression/CompressionCodecEncrypted.cpp
+++ b/src/Compression/CompressionCodecEncrypted.cpp
@@ -694,7 +694,7 @@ bool CompressionCodecEncrypted::Configuration::tryLoad(const Poco::Util::Abstrac
 /// if encryption is disabled, print warning about this.
 void CompressionCodecEncrypted::Configuration::load(const Poco::Util::AbstractConfiguration & config [[maybe_unused]], const String & config_prefix [[maybe_unused]])
 {
-    LOG_WARNING(&Poco::Logger::get("CompressionCodecEncrypted"), "Server was built without SSL support. Encryption is disabled.");
+    LOG_WARNING(getLogger("CompressionCodecEncrypted"), "Server was built without SSL support. Encryption is disabled.");
 }
 
 }
diff --git a/src/Compression/CompressionCodecMultiple.cpp b/src/Compression/CompressionCodecMultiple.cpp
index b1eb7fb50c3..6dc10677a3f 100644
--- a/src/Compression/CompressionCodecMultiple.cpp
+++ b/src/Compression/CompressionCodecMultiple.cpp
@@ -1,14 +1,9 @@
 #include <Compression/CompressionCodecMultiple.h>
 #include <Compression/CompressionInfo.h>
 #include <Common/PODArray.h>
-#include <base/unaligned.h>
 #include <Compression/CompressionFactory.h>
-#include <Parsers/ASTExpressionList.h>
-#include <Parsers/ASTFunction.h>
 #include <IO/WriteHelpers.h>
 #include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
-#include <base/hex.h>
 
 
 namespace DB
@@ -88,14 +83,34 @@ void CompressionCodecMultiple::doDecompressData(const char * source, UInt32 sour
         const auto codec = CompressionCodecFactory::instance().get(compression_method);
         auto additional_size_at_the_end_of_buffer = codec->getAdditionalSizeAtTheEndOfBuffer();
 
-        compressed_buf.resize(compressed_buf.size() + additional_size_at_the_end_of_buffer);
+        if (compressed_buf.size() >= 1_GiB)
+            throw Exception(decompression_error_code, "Too large compressed size: {}", compressed_buf.size());
+
+        {
+            UInt32 bytes_to_resize;
+            if (common::addOverflow(static_cast<UInt32>(compressed_buf.size()), additional_size_at_the_end_of_buffer, bytes_to_resize))
+                throw Exception(decompression_error_code, "Too large compressed size: {}", compressed_buf.size());
+
+            compressed_buf.resize(compressed_buf.size() + additional_size_at_the_end_of_buffer);
+        }
+
         UInt32 uncompressed_size = readDecompressedBlockSize(compressed_buf.data());
 
+        if (uncompressed_size >= 1_GiB)
+            throw Exception(decompression_error_code, "Too large uncompressed size: {}", uncompressed_size);
+
         if (idx == 0 && uncompressed_size != decompressed_size)
             throw Exception(decompression_error_code, "Wrong final decompressed size in codec Multiple, got {}, expected {}",
                 uncompressed_size, decompressed_size);
 
-        uncompressed_buf.resize(uncompressed_size + additional_size_at_the_end_of_buffer);
+        {
+            UInt32 bytes_to_resize;
+            if (common::addOverflow(uncompressed_size, additional_size_at_the_end_of_buffer, bytes_to_resize))
+                throw Exception(decompression_error_code, "Too large uncompressed size: {}", uncompressed_size);
+
+            uncompressed_buf.resize(bytes_to_resize);
+        }
+
         codec->decompress(compressed_buf.data(), source_size, uncompressed_buf.data());
         uncompressed_buf.swap(compressed_buf);
         source_size = uncompressed_size;
diff --git a/src/Compression/CompressionCodecNone.cpp b/src/Compression/CompressionCodecNone.cpp
index 065ac4a2625..53d62e51920 100644
--- a/src/Compression/CompressionCodecNone.cpp
+++ b/src/Compression/CompressionCodecNone.cpp
@@ -27,8 +27,12 @@ UInt32 CompressionCodecNone::doCompressData(const char * source, UInt32 source_s
     return source_size;
 }
 
-void CompressionCodecNone::doDecompressData(const char * source, UInt32 /*source_size*/, char * dest, UInt32 uncompressed_size) const
+void CompressionCodecNone::doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const
 {
+    if (source_size != uncompressed_size)
+        throw Exception(decompression_error_code, "Wrong data for compression codec NONE: source_size ({}) != uncompressed_size ({})",
+            source_size, uncompressed_size);
+
     memcpy(dest, source, uncompressed_size);
 }
 
diff --git a/src/Compression/CompressionCodecNone.h b/src/Compression/CompressionCodecNone.h
index 1565720947d..5d6f135b351 100644
--- a/src/Compression/CompressionCodecNone.h
+++ b/src/Compression/CompressionCodecNone.h
@@ -18,9 +18,7 @@ public:
     void updateHash(SipHash & hash) const override;
 
 protected:
-
     UInt32 doCompressData(const char * source, UInt32 source_size, char * dest) const override;
-
     void doDecompressData(const char * source, UInt32 source_size, char * dest, UInt32 uncompressed_size) const override;
 
     bool isCompression() const override { return false; }
diff --git a/src/Compression/CompressionCodecT64.cpp b/src/Compression/CompressionCodecT64.cpp
index bf9a9414bc1..3ddc56fe4f6 100644
--- a/src/Compression/CompressionCodecT64.cpp
+++ b/src/Compression/CompressionCodecT64.cpp
@@ -91,6 +91,7 @@ enum class MagicNumber : uint8_t
     Decimal32   = 19,
     Decimal64   = 20,
     IPv4        = 21,
+    Date32      = 22,
 };
 
 MagicNumber serializeTypeId(std::optional<TypeIndex> type_id)
@@ -109,6 +110,7 @@ MagicNumber serializeTypeId(std::optional<TypeIndex> type_id)
         case TypeIndex::Int32:      return MagicNumber::Int32;
         case TypeIndex::Int64:      return MagicNumber::Int64;
         case TypeIndex::Date:       return MagicNumber::Date;
+        case TypeIndex::Date32:     return MagicNumber::Date32;
         case TypeIndex::DateTime:   return MagicNumber::DateTime;
         case TypeIndex::DateTime64: return MagicNumber::DateTime64;
         case TypeIndex::Enum8:      return MagicNumber::Enum8;
@@ -137,6 +139,7 @@ TypeIndex deserializeTypeId(uint8_t serialized_type_id)
         case MagicNumber::Int32:        return TypeIndex::Int32;
         case MagicNumber::Int64:        return TypeIndex::Int64;
         case MagicNumber::Date:         return TypeIndex::Date;
+        case MagicNumber::Date32:       return TypeIndex::Date32;
         case MagicNumber::DateTime:     return TypeIndex::DateTime;
         case MagicNumber::DateTime64:   return TypeIndex::DateTime64;
         case MagicNumber::Enum8:        return TypeIndex::Enum8;
@@ -165,6 +168,7 @@ TypeIndex baseType(TypeIndex type_idx)
             return TypeIndex::Int16;
         case TypeIndex::Int32:
         case TypeIndex::Decimal32:
+        case TypeIndex::Date32:
             return TypeIndex::Int32;
         case TypeIndex::Int64:
         case TypeIndex::Decimal64:
@@ -205,6 +209,7 @@ TypeIndex typeIdx(const IDataType * data_type)
         case TypeIndex::UInt16:
         case TypeIndex::Enum16:
         case TypeIndex::Date:
+        case TypeIndex::Date32:
         case TypeIndex::Int32:
         case TypeIndex::UInt32:
         case TypeIndex::IPv4:
diff --git a/src/Compression/CompressionCodecZSTDQAT.cpp b/src/Compression/CompressionCodecZSTDQAT.cpp
index 4828a71a515..5a4ef70a30a 100644
--- a/src/Compression/CompressionCodecZSTDQAT.cpp
+++ b/src/Compression/CompressionCodecZSTDQAT.cpp
@@ -34,7 +34,7 @@ protected:
 
 private:
     const int level;
-    Poco::Logger * log;
+    LoggerPtr log;
     static std::atomic<int> qat_state; /// Global initialization status of QAT device, we fall back back to software compression if uninitialized
 };
 
@@ -103,7 +103,7 @@ void registerCodecZSTDQAT(CompressionCodecFactory & factory)
 CompressionCodecZSTDQAT::CompressionCodecZSTDQAT(int level_)
     : CompressionCodecZSTD(level_)
     , level(level_)
-    , log(&Poco::Logger::get("CompressionCodecZSTDQAT"))
+    , log(getLogger("CompressionCodecZSTDQAT"))
 {
     setCodecDescription("ZSTD_QAT", {std::make_shared<ASTLiteral>(static_cast<UInt64>(level))});
 }
diff --git a/src/Compression/CompressionFactory.cpp b/src/Compression/CompressionFactory.cpp
index f4413401667..68e0131c91b 100644
--- a/src/Compression/CompressionFactory.cpp
+++ b/src/Compression/CompressionFactory.cpp
@@ -7,6 +7,8 @@
 #include <Poco/String.h>
 #include <IO/ReadBuffer.h>
 #include <Parsers/queryToString.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/ExpressionElementParsers.h>
 #include <Compression/CompressionCodecMultiple.h>
 #include <Compression/CompressionCodecNone.h>
 #include <IO/WriteHelpers.h>
@@ -44,6 +46,12 @@ CompressionCodecPtr CompressionCodecFactory::get(const String & family_name, std
     }
 }
 
+CompressionCodecPtr CompressionCodecFactory::get(const String & compression_codec) const
+{
+    ParserCodec codec_parser;
+    auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+    return CompressionCodecFactory::instance().get(ast, nullptr);
+}
 
 CompressionCodecPtr CompressionCodecFactory::get(
     const ASTPtr & ast, const IDataType * column_type, CompressionCodecPtr current_default, bool only_generic) const
diff --git a/src/Compression/CompressionFactory.h b/src/Compression/CompressionFactory.h
index e71476d564d..2885f35d7bd 100644
--- a/src/Compression/CompressionFactory.h
+++ b/src/Compression/CompressionFactory.h
@@ -68,6 +68,9 @@ public:
     /// For backward compatibility with config settings
     CompressionCodecPtr get(const String & family_name, std::optional<int> level) const;
 
+    /// Get codec by name with optional params. Example: LZ4, ZSTD(3)
+    CompressionCodecPtr get(const String & compression_codec) const;
+
     /// Register codec with parameters and column type
     void registerCompressionCodecWithType(const String & family_name, std::optional<uint8_t> byte_code, CreatorWithType creator);
     /// Register codec with parameters
diff --git a/src/Compression/LZ4_decompress_faster.cpp b/src/Compression/LZ4_decompress_faster.cpp
index c7f6571cb46..b548feed848 100644
--- a/src/Compression/LZ4_decompress_faster.cpp
+++ b/src/Compression/LZ4_decompress_faster.cpp
@@ -49,9 +49,7 @@ inline void copy8(UInt8 * dst, const UInt8 * src)
 inline void wildCopy8(UInt8 * dst, const UInt8 * src, const UInt8 * dst_end)
 {
     /// Unrolling with clang is doing >10% performance degrade.
-#if defined(__clang__)
     #pragma nounroll
-#endif
     do
     {
         copy8(dst, src);
@@ -234,9 +232,7 @@ inline void copy16(UInt8 * dst, const UInt8 * src)
 inline void wildCopy16(UInt8 * dst, const UInt8 * src, const UInt8 * dst_end)
 {
     /// Unrolling with clang is doing >10% performance degrade.
-#if defined(__clang__)
     #pragma nounroll
-#endif
     do
     {
         copy16(dst, src);
@@ -371,9 +367,7 @@ inline void copy32(UInt8 * dst, const UInt8 * src)
 inline void wildCopy32(UInt8 * dst, const UInt8 * src, const UInt8 * dst_end)
 {
     /// Unrolling with clang is doing >10% performance degrade.
-#if defined(__clang__)
     #pragma nounroll
-#endif
     do
     {
         copy32(dst, src);
@@ -487,9 +481,7 @@ bool NO_INLINE decompressImpl(const char * const source, char * const dest, size
     UInt8 * const output_end = op + dest_size;
 
     /// Unrolling with clang is doing >10% performance degrade.
-#if defined(__clang__)
     #pragma nounroll
-#endif
     while (true)
     {
         size_t length;
diff --git a/src/Compression/examples/CMakeLists.txt b/src/Compression/examples/CMakeLists.txt
index 7bf68e8845e..a7cc6bebf42 100644
--- a/src/Compression/examples/CMakeLists.txt
+++ b/src/Compression/examples/CMakeLists.txt
@@ -1,5 +1,2 @@
 clickhouse_add_executable (compressed_buffer compressed_buffer.cpp)
-target_link_libraries (compressed_buffer PRIVATE dbms)
-
-clickhouse_add_executable (cached_compressed_read_buffer cached_compressed_read_buffer.cpp)
-target_link_libraries (cached_compressed_read_buffer PRIVATE dbms)
+target_link_libraries (compressed_buffer PRIVATE clickhouse_common_io clickhouse_compression)
diff --git a/src/Compression/examples/cached_compressed_read_buffer.cpp b/src/Compression/examples/cached_compressed_read_buffer.cpp
deleted file mode 100644
index a8e14ac7271..00000000000
--- a/src/Compression/examples/cached_compressed_read_buffer.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-#include <iostream>
-#include <iomanip>
-#include <limits>
-
-#include <Compression/CompressionFactory.h>
-#include <Compression/CachedCompressedReadBuffer.h>
-#include <IO/WriteBufferFromFile.h>
-#include <Disks/IO/createReadBufferFromFileBase.h>
-#include <IO/copyData.h>
-
-#include <Common/Stopwatch.h>
-
-
-int main(int argc, char ** argv)
-{
-    using namespace DB;
-
-    if (argc < 2)
-    {
-        std::cerr << "Usage: program path\n";
-        return 1;
-    }
-
-    try
-    {
-        UncompressedCache cache("SLRU", 1024, 0.5);
-        std::string path = argv[1];
-
-        std::cerr << std::fixed << std::setprecision(3);
-
-        size_t hits = 0;
-        size_t misses = 0;
-
-        {
-            Stopwatch watch;
-            CachedCompressedReadBuffer in(
-                path,
-                [&]()
-                {
-                    return createReadBufferFromFileBase(path, {});
-                },
-                &cache
-            );
-            WriteBufferFromFile out("/dev/null");
-            copyData(in, out);
-
-            std::cerr << "Elapsed: " << watch.elapsedSeconds() << std::endl;
-        }
-
-        cache.getStats(hits, misses);
-        std::cerr << "Hits: " << hits << ", misses: " << misses << std::endl;
-
-        {
-            Stopwatch watch;
-            CachedCompressedReadBuffer in(
-                path,
-                [&]()
-                {
-                    return createReadBufferFromFileBase(path, {});
-                },
-                &cache
-            );
-            WriteBufferFromFile out("/dev/null");
-            copyData(in, out);
-
-            std::cerr << "Elapsed: " << watch.elapsedSeconds() << std::endl;
-        }
-
-        cache.getStats(hits, misses);
-        std::cerr << "Hits: " << hits << ", misses: " << misses << std::endl;
-    }
-    catch (const Exception & e)
-    {
-        std::cerr << e.what() << ", " << e.displayText() << std::endl;
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/Compression/examples/compressed_buffer.cpp b/src/Compression/examples/compressed_buffer.cpp
index 74646ff0f28..530f0938662 100644
--- a/src/Compression/examples/compressed_buffer.cpp
+++ b/src/Compression/examples/compressed_buffer.cpp
@@ -1,7 +1,4 @@
-#include <string>
-
 #include <iostream>
-#include <fstream>
 #include <iomanip>
 
 #include <Common/Stopwatch.h>
diff --git a/src/Compression/tests/gtest_compressionCodec.cpp b/src/Compression/tests/gtest_compressionCodec.cpp
index 24f16a55c25..f3f6345a5b5 100644
--- a/src/Compression/tests/gtest_compressionCodec.cpp
+++ b/src/Compression/tests/gtest_compressionCodec.cpp
@@ -442,7 +442,7 @@ CompressionCodecPtr makeCodec(const std::string & codec_string, const DataTypePt
 {
     const std::string codec_statement = "(" + codec_string + ")";
     Tokens tokens(codec_statement.begin().base(), codec_statement.end().base());
-    IParser::Pos token_iterator(tokens, 0);
+    IParser::Pos token_iterator(tokens, 0, 0);
 
     Expected expected;
     ASTPtr codec_ast;
@@ -483,7 +483,7 @@ void testTranscoding(Timer & timer, ICompressionCodec & codec, const CodecTestSe
 
     ASSERT_TRUE(EqualByteContainers(test_sequence.data_type->getSizeOfValueInMemory(), source_data, decoded));
 
-    const auto header_size = codec.getHeaderSize();
+    const auto header_size = ICompressionCodec::getHeaderSize();
     const auto compression_ratio = (encoded_size - header_size) / (source_data.size() * 1.0);
 
     if (expected_compression_ratio)
diff --git a/src/Coordination/Changelog.cpp b/src/Coordination/Changelog.cpp
index 7f1135eec94..58d396aad88 100644
--- a/src/Coordination/Changelog.cpp
+++ b/src/Coordination/Changelog.cpp
@@ -1,5 +1,12 @@
+#include <exception>
 #include <filesystem>
+#include <mutex>
+#include <ranges>
 #include <Coordination/Changelog.h>
+#include <Coordination/Keeper4LWInfo.h>
+#include <Coordination/KeeperContext.h>
+#include <Coordination/CoordinationSettings.h>
+#include <Coordination/KeeperCommon.h>
 #include <Disks/DiskLocal.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
@@ -14,8 +21,19 @@
 #include <Common/SipHash.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
+#include <Common/ThreadPool.h>
+#include <Common/ProfileEvents.h>
 #include <libnuraft/log_val_type.hxx>
+#include <libnuraft/log_entry.hxx>
+#include <libnuraft/raft_server.hxx>
 
+namespace ProfileEvents
+{
+    extern const Event KeeperLogsEntryReadFromLatestCache;
+    extern const Event KeeperLogsEntryReadFromCommitCache;
+    extern const Event KeeperLogsEntryReadFromFile;
+    extern const Event KeeperLogsPrefetchedEntries;
+}
 
 namespace DB
 {
@@ -33,25 +51,32 @@ namespace ErrorCodes
 namespace
 {
 
-constexpr std::string_view tmp_prefix = "tmp_";
-
-void moveFileBetweenDisks(DiskPtr disk_from, ChangelogFileDescriptionPtr description, DiskPtr disk_to, const std::string & path_to)
+void moveChangelogBetweenDisks(
+    DiskPtr disk_from,
+    ChangelogFileDescriptionPtr description,
+    DiskPtr disk_to,
+    const std::string & path_to,
+    const KeeperContextPtr & keeper_context)
 {
-    /// we use empty file with prefix tmp_ to detect incomplete copies
-    /// if a copy is complete we don't care from which disk we use the same file
-    /// so it's okay if a failure happens after removing of tmp file but before we remove
-    /// the changelog from the source disk
-    auto from_path = fs::path(description->path);
-    auto tmp_changelog_name = from_path.parent_path() / (std::string{tmp_prefix} + from_path.filename().string());
-    {
-        auto buf = disk_to->writeFile(tmp_changelog_name);
-        buf->finalize();
-    }
-    disk_from->copyFile(from_path, *disk_to, path_to, {});
-    disk_to->removeFile(tmp_changelog_name);
-    disk_from->removeFile(description->path);
-    description->path = path_to;
-    description->disk = disk_to;
+    auto path_from = description->path;
+    moveFileBetweenDisks(
+        disk_from,
+        path_from,
+        disk_to,
+        path_to,
+        [&]
+        {
+            /// a different thread could be trying to read from the file
+            /// we should make sure the source disk contains the file while read is in progress
+            description->withLock(
+                [&]
+                {
+                    description->disk = disk_to;
+                    description->path = path_to;
+                });
+        },
+        getLogger("Changelog"),
+        keeper_context);
 }
 
 constexpr auto DEFAULT_PREFIX = "changelog";
@@ -111,12 +136,14 @@ class ChangelogWriter
 public:
     ChangelogWriter(
         std::map<uint64_t, ChangelogFileDescriptionPtr> & existing_changelogs_,
+        LogEntryStorage & entry_storage_,
         KeeperContextPtr keeper_context_,
         LogFileSettings log_file_settings_)
         : existing_changelogs(existing_changelogs_)
+        , entry_storage(entry_storage_)
         , log_file_settings(log_file_settings_)
         , keeper_context(std::move(keeper_context_))
-        , log(&Poco::Logger::get("Changelog"))
+        , log(getLogger("Changelog"))
     {
     }
 
@@ -173,15 +200,15 @@ public:
                     }
                     else
                     {
-                        moveFileBetweenDisks(log_disk, current_file_description, disk, new_path);
+                        moveChangelogBetweenDisks(log_disk, current_file_description, disk, new_path, keeper_context);
                     }
                 }
             }
 
             auto latest_log_disk = getLatestLogDisk();
-            assert(file_description->disk == latest_log_disk);
+            chassert(file_description->disk == latest_log_disk);
             file_buf = latest_log_disk->writeFile(file_description->path, DBMS_DEFAULT_BUFFER_SIZE, mode);
-            assert(file_buf);
+            chassert(file_buf);
             last_index_written.reset();
             current_file_description = std::move(file_description);
 
@@ -196,7 +223,7 @@ public:
         }
         catch (...)
         {
-            tryLogCurrentException(log);
+            tryLogCurrentException(log, "While setting new changelog file");
             throw;
         }
     }
@@ -238,6 +265,7 @@ public:
         }
 
         auto & write_buffer = getBuffer();
+        auto current_position =  initial_file_size + write_buffer.count();
         writeIntBinary(computeRecordChecksum(record), write_buffer);
 
         writeIntBinary(record.header.version, write_buffer);
@@ -255,6 +283,15 @@ public:
             /// Flush compressed data to file buffer
             compressed_buffer->next();
         }
+        else
+        {
+            unflushed_indices_with_log_location.emplace_back(
+                record.header.index,
+                LogLocation{
+                    .file_description = current_file_description,
+                    .position = current_position,
+                    .size = record.header.blob_size});
+        }
 
         last_index_written = record.header.index;
 
@@ -272,6 +309,8 @@ public:
             else
                 file_buffer->next();
         }
+        entry_storage.addLogLocations(std::move(unflushed_indices_with_log_location));
+        unflushed_indices_with_log_location.clear();
     }
 
     uint64_t getStartIndex() const
@@ -314,9 +353,9 @@ public:
 private:
     void finalizeCurrentFile()
     {
-        assert(prealloc_done);
+        chassert(prealloc_done);
 
-        assert(current_file_description);
+        chassert(current_file_description);
         // compact can delete the file and we don't need to do anything
         if (current_file_description->deleted)
         {
@@ -400,9 +439,11 @@ private:
     {
         const auto * file_buffer = tryGetFileBuffer();
 
+        if (file_buffer)
+            initial_file_size = getSizeFromFileDescriptor(file_buffer->getFD());
+
         if (log_file_settings.max_size == 0 || !file_buffer)
         {
-            initial_file_size = 0;
             prealloc_done = true;
             return;
         }
@@ -428,7 +469,6 @@ private:
             }
         }
 #endif
-        initial_file_size = getSizeFromFileDescriptor(file_buffer->getFD());
 
         prealloc_done = true;
     }
@@ -441,6 +481,10 @@ private:
 
     std::map<uint64_t, ChangelogFileDescriptionPtr> & existing_changelogs;
 
+    LogEntryStorage & entry_storage;
+
+    std::vector<std::pair<uint64_t, LogLocation>> unflushed_indices_with_log_location;
+
     ChangelogFileDescriptionPtr current_file_description{nullptr};
     std::unique_ptr<WriteBufferFromFileBase> file_buf;
     std::optional<uint64_t> last_index_written;
@@ -454,25 +498,28 @@ private:
 
     KeeperContextPtr keeper_context;
 
-    Poco::Logger * const log;
+    LoggerPtr const log;
 };
 
+namespace
+{
+
 struct ChangelogReadResult
 {
     /// Total entries read from log including skipped.
     /// Useful when we decide to continue to write in the same log and want to know
     /// how many entries was already written in it.
-    uint64_t total_entries_read_from_log;
+    uint64_t total_entries_read_from_log{0};
 
     /// First index in log
-    uint64_t log_start_index;
+    uint64_t log_start_index{0};
 
     /// First entry actually read log (not including skipped)
-    uint64_t first_read_index;
+    uint64_t first_read_index{0};
     /// Last entry read from log (last entry in log)
     /// When we don't skip anything last_read_index - first_read_index = total_entries_read_from_log.
     /// But when some entries from the start of log can be skipped because they are not required.
-    uint64_t last_read_index;
+    uint64_t last_read_index{0};
 
     /// last offset we were able to read from log
     off_t last_position;
@@ -482,69 +529,99 @@ struct ChangelogReadResult
     bool error;
 };
 
+ChangelogRecord readChangelogRecord(ReadBuffer & read_buf, const std::string & filepath)
+{
+    /// Read checksum
+    Checksum record_checksum;
+    readIntBinary(record_checksum, read_buf);
+
+    /// Read header
+    ChangelogRecord record;
+    readIntBinary(record.header.version, read_buf);
+    readIntBinary(record.header.index, read_buf);
+    readIntBinary(record.header.term, read_buf);
+    readIntBinary(record.header.value_type, read_buf);
+    readIntBinary(record.header.blob_size, read_buf);
+
+    if (record.header.version > CURRENT_CHANGELOG_VERSION)
+        throw Exception(
+            ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported changelog version {} on path {}", static_cast<uint8_t>(record.header.version), filepath);
+
+    /// Read data
+    if (record.header.blob_size != 0)
+    {
+        auto buffer = nuraft::buffer::alloc(record.header.blob_size);
+        auto * buffer_begin = reinterpret_cast<char *>(buffer->data_begin());
+        read_buf.readStrict(buffer_begin, record.header.blob_size);
+        record.blob = buffer;
+    }
+    else
+        record.blob = nullptr;
+
+    /// Compare checksums
+    Checksum checksum = computeRecordChecksum(record);
+    if (checksum != record_checksum)
+    {
+        throw Exception(
+            ErrorCodes::CHECKSUM_DOESNT_MATCH,
+            "Checksums doesn't match for log {} (version {}), index {}, blob_size {}",
+            filepath,
+            record.header.version,
+            record.header.index,
+            record.header.blob_size);
+    }
+
+    return record;
+}
+
+LogEntryPtr logEntryFromRecord(const ChangelogRecord & record)
+{
+    return nuraft::cs_new<nuraft::log_entry>(record.header.term, record.blob, static_cast<nuraft::log_val_type>(record.header.value_type));
+}
+
+size_t logEntrySize(const LogEntryPtr & log_entry)
+{
+    return log_entry->get_buf().size();
+}
+
+LogEntryPtr getLogEntry(const CacheEntry & cache_entry)
+{
+    if (const auto * log_entry = std::get_if<LogEntryPtr>(&cache_entry))
+        return *log_entry;
+
+    const auto & prefetched_log_entry = std::get<PrefetchedCacheEntry>(cache_entry);
+    return prefetched_log_entry.getLogEntry();
+}
+
+}
+
 class ChangelogReader
 {
 public:
-    explicit ChangelogReader(DiskPtr disk_, const std::string & filepath_) : disk(disk_), filepath(filepath_)
+    explicit ChangelogReader(ChangelogFileDescriptionPtr changelog_description_) : changelog_description(changelog_description_)
     {
-        compression_method = chooseCompressionMethod(filepath, "");
-        auto read_buffer_from_file = disk->readFile(filepath);
+        compression_method = chooseCompressionMethod(changelog_description->path, "");
+        auto read_buffer_from_file = changelog_description->disk->readFile(changelog_description->path);
         read_buf = wrapReadBufferWithCompressionMethod(std::move(read_buffer_from_file), compression_method);
     }
 
     /// start_log_index -- all entries with index < start_log_index will be skipped, but accounted into total_entries_read_from_log
-    ChangelogReadResult readChangelog(IndexToLogEntry & logs, uint64_t start_log_index, Poco::Logger * log)
+    ChangelogReadResult readChangelog(LogEntryStorage & entry_storage, uint64_t start_log_index, LoggerPtr log)
     {
         ChangelogReadResult result{};
         result.compressed_log = compression_method != CompressionMethod::None;
+        const auto & filepath = changelog_description->path;
         try
         {
             while (!read_buf->eof())
             {
                 result.last_position = read_buf->count();
-                /// Read checksum
-                Checksum record_checksum;
-                readIntBinary(record_checksum, *read_buf);
 
-                /// Read header
-                ChangelogRecord record;
-                readIntBinary(record.header.version, *read_buf);
-                readIntBinary(record.header.index, *read_buf);
-                readIntBinary(record.header.term, *read_buf);
-                readIntBinary(record.header.value_type, *read_buf);
-                readIntBinary(record.header.blob_size, *read_buf);
-
-                if (record.header.version > CURRENT_CHANGELOG_VERSION)
-                    throw Exception(
-                        ErrorCodes::UNKNOWN_FORMAT_VERSION, "Unsupported changelog version {} on path {}", static_cast<uint8_t>(record.header.version), filepath);
-
-                /// Read data
-                if (record.header.blob_size != 0)
-                {
-                    auto buffer = nuraft::buffer::alloc(record.header.blob_size);
-                    auto * buffer_begin = reinterpret_cast<char *>(buffer->data_begin());
-                    read_buf->readStrict(buffer_begin, record.header.blob_size);
-                    record.blob = buffer;
-                }
-                else
-                    record.blob = nullptr;
-
-                /// Compare checksums
-                Checksum checksum = computeRecordChecksum(record);
-                if (checksum != record_checksum)
-                {
-                    throw Exception(
-                        ErrorCodes::CHECKSUM_DOESNT_MATCH,
-                        "Checksums doesn't match for log {} (version {}), index {}, blob_size {}",
-                        filepath,
-                        record.header.version,
-                        record.header.index,
-                        record.header.blob_size);
-                }
+                auto record = readChangelogRecord(*read_buf, filepath);
 
                 /// Check for duplicated changelog ids
-                if (logs.contains(record.header.index))
-                    std::erase_if(logs, [&record](const auto & item) { return item.first >= record.header.index; });
+                if (entry_storage.contains(record.header.index))
+                    entry_storage.cleanAfter(record.header.index - 1);
 
                 result.total_entries_read_from_log += 1;
 
@@ -553,12 +630,18 @@ public:
                     continue;
 
                 /// Create log entry for read data
-                auto log_entry = nuraft::cs_new<nuraft::log_entry>(record.header.term, record.blob, static_cast<nuraft::log_val_type>(record.header.value_type));
+                auto log_entry = logEntryFromRecord(record);
                 if (result.first_read_index == 0)
                     result.first_read_index = record.header.index;
 
                 /// Put it into in memory structure
-                logs.emplace(record.header.index, log_entry);
+                entry_storage.addEntryWithLocation(
+                    record.header.index,
+                    log_entry,
+                    LogLocation{
+                        .file_description = changelog_description,
+                        .position = static_cast<size_t>(result.last_position),
+                        .size = record.header.blob_size});
                 result.last_read_index = record.header.index;
 
                 if (result.total_entries_read_from_log % 50000 == 0)
@@ -585,131 +668,971 @@ public:
     }
 
 private:
-    DiskPtr disk;
-    std::string filepath;
+    ChangelogFileDescriptionPtr changelog_description;
     CompressionMethod compression_method;
     std::unique_ptr<ReadBuffer> read_buf;
 };
 
+PrefetchedCacheEntry::PrefetchedCacheEntry()
+    : log_entry(log_entry_resolver.get_future())
+{}
+
+const LogEntryPtr & PrefetchedCacheEntry::getLogEntry() const
+{
+    return log_entry.get();
+}
+
+void PrefetchedCacheEntry::resolve(std::exception_ptr exception)
+{
+    log_entry_resolver.set_exception(exception);
+}
+
+void PrefetchedCacheEntry::resolve(LogEntryPtr log_entry_)
+{
+    log_entry_resolver.set_value(std::move(log_entry_));
+}
+
+LogEntryStorage::LogEntryStorage(const LogFileSettings & log_settings, KeeperContextPtr keeper_context_)
+    : latest_logs_cache(log_settings.latest_logs_cache_size_threshold)
+    , commit_logs_cache(log_settings.commit_logs_cache_size_threshold)
+    , prefetch_queue(std::numeric_limits<uint64_t>::max())
+    , keeper_context(std::move(keeper_context_))
+    , log(getLogger("Changelog"))
+{
+    commit_logs_prefetcher = std::make_unique<ThreadFromGlobalPool>([this] { prefetchCommitLogs(); });
+}
+
+LogEntryStorage::~LogEntryStorage()
+{
+    shutdown();
+}
+
+void LogEntryStorage::prefetchCommitLogs()
+{
+    std::shared_ptr<PrefetchInfo> prefetch_info;
+    while (prefetch_queue.pop(prefetch_info))
+    {
+        if (prefetch_info->cancel)
+        {
+            prefetch_info->done = true;
+            prefetch_info->done.notify_all();
+            continue;
+        }
+
+        auto current_index = prefetch_info->commit_prefetch_index_range.first;
+        try
+        {
+            for (const auto & prefetch_file_info : prefetch_info->file_infos)
+            {
+                prefetch_file_info.file_description->withLock(
+                    [&]
+                    {
+                        const auto & [changelog_description, position, count] = prefetch_file_info;
+                        auto file = changelog_description->disk->readFile(changelog_description->path, ReadSettings());
+                        file->seek(position, SEEK_SET);
+                        LOG_TRACE(
+                            log, "Prefetching {} log entries from path {}, from position {}", count, changelog_description->path, position);
+                        ProfileEvents::increment(ProfileEvents::KeeperLogsPrefetchedEntries, count);
+
+                        for (size_t i = 0; i < count; ++i)
+                        {
+                            if (prefetch_info->cancel)
+                                break;
+
+                            auto record = readChangelogRecord(*file, changelog_description->path);
+                            auto entry = logEntryFromRecord(record);
+                            if (current_index != record.header.index)
+                                throw Exception(
+                                    ErrorCodes::LOGICAL_ERROR,
+                                    "Invalid index prefetched, expected {}, actual {}",
+                                    current_index,
+                                    record.header.index);
+
+                            commit_logs_cache.getPrefetchedCacheEntry(record.header.index).resolve(std::move(entry));
+                            ++current_index;
+                        }
+                    });
+
+                if (prefetch_info->cancel)
+                    break;
+            }
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "While prefetching log entries");
+            auto exception = std::current_exception();
+
+            for (; current_index <= prefetch_info->commit_prefetch_index_range.second; ++current_index)
+                commit_logs_cache.getPrefetchedCacheEntry(current_index).resolve(exception);
+        }
+
+        prefetch_info->done = true;
+        prefetch_info->done.notify_all();
+    }
+}
+
+void LogEntryStorage::startCommitLogsPrefetch(uint64_t last_committed_index) const
+{
+    if (keeper_context->isShutdownCalled())
+        return;
+
+    /// commit logs is not empty and it's not next log
+    if (!commit_logs_cache.empty() && commit_logs_cache.max_index_in_cache != last_committed_index)
+        return;
+
+    if (logs_location.empty())
+        return;
+
+    /// we are already prefetching some logs for commit
+    if (current_prefetch_info && !current_prefetch_info->done)
+        return;
+
+    auto new_prefetch_info = std::make_shared<PrefetchInfo>();
+    auto & [prefetch_from, prefetch_to] = new_prefetch_info->commit_prefetch_index_range;
+
+    /// if there are no entries in commit cache we will start from the next log that will be committed
+    /// otherwise we continue appending the commit cache from the latest entry stored in it
+    size_t current_index = commit_logs_cache.empty() ? last_committed_index + 1 : commit_logs_cache.max_index_in_cache + 1;
+
+    prefetch_from = current_index;
+
+    size_t total_size = 0;
+    std::vector<FileReadInfo> file_infos;
+    FileReadInfo * current_file_info = nullptr;
+
+    size_t max_index_for_prefetch = 0;
+    if (!latest_logs_cache.empty())
+        max_index_for_prefetch = latest_logs_cache.min_index_in_cache - 1;
+    else
+        max_index_for_prefetch = max_index_with_location;
+
+    for (; current_index <= max_index_for_prefetch; ++current_index)
+    {
+        const auto & [changelog_description, position, size] = logs_location.at(current_index);
+        if (total_size == 0)
+            current_file_info = &file_infos.emplace_back(changelog_description, position, /* count */ 1);
+        else if (total_size + size > commit_logs_cache.size_threshold)
+            break;
+        else if (changelog_description == current_file_info->file_description)
+            ++current_file_info->count;
+        else
+            current_file_info = &file_infos.emplace_back(changelog_description, position, /* count */ 1);
+
+        total_size += size;
+        commit_logs_cache.addEntry(current_index, size, PrefetchedCacheEntry());
+    }
+
+    if (!file_infos.empty())
+    {
+        current_prefetch_info = std::move(new_prefetch_info);
+        prefetch_to = current_index - 1;
+        LOG_TRACE(log, "Will prefetch {} commit log entries [{} - {}]", prefetch_to - prefetch_from + 1, prefetch_from, prefetch_to);
+
+        current_prefetch_info->file_infos = std::move(file_infos);
+        auto inserted = prefetch_queue.push(current_prefetch_info);
+        chassert(inserted);
+    }
+}
+
+LogEntryStorage::InMemoryCache::InMemoryCache(size_t size_threshold_)
+    : size_threshold(size_threshold_)
+{}
+
+void LogEntryStorage::InMemoryCache::updateStatsWithNewEntry(uint64_t index, size_t size)
+{
+    cache_size += size;
+
+    if (cache.size() == 1)
+    {
+        min_index_in_cache = index;
+        max_index_in_cache = index;
+    }
+    else
+    {
+        chassert(index > max_index_in_cache);
+        max_index_in_cache = index;
+    }
+}
+
+void LogEntryStorage::InMemoryCache::addEntry(uint64_t index, size_t size, CacheEntry log_entry)
+{
+    auto [_, inserted] = cache.emplace(index, std::move(log_entry));
+    if (!inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to insert log with index {} which is already present in cache", index);
+
+    updateStatsWithNewEntry(index, size);
+}
+
+void LogEntryStorage::InMemoryCache::addEntry(IndexToCacheEntryNode && node)
+{
+    auto index = node.key();
+    auto entry_size = logEntrySize(getLogEntry(node.mapped()));
+
+    auto result = cache.insert(std::move(node));
+    if (!result.inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to insert log with index {} which is already present in cache", index);
+
+    updateStatsWithNewEntry(index, entry_size);
+}
+
+IndexToCacheEntryNode LogEntryStorage::InMemoryCache::popOldestEntry()
+{
+    auto node = cache.extract(min_index_in_cache);
+    if (node.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Couldn't find the oldest entry of index {} in logs cache", min_index_in_cache);
+    ++min_index_in_cache;
+    cache_size -= logEntrySize(getLogEntry(node.mapped()));
+    return node;
+}
+
+bool LogEntryStorage::InMemoryCache::containsEntry(uint64_t index) const
+{
+    return !cache.empty() && index >= min_index_in_cache && index <= max_index_in_cache;
+}
+
+CacheEntry * LogEntryStorage::InMemoryCache::getCacheEntry(uint64_t index)
+{
+    if (!containsEntry(index))
+        return nullptr;
+
+    auto it = cache.find(index);
+    if (it == cache.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Index {} missing from cache while it should be present", index);
+
+    return &it->second;
+}
+
+const CacheEntry * LogEntryStorage::InMemoryCache::getCacheEntry(uint64_t index) const
+{
+    return const_cast<InMemoryCache &>(*this).getCacheEntry(index);
+}
+
+PrefetchedCacheEntry & LogEntryStorage::InMemoryCache::getPrefetchedCacheEntry(uint64_t index)
+{
+    auto * cache_entry = getCacheEntry(index);
+    if (cache_entry == nullptr)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing expected index {} in cache", index);
+
+    return std::get<PrefetchedCacheEntry>(*cache_entry);
+}
+
+
+LogEntryPtr LogEntryStorage::InMemoryCache::getEntry(uint64_t index) const
+{
+    const auto * cache_entry = getCacheEntry(index);
+    if (cache_entry == nullptr)
+        return nullptr;
+
+    return getLogEntry(*cache_entry);
+}
+
+void LogEntryStorage::InMemoryCache::cleanUpTo(uint64_t index)
+{
+    if (empty() || index <= min_index_in_cache)
+        return;
+
+    if (index > max_index_in_cache)
+    {
+        cache.clear();
+        cache_size = 0;
+        return;
+    }
+
+    for (size_t i = min_index_in_cache; i < index; ++i)
+    {
+        auto it = cache.find(i);
+        if (it == cache.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with index {} unexpectedly missing from cache", i);
+
+        cache_size -= logEntrySize(getLogEntry(it->second));
+        cache.erase(it);
+    }
+    min_index_in_cache = index;
+}
+
+void LogEntryStorage::InMemoryCache::cleanAfter(uint64_t index)
+{
+    if (empty() || index >= max_index_in_cache)
+        return;
+
+    if (index < min_index_in_cache)
+    {
+        cache.clear();
+        cache_size = 0;
+        return;
+    }
+
+    for (size_t i = index + 1; i <= max_index_in_cache; ++i)
+    {
+        auto it = cache.find(i);
+        if (it == cache.end())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with index {} unexpectedly missing from cache", i);
+
+        cache_size -= logEntrySize(getLogEntry(it->second));
+        cache.erase(it);
+    }
+
+    max_index_in_cache = index;
+}
+
+void LogEntryStorage::InMemoryCache::clear()
+{
+    cache.clear();
+    cache_size = 0;
+}
+
+bool LogEntryStorage::InMemoryCache::empty() const
+{
+    return cache.empty();
+}
+
+size_t LogEntryStorage::InMemoryCache::numberOfEntries() const
+{
+    return cache.size();
+}
+
+bool LogEntryStorage::InMemoryCache::hasSpaceAvailable(size_t log_entry_size) const
+{
+    return size_threshold == 0 || empty() || cache_size + log_entry_size < size_threshold;
+}
+
+void LogEntryStorage::addEntry(uint64_t index, const LogEntryPtr & log_entry)
+{
+    /// we update the cache for added entries on refreshCache call
+    latest_logs_cache.addEntry(index, logEntrySize(log_entry), log_entry);
+
+    if (log_entry->get_val_type() == nuraft::conf)
+    {
+        latest_config = log_entry;
+        latest_config_index = index;
+        logs_with_config_changes.insert(index);
+    }
+
+    updateTermInfoWithNewEntry(index, log_entry->get_term());
+}
+
+bool LogEntryStorage::shouldMoveLogToCommitCache(uint64_t index, size_t log_entry_size)
+{
+    /// if commit logs cache is empty, we need it only if it's the next log to commit
+    if (commit_logs_cache.empty())
+        return keeper_context->lastCommittedIndex() + 1 == index;
+
+    return commit_logs_cache.max_index_in_cache == index - 1 && commit_logs_cache.hasSpaceAvailable(log_entry_size);
+}
+
+void LogEntryStorage::updateTermInfoWithNewEntry(uint64_t index, uint64_t term)
+{
+    if (!log_term_infos.empty() && log_term_infos.back().term == term)
+        return;
+
+    log_term_infos.push_back(LogTermInfo{.term = term, .first_index = index});
+}
+
+void LogEntryStorage::addEntryWithLocation(uint64_t index, const LogEntryPtr & log_entry, LogLocation log_location)
+{
+    auto entry_size = logEntrySize(log_entry);
+    while (!latest_logs_cache.hasSpaceAvailable(entry_size))
+    {
+        auto entry_handle = latest_logs_cache.popOldestEntry();
+        size_t removed_entry_size = logEntrySize(getLogEntry(entry_handle.mapped()));
+        if (shouldMoveLogToCommitCache(entry_handle.key(), removed_entry_size))
+            commit_logs_cache.addEntry(std::move(entry_handle));
+    }
+    latest_logs_cache.addEntry(index, entry_size, CacheEntry(log_entry));
+
+    logs_location.emplace(index, std::move(log_location));
+
+    if (logs_location.size() == 1)
+        min_index_with_location = index;
+
+    max_index_with_location = index;
+
+    if (log_entry->get_val_type() == nuraft::conf)
+    {
+        latest_config = log_entry;
+        latest_config_index = index;
+        logs_with_config_changes.insert(index);
+    }
+
+    updateTermInfoWithNewEntry(index, log_entry->get_term());
+}
+
+void LogEntryStorage::cleanUpTo(uint64_t index)
+{
+    latest_logs_cache.cleanUpTo(index);
+
+    if (!logs_location.empty() && index > min_index_with_location)
+    {
+        if (index > max_index_with_location)
+        {
+            logs_location.clear();
+        }
+        else
+        {
+            for (size_t i = min_index_with_location; i < index; ++i)
+            {
+                auto it = logs_location.find(i);
+                if (it == logs_location.end())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with index {} unexpectedly missing from logs location", i);
+
+                logs_location.erase(it);
+            }
+
+            min_index_with_location = index;
+
+        }
+    }
+
+    {
+        std::lock_guard lock(logs_location_mutex);
+        if (!unapplied_indices_with_log_locations.empty())
+        {
+            auto last = std::ranges::lower_bound(
+                unapplied_indices_with_log_locations,
+                index,
+                std::ranges::less{},
+                [](const auto & index_with_location) { return index_with_location.first; });
+
+            unapplied_indices_with_log_locations.erase(unapplied_indices_with_log_locations.begin(), last);
+        }
+    }
+
+    /// uncommitted logs should be compacted only if we received snapshot from leader
+    if (current_prefetch_info && !current_prefetch_info->done)
+    {
+        auto [prefetch_from, prefetch_to] = current_prefetch_info->commit_prefetch_index_range;
+        /// if we will clean some logs that are currently prefetched, stop prefetching
+        /// and clean all logs from it
+        if (index > prefetch_from)
+        {
+            current_prefetch_info->cancel = true;
+            current_prefetch_info->done.wait(false);
+            commit_logs_cache.clear();
+        }
+
+        /// start prefetching logs for committing at the current index
+        /// the last log index in the snapshot should be the
+        /// last log we cleaned up
+        startCommitLogsPrefetch(index - 1);
+    }
+    else
+        commit_logs_cache.cleanUpTo(index);
+
+    std::erase_if(logs_with_config_changes, [&](const auto conf_index) { return conf_index < index; });
+    if (auto it = std::max_element(logs_with_config_changes.begin(), logs_with_config_changes.end()); it != logs_with_config_changes.end())
+    {
+        latest_config_index = *it;
+        latest_config = getEntry(latest_config_index);
+    }
+    else
+        latest_config = nullptr;
+
+    if (first_log_index < index)
+        first_log_entry = nullptr;
+
+    /// remove all the term infos we don't need (all terms that start before index)
+    uint64_t last_removed_term = 0;
+    while (!log_term_infos.empty() && log_term_infos.front().first_index < index)
+    {
+        last_removed_term = log_term_infos.front().term;
+        log_term_infos.pop_front();
+    }
+
+    /// the last removed term info could contain terms for some indices we didn't cleanup
+    /// so we add the last removed term info back but with new first index
+    if (last_removed_term != 0 && (log_term_infos.empty() || log_term_infos.front().first_index > index))
+        log_term_infos.push_front(LogTermInfo{.term = last_removed_term, .first_index = index});
+}
+
+void LogEntryStorage::cleanAfter(uint64_t index)
+{
+    latest_logs_cache.cleanAfter(index);
+
+    if (!logs_location.empty() && index < max_index_with_location)
+    {
+        if (index < min_index_with_location)
+        {
+            logs_location.clear();
+        }
+        else
+        {
+            for (size_t i = index + 1; i <= max_index_with_location; ++i)
+            {
+                auto it = logs_location.find(i);
+                if (it == logs_location.end())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with index {} unexpectedly missing from logs location", i);
+
+                logs_location.erase(it);
+            }
+
+            max_index_with_location = index;
+        }
+    }
+
+    {
+        std::lock_guard lock(logs_location_mutex);
+        if (!unapplied_indices_with_log_locations.empty())
+        {
+            auto first = std::ranges::upper_bound(
+                unapplied_indices_with_log_locations,
+                index,
+                std::ranges::less{},
+                [](const auto & index_with_location) { return index_with_location.first; });
+
+            unapplied_indices_with_log_locations.erase(first, unapplied_indices_with_log_locations.end());
+        }
+    }
+
+    /// if we cleared all latest logs, there is a possibility we would need to clear commit logs
+    if (latest_logs_cache.empty())
+    {
+        /// we will clean everything after the index, if there is a prefetch in progress
+        /// wait until we fetch everything until index
+        /// afterwards we can stop prefetching of newer logs because they will be cleaned up
+        commit_logs_cache.getEntry(index);
+        if (current_prefetch_info && !current_prefetch_info->done)
+        {
+            auto [prefetch_from, prefetch_to] = current_prefetch_info->commit_prefetch_index_range;
+            /// if we will clean some logs that are currently prefetched, stop prefetching
+            if (index < prefetch_to)
+            {
+                current_prefetch_info->cancel = true;
+                current_prefetch_info->done.wait(false);
+            }
+        }
+
+        commit_logs_cache.cleanAfter(index);
+        startCommitLogsPrefetch(keeper_context->lastCommittedIndex());
+    }
+
+    if (empty() || first_log_index > index)
+    {
+        /// if we don't store any logs or if the first log index changed, reset first log cache
+        first_log_entry = nullptr;
+    }
+
+    std::erase_if(logs_with_config_changes, [&](const auto conf_index) { return conf_index > index; });
+    if (auto it = std::max_element(logs_with_config_changes.begin(), logs_with_config_changes.end()); it != logs_with_config_changes.end())
+    {
+        latest_config_index = *it;
+        latest_config = getEntry(latest_config_index);
+    }
+    else
+        latest_config = nullptr;
+
+    /// remove all the term infos we don't need (all terms that start after index)
+    while (!log_term_infos.empty() && log_term_infos.back().first_index > index)
+        log_term_infos.pop_back();
+}
+
+bool LogEntryStorage::contains(uint64_t index) const
+{
+    return logs_location.contains(index) || latest_logs_cache.containsEntry(index);
+}
+
+LogEntryPtr LogEntryStorage::getEntry(uint64_t index) const
+{
+    auto last_committed_index = keeper_context->lastCommittedIndex();
+    commit_logs_cache.cleanUpTo(last_committed_index);
+    startCommitLogsPrefetch(last_committed_index);
+
+    LogEntryPtr entry = nullptr;
+
+    if (latest_config != nullptr && index == latest_config_index)
+        return latest_config;
+
+    if (first_log_entry != nullptr && index == first_log_index)
+        return first_log_entry;
+
+    if (auto entry_from_latest_cache = latest_logs_cache.getEntry(index))
+    {
+        ProfileEvents::increment(ProfileEvents::KeeperLogsEntryReadFromLatestCache);
+        return entry_from_latest_cache;
+    }
+
+    if (auto entry_from_commit_cache = commit_logs_cache.getEntry(index))
+    {
+        ProfileEvents::increment(ProfileEvents::KeeperLogsEntryReadFromCommitCache);
+        return entry_from_commit_cache;
+    }
+
+    if (auto it = logs_location.find(index); it != logs_location.end())
+    {
+        it->second.file_description->withLock(
+            [&]
+            {
+                const auto & [changelog_description, position, size] = it->second;
+                auto file = changelog_description->disk->readFile(changelog_description->path, ReadSettings());
+                file->seek(position, SEEK_SET);
+                LOG_TRACE(
+                    log,
+                    "Reading log entry at index {} from path {}, position {}, size {}",
+                    index,
+                    changelog_description->path,
+                    position,
+                    size);
+
+                auto record = readChangelogRecord(*file, changelog_description->path);
+                entry = logEntryFromRecord(record);
+            });
+
+        /// if we fetched the first log entry, we will cache it because it's often accessed
+        if (first_log_entry == nullptr && index == getFirstIndex())
+        {
+            first_log_index = index;
+            first_log_entry = entry;
+        }
+
+        ProfileEvents::increment(ProfileEvents::KeeperLogsEntryReadFromFile);
+    }
+
+    return entry;
+}
+
+void LogEntryStorage::clear()
+{
+    latest_logs_cache.clear();
+    commit_logs_cache.clear();
+    logs_location.clear();
+}
+
+LogEntryPtr LogEntryStorage::getLatestConfigChange() const
+{
+    return latest_config;
+}
+
+uint64_t LogEntryStorage::termAt(uint64_t index) const
+{
+    uint64_t term_for_index = 0;
+    for (const auto [term, first_index] : log_term_infos)
+    {
+        if (index < first_index)
+            return term_for_index;
+
+        term_for_index = term;
+    }
+
+    return term_for_index;
+}
+
+void LogEntryStorage::addLogLocations(std::vector<std::pair<uint64_t, LogLocation>> && indices_with_log_locations)
+{
+    /// if we have unlimited space in latest logs cache we don't need log location
+    if (latest_logs_cache.size_threshold == 0)
+        return;
+
+    std::lock_guard lock(logs_location_mutex);
+    unapplied_indices_with_log_locations.insert(
+        unapplied_indices_with_log_locations.end(),
+        std::make_move_iterator(indices_with_log_locations.begin()),
+        std::make_move_iterator(indices_with_log_locations.end()));
+}
+
+void LogEntryStorage::refreshCache()
+{
+    /// if we have unlimited space in latest logs cache we don't need log location
+    if (latest_logs_cache.size_threshold == 0)
+        return;
+
+    std::vector<IndexWithLogLocation> new_unapplied_indices_with_log_locations;
+    {
+        std::lock_guard lock(logs_location_mutex);
+        new_unapplied_indices_with_log_locations.swap(unapplied_indices_with_log_locations);
+    }
+
+    for (auto & [index, log_location] : new_unapplied_indices_with_log_locations)
+    {
+        if (logs_location.empty())
+            min_index_with_location = index;
+
+        logs_location.emplace(index, std::move(log_location));
+        max_index_with_location = index;
+    }
+
+    if (logs_location.empty())
+        return;
+
+    while (latest_logs_cache.numberOfEntries() > 1 && latest_logs_cache.min_index_in_cache <= max_index_with_location
+           && latest_logs_cache.cache_size > latest_logs_cache.size_threshold)
+    {
+        auto node = latest_logs_cache.popOldestEntry();
+        auto log_entry_size = logEntrySize(getLogEntry(node.mapped()));
+        if (shouldMoveLogToCommitCache(node.key(), log_entry_size))
+            commit_logs_cache.addEntry(std::move(node));
+    }
+}
+
+LogEntriesPtr LogEntryStorage::getLogEntriesBetween(uint64_t start, uint64_t end) const
+{
+    LogEntriesPtr ret = nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
+    ret->reserve(end - start);
+
+    /// we rely on fact that changelogs need to be written sequentially with
+    /// no other writes between
+    std::optional<FileReadInfo> read_info;
+    const auto set_new_file = [&](const auto & log_location)
+    {
+        read_info.emplace();
+        read_info->file_description = log_location.file_description;
+        read_info->position = log_location.position;
+        read_info->count = 1;
+    };
+
+    const auto flush_file = [&]
+    {
+        if (!read_info)
+            return;
+
+        LOG_TRACE(log, "Reading from path {} {} entries", read_info->file_description->path, read_info->count);
+        read_info->file_description->withLock(
+            [&]
+            {
+                const auto & [file_description, start_position, count] = *read_info;
+                auto file = file_description->disk->readFile(file_description->path);
+                file->seek(start_position, SEEK_SET);
+
+                for (size_t i = 0; i < count; ++i)
+                {
+                    auto record = readChangelogRecord(*file, file_description->path);
+                    ret->push_back(logEntryFromRecord(record));
+                    ProfileEvents::increment(ProfileEvents::KeeperLogsEntryReadFromFile);
+                }
+            });
+
+        read_info.reset();
+    };
+
+    for (size_t i = start; i < end; ++i)
+    {
+        if (auto commit_cache_entry = commit_logs_cache.getEntry(i))
+        {
+            flush_file();
+            ret->push_back(std::move(commit_cache_entry));
+        }
+        else if (auto latest_cache_entry = latest_logs_cache.getEntry(i))
+        {
+            flush_file();
+            ret->push_back(std::move(latest_cache_entry));
+        }
+        else
+        {
+            const auto & log_location = logs_location.at(i);
+
+            if (!read_info)
+                set_new_file(log_location);
+            else if (read_info->file_description == log_location.file_description)
+                ++read_info->count;
+            else
+            {
+                flush_file();
+                set_new_file(log_location);
+            }
+        }
+    }
+
+    flush_file();
+    return ret;
+}
+
+void LogEntryStorage::getKeeperLogInfo(KeeperLogInfo & log_info) const
+{
+    log_info.latest_logs_cache_entries = latest_logs_cache.numberOfEntries();
+    log_info.latest_logs_cache_size = latest_logs_cache.cache_size;
+
+    log_info.commit_logs_cache_entries = commit_logs_cache.numberOfEntries();
+    log_info.commit_logs_cache_size = commit_logs_cache.cache_size;
+}
+
+bool LogEntryStorage::isConfigLog(uint64_t index) const
+{
+    return logs_with_config_changes.contains(index);
+}
+
+size_t LogEntryStorage::empty() const
+{
+    return logs_location.empty() && latest_logs_cache.empty();
+}
+
+size_t LogEntryStorage::size() const
+{
+    if (empty())
+        return 0;
+
+    size_t min_index = 0;
+    size_t max_index = 0;
+
+    if (!logs_location.empty())
+    {
+        min_index = min_index_with_location;
+        max_index = max_index_with_location;
+    }
+    else
+        min_index = latest_logs_cache.min_index_in_cache;
+
+    if (!latest_logs_cache.empty())
+        max_index = latest_logs_cache.max_index_in_cache;
+
+    return max_index - min_index + 1;
+}
+
+size_t LogEntryStorage::getFirstIndex() const
+{
+    if (!logs_location.empty())
+        return min_index_with_location;
+
+    if (!latest_logs_cache.empty())
+        return latest_logs_cache.min_index_in_cache;
+
+    return 0;
+}
+
+void LogEntryStorage::shutdown()
+{
+    if (std::exchange(is_shutdown, true))
+        return;
+
+    if (!prefetch_queue.isFinished())
+        prefetch_queue.finish();
+
+    if (current_prefetch_info)
+    {
+        current_prefetch_info->cancel = true;
+        current_prefetch_info->done.wait(false);
+    }
+
+    if (commit_logs_prefetcher->joinable())
+        commit_logs_prefetcher->join();
+}
+
 Changelog::Changelog(
-    Poco::Logger * log_, LogFileSettings log_file_settings, FlushSettings flush_settings_, KeeperContextPtr keeper_context_)
+    LoggerPtr log_, LogFileSettings log_file_settings, FlushSettings flush_settings_, KeeperContextPtr keeper_context_)
     : changelogs_detached_dir("detached")
     , rotate_interval(log_file_settings.rotate_interval)
     , compress_logs(log_file_settings.compress_logs)
     , log(log_)
+    , entry_storage(log_file_settings, keeper_context_)
     , write_operations(std::numeric_limits<size_t>::max())
     , append_completion_queue(std::numeric_limits<size_t>::max())
     , keeper_context(std::move(keeper_context_))
     , flush_settings(flush_settings_)
 {
-    if (auto latest_log_disk = getLatestLogDisk();
-        log_file_settings.force_sync && dynamic_cast<const DiskLocal *>(latest_log_disk.get()) == nullptr)
+    try
     {
-        throw DB::Exception(
-            DB::ErrorCodes::BAD_ARGUMENTS,
-            "force_sync is set to true for logs but disk '{}' cannot satisfy such guarantee because it's not of type DiskLocal.\n"
-            "If you want to use force_sync and same disk for all logs, please set keeper_server.log_storage_disk to a local disk.\n"
-            "If you want to use force_sync and different disk only for old logs, please set 'keeper_server.log_storage_disk' to any "
-            "supported disk and 'keeper_server.latest_log_storage_disk' to a local disk.\n"
-            "Otherwise, disable force_sync",
-            latest_log_disk->getName());
-    }
-
-    /// Load all files on changelog disks
-
-    std::unordered_set<DiskPtr> read_disks;
-
-    const auto load_from_disk = [&](const auto & disk)
-    {
-        if (read_disks.contains(disk))
-            return;
-
-        LOG_TRACE(log, "Reading from disk {}", disk->getName());
-        std::unordered_map<std::string, std::string> incomplete_files;
-
-        const auto clean_incomplete_file = [&](const auto & file_path)
+        if (auto latest_log_disk = getLatestLogDisk();
+            log_file_settings.force_sync && dynamic_cast<const DiskLocal *>(latest_log_disk.get()) == nullptr)
         {
-            if (auto incomplete_it = incomplete_files.find(fs::path(file_path).filename()); incomplete_it != incomplete_files.end())
+            throw DB::Exception(
+                DB::ErrorCodes::BAD_ARGUMENTS,
+                "force_sync is set to true for logs but disk '{}' cannot satisfy such guarantee because it's not of type DiskLocal.\n"
+                "If you want to use force_sync and same disk for all logs, please set keeper_server.log_storage_disk to a local disk.\n"
+                "If you want to use force_sync and different disk only for old logs, please set 'keeper_server.log_storage_disk' to any "
+                "supported disk and 'keeper_server.latest_log_storage_disk' to a local disk.\n"
+                "Otherwise, disable force_sync",
+                latest_log_disk->getName());
+        }
+
+        /// Load all files on changelog disks
+
+        std::unordered_set<DiskPtr> read_disks;
+
+        const auto load_from_disk = [&](const auto & disk)
+        {
+            if (read_disks.contains(disk))
+                return;
+
+            LOG_TRACE(log, "Reading from disk {}", disk->getName());
+            std::unordered_map<std::string, std::string> incomplete_files;
+
+            const auto clean_incomplete_file = [&](const auto & file_path)
             {
-                LOG_TRACE(log, "Removing {} from {}", file_path, disk->getName());
-                disk->removeFile(file_path);
-                disk->removeFile(incomplete_it->second);
-                incomplete_files.erase(incomplete_it);
-                return true;
+                if (auto incomplete_it = incomplete_files.find(fs::path(file_path).filename()); incomplete_it != incomplete_files.end())
+                {
+                    LOG_TRACE(log, "Removing {} from {}", file_path, disk->getName());
+                    disk->removeFile(file_path);
+                    disk->removeFile(incomplete_it->second);
+                    incomplete_files.erase(incomplete_it);
+                    return true;
+                }
+
+                return false;
+            };
+
+            std::vector<std::string> changelog_files;
+            for (auto it = disk->iterateDirectory(""); it->isValid(); it->next())
+            {
+                const auto & file_name = it->name();
+                if (file_name == changelogs_detached_dir)
+                    continue;
+
+                if (file_name.starts_with(tmp_keeper_file_prefix))
+                {
+                    incomplete_files.emplace(file_name.substr(tmp_keeper_file_prefix.size()), it->path());
+                    continue;
+                }
+
+                if (file_name.starts_with(DEFAULT_PREFIX))
+                {
+                    if (!clean_incomplete_file(it->path()))
+                        changelog_files.push_back(it->path());
+                }
+                else
+                {
+                    LOG_WARNING(log, "Unknown file found in log directory: {}", file_name);
+                }
             }
 
-            return false;
+            for (const auto & changelog_file : changelog_files)
+            {
+                if (clean_incomplete_file(fs::path(changelog_file).filename()))
+                    continue;
+
+                auto file_description = getChangelogFileDescription(changelog_file);
+                file_description->disk = disk;
+
+                LOG_TRACE(log, "Found {} on {}", changelog_file, disk->getName());
+                auto [changelog_it, inserted] = existing_changelogs.insert_or_assign(file_description->from_log_index, std::move(file_description));
+
+                if (!inserted)
+                    LOG_WARNING(log, "Found duplicate entries for {}, will use the entry from {}", changelog_it->second->path, disk->getName());
+            }
+
+            for (const auto & [name, path] : incomplete_files)
+                disk->removeFile(path);
+
+            read_disks.insert(disk);
         };
 
-        std::vector<std::string> changelog_files;
-        for (auto it = disk->iterateDirectory(""); it->isValid(); it->next())
-        {
-            const auto & file_name = it->name();
-            if (file_name == changelogs_detached_dir)
-                continue;
+        /// Load all files from old disks
+        for (const auto & disk : keeper_context->getOldLogDisks())
+            load_from_disk(disk);
 
-            if (file_name.starts_with(tmp_prefix))
-            {
-                incomplete_files.emplace(file_name.substr(tmp_prefix.size()), it->path());
-                continue;
-            }
-
-            if (file_name.starts_with(DEFAULT_PREFIX))
-            {
-                if (!clean_incomplete_file(it->path()))
-                    changelog_files.push_back(it->path());
-            }
-            else
-            {
-                LOG_WARNING(log, "Unknown file found in log directory: {}", file_name);
-            }
-        }
-
-        for (const auto & changelog_file : changelog_files)
-        {
-            if (clean_incomplete_file(fs::path(changelog_file).filename()))
-                continue;
-
-            auto file_description = getChangelogFileDescription(changelog_file);
-            file_description->disk = disk;
-
-            LOG_TRACE(log, "Found {} on {}", changelog_file, disk->getName());
-            auto [changelog_it, inserted] = existing_changelogs.insert_or_assign(file_description->from_log_index, std::move(file_description));
-
-            if (!inserted)
-                LOG_WARNING(log, "Found duplicate entries for {}, will use the entry from {}", changelog_it->second->path, disk->getName());
-        }
-
-        for (const auto & [name, path] : incomplete_files)
-            disk->removeFile(path);
-
-        read_disks.insert(disk);
-    };
-
-    /// Load all files from old disks
-    for (const auto & disk : keeper_context->getOldLogDisks())
+        auto disk = getDisk();
         load_from_disk(disk);
 
-    auto disk = getDisk();
-    load_from_disk(disk);
+        auto latest_log_disk = getLatestLogDisk();
+        if (disk != latest_log_disk)
+            load_from_disk(latest_log_disk);
 
-    auto latest_log_disk = getLatestLogDisk();
-    if (disk != latest_log_disk)
-        load_from_disk(latest_log_disk);
+        if (existing_changelogs.empty())
+            LOG_WARNING(log, "No logs exists in {}. It's Ok if it's the first run of clickhouse-keeper.", disk->getPath());
 
-    if (existing_changelogs.empty())
-        LOG_WARNING(log, "No logs exists in {}. It's Ok if it's the first run of clickhouse-keeper.", disk->getPath());
+        clean_log_thread = std::make_unique<ThreadFromGlobalPool>([this] { cleanLogThread(); });
 
-    clean_log_thread = ThreadFromGlobalPool([this] { cleanLogThread(); });
+        write_thread = std::make_unique<ThreadFromGlobalPool>([this] { writeThread(); });
 
-    write_thread = ThreadFromGlobalPool([this] { writeThread(); });
+        append_completion_thread = std::make_unique<ThreadFromGlobalPool>([this] { appendCompletionThread(); });
 
-    append_completion_thread = ThreadFromGlobalPool([this] { appendCompletionThread(); });
-
-    current_writer = std::make_unique<ChangelogWriter>(existing_changelogs, keeper_context, log_file_settings);
+        current_writer = std::make_unique<ChangelogWriter>(existing_changelogs, entry_storage, keeper_context, log_file_settings);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        throw;
+    }
 }
 
 void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uint64_t logs_to_keep)
+try
 {
     std::lock_guard writer_lock(writer_mutex);
     std::optional<ChangelogReadResult> last_log_read_result;
@@ -751,7 +1674,6 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
                         changelog_description.from_log_index);
                     /// Nothing to do with our more fresh log, leader will overwrite them, so remove everything and just start from last_commited_index
                     removeAllLogs();
-                    min_log_id = last_commited_log_index;
                     max_log_id = last_commited_log_index == 0 ? 0 : last_commited_log_index - 1;
                     current_writer->rotate(max_log_id + 1);
                     initialized = true;
@@ -783,18 +1705,14 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
                 break;
             }
 
-            ChangelogReader reader(changelog_description.disk, changelog_description.path);
-            last_log_read_result = reader.readChangelog(logs, start_to_read_from, log);
+            ChangelogReader reader(changelog_description_ptr);
+            last_log_read_result = reader.readChangelog(entry_storage, start_to_read_from, log);
 
             if (last_log_read_result->last_read_index != 0)
                 last_read_index = last_log_read_result->last_read_index;
 
             last_log_read_result->log_start_index = changelog_description.from_log_index;
 
-            /// Otherwise we have already initialized it
-            if (min_log_id == 0)
-                min_log_id = last_log_read_result->first_read_index;
-
             if (last_log_read_result->last_read_index != 0)
                 max_log_id = last_log_read_result->last_read_index;
 
@@ -813,16 +1731,14 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
         auto disk = getDisk();
 
         if (latest_log_disk != disk && latest_log_disk == description->disk)
-            moveFileBetweenDisks(latest_log_disk, description, disk, description->path);
+            moveChangelogBetweenDisks(latest_log_disk, description, disk, description->path, keeper_context);
     };
 
     /// we can have empty log (with zero entries) and last_log_read_result will be initialized
-    if (!last_log_read_result || min_log_id == 0) /// We just may have no logs (only snapshot or nothing)
+    if (!last_log_read_result || entry_storage.empty()) /// We just may have no logs (only snapshot or nothing)
     {
         /// Just to be sure they don't exist
         removeAllLogs();
-
-        min_log_id = last_commited_log_index;
         max_log_id = last_commited_log_index == 0 ? 0 : last_commited_log_index - 1;
     }
     else if (last_commited_log_index != 0 && max_log_id < last_commited_log_index - 1) /// If we have more fresh snapshot than our logs
@@ -834,7 +1750,6 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
             last_commited_log_index - 1);
 
         removeAllLogs();
-        min_log_id = last_commited_log_index;
         max_log_id = last_commited_log_index - 1;
     }
     else if (last_log_is_not_complete) /// if it's complete just start new one
@@ -861,13 +1776,13 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
             remove_invalid_logs();
             description->disk->removeFile(description->path);
             existing_changelogs.erase(last_log_read_result->log_start_index);
-            std::erase_if(logs, [last_log_read_result](const auto & item) { return item.first >= last_log_read_result->log_start_index; });
+            entry_storage.cleanAfter(last_log_read_result->log_start_index - 1);
         }
         else if (last_log_read_result->error)
         {
-            LOG_INFO(log, "Chagelog {} read finished with error but some logs were read from it, file will not be removed", description->path);
+            LOG_INFO(log, "Changelog {} read finished with error but some logs were read from it, file will not be removed", description->path);
             remove_invalid_logs();
-            std::erase_if(logs, [last_log_read_result](const auto & item) { return item.first > last_log_read_result->last_read_index; });
+            entry_storage.cleanAfter(last_log_read_result->last_read_index);
             move_from_latest_logs_disks(existing_changelogs.at(last_log_read_result->log_start_index));
         }
         /// don't mix compressed and uncompressed writes
@@ -899,12 +1814,15 @@ void Changelog::readChangelogAndInitWriter(uint64_t last_commited_log_index, uin
         }
 
         if (description->disk != disk)
-            moveFileBetweenDisks(description->disk, description, disk, description->path);
+            moveChangelogBetweenDisks(description->disk, description, disk, description->path, keeper_context);
     }
 
-
     initialized = true;
 }
+catch (...)
+{
+    tryLogCurrentException(__PRETTY_FUNCTION__);
+}
 
 
 void Changelog::initWriter(ChangelogFileDescriptionPtr description)
@@ -921,7 +1839,7 @@ void Changelog::initWriter(ChangelogFileDescriptionPtr description)
     auto log_disk = description->disk;
     auto latest_log_disk = getLatestLogDisk();
     if (log_disk != latest_log_disk)
-        moveFileBetweenDisks(log_disk, description, latest_log_disk, description->path);
+        moveChangelogBetweenDisks(log_disk, description, latest_log_disk, description->path, keeper_context);
 
     current_writer->setFile(std::move(description), WriteMode::Append);
 }
@@ -984,11 +1902,11 @@ void Changelog::removeExistingLogs(ChangelogIter begin, ChangelogIter end)
             catch (const DB::Exception & e)
             {
                 if (e.code() == DB::ErrorCodes::NOT_IMPLEMENTED)
-                    moveFileBetweenDisks(changelog_disk, changelog_description, disk, new_path);
+                    moveChangelogBetweenDisks(changelog_disk, changelog_description, disk, new_path, keeper_context);
             }
         }
         else
-            moveFileBetweenDisks(changelog_disk, changelog_description, disk, new_path);
+            moveChangelogBetweenDisks(changelog_disk, changelog_description, disk, new_path, keeper_context);
 
         itr = existing_changelogs.erase(itr);
     }
@@ -1006,14 +1924,14 @@ void Changelog::removeAllLogsAfter(uint64_t remove_after_log_start_index)
     LOG_WARNING(log, "Removing changelogs that go after broken changelog entry");
     removeExistingLogs(start_to_remove_from_itr, existing_changelogs.end());
 
-    std::erase_if(logs, [start_to_remove_from_log_id](const auto & item) { return item.first >= start_to_remove_from_log_id; });
+    entry_storage.cleanAfter(start_to_remove_from_log_id - 1);
 }
 
 void Changelog::removeAllLogs()
 {
     LOG_WARNING(log, "Removing all changelogs");
     removeExistingLogs(existing_changelogs.begin(), existing_changelogs.end());
-    logs.clear();
+    entry_storage.clear();
 }
 
 ChangelogRecord Changelog::buildRecord(uint64_t index, const LogEntryPtr & log_entry)
@@ -1045,7 +1963,7 @@ void Changelog::appendCompletionThread()
         if (auto raft_server_locked = raft_server.lock())
             raft_server_locked->notify_log_append_completion(append_ok);
         else
-            LOG_WARNING(log, "Raft server is not set in LogStore.");
+            LOG_INFO(log, "Raft server is not set in LogStore.");
     }
 }
 
@@ -1085,70 +2003,78 @@ void Changelog::writeThread()
             LOG_WARNING(log, "Changelog is shut down");
     };
 
-    /// NuRaft writes a batch of request by first calling multiple store requests, i.e. AppendLog
-    /// finished by a flush request
-    /// We assume that after some number of appends, we always get flush request
-    while (true)
+    try
     {
-        if (try_batch_flush)
+        /// NuRaft writes a batch of request by first calling multiple store requests, i.e. AppendLog
+        /// finished by a flush request
+        /// We assume that after some number of appends, we always get flush request
+        while (true)
         {
-            try_batch_flush = false;
-            /// we have Flush request stored in write operation
-            /// but we try to get new append operations
-            /// if there are none, we apply the currently set Flush
-            chassert(std::holds_alternative<Flush>(write_operation));
-            if (!write_operations.tryPop(write_operation))
+            if (try_batch_flush)
             {
-                chassert(batch_append_ok);
-                const auto & flush = std::get<Flush>(write_operation);
-                flush_logs(flush);
-                notify_append_completion();
-                if (!write_operations.pop(write_operation))
-                    break;
-            }
-        }
-        else if (!write_operations.pop(write_operation))
-        {
-            break;
-        }
-
-        assert(initialized);
-
-        if (auto * append_log = std::get_if<AppendLog>(&write_operation))
-        {
-            if (!batch_append_ok)
-                continue;
-
-            std::lock_guard writer_lock(writer_mutex);
-            assert(current_writer);
-
-            batch_append_ok = current_writer->appendRecord(buildRecord(append_log->index, append_log->log_entry));
-            ++pending_appends;
-        }
-        else
-        {
-            const auto & flush = std::get<Flush>(write_operation);
-
-            if (batch_append_ok)
-            {
-                /// we can try batching more logs for flush
-                if (pending_appends < flush_settings.max_flush_batch_size)
+                try_batch_flush = false;
+                /// we have Flush request stored in write operation
+                /// but we try to get new append operations
+                /// if there are none, we apply the currently set Flush
+                chassert(std::holds_alternative<Flush>(write_operation));
+                if (!write_operations.tryPop(write_operation))
                 {
-                    try_batch_flush = true;
-                    continue;
+                    chassert(batch_append_ok);
+                    const auto & flush = std::get<Flush>(write_operation);
+                    flush_logs(flush);
+                    notify_append_completion();
+                    if (!write_operations.pop(write_operation))
+                        break;
                 }
-                /// we need to flush because we have maximum allowed pending records
-                flush_logs(flush);
+            }
+            else if (!write_operations.pop(write_operation))
+            {
+                break;
+            }
+
+            assert(initialized);
+
+            if (auto * append_log = std::get_if<AppendLog>(&write_operation))
+            {
+                if (!batch_append_ok)
+                    continue;
+
+                std::lock_guard writer_lock(writer_mutex);
+                assert(current_writer);
+
+                batch_append_ok = current_writer->appendRecord(buildRecord(append_log->index, append_log->log_entry));
+                ++pending_appends;
             }
             else
             {
-                std::lock_guard lock{durable_idx_mutex};
-                *flush.failed = true;
+                const auto & flush = std::get<Flush>(write_operation);
+
+                if (batch_append_ok)
+                {
+                    /// we can try batching more logs for flush
+                    if (pending_appends < flush_settings.max_flush_batch_size)
+                    {
+                        try_batch_flush = true;
+                        continue;
+                    }
+                    /// we need to flush because we have maximum allowed pending records
+                    flush_logs(flush);
+                }
+                else
+                {
+                    std::lock_guard lock{durable_idx_mutex};
+                    *flush.failed = true;
+                }
+                notify_append_completion();
+                batch_append_ok = true;
             }
-            notify_append_completion();
-            batch_append_ok = true;
         }
     }
+    catch (...)
+    {
+        tryLogCurrentException(log, "Write thread failed, aborting");
+        std::abort();
+    }
 }
 
 
@@ -1157,10 +2083,7 @@ void Changelog::appendEntry(uint64_t index, const LogEntryPtr & log_entry)
     if (!initialized)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Changelog must be initialized before appending records");
 
-    if (logs.empty())
-        min_log_id = index;
-
-    logs[index] = log_entry;
+    entry_storage.addEntry(index, log_entry);
     max_log_id = index;
 
     if (!write_operations.push(AppendLog{index, log_entry}))
@@ -1191,7 +2114,7 @@ void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
             auto log_disk = description->disk;
             auto latest_log_disk = getLatestLogDisk();
             if (log_disk != latest_log_disk)
-                moveFileBetweenDisks(log_disk, description, latest_log_disk, description->path);
+                moveChangelogBetweenDisks(log_disk, description, latest_log_disk, description->path, keeper_context);
 
             current_writer->setFile(std::move(description), WriteMode::Append);
 
@@ -1207,7 +2130,7 @@ void Changelog::writeAt(uint64_t index, const LogEntryPtr & log_entry)
 
     /// Remove redundant logs from memory
     /// Everything >= index must be removed
-    std::erase_if(logs, [index](const auto & item) { return item.first >= index; });
+    entry_storage.cleanAfter(index - 1);
 
     /// Now we can actually override entry at index
     appendEntry(index, log_entry);
@@ -1274,61 +2197,50 @@ void Changelog::compact(uint64_t up_to_log_index)
         else /// Files are ordered, so all subsequent should exist
             break;
     }
-    /// Compaction from the past is possible, so don't make our min_log_id smaller.
-    min_log_id = std::max(min_log_id, up_to_log_index + 1);
-    std::erase_if(logs, [up_to_log_index](const auto & item) { return item.first <= up_to_log_index; });
+
+    entry_storage.cleanUpTo(up_to_log_index + 1);
 
     if (need_rotate)
         current_writer->rotate(up_to_log_index + 1);
 
-    LOG_INFO(log, "Compaction up to {} finished new min index {}, new max index {}", up_to_log_index, min_log_id, max_log_id);
+    LOG_INFO(log, "Compaction up to {} finished new min index {}, new max index {}", up_to_log_index, getStartIndex(), max_log_id);
+}
+
+uint64_t Changelog::getNextEntryIndex() const
+{
+    return max_log_id + 1;
+}
+
+uint64_t Changelog::getStartIndex() const
+{
+    return entry_storage.empty() ? max_log_id + 1 : entry_storage.getFirstIndex();
 }
 
 LogEntryPtr Changelog::getLastEntry() const
 {
     /// This entry treaded in special way by NuRaft
-    static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(sizeof(uint64_t)));
+    static LogEntryPtr fake_entry = nuraft::cs_new<nuraft::log_entry>(0, nuraft::buffer::alloc(0));
 
-    auto entry = logs.find(max_log_id);
-    if (entry == logs.end())
-    {
+    auto entry = entry_storage.getEntry(max_log_id);
+    if (entry == nullptr)
         return fake_entry;
-    }
 
-    return entry->second;
+    return entry;
 }
 
 LogEntriesPtr Changelog::getLogEntriesBetween(uint64_t start, uint64_t end)
 {
-    LogEntriesPtr ret = nuraft::cs_new<std::vector<nuraft::ptr<nuraft::log_entry>>>();
-
-    ret->resize(end - start);
-    uint64_t result_pos = 0;
-    for (uint64_t i = start; i < end; ++i)
-    {
-        (*ret)[result_pos] = entryAt(i);
-        result_pos++;
-    }
-    return ret;
+    return entry_storage.getLogEntriesBetween(start, end);
 }
 
-LogEntryPtr Changelog::entryAt(uint64_t index)
+LogEntryPtr Changelog::entryAt(uint64_t index) const
 {
-    nuraft::ptr<nuraft::log_entry> src = nullptr;
-    auto entry = logs.find(index);
-    if (entry == logs.end())
-        return nullptr;
-
-    src = entry->second;
-    return src;
+    return entry_storage.getEntry(index);
 }
 
 LogEntryPtr Changelog::getLatestConfigChange() const
 {
-    for (const auto & [_, entry] : logs)
-        if (entry->get_val_type() == nuraft::conf)
-            return entry;
-    return nullptr;
+    return entry_storage.getLatestConfigChange();
 }
 
 nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(uint64_t index, int32_t count)
@@ -1339,11 +2251,11 @@ nuraft::ptr<nuraft::buffer> Changelog::serializeEntriesToBuffer(uint64_t index,
     uint64_t size_total = 0;
     for (uint64_t i = index; i < index + count; ++i)
     {
-        auto entry = logs.find(i);
-        if (entry == logs.end())
+        auto entry = entry_storage.getEntry(i);
+        if (entry == nullptr)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Don't have log entry {}", i);
 
-        nuraft::ptr<nuraft::buffer> buf = entry->second->serialize();
+        nuraft::ptr<nuraft::buffer> buf = entry->serialize();
         size_total += buf->size();
         returned_logs.push_back(std::move(buf));
     }
@@ -1374,13 +2286,23 @@ void Changelog::applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer)
         buffer.get(buf_local);
 
         LogEntryPtr log_entry = nuraft::log_entry::deserialize(*buf_local);
-        if (i == 0 && logs.contains(cur_index))
+        if (i == 0 && cur_index >= entry_storage.getFirstIndex() && cur_index <= max_log_id)
             writeAt(cur_index, log_entry);
         else
             appendEntry(cur_index, log_entry);
     }
 }
 
+bool Changelog::isConfigLog(uint64_t index) const
+{
+    return entry_storage.isConfigLog(index);
+}
+
+uint64_t Changelog::termAt(uint64_t index) const
+{
+    return entry_storage.termAt(index);
+}
+
 bool Changelog::flush()
 {
     if (auto failed_ptr = flushAsync())
@@ -1406,37 +2328,47 @@ std::shared_ptr<bool> Changelog::flushAsync()
 
     if (!pushed)
     {
-        LOG_WARNING(log, "Changelog is shut down");
+        LOG_INFO(log, "Changelog is shut down");
         return nullptr;
     }
+
+    entry_storage.refreshCache();
     return failed;
 }
 
+uint64_t Changelog::size() const
+{
+    return entry_storage.size();
+}
+
 void Changelog::shutdown()
 {
+    LOG_DEBUG(log, "Shutting down Changelog");
     if (!log_files_to_delete_queue.isFinished())
         log_files_to_delete_queue.finish();
 
-    if (clean_log_thread.joinable())
-        clean_log_thread.join();
+    if (clean_log_thread->joinable())
+        clean_log_thread->join();
 
     if (!write_operations.isFinished())
         write_operations.finish();
 
-    if (write_thread.joinable())
-        write_thread.join();
+    if (write_thread->joinable())
+        write_thread->join();
 
     if (!append_completion_queue.isFinished())
         append_completion_queue.finish();
 
-    if (append_completion_thread.joinable())
-        append_completion_thread.join();
+    if (append_completion_thread->joinable())
+        append_completion_thread->join();
 
     if (current_writer)
     {
         current_writer->finalize();
         current_writer.reset();
     }
+
+    entry_storage.shutdown();
 }
 
 Changelog::~Changelog()
@@ -1485,4 +2417,18 @@ bool Changelog::isInitialized() const
     return initialized;
 }
 
+void Changelog::getKeeperLogInfo(KeeperLogInfo & log_info) const
+{
+    if (!entry_storage.empty())
+    {
+        log_info.first_log_idx = getStartIndex();
+        log_info.first_log_term = termAt(log_info.first_log_idx);
+
+        log_info.last_log_idx = max_log_id;
+        log_info.last_log_term = termAt(log_info.last_log_idx);
+    }
+
+    entry_storage.getKeeperLogInfo(log_info);
+}
+
 }
diff --git a/src/Coordination/Changelog.h b/src/Coordination/Changelog.h
index 20f850e3f62..2e8dbe75e90 100644
--- a/src/Coordination/Changelog.h
+++ b/src/Coordination/Changelog.h
@@ -1,17 +1,26 @@
 #pragma once
 
-#include <optional>
-#include <city.h>
-#include <Disks/IDisk.h>
-#include <IO/CompressionMethod.h>
-#include <IO/HashingWriteBuffer.h>
-#include <IO/WriteBufferFromFile.h>
-#include <base/defines.h>
-#include <libnuraft/nuraft.hxx>
-#include <libnuraft/raft_server.hxx>
+#include <libnuraft/ptr.hxx>
+#include <Common/ThreadPool_fwd.h>
 #include <Common/ConcurrentBoundedQueue.h>
-#include <Common/ThreadPool.h>
-#include <Coordination/KeeperContext.h>
+
+#include <map>
+#include <unordered_set>
+#include <future>
+
+namespace nuraft
+{
+    struct log_entry;
+    struct buffer;
+    struct raft_server;
+}
+
+namespace Poco
+{
+    class Logger;
+}
+
+using LoggerPtr = std::shared_ptr<Poco::Logger>;
 
 namespace DB
 {
@@ -23,8 +32,11 @@ using LogEntries = std::vector<LogEntryPtr>;
 using LogEntriesPtr = nuraft::ptr<LogEntries>;
 using BufferPtr = nuraft::ptr<nuraft::buffer>;
 
-using IndexToOffset = std::unordered_map<uint64_t, off_t>;
-using IndexToLogEntry = std::unordered_map<uint64_t, LogEntryPtr>;
+struct KeeperLogInfo;
+class KeeperContext;
+using KeeperContextPtr = std::shared_ptr<KeeperContext>;
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
 
 enum class ChangelogVersion : uint8_t
 {
@@ -63,10 +75,19 @@ struct ChangelogFileDescription
     DiskPtr disk;
     std::string path;
 
+    std::mutex file_mutex;
+
     bool deleted = false;
 
     /// How many entries should be stored in this log
     uint64_t expectedEntriesCountInLog() const { return to_log_index - from_log_index + 1; }
+
+    template <typename TFunction>
+    void withLock(TFunction && fn)
+    {
+        std::lock_guard lock(file_mutex);
+        fn();
+    }
 };
 
 using ChangelogFileDescriptionPtr = std::shared_ptr<ChangelogFileDescription>;
@@ -80,6 +101,8 @@ struct LogFileSettings
     uint64_t rotate_interval = 100000;
     uint64_t max_size = 0;
     uint64_t overallocate_size = 0;
+    uint64_t latest_logs_cache_size_threshold = 0;
+    uint64_t commit_logs_cache_size_threshold = 0;
 };
 
 struct FlushSettings
@@ -87,6 +110,191 @@ struct FlushSettings
     uint64_t max_flush_batch_size = 1000;
 };
 
+struct LogLocation
+{
+    ChangelogFileDescriptionPtr file_description;
+    size_t position;
+    size_t size;
+};
+
+struct PrefetchedCacheEntry
+{
+    explicit PrefetchedCacheEntry();
+
+    const LogEntryPtr & getLogEntry() const;
+    void resolve(std::exception_ptr exception);
+    void resolve(LogEntryPtr log_entry_);
+private:
+    std::promise<LogEntryPtr> log_entry_resolver;
+    mutable std::shared_future<LogEntryPtr> log_entry;
+};
+
+using CacheEntry = std::variant<LogEntryPtr, PrefetchedCacheEntry>;
+using IndexToCacheEntry = std::unordered_map<uint64_t, CacheEntry>;
+using IndexToCacheEntryNode = typename IndexToCacheEntry::node_type;
+
+/**
+  * Storage for storing and handling deserialized entries from disk.
+  * It consists of 2 in-memory caches that rely heavily on the way
+  * entries are used in Raft.
+  * Random and repeated access to certain entries is almost never done so we can't implement a solution
+  * like LRU/SLRU cache because entries would be cached and never read again.
+  * Entries are often read sequentially for 2 cases:
+  * - for replication
+  * - for committing
+  *
+  * First cache will store latest logs in memory, limited by the latest_logs_cache_size_threshold coordination setting.
+  * Once the log is persisted to the disk, we store it's location in the file and allow the storage
+  * to evict that log from cache if it's needed.
+  * Latest logs cache should have a high hit rate in "normal" operation for both replication and committing.
+  *
+  * As we commit (and read) logs sequentially, we will try to read from latest logs cache.
+  * In some cases, latest logs could be ahead from last committed log by more than latest_logs_cache_size_threshold
+  * which means that for each commit we would need to read the log from disk.
+  * In case latest logs cache hits the threshold we have a second cache called commit logs cache limited by commit_logs_cache_size_threshold.
+  * If a log is evicted from the latest logs cache, we check if we can move it to commit logs cache to avoid re-reading the log from disk.
+  * If latest logs cache moves ahead of the commit log by a lot or commit log hits the threshold
+  * we cannot move the entries from latest logs and we will need to refill the commit cache from disk.
+  * To avoid reading entry by entry (which can have really bad effect on performance because we support disks based on S3),
+  * we try to prefetch multiple entries ahead of time because we know that they will be read by commit thread
+  * in the future.
+  * Commit logs cache should have a high hit rate if we start with a lot of unprocessed logs that cannot fit in the
+  * latest logs cache.
+  */
+struct LogEntryStorage
+{
+    LogEntryStorage(const LogFileSettings & log_settings, KeeperContextPtr keeper_context_);
+
+    ~LogEntryStorage();
+
+    void addEntry(uint64_t index, const LogEntryPtr & log_entry);
+    void addEntryWithLocation(uint64_t index, const LogEntryPtr & log_entry, LogLocation log_location);
+    /// clean all logs up to (but not including) index
+    void cleanUpTo(uint64_t index);
+    /// clean all logs after (but not including) index
+    void cleanAfter(uint64_t index);
+    bool contains(uint64_t index) const;
+    LogEntryPtr getEntry(uint64_t index) const;
+    void clear();
+    LogEntryPtr getLatestConfigChange() const;
+    uint64_t termAt(uint64_t index) const;
+
+    using IndexWithLogLocation = std::pair<uint64_t, LogLocation>;
+
+    void addLogLocations(std::vector<IndexWithLogLocation> && indices_with_log_locations);
+
+    void refreshCache();
+
+    LogEntriesPtr getLogEntriesBetween(uint64_t start, uint64_t end) const;
+
+    void getKeeperLogInfo(KeeperLogInfo & log_info) const;
+
+    bool isConfigLog(uint64_t index) const;
+
+    size_t empty() const;
+    size_t size() const;
+    size_t getFirstIndex() const;
+
+    void shutdown();
+private:
+    void prefetchCommitLogs();
+
+    void startCommitLogsPrefetch(uint64_t last_committed_index) const;
+
+    bool shouldMoveLogToCommitCache(uint64_t index, size_t log_entry_size);
+
+    void updateTermInfoWithNewEntry(uint64_t index, uint64_t term);
+
+    struct InMemoryCache
+    {
+        explicit InMemoryCache(size_t size_threshold_);
+
+        void addEntry(uint64_t index, size_t size, CacheEntry log_entry);
+        void addEntry(IndexToCacheEntryNode && node);
+
+        void updateStatsWithNewEntry(uint64_t index, size_t size);
+
+        IndexToCacheEntryNode popOldestEntry();
+
+        bool containsEntry(uint64_t index) const;
+
+        LogEntryPtr getEntry(uint64_t index) const;
+
+        CacheEntry * getCacheEntry(uint64_t index);
+        const CacheEntry * getCacheEntry(uint64_t index) const;
+        PrefetchedCacheEntry & getPrefetchedCacheEntry(uint64_t index);
+
+        void cleanUpTo(uint64_t index);
+        void cleanAfter(uint64_t index);
+
+        bool empty() const;
+        size_t numberOfEntries() const;
+        bool hasSpaceAvailable(size_t log_entry_size) const;
+        void clear();
+
+        /// Mapping log_id -> log_entry
+        mutable IndexToCacheEntry cache;
+        size_t cache_size = 0;
+        size_t min_index_in_cache = 0;
+        size_t max_index_in_cache = 0;
+
+        const size_t size_threshold;
+    };
+
+    InMemoryCache latest_logs_cache;
+    mutable InMemoryCache commit_logs_cache;
+
+    LogEntryPtr latest_config;
+    uint64_t latest_config_index = 0;
+
+    mutable LogEntryPtr first_log_entry;
+    mutable uint64_t first_log_index = 0;
+
+    std::unique_ptr<ThreadFromGlobalPool> commit_logs_prefetcher;
+
+    struct FileReadInfo
+    {
+        ChangelogFileDescriptionPtr file_description;
+        size_t position;
+        size_t count;
+    };
+
+    struct PrefetchInfo
+    {
+        std::vector<FileReadInfo> file_infos;
+        std::pair<uint64_t, uint64_t> commit_prefetch_index_range;
+        std::atomic<bool> cancel;
+        std::atomic<bool> done = false;
+    };
+
+    mutable ConcurrentBoundedQueue<std::shared_ptr<PrefetchInfo>> prefetch_queue;
+    mutable std::shared_ptr<PrefetchInfo> current_prefetch_info;
+
+    mutable std::mutex logs_location_mutex;
+    std::vector<IndexWithLogLocation> unapplied_indices_with_log_locations;
+    std::unordered_map<uint64_t, LogLocation> logs_location;
+    size_t max_index_with_location = 0;
+    size_t min_index_with_location = 0;
+
+    /// store indices of logs that contain config changes
+    std::unordered_set<uint64_t> logs_with_config_changes;
+
+    struct LogTermInfo
+    {
+        uint64_t term = 0;
+        uint64_t first_index = 0;
+    };
+
+    /// store first index of each term
+    /// so we don't have to fetch log to return that information
+    /// terms are monotonically increasing so first index is enough
+    std::deque<LogTermInfo> log_term_infos;
+
+    bool is_shutdown = false;
+    KeeperContextPtr keeper_context;
+    LoggerPtr log;
+};
+
 /// Simplest changelog with files rotation.
 /// No compression, no metadata, just entries with headers one by one.
 /// Able to read broken files/entries and discard them. Not thread safe.
@@ -94,7 +302,7 @@ class Changelog
 {
 public:
     Changelog(
-        Poco::Logger * log_,
+        LoggerPtr log_,
         LogFileSettings log_file_settings,
         FlushSettings flush_settings,
         KeeperContextPtr keeper_context_);
@@ -114,9 +322,9 @@ public:
     /// Remove log files with to_log_index <= up_to_log_index.
     void compact(uint64_t up_to_log_index);
 
-    uint64_t getNextEntryIndex() const { return max_log_id + 1; }
+    uint64_t getNextEntryIndex() const;
 
-    uint64_t getStartIndex() const { return min_log_id; }
+    uint64_t getStartIndex() const;
 
     /// Last entry in log, or fake entry with term 0 if log is empty
     LogEntryPtr getLastEntry() const;
@@ -128,7 +336,7 @@ public:
     LogEntriesPtr getLogEntriesBetween(uint64_t start_index, uint64_t end_index);
 
     /// Return entry at position index
-    LogEntryPtr entryAt(uint64_t index);
+    LogEntryPtr entryAt(uint64_t index) const;
 
     /// Serialize entries from index into buffer
     BufferPtr serializeEntriesToBuffer(uint64_t index, int32_t count);
@@ -136,6 +344,9 @@ public:
     /// Apply entries from buffer overriding existing entries
     void applyEntriesFromBuffer(uint64_t index, nuraft::buffer & buffer);
 
+    bool isConfigLog(uint64_t index) const;
+    uint64_t termAt(uint64_t index) const;
+
     /// Fsync latest log to disk and flush buffer
     bool flush();
 
@@ -143,7 +354,7 @@ public:
 
     void shutdown();
 
-    uint64_t size() const { return logs.size(); }
+    uint64_t size() const;
 
     uint64_t lastDurableIndex() const
     {
@@ -155,6 +366,8 @@ public:
 
     bool isInitialized() const;
 
+    void getKeeperLogInfo(KeeperLogInfo & log_info) const;
+
     /// Fsync log to disk
     ~Changelog();
 
@@ -185,21 +398,19 @@ private:
     const String changelogs_detached_dir;
     const uint64_t rotate_interval;
     const bool compress_logs;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::mutex writer_mutex;
     /// Current writer for changelog file
     std::unique_ptr<ChangelogWriter> current_writer;
-    /// Mapping log_id -> log_entry
-    IndexToLogEntry logs;
-    /// Start log_id which exists in all "active" logs
-    /// min_log_id + 1 == max_log_id means empty log storage for NuRaft
-    uint64_t min_log_id = 0;
+
+    LogEntryStorage entry_storage;
+
     uint64_t max_log_id = 0;
     /// For compaction, queue of delete not used logs
     /// 128 is enough, even if log is not removed, it's not a problem
     ConcurrentBoundedQueue<std::pair<std::string, DiskPtr>> log_files_to_delete_queue{128};
-    ThreadFromGlobalPool clean_log_thread;
+    std::unique_ptr<ThreadFromGlobalPool> clean_log_thread;
 
     struct AppendLog
     {
@@ -217,7 +428,7 @@ private:
 
     void writeThread();
 
-    ThreadFromGlobalPool write_thread;
+    std::unique_ptr<ThreadFromGlobalPool> write_thread;
     ConcurrentBoundedQueue<WriteOperation> write_operations;
 
     /// Append log completion callback tries to acquire NuRaft's global lock
@@ -226,7 +437,7 @@ private:
     /// For those reasons we call the completion callback in a different thread
     void appendCompletionThread();
 
-    ThreadFromGlobalPool append_completion_thread;
+    std::unique_ptr<ThreadFromGlobalPool> append_completion_thread;
     ConcurrentBoundedQueue<bool> append_completion_queue;
 
     // last_durable_index needs to be exposed through const getter so we make mutex mutable
diff --git a/src/Coordination/CoordinationSettings.cpp b/src/Coordination/CoordinationSettings.cpp
index 2436d730ae4..05f691ca76b 100644
--- a/src/Coordination/CoordinationSettings.cpp
+++ b/src/Coordination/CoordinationSettings.cpp
@@ -34,6 +34,11 @@ void CoordinationSettings::loadFromConfig(const String & config_elem, const Poco
             e.addMessage("in Coordination settings config");
         throw;
     }
+
+    /// for backwards compatibility we set max_requests_append_size to max_requests_batch_size
+    /// if max_requests_append_size was not changed
+    if (!max_requests_append_size.changed)
+        max_requests_append_size = max_requests_batch_size;
 }
 
 
@@ -41,7 +46,7 @@ const String KeeperConfigurationAndSettings::DEFAULT_FOUR_LETTER_WORD_CMD =
 #if USE_JEMALLOC
 "jmst,jmfp,jmep,jmdp,"
 #endif
-"conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld,rclc,clrs,ftfl,ydld";
+"conf,cons,crst,envi,ruok,srst,srvr,stat,wchs,dirs,mntr,isro,rcvr,apiv,csnp,lgif,rqld,rclc,clrs,ftfl,ydld,pfev";
 
 KeeperConfigurationAndSettings::KeeperConfigurationAndSettings()
     : server_id(NOT_EXIST)
@@ -109,6 +114,8 @@ void KeeperConfigurationAndSettings::dump(WriteBufferFromOwnString & buf) const
     write_int(static_cast<uint64_t>(coordination_settings->election_timeout_lower_bound_ms));
     writeText("election_timeout_upper_bound_ms=", buf);
     write_int(static_cast<uint64_t>(coordination_settings->election_timeout_upper_bound_ms));
+    writeText("leadership_expiry_ms=", buf);
+    write_int(static_cast<uint64_t>(coordination_settings->leadership_expiry_ms));
 
     writeText("reserved_log_items=", buf);
     write_int(coordination_settings->reserved_log_items);
diff --git a/src/Coordination/CoordinationSettings.h b/src/Coordination/CoordinationSettings.h
index a58f2b04797..a32552616ee 100644
--- a/src/Coordination/CoordinationSettings.h
+++ b/src/Coordination/CoordinationSettings.h
@@ -26,6 +26,7 @@ struct Settings;
     M(Milliseconds, heart_beat_interval_ms, 500, "Heartbeat interval between quorum nodes", 0) \
     M(Milliseconds, election_timeout_lower_bound_ms, 1000, "Lower bound of election timer (avoid too often leader elections)", 0) \
     M(Milliseconds, election_timeout_upper_bound_ms, 2000, "Upper bound of election timer (avoid too often leader elections)", 0) \
+    M(Milliseconds, leadership_expiry_ms, 0, "Duration after which a leader will expire if it fails to receive responses from peers. Set it lower or equal to election_timeout_lower_bound_ms to avoid multiple leaders.", 0) \
     M(UInt64, reserved_log_items, 100000, "How many log items to store (don't remove during compaction)", 0) \
     M(UInt64, snapshot_distance, 100000, "How many log items we have to collect to write new snapshot", 0) \
     M(Bool, auto_forwarding, true, "Allow to forward write requests from followers to leader", 0) \
@@ -41,6 +42,7 @@ struct Settings;
     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_batch_bytes_size, 100*1024, "Max size in bytes of batch of requests that can be sent to RAFT", 0) \
+    M(UInt64, max_requests_append_size, 100, "Max size of batch of requests that can be sent to replica in append request", 0) \
     M(UInt64, max_flush_batch_size, 1000, "Max size of batch of requests that can be flushed together", 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) \
@@ -52,7 +54,11 @@ struct Settings;
     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) \
     M(UInt64, raft_limits_reconnect_limit, 50, "If connection to a peer is silent longer than this limit * (multiplied by heartbeat interval), we re-establish the connection.", 0) \
-    M(Bool, async_replication, false, "Enable async replication. All write and read guarantees are preserved while better performance is achieved. Settings is disabled by default to not break backwards compatibility.", 0)
+    M(Bool, async_replication, false, "Enable async replication. All write and read guarantees are preserved while better performance is achieved. Settings is disabled by default to not break backwards compatibility.", 0) \
+    M(UInt64, latest_logs_cache_size_threshold, 1 * 1024 * 1024 * 1024, "Maximum total size of in-memory cache of latest log entries.", 0) \
+    M(UInt64, commit_logs_cache_size_threshold, 500 * 1024 * 1024, "Maximum total size of in-memory cache of log entries needed next for commit.", 0) \
+    M(UInt64, disk_move_retries_wait_ms, 1000, "How long to wait between retries after a failure which happened while a file was being moved between disks.", 0) \
+    M(UInt64, disk_move_retries_during_init, 100, "The amount of retries after a failure which happened while a file was being moved between disks during initialization.", 0)
 
 DECLARE_SETTINGS_TRAITS(CoordinationSettingsTraits, LIST_OF_COORDINATION_SETTINGS)
 
diff --git a/src/Coordination/FourLetterCommand.cpp b/src/Coordination/FourLetterCommand.cpp
index 803c6eb594e..25254e10441 100644
--- a/src/Coordination/FourLetterCommand.cpp
+++ b/src/Coordination/FourLetterCommand.cpp
@@ -9,6 +9,7 @@
 #include <Common/getCurrentProcessFDCount.h>
 #include <Common/getMaxFileDescriptorCount.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Common/config_version.h>
 #include "Coordination/KeeperFeatureFlags.h"
 #include <Coordination/Keeper4LWInfo.h>
 #include <IO/WriteHelpers.h>
@@ -37,6 +38,12 @@ String formatZxid(int64_t zxid)
 
 }
 
+#if USE_NURAFT
+namespace ProfileEvents
+{
+    extern const std::vector<Event> keeper_profile_events;
+}
+#endif
 
 namespace DB
 {
@@ -193,6 +200,8 @@ void FourLetterCommandFactory::registerCommands(KeeperDispatcher & keeper_dispat
         FourLetterCommandPtr jemalloc_disable_profile = std::make_shared<JemallocDisableProfile>(keeper_dispatcher);
         factory.registerCommand(jemalloc_disable_profile);
 #endif
+        FourLetterCommandPtr profile_events_command = std::make_shared<ProfileEventsCommand>(keeper_dispatcher);
+        factory.registerCommand(profile_events_command);
 
         factory.initializeAllowList(keeper_dispatcher);
         factory.setInitialize(true);
@@ -234,7 +243,7 @@ void FourLetterCommandFactory::initializeAllowList(KeeperDispatcher & keeper_dis
             }
             else
             {
-                auto * log = &Poco::Logger::get("FourLetterCommandFactory");
+                auto log = getLogger("FourLetterCommandFactory");
                 LOG_WARNING(log, "Find invalid keeper 4lw command {} when initializing, ignore it.", token);
             }
         }
@@ -300,7 +309,11 @@ String MonitorCommand::run()
 
 #if defined(OS_LINUX) || defined(OS_DARWIN)
     print(ret, "open_file_descriptor_count", getCurrentProcessFDCount());
-    print(ret, "max_file_descriptor_count", getMaxFileDescriptorCount());
+    auto max_file_descriptor_count = getMaxFileDescriptorCount();
+    if (max_file_descriptor_count.has_value())
+        print(ret, "max_file_descriptor_count", *max_file_descriptor_count);
+    else
+        print(ret, "max_file_descriptor_count", -1);
 #endif
 
     if (keeper_info.is_leader)
@@ -557,6 +570,12 @@ String LogInfoCommand::run()
     append("leader_committed_log_idx", log_info.leader_committed_log_idx);
     append("target_committed_log_idx", log_info.target_committed_log_idx);
     append("last_snapshot_idx", log_info.last_snapshot_idx);
+
+    append("latest_logs_cache_entries", log_info.latest_logs_cache_entries);
+    append("latest_logs_cache_size", log_info.latest_logs_cache_size);
+
+    append("commit_logs_cache_entries", log_info.commit_logs_cache_entries);
+    append("commit_logs_cache_size", log_info.commit_logs_cache_size);
     return ret.str();
 }
 
@@ -573,7 +592,7 @@ String RecalculateCommand::run()
 
 String CleanResourcesCommand::run()
 {
-    keeper_dispatcher.cleanResources();
+    KeeperDispatcher::cleanResources();
     return "ok";
 }
 
@@ -640,4 +659,31 @@ String JemallocDisableProfile::run()
 }
 #endif
 
+String ProfileEventsCommand::run()
+{
+    StringBuffer ret;
+
+#if USE_NURAFT
+    auto append = [&ret] (const String & metric, uint64_t value, const String & docs) -> void
+    {
+        writeText(metric, ret);
+        writeText('\t', ret);
+        writeText(std::to_string(value), ret);
+        writeText('\t', ret);
+        writeText(docs, ret);
+        writeText('\n', ret);
+    };
+
+    for (auto i : ProfileEvents::keeper_profile_events)
+    {
+        const auto counter = ProfileEvents::global_counters[i].load(std::memory_order_relaxed);
+        std::string metric_name{ProfileEvents::getName(static_cast<ProfileEvents::Event>(i))};
+        std::string metric_doc{ProfileEvents::getDocumentation(static_cast<ProfileEvents::Event>(i))};
+        append(metric_name, counter, metric_doc);
+    }
+#endif
+
+    return ret.str();
+}
+
 }
diff --git a/src/Coordination/FourLetterCommand.h b/src/Coordination/FourLetterCommand.h
index 7fc044881cf..82b30a0b5f6 100644
--- a/src/Coordination/FourLetterCommand.h
+++ b/src/Coordination/FourLetterCommand.h
@@ -1,18 +1,19 @@
 #pragma once
 
-#include <sstream>
-#include <string>
+#include "config.h"
+
 #include <unordered_map>
-
-#include <Coordination/KeeperDispatcher.h>
-#include <IO/WriteBufferFromString.h>
-
-#include <Common/config_version.h>
-
+#include <string>
+#include <boost/noncopyable.hpp>
 
 namespace DB
 {
 
+class WriteBufferFromOwnString;
+class KeeperDispatcher;
+
+using String = std::string;
+
 struct IFourLetterCommand;
 using FourLetterCommandPtr = std::shared_ptr<DB::IFourLetterCommand>;
 
@@ -479,4 +480,16 @@ struct JemallocDisableProfile : public IFourLetterCommand
 };
 #endif
 
+struct ProfileEventsCommand : public IFourLetterCommand
+{
+    explicit ProfileEventsCommand(KeeperDispatcher & keeper_dispatcher_)
+        : IFourLetterCommand(keeper_dispatcher_)
+    {
+    }
+
+    String name() override { return "pfev"; }
+    String run() override;
+    ~ProfileEventsCommand() override = default;
+};
+
 }
diff --git a/src/Coordination/InMemoryLogStore.cpp b/src/Coordination/InMemoryLogStore.cpp
index ca240584a54..32aaf8e0d4a 100644
--- a/src/Coordination/InMemoryLogStore.cpp
+++ b/src/Coordination/InMemoryLogStore.cpp
@@ -16,7 +16,7 @@ ptr<log_entry> makeClone(const ptr<log_entry> & entry)
 InMemoryLogStore::InMemoryLogStore()
     : start_idx(1)
 {
-    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(sizeof(uint64_t));
+    nuraft::ptr<nuraft::buffer> buf = nuraft::buffer::alloc(0);
     logs[0] = nuraft::cs_new<nuraft::log_entry>(0, buf);
 }
 
@@ -191,4 +191,10 @@ bool InMemoryLogStore::compact(uint64_t last_log_index)
     return true;
 }
 
+bool InMemoryLogStore::is_conf(uint64_t index)
+{
+    auto entry = entry_at(index);
+    return entry != nullptr && entry->get_val_type() == nuraft::conf;
+}
+
 }
diff --git a/src/Coordination/InMemoryLogStore.h b/src/Coordination/InMemoryLogStore.h
index fc56826c81b..82c676639d5 100644
--- a/src/Coordination/InMemoryLogStore.h
+++ b/src/Coordination/InMemoryLogStore.h
@@ -39,6 +39,8 @@ public:
 
     bool flush() override { return true; }
 
+    bool is_conf(uint64_t index) override;
+
 private:
     std::map<uint64_t, nuraft::ptr<nuraft::log_entry>> logs TSA_GUARDED_BY(logs_lock);
     mutable std::mutex logs_lock;
diff --git a/src/Coordination/Keeper4LWInfo.h b/src/Coordination/Keeper4LWInfo.h
index 105478457cc..80b00b3f36e 100644
--- a/src/Coordination/Keeper4LWInfo.h
+++ b/src/Coordination/Keeper4LWInfo.h
@@ -22,6 +22,7 @@ struct Keeper4LWInfo
     bool is_standalone;
 
     bool has_leader;
+    bool is_exceeding_mem_soft_limit;
 
     uint64_t alive_connections_count;
     uint64_t outstanding_requests_count;
@@ -51,16 +52,16 @@ struct Keeper4LWInfo
 struct KeeperLogInfo
 {
     /// My first log index in log store.
-    uint64_t first_log_idx;
+    uint64_t first_log_idx{0};
 
     /// My first log term.
-    uint64_t first_log_term;
+    uint64_t first_log_term{0};
 
     /// My last log index in log store.
-    uint64_t last_log_idx;
+    uint64_t last_log_idx{0};
 
     /// My last log term.
-    uint64_t last_log_term;
+    uint64_t last_log_term{0};
 
     /// My last committed log index in state machine.
     uint64_t last_committed_log_idx;
@@ -73,6 +74,12 @@ struct KeeperLogInfo
 
     /// The largest committed log index in last snapshot.
     uint64_t last_snapshot_idx;
+
+    uint64_t latest_logs_cache_entries;
+    uint64_t latest_logs_cache_size;
+
+    uint64_t commit_logs_cache_entries;
+    uint64_t commit_logs_cache_size;
 };
 
 }
diff --git a/src/Coordination/KeeperAsynchronousMetrics.cpp b/src/Coordination/KeeperAsynchronousMetrics.cpp
index 4471012e917..a5b4bc4af97 100644
--- a/src/Coordination/KeeperAsynchronousMetrics.cpp
+++ b/src/Coordination/KeeperAsynchronousMetrics.cpp
@@ -20,16 +20,14 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
     size_t ephemerals_count = 0;
     size_t approximate_data_size = 0;
     size_t key_arena_size = 0;
-    size_t latest_snapshot_size = 0;
     size_t open_file_descriptor_count = 0;
-    size_t max_file_descriptor_count = 0;
+    std::optional<size_t> max_file_descriptor_count = 0;
     size_t followers = 0;
     size_t synced_followers = 0;
     size_t zxid = 0;
     size_t session_with_watches = 0;
     size_t paths_watched = 0;
-    //size_t snapshot_dir_size = 0;
-    //size_t log_dir_size = 0;
+    size_t is_exceeding_mem_soft_limit = 0;
 
     if (keeper_dispatcher.isServerActive())
     {
@@ -38,6 +36,7 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
         is_leader = static_cast<size_t>(keeper_info.is_leader);
         is_observer = static_cast<size_t>(keeper_info.is_observer);
         is_follower = static_cast<size_t>(keeper_info.is_follower);
+        is_exceeding_mem_soft_limit = static_cast<size_t>(keeper_info.is_exceeding_mem_soft_limit);
 
         zxid = keeper_info.last_zxid;
         const auto & state_machine = keeper_dispatcher.getStateMachine();
@@ -46,11 +45,8 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
         ephemerals_count = state_machine.getTotalEphemeralNodesCount();
         approximate_data_size = state_machine.getApproximateDataSize();
         key_arena_size = state_machine.getKeyArenaSize();
-        latest_snapshot_size = state_machine.getLatestSnapshotBufSize();
         session_with_watches = state_machine.getSessionsWithWatchesCount();
         paths_watched = state_machine.getWatchedPathsCount();
-        //snapshot_dir_size = keeper_dispatcher.getSnapDirSize();
-        //log_dir_size = keeper_dispatcher.getLogDirSize();
 
 #    if defined(__linux__) || defined(__APPLE__)
         open_file_descriptor_count = getCurrentProcessFDCount();
@@ -68,6 +64,7 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
     new_values["KeeperIsFollower"] = { is_follower, "1 if ClickHouse Keeper is a follower, 0 otherwise." };
     new_values["KeeperIsObserver"] = { is_observer, "1 if ClickHouse Keeper is an observer, 0 otherwise." };
     new_values["KeeperIsStandalone"] = { is_standalone, "1 if ClickHouse Keeper is in a standalone mode, 0 otherwise." };
+    new_values["KeeperIsExceedingMemorySoftLimitHit"] = { is_exceeding_mem_soft_limit, "1 if ClickHouse Keeper is exceeding the memory soft limit, 0 otherwise." };
 
     new_values["KeeperZnodeCount"] = { znode_count, "The number of nodes (data entries) in ClickHouse Keeper." };
     new_values["KeeperWatchCount"] = { watch_count, "The number of watches in ClickHouse Keeper." };
@@ -75,18 +72,21 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
 
     new_values["KeeperApproximateDataSize"] = { approximate_data_size, "The approximate data size of ClickHouse Keeper, in bytes." };
     new_values["KeeperKeyArenaSize"] = { key_arena_size, "The size in bytes of the memory arena for keys in ClickHouse Keeper." };
-    new_values["KeeperLatestSnapshotSize"] = { latest_snapshot_size, "The uncompressed size in bytes of the latest snapshot created by ClickHouse Keeper." };
+    /// TODO: value was incorrectly set to 0 previously for local snapshots
+    /// it needs to be fixed and it needs to be atomic to avoid deadlock
+    ///new_values["KeeperLatestSnapshotSize"] = { latest_snapshot_size, "The uncompressed size in bytes of the latest snapshot created by ClickHouse Keeper." };
 
     new_values["KeeperOpenFileDescriptorCount"] = { open_file_descriptor_count, "The number of open file descriptors in ClickHouse Keeper." };
-    new_values["KeeperMaxFileDescriptorCount"] = { max_file_descriptor_count, "The maximum number of open file descriptors in ClickHouse Keeper." };
+    if (max_file_descriptor_count.has_value())
+        new_values["KeeperMaxFileDescriptorCount"] = { *max_file_descriptor_count, "The maximum number of open file descriptors in ClickHouse Keeper." };
+    else
+        new_values["KeeperMaxFileDescriptorCount"] = { -1, "The maximum number of open file descriptors in ClickHouse Keeper." };
 
     new_values["KeeperFollowers"] = { followers, "The number of followers of ClickHouse Keeper." };
     new_values["KeeperSyncedFollowers"] = { synced_followers, "The number of followers of ClickHouse Keeper who are also in-sync." };
     new_values["KeeperZxid"] = { zxid, "The current transaction id number (zxid) in ClickHouse Keeper." };
     new_values["KeeperSessionWithWatches"] = { session_with_watches, "The number of client sessions of ClickHouse Keeper having watches." };
     new_values["KeeperPathsWatched"] = { paths_watched, "The number of different paths watched by the clients of ClickHouse Keeper." };
-    //new_values["KeeperSnapshotDirSize"] = { snapshot_dir_size, "The size of the snapshots directory of ClickHouse Keeper, in bytes." };
-    //new_values["KeeperLogDirSize"] = { log_dir_size, "The size of the logs directory of ClickHouse Keeper, in bytes." };
 
     auto keeper_log_info = keeper_dispatcher.getKeeperLogInfo();
 
@@ -97,6 +97,12 @@ void updateKeeperInformation(KeeperDispatcher & keeper_dispatcher, AsynchronousM
     new_values["KeeperTargetCommitLogIdx"] = { keeper_log_info.target_committed_log_idx, "Index until which logs can be committed in ClickHouse Keeper." };
     new_values["KeeperLastSnapshotIdx"] = { keeper_log_info.last_snapshot_idx, "Index of the last log present in the last created snapshot." };
 
+    new_values["KeeperLatestLogsCacheEntries"] = {keeper_log_info.latest_logs_cache_entries, "Number of entries stored in the in-memory cache for latest logs"};
+    new_values["KeeperLatestLogsCacheSize"] = {keeper_log_info.latest_logs_cache_size, "Total size of in-memory cache for latest logs"};
+
+    new_values["KeeperCommitLogsCacheEntries"] = {keeper_log_info.commit_logs_cache_entries, "Number of entries stored in the in-memory cache for next logs to be committed"};
+    new_values["KeeperCommitLogsCacheSize"] = {keeper_log_info.commit_logs_cache_size, "Total size of in-memory cache for next logs to be committed"};
+
     auto & keeper_connection_stats = keeper_dispatcher.getKeeperConnectionStats();
 
     new_values["KeeperMinLatency"] = { keeper_connection_stats.getMinLatency(), "Minimal request latency of ClickHouse Keeper." };
@@ -119,7 +125,7 @@ KeeperAsynchronousMetrics::~KeeperAsynchronousMetrics()
     stop();
 }
 
-void KeeperAsynchronousMetrics::updateImpl(AsynchronousMetricValues & new_values, TimePoint /*update_time*/, TimePoint /*current_time*/)
+void KeeperAsynchronousMetrics::updateImpl(TimePoint /*update_time*/, TimePoint /*current_time*/, bool /*force_update*/, bool /*first_run*/, AsynchronousMetricValues & new_values)
 {
 #if USE_NURAFT
     {
diff --git a/src/Coordination/KeeperAsynchronousMetrics.h b/src/Coordination/KeeperAsynchronousMetrics.h
index 457a7112507..33e8d6818d7 100644
--- a/src/Coordination/KeeperAsynchronousMetrics.h
+++ b/src/Coordination/KeeperAsynchronousMetrics.h
@@ -19,7 +19,7 @@ public:
 private:
     ContextPtr context;
 
-    void updateImpl(AsynchronousMetricValues & new_values, TimePoint update_time, TimePoint current_time) override;
+    void updateImpl(TimePoint update_time, TimePoint current_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values) override;
 };
 
 
diff --git a/src/Coordination/KeeperCommon.cpp b/src/Coordination/KeeperCommon.cpp
new file mode 100644
index 00000000000..0245dbf28a2
--- /dev/null
+++ b/src/Coordination/KeeperCommon.cpp
@@ -0,0 +1,122 @@
+#include <Coordination/KeeperCommon.h>
+
+#include <string>
+#include <filesystem>
+
+#include <Common/logger_useful.h>
+#include <Disks/IDisk.h>
+#include <Coordination/KeeperContext.h>
+#include <Coordination/CoordinationSettings.h>
+
+namespace DB
+{
+
+static size_t findLastSlash(StringRef path)
+{
+    if (path.size == 0)
+        return std::string::npos;
+
+    for (size_t i = path.size - 1; i > 0; --i)
+    {
+        if (path.data[i] == '/')
+            return i;
+    }
+
+    if (path.data[0] == '/')
+        return 0;
+
+    return std::string::npos;
+}
+
+StringRef parentNodePath(StringRef path)
+{
+    auto rslash_pos = findLastSlash(path);
+    if (rslash_pos > 0)
+        return StringRef{path.data, rslash_pos};
+    return "/";
+}
+
+StringRef getBaseNodeName(StringRef path)
+{
+    size_t basename_start = findLastSlash(path);
+    return StringRef{path.data + basename_start + 1, path.size - basename_start - 1};
+}
+
+void moveFileBetweenDisks(
+    DiskPtr disk_from,
+    const std::string & path_from,
+    DiskPtr disk_to,
+    const std::string & path_to,
+    std::function<void()> before_file_remove_op,
+    LoggerPtr logger,
+    const KeeperContextPtr & keeper_context)
+{
+    LOG_TRACE(logger, "Moving {} to {} from disk {} to disk {}", path_from, path_to, disk_from->getName(), disk_to->getName());
+    /// we use empty file with prefix tmp_ to detect incomplete copies
+    /// if a copy is complete we don't care from which disk we use the same file
+    /// so it's okay if a failure happens after removing of tmp file but before we remove
+    /// the file from the source disk
+    auto from_path = fs::path(path_from);
+    auto tmp_file_name = from_path.parent_path() / (std::string{tmp_keeper_file_prefix} + from_path.filename().string());
+
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
+    auto max_retries_on_init = coordination_settings->disk_move_retries_during_init.value;
+    auto retries_sleep = std::chrono::milliseconds(coordination_settings->disk_move_retries_wait_ms);
+    auto run_with_retries = [&](const auto & op, std::string_view operation_description)
+    {
+        size_t retry_num = 0;
+        do
+        {
+            try
+            {
+                op();
+                return true;
+            }
+            catch (...)
+            {
+                tryLogCurrentException(
+                    logger,
+                    fmt::format(
+                        "While moving file {} to disk {} and running '{}'", path_from, disk_to->getName(), operation_description));
+                std::this_thread::sleep_for(retries_sleep);
+            }
+
+            ++retry_num;
+            if (keeper_context->getServerState() == KeeperContext::Phase::INIT && retry_num == max_retries_on_init)
+            {
+                LOG_ERROR(logger, "Operation '{}' failed too many times", operation_description);
+                break;
+            }
+        } while (!keeper_context->isShutdownCalled());
+
+        LOG_ERROR(
+            logger,
+            "Failed to run '{}' while moving file {} to disk {}",
+            operation_description,
+            path_from,
+            disk_to->getName());
+        return false;
+    };
+
+    if (!run_with_retries(
+            [&]
+            {
+                auto buf = disk_to->writeFile(tmp_file_name);
+                buf->finalize();
+            },
+            "creating temporary file"))
+        return;
+
+    if (!run_with_retries([&] { disk_from->copyFile(from_path, *disk_to, path_to, {}); }, "copying file"))
+        return;
+
+    if (!run_with_retries([&] { disk_to->removeFileIfExists(tmp_file_name); }, "removing temporary file"))
+        return;
+
+    if (before_file_remove_op)
+        before_file_remove_op();
+
+    if (!run_with_retries([&] { disk_from->removeFileIfExists(path_from); }, "removing file from source disk"))
+        return;
+}
+}
diff --git a/src/Coordination/KeeperCommon.h b/src/Coordination/KeeperCommon.h
new file mode 100644
index 00000000000..02f71a04d06
--- /dev/null
+++ b/src/Coordination/KeeperCommon.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <base/StringRef.h>
+#include "Common/Logger.h"
+
+namespace DB
+{
+
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+class KeeperContext;
+using KeeperContextPtr = std::shared_ptr<KeeperContext>;
+
+StringRef parentNodePath(StringRef path);
+
+StringRef getBaseNodeName(StringRef path);
+
+inline static constexpr std::string_view tmp_keeper_file_prefix = "tmp_";
+
+void moveFileBetweenDisks(
+    DiskPtr disk_from,
+    const std::string & path_from,
+    DiskPtr disk_to,
+    const std::string & path_to,
+    std::function<void()> before_file_remove_op,
+    LoggerPtr logger,
+    const KeeperContextPtr & keeper_context);
+
+}
diff --git a/src/Coordination/KeeperConstants.cpp b/src/Coordination/KeeperConstants.cpp
new file mode 100644
index 00000000000..8251dca3d1e
--- /dev/null
+++ b/src/Coordination/KeeperConstants.cpp
@@ -0,0 +1,378 @@
+#include <Common/ProfileEvents.h>
+#include <Common/CurrentMetrics.h>
+
+/// Events which are useful for Keeper.
+/// New events should be added manually.
+#define APPLY_FOR_KEEPER_PROFILE_EVENTS(M) \
+    M(FileOpen) \
+    M(Seek) \
+    M(ReadBufferFromFileDescriptorRead) \
+    M(ReadBufferFromFileDescriptorReadFailed) \
+    M(ReadBufferFromFileDescriptorReadBytes) \
+    M(WriteBufferFromFileDescriptorWrite) \
+    M(WriteBufferFromFileDescriptorWriteFailed) \
+    M(WriteBufferFromFileDescriptorWriteBytes) \
+    M(FileSync) \
+    M(DirectorySync) \
+    M(FileSyncElapsedMicroseconds) \
+    M(DirectorySyncElapsedMicroseconds) \
+    M(ReadCompressedBytes) \
+    M(CompressedReadBufferBlocks) \
+    M(CompressedReadBufferBytes) \
+    M(AIOWrite) \
+    M(AIOWriteBytes) \
+    M(AIORead) \
+    M(AIOReadBytes) \
+    M(IOBufferAllocs) \
+    M(IOBufferAllocBytes) \
+    M(ArenaAllocChunks) \
+    M(ArenaAllocBytes) \
+    M(CreatedReadBufferOrdinary) \
+    M(CreatedReadBufferDirectIO) \
+    M(CreatedReadBufferDirectIOFailed) \
+    M(CreatedReadBufferMMap) \
+    M(CreatedReadBufferMMapFailed) \
+    M(DiskReadElapsedMicroseconds) \
+    M(DiskWriteElapsedMicroseconds) \
+    M(NetworkReceiveElapsedMicroseconds) \
+    M(NetworkSendElapsedMicroseconds) \
+    M(NetworkReceiveBytes) \
+    M(NetworkSendBytes) \
+\
+    M(DiskS3GetRequestThrottlerCount) \
+    M(DiskS3GetRequestThrottlerSleepMicroseconds) \
+    M(DiskS3PutRequestThrottlerCount) \
+    M(DiskS3PutRequestThrottlerSleepMicroseconds) \
+    M(S3GetRequestThrottlerCount) \
+    M(S3GetRequestThrottlerSleepMicroseconds) \
+    M(S3PutRequestThrottlerCount) \
+    M(S3PutRequestThrottlerSleepMicroseconds) \
+    M(RemoteReadThrottlerBytes) \
+    M(RemoteReadThrottlerSleepMicroseconds) \
+    M(RemoteWriteThrottlerBytes) \
+    M(RemoteWriteThrottlerSleepMicroseconds) \
+    M(LocalReadThrottlerBytes) \
+    M(LocalReadThrottlerSleepMicroseconds) \
+    M(LocalWriteThrottlerBytes) \
+    M(LocalWriteThrottlerSleepMicroseconds) \
+    M(ThrottlerSleepMicroseconds) \
+\
+    M(SlowRead) \
+    M(ReadBackoff) \
+\
+    M(ContextLock) \
+    M(ContextLockWaitMicroseconds) \
+\
+    M(RWLockAcquiredReadLocks) \
+    M(RWLockAcquiredWriteLocks) \
+    M(RWLockReadersWaitMilliseconds) \
+    M(RWLockWritersWaitMilliseconds) \
+    M(DNSError) \
+    M(RealTimeMicroseconds) \
+    M(UserTimeMicroseconds) \
+    M(SystemTimeMicroseconds) \
+    M(MemoryOvercommitWaitTimeMicroseconds) \
+    M(MemoryAllocatorPurge) \
+    M(MemoryAllocatorPurgeTimeMicroseconds) \
+    M(SoftPageFaults) \
+    M(HardPageFaults) \
+\
+    M(OSIOWaitMicroseconds) \
+    M(OSCPUWaitMicroseconds) \
+    M(OSCPUVirtualTimeMicroseconds) \
+    M(OSReadBytes) \
+    M(OSWriteBytes) \
+    M(OSReadChars) \
+    M(OSWriteChars) \
+\
+    M(PerfCPUCycles) \
+    M(PerfInstructions) \
+    M(PerfCacheReferences) \
+    M(PerfCacheMisses) \
+    M(PerfBranchInstructions) \
+    M(PerfBranchMisses) \
+    M(PerfBusCycles) \
+    M(PerfStalledCyclesFrontend) \
+    M(PerfStalledCyclesBackend) \
+    M(PerfRefCPUCycles) \
+\
+    M(PerfCPUClock) \
+    M(PerfTaskClock) \
+    M(PerfContextSwitches) \
+    M(PerfCPUMigrations) \
+    M(PerfAlignmentFaults) \
+    M(PerfEmulationFaults) \
+    M(PerfMinEnabledTime) \
+    M(PerfMinEnabledRunningTime) \
+    M(PerfDataTLBReferences) \
+    M(PerfDataTLBMisses) \
+    M(PerfInstructionTLBReferences) \
+    M(PerfInstructionTLBMisses) \
+    M(PerfLocalMemoryReferences) \
+    M(PerfLocalMemoryMisses) \
+\
+    M(CannotWriteToWriteBufferDiscard) \
+\
+    M(S3ReadMicroseconds) \
+    M(S3ReadRequestsCount) \
+    M(S3ReadRequestsErrors) \
+    M(S3ReadRequestsThrottling) \
+    M(S3ReadRequestsRedirects) \
+\
+    M(S3WriteMicroseconds) \
+    M(S3WriteRequestsCount) \
+    M(S3WriteRequestsErrors) \
+    M(S3WriteRequestsThrottling) \
+    M(S3WriteRequestsRedirects) \
+\
+    M(DiskS3ReadMicroseconds) \
+    M(DiskS3ReadRequestsCount) \
+    M(DiskS3ReadRequestsErrors) \
+    M(DiskS3ReadRequestsThrottling) \
+    M(DiskS3ReadRequestsRedirects) \
+\
+    M(DiskS3WriteMicroseconds) \
+    M(DiskS3WriteRequestsCount) \
+    M(DiskS3WriteRequestsErrors) \
+    M(DiskS3WriteRequestsThrottling) \
+    M(DiskS3WriteRequestsRedirects) \
+\
+    M(S3DeleteObjects) \
+    M(S3CopyObject) \
+    M(S3ListObjects) \
+    M(S3HeadObject) \
+    M(S3GetObjectAttributes) \
+    M(S3CreateMultipartUpload) \
+    M(S3UploadPartCopy) \
+    M(S3UploadPart) \
+    M(S3AbortMultipartUpload) \
+    M(S3CompleteMultipartUpload) \
+    M(S3PutObject) \
+    M(S3GetObject) \
+\
+    M(AzureUploadPart) \
+    M(DiskAzureUploadPart) \
+    M(AzureCopyObject) \
+    M(DiskAzureCopyObject) \
+    M(AzureDeleteObjects) \
+    M(AzureListObjects) \
+\
+    M(DiskS3DeleteObjects) \
+    M(DiskS3CopyObject) \
+    M(DiskS3ListObjects) \
+    M(DiskS3HeadObject) \
+    M(DiskS3GetObjectAttributes) \
+    M(DiskS3CreateMultipartUpload) \
+    M(DiskS3UploadPartCopy) \
+    M(DiskS3UploadPart) \
+    M(DiskS3AbortMultipartUpload) \
+    M(DiskS3CompleteMultipartUpload) \
+    M(DiskS3PutObject) \
+    M(DiskS3GetObject) \
+\
+    M(S3Clients) \
+    M(TinyS3Clients) \
+\
+    M(ReadBufferFromS3Microseconds) \
+    M(ReadBufferFromS3InitMicroseconds) \
+    M(ReadBufferFromS3Bytes) \
+    M(ReadBufferFromS3RequestsErrors) \
+    M(ReadBufferFromS3ResetSessions) \
+    M(ReadBufferFromS3PreservedSessions) \
+\
+    M(WriteBufferFromS3Microseconds) \
+    M(WriteBufferFromS3Bytes) \
+    M(WriteBufferFromS3RequestsErrors) \
+    M(WriteBufferFromS3WaitInflightLimitMicroseconds) \
+    M(RemoteFSSeeks) \
+    M(RemoteFSPrefetches) \
+    M(RemoteFSCancelledPrefetches) \
+    M(RemoteFSUnusedPrefetches) \
+    M(RemoteFSPrefetchedReads) \
+    M(RemoteFSPrefetchedBytes) \
+    M(RemoteFSUnprefetchedReads) \
+    M(RemoteFSUnprefetchedBytes) \
+    M(RemoteFSLazySeeks) \
+    M(RemoteFSSeeksWithReset) \
+    M(RemoteFSBuffers) \
+\
+    M(ThreadpoolReaderTaskMicroseconds) \
+    M(ThreadpoolReaderPrepareMicroseconds) \
+    M(ThreadpoolReaderReadBytes) \
+    M(ThreadpoolReaderSubmit) \
+    M(ThreadpoolReaderSubmitReadSynchronously) \
+    M(ThreadpoolReaderSubmitReadSynchronouslyBytes) \
+    M(ThreadpoolReaderSubmitReadSynchronouslyMicroseconds) \
+    M(ThreadpoolReaderSubmitLookupInCacheMicroseconds) \
+    M(AsynchronousReaderIgnoredBytes) \
+\
+    M(FileSegmentWaitReadBufferMicroseconds) \
+    M(FileSegmentReadMicroseconds) \
+    M(FileSegmentCacheWriteMicroseconds) \
+    M(FileSegmentPredownloadMicroseconds) \
+    M(FileSegmentUsedBytes) \
+\
+    M(ReadBufferSeekCancelConnection) \
+\
+    M(SleepFunctionCalls) \
+    M(SleepFunctionMicroseconds) \
+    M(SleepFunctionElapsedMicroseconds) \
+\
+    M(ThreadPoolReaderPageCacheHit) \
+    M(ThreadPoolReaderPageCacheHitBytes) \
+    M(ThreadPoolReaderPageCacheHitElapsedMicroseconds) \
+    M(ThreadPoolReaderPageCacheMiss) \
+    M(ThreadPoolReaderPageCacheMissBytes) \
+    M(ThreadPoolReaderPageCacheMissElapsedMicroseconds) \
+\
+    M(AsynchronousReadWaitMicroseconds) \
+    M(SynchronousReadWaitMicroseconds) \
+    M(AsynchronousRemoteReadWaitMicroseconds) \
+    M(SynchronousRemoteReadWaitMicroseconds) \
+\
+    M(ExternalDataSourceLocalCacheReadBytes) \
+\
+    M(MainConfigLoads) \
+\
+    M(KeeperPacketsSent) \
+    M(KeeperPacketsReceived) \
+    M(KeeperRequestTotal) \
+    M(KeeperLatency) \
+    M(KeeperCommits) \
+    M(KeeperCommitsFailed) \
+    M(KeeperSnapshotCreations) \
+    M(KeeperSnapshotCreationsFailed) \
+    M(KeeperSnapshotApplys) \
+    M(KeeperSnapshotApplysFailed) \
+    M(KeeperReadSnapshot) \
+    M(KeeperSaveSnapshot) \
+    M(KeeperCreateRequest) \
+    M(KeeperRemoveRequest) \
+    M(KeeperSetRequest) \
+    M(KeeperReconfigRequest) \
+    M(KeeperCheckRequest) \
+    M(KeeperMultiRequest) \
+    M(KeeperMultiReadRequest) \
+    M(KeeperGetRequest) \
+    M(KeeperListRequest) \
+    M(KeeperExistsRequest) \
+\
+    M(IOUringSQEsSubmitted) \
+    M(IOUringSQEsResubmits) \
+    M(IOUringCQEsCompleted) \
+    M(IOUringCQEsFailed) \
+\
+    M(LogTest) \
+    M(LogTrace) \
+    M(LogDebug) \
+    M(LogInfo) \
+    M(LogWarning) \
+    M(LogError) \
+    M(LogFatal) \
+\
+    M(InterfaceHTTPSendBytes) \
+    M(InterfaceHTTPReceiveBytes) \
+    M(InterfaceNativeSendBytes) \
+    M(InterfaceNativeReceiveBytes) \
+    M(InterfacePrometheusSendBytes) \
+    M(InterfacePrometheusReceiveBytes) \
+    M(InterfaceInterserverSendBytes) \
+    M(InterfaceInterserverReceiveBytes) \
+    M(InterfaceMySQLSendBytes) \
+    M(InterfaceMySQLReceiveBytes) \
+    M(InterfacePostgreSQLSendBytes) \
+    M(InterfacePostgreSQLReceiveBytes) \
+\
+    M(KeeperLogsEntryReadFromLatestCache) \
+    M(KeeperLogsEntryReadFromCommitCache) \
+    M(KeeperLogsEntryReadFromFile) \
+    M(KeeperLogsPrefetchedEntries) \
+
+namespace ProfileEvents
+{
+#define M(NAME) extern const Event NAME;
+    APPLY_FOR_KEEPER_PROFILE_EVENTS(M)
+#undef M
+
+#define M(NAME) NAME,
+extern const std::vector<Event> keeper_profile_events
+{
+    APPLY_FOR_KEEPER_PROFILE_EVENTS(M)
+};
+#undef M
+}
+
+/// Metrics which are useful for Keeper.
+/// New metrics should be added manually.
+#define APPLY_FOR_KEEPER_METRICS(M) \
+    M(BackgroundCommonPoolTask) \
+    M(BackgroundCommonPoolSize) \
+    M(TCPConnection) \
+    M(HTTPConnection) \
+    M(OpenFileForRead) \
+    M(OpenFileForWrite) \
+    M(Read) \
+    M(RemoteRead) \
+    M(Write) \
+    M(NetworkReceive) \
+    M(NetworkSend) \
+    M(MemoryTracking) \
+    M(ContextLockWait) \
+    M(Revision) \
+    M(VersionInteger) \
+    M(RWLockWaitingReaders) \
+    M(RWLockWaitingWriters) \
+    M(RWLockActiveReaders) \
+    M(RWLockActiveWriters) \
+    M(GlobalThread) \
+    M(GlobalThreadActive) \
+    M(GlobalThreadScheduled) \
+    M(LocalThread) \
+    M(LocalThreadActive) \
+    M(LocalThreadScheduled) \
+    M(IOPrefetchThreads) \
+    M(IOPrefetchThreadsActive) \
+    M(IOPrefetchThreadsScheduled) \
+    M(IOWriterThreads) \
+    M(IOWriterThreadsActive) \
+    M(IOWriterThreadsScheduled) \
+    M(IOThreads) \
+    M(IOThreadsActive) \
+    M(IOThreadsScheduled) \
+    M(ThreadPoolRemoteFSReaderThreads) \
+    M(ThreadPoolRemoteFSReaderThreadsActive) \
+    M(ThreadPoolRemoteFSReaderThreadsScheduled) \
+    M(ThreadPoolFSReaderThreads) \
+    M(ThreadPoolFSReaderThreadsActive) \
+    M(ThreadPoolFSReaderThreadsScheduled) \
+    M(DiskObjectStorageAsyncThreads) \
+    M(DiskObjectStorageAsyncThreadsActive) \
+    M(ObjectStorageS3Threads) \
+    M(ObjectStorageS3ThreadsActive) \
+    M(ObjectStorageS3ThreadsScheduled) \
+    M(ObjectStorageAzureThreads) \
+    M(ObjectStorageAzureThreadsActive) \
+    M(ObjectStorageAzureThreadsScheduled) \
+    M(MMappedFiles) \
+    M(MMappedFileBytes) \
+    M(AsynchronousReadWait) \
+    M(S3Requests) \
+    M(KeeperAliveConnections) \
+    M(KeeperOutstandingRequets) \
+    M(ThreadsInOvercommitTracker) \
+    M(IOUringPendingEvents) \
+    M(IOUringInFlightEvents) \
+
+namespace CurrentMetrics
+{
+#define M(NAME) extern const Metric NAME;
+    APPLY_FOR_KEEPER_METRICS(M)
+#undef M
+
+#define M(NAME) NAME,
+extern const std::vector<Metric> keeper_metrics
+{
+    APPLY_FOR_KEEPER_METRICS(M)
+};
+#undef M
+}
diff --git a/src/Coordination/KeeperContext.cpp b/src/Coordination/KeeperContext.cpp
index 6bb5b066d9f..a36a074ce89 100644
--- a/src/Coordination/KeeperContext.cpp
+++ b/src/Coordination/KeeperContext.cpp
@@ -1,13 +1,19 @@
+#include <atomic>
+#include <chrono>
+
 #include <Coordination/KeeperContext.h>
 
 #include <Coordination/Defines.h>
-#include <Disks/DiskLocal.h>
-#include <Interpreters/Context.h>
-#include <IO/S3/Credentials.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include <Coordination/KeeperConstants.h>
-#include <Common/logger_useful.h>
+#include <Server/CloudPlacementInfo.h>
 #include <Coordination/KeeperFeatureFlags.h>
+#include <Disks/DiskLocal.h>
+#include <Disks/DiskSelector.h>
+#include <IO/S3/Credentials.h>
+#include <Interpreters/Context.h>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/logger_useful.h>
+
 #include <boost/algorithm/string.hpp>
 
 namespace DB
@@ -20,9 +26,10 @@ extern const int BAD_ARGUMENTS;
 
 }
 
-KeeperContext::KeeperContext(bool standalone_keeper_)
+KeeperContext::KeeperContext(bool standalone_keeper_, CoordinationSettingsPtr coordination_settings_)
     : disk_selector(std::make_shared<DiskSelector>())
     , standalone_keeper(standalone_keeper_)
+    , coordination_settings(std::move(coordination_settings_))
 {
     /// enable by default some feature flags
     feature_flags.enableFeatureFlag(KeeperFeatureFlag::FILTERED_LIST);
@@ -37,26 +44,11 @@ void KeeperContext::initialize(const Poco::Util::AbstractConfiguration & config,
 {
     dispatcher = dispatcher_;
 
-    if (config.hasProperty("keeper_server.availability_zone"))
+    const auto keeper_az = PlacementInfo::PlacementInfo::instance().getAvailabilityZone();
+    if (!keeper_az.empty())
     {
-        auto keeper_az = config.getString("keeper_server.availability_zone.value", "");
-        const auto auto_detect_for_cloud = config.getBool("keeper_server.availability_zone.enable_auto_detection_on_cloud", false);
-        if (keeper_az.empty() && auto_detect_for_cloud)
-        {
-            try
-            {
-                keeper_az = DB::S3::getRunningAvailabilityZone();
-            }
-            catch (...)
-            {
-                tryLogCurrentException(__PRETTY_FUNCTION__);
-            }
-        }
-        if (!keeper_az.empty())
-        {
-            system_nodes_with_data[keeper_availability_zone_path] = keeper_az;
-            LOG_INFO(&Poco::Logger::get("KeeperContext"), "Initialize the KeeperContext with availability zone: '{}'", keeper_az);
-        }
+        system_nodes_with_data[keeper_availability_zone_path] = keeper_az;
+        LOG_INFO(getLogger("KeeperContext"), "Initialize the KeeperContext with availability zone: '{}'", keeper_az);
     }
 
     updateKeeperMemorySoftLimit(config);
@@ -88,7 +80,7 @@ bool diskValidator(const Poco::Util::AbstractConfiguration & config, const std::
             supported_disk_types.end(),
             [&](const auto supported_type) { return disk_type != supported_type; }))
     {
-        LOG_INFO(&Poco::Logger::get("KeeperContext"), "Disk type '{}' is not supported for Keeper", disk_type);
+        LOG_INFO(getLogger("KeeperContext"), "Disk type '{}' is not supported for Keeper", disk_type);
         return false;
     }
 
@@ -374,7 +366,7 @@ void KeeperContext::initializeFeatureFlags(const Poco::Util::AbstractConfigurati
         system_nodes_with_data[keeper_api_feature_flags_path] = feature_flags.getFeatureFlags();
     }
 
-    feature_flags.logFlags(&Poco::Logger::get("KeeperContext"));
+    feature_flags.logFlags(getLogger("KeeperContext"));
 }
 
 void KeeperContext::updateKeeperMemorySoftLimit(const Poco::Util::AbstractConfiguration & config)
@@ -383,4 +375,79 @@ void KeeperContext::updateKeeperMemorySoftLimit(const Poco::Util::AbstractConfig
         memory_soft_limit = config.getUInt64("keeper_server.max_memory_usage_soft_limit");
 }
 
+bool KeeperContext::setShutdownCalled()
+{
+    std::unique_lock local_logs_preprocessed_lock(local_logs_preprocessed_cv_mutex);
+    std::unique_lock last_committed_log_idx_lock(last_committed_log_idx_cv_mutex);
+
+    if (!shutdown_called.exchange(true))
+    {
+        local_logs_preprocessed_lock.unlock();
+        last_committed_log_idx_lock.unlock();
+
+        local_logs_preprocessed_cv.notify_all();
+        last_committed_log_idx_cv.notify_all();
+        return true;
+    }
+
+    return false;
+}
+
+void KeeperContext::setLocalLogsPreprocessed()
+{
+    {
+        std::lock_guard lock(local_logs_preprocessed_cv_mutex);
+        local_logs_preprocessed = true;
+    }
+    local_logs_preprocessed_cv.notify_all();
+}
+
+bool KeeperContext::localLogsPreprocessed() const
+{
+    return local_logs_preprocessed;
+}
+
+void KeeperContext::waitLocalLogsPreprocessedOrShutdown()
+{
+    std::unique_lock lock(local_logs_preprocessed_cv_mutex);
+    local_logs_preprocessed_cv.wait(lock, [this]{ return shutdown_called || local_logs_preprocessed; });
+}
+
+const CoordinationSettingsPtr & KeeperContext::getCoordinationSettings() const
+{
+    return coordination_settings;
+}
+
+uint64_t KeeperContext::lastCommittedIndex() const
+{
+    return last_committed_log_idx.load(std::memory_order_relaxed);
+}
+
+void KeeperContext::setLastCommitIndex(uint64_t commit_index)
+{
+    bool should_notify;
+    {
+        std::lock_guard lock(last_committed_log_idx_cv_mutex);
+        last_committed_log_idx.store(commit_index, std::memory_order_relaxed);
+
+        should_notify = wait_commit_upto_idx.has_value() && commit_index >= wait_commit_upto_idx;
+    }
+
+    if (should_notify)
+        last_committed_log_idx_cv.notify_all();
+}
+
+bool KeeperContext::waitCommittedUpto(uint64_t log_idx, uint64_t wait_timeout_ms)
+{
+    std::unique_lock lock(last_committed_log_idx_cv_mutex);
+    wait_commit_upto_idx = log_idx;
+    bool success = last_committed_log_idx_cv.wait_for(
+        lock,
+        std::chrono::milliseconds(wait_timeout_ms),
+        [&] { return shutdown_called || lastCommittedIndex() >= wait_commit_upto_idx; });
+
+    wait_commit_upto_idx.reset();
+    return success;
+}
+
 }
diff --git a/src/Coordination/KeeperContext.h b/src/Coordination/KeeperContext.h
index c1c34db2c4b..e283e65dffa 100644
--- a/src/Coordination/KeeperContext.h
+++ b/src/Coordination/KeeperContext.h
@@ -1,8 +1,8 @@
 #pragma once
 #include <Coordination/KeeperFeatureFlags.h>
-#include <Disks/DiskSelector.h>
-#include <IO/WriteBufferFromString.h>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <atomic>
+#include <condition_variable>
 #include <cstdint>
 #include <memory>
 
@@ -11,10 +11,19 @@ namespace DB
 
 class KeeperDispatcher;
 
+struct CoordinationSettings;
+using CoordinationSettingsPtr = std::shared_ptr<CoordinationSettings>;
+
+class DiskSelector;
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
+class WriteBufferFromOwnString;
+
 class KeeperContext
 {
 public:
-    explicit KeeperContext(bool standalone_keeper_);
+    KeeperContext(bool standalone_keeper_, CoordinationSettingsPtr coordination_settings_);
 
     enum class Phase : uint8_t
     {
@@ -56,10 +65,24 @@ public:
     UInt64 getKeeperMemorySoftLimit() const { return memory_soft_limit; }
     void updateKeeperMemorySoftLimit(const Poco::Util::AbstractConfiguration & config);
 
-    /// set to true when we have preprocessed or committed all the logs
-    /// that were already present locally during startup
-    std::atomic<bool> local_logs_preprocessed = false;
-    std::atomic<bool> shutdown_called = false;
+    bool setShutdownCalled();
+    const auto & isShutdownCalled() const
+    {
+        return shutdown_called;
+    }
+
+    void setLocalLogsPreprocessed();
+    bool localLogsPreprocessed() const;
+
+    void waitLocalLogsPreprocessedOrShutdown();
+
+    uint64_t lastCommittedIndex() const;
+    void setLastCommitIndex(uint64_t commit_index);
+    /// returns true if the log is committed, false if timeout happened
+    bool waitCommittedUpto(uint64_t log_idx, uint64_t wait_timeout_ms);
+
+    const CoordinationSettingsPtr & getCoordinationSettings() const;
+
 private:
     /// local disk defined using path or disk name
     using Storage = std::variant<DiskPtr, std::string>;
@@ -73,7 +96,15 @@ private:
 
     DiskPtr getDisk(const Storage & storage) const;
 
-    Phase server_state{Phase::INIT};
+    std::mutex local_logs_preprocessed_cv_mutex;
+    std::condition_variable local_logs_preprocessed_cv;
+
+    /// set to true when we have preprocessed or committed all the logs
+    /// that were already present locally during startup
+    std::atomic<bool> local_logs_preprocessed = false;
+    std::atomic<bool> shutdown_called = false;
+
+    std::atomic<Phase> server_state{Phase::INIT};
 
     bool ignore_system_path_on_startup{false};
     bool digest_enabled{true};
@@ -97,6 +128,15 @@ private:
     KeeperDispatcher * dispatcher{nullptr};
 
     std::atomic<UInt64> memory_soft_limit = 0;
+
+    std::atomic<UInt64> last_committed_log_idx = 0;
+
+    /// will be set by dispatcher when waiting for certain commits
+    std::optional<UInt64> wait_commit_upto_idx = 0;
+    std::mutex last_committed_log_idx_cv_mutex;
+    std::condition_variable last_committed_log_idx_cv;
+
+    CoordinationSettingsPtr coordination_settings;
 };
 
 using KeeperContextPtr = std::shared_ptr<KeeperContext>;
diff --git a/src/Coordination/KeeperDispatcher.cpp b/src/Coordination/KeeperDispatcher.cpp
index 9c32d8a2ab7..84e1632e9b1 100644
--- a/src/Coordination/KeeperDispatcher.cpp
+++ b/src/Coordination/KeeperDispatcher.cpp
@@ -5,12 +5,16 @@
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include <base/hex.h>
+#include "Common/ZooKeeper/IKeeper.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 <Common/formatReadable.h>
+
+#include <Disks/IDisk.h>
 
 #include <atomic>
 #include <future>
@@ -93,7 +97,7 @@ bool checkIfRequestIncreaseMem(const Coordination::ZooKeeperRequestPtr & request
 KeeperDispatcher::KeeperDispatcher()
     : responses_queue(std::numeric_limits<size_t>::max())
     , configuration_and_settings(std::make_shared<KeeperConfigurationAndSettings>())
-    , log(&Poco::Logger::get("KeeperDispatcher"))
+    , log(getLogger("KeeperDispatcher"))
 {}
 
 void KeeperDispatcher::requestThread()
@@ -106,7 +110,7 @@ void KeeperDispatcher::requestThread()
     /// to send errors to the client.
     KeeperStorage::RequestsForSessions prev_batch;
 
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
 
     while (!shutdown_called)
     {
@@ -132,9 +136,9 @@ void KeeperDispatcher::requestThread()
                     break;
 
                 Int64 mem_soft_limit = keeper_context->getKeeperMemorySoftLimit();
-                if (configuration_and_settings->standalone_keeper && mem_soft_limit > 0 && total_memory_tracker.get() >= mem_soft_limit && checkIfRequestIncreaseMem(request.request))
+                if (configuration_and_settings->standalone_keeper && isExceedingMemorySoftLimit() && checkIfRequestIncreaseMem(request.request))
                 {
-                    LOG_TRACE(log, "Processing requests refused because of max_memory_usage_soft_limit {}, the total used memory is {}, request type is {}", mem_soft_limit, total_memory_tracker.get(), request.request->getOpNum());
+                    LOG_WARNING(log, "Processing requests refused because of max_memory_usage_soft_limit {}, the total used memory is {}, request type is {}", ReadableSize(mem_soft_limit), ReadableSize(total_memory_tracker.get()), request.request->getOpNum());
                     addErrorResponses({request}, Coordination::Error::ZCONNECTIONLOSS);
                     continue;
                 }
@@ -210,10 +214,13 @@ void KeeperDispatcher::requestThread()
                 if (shutdown_called)
                     break;
 
+                bool execute_requests_after_write = has_read_request || has_reconfig_request;
+
                 nuraft::ptr<nuraft::buffer> result_buf = nullptr;
                 /// Forcefully process all previous pending requests
                 if (prev_result)
-                    result_buf = forceWaitAndProcessResult(prev_result, prev_batch);
+                    result_buf
+                        = forceWaitAndProcessResult(prev_result, prev_batch, /*clear_requests_on_success=*/!execute_requests_after_write);
 
                 /// Process collected write requests batch
                 if (!current_batch.empty())
@@ -234,10 +241,11 @@ void KeeperDispatcher::requestThread()
                 }
 
                 /// If we will execute read or reconfig next, we have to process result now
-                if (has_read_request || has_reconfig_request)
+                if (execute_requests_after_write)
                 {
                     if (prev_result)
-                        result_buf = forceWaitAndProcessResult(prev_result, current_batch);
+                        result_buf = forceWaitAndProcessResult(
+                            prev_result, prev_batch, /*clear_requests_on_success=*/!execute_requests_after_write);
 
                     /// In case of older version or disabled async replication, result buf will be set to value of `commit` function
                     /// which always returns nullptr
@@ -249,19 +257,15 @@ void KeeperDispatcher::requestThread()
                         nuraft::buffer_serializer bs(result_buf);
                         auto log_idx = bs.get_u64();
 
-                        /// we will wake up this thread on each commit so we need to run it in loop until the last request of batch is committed
-                        while (true)
-                        {
-                            if (shutdown_called)
-                                return;
+                        /// if timeout happened set error responses for the requests
+                        if (!keeper_context->waitCommittedUpto(log_idx, coordination_settings->operation_timeout_ms.totalMilliseconds()))
+                            addErrorResponses(prev_batch, Coordination::Error::ZOPERATIONTIMEOUT);
 
-                            auto current_last_committed_idx = our_last_committed_log_idx.load(std::memory_order_relaxed);
-                            if (current_last_committed_idx >= log_idx)
-                                break;
-
-                            our_last_committed_log_idx.wait(current_last_committed_idx);
-                        }
+                        if (shutdown_called)
+                            return;
                     }
+
+                    prev_batch.clear();
                 }
 
                 if (has_reconfig_request)
@@ -287,7 +291,7 @@ void KeeperDispatcher::requestThread()
 void KeeperDispatcher::responseThread()
 {
     setThreadName("KeeperRspT");
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
     while (!shutdown_called)
     {
         KeeperStorage::ResponseForSession response_for_session;
@@ -314,19 +318,19 @@ void KeeperDispatcher::responseThread()
 void KeeperDispatcher::snapshotThread()
 {
     setThreadName("KeeperSnpT");
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
     while (!shutdown_called)
     {
         CreateSnapshotTask task;
         if (!snapshots_queue.pop(task))
             break;
 
-        if (shutdown_called)
-            break;
-
         try
         {
-            auto snapshot_file_info = task.create_snapshot(std::move(task.snapshot));
+            auto snapshot_file_info = task.create_snapshot(std::move(task.snapshot), /*execute_only_cleanup=*/shutdown_called);
+
+            if (shutdown_called)
+                break;
 
             if (snapshot_file_info.path.empty())
                 continue;
@@ -392,7 +396,7 @@ bool KeeperDispatcher::putRequest(const Coordination::ZooKeeperRequestPtr & requ
     request_info.time = duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count();
     request_info.session_id = session_id;
 
-    if (keeper_context->shutdown_called)
+    if (keeper_context->isShutdownCalled())
         return false;
 
     /// Put close requests without timeouts
@@ -413,8 +417,8 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
 {
     LOG_DEBUG(log, "Initializing storage dispatcher");
 
-    keeper_context = std::make_shared<KeeperContext>(standalone_keeper);
     configuration_and_settings = KeeperConfigurationAndSettings::loadFromConfig(config, standalone_keeper);
+    keeper_context = std::make_shared<KeeperContext>(standalone_keeper, configuration_and_settings->coordination_settings);
 
     keeper_context->initialize(config, this);
 
@@ -432,7 +436,7 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
         snapshots_queue,
         keeper_context,
         snapshot_s3,
-        [this](uint64_t log_idx, const KeeperStorage::RequestForSession & request_for_session)
+        [this](uint64_t /*log_idx*/, const KeeperStorage::RequestForSession & request_for_session)
         {
             {
                 /// check if we have queue of read requests depending on this request to be committed
@@ -456,9 +460,6 @@ void KeeperDispatcher::initialize(const Poco::Util::AbstractConfiguration & conf
                     }
                 }
             }
-
-            our_last_committed_log_idx.store(log_idx, std::memory_order_relaxed);
-            our_last_committed_log_idx.notify_all();
         });
 
     try
@@ -498,16 +499,11 @@ void KeeperDispatcher::shutdown()
     try
     {
         {
-            if (!keeper_context || keeper_context->shutdown_called.exchange(true))
+            if (!keeper_context || !keeper_context->setShutdownCalled())
                 return;
 
             LOG_DEBUG(log, "Shutting down storage dispatcher");
 
-            our_last_committed_log_idx = std::numeric_limits<uint64_t>::max();
-            our_last_committed_log_idx.notify_all();
-
-            keeper_context->local_logs_preprocessed = true;
-
             if (session_cleaner_thread.joinable())
                 session_cleaner_thread.join();
 
@@ -634,7 +630,7 @@ void KeeperDispatcher::registerSession(int64_t session_id, ZooKeeperResponseCall
 
 void KeeperDispatcher::sessionCleanerTask()
 {
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
     while (true)
     {
         if (shutdown_called)
@@ -685,7 +681,7 @@ void KeeperDispatcher::sessionCleanerTask()
 void KeeperDispatcher::finishSession(int64_t session_id)
 {
     /// shutdown() method will cleanup sessions if needed
-    if (keeper_context->shutdown_called)
+    if (keeper_context->isShutdownCalled())
         return;
 
     {
@@ -721,7 +717,8 @@ void KeeperDispatcher::addErrorResponses(const KeeperStorage::RequestsForSession
     }
 }
 
-nuraft::ptr<nuraft::buffer> KeeperDispatcher::forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions)
+nuraft::ptr<nuraft::buffer> KeeperDispatcher::forceWaitAndProcessResult(
+    RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions, bool clear_requests_on_success)
 {
     if (!result->has_result())
         result->get();
@@ -735,7 +732,10 @@ nuraft::ptr<nuraft::buffer> KeeperDispatcher::forceWaitAndProcessResult(RaftAppe
     auto result_buf = result->get();
 
     result = nullptr;
-    requests_for_sessions.clear();
+
+    if (!result_buf || clear_requests_on_success)
+        requests_for_sessions.clear();
+
     return result_buf;
 }
 
@@ -796,7 +796,7 @@ int64_t KeeperDispatcher::getSessionID(int64_t session_timeout_ms)
 
 void KeeperDispatcher::clusterUpdateWithReconfigDisabledThread()
 {
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
     while (!shutdown_called)
     {
         try
@@ -851,7 +851,7 @@ void KeeperDispatcher::clusterUpdateThread()
 {
     using enum KeeperServer::ConfigUpdateState;
     bool last_command_was_leader_change = false;
-    auto & shutdown_called = keeper_context->shutdown_called;
+    const auto & shutdown_called = keeper_context->isShutdownCalled();
     while (!shutdown_called)
     {
         ClusterUpdateAction action;
@@ -876,7 +876,7 @@ void KeeperDispatcher::clusterUpdateThread()
 
 void KeeperDispatcher::pushClusterUpdates(ClusterUpdateActions && actions)
 {
-    if (keeper_context->shutdown_called) return;
+    if (keeper_context->isShutdownCalled()) return;
     for (auto && action : actions)
     {
         if (!cluster_update_queue.push(std::move(action)))
diff --git a/src/Coordination/KeeperDispatcher.h b/src/Coordination/KeeperDispatcher.h
index 6483de7bd19..231ef7e94e9 100644
--- a/src/Coordination/KeeperDispatcher.h
+++ b/src/Coordination/KeeperDispatcher.h
@@ -70,7 +70,7 @@ private:
 
     KeeperConfigurationAndSettingsPtr configuration_and_settings;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Counter for new session_id requests.
     std::atomic<int64_t> internal_session_id_counter{0};
@@ -100,13 +100,12 @@ private:
 
     /// Forcefully wait for result and sets errors if something when wrong.
     /// Clears both arguments
-    nuraft::ptr<nuraft::buffer> forceWaitAndProcessResult(RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions);
+    nuraft::ptr<nuraft::buffer> forceWaitAndProcessResult(
+        RaftAppendResult & result, KeeperStorage::RequestsForSessions & requests_for_sessions, bool clear_requests_on_success);
 
 public:
     std::mutex read_request_queue_mutex;
 
-    std::atomic<uint64_t> our_last_committed_log_idx = 0;
-
     /// 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;
 
@@ -177,6 +176,11 @@ public:
         return server->isObserver();
     }
 
+    bool isExceedingMemorySoftLimit() const
+    {
+        return server->isExceedingMemorySoftLimit();
+    }
+
     uint64_t getLogDirSize() const;
 
     uint64_t getSnapDirSize() const;
diff --git a/src/Coordination/KeeperFeatureFlags.cpp b/src/Coordination/KeeperFeatureFlags.cpp
index d0cd1c86b55..2aad6cbed32 100644
--- a/src/Coordination/KeeperFeatureFlags.cpp
+++ b/src/Coordination/KeeperFeatureFlags.cpp
@@ -80,7 +80,7 @@ const std::string & KeeperFeatureFlags::getFeatureFlags() const
     return feature_flags;
 }
 
-void KeeperFeatureFlags::logFlags(Poco::Logger * log) const
+void KeeperFeatureFlags::logFlags(LoggerPtr log) const
 {
     for (const auto & [feature_flag, feature_flag_name] : magic_enum::enum_entries<KeeperFeatureFlag>())
     {
diff --git a/src/Coordination/KeeperFeatureFlags.h b/src/Coordination/KeeperFeatureFlags.h
index 4db972fa2a0..4e26ca60736 100644
--- a/src/Coordination/KeeperFeatureFlags.h
+++ b/src/Coordination/KeeperFeatureFlags.h
@@ -32,7 +32,7 @@ public:
     void enableFeatureFlag(KeeperFeatureFlag feature);
     void disableFeatureFlag(KeeperFeatureFlag feature);
 
-    void logFlags(Poco::Logger * log) const;
+    void logFlags(LoggerPtr log) const;
 private:
     std::string feature_flags;
 };
diff --git a/src/Coordination/KeeperLogStore.cpp b/src/Coordination/KeeperLogStore.cpp
index 8cff3419afc..820039d8a8f 100644
--- a/src/Coordination/KeeperLogStore.cpp
+++ b/src/Coordination/KeeperLogStore.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 
 KeeperLogStore::KeeperLogStore(LogFileSettings log_file_settings, FlushSettings flush_settings, KeeperContextPtr keeper_context)
-    : log(&Poco::Logger::get("KeeperLogStore")), changelog(log, log_file_settings, flush_settings, keeper_context)
+    : log(getLogger("KeeperLogStore")), changelog(log, log_file_settings, flush_settings, keeper_context)
 {
     if (log_file_settings.force_sync)
         LOG_INFO(log, "force_sync enabled");
@@ -66,13 +66,16 @@ nuraft::ptr<nuraft::log_entry> KeeperLogStore::entry_at(uint64_t index)
     return changelog.entryAt(index);
 }
 
+bool KeeperLogStore::is_conf(uint64_t index)
+{
+    std::lock_guard lock(changelog_lock);
+    return changelog.isConfigLog(index);
+}
+
 uint64_t KeeperLogStore::term_at(uint64_t index)
 {
     std::lock_guard lock(changelog_lock);
-    auto entry = changelog.entryAt(index);
-    if (entry)
-        return entry->get_term();
-    return 0;
+    return changelog.termAt(index);
 }
 
 nuraft::ptr<nuraft::buffer> KeeperLogStore::pack(uint64_t index, int32_t cnt)
@@ -145,4 +148,10 @@ void KeeperLogStore::setRaftServer(const nuraft::ptr<nuraft::raft_server> & raft
     return changelog.setRaftServer(raft_server);
 }
 
+void KeeperLogStore::getKeeperLogInfo(KeeperLogInfo & log_info) const
+{
+    std::lock_guard lock(changelog_lock);
+    changelog.getKeeperLogInfo(log_info);
+}
+
 }
diff --git a/src/Coordination/KeeperLogStore.h b/src/Coordination/KeeperLogStore.h
index de9205241bd..21d9479ee47 100644
--- a/src/Coordination/KeeperLogStore.h
+++ b/src/Coordination/KeeperLogStore.h
@@ -1,10 +1,10 @@
 #pragma once
 #include <libnuraft/log_store.hxx>
-#include <map>
 #include <mutex>
 #include <Core/Types.h>
 #include <Coordination/Changelog.h>
 #include <Coordination/KeeperContext.h>
+#include <Coordination/Keeper4LWInfo.h>
 #include <base/defines.h>
 
 namespace DB
@@ -38,6 +38,8 @@ public:
     /// Return entry at index
     nuraft::ptr<nuraft::log_entry> entry_at(uint64_t index) override;
 
+    bool is_conf(uint64_t index) override;
+
     /// Term if the index
     uint64_t term_at(uint64_t index) override;
 
@@ -72,9 +74,11 @@ public:
 
     void setRaftServer(const nuraft::ptr<nuraft::raft_server> & raft_server);
 
+    void getKeeperLogInfo(KeeperLogInfo & log_info) const;
+
 private:
     mutable std::mutex changelog_lock;
-    Poco::Logger * log;
+    LoggerPtr log;
     Changelog changelog TSA_GUARDED_BY(changelog_lock);
 };
 
diff --git a/src/Coordination/KeeperServer.cpp b/src/Coordination/KeeperServer.cpp
index 26ee3668ef6..57dc9596038 100644
--- a/src/Coordination/KeeperServer.cpp
+++ b/src/Coordination/KeeperServer.cpp
@@ -6,11 +6,11 @@
 #include <chrono>
 #include <mutex>
 #include <string>
+#include <Coordination/KeeperLogStore.h>
 #include <Coordination/KeeperStateMachine.h>
 #include <Coordination/KeeperStateManager.h>
 #include <Coordination/KeeperSnapshotManagerS3.h>
 #include <Coordination/LoggerWrapper.h>
-#include <Coordination/ReadBufferFromNuraftBuffer.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -25,13 +25,16 @@
 #include <Poco/Util/Application.h>
 #include <Common/Exception.h>
 #include <Common/LockMemoryExceptionInThread.h>
-#include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/Stopwatch.h>
 #include <Common/getMultipleKeysFromConfig.h>
 #include <Disks/DiskLocal.h>
+
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #include <fmt/chrono.h>
+
 #include <libnuraft/req_msg.hxx>
 
+
 namespace DB
 {
 
@@ -92,7 +95,7 @@ std::string checkAndGetSuperdigest(const String & user_and_digest)
     return user_and_digest;
 }
 
-int32_t getValueOrMaxInt32AndLogWarning(uint64_t value, const std::string & name, Poco::Logger * log)
+int32_t getValueOrMaxInt32AndLogWarning(uint64_t value, const std::string & name, LoggerPtr log)
 {
     if (value > std::numeric_limits<int32_t>::max())
     {
@@ -119,22 +122,20 @@ KeeperServer::KeeperServer(
     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"))
+    , log(getLogger("KeeperServer"))
     , is_recovering(config.getBool("keeper_server.force_recovery", false))
     , keeper_context{std::move(keeper_context_)}
     , create_snapshot_on_exit(config.getBool("keeper_server.create_snapshot_on_exit", true))
     , enable_reconfiguration(config.getBool("keeper_server.enable_reconfiguration", false))
 {
-    if (coordination_settings->quorum_reads)
+    if (keeper_context->getCoordinationSettings()->quorum_reads)
         LOG_WARNING(log, "Quorum reads enabled, Keeper will work slower.");
 
     state_machine = nuraft::cs_new<KeeperStateMachine>(
         responses_queue_,
         snapshots_queue_,
-        coordination_settings,
         keeper_context,
-        config.getBool("keeper_server.upload_snapshot_on_exit", true) ? &snapshot_manager_s3 : nullptr,
+        config.getBool("keeper_server.upload_snapshot_on_exit", false) ? &snapshot_manager_s3 : nullptr,
         commit_callback,
         checkAndGetSuperdigest(configuration_and_settings_->super_digest));
 
@@ -143,7 +144,6 @@ KeeperServer::KeeperServer(
         "keeper_server",
         "state",
         config,
-        coordination_settings,
         keeper_context);
 }
 
@@ -203,6 +203,16 @@ struct KeeperServer::KeeperRaftServer : public nuraft::raft_server
         return std::unique_lock(lock_);
     }
 
+    bool isCommitInProgress() const
+    {
+        return sm_commit_exec_in_progress_;
+    }
+
+    void setServingRequest(bool value)
+    {
+        serving_req_ = value;
+    }
+
     using nuraft::raft_server::raft_server;
 
     // peers are initially marked as responding because at least one cycle
@@ -216,7 +226,7 @@ void KeeperServer::loadLatestConfig()
 {
     auto latest_snapshot_config = state_machine->getClusterConfig();
     auto latest_log_store_config = state_manager->getLatestConfigFromLogStore();
-    auto async_replication = coordination_settings->async_replication;
+    auto async_replication = keeper_context->getCoordinationSettings()->async_replication;
 
     if (latest_snapshot_config && latest_log_store_config)
     {
@@ -283,6 +293,8 @@ void KeeperServer::forceRecovery()
 
 void KeeperServer::launchRaftServer(const Poco::Util::AbstractConfiguration & config, bool enable_ipv6)
 {
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
+
     nuraft::raft_params params;
     params.parallel_log_appending_ = true;
     params.heart_beat_interval_
@@ -304,6 +316,18 @@ void KeeperServer::launchRaftServer(const Poco::Util::AbstractConfiguration & co
         }
     }
 
+    params.leadership_expiry_ = getValueOrMaxInt32AndLogWarning(
+        coordination_settings->leadership_expiry_ms.totalMilliseconds(), "leadership_expiry_ms", log);
+
+    if (params.leadership_expiry_ > 0 && params.leadership_expiry_ <= params.election_timeout_lower_bound_)
+    {
+        LOG_INFO(
+            log,
+            "leadership_expiry_ is smaller than or equal to election_timeout_lower_bound_ms, which can avoid multiple leaders. "
+            "Notice that too small leadership_expiry_ may make Raft group sensitive to network status. "
+            );
+    }
+
     params.reserved_log_items_ = getValueOrMaxInt32AndLogWarning(coordination_settings->reserved_log_items, "reserved_log_items", log);
     params.snapshot_distance_ = getValueOrMaxInt32AndLogWarning(coordination_settings->snapshot_distance, "snapshot_distance", log);
 
@@ -322,7 +346,7 @@ void KeeperServer::launchRaftServer(const Poco::Util::AbstractConfiguration & co
     params.auto_forwarding_req_timeout_
         = getValueOrMaxInt32AndLogWarning(coordination_settings->operation_timeout_ms.totalMilliseconds() * 2, "operation_timeout_ms", log);
     params.max_append_size_
-        = getValueOrMaxInt32AndLogWarning(coordination_settings->max_requests_batch_size, "max_requests_batch_size", log);
+        = getValueOrMaxInt32AndLogWarning(coordination_settings->max_requests_append_size, "max_requests_append_size", log);
 
     params.return_method_ = nuraft::raft_params::async_handler;
 
@@ -417,13 +441,17 @@ void KeeperServer::startup(const Poco::Util::AbstractConfiguration & config, boo
 {
     state_machine->init();
 
+    keeper_context->setLastCommitIndex(state_machine->last_commit_index());
+
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
+
     state_manager->loadLogStore(state_machine->last_commit_index() + 1, coordination_settings->reserved_log_items);
 
     auto log_store = state_manager->load_log_store();
     last_log_idx_on_disk = log_store->next_slot() - 1;
     LOG_TRACE(log, "Last local log idx {}", last_log_idx_on_disk);
     if (state_machine->last_commit_index() >= last_log_idx_on_disk)
-        keeper_context->local_logs_preprocessed = true;
+        keeper_context->setLocalLogsPreprocessed();
 
     loadLatestConfig();
 
@@ -436,7 +464,7 @@ void KeeperServer::startup(const Poco::Util::AbstractConfiguration & config, boo
 
 void KeeperServer::shutdownRaftServer()
 {
-    size_t timeout = coordination_settings->shutdown_timeout.totalSeconds();
+    size_t timeout = keeper_context->getCoordinationSettings()->shutdown_timeout.totalSeconds();
 
     if (!raft_instance)
     {
@@ -548,6 +576,12 @@ bool KeeperServer::isLeaderAlive() const
     return raft_instance && raft_instance->is_leader_alive();
 }
 
+bool KeeperServer::isExceedingMemorySoftLimit() const
+{
+    Int64 mem_soft_limit = keeper_context->getKeeperMemorySoftLimit();
+    return mem_soft_limit > 0 && total_memory_tracker.get() >= mem_soft_limit;
+}
+
 /// TODO test whether taking failed peer in count
 uint64_t KeeperServer::getFollowerCount() const
 {
@@ -625,16 +659,16 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
         }
     }
 
-    if (!keeper_context->local_logs_preprocessed)
+    if (!keeper_context->localLogsPreprocessed())
     {
         const auto preprocess_logs = [&]
         {
             auto lock = raft_instance->lockRaft();
 
-            if (keeper_context->local_logs_preprocessed)
+            if (keeper_context->localLogsPreprocessed())
                 return;
 
-            keeper_context->local_logs_preprocessed = true;
+            keeper_context->setLocalLogsPreprocessed();
             auto log_store = state_manager->load_log_store();
             auto log_entries = log_store->log_entries(state_machine->last_commit_index() + 1, log_store->next_slot());
 
@@ -669,15 +703,32 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
                 /// until we preprocess all stored logs
                 return nuraft::cb_func::ReturnCode::ReturnNull;
             }
+            case nuraft::cb_func::ProcessReq:
+            {
+                auto & req = *static_cast<nuraft::req_msg *>(param->ctx);
+
+                if (req.get_type() != nuraft::msg_type::append_entries_request)
+                    break;
+
+                if (req.log_entries().empty())
+                    break;
+
+                /// committing/preprocessing of local logs can take some time
+                /// and we don't want election to start during that time so we
+                /// set serving requests to avoid elections on timeout
+                raft_instance->setServingRequest(true);
+                SCOPE_EXIT(raft_instance->setServingRequest(false));
+                /// maybe we got snapshot installed
+                if (state_machine->last_commit_index() >= last_log_idx_on_disk && !raft_instance->isCommitInProgress())
+                    preprocess_logs();
+                /// we don't want to append new logs if we are committing local logs
+                else if (raft_instance->get_target_committed_log_idx() >= last_log_idx_on_disk)
+                    keeper_context->waitLocalLogsPreprocessedOrShutdown();
+
+                break;
+            }
             case nuraft::cb_func::GotAppendEntryReqFromLeader:
             {
-                /// maybe we got snapshot installed
-                if (state_machine->last_commit_index() >= last_log_idx_on_disk)
-                {
-                    preprocess_logs();
-                    break;
-                }
-
                 auto & req = *static_cast<nuraft::req_msg *>(param->ctx);
 
                 if (req.log_entries().empty())
@@ -685,11 +736,6 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
 
                 if (req.get_last_log_idx() < last_log_idx_on_disk)
                     last_log_idx_on_disk = req.get_last_log_idx();
-                /// we don't want to accept too many new logs before we preprocess all the local logs
-                /// because the next log index is decreased on each failure we need to also accept requests when it's near last_log_idx_on_disk
-                /// so the counter is reset on the leader side
-                else if (raft_instance->get_target_committed_log_idx() >= last_log_idx_on_disk && req.get_last_log_idx() > last_log_idx_on_disk)
-                    return nuraft::cb_func::ReturnNull;
 
                 break;
             }
@@ -842,7 +888,7 @@ nuraft::cb_func::ReturnCode KeeperServer::callbackFunc(nuraft::cb_func::Type typ
                 /// Node first became leader, and after that some other node became leader.
                 /// BecameFresh for this node will not be called because it was already fresh
                 /// when it was leader.
-                if (leader_index < our_index + coordination_settings->fresh_log_gap)
+                if (leader_index < our_index + keeper_context->getCoordinationSettings()->fresh_log_gap)
                     set_initialized();
             }
             return nuraft::cb_func::ReturnCode::Ok;
@@ -877,7 +923,7 @@ void KeeperServer::waitInit()
 {
     std::unique_lock lock(initialized_mutex);
 
-    int64_t timeout = coordination_settings->startup_timeout.totalMilliseconds();
+    int64_t timeout = keeper_context->getCoordinationSettings()->startup_timeout.totalMilliseconds();
     if (!initialized_cv.wait_for(lock, std::chrono::milliseconds(timeout), [&] { return initialized_flag.load(); }))
         LOG_WARNING(log, "Failed to wait for RAFT initialization in {}ms, will continue in background", timeout);
 }
@@ -949,6 +995,7 @@ KeeperServer::ConfigUpdateState KeeperServer::applyConfigUpdate(
 
 ClusterUpdateActions KeeperServer::getRaftConfigurationDiff(const Poco::Util::AbstractConfiguration & config)
 {
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
     auto diff = state_manager->getRaftConfigurationDiff(config, coordination_settings);
 
     if (!diff.empty())
@@ -976,6 +1023,7 @@ void KeeperServer::applyConfigUpdateWithReconfigDisabled(const ClusterUpdateActi
         std::this_thread::sleep_for(sleep_time * (i + 1));
     };
 
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
     if (const auto * add = std::get_if<AddRaftServer>(&action))
     {
         for (size_t i = 0; i < coordination_settings->configuration_change_tries_count && !is_recovering; ++i)
@@ -1031,6 +1079,7 @@ bool KeeperServer::waitForConfigUpdateWithReconfigDisabled(const ClusterUpdateAc
     auto became_leader = [&] { LOG_INFO(log, "Became leader, aborting"); return false; };
     auto backoff = [&](size_t i) { std::this_thread::sleep_for(sleep_time * (i + 1)); };
 
+    const auto & coordination_settings = keeper_context->getCoordinationSettings();
     if (const auto* add = std::get_if<AddRaftServer>(&action))
     {
         for (size_t i = 0; i < coordination_settings->configuration_change_tries_count && !is_recovering; ++i)
@@ -1075,6 +1124,7 @@ Keeper4LWInfo KeeperServer::getPartiallyFilled4LWInfo() const
         result.follower_count = getFollowerCount();
         result.synced_follower_count = getSyncedFollowerCount();
     }
+    result.is_exceeding_mem_soft_limit = isExceedingMemorySoftLimit();
     result.total_nodes_count = getKeeperStateMachine()->getNodesCount();
     result.last_zxid = getKeeperStateMachine()->getLastProcessedZxid();
     return result;
@@ -1096,14 +1146,12 @@ KeeperLogInfo KeeperServer::getKeeperLogInfo()
     auto log_store = state_manager->load_log_store();
     if (log_store)
     {
-        log_info.first_log_idx = log_store->start_index();
-        log_info.first_log_term = log_store->term_at(log_info.first_log_idx);
+        const auto & keeper_log_storage = static_cast<const KeeperLogStore &>(*log_store);
+        keeper_log_storage.getKeeperLogInfo(log_info);
     }
 
     if (raft_instance)
     {
-        log_info.last_log_idx = raft_instance->get_last_log_idx();
-        log_info.last_log_term = raft_instance->get_last_log_term();
         log_info.last_committed_log_idx = raft_instance->get_committed_log_idx();
         log_info.leader_committed_log_idx = raft_instance->get_leader_committed_log_idx();
         log_info.target_committed_log_idx = raft_instance->get_target_committed_log_idx();
diff --git a/src/Coordination/KeeperServer.h b/src/Coordination/KeeperServer.h
index fde40d7d60f..dd54539a92b 100644
--- a/src/Coordination/KeeperServer.h
+++ b/src/Coordination/KeeperServer.h
@@ -22,8 +22,6 @@ class KeeperServer
 private:
     const int server_id;
 
-    CoordinationSettingsPtr coordination_settings;
-
     nuraft::ptr<KeeperStateMachine> state_machine;
 
     nuraft::ptr<KeeperStateManager> state_manager;
@@ -44,11 +42,11 @@ private:
     std::condition_variable initialized_cv;
     std::atomic<bool> initial_batch_committed = false;
 
-    uint64_t last_log_idx_on_disk = 0;
+    std::atomic<uint64_t> last_log_idx_on_disk = 0;
 
     nuraft::ptr<nuraft::cluster_config> last_local_config;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Callback func which is called by NuRaft on all internal events.
     /// Used to determine the moment when raft is ready to server new requests
@@ -110,6 +108,8 @@ public:
 
     bool isLeaderAlive() const;
 
+    bool isExceedingMemorySoftLimit() const;
+
     Keeper4LWInfo getPartiallyFilled4LWInfo() const;
 
     /// @return follower count if node is not leader return 0
diff --git a/src/Coordination/KeeperSnapshotManager.cpp b/src/Coordination/KeeperSnapshotManager.cpp
index fffa6eaa941..f25ccab86b1 100644
--- a/src/Coordination/KeeperSnapshotManager.cpp
+++ b/src/Coordination/KeeperSnapshotManager.cpp
@@ -1,24 +1,24 @@
+#include <filesystem>
+#include <memory>
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
+#include <Coordination/CoordinationSettings.h>
+#include <Coordination/KeeperCommon.h>
+#include <Coordination/KeeperConstants.h>
+#include <Coordination/KeeperContext.h>
 #include <Coordination/KeeperSnapshotManager.h>
 #include <Coordination/ReadBufferFromNuraftBuffer.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
+#include <Core/Field.h>
+#include <Disks/DiskLocal.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteHelpers.h>
 #include <IO/copyData.h>
-#include <Common/ZooKeeper/ZooKeeperIO.h>
-#include <filesystem>
-#include <memory>
-#include <Common/logger_useful.h>
-#include <Coordination/KeeperContext.h>
-#include <Coordination/pathUtils.h>
-#include <Coordination/KeeperConstants.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
-#include "Core/Field.h"
-#include <Disks/DiskLocal.h>
-
+#include <Common/ZooKeeper/ZooKeeperIO.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -32,23 +32,21 @@ namespace ErrorCodes
 
 namespace
 {
-    constexpr std::string_view tmp_prefix = "tmp_";
-
-    void moveFileBetweenDisks(DiskPtr disk_from, const std::string & path_from, DiskPtr disk_to, const std::string & path_to)
+    void moveSnapshotBetweenDisks(
+        DiskPtr disk_from,
+        const std::string & path_from,
+        DiskPtr disk_to,
+        const std::string & path_to,
+        const KeeperContextPtr & keeper_context)
     {
-        /// we use empty file with prefix tmp_ to detect incomplete copies
-        /// if a copy is complete we don't care from which disk we use the same file
-        /// so it's okay if a failure happens after removing of tmp file but before we remove
-        /// the snapshot from the source disk
-        auto from_path = fs::path(path_from);
-        auto tmp_snapshot_name = from_path.parent_path() / (std::string{tmp_prefix} + from_path.filename().string());
-        {
-            auto buf = disk_to->writeFile(tmp_snapshot_name);
-            buf->finalize();
-        }
-        disk_from->copyFile(from_path, *disk_to, path_to, {});
-        disk_to->removeFile(tmp_snapshot_name);
-        disk_from->removeFile(path_from);
+        moveFileBetweenDisks(
+            std::move(disk_from),
+            path_from,
+            std::move(disk_to),
+            path_to,
+            /*before_file_remove_op=*/{},
+            getLogger("KeeperSnapshotManager"),
+            keeper_context);
     }
 
     uint64_t getSnapshotPathUpToLogIdx(const String & snapshot_path)
@@ -74,33 +72,38 @@ namespace
 
         /// Serialize ACL
         writeBinary(node.acl_id, out);
-        writeBinary(node.is_sequental, out);
+        /// Write is_sequential for backwards compatibility
+        if (version < SnapshotVersion::V6)
+            writeBinary(false, out);
+
         /// Serialize stat
-        writeBinary(node.stat.czxid, out);
-        writeBinary(node.stat.mzxid, out);
-        writeBinary(node.stat.ctime, out);
-        writeBinary(node.stat.mtime, out);
-        writeBinary(node.stat.version, out);
-        writeBinary(node.stat.cversion, out);
-        writeBinary(node.stat.aversion, out);
-        writeBinary(node.stat.ephemeralOwner, out);
-        writeBinary(node.stat.dataLength, out);
-        writeBinary(node.stat.numChildren, out);
-        writeBinary(node.stat.pzxid, out);
+        writeBinary(node.czxid, out);
+        writeBinary(node.mzxid, out);
+        writeBinary(node.ctime(), out);
+        writeBinary(node.mtime, out);
+        writeBinary(node.version, out);
+        writeBinary(node.cversion, out);
+        writeBinary(node.aversion, out);
+        writeBinary(node.ephemeralOwner(), out);
+        if (version < SnapshotVersion::V6)
+            writeBinary(static_cast<int32_t>(node.data_size), out);
+        writeBinary(node.numChildren(), out);
+        writeBinary(node.pzxid, out);
 
-        writeBinary(node.seq_num, out);
+        writeBinary(node.seqNum(), out);
 
-        if (version >= SnapshotVersion::V4)
-        {
-            writeBinary(node.size_bytes, out);
-        }
+        if (version >= SnapshotVersion::V4 && version <= SnapshotVersion::V5)
+            writeBinary(node.sizeInBytes(), out);
     }
 
     void readNode(KeeperStorage::Node & node, ReadBuffer & in, SnapshotVersion version, ACLMap & acl_map)
     {
-        String new_data;
-        readBinary(new_data, in);
-        node.setData(std::move(new_data));
+        readVarUInt(node.data_size, in);
+        if (node.data_size != 0)
+        {
+            node.data = std::unique_ptr<char[]>(new char[node.data_size]);
+            in.readStrict(node.data.get(), node.data_size);
+        }
 
         if (version >= SnapshotVersion::V1)
         {
@@ -129,25 +132,48 @@ namespace
 
         acl_map.addUsage(node.acl_id);
 
-        readBinary(node.is_sequental, in);
+        if (version < SnapshotVersion::V6)
+        {
+            bool is_sequential = false;
+            readBinary(is_sequential, in);
+        }
 
         /// Deserialize stat
-        readBinary(node.stat.czxid, in);
-        readBinary(node.stat.mzxid, in);
-        readBinary(node.stat.ctime, in);
-        readBinary(node.stat.mtime, in);
-        readBinary(node.stat.version, in);
-        readBinary(node.stat.cversion, in);
-        readBinary(node.stat.aversion, in);
-        readBinary(node.stat.ephemeralOwner, in);
-        readBinary(node.stat.dataLength, in);
-        readBinary(node.stat.numChildren, in);
-        readBinary(node.stat.pzxid, in);
-        readBinary(node.seq_num, in);
+        readBinary(node.czxid, in);
+        readBinary(node.mzxid, in);
+        int64_t ctime;
+        readBinary(ctime, in);
+        node.setCtime(ctime);
+        readBinary(node.mtime, in);
+        readBinary(node.version, in);
+        readBinary(node.cversion, in);
+        readBinary(node.aversion, in);
+        int64_t ephemeral_owner = 0;
+        readBinary(ephemeral_owner, in);
+        if (ephemeral_owner != 0)
+            node.setEphemeralOwner(ephemeral_owner);
 
-        if (version >= SnapshotVersion::V4)
+        if (version < SnapshotVersion::V6)
         {
-            readBinary(node.size_bytes, in);
+            int32_t data_length = 0;
+            readBinary(data_length, in);
+        }
+        int32_t num_children = 0;
+        readBinary(num_children, in);
+        if (ephemeral_owner == 0)
+            node.setNumChildren(num_children);
+
+        readBinary(node.pzxid, in);
+
+        int32_t seq_num = 0;
+        readBinary(seq_num, in);
+        if (ephemeral_owner == 0)
+            node.setSeqNum(seq_num);
+
+        if (version >= SnapshotVersion::V4 && version <= SnapshotVersion::V5)
+        {
+            uint64_t size_bytes = 0;
+            readBinary(size_bytes, in);
         }
     }
 
@@ -227,7 +253,7 @@ void KeeperStorageSnapshot::serialize(const KeeperStorageSnapshot & snapshot, Wr
         /// Benign race condition possible while taking snapshot: NuRaft decide to create snapshot at some log id
         /// and only after some time we lock storage and enable snapshot mode. So snapshot_container_size can be
         /// slightly bigger than required.
-        if (node.stat.mzxid > snapshot.zxid)
+        if (node.mzxid > snapshot.zxid)
             break;
 
         writeBinary(path, out);
@@ -349,30 +375,36 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
     size_t snapshot_container_size;
     readBinary(snapshot_container_size, in);
 
+    storage.container.reserve(snapshot_container_size);
+
     if (recalculate_digest)
         storage.nodes_digest = 0;
 
-    const auto is_node_empty = [](const auto & node)
-    {
-        return node.getData().empty() && node.stat == Coordination::Stat{};
-    };
-
     for (size_t nodes_read = 0; nodes_read < snapshot_container_size; ++nodes_read)
     {
-        std::string path;
-        readBinary(path, in);
+        size_t path_size = 0;
+        readVarUInt(path_size, in);
+        chassert(path_size != 0);
+        auto path_data = storage.container.allocateKey(path_size);
+        in.readStrict(path_data.get(), path_size);
+        std::string_view path{path_data.get(), path_size};
+
         KeeperStorage::Node node{};
         readNode(node, in, current_version, storage.acl_map);
 
         using enum Coordination::PathMatchResult;
         auto match_result = Coordination::matchPath(path, keeper_system_path);
 
-        const std::string error_msg = fmt::format("Cannot read node on path {} from a snapshot because it is used as a system node", path);
+        const auto get_error_msg = [&]
+        {
+            return fmt::format("Cannot read node on path {} from a snapshot because it is used as a system node", path);
+        };
+
         if (match_result == IS_CHILD)
         {
             if (keeper_context->ignoreSystemPathOnStartup() || keeper_context->getServerState() != KeeperContext::Phase::INIT)
             {
-                LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
+                LOG_ERROR(getLogger("KeeperSnapshotManager"), "{}. Ignoring it", get_error_msg());
                 continue;
             }
             else
@@ -380,15 +412,15 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
                     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);
+                    get_error_msg());
         }
         else if (match_result == EXACT)
         {
-            if (!is_node_empty(node))
+            if (!node.empty())
             {
                 if (keeper_context->ignoreSystemPathOnStartup() || keeper_context->getServerState() != KeeperContext::Phase::INIT)
                 {
-                    LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "{}. Ignoring it", error_msg);
+                    LOG_ERROR(getLogger("KeeperSnapshotManager"), "{}. Ignoring it", get_error_msg());
                     node = KeeperStorage::Node{};
                 }
                 else
@@ -396,28 +428,32 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
                         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);
+                        get_error_msg());
             }
-
-            // we always ignore the written size for this node
-            node.recalculateSize();
         }
 
-        storage.container.insertOrReplace(path, node);
-        if (node.stat.ephemeralOwner != 0)
-            storage.ephemerals[node.stat.ephemeralOwner].insert(path);
+        auto ephemeral_owner = node.ephemeralOwner();
+        if (!node.isEphemeral() && node.numChildren() > 0)
+            node.getChildren().reserve(node.numChildren());
+
+        if (ephemeral_owner != 0)
+            storage.ephemerals[node.ephemeralOwner()].insert(std::string{path});
 
         if (recalculate_digest)
             storage.nodes_digest += node.getDigest(path);
+
+        storage.container.insertOrReplace(std::move(path_data), path_size, std::move(node));
     }
 
+    LOG_TRACE(getLogger("KeeperSnapshotManager"), "Building structure for children nodes");
+
     for (const auto & itr : storage.container)
     {
         if (itr.key != "/")
         {
             auto parent_path = parentNodePath(itr.key);
             storage.container.updateValue(
-                parent_path, [version, path = itr.key](KeeperStorage::Node & value) { value.addChild(getBaseNodeName(path), /*update_size*/ version < SnapshotVersion::V4); });
+                parent_path, [path = itr.key](KeeperStorage::Node & value) { value.addChild(getBaseNodeName(path)); });
         }
     }
 
@@ -425,16 +461,16 @@ void KeeperStorageSnapshot::deserialize(SnapshotDeserializationResult & deserial
     {
         if (itr.key != "/")
         {
-            if (itr.value.stat.numChildren != static_cast<int32_t>(itr.value.getChildren().size()))
+            if (itr.value.numChildren() != static_cast<int32_t>(itr.value.getChildren().size()))
             {
 #ifdef NDEBUG
                 /// TODO (alesapin) remove this, it should be always CORRUPTED_DATA.
-                LOG_ERROR(&Poco::Logger::get("KeeperSnapshotManager"), "Children counter in stat.numChildren {}"
-                            " is different from actual children size {} for node {}", itr.value.stat.numChildren, itr.value.getChildren().size(), itr.key);
+                LOG_ERROR(getLogger("KeeperSnapshotManager"), "Children counter in stat.numChildren {}"
+                            " is different from actual children size {} for node {}", itr.value.numChildren(), itr.value.getChildren().size(), itr.key);
 #else
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Children counter in stat.numChildren {}"
                                 " is different from actual children size {} for node {}",
-                                itr.value.stat.numChildren, itr.value.getChildren().size(), itr.key);
+                                itr.value.numChildren(), itr.value.getChildren().size(), itr.key);
 #endif
             }
         }
@@ -565,9 +601,9 @@ KeeperSnapshotManager::KeeperSnapshotManager(
         std::vector<std::string> snapshot_files;
         for (auto it = disk->iterateDirectory(""); it->isValid(); it->next())
         {
-            if (it->name().starts_with(tmp_prefix))
+            if (it->name().starts_with(tmp_keeper_file_prefix))
             {
-                incomplete_files.emplace(it->name().substr(tmp_prefix.size()), it->path());
+                incomplete_files.emplace(it->name().substr(tmp_keeper_file_prefix.size()), it->path());
                 continue;
             }
 
@@ -586,7 +622,7 @@ KeeperSnapshotManager::KeeperSnapshotManager(
 
             if (!inserted)
                 LOG_WARNING(
-                    &Poco::Logger::get("KeeperSnapshotManager"),
+                    log,
                     "Found another snapshots with last log idx {}, will use snapshot from disk {}",
                     snapshot_up_to,
                     disk->getName());
@@ -595,6 +631,9 @@ KeeperSnapshotManager::KeeperSnapshotManager(
         for (const auto & [name, path] : incomplete_files)
             disk->removeFile(path);
 
+        if (snapshot_files.empty())
+            LOG_TRACE(log, "No snapshots were found on {}", disk->getName());
+
         read_disks.insert(disk);
     };
 
@@ -757,7 +796,7 @@ void KeeperSnapshotManager::moveSnapshotsIfNeeded()
         {
             if (file_info.disk != latest_snapshot_disk)
             {
-                moveFileBetweenDisks(file_info.disk, file_info.path, latest_snapshot_disk, file_info.path);
+                moveSnapshotBetweenDisks(file_info.disk, file_info.path, latest_snapshot_disk, file_info.path, keeper_context);
                 file_info.disk = latest_snapshot_disk;
             }
         }
@@ -765,7 +804,7 @@ void KeeperSnapshotManager::moveSnapshotsIfNeeded()
         {
             if (file_info.disk != disk)
             {
-                moveFileBetweenDisks(file_info.disk, file_info.path, disk, file_info.path);
+                moveSnapshotBetweenDisks(file_info.disk, file_info.path, disk, file_info.path, keeper_context);
                 file_info.disk = disk;
             }
         }
@@ -823,4 +862,30 @@ SnapshotFileInfo KeeperSnapshotManager::serializeSnapshotToDisk(const KeeperStor
     return {snapshot_file_name, disk};
 }
 
+size_t KeeperSnapshotManager::getLatestSnapshotIndex() const
+{
+    if (!existing_snapshots.empty())
+        return existing_snapshots.rbegin()->first;
+    return 0;
+}
+
+SnapshotFileInfo KeeperSnapshotManager::getLatestSnapshotInfo() const
+{
+    if (!existing_snapshots.empty())
+    {
+        const auto & [path, disk] = existing_snapshots.at(getLatestSnapshotIndex());
+
+        try
+        {
+            if (disk->exists(path))
+                return {path, disk};
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log);
+        }
+    }
+    return {"", nullptr};
+}
+
 }
diff --git a/src/Coordination/KeeperSnapshotManager.h b/src/Coordination/KeeperSnapshotManager.h
index 9bb287b9276..8ba0f92a564 100644
--- a/src/Coordination/KeeperSnapshotManager.h
+++ b/src/Coordination/KeeperSnapshotManager.h
@@ -1,12 +1,6 @@
 #pragma once
-#include <filesystem>
-#include <system_error>
 #include <Coordination/KeeperStorage.h>
-#include <IO/ReadBuffer.h>
-#include <IO/WriteBuffer.h>
 #include <libnuraft/nuraft.hxx>
-#include <Coordination/KeeperContext.h>
-#include <Disks/IDisk.h>
 
 namespace DB
 {
@@ -16,6 +10,15 @@ using SnapshotMetadataPtr = std::shared_ptr<SnapshotMetadata>;
 using ClusterConfig = nuraft::cluster_config;
 using ClusterConfigPtr = nuraft::ptr<ClusterConfig>;
 
+class WriteBuffer;
+class ReadBuffer;
+
+class KeeperContext;
+using KeeperContextPtr = std::shared_ptr<KeeperContext>;
+
+class IDisk;
+using DiskPtr = std::shared_ptr<IDisk>;
+
 enum SnapshotVersion : uint8_t
 {
     V0 = 0,
@@ -24,9 +27,10 @@ enum SnapshotVersion : uint8_t
     V3 = 3, /// compress snapshots with ZSTD codec
     V4 = 4, /// add Node size to snapshots
     V5 = 5, /// add ZXID and digest to snapshots
+    V6 = 6, /// remove is_sequential, per node size, data length
 };
 
-static constexpr auto CURRENT_SNAPSHOT_VERSION = SnapshotVersion::V5;
+static constexpr auto CURRENT_SNAPSHOT_VERSION = SnapshotVersion::V6;
 
 /// What is stored in binary snapshot
 struct SnapshotDeserializationResult
@@ -94,8 +98,7 @@ struct SnapshotFileInfo
 };
 
 using KeeperStorageSnapshotPtr = std::shared_ptr<KeeperStorageSnapshot>;
-using CreateSnapshotCallback = std::function<SnapshotFileInfo(KeeperStorageSnapshotPtr &&)>;
-
+using CreateSnapshotCallback = std::function<SnapshotFileInfo(KeeperStorageSnapshotPtr &&, bool)>;
 
 using SnapshotMetaAndStorage = std::pair<SnapshotMetadataPtr, KeeperStoragePtr>;
 
@@ -138,30 +141,9 @@ public:
     size_t totalSnapshots() const { return existing_snapshots.size(); }
 
     /// The most fresh snapshot log index we have
-    size_t getLatestSnapshotIndex() const
-    {
-        if (!existing_snapshots.empty())
-            return existing_snapshots.rbegin()->first;
-        return 0;
-    }
+    size_t getLatestSnapshotIndex() const;
 
-    SnapshotFileInfo getLatestSnapshotInfo() const
-    {
-        if (!existing_snapshots.empty())
-        {
-            const auto & [path, disk] = existing_snapshots.at(getLatestSnapshotIndex());
-
-            try
-            {
-                if (disk->exists(path))
-                    return {path, disk};
-            }
-            catch (...)
-            {
-            }
-        }
-        return {"", nullptr};
-    }
+    SnapshotFileInfo getLatestSnapshotInfo() const;
 
 private:
     void removeOutdatedSnapshotsIfNeeded();
@@ -187,7 +169,7 @@ private:
 
     KeeperContextPtr keeper_context;
 
-    Poco::Logger * log = &Poco::Logger::get("KeeperSnapshotManager");
+    LoggerPtr log = getLogger("KeeperSnapshotManager");
 };
 
 /// Keeper create snapshots in background thread. KeeperStateMachine just create
diff --git a/src/Coordination/KeeperSnapshotManagerS3.cpp b/src/Coordination/KeeperSnapshotManagerS3.cpp
index 716184e07d0..b984b8ad18e 100644
--- a/src/Coordination/KeeperSnapshotManagerS3.cpp
+++ b/src/Coordination/KeeperSnapshotManagerS3.cpp
@@ -6,6 +6,8 @@
 #include <Common/Exception.h>
 #include <Common/setThreadName.h>
 
+#include <Disks/IDisk.h>
+
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/Credentials.h>
 #include <IO/WriteBufferFromS3.h>
@@ -43,7 +45,7 @@ struct KeeperSnapshotManagerS3::S3Configuration
 
 KeeperSnapshotManagerS3::KeeperSnapshotManagerS3()
     : snapshots_s3_queue(std::numeric_limits<size_t>::max())
-    , log(&Poco::Logger::get("KeeperSnapshotManagerS3"))
+    , log(getLogger("KeeperSnapshotManagerS3"))
     , uuid(UUIDHelpers::generateV4())
 {}
 
@@ -103,6 +105,7 @@ void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractCo
             .use_virtual_addressing = new_uri.is_virtual_hosted_style,
             .disable_checksum = false,
             .gcs_issue_compose_request = false,
+            .is_s3express_bucket = S3::isS3ExpressEndpoint(new_uri.endpoint),
         };
 
         auto client = S3::ClientFactory::instance().create(
@@ -119,7 +122,8 @@ void KeeperSnapshotManagerS3::updateS3Configuration(const Poco::Util::AbstractCo
                 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),
-            });
+            },
+            credentials.GetSessionToken());
 
         auto new_client = std::make_shared<KeeperSnapshotManagerS3::S3Configuration>(std::move(new_uri), std::move(auth_settings), std::move(client));
 
@@ -215,6 +219,7 @@ void KeeperSnapshotManagerS3::uploadSnapshotImpl(const SnapshotFileInfo & snapsh
         }
 
         /// To avoid reference to binding
+
         const auto & snapshot_path_ref = snapshot_path;
 
         SCOPE_EXIT(
diff --git a/src/Coordination/KeeperSnapshotManagerS3.h b/src/Coordination/KeeperSnapshotManagerS3.h
index e17cf5a1cfb..d03deb60c1a 100644
--- a/src/Coordination/KeeperSnapshotManagerS3.h
+++ b/src/Coordination/KeeperSnapshotManagerS3.h
@@ -45,7 +45,7 @@ private:
 
     std::atomic<bool> shutdown_called{false};
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     UUID uuid;
 
diff --git a/src/Coordination/KeeperStateMachine.cpp b/src/Coordination/KeeperStateMachine.cpp
index dcdd724f2bd..3dbdb329b93 100644
--- a/src/Coordination/KeeperStateMachine.cpp
+++ b/src/Coordination/KeeperStateMachine.cpp
@@ -11,6 +11,7 @@
 #include <base/errnoToString.h>
 #include <base/move_extend.h>
 #include <sys/mman.h>
+#include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
 #include <Common/ZooKeeper/ZooKeeperCommon.h>
 #include <Common/ZooKeeper/ZooKeeperIO.h>
@@ -42,24 +43,21 @@ namespace ErrorCodes
 KeeperStateMachine::KeeperStateMachine(
     ResponsesQueue & responses_queue_,
     SnapshotsQueue & snapshots_queue_,
-    const CoordinationSettingsPtr & coordination_settings_,
     const KeeperContextPtr & keeper_context_,
     KeeperSnapshotManagerS3 * snapshot_manager_s3_,
     CommitCallback commit_callback_,
     const std::string & superdigest_)
     : commit_callback(commit_callback_)
-    , coordination_settings(coordination_settings_)
     , snapshot_manager(
-          coordination_settings->snapshots_to_keep,
+          keeper_context_->getCoordinationSettings()->snapshots_to_keep,
           keeper_context_,
-          coordination_settings->compress_snapshots_with_zstd_format,
+          keeper_context_->getCoordinationSettings()->compress_snapshots_with_zstd_format,
           superdigest_,
-          coordination_settings->dead_session_check_period_ms.totalMilliseconds())
+          keeper_context_->getCoordinationSettings()->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"))
+    , min_request_size_to_cache(keeper_context_->getCoordinationSettings()->min_request_size_for_cache)
+    , log(getLogger("KeeperStateMachine"))
     , superdigest(superdigest_)
     , keeper_context(keeper_context_)
     , snapshot_manager_s3(snapshot_manager_s3_)
@@ -80,14 +78,13 @@ void KeeperStateMachine::init()
 {
     /// Do everything without mutexes, no other threads exist.
     LOG_DEBUG(log, "Totally have {} snapshots", snapshot_manager.totalSnapshots());
-    bool loaded = false;
     bool has_snapshots = snapshot_manager.totalSnapshots() != 0;
     /// Deserialize latest snapshot from disk
-    while (snapshot_manager.totalSnapshots() != 0)
-    {
-        uint64_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
-        LOG_DEBUG(log, "Trying to load state machine from snapshot up to log index {}", latest_log_index);
+    uint64_t latest_log_index = snapshot_manager.getLatestSnapshotIndex();
+    LOG_DEBUG(log, "Trying to load state machine from snapshot up to log index {}", latest_log_index);
 
+    if (has_snapshots)
+    {
         try
         {
             latest_snapshot_buf = snapshot_manager.deserializeSnapshotBufferFromDisk(latest_log_index);
@@ -100,58 +97,53 @@ void KeeperStateMachine::init()
             storage = std::move(snapshot_deserialization_result.storage);
             latest_snapshot_meta = snapshot_deserialization_result.snapshot_meta;
             cluster_config = snapshot_deserialization_result.cluster_config;
-            last_committed_idx = latest_snapshot_meta->get_last_log_idx();
-            loaded = true;
-            break;
+            keeper_context->setLastCommitIndex(latest_snapshot_meta->get_last_log_idx());
         }
-        catch (const DB::Exception & ex)
+        catch (...)
         {
-            LOG_WARNING(
+            tryLogCurrentException(
                 log,
-                "Failed to load from snapshot with index {}, with error {}, will remove it from disk",
-                latest_log_index,
-                ex.displayText());
-            snapshot_manager.removeSnapshot(latest_log_index);
+                fmt::format(
+                    "Aborting because of failure to load from latest snapshot with index {}. Problematic snapshot can be removed but it will "
+                    "lead to data loss",
+                    latest_log_index));
+            std::abort();
         }
     }
 
+    auto last_committed_idx = keeper_context->lastCommittedIndex();
     if (has_snapshots)
-    {
-        if (loaded)
-            LOG_DEBUG(log, "Loaded snapshot with last committed log index {}", last_committed_idx);
-        else
-            LOG_WARNING(log, "All snapshots broken, last committed log index {}", last_committed_idx);
-    }
+        LOG_DEBUG(log, "Loaded snapshot with last committed log index {}", last_committed_idx);
     else
-    {
         LOG_DEBUG(log, "No existing snapshots, last committed log index {}", last_committed_idx);
-    }
 
     if (!storage)
         storage = std::make_unique<KeeperStorage>(
-            coordination_settings->dead_session_check_period_ms.totalMilliseconds(), superdigest, keeper_context);
+            keeper_context->getCoordinationSettings()->dead_session_check_period_ms.totalMilliseconds(), superdigest, keeper_context);
 }
 
 namespace
 {
 
 void assertDigest(
-    const KeeperStorage::Digest & first,
-    const KeeperStorage::Digest & second,
+    const KeeperStorage::Digest & expected,
+    const KeeperStorage::Digest & actual,
     const Coordination::ZooKeeperRequest & request,
+    uint64_t log_idx,
     bool committing)
 {
-    if (!KeeperStorage::checkDigest(first, second))
+    if (!KeeperStorage::checkDigest(expected, actual))
     {
         LOG_FATAL(
-            &Poco::Logger::get("KeeperStateMachine"),
-            "Digest for nodes is not matching after {} request of type '{}'.\nExpected digest - {}, actual digest - {} (digest "
-            "{}). Keeper will terminate to avoid inconsistencies.\nExtra information about the request:\n{}",
+            getLogger("KeeperStateMachine"),
+            "Digest for nodes is not matching after {} request of type '{}' at log index {}.\nExpected digest - {}, actual digest - {} "
+            "(digest {}). Keeper will terminate to avoid inconsistencies.\nExtra information about the request:\n{}",
             committing ? "committing" : "preprocessing",
             request.getOpNum(),
-            first.value,
-            second.value,
-            first.version,
+            log_idx,
+            expected.value,
+            actual.value,
+            expected.version,
             request.toString());
         std::terminate();
     }
@@ -167,7 +159,7 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::pre_commit(uint64_t log_idx, nur
 
     /// Don't preprocess anything until the first commit when we will manually pre_commit and commit
     /// all needed logs
-    if (!keeper_context->local_logs_preprocessed)
+    if (!keeper_context->localLogsPreprocessed())
         return result;
 
     auto request_for_session = parseRequest(data, /*final=*/false);
@@ -296,12 +288,12 @@ bool KeeperStateMachine::preprocess(const KeeperStorage::RequestForSession & req
     }
     catch (...)
     {
-        tryLogCurrentException(__PRETTY_FUNCTION__, "Failed to preprocess stored log, aborting to avoid inconsistent state");
+        tryLogCurrentException(__PRETTY_FUNCTION__, fmt::format("Failed to preprocess stored log at index {}, aborting to avoid inconsistent state", request_for_session.log_idx));
         std::abort();
     }
 
     if (keeper_context->digestEnabled() && request_for_session.digest)
-        assertDigest(*request_for_session.digest, storage->getNodesDigest(false), *request_for_session.request, false);
+        assertDigest(*request_for_session.digest, storage->getNodesDigest(false), *request_for_session.request, request_for_session.log_idx, false);
 
     return true;
 }
@@ -394,8 +386,8 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, n
 
     request_for_session->log_idx = log_idx;
 
-    if (!keeper_context->local_logs_preprocessed)
-        preprocess(*request_for_session);
+    if (!keeper_context->localLogsPreprocessed() && !preprocess(*request_for_session))
+        return nullptr;
 
     auto try_push = [this](const KeeperStorage::ResponseForSession& response)
     {
@@ -408,48 +400,58 @@ nuraft::ptr<nuraft::buffer> KeeperStateMachine::commit(const uint64_t log_idx, n
         }
     };
 
-    const auto op_num = request_for_session->request->getOpNum();
-    if (op_num == Coordination::OpNum::SessionID)
+    try
     {
-        const Coordination::ZooKeeperSessionIDRequest & session_id_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;
-        response->server_id = session_id_request.server_id;
-        KeeperStorage::ResponseForSession response_for_session;
-        response_for_session.session_id = -1;
-        response_for_session.response = response;
-
-        std::lock_guard lock(storage_and_responses_lock);
-        session_id = storage->getSessionID(session_id_request.session_timeout_ms);
-        LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_id_request.session_timeout_ms);
-        response->session_id = session_id;
-        try_push(response_for_session);
-    }
-    else
-    {
-        if (op_num == Coordination::OpNum::Close)
+        const auto op_num = request_for_session->request->getOpNum();
+        if (op_num == Coordination::OpNum::SessionID)
         {
-            std::lock_guard lock(request_cache_mutex);
-            parsed_request_cache.erase(request_for_session->session_id);
+            const Coordination::ZooKeeperSessionIDRequest & session_id_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;
+            response->server_id = session_id_request.server_id;
+            KeeperStorage::ResponseForSession response_for_session;
+            response_for_session.session_id = -1;
+            response_for_session.response = response;
+
+            std::lock_guard lock(storage_and_responses_lock);
+            session_id = storage->getSessionID(session_id_request.session_timeout_ms);
+            LOG_DEBUG(log, "Session ID response {} with timeout {}", session_id, session_id_request.session_timeout_ms);
+            response->session_id = session_id;
+            try_push(response_for_session);
+        }
+        else
+        {
+            if (op_num == 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);
+            for (auto & response_for_session : responses_for_sessions)
+                try_push(response_for_session);
+
+            if (keeper_context->digestEnabled() && request_for_session->digest)
+                assertDigest(*request_for_session->digest, storage->getNodesDigest(true), *request_for_session->request, request_for_session->log_idx, true);
         }
 
-        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);
-        for (auto & response_for_session : responses_for_sessions)
-            try_push(response_for_session);
+        ProfileEvents::increment(ProfileEvents::KeeperCommits);
 
-        if (keeper_context->digestEnabled() && request_for_session->digest)
-            assertDigest(*request_for_session->digest, storage->getNodesDigest(true), *request_for_session->request, true);
+        if (commit_callback)
+            commit_callback(log_idx, *request_for_session);
+
+        keeper_context->setLastCommitIndex(log_idx);
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log, fmt::format("Failed to commit stored log at index {}", log_idx));
+        throw;
     }
 
-    ProfileEvents::increment(ProfileEvents::KeeperCommits);
-    last_committed_idx = log_idx;
-
-    if (commit_callback)
-        commit_callback(log_idx, *request_for_session);
     return nullptr;
 }
 
@@ -496,7 +498,7 @@ bool KeeperStateMachine::apply_snapshot(nuraft::snapshot & s)
     }
 
     ProfileEvents::increment(ProfileEvents::KeeperSnapshotApplys);
-    last_committed_idx = s.get_last_log_idx();
+    keeper_context->setLastCommitIndex(s.get_last_log_idx());
     return true;
 }
 
@@ -506,13 +508,13 @@ void KeeperStateMachine::commit_config(const uint64_t log_idx, nuraft::ptr<nuraf
     std::lock_guard lock(cluster_config_lock);
     auto tmp = new_conf->serialize();
     cluster_config = ClusterConfig::deserialize(*tmp);
-    last_committed_idx = log_idx;
+    keeper_context->setLastCommitIndex(log_idx);
 }
 
 void KeeperStateMachine::rollback(uint64_t log_idx, nuraft::buffer & data)
 {
     /// Don't rollback anything until the first commit because nothing was preprocessed
-    if (!keeper_context->local_logs_preprocessed)
+    if (!keeper_context->localLogsPreprocessed())
         return;
 
     auto request_for_session = parseRequest(data, true);
@@ -562,63 +564,65 @@ void KeeperStateMachine::create_snapshot(nuraft::snapshot & s, nuraft::async_res
     }
 
     /// create snapshot task for background execution (in snapshot thread)
-    snapshot_task.create_snapshot = [this, when_done](KeeperStorageSnapshotPtr && snapshot)
+    snapshot_task.create_snapshot = [this, when_done](KeeperStorageSnapshotPtr && snapshot, bool execute_only_cleanup)
     {
         nuraft::ptr<std::exception> exception(nullptr);
         bool ret = true;
-        try
+        if (!execute_only_cleanup)
         {
-            { /// Read storage data without locks and create snapshot
-                std::lock_guard lock(snapshots_lock);
+            try
+            {
+                { /// Read storage data without locks and create snapshot
+                    std::lock_guard lock(snapshots_lock);
 
-                if (latest_snapshot_meta && snapshot->snapshot_meta->get_last_log_idx() <= latest_snapshot_meta->get_last_log_idx())
-                {
-                    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(),
-                        latest_snapshot_meta->get_last_log_idx());
-                }
-                else
-                {
-                    latest_snapshot_meta = snapshot->snapshot_meta;
-                    /// we rely on the fact that the snapshot disk cannot be changed during runtime
-                    if (isLocalDisk(*keeper_context->getLatestSnapshotDisk()))
+                    if (latest_snapshot_meta && snapshot->snapshot_meta->get_last_log_idx() <= latest_snapshot_meta->get_last_log_idx())
                     {
-                        auto snapshot_info = snapshot_manager.serializeSnapshotToDisk(*snapshot);
-                        latest_snapshot_info = std::move(snapshot_info);
-                        latest_snapshot_buf = nullptr;
+                        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(),
+                            latest_snapshot_meta->get_last_log_idx());
                     }
                     else
                     {
-                        auto snapshot_buf = snapshot_manager.serializeSnapshotToBuffer(*snapshot);
-                        auto snapshot_info = snapshot_manager.serializeSnapshotBufferToDisk(*snapshot_buf, snapshot->snapshot_meta->get_last_log_idx());
-                        latest_snapshot_info = std::move(snapshot_info);
-                        latest_snapshot_buf = std::move(snapshot_buf);
-                    }
+                        latest_snapshot_meta = snapshot->snapshot_meta;
+                        /// we rely on the fact that the snapshot disk cannot be changed during runtime
+                        if (isLocalDisk(*keeper_context->getLatestSnapshotDisk()))
+                        {
+                            auto snapshot_info = snapshot_manager.serializeSnapshotToDisk(*snapshot);
+                            latest_snapshot_info = std::move(snapshot_info);
+                            latest_snapshot_buf = nullptr;
+                        }
+                        else
+                        {
+                            auto snapshot_buf = snapshot_manager.serializeSnapshotToBuffer(*snapshot);
+                            auto snapshot_info = snapshot_manager.serializeSnapshotBufferToDisk(*snapshot_buf, snapshot->snapshot_meta->get_last_log_idx());
+                            latest_snapshot_info = std::move(snapshot_info);
+                            latest_snapshot_buf = std::move(snapshot_buf);
+                        }
 
-                    ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreations);
-                    LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), latest_snapshot_info.path);
+                        ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreations);
+                        LOG_DEBUG(log, "Created persistent snapshot {} with path {}", latest_snapshot_meta->get_last_log_idx(), latest_snapshot_info.path);
+                    }
                 }
             }
-
+            catch (...)
             {
-                /// Destroy snapshot with lock
-                std::lock_guard lock(storage_and_responses_lock);
-                LOG_TRACE(log, "Clearing garbage after snapshot");
-                /// Turn off "snapshot mode" and clear outdate part of storage state
-                storage->clearGarbageAfterSnapshot();
-                LOG_TRACE(log, "Cleared garbage after snapshot");
-                snapshot.reset();
+                ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreationsFailed);
+                LOG_TRACE(log, "Exception happened during snapshot");
+                tryLogCurrentException(log);
+                ret = false;
             }
         }
-        catch (...)
         {
-            ProfileEvents::increment(ProfileEvents::KeeperSnapshotCreationsFailed);
-            LOG_TRACE(log, "Exception happened during snapshot");
-            tryLogCurrentException(log);
-            ret = false;
+            /// Destroy snapshot with lock
+            std::lock_guard lock(storage_and_responses_lock);
+            LOG_TRACE(log, "Clearing garbage after snapshot");
+            /// Turn off "snapshot mode" and clear outdate part of storage state
+            storage->clearGarbageAfterSnapshot();
+            LOG_TRACE(log, "Cleared garbage after snapshot");
+            snapshot.reset();
         }
 
         when_done(ret, exception);
@@ -626,11 +630,10 @@ void KeeperStateMachine::create_snapshot(nuraft::snapshot & s, nuraft::async_res
         return ret ? latest_snapshot_info : SnapshotFileInfo{};
     };
 
-
     if (keeper_context->getServerState() == KeeperContext::Phase::SHUTDOWN)
     {
         LOG_INFO(log, "Creating a snapshot during shutdown because 'create_snapshot_on_exit' is enabled.");
-        auto snapshot_file_info = snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+        auto snapshot_file_info = snapshot_task.create_snapshot(std::move(snapshot_task.snapshot), /*execute_only_cleanup=*/false);
 
         if (!snapshot_file_info.path.empty() && snapshot_manager_s3)
         {
@@ -679,7 +682,7 @@ void KeeperStateMachine::save_logical_snp_obj(
     }
 }
 
-static int bufferFromFile(Poco::Logger * log, const std::string & path, nuraft::ptr<nuraft::buffer> & data_out)
+static int bufferFromFile(LoggerPtr log, const std::string & path, nuraft::ptr<nuraft::buffer> & data_out)
 {
     if (path.empty() || !std::filesystem::exists(path))
     {
diff --git a/src/Coordination/KeeperStateMachine.h b/src/Coordination/KeeperStateMachine.h
index aad5d3aafd4..3727beadb98 100644
--- a/src/Coordination/KeeperStateMachine.h
+++ b/src/Coordination/KeeperStateMachine.h
@@ -25,7 +25,6 @@ public:
     KeeperStateMachine(
         ResponsesQueue & responses_queue_,
         SnapshotsQueue & snapshots_queue_,
-        const CoordinationSettingsPtr & coordination_settings_,
         const KeeperContextPtr & keeper_context_,
         KeeperSnapshotManagerS3 * snapshot_manager_s3_,
         CommitCallback commit_callback_ = {},
@@ -70,7 +69,7 @@ public:
         const KeeperStorage::RequestForSession & request_for_session,
         bool allow_missing) TSA_NO_THREAD_SAFETY_ANALYSIS;
 
-    uint64_t last_commit_index() override { return last_committed_idx; }
+    uint64_t last_commit_index() override { return keeper_context->lastCommittedIndex(); }
 
     /// Apply preliminarily saved (save_logical_snp_obj) snapshot to our state.
     bool apply_snapshot(nuraft::snapshot & s) override;
@@ -139,8 +138,6 @@ private:
     SnapshotFileInfo latest_snapshot_info;
     nuraft::ptr<nuraft::buffer> latest_snapshot_buf = nullptr;
 
-    CoordinationSettingsPtr coordination_settings;
-
     /// Main state machine logic
     KeeperStoragePtr storage TSA_PT_GUARDED_BY(storage_and_responses_lock);
 
@@ -170,10 +167,7 @@ private:
     /// 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;
-
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Cluster config for our quorum.
     /// It's a copy of config stored in StateManager, but here
diff --git a/src/Coordination/KeeperStateManager.cpp b/src/Coordination/KeeperStateManager.cpp
index efe8a0cb2bd..c30df0b6313 100644
--- a/src/Coordination/KeeperStateManager.cpp
+++ b/src/Coordination/KeeperStateManager.cpp
@@ -30,7 +30,7 @@ bool isLocalhost(const std::string & hostname)
 {
     try
     {
-        return isLocalAddress(DNSResolver::instance().resolveHost(hostname));
+        return isLocalAddress(DNSResolver::instance().resolveHostAllInOriginOrder(hostname).front());
     }
     catch (...)
     {
@@ -227,7 +227,7 @@ KeeperStateManager::KeeperStateManager(int server_id_, const std::string & host,
           keeper_context_))
     , server_state_file_name("state")
     , keeper_context(keeper_context_)
-    , logger(&Poco::Logger::get("KeeperStateManager"))
+    , logger(getLogger("KeeperStateManager"))
 {
     auto peer_config = nuraft::cs_new<nuraft::srv_config>(my_server_id, host + ":" + std::to_string(port));
     configuration_wrapper.cluster_config = nuraft::cs_new<nuraft::cluster_config>();
@@ -241,28 +241,30 @@ KeeperStateManager::KeeperStateManager(
     const std::string & config_prefix_,
     const std::string & server_state_file_name_,
     const Poco::Util::AbstractConfiguration & config,
-    const CoordinationSettingsPtr & coordination_settings,
     KeeperContextPtr keeper_context_)
     : my_server_id(my_server_id_)
     , secure(config.getBool(config_prefix_ + ".raft_configuration.secure", false))
     , config_prefix(config_prefix_)
-    , configuration_wrapper(parseServersConfiguration(config, false, coordination_settings->async_replication))
+    , configuration_wrapper(parseServersConfiguration(config, false, keeper_context_->getCoordinationSettings()->async_replication))
     , log_store(nuraft::cs_new<KeeperLogStore>(
           LogFileSettings
           {
-              .force_sync = coordination_settings->force_sync,
-              .compress_logs = coordination_settings->compress_logs,
-              .rotate_interval = coordination_settings->rotate_log_storage_interval,
-              .max_size = coordination_settings->max_log_file_size,
-              .overallocate_size = coordination_settings->log_file_overallocate_size},
+              .force_sync = keeper_context_->getCoordinationSettings()->force_sync,
+              .compress_logs = keeper_context_->getCoordinationSettings()->compress_logs,
+              .rotate_interval = keeper_context_->getCoordinationSettings()->rotate_log_storage_interval,
+              .max_size = keeper_context_->getCoordinationSettings()->max_log_file_size,
+              .overallocate_size = keeper_context_->getCoordinationSettings()->log_file_overallocate_size,
+              .latest_logs_cache_size_threshold = keeper_context_->getCoordinationSettings()->latest_logs_cache_size_threshold,
+              .commit_logs_cache_size_threshold = keeper_context_->getCoordinationSettings()->commit_logs_cache_size_threshold
+          },
           FlushSettings
           {
-              .max_flush_batch_size = coordination_settings->max_flush_batch_size,
+              .max_flush_batch_size = keeper_context_->getCoordinationSettings()->max_flush_batch_size,
           },
           keeper_context_))
     , server_state_file_name(server_state_file_name_)
     , keeper_context(keeper_context_)
-    , logger(&Poco::Logger::get("KeeperStateManager"))
+    , logger(getLogger("KeeperStateManager"))
 {
 }
 
@@ -495,7 +497,7 @@ ClusterUpdateActions KeeperStateManager::getRaftConfigurationDiff(
             if (old_endpoint != server_config->get_endpoint())
             {
                 LOG_WARNING(
-                    &Poco::Logger::get("RaftConfiguration"),
+                    getLogger("RaftConfiguration"),
                     "Config will be ignored because a server with ID {} is already present in the cluster on a different endpoint ({}). "
                     "The endpoint of the current servers should not be changed. For servers on a new endpoint, please use a new ID.",
                     new_id,
diff --git a/src/Coordination/KeeperStateManager.h b/src/Coordination/KeeperStateManager.h
index fd05261ac6c..60f6dbe7b62 100644
--- a/src/Coordination/KeeperStateManager.h
+++ b/src/Coordination/KeeperStateManager.h
@@ -23,7 +23,6 @@ public:
         const std::string & config_prefix_,
         const std::string & server_state_file_name_,
         const Poco::Util::AbstractConfiguration & config,
-        const CoordinationSettingsPtr & coordination_settings,
         KeeperContextPtr keeper_context_);
 
     /// Constructor for tests
@@ -128,7 +127,7 @@ private:
 
     KeeperContextPtr keeper_context;
 
-    Poco::Logger * logger;
+    LoggerPtr logger;
 
 public:
     /// Parse configuration from xml config.
diff --git a/src/Coordination/KeeperStorage.cpp b/src/Coordination/KeeperStorage.cpp
index 41e6f5b5e2b..a5e062a5aa6 100644
--- a/src/Coordination/KeeperStorage.cpp
+++ b/src/Coordination/KeeperStorage.cpp
@@ -18,16 +18,14 @@
 #include <Common/LockMemoryExceptionInThread.h>
 #include <Common/ProfileEvents.h>
 
-#include <Coordination/pathUtils.h>
+#include <Coordination/KeeperCommon.h>
 #include <Coordination/KeeperConstants.h>
 #include <Coordination/KeeperReconfiguration.h>
 #include <Coordination/KeeperStorage.h>
 #include <Coordination/KeeperDispatcher.h>
 
-#include <mutex>
 #include <functional>
 #include <base/defines.h>
-#include <filesystem>
 
 namespace ProfileEvents
 {
@@ -167,77 +165,214 @@ KeeperStorage::ResponsesForSessions processWatchesImpl(
 }
 
 // When this function is updated, update CURRENT_DIGEST_VERSION!!
-uint64_t calculateDigest(std::string_view path, std::string_view data, const Coordination::Stat & stat)
+uint64_t calculateDigest(std::string_view path, const KeeperStorage::Node & node)
 {
     SipHash hash;
 
     hash.update(path);
 
-    hash.update(data);
+    auto data = node.getData();
+    if (!data.empty())
+    {
+        chassert(data.data() != nullptr);
+        hash.update(data);
+    }
 
-    hash.update(stat.czxid);
-    hash.update(stat.czxid);
-    hash.update(stat.mzxid);
-    hash.update(stat.ctime);
-    hash.update(stat.mtime);
-    hash.update(stat.version);
-    hash.update(stat.cversion);
-    hash.update(stat.aversion);
-    hash.update(stat.ephemeralOwner);
-    hash.update(stat.dataLength);
-    hash.update(stat.numChildren);
-    hash.update(stat.pzxid);
+    hash.update(node.czxid);
+    hash.update(node.mzxid);
+    hash.update(node.ctime());
+    hash.update(node.mtime);
+    hash.update(node.version);
+    hash.update(node.cversion);
+    hash.update(node.aversion);
+    hash.update(node.ephemeralOwner());
+    hash.update(node.numChildren());
+    hash.update(node.pzxid);
 
-    return hash.get64();
+    auto digest = hash.get64();
+
+    /// 0 means no cached digest
+    if (digest == 0)
+        return 1;
+
+    return digest;
 }
 
 }
 
-void KeeperStorage::Node::setData(String new_data)
+KeeperStorage::Node & KeeperStorage::Node::operator=(const Node & other)
 {
-    size_bytes = size_bytes - data.size() + new_data.size();
-    data = std::move(new_data);
+    if (this == &other)
+        return *this;
+
+    czxid = other.czxid;
+    mzxid = other.mzxid;
+    pzxid = other.pzxid;
+    acl_id = other.acl_id;
+    mtime = other.mtime;
+    is_ephemeral_and_ctime = other.is_ephemeral_and_ctime;
+    ephemeral_or_children_data = other.ephemeral_or_children_data;
+    data_size = other.data_size;
+    version = other.version;
+    cversion = other.cversion;
+    aversion = other.aversion;
+
+    if (data_size != 0)
+    {
+        data = std::unique_ptr<char[]>(new char[data_size]);
+        memcpy(data.get(), other.data.get(), data_size);
+    }
+
+    children = other.children;
+
+    return *this;
 }
 
-void KeeperStorage::Node::addChild(StringRef child_path, bool update_size)
+KeeperStorage::Node::Node(const Node & other)
+{
+    *this = other;
+}
+
+KeeperStorage::Node & KeeperStorage::Node::operator=(Node && other) noexcept
+{
+    if (this == &other)
+        return *this;
+
+    czxid = other.czxid;
+    mzxid = other.mzxid;
+    pzxid = other.pzxid;
+    acl_id = other.acl_id;
+    mtime = other.mtime;
+    is_ephemeral_and_ctime = other.is_ephemeral_and_ctime;
+    ephemeral_or_children_data = other.ephemeral_or_children_data;
+    version = other.version;
+    cversion = other.cversion;
+    aversion = other.aversion;
+
+    data_size = other.data_size;
+    data = std::move(other.data);
+
+    other.data_size = 0;
+
+    static_assert(std::is_nothrow_move_assignable_v<ChildrenSet>);
+    children = std::move(other.children);
+
+    return *this;
+}
+
+KeeperStorage::Node::Node(Node && other) noexcept
+{
+    *this = std::move(other);
+}
+
+bool KeeperStorage::Node::empty() const
+{
+    return data_size == 0 && mzxid == 0;
+}
+
+void KeeperStorage::Node::copyStats(const Coordination::Stat & stat)
+{
+    czxid = stat.czxid;
+    mzxid = stat.mzxid;
+    pzxid = stat.pzxid;
+
+    mtime = stat.mtime;
+    setCtime(stat.ctime);
+
+    version = stat.version;
+    cversion = stat.cversion;
+    aversion = stat.aversion;
+
+    if (stat.ephemeralOwner == 0)
+    {
+        is_ephemeral_and_ctime.is_ephemeral = false;
+        setNumChildren(stat.numChildren);
+    }
+    else
+    {
+        setEphemeralOwner(stat.ephemeralOwner);
+    }
+}
+
+void KeeperStorage::Node::setResponseStat(Coordination::Stat & response_stat) const
+{
+    response_stat.czxid = czxid;
+    response_stat.mzxid = mzxid;
+    response_stat.ctime = ctime();
+    response_stat.mtime = mtime;
+    response_stat.version = version;
+    response_stat.cversion = cversion;
+    response_stat.aversion = aversion;
+    response_stat.ephemeralOwner = ephemeralOwner();
+    response_stat.dataLength = static_cast<int32_t>(data_size);
+    response_stat.numChildren = numChildren();
+    response_stat.pzxid = pzxid;
+
+}
+
+uint64_t KeeperStorage::Node::sizeInBytes() const
+{
+    return sizeof(Node) + children.size() * sizeof(StringRef) + data_size;
+}
+
+void KeeperStorage::Node::setData(const String & new_data)
+{
+    data_size = static_cast<uint32_t>(new_data.size());
+    if (data_size != 0)
+    {
+        data = std::unique_ptr<char[]>(new char[new_data.size()]);
+        memcpy(data.get(), new_data.data(), data_size);
+    }
+}
+
+void KeeperStorage::Node::addChild(StringRef child_path)
 {
-    if (update_size) [[likely]]
-        size_bytes += sizeof child_path;
     children.insert(child_path);
 }
 
 void KeeperStorage::Node::removeChild(StringRef child_path)
 {
-    size_bytes -= sizeof child_path;
     children.erase(child_path);
 }
 
 void KeeperStorage::Node::invalidateDigestCache() const
 {
-    cached_digest.reset();
+    cached_digest = 0;
 }
 
 UInt64 KeeperStorage::Node::getDigest(const std::string_view path) const
 {
-    if (!cached_digest)
-        cached_digest = calculateDigest(path, data, stat);
+    if (cached_digest == 0)
+        cached_digest = calculateDigest(path, *this);
 
-    return *cached_digest;
+    return cached_digest;
 };
 
 void KeeperStorage::Node::shallowCopy(const KeeperStorage::Node & other)
 {
-    stat = other.stat;
-    seq_num = other.seq_num;
-    setData(other.getData());
-    cached_digest = other.cached_digest;
-}
+    czxid = other.czxid;
+    mzxid = other.mzxid;
+    pzxid = other.pzxid;
+    acl_id = other.acl_id; /// 0 -- no ACL by default
 
-void KeeperStorage::Node::recalculateSize()
-{
-    size_bytes = sizeof(Node);
-    size_bytes += children.size() * sizeof(decltype(children)::value_type);
-    size_bytes += data.size();
+    mtime = other.mtime;
+
+    is_ephemeral_and_ctime = other.is_ephemeral_and_ctime;
+
+    ephemeral_or_children_data = other.ephemeral_or_children_data;
+
+    data_size = other.data_size;
+    if (data_size != 0)
+    {
+        data = std::unique_ptr<char[]>(new char[data_size]);
+        memcpy(data.get(), other.data.get(), data_size);
+    }
+
+    version = other.version;
+    cversion = other.cversion;
+    aversion = other.aversion;
+
+    cached_digest = other.cached_digest;
 }
 
 KeeperStorage::KeeperStorage(
@@ -268,13 +403,13 @@ void KeeperStorage::initializeSystemNodes()
 
         // update root and the digest based on it
         auto current_root_it = container.find("/");
-        assert(current_root_it != container.end());
+        chassert(current_root_it != container.end());
         removeDigest(current_root_it->value, "/");
         auto updated_root_it = container.updateValue(
             "/",
-            [](auto & node)
+            [](KeeperStorage::Node & node)
             {
-                ++node.stat.numChildren;
+                node.increaseNumChildren();
                 node.addChild(getBaseNodeName(keeper_system_path));
             }
         );
@@ -284,7 +419,7 @@ void KeeperStorage::initializeSystemNodes()
     // insert child system nodes
     for (const auto & [path, data] : keeper_context->getSystemNodesWithData())
     {
-        assert(path.starts_with(keeper_system_path));
+        chassert(path.starts_with(keeper_system_path));
         Node child_system_node;
         child_system_node.setData(data);
         auto [map_key, _] = container.insert(std::string{path}, child_system_node);
@@ -329,7 +464,7 @@ std::shared_ptr<KeeperStorage::Node> KeeperStorage::UncommittedState::tryGetNode
 
 void KeeperStorage::UncommittedState::applyDelta(const Delta & delta)
 {
-    assert(!delta.path.empty());
+    chassert(!delta.path.empty());
     if (!nodes.contains(delta.path))
     {
         if (auto storage_node = tryGetNodeFromStorage(delta.path))
@@ -345,22 +480,22 @@ void KeeperStorage::UncommittedState::applyDelta(const Delta & delta)
 
             if constexpr (std::same_as<DeltaType, CreateNodeDelta>)
             {
-                assert(!node);
+                chassert(!node);
                 node = std::make_shared<Node>();
-                node->stat = operation.stat;
+                node->copyStats(operation.stat);
                 node->setData(operation.data);
                 acls = operation.acls;
                 last_applied_zxid = delta.zxid;
             }
             else if constexpr (std::same_as<DeltaType, RemoveNodeDelta>)
             {
-                assert(node);
+                chassert(node);
                 node = nullptr;
                 last_applied_zxid = delta.zxid;
             }
             else if constexpr (std::same_as<DeltaType, UpdateNodeDelta>)
             {
-                assert(node);
+                chassert(node);
                 node->invalidateDigestCache();
                 operation.update_fn(*node);
                 last_applied_zxid = delta.zxid;
@@ -374,6 +509,40 @@ void KeeperStorage::UncommittedState::applyDelta(const Delta & delta)
         delta.operation);
 }
 
+bool KeeperStorage::UncommittedState::hasACL(int64_t session_id, bool is_local, std::function<bool(const AuthID &)> predicate) const
+{
+    const auto check_auth = [&](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;
+
+            if (predicate(*auth_ptr))
+                return true;
+        }
+        return false;
+    };
+
+    if (is_local)
+        return check_auth(storage.session_and_auth[session_id]);
+
+    if (check_auth(storage.session_and_auth[session_id]))
+        return true;
+
+    // check if there are uncommitted
+    const auto auth_it = session_and_auth.find(session_id);
+    if (auth_it == session_and_auth.end())
+        return false;
+
+    return check_auth(auth_it->second);
+}
+
 void KeeperStorage::UncommittedState::addDelta(Delta new_delta)
 {
     const auto & added_delta = deltas.emplace_back(std::move(new_delta));
@@ -398,7 +567,7 @@ void KeeperStorage::UncommittedState::addDeltas(std::vector<Delta> new_deltas)
 
 void KeeperStorage::UncommittedState::commit(int64_t commit_zxid)
 {
-    assert(deltas.empty() || deltas.front().zxid >= commit_zxid);
+    chassert(deltas.empty() || deltas.front().zxid >= commit_zxid);
 
     // collect nodes that have no further modification in the current transaction
     std::unordered_set<std::string> modified_nodes;
@@ -416,7 +585,7 @@ void KeeperStorage::UncommittedState::commit(int64_t commit_zxid)
         if (!front_delta.path.empty())
         {
             auto & path_deltas = deltas_for_path.at(front_delta.path);
-            assert(path_deltas.front() == &front_delta);
+            chassert(path_deltas.front() == &front_delta);
             path_deltas.pop_front();
             if (path_deltas.empty())
             {
@@ -434,7 +603,7 @@ void KeeperStorage::UncommittedState::commit(int64_t commit_zxid)
         else if (auto * add_auth = std::get_if<AddAuthDelta>(&front_delta.operation))
         {
             auto & uncommitted_auth = session_and_auth[add_auth->session_id];
-            assert(!uncommitted_auth.empty() && uncommitted_auth.front() == &add_auth->auth_id);
+            chassert(!uncommitted_auth.empty() && uncommitted_auth.front() == &add_auth->auth_id);
             uncommitted_auth.pop_front();
             if (uncommitted_auth.empty())
                 session_and_auth.erase(add_auth->session_id);
@@ -474,7 +643,7 @@ void KeeperStorage::UncommittedState::rollback(int64_t rollback_zxid)
         if (delta_it->zxid < rollback_zxid)
             break;
 
-        assert(delta_it->zxid == rollback_zxid);
+        chassert(delta_it->zxid == rollback_zxid);
         if (!delta_it->path.empty())
         {
             std::visit(
@@ -597,7 +766,7 @@ namespace
 [[noreturn]] void onStorageInconsistency()
 {
     LOG_ERROR(
-        &Poco::Logger::get("KeeperStorage"),
+        getLogger("KeeperStorage"),
         "Inconsistency found between uncommitted and committed data. Keeper will terminate to avoid undefined behaviour.");
     std::terminate();
 }
@@ -650,7 +819,6 @@ Coordination::Error KeeperStorage::commit(int64_t commit_zxid)
                             path,
                             std::move(operation.data),
                             operation.stat,
-                            operation.is_sequental,
                             std::move(operation.acls)))
                         onStorageInconsistency();
 
@@ -662,7 +830,7 @@ Coordination::Error KeeperStorage::commit(int64_t commit_zxid)
                     if (node_it == container.end())
                         onStorageInconsistency();
 
-                    if (operation.version != -1 && operation.version != node_it->value.stat.version)
+                    if (operation.version != -1 && operation.version != node_it->value.version)
                         onStorageInconsistency();
 
                     removeDigest(node_it->value, path);
@@ -684,7 +852,7 @@ Coordination::Error KeeperStorage::commit(int64_t commit_zxid)
                     if (node_it == container.end())
                         onStorageInconsistency();
 
-                    if (operation.version != -1 && operation.version != node_it->value.stat.aversion)
+                    if (operation.version != -1 && operation.version != node_it->value.aversion)
                         onStorageInconsistency();
 
                     acl_map.removeUsage(node_it->value.acl_id);
@@ -730,7 +898,6 @@ bool KeeperStorage::createNode(
     const std::string & path,
     String data,
     const Coordination::Stat & stat,
-    bool is_sequental,
     Coordination::ACLs node_acls)
 {
     auto parent_path = parentNodePath(path);
@@ -739,7 +906,7 @@ bool KeeperStorage::createNode(
     if (node_it == container.end())
         return false;
 
-    if (node_it->value.stat.ephemeralOwner != 0)
+    if (node_it->value.isEphemeral())
         return false;
 
     if (container.contains(path))
@@ -751,9 +918,8 @@ bool KeeperStorage::createNode(
     acl_map.addUsage(acl_id);
 
     created_node.acl_id = acl_id;
-    created_node.stat = stat;
-    created_node.setData(std::move(data));
-    created_node.is_sequental = is_sequental;
+    created_node.copyStats(stat);
+    created_node.setData(data);
     auto [map_key, _] = container.insert(path, created_node);
     /// Take child path from key owned by map.
     auto child_path = getBaseNodeName(map_key->getKey());
@@ -762,7 +928,7 @@ bool KeeperStorage::createNode(
             [child_path](KeeperStorage::Node & parent)
             {
                 parent.addChild(child_path);
-                chassert(parent.stat.numChildren == static_cast<int32_t>(parent.getChildren().size()));
+                chassert(parent.numChildren() == static_cast<int32_t>(parent.getChildren().size()));
             }
     );
 
@@ -776,21 +942,22 @@ bool KeeperStorage::removeNode(const std::string & path, int32_t version)
     if (node_it == container.end())
         return false;
 
-    if (version != -1 && version != node_it->value.stat.version)
+    if (version != -1 && version != node_it->value.version)
         return false;
 
-    if (node_it->value.stat.numChildren)
+    if (node_it->value.numChildren())
         return false;
 
-    auto prev_node = node_it->value;
-    acl_map.removeUsage(prev_node.acl_id);
+    KeeperStorage::Node prev_node;
+    prev_node.shallowCopy(node_it->value);
+    acl_map.removeUsage(node_it->value.acl_id);
 
     container.updateValue(
         parentNodePath(path),
         [child_basename = getBaseNodeName(node_it->key)](KeeperStorage::Node & parent)
         {
             parent.removeChild(child_basename);
-            chassert(parent.stat.numChildren == static_cast<int32_t>(parent.getChildren().size()));
+            chassert(parent.numChildren() == static_cast<int32_t>(parent.getChildren().size()));
         }
     );
 
@@ -878,7 +1045,7 @@ void handleSystemNodeModification(const KeeperContext & keeper_context, std::str
             "If you still want to ignore it, you can set 'keeper_server.ignore_system_path_on_startup' to true.",
             error_msg);
 
-    LOG_ERROR(&Poco::Logger::get("KeeperStorage"), fmt::runtime(error_msg));
+    LOG_ERROR(getLogger("KeeperStorage"), fmt::runtime(error_msg));
 }
 
 }
@@ -950,7 +1117,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
         if (parent_node == nullptr)
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
 
-        else if (parent_node->stat.ephemeralOwner != 0)
+        else if (parent_node->isEphemeral())
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNOCHILDRENFOREPHEMERALS}};
 
         std::string path_created = request.path;
@@ -959,7 +1126,7 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
             if (request.not_exists)
                 return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADARGUMENTS}};
 
-            auto seq_num = parent_node->seq_num;
+            auto seq_num = parent_node->seqNum();
 
             std::stringstream seq_num_str; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
             seq_num_str.exceptions(std::ios::failbit);
@@ -999,15 +1166,15 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
         auto parent_update = [parent_cversion, zxid](KeeperStorage::Node & node)
         {
             /// Increment sequential number even if node is not sequential
-            ++node.seq_num;
+            node.increaseSeqNum();
             if (parent_cversion == -1)
-                ++node.stat.cversion;
-            else if (parent_cversion > node.stat.cversion)
-                node.stat.cversion = parent_cversion;
+                ++node.cversion;
+            else if (parent_cversion > node.cversion)
+                node.cversion = parent_cversion;
 
-            if (zxid > node.stat.pzxid)
-                node.stat.pzxid = zxid;
-            ++node.stat.numChildren;
+            if (zxid > node.pzxid)
+                node.pzxid = zxid;
+            node.increaseNumChildren();
         };
 
         new_deltas.emplace_back(std::string{parent_path}, zxid, KeeperStorage::UpdateNodeDelta{std::move(parent_update)});
@@ -1022,13 +1189,12 @@ struct KeeperStorageCreateRequestProcessor final : public KeeperStorageRequestPr
         stat.version = 0;
         stat.aversion = 0;
         stat.cversion = 0;
-        stat.dataLength = static_cast<Int32>(request.data.length());
         stat.ephemeralOwner = request.is_ephemeral ? session_id : 0;
 
         new_deltas.emplace_back(
             std::move(path_created),
             zxid,
-            KeeperStorage::CreateNodeDelta{stat, request.is_sequential, std::move(node_acls), request.data});
+            KeeperStorage::CreateNodeDelta{stat, std::move(node_acls), request.data});
 
         digest = storage.calculateNodesDigest(digest, new_deltas);
         return new_deltas;
@@ -1126,8 +1292,9 @@ struct KeeperStorageGetRequestProcessor final : public KeeperStorageRequestProce
         }
         else
         {
-            response.stat = node_it->value.stat;
-            response.data = node_it->value.getData();
+            node_it->value.setResponseStat(response.stat);
+            auto data = node_it->value.getData();
+            response.data = std::string(data);
             response.error = Coordination::Error::ZOK;
         }
 
@@ -1184,8 +1351,8 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
                 {
                     [zxid](KeeperStorage::Node & parent)
                     {
-                        if (parent.stat.pzxid < zxid)
-                            parent.stat.pzxid = zxid;
+                        if (parent.pzxid < zxid)
+                            parent.pzxid = zxid;
                    }
                 }
             );
@@ -1199,9 +1366,9 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
                 update_parent_pzxid();
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
         }
-        else if (request.version != -1 && request.version != node->stat.version)
+        else if (request.version != -1 && request.version != node->version)
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
-        else if (node->stat.numChildren != 0)
+        else if (node->numChildren() != 0)
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZNOTEMPTY}};
 
         if (request.restored_from_zookeeper_log)
@@ -1212,14 +1379,14 @@ struct KeeperStorageRemoveRequestProcessor final : public KeeperStorageRequestPr
             zxid,
             KeeperStorage::UpdateNodeDelta{[](KeeperStorage::Node & parent)
                                            {
-                                               ++parent.stat.cversion;
-                                               --parent.stat.numChildren;
+                                               ++parent.cversion;
+                                               parent.decreaseNumChildren();
                                            }});
 
-        new_deltas.emplace_back(request.path, zxid, KeeperStorage::RemoveNodeDelta{request.version, node->stat.ephemeralOwner});
+        new_deltas.emplace_back(request.path, zxid, KeeperStorage::RemoveNodeDelta{request.version, node->ephemeralOwner()});
 
-        if (node->stat.ephemeralOwner != 0)
-            storage.unregisterEphemeralPath(node->stat.ephemeralOwner, request.path);
+        if (node->isEphemeral())
+            storage.unregisterEphemeralPath(node->ephemeralOwner(), request.path);
 
         digest = storage.calculateNodesDigest(digest, new_deltas);
 
@@ -1285,7 +1452,7 @@ struct KeeperStorageExistsRequestProcessor final : public KeeperStorageRequestPr
         }
         else
         {
-            response.stat = node_it->value.stat;
+            node_it->value.setResponseStat(response.stat);
             response.error = Coordination::Error::ZOK;
         }
 
@@ -1333,7 +1500,7 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
 
         auto node = storage.uncommitted_state.getNode(request.path);
 
-        if (request.version != -1 && request.version != node->stat.version)
+        if (request.version != -1 && request.version != node->version)
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
 
         new_deltas.emplace_back(
@@ -1342,10 +1509,9 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
             KeeperStorage::UpdateNodeDelta{
                 [zxid, data = request.data, time](KeeperStorage::Node & value)
                 {
-                    value.stat.version++;
-                    value.stat.mzxid = zxid;
-                    value.stat.mtime = time;
-                    value.stat.dataLength = static_cast<Int32>(data.length());
+                    value.version++;
+                    value.mzxid = zxid;
+                    value.mtime = time;
                     value.setData(data);
                 },
                 request.version});
@@ -1357,7 +1523,7 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
                 {
                     [](KeeperStorage::Node & parent)
                     {
-                        parent.stat.cversion++;
+                        parent.cversion++;
                     }
                 }
         );
@@ -1384,7 +1550,7 @@ struct KeeperStorageSetRequestProcessor final : public KeeperStorageRequestProce
         if (node_it == container.end())
             onStorageInconsistency();
 
-        response.stat = node_it->value.stat;
+        node_it->value.setResponseStat(response.stat);
         response.error = Coordination::Error::ZOK;
 
         return response_ptr;
@@ -1448,7 +1614,7 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
         {
             auto path_prefix = request.path;
             if (path_prefix.empty())
-                throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: path cannot be empty");
+                throw DB::Exception(ErrorCodes::LOGICAL_ERROR, "Path cannot be empty");
 
             const auto & children = node_it->value.getChildren();
             response.names.reserve(children.size());
@@ -1459,9 +1625,7 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
 
                 auto list_request_type = ALL;
                 if (auto * filtered_list = dynamic_cast<Coordination::ZooKeeperFilteredListRequest *>(&request))
-                {
                     list_request_type = filtered_list->list_request_type;
-                }
 
                 if (list_request_type == ALL)
                     return true;
@@ -1471,7 +1635,7 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
                 if (child_it == container.end())
                     onStorageInconsistency();
 
-                const auto is_ephemeral = child_it->value.stat.ephemeralOwner != 0;
+                const auto is_ephemeral = child_it->value.isEphemeral();
                 return (is_ephemeral && list_request_type == EPHEMERAL_ONLY) || (!is_ephemeral && list_request_type == PERSISTENT_ONLY);
             };
 
@@ -1481,7 +1645,7 @@ struct KeeperStorageListRequestProcessor final : public KeeperStorageRequestProc
                     response.names.push_back(child.toString());
             }
 
-            response.stat = node_it->value.stat;
+            node_it->value.setResponseStat(response.stat);
             response.error = Coordination::Error::ZOK;
         }
 
@@ -1524,7 +1688,7 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
         auto node = storage.uncommitted_state.getNode(request.path);
         if (check_not_exists)
         {
-            if (node && (request.version == -1 || request.version == node->stat.version))
+            if (node && (request.version == -1 || request.version == node->version))
                 return {KeeperStorage::Delta{zxid, Coordination::Error::ZNODEEXISTS}};
         }
         else
@@ -1532,7 +1696,7 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
             if (!node)
                 return {KeeperStorage::Delta{zxid, Coordination::Error::ZNONODE}};
 
-            if (request.version != -1 && request.version != node->stat.version)
+            if (request.version != -1 && request.version != node->version)
                 return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
         }
 
@@ -1568,7 +1732,7 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
 
         if (check_not_exists)
         {
-            if (node_it != container.end() && (request.version == -1 || request.version == node_it->value.stat.version))
+            if (node_it != container.end() && (request.version == -1 || request.version == node_it->value.version))
                 on_error(Coordination::Error::ZNODEEXISTS);
             else
                 response.error = Coordination::Error::ZOK;
@@ -1577,7 +1741,7 @@ struct KeeperStorageCheckRequestProcessor final : public KeeperStorageRequestPro
         {
             if (node_it == container.end())
                 on_error(Coordination::Error::ZNONODE);
-            else if (request.version != -1 && request.version != node_it->value.stat.version)
+            else if (request.version != -1 && request.version != node_it->value.version)
                 on_error(Coordination::Error::ZBADVERSION);
             else
                 response.error = Coordination::Error::ZOK;
@@ -1630,7 +1794,7 @@ struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestPr
 
         auto node = uncommitted_state.getNode(request.path);
 
-        if (request.version != -1 && request.version != node->stat.aversion)
+        if (request.version != -1 && request.version != node->aversion)
             return {KeeperStorage::Delta{zxid, Coordination::Error::ZBADVERSION}};
 
 
@@ -1650,7 +1814,7 @@ struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestPr
                 zxid,
                 KeeperStorage::UpdateNodeDelta
                 {
-                    [](KeeperStorage::Node & n) { ++n.stat.aversion; }
+                    [](KeeperStorage::Node & n) { ++n.aversion; }
                 }
             }
         };
@@ -1675,7 +1839,7 @@ struct KeeperStorageSetACLRequestProcessor final : public KeeperStorageRequestPr
         auto node_it = storage.container.find(request.path);
         if (node_it == storage.container.end())
             onStorageInconsistency();
-        response.stat = node_it->value.stat;
+        node_it->value.setResponseStat(response.stat);
         response.error = Coordination::Error::ZOK;
 
         return response_ptr;
@@ -1729,7 +1893,7 @@ struct KeeperStorageGetACLRequestProcessor final : public KeeperStorageRequestPr
         }
         else
         {
-            response.stat = node_it->value.stat;
+            node_it->value.setResponseStat(response.stat);
             response.acl = storage.acl_map.convertNumber(node_it->value.acl_id);
         }
 
@@ -1819,7 +1983,7 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
             }
         }
 
-        assert(request.requests.empty() || operation_type.has_value());
+        chassert(request.requests.empty() || operation_type.has_value());
     }
 
     std::vector<KeeperStorage::Delta>
@@ -1868,7 +2032,7 @@ struct KeeperStorageMultiRequestProcessor final : public KeeperStorageRequestPro
 
         auto & deltas = storage.uncommitted_state.deltas;
         // the deltas will have at least SubDeltaEnd or FailedMultiDelta
-        assert(!deltas.empty());
+        chassert(!deltas.empty());
         if (auto * failed_multi = std::get_if<KeeperStorage::FailedMultiDelta>(&deltas.front().operation))
         {
             for (size_t i = 0; i < concrete_requests.size(); ++i)
@@ -2068,7 +2232,7 @@ UInt64 KeeperStorage::calculateNodesDigest(UInt64 current_digest, const std::vec
                 [&](const CreateNodeDelta & create_delta)
                 {
                     auto node = std::make_shared<Node>();
-                    node->stat = create_delta.stat;
+                    node->copyStats(create_delta.stat);
                     node->setData(create_delta.data);
                     updated_nodes.emplace(delta.path, node);
                 },
@@ -2191,8 +2355,8 @@ void KeeperStorage::preprocessRequest(
                     {
                         [ephemeral_path](Node & parent)
                         {
-                            ++parent.stat.cversion;
-                            --parent.stat.numChildren;
+                            ++parent.cversion;
+                            parent.decreaseNumChildren();
                         }
                     }
                 );
@@ -2295,7 +2459,7 @@ KeeperStorage::ResponsesForSessions KeeperStorage::processRequest(
 
         if (is_local)
         {
-            assert(zk_request->isReadRequest());
+            chassert(zk_request->isReadRequest());
             if (check_acl && !request_processor->checkAuth(*this, session_id, true))
             {
                 response = zk_request->makeResponse();
@@ -2374,7 +2538,7 @@ void KeeperStorage::rollbackRequest(int64_t rollback_zxid, bool allow_missing)
     }
     catch (...)
     {
-        LOG_FATAL(&Poco::Logger::get("KeeperStorage"), "Failed to rollback log. Terminating to avoid inconsistencies");
+        LOG_FATAL(getLogger("KeeperStorage"), "Failed to rollback log. Terminating to avoid inconsistencies");
         std::terminate();
     }
 }
@@ -2524,6 +2688,17 @@ void KeeperStorage::recalculateStats()
     container.recalculateDataSize();
 }
 
+bool KeeperStorage::checkDigest(const Digest & first, const Digest & second)
+{
+    if (first.version != second.version)
+        return true;
+
+    if (first.version == DigestVersion::NO_DIGEST)
+        return true;
+
+    return first.value == second.value;
+}
+
 String KeeperStorage::generateDigest(const String & userdata)
 {
     std::vector<String> user_password;
diff --git a/src/Coordination/KeeperStorage.h b/src/Coordination/KeeperStorage.h
index ec5df74efb6..d9e67f799f8 100644
--- a/src/Coordination/KeeperStorage.h
+++ b/src/Coordination/KeeperStorage.h
@@ -5,17 +5,15 @@
 #include <Coordination/ACLMap.h>
 #include <Coordination/SessionExpiryQueue.h>
 #include <Coordination/SnapshotableHashTable.h>
-#include <IO/WriteBufferFromString.h>
-#include <Common/ConcurrentBoundedQueue.h>
-#include <Common/ZooKeeper/IKeeper.h>
-#include <Common/ZooKeeper/ZooKeeperCommon.h>
-#include <Coordination/KeeperContext.h>
 
 #include <absl/container/flat_hash_set.h>
 
 namespace DB
 {
 
+class KeeperContext;
+using KeeperContextPtr = std::shared_ptr<KeeperContext>;
+
 struct KeeperStorageRequestProcessor;
 using KeeperStorageRequestProcessorPtr = std::shared_ptr<KeeperStorageRequestProcessor>;
 using ResponseCallback = std::function<void(const Coordination::ZooKeeperResponsePtr &)>;
@@ -30,28 +28,127 @@ struct KeeperStorageSnapshot;
 class KeeperStorage
 {
 public:
+    /// Node should have as minimal size as possible to reduce memory footprint
+    /// of stored nodes
+    /// New fields should be added to the struct only if it's really necessary
     struct Node
     {
+        int64_t czxid{0};
+        int64_t mzxid{0};
+        int64_t pzxid{0};
         uint64_t acl_id = 0; /// 0 -- no ACL by default
-        bool is_sequental = false;
-        Coordination::Stat stat{};
-        int32_t seq_num = 0;
-        uint64_t size_bytes; // save size to avoid calculate every time
 
-        Node() : size_bytes(sizeof(Node)) { }
+        int64_t mtime{0};
+
+        std::unique_ptr<char[]> data{nullptr};
+        uint32_t data_size{0};
+
+        int32_t version{0};
+        int32_t cversion{0};
+        int32_t aversion{0};
+
+        mutable uint64_t cached_digest = 0;
+
+        Node() = default;
+
+        Node & operator=(const Node & other);
+        Node(const Node & other);
+
+        Node & operator=(Node && other) noexcept;
+        Node(Node && other) noexcept;
+
+        bool empty() const;
+
+        bool isEphemeral() const
+        {
+            return is_ephemeral_and_ctime.is_ephemeral;
+        }
+
+        int64_t ephemeralOwner() const
+        {
+            if (isEphemeral())
+                return ephemeral_or_children_data.ephemeral_owner;
+
+            return 0;
+        }
+
+        void setEphemeralOwner(int64_t ephemeral_owner)
+        {
+            is_ephemeral_and_ctime.is_ephemeral = ephemeral_owner != 0;
+            ephemeral_or_children_data.ephemeral_owner = ephemeral_owner;
+        }
+
+        int32_t numChildren() const
+        {
+            if (isEphemeral())
+                return 0;
+
+            return ephemeral_or_children_data.children_info.num_children;
+        }
+
+        void setNumChildren(int32_t num_children)
+        {
+            ephemeral_or_children_data.children_info.num_children = num_children;
+        }
+
+        void increaseNumChildren()
+        {
+            chassert(!isEphemeral());
+            ++ephemeral_or_children_data.children_info.num_children;
+        }
+
+        void decreaseNumChildren()
+        {
+            chassert(!isEphemeral());
+            --ephemeral_or_children_data.children_info.num_children;
+        }
+
+        int32_t seqNum() const
+        {
+            if (isEphemeral())
+                return 0;
+
+            return ephemeral_or_children_data.children_info.seq_num;
+        }
+
+        void setSeqNum(int32_t seq_num)
+        {
+            ephemeral_or_children_data.children_info.seq_num = seq_num;
+        }
+
+        void increaseSeqNum()
+        {
+            chassert(!isEphemeral());
+            ++ephemeral_or_children_data.children_info.seq_num;
+        }
+
+        int64_t ctime() const
+        {
+            return is_ephemeral_and_ctime.ctime;
+        }
+
+        void setCtime(uint64_t ctime)
+        {
+            is_ephemeral_and_ctime.ctime = ctime;
+        }
+
+        void copyStats(const Coordination::Stat & stat);
+
+        void setResponseStat(Coordination::Stat & response_stat) const;
 
         /// Object memory size
-        uint64_t sizeInBytes() const { return size_bytes; }
+        uint64_t sizeInBytes() const;
 
-        void setData(String new_data);
+        void setData(const String & new_data);
 
-        const auto & getData() const noexcept { return data; }
+        std::string_view getData() const noexcept { return {data.get(), data_size}; }
 
-        void addChild(StringRef child_path, bool update_size = true);
+        void addChild(StringRef child_path);
 
         void removeChild(StringRef child_path);
 
         const auto & getChildren() const noexcept { return children; }
+        auto & getChildren() { return children; }
 
         // Invalidate the calculated digest so it's recalculated again on the next
         // getDigest call
@@ -63,23 +160,47 @@ public:
         // copy only necessary information for preprocessing and digest calculation
         // (e.g. we don't need to copy list of children)
         void shallowCopy(const Node & other);
-
-        void recalculateSize();
-
     private:
-        String data;
+        /// as ctime can't be negative because it stores the timestamp when the
+        /// node was created, we can use the MSB for a bool
+        struct
+        {
+            bool is_ephemeral : 1;
+            int64_t ctime : 63;
+        } is_ephemeral_and_ctime{false, 0};
+
+        /// ephemeral notes cannot have children so a node can set either
+        /// ephemeral_owner OR seq_num + num_children
+        union
+        {
+            int64_t ephemeral_owner;
+            struct
+            {
+                int32_t seq_num;
+                int32_t num_children;
+            } children_info;
+        } ephemeral_or_children_data{0};
+
         ChildrenSet children{};
-        mutable std::optional<UInt64> cached_digest;
     };
 
+#if !defined(ADDRESS_SANITIZER) && !defined(MEMORY_SANITIZER)
+    static_assert(
+        sizeof(ListNode<Node>) <= 144,
+        "std::list node containing ListNode<Node> is > 160 bytes (sizeof(ListNode<Node>) + 16 bytes for pointers) which will increase "
+        "memory consumption");
+#endif
+
     enum DigestVersion : uint8_t
     {
         NO_DIGEST = 0,
         V1 = 1,
-        V2 = 2  // added system nodes that modify the digest on startup so digest from V0 is invalid
+        V2 = 2, // added system nodes that modify the digest on startup so digest from V0 is invalid
+        V3 = 3, // fixed bug with casting, removed duplicate czxid usage
+        V4 = 4  // 0 is not a valid digest value
     };
 
-    static constexpr auto CURRENT_DIGEST_VERSION = DigestVersion::V2;
+    static constexpr auto CURRENT_DIGEST_VERSION = DigestVersion::V4;
 
     struct ResponseForSession
     {
@@ -94,16 +215,7 @@ public:
         uint64_t value{0};
     };
 
-    static bool checkDigest(const Digest & first, const Digest & second)
-    {
-        if (first.version != second.version)
-            return true;
-
-        if (first.version == DigestVersion::NO_DIGEST)
-            return true;
-
-        return first.value == second.value;
-    }
+    static bool checkDigest(const Digest & first, const Digest & second);
 
     static String generateDigest(const String & userdata);
 
@@ -159,7 +271,6 @@ public:
     struct CreateNodeDelta
     {
         Coordination::Stat stat;
-        bool is_sequental;
         Coordination::ACLs acls;
         String data;
     };
@@ -233,39 +344,7 @@ public:
 
         void applyDelta(const Delta & delta);
 
-        bool hasACL(int64_t session_id, bool is_local, std::function<bool(const AuthID &)> predicate)
-        {
-            const auto check_auth = [&](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;
-
-                    if (predicate(*auth_ptr))
-                        return true;
-                }
-                return false;
-            };
-
-            if (is_local)
-                return check_auth(storage.session_and_auth[session_id]);
-
-            if (check_auth(storage.session_and_auth[session_id]))
-                return true;
-
-            // check if there are uncommitted
-            const auto auth_it = session_and_auth.find(session_id);
-            if (auth_it == session_and_auth.end())
-                return false;
-
-            return check_auth(auth_it->second);
-        }
+        bool hasACL(int64_t session_id, bool is_local, std::function<bool(const AuthID &)> predicate) const;
 
         void forEachAuthInSession(int64_t session_id, std::function<void(const AuthID &)> func) const;
 
@@ -325,7 +404,6 @@ public:
         const std::string & path,
         String data,
         const Coordination::Stat & stat,
-        bool is_sequental,
         Coordination::ACLs node_acls);
 
     // Remove node in the storage
diff --git a/src/Coordination/LoggerWrapper.h b/src/Coordination/LoggerWrapper.h
index d092a8d4440..d08c42b6868 100644
--- a/src/Coordination/LoggerWrapper.h
+++ b/src/Coordination/LoggerWrapper.h
@@ -26,7 +26,7 @@ private:
 
 public:
     LoggerWrapper(const std::string & name, LogsLevel level_)
-        : log(&Poco::Logger::get(name))
+        : log(getLogger(name))
         , level(level_)
     {
         log->setLevel(static_cast<int>(LEVELS.at(level)));
@@ -57,7 +57,7 @@ public:
     }
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<LogsLevel> level;
 };
 
diff --git a/src/Coordination/SnapshotableHashTable.h b/src/Coordination/SnapshotableHashTable.h
index 093126237ef..70858930115 100644
--- a/src/Coordination/SnapshotableHashTable.h
+++ b/src/Coordination/SnapshotableHashTable.h
@@ -1,11 +1,7 @@
 #pragma once
 #include <base/StringRef.h>
 #include <Common/HashTable/HashMap.h>
-#include <Common/ArenaWithFreeLists.h>
 #include <Common/ArenaUtils.h>
-#include <unordered_map>
-#include <list>
-#include <atomic>
 
 
 namespace DB
@@ -17,16 +13,65 @@ struct ListNode
     StringRef key;
     V value;
 
-    /// Monotonically increasing version info for snapshot
-    size_t version{0};
-    bool active_in_map{true};
-    bool free_key{false};
+    struct
+    {
+        bool active_in_map : 1;
+        bool free_key : 1;
+        uint64_t version : 62;
+    } node_metadata{false, false, 0};
+
+    void setInactiveInMap()
+    {
+        node_metadata.active_in_map = false;
+    }
+
+    void setActiveInMap()
+    {
+        node_metadata.active_in_map = true;
+    }
+
+    bool isActiveInMap()
+    {
+        return node_metadata.active_in_map;
+    }
+
+    void setFreeKey()
+    {
+        node_metadata.free_key = true;
+    }
+
+    bool getFreeKey()
+    {
+        return node_metadata.free_key;
+    }
+
+    uint64_t getVersion()
+    {
+        return node_metadata.version;
+    }
+
+    void setVersion(uint64_t version)
+    {
+        node_metadata.version = version;
+    }
 };
 
 template <class V>
 class SnapshotableHashTable
 {
 private:
+    struct GlobalArena
+    {
+        char * alloc(const size_t size)
+        {
+            return new char[size];
+        }
+
+        void free(const char * ptr, size_t /*size*/)
+        {
+            delete [] ptr;
+        }
+    };
 
     using ListElem = ListNode<V>;
     using List = std::list<ListElem>;
@@ -39,7 +84,12 @@ private:
     /// Allows to avoid additional copies in updateValue function
     size_t current_version{0};
     size_t snapshot_up_to_version{0};
-    ArenaWithFreeLists arena;
+
+    /// Arena used for keys
+    /// we don't use std::string because it uses 24 bytes (because of SSO)
+    /// we want to always allocate the key on heap and use StringRef to it
+    GlobalArena arena;
+
     /// Collect invalid iterators to avoid traversing the whole list
     std::vector<Mapped> snapshot_invalid_iters;
 
@@ -119,12 +169,60 @@ private:
         }
     }
 
+    void insertOrReplace(StringRef key, V value, bool owns_key)
+    {
+        size_t hash_value = map.hash(key);
+        auto new_value_size = value.sizeInBytes();
+        auto it = map.find(key, hash_value);
+        uint64_t old_value_size = it == map.end() ? 0 : it->getMapped()->value.sizeInBytes();
+
+        if (it == map.end())
+        {
+            auto list_key = owns_key ? key : copyStringInArena(arena, key);
+            ListElem elem{list_key, std::move(value)};
+            elem.setVersion(current_version);
+            auto itr = list.insert(list.end(), std::move(elem));
+            bool inserted;
+            map.emplace(itr->key, it, inserted, hash_value);
+            itr->setActiveInMap();
+            chassert(inserted);
+            it->getMapped() = itr;
+        }
+        else
+        {
+            if (owns_key)
+                arena.free(key.data, key.size);
+
+            auto list_itr = it->getMapped();
+            if (snapshot_mode)
+            {
+                ListElem elem{list_itr->key, std::move(value)};
+                elem.setVersion(current_version);
+                list_itr->setInactiveInMap();
+                auto new_list_itr = list.insert(list.end(), std::move(elem));
+                it->getMapped() = new_list_itr;
+                snapshot_invalid_iters.push_back(list_itr);
+            }
+            else
+            {
+                list_itr->value = std::move(value);
+            }
+        }
+        updateDataSize(INSERT_OR_REPLACE, key.size, new_value_size, old_value_size, !snapshot_mode);
+    }
+
+
 public:
 
     using iterator = typename List::iterator;
     using const_iterator = typename List::const_iterator;
     using ValueUpdater = std::function<void(V & value)>;
 
+    ~SnapshotableHashTable()
+    {
+        clear();
+    }
+
     std::pair<typename IndexMap::LookupResult, bool> insert(const std::string & key, const V & value)
     {
         size_t hash_value = map.hash(key);
@@ -132,11 +230,13 @@ public:
 
         if (!it)
         {
-            ListElem elem{copyStringInArena(arena, key), value, current_version};
+            ListElem elem{copyStringInArena(arena, key), value};
+            elem.setVersion(current_version);
             auto itr = list.insert(list.end(), std::move(elem));
             bool inserted;
             map.emplace(itr->key, it, inserted, hash_value);
-            assert(inserted);
+            itr->setActiveInMap();
+            chassert(inserted);
 
             it->getMapped() = itr;
             updateDataSize(INSERT, key.size(), value.sizeInBytes(), 0);
@@ -146,38 +246,39 @@ public:
         return std::make_pair(it, false);
     }
 
-    void insertOrReplace(const std::string & key, const V & value)
+    void reserve(size_t node_num)
     {
-        size_t hash_value = map.hash(key);
-        auto it = map.find(key, hash_value);
-        uint64_t old_value_size = it == map.end() ? 0 : it->getMapped()->value.sizeInBytes();
+        map.reserve(node_num);
+    }
 
-        if (it == map.end())
+    void insertOrReplace(const std::string & key, V value)
+    {
+        insertOrReplace(key, std::move(value), /*owns_key*/ false);
+    }
+
+    struct KeyDeleter
+    {
+        void operator()(const char * key)
         {
-            ListElem elem{copyStringInArena(arena, key), value, current_version};
-            auto itr = list.insert(list.end(), std::move(elem));
-            bool inserted;
-            map.emplace(itr->key, it, inserted, hash_value);
-            assert(inserted);
-            it->getMapped() = itr;
+            if (key)
+                arena->free(key, size);
         }
-        else
-        {
-            auto list_itr = it->getMapped();
-            if (snapshot_mode)
-            {
-                ListElem elem{list_itr->key, value, current_version};
-                list_itr->active_in_map = false;
-                auto new_list_itr = list.insert(list.end(), std::move(elem));
-                it->getMapped() = new_list_itr;
-                snapshot_invalid_iters.push_back(list_itr);
-            }
-            else
-            {
-                list_itr->value = value;
-            }
-        }
-        updateDataSize(INSERT_OR_REPLACE, key.size(), value.sizeInBytes(), old_value_size, !snapshot_mode);
+
+        size_t size;
+        GlobalArena * arena;
+    };
+
+    using KeyPtr = std::unique_ptr<char[], KeyDeleter>;
+
+    KeyPtr allocateKey(size_t size)
+    {
+        return KeyPtr{new char[size], KeyDeleter{size, &arena}};
+    }
+
+    void insertOrReplace(KeyPtr key_data, size_t key_size, V value)
+    {
+        StringRef key{key_data.release(), key_size};
+        insertOrReplace(key, std::move(value), /*owns_key*/ true);
     }
 
     bool erase(const std::string & key)
@@ -190,9 +291,9 @@ public:
         uint64_t old_data_size = list_itr->value.sizeInBytes();
         if (snapshot_mode)
         {
-            list_itr->active_in_map = false;
+            list_itr->setInactiveInMap();
             snapshot_invalid_iters.push_back(list_itr);
-            list_itr->free_key = true;
+            list_itr->setFreeKey();
             map.erase(it->getKey());
         }
         else
@@ -215,7 +316,7 @@ public:
     {
         size_t hash_value = map.hash(key);
         auto it = map.find(key, hash_value);
-        assert(it != map.end());
+        chassert(it != map.end());
 
         auto list_itr = it->getMapped();
         uint64_t old_value_size = list_itr->value.sizeInBytes();
@@ -228,13 +329,14 @@ public:
             /// We in snapshot mode but updating some node which is already more
             /// fresh than snapshot distance. So it will not participate in
             /// snapshot and we don't need to copy it.
-            if (list_itr->version <= snapshot_up_to_version)
+            if (list_itr->getVersion() <= snapshot_up_to_version)
             {
                 auto elem_copy = *(list_itr);
-                list_itr->active_in_map = false;
+                list_itr->setInactiveInMap();
                 snapshot_invalid_iters.push_back(list_itr);
                 updater(elem_copy.value);
-                elem_copy.version = current_version;
+
+                elem_copy.setVersion(current_version);
                 auto itr = list.insert(list.end(), std::move(elem_copy));
                 it->getMapped() = itr;
                 ret = itr;
@@ -269,17 +371,17 @@ public:
     const V & getValue(StringRef key) const
     {
         auto it = map.find(key);
-        assert(it);
+        chassert(it);
         return it->getMapped()->value;
     }
 
     void clearOutdatedNodes()
     {
-        for (auto & itr: snapshot_invalid_iters)
+        for (auto & itr : snapshot_invalid_iters)
         {
-            assert(!itr->active_in_map);
+            chassert(!itr->isActiveInMap());
             updateDataSize(CLEAR_OUTDATED_NODES, itr->key.size, itr->value.sizeInBytes(), 0);
-            if (itr->free_key)
+            if (itr->getFreeKey())
                 arena.free(const_cast<char *>(itr->key.data), itr->key.size);
             list.erase(itr);
         }
@@ -288,6 +390,7 @@ public:
 
     void clear()
     {
+        clearOutdatedNodes();
         map.clear();
         for (auto itr = list.begin(); itr != list.end(); ++itr)
             arena.free(const_cast<char *>(itr->key.data), itr->key.size);
@@ -327,13 +430,12 @@ public:
         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(); }
+    uint64_t keyArenaSize() const { return 0; }
 
     iterator begin() { return list.begin(); }
     const_iterator begin() const { return list.cbegin(); }
diff --git a/src/Coordination/Standalone/Context.cpp b/src/Coordination/Standalone/Context.cpp
index 374610769c4..1095a11566f 100644
--- a/src/Coordination/Standalone/Context.cpp
+++ b/src/Coordination/Standalone/Context.cpp
@@ -44,12 +44,78 @@ struct ContextSharedPart : boost::noncopyable
         : macros(std::make_unique<Macros>())
     {}
 
+    ~ContextSharedPart()
+    {
+        if (keeper_dispatcher)
+        {
+            try
+            {
+                keeper_dispatcher->shutdown();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        /// Wait for thread pool for background reads and writes,
+        /// since it may use per-user MemoryTracker which will be destroyed here.
+        if (asynchronous_remote_fs_reader)
+        {
+            try
+            {
+                asynchronous_remote_fs_reader->wait();
+                asynchronous_remote_fs_reader.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        if (asynchronous_local_fs_reader)
+        {
+            try
+            {
+                asynchronous_local_fs_reader->wait();
+                asynchronous_local_fs_reader.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        if (synchronous_local_fs_reader)
+        {
+            try
+            {
+                synchronous_local_fs_reader->wait();
+                synchronous_local_fs_reader.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+
+        if (threadpool_writer)
+        {
+            try
+            {
+                threadpool_writer->wait();
+                threadpool_writer.reset();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+    }
+
     /// For access of most of shared objects.
     mutable SharedMutex mutex;
 
-    mutable std::mutex keeper_dispatcher_mutex;
-    mutable std::shared_ptr<KeeperDispatcher> keeper_dispatcher TSA_GUARDED_BY(keeper_dispatcher_mutex);
-
     ServerSettings server_settings;
 
     String path;                                            /// Path to the data directory, with a slash at the end.
@@ -77,6 +143,10 @@ struct ContextSharedPart : boost::noncopyable
 
     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 std::mutex keeper_dispatcher_mutex;
+    mutable std::shared_ptr<KeeperDispatcher> keeper_dispatcher TSA_GUARDED_BY(keeper_dispatcher_mutex);
+
 };
 
 ContextData::ContextData() = default;
@@ -374,7 +444,7 @@ void Context::updateKeeperConfiguration([[maybe_unused]] const Poco::Util::Abstr
     if (!shared->keeper_dispatcher)
         return;
 
-    shared->keeper_dispatcher->updateConfiguration(getConfigRef(), getMacros());
+    shared->keeper_dispatcher->updateConfiguration(config_, getMacros());
 }
 
 std::shared_ptr<zkutil::ZooKeeper> Context::getZooKeeper() const
@@ -382,4 +452,9 @@ std::shared_ptr<zkutil::ZooKeeper> Context::getZooKeeper() const
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot connect to ZooKeeper from Keeper");
 }
 
+const ServerSettings & Context::getServerSettings() const
+{
+    return shared->server_settings;
+}
+
 }
diff --git a/src/Coordination/Standalone/Context.h b/src/Coordination/Standalone/Context.h
index a6199864422..adb9111185f 100644
--- a/src/Coordination/Standalone/Context.h
+++ b/src/Coordination/Standalone/Context.h
@@ -11,10 +11,11 @@
 #include <Disks/IO/getThreadPoolReader.h>
 
 #include <Core/Settings.h>
+#include <Core/ServerSettings.h>
 #include <Core/BackgroundSchedulePool.h>
 
 #include <IO/AsyncReadCounters.h>
-#include <IO/IResourceManager.h>
+#include <Common/Scheduler/IResourceManager.h>
 
 #include <Poco/Util/Application.h>
 
@@ -160,6 +161,8 @@ public:
     void updateKeeperConfiguration(const Poco::Util::AbstractConfiguration & config);
 
     zkutil::ZooKeeperPtr getZooKeeper() const;
+
+    const ServerSettings & getServerSettings() const;
 };
 
 }
diff --git a/src/Coordination/WriteBufferFromNuraftBuffer.h b/src/Coordination/WriteBufferFromNuraftBuffer.h
index c9ca1e2a227..61b8632631a 100644
--- a/src/Coordination/WriteBufferFromNuraftBuffer.h
+++ b/src/Coordination/WriteBufferFromNuraftBuffer.h
@@ -16,7 +16,7 @@ public:
     ~WriteBufferFromNuraftBuffer() override;
 
 private:
-    void finalizeImpl() override final;
+    void finalizeImpl() final;
 
     void nextImpl() override;
 
diff --git a/src/Coordination/ZooKeeperDataReader.cpp b/src/Coordination/ZooKeeperDataReader.cpp
index 3c1550f08c8..c205db942b9 100644
--- a/src/Coordination/ZooKeeperDataReader.cpp
+++ b/src/Coordination/ZooKeeperDataReader.cpp
@@ -8,7 +8,7 @@
 #include <Common/ZooKeeper/ZooKeeperIO.h>
 #include <Common/logger_useful.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Coordination/pathUtils.h>
+#include <Coordination/KeeperCommon.h>
 
 
 namespace DB
@@ -90,7 +90,7 @@ void deserializeACLMap(KeeperStorage & storage, ReadBuffer & in)
     }
 }
 
-int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, Poco::Logger * log)
+int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, LoggerPtr log)
 {
     int64_t max_zxid = 0;
     std::string path;
@@ -101,31 +101,37 @@ int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, Poco::L
         KeeperStorage::Node node{};
         String data;
         Coordination::read(data, in);
-        node.setData(std::move(data));
+        node.setData(data);
         Coordination::read(node.acl_id, in);
 
         /// Deserialize stat
-        Coordination::read(node.stat.czxid, in);
-        Coordination::read(node.stat.mzxid, in);
+        Coordination::read(node.czxid, in);
+        Coordination::read(node.mzxid, in);
         /// For some reason ZXID specified in filename can be smaller
         /// then actual zxid from nodes. In this case we will use zxid from nodes.
-        max_zxid = std::max(max_zxid, node.stat.mzxid);
+        max_zxid = std::max(max_zxid, node.mzxid);
 
-        Coordination::read(node.stat.ctime, in);
-        Coordination::read(node.stat.mtime, in);
-        Coordination::read(node.stat.version, in);
-        Coordination::read(node.stat.cversion, in);
-        Coordination::read(node.stat.aversion, in);
-        Coordination::read(node.stat.ephemeralOwner, in);
-        Coordination::read(node.stat.pzxid, in);
+        int64_t ctime;
+        Coordination::read(ctime, in);
+        node.setCtime(ctime);
+        Coordination::read(node.mtime, in);
+        Coordination::read(node.version, in);
+        Coordination::read(node.cversion, in);
+        Coordination::read(node.aversion, in);
+        int64_t ephemeral_owner;
+        Coordination::read(ephemeral_owner, in);
+        if (ephemeral_owner != 0)
+            node.setEphemeralOwner(ephemeral_owner);
+        Coordination::read(node.pzxid, in);
         if (!path.empty())
         {
-            node.stat.dataLength = static_cast<Int32>(node.getData().length());
-            node.seq_num = node.stat.cversion;
+            if (ephemeral_owner == 0)
+                node.setSeqNum(node.cversion);
+
             storage.container.insertOrReplace(path, node);
 
-            if (node.stat.ephemeralOwner != 0)
-                storage.ephemerals[node.stat.ephemeralOwner].insert(path);
+            if (ephemeral_owner != 0)
+                storage.ephemerals[ephemeral_owner].insert(path);
 
             storage.acl_map.addUsage(node.acl_id);
         }
@@ -140,14 +146,14 @@ int64_t deserializeStorageData(KeeperStorage & storage, ReadBuffer & in, Poco::L
         if (itr.key != "/")
         {
             auto parent_path = parentNodePath(itr.key);
-            storage.container.updateValue(parent_path, [my_path = itr.key] (KeeperStorage::Node & value) { value.addChild(getBaseNodeName(my_path)); ++value.stat.numChildren; });
+            storage.container.updateValue(parent_path, [my_path = itr.key] (KeeperStorage::Node & value) { value.addChild(getBaseNodeName(my_path)); value.increaseNumChildren(); });
         }
     }
 
     return max_zxid;
 }
 
-void deserializeKeeperStorageFromSnapshot(KeeperStorage & storage, const std::string & snapshot_path, Poco::Logger * log)
+void deserializeKeeperStorageFromSnapshot(KeeperStorage & storage, const std::string & snapshot_path, LoggerPtr log)
 {
     LOG_INFO(log, "Deserializing storage snapshot {}", snapshot_path);
     int64_t zxid = getZxidFromName(snapshot_path);
@@ -186,7 +192,7 @@ void deserializeKeeperStorageFromSnapshot(KeeperStorage & storage, const std::st
     LOG_INFO(log, "Finished, snapshot ZXID {}", storage.zxid);
 }
 
-void deserializeKeeperStorageFromSnapshotsDir(KeeperStorage & storage, const std::string & path, Poco::Logger * log)
+void deserializeKeeperStorageFromSnapshotsDir(KeeperStorage & storage, const std::string & path, LoggerPtr log)
 {
     namespace fs = std::filesystem;
     std::map<int64_t, std::string> existing_snapshots;
@@ -474,7 +480,7 @@ bool hasErrorsInMultiRequest(Coordination::ZooKeeperRequestPtr request)
 
 }
 
-bool deserializeTxn(KeeperStorage & storage, ReadBuffer & in, Poco::Logger * /*log*/)
+bool deserializeTxn(KeeperStorage & storage, ReadBuffer & in, LoggerPtr /*log*/)
 {
     int64_t checksum;
     Coordination::read(checksum, in);
@@ -529,7 +535,7 @@ bool deserializeTxn(KeeperStorage & storage, ReadBuffer & in, Poco::Logger * /*l
     return true;
 }
 
-void deserializeLogAndApplyToStorage(KeeperStorage & storage, const std::string & log_path, Poco::Logger * log)
+void deserializeLogAndApplyToStorage(KeeperStorage & storage, const std::string & log_path, LoggerPtr log)
 {
     ReadBufferFromFile reader(log_path);
 
@@ -553,7 +559,7 @@ void deserializeLogAndApplyToStorage(KeeperStorage & storage, const std::string
     LOG_INFO(log, "Finished {} deserialization, totally read {} records", log_path, counter);
 }
 
-void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string & path, Poco::Logger * log)
+void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string & path, LoggerPtr log)
 {
     namespace fs = std::filesystem;
     std::map<int64_t, std::string> existing_logs;
diff --git a/src/Coordination/ZooKeeperDataReader.h b/src/Coordination/ZooKeeperDataReader.h
index 8fd86ba99e2..648dc95adcf 100644
--- a/src/Coordination/ZooKeeperDataReader.h
+++ b/src/Coordination/ZooKeeperDataReader.h
@@ -5,12 +5,12 @@
 namespace DB
 {
 
-void deserializeKeeperStorageFromSnapshot(KeeperStorage & storage, const std::string & snapshot_path, Poco::Logger * log);
+void deserializeKeeperStorageFromSnapshot(KeeperStorage & storage, const std::string & snapshot_path, LoggerPtr log);
 
-void deserializeKeeperStorageFromSnapshotsDir(KeeperStorage & storage, const std::string & path, Poco::Logger * log);
+void deserializeKeeperStorageFromSnapshotsDir(KeeperStorage & storage, const std::string & path, LoggerPtr log);
 
-void deserializeLogAndApplyToStorage(KeeperStorage & storage, const std::string & log_path, Poco::Logger * log);
+void deserializeLogAndApplyToStorage(KeeperStorage & storage, const std::string & log_path, LoggerPtr log);
 
-void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string & path, Poco::Logger * log);
+void deserializeLogsAndApplyToStorage(KeeperStorage & storage, const std::string & path, LoggerPtr log);
 
 }
diff --git a/src/Coordination/pathUtils.cpp b/src/Coordination/pathUtils.cpp
deleted file mode 100644
index 25f8e25cf06..00000000000
--- a/src/Coordination/pathUtils.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <Coordination/pathUtils.h>
-
-namespace DB
-{
-
-static size_t findLastSlash(StringRef path)
-{
-    if (path.size == 0)
-        return std::string::npos;
-
-    for (size_t i = path.size - 1; i > 0; --i)
-    {
-        if (path.data[i] == '/')
-            return i;
-    }
-
-    if (path.data[0] == '/')
-        return 0;
-
-    return std::string::npos;
-}
-
-StringRef parentNodePath(StringRef path)
-{
-    auto rslash_pos = findLastSlash(path);
-    if (rslash_pos > 0)
-        return StringRef{path.data, rslash_pos};
-    return "/";
-}
-
-StringRef getBaseNodeName(StringRef path)
-{
-    size_t basename_start = findLastSlash(path);
-    return StringRef{path.data + basename_start + 1, path.size - basename_start - 1};
-}
-
-}
diff --git a/src/Coordination/pathUtils.h b/src/Coordination/pathUtils.h
deleted file mode 100644
index b2b79b14110..00000000000
--- a/src/Coordination/pathUtils.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-#include <string>
-#include <base/StringRef.h>
-
-namespace DB
-{
-
-StringRef parentNodePath(StringRef path);
-
-StringRef getBaseNodeName(StringRef path);
-
-}
diff --git a/src/Coordination/tests/gtest_coordination.cpp b/src/Coordination/tests/gtest_coordination.cpp
index dd19f0b9967..d314757efc9 100644
--- a/src/Coordination/tests/gtest_coordination.cpp
+++ b/src/Coordination/tests/gtest_coordination.cpp
@@ -1,8 +1,6 @@
 #include <chrono>
 #include <gtest/gtest.h>
-#include "Common/ZooKeeper/IKeeper.h"
 
-#include "Core/Defines.h"
 #include "config.h"
 
 #if USE_NURAFT
@@ -22,7 +20,7 @@
 #include <Coordination/ReadBufferFromNuraftBuffer.h>
 #include <Coordination/SummingStateMachine.h>
 #include <Coordination/WriteBufferFromNuraftBuffer.h>
-#include <Coordination/pathUtils.h>
+#include <Coordination/KeeperCommon.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteHelpers.h>
 #include <libnuraft/nuraft.hxx>
@@ -45,10 +43,7 @@ struct ChangelogDirTest
     bool drop;
     explicit ChangelogDirTest(std::string path_, bool drop_ = true) : path(path_), drop(drop_)
     {
-        if (fs::exists(path))
-        {
-            EXPECT_TRUE(false) << "Path " << path << " already exists, remove it to run test";
-        }
+        EXPECT_FALSE(fs::exists(path)) << "Path " << path << " already exists, remove it to run test";
         fs::create_directory(path);
     }
 
@@ -68,8 +63,8 @@ struct CompressionParam
 class CoordinationTest : public ::testing::TestWithParam<CompressionParam>
 {
 protected:
-    DB::KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true);
-    Poco::Logger * log{&Poco::Logger::get("CoordinationTest")};
+    DB::KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true, std::make_shared<DB::CoordinationSettings>());
+    LoggerPtr log{getLogger("CoordinationTest")};
 
     void SetUp() override
     {
@@ -77,7 +72,7 @@ protected:
         Poco::Logger::root().setChannel(channel);
         Poco::Logger::root().setLevel("trace");
 
-        keeper_context->local_logs_preprocessed = true;
+        keeper_context->setLocalLogsPreprocessed();
     }
 
     void setLogDirectory(const std::string & path) { keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", path)); }
@@ -561,6 +556,7 @@ TEST_P(CoordinationTest, ChangelogTestCompaction)
 
     EXPECT_EQ(changelog.size(), 3);
 
+    keeper_context->setLastCommitIndex(2);
     changelog.compact(2);
 
     EXPECT_EQ(changelog.size(), 1);
@@ -585,6 +581,7 @@ TEST_P(CoordinationTest, ChangelogTestCompaction)
     EXPECT_TRUE(fs::exists("./logs/changelog_1_5.bin" + params.extension));
     EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
 
+    keeper_context->setLastCommitIndex(6);
     changelog.compact(6);
     std::this_thread::sleep_for(std::chrono::microseconds(1000));
 
@@ -952,12 +949,12 @@ TEST_P(CoordinationTest, ChangelogTestStartNewLogAfterRead)
 
 namespace
 {
-void assertBrokenLogRemoved(const fs::path & log_folder, const fs::path & filename)
+void assertBrokenFileRemoved(const fs::path & directory, const fs::path & filename)
 {
-    EXPECT_FALSE(fs::exists(log_folder / filename));
-    // broken logs are sent to the detached/{timestamp} folder
+    EXPECT_FALSE(fs::exists(directory / filename));
+    // broken files are sent to the detached/{timestamp} folder
     // we don't know timestamp so we iterate all of them
-    for (const auto & dir_entry : fs::recursive_directory_iterator(log_folder / "detached"))
+    for (const auto & dir_entry : fs::recursive_directory_iterator(directory / "detached"))
     {
         if (dir_entry.path().filename() == filename)
             return;
@@ -1017,10 +1014,10 @@ TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
     EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    assertBrokenLogRemoved(log_folder, "changelog_16_20.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_21_25.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_26_30.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_31_35.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_16_20.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_21_25.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_26_30.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_31_35.bin" + params.extension);
 
     auto entry = getLogEntry("h", 7777);
     changelog_reader.append(entry);
@@ -1034,10 +1031,10 @@ TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate)
     EXPECT_TRUE(fs::exists("./logs/changelog_6_10.bin" + params.extension));
     EXPECT_TRUE(fs::exists("./logs/changelog_11_15.bin" + params.extension));
 
-    assertBrokenLogRemoved(log_folder, "changelog_16_20.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_21_25.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_26_30.bin" + params.extension);
-    assertBrokenLogRemoved(log_folder, "changelog_31_35.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_16_20.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_21_25.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_26_30.bin" + params.extension);
+    assertBrokenFileRemoved(log_folder, "changelog_31_35.bin" + params.extension);
 
     DB::KeeperLogStore changelog_reader2(
         DB::LogFileSettings{.force_sync = true, .compress_logs = params.enable_compression, .rotate_interval = 5},
@@ -1084,7 +1081,7 @@ TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
 
     EXPECT_EQ(changelog_reader.size(), 0);
     EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin" + params.extension));
-    assertBrokenLogRemoved("./logs", "changelog_21_40.bin" + params.extension);
+    assertBrokenFileRemoved("./logs", "changelog_21_40.bin" + params.extension);
     auto entry = getLogEntry("hello_world", 7777);
     changelog_reader.append(entry);
     changelog_reader.end_of_append_batch(0, 0);
@@ -1104,7 +1101,7 @@ TEST_P(CoordinationTest, ChangelogTestReadAfterBrokenTruncate2)
 }
 
 /// Truncating only some entries from the end
-/// For compressed logs we have no reliable way of knowing how many log entries were lost 
+/// For compressed logs we have no reliable way of knowing how many log entries were lost
 /// after we truncate some bytes from the end
 TEST_F(CoordinationTest, ChangelogTestReadAfterBrokenTruncate3)
 {
@@ -1141,7 +1138,7 @@ TEST_F(CoordinationTest, ChangelogTestReadAfterBrokenTruncate3)
 
     EXPECT_EQ(changelog_reader.size(), 19);
     EXPECT_TRUE(fs::exists("./logs/changelog_1_20.bin"));
-    assertBrokenLogRemoved("./logs", "changelog_21_40.bin");
+    assertBrokenFileRemoved("./logs", "changelog_21_40.bin");
     EXPECT_TRUE(fs::exists("./logs/changelog_20_39.bin"));
     auto entry = getLogEntry("hello_world", 7777);
     changelog_reader.append(entry);
@@ -1280,7 +1277,7 @@ TEST_P(CoordinationTest, ChangelogTestLostFiles)
         keeper_context);
     /// It should print error message, but still able to start
     changelog_reader.init(5, 0);
-    assertBrokenLogRemoved("./logs", "changelog_21_40.bin" + params.extension);
+    assertBrokenFileRemoved("./logs", "changelog_21_40.bin" + params.extension);
 }
 
 TEST_P(CoordinationTest, ChangelogTestLostFiles2)
@@ -1321,7 +1318,7 @@ TEST_P(CoordinationTest, ChangelogTestLostFiles2)
     EXPECT_TRUE(fs::exists("./logs/changelog_1_10.bin" + params.extension));
     EXPECT_TRUE(fs::exists("./logs/changelog_11_20.bin" + params.extension));
 
-    assertBrokenLogRemoved("./logs", "changelog_31_40.bin" + params.extension);
+    assertBrokenFileRemoved("./logs", "changelog_31_40.bin" + params.extension);
 }
 struct IntNode
 {
@@ -1367,11 +1364,11 @@ TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
     auto itr = map_snp.begin();
     EXPECT_EQ(itr->key, "/hello");
     EXPECT_EQ(itr->value, 7);
-    EXPECT_EQ(itr->active_in_map, false);
+    EXPECT_EQ(itr->isActiveInMap(), false);
     itr = std::next(itr);
     EXPECT_EQ(itr->key, "/hello");
     EXPECT_EQ(itr->value, 554);
-    EXPECT_EQ(itr->active_in_map, true);
+    EXPECT_EQ(itr->isActiveInMap(), true);
     itr = std::next(itr);
     EXPECT_EQ(itr, map_snp.end());
     for (int i = 0; i < 5; ++i)
@@ -1387,7 +1384,7 @@ TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
     {
         EXPECT_EQ(itr->key, "/hello" + std::to_string(i));
         EXPECT_EQ(itr->value, i);
-        EXPECT_EQ(itr->active_in_map, true);
+        EXPECT_EQ(itr->isActiveInMap(), true);
         itr = std::next(itr);
     }
 
@@ -1401,7 +1398,7 @@ TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
     {
         EXPECT_EQ(itr->key, "/hello" + std::to_string(i));
         EXPECT_EQ(itr->value, i);
-        EXPECT_EQ(itr->active_in_map, i != 3 && i != 2);
+        EXPECT_EQ(itr->isActiveInMap(), i != 3 && i != 2);
         itr = std::next(itr);
     }
     map_snp.clearOutdatedNodes();
@@ -1411,19 +1408,19 @@ TEST_P(CoordinationTest, SnapshotableHashMapTrySnapshot)
     itr = map_snp.begin();
     EXPECT_EQ(itr->key, "/hello");
     EXPECT_EQ(itr->value, 554);
-    EXPECT_EQ(itr->active_in_map, true);
+    EXPECT_EQ(itr->isActiveInMap(), true);
     itr = std::next(itr);
     EXPECT_EQ(itr->key, "/hello0");
     EXPECT_EQ(itr->value, 0);
-    EXPECT_EQ(itr->active_in_map, true);
+    EXPECT_EQ(itr->isActiveInMap(), true);
     itr = std::next(itr);
     EXPECT_EQ(itr->key, "/hello1");
     EXPECT_EQ(itr->value, 1);
-    EXPECT_EQ(itr->active_in_map, true);
+    EXPECT_EQ(itr->isActiveInMap(), true);
     itr = std::next(itr);
     EXPECT_EQ(itr->key, "/hello4");
     EXPECT_EQ(itr->value, 4);
-    EXPECT_EQ(itr->active_in_map, true);
+    EXPECT_EQ(itr->isActiveInMap(), true);
     itr = std::next(itr);
     EXPECT_EQ(itr, map_snp.end());
     map_snp.disableSnapshotMode();
@@ -1511,7 +1508,7 @@ void addNode(DB::KeeperStorage & storage, const std::string & path, const std::s
     using Node = DB::KeeperStorage::Node;
     Node node{};
     node.setData(data);
-    node.stat.ephemeralOwner = ephemeral_owner;
+    node.setEphemeralOwner(ephemeral_owner);
     storage.container.insertOrReplace(path, node);
     auto child_it = storage.container.find(path);
     auto child_path = DB::getBaseNodeName(child_it->key);
@@ -1520,7 +1517,7 @@ void addNode(DB::KeeperStorage & storage, const std::string & path, const std::s
         [&](auto & parent)
         {
             parent.addChild(child_path);
-            parent.stat.numChildren++;
+            parent.increaseNumChildren();
         });
 }
 
@@ -1533,12 +1530,12 @@ TEST_P(CoordinationTest, TestStorageSnapshotSimple)
     DB::KeeperSnapshotManager manager(3, keeper_context, params.enable_compression);
 
     DB::KeeperStorage storage(500, "", keeper_context);
-    addNode(storage, "/hello", "world", 1);
-    addNode(storage, "/hello/somepath", "somedata", 3);
+    addNode(storage, "/hello1", "world", 1);
+    addNode(storage, "/hello2", "somedata", 3);
     storage.session_id_counter = 5;
     storage.zxid = 2;
-    storage.ephemerals[3] = {"/hello"};
-    storage.ephemerals[1] = {"/hello/somepath"};
+    storage.ephemerals[3] = {"/hello2"};
+    storage.ephemerals[1] = {"/hello1"};
     storage.getSessionID(130);
     storage.getSessionID(130);
 
@@ -1559,13 +1556,13 @@ TEST_P(CoordinationTest, TestStorageSnapshotSimple)
     auto [restored_storage, snapshot_meta, _] = manager.deserializeSnapshotFromBuffer(debuf);
 
     EXPECT_EQ(restored_storage->container.size(), 6);
-    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 2);
-    EXPECT_EQ(restored_storage->container.getValue("/hello").getChildren().size(), 1);
-    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getChildren().size(), 0);
+    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 3);
+    EXPECT_EQ(restored_storage->container.getValue("/hello1").getChildren().size(), 0);
+    EXPECT_EQ(restored_storage->container.getValue("/hello2").getChildren().size(), 0);
 
     EXPECT_EQ(restored_storage->container.getValue("/").getData(), "");
-    EXPECT_EQ(restored_storage->container.getValue("/hello").getData(), "world");
-    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getData(), "somedata");
+    EXPECT_EQ(restored_storage->container.getValue("/hello1").getData(), "world");
+    EXPECT_EQ(restored_storage->container.getValue("/hello2").getData(), "somedata");
     EXPECT_EQ(restored_storage->session_id_counter, 7);
     EXPECT_EQ(restored_storage->zxid, 2);
     EXPECT_EQ(restored_storage->ephemerals.size(), 2);
@@ -1761,22 +1758,30 @@ getLogEntryFromZKRequest(size_t term, int64_t session_id, int64_t zxid, const Co
 }
 
 void testLogAndStateMachine(
-    Coordination::CoordinationSettingsPtr settings,
+    DB::CoordinationSettingsPtr settings,
     uint64_t total_logs,
-    bool enable_compression,
-    Coordination::KeeperContextPtr keeper_context)
+    bool enable_compression)
 {
     using namespace Coordination;
     using namespace DB;
 
     ChangelogDirTest snapshots("./snapshots");
-    keeper_context->setSnapshotDisk(std::make_shared<DiskLocal>("SnapshotDisk", "./snapshots"));
     ChangelogDirTest logs("./logs");
-    keeper_context->setLogDisk(std::make_shared<DiskLocal>("LogDisk", "./logs"));
+
+    auto get_keeper_context = [&]
+    {
+        auto local_keeper_context = std::make_shared<DB::KeeperContext>(true, settings);
+        local_keeper_context->setSnapshotDisk(std::make_shared<DiskLocal>("SnapshotDisk", "./snapshots"));
+        local_keeper_context->setLogDisk(std::make_shared<DiskLocal>("LogDisk", "./logs"));
+        return local_keeper_context;
+    };
 
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, settings, keeper_context, nullptr);
+
+    auto keeper_context = get_keeper_context();
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, keeper_context, nullptr);
+
     state_machine->init();
     DB::KeeperLogStore changelog(
         DB::LogFileSettings{
@@ -1784,6 +1789,7 @@ void testLogAndStateMachine(
         DB::FlushSettings(),
         keeper_context);
     changelog.init(state_machine->last_commit_index() + 1, settings->reserved_log_items);
+
     for (size_t i = 1; i < total_logs + 1; ++i)
     {
         std::shared_ptr<ZooKeeperCreateRequest> request = std::make_shared<ZooKeeperCreateRequest>();
@@ -1804,7 +1810,7 @@ void testLogAndStateMachine(
                 = [&snapshot_created](bool & ret, nuraft::ptr<std::exception> & /*exception*/)
             {
                 snapshot_created = ret;
-                LOG_INFO(&Poco::Logger::get("CoordinationTest"), "Snapshot finished");
+                LOG_INFO(getLogger("CoordinationTest"), "Snapshot finished");
             };
 
             state_machine->create_snapshot(s, when_done);
@@ -1812,14 +1818,16 @@ void testLogAndStateMachine(
             bool pop_result = snapshots_queue.pop(snapshot_task);
             EXPECT_TRUE(pop_result);
 
-            snapshot_task.create_snapshot(std::move(snapshot_task.snapshot));
+            snapshot_task.create_snapshot(std::move(snapshot_task.snapshot), /*execute_only_cleanup=*/false);
         }
+
         if (snapshot_created && changelog.size() > settings->reserved_log_items)
             changelog.compact(i - settings->reserved_log_items);
     }
 
     SnapshotsQueue snapshots_queue1{1};
-    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, settings, keeper_context, nullptr);
+    keeper_context = get_keeper_context();
+    auto restore_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue1, keeper_context, nullptr);
     restore_machine->init();
     EXPECT_EQ(restore_machine->last_commit_index(), total_logs - total_logs % settings->snapshot_distance);
 
@@ -1866,63 +1874,64 @@ TEST_P(CoordinationTest, TestStateMachineAndLogStore)
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 37, params.enable_compression, keeper_context);
+
+        testLogAndStateMachine(settings, 37, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 11, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 11, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 10;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 20;
         settings->rotate_log_storage_interval = 30;
-        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 0;
         settings->rotate_log_storage_interval = 10;
-        testLogAndStateMachine(settings, 40, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 40, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 1;
         settings->reserved_log_items = 1;
         settings->rotate_log_storage_interval = 32;
-        testLogAndStateMachine(settings, 32, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 32, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 10;
         settings->reserved_log_items = 7;
         settings->rotate_log_storage_interval = 1;
-        testLogAndStateMachine(settings, 33, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 33, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 33, params.enable_compression);
     }
     {
         CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
         settings->snapshot_distance = 37;
         settings->reserved_log_items = 1000;
         settings->rotate_log_storage_interval = 5000;
-        testLogAndStateMachine(settings, 45, params.enable_compression, keeper_context);
+        testLogAndStateMachine(settings, 45, params.enable_compression);
     }
 }
 
@@ -1934,11 +1943,10 @@ TEST_P(CoordinationTest, TestEphemeralNodeRemove)
     ChangelogDirTest snapshots("./snapshots");
     setSnapshotDirectory("./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, settings, keeper_context, nullptr);
+
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, keeper_context, nullptr);
     state_machine->init();
 
     std::shared_ptr<ZooKeeperCreateRequest> request_c = std::make_shared<ZooKeeperCreateRequest>();
@@ -1968,11 +1976,10 @@ TEST_P(CoordinationTest, TestCreateNodeWithAuthSchemeForAclWhenAuthIsPrecommitte
 
     ChangelogDirTest snapshots("./snapshots");
     setSnapshotDirectory("./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, settings, keeper_context, nullptr);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, keeper_context, nullptr);
     state_machine->init();
 
     String user_auth_data = "test_user:test_password";
@@ -2020,11 +2027,10 @@ TEST_P(CoordinationTest, TestSetACLWithAuthSchemeForAclWhenAuthIsPrecommitted)
     ChangelogDirTest snapshots("./snapshots");
     setSnapshotDirectory("./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, settings, keeper_context, nullptr);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, keeper_context, nullptr);
     state_machine->init();
 
     String user_auth_data = "test_user:test_password";
@@ -2135,6 +2141,7 @@ TEST_P(CoordinationTest, TestRotateIntervalChanges)
 
     waitDurableLogs(changelog_2);
 
+    keeper_context->setLastCommitIndex(105);
     changelog_2.compact(105);
     std::this_thread::sleep_for(std::chrono::microseconds(1000));
 
@@ -2160,6 +2167,7 @@ TEST_P(CoordinationTest, TestRotateIntervalChanges)
 
     waitDurableLogs(changelog_3);
 
+    keeper_context->setLastCommitIndex(125);
     changelog_3.compact(125);
     std::this_thread::sleep_for(std::chrono::microseconds(1000));
     assertFileDeleted("./logs/changelog_101_110.bin" + params.extension);
@@ -2254,12 +2262,12 @@ TEST_P(CoordinationTest, TestStorageSnapshotDifferentCompressions)
     DB::KeeperSnapshotManager manager(3, keeper_context, params.enable_compression);
 
     DB::KeeperStorage storage(500, "", keeper_context);
-    addNode(storage, "/hello", "world", 1);
-    addNode(storage, "/hello/somepath", "somedata", 3);
+    addNode(storage, "/hello1", "world", 1);
+    addNode(storage, "/hello2", "somedata", 3);
     storage.session_id_counter = 5;
     storage.zxid = 2;
-    storage.ephemerals[3] = {"/hello"};
-    storage.ephemerals[1] = {"/hello/somepath"};
+    storage.ephemerals[3] = {"/hello2"};
+    storage.ephemerals[1] = {"/hello1"};
     storage.getSessionID(130);
     storage.getSessionID(130);
 
@@ -2276,13 +2284,13 @@ TEST_P(CoordinationTest, TestStorageSnapshotDifferentCompressions)
     auto [restored_storage, snapshot_meta, _] = new_manager.deserializeSnapshotFromBuffer(debuf);
 
     EXPECT_EQ(restored_storage->container.size(), 6);
-    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 2);
-    EXPECT_EQ(restored_storage->container.getValue("/hello").getChildren().size(), 1);
-    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getChildren().size(), 0);
+    EXPECT_EQ(restored_storage->container.getValue("/").getChildren().size(), 3);
+    EXPECT_EQ(restored_storage->container.getValue("/hello1").getChildren().size(), 0);
+    EXPECT_EQ(restored_storage->container.getValue("/hello2").getChildren().size(), 0);
 
     EXPECT_EQ(restored_storage->container.getValue("/").getData(), "");
-    EXPECT_EQ(restored_storage->container.getValue("/hello").getData(), "world");
-    EXPECT_EQ(restored_storage->container.getValue("/hello/somepath").getData(), "somedata");
+    EXPECT_EQ(restored_storage->container.getValue("/hello1").getData(), "world");
+    EXPECT_EQ(restored_storage->container.getValue("/hello2").getData(), "somedata");
     EXPECT_EQ(restored_storage->session_id_counter, 7);
     EXPECT_EQ(restored_storage->zxid, 2);
     EXPECT_EQ(restored_storage->ephemerals.size(), 2);
@@ -2951,7 +2959,7 @@ TEST_P(CoordinationTest, TestCheckNotExistsRequest)
     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;
+    auto node_version = node_it->value.version;
 
     {
         SCOPED_TRACE("CheckNotExists returns ZNODEEXISTS");
diff --git a/src/Core/AccurateComparison.h b/src/Core/AccurateComparison.h
index a201c136e3a..139ee4d88dc 100644
--- a/src/Core/AccurateComparison.h
+++ b/src/Core/AccurateComparison.h
@@ -152,7 +152,7 @@ bool notEqualsOp(A a, B b)
 }
 
 /// Converts numeric to an equal numeric of other type.
-/// When `strict` is `true` check that result exactly same as input, otherwise just check overflow
+/// When `strict` is `true` check that result exactly the same as input, otherwise just check overflow
 template <typename From, typename To, bool strict = true>
 inline bool NO_SANITIZE_UNDEFINED convertNumeric(From value, To & result)
 {
diff --git a/src/Core/BackgroundSchedulePool.cpp b/src/Core/BackgroundSchedulePool.cpp
index fa892bc3c84..4facdeb4631 100644
--- a/src/Core/BackgroundSchedulePool.cpp
+++ b/src/Core/BackgroundSchedulePool.cpp
@@ -116,7 +116,7 @@ void BackgroundSchedulePoolTaskInfo::execute()
     static constexpr UInt64 slow_execution_threshold_ms = 200;
 
     if (milliseconds >= slow_execution_threshold_ms)
-        LOG_TRACE(&Poco::Logger::get(log_name), "Execution took {} ms.", milliseconds);
+        LOG_TRACE(getLogger(log_name), "Execution took {} ms.", milliseconds);
 
     {
         std::lock_guard lock_schedule(schedule_mutex);
@@ -160,7 +160,7 @@ BackgroundSchedulePool::BackgroundSchedulePool(size_t size_, CurrentMetrics::Met
     , size_metric(size_metric_, size_)
     , thread_name(thread_name_)
 {
-    LOG_INFO(&Poco::Logger::get("BackgroundSchedulePool/" + thread_name), "Create BackgroundSchedulePool with {} threads", size_);
+    LOG_INFO(getLogger("BackgroundSchedulePool/" + thread_name), "Create BackgroundSchedulePool with {} threads", size_);
 
     threads.resize(size_);
 
@@ -174,7 +174,7 @@ BackgroundSchedulePool::BackgroundSchedulePool(size_t size_, CurrentMetrics::Met
     catch (...)
     {
         LOG_FATAL(
-            &Poco::Logger::get("BackgroundSchedulePool/" + thread_name),
+            getLogger("BackgroundSchedulePool/" + thread_name),
             "Couldn't get {} threads from global thread pool: {}",
             size_,
             getCurrentExceptionCode() == DB::ErrorCodes::CANNOT_SCHEDULE_TASK
@@ -192,7 +192,7 @@ void BackgroundSchedulePool::increaseThreadsCount(size_t new_threads_count)
 
     if (new_threads_count < old_threads_count)
     {
-        LOG_WARNING(&Poco::Logger::get("BackgroundSchedulePool/" + thread_name),
+        LOG_WARNING(getLogger("BackgroundSchedulePool/" + thread_name),
             "Tried to increase the number of threads but the new threads count ({}) is not greater than old one ({})", new_threads_count, old_threads_count);
         return;
     }
@@ -219,7 +219,7 @@ BackgroundSchedulePool::~BackgroundSchedulePool()
         tasks_cond_var.notify_all();
         delayed_tasks_cond_var.notify_all();
 
-        LOG_TRACE(&Poco::Logger::get("BackgroundSchedulePool/" + thread_name), "Waiting for threads to finish.");
+        LOG_TRACE(getLogger("BackgroundSchedulePool/" + thread_name), "Waiting for threads to finish.");
         delayed_thread->join();
 
         for (auto & thread : threads)
diff --git a/src/Core/BackgroundSchedulePool.h b/src/Core/BackgroundSchedulePool.h
index eca93353283..a1450be2466 100644
--- a/src/Core/BackgroundSchedulePool.h
+++ b/src/Core/BackgroundSchedulePool.h
@@ -1,21 +1,20 @@
 #pragma once
 
+#include <atomic>
+#include <condition_variable>
+#include <functional>
+#include <map>
+#include <mutex>
+#include <thread>
+#include <vector>
+#include <base/scope_guard.h>
+#include <boost/noncopyable.hpp>
 #include <Poco/Notification.h>
 #include <Poco/NotificationQueue.h>
 #include <Poco/Timestamp.h>
-#include <thread>
-#include <atomic>
-#include <mutex>
-#include <condition_variable>
-#include <vector>
-#include <map>
-#include <functional>
-#include <boost/noncopyable.hpp>
-#include <Common/ZooKeeper/Types.h>
 #include <Common/CurrentMetrics.h>
-#include <Common/CurrentThread.h>
 #include <Common/ThreadPool_fwd.h>
-#include <base/scope_guard.h>
+#include <Common/ZooKeeper/Types.h>
 
 
 namespace DB
diff --git a/src/Core/BaseSettings.cpp b/src/Core/BaseSettings.cpp
index 72a8070e652..c535b9ce65e 100644
--- a/src/Core/BaseSettings.cpp
+++ b/src/Core/BaseSettings.cpp
@@ -41,14 +41,13 @@ BaseSettingsHelpers::Flags BaseSettingsHelpers::readFlags(ReadBuffer & in)
 
 void BaseSettingsHelpers::throwSettingNotFound(std::string_view name)
 {
-    throw Exception(ErrorCodes::UNKNOWN_SETTING, "Unknown setting {}", String{name});
+    throw Exception(ErrorCodes::UNKNOWN_SETTING, "Unknown setting '{}'", String{name});
 }
 
 
 void BaseSettingsHelpers::warningSettingNotFound(std::string_view name)
 {
-    static auto * log = &Poco::Logger::get("Settings");
-    LOG_WARNING(log, "Unknown setting {}, skipping", name);
+    LOG_WARNING(getLogger("Settings"), "Unknown setting '{}', skipping", name);
 }
 
 }
diff --git a/src/Core/BaseSettings.h b/src/Core/BaseSettings.h
index 6f3245c83e8..7191038a4ce 100644
--- a/src/Core/BaseSettings.h
+++ b/src/Core/BaseSettings.h
@@ -7,7 +7,6 @@
 #include <base/range.h>
 #include <boost/blank.hpp>
 #include <unordered_map>
-#include <boost/program_options/options_description.hpp>
 
 
 namespace boost::program_options
@@ -129,18 +128,6 @@ public:
         std::conditional_t<Traits::allow_custom_settings, const CustomSettingMap::mapped_type*, boost::blank> custom_setting;
     };
 
-    /// Adds program options to set the settings from a command line.
-    /// (Don't forget to call notify() on the `variables_map` after parsing it!)
-    void addProgramOptions(boost::program_options::options_description & options);
-
-    /// Adds program options as to set the settings from a command line.
-    /// Allows to set one setting multiple times, the last value will be used.
-    /// (Don't forget to call notify() on the `variables_map` after parsing it!)
-    void addProgramOptionsAsMultitokens(boost::program_options::options_description & options);
-
-    void addProgramOption(boost::program_options::options_description & options, std::string_view name, const SettingFieldRef & field);
-    void addProgramOptionAsMultitoken(boost::program_options::options_description & options, std::string_view name, const SettingFieldRef & field);
-
     enum SkipFlags
     {
         SKIP_NONE = 0,
@@ -561,57 +548,6 @@ String BaseSettings<TTraits>::toString() const
     return out.str();
 }
 
-template <typename TTraits>
-void BaseSettings<TTraits>::addProgramOptions(boost::program_options::options_description & options)
-{
-    const auto & settings_to_aliases = TTraits::settingsToAliases();
-    for (const auto & field : all())
-    {
-        std::string_view name = field.getName();
-        addProgramOption(options, name, field);
-
-        if (auto it = settings_to_aliases.find(name); it != settings_to_aliases.end())
-        {
-            for (const auto alias : it->second)
-                addProgramOption(options, alias, field);
-        }
-    }
-}
-
-template <typename TTraits>
-void BaseSettings<TTraits>::addProgramOptionsAsMultitokens(boost::program_options::options_description & options)
-{
-    const auto & settings_to_aliases = TTraits::settingsToAliases();
-    for (const auto & field : all())
-    {
-        std::string_view name = field.getName();
-        addProgramOptionAsMultitoken(options, name, field);
-
-        if (auto it = settings_to_aliases.find(name); it != settings_to_aliases.end())
-        {
-            for (const auto alias : it->second)
-                addProgramOptionAsMultitoken(options, alias, field);
-        }
-    }
-}
-
-
-template <typename TTraits>
-void BaseSettings<TTraits>::addProgramOption(boost::program_options::options_description & options, std::string_view name, const SettingFieldRef & field)
-{
-    auto on_program_option = boost::function1<void, const std::string &>([this, name](const std::string & value) { set(name, value); });
-    options.add(boost::shared_ptr<boost::program_options::option_description>(new boost::program_options::option_description(
-        name.data(), boost::program_options::value<std::string>()->composing()->notifier(on_program_option), field.getDescription())));
-}
-
-template <typename TTraits>
-void BaseSettings<TTraits>::addProgramOptionAsMultitoken(boost::program_options::options_description & options, std::string_view name, const SettingFieldRef & field)
-{
-    auto on_program_option = boost::function1<void, const Strings &>([this, name](const Strings & values) { set(name, values.back()); });
-    options.add(boost::shared_ptr<boost::program_options::option_description>(new boost::program_options::option_description(
-        name.data(), boost::program_options::value<Strings>()->multitoken()->composing()->notifier(on_program_option), field.getDescription())));
-}
-
 template <typename TTraits>
 bool operator==(const BaseSettings<TTraits> & left, const BaseSettings<TTraits> & right)
 {
diff --git a/src/Core/BaseSettingsProgramOptions.h b/src/Core/BaseSettingsProgramOptions.h
new file mode 100644
index 00000000000..6c8166fc119
--- /dev/null
+++ b/src/Core/BaseSettingsProgramOptions.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <Core/Settings.h>
+#include <Core/Types_fwd.h>
+
+#include <boost/program_options.hpp>
+
+namespace DB
+{
+
+template <typename T>
+void addProgramOptionAsMultitoken(T &cmd_settings, boost::program_options::options_description & options, std::string_view name, const typename T::SettingFieldRef & field)
+{
+    auto on_program_option = boost::function1<void, const Strings &>([&cmd_settings, name](const Strings & values) { cmd_settings.set(name, values.back()); });
+    options.add(boost::shared_ptr<boost::program_options::option_description>(new boost::program_options::option_description(
+            name.data(), boost::program_options::value<Strings>()->multitoken()->composing()->notifier(on_program_option), field.getDescription())));
+}
+
+template <typename T>
+void addProgramOptionsAsMultitokens(T &cmd_settings, boost::program_options::options_description & options)
+{
+    const auto & settings_to_aliases = T::Traits::settingsToAliases();
+    for (const auto & field : cmd_settings.all())
+    {
+        std::string_view name = field.getName();
+        addProgramOptionAsMultitoken(cmd_settings, options, name, field);
+
+        if (auto it = settings_to_aliases.find(name); it != settings_to_aliases.end())
+            for (const auto alias : it->second)
+                addProgramOptionAsMultitoken(cmd_settings, options, alias, field);
+    }
+}
+
+/// Adds program options to set the settings from a command line.
+/// (Don't forget to call notify() on the `variables_map` after parsing it!)
+template <typename T>
+void addProgramOption(T &cmd_settings, boost::program_options::options_description & options, std::string_view name, const typename T::SettingFieldRef  & field)
+{
+    auto on_program_option = boost::function1<void, const std::string &>([&cmd_settings, name](const std::string & value) { cmd_settings.set(name, value); });
+    options.add(boost::shared_ptr<boost::program_options::option_description>(new boost::program_options::option_description(
+            name.data(), boost::program_options::value<std::string>()->composing()->notifier(on_program_option), field.getDescription())));
+}
+
+template <typename T>
+void addProgramOptions(T &cmd_settings, boost::program_options::options_description & options)
+{
+    const auto & settings_to_aliases = T::Traits::settingsToAliases();
+    for (const auto & field : cmd_settings.all())
+    {
+        std::string_view name = field.getName();
+        addProgramOption(cmd_settings, options, name, field);
+
+        if (auto it = settings_to_aliases.find(name); it != settings_to_aliases.end())
+            for (const auto alias : it->second)
+                addProgramOption(cmd_settings, options, alias, field);
+    }
+}
+
+
+}
diff --git a/src/Core/Block.cpp b/src/Core/Block.cpp
index a7d5b0a869f..77dbad5443e 100644
--- a/src/Core/Block.cpp
+++ b/src/Core/Block.cpp
@@ -1,19 +1,17 @@
-#include <Common/Exception.h>
-#include <Common/FieldVisitorToString.h>
-
-#include <Core/Block.h>
-
-#include <IO/WriteBufferFromString.h>
-#include <IO/Operators.h>
-
-#include <Common/assert_cast.h>
-
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnSparse.h>
+#include <Core/Block.h>
+#include <IO/Operators.h>
+#include <IO/WriteBufferFromString.h>
+#include <base/sort.h>
+#include <Common/Exception.h>
+#include <Common/FieldVisitorToString.h>
+#include <Common/assert_cast.h>
 
 #include <iterator>
-#include <base/sort.h>
+
 #include <boost/algorithm/string.hpp>
 
 
@@ -601,7 +599,7 @@ Block Block::shrinkToFit() const
 {
     Columns new_columns(data.size(), nullptr);
     for (size_t i = 0; i < data.size(); ++i)
-        new_columns[i] = data[i].column->shrinkToFit();
+        new_columns[i] = data[i].column->cloneResized(data[i].column->size());
     return cloneWithColumns(new_columns);
 }
 
diff --git a/src/Core/Block.h b/src/Core/Block.h
index 1a4f8c2e446..c8bebb4552a 100644
--- a/src/Core/Block.h
+++ b/src/Core/Block.h
@@ -177,7 +177,6 @@ using BlockPtr = std::shared_ptr<Block>;
 using Blocks = std::vector<Block>;
 using BlocksList = std::list<Block>;
 using BlocksPtr = std::shared_ptr<Blocks>;
-using BlocksPtrs = std::shared_ptr<std::vector<BlocksPtr>>;
 
 /// Extends block with extra data in derived classes
 struct ExtraBlock
diff --git a/src/Core/CompareHelper.h b/src/Core/CompareHelper.h
new file mode 100644
index 00000000000..2e7aaf1f605
--- /dev/null
+++ b/src/Core/CompareHelper.h
@@ -0,0 +1,93 @@
+#pragma once
+
+#include <base/defines.h>
+#include <base/types.h>
+
+#include <cmath>
+
+namespace DB
+{
+
+/** Stuff for comparing numbers.
+  * Integer values are compared as usual.
+  * Floating-point numbers are compared this way that NaNs always end up at the end
+  *  (if you don't do this, the sort would not work at all).
+  */
+template <class T, class U = T>
+struct CompareHelper
+{
+    static constexpr bool less(T a, U b, int /*nan_direction_hint*/) { return a < b; }
+    static constexpr bool greater(T a, U b, int /*nan_direction_hint*/) { return a > b; }
+    static constexpr bool equals(T a, U b, int /*nan_direction_hint*/) { return a == b; }
+
+    /** Compares two numbers. Returns a number less than zero, equal to zero, or greater than zero if a < b, a == b, a > b, respectively.
+      * If one of the values is NaN, then
+      * - if nan_direction_hint == -1 - NaN are considered less than all numbers;
+      * - if nan_direction_hint == 1 - NaN are considered to be larger than all numbers;
+      * Essentially: nan_direction_hint == -1 says that the comparison is for sorting in descending order.
+      */
+    static constexpr int compare(T a, U b, int /*nan_direction_hint*/) { return a > b ? 1 : (a < b ? -1 : 0); }
+};
+
+template <class T>
+struct FloatCompareHelper
+{
+    static constexpr bool less(T a, T b, int nan_direction_hint)
+    {
+        const bool isnan_a = std::isnan(a);
+        const bool isnan_b = std::isnan(b);
+
+        if (isnan_a && isnan_b)
+            return false;
+        if (isnan_a)
+            return nan_direction_hint < 0;
+        if (isnan_b)
+            return nan_direction_hint > 0;
+
+        return a < b;
+    }
+
+    static constexpr bool greater(T a, T b, int nan_direction_hint)
+    {
+        const bool isnan_a = std::isnan(a);
+        const bool isnan_b = std::isnan(b);
+
+        if (isnan_a && isnan_b)
+            return false;
+        if (isnan_a)
+            return nan_direction_hint > 0;
+        if (isnan_b)
+            return nan_direction_hint < 0;
+
+        return a > b;
+    }
+
+    static constexpr bool equals(T a, T b, int nan_direction_hint) { return compare(a, b, nan_direction_hint) == 0; }
+
+    static constexpr int compare(T a, T b, int nan_direction_hint)
+    {
+        const bool isnan_a = std::isnan(a);
+        const bool isnan_b = std::isnan(b);
+
+        if (unlikely(isnan_a || isnan_b))
+        {
+            if (isnan_a && isnan_b)
+                return 0;
+
+            return isnan_a ? nan_direction_hint : -nan_direction_hint;
+        }
+
+        return (T(0) < (a - b)) - ((a - b) < T(0));
+    }
+};
+
+template <typename U>
+struct CompareHelper<Float32, U> : public FloatCompareHelper<Float32>
+{
+};
+template <typename U>
+struct CompareHelper<Float64, U> : public FloatCompareHelper<Float64>
+{
+};
+
+}
diff --git a/src/Core/Defines.h b/src/Core/Defines.h
index a3ab76c0b93..f2142bc764d 100644
--- a/src/Core/Defines.h
+++ b/src/Core/Defines.h
@@ -8,9 +8,11 @@ namespace DB
 
 static constexpr auto DBMS_DEFAULT_PORT = 9000;
 static constexpr auto DBMS_DEFAULT_SECURE_PORT = 9440;
+
 static constexpr auto DBMS_DEFAULT_CONNECT_TIMEOUT_SEC = 10;
 static constexpr auto DBMS_DEFAULT_SEND_TIMEOUT_SEC = 300;
 static constexpr auto DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC = 300;
+
 /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus).
 static constexpr auto DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC = 5;
 static constexpr auto DBMS_DEFAULT_POLL_INTERVAL = 10;
@@ -34,7 +36,6 @@ static constexpr auto DEFAULT_BLOCK_SIZE
 static constexpr auto DEFAULT_INSERT_BLOCK_SIZE
     = 1048449; /// 1048576 - PADDING_FOR_SIMD - (PADDING_FOR_SIMD - 1) bytes padding that we usually have in arrays
 
-static constexpr auto DEFAULT_PERIODIC_LIVE_VIEW_REFRESH_SEC = 60;
 static constexpr auto SHOW_CHARS_ON_SYNTAX_ERROR = ptrdiff_t(160);
 /// each period reduces the error counter by 2 times
 /// too short a period can cause errors to disappear immediately after creation.
@@ -51,7 +52,9 @@ static constexpr auto DEFAULT_HTTP_READ_BUFFER_CONNECTION_TIMEOUT = 1;
 /// the number is unmotivated
 static constexpr auto DEFAULT_COUNT_OF_HTTP_CONNECTIONS_PER_ENDPOINT = 15;
 
+static constexpr auto DEFAULT_TCP_KEEP_ALIVE_TIMEOUT = 290;
 static constexpr auto DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT = 30;
+static constexpr auto DEFAULT_HTTP_KEEP_ALIVE_MAX_REQUEST = 1000;
 
 static constexpr auto DBMS_DEFAULT_PATH = "/var/lib/clickhouse/";
 
@@ -61,6 +64,8 @@ static constexpr auto DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC = 120;
 
 /// Default limit on recursion depth of recursive descend parser.
 static constexpr auto DBMS_DEFAULT_MAX_PARSER_DEPTH = 1000;
+/// Default limit on the amount of backtracking of recursive descend parser.
+static constexpr auto DBMS_DEFAULT_MAX_PARSER_BACKTRACKS = 1000000;
 
 /// Default limit on query size.
 static constexpr auto DBMS_DEFAULT_MAX_QUERY_SIZE = 262144;
@@ -68,6 +73,15 @@ static constexpr auto DBMS_DEFAULT_MAX_QUERY_SIZE = 262144;
 /// Max depth of hierarchical dictionary
 static constexpr auto DBMS_HIERARCHICAL_DICTIONARY_MAX_DEPTH = 1000;
 
+#ifdef OS_LINUX
+#define DBMS_DEFAULT_PAGE_CACHE_USE_MADV_FREE true
+#else
+/// On Mac OS, MADV_FREE is not lazy, so page_cache_use_madv_free should be disabled.
+/// On FreeBSD, it may work but we haven't tested it.
+#define DBMS_DEFAULT_PAGE_CACHE_USE_MADV_FREE false
+#endif
+
+
 /// Default maximum (total and entry) sizes and policies of various caches
 static constexpr auto DEFAULT_UNCOMPRESSED_CACHE_POLICY = "SLRU";
 static constexpr auto DEFAULT_UNCOMPRESSED_CACHE_MAX_SIZE = 0_MiB;
diff --git a/src/Core/ExternalTable.cpp b/src/Core/ExternalTable.cpp
index 58b705ca317..f8bbd16d038 100644
--- a/src/Core/ExternalTable.cpp
+++ b/src/Core/ExternalTable.cpp
@@ -17,6 +17,9 @@
 
 #include <Core/ExternalTable.h>
 #include <Poco/Net/MessageHeader.h>
+#include <Parsers/ASTNameTypePair.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/parseQuery.h>
 #include <base/scope_guard.h>
 
 
@@ -28,6 +31,18 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+/// Parsing a list of types with `,` as separator. For example, `Int, Enum('foo'=1,'bar'=2), Double`
+/// Used in `parseStructureFromTypesField`
+class ParserTypeList : public IParserBase
+{
+protected:
+    const char * getName() const override { return "type pair list"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override
+    {
+        return ParserList(std::make_unique<ParserDataType>(), std::make_unique<ParserToken>(TokenType::Comma), false)
+        .parse(pos, node, expected);
+    }
+};
 
 ExternalTableDataPtr BaseExternalTable::getData(ContextPtr context)
 {
@@ -55,23 +70,38 @@ void BaseExternalTable::clear()
 
 void BaseExternalTable::parseStructureFromStructureField(const std::string & argument)
 {
-    std::vector<std::string> vals;
-    splitInto<' ', ','>(vals, argument, true);
+    ParserNameTypePairList parser;
+    const auto * pos = argument.data();
+    String error;
+    ASTPtr columns_list_raw = tryParseQuery(parser, pos, pos + argument.size(), error, false, "", false, DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
 
-    if (vals.size() % 2 != 0)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Odd number of attributes in section structure: {}", vals.size());
+    if (!columns_list_raw)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Error while parsing table structure: {}", error);
 
-    for (size_t i = 0; i < vals.size(); i += 2)
-        structure.emplace_back(vals[i], vals[i + 1]);
+    for (auto & child : columns_list_raw->children)
+    {
+        auto * column = child->as<ASTNameTypePair>();
+        /// We use `formatWithPossiblyHidingSensitiveData` instead of `getColumnNameWithoutAlias` because `column->type` is an ASTFunction.
+        /// `getColumnNameWithoutAlias` will return name of the function with `(arguments)` even if arguments is empty.
+        if (column)
+            structure.emplace_back(column->name, column->type->formatWithPossiblyHidingSensitiveData(0, true, true));
+        else
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Error while parsing table structure: expected column definition, got {}", child->formatForErrorMessage());
+    }
 }
 
 void BaseExternalTable::parseStructureFromTypesField(const std::string & argument)
 {
-    std::vector<std::string> vals;
-    splitInto<' ', ','>(vals, argument, true);
+    ParserTypeList parser;
+    const auto * pos = argument.data();
+    String error;
+    ASTPtr type_list_raw = tryParseQuery(parser, pos, pos+argument.size(), error, false, "", false, DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
 
-    for (size_t i = 0; i < vals.size(); ++i)
-        structure.emplace_back("_" + toString(i + 1), vals[i]);
+    if (!type_list_raw)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Error while parsing table structure: {}", error);
+
+    for (size_t i = 0; i < type_list_raw->children.size(); ++i)
+        structure.emplace_back("_" + toString(i + 1), type_list_raw->children[i]->formatWithPossiblyHidingSensitiveData(0, true, true));
 }
 
 void BaseExternalTable::initSampleBlock()
diff --git a/src/Core/Field.cpp b/src/Core/Field.cpp
index 9c058d61902..73f0703f21e 100644
--- a/src/Core/Field.cpp
+++ b/src/Core/Field.cpp
@@ -22,6 +22,12 @@ namespace ErrorCodes
     extern const int DECIMAL_OVERFLOW;
 }
 
+template <is_decimal T>
+T DecimalField<T>::getScaleMultiplier() const
+{
+    return DecimalUtils::scaleMultiplier<T>(scale);
+}
+
 inline Field getBinaryValue(UInt8 type, ReadBuffer & buf)
 {
     switch (static_cast<Field::Types::Which>(type))
@@ -627,5 +633,9 @@ std::string_view Field::getTypeName() const
     return fieldTypeToString(which);
 }
 
-
+template class DecimalField<Decimal32>;
+template class DecimalField<Decimal64>;
+template class DecimalField<Decimal128>;
+template class DecimalField<Decimal256>;
+template class DecimalField<DateTime64>;
 }
diff --git a/src/Core/Field.h b/src/Core/Field.h
index 6afa98ed9c0..eb01be6c43d 100644
--- a/src/Core/Field.h
+++ b/src/Core/Field.h
@@ -7,14 +7,14 @@
 #include <type_traits>
 #include <functional>
 
-#include <Common/Exception.h>
-#include <Common/AllocatorWithMemoryTracking.h>
-#include <Core/Types.h>
+#include <Core/CompareHelper.h>
 #include <Core/Defines.h>
-#include <Core/DecimalFunctions.h>
+#include <Core/Types.h>
 #include <Core/UUID.h>
-#include <base/IPv4andIPv6.h>
 #include <base/DayNum.h>
+#include <base/IPv4andIPv6.h>
+#include <Common/AllocatorWithMemoryTracking.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
@@ -39,6 +39,7 @@ using FieldVector = std::vector<Field, AllocatorWithMemoryTracking<Field>>;
 /// construct a Field of Array or a Tuple type. An alternative approach would be
 /// to construct both of these types from FieldVector, and have the caller
 /// specify the desired Field type explicitly.
+/// NOLINTBEGIN(modernize-type-traits)
 #define DEFINE_FIELD_VECTOR(X) \
 struct X : public FieldVector \
 { \
@@ -47,6 +48,7 @@ struct X : public FieldVector \
 
 DEFINE_FIELD_VECTOR(Array);
 DEFINE_FIELD_VECTOR(Tuple);
+/// NOLINTEND(modernize-type-traits)
 
 /// An array with the following structure: [(key1, value1), (key2, value2), ...]
 DEFINE_FIELD_VECTOR(Map); /// TODO: use map instead of vector.
@@ -148,7 +150,7 @@ public:
 
     operator T() const { return dec; } /// NOLINT
     T getValue() const { return dec; }
-    T getScaleMultiplier() const { return DecimalUtils::scaleMultiplier<T>(scale); }
+    T getScaleMultiplier() const;
     UInt32 getScale() const { return scale; }
 
     template <typename U>
@@ -197,6 +199,12 @@ private:
     UInt32 scale;
 };
 
+extern template class DecimalField<Decimal32>;
+extern template class DecimalField<Decimal64>;
+extern template class DecimalField<Decimal128>;
+extern template class DecimalField<Decimal256>;
+extern template class DecimalField<DateTime64>;
+
 template <typename T> constexpr bool is_decimal_field = false;
 template <> constexpr inline bool is_decimal_field<DecimalField<Decimal32>> = true;
 template <> constexpr inline bool is_decimal_field<DecimalField<Decimal64>> = true;
@@ -215,9 +223,8 @@ using NearestFieldType = typename NearestFieldTypeImpl<T>::Type;
 template <> struct NearestFieldTypeImpl<char> { using Type = std::conditional_t<is_signed_v<char>, Int64, UInt64>; };
 template <> struct NearestFieldTypeImpl<signed char> { using Type = Int64; };
 template <> struct NearestFieldTypeImpl<unsigned char> { using Type = UInt64; };
-#ifdef __cpp_char8_t
 template <> struct NearestFieldTypeImpl<char8_t> { using Type = UInt64; };
-#endif
+template <> struct NearestFieldTypeImpl<Int8> { using Type = Int64; };
 
 template <> struct NearestFieldTypeImpl<UInt16> { using Type = UInt64; };
 template <> struct NearestFieldTypeImpl<UInt32> { using Type = UInt64; };
@@ -497,7 +504,7 @@ public:
 
         switch (which)
         {
-            case Types::Null:    return false;
+            case Types::Null:    return get<Null>() < rhs.get<Null>();
             case Types::Bool:    [[fallthrough]];
             case Types::UInt64:  return get<UInt64>()  < rhs.get<UInt64>();
             case Types::UInt128: return get<UInt128>() < rhs.get<UInt128>();
@@ -508,7 +515,9 @@ public:
             case Types::UUID:    return get<UUID>()    < rhs.get<UUID>();
             case Types::IPv4:    return get<IPv4>()    < rhs.get<IPv4>();
             case Types::IPv6:    return get<IPv6>()    < rhs.get<IPv6>();
-            case Types::Float64: return get<Float64>() < rhs.get<Float64>();
+            case Types::Float64:
+                static constexpr int nan_direction_hint = 1; /// Put NaN at the end
+                return FloatCompareHelper<Float64>::less(get<Float64>(), rhs.get<Float64>(), nan_direction_hint);
             case Types::String:  return get<String>()  < rhs.get<String>();
             case Types::Array:   return get<Array>()   < rhs.get<Array>();
             case Types::Tuple:   return get<Tuple>()   < rhs.get<Tuple>();
@@ -539,7 +548,7 @@ public:
 
         switch (which)
         {
-            case Types::Null:    return true;
+            case Types::Null:    return get<Null>() <= rhs.get<Null>();
             case Types::Bool: [[fallthrough]];
             case Types::UInt64:  return get<UInt64>()  <= rhs.get<UInt64>();
             case Types::UInt128: return get<UInt128>() <= rhs.get<UInt128>();
@@ -550,7 +559,14 @@ public:
             case Types::UUID:    return get<UUID>().toUnderType() <= rhs.get<UUID>().toUnderType();
             case Types::IPv4:    return get<IPv4>()    <= rhs.get<IPv4>();
             case Types::IPv6:    return get<IPv6>()    <= rhs.get<IPv6>();
-            case Types::Float64: return get<Float64>() <= rhs.get<Float64>();
+            case Types::Float64:
+            {
+                static constexpr int nan_direction_hint = 1; /// Put NaN at the end
+                Float64 f1 = get<Float64>();
+                Float64 f2 = get<Float64>();
+                return FloatCompareHelper<Float64>::less(f1, f2, nan_direction_hint)
+                    || FloatCompareHelper<Float64>::equals(f1, f2, nan_direction_hint);
+            }
             case Types::String:  return get<String>()  <= rhs.get<String>();
             case Types::Array:   return get<Array>()   <= rhs.get<Array>();
             case Types::Tuple:   return get<Tuple>()   <= rhs.get<Tuple>();
@@ -581,15 +597,13 @@ public:
 
         switch (which)
         {
-            case Types::Null: return true;
+            case Types::Null: return get<Null>() == rhs.get<Null>();
             case Types::Bool: [[fallthrough]];
             case Types::UInt64: return get<UInt64>() == rhs.get<UInt64>();
             case Types::Int64:   return get<Int64>() == rhs.get<Int64>();
             case Types::Float64:
-            {
-                // Compare as UInt64 so that NaNs compare as equal.
-                return std::bit_cast<UInt64>(get<Float64>()) == std::bit_cast<UInt64>(rhs.get<Float64>());
-            }
+                static constexpr int nan_direction_hint = 1; /// Put NaN at the end
+                return FloatCompareHelper<Float64>::equals(get<Float64>(), rhs.get<Float64>(), nan_direction_hint);
             case Types::UUID:    return get<UUID>()    == rhs.get<UUID>();
             case Types::IPv4:    return get<IPv4>()    == rhs.get<IPv4>();
             case Types::IPv6:    return get<IPv6>()    == rhs.get<IPv6>();
diff --git a/src/Core/LogsLevel.h b/src/Core/LogsLevel.h
new file mode 100644
index 00000000000..95721820d9c
--- /dev/null
+++ b/src/Core/LogsLevel.h
@@ -0,0 +1,16 @@
+#pragma once
+
+namespace DB
+{
+enum class LogsLevel
+{
+    none = 0, /// Disable
+    fatal,
+    error,
+    warning,
+    information,
+    debug,
+    trace,
+    test,
+};
+}
diff --git a/src/Core/MySQL/Authentication.cpp b/src/Core/MySQL/Authentication.cpp
index 2c10bd88722..ac625e216cd 100644
--- a/src/Core/MySQL/Authentication.cpp
+++ b/src/Core/MySQL/Authentication.cpp
@@ -9,6 +9,11 @@
 #include <Common/OpenSSLHelpers.h>
 
 #include <base/scope_guard.h>
+#include <base/defines.h>
+#include <string_view>
+
+
+using namespace std::literals;
 
 namespace DB
 {
@@ -102,7 +107,7 @@ void Native41::authenticate(
 
 #if USE_SSL
 
-Sha256Password::Sha256Password(RSA & public_key_, RSA & private_key_, Poco::Logger * log_)
+Sha256Password::Sha256Password(RSA & public_key_, RSA & private_key_, LoggerPtr log_)
     : public_key(public_key_), private_key(private_key_), log(log_)
 {
     /** Native authentication sent 20 bytes + '\0' character = 21 bytes.
diff --git a/src/Core/MySQL/Authentication.h b/src/Core/MySQL/Authentication.h
index ee6aaac02bc..3179fa20f59 100644
--- a/src/Core/MySQL/Authentication.h
+++ b/src/Core/MySQL/Authentication.h
@@ -61,7 +61,7 @@ private:
 class Sha256Password : public IPlugin
 {
 public:
-    Sha256Password(RSA & public_key_, RSA & private_key_, Poco::Logger * log_);
+    Sha256Password(RSA & public_key_, RSA & private_key_, LoggerPtr log_);
 
     String getName() override { return "sha256_password"; }
 
@@ -74,7 +74,7 @@ public:
 private:
     RSA & public_key;
     RSA & private_key;
-    Poco::Logger * log;
+    LoggerPtr log;
     String scramble;
 };
 #endif
diff --git a/src/Core/MySQL/MySQLReplication.h b/src/Core/MySQL/MySQLReplication.h
index 6ba507245b3..3387d952711 100644
--- a/src/Core/MySQL/MySQLReplication.h
+++ b/src/Core/MySQL/MySQLReplication.h
@@ -210,7 +210,7 @@ namespace MySQLReplication
     public:
         EventHeader header;
 
-        EventBase(EventHeader && header_) : header(std::move(header_)) {}
+        explicit EventBase(EventHeader && header_) : header(std::move(header_)) {}
 
         virtual ~EventBase() = default;
         virtual void dump(WriteBuffer & out) const = 0;
@@ -224,7 +224,7 @@ namespace MySQLReplication
     class FormatDescriptionEvent : public EventBase
     {
     public:
-        FormatDescriptionEvent(EventHeader && header_)
+        explicit FormatDescriptionEvent(EventHeader && header_)
             : EventBase(std::move(header_)), binlog_version(0), create_timestamp(0), event_header_length(0)
         {
         }
@@ -249,7 +249,7 @@ namespace MySQLReplication
         UInt64 position;
         String next_binlog;
 
-        RotateEvent(EventHeader && header_) : EventBase(std::move(header_)), position(0) {}
+        explicit RotateEvent(EventHeader && header_) : EventBase(std::move(header_)), position(0) {}
         void dump(WriteBuffer & out) const override;
 
     protected:
@@ -280,7 +280,7 @@ namespace MySQLReplication
         QueryType typ = QUERY_EVENT_DDL;
         bool transaction_complete = true;
 
-        QueryEvent(EventHeader && header_)
+        explicit QueryEvent(EventHeader && header_)
             : EventBase(std::move(header_)), thread_id(0), exec_time(0), schema_len(0), error_code(0), status_len(0)
         {
         }
@@ -295,7 +295,7 @@ namespace MySQLReplication
     class XIDEvent : public EventBase
     {
     public:
-        XIDEvent(EventHeader && header_) : EventBase(std::move(header_)), xid(0) {}
+        explicit XIDEvent(EventHeader && header_) : EventBase(std::move(header_)), xid(0) {}
 
     protected:
         UInt64 xid;
@@ -417,7 +417,7 @@ namespace MySQLReplication
         UInt64 table_id;
         UInt16 flags;
 
-        RowsEventHeader(EventType type_) : type(type_), table_id(0), flags(0) {}
+        explicit RowsEventHeader(EventType type_) : type(type_), table_id(0), flags(0) {}
         void parse(ReadBuffer & payload);
     };
 
@@ -482,7 +482,7 @@ namespace MySQLReplication
         UInt8 commit_flag;
         GTID gtid;
 
-        GTIDEvent(EventHeader && header_) : EventBase(std::move(header_)), commit_flag(0) {}
+        explicit GTIDEvent(EventHeader && header_) : EventBase(std::move(header_)), commit_flag(0) {}
         void dump(WriteBuffer & out) const override;
 
     protected:
@@ -492,7 +492,7 @@ namespace MySQLReplication
     class DryRunEvent : public EventBase
     {
     public:
-        DryRunEvent(EventHeader && header_) : EventBase(std::move(header_)) {}
+        explicit DryRunEvent(EventHeader && header_) : EventBase(std::move(header_)) {}
         void dump(WriteBuffer & out) const override;
 
     protected:
@@ -546,7 +546,7 @@ namespace MySQLReplication
         virtual void setGTIDSets(GTIDSets sets) = 0;
         virtual void setChecksumSignatureLength(size_t checksum_signature_length_) = 0;
 
-        virtual ~IFlavor() override = default;
+        ~IFlavor() override = default;
     };
 
     class MySQLFlavor : public IFlavor
diff --git a/src/Core/MySQL/MySQLUtils.cpp b/src/Core/MySQL/MySQLUtils.cpp
index 7ba6c32fd0d..0b75c0882cd 100644
--- a/src/Core/MySQL/MySQLUtils.cpp
+++ b/src/Core/MySQL/MySQLUtils.cpp
@@ -1,9 +1,11 @@
-#include "Common/assert_cast.h"
-#include "Columns/ColumnNullable.h"
-#include "Columns/ColumnsDateTime.h"
-#include "Core/DecimalFunctions.h"
-#include "DataTypes/IDataType.h"
-#include "base/types.h"
+#include <Core/MySQL/MySQLUtils.h>
+
+#include <Common/assert_cast.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnsDateTime.h>
+#include <Core/DecimalFunctions.h>
+#include <DataTypes/IDataType.h>
+#include <base/types.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/MySQLUtils.h b/src/Core/MySQL/MySQLUtils.h
index e77e9c22ee4..1418674519d 100644
--- a/src/Core/MySQL/MySQLUtils.h
+++ b/src/Core/MySQL/MySQLUtils.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Core/DecimalFunctions.h"
-#include "DataTypes/IDataType.h"
+#include <Core/DecimalFunctions.h>
+#include <DataTypes/IDataType.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/PacketEndpoint.cpp b/src/Core/MySQL/PacketEndpoint.cpp
index 97b5d3b4d11..085d7595167 100644
--- a/src/Core/MySQL/PacketEndpoint.cpp
+++ b/src/Core/MySQL/PacketEndpoint.cpp
@@ -40,7 +40,7 @@ bool PacketEndpoint::tryReceivePacket(IMySQLReadPacket & packet, UInt64 millisec
         ReadBufferFromPocoSocket * socket_in = typeid_cast<ReadBufferFromPocoSocket *>(in);
 
         if (!socket_in)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: Attempt to pull the duration in a non socket stream");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to pull the duration in a non socket stream");
 
         if (!socket_in->poll(millisecond * 1000))
             return false;
diff --git a/src/Core/MySQL/PacketsGeneric.h b/src/Core/MySQL/PacketsGeneric.h
index 969716dfc7a..f6222ea6645 100644
--- a/src/Core/MySQL/PacketsGeneric.h
+++ b/src/Core/MySQL/PacketsGeneric.h
@@ -93,7 +93,7 @@ protected:
     void writePayloadImpl(WriteBuffer & buffer) const override;
 
 public:
-    OKPacket(uint32_t capabilities_);
+    explicit OKPacket(uint32_t capabilities_);
 
     OKPacket(uint8_t header_, uint32_t capabilities_, uint64_t affected_rows_,
              uint32_t status_flags_, int16_t warnings_, String session_state_changes_ = "", String info_ = "");
@@ -180,7 +180,7 @@ protected:
     void readPayloadImpl(ReadBuffer & payload) override;
 
 public:
-    ResponsePacket(UInt32 server_capability_flags_);
+    explicit ResponsePacket(UInt32 server_capability_flags_);
 
     ResponsePacket(UInt32 server_capability_flags_, bool is_handshake_);
 };
diff --git a/src/Core/MySQL/PacketsProtocolBinary.cpp b/src/Core/MySQL/PacketsProtocolBinary.cpp
index 6a85dc685db..b3599baa25f 100644
--- a/src/Core/MySQL/PacketsProtocolBinary.cpp
+++ b/src/Core/MySQL/PacketsProtocolBinary.cpp
@@ -1,19 +1,20 @@
+#include <Core/MySQL/PacketsProtocolBinary.h>
+
+#include <base/DayNum.h>
+#include <base/types.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnVector.h>
 #include <Columns/IColumn.h>
+#include <Common/LocalDate.h>
+#include <Common/LocalDateTime.h>
+#include <Core/DecimalFunctions.h>
 #include <Core/MySQL/IMySQLReadPacket.h>
 #include <Core/MySQL/IMySQLWritePacket.h>
-#include <Core/MySQL/PacketsProtocolBinary.h>
-#include "Common/LocalDate.h"
-#include "Common/LocalDateTime.h"
-#include "Columns/ColumnNullable.h"
-#include "Columns/ColumnVector.h"
-#include "Core/DecimalFunctions.h"
-#include "DataTypes/DataTypeDateTime64.h"
-#include "DataTypes/DataTypeLowCardinality.h"
-#include "Formats/FormatSettings.h"
-#include "IO/WriteBufferFromString.h"
-#include "MySQLUtils.h"
-#include "base/DayNum.h"
-#include "base/types.h"
+#include <Core/MySQL/MySQLUtils.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Formats/FormatSettings.h>
+#include <IO/WriteBufferFromString.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/PacketsProtocolBinary.h b/src/Core/MySQL/PacketsProtocolBinary.h
index a440647d267..540c859a2d4 100644
--- a/src/Core/MySQL/PacketsProtocolBinary.h
+++ b/src/Core/MySQL/PacketsProtocolBinary.h
@@ -2,11 +2,11 @@
 
 #include <vector>
 #include <Columns/IColumn.h>
+#include <Core/DecimalFunctions.h>
 #include <Core/MySQL/IMySQLReadPacket.h>
 #include <Core/MySQL/IMySQLWritePacket.h>
-#include "Core/DecimalFunctions.h"
-#include "DataTypes/IDataType.h"
-#include "DataTypes/Serializations/ISerialization.h"
+#include <DataTypes/IDataType.h>
+#include <DataTypes/Serializations/ISerialization.h>
 
 namespace DB
 {
diff --git a/src/Core/MySQL/PacketsProtocolText.cpp b/src/Core/MySQL/PacketsProtocolText.cpp
index d84f6684671..349883b3be4 100644
--- a/src/Core/MySQL/PacketsProtocolText.cpp
+++ b/src/Core/MySQL/PacketsProtocolText.cpp
@@ -1,14 +1,15 @@
 #include <Core/MySQL/PacketsProtocolText.h>
+
+#include <Core/MySQL/MySQLUtils.h>
 #include <Columns/ColumnNullable.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include "Common/assert_cast.h"
-#include "Core/MySQL/IMySQLWritePacket.h"
-#include "DataTypes/DataTypeLowCardinality.h"
-#include "DataTypes/DataTypesDecimal.h"
+#include <Common/assert_cast.h>
+#include <Core/MySQL/IMySQLWritePacket.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypesDecimal.h>
 
-#include "MySQLUtils.h"
 
 namespace DB
 {
@@ -22,7 +23,7 @@ namespace ProtocolText
 ResultSetRow::ResultSetRow(const Serializations & serializations, const DataTypes & data_types, const Columns & columns_, size_t row_num_)
     : columns(columns_), row_num(row_num_)
 {
-    static FormatSettings format_settings = {.bool_true_representation = "1", .bool_false_representation = "0"};
+    FormatSettings format_settings = {.bool_true_representation = "1", .bool_false_representation = "0"};
 
     for (size_t i = 0; i < columns.size(); ++i)
     {
diff --git a/src/Core/MySQL/PacketsReplication.h b/src/Core/MySQL/PacketsReplication.h
index ca89217f3f1..a6d4d5ce786 100644
--- a/src/Core/MySQL/PacketsReplication.h
+++ b/src/Core/MySQL/PacketsReplication.h
@@ -34,7 +34,7 @@ protected:
     void writePayloadImpl(WriteBuffer & buffer) const override;
 
 public:
-    RegisterSlave(UInt32 server_id_);
+    explicit RegisterSlave(UInt32 server_id_);
 };
 
 /// https://dev.mysql.com/doc/internals/en/com-binlog-dump-gtid.html
diff --git a/src/Core/NamesAndAliases.h b/src/Core/NamesAndAliases.h
index 694d4095ace..bc46004bc5c 100644
--- a/src/Core/NamesAndAliases.h
+++ b/src/Core/NamesAndAliases.h
@@ -47,7 +47,7 @@ using NamesAndAliases = std::vector<NameAndAliasPair>;
 namespace std
 {
     template <> struct tuple_size<DB::NameAndAliasPair> : std::integral_constant<size_t, 2> {};
-    template <> struct tuple_element<0, DB::NameAndAliasPair> { using type = DB::String; };
+    template <> struct tuple_element<0, DB::NameAndAliasPair> { using type = String; };
     template <> struct tuple_element<1, DB::NameAndAliasPair> { using type = DB::DataTypePtr; };
-    template <> struct tuple_element<2, DB::NameAndAliasPair> { using type = DB::String; };
+    template <> struct tuple_element<2, DB::NameAndAliasPair> { using type = String; };
 }
diff --git a/src/Core/NamesAndTypes.cpp b/src/Core/NamesAndTypes.cpp
index 84913985c87..d6380a632f1 100644
--- a/src/Core/NamesAndTypes.cpp
+++ b/src/Core/NamesAndTypes.cpp
@@ -1,4 +1,3 @@
-#include <cstddef>
 #include <Core/NamesAndTypes.h>
 
 #include <base/sort.h>
@@ -12,6 +11,8 @@
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
 
+#include <boost/algorithm/string.hpp>
+#include <cstddef>
 
 namespace DB
 {
@@ -218,6 +219,16 @@ bool NamesAndTypesList::contains(const String & name) const
     return false;
 }
 
+bool NamesAndTypesList::containsCaseInsensitive(const String & name) const
+{
+    for (const NameAndTypePair & column : *this)
+    {
+        if (boost::iequals(column.name, name))
+            return true;
+    }
+    return false;
+}
+
 std::optional<NameAndTypePair> NamesAndTypesList::tryGetByName(const std::string & name) const
 {
     for (const NameAndTypePair & column : *this)
diff --git a/src/Core/NamesAndTypes.h b/src/Core/NamesAndTypes.h
index ba97d8b4592..915add9b7bc 100644
--- a/src/Core/NamesAndTypes.h
+++ b/src/Core/NamesAndTypes.h
@@ -114,8 +114,9 @@ public:
     /// Unlike `filter`, returns columns in the order in which they go in `names`.
     NamesAndTypesList addTypes(const Names & names) const;
 
-    /// Check that column contains in list
+    /// Check if `name` is one of the column names
     bool contains(const String & name) const;
+    bool containsCaseInsensitive(const String & name) const;
 
     /// Try to get column by name, returns empty optional if column not found
     std::optional<NameAndTypePair> tryGetByName(const std::string & name) const;
@@ -133,6 +134,6 @@ using NamesAndTypesLists = std::vector<NamesAndTypesList>;
 namespace std
 {
     template <> struct tuple_size<DB::NameAndTypePair> : std::integral_constant<size_t, 2> {};
-    template <> struct tuple_element<0, DB::NameAndTypePair> { using type = DB::String; };
+    template <> struct tuple_element<0, DB::NameAndTypePair> { using type = String; };
     template <> struct tuple_element<1, DB::NameAndTypePair> { using type = DB::DataTypePtr; };
 }
diff --git a/src/Core/PostgreSQL/Connection.cpp b/src/Core/PostgreSQL/Connection.cpp
index 5a589a80d02..eea24dd6940 100644
--- a/src/Core/PostgreSQL/Connection.cpp
+++ b/src/Core/PostgreSQL/Connection.cpp
@@ -9,7 +9,7 @@ namespace postgres
 
 Connection::Connection(const ConnectionInfo & connection_info_, bool replication_, size_t num_tries_)
     : connection_info(connection_info_), replication(replication_), num_tries(num_tries_)
-    , log(&Poco::Logger::get("PostgreSQLReplicaConnection"))
+    , log(getLogger("PostgreSQLReplicaConnection"))
 {
     if (replication)
         connection_info = {fmt::format("{} replication=database", connection_info.connection_string), connection_info.host_port};
@@ -65,7 +65,7 @@ void Connection::updateConnection()
     if (replication)
         connection->set_variable("default_transaction_isolation", "'repeatable read'");
 
-    LOG_DEBUG(&Poco::Logger::get("PostgreSQLConnection"), "New connection to {}", connection_info.host_port);
+    LOG_DEBUG(getLogger("PostgreSQLConnection"), "New connection to {}", connection_info.host_port);
 }
 
 void Connection::connect()
diff --git a/src/Core/PostgreSQL/Connection.h b/src/Core/PostgreSQL/Connection.h
index efc10b6ed20..5e0aa0983d5 100644
--- a/src/Core/PostgreSQL/Connection.h
+++ b/src/Core/PostgreSQL/Connection.h
@@ -6,6 +6,7 @@
 
 #include <pqxx/pqxx>
 #include <Core/Types.h>
+#include <Common/Logger.h>
 #include <boost/noncopyable.hpp>
 
 /** Methods to work with PostgreSQL connection object.
@@ -61,7 +62,7 @@ private:
     bool replication;
     size_t num_tries;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 using ConnectionPtr = std::unique_ptr<Connection>;
diff --git a/src/Core/PostgreSQL/PoolWithFailover.cpp b/src/Core/PostgreSQL/PoolWithFailover.cpp
index 3655681c515..a034c50094d 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.cpp
+++ b/src/Core/PostgreSQL/PoolWithFailover.cpp
@@ -32,7 +32,7 @@ PoolWithFailover::PoolWithFailover(
     , max_tries(max_tries_)
     , auto_close_connection(auto_close_connection_)
 {
-    LOG_TRACE(&Poco::Logger::get("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
+    LOG_TRACE(getLogger("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
               pool_size, pool_wait_timeout, max_tries_);
 
     for (const auto & [priority, configurations] : configurations_by_priority)
@@ -56,13 +56,13 @@ PoolWithFailover::PoolWithFailover(
     , max_tries(max_tries_)
     , auto_close_connection(auto_close_connection_)
 {
-    LOG_TRACE(&Poco::Logger::get("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
+    LOG_TRACE(getLogger("PostgreSQLConnectionPool"), "PostgreSQL connection pool size: {}, connection wait timeout: {}, max failover tries: {}",
               pool_size, pool_wait_timeout, max_tries_);
 
     /// Replicas have the same priority, but traversed replicas are moved to the end of the queue.
     for (const auto & [host, port] : configuration.addresses)
     {
-        LOG_DEBUG(&Poco::Logger::get("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
+        LOG_DEBUG(getLogger("PostgreSQLPoolWithFailover"), "Adding address host: {}, port: {} to connection pool", host, port);
         auto connection_string = formatConnectionString(configuration.database, host, port, configuration.username, configuration.password);
         replicas_with_priority[0].emplace_back(connection_string, pool_size);
     }
diff --git a/src/Core/PostgreSQL/PoolWithFailover.h b/src/Core/PostgreSQL/PoolWithFailover.h
index bf3782afba4..3c538fc3dea 100644
--- a/src/Core/PostgreSQL/PoolWithFailover.h
+++ b/src/Core/PostgreSQL/PoolWithFailover.h
@@ -62,7 +62,7 @@ private:
     size_t max_tries;
     bool auto_close_connection;
     std::mutex mutex;
-    Poco::Logger * log = &Poco::Logger::get("PostgreSQLConnectionPool");
+    LoggerPtr log = getLogger("PostgreSQLConnectionPool");
 };
 
 using PoolWithFailoverPtr = std::shared_ptr<PoolWithFailover>;
diff --git a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
index aa60bdee28a..b507b300769 100644
--- a/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
+++ b/src/Core/PostgreSQL/insertPostgreSQLValue.cpp
@@ -36,7 +36,7 @@ void insertDefaultPostgreSQLValue(IColumn & column, const IColumn & sample_colum
 
 void insertPostgreSQLValue(
         IColumn & column, std::string_view value,
-        const ExternalResultDescription::ValueType type, const DataTypePtr data_type,
+        ExternalResultDescription::ValueType type, DataTypePtr data_type,
         const std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t idx)
 {
     switch (type)
@@ -170,7 +170,7 @@ void insertPostgreSQLValue(
 
 
 void preparePostgreSQLArrayInfo(
-        std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t column_idx, const DataTypePtr data_type)
+        std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t column_idx, DataTypePtr data_type)
 {
     const auto * array_type = typeid_cast<const DataTypeArray *>(data_type.get());
     auto nested = array_type->getNestedType();
diff --git a/src/Core/PostgreSQL/insertPostgreSQLValue.h b/src/Core/PostgreSQL/insertPostgreSQLValue.h
index 3bc83292b96..bfb85422aa1 100644
--- a/src/Core/PostgreSQL/insertPostgreSQLValue.h
+++ b/src/Core/PostgreSQL/insertPostgreSQLValue.h
@@ -22,11 +22,11 @@ struct PostgreSQLArrayInfo
 
 void insertPostgreSQLValue(
         IColumn & column, std::string_view value,
-        const ExternalResultDescription::ValueType type, const DataTypePtr data_type,
+        ExternalResultDescription::ValueType type, DataTypePtr data_type,
         const std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t idx);
 
 void preparePostgreSQLArrayInfo(
-        std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t column_idx, const DataTypePtr data_type);
+        std::unordered_map<size_t, PostgreSQLArrayInfo> & array_info, size_t column_idx, DataTypePtr data_type);
 
 void insertDefaultPostgreSQLValue(IColumn & column, const IColumn & sample_column);
 
diff --git a/src/Core/PostgreSQLProtocol.h b/src/Core/PostgreSQLProtocol.h
index b0d7646a5f7..7630fbb0b23 100644
--- a/src/Core/PostgreSQLProtocol.h
+++ b/src/Core/PostgreSQLProtocol.h
@@ -872,7 +872,7 @@ public:
 class AuthenticationManager
 {
 private:
-    Poco::Logger * log = &Poco::Logger::get("AuthenticationManager");
+    LoggerPtr log = getLogger("AuthenticationManager");
     std::unordered_map<AuthenticationType, std::shared_ptr<AuthenticationMethod>> type_to_method = {};
 
 public:
diff --git a/src/Core/Protocol.h b/src/Core/Protocol.h
index 441e22f4a16..48107154753 100644
--- a/src/Core/Protocol.h
+++ b/src/Core/Protocol.h
@@ -56,10 +56,11 @@ namespace DB
 namespace EncodedUserInfo
 {
 
-/// Marker of the inter-server secret (passed in the user name)
+/// Marker for the inter-server secret (passed as the user name)
 /// (anyway user cannot be started with a whitespace)
 const char USER_INTERSERVER_MARKER[] = " INTERSERVER SECRET ";
-/// Marker of the SSH keys based authentication (passed in the user name)
+
+/// Marker for SSH-keys-based authentication (passed as the user name)
 const char SSH_KEY_AUTHENTICAION_MARKER[] = " SSH KEY AUTHENTICATION ";
 
 };
@@ -160,8 +161,8 @@ namespace Protocol
             ReadTaskResponse = 9,           /// A filename to read from s3 (used in s3Cluster)
             MergeTreeReadTaskResponse = 10, /// Coordinator's decision with a modified set of mark ranges allowed to read
 
-            SSHChallengeRequest = 11,       /// Request for SSH signature challenge
-            SSHChallengeResponse = 12,       /// Request for SSH signature challenge
+            SSHChallengeRequest = 11,       /// Request SSH signature challenge
+            SSHChallengeResponse = 12,      /// Reply to SSH signature challenge
             MAX = SSHChallengeResponse,
         };
 
diff --git a/src/Core/ProtocolDefines.h b/src/Core/ProtocolDefines.h
index 058c6fdc903..159a4c28b6d 100644
--- a/src/Core/ProtocolDefines.h
+++ b/src/Core/ProtocolDefines.h
@@ -76,6 +76,9 @@ static constexpr auto DBMS_MIN_REVISION_WITH_SPARSE_SERIALIZATION = 54465;
 
 static constexpr auto DBMS_MIN_REVISION_WITH_SSH_AUTHENTICATION = 54466;
 
+/// Send read-only flag for Replicated tables as well
+static constexpr auto DBMS_MIN_REVISION_WITH_TABLE_READ_ONLY_CHECK = 54467;
+
 /// Version of ClickHouse TCP protocol.
 ///
 /// Should be incremented manually on protocol changes.
@@ -83,6 +86,6 @@ static constexpr auto DBMS_MIN_REVISION_WITH_SSH_AUTHENTICATION = 54466;
 /// 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).
-static constexpr auto DBMS_TCP_PROTOCOL_VERSION = 54466;
+static constexpr auto DBMS_TCP_PROTOCOL_VERSION = 54467;
 
 }
diff --git a/src/Core/ServerSettings.h b/src/Core/ServerSettings.h
index 2a9fa8e744c..46e2dc649a6 100644
--- a/src/Core/ServerSettings.h
+++ b/src/Core/ServerSettings.h
@@ -40,6 +40,7 @@ namespace DB
     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(Bool, shutdown_wait_backups_and_restores, true, "If set to true ClickHouse will wait for running backups and restores to finish before shutdown.", 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 heavy asynchronous metrics.", 0) \
@@ -53,14 +54,19 @@ namespace DB
     M(UInt64, merges_mutations_memory_usage_soft_limit, 0, "Maximum total memory usage for merges and mutations in bytes. 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, cgroups_memory_usage_observer_wait_time, 15, "Polling interval in seconds to read the current memory usage from cgroups. Zero means disabled.", 0) \
+    M(Double, cgroup_memory_watcher_hard_limit_ratio, 0.95, "Hard memory limit ratio for cgroup memory usage observer", 0) \
+    M(Double, cgroup_memory_watcher_soft_limit_ratio, 0.9, "Sort memory limit ratio limit for cgroup memory usage observer", 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_queue_flush_on_shutdown, true, "If true queue of asynchronous inserts is flushed on graceful shutdown", 0) \
+    M(Bool, ignore_empty_sql_security_in_create_view_query, true, "If true, ClickHouse doesn't write defaults for empty SQL security statement in CREATE VIEW queries. This setting is only necessary for the migration period and will become obsolete in 24.4", 0)  \
     \
     M(UInt64, max_concurrent_queries, 0, "Maximum number of concurrently executed queries. Zero means unlimited.", 0) \
     M(UInt64, max_concurrent_insert_queries, 0, "Maximum number of concurrently INSERT queries. Zero means unlimited.", 0) \
     M(UInt64, max_concurrent_select_queries, 0, "Maximum number of concurrently SELECT queries. Zero means unlimited.", 0) \
+    M(UInt64, max_waiting_queries, 0, "Maximum number of concurrently waiting queries blocked due to `async_load_databases`. Note that waiting queries are not considered by `max_concurrent_*queries*` limits. Zero means unlimited.", 0) \
     \
-    M(Double, cache_size_to_ram_max_ratio, 0.5, "Set cache size ro RAM max ratio. Allows to lower cache size on low-memory systems.", 0) \
+    M(Double, cache_size_to_ram_max_ratio, 0.5, "Set cache size to RAM max ratio. Allows to lower cache size on low-memory systems.", 0) \
     M(String, uncompressed_cache_policy, DEFAULT_UNCOMPRESSED_CACHE_POLICY, "Uncompressed cache policy name.", 0) \
     M(UInt64, uncompressed_cache_size, DEFAULT_UNCOMPRESSED_CACHE_MAX_SIZE, "Size of cache for uncompressed blocks. Zero means disabled.", 0) \
     M(Double, uncompressed_cache_size_ratio, DEFAULT_UNCOMPRESSED_CACHE_SIZE_RATIO, "The size of the protected queue in the uncompressed cache relative to the cache's total size.", 0) \
@@ -73,10 +79,16 @@ namespace DB
     M(String, index_mark_cache_policy, DEFAULT_INDEX_MARK_CACHE_POLICY, "Secondary index mark cache policy name.", 0) \
     M(UInt64, index_mark_cache_size, DEFAULT_INDEX_MARK_CACHE_MAX_SIZE, "Size of cache for secondary index marks. Zero means disabled.", 0) \
     M(Double, index_mark_cache_size_ratio, DEFAULT_INDEX_MARK_CACHE_SIZE_RATIO, "The size of the protected queue in the secondary index mark cache relative to the cache's total size.", 0) \
+    M(UInt64, page_cache_chunk_size, 2 << 20, "Bytes per chunk in userspace page cache. Rounded up to a multiple of page size (typically 4 KiB) or huge page size (typically 2 MiB, only if page_cache_use_thp is enabled).", 0) \
+    M(UInt64, page_cache_mmap_size, 1 << 30, "Bytes per memory mapping in userspace page cache. Not important.", 0) \
+    M(UInt64, page_cache_size, 10ul << 30, "Amount of virtual memory to map for userspace page cache. If page_cache_use_madv_free is enabled, it's recommended to set this higher than the machine's RAM size. Use 0 to disable userspace page cache.", 0) \
+    M(Bool, page_cache_use_madv_free, DBMS_DEFAULT_PAGE_CACHE_USE_MADV_FREE, "If true, the userspace page cache will allow the OS to automatically reclaim memory from the cache on memory pressure (using MADV_FREE).", 0) \
+    M(Bool, page_cache_use_transparent_huge_pages, true, "Userspace will attempt to use transparent huge pages on Linux. This is best-effort.", 0) \
     M(UInt64, mmap_cache_size, DEFAULT_MMAP_CACHE_MAX_SIZE, "A cache for mmapped files.", 0) \
     \
-    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(Bool,   disable_internal_dns_cache, false, "Disable internal DNS caching at all.", 0) \
+    M(UInt64, dns_cache_max_entries, 10000, "Internal DNS cache max entries.", 0) \
+    M(Int32,  dns_cache_update_period, 15, "Internal DNS cache update period in seconds.", 0) \
     M(UInt32, dns_max_consecutive_failures, 10, "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) \
@@ -101,7 +113,6 @@ namespace DB
     M(UInt64, tables_loader_background_pool_size, 0, "The maximum number of threads that will be used for background async loading of tables. Zero means use all CPUs.", 0) \
     M(Bool, async_load_databases, false, "Enable asynchronous loading of databases and tables to speedup server startup. Queries to not yet loaded entity will be blocked until load is finished.", 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) \
-    \
     M(Seconds, keep_alive_timeout, DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT, "The number of seconds that ClickHouse waits for incoming requests before closing the connection.", 0) \
     M(Seconds, replicated_fetches_http_connection_timeout, 0, "HTTP connection timeout for part fetch requests. Inherited from default profile `http_connection_timeout` if not set explicitly.", 0) \
     M(Seconds, replicated_fetches_http_send_timeout, 0, "HTTP send timeout for part fetch requests. Inherited from default profile `http_send_timeout` if not set explicitly.", 0) \
@@ -112,8 +123,24 @@ namespace DB
     M(UInt64, total_memory_profiler_sample_max_allocation_size, 0, "Collect random allocations of size less or equal than specified value with probability equal to `total_memory_profiler_sample_probability`. 0 means disabled. You may want to set 'max_untracked_memory' to 0 to make this threshold to work as expected.", 0) \
     M(Bool, validate_tcp_client_information, false, "Validate client_information in the query packet over the native TCP protocol.", 0) \
     M(Bool, storage_metadata_write_full_object_key, false, "Write disk metadata files with VERSION_FULL_OBJECT_KEY format", 0) \
+    M(UInt64, max_materialized_views_count_for_table, 0, "A limit on the number of materialized views attached to a table.", 0) \
+    M(UInt32, max_database_replicated_create_table_thread_pool_size, 1, "The number of threads to create tables during replica recovery in DatabaseReplicated. Zero means number of threads equal number of cores.", 0) \
+    M(Bool, format_alter_operations_with_parentheses, false, "If enabled, each operation in alter queries will be surrounded with parentheses in formatted queries to make them less ambiguous.", 0) \
+    M(String, default_replica_path, "/clickhouse/tables/{uuid}/{shard}", "The path to the table in ZooKeeper", 0) \
+    M(String, default_replica_name, "{replica}", "The replica name in ZooKeeper", 0) \
+    M(UInt64, disk_connections_soft_limit, 5000, "Connections above this limit have significantly shorter time to live. The limit applies to the disks connections.", 0) \
+    M(UInt64, disk_connections_warn_limit, 10000, "Warning massages are written to the logs if number of in-use connections are higher than this limit. The limit applies to the disks connections.", 0) \
+    M(UInt64, disk_connections_store_limit, 30000, "Connections above this limit reset after use. Set to 0 to turn connection cache off. The limit applies to the disks connections.", 0) \
+    M(UInt64, storage_connections_soft_limit, 100, "Connections above this limit have significantly shorter time to live. The limit applies to the storages connections.", 0) \
+    M(UInt64, storage_connections_warn_limit, 1000, "Warning massages are written to the logs if number of in-use connections are higher than this limit. The limit applies to the storages connections.", 0) \
+    M(UInt64, storage_connections_store_limit, 5000, "Connections above this limit reset after use. Set to 0 to turn connection cache off. The limit applies to the storages connections.", 0) \
+    M(UInt64, http_connections_soft_limit, 100, "Connections above this limit have significantly shorter time to live. The limit applies to the http connections which do not belong to any disk or storage.", 0) \
+    M(UInt64, http_connections_warn_limit, 1000, "Warning massages are written to the logs if number of in-use connections are higher than this limit. The limit applies to the http connections which do not belong to any disk or storage.", 0) \
+    M(UInt64, http_connections_store_limit, 5000, "Connections above this limit reset after use. Set to 0 to turn connection cache off. The limit applies to the http connections which do not belong to any disk or storage.", 0) \
+    M(UInt64, global_profiler_real_time_period_ns, 0, "Period for real clock timer of global profiler (in nanoseconds). Set 0 value to turn off the real clock global profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
+    M(UInt64, global_profiler_cpu_time_period_ns, 0, "Period for CPU clock timer of global profiler (in nanoseconds). Set 0 value to turn off the CPU clock global profiler. Recommended value is at least 10000000 (100 times a second) for single queries or 1000000000 (once a second) for cluster-wide profiling.", 0) \
 
-    /// If you add a setting which can be updated at runtime, please update 'changeable_settings' map in StorageSystemServerSettings.cpp
+/// If you add a setting which can be updated at runtime, please update 'changeable_settings' map in StorageSystemServerSettings.cpp
 
 DECLARE_SETTINGS_TRAITS(ServerSettingsTraits, SERVER_SETTINGS)
 
diff --git a/src/Core/ServerUUID.cpp b/src/Core/ServerUUID.cpp
index bcc1fecb529..c2de6be7794 100644
--- a/src/Core/ServerUUID.cpp
+++ b/src/Core/ServerUUID.cpp
@@ -14,6 +14,11 @@ namespace ErrorCodes
 }
 
 void ServerUUID::load(const fs::path & server_uuid_file, Poco::Logger * log)
+{
+    server_uuid = loadServerUUID(server_uuid_file, log);
+}
+
+UUID loadServerUUID(const fs::path & server_uuid_file, Poco::Logger * log)
 {
     /// Write a uuid file containing a unique uuid if the file doesn't already exist during server start.
 
@@ -25,8 +30,7 @@ void ServerUUID::load(const fs::path & server_uuid_file, Poco::Logger * log)
             ReadBufferFromFile in(server_uuid_file);
             readUUIDText(uuid, in);
             assertEOF(in);
-            server_uuid = uuid;
-            return;
+            return uuid;
         }
         catch (...)
         {
@@ -44,7 +48,7 @@ void ServerUUID::load(const fs::path & server_uuid_file, Poco::Logger * log)
         out.write(uuid_str.data(), uuid_str.size());
         out.sync();
         out.finalize();
-        server_uuid = new_uuid;
+        return new_uuid;
     }
     catch (...)
     {
diff --git a/src/Core/ServerUUID.h b/src/Core/ServerUUID.h
index 36bbf0e6315..71ae9edc00e 100644
--- a/src/Core/ServerUUID.h
+++ b/src/Core/ServerUUID.h
@@ -1,12 +1,10 @@
 #pragma once
+
 #include <Core/UUID.h>
+#include <Common/Logger.h>
 #include <filesystem>
 
 namespace fs = std::filesystem;
-namespace Poco
-{
-    class Logger;
-}
 
 namespace DB
 {
@@ -23,4 +21,6 @@ public:
     static void load(const fs::path & server_uuid_file, Poco::Logger * log);
 };
 
+UUID loadServerUUID(const fs::path & server_uuid_file, Poco::Logger * log);
+
 }
diff --git a/src/Core/Settings.cpp b/src/Core/Settings.cpp
index a38197b9eeb..8257b94cd9f 100644
--- a/src/Core/Settings.cpp
+++ b/src/Core/Settings.cpp
@@ -15,6 +15,7 @@ namespace ErrorCodes
     extern const int THERE_IS_NO_PROFILE;
     extern const int NO_ELEMENTS_IN_CONFIG;
     extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+    extern const int BAD_ARGUMENTS;
 }
 
 IMPLEMENT_SETTINGS_TRAITS(SettingsTraits, LIST_OF_SETTINGS)
@@ -114,7 +115,11 @@ std::vector<String> Settings::getAllRegisteredNames() const
 void Settings::set(std::string_view name, const Field & value)
 {
     if (name == "compatibility")
+    {
+        if (value.getType() != Field::Types::Which::String)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected type of value for setting 'compatibility'. Expected String, got {}", value.getTypeName());
         applyCompatibilitySetting(value.get<String>());
+    }
     /// If we change setting that was changed by compatibility setting before
     /// we should remove it from settings_changed_by_compatibility_setting,
     /// otherwise the next time we will change compatibility setting
diff --git a/src/Core/Settings.h b/src/Core/Settings.h
index 0e6da579b10..78e482c6090 100644
--- a/src/Core/Settings.h
+++ b/src/Core/Settings.h
@@ -26,9 +26,8 @@ class IColumn;
   * `flags` can be either 0 or IMPORTANT.
   * A setting is "IMPORTANT" if it affects the results of queries and can't be ignored by older versions.
   *
-  * When adding new settings that control some backward incompatible changes or when changing some settings values,
-  * consider adding them to settings changes history in SettingsChangesHistory.h for special `compatibility` setting
-  * to work correctly.
+  * When adding new or changing existing settings add them to settings changes history in SettingsChangesHistory.h
+  * for tracking settings changes in different versions and for special `compatibility` setting to work correctly.
   */
 
 #define COMMON_SETTINGS(M, ALIAS) \
@@ -41,6 +40,8 @@ class IColumn;
     M(UInt64, min_insert_block_size_bytes, (DEFAULT_INSERT_BLOCK_SIZE * 256), "Squash blocks passed to INSERT query to specified size in bytes, if blocks are not big enough.", 0) \
     M(UInt64, min_insert_block_size_rows_for_materialized_views, 0, "Like min_insert_block_size_rows, but applied only during pushing to MATERIALIZED VIEW (default: min_insert_block_size_rows)", 0) \
     M(UInt64, min_insert_block_size_bytes_for_materialized_views, 0, "Like min_insert_block_size_bytes, but applied only during pushing to MATERIALIZED VIEW (default: min_insert_block_size_bytes)", 0) \
+    M(UInt64, min_external_table_block_size_rows, DEFAULT_INSERT_BLOCK_SIZE, "Squash blocks passed to external table to specified size in rows, if blocks are not big enough.", 0) \
+    M(UInt64, min_external_table_block_size_bytes, (DEFAULT_INSERT_BLOCK_SIZE * 256), "Squash blocks passed to external table to specified size in bytes, if blocks are not big enough.", 0) \
     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) \
@@ -62,7 +63,7 @@ class IColumn;
     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, 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(Seconds, tcp_keep_alive_timeout, DEFAULT_TCP_KEEP_ALIVE_TIMEOUT /* 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, 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) \
@@ -77,15 +78,23 @@ class IColumn;
     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, 3, "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, azure_strict_upload_part_size, 0, "The exact size of part to upload during multipart upload to Azure blob storage.", 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, azure_min_upload_part_size, 16*1024*1024, "The minimum size of part to upload during multipart upload to Azure blob storage.", 0) \
+    M(UInt64, azure_max_upload_part_size, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to Azure blob storage.", 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 is 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, azure_upload_part_size_multiply_factor, 2, "Multiply azure_min_upload_part_size by this factor each time azure_multiply_parts_count_threshold parts were uploaded from a single write to Azure blob storage.", 0) \
+    M(UInt64, azure_upload_part_size_multiply_parts_count_threshold, 500, "Each time this number of parts was uploaded to Azure blob storage, azure_min_upload_part_size is multiplied by azure_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.", 0) \
+    M(UInt64, azure_max_inflight_parts_for_one_file, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited.", 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, azure_max_single_part_upload_size, 100*1024*1024, "The maximum size of object to upload using singlepart upload to Azure blob storage.", 0) \
+    M(UInt64, azure_max_single_part_upload_size, 100*1024*1024, "The maximum size of object to upload using singlepart upload to Azure blob storage.", 0)                                                                             \
+    M(UInt64, azure_max_single_part_copy_size, 256*1024*1024, "The maximum size of object to copy using single part copy to Azure blob storage.", 0) \
     M(UInt64, s3_max_single_read_retries, 4, "The maximum number of retries during single S3 read.", 0) \
     M(UInt64, azure_max_single_read_retries, 4, "The maximum number of retries during single Azure blob storage read.", 0) \
+    M(UInt64, azure_max_unexpected_write_error_retries, 4, "The maximum number of retries in case of unexpected errors during Azure blob storage write", 0) \
     M(UInt64, s3_max_unexpected_write_error_retries, 4, "The maximum number of retries in case of unexpected errors during S3 write.", 0) \
     M(UInt64, s3_max_redirects, 10, "Max number of S3 redirects hops allowed.", 0) \
     M(UInt64, s3_max_connections, 1024, "The maximum number of connections per server.", 0) \
@@ -107,10 +116,11 @@ class IColumn;
     M(Bool, s3_disable_checksum, false, "Do not calculate a checksum when sending a file to S3. This speeds up writes by avoiding excessive processing passes on a file. It is mostly safe as the data of MergeTree tables is checksummed by ClickHouse anyway, and when S3 is accessed with HTTPS, the TLS layer already provides integrity while transferring through the network. While additional checksums on S3 give defense in depth.", 0) \
     M(UInt64, s3_retry_attempts, 100, "Setting for Aws::Client::RetryStrategy, Aws::Client does retries itself, 0 means no retries", 0) \
     M(UInt64, s3_request_timeout_ms, 30000, "Idleness timeout for sending and receiving data to/from S3. Fail if a single TCP read or write call blocks for this long.", 0) \
-    M(UInt64, s3_http_connection_pool_size, 1000, "How many reusable open connections to keep per S3 endpoint. This only applies to the S3 table engine and table function, not to S3 disks (for disks, use disk config instead). Global setting, can only be set in config, overriding it per session or per query has no effect.", 0) \
+    M(UInt64, s3_connect_timeout_ms, 1000, "Connection timeout for host from s3 disks.", 0) \
     M(Bool, enable_s3_requests_logging, false, "Enable very explicit logging of S3 requests. Makes sense for debug only.", 0) \
     M(String, s3queue_default_zookeeper_path, "/clickhouse/s3queue/", "Default zookeeper path prefix for S3Queue engine", 0) \
     M(Bool, s3queue_enable_logging_to_s3queue_log, false, "Enable writing to system.s3queue_log. The value can be overwritten per table with table settings", 0) \
+    M(Bool, s3queue_allow_experimental_sharded_mode, false, "Enable experimental sharded mode of S3Queue table engine. It is experimental because it will be rewritten", 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) \
     M(Bool, hdfs_create_new_file_on_insert, false, "Enables or disables creating a new file on each insert in hdfs engine tables", 0) \
@@ -126,6 +136,7 @@ class IColumn;
     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) \
     \
+    M(Bool, distributed_insert_skip_read_only_replicas, false, "If true, INSERT into Distributed will skip read-only replicas.", 0) \
     M(Bool, distributed_foreground_insert, false, "If setting is enabled, insert query into distributed waits until data are sent to all nodes in a cluster. \n\nEnables or disables synchronous data insertion into a `Distributed` table.\n\nBy default, when inserting data into a Distributed table, the ClickHouse server sends data to cluster nodes in the background. When `distributed_foreground_insert` = 1, the data is processed synchronously, and the `INSERT` operation succeeds only after all the data is saved on all shards (at least one replica for each shard if `internal_replication` is true).", 0) ALIAS(insert_distributed_sync) \
     M(UInt64, distributed_background_insert_timeout, 0, "Timeout for insert query into distributed. Setting is used only with insert_distributed_sync enabled. Zero value means no timeout.", 0) ALIAS(insert_distributed_timeout) \
     M(Milliseconds, distributed_background_insert_sleep_time_ms, 100, "Sleep time for background INSERTs into Distributed, in case of any errors delay grows exponentially.", 0) ALIAS(distributed_directory_monitor_sleep_time_ms) \
@@ -154,9 +165,11 @@ class IColumn;
     M(Float, totals_auto_threshold, 0.5, "The threshold for totals_mode = 'auto'.", 0) \
     \
     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_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 misuse", 0) \
     M(Bool, allow_suspicious_indices, false, "Reject primary/secondary indexes and sorting keys with identical expressions", 0) \
     M(Bool, allow_suspicious_ttl_expressions, false, "Reject TTL expressions that don't depend on any of table's columns. It indicates a user error most of the time.", 0) \
+    M(Bool, allow_suspicious_variant_types, false, "In CREATE TABLE statement allows specifying Variant type with similar variant types (for example, with different numeric or date types). Enabling this setting may introduce some ambiguity when working with values with similar types.", 0) \
+    M(Bool, allow_suspicious_primary_key, false, "Forbid suspicious PRIMARY KEY/ORDER BY for MergeTree (i.e. SimpleAggregateFunction)", 0) \
     M(Bool, compile_expressions, false, "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) \
@@ -171,10 +184,11 @@ class IColumn;
     M(Bool, enable_positional_arguments, true, "Enable positional arguments in ORDER BY, GROUP BY and LIMIT BY", 0) \
     M(Bool, enable_extended_results_for_datetime_functions, false, "Enable date functions like toLastDayOfMonth return Date32 results (instead of Date results) for Date32/DateTime64 arguments.", 0) \
     M(Bool, allow_nonconst_timezone_arguments, false, "Allow non-const timezone arguments in certain time-related functions like toTimeZone(), fromUnixTimestamp*(), snowflakeToDateTime*()", 0) \
+    M(Bool, function_locate_has_mysql_compatible_argument_order, true, "Function locate() has arguments (needle, haystack[, start_pos]) like in MySQL instead of (haystack, needle[, start_pos]) like function position()", 0) \
     \
     M(Bool, group_by_use_nulls, false, "Treat columns mentioned in ROLLUP, CUBE or GROUPING SETS as Nullable", 0) \
     \
-    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(NonZeroUInt64, 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. Should be always greater than 0", 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) \
@@ -182,9 +196,11 @@ class IColumn;
     \
     M(String, cluster_for_parallel_replicas, "", "Cluster for a shard in which current server is located", 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(Bool, parallel_replicas_allow_in_with_subquery, true, "If true, subquery for IN will be executed on every follower replica.", 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(UInt64, parallel_replicas_min_number_of_rows_per_replica, 0, "Limit the number of replicas used in a query to (estimated rows to read / min_number_of_rows_per_replica). The max is still limited by 'max_parallel_replicas'", 0) \
+    M(Bool, parallel_replicas_prefer_local_join, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN.", 0) \
     M(UInt64, parallel_replicas_mark_segment_size, 128, "Parts virtually divided into segments to be distributed between replicas for parallel reading. This setting controls the size of these segments. Not recommended to change until you're absolutely sure in what you're doing", 0) \
     \
     M(Bool, skip_unavailable_shards, false, "If true, ClickHouse silently skips unavailable shards. Shard is marked as unavailable when: 1) The shard cannot be reached due to a connection failure. 2) Shard is unresolvable through DNS. 3) Table does not exist on the shard.", 0) \
@@ -215,11 +231,13 @@ class IColumn;
     M(UInt64, merge_tree_max_rows_to_use_cache, (128 * 8192), "The maximum number of rows per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
     M(UInt64, merge_tree_max_bytes_to_use_cache, (192 * 10 * 1024 * 1024), "The maximum number of bytes per request, to use the cache of uncompressed data. If the request is large, the cache is not used. (For large queries not to flush out the cache.)", 0) \
     M(Bool, do_not_merge_across_partitions_select_final, false, "Merge parts only in one partition in select final", 0) \
+    M(Bool, split_parts_ranges_into_intersecting_and_non_intersecting_final, true, "Split parts ranges into intersecting and non intersecting during FINAL optimization", 0) \
+    M(Bool, split_intersecting_parts_ranges_into_layers_final, true, "Split intersecting parts ranges into layers during FINAL optimization", 0) \
     M(Bool, allow_experimental_inverted_index, false, "If it is set to true, allow to use experimental inverted index.", 0) \
     \
     M(UInt64, mysql_max_rows_to_insert, 65536, "The maximum number of rows in MySQL batch insertion of the MySQL storage engine", 0) \
-    M(Bool, mysql_map_string_to_text_in_show_columns, false, "If enabled, String type will be mapped to TEXT in SHOW [FULL] COLUMNS, BLOB otherwise.", 0) \
-    M(Bool, mysql_map_fixed_string_to_text_in_show_columns, false, "If enabled, FixedString type will be mapped to TEXT in SHOW [FULL] COLUMNS, BLOB otherwise.", 0) \
+    M(Bool, mysql_map_string_to_text_in_show_columns, true, "If enabled, String type will be mapped to TEXT in SHOW [FULL] COLUMNS, BLOB otherwise. Has an effect only when the connection is made through the MySQL wire protocol.", 0) \
+    M(Bool, mysql_map_fixed_string_to_text_in_show_columns, true, "If enabled, FixedString type will be mapped to TEXT in SHOW [FULL] COLUMNS, BLOB otherwise. Has an effect only when the connection is made through the MySQL wire protocol.", 0) \
     \
     M(UInt64, optimize_min_equality_disjunction_chain_length, 3, "The minimum length of the expression `expr = x1 OR ... expr = xN` for optimization ", 0) \
     M(UInt64, optimize_min_inequality_conjunction_chain_length, 3, "The minimum length of the expression `expr <> x1 AND ... expr <> xN` for optimization ", 0) \
@@ -253,16 +271,16 @@ class IColumn;
     M(LogQueriesType, log_queries_min_type, QueryLogElementType::QUERY_START, "Minimal type in query_log to log, possible values (from low to high): QUERY_START, QUERY_FINISH, EXCEPTION_BEFORE_START, EXCEPTION_WHILE_PROCESSING.", 0) \
     M(Milliseconds, log_queries_min_query_duration_ms, 0, "Minimal time for the query to run, to get to the query_log/query_thread_log/query_views_log.", 0) \
     M(UInt64, log_queries_cut_to_length, 100000, "If query length is greater than specified threshold (in bytes), then cut query when writing to query log. Also limit length of printed query in ordinary text log.", 0) \
-    M(Float, log_queries_probability, 1., "Log queries with the specified probabality.", 0) \
+    M(Float, log_queries_probability, 1., "Log queries with the specified probability.", 0) \
     \
-    M(Bool, log_processors_profiles, false, "Log Processors profile events.", 0) \
+    M(Bool, log_processors_profiles, true, "Log Processors profile events.", 0) \
     M(DistributedProductMode, distributed_product_mode, DistributedProductMode::DENY, "How are distributed subqueries performed inside IN or JOIN sections?", IMPORTANT) \
     \
     M(UInt64, max_concurrent_queries_for_all_users, 0, "The maximum number of concurrent requests for all users.", 0) \
     M(UInt64, max_concurrent_queries_for_user, 0, "The maximum number of concurrent requests per user.", 0) \
     \
-    M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \
-    M(Bool, async_insert_deduplicate, false, "For async INSERT queries in the replicated table, specifies that deduplication of insertings blocks should be performed", 0) \
+    M(Bool, insert_deduplicate, true, "For INSERT queries in the replicated table, specifies that deduplication of inserting blocks should be performed", 0) \
+    M(Bool, async_insert_deduplicate, false, "For async INSERT queries in the replicated table, specifies that deduplication of inserting blocks should be performed", 0) \
     \
     M(UInt64Auto, insert_quorum, 0, "For INSERT queries in the replicated table, wait writing for the specified number of replicas and linearize the addition of the data. 0 - disabled, 'auto' - use majority", 0) \
     M(Milliseconds, insert_quorum_timeout, 600000, "If the quorum of replicas did not meet in specified time (in milliseconds), exception will be thrown and insertion is aborted.", 0) \
@@ -277,6 +295,7 @@ class IColumn;
     M(UInt64, read_backoff_min_concurrency, 1, "Settings to try keeping the minimal number of threads in case of slow reads.", 0) \
     \
     M(Float, memory_tracker_fault_probability, 0., "For testing of `exception safety` - throw an exception every time you allocate memory with the specified probability.", 0) \
+    M(Float, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability, 0.0, "For testing of `PartsSplitter` - split read ranges into intersecting and non intersecting every time you read from MergeTree with the specified probability.", 0) \
     \
     M(Bool, enable_http_compression, false, "Compress the result if the client over HTTP said that it understands data compressed by gzip, deflate, zstd, br, lz4, bz2, xz.", 0) \
     M(Int64, http_zlib_compression_level, 3, "Compression level - used if the client on HTTP said that it understands data compressed by gzip or deflate.", 0) \
@@ -362,8 +381,10 @@ class IColumn;
     M(Float, opentelemetry_start_trace_probability, 0., "Probability to start an OpenTelemetry trace for an incoming query.", 0) \
     M(Bool, opentelemetry_trace_processors, false, "Collect OpenTelemetry spans for processors.", 0) \
     M(Bool, prefer_column_name_to_alias, false, "Prefer using column names instead of aliases if possible.", 0) \
-    M(Bool, allow_experimental_analyzer, false, "Allow experimental analyzer", 0) \
+    M(Bool, allow_experimental_analyzer, true, "Allow experimental analyzer.", 0) \
+    M(Bool, analyzer_compatibility_join_using_top_level_identifier, false, "Force to resolve identifier in JOIN USING from projection (for example, in `SELECT a + 1 AS b FROM t1 JOIN t2 USING (b)` join will be performed by `t1.a + 1 = t2.b`, rather then `t1.b = t2.b`).", 0) \
     M(Bool, prefer_global_in_and_join, false, "If enabled, all IN/JOIN operators will be rewritten as GLOBAL IN/JOIN. It's useful when the to-be-joined tables are only available on the initiator and we need to always scatter their data on-the-fly during distributed processing with the GLOBAL keyword. It's also useful to reduce the need to access the external sources joining external tables.", 0) \
+    M(Bool, enable_vertical_final, true, "If enable, remove duplicated rows during FINAL by marking rows as deleted and filtering them later instead of merging rows", 0) \
     \
     \
     /** Limits during query execution are part of the settings. \
@@ -407,6 +428,7 @@ class IColumn;
     M(UInt64, min_execution_speed_bytes, 0, "Minimum number of execution bytes per second.", 0) \
     M(UInt64, max_execution_speed_bytes, 0, "Maximum number of execution bytes per second.", 0) \
     M(Seconds, timeout_before_checking_execution_speed, 10, "Check that the speed is not too low after the specified time has elapsed.", 0) \
+    M(Seconds, max_estimated_execution_time, 0, "Maximum query estimate execution time in seconds.", 0) \
     \
     M(UInt64, max_columns_to_read, 0, "If a query requires reading more than specified number of columns, exception is thrown. Zero value means unlimited. This setting is useful to prevent too complex queries.", 0) \
     M(UInt64, max_temporary_columns, 0, "If a query generates more than the specified number of temporary columns in memory as a result of intermediate calculation, exception is thrown. Zero value means unlimited. This setting is useful to prevent too complex queries.", 0) \
@@ -435,11 +457,11 @@ class IColumn;
     M(UInt64, partial_merge_join_left_table_buffer_bytes, 0, "If not 0 group left table blocks in bigger ones for left-side table in partial merge join. It uses up to 2x of specified memory per joining thread.", 0) \
     M(UInt64, partial_merge_join_rows_in_right_blocks, 65536, "Split right-hand joining data in blocks of specified size. It's a portion of data indexed by min-max values and possibly unloaded on disk.", 0) \
     M(UInt64, join_on_disk_max_files_to_merge, 64, "For MergeJoin on disk set how much files it's allowed to sort simultaneously. Then this value bigger then more memory used and then less disk I/O needed. Minimum is 2.", 0) \
-    M(UInt64, max_rows_in_set_to_optimize_join, 100'000, "Maximal size of the set to filter joined tables by each other row sets before joining. 0 - disable.", 0) \
+    M(UInt64, max_rows_in_set_to_optimize_join, 0, "Maximal size of the set to filter joined tables by each other row sets before joining. 0 - disable.", 0) \
     \
     M(Bool, compatibility_ignore_collation_in_create_table, true, "Compatibility ignore collation in create table", 0) \
     \
-    M(String, temporary_files_codec, "LZ4", "Set compression codec for temporary files (sort and join on disk). I.e. LZ4, NONE.", 0) \
+    M(String, temporary_files_codec, "LZ4", "Set compression codec for temporary files produced by (JOINs, external GROUP BY, external ORDER BY). I.e. LZ4, NONE.", 0) \
     \
     M(UInt64, max_rows_to_transfer, 0, "Maximum size (in rows) of the transmitted external table obtained when the GLOBAL IN/JOIN section is executed.", 0) \
     M(UInt64, max_bytes_to_transfer, 0, "Maximum size (in uncompressed bytes) of the transmitted external table obtained when the GLOBAL IN/JOIN section is executed.", 0) \
@@ -557,7 +579,7 @@ class IColumn;
     M(UInt64, min_free_disk_space_for_temporary_data, 0, "The minimum disk space to keep while writing temporary data used in external sorting and aggregation.", 0) \
     \
     M(DefaultTableEngine, default_temporary_table_engine, DefaultTableEngine::Memory, "Default table engine used when ENGINE is not set in CREATE TEMPORARY statement.",0) \
-    M(DefaultTableEngine, default_table_engine, DefaultTableEngine::None, "Default table engine used when ENGINE is not set in CREATE statement.",0) \
+    M(DefaultTableEngine, default_table_engine, DefaultTableEngine::MergeTree, "Default table engine used when ENGINE is not set in CREATE statement.",0) \
     M(Bool, show_table_uuid_in_table_create_query_if_not_nil, false, "For tables in databases with Engine=Atomic show UUID of the table in its CREATE query.", 0) \
     M(Bool, database_atomic_wait_for_drop_and_detach_synchronously, false, "When executing DROP or DETACH TABLE in Atomic database, wait for table data to be finally dropped or detached.", 0) \
     M(Bool, enable_scalar_subquery_optimization, true, "If it is set to true, prevent scalar subqueries from (de)serializing large scalar values and possibly avoid running the same subquery more than once.", 0) \
@@ -568,6 +590,7 @@ class IColumn;
     M(Bool, optimize_respect_aliases, true, "If it is set to true, it will respect aliases in WHERE/GROUP BY/ORDER BY, that will help with partition pruning/secondary indexes/optimize_aggregation_in_order/optimize_read_in_order/optimize_trivial_count", 0) \
     M(UInt64, mutations_sync, 0, "Wait for synchronous execution of ALTER TABLE UPDATE/DELETE queries (mutations). 0 - execute asynchronously. 1 - wait current server. 2 - wait all replicas if they exist.", 0) \
     M(Bool, enable_lightweight_delete, true, "Enable lightweight DELETE mutations for mergetree tables.", 0) ALIAS(allow_experimental_lightweight_delete) \
+    M(UInt64, lightweight_deletes_sync, 2, "The same as 'mutation_sync', but controls only execution of lightweight deletes", 0) \
     M(Bool, apply_deleted_mask, true, "Enables filtering out rows deleted with lightweight DELETE. If disabled, a query will be able to read those rows. This is useful for debugging and \"undelete\" scenarios", 0) \
     M(Bool, optimize_normalize_count_variants, true, "Rewrite aggregate functions that semantically equals to count() as count().", 0) \
     M(Bool, optimize_injective_functions_inside_uniq, true, "Delete injective functions of one argument inside uniq*() functions.", 0) \
@@ -584,18 +607,22 @@ class IColumn;
     M(Bool, optimize_using_constraints, false, "Use constraints for query optimization", 0)                                                                                                                                           \
     M(Bool, optimize_substitute_columns, false, "Use constraints for column substitution", 0)                                                                                                                                         \
     M(Bool, optimize_append_index, false, "Use constraints in order to append index condition (indexHint)", 0) \
+    M(Bool, optimize_time_filter_with_preimage, true, "Optimize Date and DateTime predicates by converting functions into equivalent comparisons without conversions (e.g. toYear(col) = 2023 -> col >= '2023-01-01' AND col <= '2023-12-31')", 0) \
     M(Bool, normalize_function_names, true, "Normalize function names to their canonical names", 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, enable_early_constant_folding, true, "Enable query optimization where we analyze function and subqueries results and rewrite query if there are 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, throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert, true, "Throw exception on INSERT query when the setting `deduplicate_blocks_in_dependent_materialized_views` is enabled along with `async_insert`. It guarantees correctness, because these features can't work together.", 0) \
+    M(Bool, update_insert_deduplication_token_in_dependent_materialized_views, false, "Should update insert deduplication token with table identifier during insert in dependent materialized views.", 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, ignore_materialized_views_with_dropped_target_table, false, "Ignore MVs with dropped taraget table during pushing to views", 0) \
+    M(Bool, ignore_materialized_views_with_dropped_target_table, false, "Ignore MVs with dropped target table during pushing to views", 0) \
     M(Bool, allow_experimental_refreshable_materialized_view, false, "Allow refreshable materialized views (CREATE MATERIALIZED VIEW <name> REFRESH ...).", 0) \
     M(Bool, stop_refreshable_materialized_views_on_startup, false, "On server startup, prevent scheduling of refreshable materialized views, as if with SYSTEM STOP VIEWS. You can manually start them with SYSTEM START VIEWS or SYSTEM START VIEW <name> afterwards. Also applies to newly created views. Has no effect on non-refreshable materialized views.", 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) \
+    M(UInt64, max_parser_backtracks, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, "Maximum parser backtracking (how many times it tries different alternatives in the recursive descend parsing process).", 0) \
     M(Bool, allow_settings_after_format_in_insert, false, "Allow SETTINGS after FORMAT, but note, that this is not always safe (note: this is a compatibility setting).", 0) \
-    M(Seconds, periodic_live_view_refresh, DEFAULT_PERIODIC_LIVE_VIEW_REFRESH_SEC, "Interval after which periodically refreshed live view is forced to refresh.", 0) \
+    M(Seconds, periodic_live_view_refresh, 60, "Interval after which periodically refreshed live view is forced to refresh.", 0) \
     M(Bool, transform_null_in, false, "If enabled, NULL values will be matched with 'IN' operator as if they are considered equal.", 0) \
     M(Bool, allow_nondeterministic_mutations, false, "Allow non-deterministic functions in ALTER UPDATE/ALTER DELETE statements", 0) \
     M(Seconds, lock_acquire_timeout, DBMS_DEFAULT_LOCK_ACQUIRE_TIMEOUT_SEC, "How long locking request should wait before failing", 0) \
@@ -642,6 +669,7 @@ 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(QueryCacheNondeterministicFunctionHandling, query_cache_nondeterministic_function_handling, QueryCacheNondeterministicFunctionHandling::Throw, "How the query cache handles queries with non-deterministic functions, e.g. now()", 0) \
+    M(QueryCacheSystemTableHandling, query_cache_system_table_handling, QueryCacheSystemTableHandling::Throw, "How the query cache handles queries against system tables, i.e. tables in databases 'system.*' and 'information_schema.*'", 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) \
@@ -686,7 +714,7 @@ class IColumn;
     M(Bool, database_replicated_allow_replicated_engine_arguments, true, "Allow to create only Replicated tables in database with engine Replicated with explicit arguments", 0) \
     M(Bool, cloud_mode, false, "Only available in ClickHouse Cloud", 0) \
     M(UInt64, cloud_mode_engine, 1, "Only available in ClickHouse Cloud", 0) \
-    M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result, one of: 'none', 'throw', 'null_status_on_timeout', 'never_throw'", 0) \
+    M(DistributedDDLOutputMode, distributed_ddl_output_mode, DistributedDDLOutputMode::THROW, "Format of distributed DDL query result, one of: 'none', 'throw', 'null_status_on_timeout', 'never_throw', 'none_only_active', 'throw_only_active', 'null_status_on_timeout_only_active'", 0) \
     M(UInt64, distributed_ddl_entry_format_version, 5, "Compatibility version of distributed DDL (ON CLUSTER) queries", 0) \
     \
     M(UInt64, external_storage_max_read_rows, 0, "Limit maximum number of rows when table with external engine should flush history data. Now supported only for MySQL table engine, database engine, dictionary and MaterializedMySQL. If equal to 0, this setting is disabled", 0) \
@@ -698,6 +726,7 @@ class IColumn;
     M(SetOperationMode, intersect_default_mode, SetOperationMode::ALL, "Set default mode in INTERSECT query. Possible values: empty string, 'ALL', 'DISTINCT'. If empty, query without mode will throw exception.", 0) \
     M(SetOperationMode, except_default_mode, SetOperationMode::ALL, "Set default mode in EXCEPT query. Possible values: empty string, 'ALL', 'DISTINCT'. If empty, query without mode will throw exception.", 0) \
     M(Bool, optimize_aggregators_of_group_by_keys, true, "Eliminates min/max/any/anyLast aggregators of GROUP BY keys in SELECT section", 0) \
+    M(Bool, optimize_injective_functions_in_group_by, true, "Replaces injective functions by it's arguments in GROUP BY section", 0) \
     M(Bool, optimize_group_by_function_keys, true, "Eliminates functions of other keys in GROUP BY section", 0) \
     M(Bool, optimize_group_by_constant_keys, true, "Optimize GROUP BY when all keys in block are constant", 0) \
     M(Bool, legacy_column_name_of_tuple_literal, false, "List all names of element of large tuple literals in their column names instead of hash. This settings exists only for compatibility reasons. It makes sense to set to 'true', while doing rolling update of cluster from version lower than 21.7 to higher.", 0) \
@@ -709,6 +738,7 @@ class IColumn;
     M(Bool, query_plan_split_filter, true, "Allow to split filters in the query plan", 0) \
     M(Bool, query_plan_merge_expressions, true, "Allow to merge expressions in the query plan", 0) \
     M(Bool, query_plan_filter_push_down, true, "Allow to push down filter by predicate query plan step", 0) \
+    M(Bool, query_plan_optimize_prewhere, true, "Allow to push down filter to PREWHERE expression for supported storages", 0) \
     M(Bool, query_plan_execute_functions_after_sorting, true, "Allow to re-order functions after sorting", 0) \
     M(Bool, query_plan_reuse_storage_ordering_for_window_functions, true, "Allow to use the storage sorting for window functions", 0) \
     M(Bool, query_plan_lift_up_union, true, "Allow to move UNIONs up so that more parts of the query plan can be optimized", 0) \
@@ -724,6 +754,7 @@ 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(UInt64, function_sleep_max_microseconds_per_block, 3000000, "Maximum number of microseconds the function `sleep` is allowed to sleep for each block. If a user called it with a larger value, it throws an exception. It is a safety threshold.", 0) \
+    M(UInt64, function_visible_width_behavior, 1, "The version of `visibleWidth` behavior. 0 - only count the number of code points; 1 - correctly count zero-width and combining characters, count full-width characters as two, estimate the tab width, count delete characters.", 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::pread, "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) \
@@ -743,9 +774,14 @@ class IColumn;
     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) \
+    M(UInt64, async_insert_max_data_size, 10485760, "Maximum size in bytes of unparsed data collected per query before being inserted", 0) \
     M(UInt64, async_insert_max_query_number, 450, "Maximum number of insert queries before being inserted", 0) \
-    M(Milliseconds, async_insert_busy_timeout_ms, 200, "Maximum time to wait before dumping collected data per query since the first data appeared", 0) \
+    M(Milliseconds, async_insert_poll_timeout_ms, 10, "Timeout for polling data from asynchronous insert queue", 0) \
+    M(Bool, async_insert_use_adaptive_busy_timeout, true, "If it is set to true, use adaptive busy timeout for asynchronous inserts", 0) \
+    M(Milliseconds, async_insert_busy_timeout_min_ms, 50, "If auto-adjusting is enabled through async_insert_use_adaptive_busy_timeout, minimum time to wait before dumping collected data per query since the first data appeared. It also serves as the initial value for the adaptive algorithm", 0) \
+    M(Milliseconds, async_insert_busy_timeout_max_ms, 200, "Maximum time to wait before dumping collected data per query since the first data appeared.", 0) ALIAS(async_insert_busy_timeout_ms) \
+    M(Double, async_insert_busy_timeout_increase_rate, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout increases", 0) \
+    M(Double, async_insert_busy_timeout_decrease_rate, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout decreases", 0) \
     \
     M(UInt64, remote_fs_read_max_backoff_ms, 10000, "Max wait time when trying to read data for remote disk", 0) \
     M(UInt64, remote_fs_read_backoff_max_tries, 5, "Max attempts to read with backoff", 0) \
@@ -757,11 +793,16 @@ class IColumn;
     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) \
     M(UInt64, filesystem_cache_segments_batch_size, 20, "Limit on size of a single batch of file segments that a read buffer can request from cache. Too low value will lead to excessive requests to cache, too large may slow down eviction from cache", 0) \
+    M(UInt64, filesystem_cache_reserve_space_wait_lock_timeout_milliseconds, 1000, "Wait time to lock cache for sapce reservation in filesystem cache", 0) \
+    \
+    M(Bool, use_page_cache_for_disks_without_file_cache, false, "Use userspace page cache for remote disks that don't have filesystem cache enabled.", 0) \
+    M(Bool, read_from_page_cache_if_exists_otherwise_bypass_cache, false, "Use userspace page cache in passive mode, similar to read_from_filesystem_cache_if_exists_otherwise_bypass_cache.", 0) \
+    M(Bool, page_cache_inject_eviction, false, "Userspace page cache will sometimes invalidate some pages at random. Intended for testing.", 0) \
     \
     M(Bool, load_marks_asynchronously, false, "Load MergeTree marks asynchronously", 0) \
     M(Bool, enable_filesystem_read_prefetches_log, false, "Log to system.filesystem prefetch_log during query. Should be used only for testing or debugging, not recommended to be turned on by default", 0) \
-    M(Bool, allow_prefetched_read_pool_for_remote_filesystem, true, "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(Bool, allow_prefetched_read_pool_for_remote_filesystem, true, "Prefer prefetched threadpool if all parts are on remote filesystem", 0) \
+    M(Bool, allow_prefetched_read_pool_for_local_filesystem, false, "Prefer prefetched threadpool if all parts are on local 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) \
@@ -806,24 +847,32 @@ class IColumn;
     \
     M(String, rename_files_after_processing, "", "Rename successfully processed files according to the specified pattern; Pattern can include the following placeholders: `%a` (full original file name), `%f` (original filename without extension), `%e` (file extension with dot), `%t` (current timestamp in µs), and `%%` (% sign)", 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(Bool, parallelize_output_from_storages, true, "Parallelize output for reading step from storage. It allows parallelization of  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(Bool, count_distinct_optimization, false, "Rewrite count distinct to subquery of group by", 0) \
-    M(Bool, throw_if_no_data_to_insert, true, "Enables or disables empty INSERTs, enabled by default", 0) \
+    M(Bool, throw_if_no_data_to_insert, true, "Allows or forbids empty INSERTs, enabled by default (throws an error on an empty insert)", 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(Bool, optimize_sorting_by_input_stream_properties, true, "Optimize sorting by sorting properties of input stream", 0) \
+    M(UInt64, keeper_max_retries, 10, "Max retries for general keeper operations", 0) \
+    M(UInt64, keeper_retry_initial_backoff_ms, 100, "Initial backoff timeout for general keeper operations", 0) \
+    M(UInt64, keeper_retry_max_backoff_ms, 5000, "Max backoff timeout for general keeper operations", 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) \
     M(UInt64, insert_keeper_retry_max_backoff_ms, 10000, "Max backoff timeout for keeper operations during insert", 0) \
     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(Bool, force_aggregation_in_order, false, "The setting is used by the server itself to support distributed queries. Do not change it manually, because it will break normal operations. (Forces use of aggregation in order on remote nodes during distributed aggregation).", 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) \
     M(Bool, optimize_uniq_to_count, true, "Rewrite uniq and its variants(except uniqUpTo) to count if subquery has distinct or group by clause.", 0) \
+    M(Bool, use_variant_as_common_type, false, "Use Variant as a result type for if/multiIf in case when there is no common type for arguments", 0) \
+    M(Bool, enable_order_by_all, true, "Enable sorting expression ORDER BY ALL.", 0) \
+    M(Bool, traverse_shadow_remote_data_paths, false, "Traverse shadow directory when query system.remote_data_paths", 0) \
+    M(Bool, geo_distance_returns_float64_on_float64_arguments, true, "If all four arguments to `geoDistance`, `greatCircleDistance`, `greatCircleAngle` functions are Float64, return Float64 and use double precision for internal calculations. In previous ClickHouse versions, the functions always returned Float32.", 0) \
+    M(Bool, allow_get_client_http_header, false, "Allow to use the function `getClientHTTPHeader` which lets to obtain a value of an the current HTTP request's header. It is not enabled by default for security reasons, because some headers, such as `Cookie`, could contain sensitive info. Note that the `X-ClickHouse-*` and `Authentication` headers are always restricted and cannot be obtained with this function.", 0) \
     \
     /** Experimental functions */ \
     M(Bool, allow_experimental_materialized_postgresql_table, false, "Allows to use the MaterializedPostgreSQL table engine. Disabled by default, because this feature is experimental", 0) \
@@ -831,6 +880,7 @@ class IColumn;
     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", 0) \
     M(Bool, allow_experimental_object_type, false, "Allow Object and JSON data types", 0) \
+    M(Bool, allow_experimental_variant_type, false, "Allow Variant data type", 0) \
     M(Bool, allow_experimental_annoy_index, false, "Allows to use Annoy index. Disabled by default because this feature is experimental", 0) \
     M(Bool, allow_experimental_usearch_index, false, "Allows to use USearch index. Disabled by default because this feature is experimental", 0) \
     M(UInt64, max_limit_for_ann_queries, 1'000'000, "SELECT queries with LIMIT bigger than this setting cannot use ANN indexes. Helps to prevent memory overflows in ANN search indexes.", 0) \
@@ -843,18 +893,20 @@ class IColumn;
     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, 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) \
+    M(UInt64, extract_key_value_pairs_max_pairs_per_row, 1000, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory.", 0) ALIAS(extract_kvp_max_pairs_per_row) \
     M(Timezone, session_timezone, "", "This setting can be removed in the future due to potential caveats. It is experimental and is not suitable for production usage. The default timezone for current session or query. The server default timezone if empty.", 0) \
     M(Bool, allow_create_index_without_type, false, "Allow CREATE INDEX query without TYPE. Query will be ignored. Made for SQL compatibility tests.", 0) \
     M(Bool, create_index_ignore_unique, false, "Ignore UNIQUE keyword in CREATE UNIQUE INDEX. Made for SQL compatibility tests.", 0) \
     M(Bool, print_pretty_type_names, true, "Print pretty type names in DESCRIBE query and toTypeName() function", 0) \
     M(Bool, create_table_empty_primary_key_by_default, false, "Allow to create *MergeTree tables with empty primary key when ORDER BY and PRIMARY KEY not specified", 0) \
     M(Bool, allow_named_collection_override_by_default, true, "Allow named collections' fields override by default.", 0)\
-    M(Bool, allow_experimental_shared_merge_tree, false, "Only available in ClickHouse Cloud", 0) \
-    M(UInt64, cache_warmer_threads, 4, "Only available in ClickHouse Cloud", 0) \
-    M(Int64, ignore_cold_parts_seconds, 0, "Only available in ClickHouse Cloud", 0) \
-    M(Int64, prefer_warmed_unmerged_parts_seconds, 0, "Only available in ClickHouse Cloud", 0) \
-    M(Bool, enable_order_by_all, true, "Enable sorting expression ORDER BY ALL.", 0)\
+    M(SQLSecurityType, default_normal_view_sql_security, SQLSecurityType::INVOKER, "Allows to set a default value for SQL SECURITY option when creating a normal view.", 0) \
+    M(SQLSecurityType, default_materialized_view_sql_security, SQLSecurityType::DEFINER, "Allows to set a default value for SQL SECURITY option when creating a materialized view.", 0) \
+    M(String, default_view_definer, "CURRENT_USER", "Allows to set a default value for DEFINER option when creating view.", 0) \
+    M(UInt64, cache_warmer_threads, 4, "Only available in ClickHouse Cloud. Number of background threads for speculatively downloading new data parts into file cache, when cache_populated_by_fetch is enabled. Zero to disable.", 0) \
+    M(Int64, ignore_cold_parts_seconds, 0, "Only available in ClickHouse Cloud. Exclude new data parts from SELECT queries until they're either pre-warmed (see cache_populated_by_fetch) or this many seconds old. Only for Replicated-/SharedMergeTree.", 0) \
+    M(Int64, prefer_warmed_unmerged_parts_seconds, 0, "Only available in ClickHouse Cloud. If a merged part is less than this many seconds old and is not pre-warmed (see cache_populated_by_fetch), but all its source parts are available and pre-warmed, SELECT queries will read from those parts instead. Only for ReplicatedMergeTree. Note that this only checks whether CacheWarmer processed the part; if the part was fetched into cache by something else, it'll still be considered cold until CacheWarmer gets to it; if it was warmed, then evicted from cache, it'll still be considered warm.", 0) \
+    M(Bool, iceberg_engine_ignore_schema_evolution, false, "Ignore schema evolution in Iceberg table engine and read all data using latest schema saved on table creation. Note that it can lead to incorrect result", 0) \
 
 // End of COMMON_SETTINGS
 // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS, move obsolete settings to OBSOLETE_SETTINGS and obsolete format settings to OBSOLETE_FORMAT_SETTINGS.
@@ -877,6 +929,7 @@ class IColumn;
     MAKE_OBSOLETE(M, Bool, allow_experimental_geo_types, true) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_query_cache, true) \
     MAKE_OBSOLETE(M, Bool, allow_experimental_alter_materialized_view_structure, true) \
+    MAKE_OBSOLETE(M, Bool, allow_experimental_shared_merge_tree, true) \
     \
     MAKE_OBSOLETE(M, Milliseconds, async_insert_stale_timeout_ms, 0) \
     MAKE_OBSOLETE(M, StreamingHandleErrorMode, handle_kafka_error_mode, StreamingHandleErrorMode::DEFAULT) \
@@ -993,13 +1046,16 @@ class IColumn;
     M(Bool, input_format_json_read_objects_as_strings, true, "Allow to parse JSON objects as strings in JSON input formats", 0) \
     M(Bool, input_format_json_read_arrays_as_strings, true, "Allow to parse JSON arrays as strings in JSON input formats", 0) \
     M(Bool, input_format_json_try_infer_named_tuples_from_objects, true, "Try to infer named tuples from JSON objects in JSON input formats", 0) \
+    M(Bool, input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects, false, "Use String type instead of an exception in case of ambiguous paths in JSON objects during named tuples inference", 0) \
     M(Bool, input_format_json_infer_incomplete_types_as_strings, true, "Use type String for keys that contains only Nulls or empty objects/arrays during schema inference in JSON input formats", 0) \
     M(Bool, input_format_json_named_tuples_as_objects, true, "Deserialize named tuple columns as JSON objects", 0) \
     M(Bool, input_format_json_ignore_unknown_keys_in_named_tuple, true, "Ignore unknown keys in json object for named tuples", 0) \
     M(Bool, input_format_json_defaults_for_missing_elements_in_named_tuple, true, "Insert default value in named tuple element if it's missing in json object", 0) \
+    M(Bool, input_format_json_throw_on_bad_escape_sequence, true, "Throw an exception if JSON string contains bad escape sequence in JSON input formats. If disabled, bad escape sequences will remain as is in the data", 0) \
     M(Bool, input_format_try_infer_integers, true, "Try to infer integers instead of floats while schema inference in text formats", 0) \
     M(Bool, input_format_try_infer_dates, true, "Try to infer dates from string fields while schema inference in text formats", 0) \
     M(Bool, input_format_try_infer_datetimes, true, "Try to infer datetimes from string fields while schema inference in text formats", 0) \
+    M(Bool, input_format_try_infer_exponent_floats, false, "Try to infer floats in exponential notation while schema inference in text formats (except JSON, where exponent numbers are always inferred)", 0) \
     M(Bool, output_format_markdown_escape_special_characters, false, "Escape special characters in Markdown", 0) \
     M(Bool, input_format_protobuf_flatten_google_wrappers, false, "Enable Google wrappers for regular non-nested columns, e.g. google.protobuf.StringValue 'str' for String column 'str'. For Nullable columns empty wrappers are recognized as defaults, and missing as nulls", 0) \
     M(Bool, output_format_protobuf_nullables_with_google_wrappers, false, "When serializing Nullable columns with Google wrappers, serialize default values as empty wrappers. If turned off, default and null values are not serialized", 0) \
@@ -1047,20 +1103,21 @@ class IColumn;
     M(UInt64, output_format_pretty_max_rows, 10000, "Rows limit for Pretty formats.", 0) \
     M(UInt64, output_format_pretty_max_column_pad_width, 250, "Maximum width to pad all values in a column in Pretty formats.", 0) \
     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(UInt64, output_format_pretty_max_value_width_apply_for_single_value, false, "Only cut values (see the `output_format_pretty_max_value_width` setting) when it is not a single value in a block. Otherwise output it entirely, which is useful for the `SHOW CREATE TABLE` query.", 0) \
+    M(UInt64Auto, output_format_pretty_color, "auto", "Use ANSI escape sequences in Pretty formats. 0 - disabled, 1 - enabled, 'auto' - enabled if a terminal.", 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, "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_string_as_string, true, "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(ParquetCompression, output_format_parquet_compression_method, "zstd", "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(Bool, output_format_parquet_use_custom_encoder, false, "Use a faster Parquet encoder implementation.", 0) \
     M(Bool, output_format_parquet_parallel_encoding, true, "Do Parquet encoding in multiple threads. Requires output_format_parquet_use_custom_encoder.", 0) \
     M(UInt64, output_format_parquet_data_page_size, 1024 * 1024, "Target page size in bytes, before compression.", 0) \
     M(UInt64, output_format_parquet_batch_size, 1024, "Check page size every this many rows. Consider decreasing if you have columns with average values size above a few KBs.", 0) \
-    M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy'.", 0) \
+    M(String, output_format_avro_codec, "", "Compression codec used for output. Possible values: 'null', 'deflate', 'snappy', 'zstd'.", 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) \
     M(UInt64, output_format_avro_rows_in_file, 1, "Max rows in a file (if permitted by storage)", 0) \
@@ -1077,6 +1134,8 @@ class IColumn;
     M(String, format_schema, "", "Schema identifier (used by schema-based formats)", 0) \
     M(String, format_template_resultset, "", "Path to file which contains format string for result set (for Template format)", 0) \
     M(String, format_template_row, "", "Path to file which contains format string for rows (for Template format)", 0) \
+    M(String, format_template_row_format, "", "Format string for rows (for Template format)", 0) \
+    M(String, format_template_resultset_format, "", "Format string for result set (for Template format)", 0) \
     M(String, format_template_rows_between_delimiter, "\n", "Delimiter between rows (for Template format)", 0) \
     \
     M(EscapingRule, format_custom_escaping_rule, "Escaped", "Field escaping rule (for CustomSeparated format)", 0) \
@@ -1093,19 +1152,23 @@ class IColumn;
     \
     M(Bool, output_format_enable_streaming, false, "Enable streaming in output formats that support it.", 0) \
     M(Bool, output_format_write_statistics, true, "Write statistics about read rows, bytes, time elapsed in suitable output formats.", 0) \
-    M(Bool, output_format_pretty_row_numbers, false, "Add row numbers before each row for pretty output format", 0) \
+    M(Bool, output_format_pretty_row_numbers, true, "Add row numbers before each row for pretty output format", 0) \
+    M(Bool, output_format_pretty_highlight_digit_groups, true, "If enabled and if output is a terminal, highlight every digit corresponding to the number of thousands, millions, etc. with underline.", 0) \
+    M(UInt64, output_format_pretty_single_large_number_tip_threshold, 1'000'000, "Print a readable number tip on the right side of the table if the block consists of a single number which exceeds this value (except 0)", 0) \
     M(Bool, insert_distributed_one_random_shard, false, "If setting is enabled, inserting into distributed table will choose a random shard to write when there is no sharding key", 0) \
     \
     M(Bool, exact_rows_before_limit, false, "When enabled, ClickHouse will provide exact value for rows_before_limit_at_least statistic, but with the cost that the data before limit will have to be read completely", 0) \
-    M(UInt64, cross_to_inner_join_rewrite, 1, "Use inner join instead of comma/cross join if there're joining expressions in the WHERE section. Values: 0 - no rewrite, 1 - apply if possible for comma/cross, 2 - force rewrite all comma joins, cross - if possible", 0) \
+    M(UInt64, cross_to_inner_join_rewrite, 1, "Use inner join instead of comma/cross join if there are joining expressions in the WHERE section. Values: 0 - no rewrite, 1 - apply if possible for comma/cross, 2 - force rewrite all comma joins, cross - if possible", 0) \
     \
     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_use_signed_indexes_for_dictionary, true, "Use signed integers for dictionary indexes in Arrow format", 0) \
+    M(Bool, output_format_arrow_use_64_bit_indexes_for_dictionary, false, "Always use 64 bit integers for dictionary indexes in Arrow format", 0) \
+    M(Bool, output_format_arrow_string_as_string, true, "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(Bool, output_format_orc_string_as_string, true, "Use ORC String type instead of Binary for String columns", 0) \
+    M(ORCCompression, output_format_orc_compression_method, "zstd", "Compression method for ORC output format. Supported codecs: lz4, snappy, zlib, zstd, none (uncompressed)", 0) \
     M(UInt64, output_format_orc_row_index_stride, 10'000, "Target row index stride in ORC output format", 0) \
     \
     M(CapnProtoEnumComparingMode, format_capn_proto_enum_comparising_mode, FormatSettings::CapnProtoEnumComparingMode::BY_VALUES, "How to map ClickHouse Enum and CapnProto Enum", 0) \
@@ -1123,6 +1186,8 @@ class IColumn;
     M(Bool, output_format_sql_insert_use_replace, false, "Use REPLACE statement instead of INSERT", 0) \
     M(Bool, output_format_sql_insert_quote_names, true, "Quote column names with '`' characters", 0) \
     \
+    M(Bool, output_format_values_escape_quote_with_quote, false, "If true escape ' with '', otherwise quoted with \\'", 0) \
+    \
     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) \
     \
@@ -1134,6 +1199,7 @@ class IColumn;
     M(Bool, dictionary_use_async_executor, false, "Execute a pipeline for reading dictionary source in several threads. It's supported only by dictionaries with local CLICKHOUSE source.", 0) \
     M(Bool, precise_float_parsing, false, "Prefer more precise (but slower) float parsing algorithm", 0) \
     M(DateTimeOverflowBehavior, date_time_overflow_behavior, "ignore", "Overflow mode for Date, Date32, DateTime, DateTime64 types. Possible values: 'ignore', 'throw', 'saturate'.", 0) \
+    M(Bool, validate_experimental_and_suspicious_types_inside_nested_types, true, "Validate usage of experimental and suspicious types inside nested types like Array/Map/Tuple", 0) \
 
 
 // End of FORMAT_FACTORY_SETTINGS
diff --git a/src/Core/SettingsChangesHistory.h b/src/Core/SettingsChangesHistory.h
index fdee1fd5b13..8b5cdf03a33 100644
--- a/src/Core/SettingsChangesHistory.h
+++ b/src/Core/SettingsChangesHistory.h
@@ -19,7 +19,7 @@ namespace ErrorCodes
 class ClickHouseVersion
 {
 public:
-    ClickHouseVersion(const String & version)
+    ClickHouseVersion(const String & version) /// NOLINT(google-explicit-constructor)
     {
         Strings split;
         boost::split(split, version, [](char c){ return c == '.'; });
@@ -37,7 +37,7 @@ public:
         }
     }
 
-    ClickHouseVersion(const char * version) : ClickHouseVersion(String(version)) {}
+    ClickHouseVersion(const char * version) : ClickHouseVersion(String(version)) {} /// NOLINT(google-explicit-constructor)
 
     String toString() const
     {
@@ -77,12 +77,110 @@ namespace SettingsChangesHistory
 
 /// History of settings changes that controls some backward incompatible changes
 /// across all ClickHouse versions. It maps ClickHouse version to settings changes that were done
-/// in this version. Settings changes is a vector of structs {setting_name, previous_value, new_value}
+/// in this version. This history contains both changes to existing settings and newly added settings.
+/// Settings changes is a vector of structs
+///     {setting_name, previous_value, new_value, reason}.
+/// For newly added setting choose the most appropriate previous_value (for example, if new setting
+/// controls new feature and it's 'true' by default, use 'false' as previous_value).
 /// It's used to implement `compatibility` setting (see https://github.com/ClickHouse/ClickHouse/issues/35972)
 static std::map<ClickHouseVersion, SettingsChangesHistory::SettingsChanges> settings_changes_history =
 {
+    {"24.4", {{"input_format_json_throw_on_bad_escape_sequence", true, true, "Allow to save JSON strings with bad escape sequences"},
+              {"lightweight_deletes_sync", 2, 2, "The same as 'mutation_sync', but controls only execution of lightweight deletes"},
+              {"query_cache_system_table_handling", "save", "throw", "The query cache no longer caches results of queries against system tables"},
+              }},
+    {"24.3", {{"s3_connect_timeout_ms", 1000, 1000, "Introduce new dedicated setting for s3 connection timeout"},
+              {"allow_experimental_shared_merge_tree", false, true, "The setting is obsolete"},
+              {"use_page_cache_for_disks_without_file_cache", false, false, "Added userspace page cache"},
+              {"read_from_page_cache_if_exists_otherwise_bypass_cache", false, false, "Added userspace page cache"},
+              {"page_cache_inject_eviction", false, false, "Added userspace page cache"},
+              {"default_table_engine", "None", "MergeTree", "Set default table engine to MergeTree for better usability"},
+              {"input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects", false, false, "Allow to use String type for ambiguous paths during named tuple inference from JSON objects"},
+              {"traverse_shadow_remote_data_paths", false, false, "Traverse shadow directory when query system.remote_data_paths."},
+              {"throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert", false, true, "Deduplication is dependent materialized view cannot work together with async inserts."},
+              {"parallel_replicas_allow_in_with_subquery", false, true, "If true, subquery for IN will be executed on every follower replica"},
+              {"log_processors_profiles", false, true, "Enable by default"},
+              {"function_locate_has_mysql_compatible_argument_order", false, true, "Increase compatibility with MySQL's locate function."},
+              {"allow_suspicious_primary_key", true, false, "Forbid suspicious PRIMARY KEY/ORDER BY for MergeTree (i.e. SimpleAggregateFunction)"},
+              {"filesystem_cache_reserve_space_wait_lock_timeout_milliseconds", 1000, 1000, "Wait time to lock cache for sapce reservation in filesystem cache"},
+              {"max_parser_backtracks", 0, 1000000, "Limiting the complexity of parsing"},
+              {"analyzer_compatibility_join_using_top_level_identifier", false, false, "Force to resolve identifier in JOIN USING from projection"},
+              {"distributed_insert_skip_read_only_replicas", false, false, "If true, INSERT into Distributed will skip read-only replicas"},
+              {"keeper_max_retries", 10, 10, "Max retries for general keeper operations"},
+              {"keeper_retry_initial_backoff_ms", 100, 100, "Initial backoff timeout for general keeper operations"},
+              {"keeper_retry_max_backoff_ms", 5000, 5000, "Max backoff timeout for general keeper operations"},
+              {"s3queue_allow_experimental_sharded_mode", false, false, "Enable experimental sharded mode of S3Queue table engine. It is experimental because it will be rewritten"},
+              {"allow_experimental_analyzer", false, true, "Enable analyzer and planner by default."},
+              {"merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability", 0.0, 0.0, "For testing of `PartsSplitter` - split read ranges into intersecting and non intersecting every time you read from MergeTree with the specified probability."},
+              {"allow_get_client_http_header", false, false, "Introduced a new function."},
+              {"output_format_pretty_row_numbers", false, true, "It is better for usability."},
+              {"output_format_pretty_max_value_width_apply_for_single_value", true, false, "Single values in Pretty formats won't be cut."},
+              {"output_format_parquet_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+              {"output_format_orc_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+              {"output_format_arrow_string_as_string", false, true, "ClickHouse allows arbitrary binary data in the String data type, which is typically UTF-8. Parquet/ORC/Arrow Strings only support UTF-8. That's why you can choose which Arrow's data type to use for the ClickHouse String data type - String or Binary. While Binary would be more correct and compatible, using String by default will correspond to user expectations in most cases."},
+              {"output_format_parquet_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
+              {"output_format_orc_compression_method", "lz4", "zstd", "Parquet/ORC/Arrow support many compression methods, including lz4 and zstd. ClickHouse supports each and every compression method. Some inferior tools, such as 'duckdb', lack support for the faster `lz4` compression method, that's why we set zstd by default."},
+              {"output_format_pretty_highlight_digit_groups", false, true, "If enabled and if output is a terminal, highlight every digit corresponding to the number of thousands, millions, etc. with underline."},
+              {"geo_distance_returns_float64_on_float64_arguments", false, true, "Increase the default precision."},
+              {"azure_max_inflight_parts_for_one_file", 20, 20, "The maximum number of a concurrent loaded parts in multipart upload request. 0 means unlimited."},
+              {"azure_strict_upload_part_size", 0, 0, "The exact size of part to upload during multipart upload to Azure blob storage."},
+              {"azure_min_upload_part_size", 16*1024*1024, 16*1024*1024, "The minimum size of part to upload during multipart upload to Azure blob storage."},
+              {"azure_max_upload_part_size", 5ull*1024*1024*1024, 5ull*1024*1024*1024, "The maximum size of part to upload during multipart upload to Azure blob storage."},
+              {"azure_upload_part_size_multiply_factor", 2, 2, "Multiply azure_min_upload_part_size by this factor each time azure_multiply_parts_count_threshold parts were uploaded from a single write to Azure blob storage."},
+              {"azure_upload_part_size_multiply_parts_count_threshold", 500, 500, "Each time this number of parts was uploaded to Azure blob storage, azure_min_upload_part_size is multiplied by azure_upload_part_size_multiply_factor."},
+              }},
+    {"24.2", {{"allow_suspicious_variant_types", true, false, "Don't allow creating Variant type with suspicious variants by default"},
+              {"validate_experimental_and_suspicious_types_inside_nested_types", false, true, "Validate usage of experimental and suspicious types inside nested types"},
+              {"output_format_values_escape_quote_with_quote", false, false, "If true escape ' with '', otherwise quoted with \\'"},
+              {"output_format_pretty_single_large_number_tip_threshold", 0, 1'000'000, "Print a readable number tip on the right side of the table if the block consists of a single number which exceeds this value (except 0)"},
+              {"input_format_try_infer_exponent_floats", true, false, "Don't infer floats in exponential notation by default"},
+              {"query_plan_optimize_prewhere", true, true, "Allow to push down filter to PREWHERE expression for supported storages"},
+              {"async_insert_max_data_size", 1000000, 10485760, "The previous value appeared to be too small."},
+              {"async_insert_poll_timeout_ms", 10, 10, "Timeout in milliseconds for polling data from asynchronous insert queue"},
+              {"async_insert_use_adaptive_busy_timeout", false, true, "Use adaptive asynchronous insert timeout"},
+              {"async_insert_busy_timeout_min_ms", 50, 50, "The minimum value of the asynchronous insert timeout in milliseconds; it also serves as the initial value, which may be increased later by the adaptive algorithm"},
+              {"async_insert_busy_timeout_max_ms", 200, 200, "The minimum value of the asynchronous insert timeout in milliseconds; async_insert_busy_timeout_ms is aliased to async_insert_busy_timeout_max_ms"},
+              {"async_insert_busy_timeout_increase_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout increases"},
+              {"async_insert_busy_timeout_decrease_rate", 0.2, 0.2, "The exponential growth rate at which the adaptive asynchronous insert timeout decreases"},
+              {"format_template_row_format", "", "", "Template row format string can be set directly in query"},
+              {"format_template_resultset_format", "", "", "Template result set format string can be set in query"},
+              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", true, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
+              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"},
+              {"azure_max_single_part_copy_size", 256*1024*1024, 256*1024*1024, "The maximum size of object to copy using single part copy to Azure blob storage."},
+              {"min_external_table_block_size_rows", DEFAULT_INSERT_BLOCK_SIZE, DEFAULT_INSERT_BLOCK_SIZE, "Squash blocks passed to external table to specified size in rows, if blocks are not big enough"},
+              {"min_external_table_block_size_bytes", DEFAULT_INSERT_BLOCK_SIZE * 256, DEFAULT_INSERT_BLOCK_SIZE * 256, "Squash blocks passed to external table to specified size in bytes, if blocks are not big enough."},
+              {"parallel_replicas_prefer_local_join", true, true, "If true, and JOIN can be executed with parallel replicas algorithm, and all storages of right JOIN part are *MergeTree, local JOIN will be used instead of GLOBAL JOIN."},
+              {"optimize_time_filter_with_preimage", true, true, "Optimize Date and DateTime predicates by converting functions into equivalent comparisons without conversions (e.g. toYear(col) = 2023 -> col >= '2023-01-01' AND col <= '2023-12-31')"},
+              {"extract_key_value_pairs_max_pairs_per_row", 0, 0, "Max number of pairs that can be produced by the `extractKeyValuePairs` function. Used as a safeguard against consuming too much memory."},
+              {"default_view_definer", "CURRENT_USER", "CURRENT_USER", "Allows to set default `DEFINER` option while creating a view"},
+              {"default_materialized_view_sql_security", "DEFINER", "DEFINER", "Allows to set a default value for SQL SECURITY option when creating a materialized view"},
+              {"default_normal_view_sql_security", "INVOKER", "INVOKER", "Allows to set default `SQL SECURITY` option while creating a normal view"},
+              {"mysql_map_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
+              {"mysql_map_fixed_string_to_text_in_show_columns", false, true, "Reduce the configuration effort to connect ClickHouse with BI tools."},
+              }},
     {"24.1", {{"print_pretty_type_names", false, true, "Better user experience."},
-              {"input_format_json_read_bools_as_strings", false, true, "Allow to read bools as strings in JSON formats by default"}}},
+              {"input_format_json_read_bools_as_strings", false, true, "Allow to read bools as strings in JSON formats by default"},
+              {"output_format_arrow_use_signed_indexes_for_dictionary", false, true, "Use signed indexes type for Arrow dictionaries by default as it's recommended"},
+              {"allow_experimental_variant_type", false, false, "Add new experimental Variant type"},
+              {"use_variant_as_common_type", false, false, "Allow to use Variant in if/multiIf if there is no common type"},
+              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
+              {"parallel_replicas_mark_segment_size", 128, 128, "Add new setting to control segment size in new parallel replicas coordinator implementation"},
+              {"ignore_materialized_views_with_dropped_target_table", false, false, "Add new setting to allow to ignore materialized views with dropped target table"},
+              {"output_format_compression_level", 3, 3, "Allow to change compression level in the query output"},
+              {"output_format_compression_zstd_window_log", 0, 0, "Allow to change zstd window log in the query output when zstd compression is used"},
+              {"enable_zstd_qat_codec", false, false, "Add new ZSTD_QAT codec"},
+              {"enable_vertical_final", false, true, "Use vertical final by default"},
+              {"output_format_arrow_use_64_bit_indexes_for_dictionary", false, false, "Allow to use 64 bit indexes type in Arrow dictionaries"},
+              {"max_rows_in_set_to_optimize_join", 100000, 0, "Disable join optimization as it prevents from read in order optimization"},
+              {"output_format_pretty_color", true, "auto", "Setting is changed to allow also for auto value, disabling ANSI escapes if output is not a tty"},
+              {"function_visible_width_behavior", 0, 1, "We changed the default behavior of `visibleWidth` to be more precise"},
+              {"max_estimated_execution_time", 0, 0, "Separate max_execution_time and max_estimated_execution_time"},
+              {"iceberg_engine_ignore_schema_evolution", false, false, "Allow to ignore schema evolution in Iceberg table engine"},
+              {"optimize_injective_functions_in_group_by", false, true, "Replace injective functions by it's arguments in GROUP BY section in analyzer"},
+              {"update_insert_deduplication_token_in_dependent_materialized_views", false, false, "Allow to update insert deduplication token with table identifier during insert in dependent materialized views"},
+              {"azure_max_unexpected_write_error_retries", 4, 4, "The maximum number of retries in case of unexpected errors during Azure blob storage write"},
+              {"split_parts_ranges_into_intersecting_and_non_intersecting_final", false, true, "Allow to split parts ranges into intersecting and non intersecting during FINAL optimization"},
+              {"split_intersecting_parts_ranges_into_layers_final", true, true, "Allow to split intersecting parts ranges into layers during FINAL optimization"}}},
     {"23.12", {{"allow_suspicious_ttl_expressions", true, false, "It is a new setting, and in previous versions the behavior was equivalent to allowing."},
               {"input_format_parquet_allow_missing_columns", false, true, "Allow missing columns in Parquet files by default"},
               {"input_format_orc_allow_missing_columns", false, true, "Allow missing columns in ORC files by default"},
diff --git a/src/Core/SettingsEnums.cpp b/src/Core/SettingsEnums.cpp
index 0c84c1cc7d2..0caf6e8d609 100644
--- a/src/Core/SettingsEnums.cpp
+++ b/src/Core/SettingsEnums.cpp
@@ -1,5 +1,8 @@
 #include <Core/SettingsEnums.h>
 #include <magic_enum.hpp>
+#include <Access/Common/SQLSecurityDefs.h>
+
+#include <boost/range/adaptor/map.hpp>
 
 
 namespace DB
@@ -17,6 +20,16 @@ namespace ErrorCodes
     extern const int UNKNOWN_UNION;
 }
 
+template <typename Type>
+constexpr auto getEnumValues()
+{
+    std::array<std::pair<std::string_view, Type>, magic_enum::enum_count<Type>()> enum_values{};
+    size_t index = 0;
+    for (auto value : magic_enum::enum_values<Type>())
+        enum_values[index++] = std::pair{magic_enum::enum_name(value), value};
+    return enum_values;
+}
+
 IMPLEMENT_SETTING_ENUM(LoadBalancing, ErrorCodes::UNKNOWN_LOAD_BALANCING,
     {{"random",           LoadBalancing::RANDOM},
      {"nearest_hostname", LoadBalancing::NEAREST_HOSTNAME},
@@ -74,6 +87,10 @@ IMPLEMENT_SETTING_ENUM(QueryCacheNondeterministicFunctionHandling, ErrorCodes::B
      {"save",   QueryCacheNondeterministicFunctionHandling::Save},
      {"ignore", QueryCacheNondeterministicFunctionHandling::Ignore}})
 
+IMPLEMENT_SETTING_ENUM(QueryCacheSystemTableHandling, ErrorCodes::BAD_ARGUMENTS,
+    {{"throw",  QueryCacheSystemTableHandling::Throw},
+     {"save",   QueryCacheSystemTableHandling::Save},
+     {"ignore", QueryCacheSystemTableHandling::Ignore}})
 
 IMPLEMENT_SETTING_ENUM(DateTimeInputFormat, ErrorCodes::BAD_ARGUMENTS,
     {{"basic",       FormatSettings::DateTimeInputFormat::Basic},
@@ -117,6 +134,7 @@ IMPLEMENT_SETTING_ENUM(DistributedDDLOutputMode, ErrorCodes::BAD_ARGUMENTS,
      {"null_status_on_timeout", DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT},
      {"throw_only_active", DistributedDDLOutputMode::THROW_ONLY_ACTIVE},
      {"null_status_on_timeout_only_active", DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT_ONLY_ACTIVE},
+     {"none_only_active", DistributedDDLOutputMode::NONE_ONLY_ACTIVE},
      {"never_throw", DistributedDDLOutputMode::NEVER_THROW}})
 
 IMPLEMENT_SETTING_ENUM(StreamingHandleErrorMode, ErrorCodes::BAD_ARGUMENTS,
@@ -206,4 +224,9 @@ IMPLEMENT_SETTING_ENUM(DateTimeOverflowBehavior, ErrorCodes::BAD_ARGUMENTS,
     {{"throw", FormatSettings::DateTimeOverflowBehavior::Throw},
      {"ignore", FormatSettings::DateTimeOverflowBehavior::Ignore},
      {"saturate", FormatSettings::DateTimeOverflowBehavior::Saturate}})
+
+IMPLEMENT_SETTING_ENUM(SQLSecurityType, ErrorCodes::BAD_ARGUMENTS,
+    {{"DEFINER", SQLSecurityType::DEFINER},
+     {"INVOKER", SQLSecurityType::INVOKER},
+     {"NONE", SQLSecurityType::NONE}})
 }
diff --git a/src/Core/SettingsEnums.h b/src/Core/SettingsEnums.h
index 246cdf6f684..b17ff11d428 100644
--- a/src/Core/SettingsEnums.h
+++ b/src/Core/SettingsEnums.h
@@ -1,16 +1,120 @@
 #pragma once
 
-#include <Core/SettingsFields.h>
 #include <Core/Joins.h>
-#include <QueryPipeline/SizeLimits.h>
+#include <Core/LogsLevel.h>
+#include <Core/SettingsFields.h>
 #include <Formats/FormatSettings.h>
 #include <IO/ReadSettings.h>
+#include <Parsers/ASTSQLSecurity.h>
+#include <QueryPipeline/SizeLimits.h>
 #include <Common/ShellCommandSettings.h>
 
 
 namespace DB
 {
 
+template <typename Type>
+constexpr auto getEnumValues();
+
+/// NOLINTNEXTLINE
+#define DECLARE_SETTING_ENUM(ENUM_TYPE) \
+    DECLARE_SETTING_ENUM_WITH_RENAME(ENUM_TYPE, ENUM_TYPE)
+
+/// NOLINTNEXTLINE
+#define DECLARE_SETTING_ENUM_WITH_RENAME(NEW_NAME, ENUM_TYPE) \
+    struct SettingField##NEW_NAME##Traits \
+    { \
+        using EnumType = ENUM_TYPE; \
+        using EnumValuePairs = std::pair<const char *, EnumType>[]; \
+        static const String & toString(EnumType value); \
+        static EnumType fromString(std::string_view str); \
+    }; \
+    \
+    using SettingField##NEW_NAME = SettingFieldEnum<ENUM_TYPE, SettingField##NEW_NAME##Traits>;
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
+    IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, EnumValuePairs, __VA_ARGS__)
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME) \
+    IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, , getEnumValues<EnumType>())
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, PAIRS_TYPE, ...) \
+    const String & SettingField##NEW_NAME##Traits::toString(typename SettingField##NEW_NAME::EnumType value) \
+    { \
+        static const std::unordered_map<EnumType, String> map = [] { \
+            std::unordered_map<EnumType, String> res; \
+            for (const auto & [name, val] : PAIRS_TYPE __VA_ARGS__) \
+                res.emplace(val, name); \
+            return res; \
+        }(); \
+        auto it = map.find(value); \
+        if (it != map.end()) \
+            return it->second; \
+        throw Exception(ERROR_CODE_FOR_UNEXPECTED_NAME, \
+            "Unexpected value of " #NEW_NAME ":{}", std::to_string(std::underlying_type_t<EnumType>(value))); \
+    } \
+    \
+    typename SettingField##NEW_NAME::EnumType SettingField##NEW_NAME##Traits::fromString(std::string_view str) \
+    { \
+        static const std::unordered_map<std::string_view, EnumType> map = [] { \
+            std::unordered_map<std::string_view, EnumType> res; \
+            for (const auto & [name, val] : PAIRS_TYPE __VA_ARGS__) \
+                res.emplace(name, val); \
+            return res; \
+        }(); \
+        auto it = map.find(str); \
+        if (it != map.end()) \
+            return it->second; \
+        String msg; \
+        bool need_comma = false; \
+        for (auto & name : map | boost::adaptors::map_keys) \
+        { \
+            if (std::exchange(need_comma, true)) \
+                msg += ", "; \
+            msg += "'" + String{name} + "'"; \
+        } \
+        throw Exception(ERROR_CODE_FOR_UNEXPECTED_NAME, "Unexpected value of " #NEW_NAME ": '{}'. Must be one of [{}]", String{str}, msg); \
+    }
+
+/// NOLINTNEXTLINE
+#define DECLARE_SETTING_MULTI_ENUM(ENUM_TYPE) \
+    DECLARE_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, ENUM_TYPE)
+
+/// NOLINTNEXTLINE
+#define DECLARE_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, NEW_NAME) \
+    struct SettingField##NEW_NAME##Traits \
+    { \
+        using EnumType = ENUM_TYPE; \
+        using EnumValuePairs = std::pair<const char *, EnumType>[]; \
+        static size_t getEnumSize(); \
+        static const String & toString(EnumType value); \
+        static EnumType fromString(std::string_view str); \
+    }; \
+    \
+    using SettingField##NEW_NAME = SettingFieldMultiEnum<ENUM_TYPE, SettingField##NEW_NAME##Traits>; \
+    using NEW_NAME##List = typename SettingField##NEW_NAME::ValueType;
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_MULTI_ENUM(ENUM_TYPE, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
+    IMPLEMENT_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, ERROR_CODE_FOR_UNEXPECTED_NAME, __VA_ARGS__)
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_MULTI_ENUM_WITH_RENAME(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
+    IMPLEMENT_SETTING_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, __VA_ARGS__)\
+    size_t SettingField##NEW_NAME##Traits::getEnumSize() {\
+        return std::initializer_list<std::pair<const char*, NEW_NAME>> __VA_ARGS__ .size();\
+    }
+
+/// NOLINTNEXTLINE
+#define IMPLEMENT_SETTING_MULTI_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME) \
+    IMPLEMENT_SETTING_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME)\
+    size_t SettingField##NEW_NAME##Traits::getEnumSize() {\
+        return getEnumValues<EnumType>().size();\
+    }
+
 enum class LoadBalancing
 {
     /// among replicas with a minimum number of errors selected randomly
@@ -80,6 +184,15 @@ enum class QueryCacheNondeterministicFunctionHandling
 
 DECLARE_SETTING_ENUM(QueryCacheNondeterministicFunctionHandling)
 
+/// How the query cache handles queries against system tables, tables in databases 'system.*' and 'information_schema.*'
+enum class QueryCacheSystemTableHandling
+{
+    Throw,
+    Save,
+    Ignore
+};
+
+DECLARE_SETTING_ENUM(QueryCacheSystemTableHandling)
 
 DECLARE_SETTING_ENUM_WITH_RENAME(DateTimeInputFormat, FormatSettings::DateTimeInputFormat)
 
@@ -89,18 +202,6 @@ DECLARE_SETTING_ENUM_WITH_RENAME(IntervalOutputFormat, FormatSettings::IntervalO
 
 DECLARE_SETTING_ENUM_WITH_RENAME(ParquetVersion, FormatSettings::ParquetVersion)
 
-enum class LogsLevel
-{
-    none = 0,    /// Disable
-    fatal,
-    error,
-    warning,
-    information,
-    debug,
-    trace,
-    test,
-};
-
 DECLARE_SETTING_ENUM(LogsLevel)
 
 
@@ -140,6 +241,7 @@ enum class DefaultTableEngine
 
 DECLARE_SETTING_ENUM(DefaultTableEngine)
 
+
 enum class CleanDeletedRows
 {
     Never = 0, /// Disable.
@@ -175,6 +277,7 @@ enum class DistributedDDLOutputMode
     NEVER_THROW,
     THROW_ONLY_ACTIVE,
     NULL_STATUS_ON_TIMEOUT_ONLY_ACTIVE,
+    NONE_ONLY_ACTIVE,
 };
 
 DECLARE_SETTING_ENUM(DistributedDDLOutputMode)
@@ -266,4 +369,5 @@ DECLARE_SETTING_ENUM(SchemaInferenceMode)
 
 DECLARE_SETTING_ENUM_WITH_RENAME(DateTimeOverflowBehavior, FormatSettings::DateTimeOverflowBehavior)
 
+DECLARE_SETTING_ENUM(SQLSecurityType)
 }
diff --git a/src/Core/SettingsFields.cpp b/src/Core/SettingsFields.cpp
index 80197cfbe22..caa8b3fdffd 100644
--- a/src/Core/SettingsFields.cpp
+++ b/src/Core/SettingsFields.cpp
@@ -1,18 +1,20 @@
 #include <Core/SettingsFields.h>
-
 #include <Core/Field.h>
+#include <Core/AccurateComparison.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
-#include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/logger_useful.h>
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteHelpers.h>
+
 #include <boost/algorithm/string/predicate.hpp>
+#include <cctz/time_zone.h>
 
 #include <cmath>
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -20,6 +22,8 @@ namespace ErrorCodes
     extern const int SIZE_OF_FIXED_STRING_DOESNT_MATCH;
     extern const int CANNOT_PARSE_BOOL;
     extern const int CANNOT_PARSE_NUMBER;
+    extern const int CANNOT_CONVERT_TYPE;
+    extern const int BAD_ARGUMENTS;
 }
 
 
@@ -48,9 +52,51 @@ namespace
     T fieldToNumber(const Field & f)
     {
         if (f.getType() == Field::Types::String)
+        {
             return stringToNumber<T>(f.get<const String &>());
+        }
+        else if (f.getType() == Field::Types::UInt64)
+        {
+            T result;
+            if (!accurate::convertNumeric(f.get<UInt64>(), result))
+                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Field value {} is out of range of {} type", f, demangle(typeid(T).name()));
+            return result;
+        }
+        else if (f.getType() == Field::Types::Int64)
+        {
+            T result;
+            if (!accurate::convertNumeric(f.get<Int64>(), result))
+                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Field value {} is out of range of {} type", f, demangle(typeid(T).name()));
+            return result;
+        }
+        else if (f.getType() == Field::Types::Bool)
+        {
+            return T(f.get<bool>());
+        }
+        else if (f.getType() == Field::Types::Float64)
+        {
+            Float64 x = f.get<Float64>();
+            if constexpr (std::is_floating_point_v<T>)
+            {
+                return T(x);
+            }
+            else
+            {
+                if (!isFinite(x))
+                {
+                    /// Conversion of infinite values to integer is undefined.
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert infinite value to integer type");
+                }
+                else if (x > Float64(std::numeric_limits<T>::max()) || x < Float64(std::numeric_limits<T>::lowest()))
+                {
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert out of range floating point value to integer type");
+                }
+                else
+                    return T(x);
+            }
+        }
         else
-            return applyVisitor(FieldVisitorConvertToNumber<T>(), f);
+            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Invalid value {} of the setting, which needs {}", f, demangle(typeid(T).name()));
     }
 
     Map stringToMap(const String & str)
@@ -174,7 +220,7 @@ namespace
         if (f.getType() == Field::Types::String)
             return stringToMaxThreads(f.get<const String &>());
         else
-            return applyVisitor(FieldVisitorConvertToNumber<UInt64>(), f);
+            return fieldToNumber<UInt64>(f);
     }
 }
 
@@ -225,6 +271,10 @@ namespace
         if (d != 0.0 && !std::isnormal(d))
             throw Exception(
                 ErrorCodes::CANNOT_PARSE_NUMBER, "A setting's value in seconds must be a normal floating point number or zero. Got {}", d);
+        if (d * 1000000 > std::numeric_limits<Poco::Timespan::TimeDiff>::max() || d * 1000000 < std::numeric_limits<Poco::Timespan::TimeDiff>::min())
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS, "Cannot convert seconds to microseconds: the setting's value in seconds is too big: {}", d);
+
         return static_cast<Poco::Timespan::TimeDiff>(d * 1000000);
     }
 
@@ -496,6 +546,13 @@ void SettingFieldTimezone::readBinary(ReadBuffer & in)
     *this = std::move(str);
 }
 
+void SettingFieldTimezone::validateTimezone(const std::string & tz_str)
+{
+    cctz::time_zone validated_tz;
+    if (!tz_str.empty() && !cctz::load_time_zone(tz_str, &validated_tz))
+        throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid time zone: {}", tz_str);
+}
+
 String SettingFieldCustom::toString() const
 {
     return value.dump();
@@ -518,4 +575,40 @@ void SettingFieldCustom::readBinary(ReadBuffer & in)
     parseFromString(str);
 }
 
+SettingFieldNonZeroUInt64::SettingFieldNonZeroUInt64(UInt64 x) : SettingFieldUInt64(x)
+{
+    checkValueNonZero();
+}
+
+SettingFieldNonZeroUInt64::SettingFieldNonZeroUInt64(const DB::Field & f) : SettingFieldUInt64(f)
+{
+    checkValueNonZero();
+}
+
+SettingFieldNonZeroUInt64 & SettingFieldNonZeroUInt64::operator=(UInt64 x)
+{
+    SettingFieldUInt64::operator=(x);
+    checkValueNonZero();
+    return *this;
+}
+
+SettingFieldNonZeroUInt64 & SettingFieldNonZeroUInt64::operator=(const DB::Field & f)
+{
+    SettingFieldUInt64::operator=(f);
+    checkValueNonZero();
+    return *this;
+}
+
+void SettingFieldNonZeroUInt64::parseFromString(const String & str)
+{
+    SettingFieldUInt64::parseFromString(str);
+    checkValueNonZero();
+}
+
+void SettingFieldNonZeroUInt64::checkValueNonZero() const
+{
+    if (value == 0)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "A setting's value has to be greater than 0");
+}
+
 }
diff --git a/src/Core/SettingsFields.h b/src/Core/SettingsFields.h
index 22c1cf8a267..64854e46ab5 100644
--- a/src/Core/SettingsFields.h
+++ b/src/Core/SettingsFields.h
@@ -1,16 +1,12 @@
 #pragma once
 
-#include <Poco/Timespan.h>
-#include <Poco/URI.h>
-#include <base/types.h>
+#include <chrono>
+#include <string_view>
 #include <Core/Field.h>
 #include <Core/MultiEnum.h>
-#include <boost/range/adaptor/map.hpp>
-#include <cctz/time_zone.h>
-#include <chrono>
-#include <unordered_map>
-#include <string_view>
-#include <magic_enum.hpp>
+#include <base/types.h>
+#include <Poco/Timespan.h>
+#include <Poco/URI.h>
 
 
 namespace DB
@@ -381,79 +377,6 @@ void SettingFieldEnum<EnumT, Traits>::readBinary(ReadBuffer & in)
     *this = Traits::fromString(SettingFieldEnumHelpers::readBinary(in));
 }
 
-template <typename Type>
-constexpr auto getEnumValues()
-{
-    std::array<std::pair<std::string_view, Type>, magic_enum::enum_count<Type>()> enum_values{};
-    size_t index = 0;
-    for (auto value : magic_enum::enum_values<Type>())
-        enum_values[index++] = std::pair{magic_enum::enum_name(value), value};
-    return enum_values;
-}
-
-/// NOLINTNEXTLINE
-#define DECLARE_SETTING_ENUM(ENUM_TYPE) \
-    DECLARE_SETTING_ENUM_WITH_RENAME(ENUM_TYPE, ENUM_TYPE)
-
-/// NOLINTNEXTLINE
-#define DECLARE_SETTING_ENUM_WITH_RENAME(NEW_NAME, ENUM_TYPE) \
-    struct SettingField##NEW_NAME##Traits \
-    { \
-        using EnumType = ENUM_TYPE; \
-        using EnumValuePairs = std::pair<const char *, EnumType>[]; \
-        static const String & toString(EnumType value); \
-        static EnumType fromString(std::string_view str); \
-    }; \
-    \
-    using SettingField##NEW_NAME = SettingFieldEnum<ENUM_TYPE, SettingField##NEW_NAME##Traits>;
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
-    IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, EnumValuePairs, __VA_ARGS__)
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME) \
-    IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, , getEnumValues<EnumType>())
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_ENUM_IMPL(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, PAIRS_TYPE, ...) \
-    const String & SettingField##NEW_NAME##Traits::toString(typename SettingField##NEW_NAME::EnumType value) \
-    { \
-        static const std::unordered_map<EnumType, String> map = [] { \
-            std::unordered_map<EnumType, String> res; \
-            for (const auto & [name, val] : PAIRS_TYPE __VA_ARGS__) \
-                res.emplace(val, name); \
-            return res; \
-        }(); \
-        auto it = map.find(value); \
-        if (it != map.end()) \
-            return it->second; \
-        throw Exception(ERROR_CODE_FOR_UNEXPECTED_NAME, \
-            "Unexpected value of " #NEW_NAME ":{}", std::to_string(std::underlying_type_t<EnumType>(value))); \
-    } \
-    \
-    typename SettingField##NEW_NAME::EnumType SettingField##NEW_NAME##Traits::fromString(std::string_view str) \
-    { \
-        static const std::unordered_map<std::string_view, EnumType> map = [] { \
-            std::unordered_map<std::string_view, EnumType> res; \
-            for (const auto & [name, val] : PAIRS_TYPE __VA_ARGS__) \
-                res.emplace(name, val); \
-            return res; \
-        }(); \
-        auto it = map.find(str); \
-        if (it != map.end()) \
-            return it->second; \
-        String msg; \
-        bool need_comma = false; \
-        for (auto & name : map | boost::adaptors::map_keys) \
-        { \
-            if (std::exchange(need_comma, true)) \
-                msg += ", "; \
-            msg += "'" + String{name} + "'"; \
-        } \
-        throw Exception(ERROR_CODE_FOR_UNEXPECTED_NAME, "Unexpected value of " #NEW_NAME ": '{}'. Must be one of [{}]", String{str}, msg); \
-    }
-
 // Mostly like SettingFieldEnum, but can have multiple enum values (or none) set at once.
 template <typename Enum, typename Traits>
 struct SettingFieldMultiEnum
@@ -544,42 +467,6 @@ void SettingFieldMultiEnum<EnumT, Traits>::readBinary(ReadBuffer & in)
     parseFromString(SettingFieldEnumHelpers::readBinary(in));
 }
 
-/// NOLINTNEXTLINE
-#define DECLARE_SETTING_MULTI_ENUM(ENUM_TYPE) \
-    DECLARE_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, ENUM_TYPE)
-
-/// NOLINTNEXTLINE
-#define DECLARE_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, NEW_NAME) \
-    struct SettingField##NEW_NAME##Traits \
-    { \
-        using EnumType = ENUM_TYPE; \
-        using EnumValuePairs = std::pair<const char *, EnumType>[]; \
-        static size_t getEnumSize(); \
-        static const String & toString(EnumType value); \
-        static EnumType fromString(std::string_view str); \
-    }; \
-    \
-    using SettingField##NEW_NAME = SettingFieldMultiEnum<ENUM_TYPE, SettingField##NEW_NAME##Traits>; \
-    using NEW_NAME##List = typename SettingField##NEW_NAME::ValueType;
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_MULTI_ENUM(ENUM_TYPE, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
-    IMPLEMENT_SETTING_MULTI_ENUM_WITH_RENAME(ENUM_TYPE, ERROR_CODE_FOR_UNEXPECTED_NAME, __VA_ARGS__)
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_MULTI_ENUM_WITH_RENAME(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, ...) \
-    IMPLEMENT_SETTING_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME, __VA_ARGS__)\
-    size_t SettingField##NEW_NAME##Traits::getEnumSize() {\
-        return std::initializer_list<std::pair<const char*, NEW_NAME>> __VA_ARGS__ .size();\
-    }
-
-/// NOLINTNEXTLINE
-#define IMPLEMENT_SETTING_MULTI_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME) \
-    IMPLEMENT_SETTING_AUTO_ENUM(NEW_NAME, ERROR_CODE_FOR_UNEXPECTED_NAME)\
-    size_t SettingField##NEW_NAME##Traits::getEnumSize() {\
-        return getEnumValues<EnumType>().size();\
-    }
-
 /// Setting field for specifying user-defined timezone. It is basically a string, but it needs validation.
 struct SettingFieldTimezone
 {
@@ -608,12 +495,7 @@ struct SettingFieldTimezone
     void readBinary(ReadBuffer & in);
 
 private:
-    void validateTimezone(const std::string & tz_str)
-    {
-        cctz::time_zone validated_tz;
-        if (!tz_str.empty() && !cctz::load_time_zone(tz_str, &validated_tz))
-            throw DB::Exception(DB::ErrorCodes::BAD_ARGUMENTS, "Invalid time zone: {}", tz_str);
-    }
+    void validateTimezone(const std::string & tz_str);
 };
 
 /// Can keep a value of any type. Used for user-defined settings.
@@ -633,4 +515,19 @@ struct SettingFieldCustom
     void readBinary(ReadBuffer & in);
 };
 
+struct SettingFieldNonZeroUInt64 : public SettingFieldUInt64
+{
+public:
+    explicit SettingFieldNonZeroUInt64(UInt64 x = 1);
+    explicit SettingFieldNonZeroUInt64(const Field & f);
+
+    SettingFieldNonZeroUInt64 & operator=(UInt64 x);
+    SettingFieldNonZeroUInt64 & operator=(const Field & f);
+
+    void parseFromString(const String & str);
+
+private:
+    void checkValueNonZero() const;
+};
+
 }
diff --git a/src/Core/SettingsQuirks.cpp b/src/Core/SettingsQuirks.cpp
index 1a79c23d955..ee6fbea3409 100644
--- a/src/Core/SettingsQuirks.cpp
+++ b/src/Core/SettingsQuirks.cpp
@@ -1,9 +1,10 @@
-#include <base/defines.h>
-#include <Core/SettingsQuirks.h>
 #include <Core/Settings.h>
+#include <Core/SettingsQuirks.h>
+#include <base/defines.h>
 #include <Poco/Environment.h>
 #include <Poco/Platform.h>
 #include <Common/VersionNumber.h>
+#include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/logger_useful.h>
 
 
@@ -17,7 +18,7 @@ namespace
 ///
 ///   [1]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=339ddb53d373
 ///   [2]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0c54a6a44bf3
-bool nestedEpollWorks(Poco::Logger * log)
+bool nestedEpollWorks(LoggerPtr log)
 {
     if (Poco::Environment::os() != POCO_OS_LINUX)
         return true;
@@ -47,8 +48,13 @@ bool queryProfilerWorks() { return false; }
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int INVALID_SETTING_VALUE;
+}
+
 /// Update some settings defaults to avoid some known issues.
-void applySettingsQuirks(Settings & settings, Poco::Logger * log)
+void applySettingsQuirks(Settings & settings, LoggerPtr log)
 {
     if (!nestedEpollWorks(log))
     {
@@ -89,4 +95,34 @@ void applySettingsQuirks(Settings & settings, Poco::Logger * log)
     }
 }
 
+void doSettingsSanityCheck(const Settings & current_settings)
+{
+    auto getCurrentValue = [&current_settings](const std::string_view name) -> Field
+    {
+        Field current_value;
+        bool has_current_value = current_settings.tryGet(name, current_value);
+        chassert(has_current_value);
+        return current_value;
+    };
+
+    UInt64 max_threads = getCurrentValue("max_threads").get<UInt64>();
+    if (max_threads > getNumberOfPhysicalCPUCores() * 65536)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Sanity check: Too many threads requested ({})", max_threads);
+
+    constexpr UInt64 max_sane_block_rows_size = 4294967296; // 2^32
+    std::unordered_set<String> block_rows_settings{
+        "max_block_size",
+        "max_insert_block_size",
+        "min_insert_block_size_rows",
+        "min_insert_block_size_bytes_for_materialized_views",
+        "min_external_table_block_size_rows",
+        "max_joined_block_size_rows",
+        "input_format_parquet_max_block_size"};
+    for (auto const & setting : block_rows_settings)
+    {
+        auto block_size = getCurrentValue(setting).get<UInt64>();
+        if (block_size > max_sane_block_rows_size)
+            throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Sanity check: '{}' value is too high ({})", setting, block_size);
+    }
+}
 }
diff --git a/src/Core/SettingsQuirks.h b/src/Core/SettingsQuirks.h
index 38def8eebf2..9461f5716a8 100644
--- a/src/Core/SettingsQuirks.h
+++ b/src/Core/SettingsQuirks.h
@@ -1,9 +1,6 @@
 #pragma once
 
-namespace Poco
-{
-class Logger;
-}
+#include <Common/Logger.h>
 
 namespace DB
 {
@@ -11,6 +8,8 @@ namespace DB
 struct Settings;
 
 /// Update some settings defaults to avoid some known issues.
-void applySettingsQuirks(Settings & settings, Poco::Logger * log = nullptr);
+void applySettingsQuirks(Settings & settings, LoggerPtr log = nullptr);
 
+/// Verify that some settings have sane values. Throws if not
+void doSettingsSanityCheck(const Settings & settings);
 }
diff --git a/src/Core/SortDescription.cpp b/src/Core/SortDescription.cpp
index 9ba7df8ef24..9edc79a1ff1 100644
--- a/src/Core/SortDescription.cpp
+++ b/src/Core/SortDescription.cpp
@@ -108,10 +108,9 @@ static std::string getSortDescriptionDump(const SortDescription & description, c
     return buffer.str();
 }
 
-static Poco::Logger * getLogger()
+static LoggerPtr getLogger()
 {
-    static Poco::Logger & logger = Poco::Logger::get("SortDescription");
-    return &logger;
+    return ::getLogger("SortDescription");
 }
 
 void compileSortDescriptionIfNeeded(SortDescription & description, const DataTypes & sort_description_types, bool increase_compile_attempts)
diff --git a/src/Core/TypeId.h b/src/Core/TypeId.h
index 9c634d2321c..7003e880cd5 100644
--- a/src/Core/TypeId.h
+++ b/src/Core/TypeId.h
@@ -49,6 +49,7 @@ enum class TypeIndex
     IPv4,
     IPv6,
     JSONPaths,
+    Variant,
 };
 
 /**
diff --git a/src/Core/Types.h b/src/Core/Types.h
index 74e18e9494d..2a930d09873 100644
--- a/src/Core/Types.h
+++ b/src/Core/Types.h
@@ -23,9 +23,9 @@ struct Null
 {
     enum class Value
     {
-        Null,
-        PositiveInfinity,
-        NegativeInfinity,
+        NegativeInfinity = -1,
+        Null = 0,
+        PositiveInfinity = 1,
     };
 
     Value value{Value::Null};
@@ -34,15 +34,12 @@ struct Null
     bool isPositiveInfinity() const { return value == Value::PositiveInfinity; }
     bool isNegativeInfinity() const { return value == Value::NegativeInfinity; }
 
-    bool operator==(const Null & other) const
+    auto operator<=>(const Null & other) const
     {
-        return value == other.value;
+        return static_cast<int>(value) <=> static_cast<int>(other.value);
     }
 
-    bool operator!=(const Null & other) const
-    {
-        return !(*this == other);
-    }
+    bool operator==(const Null &) const = default;
 };
 
 using UInt128 = ::UInt128;
diff --git a/src/Core/Types_fwd.h b/src/Core/Types_fwd.h
index a59e4b6eab8..c75d4d627b2 100644
--- a/src/Core/Types_fwd.h
+++ b/src/Core/Types_fwd.h
@@ -28,16 +28,10 @@ namespace DB
 using UUID = StrongTypedef<UInt128, struct UUIDTag>;
 
 struct IPv4;
-
 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.
diff --git a/src/Core/examples/CMakeLists.txt b/src/Core/examples/CMakeLists.txt
index 2326eada96d..f30ee25491f 100644
--- a/src/Core/examples/CMakeLists.txt
+++ b/src/Core/examples/CMakeLists.txt
@@ -6,6 +6,3 @@ target_link_libraries (field PRIVATE dbms)
 
 clickhouse_add_executable (string_ref_hash string_ref_hash.cpp)
 target_link_libraries (string_ref_hash PRIVATE clickhouse_common_io)
-
-clickhouse_add_executable (mysql_protocol mysql_protocol.cpp)
-target_link_libraries (mysql_protocol PRIVATE dbms)
diff --git a/src/Core/examples/mysql_protocol.cpp b/src/Core/examples/mysql_protocol.cpp
deleted file mode 100644
index 396bc6f7e9b..00000000000
--- a/src/Core/examples/mysql_protocol.cpp
+++ /dev/null
@@ -1,390 +0,0 @@
-#include <string>
-
-#include <Core/MySQL/Authentication.h>
-#include <Core/MySQL/MySQLClient.h>
-#include <Core/MySQL/PacketsConnection.h>
-#include <Core/MySQL/PacketsGeneric.h>
-#include <Core/MySQL/PacketsProtocolText.h>
-#include <IO/ReadBufferFromString.h>
-#include <IO/WriteBufferFromString.h>
-#include <IO/WriteBufferFromOStream.h>
-
-#include <boost/program_options.hpp>
-
-int main(int argc, char ** argv)
-{
-    using namespace DB;
-    using namespace MySQLProtocol;
-    using namespace MySQLProtocol::Generic;
-    using namespace MySQLProtocol::Authentication;
-    using namespace MySQLProtocol::ConnectionPhase;
-    using namespace MySQLProtocol::ProtocolText;
-
-
-    uint8_t server_sequence_id = 1;
-    uint8_t client_sequence_id = 1;
-    String user = "default";
-    String password = "123";
-    String database;
-
-    UInt8 charset_utf8 = 33;
-    UInt32 max_packet_size = MAX_PACKET_LENGTH;
-    String mysql_native_password = "mysql_native_password";
-
-    UInt32 server_capability_flags = CLIENT_PROTOCOL_41 | CLIENT_SECURE_CONNECTION | CLIENT_PLUGIN_AUTH
-        | CLIENT_PLUGIN_AUTH_LENENC_CLIENT_DATA | CLIENT_CONNECT_WITH_DB | CLIENT_DEPRECATE_EOF;
-
-    UInt32 client_capability_flags = CLIENT_PROTOCOL_41 | CLIENT_PLUGIN_AUTH | CLIENT_SECURE_CONNECTION;
-
-    /// Handshake packet
-    {
-        /// 1. Greeting:
-        /// 1.1 Server writes greeting to client
-        std::string s0;
-        WriteBufferFromString out0(s0);
-
-        Handshake server_handshake(
-            server_capability_flags, -1, "ClickHouse", "mysql_native_password", "aaaaaaaaaaaaaaaaaaaaa", CharacterSet::utf8_general_ci);
-        server_handshake.writePayload(out0, server_sequence_id);
-
-        /// 1.2 Client reads the greeting
-        ReadBufferFromString in0(s0);
-        Handshake client_handshake;
-        client_handshake.readPayload(in0, client_sequence_id);
-
-        /// Check packet
-        ASSERT(server_handshake.capability_flags == client_handshake.capability_flags)
-        ASSERT(server_handshake.status_flags == client_handshake.status_flags)
-        ASSERT(server_handshake.server_version == client_handshake.server_version)
-        ASSERT(server_handshake.protocol_version == client_handshake.protocol_version)
-        ASSERT(server_handshake.auth_plugin_data.substr(0, 20) == client_handshake.auth_plugin_data)
-        ASSERT(server_handshake.auth_plugin_name == client_handshake.auth_plugin_name)
-
-        /// 2. Greeting Response:
-        std::string s1;
-        WriteBufferFromString out1(s1);
-
-        /// 2.1 Client writes to server
-        Native41 native41(password, client_handshake.auth_plugin_data);
-        String auth_plugin_data = native41.getAuthPluginData();
-        HandshakeResponse client_handshake_response(
-            client_capability_flags, max_packet_size, charset_utf8, user, database, auth_plugin_data, mysql_native_password);
-        client_handshake_response.writePayload(out1, client_sequence_id);
-
-        /// 2.2 Server reads the response
-        ReadBufferFromString in1(s1);
-        HandshakeResponse server_handshake_response;
-        server_handshake_response.readPayload(in1, server_sequence_id);
-
-        /// Check
-        ASSERT(server_handshake_response.capability_flags == client_handshake_response.capability_flags)
-        ASSERT(server_handshake_response.character_set == client_handshake_response.character_set)
-        ASSERT(server_handshake_response.username == client_handshake_response.username)
-        ASSERT(server_handshake_response.database == client_handshake_response.database)
-        ASSERT(server_handshake_response.auth_response == client_handshake_response.auth_response)
-        ASSERT(server_handshake_response.auth_plugin_name == client_handshake_response.auth_plugin_name)
-    }
-
-    /// OK Packet
-    {
-        // 1. Server writes packet
-        std::string s0;
-        WriteBufferFromString out0(s0);
-        OKPacket server(0x00, server_capability_flags, 0, 0, 0, "", "");
-        server.writePayload(out0, server_sequence_id);
-
-        // 2. Client reads packet
-        ReadBufferFromString in0(s0);
-        ResponsePacket client(server_capability_flags);
-        client.readPayload(in0, client_sequence_id);
-
-        // Check
-        ASSERT(client.getType() == PACKET_OK)
-        ASSERT(client.ok.header == server.header)
-        ASSERT(client.ok.status_flags == server.status_flags)
-        ASSERT(client.ok.capabilities == server.capabilities)
-    }
-
-    /// ERR Packet
-    {
-        // 1. Server writes packet
-        std::string s0;
-        WriteBufferFromString out0(s0);
-        ERRPacket server(123, "12345", "This is the error message");
-        server.writePayload(out0, server_sequence_id);
-
-        // 2. Client reads packet
-        ReadBufferFromString in0(s0);
-        ResponsePacket client(server_capability_flags);
-        client.readPayload(in0, client_sequence_id);
-
-        // Check
-        ASSERT(client.getType() == PACKET_ERR)
-        ASSERT(client.err.header == server.header)
-        ASSERT(client.err.error_code == server.error_code)
-        ASSERT(client.err.sql_state == server.sql_state)
-        ASSERT(client.err.error_message == server.error_message)
-    }
-
-    /// EOF Packet
-    {
-        // 1. Server writes packet
-        std::string s0;
-        WriteBufferFromString out0(s0);
-        EOFPacket server(1, 1);
-        server.writePayload(out0, server_sequence_id);
-
-        // 2. Client reads packet
-        ReadBufferFromString in0(s0);
-        ResponsePacket client(server_capability_flags);
-        client.readPayload(in0, client_sequence_id);
-
-        // Check
-        ASSERT(client.getType() == PACKET_EOF)
-        ASSERT(client.eof.header == server.header)
-        ASSERT(client.eof.warnings == server.warnings)
-        ASSERT(client.eof.status_flags == server.status_flags)
-    }
-
-    /// ColumnDefinition Packet
-    {
-        // 1. Server writes packet
-        std::string s0;
-        WriteBufferFromString out0(s0);
-        ColumnDefinition server("schema", "tbl", "org_tbl", "name", "org_name", 33, 0x00, MYSQL_TYPE_STRING, 0x00, 0x00);
-        server.writePayload(out0, server_sequence_id);
-
-        // 2. Client reads packet
-        ReadBufferFromString in0(s0);
-        ColumnDefinition client;
-        client.readPayload(in0, client_sequence_id);
-
-        // Check
-        ASSERT(client.column_type == server.column_type)
-        ASSERT(client.column_length == server.column_length)
-        ASSERT(client.next_length == server.next_length)
-        ASSERT(client.character_set == server.character_set)
-        ASSERT(client.decimals == server.decimals)
-        ASSERT(client.name == server.name)
-        ASSERT(client.org_name == server.org_name)
-        ASSERT(client.table == server.table)
-        ASSERT(client.org_table == server.org_table)
-        ASSERT(client.schema == server.schema)
-    }
-
-    /// GTID sets tests.
-   {
-        struct Testcase
-        {
-            String name;
-            String sets;
-            String want;
-        };
-
-        Testcase cases[] = {
-            {"gtid-sets-without-whitespace",
-             "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812,9f58c169-d121-11e7-835b-ac162db9c048:1-56060985:56060987-56061175:56061177-"
-             "56061224:56061226-75201528:75201530-75201755:75201757-75201983:75201985-75407550:75407552-75407604:75407606-75407661:"
-             "75407663-87889848:87889850-87889935:87889937-87890042:87890044-88391955:88391957-88392125:88392127-88392245:88392247-"
-             "88755771:88755773-88755826:88755828-88755921:88755923-100279047:100279049-100279126:100279128-100279247:100279249-121672430:"
-             "121672432-121672503:121672505-121672524:121672526-122946019:122946021-122946291:122946293-122946469:122946471-134313284:"
-             "134313286-134313415:134313417-134313648:134313650-136492728:136492730-136492784:136492786-136492904:136492906-145582402:"
-             "145582404-145582439:145582441-145582463:145582465-147455222:147455224-147455262:147455264-147455277:147455279-149319049:"
-             "149319051-149319261:149319263-150635915,a6d83ff6-bfcf-11e7-8c93-246e96158550:1-126618302",
-             "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812,9f58c169-d121-11e7-835b-ac162db9c048:1-56060985:56060987-56061175:56061177-"
-             "56061224:56061226-75201528:75201530-75201755:75201757-75201983:75201985-75407550:75407552-75407604:75407606-75407661:"
-             "75407663-87889848:87889850-87889935:87889937-87890042:87890044-88391955:88391957-88392125:88392127-88392245:88392247-"
-             "88755771:88755773-88755826:88755828-88755921:88755923-100279047:100279049-100279126:100279128-100279247:100279249-121672430:"
-             "121672432-121672503:121672505-121672524:121672526-122946019:122946021-122946291:122946293-122946469:122946471-134313284:"
-             "134313286-134313415:134313417-134313648:134313650-136492728:136492730-136492784:136492786-136492904:136492906-145582402:"
-             "145582404-145582439:145582441-145582463:145582465-147455222:147455224-147455262:147455264-147455277:147455279-149319049:"
-             "149319051-149319261:149319263-150635915,a6d83ff6-bfcf-11e7-8c93-246e96158550:1-126618302"},
-
-            {"gtid-sets-with-whitespace",
-             "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812, 9f58c169-d121-11e7-835b-ac162db9c048:1-56060985:56060987-56061175:56061177",
-             "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812,9f58c169-d121-11e7-835b-ac162db9c048:1-56060985:56060987-56061175:56061177"},
-
-            {"gtid-sets-single", "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812", "2c5adab4-d64a-11e5-82df-ac162d72dac0:1-247743812"}};
-
-        for (auto & tc : cases)
-        {
-            GTIDSets gtid_sets;
-            gtid_sets.parse(tc.sets);
-
-            String want = tc.want;
-            String got = gtid_sets.toString();
-            ASSERT(want == got)
-        }
-    }
-
-    {
-        struct Testcase
-        {
-            String name;
-            String gtid_sets;
-            String gtid_str;
-            String want;
-        };
-
-        Testcase cases[] = {
-            {"merge",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:4-7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:3",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-7"},
-
-            {"merge-front",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:5-7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:3",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-3:5-7"},
-
-            {"extend-interval",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:6-7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:4",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:4:6-7"},
-
-            {"extend-interval",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:4:7-9",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:5",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-2:4-5:7-9"},
-
-            {"extend-interval",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6-7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:4",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:4:6-7"},
-
-            {"extend-interval",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6-7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:9",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6-7:9"},
-
-            {"extend-interval",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6-7",
-             "20662d71-9d91-11ea-bbc2-0242ac110003:9",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6-7,20662d71-9d91-11ea-bbc2-0242ac110003:9"},
-
-            {"shrink-sequence",
-              "10662d71-9d91-11ea-bbc2-0242ac110003:1-3:4-5:7",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:6",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-7"},
-
-            {"shrink-sequence",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-3:4-5:10",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:8",
-             "10662d71-9d91-11ea-bbc2-0242ac110003:1-5:8:10"
-            }
-        };
-
-        for (auto & tc : cases)
-        {
-            GTIDSets gtid_sets;
-            gtid_sets.parse(tc.gtid_sets);
-            ASSERT(tc.gtid_sets == gtid_sets.toString())
-
-            GTIDSets gtid_sets1;
-            gtid_sets1.parse(tc.gtid_str);
-
-            GTID gtid;
-            gtid.uuid = gtid_sets1.sets[0].uuid;
-            gtid.seq_no = gtid_sets1.sets[0].intervals[0].start;
-            gtid_sets.update(gtid);
-
-            String want = tc.want;
-            String got = gtid_sets.toString();
-            ASSERT(want == got)
-        }
-    }
-
-    {
-        /// mysql_protocol --host=172.17.0.3 --user=root --password=123 --db=sbtest
-        try
-        {
-            boost::program_options::options_description desc("Allowed options");
-            desc.add_options()("host", boost::program_options::value<std::string>()->required(), "master host")(
-                "port", boost::program_options::value<std::int32_t>()->default_value(3306), "master port")(
-                "user", boost::program_options::value<std::string>()->default_value("root"), "master user")(
-                "password", boost::program_options::value<std::string>()->required(), "master password")(
-                "gtid", boost::program_options::value<std::string>()->default_value(""), "executed GTID sets")(
-                "db", boost::program_options::value<std::string>()->required(), "replicate do db")(
-                "binlog_checksum", boost::program_options::value<std::string>()->default_value("CRC32"), "master binlog_checksum");
-
-            boost::program_options::variables_map options;
-            boost::program_options::store(boost::program_options::parse_command_line(argc, argv, desc), options);
-            if (argc == 0)
-            {
-                return 1;
-            }
-
-            auto host = options.at("host").as<DB::String>();
-            auto port = options.at("port").as<DB::Int32>();
-            auto master_user = options.at("user").as<DB::String>();
-            auto master_password = options.at("password").as<DB::String>();
-            auto gtid_sets = options.at("gtid").as<DB::String>();
-            auto replicate_db = options.at("db").as<DB::String>();
-            auto binlog_checksum = options.at("binlog_checksum").as<String>();
-
-            std::cerr << "Master Host: " << host << ", Port: " << port << ", User: " << master_user << ", Password: " << master_password
-                      << ", Replicate DB: " << replicate_db << ", GTID: " << gtid_sets << std::endl;
-
-            UInt32 slave_id = 9004;
-            MySQLClient slave(host, port, master_user, master_password);
-
-            /// Connect to the master.
-            slave.connect();
-            slave.startBinlogDumpGTID(slave_id, replicate_db, {}, gtid_sets, binlog_checksum);
-
-            WriteBufferFromOStream cerr(std::cerr);
-
-            /// Read one binlog event on by one.
-            while (true)
-            {
-                auto event = slave.readOneBinlogEvent();
-                switch (event->type())
-                {
-                    case MYSQL_QUERY_EVENT: {
-                        auto binlog_event = std::static_pointer_cast<QueryEvent>(event);
-                        binlog_event->dump(cerr);
-
-                        Position pos = slave.getPosition();
-                        pos.dump(cerr);
-                        break;
-                    }
-                    case MYSQL_WRITE_ROWS_EVENT: {
-                        auto binlog_event = std::static_pointer_cast<WriteRowsEvent>(event);
-                        binlog_event->dump(cerr);
-
-                        Position pos = slave.getPosition();
-                        pos.dump(cerr);
-                        break;
-                    }
-                    case MYSQL_UPDATE_ROWS_EVENT: {
-                        auto binlog_event = std::static_pointer_cast<UpdateRowsEvent>(event);
-                        binlog_event->dump(cerr);
-
-                        Position pos = slave.getPosition();
-                        pos.dump(cerr);
-                        break;
-                    }
-                    case MYSQL_DELETE_ROWS_EVENT: {
-                        auto binlog_event = std::static_pointer_cast<DeleteRowsEvent>(event);
-                        binlog_event->dump(cerr);
-
-                        Position pos = slave.getPosition();
-                        pos.dump(cerr);
-                        break;
-                    }
-                    default:
-                        if (event->header.type != MySQLReplication::EventType::HEARTBEAT_EVENT)
-                        {
-                            event->dump(cerr);
-                        }
-                        break;
-                }
-            }
-        }
-        catch (const Exception & ex)
-        {
-            std::cerr << "Error: " << ex.message() << std::endl;
-            return 1;
-        }
-    }
-}
diff --git a/src/Core/tests/gtest_charset_conv.cpp b/src/Core/tests/gtest_charset_conv.cpp
index 9b501b5f8fc..073b0dd74b4 100644
--- a/src/Core/tests/gtest_charset_conv.cpp
+++ b/src/Core/tests/gtest_charset_conv.cpp
@@ -5,14 +5,12 @@
 namespace DB
 {
 
-// NOLINTBEGIN(clang-analyzer-optin.performance.Padding)
 struct CheckResult
 {
     Int32 id;
     String name;
     bool need_convert;
 };
-// NOLINTEND(clang-analyzer-optin.performance.Padding)
 
 TEST(CharsetTest, CharsetTest)
 {
diff --git a/src/Core/tests/gtest_multienum.cpp b/src/Core/tests/gtest_multienum.cpp
index e935208f661..f9348fbedce 100644
--- a/src/Core/tests/gtest_multienum.cpp
+++ b/src/Core/tests/gtest_multienum.cpp
@@ -7,7 +7,6 @@
 namespace
 {
 
-using namespace DB;
 enum class TestEnum : UInt8
 {
     // name represents which bit is going to be set
diff --git a/src/Daemon/BaseDaemon.cpp b/src/Daemon/BaseDaemon.cpp
index 44a47de6918..bdac6e34444 100644
--- a/src/Daemon/BaseDaemon.cpp
+++ b/src/Daemon/BaseDaemon.cpp
@@ -1,9 +1,11 @@
 #pragma clang diagnostic ignored "-Wreserved-identifier"
 
+#include <base/defines.h>
+#include <base/errnoToString.h>
+#include <Common/CurrentThread.h>
+#include <Common/MemoryTracker.h>
 #include <Daemon/BaseDaemon.h>
 #include <Daemon/SentryWriter.h>
-#include <base/errnoToString.h>
-#include <base/defines.h>
 
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -210,7 +212,7 @@ public:
     static constexpr int SanitizerTrap = -3;
 
     explicit SignalListener(BaseDaemon & daemon_)
-        : log(&Poco::Logger::get("BaseDaemon"))
+        : log(getLogger("BaseDaemon"))
         , daemon(daemon_)
     {
     }
@@ -275,19 +277,30 @@ public:
                 }
 
                 readPODBinary(stack_trace, in);
-                readVectorBinary(thread_frame_pointers, in);
+
+                if (sig != SanitizerTrap)
+                    readVectorBinary(thread_frame_pointers, in);
+
                 readBinary(thread_num, in);
                 readPODBinary(thread_ptr, in);
 
                 /// This allows to receive more signals if failure happens inside onFault function.
                 /// Example: segfault while symbolizing stack trace.
-                std::thread([=, this] { onFault(sig, info, context, stack_trace, thread_frame_pointers, thread_num, thread_ptr); }).detach();
+                try
+                {
+                    std::thread([=, this] { onFault(sig, info, context, stack_trace, thread_frame_pointers, thread_num, thread_ptr); }).detach();
+                }
+                catch (...)
+                {
+                    /// Likely cannot allocate thread
+                    onFault(sig, info, context, stack_trace, thread_frame_pointers, thread_num, thread_ptr);
+                }
             }
         }
     }
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     BaseDaemon & daemon;
 
     void onTerminate(std::string_view message, UInt32 thread_num) const
@@ -319,6 +332,7 @@ private:
         const std::vector<StackTrace::FramePointers> & thread_frame_pointers,
         UInt32 thread_num,
         ThreadStatus * thread_ptr) const
+    try
     {
         ThreadStatus thread_status;
 
@@ -506,7 +520,7 @@ private:
             }
         }
 
-        /// ClickHouse Keeper does not link to some part of Settings.
+        /// ClickHouse Keeper does not link to some parts of Settings.
 #ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
         /// List changed settings.
         if (!query_id.empty())
@@ -524,16 +538,32 @@ private:
         }
 #endif
 
-        /// When everything is done, we will try to send these error messages to client.
+        /// When everything is done, we will try to send these error messages to the client.
         if (thread_ptr)
             thread_ptr->onFatalError();
 
         fatal_error_printed.test_and_set();
     }
+    catch (...)
+    {
+        /// onFault is called from the std::thread, and it should catch all exceptions; otherwise, you can get unrelated fatal errors.
+        PreformattedMessage message = getCurrentExceptionMessageAndPattern(true);
+        LOG_FATAL(getLogger(__PRETTY_FUNCTION__), message);
+    }
 };
 
 
 #if defined(SANITIZER)
+
+template <typename T>
+struct ValueHolder
+{
+    ValueHolder(T value_) : value(value_)
+    {}
+
+    T value;
+};
+
 extern "C" void __sanitizer_set_death_callback(void (*)());
 
 /// Sanitizers may not expect some function calls from death callback.
@@ -551,10 +581,13 @@ static DISABLE_SANITIZER_INSTRUMENTATION void sanitizerDeathCallback()
 
     const StackTrace stack_trace;
 
-    int sig = SignalListener::SanitizerTrap;
-    writeBinary(sig, out);
+    writeBinary(SignalListener::SanitizerTrap, out);
     writePODBinary(stack_trace, out);
-    writeBinary(UInt32(getThreadId()), out);
+    /// We create a dummy struct with a constructor so DISABLE_SANITIZER_INSTRUMENTATION is not applied to it
+    /// otherwise, Memory sanitizer can't know that values initiialized inside this function are actually initialized
+    /// because instrumentations are disabled leading to false positives later on
+    ValueHolder<UInt32> thread_id{static_cast<UInt32>(getThreadId())};
+    writeBinary(thread_id.value, out);
     writePODBinary(current_thread, out);
 
     out.next();
@@ -639,7 +672,7 @@ void BaseDaemon::reloadConfiguration()
       */
     config_path = config().getString("config-file", getDefaultConfigFileName());
     ConfigProcessor config_processor(config_path, false, true);
-    config_processor.setConfigPath(fs::path(config_path).parent_path());
+    ConfigProcessor::setConfigPath(fs::path(config_path).parent_path());
     loaded_config = config_processor.loadConfig(/* allow_zk_includes = */ true);
 
     if (last_configuration != nullptr)
diff --git a/src/Daemon/BaseDaemon.h b/src/Daemon/BaseDaemon.h
index 952cf61d8e0..a0f47c44460 100644
--- a/src/Daemon/BaseDaemon.h
+++ b/src/Daemon/BaseDaemon.h
@@ -103,7 +103,7 @@ public:
 
     GraphiteWriter * getGraphiteWriter(const std::string & config_name = DEFAULT_GRAPHITE_CONFIG_NAME)
     {
-        if (graphite_writers.count(config_name))
+        if (graphite_writers.contains(config_name))
             return graphite_writers[config_name].get();
         return nullptr;
     }
@@ -183,7 +183,7 @@ std::optional<std::reference_wrapper<Daemon>> BaseDaemon::tryGetInstance()
     {
         ptr = dynamic_cast<Daemon *>(&Poco::Util::Application::instance());
     }
-    catch (const Poco::NullPointerException &)
+    catch (const Poco::NullPointerException &) /// NOLINT(bugprone-empty-catch)
     {
         /// if daemon doesn't exist than instance() throw NullPointerException
     }
diff --git a/src/Daemon/GraphiteWriter.h b/src/Daemon/GraphiteWriter.h
index 903385863e8..3df0326c48d 100644
--- a/src/Daemon/GraphiteWriter.h
+++ b/src/Daemon/GraphiteWriter.h
@@ -15,7 +15,7 @@
 class GraphiteWriter
 {
 public:
-    GraphiteWriter(const std::string & config_name, const std::string & sub_path = "");
+    explicit GraphiteWriter(const std::string & config_name, const std::string & sub_path = "");
 
     template <typename T> using KeyValuePair = std::pair<std::string, T>;
     template <typename T> using KeyValueVector = std::vector<KeyValuePair<T>>;
diff --git a/src/Daemon/SentryWriter.cpp b/src/Daemon/SentryWriter.cpp
index d6e7144ca3b..0fa8b99a6f7 100644
--- a/src/Daemon/SentryWriter.cpp
+++ b/src/Daemon/SentryWriter.cpp
@@ -12,6 +12,7 @@
 #include <Common/StackTrace.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Core/ServerUUID.h>
+#include <IO/WriteHelpers.h>
 
 #include "config.h"
 #include <Common/config_version.h>
@@ -68,7 +69,7 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
 {
     bool enabled = false;
     bool debug = config.getBool("send_crash_reports.debug", false);
-    auto * logger = &Poco::Logger::get("SentryWriter");
+    auto logger = getLogger("SentryWriter");
 
     if (config.getBool("send_crash_reports.enabled", false))
     {
@@ -78,7 +79,7 @@ void SentryWriter::initialize(Poco::Util::LayeredConfiguration & config)
 
     if (enabled)
     {
-        server_data_path = config.getString("path", "");
+        server_data_path = config.getString("path", DB::DBMS_DEFAULT_PATH);
         const std::filesystem::path & default_tmp_path = fs::path(config.getString("tmp_path", fs::temp_directory_path())) / "sentry";
         const std::string & endpoint
             = config.getString("send_crash_reports.endpoint");
@@ -140,7 +141,7 @@ void SentryWriter::shutdown()
 
 void SentryWriter::onFault(int sig, const std::string & error_message, const StackTrace & stack_trace)
 {
-    auto * logger = &Poco::Logger::get("SentryWriter");
+    auto logger = getLogger("SentryWriter");
     if (initialized)
     {
         sentry_value_t event = sentry_value_new_message_event(SENTRY_LEVEL_FATAL, "fault", error_message.c_str());
@@ -169,11 +170,9 @@ void SentryWriter::onFault(int sig, const std::string & error_message, const Sta
             };
 
             StackTrace::Frames frames;
-            StackTrace::symbolize(stack_trace.getFramePointers(), offset, stack_size, frames);
 
-            for (ssize_t i = stack_size - 1; i >= offset; --i)
+            auto sentry_add_stack_trace = [&](const StackTrace::Frame & current_frame)
             {
-                const StackTrace::Frame & current_frame = frames[i];
                 sentry_value_t sentry_frame = sentry_value_new_object();
                 UInt64 frame_ptr = reinterpret_cast<UInt64>(current_frame.virtual_addr);
 
@@ -190,7 +189,9 @@ void SentryWriter::onFault(int sig, const std::string & error_message, const Sta
                     sentry_value_set_by_key(sentry_frame, "lineno", sentry_value_new_int32(static_cast<int32_t>(current_frame.line.value())));
 
                 sentry_value_append(sentry_frames, sentry_frame);
-            }
+            };
+
+            StackTrace::forEachFrame(stack_trace.getFramePointers(), offset, stack_size, sentry_add_stack_trace, /* fatal= */ true);
         }
 
         /// Prepare data for https://develop.sentry.dev/sdk/event-payloads/threads/
diff --git a/src/DataTypes/DataTypeAggregateFunction.cpp b/src/DataTypes/DataTypeAggregateFunction.cpp
index 7dc036cafa4..ef7d86d2a81 100644
--- a/src/DataTypes/DataTypeAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeAggregateFunction.cpp
@@ -15,6 +15,7 @@
 #include <IO/Operators.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier_fwd.h>
 #include <Parsers/ASTLiteral.h>
@@ -32,6 +33,11 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+String DataTypeAggregateFunction::getFunctionName() const
+{
+    return function->getName();
+}
+
 
 String DataTypeAggregateFunction::doGetName() const
 {
@@ -52,6 +58,25 @@ size_t DataTypeAggregateFunction::getVersion() const
     return function->getDefaultVersion();
 }
 
+DataTypePtr DataTypeAggregateFunction::getReturnType() const
+{
+    return function->getResultType();
+}
+
+DataTypePtr DataTypeAggregateFunction::getReturnTypeToPredict() const
+{
+    return function->getReturnTypeToPredict();
+}
+
+bool DataTypeAggregateFunction::isVersioned() const
+{
+    return function->isVersioned();
+}
+
+void DataTypeAggregateFunction::updateVersionFromRevision(size_t revision, bool if_empty) const
+{
+    setVersion(function->getVersionFromRevision(revision), if_empty);
+}
 
 String DataTypeAggregateFunction::getNameImpl(bool with_version) const
 {
@@ -239,7 +264,7 @@ static DataTypePtr create(const ASTPtr & arguments)
         argument_types.push_back(DataTypeFactory::instance().get(arguments->children[i]));
 
     if (function_name.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: empty name of aggregate function passed");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty name of aggregate function passed");
 
     AggregateFunctionProperties properties;
     AggregateFunctionPtr function = AggregateFunctionFactory::instance().get(function_name, action, argument_types, params_row, properties);
diff --git a/src/DataTypes/DataTypeAggregateFunction.h b/src/DataTypes/DataTypeAggregateFunction.h
index 7d1bb355ccf..8b4b3d6ee4c 100644
--- a/src/DataTypes/DataTypeAggregateFunction.h
+++ b/src/DataTypes/DataTypeAggregateFunction.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <AggregateFunctions/IAggregateFunction.h>
-
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
+#include <Core/Field.h>
 #include <DataTypes/IDataType.h>
 
 
@@ -39,7 +39,7 @@ public:
     {
     }
 
-    String getFunctionName() const { return function->getName(); }
+    String getFunctionName() const;
     AggregateFunctionPtr getFunction() const { return function; }
 
     String doGetName() const override;
@@ -51,8 +51,8 @@ public:
 
     bool canBeInsideNullable() const override { return false; }
 
-    DataTypePtr getReturnType() const { return function->getResultType(); }
-    DataTypePtr getReturnTypeToPredict() const { return function->getReturnTypeToPredict(); }
+    DataTypePtr getReturnType() const;
+    DataTypePtr getReturnTypeToPredict() const;
     DataTypes getArgumentsDataTypes() const { return argument_types; }
 
     MutableColumnPtr createColumn() const override;
@@ -69,7 +69,7 @@ public:
     SerializationPtr doGetDefaultSerialization() const override;
     bool supportsSparseSerialization() const override { return false; }
 
-    bool isVersioned() const { return function->isVersioned(); }
+    bool isVersioned() const;
 
     /// Version is not empty only if it was parsed from AST or implicitly cast to 0 or version according
     /// to server revision.
@@ -84,10 +84,7 @@ public:
         version = version_;
     }
 
-    void updateVersionFromRevision(size_t revision, bool if_empty) const
-    {
-        setVersion(function->getVersionFromRevision(revision), if_empty);
-    }
+    void updateVersionFromRevision(size_t revision, bool if_empty) const;
 };
 
 void setVersionToAggregateFunctions(DataTypePtr & type, bool if_empty, std::optional<size_t> revision = std::nullopt);
diff --git a/src/DataTypes/DataTypeArray.cpp b/src/DataTypes/DataTypeArray.cpp
index 24cd759e2a5..6e5760933eb 100644
--- a/src/DataTypes/DataTypeArray.cpp
+++ b/src/DataTypes/DataTypeArray.cpp
@@ -69,6 +69,11 @@ String DataTypeArray::doGetPrettyName(size_t indent) const
     return s.str();
 }
 
+void DataTypeArray::forEachChild(const ChildCallback & callback) const
+{
+    callback(*nested);
+    nested->forEachChild(callback);
+}
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeArray.h b/src/DataTypes/DataTypeArray.h
index 6a09b3b530d..4423f137e1a 100644
--- a/src/DataTypes/DataTypeArray.h
+++ b/src/DataTypes/DataTypeArray.h
@@ -43,6 +43,7 @@ public:
 
     MutableColumnPtr createColumn() const override;
 
+    void forEachChild(const ChildCallback & callback) const override;
 
     Field getDefault() const override;
 
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
index aa3b154e49b..cae9622bcb9 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.cpp
@@ -7,6 +7,7 @@
 #include <DataTypes/DataTypeFactory.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
@@ -141,7 +142,7 @@ static std::pair<DataTypePtr, DataTypeCustomDescPtr> create(const ASTPtr & argum
         argument_types.push_back(DataTypeFactory::instance().get(arguments->children[i]));
 
     if (function_name.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: empty name of aggregate function passed");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Empty name of aggregate function passed");
 
     AggregateFunctionProperties properties;
     /// NullsAction is not part of the type definition, instead it will have transformed the function into a different one
diff --git a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
index 926dfd9cc82..bdabb465fe5 100644
--- a/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
+++ b/src/DataTypes/DataTypeCustomSimpleAggregateFunction.h
@@ -1,13 +1,18 @@
 #pragma once
 
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
+#include <Core/Field.h>
 #include <DataTypes/DataTypeCustom.h>
-#include <AggregateFunctions/IAggregateFunction.h>
 
 #include <IO/ReadHelpers.h>
 
 namespace DB
 {
 
+class IDataType;
+using DataTypePtr = std::shared_ptr<const IDataType>;
+using DataTypes = std::vector<DataTypePtr>;
+
 /** The type SimpleAggregateFunction(fct, type) is meant to be used in an AggregatingMergeTree. It behaves like a standard
  * data type but when rows are merged, an aggregation function is applied.
  *
diff --git a/src/DataTypes/DataTypeDate.h b/src/DataTypes/DataTypeDate.h
index 2f17207cc07..0e08b9ba2ca 100644
--- a/src/DataTypes/DataTypeDate.h
+++ b/src/DataTypes/DataTypeDate.h
@@ -12,6 +12,7 @@ public:
     static constexpr auto family_name = "Date";
 
     TypeIndex getTypeId() const override { return TypeIndex::Date; }
+    TypeIndex getColumnType() const override { return TypeIndex::UInt16; }
     const char * getFamilyName() const override { return family_name; }
 
     bool canBeUsedAsVersion() const override { return true; }
diff --git a/src/DataTypes/DataTypeDate32.cpp b/src/DataTypes/DataTypeDate32.cpp
index 83b1260eb6d..343e498d303 100644
--- a/src/DataTypes/DataTypeDate32.cpp
+++ b/src/DataTypes/DataTypeDate32.cpp
@@ -1,6 +1,8 @@
 #include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/Serializations/SerializationDate32.h>
+#include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 
 namespace DB
 {
@@ -14,6 +16,11 @@ SerializationPtr DataTypeDate32::doGetDefaultSerialization() const
     return std::make_shared<SerializationDate32>();
 }
 
+Field DataTypeDate32::getDefault() const
+{
+    return -static_cast<Int64>(DateLUT::instance().getDayNumOffsetEpoch()); /// NOLINT(readability-static-accessed-through-instance)
+}
+
 void registerDataTypeDate32(DataTypeFactory & factory)
 {
     factory.registerSimpleDataType(
diff --git a/src/DataTypes/DataTypeDate32.h b/src/DataTypes/DataTypeDate32.h
index 9160b62dc15..65633e7a228 100644
--- a/src/DataTypes/DataTypeDate32.h
+++ b/src/DataTypes/DataTypeDate32.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Core/Field.h>
-#include <Common/DateLUT.h>
 #include <DataTypes/DataTypeNumberBase.h>
 
 namespace DB
@@ -12,12 +11,10 @@ public:
     static constexpr auto family_name = "Date32";
 
     TypeIndex getTypeId() const override { return TypeIndex::Date32; }
+    TypeIndex getColumnType() const override { return TypeIndex::Int32; }
     const char * getFamilyName() const override { return family_name; }
 
-    Field getDefault() const override
-    {
-        return -static_cast<Int64>(DateLUT::instance().getDayNumOffsetEpoch());
-    }
+    Field getDefault() const override;
 
     bool canBeUsedAsVersion() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
diff --git a/src/DataTypes/DataTypeDateTime.h b/src/DataTypes/DataTypeDateTime.h
index a4a05917ba5..5519240dee1 100644
--- a/src/DataTypes/DataTypeDateTime.h
+++ b/src/DataTypes/DataTypeDateTime.h
@@ -40,6 +40,7 @@ public:
     const char * getFamilyName() const override { return family_name; }
     String doGetName() const override;
     TypeIndex getTypeId() const override { return TypeIndex::DateTime; }
+    TypeIndex getColumnType() const override { return TypeIndex::UInt32; }
 
     bool canBeUsedAsVersion() const override { return true; }
     bool canBeInsideNullable() const override { return true; }
diff --git a/src/DataTypes/DataTypeDecimalBase.h b/src/DataTypes/DataTypeDecimalBase.h
index adbe9c95b14..9887dfabcdb 100644
--- a/src/DataTypes/DataTypeDecimalBase.h
+++ b/src/DataTypes/DataTypeDecimalBase.h
@@ -207,4 +207,10 @@ inline DataTypePtr createDecimal(UInt64 precision_value, UInt64 scale_value)
     return std::make_shared<DecimalType<Decimal256>>(precision_value, scale_value);
 }
 
+extern template class DataTypeDecimalBase<Decimal32>;
+extern template class DataTypeDecimalBase<Decimal64>;
+extern template class DataTypeDecimalBase<Decimal128>;
+extern template class DataTypeDecimalBase<Decimal256>;
+extern template class DataTypeDecimalBase<DateTime64>;
+
 }
diff --git a/src/DataTypes/DataTypeDomainBool.cpp b/src/DataTypes/DataTypeDomainBool.cpp
index 245c5495299..3d19b6262d8 100644
--- a/src/DataTypes/DataTypeDomainBool.cpp
+++ b/src/DataTypes/DataTypeDomainBool.cpp
@@ -1,6 +1,7 @@
-#include <DataTypes/Serializations/SerializationBool.h>
-#include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeCustom.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/Serializations/SerializationBool.h>
 
 namespace DB
 {
diff --git a/src/DataTypes/DataTypeEnum.h b/src/DataTypes/DataTypeEnum.h
index 2f607fc2aa6..075d2d274ae 100644
--- a/src/DataTypes/DataTypeEnum.h
+++ b/src/DataTypes/DataTypeEnum.h
@@ -54,6 +54,7 @@ public:
     const char * getFamilyName() const override;
 
     TypeIndex getTypeId() const override { return type_id; }
+    TypeIndex getColumnType() const override { return sizeof(FieldType) == 1 ? TypeIndex::Int8 : TypeIndex::Int16; }
 
     FieldType readValue(ReadBuffer & istr) const
     {
diff --git a/src/DataTypes/DataTypeFactory.cpp b/src/DataTypes/DataTypeFactory.cpp
index 415f24d8151..844384f3c95 100644
--- a/src/DataTypes/DataTypeFactory.cpp
+++ b/src/DataTypes/DataTypeFactory.cpp
@@ -56,13 +56,14 @@ DataTypePtr DataTypeFactory::getImpl(const String & full_name) const
     {
         String out_err;
         const char * start = full_name.data();
-        ast = tryParseQuery(parser, start, start + full_name.size(), out_err, false, "data type", false, DBMS_DEFAULT_MAX_QUERY_SIZE, data_type_max_parse_depth);
+        ast = tryParseQuery(parser, start, start + full_name.size(), out_err, false, "data type", false,
+            DBMS_DEFAULT_MAX_QUERY_SIZE, data_type_max_parse_depth, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
         if (!ast)
             return nullptr;
     }
     else
     {
-        ast = parseQuery(parser, full_name.data(), full_name.data() + full_name.size(), "data type", false, data_type_max_parse_depth);
+        ast = parseQuery(parser, full_name.data(), full_name.data() + full_name.size(), "data type", false, data_type_max_parse_depth, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     }
 
     return getImpl<nullptr_on_error>(ast);
@@ -290,6 +291,7 @@ DataTypeFactory::DataTypeFactory()
     registerDataTypeDomainGeo(*this);
     registerDataTypeMap(*this);
     registerDataTypeObject(*this);
+    registerDataTypeVariant(*this);
 }
 
 DataTypeFactory & DataTypeFactory::instance()
diff --git a/src/DataTypes/DataTypeFactory.h b/src/DataTypes/DataTypeFactory.h
index ba7c1a3d7fe..4727cb3ae5c 100644
--- a/src/DataTypes/DataTypeFactory.h
+++ b/src/DataTypes/DataTypeFactory.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <DataTypes/IDataType.h>
 #include <Parsers/IAST_fwd.h>
 #include <Common/IFactoryWithAliases.h>
 #include <DataTypes/DataTypeCustom.h>
@@ -100,5 +99,6 @@ void registerDataTypeDomainBool(DataTypeFactory & factory);
 void registerDataTypeDomainSimpleAggregateFunction(DataTypeFactory & factory);
 void registerDataTypeDomainGeo(DataTypeFactory & factory);
 void registerDataTypeObject(DataTypeFactory & factory);
+void registerDataTypeVariant(DataTypeFactory & factory);
 
 }
diff --git a/src/DataTypes/DataTypeInterval.cpp b/src/DataTypes/DataTypeInterval.cpp
index f8fe8bb3b4b..20e0c5eb8b8 100644
--- a/src/DataTypes/DataTypeInterval.cpp
+++ b/src/DataTypes/DataTypeInterval.cpp
@@ -15,17 +15,17 @@ bool DataTypeInterval::equals(const IDataType & rhs) const
 
 void registerDataTypeInterval(DataTypeFactory & factory)
 {
-    factory.registerSimpleDataType("IntervalNanosecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Nanosecond)); });
-    factory.registerSimpleDataType("IntervalMicrosecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Microsecond)); });
-    factory.registerSimpleDataType("IntervalMillisecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Millisecond)); });
-    factory.registerSimpleDataType("IntervalSecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Second)); });
-    factory.registerSimpleDataType("IntervalMinute", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Minute)); });
-    factory.registerSimpleDataType("IntervalHour", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Hour)); });
-    factory.registerSimpleDataType("IntervalDay", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Day)); });
-    factory.registerSimpleDataType("IntervalWeek", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Week)); });
-    factory.registerSimpleDataType("IntervalMonth", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Month)); });
-    factory.registerSimpleDataType("IntervalQuarter", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Quarter)); });
-    factory.registerSimpleDataType("IntervalYear", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Year)); });
+    factory.registerSimpleDataType("IntervalNanosecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Nanosecond)); });
+    factory.registerSimpleDataType("IntervalMicrosecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Microsecond)); });
+    factory.registerSimpleDataType("IntervalMillisecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Millisecond)); });
+    factory.registerSimpleDataType("IntervalSecond", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Second)); });
+    factory.registerSimpleDataType("IntervalMinute", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Minute)); });
+    factory.registerSimpleDataType("IntervalHour", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Hour)); });
+    factory.registerSimpleDataType("IntervalDay", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Day)); });
+    factory.registerSimpleDataType("IntervalWeek", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Week)); });
+    factory.registerSimpleDataType("IntervalMonth", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Month)); });
+    factory.registerSimpleDataType("IntervalQuarter", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Quarter)); });
+    factory.registerSimpleDataType("IntervalYear", [] { return DataTypePtr(std::make_shared<DataTypeInterval>(IntervalKind::Kind::Year)); });
 }
 
 }
diff --git a/src/DataTypes/DataTypeInterval.h b/src/DataTypes/DataTypeInterval.h
index b0e747555e3..8bb9ae8d7b6 100644
--- a/src/DataTypes/DataTypeInterval.h
+++ b/src/DataTypes/DataTypeInterval.h
@@ -28,6 +28,7 @@ public:
     std::string doGetName() const override { return fmt::format("Interval{}", kind.toString()); }
     const char * getFamilyName() const override { return "Interval"; }
     TypeIndex getTypeId() const override { return TypeIndex::Interval; }
+    TypeIndex getColumnType() const override { return TypeIndex::Int64; }
 
     bool equals(const IDataType & rhs) const override;
 
diff --git a/src/DataTypes/DataTypeLowCardinality.cpp b/src/DataTypes/DataTypeLowCardinality.cpp
index 3e94b533c7a..5af1f28cbad 100644
--- a/src/DataTypes/DataTypeLowCardinality.cpp
+++ b/src/DataTypes/DataTypeLowCardinality.cpp
@@ -153,6 +153,12 @@ SerializationPtr DataTypeLowCardinality::doGetDefaultSerialization() const
     return std::make_shared<SerializationLowCardinality>(dictionary_type);
 }
 
+void DataTypeLowCardinality::forEachChild(const ChildCallback & callback) const
+{
+    callback(*dictionary_type);
+    dictionary_type->forEachChild(callback);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeLowCardinality.h b/src/DataTypes/DataTypeLowCardinality.h
index 389e24ef2a9..cd926bb595c 100644
--- a/src/DataTypes/DataTypeLowCardinality.h
+++ b/src/DataTypes/DataTypeLowCardinality.h
@@ -60,6 +60,8 @@ public:
     static MutableColumnUniquePtr createColumnUnique(const IDataType & keys_type);
     static MutableColumnUniquePtr createColumnUnique(const IDataType & keys_type, MutableColumnPtr && keys);
 
+    void forEachChild(const ChildCallback & callback) const override;
+
 private:
     SerializationPtr doGetDefaultSerialization() const override;
 
diff --git a/src/DataTypes/DataTypeLowCardinalityHelpers.cpp b/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
index 98eb76267a4..116e806f89c 100644
--- a/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
+++ b/src/DataTypes/DataTypeLowCardinalityHelpers.cpp
@@ -20,6 +20,7 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_COLUMN;
     extern const int TYPE_MISMATCH;
+    extern const int LOGICAL_ERROR;
 }
 
 DataTypePtr recursiveRemoveLowCardinality(const DataTypePtr & type)
@@ -55,62 +56,61 @@ DataTypePtr recursiveRemoveLowCardinality(const DataTypePtr & type)
 
 ColumnPtr recursiveRemoveLowCardinality(const ColumnPtr & column)
 {
-    if (!column)
-        return column;
+    ColumnPtr res = column;
 
     if (const auto * column_array = typeid_cast<const ColumnArray *>(column.get()))
     {
         const auto & data = column_array->getDataPtr();
         auto data_no_lc = recursiveRemoveLowCardinality(data);
-        if (data.get() == data_no_lc.get())
-            return column;
-
-        return ColumnArray::create(data_no_lc, column_array->getOffsetsPtr());
+        if (data.get() != data_no_lc.get())
+            res = ColumnArray::create(data_no_lc, column_array->getOffsetsPtr());
     }
-
-    if (const auto * column_const = typeid_cast<const ColumnConst *>(column.get()))
+    else if (const auto * column_const = typeid_cast<const ColumnConst *>(column.get()))
     {
         const auto & nested = column_const->getDataColumnPtr();
         auto nested_no_lc = recursiveRemoveLowCardinality(nested);
-        if (nested.get() == nested_no_lc.get())
-            return column;
-
-        return ColumnConst::create(nested_no_lc, column_const->size());
+        if (nested.get() != nested_no_lc.get())
+            res = ColumnConst::create(nested_no_lc, column_const->size());
     }
-
-    if (const auto * column_tuple = typeid_cast<const ColumnTuple *>(column.get()))
+    else if (const auto * column_tuple = typeid_cast<const ColumnTuple *>(column.get()))
     {
         auto columns = column_tuple->getColumns();
         for (auto & element : columns)
             element = recursiveRemoveLowCardinality(element);
-        return ColumnTuple::create(columns);
+        res = ColumnTuple::create(columns);
     }
-
-    if (const auto * column_map = typeid_cast<const ColumnMap *>(column.get()))
+    else if (const auto * column_map = typeid_cast<const ColumnMap *>(column.get()))
     {
         const auto & nested = column_map->getNestedColumnPtr();
         auto nested_no_lc = recursiveRemoveLowCardinality(nested);
-        if (nested.get() == nested_no_lc.get())
-            return column;
-
-        return ColumnMap::create(nested_no_lc);
+        if (nested.get() != nested_no_lc.get())
+            res = ColumnMap::create(nested_no_lc);
     }
-
     /// Special case when column is a lazy argument of short circuit function.
     /// We should call recursiveRemoveLowCardinality on the result column
     /// when function will be executed.
-    if (const auto * column_function = typeid_cast<const ColumnFunction *>(column.get()))
+    else if (const auto * column_function = typeid_cast<const ColumnFunction *>(column.get()))
     {
-        if (!column_function->isShortCircuitArgument())
-            return column;
-
-        return column_function->recursivelyConvertResultToFullColumnIfLowCardinality();
+        if (column_function->isShortCircuitArgument())
+            res = column_function->recursivelyConvertResultToFullColumnIfLowCardinality();
+    }
+    else if (const auto * column_low_cardinality = typeid_cast<const ColumnLowCardinality *>(column.get()))
+    {
+        res = column_low_cardinality->convertToFullColumn();
     }
 
-    if (const auto * column_low_cardinality = typeid_cast<const ColumnLowCardinality *>(column.get()))
-        return column_low_cardinality->convertToFullColumn();
+    if (res != column)
+    {
+        /// recursiveRemoveLowCardinality() must not change the size of a passed column!
+        if (res->size() != column->size())
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "recursiveRemoveLowCardinality() somehow changed the size of column {}. Old size={}, new size={}. It's a bug",
+                            column->getName(), column->size(), res->size());
+        }
+    }
 
-    return column;
+    return res;
 }
 
 ColumnPtr recursiveLowCardinalityTypeConversion(const ColumnPtr & column, const DataTypePtr & from_type, const DataTypePtr & to_type)
diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index 1f246af74d3..4b85606ff26 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -143,6 +143,14 @@ DataTypePtr DataTypeMap::getNestedTypeWithUnnamedTuple() const
     return std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(from_tuple.getElements()));
 }
 
+void DataTypeMap::forEachChild(const DB::IDataType::ChildCallback & callback) const
+{
+    callback(*key_type);
+    key_type->forEachChild(callback);
+    callback(*value_type);
+    value_type->forEachChild(callback);
+}
+
 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 257888a8e44..7281cca1bb1 100644
--- a/src/DataTypes/DataTypeMap.h
+++ b/src/DataTypes/DataTypeMap.h
@@ -54,6 +54,8 @@ public:
 
     static bool checkKeyType(DataTypePtr key_type);
 
+    void forEachChild(const ChildCallback & callback) const override;
+
 private:
     void assertKeyType() const;
 };
diff --git a/src/DataTypes/DataTypeNullable.cpp b/src/DataTypes/DataTypeNullable.cpp
index 41a9a1de543..db252659d41 100644
--- a/src/DataTypes/DataTypeNullable.cpp
+++ b/src/DataTypes/DataTypeNullable.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/Serializations/SerializationNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/ColumnConst.h>
 #include <Core/Field.h>
 #include <Parsers/IAST.h>
 #include <Common/typeid_cast.h>
@@ -56,11 +57,41 @@ bool DataTypeNullable::equals(const IDataType & rhs) const
     return rhs.isNullable() && nested_data_type->equals(*static_cast<const DataTypeNullable &>(rhs).nested_data_type);
 }
 
+ColumnPtr DataTypeNullable::createColumnConst(size_t size, const Field & field) const
+{
+    if (onlyNull())
+    {
+        auto column = createColumn();
+        column->insert(field);
+        return ColumnConst::create(std::move(column), size);
+    }
+
+    auto column = nested_data_type->createColumn();
+    bool is_null = field.isNull();
+
+    if (is_null)
+        nested_data_type->insertDefaultInto(*column);
+    else
+        column->insert(field);
+
+    auto null_mask = ColumnUInt8::create();
+    null_mask->getData().push_back(is_null ? 1 : 0);
+
+    auto res = ColumnNullable::create(std::move(column), std::move(null_mask));
+    return ColumnConst::create(std::move(res), size);
+}
+
 SerializationPtr DataTypeNullable::doGetDefaultSerialization() const
 {
     return std::make_shared<SerializationNullable>(nested_data_type->getDefaultSerialization());
 }
 
+void DataTypeNullable::forEachChild(const ChildCallback & callback) const
+{
+    callback(*nested_data_type);
+    nested_data_type->forEachChild(callback);
+}
+
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
@@ -114,5 +145,33 @@ DataTypePtr makeNullableOrLowCardinalityNullable(const DataTypePtr & type)
     return std::make_shared<DataTypeNullable>(type);
 }
 
+DataTypePtr makeNullableOrLowCardinalityNullableSafe(const DataTypePtr & type)
+{
+    if (isNullableOrLowCardinalityNullable(type))
+        return type;
+
+    if (type->lowCardinality())
+    {
+        const auto & dictionary_type = assert_cast<const DataTypeLowCardinality &>(*type).getDictionaryType();
+        return std::make_shared<DataTypeLowCardinality>(makeNullable(dictionary_type));
+    }
+
+    return makeNullableSafe(type);
+}
+
+DataTypePtr removeNullableOrLowCardinalityNullable(const DataTypePtr & type)
+{
+    if (type->isNullable())
+        return static_cast<const DataTypeNullable &>(*type).getNestedType();
+
+    if (type->isLowCardinalityNullable())
+    {
+        auto dict_type = removeNullable(static_cast<const DataTypeLowCardinality &>(*type).getDictionaryType());
+        return std::make_shared<DataTypeLowCardinality>(dict_type);
+    }
+
+    return type;
+
+}
 
 }
diff --git a/src/DataTypes/DataTypeNullable.h b/src/DataTypes/DataTypeNullable.h
index 06d46fb15ed..71abe48c151 100644
--- a/src/DataTypes/DataTypeNullable.h
+++ b/src/DataTypes/DataTypeNullable.h
@@ -41,8 +41,12 @@ public:
     bool onlyNull() const override;
     bool canBeInsideLowCardinality() const override { return nested_data_type->canBeInsideLowCardinality(); }
     bool canBePromoted() const override { return nested_data_type->canBePromoted(); }
+    ColumnPtr createColumnConst(size_t size, const Field & field) const override;
 
     const DataTypePtr & getNestedType() const { return nested_data_type; }
+
+    void forEachChild(const ChildCallback & callback) const override;
+
 private:
     SerializationPtr doGetDefaultSerialization() const override;
 
@@ -54,5 +58,8 @@ DataTypePtr makeNullable(const DataTypePtr & type);
 DataTypePtr makeNullableSafe(const DataTypePtr & type);
 DataTypePtr removeNullable(const DataTypePtr & type);
 DataTypePtr makeNullableOrLowCardinalityNullable(const DataTypePtr & type);
+DataTypePtr makeNullableOrLowCardinalityNullableSafe(const DataTypePtr & type);
+/// Nullable(T) -> T, LowCardinality(Nullable(T)) -> T
+DataTypePtr removeNullableOrLowCardinalityNullable(const DataTypePtr & type);
 
 }
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index db8a14c537a..5bbd79160d4 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -11,6 +11,7 @@
 #include <DataTypes/Serializations/SerializationTuple.h>
 #include <DataTypes/Serializations/SerializationNamed.h>
 #include <DataTypes/Serializations/SerializationInfoTuple.h>
+#include <DataTypes/Serializations/SerializationVariantElement.h>
 #include <DataTypes/NestedUtils.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTNameTypePair.h>
@@ -56,7 +57,7 @@ static std::optional<Exception> checkTupleNames(const Strings & names)
             return Exception(ErrorCodes::BAD_ARGUMENTS, "Names of tuple elements cannot be empty");
 
         if (!names_set.insert(name).second)
-            return Exception(ErrorCodes::DUPLICATE_COLUMN, "Names of tuple elements must be unique");
+            return Exception(ErrorCodes::DUPLICATE_COLUMN, "Names of tuple elements must be unique. Duplicate name: {}", name);
     }
 
     return {};
@@ -189,11 +190,15 @@ MutableColumnPtr DataTypeTuple::createColumn() const
 
 MutableColumnPtr DataTypeTuple::createColumn(const ISerialization & serialization) const
 {
+    /// If we read Tuple as Variant subcolumn, it may be wrapped to SerializationVariantElement.
+    /// Here we don't need it, so we drop this wrapper.
+    const auto * current_serialization = &serialization;
+    while (const auto * serialization_variant_element = typeid_cast<const SerializationVariantElement *>(current_serialization))
+        current_serialization = serialization_variant_element->getNested().get();
+
     /// If we read subcolumn of nested Tuple, it may be wrapped to SerializationNamed
     /// several times to allow to reconstruct the substream path name.
     /// Here we don't need substream path name, so we drop first several wrapper serializations.
-
-    const auto * current_serialization = &serialization;
     while (const auto * serialization_named = typeid_cast<const SerializationNamed *>(current_serialization))
         current_serialization = serialization_named->getNested().get();
 
@@ -320,7 +325,7 @@ SerializationPtr DataTypeTuple::doGetDefaultSerialization() const
     {
         String elem_name = have_explicit_names ? names[i] : toString(i + 1);
         auto serialization = elems[i]->getDefaultSerialization();
-        serializations[i] = std::make_shared<SerializationNamed>(serialization, elem_name);
+        serializations[i] = std::make_shared<SerializationNamed>(serialization, elem_name, SubstreamType::TupleElement);
     }
 
     return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
@@ -335,13 +340,13 @@ SerializationPtr DataTypeTuple::getSerialization(const SerializationInfo & info)
     {
         String elem_name = have_explicit_names ? names[i] : toString(i + 1);
         auto serialization = elems[i]->getSerialization(*info_tuple.getElementInfo(i));
-        serializations[i] = std::make_shared<SerializationNamed>(serialization, elem_name);
+        serializations[i] = std::make_shared<SerializationNamed>(serialization, elem_name, SubstreamType::TupleElement);
     }
 
     return std::make_shared<SerializationTuple>(std::move(serializations), have_explicit_names);
 }
 
-MutableSerializationInfoPtr DataTypeTuple::createSerializationInfo(const SerializationInfo::Settings & settings) const
+MutableSerializationInfoPtr DataTypeTuple::createSerializationInfo(const SerializationInfoSettings & settings) const
 {
     MutableSerializationInfos infos;
     infos.reserve(elems.size());
@@ -371,6 +376,14 @@ SerializationInfoPtr DataTypeTuple::getSerializationInfo(const IColumn & column)
     return std::make_shared<SerializationInfoTuple>(std::move(infos), names, SerializationInfo::Settings{});
 }
 
+void DataTypeTuple::forEachChild(const ChildCallback & callback) const
+{
+    for (const auto & elem : elems)
+    {
+        callback(*elem);
+        elem->forEachChild(callback);
+    }
+}
 
 static DataTypePtr create(const ASTPtr & arguments)
 {
diff --git a/src/DataTypes/DataTypeTuple.h b/src/DataTypes/DataTypeTuple.h
index db49b7f22d1..15561fe4286 100644
--- a/src/DataTypes/DataTypeTuple.h
+++ b/src/DataTypes/DataTypeTuple.h
@@ -58,7 +58,7 @@ public:
 
     SerializationPtr doGetDefaultSerialization() const override;
     SerializationPtr getSerialization(const SerializationInfo & info) const override;
-    MutableSerializationInfoPtr createSerializationInfo(const SerializationInfo::Settings & settings) const override;
+    MutableSerializationInfoPtr createSerializationInfo(const SerializationInfoSettings & settings) const override;
     SerializationInfoPtr getSerializationInfo(const IColumn & column) const override;
 
     const DataTypePtr & getElement(size_t i) const { return elems[i]; }
@@ -70,6 +70,8 @@ public:
     String getNameByPosition(size_t i) const;
 
     bool haveExplicitNames() const { return have_explicit_names; }
+
+    void forEachChild(const ChildCallback & callback) const override;
 };
 
 }
diff --git a/src/DataTypes/DataTypeVariant.cpp b/src/DataTypes/DataTypeVariant.cpp
new file mode 100644
index 00000000000..db96972c00f
--- /dev/null
+++ b/src/DataTypes/DataTypeVariant.cpp
@@ -0,0 +1,229 @@
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnConst.h>
+#include <Core/Field.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/Serializations/SerializationVariant.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/FieldToDataType.h>
+#include <Common/assert_cast.h>
+#include <IO/WriteHelpers.h>
+#include <IO/WriteBufferFromString.h>
+#include <IO/Operators.h>
+#include <Parsers/IAST.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int EMPTY_DATA_PASSED;
+}
+
+
+DataTypeVariant::DataTypeVariant(const DataTypes & variants_)
+{
+    /// Sort nested types by their full names and squash identical types.
+    std::map<String, DataTypePtr> name_to_type;
+    for (const auto & type : variants_)
+    {
+        /// Nullable(...), LowCardinality(Nullable(...)) and Variant(...) types are not allowed inside Variant type.
+        if (isNullableOrLowCardinalityNullable(type))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Nullable/LowCardinality(Nullable) types are not allowed inside Variant type");
+        if (type->getTypeId() == TypeIndex::Variant)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Nested Variant types are not allowed");
+        /// Don't use Nothing type as a variant.
+        if (!isNothing(type))
+            name_to_type[type->getName()] = type;
+    }
+
+    variants.reserve(name_to_type.size());
+    for (const auto & [_, type] : name_to_type)
+        variants.push_back(type);
+
+    if (variants.empty())
+        throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "Variant cannot be empty");
+
+    if (variants.size() > ColumnVariant::MAX_NESTED_COLUMNS)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Variant type with more than {} nested types is not allowed", ColumnVariant::MAX_NESTED_COLUMNS);
+}
+
+std::string DataTypeVariant::doGetName() const
+{
+    size_t size = variants.size();
+    WriteBufferFromOwnString s;
+
+    s << "Variant(";
+    for (size_t i = 0; i < size; ++i)
+    {
+        if (i != 0)
+            s << ", ";
+
+        s << variants[i]->getName();
+    }
+    s << ")";
+
+    return s.str();
+}
+
+std::string DataTypeVariant::doGetPrettyName(size_t indent) const
+{
+    size_t size = variants.size();
+    WriteBufferFromOwnString s;
+    s << "Variant(";
+
+    for (size_t i = 0; i != size; ++i)
+    {
+        if (i != 0)
+            s << ", ";
+
+        s << variants[i]->getPrettyName(indent);
+    }
+
+    s << ')';
+    return s.str();
+}
+
+MutableColumnPtr DataTypeVariant::createColumn() const
+{
+    size_t size = variants.size();
+    MutableColumns nested_columns;
+    nested_columns.reserve(size);
+    for (size_t i = 0; i < size; ++i)
+        nested_columns.push_back(variants[i]->createColumn());
+
+    return ColumnVariant::create(std::move(nested_columns));
+}
+
+Field DataTypeVariant::getDefault() const
+{
+    return Null();
+}
+
+bool DataTypeVariant::equals(const IDataType & rhs) const
+{
+    if (typeid(rhs) != typeid(*this))
+        return false;
+
+    const DataTypeVariant & rhs_variant = static_cast<const DataTypeVariant &>(rhs);
+
+    size_t size = variants.size();
+    if (size != rhs_variant.variants.size())
+        return false;
+
+    for (size_t i = 0; i < size; ++i)
+        if (!variants[i]->equals(*rhs_variant.variants[i]))
+            return false;
+
+    return true;
+}
+
+bool DataTypeVariant::textCanContainOnlyValidUTF8() const
+{
+    return std::all_of(variants.begin(), variants.end(), [](auto && elem) { return elem->textCanContainOnlyValidUTF8(); });
+}
+
+bool DataTypeVariant::haveMaximumSizeOfValue() const
+{
+    return std::all_of(variants.begin(), variants.end(), [](auto && elem) { return elem->haveMaximumSizeOfValue(); });
+}
+
+bool DataTypeVariant::hasDynamicSubcolumns() const
+{
+    return std::any_of(variants.begin(), variants.end(), [](auto && elem) { return elem->hasDynamicSubcolumns(); });
+}
+
+std::optional<ColumnVariant::Discriminator> DataTypeVariant::tryGetVariantDiscriminator(const IDataType & type) const
+{
+    String type_name = type.getName();
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        /// We don't use equals here, because it doesn't respect custom type names.
+        if (variants[i]->getName() == type_name)
+            return i;
+    }
+
+    return std::nullopt;
+}
+
+size_t DataTypeVariant::getMaximumSizeOfValueInMemory() const
+{
+    size_t max_size = 0;
+    for (const auto & elem : variants)
+    {
+        size_t elem_max_size = elem->getMaximumSizeOfValueInMemory();
+        if (elem_max_size > max_size)
+            max_size = elem_max_size;
+    }
+    return max_size;
+}
+
+SerializationPtr DataTypeVariant::doGetDefaultSerialization() const
+{
+    SerializationVariant::VariantSerializations serializations;
+    serializations.reserve(variants.size());
+    Names variant_names;
+    variant_names.reserve(variants.size());
+
+    for (const auto & variant : variants)
+    {
+        serializations.push_back(variant->getDefaultSerialization());
+        variant_names.push_back(variant->getName());
+    }
+
+    return std::make_shared<SerializationVariant>(std::move(serializations), std::move(variant_names), SerializationVariant::getVariantsDeserializeTextOrder(variants), getName());
+}
+
+void DataTypeVariant::forEachChild(const DB::IDataType::ChildCallback & callback) const
+{
+    for (const auto & variant : variants)
+    {
+        callback(*variant);
+        variant->forEachChild(callback);
+    }
+}
+
+static DataTypePtr create(const ASTPtr & arguments)
+{
+    if (!arguments || arguments->children.empty())
+        throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "Variant cannot be empty");
+
+    DataTypes nested_types;
+    nested_types.reserve(arguments->children.size());
+
+    for (const ASTPtr & child : arguments->children)
+        nested_types.emplace_back(DataTypeFactory::instance().get(child));
+
+    return std::make_shared<DataTypeVariant>(nested_types);
+}
+
+bool isVariantExtension(const DataTypePtr & from_type, const DataTypePtr & to_type)
+{
+    const auto * from_variant = typeid_cast<const DataTypeVariant *>(from_type.get());
+    const auto * to_variant = typeid_cast<const DataTypeVariant *>(to_type.get());
+    if (!from_variant || !to_variant)
+        return false;
+
+    const auto & to_variants = to_variant->getVariants();
+    std::unordered_set<String> to_variant_types;
+    to_variant_types.reserve(to_variants.size());
+    for (const auto & variant : to_variants)
+        to_variant_types.insert(variant->getName());
+
+    for (const auto & variant : from_variant->getVariants())
+    {
+        if (!to_variant_types.contains(variant->getName()))
+            return false;
+    }
+
+    return true;
+}
+
+
+void registerDataTypeVariant(DataTypeFactory & factory)
+{
+    factory.registerDataType("Variant", create);
+}
+
+}
diff --git a/src/DataTypes/DataTypeVariant.h b/src/DataTypes/DataTypeVariant.h
new file mode 100644
index 00000000000..dadc85ac3b3
--- /dev/null
+++ b/src/DataTypes/DataTypeVariant.h
@@ -0,0 +1,70 @@
+#pragma once
+
+#include <DataTypes/IDataType.h>
+#include <Columns/ColumnVariant.h>
+#include <optional>
+
+
+namespace DB
+{
+
+/** Variant data type.
+  * This type represents a union of other data types.
+  * For example, type Variant(T1, T2, ..., TN) means that each row of this type
+  * has a value of either type T1 or T2 or ... or TN or none of them (NULL value).
+  * Nullable(...), LowCardinality(Nullable(...)) and Variant(...) types are not allowed
+  * inside Variant type.
+  * The order of nested types doesn't matter: Variant(T1, T2) = Variant(T2, T1).
+  * To have global order of nested types we sort variants by type names on Variant creation.
+  * The index of a variant in a sorted list is called global variant discriminator.
+  */
+class DataTypeVariant final : public IDataType
+{
+private:
+    DataTypes variants;
+
+public:
+    static constexpr bool is_parametric = true;
+
+    explicit DataTypeVariant(const DataTypes & variants_);
+
+    TypeIndex getTypeId() const override { return TypeIndex::Variant; }
+    const char * getFamilyName() const override { return "Variant"; }
+
+    bool canBeInsideNullable() const override { return false; }
+    bool supportsSparseSerialization() const override { return false; }
+    bool canBeInsideSparseColumns() const override { return false; }
+
+    MutableColumnPtr createColumn() const override;
+
+    Field getDefault() const override;
+
+    bool equals(const IDataType & rhs) const override;
+
+    bool isParametric() const override { return true; }
+    bool haveSubtypes() const override { return true; }
+    bool textCanContainOnlyValidUTF8() const override;
+    bool haveMaximumSizeOfValue() const override;
+    bool hasDynamicSubcolumns() const override;
+    size_t getMaximumSizeOfValueInMemory() const override;
+
+    const DataTypePtr & getVariant(size_t i) const { return variants[i]; }
+    const DataTypes & getVariants() const { return variants; }
+
+    /// Check if Variant has provided type in the list of variants and return its discriminator.
+    std::optional<ColumnVariant::Discriminator> tryGetVariantDiscriminator(const IDataType & type) const;
+
+    void forEachChild(const ChildCallback & callback) const override;
+
+private:
+    std::string doGetName() const override;
+    std::string doGetPrettyName(size_t indent) const override;
+    SerializationPtr doGetDefaultSerialization() const override;
+};
+
+/// Check if conversion from from_type to to_type is Variant extension
+/// (both types are Variants and to_type contains all variants from from_type).
+bool isVariantExtension(const DataTypePtr & from_type, const DataTypePtr & to_type);
+
+}
+
diff --git a/src/DataTypes/DataTypesDecimal.cpp b/src/DataTypes/DataTypesDecimal.cpp
index 7ad9f0b6fd8..77a7a3e7237 100644
--- a/src/DataTypes/DataTypesDecimal.cpp
+++ b/src/DataTypes/DataTypesDecimal.cpp
@@ -112,6 +112,256 @@ static DataTypePtr createExact(const ASTPtr & arguments)
     return createDecimal<DataTypeDecimal>(precision, scale);
 }
 
+template <typename FromDataType, typename ToDataType, typename ReturnType>
+requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
+ReturnType convertDecimalsImpl(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result)
+{
+    using FromFieldType = typename FromDataType::FieldType;
+    using ToFieldType = typename ToDataType::FieldType;
+    using MaxFieldType = std::conditional_t<(sizeof(FromFieldType) > sizeof(ToFieldType)), FromFieldType, ToFieldType>;
+    using MaxNativeType = typename MaxFieldType::NativeType;
+
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    MaxNativeType converted_value;
+    if (scale_to > scale_from)
+    {
+        converted_value = DecimalUtils::scaleMultiplier<MaxNativeType>(scale_to - scale_from);
+        if (common::mulOverflow(static_cast<MaxNativeType>(value.value), converted_value, converted_value))
+        {
+            if constexpr (throw_exception)
+                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);
+        }
+    }
+    else if (scale_to == scale_from)
+    {
+        converted_value = value.value;
+    }
+    else
+    {
+        converted_value = value.value / DecimalUtils::scaleMultiplier<MaxNativeType>(scale_from - scale_to);
+    }
+
+    if constexpr (sizeof(FromFieldType) > sizeof(ToFieldType))
+    {
+        if (converted_value < std::numeric_limits<typename ToFieldType::NativeType>::min() ||
+            converted_value > std::numeric_limits<typename ToFieldType::NativeType>::max())
+        {
+            if constexpr (throw_exception)
+                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);
+        }
+    }
+
+    result = static_cast<typename ToFieldType::NativeType>(converted_value);
+
+    return ReturnType(true);
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template void convertDecimalsImpl<FROM_DATA_TYPE, TO_DATA_TYPE, void>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result); \
+    template bool convertDecimalsImpl<FROM_DATA_TYPE, TO_DATA_TYPE, bool>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
+typename ToDataType::FieldType convertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to)
+{
+    using ToFieldType = typename ToDataType::FieldType;
+    ToFieldType result;
+
+    convertDecimalsImpl<FromDataType, ToDataType, void>(value, scale_from, scale_to, result);
+
+    return result;
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template typename TO_DATA_TYPE::FieldType convertDecimals<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
+bool tryConvertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result)
+{
+    return convertDecimalsImpl<FromDataType, ToDataType, bool>(value, scale_from, scale_to, result);
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template bool tryConvertDecimals<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType, typename ReturnType>
+requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
+ReturnType convertFromDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType & result)
+{
+    using FromFieldType = typename FromDataType::FieldType;
+    using ToFieldType = typename ToDataType::FieldType;
+
+    return DecimalUtils::convertToImpl<ToFieldType, FromFieldType, ReturnType>(value, scale, result);
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template void convertFromDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result); \
+    template bool convertFromDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
+inline typename ToDataType::FieldType convertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
+{
+    typename ToDataType::FieldType result;
+
+    convertFromDecimalImpl<FromDataType, ToDataType, void>(value, scale, result);
+
+    return result;
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template typename TO_DATA_TYPE::FieldType convertFromDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
+inline bool tryConvertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
+{
+    return convertFromDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template bool tryConvertFromDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType& result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType, typename ReturnType>
+requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
+ReturnType convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType & result)
+{
+    using FromFieldType = typename FromDataType::FieldType;
+    using ToFieldType = typename ToDataType::FieldType;
+    using ToNativeType = typename ToFieldType::NativeType;
+
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    if constexpr (std::is_floating_point_v<FromFieldType>)
+    {
+        if (!std::isfinite(value))
+        {
+            if constexpr (throw_exception)
+                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow. Cannot convert infinity or NaN to decimal", ToDataType::family_name);
+            else
+                return ReturnType(false);
+        }
+
+        auto out = value * static_cast<FromFieldType>(DecimalUtils::scaleMultiplier<ToNativeType>(scale));
+
+        if (out <= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::min()) ||
+            out >= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::max()))
+        {
+            if constexpr (throw_exception)
+                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow. Float is out of Decimal range", ToDataType::family_name);
+            else
+                return ReturnType(false);
+        }
+
+        result = static_cast<ToNativeType>(out);
+        return ReturnType(true);
+    }
+    else
+    {
+        if constexpr (is_big_int_v<FromFieldType>)
+            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal256>, ToDataType, ReturnType>(static_cast<Int256>(value), 0, scale, result));
+        else if constexpr (std::is_same_v<FromFieldType, UInt64>)
+            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal128>, ToDataType, ReturnType>(static_cast<Int128>(value), 0, scale, result));
+        else
+            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal64>, ToDataType, ReturnType>(static_cast<Int64>(value), 0, scale, result));
+    }
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template void convertToDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);  \
+    template bool convertToDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
+inline typename ToDataType::FieldType convertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
+{
+    typename ToDataType::FieldType result;
+    convertToDecimalImpl<FromDataType, ToDataType, void>(value, scale, result);
+    return result;
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template typename TO_DATA_TYPE::FieldType convertToDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename FromDataType, typename ToDataType>
+requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
+inline bool tryConvertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
+{
+    return convertToDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
+}
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    template bool tryConvertToDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType& result);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
+
+template <typename T>
+DataTypePtr createDecimalMaxPrecision(UInt64 scale)
+{
+    return std::make_shared<DataTypeDecimal<T>>(DecimalUtils::max_precision<T>, scale);
+}
+
+template DataTypePtr createDecimalMaxPrecision<Decimal32>(UInt64 scale);
+template DataTypePtr createDecimalMaxPrecision<Decimal64>(UInt64 scale);
+template DataTypePtr createDecimalMaxPrecision<Decimal128>(UInt64 scale);
+template DataTypePtr createDecimalMaxPrecision<Decimal256>(UInt64 scale);
+
+/// Explicit template instantiations.
+template class DataTypeDecimal<Decimal32>;
+template class DataTypeDecimal<Decimal64>;
+template class DataTypeDecimal<Decimal128>;
+template class DataTypeDecimal<Decimal256>;
+
 void registerDataTypeDecimal(DataTypeFactory & factory)
 {
     factory.registerDataType("Decimal32", createExact<Decimal32>, DataTypeFactory::CaseInsensitive);
@@ -125,10 +375,4 @@ void registerDataTypeDecimal(DataTypeFactory & factory)
     factory.registerAlias("FIXED", "Decimal", DataTypeFactory::CaseInsensitive);
 }
 
-/// Explicit template instantiations.
-template class DataTypeDecimal<Decimal32>;
-template class DataTypeDecimal<Decimal64>;
-template class DataTypeDecimal<Decimal128>;
-template class DataTypeDecimal<Decimal256>;
-
 }
diff --git a/src/DataTypes/DataTypesDecimal.h b/src/DataTypes/DataTypesDecimal.h
index e2b433cbe2f..badefc4c75a 100644
--- a/src/DataTypes/DataTypesDecimal.h
+++ b/src/DataTypes/DataTypesDecimal.h
@@ -3,7 +3,11 @@
 #include <base/arithmeticOverflow.h>
 #include <base/extended_types.h>
 #include <Common/typeid_cast.h>
+#include <base/Decimal.h>
+#include <base/Decimal_fwd.h>
 #include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDecimalBase.h>
 #include <DataTypes/DataTypeDateTime64.h>
 
@@ -13,7 +17,6 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int DECIMAL_OVERFLOW;
     extern const int LOGICAL_ERROR;
 }
 
@@ -99,171 +102,145 @@ inline UInt32 getDecimalScale(const DataTypeDecimal<T> & data_type)
     return data_type.getScale();
 }
 
+#define FOR_EACH_DECIMAL_TYPE(M) \
+    M(DataTypeDecimal<DateTime64>) \
+    M(DataTypeDateTime64) \
+    M(DataTypeDecimal32) \
+    M(DataTypeDecimal64) \
+    M(DataTypeDecimal128) \
+    M(DataTypeDecimal256)
+
+#define FOR_EACH_DECIMAL_TYPE_PASS(M, X) \
+    M(DataTypeDecimal<DateTime64>, X) \
+    M(DataTypeDateTime64, X) \
+    M(DataTypeDecimal32, X) \
+    M(DataTypeDecimal64, X) \
+    M(DataTypeDecimal128, X) \
+    M(DataTypeDecimal256, X)
+
+
 template <typename FromDataType, typename ToDataType, typename ReturnType = void>
 requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
-inline ReturnType convertDecimalsImpl(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result)
-{
-    using FromFieldType = typename FromDataType::FieldType;
-    using ToFieldType = typename ToDataType::FieldType;
-    using MaxFieldType = std::conditional_t<(sizeof(FromFieldType) > sizeof(ToFieldType)), FromFieldType, ToFieldType>;
-    using MaxNativeType = typename MaxFieldType::NativeType;
+ReturnType convertDecimalsImpl(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result);
 
-    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template void convertDecimalsImpl<FROM_DATA_TYPE, TO_DATA_TYPE, void>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result); \
+    extern template bool convertDecimalsImpl<FROM_DATA_TYPE, TO_DATA_TYPE, bool>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
 
-    MaxNativeType converted_value;
-    if (scale_to > scale_from)
-    {
-        converted_value = DecimalUtils::scaleMultiplier<MaxNativeType>(scale_to - scale_from);
-        if (common::mulOverflow(static_cast<MaxNativeType>(value.value), converted_value, converted_value))
-        {
-            if constexpr (throw_exception)
-                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);
-        }
-    }
-    else if (scale_to == scale_from)
-    {
-        converted_value = value.value;
-    }
-    else
-    {
-        converted_value = value.value / DecimalUtils::scaleMultiplier<MaxNativeType>(scale_from - scale_to);
-    }
-
-    if constexpr (sizeof(FromFieldType) > sizeof(ToFieldType))
-    {
-        if (converted_value < std::numeric_limits<typename ToFieldType::NativeType>::min() ||
-            converted_value > std::numeric_limits<typename ToFieldType::NativeType>::max())
-        {
-            if constexpr (throw_exception)
-                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);
-        }
-    }
-
-    result = static_cast<typename ToFieldType::NativeType>(converted_value);
-
-    return ReturnType(true);
-}
 
 template <typename FromDataType, typename ToDataType>
 requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
-inline typename ToDataType::FieldType convertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to)
-{
-    using ToFieldType = typename ToDataType::FieldType;
-    ToFieldType result;
+typename ToDataType::FieldType convertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to);
 
-    convertDecimalsImpl<FromDataType, ToDataType, void>(value, scale_from, scale_to, result);
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template typename TO_DATA_TYPE::FieldType convertDecimals<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
 
-    return result;
-}
 
 template <typename FromDataType, typename ToDataType>
 requires (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
-inline bool tryConvertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result)
-{
-    return convertDecimalsImpl<FromDataType, ToDataType, bool>(value, scale_from, scale_to, result);
-}
+bool tryConvertDecimals(const typename FromDataType::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename ToDataType::FieldType & result);
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template bool tryConvertDecimals<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale_from, UInt32 scale_to, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
 
 template <typename FromDataType, typename ToDataType, typename ReturnType>
 requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
-inline ReturnType convertFromDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
-{
-    using FromFieldType = typename FromDataType::FieldType;
-    using ToFieldType = typename ToDataType::FieldType;
+ReturnType convertFromDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType & result);
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template void convertFromDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result); \
+    extern template bool convertFromDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
 
-    return DecimalUtils::convertToImpl<ToFieldType, FromFieldType, ReturnType>(value, scale, result);
-}
 
 template <typename FromDataType, typename ToDataType>
 requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
-inline typename ToDataType::FieldType convertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
-{
-    typename ToDataType::FieldType result;
+typename ToDataType::FieldType convertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale);
 
-    convertFromDecimalImpl<FromDataType, ToDataType, void>(value, scale, result);
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template typename TO_DATA_TYPE::FieldType convertFromDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
 
-    return result;
-}
 
 template <typename FromDataType, typename ToDataType>
 requires (IsDataTypeDecimal<FromDataType> && is_arithmetic_v<typename ToDataType::FieldType>)
-inline bool tryConvertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
-{
-    return convertFromDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
-}
+bool tryConvertFromDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result);
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template bool tryConvertFromDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType& result);
+#define INVOKE(X) FOR_EACH_DECIMAL_TYPE_PASS(DISPATCH, X)
+FOR_EACH_ARITHMETIC_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
 
 template <typename FromDataType, typename ToDataType, typename ReturnType>
 requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
-inline ReturnType convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
-{
-    using FromFieldType = typename FromDataType::FieldType;
-    using ToFieldType = typename ToDataType::FieldType;
-    using ToNativeType = typename ToFieldType::NativeType;
+ReturnType convertToDecimalImpl(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result);
 
-    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template void convertToDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);  \
+    extern template bool convertToDecimalImpl<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType & result);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
 
-    if constexpr (std::is_floating_point_v<FromFieldType>)
-    {
-        if (!std::isfinite(value))
-        {
-            if constexpr (throw_exception)
-                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow. Cannot convert infinity or NaN to decimal", ToDataType::family_name);
-            else
-                return ReturnType(false);
-        }
-
-        auto out = value * static_cast<FromFieldType>(DecimalUtils::scaleMultiplier<ToNativeType>(scale));
-
-        if (out <= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::min()) ||
-            out >= static_cast<FromFieldType>(std::numeric_limits<ToNativeType>::max()))
-        {
-            if constexpr (throw_exception)
-                throw Exception(ErrorCodes::DECIMAL_OVERFLOW, "{} convert overflow. Float is out of Decimal range", ToDataType::family_name);
-            else
-                return ReturnType(false);
-        }
-
-        result = static_cast<ToNativeType>(out);
-        return ReturnType(true);
-    }
-    else
-    {
-        if constexpr (is_big_int_v<FromFieldType>)
-            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal256>, ToDataType, ReturnType>(static_cast<Int256>(value), 0, scale, result));
-        else if constexpr (std::is_same_v<FromFieldType, UInt64>)
-            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal128>, ToDataType, ReturnType>(static_cast<Int128>(value), 0, scale, result));
-        else
-            return ReturnType(convertDecimalsImpl<DataTypeDecimal<Decimal64>, ToDataType, ReturnType>(static_cast<Int64>(value), 0, scale, result));
-    }
-}
 
 template <typename FromDataType, typename ToDataType>
 requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
-inline typename ToDataType::FieldType convertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale)
-{
-    typename ToDataType::FieldType result;
-    convertToDecimalImpl<FromDataType, ToDataType, void>(value, scale, result);
-    return result;
-}
+typename ToDataType::FieldType convertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale);
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template typename TO_DATA_TYPE::FieldType convertToDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
 
 template <typename FromDataType, typename ToDataType>
 requires (is_arithmetic_v<typename FromDataType::FieldType> && IsDataTypeDecimal<ToDataType>)
-inline bool tryConvertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result)
-{
-    return convertToDecimalImpl<FromDataType, ToDataType, bool>(value, scale, result);
-}
+bool tryConvertToDecimal(const typename FromDataType::FieldType & value, UInt32 scale, typename ToDataType::FieldType& result);
+
+#define DISPATCH(FROM_DATA_TYPE, TO_DATA_TYPE) \
+    extern template bool tryConvertToDecimal<FROM_DATA_TYPE, TO_DATA_TYPE>(const typename FROM_DATA_TYPE::FieldType & value, UInt32 scale, typename TO_DATA_TYPE::FieldType& result);
+#define INVOKE(X) FOR_EACH_ARITHMETIC_TYPE_PASS(DISPATCH, X)
+FOR_EACH_DECIMAL_TYPE(INVOKE);
+#undef INVOKE
+#undef DISPATCH
+
 
 template <typename T>
-inline DataTypePtr createDecimalMaxPrecision(UInt64 scale)
-{
-    return std::make_shared<DataTypeDecimal<T>>(DecimalUtils::max_precision<T>, scale);
-}
+DataTypePtr createDecimalMaxPrecision(UInt64 scale);
+
+extern template DataTypePtr createDecimalMaxPrecision<Decimal32>(UInt64 scale);
+extern template DataTypePtr createDecimalMaxPrecision<Decimal64>(UInt64 scale);
+extern template DataTypePtr createDecimalMaxPrecision<Decimal128>(UInt64 scale);
+extern template DataTypePtr createDecimalMaxPrecision<Decimal256>(UInt64 scale);
+
+extern template class DataTypeDecimal<Decimal32>;
+extern template class DataTypeDecimal<Decimal64>;
+extern template class DataTypeDecimal<Decimal128>;
+extern template class DataTypeDecimal<Decimal256>;
 
 }
diff --git a/src/DataTypes/DataTypesNumber.cpp b/src/DataTypes/DataTypesNumber.cpp
index 1c0c418411b..99446d24eed 100644
--- a/src/DataTypes/DataTypesNumber.cpp
+++ b/src/DataTypes/DataTypesNumber.cpp
@@ -66,39 +66,57 @@ void registerDataTypeNumbers(DataTypeFactory & factory)
     /// These synonyms are added for compatibility.
 
     factory.registerAlias("TINYINT", "Int8", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("INT1", "Int8", DataTypeFactory::CaseInsensitive);    /// MySQL
-    factory.registerAlias("BYTE", "Int8", DataTypeFactory::CaseInsensitive);    /// MS Access
-    factory.registerAlias("SMALLINT", "Int16", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("INT", "Int32", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("INTEGER", "Int32", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("BIGINT", "Int64", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("FLOAT", "Float32", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("REAL", "Float32", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("SINGLE", "Float32", DataTypeFactory::CaseInsensitive);   /// MS Access
-    factory.registerAlias("DOUBLE", "Float64", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("MEDIUMINT", "Int32", DataTypeFactory::CaseInsensitive);    /// MySQL
-
-    factory.registerAlias("DOUBLE PRECISION", "Float64", DataTypeFactory::CaseInsensitive);
-
-    /// MySQL
+    factory.registerAlias("INT1", "Int8", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("BYTE", "Int8", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("TINYINT SIGNED", "Int8", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INT1 SIGNED", "Int8", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("SMALLINT", "Int16", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("SMALLINT SIGNED", "Int16", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("INT", "Int32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("INTEGER", "Int32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("MEDIUMINT", "Int32", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("MEDIUMINT SIGNED", "Int32", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INT SIGNED", "Int32", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INTEGER SIGNED", "Int32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("BIGINT", "Int64", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("SIGNED", "Int64", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("BIGINT SIGNED", "Int64", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("TIME", "Int64", DataTypeFactory::CaseInsensitive);
+
     factory.registerAlias("TINYINT UNSIGNED", "UInt8", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INT1 UNSIGNED", "UInt8", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("SMALLINT UNSIGNED", "UInt16", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("YEAR", "UInt16", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("MEDIUMINT UNSIGNED", "UInt32", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INT UNSIGNED", "UInt32", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("INTEGER UNSIGNED", "UInt32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("UNSIGNED", "UInt64", DataTypeFactory::CaseInsensitive);
     factory.registerAlias("BIGINT UNSIGNED", "UInt64", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("BIT", "UInt64", DataTypeFactory::CaseInsensitive);  /// MySQL
-    factory.registerAlias("SET", "UInt64", DataTypeFactory::CaseInsensitive);  /// MySQL
-    factory.registerAlias("YEAR", "UInt16", DataTypeFactory::CaseInsensitive);
-    factory.registerAlias("TIME", "Int64", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("BIT", "UInt64", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("SET", "UInt64", DataTypeFactory::CaseInsensitive);
+
+    factory.registerAlias("FLOAT", "Float32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("REAL", "Float32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("SINGLE", "Float32", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("DOUBLE", "Float64", DataTypeFactory::CaseInsensitive);
+    factory.registerAlias("DOUBLE PRECISION", "Float64", DataTypeFactory::CaseInsensitive);
 }
 
+/// Explicit template instantiations.
+template class DataTypeNumber<UInt8>;
+template class DataTypeNumber<UInt16>;
+template class DataTypeNumber<UInt32>;
+template class DataTypeNumber<UInt64>;
+template class DataTypeNumber<Int8>;
+template class DataTypeNumber<Int16>;
+template class DataTypeNumber<Int32>;
+template class DataTypeNumber<Int64>;
+template class DataTypeNumber<Float32>;
+template class DataTypeNumber<Float64>;
+
+template class DataTypeNumber<UInt128>;
+template class DataTypeNumber<Int128>;
+template class DataTypeNumber<UInt256>;
+template class DataTypeNumber<Int256>;
+
 }
diff --git a/src/DataTypes/DataTypesNumber.h b/src/DataTypes/DataTypesNumber.h
index 0c1f88a7925..d550ceababc 100644
--- a/src/DataTypes/DataTypesNumber.h
+++ b/src/DataTypes/DataTypesNumber.h
@@ -55,6 +55,22 @@ private:
     bool unsigned_can_be_signed = false;
 };
 
+extern template class DataTypeNumber<UInt8>;
+extern template class DataTypeNumber<UInt16>;
+extern template class DataTypeNumber<UInt32>;
+extern template class DataTypeNumber<UInt64>;
+extern template class DataTypeNumber<Int8>;
+extern template class DataTypeNumber<Int16>;
+extern template class DataTypeNumber<Int32>;
+extern template class DataTypeNumber<Int64>;
+extern template class DataTypeNumber<Float32>;
+extern template class DataTypeNumber<Float64>;
+
+extern template class DataTypeNumber<UInt128>;
+extern template class DataTypeNumber<Int128>;
+extern template class DataTypeNumber<UInt256>;
+extern template class DataTypeNumber<Int256>;
+
 using DataTypeUInt8 = DataTypeNumber<UInt8>;
 using DataTypeUInt16 = DataTypeNumber<UInt16>;
 using DataTypeUInt32 = DataTypeNumber<UInt32>;
diff --git a/src/DataTypes/EnumValues.cpp b/src/DataTypes/EnumValues.cpp
index 9df49e765a7..a15136b9335 100644
--- a/src/DataTypes/EnumValues.cpp
+++ b/src/DataTypes/EnumValues.cpp
@@ -74,6 +74,25 @@ T EnumValues<T>::getValue(StringRef field_name, bool try_treat_as_id) const
     return it->getMapped();
 }
 
+template <typename T>
+bool EnumValues<T>::tryGetValue(T & x, StringRef field_name, bool try_treat_as_id) const
+{
+    const auto it = name_to_value_map.find(field_name);
+    if (!it)
+    {
+        /// It is used in CSV and TSV input formats. If we fail to find given string in
+        /// enum names, we will try to treat it as enum id.
+        if (try_treat_as_id)
+        {
+            ReadBufferFromMemory tmp_buf(field_name.data, field_name.size);
+            return tryReadText(x, tmp_buf) && tmp_buf.eof() && value_to_name_map.contains(x);
+        }
+        return false;
+    }
+    x = it->getMapped();
+    return true;
+}
+
 template <typename T>
 Names EnumValues<T>::getAllRegisteredNames() const
 {
diff --git a/src/DataTypes/EnumValues.h b/src/DataTypes/EnumValues.h
index 5189f7a56f5..889878bc60f 100644
--- a/src/DataTypes/EnumValues.h
+++ b/src/DataTypes/EnumValues.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-namespace ErrorCodes
+namespace ErrorCodesEnumValues
 {
     extern const int BAD_ARGUMENTS;
 }
@@ -42,6 +42,11 @@ public:
         return it;
     }
 
+    bool hasValue(const T & value) const
+    {
+        return value_to_name_map.contains(value);
+    }
+
     /// throws exception if value is not valid
     const StringRef & getNameForValue(const T & value) const
     {
@@ -60,6 +65,7 @@ public:
     }
 
     T getValue(StringRef field_name, bool try_treat_as_id = false) const;
+    bool tryGetValue(T & x, StringRef field_name, bool try_treat_as_id = false) const;
 
     template <typename TValues>
     bool containsAll(const TValues & rhs_values) const
diff --git a/src/DataTypes/FieldToDataType.cpp b/src/DataTypes/FieldToDataType.cpp
index 0131a3956f4..a7b43e9e2c5 100644
--- a/src/DataTypes/FieldToDataType.cpp
+++ b/src/DataTypes/FieldToDataType.cpp
@@ -208,5 +208,6 @@ DataTypePtr FieldToDataType<on_error>::operator()(const bool &) const
 template class FieldToDataType<LeastSupertypeOnError::Throw>;
 template class FieldToDataType<LeastSupertypeOnError::String>;
 template class FieldToDataType<LeastSupertypeOnError::Null>;
+template class FieldToDataType<LeastSupertypeOnError::Variant>;
 
 }
diff --git a/src/DataTypes/IDataType.cpp b/src/DataTypes/IDataType.cpp
index 2a7e0f246de..344b81be960 100644
--- a/src/DataTypes/IDataType.cpp
+++ b/src/DataTypes/IDataType.cpp
@@ -109,11 +109,26 @@ Ptr IDataType::getForSubcolumn(
     bool throw_if_null) const
 {
     Ptr res;
-    forEachSubcolumn([&](const auto &, const auto & name, const auto & subdata)
+
+    ISerialization::StreamCallback callback_with_data = [&](const auto & subpath)
     {
-        if (name == subcolumn_name)
-            res = subdata.*member;
-    }, data);
+        for (size_t i = 0; i < subpath.size(); ++i)
+        {
+            size_t prefix_len = i + 1;
+            if (!subpath[i].visited && ISerialization::hasSubcolumnForPath(subpath, prefix_len))
+            {
+                auto name = ISerialization::getSubcolumnNameForStream(subpath, prefix_len);
+                /// Create data from path only if it's requested subcolumn.
+                if (name == subcolumn_name)
+                    res = ISerialization::createFromPath(subpath, prefix_len).*member;
+            }
+            subpath[i].visited = true;
+        }
+    };
+
+    ISerialization::EnumerateStreamsSettings settings;
+    settings.position_independent_encoding = false;
+    data.serialization->enumerateStreams(settings, callback_with_data, data);
 
     if (!res && throw_if_null)
         throw Exception(ErrorCodes::ILLEGAL_COLUMN, "There is no subcolumn {} in type {}", subcolumn_name, getName());
@@ -187,7 +202,7 @@ void IDataType::setCustomization(DataTypeCustomDescPtr custom_desc_) const
         custom_serialization = std::move(custom_desc_->serialization);
 }
 
-MutableSerializationInfoPtr IDataType::createSerializationInfo(const SerializationInfo::Settings & settings) const
+MutableSerializationInfoPtr IDataType::createSerializationInfo(const SerializationInfoSettings & settings) const
 {
     return std::make_shared<SerializationInfo>(ISerialization::Kind::DEFAULT, settings);
 }
@@ -252,4 +267,91 @@ SerializationPtr IDataType::getSerialization(const NameAndTypePair & column)
     return column.type->getDefaultSerialization();
 }
 
+#define FOR_TYPES_OF_TYPE(M) \
+    M(TypeIndex) \
+    M(const IDataType &) \
+    M(const DataTypePtr &) \
+    M(WhichDataType)
+
+#define DISPATCH(TYPE) \
+bool isUInt8(TYPE data_type) { return WhichDataType(data_type).isUInt8(); } \
+bool isUInt16(TYPE data_type) { return WhichDataType(data_type).isUInt16(); } \
+bool isUInt32(TYPE data_type) { return WhichDataType(data_type).isUInt32(); } \
+bool isUInt64(TYPE data_type) { return WhichDataType(data_type).isUInt64(); } \
+bool isNativeUInt(TYPE data_type) { return WhichDataType(data_type).isNativeUInt(); } \
+bool isUInt(TYPE data_type) { return WhichDataType(data_type).isUInt(); } \
+\
+bool isInt8(TYPE data_type) { return WhichDataType(data_type).isInt8(); } \
+bool isInt16(TYPE data_type) { return WhichDataType(data_type).isInt16(); } \
+bool isInt32(TYPE data_type) { return WhichDataType(data_type).isInt32(); } \
+bool isInt64(TYPE data_type) { return WhichDataType(data_type).isInt64(); } \
+bool isNativeInt(TYPE data_type) { return WhichDataType(data_type).isNativeInt(); } \
+bool isInt(TYPE data_type) { return WhichDataType(data_type).isInt(); } \
+\
+bool isInteger(TYPE data_type) { return WhichDataType(data_type).isInteger(); } \
+bool isNativeInteger(TYPE data_type) { return WhichDataType(data_type).isNativeInteger(); } \
+\
+bool isDecimal(TYPE data_type) { return WhichDataType(data_type).isDecimal(); } \
+\
+bool isFloat(TYPE data_type) { return WhichDataType(data_type).isFloat(); } \
+\
+bool isNativeNumber(TYPE data_type) { return WhichDataType(data_type).isNativeNumber(); } \
+bool isNumber(TYPE data_type) { return WhichDataType(data_type).isNumber(); } \
+\
+bool isEnum8(TYPE data_type) { return WhichDataType(data_type).isEnum8(); } \
+bool isEnum16(TYPE data_type) { return WhichDataType(data_type).isEnum16(); } \
+bool isEnum(TYPE data_type) { return WhichDataType(data_type).isEnum(); } \
+\
+bool isDate(TYPE data_type) { return WhichDataType(data_type).isDate(); } \
+bool isDate32(TYPE data_type) { return WhichDataType(data_type).isDate32(); } \
+bool isDateOrDate32(TYPE data_type) { return WhichDataType(data_type).isDateOrDate32(); } \
+bool isDateTime(TYPE data_type) { return WhichDataType(data_type).isDateTime(); } \
+bool isDateTime64(TYPE data_type) { return WhichDataType(data_type).isDateTime64(); } \
+bool isDateTimeOrDateTime64(TYPE data_type) { return WhichDataType(data_type).isDateTimeOrDateTime64(); } \
+bool isDateOrDate32OrDateTimeOrDateTime64(TYPE data_type) { return WhichDataType(data_type).isDateOrDate32OrDateTimeOrDateTime64(); } \
+\
+bool isString(TYPE data_type) { return WhichDataType(data_type).isString(); } \
+bool isFixedString(TYPE data_type) { return WhichDataType(data_type).isFixedString(); } \
+bool isStringOrFixedString(TYPE data_type) { return WhichDataType(data_type).isStringOrFixedString(); } \
+\
+bool isUUID(TYPE data_type) { return WhichDataType(data_type).isUUID(); } \
+bool isIPv4(TYPE data_type) { return WhichDataType(data_type).isIPv4(); } \
+bool isIPv6(TYPE data_type) { return WhichDataType(data_type).isIPv6(); } \
+bool isArray(TYPE data_type) { return WhichDataType(data_type).isArray(); } \
+bool isTuple(TYPE data_type) { return WhichDataType(data_type).isTuple(); } \
+bool isMap(TYPE data_type) {return WhichDataType(data_type).isMap(); } \
+bool isInterval(TYPE data_type) {return WhichDataType(data_type).isInterval(); } \
+bool isObject(TYPE data_type) { return WhichDataType(data_type).isObject(); } \
+bool isVariant(TYPE data_type) { return WhichDataType(data_type).isVariant(); } \
+bool isNothing(TYPE data_type) { return WhichDataType(data_type).isNothing(); } \
+\
+bool isColumnedAsNumber(TYPE data_type) \
+{ \
+    WhichDataType which(data_type); \
+    return which.isInteger() || which.isFloat() || which.isDateOrDate32OrDateTimeOrDateTime64() || which.isUUID() || which.isIPv4() || which.isIPv6(); \
+} \
+\
+bool isColumnedAsDecimal(TYPE data_type) \
+{ \
+    WhichDataType which(data_type); \
+    return which.isDecimal() || which.isDateTime64(); \
+} \
+\
+bool isNotCreatable(TYPE data_type) \
+{ \
+    WhichDataType which(data_type); \
+    return which.isNothing() || which.isFunction() || which.isSet(); \
+} \
+\
+bool isNotDecimalButComparableToDecimal(TYPE data_type) \
+{ \
+    WhichDataType which(data_type); \
+    return which.isInt() || which.isUInt() || which.isFloat(); \
+} \
+
+FOR_TYPES_OF_TYPE(DISPATCH)
+
+#undef DISPATCH
+#undef FOR_TYPES_OF_TYPE
+
 }
diff --git a/src/DataTypes/IDataType.h b/src/DataTypes/IDataType.h
index eabf066bc3d..eaf798a3017 100644
--- a/src/DataTypes/IDataType.h
+++ b/src/DataTypes/IDataType.h
@@ -7,8 +7,6 @@
 #include <Common/COW.h>
 #include <DataTypes/DataTypeCustom.h>
 #include <DataTypes/Serializations/ISerialization.h>
-#include <DataTypes/Serializations/SerializationInfo.h>
-
 
 namespace DB
 {
@@ -38,6 +36,11 @@ struct DataTypeWithConstInfo
 
 using DataTypesWithConstInfo = std::vector<DataTypeWithConstInfo>;
 
+class SerializationInfo;
+using SerializationInfoPtr = std::shared_ptr<const SerializationInfo>;
+using MutableSerializationInfoPtr = std::shared_ptr<SerializationInfo>;
+struct SerializationInfoSettings;
+
 /** Properties of data type.
   *
   * Contains methods for getting serialization instances.
@@ -86,6 +89,8 @@ public:
 
     /// Data type id. It's used for runtime type checks.
     virtual TypeIndex getTypeId() const = 0;
+    /// Storage type (e.g. Int64 for Interval)
+    virtual TypeIndex getColumnType() const { return getTypeId(); }
 
     bool hasSubcolumn(std::string_view subcolumn_name) const;
 
@@ -109,9 +114,13 @@ public:
         const SubcolumnCallback & callback,
         const SubstreamData & data);
 
+    /// Call callback for each nested type recursively.
+    using ChildCallback = std::function<void(const IDataType &)>;
+    virtual void forEachChild(const ChildCallback &) const {}
+
     Names getSubcolumnNames() const;
 
-    virtual MutableSerializationInfoPtr createSerializationInfo(const SerializationInfo::Settings & settings) const;
+    virtual MutableSerializationInfoPtr createSerializationInfo(const SerializationInfoSettings & settings) const;
     virtual SerializationInfoPtr getSerializationInfo(const IColumn & column) const;
 
     /// TODO: support more types.
@@ -150,7 +159,7 @@ public:
 
     /** Create ColumnConst for corresponding type, with specified size and value.
       */
-    ColumnPtr createColumnConst(size_t size, const Field & field) const;
+    virtual ColumnPtr createColumnConst(size_t size, const Field & field) const;
     ColumnPtr createColumnConstWithDefaultValue(size_t size) const;
 
     /** Get default value of data type.
@@ -412,74 +421,82 @@ struct WhichDataType
     constexpr bool isSimple() const  { return isInt() || isUInt() || isFloat() || isString(); }
 
     constexpr bool isLowCardinality() const { return idx == TypeIndex::LowCardinality; }
+
+    constexpr bool isVariant() const { return idx == TypeIndex::Variant; }
 };
 
 /// IDataType helpers (alternative for IDataType virtual methods with single point of truth)
 
-template <typename T> inline bool isUInt8(const T & data_type) { return WhichDataType(data_type).isUInt8(); }
-template <typename T> inline bool isUInt16(const T & data_type) { return WhichDataType(data_type).isUInt16(); }
-template <typename T> inline bool isUInt32(const T & data_type) { return WhichDataType(data_type).isUInt32(); }
-template <typename T> inline bool isUInt64(const T & data_type) { return WhichDataType(data_type).isUInt64(); }
-template <typename T> inline bool isNativeUInt(const T & data_type) { return WhichDataType(data_type).isNativeUInt(); }
-template <typename T> inline bool isUInt(const T & data_type) { return WhichDataType(data_type).isUInt(); }
+#define FOR_TYPES_OF_TYPE(M) \
+    M(TypeIndex) \
+    M(const IDataType &) \
+    M(const DataTypePtr &) \
+    M(WhichDataType)
 
-template <typename T> inline bool isInt8(const T & data_type) { return WhichDataType(data_type).isInt8(); }
-template <typename T> inline bool isInt16(const T & data_type) { return WhichDataType(data_type).isInt16(); }
-template <typename T> inline bool isInt32(const T & data_type) { return WhichDataType(data_type).isInt32(); }
-template <typename T> inline bool isInt64(const T & data_type) { return WhichDataType(data_type).isInt64(); }
-template <typename T> inline bool isNativeInt(const T & data_type) { return WhichDataType(data_type).isNativeInt(); }
-template <typename T> inline bool isInt(const T & data_type) { return WhichDataType(data_type).isInt(); }
+#define DISPATCH(TYPE) \
+bool isUInt8(TYPE data_type); \
+bool isUInt16(TYPE data_type); \
+bool isUInt32(TYPE data_type); \
+bool isUInt64(TYPE data_type); \
+bool isNativeUInt(TYPE data_type); \
+bool isUInt(TYPE data_type); \
+\
+bool isInt8(TYPE data_type); \
+bool isInt16(TYPE data_type); \
+bool isInt32(TYPE data_type); \
+bool isInt64(TYPE data_type); \
+bool isNativeInt(TYPE data_type); \
+bool isInt(TYPE data_type); \
+\
+bool isInteger(TYPE data_type); \
+bool isNativeInteger(TYPE data_type); \
+\
+bool isDecimal(TYPE data_type); \
+\
+bool isFloat(TYPE data_type); \
+\
+bool isNativeNumber(TYPE data_type); \
+bool isNumber(TYPE data_type); \
+\
+bool isEnum8(TYPE data_type); \
+bool isEnum16(TYPE data_type); \
+bool isEnum(TYPE data_type); \
+\
+bool isDate(TYPE data_type); \
+bool isDate32(TYPE data_type); \
+bool isDateOrDate32(TYPE data_type); \
+bool isDateTime(TYPE data_type); \
+bool isDateTime64(TYPE data_type); \
+bool isDateTimeOrDateTime64(TYPE data_type); \
+bool isDateOrDate32OrDateTimeOrDateTime64(TYPE data_type); \
+\
+bool isString(TYPE data_type); \
+bool isFixedString(TYPE data_type); \
+bool isStringOrFixedString(TYPE data_type); \
+\
+bool isUUID(TYPE data_type); \
+bool isIPv4(TYPE data_type); \
+bool isIPv6(TYPE data_type); \
+bool isArray(TYPE data_type); \
+bool isTuple(TYPE data_type); \
+bool isMap(TYPE data_type); \
+bool isInterval(TYPE data_type); \
+bool isObject(TYPE data_type); \
+bool isVariant(TYPE data_type); \
+bool isNothing(TYPE data_type); \
+\
+bool isColumnedAsNumber(TYPE data_type); \
+\
+bool isColumnedAsDecimal(TYPE data_type); \
+\
+bool isNotCreatable(TYPE data_type); \
+\
+bool isNotDecimalButComparableToDecimal(TYPE data_type); \
 
-template <typename T> inline bool isInteger(const T & data_type) { return WhichDataType(data_type).isInteger(); }
-template <typename T> inline bool isNativeInteger(const T & data_type) { return WhichDataType(data_type).isNativeInteger(); }
+FOR_TYPES_OF_TYPE(DISPATCH)
 
-template <typename T> inline bool isDecimal(const T & data_type) { return WhichDataType(data_type).isDecimal(); }
-
-template <typename T> inline bool isFloat(const T & data_type) { return WhichDataType(data_type).isFloat(); }
-
-template <typename T> inline bool isNativeNumber(const T & data_type) { return WhichDataType(data_type).isNativeNumber(); }
-template <typename T> inline bool isNumber(const T & data_type) { return WhichDataType(data_type).isNumber(); }
-
-template <typename T> inline bool isEnum8(const T & data_type) { return WhichDataType(data_type).isEnum8(); }
-template <typename T> inline bool isEnum16(const T & data_type) { return WhichDataType(data_type).isEnum16(); }
-template <typename T> inline bool isEnum(const T & data_type) { return WhichDataType(data_type).isEnum(); }
-
-template <typename T> inline bool isDate(const T & data_type) { return WhichDataType(data_type).isDate(); }
-template <typename T> inline bool isDate32(const T & data_type) { return WhichDataType(data_type).isDate32(); }
-template <typename T> inline bool isDateOrDate32(const T & data_type) { return WhichDataType(data_type).isDateOrDate32(); }
-template <typename T> inline bool isDateTime(const T & data_type) { return WhichDataType(data_type).isDateTime(); }
-template <typename T> inline bool isDateTime64(const T & data_type) { return WhichDataType(data_type).isDateTime64(); }
-template <typename T> inline bool isDateTimeOrDateTime64(const T & data_type) { return WhichDataType(data_type).isDateTimeOrDateTime64(); }
-template <typename T> inline bool isDateOrDate32OrDateTimeOrDateTime64(const T & data_type) { return WhichDataType(data_type).isDateOrDate32OrDateTimeOrDateTime64(); }
-
-template <typename T> inline bool isString(const T & data_type) { return WhichDataType(data_type).isString(); }
-template <typename T> inline bool isFixedString(const T & data_type) { return WhichDataType(data_type).isFixedString(); }
-template <typename T> inline bool isStringOrFixedString(const T & data_type) { return WhichDataType(data_type).isStringOrFixedString(); }
-
-template <typename T> inline bool isUUID(const T & data_type) { return WhichDataType(data_type).isUUID(); }
-template <typename T> inline bool isIPv4(const T & data_type) { return WhichDataType(data_type).isIPv4(); }
-template <typename T> inline bool isIPv6(const T & data_type) { return WhichDataType(data_type).isIPv6(); }
-template <typename T> inline bool isArray(const T & data_type) { return WhichDataType(data_type).isArray(); }
-template <typename T> inline bool isTuple(const T & data_type) { return WhichDataType(data_type).isTuple(); }
-template <typename T> inline bool isMap(const T & data_type) {return WhichDataType(data_type).isMap(); }
-template <typename T> inline bool isInterval(const T & data_type) {return WhichDataType(data_type).isInterval(); }
-template <typename T> inline bool isObject(const T & data_type) { return WhichDataType(data_type).isObject(); }
-
-template <typename T> inline bool isNothing(const T & data_type) { return WhichDataType(data_type).isNothing(); }
-
-template <typename T>
-inline bool isColumnedAsNumber(const T & data_type)
-{
-    WhichDataType which(data_type);
-    return which.isInteger() || which.isFloat() || which.isDateOrDate32OrDateTimeOrDateTime64() || which.isUUID() || which.isIPv4() || which.isIPv6();
-}
-
-template <typename T>
-inline bool isColumnedAsDecimal(const T & data_type)
-{
-    WhichDataType which(data_type);
-    return which.isDecimal() || which.isDateTime64();
-}
+#undef DISPATCH
+#undef FOR_TYPES_OF_TYPE
 
 // Same as isColumnedAsDecimal but also checks value type of underlyig column.
 template <typename T, typename DataType>
@@ -489,19 +506,6 @@ inline bool isColumnedAsDecimalT(const DataType & data_type)
     return (which.isDecimal() || which.isDateTime64()) && which.idx == TypeToTypeIndex<T>;
 }
 
-template <typename T>
-inline bool isNotCreatable(const T & data_type)
-{
-    WhichDataType which(data_type);
-    return which.isNothing() || which.isFunction() || which.isSet();
-}
-
-inline bool isNotDecimalButComparableToDecimal(const DataTypePtr & data_type)
-{
-    WhichDataType which(data_type);
-    return which.isInt() || which.isUInt() || which.isFloat();
-}
-
 inline bool isBool(const DataTypePtr & data_type)
 {
     return data_type->getName() == "Bool";
@@ -532,6 +536,8 @@ class DataTypeDateTime;
 class DataTypeDateTime64;
 
 template <is_decimal T> constexpr bool IsDataTypeDecimal<DataTypeDecimal<T>> = true;
+
+/// TODO: this is garbage, remove it.
 template <> inline constexpr bool IsDataTypeDecimal<DataTypeDateTime64> = true;
 
 template <typename T> constexpr bool IsDataTypeNumber<DataTypeNumber<T>> = true;
diff --git a/src/DataTypes/NestedUtils.cpp b/src/DataTypes/NestedUtils.cpp
index a7cc1b21389..6a56f885503 100644
--- a/src/DataTypes/NestedUtils.cpp
+++ b/src/DataTypes/NestedUtils.cpp
@@ -16,6 +16,7 @@
 #include <Columns/ColumnConst.h>
 
 #include <Parsers/IAST.h>
+#include <Storages/ColumnsDescription.h>
 
 #include <boost/algorithm/string/case_conv.hpp>
 
@@ -294,6 +295,12 @@ Names getAllNestedColumnsForTable(const Block & block, const std::string & table
     return names;
 }
 
+bool isSubcolumnOfNested(const String & column_name, const ColumnsDescription & columns)
+{
+    auto nested_subcolumn = columns.tryGetColumnOrSubcolumn(GetColumnsOptions::AllPhysical, column_name);
+    return nested_subcolumn && isNested(nested_subcolumn->getTypeInStorage()) && nested_subcolumn->isSubcolumn() && isArray(nested_subcolumn->type);
+}
+
 }
 
 NestedColumnExtractHelper::NestedColumnExtractHelper(const Block & block_, bool case_insentive_)
diff --git a/src/DataTypes/NestedUtils.h b/src/DataTypes/NestedUtils.h
index 85c29d2c08f..a0f630acc55 100644
--- a/src/DataTypes/NestedUtils.h
+++ b/src/DataTypes/NestedUtils.h
@@ -7,6 +7,8 @@
 namespace DB
 {
 
+class ColumnsDescription;
+
 namespace Nested
 {
     std::string concatenateName(const std::string & nested_table_name, const std::string & nested_field_name);
@@ -40,6 +42,9 @@ namespace Nested
 
     /// Extract all column names that are nested for specifying table.
     Names getAllNestedColumnsForTable(const Block & block, const std::string & table_name);
+
+    /// Returns true if @column_name is a subcolumn (of Array type) of any Nested column in @columns.
+    bool isSubcolumnOfNested(const String & column_name, const ColumnsDescription & columns);
 }
 
 /// Use this class to extract element columns from columns of nested type in a block, e.g. named Tuple.
diff --git a/src/DataTypes/NumberTraits.h b/src/DataTypes/NumberTraits.h
index cf283d3358c..59a64017af3 100644
--- a/src/DataTypes/NumberTraits.h
+++ b/src/DataTypes/NumberTraits.h
@@ -217,11 +217,13 @@ template <typename A> struct ToInteger
 
 // CLICKHOUSE-29. The same depth, different signs
 // NOTE: This case is applied for 64-bit integers only (for backward compatibility), but could be used for any-bit integers
+/// NOLINTBEGIN(misc-redundant-expression)
 template <typename A, typename B>
 constexpr bool LeastGreatestSpecialCase =
     std::is_integral_v<A> && std::is_integral_v<B>
     && (8 == sizeof(A) && sizeof(A) == sizeof(B))
     && (is_signed_v<A> ^ is_signed_v<B>);
+/// NOLINTEND(misc-redundant-expression)
 
 template <typename A, typename B>
 using ResultOfLeast = std::conditional_t<LeastGreatestSpecialCase<A, B>,
diff --git a/src/DataTypes/ObjectUtils.cpp b/src/DataTypes/ObjectUtils.cpp
index 23d29136c85..99cf092e6cd 100644
--- a/src/DataTypes/ObjectUtils.cpp
+++ b/src/DataTypes/ObjectUtils.cpp
@@ -1,3 +1,8 @@
+#include <memory>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/Utils.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/DataTypeObject.h>
 #include <DataTypes/DataTypeNothing.h>
@@ -28,9 +33,9 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int TYPE_MISMATCH;
-    extern const int LOGICAL_ERROR;
     extern const int INCOMPATIBLE_COLUMNS;
     extern const int NOT_IMPLEMENTED;
+    extern const int EXPERIMENTAL_FEATURE_ERROR;
 }
 
 size_t getNumberOfDimensions(const IDataType & type)
@@ -92,7 +97,7 @@ ColumnPtr createArrayOfColumn(ColumnPtr column, size_t num_dimensions)
 Array createEmptyArrayField(size_t num_dimensions)
 {
     if (num_dimensions == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot create array field with 0 dimensions");
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Cannot create array field with 0 dimensions");
 
     Array array;
     Array * current_array = &array;
@@ -231,7 +236,7 @@ static std::pair<ColumnPtr, DataTypePtr> recursivlyConvertDynamicColumnToTuple(
         };
     }
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Type {} unexpectedly has dynamic columns", type->getName());
+    throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Type {} unexpectedly has dynamic columns", type->getName());
 }
 
 void convertDynamicColumnsToTuples(Block & block, const StorageSnapshotPtr & storage_snapshot)
@@ -247,7 +252,7 @@ void convertDynamicColumnsToTuples(Block & block, const StorageSnapshotPtr & sto
         GetColumnsOptions options(GetColumnsOptions::AllPhysical);
         auto storage_column = storage_snapshot->tryGetColumn(options, column.name);
         if (!storage_column)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Column '{}' not found in storage", column.name);
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Column '{}' not found in storage", column.name);
 
         auto storage_column_concrete = storage_snapshot->getColumn(options.withExtendedObjects(), column.name);
 
@@ -315,7 +320,7 @@ static DataTypePtr getLeastCommonTypeForObject(const DataTypes & types, bool che
     {
         const auto * type_tuple = typeid_cast<const DataTypeTuple *>(type.get());
         if (!type_tuple)
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
                 "Least common type for object can be deduced only from tuples, but {} given", type->getName());
 
         auto [tuple_paths, tuple_types] = flattenTuple(type);
@@ -427,7 +432,7 @@ static DataTypePtr getLeastCommonTypeForDynamicColumnsImpl(
     if (const auto * type_tuple = typeid_cast<const DataTypeTuple *>(type_in_storage.get()))
         return getLeastCommonTypeForTuple(*type_tuple, concrete_types, check_ambiguos_paths);
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Type {} unexpectedly has dynamic columns", type_in_storage->getName());
+    throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Type {} unexpectedly has dynamic columns", type_in_storage->getName());
 }
 
 DataTypePtr getLeastCommonTypeForDynamicColumns(
@@ -481,7 +486,7 @@ DataTypePtr createConcreteEmptyDynamicColumn(const DataTypePtr & type_in_storage
         return recreateTupleWithElements(*type_tuple, new_elements);
     }
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Type {} unexpectedly has dynamic columns", type_in_storage->getName());
+    throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Type {} unexpectedly has dynamic columns", type_in_storage->getName());
 }
 
 bool hasDynamicSubcolumns(const ColumnsDescription & columns)
@@ -613,7 +618,7 @@ DataTypePtr reduceNumberOfDimensions(DataTypePtr type, size_t dimensions_to_redu
     {
         const auto * type_array = typeid_cast<const DataTypeArray *>(type.get());
         if (!type_array)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not enough dimensions to reduce");
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Not enough dimensions to reduce");
 
         type = type_array->getNestedType();
     }
@@ -627,7 +632,7 @@ ColumnPtr reduceNumberOfDimensions(ColumnPtr column, size_t dimensions_to_reduce
     {
         const auto * column_array = typeid_cast<const ColumnArray *>(column.get());
         if (!column_array)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not enough dimensions to reduce");
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Not enough dimensions to reduce");
 
         column = column_array->getDataPtr();
     }
@@ -653,7 +658,7 @@ ColumnWithTypeAndDimensions createTypeFromNode(const Node & node)
     auto collect_tuple_elemets = [](const auto & children)
     {
         if (children.empty())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot create type from empty Tuple or Nested node");
+            throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Cannot create type from empty Tuple or Nested node");
 
         std::vector<std::tuple<String, ColumnWithTypeAndDimensions>> tuple_elements;
         tuple_elements.reserve(children.size());
@@ -705,6 +710,7 @@ ColumnWithTypeAndDimensions createTypeFromNode(const Node & node)
         size_t num_elements = tuple_columns.size();
         Columns tuple_elements_columns(num_elements);
         DataTypes tuple_elements_types(num_elements);
+        size_t last_offset = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets_columns.back()).getData().back();
 
         /// Reduce extra array dimensions to get columns and types of Nested elements.
         for (size_t i = 0; i < num_elements; ++i)
@@ -712,6 +718,14 @@ ColumnWithTypeAndDimensions createTypeFromNode(const Node & node)
             assert(tuple_columns[i].array_dimensions == tuple_columns[0].array_dimensions);
             tuple_elements_columns[i] = reduceNumberOfDimensions(tuple_columns[i].column, tuple_columns[i].array_dimensions);
             tuple_elements_types[i] = reduceNumberOfDimensions(tuple_columns[i].type, tuple_columns[i].array_dimensions);
+            if (tuple_elements_columns[i]->size() != last_offset)
+                throw Exception(
+                    ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+                    "Cannot create a type for subcolumn {} in Object data type: offsets_column has data inconsistent with nested_column. "
+                    "Data size: {}, last offset: {}",
+                    node.path.getPath(),
+                    tuple_elements_columns[i]->size(),
+                    last_offset);
         }
 
         auto result_column = ColumnArray::create(ColumnTuple::create(tuple_elements_columns), offsets_columns.back());
@@ -720,6 +734,16 @@ ColumnWithTypeAndDimensions createTypeFromNode(const Node & node)
         /// Recreate result Array type and Array column.
         for (auto it = offsets_columns.rbegin() + 1; it != offsets_columns.rend(); ++it)
         {
+            last_offset = assert_cast<const ColumnArray::ColumnOffsets &>((**it)).getData().back();
+            if (result_column->size() != last_offset)
+                throw Exception(
+                    ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
+                    "Cannot create a type for subcolumn {} in Object data type: offsets_column has data inconsistent with nested_column. "
+                    "Data size: {}, last offset: {}",
+                    node.path.getPath(),
+                    result_column->size(),
+                    last_offset);
+
             result_column = ColumnArray::create(result_column, *it);
             result_type = std::make_shared<DataTypeArray>(result_type);
         }
@@ -822,7 +846,7 @@ std::pair<ColumnPtr, DataTypePtr> unflattenTuple(
     assert(paths.size() == tuple_columns.size());
 
     if (paths.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot unflatten empty Tuple");
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Cannot unflatten empty Tuple");
 
     /// We add all paths to the subcolumn tree and then create a type from it.
     /// The tree stores column, type and number of array dimensions
@@ -841,7 +865,7 @@ std::pair<ColumnPtr, DataTypePtr> unflattenTuple(
         tree.add(paths[i], [&](Node::Kind kind, bool exists) -> std::shared_ptr<Node>
             {
                 if (pos >= num_parts)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
                         "Not enough name parts for path {}. Expected at least {}, got {}",
                             paths[i].getPath(), pos + 1, num_parts);
 
@@ -888,10 +912,10 @@ static void addConstantToWithClause(const ASTPtr & query, const String & column_
 
 /// @expected_columns and @available_columns contain descriptions
 /// of extended Object columns.
-void replaceMissedSubcolumnsByConstants(
+NamesAndTypes calculateMissedSubcolumns(
     const ColumnsDescription & expected_columns,
-    const ColumnsDescription & available_columns,
-    ASTPtr query)
+    const ColumnsDescription & available_columns
+)
 {
     NamesAndTypes missed_names_types;
 
@@ -928,6 +952,18 @@ void replaceMissedSubcolumnsByConstants(
             [](const auto & lhs, const auto & rhs) { return lhs.name < rhs.name; });
     }
 
+    return missed_names_types;
+}
+
+/// @expected_columns and @available_columns contain descriptions
+/// of extended Object columns.
+void replaceMissedSubcolumnsByConstants(
+    const ColumnsDescription & expected_columns,
+    const ColumnsDescription & available_columns,
+    ASTPtr query)
+{
+    NamesAndTypes missed_names_types = calculateMissedSubcolumns(expected_columns, available_columns);
+
     if (missed_names_types.empty())
         return;
 
@@ -940,6 +976,42 @@ void replaceMissedSubcolumnsByConstants(
             addConstantToWithClause(query, name, type);
 }
 
+/// @expected_columns and @available_columns contain descriptions
+/// of extended Object columns.
+bool replaceMissedSubcolumnsByConstants(
+    const ColumnsDescription & expected_columns,
+    const ColumnsDescription & available_columns,
+    QueryTreeNodePtr & query,
+    const ContextPtr & context [[maybe_unused]])
+{
+    bool has_missing_objects = false;
+
+    NamesAndTypes missed_names_types = calculateMissedSubcolumns(expected_columns, available_columns);
+
+    if (missed_names_types.empty())
+        return has_missing_objects;
+
+    auto * query_node = query->as<QueryNode>();
+    if (!query_node)
+        return has_missing_objects;
+
+    auto table_expression = extractLeftTableExpression(query_node->getJoinTree());
+
+    std::unordered_map<std::string, QueryTreeNodePtr> column_name_to_node;
+    for (const auto & [name, type] : missed_names_types)
+    {
+        auto constant = std::make_shared<ConstantNode>(type->getDefault(), type);
+        constant->setAlias(table_expression->getAlias() + "." + name);
+
+        column_name_to_node[name] = buildCastFunction(constant, type, context);
+        has_missing_objects = true;
+    }
+
+    replaceColumns(query, table_expression, column_name_to_node);
+
+    return has_missing_objects;
+}
+
 Field FieldVisitorReplaceScalars::operator()(const Array & x) const
 {
     if (num_dimensions_to_keep == 0)
@@ -982,6 +1054,14 @@ Field FieldVisitorFoldDimension::operator()(const Array & x) const
     return res;
 }
 
+Field FieldVisitorFoldDimension::operator()(const Null & x) const
+{
+    if (num_dimensions_to_fold == 0)
+        return x;
+
+    return Array();
+}
+
 void setAllObjectsToDummyTupleType(NamesAndTypesList & columns)
 {
     for (auto & column : columns)
diff --git a/src/DataTypes/ObjectUtils.h b/src/DataTypes/ObjectUtils.h
index 2bfcaae09ca..3e3b1b96740 100644
--- a/src/DataTypes/ObjectUtils.h
+++ b/src/DataTypes/ObjectUtils.h
@@ -13,6 +13,10 @@ namespace DB
 
 struct StorageSnapshot;
 using StorageSnapshotPtr = std::shared_ptr<StorageSnapshot>;
+class ColumnsDescription;
+
+class IQueryTreeNode;
+using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
 
 /// Returns number of dimensions in Array type. 0 if type is not array.
 size_t getNumberOfDimensions(const IDataType & type);
@@ -97,6 +101,12 @@ void replaceMissedSubcolumnsByConstants(
     const ColumnsDescription & available_columns,
     ASTPtr query);
 
+bool replaceMissedSubcolumnsByConstants(
+    const ColumnsDescription & expected_columns,
+    const ColumnsDescription & available_columns,
+    QueryTreeNodePtr & query,
+    const ContextPtr & context);
+
 /// Visitor that keeps @num_dimensions_to_keep dimensions in arrays
 /// and replaces all scalars or nested arrays to @replacement at that level.
 class FieldVisitorReplaceScalars : public StaticVisitor<Field>
@@ -139,7 +149,7 @@ public:
 
     Field operator()(const Array & x) const;
 
-    Field operator()(const Null & x) const { return x; }
+    Field operator()(const Null & x) const;
 
     template <typename T>
     Field operator()(const T & x) const
diff --git a/src/DataTypes/Serializations/ISerialization.cpp b/src/DataTypes/Serializations/ISerialization.cpp
index e70dc6a2380..a3a28f8091c 100644
--- a/src/DataTypes/Serializations/ISerialization.cpp
+++ b/src/DataTypes/Serializations/ISerialization.cpp
@@ -49,11 +49,21 @@ ISerialization::Kind ISerialization::stringToKind(const String & str)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown serialization kind '{}'", str);
 }
 
+const std::set<SubstreamType> ISerialization::Substream::named_types
+{
+    TupleElement,
+    NamedOffsets,
+    NamedNullMap,
+    NamedVariantDiscriminators,
+};
+
 String ISerialization::Substream::toString() const
 {
-    if (type == TupleElement)
-        return fmt::format("TupleElement({}, escape_tuple_delimiter = {})",
-            tuple_element_name, escape_tuple_delimiter ? "true" : "false");
+    if (named_types.contains(type))
+        return fmt::format("{}({})", type, name_of_substream);
+
+    if (type == VariantElement)
+        return fmt::format("VariantElement({})", variant_element_name);
 
     return String(magic_enum::enum_name(type));
 }
@@ -110,8 +120,10 @@ void ISerialization::serializeBinaryBulkWithMultipleStreams(
     SerializeBinaryBulkSettings & settings,
     SerializeBinaryBulkStatePtr & /* state */) const
 {
+    settings.path.push_back(Substream::Regular);
     if (WriteBuffer * stream = settings.getter(settings.path))
         serializeBinaryBulk(column, *stream, offset, limit);
+    settings.path.pop_back();
 }
 
 void ISerialization::deserializeBinaryBulkWithMultipleStreams(
@@ -121,6 +133,8 @@ void ISerialization::deserializeBinaryBulkWithMultipleStreams(
     DeserializeBinaryBulkStatePtr & /* state */,
     SubstreamsCache * cache) const
 {
+    settings.path.push_back(Substream::Regular);
+
     auto cached_column = getFromSubstreamsCache(cache, settings.path);
     if (cached_column)
     {
@@ -133,6 +147,8 @@ void ISerialization::deserializeBinaryBulkWithMultipleStreams(
         column = std::move(mutable_column);
         addToSubstreamsCache(cache, settings.path, column);
     }
+
+    settings.path.pop_back();
 }
 
 namespace
@@ -161,17 +177,25 @@ String getNameForSubstreamPath(
             stream_name += ".dict";
         else if (it->type == Substream::SparseOffsets)
             stream_name += ".sparse.idx";
-        else if (it->type == Substream::TupleElement)
+        else if (Substream::named_types.contains(it->type))
         {
+            auto substream_name = "." + it->name_of_substream;
+
             /// For compatibility reasons, we use %2E (escaped dot) instead of dot.
             /// Because nested data may be represented not by Array of Tuple,
-            ///  but by separate Array columns with names in a form of a.b,
-            ///  and name is encoded as a whole.
-            if (escape_tuple_delimiter && it->escape_tuple_delimiter)
-                stream_name += escapeForFileName("." + it->tuple_element_name);
+            /// but by separate Array columns with names in a form of a.b,
+            /// and name is encoded as a whole.
+            if (it->type == Substream::TupleElement && escape_tuple_delimiter)
+                stream_name += escapeForFileName(substream_name);
             else
-                stream_name += "." + it->tuple_element_name;
+                stream_name += substream_name;
         }
+        else if (it->type == Substream::VariantDiscriminators)
+            stream_name += ".variant_discr";
+        else if (it->type == Substream::VariantOffsets)
+            stream_name += ".variant_offsets";
+        else if (it->type == Substream::VariantElement)
+            stream_name += "." + it->variant_element_name;
     }
 
     return stream_name;
@@ -184,23 +208,31 @@ String ISerialization::getFileNameForStream(const NameAndTypePair & column, cons
     return getFileNameForStream(column.getNameInStorage(), path);
 }
 
-bool isOffsetsOfNested(const ISerialization::SubstreamPath & path)
+static bool isPossibleOffsetsOfNested(const ISerialization::SubstreamPath & path)
 {
-    if (path.empty())
-        return false;
+    /// Arrays of Nested cannot be inside other types.
+    /// So it's ok to check only first element of path.
 
-    for (const auto & elem : path)
-        if (elem.type == ISerialization::Substream::ArrayElements)
-            return false;
+    /// Array offsets as a part of serialization of Array type.
+    if (path.size() == 1
+        && path[0].type == ISerialization::Substream::ArraySizes)
+        return true;
 
-    return path.back().type == ISerialization::Substream::ArraySizes;
+    /// Array offsets as a separate subcolumn.
+    if (path.size() == 2
+        && path[0].type == ISerialization::Substream::NamedOffsets
+        && path[1].type == ISerialization::Substream::Regular
+        && path[0].name_of_substream == "size0")
+        return true;
+
+    return false;
 }
 
 String ISerialization::getFileNameForStream(const String & name_in_storage, const SubstreamPath & path)
 {
     String stream_name;
     auto nested_storage_name = Nested::extractTableName(name_in_storage);
-    if (name_in_storage != nested_storage_name && isOffsetsOfNested(path))
+    if (name_in_storage != nested_storage_name && isPossibleOffsetsOfNested(path))
         stream_name = escapeForFileName(nested_storage_name);
     else
         stream_name = escapeForFileName(name_in_storage);
@@ -252,6 +284,53 @@ bool ISerialization::isSpecialCompressionAllowed(const SubstreamPath & path)
     return true;
 }
 
+namespace
+{
+
+template <typename F>
+bool tryDeserializeText(const F deserialize, DB::IColumn & column)
+{
+    size_t prev_size = column.size();
+    try
+    {
+        deserialize(column);
+        return true;
+    }
+    catch (...)
+    {
+        if (column.size() > prev_size)
+            column.popBack(column.size() - prev_size);
+        return false;
+    }
+}
+
+}
+
+bool ISerialization::tryDeserializeTextCSV(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return tryDeserializeText([&](DB::IColumn & my_column) { deserializeTextCSV(my_column, istr, settings); }, column);
+}
+
+bool ISerialization::tryDeserializeTextEscaped(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return tryDeserializeText([&](DB::IColumn & my_column) { deserializeTextEscaped(my_column, istr, settings); }, column);
+}
+
+bool ISerialization::tryDeserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return tryDeserializeText([&](DB::IColumn & my_column) { deserializeTextJSON(my_column, istr, settings); }, column);
+}
+
+bool ISerialization::tryDeserializeTextQuoted(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return tryDeserializeText([&](DB::IColumn & my_column) { deserializeTextQuoted(my_column, istr, settings); }, column);
+}
+
+bool ISerialization::tryDeserializeWholeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return tryDeserializeText([&](DB::IColumn & my_column) { deserializeWholeText(my_column, istr, settings); }, column);
+}
+
 void ISerialization::deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     String field;
@@ -261,6 +340,15 @@ void ISerialization::deserializeTextRaw(IColumn & column, ReadBuffer & istr, con
     deserializeWholeText(column, buf, settings);
 }
 
+bool ISerialization::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    /// Read until \t or \n.
+    readString(field, istr);
+    ReadBufferFromString buf(field);
+    return tryDeserializeWholeText(column, buf, settings);
+}
+
 void ISerialization::serializeTextMarkdown(
     const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings & settings) const
 {
@@ -288,7 +376,8 @@ bool ISerialization::hasSubcolumnForPath(const SubstreamPath & path, size_t pref
     size_t last_elem = prefix_len - 1;
     return path[last_elem].type == Substream::NullMap
             || path[last_elem].type == Substream::TupleElement
-            || path[last_elem].type == Substream::ArraySizes;
+            || path[last_elem].type == Substream::ArraySizes
+            || path[last_elem].type == Substream::VariantElement;
 }
 
 ISerialization::SubstreamData ISerialization::createFromPath(const SubstreamPath & path, size_t prefix_len)
@@ -317,6 +406,8 @@ void ISerialization::throwUnexpectedDataAfterParsedValue(IColumn & column, ReadB
 {
     WriteBufferFromOwnString ostr;
     serializeText(column, column.size() - 1, ostr, settings);
+    /// Restore correct column size.
+    column.popBack(1);
     throw Exception(
         ErrorCodes::UNEXPECTED_DATA_AFTER_PARSED_VALUE,
         "Unexpected data '{}' after parsed {} value '{}'",
@@ -326,4 +417,3 @@ void ISerialization::throwUnexpectedDataAfterParsedValue(IColumn & column, ReadB
 }
 
 }
-
diff --git a/src/DataTypes/Serializations/ISerialization.h b/src/DataTypes/Serializations/ISerialization.h
index 030c3c6d81e..ebaa26d19a6 100644
--- a/src/DataTypes/Serializations/ISerialization.h
+++ b/src/DataTypes/Serializations/ISerialization.h
@@ -9,7 +9,7 @@
 #include <boost/noncopyable.hpp>
 #include <unordered_map>
 #include <memory>
-#include <variant>
+#include <set>
 
 namespace DB
 {
@@ -102,7 +102,7 @@ public:
     struct SubstreamData
     {
         SubstreamData() = default;
-        SubstreamData(SerializationPtr serialization_)
+        explicit SubstreamData(SerializationPtr serialization_)
             : serialization(std::move(serialization_))
         {
         }
@@ -142,6 +142,8 @@ public:
             NullMap,
 
             TupleElement,
+            NamedOffsets,
+            NamedNullMap,
 
             DictionaryKeys,
             DictionaryIndexes,
@@ -152,16 +154,25 @@ public:
             ObjectStructure,
             ObjectData,
 
+            VariantDiscriminators,
+            NamedVariantDiscriminators,
+            VariantOffsets,
+            VariantElements,
+            VariantElement,
+
             Regular,
         };
 
+        /// Types of substreams that can have arbitrary name.
+        static const std::set<Type> named_types;
+
         Type type;
 
-        /// Index of tuple element, starting at 1 or name.
-        String tuple_element_name;
+        /// The name of a variant element type.
+        String variant_element_name;
 
-        /// Do we need to escape a dot in filenames for tuple elements.
-        bool escape_tuple_delimiter = true;
+        /// Name of substream for type from 'named_types'.
+        String name_of_substream;
 
         /// Data for current substream.
         SubstreamData data;
@@ -173,7 +184,6 @@ public:
         mutable bool visited = false;
 
         Substream(Type type_) : type(type_) {} /// NOLINT
-
         String toString() const;
     };
 
@@ -320,17 +330,20 @@ public:
     virtual void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
 
     virtual void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+    virtual bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
 
     /** Text serialization as a literal that may be inserted into a query.
       */
     virtual void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
 
     virtual void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+    virtual bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
 
     /** Text serialization for the CSV format.
       */
     virtual void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const = 0;
     virtual void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+    virtual bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
 
     /** Text serialization for displaying on a terminal or saving into a text file, and the like.
       * Without escaping or quoting.
@@ -340,11 +353,13 @@ public:
     /** Text deserialization in case when buffer contains only one value, without any escaping and delimiters.
       */
     virtual void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const = 0;
+    virtual bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
 
     /** Text serialization intended for using in JSON format.
       */
     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 bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const;
     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);
@@ -364,6 +379,7 @@ public:
      *  additional code in data types serialization and ReadHelpers.
      */
     virtual void deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const;
+    virtual bool tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const;
     virtual void serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
 
     virtual void serializeTextMarkdown(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const;
@@ -393,6 +409,7 @@ protected:
 using SerializationPtr = std::shared_ptr<const ISerialization>;
 using Serializations = std::vector<SerializationPtr>;
 using SerializationByName = std::unordered_map<String, SerializationPtr>;
+using SubstreamType = ISerialization::Substream::Type;
 
 template <typename State, typename StatePtr>
 State * ISerialization::checkAndGetState(const StatePtr & state) const
@@ -415,6 +432,4 @@ State * ISerialization::checkAndGetState(const StatePtr & state) const
     return state_concrete;
 }
 
-bool isOffsetsOfNested(const ISerialization::SubstreamPath & path);
-
 }
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
index c9af5d1f838..640d2c419d4 100644
--- a/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.cpp
@@ -1,17 +1,15 @@
-#include <DataTypes/Serializations/SerializationAggregateFunction.h>
-
-#include <IO/WriteHelpers.h>
-
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
-
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Common/AlignedBuffer.h>
-#include <Common/Arena.h>
-
+#include <DataTypes/Serializations/SerializationAggregateFunction.h>
 #include <Formats/FormatSettings.h>
 #include <IO/Operators.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/WriteHelpers.h>
+#include <Common/AlignedBuffer.h>
+#include <Common/Arena.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
 
 namespace DB
 {
@@ -186,10 +184,10 @@ void SerializationAggregateFunction::serializeTextJSON(const IColumn & column, s
 }
 
 
-void SerializationAggregateFunction::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+void SerializationAggregateFunction::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     String s;
-    readJSONString(s, istr);
+    readJSONString(s, istr, settings.json);
     deserializeFromString(function, column, s, version);
 }
 
diff --git a/src/DataTypes/Serializations/SerializationAggregateFunction.h b/src/DataTypes/Serializations/SerializationAggregateFunction.h
index 4212298bbc1..c45fc79f714 100644
--- a/src/DataTypes/Serializations/SerializationAggregateFunction.h
+++ b/src/DataTypes/Serializations/SerializationAggregateFunction.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
 
 #include <DataTypes/Serializations/ISerialization.h>
 
diff --git a/src/DataTypes/Serializations/SerializationArray.cpp b/src/DataTypes/Serializations/SerializationArray.cpp
index 0d99b741a23..e8aab615849 100644
--- a/src/DataTypes/Serializations/SerializationArray.cpp
+++ b/src/DataTypes/Serializations/SerializationArray.cpp
@@ -230,10 +230,10 @@ void SerializationArray::enumerateStreams(
     const auto * column_array = data.column ? &assert_cast<const ColumnArray &>(*data.column) : nullptr;
     auto offsets = column_array ? column_array->getOffsetsPtr() : nullptr;
 
-    auto offsets_serialization =
-        std::make_shared<SerializationNamed>(
-            std::make_shared<SerializationNumber<UInt64>>(),
-                "size" + std::to_string(getArrayLevel(settings.path)), false);
+    auto subcolumn_name = "size" + std::to_string(getArrayLevel(settings.path));
+    auto offsets_serialization = std::make_shared<SerializationNamed>(
+        std::make_shared<SerializationNumber<UInt64>>(),
+        subcolumn_name, SubstreamType::NamedOffsets);
 
     auto offsets_column = offsets && !settings.position_independent_encoding
         ? arrayOffsetsToSizes(*offsets)
@@ -419,9 +419,11 @@ static void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffe
 }
 
 
-template <typename Reader>
-static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && read_nested, bool allow_unenclosed)
+template <typename ReturnType = void, typename Reader>
+static ReturnType deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && read_nested, bool allow_unenclosed)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     ColumnArray & column_array = assert_cast<ColumnArray &>(column);
     ColumnArray::Offsets & offsets = column_array.getOffsets();
 
@@ -433,7 +435,18 @@ static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && r
     if (checkChar('[', istr))
         has_braces = true;
     else if (!allow_unenclosed)
-        throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT, "Array does not start with '[' character");
+    {
+        if constexpr (throw_exception)
+            throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT, "Array does not start with '[' character");
+        return ReturnType(false);
+    }
+
+    auto on_error_no_throw = [&]()
+    {
+        if (size)
+            nested_column.popBack(size);
+        return ReturnType(false);
+    };
 
     try
     {
@@ -443,11 +456,17 @@ static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && r
             if (!first)
             {
                 if (*istr.position() == ',')
+                {
                     ++istr.position();
+                }
                 else
-                    throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT,
-                        "Cannot read array from text, expected comma or end of array, found '{}'",
-                        *istr.position());
+                {
+                    if constexpr (throw_exception)
+                        throw Exception(ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT,
+                            "Cannot read array from text, expected comma or end of array, found '{}'",
+                            *istr.position());
+                    return on_error_no_throw();
+                }
             }
 
             first = false;
@@ -457,25 +476,42 @@ static void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && r
             if (*istr.position() == ']')
                 break;
 
-            read_nested(nested_column);
+            if constexpr (throw_exception)
+                read_nested(nested_column);
+            else if (!read_nested(nested_column))
+                return on_error_no_throw();
+
             ++size;
 
             skipWhitespaceIfAny(istr);
         }
 
         if (has_braces)
-            assertChar(']', istr);
+        {
+            if constexpr (throw_exception)
+                assertChar(']', istr);
+            else if (!checkChar(']', istr))
+                return on_error_no_throw();
+        }
         else /// If array is not enclosed in braces, we read until EOF.
-            assertEOF(istr);
+        {
+            if constexpr (throw_exception)
+                assertEOF(istr);
+            else if (!istr.eof())
+                return on_error_no_throw();
+        }
     }
     catch (...)
     {
         if (size)
             nested_column.popBack(size);
-        throw;
+        if constexpr (throw_exception)
+            throw;
+        return ReturnType(false);
     }
 
     offsets.push_back(offsets.back() + size);
+    return ReturnType(true);
 }
 
 
@@ -494,8 +530,8 @@ void SerializationArray::deserializeText(IColumn & column, ReadBuffer & istr, co
     deserializeTextImpl(column, istr,
         [&](IColumn & nested_column)
         {
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextQuotedImpl(nested_column, istr, settings, nested);
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(nested_column, istr, settings, nested);
             else
                 nested->deserializeTextQuoted(nested_column, istr, settings);
         }, false);
@@ -504,6 +540,29 @@ void SerializationArray::deserializeText(IColumn & column, ReadBuffer & istr, co
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "Array");
 }
 
+bool SerializationArray::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const
+{
+    auto read_nested = [&](IColumn & nested_column)
+    {
+        if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+            return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextQuoted(nested_column, istr, settings, nested);
+        return nested->tryDeserializeTextQuoted(nested_column, istr, settings);
+    };
+
+    bool ok = deserializeTextImpl<bool>(column, istr, std::move(read_nested), false);
+
+    if (!ok)
+        return false;
+
+    if (whole && !istr.eof())
+    {
+        column.popBack(1);
+        return false;
+    }
+
+    return true;
+}
+
 void SerializationArray::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     const ColumnArray & column_array = assert_cast<const ColumnArray &>(column);
@@ -559,13 +618,25 @@ void SerializationArray::deserializeTextJSON(IColumn & column, ReadBuffer & istr
     deserializeTextImpl(column, istr,
         [&](IColumn & nested_column)
         {
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextJSONImpl(nested_column, istr, settings, nested);
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(nested_column, istr, settings, nested);
             else
                 nested->deserializeTextJSON(nested_column, istr, settings);
         }, false);
 }
 
+bool SerializationArray::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    auto read_nested = [&](IColumn & nested_column)
+    {
+        if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+            return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextJSON(nested_column, istr, settings, nested);
+        return nested->tryDeserializeTextJSON(nested_column, istr, settings);
+    };
+
+    return deserializeTextImpl<bool>(column, istr, std::move(read_nested), false);
+}
+
 
 void SerializationArray::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -608,8 +679,8 @@ void SerializationArray::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
         deserializeTextImpl(column, rb,
             [&](IColumn & nested_column)
             {
-                if (settings.null_as_default)
-                    SerializationNullable::deserializeTextCSVImpl(nested_column, rb, settings, nested);
+                if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                    SerializationNullable::deserializeNullAsDefaultOrNestedTextCSV(nested_column, rb, settings, nested);
                 else
                     nested->deserializeTextCSV(nested_column, rb, settings);
             }, true);
@@ -619,12 +690,43 @@ void SerializationArray::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
         deserializeTextImpl(column, rb,
             [&](IColumn & nested_column)
             {
-                if (settings.null_as_default)
-                    SerializationNullable::deserializeTextQuotedImpl(nested_column, rb, settings, nested);
+                if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                    SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(nested_column, rb, settings, nested);
                 else
                     nested->deserializeTextQuoted(nested_column, rb, settings);
             }, true);
     }
 }
 
+bool SerializationArray::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    if (!tryReadCSV(s, istr, settings.csv))
+        return false;
+    ReadBufferFromString rb(s);
+
+    if (settings.csv.arrays_as_nested_csv)
+    {
+        auto read_nested = [&](IColumn & nested_column)
+        {
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextCSV(nested_column, rb, settings, nested);
+            return nested->tryDeserializeTextCSV(nested_column, rb, settings);
+        };
+
+        return deserializeTextImpl<bool>(column, rb, read_nested, true);
+    }
+    else
+    {
+        auto read_nested = [&](IColumn & nested_column)
+        {
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(nested_column))
+                return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextQuoted(nested_column, rb, settings, nested);
+            return nested->tryDeserializeTextQuoted(nested_column, rb, settings);
+        };
+
+        return deserializeTextImpl<bool>(column, rb, read_nested, true);
+    }
+}
+
 }
diff --git a/src/DataTypes/Serializations/SerializationArray.h b/src/DataTypes/Serializations/SerializationArray.h
index de331169db5..82f5e8bce45 100644
--- a/src/DataTypes/Serializations/SerializationArray.h
+++ b/src/DataTypes/Serializations/SerializationArray.h
@@ -20,15 +20,18 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
+    bool tryDeserializeText(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;
+    bool tryDeserializeTextJSON(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;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     /** Streaming serialization of arrays is arranged in a special way:
       * - elements placed in a row are written/read without array sizes;
diff --git a/src/DataTypes/Serializations/SerializationBool.cpp b/src/DataTypes/Serializations/SerializationBool.cpp
index 41b5bf806e5..d6a74e5cb8f 100644
--- a/src/DataTypes/Serializations/SerializationBool.cpp
+++ b/src/DataTypes/Serializations/SerializationBool.cpp
@@ -150,30 +150,42 @@ bool tryDeserializeAllVariants(ColumnUInt8 * column, ReadBuffer & istr)
     return true;
 }
 
-void deserializeImpl(
+template <typename ReturnType = void>
+ReturnType deserializeImpl(
     IColumn & column, ReadBuffer & istr, const FormatSettings & settings, std::function<bool(ReadBuffer &)> check_end_of_value)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     ColumnUInt8 * col = checkAndGetDeserializeColumnType(column);
+    auto restore_column_if_needed = [&, prev_size = col->size()]()
+    {
+        if (col->size() > prev_size)
+            col->popBack(1);
+    };
 
     PeekableReadBuffer buf(istr);
     buf.setCheckpoint();
     if (checkString(settings.bool_true_representation, buf) && check_end_of_value(buf))
     {
         col->insert(true);
-        return;
+        return ReturnType(true);
     }
 
     buf.rollbackToCheckpoint();
     if (checkString(settings.bool_false_representation, buf) && check_end_of_value(buf))
     {
-        col->insert(false);
         buf.dropCheckpoint();
         if (buf.hasUnreadData())
-            throw Exception(
-                ErrorCodes::CANNOT_PARSE_BOOL,
-                "Cannot continue parsing after parsed bool value because it will result in the loss of some data. It may happen if "
-                "bool_true_representation or bool_false_representation contains some delimiters of input format");
-        return;
+        {
+            if constexpr (throw_exception)
+                throw Exception(
+                    ErrorCodes::CANNOT_PARSE_BOOL,
+                    "Cannot continue parsing after parsed bool value because it will result in the loss of some data. It may happen if "
+                    "bool_true_representation or bool_false_representation contains some delimiters of input format");
+            return ReturnType(false);
+        }
+        col->insert(false);
+        return ReturnType(true);
     }
 
     buf.rollbackToCheckpoint();
@@ -181,22 +193,31 @@ void deserializeImpl(
     {
         buf.dropCheckpoint();
         if (buf.hasUnreadData())
-            throw Exception(
-                ErrorCodes::CANNOT_PARSE_BOOL,
-                "Cannot continue parsing after parsed bool value because it will result in the loss of some data. It may happen if "
-                "bool_true_representation or bool_false_representation contains some delimiters of input format");
-        return;
+        {
+            restore_column_if_needed();
+            if constexpr (throw_exception)
+                throw Exception(
+                    ErrorCodes::CANNOT_PARSE_BOOL,
+                    "Cannot continue parsing after parsed bool value because it will result in the loss of some data. It may happen if "
+                    "bool_true_representation or bool_false_representation contains some delimiters of input format");
+            return ReturnType(false);
+        }
+        return ReturnType(true);
     }
 
     buf.makeContinuousMemoryFromCheckpointToPos();
     buf.rollbackToCheckpoint();
-    throw Exception(
-        ErrorCodes::CANNOT_PARSE_BOOL,
-        "Cannot parse boolean value here: '{}', should be '{}' or '{}' controlled by setting bool_true_representation and "
-        "bool_false_representation or one of "
-        "True/False/T/F/Y/N/Yes/No/On/Off/Enable/Disable/Enabled/Disabled/1/0",
-        String(buf.position(), std::min(10lu, buf.available())),
-        settings.bool_true_representation, settings.bool_false_representation);
+    restore_column_if_needed();
+    if constexpr (throw_exception)
+        throw Exception(
+            ErrorCodes::CANNOT_PARSE_BOOL,
+            "Cannot parse boolean value here: '{}', should be '{}' or '{}' controlled by setting bool_true_representation and "
+            "bool_false_representation or one of "
+            "True/False/T/F/Y/N/Yes/No/On/Off/Enable/Disable/Enabled/Disabled/1/0",
+            String(buf.position(), std::min(10lu, buf.available())),
+            settings.bool_true_representation, settings.bool_false_representation);
+
+    return ReturnType(false);
 }
 
 }
@@ -225,6 +246,14 @@ void SerializationBool::deserializeTextEscaped(IColumn & column, ReadBuffer & is
     deserializeImpl(column, istr, settings, [](ReadBuffer & buf){ return buf.eof() || *buf.position() == '\t' || *buf.position() == '\n'; });
 }
 
+bool SerializationBool::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (istr.eof())
+        return false;
+
+    return deserializeImpl<bool>(column, istr, settings, [](ReadBuffer & buf){ return buf.eof() || *buf.position() == '\t' || *buf.position() == '\n'; });
+}
+
 void SerializationBool::serializeTextJSON(const IColumn &column, size_t row_num, WriteBuffer &ostr, const FormatSettings &settings) const
 {
     serializeSimple(column, row_num, ostr, settings);
@@ -250,6 +279,33 @@ void SerializationBool::deserializeTextJSON(IColumn &column, ReadBuffer &istr, c
     col->insert(value);
 }
 
+bool SerializationBool::tryDeserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    if (istr.eof())
+        return false;
+
+    ColumnUInt8 * col = checkAndGetDeserializeColumnType(column);
+    bool value = false;
+    char first_char = *istr.position();
+    if (first_char == 't' || first_char == 'f')
+    {
+        if (!readBoolTextWord<bool>(value, istr))
+            return false;
+    }
+    else if (first_char == '1' || first_char == '0')
+    {
+        /// Doesn't throw.
+        readBoolText(value, istr);
+    }
+    else
+    {
+        return false;
+    }
+
+    col->insert(value);
+    return true;
+}
+
 void SerializationBool::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeCustom(column, row_num, ostr, settings);
@@ -263,6 +319,14 @@ void SerializationBool::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
     deserializeImpl(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof() || *buf.position() == settings.csv.delimiter || *buf.position() == '\n' || *buf.position() == '\r'; });
 }
 
+bool SerializationBool::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (istr.eof())
+        return false;
+
+    return deserializeImpl<bool>(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof() || *buf.position() == settings.csv.delimiter || *buf.position() == '\n' || *buf.position() == '\r'; });
+}
+
 void SerializationBool::serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeCustom(column, row_num, ostr, settings);
@@ -276,15 +340,30 @@ void SerializationBool::deserializeTextRaw(IColumn & column, ReadBuffer & istr,
     deserializeImpl(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof() || *buf.position() == '\t' || *buf.position() == '\n'; });
 }
 
+bool SerializationBool::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (istr.eof())
+        return false;
+
+    return deserializeImpl<bool>(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof() || *buf.position() == '\t' || *buf.position() == '\n'; });
+}
+
 void SerializationBool::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeSimple(column, row_num, ostr, settings);
 }
 
-void SerializationBool::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+template <typename ReturnType>
+ReturnType deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (istr.eof())
-        throw Exception(ErrorCodes::CANNOT_PARSE_BOOL, "Expected boolean value but get EOF.");
+    {
+        if constexpr (throw_exception)
+            throw Exception(ErrorCodes::CANNOT_PARSE_BOOL, "Expected boolean value but get EOF.");
+        return ReturnType(false);
+    }
 
     auto * col = checkAndGetDeserializeColumnType(column);
 
@@ -292,11 +371,17 @@ void SerializationBool::deserializeTextQuoted(IColumn & column, ReadBuffer & ist
     switch (symbol)
     {
         case 't':
-            assertStringCaseInsensitive("true", istr);
+            if constexpr (throw_exception)
+                assertStringCaseInsensitive("true", istr);
+            else if (!checkStringCaseInsensitive("true", istr))
+                return ReturnType(false);
             col->insert(true);
             break;
         case 'f':
-            assertStringCaseInsensitive("false", istr);
+            if constexpr (throw_exception)
+                assertStringCaseInsensitive("false", istr);
+            else if (!checkStringCaseInsensitive("false", istr))
+                return ReturnType(false);
             col->insert(false);
             break;
         case '1':
@@ -307,16 +392,40 @@ void SerializationBool::deserializeTextQuoted(IColumn & column, ReadBuffer & ist
             break;
         case '\'':
             ++istr.position();
-            deserializeImpl(column, istr, settings, [](ReadBuffer & buf){ return !buf.eof() && *buf.position() == '\''; });
-            assertChar('\'', istr);
+            if constexpr (throw_exception)
+            {
+                deserializeImpl(column, istr, settings, [](ReadBuffer & buf){ return !buf.eof() && *buf.position() == '\''; });
+                assertChar('\'', istr);
+            }
+            else
+            {
+                if (!deserializeImpl<bool>(column, istr, settings, [](ReadBuffer & buf) { return !buf.eof() && *buf.position() == '\''; }) || !checkChar('\'', istr))
+                    return ReturnType(false);
+            }
             break;
         default:
-            throw Exception(
-                ErrorCodes::CANNOT_PARSE_BOOL,
-                "Cannot parse boolean value here: '{}', should be true/false, 1/0 or on of "
-                "True/False/T/F/Y/N/Yes/No/On/Off/Enable/Disable/Enabled/Disabled/1/0 in quotes",
-                String(istr.position(), std::min(10ul, istr.available())));
+        {
+            if constexpr (throw_exception)
+                throw Exception(
+                    ErrorCodes::CANNOT_PARSE_BOOL,
+                    "Cannot parse boolean value here: '{}', should be true/false, 1/0 or on of "
+                    "True/False/T/F/Y/N/Yes/No/On/Off/Enable/Disable/Enabled/Disabled/1/0 in quotes",
+                    String(istr.position(), std::min(10ul, istr.available())));
+            return ReturnType(false);
+        }
     }
+
+    return ReturnType(true);
+}
+
+void SerializationBool::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextQuotedImpl<void>(column, istr, settings);
+}
+
+bool SerializationBool::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return deserializeTextQuotedImpl<bool>(column, istr, settings);
 }
 
 void SerializationBool::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
@@ -327,6 +436,14 @@ void SerializationBool::deserializeWholeText(IColumn & column, ReadBuffer & istr
     deserializeImpl(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof(); });
 }
 
+bool SerializationBool::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (istr.eof())
+        return false;
+
+    return deserializeImpl<bool>(column, istr, settings, [&](ReadBuffer & buf){ return buf.eof(); });
+}
+
 void SerializationBool::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeSimple(column, row_num, ostr, settings);
diff --git a/src/DataTypes/Serializations/SerializationBool.h b/src/DataTypes/Serializations/SerializationBool.h
index a5aa0ca80a2..3e511b7249e 100644
--- a/src/DataTypes/Serializations/SerializationBool.h
+++ b/src/DataTypes/Serializations/SerializationBool.h
@@ -15,21 +15,27 @@ public:
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const  override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const  override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
 
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
 };
diff --git a/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp b/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp
index 03564bac64b..938fd050173 100644
--- a/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp
+++ b/src/DataTypes/Serializations/SerializationCustomSimpleText.cpp
@@ -24,6 +24,12 @@ void deserializeFromString(const SerializationCustomSimpleText & domain, IColumn
     domain.deserializeText(column, istr, settings, true);
 }
 
+bool tryDeserializeFromString(const SerializationCustomSimpleText & domain, IColumn & column, const String & s, const FormatSettings & settings)
+{
+    ReadBufferFromString istr(s);
+    return domain.tryDeserializeText(column, istr, settings, true);
+}
+
 }
 
 namespace DB
@@ -34,6 +40,19 @@ SerializationCustomSimpleText::SerializationCustomSimpleText(const Serialization
 {
 }
 
+bool SerializationCustomSimpleText::tryDeserializeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, bool whole) const
+{
+    try
+    {
+        deserializeText(column, istr, settings, whole);
+        return true;
+    }
+    catch (...)
+    {
+        return false;
+    }
+}
+
 void SerializationCustomSimpleText::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     String str;
@@ -41,6 +60,13 @@ void SerializationCustomSimpleText::deserializeWholeText(IColumn & column, ReadB
     deserializeFromString(*this, column, str, settings);
 }
 
+bool SerializationCustomSimpleText::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readStringUntilEOF(str, istr);
+    return tryDeserializeFromString(*this, column, str, settings);
+}
+
 void SerializationCustomSimpleText::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeEscapedString(serializeToString(*this, column, row_num, settings), ostr);
@@ -53,6 +79,13 @@ void SerializationCustomSimpleText::deserializeTextEscaped(IColumn & column, Rea
     deserializeFromString(*this, column, str, settings);
 }
 
+bool SerializationCustomSimpleText::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readEscapedString(str, istr);
+    return tryDeserializeFromString(*this, column, str, settings);
+}
+
 void SerializationCustomSimpleText::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeQuotedString(serializeToString(*this, column, row_num, settings), ostr);
@@ -65,6 +98,14 @@ void SerializationCustomSimpleText::deserializeTextQuoted(IColumn & column, Read
     deserializeFromString(*this, column, str, settings);
 }
 
+bool SerializationCustomSimpleText::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    if (!tryReadQuotedString(str, istr))
+        return false;
+    return tryDeserializeFromString(*this, column, str, settings);
+}
+
 void SerializationCustomSimpleText::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeCSVString(serializeToString(*this, column, row_num, settings), ostr);
@@ -77,6 +118,13 @@ void SerializationCustomSimpleText::deserializeTextCSV(IColumn & column, ReadBuf
     deserializeFromString(*this, column, str, settings);
 }
 
+bool SerializationCustomSimpleText::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    readCSVStringInto<String, false, false>(str, istr, settings.csv);
+    return tryDeserializeFromString(*this, column, str, settings);
+}
+
 void SerializationCustomSimpleText::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeJSONString(serializeToString(*this, column, row_num, settings), ostr, settings);
@@ -85,10 +133,18 @@ void SerializationCustomSimpleText::serializeTextJSON(const IColumn & column, si
 void SerializationCustomSimpleText::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     String str;
-    readJSONString(str, istr);
+    readJSONString(str, istr, settings.json);
     deserializeFromString(*this, column, str, settings);
 }
 
+bool SerializationCustomSimpleText::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String str;
+    if (!tryReadJSONStringInto(str, istr, settings.json))
+        return false;
+    return tryDeserializeFromString(*this, column, str, settings);
+}
+
 void SerializationCustomSimpleText::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeXMLStringForTextElement(serializeToString(*this, column, row_num, settings), ostr);
diff --git a/src/DataTypes/Serializations/SerializationCustomSimpleText.h b/src/DataTypes/Serializations/SerializationCustomSimpleText.h
index 0c909350002..f7aea8697ff 100644
--- a/src/DataTypes/Serializations/SerializationCustomSimpleText.h
+++ b/src/DataTypes/Serializations/SerializationCustomSimpleText.h
@@ -18,24 +18,28 @@ public:
     explicit SerializationCustomSimpleText(const SerializationPtr & nested_);
 
     // Methods that subclasses must override in order to get full serialization/deserialization support.
-    virtual void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override = 0;
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override = 0;
     /// whole = true means that buffer contains only one value, so we should read until EOF.
     /// It's needed to check if there is garbage after parsed field.
     virtual void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const = 0;
+    virtual bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const;
 
     /** Text deserialization in case when buffer contains only one value, without any escaping and delimiters.
       */
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     /** Text serialization with escaping but without quoting.
       */
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
 
     /** Text serialization as a literal that may be inserted into a query.
       */
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const  override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const  override;
 
     /** Text serialization for the CSV format.
       */
@@ -44,12 +48,14 @@ public:
       * (the delimiter is not consumed).
       */
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     /** Text serialization intended for using in JSON format.
       * force_quoting_64bit_integers parameter forces to brace UInt64 and Int64 types into quotes.
       */
     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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     /** Text serialization for putting into the XML format.
       */
diff --git a/src/DataTypes/Serializations/SerializationDate.cpp b/src/DataTypes/Serializations/SerializationDate.cpp
index 534f599a072..38e1bb87b6d 100644
--- a/src/DataTypes/Serializations/SerializationDate.cpp
+++ b/src/DataTypes/Serializations/SerializationDate.cpp
@@ -22,6 +22,15 @@ void SerializationDate::deserializeWholeText(IColumn & column, ReadBuffer & istr
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "Date");
 }
 
+bool SerializationDate::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    if (!tryReadDateText(x, istr, time_zone) || !istr.eof())
+        return false;
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
     DayNum x;
@@ -29,6 +38,15 @@ void SerializationDate::deserializeTextEscaped(IColumn & column, ReadBuffer & is
     assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
 }
 
+bool SerializationDate::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    if (!tryReadDateText(x, istr, time_zone))
+        return false;
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeText(column, row_num, ostr, settings);
@@ -50,6 +68,16 @@ void SerializationDate::deserializeTextQuoted(IColumn & column, ReadBuffer & ist
     assert_cast<ColumnUInt16 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
 }
 
+bool SerializationDate::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    if (!checkChar('\'', istr) || !tryReadDateText(x, istr, time_zone) || !checkChar('\'', istr))
+        return false;
+
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -66,6 +94,15 @@ void SerializationDate::deserializeTextJSON(IColumn & column, ReadBuffer & istr,
     assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
 }
 
+bool SerializationDate::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum x;
+    if (!checkChar('"', istr) || !tryReadDateText(x, istr, time_zone) || !checkChar('"', istr))
+        return false;
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -80,6 +117,15 @@ void SerializationDate::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
     assert_cast<ColumnUInt16 &>(column).getData().push_back(value);
 }
 
+bool SerializationDate::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    DayNum value;
+    if (!tryReadCSV(value, istr, time_zone))
+        return false;
+    assert_cast<ColumnUInt16 &>(column).getData().push_back(value);
+    return true;
+}
+
 SerializationDate::SerializationDate(const DateLUTImpl & time_zone_) : time_zone(time_zone_)
 {
 }
diff --git a/src/DataTypes/Serializations/SerializationDate.h b/src/DataTypes/Serializations/SerializationDate.h
index f751b06fba6..dcf79eb49da 100644
--- a/src/DataTypes/Serializations/SerializationDate.h
+++ b/src/DataTypes/Serializations/SerializationDate.h
@@ -13,14 +13,19 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
 protected:
     const DateLUTImpl & time_zone;
diff --git a/src/DataTypes/Serializations/SerializationDate32.cpp b/src/DataTypes/Serializations/SerializationDate32.cpp
index 851710de839..70a22d59e42 100644
--- a/src/DataTypes/Serializations/SerializationDate32.cpp
+++ b/src/DataTypes/Serializations/SerializationDate32.cpp
@@ -21,6 +21,15 @@ void SerializationDate32::deserializeWholeText(IColumn & column, ReadBuffer & is
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "Date32");
 }
 
+bool SerializationDate32::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ExtendedDayNum x;
+    if (!tryReadDateText(x, istr, time_zone) || !istr.eof())
+        return false;
+    assert_cast<ColumnInt32 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate32::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
     ExtendedDayNum x;
@@ -28,6 +37,15 @@ void SerializationDate32::deserializeTextEscaped(IColumn & column, ReadBuffer &
     assert_cast<ColumnInt32 &>(column).getData().push_back(x);
 }
 
+bool SerializationDate32::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ExtendedDayNum x;
+    if (!tryReadDateText(x, istr, time_zone))
+        return false;
+    assert_cast<ColumnInt32 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate32::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeText(column, row_num, ostr, settings);
@@ -49,6 +67,15 @@ void SerializationDate32::deserializeTextQuoted(IColumn & column, ReadBuffer & i
     assert_cast<ColumnInt32 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
 }
 
+bool SerializationDate32::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ExtendedDayNum x;
+    if (!checkChar('\'', istr) || !tryReadDateText(x, istr, time_zone) || !checkChar('\'', istr))
+        return false;
+    assert_cast<ColumnInt32 &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+    return true;
+}
+
 void SerializationDate32::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -65,6 +92,15 @@ void SerializationDate32::deserializeTextJSON(IColumn & column, ReadBuffer & ist
     assert_cast<ColumnInt32 &>(column).getData().push_back(x);
 }
 
+bool SerializationDate32::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    ExtendedDayNum x;
+    if (!checkChar('"', istr) || !tryReadDateText(x, istr, time_zone) || !checkChar('"', istr))
+        return false;
+    assert_cast<ColumnInt32 &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDate32::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -79,6 +115,15 @@ void SerializationDate32::deserializeTextCSV(IColumn & column, ReadBuffer & istr
     assert_cast<ColumnInt32 &>(column).getData().push_back(value.getExtenedDayNum());
 }
 
+bool SerializationDate32::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    LocalDate value;
+    if (!tryReadCSV(value, istr))
+        return false;
+    assert_cast<ColumnInt32 &>(column).getData().push_back(value.getExtenedDayNum());
+    return true;
+}
+
 SerializationDate32::SerializationDate32(const DateLUTImpl & time_zone_) : time_zone(time_zone_)
 {
 }
diff --git a/src/DataTypes/Serializations/SerializationDate32.h b/src/DataTypes/Serializations/SerializationDate32.h
index 49560fb6c7d..be2e2b76c1d 100644
--- a/src/DataTypes/Serializations/SerializationDate32.h
+++ b/src/DataTypes/Serializations/SerializationDate32.h
@@ -12,14 +12,19 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
 protected:
     const DateLUTImpl & time_zone;
diff --git a/src/DataTypes/Serializations/SerializationDateTime.cpp b/src/DataTypes/Serializations/SerializationDateTime.cpp
index 77beb0d9b75..17465d85e9d 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime.cpp
@@ -21,15 +21,56 @@ inline void readText(time_t & x, ReadBuffer & istr, const FormatSettings & setti
     switch (settings.date_time_input_format)
     {
         case FormatSettings::DateTimeInputFormat::Basic:
-            readDateTimeText(x, istr, time_zone);
-            return;
+            readDateTimeTextImpl<>(x, istr, time_zone);
+            break;
         case FormatSettings::DateTimeInputFormat::BestEffort:
             parseDateTimeBestEffort(x, istr, time_zone, utc_time_zone);
-            return;
+            break;
         case FormatSettings::DateTimeInputFormat::BestEffortUS:
             parseDateTimeBestEffortUS(x, istr, time_zone, utc_time_zone);
-            return;
+            break;
     }
+
+    if (x < 0)
+        x = 0;
+}
+
+inline void readAsIntText(time_t & x, ReadBuffer & istr)
+{
+    readIntText(x, istr);
+    if (x < 0)
+        x = 0;
+}
+
+inline bool tryReadText(time_t & x, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
+{
+    bool res;
+    switch (settings.date_time_input_format)
+    {
+        case FormatSettings::DateTimeInputFormat::Basic:
+            res = tryReadDateTimeText(x, istr, time_zone);
+            break;
+        case FormatSettings::DateTimeInputFormat::BestEffort:
+            res = tryParseDateTimeBestEffort(x, istr, time_zone, utc_time_zone);
+            break;
+        case FormatSettings::DateTimeInputFormat::BestEffortUS:
+            res = tryParseDateTimeBestEffortUS(x, istr, time_zone, utc_time_zone);
+            break;
+    }
+
+    if (x < 0)
+        x = 0;
+
+    return res;
+}
+
+inline bool tryReadAsIntText(time_t & x, ReadBuffer & istr)
+{
+    if (!tryReadIntText(x, istr))
+        return false;
+    if (x < 0)
+        x = 0;
+    return true;
 }
 
 }
@@ -68,15 +109,32 @@ void SerializationDateTime::deserializeWholeText(IColumn & column, ReadBuffer &
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "DateTime");
 }
 
+bool SerializationDateTime::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (!tryReadText(x, istr, settings, time_zone, utc_time_zone) || !istr.eof())
+        return false;
+
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
+    return true;
+}
+
 void SerializationDateTime::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     time_t x = 0;
     readText(x, istr, settings, time_zone, utc_time_zone);
-    if (x < 0)
-        x = 0;
     assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
+bool SerializationDateTime::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (!tryReadText(x, istr, settings, time_zone, utc_time_zone))
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
+    return true;
+}
+
 void SerializationDateTime::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('\'', ostr);
@@ -94,15 +152,32 @@ void SerializationDateTime::deserializeTextQuoted(IColumn & column, ReadBuffer &
     }
     else /// Just 1504193808 or 01504193808
     {
-        readIntText(x, istr);
+        readAsIntText(x, istr);
     }
-    if (x < 0)
-        x = 0;
 
     /// It's important to do this at the end - for exception safety.
     assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
+bool SerializationDateTime::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
+    {
+        if (!tryReadText(x, istr, settings, time_zone, utc_time_zone) || !checkChar('\'', istr))
+            return false;
+    }
+    else /// Just 1504193808 or 01504193808
+    {
+        if (!tryReadAsIntText(x, istr))
+            return false;
+    }
+
+    /// It's important to do this at the end - for exception safety.
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
+    return true;
+}
+
 void SerializationDateTime::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -120,13 +195,30 @@ void SerializationDateTime::deserializeTextJSON(IColumn & column, ReadBuffer & i
     }
     else
     {
-        readIntText(x, istr);
+        readAsIntText(x, istr);
     }
-    if (x < 0)
-        x = 0;
+
     assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
+bool SerializationDateTime::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+    if (checkChar('"', istr))
+    {
+        if (!tryReadText(x, istr, settings, time_zone, utc_time_zone) || !checkChar('"', istr))
+            return false;
+    }
+    else
+    {
+        if (!tryReadIntText(x, istr))
+            return false;
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
+    return true;
+}
+
 void SerializationDateTime::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -165,13 +257,48 @@ void SerializationDateTime::deserializeTextCSV(IColumn & column, ReadBuffer & is
             readCSVString(datetime_str, istr, settings.csv);
             ReadBufferFromString buf(datetime_str);
             readText(x, buf, settings, time_zone, utc_time_zone);
+            if (!buf.eof())
+                throwUnexpectedDataAfterParsedValue(column, istr, settings, "DateTime");
         }
     }
 
-    if (x < 0)
-        x = 0;
-
     assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
 }
 
+bool SerializationDateTime::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    time_t x = 0;
+
+    if (istr.eof())
+        return false;
+
+    char maybe_quote = *istr.position();
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+    {
+        ++istr.position();
+        if (!tryReadText(x, istr, settings, time_zone, utc_time_zone) || !checkChar(maybe_quote, istr))
+            return false;
+    }
+    else
+    {
+        if (settings.csv.delimiter != ',' || settings.date_time_input_format == FormatSettings::DateTimeInputFormat::Basic)
+        {
+            if (!tryReadText(x, istr, settings, time_zone, utc_time_zone))
+                return false;
+        }
+        else
+        {
+            String datetime_str;
+            readCSVString(datetime_str, istr, settings.csv);
+            ReadBufferFromString buf(datetime_str);
+            if (!tryReadText(x, buf, settings, time_zone, utc_time_zone) || !buf.eof())
+                return false;
+        }
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(static_cast<UInt32>(x));
+    return true;
+}
+
 }
diff --git a/src/DataTypes/Serializations/SerializationDateTime.h b/src/DataTypes/Serializations/SerializationDateTime.h
index f4a142483e5..584b0c4116b 100644
--- a/src/DataTypes/Serializations/SerializationDateTime.h
+++ b/src/DataTypes/Serializations/SerializationDateTime.h
@@ -15,14 +15,19 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.cpp b/src/DataTypes/Serializations/SerializationDateTime64.cpp
index 93891886000..442e29edd52 100644
--- a/src/DataTypes/Serializations/SerializationDateTime64.cpp
+++ b/src/DataTypes/Serializations/SerializationDateTime64.cpp
@@ -47,6 +47,16 @@ void SerializationDateTime64::deserializeText(IColumn & column, ReadBuffer & ist
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "DateTime64");
 }
 
+bool SerializationDateTime64::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const
+{
+    DateTime64 result = 0;
+    if (!tryReadDateTime64Text(result, scale, istr, time_zone) || (whole && !istr.eof()))
+        return false;
+
+    assert_cast<ColumnType &>(column).getData().push_back(result);
+    return true;
+}
+
 void SerializationDateTime64::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     deserializeTextEscaped(column, istr, settings);
@@ -75,6 +85,29 @@ static inline void readText(DateTime64 & x, UInt32 scale, ReadBuffer & istr, con
     }
 }
 
+static inline bool tryReadText(DateTime64 & x, UInt32 scale, ReadBuffer & istr, const FormatSettings & settings, const DateLUTImpl & time_zone, const DateLUTImpl & utc_time_zone)
+{
+    switch (settings.date_time_input_format)
+    {
+        case FormatSettings::DateTimeInputFormat::Basic:
+            return tryReadDateTime64Text(x, scale, istr, time_zone);
+        case FormatSettings::DateTimeInputFormat::BestEffort:
+            return tryParseDateTime64BestEffort(x, scale, istr, time_zone, utc_time_zone);
+        case FormatSettings::DateTimeInputFormat::BestEffortUS:
+            return tryParseDateTime64BestEffortUS(x, scale, istr, time_zone, utc_time_zone);
+    }
+}
+
+
+bool SerializationDateTime64::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone) || !istr.eof())
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDateTime64::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     DateTime64 x = 0;
@@ -82,6 +115,15 @@ void SerializationDateTime64::deserializeTextEscaped(IColumn & column, ReadBuffe
     assert_cast<ColumnType &>(column).getData().push_back(x);
 }
 
+bool SerializationDateTime64::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone))
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDateTime64::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('\'', ostr);
@@ -104,6 +146,23 @@ void SerializationDateTime64::deserializeTextQuoted(IColumn & column, ReadBuffer
     assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
 }
 
+bool SerializationDateTime64::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (checkChar('\'', istr)) /// Cases: '2017-08-31 18:36:48' or '1504193808'
+    {
+        if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone) || !checkChar('\'', istr))
+            return false;
+    }
+    else /// Just 1504193808 or 01504193808
+    {
+        if (!tryReadIntText(x, istr))
+            return false;
+    }
+    assert_cast<ColumnType &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+    return true;
+}
+
 void SerializationDateTime64::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -126,6 +185,23 @@ void SerializationDateTime64::deserializeTextJSON(IColumn & column, ReadBuffer &
     assert_cast<ColumnType &>(column).getData().push_back(x);
 }
 
+bool SerializationDateTime64::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+    if (checkChar('"', istr))
+    {
+        if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone) || !checkChar('"', istr))
+            return false;
+    }
+    else
+    {
+        if (!tryReadIntText(x, istr))
+            return false;
+    }
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationDateTime64::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -170,4 +246,40 @@ void SerializationDateTime64::deserializeTextCSV(IColumn & column, ReadBuffer &
     assert_cast<ColumnType &>(column).getData().push_back(x);
 }
 
+bool SerializationDateTime64::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    DateTime64 x = 0;
+
+    if (istr.eof())
+        return false;
+
+    char maybe_quote = *istr.position();
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+    {
+        ++istr.position();
+        if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone) || !checkChar(maybe_quote, istr))
+            return false;
+    }
+    else
+    {
+        if (settings.csv.delimiter != ',' || settings.date_time_input_format == FormatSettings::DateTimeInputFormat::Basic)
+        {
+            if (!tryReadText(x, scale, istr, settings, time_zone, utc_time_zone))
+                return false;
+        }
+        else
+        {
+            String datetime_str;
+            readCSVString(datetime_str, istr, settings.csv);
+            ReadBufferFromString buf(datetime_str);
+            if (!tryReadText(x, scale, buf, settings, time_zone, utc_time_zone) || !buf.eof())
+                return false;
+        }
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 }
diff --git a/src/DataTypes/Serializations/SerializationDateTime64.h b/src/DataTypes/Serializations/SerializationDateTime64.h
index f817edbf0dd..b49bd1e9098 100644
--- a/src/DataTypes/Serializations/SerializationDateTime64.h
+++ b/src/DataTypes/Serializations/SerializationDateTime64.h
@@ -15,15 +15,21 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
+    bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationDecimal.cpp b/src/DataTypes/Serializations/SerializationDecimal.cpp
index b576b7a048c..d632c224783 100644
--- a/src/DataTypes/Serializations/SerializationDecimal.cpp
+++ b/src/DataTypes/Serializations/SerializationDecimal.cpp
@@ -16,11 +16,19 @@ namespace ErrorCodes
 }
 
 template <typename T>
-bool SerializationDecimal<T>::tryReadText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale)
+bool SerializationDecimal<T>::tryReadText(T & x, ReadBuffer & istr, UInt32 precision, UInt32 scale, bool csv)
 {
     UInt32 unread_scale = scale;
-    if (!tryReadDecimalText(istr, x, precision, unread_scale))
-        return false;
+    if (csv)
+    {
+        if (!tryReadCSVDecimalText(istr, x, precision, unread_scale))
+            return false;
+    }
+    else
+    {
+        if (!tryReadDecimalText(istr, x, precision, unread_scale))
+            return false;
+    }
 
     if (common::mulOverflow(x.value, DecimalUtils::scaleMultiplier<T>(unread_scale), x.value))
         return false;
@@ -59,6 +67,16 @@ void SerializationDecimal<T>::deserializeText(IColumn & column, ReadBuffer & ist
         ISerialization::throwUnexpectedDataAfterParsedValue(column, istr, settings, "Decimal");
 }
 
+template <typename T>
+bool SerializationDecimal<T>::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const
+{
+    T x;
+    if (!tryReadText(x, istr) || (whole && !istr.eof()))
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename T>
 void SerializationDecimal<T>::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
@@ -67,6 +85,16 @@ void SerializationDecimal<T>::deserializeTextCSV(IColumn & column, ReadBuffer &
     assert_cast<ColumnType &>(column).getData().push_back(x);
 }
 
+template <typename T>
+bool SerializationDecimal<T>::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    T x;
+    if (!tryReadText(x, istr, true))
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename T>
 void SerializationDecimal<T>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -88,6 +116,18 @@ void SerializationDecimal<T>::deserializeTextJSON(IColumn & column, ReadBuffer &
         assertChar('"', istr);
 }
 
+template <typename T>
+bool SerializationDecimal<T>::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    bool have_quotes = checkChar('"', istr);
+    T x;
+    if (!tryReadText(x, istr) || (have_quotes && !checkChar('"', istr)))
+        return false;
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 
 template class SerializationDecimal<Decimal32>;
 template class SerializationDecimal<Decimal64>;
diff --git a/src/DataTypes/Serializations/SerializationDecimal.h b/src/DataTypes/Serializations/SerializationDecimal.h
index 57decdd0973..22a8eb1a47c 100644
--- a/src/DataTypes/Serializations/SerializationDecimal.h
+++ b/src/DataTypes/Serializations/SerializationDecimal.h
@@ -16,15 +16,19 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
+    bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void readText(T & x, ReadBuffer & istr, bool csv = false) const { readText(x, istr, this->precision, this->scale, csv); }
+    bool tryReadText(T & x, ReadBuffer & istr, bool csv = false) const { return tryReadText(x, istr, this->precision, this->scale, csv); }
 
     static void readText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_, bool csv = false);
-    static bool tryReadText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_);
+    static bool tryReadText(T & x, ReadBuffer & istr, UInt32 precision_, UInt32 scale_, bool csv = false);
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationDecimalBase.h b/src/DataTypes/Serializations/SerializationDecimalBase.h
index 08f963cedbb..5676280d34b 100644
--- a/src/DataTypes/Serializations/SerializationDecimalBase.h
+++ b/src/DataTypes/Serializations/SerializationDecimalBase.h
@@ -29,4 +29,10 @@ public:
     void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double avg_value_size_hint) const override;
 };
 
+extern template class SerializationDecimalBase<Decimal32>;
+extern template class SerializationDecimalBase<Decimal64>;
+extern template class SerializationDecimalBase<Decimal128>;
+extern template class SerializationDecimalBase<Decimal256>;
+extern template class SerializationDecimalBase<DateTime64>;
+
 }
diff --git a/src/DataTypes/Serializations/SerializationEnum.cpp b/src/DataTypes/Serializations/SerializationEnum.cpp
index 9b3a437e9cf..d72442eec99 100644
--- a/src/DataTypes/Serializations/SerializationEnum.cpp
+++ b/src/DataTypes/Serializations/SerializationEnum.cpp
@@ -34,6 +34,27 @@ void SerializationEnum<Type>::deserializeTextEscaped(IColumn & column, ReadBuffe
     }
 }
 
+template <typename Type>
+bool SerializationEnum<Type>::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    FieldType x;
+    if (settings.tsv.enum_as_number)
+    {
+        if (!tryReadValue(istr, x))
+            return false;
+    }
+    else
+    {
+        std::string field_name;
+        readEscapedString(field_name, istr);
+        if (!ref_enum_values.tryGetValue(x, StringRef(field_name), true))
+            return false;
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename Type>
 void SerializationEnum<Type>::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
@@ -48,6 +69,20 @@ void SerializationEnum<Type>::deserializeTextQuoted(IColumn & column, ReadBuffer
     assert_cast<ColumnType &>(column).getData().push_back(ref_enum_values.getValue(StringRef(field_name)));
 }
 
+template <typename Type>
+bool SerializationEnum<Type>::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    std::string field_name;
+    if (!tryReadQuotedStringWithSQLStyle(field_name, istr))
+        return false;
+
+    FieldType x;
+    if (!ref_enum_values.tryGetValue(x, StringRef(field_name)))
+        return false;
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename Type>
 void SerializationEnum<Type>::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
@@ -65,6 +100,27 @@ void SerializationEnum<Type>::deserializeWholeText(IColumn & column, ReadBuffer
     }
 }
 
+template <typename Type>
+bool SerializationEnum<Type>::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    FieldType x;
+    if (settings.tsv.enum_as_number)
+    {
+        if (!tryReadValue(istr, x) || !istr.eof())
+            return false;
+    }
+    else
+    {
+        std::string field_name;
+        readStringUntilEOF(field_name, istr);
+        if (!ref_enum_values.tryGetValue(x, StringRef(field_name), true))
+            return false;
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename Type>
 void SerializationEnum<Type>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -78,18 +134,39 @@ void SerializationEnum<Type>::serializeTextXML(const IColumn & column, size_t ro
 }
 
 template <typename Type>
-void SerializationEnum<Type>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+void SerializationEnum<Type>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     if (!istr.eof() && *istr.position() != '"')
         assert_cast<ColumnType &>(column).getData().push_back(readValue(istr));
     else
     {
         std::string field_name;
-        readJSONString(field_name, istr);
+        readJSONString(field_name, istr, settings.json);
         assert_cast<ColumnType &>(column).getData().push_back(ref_enum_values.getValue(StringRef(field_name)));
     }
 }
 
+template <typename Type>
+bool SerializationEnum<Type>::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    FieldType x;
+    if (!istr.eof() && *istr.position() != '"')
+    {
+        if (!tryReadValue(istr, x))
+            return false;
+    }
+    else
+    {
+        std::string field_name;
+        readJSONString(field_name, istr, settings.json);
+        if (!ref_enum_values.tryGetValue(x, StringRef(field_name)))
+            return false;
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename Type>
 void SerializationEnum<Type>::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
@@ -109,6 +186,28 @@ void SerializationEnum<Type>::deserializeTextCSV(IColumn & column, ReadBuffer &
     }
 }
 
+template <typename Type>
+bool SerializationEnum<Type>::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    FieldType x;
+
+    if (settings.csv.enum_as_number)
+    {
+        if (!tryReadValue(istr, x))
+            return false;
+    }
+    else
+    {
+        std::string field_name;
+        readCSVString(field_name, istr, settings.csv);
+        if (!ref_enum_values.tryGetValue(x, StringRef(field_name), true))
+            return false;
+    }
+
+    assert_cast<ColumnType &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename Type>
 void SerializationEnum<Type>::serializeTextMarkdown(
     const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
diff --git a/src/DataTypes/Serializations/SerializationEnum.h b/src/DataTypes/Serializations/SerializationEnum.h
index 03b134e59a6..bb720ee9b1f 100644
--- a/src/DataTypes/Serializations/SerializationEnum.h
+++ b/src/DataTypes/Serializations/SerializationEnum.h
@@ -34,15 +34,20 @@ public:
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void serializeTextMarkdown(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
@@ -53,6 +58,11 @@ public:
         return ref_enum_values.findByValue(x)->first;
     }
 
+    bool tryReadValue(ReadBuffer & istr, FieldType & x) const
+    {
+       return tryReadText(x, istr) && ref_enum_values.hasValue(x);
+    }
+
     std::optional<EnumValues<Type>> own_enum_values;
     std::shared_ptr<const DataTypeEnum<Type>> own_enum_type;
     const EnumValues<Type> & ref_enum_values;
diff --git a/src/DataTypes/Serializations/SerializationFixedString.cpp b/src/DataTypes/Serializations/SerializationFixedString.cpp
index fa50af52f2f..481ae2a6165 100644
--- a/src/DataTypes/Serializations/SerializationFixedString.cpp
+++ b/src/DataTypes/Serializations/SerializationFixedString.cpp
@@ -150,12 +150,49 @@ static inline void read(const SerializationFixedString & self, IColumn & column,
     }
 }
 
+bool SerializationFixedString::tryAlignStringLength(size_t n, PaddedPODArray<UInt8> & data, size_t string_start)
+{
+    size_t length = data.size() - string_start;
+    if (length < n)
+    {
+        data.resize_fill(string_start + n);
+    }
+    else if (length > n)
+    {
+        data.resize_assume_reserved(string_start);
+        return false;
+    }
+
+    return true;
+}
+
+template <typename Reader>
+static inline bool tryRead(const SerializationFixedString & self, IColumn & column, Reader && reader)
+{
+    ColumnFixedString::Chars & data = typeid_cast<ColumnFixedString &>(column).getChars();
+    size_t prev_size = data.size();
+    try
+    {
+        return reader(data) && SerializationFixedString::tryAlignStringLength(self.getN(), data, prev_size);
+    }
+    catch (...)
+    {
+        data.resize_assume_reserved(prev_size);
+        return false;
+    }
+}
+
 
 void SerializationFixedString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
     read(*this, column, [&istr](ColumnFixedString::Chars & data) { readEscapedStringInto(data, istr); });
 }
 
+bool SerializationFixedString::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    return tryRead(*this, column, [&istr](ColumnFixedString::Chars & data) { readEscapedStringInto(data, istr); return true; });
+}
+
 
 void SerializationFixedString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
@@ -169,12 +206,22 @@ void SerializationFixedString::deserializeTextQuoted(IColumn & column, ReadBuffe
     read(*this, column, [&istr](ColumnFixedString::Chars & data) { readQuotedStringInto<true>(data, istr); });
 }
 
+bool SerializationFixedString::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    return tryRead(*this, column, [&istr](ColumnFixedString::Chars & data) { return tryReadQuotedStringInto<true>(data, istr); });
+}
+
 
 void SerializationFixedString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
     read(*this, column, [&istr](ColumnFixedString::Chars & data) { readStringUntilEOFInto(data, istr); });
 }
 
+bool SerializationFixedString::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    return tryRead(*this, column, [&istr](ColumnFixedString::Chars & data) { readStringUntilEOFInto(data, istr); return true; });
+}
+
 
 void SerializationFixedString::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -183,11 +230,15 @@ void SerializationFixedString::serializeTextJSON(const IColumn & column, size_t
 }
 
 
-void SerializationFixedString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+void SerializationFixedString::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    read(*this, column, [&istr](ColumnFixedString::Chars & data) { readJSONStringInto(data, istr); });
+    read(*this, column, [&istr, &settings](ColumnFixedString::Chars & data) { readJSONStringInto(data, istr, settings.json); });
 }
 
+bool SerializationFixedString::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryRead(*this, column, [&istr, &settings](ColumnFixedString::Chars & data) { return tryReadJSONStringInto(data, istr, settings.json); });
+}
 
 void SerializationFixedString::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
 {
@@ -208,6 +259,11 @@ void SerializationFixedString::deserializeTextCSV(IColumn & column, ReadBuffer &
     read(*this, column, [&istr, &csv = settings.csv](ColumnFixedString::Chars & data) { readCSVStringInto(data, istr, csv); });
 }
 
+bool SerializationFixedString::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryRead(*this, column, [&istr, &csv = settings.csv](ColumnFixedString::Chars & data) { readCSVStringInto<ColumnFixedString::Chars, false, false>(data, istr, csv); return true; });
+}
+
 void SerializationFixedString::serializeTextMarkdown(
     const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings & settings) const
 {
diff --git a/src/DataTypes/Serializations/SerializationFixedString.h b/src/DataTypes/Serializations/SerializationFixedString.h
index c27b10ad158..8eb4eacdbff 100644
--- a/src/DataTypes/Serializations/SerializationFixedString.h
+++ b/src/DataTypes/Serializations/SerializationFixedString.h
@@ -26,20 +26,25 @@ public:
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextMarkdown(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
@@ -47,6 +52,7 @@ public:
     /// If the length is less than getN() the function will add zero characters up to getN().
     /// If the length is greater than getN() the function will throw an exception.
     static void alignStringLength(size_t n, PaddedPODArray<UInt8> & data, size_t string_start);
+    static bool tryAlignStringLength(size_t n, PaddedPODArray<UInt8> & data, size_t string_start);
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp b/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp
new file mode 100644
index 00000000000..dfcd24aff58
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationIPv4andIPv6.cpp
@@ -0,0 +1,187 @@
+#include <DataTypes/Serializations/SerializationIPv4andIPv6.h>
+
+namespace DB
+{
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeText(const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings &) const
+{
+    writeText(assert_cast<const ColumnVector<IPv> &>(column).getData()[row_num], ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, bool whole) const
+{
+    IPv x;
+    readText(x, istr);
+
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+
+    if (whole && !istr.eof())
+        throwUnexpectedDataAfterParsedValue(column, istr, settings, TypeName<IPv>.data());
+}
+
+template <typename IPv>
+bool SerializationIP<IPv>::tryDeserializeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &, bool whole) const
+{
+    IPv x;
+    if (!tryReadText(x, istr) || (whole && !istr.eof()))
+        return false;
+
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+    return true;
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeTextQuoted(const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings & settings) const
+{
+    writeChar('\'', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('\'', ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeTextQuoted(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv x;
+    assertChar('\'', istr);
+    readText(x, istr);
+    assertChar('\'', istr);
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
+}
+
+template <typename IPv>
+bool SerializationIP<IPv>::tryDeserializeTextQuoted(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv x;
+    if (!checkChar('\'', istr) || !tryReadText(x, istr) || !checkChar('\'', istr))
+        return false;
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+    return true;
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeTextJSON(const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    IPv x;
+    assertChar('"', istr);
+    readText(x, istr);
+    /// this code looks weird, but we want to throw specific exception to match original behavior...
+    if (istr.eof())
+        assertChar('"', istr);
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+    if (*istr.position() != '"')
+        throwUnexpectedDataAfterParsedValue(column, istr, settings, TypeName<IPv>.data());
+    istr.ignore();
+}
+
+template <typename IPv>
+bool SerializationIP<IPv>::tryDeserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv x;
+    if (!checkChar('"', istr) || !tryReadText(x, istr) || !checkChar('"', istr))
+        return false;
+
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+    return true;
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeTextCSV(const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings & settings) const
+{
+    writeChar('"', ostr);
+    serializeText(column, row_num, ostr, settings);
+    writeChar('"', ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeTextCSV(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv value;
+    readCSV(value, istr);
+
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(value);
+}
+
+template <typename IPv>
+bool SerializationIP<IPv>::tryDeserializeTextCSV(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv value;
+    if (!tryReadCSV(value, istr))
+        return false;
+
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(value);
+    return true;
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
+{
+    IPv x = field.get<IPv>();
+    if constexpr (std::is_same_v<IPv, IPv6>)
+        writeBinary(x, ostr);
+    else
+        writeBinaryLittleEndian(x, ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeBinary(DB::Field & field, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv x;
+    if constexpr (std::is_same_v<IPv, IPv6>)
+        readBinary(x, istr);
+    else
+        readBinaryLittleEndian(x, istr);
+    field = NearestFieldType<IPv>(x);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeBinary(const DB::IColumn & column, size_t row_num, DB::WriteBuffer & ostr, const DB::FormatSettings &) const
+{
+    writeBinary(assert_cast<const ColumnVector<IPv> &>(column).getData()[row_num], ostr);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeBinary(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings &) const
+{
+    IPv x;
+    readBinary(x.toUnderType(), istr);
+    assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::serializeBinaryBulk(const DB::IColumn & column, DB::WriteBuffer & ostr, size_t offset, size_t limit) const
+{
+    const typename ColumnVector<IPv>::Container & x = typeid_cast<const ColumnVector<IPv> &>(column).getData();
+
+    size_t size = x.size();
+
+    if (limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    if (limit)
+        ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(IPv) * limit);
+}
+
+template <typename IPv>
+void SerializationIP<IPv>::deserializeBinaryBulk(DB::IColumn & column, DB::ReadBuffer & istr, size_t limit, double) const
+{
+    typename ColumnVector<IPv>::Container & x = typeid_cast<ColumnVector<IPv> &>(column).getData();
+    size_t initial_size = x.size();
+    x.resize(initial_size + limit);
+    size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(IPv) * limit);
+    x.resize(initial_size + size / sizeof(IPv));
+}
+
+template class SerializationIP<IPv4>;
+template class SerializationIP<IPv6>;
+
+}
diff --git a/src/DataTypes/Serializations/SerializationIPv4andIPv6.h b/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
index 7d8669fd444..a53f257646b 100644
--- a/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
+++ b/src/DataTypes/Serializations/SerializationIPv4andIPv6.h
@@ -13,123 +13,30 @@ template <typename IPv>
 class SerializationIP : public SimpleTextSerialization
 {
 public:
-    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override
-    {
-        writeText(assert_cast<const ColumnVector<IPv> &>(column).getData()[row_num], ostr);
-    }
-    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override
-    {
-        IPv x;
-        readText(x, istr);
+    void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
+    bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
 
-        if (whole && !istr.eof())
-            throwUnexpectedDataAfterParsedValue(column, istr, settings, TypeName<IPv>.data());
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
-        assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
-    }
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        serializeText(column, row_num, ostr, settings);
-    }
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        deserializeText(column, istr, settings, false);
-    }
-    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        writeChar('\'', ostr);
-        serializeText(column, row_num, ostr, settings);
-        writeChar('\'', ostr);
-    }
-    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override
-    {
-        IPv x;
-        assertChar('\'', istr);
-        readText(x, istr);
-        assertChar('\'', istr);
-        assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);    /// It's important to do this at the end - for exception safety.
-    }
-    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        writeChar('"', ostr);
-        serializeText(column, row_num, ostr, settings);
-        writeChar('"', ostr);
-    }
-    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
-    {
-        IPv x;
-        assertChar('"', istr);
-        readText(x, istr);
-        /// this code looks weird, but we want to throw specific exception to match original behavior...
-        if (istr.eof())
-            assertChar('"', istr);
-        if (*istr.position() != '"')
-            throwUnexpectedDataAfterParsedValue(column, istr, settings, TypeName<IPv>.data());
-        istr.ignore();
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
-        assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
-    }
-    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override
-    {
-        writeChar('"', ostr);
-        serializeText(column, row_num, ostr, settings);
-        writeChar('"', ostr);
-    }
-    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &/* settings*/) const override
-    {
-        IPv value;
-        readCSV(value, istr);
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &/* settings*/) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &/* settings*/) const override;
 
-        assert_cast<ColumnVector<IPv> &>(column).getData().push_back(value);
-    }
+    void serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const override;
 
-    void serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const override
-    {
-        IPv x = field.get<IPv>();
-        if constexpr (std::is_same_v<IPv, IPv6>)
-            writeBinary(x, ostr);
-        else
-            writeBinaryLittleEndian(x, ostr);
-    }
-    void deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const override
-    {
-        IPv x;
-        if constexpr (std::is_same_v<IPv, IPv6>)
-            readBinary(x, istr);
-        else
-            readBinaryLittleEndian(x, istr);
-        field = NearestFieldType<IPv>(x);
-    }
-    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override
-    {
-        writeBinary(assert_cast<const ColumnVector<IPv> &>(column).getData()[row_num], ostr);
-    }
-    void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override
-    {
-        IPv x;
-        readBinary(x.toUnderType(), istr);
-        assert_cast<ColumnVector<IPv> &>(column).getData().push_back(x);
-    }
-    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override
-    {
-        const typename ColumnVector<IPv>::Container & x = typeid_cast<const ColumnVector<IPv> &>(column).getData();
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
-        size_t size = x.size();
-
-        if (limit == 0 || offset + limit > size)
-            limit = size - offset;
-
-        if (limit)
-            ostr.write(reinterpret_cast<const char *>(&x[offset]), sizeof(IPv) * limit);
-    }
-    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const override
-    {
-        typename ColumnVector<IPv>::Container & x = typeid_cast<ColumnVector<IPv> &>(column).getData();
-        size_t initial_size = x.size();
-        x.resize(initial_size + limit);
-        size_t size = istr.readBig(reinterpret_cast<char*>(&x[initial_size]), sizeof(IPv) * limit);
-        x.resize(initial_size + size / sizeof(IPv));
-    }
+    void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
+    void deserializeBinaryBulk(IColumn & column, ReadBuffer & istr, size_t limit, double /*avg_value_size_hint*/) const override;
 };
 
 using SerializationIPv4 = SerializationIP<IPv4>;
diff --git a/src/DataTypes/Serializations/SerializationInfo.h b/src/DataTypes/Serializations/SerializationInfo.h
index 3d8f4f1d00c..5a900a5521c 100644
--- a/src/DataTypes/Serializations/SerializationInfo.h
+++ b/src/DataTypes/Serializations/SerializationInfo.h
@@ -2,6 +2,8 @@
 
 #include <Core/Types_fwd.h>
 #include <DataTypes/Serializations/ISerialization.h>
+#include <DataTypes/Serializations/SerializationInfoSettings.h>
+
 #include <Poco/JSON/Object.h>
 
 
@@ -28,6 +30,8 @@ constexpr auto SERIALIZATION_INFO_VERSION = 0;
 class SerializationInfo
 {
 public:
+    using Settings = SerializationInfoSettings;
+
     struct Data
     {
         size_t num_rows = 0;
@@ -38,16 +42,8 @@ public:
         void addDefaults(size_t length);
     };
 
-    struct Settings
-    {
-        const double ratio_of_defaults_for_sparse = 1.0;
-        const bool choose_kind = false;
-
-        bool isAlwaysDefault() const { return ratio_of_defaults_for_sparse >= 1.0; }
-    };
-
-    SerializationInfo(ISerialization::Kind kind_, const Settings & settings_);
-    SerializationInfo(ISerialization::Kind kind_, const Settings & settings_, const Data & data_);
+    SerializationInfo(ISerialization::Kind kind_, const SerializationInfoSettings & settings_);
+    SerializationInfo(ISerialization::Kind kind_, const SerializationInfoSettings & settings_, const Data & data_);
 
     virtual ~SerializationInfo() = default;
 
@@ -64,7 +60,7 @@ public:
     virtual std::shared_ptr<SerializationInfo> createWithType(
         const IDataType & old_type,
         const IDataType & new_type,
-        const Settings & new_settings) const;
+        const SerializationInfoSettings & new_settings) const;
 
     virtual void serialializeKindBinary(WriteBuffer & out) const;
     virtual void deserializeFromKindsBinary(ReadBuffer & in);
@@ -73,14 +69,14 @@ public:
     virtual void fromJSON(const Poco::JSON::Object & object);
 
     void setKind(ISerialization::Kind kind_) { kind = kind_; }
-    const Settings & getSettings() const { return settings; }
+    const SerializationInfoSettings & getSettings() const { return settings; }
     const Data & getData() const { return data; }
     ISerialization::Kind getKind() const { return kind; }
 
-    static ISerialization::Kind chooseKind(const Data & data, const Settings & settings);
+    static ISerialization::Kind chooseKind(const Data & data, const SerializationInfoSettings & settings);
 
 protected:
-    const Settings settings;
+    const SerializationInfoSettings settings;
 
     ISerialization::Kind kind;
     Data data;
@@ -96,7 +92,7 @@ using MutableSerializationInfos = std::vector<MutableSerializationInfoPtr>;
 class SerializationInfoByName : public std::map<String, MutableSerializationInfoPtr>
 {
 public:
-    using Settings = SerializationInfo::Settings;
+    using Settings = SerializationInfoSettings;
 
     SerializationInfoByName() = default;
     SerializationInfoByName(const NamesAndTypesList & columns, const Settings & settings);
diff --git a/src/DataTypes/Serializations/SerializationInfoSettings.h b/src/DataTypes/Serializations/SerializationInfoSettings.h
new file mode 100644
index 00000000000..26f2c344bea
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationInfoSettings.h
@@ -0,0 +1,14 @@
+#pragma once
+
+namespace DB
+{
+
+struct SerializationInfoSettings
+{
+    const double ratio_of_defaults_for_sparse = 1.0;
+    const bool choose_kind = false;
+
+    bool isAlwaysDefault() const { return ratio_of_defaults_for_sparse >= 1.0; }
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.cpp b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
index 3e1cbdb00f5..9efe05042ed 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.cpp
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.cpp
@@ -700,6 +700,11 @@ void SerializationLowCardinality::deserializeTextEscaped(IColumn & column, ReadB
     deserializeImpl(column, &ISerialization::deserializeTextEscaped, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeTextEscaped, istr, settings);
+}
+
 void SerializationLowCardinality::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeImpl(column, row_num, &ISerialization::serializeTextQuoted, ostr, settings);
@@ -710,11 +715,21 @@ void SerializationLowCardinality::deserializeTextQuoted(IColumn & column, ReadBu
     deserializeImpl(column, &ISerialization::deserializeTextQuoted, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeTextQuoted, istr, settings);
+}
+
 void SerializationLowCardinality::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
     deserializeImpl(column, &ISerialization::deserializeWholeText, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeWholeText, istr, settings);
+}
+
 void SerializationLowCardinality::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeImpl(column, row_num, &ISerialization::serializeTextCSV, ostr, settings);
@@ -725,6 +740,11 @@ void SerializationLowCardinality::deserializeTextCSV(IColumn & column, ReadBuffe
     deserializeImpl(column, &ISerialization::deserializeTextCSV, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeTextCSV, istr, settings);
+}
+
 void SerializationLowCardinality::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeImpl(column, row_num, &ISerialization::serializeText, ostr, settings);
@@ -740,6 +760,11 @@ void SerializationLowCardinality::deserializeTextJSON(IColumn & column, ReadBuff
     deserializeImpl(column, &ISerialization::deserializeTextJSON, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeTextJSON, istr, settings);
+}
+
 void SerializationLowCardinality::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeImpl(column, row_num, &ISerialization::serializeTextXML, ostr, settings);
@@ -750,6 +775,11 @@ void SerializationLowCardinality::deserializeTextRaw(IColumn & column, ReadBuffe
     deserializeImpl(column, &ISerialization::deserializeTextRaw, istr, settings);
 }
 
+bool SerializationLowCardinality::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return tryDeserializeImpl(column, &ISerialization::tryDeserializeTextRaw, istr, settings);
+}
+
 void SerializationLowCardinality::serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeImpl(column, row_num, &ISerialization::serializeTextRaw, ostr, settings);
@@ -769,7 +799,7 @@ template <typename... Params, typename... Args>
 void SerializationLowCardinality::deserializeImpl(
     IColumn & column, SerializationLowCardinality::DeserializeFunctionPtr<Params...> func, Args &&... args) const
 {
-    auto & low_cardinality_column= getColumnLowCardinality(column);
+    auto & low_cardinality_column = getColumnLowCardinality(column);
     auto temp_column = low_cardinality_column.getDictionary().getNestedColumn()->cloneEmpty();
 
     auto serialization = dictionary_type->getDefaultSerialization();
@@ -778,4 +808,19 @@ void SerializationLowCardinality::deserializeImpl(
     low_cardinality_column.insertFromFullColumn(*temp_column, 0);
 }
 
+template <typename... Params, typename... Args>
+bool SerializationLowCardinality::tryDeserializeImpl(
+    IColumn & column, SerializationLowCardinality::TryDeserializeFunctionPtr<Params...> func, Args &&... args) const
+{
+    auto & low_cardinality_column = getColumnLowCardinality(column);
+    auto temp_column = low_cardinality_column.getDictionary().getNestedColumn()->cloneEmpty();
+
+    auto serialization = dictionary_type->getDefaultSerialization();
+    if (!(serialization.get()->*func)(*temp_column, std::forward<Args>(args)...))
+        return false;
+
+    low_cardinality_column.insertFromFullColumn(*temp_column, 0);
+    return true;
+}
+
 }
diff --git a/src/DataTypes/Serializations/SerializationLowCardinality.h b/src/DataTypes/Serializations/SerializationLowCardinality.h
index 5f56bcf8108..d2c3a95c702 100644
--- a/src/DataTypes/Serializations/SerializationLowCardinality.h
+++ b/src/DataTypes/Serializations/SerializationLowCardinality.h
@@ -55,16 +55,22 @@ public:
     void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeText(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 deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
 
 private:
@@ -79,6 +85,12 @@ private:
 
     template <typename ... Params, typename... Args>
     void deserializeImpl(IColumn & column, DeserializeFunctionPtr<Params...> func, Args &&... args) const;
+
+    template <typename ... Params>
+    using TryDeserializeFunctionPtr = bool (ISerialization::*)(IColumn &, Params ...) const;
+
+    template <typename ... Params, typename... Args>
+    bool tryDeserializeImpl(IColumn & column, TryDeserializeFunctionPtr<Params...> func, Args &&... args) const;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationMap.cpp b/src/DataTypes/Serializations/SerializationMap.cpp
index 7588e630689..7b6f87baf2e 100644
--- a/src/DataTypes/Serializations/SerializationMap.cpp
+++ b/src/DataTypes/Serializations/SerializationMap.cpp
@@ -115,9 +115,11 @@ void SerializationMap::serializeTextImpl(
     writeChar('}', ostr);
 }
 
-template <typename Reader>
-void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const
+template <typename ReturnType, typename Reader>
+ReturnType SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     auto & column_map = assert_cast<ColumnMap &>(column);
 
     auto & nested_array = column_map.getNestedColumn();
@@ -128,7 +130,21 @@ void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr,
     auto & value_column = nested_tuple.getColumn(1);
 
     size_t size = 0;
-    assertChar('{', istr);
+    if constexpr (throw_exception)
+        assertChar('{', istr);
+    else if (!checkChar('{', istr))
+        return ReturnType(false);
+
+    auto on_error_no_throw = [&]()
+    {
+        if (size)
+        {
+            nested_tuple.getColumnPtr(0) = key_column.cut(0, offsets.back());
+            nested_tuple.getColumnPtr(1) = value_column.cut(0, offsets.back());
+        }
+
+        return ReturnType(false);
+    };
 
     try
     {
@@ -138,9 +154,15 @@ void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr,
             if (!first)
             {
                 if (*istr.position() == ',')
+                {
                     ++istr.position();
+                }
                 else
-                    throw Exception(ErrorCodes::CANNOT_READ_MAP_FROM_TEXT, "Cannot read Map from text");
+                {
+                    if constexpr (throw_exception)
+                        throw Exception(ErrorCodes::CANNOT_READ_MAP_FROM_TEXT, "Cannot read Map from text");
+                    return on_error_no_throw();
+                }
             }
 
             first = false;
@@ -150,19 +172,32 @@ void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr,
             if (*istr.position() == '}')
                 break;
 
-            reader(istr, key, key_column);
+            if constexpr (throw_exception)
+                reader(istr, key, key_column);
+            else if (!reader(istr, key, key_column))
+                return on_error_no_throw();
+
             ++size;
 
             skipWhitespaceIfAny(istr);
-            assertChar(':', istr);
+            if constexpr (throw_exception)
+                assertChar(':', istr);
+            else if (!checkChar(':', istr))
+                return on_error_no_throw();
             skipWhitespaceIfAny(istr);
 
-            reader(istr, value, value_column);
+            if constexpr (throw_exception)
+                reader(istr, value, value_column);
+            else if (!reader(istr, value, value_column))
+                return on_error_no_throw();
 
             skipWhitespaceIfAny(istr);
         }
 
-        assertChar('}', istr);
+        if constexpr (throw_exception)
+            assertChar('}', istr);
+        else if (!checkChar('}', istr))
+            return on_error_no_throw();
     }
     catch (...)
     {
@@ -171,10 +206,14 @@ void SerializationMap::deserializeTextImpl(IColumn & column, ReadBuffer & istr,
             nested_tuple.getColumnPtr(0) = key_column.cut(0, offsets.back());
             nested_tuple.getColumnPtr(1) = value_column.cut(0, offsets.back());
         }
-        throw;
+
+        if constexpr (throw_exception)
+            throw;
+        return ReturnType(false);
     }
 
     offsets.push_back(offsets.back() + size);
+    return ReturnType(true);
 }
 
 void SerializationMap::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -192,8 +231,8 @@ void SerializationMap::deserializeText(IColumn & column, ReadBuffer & istr, cons
     deserializeTextImpl(column, istr,
         [&settings](ReadBuffer & buf, const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
         {
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextQuotedImpl(subcolumn, buf, settings, subcolumn_serialization);
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(subcolumn))
+                SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(subcolumn, buf, settings, subcolumn_serialization);
             else
                 subcolumn_serialization->deserializeTextQuoted(subcolumn, buf, settings);
         });
@@ -202,6 +241,28 @@ void SerializationMap::deserializeText(IColumn & column, ReadBuffer & istr, cons
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "Map");
 }
 
+bool SerializationMap::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const
+{
+    auto reader = [&settings](ReadBuffer & buf, const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
+    {
+        if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(subcolumn))
+            return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextQuoted(subcolumn, buf, settings, subcolumn_serialization);
+        return subcolumn_serialization->tryDeserializeTextQuoted(subcolumn, buf, settings);
+    };
+
+    auto ok = deserializeTextImpl<bool>(column, istr, reader);
+    if (!ok)
+        return false;
+
+    if (whole && !istr.eof())
+    {
+        column.popBack(1);
+        return false;
+    }
+
+    return true;
+}
+
 void SerializationMap::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     serializeTextImpl(column, row_num, ostr,
@@ -260,13 +321,25 @@ void SerializationMap::deserializeTextJSON(IColumn & column, ReadBuffer & istr,
     deserializeTextImpl(column, istr,
         [&settings](ReadBuffer & buf, const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
         {
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextJSONImpl(subcolumn, buf, settings, subcolumn_serialization);
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(subcolumn))
+                SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(subcolumn, buf, settings, subcolumn_serialization);
             else
                 subcolumn_serialization->deserializeTextJSON(subcolumn, buf, settings);
         });
 }
 
+bool SerializationMap::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    auto reader = [&settings](ReadBuffer & buf, const SerializationPtr & subcolumn_serialization, IColumn & subcolumn)
+    {
+        if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(subcolumn))
+            return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextJSON(subcolumn, buf, settings, subcolumn_serialization);
+        return subcolumn_serialization->tryDeserializeTextJSON(subcolumn, buf, settings);
+    };
+
+    return deserializeTextImpl<bool>(column, istr, reader);
+}
+
 void SerializationMap::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     const auto & column_map = assert_cast<const ColumnMap &>(column);
@@ -308,6 +381,15 @@ void SerializationMap::deserializeTextCSV(IColumn & column, ReadBuffer & istr, c
     deserializeText(column, rb, settings, true);
 }
 
+bool SerializationMap::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    if (!tryReadCSV(s, istr, settings.csv))
+        return false;
+    ReadBufferFromString rb(s);
+    return tryDeserializeText(column, rb, settings, true);
+}
+
 void SerializationMap::enumerateStreams(
     EnumerateStreamsSettings & settings,
     const StreamCallback & callback,
diff --git a/src/DataTypes/Serializations/SerializationMap.h b/src/DataTypes/Serializations/SerializationMap.h
index f32c656757d..3e27ef1b04a 100644
--- a/src/DataTypes/Serializations/SerializationMap.h
+++ b/src/DataTypes/Serializations/SerializationMap.h
@@ -24,13 +24,16 @@ public:
     void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
+    bool tryDeserializeText(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;
+    bool tryDeserializeTextJSON(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;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void enumerateStreams(
         EnumerateStreamsSettings & settings,
@@ -68,8 +71,8 @@ private:
     template <typename KeyWriter, typename ValueWriter>
     void serializeTextImpl(const IColumn & column, size_t row_num, WriteBuffer & ostr, KeyWriter && key_writer, ValueWriter && value_writer) const;
 
-    template <typename Reader>
-    void deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const;
+    template <typename ReturnType = void, typename Reader>
+    ReturnType deserializeTextImpl(IColumn & column, ReadBuffer & istr, Reader && reader) const;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationNamed.cpp b/src/DataTypes/Serializations/SerializationNamed.cpp
index ca60948ce68..2792827e690 100644
--- a/src/DataTypes/Serializations/SerializationNamed.cpp
+++ b/src/DataTypes/Serializations/SerializationNamed.cpp
@@ -3,6 +3,23 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+SerializationNamed::SerializationNamed(
+    const SerializationPtr & nested_,
+    const String & name_,
+    SubstreamType substream_type_)
+    : SerializationWrapper(nested_)
+    , name(name_)
+    , substream_type(substream_type_)
+{
+    if (!ISerialization::Substream::named_types.contains(substream_type))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "SerializationNamed doesn't support substream type {}", substream_type);
+}
+
 void SerializationNamed::enumerateStreams(
     EnumerateStreamsSettings & settings,
     const StreamCallback & callback,
@@ -10,7 +27,7 @@ void SerializationNamed::enumerateStreams(
 {
     addToPath(settings.path);
     settings.path.back().data = data;
-    settings.path.back().creator = std::make_shared<SubcolumnCreator>(name, escape_delimiter);
+    settings.path.back().creator = std::make_shared<SubcolumnCreator>(name, substream_type);
 
     nested_serialization->enumerateStreams(settings, callback, data);
     settings.path.pop_back();
@@ -70,9 +87,8 @@ void SerializationNamed::deserializeBinaryBulkWithMultipleStreams(
 
 void SerializationNamed::addToPath(SubstreamPath & path) const
 {
-    path.push_back(Substream::TupleElement);
-    path.back().tuple_element_name = name;
-    path.back().escape_tuple_delimiter = escape_delimiter;
+    path.push_back(substream_type);
+    path.back().name_of_substream = name;
 }
 
 }
diff --git a/src/DataTypes/Serializations/SerializationNamed.h b/src/DataTypes/Serializations/SerializationNamed.h
index 52bbb039442..0633ba2ea6f 100644
--- a/src/DataTypes/Serializations/SerializationNamed.h
+++ b/src/DataTypes/Serializations/SerializationNamed.h
@@ -1,5 +1,4 @@
 #pragma once
-
 #include <DataTypes/Serializations/SerializationWrapper.h>
 
 namespace DB
@@ -14,14 +13,10 @@ class SerializationNamed final : public SerializationWrapper
 {
 private:
     String name;
-    bool escape_delimiter;
+    SubstreamType substream_type;
 
 public:
-    SerializationNamed(const SerializationPtr & nested_, const String & name_, bool escape_delimiter_ = true)
-        : SerializationWrapper(nested_)
-        , name(name_), escape_delimiter(escape_delimiter_)
-    {
-    }
+    SerializationNamed(const SerializationPtr & nested_, const String & name_, SubstreamType substream_type_);
 
     const String & getElementName() const { return name; }
 
@@ -61,16 +56,18 @@ private:
     struct SubcolumnCreator : public ISubcolumnCreator
     {
         const String name;
-        const bool escape_delimiter;
+        SubstreamType substream_type;
 
-        SubcolumnCreator(const String & name_, bool escape_delimiter_)
-            : name(name_), escape_delimiter(escape_delimiter_) {}
+        SubcolumnCreator(const String & name_, SubstreamType substream_type_)
+            : name(name_), substream_type(substream_type_)
+        {
+        }
 
         DataTypePtr create(const DataTypePtr & prev) const override { return prev; }
         ColumnPtr create(const ColumnPtr & prev) const override { return prev; }
         SerializationPtr create(const SerializationPtr & prev) const override
         {
-            return std::make_shared<SerializationNamed>(prev, name, escape_delimiter);
+            return std::make_shared<SerializationNamed>(prev, name, substream_type);
         }
     };
 
diff --git a/src/DataTypes/Serializations/SerializationNothing.h b/src/DataTypes/Serializations/SerializationNothing.h
index 02974d1ca76..7d1fff55b01 100644
--- a/src/DataTypes/Serializations/SerializationNothing.h
+++ b/src/DataTypes/Serializations/SerializationNothing.h
@@ -25,6 +25,7 @@ public:
     void deserializeBinary(IColumn &, ReadBuffer &, const FormatSettings &) const override                          { throwNoSerialization(); }
     void serializeText(const IColumn &, size_t, WriteBuffer &, const FormatSettings &) const override { throwNoSerialization(); }
     void deserializeText(IColumn &, ReadBuffer &, const FormatSettings &, bool) const override    { throwNoSerialization(); }
+    bool tryDeserializeText(IColumn &, ReadBuffer &, const FormatSettings &, bool) const override    { throwNoSerialization(); }
 
     /// These methods read and write zero bytes just to allow to figure out size of column.
     void serializeBinaryBulk(const IColumn & column, WriteBuffer & ostr, size_t offset, size_t limit) const override;
diff --git a/src/DataTypes/Serializations/SerializationNullable.cpp b/src/DataTypes/Serializations/SerializationNullable.cpp
index d9efc6fff10..4d31451f92d 100644
--- a/src/DataTypes/Serializations/SerializationNullable.cpp
+++ b/src/DataTypes/Serializations/SerializationNullable.cpp
@@ -45,7 +45,9 @@ void SerializationNullable::enumerateStreams(
     const auto * type_nullable = data.type ? &assert_cast<const DataTypeNullable &>(*data.type) : nullptr;
     const auto * column_nullable = data.column ? &assert_cast<const ColumnNullable &>(*data.column) : nullptr;
 
-    auto null_map_serialization = std::make_shared<SerializationNamed>(std::make_shared<SerializationNumber<UInt8>>(), "null", false);
+    auto null_map_serialization = std::make_shared<SerializationNamed>(
+        std::make_shared<SerializationNumber<UInt8>>(),
+        "null", SubstreamType::NamedNullMap);
 
     settings.path.push_back(Substream::NullMap);
     auto null_map_data = SubstreamData(null_map_serialization)
@@ -187,55 +189,59 @@ void SerializationNullable::serializeBinary(const IColumn & column, size_t row_n
         nested->serializeBinary(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-/// Deserialize value into ColumnNullable.
-/// We need to insert both to nested column and to null byte map, or, in case of exception, to not insert at all.
-template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested>
-requires std::same_as<ReturnType, void>
-static ReturnType
-safeDeserialize(IColumn & column, const ISerialization &, CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
+template <typename ReturnType>
+ReturnType safeAppendToNullMap(ColumnNullable & column, bool is_null)
 {
-    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
-
-    if (check_for_null())
+    try
     {
-        col.insertDefault();
+        column.getNullMapData().push_back(is_null);
     }
-    else
+    catch (...)
     {
-        deserialize_nested(col.getNestedColumn());
-
-        try
-        {
-            col.getNullMapData().push_back(0);
-        }
-        catch (...)
-        {
-            col.getNestedColumn().popBack(1);
+        column.getNestedColumn().popBack(1);
+        if constexpr (std::is_same_v<ReturnType, void>)
             throw;
-        }
+        return ReturnType(false);
     }
+
+    return ReturnType(true);
 }
 
-/// Deserialize value into non-nullable column. In case of NULL, insert default value and return false.
+/// Deserialize value into non-nullable column. In case of NULL, insert default and set is_null to true.
+/// If ReturnType is bool, return true if parsing was successful and false in case of any error.
 template <typename ReturnType = void, typename CheckForNull, typename DeserializeNested>
-requires std::same_as<ReturnType, bool>
-static ReturnType
-safeDeserialize(IColumn & column, const ISerialization &, CheckForNull && check_for_null, DeserializeNested && deserialize_nested)
+static ReturnType deserializeImpl(IColumn & column, ReadBuffer & buf, CheckForNull && check_for_null, DeserializeNested && deserialize_nested, bool & is_null)
 {
-    bool insert_default = check_for_null();
-    if (insert_default)
+    is_null = check_for_null(buf);
+    if (is_null)
+    {
         column.insertDefault();
+    }
     else
-        deserialize_nested(column);
-    return !insert_default;
+    {
+        if constexpr (std::is_same_v<ReturnType, void>)
+            deserialize_nested(column, buf);
+        else if (!deserialize_nested(column, buf))
+            return ReturnType(false);
+    }
+
+    return ReturnType(true);
 }
 
 
 void SerializationNullable::deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    safeDeserialize(column, *nested,
-        [&istr] { bool is_null = false; readBinary(is_null, istr); return is_null; },
-        [this, &istr, settings] (IColumn & nested_column) { nested->deserializeBinary(nested_column, istr, settings); });
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    auto check_for_null = [](ReadBuffer & buf)
+    {
+        bool is_null_ = false;
+        readBinary(is_null_, buf);
+        return is_null_;
+    };
+    auto deserialize_nested = [this, &settings] (IColumn & nested_column, ReadBuffer & buf) { nested->deserializeBinary(nested_column, buf, settings); };
+    deserializeImpl(col.getNestedColumn(), istr, check_for_null, deserialize_nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
 }
 
 
@@ -244,20 +250,19 @@ void SerializationNullable::serializeTextEscaped(const IColumn & column, size_t
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeString(settings.tsv.null_representation, ostr);
+        serializeNullEscaped(ostr, settings);
     else
         nested->serializeTextEscaped(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-
-void SerializationNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+void SerializationNullable::serializeNullEscaped(DB::WriteBuffer & ostr, const DB::FormatSettings & settings)
 {
-    deserializeTextEscapedImpl<void>(column, istr, settings, nested);
+    writeString(settings.tsv.null_representation, ostr);
 }
 
-void SerializationNullable::deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+bool SerializationNullable::tryDeserializeNullEscaped(DB::ReadBuffer & istr, const DB::FormatSettings & settings)
 {
-    deserializeTextRawImpl<void>(column, istr, settings, nested);
+    return checkString(settings.tsv.null_representation, istr);
 }
 
 void SerializationNullable::serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -265,72 +270,73 @@ void SerializationNullable::serializeTextRaw(const IColumn & column, size_t row_
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeString(settings.tsv.null_representation, ostr);
+        serializeNullRaw(ostr, settings);
     else
         nested->serializeTextRaw(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-template<typename ReturnType>
-ReturnType SerializationNullable::deserializeTextRawImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested)
+void SerializationNullable::serializeNullRaw(DB::WriteBuffer & ostr, const DB::FormatSettings & settings)
 {
-    return deserializeTextEscapedAndRawImpl<ReturnType, false>(column, istr, settings, nested);
+    writeString(settings.tsv.null_representation, ostr);
 }
 
-template<typename ReturnType>
-ReturnType SerializationNullable::deserializeTextEscapedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                             const SerializationPtr & nested)
+bool SerializationNullable::tryDeserializeNullRaw(DB::ReadBuffer & istr, const DB::FormatSettings & settings)
 {
-    return deserializeTextEscapedAndRawImpl<ReturnType, true>(column, istr, settings, nested);
+    return checkString(settings.tsv.null_representation, istr);
 }
 
 template<typename ReturnType, bool escaped>
-ReturnType SerializationNullable::deserializeTextEscapedAndRawImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                    const SerializationPtr & nested_serialization)
+ReturnType deserializeTextEscapedAndRawImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization, bool & is_null)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     const String & null_representation = settings.tsv.null_representation;
+    auto deserialize_nested = [&nested_serialization, &settings] (IColumn & nested_column, ReadBuffer & buf_)
+    {
+        if constexpr (throw_exception)
+        {
+            if constexpr (escaped)
+                nested_serialization->deserializeTextEscaped(nested_column, buf_, settings);
+            else
+                nested_serialization->deserializeTextRaw(nested_column, buf_, settings);
+        }
+        else
+        {
+            if constexpr (escaped)
+                return nested_serialization->tryDeserializeTextEscaped(nested_column, buf_, settings);
+            else
+                return nested_serialization->tryDeserializeTextRaw(nested_column, buf_, settings);
+        }
+    };
 
     /// Some data types can deserialize absence of data (e.g. empty string), so eof is ok.
     if (istr.eof() || (!null_representation.empty() && *istr.position() != null_representation[0]))
     {
         /// This is not null, surely.
-        return safeDeserialize<ReturnType>(column, *nested_serialization,
-            [] { return false; },
-            [&nested_serialization, &istr, &settings] (IColumn & nested_column)
-            {
-                if constexpr (escaped)
-                    nested_serialization->deserializeTextEscaped(nested_column, istr, settings);
-                else
-                    nested_serialization->deserializeTextRaw(nested_column, istr, settings);
-            });
+        return deserializeImpl<ReturnType>(column, istr, [](ReadBuffer &){ return false; }, deserialize_nested, is_null);
     }
 
     /// Check if we have enough data in buffer to check if it's a null.
     if (istr.available() > null_representation.size())
     {
-        auto check_for_null = [&istr, &null_representation]()
+        auto check_for_null = [&null_representation](ReadBuffer & buf)
         {
-            auto * pos = istr.position();
-            if (checkString(null_representation, istr) && (*istr.position() == '\t' || *istr.position() == '\n'))
+            auto * pos = buf.position();
+            if (checkString(null_representation, buf) && (*buf.position() == '\t' || *buf.position() == '\n'))
                 return true;
-            istr.position() = pos;
+            buf.position() = pos;
             return false;
         };
-        auto deserialize_nested = [&nested_serialization, &settings, &istr] (IColumn & nested_column)
-        {
-            if constexpr (escaped)
-                nested_serialization->deserializeTextEscaped(nested_column, istr, settings);
-            else
-                nested_serialization->deserializeTextRaw(nested_column, istr, settings);
-        };
-        return safeDeserialize<ReturnType>(column, *nested_serialization, check_for_null, deserialize_nested);
+        return deserializeImpl<ReturnType>(column, istr, check_for_null, deserialize_nested, is_null);
     }
 
     /// We don't have enough data in buffer to check if it's a null.
     /// Use PeekableReadBuffer to make a checkpoint before checking null
     /// representation and rollback if check was failed.
-    PeekableReadBuffer buf(istr, true);
-    auto check_for_null = [&buf, &null_representation]()
+    PeekableReadBuffer peekable_buf(istr, true);
+    auto check_for_null = [&null_representation](ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         buf.setCheckpoint();
         SCOPE_EXIT(buf.dropCheckpoint());
         if (checkString(null_representation, buf) && (buf.eof() || *buf.position() == '\t' || *buf.position() == '\n'))
@@ -340,16 +346,18 @@ ReturnType SerializationNullable::deserializeTextEscapedAndRawImpl(IColumn & col
         return false;
     };
 
-    auto deserialize_nested = [&nested_serialization, &settings, &buf, &null_representation, &istr] (IColumn & nested_column)
+    auto deserialize_nested_with_check = [&deserialize_nested, &nested_serialization, &settings, &null_representation, &istr] (IColumn & nested_column, ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         auto * pos = buf.position();
-        if constexpr (escaped)
-            nested_serialization->deserializeTextEscaped(nested_column, buf, settings);
-        else
-            nested_serialization->deserializeTextRaw(nested_column, buf, settings);
+        if constexpr (throw_exception)
+            deserialize_nested(nested_column, buf);
+        else if (!deserialize_nested(nested_column, buf))
+            return ReturnType(false);
+
         /// Check that we don't have any unread data in PeekableReadBuffer own memory.
         if (likely(!buf.hasUnreadData()))
-            return;
+            return ReturnType(true);
 
         /// We have some unread data in PeekableReadBuffer own memory.
         /// It can happen only if there is a string instead of a number
@@ -358,6 +366,9 @@ ReturnType SerializationNullable::deserializeTextEscapedAndRawImpl(IColumn & col
         /// We also should delete incorrectly deserialized value from nested column.
         nested_column.popBack(1);
 
+        if constexpr (!throw_exception)
+            return ReturnType(false);
+
         if (null_representation.find('\t') != std::string::npos || null_representation.find('\n') != std::string::npos)
             throw DB::Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "TSV custom null representation "
                                        "containing '\\t' or '\\n' may not work correctly for large input.");
@@ -375,7 +386,63 @@ ReturnType SerializationNullable::deserializeTextEscapedAndRawImpl(IColumn & col
                                    istr.count(), std::string(pos, buf.position() - pos), parsed_value.str());
     };
 
-    return safeDeserialize<ReturnType>(column, *nested_serialization, check_for_null, deserialize_nested);
+    return deserializeImpl<ReturnType>(column, peekable_buf, check_for_null, deserialize_nested_with_check, is_null);
+}
+
+void SerializationNullable::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeTextEscapedAndRawImpl<void, true>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeTextEscapedAndRawImpl<bool, true>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedTextEscaped(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeTextEscapedAndRawImpl<void, true>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextEscaped(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeTextEscapedAndRawImpl<bool, true>(nested_column, istr, settings, nested_serialization, is_null);
+}
+
+void SerializationNullable::deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeTextEscapedAndRawImpl<void, false>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeTextEscapedAndRawImpl<bool, false>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedTextRaw(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeTextEscapedAndRawImpl<void, false>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextRaw(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeTextEscapedAndRawImpl<bool, false>(nested_column, istr, settings, nested_serialization, is_null);
 }
 
 void SerializationNullable::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -383,45 +450,51 @@ void SerializationNullable::serializeTextQuoted(const IColumn & column, size_t r
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeCString("NULL", ostr);
+        serializeNullQuoted(ostr);
     else
         nested->serializeTextQuoted(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-
-void SerializationNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+void SerializationNullable::serializeNullQuoted(DB::WriteBuffer & ostr)
 {
-    deserializeTextQuotedImpl<void>(column, istr, settings, nested);
+    writeCString("NULL", ostr);
+}
+
+bool SerializationNullable::tryDeserializeNullQuoted(DB::ReadBuffer & istr)
+{
+    return checkStringCaseInsensitive("NULL", istr);
 }
 
 template<typename ReturnType>
-ReturnType SerializationNullable::deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                   const SerializationPtr & nested)
+ReturnType deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested, bool & is_null)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    auto deserialize_nested = [&nested, &settings] (IColumn & nested_column, ReadBuffer & buf)
+    {
+        if constexpr (!throw_exception)
+            return nested->tryDeserializeTextQuoted(nested_column, buf, settings);
+        nested->deserializeTextQuoted(nested_column, buf, settings);
+    };
+
     if (istr.eof() || (*istr.position() != 'N' && *istr.position() != 'n'))
     {
         /// This is not null, surely.
-        return safeDeserialize<ReturnType>(column, *nested,
-            [] { return false; },
-            [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeTextQuoted(nested_column, istr, settings); });
+        return deserializeImpl<ReturnType>(column, istr, [](ReadBuffer &){ return false; }, deserialize_nested, is_null);
     }
 
     /// Check if we have enough data in buffer to check if it's a null.
     if (istr.available() >= 4)
     {
-        auto check_for_null = [&istr]()
+        auto check_for_null = [](ReadBuffer & buf)
         {
-            auto * pos = istr.position();
-            if (checkStringCaseInsensitive("NULL", istr))
+            auto * pos = buf.position();
+            if (checkStringCaseInsensitive("NULL", buf))
                 return true;
-            istr.position() = pos;
+            buf.position() = pos;
             return false;
         };
-        auto deserialize_nested = [&nested, &settings, &istr] (IColumn & nested_column)
-        {
-            nested->deserializeTextQuoted(nested_column, istr, settings);
-        };
-        return safeDeserialize<ReturnType>(column, *nested, check_for_null, deserialize_nested);
+        return deserializeImpl<ReturnType>(column, istr, check_for_null, deserialize_nested, is_null);
     }
 
     /// We don't have enough data in buffer to check if it's a NULL
@@ -429,9 +502,10 @@ ReturnType SerializationNullable::deserializeTextQuotedImpl(IColumn & column, Re
     /// to differentiate for example NULL and NaN for float)
     /// Use PeekableReadBuffer to make a checkpoint before checking
     /// null and rollback if the check was failed.
-    PeekableReadBuffer buf(istr, true);
-    auto check_for_null = [&buf]()
+    PeekableReadBuffer peekable_buf(istr, true);
+    auto check_for_null = [](ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         buf.setCheckpoint();
         SCOPE_EXIT(buf.dropCheckpoint());
         if (checkStringCaseInsensitive("NULL", buf))
@@ -441,39 +515,74 @@ ReturnType SerializationNullable::deserializeTextQuotedImpl(IColumn & column, Re
         return false;
     };
 
-    auto deserialize_nested = [&nested, &settings, &buf] (IColumn & nested_column)
+    auto deserialize_nested_with_check = [&deserialize_nested] (IColumn & nested_column, ReadBuffer & buf_)
     {
-        nested->deserializeTextQuoted(nested_column, buf, settings);
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
+
+        if constexpr (throw_exception)
+            deserialize_nested(nested_column, buf);
+        else if (!deserialize_nested(nested_column, buf))
+            return false;
+
         /// Check that we don't have any unread data in PeekableReadBuffer own memory.
         if (likely(!buf.hasUnreadData()))
-            return;
+            return ReturnType(true);
 
         /// 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);
+
+        if constexpr (!throw_exception)
+            return ReturnType(false);
+
         throw DB::Exception(
             ErrorCodes::CANNOT_READ_ALL_DATA,
             "Error while parsing Nullable: got an unquoted string {} instead of a number",
             String(buf.position(), std::min(10ul, buf.available())));
     };
 
-    return safeDeserialize<ReturnType>(column, *nested, check_for_null, deserialize_nested);
+    return deserializeImpl<ReturnType>(column, peekable_buf, check_for_null, deserialize_nested_with_check, is_null);
 }
 
 
-void SerializationNullable::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+void SerializationNullable::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    deserializeWholeTextImpl<void>(column, istr, settings, nested);
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeTextQuotedImpl<void>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeTextQuotedImpl<bool>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeTextQuotedImpl<void>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextQuoted(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeTextQuotedImpl<bool>(nested_column, istr, settings, nested_serialization, is_null);
 }
 
 template <typename ReturnType>
-ReturnType SerializationNullable::deserializeWholeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                  const SerializationPtr & nested)
+ReturnType deserializeWholeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested, bool & is_null)
 {
-    PeekableReadBuffer buf(istr, true);
-    auto check_for_null = [&buf]()
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    PeekableReadBuffer peekable_buf(istr, true);
+    auto check_for_null = [](ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         buf.setCheckpoint();
         SCOPE_EXIT(buf.dropCheckpoint());
 
@@ -488,15 +597,46 @@ ReturnType SerializationNullable::deserializeWholeTextImpl(IColumn & column, Rea
         return false;
     };
 
-    auto deserialize_nested = [&nested, &settings, &buf] (IColumn & nested_column)
+    auto deserialize_nested = [&nested, &settings] (IColumn & nested_column, ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
+        if constexpr (!throw_exception)
+            return nested->tryDeserializeWholeText(nested_column, buf, settings);
+
         nested->deserializeWholeText(nested_column, buf, settings);
         assert(!buf.hasUnreadData());
     };
 
-    return safeDeserialize<ReturnType>(column, *nested, check_for_null, deserialize_nested);
+    return deserializeImpl<ReturnType>(column, peekable_buf, check_for_null, deserialize_nested, is_null);
 }
 
+void SerializationNullable::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeWholeTextImpl<void>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeWholeTextImpl<bool>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedWholeText(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeWholeTextImpl<void>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedWholeText(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeWholeTextImpl<bool>(nested_column, istr, settings, nested_serialization, is_null);
+}
 
 void SerializationNullable::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -508,48 +648,56 @@ void SerializationNullable::serializeTextCSV(const IColumn & column, size_t row_
         nested->serializeTextCSV(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-void SerializationNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+void SerializationNullable::serializeNullCSV(DB::WriteBuffer & ostr, const DB::FormatSettings & settings)
 {
-    deserializeTextCSVImpl<void>(column, istr, settings, nested);
+    writeString(settings.csv.null_representation, ostr);
+}
+
+bool SerializationNullable::tryDeserializeNullCSV(DB::ReadBuffer & istr, const DB::FormatSettings & settings)
+{
+    return checkString(settings.csv.null_representation, istr);
 }
 
 template<typename ReturnType>
-ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                         const SerializationPtr & nested_serialization)
+ReturnType deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization, bool & is_null)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    auto deserialize_nested = [&nested_serialization, &settings] (IColumn & nested_column, ReadBuffer & buf)
+    {
+        if constexpr (!throw_exception)
+            return nested_serialization->tryDeserializeTextCSV(nested_column, buf, settings);
+        nested_serialization->deserializeTextCSV(nested_column, buf, settings);
+    };
+
     const String & null_representation = settings.csv.null_representation;
     if (istr.eof() || (!null_representation.empty() && *istr.position() != null_representation[0]))
     {
         /// This is not null, surely.
-        return safeDeserialize<ReturnType>(column, *nested_serialization,
-            [] { return false; },
-            [&nested_serialization, &istr, &settings] (IColumn & nested_column) { nested_serialization->deserializeTextCSV(nested_column, istr, settings); });
+        return deserializeImpl<ReturnType>(column, istr, [](ReadBuffer &){ return false; }, deserialize_nested, is_null);
     }
 
     /// Check if we have enough data in buffer to check if it's a null.
     if (settings.csv.custom_delimiter.empty() && istr.available() > null_representation.size())
     {
-        auto check_for_null = [&istr, &null_representation, &settings]()
+        auto check_for_null = [&null_representation, &settings](ReadBuffer & buf)
         {
-            auto * pos = istr.position();
-            if (checkString(null_representation, istr) && (*istr.position() == settings.csv.delimiter || *istr.position() == '\r' || *istr.position() == '\n'))
+            auto * pos = buf.position();
+            if (checkString(null_representation, buf) && (*buf.position() == settings.csv.delimiter || *buf.position() == '\r' || *buf.position() == '\n'))
                 return true;
-            istr.position() = pos;
+            buf.position() = pos;
             return false;
         };
-        auto deserialize_nested = [&nested_serialization, &settings, &istr] (IColumn & nested_column)
-        {
-            nested_serialization->deserializeTextCSV(nested_column, istr, settings);
-        };
-        return safeDeserialize<ReturnType>(column, *nested_serialization, check_for_null, deserialize_nested);
+        return deserializeImpl<ReturnType>(column, istr, check_for_null, deserialize_nested, is_null);
     }
 
     /// We don't have enough data in buffer to check if it's a null.
     /// Use PeekableReadBuffer to make a checkpoint before checking null
     /// representation and rollback if the check was failed.
-    PeekableReadBuffer buf(istr, true);
-    auto check_for_null = [&buf, &null_representation, &settings]()
+    PeekableReadBuffer peekable_buf(istr, true);
+    auto check_for_null = [&null_representation, &settings](ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         buf.setCheckpoint();
         SCOPE_EXIT(buf.dropCheckpoint());
         if (checkString(null_representation, buf))
@@ -572,13 +720,18 @@ ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadB
         return false;
     };
 
-    auto deserialize_nested = [&nested_serialization, &settings, &buf, &null_representation, &istr] (IColumn & nested_column)
+    auto deserialize_nested_with_check = [&deserialize_nested, &nested_serialization, &settings, &null_representation, &istr] (IColumn & nested_column, ReadBuffer & buf_)
     {
+        auto & buf = assert_cast<PeekableReadBuffer &>(buf_);
         auto * pos = buf.position();
-        nested_serialization->deserializeTextCSV(nested_column, buf, settings);
+        if constexpr (throw_exception)
+            deserialize_nested(nested_column, buf);
+        else if (!deserialize_nested(nested_column, buf))
+            return ReturnType(false);
+
         /// Check that we don't have any unread data in PeekableReadBuffer own memory.
         if (likely(!buf.hasUnreadData()))
-            return;
+            return ReturnType(true);
 
         /// We have some unread data in PeekableReadBuffer own memory.
         /// It can happen only if there is an unquoted string instead of a number
@@ -587,6 +740,9 @@ ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadB
         /// We also should delete incorrectly deserialized value from nested column.
         nested_column.popBack(1);
 
+        if constexpr (!throw_exception)
+            return ReturnType(false);
+
         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::Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "CSV custom null representation containing "
@@ -602,7 +758,35 @@ ReturnType SerializationNullable::deserializeTextCSVImpl(IColumn & column, ReadB
                                    istr.count(), std::string(pos, buf.position() - pos), parsed_value.str());
     };
 
-    return safeDeserialize<ReturnType>(column, *nested_serialization, check_for_null, deserialize_nested);
+    return deserializeImpl<ReturnType>(column, peekable_buf, check_for_null, deserialize_nested_with_check, is_null);
+}
+
+void SerializationNullable::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeTextCSVImpl<void>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeTextCSVImpl<bool>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedTextCSV(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeTextCSVImpl<void>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextCSV(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeTextCSVImpl<bool>(nested_column, istr, settings, nested_serialization, is_null);
 }
 
 void SerializationNullable::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -616,38 +800,86 @@ void SerializationNullable::serializeText(const IColumn & column, size_t row_num
     /// This assumes UTF-8 and proper font support. This is Ok, because Pretty formats are "presentational", not for data exchange.
 
     if (col.isNullAt(row_num))
-    {
-        if (settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8)
-            writeCString("ᴺ�ᴸᴸ", ostr);
-        else
-            writeCString("NULL", ostr);
-    }
+        serializeNullText(ostr, settings);
     else
         nested->serializeText(col.getNestedColumn(), row_num, ostr, settings);
 }
 
+void SerializationNullable::serializeNullText(DB::WriteBuffer & ostr, const DB::FormatSettings & settings)
+{
+    if (settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8)
+        writeCString("ᴺ�ᴸᴸ", ostr);
+    else
+        writeCString("NULL", ostr);
+}
+
+bool SerializationNullable::tryDeserializeNullText(DB::ReadBuffer & istr)
+{
+    if (checkCharCaseInsensitive('N', istr))
+        return checkStringCaseInsensitive("ULL", istr);
+    return checkStringCaseInsensitive("ᴺ�ᴸᴸ", istr);
+}
+
 void SerializationNullable::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     const ColumnNullable & col = assert_cast<const ColumnNullable &>(column);
 
     if (col.isNullAt(row_num))
-        writeCString("null", ostr);
+        serializeNullJSON(ostr);
     else
         nested->serializeTextJSON(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-void SerializationNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+void SerializationNullable::serializeNullJSON(DB::WriteBuffer & ostr)
 {
-    deserializeTextJSONImpl<void>(column, istr, settings, nested);
+    writeCString("null", ostr);
+}
+
+bool SerializationNullable::tryDeserializeNullJSON(DB::ReadBuffer & istr)
+{
+    return checkString("null", istr);
 }
 
 template<typename ReturnType>
-ReturnType SerializationNullable::deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings,
-                                                    const SerializationPtr & nested)
+ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested, bool & is_null)
 {
-    return safeDeserialize<ReturnType>(column, *nested,
-        [&istr] { return checkStringByFirstCharacterAndAssertTheRest("null", istr); },
-        [&nested, &istr, &settings] (IColumn & nested_column) { nested->deserializeTextJSON(nested_column, istr, settings); });
+    auto check_for_null = [](ReadBuffer & buf){ return checkStringByFirstCharacterAndAssertTheRest("null", buf); };
+    auto deserialize_nested = [&nested, &settings](IColumn & nested_column, ReadBuffer & buf)
+    {
+        if constexpr (std::is_same_v<ReturnType, bool>)
+            return nested->tryDeserializeTextJSON(nested_column, buf, settings);
+        nested->deserializeTextJSON(nested_column, buf, settings);
+    };
+
+    return deserializeImpl<ReturnType>(column, istr, check_for_null, deserialize_nested, is_null);
+}
+
+void SerializationNullable::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    deserializeTextJSONImpl<void>(col.getNestedColumn(), istr, settings, nested, is_null);
+    safeAppendToNullMap<void>(col, is_null);
+}
+
+bool SerializationNullable::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnNullable & col = assert_cast<ColumnNullable &>(column);
+    bool is_null;
+    return deserializeTextJSONImpl<bool>(col.getNestedColumn(), istr, settings, nested, is_null) && safeAppendToNullMap<bool>(col, is_null);
+}
+
+bool SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    deserializeTextJSONImpl<void>(nested_column, istr, settings, nested_serialization, is_null);
+    return !is_null;
+}
+
+bool SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextJSON(DB::IColumn & nested_column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, const DB::SerializationPtr & nested_serialization)
+{
+    bool is_null;
+    return deserializeTextJSONImpl<bool>(nested_column, istr, settings, nested_serialization, is_null);
 }
 
 void SerializationNullable::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -660,11 +892,9 @@ void SerializationNullable::serializeTextXML(const IColumn & column, size_t row_
         nested->serializeTextXML(col.getNestedColumn(), row_num, ostr, settings);
 }
 
-template bool SerializationNullable::deserializeWholeTextImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-template bool SerializationNullable::deserializeTextEscapedImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-template bool SerializationNullable::deserializeTextQuotedImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
-template bool SerializationNullable::deserializeTextCSVImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-template bool SerializationNullable::deserializeTextJSONImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
-template bool SerializationNullable::deserializeTextRawImpl<bool>(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
+void SerializationNullable::serializeNullXML(DB::WriteBuffer & ostr)
+{
+    writeCString("\\N", ostr);
+}
 
 }
diff --git a/src/DataTypes/Serializations/SerializationNullable.h b/src/DataTypes/Serializations/SerializationNullable.h
index 3ec01b46de5..37858ccdefd 100644
--- a/src/DataTypes/Serializations/SerializationNullable.h
+++ b/src/DataTypes/Serializations/SerializationNullable.h
@@ -51,9 +51,12 @@ public:
     void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
@@ -66,31 +69,49 @@ public:
       * In CSV, non-NULL string value, starting with \N characters, must be placed in quotes, to avoid ambiguity.
       */
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 
     void deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
 
-    /// If ReturnType is bool, check for NULL and deserialize value into non-nullable column (and return true) or insert default value of nested type (and return false)
-    /// If ReturnType is void, deserialize Nullable(T)
-    template <typename ReturnType = bool>
-    static ReturnType deserializeWholeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextEscapedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextQuotedImpl(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested);
-    template <typename ReturnType = bool>
-    static ReturnType deserializeTextRawImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
-    template <typename ReturnType = bool, bool escaped>
-    static ReturnType deserializeTextEscapedAndRawImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested);
+    /// If Check for NULL and deserialize value into non-nullable column (and return true) or insert default value of nested type (and return false)
+    static bool deserializeNullAsDefaultOrNestedWholeText(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool deserializeNullAsDefaultOrNestedTextEscaped(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool deserializeNullAsDefaultOrNestedTextQuoted(IColumn & nested_column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested_serialization);
+    static bool deserializeNullAsDefaultOrNestedTextCSV(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool deserializeNullAsDefaultOrNestedTextJSON(IColumn & nested_column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested_serialization);
+    static bool deserializeNullAsDefaultOrNestedTextRaw(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+
+    /// If Check for NULL and deserialize value into non-nullable column or insert default value of nested type.
+    /// Return true if parsing was successful and false in case of any error.
+    static bool tryDeserializeNullAsDefaultOrNestedWholeText(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool tryDeserializeNullAsDefaultOrNestedTextEscaped(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool tryDeserializeNullAsDefaultOrNestedTextQuoted(IColumn & nested_column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested_serialization);
+    static bool tryDeserializeNullAsDefaultOrNestedTextCSV(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+    static bool tryDeserializeNullAsDefaultOrNestedTextJSON(IColumn & nested_column, ReadBuffer & istr, const FormatSettings &, const SerializationPtr & nested_serialization);
+    static bool tryDeserializeNullAsDefaultOrNestedTextRaw(IColumn & nested_column, ReadBuffer & istr, const FormatSettings & settings, const SerializationPtr & nested_serialization);
+
+
+    static void serializeNullEscaped(WriteBuffer & ostr, const FormatSettings & settings);
+    static bool tryDeserializeNullEscaped(ReadBuffer & istr, const FormatSettings & settings);
+    static void serializeNullQuoted(WriteBuffer & ostr);
+    static bool tryDeserializeNullQuoted(ReadBuffer & istr);
+    static void serializeNullCSV(WriteBuffer & ostr, const FormatSettings & settings);
+    static bool tryDeserializeNullCSV(ReadBuffer & istr, const FormatSettings & settings);
+    static void serializeNullJSON(WriteBuffer & ostr);
+    static bool tryDeserializeNullJSON(ReadBuffer & istr);
+    static void serializeNullRaw(WriteBuffer & ostr, const FormatSettings & settings);
+    static bool tryDeserializeNullRaw(ReadBuffer & istr, const FormatSettings & settings);
+    static void serializeNullText(WriteBuffer & ostr, const FormatSettings & settings);
+    static bool tryDeserializeNullText(ReadBuffer & istr);
+    static void serializeNullXML(WriteBuffer & ostr);
 
 private:
     struct SubcolumnCreator : public ISubcolumnCreator
diff --git a/src/DataTypes/Serializations/SerializationNumber.cpp b/src/DataTypes/Serializations/SerializationNumber.cpp
index b6c7e4618b8..bdb4dfc6735 100644
--- a/src/DataTypes/Serializations/SerializationNumber.cpp
+++ b/src/DataTypes/Serializations/SerializationNumber.cpp
@@ -37,6 +37,18 @@ void SerializationNumber<T>::deserializeText(IColumn & column, ReadBuffer & istr
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "Number");
 }
 
+template <typename T>
+bool SerializationNumber<T>::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const
+{
+    T x;
+
+    if (!tryReadText(x, istr) || (whole && !istr.eof()))
+        return false;
+
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename T>
 void SerializationNumber<T>::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -44,9 +56,10 @@ void SerializationNumber<T>::serializeTextJSON(const IColumn & column, size_t ro
     writeJSONNumber(x, ostr, settings);
 }
 
-template <typename T>
-void SerializationNumber<T>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+template <typename T, typename ReturnType>
+ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
     bool has_quote = false;
     if (!istr.eof() && *istr.position() == '"')        /// We understand the number both in quotes and without.
     {
@@ -54,13 +67,16 @@ void SerializationNumber<T>::deserializeTextJSON(IColumn & column, ReadBuffer &
         ++istr.position();
     }
 
-    FieldType x;
+    T x;
 
     /// null
     if (!has_quote && !istr.eof() && *istr.position() == 'n')
     {
         ++istr.position();
-        assertString("ull", istr);
+        if constexpr (throw_exception)
+            assertString("ull", istr);
+        else if (!checkString("ull", istr))
+            return ReturnType(false);
 
         x = NaNOrZero<T>();
     }
@@ -73,26 +89,62 @@ void SerializationNumber<T>::deserializeTextJSON(IColumn & column, ReadBuffer &
         {
             // extra conditions to parse true/false strings into 1/0
             if (istr.eof())
-                throwReadAfterEOF();
+            {
+                if constexpr (throw_exception)
+                    throwReadAfterEOF();
+                else
+                    return false;
+            }
+
             if (*istr.position() == 't' || *istr.position() == 'f')
             {
                 bool tmp = false;
-                readBoolTextWord(tmp, istr);
+                if constexpr (throw_exception)
+                    readBoolTextWord(tmp, istr);
+                else if (!readBoolTextWord<bool>(tmp, istr))
+                    return ReturnType(false);
+
                 x = tmp;
             }
             else
-                readText(x, istr);
+            {
+                if constexpr (throw_exception)
+                    readText(x, istr);
+                else if (!tryReadText(x, istr))
+                    return ReturnType(false);
+            }
         }
         else
         {
-            readText(x, istr);
+            if constexpr (throw_exception)
+                readText(x, istr);
+            else if (!tryReadText(x, istr))
+                return ReturnType(false);
         }
 
         if (has_quote)
-            assertChar('"', istr);
+        {
+            if constexpr (throw_exception)
+                assertChar('"', istr);
+            else if (!checkChar('"', istr))
+                return ReturnType(false);
+        }
     }
 
     assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+    return ReturnType(true);
+}
+
+template <typename T>
+void SerializationNumber<T>::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    deserializeTextJSONImpl<T, void>(column, istr, settings);
+}
+
+template <typename T>
+bool SerializationNumber<T>::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return deserializeTextJSONImpl<T, bool>(column, istr, settings);
 }
 
 template <typename T>
@@ -103,6 +155,16 @@ void SerializationNumber<T>::deserializeTextCSV(IColumn & column, ReadBuffer & i
     assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
 }
 
+template <typename T>
+bool SerializationNumber<T>::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & /*settings*/) const
+{
+    FieldType x;
+    if (!tryReadCSV(x, istr))
+        return false;
+    assert_cast<ColumnVector<T> &>(column).getData().push_back(x);
+    return true;
+}
+
 template <typename T>
 void SerializationNumber<T>::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
diff --git a/src/DataTypes/Serializations/SerializationNumber.h b/src/DataTypes/Serializations/SerializationNumber.h
index 972c6c9a30f..9d53dc9c494 100644
--- a/src/DataTypes/Serializations/SerializationNumber.h
+++ b/src/DataTypes/Serializations/SerializationNumber.h
@@ -20,9 +20,12 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
+    bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
     void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     /** Format is platform-dependent. */
     void serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const override;
diff --git a/src/DataTypes/Serializations/SerializationObject.cpp b/src/DataTypes/Serializations/SerializationObject.cpp
index e6dc16ef5a0..67bf7af7799 100644
--- a/src/DataTypes/Serializations/SerializationObject.cpp
+++ b/src/DataTypes/Serializations/SerializationObject.cpp
@@ -5,13 +5,11 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/NestedUtils.h>
 #include <Common/JSONParsers/SimdJSONParser.h>
 #include <Common/JSONParsers/RapidJSONParser.h>
-#include <Common/HashTable/HashSet.h>
 #include <Columns/ColumnObject.h>
+#include <Columns/ColumnTuple.h>
 #include <Columns/ColumnString.h>
-#include <Functions/FunctionsConversion.h>
 
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
@@ -29,7 +27,8 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
     extern const int CANNOT_READ_ALL_DATA;
     extern const int ARGUMENT_OUT_OF_BOUND;
-    extern const int LOGICAL_ERROR;
+    extern const int CANNOT_PARSE_TEXT;
+    extern const int EXPERIMENTAL_FEATURE_ERROR;
 }
 
 template <typename Parser>
@@ -177,7 +176,7 @@ void SerializationObject<Parser>::serializeBinaryBulkStatePrefix(
     auto * stream = settings.getter(settings.path);
 
     if (!stream)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Missing stream for kind of binary serialization");
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR, "Missing stream for kind of binary serialization");
 
     auto [tuple_column, tuple_type] = unflattenObjectToTuple(column_object);
 
@@ -288,7 +287,7 @@ void SerializationObject<Parser>::serializeBinaryBulkWithMultipleStreams(
 
     if (!state_object->nested_type->equals(*tuple_type))
     {
-        throw Exception(ErrorCodes::LOGICAL_ERROR,
+        throw Exception(ErrorCodes::EXPERIMENTAL_FEATURE_ERROR,
             "Types of internal column of Object mismatched. Expected: {}, Got: {}",
             state_object->nested_type->getName(), tuple_type->getName());
     }
@@ -344,7 +343,20 @@ void SerializationObject<Parser>::deserializeBinaryBulkFromString(
     state.nested_serialization->deserializeBinaryBulkWithMultipleStreams(
         column_string, limit, settings, state.nested_state, cache);
 
-    ConvertImplGenericFromString<ColumnString>::executeImpl(*column_string, column_object, *this, column_string->size());
+    size_t input_rows_count = column_string->size();
+    column_object.reserve(input_rows_count);
+
+    FormatSettings format_settings;
+    for (size_t i = 0; i < input_rows_count; ++i)
+    {
+        const auto & val = column_string->getDataAt(i);
+        ReadBufferFromMemory read_buffer(val.data, val.size);
+        deserializeWholeText(column_object, read_buffer, format_settings);
+
+        if (!read_buffer.eof())
+            throw Exception(ErrorCodes::CANNOT_PARSE_TEXT,
+                "Cannot parse string to column Object. Expected eof");
+    }
 }
 
 template <typename Parser>
diff --git a/src/DataTypes/Serializations/SerializationSparse.h b/src/DataTypes/Serializations/SerializationSparse.h
index 2d31fba2509..b1ed7b613f0 100644
--- a/src/DataTypes/Serializations/SerializationSparse.h
+++ b/src/DataTypes/Serializations/SerializationSparse.h
@@ -27,7 +27,7 @@ public:
 
     Kind getKind() const override { return Kind::SPARSE; }
 
-    virtual void enumerateStreams(
+    void enumerateStreams(
         EnumerateStreamsSettings & settings,
         const StreamCallback & callback,
         const SubstreamData & data) const override;
diff --git a/src/DataTypes/Serializations/SerializationString.cpp b/src/DataTypes/Serializations/SerializationString.cpp
index b2b083fd466..8abaa3bd5ea 100644
--- a/src/DataTypes/Serializations/SerializationString.cpp
+++ b/src/DataTypes/Serializations/SerializationString.cpp
@@ -208,7 +208,7 @@ static NO_INLINE void deserializeBinarySSE2(ColumnString::Chars & data, ColumnSt
         data[offset - 1] = 0;
     }
 
-    data.resize(offset);
+    data.resize_exact(offset);
 }
 
 
@@ -272,50 +272,85 @@ void SerializationString::serializeTextEscaped(const IColumn & column, size_t ro
 }
 
 
-template <typename Reader>
-static inline void read(IColumn & column, Reader && reader)
+template <typename ReturnType, typename Reader>
+static inline ReturnType read(IColumn & column, Reader && reader)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
     ColumnString & column_string = assert_cast<ColumnString &>(column);
     ColumnString::Chars & data = column_string.getChars();
     ColumnString::Offsets & offsets = column_string.getOffsets();
     size_t old_chars_size = data.size();
     size_t old_offsets_size = offsets.size();
-    try
-    {
-        reader(data);
-        data.push_back(0);
-        offsets.push_back(data.size());
-    }
-    catch (...)
+    auto restore_column = [&]()
     {
         offsets.resize_assume_reserved(old_offsets_size);
         data.resize_assume_reserved(old_chars_size);
-        throw;
+    };
+
+    try
+    {
+        if constexpr (throw_exception)
+        {
+            reader(data);
+        }
+        else if (!reader(data))
+        {
+            restore_column();
+            return false;
+        }
+
+        data.push_back(0);
+        offsets.push_back(data.size());
+        return ReturnType(true);
+    }
+    catch (...)
+    {
+        restore_column();
+        if constexpr (throw_exception)
+            throw;
+        else
+            return false;
     }
 }
 
 
 void SerializationString::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
-    read(column, [&](ColumnString::Chars & data) { readStringUntilEOFInto(data, istr); });
+    read<void>(column, [&](ColumnString::Chars & data) { readStringUntilEOFInto(data, istr); });
 }
 
+bool SerializationString::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    return read<bool>(column, [&](ColumnString::Chars & data) { readStringUntilEOFInto(data, istr); return true; });
+}
 
 void SerializationString::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
-    read(column, [&](ColumnString::Chars & data) { readEscapedStringInto(data, istr); });
+    read<void>(column, [&](ColumnString::Chars & data) { readEscapedStringInto(data, istr); });
 }
 
-
-void SerializationString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const
+bool SerializationString::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
-    writeQuotedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
+    return read<bool>(column, [&](ColumnString::Chars & data) { readEscapedStringInto(data, istr); return true; });
+}
+
+void SerializationString::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    if (settings.values.escape_quote_with_quote)
+        writeQuotedStringPostgreSQL(assert_cast<const ColumnString &>(column).getDataAt(row_num).toView(), ostr);
+    else
+        writeQuotedString(assert_cast<const ColumnString &>(column).getDataAt(row_num), ostr);
 }
 
 
 void SerializationString::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
 {
-    read(column, [&](ColumnString::Chars & data) { readQuotedStringInto<true>(data, istr); });
+    read<void>(column, [&](ColumnString::Chars & data) { readQuotedStringInto<true>(data, istr); });
+}
+
+bool SerializationString::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    return read<bool>(column, [&](ColumnString::Chars & data) { return tryReadQuotedStringInto<true>(data, istr); });
 }
 
 
@@ -329,11 +364,11 @@ void SerializationString::deserializeTextJSON(IColumn & column, ReadBuffer & ist
 {
     if (settings.json.read_objects_as_strings && !istr.eof() && *istr.position() == '{')
     {
-        read(column, [&](ColumnString::Chars & data) { readJSONObjectPossiblyInvalid(data, istr); });
+        read<void>(column, [&](ColumnString::Chars & data) { readJSONObjectPossiblyInvalid(data, istr); });
     }
     else if (settings.json.read_arrays_as_strings && !istr.eof() && *istr.position() == '[')
     {
-        read(column, [&](ColumnString::Chars & data) { readJSONArrayInto(data, istr); });
+        read<void>(column, [&](ColumnString::Chars & data) { readJSONArrayInto(data, istr); });
     }
     else if (settings.json.read_bools_as_strings && !istr.eof() && (*istr.position() == 't' || *istr.position() == 'f'))
     {
@@ -349,21 +384,69 @@ void SerializationString::deserializeTextJSON(IColumn & column, ReadBuffer & ist
             str_value = "false";
         }
 
-        read(column, [&](ColumnString::Chars & data) { data.insert(str_value.begin(), str_value.end()); });
+        read<void>(column, [&](ColumnString::Chars & data) { data.insert(str_value.begin(), str_value.end()); });
     }
     else if (settings.json.read_numbers_as_strings && !istr.eof() && *istr.position() != '"')
     {
         String field;
-        readJSONField(field, istr);
+        readJSONField(field, istr, settings.json);
         Float64 tmp;
         ReadBufferFromString buf(field);
         if (tryReadFloatText(tmp, buf) && buf.eof())
-            read(column, [&](ColumnString::Chars & data) { data.insert(field.begin(), field.end()); });
+            read<void>(column, [&](ColumnString::Chars & data) { data.insert(field.begin(), field.end()); });
         else
             throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse JSON String value here: {}", field);
     }
     else
-        read(column, [&](ColumnString::Chars & data) { readJSONStringInto(data, istr); });
+        read<void>(column, [&](ColumnString::Chars & data) { readJSONStringInto(data, istr, settings.json); });
+}
+
+bool SerializationString::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    if (settings.json.read_objects_as_strings && !istr.eof() && *istr.position() == '{')
+        return read<bool>(column, [&](ColumnString::Chars & data) { return readJSONObjectPossiblyInvalid<ColumnString::Chars, bool>(data, istr); });
+
+    if (settings.json.read_arrays_as_strings && !istr.eof() && *istr.position() == '[')
+        return read<bool>(column, [&](ColumnString::Chars & data) { return readJSONArrayInto<ColumnString::Chars, bool>(data, istr); });
+
+    if (settings.json.read_bools_as_strings && !istr.eof() && (*istr.position() == 't' || *istr.position() == 'f'))
+    {
+        String str_value;
+        if (*istr.position() == 't')
+        {
+            if (!checkString("true", istr))
+                return false;
+            str_value = "true";
+        }
+        else if (*istr.position() == 'f')
+        {
+            if (!checkString("false", istr))
+                return false;
+            str_value = "false";
+        }
+
+        read<void>(column, [&](ColumnString::Chars & data) { data.insert(str_value.begin(), str_value.end()); });
+        return true;
+    }
+
+    if (settings.json.read_numbers_as_strings && !istr.eof() && *istr.position() != '"')
+    {
+        String field;
+        if (!tryReadJSONField(field, istr, settings.json))
+            return false;
+
+        Float64 tmp;
+        ReadBufferFromString buf(field);
+        if (tryReadFloatText(tmp, buf) && buf.eof())
+        {
+            read<void>(column, [&](ColumnString::Chars & data) { data.insert(field.begin(), field.end()); });
+            return true;
+        }
+
+        return false;
+    }
+
+    return read<bool>(column, [&](ColumnString::Chars & data) { return tryReadJSONStringInto(data, istr, settings.json); });
 }
 
 
@@ -381,7 +464,12 @@ void SerializationString::serializeTextCSV(const IColumn & column, size_t row_nu
 
 void SerializationString::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    read(column, [&](ColumnString::Chars & data) { readCSVStringInto(data, istr, settings.csv); });
+    read<void>(column, [&](ColumnString::Chars & data) { readCSVStringInto(data, istr, settings.csv); });
+}
+
+bool SerializationString::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return read<bool>(column, [&](ColumnString::Chars & data) { readCSVStringInto<ColumnString::Chars, false, false>(data, istr, settings.csv); return true; });
 }
 
 void SerializationString::serializeTextMarkdown(
diff --git a/src/DataTypes/Serializations/SerializationString.h b/src/DataTypes/Serializations/SerializationString.h
index cd4cdf79c11..89ab84f0d22 100644
--- a/src/DataTypes/Serializations/SerializationString.h
+++ b/src/DataTypes/Serializations/SerializationString.h
@@ -18,20 +18,25 @@ public:
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextMarkdown(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
 };
diff --git a/src/DataTypes/Serializations/SerializationTuple.cpp b/src/DataTypes/Serializations/SerializationTuple.cpp
index cbbe97eb05c..632a019d2d9 100644
--- a/src/DataTypes/Serializations/SerializationTuple.cpp
+++ b/src/DataTypes/Serializations/SerializationTuple.cpp
@@ -7,6 +7,7 @@
 #include <Common/assert_cast.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromString.h>
 
 
@@ -62,15 +63,34 @@ void SerializationTuple::serializeBinary(const IColumn & column, size_t row_num,
 }
 
 
-template <typename F>
-static void addElementSafe(size_t num_elems, IColumn & column, F && impl)
+template <typename ReturnType, typename F>
+static ReturnType addElementSafe(size_t num_elems, IColumn & column, F && impl)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     /// We use the assumption that tuples of zero size do not exist.
     size_t old_size = column.size();
 
+    auto restore_elements = [&]()
+    {
+        for (size_t i = 0; i < num_elems; ++i)
+        {
+            auto & element_column = extractElementColumn(column, i);
+            if (element_column.size() > old_size)
+            {
+                chassert(element_column.size() - old_size == 1);
+                element_column.popBack(1);
+            }
+        }
+    };
+
     try
     {
-        impl();
+        if (!impl())
+        {
+            restore_elements();
+            return ReturnType(false);
+        }
 
         // Check that all columns now have the same size.
         size_t new_size = column.size();
@@ -81,30 +101,32 @@ static void addElementSafe(size_t num_elems, IColumn & column, F && impl)
             {
                 // This is not a logical error because it may work with
                 // user-supplied data.
-                throw Exception(ErrorCodes::SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH,
-                    "Cannot read a tuple because not all elements are present");
+                if constexpr (throw_exception)
+                    throw Exception(ErrorCodes::SIZES_OF_COLUMNS_IN_TUPLE_DOESNT_MATCH,
+                        "Cannot read a tuple because not all elements are present");
+                restore_elements();
+                return ReturnType(false);
             }
         }
     }
     catch (...)
     {
-        for (size_t i = 0; i < num_elems; ++i)
-        {
-            auto & element_column = extractElementColumn(column, i);
-            if (element_column.size() > old_size)
-                element_column.popBack(1);
-        }
-
-        throw;
+        restore_elements();
+        if constexpr (throw_exception)
+            throw;
+        return ReturnType(false);
     }
+
+    return ReturnType(true);
 }
 
 void SerializationTuple::deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    addElementSafe(elems.size(), column, [&]
+    addElementSafe<void>(elems.size(), column, [&]
     {
         for (size_t i = 0; i < elems.size(); ++i)
             elems[i]->deserializeBinary(extractElementColumn(column, i), istr, settings);
+        return true;
     });
 }
 
@@ -120,25 +142,51 @@ void SerializationTuple::serializeText(const IColumn & column, size_t row_num, W
     writeChar(')', ostr);
 }
 
-void SerializationTuple::deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const
+template <typename ReturnType>
+ReturnType SerializationTuple::deserializeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const
 {
-    const size_t size = elems.size();
-    assertChar('(', istr);
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
-    addElementSafe(elems.size(), column, [&]
+    const size_t size = elems.size();
+    if constexpr (throw_exception)
+        assertChar('(', istr);
+    else if (!checkChar('(', istr))
+        return ReturnType(false);
+
+    auto impl = [&]()
     {
         for (size_t i = 0; i < size; ++i)
         {
             skipWhitespaceIfAny(istr);
             if (i != 0)
             {
-                assertChar(',', istr);
+                if constexpr (throw_exception)
+                    assertChar(',', istr);
+                else if (!checkChar(',', istr))
+                    return false;
+
                 skipWhitespaceIfAny(istr);
             }
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextQuotedImpl(extractElementColumn(column, i), istr, settings, elems[i]);
+
+            auto & element_column = extractElementColumn(column, i);
+            if constexpr (throw_exception)
+            {
+                if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(element_column))
+                    SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(element_column, istr, settings, elems[i]);
+                else
+                    elems[i]->deserializeTextQuoted(element_column, istr, settings);
+            }
             else
-                elems[i]->deserializeTextQuoted(extractElementColumn(column, i), istr, settings);
+            {
+                bool ok;
+                if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(element_column))
+                    ok = SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextQuoted(element_column, istr, settings, elems[i]);
+                else
+                    ok = elems[i]->tryDeserializeTextQuoted(element_column, istr, settings);
+
+                if (!ok)
+                    return false;
+            }
         }
 
         // Special format for one element tuple (1,)
@@ -150,11 +198,32 @@ void SerializationTuple::deserializeText(IColumn & column, ReadBuffer & istr, co
         }
 
         skipWhitespaceIfAny(istr);
-        assertChar(')', istr);
+        if constexpr (throw_exception)
+            assertChar(')', istr);
+        else if (!checkChar(')', istr))
+            return false;
 
         if (whole && !istr.eof())
-            throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
-    });
+        {
+            if constexpr (throw_exception)
+                throwUnexpectedDataAfterParsedValue(column, istr, settings, "Tuple");
+            return false;
+        }
+
+        return true;
+    };
+
+    return addElementSafe<ReturnType>(elems.size(), column, impl);
+}
+
+void SerializationTuple::deserializeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, bool whole) const
+{
+    deserializeTextImpl(column, istr, settings, whole);
+}
+
+bool SerializationTuple::tryDeserializeText(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings, bool whole) const
+{
+    return deserializeTextImpl<bool>(column, istr, settings, whole);
 }
 
 void SerializationTuple::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
@@ -239,16 +308,40 @@ void SerializationTuple::serializeTextJSONPretty(const IColumn & column, size_t
     }
 }
 
-void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+template <typename ReturnType>
+ReturnType SerializationTuple::deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    auto deserialize_element = [&](IColumn & element_column, size_t element_pos)
+    {
+        if constexpr (throw_exception)
+        {
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(element_column))
+                SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(element_column, istr, settings, elems[element_pos]);
+            else
+                elems[element_pos]->deserializeTextJSON(element_column, istr, settings);
+            return true;
+        }
+        else
+        {
+            if (settings.null_as_default && !isColumnNullableOrLowCardinalityNullable(element_column))
+                return SerializationNullable::tryDeserializeNullAsDefaultOrNestedTextJSON(element_column, istr, settings, elems[element_pos]);
+            return elems[element_pos]->tryDeserializeTextJSON(element_column, istr, settings);
+        }
+    };
+
     if (settings.json.read_named_tuples_as_objects
         && have_explicit_names)
     {
         skipWhitespaceIfAny(istr);
-        assertChar('{', istr);
+        if constexpr (throw_exception)
+            assertChar('{', istr);
+        else if (!checkChar('{', istr))
+            return ReturnType(false);
         skipWhitespaceIfAny(istr);
 
-        addElementSafe(elems.size(), column, [&]
+        auto impl = [&]()
         {
             std::vector<UInt8> seen_elements(elems.size(), 0);
             size_t processed = 0;
@@ -256,18 +349,32 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
             while (!istr.eof() && *istr.position() != '}')
             {
                 if (!settings.json.ignore_unknown_keys_in_named_tuple && processed == elems.size())
-                    throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected number of elements in named tuple. Expected no more than {} (consider enabling input_format_json_ignore_unknown_keys_in_named_tuple setting)", elems.size());
+                {
+                    if constexpr (throw_exception)
+                        throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected number of elements in named tuple. Expected no more than {} (consider enabling input_format_json_ignore_unknown_keys_in_named_tuple setting)", elems.size());
+                    return false;
+                }
 
                 if (processed + skipped > 0)
                 {
-                    assertChar(',', istr);
+                    if constexpr (throw_exception)
+                        assertChar(',', istr);
+                    else if (!checkChar(',', istr))
+                        return false;
                     skipWhitespaceIfAny(istr);
                 }
 
                 std::string name;
-                readDoubleQuotedString(name, istr);
+                if constexpr (throw_exception)
+                    readDoubleQuotedString(name, istr);
+                else if (!tryReadDoubleQuotedString(name, istr))
+                    return false;
+
                 skipWhitespaceIfAny(istr);
-                assertChar(':', istr);
+                if constexpr (throw_exception)
+                    assertChar(':', istr);
+                else if (!checkChar(':', istr))
+                    return false;
                 skipWhitespaceIfAny(istr);
 
                 const size_t element_pos = getPositionByName(name);
@@ -275,36 +382,52 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                 {
                     if (settings.json.ignore_unknown_keys_in_named_tuple)
                     {
-                        skipJSONField(istr, name);
+                        if constexpr (throw_exception)
+                            skipJSONField(istr, name, settings.json);
+                        else if (!trySkipJSONField(istr, name, settings.json))
+                            return false;
+
                         skipWhitespaceIfAny(istr);
                         ++skipped;
                         continue;
                     }
                     else
-                        throw Exception(ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK, "Tuple doesn't have element with name '{}', enable setting input_format_json_ignore_unknown_keys_in_named_tuple", name);
+                    {
+                        if constexpr (throw_exception)
+                            throw Exception(ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK, "Tuple doesn't have element with name '{}', enable setting input_format_json_ignore_unknown_keys_in_named_tuple", name);
+                        return false;
+                    }
                 }
 
                 seen_elements[element_pos] = 1;
                 auto & element_column = extractElementColumn(column, element_pos);
 
-                try
+                if constexpr (throw_exception)
                 {
-                    if (settings.null_as_default)
-                        SerializationNullable::deserializeTextJSONImpl(element_column, istr, settings, elems[element_pos]);
-                    else
-                        elems[element_pos]->deserializeTextJSON(element_column, istr, settings);
+                    try
+                    {
+                        deserialize_element(element_column, element_pos);
+                    }
+                    catch (Exception & e)
+                    {
+                        e.addMessage("(while reading the value of nested key " + name + ")");
+                        throw;
+                    }
                 }
-                catch (Exception & e)
+                else
                 {
-                    e.addMessage("(while reading the value of nested key " + name + ")");
-                    throw;
+                    if (!deserialize_element(element_column, element_pos))
+                        return false;
                 }
 
                 skipWhitespaceIfAny(istr);
                 ++processed;
             }
 
-            assertChar('}', istr);
+            if constexpr (throw_exception)
+                assertChar('}', istr);
+            else if (!checkChar('}', istr))
+                return false;
 
             /// Check if we have missing elements.
             if (processed != elems.size())
@@ -315,41 +438,81 @@ void SerializationTuple::deserializeTextJSON(IColumn & column, ReadBuffer & istr
                         continue;
 
                     if (!settings.json.defaults_for_missing_elements_in_named_tuple)
-                        throw Exception(
-                            ErrorCodes::INCORRECT_DATA,
-                            "JSON object doesn't contain tuple element {}. If you want to insert defaults in case of missing elements, "
-                            "enable setting input_format_json_defaults_for_missing_elements_in_named_tuple",
-                            elems[element_pos]->getElementName());
+                    {
+                        if constexpr (throw_exception)
+                            throw Exception(
+                                ErrorCodes::INCORRECT_DATA,
+                                "JSON object doesn't contain tuple element {}. If you want to insert defaults in case of missing elements, "
+                                "enable setting input_format_json_defaults_for_missing_elements_in_named_tuple",
+                                elems[element_pos]->getElementName());
+                        return false;
+                    }
 
                     auto & element_column = extractElementColumn(column, element_pos);
                     element_column.insertDefault();
                 }
             }
-        });
+
+            return true;
+        };
+
+        return addElementSafe<ReturnType>(elems.size(), column, impl);
     }
     else
     {
-        assertChar('[', istr);
+        skipWhitespaceIfAny(istr);
+        if constexpr (throw_exception)
+            assertChar('[', istr);
+        else if (!checkChar('[', istr))
+            return false;
+        skipWhitespaceIfAny(istr);
 
-        addElementSafe(elems.size(), column, [&]
+        auto impl = [&]()
         {
             for (size_t i = 0; i < elems.size(); ++i)
             {
                 skipWhitespaceIfAny(istr);
                 if (i != 0)
                 {
-                    assertChar(',', istr);
+                    if constexpr (throw_exception)
+                        assertChar(',', istr);
+                    else if (!checkChar(',', istr))
+                        return false;
                     skipWhitespaceIfAny(istr);
                 }
-                elems[i]->deserializeTextJSON(extractElementColumn(column, i), istr, settings);
+
+                auto & element_column = extractElementColumn(column, i);
+
+                if constexpr (throw_exception)
+                    deserialize_element(element_column, i);
+                else if (!deserialize_element(element_column, i))
+                    return false;
             }
 
             skipWhitespaceIfAny(istr);
-            assertChar(']', istr);
-        });
+            if constexpr (throw_exception)
+                assertChar(']', istr);
+            else if (!checkChar(']', istr))
+                return false;
+
+            return true;
+        };
+
+        return addElementSafe<ReturnType>(elems.size(), column, impl);
     }
 }
 
+void SerializationTuple::deserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    deserializeTextJSONImpl(column, istr, settings);
+}
+
+bool SerializationTuple::tryDeserializeTextJSON(DB::IColumn & column, DB::ReadBuffer & istr, const DB::FormatSettings & settings) const
+{
+    return deserializeTextJSONImpl<bool>(column, istr, settings);
+}
+
+
 void SerializationTuple::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeCString("<tuple>", ostr);
@@ -364,33 +527,26 @@ void SerializationTuple::serializeTextXML(const IColumn & column, size_t row_num
 
 void SerializationTuple::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
-    for (size_t i = 0; i < elems.size(); ++i)
-    {
-        if (i != 0)
-            writeChar(settings.csv.tuple_delimiter, ostr);
-        elems[i]->serializeTextCSV(extractElementColumn(column, i), row_num, ostr, settings);
-    }
+    WriteBufferFromOwnString wb;
+    serializeText(column, row_num, wb, settings);
+    writeCSV(wb.str(), ostr);
 }
 
 void SerializationTuple::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
 {
-    addElementSafe(elems.size(), column, [&]
-    {
-        const size_t size = elems.size();
-        for (size_t i = 0; i < size; ++i)
-        {
-            if (i != 0)
-            {
-                skipWhitespaceIfAny(istr);
-                assertChar(settings.csv.tuple_delimiter, istr);
-                skipWhitespaceIfAny(istr);
-            }
-            if (settings.null_as_default)
-                SerializationNullable::deserializeTextCSVImpl(extractElementColumn(column, i), istr, settings, elems[i]);
-            else
-                elems[i]->deserializeTextCSV(extractElementColumn(column, i), istr, settings);
-        }
-    });
+    String s;
+    readCSV(s, istr, settings.csv);
+    ReadBufferFromString rb(s);
+    deserializeText(column, rb, settings, true);
+}
+
+bool SerializationTuple::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String s;
+    if (!tryReadCSV(s, istr, settings.csv))
+        return false;
+    ReadBufferFromString rb(s);
+    return tryDeserializeText(column, rb, settings, true);
 }
 
 void SerializationTuple::enumerateStreams(
diff --git a/src/DataTypes/Serializations/SerializationTuple.h b/src/DataTypes/Serializations/SerializationTuple.h
index 7325259f440..d9c63a05217 100644
--- a/src/DataTypes/Serializations/SerializationTuple.h
+++ b/src/DataTypes/Serializations/SerializationTuple.h
@@ -23,14 +23,17 @@ public:
     void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const override;
+    bool tryDeserializeText(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;
+    bool tryDeserializeTextJSON(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).
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     /** Each sub-column in a tuple is serialized in separate stream.
       */
@@ -73,6 +76,15 @@ private:
     bool have_explicit_names;
 
     size_t getPositionByName(const String & name) const;
+
+    template <typename ReturnType = void>
+    ReturnType deserializeTextImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const;
+
+    template <typename ReturnType = void>
+    ReturnType deserializeTextJSONImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const;
+
+    template <typename ReturnType = void>
+    ReturnType deserializeTextCSVImpl(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const;
 };
 
 }
diff --git a/src/DataTypes/Serializations/SerializationUUID.cpp b/src/DataTypes/Serializations/SerializationUUID.cpp
index 5cf17b4c0c8..5a7aeca67a0 100644
--- a/src/DataTypes/Serializations/SerializationUUID.cpp
+++ b/src/DataTypes/Serializations/SerializationUUID.cpp
@@ -25,15 +25,16 @@ void SerializationUUID::deserializeText(IColumn & column, ReadBuffer & istr, con
         throwUnexpectedDataAfterParsedValue(column, istr, settings, "UUID");
 }
 
-void SerializationUUID::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+bool SerializationUUID::tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const
 {
-    deserializeText(column, istr, settings, false);
+    UUID x;
+    if (!tryReadText(x, istr) || (whole && !istr.eof()))
+        return false;
+
+    assert_cast<ColumnUUID &>(column).getData().push_back(x);
+    return true;
 }
 
-void SerializationUUID::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
-{
-    serializeText(column, row_num, ostr, settings);
-}
 
 void SerializationUUID::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
@@ -76,6 +77,17 @@ void SerializationUUID::deserializeTextQuoted(IColumn & column, ReadBuffer & ist
     assert_cast<ColumnUUID &>(column).getData().push_back(std::move(uuid)); /// It's important to do this at the end - for exception safety.
 }
 
+bool SerializationUUID::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID uuid;
+    String field;
+    if (!checkChar('\'', istr) || !tryReadText(uuid, istr) || !checkChar('\'', istr))
+        return false;
+
+    assert_cast<ColumnUUID &>(column).getData().push_back(std::move(uuid));
+    return true;
+}
+
 void SerializationUUID::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -92,6 +104,15 @@ void SerializationUUID::deserializeTextJSON(IColumn & column, ReadBuffer & istr,
     assert_cast<ColumnUUID &>(column).getData().push_back(x);
 }
 
+bool SerializationUUID::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID x;
+    if (!checkChar('"', istr) || !tryReadText(x, istr) || !checkChar('"', istr))
+        return false;
+    assert_cast<ColumnUUID &>(column).getData().push_back(x);
+    return true;
+}
+
 void SerializationUUID::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     writeChar('"', ostr);
@@ -106,6 +127,14 @@ void SerializationUUID::deserializeTextCSV(IColumn & column, ReadBuffer & istr,
     assert_cast<ColumnUUID &>(column).getData().push_back(value);
 }
 
+bool SerializationUUID::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const
+{
+    UUID value;
+    if (!tryReadCSV(value, istr))
+        return false;
+    assert_cast<ColumnUUID &>(column).getData().push_back(value);
+    return true;
+}
 
 void SerializationUUID::serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const
 {
diff --git a/src/DataTypes/Serializations/SerializationUUID.h b/src/DataTypes/Serializations/SerializationUUID.h
index da8c15f7279..458504f8f42 100644
--- a/src/DataTypes/Serializations/SerializationUUID.h
+++ b/src/DataTypes/Serializations/SerializationUUID.h
@@ -10,14 +10,16 @@ class SerializationUUID : public SimpleTextSerialization
 public:
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
-    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
-    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const override;
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
 
     void serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings &) const override;
diff --git a/src/DataTypes/Serializations/SerializationVariant.cpp b/src/DataTypes/Serializations/SerializationVariant.cpp
new file mode 100644
index 00000000000..8ca86c63bf6
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationVariant.cpp
@@ -0,0 +1,840 @@
+#include <DataTypes/Serializations/SerializationVariant.h>
+#include <DataTypes/Serializations/SerializationVariantElement.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
+#include <DataTypes/Serializations/SerializationNullable.h>
+#include <DataTypes/Serializations/SerializationNamed.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Columns/ColumnVariant.h>
+
+#include <IO/ReadBuffer.h>
+#include <IO/WriteBuffer.h>
+#include <IO/WriteHelpers.h>
+#include <IO/ReadHelpers.h>
+#include <IO/ReadBufferFromString.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
+    extern const int INCORRECT_DATA;
+}
+
+void SerializationVariant::enumerateStreams(
+    EnumerateStreamsSettings & settings,
+    const StreamCallback & callback,
+    const SubstreamData & data) const
+{
+    const auto * type_variant = data.type ? &assert_cast<const DataTypeVariant &>(*data.type) : nullptr;
+    const auto * column_variant = data.column ? &assert_cast<const ColumnVariant &>(*data.column) : nullptr;
+
+    auto discriminators_serialization = std::make_shared<SerializationNamed>(std::make_shared<SerializationNumber<ColumnVariant::Discriminator>>(), "discr", SubstreamType::NamedVariantDiscriminators);
+    auto local_discriminators = column_variant ? column_variant->getLocalDiscriminatorsPtr() : nullptr;
+
+    settings.path.push_back(Substream::VariantDiscriminators);
+    auto discriminators_data = SubstreamData(discriminators_serialization)
+                             .withType(type_variant ? std::make_shared<DataTypeNumber<ColumnVariant::Discriminator>>() : nullptr)
+                             .withColumn(column_variant ? column_variant->getLocalDiscriminatorsPtr() : nullptr)
+                             .withSerializationInfo(data.serialization_info);
+
+    settings.path.back().data = discriminators_data;
+    callback(settings.path);
+    settings.path.pop_back();
+
+    settings.path.push_back(Substream::VariantElements);
+    settings.path.back().data = data;
+
+    for (size_t i = 0; i < variants.size(); ++i)
+    {
+        settings.path.back().creator = std::make_shared<SerializationVariantElement::VariantSubcolumnCreator>(local_discriminators, variant_names[i], i, column_variant ? column_variant->localDiscriminatorByGlobal(i) : i);
+
+        auto variant_data = SubstreamData(variants[i])
+                             .withType(type_variant ? type_variant->getVariant(i) : nullptr)
+                             .withColumn(column_variant ? column_variant->getVariantPtrByGlobalDiscriminator(i) : nullptr)
+                             .withSerializationInfo(data.serialization_info);
+
+        addVariantElementToPath(settings.path, i);
+        settings.path.back().data = variant_data;
+        variants[i]->enumerateStreams(settings, callback, variant_data);
+        settings.path.pop_back();
+    }
+
+    settings.path.pop_back();
+}
+
+struct SerializeBinaryBulkStateVariant : public ISerialization::SerializeBinaryBulkState
+{
+    std::vector<ISerialization::SerializeBinaryBulkStatePtr> states;
+};
+
+struct DeserializeBinaryBulkStateVariant : public ISerialization::DeserializeBinaryBulkState
+{
+    std::vector<ISerialization::DeserializeBinaryBulkStatePtr> states;
+};
+
+void SerializationVariant::serializeBinaryBulkStatePrefix(
+    const IColumn & column,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+
+    auto variant_state = std::make_shared<SerializeBinaryBulkStateVariant>();
+    variant_state->states.resize(variants.size());
+
+    settings.path.push_back(Substream::VariantElements);
+
+    for (size_t i = 0; i < variants.size(); ++i)
+    {
+        addVariantElementToPath(settings.path, i);
+        variants[i]->serializeBinaryBulkStatePrefix(col.getVariantByGlobalDiscriminator(i), settings, variant_state->states[i]);
+        settings.path.pop_back();
+    }
+
+    settings.path.pop_back();
+    state = std::move(variant_state);
+}
+
+
+void SerializationVariant::serializeBinaryBulkStateSuffix(
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    auto * variant_state = checkAndGetState<SerializeBinaryBulkStateVariant>(state);
+
+    settings.path.push_back(Substream::VariantElements);
+    for (size_t i = 0; i < variants.size(); ++i)
+    {
+        addVariantElementToPath(settings.path, i);
+        variants[i]->serializeBinaryBulkStateSuffix(settings, variant_state->states[i]);
+        settings.path.pop_back();
+    }
+    settings.path.pop_back();
+}
+
+
+void SerializationVariant::deserializeBinaryBulkStatePrefix(
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state) const
+{
+    auto variant_state = std::make_shared<DeserializeBinaryBulkStateVariant>();
+    variant_state->states.resize(variants.size());
+
+    settings.path.push_back(Substream::VariantElements);
+    for (size_t i = 0; i < variants.size(); ++i)
+    {
+        addVariantElementToPath(settings.path, i);
+        variants[i]->deserializeBinaryBulkStatePrefix(settings, variant_state->states[i]);
+        settings.path.pop_back();
+    }
+
+    settings.path.pop_back();
+    state = std::move(variant_state);
+}
+
+
+void SerializationVariant::serializeBinaryBulkWithMultipleStreams(
+    const IColumn & column,
+    size_t offset,
+    size_t limit,
+    SerializeBinaryBulkSettings & settings,
+    SerializeBinaryBulkStatePtr & state) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    if (const size_t size = col.size(); limit == 0 || offset + limit > size)
+        limit = size - offset;
+
+    settings.path.push_back(Substream::VariantDiscriminators);
+    auto * discriminators_stream = settings.getter(settings.path);
+    settings.path.pop_back();
+
+    if (!discriminators_stream)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Got empty stream for VariantDiscriminators in SerializationVariant::serializeBinaryBulkWithMultipleStreams");
+
+    auto * variant_state = checkAndGetState<SerializeBinaryBulkStateVariant>(state);
+
+    /// If offset = 0 and limit == col.size() or we have only NULLs, we don't need to calculate
+    /// offsets and limits for variants and need to just serialize whole columns.
+    if ((offset == 0 && limit == col.size()) || col.hasOnlyNulls())
+    {
+        /// First, serialize discriminators.
+        /// If we have only NULLs or local and global discriminators are the same, just serialize the column as is.
+        if (col.hasOnlyNulls() || col.hasGlobalVariantsOrder())
+        {
+            SerializationNumber<ColumnVariant::Discriminator>().serializeBinaryBulk(col.getLocalDiscriminatorsColumn(), *discriminators_stream, offset, limit);
+        }
+        /// If local and global discriminators are different, we should convert local to global before serializing (because we don't serialize the mapping).
+        else
+        {
+            const auto & local_discriminators = col.getLocalDiscriminators();
+            for (size_t i = offset; i != offset + limit; ++i)
+                writeBinaryLittleEndian(col.globalDiscriminatorByLocal(local_discriminators[i]), *discriminators_stream);
+        }
+
+        /// Second, serialize variants in global order.
+        settings.path.push_back(Substream::VariantElements);
+        for (size_t i = 0; i != variants.size(); ++i)
+        {
+            addVariantElementToPath(settings.path, i);
+            variants[i]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(i), 0, 0, settings, variant_state->states[i]);
+            settings.path.pop_back();
+        }
+        settings.path.pop_back();
+        return;
+    }
+
+    /// If we have only one non empty variant and no NULLs, we can use the same limit offset for this variant.
+    if (auto non_empty_local_discr = col.getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+    {
+        /// First, serialize discriminators.
+        /// We know that all discriminators are the same, so we just need to serialize this discriminator limit times.
+        auto non_empty_global_discr = col.globalDiscriminatorByLocal(*non_empty_local_discr);
+        for (size_t i = 0; i != limit; ++i)
+            writeBinaryLittleEndian(non_empty_global_discr, *discriminators_stream);
+
+        /// Second, serialize non-empty variant (other variants are empty and we can skip their serialization).
+        settings.path.push_back(Substream::VariantElements);
+        addVariantElementToPath(settings.path, non_empty_global_discr);
+        /// We can use the same offset/limit as for whole Variant column
+        variants[non_empty_global_discr]->serializeBinaryBulkWithMultipleStreams(col.getVariantByGlobalDiscriminator(non_empty_global_discr), offset, limit, settings, variant_state->states[non_empty_global_discr]);
+        settings.path.pop_back();
+        settings.path.pop_back();
+        return;
+    }
+
+    /// In general case we should iterate through local discriminators in range [offset, offset + limit] to serialize global discriminators and calculate offset/limit pair for each variant.
+    const auto & local_discriminators = col.getLocalDiscriminators();
+    const auto & offsets = col.getOffsets();
+    std::vector<std::pair<size_t, size_t>> variant_offsets_and_limits(variants.size(), {0, 0});
+    size_t end = offset + limit;
+    for (size_t i = offset; i < end; ++i)
+    {
+        auto global_discr = col.globalDiscriminatorByLocal(local_discriminators[i]);
+        writeBinaryLittleEndian(global_discr, *discriminators_stream);
+
+        if (global_discr != ColumnVariant::NULL_DISCRIMINATOR)
+        {
+            /// If we see this discriminator for the first time, update offset
+            if (!variant_offsets_and_limits[global_discr].second)
+                variant_offsets_and_limits[global_discr].first = offsets[i];
+            /// Update limit for this discriminator.
+            ++variant_offsets_and_limits[global_discr].second;
+        }
+    }
+
+    /// Serialize variants in global order.
+    settings.path.push_back(Substream::VariantElements);
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        /// Serialize variant only if we have its discriminator in the range.
+        if (variant_offsets_and_limits[i].second)
+        {
+            addVariantElementToPath(settings.path, i);
+            variants[i]->serializeBinaryBulkWithMultipleStreams(
+                col.getVariantByGlobalDiscriminator(i),
+                variant_offsets_and_limits[i].first,
+                variant_offsets_and_limits[i].second,
+                settings,
+                variant_state->states[i]);
+            settings.path.pop_back();
+        }
+    }
+    settings.path.pop_back();
+}
+
+
+void SerializationVariant::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto mutable_column = column->assumeMutable();
+    ColumnVariant & col = assert_cast<ColumnVariant &>(*mutable_column);
+    /// We always serialize Variant column with global variants order,
+    /// so while deserialization column should be always with global variants order.
+    if (!col.hasGlobalVariantsOrder())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to deserialize data into Variant column with not global variants order");
+
+    /// First, deserialize discriminators.
+    settings.path.push_back(Substream::VariantDiscriminators);
+    if (auto cached_discriminators = getFromSubstreamsCache(cache, settings.path))
+    {
+        col.getLocalDiscriminatorsPtr() = cached_discriminators;
+    }
+    else
+    {
+        auto * discriminators_stream = settings.getter(settings.path);
+        if (!discriminators_stream)
+            return;
+
+        SerializationNumber<ColumnVariant::Discriminator>().deserializeBinaryBulk(*col.getLocalDiscriminatorsPtr()->assumeMutable(), *discriminators_stream, limit, 0);
+        addToSubstreamsCache(cache, settings.path, col.getLocalDiscriminatorsPtr());
+    }
+    settings.path.pop_back();
+
+    /// Second, calculate limits for each variant by iterating through new discriminators.
+    std::vector<size_t> variant_limits(variants.size(), 0);
+    auto & discriminators_data = col.getLocalDiscriminators();
+    size_t discriminators_offset = discriminators_data.size() - limit;
+    for (size_t i = discriminators_offset; i != discriminators_data.size(); ++i)
+    {
+        ColumnVariant::Discriminator discr = discriminators_data[i];
+        if (discr != ColumnVariant::NULL_DISCRIMINATOR)
+            ++variant_limits[discr];
+    }
+
+    /// Now we can deserialize variants according to their limits.
+    auto * variant_state = checkAndGetState<DeserializeBinaryBulkStateVariant>(state);
+    settings.path.push_back(Substream::VariantElements);
+    for (size_t i = 0; i != variants.size(); ++i)
+    {
+        addVariantElementToPath(settings.path, i);
+        variants[i]->deserializeBinaryBulkWithMultipleStreams(col.getVariantPtrByLocalDiscriminator(i), variant_limits[i], settings, variant_state->states[i], cache);
+        settings.path.pop_back();
+    }
+    settings.path.pop_back();
+
+    /// Fill offsets column.
+    /// It's important to do it after deserialization of all variants, because to fill offsets we need
+    /// initial variants sizes without values in current range, but some variants can be shared with
+    /// other columns via substream cache and they can already contain values from this range even
+    /// before we call deserialize for them. So, before deserialize we cannot know for sure if
+    /// variant columns already contain values from current range or not. But after calling deserialize
+    /// we know for sure that they contain these values, so we can use valiant limits and their
+    /// new sizes to calculate correct offsets.
+    settings.path.push_back(Substream::VariantOffsets);
+    if (auto cached_offsets = getFromSubstreamsCache(cache, settings.path))
+    {
+        col.getOffsetsPtr() = cached_offsets;
+    }
+    else
+    {
+        auto & offsets = col.getOffsets();
+        offsets.reserve(offsets.size() + limit);
+        std::vector<size_t> variant_offsets;
+        variant_offsets.reserve(variants.size());
+        for (size_t i = 0; i != variants.size(); ++i)
+            variant_offsets.push_back(col.getVariantByLocalDiscriminator(i).size() - variant_limits[i]);
+
+        for (size_t i = discriminators_offset; i != discriminators_data.size(); ++i)
+        {
+            ColumnVariant::Discriminator discr = discriminators_data[i];
+            if (discr == ColumnVariant::NULL_DISCRIMINATOR)
+                offsets.emplace_back();
+            else
+                offsets.push_back(variant_offsets[discr]++);
+        }
+
+        addToSubstreamsCache(cache, settings.path, col.getOffsetsPtr());
+    }
+    settings.path.pop_back();
+}
+
+void SerializationVariant::addVariantElementToPath(DB::ISerialization::SubstreamPath & path, size_t i) const
+{
+    path.push_back(Substream::VariantElement);
+    path.back().variant_element_name = variant_names[i];
+}
+
+void SerializationVariant::serializeBinary(const Field & /*field*/, WriteBuffer & /*ostr*/, const FormatSettings & /*settings*/) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinary from a field is not implemented for SerializationVariant");
+}
+
+void SerializationVariant::deserializeBinary(Field & /*field*/, ReadBuffer & /*istr*/, const FormatSettings & /*settings*/) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method deserializeBinary to a field is not implemented for SerializationVariant");
+}
+
+void SerializationVariant::serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    writeBinaryLittleEndian(global_discr, ostr);
+    if (global_discr != ColumnVariant::NULL_DISCRIMINATOR)
+        variants[global_discr]->serializeBinary(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+void SerializationVariant::deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    ColumnVariant & col = assert_cast<ColumnVariant &>(column);
+    ColumnVariant::Discriminator global_discr;
+    readBinaryLittleEndian(global_discr, istr);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+    {
+        col.insertDefault();
+    }
+    else
+    {
+        auto & variant_column = col.getVariantByGlobalDiscriminator(global_discr);
+        variants[global_discr]->deserializeBinary(variant_column, istr, settings);
+        col.getLocalDiscriminators().push_back(col.localDiscriminatorByGlobal(global_discr));
+        col.getOffsets().push_back(variant_column.size() - 1);
+    }
+}
+
+namespace
+{
+
+const std::unordered_map<TypeIndex, size_t> & getTypesTextDeserializePriorityMap()
+{
+    static std::unordered_map<TypeIndex, size_t> priority_map = []
+    {
+        static constexpr std::array priorities = {
+            /// Complex types have highest priority.
+            TypeIndex::Array,
+            TypeIndex::Tuple,
+            TypeIndex::Map,
+            TypeIndex::AggregateFunction,
+
+            /// Enums can be parsed both from strings and numbers.
+            /// So they have high enough priority.
+            TypeIndex::Enum8,
+            TypeIndex::Enum16,
+
+            /// Types that can be parsed from strings.
+            TypeIndex::UUID,
+            TypeIndex::IPv4,
+            TypeIndex::IPv6,
+
+            /// Types that can be parsed from numbers.
+            /// The order:
+            ///    1) Integers
+            ///    2) Big Integers
+            ///    3) Decimals
+            ///    4) Floats
+            /// In each group small types have higher priority.
+            TypeIndex::Int8,
+            TypeIndex::UInt8,
+            TypeIndex::Int16,
+            TypeIndex::UInt16,
+            TypeIndex::Int32,
+            TypeIndex::UInt32,
+            TypeIndex::Int64,
+            TypeIndex::UInt64,
+            TypeIndex::Int128,
+            TypeIndex::UInt128,
+            TypeIndex::Int256,
+            TypeIndex::UInt256,
+            TypeIndex::Decimal32,
+            TypeIndex::Decimal64,
+            TypeIndex::Decimal128,
+            TypeIndex::Decimal256,
+            TypeIndex::Float32,
+            TypeIndex::Float64,
+
+            /// Dates and DateTimes. More simple Date types have higher priority.
+            /// They have lower priority as numbers as some DateTimes sometimes can
+            /// be also parsed from numbers, but we don't want it usually.
+            TypeIndex::Date,
+            TypeIndex::Date32,
+            TypeIndex::DateTime,
+            TypeIndex::DateTime64,
+
+            /// String types have almost the lowest priority,
+            /// as in text formats almost all data can
+            /// be deserialized into String type.
+            TypeIndex::FixedString,
+            TypeIndex::String,
+        };
+
+        std::unordered_map<TypeIndex, size_t> pm;
+
+        pm.reserve(priorities.size());
+        for (size_t i = 0; i != priorities.size(); ++i)
+            pm[priorities[i]] = priorities.size() - i;
+        return pm;
+    }();
+
+    return priority_map;
+}
+
+/// We want to create more or less optimal order of types in which we will try text deserializations.
+/// To do it, for each type we calculate a priority and then sort them by this priority.
+/// Above we defined priority of each data type, but types can be nested and also we can have LowCardinality and Nullable.
+/// To sort any nested types we create a priority that is a tuple of 3 elements:
+/// 1) The maximum depth of nested types like Array/Map/Tuple.
+/// 2) The combination of simple and complex types priorities.
+/// 3) The depth of nested types LowCardinality/Nullable.
+/// So, when we will sort types, first we will sort by the maximum depth of nested types, so more nested types are deserialized first,
+/// then for types with the same depth we sort by the types priority, and last we sort by the depth of LowCardinality/Nullable types,
+/// so if we have types with the same level of nesting and the same priority, we will first try to deserialize LowCardinality/Nullable types
+/// (for example if we have types Array(Array(String)) and Array(Array(Nullable(String))).
+/// This is just a batch of heuristics.
+std::tuple<size_t, size_t, size_t> getTypeTextDeserializePriority(const DataTypePtr & type, size_t nested_depth, size_t simple_nested_depth, const std::unordered_map<TypeIndex, size_t> & priority_map)
+{
+    if (const auto * nullable_type = typeid_cast<const DataTypeNullable *>(type.get()))
+        return getTypeTextDeserializePriority(nullable_type->getNestedType(), nested_depth, simple_nested_depth + 1, priority_map);
+
+    if (const auto * lc_type = typeid_cast<const DataTypeLowCardinality *>(type.get()))
+        return getTypeTextDeserializePriority(lc_type->getDictionaryType(), nested_depth, simple_nested_depth + 1, priority_map);
+
+    if (const auto * array_type = typeid_cast<const DataTypeArray *>(type.get()))
+    {
+        auto [elements_nested_depth, elements_priority, elements_simple_nested_depth] = getTypeTextDeserializePriority(array_type->getNestedType(), nested_depth + 1, simple_nested_depth, priority_map);
+        return {elements_nested_depth, elements_priority + priority_map.at(TypeIndex::Array), elements_simple_nested_depth};
+    }
+
+    if (const auto * tuple_type = typeid_cast<const DataTypeTuple *>(type.get()))
+    {
+        size_t max_nested_depth = 0;
+        size_t sum_priority = 0;
+        size_t max_simple_nested_depth = 0;
+        for (const auto & elem : tuple_type->getElements())
+        {
+            auto [elem_nested_depth, elem_priority, elem_simple_nested_depth] = getTypeTextDeserializePriority(elem, nested_depth + 1, simple_nested_depth, priority_map);
+            sum_priority += elem_priority;
+            if (elem_nested_depth > max_nested_depth)
+                max_nested_depth = elem_nested_depth;
+            if (elem_simple_nested_depth > max_simple_nested_depth)
+                max_simple_nested_depth = elem_simple_nested_depth;
+        }
+
+        return {max_nested_depth, sum_priority + priority_map.at(TypeIndex::Tuple), max_simple_nested_depth};
+    }
+
+    if (const auto * map_type = typeid_cast<const DataTypeMap *>(type.get()))
+    {
+        auto [key_max_depth, key_priority, key_simple_nested_depth] = getTypeTextDeserializePriority(map_type->getKeyType(), nested_depth + 1, simple_nested_depth, priority_map);
+        auto [value_max_depth, value_priority, value_simple_nested_depth] = getTypeTextDeserializePriority(map_type->getValueType(), nested_depth + 1, simple_nested_depth, priority_map);
+        return {std::max(key_max_depth, value_max_depth), key_priority + value_priority + priority_map.at(TypeIndex::Map), std::max(key_simple_nested_depth, value_simple_nested_depth)};
+    }
+
+    if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(type.get()))
+    {
+        size_t max_priority = 0;
+        size_t max_depth = 0;
+        size_t max_simple_nested_depth = 0;
+        for (const auto & variant : variant_type->getVariants())
+        {
+            auto [variant_max_depth, variant_priority, variant_simple_nested_depth] = getTypeTextDeserializePriority(variant, nested_depth, simple_nested_depth, priority_map);
+            if (variant_priority > max_priority)
+                max_priority = variant_priority;
+            if (variant_max_depth > max_depth)
+                max_depth = variant_max_depth;
+            if (variant_simple_nested_depth > max_simple_nested_depth)
+                max_simple_nested_depth = variant_simple_nested_depth;
+        }
+
+        return {max_depth, max_priority, max_simple_nested_depth};
+    }
+
+    /// Bool type should have priority higher then all integers.
+    if (isBool(type))
+        return {nested_depth, priority_map.at(TypeIndex::Int8) + 1, simple_nested_depth};
+
+    auto it = priority_map.find(type->getTypeId());
+    return {nested_depth, it == priority_map.end() ? 0 : it->second, simple_nested_depth};
+}
+
+}
+
+std::vector<size_t> SerializationVariant::getVariantsDeserializeTextOrder(const DB::DataTypes & variant_types)
+{
+    std::vector<std::tuple<size_t, size_t, size_t>> priorities;
+    priorities.reserve(variant_types.size());
+    std::vector<size_t> order;
+    order.reserve(variant_types.size());
+    const auto & priority_map = getTypesTextDeserializePriorityMap();
+    for (size_t i = 0; i != variant_types.size(); ++i)
+    {
+        priorities.push_back(getTypeTextDeserializePriority(variant_types[i], 0, 0, priority_map));
+        order.push_back(i);
+    }
+
+    std::sort(order.begin(), order.end(), [&](size_t left, size_t right) { return priorities[left] > priorities[right]; });
+    return order;
+}
+
+
+bool SerializationVariant::tryDeserializeImpl(
+    IColumn & column,
+    const String & field,
+    std::function<bool(ReadBuffer &)> check_for_null,
+    std::function<bool(IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer &)> try_deserialize_nested) const
+{
+    auto & column_variant = assert_cast<ColumnVariant &>(column);
+    ReadBufferFromString null_buf(field);
+    if (check_for_null(null_buf) && null_buf.eof())
+    {
+        column_variant.insertDefault();
+        return true;
+    }
+
+    for (size_t global_discr : deserialize_text_order)
+    {
+        ReadBufferFromString variant_buf(field);
+        auto & variant_column = column_variant.getVariantByGlobalDiscriminator(global_discr);
+        size_t prev_size = variant_column.size();
+        if (try_deserialize_nested(variant_column, variants[global_discr], variant_buf) && variant_buf.eof())
+        {
+            column_variant.getLocalDiscriminators().push_back(column_variant.localDiscriminatorByGlobal(global_discr));
+            column_variant.getOffsets().push_back(prev_size);
+            return true;
+        }
+        else if (variant_column.size() > prev_size)
+        {
+            variant_column.popBack(1);
+        }
+    }
+
+    return false;
+}
+
+void SerializationVariant::serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullEscaped(ostr, settings);
+    else
+        variants[global_discr]->serializeTextEscaped(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readEscapedString(field, istr);
+    return tryDeserializeTextEscapedImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readEscapedString(field, istr);
+    if (!tryDeserializeTextEscapedImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse escaped value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeTextEscapedImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullEscaped(buf, settings);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeTextEscaped(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullRaw(ostr, settings);
+    else
+        variants[global_discr]->serializeTextRaw(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readString(field, istr);
+    return tryDeserializeTextRawImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readString(field, istr);
+    if (!tryDeserializeTextRawImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse raw value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeTextRawImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullRaw(buf, settings);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeTextRaw(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullQuoted(ostr);
+    else
+        variants[global_discr]->serializeTextQuoted(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    if (!tryReadQuotedField(field, istr))
+        return false;
+    return tryDeserializeTextQuotedImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readQuotedField(field, istr);
+    if (!tryDeserializeTextQuotedImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse quoted value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeTextQuotedImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullQuoted(buf);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeTextQuoted(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullCSV(ostr, settings);
+    else
+        variants[global_discr]->serializeTextCSV(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readCSVStringInto<String, true, false>(field, istr, settings.csv);
+    return tryDeserializeTextCSVImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readCSVField(field, istr, settings.csv);
+    if (!tryDeserializeTextCSVImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse CSV value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeTextCSVImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullCSV(buf, settings);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeTextCSV(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullText(ostr, settings);
+    else
+        variants[global_discr]->serializeText(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readStringUntilEOF(field, istr);
+    return tryDeserializeWholeTextImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readStringUntilEOF(field, istr);
+    if (!tryDeserializeWholeTextImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse text value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeWholeTextImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullText(buf);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeWholeText(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullJSON(ostr);
+    else
+        variants[global_discr]->serializeTextJSON(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+bool SerializationVariant::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    if (!tryReadJSONField(field, istr, settings.json))
+        return false;
+    return tryDeserializeTextJSONImpl(column, field, settings);
+}
+
+void SerializationVariant::deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    String field;
+    readJSONField(field, istr, settings.json);
+    if (!tryDeserializeTextJSONImpl(column, field, settings))
+        throw Exception(ErrorCodes::INCORRECT_DATA, "Cannot parse JSON value of type {} here: {}", variant_name, field);
+}
+
+bool SerializationVariant::tryDeserializeTextJSONImpl(DB::IColumn & column, const String & field, const DB::FormatSettings & settings) const
+{
+    auto check_for_null = [&](ReadBuffer & buf)
+    {
+        return SerializationNullable::tryDeserializeNullJSON(buf);
+    };
+    auto try_deserialize_variant =[&](IColumn & variant_column, const SerializationPtr & variant_serialization, ReadBuffer & buf)
+    {
+        return variant_serialization->tryDeserializeTextJSON(variant_column, buf, settings);
+    };
+
+    return tryDeserializeImpl(column, field, check_for_null, try_deserialize_variant);
+}
+
+void SerializationVariant::serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
+{
+    const ColumnVariant & col = assert_cast<const ColumnVariant &>(column);
+    auto global_discr = col.globalDiscriminatorAt(row_num);
+    if (global_discr == ColumnVariant::NULL_DISCRIMINATOR)
+        SerializationNullable::serializeNullXML(ostr);
+    else
+        variants[global_discr]->serializeTextXML(col.getVariantByGlobalDiscriminator(global_discr), col.offsetAt(row_num), ostr, settings);
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationVariant.h b/src/DataTypes/Serializations/SerializationVariant.h
new file mode 100644
index 00000000000..3f53dcf1339
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationVariant.h
@@ -0,0 +1,139 @@
+#pragma once
+
+#include <DataTypes/Serializations/ISerialization.h>
+#include <DataTypes/Serializations/SerializationVariantElement.h>
+
+namespace DB
+{
+
+/// Class for serializing/deserializing column with Variant type.
+/// It supports both text and binary bulk serializations/deserializations.
+///
+/// During text serialization it checks discriminator of the current row and
+/// uses corresponding text serialization of this variant.
+///
+/// During text deserialization it tries all variants deserializations
+/// (using tryDeserializeText* methods of ISerialization) in predefined order
+/// and inserts data in the first variant with succeeded deserialization.
+///
+/// During binary bulk serialization it transforms local discriminators
+/// to global and serializes them into a separate stream VariantDiscriminators.
+/// Each variant is serialized into a separate stream with path VariantElements/VariantElement
+/// (VariantElements stream is needed for correct sub-columns creation). We store and serialize
+/// variants in a sparse form (the size of a variant column equals to the number of its discriminator
+/// in the discriminators column), so during deserialization the limit for each variant is
+/// calculated according to discriminators column.
+/// Offsets column is not serialized and stored only in memory.
+///
+/// During binary bulk deserialization we first deserialize discriminators from corresponding stream
+/// and use them to calculate the limit for each variant. Each variant is deserialized from
+/// corresponding stream using calculated limit. Offsets column is not deserialized and constructed
+/// according to discriminators.
+class SerializationVariant : public ISerialization
+{
+public:
+    using VariantSerializations = std::vector<SerializationPtr>;
+
+    explicit SerializationVariant(
+        const VariantSerializations & variants_,
+        const std::vector<String> & variant_names_,
+        const std::vector<size_t> & deserialize_text_order_,
+        const String & variant_name_)
+        : variants(variants_), variant_names(variant_names_), deserialize_text_order(deserialize_text_order_), variant_name(variant_name_)
+    {
+    }
+
+    void enumerateStreams(
+        EnumerateStreamsSettings & settings,
+        const StreamCallback & callback,
+        const SubstreamData & data) const override;
+
+    void serializeBinaryBulkStatePrefix(
+        const IColumn & column,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+
+    void serializeBinary(const Field & field, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeBinary(Field & field, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeBinary(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeBinary(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeText(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;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextRaw(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+    void deserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+    bool tryDeserializeTextRaw(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override;
+
+    void serializeTextXML(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const override;
+
+    /// Determine the order in which we should try to deserialize variants.
+    /// In some cases the text representation of a value can be deserialized
+    /// into several types (for example, almost all text values can be deserialized
+    /// into String type), so we uses some heuristics to determine the more optimal order.
+    static std::vector<size_t> getVariantsDeserializeTextOrder(const DataTypes & variant_types);
+
+private:
+    void addVariantElementToPath(SubstreamPath & path, size_t i) const;
+
+    bool tryDeserializeTextEscapedImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+    bool tryDeserializeTextQuotedImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+    bool tryDeserializeWholeTextImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+    bool tryDeserializeTextCSVImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+    bool tryDeserializeTextJSONImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+    bool tryDeserializeTextRawImpl(IColumn & column, const String & field, const FormatSettings & settings) const;
+
+    bool tryDeserializeImpl(
+        IColumn & column,
+        const String & field,
+        std::function<bool(ReadBuffer &)> check_for_null,
+        std::function<bool(IColumn & variant_columm, const SerializationPtr & nested, ReadBuffer &)> try_deserialize_nested) const;
+
+    VariantSerializations variants;
+    std::vector<String> variant_names;
+    std::vector<size_t> deserialize_text_order;
+    /// Name of Variant data type for better exception messages.
+    String variant_name;
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationVariantElement.cpp b/src/DataTypes/Serializations/SerializationVariantElement.cpp
new file mode 100644
index 00000000000..7d4487fe6da
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationVariantElement.cpp
@@ -0,0 +1,271 @@
+#include <DataTypes/Serializations/SerializationVariantElement.h>
+#include <DataTypes/Serializations/SerializationNumber.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
+void SerializationVariantElement::enumerateStreams(
+    DB::ISerialization::EnumerateStreamsSettings & settings,
+    const DB::ISerialization::StreamCallback & callback,
+    const DB::ISerialization::SubstreamData & data) const
+{
+    /// We will need stream for discriminators during deserialization.
+    settings.path.push_back(Substream::VariantDiscriminators);
+    callback(settings.path);
+    settings.path.pop_back();
+
+    addVariantToPath(settings.path);
+    settings.path.back().data = data;
+    nested_serialization->enumerateStreams(settings, callback, data);
+    removeVariantFromPath(settings.path);
+}
+
+void SerializationVariantElement::serializeBinaryBulkStatePrefix(const IColumn &, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
+{
+    throw Exception(
+        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStatePrefix is not implemented for SerializationVariantElement");
+}
+
+void SerializationVariantElement::serializeBinaryBulkStateSuffix(SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
+{
+    throw Exception(
+        ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkStateSuffix is not implemented for SerializationVariantElement");
+}
+
+struct DeserializeBinaryBulkStateVariantElement : public ISerialization::DeserializeBinaryBulkState
+{
+    /// During deserialization discriminators and variant streams can be shared.
+    /// For example we can read several variant elements together: "select v.UInt32, v.String from table",
+    /// or we can read the whole variant and some of variant elements: "select v, v.UInt32 from table".
+    /// To read the same column from the same stream more than once we use substream cache,
+    /// but this cache stores the whole column, not only the current range.
+    /// During deserialization of variant element discriminators and variant columns are not stored
+    /// in the result column, so we need to store them inside deserialization state, so we can use
+    /// substream cache correctly.
+    ColumnPtr discriminators;
+    ColumnPtr variant;
+
+    ISerialization::DeserializeBinaryBulkStatePtr variant_element_state;
+};
+
+void SerializationVariantElement::deserializeBinaryBulkStatePrefix(DeserializeBinaryBulkSettings & settings, DeserializeBinaryBulkStatePtr & state) const
+{
+    auto variant_element_state = std::make_shared<DeserializeBinaryBulkStateVariantElement>();
+
+    addVariantToPath(settings.path);
+    nested_serialization->deserializeBinaryBulkStatePrefix(settings, variant_element_state->variant_element_state);
+    removeVariantFromPath(settings.path);
+
+    state = std::move(variant_element_state);
+}
+
+void SerializationVariantElement::serializeBinaryBulkWithMultipleStreams(const IColumn &, size_t, size_t, SerializeBinaryBulkSettings &, SerializeBinaryBulkStatePtr &) const
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method serializeBinaryBulkWithMultipleStreams is not implemented for SerializationVariantElement");
+}
+
+void SerializationVariantElement::deserializeBinaryBulkWithMultipleStreams(
+    ColumnPtr & result_column,
+    size_t limit,
+    DeserializeBinaryBulkSettings & settings,
+    DeserializeBinaryBulkStatePtr & state,
+    SubstreamsCache * cache) const
+{
+    auto * variant_element_state = checkAndGetState<DeserializeBinaryBulkStateVariantElement>(state);
+
+    /// First, deserialize discriminators from Variant column.
+    settings.path.push_back(Substream::VariantDiscriminators);
+    if (auto cached_discriminators = getFromSubstreamsCache(cache, settings.path))
+    {
+        variant_element_state->discriminators = cached_discriminators;
+    }
+    else
+    {
+        auto * discriminators_stream = settings.getter(settings.path);
+        if (!discriminators_stream)
+            return;
+
+        /// If we started to read a new column, reinitialize discriminators column in deserialization state.
+        if (!variant_element_state->discriminators || result_column->empty())
+            variant_element_state->discriminators = ColumnVariant::ColumnDiscriminators::create();
+
+        SerializationNumber<ColumnVariant::Discriminator>().deserializeBinaryBulk(*variant_element_state->discriminators->assumeMutable(), *discriminators_stream, limit, 0);
+        addToSubstreamsCache(cache, settings.path, variant_element_state->discriminators);
+    }
+    settings.path.pop_back();
+
+    /// Iterate through new discriminators to calculate the limit for our variant.
+    const auto & discriminators_data = assert_cast<const ColumnVariant::ColumnDiscriminators &>(*variant_element_state->discriminators).getData();
+    size_t discriminators_offset = variant_element_state->discriminators->size() - limit;
+    size_t variant_limit = 0;
+    for (size_t i = discriminators_offset; i != discriminators_data.size(); ++i)
+        variant_limit += (discriminators_data[i] == variant_discriminator);
+
+    /// Now we know the limit for our variant and can deserialize it.
+
+    /// If result column is Nullable, fill null map and extract nested column.
+    MutableColumnPtr mutable_column = result_column->assumeMutable();
+    if (isColumnNullable(*mutable_column))
+    {
+        auto & nullable_column = assert_cast<ColumnNullable &>(*mutable_column);
+        NullMap & null_map = nullable_column.getNullMapData();
+        /// If we have only our discriminator in range, fill null map with 0.
+        if (variant_limit == limit)
+        {
+            null_map.resize_fill(null_map.size() + limit, 0);
+        }
+        /// If no our discriminator in current range, fill null map with 1.
+        else if (variant_limit == 0)
+        {
+            null_map.resize_fill(null_map.size() + limit, 1);
+        }
+        /// Otherwise we should iterate through discriminators to fill null map.
+        else
+        {
+            null_map.reserve(null_map.size() + limit);
+            for (size_t i = discriminators_offset; i != discriminators_data.size(); ++i)
+                null_map.push_back(discriminators_data[i] != variant_discriminator);
+        }
+
+        mutable_column = nullable_column.getNestedColumnPtr()->assumeMutable();
+    }
+
+    /// If we started to read a new column, reinitialize variant column in deserialization state.
+    if (!variant_element_state->variant || result_column->empty())
+    {
+        variant_element_state->variant = mutable_column->cloneEmpty();
+
+        /// When result column is LowCardinality(Nullable(T)) we should
+        /// remove Nullable from variant column before deserialization.
+        if (isColumnLowCardinalityNullable(*mutable_column))
+            assert_cast<ColumnLowCardinality &>(*variant_element_state->variant->assumeMutable()).nestedRemoveNullable();
+    }
+
+    /// If nothing to deserialize, just insert defaults.
+    if (variant_limit == 0)
+    {
+        mutable_column->insertManyDefaults(limit);
+        return;
+    }
+
+    addVariantToPath(settings.path);
+    nested_serialization->deserializeBinaryBulkWithMultipleStreams(variant_element_state->variant, variant_limit, settings, variant_element_state->variant_element_state, cache);
+    removeVariantFromPath(settings.path);
+
+    /// If nothing was deserialized when variant_limit > 0
+    /// it means that we don't have a stream for such sub-column.
+    /// It may happen during ALTER MODIFY column with Variant extension.
+    /// In this case we should just insert default values.
+    if (variant_element_state->variant->empty())
+    {
+        mutable_column->insertManyDefaults(limit);
+        return;
+    }
+
+    size_t variant_offset = variant_element_state->variant->size() - variant_limit;
+
+    /// If we have only our discriminator in range, insert the whole range to result column.
+    if (variant_limit == limit)
+    {
+        mutable_column->insertRangeFrom(*variant_element_state->variant, variant_offset, variant_limit);
+    }
+    /// Otherwise iterate through discriminators and insert value from variant or default value depending on the discriminator.
+    else
+    {
+        for (size_t i = discriminators_offset; i != discriminators_data.size(); ++i)
+        {
+            if (discriminators_data[i] == variant_discriminator)
+                mutable_column->insertFrom(*variant_element_state->variant, variant_offset++);
+            else
+                mutable_column->insertDefault();
+        }
+    }
+}
+
+void SerializationVariantElement::addVariantToPath(DB::ISerialization::SubstreamPath & path) const
+{
+    path.push_back(Substream::VariantElements);
+    path.push_back(Substream::VariantElement);
+    path.back().variant_element_name = variant_element_name;
+}
+
+void SerializationVariantElement::removeVariantFromPath(DB::ISerialization::SubstreamPath & path) const
+{
+    path.pop_back();
+    path.pop_back();
+}
+
+SerializationVariantElement::VariantSubcolumnCreator::VariantSubcolumnCreator(
+    const ColumnPtr & local_discriminators_,
+    const String & variant_element_name_,
+    ColumnVariant::Discriminator global_variant_discriminator_,
+    ColumnVariant::Discriminator local_variant_discriminator_)
+    : local_discriminators(local_discriminators_)
+    , variant_element_name(variant_element_name_)
+    , global_variant_discriminator(global_variant_discriminator_)
+    , local_variant_discriminator(local_variant_discriminator_)
+{
+}
+
+DataTypePtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB::DataTypePtr & prev) const
+{
+    return makeNullableOrLowCardinalityNullableSafe(prev);
+}
+
+SerializationPtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB::SerializationPtr & prev) const
+{
+    return std::make_shared<SerializationVariantElement>(prev, variant_element_name, global_variant_discriminator);
+}
+
+ColumnPtr SerializationVariantElement::VariantSubcolumnCreator::create(const DB::ColumnPtr & prev) const
+{
+    /// Case when original Variant column contained only one non-empty variant and no NULLs.
+    /// In this case just use this variant.
+    if (prev->size() == local_discriminators->size())
+        return makeNullableOrLowCardinalityNullableSafe(prev);
+
+    /// If this variant is empty, fill result column with default values.
+    if (prev->empty())
+    {
+        auto res = makeNullableOrLowCardinalityNullableSafe(prev)->cloneEmpty();
+        res->insertManyDefaults(local_discriminators->size());
+        return res;
+    }
+
+    /// In general case we should iterate through discriminators and create null-map for our variant.
+    NullMap null_map;
+    null_map.reserve(local_discriminators->size());
+    const auto & local_discriminators_data = assert_cast<const ColumnVariant::ColumnDiscriminators &>(*local_discriminators).getData();
+    for (auto local_discr : local_discriminators_data)
+        null_map.push_back(local_discr != local_variant_discriminator);
+
+    /// Now we can create new column from null-map and variant column using IColumn::expand.
+    auto res_column = IColumn::mutate(prev);
+
+    /// Special case for LowCardinality. We want the result to be LowCardinality(Nullable),
+    /// but we don't have a good way to apply null-mask for LowCardinality(), so, we first
+    /// convert our column to LowCardinality(Nullable()) and then use expand which will
+    /// fill rows with 0 in mask with default value (that is NULL).
+    if (prev->lowCardinality())
+        res_column = assert_cast<ColumnLowCardinality &>(*res_column).cloneNullable();
+
+    res_column->expand(null_map, /*inverted = */ true);
+
+    if (res_column->canBeInsideNullable())
+    {
+        auto null_map_col = ColumnUInt8::create();
+        null_map_col->getData() = std::move(null_map);
+        return ColumnNullable::create(std::move(res_column), std::move(null_map_col));
+    }
+
+    return res_column;
+}
+
+}
diff --git a/src/DataTypes/Serializations/SerializationVariantElement.h b/src/DataTypes/Serializations/SerializationVariantElement.h
new file mode 100644
index 00000000000..aafecf43d39
--- /dev/null
+++ b/src/DataTypes/Serializations/SerializationVariantElement.h
@@ -0,0 +1,87 @@
+#pragma once
+
+#include <DataTypes/Serializations/SerializationWrapper.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnVariant.h>
+
+namespace DB
+{
+
+class SerializationVariant;
+
+/// Serialization for Variant element when we read it as a subcolumn.
+class SerializationVariantElement final : public SerializationWrapper
+{
+private:
+    /// To be able to deserialize Variant element as a subcolumn
+    /// we need its type name and global discriminator.
+    String variant_element_name;
+    ColumnVariant::Discriminator variant_discriminator;
+
+public:
+    SerializationVariantElement(const SerializationPtr & nested_, const String & variant_element_name_, ColumnVariant::Discriminator variant_discriminator_)
+        : SerializationWrapper(nested_)
+        , variant_element_name(variant_element_name_)
+        , variant_discriminator(variant_discriminator_)
+    {
+    }
+
+    void enumerateStreams(
+        EnumerateStreamsSettings & settings,
+        const StreamCallback & callback,
+        const SubstreamData & data) const override;
+
+    void serializeBinaryBulkStatePrefix(
+        const IColumn & column,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkStateSuffix(
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkStatePrefix(
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state) const override;
+
+    void serializeBinaryBulkWithMultipleStreams(
+        const IColumn & column,
+        size_t offset,
+        size_t limit,
+        SerializeBinaryBulkSettings & settings,
+        SerializeBinaryBulkStatePtr & state) const override;
+
+    void deserializeBinaryBulkWithMultipleStreams(
+        ColumnPtr & column,
+        size_t limit,
+        DeserializeBinaryBulkSettings & settings,
+        DeserializeBinaryBulkStatePtr & state,
+        SubstreamsCache * cache) const override;
+
+private:
+    friend SerializationVariant;
+
+    void addVariantToPath(SubstreamPath & path) const;
+    void removeVariantFromPath(SubstreamPath & path) const;
+
+    struct VariantSubcolumnCreator : public ISubcolumnCreator
+    {
+        const ColumnPtr local_discriminators;
+        const String variant_element_name;
+        const ColumnVariant::Discriminator global_variant_discriminator;
+        const ColumnVariant::Discriminator local_variant_discriminator;
+
+        VariantSubcolumnCreator(
+            const ColumnPtr & local_discriminators_,
+            const String & variant_element_name_,
+            ColumnVariant::Discriminator global_variant_discriminator_,
+            ColumnVariant::Discriminator local_variant_discriminator_);
+
+        DataTypePtr create(const DataTypePtr & prev) const override;
+        ColumnPtr create(const ColumnPtr & prev) const override;
+        SerializationPtr create(const SerializationPtr & prev) const override;
+    };
+};
+
+}
diff --git a/src/DataTypes/Serializations/SerializationWrapper.cpp b/src/DataTypes/Serializations/SerializationWrapper.cpp
index 18e4891ee65..bde52bb8096 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.cpp
+++ b/src/DataTypes/Serializations/SerializationWrapper.cpp
@@ -96,6 +96,11 @@ void SerializationWrapper::deserializeTextEscaped(IColumn & column, ReadBuffer &
     nested_serialization->deserializeTextEscaped(column, istr, settings);
 }
 
+bool SerializationWrapper::tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return nested_serialization->tryDeserializeTextEscaped(column, istr, settings);
+}
+
 void SerializationWrapper::serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     nested_serialization->serializeTextQuoted(column, row_num, ostr, settings);
@@ -106,6 +111,11 @@ void SerializationWrapper::deserializeTextQuoted(IColumn & column, ReadBuffer &
     nested_serialization->deserializeTextQuoted(column, istr, settings);
 }
 
+bool SerializationWrapper::tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return nested_serialization->tryDeserializeTextQuoted(column, istr, settings);
+}
+
 void SerializationWrapper::serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     nested_serialization->serializeTextCSV(column, row_num, ostr, settings);
@@ -116,6 +126,11 @@ void SerializationWrapper::deserializeTextCSV(IColumn & column, ReadBuffer & ist
     nested_serialization->deserializeTextCSV(column, istr, settings);
 }
 
+bool SerializationWrapper::tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return nested_serialization->tryDeserializeTextCSV(column, istr, settings);
+}
+
 void SerializationWrapper::serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     nested_serialization->serializeText(column, row_num, ostr, settings);
@@ -126,6 +141,11 @@ void SerializationWrapper::deserializeWholeText(IColumn & column, ReadBuffer & i
     nested_serialization->deserializeWholeText(column, istr, settings);
 }
 
+bool SerializationWrapper::tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return nested_serialization->tryDeserializeWholeText(column, istr, settings);
+}
+
 void SerializationWrapper::serializeTextJSON(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings & settings) const
 {
     nested_serialization->serializeTextJSON(column, row_num, ostr, settings);
@@ -136,6 +156,11 @@ void SerializationWrapper::deserializeTextJSON(IColumn & column, ReadBuffer & is
     nested_serialization->deserializeTextJSON(column, istr, settings);
 }
 
+bool SerializationWrapper::tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const
+{
+    return nested_serialization->tryDeserializeTextJSON(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);
diff --git a/src/DataTypes/Serializations/SerializationWrapper.h b/src/DataTypes/Serializations/SerializationWrapper.h
index 31900f93148..6c5e2046062 100644
--- a/src/DataTypes/Serializations/SerializationWrapper.h
+++ b/src/DataTypes/Serializations/SerializationWrapper.h
@@ -63,18 +63,23 @@ public:
 
     void serializeTextEscaped(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextQuoted(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeTextCSV(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
 
     void serializeText(const IColumn & column, size_t row_num, WriteBuffer & ostr, const FormatSettings &) const override;
     void deserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) const override;
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings &) 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;
+    bool tryDeserializeTextJSON(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/Serializations/SimpleTextSerialization.h b/src/DataTypes/Serializations/SimpleTextSerialization.h
index 0247f30b30a..11f56de73d1 100644
--- a/src/DataTypes/Serializations/SimpleTextSerialization.h
+++ b/src/DataTypes/Serializations/SimpleTextSerialization.h
@@ -36,29 +36,67 @@ protected:
         deserializeText(column, istr, settings, true);
     }
 
+    bool tryDeserializeWholeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
+    {
+        return tryDeserializeText(column, istr, settings, true);
+    }
+
     void deserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
     {
         deserializeText(column, istr, settings, false);
     }
 
+    bool tryDeserializeTextEscaped(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
+    {
+        return tryDeserializeText(column, istr, settings, false);
+    }
+
     void deserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
     {
         deserializeText(column, istr, settings, false);
     }
 
+    bool tryDeserializeTextQuoted(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
+    {
+        return tryDeserializeText(column, istr, settings, false);
+    }
+
     void deserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
     {
         deserializeText(column, istr, settings, false);
     }
 
+    bool tryDeserializeTextJSON(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
+    {
+        return tryDeserializeText(column, istr, settings, false);
+    }
+
     void deserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
     {
         deserializeText(column, istr, settings, false);
     }
 
+    bool tryDeserializeTextCSV(IColumn & column, ReadBuffer & istr, const FormatSettings & settings) const override
+    {
+        return tryDeserializeText(column, istr, settings, false);
+    }
+
     /// whole = true means that buffer contains only one value, so we should read until EOF.
     /// It's needed to check if there is garbage after parsed field.
     virtual void deserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings &, bool whole) const = 0;
+
+    virtual bool tryDeserializeText(IColumn & column, ReadBuffer & istr, const FormatSettings & settings, bool whole) const
+    {
+        try
+        {
+            deserializeText(column, istr, settings, whole);
+            return true;
+        }
+        catch (...)
+        {
+            return false;
+        }
+    }
 };
 
 }
diff --git a/src/DataTypes/Serializations/tests/gtest_json_parser.cpp b/src/DataTypes/Serializations/tests/gtest_json_parser.cpp
index 9b0c8e44d02..1b5b02d579c 100644
--- a/src/DataTypes/Serializations/tests/gtest_json_parser.cpp
+++ b/src/DataTypes/Serializations/tests/gtest_json_parser.cpp
@@ -34,7 +34,7 @@ TEST(JSONDataParser, ReadJSON)
         JSONDataParser<SimdJSONParser> parser;
         ReadBufferFromString buf(json_bad);
         String res;
-        parser.readJSON(res, buf);
+        JSONDataParser<SimdJSONParser>::readJSON(res, buf);
         ASSERT_EQ(json1, res);
     }
 
@@ -44,7 +44,7 @@ TEST(JSONDataParser, ReadJSON)
         JSONDataParser<SimdJSONParser> parser;
         ReadBufferFromString buf(json_bad);
         String res;
-        parser.readJSON(res, buf);
+        JSONDataParser<SimdJSONParser>::readJSON(res, buf);
         ASSERT_EQ(json2, res);
     }
 }
diff --git a/src/DataTypes/Utils.cpp b/src/DataTypes/Utils.cpp
index e58331a8bcb..2f29d57d454 100644
--- a/src/DataTypes/Utils.cpp
+++ b/src/DataTypes/Utils.cpp
@@ -223,6 +223,7 @@ bool canBeSafelyCasted(const DataTypePtr & from_type, const DataTypePtr & to_typ
         case TypeIndex::AggregateFunction:
         case TypeIndex::Nothing:
         case TypeIndex::JSONPaths:
+        case TypeIndex::Variant:
             return false;
     }
 
diff --git a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
index e40734e0a57..0ae325871fb 100644
--- a/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
+++ b/src/DataTypes/fuzzers/data_type_deserialization_fuzzer.cpp
@@ -24,6 +24,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 
         auto initialize = [&]() mutable
         {
+            if (context)
+                return true;
+
             shared_context = Context::createShared();
             context = Context::createGlobal(shared_context.get());
             context->makeGlobalContext();
diff --git a/src/DataTypes/getLeastSupertype.cpp b/src/DataTypes/getLeastSupertype.cpp
index e5bdb4b267f..e69b0411aac 100644
--- a/src/DataTypes/getLeastSupertype.cpp
+++ b/src/DataTypes/getLeastSupertype.cpp
@@ -18,6 +18,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeVariant.h>
 
 
 namespace DB
@@ -383,6 +384,7 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
                 return throwOrReturn<on_error>(types, "because some of them are Maps and some of them are not", ErrorCodes::NO_COMMON_TYPE);
 
             auto keys_common_type = getLeastSupertype<on_error>(key_types);
+
             auto values_common_type = getLeastSupertype<on_error>(value_types);
             /// When on_error == LeastSupertypeOnError::Null and we cannot get least supertype for keys or values,
             /// keys_common_type or values_common_type will be nullptr, we should return nullptr in this case.
@@ -424,6 +426,7 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
             else
             {
                 auto nested_type = getLeastSupertype<on_error>(nested_types);
+
                 /// When on_error == LeastSupertypeOnError::Null and we cannot get least supertype,
                 /// nested_type will be nullptr, we should return nullptr in this case.
                 if (!nested_type)
@@ -460,6 +463,9 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
             /// nested_type will be nullptr, we should return nullptr in this case.
             if (!nested_type)
                 return nullptr;
+            /// Common type for Nullable(Nothing) and Variant(...) is Variant(...)
+            if (isVariant(nested_type))
+                return nested_type;
             return std::make_shared<DataTypeNullable>(nested_type);
         }
     }
@@ -471,16 +477,18 @@ DataTypePtr getLeastSupertype(const DataTypes & types)
         type_ids.insert(type->getTypeId());
 
     /// For String and FixedString, or for different FixedStrings, the common type is String.
-    /// No other types are compatible with Strings. TODO Enums?
+    /// If there are Enums and any type of Strings, the common type is String.
+    /// No other types are compatible with Strings.
     {
         size_t have_string = type_ids.count(TypeIndex::String);
         size_t have_fixed_string = type_ids.count(TypeIndex::FixedString);
+        size_t have_enums = type_ids.count(TypeIndex::Enum8) + type_ids.count(TypeIndex::Enum16);
 
         if (have_string || have_fixed_string)
         {
-            bool all_strings = type_ids.size() == (have_string + have_fixed_string);
-            if (!all_strings)
-                return throwOrReturn<on_error>(types, "because some of them are String/FixedString and some of them are not", ErrorCodes::NO_COMMON_TYPE);
+            bool all_compatible_with_string = type_ids.size() == (have_string + have_fixed_string + have_enums);
+            if (!all_compatible_with_string)
+                return throwOrReturn<on_error>(types, "because some of them are String/FixedString/Enum and some of them are not", ErrorCodes::NO_COMMON_TYPE);
 
             return std::make_shared<DataTypeString>();
         }
@@ -637,6 +645,38 @@ DataTypePtr getLeastSupertypeOrString(const DataTypes & types)
     return getLeastSupertype<LeastSupertypeOnError::String>(types);
 }
 
+template<>
+DataTypePtr getLeastSupertype<LeastSupertypeOnError::Variant>(const DataTypes & types)
+{
+    auto common_type = getLeastSupertype<LeastSupertypeOnError::Null>(types);
+    if (common_type)
+        return common_type;
+
+    /// Create Variant with provided arguments as variants.
+    DataTypes variants;
+    for (const auto & type : types)
+    {
+        /// Nested Variant types are not supported. If we have Variant type
+        /// we use all its variants in the result Variant.
+        if (isVariant(type))
+        {
+            const DataTypes & nested_variants = assert_cast<const DataTypeVariant &>(*type).getVariants();
+            variants.insert(variants.end(), nested_variants.begin(), nested_variants.end());
+        }
+        else
+        {
+            variants.push_back(removeNullableOrLowCardinalityNullable(type));
+        }
+    }
+
+    return std::make_shared<DataTypeVariant>(variants);
+}
+
+DataTypePtr getLeastSupertypeOrVariant(const DataTypes & types)
+{
+    return getLeastSupertype<LeastSupertypeOnError::Variant>(types);
+}
+
 DataTypePtr tryGetLeastSupertype(const DataTypes & types)
 {
     return getLeastSupertype<LeastSupertypeOnError::Null>(types);
diff --git a/src/DataTypes/getLeastSupertype.h b/src/DataTypes/getLeastSupertype.h
index 2ef4a0e6850..ab920f726b9 100644
--- a/src/DataTypes/getLeastSupertype.h
+++ b/src/DataTypes/getLeastSupertype.h
@@ -9,6 +9,7 @@ enum class LeastSupertypeOnError
     Throw,
     String,
     Null,
+    Variant,
 };
 
 /** Get data type that covers all possible values of passed data types.
@@ -24,6 +25,17 @@ DataTypePtr getLeastSupertype(const DataTypes & types);
 /// All types can be casted to String, because they can be serialized to String.
 DataTypePtr getLeastSupertypeOrString(const DataTypes & types);
 
+/// Same as getLeastSupertype but in case when there is no supertype for provided types
+/// it uses Variant of these types as a supertype. Any type can be casted to a Variant
+/// that contains this type.
+/// As nested Variants are not allowed, if one of the types is Variant, it's variants
+/// are used in the resulting Variant.
+/// Examples:
+/// (UInt64, String) -> Variant(UInt64, String)
+/// (Array(UInt64), Array(String)) -> Variant(Array(UInt64), Array(String))
+/// (Variant(UInt64, String), Array(UInt32)) -> Variant(UInt64, String, Array(UInt32))
+DataTypePtr getLeastSupertypeOrVariant(const DataTypes & types);
+
 /// Same as above but return nullptr instead of throwing exception.
 DataTypePtr tryGetLeastSupertype(const DataTypes & types);
 
diff --git a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
index 0373e55a62d..bf5337c89da 100644
--- a/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
+++ b/src/DataTypes/tests/gtest_DataType_deserializeAsText.cpp
@@ -1,6 +1,7 @@
 #include <Columns/IColumn.h>
 #include <Core/Field.h>
 #include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/IDataType.h>
 #include <Formats/FormatSettings.h>
 #include <IO/ReadBuffer.h>
 
diff --git a/src/Databases/DDLDependencyVisitor.cpp b/src/Databases/DDLDependencyVisitor.cpp
index cb85119e3b0..75a01a6190f 100644
--- a/src/Databases/DDLDependencyVisitor.cpp
+++ b/src/Databases/DDLDependencyVisitor.cpp
@@ -444,8 +444,9 @@ namespace
             ParserSelectWithUnionQuery parser;
             String description = fmt::format("Query for ClickHouse dictionary {}", data.table_name);
             String fixed_query = removeWhereConditionPlaceholder(query);
+            const Settings & settings = data.context->getSettingsRef();
             ASTPtr select = parseQuery(parser, fixed_query, description,
-                                       data.context->getSettingsRef().max_query_size, data.context->getSettingsRef().max_parser_depth);
+                settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 
             DDLDependencyVisitor::Visitor visitor{data};
             visitor.visit(select);
diff --git a/src/Databases/DatabaseAtomic.cpp b/src/Databases/DatabaseAtomic.cpp
index 8a5ba5f033f..c2d0fbe1c00 100644
--- a/src/Databases/DatabaseAtomic.cpp
+++ b/src/Databases/DatabaseAtomic.cpp
@@ -11,6 +11,7 @@
 #include <Common/filesystemHelpers.h>
 #include <Storages/StorageMaterializedView.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <filesystem>
 #include <Interpreters/DDLTask.h>
@@ -76,7 +77,7 @@ String DatabaseAtomic::getTableDataPath(const ASTCreateQuery & query) const
 
 void DatabaseAtomic::drop(ContextPtr)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
     assert(TSA_SUPPRESS_WARNING_FOR_READ(tables).empty());
     try
     {
@@ -115,7 +116,7 @@ StoragePtr DatabaseAtomic::detachTable(ContextPtr /* context */, const String &
 
 void DatabaseAtomic::dropTable(ContextPtr local_context, const String & table_name, bool sync)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
     auto table = tryGetTable(table_name, local_context);
     /// Remove the inner table (if any) to avoid deadlock
     /// (due to attempt to execute DROP from the worker thread)
@@ -179,7 +180,7 @@ void DatabaseAtomic::renameTable(ContextPtr local_context, const String & table_
     if (exchange && !supportsAtomicRename())
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "RENAME EXCHANGE is not supported");
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto & other_db = dynamic_cast<DatabaseAtomic &>(to_database);
     bool inside_database = this == &other_db;
@@ -416,9 +417,9 @@ void DatabaseAtomic::assertCanBeDetached(bool cleanup)
 }
 
 DatabaseTablesIteratorPtr
-DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name) const
+DatabaseAtomic::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const
 {
-    auto base_iter = DatabaseOrdinary::getTablesIterator(local_context, filter_by_table_name);
+    auto base_iter = DatabaseOrdinary::getTablesIterator(local_context, filter_by_table_name, skip_not_loaded);
     return std::make_unique<AtomicDatabaseTablesSnapshotIterator>(std::move(typeid_cast<DatabaseTablesSnapshotIterator &>(*base_iter)));
 }
 
@@ -468,13 +469,30 @@ LoadTaskPtr DatabaseAtomic::startupDatabaseAsync(AsyncLoader & async_loader, Loa
             for (const auto & table : table_names)
                 tryCreateSymlink(table.first, table.second, true);
         });
+    std::scoped_lock lock(mutex);
     return startup_atomic_database_task = makeLoadTask(async_loader, {job});
 }
 
-void DatabaseAtomic::waitDatabaseStarted(bool no_throw) const
+void DatabaseAtomic::waitDatabaseStarted() const
 {
-    if (startup_atomic_database_task)
-        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_atomic_database_task, no_throw);
+    LoadTaskPtr task;
+    {
+        std::scoped_lock lock(mutex);
+        task = startup_atomic_database_task;
+    }
+    if (task)
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task, false);
+}
+
+void DatabaseAtomic::stopLoading()
+{
+    LoadTaskPtr stop_atomic_database;
+    {
+        std::scoped_lock lock(mutex);
+        stop_atomic_database.swap(startup_atomic_database_task);
+    }
+    stop_atomic_database.reset();
+    DatabaseOrdinary::stopLoading();
 }
 
 void DatabaseAtomic::tryCreateSymlink(const String & table_name, const String & actual_data_path, bool if_data_path_exist)
@@ -544,7 +562,7 @@ void DatabaseAtomic::renameDatabase(ContextPtr query_context, const String & new
 {
     /// CREATE, ATTACH, DROP, DETACH and RENAME DATABASE must hold DDLGuard
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     bool check_ref_deps = query_context->getSettingsRef().check_referential_table_dependencies;
     bool check_loading_deps = !check_ref_deps && query_context->getSettingsRef().check_table_dependencies;
diff --git a/src/Databases/DatabaseAtomic.h b/src/Databases/DatabaseAtomic.h
index 83cb51be1ff..b59edd479ba 100644
--- a/src/Databases/DatabaseAtomic.h
+++ b/src/Databases/DatabaseAtomic.h
@@ -46,12 +46,13 @@ public:
 
     void drop(ContextPtr /*context*/) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     void beforeLoadingMetadata(ContextMutablePtr context, LoadingStrictnessLevel mode) override;
 
     LoadTaskPtr startupDatabaseAsync(AsyncLoader & async_loader, LoadJobSet startup_after, LoadingStrictnessLevel mode) override;
-    void waitDatabaseStarted(bool no_throw) const override;
+    void waitDatabaseStarted() const override;
+    void stopLoading() override;
 
     /// Atomic database cannot be detached if there is detached table which still in use
     void assertCanBeDetached(bool cleanup) override;
@@ -87,7 +88,7 @@ protected:
     String path_to_metadata_symlink;
     const UUID db_uuid;
 
-    LoadTaskPtr startup_atomic_database_task;
+    LoadTaskPtr startup_atomic_database_task TSA_GUARDED_BY(mutex);
 };
 
 }
diff --git a/src/Databases/DatabaseDictionary.cpp b/src/Databases/DatabaseDictionary.cpp
index e2e0d52cd88..adb9a659fcd 100644
--- a/src/Databases/DatabaseDictionary.cpp
+++ b/src/Databases/DatabaseDictionary.cpp
@@ -51,7 +51,7 @@ namespace
 
 DatabaseDictionary::DatabaseDictionary(const String & name_, ContextPtr context_)
     : IDatabase(name_), WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("DatabaseDictionary(" + database_name + ")"))
+    , log(getLogger("DatabaseDictionary(" + database_name + ")"))
 {
 }
 
@@ -80,7 +80,7 @@ StoragePtr DatabaseDictionary::tryGetTable(const String & table_name, ContextPtr
     return createStorageDictionary(getDatabaseName(), load_result, getContext());
 }
 
-DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
+DatabaseTablesIteratorPtr DatabaseDictionary::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name, bool /* skip_not_loaded */) const
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(listTables(filter_by_table_name), getDatabaseName());
 }
@@ -115,7 +115,7 @@ ASTPtr DatabaseDictionary::getCreateTableQueryImpl(const String & table_name, Co
     const char * pos = query.data();
     std::string error_message;
     auto ast = tryParseQuery(parser, pos, pos + query.size(), error_message,
-            /* hilite = */ false, "", /* allow_multi_statements = */ false, 0, settings.max_parser_depth);
+        /* hilite = */ false, "", /* allow_multi_statements = */ false, 0, settings.max_parser_depth, settings.max_parser_backtracks, true);
 
     if (!ast && throw_on_error)
         throw Exception::createDeprecated(error_message, ErrorCodes::SYNTAX_ERROR);
@@ -134,7 +134,7 @@ ASTPtr DatabaseDictionary::getCreateDatabaseQuery() const
     }
     auto settings = getContext()->getSettingsRef();
     ParserCreateQuery parser;
-    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
+    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 }
 
 void DatabaseDictionary::shutdown()
diff --git a/src/Databases/DatabaseDictionary.h b/src/Databases/DatabaseDictionary.h
index 425d048aa65..a18ea833710 100644
--- a/src/Databases/DatabaseDictionary.h
+++ b/src/Databases/DatabaseDictionary.h
@@ -34,7 +34,7 @@ public:
 
     StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     bool empty() const override;
 
@@ -48,7 +48,7 @@ protected:
     ASTPtr getCreateTableQueryImpl(const String & table_name, ContextPtr context, bool throw_on_error) const override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     Tables listTables(const FilterByNameFunction & filter_by_name) const;
 };
diff --git a/src/Databases/DatabaseFactory.cpp b/src/Databases/DatabaseFactory.cpp
index fc8073eac3b..3a4c1423f7c 100644
--- a/src/Databases/DatabaseFactory.cpp
+++ b/src/Databases/DatabaseFactory.cpp
@@ -9,7 +9,7 @@
 #include <Parsers/queryToString.h>
 #include <Common/Macros.h>
 #include <Common/filesystemHelpers.h>
-#include <Common/logger_useful.h>
+
 
 namespace fs = std::filesystem;
 
diff --git a/src/Databases/DatabaseFactory.h b/src/Databases/DatabaseFactory.h
index 6b92963f46e..494c9e0076e 100644
--- a/src/Databases/DatabaseFactory.h
+++ b/src/Databases/DatabaseFactory.h
@@ -35,7 +35,7 @@ public:
     {
         const String & engine_name;
         ASTs & engine_args;
-        ASTStorage * storage;
+        ASTStorage * storage = nullptr;
         const ASTCreateQuery & create_query;
         const String & database_name;
         const String & metadata_path;
diff --git a/src/Databases/DatabaseFilesystem.cpp b/src/Databases/DatabaseFilesystem.cpp
index 5564f1d07cf..b27a816a60d 100644
--- a/src/Databases/DatabaseFilesystem.cpp
+++ b/src/Databases/DatabaseFilesystem.cpp
@@ -32,7 +32,7 @@ namespace ErrorCodes
 }
 
 DatabaseFilesystem::DatabaseFilesystem(const String & name_, const String & path_, ContextPtr context_)
-    : IDatabase(name_), WithContext(context_->getGlobalContext()), path(path_), log(&Poco::Logger::get("DatabaseFileSystem(" + name_ + ")"))
+    : IDatabase(name_), WithContext(context_->getGlobalContext()), path(path_), log(getLogger("DatabaseFileSystem(" + name_ + ")"))
 {
     bool is_local = context_->getApplicationType() == Context::ApplicationType::LOCAL;
     fs::path user_files_path = is_local ? "" : fs::canonical(getContext()->getUserFilesPath());
@@ -146,11 +146,7 @@ StoragePtr DatabaseFilesystem::getTableImpl(const String & name, ContextPtr cont
     if (!checkTableFilePath(table_path, context_, throw_on_error))
         return {};
 
-    auto format = FormatFactory::instance().getFormatFromFileName(table_path, throw_on_error);
-    if (format.empty())
-        return {};
-
-    auto ast_function_ptr = makeASTFunction("file", std::make_shared<ASTLiteral>(table_path), std::make_shared<ASTLiteral>(format));
+    auto ast_function_ptr = makeASTFunction("file", std::make_shared<ASTLiteral>(table_path));
 
     auto table_function = TableFunctionFactory::instance().get(ast_function_ptr, context_);
     if (!table_function)
@@ -191,7 +187,7 @@ ASTPtr DatabaseFilesystem::getCreateDatabaseQuery() const
     const String query = fmt::format("CREATE DATABASE {} ENGINE = Filesystem('{}')", backQuoteIfNeed(getDatabaseName()), path);
 
     ParserCreateQuery parser;
-    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
+    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 
     if (const auto database_comment = getDatabaseComment(); !database_comment.empty())
     {
@@ -233,7 +229,7 @@ std::vector<std::pair<ASTPtr, StoragePtr>> DatabaseFilesystem::getTablesForBacku
  * Returns an empty iterator because the database does not have its own tables
  * But only caches them for quick access
  */
-DatabaseTablesIteratorPtr DatabaseFilesystem::getTablesIterator(ContextPtr, const FilterByNameFunction &) const
+DatabaseTablesIteratorPtr DatabaseFilesystem::getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(Tables{}, getDatabaseName());
 }
diff --git a/src/Databases/DatabaseFilesystem.h b/src/Databases/DatabaseFilesystem.h
index b72891b9a5c..4b9db5e574d 100644
--- a/src/Databases/DatabaseFilesystem.h
+++ b/src/Databases/DatabaseFilesystem.h
@@ -45,7 +45,7 @@ public:
 
     std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction &, const ContextPtr &) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const override;
 
 protected:
     StoragePtr getTableImpl(const String & name, ContextPtr context, bool throw_on_error) const;
@@ -61,7 +61,7 @@ protected:
 private:
     String path;
     mutable Tables loaded_tables TSA_GUARDED_BY(mutex);
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Databases/DatabaseHDFS.cpp b/src/Databases/DatabaseHDFS.cpp
index 9d0395e4217..1de7f80f512 100644
--- a/src/Databases/DatabaseHDFS.cpp
+++ b/src/Databases/DatabaseHDFS.cpp
@@ -45,7 +45,7 @@ DatabaseHDFS::DatabaseHDFS(const String & name_, const String & source_url, Cont
     : IDatabase(name_)
     , WithContext(context_->getGlobalContext())
     , source(source_url)
-    , log(&Poco::Logger::get("DatabaseHDFS(" + name_ + ")"))
+    , log(getLogger("DatabaseHDFS(" + name_ + ")"))
 {
     if (!source.empty())
     {
@@ -183,7 +183,7 @@ ASTPtr DatabaseHDFS::getCreateDatabaseQuery() const
     ParserCreateQuery parser;
 
     const String query = fmt::format("CREATE DATABASE {} ENGINE = HDFS('{}')", backQuoteIfNeed(getDatabaseName()), source);
-    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
+    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 
     if (const auto database_comment = getDatabaseComment(); !database_comment.empty())
     {
@@ -225,7 +225,7 @@ std::vector<std::pair<ASTPtr, StoragePtr>> DatabaseHDFS::getTablesForBackup(cons
  * Returns an empty iterator because the database does not have its own tables
  * But only caches them for quick access
  */
-DatabaseTablesIteratorPtr DatabaseHDFS::getTablesIterator(ContextPtr, const FilterByNameFunction &) const
+DatabaseTablesIteratorPtr DatabaseHDFS::getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(Tables{}, getDatabaseName());
 }
diff --git a/src/Databases/DatabaseHDFS.h b/src/Databases/DatabaseHDFS.h
index 957b2080135..d19918000cf 100644
--- a/src/Databases/DatabaseHDFS.h
+++ b/src/Databases/DatabaseHDFS.h
@@ -45,7 +45,7 @@ public:
     void shutdown() override;
 
     std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction &, const ContextPtr &) const override;
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const override;
 
 protected:
     StoragePtr getTableImpl(const String & name, ContextPtr context) const;
@@ -60,7 +60,7 @@ private:
     const String source;
 
     mutable Tables loaded_tables TSA_GUARDED_BY(mutex);
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Databases/DatabaseLazy.cpp b/src/Databases/DatabaseLazy.cpp
index fcd832e7cc2..fb1b3ee626b 100644
--- a/src/Databases/DatabaseLazy.cpp
+++ b/src/Databases/DatabaseLazy.cpp
@@ -152,7 +152,7 @@ StoragePtr DatabaseLazy::tryGetTable(const String & table_name) const
     return loadTable(table_name);
 }
 
-DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
+DatabaseTablesIteratorPtr DatabaseLazy::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name, bool /* skip_not_loaded */) const
 {
     std::lock_guard lock(mutex);
     Strings filtered_tables;
@@ -253,7 +253,7 @@ StoragePtr DatabaseLazy::loadTable(const String & table_name) const
         {
             const auto & ast_create = ast->as<const ASTCreateQuery &>();
             String table_data_path_relative = getTableDataPath(ast_create);
-            table = createTableFromAST(ast_create, getDatabaseName(), table_data_path_relative, context_copy, false).second;
+            table = createTableFromAST(ast_create, getDatabaseName(), table_data_path_relative, context_copy, LoadingStrictnessLevel::ATTACH).second;
         }
 
         if (!ast || !endsWith(table->getName(), "Log"))
diff --git a/src/Databases/DatabaseLazy.h b/src/Databases/DatabaseLazy.h
index 2b1b119754d..4347649117d 100644
--- a/src/Databases/DatabaseLazy.h
+++ b/src/Databases/DatabaseLazy.h
@@ -62,7 +62,7 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     void attachTable(ContextPtr context, const String & table_name, const StoragePtr & table, const String & relative_table_path) override;
 
diff --git a/src/Databases/DatabaseMemory.cpp b/src/Databases/DatabaseMemory.cpp
index 794eebbc399..4ff7b3c7f2b 100644
--- a/src/Databases/DatabaseMemory.cpp
+++ b/src/Databases/DatabaseMemory.cpp
@@ -6,6 +6,7 @@
 #include <Databases/DDLDependencyVisitor.h>
 #include <Databases/DDLLoadingDependencyVisitor.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/formatAST.h>
diff --git a/src/Databases/DatabaseOnDisk.cpp b/src/Databases/DatabaseOnDisk.cpp
index 12b0dc07799..674e9afa8ac 100644
--- a/src/Databases/DatabaseOnDisk.cpp
+++ b/src/Databases/DatabaseOnDisk.cpp
@@ -1,12 +1,18 @@
 #include <Databases/DatabaseOnDisk.h>
 
+#include <filesystem>
+#include <iterator>
+#include <span>
+#include <Databases/DatabaseAtomic.h>
+#include <Databases/DatabaseOrdinary.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteHelpers.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/ApplyWithSubqueryVisitor.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/InterpreterCreateQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -15,14 +21,11 @@
 #include <Storages/IStorage.h>
 #include <Storages/StorageFactory.h>
 #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 <filesystem>
+#include <Common/escapeForFileName.h>
+#include <Common/filesystemHelpers.h>
+#include <Common/logger_useful.h>
 
 namespace fs = std::filesystem;
 
@@ -59,13 +62,13 @@ std::pair<String, StoragePtr> createTableFromAST(
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool force_restore)
+    LoadingStrictnessLevel mode)
 {
     ast_create_query.attach = true;
     ast_create_query.setDatabase(database_name);
 
     if (ast_create_query.select && ast_create_query.isView())
-        ApplyWithSubqueryVisitor().visit(*ast_create_query.select);
+        ApplyWithSubqueryVisitor::visit(*ast_create_query.select);
 
     if (ast_create_query.as_table_function)
     {
@@ -74,7 +77,7 @@ std::pair<String, StoragePtr> createTableFromAST(
         auto table_function = factory.get(table_function_ast, context);
         ColumnsDescription columns;
         if (ast_create_query.columns_list && ast_create_query.columns_list->columns)
-            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true, false);
+            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, mode);
         StoragePtr storage = table_function->execute(table_function_ast, context, ast_create_query.getTable(), std::move(columns));
         storage->renameInMemory(ast_create_query);
         return {ast_create_query.getTable(), storage};
@@ -83,7 +86,13 @@ std::pair<String, StoragePtr> createTableFromAST(
     ColumnsDescription columns;
     ConstraintsDescription constraints;
 
-    if (!ast_create_query.is_dictionary)
+    bool has_columns = true;
+    if (ast_create_query.is_dictionary)
+        has_columns = false;
+    if (ast_create_query.isParameterizedView())
+        has_columns = false;
+
+    if (has_columns)
     {
         /// We do not directly use `InterpreterCreateQuery::execute`, because
         /// - the database has not been loaded yet;
@@ -100,7 +109,7 @@ std::pair<String, StoragePtr> createTableFromAST(
         }
         else
         {
-            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, true, false);
+            columns = InterpreterCreateQuery::getColumnsDescription(*ast_create_query.columns_list->columns, context, mode);
             constraints = InterpreterCreateQuery::getConstraintsDescription(ast_create_query.columns_list->constraints);
         }
     }
@@ -115,7 +124,7 @@ std::pair<String, StoragePtr> createTableFromAST(
             context->getGlobalContext(),
             columns,
             constraints,
-            force_restore)
+            mode)
     };
 }
 
@@ -165,7 +174,7 @@ DatabaseOnDisk::DatabaseOnDisk(
 
 void DatabaseOnDisk::shutdown()
 {
-    waitDatabaseStarted(/* no_throw = */ true);
+    stopLoading();
     DatabaseWithOwnTablesBase::shutdown();
 }
 
@@ -196,7 +205,7 @@ void DatabaseOnDisk::createTable(
         throw Exception(
             ErrorCodes::TABLE_ALREADY_EXISTS, "Table {}.{} already exists", backQuote(getDatabaseName()), backQuote(table_name));
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     String table_metadata_path = getObjectMetadataPath(table_name);
 
@@ -287,7 +296,7 @@ void DatabaseOnDisk::commitCreateTable(const ASTCreateQuery & query, const Stora
 
 void DatabaseOnDisk::detachTablePermanently(ContextPtr query_context, const String & table_name)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto table = detachTable(query_context, table_name);
 
@@ -305,7 +314,7 @@ void DatabaseOnDisk::detachTablePermanently(ContextPtr query_context, const Stri
 
 void DatabaseOnDisk::dropTable(ContextPtr local_context, const String & table_name, bool /*sync*/)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     String table_metadata_path = getObjectMetadataPath(table_name);
     String table_metadata_path_drop = table_metadata_path + drop_suffix;
@@ -391,7 +400,7 @@ void DatabaseOnDisk::renameTable(
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Moving tables between databases of different engines is not supported");
     }
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto table_data_relative_path = getTableDataPath(table_name);
     TableExclusiveLockHolder table_lock;
@@ -520,7 +529,7 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
         /// If database.sql doesn't exist, then engine is Ordinary
         String query = "CREATE DATABASE " + backQuoteIfNeed(getDatabaseName()) + " ENGINE = Ordinary";
         ParserCreateQuery parser;
-        ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
+        ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
     }
 
     if (const auto database_comment = getDatabaseComment(); !database_comment.empty())
@@ -534,7 +543,7 @@ ASTPtr DatabaseOnDisk::getCreateDatabaseQuery() const
 
 void DatabaseOnDisk::drop(ContextPtr local_context)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     assert(TSA_SUPPRESS_WARNING_FOR_READ(tables).empty());
     if (local_context->getSettingsRef().force_remove_data_recursively_on_drop)
@@ -606,7 +615,7 @@ void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const Iterat
     };
 
     /// Metadata files to load: name and flag for .tmp_drop files
-    std::set<std::pair<String, bool>> metadata_files;
+    std::vector<std::pair<String, bool>> metadata_files;
 
     fs::directory_iterator dir_end;
     for (fs::directory_iterator dir_it(getMetadataPath()); dir_it != dir_end; ++dir_it)
@@ -627,7 +636,7 @@ void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const Iterat
         if (endsWith(file_name, ".sql.tmp_drop"))
         {
             /// There are files that we tried to delete previously
-            metadata_files.emplace(file_name, false);
+            metadata_files.emplace_back(file_name, false);
         }
         else if (endsWith(file_name, ".sql.tmp"))
         {
@@ -638,29 +647,36 @@ void DatabaseOnDisk::iterateMetadataFiles(ContextPtr local_context, const Iterat
         else if (endsWith(file_name, ".sql"))
         {
             /// The required files have names like `table_name.sql`
-            metadata_files.emplace(file_name, true);
+            metadata_files.emplace_back(file_name, true);
         }
         else
             throw Exception(ErrorCodes::INCORRECT_FILE_NAME, "Incorrect file extension: {} in metadata directory {}", file_name, getMetadataPath());
     }
 
+    std::sort(metadata_files.begin(), metadata_files.end());
+    metadata_files.erase(std::unique(metadata_files.begin(), metadata_files.end()), metadata_files.end());
+
     /// Read and parse metadata in parallel
     ThreadPool pool(CurrentMetrics::DatabaseOnDiskThreads, CurrentMetrics::DatabaseOnDiskThreadsActive, CurrentMetrics::DatabaseOnDiskThreadsScheduled);
-    for (const auto & file : metadata_files)
+    const auto batch_size = metadata_files.size() / pool.getMaxThreads() + 1;
+    for (auto it = metadata_files.begin(); it < metadata_files.end(); std::advance(it, batch_size))
     {
-        pool.scheduleOrThrowOnError([&]()
-        {
-            if (file.second)
-                process_metadata_file(file.first);
-            else
-                process_tmp_drop_metadata_file(file.first);
-        });
+        std::span batch{it, std::min(std::next(it, batch_size), metadata_files.end())};
+        pool.scheduleOrThrowOnError(
+            [batch, &process_metadata_file, &process_tmp_drop_metadata_file]() mutable
+            {
+                for (const auto & file : batch)
+                    if (file.second)
+                        process_metadata_file(file.first);
+                    else
+                        process_tmp_drop_metadata_file(file.first);
+            });
     }
     pool.wait();
 }
 
 ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
-    Poco::Logger * logger,
+    LoggerPtr logger,
     ContextPtr local_context,
     const String & metadata_file_path,
     bool throw_on_error /*= true*/,
@@ -701,7 +717,7 @@ ASTPtr DatabaseOnDisk::parseQueryFromMetadata(
     const char * pos = query.data();
     std::string error_message;
     auto ast = tryParseQuery(parser, pos, pos + query.size(), error_message, /* hilite = */ false,
-                             "in file " + metadata_file_path, /* allow_multi_statements = */ false, 0, settings.max_parser_depth);
+        "in file " + metadata_file_path, /* allow_multi_statements = */ false, 0, settings.max_parser_depth, settings.max_parser_backtracks, true);
 
     if (!ast && throw_on_error)
         throw Exception::createDeprecated(error_message, ErrorCodes::SYNTAX_ERROR);
@@ -759,12 +775,14 @@ ASTPtr DatabaseOnDisk::getCreateQueryFromStorage(const String & table_name, cons
     auto ast_storage = std::make_shared<ASTStorage>();
     ast_storage->set(ast_storage->engine, ast_engine);
 
-    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
-    auto create_table_query = DB::getCreateQueryFromStorage(storage,
-                                                            ast_storage,
-                                                            false,
-                                                            max_parser_depth,
-                                                            throw_on_error);
+    const Settings & settings = getContext()->getSettingsRef();
+    auto create_table_query = DB::getCreateQueryFromStorage(
+        storage,
+        ast_storage,
+        false,
+        static_cast<unsigned>(settings.max_parser_depth),
+        static_cast<unsigned>(settings.max_parser_backtracks),
+        throw_on_error);
 
     create_table_query->set(create_table_query->as<ASTCreateQuery>()->comment,
                             std::make_shared<ASTLiteral>("SYSTEM TABLE is built on the fly."));
diff --git a/src/Databases/DatabaseOnDisk.h b/src/Databases/DatabaseOnDisk.h
index 59c2c27068e..12656068643 100644
--- a/src/Databases/DatabaseOnDisk.h
+++ b/src/Databases/DatabaseOnDisk.h
@@ -16,7 +16,7 @@ std::pair<String, StoragePtr> createTableFromAST(
     const String & database_name,
     const String & table_data_path_relative,
     ContextMutablePtr context,
-    bool force_restore);
+    LoadingStrictnessLevel mode);
 
 /** Get the string with the table definition based on the CREATE query.
   * It is an ATTACH query that you can execute to create a table from the correspondent database.
@@ -68,7 +68,7 @@ public:
     String getTableDataPath(const ASTCreateQuery & query) const override { return getTableDataPath(query.getTable()); }
     String getMetadataPath() const override { return metadata_path; }
 
-    static ASTPtr parseQueryFromMetadata(Poco::Logger * log, ContextPtr context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
+    static ASTPtr parseQueryFromMetadata(LoggerPtr log, ContextPtr context, const String & metadata_file_path, bool throw_on_error = true, bool remove_empty = false);
 
     /// will throw when the table we want to attach already exists (in active / detached / detached permanently form)
     void checkMetadataFilenameAvailability(const String & to_table_name) const override;
diff --git a/src/Databases/DatabaseOrdinary.cpp b/src/Databases/DatabaseOrdinary.cpp
index ba1b2cdacad..32f7fdc5e52 100644
--- a/src/Databases/DatabaseOrdinary.cpp
+++ b/src/Databases/DatabaseOrdinary.cpp
@@ -29,6 +29,10 @@
 #include <Common/typeid_cast.h>
 #include <Common/logger_useful.h>
 #include <Common/CurrentMetrics.h>
+#include <Core/Defines.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+
+#include <boost/algorithm/string/replace.hpp>
 
 namespace fs = std::filesystem;
 
@@ -39,10 +43,13 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int UNKNOWN_DATABASE_ENGINE;
+    extern const int NOT_IMPLEMENTED;
 }
 
 static constexpr size_t METADATA_FILE_BUFFER_SIZE = 32768;
 
+static constexpr const char * const CONVERT_TO_REPLICATED_FLAG_NAME = "convert_to_replicated";
+
 DatabaseOrdinary::DatabaseOrdinary(const String & name_, const String & metadata_path_, ContextPtr context_)
     : DatabaseOrdinary(name_, metadata_path_, "data/" + escapeForFileName(name_) + "/", "DatabaseOrdinary (" + name_ + ")", context_)
 {
@@ -60,6 +67,94 @@ void DatabaseOrdinary::loadStoredObjects(ContextMutablePtr, LoadingStrictnessLev
     throw Exception(ErrorCodes::LOGICAL_ERROR, "Not implemented");
 }
 
+static void setReplicatedEngine(ASTCreateQuery * create_query, ContextPtr context)
+{
+    auto * storage = create_query->storage;
+
+    /// Get replicated engine
+    const auto & server_settings = context->getServerSettings();
+    String replica_path = server_settings.default_replica_path;
+    String replica_name = server_settings.default_replica_name;
+
+    auto args = std::make_shared<ASTExpressionList>();
+    args->children.push_back(std::make_shared<ASTLiteral>(replica_path));
+    args->children.push_back(std::make_shared<ASTLiteral>(replica_name));
+
+    /// Add old engine's arguments
+    if (storage->engine->arguments)
+    {
+        for (size_t i = 0; i < storage->engine->arguments->children.size(); ++i)
+            args->children.push_back(storage->engine->arguments->children[i]->clone());
+    }
+
+    auto engine = std::make_shared<ASTFunction>();
+    engine->name = "Replicated" + storage->engine->name;
+    engine->arguments = args;
+
+    /// Set new engine for the old query
+    create_query->storage->set(create_query->storage->engine, engine->clone());
+}
+
+String DatabaseOrdinary::getConvertToReplicatedFlagPath(const String & name, bool tableStarted)
+{
+    fs::path data_path;
+    if (!tableStarted)
+    {
+        auto create_query = tryGetCreateTableQuery(name, getContext());
+        data_path = fs::path(getContext()->getPath()) / getTableDataPath(create_query->as<ASTCreateQuery &>());
+    }
+    else
+        data_path = fs::path(getContext()->getPath()) / getTableDataPath(name);
+
+    return (data_path / CONVERT_TO_REPLICATED_FLAG_NAME).string();
+}
+
+void DatabaseOrdinary::convertMergeTreeToReplicatedIfNeeded(ASTPtr ast, const QualifiedTableName & qualified_name, const String & file_name)
+{
+    fs::path path(getMetadataPath());
+    fs::path file_path(file_name);
+    fs::path full_path = path / file_path;
+
+    auto * create_query = ast->as<ASTCreateQuery>();
+
+    if (!create_query->storage || !create_query->storage->engine->name.ends_with("MergeTree") || create_query->storage->engine->name.starts_with("Replicated") || create_query->storage->engine->name.starts_with("Shared"))
+        return;
+
+    auto convert_to_replicated_flag_path = getConvertToReplicatedFlagPath(qualified_name.table, false);
+
+    if (!fs::exists(convert_to_replicated_flag_path))
+        return;
+
+    if (getUUID() == UUIDHelpers::Nil)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+            "Table engine conversion to replicated is supported only for Atomic databases. Convert your database engine to Atomic first.");
+
+    LOG_INFO(log, "Found {} flag for table {}. Will try to change it's engine in metadata to replicated.", CONVERT_TO_REPLICATED_FLAG_NAME, backQuote(qualified_name.getFullName()));
+
+    setReplicatedEngine(create_query, getContext());
+
+    /// Write changes to metadata
+    String table_metadata_path = full_path;
+    String table_metadata_tmp_path = table_metadata_path + ".tmp";
+    String statement = getObjectDefinitionFromCreateQuery(ast);
+    {
+        WriteBufferFromFile out(table_metadata_tmp_path, statement.size(), O_WRONLY | O_CREAT | O_EXCL);
+        writeString(statement, out);
+        out.next();
+        if (getContext()->getSettingsRef().fsync_metadata)
+            out.sync();
+        out.close();
+    }
+    fs::rename(table_metadata_tmp_path, table_metadata_path);
+
+    LOG_INFO(
+        log,
+        "Engine of table {} is set to replicated in metadata. Not removing {} flag until table is loaded and metadata in zookeeper is restored.",
+        backQuote(qualified_name.getFullName()),
+        CONVERT_TO_REPLICATED_FLAG_NAME
+    );
+}
+
 void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTablesMetadata & metadata, bool is_startup)
 {
     size_t prev_tables_count = metadata.parsed_tables.size();
@@ -76,7 +171,7 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
             auto ast = parseQueryFromMetadata(log, getContext(), full_path.string(), /*throw_on_error*/ true, /*remove_empty*/ false);
             if (ast)
             {
-                FunctionNameNormalizer().visit(ast.get());
+                FunctionNameNormalizer::visit(ast.get());
                 auto * create_query = ast->as<ASTCreateQuery>();
                 /// NOTE No concurrent writes are possible during database loading
                 create_query->setDatabase(TSA_SUPPRESS_WARNING_FOR_READ(database_name));
@@ -109,6 +204,8 @@ void DatabaseOrdinary::loadTablesMetadata(ContextPtr local_context, ParsedTables
 
                 QualifiedTableName qualified_name{TSA_SUPPRESS_WARNING_FOR_READ(database_name), create_query->getTable()};
 
+                convertMergeTreeToReplicatedIfNeeded(ast, qualified_name, file_name);
+
                 std::lock_guard lock{metadata.mutex};
                 metadata.parsed_tables[qualified_name] = ParsedTableMetadata{full_path.string(), ast};
                 metadata.total_dictionaries += create_query->is_dictionary;
@@ -150,7 +247,7 @@ void DatabaseOrdinary::loadTableFromMetadata(
             name.database,
             getTableDataPath(query),
             local_context,
-            LoadingStrictnessLevel::FORCE_RESTORE <= mode);
+            mode);
 
         attachTable(local_context, table_name, table, getTableDataPath(query));
     }
@@ -185,6 +282,55 @@ LoadTaskPtr DatabaseOrdinary::loadTableFromMetadataAsync(
     return load_table[name.table] = makeLoadTask(async_loader, {job});
 }
 
+void DatabaseOrdinary::restoreMetadataAfterConvertingToReplicated(StoragePtr table, const QualifiedTableName & name)
+{
+    auto * rmt = table->as<StorageReplicatedMergeTree>();
+    if (!rmt)
+        return;
+
+    auto convert_to_replicated_flag_path = getConvertToReplicatedFlagPath(name.table, true);
+    if (!fs::exists(convert_to_replicated_flag_path))
+        return;
+
+    fs::remove(convert_to_replicated_flag_path);
+    LOG_INFO
+    (
+        log,
+        "Removing convert to replicated flag for {}.",
+        backQuote(name.getFullName())
+    );
+
+    auto has_metadata = rmt->hasMetadataInZooKeeper();
+    if (!has_metadata.has_value())
+    {
+        LOG_WARNING
+        (
+            log,
+            "No connection to ZooKeeper, can't restore metadata for {} in ZooKeeper after conversion. Run SYSTEM RESTORE REPLICA while connected to ZooKeeper.",
+            backQuote(name.getFullName())
+        );
+    }
+    else if (*has_metadata)
+    {
+        LOG_INFO
+        (
+            log,
+            "Table {} already has metatada in ZooKeeper.",
+            backQuote(name.getFullName())
+        );
+    }
+    else
+    {
+        rmt->restoreMetadataInZooKeeper();
+        LOG_INFO
+        (
+            log,
+            "Metadata in ZooKeeper for {} is restored.",
+            backQuote(name.getFullName())
+        );
+    }
+}
+
 LoadTaskPtr DatabaseOrdinary::startupTableAsync(
     AsyncLoader & async_loader,
     LoadJobSet startup_after,
@@ -212,6 +358,11 @@ LoadTaskPtr DatabaseOrdinary::startupTableAsync(
                 /// until startup finished.
                 auto table_lock_holder = table->lockForShare(RWLockImpl::NO_QUERY, getContext()->getSettingsRef().lock_acquire_timeout);
                 table->startup();
+
+                /// If table is ReplicatedMergeTree after conversion from MergeTree,
+                /// it is in readonly mode due to metadata in zookeeper missing.
+                restoreMetadataAfterConvertingToReplicated(table, name);
+
                 logAboutProgress(log, ++tables_started, total_tables_to_startup, startup_watch);
             }
             else
@@ -238,6 +389,7 @@ LoadTaskPtr DatabaseOrdinary::startupDatabaseAsync(
             // 1) startup should be done after tables loading
             // 2) load or startup errors for tables should not lead to not starting up the whole database
         });
+    std::scoped_lock lock(mutex);
     return startup_database_task = makeLoadTask(async_loader, {job});
 }
 
@@ -255,24 +407,76 @@ void DatabaseOrdinary::waitTableStarted(const String & name) const
         waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task);
 }
 
-void DatabaseOrdinary::waitDatabaseStarted(bool no_throw) const
+void DatabaseOrdinary::waitDatabaseStarted() const
 {
     /// Prioritize load and startup of all tables and database itself and wait for them synchronously
-    if (startup_database_task)
-        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_database_task, no_throw);
+    LoadTaskPtr task;
+    {
+        std::scoped_lock lock(mutex);
+        task = startup_database_task;
+    }
+    if (task)
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task);
 }
 
-DatabaseTablesIteratorPtr DatabaseOrdinary::getTablesIterator(ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const
+void DatabaseOrdinary::stopLoading()
 {
-    auto result = DatabaseWithOwnTablesBase::getTablesIterator(local_context, filter_by_table_name);
-    std::scoped_lock lock(mutex);
-    typeid_cast<DatabaseTablesSnapshotIterator &>(*result).setLoadTasks(startup_table);
-    return result;
+    std::unordered_map<String, LoadTaskPtr> stop_load_table;
+    std::unordered_map<String, LoadTaskPtr> stop_startup_table;
+    LoadTaskPtr stop_startup_database;
+    {
+        std::scoped_lock lock(mutex);
+        stop_load_table.swap(load_table);
+        stop_startup_table.swap(startup_table);
+        stop_startup_database.swap(startup_database_task);
+    }
+
+    // Cancel pending tasks and wait for currently running tasks
+    // Note that order must be backward of how it was created to make sure no dependent task is run after waiting for current task
+    stop_startup_database.reset();
+    stop_startup_table.clear();
+    stop_load_table.clear();
+}
+
+DatabaseTablesIteratorPtr DatabaseOrdinary::getTablesIterator(ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const
+{
+    if (!skip_not_loaded)
+    {
+        // Wait for every table (matching the filter) to be loaded and started up before we make the snapshot.
+        // It is important, because otherwise table might be:
+        //  - not attached and thus will be missed in the snapshot;
+        //  - not started, which is not good for DDL operations.
+        LoadTaskPtrs tasks_to_wait;
+        {
+            std::lock_guard lock(mutex);
+            if (!filter_by_table_name)
+                tasks_to_wait.reserve(startup_table.size());
+            for (const auto & [table_name, task] : startup_table)
+                if (!filter_by_table_name || filter_by_table_name(table_name))
+                    tasks_to_wait.emplace_back(task);
+        }
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), tasks_to_wait);
+    }
+    return DatabaseWithOwnTablesBase::getTablesIterator(local_context, filter_by_table_name, skip_not_loaded);
+}
+
+Strings DatabaseOrdinary::getAllTableNames(ContextPtr) const
+{
+    std::set<String> unique_names;
+    {
+        std::lock_guard lock(mutex);
+        for (const auto & [table_name, _] : tables)
+            unique_names.emplace(table_name);
+        // Not yet loaded table are not listed in `tables`, so we have to add table names from tasks
+        for (const auto & [table_name, _] : startup_table)
+            unique_names.emplace(table_name);
+    }
+    return {unique_names.begin(), unique_names.end()};
 }
 
 void DatabaseOrdinary::alterTable(ContextPtr local_context, const StorageID & table_id, const StorageInMemoryMetadata & metadata)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     String table_name = table_id.table_name;
 
@@ -293,7 +497,7 @@ void DatabaseOrdinary::alterTable(ContextPtr local_context, const StorageID & ta
         statement.data() + statement.size(),
         "in file " + table_metadata_path,
         0,
-        local_context->getSettingsRef().max_parser_depth);
+        local_context->getSettingsRef().max_parser_depth, local_context->getSettingsRef().max_parser_backtracks);
 
     applyMetadataChangesToCreateQuery(ast, metadata);
 
@@ -337,6 +541,9 @@ void registerDatabaseOrdinary(DatabaseFactory & factory)
             throw Exception(
                 ErrorCodes::UNKNOWN_DATABASE_ENGINE,
                 "Ordinary database engine is deprecated (see also allow_deprecated_database_ordinary setting)");
+
+        args.context->addWarningMessageAboutDatabaseOrdinary(args.database_name);
+
         return make_shared<DatabaseOrdinary>(
             args.database_name,
             args.metadata_path,
diff --git a/src/Databases/DatabaseOrdinary.h b/src/Databases/DatabaseOrdinary.h
index d1d7dfd83fa..fa5827903cb 100644
--- a/src/Databases/DatabaseOrdinary.h
+++ b/src/Databases/DatabaseOrdinary.h
@@ -51,11 +51,13 @@ public:
 
     void waitTableStarted(const String & name) const override;
 
-    void waitDatabaseStarted(bool no_throw) const override;
+    void waitDatabaseStarted() const override;
+    void stopLoading() override;
 
     LoadTaskPtr startupDatabaseAsync(AsyncLoader & async_loader, LoadJobSet startup_after, LoadingStrictnessLevel mode) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
+    Strings getAllTableNames(ContextPtr context) const override;
 
     void alterTable(
         ContextPtr context,
@@ -76,10 +78,15 @@ protected:
 
     std::unordered_map<String, LoadTaskPtr> load_table TSA_GUARDED_BY(mutex);
     std::unordered_map<String, LoadTaskPtr> startup_table TSA_GUARDED_BY(mutex);
-    LoadTaskPtr startup_database_task;
+    LoadTaskPtr startup_database_task TSA_GUARDED_BY(mutex);
     std::atomic<size_t> total_tables_to_startup{0};
     std::atomic<size_t> tables_started{0};
     AtomicStopwatch startup_watch;
+
+private:
+    void convertMergeTreeToReplicatedIfNeeded(ASTPtr ast, const QualifiedTableName & qualified_name, const String & file_name);
+    void restoreMetadataAfterConvertingToReplicated(StoragePtr table, const QualifiedTableName & name);
+    String getConvertToReplicatedFlagPath(const String & name, bool tableStarted);
 };
 
 }
diff --git a/src/Databases/DatabaseReplicated.cpp b/src/Databases/DatabaseReplicated.cpp
index d484b223706..7b8f7468e81 100644
--- a/src/Databases/DatabaseReplicated.cpp
+++ b/src/Databases/DatabaseReplicated.cpp
@@ -20,6 +20,7 @@
 #include <Databases/TablesDependencyGraph.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
@@ -29,6 +30,7 @@
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
+#include <IO/SharedThreadPools.h>
 #include <Parsers/ASTAlterQuery.h>
 #include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTFunction.h>
@@ -576,13 +578,30 @@ LoadTaskPtr DatabaseReplicated::startupDatabaseAsync(AsyncLoader & async_loader,
             ddl_worker->startup();
             ddl_worker_initialized = true;
         });
+    std::scoped_lock lock(mutex);
     return startup_replicated_database_task = makeLoadTask(async_loader, {job});
 }
 
-void DatabaseReplicated::waitDatabaseStarted(bool no_throw) const
+void DatabaseReplicated::waitDatabaseStarted() const
 {
-    if (startup_replicated_database_task)
-        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_replicated_database_task, no_throw);
+    LoadTaskPtr task;
+    {
+        std::scoped_lock lock(mutex);
+        task = startup_replicated_database_task;
+    }
+    if (task)
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task);
+}
+
+void DatabaseReplicated::stopLoading()
+{
+    LoadTaskPtr stop_startup_replicated_database;
+    {
+        std::scoped_lock lock(mutex);
+        stop_startup_replicated_database.swap(startup_replicated_database_task);
+    }
+    stop_startup_replicated_database.reset();
+    DatabaseAtomic::stopLoading();
 }
 
 bool DatabaseReplicated::checkDigestValid(const ContextPtr & local_context, bool debug_check /* = true */) const
@@ -743,7 +762,7 @@ void DatabaseReplicated::checkQueryValid(const ASTPtr & query, ContextPtr query_
 
 BlockIO DatabaseReplicated::tryEnqueueReplicatedDDL(const ASTPtr & query, ContextPtr query_context, QueryFlags flags)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     if (query_context->getCurrentTransaction() && query_context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Distributed DDL queries inside transactions are not supported");
@@ -794,7 +813,8 @@ static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context
     ParserCreateQuery parser;
     auto size = context->getSettingsRef().max_query_size;
     auto depth = context->getSettingsRef().max_parser_depth;
-    ASTPtr query = parseQuery(parser, metadata, size, depth);
+    auto backtracks = context->getSettingsRef().max_parser_backtracks;
+    ASTPtr query = parseQuery(parser, metadata, size, depth, backtracks);
     const ASTCreateQuery & create = query->as<const ASTCreateQuery &>();
     if (!create.storage || !create.storage->engine)
         return UUIDHelpers::Nil;
@@ -807,7 +827,7 @@ static UUID getTableUUIDIfReplicated(const String & metadata, ContextPtr context
 
 void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeeper, UInt32 our_log_ptr, UInt32 & max_log_ptr)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     is_recovering = true;
     SCOPE_EXIT({ is_recovering = false; });
@@ -853,7 +873,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     std::vector<RenameEdge> replicated_tables_to_rename;
     size_t total_tables = 0;
     std::vector<UUID> replicated_ids;
-    for (auto existing_tables_it = getTablesIterator(getContext(), {}); existing_tables_it->isValid();
+    for (auto existing_tables_it = getTablesIterator(getContext(), {}, /*skip_not_loaded=*/false); existing_tables_it->isValid();
          existing_tables_it->next(), ++total_tables)
     {
         String name = existing_tables_it->name();
@@ -908,6 +928,7 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
         query_context->setSetting("allow_experimental_nlp_functions", 1);
         query_context->setSetting("allow_experimental_hash_functions", 1);
         query_context->setSetting("allow_experimental_object_type", 1);
+        query_context->setSetting("allow_experimental_variant_type", 1);
         query_context->setSetting("allow_experimental_annoy_index", 1);
         query_context->setSetting("allow_experimental_usearch_index", 1);
         query_context->setSetting("allow_experimental_bigint_types", 1);
@@ -1073,31 +1094,57 @@ void DatabaseReplicated::recoverLostReplica(const ZooKeeperPtr & current_zookeep
     }
 
     tables_dependencies.checkNoCyclicDependencies();
-    auto tables_to_create = tables_dependencies.getTablesSortedByDependency();
 
-    for (const auto & table_id : tables_to_create)
+    auto allow_concurrent_table_creation = getContext()->getServerSettings().max_database_replicated_create_table_thread_pool_size > 1;
+    auto tables_to_create_by_level = tables_dependencies.getTablesSplitByDependencyLevel();
+
+    auto create_tables_runner = threadPoolCallbackRunner<void>(getDatabaseReplicatedCreateTablesThreadPool().get(), "CreateTables");
+    std::vector<std::future<void>> create_table_futures;
+
+    for (const auto & tables_to_create : tables_to_create_by_level)
     {
-        auto table_name = table_id.getTableName();
-        auto metadata_it = table_name_to_metadata.find(table_name);
-        if (metadata_it == table_name_to_metadata.end())
+        for (const auto & table_id : tables_to_create)
         {
-            /// 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;
+            auto task = [&]()
+            {
+                auto table_name = table_id.getTableName();
+                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());
+                    return;
+                }
+
+                const auto & create_query_string = metadata_it->second;
+                if (isTableExist(table_name, getContext()))
+                {
+                    assert(create_query_string == readMetadataFile(table_name) || getTableUUIDIfReplicated(create_query_string, getContext()) != UUIDHelpers::Nil);
+                    return;
+                }
+
+                auto query_ast = parseQueryFromMetadataInZooKeeper(table_name, create_query_string);
+                LOG_INFO(log, "Executing {}", serializeAST(*query_ast));
+                auto create_query_context = make_query_context();
+                InterpreterCreateQuery(query_ast, create_query_context).execute();
+            };
+
+            if (allow_concurrent_table_creation)
+                create_table_futures.push_back(create_tables_runner(task, Priority{0}));
+            else
+                task();
         }
 
-        const auto & create_query_string = metadata_it->second;
-        if (isTableExist(table_name, getContext()))
-        {
-            assert(create_query_string == readMetadataFile(table_name) || getTableUUIDIfReplicated(create_query_string, getContext()) != UUIDHelpers::Nil);
-            continue;
-        }
+        /// First wait for all tasks to finish.
+        for (auto & future : create_table_futures)
+            future.wait();
 
-        auto query_ast = parseQueryFromMetadataInZooKeeper(table_name, create_query_string);
-        LOG_INFO(log, "Executing {}", serializeAST(*query_ast));
-        auto create_query_context = make_query_context();
-        InterpreterCreateQuery(query_ast, create_query_context).execute();
+        /// Now rethrow the first exception if any.
+        for (auto & future : create_table_futures)
+            future.get();
+
+        create_table_futures.clear();
     }
     LOG_INFO(log, "All tables are created successfully");
 
@@ -1189,7 +1236,7 @@ ASTPtr DatabaseReplicated::parseQueryFromMetadataInZooKeeper(const String & node
 {
     ParserCreateQuery parser;
     String description = "in ZooKeeper " + zookeeper_path + "/metadata/" + node_name;
-    auto ast = parseQuery(parser, query, description, 0, getContext()->getSettingsRef().max_parser_depth);
+    auto ast = parseQuery(parser, query, description, 0, getContext()->getSettingsRef().max_parser_depth, getContext()->getSettingsRef().max_parser_backtracks);
 
     auto & create = ast->as<ASTCreateQuery &>();
     if (create.uuid == UUIDHelpers::Nil || create.getTable() != TABLE_WITH_UUID_NAME_PLACEHOLDER || create.database)
@@ -1258,7 +1305,7 @@ void DatabaseReplicated::drop(ContextPtr context_)
         return;
     }
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto current_zookeeper = getZooKeeper();
     current_zookeeper->set(replica_path, DROPPED_MARK, -1);
@@ -1277,7 +1324,6 @@ void DatabaseReplicated::drop(ContextPtr context_)
 
 void DatabaseReplicated::stopReplication()
 {
-    waitDatabaseStarted(/* no_throw = */ true);
     if (ddl_worker)
         ddl_worker->shutdown();
 }
@@ -1293,7 +1339,7 @@ void DatabaseReplicated::shutdown()
 
 void DatabaseReplicated::dropTable(ContextPtr local_context, const String & table_name, bool sync)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker || !ddl_worker->isCurrentlyActive() || txn || startsWith(table_name, ".inner_id."));
@@ -1337,7 +1383,7 @@ void DatabaseReplicated::renameTable(ContextPtr local_context, const String & ta
     if (exchange && !to_database.isTableExist(to_table_name, local_context))
         throw Exception(ErrorCodes::UNKNOWN_TABLE, "Table {} does not exist", to_table_name);
 
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     String statement = readMetadataFile(table_name);
     String statement_to;
@@ -1439,7 +1485,7 @@ bool DatabaseReplicated::canExecuteReplicatedMetadataAlter() const
 
 void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const String & table_name)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
@@ -1464,7 +1510,7 @@ void DatabaseReplicated::detachTablePermanently(ContextPtr local_context, const
 
 void DatabaseReplicated::removeDetachedPermanentlyFlag(ContextPtr local_context, const String & table_name, const String & table_metadata_path, bool attach)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     auto txn = local_context->getZooKeeperMetadataTransaction();
     assert(!ddl_worker->isCurrentlyActive() || txn);
@@ -1502,7 +1548,7 @@ String DatabaseReplicated::readMetadataFile(const String & table_name) const
 std::vector<std::pair<ASTPtr, StoragePtr>>
 DatabaseReplicated::getTablesForBackup(const FilterByNameFunction & filter, const ContextPtr &) const
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     /// Here we read metadata from ZooKeeper. We could do that by simple call of DatabaseAtomic::getTablesForBackup() however
     /// reading from ZooKeeper is better because thus we won't be dependent on how fast the replication queue of this database is.
@@ -1514,7 +1560,7 @@ DatabaseReplicated::getTablesForBackup(const FilterByNameFunction & filter, cons
     for (const auto & [table_name, metadata] : snapshot)
     {
         ParserCreateQuery parser;
-        auto create_table_query = parseQuery(parser, metadata, 0, getContext()->getSettingsRef().max_parser_depth);
+        auto create_table_query = parseQuery(parser, metadata, 0, getContext()->getSettingsRef().max_parser_depth, getContext()->getSettingsRef().max_parser_backtracks);
 
         auto & create = create_table_query->as<ASTCreateQuery &>();
         create.attach = false;
@@ -1545,7 +1591,7 @@ void DatabaseReplicated::createTableRestoredFromBackup(
     std::shared_ptr<IRestoreCoordination> restore_coordination,
     UInt64 timeout_ms)
 {
-    waitDatabaseStarted(false);
+    waitDatabaseStarted();
 
     /// Because of the replication multiple nodes can try to restore the same tables again and failed with "Table already exists"
     /// because of some table could be restored already on other node and then replicated to this node.
diff --git a/src/Databases/DatabaseReplicated.h b/src/Databases/DatabaseReplicated.h
index 8a3999e70e9..55bcf963d37 100644
--- a/src/Databases/DatabaseReplicated.h
+++ b/src/Databases/DatabaseReplicated.h
@@ -126,7 +126,8 @@ private:
     UInt64 getMetadataHash(const String & table_name) const;
     bool checkDigestValid(const ContextPtr & local_context, bool debug_check = true) const TSA_REQUIRES(metadata_mutex);
 
-    void waitDatabaseStarted(bool no_throw) const override;
+    void waitDatabaseStarted() const override;
+    void stopLoading() override;
 
     String zookeeper_path;
     String shard_name;
@@ -155,7 +156,7 @@ private:
 
     mutable ClusterPtr cluster;
 
-    LoadTaskPtr startup_replicated_database_task;
+    LoadTaskPtr startup_replicated_database_task TSA_GUARDED_BY(mutex);
 };
 
 }
diff --git a/src/Databases/DatabaseReplicatedWorker.cpp b/src/Databases/DatabaseReplicatedWorker.cpp
index 2056b403ff6..51065062995 100644
--- a/src/Databases/DatabaseReplicatedWorker.cpp
+++ b/src/Databases/DatabaseReplicatedWorker.cpp
@@ -75,10 +75,9 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
     String active_path = fs::path(database->replica_path) / "active";
     String active_id = toString(ServerUUID::get());
     zookeeper->deleteEphemeralNodeIfContentMatches(active_path, active_id);
-    zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
+    if (active_node_holder)
+        active_node_holder->setAlreadyRemoved();
     active_node_holder.reset();
-    active_node_holder_zookeeper = zookeeper;
-    active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
 
     String log_ptr_str = zookeeper->get(database->replica_path + "/log_ptr");
     UInt32 our_log_ptr = parse<UInt32>(log_ptr_str);
@@ -127,9 +126,15 @@ void DatabaseReplicatedDDLWorker::initializeReplication()
         initializeLogPointer(log_entry_name);
     }
 
-    std::lock_guard lock{database->metadata_mutex};
-    if (!database->checkDigestValid(context, false))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
+    {
+        std::lock_guard lock{database->metadata_mutex};
+        if (!database->checkDigestValid(context, false))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Inconsistent database metadata after reconnection to ZooKeeper");
+    }
+
+    zookeeper->create(active_path, active_id, zkutil::CreateMode::Ephemeral);
+    active_node_holder_zookeeper = zookeeper;
+    active_node_holder = zkutil::EphemeralNodeHolder::existing(active_path, *active_node_holder_zookeeper);
 }
 
 String DatabaseReplicatedDDLWorker::enqueueQuery(DDLLogEntry & entry)
diff --git a/src/Databases/DatabaseS3.cpp b/src/Databases/DatabaseS3.cpp
index 1721b0e9e97..1589cc1c75d 100644
--- a/src/Databases/DatabaseS3.cpp
+++ b/src/Databases/DatabaseS3.cpp
@@ -49,7 +49,7 @@ DatabaseS3::DatabaseS3(const String & name_, const Configuration& config_, Conte
     : IDatabase(name_)
     , WithContext(context_->getGlobalContext())
     , config(config_)
-    , log(&Poco::Logger::get("DatabaseS3(" + name_ + ")"))
+    , log(getLogger("DatabaseS3(" + name_ + ")"))
 {
 }
 
@@ -191,7 +191,7 @@ ASTPtr DatabaseS3::getCreateDatabaseQuery() const
         creation_args += fmt::format(", '{}', '{}'", config.access_key_id.value(), config.secret_access_key.value());
 
     const String query = fmt::format("CREATE DATABASE {} ENGINE = S3({})", backQuoteIfNeed(getDatabaseName()), creation_args);
-    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth);
+    ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(), "", 0, settings.max_parser_depth, settings.max_parser_backtracks);
 
     if (const auto database_comment = getDatabaseComment(); !database_comment.empty())
     {
@@ -303,7 +303,7 @@ std::vector<std::pair<ASTPtr, StoragePtr>> DatabaseS3::getTablesForBackup(const
  * Returns an empty iterator because the database does not have its own tables
  * But only caches them for quick access
  */
-DatabaseTablesIteratorPtr DatabaseS3::getTablesIterator(ContextPtr, const FilterByNameFunction &) const
+DatabaseTablesIteratorPtr DatabaseS3::getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const
 {
     return std::make_unique<DatabaseTablesSnapshotIterator>(Tables{}, getDatabaseName());
 }
diff --git a/src/Databases/DatabaseS3.h b/src/Databases/DatabaseS3.h
index 8297ae4e02d..7e38da0fe63 100644
--- a/src/Databases/DatabaseS3.h
+++ b/src/Databases/DatabaseS3.h
@@ -56,7 +56,7 @@ public:
     void shutdown() override;
 
     std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction &, const ContextPtr &) const override;
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr, const FilterByNameFunction &, bool) const override;
 
     static Configuration parseArguments(ASTs engine_args, ContextPtr context);
 
@@ -73,7 +73,7 @@ private:
     const Configuration config;
 
     mutable Tables loaded_tables TSA_GUARDED_BY(mutex);
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Databases/DatabasesCommon.cpp b/src/Databases/DatabasesCommon.cpp
index bda48737621..fc75f8e44b9 100644
--- a/src/Databases/DatabasesCommon.cpp
+++ b/src/Databases/DatabasesCommon.cpp
@@ -1,6 +1,7 @@
 #include <Databases/DatabasesCommon.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ParserCreateQuery.h>
@@ -70,6 +71,17 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
         query->replace(ast_create_query.refresh_strategy, metadata.refresh);
     }
 
+    if (metadata.sql_security_type)
+    {
+        auto new_sql_security = std::make_shared<ASTSQLSecurity>();
+        new_sql_security->type = metadata.sql_security_type;
+
+        if (metadata.definer)
+            new_sql_security->definer = std::make_shared<ASTUserNameWithHost>(*metadata.definer);
+
+        ast_create_query.sql_security = std::move(new_sql_security);
+    }
+
     /// MaterializedView, Dictionary are types of CREATE query without storage.
     if (ast_create_query.storage)
     {
@@ -108,7 +120,8 @@ void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemo
 }
 
 
-ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_storage, bool only_ordinary, uint32_t max_parser_depth, bool throw_on_error)
+ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_storage, bool only_ordinary,
+    uint32_t max_parser_depth, uint32_t max_parser_backtracks, bool throw_on_error)
 {
     auto table_id = storage->getStorageID();
     auto metadata_ptr = storage->getInMemoryMetadataPtr();
@@ -148,7 +161,7 @@ ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_
                 Expected expected;
                 expected.max_parsed_pos = string_end;
                 Tokens tokens(type_name.c_str(), string_end);
-                IParser::Pos pos(tokens, max_parser_depth);
+                IParser::Pos pos(tokens, max_parser_depth, max_parser_backtracks);
                 ParserDataType parser;
                 if (!parser.parse(pos, ast_type, expected))
                 {
@@ -197,7 +210,7 @@ void cleanupObjectDefinitionFromTemporaryFlags(ASTCreateQuery & query)
 
 
 DatabaseWithOwnTablesBase::DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context_)
-        : IDatabase(name_), WithContext(context_->getGlobalContext()), log(&Poco::Logger::get(logger))
+        : IDatabase(name_), WithContext(context_->getGlobalContext()), log(getLogger(logger))
 {
 }
 
@@ -213,7 +226,7 @@ StoragePtr DatabaseWithOwnTablesBase::tryGetTable(const String & table_name, Con
     return tryGetTableNoWait(table_name);
 }
 
-DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name) const
+DatabaseTablesIteratorPtr DatabaseWithOwnTablesBase::getTablesIterator(ContextPtr, const FilterByNameFunction & filter_by_table_name, bool /* skip_not_loaded */) const
 {
     std::lock_guard lock(mutex);
     if (!filter_by_table_name)
@@ -350,7 +363,7 @@ std::vector<std::pair<ASTPtr, StoragePtr>> DatabaseWithOwnTablesBase::getTablesF
 {
     std::vector<std::pair<ASTPtr, StoragePtr>> res;
 
-    for (auto it = getTablesIterator(local_context, filter); it->isValid(); it->next())
+    for (auto it = getTablesIterator(local_context, filter, /*skip_not_loaded=*/false); it->isValid(); it->next())
     {
         auto storage = it->table();
         if (!storage)
diff --git a/src/Databases/DatabasesCommon.h b/src/Databases/DatabasesCommon.h
index fc67596d3de..2eecf8a564f 100644
--- a/src/Databases/DatabasesCommon.h
+++ b/src/Databases/DatabasesCommon.h
@@ -13,7 +13,8 @@ namespace DB
 {
 
 void applyMetadataChangesToCreateQuery(const ASTPtr & query, const StorageInMemoryMetadata & metadata);
-ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_storage, bool only_ordinary, uint32_t max_parser_depth, bool throw_on_error);
+ASTPtr getCreateQueryFromStorage(const StoragePtr & storage, const ASTPtr & ast_storage, bool only_ordinary,
+    uint32_t max_parser_depth, uint32_t max_parser_backtracks, bool throw_on_error);
 
 /// Cleans a CREATE QUERY from temporary flags like "IF NOT EXISTS", "OR REPLACE", "AS SELECT" (for non-views), etc.
 void cleanupObjectDefinitionFromTemporaryFlags(ASTCreateQuery & query);
@@ -34,7 +35,7 @@ public:
 
     StoragePtr detachTable(ContextPtr context, const String & table_name) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     std::vector<std::pair<ASTPtr, StoragePtr>> getTablesForBackup(const FilterByNameFunction & filter, const ContextPtr & local_context) const override;
     void createTableRestoredFromBackup(const ASTPtr & create_table_query, ContextMutablePtr local_context, std::shared_ptr<IRestoreCoordination> restore_coordination, UInt64 timeout_ms) override;
@@ -45,7 +46,7 @@ public:
 
 protected:
     Tables tables TSA_GUARDED_BY(mutex);
-    Poco::Logger * log;
+    LoggerPtr log;
 
     DatabaseWithOwnTablesBase(const String & name_, const String & logger, ContextPtr context);
 
diff --git a/src/Databases/DatabasesOverlay.cpp b/src/Databases/DatabasesOverlay.cpp
index b44a9798072..2772db5e066 100644
--- a/src/Databases/DatabasesOverlay.cpp
+++ b/src/Databases/DatabasesOverlay.cpp
@@ -17,7 +17,7 @@ namespace ErrorCodes
 }
 
 DatabasesOverlay::DatabasesOverlay(const String & name_, ContextPtr context_)
-    : IDatabase(name_), WithContext(context_->getGlobalContext()), log(&Poco::Logger::get("DatabaseOverlay(" + name_ + ")"))
+    : IDatabase(name_), WithContext(context_->getGlobalContext()), log(getLogger("DatabaseOverlay(" + name_ + ")"))
 {
 }
 
@@ -149,7 +149,9 @@ ASTPtr DatabasesOverlay::getCreateTableQueryImpl(const String & name, ContextPtr
  */
 ASTPtr DatabasesOverlay::getCreateDatabaseQuery() const
 {
-    return std::make_shared<ASTCreateQuery>();
+    auto query = std::make_shared<ASTCreateQuery>();
+    query->setDatabase(getDatabaseName());
+    return query;
 }
 
 String DatabasesOverlay::getTableDataPath(const String & table_name) const
@@ -252,7 +254,7 @@ void DatabasesOverlay::shutdown()
         db->shutdown();
 }
 
-DatabaseTablesIteratorPtr DatabasesOverlay::getTablesIterator(ContextPtr context_, const FilterByNameFunction & filter_by_table_name) const
+DatabaseTablesIteratorPtr DatabasesOverlay::getTablesIterator(ContextPtr context_, const FilterByNameFunction & filter_by_table_name, bool /*skip_not_loaded*/) const
 {
     Tables tables;
     for (const auto & db : databases)
diff --git a/src/Databases/DatabasesOverlay.h b/src/Databases/DatabasesOverlay.h
index 0f31bbd6a47..b0c7e7e4032 100644
--- a/src/Databases/DatabasesOverlay.h
+++ b/src/Databases/DatabasesOverlay.h
@@ -23,7 +23,6 @@ public:
 
     String getEngineName() const override { return "Overlay"; }
 
-public:
     bool isTableExist(const String & table_name, ContextPtr context) const override;
 
     StoragePtr tryGetTable(const String & table_name, ContextPtr context) const override;
@@ -52,7 +51,7 @@ public:
 
     void createTableRestoredFromBackup(const ASTPtr & create_table_query, ContextMutablePtr local_context, std::shared_ptr<IRestoreCoordination> restore_coordination, UInt64 timeout_ms) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     bool empty() const override;
 
@@ -60,7 +59,7 @@ public:
 
 protected:
     std::vector<DatabasePtr> databases;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Databases/IDatabase.cpp b/src/Databases/IDatabase.cpp
index ae8fc58bf89..95d671d1960 100644
--- a/src/Databases/IDatabase.cpp
+++ b/src/Databases/IDatabase.cpp
@@ -1,11 +1,12 @@
 #include <memory>
 #include <Databases/IDatabase.h>
-#include <Storages/IStorage.h>
-#include <Parsers/ASTCreateQuery.h>
-#include <Common/quoteString.h>
 #include <Interpreters/DatabaseCatalog.h>
-#include <Common/NamePrompter.h>
+#include <Interpreters/TableNameHints.h>
+#include <Parsers/ASTCreateQuery.h>
+#include <Storages/IStorage.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/NamePrompter.h>
+#include <Common/quoteString.h>
 
 
 namespace CurrentMetrics
diff --git a/src/Databases/IDatabase.h b/src/Databases/IDatabase.h
index 15e453371b7..b00f2fe4baf 100644
--- a/src/Databases/IDatabase.h
+++ b/src/Databases/IDatabase.h
@@ -77,17 +77,12 @@ private:
     Tables tables;
     Tables::iterator it;
 
-    // Tasks to wait before returning a table
-    using Tasks = std::unordered_map<String, LoadTaskPtr>;
-    Tasks tasks;
-
 protected:
     DatabaseTablesSnapshotIterator(DatabaseTablesSnapshotIterator && other) noexcept
     : IDatabaseTablesIterator(std::move(other.database_name))
     {
         size_t idx = std::distance(other.tables.begin(), other.it);
         std::swap(tables, other.tables);
-        std::swap(tasks, other.tasks);
         other.it = other.tables.end();
         it = tables.begin();
         std::advance(it, idx);
@@ -110,17 +105,7 @@ public:
 
     const String & name() const override { return it->first; }
 
-    const StoragePtr & table() const override
-    {
-        if (auto task = tasks.find(it->first); task != tasks.end())
-            waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task->second);
-        return it->second;
-    }
-
-    void setLoadTasks(const Tasks & tasks_)
-    {
-        tasks = tasks_;
-    }
+    const StoragePtr & table() const override { return it->second; }
 };
 
 using DatabaseTablesIteratorPtr = std::unique_ptr<IDatabaseTablesIterator>;
@@ -219,8 +204,11 @@ public:
     virtual void waitTableStarted(const String & /*name*/) const {}
 
     /// Waits for the database to be started up, i.e. task returned by `startupDatabaseAsync()` is done
-    /// NOTE: `no_throw` wait should be used during shutdown to (1) prevent race with startup and (2) avoid exceptions if startup failed
-    virtual void waitDatabaseStarted(bool /*no_throw*/) const {}
+    virtual void waitDatabaseStarted() const {}
+
+    /// Cancels all load and startup tasks and waits for currently running tasks to finish.
+    /// Should be used during shutdown to (1) prevent race with startup, (2) stop any not yet started task and (3) avoid exceptions if startup failed
+    virtual void stopLoading() {}
 
     /// Check the existence of the table in memory (attached).
     virtual bool isTableExist(const String & name, ContextPtr context) const = 0;
@@ -241,7 +229,18 @@ public:
 
     /// Get an iterator that allows you to pass through all the tables.
     /// It is possible to have "hidden" tables that are not visible when passing through, but are visible if you get them by name using the functions above.
-    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}) const = 0; /// NOLINT
+    /// Wait for all tables to be loaded and started up. If `skip_not_loaded` is true, then not yet loaded or not yet started up (at the moment of iterator creation) tables are excluded.
+    virtual DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name = {}, bool skip_not_loaded = false) const = 0; /// NOLINT
+
+    /// Returns list of table names.
+    virtual Strings getAllTableNames(ContextPtr context) const
+    {
+        // NOTE: This default implementation wait for all tables to be loaded and started up. It should be reimplemented for databases that support async loading.
+        Strings result;
+        for (auto table_it = getTablesIterator(context); table_it->isValid(); table_it->next())
+            result.emplace_back(table_it->name());
+        return result;
+    }
 
     /// Is the database empty.
     virtual bool empty() const = 0;
@@ -404,7 +403,7 @@ public:
 
     virtual void stopReplication()
     {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Database engine {} does not run a replication thread!", getEngineName());
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Database engine {} does not run a replication thread", getEngineName());
     }
 
     virtual bool shouldReplicateQuery(const ContextPtr & /*query_context*/, const ASTPtr & /*query_ptr*/) const { return false; }
diff --git a/src/Databases/LoadingStrictnessLevel.cpp b/src/Databases/LoadingStrictnessLevel.cpp
index 8d491ca5689..9f90b7a9c06 100644
--- a/src/Databases/LoadingStrictnessLevel.cpp
+++ b/src/Databases/LoadingStrictnessLevel.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore)
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore, bool secondary)
 {
     if (force_restore)
     {
@@ -22,6 +22,9 @@ LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach,
     if (attach)
         return LoadingStrictnessLevel::ATTACH;
 
+    if (secondary)
+        return LoadingStrictnessLevel::SECONDARY_CREATE;
+
     return LoadingStrictnessLevel::CREATE;
 }
 
diff --git a/src/Databases/LoadingStrictnessLevel.h b/src/Databases/LoadingStrictnessLevel.h
index b6449a0a9fd..fe3be363cd2 100644
--- a/src/Databases/LoadingStrictnessLevel.h
+++ b/src/Databases/LoadingStrictnessLevel.h
@@ -8,14 +8,16 @@ enum class LoadingStrictnessLevel
 {
     /// Do all possible sanity checks
     CREATE = 0,
+    /// Skip some sanity checks (for internal queries in DatabaseReplicated; for RESTORE)
+    SECONDARY_CREATE = 1,
     /// Expect existing paths on FS and in ZK for ATTACH query
-    ATTACH = 1,
+    ATTACH = 2,
     /// We ignore some error on server startup
-    FORCE_ATTACH = 2,
+    FORCE_ATTACH = 3,
     /// Skip all sanity checks (if force_restore_data flag exists)
-    FORCE_RESTORE = 3,
+    FORCE_RESTORE = 4,
 };
 
-LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore);
+LoadingStrictnessLevel getLoadingStrictnessLevel(bool attach, bool force_attach, bool force_restore, bool secondary);
 
 }
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
index 99dd337189c..d8360a24bcb 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.cpp
@@ -90,13 +90,30 @@ LoadTaskPtr DatabaseMaterializedMySQL::startupDatabaseAsync(AsyncLoader & async_
             materialize_thread.startSynchronization();
             started_up = true;
         });
+    std::scoped_lock lock(mutex);
     return startup_mysql_database_task = makeLoadTask(async_loader, {job});
 }
 
-void DatabaseMaterializedMySQL::waitDatabaseStarted(bool no_throw) const
+void DatabaseMaterializedMySQL::waitDatabaseStarted() const
 {
-    if (startup_mysql_database_task)
-        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_mysql_database_task, no_throw);
+    LoadTaskPtr task;
+    {
+        std::scoped_lock lock(mutex);
+        task = startup_mysql_database_task;
+    }
+    if (task)
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task);
+}
+
+void DatabaseMaterializedMySQL::stopLoading()
+{
+    LoadTaskPtr stop_startup_mysql_database;
+    {
+        std::scoped_lock lock(mutex);
+        stop_startup_mysql_database.swap(startup_mysql_database_task);
+    }
+    stop_startup_mysql_database.reset();
+    DatabaseAtomic::stopLoading();
 }
 
 void DatabaseMaterializedMySQL::createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query)
@@ -168,9 +185,9 @@ StoragePtr DatabaseMaterializedMySQL::tryGetTable(const String & name, ContextPt
 }
 
 DatabaseTablesIteratorPtr
-DatabaseMaterializedMySQL::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const
+DatabaseMaterializedMySQL::getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const
 {
-    DatabaseTablesIteratorPtr iterator = DatabaseAtomic::getTablesIterator(context_, filter_by_table_name);
+    DatabaseTablesIteratorPtr iterator = DatabaseAtomic::getTablesIterator(context_, filter_by_table_name, skip_not_loaded);
     if (context_->isInternalQuery())
         return iterator;
     return std::make_unique<DatabaseMaterializedTablesIterator>(std::move(iterator), this);
@@ -184,7 +201,6 @@ void DatabaseMaterializedMySQL::checkIsInternalQuery(ContextPtr context_, const
 
 void DatabaseMaterializedMySQL::stopReplication()
 {
-    waitDatabaseStarted(/* no_throw = */ true);
     materialize_thread.stopSynchronization();
     started_up = false;
 }
diff --git a/src/Databases/MySQL/DatabaseMaterializedMySQL.h b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
index 4d7871d49d6..a6418e6fc5c 100644
--- a/src/Databases/MySQL/DatabaseMaterializedMySQL.h
+++ b/src/Databases/MySQL/DatabaseMaterializedMySQL.h
@@ -48,13 +48,14 @@ protected:
 
     std::atomic_bool started_up{false};
 
-    LoadTaskPtr startup_mysql_database_task;
+    LoadTaskPtr startup_mysql_database_task TSA_GUARDED_BY(mutex);
 
 public:
     String getEngineName() const override { return "MaterializedMySQL"; }
 
     LoadTaskPtr startupDatabaseAsync(AsyncLoader & async_loader, LoadJobSet startup_after, LoadingStrictnessLevel mode) override;
-    void waitDatabaseStarted(bool no_throw) const override;
+    void waitDatabaseStarted() const override;
+    void stopLoading() override;
 
     void createTable(ContextPtr context_, const String & name, const StoragePtr & table, const ASTPtr & query) override;
 
@@ -72,7 +73,7 @@ public:
 
     StoragePtr tryGetTable(const String & name, ContextPtr context_) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context_, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     void checkIsInternalQuery(ContextPtr context_, const char * method) const;
 
diff --git a/src/Databases/MySQL/DatabaseMySQL.cpp b/src/Databases/MySQL/DatabaseMySQL.cpp
index 96a5c3a18ce..b2e199735db 100644
--- a/src/Databases/MySQL/DatabaseMySQL.cpp
+++ b/src/Databases/MySQL/DatabaseMySQL.cpp
@@ -105,7 +105,7 @@ bool DatabaseMySQL::empty() const
     return true;
 }
 
-DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name) const
+DatabaseTablesIteratorPtr DatabaseMySQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & filter_by_table_name, bool /* skip_not_loaded */) const
 {
     Tables tables;
     std::lock_guard lock(mutex);
@@ -174,12 +174,14 @@ ASTPtr DatabaseMySQL::getCreateTableQueryImpl(const String & table_name, Context
         ast_storage->settings = nullptr;
     }
 
-    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
-    auto create_table_query = DB::getCreateQueryFromStorage(storage,
-                                                            table_storage_define,
-                                                            true,
-                                                            max_parser_depth,
-                                                            throw_on_error);
+    const Settings & settings = getContext()->getSettingsRef();
+    auto create_table_query = DB::getCreateQueryFromStorage(
+        storage,
+        table_storage_define,
+        true,
+        static_cast<unsigned>(settings.max_parser_depth),
+        static_cast<unsigned>(settings.max_parser_backtracks),
+        throw_on_error);
     return create_table_query;
 }
 
diff --git a/src/Databases/MySQL/DatabaseMySQL.h b/src/Databases/MySQL/DatabaseMySQL.h
index e5b1f434d2f..084a8339be3 100644
--- a/src/Databases/MySQL/DatabaseMySQL.h
+++ b/src/Databases/MySQL/DatabaseMySQL.h
@@ -58,7 +58,7 @@ public:
 
     bool empty() const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_nam, bool skip_not_loaded) const override;
 
     ASTPtr getCreateDatabaseQuery() const override;
 
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
index 5834fb96dc6..20db8036942 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.cpp
@@ -116,7 +116,7 @@ static BlockIO tryToExecuteQuery(const String & query_to_execute, ContextMutable
     catch (...)
     {
         tryLogCurrentException(
-            &Poco::Logger::get("MaterializedMySQLSyncThread(" + database + ")"),
+            getLogger("MaterializedMySQLSyncThread(" + database + ")"),
             "Query " + query_to_execute + " wasn't finished successfully");
         throw;
     }
@@ -255,7 +255,7 @@ MaterializedMySQLSyncThread::MaterializedMySQLSyncThread(
     const MySQLReplication::BinlogClientPtr & binlog_client_,
     MaterializedMySQLSettings * settings_)
     : WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("MaterializedMySQLSyncThread"))
+    , log(getLogger("MaterializedMySQLSyncThread"))
     , database_name(database_name_)
     , mysql_database_name(mysql_database_name_)
     , pool(std::move(pool_)) /// NOLINT
@@ -504,7 +504,7 @@ static inline void dumpDataForTables(
             StreamSettings mysql_input_stream_settings(context->getSettingsRef());
             String mysql_select_all_query = "SELECT " + rewriteMysqlQueryColumn(connection, mysql_database_name, table_name, context->getSettingsRef()) + " FROM "
                     + backQuoteIfNeed(mysql_database_name) + "." + backQuoteIfNeed(table_name);
-            LOG_INFO(&Poco::Logger::get("MaterializedMySQLSyncThread(" + database_name + ")"), "mysql_select_all_query is {}", mysql_select_all_query);
+            LOG_INFO(getLogger("MaterializedMySQLSyncThread(" + database_name + ")"), "mysql_select_all_query is {}", mysql_select_all_query);
             auto input = std::make_unique<MySQLSource>(connection, mysql_select_all_query, pipeline.getHeader(), mysql_input_stream_settings);
             auto counting = std::make_shared<CountingTransform>(pipeline.getHeader());
             Pipe pipe(std::move(input));
@@ -516,7 +516,7 @@ static inline void dumpDataForTables(
             executor.execute();
 
             const Progress & progress = counting->getProgress();
-            LOG_INFO(&Poco::Logger::get("MaterializedMySQLSyncThread(" + database_name + ")"),
+            LOG_INFO(getLogger("MaterializedMySQLSyncThread(" + database_name + ")"),
                 "Materialize MySQL step 1: dump {}, {} rows, {} in {} sec., {} rows/sec., {}/sec."
                 , table_name, formatReadableQuantity(progress.written_rows), formatReadableSizeWithBinarySuffix(progress.written_bytes)
                 , watch.elapsedSeconds(), formatReadableQuantity(static_cast<size_t>(progress.written_rows / watch.elapsedSeconds()))
@@ -779,7 +779,7 @@ static void writeFieldsToColumn(
                         casted_int32_column->insertValue(num & 0x800000 ? num | 0xFF000000 : num);
                     }
                     else
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: it is a bug.");
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "MaterializedMySQL is a bug.");
                 }
             }
         }
@@ -844,7 +844,7 @@ static inline bool differenceSortingKeys(const Tuple & row_old_data, const Tuple
 static inline size_t onUpdateData(const Row & rows_data, Block & buffer, size_t version, const std::vector<size_t> & sorting_columns_index)
 {
     if (rows_data.size() % 2 != 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: It is a bug.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "MaterializedMySQL is a bug.");
 
     size_t prev_bytes = buffer.bytes();
     std::vector<bool> writeable_rows_mask(rows_data.size());
diff --git a/src/Databases/MySQL/MaterializedMySQLSyncThread.h b/src/Databases/MySQL/MaterializedMySQLSyncThread.h
index 004a4d67d32..03e558bfd68 100644
--- a/src/Databases/MySQL/MaterializedMySQLSyncThread.h
+++ b/src/Databases/MySQL/MaterializedMySQLSyncThread.h
@@ -56,7 +56,7 @@ public:
     void assertMySQLAvailable();
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     String database_name;
     String mysql_database_name;
diff --git a/src/Databases/MySQL/MySQLBinlog.h b/src/Databases/MySQL/MySQLBinlog.h
index 0b8f7543590..fe8f4541ad7 100644
--- a/src/Databases/MySQL/MySQLBinlog.h
+++ b/src/Databases/MySQL/MySQLBinlog.h
@@ -94,7 +94,7 @@ using BinlogFactoryPtr = std::shared_ptr<IBinlogFactory>;
 class BinlogFromFileFactory : public IBinlogFactory
 {
 public:
-    BinlogFromFileFactory(const String & filename_);
+    explicit BinlogFromFileFactory(const String & filename_);
     BinlogPtr createBinlog(const String & executed_gtid_set) override;
 
 private:
diff --git a/src/Databases/MySQL/MySQLBinlogClient.cpp b/src/Databases/MySQL/MySQLBinlogClient.cpp
index e7d707f76ce..94e01673e88 100644
--- a/src/Databases/MySQL/MySQLBinlogClient.cpp
+++ b/src/Databases/MySQL/MySQLBinlogClient.cpp
@@ -17,7 +17,7 @@ BinlogClient::BinlogClient(const BinlogFactoryPtr & factory_,
     , binlog_client_name(name)
     , max_bytes_in_buffer(max_bytes_in_buffer_)
     , max_flush_ms(max_flush_ms_)
-    , logger(&Poco::Logger::get("BinlogClient(" + name + ")"))
+    , logger(getLogger("BinlogClient(" + name + ")"))
 {
 }
 
diff --git a/src/Databases/MySQL/MySQLBinlogClient.h b/src/Databases/MySQL/MySQLBinlogClient.h
index b76934d08cf..b4908f79e94 100644
--- a/src/Databases/MySQL/MySQLBinlogClient.h
+++ b/src/Databases/MySQL/MySQLBinlogClient.h
@@ -14,7 +14,7 @@ namespace DB::MySQLReplication
 class BinlogClient
 {
 public:
-    BinlogClient(const BinlogFactoryPtr & factory,
+    explicit BinlogClient(const BinlogFactoryPtr & factory,
                  const String & name = {},
                  UInt64 max_bytes_in_buffer_ = DBMS_DEFAULT_BUFFER_SIZE,
                  UInt64 max_flush_ms_ = 1000);
@@ -48,7 +48,7 @@ private:
     std::vector<BinlogEventsDispatcherPtr> dispatchers;
     String binlog_checksum;
     mutable std::mutex mutex;
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
     int dispatchers_count = 0;
 };
 
diff --git a/src/Databases/MySQL/MySQLBinlogEventsDispatcher.cpp b/src/Databases/MySQL/MySQLBinlogEventsDispatcher.cpp
index 4af307f9c0f..d027d4b2192 100644
--- a/src/Databases/MySQL/MySQLBinlogEventsDispatcher.cpp
+++ b/src/Databases/MySQL/MySQLBinlogEventsDispatcher.cpp
@@ -19,7 +19,7 @@ public:
         , mysql_database_names(mysql_database_names_)
         , max_bytes(max_bytes_)
         , max_waiting_ms(max_waiting_ms_)
-        , logger(&Poco::Logger::get("BinlogFromDispatcher(" + name + ")"))
+        , logger(getLogger("BinlogFromDispatcher(" + name + ")"))
     {
     }
 
@@ -65,7 +65,7 @@ private:
 
     std::condition_variable cv;
     bool is_cancelled = false;
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
     std::exception_ptr exception;
 };
 
@@ -84,7 +84,7 @@ BinlogEventsDispatcher::BinlogEventsDispatcher(const String & logger_name_, size
     : logger_name(logger_name_)
     , max_bytes_in_buffer(max_bytes_in_buffer_)
     , max_flush_ms(max_flush_ms_)
-    , logger(&Poco::Logger::get("BinlogEventsDispatcher(" + logger_name + ")"))
+    , logger(getLogger("BinlogEventsDispatcher(" + logger_name + ")"))
     , dispatching_thread(std::make_unique<ThreadFromGlobalPool>([this]() { dispatchEvents(); }))
 {
 }
diff --git a/src/Databases/MySQL/MySQLBinlogEventsDispatcher.h b/src/Databases/MySQL/MySQLBinlogEventsDispatcher.h
index 43379697015..291df385236 100644
--- a/src/Databases/MySQL/MySQLBinlogEventsDispatcher.h
+++ b/src/Databases/MySQL/MySQLBinlogEventsDispatcher.h
@@ -18,7 +18,7 @@ class BinlogFromDispatcher;
 class BinlogEventsDispatcher final : boost::noncopyable
 {
 public:
-    BinlogEventsDispatcher(const String & logger_name_ = "BinlogDispatcher", size_t max_bytes_in_buffer_ = 1_MiB, UInt64 max_flush_ms_ = 1000);
+    explicit BinlogEventsDispatcher(const String & logger_name_ = "BinlogDispatcher", size_t max_bytes_in_buffer_ = 1_MiB, UInt64 max_flush_ms_ = 1000);
     ~BinlogEventsDispatcher();
 
     /// Moves all IBinlog objects to \a to if it has the same position
@@ -110,7 +110,7 @@ private:
     const String logger_name;
     const size_t max_bytes_in_buffer = 0;
     const UInt64 max_flush_ms = 0;
-    Poco::Logger * logger = nullptr;
+    LoggerPtr logger = nullptr;
 
     BinlogPtr binlog_read_from;
 
diff --git a/src/Databases/MySQL/tryConvertStringLiterals.cpp b/src/Databases/MySQL/tryConvertStringLiterals.cpp
index ab392b301e8..ac65d510f67 100644
--- a/src/Databases/MySQL/tryConvertStringLiterals.cpp
+++ b/src/Databases/MySQL/tryConvertStringLiterals.cpp
@@ -61,7 +61,7 @@ static bool tryReadCharset(
 bool tryConvertStringLiterals(String & query)
 {
     Tokens tokens(query.data(), query.data() + query.size());
-    IParser::Pos pos(tokens, 0);
+    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     Expected expected;
     String rewritten_query;
     rewritten_query.reserve(query.size());
diff --git a/src/Databases/MySQL/tryParseTableIDFromDDL.cpp b/src/Databases/MySQL/tryParseTableIDFromDDL.cpp
index a01eb311450..bc7f2507e57 100644
--- a/src/Databases/MySQL/tryParseTableIDFromDDL.cpp
+++ b/src/Databases/MySQL/tryParseTableIDFromDDL.cpp
@@ -10,25 +10,25 @@ StorageID tryParseTableIDFromDDL(const String & query, const String & default_da
 {
     bool is_ddl = false;
     Tokens tokens(query.data(), query.data() + query.size());
-    IParser::Pos pos(tokens, 0);
+    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     Expected expected;
-    if (ParserKeyword("CREATE TEMPORARY TABLE").ignore(pos, expected) || ParserKeyword("CREATE TABLE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::CREATE_TEMPORARY_TABLE).ignore(pos, expected) || ParserKeyword(Keyword::CREATE_TABLE).ignore(pos, expected))
     {
-        ParserKeyword("IF NOT EXISTS").ignore(pos, expected);
+        ParserKeyword(Keyword::IF_NOT_EXISTS).ignore(pos, expected);
         is_ddl = true;
     }
-    else if (ParserKeyword("ALTER TABLE").ignore(pos, expected) || ParserKeyword("RENAME TABLE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::ALTER_TABLE).ignore(pos, expected) || ParserKeyword(Keyword::RENAME_TABLE).ignore(pos, expected))
     {
         is_ddl = true;
     }
-    else if (ParserKeyword("DROP TABLE").ignore(pos, expected) || ParserKeyword("DROP TEMPORARY TABLE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::DROP_TABLE).ignore(pos, expected) || ParserKeyword(Keyword::DROP_TEMPORARY_TABLE).ignore(pos, expected))
     {
-        ParserKeyword("IF EXISTS").ignore(pos, expected);
+        ParserKeyword(Keyword::IF_EXISTS).ignore(pos, expected);
         is_ddl = true;
     }
-    else if (ParserKeyword("TRUNCATE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::TRUNCATE).ignore(pos, expected))
     {
-        ParserKeyword("TABLE").ignore(pos, expected);
+        ParserKeyword(Keyword::TABLE).ignore(pos, expected);
         is_ddl = true;
     }
 
diff --git a/src/Databases/MySQL/tryQuoteUnrecognizedTokens.cpp b/src/Databases/MySQL/tryQuoteUnrecognizedTokens.cpp
index c5a366698e6..9ecc81c693f 100644
--- a/src/Databases/MySQL/tryQuoteUnrecognizedTokens.cpp
+++ b/src/Databases/MySQL/tryQuoteUnrecognizedTokens.cpp
@@ -37,7 +37,7 @@ static void quoteLiteral(
 bool tryQuoteUnrecognizedTokens(String & query)
 {
     Tokens tokens(query.data(), query.data() + query.size());
-    IParser::Pos pos(tokens, 0);
+    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     Expected expected;
     String rewritten_query;
     const char * copy_from = query.data();
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
index a659821e179..7ce03c74c58 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.cpp
@@ -5,6 +5,7 @@
 #include <Storages/PostgreSQL/StorageMaterializedPostgreSQL.h>
 #include <Databases/PostgreSQL/fetchPostgreSQLTableStructure.h>
 
+#include <Common/CurrentThread.h>
 #include <Common/logger_useful.h>
 #include <Common/Macros.h>
 #include <Common/PoolId.h>
@@ -152,13 +153,30 @@ LoadTaskPtr DatabaseMaterializedPostgreSQL::startupDatabaseAsync(AsyncLoader & a
         {
             startup_task->activateAndSchedule();
         });
+    std::scoped_lock lock(mutex);
     return startup_postgresql_database_task = makeLoadTask(async_loader, {job});
 }
 
-void DatabaseMaterializedPostgreSQL::waitDatabaseStarted(bool no_throw) const
+void DatabaseMaterializedPostgreSQL::waitDatabaseStarted() const
 {
-    if (startup_postgresql_database_task)
-        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), startup_postgresql_database_task, no_throw);
+    LoadTaskPtr task;
+    {
+        std::scoped_lock lock(mutex);
+        task = startup_postgresql_database_task;
+    }
+    if (task)
+        waitLoad(currentPoolOr(TablesLoaderForegroundPoolId), task);
+}
+
+void DatabaseMaterializedPostgreSQL::stopLoading()
+{
+    LoadTaskPtr stop_startup_postgresql_database;
+    {
+        std::scoped_lock lock(mutex);
+        stop_startup_postgresql_database.swap(startup_postgresql_database_task);
+    }
+    stop_startup_postgresql_database.reset();
+    DatabaseAtomic::stopLoading();
 }
 
 void DatabaseMaterializedPostgreSQL::applySettingsChanges(const SettingsChanges & settings_changes, ContextPtr query_context)
@@ -281,7 +299,7 @@ ASTPtr DatabaseMaterializedPostgreSQL::createAlterSettingsQuery(const SettingCha
 
     auto command = std::make_shared<ASTAlterCommand>();
     command->type = ASTAlterCommand::Type::MODIFY_DATABASE_SETTING;
-    command->settings_changes = std::move(set);
+    command->settings_changes = command->children.emplace_back(std::move(set)).get();
 
     auto command_list = std::make_shared<ASTExpressionList>();
     command_list->children.push_back(command);
@@ -438,8 +456,6 @@ void DatabaseMaterializedPostgreSQL::shutdown()
 
 void DatabaseMaterializedPostgreSQL::stopReplication()
 {
-    waitDatabaseStarted(/* no_throw = */ true);
-
     std::lock_guard lock(handler_mutex);
     if (replication_handler)
         replication_handler->shutdown();
@@ -467,10 +483,10 @@ void DatabaseMaterializedPostgreSQL::drop(ContextPtr local_context)
 
 
 DatabaseTablesIteratorPtr DatabaseMaterializedPostgreSQL::getTablesIterator(
-    ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const
+    ContextPtr local_context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const
 {
     /// Modify context into nested_context and pass query to Atomic database.
-    return DatabaseAtomic::getTablesIterator(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), filter_by_table_name);
+    return DatabaseAtomic::getTablesIterator(StorageMaterializedPostgreSQL::makeNestedTableContext(local_context), filter_by_table_name, skip_not_loaded);
 }
 
 void registerDatabaseMaterializedPostgreSQL(DatabaseFactory & factory)
diff --git a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
index 8feb5a014e1..cf1333d03c8 100644
--- a/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabaseMaterializedPostgreSQL.h
@@ -41,10 +41,11 @@ public:
     String getMetadataPath() const override { return metadata_path; }
 
     LoadTaskPtr startupDatabaseAsync(AsyncLoader & async_loader, LoadJobSet startup_after, LoadingStrictnessLevel mode) override;
-    void waitDatabaseStarted(bool no_throw) const override;
+    void waitDatabaseStarted() const override;
+    void stopLoading() override;
 
     DatabaseTablesIteratorPtr
-    getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name) const override;
+    getTablesIterator(ContextPtr context, const DatabaseOnDisk::FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
@@ -94,7 +95,7 @@ private:
     BackgroundSchedulePool::TaskHolder startup_task;
     bool shutdown_called = false;
 
-    LoadTaskPtr startup_postgresql_database_task;
+    LoadTaskPtr startup_postgresql_database_task TSA_GUARDED_BY(mutex);
 };
 
 }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
index 1fe5c078581..3f62b9719d2 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.cpp
@@ -57,7 +57,7 @@ DatabasePostgreSQL::DatabasePostgreSQL(
     , configuration(configuration_)
     , pool(std::move(pool_))
     , cache_tables(cache_tables_)
-    , log(&Poco::Logger::get("DatabasePostgreSQL(" + dbname_ + ")"))
+    , log(getLogger("DatabasePostgreSQL(" + dbname_ + ")"))
 {
     fs::create_directories(metadata_path);
     cleaner_task = getContext()->getSchedulePool().createTask("PostgreSQLCleanerTask", [this]{ removeOutdatedTables(); });
@@ -97,7 +97,7 @@ bool DatabasePostgreSQL::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */) const
+DatabaseTablesIteratorPtr DatabasePostgreSQL::getTablesIterator(ContextPtr local_context, const FilterByNameFunction & /* filter_by_table_name */, bool /* skip_not_loaded */) const
 {
     std::lock_guard lock(mutex);
     Tables tables;
@@ -531,7 +531,7 @@ void registerDatabasePostgreSQL(DatabaseFactory & factory)
                 else
                 {
                     use_table_cache = safeGetLiteralValue<UInt8>(engine_args[4], engine_name);
-                    LOG_WARNING(&Poco::Logger::get("DatabaseFactory"), "A deprecated syntax of PostgreSQL database engine is used");
+                    LOG_WARNING(getLogger("DatabaseFactory"), "A deprecated syntax of PostgreSQL database engine is used");
                     is_deprecated_syntax = true;
                 }
             }
diff --git a/src/Databases/PostgreSQL/DatabasePostgreSQL.h b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
index d731e06649b..137b9d5cef9 100644
--- a/src/Databases/PostgreSQL/DatabasePostgreSQL.h
+++ b/src/Databases/PostgreSQL/DatabasePostgreSQL.h
@@ -46,7 +46,7 @@ public:
 
     void loadStoredObjects(ContextMutablePtr, LoadingStrictnessLevel /*mode*/) override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     bool isTableExist(const String & name, ContextPtr context) const override;
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
@@ -73,7 +73,7 @@ private:
     mutable Tables cached_tables;
     std::unordered_set<std::string> detached_or_dropped;
     BackgroundSchedulePool::TaskHolder cleaner_task;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     String getTableNameForLogs(const String & table_name) const;
 
diff --git a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
index 469ca52890a..943f3ae502e 100644
--- a/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
+++ b/src/Databases/PostgreSQL/fetchPostgreSQLTableStructure.cpp
@@ -213,7 +213,9 @@ PostgreSQLTableStructure::ColumnsInfoPtr readNamesAndTypesList(
                         PostgreSQLTableStructure::PGAttribute{
                             .atttypid = parse<int>(std::get<4>(row)),
                             .atttypmod = parse<int>(std::get<5>(row)),
-                            .attgenerated = attgenerated.empty() ? char{} : char(attgenerated[0])
+                            .atthasdef = false,
+                            .attgenerated = attgenerated.empty() ? char{} : char(attgenerated[0]),
+                            .attr_def = {}
                     });
 
                     ++i;
diff --git a/src/Databases/SQLite/DatabaseSQLite.cpp b/src/Databases/SQLite/DatabaseSQLite.cpp
index 605a354bd7e..e758ea35de5 100644
--- a/src/Databases/SQLite/DatabaseSQLite.cpp
+++ b/src/Databases/SQLite/DatabaseSQLite.cpp
@@ -33,7 +33,7 @@ DatabaseSQLite::DatabaseSQLite(
     , WithContext(context_->getGlobalContext())
     , database_engine_define(database_engine_define_->clone())
     , database_path(database_path_)
-    , log(&Poco::Logger::get("DatabaseSQLite"))
+    , log(getLogger("DatabaseSQLite"))
 {
     sqlite_db = openSQLiteDB(database_path_, context_, !is_attach_);
 }
@@ -46,7 +46,7 @@ bool DatabaseSQLite::empty() const
 }
 
 
-DatabaseTablesIteratorPtr DatabaseSQLite::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction &) const
+DatabaseTablesIteratorPtr DatabaseSQLite::getTablesIterator(ContextPtr local_context, const IDatabase::FilterByNameFunction &, bool) const
 {
     std::lock_guard lock(mutex);
 
@@ -194,10 +194,10 @@ ASTPtr DatabaseSQLite::getCreateTableQueryImpl(const String & table_name, Contex
     /// Add table_name to engine arguments
     storage_engine_arguments->children.insert(storage_engine_arguments->children.begin() + 1, std::make_shared<ASTLiteral>(table_id.table_name));
 
-    unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+    const Settings & settings = getContext()->getSettingsRef();
+
     auto create_table_query = DB::getCreateQueryFromStorage(storage, table_storage_define, true,
-                                                            max_parser_depth,
-                                                            throw_on_error);
+        static_cast<uint32_t>(settings.max_parser_depth), static_cast<uint32_t>(settings.max_parser_backtracks), throw_on_error);
 
     return create_table_query;
 }
diff --git a/src/Databases/SQLite/DatabaseSQLite.h b/src/Databases/SQLite/DatabaseSQLite.h
index a89fbc32c3d..6bd84a4d297 100644
--- a/src/Databases/SQLite/DatabaseSQLite.h
+++ b/src/Databases/SQLite/DatabaseSQLite.h
@@ -32,7 +32,7 @@ public:
 
     StoragePtr tryGetTable(const String & name, ContextPtr context) const override;
 
-    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name) const override;
+    DatabaseTablesIteratorPtr getTablesIterator(ContextPtr context, const FilterByNameFunction & filter_by_table_name, bool skip_not_loaded) const override;
 
     bool empty() const override;
 
@@ -50,7 +50,7 @@ private:
 
     mutable SQLitePtr sqlite_db;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     bool checkSQLiteTable(const String & table_name) const;
 
diff --git a/src/Databases/SQLite/SQLiteUtils.cpp b/src/Databases/SQLite/SQLiteUtils.cpp
index 19b8662707b..eeea04476d3 100644
--- a/src/Databases/SQLite/SQLiteUtils.cpp
+++ b/src/Databases/SQLite/SQLiteUtils.cpp
@@ -21,7 +21,7 @@ void processSQLiteError(const String & message, bool throw_on_error)
     if (throw_on_error)
         throw Exception::createDeprecated(message, ErrorCodes::PATH_ACCESS_DENIED);
     else
-        LOG_ERROR(&Poco::Logger::get("SQLiteEngine"), fmt::runtime(message));
+        LOG_ERROR(getLogger("SQLiteEngine"), fmt::runtime(message));
 }
 
 String validateSQLiteDatabasePath(const String & path, const String & user_files_path, bool need_check, bool throw_on_error)
@@ -54,7 +54,7 @@ SQLitePtr openSQLiteDB(const String & path, ContextPtr context, bool throw_on_er
         return nullptr;
 
     if (!fs::exists(database_path))
-        LOG_DEBUG(&Poco::Logger::get("SQLite"), "SQLite database path {} does not exist, will create an empty SQLite database", database_path);
+        LOG_DEBUG(getLogger("SQLite"), "SQLite database path {} does not exist, will create an empty SQLite database", database_path);
 
     sqlite3 * tmp_sqlite_db = nullptr;
     int status;
diff --git a/src/Databases/TablesDependencyGraph.cpp b/src/Databases/TablesDependencyGraph.cpp
index 16404c6870f..d227a3ac76b 100644
--- a/src/Databases/TablesDependencyGraph.cpp
+++ b/src/Databases/TablesDependencyGraph.cpp
@@ -448,7 +448,7 @@ std::vector<StorageID> TablesDependencyGraph::getTables() const
 void TablesDependencyGraph::mergeWith(const TablesDependencyGraph & other)
 {
     for (const auto & other_node : other.nodes)
-        addDependencies(other_node->storage_id, other.getDependencies(*other_node));
+        addDependencies(other_node->storage_id, TablesDependencyGraph::getDependencies(*other_node));
 }
 
 
@@ -699,6 +699,22 @@ std::vector<StorageID> TablesDependencyGraph::getTablesSortedByDependency() cons
 }
 
 
+std::vector<std::vector<StorageID>> TablesDependencyGraph::getTablesSplitByDependencyLevel() const
+{
+    std::vector<std::vector<StorageID>> tables_split_by_level;
+    auto sorted_nodes = getNodesSortedByLevel();
+    if (sorted_nodes.empty())
+        return tables_split_by_level;
+
+    tables_split_by_level.resize(sorted_nodes.back()->level + 1);
+    for (const auto * node : sorted_nodes)
+    {
+        tables_split_by_level[node->level].emplace_back(node->storage_id);
+    }
+    return tables_split_by_level;
+}
+
+
 void TablesDependencyGraph::log() const
 {
     if (nodes.empty())
@@ -720,10 +736,10 @@ void TablesDependencyGraph::log() const
 }
 
 
-Poco::Logger * TablesDependencyGraph::getLogger() const
+LoggerPtr TablesDependencyGraph::getLogger() const
 {
     if (!logger)
-        logger = &Poco::Logger::get(name_for_logging);
+        logger = ::getLogger(name_for_logging);
     return logger;
 }
 
diff --git a/src/Databases/TablesDependencyGraph.h b/src/Databases/TablesDependencyGraph.h
index 50be3bbf969..eb13539b5b6 100644
--- a/src/Databases/TablesDependencyGraph.h
+++ b/src/Databases/TablesDependencyGraph.h
@@ -107,6 +107,12 @@ public:
     /// tables which depend on the tables which depend on the tables without dependencies, and so on.
     std::vector<StorageID> getTablesSortedByDependency() const;
 
+    /// Returns a list of lists of tables by the number of dependencies they have:
+    /// tables without dependencies are in the first list, then
+    /// tables which depend on the tables without dependencies are in the second list, then
+    /// tables which depend on the tables which depend on the tables without dependencies are in the third list, and so on.
+    std::vector<std::vector<StorageID>> getTablesSplitByDependencyLevel() const;
+
     /// Outputs information about this graph as a bunch of logging messages.
     void log() const;
 
@@ -163,7 +169,7 @@ private:
     mutable bool levels_calculated = false;
 
     const String name_for_logging;
-    mutable Poco::Logger * logger = nullptr;
+    mutable LoggerPtr logger = nullptr;
 
     Node * findNode(const StorageID & table_id) const;
     Node * addOrUpdateNode(const StorageID & table_id);
@@ -175,7 +181,7 @@ private:
     void setNeedRecalculateLevels() const;
     const NodesSortedByLevel & getNodesSortedByLevel() const;
 
-    Poco::Logger * getLogger() const;
+    LoggerPtr getLogger() const;
 };
 
 }
diff --git a/src/Databases/TablesLoader.cpp b/src/Databases/TablesLoader.cpp
index f1b5c4377fe..48745ff91c2 100644
--- a/src/Databases/TablesLoader.cpp
+++ b/src/Databases/TablesLoader.cpp
@@ -29,7 +29,7 @@ TablesLoader::TablesLoader(ContextMutablePtr global_context_, Databases database
     , async_loader(global_context->getAsyncLoader())
 {
     metadata.default_database = global_context->getCurrentDatabase();
-    log = &Poco::Logger::get("TablesLoader");
+    log = getLogger("TablesLoader");
 }
 
 LoadTaskPtrs TablesLoader::loadTablesAsync(LoadJobSet load_after)
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
index 038aa35895f..26b5777f1a9 100644
--- a/src/Databases/TablesLoader.h
+++ b/src/Databases/TablesLoader.h
@@ -73,7 +73,7 @@ private:
     TablesDependencyGraph referential_dependencies;
     TablesDependencyGraph loading_dependencies;
     TablesDependencyGraph all_loading_dependencies;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<size_t> tables_processed{0};
     AtomicStopwatch stopwatch;
 
diff --git a/src/Dictionaries/CacheDictionary.cpp b/src/Dictionaries/CacheDictionary.cpp
index b40a60e0915..fbb04eab3e4 100644
--- a/src/Dictionaries/CacheDictionary.cpp
+++ b/src/Dictionaries/CacheDictionary.cpp
@@ -3,15 +3,13 @@
 #include <memory>
 #include <base/chrono_io.h>
 
-#include <Core/Defines.h>
 #include <Common/CurrentMetrics.h>
-#include <Common/HashTable/Hash.h>
 #include <Common/HashTable/HashSet.h>
 #include <Common/ProfileEvents.h>
 #include <Common/ProfilingScopedRWLock.h>
 
 #include <Dictionaries/DictionarySource.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
 #include <QueryPipeline/QueryPipelineBuilder.h>
@@ -63,7 +61,7 @@ CacheDictionary<dictionary_key_type>::CacheDictionary(
             update(unit_to_update);
         })
     , configuration(configuration_)
-    , log(&Poco::Logger::get("ExternalDictionaries"))
+    , log(getLogger("ExternalDictionaries"))
     , rnd_engine(randomSeed())
 {
     if (!source_ptr->supportsSelectiveLoad())
@@ -118,22 +116,35 @@ DictionarySourcePtr CacheDictionary<dictionary_key_type>::getSource() const
 
 template <DictionaryKeyType dictionary_key_type>
 ColumnPtr CacheDictionary<dictionary_key_type>::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr & default_values_column) const
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
+        const Columns & key_columns,
+        const DataTypes & key_types,
+        DefaultOrFilter default_or_filter) const
 {
-    return getColumns({attribute_name}, {result_type}, key_columns, key_types, {default_values_column}).front();
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
+    if (is_short_circuit)
+    {
+        IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+        return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, default_mask).front();
+    }
+    else
+    {
+        const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+        const Columns & columns= Columns({default_values_column});
+        return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, columns).front();
+    }
 }
 
 template <DictionaryKeyType dictionary_key_type>
 Columns CacheDictionary<dictionary_key_type>::getColumns(
     const Strings & attribute_names,
-    const DataTypes & result_types,
+    const DataTypes & attribute_types,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const Columns & default_values_columns) const
+     DefaultsOrFilter defaults_or_filter) const
 {
     /**
     * Flow of getColumnsImpl
@@ -149,6 +160,9 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     * use default value.
     */
 
+    bool is_short_circuit = std::holds_alternative<RefFilter>(defaults_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefaults>(defaults_or_filter));
+
     if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
@@ -156,13 +170,18 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
     auto keys = extractor.extractAllKeys();
 
-    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, attribute_types,
+        is_short_circuit ? nullptr : &std::get<RefDefaults>(defaults_or_filter).get() /*default_values_columns*/);
 
     FetchResult result_of_fetch_from_storage;
 
+    IColumn::Filter * default_mask = nullptr;
+    if (is_short_circuit)
+        default_mask= &std::get<RefFilter>(defaults_or_filter).get();
+
     {
         const ProfilingScopedReadRWLock read_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
-        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request);
+        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request, default_mask);
     }
 
     size_t found_keys_size = result_of_fetch_from_storage.found_keys_size;
@@ -178,9 +197,11 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
     found_count.fetch_add(found_keys_size, std::memory_order_relaxed);
 
     MutableColumns & fetched_columns_from_storage = result_of_fetch_from_storage.fetched_columns;
-    const PaddedPODArray<KeyState> & key_index_to_state_from_storage = result_of_fetch_from_storage.key_index_to_state;
+    const PaddedPODArray<KeyState> & key_index_to_state_from_storage =
+        result_of_fetch_from_storage.key_index_to_state;
 
-    bool source_returns_fetched_columns_in_order_of_keys = cache_storage_ptr->returnsFetchedColumnsInOrderOfRequestedKeys();
+    bool source_returns_fetched_columns_in_order_of_keys =
+        cache_storage_ptr->returnsFetchedColumnsInOrderOfRequestedKeys();
 
     if (not_found_keys_size == 0 && expired_keys_size == 0)
     {
@@ -195,14 +216,16 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
                 keys,
                 request,
                 fetched_columns_from_storage,
-                key_index_to_state_from_storage);
+                key_index_to_state_from_storage,
+                default_mask);
 
             return request.filterRequestedColumns(aggregated_columns);
         }
     }
 
     size_t keys_to_update_size = not_found_keys_size + expired_keys_size;
-    auto update_unit = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>(key_columns, key_index_to_state_from_storage, request, keys_to_update_size);
+    auto update_unit = std::make_shared<CacheDictionaryUpdateUnit<dictionary_key_type>>(
+        key_columns, key_index_to_state_from_storage, request, keys_to_update_size);
 
     HashMap<KeyType, size_t> requested_keys_to_fetched_columns_during_update_index;
     MutableColumns fetched_columns_during_update = request.makeAttributesResultColumns();
@@ -221,7 +244,8 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
                 keys,
                 request,
                 fetched_columns_from_storage,
-                key_index_to_state_from_storage);
+                key_index_to_state_from_storage,
+                default_mask);
 
             return request.filterRequestedColumns(aggregated_columns);
         }
@@ -232,7 +256,8 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
         update_queue.tryPushToUpdateQueueOrThrow(update_unit);
         update_queue.waitForCurrentUpdateFinish(update_unit);
 
-        requested_keys_to_fetched_columns_during_update_index = std::move(update_unit->requested_keys_to_fetched_columns_during_update_index);
+        requested_keys_to_fetched_columns_during_update_index =
+            std::move(update_unit->requested_keys_to_fetched_columns_during_update_index);
         fetched_columns_during_update = std::move(update_unit->fetched_columns_during_update);
     }
 
@@ -242,7 +267,8 @@ Columns CacheDictionary<dictionary_key_type>::getColumns(
         fetched_columns_from_storage,
         key_index_to_state_from_storage,
         fetched_columns_during_update,
-        requested_keys_to_fetched_columns_during_update_index);
+        requested_keys_to_fetched_columns_during_update_index,
+        default_mask);
 
     return request.filterRequestedColumns(aggregated_columns);
 }
@@ -282,7 +308,7 @@ ColumnUInt8::Ptr CacheDictionary<dictionary_key_type>::hasKeys(const Columns & k
         /// Write lock on storage
         const ProfilingScopedWriteRWLock write_lock{rw_lock, ProfileEvents::DictCacheLockWriteNs};
 
-        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request);
+        result_of_fetch_from_storage = cache_storage_ptr->fetchColumnsForKeys(keys, request, /*default_mask*/ nullptr);
     }
 
     size_t found_keys_size = result_of_fetch_from_storage.found_keys_size;
@@ -396,7 +422,8 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumnsInOrderOfKe
     const PaddedPODArray<KeyType> & keys,
     const DictionaryStorageFetchRequest & request,
     const MutableColumns & fetched_columns,
-    const PaddedPODArray<KeyState> & key_index_to_state)
+    const PaddedPODArray<KeyState> & key_index_to_state,
+    IColumn::Filter * default_mask) const
 {
     MutableColumns aggregated_columns = request.makeAttributesResultColumns();
 
@@ -407,6 +434,9 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumnsInOrderOfKe
         if (!request.shouldFillResultColumnWithIndex(fetch_request_index))
             continue;
 
+        if (default_mask)
+            default_mask->resize(keys.size());
+
         const auto & aggregated_column = aggregated_columns[fetch_request_index];
         const auto & fetched_column = fetched_columns[fetch_request_index];
 
@@ -417,7 +447,18 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumnsInOrderOfKe
             if (state.isNotFound())
                 continue;
 
-            aggregated_column->insertFrom(*fetched_column, state.getFetchedColumnIndex());
+            if (default_mask)
+            {
+                if (state.isDefault())
+                    (*default_mask)[key_index] = 1;
+                else
+                {
+                    (*default_mask)[key_index] = 0;
+                    aggregated_column->insertFrom(*fetched_column, state.getFetchedColumnIndex());
+                }
+            }
+            else
+                aggregated_column->insertFrom(*fetched_column, state.getFetchedColumnIndex());
         }
     }
 
@@ -431,7 +472,8 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
         const MutableColumns & fetched_columns_from_storage,
         const PaddedPODArray<KeyState> & key_index_to_fetched_columns_from_storage_result,
         const MutableColumns & fetched_columns_during_update,
-        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index)
+        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index,
+        IColumn::Filter * default_mask) const
 {
     /**
     * Aggregation of columns fetched from storage and from source during update.
@@ -450,7 +492,9 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
         const auto & aggregated_column = aggregated_columns[fetch_request_index];
         const auto & fetched_column_from_storage = fetched_columns_from_storage[fetch_request_index];
         const auto & fetched_column_during_update = fetched_columns_during_update[fetch_request_index];
-        const auto & default_value_provider = request.defaultValueProviderAtIndex(fetch_request_index);
+
+        if (default_mask)
+            default_mask->resize(keys.size());
 
         for (size_t key_index = 0; key_index < keys.size(); ++key_index)
         {
@@ -460,7 +504,22 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
             if (key_state_from_storage.isFound())
             {
                 /// Check and insert value if key was fetched from cache
-                aggregated_column->insertFrom(*fetched_column_from_storage, key_state_from_storage.getFetchedColumnIndex());
+
+                if (default_mask)
+                {
+                    if (key_state_from_storage.isDefault())
+                        (*default_mask)[key_index] = 1;
+                    else
+                    {
+                        (*default_mask)[key_index] = 0;
+                        aggregated_column->insertFrom(*fetched_column_from_storage,
+                            key_state_from_storage.getFetchedColumnIndex());
+                    }
+                }
+                else
+                    aggregated_column->insertFrom(*fetched_column_from_storage,
+                        key_state_from_storage.getFetchedColumnIndex());
+
                 continue;
             }
 
@@ -469,11 +528,21 @@ MutableColumns CacheDictionary<dictionary_key_type>::aggregateColumns(
             if (find_iterator_in_fetch_during_update)
             {
                 aggregated_column->insertFrom(*fetched_column_during_update, find_iterator_in_fetch_during_update->getMapped());
+
+                if (default_mask)
+                    (*default_mask)[key_index] = 0;
+
                 continue;
             }
 
-            /// Insert default value
-            aggregated_column->insert(default_value_provider.getDefaultValue(key_index));
+            if (default_mask)
+                (*default_mask)[key_index] = 1;
+            else
+            {
+                /// Insert default value
+                const auto & default_value_provider = request.defaultValueProviderAtIndex(fetch_request_index);
+                aggregated_column->insert(default_value_provider.getDefaultValue(key_index));
+            }
         }
     }
 
diff --git a/src/Dictionaries/CacheDictionary.h b/src/Dictionaries/CacheDictionary.h
index 66efb4a85a5..835a359339f 100644
--- a/src/Dictionaries/CacheDictionary.h
+++ b/src/Dictionaries/CacheDictionary.h
@@ -78,27 +78,27 @@ public:
 
     double getLoadFactor() const override;
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(hit_count.load(std::memory_order_acquire)) / queries;
+        return static_cast<double>(hit_count.load()) / queries;
     }
 
     bool supportUpdates() const override { return false; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<CacheDictionary>(
                 getDictionaryID(),
@@ -126,18 +126,18 @@ public:
     }
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     Columns getColumns(
         const Strings & attribute_names,
-        const DataTypes & result_types,
+        const DataTypes & attribute_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns) const override;
+        DefaultsOrFilter defaults_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -157,19 +157,21 @@ public:
 private:
     using FetchResult = std::conditional_t<dictionary_key_type == DictionaryKeyType::Simple, SimpleKeysStorageFetchResult, ComplexKeysStorageFetchResult>;
 
-    static MutableColumns aggregateColumnsInOrderOfKeys(
+    MutableColumns aggregateColumnsInOrderOfKeys(
         const PaddedPODArray<KeyType> & keys,
         const DictionaryStorageFetchRequest & request,
         const MutableColumns & fetched_columns,
-        const PaddedPODArray<KeyState> & key_index_to_state);
+        const PaddedPODArray<KeyState> & key_index_to_state,
+        IColumn::Filter * default_mask = nullptr) const;
 
-    static MutableColumns aggregateColumns(
+    MutableColumns aggregateColumns(
         const PaddedPODArray<KeyType> & keys,
         const DictionaryStorageFetchRequest & request,
         const MutableColumns & fetched_columns_from_storage,
         const PaddedPODArray<KeyState> & key_index_to_fetched_columns_from_storage_result,
         const MutableColumns & fetched_columns_during_update,
-        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index);
+        const HashMap<KeyType, size_t> & found_keys_to_fetched_columns_during_update_index,
+        IColumn::Filter * default_mask = nullptr) const;
 
     void update(CacheDictionaryUpdateUnitPtr<dictionary_key_type> update_unit_ptr);
 
@@ -202,7 +204,7 @@ private:
 
     const CacheDictionaryConfiguration configuration;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     mutable pcg64 rnd_engine;
 
diff --git a/src/Dictionaries/CacheDictionaryStorage.h b/src/Dictionaries/CacheDictionaryStorage.h
index ba17cebebba..01217c58e31 100644
--- a/src/Dictionaries/CacheDictionaryStorage.h
+++ b/src/Dictionaries/CacheDictionaryStorage.h
@@ -72,10 +72,11 @@ public:
 
     SimpleKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<UInt64> & keys,
-        const DictionaryStorageFetchRequest & fetch_request) override
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * const default_mask) override
     {
         if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
-            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
+            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request, default_mask);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for complex key storage");
     }
@@ -108,10 +109,11 @@ public:
 
     ComplexKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<StringRef> & keys,
-        const DictionaryStorageFetchRequest & column_fetch_requests) override
+        const DictionaryStorageFetchRequest & column_fetch_requests,
+        IColumn::Filter * const default_mask) override
     {
         if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
-            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, column_fetch_requests);
+            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, column_fetch_requests, default_mask);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
     }
@@ -176,7 +178,8 @@ private:
     template <typename KeysStorageFetchResult>
     KeysStorageFetchResult fetchColumnsForKeysImpl(
         const PaddedPODArray<KeyType> & keys,
-        const DictionaryStorageFetchRequest & fetch_request)
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * const default_mask)
     {
         KeysStorageFetchResult result;
 
@@ -186,6 +189,7 @@ private:
         const time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
         size_t fetched_columns_index = 0;
+        size_t fetched_columns_index_without_default = 0;
         size_t keys_size = keys.size();
 
         PaddedPODArray<FetchedKey> fetched_keys;
@@ -207,11 +211,15 @@ private:
 
             result.expired_keys_size += static_cast<size_t>(key_state == KeyState::expired);
 
-            result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+            result.key_index_to_state[key_index] = {key_state,
+                default_mask ? fetched_columns_index_without_default : fetched_columns_index};
             fetched_keys[fetched_columns_index] = FetchedKey(cell.element_index, cell.is_default);
 
             ++fetched_columns_index;
 
+            if (!cell.is_default)
+                ++fetched_columns_index_without_default;
+
             result.key_index_to_state[key_index].setDefaultValue(cell.is_default);
             result.default_keys_size += cell.is_default;
         }
@@ -224,64 +232,126 @@ private:
                 continue;
 
             auto & attribute = attributes[attribute_index];
-            const auto & default_value_provider = fetch_request.defaultValueProviderAtIndex(attribute_index);
-
             auto & fetched_column = *result.fetched_columns[attribute_index];
-            fetched_column.reserve(fetched_columns_index);
+            fetched_column.reserve(default_mask ? fetched_columns_index_without_default :
+                                                  fetched_columns_index);
 
-            if (unlikely(attribute.is_nullable))
+            if (!default_mask)
             {
-                getItemsForFetchedKeys<Field>(
-                    attribute,
-                    fetched_columns_index,
-                    fetched_keys,
-                    [&](Field & value) { fetched_column.insert(value); },
-                    default_value_provider);
+                const auto & default_value_provider =
+                    fetch_request.defaultValueProviderAtIndex(attribute_index);
+
+                if (unlikely(attribute.is_nullable))
+                {
+                    getItemsForFetchedKeys<Field>(
+                        attribute,
+                        fetched_columns_index,
+                        fetched_keys,
+                        [&](Field & value) { fetched_column.insert(value); },
+                        default_value_provider);
+                }
+                else
+                {
+                    auto type_call = [&](const auto & dictionary_attribute_type)
+                    {
+                        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                        using AttributeType = typename Type::AttributeType;
+                        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+                        using ColumnType = typename ColumnProvider::ColumnType;
+                        using ValueType = DictionaryValueType<AttributeType>;
+
+                        ColumnType & column_typed = static_cast<ColumnType &>(fetched_column);
+
+                        if constexpr (std::is_same_v<ValueType, Array>)
+                        {
+                            getItemsForFetchedKeys<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](Array & value) { fetched_column.insert(value); },
+                                default_value_provider);
+                        }
+                        else if constexpr (std::is_same_v<ValueType, StringRef>)
+                        {
+                            getItemsForFetchedKeys<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](StringRef value) { fetched_column.insertData(value.data, value.size); },
+                                default_value_provider);
+                        }
+                        else
+                        {
+                            auto & data = column_typed.getData();
+
+                            getItemsForFetchedKeys<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](auto value) { data.push_back(static_cast<AttributeType>(value)); },
+                                default_value_provider);
+                        }
+                    };
+
+                    callOnDictionaryAttributeType(attribute.type, type_call);
+                }
             }
             else
             {
-                auto type_call = [&](const auto & dictionary_attribute_type)
+                if (unlikely(attribute.is_nullable))
                 {
-                    using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-                    using AttributeType = typename Type::AttributeType;
-                    using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-                    using ColumnType = typename ColumnProvider::ColumnType;
-                    using ValueType = DictionaryValueType<AttributeType>;
-
-                    ColumnType & column_typed = static_cast<ColumnType &>(fetched_column);
-
-                    if constexpr (std::is_same_v<ValueType, Array>)
+                    getItemsForFetchedKeysShortCircuit<Field>(
+                        attribute,
+                        fetched_columns_index,
+                        fetched_keys,
+                        [&](Field & value) { fetched_column.insert(value); },
+                        *default_mask);
+                }
+                else
+                {
+                    auto type_call = [&](const auto & dictionary_attribute_type)
                     {
-                        getItemsForFetchedKeys<ValueType>(
-                            attribute,
-                            fetched_columns_index,
-                            fetched_keys,
-                            [&](Array & value) { fetched_column.insert(value); },
-                            default_value_provider);
-                    }
-                    else if constexpr (std::is_same_v<ValueType, StringRef>)
-                    {
-                        getItemsForFetchedKeys<ValueType>(
-                            attribute,
-                            fetched_columns_index,
-                            fetched_keys,
-                            [&](StringRef value) { fetched_column.insertData(value.data, value.size); },
-                            default_value_provider);
-                    }
-                    else
-                    {
-                        auto & data = column_typed.getData();
+                        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+                        using AttributeType = typename Type::AttributeType;
+                        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+                        using ColumnType = typename ColumnProvider::ColumnType;
+                        using ValueType = DictionaryValueType<AttributeType>;
 
-                        getItemsForFetchedKeys<ValueType>(
-                            attribute,
-                            fetched_columns_index,
-                            fetched_keys,
-                            [&](auto value) { data.push_back(static_cast<AttributeType>(value)); },
-                            default_value_provider);
-                    }
-                };
+                        ColumnType & column_typed = static_cast<ColumnType &>(fetched_column);
 
-                callOnDictionaryAttributeType(attribute.type, type_call);
+                        if constexpr (std::is_same_v<ValueType, Array>)
+                        {
+                            getItemsForFetchedKeysShortCircuit<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](Array & value) { fetched_column.insert(value); },
+                                *default_mask);
+                        }
+                        else if constexpr (std::is_same_v<ValueType, StringRef>)
+                        {
+                            getItemsForFetchedKeysShortCircuit<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](StringRef value) { fetched_column.insertData(value.data, value.size); },
+                                *default_mask);
+                        }
+                        else
+                        {
+                            auto & data = column_typed.getData();
+
+                            getItemsForFetchedKeysShortCircuit<ValueType>(
+                                attribute,
+                                fetched_columns_index,
+                                fetched_keys,
+                                [&](auto value) { data.push_back(static_cast<AttributeType>(value)); },
+                                *default_mask);
+                        }
+                    };
+
+                    callOnDictionaryAttributeType(attribute.type, type_call);
+                }
             }
         }
 
@@ -603,6 +673,31 @@ private:
         }
     }
 
+    template <typename ValueType, typename ValueSetter>
+    void getItemsForFetchedKeysShortCircuit(
+        Attribute & attribute,
+        size_t fetched_keys_size,
+        PaddedPODArray<FetchedKey> & fetched_keys,
+        ValueSetter && value_setter,
+        IColumn::Filter & default_mask)
+    {
+        default_mask.resize(fetched_keys_size);
+        auto & container = std::get<ContainerType<ValueType>>(attribute.attribute_container);
+
+        for (size_t fetched_key_index = 0; fetched_key_index < fetched_keys_size; ++fetched_key_index)
+        {
+            auto fetched_key = fetched_keys[fetched_key_index];
+
+            if (unlikely(fetched_key.is_default))
+                default_mask[fetched_key_index] = 1;
+            else
+            {
+                default_mask[fetched_key_index] = 0;
+                value_setter(container[fetched_key.element_index]);
+            }
+        }
+    }
+
     void createAttributes(const DictionaryStructure & dictionary_structure)
     {
         /// For each dictionary attribute create storage attribute
diff --git a/src/Dictionaries/CassandraDictionarySource.cpp b/src/Dictionaries/CassandraDictionarySource.cpp
index e0cf2483b3d..b3bf288ef5a 100644
--- a/src/Dictionaries/CassandraDictionarySource.cpp
+++ b/src/Dictionaries/CassandraDictionarySource.cpp
@@ -105,7 +105,7 @@ CassandraDictionarySource::CassandraDictionarySource(
     const DictionaryStructure & dict_struct_,
     const Configuration & configuration_,
     const Block & sample_block_)
-    : log(&Poco::Logger::get("CassandraDictionarySource"))
+    : log(getLogger("CassandraDictionarySource"))
     , dict_struct(dict_struct_)
     , configuration(configuration_)
     , sample_block(sample_block_)
diff --git a/src/Dictionaries/CassandraDictionarySource.h b/src/Dictionaries/CassandraDictionarySource.h
index 2591b33c638..3700642fc5b 100644
--- a/src/Dictionaries/CassandraDictionarySource.h
+++ b/src/Dictionaries/CassandraDictionarySource.h
@@ -77,7 +77,7 @@ private:
     void maybeAllowFiltering(String & query) const;
     CassSessionShared getSession();
 
-    Poco::Logger * log;
+    LoggerPtr log;
     const DictionaryStructure dict_struct;
     const Configuration configuration;
     Block sample_block;
diff --git a/src/Dictionaries/CassandraHelpers.cpp b/src/Dictionaries/CassandraHelpers.cpp
index e93b3fe8d49..4c569d00957 100644
--- a/src/Dictionaries/CassandraHelpers.cpp
+++ b/src/Dictionaries/CassandraHelpers.cpp
@@ -47,7 +47,7 @@ void setupCassandraDriverLibraryLogging(CassLogLevel level)
 {
     std::call_once(setup_logging_flag, [level]()
     {
-        Poco::Logger * logger = &Poco::Logger::get("CassandraDriverLibrary");
+        Poco::Logger * logger = getRawLogger("CassandraDriverLibrary");
         cass_log_set_level(level);
         if (level != CASS_LOG_DISABLED)
             cass_log_set_callback(cassandraLogCallback, logger);
diff --git a/src/Dictionaries/ClickHouseDictionarySource.h b/src/Dictionaries/ClickHouseDictionarySource.h
index cfb6a0bcd37..3357514eab2 100644
--- a/src/Dictionaries/ClickHouseDictionarySource.h
+++ b/src/Dictionaries/ClickHouseDictionarySource.h
@@ -85,7 +85,7 @@ private:
     ContextMutablePtr context;
     ConnectionPoolWithFailoverPtr pool;
     std::string load_all_query;
-    Poco::Logger * log = &Poco::Logger::get("ClickHouseDictionarySource");
+    LoggerPtr log = getLogger("ClickHouseDictionarySource");
 
     /// RegExpTreeDictionary is the only dictionary whose structure of attributions differ from the input block.
     /// For now we need to modify sample_block in the ctor of RegExpTreeDictionary.
diff --git a/src/Dictionaries/DictionaryFactory.cpp b/src/Dictionaries/DictionaryFactory.cpp
index f6102d7c657..337121822ea 100644
--- a/src/Dictionaries/DictionaryFactory.cpp
+++ b/src/Dictionaries/DictionaryFactory.cpp
@@ -46,7 +46,7 @@ DictionaryPtr DictionaryFactory::create(
 
     DictionarySourcePtr source_ptr = DictionarySourceFactory::instance().create(
         name, config, config_prefix + ".source", dict_struct, global_context, config.getString(config_prefix + ".database", ""), created_from_ddl);
-    LOG_TRACE(&Poco::Logger::get("DictionaryFactory"), "Created dictionary source '{}' for dictionary '{}'", source_ptr->toString(), name);
+    LOG_TRACE(getLogger("DictionaryFactory"), "Created dictionary source '{}' for dictionary '{}'", source_ptr->toString(), name);
 
     const auto & layout_type = keys.front();
 
@@ -55,11 +55,7 @@ DictionaryPtr DictionaryFactory::create(
         if (found != registered_layouts.end())
         {
             const auto & layout_creator = found->second.layout_create_function;
-            auto result = layout_creator(name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
-            if (config.hasProperty(config_prefix + ".comment"))
-                result->setDictionaryComment(config.getString(config_prefix + ".comment"));
-
-            return result;
+            return layout_creator(name, dict_struct, config, config_prefix, std::move(source_ptr), global_context, created_from_ddl);
         }
     }
 
diff --git a/src/Dictionaries/DictionaryHelpers.h b/src/Dictionaries/DictionaryHelpers.h
index 1de7be0bf4f..8bf190d3edc 100644
--- a/src/Dictionaries/DictionaryHelpers.h
+++ b/src/Dictionaries/DictionaryHelpers.h
@@ -75,13 +75,15 @@ public:
     DictionaryStorageFetchRequest(const DictionaryStructure & structure,
         const Strings & attributes_to_fetch_names,
         const DataTypes & attributes_to_fetch_types,
-        const Columns & attributes_to_fetch_default_values_columns)
+        const Columns * const attributes_to_fetch_default_values_columns = nullptr)
         : attributes_to_fetch_filter(structure.attributes.size(), false)
     {
         size_t attributes_to_fetch_size = attributes_to_fetch_names.size();
 
         assert(attributes_to_fetch_size == attributes_to_fetch_types.size());
-        assert(attributes_to_fetch_size == attributes_to_fetch_default_values_columns.size());
+
+        bool has_default = attributes_to_fetch_default_values_columns;
+        assert(!has_default || attributes_to_fetch_size == attributes_to_fetch_default_values_columns->size());
 
         for (size_t i = 0; i < attributes_to_fetch_size; ++i)
             attributes_to_fetch_name_to_index.emplace(attributes_to_fetch_names[i], i);
@@ -109,7 +111,6 @@ public:
 
             size_t attributes_to_fetch_index = attribute_to_fetch_index_it->second;
             const auto & attribute_to_fetch_result_type = attributes_to_fetch_types[attributes_to_fetch_index];
-            const auto & attribute_to_fetch_default_value_column = attributes_to_fetch_default_values_columns[attributes_to_fetch_index];
 
             if (!attribute_to_fetch_result_type->equals(*dictionary_attribute.type))
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
@@ -118,7 +119,13 @@ public:
                     attribute_to_fetch_result_type->getName(),
                     dictionary_attribute.type->getName());
 
-            attributes_default_value_providers.emplace_back(dictionary_attribute.null_value, attribute_to_fetch_default_value_column);
+            if (has_default)
+            {
+                const auto & attribute_to_fetch_default_value_column =
+                    (*attributes_to_fetch_default_values_columns)[attributes_to_fetch_index];
+                attributes_default_value_providers.emplace_back(dictionary_attribute.null_value,
+                    attribute_to_fetch_default_value_column);
+            }
         }
     }
 
diff --git a/src/Dictionaries/DictionaryPipelineExecutor.cpp b/src/Dictionaries/DictionaryPipelineExecutor.cpp
new file mode 100644
index 00000000000..30d1ab95f53
--- /dev/null
+++ b/src/Dictionaries/DictionaryPipelineExecutor.cpp
@@ -0,0 +1,42 @@
+#include <Dictionaries/DictionaryPipelineExecutor.h>
+
+#include <Core/Block.h>
+#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <QueryPipeline/QueryPipeline.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int LOGICAL_ERROR;
+}
+
+DictionaryPipelineExecutor::DictionaryPipelineExecutor(QueryPipeline & pipeline_, bool async)
+    : async_executor(async ? std::make_unique<PullingAsyncPipelineExecutor>(pipeline_) : nullptr)
+    , executor(async ? nullptr : std::make_unique<PullingPipelineExecutor>(pipeline_))
+{
+}
+
+bool DictionaryPipelineExecutor::pull(Block & block)
+{
+    if (async_executor)
+    {
+        while (true)
+        {
+            bool has_data = async_executor->pull(block);
+            if (has_data && !block)
+                continue;
+            return has_data;
+        }
+    }
+    else if (executor)
+        return executor->pull(block);
+    else
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionaryPipelineExecutor is not initialized");
+}
+
+DictionaryPipelineExecutor::~DictionaryPipelineExecutor() = default;
+
+}
diff --git a/src/Dictionaries/DictionaryPipelineExecutor.h b/src/Dictionaries/DictionaryPipelineExecutor.h
new file mode 100644
index 00000000000..601213e5039
--- /dev/null
+++ b/src/Dictionaries/DictionaryPipelineExecutor.h
@@ -0,0 +1,27 @@
+#pragma once
+
+#include <memory>
+
+namespace DB
+{
+
+class Block;
+class QueryPipeline;
+class PullingAsyncPipelineExecutor;
+class PullingPipelineExecutor;
+
+/// Wrapper for `Pulling(Async)PipelineExecutor` to dynamically dispatch calls to the right executor
+class DictionaryPipelineExecutor
+{
+public:
+    DictionaryPipelineExecutor(QueryPipeline & pipeline_, bool async);
+    bool pull(Block & block);
+
+    ~DictionaryPipelineExecutor();
+
+private:
+    std::unique_ptr<PullingAsyncPipelineExecutor> async_executor;
+    std::unique_ptr<PullingPipelineExecutor> executor;
+};
+
+}
diff --git a/src/Dictionaries/DictionarySourceFactory.cpp b/src/Dictionaries/DictionarySourceFactory.cpp
index 5ae4bb5a439..eedf6967c13 100644
--- a/src/Dictionaries/DictionarySourceFactory.cpp
+++ b/src/Dictionaries/DictionarySourceFactory.cpp
@@ -65,7 +65,7 @@ namespace
 }
 
 
-DictionarySourceFactory::DictionarySourceFactory() : log(&Poco::Logger::get("DictionarySourceFactory"))
+DictionarySourceFactory::DictionarySourceFactory() : log(getLogger("DictionarySourceFactory"))
 {
 }
 
diff --git a/src/Dictionaries/DictionarySourceFactory.h b/src/Dictionaries/DictionarySourceFactory.h
index 4c867db4ea1..a9007230047 100644
--- a/src/Dictionaries/DictionarySourceFactory.h
+++ b/src/Dictionaries/DictionarySourceFactory.h
@@ -59,7 +59,7 @@ private:
     using SourceRegistry = std::unordered_map<std::string, Creator>;
     SourceRegistry registered_sources;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Dictionaries/DictionarySourceHelpers.cpp b/src/Dictionaries/DictionarySourceHelpers.cpp
index d9a4d9ccbcf..f0e1bc4109a 100644
--- a/src/Dictionaries/DictionarySourceHelpers.cpp
+++ b/src/Dictionaries/DictionarySourceHelpers.cpp
@@ -9,15 +9,11 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/SettingsChanges.h>
 
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/Executors/PullingAsyncPipelineExecutor.h>
-
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
 }
 
@@ -135,29 +131,4 @@ String TransformWithAdditionalColumns::getName() const
     return "TransformWithAdditionalColumns";
 }
 
-DictionaryPipelineExecutor::DictionaryPipelineExecutor(QueryPipeline & pipeline_, bool async)
-    : async_executor(async ? std::make_unique<PullingAsyncPipelineExecutor>(pipeline_) : nullptr)
-    , executor(async ? nullptr : std::make_unique<PullingPipelineExecutor>(pipeline_))
-{}
-
-bool DictionaryPipelineExecutor::pull(Block & block)
-{
-    if (async_executor)
-    {
-        while (true)
-        {
-            bool has_data = async_executor->pull(block);
-            if (has_data && !block)
-                continue;
-            return has_data;
-        }
-    }
-    else if (executor)
-        return executor->pull(block);
-    else
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "DictionaryPipelineExecutor is not initialized");
-}
-
-DictionaryPipelineExecutor::~DictionaryPipelineExecutor() = default;
-
 }
diff --git a/src/Dictionaries/DictionarySourceHelpers.h b/src/Dictionaries/DictionarySourceHelpers.h
index a545b5cdac7..39c6e7b3c42 100644
--- a/src/Dictionaries/DictionarySourceHelpers.h
+++ b/src/Dictionaries/DictionarySourceHelpers.h
@@ -16,10 +16,6 @@ namespace DB
 struct DictionaryStructure;
 class SettingsChanges;
 
-class PullingPipelineExecutor;
-class PullingAsyncPipelineExecutor;
-class QueryPipeline;
-
 /// For simple key
 
 Block blockForIds(
@@ -55,17 +51,4 @@ private:
     size_t current_range_index = 0;
 };
 
-/// Wrapper for `Pulling(Async)PipelineExecutor` to dynamically dispatch calls to the right executor
-class DictionaryPipelineExecutor
-{
-public:
-    DictionaryPipelineExecutor(QueryPipeline & pipeline_, bool async);
-    bool pull(Block & block);
-
-    ~DictionaryPipelineExecutor();
-private:
-    std::unique_ptr<PullingAsyncPipelineExecutor> async_executor;
-    std::unique_ptr<PullingPipelineExecutor> executor;
-};
-
 }
diff --git a/src/Dictionaries/DirectDictionary.cpp b/src/Dictionaries/DirectDictionary.cpp
index 64c7eb14024..f47b386b2ef 100644
--- a/src/Dictionaries/DirectDictionary.cpp
+++ b/src/Dictionaries/DirectDictionary.cpp
@@ -42,11 +42,14 @@ DirectDictionary<dictionary_key_type>::DirectDictionary(
 template <DictionaryKeyType dictionary_key_type>
 Columns DirectDictionary<dictionary_key_type>::getColumns(
     const Strings & attribute_names,
-    const DataTypes & result_types,
+    const DataTypes & attribute_types,
     const Columns & key_columns,
-    const DataTypes & key_types [[maybe_unused]],
-    const Columns & default_values_columns) const
+    const DataTypes & key_types,
+    DefaultsOrFilter defaults_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(defaults_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefaults>(defaults_or_filter));
+
     if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
@@ -54,7 +57,8 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
     DictionaryKeysExtractor<dictionary_key_type> extractor(key_columns, arena_holder.getComplexKeyArena());
     const auto requested_keys = extractor.extractAllKeys();
 
-    DictionaryStorageFetchRequest request(dict_struct, attribute_names, result_types, default_values_columns);
+    DictionaryStorageFetchRequest request(dict_struct, attribute_names, attribute_types,
+        is_short_circuit ? nullptr : &std::get<RefDefaults>(defaults_or_filter).get() /*default_values_columns*/);
 
     HashMap<KeyType, size_t> key_to_fetched_index;
     key_to_fetched_index.reserve(requested_keys.size());
@@ -96,7 +100,8 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
         for (size_t i = 0; i < dictionary_keys_size; ++i)
             block_key_columns.emplace_back(block.safeGetByPosition(i).column);
 
-        DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(block_key_columns, arena_holder.getComplexKeyArena());
+        DictionaryKeysExtractor<dictionary_key_type> block_keys_extractor(
+            block_key_columns, arena_holder.getComplexKeyArena());
         auto block_keys = block_keys_extractor.extractAllKeys();
 
         for (size_t attribute_index = 0; attribute_index < request.attributesSize(); ++attribute_index)
@@ -118,7 +123,7 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
         block_key_columns.clear();
     }
 
-    LOG_DEBUG(&Poco::Logger::get("DirectDictionary"), "read {} blocks with {} rows from pipeline in {} ms",
+    LOG_DEBUG(getLogger("DirectDictionary"), "read {} blocks with {} rows from pipeline in {} ms",
         block_num, rows_num, watch.elapsedMilliseconds());
 
     Field value_to_insert;
@@ -129,6 +134,11 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
 
     size_t keys_found = 0;
 
+    IColumn::Filter * default_mask = nullptr;
+    if (is_short_circuit)
+        default_mask= &std::get<RefFilter>(defaults_or_filter).get();
+
+    bool mask_filled = false;
     for (size_t attribute_index = 0; attribute_index < result_columns.size(); ++attribute_index)
     {
         if (!request.shouldFillResultColumnWithIndex(attribute_index))
@@ -137,10 +147,12 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
         auto & result_column = result_columns[attribute_index];
 
         const auto & fetched_column_from_storage = fetched_columns_from_storage[attribute_index];
-        const auto & default_value_provider = request.defaultValueProviderAtIndex(attribute_index);
 
         result_column->reserve(requested_keys_size);
 
+        if (default_mask && !mask_filled)
+            default_mask->resize(requested_keys_size);
+
         for (size_t requested_key_index = 0; requested_key_index < requested_keys_size; ++requested_key_index)
         {
             const auto requested_key = requested_keys[requested_key_index];
@@ -150,12 +162,29 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
             {
                 fetched_column_from_storage->get(it->getMapped(), value_to_insert);
                 ++keys_found;
+
+                if (default_mask && !mask_filled)
+                    (*default_mask)[requested_key_index] = 0;
+
+                result_column->insert(value_to_insert);
             }
             else
-                value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
-
-            result_column->insert(value_to_insert);
+            {
+                if (default_mask)
+                {
+                    if (!mask_filled)
+                        (*default_mask)[requested_key_index] = 1;
+                }
+                else
+                {
+                    const auto & default_value_provider = request.defaultValueProviderAtIndex(attribute_index);
+                    value_to_insert = default_value_provider.getDefaultValue(requested_key_index);
+                    result_column->insert(value_to_insert);
+                }
+            }
         }
+
+        mask_filled = true;
     }
 
     query_count.fetch_add(requested_keys_size, std::memory_order_relaxed);
@@ -167,12 +196,25 @@ Columns DirectDictionary<dictionary_key_type>::getColumns(
 template <DictionaryKeyType dictionary_key_type>
 ColumnPtr DirectDictionary<dictionary_key_type>::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr & result_type,
+    const DataTypePtr & attribute_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr & default_values_column) const
+    DefaultOrFilter default_or_filter) const
 {
-    return getColumns({ attribute_name }, { result_type }, key_columns, key_types, { default_values_column }).front();
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
+    if (is_short_circuit)
+    {
+        IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+        return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, default_mask).front();
+    }
+    else
+    {
+        const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+        const Columns & columns= Columns({default_values_column});
+        return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, columns).front();
+    }
 }
 
 template <DictionaryKeyType dictionary_key_type>
@@ -353,7 +395,7 @@ Pipe DirectDictionary<dictionary_key_type>::getSourcePipe(
             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());
+    LOG_DEBUG(getLogger("DirectDictionary"), "building pipeline for loading keys done in {} ms", watch.elapsedMilliseconds());
     return pipe;
 }
 
diff --git a/src/Dictionaries/DirectDictionary.h b/src/Dictionaries/DirectDictionary.h
index 214c8ef8a13..d4b4cd8e698 100644
--- a/src/Dictionaries/DirectDictionary.h
+++ b/src/Dictionaries/DirectDictionary.h
@@ -34,14 +34,14 @@ public:
 
     size_t getBytesAllocated() const override { return 0; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -50,7 +50,7 @@ public:
 
     double getLoadFactor() const override { return 0; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<DirectDictionary>(getDictionaryID(), dict_struct, source_ptr->clone());
     }
@@ -70,17 +70,17 @@ public:
 
     Columns getColumns(
         const Strings & attribute_names,
-        const DataTypes & result_types,
+        const DataTypes & attribute_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns) const override;
+        DefaultsOrFilter defaults_or_filter) const override;
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
diff --git a/src/Dictionaries/Embedded/GeodataProviders/IHierarchiesProvider.h b/src/Dictionaries/Embedded/GeodataProviders/IHierarchiesProvider.h
index 68ab0fdca2d..a4b88127786 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/IHierarchiesProvider.h
+++ b/src/Dictionaries/Embedded/GeodataProviders/IHierarchiesProvider.h
@@ -14,7 +14,7 @@ class IRegionsHierarchyReader
 public:
     virtual bool readNext(RegionEntry & entry) = 0;
 
-    virtual ~IRegionsHierarchyReader() {}
+    virtual ~IRegionsHierarchyReader() = default;
 };
 
 using IRegionsHierarchyReaderPtr = std::unique_ptr<IRegionsHierarchyReader>;
diff --git a/src/Dictionaries/Embedded/GeodataProviders/Types.h b/src/Dictionaries/Embedded/GeodataProviders/Types.h
index 0fd6a01051a..2209c7f6d56 100644
--- a/src/Dictionaries/Embedded/GeodataProviders/Types.h
+++ b/src/Dictionaries/Embedded/GeodataProviders/Types.h
@@ -9,7 +9,7 @@ using RegionID = UInt32;
 using RegionDepth = UInt8;
 using RegionPopulation = UInt32;
 
-enum class RegionType : Int8
+enum class RegionType : int8_t
 {
     Hidden = -1,
     Continent = 1,
diff --git a/src/Dictionaries/Embedded/RegionsHierarchies.cpp b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
index c3c62bcc83c..3f1222fff3f 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchies.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchies.cpp
@@ -8,7 +8,7 @@ namespace DB
 
 RegionsHierarchies::RegionsHierarchies(IRegionsHierarchiesDataProviderPtr data_provider)
 {
-    Poco::Logger * log = &Poco::Logger::get("RegionsHierarchies");
+    LoggerPtr log = getLogger("RegionsHierarchies");
 
     LOG_DEBUG(log, "Adding default regions hierarchy");
     data.emplace("", data_provider->getDefaultHierarchySource());
diff --git a/src/Dictionaries/Embedded/RegionsHierarchy.cpp b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
index 23f4c250a23..a59f6fcd0e7 100644
--- a/src/Dictionaries/Embedded/RegionsHierarchy.cpp
+++ b/src/Dictionaries/Embedded/RegionsHierarchy.cpp
@@ -23,7 +23,7 @@ RegionsHierarchy::RegionsHierarchy(IRegionsHierarchyDataSourcePtr data_source_)
 
 void RegionsHierarchy::reload()
 {
-    Poco::Logger * log = &Poco::Logger::get("RegionsHierarchy");
+    LoggerPtr log = getLogger("RegionsHierarchy");
 
     if (!data_source->isModified())
         return;
diff --git a/src/Dictionaries/Embedded/RegionsNames.cpp b/src/Dictionaries/Embedded/RegionsNames.cpp
index 847dfe99b10..c89bacc7ec9 100644
--- a/src/Dictionaries/Embedded/RegionsNames.cpp
+++ b/src/Dictionaries/Embedded/RegionsNames.cpp
@@ -42,7 +42,7 @@ std::string RegionsNames::dumpSupportedLanguagesNames()
 
 void RegionsNames::reload()
 {
-    Poco::Logger * log = &Poco::Logger::get("RegionsNames");
+    LoggerPtr log = getLogger("RegionsNames");
     LOG_DEBUG(log, "Reloading regions names");
 
     RegionID max_region_id = 0;
diff --git a/src/Dictionaries/ExecutableDictionarySource.cpp b/src/Dictionaries/ExecutableDictionarySource.cpp
index f1acd610274..6b9f97a6d5c 100644
--- a/src/Dictionaries/ExecutableDictionarySource.cpp
+++ b/src/Dictionaries/ExecutableDictionarySource.cpp
@@ -71,7 +71,7 @@ ExecutableDictionarySource::ExecutableDictionarySource(
     Block & sample_block_,
     std::shared_ptr<ShellCommandSourceCoordinator> coordinator_,
     ContextPtr context_)
-    : log(&Poco::Logger::get("ExecutableDictionarySource"))
+    : log(getLogger("ExecutableDictionarySource"))
     , dict_struct(dict_struct_)
     , configuration(configuration_)
     , sample_block(sample_block_)
@@ -93,7 +93,7 @@ ExecutableDictionarySource::ExecutableDictionarySource(
 }
 
 ExecutableDictionarySource::ExecutableDictionarySource(const ExecutableDictionarySource & other)
-    : log(&Poco::Logger::get("ExecutableDictionarySource"))
+    : log(getLogger("ExecutableDictionarySource"))
     , update_time(other.update_time)
     , dict_struct(other.dict_struct)
     , configuration(other.configuration)
diff --git a/src/Dictionaries/ExecutableDictionarySource.h b/src/Dictionaries/ExecutableDictionarySource.h
index c7067a62893..eb936434218 100644
--- a/src/Dictionaries/ExecutableDictionarySource.h
+++ b/src/Dictionaries/ExecutableDictionarySource.h
@@ -63,7 +63,7 @@ public:
     QueryPipeline getStreamForBlock(const Block & block);
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     time_t update_time = 0;
     const DictionaryStructure dict_struct;
     const Configuration configuration;
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.cpp b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
index d28c73c9c52..d8111afdc19 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.cpp
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.cpp
@@ -40,7 +40,7 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(
     , sample_block(sample_block_)
     , coordinator(std::move(coordinator_))
     , context(context_)
-    , log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
+    , log(getLogger("ExecutablePoolDictionarySource"))
 {
     /// Remove keys from sample_block for implicit_key dictionary because
     /// these columns will not be returned from source
@@ -64,7 +64,7 @@ ExecutablePoolDictionarySource::ExecutablePoolDictionarySource(const ExecutableP
     , sample_block(other.sample_block)
     , coordinator(other.coordinator)
     , context(Context::createCopy(other.context))
-    , log(&Poco::Logger::get("ExecutablePoolDictionarySource"))
+    , log(getLogger("ExecutablePoolDictionarySource"))
 {
 }
 
diff --git a/src/Dictionaries/ExecutablePoolDictionarySource.h b/src/Dictionaries/ExecutablePoolDictionarySource.h
index e8cc6e83406..752d8ea2757 100644
--- a/src/Dictionaries/ExecutablePoolDictionarySource.h
+++ b/src/Dictionaries/ExecutablePoolDictionarySource.h
@@ -72,7 +72,7 @@ private:
     Block sample_block;
     std::shared_ptr<ShellCommandSourceCoordinator> coordinator;
     ContextPtr context;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Dictionaries/FileDictionarySource.cpp b/src/Dictionaries/FileDictionarySource.cpp
index 86287971428..16a4ecaee75 100644
--- a/src/Dictionaries/FileDictionarySource.cpp
+++ b/src/Dictionaries/FileDictionarySource.cpp
@@ -48,7 +48,7 @@ FileDictionarySource::FileDictionarySource(const FileDictionarySource & other)
 
 QueryPipeline FileDictionarySource::loadAll()
 {
-    LOG_TRACE(&Poco::Logger::get("FileDictionary"), "loadAll {}", toString());
+    LOG_TRACE(getLogger("FileDictionary"), "loadAll {}", toString());
     auto in_ptr = std::make_unique<ReadBufferFromFile>(filepath);
     auto source = context->getInputFormat(format, *in_ptr, sample_block, max_block_size);
     source->addBuffer(std::move(in_ptr));
diff --git a/src/Dictionaries/FlatDictionary.cpp b/src/Dictionaries/FlatDictionary.cpp
index 41ff4d5399e..7509af31fac 100644
--- a/src/Dictionaries/FlatDictionary.cpp
+++ b/src/Dictionaries/FlatDictionary.cpp
@@ -9,12 +9,13 @@
 #include <IO/WriteHelpers.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/MaskOperations.h>
 #include <Functions/FunctionHelpers.h>
 
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 #include <Dictionaries/DictionarySource.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
@@ -48,12 +49,15 @@ FlatDictionary::FlatDictionary(
 }
 
 ColumnPtr FlatDictionary::getColumn(
-        const std::string & attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes &,
-        const ColumnPtr & default_values_column) const
+    const std::string & attribute_name,
+    const DataTypePtr & attribute_type,
+    const Columns & key_columns,
+    const DataTypes & key_types [[maybe_unused]],
+    DefaultOrFilter default_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
     ColumnPtr result;
 
     PaddedPODArray<UInt64> backup_storage;
@@ -61,7 +65,7 @@ ColumnPtr FlatDictionary::getColumn(
 
     auto size = ids.size();
 
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
 
     size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
     const auto & attribute = attributes[attribute_index];
@@ -83,61 +87,130 @@ ColumnPtr FlatDictionary::getColumn(
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(dictionary_attribute.null_value, default_values_column);
-
         auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
-        if constexpr (std::is_same_v<ValueType, Array>)
+        if (is_short_circuit)
         {
-            auto * out = column.get();
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            size_t keys_found = 0;
 
-            getItemsImpl<ValueType, false>(
-                attribute,
-                ids,
-                [&](size_t, const Array & value, bool) { out->insert(value); },
-                default_value_extractor);
-        }
-        else if constexpr (std::is_same_v<ValueType, StringRef>)
-        {
-            auto * out = column.get();
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
 
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
+                keys_found = getItemsShortCircuitImpl<ValueType, false>(
                     attribute,
                     ids,
-                    [&](size_t row, StringRef value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out->insertData(value.data, value.size);
-                    },
-                    default_value_extractor);
+                    [&](size_t, const Array & value, bool) { out->insert(value); },
+                    default_mask);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        ids,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        ids,
+                        [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
+                        default_mask);
+            }
             else
-                getItemsImpl<ValueType, false>(
-                    attribute,
-                    ids,
-                    [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
-                    default_value_extractor);
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        ids,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        ids,
+                        [&](size_t row, const auto value, bool) { out[row] = value; },
+                        default_mask);
+
+                out.resize(keys_found);
+            }
+
+            if (attribute.is_nullable_set)
+                vec_null_map_to->resize(keys_found);
         }
         else
         {
-            auto & out = column->getData();
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+
+            DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(
+                dictionary_attribute.null_value, default_values_column);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
 
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    ids,
-                    [&](size_t row, const auto value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out[row] = value;
-                    },
-                    default_value_extractor);
-            else
                 getItemsImpl<ValueType, false>(
                     attribute,
                     ids,
-                    [&](size_t row, const auto value, bool) { out[row] = value; },
+                    [&](size_t, const Array & value, bool) { out->insert(value); },
                     default_value_extractor);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        ids,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        ids,
+                        [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
+                        default_value_extractor);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        ids,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        ids,
+                        [&](size_t row, const auto value, bool) { out[row] = value; },
+                        default_value_extractor);
+            }
         }
 
         result = std::move(column);
@@ -340,7 +413,7 @@ void FlatDictionary::blockToAttributes(const Block & block)
     const auto keys_column = block.safeGetByPosition(0).column;
 
     DictionaryKeysArenaHolder<DictionaryKeyType::Simple> arena_holder;
-    DictionaryKeysExtractor<DictionaryKeyType::Simple> keys_extractor({ keys_column }, arena_holder.getComplexKeyArena());
+    DictionaryKeysExtractor<DictionaryKeyType::Simple> keys_extractor({ keys_column }, arena_holder.getComplexKeyArena()); /// NOLINT(readability-static-accessed-through-instance)
     size_t keys_size = keys_extractor.getKeysSize();
 
     static constexpr size_t key_offset = 1;
@@ -569,6 +642,42 @@ void FlatDictionary::getItemsImpl(
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
+template <typename AttributeType, bool is_nullable, typename ValueSetter>
+size_t FlatDictionary::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    const PaddedPODArray<UInt64> & keys,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask) const
+{
+    const auto rows = keys.size();
+    default_mask.resize(rows);
+    const auto & container = std::get<ContainerType<AttributeType>>(attribute.container);
+    size_t keys_found = 0;
+
+    for (size_t row = 0; row < rows; ++row)
+    {
+        const auto key = keys[row];
+
+        if (key < loaded_keys.size() && loaded_keys[key])
+        {
+            default_mask[row] = 0;
+
+            if constexpr (is_nullable)
+                set_value(keys_found, container[key], attribute.is_nullable_set->find(key) != nullptr);
+            else
+                set_value(keys_found, container[key], false);
+
+            ++keys_found;
+        }
+        else
+            default_mask[row] = 1;
+    }
+
+    query_count.fetch_add(rows, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    return keys_found;
+}
+
 template <typename T>
 void FlatDictionary::resize(Attribute & attribute, UInt64 key)
 {
diff --git a/src/Dictionaries/FlatDictionary.h b/src/Dictionaries/FlatDictionary.h
index a54916c5cd1..7b00ce57455 100644
--- a/src/Dictionaries/FlatDictionary.h
+++ b/src/Dictionaries/FlatDictionary.h
@@ -41,14 +41,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -57,7 +57,7 @@ public:
 
     double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<FlatDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), configuration, update_field_loaded_block);
     }
@@ -76,11 +76,11 @@ public:
     DictionaryKeyType getKeyType() const override { return DictionaryKeyType::Simple; }
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -165,6 +165,13 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, bool is_nullable, typename ValueSetter>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        const PaddedPODArray<UInt64> & keys,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask) const;
+
     template <typename T>
     void resize(Attribute & attribute, UInt64 key);
 
diff --git a/src/Dictionaries/HTTPDictionarySource.cpp b/src/Dictionaries/HTTPDictionarySource.cpp
index 689593a969e..dae8ec06d30 100644
--- a/src/Dictionaries/HTTPDictionarySource.cpp
+++ b/src/Dictionaries/HTTPDictionarySource.cpp
@@ -32,7 +32,7 @@ HTTPDictionarySource::HTTPDictionarySource(
     const Poco::Net::HTTPBasicCredentials & credentials_,
     Block & sample_block_,
     ContextPtr context_)
-    : log(&Poco::Logger::get("HTTPDictionarySource"))
+    : log(getLogger("HTTPDictionarySource"))
     , update_time(std::chrono::system_clock::from_time_t(0))
     , dict_struct(dict_struct_)
     , configuration(configuration_)
@@ -45,7 +45,7 @@ HTTPDictionarySource::HTTPDictionarySource(
 }
 
 HTTPDictionarySource::HTTPDictionarySource(const HTTPDictionarySource & other)
-    : log(&Poco::Logger::get("HTTPDictionarySource"))
+    : log(getLogger("HTTPDictionarySource"))
     , update_time(other.update_time)
     , dict_struct(other.dict_struct)
     , configuration(other.configuration)
@@ -88,20 +88,18 @@ void HTTPDictionarySource::getUpdateFieldAndDate(Poco::URI & uri)
 QueryPipeline HTTPDictionarySource::loadAll()
 {
     LOG_TRACE(log, "loadAll {}", toString());
-    Poco::URI uri(configuration.url);
-    auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_GET,
-        ReadWriteBufferFromHTTP::OutStreamCallback(),
-        timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        context->getReadSettings(),
-        configuration.header_entries,
-        nullptr, false);
 
-    return createWrappedBuffer(std::move(in_ptr));
+    Poco::URI uri(configuration.url);
+
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withSettings(context->getReadSettings())
+                   .withTimeouts(timeouts)
+                   .withHeaders(configuration.header_entries)
+                   .withDelayInit(false)
+                   .create(credentials);
+
+    return createWrappedBuffer(std::move(buf));
 }
 
 QueryPipeline HTTPDictionarySource::loadUpdatedAll()
@@ -109,19 +107,16 @@ QueryPipeline HTTPDictionarySource::loadUpdatedAll()
     Poco::URI uri(configuration.url);
     getUpdateFieldAndDate(uri);
     LOG_TRACE(log, "loadUpdatedAll {}", uri.toString());
-    auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_GET,
-        ReadWriteBufferFromHTTP::OutStreamCallback(),
-        timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        context->getReadSettings(),
-        configuration.header_entries,
-        nullptr, false);
 
-    return createWrappedBuffer(std::move(in_ptr));
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withSettings(context->getReadSettings())
+                   .withTimeouts(timeouts)
+                   .withHeaders(configuration.header_entries)
+                   .withDelayInit(false)
+                   .create(credentials);
+
+    return createWrappedBuffer(std::move(buf));
 }
 
 QueryPipeline HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
@@ -139,19 +134,18 @@ QueryPipeline HTTPDictionarySource::loadIds(const std::vector<UInt64> & ids)
     };
 
     Poco::URI uri(configuration.url);
-    auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        out_stream_callback,
-        timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        context->getReadSettings(),
-        configuration.header_entries,
-        nullptr, false);
 
-    return createWrappedBuffer(std::move(in_ptr));
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withSettings(context->getReadSettings())
+                   .withTimeouts(timeouts)
+                   .withHeaders(configuration.header_entries)
+                   .withOutCallback(std::move(out_stream_callback))
+                   .withDelayInit(false)
+                   .create(credentials);
+
+    return createWrappedBuffer(std::move(buf));
 }
 
 QueryPipeline HTTPDictionarySource::loadKeys(const Columns & key_columns, const std::vector<size_t> & requested_rows)
@@ -169,19 +163,18 @@ QueryPipeline HTTPDictionarySource::loadKeys(const Columns & key_columns, const
     };
 
     Poco::URI uri(configuration.url);
-    auto in_ptr = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        out_stream_callback,
-        timeouts,
-        credentials,
-        0,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        context->getReadSettings(),
-        configuration.header_entries,
-        nullptr, false);
 
-    return createWrappedBuffer(std::move(in_ptr));
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withSettings(context->getReadSettings())
+                   .withTimeouts(timeouts)
+                   .withHeaders(configuration.header_entries)
+                   .withOutCallback(std::move(out_stream_callback))
+                   .withDelayInit(false)
+                   .create(credentials);
+
+    return createWrappedBuffer(std::move(buf));
 }
 
 bool HTTPDictionarySource::isModified() const
diff --git a/src/Dictionaries/HTTPDictionarySource.h b/src/Dictionaries/HTTPDictionarySource.h
index e22aacd89f1..414372fe7ac 100644
--- a/src/Dictionaries/HTTPDictionarySource.h
+++ b/src/Dictionaries/HTTPDictionarySource.h
@@ -66,7 +66,7 @@ private:
     // wrap buffer using encoding from made request
     QueryPipeline createWrappedBuffer(std::unique_ptr<ReadWriteBufferFromHTTP> http_buffer);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     LocalDateTime getLastModification() const;
 
diff --git a/src/Dictionaries/HashedArrayDictionary.cpp b/src/Dictionaries/HashedArrayDictionary.cpp
index 4c9ff8abe80..2420c07277c 100644
--- a/src/Dictionaries/HashedArrayDictionary.cpp
+++ b/src/Dictionaries/HashedArrayDictionary.cpp
@@ -10,6 +10,7 @@
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 
@@ -32,7 +33,7 @@ HashedArrayDictionary<dictionary_key_type, sharded>::HashedArrayDictionary(
     const HashedArrayDictionaryStorageConfiguration & configuration_,
     BlockPtr update_field_loaded_block_)
     : IDictionary(dict_id_)
-    , log(&Poco::Logger::get("HashedArrayDictionary"))
+    , log(getLogger("HashedArrayDictionary"))
     , dict_struct(dict_struct_)
     , source_ptr(std::move(source_ptr_))
     , configuration(configuration_)
@@ -47,10 +48,10 @@ HashedArrayDictionary<dictionary_key_type, sharded>::HashedArrayDictionary(
 template <DictionaryKeyType dictionary_key_type, bool sharded>
 ColumnPtr HashedArrayDictionary<dictionary_key_type, sharded>::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr & result_type,
+    const DataTypePtr & attribute_type,
     const Columns & key_columns,
-    const DataTypes & key_types [[maybe_unused]],
-    const ColumnPtr & default_values_column) const
+    const DataTypes & key_types,
+    DefaultOrFilter default_or_filter) const
 {
     if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
@@ -62,21 +63,24 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type, sharded>::getColumn(
 
     const size_t keys_size = extractor.getKeysSize();
 
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
     const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
     auto & attribute = attributes[attribute_index];
 
-    return getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, extractor);
+    return getAttributeColumn(attribute, dictionary_attribute, keys_size, default_or_filter, extractor);
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sharded>
 Columns HashedArrayDictionary<dictionary_key_type, sharded>::getColumns(
     const Strings & attribute_names,
-    const DataTypes & result_types,
+    const DataTypes & attribute_types,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const Columns & default_values_columns) const
+    DefaultsOrFilter defaults_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(defaults_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefaults>(defaults_or_filter));
+
     if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
@@ -85,6 +89,13 @@ Columns HashedArrayDictionary<dictionary_key_type, sharded>::getColumns(
 
     const size_t keys_size = extractor.getKeysSize();
 
+    IColumn::Filter * default_mask = nullptr;
+    if (is_short_circuit)
+    {
+        default_mask = &std::get<RefFilter>(defaults_or_filter).get();
+        default_mask->resize(keys_size);
+    }
+
     KeyIndexToElementIndex key_index_to_element_index;
 
     /** Optimization for multiple attributes.
@@ -111,6 +122,9 @@ Columns HashedArrayDictionary<dictionary_key_type, sharded>::getColumns(
                     key_index_to_element_index[key_index] = std::make_pair(-1, shard);
                 else
                     key_index_to_element_index[key_index] = -1;
+
+                if (default_mask)
+                    (*default_mask)[key_index] = 1;
             }
             else
             {
@@ -118,6 +132,10 @@ Columns HashedArrayDictionary<dictionary_key_type, sharded>::getColumns(
                     key_index_to_element_index[key_index] = std::make_pair(it->getMapped(), shard);
                 else
                     key_index_to_element_index[key_index] = it->getMapped();
+
+                if (default_mask)
+                    (*default_mask)[key_index] = 0;
+
                 ++keys_found;
             }
 
@@ -138,17 +156,32 @@ Columns HashedArrayDictionary<dictionary_key_type, sharded>::getColumns(
         ColumnPtr result_column;
 
         const auto & attribute_name = attribute_names[i];
-        const auto & result_type = result_types[i];
-        const auto & default_values_column = default_values_columns[i];
+        const auto & attribute_type = attribute_types[i];
 
-        const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+        const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
         const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
         auto & attribute = attributes[attribute_index];
 
-        if (attribute_names_size > 1)
-            result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, key_index_to_element_index);
+        if (is_short_circuit)
+        {
+            if (attribute_names_size > 1)
+                result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size,
+                    *default_mask, key_index_to_element_index);
+            else
+                result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size,
+                    *default_mask, extractor);
+        }
         else
-            result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size, default_values_column, extractor);
+        {
+            const Columns & default_values_columns = std::get<RefDefaults>(defaults_or_filter).get();
+            const auto & default_values_column = default_values_columns[i];
+            if (attribute_names_size > 1)
+                result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size,
+                    default_values_column, key_index_to_element_index);
+            else
+                result_column = getAttributeColumn(attribute, dictionary_attribute, keys_size,
+                    default_values_column, extractor);
+        }
 
         result_columns.emplace_back(std::move(result_column));
     }
@@ -587,9 +620,12 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type, sharded>::getAttributeColum
     const Attribute & attribute,
     const DictionaryAttribute & dictionary_attribute,
     size_t keys_size,
-    ColumnPtr default_values_column,
+    DefaultOrFilter default_or_filter,
     KeysProvider && keys_object) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
     ColumnPtr result;
 
     bool is_attribute_nullable = attribute.is_index_null.has_value();
@@ -609,61 +645,130 @@ ColumnPtr HashedArrayDictionary<dictionary_key_type, sharded>::getAttributeColum
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(dictionary_attribute.null_value, default_values_column);
-
         auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
 
-        if constexpr (std::is_same_v<ValueType, Array>)
+        if (is_short_circuit)
         {
-            auto * out = column.get();
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            size_t keys_found = 0;
 
-            getItemsImpl<ValueType, false>(
-                attribute,
-                keys_object,
-                [&](const size_t, const Array & value, bool) { out->insert(value); },
-                default_value_extractor);
-        }
-        else if constexpr (std::is_same_v<ValueType, StringRef>)
-        {
-            auto * out = column.get();
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
+
+                keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                    attribute,
+                    keys_object,
+                    [&](const size_t, const Array & value, bool) { out->insert(value); },
+                    default_mask);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        keys_object,
+                        [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
+                        default_mask);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, const auto value, bool) { out[row] = value; },
+                        default_mask);
+
+                out.resize(keys_found);
+            }
 
             if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    keys_object,
-                    [&](size_t row, StringRef value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out->insertData(value.data, value.size);
-                    },
-                    default_value_extractor);
-            else
-                getItemsImpl<ValueType, false>(
-                    attribute,
-                    keys_object,
-                    [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
-                    default_value_extractor);
+                vec_null_map_to->resize(keys_found);
         }
         else
         {
-            auto & out = column->getData();
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+
+            DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(
+                dictionary_attribute.null_value, default_values_column);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
 
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    keys_object,
-                    [&](size_t row, const auto value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out[row] = value;
-                    },
-                    default_value_extractor);
-            else
                 getItemsImpl<ValueType, false>(
                     attribute,
                     keys_object,
-                    [&](size_t row, const auto value, bool) { out[row] = value; },
+                    [&](const size_t, const Array & value, bool) { out->insert(value); },
                     default_value_extractor);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        keys_object,
+                        [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
+                        default_value_extractor);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        keys_object,
+                        [&](size_t row, const auto value, bool) { out[row] = value; },
+                        default_value_extractor);
+            }
         }
 
         result = std::move(column);
@@ -682,9 +787,10 @@ template <typename AttributeType, bool is_nullable, typename ValueSetter, typena
 void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
     const Attribute & attribute,
     DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
-    ValueSetter && set_value [[maybe_unused]],
+    ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
+    const auto & attribute_containers = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers);
     const size_t keys_size = keys_extractor.getKeysSize();
 
     size_t keys_found = 0;
@@ -694,7 +800,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
         auto key = keys_extractor.extractCurrentKey();
         auto shard = getShard(key);
         const auto & key_attribute_container = key_attribute.containers[shard];
-        const auto & attribute_container = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers)[shard];
+        const auto & attribute_container = attribute_containers[shard];
 
         const auto it = key_attribute_container.find(key);
 
@@ -726,6 +832,54 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
+template <DictionaryKeyType dictionary_key_type, bool sharded>
+template <typename AttributeType, bool is_nullable, typename ValueSetter>
+size_t HashedArrayDictionary<dictionary_key_type, sharded>::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask) const
+{
+    const auto & attribute_containers = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers);
+    const size_t keys_size = keys_extractor.getKeysSize();
+    default_mask.resize(keys_size);
+    size_t keys_found = 0;
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        auto key = keys_extractor.extractCurrentKey();
+        auto shard = getShard(key);
+        const auto & key_attribute_container = key_attribute.containers[shard];
+        const auto & attribute_container = attribute_containers[shard];
+
+        const auto it = key_attribute_container.find(key);
+
+        if (it != key_attribute_container.end())
+        {
+            size_t element_index = it->getMapped();
+
+            const auto & element = attribute_container[element_index];
+
+            if constexpr (is_nullable)
+                set_value(key_index, element, (*attribute.is_index_null)[shard][element_index]);
+            else
+                set_value(key_index, element, false);
+
+            default_mask[key_index] = 0;
+
+            ++keys_found;
+        }
+        else
+            default_mask[key_index] = 1;
+
+        keys_extractor.rollbackCurrentKey();
+    }
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    return keys_found;
+}
+
 template <DictionaryKeyType dictionary_key_type, bool sharded>
 template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
 void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
@@ -734,6 +888,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
     ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
+    const auto & attribute_containers = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers);
     const size_t keys_size = key_index_to_element_index.size();
     size_t shard = 0;
 
@@ -752,7 +907,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
 
         if (element_index != -1)
         {
-            const auto & attribute_container = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers)[shard];
+            const auto & attribute_container = attribute_containers[shard];
 
             size_t found_element_index = static_cast<size_t>(element_index);
             const auto & element = attribute_container[found_element_index];
@@ -772,12 +927,55 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::getItemsImpl(
     }
 }
 
+template <DictionaryKeyType dictionary_key_type, bool sharded>
+template <typename AttributeType, bool is_nullable, typename ValueSetter>
+size_t HashedArrayDictionary<dictionary_key_type, sharded>::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    const KeyIndexToElementIndex & key_index_to_element_index,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask [[maybe_unused]]) const
+{
+    const auto & attribute_containers = std::get<AttributeContainerShardsType<AttributeType>>(attribute.containers);
+    const size_t keys_size = key_index_to_element_index.size();
+    size_t shard = 0;
+    size_t keys_found = 0;
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        ssize_t element_index;
+        if constexpr (sharded)
+        {
+            element_index = key_index_to_element_index[key_index].first;
+            shard = key_index_to_element_index[key_index].second;
+        }
+        else
+        {
+            element_index = key_index_to_element_index[key_index];
+        }
+
+        if (element_index != -1)
+        {
+            keys_found++;
+            const auto & attribute_container = attribute_containers[shard];
+
+            size_t found_element_index = static_cast<size_t>(element_index);
+            const auto & element = attribute_container[found_element_index];
+
+            if constexpr (is_nullable)
+                set_value(key_index, element, (*attribute.is_index_null)[shard][found_element_index]);
+            else
+                set_value(key_index, element, false);
+        }
+    }
+
+    return keys_found;
+}
+
 template <DictionaryKeyType dictionary_key_type, bool sharded>
 void HashedArrayDictionary<dictionary_key_type, sharded>::loadData()
 {
     if (!source_ptr->hasUpdateField())
     {
-
         std::optional<DictionaryParallelLoaderType> parallel_loader;
         if constexpr (sharded)
             parallel_loader.emplace(*this);
@@ -790,6 +988,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::loadData()
 
         size_t total_rows = 0;
         size_t total_blocks = 0;
+        String dictionary_name = getFullName();
 
         Block block;
         while (true)
@@ -809,7 +1008,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::loadData()
 
             if (parallel_loader)
             {
-                parallel_loader->addBlock(block);
+                parallel_loader->addBlock(std::move(block));
             }
             else
             {
@@ -822,10 +1021,12 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::loadData()
         if (parallel_loader)
             parallel_loader->finish();
 
-        LOG_DEBUG(&Poco::Logger::get("HashedArrayDictionary"),
-            "Finished {}reading {} blocks with {} rows from pipeline in {:.2f} sec and inserted into hashtable in {:.2f} sec",
+        LOG_DEBUG(log,
+            "Finished {}reading {} blocks with {} rows to dictionary {} from pipeline in {:.2f} sec and inserted into hashtable in {:.2f} sec",
             configuration.use_async_executor ? "asynchronous " : "",
-            total_blocks, total_rows, pull_time_microseconds / 1000000.0, process_time_microseconds / 1000000.0);
+            total_blocks, total_rows,
+            dictionary_name,
+            pull_time_microseconds / 1000000.0, process_time_microseconds / 1000000.0);
     }
     else
     {
@@ -878,7 +1079,7 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::calculateBytesAllocate
                     bytes_allocated += container.allocated_bytes();
                 }
 
-                bucket_count = container.capacity();
+                bucket_count += container.capacity();
             }
         };
 
@@ -889,6 +1090,13 @@ void HashedArrayDictionary<dictionary_key_type, sharded>::calculateBytesAllocate
                 bytes_allocated += container.size();
     }
 
+    /// `bucket_count` should be a sum over all shards,
+    /// 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.
+    if (attributes.size())
+        bucket_count /= attributes.size();
+
     if (update_field_loaded_block)
         bytes_allocated += update_field_loaded_block->allocatedBytes();
 
@@ -967,7 +1175,14 @@ void registerDictionaryArrayHashed(DictionaryFactory & factory)
         if (shards <= 0 || 128 < shards)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,"{}: SHARDS parameter should be within [1, 128]", full_name);
 
-        HashedArrayDictionaryStorageConfiguration configuration{require_nonempty, dict_lifetime, static_cast<size_t>(shards)};
+        Int64 shard_load_queue_backlog = config.getInt(config_prefix + dictionary_layout_prefix + ".shard_load_queue_backlog", 10000);
+        if (shard_load_queue_backlog <= 0)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: SHARD_LOAD_QUEUE_BACKLOG parameter should be greater then zero", full_name);
+
+        if (source_ptr->hasUpdateField() && shards > 1)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: SHARDS parameter does not supports for updatable source (UPDATE_FIELD)", full_name);
+
+        HashedArrayDictionaryStorageConfiguration configuration{require_nonempty, dict_lifetime, static_cast<size_t>(shards), static_cast<UInt64>(shard_load_queue_backlog)};
 
         ContextMutablePtr context = copyContextAndApplySettingsFromDictionaryConfig(global_context, config, config_prefix);
         const auto & settings = context->getSettingsRef();
@@ -975,6 +1190,9 @@ void registerDictionaryArrayHashed(DictionaryFactory & factory)
         const auto * clickhouse_source = dynamic_cast<const ClickHouseDictionarySource *>(source_ptr.get());
         configuration.use_async_executor = clickhouse_source && clickhouse_source->isLocal() && settings.dictionary_use_async_executor;
 
+        if (settings.max_execution_time.totalSeconds() > 0)
+            configuration.load_timeout = std::chrono::seconds(settings.max_execution_time.totalSeconds());
+
         if (dictionary_key_type == DictionaryKeyType::Simple)
         {
             if (shards > 1)
diff --git a/src/Dictionaries/HashedArrayDictionary.h b/src/Dictionaries/HashedArrayDictionary.h
index 606008ce921..c37dd1e76cf 100644
--- a/src/Dictionaries/HashedArrayDictionary.h
+++ b/src/Dictionaries/HashedArrayDictionary.h
@@ -29,6 +29,7 @@ struct HashedArrayDictionaryStorageConfiguration
     size_t shards = 1;
     size_t shard_load_queue_backlog = 10000;
     bool use_async_executor = false;
+    std::chrono::seconds load_timeout{0};
 };
 
 template <DictionaryKeyType dictionary_key_type, bool sharded>
@@ -57,14 +58,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -73,7 +74,7 @@ public:
 
     double getLoadFactor() const override { return static_cast<double>(total_element_count) / bucket_count; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<HashedArrayDictionary<dictionary_key_type, sharded>>(getDictionaryID(), dict_struct, source_ptr->clone(), configuration, update_field_loaded_block);
     }
@@ -92,18 +93,18 @@ public:
     DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     Columns getColumns(
         const Strings & attribute_names,
-        const DataTypes & result_types,
+        const DataTypes & attribute_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns) const override;
+        DefaultsOrFilter defaults_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -216,7 +217,7 @@ private:
         const Attribute & attribute,
         const DictionaryAttribute & dictionary_attribute,
         size_t keys_size,
-        ColumnPtr default_values_column,
+        DefaultOrFilter default_or_filter,
         KeysProvider && keys_object) const;
 
     template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
@@ -226,6 +227,12 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, bool is_nullable, typename ValueSetter>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask) const;
 
     using KeyIndexToElementIndex = std::conditional_t<sharded, PaddedPODArray<std::pair<ssize_t, UInt8>>, PaddedPODArray<ssize_t>>;
 
@@ -236,6 +243,13 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, bool is_nullable, typename ValueSetter>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        const KeyIndexToElementIndex & key_index_to_element_index,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask [[maybe_unused]]) const;
+
     template <typename GetContainerFunc>
     void getAttributeContainer(size_t attribute_index, GetContainerFunc && get_container_func);
 
@@ -244,7 +258,7 @@ private:
 
     void resize(size_t total_rows);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
diff --git a/src/Dictionaries/HashedDictionary.h b/src/Dictionaries/HashedDictionary.h
index 8009ffab80a..66f085beaef 100644
--- a/src/Dictionaries/HashedDictionary.h
+++ b/src/Dictionaries/HashedDictionary.h
@@ -6,7 +6,7 @@
 #include <Dictionaries/DictionaryHelpers.h>
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionarySource.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/HierarchyDictionariesUtils.h>
 #include <Dictionaries/HashedDictionaryCollectionType.h>
 #include <Dictionaries/HashedDictionaryCollectionTraits.h>
@@ -27,6 +27,7 @@
 
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/MaskOperations.h>
 #include <Functions/FunctionHelpers.h>
 
 #include <atomic>
@@ -66,6 +67,7 @@ struct HashedDictionaryConfiguration
     const bool require_nonempty;
     const DictionaryLifetime lifetime;
     bool use_async_executor = false;
+    const std::chrono::seconds load_timeout{0};
 };
 
 template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded>
@@ -99,14 +101,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -115,7 +117,7 @@ public:
 
     double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<HashedDictionary<dictionary_key_type, sparse, sharded>>(
             getDictionaryID(),
@@ -139,11 +141,11 @@ public:
     DictionaryKeyType getKeyType() const override { return dictionary_key_type; }
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -243,6 +245,14 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, bool is_nullable, typename ValueSetter, typename NullSetter>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+        ValueSetter && set_value,
+        NullSetter && set_null,
+        IColumn::Filter & default_mask) const;
+
     template <typename GetContainersFunc>
     void getAttributeContainers(size_t attribute_index, GetContainersFunc && get_containers_func);
 
@@ -251,7 +261,7 @@ private:
 
     void resize(size_t added_rows);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     const DictionaryStructure dict_struct;
     const DictionarySourcePtr source_ptr;
@@ -293,7 +303,7 @@ HashedDictionary<dictionary_key_type, sparse, sharded>::HashedDictionary(
     const HashedDictionaryConfiguration & configuration_,
     BlockPtr update_field_loaded_block_)
     : IDictionary(dict_id_)
-    , log(&Poco::Logger::get("HashedDictionary"))
+    , log(getLogger("HashedDictionary"))
     , dict_struct(dict_struct_)
     , source_ptr(std::move(source_ptr_))
     , configuration(configuration_)
@@ -365,19 +375,23 @@ HashedDictionary<dictionary_key_type, sparse, sharded>::~HashedDictionary()
         }
     }
 
-    LOG_TRACE(log, "Destroying {} non empty hash tables (using {} threads)", hash_tables_count, pool.getMaxThreads());
+    String dictionary_name = getFullName();
+    LOG_TRACE(log, "Destroying {} non empty hash tables for dictionary {} (using {} threads) ", hash_tables_count, dictionary_name, pool.getMaxThreads());
     pool.wait();
-    LOG_TRACE(log, "Hash tables destroyed");
+    LOG_TRACE(log, "Hash tables for dictionary {} destroyed", dictionary_name);
 }
 
 template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded>
 ColumnPtr HashedDictionary<dictionary_key_type, sparse, sharded>::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr & result_type,
+    const DataTypePtr & attribute_type,
     const Columns & key_columns,
-    const DataTypes & key_types [[maybe_unused]],
-    const ColumnPtr & default_values_column) const
+    const DataTypes & key_types,
+    DefaultOrFilter default_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
     if (dictionary_key_type == DictionaryKeyType::Complex)
         dict_struct.validateKeyTypes(key_types);
 
@@ -388,7 +402,7 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse, sharded>::getColumn(
 
     const size_t size = extractor.getKeysSize();
 
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
     const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
     auto & attribute = attributes[attribute_index];
 
@@ -409,61 +423,141 @@ ColumnPtr HashedDictionary<dictionary_key_type, sparse, sharded>::getColumn(
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(dictionary_attribute.null_value, default_values_column);
-
         auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
-        if constexpr (std::is_same_v<ValueType, Array>)
+        if (is_short_circuit)
         {
-            auto * out = column.get();
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            size_t keys_found = 0;
 
-            getItemsImpl<ValueType, false>(
-                attribute,
-                extractor,
-                [&](const size_t, const Array & value, bool) { out->insert(value); },
-                default_value_extractor);
-        }
-        else if constexpr (std::is_same_v<ValueType, StringRef>)
-        {
-            auto * out = column.get();
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
+
+                keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                    attribute,
+                    extractor,
+                    [&](const size_t, const Array & value) { out->insert(value); },
+                    [&](size_t) {},
+                    default_mask);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                {
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, StringRef value)
+                        {
+                            (*vec_null_map_to)[row] = false;
+                            out->insertData(value.data, value.size);
+                        },
+                        [&](size_t row)
+                        {
+                            (*vec_null_map_to)[row] = true;
+                            out->insertDefault();
+                        },
+                        default_mask);
+                }
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        extractor,
+                        [&](size_t, StringRef value) { out->insertData(value.data, value.size); },
+                        [&](size_t) {},
+                        default_mask);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, const auto value)
+                        {
+                            (*vec_null_map_to)[row] = false;
+                            out[row] = value;
+                        },
+                        [&](size_t row) { (*vec_null_map_to)[row] = true; },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, const auto value) { out[row] = value; },
+                        [&](size_t) {},
+                        default_mask);
+
+                out.resize(keys_found);
+            }
 
             if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    extractor,
-                    [&](size_t row, StringRef value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out->insertData(value.data, value.size);
-                    },
-                    default_value_extractor);
-            else
-                getItemsImpl<ValueType, false>(
-                    attribute,
-                    extractor,
-                    [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
-                    default_value_extractor);
+                vec_null_map_to->resize(keys_found);
         }
         else
         {
-            auto & out = column->getData();
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+
+            DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(
+                dictionary_attribute.null_value, default_values_column);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
 
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    extractor,
-                    [&](size_t row, const auto value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out[row] = value;
-                    },
-                    default_value_extractor);
-            else
                 getItemsImpl<ValueType, false>(
                     attribute,
                     extractor,
-                    [&](size_t row, const auto value, bool) { out[row] = value; },
+                    [&](const size_t, const Array & value, bool) { out->insert(value); },
                     default_value_extractor);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        extractor,
+                        [&](size_t, StringRef value, bool) { out->insertData(value.data, value.size); },
+                        default_value_extractor);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        extractor,
+                        [&](size_t row, const auto value, bool) { out[row] = value; },
+                        default_value_extractor);
+            }
         }
 
         result = std::move(column);
@@ -741,6 +835,7 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::createAttributes()
     attributes.reserve(size);
 
     HashTableGrowerWithPrecalculationAndMaxLoadFactor grower(configuration.max_load_factor);
+    String dictionary_name = getFullName();
 
     for (const auto & dictionary_attribute : dict_struct.attributes)
     {
@@ -770,9 +865,9 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::createAttributes()
             }
 
             if constexpr (IsBuiltinHashTable<typename CollectionsHolder<ValueType>::value_type>)
-                LOG_TRACE(log, "Using builtin hash table for {} attribute", dictionary_attribute.name);
+                LOG_TRACE(log, "Using builtin hash table for {} attribute of {}", dictionary_attribute.name, dictionary_name);
             else
-                LOG_TRACE(log, "Using sparsehash for {} attribute", dictionary_attribute.name);
+                LOG_TRACE(log, "Using sparsehash for {} attribute of {}", dictionary_attribute.name, dictionary_name);
         };
 
         callOnDictionaryAttributeType(dictionary_attribute.underlying_type, type_call);
@@ -975,7 +1070,7 @@ template <typename AttributeType, bool is_nullable, typename ValueSetter, typena
 void HashedDictionary<dictionary_key_type, sparse, sharded>::getItemsImpl(
     const Attribute & attribute,
     DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
-    ValueSetter && set_value [[maybe_unused]],
+    ValueSetter && set_value,
     DefaultValueExtractor & default_value_extractor) const
 {
     const auto & attribute_containers = std::get<CollectionsHolder<AttributeType>>(attribute.containers);
@@ -1016,6 +1111,54 @@ void HashedDictionary<dictionary_key_type, sparse, sharded>::getItemsImpl(
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
+template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded>
+template <typename AttributeType, bool is_nullable, typename ValueSetter, typename NullSetter>
+size_t HashedDictionary<dictionary_key_type, sparse, sharded>::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    DictionaryKeysExtractor<dictionary_key_type> & keys_extractor,
+    ValueSetter && set_value,
+    NullSetter && set_null,
+    IColumn::Filter & default_mask) const
+{
+    const auto & attribute_containers = std::get<CollectionsHolder<AttributeType>>(attribute.containers);
+    const size_t keys_size = keys_extractor.getKeysSize();
+    default_mask.resize(keys_size);
+    size_t keys_found = 0;
+
+    for (size_t key_index = 0; key_index < keys_size; ++key_index)
+    {
+        auto key = keys_extractor.extractCurrentKey();
+        auto shard = getShard(key);
+
+        const auto & container = attribute_containers[shard];
+        const auto it = container.find(key);
+
+        if (it != container.end())
+        {
+            set_value(key_index, getValueFromCell(it));
+            default_mask[key_index] = 0;
+
+            ++keys_found;
+        }
+        // Need to consider items in is_nullable_sets as well, see blockToAttributes()
+        else if (is_nullable && (*attribute.is_nullable_sets)[shard].find(key) != nullptr)
+        {
+            set_null(key_index);
+            default_mask[key_index] = 0;
+
+            ++keys_found;
+        }
+        else
+            default_mask[key_index] = 1;
+
+        keys_extractor.rollbackCurrentKey();
+    }
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    return keys_found;
+}
+
 template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded>
 void HashedDictionary<dictionary_key_type, sparse, sharded>::loadData()
 {
diff --git a/src/Dictionaries/HashedDictionaryParallelLoader.h b/src/Dictionaries/HashedDictionaryParallelLoader.h
index ec892af7e36..d88ee88f9a9 100644
--- a/src/Dictionaries/HashedDictionaryParallelLoader.h
+++ b/src/Dictionaries/HashedDictionaryParallelLoader.h
@@ -31,6 +31,7 @@ template <DictionaryKeyType dictionary_key_type, bool sparse, bool sharded> clas
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int TIMEOUT_EXCEEDED;
 }
 
 }
@@ -46,12 +47,14 @@ class HashedDictionaryParallelLoader : public boost::noncopyable
 public:
     explicit HashedDictionaryParallelLoader(DictionaryType & dictionary_)
         : dictionary(dictionary_)
+        , dictionary_name(dictionary.getFullName())
         , shards(dictionary.configuration.shards)
         , pool(CurrentMetrics::HashedDictionaryThreads, CurrentMetrics::HashedDictionaryThreadsActive, CurrentMetrics::HashedDictionaryThreadsScheduled, shards)
         , shards_queues(shards)
+        , loading_timeout(dictionary.configuration.load_timeout)
     {
         UInt64 backlog = dictionary.configuration.shard_load_queue_backlog;
-        LOG_TRACE(dictionary.log, "Will load the dictionary using {} threads (with {} backlog)", shards, backlog);
+        LOG_TRACE(dictionary.log, "Will load the {} dictionary using {} threads (with {} backlog and timeout {} sec)", dictionary_name, shards, backlog, loading_timeout.count());
 
         shards_slots.resize(shards);
         iota(shards_slots.data(), shards_slots.size(), UInt64(0));
@@ -61,7 +64,11 @@ public:
             shards_queues[shard].emplace(backlog);
             pool.scheduleOrThrowOnError([this, shard, thread_group = CurrentThread::getGroup()]
             {
+                WorkerStatistic statistic;
                 SCOPE_EXIT_SAFE(
+                    LOG_TRACE(dictionary.log, "Finished worker for dictionary {} shard {}, processed {} blocks, {} rows, total time {}ms",
+                        dictionary_name, shard, statistic.total_blocks, statistic.total_rows, statistic.total_elapsed_ms);
+
                     if (thread_group)
                         CurrentThread::detachFromGroupIfNotDetached();
                 );
@@ -73,7 +80,9 @@ public:
                     CurrentThread::attachToGroupIfDetached(thread_group);
                 setThreadName("HashedDictLoad");
 
-                threadWorker(shard);
+                LOG_TRACE(dictionary.log, "Starting worker for dictionary {}, shard {}", dictionary_name, shard);
+
+                threadWorker(shard, statistic);
             });
         }
     }
@@ -82,11 +91,32 @@ public:
     {
         IColumn::Selector selector = createShardSelector(block, shards_slots);
         Blocks shards_blocks = splitBlock(selector, block);
+        block.clear();
 
         for (size_t shard = 0; shard < shards; ++shard)
         {
-            if (!shards_queues[shard]->push(std::move(shards_blocks[shard])))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to shards queue #{}", shard);
+            const auto & current_block = shards_blocks[shard];
+            while (!shards_queues[shard]->tryPush(current_block, /* milliseconds= */ 100))
+            {
+                if (shards_queues[shard]->isFinished())
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not push to finished shards queue #{}, dictionary {}", shard, dictionary_name);
+
+                /// We need to check if some workers failed
+                if (pool.active() != shards)
+                {
+                    LOG_DEBUG(dictionary.log, "Some workers for dictionary {} failed, stopping all workers", dictionary_name);
+                    stop_all_workers = true;
+                    pool.wait(); /// We expect exception to be thrown from the failed worker thread
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Worker threads for dictionary {} are not active", dictionary_name);
+                }
+
+                if (loading_timeout.count() && std::chrono::milliseconds(total_loading_time.elapsedMilliseconds()) > loading_timeout)
+                {
+                    stop_all_workers = true;
+                    pool.wait();
+                    throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Timeout {} sec for dictionary {} loading is expired", loading_timeout.count(), dictionary_name);
+                }
+            }
         }
     }
 
@@ -98,7 +128,7 @@ public:
         Stopwatch watch;
         pool.wait();
         UInt64 elapsed_ms = watch.elapsedMilliseconds();
-        LOG_TRACE(dictionary.log, "Processing the tail took {}ms", elapsed_ms);
+        LOG_TRACE(dictionary.log, "Processing the tail of dictionary {} took {}ms", dictionary_name, elapsed_ms);
     }
 
     ~HashedDictionaryParallelLoader()
@@ -119,29 +149,52 @@ public:
 
 private:
     DictionaryType & dictionary;
+    String dictionary_name;
     const size_t shards;
     ThreadPool pool;
+    std::atomic_bool stop_all_workers{false};
     std::vector<std::optional<ConcurrentBoundedQueue<Block>>> shards_queues;
+    std::chrono::seconds loading_timeout;
+    Stopwatch total_loading_time;
+
     std::vector<UInt64> shards_slots;
     DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
 
-    void threadWorker(size_t shard)
+    struct WorkerStatistic
+    {
+        UInt64 total_elapsed_ms = 0;
+        UInt64 total_blocks = 0;
+        UInt64 total_rows = 0;
+    };
+
+    void threadWorker(size_t shard, WorkerStatistic & statistic)
     {
         Block block;
         DictionaryKeysArenaHolder<dictionary_key_type> arena_holder_;
         auto & shard_queue = *shards_queues[shard];
 
-        while (shard_queue.pop(block))
+        while (true)
         {
+            if (!shard_queue.tryPop(block, /* milliseconds= */ 100))
+            {
+                /// Check if we need to stop
+                if (stop_all_workers || shard_queue.isFinished())
+                    break;
+                /// Timeout expired, but the queue is not finished yet, try again
+                continue;
+            }
+
             Stopwatch watch;
             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());
-        }
 
-        if (!shard_queue.isFinished())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not pull non finished shards queue #{}", shard);
+            statistic.total_elapsed_ms += elapsed_ms;
+            statistic.total_blocks += 1;
+            statistic.total_rows += block.rows();
+
+            if (elapsed_ms > 1'000)
+                LOG_TRACE(dictionary.log, "Block processing for shard #{} is slow {}ms (rows {})", shard, elapsed_ms, block.rows());
+        }
     }
 
     /// Split block to shards smaller block, using 'selector'.
diff --git a/src/Dictionaries/ICacheDictionaryStorage.h b/src/Dictionaries/ICacheDictionaryStorage.h
index a4990528a4e..dcd7434946f 100644
--- a/src/Dictionaries/ICacheDictionaryStorage.h
+++ b/src/Dictionaries/ICacheDictionaryStorage.h
@@ -81,7 +81,8 @@ public:
     /// Fetch columns for keys, this method is not write thread safe
     virtual SimpleKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<UInt64> & keys,
-        const DictionaryStorageFetchRequest & fetch_request) = 0;
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * default_mask) = 0;
 
     /// Fetch columns for keys, this method is not write thread safe
     virtual void insertColumnsForKeys(const PaddedPODArray<UInt64> & keys, Columns columns) = 0;
@@ -98,7 +99,8 @@ public:
     /// Fetch columns for keys, this method is not write thread safe
     virtual ComplexKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<StringRef> & keys,
-        const DictionaryStorageFetchRequest & column_fetch_requests) = 0;
+        const DictionaryStorageFetchRequest & column_fetch_requests,
+        IColumn::Filter * default_mask) = 0;
 
     /// Fetch columns for keys, this method is not write thread safe
     virtual void insertColumnsForKeys(const PaddedPODArray<StringRef> & keys, Columns columns) = 0;
diff --git a/src/Dictionaries/IDictionary.h b/src/Dictionaries/IDictionary.h
index f1834b4b129..bab80d3cd57 100644
--- a/src/Dictionaries/IDictionary.h
+++ b/src/Dictionaries/IDictionary.h
@@ -75,13 +75,6 @@ public:
         return dictionary_id;
     }
 
-    void updateDictionaryName(const StorageID & new_name) const
-    {
-        std::lock_guard lock{mutex};
-        assert(new_name.uuid == dictionary_id.uuid && dictionary_id.uuid != UUIDHelpers::Nil);
-        dictionary_id = new_name;
-    }
-
     std::string getLoadableName() const final
     {
         std::lock_guard lock{mutex};
@@ -109,6 +102,9 @@ public:
 
     virtual size_t getQueryCount() const = 0;
 
+    /// The percentage of time a lookup successfully found an entry.
+    /// When there were no lookups, it returns zero (instead of NaN).
+    /// The value is calculated non atomically and can be slightly off in the presence of concurrent lookups.
     virtual double getFoundRate() const = 0;
 
     virtual double getHitRate() const = 0;
@@ -167,29 +163,38 @@ public:
     /** Subclass must validate key columns and keys types
       * and return column representation of dictionary attribute.
       *
-      * Parameter default_values_column must be used to provide default values
-      * for keys that are not in dictionary. If null pointer is passed,
-      * then default attribute value must be used.
+      * Parameter default_or_filter is std::variant type, so either a column of
+      * default values is passed or a filter used in short circuit case, Filter's
+      * 1 represents to be filled later on by lazy execution, and 0 means we have
+      * the value right now.
       */
+    using RefDefault = std::reference_wrapper<const ColumnPtr>;
+    using RefFilter = std::reference_wrapper<IColumn::Filter>;
+    using DefaultOrFilter = std::variant<RefDefault, RefFilter>;
     virtual ColumnPtr getColumn(
-        const std::string & attribute_name,
-        const DataTypePtr & result_type,
-        const Columns & key_columns,
-        const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const = 0;
+        const std::string & attribute_name [[maybe_unused]],
+        const DataTypePtr & attribute_type [[maybe_unused]],
+        const Columns & key_columns [[maybe_unused]],
+        const DataTypes & key_types [[maybe_unused]],
+        DefaultOrFilter default_or_filter [[maybe_unused]]) const = 0;
 
     /** Get multiple columns from dictionary.
       *
       * Default implementation just calls getColumn multiple times.
       * Subclasses can provide custom more efficient implementation.
       */
+    using RefDefaults = std::reference_wrapper<const Columns>;
+    using DefaultsOrFilter = std::variant<RefDefaults, RefFilter>;
     virtual Columns getColumns(
         const Strings & attribute_names,
-        const DataTypes & result_types,
+        const DataTypes & attribute_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns) const
+        DefaultsOrFilter defaults_or_filter) const
     {
+        bool is_short_circuit = std::holds_alternative<RefFilter>(defaults_or_filter);
+        assert(is_short_circuit || std::holds_alternative<RefDefaults>(defaults_or_filter));
+
         size_t attribute_names_size = attribute_names.size();
 
         Columns result;
@@ -198,10 +203,11 @@ public:
         for (size_t i = 0; i < attribute_names_size; ++i)
         {
             const auto & attribute_name = attribute_names[i];
-            const auto & result_type = result_types[i];
-            const auto & default_values_column = default_values_columns[i];
+            const auto & attribute_type = attribute_types[i];
 
-            result.emplace_back(getColumn(attribute_name, result_type, key_columns, key_types, default_values_column));
+            DefaultOrFilter var = is_short_circuit ? DefaultOrFilter{std::get<RefFilter>(defaults_or_filter).get()} :
+                                                     std::get<RefDefaults>(defaults_or_filter).get()[i];
+            result.emplace_back(getColumn(attribute_name, attribute_type, key_columns, key_types, var));
         }
 
         return result;
@@ -326,12 +332,6 @@ public:
         return std::static_pointer_cast<const IDictionary>(IExternalLoadable::shared_from_this());
     }
 
-    void setDictionaryComment(String new_comment)
-    {
-        std::lock_guard lock{mutex};
-        dictionary_comment = std::move(new_comment);
-    }
-
     String getDictionaryComment() const
     {
         std::lock_guard lock{mutex};
@@ -439,9 +439,26 @@ public:
         return sample_block;
     }
 
+    /// Internally called by ExternalDictionariesLoader.
+    /// In order to update the dictionary ID change its configuration first and then call ExternalDictionariesLoader::reloadConfig().
+    void updateDictionaryID(const StorageID & new_dictionary_id)
+    {
+        std::lock_guard lock{mutex};
+        assert((new_dictionary_id.uuid == dictionary_id.uuid) && (dictionary_id.uuid != UUIDHelpers::Nil));
+        dictionary_id = new_dictionary_id;
+    }
+
+    /// Internally called by ExternalDictionariesLoader.
+    /// In order to update the dictionary comment change its configuration first and then call ExternalDictionariesLoader::reloadConfig().
+    void updateDictionaryComment(const String & new_dictionary_comment)
+    {
+        std::lock_guard lock{mutex};
+        dictionary_comment = new_dictionary_comment;
+    }
+
 private:
     mutable std::mutex mutex;
-    mutable StorageID dictionary_id TSA_GUARDED_BY(mutex);
+    StorageID dictionary_id TSA_GUARDED_BY(mutex);
     String dictionary_comment TSA_GUARDED_BY(mutex);
 };
 
diff --git a/src/Dictionaries/IPAddressDictionary.cpp b/src/Dictionaries/IPAddressDictionary.cpp
index 2e3c09c67c5..1bc6d16c932 100644
--- a/src/Dictionaries/IPAddressDictionary.cpp
+++ b/src/Dictionaries/IPAddressDictionary.cpp
@@ -19,6 +19,7 @@
 #include <Dictionaries/ClickHouseDictionarySource.h>
 #include <Dictionaries/DictionarySource.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Functions/FunctionHelpers.h>
 
@@ -205,7 +206,7 @@ IPAddressDictionary::IPAddressDictionary(
     , source_ptr{std::move(source_ptr_)}
     , configuration(configuration_)
     , access_to_key_from_attributes(dict_struct_.access_to_key_from_attributes)
-    , logger(&Poco::Logger::get("IPAddressDictionary"))
+    , logger(getLogger("IPAddressDictionary"))
 {
     createAttributes();
     loadData();
@@ -219,17 +220,20 @@ void IPAddressDictionary::convertKeyColumns(Columns &, DataTypes &) const
 
 ColumnPtr IPAddressDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr & result_type,
+    const DataTypePtr & attribute_type,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const ColumnPtr & default_values_column) const
+    DefaultOrFilter default_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
     validateKeyTypes(key_types);
 
     ColumnPtr result;
 
     const auto & attribute = getAttribute(attribute_name);
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
 
     auto size = key_columns.front()->size();
 
@@ -240,40 +244,83 @@ ColumnPtr IPAddressDictionary::getColumn(
         using ValueType = DictionaryValueType<AttributeType>;
         using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
 
-        const auto & null_value = std::get<AttributeType>(attribute.null_values);
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
-
         auto column = ColumnProvider::getColumn(dictionary_attribute, size);
 
-        if constexpr (std::is_same_v<ValueType, Array>)
+        if (is_short_circuit)
         {
-            auto * out = column.get();
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            size_t keys_found = 0;
 
-            getItemsImpl<ValueType>(
-                attribute,
-                key_columns,
-                [&](const size_t, const Array & value) { out->insert(value); },
-                default_value_extractor);
-        }
-        else if constexpr (std::is_same_v<ValueType, StringRef>)
-        {
-            auto * out = column.get();
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
 
-            getItemsImpl<ValueType>(
-                attribute,
-                key_columns,
-                [&](const size_t, StringRef value) { out->insertData(value.data, value.size); },
-                default_value_extractor);
+                keys_found = getItemsShortCircuitImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const Array & value) { out->insert(value); },
+                    default_mask);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                keys_found = getItemsShortCircuitImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, StringRef value) { out->insertData(value.data, value.size); },
+                    default_mask);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                keys_found = getItemsShortCircuitImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    default_mask);
+
+                out.resize(keys_found);
+            }
         }
         else
         {
-            auto & out = column->getData();
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
 
-            getItemsImpl<ValueType>(
-                attribute,
-                key_columns,
-                [&](const size_t row, const auto value) { return out[row] = value; },
-                default_value_extractor);
+            const auto & null_value = std::get<AttributeType>(attribute.null_values);
+            DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(null_value, default_values_column);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
+
+                getItemsImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, const Array & value) { out->insert(value); },
+                    default_value_extractor);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                getItemsImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t, StringRef value) { out->insertData(value.data, value.size); },
+                    default_value_extractor);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                getItemsImpl<ValueType>(
+                    attribute,
+                    key_columns,
+                    [&](const size_t row, const auto value) { return out[row] = value; },
+                    default_value_extractor);
+            }
         }
 
         result = std::move(column);
@@ -284,7 +331,6 @@ ColumnPtr IPAddressDictionary::getColumn(
     return result;
 }
 
-
 ColumnUInt8::Ptr IPAddressDictionary::hasKeys(const Columns & key_columns, const DataTypes & key_types) const
 {
     validateKeyTypes(key_types);
@@ -691,6 +737,96 @@ void IPAddressDictionary::getItemsByTwoKeyColumnsImpl(
     }
 }
 
+template <typename AttributeType, typename ValueSetter>
+size_t IPAddressDictionary::getItemsByTwoKeyColumnsShortCircuitImpl(
+    const Attribute & attribute,
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask) const
+{
+    const auto & first_column = key_columns.front();
+    const size_t rows = first_column->size();
+    default_mask.resize(rows);
+    size_t keys_found = 0;
+    auto & vec = std::get<ContainerType<AttributeType>>(attribute.maps);
+
+    if (const auto * ipv4_col = std::get_if<IPv4Container>(&ip_column))
+    {
+        const auto * key_ip_column_ptr = typeid_cast<const ColumnVector<UInt32> *>(&*key_columns.front());
+        if (key_ip_column_ptr == nullptr)
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a UInt32 IP column");
+
+        const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
+
+        auto comp_v4 = [&](size_t elem, const IPv4Subnet & target)
+        {
+            UInt32 addr = (*ipv4_col)[elem];
+            if (addr == target.addr)
+                return mask_column[elem] < target.prefix;
+            return addr < target.addr;
+        };
+
+        for (const auto i : collections::range(0, rows))
+        {
+            UInt32 addr = key_ip_column_ptr->getElement(i);
+            UInt8 mask = key_mask_column.getElement(i);
+
+            auto range = collections::range(0, row_idx.size());
+            auto found_it = std::lower_bound(range.begin(), range.end(), IPv4Subnet{addr, mask}, comp_v4);
+
+            if (likely(found_it != range.end() &&
+                (*ipv4_col)[*found_it] == addr &&
+                mask_column[*found_it] == mask))
+            {
+                set_value(i, vec[row_idx[*found_it]]);
+                default_mask[i] = 0;
+                keys_found++;
+            }
+            else
+                default_mask[i] = 1;
+        }
+        return keys_found;
+    }
+
+    const auto * key_ip_column_ptr = typeid_cast<const ColumnFixedString *>(&*key_columns.front());
+    if (key_ip_column_ptr == nullptr || key_ip_column_ptr->getN() != IPV6_BINARY_LENGTH)
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a FixedString(16) IP column");
+
+    const auto & key_mask_column = assert_cast<const ColumnVector<UInt8> &>(*key_columns.back());
+
+    const auto * ipv6_col = std::get_if<IPv6Container>(&ip_column);
+    auto comp_v6 = [&](size_t i, const IPv6Subnet & target)
+    {
+        auto cmpres = memcmp16(getIPv6FromOffset(*ipv6_col, i), target.addr);
+        if (cmpres == 0)
+            return mask_column[i] < target.prefix;
+        return cmpres < 0;
+    };
+
+    for (const auto i : collections::range(0, rows))
+    {
+        auto addr = key_ip_column_ptr->getDataAt(i);
+        UInt8 mask = key_mask_column.getElement(i);
+
+        IPv6Subnet target{reinterpret_cast<const uint8_t *>(addr.data), mask};
+
+        auto range = collections::range(0, row_idx.size());
+        auto found_it = std::lower_bound(range.begin(), range.end(), target, comp_v6);
+
+        if (likely(found_it != range.end() &&
+            memequal16(getIPv6FromOffset(*ipv6_col, *found_it), target.addr) &&
+            mask_column[*found_it] == mask))
+        {
+            set_value(i, vec[row_idx[*found_it]]);
+            default_mask[i] = 0;
+            keys_found++;
+        }
+        else
+            default_mask[i] = 1;
+    }
+    return keys_found;
+}
+
 template <typename AttributeType, typename ValueSetter, typename DefaultValueExtractor>
 void IPAddressDictionary::getItemsImpl(
     const Attribute & attribute,
@@ -756,6 +892,74 @@ void IPAddressDictionary::getItemsImpl(
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
+template <typename AttributeType, typename ValueSetter>
+size_t IPAddressDictionary::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    const Columns & key_columns,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask) const
+{
+    const auto & first_column = key_columns.front();
+    const size_t rows = first_column->size();
+    default_mask.resize(rows);
+    size_t keys_found = 0;
+
+    if (unlikely(key_columns.size() == 2))
+    {
+        keys_found = getItemsByTwoKeyColumnsShortCircuitImpl<AttributeType>(
+            attribute, key_columns, std::forward<ValueSetter>(set_value), default_mask);
+        query_count.fetch_add(rows, std::memory_order_relaxed);
+        return keys_found;
+    }
+
+    auto & vec = std::get<ContainerType<AttributeType>>(attribute.maps);
+
+    TypeIndex type_id = first_column->getDataType();
+
+    if (type_id == TypeIndex::IPv4 || type_id == TypeIndex::UInt32)
+    {
+        uint8_t addrv6_buf[IPV6_BINARY_LENGTH];
+        for (const auto i : collections::range(0, rows))
+        {
+            // addrv4 has native endianness
+            auto addrv4 = *reinterpret_cast<const UInt32 *>(first_column->getDataAt(i).data);
+            auto found = tryLookupIPv4(addrv4, addrv6_buf);
+            if (found != ipNotFound())
+            {
+                set_value(i, vec[*found]);
+                ++keys_found;
+                default_mask[i] = 0;
+            }
+            else
+                default_mask[i] = 1;
+        }
+    }
+    else if (type_id == TypeIndex::IPv6 || type_id == TypeIndex::FixedString)
+    {
+        for (const auto i : collections::range(0, rows))
+        {
+            auto addr = first_column->getDataAt(i);
+            if (addr.size != IPV6_BINARY_LENGTH)
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected key to be FixedString(16)");
+            auto found = tryLookupIPv6(reinterpret_cast<const uint8_t *>(addr.data));
+            if (found != ipNotFound())
+            {
+                set_value(i, vec[*found]);
+                ++keys_found;
+                default_mask[i] = 0;
+            }
+            else
+                default_mask[i] = 1;
+        }
+    }
+    else
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected key to be IPv4 (or UInt32) or IPv6 (or FixedString(16))");
+
+    query_count.fetch_add(rows, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    return keys_found;
+}
+
 template <typename T>
 void IPAddressDictionary::setAttributeValueImpl(Attribute & attribute, const T value)
 {
diff --git a/src/Dictionaries/IPAddressDictionary.h b/src/Dictionaries/IPAddressDictionary.h
index c5b9287c2b5..bdd02157077 100644
--- a/src/Dictionaries/IPAddressDictionary.h
+++ b/src/Dictionaries/IPAddressDictionary.h
@@ -41,14 +41,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -57,7 +57,7 @@ public:
 
     double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<IPAddressDictionary>(getDictionaryID(), dict_struct, source_ptr->clone(), configuration);
     }
@@ -78,11 +78,11 @@ public:
     void convertKeyColumns(Columns & key_columns, DataTypes & key_types) const override;
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -179,6 +179,13 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, typename ValueSetter>
+    size_t getItemsByTwoKeyColumnsShortCircuitImpl(
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask) const;
+
     template <typename AttributeType,typename ValueSetter, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
@@ -186,6 +193,13 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType,typename ValueSetter>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask) const;
+
     template <typename T>
     void setAttributeValueImpl(Attribute & attribute, const T value); /// NOLINT
 
@@ -234,7 +248,7 @@ private:
     mutable std::atomic<size_t> query_count{0};
     mutable std::atomic<size_t> found_count{0};
 
-    Poco::Logger * logger;
+    LoggerPtr logger;
 };
 
 }
diff --git a/src/Dictionaries/LibraryDictionarySource.cpp b/src/Dictionaries/LibraryDictionarySource.cpp
index 7eb4d803fe8..f6f104ca11d 100644
--- a/src/Dictionaries/LibraryDictionarySource.cpp
+++ b/src/Dictionaries/LibraryDictionarySource.cpp
@@ -30,7 +30,7 @@ LibraryDictionarySource::LibraryDictionarySource(
     Block & sample_block_,
     ContextPtr context_,
     bool created_from_ddl)
-    : log(&Poco::Logger::get("LibraryDictionarySource"))
+    : log(getLogger("LibraryDictionarySource"))
     , dict_struct{dict_struct_}
     , config_prefix{config_prefix_}
     , path{config.getString(config_prefix + ".path", "")}
@@ -78,7 +78,7 @@ LibraryDictionarySource::~LibraryDictionarySource()
 
 
 LibraryDictionarySource::LibraryDictionarySource(const LibraryDictionarySource & other)
-    : log(&Poco::Logger::get("LibraryDictionarySource"))
+    : log(getLogger("LibraryDictionarySource"))
     , dict_struct{other.dict_struct}
     , config_prefix{other.config_prefix}
     , path{other.path}
diff --git a/src/Dictionaries/LibraryDictionarySource.h b/src/Dictionaries/LibraryDictionarySource.h
index 57ab9976a3b..04a3d838577 100644
--- a/src/Dictionaries/LibraryDictionarySource.h
+++ b/src/Dictionaries/LibraryDictionarySource.h
@@ -75,7 +75,7 @@ private:
 
     static Field getDictID() { return UUIDHelpers::generateV4(); }
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     const DictionaryStructure dict_struct;
     const std::string config_prefix;
diff --git a/src/Dictionaries/MySQLDictionarySource.cpp b/src/Dictionaries/MySQLDictionarySource.cpp
index e61409e2b54..9a84512fde6 100644
--- a/src/Dictionaries/MySQLDictionarySource.cpp
+++ b/src/Dictionaries/MySQLDictionarySource.cpp
@@ -173,7 +173,7 @@ MySQLDictionarySource::MySQLDictionarySource(
     mysqlxx::PoolWithFailoverPtr pool_,
     const Block & sample_block_,
     const StreamSettings & settings_)
-    : log(&Poco::Logger::get("MySQLDictionarySource"))
+    : log(getLogger("MySQLDictionarySource"))
     , update_time(std::chrono::system_clock::from_time_t(0))
     , dict_struct(dict_struct_)
     , configuration(configuration_)
@@ -187,7 +187,7 @@ MySQLDictionarySource::MySQLDictionarySource(
 
 /// copy-constructor is provided in order to support cloneability
 MySQLDictionarySource::MySQLDictionarySource(const MySQLDictionarySource & other)
-    : log(&Poco::Logger::get("MySQLDictionarySource"))
+    : log(getLogger("MySQLDictionarySource"))
     , update_time(other.update_time)
     , dict_struct(other.dict_struct)
     , configuration(other.configuration)
diff --git a/src/Dictionaries/MySQLDictionarySource.h b/src/Dictionaries/MySQLDictionarySource.h
index 1d43ebfe2ba..d9eea3f3e26 100644
--- a/src/Dictionaries/MySQLDictionarySource.h
+++ b/src/Dictionaries/MySQLDictionarySource.h
@@ -82,7 +82,7 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::chrono::time_point<std::chrono::system_clock> update_time;
     const DictionaryStructure dict_struct;
diff --git a/src/Dictionaries/NullDictionarySource.cpp b/src/Dictionaries/NullDictionarySource.cpp
index 45dcc77f93d..2d5656e1335 100644
--- a/src/Dictionaries/NullDictionarySource.cpp
+++ b/src/Dictionaries/NullDictionarySource.cpp
@@ -20,7 +20,7 @@ NullDictionarySource::NullDictionarySource(const NullDictionarySource & other) :
 
 QueryPipeline NullDictionarySource::loadAll()
 {
-    LOG_TRACE(&Poco::Logger::get("NullDictionarySource"), "loadAll {}", toString());
+    LOG_TRACE(getLogger("NullDictionarySource"), "loadAll {}", toString());
     return QueryPipeline(std::make_shared<NullSource>(sample_block));
 }
 
diff --git a/src/Dictionaries/NullDictionarySource.h b/src/Dictionaries/NullDictionarySource.h
index 7eb02055e3a..29648859410 100644
--- a/src/Dictionaries/NullDictionarySource.h
+++ b/src/Dictionaries/NullDictionarySource.h
@@ -14,7 +14,7 @@ namespace ErrorCodes
 class NullDictionarySource final : public IDictionarySource
 {
 public:
-    NullDictionarySource(Block & sample_block_);
+    explicit NullDictionarySource(Block & sample_block_);
 
     NullDictionarySource(const NullDictionarySource & other);
 
diff --git a/src/Dictionaries/PolygonDictionary.cpp b/src/Dictionaries/PolygonDictionary.cpp
index 6f800bd921d..1456a0db750 100644
--- a/src/Dictionaries/PolygonDictionary.cpp
+++ b/src/Dictionaries/PolygonDictionary.cpp
@@ -1,6 +1,5 @@
 #include "PolygonDictionary.h"
 
-#include <numeric>
 #include <cmath>
 
 #include <base/sort.h>
@@ -15,7 +14,7 @@
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Dictionaries/DictionaryFactory.h>
 #include <Dictionaries/DictionarySource.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 
 
 namespace DB
@@ -71,15 +70,29 @@ void IPolygonDictionary::convertKeyColumns(Columns & key_columns, DataTypes & ke
 
 ColumnPtr IPolygonDictionary::getColumn(
     const std::string & attribute_name,
-    const DataTypePtr & result_type,
+    const DataTypePtr & attribute_type,
     const Columns & key_columns,
     const DataTypes &,
-    const ColumnPtr & default_values_column) const
+    DefaultOrFilter default_or_filter) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
     const auto requested_key_points = extractPoints(key_columns);
 
-    const auto & attribute = dict_struct.getAttribute(attribute_name, result_type);
-    DefaultValueProvider default_value_provider(attribute.null_value, default_values_column);
+    const auto & attribute = dict_struct.getAttribute(attribute_name, attribute_type);
+
+    std::optional<std::reference_wrapper<IColumn::Filter>> default_mask;
+    std::optional<DefaultValueProvider> default_value_provider;
+    if (is_short_circuit)
+    {
+        default_mask = std::get<RefFilter>(default_or_filter).get();
+    }
+    else
+    {
+        const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+        default_value_provider = DefaultValueProvider(attribute.null_value, default_values_column);
+    }
 
     size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
     const auto & attribute_values_column = attributes_columns[attribute_index];
@@ -89,11 +102,22 @@ ColumnPtr IPolygonDictionary::getColumn(
 
     if (unlikely(attribute.is_nullable))
     {
-        getItemsImpl<Field>(
-            requested_key_points,
-            [&](size_t row) { return (*attribute_values_column)[row]; },
-            [&](Field & value) { result->insert(value); },
-            default_value_provider);
+        if (is_short_circuit)
+        {
+            getItemsShortCircuitImpl<Field>(
+                requested_key_points,
+                [&](size_t row) { return (*attribute_values_column)[row]; },
+                [&](Field & value) { result->insert(value); },
+                default_mask.value());
+        }
+        else
+        {
+            getItemsImpl<Field>(
+                requested_key_points,
+                [&](size_t row) { return (*attribute_values_column)[row]; },
+                [&](Field & value) { result->insert(value); },
+                default_value_provider.value());
+        }
     }
     else
     {
@@ -113,30 +137,63 @@ ColumnPtr IPolygonDictionary::getColumn(
 
             if constexpr (std::is_same_v<ValueType, Array>)
             {
-                getItemsImpl<ValueType>(
-                    requested_key_points,
-                    [&](size_t row) { return (*attribute_values_column)[row].get<Array>(); },
-                    [&](Array & value) { result_column_typed.insert(value); },
-                    default_value_provider);
+                if (is_short_circuit)
+                {
+                    getItemsShortCircuitImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return (*attribute_values_column)[row].get<Array>(); },
+                        [&](Array & value) { result_column_typed.insert(value); },
+                        default_mask.value());
+                }
+                else
+                {
+                    getItemsImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return (*attribute_values_column)[row].get<Array>(); },
+                        [&](Array & value) { result_column_typed.insert(value); },
+                        default_value_provider.value());
+                }
             }
             else if constexpr (std::is_same_v<ValueType, StringRef>)
             {
-                getItemsImpl<ValueType>(
-                    requested_key_points,
-                    [&](size_t row) { return attribute_values_column->getDataAt(row); },
-                    [&](StringRef value) { result_column_typed.insertData(value.data, value.size); },
-                    default_value_provider);
+                if (is_short_circuit)
+                {
+                    getItemsShortCircuitImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return attribute_values_column->getDataAt(row); },
+                        [&](StringRef value) { result_column_typed.insertData(value.data, value.size); },
+                        default_mask.value());
+                }
+                else
+                {
+                    getItemsImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return attribute_values_column->getDataAt(row); },
+                        [&](StringRef value) { result_column_typed.insertData(value.data, value.size); },
+                        default_value_provider.value());
+                }
             }
             else
             {
                 auto & attribute_data = attribute_values_column_typed->getData();
                 auto & result_data = result_column_typed.getData();
 
-                getItemsImpl<ValueType>(
-                    requested_key_points,
-                    [&](size_t row) { return attribute_data[row]; },
-                    [&](auto value) { result_data.emplace_back(static_cast<AttributeType>(value)); },
-                    default_value_provider);
+                if (is_short_circuit)
+                {
+                    getItemsShortCircuitImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return attribute_data[row]; },
+                        [&](auto value) { result_data.emplace_back(static_cast<AttributeType>(value)); },
+                        default_mask.value());
+                }
+                else
+                {
+                    getItemsImpl<ValueType>(
+                        requested_key_points,
+                        [&](size_t row) { return attribute_data[row]; },
+                        [&](auto value) { result_data.emplace_back(static_cast<AttributeType>(value)); },
+                        default_value_provider.value());
+                }
             }
         };
 
@@ -393,6 +450,38 @@ void IPolygonDictionary::getItemsImpl(
     found_count.fetch_add(keys_found, std::memory_order_relaxed);
 }
 
+template <typename AttributeType, typename ValueGetter, typename ValueSetter>
+void IPolygonDictionary::getItemsShortCircuitImpl(
+    const std::vector<IPolygonDictionary::Point> & requested_key_points,
+    ValueGetter && get_value,
+    ValueSetter && set_value,
+    IColumn::Filter & default_mask) const
+{
+    size_t polygon_index = 0;
+    size_t keys_found = 0;
+    size_t requested_key_size = requested_key_points.size();
+    default_mask.resize(requested_key_size);
+
+    for (size_t requested_key_index = 0; requested_key_index < requested_key_size; ++requested_key_index)
+    {
+        const auto found = find(requested_key_points[requested_key_index], polygon_index);
+
+        if (found)
+        {
+            size_t attribute_values_index = polygon_index_to_attribute_value_index[polygon_index];
+            auto value = get_value(attribute_values_index);
+            set_value(value);
+            ++keys_found;
+            default_mask[requested_key_index] = 0;
+        }
+        else
+            default_mask[requested_key_index] = 1;
+    }
+
+    query_count.fetch_add(requested_key_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+}
+
 namespace
 {
 
diff --git a/src/Dictionaries/PolygonDictionary.h b/src/Dictionaries/PolygonDictionary.h
index a856d12b66c..e6eaa415c55 100644
--- a/src/Dictionaries/PolygonDictionary.h
+++ b/src/Dictionaries/PolygonDictionary.h
@@ -71,14 +71,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -100,11 +100,11 @@ public:
     void convertKeyColumns(Columns & key_columns, DataTypes & key_types) const override;
 
     ColumnPtr getColumn(
-        const std::string& attribute_name,
-        const DataTypePtr & result_type,
+        const std::string & attribute_name,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -155,6 +155,13 @@ private:
         ValueSetter && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename AttributeType, typename ValueGetter, typename ValueSetter>
+    void getItemsShortCircuitImpl(
+        const std::vector<IPolygonDictionary::Point> & requested_key_points,
+        ValueGetter && get_value,
+        ValueSetter && set_value,
+        IColumn::Filter & default_mask) const;
+
     ColumnPtr key_attribute_column;
 
     Columns attributes_columns;
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.cpp b/src/Dictionaries/PolygonDictionaryImplementations.cpp
index 3feca2ec410..64d29458430 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.cpp
+++ b/src/Dictionaries/PolygonDictionaryImplementations.cpp
@@ -29,7 +29,7 @@ PolygonDictionarySimple::PolygonDictionarySimple(
 {
 }
 
-std::shared_ptr<const IExternalLoadable> PolygonDictionarySimple::clone() const
+std::shared_ptr<IExternalLoadable> PolygonDictionarySimple::clone() const
 {
     return std::make_shared<PolygonDictionarySimple>(
             this->getDictionaryID(),
@@ -76,7 +76,7 @@ PolygonDictionaryIndexEach::PolygonDictionaryIndexEach(
     }
 }
 
-std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexEach::clone() const
+std::shared_ptr<IExternalLoadable> PolygonDictionaryIndexEach::clone() const
 {
     return std::make_shared<PolygonDictionaryIndexEach>(
             this->getDictionaryID(),
@@ -126,7 +126,7 @@ PolygonDictionaryIndexCell::PolygonDictionaryIndexCell(
 {
 }
 
-std::shared_ptr<const IExternalLoadable> PolygonDictionaryIndexCell::clone() const
+std::shared_ptr<IExternalLoadable> PolygonDictionaryIndexCell::clone() const
 {
     return std::make_shared<PolygonDictionaryIndexCell>(
             this->getDictionaryID(),
diff --git a/src/Dictionaries/PolygonDictionaryImplementations.h b/src/Dictionaries/PolygonDictionaryImplementations.h
index 912d501bcde..690ff3a0f1b 100644
--- a/src/Dictionaries/PolygonDictionaryImplementations.h
+++ b/src/Dictionaries/PolygonDictionaryImplementations.h
@@ -23,7 +23,7 @@ public:
             DictionaryLifetime dict_lifetime_,
             Configuration configuration_);
 
-    std::shared_ptr<const IExternalLoadable> clone() const override;
+    std::shared_ptr<IExternalLoadable> clone() const override;
 
 private:
     bool find(const Point & point, size_t & polygon_index) const override;
@@ -47,7 +47,7 @@ public:
             int min_intersections_,
             int max_depth_);
 
-    std::shared_ptr<const IExternalLoadable> clone() const override;
+    std::shared_ptr<IExternalLoadable> clone() const override;
 
     static constexpr size_t kMinIntersectionsDefault = 1;
     static constexpr size_t kMaxDepthDefault = 5;
@@ -75,7 +75,7 @@ public:
             size_t min_intersections_,
             size_t max_depth_);
 
-    std::shared_ptr<const IExternalLoadable> clone() const override;
+    std::shared_ptr<IExternalLoadable> clone() const override;
 
     static constexpr size_t kMinIntersectionsDefault = 1;
     static constexpr size_t kMaxDepthDefault = 5;
diff --git a/src/Dictionaries/PolygonDictionaryUtils.cpp b/src/Dictionaries/PolygonDictionaryUtils.cpp
index c28c7c15aa7..8f060fe7b8d 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.cpp
+++ b/src/Dictionaries/PolygonDictionaryUtils.cpp
@@ -69,7 +69,7 @@ const FinalCellWithSlabs * FinalCellWithSlabs::find(Coord, Coord) const
 
 SlabsPolygonIndex::SlabsPolygonIndex(
     const std::vector<Polygon> & polygons)
-    : log(&Poco::Logger::get("SlabsPolygonIndex")),
+    : log(getLogger("SlabsPolygonIndex")),
       sorted_x(uniqueX(polygons))
 {
     indexBuild(polygons);
@@ -267,7 +267,7 @@ bool SlabsPolygonIndex::find(const Point & point, size_t & id) const
     Coord y = point.y();
 
     /** Not in bounding box */
-    if (x < sorted_x[0] || x > sorted_x.back())
+    if (x < sorted_x.front() || x > sorted_x.back())
         return false;
 
     bool found = false;
diff --git a/src/Dictionaries/PolygonDictionaryUtils.h b/src/Dictionaries/PolygonDictionaryUtils.h
index 63d97e9dabd..0fd1fead456 100644
--- a/src/Dictionaries/PolygonDictionaryUtils.h
+++ b/src/Dictionaries/PolygonDictionaryUtils.h
@@ -83,7 +83,7 @@ private:
     /** Auxiliary function for adding ring to the index */
     void indexAddRing(const Ring & ring, size_t polygon_id);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /** Sorted distinct coordinates of all vertices */
     std::vector<Coord> sorted_x;
@@ -157,6 +157,12 @@ public:
         auto y_ratio = y * kSplit;
         auto x_bin = static_cast<int>(x_ratio);
         auto y_bin = static_cast<int>(y_ratio);
+        /// In case if we have a lot of values and argument is very close to max_x (max_y) so x_ratio (y_ratio) = 1.
+        if (x_bin == kSplit)
+            --x_bin;
+        /// => x_bin (y_bin) will be 4, which can lead to wrong vector access.
+        if (y_bin == kSplit)
+            --y_bin;
         return children[y_bin + x_bin * kSplit]->find(x_ratio - x_bin, y_ratio - y_bin);
     }
 
@@ -208,7 +214,7 @@ public:
     static constexpr Coord kEps = 1e-4f;
 
 private:
-    std::unique_ptr<ICell<ReturnCell>> root = nullptr;
+    std::unique_ptr<ICell<ReturnCell>> root;
     Coord min_x = 0, min_y = 0;
     Coord max_x = 0, max_y = 0;
     const size_t k_min_intersections;
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.cpp b/src/Dictionaries/PostgreSQLDictionarySource.cpp
index 8ec78308392..c7401386e40 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.cpp
+++ b/src/Dictionaries/PostgreSQLDictionarySource.cpp
@@ -57,7 +57,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(
     , configuration(configuration_)
     , pool(std::move(pool_))
     , sample_block(sample_block_)
-    , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
+    , log(getLogger("PostgreSQLDictionarySource"))
     , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.query, configuration.where))
     , load_all_query(query_builder.composeLoadAllQuery())
 {
@@ -70,7 +70,7 @@ PostgreSQLDictionarySource::PostgreSQLDictionarySource(const PostgreSQLDictionar
     , configuration(other.configuration)
     , pool(other.pool)
     , sample_block(other.sample_block)
-    , log(&Poco::Logger::get("PostgreSQLDictionarySource"))
+    , log(getLogger("PostgreSQLDictionarySource"))
     , query_builder(makeExternalQueryBuilder(dict_struct, configuration.schema, configuration.table, configuration.query, configuration.where))
     , load_all_query(query_builder.composeLoadAllQuery())
     , update_time(other.update_time)
diff --git a/src/Dictionaries/PostgreSQLDictionarySource.h b/src/Dictionaries/PostgreSQLDictionarySource.h
index 1305333458b..3070184ab3d 100644
--- a/src/Dictionaries/PostgreSQLDictionarySource.h
+++ b/src/Dictionaries/PostgreSQLDictionarySource.h
@@ -61,7 +61,7 @@ private:
     const Configuration configuration;
     postgres::PoolWithFailoverPtr pool;
     Block sample_block;
-    Poco::Logger * log;
+    LoggerPtr log;
     ExternalQueryBuilder query_builder;
     const std::string load_all_query;
     std::chrono::time_point<std::chrono::system_clock> update_time;
diff --git a/src/Dictionaries/RangeHashedDictionary.cpp b/src/Dictionaries/RangeHashedDictionary.cpp
new file mode 100644
index 00000000000..30a0123ade6
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionary.cpp
@@ -0,0 +1,225 @@
+#include <Dictionaries/RangeHashedDictionary.h>
+
+namespace DB
+{
+
+template <DictionaryKeyType dictionary_key_type>
+ColumnPtr RangeHashedDictionary<dictionary_key_type>::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr & attribute_type,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    DefaultOrFilter default_or_filter) const
+{
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
+    if (dictionary_key_type == DictionaryKeyType::Complex)
+    {
+        auto key_types_copy = key_types;
+        key_types_copy.pop_back();
+        dict_struct.validateKeyTypes(key_types_copy);
+    }
+
+    ColumnPtr result;
+
+    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, attribute_type);
+    const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
+    const auto & attribute = attributes[attribute_index];
+
+    /// Cast range column to storage type
+    Columns modified_key_columns = key_columns;
+    const ColumnPtr & range_storage_column = key_columns.back();
+    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types.back(), ""};
+    modified_key_columns.back() = castColumnAccurate(column_to_cast, dict_struct.range_min->type);
+
+    size_t keys_size = key_columns.front()->size();
+    bool is_attribute_nullable = attribute.is_value_nullable.has_value();
+
+    ColumnUInt8::MutablePtr col_null_map_to;
+    ColumnUInt8::Container * vec_null_map_to = nullptr;
+    if (is_attribute_nullable)
+    {
+        col_null_map_to = ColumnUInt8::create(keys_size, false);
+        vec_null_map_to = &col_null_map_to->getData();
+    }
+
+    auto type_call = [&](const auto & dictionary_attribute_type)
+    {
+        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
+        using AttributeType = typename Type::AttributeType;
+        using ValueType = DictionaryValueType<AttributeType>;
+        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
+
+        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
+
+        if (is_short_circuit)
+        {
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            size_t keys_found = 0;
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
+
+                keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                    attribute,
+                    modified_key_columns,
+                    [&](size_t, const Array & value, bool)
+                    {
+                        out->insert(value);
+                    },
+                    default_mask);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t, StringRef value, bool)
+                        {
+                            out->insertData(value.data, value.size);
+                        },
+                        default_mask);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    keys_found = getItemsShortCircuitImpl<ValueType, true>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_mask);
+                else
+                    keys_found = getItemsShortCircuitImpl<ValueType, false>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, const auto value, bool)
+                        {
+                            out[row] = value;
+                        },
+                        default_mask);
+
+                out.resize(keys_found);
+            }
+
+            if (is_attribute_nullable)
+                vec_null_map_to->resize(keys_found);
+        }
+        else
+        {
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+
+            DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(
+            dictionary_attribute.null_value, default_values_column);
+
+            if constexpr (std::is_same_v<ValueType, Array>)
+            {
+                auto * out = column.get();
+
+                getItemsImpl<ValueType, false>(
+                    attribute,
+                    modified_key_columns,
+                    [&](size_t, const Array & value, bool)
+                    {
+                        out->insert(value);
+                    },
+                    default_value_extractor);
+            }
+            else if constexpr (std::is_same_v<ValueType, StringRef>)
+            {
+                auto * out = column.get();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, StringRef value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out->insertData(value.data, value.size);
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t, StringRef value, bool)
+                        {
+                            out->insertData(value.data, value.size);
+                        },
+                        default_value_extractor);
+            }
+            else
+            {
+                auto & out = column->getData();
+
+                if (is_attribute_nullable)
+                    getItemsImpl<ValueType, true>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, const auto value, bool is_null)
+                        {
+                            (*vec_null_map_to)[row] = is_null;
+                            out[row] = value;
+                        },
+                        default_value_extractor);
+                else
+                    getItemsImpl<ValueType, false>(
+                        attribute,
+                        modified_key_columns,
+                        [&](size_t row, const auto value, bool)
+                        {
+                            out[row] = value;
+                        },
+                        default_value_extractor);
+            }
+        }
+
+        result = std::move(column);
+    };
+
+    callOnDictionaryAttributeType(attribute.type, type_call);
+
+    if (is_attribute_nullable)
+        result = ColumnNullable::create(result, std::move(col_null_map_to));
+
+    return result;
+}
+
+template
+ColumnPtr RangeHashedDictionary<DictionaryKeyType::Simple>::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr & attribute_type,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    DefaultOrFilter default_or_filter) const;
+
+template
+ColumnPtr RangeHashedDictionary<DictionaryKeyType::Complex>::getColumn(
+    const std::string & attribute_name,
+    const DataTypePtr & attribute_type,
+    const Columns & key_columns,
+    const DataTypes & key_types,
+    DefaultOrFilter default_or_filter) const;
+
+}
diff --git a/src/Dictionaries/RangeHashedDictionary.h b/src/Dictionaries/RangeHashedDictionary.h
index c44bffe42e1..bf004dbe32b 100644
--- a/src/Dictionaries/RangeHashedDictionary.h
+++ b/src/Dictionaries/RangeHashedDictionary.h
@@ -15,6 +15,8 @@
 #include <Dictionaries/IDictionary.h>
 #include <Dictionaries/IDictionarySource.h>
 #include <Dictionaries/DictionaryHelpers.h>
+#include <Dictionaries/DictionarySource.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -29,11 +31,6 @@
 #include <Functions/FunctionHelpers.h>
 #include <Interpreters/castColumn.h>
 
-#include <Dictionaries/ClickHouseDictionarySource.h>
-#include <Dictionaries/DictionarySource.h>
-#include <Dictionaries/DictionarySourceHelpers.h>
-
-
 namespace DB
 {
 
@@ -46,7 +43,6 @@ namespace ErrorCodes
     extern const int TYPE_MISMATCH;
 }
 
-
 enum class RangeHashedDictionaryLookupStrategy : uint8_t
 {
     min,
@@ -85,14 +81,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        size_t queries = query_count.load(std::memory_order_relaxed);
+        size_t queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -101,7 +97,7 @@ public:
 
     double getLoadFactor() const override { return static_cast<double>(element_count) / bucket_count; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         auto result = std::make_shared<RangeHashedDictionary>(
             getDictionaryID(),
@@ -131,10 +127,10 @@ public:
 
     ColumnPtr getColumn(
         const std::string & attribute_name,
-        const DataTypePtr & result_type,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override;
+        DefaultOrFilter default_or_filter) const override;
 
     ColumnUInt8::Ptr hasKeys(const Columns & key_columns, const DataTypes & key_types) const override;
 
@@ -238,13 +234,23 @@ private:
 
     static Attribute createAttribute(const DictionaryAttribute & dictionary_attribute);
 
-    template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
+    template <typename ValueType>
+    using ValueSetterFunc = std::function<void(size_t, const ValueType &, bool)>;
+
+    template <typename ValueType, bool is_nullable, typename DefaultValueExtractor>
     void getItemsImpl(
         const Attribute & attribute,
         const Columns & key_columns,
-        ValueSetter && set_value,
+        ValueSetterFunc<ValueType> && set_value,
         DefaultValueExtractor & default_value_extractor) const;
 
+    template <typename ValueType, bool is_nullable>
+    size_t getItemsShortCircuitImpl(
+        const Attribute & attribute,
+        const Columns & key_columns,
+        ValueSetterFunc<ValueType> && set_value,
+        IColumn::Filter & default_mask) const;
+
     ColumnPtr getColumnInternal(
         const std::string & attribute_name,
         const DataTypePtr & result_type,
@@ -282,7 +288,7 @@ private:
 extern template class RangeHashedDictionary<DictionaryKeyType::Simple>;
 extern template class RangeHashedDictionary<DictionaryKeyType::Complex>;
 
-namespace
+namespace impl
 {
     template <typename F>
     void callOnRangeType(const DataTypePtr & range_type, F && func)
@@ -334,128 +340,6 @@ RangeHashedDictionary<dictionary_key_type>::RangeHashedDictionary(
     calculateBytesAllocated();
 }
 
-template <DictionaryKeyType dictionary_key_type>
-ColumnPtr RangeHashedDictionary<dictionary_key_type>::getColumn(
-    const std::string & attribute_name,
-    const DataTypePtr & result_type,
-    const Columns & key_columns,
-    const DataTypes & key_types,
-    const ColumnPtr & default_values_column) const
-{
-    if (dictionary_key_type == DictionaryKeyType::Complex)
-    {
-        auto key_types_copy = key_types;
-        key_types_copy.pop_back();
-        dict_struct.validateKeyTypes(key_types_copy);
-    }
-
-    ColumnPtr result;
-
-    const auto & dictionary_attribute = dict_struct.getAttribute(attribute_name, result_type);
-    const size_t attribute_index = dict_struct.attribute_name_to_index.find(attribute_name)->second;
-    const auto & attribute = attributes[attribute_index];
-
-    /// Cast range column to storage type
-    Columns modified_key_columns = key_columns;
-    const ColumnPtr & range_storage_column = key_columns.back();
-    ColumnWithTypeAndName column_to_cast = {range_storage_column->convertToFullColumnIfConst(), key_types.back(), ""};
-    modified_key_columns.back() = castColumnAccurate(column_to_cast, dict_struct.range_min->type);
-
-    size_t keys_size = key_columns.front()->size();
-    bool is_attribute_nullable = attribute.is_value_nullable.has_value();
-
-    ColumnUInt8::MutablePtr col_null_map_to;
-    ColumnUInt8::Container * vec_null_map_to = nullptr;
-    if (is_attribute_nullable)
-    {
-        col_null_map_to = ColumnUInt8::create(keys_size, false);
-        vec_null_map_to = &col_null_map_to->getData();
-    }
-
-    auto type_call = [&](const auto & dictionary_attribute_type)
-    {
-        using Type = std::decay_t<decltype(dictionary_attribute_type)>;
-        using AttributeType = typename Type::AttributeType;
-        using ValueType = DictionaryValueType<AttributeType>;
-        using ColumnProvider = DictionaryAttributeColumnProvider<AttributeType>;
-
-        DictionaryDefaultValueExtractor<AttributeType> default_value_extractor(dictionary_attribute.null_value, default_values_column);
-
-        auto column = ColumnProvider::getColumn(dictionary_attribute, keys_size);
-
-        if constexpr (std::is_same_v<ValueType, Array>)
-        {
-            auto * out = column.get();
-
-            getItemsImpl<ValueType, false>(
-                attribute,
-                modified_key_columns,
-                [&](size_t, const Array & value, bool)
-                {
-                    out->insert(value);
-                },
-                default_value_extractor);
-        }
-        else if constexpr (std::is_same_v<ValueType, StringRef>)
-        {
-            auto * out = column.get();
-
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    modified_key_columns,
-                    [&](size_t row, StringRef value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out->insertData(value.data, value.size);
-                    },
-                    default_value_extractor);
-            else
-                getItemsImpl<ValueType, false>(
-                    attribute,
-                    modified_key_columns,
-                    [&](size_t, StringRef value, bool)
-                    {
-                        out->insertData(value.data, value.size);
-                    },
-                    default_value_extractor);
-        }
-        else
-        {
-            auto & out = column->getData();
-
-            if (is_attribute_nullable)
-                getItemsImpl<ValueType, true>(
-                    attribute,
-                    modified_key_columns,
-                    [&](size_t row, const auto value, bool is_null)
-                    {
-                        (*vec_null_map_to)[row] = is_null;
-                        out[row] = value;
-                    },
-                    default_value_extractor);
-            else
-                getItemsImpl<ValueType, false>(
-                    attribute,
-                    modified_key_columns,
-                    [&](size_t row, const auto value, bool)
-                    {
-                        out[row] = value;
-                    },
-                    default_value_extractor);
-        }
-
-        result = std::move(column);
-    };
-
-    callOnDictionaryAttributeType(attribute.type, type_call);
-
-    if (is_attribute_nullable)
-        result = ColumnNullable::create(result, std::move(col_null_map_to));
-
-    return result;
-}
-
 template <DictionaryKeyType dictionary_key_type>
 ColumnPtr RangeHashedDictionary<dictionary_key_type>::getColumnInternal(
     const std::string & attribute_name,
@@ -581,7 +465,7 @@ ColumnUInt8::Ptr RangeHashedDictionary<dictionary_key_type>::hasKeys(const Colum
     auto & out = result->getData();
     size_t keys_found = 0;
 
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
@@ -639,7 +523,7 @@ void RangeHashedDictionary<dictionary_key_type>::createAttributes()
                             getDictionaryID().getNameForLogs());
     }
 
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
@@ -669,7 +553,7 @@ void RangeHashedDictionary<dictionary_key_type>::loadData()
         updateData();
     }
 
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
@@ -689,7 +573,7 @@ void RangeHashedDictionary<dictionary_key_type>::loadData()
 template <DictionaryKeyType dictionary_key_type>
 void RangeHashedDictionary<dictionary_key_type>::calculateBytesAllocated()
 {
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
@@ -754,119 +638,6 @@ typename RangeHashedDictionary<dictionary_key_type>::Attribute RangeHashedDictio
     return attribute;
 }
 
-template <DictionaryKeyType dictionary_key_type>
-template <typename AttributeType, bool is_nullable, typename ValueSetter, typename DefaultValueExtractor>
-void RangeHashedDictionary<dictionary_key_type>::getItemsImpl(
-    const Attribute & attribute,
-    const Columns & key_columns,
-    ValueSetter && set_value,
-    DefaultValueExtractor & default_value_extractor) const
-{
-    const auto & attribute_container = std::get<AttributeContainerType<AttributeType>>(attribute.container);
-
-    size_t keys_found = 0;
-
-    const ColumnPtr & range_column = key_columns.back();
-    auto key_columns_copy = key_columns;
-    key_columns_copy.pop_back();
-
-    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
-    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns_copy, arena_holder.getComplexKeyArena());
-    const size_t keys_size = keys_extractor.getKeysSize();
-
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
-    {
-        using Types = std::decay_t<decltype(types)>;
-        using RangeColumnType = typename Types::LeftType;
-        using RangeStorageType = typename RangeColumnType::ValueType;
-        using RangeInterval = Interval<RangeStorageType>;
-
-        const auto * range_column_typed = typeid_cast<const RangeColumnType *>(range_column.get());
-        if (!range_column_typed)
-            throw Exception(ErrorCodes::TYPE_MISMATCH,
-                "Dictionary {} range column type should be equal to {}",
-                getFullName(),
-                dict_struct.range_min->type->getName());
-
-        const auto & range_column_data = range_column_typed->getData();
-
-        const auto & key_attribute_container = std::get<KeyAttributeContainerType<RangeStorageType>>(key_attribute.container);
-
-        for (size_t key_index = 0; key_index < keys_size; ++key_index)
-        {
-            auto key = keys_extractor.extractCurrentKey();
-            const auto it = key_attribute_container.find(key);
-
-            if (it)
-            {
-                const auto date = range_column_data[key_index];
-                const auto & interval_tree = it->getMapped();
-
-                size_t value_index = 0;
-                std::optional<RangeInterval> range;
-
-                interval_tree.find(date, [&](auto & interval, auto & interval_value_index)
-                {
-                    if (range)
-                    {
-                        if (likely(configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::min) && interval < *range)
-                        {
-                            range = interval;
-                            value_index = interval_value_index;
-                        }
-                        else if (configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::max && interval > * range)
-                        {
-                            range = interval;
-                            value_index = interval_value_index;
-                        }
-                    }
-                    else
-                    {
-                        range = interval;
-                        value_index = interval_value_index;
-                    }
-
-                    return true;
-                });
-
-                if (range.has_value())
-                {
-                    ++keys_found;
-
-                    AttributeType value = attribute_container[value_index];
-
-                    if constexpr (is_nullable)
-                    {
-                        bool is_null = (*attribute.is_value_nullable)[value_index];
-
-                        if (!is_null)
-                            set_value(key_index, value, false);
-                        else
-                            set_value(key_index, default_value_extractor[key_index], true);
-                    }
-                    else
-                    {
-                        set_value(key_index, value, false);
-                    }
-
-                    keys_extractor.rollbackCurrentKey();
-                    continue;
-                }
-            }
-
-            if constexpr (is_nullable)
-                set_value(key_index, default_value_extractor[key_index], default_value_extractor.isNullAt(key_index));
-            else
-                set_value(key_index, default_value_extractor[key_index], false);
-
-            keys_extractor.rollbackCurrentKey();
-        }
-    });
-
-    query_count.fetch_add(keys_size, std::memory_order_relaxed);
-    found_count.fetch_add(keys_found, std::memory_order_relaxed);
-}
-
 template <DictionaryKeyType dictionary_key_type>
 template <typename AttributeType, bool is_nullable, typename ValueSetter>
 void RangeHashedDictionary<dictionary_key_type>::getItemsInternalImpl(
@@ -1012,7 +783,7 @@ void RangeHashedDictionary<dictionary_key_type>::blockToAttributes(const Block &
         max_range_null_map = &max_range_column_nullable->getNullMapColumn().getData();
     }
 
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
@@ -1159,7 +930,7 @@ Pipe RangeHashedDictionary<dictionary_key_type>::read(const Names & column_names
 
     PaddedPODArray<KeyType> keys;
 
-    callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
+    impl::callOnRangeType(dict_struct.range_min->type, [&](const auto & types)
     {
         using Types = std::decay_t<decltype(types)>;
         using RangeColumnType = typename Types::LeftType;
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImpl.txx b/src/Dictionaries/RangeHashedDictionaryGetItemsImpl.txx
new file mode 100644
index 00000000000..8ed4445f236
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImpl.txx
@@ -0,0 +1,133 @@
+#include <Dictionaries/RangeHashedDictionary.h>
+
+#define INSTANTIATE_GET_ITEMS_IMPL(DictionaryKeyType, IsNullable, AttributeType, ValueType) \
+template void RangeHashedDictionary<DictionaryKeyType>::getItemsImpl<ValueType, IsNullable, DictionaryDefaultValueExtractor<AttributeType>>( \
+    const Attribute & attribute,\
+    const Columns & key_columns,\
+    typename RangeHashedDictionary<DictionaryKeyType>::ValueSetterFunc<ValueType> && set_value,\
+    DictionaryDefaultValueExtractor<AttributeType> & default_value_extractor) const;
+
+#define INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(AttributeType) \
+    INSTANTIATE_GET_ITEMS_IMPL(DictionaryKeyType::Simple, true, AttributeType, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_IMPL(DictionaryKeyType::Simple, false, AttributeType, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_IMPL(DictionaryKeyType::Complex, true, AttributeType, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_IMPL(DictionaryKeyType::Complex, false, AttributeType, DictionaryValueType<AttributeType>)
+
+namespace DB
+{
+
+template <DictionaryKeyType dictionary_key_type>
+template <typename ValueType, bool is_nullable, typename DefaultValueExtractor>
+void RangeHashedDictionary<dictionary_key_type>::getItemsImpl(
+    const Attribute & attribute,
+    const Columns & key_columns,
+    typename RangeHashedDictionary<dictionary_key_type>::ValueSetterFunc<ValueType> && set_value,
+    DefaultValueExtractor & default_value_extractor) const
+{
+    const auto & attribute_container = std::get<AttributeContainerType<ValueType>>(attribute.container);
+
+
+    size_t keys_found = 0;
+
+    const ColumnPtr & range_column = key_columns.back();
+    auto key_columns_copy = key_columns;
+    key_columns_copy.pop_back();
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns_copy, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+
+    impl::callOnRangeType(
+        dict_struct.range_min->type,
+        [&](const auto & types)
+        {
+            using Types = std::decay_t<decltype(types)>;
+            using RangeColumnType = typename Types::LeftType;
+            using RangeStorageType = typename RangeColumnType::ValueType;
+            using RangeInterval = Interval<RangeStorageType>;
+
+            const auto * range_column_typed = typeid_cast<const RangeColumnType *>(range_column.get());
+            if (!range_column_typed)
+                throw Exception(
+                    ErrorCodes::TYPE_MISMATCH,
+                    "Dictionary {} range column type should be equal to {}",
+                    getFullName(),
+                    dict_struct.range_min->type->getName());
+
+            const auto & range_column_data = range_column_typed->getData();
+
+            const auto & key_attribute_container = std::get<KeyAttributeContainerType<RangeStorageType>>(key_attribute.container);
+
+            for (size_t key_index = 0; key_index < keys_size; ++key_index)
+            {
+                auto key = keys_extractor.extractCurrentKey();
+                const auto it = key_attribute_container.find(key);
+
+                if (it)
+                {
+                    const auto date = range_column_data[key_index];
+                    const auto & interval_tree = it->getMapped();
+
+                    size_t value_index = 0;
+                    std::optional<RangeInterval> range;
+
+                    interval_tree.find(
+                        date,
+                        [&](auto & interval, auto & interval_value_index)
+                        {
+                            if (range)
+                            {
+                                if (likely(configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::min) && interval < *range)
+                                {
+                                    range = interval;
+                                    value_index = interval_value_index;
+                                }
+                                else if (configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::max && interval > *range)
+                                {
+                                    range = interval;
+                                    value_index = interval_value_index;
+                                }
+                            }
+                            else
+                            {
+                                range = interval;
+                                value_index = interval_value_index;
+                            }
+
+                            return true;
+                        });
+
+                    if (range.has_value())
+                    {
+                        ++keys_found;
+
+                        ValueType value = attribute_container[value_index];
+
+                        if constexpr (is_nullable)
+                        {
+                            bool is_null = (*attribute.is_value_nullable)[value_index];
+                            set_value(key_index, value, is_null);
+                        }
+                        else
+                        {
+                            set_value(key_index, value, false);
+                        }
+
+                        keys_extractor.rollbackCurrentKey();
+                        continue;
+                    }
+                }
+
+                if constexpr (is_nullable)
+                    set_value(key_index, default_value_extractor[key_index], default_value_extractor.isNullAt(key_index));
+                else
+                    set_value(key_index, default_value_extractor[key_index], false);
+
+                keys_extractor.rollbackCurrentKey();
+            }
+        });
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+}
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImplDecimal.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsImplDecimal.cpp
new file mode 100644
index 00000000000..f1ee4dd58e1
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImplDecimal.cpp
@@ -0,0 +1,10 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Decimal32);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Decimal64);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Decimal128);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Decimal256);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(DateTime64);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImplFloat.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsImplFloat.cpp
new file mode 100644
index 00000000000..291a55a76db
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImplFloat.cpp
@@ -0,0 +1,7 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Float32);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Float64);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImplInt.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsImplInt.cpp
new file mode 100644
index 00000000000..a0748a9f486
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImplInt.cpp
@@ -0,0 +1,11 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int8);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int16);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int32);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int64);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int128);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Int256);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImplOthers.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsImplOthers.cpp
new file mode 100644
index 00000000000..96e5bb54d0b
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImplOthers.cpp
@@ -0,0 +1,10 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UUID);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(IPv4);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(IPv6);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(String);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(Array);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsImplUInt.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsImplUInt.cpp
new file mode 100644
index 00000000000..e60a7189a2d
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsImplUInt.cpp
@@ -0,0 +1,11 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt8);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt16);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt32);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt64);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt128);
+INSTANTIATE_GET_ITEMS_IMPL_FOR_ATTRIBUTE_TYPE(UInt256);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx
new file mode 100644
index 00000000000..63c29f8cc34
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx
@@ -0,0 +1,132 @@
+#include <Dictionaries/RangeHashedDictionary.h>
+
+#define INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL(DictionaryKeyType, IsNullable, ValueType) \
+    template size_t RangeHashedDictionary<DictionaryKeyType>::getItemsShortCircuitImpl<ValueType, IsNullable>( \
+        const Attribute & attribute, \
+        const Columns & key_columns, \
+        typename RangeHashedDictionary<DictionaryKeyType>::ValueSetterFunc<ValueType> && set_value, \
+        IColumn::Filter & default_mask) const;
+
+#define INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(AttributeType) \
+    INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL(DictionaryKeyType::Simple, true, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL(DictionaryKeyType::Simple, false, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL(DictionaryKeyType::Complex, true, DictionaryValueType<AttributeType>) \
+    INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL(DictionaryKeyType::Complex, false, DictionaryValueType<AttributeType>)
+
+namespace DB
+{
+
+template <DictionaryKeyType dictionary_key_type>
+template <typename ValueType, bool is_nullable>
+size_t RangeHashedDictionary<dictionary_key_type>::getItemsShortCircuitImpl(
+    const Attribute & attribute,
+    const Columns & key_columns,
+    typename RangeHashedDictionary<dictionary_key_type>::ValueSetterFunc<ValueType> && set_value,
+    IColumn::Filter & default_mask) const
+{
+    const auto & attribute_container = std::get<AttributeContainerType<ValueType>>(attribute.container);
+
+    size_t keys_found = 0;
+
+    const ColumnPtr & range_column = key_columns.back();
+    auto key_columns_copy = key_columns;
+    key_columns_copy.pop_back();
+
+    DictionaryKeysArenaHolder<dictionary_key_type> arena_holder;
+    DictionaryKeysExtractor<dictionary_key_type> keys_extractor(key_columns_copy, arena_holder.getComplexKeyArena());
+    const size_t keys_size = keys_extractor.getKeysSize();
+    default_mask.resize(keys_size);
+
+    impl::callOnRangeType(
+        dict_struct.range_min->type,
+        [&](const auto & types)
+        {
+            using Types = std::decay_t<decltype(types)>;
+            using RangeColumnType = typename Types::LeftType;
+            using RangeStorageType = typename RangeColumnType::ValueType;
+            using RangeInterval = Interval<RangeStorageType>;
+
+            const auto * range_column_typed = typeid_cast<const RangeColumnType *>(range_column.get());
+            if (!range_column_typed)
+                throw Exception(
+                    ErrorCodes::TYPE_MISMATCH,
+                    "Dictionary {} range column type should be equal to {}",
+                    getFullName(),
+                    dict_struct.range_min->type->getName());
+
+            const auto & range_column_data = range_column_typed->getData();
+
+            const auto & key_attribute_container = std::get<KeyAttributeContainerType<RangeStorageType>>(key_attribute.container);
+
+            for (size_t key_index = 0; key_index < keys_size; ++key_index)
+            {
+                auto key = keys_extractor.extractCurrentKey();
+                const auto it = key_attribute_container.find(key);
+
+                if (it)
+                {
+                    const auto date = range_column_data[key_index];
+                    const auto & interval_tree = it->getMapped();
+
+                    size_t value_index = 0;
+                    std::optional<RangeInterval> range;
+
+                    interval_tree.find(
+                        date,
+                        [&](auto & interval, auto & interval_value_index)
+                        {
+                            if (range)
+                            {
+                                if (likely(configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::min) && interval < *range)
+                                {
+                                    range = interval;
+                                    value_index = interval_value_index;
+                                }
+                                else if (configuration.lookup_strategy == RangeHashedDictionaryLookupStrategy::max && interval > *range)
+                                {
+                                    range = interval;
+                                    value_index = interval_value_index;
+                                }
+                            }
+                            else
+                            {
+                                range = interval;
+                                value_index = interval_value_index;
+                            }
+
+                            return true;
+                        });
+
+                    if (range.has_value())
+                    {
+                        default_mask[key_index] = 0;
+                        ++keys_found;
+
+                        ValueType value = attribute_container[value_index];
+
+                        if constexpr (is_nullable)
+                        {
+                            bool is_null = (*attribute.is_value_nullable)[value_index];
+                            set_value(key_index, value, is_null);
+                        }
+                        else
+                        {
+                            set_value(key_index, value, false);
+                        }
+
+                        keys_extractor.rollbackCurrentKey();
+                        continue;
+                    }
+                }
+
+                default_mask[key_index] = 1;
+
+                keys_extractor.rollbackCurrentKey();
+            }
+        });
+
+    query_count.fetch_add(keys_size, std::memory_order_relaxed);
+    found_count.fetch_add(keys_found, std::memory_order_relaxed);
+    return keys_found;
+}
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplDecimal.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplDecimal.cpp
new file mode 100644
index 00000000000..298369e4735
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplDecimal.cpp
@@ -0,0 +1,10 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Decimal32);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Decimal64);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Decimal128);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Decimal256);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(DateTime64);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplFloat.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplFloat.cpp
new file mode 100644
index 00000000000..e8e8da6c75e
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplFloat.cpp
@@ -0,0 +1,7 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Float32);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Float64);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplInt.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplInt.cpp
new file mode 100644
index 00000000000..c685b9b5331
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplInt.cpp
@@ -0,0 +1,11 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int8);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int16);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int32);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int64);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int128);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Int256);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplOthers.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplOthers.cpp
new file mode 100644
index 00000000000..46ea141b59b
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplOthers.cpp
@@ -0,0 +1,10 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UUID);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(IPv4);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(IPv6);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(String);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(Array);
+}
diff --git a/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplUInt.cpp b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplUInt.cpp
new file mode 100644
index 00000000000..18421fd7e2d
--- /dev/null
+++ b/src/Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImplUInt.cpp
@@ -0,0 +1,11 @@
+#include <Dictionaries/RangeHashedDictionaryGetItemsShortCircuitImpl.txx>
+
+namespace DB
+{
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt8);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt16);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt32);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt64);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt128);
+INSTANTIATE_GET_ITEMS_SHORT_CIRCUIT_IMPL_FOR_ATTRIBUTE_TYPE(UInt256);
+}
diff --git a/src/Dictionaries/RegExpTreeDictionary.cpp b/src/Dictionaries/RegExpTreeDictionary.cpp
index bbd101d55aa..a3f243b49d7 100644
--- a/src/Dictionaries/RegExpTreeDictionary.cpp
+++ b/src/Dictionaries/RegExpTreeDictionary.cpp
@@ -27,6 +27,7 @@
 #include <Dictionaries/DictionaryHelpers.h>
 #include <Dictionaries/DictionaryStructure.h>
 #include <Dictionaries/DictionarySourceHelpers.h>
+#include <Dictionaries/DictionaryPipelineExecutor.h>
 #include <Dictionaries/RegExpTreeDictionary.h>
 #include <Dictionaries/YAMLRegExpTreeDictionarySource.h>
 
@@ -48,6 +49,7 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
     extern const int INCORRECT_DICTIONARY_DEFINITION;
     extern const int LOGICAL_ERROR;
+    extern const int TYPE_MISMATCH;
 }
 
 const std::string kRegExp = "regexp";
@@ -139,7 +141,7 @@ struct RegExpTreeDictionary::RegexTreeNode
     std::unordered_map<String, AttributeValue> attributes;
 };
 
-std::vector<StringPiece> createStringPieces(const String & value, int num_captures, const String & regex, Poco::Logger * logger)
+std::vector<StringPiece> createStringPieces(const String & value, int num_captures, const String & regex, LoggerPtr logger)
 {
     std::vector<StringPiece> result;
     String literal;
@@ -401,7 +403,7 @@ RegExpTreeDictionary::RegExpTreeDictionary(
       use_vectorscan(use_vectorscan_),
       flag_case_insensitive(flag_case_insensitive_),
       flag_dotall(flag_dotall_),
-      logger(&Poco::Logger::get("RegExpTreeDictionary"))
+      logger(getLogger("RegExpTreeDictionary"))
 {
     if (auto * ch_source = typeid_cast<ClickHouseDictionarySource *>(source_ptr.get()))
     {
@@ -438,7 +440,7 @@ public:
     constexpr bool collecting() const { return collect_values_limit != std::nullopt; }
 
     // Add a name-value pair to the collection if there's space
-    void add(const String & attr_name, Field field)
+    void add(const String & attr_name, Field field, std::unordered_set<String> * const defaults = nullptr)
     {
         if (collect_values_limit)
         {
@@ -453,15 +455,26 @@ public:
                     n_full_attributes++;
             }
         }
-        else if (!this->contains(attr_name))
+        else if (!this->contains(attr_name) && (!defaults || !defaults->contains(attr_name)))
         {
             (*this)[attr_name] = std::move(field);
             n_full_attributes++;
         }
     }
 
+    // Just occupy a space
+    void addDefault(const String & attr_name, std::unordered_set<String> * const defaults)
+    {
+        assert (!collect_values_limit);
+        if (!this->contains(attr_name) && !defaults->contains(attr_name))
+        {
+            defaults->insert(attr_name);
+            n_full_attributes++;
+        }
+    }
+
     // Checks if no more values can be added for a given attribute
-    inline bool full(const String & attr_name) const
+    inline bool full(const String & attr_name, std::unordered_set<String> * const defaults = nullptr) const
     {
         if (collect_values_limit)
         {
@@ -472,7 +485,7 @@ public:
         }
         else
         {
-            return this->contains(attr_name);
+            return this->contains(attr_name) || (defaults && defaults->contains(attr_name));
         }
     }
 
@@ -550,6 +563,51 @@ bool RegExpTreeDictionary::setAttributes(
     return attributes_to_set.attributesFull() == attributes.size();
 }
 
+bool RegExpTreeDictionary::setAttributesShortCircuit(
+    UInt64 id,
+    AttributeCollector & attributes_to_set,
+    const String & data,
+    std::unordered_set<UInt64> & visited_nodes,
+    const std::unordered_map<String, const DictionaryAttribute &> & attributes,
+    std::unordered_set<String> * defaults) const
+{
+    if (visited_nodes.contains(id))
+        return attributes_to_set.attributesFull() == attributes.size();
+    visited_nodes.emplace(id);
+    const auto & node_attributes = regex_nodes.at(id)->attributes;
+    for (const auto & [name_, value] : node_attributes)
+    {
+        if (!attributes.contains(name_) || attributes_to_set.full(name_, defaults))
+            continue;
+
+        if (value.containsBackRefs())
+        {
+            auto [updated_str, use_default] = processBackRefs(data, regex_nodes.at(id)->searcher, value.pieces);
+            if (use_default)
+            {
+                // Back-ref processing failed.
+                // - If not collecting values, set the default value immediately while we're still on this node.
+                //   Otherwise, a value from a different node could take its place before we set it to the default value post-walk.
+                // - If collecting values, don't add anything. If we find no other matches for this attribute,
+                //   then we'll set its value to the default Array value later.
+                if (!attributes_to_set.collecting())
+                    attributes_to_set.addDefault(name_, defaults);
+            }
+            else
+                attributes_to_set.add(name_, parseStringToField(updated_str, attributes.at(name_).type), defaults);
+        }
+        else
+            attributes_to_set.add(name_, value.field, defaults);
+    }
+
+    auto parent_id = regex_nodes.at(id)->parent_id;
+    if (parent_id > 0)
+        setAttributesShortCircuit(parent_id, attributes_to_set, data, visited_nodes, attributes, defaults);
+
+    /// if all attributes are full, we can stop walking the tree
+    return attributes_to_set.attributesFull() == attributes.size();
+}
+
 /// a temp struct to store all the matched result.
 struct MatchContext
 {
@@ -619,9 +677,12 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
     const ColumnString::Chars & keys_data,
     const ColumnString::Offsets & keys_offsets,
     const std::unordered_map<String, const DictionaryAttribute &> & attributes,
-    const std::unordered_map<String, ColumnPtr> & defaults,
+    DefaultMapOrFilter default_or_filter,
     std::optional<size_t> collect_values_limit) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefaultMap>(default_or_filter));
+
 
 #if USE_VECTORSCAN
     hs_scratch_t * scratch = nullptr;
@@ -648,6 +709,18 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
         columns[name_] = std::move(col_ptr);
     }
 
+    std::optional<RefDefaultMap> default_map;
+    std::optional<RefFilter> default_mask;
+    if (is_short_circuit)
+    {
+        default_mask = std::get<RefFilter>(default_or_filter).get();
+        default_mask.value().get().resize(keys_offsets.size());
+    }
+    else
+    {
+        default_map = std::get<RefDefaultMap>(default_or_filter).get();
+    }
+
     UInt64 offset = 0;
     for (size_t key_idx = 0; key_idx < keys_offsets.size(); ++key_idx)
     {
@@ -714,31 +787,66 @@ std::unordered_map<String, ColumnPtr> RegExpTreeDictionary::match(
 
         String str = String(reinterpret_cast<const char *>(keys_data.data()) + offset, length);
 
-        for (auto item : match_result.matched_idx_sorted_list)
+        if (is_short_circuit)
         {
-            UInt64 id = item.second;
-            if (!is_valid(id))
-                continue;
-            if (visited_nodes.contains(id))
-                continue;
-            if (setAttributes(id, attributes_to_set, str, visited_nodes, attributes, defaults, key_idx))
-                break;
-        }
+            std::unordered_set<String> defaults;
 
-        for (const auto & [name_, attr] : attributes)
+            for (auto item : match_result.matched_idx_sorted_list)
+            {
+                UInt64 id = item.second;
+                if (!is_valid(id))
+                    continue;
+                if (visited_nodes.contains(id))
+                    continue;
+                if (setAttributesShortCircuit(id, attributes_to_set, str, visited_nodes, attributes, &defaults))
+                    break;
+            }
+
+            for (const auto & [name_, attr] : attributes)
+            {
+                if (attributes_to_set.contains(name_))
+                    continue;
+
+                default_mask.value().get()[key_idx] = 1;
+            }
+
+            /// insert to columns
+            for (const auto & [name_, value] : attributes_to_set)
+            {
+                columns[name_]->insert(value);
+                default_mask.value().get()[key_idx] = 0;
+            }
+        }
+        else
         {
-            if (attributes_to_set.contains(name_))
-                continue;
+            for (auto item : match_result.matched_idx_sorted_list)
+            {
+                UInt64 id = item.second;
+                if (!is_valid(id))
+                    continue;
+                if (visited_nodes.contains(id))
+                    continue;
+                if (setAttributes(id, attributes_to_set, str, visited_nodes, attributes,
+                        default_map.value().get(), key_idx))
+                    break;
+            }
 
-            DefaultValueProvider default_value(
-                collect_values_limit ? DataTypeArray(attr.type).getDefault() : attr.null_value, defaults.at(name_));
-            columns[name_]->insert(default_value.getDefaultValue(key_idx));
+            for (const auto & [name_, attr] : attributes)
+            {
+                if (attributes_to_set.contains(name_))
+                    continue;
+
+                DefaultValueProvider default_value(
+                    collect_values_limit ? DataTypeArray(attr.type).getDefault() : attr.null_value,
+                        default_map.value().get().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);
         }
 
-        /// insert to columns
-        for (const auto & [name_, value] : attributes_to_set)
-            columns[name_]->insert(value);
-
         offset = key_offset;
     }
 
@@ -800,9 +908,12 @@ Columns RegExpTreeDictionary::getColumnsImpl(
     const DataTypes & result_types,
     const Columns & key_columns,
     const DataTypes & key_types,
-    const Columns & default_values_columns,
+    DefaultsOrFilter defaults_or_filter,
     std::optional<size_t> collect_values_limit) const
 {
+    bool is_short_circuit = std::holds_alternative<RefFilter>(defaults_or_filter);
+    assert(is_short_circuit || std::holds_alternative<RefDefaults>(defaults_or_filter));
+
     /// valid check
     if (key_columns.size() != 1)
     {
@@ -827,16 +938,23 @@ Columns RegExpTreeDictionary::getColumnsImpl(
         }
         const auto & attribute = structure.getAttribute(attribute_names[i], attribute_type);
         attributes.emplace(attribute.name, attribute);
-        defaults[attribute.name] = default_values_columns[i];
+        if (!is_short_circuit)
+        {
+            const Columns & default_values_columns = std::get<RefDefaults>(defaults_or_filter).get();
+            defaults[attribute.name] = default_values_columns[i];
+        }
     }
 
     /// calculate matches
     const ColumnString * key_column = typeid_cast<const ColumnString *>(key_columns[0].get());
+    if (key_column == nullptr)
+        throw Exception(ErrorCodes::TYPE_MISMATCH, "Expected a ColumnString column");
+
     const auto & columns_map = match(
         key_column->getChars(),
         key_column->getOffsets(),
         attributes,
-        defaults,
+        is_short_circuit ? std::get<RefFilter>(defaults_or_filter).get()/*default_mask*/ : DefaultMapOrFilter{defaults},
         collect_values_limit);
 
     Columns result;
diff --git a/src/Dictionaries/RegExpTreeDictionary.h b/src/Dictionaries/RegExpTreeDictionary.h
index 6597584ed45..7348c9b9257 100644
--- a/src/Dictionaries/RegExpTreeDictionary.h
+++ b/src/Dictionaries/RegExpTreeDictionary.h
@@ -58,14 +58,14 @@ public:
 
     size_t getBytesAllocated() const override { return bytes_allocated; }
 
-    size_t getQueryCount() const override { return query_count.load(std::memory_order_relaxed); }
+    size_t getQueryCount() const override { return query_count.load(); }
 
     double getFoundRate() const override
     {
-        const auto queries = query_count.load(std::memory_order_relaxed);
+        const auto queries = query_count.load();
         if (!queries)
             return 0;
-        return static_cast<double>(found_count.load(std::memory_order_relaxed)) / queries;
+        return std::min(1.0, static_cast<double>(found_count.load()) / queries);
     }
 
     double getHitRate() const override { return 1.0; }
@@ -86,7 +86,7 @@ public:
 
     bool hasHierarchy() const override { return false; }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<RegExpTreeDictionary>(
             getDictionaryID(), structure, source_ptr->clone(), configuration, use_vectorscan, flag_case_insensitive, flag_dotall);
@@ -101,22 +101,35 @@ public:
 
     ColumnPtr getColumn(
         const std::string & attribute_name,
-        const DataTypePtr & result_type,
+        const DataTypePtr & attribute_type,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const ColumnPtr & default_values_column) const override
+        DefaultOrFilter default_or_filter) const override
     {
-        return getColumns(Strings({attribute_name}), DataTypes({result_type}), key_columns, key_types, Columns({default_values_column}))[0];
+        bool is_short_circuit = std::holds_alternative<RefFilter>(default_or_filter);
+        assert(is_short_circuit || std::holds_alternative<RefDefault>(default_or_filter));
+
+        if (is_short_circuit)
+        {
+            IColumn::Filter & default_mask = std::get<RefFilter>(default_or_filter).get();
+            return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, default_mask).front();
+        }
+        else
+        {
+            const ColumnPtr & default_values_column = std::get<RefDefault>(default_or_filter).get();
+            const Columns & columns= Columns({default_values_column});
+            return getColumns({attribute_name}, {attribute_type}, key_columns, key_types, columns).front();
+        }
     }
 
     Columns getColumns(
         const Strings & attribute_names,
-        const DataTypes & result_types,
+        const DataTypes & attribute_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns) const override
+        DefaultsOrFilter defaults_or_filter) const override
     {
-        return getColumnsImpl(attribute_names, result_types, key_columns, key_types, default_values_columns, std::nullopt);
+        return getColumnsImpl(attribute_names, attribute_types, key_columns, key_types, defaults_or_filter, std::nullopt);
     }
 
     ColumnPtr getColumnAllValues(
@@ -147,7 +160,7 @@ public:
         const DataTypes & result_types,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const Columns & default_values_columns,
+        DefaultsOrFilter defaults_or_filter,
         std::optional<size_t> collect_values_limit) const;
 
 private:
@@ -171,11 +184,13 @@ private:
     void initTopologyOrder(UInt64 node_idx, std::set<UInt64> & visited, UInt64 & topology_id);
     void initGraph();
 
+    using RefDefaultMap = std::reference_wrapper<const std::unordered_map<String, ColumnPtr>>;
+    using DefaultMapOrFilter = std::variant<RefDefaultMap, RefFilter>;
     std::unordered_map<String, ColumnPtr> match(
         const ColumnString::Chars & keys_data,
         const ColumnString::Offsets & keys_offsets,
         const std::unordered_map<String, const DictionaryAttribute &> & attributes,
-        const std::unordered_map<String, ColumnPtr> & defaults,
+        DefaultMapOrFilter default_or_filter,
         std::optional<size_t> collect_values_limit) const;
 
     class AttributeCollector;
@@ -189,6 +204,14 @@ private:
         const std::unordered_map<String, ColumnPtr> & defaults,
         size_t key_index) const;
 
+    bool setAttributesShortCircuit(
+        UInt64 id,
+        AttributeCollector & attributes_to_set,
+        const String & data,
+        std::unordered_set<UInt64> & visited_nodes,
+        const std::unordered_map<String, const DictionaryAttribute &> & attributes,
+        std::unordered_set<String> * defaults) const;
+
     struct RegexTreeNode;
     using RegexTreeNodePtr = std::shared_ptr<RegexTreeNode>;
 
@@ -208,7 +231,7 @@ private:
     MultiRegexps::DataBasePtr origin_db;
     #endif
 
-    Poco::Logger * logger;
+    LoggerPtr logger;
 };
 
 }
diff --git a/src/Dictionaries/SSDCacheDictionaryStorage.h b/src/Dictionaries/SSDCacheDictionaryStorage.h
index 68f727c019c..73c96e0aedc 100644
--- a/src/Dictionaries/SSDCacheDictionaryStorage.h
+++ b/src/Dictionaries/SSDCacheDictionaryStorage.h
@@ -869,10 +869,11 @@ public:
 
     SimpleKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<UInt64> & keys,
-        const DictionaryStorageFetchRequest & fetch_request) override
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * const default_mask) override
     {
         if constexpr (dictionary_key_type == DictionaryKeyType::Simple)
-            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request);
+            return fetchColumnsForKeysImpl<SimpleKeysStorageFetchResult>(keys, fetch_request, default_mask);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method insertColumnsForKeys is not supported for complex key storage");
     }
@@ -905,10 +906,11 @@ public:
 
     ComplexKeysStorageFetchResult fetchColumnsForKeys(
         const PaddedPODArray<StringRef> & keys,
-        const DictionaryStorageFetchRequest & fetch_request) override
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * const default_mask) override
     {
         if constexpr (dictionary_key_type == DictionaryKeyType::Complex)
-            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, fetch_request);
+            return fetchColumnsForKeysImpl<ComplexKeysStorageFetchResult>(keys, fetch_request, default_mask);
         else
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method fetchColumnsForKeys is not supported for simple key storage");
     }
@@ -1002,7 +1004,8 @@ private:
     template <typename Result>
     Result fetchColumnsForKeysImpl(
         const PaddedPODArray<KeyType> & keys,
-        const DictionaryStorageFetchRequest & fetch_request) const
+        const DictionaryStorageFetchRequest & fetch_request,
+        IColumn::Filter * const default_mask) const
     {
         Result result;
 
@@ -1012,6 +1015,7 @@ private:
         const time_t now = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
         size_t fetched_columns_index = 0;
+        size_t fetched_columns_index_without_default = 0;
 
         using BlockIndexToKeysMap = absl::flat_hash_map<size_t, PaddedPODArray<KeyToBlockOffset>, DefaultHash<size_t>>;
         BlockIndexToKeysMap block_to_keys_map;
@@ -1061,8 +1065,11 @@ private:
             {
                 case Cell::in_memory:
                 {
-                    result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+                    result.key_index_to_state[key_index] = {key_state,
+                        default_mask ? fetched_columns_index_without_default : fetched_columns_index};
+
                     ++fetched_columns_index;
+                    ++fetched_columns_index_without_default;
 
                     const auto & partition = memory_buffer_partitions[cell.in_memory_partition_index];
                     char * serialized_columns_place = partition.getPlace(cell.index);
@@ -1089,12 +1096,14 @@ private:
                 }
                 case Cell::default_value:
                 {
-                    result.key_index_to_state[key_index] = {key_state, fetched_columns_index};
+                    result.key_index_to_state[key_index] = {key_state,
+                        default_mask ? fetched_columns_index_without_default : fetched_columns_index};
                     result.key_index_to_state[key_index].setDefault();
                     ++fetched_columns_index;
                     ++result.default_keys_size;
 
-                    insertDefaultValuesIntoColumns(result.fetched_columns, fetch_request, key_index);
+                    if (!default_mask)
+                        insertDefaultValuesIntoColumns(result.fetched_columns, fetch_request, key_index);
                     break;
                 }
             }
@@ -1103,7 +1112,8 @@ private:
         /// Sort blocks by offset before start async io requests
         ::sort(blocks_to_request.begin(), blocks_to_request.end());
 
-        file_buffer.fetchBlocks(configuration.read_buffer_blocks_size, blocks_to_request, [&](size_t block_index, char * block_data)
+        file_buffer.fetchBlocks(configuration.read_buffer_blocks_size, blocks_to_request,
+            [&](size_t block_index, char * block_data)
         {
             auto & keys_in_block = block_to_keys_map[block_index];
 
@@ -1112,9 +1122,11 @@ private:
                 char * key_data = block_data + key_in_block.offset_in_block;
                 deserializeAndInsertIntoColumns(result.fetched_columns, fetch_request, key_data);
 
-                result.key_index_to_state[key_in_block.key_index].setFetchedColumnIndex(fetched_columns_index);
+                result.key_index_to_state[key_in_block.key_index].setFetchedColumnIndex(
+                    default_mask ? fetched_columns_index_without_default : fetched_columns_index);
 
                 ++fetched_columns_index;
+                ++fetched_columns_index_without_default;
             }
         });
 
diff --git a/src/Dictionaries/XDBCDictionarySource.cpp b/src/Dictionaries/XDBCDictionarySource.cpp
index 080f7db96be..1ebfc4a29b0 100644
--- a/src/Dictionaries/XDBCDictionarySource.cpp
+++ b/src/Dictionaries/XDBCDictionarySource.cpp
@@ -67,7 +67,7 @@ XDBCDictionarySource::XDBCDictionarySource(
     ContextPtr context_,
     const BridgeHelperPtr bridge_)
     : WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get(bridge_->getName() + "DictionarySource"))
+    , log(getLogger(bridge_->getName() + "DictionarySource"))
     , update_time(std::chrono::system_clock::from_time_t(0))
     , dict_struct(dict_struct_)
     , configuration(configuration_)
@@ -86,7 +86,7 @@ XDBCDictionarySource::XDBCDictionarySource(
 /// copy-constructor is provided in order to support cloneability
 XDBCDictionarySource::XDBCDictionarySource(const XDBCDictionarySource & other)
     : WithContext(other.getContext())
-    , log(&Poco::Logger::get(other.bridge_helper->getName() + "DictionarySource"))
+    , log(getLogger(other.bridge_helper->getName() + "DictionarySource"))
     , update_time(other.update_time)
     , dict_struct(other.dict_struct)
     , configuration(other.configuration)
@@ -203,7 +203,7 @@ std::string XDBCDictionarySource::doInvalidateQuery(const std::string & request)
 }
 
 
-QueryPipeline XDBCDictionarySource::loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const
+QueryPipeline XDBCDictionarySource::loadFromQuery(const Poco::URI & uri, const Block & required_sample_block, const std::string & query) const
 {
     bridge_helper->startBridgeSync();
 
@@ -214,10 +214,15 @@ QueryPipeline XDBCDictionarySource::loadFromQuery(const Poco::URI & url, const B
         os << "query=" << escapeForFileName(query);
     };
 
-    auto read_buf = std::make_unique<ReadWriteBufferFromHTTP>(
-        url, Poco::Net::HTTPRequest::HTTP_POST, write_body_callback, timeouts, credentials);
-    auto format = getContext()->getInputFormat(IXDBCBridgeHelper::DEFAULT_FORMAT, *read_buf, required_sample_block, max_block_size);
-    format->addBuffer(std::move(read_buf));
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(timeouts)
+                   .withOutCallback(std::move(write_body_callback))
+                   .create(credentials);
+
+    auto format = getContext()->getInputFormat(IXDBCBridgeHelper::DEFAULT_FORMAT, *buf, required_sample_block, max_block_size);
+    format->addBuffer(std::move(buf));
 
     return QueryPipeline(std::move(format));
 }
diff --git a/src/Dictionaries/XDBCDictionarySource.h b/src/Dictionaries/XDBCDictionarySource.h
index 8ca2e172aa6..64d22807254 100644
--- a/src/Dictionaries/XDBCDictionarySource.h
+++ b/src/Dictionaries/XDBCDictionarySource.h
@@ -74,9 +74,9 @@ private:
     // execute invalidate_query. expects single cell in result
     std::string doInvalidateQuery(const std::string & request) const;
 
-    QueryPipeline loadFromQuery(const Poco::URI & url, const Block & required_sample_block, const std::string & query) const;
+    QueryPipeline loadFromQuery(const Poco::URI & uri, const Block & required_sample_block, const std::string & query) const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::chrono::time_point<std::chrono::system_clock> update_time;
     const DictionaryStructure dict_struct;
diff --git a/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp b/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
index 118d0f6a0f3..b35e507b242 100644
--- a/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
+++ b/src/Dictionaries/YAMLRegExpTreeDictionarySource.cpp
@@ -227,7 +227,7 @@ void parseMatchNode(UInt64 parent_id, UInt64 & id, const YAML::Node & node, Resu
 
     if (!match.contains(key_name))
     {
-        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Yaml match rule must contain key {}", key_name);
+        throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "YAML match rule must contain key {}", key_name);
     }
     for (const auto & [key, node_] : match)
     {
@@ -284,7 +284,7 @@ Block parseYAMLAsRegExpTree(const YAML::Node & node, const String & key_name, co
 
 YAMLRegExpTreeDictionarySource::YAMLRegExpTreeDictionarySource(
     const String & filepath_, const DictionaryStructure & dict_struct, ContextPtr context_, bool created_from_ddl)
-    : filepath(filepath_), structure(dict_struct), context(context_), logger(&Poco::Logger::get(kYAMLRegExpTreeDictionarySource))
+    : filepath(filepath_), structure(dict_struct), context(context_), logger(getLogger(kYAMLRegExpTreeDictionarySource))
 {
     key_name = (*structure.key)[0].name;
 
diff --git a/src/Dictionaries/YAMLRegExpTreeDictionarySource.h b/src/Dictionaries/YAMLRegExpTreeDictionarySource.h
index f5dd9b7d186..041cbca81c6 100644
--- a/src/Dictionaries/YAMLRegExpTreeDictionarySource.h
+++ b/src/Dictionaries/YAMLRegExpTreeDictionarySource.h
@@ -64,7 +64,7 @@ private:
 
     ContextPtr context;
 
-    Poco::Logger * logger;
+    LoggerPtr logger;
     Poco::Timestamp last_modification;
 
     Poco::Timestamp getLastModification() const;
diff --git a/src/Dictionaries/registerHashedDictionary.cpp b/src/Dictionaries/registerHashedDictionary.cpp
index f511cad04b0..5fc4f5d5cb6 100644
--- a/src/Dictionaries/registerHashedDictionary.cpp
+++ b/src/Dictionaries/registerHashedDictionary.cpp
@@ -50,7 +50,7 @@ void registerDictionaryHashed(DictionaryFactory & factory)
         const std::string dictionary_layout_prefix = ".layout." + dictionary_layout_name;
         const bool preallocate = config.getBool(config_prefix + dictionary_layout_prefix + ".preallocate", false);
         if (preallocate)
-            LOG_WARNING(&Poco::Logger::get("HashedDictionary"), "'prellocate' attribute is obsolete, consider looking at 'shards'");
+            LOG_WARNING(getLogger("HashedDictionary"), "'prellocate' attribute is obsolete, consider looking at 'shards'");
 
         Int64 shards = config.getInt(config_prefix + dictionary_layout_prefix + ".shards", 1);
         if (shards <= 0 || shards > 128)
@@ -77,10 +77,11 @@ void registerDictionaryHashed(DictionaryFactory & factory)
             require_nonempty,
             dict_lifetime,
             use_async_executor,
+            std::chrono::seconds(settings.max_execution_time.totalSeconds()),
         };
 
         if (source_ptr->hasUpdateField() && shards > 1)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,"{}: SHARDS parameter does not supports for updatable source (UPDATE_FIELD)", full_name);
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "{}: SHARDS parameter does not supports for updatable source (UPDATE_FIELD)", full_name);
 
         if (dictionary_key_type == DictionaryKeyType::Simple)
         {
diff --git a/src/Dictionaries/registerRangeHashedDictionary.cpp b/src/Dictionaries/registerRangeHashedDictionary.cpp
index 4e20abfdb79..8123b811198 100644
--- a/src/Dictionaries/registerRangeHashedDictionary.cpp
+++ b/src/Dictionaries/registerRangeHashedDictionary.cpp
@@ -1,5 +1,8 @@
-#include "RangeHashedDictionary.h"
+#include <Dictionaries/RangeHashedDictionary.h>
+
 #include <Dictionaries/DictionarySource.h>
+#include <Dictionaries/ClickHouseDictionarySource.h>
+#include <Dictionaries/DictionarySourceHelpers.h>
 #include <Dictionaries/DictionaryFactory.h>
 
 namespace DB
diff --git a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
index 989ce5c8f18..08aad663a8c 100644
--- a/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
+++ b/src/Dictionaries/tests/gtest_dictionary_configuration.cpp
@@ -48,7 +48,7 @@ TEST(ConvertDictionaryAST, SimpleDictConfiguration)
                    " COMMENT 'hello world!'";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
@@ -119,7 +119,7 @@ TEST(ConvertDictionaryAST, TrickyAttributes)
                    " SOURCE(CLICKHOUSE(HOST 'localhost'))";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
@@ -164,7 +164,7 @@ TEST(ConvertDictionaryAST, ComplexKeyAndLayoutWithParams)
                    " LIFETIME(MIN 1 MAX 10)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
 
@@ -215,7 +215,7 @@ TEST(ConvertDictionaryAST, ComplexSource)
                    " RANGE(MIN second_column MAX third_column)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     DictionaryConfigurationPtr config = getDictionaryConfigurationFromAST(*create, getContext().context);
     /// source
diff --git a/src/Disks/DiskEncrypted.cpp b/src/Disks/DiskEncrypted.cpp
index ac81899156a..68fd9012857 100644
--- a/src/Disks/DiskEncrypted.cpp
+++ b/src/Disks/DiskEncrypted.cpp
@@ -455,7 +455,8 @@ void registerDiskEncrypted(DiskFactory & factory, bool global_skip_access_check)
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
         ContextPtr context,
-        const DisksMap & map) -> DiskPtr
+        const DisksMap & map,
+        bool, bool) -> 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);
diff --git a/src/Disks/DiskFactory.cpp b/src/Disks/DiskFactory.cpp
index 1cf71773c12..de7ee5a74f4 100644
--- a/src/Disks/DiskFactory.cpp
+++ b/src/Disks/DiskFactory.cpp
@@ -14,7 +14,7 @@ DiskFactory & DiskFactory::instance()
     return factory;
 }
 
-void DiskFactory::registerDiskType(const String & disk_type, DB::DiskFactory::Creator creator)
+void DiskFactory::registerDiskType(const String & disk_type, Creator creator)
 {
     if (!registry.emplace(disk_type, creator).second)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "DiskFactory: the disk type '{}' is not unique", disk_type);
@@ -25,16 +25,21 @@ DiskPtr DiskFactory::create(
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix,
     ContextPtr context,
-    const DisksMap & map) const
+    const DisksMap & map,
+    bool attach,
+    bool custom_disk) const
 {
     const auto disk_type = config.getString(config_prefix + ".type", "local");
 
     const auto found = registry.find(disk_type);
     if (found == registry.end())
-        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG, "DiskFactory: the disk '{}' has unknown disk type: {}", name, disk_type);
+    {
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+                        "DiskFactory: the disk '{}' has unknown disk type: {}", name, disk_type);
+    }
 
     const auto & disk_creator = found->second;
-    return disk_creator(name, config, config_prefix, context, map);
+    return disk_creator(name, config, config_prefix, context, map, attach, custom_disk);
 }
 
 }
diff --git a/src/Disks/DiskFactory.h b/src/Disks/DiskFactory.h
index 998ef569ed5..d03ffa6a40f 100644
--- a/src/Disks/DiskFactory.h
+++ b/src/Disks/DiskFactory.h
@@ -27,7 +27,9 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
         ContextPtr context,
-        const DisksMap & map)>;
+        const DisksMap & map,
+        bool attach,
+        bool custom_disk)>;
 
     static DiskFactory & instance();
 
@@ -38,7 +40,9 @@ public:
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
         ContextPtr context,
-        const DisksMap & map) const;
+        const DisksMap & map,
+        bool attach = false,
+        bool custom_disk = false) const;
 
 private:
     using DiskTypeRegistry = std::unordered_map<String, Creator>;
diff --git a/src/Disks/DiskLocal.cpp b/src/Disks/DiskLocal.cpp
index 5e77ff61789..33f7ca1ec19 100644
--- a/src/Disks/DiskLocal.cpp
+++ b/src/Disks/DiskLocal.cpp
@@ -106,7 +106,7 @@ public:
             if (disk->reserved_bytes < size)
             {
                 disk->reserved_bytes = 0;
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
+                LOG_ERROR(getLogger("DiskLocal"), "Unbalanced reservations size for disk '{}'.", disk->getName());
             }
             else
             {
@@ -114,7 +114,7 @@ public:
             }
 
             if (disk->reservation_count == 0)
-                LOG_ERROR(&Poco::Logger::get("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
+                LOG_ERROR(getLogger("DiskLocal"), "Unbalanced reservation count for disk '{}'.", disk->getName());
             else
                 --disk->reservation_count;
         }
@@ -153,7 +153,6 @@ public:
             return dir_path / entry->path().filename();
     }
 
-
     String name() const override { return entry->path().filename(); }
 
 private:
@@ -475,7 +474,7 @@ DiskLocal::DiskLocal(const String & name_, const String & path_, UInt64 keep_fre
     : IDisk(name_, config, config_prefix)
     , disk_path(path_)
     , keep_free_space_bytes(keep_free_space_bytes_)
-    , logger(&Poco::Logger::get("DiskLocal"))
+    , logger(getLogger("DiskLocal"))
     , data_source_description(getLocalDataSourceDescription(disk_path))
 {
 }
@@ -494,7 +493,7 @@ DiskLocal::DiskLocal(const String & name_, const String & path_)
     : IDisk(name_)
     , disk_path(path_)
     , keep_free_space_bytes(0)
-    , logger(&Poco::Logger::get("DiskLocal"))
+    , logger(getLogger("DiskLocal"))
     , data_source_description(getLocalDataSourceDescription(disk_path))
 {
 }
@@ -582,7 +581,7 @@ try
         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->write(data.data, DiskWriteCheckData::PAGE_SIZE_IN_BYTES);
         buf->finalize();
         buf->sync();
     }
@@ -728,7 +727,8 @@ void registerDiskLocal(DiskFactory & factory, bool global_skip_access_check)
         const Poco::Util::AbstractConfiguration & config,
         const String & config_prefix,
         ContextPtr context,
-        const DisksMap & map) -> DiskPtr
+        const DisksMap & map,
+        bool, bool) -> DiskPtr
     {
         String path;
         UInt64 keep_free_space_bytes;
diff --git a/src/Disks/DiskLocal.h b/src/Disks/DiskLocal.h
index affce5a847e..b9703019c19 100644
--- a/src/Disks/DiskLocal.h
+++ b/src/Disks/DiskLocal.h
@@ -153,7 +153,7 @@ private:
     const String disk_path;
     const String disk_checker_path = ".disk_checker_file";
     std::atomic<UInt64> keep_free_space_bytes;
-    Poco::Logger * logger;
+    LoggerPtr logger;
     DataSourceDescription data_source_description;
 
     UInt64 reserved_bytes = 0;
diff --git a/src/Disks/DiskLocalCheckThread.cpp b/src/Disks/DiskLocalCheckThread.cpp
index 87fcc0d1cf5..e95c614336b 100644
--- a/src/Disks/DiskLocalCheckThread.cpp
+++ b/src/Disks/DiskLocalCheckThread.cpp
@@ -13,7 +13,7 @@ DiskLocalCheckThread::DiskLocalCheckThread(DiskLocal * disk_, ContextPtr context
     : WithContext(context_)
     , disk(std::move(disk_))
     , check_period_ms(local_disk_check_period_ms)
-    , log(&Poco::Logger::get(fmt::format("DiskLocalCheckThread({})", disk->getName())))
+    , log(getLogger(fmt::format("DiskLocalCheckThread({})", disk->getName())))
 {
     task = getContext()->getSchedulePool().createTask(log->name(), [this] { run(); });
 }
diff --git a/src/Disks/DiskLocalCheckThread.h b/src/Disks/DiskLocalCheckThread.h
index eb688d599ca..046b7553136 100644
--- a/src/Disks/DiskLocalCheckThread.h
+++ b/src/Disks/DiskLocalCheckThread.h
@@ -29,7 +29,7 @@ private:
 
     DiskLocal * disk;
     size_t check_period_ms;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<bool> need_stop{false};
 
     BackgroundSchedulePool::TaskHolder task;
diff --git a/src/Disks/DiskSelector.cpp b/src/Disks/DiskSelector.cpp
index dad1c728560..a9260a249dd 100644
--- a/src/Disks/DiskSelector.cpp
+++ b/src/Disks/DiskSelector.cpp
@@ -124,7 +124,7 @@ DiskSelectorPtr DiskSelector::updateFromConfig(
         if (num_disks_removed_from_config > 0)
         {
             LOG_WARNING(
-                &Poco::Logger::get("DiskSelector"),
+                getLogger("DiskSelector"),
                 "{} disappeared from configuration, this change will be applied after restart of ClickHouse",
                 warning.str());
         }
diff --git a/src/Disks/DiskType.cpp b/src/Disks/DiskType.cpp
index 59e242c7fe0..1778ae8025b 100644
--- a/src/Disks/DiskType.cpp
+++ b/src/Disks/DiskType.cpp
@@ -1,40 +1,65 @@
 #include "DiskType.h"
+#include <Poco/String.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
-
-String toString(DataSourceType data_source_type)
+namespace ErrorCodes
 {
-    switch (data_source_type)
+    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+}
+
+MetadataStorageType metadataTypeFromString(const String & type)
+{
+    auto check_type = Poco::toLower(type);
+    if (check_type == "local")
+        return MetadataStorageType::Local;
+    if (check_type == "plain")
+        return MetadataStorageType::Plain;
+    if (check_type == "web")
+        return MetadataStorageType::StaticWeb;
+
+    throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+                    "MetadataStorageFactory: unknown metadata storage type: {}", type);
+}
+
+bool DataSourceDescription::operator==(const DataSourceDescription & other) const
+{
+    return std::tie(type, object_storage_type, description, is_encrypted) == std::tie(other.type, other.object_storage_type, other.description, other.is_encrypted);
+}
+
+bool DataSourceDescription::sameKind(const DataSourceDescription & other) const
+{
+    return std::tie(type, object_storage_type, description)
+        == std::tie(other.type, other.object_storage_type, other.description);
+}
+
+std::string DataSourceDescription::toString() const
+{
+    switch (type)
     {
         case DataSourceType::Local:
             return "local";
         case DataSourceType::RAM:
             return "memory";
-        case DataSourceType::S3:
-            return "s3";
-        case DataSourceType::S3_Plain:
-            return "s3_plain";
-        case DataSourceType::HDFS:
-            return "hdfs";
-        case DataSourceType::WebServer:
-            return "web";
-        case DataSourceType::AzureBlobStorage:
-            return "azure_blob_storage";
-        case DataSourceType::LocalBlobStorage:
-            return "local_blob_storage";
+        case DataSourceType::ObjectStorage:
+        {
+            switch (object_storage_type)
+            {
+                case ObjectStorageType::S3:
+                    return "s3";
+                case ObjectStorageType::HDFS:
+                    return "hdfs";
+                case ObjectStorageType::Azure:
+                    return "azure_blob_storage";
+                case ObjectStorageType::Local:
+                    return "local_blob_storage";
+                case ObjectStorageType::Web:
+                    return "web";
+                case ObjectStorageType::None:
+                    return "none";
+            }
+        }
     }
-    std::unreachable;
 }
-
-bool DataSourceDescription::operator==(const DataSourceDescription & other) const
-{
-    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 82a00ccb3cc..36fe4d83004 100644
--- a/src/Disks/DiskType.h
+++ b/src/Disks/DiskType.h
@@ -10,19 +10,36 @@ enum class DataSourceType
 {
     Local,
     RAM,
-    S3,
-    S3_Plain,
-    HDFS,
-    WebServer,
-    AzureBlobStorage,
-    LocalBlobStorage,
+    ObjectStorage,
 };
 
+enum class ObjectStorageType
+{
+    None,
+    S3,
+    Azure,
+    HDFS,
+    Web,
+    Local,
+};
+
+enum class MetadataStorageType
+{
+    None,
+    Local,
+    Plain,
+    StaticWeb,
+};
+
+MetadataStorageType metadataTypeFromString(const String & type);
 String toString(DataSourceType data_source_type);
 
 struct DataSourceDescription
 {
     DataSourceType type;
+    ObjectStorageType object_storage_type = ObjectStorageType::None;
+    MetadataStorageType metadata_type = MetadataStorageType::None;
+
     std::string description;
 
     bool is_encrypted = false;
@@ -30,6 +47,8 @@ struct DataSourceDescription
 
     bool operator==(const DataSourceDescription & other) const;
     bool sameKind(const DataSourceDescription & other) const;
+
+    std::string toString() const;
 };
 
 }
diff --git a/src/Disks/IDisk.cpp b/src/Disks/IDisk.cpp
index 5426f8d0904..066acc250a2 100644
--- a/src/Disks/IDisk.cpp
+++ b/src/Disks/IDisk.cpp
@@ -33,7 +33,7 @@ void IDisk::copyFile( /// NOLINT
     const std::function<void()> & cancellation_hook
     )
 {
-    LOG_DEBUG(&Poco::Logger::get("IDisk"), "Copying from {} (path: {}) {} to {} (path: {}) {}.",
+    LOG_DEBUG(getLogger("IDisk"), "Copying from {} (path: {}) {} to {} (path: {}) {}.",
               getName(), getPath(), from_file_path, to_disk.getName(), to_disk.getPath(), to_file_path);
 
     auto in = readFile(from_file_path, read_settings);
@@ -194,7 +194,7 @@ void IDisk::startup(ContextPtr context, bool skip_access_check)
     {
         if (isReadOnly())
         {
-            LOG_DEBUG(&Poco::Logger::get("IDisk"),
+            LOG_DEBUG(getLogger("IDisk"),
                 "Skip access check for disk {} (read-only disk).",
                 getName());
         }
diff --git a/src/Disks/IDisk.h b/src/Disks/IDisk.h
index 8aaee17f237..fcc92db7b96 100644
--- a/src/Disks/IDisk.h
+++ b/src/Disks/IDisk.h
@@ -293,7 +293,7 @@ public:
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "Method `getCacheLayersNames()` is not implemented for disk: {}",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     /// Returns a list of storage objects (contains path, size, ...).
@@ -303,7 +303,7 @@ public:
     {
         throw Exception(ErrorCodes::NOT_IMPLEMENTED,
             "Method `getStorageObjects()` not implemented for disk: {}",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     /// For one local path there might be multiple remote paths in case of Log family engines.
@@ -320,11 +320,13 @@ public:
         {}
     };
 
-    virtual void getRemotePathsRecursive(const String &, std::vector<LocalPathWithObjectStoragePaths> &)
+    virtual void getRemotePathsRecursive(
+        const String &, std::vector<LocalPathWithObjectStoragePaths> &, const std::function<bool(const String &)> & /* skip_predicate */)
     {
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+        throw Exception(
+            ErrorCodes::NOT_IMPLEMENTED,
             "Method `getRemotePathsRecursive() not implemented for disk: {}`",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     /// Batch request to remove multiple files.
@@ -412,7 +414,7 @@ public:
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
             "Method getMetadataStorage() is not implemented for disk type: {}",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     /// Very similar case as for getMetadataDiskIfExistsOrSelf(). If disk has "metadata"
@@ -446,7 +448,7 @@ public:
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
             "Method getObjectStorage() is not implemented for disk type: {}",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     /// Create disk object storage according to disk type.
@@ -457,7 +459,7 @@ public:
         throw Exception(
             ErrorCodes::NOT_IMPLEMENTED,
             "Method createDiskObjectStorage() is not implemented for disk type: {}",
-            toString(getDataSourceDescription().type));
+            getDataSourceDescription().toString());
     }
 
     virtual bool supportsStat() const { return false; }
diff --git a/src/Disks/IDiskTransaction.h b/src/Disks/IDiskTransaction.h
index 975c41cb70b..7df1b71eb2b 100644
--- a/src/Disks/IDiskTransaction.h
+++ b/src/Disks/IDiskTransaction.h
@@ -62,8 +62,8 @@ public:
     virtual void copyFile(
         const std::string & from_file_path,
         const std::string & to_file_path,
-        const ReadSettings & read_settings = {},
-        const WriteSettings & write_settings = {}) = 0;
+        const ReadSettings & read_settings,
+        const WriteSettings & write_settings) = 0;
 
     /// Open the file for write and return WriteBufferFromFileBase object.
     virtual std::unique_ptr<WriteBufferFromFileBase> writeFile( /// NOLINT
diff --git a/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp b/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
index 1952d8ae253..1a9cd2c994c 100644
--- a/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
+++ b/src/Disks/IO/AsynchronousBoundedReadBuffer.cpp
@@ -48,14 +48,13 @@ AsynchronousBoundedReadBuffer::AsynchronousBoundedReadBuffer(
     const ReadSettings & settings_,
     AsyncReadCountersPtr async_read_counters_,
     FilesystemReadPrefetchesLogPtr prefetches_log_)
-    : ReadBufferFromFileBase(chooseBufferSizeForRemoteReading(settings_, impl_->getFileSize()), nullptr, 0)
+    : ReadBufferFromFileBase(0, nullptr, 0)
     , impl(std::move(impl_))
     , read_settings(settings_)
     , reader(reader_)
-    , prefetch_buffer(chooseBufferSizeForRemoteReading(read_settings, impl->getFileSize()))
     , query_id(CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() != nullptr ? CurrentThread::getQueryId() : "")
     , current_reader_id(getRandomASCIIString(8))
-    , log(&Poco::Logger::get("AsynchronousBoundedReadBuffer"))
+    , log(getLogger("AsynchronousBoundedReadBuffer"))
     , async_read_counters(async_read_counters_)
     , prefetches_log(prefetches_log_)
 {
@@ -70,12 +69,10 @@ bool AsynchronousBoundedReadBuffer::hasPendingDataToRead()
             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());
-        }
+                "Read beyond last offset ({} > {}): file size = {}, info: {}",
+                file_offset_of_buffer_end, *read_until_position, impl->getFileSize(), impl->getInfoForLog());
     }
 
     return true;
@@ -115,7 +112,7 @@ void AsynchronousBoundedReadBuffer::prefetch(Priority priority)
     last_prefetch_info.submit_time = std::chrono::system_clock::now();
     last_prefetch_info.priority = priority;
 
-    chassert(prefetch_buffer.size() == chooseBufferSizeForRemoteReading(read_settings, impl->getFileSize()));
+    prefetch_buffer.resize(chooseBufferSizeForRemoteReading(read_settings, impl->getFileSize()));
     prefetch_future = readAsync(prefetch_buffer.data(), prefetch_buffer.size(), priority);
     ProfileEvents::increment(ProfileEvents::RemoteFSPrefetches);
 }
@@ -127,14 +124,16 @@ void AsynchronousBoundedReadBuffer::setReadUntilPosition(size_t position)
         if (position < file_offset_of_buffer_end)
         {
             /// file has been read beyond new read until position already
-            if (working_buffer.size() >= file_offset_of_buffer_end - position)
+            if (available() >= file_offset_of_buffer_end - position)
             {
-                /// new read until position is inside working buffer
+                /// new read until position is after the current position in the working buffer
                 file_offset_of_buffer_end = position;
+                working_buffer.resize(working_buffer.size() - (file_offset_of_buffer_end - position));
+                pos = std::min(pos, working_buffer.end());
             }
             else
             {
-                /// new read until position is before working buffer begin
+                /// new read until position is before the current position in the working buffer
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR,
                     "Attempt to set read until position before already read data ({} > {}, info: {})",
@@ -187,6 +186,7 @@ bool AsynchronousBoundedReadBuffer::nextImpl()
         return false;
 
     chassert(file_offset_of_buffer_end <= impl->getFileSize());
+    size_t old_file_offset_of_buffer_end = file_offset_of_buffer_end;
 
     IAsynchronousReader::Result result;
     if (prefetch_future.valid())
@@ -211,7 +211,7 @@ bool AsynchronousBoundedReadBuffer::nextImpl()
     }
     else
     {
-        chassert(memory.size() == chooseBufferSizeForRemoteReading(read_settings, impl->getFileSize()));
+        memory.resize(chooseBufferSizeForRemoteReading(read_settings, impl->getFileSize()));
 
         {
             ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::SynchronousRemoteReadWaitMicroseconds);
@@ -222,6 +222,9 @@ bool AsynchronousBoundedReadBuffer::nextImpl()
         ProfileEvents::increment(ProfileEvents::RemoteFSUnprefetchedBytes, result.size);
     }
 
+    bytes_to_ignore = 0;
+    resetWorkingBuffer();
+
     size_t bytes_read = result.size - result.offset;
     if (bytes_read)
     {
@@ -232,14 +235,23 @@ bool AsynchronousBoundedReadBuffer::nextImpl()
     }
 
     file_offset_of_buffer_end = impl->getFileOffsetOfBufferEnd();
-    bytes_to_ignore = 0;
 
-    /// 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->getFileSize());
 
-    return bytes_read;
+    if (read_until_position && (file_offset_of_buffer_end > *read_until_position))
+    {
+        size_t excessive_bytes_read = file_offset_of_buffer_end - *read_until_position;
+
+        if (excessive_bytes_read > working_buffer.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "File offset moved too far: old_file_offset = {}, new_file_offset = {}, read_until_position = {}, bytes_read = {}",
+                            old_file_offset_of_buffer_end, file_offset_of_buffer_end, *read_until_position, bytes_read);
+
+        working_buffer.resize(working_buffer.size() - excessive_bytes_read);
+        file_offset_of_buffer_end = *read_until_position;
+    }
+
+    return !working_buffer.empty();
 }
 
 
@@ -250,7 +262,7 @@ off_t AsynchronousBoundedReadBuffer::seek(off_t offset, int whence)
     size_t new_pos;
     if (whence == SEEK_SET)
     {
-        assert(offset >= 0);
+        chassert(offset >= 0);
         new_pos = offset;
     }
     else if (whence == SEEK_CUR)
@@ -276,8 +288,8 @@ off_t AsynchronousBoundedReadBuffer::seek(off_t offset, int whence)
             /// 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.
             pos = working_buffer.end() - file_offset_of_buffer_end + new_pos;
-            assert(pos >= working_buffer.begin());
-            assert(pos <= working_buffer.end());
+            chassert(pos >= working_buffer.begin());
+            chassert(pos <= working_buffer.end());
 
             return new_pos;
         }
@@ -303,7 +315,7 @@ off_t AsynchronousBoundedReadBuffer::seek(off_t offset, int whence)
         break;
     }
 
-    assert(!prefetch_future.valid());
+    chassert(!prefetch_future.valid());
 
     /// First reset the buffer so the next read will fetch new data to the buffer.
     resetWorkingBuffer();
diff --git a/src/Disks/IO/AsynchronousBoundedReadBuffer.h b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
index c43b08ce2b0..6dc76352aca 100644
--- a/src/Disks/IO/AsynchronousBoundedReadBuffer.h
+++ b/src/Disks/IO/AsynchronousBoundedReadBuffer.h
@@ -67,7 +67,7 @@ private:
     const std::string query_id;
     const std::string current_reader_id;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     AsyncReadCountersPtr async_read_counters;
     FilesystemReadPrefetchesLogPtr prefetches_log;
@@ -95,7 +95,6 @@ private:
     IAsynchronousReader::Result readSync(char * data, size_t size);
 
     void resetPrefetch(FilesystemPrefetchState state);
-
 };
 
 }
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
index f507fb207e5..1fe369832ac 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.cpp
@@ -3,6 +3,7 @@
 
 #include <Disks/IO/createReadBufferFromFileBase.h>
 #include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
+#include <Interpreters/Cache/FileCache.h>
 #include <IO/BoundedReadBuffer.h>
 #include <IO/ReadBufferFromFile.h>
 #include <Interpreters/Context.h>
@@ -48,6 +49,7 @@ CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
     const String & source_file_path_,
     const FileCache::Key & cache_key_,
     FileCachePtr cache_,
+    const FileCacheUserInfo & user_,
     ImplementationBufferCreator implementation_buffer_creator_,
     const ReadSettings & settings_,
     const String & query_id_,
@@ -58,9 +60,9 @@ CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
     std::shared_ptr<FilesystemCacheLog> cache_log_)
     : ReadBufferFromFileBase(use_external_buffer_ ? 0 : settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
 #ifdef ABORT_ON_LOGICAL_ERROR
-    , log(&Poco::Logger::get(fmt::format("CachedOnDiskReadBufferFromFile({})", cache_key_)))
+    , log(getLogger(fmt::format("CachedOnDiskReadBufferFromFile({})", cache_key_)))
 #else
-    , log(&Poco::Logger::get("CachedOnDiskReadBufferFromFile"))
+    , log(getLogger("CachedOnDiskReadBufferFromFile"))
 #endif
     , cache_key(cache_key_)
     , source_file_path(source_file_path_)
@@ -70,6 +72,7 @@ CachedOnDiskReadBufferFromFile::CachedOnDiskReadBufferFromFile(
     , implementation_buffer_creator(implementation_buffer_creator_)
     , query_id(query_id_)
     , current_buffer_id(getRandomASCIIString(8))
+    , user(user_)
     , allow_seeks_after_first_read(allow_seeks_after_first_read_)
     , use_external_buffer(use_external_buffer_)
     , query_context_holder(cache_->getQueryContextHolder(query_id, settings_))
@@ -127,12 +130,12 @@ bool CachedOnDiskReadBufferFromFile::nextFileSegmentsBatch()
 
     if (settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache)
     {
-        file_segments = cache->get(cache_key, file_offset_of_buffer_end, size, settings.filesystem_cache_segments_batch_size);
+        file_segments = cache->get(cache_key, file_offset_of_buffer_end, size, settings.filesystem_cache_segments_batch_size, user.user_id);
     }
     else
     {
         CreateFileSegmentSettings create_settings(FileSegmentKind::Regular);
-        file_segments = cache->getOrSet(cache_key, file_offset_of_buffer_end, size, file_size.value(), create_settings, settings.filesystem_cache_segments_batch_size);
+        file_segments = cache->getOrSet(cache_key, file_offset_of_buffer_end, size, file_size.value(), create_settings, settings.filesystem_cache_segments_batch_size, user);
     }
     return !file_segments->empty();
 }
@@ -166,7 +169,7 @@ CachedOnDiskReadBufferFromFile::getCacheReadBuffer(const FileSegment & file_segm
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::CachedReadBufferCreateBufferMicroseconds);
 
-    auto path = file_segment.getPathInLocalCache();
+    auto path = file_segment.getPath();
     if (cache_file_reader)
     {
         chassert(cache_file_reader->getFileName() == path);
@@ -343,7 +346,7 @@ CachedOnDiskReadBufferFromFile::getReadBufferForFileSegment(FileSegment & file_s
                 }
 
                 auto downloader_id = file_segment.getOrSetDownloader();
-                if (downloader_id == file_segment.getCallerId())
+                if (downloader_id == FileSegment::getCallerId())
                 {
                     if (canStartFromCache(file_offset_of_buffer_end, file_segment))
                     {
@@ -558,8 +561,9 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegment & file_segment)
             ProfileEvents::FileSegmentPredownloadMicroseconds, predownload_watch.elapsedMicroseconds());
     });
 
-    OpenTelemetry::SpanHolder span{
-        fmt::format("CachedOnDiskReadBufferFromFile::predownload(key={}, size={})", file_segment.key().toString(), bytes_to_predownload)};
+    OpenTelemetry::SpanHolder span("CachedOnDiskReadBufferFromFile::predownload");
+    span.addAttribute("clickhouse.key", file_segment.key().toString());
+    span.addAttribute("clickhouse.size", bytes_to_predownload);
 
     if (bytes_to_predownload)
     {
@@ -633,7 +637,8 @@ void CachedOnDiskReadBufferFromFile::predownload(FileSegment & 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, settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds);
             if (continue_predownload)
             {
                 LOG_TEST(log, "Left to predownload: {}, buffer size: {}", bytes_to_predownload, current_impl_buffer_size);
@@ -864,23 +869,26 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
 
     chassert(!internal_buffer.empty());
 
-    /// We allocate buffers not less than 1M so that s3 requests will not be too small. But the same buffers (members of AsynchronousReadIndirectBufferFromRemoteFS)
-    /// are used for reading from files. Some of these readings are fairly small and their performance degrade when we use big buffers (up to ~20% for queries like Q23 from ClickBench).
-    if (use_external_buffer && read_type == ReadType::CACHED && settings.local_fs_buffer_size < internal_buffer.size())
-        internal_buffer.resize(settings.local_fs_buffer_size);
-
     auto & file_segment = file_segments->front();
     const auto & current_read_range = file_segment.range();
 
-    /// The requested right boundary could be
-    /// segment->range().left < requested_right_boundary < segment->range().right
-    /// therefore need to resize to a smaller size.
-    if (file_segments->size() == 1) // We're reading the last segment
+    if (use_external_buffer && read_type == ReadType::CACHED)
     {
-        const size_t remaining_size_to_read = std::min(current_read_range.right, read_until_position - 1) - file_offset_of_buffer_end + 1;
-        const size_t new_buf_size = std::min(internal_buffer.size(), remaining_size_to_read);
-        chassert((internal_buffer.size() >= nextimpl_working_buffer_offset + new_buf_size) && (new_buf_size > 0));
-        internal_buffer.resize(nextimpl_working_buffer_offset + new_buf_size);
+        /// We allocate buffers not less than 1M so that s3 requests will not be too small. But the same buffers (members of AsynchronousReadIndirectBufferFromRemoteFS)
+        /// are used for reading from files. Some of these readings are fairly small and their performance degrade when we use big buffers (up to ~20% for queries like Q23 from ClickBench).
+        if (settings.local_fs_buffer_size < internal_buffer.size())
+            internal_buffer.resize(settings.local_fs_buffer_size);
+
+        /// It would make sense to reduce buffer size to what is left to read (when we read the last segment) regardless of the read_type.
+        /// But we have to use big enough buffers when we [pre]download segments to amortize netw and FileCache overhead (space reservation and relevant locks).
+        if (file_segments->size() == 1)
+        {
+            const size_t remaining_size_to_read
+                = std::min(current_read_range.right, read_until_position - 1) - file_offset_of_buffer_end + 1;
+            const size_t new_buf_size = std::min(internal_buffer.size(), remaining_size_to_read);
+            chassert((internal_buffer.size() >= nextimpl_working_buffer_offset + new_buf_size) && (new_buf_size > 0));
+            internal_buffer.resize(nextimpl_working_buffer_offset + new_buf_size);
+        }
     }
 
     // Pass a valid external buffer for implementation_buffer to read into.
@@ -985,7 +993,7 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
         {
             chassert(file_offset_of_buffer_end + size - 1 <= file_segment.range().right);
 
-            bool success = file_segment.reserve(size);
+            bool success = file_segment.reserve(size, settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds);
             if (success)
             {
                 chassert(file_segment.getCurrentWriteOffset() == static_cast<size_t>(implementation_buffer->getPosition()));
@@ -1020,6 +1028,20 @@ bool CachedOnDiskReadBufferFromFile::nextImplStep()
             }
         }
 
+        /// - If last file segment was read from remote fs, then we read up to segment->range().right,
+        /// but the requested right boundary could be
+        /// segment->range().left < requested_right_boundary <  segment->range().right.
+        /// 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 (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;
+            size = std::min(size, remaining_size_to_read);
+            chassert(implementation_buffer->buffer().size() >= nextimpl_working_buffer_offset + size);
+            implementation_buffer->buffer().resize(nextimpl_working_buffer_offset + size);
+        }
+
         file_offset_of_buffer_end += size;
 
         if (download_current_segment && download_current_segment_succeeded)
@@ -1194,7 +1216,7 @@ size_t CachedOnDiskReadBufferFromFile::getRemainingSizeToRead()
 
 void CachedOnDiskReadBufferFromFile::setReadUntilPosition(size_t position)
 {
-    if (!allow_seeks_after_first_read)
+    if (initialized && !allow_seeks_after_first_read)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Method `setReadUntilPosition()` not allowed");
 
     if (read_until_position == position)
diff --git a/src/Disks/IO/CachedOnDiskReadBufferFromFile.h b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
index 10e747c2f33..74fb6220af2 100644
--- a/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
+++ b/src/Disks/IO/CachedOnDiskReadBufferFromFile.h
@@ -1,12 +1,15 @@
 #pragma once
 
-#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileCacheKey.h>
+#include <Interpreters/Cache/FileCache_fwd.h>
+#include <Interpreters/Cache/QueryLimit.h>
 #include <IO/SeekableReadBuffer.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/ReadSettings.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <Interpreters/FilesystemCacheLog.h>
 #include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Cache/UserInfo.h>
 
 
 namespace CurrentMetrics
@@ -24,8 +27,9 @@ public:
 
     CachedOnDiskReadBufferFromFile(
         const String & source_file_path_,
-        const FileCache::Key & cache_key_,
+        const FileCacheKey & cache_key_,
         FileCachePtr cache_,
+        const FileCacheUserInfo & user_,
         ImplementationBufferCreator implementation_buffer_creator_,
         const ReadSettings & settings_,
         const String & query_id_,
@@ -101,8 +105,8 @@ private:
 
     bool nextFileSegmentsBatch();
 
-    Poco::Logger * log;
-    FileCache::Key cache_key;
+    LoggerPtr log;
+    FileCacheKey cache_key;
     String source_file_path;
 
     FileCachePtr cache;
@@ -145,13 +149,14 @@ private:
 
     String query_id;
     String current_buffer_id;
+    FileCacheUserInfo user;
 
     bool allow_seeks_after_first_read;
     [[maybe_unused]]bool use_external_buffer;
     CurrentMetrics::Increment metric_increment{CurrentMetrics::FilesystemCacheReadBuffers};
     ProfileEvents::Counters current_file_segment_counters;
 
-    FileCache::QueryContextHolderPtr query_context_holder;
+    FileCacheQueryLimit::QueryContextHolderPtr query_context_holder;
 
     std::shared_ptr<FilesystemCacheLog> cache_log;
 };
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
index 48e12c7b9b9..f4e309f461e 100644
--- a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.cpp
@@ -1,10 +1,10 @@
 #include "CachedOnDiskWriteBufferFromFile.h"
 
-#include <Interpreters/Cache/FileCacheFactory.h>
-#include <Interpreters/Cache/FileSegment.h>
 #include <Common/logger_useful.h>
+#include <Interpreters/Cache/FileCacheFactory.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileSegment.h>
 #include <Interpreters/FilesystemCacheLog.h>
-#include <Interpreters/Context.h>
 #include <IO/SwapHelper.h>
 
 
@@ -25,12 +25,16 @@ namespace ErrorCodes
 FileSegmentRangeWriter::FileSegmentRangeWriter(
     FileCache * cache_,
     const FileSegment::Key & key_,
+    const FileCacheUserInfo & user_,
+    size_t reserve_space_lock_wait_timeout_milliseconds_,
     std::shared_ptr<FilesystemCacheLog> cache_log_,
     const String & query_id_,
     const String & source_path_)
     : cache(cache_)
     , key(key_)
-    , log(&Poco::Logger::get("FileSegmentRangeWriter"))
+    , user(user_)
+    , reserve_space_lock_wait_timeout_milliseconds(reserve_space_lock_wait_timeout_milliseconds_)
+    , log(getLogger("FileSegmentRangeWriter"))
     , cache_log(cache_log_)
     , query_id(query_id_)
     , source_path(source_path_)
@@ -87,7 +91,7 @@ bool FileSegmentRangeWriter::write(const char * data, size_t size, size_t offset
 
         size_t size_to_write = std::min(available_size, size);
 
-        bool reserved = file_segment->reserve(size_to_write);
+        bool reserved = file_segment->reserve(size_to_write, reserve_space_lock_wait_timeout_milliseconds);
         if (!reserved)
         {
             appendFilesystemCacheLog(*file_segment);
@@ -148,7 +152,7 @@ FileSegment & FileSegmentRangeWriter::allocateFileSegment(size_t offset, FileSeg
 
     /// We set max_file_segment_size to be downloaded,
     /// if we have less size to write, file segment will be resized in complete() method.
-    file_segments = cache->set(key, offset, cache->getMaxFileSegmentSize(), create_settings);
+    file_segments = cache->set(key, offset, cache->getMaxFileSegmentSize(), create_settings, user);
     chassert(file_segments->size() == 1);
     return file_segments->front();
 }
@@ -193,7 +197,6 @@ void FileSegmentRangeWriter::completeFileSegment()
     appendFilesystemCacheLog(file_segment);
 }
 
-
 CachedOnDiskWriteBufferFromFile::CachedOnDiskWriteBufferFromFile(
     std::unique_ptr<WriteBuffer> impl_,
     FileCachePtr cache_,
@@ -201,13 +204,16 @@ CachedOnDiskWriteBufferFromFile::CachedOnDiskWriteBufferFromFile(
     const FileCache::Key & key_,
     const String & query_id_,
     const WriteSettings & settings_,
+    const FileCacheUserInfo & user_,
     std::shared_ptr<FilesystemCacheLog> cache_log_)
     : WriteBufferFromFileDecorator(std::move(impl_))
-    , log(&Poco::Logger::get("CachedOnDiskWriteBufferFromFile"))
+    , log(getLogger("CachedOnDiskWriteBufferFromFile"))
     , cache(cache_)
     , source_path(source_path_)
     , key(key_)
     , query_id(query_id_)
+    , user(user_)
+    , reserve_space_lock_wait_timeout_milliseconds(settings_.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds)
     , throw_on_error_from_cache(settings_.throw_on_error_from_cache)
     , cache_log(!query_id_.empty() && settings_.enable_filesystem_cache_log ? cache_log_ : nullptr)
 {
@@ -231,9 +237,11 @@ void CachedOnDiskWriteBufferFromFile::nextImpl()
     }
     catch (...)
     {
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+
         /// If something was already written to cache, remove it.
         cache_writer.reset();
-        cache->removeKeyIfExists(key);
+        cache->removeKeyIfExists(key, user.user_id);
 
         throw;
     }
@@ -246,7 +254,8 @@ void CachedOnDiskWriteBufferFromFile::cacheData(char * data, size_t size, bool t
 
     if (!cache_writer)
     {
-        cache_writer = std::make_unique<FileSegmentRangeWriter>(cache.get(), key, cache_log, query_id, source_path);
+        cache_writer = std::make_unique<FileSegmentRangeWriter>(
+            cache.get(), key, user, reserve_space_lock_wait_timeout_milliseconds, cache_log, query_id, source_path);
     }
 
     Stopwatch watch(CLOCK_MONOTONIC);
diff --git a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
index 6e2ff37a5c7..ad4f6b5916d 100644
--- a/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
+++ b/src/Disks/IO/CachedOnDiskWriteBufferFromFile.h
@@ -2,7 +2,9 @@
 
 #include <IO/WriteBufferFromFileDecorator.h>
 #include <IO/WriteSettings.h>
-#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileCache_fwd.h>
+#include <Interpreters/Cache/FileCacheKey.h>
+#include <Interpreters/Cache/FileSegment.h>
 #include <Interpreters/FilesystemCacheLog.h>
 
 namespace Poco
@@ -25,8 +27,13 @@ class FileSegmentRangeWriter
 {
 public:
     FileSegmentRangeWriter(
-        FileCache * cache_, const FileSegment::Key & key_,
-        std::shared_ptr<FilesystemCacheLog> cache_log_, const String & query_id_, const String & source_path_);
+        FileCache * cache_,
+        const FileSegment::Key & key_,
+        const FileCacheUserInfo & user_,
+        size_t reserve_space_lock_wait_timeout_milliseconds_,
+        std::shared_ptr<FilesystemCacheLog> cache_log_,
+        const String & query_id_,
+        const String & source_path_);
 
     /**
     * Write a range of file segments. Allocate file segment of `max_file_segment_size` and write to
@@ -46,12 +53,14 @@ private:
     void completeFileSegment();
 
     FileCache * cache;
-    FileSegment::Key key;
+    const FileSegment::Key key;
+    const FileCacheUserInfo user;
+    const size_t reserve_space_lock_wait_timeout_milliseconds;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     std::shared_ptr<FilesystemCacheLog> cache_log;
-    String query_id;
-    String source_path;
+    const String query_id;
+    const String source_path;
 
     FileSegmentsHolderPtr file_segments;
 
@@ -71,28 +80,33 @@ public:
         std::unique_ptr<WriteBuffer> impl_,
         FileCachePtr cache_,
         const String & source_path_,
-        const FileCache::Key & key_,
+        const FileCacheKey & key_,
         const String & query_id_,
         const WriteSettings & settings_,
+        const FileCacheUserInfo & user_,
         std::shared_ptr<FilesystemCacheLog> cache_log_);
 
     void nextImpl() override;
 
     void finalizeImpl() override;
 
+    bool cachingStopped() const { return cache_in_error_state_or_disabled; }
+
 private:
     void cacheData(char * data, size_t size, bool throw_on_error);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     FileCachePtr cache;
     String source_path;
-    FileCache::Key key;
+    FileCacheKey key;
+
+    const String query_id;
+    const FileCacheUserInfo user;
+    const size_t reserve_space_lock_wait_timeout_milliseconds;
+    const bool throw_on_error_from_cache;
 
     size_t current_download_offset = 0;
-    const String query_id;
-
-    bool throw_on_error_from_cache;
     bool cache_in_error_state_or_disabled = false;
 
     std::unique_ptr<FileSegmentRangeWriter> cache_writer;
diff --git a/src/Disks/IO/IOUringReader.cpp b/src/Disks/IO/IOUringReader.cpp
index 4c9f665093d..90a4d285ecb 100644
--- a/src/Disks/IO/IOUringReader.cpp
+++ b/src/Disks/IO/IOUringReader.cpp
@@ -46,7 +46,7 @@ namespace ErrorCodes
 }
 
 IOUringReader::IOUringReader(uint32_t entries_)
-    : log(&Poco::Logger::get("IOUringReader"))
+    : log(getLogger("IOUringReader"))
 {
     struct io_uring_probe * probe = io_uring_get_probe();
     if (!probe)
diff --git a/src/Disks/IO/IOUringReader.h b/src/Disks/IO/IOUringReader.h
index b038b3acf7d..89e71e4b215 100644
--- a/src/Disks/IO/IOUringReader.h
+++ b/src/Disks/IO/IOUringReader.h
@@ -73,12 +73,12 @@ private:
         return promise.get_future();
     }
 
-    const Poco::Logger * log;
+    const LoggerPtr log;
 
 public:
-    IOUringReader(uint32_t entries_);
+    explicit IOUringReader(uint32_t entries_);
 
-    inline bool isSupported() { return is_supported; }
+    bool isSupported() const { return is_supported; }
     std::future<Result> submit(Request request) override;
     Result execute(Request /* request */) override { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method `execute` not implemented for IOUringReader"); }
 
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
index 8de977ef876..5947b742339 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.cpp
@@ -8,7 +8,7 @@
 #include <Common/Throttler.h>
 #include <base/sleep.h>
 #include <Common/ProfileEvents.h>
-
+#include <IO/SeekableReadBuffer.h>
 
 namespace ProfileEvents
 {
@@ -27,7 +27,6 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-
 ReadBufferFromAzureBlobStorage::ReadBufferFromAzureBlobStorage(
     std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
     const String & path_,
@@ -56,7 +55,6 @@ ReadBufferFromAzureBlobStorage::ReadBufferFromAzureBlobStorage(
     }
 }
 
-
 void ReadBufferFromAzureBlobStorage::setReadUntilEnd()
 {
     if (read_until_position)
@@ -105,7 +103,7 @@ bool ReadBufferFromAzureBlobStorage::nextImpl()
 
     auto handle_exception = [&, this](const auto & e, size_t i)
     {
-        LOG_INFO(log, "Exception caught during Azure Read for file {} at attempt {}/{}: {}", path, i + 1, max_single_read_retries, e.Message);
+        LOG_DEBUG(log, "Exception caught during Azure Read for file {} at attempt {}/{}: {}", path, i + 1, max_single_read_retries, e.Message);
         if (i + 1 == max_single_read_retries)
             throw;
 
@@ -139,7 +137,6 @@ bool ReadBufferFromAzureBlobStorage::nextImpl()
     return true;
 }
 
-
 off_t ReadBufferFromAzureBlobStorage::seek(off_t offset_, int whence)
 {
     if (offset_ == getPosition() && whence == SEEK_SET)
@@ -193,13 +190,11 @@ off_t ReadBufferFromAzureBlobStorage::seek(off_t offset_, int whence)
     return offset;
 }
 
-
 off_t ReadBufferFromAzureBlobStorage::getPosition()
 {
     return offset - available();
 }
 
-
 void ReadBufferFromAzureBlobStorage::initialize()
 {
     if (initialized)
@@ -220,7 +215,7 @@ void ReadBufferFromAzureBlobStorage::initialize()
 
     auto handle_exception = [&, this](const auto & e, size_t i)
     {
-        LOG_INFO(log, "Exception caught during Azure Download for file {} at offset {} at attempt {}/{}: {}", path, offset, i + 1, max_single_download_retries, e.Message);
+        LOG_DEBUG(log, "Exception caught during Azure Download for file {} at offset {} at attempt {}/{}: {}", path, offset, i + 1, max_single_download_retries, e.Message);
         if (i + 1 == max_single_download_retries)
             throw;
 
@@ -262,6 +257,47 @@ size_t ReadBufferFromAzureBlobStorage::getFileSize()
     return *file_size;
 }
 
+size_t ReadBufferFromAzureBlobStorage::readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & /*progress_callback*/) const
+{
+    size_t initial_n = n;
+
+    size_t sleep_time_with_backoff_milliseconds = 100;
+
+    for (size_t i = 0; i < max_single_download_retries && n > 0; ++i)
+    {
+        size_t bytes_copied = 0;
+        try
+        {
+            Azure::Storage::Blobs::DownloadBlobOptions download_options;
+            download_options.Range = {static_cast<int64_t>(range_begin), n};
+            auto download_response = blob_client->Download(download_options);
+
+            std::unique_ptr<Azure::Core::IO::BodyStream> body_stream = std::move(download_response.Value.BodyStream);
+            bytes_copied = body_stream->ReadToCount(reinterpret_cast<uint8_t *>(to), body_stream->Length());
+
+            LOG_TEST(log, "AzureBlobStorage readBigAt read bytes {}", bytes_copied);
+
+            if (read_settings.remote_throttler)
+                read_settings.remote_throttler->add(bytes_copied, ProfileEvents::RemoteReadThrottlerBytes, ProfileEvents::RemoteReadThrottlerSleepMicroseconds);
+        }
+        catch (const Azure::Core::RequestFailedException & e)
+        {
+            LOG_DEBUG(log, "Exception caught during Azure Download for file {} at offset {} at attempt {}/{}: {}", path, offset, i + 1, max_single_download_retries, e.Message);
+            if (i + 1 == max_single_download_retries)
+                throw;
+
+            sleepForMilliseconds(sleep_time_with_backoff_milliseconds);
+            sleep_time_with_backoff_milliseconds *= 2;
+        }
+
+        range_begin += bytes_copied;
+        to += bytes_copied;
+        n -= bytes_copied;
+    }
+
+    return initial_n;
+}
+
 }
 
 #endif
diff --git a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
index 4e21f543653..d328195cc26 100644
--- a/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/ReadBufferFromAzureBlobStorage.h
@@ -44,6 +44,10 @@ public:
 
     size_t getFileSize() override;
 
+    size_t readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & progress_callback) const override;
+
+    bool supportsReadAt() override { return true; }
+
 private:
 
     void initialize();
@@ -73,7 +77,7 @@ private:
     char * data_ptr;
     size_t data_capacity;
 
-    Poco::Logger * log = &Poco::Logger::get("ReadBufferFromAzureBlobStorage");
+    LoggerPtr log = getLogger("ReadBufferFromAzureBlobStorage");
 };
 
 }
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
index 5ff02ae464c..c77709c27eb 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.cpp
@@ -1,13 +1,12 @@
 #include "ReadBufferFromRemoteFSGather.h"
 
-#include <IO/SeekableReadBuffer.h>
-
 #include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
 #include <Disks/ObjectStorages/Cached/CachedObjectStorage.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <IO/CachedInMemoryReadBufferFromFile.h>
 #include <IO/ReadSettings.h>
 #include <IO/SwapHelper.h>
 #include <Interpreters/FilesystemCacheLog.h>
-#include <base/hex.h>
 #include <Common/logger_useful.h>
 
 using namespace DB;
@@ -15,12 +14,15 @@ using namespace DB;
 
 namespace
 {
-bool withCache(const ReadSettings & settings)
-{
-    return settings.remote_fs_cache && settings.enable_filesystem_cache
-        && (!CurrentThread::getQueryId().empty() || settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache
-            || !settings.avoid_readthrough_cache_outside_query_context);
-}
+    bool withFileCache(const ReadSettings & settings)
+    {
+        return settings.remote_fs_cache && settings.enable_filesystem_cache;
+    }
+
+    bool withPageCache(const ReadSettings & settings, bool with_file_cache)
+    {
+        return settings.page_cache && !with_file_cache && settings.use_page_cache_for_disks_without_file_cache;
+    }
 }
 
 namespace DB
@@ -33,7 +35,7 @@ namespace ErrorCodes
 size_t chooseBufferSizeForRemoteReading(const DB::ReadSettings & settings, size_t file_size)
 {
     /// Only when cache is used we could download bigger portions of FileSegments than what we actually gonna read within particular task.
-    if (!withCache(settings))
+    if (!withFileCache(settings))
         return settings.remote_fs_buffer_size;
 
     /// Buffers used for prefetch and pre-download better to have enough size, but not bigger than the whole file.
@@ -43,27 +45,30 @@ size_t chooseBufferSizeForRemoteReading(const DB::ReadSettings & settings, size_
 ReadBufferFromRemoteFSGather::ReadBufferFromRemoteFSGather(
     ReadBufferCreator && read_buffer_creator_,
     const StoredObjects & blobs_to_read_,
+    const std::string & cache_path_prefix_,
     const ReadSettings & settings_,
     std::shared_ptr<FilesystemCacheLog> cache_log_,
     bool use_external_buffer_)
-    : ReadBufferFromFileBase(
-        use_external_buffer_ ? 0 : chooseBufferSizeForRemoteReading(settings_, getTotalSize(blobs_to_read_)), nullptr, 0)
+    : ReadBufferFromFileBase(use_external_buffer_ ? 0 : chooseBufferSizeForRemoteReading(
+        settings_, getTotalSize(blobs_to_read_)), nullptr, 0)
     , settings(settings_)
     , blobs_to_read(blobs_to_read_)
     , read_buffer_creator(std::move(read_buffer_creator_))
+    , cache_path_prefix(cache_path_prefix_)
     , cache_log(settings.enable_filesystem_cache_log ? cache_log_ : nullptr)
     , query_id(CurrentThread::getQueryId())
     , use_external_buffer(use_external_buffer_)
-    , with_cache(withCache(settings))
-    , log(&Poco::Logger::get("ReadBufferFromRemoteFSGather"))
+    , with_file_cache(withFileCache(settings))
+    , with_page_cache(withPageCache(settings, with_file_cache))
+    , log(getLogger("ReadBufferFromRemoteFSGather"))
 {
     if (!blobs_to_read.empty())
         current_object = blobs_to_read.front();
 }
 
-SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const StoredObject & object)
+SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(const StoredObject & object, size_t start_offset)
 {
-    if (current_buf && !with_cache)
+    if (current_buf && !with_file_cache)
     {
         appendUncachedReadInfo();
     }
@@ -71,29 +76,45 @@ SeekableReadBufferPtr ReadBufferFromRemoteFSGather::createImplementationBuffer(c
     current_object = object;
     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); };
+    std::unique_ptr<ReadBufferFromFileBase> buf;
 
 #ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
-    if (with_cache)
+    if (with_file_cache)
     {
         auto cache_key = settings.remote_fs_cache->createKeyForPath(object_path);
-        return std::make_shared<CachedOnDiskReadBufferFromFile>(
+        buf = std::make_unique<CachedOnDiskReadBufferFromFile>(
             object_path,
             cache_key,
             settings.remote_fs_cache,
-            std::move(current_read_buffer_creator),
+            FileCache::getCommonUser(),
+            [=, this]() { return read_buffer_creator(/* restricted_seek */true, object); },
             settings,
             query_id,
             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::nullopt,
             cache_log);
     }
 #endif
 
-    return current_read_buffer_creator();
+    /// Can't wrap CachedOnDiskReadBufferFromFile in CachedInMemoryReadBufferFromFile because the
+    /// former doesn't support seeks.
+    if (with_page_cache && !buf)
+    {
+        auto inner = read_buffer_creator(/* restricted_seek */false, object);
+        auto cache_key = FileChunkAddress { .path = cache_path_prefix + object_path };
+        buf = std::make_unique<CachedInMemoryReadBufferFromFile>(
+            cache_key, settings.page_cache, std::move(inner), settings);
+    }
+
+    if (!buf)
+        buf = read_buffer_creator(/* restricted_seek */true, object);
+
+    if (read_until_position > start_offset && read_until_position < start_offset + object.bytes_size)
+        buf->setReadUntilPosition(read_until_position - start_offset);
+
+    return buf;
 }
 
 void ReadBufferFromRemoteFSGather::appendUncachedReadInfo()
@@ -122,12 +143,12 @@ void ReadBufferFromRemoteFSGather::initialize()
         return;
 
     /// One clickhouse file can be split into multiple files in remote fs.
-    auto current_buf_offset = file_offset_of_buffer_end;
+    size_t start_offset = 0;
     for (size_t i = 0; i < blobs_to_read.size(); ++i)
     {
         const auto & object = blobs_to_read[i];
 
-        if (object.bytes_size > current_buf_offset)
+        if (start_offset + object.bytes_size > file_offset_of_buffer_end)
         {
             LOG_TEST(log, "Reading from file: {} ({})", object.remote_path, object.local_path);
 
@@ -135,14 +156,14 @@ void ReadBufferFromRemoteFSGather::initialize()
             if (!current_buf || current_buf_idx != i)
             {
                 current_buf_idx = i;
-                current_buf = createImplementationBuffer(object);
+                current_buf = createImplementationBuffer(object, start_offset);
             }
 
-            current_buf->seek(current_buf_offset, SEEK_SET);
+            current_buf->seek(file_offset_of_buffer_end - start_offset, SEEK_SET);
             return;
         }
 
-        current_buf_offset -= object.bytes_size;
+        start_offset += object.bytes_size;
     }
     current_buf_idx = blobs_to_read.size();
     current_buf = nullptr;
@@ -169,14 +190,14 @@ bool ReadBufferFromRemoteFSGather::nextImpl()
 bool ReadBufferFromRemoteFSGather::moveToNextBuffer()
 {
     /// If there is no available buffers - nothing to read.
-    if (current_buf_idx + 1 >= blobs_to_read.size())
+    if (current_buf_idx + 1 >= blobs_to_read.size() || (read_until_position && file_offset_of_buffer_end >= read_until_position))
         return false;
 
     ++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);
+    current_buf = createImplementationBuffer(object, file_offset_of_buffer_end);
 
     return true;
 }
@@ -261,7 +282,7 @@ off_t ReadBufferFromRemoteFSGather::seek(off_t offset, int whence)
 
 ReadBufferFromRemoteFSGather::~ReadBufferFromRemoteFSGather()
 {
-    if (!with_cache)
+    if (!with_file_cache)
         appendUncachedReadInfo();
 }
 
diff --git a/src/Disks/IO/ReadBufferFromRemoteFSGather.h b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
index 2764ed2d021..d5dfa18987a 100644
--- a/src/Disks/IO/ReadBufferFromRemoteFSGather.h
+++ b/src/Disks/IO/ReadBufferFromRemoteFSGather.h
@@ -21,11 +21,12 @@ class ReadBufferFromRemoteFSGather final : public ReadBufferFromFileBase
 friend class ReadIndirectBufferFromRemoteFS;
 
 public:
-    using ReadBufferCreator = std::function<std::unique_ptr<ReadBufferFromFileBase>(const std::string & path, size_t read_until_position)>;
+    using ReadBufferCreator = std::function<std::unique_ptr<ReadBufferFromFileBase>(bool restricted_seek, const StoredObject & object)>;
 
     ReadBufferFromRemoteFSGather(
         ReadBufferCreator && read_buffer_creator_,
         const StoredObjects & blobs_to_read_,
+        const std::string & cache_path_prefix_,
         const ReadSettings & settings_,
         std::shared_ptr<FilesystemCacheLog> cache_log_,
         bool use_external_buffer_);
@@ -53,7 +54,7 @@ public:
     bool isContentCached(size_t offset, size_t size) override;
 
 private:
-    SeekableReadBufferPtr createImplementationBuffer(const StoredObject & object);
+    SeekableReadBufferPtr createImplementationBuffer(const StoredObject & object, size_t start_offset);
 
     bool nextImpl() override;
 
@@ -70,10 +71,12 @@ private:
     const ReadSettings settings;
     const StoredObjects blobs_to_read;
     const ReadBufferCreator read_buffer_creator;
+    const std::string cache_path_prefix;
     const std::shared_ptr<FilesystemCacheLog> cache_log;
     const String query_id;
     const bool use_external_buffer;
-    const bool with_cache;
+    const bool with_file_cache;
+    const bool with_page_cache;
 
     size_t read_until_position = 0;
     size_t file_offset_of_buffer_end = 0;
@@ -82,7 +85,7 @@ private:
     size_t current_buf_idx = 0;
     SeekableReadBufferPtr current_buf;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 size_t chooseBufferSizeForRemoteReading(const DB::ReadSettings & settings, size_t file_size);
diff --git a/src/Disks/IO/ReadBufferFromWebServer.cpp b/src/Disks/IO/ReadBufferFromWebServer.cpp
index 90cd5285875..7c5de8a13de 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.cpp
+++ b/src/Disks/IO/ReadBufferFromWebServer.cpp
@@ -1,8 +1,6 @@
 #include "ReadBufferFromWebServer.h"
 
 #include <Common/logger_useful.h>
-#include <base/sleep.h>
-#include <Core/Types.h>
 #include <IO/ReadWriteBufferFromHTTP.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/Operators.h>
@@ -23,11 +21,12 @@ namespace ErrorCodes
 ReadBufferFromWebServer::ReadBufferFromWebServer(
     const String & url_,
     ContextPtr context_,
+    size_t file_size_,
     const ReadSettings & settings_,
     bool use_external_buffer_,
     size_t read_until_position_)
-    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0)
-    , log(&Poco::Logger::get("ReadBufferFromWebServer"))
+    : ReadBufferFromFileBase(settings_.remote_fs_buffer_size, nullptr, 0, file_size_)
+    , log(getLogger("ReadBufferFromWebServer"))
     , context(context_)
     , url(url_)
     , buf_size(settings_.remote_fs_buffer_size)
@@ -38,41 +37,30 @@ ReadBufferFromWebServer::ReadBufferFromWebServer(
 }
 
 
-std::unique_ptr<ReadBuffer> ReadBufferFromWebServer::initialize()
+std::unique_ptr<SeekableReadBuffer> ReadBufferFromWebServer::initialize()
 {
     Poco::URI uri(url);
     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);
-
-        LOG_DEBUG(log, "Reading with range: {}-{}", offset, read_until_position);
-    }
-    else
-    {
-        LOG_DEBUG(log, "Reading from offset: {}", offset);
     }
 
     const auto & settings = context->getSettingsRef();
     const auto & server_settings = context->getServerSettings();
 
-    auto res = std::make_unique<ReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_GET,
-        ReadWriteBufferFromHTTP::OutStreamCallback(),
-        ConnectionTimeouts(std::max(Poco::Timespan(settings.http_connection_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
-                           settings.http_send_timeout,
-                           std::max(Poco::Timespan(settings.http_receive_timeout.totalSeconds(), 0), Poco::Timespan(20, 0)),
-                           settings.tcp_keep_alive_timeout,
-                           server_settings.keep_alive_timeout),
-        credentials,
-        0,
-        buf_size,
-        read_settings,
-        HTTPHeaderEntries{},
-        &context->getRemoteHostFilter(),
-        /* delay_initialization */true,
-        use_external_buffer);
+    auto connection_timeouts = ConnectionTimeouts::getHTTPTimeouts(settings, server_settings.keep_alive_timeout);
+    connection_timeouts.withConnectionTimeout(std::max<Poco::Timespan>(settings.http_connection_timeout, Poco::Timespan(20, 0)));
+    connection_timeouts.withReceiveTimeout(std::max<Poco::Timespan>(settings.http_receive_timeout, Poco::Timespan(20, 0)));
+
+    auto res = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::DISK)
+                   .withSettings(read_settings)
+                   .withTimeouts(connection_timeouts)
+                   .withBufSize(buf_size)
+                   .withHostFilter(&context->getRemoteHostFilter())
+                   .withExternalBuf(use_external_buffer)
+                   .create(credentials);
 
     if (read_until_position)
         res->setReadUntilPosition(read_until_position);
@@ -101,44 +89,42 @@ bool ReadBufferFromWebServer::nextImpl()
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to read beyond right offset ({} > {})", offset, read_until_position - 1);
     }
 
-    if (impl)
-    {
-        if (!use_external_buffer)
-        {
-            /**
-            * impl was initialized before, pass position() to it to make
-            * sure there is no pending data which was not read, because
-            * this branch means we read sequentially.
-            */
-            impl->position() = position();
-            assert(!impl->hasPendingData());
-        }
-    }
-    else
+    if (!impl)
     {
         impl = initialize();
+
+        if (!use_external_buffer)
+        {
+            BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset());
+        }
     }
 
     if (use_external_buffer)
     {
-        /**
-        * 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, 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());
+    }
+    else
+    {
+        impl->position() = position();
     }
 
+    chassert(available() == 0);
+
+    chassert(pos >= working_buffer.begin());
+    chassert(pos <= working_buffer.end());
+
+    chassert(working_buffer.begin() != nullptr);
+    chassert(impl->buffer().begin() != nullptr);
+
+    chassert(impl->available() == 0);
+
     auto result = impl->next();
+
+    working_buffer = impl->buffer();
+    pos = impl->position();
+
     if (result)
-    {
-        BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset());
         offset += working_buffer.size();
-    }
 
     return result;
 }
@@ -146,16 +132,29 @@ bool ReadBufferFromWebServer::nextImpl()
 
 off_t ReadBufferFromWebServer::seek(off_t offset_, int whence)
 {
-    if (impl)
-        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Seek is allowed only before first read attempt from the buffer");
-
     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_);
 
-    offset = offset_;
+    if (impl)
+    {
+        if (use_external_buffer)
+        {
+            impl->set(internal_buffer.begin(), internal_buffer.size());
+        }
+
+        impl->seek(offset_, SEEK_SET);
+
+        working_buffer = impl->buffer();
+        pos = impl->position();
+        offset = offset_ + available();
+    }
+    else
+    {
+        offset = offset_;
+    }
 
     return offset;
 }
diff --git a/src/Disks/IO/ReadBufferFromWebServer.h b/src/Disks/IO/ReadBufferFromWebServer.h
index b4edf16b095..e4f436f2eb3 100644
--- a/src/Disks/IO/ReadBufferFromWebServer.h
+++ b/src/Disks/IO/ReadBufferFromWebServer.h
@@ -20,6 +20,7 @@ public:
     explicit ReadBufferFromWebServer(
         const String & url_,
         ContextPtr context_,
+        size_t file_size_,
         const ReadSettings & settings_ = {},
         bool use_external_buffer_ = false,
         size_t read_until_position = 0);
@@ -39,15 +40,15 @@ public:
     bool supportsRightBoundedReads() const override { return true; }
 
 private:
-    std::unique_ptr<ReadBuffer> initialize();
+    std::unique_ptr<SeekableReadBuffer> initialize();
 
-    Poco::Logger * log;
+    LoggerPtr log;
     ContextPtr context;
 
     const String url;
     size_t buf_size;
 
-    std::unique_ptr<ReadBuffer> impl;
+    std::unique_ptr<SeekableReadBuffer> impl;
 
     ReadSettings read_settings;
 
diff --git a/src/Disks/IO/ThreadPoolReader.h b/src/Disks/IO/ThreadPoolReader.h
index 42bc9bf8bb4..b8aff9f22a2 100644
--- a/src/Disks/IO/ThreadPoolReader.h
+++ b/src/Disks/IO/ThreadPoolReader.h
@@ -3,7 +3,7 @@
 #include <memory>
 #include <IO/AsynchronousReader.h>
 #include <Common/ThreadPool_fwd.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 
 
 namespace DB
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.cpp b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
index f3caf62ffd5..590fc4c4656 100644
--- a/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.cpp
@@ -152,6 +152,8 @@ IAsynchronousReader::Result ThreadPoolRemoteFSReader::execute(Request request, b
     IAsynchronousReader::Result read_result;
     if (result)
     {
+        chassert(reader.buffer().begin() == request.buf);
+        chassert(reader.buffer().end() <= request.buf + request.size);
         read_result.size = reader.buffer().size();
         read_result.offset = reader.offset();
         ProfileEvents::increment(ProfileEvents::ThreadpoolReaderReadBytes, read_result.size);
diff --git a/src/Disks/IO/ThreadPoolRemoteFSReader.h b/src/Disks/IO/ThreadPoolRemoteFSReader.h
index cd2bf223f33..eacce5a54ac 100644
--- a/src/Disks/IO/ThreadPoolRemoteFSReader.h
+++ b/src/Disks/IO/ThreadPoolRemoteFSReader.h
@@ -3,7 +3,7 @@
 #include <IO/AsynchronousReader.h>
 #include <IO/SeekableReadBuffer.h>
 #include <Common/ThreadPool_fwd.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 
 namespace DB
 {
@@ -29,6 +29,9 @@ private:
 class RemoteFSFileDescriptor : public IAsynchronousReader::IFileDescriptor
 {
 public:
+    /// `reader_` implementation must ensure that next() places data at the start of internal_buffer,
+    /// even if there was previously a seek. I.e. seek() shouldn't leave pending data (no short seek
+    /// optimization), and nextImpl() shouldn't assign nextimpl_working_buffer_offset.
     explicit RemoteFSFileDescriptor(
         SeekableReadBuffer & reader_,
         std::shared_ptr<AsyncReadCounters> async_read_counters_)
diff --git a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
index 60bc04f5f95..fe64415191c 100644
--- a/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.cpp
@@ -6,7 +6,7 @@
 #include <Common/getRandomASCIIString.h>
 #include <Common/logger_useful.h>
 #include <Common/Throttler.h>
-#include <IO/ResourceGuard.h>
+#include <Common/Scheduler/ResourceGuard.h>
 
 
 namespace ProfileEvents
@@ -18,27 +18,67 @@ namespace ProfileEvents
 namespace DB
 {
 
-static constexpr auto DEFAULT_RETRY_NUM = 3;
+struct WriteBufferFromAzureBlobStorage::PartData
+{
+    Memory<> memory;
+    size_t data_size = 0;
+    std::string block_id;
+};
+
+BufferAllocationPolicyPtr createBufferAllocationPolicy(const AzureObjectStorageSettings & settings)
+{
+    BufferAllocationPolicy::Settings allocation_settings;
+    allocation_settings.strict_size = settings.strict_upload_part_size;
+    allocation_settings.min_size = settings.min_upload_part_size;
+    allocation_settings.max_size = settings.max_upload_part_size;
+    allocation_settings.multiply_factor = settings.upload_part_size_multiply_factor;
+    allocation_settings.multiply_parts_count_threshold = settings.upload_part_size_multiply_parts_count_threshold;
+    allocation_settings.max_single_size = settings.max_single_part_upload_size;
+
+    return BufferAllocationPolicy::create(allocation_settings);
+}
 
 WriteBufferFromAzureBlobStorage::WriteBufferFromAzureBlobStorage(
     std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> blob_container_client_,
     const String & blob_path_,
-    size_t max_single_part_upload_size_,
     size_t buf_size_,
-    const WriteSettings & write_settings_)
+    const WriteSettings & write_settings_,
+    std::shared_ptr<const AzureObjectStorageSettings> settings_,
+    ThreadPoolCallbackRunner<void> schedule_)
     : WriteBufferFromFileBase(buf_size_, nullptr, 0)
-    , log(&Poco::Logger::get("WriteBufferFromAzureBlobStorage"))
-    , max_single_part_upload_size(max_single_part_upload_size_)
+    , log(getLogger("WriteBufferFromAzureBlobStorage"))
+    , buffer_allocation_policy(createBufferAllocationPolicy(*settings_))
+    , max_single_part_upload_size(settings_->max_single_part_upload_size)
+    , max_unexpected_write_error_retries(settings_->max_unexpected_write_error_retries)
     , blob_path(blob_path_)
     , write_settings(write_settings_)
     , blob_container_client(blob_container_client_)
+    , task_tracker(
+          std::make_unique<TaskTracker>(
+              std::move(schedule_),
+              settings_->max_inflight_parts_for_one_file,
+              limitedLog))
 {
+    allocateBuffer();
 }
 
 
 WriteBufferFromAzureBlobStorage::~WriteBufferFromAzureBlobStorage()
 {
-    finalize();
+    LOG_TRACE(limitedLog, "Close WriteBufferFromAzureBlobStorage. {}.", blob_path);
+
+    /// That destructor could be call with finalized=false in case of exceptions
+    if (!finalized)
+    {
+        LOG_INFO(
+            log,
+            "WriteBufferFromAzureBlobStorage is not finalized in destructor. "
+            "The file might not be written to AzureBlobStorage. "
+            "{}.",
+            blob_path);
+    }
+
+    task_tracker->safeWaitAll();
 }
 
 void WriteBufferFromAzureBlobStorage::execWithRetry(std::function<void()> func, size_t num_tries, size_t cost)
@@ -75,64 +115,89 @@ void WriteBufferFromAzureBlobStorage::execWithRetry(std::function<void()> func,
     }
 }
 
+void WriteBufferFromAzureBlobStorage::preFinalize()
+{
+    if (is_prefinalized)
+        return;
+
+    // This function should not be run again
+    is_prefinalized = true;
+
+    /// If there is only one block and size is less than or equal to max_single_part_upload_size
+    /// then we use single part upload instead of multi part upload
+    if (buffer_allocation_policy->getBufferNumber() == 1)
+    {
+        size_t data_size = size_t(position() - memory.data());
+        if (data_size <= max_single_part_upload_size)
+        {
+            auto block_blob_client = blob_container_client->GetBlockBlobClient(blob_path);
+            Azure::Core::IO::MemoryBodyStream memory_stream(reinterpret_cast<const uint8_t *>(memory.data()), data_size);
+            execWithRetry([&](){ block_blob_client.Upload(memory_stream); }, max_unexpected_write_error_retries, data_size);
+            LOG_TRACE(log, "Committed single block for blob `{}`", blob_path);
+            return;
+        }
+    }
+
+    writePart();
+}
+
 void WriteBufferFromAzureBlobStorage::finalizeImpl()
 {
-    execWithRetry([this](){ next(); }, DEFAULT_RETRY_NUM);
+    LOG_TRACE(log, "finalizeImpl WriteBufferFromAzureBlobStorage {}", blob_path);
 
-    if (tmp_buffer_write_offset > 0)
-        uploadBlock(tmp_buffer->data(), tmp_buffer_write_offset);
+    if (!is_prefinalized)
+        preFinalize();
 
-    auto block_blob_client = blob_container_client->GetBlockBlobClient(blob_path);
-    execWithRetry([&](){ block_blob_client.CommitBlockList(block_ids); }, DEFAULT_RETRY_NUM);
-
-    LOG_TRACE(log, "Committed {} blocks for blob `{}`", block_ids.size(), blob_path);
-}
-
-void WriteBufferFromAzureBlobStorage::uploadBlock(const char * data, size_t size)
-{
-    auto block_blob_client = blob_container_client->GetBlockBlobClient(blob_path);
-    const std::string & block_id = block_ids.emplace_back(getRandomASCIIString(64));
-
-    Azure::Core::IO::MemoryBodyStream memory_stream(reinterpret_cast<const uint8_t *>(data), size);
-    execWithRetry([&](){ block_blob_client.StageBlock(block_id, memory_stream); }, DEFAULT_RETRY_NUM, size);
-    tmp_buffer_write_offset = 0;
-
-    LOG_TRACE(log, "Staged block (id: {}) of size {} (blob path: {}).", block_id, size, blob_path);
-}
-
-WriteBufferFromAzureBlobStorage::MemoryBufferPtr WriteBufferFromAzureBlobStorage::allocateBuffer() const
-{
-    return std::make_unique<Memory<>>(max_single_part_upload_size);
+    if (!block_ids.empty())
+    {
+        task_tracker->waitAll();
+        auto block_blob_client = blob_container_client->GetBlockBlobClient(blob_path);
+        execWithRetry([&](){ block_blob_client.CommitBlockList(block_ids); }, max_unexpected_write_error_retries);
+        LOG_TRACE(log, "Committed {} blocks for blob `{}`", block_ids.size(), blob_path);
+    }
 }
 
 void WriteBufferFromAzureBlobStorage::nextImpl()
 {
-    size_t size_to_upload = offset();
+    task_tracker->waitIfAny();
+    writePart();
+    allocateBuffer();
+}
 
-    if (size_to_upload == 0)
+void WriteBufferFromAzureBlobStorage::allocateBuffer()
+{
+    buffer_allocation_policy->nextBuffer();
+    auto size = buffer_allocation_policy->getBufferSize();
+
+    if (buffer_allocation_policy->getBufferNumber() == 1)
+        size = std::min(size_t(DBMS_DEFAULT_BUFFER_SIZE), size);
+
+    memory = Memory(size);
+    WriteBuffer::set(memory.data(), memory.size());
+}
+
+void WriteBufferFromAzureBlobStorage::writePart()
+{
+    auto data_size = size_t(position() - memory.data());
+    if (data_size == 0)
         return;
 
-    if (!tmp_buffer)
-        tmp_buffer = allocateBuffer();
+    const std::string & block_id = block_ids.emplace_back(getRandomASCIIString(64));
+    std::shared_ptr<PartData> part_data = std::make_shared<PartData>(std::move(memory), data_size, block_id);
+    WriteBuffer::set(nullptr, 0);
 
-    size_t uploaded_size = 0;
-    while (uploaded_size != size_to_upload)
+    auto upload_worker = [this, part_data] ()
     {
-        size_t memory_buffer_remaining_size = max_single_part_upload_size - tmp_buffer_write_offset;
-        if (memory_buffer_remaining_size == 0)
-            uploadBlock(tmp_buffer->data(), tmp_buffer->size());
+        auto block_blob_client = blob_container_client->GetBlockBlobClient(blob_path);
 
-        size_t size = std::min(memory_buffer_remaining_size, size_to_upload - uploaded_size);
-        memcpy(tmp_buffer->data() + tmp_buffer_write_offset, working_buffer.begin() + uploaded_size, size);
-        uploaded_size += size;
-        tmp_buffer_write_offset += size;
-    }
+        Azure::Core::IO::MemoryBodyStream memory_stream(reinterpret_cast<const uint8_t *>(part_data->memory.data()), part_data->data_size);
+        execWithRetry([&](){ block_blob_client.StageBlock(part_data->block_id, memory_stream); }, max_unexpected_write_error_retries, part_data->data_size);
 
-    if (tmp_buffer_write_offset == max_single_part_upload_size)
-        uploadBlock(tmp_buffer->data(), tmp_buffer->size());
+        if (write_settings.remote_throttler)
+            write_settings.remote_throttler->add(part_data->data_size, ProfileEvents::RemoteWriteThrottlerBytes, ProfileEvents::RemoteWriteThrottlerSleepMicroseconds);
+    };
 
-    if (write_settings.remote_throttler)
-        write_settings.remote_throttler->add(size_to_upload, ProfileEvents::RemoteWriteThrottlerBytes, ProfileEvents::RemoteWriteThrottlerSleepMicroseconds);
+    task_tracker->add(std::move(upload_worker));
 }
 
 }
diff --git a/src/Disks/IO/WriteBufferFromAzureBlobStorage.h b/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
index f1be81922e1..7d4081ad792 100644
--- a/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
+++ b/src/Disks/IO/WriteBufferFromAzureBlobStorage.h
@@ -11,7 +11,9 @@
 #include <IO/WriteSettings.h>
 #include <azure/storage/blobs.hpp>
 #include <azure/core/io/body_stream.hpp>
-
+#include <Common/ThreadPoolTaskTracker.h>
+#include <Common/BufferAllocationPolicy.h>
+#include <Storages/StorageAzureBlob.h>
 
 namespace Poco
 {
@@ -21,6 +23,8 @@ class Logger;
 namespace DB
 {
 
+class TaskTracker;
+
 class WriteBufferFromAzureBlobStorage : public WriteBufferFromFileBase
 {
 public:
@@ -29,28 +33,41 @@ public:
     WriteBufferFromAzureBlobStorage(
         AzureClientPtr blob_container_client_,
         const String & blob_path_,
-        size_t max_single_part_upload_size_,
         size_t buf_size_,
-        const WriteSettings & write_settings_);
+        const WriteSettings & write_settings_,
+        std::shared_ptr<const AzureObjectStorageSettings> settings_,
+        ThreadPoolCallbackRunner<void> schedule_ = {});
 
     ~WriteBufferFromAzureBlobStorage() override;
 
     void nextImpl() override;
-
+    void preFinalize() override;
     std::string getFileName() const override { return blob_path; }
     void sync() override { next(); }
 
 private:
+    struct PartData;
+
+    void writePart();
+    void allocateBuffer();
+
     void finalizeImpl() override;
     void execWithRetry(std::function<void()> func, size_t num_tries, size_t cost = 0);
     void uploadBlock(const char * data, size_t size);
 
-    Poco::Logger * log;
+    LoggerPtr log;
+    LogSeriesLimiterPtr limitedLog = std::make_shared<LogSeriesLimiter>(log, 1, 5);
+
+    BufferAllocationPolicyPtr buffer_allocation_policy;
 
     const size_t max_single_part_upload_size;
+    const size_t max_unexpected_write_error_retries;
     const std::string blob_path;
     const WriteSettings write_settings;
 
+    /// Track that prefinalize() is called only once
+    bool is_prefinalized = false;
+
     AzureClientPtr blob_container_client;
     std::vector<std::string> block_ids;
 
@@ -59,6 +76,10 @@ private:
     size_t tmp_buffer_write_offset = 0;
 
     MemoryBufferPtr allocateBuffer() const;
+
+    bool first_buffer=true;
+
+    std::unique_ptr<TaskTracker> task_tracker;
 };
 
 }
diff --git a/src/Disks/IO/createReadBufferFromFileBase.cpp b/src/Disks/IO/createReadBufferFromFileBase.cpp
index 236dd43e9ee..a9d451496ff 100644
--- a/src/Disks/IO/createReadBufferFromFileBase.cpp
+++ b/src/Disks/IO/createReadBufferFromFileBase.cpp
@@ -36,8 +36,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     std::optional<size_t> file_size,
     int flags,
     char * existing_memory,
-    size_t alignment,
-    bool use_external_buffer)
+    size_t alignment)
 {
     if (file_size.has_value() && !*file_size)
         return std::make_unique<ReadBufferFromEmptyFile>();
@@ -149,8 +148,7 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
                 existing_memory,
                 buffer_alignment,
                 file_size,
-                settings.local_throttler,
-                use_external_buffer);
+                settings.local_throttler);
         }
         else
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown read method");
diff --git a/src/Disks/IO/createReadBufferFromFileBase.h b/src/Disks/IO/createReadBufferFromFileBase.h
index a00456eda82..e93725a967d 100644
--- a/src/Disks/IO/createReadBufferFromFileBase.h
+++ b/src/Disks/IO/createReadBufferFromFileBase.h
@@ -21,6 +21,5 @@ std::unique_ptr<ReadBufferFromFileBase> createReadBufferFromFileBase(
     std::optional<size_t> file_size = {},
     int flags_ = -1,
     char * existing_memory = nullptr,
-    size_t alignment = 0,
-    bool use_external_buffer = false);
+    size_t alignment = 0);
 }
diff --git a/src/Disks/IVolume.cpp b/src/Disks/IVolume.cpp
index 0b072e6ba8b..d763c55c4aa 100644
--- a/src/Disks/IVolume.cpp
+++ b/src/Disks/IVolume.cpp
@@ -46,7 +46,7 @@ IVolume::IVolume(
     }
 
     if (disks.empty())
-        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Volume must contain at least one disk");
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Volume {} must contain at least one disk", name);
 }
 
 std::optional<UInt64> IVolume::getMaxUnreservedFreeSpace() const
diff --git a/src/Disks/IVolume.h b/src/Disks/IVolume.h
index f40d4dcba60..2da896a3514 100644
--- a/src/Disks/IVolume.h
+++ b/src/Disks/IVolume.h
@@ -64,7 +64,7 @@ public:
         DiskSelectorPtr disk_selector
     );
 
-    virtual ReservationPtr reserve(UInt64 bytes) override = 0;
+    ReservationPtr reserve(UInt64 bytes) override = 0;
 
     /// This is a volume.
     bool isVolume() const override { return true; }
@@ -92,6 +92,8 @@ protected:
     const String name;
 
 public:
+    /// Volume priority. Maximum UInt64 value by default (lowest possible priority)
+    UInt64 volume_priority;
     /// Max size of reservation, zero means unlimited size
     UInt64 max_data_part_size = 0;
     /// Should a new data part be synchronously moved to a volume according to ttl on insert
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
index 0e5bd64b155..e7ee768876f 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.cpp
@@ -7,6 +7,7 @@
 #include <optional>
 #include <azure/identity/managed_identity_credential.hpp>
 #include <Poco/Util/AbstractConfiguration.h>
+#include <Interpreters/Context.h>
 
 using namespace Azure::Storage::Blobs;
 
@@ -19,13 +20,6 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-struct AzureBlobStorageEndpoint
-{
-    const String storage_account_url;
-    const String container_name;
-    const std::optional<bool> container_already_exists;
-};
-
 
 void validateStorageAccountUrl(const String & storage_account_url)
 {
@@ -57,22 +51,89 @@ void validateContainerName(const String & container_name)
 
 AzureBlobStorageEndpoint processAzureBlobStorageEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
 {
-    std::string storage_url;
-    if (config.has(config_prefix + ".storage_account_url"))
+    String storage_url;
+    String account_name;
+    String container_name;
+    String prefix;
+    if (config.has(config_prefix + ".endpoint"))
+    {
+        String endpoint = config.getString(config_prefix + ".endpoint");
+
+        /// For some authentication methods account name is not present in the endpoint
+        /// 'endpoint_contains_account_name' bool is used to understand how to split the endpoint (default : true)
+        bool endpoint_contains_account_name = config.getBool(config_prefix + ".endpoint_contains_account_name", true);
+
+        size_t pos = endpoint.find("//");
+        if (pos == std::string::npos)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected '//' in endpoint");
+
+        if (endpoint_contains_account_name)
+        {
+            size_t acc_pos_begin = endpoint.find('/', pos+2);
+            if (acc_pos_begin == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected account_name in endpoint");
+
+            storage_url = endpoint.substr(0,acc_pos_begin);
+            size_t acc_pos_end = endpoint.find('/',acc_pos_begin+1);
+
+            if (acc_pos_end == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
+
+            account_name = endpoint.substr(acc_pos_begin+1,(acc_pos_end-acc_pos_begin)-1);
+
+            size_t cont_pos_end = endpoint.find('/', acc_pos_end+1);
+
+            if (cont_pos_end != std::string::npos)
+            {
+                container_name = endpoint.substr(acc_pos_end+1,(cont_pos_end-acc_pos_end)-1);
+                prefix = endpoint.substr(cont_pos_end+1);
+            }
+            else
+            {
+                container_name = endpoint.substr(acc_pos_end+1);
+            }
+        }
+        else
+        {
+            size_t cont_pos_begin = endpoint.find('/', pos+2);
+
+            if (cont_pos_begin == std::string::npos)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected container_name in endpoint");
+
+            storage_url = endpoint.substr(0,cont_pos_begin);
+            size_t cont_pos_end = endpoint.find('/',cont_pos_begin+1);
+
+            if (cont_pos_end != std::string::npos)
+            {
+                container_name = endpoint.substr(cont_pos_begin+1,(cont_pos_end-cont_pos_begin)-1);
+                prefix = endpoint.substr(cont_pos_end+1);
+            }
+            else
+            {
+                container_name = endpoint.substr(cont_pos_begin+1);
+            }
+        }
+    }
+    else if (config.has(config_prefix + ".connection_string"))
+    {
+        storage_url = config.getString(config_prefix + ".connection_string");
+        container_name = config.getString(config_prefix + ".container_name");
+    }
+    else if (config.has(config_prefix + ".storage_account_url"))
     {
         storage_url = config.getString(config_prefix + ".storage_account_url");
         validateStorageAccountUrl(storage_url);
+        container_name = config.getString(config_prefix + ".container_name");
     }
     else
-    {
-        storage_url = config.getString(config_prefix + ".connection_string");
-    }
-    String container_name = config.getString(config_prefix + ".container_name", "default-container");
-    validateContainerName(container_name);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected either `storage_account_url` or `connection_string` or `endpoint` in config");
+
+    if (!container_name.empty())
+        validateContainerName(container_name);
     std::optional<bool> container_already_exists {};
     if (config.has(config_prefix + ".container_already_exists"))
         container_already_exists = {config.getBool(config_prefix + ".container_already_exists")};
-    return {storage_url, container_name, container_already_exists};
+    return {storage_url, account_name, container_name, prefix, container_already_exists};
 }
 
 
@@ -100,11 +161,12 @@ template <class T>
 std::unique_ptr<T> getAzureBlobStorageClientWithAuth(
     const String & url, const String & container_name, const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
 {
+    std::string connection_str;
     if (config.has(config_prefix + ".connection_string"))
-    {
-        String connection_str = config.getString(config_prefix + ".connection_string");
+        connection_str = config.getString(config_prefix + ".connection_string");
+
+    if (!connection_str.empty())
         return getClientWithConnectionString<T>(connection_str, container_name);
-    }
 
     if (config.has(config_prefix + ".account_key") && config.has(config_prefix + ".account_name"))
     {
@@ -125,14 +187,13 @@ std::unique_ptr<BlobContainerClient> getAzureBlobContainerClient(
 {
     auto endpoint = processAzureBlobStorageEndpoint(config, config_prefix);
     auto container_name = endpoint.container_name;
-    auto final_url = endpoint.storage_account_url
-        + (endpoint.storage_account_url.back() == '/' ? "" : "/")
-        + container_name;
+    auto final_url = endpoint.getEndpoint();
 
     if (endpoint.container_already_exists.value_or(false))
         return getAzureBlobStorageClientWithAuth<BlobContainerClient>(final_url, container_name, config, config_prefix);
 
-    auto blob_service_client = getAzureBlobStorageClientWithAuth<BlobServiceClient>(endpoint.storage_account_url, container_name, config, config_prefix);
+    auto blob_service_client = getAzureBlobStorageClientWithAuth<BlobServiceClient>(
+        endpoint.getEndpointWithoutContainer(), container_name, config, config_prefix);
 
     try
     {
@@ -149,15 +210,25 @@ std::unique_ptr<BlobContainerClient> getAzureBlobContainerClient(
     }
 }
 
-std::unique_ptr<AzureObjectStorageSettings> getAzureBlobStorageSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr /*context*/)
+std::unique_ptr<AzureObjectStorageSettings> getAzureBlobStorageSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
 {
-    return std::make_unique<AzureObjectStorageSettings>(
-        config.getUInt64(config_prefix + ".max_single_part_upload_size", 100 * 1024 * 1024),
-        config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-        config.getInt(config_prefix + ".max_single_read_retries", 3),
-        config.getInt(config_prefix + ".max_single_download_retries", 3),
-        config.getInt(config_prefix + ".list_object_keys_size", 1000)
-    );
+    std::unique_ptr<AzureObjectStorageSettings> settings = std::make_unique<AzureObjectStorageSettings>();
+    settings->max_single_part_upload_size = config.getUInt64(config_prefix + ".max_single_part_upload_size", context->getSettings().azure_max_single_part_upload_size);
+    settings->min_bytes_for_seek = config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024);
+    settings->max_single_read_retries = config.getInt(config_prefix + ".max_single_read_retries", 3);
+    settings->max_single_download_retries = config.getInt(config_prefix + ".max_single_download_retries", 3);
+    settings->list_object_keys_size = config.getInt(config_prefix + ".list_object_keys_size", 1000);
+    settings->min_upload_part_size = config.getUInt64(config_prefix + ".min_upload_part_size", context->getSettings().azure_min_upload_part_size);
+    settings->max_upload_part_size = config.getUInt64(config_prefix + ".max_upload_part_size", context->getSettings().azure_max_upload_part_size);
+    settings->max_single_part_copy_size = config.getUInt64(config_prefix + ".max_single_part_copy_size", context->getSettings().azure_max_single_part_copy_size);
+    settings->use_native_copy = config.getBool(config_prefix + ".use_native_copy", false);
+    settings->max_unexpected_write_error_retries = config.getUInt64(config_prefix + ".max_unexpected_write_error_retries", context->getSettings().azure_max_unexpected_write_error_retries);
+    settings->max_inflight_parts_for_one_file = config.getUInt64(config_prefix + ".max_inflight_parts_for_one_file", context->getSettings().azure_max_inflight_parts_for_one_file);
+    settings->strict_upload_part_size = config.getUInt64(config_prefix + ".strict_upload_part_size", context->getSettings().azure_strict_upload_part_size);
+    settings->upload_part_size_multiply_factor = config.getUInt64(config_prefix + ".upload_part_size_multiply_factor", context->getSettings().azure_upload_part_size_multiply_factor);
+    settings->upload_part_size_multiply_parts_count_threshold = config.getUInt64(config_prefix + ".upload_part_size_multiply_parts_count_threshold", context->getSettings().azure_upload_part_size_multiply_parts_count_threshold);
+
+    return settings;
 }
 
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h
index 18e8bf159d5..20bf05d5ba6 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h
@@ -10,9 +10,46 @@
 namespace DB
 {
 
+struct AzureBlobStorageEndpoint
+{
+    const String storage_account_url;
+    const String account_name;
+    const String container_name;
+    const String prefix;
+    const std::optional<bool> container_already_exists;
+
+    String getEndpoint()
+    {
+        String url = storage_account_url;
+
+        if (!account_name.empty())
+            url += "/" + account_name;
+
+        if (!container_name.empty())
+            url += "/" + container_name;
+
+        if (!prefix.empty())
+            url += "/" + prefix;
+
+        return url;
+    }
+
+    String getEndpointWithoutContainer()
+    {
+        String url = storage_account_url;
+
+        if (!account_name.empty())
+            url += "/" + account_name;
+
+        return url;
+    }
+};
+
 std::unique_ptr<Azure::Storage::Blobs::BlobContainerClient> getAzureBlobContainerClient(
     const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
 
+AzureBlobStorageEndpoint processAzureBlobStorageEndpoint(const Poco::Util::AbstractConfiguration & config, const String & config_prefix);
+
 std::unique_ptr<AzureObjectStorageSettings> getAzureBlobStorageSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr /*context*/);
 
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
index 068e2aebab1..e0614613c3f 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.cpp
@@ -92,16 +92,14 @@ private:
 AzureObjectStorage::AzureObjectStorage(
     const String & name_,
     AzureClientPtr && client_,
-    SettingsPtr && settings_)
+    SettingsPtr && settings_,
+    const String & object_namespace_)
     : name(name_)
     , client(std::move(client_))
     , settings(std::move(settings_))
-    , log(&Poco::Logger::get("AzureObjectStorage"))
+    , object_namespace(object_namespace_)
+    , log(getLogger("AzureObjectStorage"))
 {
-    data_source_description.type = DataSourceType::AzureBlobStorage;
-    data_source_description.description = client.get()->GetUrl();
-    data_source_description.is_cached = false;
-    data_source_description.is_encrypted = false;
 }
 
 ObjectStorageKey AzureObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
@@ -208,17 +206,16 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOL
 
     auto read_buffer_creator =
         [this, settings_ptr, disk_read_settings]
-        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
+        (bool restricted_seek, const StoredObject & object_) -> std::unique_ptr<ReadBufferFromFileBase>
     {
         return std::make_unique<ReadBufferFromAzureBlobStorage>(
             client.get(),
-            path,
+            object_.remote_path,
             disk_read_settings,
             settings_ptr->max_single_read_retries,
             settings_ptr->max_single_download_retries,
             /* use_external_buffer */true,
-            /* restricted_seek */true,
-            read_until_position);
+            restricted_seek);
     };
 
     switch (read_settings.remote_fs_method)
@@ -228,16 +225,17 @@ std::unique_ptr<ReadBufferFromFileBase> AzureObjectStorage::readObjects( /// NOL
             return std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 objects,
+                "azure:",
                 disk_read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */false);
-
         }
         case RemoteFSReadMethod::threadpool:
         {
             auto impl = std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 objects,
+                "azure:",
                 disk_read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */true);
@@ -267,9 +265,9 @@ std::unique_ptr<WriteBufferFromFileBase> AzureObjectStorage::writeObject( /// NO
     return std::make_unique<WriteBufferFromAzureBlobStorage>(
         client.get(),
         object.remote_path,
-        settings.get()->max_single_part_upload_size,
         buf_size,
-        patchSettings(write_settings));
+        patchSettings(write_settings),
+        settings.get());
 }
 
 /// Remove file. Throws exception if file doesn't exists or it's a directory.
@@ -379,7 +377,8 @@ std::unique_ptr<IObjectStorage> AzureObjectStorage::cloneObjectStorage(const std
     return std::make_unique<AzureObjectStorage>(
         name,
         getAzureBlobContainerClient(config, config_prefix),
-        getAzureBlobStorageSettings(config, config_prefix, context)
+        getAzureBlobStorageSettings(config, config_prefix, context),
+        object_namespace
     );
 }
 
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
index 8e3d50418d3..b05fc7afc96 100644
--- a/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
+++ b/src/Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h
@@ -3,7 +3,6 @@
 
 #if USE_AZURE_BLOB_STORAGE
 
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
 #include <Common/MultiVersion.h>
@@ -24,12 +23,30 @@ struct AzureObjectStorageSettings
         uint64_t min_bytes_for_seek_,
         int max_single_read_retries_,
         int max_single_download_retries_,
-        int list_object_keys_size_)
+        int list_object_keys_size_,
+        size_t min_upload_part_size_,
+        size_t max_upload_part_size_,
+        size_t max_single_part_copy_size_,
+        bool use_native_copy_,
+        size_t max_unexpected_write_error_retries_,
+        size_t max_inflight_parts_for_one_file_,
+        size_t strict_upload_part_size_,
+        size_t upload_part_size_multiply_factor_,
+        size_t upload_part_size_multiply_parts_count_threshold_)
         : max_single_part_upload_size(max_single_part_upload_size_)
         , min_bytes_for_seek(min_bytes_for_seek_)
         , max_single_read_retries(max_single_read_retries_)
         , max_single_download_retries(max_single_download_retries_)
         , list_object_keys_size(list_object_keys_size_)
+        , min_upload_part_size(min_upload_part_size_)
+        , max_upload_part_size(max_upload_part_size_)
+        , max_single_part_copy_size(max_single_part_copy_size_)
+        , use_native_copy(use_native_copy_)
+        , max_unexpected_write_error_retries(max_unexpected_write_error_retries_)
+        , max_inflight_parts_for_one_file(max_inflight_parts_for_one_file_)
+        , strict_upload_part_size(strict_upload_part_size_)
+        , upload_part_size_multiply_factor(upload_part_size_multiply_factor_)
+        , upload_part_size_multiply_parts_count_threshold(upload_part_size_multiply_parts_count_threshold_)
     {
     }
 
@@ -40,6 +57,15 @@ struct AzureObjectStorageSettings
     size_t max_single_read_retries = 3;
     size_t max_single_download_retries = 3;
     int list_object_keys_size = 1000;
+    size_t min_upload_part_size = 16 * 1024 * 1024;
+    size_t max_upload_part_size = 5ULL * 1024 * 1024 * 1024;
+    size_t max_single_part_copy_size = 256 * 1024 * 1024;
+    bool use_native_copy = false;
+    size_t max_unexpected_write_error_retries = 4;
+    size_t max_inflight_parts_for_one_file = 20;
+    size_t strict_upload_part_size = 0;
+    size_t upload_part_size_multiply_factor = 2;
+    size_t upload_part_size_multiply_parts_count_threshold = 500;
 };
 
 using AzureClient = Azure::Storage::Blobs::BlobContainerClient;
@@ -54,16 +80,21 @@ public:
     AzureObjectStorage(
         const String & name_,
         AzureClientPtr && client_,
-        SettingsPtr && settings_);
+        SettingsPtr && settings_,
+        const String & object_namespace_);
 
     void listObjects(const std::string & path, RelativePathsWithMetadata & children, int max_keys) const override;
 
     ObjectStorageIteratorPtr iterate(const std::string & path_prefix) const override;
 
-    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
-
     std::string getName() const override { return "AzureObjectStorage"; }
 
+    ObjectStorageType getType() const override { return ObjectStorageType::Azure; }
+
+    std::string getCommonKeyPrefix() const override { return ""; }
+
+    std::string getDescription() const override { return client.get()->GetUrl(); }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -113,7 +144,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    String getObjectsNamespace() const override { return ""; }
+    String getObjectsNamespace() const override { return object_namespace ; }
 
     std::unique_ptr<IObjectStorage> cloneObjectStorage(
         const std::string & new_namespace,
@@ -125,15 +156,21 @@ public:
 
     bool isRemote() const override { return true; }
 
+    std::shared_ptr<const AzureObjectStorageSettings> getSettings() { return settings.get(); }
+
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> getAzureBlobStorageClient() override
+    {
+        return client.get();
+    }
+
 private:
     const String name;
     /// client used to access the files in the Blob Storage cloud
     MultiVersion<Azure::Storage::Blobs::BlobContainerClient> client;
     MultiVersion<AzureObjectStorageSettings> settings;
+    const String object_namespace; /// container + prefix
 
-    Poco::Logger * log;
-
-    DataSourceDescription data_source_description;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp b/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
deleted file mode 100644
index 7ba9d21db62..00000000000
--- a/src/Disks/ObjectStorages/AzureBlobStorage/registerDiskAzureBlobStorage.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-#include "config.h"
-
-#include <Disks/DiskFactory.h>
-
-#if USE_AZURE_BLOB_STORAGE
-
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Disks/ObjectStorages/DiskObjectStorage.h>
-
-#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
-#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
-#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
-#include <Interpreters/Context.h>
-
-namespace DB
-{
-
-void registerDiskAzureBlobStorage(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*/)
-    {
-        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-
-        ObjectStoragePtr azure_object_storage = std::make_unique<AzureObjectStorage>(
-            name,
-            getAzureBlobContainerClient(config, config_prefix),
-            getAzureBlobStorageSettings(config, config_prefix, context));
-
-        String key_prefix;
-        auto metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, key_prefix);
-
-        std::shared_ptr<IDisk> azure_blob_storage_disk = std::make_shared<DiskObjectStorage>(
-            name,
-            /* no namespaces */ key_prefix,
-            "DiskAzureBlobStorage",
-            std::move(metadata_storage),
-            std::move(azure_object_storage),
-            config,
-            config_prefix
-        );
-
-        bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
-        azure_blob_storage_disk->startup(context, skip_access_check);
-
-        return azure_blob_storage_disk;
-    };
-
-    factory.registerDiskType("azure_blob_storage", creator);
-}
-
-}
-
-#else
-
-namespace DB
-{
-
-void registerDiskAzureBlobStorage(DiskFactory &, bool /* global_skip_access_check */) {}
-
-}
-
-#endif
diff --git a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
index 742d735cc95..e3ab772e3b5 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.cpp
@@ -1,6 +1,5 @@
 #include "CachedObjectStorage.h"
 
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <IO/BoundedReadBuffer.h>
 #include <Disks/IO/CachedOnDiskWriteBufferFromFile.h>
 #include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
@@ -25,18 +24,11 @@ CachedObjectStorage::CachedObjectStorage(
     , cache(cache_)
     , cache_settings(cache_settings_)
     , cache_config_name(cache_config_name_)
-    , log(&Poco::Logger::get(getName()))
+    , log(getLogger(getName()))
 {
     cache->initialize();
 }
 
-DataSourceDescription CachedObjectStorage::getDataSourceDescription() const
-{
-    auto wrapped_object_storage_data_source = object_storage->getDataSourceDescription();
-    wrapped_object_storage_data_source.is_cached = true;
-    return wrapped_object_storage_data_source;
-}
-
 FileCache::Key CachedObjectStorage::getCacheKey(const std::string & path) const
 {
     return cache->createKeyForPath(path);
@@ -51,10 +43,6 @@ ReadSettings CachedObjectStorage::patchSettings(const ReadSettings & read_settin
 {
     ReadSettings modified_settings{read_settings};
     modified_settings.remote_fs_cache = cache;
-
-    if (!canUseReadThroughCache(read_settings))
-        modified_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
-
     return object_storage->patchSettings(modified_settings);
 }
 
@@ -114,6 +102,7 @@ std::unique_ptr<WriteBufferFromFileBase> CachedObjectStorage::writeObject( /// N
             key,
             CurrentThread::isInitialized() && CurrentThread::get().getQueryContext() ? std::string(CurrentThread::getQueryId()) : "",
             modified_write_settings,
+            FileCache::getCommonUser(),
             Context::getGlobalContextInstance()->getFilesystemCacheLog());
     }
 
@@ -126,7 +115,7 @@ void CachedObjectStorage::removeCacheIfExists(const std::string & path_key_for_c
         return;
 
     /// Add try catch?
-    cache->removeKeyIfExists(getCacheKey(path_key_for_cache));
+    cache->removeKeyIfExists(getCacheKey(path_key_for_cache), FileCache::getCommonUser().user_id);
 }
 
 void CachedObjectStorage::removeObject(const StoredObject & object)
@@ -213,14 +202,4 @@ String CachedObjectStorage::getObjectsNamespace() const
     return object_storage->getObjectsNamespace();
 }
 
-bool CachedObjectStorage::canUseReadThroughCache(const ReadSettings & settings)
-{
-    if (!settings.avoid_readthrough_cache_outside_query_context)
-        return true;
-
-    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 20b3a42540b..961c2709efc 100644
--- a/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
+++ b/src/Disks/ObjectStorages/Cached/CachedObjectStorage.h
@@ -1,8 +1,9 @@
 #pragma once
 
 #include <Disks/ObjectStorages/IObjectStorage.h>
-#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileCacheKey.h>
 #include <Interpreters/Cache/FileCacheSettings.h>
+#include "config.h"
 
 namespace Poco
 {
@@ -20,10 +21,14 @@ class CachedObjectStorage final : public IObjectStorage
 public:
     CachedObjectStorage(ObjectStoragePtr object_storage_, FileCachePtr cache_, const FileCacheSettings & cache_settings_, const String & cache_config_name_);
 
-    DataSourceDescription getDataSourceDescription() const override;
-
     std::string getName() const override { return fmt::format("CachedObjectStorage-{}({})", cache_config_name, object_storage->getName()); }
 
+    ObjectStorageType getType() const override { return object_storage->getType(); }
+
+    std::string getCommonKeyPrefix() const override { return object_storage->getCommonKeyPrefix(); }
+
+    std::string getDescription() const override { return object_storage->getDescription(); }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -114,10 +119,15 @@ public:
 
     const FileCacheSettings & getCacheSettings() const { return cache_settings; }
 
-    static bool canUseReadThroughCache(const ReadSettings & settings);
+#if USE_AZURE_BLOB_STORAGE
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> getAzureBlobStorageClient() override
+    {
+        return object_storage->getAzureBlobStorageClient();
+    }
+#endif
 
 private:
-    FileCache::Key getCacheKey(const std::string & path) const;
+    FileCacheKey getCacheKey(const std::string & path) const;
 
     ReadSettings patchSettings(const ReadSettings & read_settings) const override;
 
@@ -125,7 +135,7 @@ private:
     FileCachePtr cache;
     FileCacheSettings cache_settings;
     std::string cache_config_name;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
index da01a82746f..6e0453f5f02 100644
--- a/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
+++ b/src/Disks/ObjectStorages/Cached/registerDiskCache.cpp
@@ -23,8 +23,10 @@ void registerDiskCache(DiskFactory & factory, bool /* global_skip_access_check *
                     const Poco::Util::AbstractConfiguration & config,
                     const String & config_prefix,
                     ContextPtr context,
-                    const DisksMap & map) -> DiskPtr
-    {
+                    const DisksMap & map,
+                    bool attach,
+                    bool custom_disk) -> DiskPtr
+{
         auto disk_name = config.getString(config_prefix + ".disk", "");
         if (disk_name.empty())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk Cache requires `disk` field in config");
@@ -39,14 +41,50 @@ void registerDiskCache(DiskFactory & factory, bool /* global_skip_access_check *
         }
 
         FileCacheSettings file_cache_settings;
-        auto predefined_configuration = config.has("cache_name") ? NamedCollectionFactory::instance().tryGet(config.getString("cache_name")) : nullptr;
+        auto predefined_configuration = config.has("cache_name")
+            ? NamedCollectionFactory::instance().tryGet(config.getString("cache_name"))
+            : nullptr;
+
         if (predefined_configuration)
             file_cache_settings.loadFromCollection(*predefined_configuration);
         else
             file_cache_settings.loadFromConfig(config, config_prefix);
 
         auto config_fs_caches_dir = context->getFilesystemCachesPath();
-        if (config_fs_caches_dir.empty())
+        if (custom_disk)
+        {
+            static constexpr auto custom_cached_disks_base_dir_in_config = "custom_cached_disks_base_directory";
+            auto custom_cached_disk_path_prefix = context->getConfigRef().getString(custom_cached_disks_base_dir_in_config, config_fs_caches_dir);
+            if (custom_cached_disk_path_prefix.empty())
+            {
+                if (!attach)
+                {
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Cannot create cached custom disk without either "
+                        "`filesystem_caches_path` (common for all filesystem caches) or"
+                        "`custom_cached_disks_base_directory` (common only for custom cached disks) in server configuration file");
+                }
+                if (fs::path(file_cache_settings.base_path).is_relative())
+                {
+                    /// Compatibility prefix.
+                    file_cache_settings.base_path = fs::path(context->getPath()) / "caches" / file_cache_settings.base_path;
+                }
+            }
+            else
+            {
+                if (fs::path(file_cache_settings.base_path).is_relative())
+                    file_cache_settings.base_path = fs::path(custom_cached_disk_path_prefix) / file_cache_settings.base_path;
+
+                if (!attach && !pathStartsWith(file_cache_settings.base_path, custom_cached_disk_path_prefix))
+                {
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                                    "Filesystem cache path must lie inside `{}` (for disk: {})",
+                                    config_fs_caches_dir, name);
+                }
+            }
+        }
+        else if (config_fs_caches_dir.empty())
         {
             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;
@@ -56,7 +94,7 @@ void registerDiskCache(DiskFactory & factory, bool /* global_skip_access_check *
             if (fs::path(file_cache_settings.base_path).is_relative())
                 file_cache_settings.base_path = fs::path(config_fs_caches_dir) / file_cache_settings.base_path;
 
-            if (!pathStartsWith(file_cache_settings.base_path, config_fs_caches_dir))
+            if (!attach && !pathStartsWith(file_cache_settings.base_path, config_fs_caches_dir))
             {
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
                                 "Filesystem cache path {} must lie inside default filesystem cache path `{}`",
@@ -76,7 +114,7 @@ void registerDiskCache(DiskFactory & factory, bool /* global_skip_access_check *
         disk_object_storage->wrapWithCache(cache, file_cache_settings, name);
 
         LOG_INFO(
-            &Poco::Logger::get("DiskCache"),
+            getLogger("DiskCache"),
             "Registered cached disk (`{}`) with structure: {}",
             name, assert_cast<DiskObjectStorage *>(disk_object_storage.get())->getStructure());
 
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.cpp b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
index 6962248c7e1..430b0dc7c01 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.cpp
@@ -9,6 +9,7 @@
 #include <Common/logger_useful.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/CurrentMetrics.h>
+#include <Common/Scheduler/IResourceManager.h>
 #include <Disks/ObjectStorages/DiskObjectStorageRemoteMetadataRestoreHelper.h>
 #include <Disks/ObjectStorages/DiskObjectStorageTransaction.h>
 #include <Disks/FakeDiskTransaction.h>
@@ -61,32 +62,46 @@ DiskTransactionPtr DiskObjectStorage::createObjectStorageTransactionToAnotherDis
 DiskObjectStorage::DiskObjectStorage(
     const String & name_,
     const String & object_key_prefix_,
-    const String & log_name,
     MetadataStoragePtr metadata_storage_,
     ObjectStoragePtr object_storage_,
     const Poco::Util::AbstractConfiguration & config,
     const String & config_prefix)
     : IDisk(name_, config, config_prefix)
     , object_key_prefix(object_key_prefix_)
-    , log (&Poco::Logger::get("DiskObjectStorage(" + log_name + ")"))
+    , log(getLogger("DiskObjectStorage(" + name + ")"))
     , metadata_storage(std::move(metadata_storage_))
     , object_storage(std::move(object_storage_))
     , send_metadata(config.getBool(config_prefix + ".send_metadata", false))
     , read_resource_name(config.getString(config_prefix + ".read_resource", ""))
     , write_resource_name(config.getString(config_prefix + ".write_resource", ""))
     , metadata_helper(std::make_unique<DiskObjectStorageRemoteMetadataRestoreHelper>(this, ReadSettings{}, WriteSettings{}))
-{}
+{
+    data_source_description = DataSourceDescription{
+        .type = DataSourceType::ObjectStorage,
+        .object_storage_type = object_storage->getType(),
+        .metadata_type = metadata_storage->getType(),
+        .description = object_storage->getDescription(),
+        .is_encrypted = false,
+        .is_cached = object_storage->supportsCache(),
+    };
+}
 
 StoredObjects DiskObjectStorage::getStorageObjects(const String & local_path) const
 {
     return metadata_storage->getStorageObjects(local_path);
 }
 
-void DiskObjectStorage::getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithObjectStoragePaths> & paths_map)
+void DiskObjectStorage::getRemotePathsRecursive(
+    const String & local_path,
+    std::vector<LocalPathWithObjectStoragePaths> & paths_map,
+    const std::function<bool(const String &)> & skip_predicate)
 {
     if (!metadata_storage->exists(local_path))
         return;
 
+    if (skip_predicate && skip_predicate(local_path))
+        return;
+
     /// Protect against concurrent delition of files (for example because of a merge).
     if (metadata_storage->isFile(local_path))
     {
@@ -134,7 +149,7 @@ void DiskObjectStorage::getRemotePathsRecursive(const String & local_path, std::
         }
 
         for (; it->isValid(); it->next())
-            DiskObjectStorage::getRemotePathsRecursive(fs::path(local_path) / it->name(), paths_map);
+            DiskObjectStorage::getRemotePathsRecursive(fs::path(local_path) / it->name(), paths_map, skip_predicate);
     }
 }
 
@@ -196,7 +211,7 @@ void DiskObjectStorage::copyFile( /// NOLINT
             /// It may use s3-server-side copy
             auto & to_disk_object_storage = dynamic_cast<DiskObjectStorage &>(to_disk);
             auto transaction = createObjectStorageTransactionToAnotherDisk(to_disk_object_storage);
-            transaction->copyFile(from_file_path, to_file_path);
+            transaction->copyFile(from_file_path, to_file_path, /*read_settings*/ {}, /*write_settings*/ {});
             transaction->commit();
     }
     else
@@ -381,6 +396,7 @@ void DiskObjectStorage::shutdown()
 {
     LOG_INFO(log, "Shutting down disk {}", name);
     object_storage->shutdown();
+    metadata_storage->shutdown();
     LOG_INFO(log, "Disk {} shut down", name);
 }
 
@@ -480,7 +496,6 @@ DiskObjectStoragePtr DiskObjectStorage::createDiskObjectStorage()
     return std::make_shared<DiskObjectStorage>(
         getName(),
         object_key_prefix,
-        getName(),
         metadata_storage,
         object_storage,
         Context::getGlobalContextInstance()->getConfigRef(),
@@ -519,10 +534,9 @@ std::unique_ptr<ReadBufferFromFileBase> DiskObjectStorage::readFile(
     std::optional<size_t> read_hint,
     std::optional<size_t> file_size) const
 {
-    auto storage_objects = metadata_storage->getStorageObjects(path);
+    const auto storage_objects = metadata_storage->getStorageObjects(path);
 
     const bool file_can_be_empty = !file_size.has_value() || *file_size == 0;
-
     if (storage_objects.empty() && file_can_be_empty)
         return std::make_unique<ReadBufferFromEmptyFile>();
 
diff --git a/src/Disks/ObjectStorages/DiskObjectStorage.h b/src/Disks/ObjectStorages/DiskObjectStorage.h
index a664f11fab7..9f11c0ed02e 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorage.h
+++ b/src/Disks/ObjectStorages/DiskObjectStorage.h
@@ -30,7 +30,6 @@ public:
     DiskObjectStorage(
         const String & name_,
         const String & object_key_prefix_,
-        const String & log_name,
         MetadataStoragePtr metadata_storage_,
         ObjectStoragePtr object_storage_,
         const Poco::Util::AbstractConfiguration & config,
@@ -39,7 +38,7 @@ public:
     /// Create fake transaction
     DiskTransactionPtr createTransaction() override;
 
-    DataSourceDescription getDataSourceDescription() const override { return object_storage->getDataSourceDescription(); }
+    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
 
     bool supportZeroCopyReplication() const override { return true; }
 
@@ -49,7 +48,10 @@ public:
 
     StoredObjects getStorageObjects(const String & local_path) const override;
 
-    void getRemotePathsRecursive(const String & local_path, std::vector<LocalPathWithObjectStoragePaths> & paths_map) override;
+    void getRemotePathsRecursive(
+        const String & local_path,
+        std::vector<LocalPathWithObjectStoragePaths> & paths_map,
+        const std::function<bool(const String &)> & skip_predicate) override;
 
     const std::string & getCacheName() const override { return object_storage->getCacheName(); }
 
@@ -220,10 +222,11 @@ private:
     String getWriteResourceName() const;
 
     const String object_key_prefix;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     MetadataStoragePtr metadata_storage;
     ObjectStoragePtr object_storage;
+    DataSourceDescription data_source_description;
 
     UInt64 reserved_bytes = 0;
     UInt64 reservation_count = 0;
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp b/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
deleted file mode 100644
index cc9e4b0b712..00000000000
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Common/getRandomASCIIString.h>
-#include <Disks/DiskLocal.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Interpreters/Context.h>
-
-namespace DB
-{
-
-static String getDiskMetadataPath(
-    const String & name,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    ContextPtr context)
-{
-    return config.getString(config_prefix + ".metadata_path", fs::path(context->getPath()) / "disks" / name / "");
-}
-
-std::pair<String, DiskPtr> prepareForLocalMetadata(
-    const String & name,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    ContextPtr context)
-{
-    /// where the metadata files are stored locally
-    auto metadata_path = getDiskMetadataPath(name, config, config_prefix, context);
-    fs::create_directories(metadata_path);
-    auto metadata_disk = std::make_shared<DiskLocal>(name + "-metadata", metadata_path, 0, config, config_prefix);
-    return std::make_pair(metadata_path, metadata_disk);
-}
-
-bool isFileWithPersistentCache(const String & path)
-{
-    auto path_extension = std::filesystem::path(path).extension();
-    return path_extension == ".idx" // index files.
-            || path_extension == ".mrk" || path_extension == ".mrk2" || path_extension == ".mrk3" /// mark files.
-            || path_extension == ".txt" || path_extension == ".dat";
-}
-
-}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageCommon.h b/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
deleted file mode 100644
index 0bdbe0dfd36..00000000000
--- a/src/Disks/ObjectStorages/DiskObjectStorageCommon.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#pragma once
-
-#include <random>
-#include <utility>
-
-#include <Core/Types.h>
-#include <Common/thread_local_rng.h>
-
-#include <Disks/IDisk.h>
-
-
-namespace DB
-{
-
-std::pair<String, DiskPtr> prepareForLocalMetadata(
-    const String & name,
-    const Poco::Util::AbstractConfiguration & config,
-    const String & config_prefix,
-    ContextPtr context);
-
-bool isFileWithPersistentCache(const String & path);
-
-}
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
index 881f7a46c16..19b8b51384f 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageMetadata.cpp
@@ -104,7 +104,7 @@ void DiskObjectStorageMetadata::serialize(WriteBuffer & buf, bool sync) const
 
     if (version == VERSION_FULL_OBJECT_KEY && !storage_metadata_write_full_object_key)
     {
-        Poco::Logger * logger = &Poco::Logger::get("DiskObjectStorageMetadata");
+        LoggerPtr logger = getLogger("DiskObjectStorageMetadata");
         LOG_WARNING(
             logger,
             "Metadata file {} is written with VERSION_FULL_OBJECT_KEY version"
@@ -192,7 +192,7 @@ void DiskObjectStorageMetadata::addObject(ObjectStorageKey key, size_t size)
         bool storage_metadata_write_full_object_key = getWriteFullObjectKeySetting();
         if (!storage_metadata_write_full_object_key)
         {
-            Poco::Logger * logger = &Poco::Logger::get("DiskObjectStorageMetadata");
+            LoggerPtr logger = getLogger("DiskObjectStorageMetadata");
             LOG_WARNING(
                 logger,
                 "Metadata file {} has at least one key {} without fixed common key prefix."
diff --git a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
index 5958762fa09..d25add625e8 100644
--- a/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
+++ b/src/Disks/ObjectStorages/DiskObjectStorageTransaction.cpp
@@ -23,7 +23,6 @@ namespace ErrorCodes
     extern const int CANNOT_OPEN_FILE;
     extern const int FILE_DOESNT_EXIST;
     extern const int BAD_FILE_TYPE;
-    extern const int FILE_ALREADY_EXISTS;
     extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
     extern const int LOGICAL_ERROR;
 }
@@ -242,7 +241,7 @@ struct RemoveManyObjectStorageOperation final : public IDiskObjectStorageOperati
                     || e.code() == ErrorCodes::CANNOT_OPEN_FILE)
                 {
                     LOG_DEBUG(
-                        &Poco::Logger::get("RemoveManyObjectStorageOperation"),
+                        getLogger("RemoveManyObjectStorageOperation"),
                         "Can't read metadata because of an exception. Just remove it from the filesystem. Path: {}, exception: {}",
                         metadata_storage.getPath() + path,
                         e.message());
@@ -276,7 +275,7 @@ struct RemoveManyObjectStorageOperation final : public IDiskObjectStorageOperati
         if (!keep_all_batch_data)
         {
             LOG_DEBUG(
-                &Poco::Logger::get("RemoveManyObjectStorageOperation"),
+                getLogger("RemoveManyObjectStorageOperation"),
                 "metadata and objects were removed for [{}], "
                 "only metadata were removed for [{}].",
                 boost::algorithm::join(paths_removed_with_objects, ", "),
@@ -345,7 +344,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
                     || e.code() == ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED)
                 {
                     LOG_DEBUG(
-                        &Poco::Logger::get("RemoveRecursiveObjectStorageOperation"),
+                        getLogger("RemoveRecursiveObjectStorageOperation"),
                         "Can't read metadata because of an exception. Just remove it from the filesystem. Path: {}, exception: {}",
                         metadata_storage.getPath() + path_to_remove,
                         e.message());
@@ -399,7 +398,7 @@ struct RemoveRecursiveObjectStorageOperation final : public IDiskObjectStorageOp
             object_storage.removeObjectsIfExist(remove_from_remote);
 
             LOG_DEBUG(
-                &Poco::Logger::get("RemoveRecursiveObjectStorageOperation"),
+                getLogger("RemoveRecursiveObjectStorageOperation"),
                 "Recursively remove path {}: "
                 "metadata and objects were removed for [{}], "
                 "only metadata were removed for [{}].",
@@ -538,7 +537,7 @@ struct CopyFileObjectStorageOperation final : public IDiskObjectStorageOperation
 
         for (const auto & object_from : source_blobs)
         {
-            auto object_key = object_storage.generateObjectKeyForPath(to_path);
+            auto object_key = destination_object_storage.generateObjectKeyForPath(to_path);
             auto object_to = StoredObject(object_key.serialize());
 
             object_storage.copyObjectToAnotherObjectStorage(object_from, object_to,read_settings,write_settings, destination_object_storage);
@@ -593,14 +592,8 @@ void DiskObjectStorageTransaction::moveDirectory(const std::string & from_path,
 void DiskObjectStorageTransaction::moveFile(const String & from_path, const String & to_path)
 {
      operations_to_execute.emplace_back(
-        std::make_unique<PureMetadataObjectStorageOperation>(object_storage, metadata_storage, [from_path, to_path, this](MetadataTransactionPtr tx)
+        std::make_unique<PureMetadataObjectStorageOperation>(object_storage, metadata_storage, [from_path, to_path](MetadataTransactionPtr tx)
         {
-            if (metadata_storage.exists(to_path))
-                throw Exception(ErrorCodes::FILE_ALREADY_EXISTS, "File already exists: {}", to_path);
-
-            if (!metadata_storage.exists(from_path))
-                throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "File {} doesn't exist, cannot move", from_path);
-
             tx->moveFile(from_path, to_path);
         }));
 }
@@ -905,7 +898,7 @@ void DiskObjectStorageTransaction::commit()
         catch (...)
         {
             tryLogCurrentException(
-                &Poco::Logger::get("DiskObjectStorageTransaction"),
+                getLogger("DiskObjectStorageTransaction"),
                 fmt::format("An error occurred while executing transaction's operation #{} ({})", i, operations_to_execute[i]->getInfoForLog()));
 
             for (int64_t j = i; j >= 0; --j)
@@ -917,7 +910,7 @@ void DiskObjectStorageTransaction::commit()
                 catch (...)
                 {
                     tryLogCurrentException(
-                        &Poco::Logger::get("DiskObjectStorageTransaction"),
+                        getLogger("DiskObjectStorageTransaction"),
                         fmt::format("An error occurred while undoing transaction's operation #{}", i));
 
                     throw;
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
index 662b20f4d31..e717c88ed22 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.cpp
@@ -31,7 +31,7 @@ void HDFSObjectStorage::startup()
 ObjectStorageKey HDFSObjectStorage::generateObjectKeyForPath(const std::string & /* path */) const
 {
     /// what ever data_source_description.description value is, consider that key as relative key
-    return ObjectStorageKey::createAsRelative(data_source_description.description, getRandomASCIIString(32));
+    return ObjectStorageKey::createAsRelative(hdfs_root_path, getRandomASCIIString(32));
 }
 
 bool HDFSObjectStorage::exists(const StoredObject & object) const
@@ -60,8 +60,9 @@ 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::unique_ptr<ReadBufferFromFileBase>
+        (bool /* restricted_seek */, const StoredObject & object_) -> std::unique_ptr<ReadBufferFromFileBase>
     {
+        const auto & path = object_.remote_path;
         size_t begin_of_path = path.find('/', path.find("//") + 2);
         auto hdfs_path = path.substr(begin_of_path);
         auto hdfs_uri = path.substr(0, begin_of_path);
@@ -71,7 +72,7 @@ std::unique_ptr<ReadBufferFromFileBase> HDFSObjectStorage::readObjects( /// NOLI
     };
 
     return std::make_unique<ReadBufferFromRemoteFSGather>(
-        std::move(read_buffer_creator), objects, disk_read_settings, nullptr, /* use_external_buffer */false);
+        std::move(read_buffer_creator), objects, "hdfs:", disk_read_settings, nullptr, /* use_external_buffer */false);
 }
 
 std::unique_ptr<WriteBufferFromFileBase> HDFSObjectStorage::writeObject( /// NOLINT
diff --git a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
index fe0893f963b..66095eb9f8f 100644
--- a/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
+++ b/src/Disks/ObjectStorages/HDFS/HDFSObjectStorage.h
@@ -48,19 +48,17 @@ public:
         , hdfs_builder(createHDFSBuilder(hdfs_root_path_, config))
         , hdfs_fs(createHDFSFS(hdfs_builder.get()))
         , settings(std::move(settings_))
+        , hdfs_root_path(hdfs_root_path_)
     {
-        data_source_description.type = DataSourceType::HDFS;
-        data_source_description.description = hdfs_root_path_;
-        data_source_description.is_cached = false;
-        data_source_description.is_encrypted = false;
     }
 
     std::string getName() const override { return "HDFSObjectStorage"; }
 
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return data_source_description;
-    }
+    std::string getCommonKeyPrefix() const override { return hdfs_root_path; }
+
+    std::string getDescription() const override { return hdfs_root_path; }
+
+    ObjectStorageType getType() const override { return ObjectStorageType::HDFS; }
 
     bool exists(const StoredObject & object) const override;
 
@@ -123,10 +121,8 @@ private:
 
     HDFSBuilderWrapper hdfs_builder;
     HDFSFSPtr hdfs_fs;
-
     SettingsPtr settings;
-
-    DataSourceDescription data_source_description;
+    const std::string hdfs_root_path;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp b/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
deleted file mode 100644
index 96ff0a91564..00000000000
--- a/src/Disks/ObjectStorages/HDFS/registerDiskHDFS.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Disks/ObjectStorages/DiskObjectStorage.h>
-#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
-#include <Disks/DiskFactory.h>
-#include <Storages/HDFS/HDFSCommon.h>
-#include <Interpreters/Context.h>
-#include <Common/Macros.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-void registerDiskHDFS(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 endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
-        String uri{endpoint};
-        checkHDFSURL(uri);
-
-        if (uri.back() != '/')
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HDFS path must ends with '/', but '{}' doesn't.", uri);
-
-        std::unique_ptr<HDFSObjectStorageSettings> settings = std::make_unique<HDFSObjectStorageSettings>(
-            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
-            config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000),
-            context->getSettingsRef().hdfs_replication
-        );
-
-
-        /// FIXME Cache currently unsupported :(
-        ObjectStoragePtr hdfs_storage = std::make_unique<HDFSObjectStorage>(uri, std::move(settings), config);
-
-        auto [_, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-
-        auto metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, uri);
-        bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
-
-        DiskPtr disk = std::make_shared<DiskObjectStorage>(
-            name,
-            uri,
-            "DiskHDFS",
-            std::move(metadata_storage),
-            std::move(hdfs_storage),
-            config,
-            config_prefix);
-
-        disk->startup(context, skip_access_check);
-
-        return disk;
-    };
-
-    factory.registerDiskType("hdfs", creator);
-}
-
-}
diff --git a/src/Disks/ObjectStorages/IMetadataStorage.h b/src/Disks/ObjectStorages/IMetadataStorage.h
index 9e5078736d2..f95db2e1eee 100644
--- a/src/Disks/ObjectStorages/IMetadataStorage.h
+++ b/src/Disks/ObjectStorages/IMetadataStorage.h
@@ -11,6 +11,7 @@
 #include <Disks/DirectoryIterator.h>
 #include <Disks/WriteMode.h>
 #include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Disks/DiskType.h>
 #include <Common/ErrorCodes.h>
 
 namespace DB
@@ -164,6 +165,8 @@ public:
     /// Get metadata root path.
     virtual const std::string & getPath() const = 0;
 
+    virtual MetadataStorageType getType() const = 0;
+
     /// ==== General purpose methods. Define properties of object storage file based on metadata files ====
 
     virtual bool exists(const std::string & path) const = 0;
@@ -207,6 +210,11 @@ public:
         throwNotImplemented();
     }
 
+    virtual void shutdown()
+    {
+        /// This method is overridden for specific metadata implementations in ClickHouse Cloud.
+    }
+
     virtual ~IMetadataStorage() = default;
 
     /// ==== More specific methods. Previous were almost general purpose. ====
diff --git a/src/Disks/ObjectStorages/IObjectStorage.h b/src/Disks/ObjectStorages/IObjectStorage.h
index 72a4c432b20..fde97d82ad1 100644
--- a/src/Disks/ObjectStorages/IObjectStorage.h
+++ b/src/Disks/ObjectStorages/IObjectStorage.h
@@ -22,12 +22,23 @@
 #include <Core/Types.h>
 #include <Disks/DirectoryIterator.h>
 #include <Common/ThreadPool.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <Common/Exception.h>
+#include "config.h"
 
+#if USE_AZURE_BLOB_STORAGE
+#include <Common/MultiVersion.h>
+#include <azure/storage/blobs.hpp>
+#endif
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
 class ReadBufferFromFileBase;
 class WriteBufferFromFileBase;
 
@@ -80,10 +91,14 @@ class IObjectStorage
 public:
     IObjectStorage() = default;
 
-    virtual DataSourceDescription getDataSourceDescription() const = 0;
-
     virtual std::string getName() const = 0;
 
+    virtual ObjectStorageType getType() const = 0;
+
+    virtual std::string getCommonKeyPrefix() const = 0;
+
+    virtual std::string getDescription() const = 0;
+
     /// Object exists or not
     virtual bool exists(const StoredObject & object) const = 0;
 
@@ -203,6 +218,7 @@ public:
 
     virtual bool isReadOnly() const { return false; }
     virtual bool isWriteOnce() const { return false; }
+    virtual bool isPlain() const { return false; }
 
     virtual bool supportParallelWrite() const { return false; }
 
@@ -210,6 +226,14 @@ public:
 
     virtual WriteSettings patchSettings(const WriteSettings & write_settings) const;
 
+#if USE_AZURE_BLOB_STORAGE
+    virtual std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> getAzureBlobStorageClient()
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "This function is only implemented for AzureBlobStorage");
+    }
+#endif
+
+
 private:
     mutable std::mutex throttlers_mutex;
     ThrottlerPtr remote_read_throttler;
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
index c20a27e2384..d44e17a0713 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.cpp
@@ -1,6 +1,5 @@
 #include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
 
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Interpreters/Context.h>
 #include <Common/filesystemHelpers.h>
 #include <Common/logger_useful.h>
@@ -26,16 +25,14 @@ namespace ErrorCodes
 
 LocalObjectStorage::LocalObjectStorage(String key_prefix_)
     : key_prefix(std::move(key_prefix_))
-    , log(&Poco::Logger::get("LocalObjectStorage"))
+    , log(getLogger("LocalObjectStorage"))
 {
-    data_source_description.type = DataSourceType::Local;
     if (auto block_device_id = tryGetBlockDeviceId("/"); block_device_id.has_value())
-        data_source_description.description = *block_device_id;
+        description = *block_device_id;
     else
-        data_source_description.description = "/";
+        description = "/";
 
-    data_source_description.is_cached = false;
-    data_source_description.is_encrypted = false;
+    fs::create_directories(key_prefix);
 }
 
 bool LocalObjectStorage::exists(const StoredObject & object) const
@@ -52,10 +49,10 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOL
     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 */)
+        [=] (bool /* restricted_seek */, const StoredObject & object)
         -> std::unique_ptr<ReadBufferFromFileBase>
     {
-        return createReadBufferFromFileBase(file_path, modified_settings, read_hint, file_size);
+        return createReadBufferFromFileBase(object.remote_path, modified_settings, read_hint, file_size);
     };
 
     switch (read_settings.remote_fs_method)
@@ -63,13 +60,13 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObjects( /// NOL
         case RemoteFSReadMethod::read:
         {
             return std::make_unique<ReadBufferFromRemoteFSGather>(
-                std::move(read_buffer_creator), objects, modified_settings,
+                std::move(read_buffer_creator), objects, "file:", modified_settings,
                 global_context->getFilesystemCacheLog(), /* use_external_buffer */false);
         }
         case RemoteFSReadMethod::threadpool:
         {
             auto impl = std::make_unique<ReadBufferFromRemoteFSGather>(
-                std::move(read_buffer_creator), objects, modified_settings,
+                std::move(read_buffer_creator), objects, "file:", modified_settings,
                 global_context->getFilesystemCacheLog(), /* use_external_buffer */true);
 
             auto & reader = global_context->getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
@@ -111,13 +108,11 @@ std::unique_ptr<ReadBufferFromFileBase> LocalObjectStorage::readObject( /// NOLI
     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);
+        file_size = tryGetSizeFromFilePath(object.remote_path);
 
-    LOG_TEST(log, "Read object: {}", path);
-    return createReadBufferFromFileBase(path, patchSettings(read_settings), read_hint, file_size);
+    LOG_TEST(log, "Read object: {}", object.remote_path);
+    return createReadBufferFromFileBase(object.remote_path, patchSettings(read_settings), read_hint, file_size);
 }
 
 std::unique_ptr<WriteBufferFromFileBase> LocalObjectStorage::writeObject( /// NOLINT
@@ -131,6 +126,11 @@ std::unique_ptr<WriteBufferFromFileBase> LocalObjectStorage::writeObject( /// NO
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "LocalObjectStorage doesn't support append to files");
 
     LOG_TEST(log, "Write object: {}", object.remote_path);
+
+    /// Unlike real blob storage, in local fs we cannot create a file with non-existing prefix.
+    /// So let's create it.
+    fs::create_directories(fs::path(object.remote_path).parent_path());
+
     return std::make_unique<WriteBufferFromFile>(object.remote_path, buf_size);
 }
 
@@ -162,9 +162,36 @@ void LocalObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
         removeObjectIfExists(object);
 }
 
-ObjectMetadata LocalObjectStorage::getObjectMetadata(const std::string & /* path */) const
+ObjectMetadata LocalObjectStorage::getObjectMetadata(const std::string & path) const
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Metadata is not supported for LocalObjectStorage");
+    ObjectMetadata object_metadata;
+    LOG_TEST(log, "Getting metadata for path: {}", path);
+    object_metadata.size_bytes = fs::file_size(path);
+    object_metadata.last_modified = Poco::Timestamp::fromEpochTime(
+        std::chrono::duration_cast<std::chrono::seconds>(fs::last_write_time(path).time_since_epoch()).count());
+    return object_metadata;
+}
+
+void LocalObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, int /* max_keys */) const
+{
+    for (const auto & entry : fs::directory_iterator(path))
+    {
+        if (entry.is_directory())
+        {
+            listObjects(entry.path(), children, 0);
+            continue;
+        }
+
+        auto metadata = getObjectMetadata(entry.path());
+        children.emplace_back(entry.path(), std::move(metadata));
+    }
+}
+
+bool LocalObjectStorage::existsOrHasAnyChild(const std::string & path) const
+{
+    /// Unlike real object storage, existence of a prefix path can be checked by
+    /// just checking existence of this prefix directly, so simple exists is enough here.
+    return exists(StoredObject(path));
 }
 
 void LocalObjectStorage::copyObject( // NOLINT
diff --git a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
index 263eb3f7832..22429a99c76 100644
--- a/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
+++ b/src/Disks/ObjectStorages/Local/LocalObjectStorage.h
@@ -16,12 +16,16 @@ namespace DB
 class LocalObjectStorage : public IObjectStorage
 {
 public:
-    LocalObjectStorage(String key_prefix_);
-
-    DataSourceDescription getDataSourceDescription() const override { return data_source_description; }
+    explicit LocalObjectStorage(String key_prefix_);
 
     std::string getName() const override { return "LocalObjectStorage"; }
 
+    ObjectStorageType getType() const override { return ObjectStorageType::Local; }
+
+    std::string getCommonKeyPrefix() const override { return key_prefix; }
+
+    std::string getDescription() const override { return description; }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -54,6 +58,10 @@ public:
 
     ObjectMetadata getObjectMetadata(const std::string & path) const override;
 
+    void listObjects(const std::string & path, RelativePathsWithMetadata & children, int max_keys) const override;
+
+    bool existsOrHasAnyChild(const std::string & path) const override;
+
     void copyObject( /// NOLINT
         const StoredObject & object_from,
         const StoredObject & object_to,
@@ -86,8 +94,8 @@ public:
 
 private:
     String key_prefix;
-    Poco::Logger * log;
-    DataSourceDescription data_source_description;
+    LoggerPtr log;
+    std::string description;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp b/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp
deleted file mode 100644
index 0b2c71fa09d..00000000000
--- a/src/Disks/ObjectStorages/Local/registerLocalObjectStorage.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-#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 object_key_prefix;
-        UInt64 keep_free_space_bytes;
-        loadDiskLocalConfig(name, config, config_prefix, context, object_key_prefix, keep_free_space_bytes);
-        /// keys are mapped to the fs, object_key_prefix is a directory also
-        fs::create_directories(object_key_prefix);
-
-        String type = config.getString(config_prefix + ".type");
-        chassert(type == "local_blob_storage");
-
-        std::shared_ptr<LocalObjectStorage> local_storage = std::make_shared<LocalObjectStorage>(object_key_prefix);
-        MetadataStoragePtr metadata_storage;
-        auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-        metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, object_key_prefix);
-
-        auto disk = std::make_shared<DiskObjectStorage>(
-            name, object_key_prefix, "Local", metadata_storage, local_storage, config, config_prefix);
-        disk->startup(context, global_skip_access_check);
-        return disk;
-
-    };
-    factory.registerDiskType("local_blob_storage", creator);
-}
-
-}
diff --git a/src/Disks/ObjectStorages/MetadataStorageFactory.cpp b/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
new file mode 100644
index 00000000000..adc1f84372c
--- /dev/null
+++ b/src/Disks/ObjectStorages/MetadataStorageFactory.cpp
@@ -0,0 +1,145 @@
+#include <Disks/ObjectStorages/MetadataStorageFactory.h>
+#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
+#include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+#include <Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h>
+#endif
+#include <Disks/DiskLocal.h>
+#include <Interpreters/Context.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+    extern const int LOGICAL_ERROR;
+}
+
+MetadataStorageFactory & MetadataStorageFactory::instance()
+{
+    static MetadataStorageFactory factory;
+    return factory;
+}
+
+void MetadataStorageFactory::registerMetadataStorageType(const std::string & metadata_type, Creator creator)
+{
+    if (!registry.emplace(metadata_type, creator).second)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "MetadataStorageFactory: the metadata type '{}' is not unique",
+                        metadata_type);
+    }
+}
+
+std::string MetadataStorageFactory::getCompatibilityMetadataTypeHint(const ObjectStorageType & type)
+{
+    switch (type)
+    {
+        case ObjectStorageType::S3:
+        case ObjectStorageType::HDFS:
+        case ObjectStorageType::Local:
+        case ObjectStorageType::Azure:
+            return "local";
+        case ObjectStorageType::Web:
+            return "web";
+        default:
+            return "";
+    }
+}
+
+std::string MetadataStorageFactory::getMetadataType(
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    const std::string & compatibility_type_hint)
+{
+    if (compatibility_type_hint.empty() && !config.has(config_prefix + ".metadata_type"))
+    {
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Expected `metadata_type` in config");
+    }
+
+    return config.getString(config_prefix + ".metadata_type", compatibility_type_hint);
+}
+
+MetadataStoragePtr MetadataStorageFactory::create(
+    const std::string & name,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    ObjectStoragePtr object_storage,
+    const std::string & compatibility_type_hint) const
+{
+    const auto type = getMetadataType(config, config_prefix, compatibility_type_hint);
+    const auto it = registry.find(type);
+
+    if (it == registry.end())
+    {
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+                        "MetadataStorageFactory: unknown metadata storage type: {}", type);
+    }
+
+    return it->second(name, config, config_prefix, object_storage);
+}
+
+static std::string getObjectKeyCompatiblePrefix(
+    const IObjectStorage & object_storage,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & config_prefix)
+{
+    return config.getString(config_prefix + ".key_compatibility_prefix", object_storage.getCommonKeyPrefix());
+}
+
+void registerMetadataStorageFromDisk(MetadataStorageFactory & factory)
+{
+    factory.registerMetadataStorageType("local", [](
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ObjectStoragePtr object_storage) -> MetadataStoragePtr
+    {
+        auto metadata_path = config.getString(config_prefix + ".metadata_path",
+                                              fs::path(Context::getGlobalContextInstance()->getPath()) / "disks" / name / "");
+        fs::create_directories(metadata_path);
+        auto metadata_disk = std::make_shared<DiskLocal>(name + "-metadata", metadata_path, 0, config, config_prefix);
+        auto key_compatibility_prefix = getObjectKeyCompatiblePrefix(*object_storage, config, config_prefix);
+        return std::make_shared<MetadataStorageFromDisk>(metadata_disk, key_compatibility_prefix);
+    });
+}
+
+void registerPlainMetadataStorage(MetadataStorageFactory & factory)
+{
+    factory.registerMetadataStorageType("plain", [](
+        const std::string & /* name */,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ObjectStoragePtr object_storage) -> MetadataStoragePtr
+    {
+        auto key_compatibility_prefix = getObjectKeyCompatiblePrefix(*object_storage, config, config_prefix);
+        return std::make_shared<MetadataStorageFromPlainObjectStorage>(object_storage, key_compatibility_prefix);
+    });
+}
+
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+void registerMetadataStorageFromStaticFilesWebServer(MetadataStorageFactory & factory)
+{
+    factory.registerMetadataStorageType("web", [](
+        const std::string & /* name */,
+        const Poco::Util::AbstractConfiguration & /* config */,
+        const std::string & /* config_prefix */,
+        ObjectStoragePtr object_storage) -> MetadataStoragePtr
+    {
+        return std::make_shared<MetadataStorageFromStaticFilesWebServer>(assert_cast<const WebObjectStorage &>(*object_storage));
+    });
+}
+#endif
+
+void registerMetadataStorages()
+{
+    auto & factory = MetadataStorageFactory::instance();
+    registerMetadataStorageFromDisk(factory);
+    registerPlainMetadataStorage(factory);
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+    registerMetadataStorageFromStaticFilesWebServer(factory);
+#endif
+}
+
+}
diff --git a/src/Disks/ObjectStorages/MetadataStorageFactory.h b/src/Disks/ObjectStorages/MetadataStorageFactory.h
new file mode 100644
index 00000000000..467cd3cef98
--- /dev/null
+++ b/src/Disks/ObjectStorages/MetadataStorageFactory.h
@@ -0,0 +1,40 @@
+#pragma once
+#include <boost/noncopyable.hpp>
+#include <Disks/ObjectStorages/IMetadataStorage.h>
+
+namespace DB
+{
+
+class MetadataStorageFactory final : private boost::noncopyable
+{
+public:
+    using Creator = std::function<MetadataStoragePtr(
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ObjectStoragePtr object_storage)>;
+
+    static MetadataStorageFactory & instance();
+
+    void registerMetadataStorageType(const std::string & metadata_type, Creator creator);
+
+    MetadataStoragePtr create(
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        ObjectStoragePtr object_storage,
+        const std::string & compatibility_type_hint) const;
+
+    static std::string getMetadataType(
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const std::string & compatibility_type_hint = "");
+
+    static std::string getCompatibilityMetadataTypeHint(const ObjectStorageType & type);
+
+private:
+    using Registry = std::unordered_map<String, Creator>;
+    Registry registry;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
index 4116659ab9a..7059d8e9a6a 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromDisk.h
@@ -32,6 +32,8 @@ public:
 
     const std::string & getPath() const override;
 
+    MetadataStorageType getType() const override { return MetadataStorageType::Local; }
+
     bool exists(const std::string & path) const override;
 
     bool isFile(const std::string & path) const override;
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
index f20cd67a39f..4b8fc74e956 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.cpp
@@ -48,10 +48,7 @@ bool MetadataStorageFromPlainObjectStorage::isDirectory(const std::string & path
     std::string directory = object_key.serialize();
     if (!directory.ends_with('/'))
         directory += '/';
-
-    RelativePathsWithMetadata files;
-    object_storage->listObjects(directory, files, 1);
-    return !files.empty();
+    return object_storage->existsOrHasAnyChild(directory);
 }
 
 uint64_t MetadataStorageFromPlainObjectStorage::getFileSize(const String & path) const
@@ -98,6 +95,8 @@ DirectoryIteratorPtr MetadataStorageFromPlainObjectStorage::iterateDirectory(con
 {
     /// Required for MergeTree
     auto paths = listDirectory(path);
+    // Prepend path, since iterateDirectory() includes path, unlike listDirectory()
+    std::for_each(paths.begin(), paths.end(), [&](auto & child) { child = fs::path(path) / child; });
     std::vector<std::filesystem::path> fs_paths(paths.begin(), paths.end());
     return std::make_unique<StaticDirectoryIterator>(std::move(fs_paths));
 }
@@ -121,6 +120,12 @@ void MetadataStorageFromPlainObjectStorageTransaction::unlinkFile(const std::str
     metadata_storage.object_storage->removeObject(object);
 }
 
+void MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(const std::string & path)
+{
+    for (auto it = metadata_storage.iterateDirectory(path); it->isValid(); it->next())
+        metadata_storage.object_storage->removeObject(StoredObject(it->path()));
+}
+
 void MetadataStorageFromPlainObjectStorageTransaction::createDirectory(const std::string &)
 {
     /// Noop. It is an Object Storage not a filesystem.
diff --git a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
index 2ef823d07a4..09623716b1f 100644
--- a/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
+++ b/src/Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h
@@ -38,6 +38,8 @@ public:
 
     const std::string & getPath() const override;
 
+    MetadataStorageType getType() const override { return MetadataStorageType::Plain; }
+
     bool exists(const std::string & path) const override;
 
     bool isFile(const std::string & path) const override;
@@ -76,7 +78,7 @@ private:
 
     std::vector<MetadataOperationPtr> operations;
 public:
-    MetadataStorageFromPlainObjectStorageTransaction(const MetadataStorageFromPlainObjectStorage & metadata_storage_)
+    explicit MetadataStorageFromPlainObjectStorageTransaction(const MetadataStorageFromPlainObjectStorage & metadata_storage_)
         : metadata_storage(metadata_storage_)
     {}
 
@@ -99,12 +101,13 @@ public:
     void createDirectoryRecursive(const std::string & path) override;
 
     void unlinkFile(const std::string & path) override;
+    void removeDirectory(const std::string & path) override;
 
     UnlinkMetadataFileOperationOutcomePtr unlinkMetadata(const std::string & path) override;
 
     void commit() override
     {
-        /// Nothing to commit.
+        /// TODO: rewrite with transactions
     }
 
     bool supportsChmod() const override { return false; }
diff --git a/src/Disks/ObjectStorages/ObjectStorageFactory.cpp b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
new file mode 100644
index 00000000000..1fec0c4b673
--- /dev/null
+++ b/src/Disks/ObjectStorages/ObjectStorageFactory.cpp
@@ -0,0 +1,336 @@
+#include "config.h"
+#include <Disks/ObjectStorages/ObjectStorageFactory.h>
+#if USE_AWS_S3
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+#include <Disks/ObjectStorages/S3/diskSettings.h>
+#include <Disks/ObjectStorages/S3/DiskS3Utils.h>
+#endif
+#if USE_HDFS && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+#include <Disks/ObjectStorages/HDFS/HDFSObjectStorage.h>
+#include <Storages/HDFS/HDFSCommon.h>
+#endif
+#if USE_AZURE_BLOB_STORAGE && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
+#include <Disks/ObjectStorages/AzureBlobStorage/AzureBlobStorageAuth.h>
+#endif
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+#include <Disks/ObjectStorages/Web/WebObjectStorage.h>
+#include <Disks/ObjectStorages/Local/LocalObjectStorage.h>
+#include <Disks/loadLocalDiskConfig.h>
+#endif
+#include <Disks/ObjectStorages/MetadataStorageFactory.h>
+#include <Disks/ObjectStorages/PlainObjectStorage.h>
+#include <Interpreters/Context.h>
+#include <Common/Macros.h>
+
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int UNKNOWN_ELEMENT_IN_CONFIG;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+    bool isPlainStorage(
+        ObjectStorageType type,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix)
+    {
+        auto compatibility_hint = MetadataStorageFactory::getCompatibilityMetadataTypeHint(type);
+        auto metadata_type = MetadataStorageFactory::getMetadataType(config, config_prefix, compatibility_hint);
+        return metadataTypeFromString(metadata_type) == MetadataStorageType::Plain;
+    }
+
+    template <typename BaseObjectStorage, class ...Args>
+    ObjectStoragePtr createObjectStorage(
+        ObjectStorageType type,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        Args && ...args)
+    {
+        if (isPlainStorage(type, config, config_prefix))
+        {
+            return std::make_shared<PlainObjectStorage<BaseObjectStorage>>(std::forward<Args>(args)...);
+        }
+        else
+        {
+            return std::make_shared<BaseObjectStorage>(std::forward<Args>(args)...);
+        }
+    }
+}
+
+ObjectStorageFactory & ObjectStorageFactory::instance()
+{
+    static ObjectStorageFactory factory;
+    return factory;
+}
+
+void ObjectStorageFactory::registerObjectStorageType(const std::string & type, Creator creator)
+{
+    if (!registry.emplace(type, creator).second)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "ObjectStorageFactory: the metadata type '{}' is not unique", type);
+    }
+}
+
+ObjectStoragePtr ObjectStorageFactory::create(
+    const std::string & name,
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix,
+    const ContextPtr & context,
+    bool skip_access_check) const
+{
+    std::string type;
+    if (config.has(config_prefix + ".object_storage_type"))
+    {
+        type = config.getString(config_prefix + ".object_storage_type");
+    }
+    else if (config.has(config_prefix + ".type")) /// .type -- for compatibility.
+    {
+        type = config.getString(config_prefix + ".type");
+    }
+    else
+    {
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Expected `object_storage_type` in config");
+    }
+
+    const auto it = registry.find(type);
+
+    if (it == registry.end())
+    {
+        throw Exception(ErrorCodes::UNKNOWN_ELEMENT_IN_CONFIG,
+                        "ObjectStorageFactory: unknown object storage type: {}", type);
+    }
+
+    return it->second(name, config, config_prefix, context, skip_access_check);
+}
+
+#if USE_AWS_S3
+namespace
+{
+
+S3::URI getS3URI(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix, const ContextPtr & context)
+{
+    String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
+    S3::URI uri(endpoint);
+
+    /// An empty key remains empty.
+    if (!uri.key.empty() && !uri.key.ends_with('/'))
+        uri.key.push_back('/');
+
+    return uri;
+}
+
+void checkS3Capabilities(
+    S3ObjectStorage & storage, const S3Capabilities s3_capabilities, const String & name)
+{
+    /// If `support_batch_delete` is turned on (default), check and possibly switch it off.
+    if (s3_capabilities.support_batch_delete && !checkBatchRemove(storage))
+    {
+        LOG_WARNING(
+            getLogger("S3ObjectStorage"),
+            "Storage for disk {} does not support batch delete operations, "
+            "so `s3_capabilities.support_batch_delete` was automatically turned off during the access check. "
+            "To remove this message set `s3_capabilities.support_batch_delete` for the disk to `false`.",
+            name);
+        storage.setCapabilitiesSupportBatchDelete(false);
+    }
+}
+}
+
+void registerS3ObjectStorage(ObjectStorageFactory & factory)
+{
+    static constexpr auto disk_type = "s3";
+
+    factory.registerObjectStorageType(disk_type, [](
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool skip_access_check) -> ObjectStoragePtr
+    {
+        auto uri = getS3URI(config, config_prefix, context);
+        auto s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
+        auto settings = getSettings(config, config_prefix, context);
+        auto client = getClient(config, config_prefix, context, *settings);
+        auto key_generator = getKeyGenerator(uri, config, config_prefix);
+
+        auto object_storage = createObjectStorage<S3ObjectStorage>(
+            ObjectStorageType::S3, config, config_prefix, std::move(client), std::move(settings), uri, s3_capabilities, key_generator, name);
+
+        /// NOTE: should we still perform this check for clickhouse-disks?
+        if (!skip_access_check)
+            checkS3Capabilities(*dynamic_cast<S3ObjectStorage *>(object_storage.get()), s3_capabilities, name);
+
+        return object_storage;
+    });
+}
+
+void registerS3PlainObjectStorage(ObjectStorageFactory & factory)
+{
+    static constexpr auto disk_type = "s3_plain";
+
+    factory.registerObjectStorageType(disk_type, [](
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool skip_access_check) -> ObjectStoragePtr
+    {
+        /// send_metadata changes the filenames (includes revision), while
+        /// s3_plain do not care about this, and expect that the file name
+        /// will not be changed.
+        ///
+        /// And besides, send_metadata does not make sense for s3_plain.
+        if (config.getBool(config_prefix + ".send_metadata", false))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "s3_plain does not supports send_metadata");
+
+        auto uri = getS3URI(config, config_prefix, context);
+        auto s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
+        auto settings = getSettings(config, config_prefix, context);
+        auto client = getClient(config, config_prefix, context, *settings);
+        auto key_generator = getKeyGenerator(uri, config, config_prefix);
+
+        auto object_storage = std::make_shared<PlainObjectStorage<S3ObjectStorage>>(
+            std::move(client), std::move(settings), uri, s3_capabilities, key_generator, name);
+
+        /// NOTE: should we still perform this check for clickhouse-disks?
+        if (!skip_access_check)
+            checkS3Capabilities(*dynamic_cast<S3ObjectStorage *>(object_storage.get()), s3_capabilities, name);
+
+        return object_storage;
+    });
+}
+#endif
+
+#if USE_HDFS && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+void registerHDFSObjectStorage(ObjectStorageFactory & factory)
+{
+    factory.registerObjectStorageType("hdfs", [](
+        const std::string & /* name */,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool /* skip_access_check */) -> ObjectStoragePtr
+    {
+        auto uri = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
+        checkHDFSURL(uri);
+        if (uri.back() != '/')
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "HDFS path must ends with '/', but '{}' doesn't.", uri);
+
+        std::unique_ptr<HDFSObjectStorageSettings> settings = std::make_unique<HDFSObjectStorageSettings>(
+            config.getUInt64(config_prefix + ".min_bytes_for_seek", 1024 * 1024),
+            config.getInt(config_prefix + ".objects_chunk_size_to_delete", 1000),
+            context->getSettingsRef().hdfs_replication
+        );
+
+        return createObjectStorage<HDFSObjectStorage>(ObjectStorageType::HDFS, config, config_prefix, uri, std::move(settings), config);
+    });
+}
+#endif
+
+#if USE_AZURE_BLOB_STORAGE && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+void registerAzureObjectStorage(ObjectStorageFactory & factory)
+{
+    auto creator = [](
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool /* skip_access_check */) -> ObjectStoragePtr
+    {
+        AzureBlobStorageEndpoint endpoint = processAzureBlobStorageEndpoint(config, config_prefix);
+        return createObjectStorage<AzureObjectStorage>(
+            ObjectStorageType::Azure, config, config_prefix, name,
+            getAzureBlobContainerClient(config, config_prefix),
+            getAzureBlobStorageSettings(config, config_prefix, context),
+            endpoint.prefix.empty() ? endpoint.container_name : endpoint.container_name + "/" + endpoint.prefix);
+    };
+    factory.registerObjectStorageType("azure_blob_storage", creator);
+    factory.registerObjectStorageType("azure", creator);
+}
+#endif
+
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+void registerWebObjectStorage(ObjectStorageFactory & factory)
+{
+    factory.registerObjectStorageType("web", [](
+        const std::string & /* name */,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool /* skip_access_check */) -> ObjectStoragePtr
+    {
+        auto uri = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
+        if (!uri.ends_with('/'))
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
+        try
+        {
+            Poco::URI poco_uri(uri);
+        }
+        catch (const Poco::Exception & e)
+        {
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
+        }
+
+        return createObjectStorage<WebObjectStorage>(ObjectStorageType::Web, config, config_prefix, uri, context);
+    });
+}
+
+void registerLocalObjectStorage(ObjectStorageFactory & factory)
+{
+    auto creator = [](
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool /* skip_access_check */) -> ObjectStoragePtr
+    {
+        String object_key_prefix;
+        UInt64 keep_free_space_bytes;
+        loadDiskLocalConfig(name, config, config_prefix, context, object_key_prefix, keep_free_space_bytes);
+        /// keys are mapped to the fs, object_key_prefix is a directory also
+        fs::create_directories(object_key_prefix);
+        return createObjectStorage<LocalObjectStorage>(ObjectStorageType::Local, config, config_prefix, object_key_prefix);
+    };
+
+    factory.registerObjectStorageType("local_blob_storage", creator);
+    factory.registerObjectStorageType("local", creator);
+}
+#endif
+
+void registerObjectStorages()
+{
+    auto & factory = ObjectStorageFactory::instance();
+
+#if USE_AWS_S3
+    registerS3ObjectStorage(factory);
+    registerS3PlainObjectStorage(factory);
+#endif
+
+#if USE_HDFS && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+    registerHDFSObjectStorage(factory);
+#endif
+
+#if USE_AZURE_BLOB_STORAGE && !defined(CLICKHOUSE_KEEPER_STANDALONE_BUILD)
+    registerAzureObjectStorage(factory);
+#endif
+
+#ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
+    registerWebObjectStorage(factory);
+    registerLocalObjectStorage(factory);
+#endif
+}
+
+}
diff --git a/src/Disks/ObjectStorages/ObjectStorageFactory.h b/src/Disks/ObjectStorages/ObjectStorageFactory.h
new file mode 100644
index 00000000000..179f1a46262
--- /dev/null
+++ b/src/Disks/ObjectStorages/ObjectStorageFactory.h
@@ -0,0 +1,34 @@
+#pragma once
+#include <boost/noncopyable.hpp>
+#include <Disks/ObjectStorages/IObjectStorage.h>
+
+namespace DB
+{
+
+class ObjectStorageFactory final : private boost::noncopyable
+{
+public:
+    using Creator = std::function<ObjectStoragePtr(
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool skip_access_check)>;
+
+    static ObjectStorageFactory & instance();
+
+    void registerObjectStorageType(const std::string & type, Creator creator);
+
+    ObjectStoragePtr create(
+        const std::string & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const std::string & config_prefix,
+        const ContextPtr & context,
+        bool skip_access_check) const;
+
+private:
+    using Registry = std::unordered_map<String, Creator>;
+    Registry registry;
+};
+
+}
diff --git a/src/Disks/ObjectStorages/ObjectStorageIterator.h b/src/Disks/ObjectStorages/ObjectStorageIterator.h
index 841b0ea6664..9af2593579a 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIterator.h
+++ b/src/Disks/ObjectStorages/ObjectStorageIterator.h
@@ -54,7 +54,7 @@ public:
         return batch;
     }
 
-    virtual std::optional<RelativePathsWithMetadata> getCurrrentBatchAndScheduleNext() override
+    std::optional<RelativePathsWithMetadata> getCurrrentBatchAndScheduleNext() override
     {
         return std::nullopt;
     }
diff --git a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
index a6abe03bac9..5f63e5f6e8a 100644
--- a/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
+++ b/src/Disks/ObjectStorages/ObjectStorageIteratorAsync.h
@@ -2,7 +2,7 @@
 
 #include <Disks/ObjectStorages/ObjectStorageIterator.h>
 #include <Common/ThreadPool.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <mutex>
 #include <Common/CurrentMetrics.h>
 
diff --git a/src/Disks/ObjectStorages/PlainObjectStorage.h b/src/Disks/ObjectStorages/PlainObjectStorage.h
new file mode 100644
index 00000000000..e0907d0b4d8
--- /dev/null
+++ b/src/Disks/ObjectStorages/PlainObjectStorage.h
@@ -0,0 +1,35 @@
+#pragma once
+#include <Disks/ObjectStorages/IObjectStorage.h>
+#include <Common/ObjectStorageKeyGenerator.h>
+
+namespace DB
+{
+
+/// Do not encode keys, store as-is, and do not require separate disk for metadata.
+/// But because of this does not support renames/hardlinks/attrs/...
+///
+/// NOTE: This disk has excessive API calls.
+template <typename BaseObjectStorage>
+class PlainObjectStorage : public BaseObjectStorage
+{
+public:
+    template <class ...Args>
+    explicit PlainObjectStorage(Args && ...args)
+        : BaseObjectStorage(std::forward<Args>(args)...) {}
+
+    std::string getName() const override { return "" + BaseObjectStorage::getName(); }
+
+    /// Notes:
+    /// - supports BACKUP to this disk
+    /// - does not support INSERT into MergeTree table on this disk
+    bool isWriteOnce() const override { return true; }
+
+    bool isPlain() const override { return true; }
+
+    ObjectStorageKey generateObjectKeyForPath(const std::string & path) const override
+    {
+        return ObjectStorageKey::createAsRelative(BaseObjectStorage::getCommonKeyPrefix(), path);
+    }
+};
+
+}
diff --git a/src/Disks/ObjectStorages/RegisterDiskObjectStorage.cpp b/src/Disks/ObjectStorages/RegisterDiskObjectStorage.cpp
new file mode 100644
index 00000000000..669a0102951
--- /dev/null
+++ b/src/Disks/ObjectStorages/RegisterDiskObjectStorage.cpp
@@ -0,0 +1,67 @@
+#include <Disks/DiskFactory.h>
+#include <Interpreters/Context.h>
+#include <Disks/ObjectStorages/DiskObjectStorage.h>
+#include <Disks/ObjectStorages/MetadataStorageFactory.h>
+#include <Disks/ObjectStorages/ObjectStorageFactory.h>
+
+namespace DB
+{
+
+void registerObjectStorages();
+void registerMetadataStorages();
+
+void registerDiskObjectStorage(DiskFactory & factory, bool global_skip_access_check)
+{
+    registerObjectStorages();
+    registerMetadataStorages();
+
+    auto creator = [global_skip_access_check](
+        const String & name,
+        const Poco::Util::AbstractConfiguration & config,
+        const String & config_prefix,
+        ContextPtr context,
+        const DisksMap & /* map */,
+        bool, bool) -> DiskPtr
+    {
+        bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
+        auto object_storage = ObjectStorageFactory::instance().create(name, config, config_prefix, context, skip_access_check);
+        std::string compatibility_metadata_type_hint;
+        if (!config.has(config_prefix + ".metadata_type"))
+        {
+            if (object_storage->isPlain())
+                compatibility_metadata_type_hint = "plain";
+            else
+                compatibility_metadata_type_hint = MetadataStorageFactory::getCompatibilityMetadataTypeHint(object_storage->getType());
+        }
+
+        auto metadata_storage = MetadataStorageFactory::instance().create(
+            name, config, config_prefix, object_storage, compatibility_metadata_type_hint);
+
+        DiskObjectStoragePtr disk = std::make_shared<DiskObjectStorage>(
+            name,
+            object_storage->getCommonKeyPrefix(),
+            std::move(metadata_storage),
+            std::move(object_storage),
+            config,
+            config_prefix);
+
+        disk->startup(context, skip_access_check);
+        return disk;
+    };
+
+    factory.registerDiskType("object_storage", creator);
+#if USE_AWS_S3
+    factory.registerDiskType("s3", creator); /// For compatibility
+    factory.registerDiskType("s3_plain", creator); /// For compatibility
+#endif
+#if USE_HDFS
+    factory.registerDiskType("hdfs", creator); /// For compatibility
+#endif
+#if USE_AZURE_BLOB_STORAGE
+    factory.registerDiskType("azure_blob_storage", creator); /// For compatibility
+#endif
+    factory.registerDiskType("local_blob_storage", creator); /// For compatibility
+    factory.registerDiskType("web", creator); /// For compatibility
+}
+
+}
diff --git a/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp b/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
new file mode 100644
index 00000000000..63e7ebb00c5
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/DiskS3Utils.cpp
@@ -0,0 +1,122 @@
+#include "DiskS3Utils.h"
+
+#if USE_AWS_S3
+#include <Disks/ObjectStorages/DiskObjectStorageMetadata.h>
+#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
+#include <Core/ServerUUID.h>
+#include <IO/S3/URI.h>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+ObjectStorageKeysGeneratorPtr getKeyGenerator(
+    const S3::URI & uri,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & config_prefix)
+{
+    bool storage_metadata_write_full_object_key = DiskObjectStorageMetadata::getWriteFullObjectKeySetting();
+    bool send_metadata = config.getBool(config_prefix + ".send_metadata", false);
+
+    if (send_metadata && storage_metadata_write_full_object_key)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Wrong configuration in {}. "
+                        "s3 does not supports feature 'send_metadata' with feature 'storage_metadata_write_full_object_key'.",
+                        config_prefix);
+
+    String object_key_compatibility_prefix = config.getString(config_prefix + ".key_compatibility_prefix", String());
+    String object_key_template = config.getString(config_prefix + ".key_template", String());
+
+    if (object_key_template.empty())
+    {
+        if (!object_key_compatibility_prefix.empty())
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "Wrong configuration in {}. "
+                            "Setting 'key_compatibility_prefix' can be defined only with setting 'key_template'.",
+                            config_prefix);
+
+        return createObjectStorageKeysGeneratorByPrefix(uri.key);
+    }
+
+    if (send_metadata)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Wrong configuration in {}. "
+                        "s3 does not supports send_metadata with setting 'key_template'.",
+                        config_prefix);
+
+    if (!storage_metadata_write_full_object_key)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Wrong configuration in {}. "
+                        "Feature 'storage_metadata_write_full_object_key' has to be enabled in order to use setting 'key_template'.",
+                        config_prefix);
+
+    if (!uri.key.empty())
+        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                        "Wrong configuration in {}. "
+                        "URI.key is forbidden with settings 'key_template', use setting 'key_compatibility_prefix' instead'. "
+                        "URI.key: '{}', bucket: '{}'. ",
+                        config_prefix,
+                        uri.key, uri.bucket);
+
+    return createObjectStorageKeysGeneratorByTemplate(object_key_template);
+}
+
+static String getServerUUID()
+{
+    UUID server_uuid = ServerUUID::get();
+    if (server_uuid == UUIDHelpers::Nil)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Server UUID is not initialized");
+    return toString(server_uuid);
+}
+
+bool checkBatchRemove(S3ObjectStorage & storage)
+{
+    /// NOTE: Here we are going to write and later drop some key.
+    /// We are using generateObjectKeyForPath() which returns random object key.
+    /// That generated key is placed in a right directory where we should have write access.
+    const String path = fmt::format("clickhouse_remove_objects_capability_{}", getServerUUID());
+    const auto key = storage.generateObjectKeyForPath(path);
+    StoredObject object(key.serialize(), path);
+    try
+    {
+        auto file = storage.writeObject(object, WriteMode::Rewrite);
+        file->write("test", 4);
+        file->finalize();
+    }
+    catch (...)
+    {
+        try
+        {
+            storage.removeObject(object);
+        }
+        catch (...) // NOLINT(bugprone-empty-catch)
+        {
+        }
+        /// We don't have write access, therefore no information about batch remove.
+        return true;
+    }
+    try
+    {
+        /// Uses `DeleteObjects` request (batch delete).
+        storage.removeObjects({object});
+        return true;
+    }
+    catch (const Exception &)
+    {
+        try
+        {
+            storage.removeObject(object);
+        }
+        catch (...) // NOLINT(bugprone-empty-catch)
+        {
+        }
+        return false;
+    }
+}
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/S3/DiskS3Utils.h b/src/Disks/ObjectStorages/S3/DiskS3Utils.h
new file mode 100644
index 00000000000..e780f20d13c
--- /dev/null
+++ b/src/Disks/ObjectStorages/S3/DiskS3Utils.h
@@ -0,0 +1,24 @@
+#pragma once
+#include "config.h"
+#include <Core/Types.h>
+#include <Common/ObjectStorageKeyGenerator.h>
+
+#if USE_AWS_S3
+
+namespace Poco::Util { class AbstractConfiguration; }
+
+namespace DB
+{
+namespace S3 { struct URI; }
+
+ObjectStorageKeysGeneratorPtr getKeyGenerator(
+    const S3::URI & uri,
+    const Poco::Util::AbstractConfiguration & config,
+    const String & config_prefix);
+
+class S3ObjectStorage;
+bool checkBatchRemove(S3ObjectStorage & storage);
+
+}
+
+#endif
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
index 6a091471888..b343b73f7bd 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
@@ -6,7 +6,6 @@
 #include <Disks/ObjectStorages/ObjectStorageIteratorAsync.h>
 
 #include <Disks/IO/ReadBufferFromRemoteFSGather.h>
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Disks/IO/AsynchronousBoundedReadBuffer.h>
 #include <Disks/IO/ThreadPoolRemoteFSReader.h>
 #include <IO/WriteBufferFromS3.h>
@@ -14,7 +13,7 @@
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/copyS3File.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 
 #include <Disks/ObjectStorages/S3/diskSettings.h>
@@ -49,6 +48,7 @@ namespace ErrorCodes
 {
     extern const int S3_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
 }
 
 namespace
@@ -100,7 +100,7 @@ class S3IteratorAsync final : public IObjectStorageIteratorAsync
 {
 public:
     S3IteratorAsync(
-        const std::string & bucket,
+        const std::string & bucket_,
         const std::string & path_prefix,
         std::shared_ptr<const S3::Client> client_,
         size_t max_list_size)
@@ -111,7 +111,7 @@ public:
             "ListObjectS3")
         , client(client_)
     {
-        request.SetBucket(bucket);
+        request.SetBucket(bucket_);
         request.SetPrefix(path_prefix);
         request.SetMaxKeys(static_cast<int>(max_list_size));
     }
@@ -156,7 +156,7 @@ private:
 bool S3ObjectStorage::exists(const StoredObject & object) const
 {
     auto settings_ptr = s3_settings.get();
-    return S3::objectExists(*client.get(), bucket, object.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+    return S3::objectExists(*client.get(), uri.bucket, object.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
 }
 
 std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
@@ -172,19 +172,19 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
 
     auto read_buffer_creator =
         [this, settings_ptr, disk_read_settings]
-        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
+        (bool restricted_seek, const StoredObject & object_) -> std::unique_ptr<ReadBufferFromFileBase>
     {
         return std::make_unique<ReadBufferFromS3>(
             client.get(),
-            bucket,
-            path,
-            version_id,
+            uri.bucket,
+            object_.remote_path,
+            uri.version_id,
             settings_ptr->request_settings,
             disk_read_settings,
             /* use_external_buffer */true,
             /* offset */0,
-            read_until_position,
-            /* restricted_seek */true);
+            /* read_until_position */0,
+            restricted_seek);
     };
 
     switch (read_settings.remote_fs_method)
@@ -194,16 +194,17 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObjects( /// NOLINT
             return std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 objects,
+                "s3:" + uri.bucket + "/",
                 disk_read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */false);
-
         }
         case RemoteFSReadMethod::threadpool:
         {
             auto impl = std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 objects,
+                "s3:" + uri.bucket + "/",
                 disk_read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */true);
@@ -226,9 +227,9 @@ std::unique_ptr<ReadBufferFromFileBase> S3ObjectStorage::readObject( /// NOLINT
     auto settings_ptr = s3_settings.get();
     return std::make_unique<ReadBufferFromS3>(
         client.get(),
-        bucket,
+        uri.bucket,
         object.remote_path,
-        version_id,
+        uri.version_id,
         settings_ptr->request_settings,
         patchSettings(read_settings));
 }
@@ -257,7 +258,7 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
 
     return std::make_unique<WriteBufferFromS3>(
         client.get(),
-        bucket,
+        uri.bucket,
         object.remote_path,
         buf_size,
         settings_ptr->request_settings,
@@ -271,7 +272,7 @@ std::unique_ptr<WriteBufferFromFileBase> S3ObjectStorage::writeObject( /// NOLIN
 ObjectStorageIteratorPtr S3ObjectStorage::iterate(const std::string & path_prefix) const
 {
     auto settings_ptr = s3_settings.get();
-    return std::make_shared<S3IteratorAsync>(bucket, path_prefix, client.get(), settings_ptr->list_object_keys_size);
+    return std::make_shared<S3IteratorAsync>(uri.bucket, path_prefix, client.get(), settings_ptr->list_object_keys_size);
 }
 
 void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMetadata & children, int max_keys) const
@@ -279,7 +280,7 @@ void S3ObjectStorage::listObjects(const std::string & path, RelativePathsWithMet
     auto settings_ptr = s3_settings.get();
 
     S3::ListObjectsV2Request request;
-    request.SetBucket(bucket);
+    request.SetBucket(uri.bucket);
     request.SetPrefix(path);
     if (max_keys)
         request.SetMaxKeys(max_keys);
@@ -325,12 +326,12 @@ void S3ObjectStorage::removeObjectImpl(const StoredObject & object, bool if_exis
     ProfileEvents::increment(ProfileEvents::S3DeleteObjects);
     ProfileEvents::increment(ProfileEvents::DiskS3DeleteObjects);
     S3::DeleteObjectRequest request;
-    request.SetBucket(bucket);
+    request.SetBucket(uri.bucket);
     request.SetKey(object.remote_path);
     auto outcome = client.get()->DeleteObject(request);
     if (auto blob_storage_log = BlobStorageLogWriter::create(disk_name))
         blob_storage_log->addEvent(BlobStorageLogElement::EventType::Delete,
-                                   bucket, object.remote_path, object.local_path, object.bytes_size,
+                                   uri.bucket, object.remote_path, object.local_path, object.bytes_size,
                                    outcome.IsSuccess() ? nullptr : &outcome.GetError());
 
     throwIfUnexpectedError(outcome, if_exists);
@@ -377,7 +378,7 @@ void S3ObjectStorage::removeObjectsImpl(const StoredObjects & objects, bool if_e
             ProfileEvents::increment(ProfileEvents::S3DeleteObjects);
             ProfileEvents::increment(ProfileEvents::DiskS3DeleteObjects);
             S3::DeleteObjectsRequest request;
-            request.SetBucket(bucket);
+            request.SetBucket(uri.bucket);
             request.SetDelete(delkeys);
             auto outcome = client.get()->DeleteObjects(request);
 
@@ -387,7 +388,7 @@ void S3ObjectStorage::removeObjectsImpl(const StoredObjects & objects, bool if_e
                 auto time_now = std::chrono::system_clock::now();
                 for (const auto & object : objects)
                     blob_storage_log->addEvent(BlobStorageLogElement::EventType::Delete,
-                                               bucket, object.remote_path, object.local_path, object.bytes_size,
+                                               uri.bucket, object.remote_path, object.local_path, object.bytes_size,
                                                outcome_error, time_now);
             }
 
@@ -420,7 +421,7 @@ void S3ObjectStorage::removeObjectsIfExist(const StoredObjects & objects)
 std::optional<ObjectMetadata> S3ObjectStorage::tryGetObjectMetadata(const std::string & path) const
 {
     auto settings_ptr = s3_settings.get();
-    auto object_info = S3::getObjectInfo(*client.get(), bucket, path, {}, settings_ptr->request_settings, /* with_metadata= */ true, /* for_disk_s3= */ true, /* throw_on_error= */ false);
+    auto object_info = S3::getObjectInfo(*client.get(), uri.bucket, path, {}, settings_ptr->request_settings, /* with_metadata= */ true, /* for_disk_s3= */ true, /* throw_on_error= */ false);
 
     if (object_info.size == 0 && object_info.last_modification_time == 0 && object_info.metadata.empty())
         return {};
@@ -436,7 +437,7 @@ std::optional<ObjectMetadata> S3ObjectStorage::tryGetObjectMetadata(const std::s
 ObjectMetadata S3ObjectStorage::getObjectMetadata(const std::string & path) const
 {
     auto settings_ptr = s3_settings.get();
-    auto object_info = S3::getObjectInfo(*client.get(), bucket, path, {}, settings_ptr->request_settings, /* with_metadata= */ true, /* for_disk_s3= */ true);
+    auto object_info = S3::getObjectInfo(*client.get(), uri.bucket, path, {}, settings_ptr->request_settings, /* with_metadata= */ true, /* for_disk_s3= */ true);
 
     ObjectMetadata result;
     result.size_bytes = object_info.size;
@@ -457,18 +458,18 @@ void S3ObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
     /// Shortcut for S3
     if (auto * dest_s3 = dynamic_cast<S3ObjectStorage * >(&object_storage_to); dest_s3 != nullptr)
     {
-        auto client_ = dest_s3->client.get();
+        auto current_client = dest_s3->client.get();
         auto settings_ptr = s3_settings.get();
-        auto size = S3::getObjectSize(*client_, bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+        auto size = S3::getObjectSize(*current_client, uri.bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
         auto scheduler = threadPoolCallbackRunner<void>(getThreadPoolWriter(), "S3ObjStor_copy");
         try {
             copyS3File(
-                client_,
-                bucket,
+                current_client,
+                uri.bucket,
                 object_from.remote_path,
                 0,
                 size,
-                dest_s3->bucket,
+                dest_s3->uri.bucket,
                 object_to.remote_path,
                 settings_ptr->request_settings,
                 patchSettings(read_settings),
@@ -483,7 +484,7 @@ void S3ObjectStorage::copyObjectToAnotherObjectStorage( // NOLINT
             /// If authentication/permissions error occurs then fallthrough to copy with buffer.
             if (exc.getS3ErrorCode() != Aws::S3::S3Errors::ACCESS_DENIED)
                 throw;
-            LOG_WARNING(&Poco::Logger::get("S3ObjectStorage"),
+            LOG_WARNING(getLogger("S3ObjectStorage"),
                 "S3-server-side copy object from the disk {} to the disk {} can not be performed: {}\n",
                 getName(), dest_s3->getName(), exc.what());
         }
@@ -499,16 +500,16 @@ void S3ObjectStorage::copyObject( // NOLINT
     const WriteSettings &,
     std::optional<ObjectAttributes> object_to_attributes)
 {
-    auto client_ = client.get();
+    auto current_client = client.get();
     auto settings_ptr = s3_settings.get();
-    auto size = S3::getObjectSize(*client_, bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
+    auto size = S3::getObjectSize(*current_client, uri.bucket, object_from.remote_path, {}, settings_ptr->request_settings, /* for_disk_s3= */ true);
     auto scheduler = threadPoolCallbackRunner<void>(getThreadPoolWriter(), "S3ObjStor_copy");
-    copyS3File(client_,
-        bucket,
+    copyS3File(current_client,
+        uri.bucket,
         object_from.remote_path,
         0,
         size,
-        bucket,
+        uri.bucket,
         object_to.remote_path,
         settings_ptr->request_settings,
         patchSettings(read_settings),
@@ -552,14 +553,18 @@ std::unique_ptr<IObjectStorage> S3ObjectStorage::cloneObjectStorage(
     auto new_s3_settings = getSettings(config, config_prefix, context);
     auto new_client = getClient(config, config_prefix, context, *new_s3_settings);
     String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
+
+    auto new_uri{uri};
+    new_uri.bucket = new_namespace;
+
     return std::make_unique<S3ObjectStorage>(
-        std::move(new_client), std::move(new_s3_settings),
-        version_id, s3_capabilities, new_namespace,
-        endpoint, key_generator, disk_name);
+        std::move(new_client), std::move(new_s3_settings), new_uri, s3_capabilities, key_generator, disk_name);
 }
 
 ObjectStorageKey S3ObjectStorage::generateObjectKeyForPath(const std::string & path) const
 {
+    if (!key_generator)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Key generator is not set");
     return key_generator->generate(path);
 }
 
diff --git a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
index caa4beaba3b..4ece98c5ec4 100644
--- a/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
+++ b/src/Disks/ObjectStorages/S3/S3ObjectStorage.h
@@ -49,26 +49,18 @@ private:
         const char * logger_name,
         std::unique_ptr<S3::Client> && client_,
         std::unique_ptr<S3ObjectStorageSettings> && s3_settings_,
-        String version_id_,
+        S3::URI uri_,
         const S3Capabilities & s3_capabilities_,
-        String bucket_,
-        String connection_string,
         ObjectStorageKeysGeneratorPtr key_generator_,
         const String & disk_name_)
-        : bucket(std::move(bucket_))
+        : uri(uri_)
         , key_generator(std::move(key_generator_))
         , disk_name(disk_name_)
         , client(std::move(client_))
         , s3_settings(std::move(s3_settings_))
         , s3_capabilities(s3_capabilities_)
-        , version_id(std::move(version_id_))
+        , log(getLogger(logger_name))
     {
-        data_source_description.type = DataSourceType::S3;
-        data_source_description.description = connection_string;
-        data_source_description.is_cached = false;
-        data_source_description.is_encrypted = false;
-
-        log = &Poco::Logger::get(logger_name);
     }
 
 public:
@@ -78,13 +70,14 @@ public:
     {
     }
 
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return data_source_description;
-    }
-
     std::string getName() const override { return "S3ObjectStorage"; }
 
+    std::string getCommonKeyPrefix() const override { return uri.key; }
+
+    std::string getDescription() const override { return uri.endpoint; }
+
+    ObjectStorageType getType() const override { return ObjectStorageType::S3; }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -153,7 +146,7 @@ public:
         const std::string & config_prefix,
         ContextPtr context) override;
 
-    std::string getObjectsNamespace() const override { return bucket; }
+    std::string getObjectsNamespace() const override { return uri.bucket; }
 
     bool isRemote() const override { return true; }
 
@@ -177,8 +170,8 @@ private:
     void removeObjectImpl(const StoredObject & object, bool if_exists);
     void removeObjectsImpl(const StoredObjects & objects, bool if_exists);
 
-private:
-    std::string bucket;
+    const S3::URI uri;
+
     ObjectStorageKeysGeneratorPtr key_generator;
     std::string disk_name;
 
@@ -186,32 +179,7 @@ private:
     MultiVersion<S3ObjectStorageSettings> s3_settings;
     S3Capabilities s3_capabilities;
 
-    const String version_id;
-
-    Poco::Logger * log;
-    DataSourceDescription data_source_description;
-};
-
-/// Do not encode keys, store as-is, and do not require separate disk for metadata.
-/// But because of this does not support renames/hardlinks/attrs/...
-///
-/// NOTE: This disk has excessive API calls.
-class S3PlainObjectStorage : public S3ObjectStorage
-{
-public:
-    std::string getName() const override { return "S3PlainObjectStorage"; }
-
-    template <class ...Args>
-    explicit S3PlainObjectStorage(Args && ...args)
-        : S3ObjectStorage("S3PlainObjectStorage", std::forward<Args>(args)...)
-    {
-        data_source_description.type = DataSourceType::S3_Plain;
-    }
-
-    /// Notes:
-    /// - supports BACKUP to this disk
-    /// - does not support INSERT into MergeTree table on this disk
-    bool isWriteOnce() const override { return true; }
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.cpp b/src/Disks/ObjectStorages/S3/diskSettings.cpp
index 8ea559be5ba..c3114eb0b6f 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.cpp
+++ b/src/Disks/ObjectStorages/S3/diskSettings.cpp
@@ -1,5 +1,6 @@
 #include <Disks/ObjectStorages/S3/diskSettings.h>
-#include "IO/S3/Client.h"
+#include <IO/S3/Client.h>
+#include <Common/Exception.h>
 
 #if USE_AWS_S3
 
@@ -10,7 +11,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/Context.h>
-#include "Disks/DiskFactory.h"
+#include <Disks/DiskFactory.h>
 
 #include <aws/core/client/DefaultRetryStrategy.h>
 #include <base/getFQDNOrHostName.h>
@@ -19,13 +20,17 @@
 
 #include <Storages/StorageS3Settings.h>
 #include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
 #include <Disks/DiskLocal.h>
 #include <Common/Macros.h>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int NO_ELEMENTS_IN_CONFIG;
+}
+
 std::unique_ptr<S3ObjectStorageSettings> getSettings(const Poco::Util::AbstractConfiguration & config, const String & config_prefix, ContextPtr context)
 {
     const Settings & settings = context->getSettingsRef();
@@ -48,11 +53,15 @@ std::unique_ptr<S3::Client> getClient(
     const Settings & global_settings = context->getGlobalContext()->getSettingsRef();
     const Settings & local_settings = context->getSettingsRef();
 
-    String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
+    const String endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
     S3::URI uri(endpoint);
     if (!uri.key.ends_with('/'))
         uri.key.push_back('/');
 
+    if (S3::isS3ExpressEndpoint(endpoint) && !config.has(config_prefix + ".region"))
+        throw Exception(
+            ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Region should be explicitly specified for directory buckets ({})", config_prefix);
+
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         config.getString(config_prefix + ".region", ""),
         context->getRemoteHostFilter(),
@@ -67,11 +76,10 @@ std::unique_ptr<S3::Client> getClient(
     client_configuration.connectTimeoutMs = config.getUInt(config_prefix + ".connect_timeout_ms", S3::DEFAULT_CONNECT_TIMEOUT_MS);
     client_configuration.requestTimeoutMs = config.getUInt(config_prefix + ".request_timeout_ms", S3::DEFAULT_REQUEST_TIMEOUT_MS);
     client_configuration.maxConnections = config.getUInt(config_prefix + ".max_connections", S3::DEFAULT_MAX_CONNECTIONS);
+    client_configuration.http_keep_alive_timeout = config.getUInt(config_prefix + ".http_keep_alive_timeout", S3::DEFAULT_KEEP_ALIVE_TIMEOUT);
+    client_configuration.http_keep_alive_max_requests = config.getUInt(config_prefix + ".http_keep_alive_max_requests", S3::DEFAULT_KEEP_ALIVE_MAX_REQUESTS);
+
     client_configuration.endpointOverride = uri.endpoint;
-    client_configuration.http_keep_alive_timeout_ms = config.getUInt(
-        config_prefix + ".http_keep_alive_timeout_ms", DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT * 1000);
-    client_configuration.http_connection_pool_size = config.getUInt(config_prefix + ".http_connection_pool_size", 1000);
-    client_configuration.wait_on_pool_size_limit = false;
     client_configuration.s3_use_adaptive_timeouts = config.getBool(
         config_prefix + ".use_adaptive_timeouts", client_configuration.s3_use_adaptive_timeouts);
 
@@ -98,6 +106,7 @@ std::unique_ptr<S3::Client> getClient(
         .use_virtual_addressing = uri.is_virtual_hosted_style,
         .disable_checksum = local_settings.s3_disable_checksum,
         .gcs_issue_compose_request = config.getBool("s3.gcs_issue_compose_request", false),
+        .is_s3express_bucket = S3::isS3ExpressEndpoint(endpoint),
     };
 
     return S3::ClientFactory::instance().create(
diff --git a/src/Disks/ObjectStorages/S3/diskSettings.h b/src/Disks/ObjectStorages/S3/diskSettings.h
index 83bf7b179ef..e461daa99e2 100644
--- a/src/Disks/ObjectStorages/S3/diskSettings.h
+++ b/src/Disks/ObjectStorages/S3/diskSettings.h
@@ -9,14 +9,6 @@
 
 #include <IO/S3/Client.h>
 
-namespace Aws
-{
-namespace S3
-{
-class Client;
-}
-}
-
 namespace DB
 {
 
diff --git a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp b/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
deleted file mode 100644
index a35a1eb2a82..00000000000
--- a/src/Disks/ObjectStorages/S3/registerDiskS3.cpp
+++ /dev/null
@@ -1,243 +0,0 @@
-#include "config.h"
-
-#include <Common/logger_useful.h>
-#include <IO/ReadHelpers.h>
-#include <IO/WriteHelpers.h>
-#include <Interpreters/Context.h>
-#include <Disks/DiskFactory.h>
-
-#if USE_AWS_S3
-
-#include <base/getFQDNOrHostName.h>
-
-#include <Disks/DiskLocal.h>
-#include <Disks/ObjectStorages/IMetadataStorage.h>
-#include <Disks/ObjectStorages/DiskObjectStorage.h>
-#include <Disks/ObjectStorages/DiskObjectStorageCommon.h>
-#include <Disks/ObjectStorages/S3/S3ObjectStorage.h>
-#include <Disks/ObjectStorages/S3/diskSettings.h>
-#include <Disks/ObjectStorages/MetadataStorageFromDisk.h>
-#include <Disks/ObjectStorages/MetadataStorageFromPlainObjectStorage.h>
-
-#include <Core/ServerUUID.h>
-#include <Common/Macros.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-}
-
-namespace
-{
-
-class CheckAccess
-{
-public:
-    static bool checkBatchRemove(S3ObjectStorage & storage, const String & key_with_trailing_slash)
-    {
-        /// NOTE: key_with_trailing_slash is the disk prefix, it is required
-        /// because access is done via S3ObjectStorage not via IDisk interface
-        /// (since we don't have disk yet).
-        const String path = fmt::format("{}clickhouse_remove_objects_capability_{}", key_with_trailing_slash, getServerUUID());
-        StoredObject object(path);
-        try
-        {
-            auto file = storage.writeObject(object, WriteMode::Rewrite);
-            file->write("test", 4);
-            file->finalize();
-        }
-        catch (...)
-        {
-            try
-            {
-                storage.removeObject(object);
-            }
-            catch (...) // NOLINT(bugprone-empty-catch)
-            {
-            }
-            return true; /// We don't have write access, therefore no information about batch remove.
-        }
-        try
-        {
-            /// Uses `DeleteObjects` request (batch delete).
-            storage.removeObjects({object});
-            return true;
-        }
-        catch (const Exception &)
-        {
-            try
-            {
-                storage.removeObject(object);
-            }
-            catch (...) // NOLINT(bugprone-empty-catch)
-            {
-            }
-            return false;
-        }
-    }
-
-private:
-    static String getServerUUID()
-    {
-        UUID server_uuid = ServerUUID::get();
-        if (server_uuid == UUIDHelpers::Nil)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Server UUID is not initialized");
-        return toString(server_uuid);
-    }
-};
-
-std::pair<String, ObjectStorageKeysGeneratorPtr> getPrefixAndKeyGenerator(
-    String type, const S3::URI & uri, const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
-{
-    if (type == "s3_plain")
-        return {uri.key, createObjectStorageKeysGeneratorAsIsWithPrefix(uri.key)};
-
-    chassert(type == "s3");
-
-    bool storage_metadata_write_full_object_key = DiskObjectStorageMetadata::getWriteFullObjectKeySetting();
-    bool send_metadata = config.getBool(config_prefix + ".send_metadata", false);
-
-    if (send_metadata && storage_metadata_write_full_object_key)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Wrong configuration in {}. "
-                        "s3 does not supports feature 'send_metadata' with feature 'storage_metadata_write_full_object_key'.",
-                        config_prefix);
-
-    String object_key_compatibility_prefix = config.getString(config_prefix + ".key_compatibility_prefix", String());
-    String object_key_template = config.getString(config_prefix + ".key_template", String());
-
-    if (object_key_template.empty())
-    {
-        if (!object_key_compatibility_prefix.empty())
-            throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                            "Wrong configuration in {}. "
-                            "Setting 'key_compatibility_prefix' can be defined only with setting 'key_template'.",
-                            config_prefix);
-
-        return {uri.key, createObjectStorageKeysGeneratorByPrefix(uri.key)};
-    }
-
-    if (send_metadata)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Wrong configuration in {}. "
-                        "s3 does not supports send_metadata with setting 'key_template'.",
-                        config_prefix);
-
-    if (!storage_metadata_write_full_object_key)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Wrong configuration in {}. "
-                        "Feature 'storage_metadata_write_full_object_key' has to be enabled in order to use setting 'key_template'.",
-                        config_prefix);
-
-    if (!uri.key.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Wrong configuration in {}. "
-                        "URI.key is forbidden with settings 'key_template', use setting 'key_compatibility_prefix' instead'. "
-                        "URI.key: '{}', bucket: '{}'. ",
-                        config_prefix,
-                        uri.key, uri.bucket);
-
-    return {object_key_compatibility_prefix, createObjectStorageKeysGeneratorByTemplate(object_key_template)};
-}
-
-}
-
-void registerDiskS3(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 endpoint = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
-        S3::URI uri(endpoint);
-        // an empty key remains empty
-        if (!uri.key.empty() && !uri.key.ends_with('/'))
-            uri.key.push_back('/');
-
-        S3Capabilities s3_capabilities = getCapabilitiesFromConfig(config, config_prefix);
-        std::shared_ptr<S3ObjectStorage> s3_storage;
-
-        String type = config.getString(config_prefix + ".type");
-        chassert(type == "s3" || type == "s3_plain");
-
-        auto [object_key_compatibility_prefix, object_key_generator] = getPrefixAndKeyGenerator(type, uri, config, config_prefix);
-
-        MetadataStoragePtr metadata_storage;
-        auto settings = getSettings(config, config_prefix, context);
-        auto client = getClient(config, config_prefix, context, *settings);
-
-        if (type == "s3_plain")
-        {
-            /// send_metadata changes the filenames (includes revision), while
-            /// s3_plain do not care about this, and expect that the file name
-            /// will not be changed.
-            ///
-            /// And besides, send_metadata does not make sense for s3_plain.
-            if (config.getBool(config_prefix + ".send_metadata", false))
-                throw Exception(ErrorCodes::BAD_ARGUMENTS, "s3_plain does not supports send_metadata");
-
-            s3_storage = std::make_shared<S3PlainObjectStorage>(
-                std::move(client), std::move(settings), uri.version_id, s3_capabilities, uri.bucket, uri.endpoint, object_key_generator, name);
-
-            metadata_storage = std::make_shared<MetadataStorageFromPlainObjectStorage>(s3_storage, object_key_compatibility_prefix);
-        }
-        else
-        {
-            s3_storage = std::make_shared<S3ObjectStorage>(
-                std::move(client), std::move(settings), uri.version_id, s3_capabilities, uri.bucket, uri.endpoint, object_key_generator, name);
-
-            auto [metadata_path, metadata_disk] = prepareForLocalMetadata(name, config, config_prefix, context);
-
-            metadata_storage = std::make_shared<MetadataStorageFromDisk>(metadata_disk, object_key_compatibility_prefix);
-        }
-
-        /// NOTE: should we still perform this check for clickhouse-disks?
-        bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
-        if (!skip_access_check)
-        {
-            /// If `support_batch_delete` is turned on (default), check and possibly switch it off.
-            if (s3_capabilities.support_batch_delete && !CheckAccess::checkBatchRemove(*s3_storage, uri.key))
-            {
-                LOG_WARNING(
-                    &Poco::Logger::get("registerDiskS3"),
-                    "Storage for disk {} does not support batch delete operations, "
-                    "so `s3_capabilities.support_batch_delete` was automatically turned off during the access check. "
-                    "To remove this message set `s3_capabilities.support_batch_delete` for the disk to `false`.",
-                    name
-                );
-                s3_storage->setCapabilitiesSupportBatchDelete(false);
-            }
-        }
-
-        DiskObjectStoragePtr s3disk = std::make_shared<DiskObjectStorage>(
-            name,
-            uri.key, /// might be empty
-            type == "s3" ? "DiskS3" : "DiskS3Plain",
-            std::move(metadata_storage),
-            std::move(s3_storage),
-            config,
-            config_prefix);
-
-        s3disk->startup(context, skip_access_check);
-
-        return s3disk;
-    };
-    factory.registerDiskType("s3", creator);
-    factory.registerDiskType("s3_plain", creator);
-}
-
-}
-
-#else
-
-void registerDiskS3(DB::DiskFactory &, bool /* global_skip_access_check */) {}
-
-#endif
diff --git a/src/Disks/ObjectStorages/StaticDirectoryIterator.h b/src/Disks/ObjectStorages/StaticDirectoryIterator.h
index 891bdb688f0..3e4ad1c3ea9 100644
--- a/src/Disks/ObjectStorages/StaticDirectoryIterator.h
+++ b/src/Disks/ObjectStorages/StaticDirectoryIterator.h
@@ -22,7 +22,13 @@ public:
 
     std::string path() const override { return iter->string(); }
 
-    std::string name() const override { return iter->filename(); }
+    std::string name() const override
+    {
+        if (iter->filename().empty())
+            return iter->parent_path().filename();
+        else
+            return iter->filename();
+    }
 
 private:
     std::vector<std::filesystem::path> dir_file_paths;
diff --git a/src/Disks/ObjectStorages/StoredObject.h b/src/Disks/ObjectStorages/StoredObject.h
index af2fc127ff4..89ccb4024fa 100644
--- a/src/Disks/ObjectStorages/StoredObject.h
+++ b/src/Disks/ObjectStorages/StoredObject.h
@@ -23,8 +23,8 @@ struct StoredObject
         const String & remote_path_ = "",
         const String & local_path_ = "",
         uint64_t bytes_size_ = 0)
-        : remote_path(std::move(remote_path_))
-        , local_path(std::move(local_path_))
+        : remote_path(remote_path_)
+        , local_path(local_path_)
         , bytes_size(bytes_size_)
     {}
 };
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
index 4fecdd1fb57..5ab9d3f3631 100644
--- a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.cpp
@@ -61,21 +61,21 @@ bool MetadataStorageFromStaticFilesWebServer::isFile(const std::string & path) c
 {
     assertExists(path);
     auto file_info = object_storage.getFileInfo(path);
-    return file_info.type == WebObjectStorage::FileType::File;
+    return file_info->type == WebObjectStorage::FileType::File;
 }
 
 bool MetadataStorageFromStaticFilesWebServer::isDirectory(const std::string & path) const
 {
     assertExists(path);
     auto file_info = object_storage.getFileInfo(path);
-    return file_info.type == WebObjectStorage::FileType::Directory;
+    return file_info->type == WebObjectStorage::FileType::Directory;
 }
 
 uint64_t MetadataStorageFromStaticFilesWebServer::getFileSize(const String & path) const
 {
     assertExists(path);
     auto file_info = object_storage.getFileInfo(path);
-    return file_info.size;
+    return file_info->size;
 }
 
 StoredObjects MetadataStorageFromStaticFilesWebServer::getStorageObjects(const std::string & path) const
@@ -87,7 +87,7 @@ StoredObjects MetadataStorageFromStaticFilesWebServer::getStorageObjects(const s
     remote_path = remote_path.substr(object_storage.url.size());
 
     auto file_info = object_storage.getFileInfo(path);
-    return {StoredObject(remote_path, path, file_info.size)};
+    return {StoredObject(remote_path, path, file_info->size)};
 }
 
 std::vector<std::string> MetadataStorageFromStaticFilesWebServer::listDirectory(const std::string & path) const
@@ -109,13 +109,7 @@ DirectoryIteratorPtr MetadataStorageFromStaticFilesWebServer::iterateDirectory(c
     if (!exists(path))
         return std::make_unique<StaticDirectoryIterator>(std::move(dir_file_paths));
 
-    std::shared_lock shared_lock(object_storage.metadata_mutex);
-    for (const auto & [file_path, _] : object_storage.files)
-    {
-        if (fs::path(parentPath(file_path)) / "" == fs::path(path) / "")
-            dir_file_paths.emplace_back(file_path);
-    }
-
+    dir_file_paths = object_storage.listDirectory(path);
     LOG_TRACE(object_storage.log, "Iterate directory {} with {} files", path, dir_file_paths.size());
     return std::make_unique<StaticDirectoryIterator>(std::move(dir_file_paths));
 }
diff --git a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h
index 1b17cac994d..b720a9c91f3 100644
--- a/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h
+++ b/src/Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h
@@ -26,6 +26,8 @@ public:
 
     const std::string & getPath() const override;
 
+    MetadataStorageType getType() const override { return MetadataStorageType::StaticWeb; }
+
     bool exists(const std::string & path) const override;
 
     bool isFile(const std::string & path) const override;
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
index f3b0cb8b9a0..69f6137cd2d 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.cpp
@@ -31,69 +31,78 @@ namespace ErrorCodes
     extern const int FILE_DOESNT_EXIST;
 }
 
-void WebObjectStorage::initialize(const String & uri_path, const std::unique_lock<std::shared_mutex> & lock) const
+std::pair<WebObjectStorage::FileDataPtr, std::vector<fs::path>>
+WebObjectStorage::loadFiles(const String & path, const std::unique_lock<std::shared_mutex> &) const
 {
-    std::vector<String> directories_to_load;
-    LOG_TRACE(log, "Loading metadata for directory: {}", uri_path);
+    std::vector<fs::path> loaded_files;
+    auto full_url = fs::path(url) / path;
 
+    LOG_TRACE(log, "Adding directory: {} ({})", path, full_url);
+
+    FileDataPtr result;
     try
     {
         Poco::Net::HTTPBasicCredentials credentials{};
 
+        auto timeouts = ConnectionTimeouts::getHTTPTimeouts(
+            getContext()->getSettingsRef(),
+            getContext()->getServerSettings().keep_alive_timeout);
 
-        ReadWriteBufferFromHTTP metadata_buf(
-            Poco::URI(fs::path(uri_path) / ".index"),
-            Poco::Net::HTTPRequest::HTTP_GET,
-            ReadWriteBufferFromHTTP::OutStreamCallback(),
-            ConnectionTimeouts::getHTTPTimeouts(
-                getContext()->getSettingsRef(),
-                getContext()->getServerSettings().keep_alive_timeout),
-            credentials,
-            /* max_redirects= */ 0,
-            /* buffer_size_= */ DBMS_DEFAULT_BUFFER_SIZE,
-            getContext()->getReadSettings());
+        auto metadata_buf = BuilderRWBufferFromHTTP(Poco::URI(fs::path(full_url) / ".index"))
+                                .withConnectionGroup(HTTPConnectionGroupType::DISK)
+                                .withSettings(getContext()->getReadSettings())
+                                .withTimeouts(timeouts)
+                                .withHostFilter(&getContext()->getRemoteHostFilter())
+                                .withSkipNotFound(true)
+                                .create(credentials);
 
         String file_name;
-        FileData file_data{};
 
-        String dir_name = fs::path(uri_path.substr(url.size())) / "";
-        LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding directory: {}", dir_name);
-
-        while (!metadata_buf.eof())
+        while (!metadata_buf->eof())
         {
-            readText(file_name, metadata_buf);
-            assertChar('\t', metadata_buf);
+            readText(file_name, *metadata_buf);
+            assertChar('\t', *metadata_buf);
 
             bool is_directory;
-            readBoolText(is_directory, metadata_buf);
+            readBoolText(is_directory, *metadata_buf);
+            size_t size = 0;
             if (!is_directory)
             {
-                assertChar('\t', metadata_buf);
-                readIntText(file_data.size, metadata_buf);
+                assertChar('\t', *metadata_buf);
+                readIntText(size, *metadata_buf);
             }
-            assertChar('\n', metadata_buf);
+            assertChar('\n', *metadata_buf);
 
-            file_data.type = is_directory ? FileType::Directory : FileType::File;
-            String file_path = fs::path(uri_path) / file_name;
-            if (file_data.type == FileType::Directory)
-            {
-                directories_to_load.push_back(file_path);
-            }
+            FileDataPtr file_data = is_directory
+                ? FileData::createDirectoryInfo(false)
+                : FileData::createFileInfo(size);
 
-            file_path = file_path.substr(url.size());
-            LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Adding file: {}, size: {}", file_path, file_data.size);
+            auto file_path = fs::path(path) / file_name;
+            const bool inserted = files.add(file_path, file_data).second;
+            if (!inserted)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Loading data for {} more than once", file_path);
 
-            files.emplace(std::make_pair(file_path, file_data));
+            LOG_TRACE(getLogger("DiskWeb"), "Adding file: {}, size: {}", file_path, size);
+            loaded_files.emplace_back(file_path);
         }
 
-        files.emplace(std::make_pair(dir_name, FileData({ .type = FileType::Directory })));
+        /// Check for not found url after read attempt, because of delayed initialization.
+        if (metadata_buf->hasNotFoundURL())
+            return {};
+
+        auto [it, inserted] = files.add(path, FileData::createDirectoryInfo(true));
+        if (!inserted)
+        {
+             if (it->second->loaded_children)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Loading data for {} more than once", path);
+
+             it->second->loaded_children = true;
+        }
+
+        return std::pair(it->second, loaded_files);
     }
     catch (HTTPException & e)
     {
-        /// 404 - no files
-        if (e.getHTTPStatus() == Poco::Net::HTTPResponse::HTTP_NOT_FOUND)
-            return;
-
         e.addMessage("while loading disk metadata");
         throw;
     }
@@ -102,9 +111,6 @@ void WebObjectStorage::initialize(const String & uri_path, const std::unique_loc
         e.addMessage("while loading disk metadata");
         throw;
     }
-
-    for (const auto & directory_path : directories_to_load)
-        initialize(directory_path, lock);
 }
 
 
@@ -113,7 +119,7 @@ WebObjectStorage::WebObjectStorage(
     ContextPtr context_)
     : WithContext(context_->getGlobalContext())
     , url(url_)
-    , log(&Poco::Logger::get("WebObjectStorage"))
+    , log(getLogger("WebObjectStorage"))
 {
 }
 
@@ -124,70 +130,105 @@ bool WebObjectStorage::exists(const StoredObject & object) const
 
 bool WebObjectStorage::exists(const std::string & path) const
 {
-    LOG_TRACE(&Poco::Logger::get("DiskWeb"), "Checking existence of path: {}", path);
-    return tryGetFileInfo(path) != std::nullopt;
+    LOG_TRACE(getLogger("DiskWeb"), "Checking existence of path: {}", path);
+    return tryGetFileInfo(path) != nullptr;
 }
 
-WebObjectStorage::FileData WebObjectStorage::getFileInfo(const String & path) const
+WebObjectStorage::FileDataPtr WebObjectStorage::getFileInfo(const String & path) const
 {
     auto file_info = tryGetFileInfo(path);
     if (!file_info)
         throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "No such file: {}", path);
-    return file_info.value();
+    return file_info;
 }
 
-std::optional<WebObjectStorage::FileData> WebObjectStorage::tryGetFileInfo(const String & path) const
+std::vector<std::filesystem::path> WebObjectStorage::listDirectory(const String & path) const
+{
+    auto file_info = tryGetFileInfo(path);
+    if (!file_info)
+        throw Exception(ErrorCodes::FILE_DOESNT_EXIST, "No such file: {}", path);
+
+    if (file_info->type != FileType::Directory)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "File {} is not a directory", path);
+
+    std::vector<std::filesystem::path> result;
+    if (!file_info->loaded_children)
+    {
+        std::unique_lock unique_lock(metadata_mutex);
+        if (!file_info->loaded_children)
+            return loadFiles(path, unique_lock).second;
+    }
+    std::shared_lock shared_lock(metadata_mutex);
+    for (const auto & [file_path, _] : files)
+    {
+        if (fs::path(parentPath(file_path)) / "" == fs::path(path) / "")
+            result.emplace_back(file_path);
+    }
+    return result;
+}
+
+WebObjectStorage::FileDataPtr WebObjectStorage::tryGetFileInfo(const String & path) const
 {
     std::shared_lock shared_lock(metadata_mutex);
 
-    if (files.find(path) == files.end())
-    {
-        shared_lock.unlock();
-        std::unique_lock unique_lock(metadata_mutex);
-        if (files.find(path) == files.end())
-        {
-            fs::path index_file_dir = fs::path(url) / path;
-            if (index_file_dir.has_extension())
-                index_file_dir = index_file_dir.parent_path();
-
-            initialize(index_file_dir, unique_lock);
-        }
-        /// Files are never deleted from `files` as disk is read only, so no worry that we unlock now.
-        unique_lock.unlock();
-        shared_lock.lock();
-    }
-
-    if (files.empty())
-        return std::nullopt;
-
-    if (auto it = files.find(path); it != files.end())
+    bool is_file = fs::path(path).has_extension();
+    if (auto it = files.find(path, is_file); it != files.end())
         return it->second;
 
-    /// `object_storage.files` contains files + directories only inside `metadata_path / uuid_3_digit / uuid /`
-    /// (specific table files only), but we need to be able to also tell if `exists(<metadata_path>)`, for example.
-    auto it = std::lower_bound(
-        files.begin(), files.end(), path,
-        [](const auto & file, const std::string & path_) { return file.first < path_; }
-    );
-
-    if (it == files.end())
-        return std::nullopt;
-
-    if (startsWith(it->first, path)
-        || (it != files.begin() && startsWith(std::prev(it)->first, path)))
+    if (is_file)
     {
+        shared_lock.unlock();
+
+        const auto parent_path = fs::path(path).parent_path();
+        auto parent_info = tryGetFileInfo(parent_path);
+        if (!parent_info)
+        {
+            return nullptr;
+        }
+
+        if (!parent_info->loaded_children)
+        {
+            std::unique_lock unique_lock(metadata_mutex);
+            if (!parent_info->loaded_children)
+                loadFiles(parent_path, unique_lock);
+        }
+
+        shared_lock.lock();
+
+        if (auto jt = files.find(path, is_file); jt != files.end())
+            return jt->second;
+        else
+        {
+            return nullptr;
+        }
+    }
+    else
+    {
+        auto it = std::lower_bound(
+            files.begin(), files.end(), path,
+            [](const auto & file, const std::string & path_) { return file.first < path_; }
+        );
+        if (it != files.end())
+        {
+            if (startsWith(it->first, path)
+                || (it != files.begin() && startsWith(std::prev(it)->first, path)))
+            {
+                shared_lock.unlock();
+                std::unique_lock unique_lock(metadata_mutex);
+
+                /// Add this directory path not files cache to simplify further checks for this path.
+                return files.add(path, FileData::createDirectoryInfo(false)).first->second;
+            }
+        }
+
         shared_lock.unlock();
         std::unique_lock unique_lock(metadata_mutex);
 
-        /// Add this directory path not files cache to simplify further checks for this path.
-        files.emplace(std::make_pair(path, FileData({.type = FileType::Directory})));
-
-        unique_lock.unlock();
-        shared_lock.lock();
-
-        return FileData{ .type = FileType::Directory };
+        if (auto jt = files.find(path, is_file); jt != files.end())
+            return jt->second;
+        else
+            return loadFiles(path, unique_lock).first;
     }
-    return std::nullopt;
 }
 
 std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObjects( /// NOLINT
@@ -209,16 +250,17 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
     std::optional<size_t>,
     std::optional<size_t>) const
 {
+    size_t object_size = object.bytes_size;
     auto read_buffer_creator =
-         [this, read_settings]
-         (const std::string & path_, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
+         [this, read_settings, object_size]
+         (bool /* restricted_seek */, const StoredObject & object_) -> std::unique_ptr<ReadBufferFromFileBase>
      {
-         return std::make_unique<ReadBufferFromWebServer>(
-             fs::path(url) / path_,
-             getContext(),
-             read_settings,
-             /* use_external_buffer */true,
-             read_until_position);
+        return std::make_unique<ReadBufferFromWebServer>(
+            fs::path(url) / object_.remote_path,
+            getContext(),
+            object_size,
+            read_settings,
+            /* use_external_buffer */true);
      };
 
     auto global_context = Context::getGlobalContextInstance();
@@ -230,6 +272,7 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
             return std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 StoredObjects{object},
+                "url:" + url + "/",
                 read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */false);
@@ -239,6 +282,7 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
             auto impl = std::make_unique<ReadBufferFromRemoteFSGather>(
                 std::move(read_buffer_creator),
                 StoredObjects{object},
+                "url:" + url + "/",
                 read_settings,
                 global_context->getFilesystemCacheLog(),
                 /* use_external_buffer */true);
@@ -254,7 +298,7 @@ std::unique_ptr<ReadBufferFromFileBase> WebObjectStorage::readObject( /// NOLINT
 
 void WebObjectStorage::throwNotAllowed()
 {
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Only read-only operations are supported");
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Only read-only operations are supported in WebObjectStorage");
 }
 
 std::unique_ptr<WriteBufferFromFileBase> WebObjectStorage::writeObject( /// NOLINT
diff --git a/src/Disks/ObjectStorages/Web/WebObjectStorage.h b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
index 2bc3b6983fe..a285742c66d 100644
--- a/src/Disks/ObjectStorages/Web/WebObjectStorage.h
+++ b/src/Disks/ObjectStorages/Web/WebObjectStorage.h
@@ -21,18 +21,14 @@ class WebObjectStorage : public IObjectStorage, WithContext
 public:
     WebObjectStorage(const String & url_, ContextPtr context_);
 
-    DataSourceDescription getDataSourceDescription() const override
-    {
-        return DataSourceDescription{
-            .type = DataSourceType::WebServer,
-            .description = url,
-            .is_encrypted = false,
-            .is_cached = false,
-        };
-    }
-
     std::string getName() const override { return "WebObjectStorage"; }
 
+    ObjectStorageType getType() const override { return ObjectStorageType::Web; }
+
+    std::string getCommonKeyPrefix() const override { return url; }
+
+    std::string getDescription() const override { return url; }
+
     bool exists(const StoredObject & object) const override;
 
     std::unique_ptr<ReadBufferFromFileBase> readObject( /// NOLINT
@@ -108,24 +104,61 @@ protected:
         Directory
     };
 
+    struct FileData;
+    using FileDataPtr = std::shared_ptr<FileData>;
+
     struct FileData
     {
-        FileType type{};
-        size_t size = 0;
+        FileData(FileType type_, size_t size_, bool loaded_children_ = false)
+            : type(type_), size(size_), loaded_children(loaded_children_) {}
+
+        static FileDataPtr createFileInfo(size_t size_)
+        {
+            return std::make_shared<FileData>(FileType::File, size_, false);
+        }
+
+        static FileDataPtr createDirectoryInfo(bool loaded_childrent_)
+        {
+            return std::make_shared<FileData>(FileType::Directory, 0, loaded_childrent_);
+        }
+
+        FileType type;
+        size_t size;
+        std::atomic<bool> loaded_children;
+    };
+
+    struct Files : public std::map<String, FileDataPtr>
+    {
+        auto find(const String & path, bool is_file) const
+        {
+            if (is_file)
+                return std::map<String, FileDataPtr>::find(path);
+            else
+                return std::map<String, FileDataPtr>::find(path.ends_with("/") ? path : path + '/');
+        }
+
+        auto add(const String & path, FileDataPtr data)
+        {
+            if (data->type == FileType::Directory)
+                return emplace(path.ends_with("/") ? path : path + '/', data);
+            else
+                return emplace(path, data);
+        }
     };
 
-    using Files = std::map<String, FileData>; /// file path -> file data
     mutable Files files;
     mutable std::shared_mutex metadata_mutex;
 
-    std::optional<FileData> tryGetFileInfo(const String & path) const;
-    FileData getFileInfo(const String & path) const;
+    FileDataPtr tryGetFileInfo(const String & path) const;
+    std::vector<std::filesystem::path> listDirectory(const String & path) const;
+    FileDataPtr getFileInfo(const String & path) const;
 
 private:
-    void initialize(const String & path, const std::unique_lock<std::shared_mutex> &) const;
+    std::pair<WebObjectStorage::FileDataPtr, std::vector<std::filesystem::path>>
+    loadFiles(const String & path, const std::unique_lock<std::shared_mutex> &) const;
 
     const String url;
-    Poco::Logger * log;
+    LoggerPtr log;
     size_t min_bytes_for_seek;
 };
 
diff --git a/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp b/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp
deleted file mode 100644
index 442a399fc78..00000000000
--- a/src/Disks/ObjectStorages/Web/registerDiskWebServer.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-#include <Poco/Exception.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include <Disks/DiskFactory.h>
-#include <Disks/ObjectStorages/Web/WebObjectStorage.h>
-#include <Disks/ObjectStorages/Web/MetadataStorageFromStaticFilesWebServer.h>
-#include <Disks/ObjectStorages/DiskObjectStorage.h>
-#include <Common/assert_cast.h>
-#include <Common/Macros.h>
-#include <Interpreters/Context.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-void registerDiskWebServer(DiskFactory & factory, bool global_skip_access_check)
-{
-    auto creator = [global_skip_access_check](
-        const String & disk_name,
-        const Poco::Util::AbstractConfiguration & config,
-        const String & config_prefix,
-        ContextPtr context,
-        const DisksMap & /*map*/) -> DiskPtr
-    {
-        String uri = context->getMacros()->expand(config.getString(config_prefix + ".endpoint"));
-        bool skip_access_check = global_skip_access_check || config.getBool(config_prefix + ".skip_access_check", false);
-
-        if (!uri.ends_with('/'))
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS, "URI must end with '/', but '{}' doesn't.", uri);
-        try
-        {
-            Poco::URI poco_uri(uri);
-        }
-        catch (const Poco::Exception & e)
-        {
-            throw Exception(
-                ErrorCodes::BAD_ARGUMENTS, "Bad URI: `{}`. Error: {}", uri, e.what());
-        }
-
-        auto object_storage = std::make_shared<WebObjectStorage>(uri, context);
-        auto metadata_storage = std::make_shared<MetadataStorageFromStaticFilesWebServer>(assert_cast<const WebObjectStorage &>(*object_storage));
-        std::string root_path;
-
-        DiskPtr disk = std::make_shared<DiskObjectStorage>(
-            disk_name,
-            root_path,
-            "DiskWebServer",
-            metadata_storage,
-            object_storage,
-            config,
-            config_prefix);
-
-        disk->startup(context, skip_access_check);
-        return disk;
-    };
-
-    factory.registerDiskType("web", creator);
-}
-
-}
diff --git a/src/Disks/StoragePolicy.cpp b/src/Disks/StoragePolicy.cpp
index 6cf22cbaa1b..390afb368f8 100644
--- a/src/Disks/StoragePolicy.cpp
+++ b/src/Disks/StoragePolicy.cpp
@@ -28,6 +28,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int EXCESSIVE_ELEMENT_IN_CONFIG;
     extern const int NO_ELEMENTS_IN_CONFIG;
+    extern const int INVALID_CONFIG_PARAMETER;
     extern const int UNKNOWN_POLICY;
     extern const int UNKNOWN_VOLUME;
     extern const int LOGICAL_ERROR;
@@ -41,7 +42,7 @@ StoragePolicy::StoragePolicy(
     const String & config_prefix,
     DiskSelectorPtr disks)
     : name(std::move(name_))
-    , log(&Poco::Logger::get("StoragePolicy (" + name + ")"))
+    , log(getLogger("StoragePolicy (" + name + ")"))
 {
     Poco::Util::AbstractConfiguration::Keys keys;
     String volumes_prefix = config_prefix + ".volumes";
@@ -56,6 +57,8 @@ StoragePolicy::StoragePolicy(
         config.keys(volumes_prefix, keys);
     }
 
+    std::set<UInt64> volume_priorities;
+
     for (const auto & attr_name : keys)
     {
         if (!std::all_of(attr_name.begin(), attr_name.end(), isWordCharASCII))
@@ -63,6 +66,27 @@ StoragePolicy::StoragePolicy(
                             "Volume name can contain only alphanumeric and '_' in storage policy {} ({})",
                             backQuote(name), attr_name);
         volumes.emplace_back(createVolumeFromConfig(attr_name, config, volumes_prefix + "." + attr_name, disks));
+
+        UInt64 last_priority = volumes.back()->volume_priority;
+        if (last_priority != std::numeric_limits<UInt64>::max() && !volume_priorities.insert(last_priority).second)
+        {
+            throw Exception(
+                ErrorCodes::INVALID_CONFIG_PARAMETER,
+                "volume_priority values must be unique across the policy");
+        }
+    }
+
+    if (!volume_priorities.empty())
+    {
+        /// Check that priority values cover the range from 1 to N (lowest explicit priority)
+        if (*volume_priorities.begin() != 1 || *volume_priorities.rbegin() != volume_priorities.size())
+            throw Exception(
+                ErrorCodes::INVALID_CONFIG_PARAMETER,
+                "volume_priority values must cover the range from 1 to N (lowest priority specified) without gaps");
+
+        std::stable_sort(
+            volumes.begin(), volumes.end(),
+            [](const VolumePtr a, const VolumePtr b) { return a->volume_priority < b->volume_priority; });
     }
 
     if (volumes.empty() && name == DEFAULT_STORAGE_POLICY_NAME)
@@ -96,7 +120,7 @@ StoragePolicy::StoragePolicy(String name_, Volumes volumes_, double move_factor_
     : volumes(std::move(volumes_))
     , name(std::move(name_))
     , move_factor(move_factor_)
-    , log(&Poco::Logger::get("StoragePolicy (" + name + ")"))
+    , log(getLogger("StoragePolicy (" + name + ")"))
 {
     if (volumes.empty())
         throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Storage policy {} must contain at least one Volume.", backQuote(name));
@@ -418,7 +442,7 @@ StoragePolicySelector::StoragePolicySelector(
          */
 
         policies.emplace(name, std::make_shared<StoragePolicy>(name, config, config_prefix + "." + name, disks));
-        LOG_INFO(&Poco::Logger::get("StoragePolicySelector"), "Storage policy {} loaded", backQuote(name));
+        LOG_INFO(getLogger("StoragePolicySelector"), "Storage policy {} loaded", backQuote(name));
     }
 
     /// Add default policy if it isn't explicitly specified.
diff --git a/src/Disks/StoragePolicy.h b/src/Disks/StoragePolicy.h
index d210d8c1e2f..501e033abc3 100644
--- a/src/Disks/StoragePolicy.h
+++ b/src/Disks/StoragePolicy.h
@@ -105,7 +105,7 @@ private:
 
     void buildVolumeIndices();
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
diff --git a/src/Disks/TemporaryFileOnDisk.cpp b/src/Disks/TemporaryFileOnDisk.cpp
index 06d7da4af58..92219a7f25f 100644
--- a/src/Disks/TemporaryFileOnDisk.cpp
+++ b/src/Disks/TemporaryFileOnDisk.cpp
@@ -59,7 +59,7 @@ TemporaryFileOnDisk::~TemporaryFileOnDisk()
 
         if (!disk->exists(relative_path))
         {
-            LOG_WARNING(&Poco::Logger::get("TemporaryFileOnDisk"), "Temporary path '{}' does not exist in '{}'", relative_path, disk->getPath());
+            LOG_WARNING(getLogger("TemporaryFileOnDisk"), "Temporary path '{}' does not exist in '{}'", relative_path, disk->getPath());
             return;
         }
 
diff --git a/src/Disks/VolumeJBOD.cpp b/src/Disks/VolumeJBOD.cpp
index 682a167bf5f..a0c71583a22 100644
--- a/src/Disks/VolumeJBOD.cpp
+++ b/src/Disks/VolumeJBOD.cpp
@@ -21,7 +21,9 @@ VolumeJBOD::VolumeJBOD(
     : IVolume(name_, config, config_prefix, disk_selector)
     , disks_by_size(disks.begin(), disks.end())
 {
-    Poco::Logger * logger = &Poco::Logger::get("StorageConfiguration");
+    LoggerPtr logger = getLogger("StorageConfiguration");
+
+    volume_priority = config.getUInt64(config_prefix + ".volume_priority", std::numeric_limits<UInt64>::max());
 
     auto has_max_bytes = config.has(config_prefix + ".max_data_part_size_bytes");
     auto has_max_ratio = config.has(config_prefix + ".max_data_part_size_ratio");
@@ -85,7 +87,7 @@ VolumeJBOD::VolumeJBOD(const VolumeJBOD & volume_jbod,
         DiskSelectorPtr disk_selector)
     : VolumeJBOD(volume_jbod.name, config, config_prefix, disk_selector)
 {
-    are_merges_avoided_user_override = volume_jbod.are_merges_avoided_user_override.load(std::memory_order_relaxed);
+    are_merges_avoided_user_override = volume_jbod.are_merges_avoided_user_override.load();
     last_used = volume_jbod.last_used.load(std::memory_order_relaxed);
 }
 
diff --git a/src/Disks/getOrCreateDiskFromAST.cpp b/src/Disks/getOrCreateDiskFromAST.cpp
index da318303f62..7b2762613b6 100644
--- a/src/Disks/getOrCreateDiskFromAST.cpp
+++ b/src/Disks/getOrCreateDiskFromAST.cpp
@@ -24,7 +24,7 @@ namespace ErrorCodes
 
 namespace
 {
-    std::string getOrCreateDiskFromDiskAST(const ASTFunction & function, ContextPtr context)
+    std::string getOrCreateDiskFromDiskAST(const ASTFunction & function, ContextPtr context, bool attach)
     {
         const auto * function_args_expr = assert_cast<const ASTExpressionList *>(function.arguments.get());
         const auto & function_args = function_args_expr->children;
@@ -46,7 +46,8 @@ namespace
         }
 
         auto result_disk = context->getOrCreateDisk(disk_name, [&](const DisksMap & disks_map) -> DiskPtr {
-            auto disk = DiskFactory::instance().create(disk_name, *config, "", context, disks_map);
+            auto disk = DiskFactory::instance().create(
+                disk_name, *config, "", context, disks_map, /* attach */attach, /* custom_disk */true);
             /// Mark that disk can be used without storage policy.
             disk->markDiskAsCustom();
             return disk;
@@ -55,16 +56,16 @@ namespace
         if (!result_disk->isCustomDisk())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Disk with name `{}` already exist", disk_name);
 
-        if (!result_disk->isRemote())
+        if (!attach && !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, "");
+            static constexpr auto custom_local_disks_base_dir_in_config = "custom_local_disks_base_directory";
+            auto disk_path_expected_prefix = context->getConfigRef().getString(custom_local_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);
+                    custom_local_disks_base_dir_in_config);
 
             if (!pathStartsWith(result_disk->getPath(), disk_path_expected_prefix))
                 throw Exception(
@@ -82,6 +83,7 @@ namespace
         struct Data
         {
             ContextPtr context;
+            bool attach;
         };
 
         static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
@@ -90,7 +92,7 @@ namespace
         {
             if (isDiskFunction(ast))
             {
-                auto disk_name = getOrCreateDiskFromDiskAST(*ast->as<ASTFunction>(), data.context);
+                auto disk_name = getOrCreateDiskFromDiskAST(*ast->as<ASTFunction>(), data.context, data.attach);
                 ast = std::make_shared<ASTLiteral>(disk_name);
             }
         }
@@ -101,18 +103,18 @@ namespace
 }
 
 
-std::string getOrCreateDiskFromDiskAST(const ASTPtr & disk_function, ContextPtr context)
+std::string getOrCreateDiskFromDiskAST(const ASTPtr & disk_function, ContextPtr context, bool attach)
 {
     if (!isDiskFunction(disk_function))
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected a disk function");
 
     auto ast = disk_function->clone();
 
-    FlattenDiskConfigurationVisitor::Data data{context};
+    FlattenDiskConfigurationVisitor::Data data{context, attach};
     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);
+    LOG_TRACE(getLogger("getOrCreateDiskFromDiskAST"), "Result disk name: {}", disk_name);
     return disk_name;
 }
 
diff --git a/src/Disks/getOrCreateDiskFromAST.h b/src/Disks/getOrCreateDiskFromAST.h
index 0195f575278..61e1decbee9 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 ASTPtr & disk_function, ContextPtr context);
+std::string getOrCreateDiskFromDiskAST(const ASTPtr & disk_function, ContextPtr context, bool attach);
 
 }
diff --git a/src/Disks/registerDisks.cpp b/src/Disks/registerDisks.cpp
index 4e07fda1cc2..b8da93ff9f2 100644
--- a/src/Disks/registerDisks.cpp
+++ b/src/Disks/registerDisks.cpp
@@ -9,27 +9,12 @@ namespace DB
 
 void registerDiskLocal(DiskFactory & factory, bool global_skip_access_check);
 
-#if USE_AWS_S3
-void registerDiskS3(DiskFactory & factory, bool global_skip_access_check);
-#endif
-
-#if USE_AZURE_BLOB_STORAGE
-void registerDiskAzureBlobStorage(DiskFactory & factory, bool global_skip_access_check);
-#endif
-
 #if USE_SSL
 void registerDiskEncrypted(DiskFactory & factory, bool global_skip_access_check);
 #endif
 
-#if USE_HDFS
-void registerDiskHDFS(DiskFactory & factory, bool global_skip_access_check);
-#endif
-
-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 registerDiskObjectStorage(DiskFactory & factory, bool global_skip_access_check);
 
 
 #ifndef CLICKHOUSE_KEEPER_STANDALONE_BUILD
@@ -40,27 +25,13 @@ void registerDisks(bool global_skip_access_check)
 
     registerDiskLocal(factory, global_skip_access_check);
 
-#if USE_AWS_S3
-    registerDiskS3(factory, global_skip_access_check);
-#endif
-
-#if USE_AZURE_BLOB_STORAGE
-    registerDiskAzureBlobStorage(factory, global_skip_access_check);
-#endif
-
 #if USE_SSL
     registerDiskEncrypted(factory, global_skip_access_check);
 #endif
 
-#if USE_HDFS
-    registerDiskHDFS(factory, global_skip_access_check);
-#endif
-
-    registerDiskWebServer(factory, global_skip_access_check);
-
     registerDiskCache(factory, global_skip_access_check);
 
-    registerDiskLocalObjectStorage(factory, global_skip_access_check);
+    registerDiskObjectStorage(factory, global_skip_access_check);
 }
 
 #else
@@ -71,9 +42,7 @@ void registerDisks(bool global_skip_access_check)
 
     registerDiskLocal(factory, global_skip_access_check);
 
-#if USE_AWS_S3
-    registerDiskS3(factory, global_skip_access_check);
-#endif
+    registerDiskObjectStorage(factory, global_skip_access_check);
 }
 
 #endif
diff --git a/src/Disks/tests/gtest_asynchronous_bounded_read_buffer.cpp b/src/Disks/tests/gtest_asynchronous_bounded_read_buffer.cpp
new file mode 100644
index 00000000000..63a39fe39c7
--- /dev/null
+++ b/src/Disks/tests/gtest_asynchronous_bounded_read_buffer.cpp
@@ -0,0 +1,82 @@
+#include <gtest/gtest.h>
+
+#include <Disks/IO/AsynchronousBoundedReadBuffer.h>
+#include <Disks/IO/ThreadPoolRemoteFSReader.h>
+#include <Disks/IO/createReadBufferFromFileBase.h>
+#include <IO/WriteBufferFromFile.h>
+#include <Poco/TemporaryFile.h>
+#include <filesystem>
+
+
+using namespace DB;
+namespace fs = std::filesystem;
+
+class AsynchronousBoundedReadBufferTest : public ::testing::TestWithParam<const char *>
+{
+public:
+    AsynchronousBoundedReadBufferTest() { fs::create_directories(temp_folder.path()); }
+
+    String makeTempFile(const String & contents)
+    {
+        String path = fmt::format("{}/{}", temp_folder.path(), counter);
+        ++counter;
+
+        WriteBufferFromFile out{path};
+        out.write(contents.data(), contents.size());
+        out.finalize();
+
+        return path;
+    }
+
+private:
+    Poco::TemporaryFile temp_folder;
+    size_t counter = 0;
+};
+
+String getAlphabetWithDigits()
+{
+    String contents;
+    for (char c = 'a'; c <= 'z'; ++c)
+        contents += c;
+    for (char c = '0'; c <= '9'; ++c)
+        contents += c;
+    return contents;
+}
+
+
+TEST_F(AsynchronousBoundedReadBufferTest, setReadUntilPosition)
+{
+    String file_path = makeTempFile(getAlphabetWithDigits());
+    ThreadPoolRemoteFSReader remote_fs_reader(4, 0);
+
+    for (bool with_prefetch : {false, true})
+    {
+        AsynchronousBoundedReadBuffer read_buffer(createReadBufferFromFileBase(file_path, {}), remote_fs_reader, {});
+        read_buffer.setReadUntilPosition(20);
+
+        auto try_read = [&](size_t count)
+        {
+            if (with_prefetch)
+                read_buffer.prefetch(Priority{0});
+
+            String str;
+            str.resize(count);
+            str.resize(read_buffer.read(str.data(), str.size()));
+            return str;
+        };
+
+        EXPECT_EQ(try_read(15), "abcdefghijklmno");
+        EXPECT_EQ(try_read(15), "pqrst");
+        EXPECT_EQ(try_read(15), "");
+
+        read_buffer.setReadUntilPosition(25);
+
+        EXPECT_EQ(try_read(15), "uvwxy");
+        EXPECT_EQ(try_read(15), "");
+
+        read_buffer.setReadUntilEnd();
+
+        EXPECT_EQ(try_read(15), "z0123456789");
+        EXPECT_EQ(try_read(15), "");
+    }
+}
diff --git a/src/Disks/tests/gtest_disk.cpp b/src/Disks/tests/gtest_disk.cpp
index a9252ca5d50..87882147578 100644
--- a/src/Disks/tests/gtest_disk.cpp
+++ b/src/Disks/tests/gtest_disk.cpp
@@ -47,7 +47,7 @@ TEST_F(DiskTest, writeFile)
         writeString("test data", *out);
     }
 
-    DB::String data;
+    String data;
     {
         std::unique_ptr<DB::ReadBuffer> in = disk->readFile("test_file");
         readString(data, *in);
diff --git a/src/Disks/tests/gtest_disk_hdfs.cpp b/src/Disks/tests/gtest_disk_hdfs.cpp
index 4b5ff182256..81eaae7d829 100644
--- a/src/Disks/tests/gtest_disk_hdfs.cpp
+++ b/src/Disks/tests/gtest_disk_hdfs.cpp
@@ -52,7 +52,7 @@ TEST(DiskTestHDFS, WriteReadHDFS)
     }
 
     {
-        DB::String result;
+        String result;
         auto in = disk.readFile(file_name, {}, 1024, 1024);
         readString(result, *in);
         EXPECT_EQ("Test write to file", result);
diff --git a/src/Formats/EscapingRuleUtils.cpp b/src/Formats/EscapingRuleUtils.cpp
index a7e9fb8e99f..3edade639df 100644
--- a/src/Formats/EscapingRuleUtils.cpp
+++ b/src/Formats/EscapingRuleUtils.cpp
@@ -85,7 +85,7 @@ void skipFieldByEscapingRule(ReadBuffer & buf, FormatSettings::EscapingRule esca
             readCSVStringInto(out, buf, format_settings.csv);
             break;
         case FormatSettings::EscapingRule::JSON:
-            skipJSONField(buf, StringRef(field_name, field_name_len));
+            skipJSONField(buf, StringRef(field_name, field_name_len), format_settings.json);
             break;
         case FormatSettings::EscapingRule::Raw:
             readStringInto(out, buf);
@@ -109,31 +109,31 @@ bool deserializeFieldByEscapingRule(
     {
         case FormatSettings::EscapingRule::Escaped:
             if (parse_as_nullable)
-                read = SerializationNullable::deserializeTextEscapedImpl(column, buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextEscaped(column, buf, format_settings, serialization);
             else
                 serialization->deserializeTextEscaped(column, buf, format_settings);
             break;
         case FormatSettings::EscapingRule::Quoted:
             if (parse_as_nullable)
-                read = SerializationNullable::deserializeTextQuotedImpl(column, buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(column, buf, format_settings, serialization);
             else
                 serialization->deserializeTextQuoted(column, buf, format_settings);
             break;
         case FormatSettings::EscapingRule::CSV:
             if (parse_as_nullable)
-                read = SerializationNullable::deserializeTextCSVImpl(column, buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextCSV(column, buf, format_settings, serialization);
             else
                 serialization->deserializeTextCSV(column, buf, format_settings);
             break;
         case FormatSettings::EscapingRule::JSON:
             if (parse_as_nullable)
-                read = SerializationNullable::deserializeTextJSONImpl(column, buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(column, buf, format_settings, serialization);
             else
                 serialization->deserializeTextJSON(column, buf, format_settings);
             break;
         case FormatSettings::EscapingRule::Raw:
             if (parse_as_nullable)
-                read = SerializationNullable::deserializeTextRawImpl(column, buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextRaw(column, buf, format_settings, serialization);
             else
                 serialization->deserializeTextRaw(column, buf, format_settings);
             break;
@@ -219,9 +219,9 @@ String readByEscapingRule(ReadBuffer & buf, FormatSettings::EscapingRule escapin
             break;
         case FormatSettings::EscapingRule::JSON:
             if constexpr (read_string)
-                readJSONString(result, buf);
+                readJSONString(result, buf, format_settings.json);
             else
-                readJSONField(result, buf);
+                readJSONField(result, buf, format_settings.json);
             break;
         case FormatSettings::EscapingRule::Raw:
             readString(result, buf);
@@ -303,8 +303,8 @@ DataTypePtr tryInferDataTypeByEscapingRule(const String & field, const FormatSet
                 /// Try to determine the type of value inside quotes
                 auto type = tryInferDataTypeForSingleField(data, format_settings);
 
-                /// If we couldn't infer any type or it's tuple in quotes or it's a number and csv.try_infer_numbers_from_strings = 0, we determine it as a string.
-                if (!type || isTuple(type) || (isNumber(type) && !format_settings.csv.try_infer_numbers_from_strings))
+                /// If we couldn't infer any type or it's a number and csv.try_infer_numbers_from_strings = 0, we determine it as a string.
+                if (!type || (isNumber(type) && !format_settings.csv.try_infer_numbers_from_strings))
                     return std::make_shared<DataTypeString>();
 
                 return type;
@@ -450,8 +450,10 @@ String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings, Fo
             break;
         case FormatSettings::EscapingRule::JSON:
             result += fmt::format(
-                ", try_infer_numbers_from_strings={}, read_bools_as_numbers={}, read_bools_as_strings={}, read_objects_as_strings={}, read_numbers_as_strings={}, "
-                "read_arrays_as_strings={}, try_infer_objects_as_tuples={}, infer_incomplete_types_as_strings={}, try_infer_objects={}",
+                ", try_infer_numbers_from_strings={}, read_bools_as_numbers={}, read_bools_as_strings={}, read_objects_as_strings={}, "
+                "read_numbers_as_strings={}, "
+                "read_arrays_as_strings={}, try_infer_objects_as_tuples={}, infer_incomplete_types_as_strings={}, try_infer_objects={}, "
+                "use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects={}",
                 settings.json.try_infer_numbers_from_strings,
                 settings.json.read_bools_as_numbers,
                 settings.json.read_bools_as_strings,
@@ -460,7 +462,8 @@ String getAdditionalFormatInfoByEscapingRule(const FormatSettings & settings, Fo
                 settings.json.read_arrays_as_strings,
                 settings.json.try_infer_objects_as_tuples,
                 settings.json.infer_incomplete_types_as_strings,
-                settings.json.allow_object_type);
+                settings.json.allow_object_type,
+                settings.json.use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects);
             break;
         default:
             break;
diff --git a/src/Formats/FormatFactory.cpp b/src/Formats/FormatFactory.cpp
index 0344ed54ae3..8cbb1b9e563 100644
--- a/src/Formats/FormatFactory.cpp
+++ b/src/Formats/FormatFactory.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/ProcessList.h>
 #include <IO/SharedThreadPools.h>
+#include <IO/WriteHelpers.h>
 #include <Processors/Formats/IRowInputFormat.h>
 #include <Processors/Formats/IRowOutputFormat.h>
 #include <Processors/Formats/Impl/MySQLOutputFormat.h>
@@ -30,15 +31,32 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+bool FormatFactory::exists(const String & name) const
+{
+    return dict.find(boost::to_lower_copy(name)) != dict.end();
+}
+
 const FormatFactory::Creators & FormatFactory::getCreators(const String & name) const
 {
-    auto it = dict.find(name);
+    auto it = dict.find(boost::to_lower_copy(name));
     if (dict.end() != it)
         return it->second;
     throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown format {}", name);
 }
 
-FormatSettings getFormatSettings(ContextPtr context)
+FormatFactory::Creators & FormatFactory::getOrCreateCreators(const String & name)
+{
+    String lower_case = boost::to_lower_copy(name);
+    auto it = dict.find(lower_case);
+    if (dict.end() != it)
+        return it->second;
+
+    auto & creators = dict[lower_case];
+    creators.name = name;
+    return creators;
+}
+
+FormatSettings getFormatSettings(const ContextPtr & context)
 {
     const auto & settings = context->getSettingsRef();
 
@@ -46,7 +64,7 @@ FormatSettings getFormatSettings(ContextPtr context)
 }
 
 template <typename Settings>
-FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
+FormatSettings getFormatSettings(const ContextPtr & context, const Settings & settings)
 {
     FormatSettings format_settings;
 
@@ -104,6 +122,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.write_named_tuples_as_objects = settings.output_format_json_named_tuples_as_objects;
     format_settings.json.skip_null_value_in_named_tuples = settings.output_format_json_skip_null_value_in_named_tuples;
     format_settings.json.read_named_tuples_as_objects = settings.input_format_json_named_tuples_as_objects;
+    format_settings.json.use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects = settings.input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects;
     format_settings.json.defaults_for_missing_elements_in_named_tuple = settings.input_format_json_defaults_for_missing_elements_in_named_tuple;
     format_settings.json.ignore_unknown_keys_in_named_tuple = settings.input_format_json_ignore_unknown_keys_in_named_tuple;
     format_settings.json.quote_64bit_integers = settings.output_format_json_quote_64bit_integers;
@@ -123,6 +142,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.json.allow_object_type = context->getSettingsRef().allow_experimental_object_type;
     format_settings.json.compact_allow_variable_number_of_columns = settings.input_format_json_compact_allow_variable_number_of_columns;
     format_settings.json.try_infer_objects_as_tuples = settings.input_format_json_try_infer_named_tuples_from_objects;
+    format_settings.json.throw_on_bad_escape_sequence = settings.input_format_json_throw_on_bad_escape_sequence;
     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_rows = settings.output_format_parquet_row_group_size;
@@ -148,7 +168,10 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.pretty.max_column_pad_width = settings.output_format_pretty_max_column_pad_width;
     format_settings.pretty.max_rows = settings.output_format_pretty_max_rows;
     format_settings.pretty.max_value_width = settings.output_format_pretty_max_value_width;
+    format_settings.pretty.max_value_width_apply_for_single_value = settings.output_format_pretty_max_value_width_apply_for_single_value;
+    format_settings.pretty.highlight_digit_groups = settings.output_format_pretty_highlight_digit_groups;
     format_settings.pretty.output_format_pretty_row_numbers = settings.output_format_pretty_row_numbers;
+    format_settings.pretty.output_format_pretty_single_large_number_tip_threshold = settings.output_format_pretty_single_large_number_tip_threshold;
     format_settings.protobuf.input_flatten_google_wrappers = settings.input_format_protobuf_flatten_google_wrappers;
     format_settings.protobuf.output_nullables_with_google_wrappers = settings.output_format_protobuf_nullables_with_google_wrappers;
     format_settings.protobuf.skip_fields_with_unsupported_types_in_schema_inference = settings.input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference;
@@ -165,6 +188,8 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.template_settings.resultset_format = settings.format_template_resultset;
     format_settings.template_settings.row_between_delimiter = settings.format_template_rows_between_delimiter;
     format_settings.template_settings.row_format = settings.format_template_row;
+    format_settings.template_settings.row_format_template = settings.format_template_row_format;
+    format_settings.template_settings.resultset_format_template = settings.format_template_resultset_format;
     format_settings.tsv.crlf_end_of_line = settings.output_format_tsv_crlf_end_of_line;
     format_settings.tsv.empty_as_default = settings.input_format_tsv_empty_as_default;
     format_settings.tsv.enum_as_number = settings.input_format_tsv_enum_as_number;
@@ -178,10 +203,13 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.values.allow_data_after_semicolon = settings.input_format_values_allow_data_after_semicolon;
     format_settings.values.deduce_templates_of_expressions = settings.input_format_values_deduce_templates_of_expressions;
     format_settings.values.interpret_expressions = settings.input_format_values_interpret_expressions;
+    format_settings.values.escape_quote_with_quote = settings.output_format_values_escape_quote_with_quote;
     format_settings.with_names_use_header = settings.input_format_with_names_use_header;
     format_settings.with_types_use_header = settings.input_format_with_types_use_header;
     format_settings.write_statistics = settings.output_format_write_statistics;
     format_settings.arrow.low_cardinality_as_dictionary = settings.output_format_arrow_low_cardinality_as_dictionary;
+    format_settings.arrow.use_signed_indexes_for_dictionary = settings.output_format_arrow_use_signed_indexes_for_dictionary;
+    format_settings.arrow.use_64_bit_indexes_for_dictionary = settings.output_format_arrow_use_64_bit_indexes_for_dictionary;
     format_settings.arrow.allow_missing_columns = settings.input_format_arrow_allow_missing_columns;
     format_settings.arrow.skip_columns_with_unsupported_types_in_schema_inference = settings.input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference;
     format_settings.arrow.skip_columns_with_unsupported_types_in_schema_inference = settings.input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference;
@@ -223,6 +251,7 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     format_settings.try_infer_integers = settings.input_format_try_infer_integers;
     format_settings.try_infer_dates = settings.input_format_try_infer_dates;
     format_settings.try_infer_datetimes = settings.input_format_try_infer_datetimes;
+    format_settings.try_infer_exponent_floats = settings.input_format_try_infer_exponent_floats;
     format_settings.markdown.escape_special_characters = settings.output_format_markdown_escape_special_characters;
     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;
@@ -250,16 +279,16 @@ FormatSettings getFormatSettings(ContextPtr context, const Settings & settings)
     return format_settings;
 }
 
-template FormatSettings getFormatSettings<FormatFactorySettings>(ContextPtr context, const FormatFactorySettings & settings);
+template FormatSettings getFormatSettings<FormatFactorySettings>(const ContextPtr & context, const FormatFactorySettings & settings);
 
-template FormatSettings getFormatSettings<Settings>(ContextPtr context, const Settings & settings);
+template FormatSettings getFormatSettings<Settings>(const ContextPtr & context, const Settings & settings);
 
 
 InputFormatPtr FormatFactory::getInput(
     const String & name,
     ReadBuffer & _buf,
     const Block & sample,
-    ContextPtr context,
+    const ContextPtr & context,
     UInt64 max_block_size,
     const std::optional<FormatSettings> & _format_settings,
     std::optional<size_t> _max_parsing_threads,
@@ -392,7 +421,7 @@ std::unique_ptr<ReadBuffer> FormatFactory::wrapReadBufferIfNeeded(
         {
             parallel_read = false;
             LOG_TRACE(
-                &Poco::Logger::get("FormatFactory"),
+                getLogger("FormatFactory"),
                 "Failed to setup ParallelReadBuffer because of an exception:\n{}.\n"
                 "Falling back to the single-threaded buffer",
                 e.displayText());
@@ -402,7 +431,7 @@ std::unique_ptr<ReadBuffer> FormatFactory::wrapReadBufferIfNeeded(
     if (parallel_read)
     {
         LOG_TRACE(
-            &Poco::Logger::get("FormatFactory"),
+            getLogger("FormatFactory"),
             "Using ParallelReadBuffer with {} workers with chunks of {} bytes",
             max_download_threads,
             settings.max_download_buffer_size);
@@ -422,7 +451,7 @@ std::unique_ptr<ReadBuffer> FormatFactory::wrapReadBufferIfNeeded(
     return res;
 }
 
-static void addExistingProgressToOutputFormat(OutputFormatPtr format, ContextPtr context)
+static void addExistingProgressToOutputFormat(OutputFormatPtr format, const ContextPtr & context)
 {
     auto element_id = context->getProcessListElementSafe();
     if (element_id)
@@ -441,7 +470,7 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
     const String & name,
     WriteBuffer & buf,
     const Block & sample,
-    ContextPtr context,
+    const ContextPtr & context,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_creator;
@@ -449,6 +478,7 @@ OutputFormatPtr FormatFactory::getOutputFormatParallelIfPossible(
         throw Exception(ErrorCodes::FORMAT_IS_NOT_SUITABLE_FOR_OUTPUT, "Format {} is not suitable for output", name);
 
     auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
+    format_settings.is_writing_to_terminal = isWritingToTerminal(buf);
 
     const Settings & settings = context->getSettingsRef();
 
@@ -478,7 +508,7 @@ OutputFormatPtr FormatFactory::getOutputFormat(
     const String & name,
     WriteBuffer & buf,
     const Block & sample,
-    ContextPtr context,
+    const ContextPtr & context,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_creator;
@@ -490,6 +520,7 @@ OutputFormatPtr FormatFactory::getOutputFormat(
 
     auto format_settings = _format_settings ? *_format_settings : getFormatSettings(context);
     format_settings.max_threads = context->getSettingsRef().max_threads;
+    format_settings.is_writing_to_terminal = format_settings.is_writing_to_terminal = isWritingToTerminal(buf);
 
     /** TODO: Materialization is needed, because formats can use the functions `IDataType`,
       *  which only work with full columns.
@@ -511,7 +542,7 @@ OutputFormatPtr FormatFactory::getOutputFormat(
 
 String FormatFactory::getContentType(
     const String & name,
-    ContextPtr context,
+    const ContextPtr & context,
     const std::optional<FormatSettings> & _format_settings) const
 {
     const auto & output_getter = getCreators(name).output_creator;
@@ -530,10 +561,10 @@ String FormatFactory::getContentType(
 SchemaReaderPtr FormatFactory::getSchemaReader(
     const String & name,
     ReadBuffer & buf,
-    ContextPtr & context,
+    const ContextPtr & context,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    const auto & schema_reader_creator = dict.at(name).schema_reader_creator;
+    const auto & schema_reader_creator = getCreators(name).schema_reader_creator;
     if (!schema_reader_creator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Format {} doesn't support schema inference.", name);
 
@@ -546,10 +577,10 @@ SchemaReaderPtr FormatFactory::getSchemaReader(
 
 ExternalSchemaReaderPtr FormatFactory::getExternalSchemaReader(
     const String & name,
-    ContextPtr & context,
+    const ContextPtr & context,
     const std::optional<FormatSettings> & _format_settings) const
 {
-    const auto & external_schema_reader_creator = dict.at(name).external_schema_reader_creator;
+    const auto & external_schema_reader_creator = getCreators(name).external_schema_reader_creator;
     if (!external_schema_reader_creator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Format {} doesn't support schema inference.", name);
 
@@ -560,28 +591,28 @@ ExternalSchemaReaderPtr FormatFactory::getExternalSchemaReader(
 void FormatFactory::registerInputFormat(const String & name, InputCreator input_creator)
 {
     chassert(input_creator);
-    auto & creators = dict[name];
+    auto & creators = getOrCreateCreators(name);
     if (creators.input_creator || creators.random_access_input_creator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Input format {} is already registered", name);
     creators.input_creator = std::move(input_creator);
     registerFileExtension(name, name);
-    KnownFormatNames::instance().add(name);
+    KnownFormatNames::instance().add(name, /* case_insensitive = */ true);
 }
 
 void FormatFactory::registerRandomAccessInputFormat(const String & name, RandomAccessInputCreator input_creator)
 {
     chassert(input_creator);
-    auto & creators = dict[name];
+    auto & creators = getOrCreateCreators(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);
+    KnownFormatNames::instance().add(name, /* case_insensitive = */ true);
 }
 
 void FormatFactory::registerNonTrivialPrefixAndSuffixChecker(const String & name, NonTrivialPrefixAndSuffixChecker non_trivial_prefix_and_suffix_checker)
 {
-    auto & target = dict[name].non_trivial_prefix_and_suffix_checker;
+    auto & target = getOrCreateCreators(name).non_trivial_prefix_and_suffix_checker;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Non trivial prefix and suffix checker {} is already registered", name);
     target = std::move(non_trivial_prefix_and_suffix_checker);
@@ -589,7 +620,7 @@ void FormatFactory::registerNonTrivialPrefixAndSuffixChecker(const String & name
 
 void FormatFactory::registerAppendSupportChecker(const String & name, AppendSupportChecker append_support_checker)
 {
-    auto & target = dict[name].append_support_checker;
+    auto & target = getOrCreateCreators(name).append_support_checker;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Suffix checker {} is already registered", name);
     target = std::move(append_support_checker);
@@ -600,22 +631,22 @@ void FormatFactory::markFormatHasNoAppendSupport(const String & name)
     registerAppendSupportChecker(name, [](const FormatSettings &){ return false; });
 }
 
-bool FormatFactory::checkIfFormatSupportAppend(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_)
+bool FormatFactory::checkIfFormatSupportAppend(const String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_)
 {
     auto format_settings = format_settings_ ? *format_settings_ : getFormatSettings(context);
-    auto & append_support_checker = dict[name].append_support_checker;
+    const auto & append_support_checker = getCreators(name).append_support_checker;
     /// By default we consider that format supports append
     return !append_support_checker || append_support_checker(format_settings);
 }
 
 void FormatFactory::registerOutputFormat(const String & name, OutputCreator output_creator)
 {
-    auto & target = dict[name].output_creator;
+    auto & target = getOrCreateCreators(name).output_creator;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Output format {} is already registered", name);
     target = std::move(output_creator);
     registerFileExtension(name, name);
-    KnownFormatNames::instance().add(name);
+    KnownFormatNames::instance().add(name, /* case_insensitive = */ true);
 }
 
 void FormatFactory::registerFileExtension(const String & extension, const String & format_name)
@@ -623,10 +654,10 @@ void FormatFactory::registerFileExtension(const String & extension, const String
     file_extension_formats[boost::to_lower_copy(extension)] = format_name;
 }
 
-String FormatFactory::getFormatFromFileName(String file_name, bool throw_if_not_found)
+std::optional<String> FormatFactory::tryGetFormatFromFileName(String file_name)
 {
     if (file_name == "stdin")
-        return getFormatFromFileDescriptor(STDIN_FILENO);
+        return tryGetFormatFromFileDescriptor(STDIN_FILENO);
 
     CompressionMethod compression_method = chooseCompressionMethod(file_name, "");
     if (CompressionMethod::None != compression_method)
@@ -638,46 +669,56 @@ String FormatFactory::getFormatFromFileName(String file_name, bool throw_if_not_
 
     auto pos = file_name.find_last_of('.');
     if (pos == String::npos)
-    {
-        if (throw_if_not_found)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot determine the file format by it's extension");
-        return "";
-    }
+        return std::nullopt;
 
     String file_extension = file_name.substr(pos + 1, String::npos);
     boost::algorithm::to_lower(file_extension);
     auto it = file_extension_formats.find(file_extension);
     if (it == file_extension_formats.end())
-    {
-        if (throw_if_not_found)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot determine the file format by it's extension");
-        return "";
-    }
+        return std::nullopt;
+
     return it->second;
 }
 
-String FormatFactory::getFormatFromFileDescriptor(int fd)
+String FormatFactory::getFormatFromFileName(String file_name)
+{
+    if (auto format = tryGetFormatFromFileName(file_name))
+        return *format;
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot determine the format of the file {} by it's extension", file_name);
+}
+
+std::optional<String> FormatFactory::tryGetFormatFromFileDescriptor(int fd)
 {
 #ifdef OS_LINUX
     std::string proc_path = fmt::format("/proc/self/fd/{}", fd);
     char file_path[PATH_MAX] = {'\0'};
     if (readlink(proc_path.c_str(), file_path, sizeof(file_path) - 1) != -1)
-        return getFormatFromFileName(file_path, false);
-    return "";
+        return tryGetFormatFromFileName(file_path);
+    return std::nullopt;
 #elif defined(OS_DARWIN)
     char file_path[PATH_MAX] = {'\0'};
     if (fcntl(fd, F_GETPATH, file_path) != -1)
-        return getFormatFromFileName(file_path, false);
-    return "";
+        return tryGetFormatFromFileName(file_path);
+    return std::nullopt;
 #else
     (void)fd;
-    return "";
+    return std::nullopt;
 #endif
 }
 
+String FormatFactory::getFormatFromFileDescriptor(int fd)
+{
+    if (auto format = tryGetFormatFromFileDescriptor(fd))
+        return *format;
+
+    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot determine the format of the data by the file descriptor {}", fd);
+}
+
+
 void FormatFactory::registerFileSegmentationEngine(const String & name, FileSegmentationEngine file_segmentation_engine)
 {
-    auto & target = dict[name].file_segmentation_engine_creator;
+    auto & target = getOrCreateCreators(name).file_segmentation_engine_creator;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: File segmentation engine {} is already registered", name);
     auto creator = [file_segmentation_engine](const FormatSettings &)
@@ -689,7 +730,7 @@ void FormatFactory::registerFileSegmentationEngine(const String & name, FileSegm
 
 void FormatFactory::registerFileSegmentationEngineCreator(const String & name, FileSegmentationEngineCreator file_segmentation_engine_creator)
 {
-    auto & target = dict[name].file_segmentation_engine_creator;
+    auto & target = getOrCreateCreators(name).file_segmentation_engine_creator;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: File segmentation engine creator {} is already registered", name);
     target = std::move(file_segmentation_engine_creator);
@@ -697,7 +738,7 @@ void FormatFactory::registerFileSegmentationEngineCreator(const String & name, F
 
 void FormatFactory::registerSchemaReader(const String & name, SchemaReaderCreator schema_reader_creator)
 {
-    auto & target = dict[name].schema_reader_creator;
+    auto & target = getOrCreateCreators(name).schema_reader_creator;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Schema reader {} is already registered", name);
     target = std::move(schema_reader_creator);
@@ -705,7 +746,7 @@ void FormatFactory::registerSchemaReader(const String & name, SchemaReaderCreato
 
 void FormatFactory::registerExternalSchemaReader(const String & name, ExternalSchemaReaderCreator external_schema_reader_creator)
 {
-    auto & target = dict[name].external_schema_reader_creator;
+    auto & target = getOrCreateCreators(name).external_schema_reader_creator;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Schema reader {} is already registered", name);
     target = std::move(external_schema_reader_creator);
@@ -713,7 +754,7 @@ void FormatFactory::registerExternalSchemaReader(const String & name, ExternalSc
 
 void FormatFactory::markOutputFormatSupportsParallelFormatting(const String & name)
 {
-    auto & target = dict[name].supports_parallel_formatting;
+    auto & target = getOrCreateCreators(name).supports_parallel_formatting;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Output format {} is already marked as supporting parallel formatting", name);
     target = true;
@@ -722,7 +763,7 @@ void FormatFactory::markOutputFormatSupportsParallelFormatting(const String & na
 
 void FormatFactory::markFormatSupportsSubsetOfColumns(const String & name)
 {
-    auto & target = dict[name].subset_of_columns_support_checker;
+    auto & target = getOrCreateCreators(name).subset_of_columns_support_checker;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Format {} is already marked as supporting subset of columns", name);
     target = [](const FormatSettings &){ return true; };
@@ -730,7 +771,7 @@ void FormatFactory::markFormatSupportsSubsetOfColumns(const String & name)
 
 void FormatFactory::registerSubsetOfColumnsSupportChecker(const String & name, SubsetOfColumnsSupportChecker subset_of_columns_support_checker)
 {
-    auto & target = dict[name].subset_of_columns_support_checker;
+    auto & target = getOrCreateCreators(name).subset_of_columns_support_checker;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: Format {} is already marked as supporting subset of columns", name);
     target = std::move(subset_of_columns_support_checker);
@@ -738,13 +779,13 @@ void FormatFactory::registerSubsetOfColumnsSupportChecker(const String & name, S
 
 void FormatFactory::markOutputFormatPrefersLargeBlocks(const String & name)
 {
-    auto & target = dict[name].prefers_large_blocks;
+    auto & target = getOrCreateCreators(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::checkIfFormatSupportsSubsetOfColumns(const DB::String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_) const
+bool FormatFactory::checkIfFormatSupportsSubsetOfColumns(const String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_) const
 {
     const auto & target = getCreators(name);
     auto format_settings = format_settings_ ? *format_settings_ : getFormatSettings(context);
@@ -754,13 +795,13 @@ bool FormatFactory::checkIfFormatSupportsSubsetOfColumns(const DB::String & name
 void FormatFactory::registerAdditionalInfoForSchemaCacheGetter(
     const String & name, AdditionalInfoForSchemaCacheGetter additional_info_for_schema_cache_getter)
 {
-    auto & target = dict[name].additional_info_for_schema_cache_getter;
+    auto & target = getOrCreateCreators(name).additional_info_for_schema_cache_getter;
     if (target)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FormatFactory: additional info for schema cache getter {} is already registered", name);
     target = std::move(additional_info_for_schema_cache_getter);
 }
 
-String FormatFactory::getAdditionalInfoForSchemaCache(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_)
+String FormatFactory::getAdditionalInfoForSchemaCache(const String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_)
 {
     const auto & additional_info_getter = getCreators(name).additional_info_for_schema_cache_getter;
     if (!additional_info_getter)
@@ -772,13 +813,13 @@ String FormatFactory::getAdditionalInfoForSchemaCache(const String & name, Conte
 
 bool FormatFactory::isInputFormat(const String & name) const
 {
-    auto it = dict.find(name);
+    auto it = dict.find(boost::to_lower_copy(name));
     return it != dict.end() && (it->second.input_creator || it->second.random_access_input_creator);
 }
 
 bool FormatFactory::isOutputFormat(const String & name) const
 {
-    auto it = dict.find(name);
+    auto it = dict.find(boost::to_lower_copy(name));
     return it != dict.end() && it->second.output_creator;
 }
 
@@ -805,9 +846,10 @@ bool FormatFactory::checkIfOutputFormatPrefersLargeBlocks(const String & name) c
     return target.prefers_large_blocks;
 }
 
-bool FormatFactory::checkParallelizeOutputAfterReading(const String & name, ContextPtr context) const
+bool FormatFactory::checkParallelizeOutputAfterReading(const String & name, const ContextPtr & context) const
 {
-    if (name == "Parquet" && context->getSettingsRef().input_format_parquet_preserve_order)
+    auto format_name = boost::to_lower_copy(name);
+    if (format_name == "parquet" && context->getSettingsRef().input_format_parquet_preserve_order)
         return false;
 
     return true;
@@ -815,11 +857,23 @@ bool FormatFactory::checkParallelizeOutputAfterReading(const String & name, Cont
 
 void FormatFactory::checkFormatName(const String & name) const
 {
-    auto it = dict.find(name);
+    auto it = dict.find(boost::to_lower_copy(name));
     if (it == dict.end())
         throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown format {}", name);
 }
 
+std::vector<String> FormatFactory::getAllInputFormats() const
+{
+    std::vector<String> input_formats;
+    for (const auto & [format_name, creators] : dict)
+    {
+        if (creators.input_creator || creators.random_access_input_creator)
+            input_formats.push_back(format_name);
+    }
+
+    return input_formats;
+}
+
 FormatFactory & FormatFactory::instance()
 {
     static FormatFactory ret;
diff --git a/src/Formats/FormatFactory.h b/src/Formats/FormatFactory.h
index 9670c690456..93f67e83831 100644
--- a/src/Formats/FormatFactory.h
+++ b/src/Formats/FormatFactory.h
@@ -23,6 +23,7 @@ namespace DB
 class Block;
 struct Settings;
 struct FormatFactorySettings;
+struct ReadSettings;
 
 class ReadBuffer;
 class WriteBuffer;
@@ -48,10 +49,10 @@ using RowOutputFormatPtr = std::shared_ptr<IRowOutputFormat>;
 template <typename Allocator>
 struct Memory;
 
-FormatSettings getFormatSettings(ContextPtr context);
+FormatSettings getFormatSettings(const ContextPtr & context);
 
 template <typename T>
-FormatSettings getFormatSettings(ContextPtr context, const T & settings);
+FormatSettings getFormatSettings(const ContextPtr & context, const T & settings);
 
 /** Allows to create an IInputFormat or IOutputFormat by the name of the format.
   * Note: format and compression are independent things.
@@ -132,6 +133,7 @@ private:
 
     struct Creators
     {
+        String name;
         InputCreator input_creator;
         RandomAccessInputCreator random_access_input_creator;
         OutputCreator output_creator;
@@ -161,7 +163,7 @@ public:
         const String & name,
         ReadBuffer & buf,
         const Block & sample,
-        ContextPtr context,
+        const ContextPtr & context,
         UInt64 max_block_size,
         const std::optional<FormatSettings> & format_settings = std::nullopt,
         std::optional<size_t> max_parsing_threads = std::nullopt,
@@ -178,30 +180,30 @@ public:
         const String & name,
         WriteBuffer & buf,
         const Block & sample,
-        ContextPtr context,
+        const ContextPtr & context,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     OutputFormatPtr getOutputFormat(
         const String & name,
         WriteBuffer & buf,
         const Block & sample,
-        ContextPtr context,
+        const ContextPtr & context,
         const std::optional<FormatSettings> & _format_settings = std::nullopt) const;
 
     String getContentType(
         const String & name,
-        ContextPtr context,
+        const ContextPtr & context,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     SchemaReaderPtr getSchemaReader(
         const String & name,
         ReadBuffer & buf,
-        ContextPtr & context,
+        const ContextPtr & context,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     ExternalSchemaReaderPtr getExternalSchemaReader(
         const String & name,
-        ContextPtr & context,
+        const ContextPtr & context,
         const std::optional<FormatSettings> & format_settings = std::nullopt) const;
 
     void registerFileSegmentationEngine(const String & name, FileSegmentationEngine file_segmentation_engine);
@@ -216,7 +218,7 @@ public:
     /// registerAppendSupportChecker with append_support_checker that always returns true.
     void markFormatHasNoAppendSupport(const String & name);
 
-    bool checkIfFormatSupportAppend(const String & name, ContextPtr context, const std::optional<FormatSettings> & format_settings_ = std::nullopt);
+    bool checkIfFormatSupportAppend(const String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_ = std::nullopt);
 
     /// Register format by its name.
     void registerInputFormat(const String & name, InputCreator input_creator);
@@ -225,8 +227,10 @@ public:
 
     /// Register file extension for format
     void registerFileExtension(const String & extension, const String & format_name);
-    String getFormatFromFileName(String file_name, bool throw_if_not_found = false);
+    String getFormatFromFileName(String file_name);
+    std::optional<String> tryGetFormatFromFileName(String file_name);
     String getFormatFromFileDescriptor(int fd);
+    std::optional<String> tryGetFormatFromFileDescriptor(int fd);
 
     /// Register schema readers for format its name.
     void registerSchemaReader(const String & name, SchemaReaderCreator schema_reader_creator);
@@ -244,27 +248,31 @@ public:
     bool checkIfFormatHasAnySchemaReader(const String & name) const;
     bool checkIfOutputFormatPrefersLargeBlocks(const String & name) const;
 
-    bool checkParallelizeOutputAfterReading(const String & name, ContextPtr context) const;
+    bool checkParallelizeOutputAfterReading(const String & name, const 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);
+    String getAdditionalInfoForSchemaCache(const String & name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings_ = std::nullopt);
 
     const FormatsDictionary & getAllFormats() const
     {
         return dict;
     }
 
+    std::vector<String> getAllInputFormats() const;
+
     bool isInputFormat(const String & name) const;
     bool isOutputFormat(const String & name) const;
 
     /// Check that format with specified name exists and throw an exception otherwise.
     void checkFormatName(const String & name) const;
+    bool exists(const String & name) const;
 
 private:
     FormatsDictionary dict;
     FileExtensionFormats file_extension_formats;
 
     const Creators & getCreators(const String & name) const;
+    Creators & getOrCreateCreators(const String & name);
 
     // Creates a ReadBuffer to give to an input format. Returns nullptr if we should use `buf` directly.
     std::unique_ptr<ReadBuffer> wrapReadBufferIfNeeded(
diff --git a/src/Formats/FormatSchemaInfo.h b/src/Formats/FormatSchemaInfo.h
index e8758c3f761..0dd28699896 100644
--- a/src/Formats/FormatSchemaInfo.h
+++ b/src/Formats/FormatSchemaInfo.h
@@ -8,6 +8,7 @@
 namespace DB
 {
 class Context;
+class Block;
 
 /// Extracts information about where the format schema file is from passed context and keep it.
 class FormatSchemaInfo
diff --git a/src/Formats/FormatSettings.h b/src/Formats/FormatSettings.h
index 5982d30f6a7..5b7995e0da2 100644
--- a/src/Formats/FormatSettings.h
+++ b/src/Formats/FormatSettings.h
@@ -4,7 +4,7 @@
 #include <Core/Defines.h>
 #include <base/types.h>
 #include <base/unit.h>
-
+#include <Core/SettingsFields.h>
 
 namespace DB
 {
@@ -34,17 +34,19 @@ struct FormatSettings
     bool null_as_default = true;
     bool decimal_trailing_zeros = false;
     bool defaults_for_omitted_fields = true;
+    bool is_writing_to_terminal = false;
 
     bool seekable_read = true;
     UInt64 max_rows_to_read_for_schema_inference = 25000;
     UInt64 max_bytes_to_read_for_schema_inference = 32 * 1024 * 1024;
 
-    String column_names_for_schema_inference;
-    String schema_inference_hints;
+    String column_names_for_schema_inference{};
+    String schema_inference_hints{};
 
     bool try_infer_integers = false;
     bool try_infer_dates = false;
     bool try_infer_datetimes = false;
+    bool try_infer_exponent_floats = false;
 
     enum class DateTimeInputFormat
     {
@@ -86,7 +88,7 @@ struct FormatSettings
     struct
     {
         IntervalOutputFormat output_format = IntervalOutputFormat::Numeric;
-    } interval;
+    } interval{};
 
     enum class DateTimeOverflowBehavior
     {
@@ -122,13 +124,15 @@ struct FormatSettings
     {
         UInt64 row_group_size = 1000000;
         bool low_cardinality_as_dictionary = false;
+        bool use_signed_indexes_for_dictionary = false;
+        bool use_64_bit_indexes_for_dictionary = false;
         bool allow_missing_columns = false;
         bool skip_columns_with_unsupported_types_in_schema_inference = false;
         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;
+    } arrow{};
 
     struct
     {
@@ -138,7 +142,7 @@ struct FormatSettings
         bool allow_missing_fields = false;
         String string_column_pattern;
         UInt64 output_rows_in_file = 1;
-    } avro;
+    } avro{};
 
     String bool_true_representation = "true";
     String bool_false_representation = "false";
@@ -165,7 +169,7 @@ struct FormatSettings
         bool allow_variable_number_of_columns = false;
         bool use_default_on_bad_values = false;
         bool try_infer_numbers_from_strings = true;
-    } csv;
+    } csv{};
 
     struct HiveText
     {
@@ -173,7 +177,7 @@ struct FormatSettings
         char collection_items_delimiter = '\x02';
         char map_keys_delimiter = '\x03';
         Names input_field_names;
-    } hive_text;
+    } hive_text{};
 
     struct Custom
     {
@@ -187,9 +191,9 @@ struct FormatSettings
         bool try_detect_header = true;
         bool skip_trailing_empty_lines = false;
         bool allow_variable_number_of_columns = false;
-    } custom;
+    } custom{};
 
-    struct
+    struct JSON
     {
         bool array_of_rows = false;
         bool quote_64bit_integers = true;
@@ -198,6 +202,7 @@ struct FormatSettings
         bool quote_decimals = false;
         bool escape_forward_slashes = true;
         bool read_named_tuples_as_objects = false;
+        bool use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects = false;
         bool write_named_tuples_as_objects = false;
         bool skip_null_value_in_named_tuples = false;
         bool defaults_for_missing_elements_in_named_tuple = false;
@@ -216,13 +221,13 @@ struct FormatSettings
         bool compact_allow_variable_number_of_columns = false;
         bool try_infer_objects_as_tuples = false;
         bool infer_incomplete_types_as_strings = true;
-
-    } json;
+        bool throw_on_bad_escape_sequence = true;
+    } json{};
 
     struct
     {
-        String column_for_object_name;
-    } json_object_each_row;
+        String column_for_object_name{};
+    } json_object_each_row{};
 
     enum class ParquetVersion
     {
@@ -263,16 +268,19 @@ struct FormatSettings
         size_t data_page_size = 1024 * 1024;
         size_t write_batch_size = 1024;
         size_t local_read_min_bytes_for_seek = 8192;
-    } parquet;
+    } parquet{};
 
     struct Pretty
     {
         UInt64 max_rows = 10000;
         UInt64 max_column_pad_width = 250;
         UInt64 max_value_width = 10000;
-        bool color = true;
+        UInt64 max_value_width_apply_for_single_value = false;
+        bool highlight_digit_groups = true;
+        SettingFieldUInt64Auto color{"auto"};
 
         bool output_format_pretty_row_numbers = false;
+        UInt64 output_format_pretty_single_large_number_tip_threshold = 1'000'000;
 
         enum class Charset
         {
@@ -281,7 +289,7 @@ struct FormatSettings
         };
 
         Charset charset = Charset::UTF8;
-    } pretty;
+    } pretty{};
 
     struct
     {
@@ -298,7 +306,7 @@ struct FormatSettings
         bool skip_fields_with_unsupported_types_in_schema_inference = false;
         bool use_autogenerated_schema = true;
         std::string google_protos_path;
-    } protobuf;
+    } protobuf{};
 
     struct
     {
@@ -313,14 +321,14 @@ struct FormatSettings
          * By default, use Text ResultSet.
          */
         bool binary_protocol = false;
-    } mysql_wire;
+    } mysql_wire{};
 
     struct
     {
         std::string regexp;
         EscapingRule escaping_rule = EscapingRule::Raw;
         bool skip_unmatched = false;
-    } regexp;
+    } regexp{};
 
     struct
     {
@@ -328,14 +336,16 @@ struct FormatSettings
         std::string format_schema_path;
         bool is_server = false;
         std::string output_format_schema;
-    } schema;
+    } schema{};
 
     struct
     {
         String resultset_format;
         String row_format;
         String row_between_delimiter;
-    } template_settings;
+        String row_format_template;
+        String resultset_format_template;
+    } template_settings{};
 
     struct
     {
@@ -348,7 +358,7 @@ struct FormatSettings
         bool try_detect_header = true;
         bool skip_trailing_empty_lines = false;
         bool allow_variable_number_of_columns = false;
-    } tsv;
+    } tsv{};
 
     struct
     {
@@ -356,7 +366,8 @@ struct FormatSettings
         bool deduce_templates_of_expressions = true;
         bool accurate_types_of_literals = true;
         bool allow_data_after_semicolon = false;
-    } values;
+        bool escape_quote_with_quote = false;
+    } values{};
 
     enum class ORCCompression
     {
@@ -379,7 +390,7 @@ struct FormatSettings
         bool use_fast_decoder = true;
         bool filter_push_down = true;
         UInt64 output_row_index_stride = 10'000;
-    } orc;
+    } orc{};
 
     /// For capnProto format we should determine how to
     /// compare ClickHouse Enum and Enum from schema.
@@ -395,7 +406,7 @@ struct FormatSettings
         CapnProtoEnumComparingMode enum_comparing_mode = CapnProtoEnumComparingMode::BY_VALUES;
         bool skip_fields_with_unsupported_types_in_schema_inference = false;
         bool use_autogenerated_schema = true;
-    } capn_proto;
+    } capn_proto{};
 
     enum class MsgPackUUIDRepresentation
     {
@@ -408,13 +419,13 @@ struct FormatSettings
     {
         UInt64 number_of_columns = 0;
         MsgPackUUIDRepresentation output_uuid_representation = MsgPackUUIDRepresentation::EXT;
-    } msgpack;
+    } msgpack{};
 
     struct MySQLDump
     {
         String table_name;
         bool map_column_names = true;
-    } mysql_dump;
+    } mysql_dump{};
 
     struct
     {
@@ -423,28 +434,28 @@ struct FormatSettings
         bool include_column_names = true;
         bool use_replace = false;
         bool quote_names = true;
-    } sql_insert;
+    } sql_insert{};
 
     struct
     {
         bool output_string_as_string;
         bool skip_fields_with_unsupported_types_in_schema_inference;
-    } bson;
+    } bson{};
 
     struct
     {
         bool allow_types_conversion = true;
-    } native;
+    } native{};
 
     struct
     {
         bool valid_output_on_exception = false;
-    } xml;
+    } xml{};
 
     struct
     {
         bool escape_special_characters = false;
-    } markdown;
+    } markdown{};
 };
 
 }
diff --git a/src/Formats/JSONUtils.cpp b/src/Formats/JSONUtils.cpp
index 779f38032d8..acea5e7b748 100644
--- a/src/Formats/JSONUtils.cpp
+++ b/src/Formats/JSONUtils.cpp
@@ -215,7 +215,7 @@ namespace JSONUtils
             else
                 first = false;
 
-            auto name = readFieldName(in);
+            auto name = readFieldName(in, settings.json);
             auto type = tryInferDataTypeForSingleJSONField(in, settings, inference_info);
             names_and_types.emplace_back(name, type);
             skipWhitespaceIfAny(in);
@@ -277,19 +277,19 @@ namespace JSONUtils
             if (yield_strings)
             {
                 String str;
-                readJSONString(str, in);
+                readJSONString(str, in, format_settings.json);
 
                 ReadBufferFromString buf(str);
 
                 if (as_nullable)
-                    return SerializationNullable::deserializeWholeTextImpl(column, buf, format_settings, serialization);
+                    return SerializationNullable::deserializeNullAsDefaultOrNestedWholeText(column, buf, format_settings, serialization);
 
                 serialization->deserializeWholeText(column, buf, format_settings);
                 return true;
             }
 
             if (as_nullable)
-                return SerializationNullable::deserializeTextJSONImpl(column, in, format_settings, serialization);
+                return SerializationNullable::deserializeNullAsDefaultOrNestedTextJSON(column, in, format_settings, serialization);
 
             serialization->deserializeTextJSON(column, in, format_settings);
             return true;
@@ -567,34 +567,34 @@ namespace JSONUtils
         return true;
     }
 
-    String readFieldName(ReadBuffer & in)
+    String readFieldName(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
         skipWhitespaceIfAny(in);
         String field;
-        readJSONString(field, in);
+        readJSONString(field, in, settings);
         skipColon(in);
         return field;
     }
 
-    bool tryReadFieldName(ReadBuffer & in, String & field)
+    bool tryReadFieldName(ReadBuffer & in, String & field, const FormatSettings::JSON & settings)
     {
         skipWhitespaceIfAny(in);
-        return tryReadJSONStringInto(field, in) && checkAndSkipColon(in);
+        return tryReadJSONStringInto(field, in, settings) && checkAndSkipColon(in);
     }
 
-    String readStringField(ReadBuffer & in)
+    String readStringField(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
         skipWhitespaceIfAny(in);
         String value;
-        readJSONString(value, in);
+        readJSONString(value, in, settings);
         skipWhitespaceIfAny(in);
         return value;
     }
 
-    bool tryReadStringField(ReadBuffer & in, String & value)
+    bool tryReadStringField(ReadBuffer & in, String & value, const FormatSettings::JSON & settings)
     {
         skipWhitespaceIfAny(in);
-        if (!tryReadJSONStringInto(value, in))
+        if (!tryReadJSONStringInto(value, in, settings))
             return false;
         skipWhitespaceIfAny(in);
         return true;
@@ -680,24 +680,24 @@ namespace JSONUtils
         return true;
     }
 
-    std::pair<String, String> readStringFieldNameAndValue(ReadBuffer & in)
+    std::pair<String, String> readStringFieldNameAndValue(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
-        auto field_name = readFieldName(in);
-        auto field_value = readStringField(in);
+        auto field_name = readFieldName(in, settings);
+        auto field_value = readStringField(in, settings);
         return {field_name, field_value};
     }
 
-    bool tryReadStringFieldNameAndValue(ReadBuffer & in, std::pair<String, String> & field_and_value)
+    bool tryReadStringFieldNameAndValue(ReadBuffer & in, std::pair<String, String> & field_and_value, const FormatSettings::JSON & settings)
     {
-        return tryReadFieldName(in, field_and_value.first) && tryReadStringField(in, field_and_value.second);
+        return tryReadFieldName(in, field_and_value.first, settings) && tryReadStringField(in, field_and_value.second, settings);
     }
 
-    NameAndTypePair readObjectWithNameAndType(ReadBuffer & in)
+    NameAndTypePair readObjectWithNameAndType(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
         skipObjectStart(in);
-        auto [first_field_name, first_field_value] = readStringFieldNameAndValue(in);
+        auto [first_field_name, first_field_value] = readStringFieldNameAndValue(in, settings);
         skipComma(in);
-        auto [second_field_name, second_field_value] = readStringFieldNameAndValue(in);
+        auto [second_field_name, second_field_value] = readStringFieldNameAndValue(in, settings);
 
         NameAndTypePair name_and_type;
         if (first_field_name == "name" && second_field_name == "type")
@@ -714,20 +714,20 @@ namespace JSONUtils
         return name_and_type;
     }
 
-    bool tryReadObjectWithNameAndType(ReadBuffer & in, NameAndTypePair & name_and_type)
+    bool tryReadObjectWithNameAndType(ReadBuffer & in, NameAndTypePair & name_and_type, const FormatSettings::JSON & settings)
     {
         if (!checkAndSkipObjectStart(in))
             return false;
 
         std::pair<String, String> first_field_and_value;
-        if (!tryReadStringFieldNameAndValue(in, first_field_and_value))
+        if (!tryReadStringFieldNameAndValue(in, first_field_and_value, settings))
             return false;
 
         if (!checkAndSkipComma(in))
             return false;
 
         std::pair<String, String> second_field_and_value;
-        if (!tryReadStringFieldNameAndValue(in, second_field_and_value))
+        if (!tryReadStringFieldNameAndValue(in, second_field_and_value, settings))
             return false;
 
         if (first_field_and_value.first == "name" && second_field_and_value.first == "type")
@@ -752,9 +752,9 @@ namespace JSONUtils
         return checkAndSkipObjectEnd(in);
     }
 
-    NamesAndTypesList readMetadata(ReadBuffer & in)
+    NamesAndTypesList readMetadata(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
-        auto field_name = readFieldName(in);
+        auto field_name = readFieldName(in, settings);
         if (field_name != "meta")
             throw Exception(ErrorCodes::INCORRECT_DATA, "Expected field \"meta\" with columns names and types, found field {}", field_name);
         skipArrayStart(in);
@@ -767,15 +767,15 @@ namespace JSONUtils
             else
                 first = false;
 
-            names_and_types.push_back(readObjectWithNameAndType(in));
+            names_and_types.push_back(readObjectWithNameAndType(in, settings));
         }
         return names_and_types;
     }
 
-    bool tryReadMetadata(ReadBuffer & in, NamesAndTypesList & names_and_types)
+    bool tryReadMetadata(ReadBuffer & in, NamesAndTypesList & names_and_types, const FormatSettings::JSON & settings)
     {
         String field_name;
-        if (!tryReadFieldName(in, field_name) || field_name != "meta")
+        if (!tryReadFieldName(in, field_name, settings) || field_name != "meta")
             return false;
 
         if (!checkAndSkipArrayStart(in))
@@ -795,7 +795,7 @@ namespace JSONUtils
             }
 
             NameAndTypePair name_and_type;
-            if (!tryReadObjectWithNameAndType(in, name_and_type))
+            if (!tryReadObjectWithNameAndType(in, name_and_type, settings))
                 return false;
             names_and_types.push_back(name_and_type);
         }
@@ -819,18 +819,18 @@ namespace JSONUtils
         }
     }
 
-    NamesAndTypesList readMetadataAndValidateHeader(ReadBuffer & in, const Block & header)
+    NamesAndTypesList readMetadataAndValidateHeader(ReadBuffer & in, const Block & header, const FormatSettings::JSON & settings)
     {
-        auto names_and_types = JSONUtils::readMetadata(in);
+        auto names_and_types = JSONUtils::readMetadata(in, settings);
         validateMetadataByHeader(names_and_types, header);
         return names_and_types;
     }
 
-    bool skipUntilFieldInObject(ReadBuffer & in, const String & desired_field_name)
+    bool skipUntilFieldInObject(ReadBuffer & in, const String & desired_field_name, const FormatSettings::JSON & settings)
     {
         while (!checkAndSkipObjectEnd(in))
         {
-            auto field_name = JSONUtils::readFieldName(in);
+            auto field_name = JSONUtils::readFieldName(in, settings);
             if (field_name == desired_field_name)
                 return true;
         }
@@ -838,14 +838,14 @@ namespace JSONUtils
         return false;
     }
 
-    void skipTheRestOfObject(ReadBuffer & in)
+    void skipTheRestOfObject(ReadBuffer & in, const FormatSettings::JSON & settings)
     {
         while (!checkAndSkipObjectEnd(in))
         {
             skipComma(in);
-            auto name = readFieldName(in);
+            auto name = readFieldName(in, settings);
             skipWhitespaceIfAny(in);
-            skipJSONField(in, name);
+            skipJSONField(in, name, settings);
         }
     }
 
diff --git a/src/Formats/JSONUtils.h b/src/Formats/JSONUtils.h
index a770ded9687..7ee111c1285 100644
--- a/src/Formats/JSONUtils.h
+++ b/src/Formats/JSONUtils.h
@@ -13,6 +13,7 @@
 namespace DB
 {
 
+class Block;
 struct JSONInferenceInfo;
 
 namespace JSONUtils
@@ -114,7 +115,7 @@ namespace JSONUtils
     void skipComma(ReadBuffer & in);
     bool checkAndSkipComma(ReadBuffer & in);
 
-    String readFieldName(ReadBuffer & in);
+    String readFieldName(ReadBuffer & in, const FormatSettings::JSON & settings);
 
     void skipArrayStart(ReadBuffer & in);
     void skipArrayEnd(ReadBuffer & in);
@@ -126,13 +127,13 @@ namespace JSONUtils
     bool checkAndSkipObjectStart(ReadBuffer & in);
     bool checkAndSkipObjectEnd(ReadBuffer & in);
 
-    NamesAndTypesList readMetadata(ReadBuffer & in);
-    bool tryReadMetadata(ReadBuffer & in, NamesAndTypesList & names_and_types);
-    NamesAndTypesList readMetadataAndValidateHeader(ReadBuffer & in, const Block & header);
+    NamesAndTypesList readMetadata(ReadBuffer & in, const FormatSettings::JSON & settings);
+    bool tryReadMetadata(ReadBuffer & in, NamesAndTypesList & names_and_types, const FormatSettings::JSON & settings);
+    NamesAndTypesList readMetadataAndValidateHeader(ReadBuffer & in, const Block & header, const FormatSettings::JSON & settings);
     void validateMetadataByHeader(const NamesAndTypesList & names_and_types_from_metadata, const Block & header);
 
-    bool skipUntilFieldInObject(ReadBuffer & in, const String & desired_field_name);
-    void skipTheRestOfObject(ReadBuffer & in);
+    bool skipUntilFieldInObject(ReadBuffer & in, const String & desired_field_name, const FormatSettings::JSON & settings);
+    void skipTheRestOfObject(ReadBuffer & in, const FormatSettings::JSON & settings);
 }
 
 }
diff --git a/src/Formats/MarkInCompressedFile.cpp b/src/Formats/MarkInCompressedFile.cpp
index 41f6152dc13..58c2fd2d2e8 100644
--- a/src/Formats/MarkInCompressedFile.cpp
+++ b/src/Formats/MarkInCompressedFile.cpp
@@ -63,7 +63,7 @@ MarksInCompressedFile::MarksInCompressedFile(const PlainArray & marks)
 
     // 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.reserve(packed_length);
     packed.resize_fill(packed_length);
 
     // Second pass: write out the packed marks.
diff --git a/src/Formats/MarkInCompressedFile.h b/src/Formats/MarkInCompressedFile.h
index a25033e2a14..06ed1476410 100644
--- a/src/Formats/MarkInCompressedFile.h
+++ b/src/Formats/MarkInCompressedFile.h
@@ -12,10 +12,8 @@ namespace DB
 
 /// It's a bug in clang with three-way comparison operator
 /// https://github.com/llvm/llvm-project/issues/55919
-#ifdef __clang__
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 
 /** Mark is the position in the compressed file. The compressed file consists of adjacent compressed blocks.
   * Mark is a tuple - the offset in the file to the start of the compressed block, the offset in the decompressed block to the start of the data.
@@ -41,9 +39,7 @@ struct MarkInCompressedFile
     }
 };
 
-#ifdef __clang__
-    #pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 /**
  * In-memory representation of an array of marks.
@@ -63,7 +59,7 @@ class MarksInCompressedFile
 public:
     using PlainArray = PODArray<MarkInCompressedFile>;
 
-    MarksInCompressedFile(const PlainArray & marks);
+    explicit MarksInCompressedFile(const PlainArray & marks);
 
     MarkInCompressedFile get(size_t idx) const;
 
diff --git a/src/Formats/NativeWriter.cpp b/src/Formats/NativeWriter.cpp
index 70d5b7914a7..b150561a5fc 100644
--- a/src/Formats/NativeWriter.cpp
+++ b/src/Formats/NativeWriter.cpp
@@ -49,8 +49,9 @@ static void writeData(const ISerialization & serialization, const ColumnPtr & co
 {
     /** If there are columns-constants - then we materialize them.
       * (Since the data type does not know how to serialize / deserialize constants.)
+      * The same for compressed columns in-memory.
       */
-    ColumnPtr full_column = column->convertToFullColumnIfConst();
+    ColumnPtr full_column = column->convertToFullColumnIfConst()->decompress();
 
     ISerialization::SerializeBinaryBulkSettings settings;
     settings.getter = [&ostr](ISerialization::SubstreamPath) -> WriteBuffer * { return &ostr; };
diff --git a/src/Formats/ProtobufSerializer.cpp b/src/Formats/ProtobufSerializer.cpp
index dd37c25719c..f2f1d985cc9 100644
--- a/src/Formats/ProtobufSerializer.cpp
+++ b/src/Formats/ProtobufSerializer.cpp
@@ -1,51 +1,54 @@
 #include <Formats/ProtobufSerializer.h>
 
 #if USE_PROTOBUF
-#   include <Columns/ColumnAggregateFunction.h>
-#   include <Columns/ColumnArray.h>
-#   include <Columns/ColumnDecimal.h>
-#   include <Columns/ColumnLowCardinality.h>
-#   include <Columns/ColumnMap.h>
-#   include <Columns/ColumnNullable.h>
-#   include <Columns/ColumnFixedString.h>
-#   include <Columns/ColumnString.h>
-#   include <Columns/ColumnTuple.h>
-#   include <Columns/ColumnVector.h>
-#   include <Common/PODArray.h>
-#   include <Common/quoteString.h>
-#   include <Core/DecimalComparison.h>
-#   include <DataTypes/DataTypeAggregateFunction.h>
-#   include <DataTypes/DataTypeArray.h>
-#   include <DataTypes/DataTypesDecimal.h>
-#   include <DataTypes/DataTypeDateTime64.h>
-#   include <DataTypes/DataTypeEnum.h>
-#   include <DataTypes/DataTypeFixedString.h>
-#   include <DataTypes/DataTypeLowCardinality.h>
-#   include <DataTypes/DataTypeMap.h>
-#   include <DataTypes/DataTypeNullable.h>
-#   include <DataTypes/DataTypeTuple.h>
-#   include <DataTypes/DataTypeString.h>
-#   include <DataTypes/Serializations/SerializationDecimal.h>
-#   include <DataTypes/Serializations/SerializationFixedString.h>
-#   include <Formats/ProtobufReader.h>
-#   include <Formats/ProtobufWriter.h>
-#   include <Formats/RowInputMissingColumnsFiller.h>
-#   include <IO/Operators.h>
-#   include <IO/ReadBufferFromString.h>
-#   include <IO/ReadHelpers.h>
-#   include <IO/WriteBufferFromString.h>
-#   include <IO/WriteHelpers.h>
-#   include <base/range.h>
-#   include <base/sort.h>
-#   include <google/protobuf/descriptor.h>
-#   include <google/protobuf/descriptor.pb.h>
-#   include <boost/algorithm/string.hpp>
-#   include <boost/container/flat_map.hpp>
-#   include <boost/container/flat_set.hpp>
-#   include <boost/numeric/conversion/cast.hpp>
-#   include <boost/range/algorithm.hpp>
-#   include <boost/range/algorithm_ext/erase.hpp>
-#   include <Common/logger_useful.h>
+#    include <AggregateFunctions/IAggregateFunction.h>
+#    include <Columns/ColumnAggregateFunction.h>
+#    include <Columns/ColumnArray.h>
+#    include <Columns/ColumnDecimal.h>
+#    include <Columns/ColumnFixedString.h>
+#    include <Columns/ColumnLowCardinality.h>
+#    include <Columns/ColumnMap.h>
+#    include <Columns/ColumnNullable.h>
+#    include <Columns/ColumnString.h>
+#    include <Columns/ColumnTuple.h>
+#    include <Columns/ColumnVector.h>
+#    include <Core/DecimalComparison.h>
+#    include <DataTypes/DataTypeAggregateFunction.h>
+#    include <DataTypes/DataTypeArray.h>
+#    include <DataTypes/DataTypeDateTime64.h>
+#    include <DataTypes/DataTypeEnum.h>
+#    include <DataTypes/DataTypeFixedString.h>
+#    include <DataTypes/DataTypeLowCardinality.h>
+#    include <DataTypes/DataTypeMap.h>
+#    include <DataTypes/DataTypeNullable.h>
+#    include <DataTypes/DataTypeString.h>
+#    include <DataTypes/DataTypeTuple.h>
+#    include <DataTypes/DataTypesDecimal.h>
+#    include <DataTypes/Serializations/SerializationDecimal.h>
+#    include <DataTypes/Serializations/SerializationFixedString.h>
+#    include <Formats/ProtobufReader.h>
+#    include <Formats/ProtobufWriter.h>
+#    include <Formats/RowInputMissingColumnsFiller.h>
+#    include <IO/Operators.h>
+#    include <IO/ReadBufferFromString.h>
+#    include <IO/ReadHelpers.h>
+#    include <IO/WriteBufferFromString.h>
+#    include <IO/WriteHelpers.h>
+#    include <base/range.h>
+#    include <base/sort.h>
+#    include <Common/PODArray.h>
+#    include <Common/logger_useful.h>
+#    include <Common/quoteString.h>
+
+#    include <boost/algorithm/string.hpp>
+#    include <boost/container/flat_map.hpp>
+#    include <boost/container/flat_set.hpp>
+#    include <boost/numeric/conversion/cast.hpp>
+#    include <boost/range/algorithm.hpp>
+#    include <boost/range/algorithm_ext/erase.hpp>
+#    include <google/protobuf/descriptor.h>
+#    include <google/protobuf/descriptor.pb.h>
+
 
 namespace DB
 {
@@ -3045,7 +3048,7 @@ namespace
             {
                 *root_serializer_ptr = message_serializer.get();
 #if 0
-                LOG_INFO(&Poco::Logger::get("ProtobufSerializer"), "Serialization tree:\n{}", get_root_desc_function(0));
+                LOG_INFO(getLogger("ProtobufSerializer"), "Serialization tree:\n{}", get_root_desc_function(0));
 #endif
                 return message_serializer;
             }
@@ -3054,7 +3057,7 @@ namespace
                 auto envelope_serializer = std::make_unique<ProtobufSerializerEnvelope>(std::move(message_serializer), reader_or_writer);
                 *root_serializer_ptr = envelope_serializer.get();
 #if 0
-                LOG_INFO(&Poco::Logger::get("ProtobufSerializer"), "Serialization tree:\n{}", get_root_desc_function(0));
+                LOG_INFO(getLogger("ProtobufSerializer"), "Serialization tree:\n{}", get_root_desc_function(0));
 #endif
                 return envelope_serializer;
             }
diff --git a/src/Formats/ReadSchemaUtils.cpp b/src/Formats/ReadSchemaUtils.cpp
index 43931be3449..735b536986d 100644
--- a/src/Formats/ReadSchemaUtils.cpp
+++ b/src/Formats/ReadSchemaUtils.cpp
@@ -1,9 +1,12 @@
 #include <Formats/ReadSchemaUtils.h>
-#include <Interpreters/Context.h>
-#include <Processors/Formats/ISchemaReader.h>
-#include <Common/assert_cast.h>
-#include <IO/WithFileSize.h>
 #include <IO/EmptyReadBuffer.h>
+#include <IO/PeekableReadBuffer.h>
+#include <IO/WithFileSize.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Processors/Formats/ISchemaReader.h>
+#include <Storages/IStorage.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
@@ -14,7 +17,9 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int ONLY_NULLS_WHILE_READING_SCHEMA;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int CANNOT_DETECT_FORMAT;
     extern const int TYPE_MISMATCH;
+    extern const int LOGICAL_ERROR;
 }
 
 static std::optional<NamesAndTypesList> getOrderedColumnsList(const NamesAndTypesList & columns_list, const Names & columns_order_hint)
@@ -43,50 +48,87 @@ bool isRetryableSchemaInferenceError(int code)
     return code == ErrorCodes::EMPTY_DATA_PASSED || code == ErrorCodes::ONLY_NULLS_WHILE_READING_SCHEMA;
 }
 
-ColumnsDescription readSchemaFromFormat(
-    const String & format_name,
+/// Order of formats to try in automatic format detection.
+/// If we can successfully detect some format, we won't try next ones.
+static const std::vector<String> & getFormatsOrderForDetection()
+{
+    static const std::vector<String> formats_order =
+    {
+        "Parquet",
+        "ORC",
+        "Arrow",
+        "ArrowStream",
+        "Avro",
+        "AvroConfluent",
+        "Npy",
+        "Native",
+        "BSONEachRow",
+        "JSONCompact",
+        "Values",
+        "TSKV",
+        "JSONObjectEachRow",
+        "JSONColumns",
+        "JSONCompactColumns",
+        "JSONCompact",
+        "JSON",
+    };
+
+    return formats_order;
+}
+
+/// The set of similar formats to try in automatic format detection.
+/// We will try all formats from this set and then choose the best one
+/// according to inferred schema.
+static const std::vector<String> & getSimilarFormatsSetForDetection()
+{
+    static const std::vector<String> formats_order =
+    {
+        "TSV",
+        "CSV",
+    };
+
+    return formats_order;
+}
+
+std::pair<ColumnsDescription, String> readSchemaFromFormatImpl(
+    std::optional<String> format_name,
     const std::optional<FormatSettings> & format_settings,
     IReadBufferIterator & read_buffer_iterator,
-    bool retry,
-    ContextPtr & context,
-    std::unique_ptr<ReadBuffer> & buf)
+    const ContextPtr & context)
 try
 {
     NamesAndTypesList names_and_types;
     SchemaInferenceMode mode = context->getSettingsRef().schema_inference_mode;
-    if (mode == SchemaInferenceMode::UNION && !FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format_name, context, format_settings))
+    if (format_name && mode == SchemaInferenceMode::UNION && !FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(*format_name, context, format_settings))
     {
         String additional_message;
         /// Better exception message for WithNames(AndTypes) formats.
-        if (format_name.ends_with("WithNames") || format_name.ends_with("WithNamesAndTypes"))
+        if (format_name->ends_with("WithNames") || format_name->ends_with("WithNamesAndTypes"))
             additional_message = " (formats -WithNames(AndTypes) support reading subset of columns only when setting input_format_with_names_use_header is enabled)";
 
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "UNION schema inference mode is not supported for format {}, because it doesn't support reading subset of columns{}", format_name, additional_message);
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "UNION schema inference mode is not supported for format {}, because it doesn't support reading subset of columns{}", *format_name, additional_message);
     }
 
-    if (FormatFactory::instance().checkIfFormatHasExternalSchemaReader(format_name))
+    if (format_name && FormatFactory::instance().checkIfFormatHasExternalSchemaReader(*format_name))
     {
-        auto external_schema_reader = FormatFactory::instance().getExternalSchemaReader(format_name, context, format_settings);
+        auto external_schema_reader = FormatFactory::instance().getExternalSchemaReader(*format_name, context, format_settings);
         try
         {
-            names_and_types = external_schema_reader->readSchema();
+            return {ColumnsDescription(external_schema_reader->readSchema()), *format_name};
         }
         catch (Exception & e)
         {
             e.addMessage(
-                fmt::format("Cannot extract table structure from {} format file. You can specify the structure manually", format_name));
+                fmt::format("The table structure cannot be extracted from a {} format file. You can specify the structure manually", *format_name));
             throw;
         }
     }
-    else if (FormatFactory::instance().checkIfFormatHasSchemaReader(format_name))
-    {
-        if (mode == SchemaInferenceMode::UNION)
-            retry = false;
 
+    if (!format_name || FormatFactory::instance().checkIfFormatHasSchemaReader(*format_name))
+    {
+        IReadBufferIterator::Data iterator_data;
         std::vector<std::pair<NamesAndTypesList, String>> schemas_for_union_mode;
-        std::optional<ColumnsDescription> cached_columns;
         std::string exception_messages;
-        SchemaReaderPtr schema_reader;
         size_t max_rows_to_read = format_settings ? format_settings->max_rows_to_read_for_schema_inference
                                                   : context->getSettingsRef().input_format_max_rows_to_read_for_schema_inference;
         size_t max_bytes_to_read = format_settings ? format_settings->max_bytes_to_read_for_schema_inference
@@ -94,45 +136,71 @@ try
         size_t iterations = 0;
         while (true)
         {
+            /// When we finish working with current buffer we should put it back to iterator.
+            SCOPE_EXIT(if (iterator_data.buf) read_buffer_iterator.setPreviousReadBuffer(std::move(iterator_data.buf)));
             bool is_eof = false;
             try
             {
-                read_buffer_iterator.setPreviousReadBuffer(std::move(buf));
-                std::tie(buf, cached_columns) = read_buffer_iterator.next();
-                if (cached_columns)
+                iterator_data = read_buffer_iterator.next();
+
+                /// Read buffer iterator can determine the data format if it's unknown.
+                /// For example by scanning schema cache or by finding new file with format extension.
+                if (!format_name && iterator_data.format_name)
                 {
+                    format_name = *iterator_data.format_name;
+                    read_buffer_iterator.setFormatName(*iterator_data.format_name);
+                }
+
+                if (iterator_data.cached_columns)
+                {
+                    /// If we have schema in cache, we must also know the format.
+                    if (!format_name)
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Schema from cache was returned, but format name is unknown");
+
                     if (mode == SchemaInferenceMode::DEFAULT)
-                        return *cached_columns;
-                    schemas_for_union_mode.emplace_back(cached_columns->getAll(), read_buffer_iterator.getLastFileName());
+                    {
+                        read_buffer_iterator.setResultingSchema(*iterator_data.cached_columns);
+                        return {*iterator_data.cached_columns, *format_name};
+                    }
+
+                    schemas_for_union_mode.emplace_back(iterator_data.cached_columns->getAll(), read_buffer_iterator.getLastFileName());
                     continue;
                 }
 
-                if (!buf)
+                if (!iterator_data.buf)
                     break;
 
                 /// We just want to check for eof, but eof() can be pretty expensive.
                 /// So we use getFileSize() when available, which has better worst case.
                 /// (For remote files, typically eof() would read 1 MB from S3, which may be much
                 ///  more than what the schema reader and even data reader will read).
-                auto size = tryGetFileSizeFromReadBuffer(*buf);
+                auto size = tryGetFileSizeFromReadBuffer(*iterator_data.buf);
                 if (size.has_value())
                     is_eof = *size == 0;
                 else
-                    is_eof = buf->eof();
+                    is_eof = iterator_data.buf->eof();
             }
             catch (Exception & e)
             {
-                e.addMessage(
-                    fmt::format("Cannot extract table structure from {} format file. You can specify the structure manually", format_name));
+                if (format_name)
+                    e.addMessage(fmt::format("The table structure cannot be extracted from a {} format file. You can specify the structure manually", *format_name));
+                else
+                    e.addMessage("The data format cannot be detected by the contents of the files. You can specify the format manually");
                 throw;
             }
             catch (...)
             {
                 auto exception_message = getCurrentExceptionMessage(false);
+                if (format_name)
+                    throw Exception(
+                        ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                        "The table structure cannot be extracted from a {} format file:\n{}.\nYou can specify the structure manually",
+                        *format_name,
+                        exception_message);
+
                 throw Exception(
-                    ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                    "Cannot extract table structure from {} format file:\n{}\nYou can specify the structure manually",
-                    format_name,
+                    ErrorCodes::CANNOT_DETECT_FORMAT,
+                    "The data format cannot be detected by the contents of the files:\n{}.\nYou can specify the format manually",
                     exception_message);
             }
 
@@ -140,91 +208,224 @@ try
 
             if (is_eof)
             {
-                auto exception_message = fmt::format("Cannot extract table structure from {} format file, file is empty", format_name);
+                String exception_message;
+                if (format_name)
+                    exception_message = fmt::format("The table structure cannot be extracted from a {} format file: the file is empty", *format_name);
+                else
+                    exception_message = fmt::format("The data format cannot be detected by the contents of the files: the file is empty");
 
-                if (!retry)
-                    throw Exception(
-                        ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE, "{}. You can specify the structure manually", exception_message);
+                if (mode == SchemaInferenceMode::UNION)
+                {
+                    if (!format_name)
+                        throw Exception(ErrorCodes::CANNOT_DETECT_FORMAT, "The data format cannot be detected by the contents of the files: the file is empty. You can specify the format manually");
 
-                exception_messages += "\n" + exception_message;
+                    throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE, "{}. You can specify the structure manually", exception_message);
+                }
+
+                if (!exception_messages.empty())
+                    exception_messages += "\n";
+                exception_messages += exception_message;
                 continue;
             }
 
-            try
-            {
-                schema_reader = FormatFactory::instance().getSchemaReader(format_name, *buf, context, format_settings);
-                schema_reader->setMaxRowsAndBytesToRead(max_rows_to_read, max_bytes_to_read);
-                names_and_types = schema_reader->readSchema();
-                auto num_rows = schema_reader->readNumberOrRows();
-                if (num_rows)
-                    read_buffer_iterator.setNumRowsToLastFile(*num_rows);
+            std::unique_ptr<PeekableReadBuffer> peekable_buf; /// Can be used in format detection. Should be destroyed after schema reader.
 
-                /// In default mode, we finish when schema is inferred successfully from any file.
-                if (mode == SchemaInferenceMode::DEFAULT)
-                    break;
-
-                if (!names_and_types.empty())
-                    read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
-                schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFileName());
-            }
-            catch (...)
+            if (format_name)
             {
-                auto exception_message = getCurrentExceptionMessage(false);
-                if (schema_reader && mode == SchemaInferenceMode::DEFAULT)
+                SchemaReaderPtr schema_reader;
+
+                try
                 {
-                    size_t rows_read = schema_reader->getNumRowsRead();
-                    assert(rows_read <= max_rows_to_read);
-                    max_rows_to_read -= schema_reader->getNumRowsRead();
-                    size_t bytes_read = buf->count();
-                    /// We could exceed max_bytes_to_read a bit to complete row parsing.
-                    max_bytes_to_read -= std::min(bytes_read, max_bytes_to_read);
-                    if (rows_read != 0 && (max_rows_to_read == 0 || max_bytes_to_read == 0))
-                    {
-                        exception_message += "\nTo increase the maximum number of rows/bytes to read for structure determination, use setting "
-                                             "input_format_max_rows_to_read_for_schema_inference/input_format_max_bytes_to_read_for_schema_inference";
+                    schema_reader = FormatFactory::instance().getSchemaReader(*format_name, *iterator_data.buf, context, format_settings);
+                    schema_reader->setMaxRowsAndBytesToRead(max_rows_to_read, max_bytes_to_read);
+                    names_and_types = schema_reader->readSchema();
+                    auto num_rows = schema_reader->readNumberOrRows();
+                    if (num_rows)
+                        read_buffer_iterator.setNumRowsToLastFile(*num_rows);
 
-                        if (iterations > 1)
+                    /// In default mode, we finish when schema is inferred successfully from any file.
+                    if (mode == SchemaInferenceMode::DEFAULT)
+                        break;
+
+                    if (!names_and_types.empty())
+                        read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
+                    schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFileName());
+                }
+                catch (...)
+                {
+                    auto exception_message = getCurrentExceptionMessage(false);
+                    if (schema_reader && mode == SchemaInferenceMode::DEFAULT)
+                    {
+                        size_t rows_read = schema_reader->getNumRowsRead();
+                        assert(rows_read <= max_rows_to_read);
+                        max_rows_to_read -= schema_reader->getNumRowsRead();
+                        size_t bytes_read = iterator_data.buf->count();
+                        /// We could exceed max_bytes_to_read a bit to complete row parsing.
+                        max_bytes_to_read -= std::min(bytes_read, max_bytes_to_read);
+                        if (rows_read != 0 && (max_rows_to_read == 0 || max_bytes_to_read == 0))
                         {
-                            exception_messages += "\n" + exception_message;
+                            exception_message
+                                += "\nTo increase the maximum number of rows/bytes to read for structure determination, use setting "
+                                   "input_format_max_rows_to_read_for_schema_inference/input_format_max_bytes_to_read_for_schema_inference";
+                            if (!exception_messages.empty())
+                                exception_messages += "\n";
+                            exception_messages += exception_message;
                             break;
                         }
-                        retry = false;
                     }
-                }
 
-                if (!retry || !isRetryableSchemaInferenceError(getCurrentExceptionCode()))
-                {
-                    try
-                    {
-                        throw;
-                    }
-                    catch (Exception & e)
-                    {
-                        e.addMessage(fmt::format(
-                            "Cannot extract table structure from {} format file. You can specify the structure manually", format_name));
-                        throw;
-                    }
-                    catch (...)
+                    if (mode == SchemaInferenceMode::UNION || !isRetryableSchemaInferenceError(getCurrentExceptionCode()))
                     {
                         throw Exception(
                             ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                            "Cannot extract table structure from {} format file. "
-                            "Error: {}. You can specify the structure manually",
-                            format_name,
+                            "The table structure cannot be extracted from a {} format file. "
+                            "Error:\n{}.\nYou can specify the structure manually",
+                            *format_name,
                             exception_message);
                     }
+
+                    if (!exception_messages.empty())
+                        exception_messages += "\n";
+                    exception_messages += exception_message;
+                }
+            }
+            else
+            {
+                /// If the format is unknown we try some formats in order and try to apply their schema readers.
+                /// If we can successfully infer the schema in some format, most likely we can use this format to read this data.
+
+                /// If read_buffer_iterator supports recreation of last buffer, we will recreate it for
+                /// each format. Otherwise we will use PeekableReadBuffer and will rollback to the
+                /// beginning of the file before each format. Using PeekableReadBuffer can lead
+                /// to high memory usage as it will save all the read data from the beginning of the file,
+                /// especially it will be noticeable for formats like Parquet/ORC/Arrow that do seeks to the
+                /// end of file.
+                bool support_buf_recreation = read_buffer_iterator.supportsLastReadBufferRecreation();
+                if (!support_buf_recreation)
+                {
+                    peekable_buf = std::make_unique<PeekableReadBuffer>(*iterator_data.buf);
+                    peekable_buf->setCheckpoint();
+                }
+
+                /// First, try some formats in order. If we successfully inferred the schema for any format,
+                /// we will use this format.
+                for (const auto & format_to_detect : getFormatsOrderForDetection())
+                {
+                    try
+                    {
+                        SchemaReaderPtr schema_reader = FormatFactory::instance().getSchemaReader(format_to_detect, support_buf_recreation ? *iterator_data.buf : *peekable_buf, context, format_settings);
+                        schema_reader->setMaxRowsAndBytesToRead(max_rows_to_read, max_bytes_to_read);
+                        names_and_types = schema_reader->readSchema();
+                        if (names_and_types.empty())
+                            continue;
+
+                        /// We successfully inferred schema from this file using current format.
+                        format_name = format_to_detect;
+                        read_buffer_iterator.setFormatName(format_to_detect);
+
+                        auto num_rows = schema_reader->readNumberOrRows();
+                        if (num_rows)
+                            read_buffer_iterator.setNumRowsToLastFile(*num_rows);
+
+                        break;
+                    }
+                    catch (...)
+                    {
+                        /// We failed to infer the schema for this format.
+                        /// Recreate read buffer or rollback to the beginning of the data
+                        /// before trying next format.
+                        if (support_buf_recreation)
+                        {
+                            read_buffer_iterator.setPreviousReadBuffer(std::move(iterator_data.buf));
+                            iterator_data.buf = read_buffer_iterator.recreateLastReadBuffer();
+                        }
+                        else
+                        {
+                            peekable_buf->rollbackToCheckpoint();
+                        }
+                    }
                 }
 
-                exception_messages += "\n" + exception_message;
+                /// If no format was detected from first set of formats, we try second set.
+                /// In this set formats are similar and it can happen that data matches some of them.
+                /// We try to infer schema for all of the formats from this set and then choose the best
+                /// one according to the inferred schema.
+                if (!format_name)
+                {
+                    std::unordered_map<String, NamesAndTypesList> format_to_schema;
+                    const auto & formats_set_to_detect = getSimilarFormatsSetForDetection();
+                    for (size_t i = 0; i != formats_set_to_detect.size(); ++i)
+                    {
+                        try
+                        {
+                            SchemaReaderPtr schema_reader = FormatFactory::instance().getSchemaReader(
+                                formats_set_to_detect[i], support_buf_recreation ? *iterator_data.buf : *peekable_buf, context, format_settings);
+                            schema_reader->setMaxRowsAndBytesToRead(max_rows_to_read, max_bytes_to_read);
+                            auto tmp_names_and_types = schema_reader->readSchema();
+                            /// If schema was inferred successfully for this format, remember it and try next format.
+                            if (!tmp_names_and_types.empty())
+                                format_to_schema[formats_set_to_detect[i]] = tmp_names_and_types;
+                        }
+                        catch (...) // NOLINT(bugprone-empty-catch)
+                        {
+                            /// Try next format.
+                        }
+
+                        if (i != formats_set_to_detect.size() - 1)
+                        {
+                            if (support_buf_recreation)
+                            {
+                                read_buffer_iterator.setPreviousReadBuffer(std::move(iterator_data.buf));
+                                iterator_data.buf = read_buffer_iterator.recreateLastReadBuffer();
+                            }
+                            else
+                            {
+                                peekable_buf->rollbackToCheckpoint();
+                            }
+                        }
+                    }
+
+                    /// We choose the format with larger number of columns in inferred schema.
+                    size_t max_number_of_columns = 0;
+                    for (const auto & [format_to_detect, schema] : format_to_schema)
+                    {
+                        if (schema.size() > max_number_of_columns)
+                        {
+                            names_and_types = schema;
+                            format_name = format_to_detect;
+                            max_number_of_columns = schema.size();
+                        }
+                    }
+
+                    if (format_name)
+                        read_buffer_iterator.setFormatName(*format_name);
+                }
+
+                if (mode == SchemaInferenceMode::UNION)
+                {
+                    /// For UNION mode we need to know the schema of each file,
+                    /// if we failed to detect the format, we failed to detect the schema of this file
+                    /// in any format. It doesn't make sense to continue.
+                    if (!format_name)
+                        throw Exception(ErrorCodes::CANNOT_DETECT_FORMAT, "The data format cannot be detected by the contents of the files. You can specify the format manually");
+
+                    read_buffer_iterator.setSchemaToLastFile(ColumnsDescription(names_and_types));
+                    schemas_for_union_mode.emplace_back(names_and_types, read_buffer_iterator.getLastFileName());
+                }
+
+                if (format_name && mode == SchemaInferenceMode::DEFAULT)
+                    break;
             }
         }
 
-        /// If we got all schemas from cache, schema_reader can be uninitialized.
-        /// But we still need some stateless methods of ISchemaReader,
-        /// let's initialize it with empty buffer.
+        if (!format_name)
+            throw Exception(ErrorCodes::CANNOT_DETECT_FORMAT, "The data format cannot be detected by the contents of the files. You can specify the format manually");
+
+        /// We need some stateless methods of ISchemaReader, but during reading schema we
+        /// could not even create a schema reader (for example when we got schema from cache).
+        /// Let's create stateless schema reader from empty read buffer.
         EmptyReadBuffer empty;
-        if (!schema_reader)
-            schema_reader = FormatFactory::instance().getSchemaReader(format_name, empty, context, format_settings);
+        SchemaReaderPtr stateless_schema_reader = FormatFactory::instance().getSchemaReader(*format_name, empty, context, format_settings);
 
         if (mode == SchemaInferenceMode::UNION)
         {
@@ -251,7 +452,7 @@ try
                             /// If types are not the same, try to transform them according
                             /// to the format to find common type.
                             auto new_type_copy = type;
-                            schema_reader->transformTypesFromDifferentFilesIfNeeded(it->second, new_type_copy);
+                            stateless_schema_reader->transformTypesFromDifferentFilesIfNeeded(it->second, new_type_copy);
 
                             /// If types are not the same after transform, we cannot do anything, throw an exception.
                             if (!it->second->equals(*new_type_copy))
@@ -273,11 +474,23 @@ try
         }
 
         if (names_and_types.empty())
+        {
+            if (iterations <= 1)
+            {
+                throw Exception(
+                    ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                    "The table structure cannot be extracted from a {} format file. "
+                    "Error:\n{}.\nYou can specify the structure manually",
+                    *format_name,
+                    exception_messages);
+            }
+
             throw Exception(
                 ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
                 "All attempts to extract table structure from files failed. "
-                "Errors:{}\nYou can specify the structure manually",
+                "Errors:\n{}\nYou can specify the structure manually",
                 exception_messages);
+        }
 
         /// If we have "INSERT SELECT" query then try to order
         /// columns as they are ordered in table schema for formats
@@ -285,7 +498,7 @@ try
         /// It will allow to execute simple data loading with query
         /// "INSERT INTO table SELECT * FROM ..."
         const auto & insertion_table = context->getInsertionTable();
-        if (schema_reader && !schema_reader->hasStrictOrderOfColumns() && !insertion_table.empty())
+        if (!stateless_schema_reader->hasStrictOrderOfColumns() && !insertion_table.empty())
         {
             auto storage = DatabaseCatalog::instance().getTable(insertion_table, context);
             auto metadata = storage->getInMemoryMetadataPtr();
@@ -294,22 +507,22 @@ try
             if (ordered_list)
                 names_and_types = *ordered_list;
         }
+
+        /// Some formats like CSVWithNames can contain empty column names. We don't support empty column names and further processing can fail with an exception. Let's just remove columns with empty names from the structure.
+        names_and_types.erase(
+            std::remove_if(names_and_types.begin(), names_and_types.end(), [](const NameAndTypePair & pair) { return pair.name.empty(); }),
+            names_and_types.end());
+
+        auto columns = ColumnsDescription(names_and_types);
+        if (mode == SchemaInferenceMode::DEFAULT)
+            read_buffer_iterator.setResultingSchema(columns);
+        return {columns, *format_name};
     }
-    else
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS,
-            "{} file format doesn't support schema inference. You must specify the structure manually",
-            format_name);
 
-    /// Some formats like CSVWithNames can contain empty column names. We don't support empty column names and further processing can fail with an exception. Let's just remove columns with empty names from the structure.
-    names_and_types.erase(
-        std::remove_if(names_and_types.begin(), names_and_types.end(), [](const NameAndTypePair & pair) { return pair.name.empty(); }),
-        names_and_types.end());
-
-    auto columns = ColumnsDescription(names_and_types);
-    if (mode == SchemaInferenceMode::DEFAULT)
-        read_buffer_iterator.setResultingSchema(columns);
-    return columns;
+    throw Exception(
+        ErrorCodes::BAD_ARGUMENTS,
+        "{} file format doesn't support schema inference. You must specify the structure manually",
+        *format_name);
 }
 catch (Exception & e)
 {
@@ -319,16 +532,21 @@ catch (Exception & e)
     throw;
 }
 
-
 ColumnsDescription readSchemaFromFormat(
     const String & format_name,
     const std::optional<FormatSettings> & format_settings,
     IReadBufferIterator & read_buffer_iterator,
-    bool retry,
-    ContextPtr & context)
+    const ContextPtr & context)
 {
-    std::unique_ptr<ReadBuffer> buf_out;
-    return readSchemaFromFormat(format_name, format_settings, read_buffer_iterator, retry, context, buf_out);
+    return readSchemaFromFormatImpl(format_name, format_settings, read_buffer_iterator, context).first;
+}
+
+std::pair<ColumnsDescription, String> detectFormatAndReadSchema(
+    const std::optional<FormatSettings> & format_settings,
+    IReadBufferIterator & read_buffer_iterator,
+    const ContextPtr & context)
+{
+    return readSchemaFromFormatImpl(std::nullopt, format_settings, read_buffer_iterator, context);
 }
 
 SchemaCache::Key getKeyForSchemaCache(
diff --git a/src/Formats/ReadSchemaUtils.h b/src/Formats/ReadSchemaUtils.h
index 6aa8f3f9c4c..bb5e068f696 100644
--- a/src/Formats/ReadSchemaUtils.h
+++ b/src/Formats/ReadSchemaUtils.h
@@ -7,29 +7,68 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int NOT_IMPLEMENTED;
+}
+
 struct IReadBufferIterator
 {
     virtual ~IReadBufferIterator() = default;
 
-    virtual void setPreviousReadBuffer(std::unique_ptr<ReadBuffer> /* buffer */) {}
-
     /// Return read buffer of the next file or cached schema.
     /// In DEFAULT schema inference mode cached schema can be from any file.
     /// In UNION mode cached schema can be only from current file.
     /// When there is no files to process, return pair (nullptr, nullopt)
-    virtual std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() = 0;
 
+    struct Data
+    {
+        /// Read buffer of the next file. Can be nullptr if there are no more files
+        /// or when schema was found in cache.
+        std::unique_ptr<ReadBuffer> buf;
+
+        /// Schema from cache.
+        /// In DEFAULT schema inference mode cached schema can be from any file.
+        /// In UNION mode cached schema can be only from current file.
+        std::optional<ColumnsDescription> cached_columns;
+
+        /// Format of the file if known.
+        std::optional<String> format_name;
+    };
+
+    virtual Data next() = 0;
+
+    /// Set read buffer returned in previous iteration.
+    virtual void setPreviousReadBuffer(std::unique_ptr<ReadBuffer> /* buffer */) {}
+
+    /// Set number of rows to last file extracted during schema inference.
+    /// Used for caching number of rows from files metadata during schema inference.
     virtual void setNumRowsToLastFile(size_t /*num_rows*/) {}
 
     /// Set schema inferred from last file. Used for UNION mode to cache schema
     /// per file.
     virtual void setSchemaToLastFile(const ColumnsDescription & /*columns*/) {}
+
     /// Set resulting inferred schema. Used for DEFAULT mode to cache schema
     /// for all files.
     virtual void setResultingSchema(const ColumnsDescription & /*columns*/) {}
 
+    /// Set auto detected format name.
+    virtual void setFormatName(const String & /*format_name*/) {}
+
     /// Get last processed file name for better exception messages.
     virtual String getLastFileName() const { return ""; }
+
+    /// Return true if method recreateLastReadBuffer is implemented.
+    virtual bool supportsLastReadBufferRecreation() const { return false; }
+
+    /// Recreate last read buffer to read data from the same file again.
+    /// Used to detect format from the file content to avoid
+    /// copying data.
+    virtual std::unique_ptr<ReadBuffer> recreateLastReadBuffer()
+    {
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method recreateLastReadBuffer is not implemented");
+    }
 };
 
 struct SingleReadBufferIterator : public IReadBufferIterator
@@ -39,12 +78,22 @@ public:
     {
     }
 
-    std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+    Data next() override
     {
         if (done)
-            return {nullptr, {}};
+            return {nullptr, {}, std::nullopt};
         done = true;
-        return {std::move(buf), {}};
+        return Data{std::move(buf), {}, std::nullopt};
+    }
+
+    void setPreviousReadBuffer(std::unique_ptr<ReadBuffer> buf_) override
+    {
+        buf = std::move(buf_);
+    }
+
+    std::unique_ptr<ReadBuffer> releaseBuffer()
+    {
+        return std::move(buf);
     }
 
 private:
@@ -73,17 +122,16 @@ ColumnsDescription readSchemaFromFormat(
     const String & format_name,
     const std::optional<FormatSettings> & format_settings,
     IReadBufferIterator & read_buffer_iterator,
-    bool retry,
-    ContextPtr & context);
+    const ContextPtr & context);
 
-/// If ReadBuffer is created, it will be written to buf_out.
-ColumnsDescription readSchemaFromFormat(
-    const String & format_name,
+/// Try to detect the format of the data and it's schema.
+/// It runs schema inference for some set of formats on the same file.
+/// If schema reader of some format successfully inferred the schema from
+/// some file, we consider that the data is in this format.
+std::pair<ColumnsDescription, String> detectFormatAndReadSchema(
     const std::optional<FormatSettings> & format_settings,
     IReadBufferIterator & read_buffer_iterator,
-    bool retry,
-    ContextPtr & context,
-    std::unique_ptr<ReadBuffer> & buf_out);
+    const ContextPtr & context);
 
 SchemaCache::Key getKeyForSchemaCache(const String & source, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context);
 SchemaCache::Keys getKeysForSchemaCache(const Strings & sources, const String & format, const std::optional<FormatSettings> & format_settings, const ContextPtr & context);
diff --git a/src/Formats/SchemaInferenceUtils.cpp b/src/Formats/SchemaInferenceUtils.cpp
index f065d2f0f4d..02c0aa6dd77 100644
--- a/src/Formats/SchemaInferenceUtils.cpp
+++ b/src/Formats/SchemaInferenceUtils.cpp
@@ -17,6 +17,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/parseDateTimeBestEffort.h>
 #include <IO/PeekableReadBuffer.h>
+#include <IO/readFloatText.h>
 
 #include <Core/Block.h>
 #include <Common/assert_cast.h>
@@ -135,7 +136,7 @@ namespace
 
         bool empty() const { return paths.empty(); }
 
-        DataTypePtr finalize() const
+        DataTypePtr finalize(bool use_string_type_for_ambiguous_paths = false) const
         {
             if (paths.empty())
                 throw Exception(ErrorCodes::ONLY_NULLS_WHILE_READING_SCHEMA, "Cannot infer named Tuple from JSON object because object is empty");
@@ -166,7 +167,7 @@ namespace
                 current_node->leaf_type = type;
             }
 
-            return root_node.getType();
+            return root_node.getType(use_string_type_for_ambiguous_paths);
         }
 
     private:
@@ -179,19 +180,8 @@ namespace
             /// Store path to this node for better exception message in case of ambiguous paths.
             String path;
 
-            DataTypePtr getType() const
+            DataTypePtr getType(bool use_string_type_for_ambiguous_paths) const
             {
-                /// Check if we have ambiguous paths.
-                /// For example:
-                /// 'a.b.c' : Int32 and 'a.b' : String
-                /// Also check if leaf type is Nothing, because the next situation is possible:
-                /// {"a" : {"b" : null}} -> 'a.b' : Nullable(Nothing)
-                /// {"a" : {"b" : {"c" : 42}}} -> 'a.b.c' : Int32
-                /// And after merge we will have ambiguous paths 'a.b.c' : Int32 and 'a.b' : Nullable(Nothing),
-                /// but it's a valid case and we should ignore path 'a.b'.
-                if (leaf_type && !isNothing(removeNullable(leaf_type)) && !nodes.empty())
-                    throw Exception(ErrorCodes::INCORRECT_DATA, "JSON objects have ambiguous paths: '{}' with type {} and '{}'", path, leaf_type->getName(), nodes.begin()->second.path);
-
                 if (nodes.empty())
                     return leaf_type;
 
@@ -202,10 +192,33 @@ namespace
                 for (const auto & [name, node] : nodes)
                 {
                     node_names.push_back(name);
-                    node_types.push_back(node.getType());
+                    node_types.push_back(node.getType(use_string_type_for_ambiguous_paths));
                 }
 
-                return std::make_shared<DataTypeTuple>(std::move(node_types), std::move(node_names));
+                auto tuple_type = std::make_shared<DataTypeTuple>(std::move(node_types), std::move(node_names));
+
+                /// Check if we have ambiguous paths.
+                /// For example:
+                /// 'a.b.c' : Int32 and 'a.b' : String
+                /// Also check if leaf type is Nothing, because the next situation is possible:
+                /// {"a" : {"b" : null}} -> 'a.b' : Nullable(Nothing)
+                /// {"a" : {"b" : {"c" : 42}}} -> 'a.b.c' : Int32
+                /// And after merge we will have ambiguous paths 'a.b.c' : Int32 and 'a.b' : Nullable(Nothing),
+                /// but it's a valid case and we should ignore path 'a.b'.
+                if (leaf_type && !isNothing(removeNullable(leaf_type)) && !nodes.empty())
+                {
+                    if (use_string_type_for_ambiguous_paths)
+                        return std::make_shared<DataTypeString>();
+
+                    throw Exception(
+                        ErrorCodes::INCORRECT_DATA,
+                        "JSON objects have ambiguous data: in some objects path '{}' has type '{}' and in some - '{}'. You can enable setting "
+                        "input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects to use String type "
+                        "for path '{}'",
+                        path, leaf_type->getName(), tuple_type->getName(), path);
+                }
+
+                return tuple_type;
             }
         };
 
@@ -865,6 +878,15 @@ namespace
         return std::make_shared<DataTypeTuple>(nested_types);
     }
 
+    template <bool is_json>
+    bool tryReadFloat(Float64 & value, ReadBuffer & buf, const FormatSettings & settings)
+    {
+        if (is_json || settings.try_infer_exponent_floats)
+            return tryReadFloatText(value, buf);
+        return tryReadFloatTextNoExponent(value, buf);
+    }
+
+    template <bool is_json>
     DataTypePtr tryInferNumber(ReadBuffer & buf, const FormatSettings & settings)
     {
         if (buf.eof())
@@ -903,7 +925,7 @@ namespace
                     buf.position() = number_start;
                 }
 
-                if (tryReadFloatText(tmp_float, buf))
+                if (tryReadFloat<is_json>(tmp_float, buf, settings))
                 {
                     if (read_int && buf.position() == int_end)
                         return std::make_shared<DataTypeInt64>();
@@ -937,7 +959,7 @@ namespace
                 peekable_buf.rollbackToCheckpoint(true);
             }
 
-            if (tryReadFloatText(tmp_float, peekable_buf))
+            if (tryReadFloat<is_json>(tmp_float, peekable_buf, settings))
             {
                 /// Float parsing reads no fewer bytes than integer parsing,
                 /// so position of the buffer is either the same, or further.
@@ -949,7 +971,7 @@ namespace
                 return std::make_shared<DataTypeFloat64>();
             }
         }
-        else if (tryReadFloatText(tmp_float, buf))
+        else if (tryReadFloat<is_json>(tmp_float, buf, settings))
         {
             return std::make_shared<DataTypeFloat64>();
         }
@@ -958,15 +980,45 @@ namespace
         return nullptr;
     }
 
+    template <bool is_json>
+    DataTypePtr tryInferNumberFromStringImpl(std::string_view field, const FormatSettings & settings)
+    {
+        ReadBufferFromString buf(field);
+
+        if (settings.try_infer_integers)
+        {
+            Int64 tmp_int;
+            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 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;
+        if (tryReadFloat<is_json>(tmp, buf, settings) && buf.eof())
+            return std::make_shared<DataTypeFloat64>();
+
+        return nullptr;
+    }
+
     template <bool is_json>
     DataTypePtr tryInferString(ReadBuffer & buf, const FormatSettings & settings, JSONInferenceInfo * json_info)
     {
         String field;
         bool ok = true;
         if constexpr (is_json)
-            ok = tryReadJSONStringInto(field, buf);
+            ok = tryReadJSONStringInto(field, buf, settings.json);
         else
-            ok = tryReadQuotedStringInto(field, buf);
+            ok = tryReadQuotedString(field, buf);
 
         if (!ok)
             return nullptr;
@@ -987,7 +1039,7 @@ namespace
         {
             if (settings.json.try_infer_numbers_from_strings)
             {
-                if (auto number_type = tryInferNumberFromString(field, settings))
+                if (auto number_type = tryInferNumberFromStringImpl<true>(field, settings))
                 {
                     json_info->numbers_parsed_from_json_strings.insert(number_type.get());
                     return number_type;
@@ -1002,7 +1054,7 @@ namespace
     {
         if (depth > settings.max_parser_depth)
             throw Exception(ErrorCodes::TOO_DEEP_RECURSION,
-                            "Maximum parse depth ({}) exceeded. Consider raising max_parser_depth setting.", settings.max_parser_depth);
+                "Maximum parse depth ({}) exceeded. Consider raising max_parser_depth setting.", settings.max_parser_depth);
 
         assertChar('{', buf);
         skipWhitespaceIfAny(buf);
@@ -1019,7 +1071,7 @@ namespace
                 first = false;
 
             String key;
-            if (!tryReadJSONStringInto(key, buf))
+            if (!tryReadJSONStringInto(key, buf, settings.json))
                 return false;
 
             skipWhitespaceIfAny(buf);
@@ -1230,7 +1282,7 @@ namespace
         }
 
         /// Number
-        return tryInferNumber(buf, settings);
+        return tryInferNumber<is_json>(buf, settings);
     }
 }
 
@@ -1286,7 +1338,7 @@ void transformFinalInferredJSONTypeIfNeededImpl(DataTypePtr & data_type, const F
             return;
         }
 
-        data_type = json_paths->finalize();
+        data_type = json_paths->finalize(settings.json.use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects);
         transformFinalInferredJSONTypeIfNeededImpl(data_type, settings, json_info, remain_nothing_types);
         return;
     }
@@ -1369,31 +1421,7 @@ void transformFinalInferredJSONTypeIfNeeded(DataTypePtr & data_type, const Forma
 
 DataTypePtr tryInferNumberFromString(std::string_view field, const FormatSettings & settings)
 {
-    ReadBufferFromString buf(field);
-
-    if (settings.try_infer_integers)
-    {
-        Int64 tmp_int;
-        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 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;
-    if (tryReadFloatText(tmp, buf) && buf.eof())
-        return std::make_shared<DataTypeFloat64>();
-
-    return nullptr;
+    return tryInferNumberFromStringImpl<false>(field, settings);
 }
 
 DataTypePtr tryInferDateOrDateTimeFromString(std::string_view field, const FormatSettings & settings)
diff --git a/src/Formats/SchemaInferenceUtils.h b/src/Formats/SchemaInferenceUtils.h
index b492d9b22b6..bcf3d194825 100644
--- a/src/Formats/SchemaInferenceUtils.h
+++ b/src/Formats/SchemaInferenceUtils.h
@@ -3,9 +3,15 @@
 #include <DataTypes/IDataType.h>
 #include <IO/ReadBuffer.h>
 
+#include <vector>
+
 namespace DB
 {
 
+class Block;
+class NamesAndTypesList;
+using NamesAndTypesLists = std::vector<NamesAndTypesList>;
+
 /// Struct with some additional information about inferred types for JSON formats.
 struct JSONInferenceInfo
 {
diff --git a/src/Formats/fuzzers/format_fuzzer.cpp b/src/Formats/fuzzers/format_fuzzer.cpp
index 583d1173a01..46661e4828c 100644
--- a/src/Formats/fuzzers/format_fuzzer.cpp
+++ b/src/Formats/fuzzers/format_fuzzer.cpp
@@ -32,6 +32,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 
         auto initialize = [&]() mutable
         {
+            if (context)
+                return true;
+
             shared_context = Context::createShared();
             context = Context::createGlobal(shared_context.get());
             context->makeGlobalContext();
diff --git a/src/Functions/CMakeLists.txt b/src/Functions/CMakeLists.txt
index a06e898b7c5..733ae25274e 100644
--- a/src/Functions/CMakeLists.txt
+++ b/src/Functions/CMakeLists.txt
@@ -9,6 +9,11 @@ extract_into_parent_list(clickhouse_functions_sources dbms_sources
     FunctionHelpers.cpp
     extractTimeZoneFromFunctionArguments.cpp
     FunctionsLogical.cpp
+    if.cpp
+    multiIf.cpp
+    multiMatchAny.cpp
+    checkHyperscanRegexp.cpp
+    array/has.cpp
     CastOverloadResolver.cpp
 )
 extract_into_parent_list(clickhouse_functions_headers dbms_headers
@@ -32,6 +37,7 @@ list (APPEND PUBLIC_LIBS
         clickhouse_dictionaries_embedded
         clickhouse_parsers
         ch_contrib::consistent_hashing
+        common
         dbms
         ch_contrib::metrohash
         ch_contrib::murmurhash
@@ -137,10 +143,6 @@ list (APPEND OBJECT_LIBS $<TARGET_OBJECTS:clickhouse_functions_extractkeyvaluepa
 # 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)
 
-if (ENABLE_FUZZING)
-    add_compile_definitions(FUZZING_MODE=1)
-endif ()
-
 if (USE_GPERF)
     # Only for regenerating
     add_custom_target(generate-html-char-ref-gperf ./HTMLCharacterReference.sh
diff --git a/src/Functions/CRC.cpp b/src/Functions/CRC.cpp
index ba13fcf78f1..49d6dd6fa52 100644
--- a/src/Functions/CRC.cpp
+++ b/src/Functions/CRC.cpp
@@ -51,7 +51,7 @@ struct CRC32IEEEImpl : public CRCImpl<UInt32, CRC32_IEEE>
     static constexpr auto name = "CRC32IEEE";
 };
 
-struct CRC32ZLIBImpl
+struct CRC32ZLibImpl
 {
     using ReturnType = UInt32;
     static constexpr auto name = "CRC32";
@@ -133,13 +133,14 @@ private:
     }
 };
 
-template <class T>
+template <typename T>
 using FunctionCRC = FunctionStringOrArrayToT<CRCFunctionWrapper<T>, T, typename T::ReturnType>;
+
 // The same as IEEE variant, but uses 0xffffffff as initial value
 // This is the default
 //
-// (And zlib is used here, since it has optimized version)
-using FunctionCRC32ZLIB = FunctionCRC<CRC32ZLIBImpl>;
+// (And ZLib is used here, since it has optimized version)
+using FunctionCRC32ZLib = FunctionCRC<CRC32ZLibImpl>;
 // Uses CRC-32-IEEE 802.3 polynomial
 using FunctionCRC32IEEE = FunctionCRC<CRC32IEEEImpl>;
 // Uses CRC-64-ECMA polynomial
@@ -147,17 +148,11 @@ using FunctionCRC64ECMA = FunctionCRC<CRC64ECMAImpl>;
 
 }
 
-template <class T>
-void registerFunctionCRCImpl(FunctionFactory & factory)
-{
-    factory.registerFunction<T>(T::name, {}, FunctionFactory::CaseInsensitive);
-}
-
 REGISTER_FUNCTION(CRC)
 {
-    registerFunctionCRCImpl<FunctionCRC32ZLIB>(factory);
-    registerFunctionCRCImpl<FunctionCRC32IEEE>(factory);
-    registerFunctionCRCImpl<FunctionCRC64ECMA>(factory);
+    factory.registerFunction<FunctionCRC32ZLib>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCRC32IEEE>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCRC64ECMA>({}, FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/Functions/CastOverloadResolver.cpp b/src/Functions/CastOverloadResolver.cpp
index 7fc46db50f1..0f54ff52ba2 100644
--- a/src/Functions/CastOverloadResolver.cpp
+++ b/src/Functions/CastOverloadResolver.cpp
@@ -1,7 +1,11 @@
 #include <Functions/FunctionFactory.h>
-#include <Functions/FunctionsConversion.h>
 #include <Functions/CastOverloadResolver.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Columns/ColumnString.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -12,69 +16,72 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
+FunctionBasePtr createFunctionBaseCast(
+    ContextPtr context,
+    const char * name,
+    const ColumnsWithTypeAndName & arguments,
+    const DataTypePtr & return_type,
+    std::optional<CastDiagnostic> diagnostic,
+    CastType cast_type);
+
+
 /** CastInternal does not preserve nullability of the data type,
   * i.e. CastInternal(toNullable(toInt8(1)) as Int32) will be Int32(1).
   *
   * Cast preserves nullability according to setting `cast_keep_nullable`,
   * i.e. Cast(toNullable(toInt8(1)) as Int32) will be Nullable(Int32(1)) if `cast_keep_nullable` == 1.
   */
-template <CastType cast_type, bool internal, typename CastName, typename FunctionName>
 class CastOverloadResolverImpl : public IFunctionOverloadResolver
 {
 public:
-    using MonotonicityForRange = FunctionCastBase::MonotonicityForRange;
+    const char * getNameImpl() const
+    {
+        if (cast_type == CastType::accurate)
+            return "accurateCast";
+        if (cast_type == CastType::accurateOrNull)
+            return "accurateCastOrNull";
+        if (internal)
+            return "_CAST";
+        else
+            return "CAST";
+    }
 
-    static constexpr auto name = cast_type == CastType::accurate
-        ? CastName::accurate_cast_name
-        : (cast_type == CastType::accurateOrNull ? CastName::accurate_cast_or_null_name : CastName::cast_name);
-
-    String getName() const override { return name; }
+    String getName() const override
+    {
+        return getNameImpl();
+    }
 
     size_t getNumberOfArguments() const override { return 2; }
 
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
 
-    explicit CastOverloadResolverImpl(ContextPtr context_, std::optional<CastDiagnostic> diagnostic_, bool keep_nullable_, const DataTypeValidationSettings & data_type_validation_settings_)
+    explicit CastOverloadResolverImpl(ContextPtr context_, CastType cast_type_, bool internal_, std::optional<CastDiagnostic> diagnostic_, bool keep_nullable_, const DataTypeValidationSettings & data_type_validation_settings_)
         : context(context_)
+        , cast_type(cast_type_)
+        , internal(internal_)
         , diagnostic(std::move(diagnostic_))
         , keep_nullable(keep_nullable_)
         , data_type_validation_settings(data_type_validation_settings_)
     {
     }
 
-    static FunctionOverloadResolverPtr create(ContextPtr context)
+    static FunctionOverloadResolverPtr create(ContextPtr context, CastType cast_type, bool internal, std::optional<CastDiagnostic> diagnostic)
     {
-        const auto & settings_ref = context->getSettingsRef();
-
-        if constexpr (internal)
-            return createImpl(context, {}, false /*keep_nullable*/);
-
-        return createImpl(context, {}, settings_ref.cast_keep_nullable, DataTypeValidationSettings(settings_ref));
-    }
-
-    static FunctionOverloadResolverPtr createImpl(ContextPtr context, std::optional<CastDiagnostic> diagnostic = {}, bool keep_nullable = false, const DataTypeValidationSettings & data_type_validation_settings = {})
-    {
-        assert(!internal || !keep_nullable);
-        return std::make_unique<CastOverloadResolverImpl>(context, std::move(diagnostic), keep_nullable, data_type_validation_settings);
-    }
-
-    static FunctionOverloadResolverPtr createImpl(std::optional<CastDiagnostic> diagnostic = {}, bool keep_nullable = false, const DataTypeValidationSettings & data_type_validation_settings = {})
-    {
-        assert(!internal || !keep_nullable);
-        return std::make_unique<CastOverloadResolverImpl>(ContextPtr(), std::move(diagnostic), keep_nullable, data_type_validation_settings);
+        if (internal)
+        {
+            return std::make_unique<CastOverloadResolverImpl>(context, cast_type, internal, diagnostic, false /*keep_nullable*/, DataTypeValidationSettings{});
+        }
+        else
+        {
+            const auto & settings_ref = context->getSettingsRef();
+            return std::make_unique<CastOverloadResolverImpl>(context, cast_type, internal, diagnostic, settings_ref.cast_keep_nullable, DataTypeValidationSettings(settings_ref));
+        }
     }
 
 protected:
-
     FunctionBasePtr buildImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type) const override
     {
-        DataTypes data_types(arguments.size());
-
-        for (size_t i = 0; i < arguments.size(); ++i)
-            data_types[i] = arguments[i].type;
-
-        auto monotonicity = MonotonicityHelper::getMonotonicityInformation(arguments.front().type, return_type.get());
-        return std::make_unique<FunctionCast<FunctionName>>(context, name, std::move(monotonicity), data_types, return_type, diagnostic, cast_type);
+        return createFunctionBaseCast(context, getNameImpl(), arguments, return_type, diagnostic, cast_type);
     }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
@@ -92,10 +99,14 @@ protected:
         DataTypePtr type = DataTypeFactory::instance().get(type_col->getValue<String>());
         validateDataType(type, data_type_validation_settings);
 
-        if constexpr (cast_type == CastType::accurateOrNull)
-            return makeNullable(type);
+        if (cast_type == CastType::accurateOrNull)
+        {
+            /// Variant handles NULLs by itself during conversions.
+            if (!isVariant(type))
+                return makeNullable(type);
+        }
 
-        if constexpr (internal)
+        if (internal)
             return type;
 
         if (keep_nullable && arguments.front().type->isNullable() && type->canBeInsideNullable())
@@ -110,55 +121,27 @@ protected:
 
 private:
     ContextPtr context;
+    CastType cast_type;
+    bool internal;
     std::optional<CastDiagnostic> diagnostic;
     bool keep_nullable;
     DataTypeValidationSettings data_type_validation_settings;
 };
 
 
-struct CastOverloadName
-{
-    static constexpr auto cast_name = "CAST";
-    static constexpr auto accurate_cast_name = "accurateCast";
-    static constexpr auto accurate_cast_or_null_name = "accurateCastOrNull";
-};
-
-struct CastInternalOverloadName
-{
-    static constexpr auto cast_name = "_CAST";
-    static constexpr auto accurate_cast_name = "accurate_Cast";
-    static constexpr auto accurate_cast_or_null_name = "accurate_CastOrNull";
-};
-
-template <CastType cast_type>
-using CastOverloadResolver = CastOverloadResolverImpl<cast_type, false, CastOverloadName, CastName>;
-
-template <CastType cast_type>
-using CastInternalOverloadResolver = CastOverloadResolverImpl<cast_type, true, CastInternalOverloadName, CastInternalName>;
-
-
 FunctionOverloadResolverPtr createInternalCastOverloadResolver(CastType type, std::optional<CastDiagnostic> diagnostic)
 {
-    switch (type)
-    {
-        case CastType::nonAccurate:
-            return CastInternalOverloadResolver<CastType::nonAccurate>::createImpl(diagnostic);
-        case CastType::accurate:
-            return CastInternalOverloadResolver<CastType::accurate>::createImpl(diagnostic);
-        case CastType::accurateOrNull:
-            return CastInternalOverloadResolver<CastType::accurateOrNull>::createImpl(diagnostic);
-    }
+    return CastOverloadResolverImpl::create(ContextPtr{}, type, true, diagnostic);
 }
 
-
 REGISTER_FUNCTION(CastOverloadResolvers)
 {
-    factory.registerFunction<CastInternalOverloadResolver<CastType::nonAccurate>>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("_CAST", [](ContextPtr context){ return CastOverloadResolverImpl::create(context, CastType::nonAccurate, true, {}); }, {}, FunctionFactory::CaseInsensitive);
     /// Note: "internal" (not affected by null preserving setting) versions of accurate cast functions are unneeded.
 
-    factory.registerFunction<CastOverloadResolver<CastType::nonAccurate>>({}, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<CastOverloadResolver<CastType::accurate>>();
-    factory.registerFunction<CastOverloadResolver<CastType::accurateOrNull>>();
+    factory.registerFunction("CAST", [](ContextPtr context){ return CastOverloadResolverImpl::create(context, CastType::nonAccurate, false, {}); }, {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("accurateCast", [](ContextPtr context){ return CastOverloadResolverImpl::create(context, CastType::accurate, false, {}); }, {});
+    factory.registerFunction("accurateCastOrNull", [](ContextPtr context){ return CastOverloadResolverImpl::create(context, CastType::accurateOrNull, false, {}); }, {});
 }
 
 }
diff --git a/src/Functions/CountSubstringsImpl.h b/src/Functions/CountSubstringsImpl.h
index 8ba9ee99de8..9ff3e4e1f2a 100644
--- a/src/Functions/CountSubstringsImpl.h
+++ b/src/Functions/CountSubstringsImpl.h
@@ -47,7 +47,7 @@ struct CountSubstringsImpl
         const UInt8 * pos = begin;
 
         /// FIXME: suboptimal
-        memset(&res[0], 0, res.size() * sizeof(res[0]));
+        memset(&res[0], 0, res.size() * sizeof(res[0])); /// NOLINT(readability-container-data-pointer)
 
         if (needle.empty())
             return; // Return all zeros
diff --git a/src/Functions/CustomWeekTransforms.h b/src/Functions/CustomWeekTransforms.h
index b8d25cc30b6..75fb3c32f16 100644
--- a/src/Functions/CustomWeekTransforms.h
+++ b/src/Functions/CustomWeekTransforms.h
@@ -58,7 +58,7 @@ struct CustomWeekTransformImpl
     template <typename Transform>
     static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/, Transform transform = {})
     {
-        const auto op = WeekTransformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform, is_extended_result>{std::move(transform)};
+        const auto op = WeekTransformer<typename FromDataType::FieldType, typename ToDataType::FieldType, Transform, is_extended_result>{transform};
 
         static constexpr UInt8 default_week_mode = 0;
         UInt8 week_mode = default_week_mode;
diff --git a/src/Functions/DateTimeTransforms.cpp b/src/Functions/DateTimeTransforms.cpp
index 7ec13be9d6d..006d1e94ccd 100644
--- a/src/Functions/DateTimeTransforms.cpp
+++ b/src/Functions/DateTimeTransforms.cpp
@@ -10,16 +10,17 @@ namespace ErrorCodes
 
 void throwDateIsNotSupported(const char * name)
 {
-    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type Date of argument for function {}", name);
-}
-
-void throwDateTimeIsNotSupported(const char * name)
-{
-    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type DateTime of argument for function {}", name);
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal argument of type Date for function {}", name);
 }
 
 void throwDate32IsNotSupported(const char * name)
 {
-    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type Date32 of argument for function {}", name);
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal argument of type Date32 for function {}", name);
 }
+
+void throwDateTimeIsNotSupported(const char * name)
+{
+    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal argument of type DateTime for function {}", name);
+}
+
 }
diff --git a/src/Functions/DateTimeTransforms.h b/src/Functions/DateTimeTransforms.h
index 2219708be49..8d70dbea685 100644
--- a/src/Functions/DateTimeTransforms.h
+++ b/src/Functions/DateTimeTransforms.h
@@ -6,10 +6,12 @@
 #include <Common/DateLUTImpl.h>
 #include <Common/DateLUT.h>
 #include <Common/IntervalKind.h>
+#include "base/Decimal.h"
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/ColumnDecimal.h>
+#include <Formats/FormatSettings.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Functions/extractTimeZoneFromFunctionArguments.h>
@@ -21,8 +23,9 @@ namespace DB
 {
 
 static Int64 Int64_max_value = std::numeric_limits<Int64>::max();
-static constexpr auto microsecond_multiplier = 1000000;
-static constexpr auto millisecond_multiplier = 1000;
+static constexpr auto millisecond_multiplier = 1'000;
+static constexpr auto microsecond_multiplier = 1'000'000;
+static constexpr auto nanosecond_multiplier = 1'000'000'000;
 
 static constexpr FormatSettings::DateTimeOverflowBehavior default_date_time_overflow_behavior = FormatSettings::DateTimeOverflowBehavior::Ignore;
 
@@ -55,8 +58,8 @@ constexpr time_t MAX_DATE_TIMESTAMP = 5662310399;       // 2149-06-06 23:59:59 U
 constexpr time_t MAX_DATETIME_DAY_NUM =  49710;               // 2106-02-07
 
 [[noreturn]] void throwDateIsNotSupported(const char * name);
-[[noreturn]] void throwDateTimeIsNotSupported(const char * name);
 [[noreturn]] void throwDate32IsNotSupported(const char * name);
+[[noreturn]] void throwDateTimeIsNotSupported(const char * name);
 
 /// This factor transformation will say that the function is monotone everywhere.
 struct ZeroTransform
@@ -474,7 +477,7 @@ struct ToStartOfInterval;
 static constexpr auto TO_START_OF_INTERVAL_NAME = "toStartOfInterval";
 
 template <>
-struct ToStartOfInterval<IntervalKind::Nanosecond>
+struct ToStartOfInterval<IntervalKind::Kind::Nanosecond>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -482,7 +485,7 @@ struct ToStartOfInterval<IntervalKind::Nanosecond>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32, Int64, const DateLUTImpl &, Int64)
     {
@@ -509,7 +512,7 @@ struct ToStartOfInterval<IntervalKind::Nanosecond>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Microsecond>
+struct ToStartOfInterval<IntervalKind::Kind::Microsecond>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -517,7 +520,7 @@ struct ToStartOfInterval<IntervalKind::Microsecond>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32, Int64, const DateLUTImpl &, Int64)
     {
@@ -539,7 +542,7 @@ struct ToStartOfInterval<IntervalKind::Microsecond>
         {
             Int64 scale_diff = scale_multiplier / static_cast<Int64>(1000000);
             if (t >= 0) [[likely]] /// When we divide the `t` value we should round the result
-                return (t / microseconds + scale_diff / 2) / scale_diff * microseconds;
+                return (t + scale_diff / 2) / (microseconds * scale_diff) * microseconds;
             else
                 return ((t + 1) / microseconds / scale_diff - 1) * microseconds;
         }
@@ -552,7 +555,7 @@ struct ToStartOfInterval<IntervalKind::Microsecond>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Millisecond>
+struct ToStartOfInterval<IntervalKind::Kind::Millisecond>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -560,7 +563,7 @@ struct ToStartOfInterval<IntervalKind::Millisecond>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32, Int64, const DateLUTImpl &, Int64)
     {
@@ -582,7 +585,7 @@ struct ToStartOfInterval<IntervalKind::Millisecond>
         {
             Int64 scale_diff = scale_multiplier / static_cast<Int64>(1000);
             if (t >= 0) [[likely]]  /// When we divide the `t` value we should round the result
-                return (t / milliseconds + scale_diff / 2) / scale_diff * milliseconds;
+                return (t + scale_diff / 2) / (milliseconds * scale_diff) * milliseconds;
             else
                 return ((t + 1) / milliseconds / scale_diff - 1) * milliseconds;
         }
@@ -595,7 +598,7 @@ struct ToStartOfInterval<IntervalKind::Millisecond>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Second>
+struct ToStartOfInterval<IntervalKind::Kind::Second>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -603,7 +606,7 @@ struct ToStartOfInterval<IntervalKind::Second>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32 t, Int64 seconds, const DateLUTImpl & time_zone, Int64)
     {
@@ -616,7 +619,7 @@ struct ToStartOfInterval<IntervalKind::Second>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Minute>
+struct ToStartOfInterval<IntervalKind::Kind::Minute>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -624,7 +627,7 @@ struct ToStartOfInterval<IntervalKind::Minute>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32 t, Int64 minutes, const DateLUTImpl & time_zone, Int64)
     {
@@ -637,7 +640,7 @@ struct ToStartOfInterval<IntervalKind::Minute>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Hour>
+struct ToStartOfInterval<IntervalKind::Kind::Hour>
 {
     static UInt32 execute(UInt16, Int64, const DateLUTImpl &, Int64)
     {
@@ -645,7 +648,7 @@ struct ToStartOfInterval<IntervalKind::Hour>
     }
     static UInt32 execute(Int32, Int64, const DateLUTImpl &, Int64)
     {
-        throwDateIsNotSupported(TO_START_OF_INTERVAL_NAME);
+        throwDate32IsNotSupported(TO_START_OF_INTERVAL_NAME);
     }
     static UInt32 execute(UInt32 t, Int64 hours, const DateLUTImpl & time_zone, Int64)
     {
@@ -658,7 +661,7 @@ struct ToStartOfInterval<IntervalKind::Hour>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Day>
+struct ToStartOfInterval<IntervalKind::Kind::Day>
 {
     static UInt32 execute(UInt16 d, Int64 days, const DateLUTImpl & time_zone, Int64)
     {
@@ -679,7 +682,7 @@ struct ToStartOfInterval<IntervalKind::Day>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Week>
+struct ToStartOfInterval<IntervalKind::Kind::Week>
 {
     static UInt16 execute(UInt16 d, Int64 weeks, const DateLUTImpl & time_zone, Int64)
     {
@@ -708,7 +711,7 @@ struct ToStartOfInterval<IntervalKind::Week>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Month>
+struct ToStartOfInterval<IntervalKind::Kind::Month>
 {
     static UInt16 execute(UInt16 d, Int64 months, const DateLUTImpl & time_zone, Int64)
     {
@@ -741,7 +744,7 @@ struct ToStartOfInterval<IntervalKind::Month>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Quarter>
+struct ToStartOfInterval<IntervalKind::Kind::Quarter>
 {
     static UInt16 execute(UInt16 d, Int64 quarters, const DateLUTImpl & time_zone, Int64)
     {
@@ -770,7 +773,7 @@ struct ToStartOfInterval<IntervalKind::Quarter>
 };
 
 template <>
-struct ToStartOfInterval<IntervalKind::Year>
+struct ToStartOfInterval<IntervalKind::Kind::Year>
 {
     static UInt16 execute(UInt16 d, Int64 years, const DateLUTImpl & time_zone, Int64)
     {
@@ -814,7 +817,7 @@ struct ToTimeImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -839,7 +842,7 @@ struct ToStartOfMinuteImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -886,7 +889,7 @@ struct ToStartOfSecondImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -934,7 +937,7 @@ struct ToStartOfMillisecondImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -978,7 +981,7 @@ struct ToStartOfMicrosecondImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -1016,7 +1019,7 @@ struct ToStartOfNanosecondImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -1041,7 +1044,7 @@ struct ToStartOfFiveMinutesImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -1073,7 +1076,7 @@ struct ToStartOfTenMinutesImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -1105,7 +1108,7 @@ struct ToStartOfFifteenMinutesImpl
     }
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt32 execute(UInt16, const DateLUTImpl &)
     {
@@ -1140,7 +1143,7 @@ struct TimeSlotImpl
 
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
 
     static UInt32 execute(UInt16, const DateLUTImpl &)
@@ -1179,7 +1182,7 @@ struct ToStartOfHourImpl
 
     static UInt32 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
 
     static UInt32 execute(UInt16, const DateLUTImpl &)
@@ -1466,7 +1469,7 @@ struct ToHourImpl
     }
     static UInt8 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt8 execute(UInt16, const DateLUTImpl &)
     {
@@ -1493,7 +1496,7 @@ struct TimezoneOffsetImpl
 
     static time_t execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
 
     static time_t execute(UInt16, const DateLUTImpl &)
@@ -1519,7 +1522,7 @@ struct ToMinuteImpl
     }
     static UInt8 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt8 execute(UInt16, const DateLUTImpl &)
     {
@@ -1544,7 +1547,7 @@ struct ToSecondImpl
     }
     static UInt8 execute(Int32, const DateLUTImpl &)
     {
-        throwDateIsNotSupported(name);
+        throwDate32IsNotSupported(name);
     }
     static UInt8 execute(UInt16, const DateLUTImpl &)
     {
@@ -1555,6 +1558,32 @@ struct ToSecondImpl
     using FactorTransform = ToStartOfMinuteImpl;
 };
 
+struct ToMillisecondImpl
+{
+    static constexpr auto name = "toMillisecond";
+
+    static UInt16 execute(const DateTime64 & datetime64, Int64 scale_multiplier, const DateLUTImpl & time_zone)
+    {
+        return time_zone.toMillisecond(datetime64, scale_multiplier);
+    }
+
+    static UInt16 execute(UInt32, const DateLUTImpl &)
+    {
+        return 0;
+    }
+    static UInt16 execute(Int32, const DateLUTImpl &)
+    {
+        throwDate32IsNotSupported(name);
+    }
+    static UInt16 execute(UInt16, const DateLUTImpl &)
+    {
+        throwDateIsNotSupported(name);
+    }
+    static constexpr bool hasPreimage() { return false; }
+
+    using FactorTransform = ZeroTransform;
+};
+
 struct ToISOYearImpl
 {
     static constexpr auto name = "toISOYear";
@@ -1912,9 +1941,10 @@ struct ToRelativeSubsecondNumImpl
 {
     static constexpr auto name = "toRelativeSubsecondNumImpl";
 
-    static Int64 execute(const DateTime64 & t, DateTime64::NativeType scale, const DateLUTImpl &)
+    static Int64 execute(const DateTime64 & t, const DateTime64::NativeType scale, const DateLUTImpl &)
     {
-        static_assert(scale_multiplier == 1000 || scale_multiplier == 1000000);
+        static_assert(
+            scale_multiplier == millisecond_multiplier || scale_multiplier == microsecond_multiplier || scale_multiplier == nanosecond_multiplier);
         if (scale == scale_multiplier)
             return t.value;
         if (scale > scale_multiplier)
@@ -2040,13 +2070,14 @@ struct DateTimeComponentsWithFractionalPart : public DateLUTImpl::DateTimeCompon
 {
     UInt16  millisecond;
     UInt16  microsecond;
+    UInt16  nanosecond;
 };
 
 struct ToDateTimeComponentsImpl
 {
     static constexpr auto name = "toDateTimeComponents";
 
-    static DateTimeComponentsWithFractionalPart execute(const DateTime64 & t, DateTime64::NativeType scale_multiplier, const DateLUTImpl & time_zone)
+    static DateTimeComponentsWithFractionalPart execute(const DateTime64 & t, const DateTime64::NativeType scale_multiplier, const DateLUTImpl & time_zone)
     {
         auto components = DecimalUtils::splitWithScaleMultiplier(t, scale_multiplier);
 
@@ -2055,28 +2086,33 @@ struct ToDateTimeComponentsImpl
             components.fractional = scale_multiplier + (components.whole ? Int64(-1) : Int64(1)) * components.fractional;
             --components.whole;
         }
-        Int64 fractional = components.fractional;
-        if (scale_multiplier > microsecond_multiplier)
-            fractional = fractional / (scale_multiplier / microsecond_multiplier);
-        else if (scale_multiplier < microsecond_multiplier)
-            fractional = fractional * (microsecond_multiplier / scale_multiplier);
 
-        constexpr Int64 divider = microsecond_multiplier/ millisecond_multiplier;
-        UInt16 millisecond = static_cast<UInt16>(fractional / divider);
-        UInt16 microsecond = static_cast<UInt16>(fractional % divider);
-        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(components.whole), millisecond, microsecond};
+        // Normalize the dividers between microseconds and nanoseconds w.r.t. the scale.
+        Int64 microsecond_divider = (millisecond_multiplier * scale_multiplier) / microsecond_multiplier;
+        Int64 nanosecond_divider = scale_multiplier / microsecond_multiplier;
+
+        // Protect against division by zero for smaller scale multipliers.
+        microsecond_divider = (microsecond_divider ? microsecond_divider : 1);
+        nanosecond_divider = (nanosecond_divider ? nanosecond_divider : 1);
+
+        const Int64 & fractional = components.fractional;
+        UInt16 millisecond = static_cast<UInt16>(fractional / microsecond_divider);
+        UInt16 microsecond = static_cast<UInt16>((fractional % microsecond_divider) / nanosecond_divider);
+        UInt16 nanosecond = static_cast<UInt16>(fractional % nanosecond_divider);
+
+        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(components.whole), millisecond, microsecond, nanosecond};
     }
     static DateTimeComponentsWithFractionalPart execute(UInt32 t, const DateLUTImpl & time_zone)
     {
-        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(static_cast<DateLUTImpl::Time>(t)), 0, 0};
+        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(static_cast<DateLUTImpl::Time>(t)), 0, 0, 0};
     }
     static DateTimeComponentsWithFractionalPart execute(Int32 d, const DateLUTImpl & time_zone)
     {
-        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(ExtendedDayNum(d)), 0, 0};
+        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(ExtendedDayNum(d)), 0, 0, 0};
     }
     static DateTimeComponentsWithFractionalPart execute(UInt16 d, const DateLUTImpl & time_zone)
     {
-        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(DayNum(d)), 0, 0};
+        return DateTimeComponentsWithFractionalPart{time_zone.toDateTimeComponents(DayNum(d)), 0, 0, 0};
     }
 
     using FactorTransform = ZeroTransform;
@@ -2104,7 +2140,6 @@ struct Transformer
                     || std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
                 {
                     bool is_valid_input = vec_from[i] >= 0 && vec_from[i] <= 0xFFFFFFFFL;
-
                     if (!is_valid_input)
                     {
                         if constexpr (std::is_same_v<Additions, DateTimeAccurateOrNullConvertStrategyAdditions>)
diff --git a/src/Functions/EmptyImpl.h b/src/Functions/EmptyImpl.h
index 52484524e6a..d3b2dda024b 100644
--- a/src/Functions/EmptyImpl.h
+++ b/src/Functions/EmptyImpl.h
@@ -35,7 +35,7 @@ struct EmptyImpl
     /// Only make sense if is_fixed_to_constant.
     static void vectorFixedToConstant(const ColumnString::Chars & /*data*/, size_t /*n*/, UInt8 & /*res*/)
     {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: 'vectorFixedToConstant method' is called");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "'vectorFixedToConstant method' is called");
     }
 
     static void vectorFixedToVector(const ColumnString::Chars & data, size_t n, PaddedPODArray<UInt8> & res)
diff --git a/src/Functions/FunctionBase64Conversion.h b/src/Functions/FunctionBase64Conversion.h
index de922747ccd..979c589c64b 100644
--- a/src/Functions/FunctionBase64Conversion.h
+++ b/src/Functions/FunctionBase64Conversion.h
@@ -100,7 +100,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_arguments{
-            {"value", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_arguments);
diff --git a/src/Functions/FunctionBinaryArithmetic.h b/src/Functions/FunctionBinaryArithmetic.h
index 1b2519d1ec5..89ff63995b1 100644
--- a/src/Functions/FunctionBinaryArithmetic.h
+++ b/src/Functions/FunctionBinaryArithmetic.h
@@ -5,54 +5,55 @@
 // sanitizer/asan_interface.h
 #include <memory>
 #include <type_traits>
-#include <base/wide_integer_to_string.h>
 
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnDecimal.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnVector.h>
+#include <Columns/IColumn.h>
+#include <Core/ColumnWithTypeAndName.h>
+#include <Core/ColumnsWithTypeAndName.h>
 #include <Core/DecimalFunctions.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeInterval.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeIPv4andIPv6.h>
+#include <DataTypes/DataTypeInterval.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/IDataType.h>
 #include <DataTypes/Native.h>
 #include <DataTypes/NumberTraits.h>
+#include <DataTypes/getMostSubtype.h>
 #include <Functions/DivisionUtils.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 #include <Functions/IsOperation.h>
 #include <Functions/castTypeToEither.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/castColumn.h>
 #include <base/TypeList.h>
+#include <base/TypeLists.h>
 #include <base/map.h>
+#include <base/types.h>
+#include <base/wide_integer_to_string.h>
+#include <Common/Arena.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
-#include <Common/Arena.h>
-#include <Core/ColumnWithTypeAndName.h>
-#include <base/types.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/IColumn.h>
-#include <Core/ColumnsWithTypeAndName.h>
-#include <DataTypes/IDataType.h>
-#include <DataTypes/getMostSubtype.h>
-#include <base/TypeLists.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <Interpreters/Context.h>
 
 #if USE_EMBEDDED_COMPILER
 #    include <llvm/IR/IRBuilder.h>
@@ -147,11 +148,33 @@ private: /// it's not correct for Decimal
 public:
     static constexpr bool allow_decimal = IsOperation<Operation>::allow_decimal;
 
+    using DecimalResultDataType = Switch<
+        Case<!allow_decimal, InvalidType>,
+        Case<IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType> && UseLeftDecimal<LeftDataType, RightDataType>, LeftDataType>,
+        Case<IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>, RightDataType>,
+        Case<IsDataTypeDecimal<LeftDataType> && IsIntegralOrExtended<RightDataType>, LeftDataType>,
+        Case<IsDataTypeDecimal<RightDataType> && IsIntegralOrExtended<LeftDataType>, RightDataType>,
+
+        /// e.g Decimal +-*/ Float, least(Decimal, Float), greatest(Decimal, Float) = Float64
+        Case<IsDataTypeDecimal<LeftDataType> && IsFloatingPoint<RightDataType>, DataTypeFloat64>,
+        Case<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>,
+        Case<IsDataTypeDecimal<RightDataType> && !IsIntegralOrExtendedOrDecimal<LeftDataType>, InvalidType>>;
+
     /// Appropriate result type for binary operator on numeric types. "Date" can also mean
     /// DateTime, but if both operands are Dates, their type must be the same (e.g. Date - DateTime is invalid).
     using ResultDataType = Switch<
+        /// Result must be Integer
+        Case<IsOperation<Operation>::int_div || IsOperation<Operation>::int_div_or_zero,
+            std::conditional_t<IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType>, DataTypeFromFieldType<typename Op::ResultType>, InvalidType>>,
         /// Decimal cases
-        Case<!allow_decimal && (IsDataTypeDecimal<LeftDataType> || IsDataTypeDecimal<RightDataType>), InvalidType>,
+        Case<IsDataTypeDecimal<LeftDataType> || IsDataTypeDecimal<RightDataType>, DecimalResultDataType>,
         Case<
             IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType> && UseLeftDecimal<LeftDataType, RightDataType>,
             LeftDataType>,
@@ -622,7 +645,11 @@ private:
             if constexpr (op_case == OpCase::RightConstant)
             {
                 if ((*right_nullmap)[0])
+                {
+                    for (size_t i = 0; i < size; ++i)
+                        c[i] = ResultType();
                     return;
+                }
 
                 for (size_t i = 0; i < size; ++i)
                     c[i] = apply_func(undec(a[i]), undec(b));
@@ -647,8 +674,8 @@ private:
                                             IsOperation<Operation>::minus;
     static constexpr bool is_multiply =     IsOperation<Operation>::multiply;
     static constexpr bool is_float_division = IsOperation<Operation>::div_floating;
-    static constexpr bool is_int_division = IsOperation<Operation>::div_int ||
-                                            IsOperation<Operation>::div_int_or_zero;
+    static constexpr bool is_int_division = IsOperation<Operation>::int_div ||
+                                            IsOperation<Operation>::int_div_or_zero;
     static constexpr bool is_division = is_float_division || is_int_division;
     static constexpr bool is_compare =      IsOperation<Operation>::least ||
                                             IsOperation<Operation>::greatest;
@@ -756,8 +783,8 @@ class FunctionBinaryArithmetic : public IFunction
     static constexpr bool is_division = IsOperation<Op>::division;
     static constexpr bool is_bit_hamming_distance = IsOperation<Op>::bit_hamming_distance;
     static constexpr bool is_modulo = IsOperation<Op>::modulo;
-    static constexpr bool is_div_int = IsOperation<Op>::div_int;
-    static constexpr bool is_div_int_or_zero = IsOperation<Op>::div_int_or_zero;
+    static constexpr bool is_int_div = IsOperation<Op>::int_div;
+    static constexpr bool is_int_div_or_zero = IsOperation<Op>::int_div_or_zero;
 
     ContextPtr context;
     bool check_decimal_overflow = true;
@@ -982,11 +1009,11 @@ class FunctionBinaryArithmetic : public IFunction
             {
                 function_name = "tupleModuloByNumber";
             }
-            else if constexpr (is_div_int)
+            else if constexpr (is_int_div)
             {
                 function_name = "tupleIntDivByNumber";
             }
-            else if constexpr (is_div_int_or_zero)
+            else if constexpr (is_int_div_or_zero)
             {
                 function_name = "tupleIntDivOrZeroByNumber";
             }
@@ -1441,7 +1468,7 @@ public:
 
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
     {
-        return ((IsOperation<Op>::div_int || IsOperation<Op>::modulo || IsOperation<Op>::positive_modulo) && !arguments[1].is_const)
+        return ((IsOperation<Op>::int_div || IsOperation<Op>::modulo || IsOperation<Op>::positive_modulo) && !arguments[1].is_const)
             || (IsOperation<Op>::div_floating
                 && (isDecimalOrNullableDecimal(arguments[0].type) || isDecimalOrNullableDecimal(arguments[1].type)));
     }
@@ -1665,7 +1692,9 @@ public:
 
                 if constexpr (!std::is_same_v<ResultDataType, InvalidType>)
                 {
-                    if constexpr (IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>)
+                    if constexpr (is_int_div || is_int_div_or_zero)
+                        type_res = std::make_shared<ResultDataType>();
+                    else if constexpr (IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>)
                     {
                         if constexpr (is_division)
                         {
@@ -1685,13 +1714,19 @@ public:
                         ResultDataType result_type = decimalResultType<is_multiply, is_division>(left, right);
                         type_res = std::make_shared<ResultDataType>(result_type.getPrecision(), result_type.getScale());
                     }
-                    else if constexpr ((IsDataTypeDecimal<LeftDataType> && IsFloatingPoint<RightDataType>) ||
-                        (IsDataTypeDecimal<RightDataType> && IsFloatingPoint<LeftDataType>))
+                    else if constexpr (((IsDataTypeDecimal<LeftDataType> && IsFloatingPoint<RightDataType>) ||
+                        (IsDataTypeDecimal<RightDataType> && IsFloatingPoint<LeftDataType>)))
+                    {
                         type_res = std::make_shared<DataTypeFloat64>();
+                    }
                     else if constexpr (IsDataTypeDecimal<LeftDataType>)
+                    {
                         type_res = std::make_shared<LeftDataType>(left.getPrecision(), left.getScale());
+                    }
                     else if constexpr (IsDataTypeDecimal<RightDataType>)
+                    {
                         type_res = std::make_shared<RightDataType>(right.getPrecision(), right.getScale());
+                    }
                     else if constexpr (std::is_same_v<ResultDataType, DataTypeDateTime>)
                     {
                         // Special case for DateTime: binary OPS should reuse timezone
@@ -2000,6 +2035,7 @@ ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A
         using LeftDataType = std::decay_t<decltype(left)>;
         using RightDataType = std::decay_t<decltype(right)>;
         using ResultDataType = typename BinaryOperationTraits<Op, LeftDataType, RightDataType>::ResultDataType;
+        using DecimalResultType = typename BinaryOperationTraits<Op, LeftDataType, RightDataType>::DecimalResultDataType;
 
         if constexpr (std::is_same_v<ResultDataType, InvalidType>)
             return nullptr;
@@ -2051,6 +2087,35 @@ ColumnPtr executeStringInteger(const ColumnsWithTypeAndName & arguments, const A
                     col_left_size,
                     right_nullmap);
             }
+            /// Here we check if we have `intDiv` or `intDivOrZero` and at least one of the arguments is decimal, because in this case originally we had result as decimal, so we need to convert result into integer after calculations
+            else if constexpr (!decimal_with_float && (is_int_div || is_int_div_or_zero) && (IsDataTypeDecimal<LeftDataType> || IsDataTypeDecimal<RightDataType>))
+            {
+
+                if constexpr (!std::is_same_v<DecimalResultType, InvalidType>)
+                {
+                    DataTypePtr type_res;
+                    if constexpr (IsDataTypeDecimal<LeftDataType> && IsDataTypeDecimal<RightDataType>)
+                    {
+                        DecimalResultType result_type = decimalResultType<is_multiply, is_division>(left, right);
+                        type_res = std::make_shared<DecimalResultType>(result_type.getPrecision(), result_type.getScale());
+                    }
+                    else if constexpr (IsDataTypeDecimal<LeftDataType>)
+                        type_res = std::make_shared<LeftDataType>(left.getPrecision(), left.getScale());
+                    else
+                        type_res = std::make_shared<RightDataType>(right.getPrecision(), right.getScale());
+
+                    auto res = executeNumericWithDecimal<LeftDataType, RightDataType, DecimalResultType>(
+                            left, right,
+                            col_left_const, col_right_const,
+                            col_left, col_right,
+                            col_left_size,
+                            right_nullmap);
+
+                    auto col = ColumnWithTypeAndName(res, type_res, name);
+                    return castColumn(col, std::make_shared<ResultDataType>());
+                }
+                return nullptr;
+            }
             else // can't avoid else and another indentation level, otherwise the compiler would try to instantiate
                  // ColVecResult for Decimals which would lead to a compile error.
             {
@@ -2561,7 +2626,7 @@ public:
         /// Check the case when operation is divide, intDiv or modulo and denominator is Nullable(Something).
         /// For divide operation we should check only Nullable(Decimal), because only this case can throw division by zero error.
         bool division_by_nullable = !arguments[0].type->onlyNull() && !arguments[1].type->onlyNull() && arguments[1].type->isNullable()
-            && (IsOperation<Op>::div_int || IsOperation<Op>::modulo || IsOperation<Op>::positive_modulo
+            && (IsOperation<Op>::int_div || IsOperation<Op>::modulo || IsOperation<Op>::positive_modulo
                 || (IsOperation<Op>::div_floating
                     && (isDecimalOrNullableDecimal(arguments[0].type) || isDecimalOrNullableDecimal(arguments[1].type))));
 
diff --git a/src/Functions/FunctionConstantBase.h b/src/Functions/FunctionConstantBase.h
index ad969268713..9b999af38b6 100644
--- a/src/Functions/FunctionConstantBase.h
+++ b/src/Functions/FunctionConstantBase.h
@@ -13,8 +13,9 @@ class FunctionConstantBase : public IFunction
 {
 public:
     template <typename U>
-    explicit FunctionConstantBase(U && constant_value_, bool is_distributed_ = false)
-        : constant_value(static_cast<T>(std::forward<U>(constant_value_))), is_distributed(is_distributed_)
+    explicit FunctionConstantBase(const U & constant_value_, bool is_distributed_ = false)
+        : constant_value(static_cast<T>(constant_value_))
+        , is_distributed(is_distributed_)
     {
     }
 
diff --git a/src/Functions/FunctionDateOrDateTimeAddInterval.h b/src/Functions/FunctionDateOrDateTimeAddInterval.h
index b8c0d27c42e..f50b1415622 100644
--- a/src/Functions/FunctionDateOrDateTimeAddInterval.h
+++ b/src/Functions/FunctionDateOrDateTimeAddInterval.h
@@ -621,9 +621,9 @@ public:
         }
         else
         {
-            if (!WhichDataType(arguments[0].type).isDateTime())
+            if (!WhichDataType(arguments[0].type).isDateTimeOrDateTime64())
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}. "
-                    "Must be a DateTime", arguments[0].type->getName(), getName());
+                    "Must be a DateTime/DateTime64", arguments[0].type->getName(), getName());
 
             if (!WhichDataType(arguments[2].type).isString())
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of third argument of function {}. "
diff --git a/src/Functions/FunctionFQDN.cpp b/src/Functions/FunctionFQDN.cpp
index b054ff8e1d7..108a96216fd 100644
--- a/src/Functions/FunctionFQDN.cpp
+++ b/src/Functions/FunctionFQDN.cpp
@@ -47,7 +47,7 @@ public:
 REGISTER_FUNCTION(FQDN)
 {
     factory.registerFunction<FunctionFQDN>({}, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionFQDN>("fullHostName");
+    factory.registerAlias("fullHostName", "FQDN");
 }
 
 }
diff --git a/src/Functions/FunctionFactory.cpp b/src/Functions/FunctionFactory.cpp
index 6a7274376b9..004ef745a93 100644
--- a/src/Functions/FunctionFactory.cpp
+++ b/src/Functions/FunctionFactory.cpp
@@ -49,6 +49,18 @@ void FunctionFactory::registerFunction(
     }
 }
 
+void FunctionFactory::registerFunction(
+    const std::string & name,
+    FunctionSimpleCreator creator,
+    FunctionDocumentation doc,
+    CaseSensitiveness case_sensitiveness)
+{
+    registerFunction(name, [my_creator = std::move(creator)](ContextPtr context)
+    {
+        return std::make_unique<FunctionToOverloadResolverAdaptor>(my_creator(context));
+    }, std::move(doc), std::move(case_sensitiveness));
+}
+
 
 FunctionOverloadResolverPtr FunctionFactory::getImpl(
     const std::string & name,
diff --git a/src/Functions/FunctionFactory.h b/src/Functions/FunctionFactory.h
index 588cae64e16..bb43d4719b8 100644
--- a/src/Functions/FunctionFactory.h
+++ b/src/Functions/FunctionFactory.h
@@ -17,6 +17,7 @@ namespace DB
 {
 
 using FunctionCreator = std::function<FunctionOverloadResolverPtr(ContextPtr)>;
+using FunctionSimpleCreator = std::function<FunctionPtr(ContextPtr)>;
 using FunctionFactoryData = std::pair<FunctionCreator, FunctionDocumentation>;
 
 /** Creates function by name.
@@ -34,15 +35,6 @@ public:
         registerFunction<Function>(Function::name, std::move(doc), case_sensitiveness);
     }
 
-    template <typename Function>
-    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
-            registerFunction(name, &Function::create, std::move(doc), case_sensitiveness);
-    }
-
     /// This function is used by YQL - innovative transactional DBMS that depends on ClickHouse by source code.
     std::vector<std::string> getAllNames() const;
 
@@ -66,6 +58,12 @@ public:
         FunctionDocumentation doc = {},
         CaseSensitiveness case_sensitiveness = CaseSensitive);
 
+    void registerFunction(
+        const std::string & name,
+        FunctionSimpleCreator creator,
+        FunctionDocumentation doc = {},
+        CaseSensitiveness case_sensitiveness = CaseSensitive);
+
     FunctionDocumentation getDocumentation(const std::string & name) const;
 
 private:
@@ -74,17 +72,17 @@ private:
     Functions functions;
     Functions case_insensitive_functions;
 
-    template <typename Function>
-    static FunctionOverloadResolverPtr adaptFunctionToOverloadResolver(ContextPtr context)
-    {
-        return std::make_unique<FunctionToOverloadResolverAdaptor>(Function::create(context));
-    }
-
     const Functions & getMap() const override { return functions; }
 
     const Functions & getCaseInsensitiveMap() const override { return case_insensitive_functions; }
 
     String getFactoryName() const override { return "FunctionFactory"; }
+
+    template <typename Function>
+    void registerFunction(const std::string & name, FunctionDocumentation doc = {}, CaseSensitiveness case_sensitiveness = CaseSensitive)
+    {
+        registerFunction(name, &Function::create, std::move(doc), case_sensitiveness);
+    }
 };
 
 const String & getFunctionCanonicalNameIfAny(const String & name);
diff --git a/src/Functions/FunctionHelpers.h b/src/Functions/FunctionHelpers.h
index 5619ebdae49..9f44d3e95c2 100644
--- a/src/Functions/FunctionHelpers.h
+++ b/src/Functions/FunctionHelpers.h
@@ -108,8 +108,10 @@ struct FunctionArgumentDescriptor
 {
     const char * argument_name;
 
-    std::function<bool (const IDataType &)> type_validator_func;
-    std::function<bool (const IColumn &)> column_validator_func;
+    using TypeValidator = bool (*)(const IDataType &);
+    TypeValidator type_validator_func;
+    using ColumnValidator = bool (*)(const IColumn &);
+    ColumnValidator column_validator_func;
 
     const char * expected_type_description;
 
diff --git a/src/Functions/FunctionJoinGet.cpp b/src/Functions/FunctionJoinGet.cpp
index 5602c88c60e..085c4db3f57 100644
--- a/src/Functions/FunctionJoinGet.cpp
+++ b/src/Functions/FunctionJoinGet.cpp
@@ -1,12 +1,13 @@
 #include <Columns/ColumnString.h>
+#include <Core/Block.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/HashJoin.h>
 #include <Functions/IFunction.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/HashJoin.h>
 #include <Storages/StorageJoin.h>
 #include <Storages/TableLockHolder.h>
-#include <Core/Block.h>
 
 
 namespace DB
diff --git a/src/Functions/FunctionSQLJSON.h b/src/Functions/FunctionSQLJSON.h
index 0533f3d419a..37db514fd1f 100644
--- a/src/Functions/FunctionSQLJSON.h
+++ b/src/Functions/FunctionSQLJSON.h
@@ -26,6 +26,7 @@
 
 #include "config.h"
 
+
 namespace DB
 {
 namespace ErrorCodes
@@ -114,8 +115,6 @@ private:
 
 };
 
-class EmptyJSONStringSerializer{};
-
 
 class FunctionSQLJSONHelpers
 {
@@ -124,7 +123,7 @@ public:
     class Executor
     {
     public:
-        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, uint32_t parse_depth, const ContextPtr & context)
+        static ColumnPtr run(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, uint32_t parse_depth, uint32_t parse_backtracks, const ContextPtr & context)
         {
             MutableColumnPtr to{result_type->createColumn()};
             to->reserve(input_rows_count);
@@ -156,27 +155,13 @@ public:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Second argument (JSONPath) must be constant string");
             }
 
-            const ColumnPtr & arg_jsonpath = json_path_column.column;
-            const auto * arg_jsonpath_const = typeid_cast<const ColumnConst *>(arg_jsonpath.get());
-            const auto * arg_jsonpath_string = typeid_cast<const ColumnString *>(arg_jsonpath_const->getDataColumnPtr().get());
-
-            const ColumnPtr & arg_json = json_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());
-
-            /// Get data and offsets for 1 argument (JSONPath)
-            const ColumnString::Chars & chars_path = arg_jsonpath_string->getChars();
-            const ColumnString::Offsets & offsets_path = arg_jsonpath_string->getOffsets();
-
             /// Prepare to parse 1 argument (JSONPath)
-            const char * query_begin = reinterpret_cast<const char *>(&chars_path[0]);
-            const char * query_end = query_begin + offsets_path[0] - 1;
+            String query = typeid_cast<const ColumnConst &>(*json_path_column.column).getValue<String>();
 
-            /// Tokenize query
-            Tokens tokens(query_begin, query_end);
+            /// Tokenize the query
+            Tokens tokens(query.data(), query.data() + query.size());
             /// Max depth 0 indicates that depth is not limited
-            IParser::Pos token_iterator(tokens, parse_depth);
+            IParser::Pos token_iterator(tokens, parse_depth, parse_backtracks);
 
             /// Parse query and create AST tree
             Expected expected;
@@ -188,10 +173,6 @@ public:
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unable to parse JSONPath");
             }
 
-            /// Get data and offsets for 2 argument (JSON)
-            const ColumnString::Chars & chars_json = col_json_string->getChars();
-            const ColumnString::Offsets & offsets_json = col_json_string->getOffsets();
-
             JSONParser json_parser;
             using Element = typename JSONParser::Element;
             Element document;
@@ -200,10 +181,9 @@ public:
             /// Parse JSON for every row
             Impl impl;
             GeneratorJSONPath<JSONParser> generator_json_path(res);
-            for (const auto i : collections::range(0, input_rows_count))
+            for (size_t i = 0; i < input_rows_count; ++i)
             {
-                std::string_view json{
-                    reinterpret_cast<const char *>(&chars_json[offsets_json[i - 1]]), offsets_json[i] - offsets_json[i - 1] - 1};
+                std::string_view json = json_column.column->getDataAt(i).toView();
                 document_ok = json_parser.parse(json, document);
 
                 bool added_to_column = false;
@@ -252,16 +232,17 @@ public:
         /// 3. Parser(Tokens, ASTPtr) -> complete AST
         /// 4. Execute functions: call getNextItem on generator and handle each item
         unsigned parse_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+        unsigned parse_backtracks = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_backtracks);
 #if USE_SIMDJSON
         if (getContext()->getSettingsRef().allow_simdjson)
             return FunctionSQLJSONHelpers::Executor<
                 Name,
                 Impl<SimdJSONParser, JSONStringSerializer<SimdJSONParser::Element, SimdJSONElementFormatter>>,
-                SimdJSONParser>::run(arguments, result_type, input_rows_count, parse_depth, getContext());
+                SimdJSONParser>::run(arguments, result_type, input_rows_count, parse_depth, parse_backtracks, getContext());
 #endif
         return FunctionSQLJSONHelpers::
             Executor<Name, Impl<DummyJSONParser, DefaultJSONStringSerializer<DummyJSONParser::Element>>, DummyJSONParser>::run(
-                arguments, result_type, input_rows_count, parse_depth, getContext());
+                arguments, result_type, input_rows_count, parse_depth, parse_backtracks, getContext());
     }
 };
 
diff --git a/src/Functions/FunctionStringReplace.h b/src/Functions/FunctionStringReplace.h
index 4d723a5632c..aee04a5969a 100644
--- a/src/Functions/FunctionStringReplace.h
+++ b/src/Functions/FunctionStringReplace.h
@@ -35,9 +35,9 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"},
-            {"pattern", &isString<IDataType>, nullptr, "String"},
-            {"replacement", &isString<IDataType>, nullptr, "String"}
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"},
+            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+            {"replacement", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, args);
diff --git a/src/Functions/FunctionTokens.h b/src/Functions/FunctionTokens.h
index 5c4e582c637..c80152bc71d 100644
--- a/src/Functions/FunctionTokens.h
+++ b/src/Functions/FunctionTokens.h
@@ -74,6 +74,8 @@ public:
 
     size_t getNumberOfArguments() const override { return Generator::getNumberOfArguments(); }
 
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return Generator::getArgumentsThatAreAlwaysConstant(); }
+
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         Generator::checkArguments(*this, arguments);
@@ -184,12 +186,12 @@ static inline void checkArgumentsWithSeparatorAndOptionalMaxSubstrings(
     const IFunction & func, const ColumnsWithTypeAndName & arguments)
 {
     FunctionArgumentDescriptors mandatory_args{
-        {"separator", &isString<IDataType>, isColumnConst, "const String"},
-        {"s", &isString<IDataType>, nullptr, "String"}
+        {"separator", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"},
+        {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
     };
 
     FunctionArgumentDescriptors optional_args{
-        {"max_substrings", &isNativeInteger<IDataType>, isColumnConst, "const Number"},
+        {"max_substrings", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), isColumnConst, "const Number"},
     };
 
     validateFunctionArgumentTypes(func, arguments, mandatory_args, optional_args);
@@ -198,11 +200,11 @@ static inline void checkArgumentsWithSeparatorAndOptionalMaxSubstrings(
 static inline void checkArgumentsWithOptionalMaxSubstrings(const IFunction & func, const ColumnsWithTypeAndName & arguments)
 {
     FunctionArgumentDescriptors mandatory_args{
-        {"s", &isString<IDataType>, nullptr, "String"},
+        {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
     };
 
     FunctionArgumentDescriptors optional_args{
-        {"max_substrings", &isNativeInteger<IDataType>, isColumnConst, "const Number"},
+        {"max_substrings", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), isColumnConst, "const Number"},
     };
 
     validateFunctionArgumentTypes(func, arguments, mandatory_args, optional_args);
diff --git a/src/Functions/FunctionUnixTimestamp64.h b/src/Functions/FunctionUnixTimestamp64.h
index d74237afd77..53421a565cb 100644
--- a/src/Functions/FunctionUnixTimestamp64.h
+++ b/src/Functions/FunctionUnixTimestamp64.h
@@ -45,7 +45,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"value", &isDateTime64<IDataType>, nullptr, "DateTime64"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isDateTime64), nullptr, "DateTime64"}
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/FunctionsAES.h b/src/Functions/FunctionsAES.h
index 4792c997f51..3bb264dfaec 100644
--- a/src/Functions/FunctionsAES.h
+++ b/src/Functions/FunctionsAES.h
@@ -96,7 +96,7 @@ inline void validateCipherMode(const EVP_CIPHER * evp_cipher)
 {
     if constexpr (compatibility_mode == CompatibilityMode::MySQL)
     {
-        switch (EVP_CIPHER_mode(evp_cipher))
+        switch (EVP_CIPHER_mode(evp_cipher)) /// NOLINT(bugprone-switch-missing-default-case)
         {
             case EVP_CIPH_ECB_MODE: [[fallthrough]];
             case EVP_CIPH_CBC_MODE: [[fallthrough]];
@@ -107,7 +107,7 @@ inline void validateCipherMode(const EVP_CIPHER * evp_cipher)
     }
     else if constexpr (compatibility_mode == CompatibilityMode::OpenSSL)
     {
-        switch (EVP_CIPHER_mode(evp_cipher))
+        switch (EVP_CIPHER_mode(evp_cipher)) /// NOLINT(bugprone-switch-missing-default-case)
         {
             case EVP_CIPH_ECB_MODE: [[fallthrough]];
             case EVP_CIPH_CBC_MODE: [[fallthrough]];
@@ -154,21 +154,21 @@ private:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         auto optional_args = FunctionArgumentDescriptors{
-            {"IV", &isStringOrFixedString<IDataType>, nullptr, "Initialization vector binary string"},
+            {"IV", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "Initialization vector binary string"},
         };
 
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::OpenSSL)
         {
             optional_args.emplace_back(FunctionArgumentDescriptor{
-                "AAD", &isStringOrFixedString<IDataType>, nullptr, "Additional authenticated data binary string for GCM mode"
+                "AAD", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "Additional authenticated data binary string for GCM mode"
             });
         }
 
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
-                {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "encryption mode string"},
-                {"input", &isStringOrFixedString<IDataType>, {}, "plaintext"},
-                {"key", &isStringOrFixedString<IDataType>, {}, "encryption key binary string"},
+                {"mode", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), isColumnConst, "encryption mode string"},
+                {"input", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), {}, "plaintext"},
+                {"key", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), {}, "encryption key binary string"},
             },
             optional_args
         );
@@ -425,21 +425,21 @@ private:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         auto optional_args = FunctionArgumentDescriptors{
-            {"IV", &isStringOrFixedString<IDataType>, nullptr, "Initialization vector binary string"},
+            {"IV", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "Initialization vector binary string"},
         };
 
         if constexpr (compatibility_mode == OpenSSLDetails::CompatibilityMode::OpenSSL)
         {
             optional_args.emplace_back(FunctionArgumentDescriptor{
-                "AAD", &isStringOrFixedString<IDataType>, nullptr, "Additional authenticated data binary string for GCM mode"
+                "AAD", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "Additional authenticated data binary string for GCM mode"
             });
         }
 
         validateFunctionArgumentTypes(*this, arguments,
             FunctionArgumentDescriptors{
-                {"mode", &isStringOrFixedString<IDataType>, isColumnConst, "decryption mode string"},
-                {"input", &isStringOrFixedString<IDataType>, {}, "ciphertext"},
-                {"key", &isStringOrFixedString<IDataType>, {}, "decryption key binary string"},
+                {"mode", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), isColumnConst, "decryption mode string"},
+                {"input", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), {}, "ciphertext"},
+                {"key", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), {}, "decryption key binary string"},
             },
             optional_args
         );
diff --git a/src/Functions/FunctionsBitmap.h b/src/Functions/FunctionsBitmap.h
index 801f2ccd012..22d46fa7728 100644
--- a/src/Functions/FunctionsBitmap.h
+++ b/src/Functions/FunctionsBitmap.h
@@ -519,12 +519,12 @@ public:
                                        "but one of them has type {}.", getName(), arguments[i + 1]->getName());
 
             if (!array_type)
-                throw exception;
+                throw exception; /// NOLINT
 
             auto nested_type = array_type->getNestedType();
             WhichDataType which(nested_type);
             if (!(which.isUInt8() || which.isUInt16() || which.isUInt32() || which.isUInt64()))
-                throw exception;
+                throw exception; /// NOLINT
         }
         return arguments[0];
     }
diff --git a/src/Functions/FunctionsCodingULID.cpp b/src/Functions/FunctionsCodingULID.cpp
index 1d426ee464a..ff040945a15 100644
--- a/src/Functions/FunctionsCodingULID.cpp
+++ b/src/Functions/FunctionsCodingULID.cpp
@@ -45,7 +45,7 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
diff --git a/src/Functions/FunctionsComparison.h b/src/Functions/FunctionsComparison.h
index 446d6c008f0..57aebc11da0 100644
--- a/src/Functions/FunctionsComparison.h
+++ b/src/Functions/FunctionsComparison.h
@@ -283,7 +283,7 @@ struct StringComparisonImpl
         size_t size = a_data.size();
 
         for (size_t i = 0, j = 0; i < size; i += 16, ++j)
-            c[j] = Op::apply(memcmp16(&a_data[i], &b_data[0]), 0);
+            c[j] = Op::apply(memcmp16(&a_data[i], &b_data[0]), 0); /// NOLINT(readability-container-data-pointer)
     }
 
     static void NO_INLINE fixed_string_vector_fixed_string_vector( /// NOLINT
@@ -643,13 +643,12 @@ class FunctionComparison : public IFunction
 {
 public:
     static constexpr auto name = Name::name;
-    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionComparison>(context); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionComparison>(decimalCheckComparisonOverflow(context)); }
 
-    explicit FunctionComparison(ContextPtr context_)
-        : context(context_), check_decimal_overflow(decimalCheckComparisonOverflow(context)) {}
+    explicit FunctionComparison(bool check_decimal_overflow_)
+        : check_decimal_overflow(check_decimal_overflow_) {}
 
 private:
-    ContextPtr context;
     bool check_decimal_overflow = true;
 
     template <typename T0, typename T1>
@@ -812,7 +811,7 @@ private:
                 c0_const_size = c0_const_fixed_string->getN();
             }
             else
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Logical error: ColumnConst contains not String nor FixedString column");
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "ColumnConst contains not String nor FixedString column");
         }
 
         if (c1_const)
@@ -831,7 +830,7 @@ private:
                 c1_const_size = c1_const_fixed_string->getN();
             }
             else
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Logical error: ColumnConst contains not String nor FixedString column");
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "ColumnConst contains not String nor FixedString column");
         }
 
         using StringImpl = StringComparisonImpl<Op<int, int>>;
@@ -1115,7 +1114,7 @@ private:
         /// This is a paranoid check to protect from a broken query analysis.
         if (c0->isNullable() != c1->isNullable())
             throw Exception(ErrorCodes::LOGICAL_ERROR,
-                "Logical error: columns are assumed to be of identical types, but they are different in Nullable");
+                "Columns are assumed to be of identical types, but they are different in Nullable");
 
         if (c0_const && c1_const)
         {
@@ -1190,7 +1189,7 @@ public:
 
         if (left_tuple && right_tuple)
         {
-            auto func = FunctionToOverloadResolverAdaptor(FunctionComparison<Op, Name>::create(context));
+            auto func = FunctionToOverloadResolverAdaptor(std::make_shared<FunctionComparison<Op, Name>>(check_decimal_overflow));
 
             bool has_nullable = false;
             bool has_null = false;
diff --git a/src/Functions/FunctionsConversion.cpp b/src/Functions/FunctionsConversion.cpp
index 01e057e19a1..5e072d406ad 100644
--- a/src/Functions/FunctionsConversion.cpp
+++ b/src/Functions/FunctionsConversion.cpp
@@ -1,10 +1,4870 @@
+#include <type_traits>
+
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnObject.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnStringHelpers.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnsCommon.h>
+#include <Core/AccurateComparison.h>
+#include <Core/Types.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeIPv4andIPv6.h>
+#include <DataTypes/DataTypeInterval.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeNested.h>
+#include <DataTypes/DataTypeNothing.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeObject.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeUUID.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/ObjectUtils.h>
+#include <DataTypes/Serializations/SerializationDecimal.h>
+#include <Formats/FormatSettings.h>
+#include <Functions/CastOverloadResolver.h>
+#include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionFactory.h>
-#include <Functions/FunctionsConversion.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionsCodingIP.h>
+#include <Functions/IFunctionAdaptors.h>
+#include <Functions/TransformDateTime64.h>
+#include <Functions/castTypeToEither.h>
+#include <Functions/toFixedString.h>
+#include <IO/Operators.h>
+#include <IO/ReadBufferFromMemory.h>
+#include <IO/WriteBufferFromVector.h>
+#include <IO/parseDateTimeBestEffort.h>
+#include <Interpreters/Context.h>
+#include <Common/Concepts.h>
+#include <Common/CurrentThread.h>
+#include <Common/Exception.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/IPv6ToBinary.h>
+#include <Common/assert_cast.h>
+#include <Common/quoteString.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int ATTEMPT_TO_READ_AFTER_EOF;
+    extern const int CANNOT_PARSE_NUMBER;
+    extern const int CANNOT_READ_ARRAY_FROM_TEXT;
+    extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
+    extern const int CANNOT_PARSE_QUOTED_STRING;
+    extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
+    extern const int CANNOT_PARSE_DATE;
+    extern const int CANNOT_PARSE_DATETIME;
+    extern const int CANNOT_PARSE_TEXT;
+    extern const int CANNOT_PARSE_UUID;
+    extern const int CANNOT_PARSE_IPV4;
+    extern const int CANNOT_PARSE_IPV6;
+    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
+    extern const int LOGICAL_ERROR;
+    extern const int TYPE_MISMATCH;
+    extern const int CANNOT_CONVERT_TYPE;
+    extern const int ILLEGAL_COLUMN;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NOT_IMPLEMENTED;
+    extern const int CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN;
+    extern const int VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE;
+}
+
+namespace
+{
+
+/** Type conversion functions.
+  * toType - conversion in "natural way";
+  */
+
+UInt32 extractToDecimalScale(const ColumnWithTypeAndName & named_column)
+{
+    const auto * arg_type = named_column.type.get();
+    bool ok = checkAndGetDataType<DataTypeUInt64>(arg_type)
+        || checkAndGetDataType<DataTypeUInt32>(arg_type)
+        || checkAndGetDataType<DataTypeUInt16>(arg_type)
+        || checkAndGetDataType<DataTypeUInt8>(arg_type);
+    if (!ok)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type of toDecimal() scale {}", named_column.type->getName());
+
+    Field field;
+    named_column.column->get(0, field);
+    return static_cast<UInt32>(field.get<UInt32>());
+}
+
+
+/** Conversion of Date to DateTime: adding 00:00:00 time component.
+  */
+template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior>
+struct ToDateTimeImpl
+{
+    static constexpr auto name = "toDateTime";
+
+    static UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (d > MAX_DATETIME_DAY_NUM) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Day number {} is out of bounds of type DateTime", d);
+        }
+        else if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
+        {
+            if (d > MAX_DATETIME_DAY_NUM)
+                d = MAX_DATETIME_DAY_NUM;
+        }
+        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)));
+    }
+
+    static UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
+        {
+            if (d < 0)
+                return 0;
+            else if (d > MAX_DATETIME_DAY_NUM)
+                d = MAX_DATETIME_DAY_NUM;
+        }
+        else if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (d < 0 || d > MAX_DATETIME_DAY_NUM) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type DateTime", d);
+        }
+        return static_cast<UInt32>(time_zone.fromDayNum(ExtendedDayNum(d)));
+    }
+
+    static UInt32 execute(UInt32 dt, const DateLUTImpl & /*time_zone*/)
+    {
+        return dt;
+    }
+
+    static UInt32 execute(Int64 dt64, const DateLUTImpl & /*time_zone*/)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Ignore)
+            return static_cast<UInt32>(dt64);
+        else
+        {
+            if (dt64 < 0 || dt64 >= MAX_DATETIME_TIMESTAMP)
+            {
+                if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
+                    return dt64 < 0 ? 0 : std::numeric_limits<UInt32>::max();
+                else
+                    throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type DateTime", dt64);
+            }
+            else
+                return static_cast<UInt32>(dt64);
+        }
+    }
+};
+
+
+/// Implementation of toDate function.
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTransform32Or64
+{
+    static constexpr auto name = "toDate";
+
+    static NO_SANITIZE_UNDEFINED UInt16 execute(const FromType & from, const DateLUTImpl & time_zone)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
+        }
+        /// if value is smaller (or equal) than maximum day value for Date, than treat it as day num,
+        /// otherwise treat it as unix timestamp. This is a bit weird, but we leave this behavior.
+        if (from <= DATE_LUT_MAX_DAY_NUM)
+            return from;
+        else
+            return time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
+    }
+};
+
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTransform32Or64Signed
+{
+    static constexpr auto name = "toDate";
+
+    static NO_SANITIZE_UNDEFINED UInt16 execute(const FromType & from, const DateLUTImpl & time_zone)
+    {
+        // TODO: decide narrow or extended range based on FromType
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from < 0 || from > MAX_DATE_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
+        }
+        else
+        {
+            if (from < 0)
+                return 0;
+        }
+        return (from <= DATE_LUT_MAX_DAY_NUM)
+            ? static_cast<UInt16>(from)
+            : time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATE_TIMESTAMP)));
+    }
+};
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTransform8Or16Signed
+{
+    static constexpr auto name = "toDate";
+
+    static NO_SANITIZE_UNDEFINED UInt16 execute(const FromType & from, const DateLUTImpl &)
+    {
+        if (from < 0)
+        {
+            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
+            else
+                return 0;
+        }
+        return from;
+    }
+};
+
+/// Implementation of toDate32 function.
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDate32Transform32Or64
+{
+    static constexpr auto name = "toDate32";
+
+    static NO_SANITIZE_UNDEFINED Int32 execute(const FromType & from, const DateLUTImpl & time_zone)
+    {
+        if (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
+        {
+            return static_cast<Int32>(from);
+        }
+        else
+        {
+            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+            {
+                if (from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
+                    throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type Date32", from);
+            }
+            return time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATETIME64_TIMESTAMP)));
+        }
+    }
+};
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDate32Transform32Or64Signed
+{
+    static constexpr auto name = "toDate32";
+
+    static NO_SANITIZE_UNDEFINED Int32 execute(const FromType & from, const DateLUTImpl & time_zone)
+    {
+        static const Int32 daynum_min_offset = -static_cast<Int32>(DateLUTImpl::getDayNumOffsetEpoch());
+
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from < daynum_min_offset || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type Date32", from);
+        }
+
+        if (from < daynum_min_offset)
+            return daynum_min_offset;
+
+        return (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
+            ? static_cast<Int32>(from)
+            : time_zone.toDayNum(std::min(time_t(Int64(from)), time_t(MAX_DATETIME64_TIMESTAMP)));
+    }
+};
+
+template <typename FromType>
+struct ToDate32Transform8Or16Signed
+{
+    static constexpr auto name = "toDate32";
+
+    static NO_SANITIZE_UNDEFINED Int32 execute(const FromType & from, const DateLUTImpl &)
+    {
+        return from;
+    }
+};
+
+template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTimeTransform64
+{
+    static constexpr auto name = "toDateTime";
+
+    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
+        }
+        return static_cast<ToType>(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
+    }
+};
+
+template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTimeTransformSigned
+{
+    static constexpr auto name = "toDateTime";
+
+    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
+    {
+        if (from < 0)
+        {
+            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
+            else
+                return 0;
+        }
+        return from;
+    }
+};
+
+template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTimeTransform64Signed
+{
+    static constexpr auto name = "toDateTime";
+
+    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from < 0 || from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
+        }
+
+        if (from < 0)
+            return 0;
+        return static_cast<ToType>(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
+    }
+};
+
+/** Conversion of numeric to DateTime64
+  */
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTime64TransformUnsigned
+{
+    static constexpr auto name = "toDateTime64";
+
+    const DateTime64::NativeType scale_multiplier;
+
+    ToDateTime64TransformUnsigned(UInt32 scale) /// NOLINT
+        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
+    {}
+
+    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
+            else
+                return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
+        }
+        else
+            return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(std::min<time_t>(from, MAX_DATETIME64_TIMESTAMP), 0, scale_multiplier);
+    }
+};
+
+template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTime64TransformSigned
+{
+    static constexpr auto name = "toDateTime64";
+
+    const DateTime64::NativeType scale_multiplier;
+
+    ToDateTime64TransformSigned(UInt32 scale) /// NOLINT
+        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
+    {}
+
+    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from < MIN_DATETIME64_TIMESTAMP || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
+        }
+        from = static_cast<FromType>(std::max<time_t>(from, MIN_DATETIME64_TIMESTAMP));
+        from = static_cast<FromType>(std::min<time_t>(from, MAX_DATETIME64_TIMESTAMP));
+
+        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
+    }
+};
+
+template <typename FromDataType, typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct ToDateTime64TransformFloat
+{
+    static constexpr auto name = "toDateTime64";
+
+    const UInt32 scale;
+
+    ToDateTime64TransformFloat(UInt32 scale_) /// NOLINT
+        : scale(scale_)
+    {}
+
+    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
+    {
+        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
+        {
+            if (from < MIN_DATETIME64_TIMESTAMP || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
+                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
+        }
+
+        from = std::max(from, static_cast<FromType>(MIN_DATETIME64_TIMESTAMP));
+        from = std::min(from, static_cast<FromType>(MAX_DATETIME64_TIMESTAMP));
+        return convertToDecimal<FromDataType, DataTypeDateTime64>(from, scale);
+    }
+};
+
+struct ToDateTime64Transform
+{
+    static constexpr auto name = "toDateTime64";
+
+    const DateTime64::NativeType scale_multiplier;
+
+    ToDateTime64Transform(UInt32 scale) /// NOLINT
+        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
+    {}
+
+    DateTime64::NativeType execute(UInt16 d, const DateLUTImpl & time_zone) const
+    {
+        const auto dt = ToDateTimeImpl<>::execute(d, time_zone);
+        return execute(dt, time_zone);
+    }
+
+    DateTime64::NativeType execute(Int32 d, const DateLUTImpl & time_zone) const
+    {
+        Int64 dt = static_cast<Int64>(time_zone.fromDayNum(ExtendedDayNum(d)));
+        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
+    }
+
+    DateTime64::NativeType execute(UInt32 dt, const DateLUTImpl & /*time_zone*/) const
+    {
+        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
+    }
+};
+
+/** Transformation of numbers, dates, datetimes to strings: through formatting.
+  */
+template <typename DataType>
+struct FormatImpl
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const typename DataType::FieldType x, WriteBuffer & wb, const DataType *, const DateLUTImpl *)
+    {
+        writeText(x, wb);
+        return ReturnType(true);
+    }
+};
+
+template <>
+struct FormatImpl<DataTypeDate>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const DataTypeDate::FieldType x, WriteBuffer & wb, const DataTypeDate *, const DateLUTImpl * time_zone)
+    {
+        writeDateText(DayNum(x), wb, *time_zone);
+        return ReturnType(true);
+    }
+};
+
+template <>
+struct FormatImpl<DataTypeDate32>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const DataTypeDate32::FieldType x, WriteBuffer & wb, const DataTypeDate32 *, const DateLUTImpl * time_zone)
+    {
+        writeDateText(ExtendedDayNum(x), wb, *time_zone);
+        return ReturnType(true);
+    }
+};
+
+template <>
+struct FormatImpl<DataTypeDateTime>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const DataTypeDateTime::FieldType x, WriteBuffer & wb, const DataTypeDateTime *, const DateLUTImpl * time_zone)
+    {
+        writeDateTimeText(x, wb, *time_zone);
+        return ReturnType(true);
+    }
+};
+
+template <>
+struct FormatImpl<DataTypeDateTime64>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const DataTypeDateTime64::FieldType x, WriteBuffer & wb, const DataTypeDateTime64 * type, const DateLUTImpl * time_zone)
+    {
+        writeDateTimeText(DateTime64(x), type->getScale(), wb, *time_zone);
+        return ReturnType(true);
+    }
+};
+
+
+template <typename FieldType>
+struct FormatImpl<DataTypeEnum<FieldType>>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const FieldType x, WriteBuffer & wb, const DataTypeEnum<FieldType> * type, const DateLUTImpl *)
+    {
+        static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+        if constexpr (throw_exception)
+        {
+            writeString(type->getNameForValue(x), wb);
+        }
+        else
+        {
+            StringRef res;
+            bool is_ok = type->getNameForValue(x, res);
+            if (is_ok)
+                writeString(res, wb);
+            return ReturnType(is_ok);
+        }
+    }
+};
+
+template <typename FieldType>
+struct FormatImpl<DataTypeDecimal<FieldType>>
+{
+    template <typename ReturnType = void>
+    static ReturnType execute(const FieldType x, WriteBuffer & wb, const DataTypeDecimal<FieldType> * type, const DateLUTImpl *)
+    {
+        writeText(x, type->getScale(), wb, false);
+        return ReturnType(true);
+    }
+};
+
+ColumnUInt8::MutablePtr copyNullMap(ColumnPtr col)
+{
+    ColumnUInt8::MutablePtr null_map = nullptr;
+    if (const auto * col_nullable = checkAndGetColumn<ColumnNullable>(col.get()))
+    {
+        null_map = ColumnUInt8::create();
+        null_map->insertRangeFrom(col_nullable->getNullMapColumn(), 0, col_nullable->size());
+    }
+    return null_map;
+}
+
+
+/// Generic conversion of any type to String or FixedString via serialization to text.
+template <typename StringColumnType>
+struct ConvertImplGenericToString
+{
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/)
+    {
+        static_assert(std::is_same_v<StringColumnType, ColumnString> || std::is_same_v<StringColumnType, ColumnFixedString>,
+                "Can be used only to serialize to ColumnString or ColumnFixedString");
+
+        ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
+
+        const auto & col_with_type_and_name = columnGetNested(arguments[0]);
+        const IDataType & type = *col_with_type_and_name.type;
+        const IColumn & col_from = *col_with_type_and_name.column;
+
+        size_t size = col_from.size();
+        auto col_to = removeNullable(result_type)->createColumn();
+
+        {
+            ColumnStringHelpers::WriteHelper write_helper(
+                    assert_cast<StringColumnType &>(*col_to),
+                    size);
+
+            auto & write_buffer = write_helper.getWriteBuffer();
+
+            FormatSettings format_settings;
+            auto serialization = type.getDefaultSerialization();
+            for (size_t row = 0; row < size; ++row)
+            {
+                serialization->serializeText(col_from, row, write_buffer, format_settings);
+                write_helper.rowWritten();
+            }
+
+            write_helper.finalize();
+        }
+
+        if (result_type->isNullable() && null_map)
+            return ColumnNullable::create(std::move(col_to), std::move(null_map));
+        return col_to;
+    }
+};
+
+/** Conversion of time_t to UInt16, Int32, UInt32
+  */
+template <typename DataType>
+void convertFromTime(typename DataType::FieldType & x, time_t & time)
+{
+    x = time;
+}
+
+template <>
+inline void convertFromTime<DataTypeDateTime>(DataTypeDateTime::FieldType & x, time_t & time)
+{
+    if (unlikely(time < 0))
+        x = 0;
+    else if (unlikely(time > MAX_DATETIME_TIMESTAMP))
+        x = MAX_DATETIME_TIMESTAMP;
+    else
+        x = static_cast<UInt32>(time);
+}
+
+/** Conversion of strings to numbers, dates, datetimes: through parsing.
+  */
+template <typename DataType>
+void parseImpl(typename DataType::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool precise_float_parsing)
+{
+    if constexpr (std::is_floating_point_v<typename DataType::FieldType>)
+    {
+        if (precise_float_parsing)
+            readFloatTextPrecise(x, rb);
+        else
+            readFloatTextFast(x, rb);
+    }
+    else
+        readText(x, rb);
+}
+
+template <>
+inline void parseImpl<DataTypeDate>(DataTypeDate::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    DayNum tmp(0);
+    readDateText(tmp, rb, *time_zone);
+    x = tmp;
+}
+
+template <>
+inline void parseImpl<DataTypeDate32>(DataTypeDate32::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    ExtendedDayNum tmp(0);
+    readDateText(tmp, rb, *time_zone);
+    x = tmp;
+}
+
+
+// NOTE: no need of extra overload of DateTime64, since readDateTimeText64 has different signature and that case is explicitly handled in the calling code.
+template <>
+inline void parseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    time_t time = 0;
+    readDateTimeText(time, rb, *time_zone);
+    convertFromTime<DataTypeDateTime>(x, time);
+}
+
+template <>
+inline void parseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    UUID tmp;
+    readUUIDText(tmp, rb);
+    x = tmp.toUnderType();
+}
+
+template <>
+inline void parseImpl<DataTypeIPv4>(DataTypeIPv4::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    IPv4 tmp;
+    readIPv4Text(tmp, rb);
+    x = tmp.toUnderType();
+}
+
+template <>
+inline void parseImpl<DataTypeIPv6>(DataTypeIPv6::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    IPv6 tmp;
+    readIPv6Text(tmp, rb);
+    x = tmp;
+}
+
+template <typename DataType>
+bool tryParseImpl(typename DataType::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool precise_float_parsing)
+{
+    if constexpr (std::is_floating_point_v<typename DataType::FieldType>)
+    {
+        if (precise_float_parsing)
+            return tryReadFloatTextPrecise(x, rb);
+        else
+            return tryReadFloatTextFast(x, rb);
+    }
+    else /*if constexpr (is_integer_v<typename DataType::FieldType>)*/
+        return tryReadIntText(x, rb);
+}
+
+template <>
+inline bool tryParseImpl<DataTypeDate>(DataTypeDate::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    DayNum tmp(0);
+    if (!tryReadDateText(tmp, rb, *time_zone))
+        return false;
+    x = tmp;
+    return true;
+}
+
+template <>
+inline bool tryParseImpl<DataTypeDate32>(DataTypeDate32::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    ExtendedDayNum tmp(0);
+    if (!tryReadDateText(tmp, rb, *time_zone))
+        return false;
+    x = tmp;
+    return true;
+}
+
+template <>
+inline bool tryParseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
+{
+    time_t time = 0;
+    if (!tryReadDateTimeText(time, rb, *time_zone))
+        return false;
+    convertFromTime<DataTypeDateTime>(x, time);
+    return true;
+}
+
+template <>
+inline bool tryParseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    UUID tmp;
+    if (!tryReadUUIDText(tmp, rb))
+        return false;
+
+    x = tmp.toUnderType();
+    return true;
+}
+
+template <>
+inline bool tryParseImpl<DataTypeIPv4>(DataTypeIPv4::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    IPv4 tmp;
+    if (!tryReadIPv4Text(tmp, rb))
+        return false;
+
+    x = tmp.toUnderType();
+    return true;
+}
+
+template <>
+inline bool tryParseImpl<DataTypeIPv6>(DataTypeIPv6::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
+{
+    IPv6 tmp;
+    if (!tryReadIPv6Text(tmp, rb))
+        return false;
+
+    x = tmp;
+    return true;
+}
+
+
+/** Throw exception with verbose message when string value is not parsed completely.
+  */
+[[noreturn]] inline void throwExceptionForIncompletelyParsedValue(ReadBuffer & read_buffer, const IDataType & result_type)
+{
+    WriteBufferFromOwnString message_buf;
+    message_buf << "Cannot parse string " << quote << String(read_buffer.buffer().begin(), read_buffer.buffer().size())
+                << " as " << result_type.getName()
+                << ": syntax error";
+
+    if (read_buffer.offset())
+        message_buf << " at position " << read_buffer.offset()
+                    << " (parsed just " << quote << String(read_buffer.buffer().begin(), read_buffer.offset()) << ")";
+    else
+        message_buf << " at begin of string";
+
+    // Currently there are no functions toIPv{4,6}Or{Null,Zero}
+    if (isNativeNumber(result_type) && !(result_type.getName() == "IPv4" || result_type.getName() == "IPv6"))
+        message_buf << ". Note: there are to" << result_type.getName() << "OrZero and to" << result_type.getName() << "OrNull functions, which returns zero/NULL instead of throwing exception.";
+
+    throw Exception(PreformattedMessage{message_buf.str(), "Cannot parse string {} as {}: syntax error {}"}, ErrorCodes::CANNOT_PARSE_TEXT);
+}
+
+
+enum class ConvertFromStringExceptionMode
+{
+    Throw,  /// Throw exception if value cannot be parsed.
+    Zero,   /// Fill with zero or default if value cannot be parsed.
+    Null    /// Return ColumnNullable with NULLs when value cannot be parsed.
+};
+
+enum class ConvertFromStringParsingMode
+{
+    Normal,
+    BestEffort,  /// Only applicable for DateTime. Will use sophisticated method, that is slower.
+    BestEffortUS
+};
+
+template <typename FromDataType, typename ToDataType, typename Name,
+    ConvertFromStringExceptionMode exception_mode, ConvertFromStringParsingMode parsing_mode>
+struct ConvertThroughParsing
+{
+    static_assert(std::is_same_v<FromDataType, DataTypeString> || std::is_same_v<FromDataType, DataTypeFixedString>,
+        "ConvertThroughParsing is only applicable for String or FixedString data types");
+
+    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
+
+    static bool isAllRead(ReadBuffer & in)
+    {
+        /// In case of FixedString, skip zero bytes at end.
+        if constexpr (std::is_same_v<FromDataType, DataTypeFixedString>)
+            while (!in.eof() && *in.position() == 0)
+                ++in.position();
+
+        if (in.eof())
+            return true;
+
+        /// Special case, that allows to parse string with DateTime or DateTime64 as Date or Date32.
+        if constexpr (std::is_same_v<ToDataType, DataTypeDate> || std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            if (!in.eof() && (*in.position() == ' ' || *in.position() == 'T'))
+            {
+                if (in.buffer().size() == strlen("YYYY-MM-DD hh:mm:ss"))
+                    return true;
+
+                if (in.buffer().size() >= strlen("YYYY-MM-DD hh:mm:ss.x")
+                    && in.buffer().begin()[19] == '.')
+                {
+                    in.position() = in.buffer().begin() + 20;
+
+                    while (!in.eof() && isNumericASCII(*in.position()))
+                        ++in.position();
+
+                    if (in.eof())
+                        return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    template <typename Additions = void *>
+    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count,
+                        Additions additions [[maybe_unused]] = Additions())
+    {
+        using ColVecTo = typename ToDataType::ColumnType;
+
+        const DateLUTImpl * local_time_zone [[maybe_unused]] = nullptr;
+        const DateLUTImpl * utc_time_zone [[maybe_unused]] = nullptr;
+
+        /// For conversion to Date or DateTime type, second argument with time zone could be specified.
+        if constexpr (std::is_same_v<ToDataType, DataTypeDateTime> || to_datetime64)
+        {
+            const auto result_type = removeNullable(res_type);
+            // Time zone is already figured out during result type resolution, no need to do it here.
+            if (const auto dt_col = checkAndGetDataType<ToDataType>(result_type.get()))
+                local_time_zone = &dt_col->getTimeZone();
+            else
+                local_time_zone = &extractTimeZoneFromFunctionArguments(arguments, 1, 0);
+
+            if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort || parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
+                utc_time_zone = &DateLUT::instance("UTC");
+        }
+        else if constexpr (std::is_same_v<ToDataType, DataTypeDate> || std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            // Timezone is more or less dummy when parsing Date/Date32 from string.
+            local_time_zone = &DateLUT::instance();
+            utc_time_zone = &DateLUT::instance("UTC");
+        }
+
+        const IColumn * col_from = arguments[0].column.get();
+        const ColumnString * col_from_string = checkAndGetColumn<ColumnString>(col_from);
+        const ColumnFixedString * col_from_fixed_string = checkAndGetColumn<ColumnFixedString>(col_from);
+
+        if (std::is_same_v<FromDataType, DataTypeString> && !col_from_string)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                col_from->getName(), Name::name);
+
+        if (std::is_same_v<FromDataType, DataTypeFixedString> && !col_from_fixed_string)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                col_from->getName(), Name::name);
+
+        size_t size = input_rows_count;
+        typename ColVecTo::MutablePtr col_to = nullptr;
+
+        if constexpr (IsDataTypeDecimal<ToDataType>)
+        {
+            UInt32 scale = additions;
+            if constexpr (to_datetime64)
+            {
+                ToDataType check_bounds_in_ctor(scale, local_time_zone ? local_time_zone->getTimeZone() : String{});
+            }
+            else
+            {
+                ToDataType check_bounds_in_ctor(ToDataType::maxPrecision(), scale);
+            }
+            col_to = ColVecTo::create(size, scale);
+        }
+        else
+            col_to = ColVecTo::create(size);
+
+        typename ColVecTo::Container & vec_to = col_to->getData();
+
+        ColumnUInt8::MutablePtr col_null_map_to;
+        ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
+        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
+        {
+            col_null_map_to = ColumnUInt8::create(size);
+            vec_null_map_to = &col_null_map_to->getData();
+        }
+
+        const ColumnString::Chars * chars = nullptr;
+        const IColumn::Offsets * offsets = nullptr;
+        size_t fixed_string_size = 0;
+
+        if constexpr (std::is_same_v<FromDataType, DataTypeString>)
+        {
+            chars = &col_from_string->getChars();
+            offsets = &col_from_string->getOffsets();
+        }
+        else
+        {
+            chars = &col_from_fixed_string->getChars();
+            fixed_string_size = col_from_fixed_string->getN();
+        }
+
+        size_t current_offset = 0;
+
+        bool precise_float_parsing = false;
+
+        if (DB::CurrentThread::isInitialized())
+        {
+            const DB::ContextPtr query_context = DB::CurrentThread::get().getQueryContext();
+
+            if (query_context)
+                precise_float_parsing = query_context->getSettingsRef().precise_float_parsing;
+        }
+
+        for (size_t i = 0; i < size; ++i)
+        {
+            size_t next_offset = std::is_same_v<FromDataType, DataTypeString> ? (*offsets)[i] : (current_offset + fixed_string_size);
+            size_t string_size = std::is_same_v<FromDataType, DataTypeString> ? next_offset - current_offset - 1 : fixed_string_size;
+
+            ReadBufferFromMemory read_buffer(chars->data() + current_offset, string_size);
+
+            if constexpr (exception_mode == ConvertFromStringExceptionMode::Throw)
+            {
+                if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort)
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parseDateTime64BestEffort(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parseDateTimeBestEffort(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i], res);
+                    }
+                }
+                else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i], res);
+                    }
+                }
+                else
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 value = 0;
+                        readDateTime64Text(value, col_to->getScale(), read_buffer, *local_time_zone);
+                        vec_to[i] = value;
+                    }
+                    else if constexpr (IsDataTypeDecimal<ToDataType>)
+                    {
+                        SerializationDecimal<typename ToDataType::FieldType>::readText(
+                            vec_to[i], read_buffer, ToDataType::maxPrecision(), col_to->getScale());
+                    }
+                    else
+                    {
+                        /// we want to utilize constexpr condition here, which is not mixable with value comparison
+                        do
+                        {
+                            if constexpr (std::is_same_v<FromDataType, DataTypeFixedString> && std::is_same_v<ToDataType, DataTypeIPv6>)
+                            {
+                                if (fixed_string_size == IPV6_BINARY_LENGTH)
+                                {
+                                    readBinary(vec_to[i], read_buffer);
+                                    break;
+                                }
+                            }
+                            parseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone, precise_float_parsing);
+                        } while (false);
+                    }
+                }
+
+                if (!isAllRead(read_buffer))
+                    throwExceptionForIncompletelyParsedValue(read_buffer, *res_type);
+            }
+            else
+            {
+                bool parsed;
+
+                if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort)
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parsed = tryParseDateTime64BestEffort(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parsed = tryParseDateTimeBestEffort(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i],res);
+                    }
+                }
+                else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 res = 0;
+                        parsed = tryParseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
+                        vec_to[i] = res;
+                    }
+                    else
+                    {
+                        time_t res;
+                        parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
+                        convertFromTime<ToDataType>(vec_to[i],res);
+                    }
+                }
+                else
+                {
+                    if constexpr (to_datetime64)
+                    {
+                        DateTime64 value = 0;
+                        parsed = tryReadDateTime64Text(value, col_to->getScale(), read_buffer, *local_time_zone);
+                        vec_to[i] = value;
+                    }
+                    else if constexpr (IsDataTypeDecimal<ToDataType>)
+                    {
+                        parsed = SerializationDecimal<typename ToDataType::FieldType>::tryReadText(
+                            vec_to[i], read_buffer, ToDataType::maxPrecision(), col_to->getScale());
+                    }
+                    else if (std::is_same_v<FromDataType, DataTypeFixedString> && std::is_same_v<ToDataType, DataTypeIPv6>
+                            && fixed_string_size == IPV6_BINARY_LENGTH)
+                    {
+                        readBinary(vec_to[i], read_buffer);
+                        parsed = true;
+                    }
+                    else
+                    {
+                        parsed = tryParseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone, precise_float_parsing);
+                    }
+                }
+
+                if (!isAllRead(read_buffer))
+                    parsed = false;
+
+                if (!parsed)
+                {
+                    if constexpr (std::is_same_v<ToDataType, DataTypeDate32>)
+                    {
+                        vec_to[i] = -static_cast<Int32>(DateLUT::instance().getDayNumOffsetEpoch()); /// NOLINT(readability-static-accessed-through-instance)
+                    }
+                    else
+                    {
+                        vec_to[i] = static_cast<typename ToDataType::FieldType>(0);
+                    }
+                }
+
+                if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
+                    (*vec_null_map_to)[i] = !parsed;
+            }
+
+            current_offset = next_offset;
+        }
+
+        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
+            return ColumnNullable::create(std::move(col_to), std::move(col_null_map_to));
+        else
+            return col_to;
+    }
+};
+
+
+/// Function toUnixTimestamp has exactly the same implementation as toDateTime of String type.
+struct NameToUnixTimestamp { static constexpr auto name = "toUnixTimestamp"; };
+
+struct AccurateConvertStrategyAdditions
+{
+    UInt32 scale { 0 };
+};
+
+struct AccurateOrNullConvertStrategyAdditions
+{
+    UInt32 scale { 0 };
+};
+
+enum class BehaviourOnErrorFromString
+{
+    ConvertDefaultBehaviorTag,
+    ConvertReturnNullOnErrorTag,
+    ConvertReturnZeroOnErrorTag
+};
+
+/** Conversion of number types to each other, enums to numbers, dates and datetimes to numbers and back: done by straight assignment.
+  *  (Date is represented internally as number of days from some day; DateTime - as unix timestamp)
+  */
+template <typename FromDataType, typename ToDataType, typename Name,
+    FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior>
+struct ConvertImpl
+{
+    template <typename Additions = void *>
+    static ColumnPtr NO_SANITIZE_UNDEFINED execute(
+        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type [[maybe_unused]], size_t input_rows_count,
+        BehaviourOnErrorFromString from_string_tag [[maybe_unused]], Additions additions = Additions())
+    {
+        const ColumnWithTypeAndName & named_from = arguments[0];
+
+        if constexpr ((std::is_same_v<FromDataType, ToDataType> && !FromDataType::is_parametric)
+            || (std::is_same_v<FromDataType, DataTypeEnum8> && std::is_same_v<ToDataType, DataTypeInt8>)
+            || (std::is_same_v<FromDataType, DataTypeEnum16> && std::is_same_v<ToDataType, DataTypeInt16>))
+        {
+            /// If types are the same, reuse the columns.
+            /// Conversions between Enum and the underlying type are also free.
+            return named_from.column;
+        }
+        else if constexpr ((std::is_same_v<FromDataType, DataTypeDateTime> || std::is_same_v<FromDataType, DataTypeDate32>)
+            && std::is_same_v<ToDataType, DataTypeDate>)
+        {
+            /// Conversion of DateTime to Date: throw off time component.
+            /// Conversion of Date32 to Date.
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateImpl<date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime> && std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            /// Conversion of DateTime to Date: throw off time component.
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDate32Impl, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((std::is_same_v<FromDataType, DataTypeDate> || std::is_same_v<FromDataType, DataTypeDate32>)
+            && std::is_same_v<ToDataType, DataTypeDateTime>)
+        {
+            /// Conversion from Date/Date32 to DateTime.
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTimeImpl<date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime64> && std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            return DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate32, TransformDateTime64<ToDate32Impl>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        /** Special case of converting Int8, Int16, (U)Int32 or (U)Int64 (and also, for convenience,
+          * Float32, Float64) to Date. If the
+          * number is less than 65536, then it is treated as DayNum, and if it's greater or equals to 65536,
+          * then treated as unix timestamp. If the number exceeds UInt32, saturate to MAX_UINT32 then as DayNum.
+          * It's a bit illogical, as we actually have two functions in one.
+          * But allows to support frequent case,
+          *  when user write toDate(UInt32), expecting conversion of unix timestamp to Date.
+          *  (otherwise such usage would be frequent mistake).
+          */
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeUInt32>
+                || std::is_same_v<FromDataType, DataTypeUInt64>)
+            && std::is_same_v<ToDataType, DataTypeDate>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTransform32Or64<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt8>
+                || std::is_same_v<FromDataType, DataTypeInt16>)
+            && std::is_same_v<ToDataType, DataTypeDate>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTransform8Or16Signed<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt32>
+                || std::is_same_v<FromDataType, DataTypeInt64>
+                || std::is_same_v<FromDataType, DataTypeFloat32>
+                || std::is_same_v<FromDataType, DataTypeFloat64>)
+            && std::is_same_v<ToDataType, DataTypeDate>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTransform32Or64Signed<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeUInt32>
+                || std::is_same_v<FromDataType, DataTypeUInt64>)
+            && std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDate32Transform32Or64<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt8>
+                || std::is_same_v<FromDataType, DataTypeInt16>)
+            && std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDate32Transform8Or16Signed<typename FromDataType::FieldType>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt32>
+                || std::is_same_v<FromDataType, DataTypeInt64>
+                || std::is_same_v<FromDataType, DataTypeFloat32>
+                || std::is_same_v<FromDataType, DataTypeFloat64>)
+            && std::is_same_v<ToDataType, DataTypeDate32>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDate32Transform32Or64Signed<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        /// Special case of converting Int8, Int16, Int32 or (U)Int64 (and also, for convenience, Float32, Float64) to DateTime.
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt8>
+                || std::is_same_v<FromDataType, DataTypeInt16>
+                || std::is_same_v<FromDataType, DataTypeInt32>)
+            && std::is_same_v<ToDataType, DataTypeDateTime>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTimeTransformSigned<typename FromDataType::FieldType, UInt32, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr (std::is_same_v<FromDataType, DataTypeUInt64>
+            && std::is_same_v<ToDataType, DataTypeDateTime>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTimeTransform64<typename FromDataType::FieldType, UInt32, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt64>
+                || std::is_same_v<FromDataType, DataTypeFloat32>
+                || std::is_same_v<FromDataType, DataTypeFloat64>)
+            && std::is_same_v<ToDataType, DataTypeDateTime>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTimeTransform64Signed<typename FromDataType::FieldType, UInt32, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeInt8>
+                || std::is_same_v<FromDataType, DataTypeInt16>
+                || std::is_same_v<FromDataType, DataTypeInt32>
+                || std::is_same_v<FromDataType, DataTypeInt64>)
+            && std::is_same_v<ToDataType, DataTypeDateTime64>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTime64TransformSigned<typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        else if constexpr (std::is_same_v<FromDataType, DataTypeUInt64>
+            && std::is_same_v<ToDataType, DataTypeDateTime64>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTime64TransformUnsigned<UInt64, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeFloat32>
+                || std::is_same_v<FromDataType, DataTypeFloat64>)
+            && std::is_same_v<ToDataType, DataTypeDateTime64>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTime64TransformFloat<FromDataType, typename FromDataType::FieldType, default_date_time_overflow_behavior>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        /// Conversion of DateTime64 to Date or DateTime: discards fractional part.
+        else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime64>
+            && std::is_same_v<ToDataType, DataTypeDate>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, TransformDateTime64<ToDateImpl<date_time_overflow_behavior>>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime64>
+            && std::is_same_v<ToDataType, DataTypeDateTime>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, TransformDateTime64<ToDateTimeImpl<date_time_overflow_behavior>>, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        /// Conversion of Date or DateTime to DateTime64: add zero sub-second part.
+        else if constexpr ((
+                std::is_same_v<FromDataType, DataTypeDate>
+                || std::is_same_v<FromDataType, DataTypeDate32>
+                || std::is_same_v<FromDataType, DataTypeDateTime>)
+            && std::is_same_v<ToDataType, DataTypeDateTime64>)
+        {
+            return DateTimeTransformImpl<FromDataType, ToDataType, ToDateTime64Transform, false>::template execute<Additions>(
+                arguments, result_type, input_rows_count, additions);
+        }
+        else if constexpr (IsDataTypeDateOrDateTime<FromDataType>
+            && std::is_same_v<ToDataType, DataTypeString>)
+        {
+            /// Date or DateTime to String
+
+            using FromFieldType = typename FromDataType::FieldType;
+            using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
+
+            auto datetime_arg = arguments[0];
+
+            const DateLUTImpl * time_zone = nullptr;
+            const ColumnConst * time_zone_column = nullptr;
+
+            if (arguments.size() == 1)
+            {
+                auto non_null_args = createBlockWithNestedColumns(arguments);
+                time_zone = &extractTimeZoneFromFunctionArguments(non_null_args, 1, 0);
+            }
+            else /// When we have a column for timezone
+            {
+                datetime_arg.column = datetime_arg.column->convertToFullColumnIfConst();
+
+                if constexpr (std::is_same_v<FromDataType, DataTypeDate> || std::is_same_v<FromDataType, DataTypeDate32>)
+                    time_zone = &DateLUT::instance();
+                /// For argument of Date or DateTime type, second argument with time zone could be specified.
+                if constexpr (std::is_same_v<FromDataType, DataTypeDateTime> || std::is_same_v<FromDataType, DataTypeDateTime64>)
+                {
+                    if ((time_zone_column = checkAndGetColumnConst<ColumnString>(arguments[1].column.get())))
+                    {
+                        auto non_null_args = createBlockWithNestedColumns(arguments);
+                        time_zone = &extractTimeZoneFromFunctionArguments(non_null_args, 1, 0);
+                    }
+                }
+            }
+            const auto & col_with_type_and_name = columnGetNested(datetime_arg);
+
+            if (const auto col_from = checkAndGetColumn<ColVecType>(col_with_type_and_name.column.get()))
+            {
+                auto col_to = ColumnString::create();
+
+                const typename ColVecType::Container & vec_from = col_from->getData();
+                ColumnString::Chars & data_to = col_to->getChars();
+                ColumnString::Offsets & offsets_to = col_to->getOffsets();
+                size_t size = vec_from.size();
+
+                if constexpr (std::is_same_v<FromDataType, DataTypeDate>)
+                    data_to.resize(size * (strlen("YYYY-MM-DD") + 1));
+                else if constexpr (std::is_same_v<FromDataType, DataTypeDate32>)
+                    data_to.resize(size * (strlen("YYYY-MM-DD") + 1));
+                else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime>)
+                    data_to.resize(size * (strlen("YYYY-MM-DD hh:mm:ss") + 1));
+                else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime64>)
+                    data_to.resize(size * (strlen("YYYY-MM-DD hh:mm:ss.") + col_from->getScale() + 1));
+                else
+                    data_to.resize(size * 3);   /// Arbitrary
+
+                offsets_to.resize(size);
+
+                WriteBufferFromVector<ColumnString::Chars> write_buffer(data_to);
+                const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
+
+                ColumnUInt8::MutablePtr null_map = copyNullMap(datetime_arg.column);
+
+                if (!null_map && arguments.size() > 1)
+                    null_map = copyNullMap(arguments[1].column->convertToFullColumnIfConst());
+
+                if (null_map)
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        if (!time_zone_column && arguments.size() > 1)
+                        {
+                            if (!arguments[1].column.get()->getDataAt(i).toString().empty())
+                                time_zone = &DateLUT::instance(arguments[1].column.get()->getDataAt(i).toString());
+                            else
+                                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Provided time zone must be non-empty");
+                        }
+                        bool is_ok = FormatImpl<FromDataType>::template execute<bool>(vec_from[i], write_buffer, &type, time_zone);
+                        null_map->getData()[i] |= !is_ok;
+                        writeChar(0, write_buffer);
+                        offsets_to[i] = write_buffer.count();
+                    }
+                }
+                else
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        if (!time_zone_column && arguments.size() > 1)
+                        {
+                            if (!arguments[1].column.get()->getDataAt(i).toString().empty())
+                                time_zone = &DateLUT::instance(arguments[1].column.get()->getDataAt(i).toString());
+                            else
+                                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Provided time zone must be non-empty");
+                        }
+                        FormatImpl<FromDataType>::template execute<void>(vec_from[i], write_buffer, &type, time_zone);
+                        writeChar(0, write_buffer);
+                        offsets_to[i] = write_buffer.count();
+                    }
+                }
+
+                write_buffer.finalize();
+
+                if (null_map)
+                    return ColumnNullable::create(std::move(col_to), std::move(null_map));
+                return col_to;
+            }
+            else
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                        arguments[0].column->getName(), Name::name);
+        }
+        /// Conversion from FixedString to String.
+        /// Cutting sequences of zero bytes from end of strings.
+        else if constexpr (std::is_same_v<ToDataType, DataTypeString>
+            && std::is_same_v<FromDataType, DataTypeFixedString>)
+        {
+            ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
+            const auto & nested =  columnGetNested(arguments[0]);
+            if (const ColumnFixedString * col_from = checkAndGetColumn<ColumnFixedString>(nested.column.get()))
+            {
+                auto col_to = ColumnString::create();
+
+                const ColumnFixedString::Chars & data_from = col_from->getChars();
+                ColumnString::Chars & data_to = col_to->getChars();
+                ColumnString::Offsets & offsets_to = col_to->getOffsets();
+                size_t size = col_from->size();
+                size_t n = col_from->getN();
+                data_to.resize(size * (n + 1)); /// + 1 - zero terminator
+                offsets_to.resize(size);
+
+                size_t offset_from = 0;
+                size_t offset_to = 0;
+                for (size_t i = 0; i < size; ++i)
+                {
+                    if (!null_map || !null_map->getData()[i])
+                    {
+                        size_t bytes_to_copy = n;
+                        while (bytes_to_copy > 0 && data_from[offset_from + bytes_to_copy - 1] == 0)
+                            --bytes_to_copy;
+
+                        memcpy(&data_to[offset_to], &data_from[offset_from], bytes_to_copy);
+                        offset_to += bytes_to_copy;
+                    }
+                    data_to[offset_to] = 0;
+                    ++offset_to;
+                    offsets_to[i] = offset_to;
+                    offset_from += n;
+                }
+
+                data_to.resize(offset_to);
+                if (result_type->isNullable() && null_map)
+                    return ColumnNullable::create(std::move(col_to), std::move(null_map));
+                return col_to;
+            }
+            else
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                        arguments[0].column->getName(), Name::name);
+        }
+        else if constexpr (std::is_same_v<ToDataType, DataTypeString>)
+        {
+            /// Anything else to String.
+
+            using FromFieldType = typename FromDataType::FieldType;
+            using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
+
+            ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
+
+            const auto & col_with_type_and_name = columnGetNested(arguments[0]);
+            const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
+
+            if (const auto col_from = checkAndGetColumn<ColVecType>(col_with_type_and_name.column.get()))
+            {
+                auto col_to = ColumnString::create();
+
+                const typename ColVecType::Container & vec_from = col_from->getData();
+                ColumnString::Chars & data_to = col_to->getChars();
+                ColumnString::Offsets & offsets_to = col_to->getOffsets();
+                size_t size = vec_from.size();
+
+                data_to.resize(size * 3);
+                offsets_to.resize(size);
+
+                WriteBufferFromVector<ColumnString::Chars> write_buffer(data_to);
+
+                if (null_map)
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        bool is_ok = FormatImpl<FromDataType>::template execute<bool>(vec_from[i], write_buffer, &type, nullptr);
+                        /// We don't use timezones in this branch
+                        null_map->getData()[i] |= !is_ok;
+                        writeChar(0, write_buffer);
+                        offsets_to[i] = write_buffer.count();
+                    }
+                }
+                else
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        FormatImpl<FromDataType>::template execute<void>(vec_from[i], write_buffer, &type, nullptr);
+                        writeChar(0, write_buffer);
+                        offsets_to[i] = write_buffer.count();
+                    }
+                }
+
+                write_buffer.finalize();
+
+                if (null_map)
+                    return ColumnNullable::create(std::move(col_to), std::move(null_map));
+                return col_to;
+            }
+            else
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                        arguments[0].column->getName(), Name::name);
+        }
+        else if constexpr (std::is_same_v<Name, NameToUnixTimestamp>
+            && std::is_same_v<FromDataType, DataTypeString>
+            && std::is_same_v<ToDataType, DataTypeUInt32>)
+        {
+            return ConvertImpl<FromDataType, DataTypeDateTime, Name, date_time_overflow_behavior>::template execute<Additions>(
+                arguments, result_type, input_rows_count, from_string_tag);
+        }
+        else if constexpr ((std::is_same_v<FromDataType, DataTypeString> || std::is_same_v<FromDataType, DataTypeFixedString>))
+        {
+            switch (from_string_tag)
+            {
+            case BehaviourOnErrorFromString::ConvertDefaultBehaviorTag:
+                return ConvertThroughParsing<FromDataType,
+                                             ToDataType,
+                                             Name,
+                                             ConvertFromStringExceptionMode::Throw,
+                                             ConvertFromStringParsingMode::Normal>::execute(
+                        arguments, result_type, input_rows_count, additions);
+            case BehaviourOnErrorFromString::ConvertReturnNullOnErrorTag:
+                return ConvertThroughParsing<FromDataType,
+                                             ToDataType,
+                                             Name,
+                                             ConvertFromStringExceptionMode::Null,
+                                             ConvertFromStringParsingMode::Normal>::execute(
+                        arguments, result_type, input_rows_count, additions);
+            case BehaviourOnErrorFromString::ConvertReturnZeroOnErrorTag:
+                return ConvertThroughParsing<FromDataType,
+                                             ToDataType,
+                                             Name,
+                                             ConvertFromStringExceptionMode::Zero,
+                                             ConvertFromStringParsingMode::Normal>::execute(
+                        arguments, result_type, input_rows_count, additions);
+            }
+        }
+        else
+        {
+            using FromFieldType = typename FromDataType::FieldType;
+            using ToFieldType = typename ToDataType::FieldType;
+            using ColVecFrom = typename FromDataType::ColumnType;
+            using ColVecTo = typename ToDataType::ColumnType;
+
+            if constexpr ((IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
+                && !(std::is_same_v<DataTypeDateTime64, FromDataType> || std::is_same_v<DataTypeDateTime64, ToDataType>)
+                && (!IsDataTypeDecimalOrNumber<FromDataType> || !IsDataTypeDecimalOrNumber<ToDataType>))
+            {
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                    named_from.column->getName(), Name::name);
+            }
+
+            const ColVecFrom * col_from = checkAndGetColumn<ColVecFrom>(named_from.column.get());
+            if (!col_from)
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
+                    named_from.column->getName(), Name::name);
+
+            typename ColVecTo::MutablePtr col_to = nullptr;
+
+            if constexpr (IsDataTypeDecimal<ToDataType>)
+            {
+                UInt32 scale;
+
+                if constexpr (std::is_same_v<Additions, AccurateConvertStrategyAdditions>
+                    || std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                {
+                    scale = additions.scale;
+                }
+                else
+                {
+                    scale = additions;
+                }
+
+                col_to = ColVecTo::create(0, scale);
+            }
+            else
+                col_to = ColVecTo::create();
+
+            const auto & vec_from = col_from->getData();
+            auto & vec_to = col_to->getData();
+            vec_to.resize(input_rows_count);
+
+            ColumnUInt8::MutablePtr col_null_map_to;
+            ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
+            if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+            {
+                col_null_map_to = ColumnUInt8::create(input_rows_count, false);
+                vec_null_map_to = &col_null_map_to->getData();
+            }
+
+            bool result_is_bool = isBool(result_type);
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
+                {
+                    if (result_is_bool)
+                    {
+                        vec_to[i] = vec_from[i] != FromFieldType(0);
+                        continue;
+                    }
+                }
+
+                if constexpr (std::is_same_v<FromDataType, DataTypeUUID> && std::is_same_v<ToDataType, DataTypeUInt128>)
+                {
+                    static_assert(
+                        std::is_same_v<DataTypeUInt128::FieldType, DataTypeUUID::FieldType::UnderlyingType>,
+                        "UInt128 and UUID types must be same");
+
+                    vec_to[i].items[1] = vec_from[i].toUnderType().items[0];
+                    vec_to[i].items[0] = vec_from[i].toUnderType().items[1];
+                }
+                else if constexpr (std::is_same_v<FromDataType, DataTypeIPv6> && std::is_same_v<ToDataType, DataTypeUInt128>)
+                {
+                    static_assert(
+                        std::is_same_v<DataTypeUInt128::FieldType, DataTypeUUID::FieldType::UnderlyingType>,
+                        "UInt128 and IPv6 types must be same");
+
+                    vec_to[i].items[1] = std::byteswap(vec_from[i].toUnderType().items[0]);
+                    vec_to[i].items[0] = std::byteswap(vec_from[i].toUnderType().items[1]);
+                }
+                else if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
+                {
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                                    "Conversion between numeric types and UUID is not supported. "
+                                    "Probably the passed UUID is unquoted");
+                }
+                else if constexpr (
+                    (std::is_same_v<FromDataType, DataTypeIPv4> != std::is_same_v<ToDataType, DataTypeIPv4>)
+                    && !(is_any_of<FromDataType, DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeIPv6>
+                        || is_any_of<ToDataType, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256, DataTypeIPv6>))
+                {
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Conversion from {} to {} is not supported",
+                                    TypeName<typename FromDataType::FieldType>, TypeName<typename ToDataType::FieldType>);
+                }
+                else if constexpr (std::is_same_v<FromDataType, DataTypeIPv6> != std::is_same_v<ToDataType, DataTypeIPv6>
+                    && !(std::is_same_v<ToDataType, DataTypeIPv4> || std::is_same_v<FromDataType, DataTypeIPv4>))
+                {
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
+                                    "Conversion between numeric types and IPv6 is not supported. "
+                                    "Probably the passed IPv6 is unquoted");
+                }
+                else if constexpr (IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
+                {
+                    if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                    {
+                        ToFieldType result;
+                        bool convert_result = false;
+
+                        if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
+                            convert_result = tryConvertDecimals<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), col_to->getScale(), result);
+                        else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
+                            convert_result = tryConvertFromDecimal<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), result);
+                        else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
+                            convert_result = tryConvertToDecimal<FromDataType, ToDataType>(vec_from[i], col_to->getScale(), result);
+
+                        if (convert_result)
+                            vec_to[i] = result;
+                        else
+                        {
+                            vec_to[i] = static_cast<ToFieldType>(0);
+                            (*vec_null_map_to)[i] = true;
+                        }
+                    }
+                    else
+                    {
+                        if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
+                            vec_to[i] = convertDecimals<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), col_to->getScale());
+                        else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
+                            vec_to[i] = convertFromDecimal<FromDataType, ToDataType>(vec_from[i], col_from->getScale());
+                        else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
+                            vec_to[i] = convertToDecimal<FromDataType, ToDataType>(vec_from[i], col_to->getScale());
+                        else
+                            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Unsupported data type in conversion function");
+                    }
+                }
+                else if constexpr (std::is_same_v<ToDataType, DataTypeIPv4> && std::is_same_v<FromDataType, DataTypeIPv6>)
+                {
+                    const uint8_t ip4_cidr[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
+                    const uint8_t * src = reinterpret_cast<const uint8_t *>(&vec_from[i].toUnderType());
+                    if (!matchIPv6Subnet(src, ip4_cidr, 96))
+                    {
+                        char addr[IPV6_MAX_TEXT_LENGTH + 1] {};
+                        char * paddr = addr;
+                        formatIPv6(src, paddr);
+
+                        throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "IPv6 {} in column {} is not in IPv4 mapping block", addr, named_from.column->getName());
+                    }
+
+                    uint8_t * dst = reinterpret_cast<uint8_t *>(&vec_to[i].toUnderType());
+                    if constexpr (std::endian::native == std::endian::little)
+                    {
+                        dst[0] = src[15];
+                        dst[1] = src[14];
+                        dst[2] = src[13];
+                        dst[3] = src[12];
+                    }
+                    else
+                    {
+                        dst[0] = src[12];
+                        dst[1] = src[13];
+                        dst[2] = src[14];
+                        dst[3] = src[15];
+                    }
+                }
+                else if constexpr (std::is_same_v<ToDataType, DataTypeIPv6> && std::is_same_v<FromDataType, DataTypeIPv4>)
+                {
+                    const uint8_t * src = reinterpret_cast<const uint8_t *>(&vec_from[i].toUnderType());
+                    uint8_t * dst = reinterpret_cast<uint8_t *>(&vec_to[i].toUnderType());
+                    std::memset(dst, '\0', IPV6_BINARY_LENGTH);
+                    dst[10] = dst[11] = 0xff;
+
+                    if constexpr (std::endian::native == std::endian::little)
+                    {
+                        dst[12] = src[3];
+                        dst[13] = src[2];
+                        dst[14] = src[1];
+                        dst[15] = src[0];
+                    }
+                    else
+                    {
+                        dst[12] = src[0];
+                        dst[13] = src[1];
+                        dst[14] = src[2];
+                        dst[15] = src[3];
+                    }
+                }
+                else 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
+                {
+                    /// If From Data is Nan or Inf and we convert to integer type, throw exception
+                    if constexpr (std::is_floating_point_v<FromFieldType> && !std::is_floating_point_v<ToFieldType>)
+                    {
+                        if (!isFinite(vec_from[i]))
+                        {
+                            if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                            {
+                                vec_to[i] = 0;
+                                (*vec_null_map_to)[i] = true;
+                                continue;
+                            }
+                            else
+                                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Unexpected inf or nan to integer conversion");
+                        }
+                    }
+
+                    if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>
+                            || std::is_same_v<Additions, AccurateConvertStrategyAdditions>)
+                    {
+                        bool convert_result = accurate::convertNumeric(vec_from[i], vec_to[i]);
+
+                        if (!convert_result)
+                        {
+                            if (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                            {
+                                vec_to[i] = 0;
+                                (*vec_null_map_to)[i] = true;
+                            }
+                            else
+                            {
+                                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Value in column {} cannot be safely converted into type {}",
+                                    named_from.column->getName(), result_type->getName());
+                            }
+                        }
+                    }
+                    else
+                    {
+                        vec_to[i] = static_cast<ToFieldType>(vec_from[i]);
+                    }
+                }
+            }
+
+            if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
+                return ColumnNullable::create(std::move(col_to), std::move(col_null_map_to));
+            else
+                return col_to;
+        }
+    }
+};
+
+
+/// Generic conversion of any type from String. Used for complex types: Array and Tuple or types with custom serialization.
+template <bool throw_on_error>
+struct ConvertImplGenericFromString
+{
+    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t input_rows_count)
+    {
+        const IColumn & column_from = *arguments[0].column;
+        const IDataType & data_type_to = *result_type;
+        auto res = data_type_to.createColumn();
+        auto serialization = data_type_to.getDefaultSerialization();
+        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
+
+        executeImpl(column_from, *res, *serialization, input_rows_count, null_map, result_type.get());
+        return res;
+    }
+
+    static void executeImpl(
+        const IColumn & column_from,
+        IColumn & column_to,
+        const ISerialization & serialization_from,
+        size_t input_rows_count,
+        const PaddedPODArray<UInt8> * null_map,
+        const IDataType * result_type)
+    {
+        column_to.reserve(input_rows_count);
+
+        FormatSettings format_settings;
+        for (size_t i = 0; i < input_rows_count; ++i)
+        {
+            if (null_map && (*null_map)[i])
+            {
+                column_to.insertDefault();
+                continue;
+            }
+
+            const auto & val = column_from.getDataAt(i);
+            ReadBufferFromMemory read_buffer(val.data, val.size);
+            try
+            {
+                serialization_from.deserializeWholeText(column_to, read_buffer, format_settings);
+            }
+            catch (const Exception &)
+            {
+                if constexpr (throw_on_error)
+                    throw;
+                /// Check if exception happened after we inserted the value
+                /// (deserializeWholeText should not do it, but let's check anyway).
+                if (column_to.size() > i)
+                    column_to.popBack(column_to.size() - i);
+                column_to.insertDefault();
+            }
+
+            /// Usually deserializeWholeText checks for eof after parsing, but let's check one more time just in case.
+            if (!read_buffer.eof())
+            {
+                if constexpr (throw_on_error)
+                {
+                    if (result_type)
+                        throwExceptionForIncompletelyParsedValue(read_buffer, *result_type);
+                    else
+                        throw Exception(
+                            ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse string to column {}. Expected eof", column_to.getName());
+                }
+                else
+                {
+                    if (column_to.size() > i)
+                        column_to.popBack(column_to.size() - i);
+                    column_to.insertDefault();
+                }
+            }
+        }
+    }
+};
+
+
+/// Declared early because used below.
+struct NameToDate { static constexpr auto name = "toDate"; };
+struct NameToDate32 { static constexpr auto name = "toDate32"; };
+struct NameToDateTime { static constexpr auto name = "toDateTime"; };
+struct NameToDateTime32 { static constexpr auto name = "toDateTime32"; };
+struct NameToDateTime64 { static constexpr auto name = "toDateTime64"; };
+struct NameToString { static constexpr auto name = "toString"; };
+struct NameToDecimal32 { static constexpr auto name = "toDecimal32"; };
+struct NameToDecimal64 { static constexpr auto name = "toDecimal64"; };
+struct NameToDecimal128 { static constexpr auto name = "toDecimal128"; };
+struct NameToDecimal256 { static constexpr auto name = "toDecimal256"; };
+
+
+#define DEFINE_NAME_TO_INTERVAL(INTERVAL_KIND) \
+    struct NameToInterval ## INTERVAL_KIND \
+    { \
+        static constexpr auto name = "toInterval" #INTERVAL_KIND; \
+        static constexpr auto kind = IntervalKind::Kind::INTERVAL_KIND; \
+    };
+
+DEFINE_NAME_TO_INTERVAL(Nanosecond)
+DEFINE_NAME_TO_INTERVAL(Microsecond)
+DEFINE_NAME_TO_INTERVAL(Millisecond)
+DEFINE_NAME_TO_INTERVAL(Second)
+DEFINE_NAME_TO_INTERVAL(Minute)
+DEFINE_NAME_TO_INTERVAL(Hour)
+DEFINE_NAME_TO_INTERVAL(Day)
+DEFINE_NAME_TO_INTERVAL(Week)
+DEFINE_NAME_TO_INTERVAL(Month)
+DEFINE_NAME_TO_INTERVAL(Quarter)
+DEFINE_NAME_TO_INTERVAL(Year)
+
+#undef DEFINE_NAME_TO_INTERVAL
+
+struct NameParseDateTimeBestEffort;
+struct NameParseDateTimeBestEffortOrZero;
+struct NameParseDateTimeBestEffortOrNull;
+
+template <typename Name, typename ToDataType>
+constexpr bool mightBeDateTime()
+{
+    if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
+        return true;
+    else if constexpr (
+        std::is_same_v<Name, NameToDateTime> || std::is_same_v<Name, NameParseDateTimeBestEffort>
+        || std::is_same_v<Name, NameParseDateTimeBestEffortOrZero> || std::is_same_v<Name, NameParseDateTimeBestEffortOrNull>)
+        return true;
+
+    return false;
+}
+
+template<typename Name, typename ToDataType>
+inline bool isDateTime64(const ColumnsWithTypeAndName & arguments)
+{
+    if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
+        return true;
+    else if constexpr (std::is_same_v<Name, NameToDateTime> || std::is_same_v<Name, NameParseDateTimeBestEffort>
+        || std::is_same_v<Name, NameParseDateTimeBestEffortOrZero> || std::is_same_v<Name, NameParseDateTimeBestEffortOrNull>)
+    {
+        return (arguments.size() == 2 && isUInt(arguments[1].type)) || arguments.size() == 3;
+    }
+
+    return false;
+}
+
+template <typename ToDataType, typename Name, typename MonotonicityImpl>
+class FunctionConvert : public IFunction
+{
+public:
+    using Monotonic = MonotonicityImpl;
+
+    static constexpr auto name = Name::name;
+    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
+    static constexpr bool to_decimal = IsDataTypeDecimal<ToDataType> && !to_datetime64;
+
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionConvert>(context); }
+    explicit FunctionConvert(ContextPtr context_) : context(context_) {}
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool isInjective(const ColumnsWithTypeAndName &) const override { return std::is_same_v<Name, NameToString>; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
+    {
+        return !(IsDataTypeDateOrDateTime<ToDataType> && isNumber(*arguments[0].type));
+    }
+
+    using DefaultReturnTypeGetter = std::function<DataTypePtr(const ColumnsWithTypeAndName &)>;
+    static DataTypePtr getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments, const DefaultReturnTypeGetter & getter)
+    {
+        NullPresence null_presence = getNullPresense(arguments);
+
+        if (null_presence.has_null_constant)
+        {
+            return makeNullable(std::make_shared<DataTypeNothing>());
+        }
+        if (null_presence.has_nullable)
+        {
+            auto nested_columns = Block(createBlockWithNestedColumns(arguments));
+            auto return_type = getter(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
+            return makeNullable(return_type);
+        }
+
+        return getter(arguments);
+    }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        auto getter = [&] (const auto & args) { return getReturnTypeImplRemovedNullable(args); };
+        auto res = getReturnTypeDefaultImplementationForNulls(arguments, getter);
+        to_nullable = res->isNullable();
+        checked_return_type = true;
+        return res;
+    }
+
+    DataTypePtr getReturnTypeImplRemovedNullable(const ColumnsWithTypeAndName & arguments) const
+    {
+        FunctionArgumentDescriptors mandatory_args = {{"Value", nullptr, nullptr, nullptr}};
+        FunctionArgumentDescriptors optional_args;
+
+        if constexpr (to_decimal)
+        {
+            mandatory_args.push_back({"scale", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), &isColumnConst, "const Integer"});
+        }
+
+        if (!to_decimal && isDateTime64<Name, ToDataType>(arguments))
+        {
+            mandatory_args.push_back({"scale", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), &isColumnConst, "const Integer"});
+        }
+
+        // toString(DateTime or DateTime64, [timezone: String])
+        if ((std::is_same_v<Name, NameToString> && !arguments.empty() && (isDateTime64(arguments[0].type) || isDateTime(arguments[0].type)))
+            // toUnixTimestamp(value[, timezone : String])
+            || std::is_same_v<Name, NameToUnixTimestamp>
+            // toDate(value[, timezone : String])
+            || std::is_same_v<ToDataType, DataTypeDate> // TODO: shall we allow timestamp argument for toDate? DateTime knows nothing about timezones and this argument is ignored below.
+            // toDate32(value[, timezone : String])
+            || std::is_same_v<ToDataType, DataTypeDate32>
+            // toDateTime(value[, timezone: String])
+            || std::is_same_v<ToDataType, DataTypeDateTime>
+            // toDateTime64(value, scale : Integer[, timezone: String])
+            || std::is_same_v<ToDataType, DataTypeDateTime64>)
+        {
+            optional_args.push_back({"timezone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"});
+        }
+
+        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
+
+        if constexpr (std::is_same_v<ToDataType, DataTypeInterval>)
+        {
+            return std::make_shared<DataTypeInterval>(Name::kind);
+        }
+        else if constexpr (to_decimal)
+        {
+            UInt64 scale = extractToDecimalScale(arguments[1]);
+
+            if constexpr (std::is_same_v<Name, NameToDecimal32>)
+                return createDecimalMaxPrecision<Decimal32>(scale);
+            else if constexpr (std::is_same_v<Name, NameToDecimal64>)
+                return createDecimalMaxPrecision<Decimal64>(scale);
+            else if constexpr (std::is_same_v<Name, NameToDecimal128>)
+                return createDecimalMaxPrecision<Decimal128>(scale);
+            else if constexpr (std::is_same_v<Name, NameToDecimal256>)
+                return createDecimalMaxPrecision<Decimal256>(scale);
+
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected branch in code of conversion function: it is a bug.");
+        }
+        else
+        {
+            // Optional second argument with time zone for DateTime.
+            UInt8 timezone_arg_position = 1;
+            UInt32 scale [[maybe_unused]] = DataTypeDateTime64::default_scale;
+
+            // DateTime64 requires more arguments: scale and timezone. Since timezone is optional, scale should be first.
+            if (isDateTime64<Name, ToDataType>(arguments))
+            {
+                timezone_arg_position += 1;
+                scale = static_cast<UInt32>(arguments[1].column->get64(0));
+
+                if (to_datetime64 || scale != 0) /// toDateTime('xxxx-xx-xx xx:xx:xx', 0) return DateTime
+                    return std::make_shared<DataTypeDateTime64>(scale,
+                        extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
+
+                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
+            }
+
+            if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
+                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
+            else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected branch in code of conversion function: it is a bug.");
+            else
+                return std::make_shared<ToDataType>();
+        }
+    }
+
+    /// Function actually uses default implementation for nulls,
+    /// but we need to know if return type is Nullable or not,
+    /// so we use checked_return_type only to intercept the first call to getReturnTypeImpl(...).
+    bool useDefaultImplementationForNulls() const override
+    {
+        bool to_nullable_string = to_nullable && std::is_same_v<ToDataType, DataTypeString>;
+        return checked_return_type && !to_nullable_string;
+    }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
+    {
+        if constexpr (std::is_same_v<ToDataType, DataTypeString>)
+            return {};
+        else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
+            return {2};
+        return {1};
+    }
+    bool canBeExecutedOnDefaultArguments() const override { return false; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        try
+        {
+            return executeInternal(arguments, result_type, input_rows_count);
+        }
+        catch (Exception & e)
+        {
+            /// More convenient error message.
+            if (e.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF)
+            {
+                e.addMessage("Cannot parse "
+                    + result_type->getName() + " from "
+                    + arguments[0].type->getName()
+                    + ", because value is too short");
+            }
+            else if (e.code() == ErrorCodes::CANNOT_PARSE_NUMBER
+                || e.code() == ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT
+                || e.code() == ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED
+                || e.code() == ErrorCodes::CANNOT_PARSE_QUOTED_STRING
+                || e.code() == ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE
+                || e.code() == ErrorCodes::CANNOT_PARSE_DATE
+                || e.code() == ErrorCodes::CANNOT_PARSE_DATETIME
+                || e.code() == ErrorCodes::CANNOT_PARSE_UUID
+                || e.code() == ErrorCodes::CANNOT_PARSE_IPV4
+                || e.code() == ErrorCodes::CANNOT_PARSE_IPV6)
+            {
+                e.addMessage("Cannot parse "
+                    + result_type->getName() + " from "
+                    + arguments[0].type->getName());
+            }
+
+            throw;
+        }
+    }
+
+    bool hasInformationAboutMonotonicity() const override
+    {
+        return Monotonic::has();
+    }
+
+    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
+    {
+        return Monotonic::get(type, left, right);
+    }
+
+private:
+    ContextPtr context;
+    mutable bool checked_return_type = false;
+    mutable bool to_nullable = false;
+
+    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+        if (arguments.empty())
+            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects at least 1 argument", getName());
+
+        if (result_type->onlyNull())
+            return result_type->createColumnConstWithDefaultValue(input_rows_count);
+
+        const DataTypePtr from_type = removeNullable(arguments[0].type);
+        ColumnPtr result_column;
+
+        [[maybe_unused]] FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior;
+
+        if (context)
+            date_time_overflow_behavior = context->getSettingsRef().date_time_overflow_behavior.value;
+
+        auto call = [&](const auto & types, BehaviourOnErrorFromString from_string_tag) -> bool
+        {
+            using Types = std::decay_t<decltype(types)>;
+            using LeftDataType = typename Types::LeftType;
+            using RightDataType = typename Types::RightType;
+
+            if constexpr (IsDataTypeDecimal<RightDataType>)
+            {
+                if constexpr (std::is_same_v<RightDataType, DataTypeDateTime64>)
+                {
+                    /// Account for optional timezone argument.
+                    if (arguments.size() != 2 && arguments.size() != 3)
+                        throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects 2 or 3 arguments for DataTypeDateTime64.", getName());
+                }
+                else if (arguments.size() != 2)
+                {
+                    throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects 2 arguments for Decimal.", getName());
+                }
+
+                const ColumnWithTypeAndName & scale_column = arguments[1];
+                UInt32 scale = extractToDecimalScale(scale_column);
+
+                switch (date_time_overflow_behavior)
+                {
+                    case FormatSettings::DateTimeOverflowBehavior::Throw:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Throw>::execute(arguments, result_type, input_rows_count, from_string_tag, scale);
+                        break;
+                    case FormatSettings::DateTimeOverflowBehavior::Ignore:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Ignore>::execute(arguments, result_type, input_rows_count, from_string_tag, scale);
+                        break;
+                    case FormatSettings::DateTimeOverflowBehavior::Saturate:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Saturate>::execute(arguments, result_type, input_rows_count, from_string_tag, scale);
+                        break;
+                }
+            }
+            else if constexpr (IsDataTypeDateOrDateTime<RightDataType> && std::is_same_v<LeftDataType, DataTypeDateTime64>)
+            {
+                const auto * dt64 = assert_cast<const DataTypeDateTime64 *>(arguments[0].type.get());
+                switch (date_time_overflow_behavior)
+                {
+                    case FormatSettings::DateTimeOverflowBehavior::Throw:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Throw>::execute(arguments, result_type, input_rows_count, from_string_tag, dt64->getScale());
+                        break;
+                    case FormatSettings::DateTimeOverflowBehavior::Ignore:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Ignore>::execute(arguments, result_type, input_rows_count, from_string_tag, dt64->getScale());
+                        break;
+                    case FormatSettings::DateTimeOverflowBehavior::Saturate:
+                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::Saturate>::execute(arguments, result_type, input_rows_count, from_string_tag, dt64->getScale());
+                        break;
+                }
+            }
+            else if constexpr ((IsDataTypeNumber<LeftDataType>
+                                || IsDataTypeDateOrDateTime<LeftDataType>)&&IsDataTypeDateOrDateTime<RightDataType>)
+            {
+#define GENERATE_OVERFLOW_MODE_CASE(OVERFLOW_MODE) \
+    case FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE: \
+        result_column = ConvertImpl<LeftDataType, RightDataType, Name, FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE>::execute( \
+            arguments, result_type, input_rows_count, from_string_tag); \
+        break;
+                switch (date_time_overflow_behavior)
+                {
+                    GENERATE_OVERFLOW_MODE_CASE(Throw)
+                    GENERATE_OVERFLOW_MODE_CASE(Ignore)
+                    GENERATE_OVERFLOW_MODE_CASE(Saturate)
+                }
+
+#undef GENERATE_OVERFLOW_MODE_CASE
+            }
+            else if constexpr (IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType>)
+            {
+                using LeftT = typename LeftDataType::FieldType;
+                using RightT = typename RightDataType::FieldType;
+
+                static constexpr bool bad_left =
+                    is_decimal<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
+                static constexpr bool bad_right =
+                    is_decimal<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
+
+                /// Disallow int vs UUID conversion (but support int vs UInt128 conversion)
+                if constexpr ((bad_left && std::is_same_v<RightDataType, DataTypeUUID>) ||
+                              (bad_right && std::is_same_v<LeftDataType, DataTypeUUID>))
+                {
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Wrong UUID conversion");
+                }
+                else
+                {
+                    result_column = ConvertImpl<LeftDataType, RightDataType, Name>::execute(
+                        arguments, result_type, input_rows_count, from_string_tag);
+                }
+            }
+            else
+                  result_column = ConvertImpl<LeftDataType, RightDataType, Name>::execute(arguments, result_type, input_rows_count, from_string_tag);
+
+            return true;
+        };
+
+        if constexpr (mightBeDateTime<Name, ToDataType>())
+        {
+            if (isDateTime64<Name, ToDataType>(arguments))
+            {
+                /// For toDateTime('xxxx-xx-xx xx:xx:xx.00', 2[, 'timezone']) we need to it convert to DateTime64
+                const ColumnWithTypeAndName & scale_column = arguments[1];
+                UInt32 scale = extractToDecimalScale(scale_column);
+
+                if (to_datetime64 || scale != 0) /// When scale = 0, the data type is DateTime otherwise the data type is DateTime64
+                {
+                    if (!callOnIndexAndDataType<DataTypeDateTime64>(
+                            from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag))
+                        throw Exception(
+                            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Illegal type {} of argument of function {}",
+                            arguments[0].type->getName(),
+                            getName());
+
+                    return result_column;
+                }
+            }
+        }
+
+        if constexpr (std::is_same_v<ToDataType, DataTypeString>)
+        {
+            if (from_type->getCustomSerialization())
+                return ConvertImplGenericToString<ColumnString>::execute(arguments, result_type, input_rows_count);
+        }
+
+        bool done = false;
+        if constexpr (is_any_of<ToDataType, DataTypeString, DataTypeFixedString>)
+        {
+            done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag);
+        }
+        else
+        {
+            bool cast_ipv4_ipv6_default_on_conversion_error = false;
+            if constexpr (is_any_of<ToDataType, DataTypeIPv4, DataTypeIPv6>)
+            {
+                if (context && (cast_ipv4_ipv6_default_on_conversion_error = context->getSettingsRef().cast_ipv4_ipv6_default_on_conversion_error))
+                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertReturnZeroOnErrorTag);
+            }
+
+            if (!cast_ipv4_ipv6_default_on_conversion_error)
+            {
+                /// We should use ConvertFromStringExceptionMode::Null mode when converting from String (or FixedString)
+                /// to Nullable type, to avoid 'value is too short' error on attempt to parse empty string from NULL values.
+                if (to_nullable && WhichDataType(from_type).isStringOrFixedString())
+                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertReturnNullOnErrorTag);
+                else
+                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag);
+            }
+        }
+
+        if (!done)
+        {
+            /// Generic conversion of any type to String.
+            if (std::is_same_v<ToDataType, DataTypeString>)
+            {
+                return ConvertImplGenericToString<ColumnString>::execute(arguments, result_type, input_rows_count);
+            }
+            else
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
+                    arguments[0].type->getName(), getName());
+        }
+
+        return result_column;
+    }
+};
+
+
+/** Function toTOrZero (where T is number of date or datetime type):
+  *  try to convert from String to type T through parsing,
+  *  if cannot parse, return default value instead of throwing exception.
+  * Function toTOrNull will return Nullable type with NULL when cannot parse.
+  * NOTE Also need to implement tryToUnixTimestamp with timezone.
+  */
+template <typename ToDataType, typename Name,
+    ConvertFromStringExceptionMode exception_mode,
+    ConvertFromStringParsingMode parsing_mode = ConvertFromStringParsingMode::Normal>
+class FunctionConvertFromString : public IFunction
+{
+public:
+    static constexpr auto name = Name::name;
+    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
+    static constexpr bool to_decimal = IsDataTypeDecimal<ToDataType> && !to_datetime64;
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvertFromString>(); }
+
+    String getName() const override
+    {
+        return name;
+    }
+
+    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; }
+    bool canBeExecutedOnDefaultArguments() const override { return false; }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        DataTypePtr res;
+
+        if (isDateTime64<Name, ToDataType>(arguments))
+        {
+            validateFunctionArgumentTypes(*this, arguments,
+                FunctionArgumentDescriptors{{"string", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"}},
+                // optional
+                FunctionArgumentDescriptors{
+                    {"precision", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isUInt8), isColumnConst, "const UInt8"},
+                    {"timezone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), isColumnConst, "const String or FixedString"},
+                });
+
+            UInt64 scale = to_datetime64 ? DataTypeDateTime64::default_scale : 0;
+            if (arguments.size() > 1)
+                scale = extractToDecimalScale(arguments[1]);
+            const auto timezone = extractTimeZoneNameFromFunctionArguments(arguments, 2, 0, false);
+
+            res = scale == 0 ? res = std::make_shared<DataTypeDateTime>(timezone) : std::make_shared<DataTypeDateTime64>(scale, timezone);
+        }
+        else
+        {
+            if ((arguments.size() != 1 && arguments.size() != 2) || (to_decimal && arguments.size() != 2))
+                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                    "Number of arguments for function {} doesn't match: passed {}, should be 1 or 2. "
+                    "Second argument only make sense for DateTime (time zone, optional) and Decimal (scale).",
+                    getName(), arguments.size());
+
+            if (!isStringOrFixedString(arguments[0].type))
+            {
+                if (this->getName().find("OrZero") != std::string::npos ||
+                    this->getName().find("OrNull") != std::string::npos)
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}. "
+                            "Conversion functions with postfix 'OrZero' or 'OrNull' should take String argument",
+                            arguments[0].type->getName(), getName());
+                else
+                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}",
+                            arguments[0].type->getName(), getName());
+            }
+
+            if (arguments.size() == 2)
+            {
+                if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
+                {
+                    if (!isString(arguments[1].type))
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}",
+                            arguments[1].type->getName(), getName());
+                }
+                else if constexpr (to_decimal)
+                {
+                    if (!isInteger(arguments[1].type))
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}",
+                            arguments[1].type->getName(), getName());
+                    if (!arguments[1].column)
+                        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must be constant", getName());
+                }
+                else
+                {
+                    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                        "Number of arguments for function {} doesn't match: passed {}, should be 1. "
+                        "Second argument makes sense only for DateTime and Decimal.",
+                        getName(), arguments.size());
+                }
+            }
+
+            if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
+                res = std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 1, 0, false));
+            else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "MaterializedMySQL is a bug.");
+            else if constexpr (to_decimal)
+            {
+                UInt64 scale = extractToDecimalScale(arguments[1]);
+                res = createDecimalMaxPrecision<typename ToDataType::FieldType>(scale);
+                if (!res)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Something wrong with toDecimalNNOrZero() or toDecimalNNOrNull()");
+            }
+            else
+                res = std::make_shared<ToDataType>();
+        }
+
+        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
+            res = std::make_shared<DataTypeNullable>(res);
+
+        return res;
+    }
+
+    template <typename ConvertToDataType>
+    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, UInt32 scale) const
+    {
+        const IDataType * from_type = arguments[0].type.get();
+
+        if (checkAndGetDataType<DataTypeString>(from_type))
+        {
+            return ConvertThroughParsing<DataTypeString, ConvertToDataType, Name, exception_mode, parsing_mode>::execute(
+                arguments, result_type, input_rows_count, scale);
+        }
+        else if (checkAndGetDataType<DataTypeFixedString>(from_type))
+        {
+            return ConvertThroughParsing<DataTypeFixedString, ConvertToDataType, Name, exception_mode, parsing_mode>::execute(
+                arguments, result_type, input_rows_count, scale);
+        }
+
+        return nullptr;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        ColumnPtr result_column;
+
+        if constexpr (to_decimal)
+        {
+            result_column = executeInternal<ToDataType>(arguments, result_type, input_rows_count,
+                assert_cast<const ToDataType &>(*removeNullable(result_type)).getScale());
+        }
+        else if constexpr (mightBeDateTime<Name, ToDataType>())
+        {
+            if (isDateTime64<Name, ToDataType>(arguments))
+            {
+                UInt64 scale = to_datetime64 ? DataTypeDateTime64::default_scale : 0;
+                if (arguments.size() > 1)
+                    scale = extractToDecimalScale(arguments[1]);
+
+                if (scale == 0)
+                {
+                    result_column = executeInternal<DataTypeDateTime>(arguments, result_type, input_rows_count, 0);
+                }
+                else
+                {
+                    result_column
+                        = executeInternal<DataTypeDateTime64>(arguments, result_type, input_rows_count, static_cast<UInt32>(scale));
+                }
+            }
+            else
+            {
+                result_column = executeInternal<ToDataType>(arguments, result_type, input_rows_count, 0);
+            }
+        }
+        else
+        {
+            result_column = executeInternal<ToDataType>(arguments, result_type, input_rows_count, 0);
+        }
+
+        if (!result_column)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
+                "Only String or FixedString argument is accepted for try-conversion function. For other arguments, "
+                "use function without 'orZero' or 'orNull'.", arguments[0].type->getName(), getName());
+
+        return result_column;
+    }
+};
+
+
+/// Monotonicity.
+
+struct PositiveMonotonicity
+{
+    static bool has() { return true; }
+    static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
+    {
+        return { .is_monotonic = true };
+    }
+};
+
+struct UnknownMonotonicity
+{
+    static bool has() { return false; }
+    static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
+    {
+        return { };
+    }
+};
+
+template <typename T>
+struct ToNumberMonotonicity
+{
+    static bool has() { return true; }
+
+    static UInt64 divideByRangeOfType(UInt64 x)
+    {
+        if constexpr (sizeof(T) < sizeof(UInt64))
+            return x >> (sizeof(T) * 8);
+        else
+            return 0;
+    }
+
+    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
+    {
+        if (!type.isValueRepresentedByNumber())
+            return {};
+
+        /// If type is same, the conversion is always monotonic.
+        /// (Enum has separate case, because it is different data type)
+        if (checkAndGetDataType<DataTypeNumber<T>>(&type) ||
+            checkAndGetDataType<DataTypeEnum<T>>(&type))
+            return { .is_monotonic = true, .is_always_monotonic = true };
+
+        /// Float cases.
+
+        /// When converting to Float, the conversion is always monotonic.
+        if constexpr (std::is_floating_point_v<T>)
+            return { .is_monotonic = true, .is_always_monotonic = true };
+
+        const auto * low_cardinality = typeid_cast<const DataTypeLowCardinality *>(&type);
+        const IDataType * low_cardinality_dictionary_type = nullptr;
+        if (low_cardinality)
+            low_cardinality_dictionary_type = low_cardinality->getDictionaryType().get();
+
+        WhichDataType which_type(type);
+        WhichDataType which_inner_type = low_cardinality
+            ? WhichDataType(low_cardinality_dictionary_type)
+            : WhichDataType(type);
+
+        /// If converting from Float, for monotonicity, arguments must fit in range of result type.
+        if (which_inner_type.isFloat())
+        {
+            if (left.isNull() || right.isNull())
+                return {};
+
+            Float64 left_float = left.get<Float64>();
+            Float64 right_float = right.get<Float64>();
+
+            if (left_float >= static_cast<Float64>(std::numeric_limits<T>::min())
+                && left_float <= static_cast<Float64>(std::numeric_limits<T>::max())
+                && right_float >= static_cast<Float64>(std::numeric_limits<T>::min())
+                && right_float <= static_cast<Float64>(std::numeric_limits<T>::max()))
+                return { .is_monotonic = true };
+
+            return {};
+        }
+
+        /// Integer cases.
+
+        /// Only support types represented by native integers.
+        /// It can be extended to big integers, decimals and DateTime64 later.
+        /// By the way, NULLs are representing unbounded ranges.
+        if (!((left.isNull() || left.getType() == Field::Types::UInt64 || left.getType() == Field::Types::Int64)
+            && (right.isNull() || right.getType() == Field::Types::UInt64 || right.getType() == Field::Types::Int64)))
+            return {};
+
+        const bool from_is_unsigned = type.isValueRepresentedByUnsignedInteger();
+        const bool to_is_unsigned = is_unsigned_v<T>;
+
+        const size_t size_of_from = type.getSizeOfValueInMemory();
+        const size_t size_of_to = sizeof(T);
+
+        const bool left_in_first_half = left.isNull()
+            ? from_is_unsigned
+            : (left.get<Int64>() >= 0);
+
+        const bool right_in_first_half = right.isNull()
+            ? !from_is_unsigned
+            : (right.get<Int64>() >= 0);
+
+        /// Size of type is the same.
+        if (size_of_from == size_of_to)
+        {
+            if (from_is_unsigned == to_is_unsigned)
+                return { .is_monotonic = true, .is_always_monotonic = true };
+
+            if (left_in_first_half == right_in_first_half)
+                return { .is_monotonic = true };
+
+            return {};
+        }
+
+        /// Size of type is expanded.
+        if (size_of_from < size_of_to)
+        {
+            if (from_is_unsigned == to_is_unsigned)
+                return { .is_monotonic = true, .is_always_monotonic = true };
+
+            if (!to_is_unsigned)
+                return { .is_monotonic = true, .is_always_monotonic = true };
+
+            /// signed -> unsigned. If arguments from the same half, then function is monotonic.
+            if (left_in_first_half == right_in_first_half)
+                return { .is_monotonic = true };
+
+            return {};
+        }
+
+        /// Size of type is shrunk.
+        if (size_of_from > size_of_to)
+        {
+            /// Function cannot be monotonic on unbounded ranges.
+            if (left.isNull() || right.isNull())
+                return {};
+
+            /// Function cannot be monotonic when left and right are not on the same ranges.
+            if (divideByRangeOfType(left.get<UInt64>()) != divideByRangeOfType(right.get<UInt64>()))
+                return {};
+
+            if (to_is_unsigned)
+                return { .is_monotonic = true };
+            else
+            {
+                // If To is signed, it's possible that the signedness is different after conversion. So we check it explicitly.
+                const bool is_monotonic = (T(left.get<UInt64>()) >= 0) == (T(right.get<UInt64>()) >= 0);
+
+                return { .is_monotonic = is_monotonic };
+            }
+        }
+
+        UNREACHABLE();
+    }
+};
+
+struct ToDateMonotonicity
+{
+    static bool has() { return true; }
+
+    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
+    {
+        auto which = WhichDataType(type);
+        if (which.isDateOrDate32() || which.isDateTime() || which.isDateTime64() || which.isInt8() || which.isInt16() || which.isUInt8()
+            || which.isUInt16())
+        {
+            return {.is_monotonic = true, .is_always_monotonic = true};
+        }
+        else if (
+            ((left.getType() == Field::Types::UInt64 || left.isNull()) && (right.getType() == Field::Types::UInt64 || right.isNull())
+             && ((left.isNull() || left.get<UInt64>() < 0xFFFF) && (right.isNull() || right.get<UInt64>() >= 0xFFFF)))
+            || ((left.getType() == Field::Types::Int64 || left.isNull()) && (right.getType() == Field::Types::Int64 || right.isNull())
+                && ((left.isNull() || left.get<Int64>() < 0xFFFF) && (right.isNull() || right.get<Int64>() >= 0xFFFF)))
+            || ((
+                (left.getType() == Field::Types::Float64 || left.isNull())
+                && (right.getType() == Field::Types::Float64 || right.isNull())
+                && ((left.isNull() || left.get<Float64>() < 0xFFFF) && (right.isNull() || right.get<Float64>() >= 0xFFFF))))
+            || !isNativeNumber(type))
+        {
+            return {};
+        }
+        else
+        {
+            return {.is_monotonic = true, .is_always_monotonic = true};
+        }
+    }
+};
+
+struct ToDateTimeMonotonicity
+{
+    static bool has() { return true; }
+
+    static IFunction::Monotonicity get(const IDataType & type, const Field &, const Field &)
+    {
+        if (type.isValueRepresentedByNumber())
+            return {.is_monotonic = true, .is_always_monotonic = true};
+        else
+            return {};
+    }
+};
+
+/** The monotonicity for the `toString` function is mainly determined for test purposes.
+  * It is doubtful that anyone is looking to optimize queries with conditions `toString(CounterID) = 34`.
+  */
+struct ToStringMonotonicity
+{
+    static bool has() { return true; }
+
+    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
+    {
+        IFunction::Monotonicity positive{ .is_monotonic = true };
+        IFunction::Monotonicity not_monotonic;
+
+        const auto * type_ptr = &type;
+        if (const auto * low_cardinality_type = checkAndGetDataType<DataTypeLowCardinality>(type_ptr))
+            type_ptr = low_cardinality_type->getDictionaryType().get();
+
+        /// Order on enum values (which is the order on integers) is completely arbitrary in respect to the order on strings.
+        if (WhichDataType(type).isEnum())
+            return not_monotonic;
+
+        /// `toString` function is monotonous if the argument is Date or Date32 or DateTime or String, or non-negative numbers with the same number of symbols.
+        if (checkDataTypes<DataTypeDate, DataTypeDate32, DataTypeDateTime, DataTypeString>(type_ptr))
+            return positive;
+
+        if (left.isNull() || right.isNull())
+            return {};
+
+        if (left.getType() == Field::Types::UInt64
+            && right.getType() == Field::Types::UInt64)
+        {
+            return (left.get<Int64>() == 0 && right.get<Int64>() == 0)
+                || (floor(log10(left.get<UInt64>())) == floor(log10(right.get<UInt64>())))
+                ? positive : not_monotonic;
+        }
+
+        if (left.getType() == Field::Types::Int64
+            && right.getType() == Field::Types::Int64)
+        {
+            return (left.get<Int64>() == 0 && right.get<Int64>() == 0)
+                || (left.get<Int64>() > 0 && right.get<Int64>() > 0 && floor(log10(left.get<Int64>())) == floor(log10(right.get<Int64>())))
+                ? positive : not_monotonic;
+        }
+
+        return not_monotonic;
+    }
+};
+
+
+struct NameToUInt8 { static constexpr auto name = "toUInt8"; };
+struct NameToUInt16 { static constexpr auto name = "toUInt16"; };
+struct NameToUInt32 { static constexpr auto name = "toUInt32"; };
+struct NameToUInt64 { static constexpr auto name = "toUInt64"; };
+struct NameToUInt128 { static constexpr auto name = "toUInt128"; };
+struct NameToUInt256 { static constexpr auto name = "toUInt256"; };
+struct NameToInt8 { static constexpr auto name = "toInt8"; };
+struct NameToInt16 { static constexpr auto name = "toInt16"; };
+struct NameToInt32 { static constexpr auto name = "toInt32"; };
+struct NameToInt64 { static constexpr auto name = "toInt64"; };
+struct NameToInt128 { static constexpr auto name = "toInt128"; };
+struct NameToInt256 { static constexpr auto name = "toInt256"; };
+struct NameToFloat32 { static constexpr auto name = "toFloat32"; };
+struct NameToFloat64 { static constexpr auto name = "toFloat64"; };
+struct NameToUUID { static constexpr auto name = "toUUID"; };
+struct NameToIPv4 { static constexpr auto name = "toIPv4"; };
+struct NameToIPv6 { static constexpr auto name = "toIPv6"; };
+
+using FunctionToUInt8 = FunctionConvert<DataTypeUInt8, NameToUInt8, ToNumberMonotonicity<UInt8>>;
+using FunctionToUInt16 = FunctionConvert<DataTypeUInt16, NameToUInt16, ToNumberMonotonicity<UInt16>>;
+using FunctionToUInt32 = FunctionConvert<DataTypeUInt32, NameToUInt32, ToNumberMonotonicity<UInt32>>;
+using FunctionToUInt64 = FunctionConvert<DataTypeUInt64, NameToUInt64, ToNumberMonotonicity<UInt64>>;
+using FunctionToUInt128 = FunctionConvert<DataTypeUInt128, NameToUInt128, ToNumberMonotonicity<UInt128>>;
+using FunctionToUInt256 = FunctionConvert<DataTypeUInt256, NameToUInt256, ToNumberMonotonicity<UInt256>>;
+using FunctionToInt8 = FunctionConvert<DataTypeInt8, NameToInt8, ToNumberMonotonicity<Int8>>;
+using FunctionToInt16 = FunctionConvert<DataTypeInt16, NameToInt16, ToNumberMonotonicity<Int16>>;
+using FunctionToInt32 = FunctionConvert<DataTypeInt32, NameToInt32, ToNumberMonotonicity<Int32>>;
+using FunctionToInt64 = FunctionConvert<DataTypeInt64, NameToInt64, ToNumberMonotonicity<Int64>>;
+using FunctionToInt128 = FunctionConvert<DataTypeInt128, NameToInt128, ToNumberMonotonicity<Int128>>;
+using FunctionToInt256 = FunctionConvert<DataTypeInt256, NameToInt256, ToNumberMonotonicity<Int256>>;
+using FunctionToFloat32 = FunctionConvert<DataTypeFloat32, NameToFloat32, ToNumberMonotonicity<Float32>>;
+using FunctionToFloat64 = FunctionConvert<DataTypeFloat64, NameToFloat64, ToNumberMonotonicity<Float64>>;
+
+using FunctionToDate = FunctionConvert<DataTypeDate, NameToDate, ToDateMonotonicity>;
+
+using FunctionToDate32 = FunctionConvert<DataTypeDate32, NameToDate32, ToDateMonotonicity>;
+
+using FunctionToDateTime = FunctionConvert<DataTypeDateTime, NameToDateTime, ToDateTimeMonotonicity>;
+
+using FunctionToDateTime32 = FunctionConvert<DataTypeDateTime, NameToDateTime32, ToDateTimeMonotonicity>;
+
+using FunctionToDateTime64 = FunctionConvert<DataTypeDateTime64, NameToDateTime64, ToDateTimeMonotonicity>;
+
+using FunctionToUUID = FunctionConvert<DataTypeUUID, NameToUUID, ToNumberMonotonicity<UInt128>>;
+using FunctionToIPv4 = FunctionConvert<DataTypeIPv4, NameToIPv4, ToNumberMonotonicity<UInt32>>;
+using FunctionToIPv6 = FunctionConvert<DataTypeIPv6, NameToIPv6, ToNumberMonotonicity<UInt128>>;
+using FunctionToString = FunctionConvert<DataTypeString, NameToString, ToStringMonotonicity>;
+using FunctionToUnixTimestamp = FunctionConvert<DataTypeUInt32, NameToUnixTimestamp, ToNumberMonotonicity<UInt32>>;
+using FunctionToDecimal32 = FunctionConvert<DataTypeDecimal<Decimal32>, NameToDecimal32, UnknownMonotonicity>;
+using FunctionToDecimal64 = FunctionConvert<DataTypeDecimal<Decimal64>, NameToDecimal64, UnknownMonotonicity>;
+using FunctionToDecimal128 = FunctionConvert<DataTypeDecimal<Decimal128>, NameToDecimal128, UnknownMonotonicity>;
+using FunctionToDecimal256 = FunctionConvert<DataTypeDecimal<Decimal256>, NameToDecimal256, UnknownMonotonicity>;
+
+template <typename DataType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior> struct FunctionTo;
+
+template <> struct FunctionTo<DataTypeUInt8> { using Type = FunctionToUInt8; };
+template <> struct FunctionTo<DataTypeUInt16> { using Type = FunctionToUInt16; };
+template <> struct FunctionTo<DataTypeUInt32> { using Type = FunctionToUInt32; };
+template <> struct FunctionTo<DataTypeUInt64> { using Type = FunctionToUInt64; };
+template <> struct FunctionTo<DataTypeUInt128> { using Type = FunctionToUInt128; };
+template <> struct FunctionTo<DataTypeUInt256> { using Type = FunctionToUInt256; };
+template <> struct FunctionTo<DataTypeInt8> { using Type = FunctionToInt8; };
+template <> struct FunctionTo<DataTypeInt16> { using Type = FunctionToInt16; };
+template <> struct FunctionTo<DataTypeInt32> { using Type = FunctionToInt32; };
+template <> struct FunctionTo<DataTypeInt64> { using Type = FunctionToInt64; };
+template <> struct FunctionTo<DataTypeInt128> { using Type = FunctionToInt128; };
+template <> struct FunctionTo<DataTypeInt256> { using Type = FunctionToInt256; };
+template <> struct FunctionTo<DataTypeFloat32> { using Type = FunctionToFloat32; };
+template <> struct FunctionTo<DataTypeFloat64> { using Type = FunctionToFloat64; };
+
+template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct FunctionTo<DataTypeDate, date_time_overflow_behavior> { using Type = FunctionToDate; };
+
+template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct FunctionTo<DataTypeDate32, date_time_overflow_behavior> { using Type = FunctionToDate32; };
+
+template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct FunctionTo<DataTypeDateTime, date_time_overflow_behavior> { using Type = FunctionToDateTime; };
+
+template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
+struct FunctionTo<DataTypeDateTime64, date_time_overflow_behavior> { using Type = FunctionToDateTime64; };
+
+template <> struct FunctionTo<DataTypeUUID> { using Type = FunctionToUUID; };
+template <> struct FunctionTo<DataTypeIPv4> { using Type = FunctionToIPv4; };
+template <> struct FunctionTo<DataTypeIPv6> { using Type = FunctionToIPv6; };
+template <> struct FunctionTo<DataTypeString> { using Type = FunctionToString; };
+template <> struct FunctionTo<DataTypeFixedString> { using Type = FunctionToFixedString; };
+template <> struct FunctionTo<DataTypeDecimal<Decimal32>> { using Type = FunctionToDecimal32; };
+template <> struct FunctionTo<DataTypeDecimal<Decimal64>> { using Type = FunctionToDecimal64; };
+template <> struct FunctionTo<DataTypeDecimal<Decimal128>> { using Type = FunctionToDecimal128; };
+template <> struct FunctionTo<DataTypeDecimal<Decimal256>> { using Type = FunctionToDecimal256; };
+
+template <typename FieldType> struct FunctionTo<DataTypeEnum<FieldType>>
+    : FunctionTo<DataTypeNumber<FieldType>>
+{
+};
+
+struct NameToUInt8OrZero { static constexpr auto name = "toUInt8OrZero"; };
+struct NameToUInt16OrZero { static constexpr auto name = "toUInt16OrZero"; };
+struct NameToUInt32OrZero { static constexpr auto name = "toUInt32OrZero"; };
+struct NameToUInt64OrZero { static constexpr auto name = "toUInt64OrZero"; };
+struct NameToUInt128OrZero { static constexpr auto name = "toUInt128OrZero"; };
+struct NameToUInt256OrZero { static constexpr auto name = "toUInt256OrZero"; };
+struct NameToInt8OrZero { static constexpr auto name = "toInt8OrZero"; };
+struct NameToInt16OrZero { static constexpr auto name = "toInt16OrZero"; };
+struct NameToInt32OrZero { static constexpr auto name = "toInt32OrZero"; };
+struct NameToInt64OrZero { static constexpr auto name = "toInt64OrZero"; };
+struct NameToInt128OrZero { static constexpr auto name = "toInt128OrZero"; };
+struct NameToInt256OrZero { static constexpr auto name = "toInt256OrZero"; };
+struct NameToFloat32OrZero { static constexpr auto name = "toFloat32OrZero"; };
+struct NameToFloat64OrZero { static constexpr auto name = "toFloat64OrZero"; };
+struct NameToDateOrZero { static constexpr auto name = "toDateOrZero"; };
+struct NameToDate32OrZero { static constexpr auto name = "toDate32OrZero"; };
+struct NameToDateTimeOrZero { static constexpr auto name = "toDateTimeOrZero"; };
+struct NameToDateTime64OrZero { static constexpr auto name = "toDateTime64OrZero"; };
+struct NameToDecimal32OrZero { static constexpr auto name = "toDecimal32OrZero"; };
+struct NameToDecimal64OrZero { static constexpr auto name = "toDecimal64OrZero"; };
+struct NameToDecimal128OrZero { static constexpr auto name = "toDecimal128OrZero"; };
+struct NameToDecimal256OrZero { static constexpr auto name = "toDecimal256OrZero"; };
+struct NameToUUIDOrZero { static constexpr auto name = "toUUIDOrZero"; };
+struct NameToIPv4OrZero { static constexpr auto name = "toIPv4OrZero"; };
+struct NameToIPv6OrZero { static constexpr auto name = "toIPv6OrZero"; };
+
+using FunctionToUInt8OrZero = FunctionConvertFromString<DataTypeUInt8, NameToUInt8OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt16OrZero = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt32OrZero = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt64OrZero = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt128OrZero = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUInt256OrZero = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt8OrZero = FunctionConvertFromString<DataTypeInt8, NameToInt8OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt16OrZero = FunctionConvertFromString<DataTypeInt16, NameToInt16OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt32OrZero = FunctionConvertFromString<DataTypeInt32, NameToInt32OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt64OrZero = FunctionConvertFromString<DataTypeInt64, NameToInt64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt128OrZero = FunctionConvertFromString<DataTypeInt128, NameToInt128OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToInt256OrZero = FunctionConvertFromString<DataTypeInt256, NameToInt256OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToFloat32OrZero = FunctionConvertFromString<DataTypeFloat32, NameToFloat32OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToFloat64OrZero = FunctionConvertFromString<DataTypeFloat64, NameToFloat64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDateOrZero = FunctionConvertFromString<DataTypeDate, NameToDateOrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDate32OrZero = FunctionConvertFromString<DataTypeDate32, NameToDate32OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDateTimeOrZero = FunctionConvertFromString<DataTypeDateTime, NameToDateTimeOrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDateTime64OrZero = FunctionConvertFromString<DataTypeDateTime64, NameToDateTime64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDecimal32OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal32>, NameToDecimal32OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDecimal64OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal64>, NameToDecimal64OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDecimal128OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal128>, NameToDecimal128OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToDecimal256OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal256>, NameToDecimal256OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToUUIDOrZero = FunctionConvertFromString<DataTypeUUID, NameToUUIDOrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToIPv4OrZero = FunctionConvertFromString<DataTypeIPv4, NameToIPv4OrZero, ConvertFromStringExceptionMode::Zero>;
+using FunctionToIPv6OrZero = FunctionConvertFromString<DataTypeIPv6, NameToIPv6OrZero, ConvertFromStringExceptionMode::Zero>;
+
+struct NameToUInt8OrNull { static constexpr auto name = "toUInt8OrNull"; };
+struct NameToUInt16OrNull { static constexpr auto name = "toUInt16OrNull"; };
+struct NameToUInt32OrNull { static constexpr auto name = "toUInt32OrNull"; };
+struct NameToUInt64OrNull { static constexpr auto name = "toUInt64OrNull"; };
+struct NameToUInt128OrNull { static constexpr auto name = "toUInt128OrNull"; };
+struct NameToUInt256OrNull { static constexpr auto name = "toUInt256OrNull"; };
+struct NameToInt8OrNull { static constexpr auto name = "toInt8OrNull"; };
+struct NameToInt16OrNull { static constexpr auto name = "toInt16OrNull"; };
+struct NameToInt32OrNull { static constexpr auto name = "toInt32OrNull"; };
+struct NameToInt64OrNull { static constexpr auto name = "toInt64OrNull"; };
+struct NameToInt128OrNull { static constexpr auto name = "toInt128OrNull"; };
+struct NameToInt256OrNull { static constexpr auto name = "toInt256OrNull"; };
+struct NameToFloat32OrNull { static constexpr auto name = "toFloat32OrNull"; };
+struct NameToFloat64OrNull { static constexpr auto name = "toFloat64OrNull"; };
+struct NameToDateOrNull { static constexpr auto name = "toDateOrNull"; };
+struct NameToDate32OrNull { static constexpr auto name = "toDate32OrNull"; };
+struct NameToDateTimeOrNull { static constexpr auto name = "toDateTimeOrNull"; };
+struct NameToDateTime64OrNull { static constexpr auto name = "toDateTime64OrNull"; };
+struct NameToDecimal32OrNull { static constexpr auto name = "toDecimal32OrNull"; };
+struct NameToDecimal64OrNull { static constexpr auto name = "toDecimal64OrNull"; };
+struct NameToDecimal128OrNull { static constexpr auto name = "toDecimal128OrNull"; };
+struct NameToDecimal256OrNull { static constexpr auto name = "toDecimal256OrNull"; };
+struct NameToUUIDOrNull { static constexpr auto name = "toUUIDOrNull"; };
+struct NameToIPv4OrNull { static constexpr auto name = "toIPv4OrNull"; };
+struct NameToIPv6OrNull { static constexpr auto name = "toIPv6OrNull"; };
+
+using FunctionToUInt8OrNull = FunctionConvertFromString<DataTypeUInt8, NameToUInt8OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt16OrNull = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt32OrNull = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt64OrNull = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt128OrNull = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUInt256OrNull = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt8OrNull = FunctionConvertFromString<DataTypeInt8, NameToInt8OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt16OrNull = FunctionConvertFromString<DataTypeInt16, NameToInt16OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt32OrNull = FunctionConvertFromString<DataTypeInt32, NameToInt32OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt64OrNull = FunctionConvertFromString<DataTypeInt64, NameToInt64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt128OrNull = FunctionConvertFromString<DataTypeInt128, NameToInt128OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToInt256OrNull = FunctionConvertFromString<DataTypeInt256, NameToInt256OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToFloat32OrNull = FunctionConvertFromString<DataTypeFloat32, NameToFloat32OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToFloat64OrNull = FunctionConvertFromString<DataTypeFloat64, NameToFloat64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDateOrNull = FunctionConvertFromString<DataTypeDate, NameToDateOrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDate32OrNull = FunctionConvertFromString<DataTypeDate32, NameToDate32OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDateTimeOrNull = FunctionConvertFromString<DataTypeDateTime, NameToDateTimeOrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDateTime64OrNull = FunctionConvertFromString<DataTypeDateTime64, NameToDateTime64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDecimal32OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal32>, NameToDecimal32OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDecimal64OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal64>, NameToDecimal64OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDecimal128OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal128>, NameToDecimal128OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToDecimal256OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal256>, NameToDecimal256OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToUUIDOrNull = FunctionConvertFromString<DataTypeUUID, NameToUUIDOrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToIPv4OrNull = FunctionConvertFromString<DataTypeIPv4, NameToIPv4OrNull, ConvertFromStringExceptionMode::Null>;
+using FunctionToIPv6OrNull = FunctionConvertFromString<DataTypeIPv6, NameToIPv6OrNull, ConvertFromStringExceptionMode::Null>;
+
+struct NameParseDateTimeBestEffort { static constexpr auto name = "parseDateTimeBestEffort"; };
+struct NameParseDateTimeBestEffortOrZero { static constexpr auto name = "parseDateTimeBestEffortOrZero"; };
+struct NameParseDateTimeBestEffortOrNull { static constexpr auto name = "parseDateTimeBestEffortOrNull"; };
+struct NameParseDateTimeBestEffortUS { static constexpr auto name = "parseDateTimeBestEffortUS"; };
+struct NameParseDateTimeBestEffortUSOrZero { static constexpr auto name = "parseDateTimeBestEffortUSOrZero"; };
+struct NameParseDateTimeBestEffortUSOrNull { static constexpr auto name = "parseDateTimeBestEffortUSOrNull"; };
+struct NameParseDateTime32BestEffort { static constexpr auto name = "parseDateTime32BestEffort"; };
+struct NameParseDateTime32BestEffortOrZero { static constexpr auto name = "parseDateTime32BestEffortOrZero"; };
+struct NameParseDateTime32BestEffortOrNull { static constexpr auto name = "parseDateTime32BestEffortOrNull"; };
+struct NameParseDateTime64BestEffort { static constexpr auto name = "parseDateTime64BestEffort"; };
+struct NameParseDateTime64BestEffortOrZero { static constexpr auto name = "parseDateTime64BestEffortOrZero"; };
+struct NameParseDateTime64BestEffortOrNull { static constexpr auto name = "parseDateTime64BestEffortOrNull"; };
+struct NameParseDateTime64BestEffortUS { static constexpr auto name = "parseDateTime64BestEffortUS"; };
+struct NameParseDateTime64BestEffortUSOrZero { static constexpr auto name = "parseDateTime64BestEffortUSOrZero"; };
+struct NameParseDateTime64BestEffortUSOrNull { static constexpr auto name = "parseDateTime64BestEffortUSOrNull"; };
+
+
+using FunctionParseDateTimeBestEffort = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTimeBestEffortOrZero = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTimeBestEffortOrNull = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
+
+using FunctionParseDateTimeBestEffortUS = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTimeBestEffortUSOrZero = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTimeBestEffortUSOrNull = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTimeBestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
+
+using FunctionParseDateTime32BestEffort = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTime32BestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTime32BestEffortOrZero = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTime32BestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTime32BestEffortOrNull = FunctionConvertFromString<
+    DataTypeDateTime, NameParseDateTime32BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
+
+using FunctionParseDateTime64BestEffort = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTime64BestEffortOrZero = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
+using FunctionParseDateTime64BestEffortOrNull = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
+
+using FunctionParseDateTime64BestEffortUS = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrZero = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
+using FunctionParseDateTime64BestEffortUSOrNull = FunctionConvertFromString<
+    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
+
+
+class ExecutableFunctionCast : public IExecutableFunction
+{
+public:
+    using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
+
+    explicit ExecutableFunctionCast(
+            WrapperType && wrapper_function_, const char * name_, std::optional<CastDiagnostic> diagnostic_)
+            : wrapper_function(std::move(wrapper_function_)), name(name_), diagnostic(std::move(diagnostic_)) {}
+
+    String getName() const override { return name; }
+
+protected:
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        /// drop second argument, pass others
+        ColumnsWithTypeAndName new_arguments{arguments.front()};
+        if (arguments.size() > 2)
+            new_arguments.insert(std::end(new_arguments), std::next(std::begin(arguments), 2), std::end(arguments));
+
+        try
+        {
+            return wrapper_function(new_arguments, result_type, nullptr, input_rows_count);
+        }
+        catch (Exception & e)
+        {
+            if (diagnostic)
+                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
+                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
+            throw;
+        }
+    }
+
+    bool useDefaultImplementationForNulls() const override { return false; }
+    /// CAST(Nothing, T) -> T
+    bool useDefaultImplementationForNothing() const override { return false; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+
+private:
+    WrapperType wrapper_function;
+    const char * name;
+    std::optional<CastDiagnostic> diagnostic;
+};
+
+
+struct FunctionCastName
+{
+    static constexpr auto name = "CAST";
+};
+
+class FunctionCast final : public IFunctionBase
+{
+public:
+    using MonotonicityForRange = std::function<Monotonicity(const IDataType &, const Field &, const Field &)>;
+    using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
+
+    FunctionCast(ContextPtr context_
+            , const char * cast_name_
+            , MonotonicityForRange && monotonicity_for_range_
+            , const DataTypes & argument_types_
+            , const DataTypePtr & return_type_
+            , std::optional<CastDiagnostic> diagnostic_
+            , CastType cast_type_)
+        : cast_name(cast_name_), monotonicity_for_range(std::move(monotonicity_for_range_))
+        , argument_types(argument_types_), return_type(return_type_), diagnostic(std::move(diagnostic_))
+        , cast_type(cast_type_)
+        , context(context_)
+    {
+    }
+
+    const DataTypes & getArgumentTypes() const override { return argument_types; }
+    const DataTypePtr & getResultType() const override { return return_type; }
+
+    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
+    {
+        try
+        {
+            return std::make_unique<ExecutableFunctionCast>(
+                prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), cast_name, diagnostic);
+        }
+        catch (Exception & e)
+        {
+            if (diagnostic)
+                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
+                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
+            throw;
+        }
+    }
+
+    String getName() const override { return cast_name; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    bool hasInformationAboutMonotonicity() const override
+    {
+        return static_cast<bool>(monotonicity_for_range);
+    }
+
+    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
+    {
+        return monotonicity_for_range(type, left, right);
+    }
+
+private:
+    const char * cast_name;
+    MonotonicityForRange monotonicity_for_range;
+
+    DataTypes argument_types;
+    DataTypePtr return_type;
+
+    std::optional<CastDiagnostic> diagnostic;
+    CastType cast_type;
+    ContextPtr context;
+
+    static WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type)
+    {
+        auto function_adaptor = std::make_unique<FunctionToOverloadResolverAdaptor>(function)->build({ColumnWithTypeAndName{nullptr, from_type, ""}});
+
+        return [function_adaptor]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
+        {
+            return function_adaptor->execute(arguments, result_type, input_rows_count);
+        };
+    }
+
+    static WrapperType createToNullableColumnWrapper()
+    {
+        return [] (ColumnsWithTypeAndName &, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
+        {
+            ColumnPtr res = result_type->createColumn();
+            ColumnUInt8::Ptr col_null_map_to = ColumnUInt8::create(input_rows_count, true);
+            return ColumnNullable::create(res->cloneResized(input_rows_count), std::move(col_null_map_to));
+        };
+    }
+
+    template <typename ToDataType>
+    WrapperType createWrapper(const DataTypePtr & from_type, const ToDataType * const to_type, bool requested_result_is_nullable) const
+    {
+        TypeIndex from_type_index = from_type->getTypeId();
+        WhichDataType which(from_type_index);
+        bool can_apply_accurate_cast = (cast_type == CastType::accurate || cast_type == CastType::accurateOrNull)
+            && (which.isInt() || which.isUInt() || which.isFloat());
+
+        FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior;
+        if (context)
+            date_time_overflow_behavior = context->getSettingsRef().date_time_overflow_behavior;
+
+        if (requested_result_is_nullable && checkAndGetDataType<DataTypeString>(from_type.get()))
+        {
+            /// In case when converting to Nullable type, we apply different parsing rule,
+            /// that will not throw an exception but return NULL in case of malformed input.
+            FunctionPtr function = FunctionConvertFromString<ToDataType, FunctionCastName, ConvertFromStringExceptionMode::Null>::create(context);
+            return createFunctionAdaptor(function, from_type);
+        }
+        else if (!can_apply_accurate_cast)
+        {
+            FunctionPtr function = FunctionTo<ToDataType>::Type::create(context);
+            return createFunctionAdaptor(function, from_type);
+        }
+
+        return [wrapper_cast_type = cast_type, from_type_index, to_type, date_time_overflow_behavior]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t input_rows_count)
+        {
+            ColumnPtr result_column;
+            auto res = callOnIndexAndDataType<ToDataType>(from_type_index, [&](const auto & types) -> bool
+            {
+                using Types = std::decay_t<decltype(types)>;
+                using LeftDataType = typename Types::LeftType;
+                using RightDataType = typename Types::RightType;
+
+                if constexpr (IsDataTypeNumber<LeftDataType>)
+                {
+                    if constexpr (IsDataTypeDateOrDateTime<RightDataType>)
+                    {
+#define GENERATE_OVERFLOW_MODE_CASE(OVERFLOW_MODE, ADDITIONS) \
+    case FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE: \
+        result_column \
+            = ConvertImpl<LeftDataType, RightDataType, FunctionCastName, FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE>:: \
+                execute(arguments, result_type, input_rows_count, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag, ADDITIONS()); \
+        break;
+                        if (wrapper_cast_type == CastType::accurate)
+                        {
+                            switch (date_time_overflow_behavior)
+                            {
+                                GENERATE_OVERFLOW_MODE_CASE(Throw, DateTimeAccurateConvertStrategyAdditions)
+                                GENERATE_OVERFLOW_MODE_CASE(Ignore, DateTimeAccurateConvertStrategyAdditions)
+                                GENERATE_OVERFLOW_MODE_CASE(Saturate, DateTimeAccurateConvertStrategyAdditions)
+                            }
+                        }
+                        else
+                        {
+                            switch (date_time_overflow_behavior)
+                            {
+                                GENERATE_OVERFLOW_MODE_CASE(Throw, DateTimeAccurateOrNullConvertStrategyAdditions)
+                                GENERATE_OVERFLOW_MODE_CASE(Ignore, DateTimeAccurateOrNullConvertStrategyAdditions)
+                                GENERATE_OVERFLOW_MODE_CASE(Saturate, DateTimeAccurateOrNullConvertStrategyAdditions)
+                            }
+                        }
+#undef GENERATE_OVERFLOW_MODE_CASE
+
+                        return true;
+                    }
+                    else if constexpr (IsDataTypeNumber<RightDataType>)
+                    {
+                        if (wrapper_cast_type == CastType::accurate)
+                        {
+                            result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(
+                                arguments,
+                                result_type,
+                                input_rows_count,
+                                BehaviourOnErrorFromString::ConvertDefaultBehaviorTag,
+                                AccurateConvertStrategyAdditions());
+                        }
+                        else
+                        {
+                            result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(
+                                arguments,
+                                result_type,
+                                input_rows_count,
+                                BehaviourOnErrorFromString::ConvertDefaultBehaviorTag,
+                                AccurateOrNullConvertStrategyAdditions());
+                        }
+
+                        return true;
+                    }
+                }
+
+                return false;
+            });
+
+            /// Additionally check if callOnIndexAndDataType wasn't called at all.
+            if (!res)
+            {
+                if (wrapper_cast_type == CastType::accurateOrNull)
+                {
+                    auto nullable_column_wrapper = FunctionCast::createToNullableColumnWrapper();
+                    return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
+                }
+                else
+                {
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        from_type_index, to_type->getName());
+                }
+            }
+
+            return result_column;
+        };
+    }
+
+    template <typename ToDataType>
+    WrapperType createBoolWrapper(const DataTypePtr & from_type, const ToDataType * const to_type, bool requested_result_is_nullable) const
+    {
+        if (checkAndGetDataType<DataTypeString>(from_type.get()))
+        {
+            if (cast_type == CastType::accurateOrNull)
+                return &ConvertImplGenericFromString<false>::execute;
+            return &ConvertImplGenericFromString<true>::execute;
+        }
+
+        return createWrapper<ToDataType>(from_type, to_type, requested_result_is_nullable);
+    }
+
+    WrapperType createUInt8ToBoolWrapper(const DataTypePtr from_type, const DataTypePtr to_type) const
+    {
+        return [from_type, to_type] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/) -> ColumnPtr
+        {
+            /// Special case when we convert UInt8 column to Bool column.
+            /// both columns have type UInt8, but we shouldn't use identity wrapper,
+            /// because Bool column can contain only 0 and 1.
+            auto res_column = to_type->createColumn();
+            const auto & data_from = checkAndGetColumn<ColumnUInt8>(arguments[0].column.get())->getData();
+            auto & data_to = assert_cast<ColumnUInt8 *>(res_column.get())->getData();
+            data_to.resize(data_from.size());
+            for (size_t i = 0; i != data_from.size(); ++i)
+                data_to[i] = static_cast<bool>(data_from[i]);
+            return res_column;
+        };
+    }
+
+    WrapperType createStringWrapper(const DataTypePtr & from_type) const
+    {
+        FunctionPtr function = FunctionToString::create(context);
+        return createFunctionAdaptor(function, from_type);
+    }
+
+    WrapperType createFixedStringWrapper(const DataTypePtr & from_type, const size_t N) const
+    {
+        if (!isStringOrFixedString(from_type))
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "CAST AS FixedString is only implemented for types String and FixedString");
+
+        bool exception_mode_null = cast_type == CastType::accurateOrNull;
+        return [exception_mode_null, N] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/)
+        {
+            if (exception_mode_null)
+                return FunctionToFixedString::executeForN<ConvertToFixedStringExceptionMode::Null>(arguments, N);
+            else
+                return FunctionToFixedString::executeForN<ConvertToFixedStringExceptionMode::Throw>(arguments, N);
+        };
+    }
+
+#define GENERATE_INTERVAL_CASE(INTERVAL_KIND) \
+            case IntervalKind::Kind::INTERVAL_KIND: \
+                return createFunctionAdaptor(FunctionConvert<DataTypeInterval, NameToInterval##INTERVAL_KIND, PositiveMonotonicity>::create(context), from_type);
+
+    WrapperType createIntervalWrapper(const DataTypePtr & from_type, IntervalKind kind) const
+    {
+        switch (kind.kind)
+        {
+            GENERATE_INTERVAL_CASE(Nanosecond)
+            GENERATE_INTERVAL_CASE(Microsecond)
+            GENERATE_INTERVAL_CASE(Millisecond)
+            GENERATE_INTERVAL_CASE(Second)
+            GENERATE_INTERVAL_CASE(Minute)
+            GENERATE_INTERVAL_CASE(Hour)
+            GENERATE_INTERVAL_CASE(Day)
+            GENERATE_INTERVAL_CASE(Week)
+            GENERATE_INTERVAL_CASE(Month)
+            GENERATE_INTERVAL_CASE(Quarter)
+            GENERATE_INTERVAL_CASE(Year)
+        }
+        throw Exception{ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion to unexpected IntervalKind: {}", kind.toString()};
+    }
+
+#undef GENERATE_INTERVAL_CASE
+
+    template <typename ToDataType>
+    requires IsDataTypeDecimal<ToDataType>
+    WrapperType createDecimalWrapper(const DataTypePtr & from_type, const ToDataType * to_type, bool requested_result_is_nullable) const
+    {
+        TypeIndex type_index = from_type->getTypeId();
+        UInt32 scale = to_type->getScale();
+
+        WhichDataType which(type_index);
+        bool ok = which.isNativeInt() || which.isNativeUInt() || which.isDecimal() || which.isFloat() || which.isDateOrDate32() || which.isDateTime() || which.isDateTime64()
+            || which.isStringOrFixedString();
+        if (!ok)
+        {
+            if (cast_type == CastType::accurateOrNull)
+                return createToNullableColumnWrapper();
+            else
+                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
+                    from_type->getName(), to_type->getName());
+        }
+
+        auto wrapper_cast_type = cast_type;
+
+        return [wrapper_cast_type, type_index, scale, to_type, requested_result_is_nullable]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *column_nullable, size_t input_rows_count)
+        {
+            ColumnPtr result_column;
+            auto res = callOnIndexAndDataType<ToDataType>(type_index, [&](const auto & types) -> bool
+            {
+                using Types = std::decay_t<decltype(types)>;
+                using LeftDataType = typename Types::LeftType;
+                using RightDataType = typename Types::RightType;
+
+                if constexpr (IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType> && !std::is_same_v<DataTypeDateTime64, RightDataType>)
+                {
+                    if (wrapper_cast_type == CastType::accurate)
+                    {
+                        AccurateConvertStrategyAdditions additions;
+                        additions.scale = scale;
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(
+                            arguments, result_type, input_rows_count, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag, additions);
+
+                        return true;
+                    }
+                    else if (wrapper_cast_type == CastType::accurateOrNull)
+                    {
+                        AccurateOrNullConvertStrategyAdditions additions;
+                        additions.scale = scale;
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(
+                            arguments, result_type, input_rows_count, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag, additions);
+
+                        return true;
+                    }
+                }
+                else if constexpr (std::is_same_v<LeftDataType, DataTypeString>)
+                {
+                    if (requested_result_is_nullable)
+                    {
+                        /// Consistent with CAST(Nullable(String) AS Nullable(Numbers))
+                        /// In case when converting to Nullable type, we apply different parsing rule,
+                        /// that will not throw an exception but return NULL in case of malformed input.
+                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(
+                            arguments, result_type, input_rows_count, BehaviourOnErrorFromString::ConvertReturnNullOnErrorTag, scale);
+
+                        return true;
+                    }
+                }
+
+                result_column = ConvertImpl<LeftDataType, RightDataType, FunctionCastName>::execute(arguments, result_type, input_rows_count, BehaviourOnErrorFromString::ConvertDefaultBehaviorTag, scale);
+
+                return true;
+            });
+
+            /// Additionally check if callOnIndexAndDataType wasn't called at all.
+            if (!res)
+            {
+                if (wrapper_cast_type == CastType::accurateOrNull)
+                {
+                    auto nullable_column_wrapper = FunctionCast::createToNullableColumnWrapper();
+                    return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
+                }
+                else
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
+                        "Conversion from {} to {} is not supported",
+                        type_index, to_type->getName());
+            }
+
+            return result_column;
+        };
+    }
+
+    WrapperType createAggregateFunctionWrapper(const DataTypePtr & from_type_untyped, const DataTypeAggregateFunction * to_type) const
+    {
+        /// Conversion from String through parsing.
+        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
+        {
+            return &ConvertImplGenericFromString<true>::execute;
+        }
+        else if (const auto * agg_type = checkAndGetDataType<DataTypeAggregateFunction>(from_type_untyped.get()))
+        {
+            if (agg_type->getFunction()->haveSameStateRepresentation(*to_type->getFunction()))
+            {
+                return [function = to_type->getFunction()](
+                           ColumnsWithTypeAndName & arguments,
+                           const DataTypePtr & /* result_type */,
+                           const ColumnNullable * /* nullable_source */,
+                           size_t /*input_rows_count*/) -> ColumnPtr
+                {
+                    const auto & argument_column = arguments.front();
+                    const auto * col_agg = checkAndGetColumn<ColumnAggregateFunction>(argument_column.column.get());
+                    if (col_agg)
+                    {
+                        auto new_col_agg = ColumnAggregateFunction::create(*col_agg);
+                        new_col_agg->set(function);
+                        return new_col_agg;
+                    }
+                    else
+                    {
+                        throw Exception(
+                            ErrorCodes::LOGICAL_ERROR,
+                            "Illegal column {} for function CAST AS AggregateFunction",
+                            argument_column.column->getName());
+                    }
+                };
+            }
+        }
+
+        if (cast_type == CastType::accurateOrNull)
+            return createToNullableColumnWrapper();
+        else
+            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
+                from_type_untyped->getName(), to_type->getName());
+    }
+
+    WrapperType createArrayWrapper(const DataTypePtr & from_type_untyped, const DataTypeArray & to_type) const
+    {
+        /// Conversion from String through parsing.
+        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
+        {
+            return &ConvertImplGenericFromString<true>::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)
+        {
+            /// 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)
+        {
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "CAST AS Array can only be performed between same-dimensional Array, Map or String types");
+        }
+
+        DataTypePtr from_nested_type = from_type->getNestedType();
+
+        /// In query SELECT CAST([] AS Array(Array(String))) from type is Array(Nothing)
+        bool from_empty_array = isNothing(from_nested_type);
+
+        if (from_type->getNumberOfDimensions() != to_type.getNumberOfDimensions() && !from_empty_array)
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "CAST AS Array can only be performed between same-dimensional array types");
+
+        const DataTypePtr & to_nested_type = to_type.getNestedType();
+
+        /// Prepare nested type conversion
+        const auto nested_function = prepareUnpackDictionaries(from_nested_type, to_nested_type);
+
+        return [nested_function, from_nested_type, to_nested_type](
+                ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
+        {
+            const auto & argument_column = arguments.front();
+
+            const ColumnArray * col_array = nullptr;
+
+            if (const ColumnMap * col_map = checkAndGetColumn<ColumnMap>(argument_column.column.get()))
+                col_array = &col_map->getNestedColumn();
+            else
+                col_array = checkAndGetColumn<ColumnArray>(argument_column.column.get());
+
+            if (col_array)
+            {
+                /// create columns for converting nested column containing original and result columns
+                ColumnsWithTypeAndName nested_columns{{ col_array->getDataPtr(), from_nested_type, "" }};
+
+                /// convert nested column
+                auto result_column = nested_function(nested_columns, to_nested_type, nullable_source, nested_columns.front().column->size());
+
+                /// set converted nested column to result
+                return ColumnArray::create(result_column, col_array->getOffsetsPtr());
+            }
+            else
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Illegal column {} for function CAST AS Array",
+                    argument_column.column->getName());
+            }
+        };
+    }
+
+    using ElementWrappers = std::vector<WrapperType>;
+
+    ElementWrappers getElementWrappers(const DataTypes & from_element_types, const DataTypes & to_element_types) const
+    {
+        ElementWrappers element_wrappers;
+        element_wrappers.reserve(from_element_types.size());
+
+        /// Create conversion wrapper for each element in tuple
+        for (size_t i = 0; i < from_element_types.size(); ++i)
+        {
+            const DataTypePtr & from_element_type = from_element_types[i];
+            const DataTypePtr & to_element_type = to_element_types[i];
+            element_wrappers.push_back(prepareUnpackDictionaries(from_element_type, to_element_type));
+        }
+
+        return element_wrappers;
+    }
+
+    WrapperType createTupleWrapper(const DataTypePtr & from_type_untyped, const DataTypeTuple * to_type) const
+    {
+        /// Conversion from String through parsing.
+        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
+        {
+            return &ConvertImplGenericFromString<true>::execute;
+        }
+
+        const auto * from_type = checkAndGetDataType<DataTypeTuple>(from_type_untyped.get());
+        if (!from_type)
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Tuple can only be performed between tuple types or from String.\n"
+                            "Left type: {}, right type: {}", from_type_untyped->getName(), to_type->getName());
+
+        const auto & from_element_types = from_type->getElements();
+        const auto & to_element_types = to_type->getElements();
+
+        std::vector<WrapperType> element_wrappers;
+        std::vector<std::optional<size_t>> to_reverse_index;
+
+        /// For named tuples allow conversions for tuples with
+        /// different sets of elements. If element exists in @to_type
+        /// and doesn't exist in @to_type it will be filled by default values.
+        if (from_type->haveExplicitNames() && to_type->haveExplicitNames())
+        {
+            const auto & from_names = from_type->getElementNames();
+            std::unordered_map<String, size_t> from_positions;
+            from_positions.reserve(from_names.size());
+            for (size_t i = 0; i < from_names.size(); ++i)
+                from_positions[from_names[i]] = i;
+
+            const auto & to_names = to_type->getElementNames();
+            element_wrappers.reserve(to_names.size());
+            to_reverse_index.reserve(from_names.size());
+
+            for (size_t i = 0; i < to_names.size(); ++i)
+            {
+                auto it = from_positions.find(to_names[i]);
+                if (it != from_positions.end())
+                {
+                    element_wrappers.emplace_back(prepareUnpackDictionaries(from_element_types[it->second], to_element_types[i]));
+                    to_reverse_index.emplace_back(it->second);
+                }
+                else
+                {
+                    element_wrappers.emplace_back();
+                    to_reverse_index.emplace_back();
+                }
+            }
+        }
+        else
+        {
+            if (from_element_types.size() != to_element_types.size())
+                throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Tuple can only be performed between tuple types "
+                                "with the same number of elements or from String.\nLeft type: {}, right type: {}",
+                                from_type->getName(), to_type->getName());
+
+            element_wrappers = getElementWrappers(from_element_types, to_element_types);
+            to_reverse_index.reserve(to_element_types.size());
+            for (size_t i = 0; i < to_element_types.size(); ++i)
+                to_reverse_index.emplace_back(i);
+        }
+
+        return [element_wrappers, from_element_types, to_element_types, to_reverse_index]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+        {
+            const auto * col = arguments.front().column.get();
+
+            size_t tuple_size = to_element_types.size();
+            const ColumnTuple & column_tuple = typeid_cast<const ColumnTuple &>(*col);
+
+            Columns converted_columns(tuple_size);
+
+            /// invoke conversion for each element
+            for (size_t i = 0; i < tuple_size; ++i)
+            {
+                if (to_reverse_index[i])
+                {
+                    size_t from_idx = *to_reverse_index[i];
+                    ColumnsWithTypeAndName element = {{column_tuple.getColumns()[from_idx], from_element_types[from_idx], "" }};
+                    converted_columns[i] = element_wrappers[i](element, to_element_types[i], nullable_source, input_rows_count);
+                }
+                else
+                {
+                    converted_columns[i] = to_element_types[i]->createColumn()->cloneResized(input_rows_count);
+                }
+            }
+
+            return ColumnTuple::create(converted_columns);
+        };
+    }
+
+    /// The case of: tuple([key1, key2, ..., key_n], [value1, value2, ..., value_n])
+    WrapperType createTupleToMapWrapper(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
+        {
+            const auto * col = arguments.front().column.get();
+            const auto & column_tuple = assert_cast<const ColumnTuple &>(*col);
+
+            Columns offsets(2);
+            Columns converted_columns(2);
+            for (size_t i = 0; i < 2; ++i)
+            {
+                const auto & column_array = assert_cast<const ColumnArray &>(column_tuple.getColumn(i));
+                ColumnsWithTypeAndName element = {{column_array.getDataPtr(), from_kv_types[i], ""}};
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
+                offsets[i] = column_array.getOffsetsPtr();
+            }
+
+            const auto & keys_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets[0]).getData();
+            const auto & values_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets[1]).getData();
+            if (keys_offsets != values_offsets)
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "CAST AS Map can only be performed from tuple of arrays with equal sizes.");
+
+            return ColumnMap::create(converted_columns[0], converted_columns[1], offsets[0]);
+        };
+    }
+
+    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
+        {
+            const auto * col = arguments.front().column.get();
+            const auto & column_map = typeid_cast<const ColumnMap &>(*col);
+            const auto & nested_data = column_map.getNestedData();
+
+            Columns converted_columns(2);
+            for (size_t i = 0; i < 2; ++i)
+            {
+                ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
+            }
+
+            return ColumnMap::create(converted_columns[0], converted_columns[1], column_map.getNestedColumn().getOffsetsPtr());
+        };
+    }
+
+    /// The case of: [(key1, value1), (key2, value2), ...]
+    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
+        {
+            const auto * col = arguments.front().column.get();
+            const auto & column_array = typeid_cast<const ColumnArray &>(*col);
+            const auto & nested_data = typeid_cast<const ColumnTuple &>(column_array.getData());
+
+            Columns converted_columns(2);
+            for (size_t i = 0; i < 2; ++i)
+            {
+                ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
+                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
+            }
+
+            return ColumnMap::create(converted_columns[0], converted_columns[1], column_array.getOffsetsPtr());
+        };
+    }
+
+
+    WrapperType createMapWrapper(const DataTypePtr & from_type_untyped, const DataTypeMap * to_type) const
+    {
+        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 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();
+
+            for (const auto & elem : from_tuple->getElements())
+            {
+                const auto * type_array = checkAndGetDataType<DataTypeArray>(elem.get());
+                if (!type_array)
+                    throw Exception(ErrorCodes::TYPE_MISMATCH,
+                        "CAST AS Map can only be performed from tuples of array. Got: {}", from_tuple->getName());
+
+                from_kv_types.push_back(type_array->getNestedType());
+            }
+
+            return createTupleToMapWrapper(from_kv_types, to_kv_types);
+        }
+        else if (const auto * from_array = typeid_cast<const DataTypeArray *>(from_type_untyped.get()))
+        {
+            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 requires nested tuple of 2 elements. "
+                    "Left type: {}, right type: {}",
+                    from_array->getName(),
+                    to_type->getName());
+
+            return createArrayToMapWrapper(nested_tuple->getElements(), to_type->getKeyValueTypes());
+        }
+        else if (const auto * from_type = checkAndGetDataType<DataTypeMap>(from_type_untyped.get()))
+        {
+            return createMapToMapWrapper(from_type->getKeyValueTypes(), to_type->getKeyValueTypes());
+        }
+        else
+        {
+            throw Exception(ErrorCodes::TYPE_MISMATCH, "Unsupported types to CAST AS Map. "
+                "Left type: {}, right type: {}", from_type_untyped->getName(), to_type->getName());
+        }
+    }
+
+    WrapperType createTupleToObjectWrapper(const DataTypeTuple & from_tuple, bool has_nullable_subcolumns) const
+    {
+        if (!from_tuple.haveExplicitNames())
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Cast to Object can be performed only from flatten Named Tuple. Got: {}", from_tuple.getName());
+
+        PathsInData paths;
+        DataTypes from_types;
+
+        std::tie(paths, from_types) = flattenTuple(from_tuple.getPtr());
+        auto to_types = from_types;
+
+        for (auto & type : to_types)
+        {
+            if (isTuple(type) || isNested(type))
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "Cast to Object can be performed only from flatten Named Tuple. Got: {}",
+                    from_tuple.getName());
+
+            type = recursiveRemoveLowCardinality(type);
+        }
+
+        return [element_wrappers = getElementWrappers(from_types, to_types),
+            has_nullable_subcolumns, from_types, to_types, paths]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count)
+        {
+            size_t tuple_size = to_types.size();
+            auto flattened_column = flattenTuple(arguments.front().column);
+            const auto & column_tuple = assert_cast<const ColumnTuple &>(*flattened_column);
+
+            if (tuple_size != column_tuple.getColumns().size())
+                throw Exception(ErrorCodes::TYPE_MISMATCH,
+                    "Expected tuple with {} subcolumn, but got {} subcolumns",
+                    tuple_size, column_tuple.getColumns().size());
+
+            auto res = ColumnObject::create(has_nullable_subcolumns);
+            for (size_t i = 0; i < tuple_size; ++i)
+            {
+                ColumnsWithTypeAndName element = {{column_tuple.getColumns()[i], from_types[i], "" }};
+                auto converted_column = element_wrappers[i](element, to_types[i], nullable_source, input_rows_count);
+                res->addSubcolumn(paths[i], converted_column->assumeMutable());
+            }
+
+            return res;
+        };
+    }
+
+    WrapperType createMapToObjectWrapper(const DataTypeMap & from_map, bool has_nullable_subcolumns) const
+    {
+        auto key_value_types = from_map.getKeyValueTypes();
+
+        if (!isStringOrFixedString(key_value_types[0]))
+            throw Exception(ErrorCodes::TYPE_MISMATCH,
+                "Cast to Object from Map can be performed only from Map "
+                "with String or FixedString key. Got: {}", from_map.getName());
+
+        const auto & value_type = key_value_types[1];
+        auto to_value_type = value_type;
+
+        if (!has_nullable_subcolumns && value_type->isNullable())
+            to_value_type = removeNullable(value_type);
+
+        if (has_nullable_subcolumns && !value_type->isNullable())
+            to_value_type = makeNullable(value_type);
+
+        DataTypes to_key_value_types{std::make_shared<DataTypeString>(), std::move(to_value_type)};
+        auto element_wrappers = getElementWrappers(key_value_types, to_key_value_types);
+
+        return [has_nullable_subcolumns, element_wrappers, key_value_types, to_key_value_types]
+            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t) -> ColumnPtr
+        {
+            const auto & column_map = assert_cast<const ColumnMap &>(*arguments.front().column);
+            const auto & offsets = column_map.getNestedColumn().getOffsets();
+            auto key_value_columns = column_map.getNestedData().getColumnsCopy();
+
+            for (size_t i = 0; i < 2; ++i)
+            {
+                ColumnsWithTypeAndName element{{key_value_columns[i], key_value_types[i], ""}};
+                key_value_columns[i] = element_wrappers[i](element, to_key_value_types[i], nullable_source, key_value_columns[i]->size());
+            }
+
+            const auto & key_column_str = assert_cast<const ColumnString &>(*key_value_columns[0]);
+            const auto & value_column = *key_value_columns[1];
+
+            using SubcolumnsMap = HashMap<StringRef, MutableColumnPtr, StringRefHash>;
+            SubcolumnsMap subcolumns;
+
+            for (size_t row = 0; row < offsets.size(); ++row)
+            {
+                for (size_t i = offsets[static_cast<ssize_t>(row) - 1]; i < offsets[row]; ++i)
+                {
+                    auto ref = key_column_str.getDataAt(i);
+
+                    bool inserted;
+                    SubcolumnsMap::LookupResult it;
+                    subcolumns.emplace(ref, it, inserted);
+                    auto & subcolumn = it->getMapped();
+
+                    if (inserted)
+                        subcolumn = value_column.cloneEmpty()->cloneResized(row);
+
+                    /// Map can have duplicated keys. We insert only first one.
+                    if (subcolumn->size() == row)
+                        subcolumn->insertFrom(value_column, i);
+                }
+
+                /// Insert default values for keys missed in current row.
+                for (const auto & [_, subcolumn] : subcolumns)
+                    if (subcolumn->size() == row)
+                        subcolumn->insertDefault();
+            }
+
+            auto column_object = ColumnObject::create(has_nullable_subcolumns);
+            for (auto && [key, subcolumn] : subcolumns)
+            {
+                PathInData path(key.toView());
+                column_object->addSubcolumn(path, std::move(subcolumn));
+            }
+
+            return column_object;
+        };
+    }
+
+    WrapperType createObjectWrapper(const DataTypePtr & from_type, const DataTypeObject * to_type) const
+    {
+        if (const auto * from_tuple = checkAndGetDataType<DataTypeTuple>(from_type.get()))
+        {
+            return createTupleToObjectWrapper(*from_tuple, to_type->hasNullableSubcolumns());
+        }
+        else if (const auto * from_map = checkAndGetDataType<DataTypeMap>(from_type.get()))
+        {
+            return createMapToObjectWrapper(*from_map, to_type->hasNullableSubcolumns());
+        }
+        else if (checkAndGetDataType<DataTypeString>(from_type.get()))
+        {
+            return [] (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * nullable_source, size_t input_rows_count)
+            {
+                auto res = ConvertImplGenericFromString<true>::execute(arguments, result_type, nullable_source, input_rows_count)->assumeMutable();
+                res->finalize();
+                return res;
+            };
+        }
+        else if (checkAndGetDataType<DataTypeObject>(from_type.get()))
+        {
+            return [is_nullable = to_type->hasNullableSubcolumns()] (ColumnsWithTypeAndName & arguments, const DataTypePtr & , const ColumnNullable * , size_t) -> ColumnPtr
+            {
+                const auto & column_object = assert_cast<const ColumnObject &>(*arguments.front().column);
+                auto res = ColumnObject::create(is_nullable);
+                for (size_t i = 0; i < column_object.size(); i++)
+                    res->insert(column_object[i]);
+
+                res->finalize();
+                return res;
+            };
+        }
+
+        throw Exception(ErrorCodes::TYPE_MISMATCH,
+            "Cast to Object can be performed only from flatten named Tuple, Map or String. Got: {}", from_type->getName());
+    }
+
+    WrapperType createVariantToVariantWrapper(const DataTypeVariant & from_variant, const DataTypeVariant & to_variant) const
+    {
+        /// We support only extension of variant type, so, only new types can be added.
+        /// For example: Variant(T1, T2) -> Variant(T1, T2, T3) is supported, but Variant(T1, T2) -> Variant(T1, T3) is not supported.
+        /// We want to extend Variant type for free without rewriting the data, but we sort data types inside Variant during type creation
+        /// (we do it because we want Variant(T1, T2) to be the same as Variant(T2, T1)), but after extension the order of variant types
+        /// (and so their discriminators) can be different. For example: Variant(T1, T3) -> Variant(T1, T2, T3).
+        /// To avoid full rewrite of discriminators column, ColumnVariant supports it's local order of variant columns (and so local
+        /// discriminators) and stores mapping global order -> local order.
+        /// So, to extend Variant with new types for free, we should keep old local order for old variants, append new variants and change
+        /// mapping global order -> local order according to the new global order.
+
+        /// Create map (new variant type) -> (it's global discriminator in new order).
+        const auto & new_variants = to_variant.getVariants();
+        std::unordered_map<String, ColumnVariant::Discriminator> new_variant_types_to_new_global_discriminator;
+        new_variant_types_to_new_global_discriminator.reserve(new_variants.size());
+        for (size_t i = 0; i != new_variants.size(); ++i)
+            new_variant_types_to_new_global_discriminator[new_variants[i]->getName()] = i;
+
+        /// Create set of old variant types.
+        const auto & old_variants = from_variant.getVariants();
+        std::unordered_map<String, ColumnVariant::Discriminator> old_variant_types_to_old_global_discriminator;
+        old_variant_types_to_old_global_discriminator.reserve(old_variants.size());
+        for (size_t i = 0; i != old_variants.size(); ++i)
+            old_variant_types_to_old_global_discriminator[old_variants[i]->getName()] = i;
+
+        /// Check that the set of old variants types is a subset of new variant types and collect new global discriminator for each old global discriminator.
+        std::unordered_map<ColumnVariant::Discriminator, ColumnVariant::Discriminator> old_global_discriminator_to_new;
+        old_global_discriminator_to_new.reserve(old_variants.size());
+        for (const auto & [old_variant_type, old_discriminator] : old_variant_types_to_old_global_discriminator)
+        {
+            auto it = new_variant_types_to_new_global_discriminator.find(old_variant_type);
+            if (it == new_variant_types_to_new_global_discriminator.end())
+                throw Exception(
+                    ErrorCodes::CANNOT_CONVERT_TYPE,
+                    "Cannot convert type {} to {}. Conversion between Variant types is allowed only when new Variant type is an extension "
+                    "of an initial one", from_variant.getName(), to_variant.getName());
+            old_global_discriminator_to_new[old_discriminator] = it->second;
+        }
+
+        /// Collect variant types and their global discriminators that should be added to the old Variant to get the new Variant.
+        std::vector<std::pair<DataTypePtr, ColumnVariant::Discriminator>> variant_types_and_discriminators_to_add;
+        variant_types_and_discriminators_to_add.reserve(new_variants.size() - old_variants.size());
+        for (size_t i = 0; i != new_variants.size(); ++i)
+        {
+            if (!old_variant_types_to_old_global_discriminator.contains(new_variants[i]->getName()))
+                variant_types_and_discriminators_to_add.emplace_back(new_variants[i], i);
+        }
+
+        return [old_global_discriminator_to_new, variant_types_and_discriminators_to_add]
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t) -> ColumnPtr
+        {
+            const auto & column_variant = assert_cast<const ColumnVariant &>(*arguments.front().column.get());
+            size_t num_old_variants = column_variant.getNumVariants();
+            Columns new_variant_columns;
+            new_variant_columns.reserve(num_old_variants + variant_types_and_discriminators_to_add.size());
+            std::vector<ColumnVariant::Discriminator> new_local_to_global_discriminators;
+            new_local_to_global_discriminators.reserve(num_old_variants + variant_types_and_discriminators_to_add.size());
+            for (size_t i = 0; i != num_old_variants; ++i)
+            {
+                new_variant_columns.push_back(column_variant.getVariantPtrByLocalDiscriminator(i));
+                new_local_to_global_discriminators.push_back(old_global_discriminator_to_new.at(column_variant.globalDiscriminatorByLocal(i)));
+            }
+
+            for (const auto & [new_variant_type, new_global_discriminator] : variant_types_and_discriminators_to_add)
+            {
+                new_variant_columns.push_back(new_variant_type->createColumn());
+                new_local_to_global_discriminators.push_back(new_global_discriminator);
+            }
+
+            return ColumnVariant::create(column_variant.getLocalDiscriminatorsPtr(), column_variant.getOffsetsPtr(), new_variant_columns, new_local_to_global_discriminators);
+        };
+    }
+
+    WrapperType createVariantToColumnWrapper(const DataTypeVariant & from_variant, const DataTypePtr & to_type) const
+    {
+        const auto & variant_types = from_variant.getVariants();
+        std::vector<WrapperType> variant_wrappers;
+        variant_wrappers.reserve(variant_types.size());
+
+        /// Create conversion wrapper for each variant.
+        for (const auto & variant_type : variant_types)
+            variant_wrappers.push_back(prepareUnpackDictionaries(variant_type, to_type));
+
+        return [variant_wrappers, variant_types, to_type]
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+        {
+            const auto & column_variant = assert_cast<const ColumnVariant &>(*arguments.front().column.get());
+
+            /// First, cast each variant to the result type.
+            std::vector<ColumnPtr> casted_variant_columns;
+            casted_variant_columns.reserve(variant_types.size());
+            for (size_t i = 0; i != variant_types.size(); ++i)
+            {
+                auto variant_col = column_variant.getVariantPtrByLocalDiscriminator(i);
+                ColumnsWithTypeAndName variant = {{variant_col, variant_types[i], "" }};
+                const auto & variant_wrapper = variant_wrappers[column_variant.globalDiscriminatorByLocal(i)];
+                casted_variant_columns.push_back(variant_wrapper(variant, result_type, nullptr, variant_col->size()));
+            }
+
+            /// Second, construct resulting column from casted variant columns according to discriminators.
+            const auto & local_discriminators = column_variant.getLocalDiscriminators();
+            auto res = result_type->createColumn();
+            res->reserve(input_rows_count);
+            for (size_t i = 0; i != input_rows_count; ++i)
+            {
+                auto local_discr = local_discriminators[i];
+                if (local_discr == ColumnVariant::NULL_DISCRIMINATOR)
+                    res->insertDefault();
+                else
+                    res->insertFrom(*casted_variant_columns[local_discr], column_variant.offsetAt(i));
+            }
+
+            return res;
+        };
+    }
+
+    static ColumnPtr createVariantFromDescriptorsAndOneNonEmptyVariant(const DataTypes & variant_types, const ColumnPtr & discriminators, const ColumnPtr & variant, ColumnVariant::Discriminator variant_discr)
+    {
+        Columns variants;
+        variants.reserve(variant_types.size());
+        for (size_t i = 0; i != variant_types.size(); ++i)
+        {
+            if (i == variant_discr)
+                variants.emplace_back(variant);
+            else
+                variants.push_back(variant_types[i]->createColumn());
+        }
+
+        return ColumnVariant::create(discriminators, variants);
+    }
+
+    WrapperType createStringToVariantWrapper() const
+    {
+        return [&](ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+        {
+            auto column = arguments[0].column->convertToFullColumnIfLowCardinality();
+            auto args = arguments;
+            args[0].column = column;
+
+            const ColumnNullable * column_nullable = nullptr;
+            if (isColumnNullable(*args[0].column))
+            {
+                column_nullable = assert_cast<const ColumnNullable *>(args[0].column.get());
+                args[0].column = column_nullable->getNestedColumnPtr();
+            }
+
+            args[0].type = removeNullable(removeLowCardinality(args[0].type));
+
+            if (cast_type == CastType::accurateOrNull)
+                return ConvertImplGenericFromString<false>::execute(args, result_type, column_nullable, input_rows_count);
+            return ConvertImplGenericFromString<true>::execute(args, result_type, column_nullable, input_rows_count);
+        };
+    }
+
+    WrapperType createColumnToVariantWrapper(const DataTypePtr & from_type, const DataTypeVariant & to_variant) const
+    {
+        /// We allow converting NULL to Variant(...) as Variant can store NULLs.
+        if (from_type->onlyNull())
+        {
+            return [](ColumnsWithTypeAndName &, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+            {
+                auto result_column = result_type->createColumn();
+                result_column->insertManyDefaults(input_rows_count);
+                return result_column;
+            };
+        }
+
+        auto variant_discr_opt = to_variant.tryGetVariantDiscriminator(*removeNullableOrLowCardinalityNullable(from_type));
+        /// Cast String to Variant through parsing if it's not Variant(String).
+        if (isStringOrFixedString(removeNullable(removeLowCardinality(from_type))) && (!variant_discr_opt || to_variant.getVariants().size() > 1))
+            return createStringToVariantWrapper();
+
+        if (!variant_discr_opt)
+            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert type {} to {}. Conversion to Variant allowed only for types from this Variant", from_type->getName(), to_variant.getName());
+
+        return [variant_discr = *variant_discr_opt]
+               (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t) -> ColumnPtr
+        {
+            const auto & result_variant_type = assert_cast<const DataTypeVariant &>(*result_type);
+            const auto & variant_types = result_variant_type.getVariants();
+            if (const ColumnNullable * col_nullable = typeid_cast<const ColumnNullable *>(arguments.front().column.get()))
+            {
+                const auto & column = col_nullable->getNestedColumnPtr();
+                const auto & null_map = col_nullable->getNullMapData();
+                IColumn::Filter filter;
+                filter.reserve(column->size());
+                auto discriminators = ColumnVariant::ColumnDiscriminators::create();
+                auto & discriminators_data = discriminators->getData();
+                discriminators_data.reserve(column->size());
+                size_t variant_size_hint = 0;
+                for (size_t i = 0; i != column->size(); ++i)
+                {
+                    if (null_map[i])
+                    {
+                        discriminators_data.push_back(ColumnVariant::NULL_DISCRIMINATOR);
+                        filter.push_back(0);
+                    }
+                    else
+                    {
+                        discriminators_data.push_back(variant_discr);
+                        filter.push_back(1);
+                        ++variant_size_hint;
+                    }
+                }
+
+                ColumnPtr variant_column;
+                /// If there were no NULLs, just use the column.
+                if (variant_size_hint == column->size())
+                    variant_column = column;
+                /// Otherwise we should use filtered column.
+                else
+                    variant_column = column->filter(filter, variant_size_hint);
+                return createVariantFromDescriptorsAndOneNonEmptyVariant(variant_types, std::move(discriminators), variant_column, variant_discr);
+            }
+            else if (isColumnLowCardinalityNullable(*arguments.front().column))
+            {
+                const auto & column = arguments.front().column;
+
+                /// Variant column cannot have LowCardinality(Nullable(...)) variant, as Variant column stores NULLs itself.
+                /// We should create a null-map, insert NULL_DISCRIMINATOR on NULL values and filter initial column.
+                const auto & col_lc = assert_cast<const ColumnLowCardinality &>(*column);
+                const auto & indexes = col_lc.getIndexes();
+                auto null_index = col_lc.getDictionary().getNullValueIndex();
+                IColumn::Filter filter;
+                filter.reserve(col_lc.size());
+                auto discriminators = ColumnVariant::ColumnDiscriminators::create();
+                auto & discriminators_data = discriminators->getData();
+                discriminators_data.reserve(col_lc.size());
+                size_t variant_size_hint = 0;
+                for (size_t i = 0; i != col_lc.size(); ++i)
+                {
+                    if (indexes.getUInt(i) == null_index)
+                    {
+                        discriminators_data.push_back(ColumnVariant::NULL_DISCRIMINATOR);
+                        filter.push_back(0);
+                    }
+                    else
+                    {
+                        discriminators_data.push_back(variant_discr);
+                        filter.push_back(1);
+                        ++variant_size_hint;
+                    }
+                }
+
+                MutableColumnPtr variant_column;
+                /// If there were no NULLs, we can just clone the column.
+                if (variant_size_hint == col_lc.size())
+                    variant_column = IColumn::mutate(column);
+                /// Otherwise we should filter column.
+                else
+                    variant_column = column->filter(filter, variant_size_hint)->assumeMutable();
+
+                assert_cast<ColumnLowCardinality &>(*variant_column).nestedRemoveNullable();
+                return createVariantFromDescriptorsAndOneNonEmptyVariant(variant_types, std::move(discriminators), std::move(variant_column), variant_discr);
+            }
+            else
+            {
+                const auto & column = arguments.front().column;
+                auto discriminators = ColumnVariant::ColumnDiscriminators::create();
+                discriminators->getData().resize_fill(column->size(), variant_discr);
+                return createVariantFromDescriptorsAndOneNonEmptyVariant(variant_types, std::move(discriminators), column, variant_discr);
+            }
+        };
+    }
+
+    /// Wrapper for conversion to/from Variant type
+    WrapperType createVariantWrapper(const DataTypePtr & from_type, const DataTypePtr & to_type) const
+    {
+        if (const auto * from_variant = checkAndGetDataType<DataTypeVariant>(from_type.get()))
+        {
+            if (const auto * to_variant = checkAndGetDataType<DataTypeVariant>(to_type.get()))
+                return createVariantToVariantWrapper(*from_variant, *to_variant);
+
+            return createVariantToColumnWrapper(*from_variant, to_type);
+        }
+
+        return createColumnToVariantWrapper(from_type, assert_cast<const DataTypeVariant &>(*to_type));
+    }
+
+    template <typename FieldType>
+    WrapperType createEnumWrapper(const DataTypePtr & from_type, const DataTypeEnum<FieldType> * to_type) const
+    {
+        using EnumType = DataTypeEnum<FieldType>;
+        using Function = typename FunctionTo<EnumType>::Type;
+
+        if (const auto * from_enum8 = checkAndGetDataType<DataTypeEnum8>(from_type.get()))
+            checkEnumToEnumConversion(from_enum8, to_type);
+        else if (const auto * from_enum16 = checkAndGetDataType<DataTypeEnum16>(from_type.get()))
+            checkEnumToEnumConversion(from_enum16, to_type);
+
+        if (checkAndGetDataType<DataTypeString>(from_type.get()))
+            return createStringToEnumWrapper<ColumnString, EnumType>();
+        else if (checkAndGetDataType<DataTypeFixedString>(from_type.get()))
+            return createStringToEnumWrapper<ColumnFixedString, EnumType>();
+        else if (isNativeNumber(from_type) || isEnum(from_type))
+        {
+            auto function = Function::create(context);
+            return createFunctionAdaptor(function, from_type);
+        }
+        else
+        {
+            if (cast_type == CastType::accurateOrNull)
+                return createToNullableColumnWrapper();
+            else
+                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
+                    from_type->getName(), to_type->getName());
+        }
+    }
+
+    template <typename EnumTypeFrom, typename EnumTypeTo>
+    void checkEnumToEnumConversion(const EnumTypeFrom * from_type, const EnumTypeTo * to_type) const
+    {
+        const auto & from_values = from_type->getValues();
+        const auto & to_values = to_type->getValues();
+
+        using ValueType = std::common_type_t<typename EnumTypeFrom::FieldType, typename EnumTypeTo::FieldType>;
+        using NameValuePair = std::pair<std::string, ValueType>;
+        using EnumValues = std::vector<NameValuePair>;
+
+        EnumValues name_intersection;
+        std::set_intersection(std::begin(from_values), std::end(from_values),
+            std::begin(to_values), std::end(to_values), std::back_inserter(name_intersection),
+            [] (auto && from, auto && to) { return from.first < to.first; });
+
+        for (const auto & name_value : name_intersection)
+        {
+            const auto & old_value = name_value.second;
+            const auto & new_value = to_type->getValue(name_value.first);
+            if (old_value != new_value)
+                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Enum conversion changes value for element '{}' from {} to {}",
+                    name_value.first, toString(old_value), toString(new_value));
+        }
+    }
+
+    template <typename ColumnStringType, typename EnumType>
+    WrapperType createStringToEnumWrapper() const
+    {
+        const char * function_name = cast_name;
+        return [function_name] (
+            ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
+        {
+            const auto & first_col = arguments.front().column.get();
+            const auto & result_type = typeid_cast<const EnumType &>(*res_type);
+
+            const ColumnStringType * col = typeid_cast<const ColumnStringType *>(first_col);
+
+            if (col && nullable_col && nullable_col->size() != col->size())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "ColumnNullable is not compatible with original");
+
+            if (col)
+            {
+                const auto size = col->size();
+
+                auto res = result_type.createColumn();
+                auto & out_data = static_cast<typename EnumType::ColumnType &>(*res).getData();
+                out_data.resize(size);
+
+                auto default_enum_value = result_type.getValues().front().second;
+
+                if (nullable_col)
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        if (!nullable_col->isNullAt(i))
+                            out_data[i] = result_type.getValue(col->getDataAt(i));
+                        else
+                            out_data[i] = default_enum_value;
+                    }
+                }
+                else
+                {
+                    for (size_t i = 0; i < size; ++i)
+                        out_data[i] = result_type.getValue(col->getDataAt(i));
+                }
+
+                return res;
+            }
+            else
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column {} as first argument of function {}",
+                    first_col->getName(), function_name);
+        };
+    }
+
+    template <typename EnumType>
+    WrapperType createEnumToStringWrapper() const
+    {
+        const char * function_name = cast_name;
+        return [function_name] (
+            ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
+        {
+            using ColumnEnumType = EnumType::ColumnType;
+
+            const auto & first_col = arguments.front().column.get();
+            const auto & first_type = arguments.front().type.get();
+
+            const ColumnEnumType * enum_col = typeid_cast<const ColumnEnumType *>(first_col);
+            const EnumType * enum_type = typeid_cast<const EnumType *>(first_type);
+
+            if (enum_col && nullable_col && nullable_col->size() != enum_col->size())
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "ColumnNullable is not compatible with original");
+
+            if (enum_col && enum_type)
+            {
+                const auto size = enum_col->size();
+                const auto & enum_data = enum_col->getData();
+
+                auto res = res_type->createColumn();
+
+                if (nullable_col)
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        if (!nullable_col->isNullAt(i))
+                        {
+                            const auto & value = enum_type->getNameForValue(enum_data[i]);
+                            res->insertData(value.data, value.size);
+                        }
+                        else
+                            res->insertDefault();
+                    }
+                }
+                else
+                {
+                    for (size_t i = 0; i < size; ++i)
+                    {
+                        const auto & value = enum_type->getNameForValue(enum_data[i]);
+                        res->insertData(value.data, value.size);
+                    }
+                }
+
+                return res;
+            }
+            else
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column {} as first argument of function {}",
+                    first_col->getName(), function_name);
+        };
+    }
+
+    static WrapperType createIdentityWrapper(const DataTypePtr &)
+    {
+        return [] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/)
+        {
+            return arguments.front().column;
+        };
+    }
+
+    static WrapperType createNothingWrapper(const IDataType * to_type)
+    {
+        ColumnPtr res = to_type->createColumnConstWithDefaultValue(1);
+        return [res] (ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t input_rows_count)
+        {
+            /// Column of Nothing type is trivially convertible to any other column
+            return res->cloneResized(input_rows_count)->convertToFullColumnIfConst();
+        };
+    }
+
+    WrapperType prepareUnpackDictionaries(const DataTypePtr & from_type, const DataTypePtr & to_type) const
+    {
+        /// Conversion from/to Variant data type is processed in a special way.
+        /// We don't need to remove LowCardinality/Nullable.
+        if (isVariant(to_type) || isVariant(from_type))
+            return createVariantWrapper(from_type, to_type);
+
+        const auto * from_low_cardinality = typeid_cast<const DataTypeLowCardinality *>(from_type.get());
+        const auto * to_low_cardinality = typeid_cast<const DataTypeLowCardinality *>(to_type.get());
+        const auto & from_nested = from_low_cardinality ? from_low_cardinality->getDictionaryType() : from_type;
+        const auto & to_nested = to_low_cardinality ? to_low_cardinality->getDictionaryType() : to_type;
+
+        if (from_type->onlyNull())
+        {
+            if (!to_nested->isNullable() && !isVariant(to_type))
+            {
+                if (cast_type == CastType::accurateOrNull)
+                {
+                    return createToNullableColumnWrapper();
+                }
+                else
+                {
+                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert NULL to a non-nullable type");
+                }
+            }
+
+            return [](ColumnsWithTypeAndName &, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
+            {
+                return result_type->createColumnConstWithDefaultValue(input_rows_count)->convertToFullColumnIfConst();
+            };
+        }
+
+        bool skip_not_null_check = false;
+
+        if (from_low_cardinality && from_nested->isNullable() && !to_nested->isNullable())
+            /// Disable check for dictionary. Will check that column doesn't contain NULL in wrapper below.
+            skip_not_null_check = true;
+
+        auto wrapper = prepareRemoveNullable(from_nested, to_nested, skip_not_null_check);
+        if (!from_low_cardinality && !to_low_cardinality)
+            return wrapper;
+
+        return [wrapper, from_low_cardinality, to_low_cardinality, skip_not_null_check]
+                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
+        {
+            ColumnsWithTypeAndName args = {arguments[0]};
+            auto & arg = args.front();
+            auto res_type = result_type;
+
+            ColumnPtr converted_column;
+
+            ColumnPtr res_indexes;
+            /// For some types default can't be casted (for example, String to Int). In that case convert column to full.
+            bool src_converted_to_full_column = false;
+
+            {
+                auto tmp_rows_count = input_rows_count;
+
+                if (to_low_cardinality)
+                    res_type = to_low_cardinality->getDictionaryType();
+
+                if (from_low_cardinality)
+                {
+                    const auto & col_low_cardinality = typeid_cast<const ColumnLowCardinality &>(*arguments[0].column);
+
+                    if (skip_not_null_check && col_low_cardinality.containsNull())
+                        throw Exception(ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN, "Cannot convert NULL value to non-Nullable type");
+
+                    arg.column = col_low_cardinality.getDictionary().getNestedColumn();
+                    arg.type = from_low_cardinality->getDictionaryType();
+
+                    /// TODO: Make map with defaults conversion.
+                    src_converted_to_full_column = !removeNullable(arg.type)->equals(*removeNullable(res_type));
+                    if (src_converted_to_full_column)
+                        arg.column = arg.column->index(col_low_cardinality.getIndexes(), 0);
+                    else
+                        res_indexes = col_low_cardinality.getIndexesPtr();
+
+                    tmp_rows_count = arg.column->size();
+                }
+
+                /// Perform the requested conversion.
+                converted_column = wrapper(args, res_type, nullable_source, tmp_rows_count);
+            }
+
+            if (to_low_cardinality)
+            {
+                auto res_column = to_low_cardinality->createColumn();
+                auto & col_low_cardinality = typeid_cast<ColumnLowCardinality &>(*res_column);
+
+                if (from_low_cardinality && !src_converted_to_full_column)
+                    col_low_cardinality.insertRangeFromDictionaryEncodedColumn(*converted_column, *res_indexes);
+                else
+                    col_low_cardinality.insertRangeFromFullColumn(*converted_column, 0, converted_column->size());
+
+                return res_column;
+            }
+            else if (!src_converted_to_full_column)
+                return converted_column->index(*res_indexes, 0);
+            else
+                return converted_column;
+        };
+    }
+
+    WrapperType prepareRemoveNullable(const DataTypePtr & from_type, const DataTypePtr & to_type, bool skip_not_null_check) const
+    {
+        /// Determine whether pre-processing and/or post-processing must take place during conversion.
+
+        bool source_is_nullable = from_type->isNullable();
+        bool result_is_nullable = to_type->isNullable();
+
+        auto wrapper = prepareImpl(removeNullable(from_type), removeNullable(to_type), result_is_nullable);
+
+        if (result_is_nullable)
+        {
+            return [wrapper, source_is_nullable]
+                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+            {
+                /// Create a temporary columns on which to perform the operation.
+                const auto & nullable_type = static_cast<const DataTypeNullable &>(*result_type);
+                const auto & nested_type = nullable_type.getNestedType();
+
+                ColumnsWithTypeAndName tmp_args;
+                if (source_is_nullable)
+                    tmp_args = createBlockWithNestedColumns(arguments);
+                else
+                    tmp_args = arguments;
+
+                const ColumnNullable * nullable_source = nullptr;
+
+                /// Add original ColumnNullable for createStringToEnumWrapper()
+                if (source_is_nullable)
+                {
+                    if (arguments.size() != 1)
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid number of arguments");
+                    nullable_source = typeid_cast<const ColumnNullable *>(arguments.front().column.get());
+                }
+
+                /// Perform the requested conversion.
+                auto tmp_res = wrapper(tmp_args, nested_type, nullable_source, input_rows_count);
+
+                /// May happen in fuzzy tests. For debug purpose.
+                if (!tmp_res)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Couldn't convert {} to {} in prepareRemoveNullable wrapper.",
+                                    arguments[0].type->getName(), nested_type->getName());
+
+                return wrapInNullable(tmp_res, arguments, nested_type, input_rows_count);
+            };
+        }
+        else if (source_is_nullable)
+        {
+            /// Conversion from Nullable to non-Nullable.
+
+            return [wrapper, skip_not_null_check]
+                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+            {
+                auto tmp_args = createBlockWithNestedColumns(arguments);
+                auto nested_type = removeNullable(result_type);
+
+                /// Check that all values are not-NULL.
+                /// Check can be skipped in case if LowCardinality dictionary is transformed.
+                /// In that case, correctness will be checked beforehand.
+                if (!skip_not_null_check)
+                {
+                    const auto & col = arguments[0].column;
+                    const auto & nullable_col = assert_cast<const ColumnNullable &>(*col);
+                    const auto & null_map = nullable_col.getNullMapData();
+
+                    if (!memoryIsZero(null_map.data(), 0, null_map.size()))
+                        throw Exception(ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN, "Cannot convert NULL value to non-Nullable type");
+                }
+                const ColumnNullable * nullable_source = typeid_cast<const ColumnNullable *>(arguments.front().column.get());
+                return wrapper(tmp_args, nested_type, nullable_source, input_rows_count);
+            };
+        }
+        else
+            return wrapper;
+    }
+
+    /// 'from_type' and 'to_type' are nested types in case of Nullable.
+    /// 'requested_result_is_nullable' is true if CAST to Nullable type is requested.
+    WrapperType prepareImpl(const DataTypePtr & from_type, const DataTypePtr & to_type, bool requested_result_is_nullable) const
+    {
+        if (isUInt8(from_type) && isBool(to_type))
+            return createUInt8ToBoolWrapper(from_type, to_type);
+
+        /// We can cast IPv6 into IPv6, IPv4 into IPv4, but we should not allow to cast FixedString(16) into IPv6 as part of identity cast
+        bool safe_convert_custom_types = true;
+
+        if (const auto * to_type_custom_name = to_type->getCustomName())
+            safe_convert_custom_types = from_type->getCustomName() && from_type->getCustomName()->getName() == to_type_custom_name->getName();
+        else if (const auto * from_type_custom_name = from_type->getCustomName())
+            safe_convert_custom_types = to_type->getCustomName() && from_type_custom_name->getName() == to_type->getCustomName()->getName();
+
+        if (from_type->equals(*to_type) && safe_convert_custom_types)
+        {
+            /// We can only use identity conversion for DataTypeAggregateFunction when they are strictly equivalent.
+            if (typeid_cast<const DataTypeAggregateFunction *>(from_type.get()))
+            {
+                if (DataTypeAggregateFunction::strictEquals(from_type, to_type))
+                    return createIdentityWrapper(from_type);
+            }
+            else
+                return createIdentityWrapper(from_type);
+        }
+        else if (WhichDataType(from_type).isNothing())
+            return createNothingWrapper(to_type.get());
+
+        WrapperType ret;
+
+        auto make_default_wrapper = [&](const auto & types) -> bool
+        {
+            using Types = std::decay_t<decltype(types)>;
+            using ToDataType = typename Types::LeftType;
+
+            if constexpr (is_any_of<ToDataType,
+                DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
+                DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
+                DataTypeFloat32, DataTypeFloat64,
+                DataTypeDate, DataTypeDate32, DataTypeDateTime,
+                DataTypeUUID, DataTypeIPv4, DataTypeIPv6>)
+            {
+                ret = createWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
+                return true;
+            }
+            if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
+            {
+                if (isBool(to_type))
+                    ret = createBoolWrapper<ToDataType>(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
+                else
+                    ret = createWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
+                return true;
+            }
+            if constexpr (
+                std::is_same_v<ToDataType, DataTypeEnum8> ||
+                std::is_same_v<ToDataType, DataTypeEnum16>)
+            {
+                ret = createEnumWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()));
+                return true;
+            }
+            if constexpr (is_any_of<ToDataType,
+                DataTypeDecimal<Decimal32>, DataTypeDecimal<Decimal64>,
+                DataTypeDecimal<Decimal128>, DataTypeDecimal<Decimal256>,
+                DataTypeDateTime64>)
+            {
+                ret = createDecimalWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
+                return true;
+            }
+
+            return false;
+        };
+
+        bool cast_ipv4_ipv6_default_on_conversion_error_value = context && context->getSettingsRef().cast_ipv4_ipv6_default_on_conversion_error;
+        bool input_format_ipv4_default_on_conversion_error_value = context && context->getSettingsRef().input_format_ipv4_default_on_conversion_error;
+        bool input_format_ipv6_default_on_conversion_error_value = context && context->getSettingsRef().input_format_ipv6_default_on_conversion_error;
+
+        auto make_custom_serialization_wrapper = [&, cast_ipv4_ipv6_default_on_conversion_error_value, input_format_ipv4_default_on_conversion_error_value, input_format_ipv6_default_on_conversion_error_value](const auto & types) -> bool
+        {
+            using Types = std::decay_t<decltype(types)>;
+            using ToDataType = typename Types::RightType;
+            using FromDataType = typename Types::LeftType;
+
+            if constexpr (WhichDataType(FromDataType::type_id).isStringOrFixedString())
+            {
+                if constexpr (std::is_same_v<ToDataType, DataTypeIPv4>)
+                {
+                    ret = [cast_ipv4_ipv6_default_on_conversion_error_value,
+                           input_format_ipv4_default_on_conversion_error_value,
+                           requested_result_is_nullable](
+                              ColumnsWithTypeAndName & arguments,
+                              const DataTypePtr & result_type,
+                              const ColumnNullable * column_nullable,
+                              size_t) -> ColumnPtr
+                    {
+                        if (!WhichDataType(result_type).isIPv4())
+                            throw Exception(ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv4", result_type->getName());
+
+                        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
+                        if (requested_result_is_nullable)
+                            return convertToIPv4<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
+                        else if (cast_ipv4_ipv6_default_on_conversion_error_value || input_format_ipv4_default_on_conversion_error_value)
+                            return convertToIPv4<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
+                        else
+                            return convertToIPv4<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
+                    };
+
+                    return true;
+                }
+
+                if constexpr (std::is_same_v<ToDataType, DataTypeIPv6>)
+                {
+                    ret = [cast_ipv4_ipv6_default_on_conversion_error_value,
+                           input_format_ipv6_default_on_conversion_error_value,
+                           requested_result_is_nullable](
+                              ColumnsWithTypeAndName & arguments,
+                              const DataTypePtr & result_type,
+                              const ColumnNullable * column_nullable,
+                              size_t) -> ColumnPtr
+                    {
+                        if (!WhichDataType(result_type).isIPv6())
+                            throw Exception(
+                                ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv6", result_type->getName());
+
+                        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
+                        if (requested_result_is_nullable)
+                            return convertToIPv6<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
+                        else if (cast_ipv4_ipv6_default_on_conversion_error_value || input_format_ipv6_default_on_conversion_error_value)
+                            return convertToIPv6<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
+                        else
+                            return convertToIPv6<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
+                    };
+
+                    return true;
+                }
+
+                if (to_type->getCustomSerialization() && to_type->getCustomName())
+                {
+                    ret = [this, requested_result_is_nullable](
+                              ColumnsWithTypeAndName & arguments,
+                              const DataTypePtr & result_type,
+                              const ColumnNullable * column_nullable,
+                              size_t input_rows_count) -> ColumnPtr
+                    {
+                        auto wrapped_result_type = result_type;
+                        if (requested_result_is_nullable)
+                            wrapped_result_type = makeNullable(result_type);
+                        if (this->cast_type == CastType::accurateOrNull)
+                            return ConvertImplGenericFromString<false>::execute(
+                                arguments, wrapped_result_type, column_nullable, input_rows_count);
+                        return ConvertImplGenericFromString<true>::execute(
+                            arguments, wrapped_result_type, column_nullable, input_rows_count);
+                    };
+                    return true;
+                }
+            }
+            else if constexpr (WhichDataType(FromDataType::type_id).isIPv6() && WhichDataType(ToDataType::type_id).isIPv4())
+            {
+                ret = [cast_ipv4_ipv6_default_on_conversion_error_value, requested_result_is_nullable](
+                                ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t)
+                        -> ColumnPtr
+                {
+                    if (!WhichDataType(result_type).isIPv4())
+                        throw Exception(
+                            ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv4", result_type->getName());
+
+                    const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
+                    if (requested_result_is_nullable)
+                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
+                    else if (cast_ipv4_ipv6_default_on_conversion_error_value)
+                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
+                    else
+                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
+                };
+
+                return true;
+            }
+
+            if constexpr (WhichDataType(ToDataType::type_id).isStringOrFixedString())
+            {
+                if constexpr (WhichDataType(FromDataType::type_id).isEnum())
+                {
+                    ret = createEnumToStringWrapper<FromDataType>();
+                    return true;
+                }
+                else if (from_type->getCustomSerialization())
+                {
+                    ret = [](ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
+                    {
+                        return ConvertImplGenericToString<typename ToDataType::ColumnType>::execute(arguments, result_type, input_rows_count);
+                    };
+                    return true;
+                }
+            }
+
+            return false;
+        };
+
+        if (callOnTwoTypeIndexes(from_type->getTypeId(), to_type->getTypeId(), make_custom_serialization_wrapper))
+            return ret;
+
+        if (callOnIndexAndDataType<void>(to_type->getTypeId(), make_default_wrapper))
+            return ret;
+
+        switch (to_type->getTypeId())
+        {
+            case TypeIndex::String:
+                return createStringWrapper(from_type);
+            case TypeIndex::FixedString:
+                return createFixedStringWrapper(from_type, checkAndGetDataType<DataTypeFixedString>(to_type.get())->getN());
+            case TypeIndex::Array:
+                return createArrayWrapper(from_type, static_cast<const DataTypeArray &>(*to_type));
+            case TypeIndex::Tuple:
+                return createTupleWrapper(from_type, checkAndGetDataType<DataTypeTuple>(to_type.get()));
+            case TypeIndex::Map:
+                return createMapWrapper(from_type, checkAndGetDataType<DataTypeMap>(to_type.get()));
+            case TypeIndex::Object:
+                return createObjectWrapper(from_type, checkAndGetDataType<DataTypeObject>(to_type.get()));
+            case TypeIndex::AggregateFunction:
+                return createAggregateFunctionWrapper(from_type, checkAndGetDataType<DataTypeAggregateFunction>(to_type.get()));
+            case TypeIndex::Interval:
+                return createIntervalWrapper(from_type, checkAndGetDataType<DataTypeInterval>(to_type.get())->getKind());
+            default:
+                break;
+        }
+
+        if (cast_type == CastType::accurateOrNull)
+            return createToNullableColumnWrapper();
+        else
+            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
+                from_type->getName(), to_type->getName());
+    }
+};
+
+}
+
+
+FunctionBasePtr createFunctionBaseCast(
+    ContextPtr context,
+    const char * name,
+    const ColumnsWithTypeAndName & arguments,
+    const DataTypePtr & return_type,
+    std::optional<CastDiagnostic> diagnostic,
+    CastType cast_type)
+{
+    DataTypes data_types(arguments.size());
+
+    for (size_t i = 0; i < arguments.size(); ++i)
+        data_types[i] = arguments[i].type;
+
+    FunctionCast::MonotonicityForRange monotonicity;
+
+    if (isEnum(arguments.front().type)
+        && castTypeToEither<DataTypeEnum8, DataTypeEnum16>(return_type.get(), [&](auto & type)
+        {
+            monotonicity = FunctionTo<std::decay_t<decltype(type)>>::Type::Monotonic::get;
+            return true;
+        }))
+    {
+    }
+    else if (castTypeToEither<
+        DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256,
+        DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64, DataTypeInt128, DataTypeInt256,
+        DataTypeFloat32, DataTypeFloat64,
+        DataTypeDate, DataTypeDate32, DataTypeDateTime,
+        DataTypeString>(return_type.get(), [&](auto & type)
+        {
+            monotonicity = FunctionTo<std::decay_t<decltype(type)>>::Type::Monotonic::get;
+            return true;
+        }))
+    {
+    }
+
+    return std::make_unique<FunctionCast>(context, name, std::move(monotonicity), data_types, return_type, diagnostic, cast_type);
+}
+
 REGISTER_FUNCTION(Conversion)
 {
     factory.registerFunction<FunctionToUInt8>();
@@ -32,7 +4892,7 @@ REGISTER_FUNCTION(Conversion)
     /// MySQL compatibility alias. Cannot be registered as alias,
     /// because we don't want it to be normalized to toDate in queries,
     /// otherwise CREATE DICTIONARY query breaks.
-    factory.registerFunction<FunctionToDate>("DATE", {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction("DATE", &FunctionToDate::create, {}, FunctionFactory::CaseInsensitive);
 
     factory.registerFunction<FunctionToDate32>();
     factory.registerFunction<FunctionToDateTime>();
diff --git a/src/Functions/FunctionsConversion.h b/src/Functions/FunctionsConversion.h
deleted file mode 100644
index eed75788fcd..00000000000
--- a/src/Functions/FunctionsConversion.h
+++ /dev/null
@@ -1,4728 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <type_traits>
-
-#include <IO/WriteBufferFromVector.h>
-#include <IO/ReadBufferFromMemory.h>
-#include <IO/Operators.h>
-#include <IO/parseDateTimeBestEffort.h>
-#include <DataTypes/DataTypeFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypesDecimal.h>
-#include <DataTypes/DataTypeString.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDate32.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeDateTime64.h>
-#include <DataTypes/DataTypeEnum.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/DataTypeTuple.h>
-#include <DataTypes/DataTypeMap.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeNothing.h>
-#include <DataTypes/DataTypeUUID.h>
-#include <DataTypes/DataTypeInterval.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataTypes/DataTypeObject.h>
-#include <DataTypes/ObjectUtils.h>
-#include <DataTypes/DataTypeNested.h>
-#include <DataTypes/Serializations/SerializationDecimal.h>
-#include <Formats/FormatSettings.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnAggregateFunction.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnMap.h>
-#include <Columns/ColumnObject.h>
-#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>
-#include <Functions/IFunctionAdaptors.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/DateTimeTransforms.h>
-#include <Functions/toFixedString.h>
-#include <Functions/TransformDateTime64.h>
-#include <Functions/FunctionsCodingIP.h>
-#include <Functions/CastOverloadResolver.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <Columns/ColumnLowCardinality.h>
-#include <Interpreters/Context.h>
-#include <Common/HashTable/HashMap.h>
-#include <DataTypes/DataTypeIPv4andIPv6.h>
-#include <Common/IPv6ToBinary.h>
-#include "DataTypes/IDataType.h"
-#include <Core/Types.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int ATTEMPT_TO_READ_AFTER_EOF;
-    extern const int CANNOT_PARSE_NUMBER;
-    extern const int CANNOT_READ_ARRAY_FROM_TEXT;
-    extern const int CANNOT_PARSE_INPUT_ASSERTION_FAILED;
-    extern const int CANNOT_PARSE_QUOTED_STRING;
-    extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
-    extern const int CANNOT_PARSE_DATE;
-    extern const int CANNOT_PARSE_DATETIME;
-    extern const int CANNOT_PARSE_TEXT;
-    extern const int CANNOT_PARSE_UUID;
-    extern const int CANNOT_PARSE_IPV4;
-    extern const int CANNOT_PARSE_IPV6;
-    extern const int TOO_FEW_ARGUMENTS_FOR_FUNCTION;
-    extern const int LOGICAL_ERROR;
-    extern const int TYPE_MISMATCH;
-    extern const int CANNOT_CONVERT_TYPE;
-    extern const int ILLEGAL_COLUMN;
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int NOT_IMPLEMENTED;
-    extern const int CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN;
-    extern const int CANNOT_PARSE_BOOL;
-    extern const int VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE;
-}
-
-/** Type conversion functions.
-  * toType - conversion in "natural way";
-  */
-
-inline UInt32 extractToDecimalScale(const ColumnWithTypeAndName & named_column)
-{
-    const auto * arg_type = named_column.type.get();
-    bool ok = checkAndGetDataType<DataTypeUInt64>(arg_type)
-        || checkAndGetDataType<DataTypeUInt32>(arg_type)
-        || checkAndGetDataType<DataTypeUInt16>(arg_type)
-        || checkAndGetDataType<DataTypeUInt8>(arg_type);
-    if (!ok)
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type of toDecimal() scale {}", named_column.type->getName());
-
-    Field field;
-    named_column.column->get(0, field);
-    return static_cast<UInt32>(field.get<UInt32>());
-}
-
-/// Function toUnixTimestamp has exactly the same implementation as toDateTime of String type.
-struct NameToUnixTimestamp { static constexpr auto name = "toUnixTimestamp"; };
-
-struct AccurateConvertStrategyAdditions
-{
-    UInt32 scale { 0 };
-};
-
-struct AccurateOrNullConvertStrategyAdditions
-{
-    UInt32 scale { 0 };
-};
-
-
-struct ConvertDefaultBehaviorTag {};
-struct ConvertReturnNullOnErrorTag {};
-struct ConvertReturnZeroOnErrorTag {};
-
-/** Conversion of number types to each other, enums to numbers, dates and datetimes to numbers and back: done by straight assignment.
-  *  (Date is represented internally as number of days from some day; DateTime - as unix timestamp)
-  */
-template <typename FromDataType, typename ToDataType, typename Name,
-    typename SpecialTag = ConvertDefaultBehaviorTag,
-    FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior>
-struct ConvertImpl
-{
-    using FromFieldType = typename FromDataType::FieldType;
-    using ToFieldType = typename ToDataType::FieldType;
-
-    template <typename Additions = void *>
-    static ColumnPtr NO_SANITIZE_UNDEFINED execute(
-        const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type [[maybe_unused]], size_t input_rows_count,
-        Additions additions [[maybe_unused]] = Additions())
-    {
-        const ColumnWithTypeAndName & named_from = arguments[0];
-
-        using ColVecFrom = typename FromDataType::ColumnType;
-        using ColVecTo = typename ToDataType::ColumnType;
-
-        if constexpr ((IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
-            && !(std::is_same_v<DataTypeDateTime64, FromDataType> || std::is_same_v<DataTypeDateTime64, ToDataType>))
-        {
-            if constexpr (!IsDataTypeDecimalOrNumber<FromDataType> || !IsDataTypeDecimalOrNumber<ToDataType>)
-            {
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                    named_from.column->getName(), Name::name);
-            }
-        }
-
-        if (const ColVecFrom * col_from = checkAndGetColumn<ColVecFrom>(named_from.column.get()))
-        {
-            typename ColVecTo::MutablePtr col_to = nullptr;
-
-            if constexpr (IsDataTypeDecimal<ToDataType>)
-            {
-                UInt32 scale;
-
-                if constexpr (std::is_same_v<Additions, AccurateConvertStrategyAdditions>
-                    || std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                {
-                    scale = additions.scale;
-                }
-                else
-                {
-                    scale = additions;
-                }
-
-                col_to = ColVecTo::create(0, scale);
-            }
-            else
-                col_to = ColVecTo::create();
-
-            const auto & vec_from = col_from->getData();
-            auto & vec_to = col_to->getData();
-            vec_to.resize(input_rows_count);
-
-            ColumnUInt8::MutablePtr col_null_map_to;
-            ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
-            if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-            {
-                col_null_map_to = ColumnUInt8::create(input_rows_count, false);
-                vec_null_map_to = &col_null_map_to->getData();
-            }
-
-            bool result_is_bool = isBool(result_type);
-            for (size_t i = 0; i < input_rows_count; ++i)
-            {
-                if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
-                {
-                    if (result_is_bool)
-                    {
-                        vec_to[i] = vec_from[i] != FromFieldType(0);
-                        continue;
-                    }
-                }
-
-                if constexpr (std::is_same_v<FromDataType, DataTypeUUID> && std::is_same_v<ToDataType, DataTypeUInt128>)
-                {
-                    static_assert(
-                        std::is_same_v<DataTypeUInt128::FieldType, DataTypeUUID::FieldType::UnderlyingType>,
-                        "UInt128 and UUID types must be same");
-
-                    vec_to[i].items[1] = vec_from[i].toUnderType().items[0];
-                    vec_to[i].items[0] = vec_from[i].toUnderType().items[1];
-
-                    continue;
-                }
-
-                if constexpr (std::is_same_v<FromDataType, DataTypeIPv6> && std::is_same_v<ToDataType, DataTypeUInt128>)
-                {
-                    static_assert(
-                        std::is_same_v<DataTypeUInt128::FieldType, DataTypeUUID::FieldType::UnderlyingType>,
-                        "UInt128 and IPv6 types must be same");
-
-                    vec_to[i].items[1] = std::byteswap(vec_from[i].toUnderType().items[0]);
-                    vec_to[i].items[0] = std::byteswap(vec_from[i].toUnderType().items[1]);
-
-                    continue;
-                }
-
-                if constexpr (std::is_same_v<FromDataType, DataTypeUUID> != std::is_same_v<ToDataType, DataTypeUUID>)
-                {
-                    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                                    "Conversion between numeric types and UUID is not supported. "
-                                    "Probably the passed UUID is unquoted");
-                }
-                else if constexpr (
-                    (std::is_same_v<FromDataType, DataTypeIPv4> != std::is_same_v<ToDataType, DataTypeIPv4>)
-                    && !(is_any_of<FromDataType, DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64, DataTypeIPv6> || is_any_of<ToDataType, DataTypeUInt32, DataTypeUInt64, DataTypeUInt128, DataTypeUInt256, DataTypeIPv6>)
-                )
-                {
-                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Conversion from {} to {} is not supported",
-                                    TypeName<typename FromDataType::FieldType>, TypeName<typename ToDataType::FieldType>);
-                }
-                else if constexpr (std::is_same_v<FromDataType, DataTypeIPv6> != std::is_same_v<ToDataType, DataTypeIPv6> && !(std::is_same_v<ToDataType, DataTypeIPv4> || std::is_same_v<FromDataType, DataTypeIPv4>))
-                {
-                    throw Exception(ErrorCodes::NOT_IMPLEMENTED,
-                                    "Conversion between numeric types and IPv6 is not supported. "
-                                    "Probably the passed IPv6 is unquoted");
-                }
-                else
-                {
-                    if constexpr (IsDataTypeDecimal<FromDataType> || IsDataTypeDecimal<ToDataType>)
-                    {
-                        if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                        {
-                            ToFieldType result;
-                            bool convert_result = false;
-
-                            if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
-                                convert_result = tryConvertDecimals<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), col_to->getScale(), result);
-                            else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
-                                convert_result = tryConvertFromDecimal<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), result);
-                            else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
-                                convert_result = tryConvertToDecimal<FromDataType, ToDataType>(vec_from[i], col_to->getScale(), result);
-
-                            if (convert_result)
-                                vec_to[i] = result;
-                            else
-                            {
-                                vec_to[i] = static_cast<ToFieldType>(0);
-                                (*vec_null_map_to)[i] = true;
-                            }
-                        }
-                        else
-                        {
-                            if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeDecimal<ToDataType>)
-                                vec_to[i] = convertDecimals<FromDataType, ToDataType>(vec_from[i], col_from->getScale(), col_to->getScale());
-                            else if constexpr (IsDataTypeDecimal<FromDataType> && IsDataTypeNumber<ToDataType>)
-                                vec_to[i] = convertFromDecimal<FromDataType, ToDataType>(vec_from[i], col_from->getScale());
-                            else if constexpr (IsDataTypeNumber<FromDataType> && IsDataTypeDecimal<ToDataType>)
-                                vec_to[i] = convertToDecimal<FromDataType, ToDataType>(vec_from[i], col_to->getScale());
-                            else
-                                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Unsupported data type in conversion function");
-                        }
-                    }
-                    else
-                    {
-                        /// If From Data is Nan or Inf and we convert to integer type, throw exception
-                        if constexpr (std::is_floating_point_v<FromFieldType> && !std::is_floating_point_v<ToFieldType>)
-                        {
-                            if (!isFinite(vec_from[i]))
-                            {
-                                if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                                {
-                                    vec_to[i] = 0;
-                                    (*vec_null_map_to)[i] = true;
-                                    continue;
-                                }
-                                else
-                                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Unexpected inf or nan to integer conversion");
-                            }
-                        }
-
-                        if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>
-                                || std::is_same_v<Additions, AccurateConvertStrategyAdditions>)
-                        {
-                            bool convert_result = accurate::convertNumeric(vec_from[i], vec_to[i]);
-
-                            if (!convert_result)
-                            {
-                                if (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                                {
-                                    vec_to[i] = 0;
-                                    (*vec_null_map_to)[i] = true;
-                                }
-                                else
-                                {
-                                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Value in column {} cannot be safely converted into type {}",
-                                        named_from.column->getName(), result_type->getName());
-                                }
-                            }
-                        }
-                        else
-                        {
-                            if constexpr (std::is_same_v<ToDataType, DataTypeIPv4> && std::is_same_v<FromDataType, DataTypeIPv6>)
-                            {
-                                const uint8_t ip4_cidr[] {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00};
-                                const uint8_t * src = reinterpret_cast<const uint8_t *>(&vec_from[i].toUnderType());
-                                if (!matchIPv6Subnet(src, ip4_cidr, 96))
-                                {
-                                    char addr[IPV6_MAX_TEXT_LENGTH + 1] {};
-                                    char * paddr = addr;
-                                    formatIPv6(src, paddr);
-
-                                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "IPv6 {} in column {} is not in IPv4 mapping block", addr, named_from.column->getName());
-                                }
-
-                                uint8_t * dst = reinterpret_cast<uint8_t *>(&vec_to[i].toUnderType());
-                                if constexpr (std::endian::native == std::endian::little)
-                                {
-                                    dst[0] = src[15];
-                                    dst[1] = src[14];
-                                    dst[2] = src[13];
-                                    dst[3] = src[12];
-                                }
-                                else
-                                {
-                                    dst[0] = src[12];
-                                    dst[1] = src[13];
-                                    dst[2] = src[14];
-                                    dst[3] = src[15];
-                                }
-                            }
-                            else if constexpr (std::is_same_v<ToDataType, DataTypeIPv6> && std::is_same_v<FromDataType, DataTypeIPv4>)
-                            {
-                                const uint8_t * src = reinterpret_cast<const uint8_t *>(&vec_from[i].toUnderType());
-                                uint8_t * dst = reinterpret_cast<uint8_t *>(&vec_to[i].toUnderType());
-                                std::memset(dst, '\0', IPV6_BINARY_LENGTH);
-                                dst[10] = dst[11] = 0xff;
-
-                                if constexpr (std::endian::native == std::endian::little)
-                                {
-                                    dst[12] = src[3];
-                                    dst[13] = src[2];
-                                    dst[14] = src[1];
-                                    dst[15] = src[0];
-                                }
-                                else
-                                {
-                                    dst[12] = src[0];
-                                    dst[13] = src[1];
-                                    dst[14] = src[2];
-                                    dst[15] = src[3];
-                                }
-                            }
-                            else 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]);
-                        }
-                    }
-                }
-            }
-
-            if constexpr (std::is_same_v<Additions, AccurateOrNullConvertStrategyAdditions>)
-                return ColumnNullable::create(std::move(col_to), std::move(col_null_map_to));
-            else
-                return col_to;
-        }
-        else
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                named_from.column->getName(), Name::name);
-    }
-};
-
-/** Conversion of DateTime to Date: throw off time component.
-  */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDateTime, DataTypeDate, ToDateImpl<date_time_overflow_behavior>, false> {};
-
-/** Conversion of DateTime to Date32: throw off time component.
-  */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDateTime, DataTypeDate32, ToDate32Impl, false> {};
-
-/** Conversion of Date to DateTime: adding 00:00:00 time component.
-  */
-template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior>
-struct ToDateTimeImpl
-{
-    static constexpr auto name = "toDateTime";
-
-    static UInt32 execute(UInt16 d, const DateLUTImpl & time_zone)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (d > MAX_DATETIME_DAY_NUM) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Day number {} is out of bounds of type DateTime", d);
-        }
-        else if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
-        {
-            if (d > MAX_DATETIME_DAY_NUM)
-                d = MAX_DATETIME_DAY_NUM;
-        }
-        return static_cast<UInt32>(time_zone.fromDayNum(DayNum(d)));
-    }
-
-    static UInt32 execute(Int32 d, const DateLUTImpl & time_zone)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
-        {
-            if (d < 0)
-                return 0;
-            else if (d > MAX_DATETIME_DAY_NUM)
-                d = MAX_DATETIME_DAY_NUM;
-        }
-        else if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (d < 0 || d > MAX_DATETIME_DAY_NUM) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type DateTime", d);
-        }
-        return static_cast<UInt32>(time_zone.fromDayNum(ExtendedDayNum(d)));
-    }
-
-    static UInt32 execute(UInt32 dt, const DateLUTImpl & /*time_zone*/)
-    {
-        return dt;
-    }
-
-    static UInt32 execute(Int64 dt64, const DateLUTImpl & /*time_zone*/)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Ignore)
-            return static_cast<UInt32>(dt64);
-        else
-        {
-            if (dt64 < 0 || dt64 >= MAX_DATETIME_TIMESTAMP)
-            {
-                if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Saturate)
-                    return dt64 < 0 ? 0 : std::numeric_limits<UInt32>::max();
-                else
-                    throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type DateTime", dt64);
-            }
-            else
-                return static_cast<UInt32>(dt64);
-        }
-    }
-};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDate, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDate, DataTypeDateTime, ToDateTimeImpl<date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDate32, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDate32, DataTypeDateTime, ToDateTimeImpl<date_time_overflow_behavior>, false> {};
-
-/// Implementation of toDate function.
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTransform32Or64
-{
-    static constexpr auto name = "toDate";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
-        }
-        /// if value is smaller (or equal) than maximum day value for Date, than treat it as day num,
-        /// otherwise treat it as unix timestamp. This is a bit weird, but we leave this behavior.
-        if (from <= DATE_LUT_MAX_DAY_NUM)
-            return from;
-        else
-            return time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
-    }
-};
-
-/** Conversion of Date32 to Date.
-  */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDate32, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDate32, DataTypeDate, ToDateImpl<date_time_overflow_behavior>, false> {};
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTransform32Or64Signed
-{
-    static constexpr auto name = "toDate";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
-    {
-        // TODO: decide narrow or extended range based on FromType
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from < 0 || from > MAX_DATE_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
-        }
-        else
-        {
-            if (from < 0)
-                return 0;
-        }
-        return (from <= DATE_LUT_MAX_DAY_NUM)
-            ? static_cast<ToType>(from)
-            : time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATE_TIMESTAMP)));
-    }
-};
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTransform8Or16Signed
-{
-    static constexpr auto name = "toDate";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
-    {
-        if (from < 0)
-        {
-            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Value {} is out of bounds of type Date", from);
-            else
-                return 0;
-        }
-        return from;
-    }
-};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime64, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-        : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate32, TransformDateTime64<ToDate32Impl>, false> {};
-
-/// Implementation of toDate32 function.
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDate32Transform32Or64
-{
-    static constexpr auto name = "toDate32";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
-    {
-        if (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
-            return static_cast<ToType>(from);
-        else
-        {
-            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-            {
-                if (from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
-                    throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type Date32", from);
-            }
-            return time_zone.toDayNum(std::min(time_t(from), time_t(MAX_DATETIME64_TIMESTAMP)));
-        }
-    }
-};
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDate32Transform32Or64Signed
-{
-    static constexpr auto name = "toDate32";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl & time_zone)
-    {
-        static const Int32 daynum_min_offset = -static_cast<Int32>(time_zone.getDayNumOffsetEpoch());
-
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from < daynum_min_offset || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type Date32", from);
-        }
-
-        if (from < daynum_min_offset)
-            return daynum_min_offset;
-
-        return (from < DATE_LUT_MAX_EXTEND_DAY_NUM)
-            ? static_cast<ToType>(from)
-            : time_zone.toDayNum(std::min(time_t(Int64(from)), time_t(MAX_DATETIME64_TIMESTAMP)));
-    }
-};
-
-template <typename FromType, typename ToType>
-struct ToDate32Transform8Or16Signed
-{
-    static constexpr auto name = "toDate32";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
-    {
-        return from;
-    }
-};
-
-/** Special case of converting Int8, Int16, (U)Int32 or (U)Int64 (and also, for convenience,
-  * Float32, Float64) to Date. If the
-  * number is less than 65536, then it is treated as DayNum, and if it's greater or equals to 65536,
-  * then treated as unix timestamp. If the number exceeds UInt32, saturate to MAX_UINT32 then as DayNum.
-  * It's a bit illogical, as we actually have two functions in one.
-  * But allows to support frequent case,
-  *  when user write toDate(UInt32), expecting conversion of unix timestamp to Date.
-  *  (otherwise such usage would be frequent mistake).
-  */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt32, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt32, DataTypeDate, ToDateTransform32Or64<UInt32, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt64, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt64, DataTypeDate, ToDateTransform32Or64<UInt64, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt8, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt8, DataTypeDate, ToDateTransform8Or16Signed<Int8, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt16, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt16, DataTypeDate, ToDateTransform8Or16Signed<Int16, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt32, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt32, DataTypeDate, ToDateTransform32Or64Signed<Int32, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt64, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt64, DataTypeDate, ToDateTransform32Or64Signed<Int64, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat32, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat32, DataTypeDate, ToDateTransform32Or64Signed<Float32, UInt16, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat64, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat64, DataTypeDate, ToDateTransform32Or64Signed<Float64, UInt16, default_date_time_overflow_behavior>, false> {};
-
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt32, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt32, DataTypeDate32, ToDate32Transform32Or64<UInt32, Int32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt64, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt64, DataTypeDate32, ToDate32Transform32Or64<UInt64, Int32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt8, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt8, DataTypeDate32, ToDate32Transform8Or16Signed<Int8, Int32>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt16, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt16, DataTypeDate32, ToDate32Transform8Or16Signed<Int16, Int32>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt32, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt32, DataTypeDate32, ToDate32Transform32Or64Signed<Int32, Int32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt64, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt64, DataTypeDate32, ToDate32Transform32Or64Signed<Int64, Int32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat32, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat32, DataTypeDate32, ToDate32Transform32Or64Signed<Float32, Int32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat64, DataTypeDate32, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat64, DataTypeDate32, ToDate32Transform32Or64Signed<Float64, Int32, default_date_time_overflow_behavior>, false> {};
-
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTimeTransform64
-{
-    static constexpr auto name = "toDateTime";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
-        }
-        return static_cast<ToType>(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
-    }
-};
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTimeTransformSigned
-{
-    static constexpr auto name = "toDateTime";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
-    {
-        if (from < 0)
-        {
-            if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
-            else
-                return 0;
-        }
-        return from;
-    }
-};
-
-template <typename FromType, typename ToType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTimeTransform64Signed
-{
-    static constexpr auto name = "toDateTime";
-
-    static NO_SANITIZE_UNDEFINED ToType execute(const FromType & from, const DateLUTImpl &)
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from < 0 || from > MAX_DATETIME_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime", from);
-        }
-
-        if (from < 0)
-            return 0;
-        return static_cast<ToType>(std::min(time_t(from), time_t(MAX_DATETIME_TIMESTAMP)));
-    }
-};
-
-/// Special case of converting Int8, Int16, Int32 or (U)Int64 (and also, for convenience, Float32, Float64) to DateTime.
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt8, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt8, DataTypeDateTime, ToDateTimeTransformSigned<Int8, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt16, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt16, DataTypeDateTime, ToDateTimeTransformSigned<Int16, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt32, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt32, DataTypeDateTime, ToDateTimeTransformSigned<Int32, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt64, DataTypeDateTime, ToDateTimeTransform64Signed<Int64, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt64, DataTypeDateTime, ToDateTimeTransform64<UInt64, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat32, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat32, DataTypeDateTime, ToDateTimeTransform64Signed<Float32, UInt32, default_date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime, ToDateTimeTransform64Signed<Float64, UInt32, default_date_time_overflow_behavior>, false> {};
-
-/** Conversion of numeric to DateTime64
-  */
-
-template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTime64TransformUnsigned
-{
-    static constexpr auto name = "toDateTime64";
-
-    const DateTime64::NativeType scale_multiplier = 1;
-
-    ToDateTime64TransformUnsigned(UInt32 scale = 0) /// NOLINT
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
-    {}
-
-    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
-            else
-                return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
-        }
-        else
-            return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(std::min<time_t>(from, MAX_DATETIME64_TIMESTAMP), 0, scale_multiplier);
-    }
-};
-template <typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTime64TransformSigned
-{
-    static constexpr auto name = "toDateTime64";
-
-    const DateTime64::NativeType scale_multiplier = 1;
-
-    ToDateTime64TransformSigned(UInt32 scale = 0) /// NOLINT
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
-    {}
-
-    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from < MIN_DATETIME64_TIMESTAMP || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
-        }
-        from = static_cast<FromType>(std::max<time_t>(from, MIN_DATETIME64_TIMESTAMP));
-        from = static_cast<FromType>(std::min<time_t>(from, MAX_DATETIME64_TIMESTAMP));
-
-        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(from, 0, scale_multiplier);
-    }
-};
-template <typename FromDataType, typename FromType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ToDateTime64TransformFloat
-{
-    static constexpr auto name = "toDateTime64";
-
-    const UInt32 scale = 1;
-
-    ToDateTime64TransformFloat(UInt32 scale_ = 0) /// NOLINT
-        : scale(scale_)
-    {}
-
-    NO_SANITIZE_UNDEFINED DateTime64::NativeType execute(FromType from, const DateLUTImpl &) const
-    {
-        if constexpr (date_time_overflow_behavior == FormatSettings::DateTimeOverflowBehavior::Throw)
-        {
-            if (from < MIN_DATETIME64_TIMESTAMP || from > MAX_DATETIME64_TIMESTAMP) [[unlikely]]
-                throw Exception(ErrorCodes::VALUE_IS_OUT_OF_RANGE_OF_DATA_TYPE, "Timestamp value {} is out of bounds of type DateTime64", from);
-        }
-
-        from = std::max(from, static_cast<FromType>(MIN_DATETIME64_TIMESTAMP));
-        from = std::min(from, static_cast<FromType>(MAX_DATETIME64_TIMESTAMP));
-        return convertToDecimal<FromDataType, DataTypeDateTime64>(from, scale);
-    }
-};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt8, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt8, DataTypeDateTime64, ToDateTime64TransformSigned<Int8, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt16, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt16, DataTypeDateTime64, ToDateTime64TransformSigned<Int16, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt32, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt32, DataTypeDateTime64, ToDateTime64TransformSigned<Int32, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeInt64, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeInt64, DataTypeDateTime64, ToDateTime64TransformSigned<Int64, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeUInt64, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeUInt64, DataTypeDateTime64, ToDateTime64TransformUnsigned<UInt64, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat32, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat32, DataTypeDateTime64, ToDateTime64TransformFloat<DataTypeFloat32, Float32, date_time_overflow_behavior>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeFloat64, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeFloat64, DataTypeDateTime64, ToDateTime64TransformFloat<DataTypeFloat64, Float64, date_time_overflow_behavior>, false> {};
-
-
-/** Conversion of DateTime64 to Date or DateTime: discards fractional part.
- */
-template <typename Transform>
-struct FromDateTime64Transform
-{
-    static constexpr auto name = Transform::name;
-
-    const DateTime64::NativeType scale_multiplier = 1;
-
-    FromDateTime64Transform(UInt32 scale) /// NOLINT
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
-    {}
-
-    auto execute(DateTime64::NativeType dt, const DateLUTImpl & time_zone) const
-    {
-        const auto c = DecimalUtils::splitWithScaleMultiplier(DateTime64(dt), scale_multiplier);
-        return Transform::execute(static_cast<UInt32>(c.whole), time_zone);
-    }
-};
-
-/** Conversion of DateTime64 to Date or DateTime: discards fractional part.
- */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime64, DataTypeDate, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDate, TransformDateTime64<ToDateImpl<date_time_overflow_behavior>>, false> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime64, DataTypeDateTime, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDateTime64, DataTypeDateTime, TransformDateTime64<ToDateTimeImpl<date_time_overflow_behavior>>, false> {};
-
-struct ToDateTime64Transform
-{
-    static constexpr auto name = "toDateTime64";
-
-    const DateTime64::NativeType scale_multiplier = 1;
-
-    ToDateTime64Transform(UInt32 scale = 0) /// NOLINT
-        : scale_multiplier(DecimalUtils::scaleMultiplier<DateTime64::NativeType>(scale))
-    {}
-
-    DateTime64::NativeType execute(UInt16 d, const DateLUTImpl & time_zone) const
-    {
-        const auto dt = ToDateTimeImpl<>::execute(d, time_zone);
-        return execute(dt, time_zone);
-    }
-
-    DateTime64::NativeType execute(Int32 d, const DateLUTImpl & time_zone) const
-    {
-        Int64 dt = static_cast<Int64>(time_zone.fromDayNum(ExtendedDayNum(d)));
-        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
-    }
-
-    DateTime64::NativeType execute(UInt32 dt, const DateLUTImpl & /*time_zone*/) const
-    {
-        return DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(dt, 0, scale_multiplier);
-    }
-};
-
-/** Conversion of Date or DateTime to DateTime64: add zero sub-second part.
-  */
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDate, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDate, DataTypeDateTime64, ToDateTime64Transform> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDate32, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDate32, DataTypeDateTime64, ToDateTime64Transform> {};
-
-template <typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct ConvertImpl<DataTypeDateTime, DataTypeDateTime64, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : DateTimeTransformImpl<DataTypeDateTime, DataTypeDateTime64, ToDateTime64Transform> {};
-
-
-/** Transformation of numbers, dates, datetimes to strings: through formatting.
-  */
-template <typename DataType>
-struct FormatImpl
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const typename DataType::FieldType x, WriteBuffer & wb, const DataType *, const DateLUTImpl *)
-    {
-        writeText(x, wb);
-        return ReturnType(true);
-    }
-};
-
-template <>
-struct FormatImpl<DataTypeDate>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const DataTypeDate::FieldType x, WriteBuffer & wb, const DataTypeDate *, const DateLUTImpl * time_zone)
-    {
-        writeDateText(DayNum(x), wb, *time_zone);
-        return ReturnType(true);
-    }
-};
-
-template <>
-struct FormatImpl<DataTypeDate32>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const DataTypeDate32::FieldType x, WriteBuffer & wb, const DataTypeDate32 *, const DateLUTImpl * time_zone)
-    {
-        writeDateText(ExtendedDayNum(x), wb, *time_zone);
-        return ReturnType(true);
-    }
-};
-
-template <>
-struct FormatImpl<DataTypeDateTime>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const DataTypeDateTime::FieldType x, WriteBuffer & wb, const DataTypeDateTime *, const DateLUTImpl * time_zone)
-    {
-        writeDateTimeText(x, wb, *time_zone);
-        return ReturnType(true);
-    }
-};
-
-template <>
-struct FormatImpl<DataTypeDateTime64>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const DataTypeDateTime64::FieldType x, WriteBuffer & wb, const DataTypeDateTime64 * type, const DateLUTImpl * time_zone)
-    {
-        writeDateTimeText(DateTime64(x), type->getScale(), wb, *time_zone);
-        return ReturnType(true);
-    }
-};
-
-
-template <typename FieldType>
-struct FormatImpl<DataTypeEnum<FieldType>>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const FieldType x, WriteBuffer & wb, const DataTypeEnum<FieldType> * type, const DateLUTImpl *)
-    {
-        static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
-
-        if constexpr (throw_exception)
-        {
-            writeString(type->getNameForValue(x), wb);
-        }
-        else
-        {
-            StringRef res;
-            bool is_ok = type->getNameForValue(x, res);
-            if (is_ok)
-                writeString(res, wb);
-            return ReturnType(is_ok);
-        }
-    }
-};
-
-template <typename FieldType>
-struct FormatImpl<DataTypeDecimal<FieldType>>
-{
-    template <typename ReturnType = void>
-    static ReturnType execute(const FieldType x, WriteBuffer & wb, const DataTypeDecimal<FieldType> * type, const DateLUTImpl *)
-    {
-        writeText(x, type->getScale(), wb, false);
-        return ReturnType(true);
-    }
-};
-
-
-/// DataTypeEnum<T> to DataType<T> free conversion
-template <typename FieldType, typename Name>
-struct ConvertImpl<DataTypeEnum<FieldType>, DataTypeNumber<FieldType>, Name, ConvertDefaultBehaviorTag>
-{
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
-    {
-        return arguments[0].column;
-    }
-};
-
-static inline ColumnUInt8::MutablePtr copyNullMap(ColumnPtr col)
-{
-    ColumnUInt8::MutablePtr null_map = nullptr;
-    if (const auto * col_null = checkAndGetColumn<ColumnNullable>(col.get()))
-    {
-        null_map = ColumnUInt8::create();
-        null_map->insertRangeFrom(col_null->getNullMapColumn(), 0, col_null->size());
-    }
-    return null_map;
-}
-
-template <typename FromDataType, typename Name>
-requires (!std::is_same_v<FromDataType, DataTypeString>)
-struct ConvertImpl<FromDataType, DataTypeString, Name, ConvertDefaultBehaviorTag>
-{
-    using FromFieldType = typename FromDataType::FieldType;
-    using ColVecType = ColumnVectorOrDecimal<FromFieldType>;
-
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/)
-    {
-        if constexpr (IsDataTypeDateOrDateTime<FromDataType>)
-        {
-            auto datetime_arg = arguments[0];
-
-            const DateLUTImpl * time_zone = nullptr;
-            const ColumnConst * time_zone_column = nullptr;
-
-            if (arguments.size() == 1)
-            {
-                auto non_null_args = createBlockWithNestedColumns(arguments);
-                time_zone = &extractTimeZoneFromFunctionArguments(non_null_args, 1, 0);
-            }
-            else /// When we have a column for timezone
-            {
-                datetime_arg.column = datetime_arg.column->convertToFullColumnIfConst();
-
-                if constexpr (std::is_same_v<FromDataType, DataTypeDate> || std::is_same_v<FromDataType, DataTypeDate32>)
-                    time_zone = &DateLUT::instance();
-                /// For argument of Date or DateTime type, second argument with time zone could be specified.
-                if constexpr (std::is_same_v<FromDataType, DataTypeDateTime> || std::is_same_v<FromDataType, DataTypeDateTime64>)
-                {
-                    if ((time_zone_column = checkAndGetColumnConst<ColumnString>(arguments[1].column.get())))
-                    {
-                        auto non_null_args = createBlockWithNestedColumns(arguments);
-                        time_zone = &extractTimeZoneFromFunctionArguments(non_null_args, 1, 0);
-                    }
-                }
-            }
-            const auto & col_with_type_and_name = columnGetNested(datetime_arg);
-
-            if (const auto col_from = checkAndGetColumn<ColVecType>(col_with_type_and_name.column.get()))
-            {
-                auto col_to = ColumnString::create();
-
-                const typename ColVecType::Container & vec_from = col_from->getData();
-                ColumnString::Chars & data_to = col_to->getChars();
-                ColumnString::Offsets & offsets_to = col_to->getOffsets();
-                size_t size = vec_from.size();
-
-                if constexpr (std::is_same_v<FromDataType, DataTypeDate>)
-                    data_to.resize(size * (strlen("YYYY-MM-DD") + 1));
-                else if constexpr (std::is_same_v<FromDataType, DataTypeDate32>)
-                    data_to.resize(size * (strlen("YYYY-MM-DD") + 1));
-                else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime>)
-                    data_to.resize(size * (strlen("YYYY-MM-DD hh:mm:ss") + 1));
-                else if constexpr (std::is_same_v<FromDataType, DataTypeDateTime64>)
-                    data_to.resize(size * (strlen("YYYY-MM-DD hh:mm:ss.") + col_from->getScale() + 1));
-                else
-                    data_to.resize(size * 3);   /// Arbitrary
-
-                offsets_to.resize(size);
-
-                WriteBufferFromVector<ColumnString::Chars> write_buffer(data_to);
-                const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
-
-                ColumnUInt8::MutablePtr null_map = copyNullMap(datetime_arg.column);
-
-                if (null_map)
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        if (!time_zone_column && arguments.size() > 1)
-                        {
-                            if (!arguments[1].column.get()->getDataAt(i).toString().empty())
-                                time_zone = &DateLUT::instance(arguments[1].column.get()->getDataAt(i).toString());
-                            else
-                                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Provided time zone must be non-empty");
-                        }
-                        bool is_ok = FormatImpl<FromDataType>::template execute<bool>(vec_from[i], write_buffer, &type, time_zone);
-                        null_map->getData()[i] |= !is_ok;
-                        writeChar(0, write_buffer);
-                        offsets_to[i] = write_buffer.count();
-                    }
-                }
-                else
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        if (!time_zone_column && arguments.size() > 1)
-                        {
-                            if (!arguments[1].column.get()->getDataAt(i).toString().empty())
-                            time_zone = &DateLUT::instance(arguments[1].column.get()->getDataAt(i).toString());
-                            else
-                                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Provided time zone must be non-empty");
-                        }
-                        FormatImpl<FromDataType>::template execute<void>(vec_from[i], write_buffer, &type, time_zone);
-                        writeChar(0, write_buffer);
-                        offsets_to[i] = write_buffer.count();
-                    }
-                }
-
-                write_buffer.finalize();
-
-                if (null_map)
-                    return ColumnNullable::create(std::move(col_to), std::move(null_map));
-                return col_to;
-            }
-            else
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                        arguments[0].column->getName(), Name::name);
-        }
-        else
-        {
-            ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
-
-            const auto & col_with_type_and_name = columnGetNested(arguments[0]);
-            const auto & type = static_cast<const FromDataType &>(*col_with_type_and_name.type);
-
-            if (const auto col_from = checkAndGetColumn<ColVecType>(col_with_type_and_name.column.get()))
-            {
-                auto col_to = ColumnString::create();
-
-                const typename ColVecType::Container & vec_from = col_from->getData();
-                ColumnString::Chars & data_to = col_to->getChars();
-                ColumnString::Offsets & offsets_to = col_to->getOffsets();
-                size_t size = vec_from.size();
-
-                data_to.resize(size * 3);
-                offsets_to.resize(size);
-
-                WriteBufferFromVector<ColumnString::Chars> write_buffer(data_to);
-
-                if (null_map)
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        bool is_ok = FormatImpl<FromDataType>::template execute<bool>(vec_from[i], write_buffer, &type, nullptr);
-                        /// We don't use timezones in this branch
-                        null_map->getData()[i] |= !is_ok;
-                        writeChar(0, write_buffer);
-                        offsets_to[i] = write_buffer.count();
-                    }
-                }
-                else
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        FormatImpl<FromDataType>::template execute<void>(vec_from[i], write_buffer, &type, nullptr);
-                        writeChar(0, write_buffer);
-                        offsets_to[i] = write_buffer.count();
-                    }
-                }
-
-                write_buffer.finalize();
-
-                if (null_map)
-                    return ColumnNullable::create(std::move(col_to), std::move(null_map));
-                return col_to;
-            }
-            else
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                        arguments[0].column->getName(), Name::name);
-        }
-    }
-};
-
-
-/// Generic conversion of any type to String or FixedString via serialization to text.
-template <typename StringColumnType>
-struct ConvertImplGenericToString
-{
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/)
-    {
-        static_assert(std::is_same_v<StringColumnType, ColumnString> || std::is_same_v<StringColumnType, ColumnFixedString>,
-                "Can be used only to serialize to ColumnString or ColumnFixedString");
-
-        ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
-
-        const auto & col_with_type_and_name = columnGetNested(arguments[0]);
-        const IDataType & type = *col_with_type_and_name.type;
-        const IColumn & col_from = *col_with_type_and_name.column;
-
-        size_t size = col_from.size();
-        auto col_to = removeNullable(result_type)->createColumn();
-
-        {
-            ColumnStringHelpers::WriteHelper write_helper(
-                    assert_cast<StringColumnType &>(*col_to),
-                    size);
-
-            auto & write_buffer = write_helper.getWriteBuffer();
-
-            FormatSettings format_settings;
-            auto serialization = type.getDefaultSerialization();
-            for (size_t row = 0; row < size; ++row)
-            {
-                serialization->serializeText(col_from, row, write_buffer, format_settings);
-                write_helper.rowWritten();
-            }
-
-            write_helper.finalize();
-        }
-
-        if (result_type->isNullable() && null_map)
-            return ColumnNullable::create(std::move(col_to), std::move(null_map));
-        return col_to;
-    }
-};
-
-/** Conversion of time_t to UInt16, Int32, UInt32
-  */
-template <typename DataType>
-void convertFromTime(typename DataType::FieldType & x, time_t & time)
-{
-    x = time;
-}
-
-template <>
-inline void convertFromTime<DataTypeDate>(DataTypeDate::FieldType & x, time_t & time)
-{
-    if (unlikely(time < 0))
-        x = 0;
-    else if (unlikely(time > 0xFFFF))
-        x = 0xFFFF;
-    else
-        x = time;
-}
-
-template <>
-inline void convertFromTime<DataTypeDate32>(DataTypeDate32::FieldType & x, time_t & time)
-{
-    x = static_cast<UInt32>(time);
-}
-
-template <>
-inline void convertFromTime<DataTypeDateTime>(DataTypeDateTime::FieldType & x, time_t & time)
-{
-    if (unlikely(time < 0))
-        x = 0;
-    else if (unlikely(time > MAX_DATETIME_TIMESTAMP))
-        x = MAX_DATETIME_TIMESTAMP;
-    else
-        x = static_cast<UInt32>(time);
-}
-
-/** Conversion of strings to numbers, dates, datetimes: through parsing.
-  */
-template <typename DataType>
-void parseImpl(typename DataType::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool precise_float_parsing)
-{
-    if constexpr (std::is_floating_point_v<typename DataType::FieldType>)
-    {
-        if (precise_float_parsing)
-            readFloatTextPrecise(x, rb);
-        else
-            readFloatTextFast(x, rb);
-    }
-    else
-        readText(x, rb);
-}
-
-template <>
-inline void parseImpl<DataTypeDate>(DataTypeDate::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    DayNum tmp(0);
-    readDateText(tmp, rb, *time_zone);
-    x = tmp;
-}
-
-template <>
-inline void parseImpl<DataTypeDate32>(DataTypeDate32::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    ExtendedDayNum tmp(0);
-    readDateText(tmp, rb, *time_zone);
-    x = tmp;
-}
-
-
-// NOTE: no need of extra overload of DateTime64, since readDateTimeText64 has different signature and that case is explicitly handled in the calling code.
-template <>
-inline void parseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    time_t time = 0;
-    readDateTimeText(time, rb, *time_zone);
-    convertFromTime<DataTypeDateTime>(x, time);
-}
-
-template <>
-inline void parseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    UUID tmp;
-    readUUIDText(tmp, rb);
-    x = tmp.toUnderType();
-}
-
-template <>
-inline void parseImpl<DataTypeIPv4>(DataTypeIPv4::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    IPv4 tmp;
-    readIPv4Text(tmp, rb);
-    x = tmp.toUnderType();
-}
-
-template <>
-inline void parseImpl<DataTypeIPv6>(DataTypeIPv6::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    IPv6 tmp;
-    readIPv6Text(tmp, rb);
-    x = tmp;
-}
-
-template <typename DataType>
-bool tryParseImpl(typename DataType::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool precise_float_parsing)
-{
-    if constexpr (std::is_floating_point_v<typename DataType::FieldType>)
-    {
-        if (precise_float_parsing)
-            return tryReadFloatTextPrecise(x, rb);
-        else
-            return tryReadFloatTextFast(x, rb);
-    }
-    else /*if constexpr (is_integer_v<typename DataType::FieldType>)*/
-        return tryReadIntText(x, rb);
-}
-
-template <>
-inline bool tryParseImpl<DataTypeDate>(DataTypeDate::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    DayNum tmp(0);
-    if (!tryReadDateText(tmp, rb, *time_zone))
-        return false;
-    x = tmp;
-    return true;
-}
-
-template <>
-inline bool tryParseImpl<DataTypeDate32>(DataTypeDate32::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    ExtendedDayNum tmp(0);
-    if (!tryReadDateText(tmp, rb, *time_zone))
-        return false;
-    x = tmp;
-    return true;
-}
-
-template <>
-inline bool tryParseImpl<DataTypeDateTime>(DataTypeDateTime::FieldType & x, ReadBuffer & rb, const DateLUTImpl * time_zone, bool)
-{
-    time_t time = 0;
-    if (!tryReadDateTimeText(time, rb, *time_zone))
-        return false;
-    convertFromTime<DataTypeDateTime>(x, time);
-    return true;
-}
-
-template <>
-inline bool tryParseImpl<DataTypeUUID>(DataTypeUUID::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    UUID tmp;
-    if (!tryReadUUIDText(tmp, rb))
-        return false;
-
-    x = tmp.toUnderType();
-    return true;
-}
-
-template <>
-inline bool tryParseImpl<DataTypeIPv4>(DataTypeIPv4::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    IPv4 tmp;
-    if (!tryReadIPv4Text(tmp, rb))
-        return false;
-
-    x = tmp.toUnderType();
-    return true;
-}
-
-template <>
-inline bool tryParseImpl<DataTypeIPv6>(DataTypeIPv6::FieldType & x, ReadBuffer & rb, const DateLUTImpl *, bool)
-{
-    IPv6 tmp;
-    if (!tryReadIPv6Text(tmp, rb))
-        return false;
-
-    x = tmp;
-    return true;
-}
-
-
-/** Throw exception with verbose message when string value is not parsed completely.
-  */
-[[noreturn]] inline void throwExceptionForIncompletelyParsedValue(ReadBuffer & read_buffer, const IDataType & result_type)
-{
-    WriteBufferFromOwnString message_buf;
-    message_buf << "Cannot parse string " << quote << String(read_buffer.buffer().begin(), read_buffer.buffer().size())
-                << " as " << result_type.getName()
-                << ": syntax error";
-
-    if (read_buffer.offset())
-        message_buf << " at position " << read_buffer.offset()
-                    << " (parsed just " << quote << String(read_buffer.buffer().begin(), read_buffer.offset()) << ")";
-    else
-        message_buf << " at begin of string";
-
-    // Currently there are no functions toIPv{4,6}Or{Null,Zero}
-    if (isNativeNumber(result_type) && !(result_type.getName() == "IPv4" || result_type.getName() == "IPv6"))
-        message_buf << ". Note: there are to" << result_type.getName() << "OrZero and to" << result_type.getName() << "OrNull functions, which returns zero/NULL instead of throwing exception.";
-
-    throw Exception(PreformattedMessage{message_buf.str(), "Cannot parse string {} as {}: syntax error {}"}, ErrorCodes::CANNOT_PARSE_TEXT);
-}
-
-
-enum class ConvertFromStringExceptionMode
-{
-    Throw,  /// Throw exception if value cannot be parsed.
-    Zero,   /// Fill with zero or default if value cannot be parsed.
-    Null    /// Return ColumnNullable with NULLs when value cannot be parsed.
-};
-
-enum class ConvertFromStringParsingMode
-{
-    Normal,
-    BestEffort,  /// Only applicable for DateTime. Will use sophisticated method, that is slower.
-    BestEffortUS
-};
-
-template <typename FromDataType, typename ToDataType, typename Name,
-    ConvertFromStringExceptionMode exception_mode, ConvertFromStringParsingMode parsing_mode>
-struct ConvertThroughParsing
-{
-    static_assert(std::is_same_v<FromDataType, DataTypeString> || std::is_same_v<FromDataType, DataTypeFixedString>,
-        "ConvertThroughParsing is only applicable for String or FixedString data types");
-
-    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
-
-    static bool isAllRead(ReadBuffer & in)
-    {
-        /// In case of FixedString, skip zero bytes at end.
-        if constexpr (std::is_same_v<FromDataType, DataTypeFixedString>)
-            while (!in.eof() && *in.position() == 0)
-                ++in.position();
-
-        if (in.eof())
-            return true;
-
-        /// Special case, that allows to parse string with DateTime or DateTime64 as Date or Date32.
-        if constexpr (std::is_same_v<ToDataType, DataTypeDate> || std::is_same_v<ToDataType, DataTypeDate32>)
-        {
-            if (!in.eof() && (*in.position() == ' ' || *in.position() == 'T'))
-            {
-                if (in.buffer().size() == strlen("YYYY-MM-DD hh:mm:ss"))
-                    return true;
-
-                if (in.buffer().size() >= strlen("YYYY-MM-DD hh:mm:ss.x")
-                    && in.buffer().begin()[19] == '.')
-                {
-                    in.position() = in.buffer().begin() + 20;
-
-                    while (!in.eof() && isNumericASCII(*in.position()))
-                        ++in.position();
-
-                    if (in.eof())
-                        return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    template <typename Additions = void *>
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, size_t input_rows_count,
-                        Additions additions [[maybe_unused]] = Additions())
-    {
-        using ColVecTo = typename ToDataType::ColumnType;
-
-        const DateLUTImpl * local_time_zone [[maybe_unused]] = nullptr;
-        const DateLUTImpl * utc_time_zone [[maybe_unused]] = nullptr;
-
-        /// For conversion to Date or DateTime type, second argument with time zone could be specified.
-        if constexpr (std::is_same_v<ToDataType, DataTypeDateTime> || to_datetime64)
-        {
-            const auto result_type = removeNullable(res_type);
-            // Time zone is already figured out during result type resolution, no need to do it here.
-            if (const auto dt_col = checkAndGetDataType<ToDataType>(result_type.get()))
-                local_time_zone = &dt_col->getTimeZone();
-            else
-                local_time_zone = &extractTimeZoneFromFunctionArguments(arguments, 1, 0);
-
-            if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort || parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
-                utc_time_zone = &DateLUT::instance("UTC");
-        }
-        else if constexpr (std::is_same_v<ToDataType, DataTypeDate> || std::is_same_v<ToDataType, DataTypeDate32>)
-        {
-            // Timezone is more or less dummy when parsing Date/Date32 from string.
-            local_time_zone = &DateLUT::instance();
-            utc_time_zone = &DateLUT::instance("UTC");
-        }
-
-        const IColumn * col_from = arguments[0].column.get();
-        const ColumnString * col_from_string = checkAndGetColumn<ColumnString>(col_from);
-        const ColumnFixedString * col_from_fixed_string = checkAndGetColumn<ColumnFixedString>(col_from);
-
-        if (std::is_same_v<FromDataType, DataTypeString> && !col_from_string)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                col_from->getName(), Name::name);
-
-        if (std::is_same_v<FromDataType, DataTypeFixedString> && !col_from_fixed_string)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                col_from->getName(), Name::name);
-
-        size_t size = input_rows_count;
-        typename ColVecTo::MutablePtr col_to = nullptr;
-
-        if constexpr (IsDataTypeDecimal<ToDataType>)
-        {
-            UInt32 scale = additions;
-            if constexpr (to_datetime64)
-            {
-                ToDataType check_bounds_in_ctor(scale, local_time_zone ? local_time_zone->getTimeZone() : String{});
-            }
-            else
-            {
-                ToDataType check_bounds_in_ctor(ToDataType::maxPrecision(), scale);
-            }
-            col_to = ColVecTo::create(size, scale);
-        }
-        else
-            col_to = ColVecTo::create(size);
-
-        typename ColVecTo::Container & vec_to = col_to->getData();
-
-        ColumnUInt8::MutablePtr col_null_map_to;
-        ColumnUInt8::Container * vec_null_map_to [[maybe_unused]] = nullptr;
-        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
-        {
-            col_null_map_to = ColumnUInt8::create(size);
-            vec_null_map_to = &col_null_map_to->getData();
-        }
-
-        const ColumnString::Chars * chars = nullptr;
-        const IColumn::Offsets * offsets = nullptr;
-        size_t fixed_string_size = 0;
-
-        if constexpr (std::is_same_v<FromDataType, DataTypeString>)
-        {
-            chars = &col_from_string->getChars();
-            offsets = &col_from_string->getOffsets();
-        }
-        else
-        {
-            chars = &col_from_fixed_string->getChars();
-            fixed_string_size = col_from_fixed_string->getN();
-        }
-
-        size_t current_offset = 0;
-
-        bool precise_float_parsing = false;
-
-        if (DB::CurrentThread::isInitialized())
-        {
-            const DB::ContextPtr query_context = DB::CurrentThread::get().getQueryContext();
-
-            if (query_context)
-                precise_float_parsing = query_context->getSettingsRef().precise_float_parsing;
-        }
-
-        for (size_t i = 0; i < size; ++i)
-        {
-            size_t next_offset = std::is_same_v<FromDataType, DataTypeString> ? (*offsets)[i] : (current_offset + fixed_string_size);
-            size_t string_size = std::is_same_v<FromDataType, DataTypeString> ? next_offset - current_offset - 1 : fixed_string_size;
-
-            ReadBufferFromMemory read_buffer(&(*chars)[current_offset], string_size);
-
-            if constexpr (exception_mode == ConvertFromStringExceptionMode::Throw)
-            {
-                if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort)
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 res = 0;
-                        parseDateTime64BestEffort(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
-                        vec_to[i] = res;
-                    }
-                    else
-                    {
-                        time_t res;
-                        parseDateTimeBestEffort(res, read_buffer, *local_time_zone, *utc_time_zone);
-                        convertFromTime<ToDataType>(vec_to[i], res);
-                    }
-                }
-                else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 res = 0;
-                        parseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
-                        vec_to[i] = res;
-                    }
-                    else
-                    {
-                        time_t res;
-                        parseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
-                        convertFromTime<ToDataType>(vec_to[i], res);
-                    }
-                }
-                else
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 value = 0;
-                        readDateTime64Text(value, col_to->getScale(), read_buffer, *local_time_zone);
-                        vec_to[i] = value;
-                    }
-                    else if constexpr (IsDataTypeDecimal<ToDataType>)
-                    {
-                        SerializationDecimal<typename ToDataType::FieldType>::readText(
-                            vec_to[i], read_buffer, ToDataType::maxPrecision(), col_to->getScale());
-                    }
-                    else
-                    {
-                        /// we want to utilize constexpr condition here, which is not mixable with value comparison
-                        do
-                        {
-                            if constexpr (std::is_same_v<FromDataType, DataTypeFixedString> && std::is_same_v<ToDataType, DataTypeIPv6>)
-                            {
-                                if (fixed_string_size == IPV6_BINARY_LENGTH)
-                                {
-                                    readBinary(vec_to[i], read_buffer);
-                                    break;
-                                }
-                            }
-                            parseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone, precise_float_parsing);
-                        } while (false);
-                    }
-                }
-
-                if (!isAllRead(read_buffer))
-                    throwExceptionForIncompletelyParsedValue(read_buffer, *res_type);
-            }
-            else
-            {
-                bool parsed;
-
-                if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffort)
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 res = 0;
-                        parsed = tryParseDateTime64BestEffort(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
-                        vec_to[i] = res;
-                    }
-                    else
-                    {
-                        time_t res;
-                        parsed = tryParseDateTimeBestEffort(res, read_buffer, *local_time_zone, *utc_time_zone);
-                        convertFromTime<ToDataType>(vec_to[i],res);
-                    }
-                }
-                else if constexpr (parsing_mode == ConvertFromStringParsingMode::BestEffortUS)
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 res = 0;
-                        parsed = tryParseDateTime64BestEffortUS(res, col_to->getScale(), read_buffer, *local_time_zone, *utc_time_zone);
-                        vec_to[i] = res;
-                    }
-                    else
-                    {
-                        time_t res;
-                        parsed = tryParseDateTimeBestEffortUS(res, read_buffer, *local_time_zone, *utc_time_zone);
-                        convertFromTime<ToDataType>(vec_to[i],res);
-                    }
-                }
-                else
-                {
-                    if constexpr (to_datetime64)
-                    {
-                        DateTime64 value = 0;
-                        parsed = tryReadDateTime64Text(value, col_to->getScale(), read_buffer, *local_time_zone);
-                        vec_to[i] = value;
-                    }
-                    else if constexpr (IsDataTypeDecimal<ToDataType>)
-                    {
-                        parsed = SerializationDecimal<typename ToDataType::FieldType>::tryReadText(
-                            vec_to[i], read_buffer, ToDataType::maxPrecision(), col_to->getScale());
-                    }
-                    else
-                    {
-                        /// we want to utilize constexpr condition here, which is not mixable with value comparison
-                        do
-                        {
-                            if constexpr (std::is_same_v<FromDataType, DataTypeFixedString> && std::is_same_v<ToDataType, DataTypeIPv6>)
-                            {
-                                if (fixed_string_size == IPV6_BINARY_LENGTH)
-                                {
-                                    readBinary(vec_to[i], read_buffer);
-                                    parsed = true;
-                                    break;
-                                }
-                            }
-
-                            parsed = tryParseImpl<ToDataType>(vec_to[i], read_buffer, local_time_zone, precise_float_parsing);
-                        } while (false);
-                    }
-                }
-
-                if (!isAllRead(read_buffer))
-                    parsed = false;
-
-                if (!parsed)
-                {
-                    if constexpr (std::is_same_v<ToDataType, DataTypeDate32>)
-                    {
-                        vec_to[i] = -static_cast<Int32>(DateLUT::instance().getDayNumOffsetEpoch());
-                    }
-                    else
-                    {
-                        vec_to[i] = static_cast<typename ToDataType::FieldType>(0);
-                    }
-                }
-
-                if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
-                    (*vec_null_map_to)[i] = !parsed;
-            }
-
-            current_offset = next_offset;
-        }
-
-        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
-            return ColumnNullable::create(std::move(col_to), std::move(col_null_map_to));
-        else
-            return col_to;
-    }
-};
-
-
-template <typename ToDataType, typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-requires (!std::is_same_v<ToDataType, DataTypeString>)
-struct ConvertImpl<DataTypeString, ToDataType, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : ConvertThroughParsing<DataTypeString, ToDataType, Name, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::Normal> {};
-
-template <typename ToDataType, typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-requires (!std::is_same_v<ToDataType, DataTypeFixedString>)
-struct ConvertImpl<DataTypeFixedString, ToDataType, Name, ConvertDefaultBehaviorTag, date_time_overflow_behavior>
-    : ConvertThroughParsing<DataTypeFixedString, ToDataType, Name, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::Normal> {};
-
-template <typename ToDataType, typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-requires (!std::is_same_v<ToDataType, DataTypeString>)
-struct ConvertImpl<DataTypeString, ToDataType, Name, ConvertReturnNullOnErrorTag, date_time_overflow_behavior>
-    : ConvertThroughParsing<DataTypeString, ToDataType, Name, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::Normal> {};
-
-template <typename ToDataType, typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-requires (!std::is_same_v<ToDataType, DataTypeFixedString>)
-struct ConvertImpl<DataTypeFixedString, ToDataType, Name, ConvertReturnNullOnErrorTag, date_time_overflow_behavior>
-    : ConvertThroughParsing<DataTypeFixedString, ToDataType, Name, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::Normal> {};
-
-template <typename FromDataType, typename ToDataType, typename Name, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-requires (is_any_of<FromDataType, DataTypeString, DataTypeFixedString> && is_any_of<ToDataType, DataTypeIPv4, DataTypeIPv6>)
-struct ConvertImpl<FromDataType, ToDataType, Name, ConvertReturnZeroOnErrorTag, date_time_overflow_behavior>
-    : ConvertThroughParsing<FromDataType, ToDataType, Name, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::Normal> {};
-
-/// Generic conversion of any type from String. Used for complex types: Array and Tuple or types with custom serialization.
-template <typename StringColumnType>
-struct ConvertImplGenericFromString
-{
-    static ColumnPtr execute(ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t input_rows_count)
-    {
-        static_assert(std::is_same_v<StringColumnType, ColumnString> || std::is_same_v<StringColumnType, ColumnFixedString>,
-                "Can be used only to parse from ColumnString or ColumnFixedString");
-
-        const IColumn & column_from = *arguments[0].column;
-        const IDataType & data_type_to = *result_type;
-        auto res = data_type_to.createColumn();
-        auto serialization = data_type_to.getDefaultSerialization();
-        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
-
-        executeImpl(column_from, *res, *serialization, input_rows_count, null_map, result_type.get());
-        return res;
-    }
-
-    static void executeImpl(
-        const IColumn & column_from,
-        IColumn & column_to,
-        const ISerialization & serialization_from,
-        size_t input_rows_count,
-        const PaddedPODArray<UInt8> * null_map = nullptr,
-        const IDataType * result_type = nullptr)
-    {
-        static_assert(std::is_same_v<StringColumnType, ColumnString> || std::is_same_v<StringColumnType, ColumnFixedString>,
-                "Can be used only to parse from ColumnString or ColumnFixedString");
-
-        if (const StringColumnType * col_from_string = checkAndGetColumn<StringColumnType>(&column_from))
-        {
-            column_to.reserve(input_rows_count);
-
-            FormatSettings format_settings;
-            for (size_t i = 0; i < input_rows_count; ++i)
-            {
-                if (null_map && (*null_map)[i])
-                {
-                    column_to.insertDefault();
-                    continue;
-                }
-
-                const auto & val = col_from_string->getDataAt(i);
-                ReadBufferFromMemory read_buffer(val.data, val.size);
-                try
-                {
-                    serialization_from.deserializeWholeText(column_to, read_buffer, format_settings);
-                }
-                catch (const Exception & e)
-                {
-                    auto * nullable_column = typeid_cast<ColumnNullable *>(&column_to);
-                    if (e.code() == ErrorCodes::CANNOT_PARSE_BOOL && nullable_column)
-                    {
-                        auto & col_nullmap = nullable_column->getNullMapData();
-                        if (col_nullmap.size() != nullable_column->size())
-                            col_nullmap.resize_fill(nullable_column->size());
-                        if (nullable_column->size() == (i + 1))
-                            nullable_column->popBack(1);
-                        nullable_column->insertDefault();
-                        continue;
-                    }
-                    throw;
-                }
-
-                if (!read_buffer.eof())
-                {
-                    if (result_type)
-                        throwExceptionForIncompletelyParsedValue(read_buffer, *result_type);
-                    else
-                        throw Exception(ErrorCodes::CANNOT_PARSE_TEXT,
-                            "Cannot parse string to column {}. Expected eof", column_to.getName());
-                }
-            }
-        }
-        else
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                "Illegal column {} of first argument of conversion function from string",
-                column_from.getName());
-    }
-
-};
-
-
-template <>
-struct ConvertImpl<DataTypeString, DataTypeUInt32, NameToUnixTimestamp, ConvertDefaultBehaviorTag>
-    : ConvertImpl<DataTypeString, DataTypeDateTime, NameToUnixTimestamp, ConvertDefaultBehaviorTag> {};
-
-template <>
-struct ConvertImpl<DataTypeString, DataTypeUInt32, NameToUnixTimestamp, ConvertReturnNullOnErrorTag>
-    : ConvertImpl<DataTypeString, DataTypeDateTime, NameToUnixTimestamp, ConvertReturnNullOnErrorTag> {};
-
-/** If types are identical, just take reference to column.
-  */
-template <typename T, typename Name>
-requires (!T::is_parametric)
-struct ConvertImpl<T, T, Name, ConvertDefaultBehaviorTag>
-{
-    template <typename Additions = void *>
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/,
-        Additions additions [[maybe_unused]] = Additions())
-    {
-        return arguments[0].column;
-    }
-};
-
-template <typename Name>
-struct ConvertImpl<DataTypeUInt8, DataTypeUInt8, Name, ConvertDefaultBehaviorTag>
-{
-    template <typename Additions = void *>
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/,
-                             Additions additions [[maybe_unused]] = Additions())
-    {
-
-        return arguments[0].column;
-    }
-};
-
-
-/** Conversion from FixedString to String.
-  * Cutting sequences of zero bytes from end of strings.
-  */
-template <typename Name>
-struct ConvertImpl<DataTypeFixedString, DataTypeString, Name, ConvertDefaultBehaviorTag>
-{
-    static ColumnPtr execute(const ColumnsWithTypeAndName & arguments, const DataTypePtr & return_type, size_t /*input_rows_count*/)
-    {
-        ColumnUInt8::MutablePtr null_map = copyNullMap(arguments[0].column);
-        const auto & nested =  columnGetNested(arguments[0]);
-        if (const ColumnFixedString * col_from = checkAndGetColumn<ColumnFixedString>(nested.column.get()))
-        {
-            auto col_to = ColumnString::create();
-
-            const ColumnFixedString::Chars & data_from = col_from->getChars();
-            ColumnString::Chars & data_to = col_to->getChars();
-            ColumnString::Offsets & offsets_to = col_to->getOffsets();
-            size_t size = col_from->size();
-            size_t n = col_from->getN();
-            data_to.resize(size * (n + 1)); /// + 1 - zero terminator
-            offsets_to.resize(size);
-
-            size_t offset_from = 0;
-            size_t offset_to = 0;
-            for (size_t i = 0; i < size; ++i)
-            {
-                if (!null_map || !null_map->getData()[i])
-                {
-                    size_t bytes_to_copy = n;
-                    while (bytes_to_copy > 0 && data_from[offset_from + bytes_to_copy - 1] == 0)
-                        --bytes_to_copy;
-
-                    memcpy(&data_to[offset_to], &data_from[offset_from], bytes_to_copy);
-                    offset_to += bytes_to_copy;
-                }
-                data_to[offset_to] = 0;
-                ++offset_to;
-                offsets_to[i] = offset_to;
-                offset_from += n;
-            }
-
-            data_to.resize(offset_to);
-            if (return_type->isNullable() && null_map)
-                return ColumnNullable::create(std::move(col_to), std::move(null_map));
-            return col_to;
-        }
-        else
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of first argument of function {}",
-                    arguments[0].column->getName(), Name::name);
-    }
-};
-
-
-/// Declared early because used below.
-struct NameToDate { static constexpr auto name = "toDate"; };
-struct NameToDate32 { static constexpr auto name = "toDate32"; };
-struct NameToDateTime { static constexpr auto name = "toDateTime"; };
-struct NameToDateTime32 { static constexpr auto name = "toDateTime32"; };
-struct NameToDateTime64 { static constexpr auto name = "toDateTime64"; };
-struct NameToString { static constexpr auto name = "toString"; };
-struct NameToDecimal32 { static constexpr auto name = "toDecimal32"; };
-struct NameToDecimal64 { static constexpr auto name = "toDecimal64"; };
-struct NameToDecimal128 { static constexpr auto name = "toDecimal128"; };
-struct NameToDecimal256 { static constexpr auto name = "toDecimal256"; };
-
-
-#define DEFINE_NAME_TO_INTERVAL(INTERVAL_KIND) \
-    struct NameToInterval ## INTERVAL_KIND \
-    { \
-        static constexpr auto name = "toInterval" #INTERVAL_KIND; \
-        static constexpr auto kind = IntervalKind::INTERVAL_KIND; \
-    };
-
-DEFINE_NAME_TO_INTERVAL(Nanosecond)
-DEFINE_NAME_TO_INTERVAL(Microsecond)
-DEFINE_NAME_TO_INTERVAL(Millisecond)
-DEFINE_NAME_TO_INTERVAL(Second)
-DEFINE_NAME_TO_INTERVAL(Minute)
-DEFINE_NAME_TO_INTERVAL(Hour)
-DEFINE_NAME_TO_INTERVAL(Day)
-DEFINE_NAME_TO_INTERVAL(Week)
-DEFINE_NAME_TO_INTERVAL(Month)
-DEFINE_NAME_TO_INTERVAL(Quarter)
-DEFINE_NAME_TO_INTERVAL(Year)
-
-#undef DEFINE_NAME_TO_INTERVAL
-
-struct NameParseDateTimeBestEffort;
-struct NameParseDateTimeBestEffortOrZero;
-struct NameParseDateTimeBestEffortOrNull;
-
-template<typename Name, typename ToDataType>
-static inline bool isDateTime64(const ColumnsWithTypeAndName & arguments)
-{
-    if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
-        return true;
-    else if constexpr (std::is_same_v<Name, NameToDateTime> || std::is_same_v<Name, NameParseDateTimeBestEffort>
-        || std::is_same_v<Name, NameParseDateTimeBestEffortOrZero> || std::is_same_v<Name, NameParseDateTimeBestEffortOrNull>)
-    {
-        return (arguments.size() == 2 && isUInt(arguments[1].type)) || arguments.size() == 3;
-    }
-
-    return false;
-}
-
-template <typename ToDataType, typename Name, typename MonotonicityImpl>
-class FunctionConvert : public IFunction
-{
-public:
-    using Monotonic = MonotonicityImpl;
-
-    static constexpr auto name = Name::name;
-    static constexpr bool to_decimal =
-        std::is_same_v<Name, NameToDecimal32> || std::is_same_v<Name, NameToDecimal64>
-         || std::is_same_v<Name, NameToDecimal128> || std::is_same_v<Name, NameToDecimal256>;
-
-    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
-
-    static constexpr bool to_string_or_fixed_string = std::is_same_v<ToDataType, DataTypeFixedString> ||
-                                                      std::is_same_v<ToDataType, DataTypeString>;
-
-    static constexpr bool to_date_or_datetime = std::is_same_v<ToDataType, DataTypeDate> ||
-                                                std::is_same_v<ToDataType, DataTypeDate32> ||
-                                                std::is_same_v<ToDataType, DataTypeDateTime>;
-
-    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionConvert>(context); }
-    static FunctionPtr create() { return std::make_shared<FunctionConvert>(); }
-
-    FunctionConvert() = default;
-    explicit FunctionConvert(ContextPtr context_) : context(context_) {}
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool isInjective(const ColumnsWithTypeAndName &) const override { return std::is_same_v<Name, NameToString>; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & arguments) const override
-    {
-        /// TODO: We can make more optimizations here.
-        return !(to_date_or_datetime && isNumber(*arguments[0].type));
-    }
-
-    using DefaultReturnTypeGetter = std::function<DataTypePtr(const ColumnsWithTypeAndName &)>;
-    static DataTypePtr getReturnTypeDefaultImplementationForNulls(const ColumnsWithTypeAndName & arguments, const DefaultReturnTypeGetter & getter)
-    {
-        NullPresence null_presence = getNullPresense(arguments);
-
-        if (null_presence.has_null_constant)
-        {
-            return makeNullable(std::make_shared<DataTypeNothing>());
-        }
-        if (null_presence.has_nullable)
-        {
-            auto nested_columns = Block(createBlockWithNestedColumns(arguments));
-            auto return_type = getter(ColumnsWithTypeAndName(nested_columns.begin(), nested_columns.end()));
-            return makeNullable(return_type);
-        }
-
-        return getter(arguments);
-    }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        auto getter = [&] (const auto & args) { return getReturnTypeImplRemovedNullable(args); };
-        auto res = getReturnTypeDefaultImplementationForNulls(arguments, getter);
-        to_nullable = res->isNullable();
-        checked_return_type = true;
-        return res;
-    }
-
-    DataTypePtr getReturnTypeImplRemovedNullable(const ColumnsWithTypeAndName & arguments) const
-    {
-        FunctionArgumentDescriptors mandatory_args = {{"Value", nullptr, nullptr, nullptr}};
-        FunctionArgumentDescriptors optional_args;
-
-        if constexpr (to_decimal)
-        {
-            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
-        }
-
-        if (!to_decimal && isDateTime64<Name, ToDataType>(arguments))
-        {
-            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
-        }
-
-        // toString(DateTime or DateTime64, [timezone: String])
-        if ((std::is_same_v<Name, NameToString> && !arguments.empty() && (isDateTime64(arguments[0].type) || isDateTime(arguments[0].type)))
-            // toUnixTimestamp(value[, timezone : String])
-            || std::is_same_v<Name, NameToUnixTimestamp>
-            // toDate(value[, timezone : String])
-            || std::is_same_v<ToDataType, DataTypeDate> // TODO: shall we allow timestamp argument for toDate? DateTime knows nothing about timezones and this argument is ignored below.
-            // toDate32(value[, timezone : String])
-            || std::is_same_v<ToDataType, DataTypeDate32>
-            // toDateTime(value[, timezone: String])
-            || std::is_same_v<ToDataType, DataTypeDateTime>
-            // toDateTime64(value, scale : Integer[, timezone: String])
-            || std::is_same_v<ToDataType, DataTypeDateTime64>)
-        {
-            optional_args.push_back({"timezone", &isString<IDataType>, nullptr, "String"});
-        }
-
-        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
-
-        if constexpr (std::is_same_v<ToDataType, DataTypeInterval>)
-        {
-            return std::make_shared<DataTypeInterval>(Name::kind);
-        }
-        else if constexpr (to_decimal)
-        {
-            UInt64 scale = extractToDecimalScale(arguments[1]);
-
-            if constexpr (std::is_same_v<Name, NameToDecimal32>)
-                return createDecimalMaxPrecision<Decimal32>(scale);
-            else if constexpr (std::is_same_v<Name, NameToDecimal64>)
-                return createDecimalMaxPrecision<Decimal64>(scale);
-            else if constexpr (std::is_same_v<Name, NameToDecimal128>)
-                return createDecimalMaxPrecision<Decimal128>(scale);
-            else if constexpr (std::is_same_v<Name, NameToDecimal256>)
-                return createDecimalMaxPrecision<Decimal256>(scale);
-
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected branch in code of conversion function: it is a bug.");
-        }
-        else
-        {
-            // Optional second argument with time zone for DateTime.
-            UInt8 timezone_arg_position = 1;
-            UInt32 scale [[maybe_unused]] = DataTypeDateTime64::default_scale;
-
-            // DateTime64 requires more arguments: scale and timezone. Since timezone is optional, scale should be first.
-            if (isDateTime64<Name, ToDataType>(arguments))
-            {
-                timezone_arg_position += 1;
-                scale = static_cast<UInt32>(arguments[1].column->get64(0));
-
-                if (to_datetime64 || scale != 0) /// toDateTime('xxxx-xx-xx xx:xx:xx', 0) return DateTime
-                    return std::make_shared<DataTypeDateTime64>(scale,
-                        extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
-
-                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
-            }
-
-            if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
-                return std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, timezone_arg_position, 0, false));
-            else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected branch in code of conversion function: it is a bug.");
-            else
-                return std::make_shared<ToDataType>();
-        }
-    }
-
-    /// Function actually uses default implementation for nulls,
-    /// but we need to know if return type is Nullable or not,
-    /// so we use checked_return_type only to intercept the first call to getReturnTypeImpl(...).
-    bool useDefaultImplementationForNulls() const override
-    {
-        bool to_nullable_string = to_nullable && std::is_same_v<ToDataType, DataTypeString>;
-        return checked_return_type && !to_nullable_string;
-    }
-
-    bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override
-    {
-        if constexpr (std::is_same_v<ToDataType, DataTypeString>)
-            return {};
-        else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
-            return {2};
-        return {1};
-    }
-    bool canBeExecutedOnDefaultArguments() const override { return false; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        try
-        {
-            return executeInternal(arguments, result_type, input_rows_count);
-        }
-        catch (Exception & e)
-        {
-            /// More convenient error message.
-            if (e.code() == ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF)
-            {
-                e.addMessage("Cannot parse "
-                    + result_type->getName() + " from "
-                    + arguments[0].type->getName()
-                    + ", because value is too short");
-            }
-            else if (e.code() == ErrorCodes::CANNOT_PARSE_NUMBER
-                || e.code() == ErrorCodes::CANNOT_READ_ARRAY_FROM_TEXT
-                || e.code() == ErrorCodes::CANNOT_PARSE_INPUT_ASSERTION_FAILED
-                || e.code() == ErrorCodes::CANNOT_PARSE_QUOTED_STRING
-                || e.code() == ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE
-                || e.code() == ErrorCodes::CANNOT_PARSE_DATE
-                || e.code() == ErrorCodes::CANNOT_PARSE_DATETIME
-                || e.code() == ErrorCodes::CANNOT_PARSE_UUID
-                || e.code() == ErrorCodes::CANNOT_PARSE_IPV4
-                || e.code() == ErrorCodes::CANNOT_PARSE_IPV6)
-            {
-                e.addMessage("Cannot parse "
-                    + result_type->getName() + " from "
-                    + arguments[0].type->getName());
-            }
-
-            throw;
-        }
-    }
-
-    bool hasInformationAboutMonotonicity() const override
-    {
-        return Monotonic::has();
-    }
-
-    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
-    {
-        return Monotonic::get(type, left, right);
-    }
-
-private:
-    ContextPtr context;
-    mutable bool checked_return_type = false;
-    mutable bool to_nullable = false;
-
-    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
-    {
-        if (arguments.empty())
-            throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects at least 1 argument", getName());
-
-        if (result_type->onlyNull())
-            return result_type->createColumnConstWithDefaultValue(input_rows_count);
-
-        const DataTypePtr from_type = removeNullable(arguments[0].type);
-        ColumnPtr result_column;
-
-        [[maybe_unused]] FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior;
-
-        if (context)
-            date_time_overflow_behavior = context->getSettingsRef().date_time_overflow_behavior.value;
-
-        auto call = [&](const auto & types, const auto & tag) -> bool
-        {
-            using Types = std::decay_t<decltype(types)>;
-            using LeftDataType = typename Types::LeftType;
-            using RightDataType = typename Types::RightType;
-            using SpecialTag = std::decay_t<decltype(tag)>;
-
-            if constexpr (IsDataTypeDecimal<RightDataType>)
-            {
-                if constexpr (std::is_same_v<RightDataType, DataTypeDateTime64>)
-                {
-                    /// Account for optional timezone argument.
-                    if (arguments.size() != 2 && arguments.size() != 3)
-                        throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects 2 or 3 arguments for DataTypeDateTime64.", getName());
-                }
-                else if (arguments.size() != 2)
-                {
-                    throw Exception(ErrorCodes::TOO_FEW_ARGUMENTS_FOR_FUNCTION, "Function {} expects 2 arguments for Decimal.", getName());
-                }
-
-                const ColumnWithTypeAndName & scale_column = arguments[1];
-                UInt32 scale = extractToDecimalScale(scale_column);
-
-                switch (date_time_overflow_behavior)
-                {
-                    case FormatSettings::DateTimeOverflowBehavior::Throw:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Throw>::execute(arguments, result_type, input_rows_count, scale);
-                        break;
-                    case FormatSettings::DateTimeOverflowBehavior::Ignore:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Ignore>::execute(arguments, result_type, input_rows_count, scale);
-                        break;
-                    case FormatSettings::DateTimeOverflowBehavior::Saturate:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Saturate>::execute(arguments, result_type, input_rows_count, scale);
-                        break;
-                }
-
-            }
-            else if constexpr (IsDataTypeDateOrDateTime<RightDataType> && std::is_same_v<LeftDataType, DataTypeDateTime64>)
-            {
-                const auto * dt64 = assert_cast<const DataTypeDateTime64 *>(arguments[0].type.get());
-                switch (date_time_overflow_behavior)
-                {
-                    case FormatSettings::DateTimeOverflowBehavior::Throw:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Throw>::execute(arguments, result_type, input_rows_count, dt64->getScale());
-                        break;
-                    case FormatSettings::DateTimeOverflowBehavior::Ignore:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Ignore>::execute(arguments, result_type, input_rows_count, dt64->getScale());
-                        break;
-                    case FormatSettings::DateTimeOverflowBehavior::Saturate:
-                        result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::Saturate>::execute(arguments, result_type, input_rows_count, dt64->getScale());
-                        break;
-                }
-            }
-#define GENERATE_OVERFLOW_MODE_CASE(OVERFLOW_MODE) \
-            case FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE: \
-                result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag, FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE>::execute( \
-                arguments, result_type, input_rows_count); \
-                break;
-
-            else if constexpr (IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType>)
-            {
-                using LeftT = typename LeftDataType::FieldType;
-                using RightT = typename RightDataType::FieldType;
-
-                static constexpr bool bad_left =
-                    is_decimal<LeftT> || std::is_floating_point_v<LeftT> || is_big_int_v<LeftT> || is_signed_v<LeftT>;
-                static constexpr bool bad_right =
-                    is_decimal<RightT> || std::is_floating_point_v<RightT> || is_big_int_v<RightT> || is_signed_v<RightT>;
-
-                /// Disallow int vs UUID conversion (but support int vs UInt128 conversion)
-                if constexpr ((bad_left && std::is_same_v<RightDataType, DataTypeUUID>) ||
-                              (bad_right && std::is_same_v<LeftDataType, DataTypeUUID>))
-                {
-                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Wrong UUID conversion");
-                }
-                else
-                {
-                    switch (date_time_overflow_behavior)
-                    {
-                        GENERATE_OVERFLOW_MODE_CASE(Throw)
-                        GENERATE_OVERFLOW_MODE_CASE(Ignore)
-                        GENERATE_OVERFLOW_MODE_CASE(Saturate)
-                    }
-                }
-            }
-            else if constexpr ((IsDataTypeNumber<LeftDataType> || IsDataTypeDateOrDateTime<LeftDataType>)
-                               && IsDataTypeDateOrDateTime<RightDataType>)
-            {
-                switch (date_time_overflow_behavior)
-                {
-                    GENERATE_OVERFLOW_MODE_CASE(Throw)
-                    GENERATE_OVERFLOW_MODE_CASE(Ignore)
-                    GENERATE_OVERFLOW_MODE_CASE(Saturate)
-                }
-            }
-#undef GENERATE_OVERFLOW_MODE_CASE
-            else
-                  result_column = ConvertImpl<LeftDataType, RightDataType, Name, SpecialTag>::execute(arguments, result_type, input_rows_count);
-
-            return true;
-        };
-
-        if (isDateTime64<Name, ToDataType>(arguments))
-        {
-            /// For toDateTime('xxxx-xx-xx xx:xx:xx.00', 2[, 'timezone']) we need to it convert to DateTime64
-            const ColumnWithTypeAndName & scale_column = arguments[1];
-            UInt32 scale = extractToDecimalScale(scale_column);
-
-            if (to_datetime64 || scale != 0) /// When scale = 0, the data type is DateTime otherwise the data type is DateTime64
-            {
-                if (!callOnIndexAndDataType<DataTypeDateTime64>(from_type->getTypeId(), call, ConvertDefaultBehaviorTag{}))
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
-                                    arguments[0].type->getName(), getName());
-
-                return result_column;
-            }
-        }
-
-        if constexpr (std::is_same_v<ToDataType, DataTypeString>)
-        {
-            if (from_type->getCustomSerialization())
-                return ConvertImplGenericToString<ColumnString>::execute(arguments, result_type, input_rows_count);
-        }
-
-        bool done = false;
-        if constexpr (to_string_or_fixed_string)
-        {
-            done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, ConvertDefaultBehaviorTag{});
-        }
-        else
-        {
-            bool cast_ipv4_ipv6_default_on_conversion_error = false;
-            if constexpr (is_any_of<ToDataType, DataTypeIPv4, DataTypeIPv6>)
-                if (context && (cast_ipv4_ipv6_default_on_conversion_error = context->getSettingsRef().cast_ipv4_ipv6_default_on_conversion_error))
-                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, ConvertReturnZeroOnErrorTag{});
-
-            if (!cast_ipv4_ipv6_default_on_conversion_error)
-            {
-                /// We should use ConvertFromStringExceptionMode::Null mode when converting from String (or FixedString)
-                /// to Nullable type, to avoid 'value is too short' error on attempt to parse empty string from NULL values.
-                if (to_nullable && WhichDataType(from_type).isStringOrFixedString())
-                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, ConvertReturnNullOnErrorTag{});
-                else
-                    done = callOnIndexAndDataType<ToDataType>(from_type->getTypeId(), call, ConvertDefaultBehaviorTag{});
-            }
-        }
-
-        if (!done)
-        {
-            /// Generic conversion of any type to String.
-            if (std::is_same_v<ToDataType, DataTypeString>)
-            {
-                return ConvertImplGenericToString<ColumnString>::execute(arguments, result_type, input_rows_count);
-            }
-            else
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}",
-                    arguments[0].type->getName(), getName());
-        }
-
-        return result_column;
-    }
-};
-
-
-/** Function toTOrZero (where T is number of date or datetime type):
-  *  try to convert from String to type T through parsing,
-  *  if cannot parse, return default value instead of throwing exception.
-  * Function toTOrNull will return Nullable type with NULL when cannot parse.
-  * NOTE Also need to implement tryToUnixTimestamp with timezone.
-  */
-template <typename ToDataType, typename Name,
-    ConvertFromStringExceptionMode exception_mode,
-    ConvertFromStringParsingMode parsing_mode = ConvertFromStringParsingMode::Normal>
-class FunctionConvertFromString : public IFunction
-{
-public:
-    static constexpr auto name = Name::name;
-    static constexpr bool to_decimal =
-        std::is_same_v<ToDataType, DataTypeDecimal<Decimal32>> ||
-        std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>> ||
-        std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>> ||
-        std::is_same_v<ToDataType, DataTypeDecimal<Decimal256>>;
-
-    static constexpr bool to_datetime64 = std::is_same_v<ToDataType, DataTypeDateTime64>;
-
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionConvertFromString>(); }
-    static FunctionPtr create() { return std::make_shared<FunctionConvertFromString>(); }
-
-    String getName() const override
-    {
-        return name;
-    }
-
-    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; }
-    bool canBeExecutedOnDefaultArguments() const override { return false; }
-
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
-    {
-        DataTypePtr res;
-
-        if (isDateTime64<Name, ToDataType>(arguments))
-        {
-            validateFunctionArgumentTypes(*this, arguments,
-                FunctionArgumentDescriptors{{"string", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"}},
-                // optional
-                FunctionArgumentDescriptors{
-                    {"precision", &isUInt8<IDataType>, isColumnConst, "const UInt8"},
-                    {"timezone", &isStringOrFixedString<IDataType>, isColumnConst, "const String or FixedString"},
-                });
-
-            UInt64 scale = to_datetime64 ? DataTypeDateTime64::default_scale : 0;
-            if (arguments.size() > 1)
-                scale = extractToDecimalScale(arguments[1]);
-            const auto timezone = extractTimeZoneNameFromFunctionArguments(arguments, 2, 0, false);
-
-            res = scale == 0 ? res = std::make_shared<DataTypeDateTime>(timezone) : std::make_shared<DataTypeDateTime64>(scale, timezone);
-        }
-        else
-        {
-            if ((arguments.size() != 1 && arguments.size() != 2) || (to_decimal && arguments.size() != 2))
-                throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                    "Number of arguments for function {} doesn't match: passed {}, should be 1 or 2. "
-                    "Second argument only make sense for DateTime (time zone, optional) and Decimal (scale).",
-                    getName(), arguments.size());
-
-            if (!isStringOrFixedString(arguments[0].type))
-            {
-                if (this->getName().find("OrZero") != std::string::npos ||
-                    this->getName().find("OrNull") != std::string::npos)
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}. "
-                            "Conversion functions with postfix 'OrZero' or 'OrNull' should take String argument",
-                            arguments[0].type->getName(), getName());
-                else
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument of function {}",
-                            arguments[0].type->getName(), getName());
-            }
-
-            if (arguments.size() == 2)
-            {
-                if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
-                {
-                    if (!isString(arguments[1].type))
-                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}",
-                            arguments[1].type->getName(), getName());
-                }
-                else if constexpr (to_decimal)
-                {
-                    if (!isInteger(arguments[1].type))
-                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of 2nd argument of function {}",
-                            arguments[1].type->getName(), getName());
-                    if (!arguments[1].column)
-                        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Second argument for function {} must be constant", getName());
-                }
-                else
-                {
-                    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Number of arguments for function {} doesn't match: passed {}, should be 1. "
-                        "Second argument makes sense only for DateTime and Decimal.",
-                        getName(), arguments.size());
-                }
-            }
-
-            if constexpr (std::is_same_v<ToDataType, DataTypeDateTime>)
-                res = std::make_shared<DataTypeDateTime>(extractTimeZoneNameFromFunctionArguments(arguments, 1, 0, false));
-            else if constexpr (std::is_same_v<ToDataType, DataTypeDateTime64>)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: It is a bug.");
-            else if constexpr (to_decimal)
-            {
-                UInt64 scale = extractToDecimalScale(arguments[1]);
-                res = createDecimalMaxPrecision<typename ToDataType::FieldType>(scale);
-                if (!res)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Something wrong with toDecimalNNOrZero() or toDecimalNNOrNull()");
-            }
-            else
-                res = std::make_shared<ToDataType>();
-        }
-
-        if constexpr (exception_mode == ConvertFromStringExceptionMode::Null)
-            res = std::make_shared<DataTypeNullable>(res);
-
-        return res;
-    }
-
-    template <typename ConvertToDataType>
-    ColumnPtr executeInternal(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count, UInt32 scale = 0) const
-    {
-        const IDataType * from_type = arguments[0].type.get();
-
-        if (checkAndGetDataType<DataTypeString>(from_type))
-        {
-            return ConvertThroughParsing<DataTypeString, ConvertToDataType, Name, exception_mode, parsing_mode>::execute(
-                arguments, result_type, input_rows_count, scale);
-        }
-        else if (checkAndGetDataType<DataTypeFixedString>(from_type))
-        {
-            return ConvertThroughParsing<DataTypeFixedString, ConvertToDataType, Name, exception_mode, parsing_mode>::execute(
-                arguments, result_type, input_rows_count, scale);
-        }
-
-        return nullptr;
-    }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        ColumnPtr result_column;
-
-        if constexpr (to_decimal)
-            result_column = executeInternal<ToDataType>(arguments, result_type, input_rows_count,
-                assert_cast<const ToDataType &>(*removeNullable(result_type)).getScale());
-        else
-        {
-            if (isDateTime64<Name, ToDataType>(arguments))
-            {
-                UInt64 scale = to_datetime64 ? DataTypeDateTime64::default_scale : 0;
-                if (arguments.size() > 1)
-                    scale = extractToDecimalScale(arguments[1]);
-
-                if (scale == 0)
-                    result_column = executeInternal<DataTypeDateTime>(arguments, result_type, input_rows_count);
-                else
-                {
-                    result_column = executeInternal<DataTypeDateTime64>(arguments, result_type, input_rows_count, static_cast<UInt32>(scale));
-                }
-            }
-            else
-            {
-                result_column = executeInternal<ToDataType>(arguments, result_type, input_rows_count);
-            }
-        }
-
-        if (!result_column)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
-                "Only String or FixedString argument is accepted for try-conversion function. For other arguments, "
-                "use function without 'orZero' or 'orNull'.", arguments[0].type->getName(), getName());
-
-        return result_column;
-    }
-};
-
-
-/// Monotonicity.
-
-struct PositiveMonotonicity
-{
-    static bool has() { return true; }
-    static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
-    {
-        return { .is_monotonic = true };
-    }
-};
-
-struct UnknownMonotonicity
-{
-    static bool has() { return false; }
-    static IFunction::Monotonicity get(const IDataType &, const Field &, const Field &)
-    {
-        return { };
-    }
-};
-
-template <typename T>
-struct ToNumberMonotonicity
-{
-    static bool has() { return true; }
-
-    static UInt64 divideByRangeOfType(UInt64 x)
-    {
-        if constexpr (sizeof(T) < sizeof(UInt64))
-            return x >> (sizeof(T) * 8);
-        else
-            return 0;
-    }
-
-    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
-    {
-        if (!type.isValueRepresentedByNumber())
-            return {};
-
-        /// If type is same, the conversion is always monotonic.
-        /// (Enum has separate case, because it is different data type)
-        if (checkAndGetDataType<DataTypeNumber<T>>(&type) ||
-            checkAndGetDataType<DataTypeEnum<T>>(&type))
-            return { .is_monotonic = true, .is_always_monotonic = true };
-
-        /// Float cases.
-
-        /// When converting to Float, the conversion is always monotonic.
-        if constexpr (std::is_floating_point_v<T>)
-            return { .is_monotonic = true, .is_always_monotonic = true };
-
-        const auto * low_cardinality = typeid_cast<const DataTypeLowCardinality *>(&type);
-        const IDataType * low_cardinality_dictionary_type = nullptr;
-        if (low_cardinality)
-            low_cardinality_dictionary_type = low_cardinality->getDictionaryType().get();
-
-        WhichDataType which_type(type);
-        WhichDataType which_inner_type = low_cardinality
-            ? WhichDataType(low_cardinality_dictionary_type)
-            : WhichDataType(type);
-
-        /// If converting from Float, for monotonicity, arguments must fit in range of result type.
-        if (which_inner_type.isFloat())
-        {
-            if (left.isNull() || right.isNull())
-                return {};
-
-            Float64 left_float = left.get<Float64>();
-            Float64 right_float = right.get<Float64>();
-
-            if (left_float >= static_cast<Float64>(std::numeric_limits<T>::min())
-                && left_float <= static_cast<Float64>(std::numeric_limits<T>::max())
-                && right_float >= static_cast<Float64>(std::numeric_limits<T>::min())
-                && right_float <= static_cast<Float64>(std::numeric_limits<T>::max()))
-                return { .is_monotonic = true };
-
-            return {};
-        }
-
-        /// Integer cases.
-
-        /// Only support types represented by native integers.
-        /// It can be extended to big integers, decimals and DateTime64 later.
-        /// By the way, NULLs are representing unbounded ranges.
-        if (!((left.isNull() || left.getType() == Field::Types::UInt64 || left.getType() == Field::Types::Int64)
-            && (right.isNull() || right.getType() == Field::Types::UInt64 || right.getType() == Field::Types::Int64)))
-            return {};
-
-        const bool from_is_unsigned = type.isValueRepresentedByUnsignedInteger();
-        const bool to_is_unsigned = is_unsigned_v<T>;
-
-        const size_t size_of_from = type.getSizeOfValueInMemory();
-        const size_t size_of_to = sizeof(T);
-
-        const bool left_in_first_half = left.isNull()
-            ? from_is_unsigned
-            : (left.get<Int64>() >= 0);
-
-        const bool right_in_first_half = right.isNull()
-            ? !from_is_unsigned
-            : (right.get<Int64>() >= 0);
-
-        /// Size of type is the same.
-        if (size_of_from == size_of_to)
-        {
-            if (from_is_unsigned == to_is_unsigned)
-                return { .is_monotonic = true, .is_always_monotonic = true };
-
-            if (left_in_first_half == right_in_first_half)
-                return { .is_monotonic = true };
-
-            return {};
-        }
-
-        /// Size of type is expanded.
-        if (size_of_from < size_of_to)
-        {
-            if (from_is_unsigned == to_is_unsigned)
-                return { .is_monotonic = true, .is_always_monotonic = true };
-
-            if (!to_is_unsigned)
-                return { .is_monotonic = true, .is_always_monotonic = true };
-
-            /// signed -> unsigned. If arguments from the same half, then function is monotonic.
-            if (left_in_first_half == right_in_first_half)
-                return { .is_monotonic = true };
-
-            return {};
-        }
-
-        /// Size of type is shrunk.
-        if (size_of_from > size_of_to)
-        {
-            /// Function cannot be monotonic on unbounded ranges.
-            if (left.isNull() || right.isNull())
-                return {};
-
-            /// Function cannot be monotonic when left and right are not on the same ranges.
-            if (divideByRangeOfType(left.get<UInt64>()) != divideByRangeOfType(right.get<UInt64>()))
-                return {};
-
-            if (to_is_unsigned)
-                return { .is_monotonic = true };
-            else
-            {
-                // If To is signed, it's possible that the signedness is different after conversion. So we check it explicitly.
-                const bool is_monotonic = (T(left.get<UInt64>()) >= 0) == (T(right.get<UInt64>()) >= 0);
-
-                return { .is_monotonic = is_monotonic };
-            }
-        }
-
-        UNREACHABLE();
-    }
-};
-
-struct ToDateMonotonicity
-{
-    static bool has() { return true; }
-
-    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
-    {
-        auto which = WhichDataType(type);
-        if (which.isDateOrDate32() || which.isDateTime() || which.isDateTime64() || which.isInt8() || which.isInt16() || which.isUInt8()
-            || which.isUInt16())
-        {
-            return {.is_monotonic = true, .is_always_monotonic = true};
-        }
-        else if (
-            ((left.getType() == Field::Types::UInt64 || left.isNull()) && (right.getType() == Field::Types::UInt64 || right.isNull())
-             && ((left.isNull() || left.get<UInt64>() < 0xFFFF) && (right.isNull() || right.get<UInt64>() >= 0xFFFF)))
-            || ((left.getType() == Field::Types::Int64 || left.isNull()) && (right.getType() == Field::Types::Int64 || right.isNull())
-                && ((left.isNull() || left.get<Int64>() < 0xFFFF) && (right.isNull() || right.get<Int64>() >= 0xFFFF)))
-            || ((
-                (left.getType() == Field::Types::Float64 || left.isNull())
-                && (right.getType() == Field::Types::Float64 || right.isNull())
-                && ((left.isNull() || left.get<Float64>() < 0xFFFF) && (right.isNull() || right.get<Float64>() >= 0xFFFF))))
-            || !isNativeNumber(type))
-        {
-            return {};
-        }
-        else
-        {
-            return {.is_monotonic = true, .is_always_monotonic = true};
-        }
-    }
-};
-
-struct ToDateTimeMonotonicity
-{
-    static bool has() { return true; }
-
-    static IFunction::Monotonicity get(const IDataType & type, const Field &, const Field &)
-    {
-        if (type.isValueRepresentedByNumber())
-            return {.is_monotonic = true, .is_always_monotonic = true};
-        else
-            return {};
-    }
-};
-
-/** The monotonicity for the `toString` function is mainly determined for test purposes.
-  * It is doubtful that anyone is looking to optimize queries with conditions `toString(CounterID) = 34`.
-  */
-struct ToStringMonotonicity
-{
-    static bool has() { return true; }
-
-    static IFunction::Monotonicity get(const IDataType & type, const Field & left, const Field & right)
-    {
-        IFunction::Monotonicity positive{ .is_monotonic = true };
-        IFunction::Monotonicity not_monotonic;
-
-        const auto * type_ptr = &type;
-        if (const auto * low_cardinality_type = checkAndGetDataType<DataTypeLowCardinality>(type_ptr))
-            type_ptr = low_cardinality_type->getDictionaryType().get();
-
-        /// Order on enum values (which is the order on integers) is completely arbitrary in respect to the order on strings.
-        if (WhichDataType(type).isEnum())
-            return not_monotonic;
-
-        /// `toString` function is monotonous if the argument is Date or Date32 or DateTime or String, or non-negative numbers with the same number of symbols.
-        if (checkDataTypes<DataTypeDate, DataTypeDate32, DataTypeDateTime, DataTypeString>(type_ptr))
-            return positive;
-
-        if (left.isNull() || right.isNull())
-            return {};
-
-        if (left.getType() == Field::Types::UInt64
-            && right.getType() == Field::Types::UInt64)
-        {
-            return (left.get<Int64>() == 0 && right.get<Int64>() == 0)
-                || (floor(log10(left.get<UInt64>())) == floor(log10(right.get<UInt64>())))
-                ? positive : not_monotonic;
-        }
-
-        if (left.getType() == Field::Types::Int64
-            && right.getType() == Field::Types::Int64)
-        {
-            return (left.get<Int64>() == 0 && right.get<Int64>() == 0)
-                || (left.get<Int64>() > 0 && right.get<Int64>() > 0 && floor(log10(left.get<Int64>())) == floor(log10(right.get<Int64>())))
-                ? positive : not_monotonic;
-        }
-
-        return not_monotonic;
-    }
-};
-
-
-struct NameToUInt8 { static constexpr auto name = "toUInt8"; };
-struct NameToUInt16 { static constexpr auto name = "toUInt16"; };
-struct NameToUInt32 { static constexpr auto name = "toUInt32"; };
-struct NameToUInt64 { static constexpr auto name = "toUInt64"; };
-struct NameToUInt128 { static constexpr auto name = "toUInt128"; };
-struct NameToUInt256 { static constexpr auto name = "toUInt256"; };
-struct NameToInt8 { static constexpr auto name = "toInt8"; };
-struct NameToInt16 { static constexpr auto name = "toInt16"; };
-struct NameToInt32 { static constexpr auto name = "toInt32"; };
-struct NameToInt64 { static constexpr auto name = "toInt64"; };
-struct NameToInt128 { static constexpr auto name = "toInt128"; };
-struct NameToInt256 { static constexpr auto name = "toInt256"; };
-struct NameToFloat32 { static constexpr auto name = "toFloat32"; };
-struct NameToFloat64 { static constexpr auto name = "toFloat64"; };
-struct NameToUUID { static constexpr auto name = "toUUID"; };
-struct NameToIPv4 { static constexpr auto name = "toIPv4"; };
-struct NameToIPv6 { static constexpr auto name = "toIPv6"; };
-
-using FunctionToUInt8 = FunctionConvert<DataTypeUInt8, NameToUInt8, ToNumberMonotonicity<UInt8>>;
-using FunctionToUInt16 = FunctionConvert<DataTypeUInt16, NameToUInt16, ToNumberMonotonicity<UInt16>>;
-using FunctionToUInt32 = FunctionConvert<DataTypeUInt32, NameToUInt32, ToNumberMonotonicity<UInt32>>;
-using FunctionToUInt64 = FunctionConvert<DataTypeUInt64, NameToUInt64, ToNumberMonotonicity<UInt64>>;
-using FunctionToUInt128 = FunctionConvert<DataTypeUInt128, NameToUInt128, ToNumberMonotonicity<UInt128>>;
-using FunctionToUInt256 = FunctionConvert<DataTypeUInt256, NameToUInt256, ToNumberMonotonicity<UInt256>>;
-using FunctionToInt8 = FunctionConvert<DataTypeInt8, NameToInt8, ToNumberMonotonicity<Int8>>;
-using FunctionToInt16 = FunctionConvert<DataTypeInt16, NameToInt16, ToNumberMonotonicity<Int16>>;
-using FunctionToInt32 = FunctionConvert<DataTypeInt32, NameToInt32, ToNumberMonotonicity<Int32>>;
-using FunctionToInt64 = FunctionConvert<DataTypeInt64, NameToInt64, ToNumberMonotonicity<Int64>>;
-using FunctionToInt128 = FunctionConvert<DataTypeInt128, NameToInt128, ToNumberMonotonicity<Int128>>;
-using FunctionToInt256 = FunctionConvert<DataTypeInt256, NameToInt256, ToNumberMonotonicity<Int256>>;
-using FunctionToFloat32 = FunctionConvert<DataTypeFloat32, NameToFloat32, ToNumberMonotonicity<Float32>>;
-using FunctionToFloat64 = FunctionConvert<DataTypeFloat64, NameToFloat64, ToNumberMonotonicity<Float64>>;
-
-using FunctionToDate = FunctionConvert<DataTypeDate, NameToDate, ToDateMonotonicity>;
-
-using FunctionToDate32 = FunctionConvert<DataTypeDate32, NameToDate32, ToDateMonotonicity>;
-
-using FunctionToDateTime = FunctionConvert<DataTypeDateTime, NameToDateTime, ToDateTimeMonotonicity>;
-
-using FunctionToDateTime32 = FunctionConvert<DataTypeDateTime, NameToDateTime32, ToDateTimeMonotonicity>;
-
-using FunctionToDateTime64 = FunctionConvert<DataTypeDateTime64, NameToDateTime64, ToDateTimeMonotonicity>;
-
-using FunctionToUUID = FunctionConvert<DataTypeUUID, NameToUUID, ToNumberMonotonicity<UInt128>>;
-using FunctionToIPv4 = FunctionConvert<DataTypeIPv4, NameToIPv4, ToNumberMonotonicity<UInt32>>;
-using FunctionToIPv6 = FunctionConvert<DataTypeIPv6, NameToIPv6, ToNumberMonotonicity<UInt128>>;
-using FunctionToString = FunctionConvert<DataTypeString, NameToString, ToStringMonotonicity>;
-using FunctionToUnixTimestamp = FunctionConvert<DataTypeUInt32, NameToUnixTimestamp, ToNumberMonotonicity<UInt32>>;
-using FunctionToDecimal32 = FunctionConvert<DataTypeDecimal<Decimal32>, NameToDecimal32, UnknownMonotonicity>;
-using FunctionToDecimal64 = FunctionConvert<DataTypeDecimal<Decimal64>, NameToDecimal64, UnknownMonotonicity>;
-using FunctionToDecimal128 = FunctionConvert<DataTypeDecimal<Decimal128>, NameToDecimal128, UnknownMonotonicity>;
-using FunctionToDecimal256 = FunctionConvert<DataTypeDecimal<Decimal256>, NameToDecimal256, UnknownMonotonicity>;
-
-template <typename DataType, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior> struct FunctionTo;
-
-template <> struct FunctionTo<DataTypeUInt8> { using Type = FunctionToUInt8; };
-template <> struct FunctionTo<DataTypeUInt16> { using Type = FunctionToUInt16; };
-template <> struct FunctionTo<DataTypeUInt32> { using Type = FunctionToUInt32; };
-template <> struct FunctionTo<DataTypeUInt64> { using Type = FunctionToUInt64; };
-template <> struct FunctionTo<DataTypeUInt128> { using Type = FunctionToUInt128; };
-template <> struct FunctionTo<DataTypeUInt256> { using Type = FunctionToUInt256; };
-template <> struct FunctionTo<DataTypeInt8> { using Type = FunctionToInt8; };
-template <> struct FunctionTo<DataTypeInt16> { using Type = FunctionToInt16; };
-template <> struct FunctionTo<DataTypeInt32> { using Type = FunctionToInt32; };
-template <> struct FunctionTo<DataTypeInt64> { using Type = FunctionToInt64; };
-template <> struct FunctionTo<DataTypeInt128> { using Type = FunctionToInt128; };
-template <> struct FunctionTo<DataTypeInt256> { using Type = FunctionToInt256; };
-template <> struct FunctionTo<DataTypeFloat32> { using Type = FunctionToFloat32; };
-template <> struct FunctionTo<DataTypeFloat64> { using Type = FunctionToFloat64; };
-
-template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct FunctionTo<DataTypeDate, date_time_overflow_behavior> { using Type = FunctionToDate; };
-
-template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct FunctionTo<DataTypeDate32, date_time_overflow_behavior> { using Type = FunctionToDate32; };
-
-template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct FunctionTo<DataTypeDateTime, date_time_overflow_behavior> { using Type = FunctionToDateTime; };
-
-template <FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior>
-struct FunctionTo<DataTypeDateTime64, date_time_overflow_behavior> { using Type = FunctionToDateTime64; };
-
-template <> struct FunctionTo<DataTypeUUID> { using Type = FunctionToUUID; };
-template <> struct FunctionTo<DataTypeIPv4> { using Type = FunctionToIPv4; };
-template <> struct FunctionTo<DataTypeIPv6> { using Type = FunctionToIPv6; };
-template <> struct FunctionTo<DataTypeString> { using Type = FunctionToString; };
-template <> struct FunctionTo<DataTypeFixedString> { using Type = FunctionToFixedString; };
-template <> struct FunctionTo<DataTypeDecimal<Decimal32>> { using Type = FunctionToDecimal32; };
-template <> struct FunctionTo<DataTypeDecimal<Decimal64>> { using Type = FunctionToDecimal64; };
-template <> struct FunctionTo<DataTypeDecimal<Decimal128>> { using Type = FunctionToDecimal128; };
-template <> struct FunctionTo<DataTypeDecimal<Decimal256>> { using Type = FunctionToDecimal256; };
-
-template <typename FieldType> struct FunctionTo<DataTypeEnum<FieldType>>
-    : FunctionTo<DataTypeNumber<FieldType>>
-{
-};
-
-struct NameToUInt8OrZero { static constexpr auto name = "toUInt8OrZero"; };
-struct NameToUInt16OrZero { static constexpr auto name = "toUInt16OrZero"; };
-struct NameToUInt32OrZero { static constexpr auto name = "toUInt32OrZero"; };
-struct NameToUInt64OrZero { static constexpr auto name = "toUInt64OrZero"; };
-struct NameToUInt128OrZero { static constexpr auto name = "toUInt128OrZero"; };
-struct NameToUInt256OrZero { static constexpr auto name = "toUInt256OrZero"; };
-struct NameToInt8OrZero { static constexpr auto name = "toInt8OrZero"; };
-struct NameToInt16OrZero { static constexpr auto name = "toInt16OrZero"; };
-struct NameToInt32OrZero { static constexpr auto name = "toInt32OrZero"; };
-struct NameToInt64OrZero { static constexpr auto name = "toInt64OrZero"; };
-struct NameToInt128OrZero { static constexpr auto name = "toInt128OrZero"; };
-struct NameToInt256OrZero { static constexpr auto name = "toInt256OrZero"; };
-struct NameToFloat32OrZero { static constexpr auto name = "toFloat32OrZero"; };
-struct NameToFloat64OrZero { static constexpr auto name = "toFloat64OrZero"; };
-struct NameToDateOrZero { static constexpr auto name = "toDateOrZero"; };
-struct NameToDate32OrZero { static constexpr auto name = "toDate32OrZero"; };
-struct NameToDateTimeOrZero { static constexpr auto name = "toDateTimeOrZero"; };
-struct NameToDateTime64OrZero { static constexpr auto name = "toDateTime64OrZero"; };
-struct NameToDecimal32OrZero { static constexpr auto name = "toDecimal32OrZero"; };
-struct NameToDecimal64OrZero { static constexpr auto name = "toDecimal64OrZero"; };
-struct NameToDecimal128OrZero { static constexpr auto name = "toDecimal128OrZero"; };
-struct NameToDecimal256OrZero { static constexpr auto name = "toDecimal256OrZero"; };
-struct NameToUUIDOrZero { static constexpr auto name = "toUUIDOrZero"; };
-struct NameToIPv4OrZero { static constexpr auto name = "toIPv4OrZero"; };
-struct NameToIPv6OrZero { static constexpr auto name = "toIPv6OrZero"; };
-
-using FunctionToUInt8OrZero = FunctionConvertFromString<DataTypeUInt8, NameToUInt8OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUInt16OrZero = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUInt32OrZero = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUInt64OrZero = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUInt128OrZero = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUInt256OrZero = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt8OrZero = FunctionConvertFromString<DataTypeInt8, NameToInt8OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt16OrZero = FunctionConvertFromString<DataTypeInt16, NameToInt16OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt32OrZero = FunctionConvertFromString<DataTypeInt32, NameToInt32OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt64OrZero = FunctionConvertFromString<DataTypeInt64, NameToInt64OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt128OrZero = FunctionConvertFromString<DataTypeInt128, NameToInt128OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToInt256OrZero = FunctionConvertFromString<DataTypeInt256, NameToInt256OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToFloat32OrZero = FunctionConvertFromString<DataTypeFloat32, NameToFloat32OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToFloat64OrZero = FunctionConvertFromString<DataTypeFloat64, NameToFloat64OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDateOrZero = FunctionConvertFromString<DataTypeDate, NameToDateOrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDate32OrZero = FunctionConvertFromString<DataTypeDate32, NameToDate32OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDateTimeOrZero = FunctionConvertFromString<DataTypeDateTime, NameToDateTimeOrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDateTime64OrZero = FunctionConvertFromString<DataTypeDateTime64, NameToDateTime64OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDecimal32OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal32>, NameToDecimal32OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDecimal64OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal64>, NameToDecimal64OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDecimal128OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal128>, NameToDecimal128OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToDecimal256OrZero = FunctionConvertFromString<DataTypeDecimal<Decimal256>, NameToDecimal256OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToUUIDOrZero = FunctionConvertFromString<DataTypeUUID, NameToUUIDOrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToIPv4OrZero = FunctionConvertFromString<DataTypeIPv4, NameToIPv4OrZero, ConvertFromStringExceptionMode::Zero>;
-using FunctionToIPv6OrZero = FunctionConvertFromString<DataTypeIPv6, NameToIPv6OrZero, ConvertFromStringExceptionMode::Zero>;
-
-struct NameToUInt8OrNull { static constexpr auto name = "toUInt8OrNull"; };
-struct NameToUInt16OrNull { static constexpr auto name = "toUInt16OrNull"; };
-struct NameToUInt32OrNull { static constexpr auto name = "toUInt32OrNull"; };
-struct NameToUInt64OrNull { static constexpr auto name = "toUInt64OrNull"; };
-struct NameToUInt128OrNull { static constexpr auto name = "toUInt128OrNull"; };
-struct NameToUInt256OrNull { static constexpr auto name = "toUInt256OrNull"; };
-struct NameToInt8OrNull { static constexpr auto name = "toInt8OrNull"; };
-struct NameToInt16OrNull { static constexpr auto name = "toInt16OrNull"; };
-struct NameToInt32OrNull { static constexpr auto name = "toInt32OrNull"; };
-struct NameToInt64OrNull { static constexpr auto name = "toInt64OrNull"; };
-struct NameToInt128OrNull { static constexpr auto name = "toInt128OrNull"; };
-struct NameToInt256OrNull { static constexpr auto name = "toInt256OrNull"; };
-struct NameToFloat32OrNull { static constexpr auto name = "toFloat32OrNull"; };
-struct NameToFloat64OrNull { static constexpr auto name = "toFloat64OrNull"; };
-struct NameToDateOrNull { static constexpr auto name = "toDateOrNull"; };
-struct NameToDate32OrNull { static constexpr auto name = "toDate32OrNull"; };
-struct NameToDateTimeOrNull { static constexpr auto name = "toDateTimeOrNull"; };
-struct NameToDateTime64OrNull { static constexpr auto name = "toDateTime64OrNull"; };
-struct NameToDecimal32OrNull { static constexpr auto name = "toDecimal32OrNull"; };
-struct NameToDecimal64OrNull { static constexpr auto name = "toDecimal64OrNull"; };
-struct NameToDecimal128OrNull { static constexpr auto name = "toDecimal128OrNull"; };
-struct NameToDecimal256OrNull { static constexpr auto name = "toDecimal256OrNull"; };
-struct NameToUUIDOrNull { static constexpr auto name = "toUUIDOrNull"; };
-struct NameToIPv4OrNull { static constexpr auto name = "toIPv4OrNull"; };
-struct NameToIPv6OrNull { static constexpr auto name = "toIPv6OrNull"; };
-
-using FunctionToUInt8OrNull = FunctionConvertFromString<DataTypeUInt8, NameToUInt8OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUInt16OrNull = FunctionConvertFromString<DataTypeUInt16, NameToUInt16OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUInt32OrNull = FunctionConvertFromString<DataTypeUInt32, NameToUInt32OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUInt64OrNull = FunctionConvertFromString<DataTypeUInt64, NameToUInt64OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUInt128OrNull = FunctionConvertFromString<DataTypeUInt128, NameToUInt128OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUInt256OrNull = FunctionConvertFromString<DataTypeUInt256, NameToUInt256OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt8OrNull = FunctionConvertFromString<DataTypeInt8, NameToInt8OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt16OrNull = FunctionConvertFromString<DataTypeInt16, NameToInt16OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt32OrNull = FunctionConvertFromString<DataTypeInt32, NameToInt32OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt64OrNull = FunctionConvertFromString<DataTypeInt64, NameToInt64OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt128OrNull = FunctionConvertFromString<DataTypeInt128, NameToInt128OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToInt256OrNull = FunctionConvertFromString<DataTypeInt256, NameToInt256OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToFloat32OrNull = FunctionConvertFromString<DataTypeFloat32, NameToFloat32OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToFloat64OrNull = FunctionConvertFromString<DataTypeFloat64, NameToFloat64OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDateOrNull = FunctionConvertFromString<DataTypeDate, NameToDateOrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDate32OrNull = FunctionConvertFromString<DataTypeDate32, NameToDate32OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDateTimeOrNull = FunctionConvertFromString<DataTypeDateTime, NameToDateTimeOrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDateTime64OrNull = FunctionConvertFromString<DataTypeDateTime64, NameToDateTime64OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDecimal32OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal32>, NameToDecimal32OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDecimal64OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal64>, NameToDecimal64OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDecimal128OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal128>, NameToDecimal128OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToDecimal256OrNull = FunctionConvertFromString<DataTypeDecimal<Decimal256>, NameToDecimal256OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToUUIDOrNull = FunctionConvertFromString<DataTypeUUID, NameToUUIDOrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToIPv4OrNull = FunctionConvertFromString<DataTypeIPv4, NameToIPv4OrNull, ConvertFromStringExceptionMode::Null>;
-using FunctionToIPv6OrNull = FunctionConvertFromString<DataTypeIPv6, NameToIPv6OrNull, ConvertFromStringExceptionMode::Null>;
-
-struct NameParseDateTimeBestEffort { static constexpr auto name = "parseDateTimeBestEffort"; };
-struct NameParseDateTimeBestEffortOrZero { static constexpr auto name = "parseDateTimeBestEffortOrZero"; };
-struct NameParseDateTimeBestEffortOrNull { static constexpr auto name = "parseDateTimeBestEffortOrNull"; };
-struct NameParseDateTimeBestEffortUS { static constexpr auto name = "parseDateTimeBestEffortUS"; };
-struct NameParseDateTimeBestEffortUSOrZero { static constexpr auto name = "parseDateTimeBestEffortUSOrZero"; };
-struct NameParseDateTimeBestEffortUSOrNull { static constexpr auto name = "parseDateTimeBestEffortUSOrNull"; };
-struct NameParseDateTime32BestEffort { static constexpr auto name = "parseDateTime32BestEffort"; };
-struct NameParseDateTime32BestEffortOrZero { static constexpr auto name = "parseDateTime32BestEffortOrZero"; };
-struct NameParseDateTime32BestEffortOrNull { static constexpr auto name = "parseDateTime32BestEffortOrNull"; };
-struct NameParseDateTime64BestEffort { static constexpr auto name = "parseDateTime64BestEffort"; };
-struct NameParseDateTime64BestEffortOrZero { static constexpr auto name = "parseDateTime64BestEffortOrZero"; };
-struct NameParseDateTime64BestEffortOrNull { static constexpr auto name = "parseDateTime64BestEffortOrNull"; };
-struct NameParseDateTime64BestEffortUS { static constexpr auto name = "parseDateTime64BestEffortUS"; };
-struct NameParseDateTime64BestEffortUSOrZero { static constexpr auto name = "parseDateTime64BestEffortUSOrZero"; };
-struct NameParseDateTime64BestEffortUSOrNull { static constexpr auto name = "parseDateTime64BestEffortUSOrNull"; };
-
-
-using FunctionParseDateTimeBestEffort = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTimeBestEffortOrZero = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTimeBestEffortOrNull = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
-
-using FunctionParseDateTimeBestEffortUS = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
-using FunctionParseDateTimeBestEffortUSOrZero = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
-using FunctionParseDateTimeBestEffortUSOrNull = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTimeBestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
-
-using FunctionParseDateTime32BestEffort = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTime32BestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTime32BestEffortOrZero = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTime32BestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTime32BestEffortOrNull = FunctionConvertFromString<
-    DataTypeDateTime, NameParseDateTime32BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
-
-using FunctionParseDateTime64BestEffort = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffort, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTime64BestEffortOrZero = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffortOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffort>;
-using FunctionParseDateTime64BestEffortOrNull = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffortOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffort>;
-
-using FunctionParseDateTime64BestEffortUS = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffortUS, ConvertFromStringExceptionMode::Throw, ConvertFromStringParsingMode::BestEffortUS>;
-using FunctionParseDateTime64BestEffortUSOrZero = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrZero, ConvertFromStringExceptionMode::Zero, ConvertFromStringParsingMode::BestEffortUS>;
-using FunctionParseDateTime64BestEffortUSOrNull = FunctionConvertFromString<
-    DataTypeDateTime64, NameParseDateTime64BestEffortUSOrNull, ConvertFromStringExceptionMode::Null, ConvertFromStringParsingMode::BestEffortUS>;
-
-
-class ExecutableFunctionCast : public IExecutableFunction
-{
-public:
-    using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
-
-    explicit ExecutableFunctionCast(
-            WrapperType && wrapper_function_, const char * name_, std::optional<CastDiagnostic> diagnostic_)
-            : wrapper_function(std::move(wrapper_function_)), name(name_), diagnostic(std::move(diagnostic_)) {}
-
-    String getName() const override { return name; }
-
-protected:
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
-    {
-        /// drop second argument, pass others
-        ColumnsWithTypeAndName new_arguments{arguments.front()};
-        if (arguments.size() > 2)
-            new_arguments.insert(std::end(new_arguments), std::next(std::begin(arguments), 2), std::end(arguments));
-
-        try
-        {
-            return wrapper_function(new_arguments, result_type, nullptr, input_rows_count);
-        }
-        catch (Exception & e)
-        {
-            if (diagnostic)
-                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
-                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
-            throw;
-        }
-    }
-
-    bool useDefaultImplementationForNulls() const override { return false; }
-    /// CAST(Nothing, T) -> T
-    bool useDefaultImplementationForNothing() const override { return false; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
-
-private:
-    WrapperType wrapper_function;
-    const char * name;
-    std::optional<CastDiagnostic> diagnostic;
-};
-
-struct CastName { static constexpr auto name = "CAST"; };
-struct CastInternalName { static constexpr auto name = "_CAST"; };
-
-class FunctionCastBase : public IFunctionBase
-{
-public:
-    using MonotonicityForRange = std::function<Monotonicity(const IDataType &, const Field &, const Field &)>;
-};
-
-template <typename FunctionName>
-class FunctionCast final : public FunctionCastBase
-{
-public:
-    using WrapperType = std::function<ColumnPtr(ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t)>;
-
-    FunctionCast(ContextPtr context_
-            , const char * cast_name_
-            , MonotonicityForRange && monotonicity_for_range_
-            , const DataTypes & argument_types_
-            , const DataTypePtr & return_type_
-            , std::optional<CastDiagnostic> diagnostic_
-            , CastType cast_type_)
-        : cast_name(cast_name_), monotonicity_for_range(std::move(monotonicity_for_range_))
-        , argument_types(argument_types_), return_type(return_type_), diagnostic(std::move(diagnostic_))
-        , cast_type(cast_type_)
-        , context(context_)
-    {
-    }
-
-    const DataTypes & getArgumentTypes() const override { return argument_types; }
-    const DataTypePtr & getResultType() const override { return return_type; }
-
-    ExecutableFunctionPtr prepare(const ColumnsWithTypeAndName & /*sample_columns*/) const override
-    {
-        try
-        {
-            return std::make_unique<ExecutableFunctionCast>(
-                    prepareUnpackDictionaries(getArgumentTypes()[0], getResultType()), cast_name, diagnostic);
-        }
-        catch (Exception & e)
-        {
-            if (diagnostic)
-                e.addMessage("while converting source column " + backQuoteIfNeed(diagnostic->column_from) +
-                             " to destination column " + backQuoteIfNeed(diagnostic->column_to));
-            throw;
-        }
-    }
-
-    String getName() const override { return cast_name; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-    bool hasInformationAboutMonotonicity() const override
-    {
-        return static_cast<bool>(monotonicity_for_range);
-    }
-
-    Monotonicity getMonotonicityForRange(const IDataType & type, const Field & left, const Field & right) const override
-    {
-        return monotonicity_for_range(type, left, right);
-    }
-
-private:
-
-    const char * cast_name;
-    MonotonicityForRange monotonicity_for_range;
-
-    DataTypes argument_types;
-    DataTypePtr return_type;
-
-    std::optional<CastDiagnostic> diagnostic;
-    CastType cast_type;
-    ContextPtr context;
-
-    static WrapperType createFunctionAdaptor(FunctionPtr function, const DataTypePtr & from_type)
-    {
-        auto function_adaptor = std::make_unique<FunctionToOverloadResolverAdaptor>(function)->build({ColumnWithTypeAndName{nullptr, from_type, ""}});
-
-        return [function_adaptor]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
-        {
-            return function_adaptor->execute(arguments, result_type, input_rows_count);
-        };
-    }
-
-    static WrapperType createToNullableColumnWrapper()
-    {
-        return [] (ColumnsWithTypeAndName &, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
-        {
-            ColumnPtr res = result_type->createColumn();
-            ColumnUInt8::Ptr col_null_map_to = ColumnUInt8::create(input_rows_count, true);
-            return ColumnNullable::create(res->cloneResized(input_rows_count), std::move(col_null_map_to));
-        };
-    }
-
-    template <typename ToDataType>
-    WrapperType createWrapper(const DataTypePtr & from_type, const ToDataType * const to_type, bool requested_result_is_nullable) const
-    {
-        TypeIndex from_type_index = from_type->getTypeId();
-        WhichDataType which(from_type_index);
-        bool can_apply_accurate_cast = (cast_type == CastType::accurate || cast_type == CastType::accurateOrNull)
-            && (which.isInt() || which.isUInt() || which.isFloat());
-
-        FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = default_date_time_overflow_behavior;
-        if (context)
-            date_time_overflow_behavior = context->getSettingsRef().date_time_overflow_behavior;
-
-        if (requested_result_is_nullable && checkAndGetDataType<DataTypeString>(from_type.get()))
-        {
-            /// In case when converting to Nullable type, we apply different parsing rule,
-            /// that will not throw an exception but return NULL in case of malformed input.
-            FunctionPtr function = FunctionConvertFromString<ToDataType, FunctionName, ConvertFromStringExceptionMode::Null>::create();
-            return createFunctionAdaptor(function, from_type);
-        }
-        else if (!can_apply_accurate_cast)
-        {
-            FunctionPtr function = FunctionTo<ToDataType>::Type::create(context);
-            return createFunctionAdaptor(function, from_type);
-        }
-
-        auto wrapper_cast_type = cast_type;
-
-        return [wrapper_cast_type, from_type_index, to_type, date_time_overflow_behavior]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *column_nullable, size_t input_rows_count)
-        {
-            ColumnPtr result_column;
-            auto res = callOnIndexAndDataType<ToDataType>(from_type_index, [&](const auto & types) -> bool {
-                using Types = std::decay_t<decltype(types)>;
-                using LeftDataType = typename Types::LeftType;
-                using RightDataType = typename Types::RightType;
-
-                if constexpr (IsDataTypeNumber<LeftDataType>)
-                {
-                    if constexpr (IsDataTypeNumber<RightDataType>)
-                    {
-#define GENERATE_OVERFLOW_MODE_CASE(OVERFLOW_MODE, ADDITIONS) \
-            case FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE: \
-                result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName, ConvertDefaultBehaviorTag, FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE>::execute( \
-                arguments, result_type, input_rows_count, ADDITIONS()); \
-                break;
-                        if (wrapper_cast_type == CastType::accurate)
-                        {
-                            switch (date_time_overflow_behavior)
-                            {
-                                GENERATE_OVERFLOW_MODE_CASE(Throw, AccurateConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Ignore, AccurateConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Saturate, AccurateConvertStrategyAdditions)
-                            }
-                        }
-                        else
-                        {
-                            switch (date_time_overflow_behavior)
-                            {
-                                GENERATE_OVERFLOW_MODE_CASE(Throw, AccurateOrNullConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Ignore, AccurateOrNullConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Saturate, AccurateOrNullConvertStrategyAdditions)
-                            }
-                        }
-#undef GENERATE_OVERFLOW_MODE_CASE
-
-                        return true;
-                    }
-
-                    if constexpr (std::is_same_v<RightDataType, DataTypeDate> || std::is_same_v<RightDataType, DataTypeDateTime>)
-                    {
-#define GENERATE_OVERFLOW_MODE_CASE(OVERFLOW_MODE, ADDITIONS) \
-            case FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE: \
-            result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName, ConvertDefaultBehaviorTag, FormatSettings::DateTimeOverflowBehavior::OVERFLOW_MODE>::template execute<ADDITIONS>( \
-arguments, result_type, input_rows_count); \
-                break;
-                        if (wrapper_cast_type == CastType::accurate)
-                        {
-                            switch (date_time_overflow_behavior)
-                            {
-                                GENERATE_OVERFLOW_MODE_CASE(Throw, DateTimeAccurateConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Ignore, DateTimeAccurateConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Saturate, DateTimeAccurateConvertStrategyAdditions)
-                            }
-                        }
-                        else
-                        {
-                            switch (date_time_overflow_behavior)
-                            {
-                                GENERATE_OVERFLOW_MODE_CASE(Throw, DateTimeAccurateOrNullConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Ignore, DateTimeAccurateOrNullConvertStrategyAdditions)
-                                GENERATE_OVERFLOW_MODE_CASE(Saturate, DateTimeAccurateOrNullConvertStrategyAdditions)
-                            }
-                        }
-#undef GENERATE_OVERFLOW_MODE_CASE
-                        return true;
-                    }
-                }
-
-                return false;
-            });
-
-            /// Additionally check if callOnIndexAndDataType wasn't called at all.
-            if (!res)
-            {
-                if (wrapper_cast_type == CastType::accurateOrNull)
-                {
-                    auto nullable_column_wrapper = FunctionCast<FunctionName>::createToNullableColumnWrapper();
-                    return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
-                }
-                else
-                {
-                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
-                        "Conversion from {} to {} is not supported",
-                        from_type_index, to_type->getName());
-                }
-            }
-
-            return result_column;
-        };
-    }
-
-    template <typename ToDataType>
-    WrapperType createBoolWrapper(const DataTypePtr & from_type, const ToDataType * const to_type, bool requested_result_is_nullable) const
-    {
-        if (checkAndGetDataType<DataTypeString>(from_type.get()))
-        {
-            return &ConvertImplGenericFromString<ColumnString>::execute;
-        }
-
-        return createWrapper<ToDataType>(from_type, to_type, requested_result_is_nullable);
-    }
-
-    WrapperType createUInt8ToBoolWrapper(const DataTypePtr from_type, const DataTypePtr to_type) const
-    {
-        return [from_type, to_type] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/) -> ColumnPtr
-        {
-            /// Special case when we convert UInt8 column to Bool column.
-            /// both columns have type UInt8, but we shouldn't use identity wrapper,
-            /// because Bool column can contain only 0 and 1.
-            auto res_column = to_type->createColumn();
-            const auto & data_from = checkAndGetColumn<ColumnUInt8>(arguments[0].column.get())->getData();
-            auto & data_to = assert_cast<ColumnUInt8 *>(res_column.get())->getData();
-            data_to.resize(data_from.size());
-            for (size_t i = 0; i != data_from.size(); ++i)
-                data_to[i] = static_cast<bool>(data_from[i]);
-            return res_column;
-        };
-    }
-
-    static WrapperType createStringWrapper(const DataTypePtr & from_type)
-    {
-        FunctionPtr function = FunctionToString::create();
-        return createFunctionAdaptor(function, from_type);
-    }
-
-    WrapperType createFixedStringWrapper(const DataTypePtr & from_type, const size_t N) const
-    {
-        if (!isStringOrFixedString(from_type))
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "CAST AS FixedString is only implemented for types String and FixedString");
-
-        bool exception_mode_null = cast_type == CastType::accurateOrNull;
-        return [exception_mode_null, N] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/)
-        {
-            if (exception_mode_null)
-                return FunctionToFixedString::executeForN<ConvertToFixedStringExceptionMode::Null>(arguments, N);
-            else
-                return FunctionToFixedString::executeForN<ConvertToFixedStringExceptionMode::Throw>(arguments, N);
-        };
-    }
-
-#define GENERATE_INTERVAL_CASE(INTERVAL_KIND) \
-            case IntervalKind::INTERVAL_KIND: \
-                return createFunctionAdaptor(FunctionConvert<DataTypeInterval, NameToInterval##INTERVAL_KIND, PositiveMonotonicity>::create(), from_type);
-
-    static WrapperType createIntervalWrapper(const DataTypePtr & from_type, IntervalKind kind)
-    {
-        switch (kind)
-        {
-            GENERATE_INTERVAL_CASE(Nanosecond)
-            GENERATE_INTERVAL_CASE(Microsecond)
-            GENERATE_INTERVAL_CASE(Millisecond)
-            GENERATE_INTERVAL_CASE(Second)
-            GENERATE_INTERVAL_CASE(Minute)
-            GENERATE_INTERVAL_CASE(Hour)
-            GENERATE_INTERVAL_CASE(Day)
-            GENERATE_INTERVAL_CASE(Week)
-            GENERATE_INTERVAL_CASE(Month)
-            GENERATE_INTERVAL_CASE(Quarter)
-            GENERATE_INTERVAL_CASE(Year)
-        }
-        throw Exception{ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion to unexpected IntervalKind: {}", kind.toString()};
-    }
-
-#undef GENERATE_INTERVAL_CASE
-
-    template <typename ToDataType>
-    requires IsDataTypeDecimal<ToDataType>
-    WrapperType createDecimalWrapper(const DataTypePtr & from_type, const ToDataType * to_type, bool requested_result_is_nullable) const
-    {
-        TypeIndex type_index = from_type->getTypeId();
-        UInt32 scale = to_type->getScale();
-
-        WhichDataType which(type_index);
-        bool ok = which.isNativeInt() || which.isNativeUInt() || which.isDecimal() || which.isFloat() || which.isDateOrDate32() || which.isDateTime() || which.isDateTime64()
-            || which.isStringOrFixedString();
-        if (!ok)
-        {
-            if (cast_type == CastType::accurateOrNull)
-                return createToNullableColumnWrapper();
-            else
-                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
-                    from_type->getName(), to_type->getName());
-        }
-
-        auto wrapper_cast_type = cast_type;
-
-        return [wrapper_cast_type, type_index, scale, to_type, requested_result_is_nullable]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *column_nullable, size_t input_rows_count)
-        {
-            ColumnPtr result_column;
-            auto res = callOnIndexAndDataType<ToDataType>(type_index, [&](const auto & types) -> bool
-            {
-                using Types = std::decay_t<decltype(types)>;
-                using LeftDataType = typename Types::LeftType;
-                using RightDataType = typename Types::RightType;
-
-                if constexpr (IsDataTypeDecimalOrNumber<LeftDataType> && IsDataTypeDecimalOrNumber<RightDataType> && !std::is_same_v<DataTypeDateTime64, RightDataType>)
-                {
-                    if (wrapper_cast_type == CastType::accurate)
-                    {
-                        AccurateConvertStrategyAdditions additions;
-                        additions.scale = scale;
-                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
-                            arguments, result_type, input_rows_count, additions);
-
-                        return true;
-                    }
-                    else if (wrapper_cast_type == CastType::accurateOrNull)
-                    {
-                        AccurateOrNullConvertStrategyAdditions additions;
-                        additions.scale = scale;
-                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(
-                            arguments, result_type, input_rows_count, additions);
-
-                        return true;
-                    }
-                }
-                else if constexpr (std::is_same_v<LeftDataType, DataTypeString>)
-                {
-                    if (requested_result_is_nullable)
-                    {
-                        /// Consistent with CAST(Nullable(String) AS Nullable(Numbers))
-                        /// In case when converting to Nullable type, we apply different parsing rule,
-                        /// that will not throw an exception but return NULL in case of malformed input.
-                        result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName, ConvertReturnNullOnErrorTag>::execute(
-                            arguments, result_type, input_rows_count, scale);
-
-                        return true;
-                    }
-                }
-
-                result_column = ConvertImpl<LeftDataType, RightDataType, FunctionName>::execute(arguments, result_type, input_rows_count, scale);
-
-                return true;
-            });
-
-            /// Additionally check if callOnIndexAndDataType wasn't called at all.
-            if (!res)
-            {
-                if (wrapper_cast_type == CastType::accurateOrNull)
-                {
-                    auto nullable_column_wrapper = FunctionCast<FunctionName>::createToNullableColumnWrapper();
-                    return nullable_column_wrapper(arguments, result_type, column_nullable, input_rows_count);
-                }
-                else
-                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE,
-                        "Conversion from {} to {} is not supported",
-                        type_index, to_type->getName());
-            }
-
-            return result_column;
-        };
-    }
-
-    WrapperType createAggregateFunctionWrapper(const DataTypePtr & from_type_untyped, const DataTypeAggregateFunction * to_type) const
-    {
-        /// Conversion from String through parsing.
-        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
-        {
-            return &ConvertImplGenericFromString<ColumnString>::execute;
-        }
-        else if (const auto * agg_type = checkAndGetDataType<DataTypeAggregateFunction>(from_type_untyped.get()))
-        {
-            if (agg_type->getFunction()->haveSameStateRepresentation(*to_type->getFunction()))
-            {
-                return [function = to_type->getFunction()](
-                           ColumnsWithTypeAndName & arguments,
-                           const DataTypePtr & /* result_type */,
-                           const ColumnNullable * /* nullable_source */,
-                           size_t /*input_rows_count*/) -> ColumnPtr
-                {
-                    const auto & argument_column = arguments.front();
-                    const auto * col_agg = checkAndGetColumn<ColumnAggregateFunction>(argument_column.column.get());
-                    if (col_agg)
-                    {
-                        auto new_col_agg = ColumnAggregateFunction::create(*col_agg);
-                        new_col_agg->set(function);
-                        return new_col_agg;
-                    }
-                    else
-                    {
-                        throw Exception(
-                            ErrorCodes::LOGICAL_ERROR,
-                            "Illegal column {} for function CAST AS AggregateFunction",
-                            argument_column.column->getName());
-                    }
-                };
-            }
-        }
-
-        if (cast_type == CastType::accurateOrNull)
-            return createToNullableColumnWrapper();
-        else
-            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
-                from_type_untyped->getName(), to_type->getName());
-    }
-
-    WrapperType createArrayWrapper(const DataTypePtr & from_type_untyped, const DataTypeArray & to_type) const
-    {
-        /// Conversion from String through parsing.
-        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
-        {
-            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)
-        {
-            /// 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)
-        {
-            throw Exception(ErrorCodes::TYPE_MISMATCH,
-                "CAST AS Array can only be performed between same-dimensional Array, Map or String types");
-        }
-
-        DataTypePtr from_nested_type = from_type->getNestedType();
-
-        /// In query SELECT CAST([] AS Array(Array(String))) from type is Array(Nothing)
-        bool from_empty_array = isNothing(from_nested_type);
-
-        if (from_type->getNumberOfDimensions() != to_type.getNumberOfDimensions() && !from_empty_array)
-            throw Exception(ErrorCodes::TYPE_MISMATCH,
-                "CAST AS Array can only be performed between same-dimensional array types");
-
-        const DataTypePtr & to_nested_type = to_type.getNestedType();
-
-        /// Prepare nested type conversion
-        const auto nested_function = prepareUnpackDictionaries(from_nested_type, to_nested_type);
-
-        return [nested_function, from_nested_type, to_nested_type](
-                ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t /*input_rows_count*/) -> ColumnPtr
-        {
-            const auto & argument_column = arguments.front();
-
-            const ColumnArray * col_array = nullptr;
-
-            if (const ColumnMap * col_map = checkAndGetColumn<ColumnMap>(argument_column.column.get()))
-                col_array = &col_map->getNestedColumn();
-            else
-                col_array = checkAndGetColumn<ColumnArray>(argument_column.column.get());
-
-            if (col_array)
-            {
-                /// create columns for converting nested column containing original and result columns
-                ColumnsWithTypeAndName nested_columns{{ col_array->getDataPtr(), from_nested_type, "" }};
-
-                /// convert nested column
-                auto result_column = nested_function(nested_columns, to_nested_type, nullable_source, nested_columns.front().column->size());
-
-                /// set converted nested column to result
-                return ColumnArray::create(result_column, col_array->getOffsetsPtr());
-            }
-            else
-            {
-                throw Exception(ErrorCodes::LOGICAL_ERROR,
-                    "Illegal column {} for function CAST AS Array",
-                    argument_column.column->getName());
-            }
-        };
-    }
-
-    using ElementWrappers = std::vector<WrapperType>;
-
-    ElementWrappers getElementWrappers(const DataTypes & from_element_types, const DataTypes & to_element_types) const
-    {
-        ElementWrappers element_wrappers;
-        element_wrappers.reserve(from_element_types.size());
-
-        /// Create conversion wrapper for each element in tuple
-        for (size_t i = 0; i < from_element_types.size(); ++i)
-        {
-            const DataTypePtr & from_element_type = from_element_types[i];
-            const DataTypePtr & to_element_type = to_element_types[i];
-            element_wrappers.push_back(prepareUnpackDictionaries(from_element_type, to_element_type));
-        }
-
-        return element_wrappers;
-    }
-
-    WrapperType createTupleWrapper(const DataTypePtr & from_type_untyped, const DataTypeTuple * to_type) const
-    {
-        /// Conversion from String through parsing.
-        if (checkAndGetDataType<DataTypeString>(from_type_untyped.get()))
-        {
-            return &ConvertImplGenericFromString<ColumnString>::execute;
-        }
-
-        const auto * from_type = checkAndGetDataType<DataTypeTuple>(from_type_untyped.get());
-        if (!from_type)
-            throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Tuple can only be performed between tuple types or from String.\n"
-                            "Left type: {}, right type: {}", from_type_untyped->getName(), to_type->getName());
-
-        const auto & from_element_types = from_type->getElements();
-        const auto & to_element_types = to_type->getElements();
-
-        std::vector<WrapperType> element_wrappers;
-        std::vector<std::optional<size_t>> to_reverse_index;
-
-        /// For named tuples allow conversions for tuples with
-        /// different sets of elements. If element exists in @to_type
-        /// and doesn't exist in @to_type it will be filled by default values.
-        if (from_type->haveExplicitNames() && to_type->haveExplicitNames())
-        {
-            const auto & from_names = from_type->getElementNames();
-            std::unordered_map<String, size_t> from_positions;
-            from_positions.reserve(from_names.size());
-            for (size_t i = 0; i < from_names.size(); ++i)
-                from_positions[from_names[i]] = i;
-
-            const auto & to_names = to_type->getElementNames();
-            element_wrappers.reserve(to_names.size());
-            to_reverse_index.reserve(from_names.size());
-
-            for (size_t i = 0; i < to_names.size(); ++i)
-            {
-                auto it = from_positions.find(to_names[i]);
-                if (it != from_positions.end())
-                {
-                    element_wrappers.emplace_back(prepareUnpackDictionaries(from_element_types[it->second], to_element_types[i]));
-                    to_reverse_index.emplace_back(it->second);
-                }
-                else
-                {
-                    element_wrappers.emplace_back();
-                    to_reverse_index.emplace_back();
-                }
-            }
-        }
-        else
-        {
-            if (from_element_types.size() != to_element_types.size())
-                throw Exception(ErrorCodes::TYPE_MISMATCH, "CAST AS Tuple can only be performed between tuple types "
-                                "with the same number of elements or from String.\nLeft type: {}, right type: {}",
-                                from_type->getName(), to_type->getName());
-
-            element_wrappers = getElementWrappers(from_element_types, to_element_types);
-            to_reverse_index.reserve(to_element_types.size());
-            for (size_t i = 0; i < to_element_types.size(); ++i)
-                to_reverse_index.emplace_back(i);
-        }
-
-        return [element_wrappers, from_element_types, to_element_types, to_reverse_index]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
-        {
-            const auto * col = arguments.front().column.get();
-
-            size_t tuple_size = to_element_types.size();
-            const ColumnTuple & column_tuple = typeid_cast<const ColumnTuple &>(*col);
-
-            Columns converted_columns(tuple_size);
-
-            /// invoke conversion for each element
-            for (size_t i = 0; i < tuple_size; ++i)
-            {
-                if (to_reverse_index[i])
-                {
-                    size_t from_idx = *to_reverse_index[i];
-                    ColumnsWithTypeAndName element = {{column_tuple.getColumns()[from_idx], from_element_types[from_idx], "" }};
-                    converted_columns[i] = element_wrappers[i](element, to_element_types[i], nullable_source, input_rows_count);
-                }
-                else
-                {
-                    converted_columns[i] = to_element_types[i]->createColumn()->cloneResized(input_rows_count);
-                }
-            }
-
-            return ColumnTuple::create(converted_columns);
-        };
-    }
-
-    /// The case of: tuple([key1, key2, ..., key_n], [value1, value2, ..., value_n])
-    WrapperType createTupleToMapWrapper(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
-        {
-            const auto * col = arguments.front().column.get();
-            const auto & column_tuple = assert_cast<const ColumnTuple &>(*col);
-
-            Columns offsets(2);
-            Columns converted_columns(2);
-            for (size_t i = 0; i < 2; ++i)
-            {
-                const auto & column_array = assert_cast<const ColumnArray &>(column_tuple.getColumn(i));
-                ColumnsWithTypeAndName element = {{column_array.getDataPtr(), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
-                offsets[i] = column_array.getOffsetsPtr();
-            }
-
-            const auto & keys_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets[0]).getData();
-            const auto & values_offsets = assert_cast<const ColumnArray::ColumnOffsets &>(*offsets[1]).getData();
-            if (keys_offsets != values_offsets)
-                throw Exception(ErrorCodes::TYPE_MISMATCH,
-                    "CAST AS Map can only be performed from tuple of arrays with equal sizes.");
-
-            return ColumnMap::create(converted_columns[0], converted_columns[1], offsets[0]);
-        };
-    }
-
-    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
-        {
-            const auto * col = arguments.front().column.get();
-            const auto & column_map = typeid_cast<const ColumnMap &>(*col);
-            const auto & nested_data = column_map.getNestedData();
-
-            Columns converted_columns(2);
-            for (size_t i = 0; i < 2; ++i)
-            {
-                ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
-            }
-
-            return ColumnMap::create(converted_columns[0], converted_columns[1], column_map.getNestedColumn().getOffsetsPtr());
-        };
-    }
-
-    /// The case of: [(key1, value1), (key2, value2), ...]
-    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
-        {
-            const auto * col = arguments.front().column.get();
-            const auto & column_array = typeid_cast<const ColumnArray &>(*col);
-            const auto & nested_data = typeid_cast<const ColumnTuple &>(column_array.getData());
-
-            Columns converted_columns(2);
-            for (size_t i = 0; i < 2; ++i)
-            {
-                ColumnsWithTypeAndName element = {{nested_data.getColumnPtr(i), from_kv_types[i], ""}};
-                converted_columns[i] = element_wrappers[i](element, to_kv_types[i], nullable_source, (element[0].column)->size());
-            }
-
-            return ColumnMap::create(converted_columns[0], converted_columns[1], column_array.getOffsetsPtr());
-        };
-    }
-
-
-    WrapperType createMapWrapper(const DataTypePtr & from_type_untyped, const DataTypeMap * to_type) const
-    {
-        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 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();
-
-            for (const auto & elem : from_tuple->getElements())
-            {
-                const auto * type_array = checkAndGetDataType<DataTypeArray>(elem.get());
-                if (!type_array)
-                    throw Exception(ErrorCodes::TYPE_MISMATCH,
-                        "CAST AS Map can only be performed from tuples of array. Got: {}", from_tuple->getName());
-
-                from_kv_types.push_back(type_array->getNestedType());
-            }
-
-            return createTupleToMapWrapper(from_kv_types, to_kv_types);
-        }
-        else if (const auto * from_array = typeid_cast<const DataTypeArray *>(from_type_untyped.get()))
-        {
-            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 requires nested tuple of 2 elements. "
-                    "Left type: {}, right type: {}",
-                    from_array->getName(),
-                    to_type->getName());
-
-            return createArrayToMapWrapper(nested_tuple->getElements(), to_type->getKeyValueTypes());
-        }
-        else if (const auto * from_type = checkAndGetDataType<DataTypeMap>(from_type_untyped.get()))
-        {
-            return createMapToMapWrapper(from_type->getKeyValueTypes(), to_type->getKeyValueTypes());
-        }
-        else
-        {
-            throw Exception(ErrorCodes::TYPE_MISMATCH, "Unsupported types to CAST AS Map. "
-                "Left type: {}, right type: {}", from_type_untyped->getName(), to_type->getName());
-        }
-    }
-
-    WrapperType createTupleToObjectWrapper(const DataTypeTuple & from_tuple, bool has_nullable_subcolumns) const
-    {
-        if (!from_tuple.haveExplicitNames())
-            throw Exception(ErrorCodes::TYPE_MISMATCH,
-            "Cast to Object can be performed only from flatten Named Tuple. Got: {}", from_tuple.getName());
-
-        PathsInData paths;
-        DataTypes from_types;
-
-        std::tie(paths, from_types) = flattenTuple(from_tuple.getPtr());
-        auto to_types = from_types;
-
-        for (auto & type : to_types)
-        {
-            if (isTuple(type) || isNested(type))
-                throw Exception(ErrorCodes::TYPE_MISMATCH,
-                    "Cast to Object can be performed only from flatten Named Tuple. Got: {}",
-                    from_tuple.getName());
-
-            type = recursiveRemoveLowCardinality(type);
-        }
-
-        return [element_wrappers = getElementWrappers(from_types, to_types),
-            has_nullable_subcolumns, from_types, to_types, paths]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t input_rows_count)
-        {
-            size_t tuple_size = to_types.size();
-            auto flattened_column = flattenTuple(arguments.front().column);
-            const auto & column_tuple = assert_cast<const ColumnTuple &>(*flattened_column);
-
-            if (tuple_size != column_tuple.getColumns().size())
-                throw Exception(ErrorCodes::TYPE_MISMATCH,
-                    "Expected tuple with {} subcolumn, but got {} subcolumns",
-                    tuple_size, column_tuple.getColumns().size());
-
-            auto res = ColumnObject::create(has_nullable_subcolumns);
-            for (size_t i = 0; i < tuple_size; ++i)
-            {
-                ColumnsWithTypeAndName element = {{column_tuple.getColumns()[i], from_types[i], "" }};
-                auto converted_column = element_wrappers[i](element, to_types[i], nullable_source, input_rows_count);
-                res->addSubcolumn(paths[i], converted_column->assumeMutable());
-            }
-
-            return res;
-        };
-    }
-
-    WrapperType createMapToObjectWrapper(const DataTypeMap & from_map, bool has_nullable_subcolumns) const
-    {
-        auto key_value_types = from_map.getKeyValueTypes();
-
-        if (!isStringOrFixedString(key_value_types[0]))
-            throw Exception(ErrorCodes::TYPE_MISMATCH,
-                "Cast to Object from Map can be performed only from Map "
-                "with String or FixedString key. Got: {}", from_map.getName());
-
-        const auto & value_type = key_value_types[1];
-        auto to_value_type = value_type;
-
-        if (!has_nullable_subcolumns && value_type->isNullable())
-            to_value_type = removeNullable(value_type);
-
-        if (has_nullable_subcolumns && !value_type->isNullable())
-            to_value_type = makeNullable(value_type);
-
-        DataTypes to_key_value_types{std::make_shared<DataTypeString>(), std::move(to_value_type)};
-        auto element_wrappers = getElementWrappers(key_value_types, to_key_value_types);
-
-        return [has_nullable_subcolumns, element_wrappers, key_value_types, to_key_value_types]
-            (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable * nullable_source, size_t) -> ColumnPtr
-        {
-            const auto & column_map = assert_cast<const ColumnMap &>(*arguments.front().column);
-            const auto & offsets = column_map.getNestedColumn().getOffsets();
-            auto key_value_columns = column_map.getNestedData().getColumnsCopy();
-
-            for (size_t i = 0; i < 2; ++i)
-            {
-                ColumnsWithTypeAndName element{{key_value_columns[i], key_value_types[i], ""}};
-                key_value_columns[i] = element_wrappers[i](element, to_key_value_types[i], nullable_source, key_value_columns[i]->size());
-            }
-
-            const auto & key_column_str = assert_cast<const ColumnString &>(*key_value_columns[0]);
-            const auto & value_column = *key_value_columns[1];
-
-            using SubcolumnsMap = HashMap<StringRef, MutableColumnPtr, StringRefHash>;
-            SubcolumnsMap subcolumns;
-
-            for (size_t row = 0; row < offsets.size(); ++row)
-            {
-                for (size_t i = offsets[static_cast<ssize_t>(row) - 1]; i < offsets[row]; ++i)
-                {
-                    auto ref = key_column_str.getDataAt(i);
-
-                    bool inserted;
-                    SubcolumnsMap::LookupResult it;
-                    subcolumns.emplace(ref, it, inserted);
-                    auto & subcolumn = it->getMapped();
-
-                    if (inserted)
-                        subcolumn = value_column.cloneEmpty()->cloneResized(row);
-
-                    /// Map can have duplicated keys. We insert only first one.
-                    if (subcolumn->size() == row)
-                        subcolumn->insertFrom(value_column, i);
-                }
-
-                /// Insert default values for keys missed in current row.
-                for (const auto & [_, subcolumn] : subcolumns)
-                    if (subcolumn->size() == row)
-                        subcolumn->insertDefault();
-            }
-
-            auto column_object = ColumnObject::create(has_nullable_subcolumns);
-            for (auto && [key, subcolumn] : subcolumns)
-            {
-                PathInData path(key.toView());
-                column_object->addSubcolumn(path, std::move(subcolumn));
-            }
-
-            return column_object;
-        };
-    }
-
-    WrapperType createObjectWrapper(const DataTypePtr & from_type, const DataTypeObject * to_type) const
-    {
-        if (const auto * from_tuple = checkAndGetDataType<DataTypeTuple>(from_type.get()))
-        {
-            return createTupleToObjectWrapper(*from_tuple, to_type->hasNullableSubcolumns());
-        }
-        else if (const auto * from_map = checkAndGetDataType<DataTypeMap>(from_type.get()))
-        {
-            return createMapToObjectWrapper(*from_map, to_type->hasNullableSubcolumns());
-        }
-        else if (checkAndGetDataType<DataTypeString>(from_type.get()))
-        {
-            return [] (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * nullable_source, size_t input_rows_count)
-            {
-                auto res = ConvertImplGenericFromString<ColumnString>::execute(arguments, result_type, nullable_source, input_rows_count)->assumeMutable();
-                res->finalize();
-                return res;
-            };
-        }
-        else if (checkAndGetDataType<DataTypeObject>(from_type.get()))
-        {
-            return [is_nullable = to_type->hasNullableSubcolumns()] (ColumnsWithTypeAndName & arguments, const DataTypePtr & , const ColumnNullable * , size_t) -> ColumnPtr
-            {
-                auto & column_object = assert_cast<const ColumnObject &>(*arguments.front().column);
-                auto res = ColumnObject::create(is_nullable);
-                for (size_t i = 0; i < column_object.size(); i++)
-                    res->insert(column_object[i]);
-
-                res->finalize();
-                return res;
-            };
-        }
-
-        throw Exception(ErrorCodes::TYPE_MISMATCH,
-            "Cast to Object can be performed only from flatten named Tuple, Map or String. Got: {}", from_type->getName());
-    }
-
-    template <typename FieldType>
-    WrapperType createEnumWrapper(const DataTypePtr & from_type, const DataTypeEnum<FieldType> * to_type) const
-    {
-        using EnumType = DataTypeEnum<FieldType>;
-        using Function = typename FunctionTo<EnumType>::Type;
-
-        if (const auto * from_enum8 = checkAndGetDataType<DataTypeEnum8>(from_type.get()))
-            checkEnumToEnumConversion(from_enum8, to_type);
-        else if (const auto * from_enum16 = checkAndGetDataType<DataTypeEnum16>(from_type.get()))
-            checkEnumToEnumConversion(from_enum16, to_type);
-
-        if (checkAndGetDataType<DataTypeString>(from_type.get()))
-            return createStringToEnumWrapper<ColumnString, EnumType>();
-        else if (checkAndGetDataType<DataTypeFixedString>(from_type.get()))
-            return createStringToEnumWrapper<ColumnFixedString, EnumType>();
-        else if (isNativeNumber(from_type) || isEnum(from_type))
-        {
-            auto function = Function::create();
-            return createFunctionAdaptor(function, from_type);
-        }
-        else
-        {
-            if (cast_type == CastType::accurateOrNull)
-                return createToNullableColumnWrapper();
-            else
-                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
-                    from_type->getName(), to_type->getName());
-        }
-    }
-
-    template <typename EnumTypeFrom, typename EnumTypeTo>
-    void checkEnumToEnumConversion(const EnumTypeFrom * from_type, const EnumTypeTo * to_type) const
-    {
-        const auto & from_values = from_type->getValues();
-        const auto & to_values = to_type->getValues();
-
-        using ValueType = std::common_type_t<typename EnumTypeFrom::FieldType, typename EnumTypeTo::FieldType>;
-        using NameValuePair = std::pair<std::string, ValueType>;
-        using EnumValues = std::vector<NameValuePair>;
-
-        EnumValues name_intersection;
-        std::set_intersection(std::begin(from_values), std::end(from_values),
-            std::begin(to_values), std::end(to_values), std::back_inserter(name_intersection),
-            [] (auto && from, auto && to) { return from.first < to.first; });
-
-        for (const auto & name_value : name_intersection)
-        {
-            const auto & old_value = name_value.second;
-            const auto & new_value = to_type->getValue(name_value.first);
-            if (old_value != new_value)
-                throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Enum conversion changes value for element '{}' from {} to {}",
-                    name_value.first, toString(old_value), toString(new_value));
-        }
-    }
-
-    template <typename ColumnStringType, typename EnumType>
-    WrapperType createStringToEnumWrapper() const
-    {
-        const char * function_name = cast_name;
-        return [function_name] (
-            ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
-        {
-            const auto & first_col = arguments.front().column.get();
-            const auto & result_type = typeid_cast<const EnumType &>(*res_type);
-
-            const ColumnStringType * col = typeid_cast<const ColumnStringType *>(first_col);
-
-            if (col && nullable_col && nullable_col->size() != col->size())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "ColumnNullable is not compatible with original");
-
-            if (col)
-            {
-                const auto size = col->size();
-
-                auto res = result_type.createColumn();
-                auto & out_data = static_cast<typename EnumType::ColumnType &>(*res).getData();
-                out_data.resize(size);
-
-                auto default_enum_value = result_type.getValues().front().second;
-
-                if (nullable_col)
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        if (!nullable_col->isNullAt(i))
-                            out_data[i] = result_type.getValue(col->getDataAt(i));
-                        else
-                            out_data[i] = default_enum_value;
-                    }
-                }
-                else
-                {
-                    for (size_t i = 0; i < size; ++i)
-                        out_data[i] = result_type.getValue(col->getDataAt(i));
-                }
-
-                return res;
-            }
-            else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column {} as first argument of function {}",
-                    first_col->getName(), function_name);
-        };
-    }
-
-    template <typename EnumType>
-    WrapperType createEnumToStringWrapper() const
-    {
-        const char * function_name = cast_name;
-        return [function_name] (
-            ColumnsWithTypeAndName & arguments, const DataTypePtr & res_type, const ColumnNullable * nullable_col, size_t /*input_rows_count*/)
-        {
-            using ColumnEnumType = EnumType::ColumnType;
-
-            const auto & first_col = arguments.front().column.get();
-            const auto & first_type = arguments.front().type.get();
-
-            const ColumnEnumType * enum_col = typeid_cast<const ColumnEnumType *>(first_col);
-            const EnumType * enum_type = typeid_cast<const EnumType *>(first_type);
-
-            if (enum_col && nullable_col && nullable_col->size() != enum_col->size())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "ColumnNullable is not compatible with original");
-
-            if (enum_col && enum_type)
-            {
-                const auto size = enum_col->size();
-                const auto & enum_data = enum_col->getData();
-
-                auto res = res_type->createColumn();
-
-                if (nullable_col)
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        if (!nullable_col->isNullAt(i))
-                        {
-                            const auto & value = enum_type->getNameForValue(enum_data[i]);
-                            res->insertData(value.data, value.size);
-                        }
-                        else
-                            res->insertDefault();
-                    }
-                }
-                else
-                {
-                    for (size_t i = 0; i < size; ++i)
-                    {
-                        const auto & value = enum_type->getNameForValue(enum_data[i]);
-                        res->insertData(value.data, value.size);
-                    }
-                }
-
-                return res;
-            }
-            else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected column {} as first argument of function {}",
-                    first_col->getName(), function_name);
-        };
-    }
-
-    static WrapperType createIdentityWrapper(const DataTypePtr &)
-    {
-        return [] (ColumnsWithTypeAndName & arguments, const DataTypePtr &, const ColumnNullable *, size_t /*input_rows_count*/)
-        {
-            return arguments.front().column;
-        };
-    }
-
-    static WrapperType createNothingWrapper(const IDataType * to_type)
-    {
-        ColumnPtr res = to_type->createColumnConstWithDefaultValue(1);
-        return [res] (ColumnsWithTypeAndName &, const DataTypePtr &, const ColumnNullable *, size_t input_rows_count)
-        {
-            /// Column of Nothing type is trivially convertible to any other column
-            return res->cloneResized(input_rows_count)->convertToFullColumnIfConst();
-        };
-    }
-
-    WrapperType prepareUnpackDictionaries(const DataTypePtr & from_type, const DataTypePtr & to_type) const
-    {
-        const auto * from_low_cardinality = typeid_cast<const DataTypeLowCardinality *>(from_type.get());
-        const auto * to_low_cardinality = typeid_cast<const DataTypeLowCardinality *>(to_type.get());
-        const auto & from_nested = from_low_cardinality ? from_low_cardinality->getDictionaryType() : from_type;
-        const auto & to_nested = to_low_cardinality ? to_low_cardinality->getDictionaryType() : to_type;
-
-        if (from_type->onlyNull())
-        {
-            if (!to_nested->isNullable())
-            {
-                if (cast_type == CastType::accurateOrNull)
-                {
-                    return createToNullableColumnWrapper();
-                }
-                else
-                {
-                    throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Cannot convert NULL to a non-nullable type");
-                }
-            }
-
-            return [](ColumnsWithTypeAndName &, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count)
-            {
-                return result_type->createColumnConstWithDefaultValue(input_rows_count)->convertToFullColumnIfConst();
-            };
-        }
-
-        bool skip_not_null_check = false;
-
-        if (from_low_cardinality && from_nested->isNullable() && !to_nested->isNullable())
-            /// Disable check for dictionary. Will check that column doesn't contain NULL in wrapper below.
-            skip_not_null_check = true;
-
-        auto wrapper = prepareRemoveNullable(from_nested, to_nested, skip_not_null_check);
-        if (!from_low_cardinality && !to_low_cardinality)
-            return wrapper;
-
-        return [wrapper, from_low_cardinality, to_low_cardinality, skip_not_null_check]
-                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * nullable_source, size_t input_rows_count) -> ColumnPtr
-        {
-            ColumnsWithTypeAndName args = {arguments[0]};
-            auto & arg = args.front();
-            auto res_type = result_type;
-
-            ColumnPtr converted_column;
-
-            ColumnPtr res_indexes;
-            /// For some types default can't be casted (for example, String to Int). In that case convert column to full.
-            bool src_converted_to_full_column = false;
-
-            {
-                auto tmp_rows_count = input_rows_count;
-
-                if (to_low_cardinality)
-                    res_type = to_low_cardinality->getDictionaryType();
-
-                if (from_low_cardinality)
-                {
-                    const auto * col_low_cardinality = typeid_cast<const ColumnLowCardinality *>(arguments[0].column.get());
-
-                    if (skip_not_null_check && col_low_cardinality->containsNull())
-                        throw Exception(ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN, "Cannot convert NULL value to non-Nullable type");
-
-                    arg.column = col_low_cardinality->getDictionary().getNestedColumn();
-                    arg.type = from_low_cardinality->getDictionaryType();
-
-                    /// TODO: Make map with defaults conversion.
-                    src_converted_to_full_column = !removeNullable(arg.type)->equals(*removeNullable(res_type));
-                    if (src_converted_to_full_column)
-                        arg.column = arg.column->index(col_low_cardinality->getIndexes(), 0);
-                    else
-                        res_indexes = col_low_cardinality->getIndexesPtr();
-
-                    tmp_rows_count = arg.column->size();
-                }
-
-                /// Perform the requested conversion.
-                converted_column = wrapper(args, res_type, nullable_source, tmp_rows_count);
-            }
-
-            if (to_low_cardinality)
-            {
-                auto res_column = to_low_cardinality->createColumn();
-                auto * col_low_cardinality = typeid_cast<ColumnLowCardinality *>(res_column.get());
-
-                if (from_low_cardinality && !src_converted_to_full_column)
-                {
-                    col_low_cardinality->insertRangeFromDictionaryEncodedColumn(*converted_column, *res_indexes);
-                }
-                else
-                    col_low_cardinality->insertRangeFromFullColumn(*converted_column, 0, converted_column->size());
-
-                return res_column;
-            }
-            else if (!src_converted_to_full_column)
-                return converted_column->index(*res_indexes, 0);
-            else
-                return converted_column;
-        };
-    }
-
-    WrapperType prepareRemoveNullable(const DataTypePtr & from_type, const DataTypePtr & to_type, bool skip_not_null_check) const
-    {
-        /// Determine whether pre-processing and/or post-processing must take place during conversion.
-
-        bool source_is_nullable = from_type->isNullable();
-        bool result_is_nullable = to_type->isNullable();
-
-        auto wrapper = prepareImpl(removeNullable(from_type), removeNullable(to_type), result_is_nullable);
-
-        if (result_is_nullable)
-        {
-            return [wrapper, source_is_nullable]
-                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
-            {
-                /// Create a temporary columns on which to perform the operation.
-                const auto & nullable_type = static_cast<const DataTypeNullable &>(*result_type);
-                const auto & nested_type = nullable_type.getNestedType();
-
-                ColumnsWithTypeAndName tmp_args;
-                if (source_is_nullable)
-                    tmp_args = createBlockWithNestedColumns(arguments);
-                else
-                    tmp_args = arguments;
-
-                const ColumnNullable * nullable_source = nullptr;
-
-                /// Add original ColumnNullable for createStringToEnumWrapper()
-                if (source_is_nullable)
-                {
-                    if (arguments.size() != 1)
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid number of arguments");
-                    nullable_source = typeid_cast<const ColumnNullable *>(arguments.front().column.get());
-                }
-
-                /// Perform the requested conversion.
-                auto tmp_res = wrapper(tmp_args, nested_type, nullable_source, input_rows_count);
-
-                /// May happen in fuzzy tests. For debug purpose.
-                if (!tmp_res)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Couldn't convert {} to {} in prepareRemoveNullable wrapper.",
-                                    arguments[0].type->getName(), nested_type->getName());
-
-                return wrapInNullable(tmp_res, arguments, nested_type, input_rows_count);
-            };
-        }
-        else if (source_is_nullable)
-        {
-            /// Conversion from Nullable to non-Nullable.
-
-            return [wrapper, skip_not_null_check]
-                (ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
-            {
-                auto tmp_args = createBlockWithNestedColumns(arguments);
-                auto nested_type = removeNullable(result_type);
-
-                /// Check that all values are not-NULL.
-                /// Check can be skipped in case if LowCardinality dictionary is transformed.
-                /// In that case, correctness will be checked beforehand.
-                if (!skip_not_null_check)
-                {
-                    const auto & col = arguments[0].column;
-                    const auto & nullable_col = assert_cast<const ColumnNullable &>(*col);
-                    const auto & null_map = nullable_col.getNullMapData();
-
-                    if (!memoryIsZero(null_map.data(), 0, null_map.size()))
-                        throw Exception(ErrorCodes::CANNOT_INSERT_NULL_IN_ORDINARY_COLUMN, "Cannot convert NULL value to non-Nullable type");
-                }
-                const ColumnNullable * nullable_source = typeid_cast<const ColumnNullable *>(arguments.front().column.get());
-                return wrapper(tmp_args, nested_type, nullable_source, input_rows_count);
-            };
-        }
-        else
-            return wrapper;
-    }
-
-    /// 'from_type' and 'to_type' are nested types in case of Nullable.
-    /// 'requested_result_is_nullable' is true if CAST to Nullable type is requested.
-    WrapperType prepareImpl(const DataTypePtr & from_type, const DataTypePtr & to_type, bool requested_result_is_nullable) const
-    {
-        if (isUInt8(from_type) && isBool(to_type))
-            return createUInt8ToBoolWrapper(from_type, to_type);
-
-        /// We can cast IPv6 into IPv6, IPv4 into IPv4, but we should not allow to cast FixedString(16) into IPv6 as part of identity cast
-        bool safe_convert_custom_types = true;
-
-        if (const auto * to_type_custom_name = to_type->getCustomName())
-            safe_convert_custom_types = from_type->getCustomName() && from_type->getCustomName()->getName() == to_type_custom_name->getName();
-        else if (const auto * from_type_custom_name = from_type->getCustomName())
-            safe_convert_custom_types = to_type->getCustomName() && from_type_custom_name->getName() == to_type->getCustomName()->getName();
-
-        if (from_type->equals(*to_type) && safe_convert_custom_types)
-        {
-            /// We can only use identity conversion for DataTypeAggregateFunction when they are strictly equivalent.
-            if (typeid_cast<const DataTypeAggregateFunction *>(from_type.get()))
-            {
-                if (DataTypeAggregateFunction::strictEquals(from_type, to_type))
-                    return createIdentityWrapper(from_type);
-            }
-            else
-                return createIdentityWrapper(from_type);
-        }
-        else if (WhichDataType(from_type).isNothing())
-            return createNothingWrapper(to_type.get());
-
-        WrapperType ret;
-
-        auto make_default_wrapper = [&](const auto & types) -> bool
-        {
-            using Types = std::decay_t<decltype(types)>;
-            using ToDataType = typename Types::LeftType;
-
-            if constexpr (
-                std::is_same_v<ToDataType, DataTypeUInt16> ||
-                std::is_same_v<ToDataType, DataTypeUInt32> ||
-                std::is_same_v<ToDataType, DataTypeUInt64> ||
-                std::is_same_v<ToDataType, DataTypeUInt128> ||
-                std::is_same_v<ToDataType, DataTypeUInt256> ||
-                std::is_same_v<ToDataType, DataTypeInt8> ||
-                std::is_same_v<ToDataType, DataTypeInt16> ||
-                std::is_same_v<ToDataType, DataTypeInt32> ||
-                std::is_same_v<ToDataType, DataTypeInt64> ||
-                std::is_same_v<ToDataType, DataTypeInt128> ||
-                std::is_same_v<ToDataType, DataTypeInt256> ||
-                std::is_same_v<ToDataType, DataTypeFloat32> ||
-                std::is_same_v<ToDataType, DataTypeFloat64> ||
-                std::is_same_v<ToDataType, DataTypeDate> ||
-                std::is_same_v<ToDataType, DataTypeDate32> ||
-                std::is_same_v<ToDataType, DataTypeDateTime> ||
-                std::is_same_v<ToDataType, DataTypeUUID> ||
-                std::is_same_v<ToDataType, DataTypeIPv4> ||
-                std::is_same_v<ToDataType, DataTypeIPv6>)
-            {
-                ret = createWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
-                return true;
-            }
-            if constexpr (std::is_same_v<ToDataType, DataTypeUInt8>)
-            {
-                if (isBool(to_type))
-                    ret = createBoolWrapper<ToDataType>(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
-                else
-                    ret = createWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
-                return true;
-            }
-            if constexpr (
-                std::is_same_v<ToDataType, DataTypeEnum8> ||
-                std::is_same_v<ToDataType, DataTypeEnum16>)
-            {
-                ret = createEnumWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()));
-                return true;
-            }
-            if constexpr (
-                std::is_same_v<ToDataType, DataTypeDecimal<Decimal32>> ||
-                std::is_same_v<ToDataType, DataTypeDecimal<Decimal64>> ||
-                std::is_same_v<ToDataType, DataTypeDecimal<Decimal128>> ||
-                std::is_same_v<ToDataType, DataTypeDecimal<Decimal256>> ||
-                std::is_same_v<ToDataType, DataTypeDateTime64>)
-            {
-                ret = createDecimalWrapper(from_type, checkAndGetDataType<ToDataType>(to_type.get()), requested_result_is_nullable);
-                return true;
-            }
-
-            return false;
-        };
-
-        bool cast_ipv4_ipv6_default_on_conversion_error_value = context && context->getSettingsRef().cast_ipv4_ipv6_default_on_conversion_error;
-        bool input_format_ipv4_default_on_conversion_error_value = context && context->getSettingsRef().input_format_ipv4_default_on_conversion_error;
-        bool input_format_ipv6_default_on_conversion_error_value = context && context->getSettingsRef().input_format_ipv6_default_on_conversion_error;
-
-        auto make_custom_serialization_wrapper = [&, cast_ipv4_ipv6_default_on_conversion_error_value, input_format_ipv4_default_on_conversion_error_value, input_format_ipv6_default_on_conversion_error_value](const auto & types) -> bool
-        {
-            using Types = std::decay_t<decltype(types)>;
-            using ToDataType = typename Types::RightType;
-            using FromDataType = typename Types::LeftType;
-
-            if constexpr (WhichDataType(FromDataType::type_id).isStringOrFixedString())
-            {
-                if constexpr (std::is_same_v<ToDataType, DataTypeIPv4>)
-                {
-                    ret = [cast_ipv4_ipv6_default_on_conversion_error_value,
-                           input_format_ipv4_default_on_conversion_error_value,
-                           requested_result_is_nullable](
-                              ColumnsWithTypeAndName & arguments,
-                              const DataTypePtr & result_type,
-                              const ColumnNullable * column_nullable,
-                              size_t) -> ColumnPtr
-                    {
-                        if (!WhichDataType(result_type).isIPv4())
-                            throw Exception(ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv4", result_type->getName());
-
-                        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
-                        if (requested_result_is_nullable)
-                            return convertToIPv4<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
-                        else if (cast_ipv4_ipv6_default_on_conversion_error_value || input_format_ipv4_default_on_conversion_error_value)
-                            return convertToIPv4<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
-                        else
-                            return convertToIPv4<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
-                    };
-
-                    return true;
-                }
-
-                if constexpr (std::is_same_v<ToDataType, DataTypeIPv6>)
-                {
-                    ret = [cast_ipv4_ipv6_default_on_conversion_error_value,
-                           input_format_ipv6_default_on_conversion_error_value,
-                           requested_result_is_nullable](
-                              ColumnsWithTypeAndName & arguments,
-                              const DataTypePtr & result_type,
-                              const ColumnNullable * column_nullable,
-                              size_t) -> ColumnPtr
-                    {
-                        if (!WhichDataType(result_type).isIPv6())
-                            throw Exception(
-                                ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv6", result_type->getName());
-
-                        const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
-                        if (requested_result_is_nullable)
-                            return convertToIPv6<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
-                        else if (cast_ipv4_ipv6_default_on_conversion_error_value || input_format_ipv6_default_on_conversion_error_value)
-                            return convertToIPv6<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
-                        else
-                            return convertToIPv6<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
-                    };
-
-                    return true;
-                }
-
-                if (to_type->getCustomSerialization() && to_type->getCustomName())
-                {
-                    ret = [requested_result_is_nullable](
-                              ColumnsWithTypeAndName & arguments,
-                              const DataTypePtr & result_type,
-                              const ColumnNullable * column_nullable,
-                              size_t input_rows_count) -> ColumnPtr
-                    {
-                        auto wrapped_result_type = result_type;
-                        if (requested_result_is_nullable)
-                            wrapped_result_type = makeNullable(result_type);
-                        return ConvertImplGenericFromString<typename FromDataType::ColumnType>::execute(
-                            arguments, wrapped_result_type, column_nullable, input_rows_count);
-                    };
-                    return true;
-                }
-            }
-            else if constexpr (WhichDataType(FromDataType::type_id).isIPv6() && WhichDataType(ToDataType::type_id).isIPv4())
-            {
-                ret = [cast_ipv4_ipv6_default_on_conversion_error_value, requested_result_is_nullable](
-                                ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable * column_nullable, size_t)
-                        -> ColumnPtr
-                {
-                    if (!WhichDataType(result_type).isIPv4())
-                        throw Exception(
-                            ErrorCodes::TYPE_MISMATCH, "Wrong result type {}. Expected IPv4", result_type->getName());
-
-                    const auto * null_map = column_nullable ? &column_nullable->getNullMapData() : nullptr;
-                    if (requested_result_is_nullable)
-                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Null>(arguments[0].column, null_map);
-                    else if (cast_ipv4_ipv6_default_on_conversion_error_value)
-                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Default>(arguments[0].column, null_map);
-                    else
-                        return convertIPv6ToIPv4<IPStringToNumExceptionMode::Throw>(arguments[0].column, null_map);
-                };
-
-                return true;
-            }
-
-            if constexpr (WhichDataType(ToDataType::type_id).isStringOrFixedString())
-            {
-                if constexpr (WhichDataType(FromDataType::type_id).isEnum())
-                {
-                    ret = createEnumToStringWrapper<FromDataType>();
-                    return true;
-                }
-                else if (from_type->getCustomSerialization())
-                {
-                    ret = [](ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, const ColumnNullable *, size_t input_rows_count) -> ColumnPtr
-                    {
-                        return ConvertImplGenericToString<typename ToDataType::ColumnType>::execute(arguments, result_type, input_rows_count);
-                    };
-                    return true;
-                }
-            }
-
-            return false;
-        };
-
-        if (callOnTwoTypeIndexes(from_type->getTypeId(), to_type->getTypeId(), make_custom_serialization_wrapper))
-            return ret;
-
-        if (callOnIndexAndDataType<void>(to_type->getTypeId(), make_default_wrapper))
-            return ret;
-
-        switch (to_type->getTypeId())
-        {
-            case TypeIndex::String:
-                return createStringWrapper(from_type);
-            case TypeIndex::FixedString:
-                return createFixedStringWrapper(from_type, checkAndGetDataType<DataTypeFixedString>(to_type.get())->getN());
-            case TypeIndex::Array:
-                return createArrayWrapper(from_type, static_cast<const DataTypeArray &>(*to_type));
-            case TypeIndex::Tuple:
-                return createTupleWrapper(from_type, checkAndGetDataType<DataTypeTuple>(to_type.get()));
-            case TypeIndex::Map:
-                return createMapWrapper(from_type, checkAndGetDataType<DataTypeMap>(to_type.get()));
-            case TypeIndex::Object:
-                return createObjectWrapper(from_type, checkAndGetDataType<DataTypeObject>(to_type.get()));
-            case TypeIndex::AggregateFunction:
-                return createAggregateFunctionWrapper(from_type, checkAndGetDataType<DataTypeAggregateFunction>(to_type.get()));
-            case TypeIndex::Interval:
-                return createIntervalWrapper(from_type, checkAndGetDataType<DataTypeInterval>(to_type.get())->getKind());
-            default:
-                break;
-        }
-
-        if (cast_type == CastType::accurateOrNull)
-            return createToNullableColumnWrapper();
-        else
-            throw Exception(ErrorCodes::CANNOT_CONVERT_TYPE, "Conversion from {} to {} is not supported",
-                from_type->getName(), to_type->getName());
-    }
-};
-
-class MonotonicityHelper
-{
-public:
-    using MonotonicityForRange = FunctionCastBase::MonotonicityForRange;
-
-    template <typename DataType>
-    static auto monotonicityForType(const DataType * const)
-    {
-        return FunctionTo<DataType>::Type::Monotonic::get;
-    }
-
-    static MonotonicityForRange getMonotonicityInformation(const DataTypePtr & from_type, const IDataType * to_type)
-    {
-        if (const auto * type = checkAndGetDataType<DataTypeUInt8>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeUInt16>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeUInt32>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeUInt64>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeUInt128>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeUInt256>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt8>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt16>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt32>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt64>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt128>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeInt256>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeFloat32>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeFloat64>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeDate>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeDate32>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeDateTime>(to_type))
-            return monotonicityForType(type);
-        if (const auto * type = checkAndGetDataType<DataTypeString>(to_type))
-            return monotonicityForType(type);
-        if (isEnum(from_type))
-        {
-            if (const auto * type = checkAndGetDataType<DataTypeEnum8>(to_type))
-                return monotonicityForType(type);
-            if (const auto * type = checkAndGetDataType<DataTypeEnum16>(to_type))
-                return monotonicityForType(type);
-        }
-        /// other types like Null, FixedString, Array and Tuple have no monotonicity defined
-        return {};
-    }
-};
-
-}
diff --git a/src/Functions/FunctionsDecimalArithmetics.h b/src/Functions/FunctionsDecimalArithmetics.h
index 79e10d215a9..e26ad7362b3 100644
--- a/src/Functions/FunctionsDecimalArithmetics.h
+++ b/src/Functions/FunctionsDecimalArithmetics.h
@@ -280,7 +280,7 @@ public:
         /**
         At compile time, result is unknown. We only know the Scale (number of fractional digits) at runtime.
         Also nothing is known about size of whole part.
-        As in simple division/multiplication for decimals, we scale the result up, but is is explicit here and no downscale is performed.
+        As in simple division/multiplication for decimals, we scale the result up, but it is explicit here and no downscale is performed.
         It guarantees that result will have given scale and it can also be MANUALLY converted to other decimal types later.
         **/
         if (scale > DecimalUtils::max_precision<Decimal256>)
diff --git a/src/Functions/FunctionsEmbeddedDictionaries.h b/src/Functions/FunctionsEmbeddedDictionaries.h
index af040c6ab93..2f270bf999a 100644
--- a/src/Functions/FunctionsEmbeddedDictionaries.h
+++ b/src/Functions/FunctionsEmbeddedDictionaries.h
@@ -141,7 +141,7 @@ private:
     const std::shared_ptr<typename DictGetter::Src> owned_dict;
 
 public:
-    FunctionTransformWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
+    explicit FunctionTransformWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
         : owned_dict(owned_dict_)
     {
         if (!owned_dict)
@@ -232,7 +232,7 @@ private:
     const std::shared_ptr<typename DictGetter::Src> owned_dict;
 
 public:
-    FunctionIsInWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
+    explicit FunctionIsInWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
         : owned_dict(owned_dict_)
     {
         if (!owned_dict)
@@ -365,7 +365,7 @@ private:
     const std::shared_ptr<typename DictGetter::Src> owned_dict;
 
 public:
-    FunctionHierarchyWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
+    explicit FunctionHierarchyWithDictionary(const std::shared_ptr<typename DictGetter::Src> & owned_dict_)
     : owned_dict(owned_dict_)
     {
         if (!owned_dict)
@@ -563,7 +563,7 @@ private:
     const MultiVersion<RegionsNames>::Version owned_dict;
 
 public:
-    FunctionRegionToName(const MultiVersion<RegionsNames>::Version & owned_dict_)
+    explicit FunctionRegionToName(const MultiVersion<RegionsNames>::Version & owned_dict_)
         : owned_dict(owned_dict_)
     {
         if (!owned_dict)
diff --git a/src/Functions/FunctionsExternalDictionaries.h b/src/Functions/FunctionsExternalDictionaries.h
index 37ddfd6168e..4460a8bd7bd 100644
--- a/src/Functions/FunctionsExternalDictionaries.h
+++ b/src/Functions/FunctionsExternalDictionaries.h
@@ -14,6 +14,8 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
+#include <Columns/ColumnsCommon.h>
+#include <Columns/MaskOperations.h>
 
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnConst.h>
@@ -21,6 +23,8 @@
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/ColumnFunction.h>
+#include <Functions/FunctionFactory.h>
 
 #include <Access/Common/AccessFlags.h>
 
@@ -31,8 +35,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <base/range.h>
-
-#include <type_traits>
+#include <base/defines.h>
 
 namespace DB
 {
@@ -44,6 +47,7 @@ namespace ErrorCodes
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int ILLEGAL_COLUMN;
     extern const int TYPE_MISMATCH;
+    extern const int LOGICAL_ERROR;
 }
 
 
@@ -62,7 +66,7 @@ namespace ErrorCodes
   */
 
 
-class FunctionDictHelper : WithContext
+class FunctionDictHelper : public WithContext
 {
 public:
     explicit FunctionDictHelper(ContextPtr context_) : WithContext(context_) {}
@@ -320,6 +324,19 @@ public:
     String getName() const override { return name; }
 
     bool isVariadic() const override { return true; }
+    bool isShortCircuit(ShortCircuitSettings & settings, size_t number_of_arguments) const override
+    {
+        if constexpr (dictionary_get_function_type != DictionaryGetFunctionType::getOrDefault)
+            return false;
+
+        /// We execute lazily only last argument with default expression.
+        for (size_t i = 0; i != number_of_arguments - 1; ++i)
+            settings.arguments_with_disabled_lazy_execution.insert(i);
+
+        settings.enable_lazy_execution_for_common_descendants_of_arguments = false;
+        settings.force_enable_lazy_execution = false;
+        return true;
+    }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
 
@@ -376,8 +393,8 @@ public:
                 throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Function {} does not support nullable keys", getName());
 
             // Wrap all the attribute types in Array()
-            for (auto it = attribute_types.begin(); it != attribute_types.end(); ++it)
-                *it = std::make_shared<DataTypeArray>(*it);
+            for (auto & attr_type : attribute_types)
+                attr_type = std::make_shared<DataTypeArray>(attr_type);
         }
         if (attribute_types.size() > 1)
         {
@@ -455,29 +472,34 @@ public:
                     arguments.size() + 1);
 
             const auto & column_before_cast = arguments[current_arguments_index];
-            ColumnWithTypeAndName column_to_cast = {column_before_cast.column->convertToFullColumnIfConst(), column_before_cast.type, column_before_cast.name};
-
-            auto result = castColumnAccurate(column_to_cast, result_type);
-
-            if (attribute_names.size() > 1)
+            const auto * column_function = checkAndGetShortCircuitArgument(column_before_cast.column);
+            /// If we have shortcircuit (column_function exists), default_cols is empty.
+            if (!column_function)
             {
-                const auto * tuple_column = checkAndGetColumn<ColumnTuple>(result.get());
+                ColumnWithTypeAndName column_to_cast = {column_before_cast.column->convertToFullColumnIfConst(), column_before_cast.type, column_before_cast.name};
 
-                if (!tuple_column)
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Wrong argument for function {} default values column must be tuple",
-                        getName());
+                auto result = castColumnAccurate(column_to_cast, result_type);
 
-                if (tuple_column->tupleSize() != attribute_names.size())
-                    throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                        "Wrong argument for function {} default values tuple column must contain same column size as requested attributes",
-                        getName());
+                if (attribute_names.size() > 1)
+                {
+                    const auto * tuple_column = checkAndGetColumn<ColumnTuple>(result.get());
 
-                default_cols = tuple_column->getColumnsCopy();
-            }
-            else
-            {
-                default_cols.emplace_back(result);
+                    if (!tuple_column)
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Wrong argument for function {} default values column must be tuple",
+                            getName());
+
+                    if (tuple_column->tupleSize() != attribute_names.size())
+                        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Wrong argument for function {} default values tuple column must contain same column size as requested attributes",
+                            getName());
+
+                    default_cols = tuple_column->getColumnsCopy();
+                }
+                else
+                {
+                    default_cols.emplace_back(result);
+                }
             }
 
             ++current_arguments_index;
@@ -584,7 +606,8 @@ public:
         }
 
         auto result_column = executeDictionaryRequest(
-            dictionary, attribute_names, key_columns, key_types, attribute_type, default_cols, collect_values_limit);
+            dictionary, attribute_names, key_columns, key_types, attribute_type, default_cols,
+            collect_values_limit, arguments[current_arguments_index-1], result_type);
 
         if (key_is_nullable)
             result_column = wrapInNullable(result_column, {arguments[2]}, result_type, input_rows_count);
@@ -594,31 +617,109 @@ public:
 
 private:
 
+    std::pair<ColumnPtr, ColumnPtr> getDefaultsShortCircuit(
+        IColumn::Filter && default_mask,
+        const DataTypePtr & result_type,
+        const ColumnWithTypeAndName & last_argument) const
+    {
+        ColumnWithTypeAndName column_before_cast = last_argument;
+        maskedExecute(column_before_cast, default_mask);
+
+        ColumnWithTypeAndName column_to_cast = {
+            column_before_cast.column->convertToFullColumnIfConst(),
+            column_before_cast.type,
+            column_before_cast.name};
+
+        auto casted = IColumn::mutate(castColumnAccurate(column_to_cast, result_type));
+
+        auto mask_col = ColumnUInt8::create();
+        mask_col->getData() = std::move(default_mask);
+        return {std::move(casted), std::move(mask_col)};
+    }
+
+    void restoreShortCircuitColumn(
+        ColumnPtr & result_column,
+        ColumnPtr defaults_column,
+        ColumnPtr mask_column,
+        const DataTypePtr & result_type) const
+    {
+        auto if_func = FunctionFactory::instance().get("if", helper.getContext());
+        ColumnsWithTypeAndName if_args =
+        {
+            {mask_column, std::make_shared<DataTypeUInt8>(), {}},
+            {defaults_column, result_type, {}},
+            {result_column, result_type, {}},
+        };
+
+        auto rows = mask_column->size();
+        result_column = if_func->build(if_args)->execute(if_args, result_type, rows);
+    }
+
+#ifdef ABORT_ON_LOGICAL_ERROR
+    void validateShortCircuitResult(const ColumnPtr & column, const IColumn::Filter & filter) const
+    {
+        size_t expected_size = filter.size() - countBytesInFilter(filter);
+        size_t col_size = column->size();
+        if (col_size != expected_size)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Invalid size of getColumnsOrDefaultShortCircuit result. Column has {} rows, but filter contains {} bytes.",
+                col_size, expected_size);
+    }
+#endif
+
     ColumnPtr executeDictionaryRequest(
         std::shared_ptr<const IDictionary> & dictionary,
         const Strings & attribute_names,
         const Columns & key_columns,
         const DataTypes & key_types,
-        const DataTypePtr & result_type,
+        const DataTypePtr & attribute_type,
         const Columns & default_cols,
-        size_t collect_values_limit) const
+        size_t collect_values_limit,
+        const ColumnWithTypeAndName & last_argument,
+        const DataTypePtr & result_type) const
     {
         ColumnPtr result;
 
         if (attribute_names.size() > 1)
         {
-            const auto & result_tuple_type = assert_cast<const DataTypeTuple &>(*result_type);
+            const auto & attribute_tuple_type = assert_cast<const DataTypeTuple &>(*attribute_type);
 
             Columns result_columns;
             if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getAll)
             {
                 result_columns = dictionary->getColumnsAllValues(
-                    attribute_names, result_tuple_type.getElements(), key_columns, key_types, default_cols, collect_values_limit);
+                    attribute_names, attribute_tuple_type.getElements(), key_columns, key_types, default_cols, collect_values_limit);
+            }
+            else if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault && default_cols.empty())
+            {
+                IColumn::Filter default_mask;
+                result_columns = dictionary->getColumns(attribute_names, attribute_tuple_type.getElements(), key_columns, key_types, default_mask);
+
+#ifdef ABORT_ON_LOGICAL_ERROR
+                for (const auto & column : result_columns)
+                    validateShortCircuitResult(column, default_mask);
+#endif
+
+                auto [defaults_column, mask_column] =
+                    getDefaultsShortCircuit(std::move(default_mask), result_type, last_argument);
+
+                const auto & tuple_defaults = assert_cast<const ColumnTuple &>(*defaults_column);
+                const auto & result_tuple_type = assert_cast<const DataTypeTuple &>(*result_type);
+
+                for (size_t col = 0; col < result_columns.size(); ++col)
+                {
+                    restoreShortCircuitColumn(
+                        result_columns[col],
+                        tuple_defaults.getColumnPtr(col),
+                        mask_column,
+                        result_tuple_type.getElements()[col]);
+                }
             }
             else
             {
-                result_columns
-                    = dictionary->getColumns(attribute_names, result_tuple_type.getElements(), key_columns, key_types, default_cols);
+                result_columns = dictionary->getColumns(
+                    attribute_names, attribute_tuple_type.getElements(), key_columns, key_types, default_cols);
             }
 
             result = ColumnTuple::create(std::move(result_columns));
@@ -628,11 +729,26 @@ private:
             if constexpr (dictionary_get_function_type == DictionaryGetFunctionType::getAll)
             {
                 result = dictionary->getColumnAllValues(
-                    attribute_names[0], result_type, key_columns, key_types, default_cols.front(), collect_values_limit);
+                    attribute_names[0], attribute_type, key_columns, key_types, default_cols.front(), collect_values_limit);
+            }
+            else if (dictionary_get_function_type == DictionaryGetFunctionType::getOrDefault && default_cols.empty())
+            {
+                IColumn::Filter default_mask;
+                result = dictionary->getColumn(attribute_names[0], attribute_type, key_columns, key_types, default_mask);
+
+#ifdef ABORT_ON_LOGICAL_ERROR
+                validateShortCircuitResult(result, default_mask);
+#endif
+
+                auto [defaults_column, mask_column] =
+                    getDefaultsShortCircuit(std::move(default_mask), result_type, last_argument);
+
+                restoreShortCircuitColumn(result, defaults_column, mask_column, result_type);
             }
             else
             {
-                result = dictionary->getColumn(attribute_names[0], result_type, key_columns, key_types, default_cols.front());
+                result = dictionary->getColumn(
+                    attribute_names[0], attribute_type, key_columns, key_types, default_cols.front());
             }
         }
 
@@ -1023,7 +1139,7 @@ private:
                 getName());
 
         auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
+        const auto & hierarchical_attribute = FunctionDictHelper::getDictionaryHierarchicalAttribute(dictionary);
 
         return std::make_shared<DataTypeArray>(removeNullable(hierarchical_attribute.type));
     }
@@ -1034,7 +1150,7 @@ private:
             return result_type->createColumn();
 
         auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
+        const auto & hierarchical_attribute = FunctionDictHelper::getDictionaryHierarchicalAttribute(dictionary);
 
         auto key_column = ColumnWithTypeAndName{arguments[1].column, arguments[1].type, arguments[1].name};
         auto key_column_casted = castColumnAccurate(key_column, removeNullable(hierarchical_attribute.type));
@@ -1089,7 +1205,7 @@ private:
             return result_type->createColumn();
 
         auto dictionary = helper.getDictionary(arguments[0].column);
-        const auto & hierarchical_attribute = helper.getDictionaryHierarchicalAttribute(dictionary);
+        const auto & hierarchical_attribute = FunctionDictHelper::getDictionaryHierarchicalAttribute(dictionary);
 
         auto key_column = ColumnWithTypeAndName{arguments[1].column->convertToFullColumnIfConst(), arguments[1].type, arguments[2].name};
         auto in_key_column = ColumnWithTypeAndName{arguments[2].column->convertToFullColumnIfConst(), arguments[2].type, arguments[2].name};
diff --git a/src/Functions/FunctionsHashing.h b/src/Functions/FunctionsHashing.h
index d0edd34e657..79b33e2f75b 100644
--- a/src/Functions/FunctionsHashing.h
+++ b/src/Functions/FunctionsHashing.h
@@ -9,10 +9,8 @@
 
 #include "config.h"
 
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wused-but-marked-unused"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wused-but-marked-unused"
 #include <xxhash.h>
 
 #include <Common/SipHash.h>
@@ -1604,6 +1602,4 @@ using FunctionXXH3 = FunctionAnyHash<ImplXXH3>;
 using FunctionWyHash64 = FunctionAnyHash<ImplWyHash64>;
 }
 
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
diff --git a/src/Functions/FunctionsJSON.h b/src/Functions/FunctionsJSON.h
index 094de0c27c2..75c274a365f 100644
--- a/src/Functions/FunctionsJSON.h
+++ b/src/Functions/FunctionsJSON.h
@@ -5,7 +5,7 @@
 
 #include <base/range.h>
 
-#include <Common/CpuId.h>
+#include <Common/CPUID.h>
 #include <Common/typeid_cast.h>
 #include <Common/assert_cast.h>
 
@@ -21,6 +21,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnTuple.h>
+#include <Columns/ColumnVariant.h>
 
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeMap.h>
@@ -35,6 +36,8 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypesDecimal.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/Serializations/SerializationVariant.h>
 #include <DataTypes/Serializations/SerializationDecimal.h>
 
 #include <Functions/IFunction.h>
@@ -257,7 +260,7 @@ private:
                 }
                 case MoveType::Key:
                 {
-                    key = (*arguments[j + 1].column).getDataAt(row).toView();
+                    key = arguments[j + 1].column->getDataAt(row).toView();
                     if (!moveToElementByKey<JSONParser>(res_element, key))
                         return false;
                     break;
@@ -334,6 +337,26 @@ private:
 
 };
 
+template <typename T>
+class JSONExtractImpl;
+
+template <typename T>
+class JSONExtractKeysAndValuesImpl;
+
+/**
+* Functions JSONExtract and JSONExtractKeysAndValues force the return type - it is specified in the last argument.
+* For example - `SELECT JSONExtract(materialize('{"a": 131231, "b": 1234}'), 'b', 'LowCardinality(FixedString(4))')`
+* But by default ClickHouse decides on its own whether the return type will be LowCardinality based on the types of
+* input arguments.
+* And for these specific functions we cannot rely on this mechanism, so these functions have their own implementation -
+* just convert all of the LowCardinality input columns to full ones, execute and wrap the resulting column in LowCardinality
+* if needed.
+*/
+template <template<typename> typename Impl>
+constexpr bool functionForcesTheReturnType()
+{
+    return std::is_same_v<Impl<void>, JSONExtractImpl<void>> || std::is_same_v<Impl<void>, JSONExtractKeysAndValuesImpl<void>>;
+}
 
 template <typename Name, template<typename> typename Impl>
 class ExecutableFunctionJSON : public IExecutableFunction
@@ -348,17 +371,50 @@ public:
     String getName() const override { return Name::name; }
     bool useDefaultImplementationForNulls() const override { return false; }
     bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override
+    {
+        return !functionForcesTheReturnType<Impl>();
+    }
 
     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;
+        if constexpr (functionForcesTheReturnType<Impl>())
+        {
+            ColumnsWithTypeAndName columns_without_low_cardinality = arguments;
+
+            for (auto & column : columns_without_low_cardinality)
+            {
+                column.column = recursiveRemoveLowCardinality(column.column);
+                column.type = recursiveRemoveLowCardinality(column.type);
+            }
+
+            ColumnsWithTypeAndName temporary_columns = null_presence.has_nullable ? createBlockWithNestedColumns(columns_without_low_cardinality) : columns_without_low_cardinality;
+            ColumnPtr temporary_result = chooseAndRunJSONParser(temporary_columns, json_return_type, input_rows_count);
+
+            if (null_presence.has_nullable)
+                temporary_result = wrapInNullable(temporary_result, columns_without_low_cardinality, result_type, input_rows_count);
+
+            if (result_type->lowCardinality())
+                temporary_result = recursiveLowCardinalityTypeConversion(temporary_result, json_return_type, result_type);
+
+            return temporary_result;
+        }
+        else
+        {
+            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)
+                temporary_result = wrapInNullable(temporary_result, arguments, result_type, input_rows_count);
+
+            if (result_type->lowCardinality())
+                temporary_result = recursiveLowCardinalityTypeConversion(temporary_result, json_return_type, result_type);
+
+            return temporary_result;
+        }
     }
 
 private:
@@ -429,7 +485,6 @@ private:
     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>
@@ -450,6 +505,10 @@ public:
     bool isVariadic() const override { return true; }
     size_t getNumberOfArguments() const override { return 0; }
     bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override
+    {
+        return !functionForcesTheReturnType<Impl>();
+    }
 
     FunctionBasePtr build(const ColumnsWithTypeAndName & arguments) const override
     {
@@ -481,7 +540,6 @@ public:
     }
 };
 
-
 struct NameJSONHas { static constexpr auto name{"JSONHas"}; };
 struct NameIsValidJSON { static constexpr auto name{"isValidJSON"}; };
 struct NameJSONLength { static constexpr auto name{"JSONLength"}; };
@@ -1053,6 +1111,13 @@ struct JSONExtractTree
 
         bool insertResultToColumn(IColumn & dest, const Element & element) override
         {
+            if (dest.getDataType() == TypeIndex::LowCardinality)
+            {
+                /// We do not need to handle nullability in that case
+                /// because nested node handles LowCardinality columns and will call proper overload of `insertData`
+                return nested->insertResultToColumn(dest, element);
+            }
+
             ColumnNullable & col_null = assert_cast<ColumnNullable &>(dest);
             if (!nested->insertResultToColumn(col_null.getNestedColumn(), element))
                 return false;
@@ -1231,6 +1296,35 @@ struct JSONExtractTree
         std::unique_ptr<Node> value;
     };
 
+    class VariantNode : public Node
+    {
+    public:
+        VariantNode(std::vector<std::unique_ptr<Node>> variant_nodes_, std::vector<size_t> order_) : variant_nodes(std::move(variant_nodes_)), order(std::move(order_)) { }
+
+        bool insertResultToColumn(IColumn & dest, const Element & element) override
+        {
+            auto & column_variant = assert_cast<ColumnVariant &>(dest);
+            for (size_t i : order)
+            {
+                auto & variant = column_variant.getVariantByGlobalDiscriminator(i);
+                if (variant_nodes[i]->insertResultToColumn(variant, element))
+                {
+                    column_variant.getLocalDiscriminators().push_back(column_variant.localDiscriminatorByGlobal(i));
+                    column_variant.getOffsets().push_back(variant.size() - 1);
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+    private:
+        std::vector<std::unique_ptr<Node>> variant_nodes;
+        /// Order in which we should try variants nodes.
+        /// For example, String should be always the last one.
+        std::vector<size_t> order;
+    };
+
     static std::unique_ptr<Node> build(const char * function_name, const DataTypePtr & type)
     {
         switch (type->getTypeId())
@@ -1307,6 +1401,16 @@ struct JSONExtractTree
                 const auto & value_type = map_type.getValueType();
                 return std::make_unique<MapNode>(build(function_name, key_type), build(function_name, value_type));
             }
+            case TypeIndex::Variant:
+            {
+                const auto & variant_type = static_cast<const DataTypeVariant &>(*type);
+                const auto & variants = variant_type.getVariants();
+                std::vector<std::unique_ptr<Node>> variant_nodes;
+                variant_nodes.reserve(variants.size());
+                for (const auto & variant : variants)
+                    variant_nodes.push_back(build(function_name, variant));
+                return std::make_unique<VariantNode>(std::move(variant_nodes), SerializationVariant::getVariantsDeserializeTextOrder(variants));
+            }
             default:
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                                 "Function {} doesn't support the return type schema: {}",
diff --git a/src/Functions/FunctionsLogical.cpp b/src/Functions/FunctionsLogical.cpp
index d01fdc99076..7e7ae76d6eb 100644
--- a/src/Functions/FunctionsLogical.cpp
+++ b/src/Functions/FunctionsLogical.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsLogical.h>
+#include <Functions/logical.h>
 
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnNullable.h>
@@ -530,7 +531,7 @@ DataTypePtr FunctionAnyArityLogical<Impl, Name>::getReturnTypeImpl(const DataTyp
         {
             has_nullable_arguments = arg_type->isNullable();
             if (has_nullable_arguments && !Impl::specialImplementationForNulls())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Unexpected type of argument for function \"{}\": "
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected type of argument for function \"{}\": "
                     " argument {} is of type {}", getName(), i + 1, arg_type->getName());
         }
 
@@ -776,4 +777,21 @@ ColumnPtr FunctionUnaryLogical<Impl, Name>::executeImpl(const ColumnsWithTypeAnd
     return res;
 }
 
+FunctionOverloadResolverPtr createInternalFunctionOrOverloadResolver()
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+}
+FunctionOverloadResolverPtr createInternalFunctionAndOverloadResolver()
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+}
+FunctionOverloadResolverPtr createInternalFunctionXorOverloadResolver()
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionXor>());
+}
+FunctionOverloadResolverPtr createInternalFunctionNotOverloadResolver()
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionNot>());
+}
+
 }
diff --git a/src/Functions/FunctionsLogical.h b/src/Functions/FunctionsLogical.h
index a25bffcdd73..41464329f79 100644
--- a/src/Functions/FunctionsLogical.h
+++ b/src/Functions/FunctionsLogical.h
@@ -164,7 +164,7 @@ public:
     bool isVariadic() const override { return true; }
     bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
     {
-        settings.enable_lazy_execution_for_first_argument = false;
+        settings.arguments_with_disabled_lazy_execution.insert(0);
         settings.enable_lazy_execution_for_common_descendants_of_arguments = true;
         settings.force_enable_lazy_execution = false;
         return name == NameAnd::name || name == NameOr::name;
diff --git a/src/Functions/FunctionsRound.cpp b/src/Functions/FunctionsRound.cpp
index 02fe1d659de..059476acb40 100644
--- a/src/Functions/FunctionsRound.cpp
+++ b/src/Functions/FunctionsRound.cpp
@@ -7,11 +7,11 @@ namespace DB
 
 REGISTER_FUNCTION(Round)
 {
-    factory.registerFunction<FunctionRound>("round", {}, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionRoundBankers>("roundBankers", {}, FunctionFactory::CaseSensitive);
-    factory.registerFunction<FunctionFloor>("floor", {}, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionCeil>("ceil", {}, FunctionFactory::CaseInsensitive);
-    factory.registerFunction<FunctionTrunc>("trunc", {}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRound>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionRoundBankers>({}, FunctionFactory::CaseSensitive);
+    factory.registerFunction<FunctionFloor>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionCeil>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionTrunc>({}, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionRoundDown>();
 
     /// Compatibility aliases.
diff --git a/src/Functions/FunctionsStringHashFixedString.cpp b/src/Functions/FunctionsStringHashFixedString.cpp
index fd42a84fa26..f4160badd37 100644
--- a/src/Functions/FunctionsStringHashFixedString.cpp
+++ b/src/Functions/FunctionsStringHashFixedString.cpp
@@ -274,12 +274,12 @@ public:
             const typename ColumnIPv6::Container & data = col_from_ip->getData();
             const auto size = col_from_ip->size();
             auto & chars_to = col_to->getChars();
-            const auto length = IPV6_BINARY_LENGTH;
+            const auto length = sizeof(IPv6::UnderlyingType);
             chars_to.resize(size * Impl::length);
             for (size_t i = 0; i < size; ++i)
             {
                 Impl::apply(
-                    reinterpret_cast<const char *>(&data[i * length]), length, reinterpret_cast<uint8_t *>(&chars_to[i * Impl::length]));
+                    reinterpret_cast<const char *>(&data[i]), length, reinterpret_cast<uint8_t *>(&chars_to[i * Impl::length]));
             }
             return col_to;
         }
diff --git a/src/Functions/FunctionsStringSearch.h b/src/Functions/FunctionsStringSearch.h
index 41b476ccc56..64de5d98ae3 100644
--- a/src/Functions/FunctionsStringSearch.h
+++ b/src/Functions/FunctionsStringSearch.h
@@ -22,13 +22,13 @@ namespace DB
   * positionCaseInsensitive(haystack, needle)
   * positionCaseInsensitiveUTF8(haystack, needle)
   *
-  * like(haystack, pattern)        - search by the regular expression LIKE; Returns 0 or 1. Case-insensitive, but only for Latin.
-  * notLike(haystack, pattern)
+  * like(haystack, needle)        - search by the regular expression LIKE; Returns 0 or 1. Case-insensitive, but only for Latin.
+  * notLike(haystack, needle)
   *
-  * ilike(haystack, pattern) - like 'like' but case-insensitive
-  * notIlike(haystack, pattern)
+  * ilike(haystack, needle) - like 'like' but case-insensitive
+  * notIlike(haystack, needle)
   *
-  * match(haystack, pattern)       - search by regular expression re2; Returns 0 or 1.
+  * match(haystack, needle)       - search by regular expression re2; Returns 0 or 1.
   *
   * countSubstrings(haystack, needle) -- count number of occurrences of needle in haystack.
   * countSubstringsCaseInsensitive(haystack, needle)
@@ -53,7 +53,7 @@ namespace DB
   * - the first subpattern, if the regexp has a subpattern;
   * - the zero subpattern (the match part, otherwise);
   * - if not match - an empty string.
-  * extract(haystack, pattern)
+  * extract(haystack, needle)
   */
 
 namespace ErrorCodes
@@ -69,13 +69,39 @@ enum class ExecutionErrorPolicy
     Throw
 };
 
-template <typename Impl, ExecutionErrorPolicy execution_error_policy = ExecutionErrorPolicy::Throw>
+enum class HaystackNeedleOrderIsConfigurable
+{
+    No,     /// function arguments are always: (haystack, needle[, position])
+    Yes     /// depending on a setting, the function arguments are (haystack, needle[, position]) or (needle, haystack[, position])
+};
+
+template <typename Impl,
+         ExecutionErrorPolicy execution_error_policy = ExecutionErrorPolicy::Throw,
+         HaystackNeedleOrderIsConfigurable haystack_needle_order_is_configurable = HaystackNeedleOrderIsConfigurable::No>
 class FunctionsStringSearch : public IFunction
 {
+private:
+    enum class ArgumentOrder
+    {
+        HaystackNeedle,
+        NeedleHaystack
+    };
+
+    ArgumentOrder argument_order = ArgumentOrder::HaystackNeedle;
+
 public:
     static constexpr auto name = Impl::name;
 
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionsStringSearch>(); }
+    static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionsStringSearch>(context); }
+
+    explicit FunctionsStringSearch([[maybe_unused]] ContextPtr context)
+    {
+        if constexpr (haystack_needle_order_is_configurable == HaystackNeedleOrderIsConfigurable::Yes)
+        {
+            if (context->getSettingsRef().function_locate_has_mysql_compatible_argument_order)
+                argument_order = ArgumentOrder::NeedleHaystack;
+        }
+    }
 
     String getName() const override { return name; }
 
@@ -105,13 +131,16 @@ public:
                 "Number of arguments for function {} doesn't match: passed {}, should be 2 or 3",
                 getName(), arguments.size());
 
-        if (!isStringOrFixedString(arguments[0]))
+        const auto & haystack_type = (argument_order == ArgumentOrder::HaystackNeedle) ? arguments[0] : arguments[1];
+        const auto & needle_type = (argument_order == ArgumentOrder::HaystackNeedle) ? arguments[1] : arguments[0];
+
+        if (!isStringOrFixedString(haystack_type))
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "Illegal type {} of argument of function {}",
                 arguments[0]->getName(), getName());
 
-        if (!isString(arguments[1]))
+        if (!isString(needle_type))
             throw Exception(
                 ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                 "Illegal type {} of argument of function {}",
@@ -135,8 +164,8 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t /*input_rows_count*/) const override
     {
-        const ColumnPtr & column_haystack = arguments[0].column;
-        const ColumnPtr & column_needle = arguments[1].column;
+        const ColumnPtr & column_haystack = (argument_order == ArgumentOrder::HaystackNeedle) ? arguments[0].column : arguments[1].column;
+        const ColumnPtr & column_needle = (argument_order == ArgumentOrder::HaystackNeedle) ? arguments[1].column : arguments[0].column;
 
         ColumnPtr column_start_pos = nullptr;
         if (arguments.size() >= 3)
@@ -161,14 +190,26 @@ public:
         {
             if (col_haystack_const && col_needle_const)
             {
-                const auto is_col_start_pos_const = !column_start_pos || isColumnConst(*column_start_pos);
+                auto column_start_position_arg = column_start_pos;
+                bool is_col_start_pos_const = false;
+                if (column_start_pos)
+                {
+                    if (const ColumnConst * const_column_start_pos = typeid_cast<const ColumnConst *>(&*column_start_pos))
+                    {
+                        is_col_start_pos_const = true;
+                        column_start_position_arg = const_column_start_pos->getDataColumnPtr();
+                    }
+                }
+                else
+                    is_col_start_pos_const = true;
+
                 vec_res.resize(is_col_start_pos_const ? 1 : column_start_pos->size());
                 const auto null_map = create_null_map();
 
                 Impl::constantConstant(
                     col_haystack_const->getValue<String>(),
                     col_needle_const->getValue<String>(),
-                    column_start_pos,
+                    column_start_position_arg,
                     vec_res,
                     null_map.get());
 
diff --git a/src/Functions/FunctionsStringSimilarity.cpp b/src/Functions/FunctionsStringSimilarity.cpp
index df068531655..aadf5c246fc 100644
--- a/src/Functions/FunctionsStringSimilarity.cpp
+++ b/src/Functions/FunctionsStringSimilarity.cpp
@@ -3,6 +3,7 @@
 #include <Functions/FunctionsHashing.h>
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/HashTable/Hash.h>
+#include <Common/MemorySanitizer.h>
 #include <Common/UTF8Helpers.h>
 
 #include <Core/Defines.h>
@@ -108,10 +109,8 @@ 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>());
         }
diff --git a/src/Functions/FunctionsTimeWindow.cpp b/src/Functions/FunctionsTimeWindow.cpp
index 231e8b6fa77..2b1359964e8 100644
--- a/src/Functions/FunctionsTimeWindow.cpp
+++ b/src/Functions/FunctionsTimeWindow.cpp
@@ -12,6 +12,7 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionsTimeWindow.h>
 
+
 namespace DB
 {
 
@@ -22,91 +23,141 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int SYNTAX_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
 {
-    std::tuple<IntervalKind::Kind, Int64>
-    dispatchForIntervalColumns(const ColumnWithTypeAndName & interval_column, const String & function_name)
-    {
-        const auto * interval_type = checkAndGetDataType<DataTypeInterval>(interval_column.type.get());
-        if (!interval_type)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
-                interval_column.name, function_name);
-        const auto * interval_column_const_int64 = checkAndGetColumnConst<ColumnInt64>(interval_column.column.get());
-        if (!interval_column_const_int64)
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
-                interval_column.name, function_name);
-        Int64 num_units = interval_column_const_int64->getValue<Int64>();
-        if (num_units <= 0)
-            throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Value for column {} of function {} must be positive",
-                interval_column.name, function_name);
 
-        return {interval_type->getKind(), num_units};
-    }
+std::tuple<IntervalKind::Kind, Int64>
+dispatchForIntervalColumns(const ColumnWithTypeAndName & interval_column, const String & function_name)
+{
+    const auto * interval_type = checkAndGetDataType<DataTypeInterval>(interval_column.type.get());
+    if (!interval_type)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
+            interval_column.name, function_name);
+    const auto * interval_column_const_int64 = checkAndGetColumnConst<ColumnInt64>(interval_column.column.get());
+    if (!interval_column_const_int64)
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}",
+            interval_column.name, function_name);
+    Int64 num_units = interval_column_const_int64->getValue<Int64>();
+    if (num_units <= 0)
+        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Value for column {} of function {} must be positive",
+            interval_column.name, function_name);
 
-    ColumnPtr executeWindowBound(const ColumnPtr & column, int index, const String & function_name)
+    return {interval_type->getKind(), num_units};
+}
+
+ColumnPtr executeWindowBound(const ColumnPtr & column, size_t index, const String & function_name)
+{
+    chassert(index == 0 || index == 1);
+    if (const ColumnTuple * col_tuple = checkAndGetColumn<ColumnTuple>(column.get()); col_tuple)
     {
-        if (const ColumnTuple * col_tuple = checkAndGetColumn<ColumnTuple>(column.get()); col_tuple)
-        {
-            if (!checkColumn<ColumnVector<UInt32>>(*col_tuple->getColumnPtr(index)))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column for first argument of function {}. "
-                    "Must be a Tuple(DataTime, DataTime)", function_name);
-            return col_tuple->getColumnPtr(index);
-        }
-        else
-        {
+        if (index >= col_tuple->tupleSize() || !checkColumn<ColumnVector<UInt32>>(*col_tuple->getColumnPtr(index)))
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column for first argument of function {}. "
-                "Must be Tuple", function_name);
-        }
+                "Must be a Tuple(DataTime, DataTime)", function_name);
+        return col_tuple->getColumnPtr(index);
     }
-
-    void checkFirstArgument(const ColumnWithTypeAndName & argument, const String & function_name)
+    else
     {
-        if (!isDateTime(argument.type))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
-                "Should be a date with time", argument.type->getName(), function_name);
-    }
-
-    void checkIntervalArgument(const ColumnWithTypeAndName & argument, const String & function_name, IntervalKind & interval_kind, bool & result_type_is_date)
-    {
-        const auto * interval_type = checkAndGetDataType<DataTypeInterval>(argument.type.get());
-        if (!interval_type)
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
-                "Should be an interval of time", argument.type->getName(), function_name);
-        interval_kind = interval_type->getKind();
-        result_type_is_date = (interval_type->getKind() == IntervalKind::Year) || (interval_type->getKind() == IntervalKind::Quarter)
-            || (interval_type->getKind() == IntervalKind::Month) || (interval_type->getKind() == IntervalKind::Week);
-    }
-
-    void checkIntervalArgument(const ColumnWithTypeAndName & argument, const String & function_name, bool & result_type_is_date)
-    {
-        IntervalKind interval_kind;
-        checkIntervalArgument(argument, function_name, interval_kind, result_type_is_date);
-    }
-
-    void checkTimeZoneArgument(
-        const ColumnWithTypeAndName & argument,
-        const String & function_name)
-    {
-        if (!WhichDataType(argument.type).isString())
-            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",
-                argument.type->getName(), function_name);
-    }
-
-    bool checkIntervalOrTimeZoneArgument(const ColumnWithTypeAndName & argument, const String & function_name, IntervalKind & interval_kind, bool & result_type_is_date)
-    {
-        if (WhichDataType(argument.type).isString())
-        {
-            checkTimeZoneArgument(argument, function_name);
-            return false;
-        }
-        checkIntervalArgument(argument, function_name, interval_kind, result_type_is_date);
-        return true;
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal column for first argument of function {}. "
+            "Must be Tuple", function_name);
     }
 }
 
+void checkFirstArgument(const ColumnWithTypeAndName & argument, const String & function_name)
+{
+    if (!isDateTime(argument.type))
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
+            "Should be a date with time", argument.type->getName(), function_name);
+}
+
+void checkIntervalArgument(const ColumnWithTypeAndName & argument, const String & function_name, IntervalKind & interval_kind, bool & result_type_is_date)
+{
+    const auto * interval_type = checkAndGetDataType<DataTypeInterval>(argument.type.get());
+    if (!interval_type)
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}. "
+            "Should be an interval of time", argument.type->getName(), function_name);
+    interval_kind = interval_type->getKind();
+    result_type_is_date = (interval_type->getKind() == IntervalKind::Kind::Year) || (interval_type->getKind() == IntervalKind::Kind::Quarter)
+        || (interval_type->getKind() == IntervalKind::Kind::Month) || (interval_type->getKind() == IntervalKind::Kind::Week);
+}
+
+void checkIntervalArgument(const ColumnWithTypeAndName & argument, const String & function_name, bool & result_type_is_date)
+{
+    IntervalKind interval_kind;
+    checkIntervalArgument(argument, function_name, interval_kind, result_type_is_date);
+}
+
+void checkTimeZoneArgument(
+    const ColumnWithTypeAndName & argument,
+    const String & function_name)
+{
+    if (!WhichDataType(argument.type).isString())
+        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",
+            argument.type->getName(), function_name);
+}
+
+bool checkIntervalOrTimeZoneArgument(const ColumnWithTypeAndName & argument, const String & function_name, IntervalKind & interval_kind, bool & result_type_is_date)
+{
+    if (WhichDataType(argument.type).isString())
+    {
+        checkTimeZoneArgument(argument, function_name);
+        return false;
+    }
+    checkIntervalArgument(argument, function_name, interval_kind, result_type_is_date);
+    return true;
+}
+
+enum TimeWindowFunctionName
+{
+    TUMBLE,
+    TUMBLE_START,
+    TUMBLE_END,
+    HOP,
+    HOP_START,
+    HOP_END,
+    WINDOW_ID
+};
+
+template <TimeWindowFunctionName type>
+struct TimeWindowImpl
+{
+    static constexpr auto name = "UNKNOWN";
+
+    static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name);
+
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name);
+};
+
+template <TimeWindowFunctionName type>
+class FunctionTimeWindow : public IFunction
+{
+public:
+    static constexpr auto name = TimeWindowImpl<type>::name;
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTimeWindow>(); }
+    String getName() const override { return name; }
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override;
+};
+
+using FunctionTumble = FunctionTimeWindow<TUMBLE>;
+using FunctionTumbleStart = FunctionTimeWindow<TUMBLE_START>;
+using FunctionTumbleEnd = FunctionTimeWindow<TUMBLE_END>;
+using FunctionHop = FunctionTimeWindow<HOP>;
+using FunctionWindowId = FunctionTimeWindow<WINDOW_ID>;
+using FunctionHopStart = FunctionTimeWindow<HOP_START>;
+using FunctionHopEnd = FunctionTimeWindow<HOP_END>;
+
+
 template <>
 struct TimeWindowImpl<TUMBLE>
 {
@@ -159,29 +210,23 @@ struct TimeWindowImpl<TUMBLE>
 
         switch (std::get<0>(interval))
         {
-                //TODO: add proper support for fractional seconds
-//            case IntervalKind::Nanosecond:
-//                return executeTumble<UInt32, IntervalKind::Nanosecond>(*time_column_vec, std::get<1>(interval), time_zone);
-//            case IntervalKind::Microsecond:
-//                return executeTumble<UInt32, IntervalKind::Microsecond>(*time_column_vec, std::get<1>(interval), time_zone);
-//            case IntervalKind::Millisecond:
-//                return executeTumble<UInt32, IntervalKind::Millisecond>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Second:
-                return executeTumble<UInt32, IntervalKind::Second>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Minute:
-                return executeTumble<UInt32, IntervalKind::Minute>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Hour:
-                return executeTumble<UInt32, IntervalKind::Hour>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Day:
-                return executeTumble<UInt32, IntervalKind::Day>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Week:
-                return executeTumble<UInt16, IntervalKind::Week>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Month:
-                return executeTumble<UInt16, IntervalKind::Month>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Quarter:
-                return executeTumble<UInt16, IntervalKind::Quarter>(*time_column_vec, std::get<1>(interval), time_zone);
-            case IntervalKind::Year:
-                return executeTumble<UInt16, IntervalKind::Year>(*time_column_vec, std::get<1>(interval), time_zone);
+            /// TODO: add proper support for fractional seconds
+            case IntervalKind::Kind::Second:
+                return executeTumble<UInt32, IntervalKind::Kind::Second>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Minute:
+                return executeTumble<UInt32, IntervalKind::Kind::Minute>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Hour:
+                return executeTumble<UInt32, IntervalKind::Kind::Hour>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Day:
+                return executeTumble<UInt32, IntervalKind::Kind::Day>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Week:
+                return executeTumble<UInt16, IntervalKind::Kind::Week>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Month:
+                return executeTumble<UInt16, IntervalKind::Kind::Month>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Quarter:
+                return executeTumble<UInt16, IntervalKind::Kind::Quarter>(*time_column_vec, std::get<1>(interval), time_zone);
+            case IntervalKind::Kind::Year:
+                return executeTumble<UInt16, IntervalKind::Kind::Year>(*time_column_vec, std::get<1>(interval), time_zone);
             default:
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "Fraction seconds are unsupported by windows yet");
         }
@@ -347,39 +392,30 @@ struct TimeWindowImpl<HOP>
 
         switch (std::get<0>(window_interval))
         {
-                //TODO: add proper support for fractional seconds
-//            case IntervalKind::Nanosecond:
-//                return executeHop<UInt32, IntervalKind::Nanosecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-//            case IntervalKind::Microsecond:
-//                return executeHop<UInt32, IntervalKind::Microsecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-//            case IntervalKind::Millisecond:
-//                return executeHop<UInt32, IntervalKind::Millisecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Second:
-                return executeHop<UInt32, IntervalKind::Second>(
+            /// TODO: add proper support for fractional seconds
+            case IntervalKind::Kind::Second:
+                return executeHop<UInt32, IntervalKind::Kind::Second>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Minute:
-                return executeHop<UInt32, IntervalKind::Minute>(
+            case IntervalKind::Kind::Minute:
+                return executeHop<UInt32, IntervalKind::Kind::Minute>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Hour:
-                return executeHop<UInt32, IntervalKind::Hour>(
+            case IntervalKind::Kind::Hour:
+                return executeHop<UInt32, IntervalKind::Kind::Hour>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Day:
-                return executeHop<UInt32, IntervalKind::Day>(
+            case IntervalKind::Kind::Day:
+                return executeHop<UInt32, IntervalKind::Kind::Day>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Week:
-                return executeHop<UInt16, IntervalKind::Week>(
+            case IntervalKind::Kind::Week:
+                return executeHop<UInt16, IntervalKind::Kind::Week>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Month:
-                return executeHop<UInt16, IntervalKind::Month>(
+            case IntervalKind::Kind::Month:
+                return executeHop<UInt16, IntervalKind::Kind::Month>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Quarter:
-                return executeHop<UInt16, IntervalKind::Quarter>(
+            case IntervalKind::Kind::Quarter:
+                return executeHop<UInt16, IntervalKind::Kind::Quarter>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Year:
-                return executeHop<UInt16, IntervalKind::Year>(
+            case IntervalKind::Kind::Year:
+                return executeHop<UInt16, IntervalKind::Kind::Year>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             default:
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "Fraction seconds are unsupported by windows yet");
@@ -407,6 +443,9 @@ struct TimeWindowImpl<HOP>
             wstart = AddTime<kind>::execute(wend, -window_num_units, time_zone);
             ToType wend_latest;
 
+            if (wstart > wend)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time overflow in function {}", name);
+
             do
             {
                 wend_latest = wend;
@@ -428,7 +467,7 @@ struct TimeWindowImpl<WINDOW_ID>
 {
     static constexpr auto name = "windowID";
 
-    [[maybe_unused]] static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         bool result_type_is_date;
         IntervalKind interval_kind_1;
@@ -470,8 +509,7 @@ struct TimeWindowImpl<WINDOW_ID>
             return std::make_shared<DataTypeUInt32>();
     }
 
-    [[maybe_unused]] static ColumnPtr
-    dispatchForHopColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static ColumnPtr dispatchForHopColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto & hop_interval_column = arguments[1];
@@ -492,39 +530,30 @@ struct TimeWindowImpl<WINDOW_ID>
 
         switch (std::get<0>(window_interval))
         {
-                //TODO: add proper support for fractional seconds
-//            case IntervalKind::Nanosecond:
-//                return executeHopSlice<UInt32, IntervalKind::Nanosecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-//            case IntervalKind::Microsecond:
-//                return executeHopSlice<UInt32, IntervalKind::Microsecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-//            case IntervalKind::Millisecond:
-//                return executeHopSlice<UInt32, IntervalKind::Millisecond>(
-//                    *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Second:
-                return executeHopSlice<UInt32, IntervalKind::Second>(
+            /// TODO: add proper support for fractional seconds
+            case IntervalKind::Kind::Second:
+                return executeHopSlice<UInt32, IntervalKind::Kind::Second>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Minute:
-                return executeHopSlice<UInt32, IntervalKind::Minute>(
+            case IntervalKind::Kind::Minute:
+                return executeHopSlice<UInt32, IntervalKind::Kind::Minute>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Hour:
-                return executeHopSlice<UInt32, IntervalKind::Hour>(
+            case IntervalKind::Kind::Hour:
+                return executeHopSlice<UInt32, IntervalKind::Kind::Hour>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Day:
-                return executeHopSlice<UInt32, IntervalKind::Day>(
+            case IntervalKind::Kind::Day:
+                return executeHopSlice<UInt32, IntervalKind::Kind::Day>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Week:
-                return executeHopSlice<UInt16, IntervalKind::Week>(
+            case IntervalKind::Kind::Week:
+                return executeHopSlice<UInt16, IntervalKind::Kind::Week>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Month:
-                return executeHopSlice<UInt16, IntervalKind::Month>(
+            case IntervalKind::Kind::Month:
+                return executeHopSlice<UInt16, IntervalKind::Kind::Month>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Quarter:
-                return executeHopSlice<UInt16, IntervalKind::Quarter>(
+            case IntervalKind::Kind::Quarter:
+                return executeHopSlice<UInt16, IntervalKind::Kind::Quarter>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
-            case IntervalKind::Year:
-                return executeHopSlice<UInt16, IntervalKind::Year>(
+            case IntervalKind::Kind::Year:
+                return executeHopSlice<UInt16, IntervalKind::Kind::Year>(
                     *time_column_vec, std::get<1>(hop_interval), std::get<1>(window_interval), time_zone);
             default:
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "Fraction seconds are unsupported by windows yet");
@@ -550,6 +579,9 @@ struct TimeWindowImpl<WINDOW_ID>
             ToType wend = AddTime<kind>::execute(wstart, hop_num_units, time_zone);
             ToType wend_latest;
 
+            if (wstart > wend)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Time overflow in function {}", name);
+
             do
             {
                 wend_latest = wend;
@@ -561,14 +593,13 @@ struct TimeWindowImpl<WINDOW_ID>
         return end;
     }
 
-    [[maybe_unused]] static ColumnPtr
-    dispatchForTumbleColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static ColumnPtr dispatchForTumbleColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         ColumnPtr column = TimeWindowImpl<TUMBLE>::dispatchForColumns(arguments, function_name);
         return executeWindowBound(column, 1, function_name);
     }
 
-    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         if (arguments.size() == 2)
             return dispatchForTumbleColumns(arguments, function_name);
@@ -608,7 +639,7 @@ struct TimeWindowImpl<HOP_START>
         }
     }
 
-    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -631,12 +662,12 @@ struct TimeWindowImpl<HOP_END>
 {
     static constexpr auto name = "hopEnd";
 
-    [[maybe_unused]] static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         return TimeWindowImpl<HOP_START>::getReturnType(arguments, function_name);
     }
 
-    [[maybe_unused]] static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
+    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name)
     {
         const auto & time_column = arguments[0];
         const auto which_type = WhichDataType(time_column.type);
@@ -667,6 +698,8 @@ ColumnPtr FunctionTimeWindow<type>::executeImpl(const ColumnsWithTypeAndName & a
     return TimeWindowImpl<type>::dispatchForColumns(arguments, name);
 }
 
+}
+
 REGISTER_FUNCTION(TimeWindow)
 {
     factory.registerFunction<FunctionTumble>();
diff --git a/src/Functions/FunctionsTimeWindow.h b/src/Functions/FunctionsTimeWindow.h
index 4346e691046..6183d25c8bd 100644
--- a/src/Functions/FunctionsTimeWindow.h
+++ b/src/Functions/FunctionsTimeWindow.h
@@ -1,8 +1,11 @@
 #pragma once
 
-#include <Common/DateLUT.h>
+#include <Core/DecimalFunctions.h>
 #include <DataTypes/DataTypeInterval.h>
 #include <Functions/IFunction.h>
+#include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
+
 
 namespace DB
 {
@@ -10,43 +13,23 @@ namespace DB
 /** Time window functions:
   *
   * tumble(time_attr, interval [, timezone])
-  *
   * tumbleStart(window_id)
-  *
   * tumbleStart(time_attr, interval [, timezone])
-  *
   * tumbleEnd(window_id)
-  *
   * tumbleEnd(time_attr, interval [, timezone])
-  *
   * hop(time_attr, hop_interval, window_interval [, timezone])
-  *
   * hopStart(window_id)
-  *
   * hopStart(time_attr, hop_interval, window_interval [, timezone])
-  *
   * hopEnd(window_id)
-  *
   * hopEnd(time_attr, hop_interval, window_interval [, timezone])
-  *
   */
-enum TimeWindowFunctionName
-{
-    TUMBLE,
-    TUMBLE_START,
-    TUMBLE_END,
-    HOP,
-    HOP_START,
-    HOP_END,
-    WINDOW_ID
-};
 
 template <IntervalKind::Kind unit>
 struct ToStartOfTransform;
 
 #define TRANSFORM_DATE(INTERVAL_KIND) \
     template <> \
-    struct ToStartOfTransform<IntervalKind::INTERVAL_KIND> \
+    struct ToStartOfTransform<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static auto execute(UInt32 t, UInt64 delta, const DateLUTImpl & time_zone) \
         { \
@@ -60,7 +43,7 @@ struct ToStartOfTransform;
 #undef TRANSFORM_DATE
 
     template <>
-    struct ToStartOfTransform<IntervalKind::Day>
+    struct ToStartOfTransform<IntervalKind::Kind::Day>
     {
         static UInt32 execute(UInt32 t, UInt64 delta, const DateLUTImpl & time_zone)
         {
@@ -70,7 +53,7 @@ struct ToStartOfTransform;
 
 #define TRANSFORM_TIME(INTERVAL_KIND) \
     template <> \
-    struct ToStartOfTransform<IntervalKind::INTERVAL_KIND> \
+    struct ToStartOfTransform<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static UInt32 execute(UInt32 t, UInt64 delta, const DateLUTImpl & time_zone) \
         { \
@@ -84,13 +67,13 @@ struct ToStartOfTransform;
 
 #define TRANSFORM_SUBSECONDS(INTERVAL_KIND, DEF_SCALE) \
 template<> \
-    struct ToStartOfTransform<IntervalKind::INTERVAL_KIND> \
+    struct ToStartOfTransform<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static Int64 execute(Int64 t, UInt64 delta, const UInt32 scale) \
         { \
-            if (scale <= DEF_SCALE) \
+            if (scale <= (DEF_SCALE)) \
             { \
-                auto val = t * DecimalUtils::scaleMultiplier<DateTime64>(DEF_SCALE - scale); \
+                auto val = t * DecimalUtils::scaleMultiplier<DateTime64>((DEF_SCALE) - scale); \
                 if (delta == 1) \
                     return val; \
                 else \
@@ -98,7 +81,7 @@ template<> \
             } \
             else \
             { \
-                return t - (t % (delta * DecimalUtils::scaleMultiplier<DateTime64>(scale - DEF_SCALE))) ; \
+                return t - (t % (delta * DecimalUtils::scaleMultiplier<DateTime64>(scale - (DEF_SCALE)))) ; \
             } \
         } \
     };
@@ -112,7 +95,7 @@ template<> \
 
 #define ADD_DATE(INTERVAL_KIND) \
     template <> \
-    struct AddTime<IntervalKind::INTERVAL_KIND> \
+    struct AddTime<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static inline auto execute(UInt16 d, Int64 delta, const DateLUTImpl & time_zone) \
         { \
@@ -125,7 +108,7 @@ template<> \
 #undef ADD_DATE
 
     template <>
-    struct AddTime<IntervalKind::Week>
+    struct AddTime<IntervalKind::Kind::Week>
     {
         static inline NO_SANITIZE_UNDEFINED ExtendedDayNum execute(UInt16 d, UInt64 delta, const DateLUTImpl &)
         {
@@ -135,10 +118,10 @@ template<> \
 
 #define ADD_TIME(INTERVAL_KIND, INTERVAL) \
     template <> \
-    struct AddTime<IntervalKind::INTERVAL_KIND> \
+    struct AddTime<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static inline NO_SANITIZE_UNDEFINED UInt32 execute(UInt32 t, Int64 delta, const DateLUTImpl &) \
-        { return static_cast<UInt32>(t + delta * INTERVAL); } \
+        { return static_cast<UInt32>(t + delta * (INTERVAL)); } \
     };
     ADD_TIME(Day, 86400)
     ADD_TIME(Hour, 3600)
@@ -148,16 +131,16 @@ template<> \
 
 #define ADD_SUBSECONDS(INTERVAL_KIND, DEF_SCALE) \
 template <> \
-    struct AddTime<IntervalKind::INTERVAL_KIND> \
+    struct AddTime<IntervalKind::Kind::INTERVAL_KIND> \
     { \
         static inline NO_SANITIZE_UNDEFINED Int64 execute(Int64 t, UInt64 delta, const UInt32 scale) \
         { \
-            if (scale < DEF_SCALE) \
+            if (scale < (DEF_SCALE)) \
             { \
-                return t + delta * DecimalUtils::scaleMultiplier<DateTime64>(DEF_SCALE - scale); \
+                return t + delta * DecimalUtils::scaleMultiplier<DateTime64>((DEF_SCALE) - scale); \
             } \
             else \
-                return t + delta * DecimalUtils::scaleMultiplier<DateTime64>(scale - DEF_SCALE); \
+                return t + delta * DecimalUtils::scaleMultiplier<DateTime64>(scale - (DEF_SCALE)); \
         } \
     };
     ADD_SUBSECONDS(Millisecond, 3)
@@ -165,39 +148,4 @@ template <> \
     ADD_SUBSECONDS(Nanosecond, 9)
 #undef ADD_SUBSECONDS
 
-template <TimeWindowFunctionName type>
-struct TimeWindowImpl
-{
-    static constexpr auto name = "UNKNOWN";
-
-    static DataTypePtr getReturnType(const ColumnsWithTypeAndName & arguments, const String & function_name);
-
-    static ColumnPtr dispatchForColumns(const ColumnsWithTypeAndName & arguments, const String & function_name);
-};
-
-template <TimeWindowFunctionName type>
-class FunctionTimeWindow : public IFunction
-{
-public:
-    static constexpr auto name = TimeWindowImpl<type>::name;
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionTimeWindow>(); }
-    String getName() const override { return name; }
-    bool isVariadic() const override { return true; }
-    size_t getNumberOfArguments() const override { return 0; }
-    bool useDefaultImplementationForConstants() const override { return true; }
-    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return true; }
-
-    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t /*input_rows_count*/) const override;
-};
-
-using FunctionTumble = FunctionTimeWindow<TUMBLE>;
-using FunctionTumbleStart = FunctionTimeWindow<TUMBLE_START>;
-using FunctionTumbleEnd = FunctionTimeWindow<TUMBLE_END>;
-using FunctionHop = FunctionTimeWindow<HOP>;
-using FunctionWindowId = FunctionTimeWindow<WINDOW_ID>;
-using FunctionHopStart = FunctionTimeWindow<HOP_START>;
-using FunctionHopEnd = FunctionTimeWindow<HOP_END>;
 }
diff --git a/src/Functions/GatherUtils/Selectors.h b/src/Functions/GatherUtils/Selectors.h
index 00367727a39..1f933c13ba0 100644
--- a/src/Functions/GatherUtils/Selectors.h
+++ b/src/Functions/GatherUtils/Selectors.h
@@ -126,19 +126,19 @@ struct ArrayAndValueSourceSelectorBySink : public ArraySinkSelector<ArrayAndValu
     template <typename Sink, typename ... Args>
     static void selectImpl(Sink && sink, IArraySource & array_source, IValueSource & value_source, Args && ... args)
     {
-        using SynkType = typename std::decay<Sink>::type;
-        using ArraySource = typename SynkType::CompatibleArraySource;
-        using ValueSource = typename SynkType::CompatibleValueSource;
+        using SinkType = typename std::decay_t<Sink>;
+        using ArraySource = typename SinkType::CompatibleArraySource;
+        using ValueSource = typename SinkType::CompatibleValueSource;
 
         auto check_type = [] (auto source_ptr)
         {
             if (source_ptr == nullptr)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "{} expected {} or {} or {} or {} but got {}",
                                 demangle(typeid(Base).name()),
-                                demangle(typeid(typename SynkType::CompatibleArraySource).name()),
-                                demangle(typeid(ConstSource<typename SynkType::CompatibleArraySource>).name()),
-                                demangle(typeid(typename SynkType::CompatibleValueSource).name()),
-                                demangle(typeid(ConstSource<typename SynkType::CompatibleValueSource>).name()),
+                                demangle(typeid(typename SinkType::CompatibleArraySource).name()),
+                                demangle(typeid(ConstSource<typename SinkType::CompatibleArraySource>).name()),
+                                demangle(typeid(typename SinkType::CompatibleValueSource).name()),
+                                demangle(typeid(ConstSource<typename SinkType::CompatibleValueSource>).name()),
                                 demangle(typeid(*source_ptr).name()));
         };
         auto check_type_and_call_concat = [& sink, & check_type, & args ...] (auto array_source_ptr, auto value_source_ptr)
diff --git a/src/Functions/GatherUtils/Sources.h b/src/Functions/GatherUtils/Sources.h
index 222f9f19168..4e3009a695d 100644
--- a/src/Functions/GatherUtils/Sources.h
+++ b/src/Functions/GatherUtils/Sources.h
@@ -140,9 +140,11 @@ struct NumericArraySource : public ArraySourceImpl<NumericArraySource<T>>
 
 
 /// The methods can be virtual or not depending on the template parameter. See IStringSource.
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wsuggest-override"
-#pragma GCC diagnostic ignored "-Wsuggest-destructor-override"
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wsuggest-override"
+#pragma clang diagnostic ignored "-Wsuggest-destructor-override"
+
+/// NOLINTBEGIN(hicpp-use-override, modernize-use-override)
 
 template <typename Base>
 struct ConstSource : public Base
@@ -231,7 +233,9 @@ struct ConstSource : public Base
     }
 };
 
-#pragma GCC diagnostic pop
+/// NOLINTEND(hicpp-use-override, modernize-use-override)
+
+#pragma clang diagnostic pop
 
 struct StringSource
 {
diff --git a/src/Functions/GregorianDate.h b/src/Functions/GregorianDate.h
index 2528223443e..fb00e4276b6 100644
--- a/src/Functions/GregorianDate.h
+++ b/src/Functions/GregorianDate.h
@@ -13,7 +13,7 @@ class WriteBuffer;
 class GregorianDate
 {
 public:
-    GregorianDate() {}
+    GregorianDate() = default;
 
     void init(ReadBuffer & in);
     bool tryInit(ReadBuffer & in);
@@ -84,7 +84,7 @@ private:
 class OrdinalDate
 {
 public:
-    OrdinalDate() {}
+    OrdinalDate() = default;
 
     void init(int32_t year, uint16_t day_of_year);
     bool tryInit(int32_t year, uint16_t day_of_year);
diff --git a/src/Functions/HasSubsequenceImpl.h b/src/Functions/HasSubsequenceImpl.h
index 17955746aa2..630a2afb720 100644
--- a/src/Functions/HasSubsequenceImpl.h
+++ b/src/Functions/HasSubsequenceImpl.h
@@ -14,8 +14,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
 }
-namespace
-{
 
 using namespace GatherUtils;
 
@@ -154,5 +152,3 @@ private:
 };
 
 }
-
-}
diff --git a/src/Functions/IFunction.cpp b/src/Functions/IFunction.cpp
index a46f4d2a11d..d4c6b8f4ba6 100644
--- a/src/Functions/IFunction.cpp
+++ b/src/Functions/IFunction.cpp
@@ -313,7 +313,7 @@ ColumnPtr IExecutableFunction::execute(const ColumnsWithTypeAndName & arguments,
 {
     bool use_default_implementation_for_sparse_columns = useDefaultImplementationForSparseColumns();
     /// DataTypeFunction does not support obtaining default (isDefaultAt())
-    /// ColumnFunction does not support getting specific values
+    /// ColumnFunction does not support getting specific values.
     if (result_type->getTypeId() != TypeIndex::Function && use_default_implementation_for_sparse_columns)
     {
         size_t num_sparse_columns = 0;
@@ -368,7 +368,7 @@ ColumnPtr IExecutableFunction::execute(const ColumnsWithTypeAndName & arguments,
             if (!result_type->canBeInsideSparseColumns() || !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);
+                return res->createWithOffsets(offsets_data, *createColumnConst(res, 0), input_rows_count, /*shift=*/ 1);
             }
 
             return ColumnSparse::create(res, sparse_offsets, input_rows_count);
diff --git a/src/Functions/IFunction.h b/src/Functions/IFunction.h
index 18932bf93fb..9b7cdf12d57 100644
--- a/src/Functions/IFunction.h
+++ b/src/Functions/IFunction.h
@@ -13,10 +13,6 @@
 
 #include <memory>
 
-#if USE_EMBEDDED_COMPILER
-#    include <Core/ValuesWithType.h>
-#endif
-
 /// This file contains user interface for functions.
 
 namespace llvm
@@ -244,9 +240,11 @@ public:
 
     struct ShortCircuitSettings
     {
-        /// Should we enable lazy execution for the first argument of short-circuit function?
-        /// Example: if(cond, then, else), we don't need to execute cond lazily.
-        bool enable_lazy_execution_for_first_argument;
+        /// Should we enable lazy execution for the nth argument of short-circuit function?
+        /// Example 1st argument: if(cond, then, else), we don't need to execute cond lazily.
+        /// Example other arguments: 1st, 2nd, 3rd argument of dictGetOrDefault should always be calculated.
+        std::unordered_set<size_t> arguments_with_disabled_lazy_execution;
+
         /// Should we enable lazy execution for functions, that are common descendants of
         /// different short-circuit function arguments?
         /// Example 1: if (cond, expr1(..., expr, ...), expr2(..., expr, ...)), we don't need
diff --git a/src/Functions/IsOperation.h b/src/Functions/IsOperation.h
index 8ea53c865ce..a74df8f4dd9 100644
--- a/src/Functions/IsOperation.h
+++ b/src/Functions/IsOperation.h
@@ -51,8 +51,8 @@ struct IsOperation
     static constexpr bool minus = IsSameOperation<Op, MinusImpl>::value;
     static constexpr bool multiply = IsSameOperation<Op, MultiplyImpl>::value;
     static constexpr bool div_floating = IsSameOperation<Op, DivideFloatingImpl>::value;
-    static constexpr bool div_int = IsSameOperation<Op, DivideIntegralImpl>::value;
-    static constexpr bool div_int_or_zero = IsSameOperation<Op, DivideIntegralOrZeroImpl>::value;
+    static constexpr bool int_div = IsSameOperation<Op, DivideIntegralImpl>::value;
+    static constexpr bool int_div_or_zero = IsSameOperation<Op, DivideIntegralOrZeroImpl>::value;
     static constexpr bool modulo = IsSameOperation<Op, ModuloImpl>::value;
     static constexpr bool positive_modulo = IsSameOperation<Op, PositiveModuloImpl>::value;
     static constexpr bool least = IsSameOperation<Op, LeastBaseImpl>::value;
@@ -60,8 +60,8 @@ struct IsOperation
 
     static constexpr bool bit_hamming_distance = IsSameOperation<Op, BitHammingDistanceImpl>::value;
 
-    static constexpr bool division = div_floating || div_int || div_int_or_zero || modulo;
-
+    static constexpr bool division = div_floating || int_div || int_div_or_zero || modulo;
+    // NOTE: allow_decimal should not fully contain `division` because of divInt
     static constexpr bool allow_decimal = plus || minus || multiply || division || least || greatest;
 };
 
diff --git a/src/Functions/JSONArrayLength.cpp b/src/Functions/JSONArrayLength.cpp
index a82c50360f9..84e87061398 100644
--- a/src/Functions/JSONArrayLength.cpp
+++ b/src/Functions/JSONArrayLength.cpp
@@ -45,7 +45,7 @@ namespace
         DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
         {
             auto args = FunctionArgumentDescriptors{
-                {"json", &isString<IDataType>, nullptr, "String"},
+                {"json", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
             };
 
             validateFunctionArgumentTypes(*this, arguments, args);
diff --git a/src/Functions/JSONPath/Generator/GeneratorJSONPath.h b/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
index de62be98d31..1016d776be0 100644
--- a/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
+++ b/src/Functions/JSONPath/Generator/GeneratorJSONPath.h
@@ -35,7 +35,7 @@ public:
         }
         const auto * query = path->jsonpath_query;
 
-        for (auto child_ast : query->children)
+        for (const auto & child_ast : query->children)
         {
             if (typeid_cast<ASTJSONPathRoot *>(child_ast.get()))
             {
diff --git a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
index 03c006774c0..fb74018b330 100644
--- a/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
+++ b/src/Functions/JSONPath/Parsers/ParserJSONPathRange.cpp
@@ -55,7 +55,7 @@ bool ParserJSONPathRange::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
         }
         else if (pos->type == TokenType::BareWord)
         {
-            if (!ParserKeyword("TO").ignore(pos, expected))
+            if (!ParserKeyword(Keyword::TO).ignore(pos, expected))
             {
                 return false;
             }
diff --git a/src/Functions/LowerUpperUTF8Impl.h b/src/Functions/LowerUpperUTF8Impl.h
index 460f75f9bde..7ca98166576 100644
--- a/src/Functions/LowerUpperUTF8Impl.h
+++ b/src/Functions/LowerUpperUTF8Impl.h
@@ -174,7 +174,7 @@ private:
 
     static void array(const UInt8 * src, const UInt8 * src_end, const ColumnString::Offsets & offsets, UInt8 * dst)
     {
-        auto offset_it = offsets.begin();
+        const auto * offset_it = offsets.begin();
         const UInt8 * begin = src;
 
 #ifdef __SSE2__
diff --git a/src/Functions/URL/URLHierarchy.cpp b/src/Functions/URL/URLHierarchy.cpp
index 25c6c9ef40b..a0c78c5c1a2 100644
--- a/src/Functions/URL/URLHierarchy.cpp
+++ b/src/Functions/URL/URLHierarchy.cpp
@@ -24,10 +24,12 @@ public:
     static bool isVariadic() { return false; }
     static size_t getNumberOfArguments() { return 1; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"URL", &isString<IDataType>, nullptr, "String"},
+            {"URL", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
         };
 
         validateFunctionArgumentTypes(func, arguments, mandatory_args);
diff --git a/src/Functions/URL/URLPathHierarchy.cpp b/src/Functions/URL/URLPathHierarchy.cpp
index 9a60d4cf989..8f546ef6a56 100644
--- a/src/Functions/URL/URLPathHierarchy.cpp
+++ b/src/Functions/URL/URLPathHierarchy.cpp
@@ -22,10 +22,12 @@ public:
     static bool isVariadic() { return false; }
     static size_t getNumberOfArguments() { return 1; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"URL", &isString<IDataType>, nullptr, "String"},
+            {"URL", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
         };
 
         validateFunctionArgumentTypes(func, arguments, mandatory_args);
diff --git a/src/Functions/URL/domain.h b/src/Functions/URL/domain.h
index f38f106e9a2..87f5aeffda7 100644
--- a/src/Functions/URL/domain.h
+++ b/src/Functions/URL/domain.h
@@ -88,7 +88,7 @@ exloop: if ((scheme_end - pos) > 2 && *pos == ':' && *(pos + 1) == '/' && *(pos
     const auto * start_of_host = pos;
     for (; pos < end; ++pos)
     {
-        switch (*pos)
+        switch (*pos) /// NOLINT(bugprone-switch-missing-default-case)
         {
         case '.':
             if (has_open_bracket)
@@ -220,7 +220,7 @@ exloop: if ((scheme_end - pos) > 2 && *pos == ':' && *(pos + 1) == '/' && *(pos
     const auto * start_of_host = pos;
     for (; pos < end; ++pos)
     {
-        switch (*pos)
+        switch (*pos) /// NOLINT(bugprone-switch-missing-default-case)
         {
         case '.':
             dot_pos = pos;
diff --git a/src/Functions/URL/extractURLParameterNames.cpp b/src/Functions/URL/extractURLParameterNames.cpp
index 08da148b43e..16ace36d39b 100644
--- a/src/Functions/URL/extractURLParameterNames.cpp
+++ b/src/Functions/URL/extractURLParameterNames.cpp
@@ -22,10 +22,12 @@ public:
     static bool isVariadic() { return false; }
     static size_t getNumberOfArguments() { return 1; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"URL", &isString<IDataType>, nullptr, "String"},
+            {"URL", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
         };
 
         validateFunctionArgumentTypes(func, arguments, mandatory_args);
diff --git a/src/Functions/URL/extractURLParameters.cpp b/src/Functions/URL/extractURLParameters.cpp
index 939622dd9d1..43079834872 100644
--- a/src/Functions/URL/extractURLParameters.cpp
+++ b/src/Functions/URL/extractURLParameters.cpp
@@ -23,10 +23,12 @@ public:
     static bool isVariadic() { return false; }
     static size_t getNumberOfArguments() { return 1; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"URL", &isString<IDataType>, nullptr, "String"},
+            {"URL", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
         };
 
         validateFunctionArgumentTypes(func, arguments, mandatory_args);
diff --git a/src/Functions/UniqTheta/FunctionsUniqTheta.h b/src/Functions/UniqTheta/FunctionsUniqTheta.h
index 2d616841c7f..c312dcc09f5 100644
--- a/src/Functions/UniqTheta/FunctionsUniqTheta.h
+++ b/src/Functions/UniqTheta/FunctionsUniqTheta.h
@@ -137,8 +137,8 @@ namespace DB
 
             for (size_t i = 0; i < input_rows_count; ++i)
             {
-                const AggregateDataPtr data_ptr_0 = is_column_const[0] ? container0[0] : container0[i];
-                const AggregateDataPtr data_ptr_1 = is_column_const[1] ? container1[0] : container1[i];
+                AggregateDataPtr data_ptr_0 = is_column_const[0] ? container0[0] : container0[i];
+                AggregateDataPtr data_ptr_1 = is_column_const[1] ? container1[0] : container1[i];
 
                 col_to->insertFrom(data_ptr_0);
                 AggregateFunctionUniqThetaData & sketch_data_1 = *reinterpret_cast<AggregateFunctionUniqThetaData *>(col_to->getData()[i]);
diff --git a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
index ca142479ff1..a4f17aa1201 100644
--- a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
+++ b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.cpp
@@ -95,12 +95,13 @@ namespace
 }
 
 ExternalUserDefinedExecutableFunctionsLoader::ExternalUserDefinedExecutableFunctionsLoader(ContextPtr global_context_)
-    : ExternalLoader("external user defined function", &Poco::Logger::get("ExternalUserDefinedExecutableFunctionsLoader"))
+    : ExternalLoader("external user defined function", getLogger("ExternalUserDefinedExecutableFunctionsLoader"))
     , WithContext(global_context_)
 {
     setConfigSettings({"function", "name", "database", "uuid"});
     enableAsyncLoading(false);
-    enablePeriodicUpdates(true);
+    if (getContext()->getApplicationType() == Context::ApplicationType::SERVER)
+        enablePeriodicUpdates(true);
     enableAlwaysLoadEverything(true);
 }
 
@@ -119,7 +120,7 @@ void ExternalUserDefinedExecutableFunctionsLoader::reloadFunction(const std::str
     loadOrReload(user_defined_function_name);
 }
 
-ExternalLoader::LoadablePtr ExternalUserDefinedExecutableFunctionsLoader::create(const std::string & name,
+ExternalLoader::LoadableMutablePtr ExternalUserDefinedExecutableFunctionsLoader::createObject(const std::string & name,
     const Poco::Util::AbstractConfiguration & config,
     const std::string & key_in_config,
     const std::string &) const
diff --git a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.h b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.h
index 1a62175eb0c..eb86986c391 100644
--- a/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.h
+++ b/src/Functions/UserDefined/ExternalUserDefinedExecutableFunctionsLoader.h
@@ -28,7 +28,7 @@ public:
     void reloadFunction(const std::string & user_defined_function_name) const;
 
 protected:
-    LoadablePtr create(const std::string & name,
+    LoadableMutablePtr createObject(const std::string & name,
         const Poco::Util::AbstractConfiguration & config,
         const std::string & key_in_config,
         const std::string & repository_name) const override;
diff --git a/src/Functions/UserDefined/UserDefinedExecutableFunction.h b/src/Functions/UserDefined/UserDefinedExecutableFunction.h
index 989f9dfe895..d48be215c7d 100644
--- a/src/Functions/UserDefined/UserDefinedExecutableFunction.h
+++ b/src/Functions/UserDefined/UserDefinedExecutableFunction.h
@@ -62,7 +62,7 @@ public:
         return true;
     }
 
-    std::shared_ptr<const IExternalLoadable> clone() const override
+    std::shared_ptr<IExternalLoadable> clone() const override
     {
         return std::make_shared<UserDefinedExecutableFunction>(configuration, coordinator, lifetime);
     }
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp b/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
index e37e4a23b63..e6796874e50 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionFactory.cpp
@@ -86,7 +86,7 @@ namespace
         auto & res = typeid_cast<ASTCreateFunctionQuery &>(*ptr);
         res.if_not_exists = false;
         res.or_replace = false;
-        FunctionNameNormalizer().visit(res.function_core.get());
+        FunctionNameNormalizer::visit(res.function_core.get());
         return ptr;
     }
 }
@@ -106,7 +106,7 @@ void UserDefinedSQLFunctionFactory::checkCanBeRegistered(const ContextPtr & cont
     if (AggregateFunctionFactory::instance().hasNameOrAlias(function_name))
         throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "The aggregate function '{}' already exists", function_name);
 
-    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context))
+    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context)) /// NOLINT(readability-static-accessed-through-instance)
         throw Exception(ErrorCodes::FUNCTION_ALREADY_EXISTS, "User defined executable function '{}' already exists", function_name);
 
     validateFunction(assert_cast<const ASTCreateFunctionQuery &>(create_function_query).function_core, function_name);
@@ -118,7 +118,7 @@ void UserDefinedSQLFunctionFactory::checkCanBeUnregistered(const ContextPtr & co
         AggregateFunctionFactory::instance().hasNameOrAlias(function_name))
         throw Exception(ErrorCodes::CANNOT_DROP_FUNCTION, "Cannot drop system function '{}'", function_name);
 
-    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context))
+    if (UserDefinedExecutableFunctionFactory::instance().has(function_name, context)) /// NOLINT(readability-static-accessed-through-instance)
         throw Exception(ErrorCodes::CANNOT_DROP_FUNCTION, "Cannot drop user defined executable function '{}'", function_name);
 }
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
index 360d1cdf76c..ebd65471449 100644
--- a/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLFunctionVisitor.cpp
@@ -30,6 +30,9 @@ void UserDefinedSQLFunctionVisitor::visit(ASTPtr & ast)
         return;
     }
 
+    /// FIXME: this helper should use updatePointerToChild(), but
+    /// forEachPointerToChild() is not implemented for ASTColumnDeclaration
+    /// (and also some members should be adjusted for this).
     const auto visit_child_with_shared_ptr = [&](ASTPtr & child)
     {
         if (!child)
@@ -86,22 +89,24 @@ void UserDefinedSQLFunctionVisitor::visit(ASTPtr & ast)
 
     if (auto * alter = ast->as<ASTAlterCommand>())
     {
-        visit_child_with_shared_ptr(alter->col_decl);
-        visit_child_with_shared_ptr(alter->column);
-        visit_child_with_shared_ptr(alter->partition);
-        visit_child_with_shared_ptr(alter->order_by);
-        visit_child_with_shared_ptr(alter->sample_by);
-        visit_child_with_shared_ptr(alter->index_decl);
-        visit_child_with_shared_ptr(alter->index);
-        visit_child_with_shared_ptr(alter->constraint_decl);
-        visit_child_with_shared_ptr(alter->constraint);
-        visit_child_with_shared_ptr(alter->projection_decl);
-        visit_child_with_shared_ptr(alter->projection);
-        visit_child_with_shared_ptr(alter->predicate);
-        visit_child_with_shared_ptr(alter->update_assignments);
-        visit_child_with_shared_ptr(alter->values);
-        visit_child_with_shared_ptr(alter->ttl);
-        visit_child_with_shared_ptr(alter->select);
+        /// It is OK to use updatePointerToChild() because ASTAlterCommand implements forEachPointerToChild()
+        const auto visit_child_update_parent = [&](ASTPtr & child)
+        {
+            if (!child)
+                return;
+
+            auto * old_ptr = child.get();
+            visit(child);
+            auto * 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);
+        };
+
+        for (auto & children : alter->children)
+            visit_child_update_parent(children);
 
         return;
     }
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
index 3ec5393fa6f..c15958f81c9 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsBackup.cpp
@@ -88,7 +88,7 @@ restoreUserDefinedSQLObjects(RestorerFromBackup & restorer, const String & data_
     auto backup = restorer.getBackup();
     fs::path data_path_in_backup_fs{data_path_in_backup};
 
-    Strings filenames = backup->listFiles(data_path_in_backup);
+    Strings filenames = backup->listFiles(data_path_in_backup, /*recursive*/ false);
     if (filenames.empty())
         return {}; /// Nothing to restore.
 
@@ -128,7 +128,7 @@ restoreUserDefinedSQLObjects(RestorerFromBackup & restorer, const String & data_
                     statement_def.data() + statement_def.size(),
                     "in file " + filepath + " from backup " + backup->getNameForLogging(),
                     0,
-                    context->getSettingsRef().max_parser_depth);
+                    context->getSettingsRef().max_parser_depth, context->getSettingsRef().max_parser_backtracks);
                 break;
             }
         }
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
index 271c464e79a..d874612ad04 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.cpp
@@ -54,9 +54,8 @@ namespace
 UserDefinedSQLObjectsDiskStorage::UserDefinedSQLObjectsDiskStorage(const ContextPtr & global_context_, const String & dir_path_)
     : global_context(global_context_)
     , dir_path{makeDirectoryPathCanonical(dir_path_)}
-    , log{&Poco::Logger::get("UserDefinedSQLObjectsLoaderFromDisk")}
+    , log{getLogger("UserDefinedSQLObjectsLoaderFromDisk")}
 {
-    createDirectory();
 }
 
 
@@ -92,7 +91,8 @@ ASTPtr UserDefinedSQLObjectsDiskStorage::tryLoadObject(UserDefinedSQLObjectType
                     object_create_query.data() + object_create_query.size(),
                     "",
                     0,
-                    global_context->getSettingsRef().max_parser_depth);
+                    global_context->getSettingsRef().max_parser_depth,
+                    global_context->getSettingsRef().max_parser_backtracks);
                 return ast;
             }
         }
@@ -121,7 +121,12 @@ void UserDefinedSQLObjectsDiskStorage::reloadObjects()
 void UserDefinedSQLObjectsDiskStorage::loadObjectsImpl()
 {
     LOG_INFO(log, "Loading user defined objects from {}", dir_path);
-    createDirectory();
+
+    if (!std::filesystem::exists(dir_path))
+    {
+        LOG_DEBUG(log, "The directory for user defined objects ({}) does not exist: nothing to load", dir_path);
+        return;
+    }
 
     std::vector<std::pair<String, ASTPtr>> function_names_and_queries;
 
@@ -156,7 +161,6 @@ void UserDefinedSQLObjectsDiskStorage::loadObjectsImpl()
 
 void UserDefinedSQLObjectsDiskStorage::reloadObject(UserDefinedSQLObjectType object_type, const String & object_name)
 {
-    createDirectory();
     auto ast = tryLoadObject(object_type, object_name);
     if (ast)
         setObject(object_name, *ast);
@@ -184,6 +188,7 @@ bool UserDefinedSQLObjectsDiskStorage::storeObjectImpl(
     bool replace_if_exists,
     const Settings & settings)
 {
+    createDirectory();
     String file_path = getFilePath(object_type, object_name);
     LOG_DEBUG(log, "Storing user-defined object {} to file {}", backQuote(object_name), file_path);
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
index f0986dbda72..ae0cbd0c589 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsDiskStorage.h
@@ -44,7 +44,7 @@ private:
 
     ContextPtr global_context;
     String dir_path;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<bool> objects_loaded = false;
 };
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
index 4f47a46b10d..f251d11789f 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsStorageBase.cpp
@@ -23,7 +23,7 @@ ASTPtr normalizeCreateFunctionQuery(const IAST & create_function_query)
     auto & res = typeid_cast<ASTCreateFunctionQuery &>(*ptr);
     res.if_not_exists = false;
     res.or_replace = false;
-    FunctionNameNormalizer().visit(res.function_core.get());
+    FunctionNameNormalizer::visit(res.function_core.get());
     return ptr;
 }
 
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
index 6e5a5338437..4ec34c15efc 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.cpp
@@ -53,7 +53,7 @@ UserDefinedSQLObjectsZooKeeperStorage::UserDefinedSQLObjectsZooKeeperStorage(
     , 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")}
+    , log{getLogger("UserDefinedSQLObjectsLoaderFromZooKeeper")}
 {
     if (zookeeper_path.empty())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "ZooKeeper path must be non-empty");
@@ -314,7 +314,8 @@ ASTPtr UserDefinedSQLObjectsZooKeeperStorage::parseObjectData(const String & obj
                 object_data.data() + object_data.size(),
                 "",
                 0,
-                global_context->getSettingsRef().max_parser_depth);
+                global_context->getSettingsRef().max_parser_depth,
+                global_context->getSettingsRef().max_parser_backtracks);
             return ast;
         }
     }
diff --git a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
index 9f41763c59c..61002be2bfd 100644
--- a/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
+++ b/src/Functions/UserDefined/UserDefinedSQLObjectsZooKeeperStorage.h
@@ -80,7 +80,7 @@ private:
     using UserDefinedSQLObjectTypeAndName = std::pair<UserDefinedSQLObjectType, String>;
     std::shared_ptr<ConcurrentBoundedQueue<UserDefinedSQLObjectTypeAndName>> watch_queue;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Functions/addressToLine.cpp b/src/Functions/addressToLine.cpp
index 771c85cabf6..bb5edf2a07a 100644
--- a/src/Functions/addressToLine.cpp
+++ b/src/Functions/addressToLine.cpp
@@ -17,7 +17,7 @@ namespace DB
 namespace
 {
 
-class FunctionAddressToLine: public FunctionAddressToLineBase<StringRef, Dwarf::LocationInfoMode::FAST>
+class FunctionAddressToLine : public FunctionAddressToLineBase<StringRef, Dwarf::LocationInfoMode::FAST>
 {
 public:
     static constexpr auto name = "addressToLine";
diff --git a/src/Functions/alphaTokens.cpp b/src/Functions/alphaTokens.cpp
index 35cacdbdbb8..35f434e7498 100644
--- a/src/Functions/alphaTokens.cpp
+++ b/src/Functions/alphaTokens.cpp
@@ -32,6 +32,8 @@ public:
 
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {1}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/appendTrailingCharIfAbsent.cpp b/src/Functions/appendTrailingCharIfAbsent.cpp
index 7ff35e599be..a5554171aaa 100644
--- a/src/Functions/appendTrailingCharIfAbsent.cpp
+++ b/src/Functions/appendTrailingCharIfAbsent.cpp
@@ -1,9 +1,10 @@
 #include <Columns/ColumnString.h>
-#include <Common/assert_cast.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
+#include <base/range.h>
+#include <Common/assert_cast.h>
 
 
 namespace DB
diff --git a/src/Functions/array/FunctionArrayMapped.h b/src/Functions/array/FunctionArrayMapped.h
index 9773673c63c..5d6d70521b0 100644
--- a/src/Functions/array/FunctionArrayMapped.h
+++ b/src/Functions/array/FunctionArrayMapped.h
@@ -335,7 +335,11 @@ public:
                         && column_array->getOffsets() != typeid_cast<const ColumnArray::ColumnOffsets &>(*offsets_column).getData())
                         throw Exception(
                             ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                                "Arrays passed to {} must have equal size", getName());
+                            "Arrays passed to {} must have equal size. Argument {} has size {} which differs with the size of another argument, {}",
+                            getName(),
+                            i + 1,
+                            column_array->getOffsets().back(),  /// By the way, PODArray supports addressing -1th element.
+                            typeid_cast<const ColumnArray::ColumnOffsets &>(*offsets_column).getData().back());
                 }
 
                 const auto * column_tuple = checkAndGetColumn<ColumnTuple>(&column_array->getData());
@@ -351,7 +355,7 @@ public:
                     {
                         arrays.emplace_back(
                             column_tuple->getColumnPtr(j),
-                            recursiveRemoveLowCardinality(type_tuple.getElement(j)),
+                            type_tuple.getElement(j),
                             array_with_type_and_name.name + "." + tuple_names[j]);
                     }
                 }
@@ -359,7 +363,7 @@ public:
                 {
                     arrays.emplace_back(
                         column_array->getDataPtr(),
-                        recursiveRemoveLowCardinality(array_type->getNestedType()),
+                        array_type->getNestedType(),
                         array_with_type_and_name.name);
                 }
 
diff --git a/src/Functions/array/FunctionsMapMiscellaneous.cpp b/src/Functions/array/FunctionsMapMiscellaneous.cpp
index 157f2fa8a26..d92bfcf0bc6 100644
--- a/src/Functions/array/FunctionsMapMiscellaneous.cpp
+++ b/src/Functions/array/FunctionsMapMiscellaneous.cpp
@@ -213,6 +213,7 @@ struct MapToSubcolumnAdapter : public MapAdapterBase<MapToSubcolumnAdapter<Name,
 class FunctionMapKeyLike : public IFunction
 {
 public:
+    FunctionMapKeyLike() : impl(/*context*/ nullptr) {} /// nullptr because getting a context here is hard and FunctionLike doesn't need context
     String getName() const override { return "mapKeyLike"; }
     size_t getNumberOfArguments() const override { return 3; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
diff --git a/src/Functions/array/array.cpp b/src/Functions/array/array.cpp
index 551f0a6625b..03b51808799 100644
--- a/src/Functions/array/array.cpp
+++ b/src/Functions/array/array.cpp
@@ -4,6 +4,7 @@
 #include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnArray.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
@@ -14,9 +15,12 @@ class FunctionArray : public IFunction
 {
 public:
     static constexpr auto name = "array";
-    static FunctionPtr create(ContextPtr)
+
+    explicit FunctionArray(bool use_variant_as_common_type_ = false) : use_variant_as_common_type(use_variant_as_common_type_) {}
+
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionArray>();
+        return std::make_shared<FunctionArray>(context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type);
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
@@ -31,6 +35,9 @@ public:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
+        if (use_variant_as_common_type)
+            return std::make_shared<DataTypeArray>(getLeastSupertypeOrVariant(arguments));
+
         return std::make_shared<DataTypeArray>(getLeastSupertype(arguments));
     }
 
@@ -97,6 +104,8 @@ private:
     }
 
     bool addField(DataTypePtr type_res, const Field & f, Array & arr) const;
+
+    bool use_variant_as_common_type = false;
 };
 
 
diff --git a/src/Functions/array/arrayDistance.cpp b/src/Functions/array/arrayDistance.cpp
index c68c89ee0d5..6ed4bf24f99 100644
--- a/src/Functions/array/arrayDistance.cpp
+++ b/src/Functions/array/arrayDistance.cpp
@@ -1,6 +1,7 @@
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/IColumn.h>
+#include <Common/TargetSpecific.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/IDataType.h>
@@ -9,15 +10,19 @@
 #include <Functions/FunctionHelpers.h>
 #include <base/range.h>
 
+#if USE_MULTITARGET_CODE
+#include <immintrin.h>
+#endif
+
 namespace DB
 {
 namespace ErrorCodes
 {
+    extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int LOGICAL_ERROR;
     extern const int SIZES_OF_ARRAYS_DONT_MATCH;
-    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
 struct L1Distance
@@ -75,6 +80,51 @@ struct L2Distance
         state.sum += other_state.sum;
     }
 
+#if USE_MULTITARGET_CODE
+    template <typename ResultType>
+    AVX512_FUNCTION_SPECIFIC_ATTRIBUTE static void accumulateCombine(
+        const ResultType * __restrict data_x,
+        const ResultType * __restrict data_y,
+        size_t i_max,
+        size_t & i_x,
+        size_t & i_y,
+        State<ResultType> & state)
+    {
+        static constexpr bool is_float32 = std::is_same_v<ResultType, Float32>;
+
+        __m512 sums;
+        if constexpr (is_float32)
+            sums = _mm512_setzero_ps();
+        else
+            sums = _mm512_setzero_pd();
+
+        constexpr size_t n = is_float32 ? 16 : 8;
+
+        for (; i_x + n < i_max; i_x += n, i_y += n)
+        {
+            if constexpr (is_float32)
+            {
+                __m512 x = _mm512_loadu_ps(data_x + i_x);
+                __m512 y = _mm512_loadu_ps(data_y + i_y);
+                __m512 differences = _mm512_sub_ps(x, y);
+                sums = _mm512_fmadd_ps(differences, differences, sums);
+            }
+            else
+            {
+                __m512 x = _mm512_loadu_pd(data_x + i_x);
+                __m512 y = _mm512_loadu_pd(data_y + i_y);
+                __m512 differences = _mm512_sub_pd(x, y);
+                sums = _mm512_fmadd_pd(differences, differences, sums);
+            }
+        }
+
+        if constexpr (is_float32)
+            state.sum = _mm512_reduce_add_ps(sums);
+        else
+            state.sum = _mm512_reduce_add_pd(sums);
+    }
+#endif
+
     template <typename ResultType>
     static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
@@ -189,6 +239,72 @@ struct CosineDistance
         state.y_squared += other_state.y_squared;
     }
 
+#if USE_MULTITARGET_CODE
+    template <typename ResultType>
+    AVX512_FUNCTION_SPECIFIC_ATTRIBUTE static void accumulateCombine(
+        const ResultType * __restrict data_x,
+        const ResultType * __restrict data_y,
+        size_t i_max,
+        size_t & i_x,
+        size_t & i_y,
+        State<ResultType> & state)
+    {
+        static constexpr bool is_float32 = std::is_same_v<ResultType, Float32>;
+
+        __m512 dot_products;
+        __m512 x_squareds;
+        __m512 y_squareds;
+
+        if constexpr (is_float32)
+        {
+            dot_products = _mm512_setzero_ps();
+            x_squareds = _mm512_setzero_ps();
+            y_squareds = _mm512_setzero_ps();
+        }
+        else
+        {
+            dot_products = _mm512_setzero_pd();
+            x_squareds = _mm512_setzero_pd();
+            y_squareds = _mm512_setzero_pd();
+        }
+
+        constexpr size_t n = is_float32 ? 16 : 8;
+
+        for (; i_x + n < i_max; i_x += n, i_y += n)
+        {
+            if constexpr (is_float32)
+            {
+                __m512 x = _mm512_loadu_ps(data_x + i_x);
+                __m512 y = _mm512_loadu_ps(data_y + i_y);
+                dot_products = _mm512_fmadd_ps(x, y, dot_products);
+                x_squareds = _mm512_fmadd_ps(x, x, x_squareds);
+                y_squareds = _mm512_fmadd_ps(y, y, y_squareds);
+            }
+            else
+            {
+                __m512 x = _mm512_loadu_pd(data_x + i_x);
+                __m512 y = _mm512_loadu_pd(data_y + i_y);
+                dot_products = _mm512_fmadd_pd(x, y, dot_products);
+                x_squareds = _mm512_fmadd_pd(x, x, x_squareds);
+                y_squareds = _mm512_fmadd_pd(y, y, y_squareds);
+            }
+        }
+
+        if constexpr (is_float32)
+        {
+            state.dot_prod = _mm512_reduce_add_ps(dot_products);
+            state.x_squared = _mm512_reduce_add_ps(x_squareds);
+            state.y_squared = _mm512_reduce_add_ps(y_squareds);
+        }
+        else
+        {
+            state.dot_prod = _mm512_reduce_add_pd(dot_products);
+            state.x_squared = _mm512_reduce_add_pd(x_squareds);
+            state.y_squared = _mm512_reduce_add_pd(y_squareds);
+        }
+    }
+#endif
+
     template <typename ResultType>
     static ResultType finalize(const State<ResultType> & state, const ConstParams &)
     {
@@ -200,7 +316,11 @@ template <class Kernel>
 class FunctionArrayDistance : public IFunction
 {
 public:
-    String getName() const override { static auto name = String("array") + Kernel::name + "Distance"; return name; }
+    String getName() const override
+    {
+        static auto name = String("array") + Kernel::name + "Distance";
+        return name;
+    }
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayDistance<Kernel>>(); }
     size_t getNumberOfArguments() const override { return 2; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {}; }
@@ -237,7 +357,7 @@ public:
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Arguments of function {} has nested type {}. "
-                    "Support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                    "Supported types: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
                     getName(),
                     common_type->getName());
         }
@@ -259,17 +379,17 @@ public:
     }
 
 
-#define SUPPORTED_TYPES(action) \
-    action(UInt8)   \
-    action(UInt16)  \
-    action(UInt32)  \
-    action(UInt64)  \
-    action(Int8)    \
-    action(Int16)   \
-    action(Int32)   \
-    action(Int64)   \
-    action(Float32) \
-    action(Float64)
+#define SUPPORTED_TYPES(ACTION) \
+    ACTION(UInt8)   \
+    ACTION(UInt16)  \
+    ACTION(UInt32)  \
+    ACTION(UInt64)  \
+    ACTION(Int8)    \
+    ACTION(Int16)   \
+    ACTION(Int32)   \
+    ACTION(Int64)   \
+    ACTION(Float32) \
+    ACTION(Float64)
 
 
 private:
@@ -278,12 +398,11 @@ private:
     {
         DataTypePtr type_x = typeid_cast<const DataTypeArray *>(arguments[0].type.get())->getNestedType();
 
-        /// Dynamic disaptch based on the 1st argument type
         switch (type_x->getTypeId())
         {
         #define ON_TYPE(type) \
             case TypeIndex::type: \
-                return executeWithFirstType<ResultType, type>(arguments, input_rows_count); \
+                return executeWithResultTypeAndLeftType<ResultType, type>(arguments, input_rows_count); \
                 break;
 
             SUPPORTED_TYPES(ON_TYPE)
@@ -293,23 +412,22 @@ private:
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Arguments of function {} has nested type {}. "
-                    "Support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                    "Supported types: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
                     getName(),
                     type_x->getName());
         }
     }
 
-    template <typename ResultType, typename FirstArgType>
-    ColumnPtr executeWithFirstType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    template <typename ResultType, typename LeftType>
+    ColumnPtr executeWithResultTypeAndLeftType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
     {
         DataTypePtr type_y = typeid_cast<const DataTypeArray *>(arguments[1].type.get())->getNestedType();
 
-        /// Dynamic disaptch based on the 2nd argument type
         switch (type_y->getTypeId())
         {
         #define ON_TYPE(type) \
             case TypeIndex::type: \
-                return executeWithTypes<ResultType, FirstArgType, type>(arguments[0].column, arguments[1].column, input_rows_count, arguments); \
+                return executeWithResultTypeAndLeftTypeAndRightType<ResultType, LeftType, type>(arguments[0].column, arguments[1].column, input_rows_count, arguments); \
                 break;
 
             SUPPORTED_TYPES(ON_TYPE)
@@ -319,59 +437,43 @@ private:
                 throw Exception(
                     ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
                     "Arguments of function {} has nested type {}. "
-                    "Support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                    "Supported types: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
                     getName(),
                     type_y->getName());
         }
     }
 
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    ColumnPtr executeWithTypes(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
+    template <typename ResultType, typename LeftType, typename RightType>
+    ColumnPtr executeWithResultTypeAndLeftTypeAndRightType(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         if (typeid_cast<const ColumnConst *>(col_x.get()))
         {
-            return executeWithTypesFirstArgConst<ResultType, FirstArgType, SecondArgType>(col_x, col_y, input_rows_count, arguments);
+            return executeWithLeftArgConst<ResultType, LeftType, RightType>(col_x, col_y, input_rows_count, arguments);
         }
         else if (typeid_cast<const ColumnConst *>(col_y.get()))
         {
-            return executeWithTypesFirstArgConst<ResultType, SecondArgType, FirstArgType>(col_y, col_x, input_rows_count, arguments);
+            return executeWithLeftArgConst<ResultType, RightType, LeftType>(col_y, col_x, input_rows_count, arguments);
         }
 
-        col_x = col_x->convertToFullColumnIfConst();
-        col_y = col_y->convertToFullColumnIfConst();
-
         const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
         const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
 
-        const auto & data_x = typeid_cast<const ColumnVector<FirstArgType> &>(array_x.getData()).getData();
-        const auto & data_y = typeid_cast<const ColumnVector<SecondArgType> &>(array_y.getData()).getData();
+        const auto & data_x = typeid_cast<const ColumnVector<LeftType> &>(array_x.getData()).getData();
+        const auto & data_y = typeid_cast<const ColumnVector<RightType> &>(array_y.getData()).getData();
 
         const auto & offsets_x = array_x.getOffsets();
-        const auto & offsets_y = array_y.getOffsets();
 
-        /// Check that arrays in both columns are the sames size
-        for (size_t row = 0; row < offsets_x.size(); ++row)
-        {
-            if (unlikely(offsets_x[row] != offsets_y[row]))
-            {
-                ColumnArray::Offset prev_offset = row > 0 ? offsets_x[row] : 0;
-                throw Exception(
-                    ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                    "Arguments of function {} have different array sizes: {} and {}",
-                    getName(),
-                    offsets_x[row] - prev_offset,
-                    offsets_y[row] - prev_offset);
-            }
-        }
+        if (!array_x.hasEqualOffsets(array_y))
+            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Array arguments for function {} must have equal sizes", getName());
 
         const typename Kernel::ConstParams kernel_params = initConstParams(arguments);
 
-        auto result = ColumnVector<ResultType>::create(input_rows_count);
-        auto & result_data = result->getData();
+        auto col_res = ColumnVector<ResultType>::create(input_rows_count);
+        auto & result_data = col_res->getData();
 
-        /// Do the actual computation
         ColumnArray::Offset prev = 0;
         size_t row = 0;
+
         for (auto off : offsets_x)
         {
             /// Process chunks in vectorized manner
@@ -397,12 +499,12 @@ private:
             result_data[row] = Kernel::finalize(state, kernel_params);
             row++;
         }
-        return result;
+        return col_res;
     }
 
     /// Special case when the 1st parameter is Const
-    template <typename ResultType, typename FirstArgType, typename SecondArgType>
-    ColumnPtr executeWithTypesFirstArgConst(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
+    template <typename ResultType, typename LeftType, typename RightType>
+    ColumnPtr executeWithLeftArgConst(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count, const ColumnsWithTypeAndName & arguments) const
     {
         col_x = assert_cast<const ColumnConst *>(col_x.get())->getDataColumnPtr();
         col_y = col_y->convertToFullColumnIfConst();
@@ -410,26 +512,25 @@ private:
         const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
         const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
 
-        const auto & data_x = typeid_cast<const ColumnVector<FirstArgType> &>(array_x.getData()).getData();
-        const auto & data_y = typeid_cast<const ColumnVector<SecondArgType> &>(array_y.getData()).getData();
+        const auto & data_x = typeid_cast<const ColumnVector<LeftType> &>(array_x.getData()).getData();
+        const auto & data_y = typeid_cast<const ColumnVector<RightType> &>(array_y.getData()).getData();
 
         const auto & offsets_x = array_x.getOffsets();
         const auto & offsets_y = array_y.getOffsets();
 
-        /// Check that arrays in both columns are the sames size
         ColumnArray::Offset prev_offset = 0;
-        for (size_t row : collections::range(0, offsets_y.size()))
+        for (auto offset_y : offsets_y)
         {
-            if (unlikely(offsets_x[0] != offsets_y[row] - prev_offset))
+            if (offsets_x[0] != offset_y - prev_offset) [[unlikely]]
             {
                 throw Exception(
                     ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
                     "Arguments of function {} have different array sizes: {} and {}",
                     getName(),
                     offsets_x[0],
-                    offsets_y[row] - prev_offset);
+                    offset_y - prev_offset);
             }
-            prev_offset = offsets_y[row];
+            prev_offset = offset_y;
         }
 
         const typename Kernel::ConstParams kernel_params = initConstParams(arguments);
@@ -437,15 +538,35 @@ private:
         auto result = ColumnVector<ResultType>::create(input_rows_count);
         auto & result_data = result->getData();
 
-        /// Do the actual computation
-        ColumnArray::Offset prev = 0;
+        size_t prev = 0;
         size_t row = 0;
+
         for (auto off : offsets_y)
         {
+            size_t i = 0;
+            typename Kernel::template State<ResultType> state;
+
+            /// SIMD optimization: process multiple elements in both input arrays at once.
+            /// To avoid combinatorial explosion of SIMD kernels, focus on
+            /// - the two most common input/output types (Float32 x Float32) --> Float32 and (Float64 x Float64) --> Float64 instead of 10 x
+            ///   10 input types x 2 output types,
+            /// - const/non-const inputs instead of non-const/non-const inputs
+            /// - the two most common metrics L2 and cosine distance,
+            /// - the most powerful SIMD instruction set (AVX-512F).
+#if USE_MULTITARGET_CODE
+            if constexpr (std::is_same_v<ResultType, LeftType> && std::is_same_v<ResultType, RightType>) /// ResultType is Float32 or Float64
+            {
+                if constexpr (std::is_same_v<Kernel, L2Distance>
+                           || std::is_same_v<Kernel, CosineDistance>)
+                {
+                    if (isArchSupported(TargetArch::AVX512F))
+                        Kernel::template accumulateCombine<ResultType>(data_x.data(), data_y.data(), i + offsets_x[0], i, prev, state);
+                }
+            }
+#else
             /// Process chunks in vectorized manner
             static constexpr size_t VEC_SIZE = 4;
             typename Kernel::template State<ResultType> states[VEC_SIZE];
-            size_t i = 0;
             for (; prev + VEC_SIZE < off; i += VEC_SIZE, prev += VEC_SIZE)
             {
                 for (size_t s = 0; s < VEC_SIZE; ++s)
@@ -453,10 +574,9 @@ private:
                         states[s], static_cast<ResultType>(data_x[i + s]), static_cast<ResultType>(data_y[prev + s]), kernel_params);
             }
 
-            typename Kernel::template State<ResultType> state;
             for (const auto & other_state : states)
                 Kernel::template combine<ResultType>(state, other_state, kernel_params);
-
+#endif
             /// Process the tail
             for (; prev < off; ++i, ++prev)
             {
@@ -466,6 +586,7 @@ private:
             result_data[row] = Kernel::finalize(state, kernel_params);
             row++;
         }
+
         return result;
     }
 
diff --git a/src/Functions/array/arrayDotProduct.cpp b/src/Functions/array/arrayDotProduct.cpp
index 47e865785d4..4551140acc3 100644
--- a/src/Functions/array/arrayDotProduct.cpp
+++ b/src/Functions/array/arrayDotProduct.cpp
@@ -1,12 +1,17 @@
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnVector.h>
+#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.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>
+#include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Functions/castTypeToEither.h>
+#include <Interpreters/Context_fwd.h>
+#include <base/types.h>
 
+#if USE_MULTITARGET_CODE
+#include <immintrin.h>
+#endif
 
 namespace DB
 {
@@ -14,31 +19,32 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int LOGICAL_ERROR;
+    extern const int SIZES_OF_ARRAYS_DONT_MATCH;
 }
 
-struct NameArrayDotProduct
+
+struct DotProduct
 {
     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>;
+        Types types;
 
         DataTypePtr result_type;
-        bool valid = castTypeToEither(Types{}, left.get(), [&](const auto & left_)
+        bool valid = castTypeToEither(types, left.get(), [&](const auto & left_)
         {
-            return castTypeToEither(Types{}, right.get(), [&](const auto & right_)
+            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>)
+                using LeftType = typename std::decay_t<decltype(left_)>::FieldType;
+                using RightType = typename std::decay_t<decltype(right_)>::FieldType;
+                using ResultType = typename NumberTraits::ResultOfAdditionMultiplication<LeftType, RightType>::Type;
+
+                if constexpr (std::is_same_v<LeftType, Float32> && std::is_same_v<RightType, Float32>)
                     result_type = std::make_shared<DataTypeFloat32>();
                 else
                     result_type = std::make_shared<DataTypeFromFieldType<ResultType>>();
@@ -49,26 +55,334 @@ public:
         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));
+                "Arguments of function {} only support: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.", 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)
+    template <typename Type>
+    struct State
     {
-        ResultType result = 0;
-        for (size_t i = 0; i < size; ++i)
-            result += static_cast<ResultType>(left[i]) * static_cast<ResultType>(right[i]);
-        return result;
+        Type sum = 0;
+    };
+
+    template <typename Type>
+    static NO_SANITIZE_UNDEFINED void accumulate(State<Type> & state, Type x, Type y)
+    {
+        state.sum += x * y;
+    }
+
+    template <typename Type>
+    static NO_SANITIZE_UNDEFINED void combine(State<Type> & state, const State<Type> & other_state)
+    {
+        state.sum += other_state.sum;
+    }
+
+#if USE_MULTITARGET_CODE
+    template <typename Type>
+    AVX512_FUNCTION_SPECIFIC_ATTRIBUTE static void accumulateCombine(
+        const Type * __restrict data_x,
+        const Type * __restrict data_y,
+        size_t i_max,
+        size_t & i,
+        State<Type> & state)
+    {
+        static constexpr bool is_float32 = std::is_same_v<Type, Float32>;
+
+        __m512 sums;
+        if constexpr (is_float32)
+            sums = _mm512_setzero_ps();
+        else
+            sums = _mm512_setzero_pd();
+
+        constexpr size_t n = is_float32 ? 16 : 8;
+
+        for (; i + n < i_max; i += n)
+        {
+            if constexpr (is_float32)
+            {
+                __m512 x = _mm512_loadu_ps(data_x + i);
+                __m512 y = _mm512_loadu_ps(data_y + i);
+                sums = _mm512_fmadd_ps(x, y, sums);
+            }
+            else
+            {
+                __m512 x = _mm512_loadu_pd(data_x + i);
+                __m512 y = _mm512_loadu_pd(data_y + i);
+                sums = _mm512_fmadd_pd(x, y, sums);
+            }
+        }
+
+        if constexpr (is_float32)
+            state.sum = _mm512_reduce_add_ps(sums);
+        else
+            state.sum = _mm512_reduce_add_pd(sums);
+    }
+#endif
+
+    template <typename Type>
+    static Type finalize(const State<Type> & state)
+    {
+        return state.sum;
+    }
+
+};
+
+
+/// The implementation is modeled after the implementation of distance functions arrayL1Distance, arrayL2Distance, etc.
+/// The main difference is that arrayDotProduct() interferes the result type differently.
+template <typename Kernel>
+class FunctionArrayScalarProduct : public IFunction
+{
+public:
+    static constexpr auto name = Kernel::name;
+
+    String getName() const override { return name; }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayScalarProduct>(); }
+    size_t getNumberOfArguments() const override { return 2; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        std::array<DataTypePtr, 2> nested_types;
+        for (size_t i = 0; i < 2; ++i)
+        {
+            const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[i].get());
+            if (!array_type)
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Arguments for function {} must be of type Array", getName());
+
+            const auto & nested_type = array_type->getNestedType();
+            if (!isNativeNumber(nested_type))
+                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                        "Function {} cannot process values of type {}", getName(), nested_type->getName());
+
+            nested_types[i] = nested_type;
+        }
+
+        return Kernel::getReturnType(nested_types[0], nested_types[1]);
+    }
+
+#define SUPPORTED_TYPES(ACTION) \
+    ACTION(UInt8) \
+    ACTION(UInt16) \
+    ACTION(UInt32) \
+    ACTION(UInt64) \
+    ACTION(Int8) \
+    ACTION(Int16) \
+    ACTION(Int32) \
+    ACTION(Int64) \
+    ACTION(Float32) \
+    ACTION(Float64)
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        switch (result_type->getTypeId())
+        {
+        #define ON_TYPE(type) \
+            case TypeIndex::type: \
+                return executeWithResultType<type>(arguments, input_rows_count); \
+                break;
+
+            SUPPORTED_TYPES(ON_TYPE)
+        #undef ON_TYPE
+
+            default:
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected result type {}", result_type->getName());
+        }
+    }
+
+private:
+    template <typename ResultType>
+    ColumnPtr executeWithResultType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    {
+        DataTypePtr type_x = typeid_cast<const DataTypeArray *>(arguments[0].type.get())->getNestedType();
+
+        switch (type_x->getTypeId())
+        {
+#define ON_TYPE(type) \
+            case TypeIndex::type: \
+                return executeWithResultTypeAndLeftType<ResultType, type>(arguments, input_rows_count); \
+                break;
+
+            SUPPORTED_TYPES(ON_TYPE)
+#undef ON_TYPE
+
+            default:
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Arguments of function {} has nested type {}. "
+                    "Supported types: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                    getName(),
+                    type_x->getName());
+        }
+    }
+
+    template <typename ResultType, typename LeftType>
+    ColumnPtr executeWithResultTypeAndLeftType(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
+    {
+        DataTypePtr type_y = typeid_cast<const DataTypeArray *>(arguments[1].type.get())->getNestedType();
+
+        switch (type_y->getTypeId())
+        {
+        #define ON_TYPE(type) \
+            case TypeIndex::type: \
+                return executeWithResultTypeAndLeftTypeAndRightType<ResultType, LeftType, type>(arguments[0].column, arguments[1].column, input_rows_count); \
+                break;
+
+            SUPPORTED_TYPES(ON_TYPE)
+        #undef ON_TYPE
+
+            default:
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "Arguments of function {} has nested type {}. "
+                    "Supported types: UInt8, UInt16, UInt32, UInt64, Int8, Int16, Int32, Int64, Float32, Float64.",
+                    getName(),
+                    type_y->getName());
+        }
+    }
+
+    template <typename ResultType, typename LeftType, typename RightType>
+    ColumnPtr executeWithResultTypeAndLeftTypeAndRightType(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count) const
+    {
+        if (typeid_cast<const ColumnConst *>(col_x.get()))
+        {
+            return executeWithLeftArgConst<ResultType, LeftType, RightType>(col_x, col_y, input_rows_count);
+        }
+        else if (typeid_cast<const ColumnConst *>(col_y.get()))
+        {
+            return executeWithLeftArgConst<ResultType, RightType, LeftType>(col_y, col_x, input_rows_count);
+        }
+
+        const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
+        const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
+
+        const auto & data_x = typeid_cast<const ColumnVector<LeftType> &>(array_x.getData()).getData();
+        const auto & data_y = typeid_cast<const ColumnVector<RightType> &>(array_y.getData()).getData();
+
+        const auto & offsets_x = array_x.getOffsets();
+
+        if (!array_x.hasEqualOffsets(array_y))
+            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH, "Array arguments for function {} must have equal sizes", getName());
+
+        auto col_res = ColumnVector<ResultType>::create(input_rows_count);
+        auto & result_data = col_res->getData();
+
+        ColumnArray::Offset current_offset = 0;
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const size_t array_size = offsets_x[row] - current_offset;
+
+            size_t i = 0;
+
+            /// Process chunks in vectorized manner
+            static constexpr size_t VEC_SIZE = 4;
+            typename Kernel::template State<ResultType> states[VEC_SIZE];
+            for (; i + VEC_SIZE < array_size; i += VEC_SIZE)
+            {
+                for (size_t j = 0; j < VEC_SIZE; ++j)
+                    Kernel::template accumulate<ResultType>(states[j], static_cast<ResultType>(data_x[current_offset + i + j]), static_cast<ResultType>(data_y[current_offset + i + j]));
+            }
+
+            typename Kernel::template State<ResultType> state;
+            for (const auto & other_state : states)
+                Kernel::template combine<ResultType>(state, other_state);
+
+            /// Process the tail
+            for (; i < array_size; ++i)
+                Kernel::template accumulate<ResultType>(state, static_cast<ResultType>(data_x[current_offset + i]), static_cast<ResultType>(data_y[current_offset + i]));
+
+            result_data[row] = Kernel::template finalize<ResultType>(state);
+
+            current_offset = offsets_x[row];
+        }
+
+        return col_res;
+    }
+
+    template <typename ResultType, typename LeftType, typename RightType>
+    ColumnPtr executeWithLeftArgConst(ColumnPtr col_x, ColumnPtr col_y, size_t input_rows_count) const
+    {
+        col_x = assert_cast<const ColumnConst *>(col_x.get())->getDataColumnPtr();
+        col_y = col_y->convertToFullColumnIfConst();
+
+        const auto & array_x = *assert_cast<const ColumnArray *>(col_x.get());
+        const auto & array_y = *assert_cast<const ColumnArray *>(col_y.get());
+
+        const auto & data_x = typeid_cast<const ColumnVector<LeftType> &>(array_x.getData()).getData();
+        const auto & data_y = typeid_cast<const ColumnVector<RightType> &>(array_y.getData()).getData();
+
+        const auto & offsets_x = array_x.getOffsets();
+        const auto & offsets_y = array_y.getOffsets();
+
+        ColumnArray::Offset prev_offset = 0;
+        for (auto offset_y : offsets_y)
+        {
+            if (offsets_x[0] != offset_y - prev_offset) [[unlikely]]
+            {
+                throw Exception(
+                    ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
+                    "Arguments of function {} have different array sizes: {} and {}",
+                    getName(),
+                    offsets_x[0],
+                    offset_y - prev_offset);
+            }
+            prev_offset = offset_y;
+        }
+
+        auto col_res = ColumnVector<ResultType>::create(input_rows_count);
+        auto & result = col_res->getData();
+
+        ColumnArray::Offset current_offset = 0;
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const size_t array_size = offsets_x[0];
+
+            typename Kernel::template State<ResultType> state;
+            size_t i = 0;
+
+            /// SIMD optimization: process multiple elements in both input arrays at once.
+            /// To avoid combinatorial explosion of SIMD kernels, focus on
+            /// - the two most common input/output types (Float32 x Float32) --> Float32 and (Float64 x Float64) --> Float64 instead of 10 x
+            ///   10 input types x 8 output types,
+            /// - const/non-const inputs instead of non-const/non-const inputs
+            /// - the most powerful SIMD instruction set (AVX-512F).
+#if USE_MULTITARGET_CODE
+            if constexpr ((std::is_same_v<ResultType, Float32> || std::is_same_v<ResultType, Float64>)
+                            && std::is_same_v<ResultType, LeftType> && std::is_same_v<LeftType, RightType>)
+            {
+                if (isArchSupported(TargetArch::AVX512F))
+                    Kernel::template accumulateCombine<ResultType>(&data_x[0], &data_y[current_offset], array_size, i, state);
+            }
+#else
+            /// Process chunks in vectorized manner
+            static constexpr size_t VEC_SIZE = 4;
+            typename Kernel::template State<ResultType> states[VEC_SIZE];
+            for (; i + VEC_SIZE < array_size; i += VEC_SIZE)
+            {
+                for (size_t j = 0; j < VEC_SIZE; ++j)
+                    Kernel::template accumulate<ResultType>(states[j], static_cast<ResultType>(data_x[i + j]), static_cast<ResultType>(data_y[current_offset + i + j]));
+            }
+
+            for (const auto & other_state : states)
+                Kernel::template combine<ResultType>(state, other_state);
+#endif
+
+            /// Process the tail
+            for (; i < array_size; ++i)
+                Kernel::template accumulate<ResultType>(state, static_cast<ResultType>(data_x[i]), static_cast<ResultType>(data_y[current_offset + i]));
+
+            result[row] = Kernel::template finalize<ResultType>(state);
+
+            current_offset = offsets_y[row];
+        }
+
+        return col_res;
     }
 };
 
-using FunctionArrayDotProduct = FunctionArrayScalarProduct<ArrayDotProductImpl, NameArrayDotProduct>;
+using FunctionArrayDotProduct = FunctionArrayScalarProduct<DotProduct>;
 
 REGISTER_FUNCTION(ArrayDotProduct)
 {
@@ -77,4 +391,5 @@ REGISTER_FUNCTION(ArrayDotProduct)
 
 // 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 cea407aee02..8669fd1f3a7 100644
--- a/src/Functions/array/arrayElement.cpp
+++ b/src/Functions/array/arrayElement.cpp
@@ -670,8 +670,7 @@ struct ArrayElementStringImpl
         ColumnArray::Offset current_offset = 0;
         /// get the total result bytes at first, and reduce the cost of result_data.resize.
         size_t total_result_bytes = 0;
-        ColumnString::Chars zero_buf(1);
-        zero_buf.push_back(0);
+        ColumnString::Chars zero_buf(16, '\0'); /// Needs 15 extra bytes for memcpySmallAllowReadWriteOverflow15
         std::vector<std::pair<const ColumnString::Char *, UInt64>> selected_bufs;
         selected_bufs.reserve(size);
         for (size_t i = 0; i < size; ++i)
@@ -737,8 +736,7 @@ struct ArrayElementStringImpl
         size_t size = offsets.size();
         result_offsets.resize(size);
 
-        ColumnString::Chars zero_buf(1);
-        zero_buf.push_back(0);
+        ColumnString::Chars zero_buf(16, '\0'); /// Needs 15 extra bytes for memcpySmallAllowReadWriteOverflow15
         ColumnArray::Offset current_offset = 0;
         /// get the total result bytes at first, and reduce the cost of result_data.resize.
         size_t total_result_bytes = 0;
diff --git a/src/Functions/array/arrayEnumerateRanked.cpp b/src/Functions/array/arrayEnumerateRanked.cpp
index dd597d607dc..69d8954bfcf 100644
--- a/src/Functions/array/arrayEnumerateRanked.cpp
+++ b/src/Functions/array/arrayEnumerateRanked.cpp
@@ -1,8 +1,8 @@
-#include <algorithm>
 #include <Columns/ColumnConst.h>
+#include <Functions/array/arrayEnumerateRanked.h>
 #include <Common/assert_cast.h>
-#include "arrayEnumerateRanked.h"
 
+#include <algorithm>
 
 namespace DB
 {
@@ -12,88 +12,105 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
-ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments)
+ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments, const char * function_name)
 {
     const size_t num_arguments = arguments.size();
+    if (!num_arguments)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Missing arguments for function arrayEnumerateUniqRanked");
 
     DepthType clear_depth = 1;
-    DepthTypes depths;
+    size_t i = 0;
+    if (const DataTypeArray * type_array = typeid_cast<const DataTypeArray *>(arguments[0].type.get()); !type_array)
+    {
+        /// If the first argument is not an array, it must be a const positive and non zero number
+        const auto & depth_column = arguments[i].column;
+        if (!depth_column || !isColumnConst(*depth_column))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "First argument of {} must be Const(UInt64)", function_name);
+        Field f = assert_cast<const ColumnConst &>(*depth_column).getField();
+        if (f.getType() != Field::Types::UInt64 || f.safeGet<UInt64>() == 0)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "First argument of {} must be a positive integer", function_name);
 
-    /// function signature is the following:
-    /// f(c0, arr1, c1, arr2, c2, ...)
-    ///
-    /// c0 is something called "clear_depth" here.
+        clear_depth = static_cast<DepthType>(f.safeGet<UInt64>());
+        i++;
+    }
+
+
+    /// The rest of the arguments must be in the shape: arr1, c1, arr2, c2, ...
     /// cN... - how deep to look into the corresponding arrN, (called "depths" here)
-    ///   may be omitted - then it means "look at the full depth".
-
-    size_t array_num = 0;
-    DepthType prev_array_depth = 0;
-    for (size_t i = 0; i < num_arguments; ++i)
+    /// may be omitted - then it means "look at the full depth"
+    DepthTypes depths;
+    for (; i < num_arguments; i++)
     {
         const DataTypePtr & type = arguments[i].type;
-        const DataTypeArray * type_array = typeid_cast<const DataTypeArray *>(type.get());
+        const DataTypeArray * current_type_array = typeid_cast<const DataTypeArray *>(type.get());
+        if (!current_type_array)
+            throw Exception(
+                ErrorCodes::BAD_ARGUMENTS,
+                "Incorrect argument {} type of function {}. Expected an Array, got {}",
+                i + 1,
+                function_name,
+                type->getName());
 
-        if (type_array)
+        if (i == num_arguments - 1)
         {
-            if (depths.size() < array_num && prev_array_depth)
-                depths.emplace_back(prev_array_depth);
-
-            prev_array_depth = static_cast<DepthType>(type_array->getNumberOfDimensions());
-            ++array_num;
+            depths.emplace_back(current_type_array->getNumberOfDimensions());
         }
         else
         {
-            const auto & depth_column = arguments[i].column;
-
-            if (depth_column && isColumnConst(*depth_column))
+            const DataTypeArray * next_argument_array = typeid_cast<const DataTypeArray *>(arguments[i + 1].type.get());
+            if (next_argument_array)
             {
-                UInt64 value = assert_cast<const ColumnConst &>(*depth_column).getValue<UInt64>();
-                if (!value)
-                    throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                    "Incorrect arguments for function arrayEnumerateUniqRanked "
-                                    "or arrayEnumerateDenseRanked: depth ({}) cannot be less or equal 0.",
-                                    std::to_string(value));
-
-                if (i == 0)
-                {
-                    clear_depth = static_cast<DepthType>(value);
-                }
-                else
-                {
-                    if (depths.size() >= array_num)
-                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                        "Incorrect arguments for function arrayEnumerateUniqRanked "
-                                        "or arrayEnumerateDenseRanked: depth ({}) for missing array.",
-                                        std::to_string(value));
-                    if (value > prev_array_depth)
-                        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                                        "Arguments for function arrayEnumerateUniqRanked/arrayEnumerateDenseRanked incorrect: depth={}"
-                                        " for array with depth={}.",
-                                        std::to_string(value), std::to_string(prev_array_depth));
-
-                    depths.emplace_back(value);
-                }
+                depths.emplace_back(current_type_array->getNumberOfDimensions());
+            }
+            else
+            {
+                i++;
+                /// The following argument is not array, so it must be a const positive integer with the depth
+                const auto & depth_column = arguments[i].column;
+                if (!depth_column || !isColumnConst(*depth_column))
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Incorrect argument {} type of function {}. Expected an Array or Const(UInt64), got {}",
+                        i + 1,
+                        function_name,
+                        arguments[i].type->getName());
+                Field f = assert_cast<const ColumnConst &>(*depth_column).getField();
+                if (f.getType() != Field::Types::UInt64 || f.safeGet<UInt64>() == 0)
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Incorrect argument {} of function {}. Expected a positive integer",
+                        i + 1,
+                        function_name);
+                UInt64 value = f.safeGet<UInt64>();
+                UInt64 prev_array_depth = current_type_array->getNumberOfDimensions();
+                if (value > prev_array_depth)
+                    throw Exception(
+                        ErrorCodes::BAD_ARGUMENTS,
+                        "Incorrect argument {} of function {}. Required depth '{}' is larger than the array depth ({})",
+                        i + 1,
+                        function_name,
+                        value,
+                        prev_array_depth);
+                depths.emplace_back(value);
             }
         }
     }
 
-    if (depths.size() < array_num)
-        depths.emplace_back(prev_array_depth);
-
     if (depths.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Incorrect arguments for function arrayEnumerateUniqRanked or arrayEnumerateDenseRanked: "
-                        "at least one array should be passed.");
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS, "Incorrect arguments for function {}: At least one array should be passed", function_name);
 
     DepthType max_array_depth = 0;
     for (auto depth : depths)
         max_array_depth = std::max(depth, max_array_depth);
 
     if (clear_depth > max_array_depth)
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                        "Incorrect arguments for function arrayEnumerateUniqRanked or arrayEnumerateDenseRanked: "
-                        "clear_depth ({}) can't be larger than max_array_depth ({}).",
-                        std::to_string(clear_depth), std::to_string(max_array_depth));
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Incorrect arguments for function {}: clear_depth ({}) can't be larger than max_array_depth ({})",
+            function_name,
+            clear_depth,
+            max_array_depth);
 
     return {clear_depth, depths, max_array_depth};
 }
diff --git a/src/Functions/array/arrayEnumerateRanked.h b/src/Functions/array/arrayEnumerateRanked.h
index 1a920260906..04fa305368d 100644
--- a/src/Functions/array/arrayEnumerateRanked.h
+++ b/src/Functions/array/arrayEnumerateRanked.h
@@ -84,7 +84,7 @@ struct ArraysDepths
 };
 
 /// Return depth info about passed arrays
-ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments);
+ArraysDepths getArraysDepths(const ColumnsWithTypeAndName & arguments, const char * function_name);
 
 template <typename Derived>
 class FunctionArrayEnumerateRankedExtended : public IFunction
@@ -105,7 +105,7 @@ public:
                 "Number of arguments for function {} doesn't match: passed {}, should be at least 1.",
                 getName(), arguments.size());
 
-        const ArraysDepths arrays_depths = getArraysDepths(arguments);
+        const ArraysDepths arrays_depths = getArraysDepths(arguments, Derived::name);
 
         /// Return type is the array of the depth as the maximum effective depth of arguments, containing UInt32.
 
@@ -154,7 +154,7 @@ ColumnPtr FunctionArrayEnumerateRankedExtended<Derived>::executeImpl(
     Columns array_holders;
     ColumnPtr offsets_column;
 
-    const ArraysDepths arrays_depths = getArraysDepths(arguments);
+    const ArraysDepths arrays_depths = getArraysDepths(arguments, Derived::name);
 
     /// If the column is Array - return it. If the const Array - materialize it, keep ownership and return.
     auto get_array_column = [&](const auto & column) -> const DB::ColumnArray *
@@ -213,17 +213,23 @@ ColumnPtr FunctionArrayEnumerateRankedExtended<Derived>::executeImpl(
             {
                 if (*offsets_by_depth[col_depth] != array->getOffsets())
                 {
-                    throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                                "Lengths and effective depths of all arrays passed to {} must be equal.", getName());
+                    throw Exception(
+                        ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
+                        "Lengths and effective depths of all arrays passed to {} must be equal",
+                        getName());
                 }
             }
         }
 
         if (col_depth < arrays_depths.depths[array_num])
         {
-            throw Exception(ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
-                            "{}: Passed array number {} depth ({}) is more than the actual array depth ({}).",
-                            getName(), array_num, std::to_string(arrays_depths.depths[array_num]), col_depth);
+            throw Exception(
+                ErrorCodes::SIZES_OF_ARRAYS_DONT_MATCH,
+                "{}: Passed array number {} depth ({}) is more than the actual array depth ({})",
+                getName(),
+                array_num,
+                std::to_string(arrays_depths.depths[array_num]),
+                col_depth);
         }
 
         auto * array_data = &array->getData();
diff --git a/src/Functions/array/arrayFold.cpp b/src/Functions/array/arrayFold.cpp
index 44fe95624a6..63c14f475fc 100644
--- a/src/Functions/array/arrayFold.cpp
+++ b/src/Functions/array/arrayFold.cpp
@@ -32,6 +32,12 @@ public:
     size_t getNumberOfArguments() const override { return 0; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
+    /// Avoid the default adaptors since they modify the inputs and that makes knowing the lambda argument types
+    /// (getLambdaArgumentTypes) more complex, as it requires knowing what the adaptors will do
+    /// It's much simpler to avoid the adapters
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+
     void getLambdaArgumentTypes(DataTypes & arguments) const override
     {
         if (arguments.size() < 3)
diff --git a/src/Functions/array/arrayIndex.h b/src/Functions/array/arrayIndex.h
index 3b19f0b486a..cd537763b4a 100644
--- a/src/Functions/array/arrayIndex.h
+++ b/src/Functions/array/arrayIndex.h
@@ -1007,8 +1007,13 @@ private:
                         if (!(*null_map)[row])
                             continue;
                     }
-                    else if (!applyVisitor(FieldVisitorAccurateEquals(), arr[i], value))
-                        continue;
+                    else
+                    {
+                        if (null_map && (*null_map)[row])
+                            continue;
+                        if (!applyVisitor(FieldVisitorAccurateEquals(), arr[i], value))
+                            continue;
+                    }
 
                     ConcreteAction::apply(data[row], i);
 
diff --git a/src/Functions/array/arrayIntersect.cpp b/src/Functions/array/arrayIntersect.cpp
index ee84e3138e8..209441eb301 100644
--- a/src/Functions/array/arrayIntersect.cpp
+++ b/src/Functions/array/arrayIntersect.cpp
@@ -20,6 +20,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Common/HashTable/ClearableHashMap.h>
 #include <Common/assert_cast.h>
+#include <base/range.h>
 #include <base/TypeLists.h>
 #include <Interpreters/castColumn.h>
 
@@ -623,7 +624,7 @@ ColumnPtr FunctionArrayIntersect::execute(const UnpackedArrays & arrays, Mutable
                 }
                 else
                 {
-                    result_data.deserializeAndInsertFromArena(pair->getKey().data);
+                    std::ignore = result_data.deserializeAndInsertFromArena(pair->getKey().data);
                 }
                 if (all_nullable)
                     null_map.push_back(0);
diff --git a/src/Functions/array/arrayJaccardIndex.cpp b/src/Functions/array/arrayJaccardIndex.cpp
index c2a4fee4845..9cb74a7aa62 100644
--- a/src/Functions/array/arrayJaccardIndex.cpp
+++ b/src/Functions/array/arrayJaccardIndex.cpp
@@ -84,8 +84,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"array_1", &isArray<IDataType>, nullptr, "Array"},
-            {"array_2", &isArray<IDataType>, nullptr, "Array"},
+            {"array_1", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
+            {"array_2", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
         return std::make_shared<DataTypeNumber<ResultType>>();
diff --git a/src/Functions/array/arrayNorm.cpp b/src/Functions/array/arrayNorm.cpp
index 027a33d094c..e87eff6add1 100644
--- a/src/Functions/array/arrayNorm.cpp
+++ b/src/Functions/array/arrayNorm.cpp
@@ -175,8 +175,7 @@ public:
         }
     }
 
-    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
     {
         DataTypePtr type = typeid_cast<const DataTypeArray *>(arguments[0].type.get())->getNestedType();
         ColumnPtr column = arguments[0].column->convertToFullColumnIfConst();
diff --git a/src/Functions/array/arrayRandomSample.cpp b/src/Functions/array/arrayRandomSample.cpp
index 40344efb077..b08a73b93f3 100644
--- a/src/Functions/array/arrayRandomSample.cpp
+++ b/src/Functions/array/arrayRandomSample.cpp
@@ -36,8 +36,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"array", &isArray<IDataType>, nullptr, "Array"},
-            {"samples", &isUInt<IDataType>, isColumnConst, "const UInt*"},
+            {"array", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
+            {"samples", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isUInt), isColumnConst, "const UInt*"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/array/arrayReduce.cpp b/src/Functions/array/arrayReduce.cpp
index 5a6a99ef785..d47d1ae98cc 100644
--- a/src/Functions/array/arrayReduce.cpp
+++ b/src/Functions/array/arrayReduce.cpp
@@ -1,14 +1,15 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
-#include <DataTypes/DataTypeArray.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 #include <AggregateFunctions/Combinators/AggregateFunctionState.h>
 #include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
 #include <Common/Arena.h>
 
 #include <Common/scope_guard_safe.h>
@@ -48,6 +49,11 @@ public:
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
+    /// As we parse the function name and deal with arrays we don't want to default NULL handler, which will hide
+    /// nullability from us (which also means hidden from the aggregate functions)
+    bool useDefaultImplementationForNulls() const override { return false; }
+    /// Same for low cardinality. We want to return exactly what the aggregate function returns, no meddling
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
     ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {0}; }
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override;
@@ -115,7 +121,8 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
     const IAggregateFunction & agg_func = *aggregate_function;
     std::unique_ptr<Arena> arena = std::make_unique<Arena>();
 
-    /// Aggregate functions do not support constant columns. Therefore, we materialize them.
+    /// Aggregate functions do not support constant or lowcardinality columns. Therefore, we materialize them and
+    /// keep a reference so they are alive until we finish using their nested columns (array data/offset)
     std::vector<ColumnPtr> materialized_columns;
 
     const size_t num_arguments_columns = arguments.size() - 1;
@@ -126,6 +133,12 @@ ColumnPtr FunctionArrayReduce::executeImpl(const ColumnsWithTypeAndName & argume
     for (size_t i = 0; i < num_arguments_columns; ++i)
     {
         const IColumn * col = arguments[i + 1].column.get();
+        auto col_no_lowcardinality = recursiveRemoveLowCardinality(arguments[i + 1].column);
+        if (col_no_lowcardinality != arguments[i + 1].column)
+        {
+            materialized_columns.emplace_back(col_no_lowcardinality);
+            col = col_no_lowcardinality.get();
+        }
 
         const ColumnArray::Offsets * offsets_i = nullptr;
         if (const ColumnArray * arr = checkAndGetColumn<ColumnArray>(col))
diff --git a/src/Functions/array/arrayScalarProduct.h b/src/Functions/array/arrayScalarProduct.h
deleted file mode 100644
index 374a2d8a194..00000000000
--- a/src/Functions/array/arrayScalarProduct.h
+++ /dev/null
@@ -1,182 +0,0 @@
-#pragma once
-
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnVector.h>
-#include <DataTypes/DataTypeArray.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/IFunction.h>
-#include <Interpreters/Context_fwd.h>
-#include <Core/TypeId.h>
-
-
-namespace DB
-{
-
-class Context;
-
-namespace ErrorCodes
-{
-    extern const int ILLEGAL_COLUMN;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
-    extern const int BAD_ARGUMENTS;
-    extern const int LOGICAL_ERROR;
-}
-
-
-template <typename Method, typename Name>
-class FunctionArrayScalarProduct : public IFunction
-{
-public:
-    static constexpr auto name = Name::name;
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayScalarProduct>(); }
-
-private:
-
-    template <typename ResultType, typename T>
-    ColumnPtr executeNumber(const ColumnsWithTypeAndName & arguments) const
-    {
-        ColumnPtr res;
-        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 ResultType, typename T, typename U>
-    ColumnPtr executeNumberNumber(const ColumnsWithTypeAndName & arguments) const
-    {
-        ColumnPtr col1 = arguments[0].column->convertToFullColumnIfConst();
-        ColumnPtr col2 = arguments[1].column->convertToFullColumnIfConst();
-        if (!col1 || !col2)
-            return nullptr;
-
-        const ColumnArray * col_array1 = checkAndGetColumn<ColumnArray>(col1.get());
-        const ColumnArray * col_array2 = checkAndGetColumn<ColumnArray>(col2.get());
-        if (!col_array1 || !col_array2)
-            return nullptr;
-
-        if (!col_array1->hasEqualOffsets(*col_array2))
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Array arguments for function {} must have equal sizes", getName());
-
-        const ColumnVector<T> * col_nested1 = checkAndGetColumn<ColumnVector<T>>(col_array1->getData());
-        const ColumnVector<U> * col_nested2 = checkAndGetColumn<ColumnVector<U>>(col_array2->getData());
-        if (!col_nested1 || !col_nested2)
-            return nullptr;
-
-        auto col_res = ColumnVector<ResultType>::create();
-
-        vector(
-            col_nested1->getData(),
-            col_nested2->getData(),
-            col_array1->getOffsets(),
-            col_res->getData());
-
-        return col_res;
-    }
-
-    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<ResultType> & result)
-    {
-        size_t size = offsets.size();
-        result.resize(size);
-
-        ColumnArray::Offset current_offset = 0;
-        for (size_t i = 0; i < size; ++i)
-        {
-            size_t array_size = offsets[i] - current_offset;
-            result[i] = Method::template apply<ResultType, T, U>(&data1[current_offset], &data2[current_offset], array_size);
-            current_offset = offsets[i];
-        }
-    }
-
-public:
-    String getName() const override { return name; }
-    size_t getNumberOfArguments() const override { return 2; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
-
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
-    {
-        // Basic type check
-        std::vector<DataTypePtr> nested_types(2, nullptr);
-        for (size_t i = 0; i < getNumberOfArguments(); ++i)
-        {
-            const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[i].get());
-            if (!array_type)
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "All arguments for function {} must be an array.", getName());
-
-            const auto & nested_type = array_type->getNestedType();
-            if (!isNativeNumber(nested_type) && !isEnum(nested_type))
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "{} cannot process values of type {}",
-                                getName(), nested_type->getName());
-            nested_types[i] = nested_type;
-        }
-
-        // Detail type check in Method, then return ReturnType
-        return Method::getReturnType(nested_types[0], nested_types[1]);
-    }
-
-    template <typename ResultType>
-    ColumnPtr executeWithResultType(const ColumnsWithTypeAndName & arguments) const
-    {
-        ColumnPtr res;
-        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/arrayShingles.cpp b/src/Functions/array/arrayShingles.cpp
new file mode 100644
index 00000000000..8932482c69c
--- /dev/null
+++ b/src/Functions/array/arrayShingles.cpp
@@ -0,0 +1,102 @@
+#include <Columns/ColumnArray.h>
+#include <DataTypes/DataTypeArray.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <IO/WriteHelpers.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int ILLEGAL_COLUMN;
+}
+
+class FunctionArrayShingles : public IFunction
+{
+public:
+    static constexpr auto name = "arrayShingles";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionArrayShingles>(); }
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 2; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+            FunctionArgumentDescriptors args{
+                {"array", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
+                {"length", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInteger), nullptr, "Integer"}
+            };
+            validateFunctionArgumentTypes(*this, arguments, args);
+
+        const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(arguments[0].type.get());
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeArray>(array_type->getNestedType()));
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & /*result_type*/, size_t input_rows_count) const override
+    {
+        const ColumnArray * col_array = checkAndGetColumn<ColumnArray>(arguments[0].column.get());
+        if (!col_array)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Expected array column for function {}", getName());
+
+        const ColumnPtr & col_length = arguments[1].column;
+
+        const auto & arr_offsets = col_array->getOffsets();
+        const auto & arr_values = col_array->getData();
+
+        auto col_res_data = arr_values.cloneEmpty();
+        auto col_res_inner_offsets = ColumnArray::ColumnOffsets::create();
+        auto col_res_outer_offsets = ColumnArray::ColumnOffsets::create();
+        IColumn::Offsets & out_offsets_2 = col_res_inner_offsets->getData();
+        IColumn::Offsets & out_offsets_1 = col_res_outer_offsets->getData();
+
+        size_t pos1 = 0, pos2 = 0;
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            const Int64 shingle_length = col_length->getInt(row);
+            if (shingle_length < 1)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Shingle argument of function {} must be a positive integer.", getName());
+
+            const size_t array_length = arr_offsets[row] - arr_offsets[row - 1];
+            if (static_cast<size_t>(shingle_length) > array_length)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Shingle argument of function {} must less or equal than the array length.", getName());
+
+            for (size_t i = 0; i < array_length - shingle_length + 1; ++i)
+            {
+                col_res_data->insertRangeFrom(arr_values, arr_offsets[row - 1] + i, shingle_length);
+                pos1 += shingle_length;
+                out_offsets_2.push_back(pos1);
+            }
+            pos2 += array_length - shingle_length + 1;
+            out_offsets_1.push_back(pos2);
+        }
+
+        return ColumnArray::create(
+            ColumnArray::create(
+                std::move(col_res_data),
+                std::move(col_res_inner_offsets)),
+            std::move(col_res_outer_offsets)
+        );
+    }
+};
+
+REGISTER_FUNCTION(ArrayShingles)
+{
+    factory.registerFunction<FunctionArrayShingles>(
+        FunctionDocumentation{
+            .description = R"(
+Generates an array of "shingles", i.e. consecutive sub-arrays with specified length of the input array.
+)",
+            .examples{
+                {"example 1", "SELECT arrayShingles([1,2,3,4,5], 3)", "[[1,2,3],[2,3,4],[3,4,5]]"}
+            },
+            .categories = {"Array"},
+        });
+}
+
+}
+
diff --git a/src/Functions/array/arraySort.cpp b/src/Functions/array/arraySort.cpp
index 184b1f82280..6c8741e6eec 100644
--- a/src/Functions/array/arraySort.cpp
+++ b/src/Functions/array/arraySort.cpp
@@ -46,7 +46,10 @@ ColumnPtr ArraySortImpl<positive, is_partial>::execute(
                     ErrorCodes::LOGICAL_ERROR,
                     "Expected fixed arguments to get the limit for partial array sort"
                 );
-            return fixed_arguments[0].column.get()->getUInt(0);
+
+            /// During dryRun the input column might be empty
+            if (!fixed_arguments[0].column->empty())
+                return fixed_arguments[0].column->getUInt(0);
         }
         return 0;
     }();
diff --git a/src/Functions/array/emptyArray.cpp b/src/Functions/array/emptyArray.cpp
index 684f8af162a..77c191b3adc 100644
--- a/src/Functions/array/emptyArray.cpp
+++ b/src/Functions/array/emptyArray.cpp
@@ -49,8 +49,7 @@ private:
 void registerFunction(FunctionFactory & factory, const String & element_type)
 {
     factory.registerFunction(FunctionEmptyArray::getNameImpl(element_type),
-        [element_type](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionEmptyArray>(element_type)); });
+        [element_type](ContextPtr){ return std::make_shared<FunctionEmptyArray>(element_type); });
 }
 
 }
diff --git a/src/Functions/array/has.cpp b/src/Functions/array/has.cpp
index f08a4f29d2d..a17dcdcfbf9 100644
--- a/src/Functions/array/has.cpp
+++ b/src/Functions/array/has.cpp
@@ -9,4 +9,10 @@ struct NameHas { static constexpr auto name = "has"; };
 using FunctionHas = FunctionArrayIndex<HasAction, NameHas>;
 
 REGISTER_FUNCTION(Has) { factory.registerFunction<FunctionHas>(); }
+
+FunctionOverloadResolverPtr createInternalFunctionHasOverloadResolver()
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionHas>());
+}
+
 }
diff --git a/src/Functions/array/has.h b/src/Functions/array/has.h
new file mode 100644
index 00000000000..226662d4051
--- /dev/null
+++ b/src/Functions/array/has.h
@@ -0,0 +1,12 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class IFunctionOverloadResolver;
+using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
+
+FunctionOverloadResolverPtr createInternalFunctionHasOverloadResolver();
+
+}
diff --git a/src/Functions/array/mapOp.cpp b/src/Functions/array/mapOp.cpp
index 613fd934c41..50b64cf9809 100644
--- a/src/Functions/array/mapOp.cpp
+++ b/src/Functions/array/mapOp.cpp
@@ -1,18 +1,19 @@
-#include <cassert>
 #include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnMap.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnVector.h>
 #include <Columns/IColumn.h>
 #include <Core/ColumnWithTypeAndName.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include "Columns/ColumnMap.h"
-#include "DataTypes/DataTypeMap.h"
+#include <base/arithmeticOverflow.h>
 
+#include <cassert>
 
 namespace DB
 {
diff --git a/src/Functions/arrayStringConcat.cpp b/src/Functions/arrayStringConcat.cpp
index 0194cc4871a..c186c0ca7e6 100644
--- a/src/Functions/arrayStringConcat.cpp
+++ b/src/Functions/arrayStringConcat.cpp
@@ -151,12 +151,12 @@ public:
     {
         FunctionArgumentDescriptors mandatory_args
         {
-            {"arr", &isArray<IDataType>, nullptr, "Array"},
+            {"arr", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
         };
 
         FunctionArgumentDescriptors optional_args
         {
-            {"separator", &isString<IDataType>, isColumnConst, "const String"},
+            {"separator", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"},
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
diff --git a/src/Functions/caseWithExpression.cpp b/src/Functions/caseWithExpression.cpp
index 9547cd200b2..71fccc8436e 100644
--- a/src/Functions/caseWithExpression.cpp
+++ b/src/Functions/caseWithExpression.cpp
@@ -113,9 +113,7 @@ REGISTER_FUNCTION(CaseWithExpression)
     factory.registerFunction<FunctionCaseWithExpression>();
 
     /// These are obsolete function names.
-    factory.registerFunction<FunctionCaseWithExpression>("caseWithExpr");
+    factory.registerAlias("caseWithExpr", "caseWithExpression");
 }
 
 }
-
-
diff --git a/src/Functions/castOrDefault.cpp b/src/Functions/castOrDefault.cpp
index 26eaf4f5613..44b39811882 100644
--- a/src/Functions/castOrDefault.cpp
+++ b/src/Functions/castOrDefault.cpp
@@ -173,25 +173,22 @@ private:
     bool keep_nullable;
 };
 
-template <typename Type, typename Name>
 class FunctionCastOrDefaultTyped final : public IFunction
 {
 public:
-    static constexpr auto name = Name::name;
-
-    static FunctionPtr create(ContextPtr context)
-    {
-        return std::make_shared<FunctionCastOrDefaultTyped>(context);
-    }
-
-    explicit FunctionCastOrDefaultTyped(ContextPtr context_)
-        : impl(context_)
+    explicit FunctionCastOrDefaultTyped(ContextPtr context_, String name_, DataTypePtr type_)
+        : impl(context_), name(std::move(name_)), type(std::move(type_)), which(type)
     {
     }
 
     String getName() const override { return name; }
 
 private:
+    FunctionCastOrDefault impl;
+    String name;
+    DataTypePtr type;
+    WhichDataType which;
+
     size_t getNumberOfArguments() const override { return 0; }
     bool isVariadic() const override { return true; }
 
@@ -209,11 +206,11 @@ private:
         FunctionArgumentDescriptors mandatory_args = {{"Value", nullptr, nullptr, nullptr}};
         FunctionArgumentDescriptors optional_args;
 
-        if constexpr (IsDataTypeDecimal<Type>)
-            mandatory_args.push_back({"scale", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"});
+        if (isDecimal(type) || isDateTime64(type))
+            mandatory_args.push_back({"scale", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), &isColumnConst, "const Integer"});
 
-        if (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
-            optional_args.push_back({"timezone", &isString<IDataType>, isColumnConst, "const String"});
+        if (isDateTimeOrDateTime64(type))
+            optional_args.push_back({"timezone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"});
 
         optional_args.push_back({"default_value", nullptr, nullptr, nullptr});
 
@@ -224,7 +221,7 @@ private:
         size_t scale = 0;
         std::string time_zone;
 
-        if constexpr (IsDataTypeDecimal<Type>)
+        if (isDecimal(type) || isDateTime64(type))
         {
             const auto & scale_argument = arguments[additional_argument_index];
 
@@ -241,7 +238,7 @@ private:
             ++additional_argument_index;
         }
 
-        if constexpr (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
+        if (isDateTimeOrDateTime64(type))
         {
             if (additional_argument_index < arguments.size())
             {
@@ -251,16 +248,22 @@ private:
             }
         }
 
-        std::shared_ptr<Type> cast_type;
+        DataTypePtr cast_type;
 
-        if constexpr (std::is_same_v<Type, DataTypeDateTime64>)
-            cast_type = std::make_shared<Type>(scale, time_zone);
-        else if constexpr (IsDataTypeDecimal<Type>)
-            cast_type = std::make_shared<Type>(Type::maxPrecision(), scale);
-        else if constexpr (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>)
-            cast_type = std::make_shared<Type>(time_zone);
+        if (which.isDateTime64())
+            cast_type = std::make_shared<DataTypeDateTime64>(scale, time_zone);
+        else if (which.isDateTime())
+            cast_type = std::make_shared<DataTypeDateTime>(time_zone);
+        else if (which.isDecimal32())
+            cast_type = createDecimalMaxPrecision<Decimal32>(scale);
+        else if (which.isDecimal64())
+            cast_type = createDecimalMaxPrecision<Decimal64>(scale);
+        else if (which.isDecimal128())
+            cast_type = createDecimalMaxPrecision<Decimal128>(scale);
+        else if (which.isDecimal256())
+            cast_type = createDecimalMaxPrecision<Decimal256>(scale);
         else
-            cast_type = std::make_shared<Type>();
+            cast_type = type;
 
         ColumnWithTypeAndName type_argument =
         {
@@ -289,7 +292,8 @@ private:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_size) const override
     {
-        size_t additional_arguments_size = IsDataTypeDecimal<Type> + (std::is_same_v<Type, DataTypeDateTime> || std::is_same_v<Type, DataTypeDateTime64>);
+        /// Scale and time zone
+        size_t additional_arguments_size = (which.isDecimal() || which.isDateTime64()) + which.isDateTimeOrDateTime64();
 
         ColumnWithTypeAndName second_argument =
         {
@@ -299,7 +303,7 @@ private:
         };
 
         ColumnsWithTypeAndName arguments_with_cast_type;
-        arguments_with_cast_type.reserve(arguments.size());
+        arguments_with_cast_type.reserve(arguments.size() + 1);
 
         arguments_with_cast_type.emplace_back(arguments[0]);
         arguments_with_cast_type.emplace_back(second_argument);
@@ -310,98 +314,79 @@ private:
 
         return impl.executeImpl(arguments_with_cast_type, result_type, input_rows_size);
     }
-
-    FunctionCastOrDefault impl;
 };
 
-struct NameToUInt8OrDefault { static constexpr auto name = "toUInt8OrDefault"; };
-struct NameToUInt16OrDefault { static constexpr auto name = "toUInt16OrDefault"; };
-struct NameToUInt32OrDefault { static constexpr auto name = "toUInt32OrDefault"; };
-struct NameToUInt64OrDefault { static constexpr auto name = "toUInt64OrDefault"; };
-struct NameToUInt256OrDefault { static constexpr auto name = "toUInt256OrDefault"; };
-struct NameToInt8OrDefault { static constexpr auto name = "toInt8OrDefault"; };
-struct NameToInt16OrDefault { static constexpr auto name = "toInt16OrDefault"; };
-struct NameToInt32OrDefault { static constexpr auto name = "toInt32OrDefault"; };
-struct NameToInt64OrDefault { static constexpr auto name = "toInt64OrDefault"; };
-struct NameToInt128OrDefault { static constexpr auto name = "toInt128OrDefault"; };
-struct NameToInt256OrDefault { static constexpr auto name = "toInt256OrDefault"; };
-struct NameToFloat32OrDefault { static constexpr auto name = "toFloat32OrDefault"; };
-struct NameToFloat64OrDefault { static constexpr auto name = "toFloat64OrDefault"; };
-struct NameToDateOrDefault { static constexpr auto name = "toDateOrDefault"; };
-struct NameToDate32OrDefault { static constexpr auto name = "toDate32OrDefault"; };
-struct NameToDateTimeOrDefault { static constexpr auto name = "toDateTimeOrDefault"; };
-struct NameToDateTime64OrDefault { static constexpr auto name = "toDateTime64OrDefault"; };
-struct NameToDecimal32OrDefault { static constexpr auto name = "toDecimal32OrDefault"; };
-struct NameToDecimal64OrDefault { static constexpr auto name = "toDecimal64OrDefault"; };
-struct NameToDecimal128OrDefault { static constexpr auto name = "toDecimal128OrDefault"; };
-struct NameToDecimal256OrDefault { static constexpr auto name = "toDecimal256OrDefault"; };
-struct NameToUUIDOrDefault { static constexpr auto name = "toUUIDOrDefault"; };
-struct NameToIPv4OrDefault { static constexpr auto name = "toIPv4OrDefault"; };
-struct NameToIPv6OrDefault { static constexpr auto name = "toIPv6OrDefault"; };
-
-using FunctionToUInt8OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt8, NameToUInt8OrDefault>;
-using FunctionToUInt16OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt16, NameToUInt16OrDefault>;
-using FunctionToUInt32OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt32, NameToUInt32OrDefault>;
-using FunctionToUInt64OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt64, NameToUInt64OrDefault>;
-using FunctionToUInt256OrDefault = FunctionCastOrDefaultTyped<DataTypeUInt256, NameToUInt256OrDefault>;
-
-using FunctionToInt8OrDefault = FunctionCastOrDefaultTyped<DataTypeInt8, NameToInt8OrDefault>;
-using FunctionToInt16OrDefault = FunctionCastOrDefaultTyped<DataTypeInt16, NameToInt16OrDefault>;
-using FunctionToInt32OrDefault = FunctionCastOrDefaultTyped<DataTypeInt32, NameToInt32OrDefault>;
-using FunctionToInt64OrDefault = FunctionCastOrDefaultTyped<DataTypeInt64, NameToInt64OrDefault>;
-using FunctionToInt128OrDefault = FunctionCastOrDefaultTyped<DataTypeInt128, NameToInt128OrDefault>;
-using FunctionToInt256OrDefault = FunctionCastOrDefaultTyped<DataTypeInt256, NameToInt256OrDefault>;
-
-using FunctionToFloat32OrDefault = FunctionCastOrDefaultTyped<DataTypeFloat32, NameToFloat32OrDefault>;
-using FunctionToFloat64OrDefault = FunctionCastOrDefaultTyped<DataTypeFloat64, NameToFloat64OrDefault>;
-
-using FunctionToDateOrDefault = FunctionCastOrDefaultTyped<DataTypeDate, NameToDateOrDefault>;
-using FunctionToDate32OrDefault = FunctionCastOrDefaultTyped<DataTypeDate32, NameToDate32OrDefault>;
-using FunctionToDateTimeOrDefault = FunctionCastOrDefaultTyped<DataTypeDateTime, NameToDateTimeOrDefault>;
-using FunctionToDateTime64OrDefault = FunctionCastOrDefaultTyped<DataTypeDateTime64, NameToDateTime64OrDefault>;
-
-using FunctionToDecimal32OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal32>, NameToDecimal32OrDefault>;
-using FunctionToDecimal64OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal64>, NameToDecimal64OrDefault>;
-using FunctionToDecimal128OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal128>, NameToDecimal128OrDefault>;
-using FunctionToDecimal256OrDefault = FunctionCastOrDefaultTyped<DataTypeDecimal<Decimal256>, NameToDecimal256OrDefault>;
-
-using FunctionToUUIDOrDefault = FunctionCastOrDefaultTyped<DataTypeUUID, NameToUUIDOrDefault>;
-using FunctionToIPv4OrDefault = FunctionCastOrDefaultTyped<DataTypeIPv4, NameToIPv4OrDefault>;
-using FunctionToIPv6OrDefault = FunctionCastOrDefaultTyped<DataTypeIPv6, NameToIPv6OrDefault>;
-
 REGISTER_FUNCTION(CastOrDefault)
 {
     factory.registerFunction<FunctionCastOrDefault>();
 
-    factory.registerFunction<FunctionToUInt8OrDefault>();
-    factory.registerFunction<FunctionToUInt16OrDefault>();
-    factory.registerFunction<FunctionToUInt32OrDefault>();
-    factory.registerFunction<FunctionToUInt64OrDefault>();
-    factory.registerFunction<FunctionToUInt256OrDefault>();
+    factory.registerFunction("toUInt8OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt8OrDefault", std::make_shared<DataTypeUInt8>()); });
+    factory.registerFunction("toUInt16OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt16OrDefault", std::make_shared<DataTypeUInt16>()); });
+    factory.registerFunction("toUInt32OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt32OrDefault", std::make_shared<DataTypeUInt32>()); });
+    factory.registerFunction("toUInt64OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt64OrDefault", std::make_shared<DataTypeUInt64>()); });
+    factory.registerFunction("toUInt128OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt128OrDefault", std::make_shared<DataTypeUInt128>()); },
+        FunctionDocumentation{
+            .description=R"(
+Converts a string in the first argument of the function to UInt128 by parsing it.
+If it cannot parse the value, returns the default value, which can be provided as the second function argument, and if provided, must be of UInt128 type.
+If the default value is not provided in the second argument, it is assumed to be zero.
+)",
+            .examples{
+                {"Successful conversion", "SELECT toUInt128OrDefault('1', 2::UInt128)", "1"},
+                {"Default value", "SELECT toUInt128OrDefault('upyachka', 123456789012345678901234567890::UInt128)", "123456789012345678901234567890"},
+                {"Implicit default value", "SELECT toUInt128OrDefault('upyachka')", "0"}},
+            .categories{"ConversionFunctions"}
+        });
+    factory.registerFunction("toUInt256OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUInt256OrDefault", std::make_shared<DataTypeUInt256>()); });
 
-    factory.registerFunction<FunctionToInt8OrDefault>();
-    factory.registerFunction<FunctionToInt16OrDefault>();
-    factory.registerFunction<FunctionToInt32OrDefault>();
-    factory.registerFunction<FunctionToInt64OrDefault>();
-    factory.registerFunction<FunctionToInt128OrDefault>();
-    factory.registerFunction<FunctionToInt256OrDefault>();
+    factory.registerFunction("toInt8OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt8OrDefault", std::make_shared<DataTypeInt8>()); });
+    factory.registerFunction("toInt16OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt16OrDefault", std::make_shared<DataTypeInt16>()); });
+    factory.registerFunction("toInt32OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt32OrDefault", std::make_shared<DataTypeInt32>()); });
+    factory.registerFunction("toInt64OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt64OrDefault", std::make_shared<DataTypeInt64>()); });
+    factory.registerFunction("toInt128OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt128OrDefault", std::make_shared<DataTypeInt128>()); });
+    factory.registerFunction("toInt256OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toInt256OrDefault", std::make_shared<DataTypeInt256>()); });
 
-    factory.registerFunction<FunctionToFloat32OrDefault>();
-    factory.registerFunction<FunctionToFloat64OrDefault>();
+    factory.registerFunction("toFloat32OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toFloat32OrDefault", std::make_shared<DataTypeFloat32>()); });
+    factory.registerFunction("toFloat64OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toFloat64OrDefault", std::make_shared<DataTypeFloat64>()); });
 
-    factory.registerFunction<FunctionToDateOrDefault>();
-    factory.registerFunction<FunctionToDate32OrDefault>();
-    factory.registerFunction<FunctionToDateTimeOrDefault>();
-    factory.registerFunction<FunctionToDateTime64OrDefault>();
+    factory.registerFunction("toDateOrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDateOrDefault", std::make_shared<DataTypeDate>()); });
+    factory.registerFunction("toDate32OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDate32OrDefault", std::make_shared<DataTypeDate32>()); });
+    factory.registerFunction("toDateTimeOrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDateTimeOrDefault", std::make_shared<DataTypeDateTime>()); });
+    factory.registerFunction("toDateTime64OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDateTime64OrDefault", std::make_shared<DataTypeDateTime64>(3 /* default scale */)); });
 
-    factory.registerFunction<FunctionToDecimal32OrDefault>();
-    factory.registerFunction<FunctionToDecimal64OrDefault>();
-    factory.registerFunction<FunctionToDecimal128OrDefault>();
-    factory.registerFunction<FunctionToDecimal256OrDefault>();
+    factory.registerFunction("toDecimal32OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDecimal32OrDefault", createDecimalMaxPrecision<Decimal32>(0)); });
+    factory.registerFunction("toDecimal64OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDecimal64OrDefault", createDecimalMaxPrecision<Decimal64>(0)); });
+    factory.registerFunction("toDecimal128OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDecimal128OrDefault", createDecimalMaxPrecision<Decimal128>(0)); });
+    factory.registerFunction("toDecimal256OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toDecimal256OrDefault", createDecimalMaxPrecision<Decimal256>(0)); });
 
-    factory.registerFunction<FunctionToUUIDOrDefault>();
-    factory.registerFunction<FunctionToIPv4OrDefault>();
-    factory.registerFunction<FunctionToIPv6OrDefault>();
+    factory.registerFunction("toUUIDOrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toUUIDOrDefault", std::make_shared<DataTypeUUID>()); });
+    factory.registerFunction("toIPv4OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toIPv4OrDefault", std::make_shared<DataTypeIPv4>()); });
+    factory.registerFunction("toIPv6OrDefault", [](ContextPtr context)
+        { return std::make_shared<FunctionCastOrDefaultTyped>(context, "toIPv6OrDefault", std::make_shared<DataTypeIPv6>()); });
 }
 
 }
diff --git a/src/Functions/coalesce.cpp b/src/Functions/coalesce.cpp
index befebd1ff52..4ae90a9db13 100644
--- a/src/Functions/coalesce.cpp
+++ b/src/Functions/coalesce.cpp
@@ -29,7 +29,14 @@ public:
         return std::make_shared<FunctionCoalesce>(context);
     }
 
-    explicit FunctionCoalesce(ContextPtr context_) : context(context_) {}
+    explicit FunctionCoalesce(ContextPtr context_)
+        : context(context_)
+        , is_not_null(FunctionFactory::instance().get("isNotNull", context))
+        , assume_not_null(FunctionFactory::instance().get("assumeNotNull", context))
+        , if_function(FunctionFactory::instance().get("if", context))
+        , multi_if_function(FunctionFactory::instance().get("multiIf", context))
+    {
+    }
 
     std::string getName() const override
     {
@@ -110,8 +117,6 @@ public:
                 break;
         }
 
-        auto is_not_null = FunctionFactory::instance().get("isNotNull", context);
-        auto assume_not_null = FunctionFactory::instance().get("assumeNotNull", context);
 
         ColumnsWithTypeAndName multi_if_args;
         ColumnsWithTypeAndName tmp_args(1);
@@ -146,13 +151,8 @@ public:
         /// If there was only two arguments (3 arguments passed to multiIf)
         /// use function "if" instead, because it's implemented more efficient.
         /// TODO: make "multiIf" the same efficient.
-        FunctionOverloadResolverPtr if_function;
-        if (multi_if_args.size() == 3)
-            if_function = FunctionFactory::instance().get("if", context);
-        else
-            if_function = FunctionFactory::instance().get("multiIf", context);
-
-        ColumnPtr res = if_function->build(multi_if_args)->execute(multi_if_args, result_type, input_rows_count);
+        FunctionOverloadResolverPtr if_or_multi_if = multi_if_args.size() == 3 ? if_function : multi_if_function;
+        ColumnPtr res = if_or_multi_if->build(multi_if_args)->execute(multi_if_args, result_type, input_rows_count);
 
         /// if last argument is not nullable, result should be also not nullable
         if (!multi_if_args.back().column->isNullable() && res->isNullable())
@@ -170,6 +170,10 @@ public:
 
 private:
     ContextPtr context;
+    FunctionOverloadResolverPtr is_not_null;
+    FunctionOverloadResolverPtr assume_not_null;
+    FunctionOverloadResolverPtr if_function;
+    FunctionOverloadResolverPtr multi_if_function;
 };
 
 }
diff --git a/src/Functions/concat.cpp b/src/Functions/concat.cpp
index b057e7fede5..c75a806559c 100644
--- a/src/Functions/concat.cpp
+++ b/src/Functions/concat.cpp
@@ -1,8 +1,8 @@
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnStringHelpers.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionsConversion.h>
 #include <Functions/GatherUtils/Algorithms.h>
 #include <Functions/GatherUtils/Sinks.h>
 #include <Functions/GatherUtils/Sources.h>
@@ -80,21 +80,21 @@ private:
         const ColumnConst * c0_const_string = checkAndGetColumnConst<ColumnString>(c0);
         const ColumnConst * c1_const_string = checkAndGetColumnConst<ColumnString>(c1);
 
-        auto c_res = ColumnString::create();
+        auto col_res = ColumnString::create();
 
         if (c0_string && c1_string)
-            concat(StringSource(*c0_string), StringSource(*c1_string), StringSink(*c_res, c0->size()));
+            concat(StringSource(*c0_string), StringSource(*c1_string), StringSink(*col_res, c0->size()));
         else if (c0_string && c1_const_string)
-            concat(StringSource(*c0_string), ConstSource<StringSource>(*c1_const_string), StringSink(*c_res, c0->size()));
+            concat(StringSource(*c0_string), ConstSource<StringSource>(*c1_const_string), StringSink(*col_res, c0->size()));
         else if (c0_const_string && c1_string)
-            concat(ConstSource<StringSource>(*c0_const_string), StringSource(*c1_string), StringSink(*c_res, c0->size()));
+            concat(ConstSource<StringSource>(*c0_const_string), StringSource(*c1_string), StringSink(*col_res, c0->size()));
         else
         {
             /// Fallback: use generic implementation for not very important cases.
             return executeFormatImpl(arguments, input_rows_count);
         }
 
-        return c_res;
+        return col_res;
     }
 
     ColumnPtr executeFormatImpl(const ColumnsWithTypeAndName & arguments, size_t input_rows_count) const
@@ -102,7 +102,7 @@ private:
         const size_t num_arguments = arguments.size();
         assert(num_arguments >= 2);
 
-        auto c_res = ColumnString::create();
+        auto col_res = ColumnString::create();
         std::vector<const ColumnString::Chars *> data(num_arguments);
         std::vector<const ColumnString::Offsets *> offsets(num_arguments);
         std::vector<size_t> fixed_string_sizes(num_arguments);
@@ -169,11 +169,11 @@ private:
             offsets,
             fixed_string_sizes,
             constant_strings,
-            c_res->getChars(),
-            c_res->getOffsets(),
+            col_res->getChars(),
+            col_res->getOffsets(),
             input_rows_count);
 
-        return c_res;
+        return col_res;
     }
 };
 
diff --git a/src/Functions/concatWithSeparator.cpp b/src/Functions/concatWithSeparator.cpp
index b4f3732710f..ed02f331192 100644
--- a/src/Functions/concatWithSeparator.cpp
+++ b/src/Functions/concatWithSeparator.cpp
@@ -1,5 +1,6 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnString.h>
+#include <Columns/ColumnStringHelpers.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
@@ -27,7 +28,6 @@ class ConcatWithSeparatorImpl : public IFunction
 public:
     static constexpr auto name = Name::name;
     explicit ConcatWithSeparatorImpl(ContextPtr context_) : context(context_) { }
-
     static FunctionPtr create(ContextPtr context) { return std::make_shared<ConcatWithSeparatorImpl>(context); }
 
     String getName() const override { return name; }
@@ -49,17 +49,13 @@ public:
                 getName(),
                 arguments.size());
 
-        for (const auto arg_idx : collections::range(0, arguments.size()))
-        {
-            const auto * arg = arguments[arg_idx].get();
-            if (!isStringOrFixedString(arg))
-                throw Exception(
-                    ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                    "Illegal type {} of argument {} of function {}",
-                    arg->getName(),
-                    arg_idx + 1,
-                    getName());
-        }
+        const auto * separator_arg = arguments[0].get();
+        if (!isStringOrFixedString(separator_arg))
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "Illegal type {} of first argument of function {}",
+                separator_arg->getName(),
+                getName());
 
         return std::make_shared<DataTypeString>();
     }
@@ -70,8 +66,9 @@ public:
         if (arguments.size() == 1)
             return result_type->createColumnConstWithDefaultValue(input_rows_count);
 
-        auto c_res = ColumnString::create();
-        c_res->reserve(input_rows_count);
+        auto col_res = ColumnString::create();
+        col_res->reserve(input_rows_count);
+
         const ColumnConst * col_sep = checkAndGetColumnConstStringOrFixedString(arguments[0].column.get());
         if (!col_sep)
             throw Exception(
@@ -88,6 +85,7 @@ public:
         std::vector<const ColumnString::Offsets *> offsets(num_args);
         std::vector<size_t> fixed_string_sizes(num_args);
         std::vector<std::optional<String>> constant_strings(num_args);
+        std::vector<ColumnString::MutablePtr> converted_col_ptrs(num_args);
 
         bool has_column_string = false;
         bool has_column_fixed_string = false;
@@ -111,9 +109,33 @@ public:
                 fixed_string_sizes[2 * i] = fixed_col->getN();
             }
             else if (const ColumnConst * const_col = checkAndGetColumnConstStringOrFixedString(column.get()))
+            {
                 constant_strings[2 * i] = const_col->getValue<String>();
+            }
             else
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column {} of argument of function {}", column->getName(), getName());
+            {
+                /// A non-String/non-FixedString-type argument: use the default serialization to convert it to String
+                auto full_column = column->convertToFullIfNeeded();
+                auto serialization = arguments[i +1].type->getDefaultSerialization();
+                auto converted_col_str = ColumnString::create();
+                ColumnStringHelpers::WriteHelper write_helper(*converted_col_str, column->size());
+                auto & write_buffer = write_helper.getWriteBuffer();
+                FormatSettings format_settings;
+                for (size_t row = 0; row < column->size(); ++row)
+                {
+                    serialization->serializeText(*full_column, row, write_buffer, format_settings);
+                    write_helper.rowWritten();
+                }
+                write_helper.finalize();
+
+                /// Keep the pointer alive
+                converted_col_ptrs[i] = std::move(converted_col_str);
+
+                /// Same as the normal `ColumnString` branch
+                has_column_string = true;
+                data[2 * i] = &converted_col_ptrs[i]->getChars();
+                offsets[2 * i] = &converted_col_ptrs[i]->getOffsets();
+            }
         }
 
         String pattern;
@@ -129,10 +151,10 @@ public:
             offsets,
             fixed_string_sizes,
             constant_strings,
-            c_res->getChars(),
-            c_res->getOffsets(),
+            col_res->getChars(),
+            col_res->getOffsets(),
             input_rows_count);
-        return std::move(c_res);
+        return std::move(col_res);
     }
 
 private:
diff --git a/src/Functions/countDigits.cpp b/src/Functions/countDigits.cpp
index 2ca8d944b0a..f2712b5b301 100644
--- a/src/Functions/countDigits.cpp
+++ b/src/Functions/countDigits.cpp
@@ -20,6 +20,40 @@ namespace ErrorCodes
 namespace
 {
 
+template <typename T>
+int digits10(T x)
+{
+    if (x < 10ULL)
+        return 1;
+    if (x < 100ULL)
+        return 2;
+    if (x < 1000ULL)
+        return 3;
+
+    if (x < 1000000000000ULL)
+    {
+        if (x < 100000000ULL)
+        {
+            if (x < 1000000ULL)
+            {
+                if (x < 10000ULL)
+                    return 4;
+                else
+                    return 5 + (x >= 100000ULL);
+            }
+
+            return 7 + (x >= 10000000ULL);
+        }
+
+        if (x < 10000000000ULL)
+            return 9 + (x >= 1000000000ULL);
+
+        return 11 + (x >= 100000000000ULL);
+    }
+
+    return 12 + digits10(x / 1000000000000ULL);
+}
+
 /// Returns number of decimal digits you need to represent the value.
 /// For Decimal values takes in account their scales: calculates result over underlying int type which is (value * scale).
 /// countDigits(42) = 2, countDigits(42.000) = 5, countDigits(0.04200) = 4.
diff --git a/src/Functions/countMatches.h b/src/Functions/countMatches.h
index 5e02915de56..fbbb9d017ee 100644
--- a/src/Functions/countMatches.h
+++ b/src/Functions/countMatches.h
@@ -3,6 +3,7 @@
 #include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -15,9 +16,7 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int ILLEGAL_COLUMN;
-    extern const int LOGICAL_ERROR;
 }
 
 using Pos = const char *;
@@ -35,45 +34,46 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        if (!isStringOrFixedString(arguments[1].type))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of second argument (pattern) of function {}. Must be String/FixedString.",
-                arguments[1].type->getName(), getName());
-        if (!isStringOrFixedString(arguments[0].type))
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Illegal type {} of first argument (haystack) of function {}. Must be String/FixedString.",
-                arguments[0].type->getName(), getName());
-        const auto * column = arguments[1].column.get();
-        if (!column || !checkAndGetColumnConstStringOrFixedString(column))
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                "The second argument of function {} should be a constant string with the pattern",
-                getName());
+        FunctionArgumentDescriptors args{
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"},
+            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "constant String"}
+        };
+        validateFunctionArgumentTypes(*this, arguments, args);
 
         return std::make_shared<DataTypeUInt64>();
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        const ColumnConst * column_pattern = checkAndGetColumnConstStringOrFixedString(arguments[1].column.get());
-        const OptimizedRegularExpression re = Regexps::createRegexp</*is_like*/ false, /*no_capture*/ true, CountMatchesBase::case_insensitive>(column_pattern->getValue<String>());
+        const IColumn * col_pattern = arguments[1].column.get();
+        const ColumnConst * col_pattern_const = checkAndGetColumnConst<ColumnString>(col_pattern);
+        if (col_pattern_const == nullptr)
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Pattern argument is not const");
+
+        const OptimizedRegularExpression re = Regexps::createRegexp</*is_like*/ false, /*no_capture*/ true, CountMatchesBase::case_insensitive>(col_pattern_const->getValue<String>());
+
+        const IColumn * col_haystack = arguments[0].column.get();
         OptimizedRegularExpression::MatchVec matches;
 
-        const IColumn * column_haystack = arguments[0].column.get();
-
-        if (const ColumnString * col_str = checkAndGetColumn<ColumnString>(column_haystack))
+        if (const ColumnConst * col_haystack_const = checkAndGetColumnConstStringOrFixedString(col_haystack))
         {
-            auto result_column = ColumnUInt64::create();
+            std::string_view str = col_haystack_const->getDataColumn().getDataAt(0).toView();
+            uint64_t matches_count = countMatches(str, re, matches);
+            return result_type->createColumnConst(input_rows_count, matches_count);
+        }
+        else if (const ColumnString * col_haystack_string = checkAndGetColumn<ColumnString>(col_haystack))
+        {
+            auto col_res = ColumnUInt64::create();
 
-            const ColumnString::Chars & src_chars = col_str->getChars();
-            const ColumnString::Offsets & src_offsets = col_str->getOffsets();
+            const ColumnString::Chars & src_chars = col_haystack_string->getChars();
+            const ColumnString::Offsets & src_offsets = col_haystack_string->getOffsets();
 
-            ColumnUInt64::Container & vec_res = result_column->getData();
+            ColumnUInt64::Container & vec_res = col_res->getData();
             vec_res.resize(input_rows_count);
 
-            size_t size = src_offsets.size();
             ColumnString::Offset current_src_offset = 0;
 
-            for (size_t i = 0; i < size; ++i)
+            for (size_t i = 0; i < input_rows_count; ++i)
             {
                 Pos pos = reinterpret_cast<Pos>(&src_chars[current_src_offset]);
                 current_src_offset = src_offsets[i];
@@ -83,16 +83,25 @@ public:
                 vec_res[i] = countMatches(str, re, matches);
             }
 
-            return result_column;
+            return col_res;
         }
-        else if (const ColumnConst * col_const_str = checkAndGetColumnConstStringOrFixedString(column_haystack))
+        else if (const ColumnFixedString * col_haystack_fixedstring = checkAndGetColumn<ColumnFixedString>(col_haystack))
         {
-            std::string_view str = col_const_str->getDataColumn().getDataAt(0).toView();
-            uint64_t matches_count = countMatches(str, re, matches);
-            return result_type->createColumnConst(input_rows_count, matches_count);
+            auto col_res = ColumnUInt64::create();
+
+            ColumnUInt64::Container & vec_res = col_res->getData();
+            vec_res.resize(input_rows_count);
+
+            for (size_t i = 0; i < input_rows_count; ++i)
+            {
+                std::string_view str = col_haystack_fixedstring->getDataAt(i).toView();
+                vec_res[i] = countMatches(str, re, matches);
+            }
+
+            return col_res;
         }
         else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Error in FunctionCountMatches::getReturnTypeImpl()");
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Could not cast haystack argument to String or FixedString");
     }
 
     static uint64_t countMatches(std::string_view src, const OptimizedRegularExpression & re, OptimizedRegularExpression::MatchVec & matches)
@@ -116,7 +125,7 @@ public:
             if (!matches[0].length)
                 break;
             pos += matches[0].offset + matches[0].length;
-            match_count++;
+            ++match_count;
         }
 
         return match_count;
diff --git a/src/Functions/coverage.cpp b/src/Functions/coverage.cpp
index 8a62469fa54..f3eb23faca7 100644
--- a/src/Functions/coverage.cpp
+++ b/src/Functions/coverage.cpp
@@ -4,7 +4,9 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnVector.h>
+#include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnsNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <Interpreters/Context.h>
@@ -21,11 +23,14 @@ namespace
 enum class Kind
 {
     Current,
+    Cumulative,
     All
 };
 
 /** If ClickHouse is build with coverage instrumentation, returns an array
-  * of currently accumulated (`coverage`) / all possible (`coverageAll`) unique code addresses.
+  * of currently accumulated (`coverageCurrent`)
+  * or accumulated since the startup (`coverageCumulative`)
+  * or all possible (`coverageAll`) unique code addresses.
   */
 class FunctionCoverage : public IFunction
 {
@@ -64,7 +69,11 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName &, const DataTypePtr &, size_t input_rows_count) const override
     {
-        auto coverage_table = kind == Kind::Current ? getCoverage() : getAllInstrumentedAddresses();
+        auto coverage_table = kind == Kind::Current
+            ? getCurrentCoverage()
+            : (kind == Kind::Cumulative
+                ? getCumulativeCoverage()
+                : getAllInstrumentedAddresses());
 
         auto column_addresses = ColumnUInt64::create();
         auto & data = column_addresses->getData();
@@ -85,8 +94,68 @@ public:
 
 REGISTER_FUNCTION(Coverage)
 {
-    factory.registerFunction("coverage", [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionCoverage>(Kind::Current)); });
-    factory.registerFunction("coverageAll", [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionCoverage>(Kind::All)); });
+    factory.registerFunction("coverageCurrent", [](ContextPtr){ return std::make_shared<FunctionCoverage>(Kind::Current); },
+        FunctionDocumentation
+        {
+            .description=R"(
+This function is only available if ClickHouse was built with the SANITIZE_COVERAGE=1 option.
+
+It returns an array of unique addresses (a subset of the instrumented points in code) in the code
+encountered at runtime after the previous coverage reset (with the `SYSTEM RESET COVERAGE` query) or after server startup.
+
+[example:functions]
+
+The order of array elements is undetermined.
+
+You can use another function, `coverageAll` to find all instrumented addresses in the code to compare and calculate the percentage.
+
+You can process the addresses with the `addressToSymbol` (possibly with `demangle`) and `addressToLine` functions
+to calculate symbol-level, file-level, or line-level coverage.
+
+If you run multiple tests sequentially and reset the coverage with the `SYSTEM RESET COVERAGE` query between the tests,
+you can obtain a coverage information for every test in isolation, to find which functions are covered by which tests and vise-versa.
+
+By default, every *basic block* in the code is covered, which roughly means - a sequence of instructions without jumps,
+e.g. a body of for loop without ifs, or a single branch of if.
+
+See https://clang.llvm.org/docs/SanitizerCoverage.html for more information.
+)",
+            .examples{
+                {"functions", "SELECT DISTINCT demangle(addressToSymbol(arrayJoin(coverageCurrent())))", ""}},
+            .categories{"Introspection"}
+        });
+
+    factory.registerFunction("coverageCumulative", [](ContextPtr){ return std::make_shared<FunctionCoverage>(Kind::Cumulative); },
+        FunctionDocumentation
+        {
+            .description=R"(
+This function is only available if ClickHouse was built with the SANITIZE_COVERAGE=1 option.
+
+It returns an array of unique addresses (a subset of the instrumented points in code) in the code
+encountered at runtime after server startup.
+
+In contrast to `coverageCurrent` it cannot be reset with the `SYSTEM RESET COVERAGE`.
+
+See the `coverageCurrent` function for the details.
+)",
+            .categories{"Introspection"}
+        });
+
+    factory.registerFunction("coverageAll", [](ContextPtr){ return std::make_shared<FunctionCoverage>(Kind::All); },
+        FunctionDocumentation
+        {
+            .description=R"(
+This function is only available if ClickHouse was built with the SANITIZE_COVERAGE=1 option.
+
+It returns an array of all unique addresses in the code instrumented for coverage
+- all possible addresses that can appear in the result of the `coverage` function.
+
+You can use this function, and the `coverage` function to compare and calculate the coverage percentage.
+
+See the `coverageCurrent` function for the details.
+)",
+            .categories{"Introspection"}
+        });
 }
 
 }
diff --git a/src/Functions/currentProfiles.cpp b/src/Functions/currentProfiles.cpp
index 77c8a20ccee..8f14943e011 100644
--- a/src/Functions/currentProfiles.cpp
+++ b/src/Functions/currentProfiles.cpp
@@ -98,9 +98,9 @@ namespace
 
 REGISTER_FUNCTION(Profiles)
 {
-    factory.registerFunction("currentProfiles", [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionProfiles>(context, Kind::currentProfiles)); });
-    factory.registerFunction("enabledProfiles", [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionProfiles>(context, Kind::enabledProfiles)); });
-    factory.registerFunction("defaultProfiles", [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionProfiles>(context, Kind::defaultProfiles)); });
+    factory.registerFunction("currentProfiles", [](ContextPtr context){ return std::make_shared<FunctionProfiles>(context, Kind::currentProfiles); });
+    factory.registerFunction("enabledProfiles", [](ContextPtr context){ return std::make_shared<FunctionProfiles>(context, Kind::enabledProfiles); });
+    factory.registerFunction("defaultProfiles", [](ContextPtr context){ return std::make_shared<FunctionProfiles>(context, Kind::defaultProfiles); });
 }
 
 }
diff --git a/src/Functions/currentUser.cpp b/src/Functions/currentUser.cpp
index 67b5d7626bf..1679c56a929 100644
--- a/src/Functions/currentUser.cpp
+++ b/src/Functions/currentUser.cpp
@@ -55,6 +55,7 @@ REGISTER_FUNCTION(CurrentUser)
 {
     factory.registerFunction<FunctionCurrentUser>();
     factory.registerAlias("user", FunctionCurrentUser::name, FunctionFactory::CaseInsensitive);
+    factory.registerAlias("current_user", FunctionCurrentUser::name, FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/Functions/dateDiff.cpp b/src/Functions/dateDiff.cpp
index f75e6eb4fc8..8e8865db7ed 100644
--- a/src/Functions/dateDiff.cpp
+++ b/src/Functions/dateDiff.cpp
@@ -6,7 +6,7 @@
 #include <Columns/ColumnsDateTime.h>
 #include <Columns/ColumnsNumber.h>
 #include <Columns/ColumnDecimal.h>
-
+#include <Formats/FormatSettings.h>
 #include <Functions/IFunction.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/FunctionFactory.h>
@@ -177,10 +177,10 @@ public:
             DateTimeComponentsWithFractionalPart a_comp;
             DateTimeComponentsWithFractionalPart b_comp;
             Int64 adjust_value;
-            auto x_microseconds = TransformDateTime64<ToRelativeSubsecondNumImpl<microsecond_multiplier>>(transform_x.getScaleMultiplier()).execute(x, timezone_x);
-            auto y_microseconds = TransformDateTime64<ToRelativeSubsecondNumImpl<microsecond_multiplier>>(transform_y.getScaleMultiplier()).execute(y, timezone_y);
+            auto x_nanoseconds = TransformDateTime64<ToRelativeSubsecondNumImpl<nanosecond_multiplier>>(transform_x.getScaleMultiplier()).execute(x, timezone_x);
+            auto y_nanoseconds = TransformDateTime64<ToRelativeSubsecondNumImpl<nanosecond_multiplier>>(transform_y.getScaleMultiplier()).execute(y, timezone_y);
 
-            if (x_microseconds <= y_microseconds)
+            if (x_nanoseconds <= y_nanoseconds)
             {
                 a_comp = TransformDateTime64<ToDateTimeComponentsImpl>(transform_x.getScaleMultiplier()).execute(x, timezone_x);
                 b_comp = TransformDateTime64<ToDateTimeComponentsImpl>(transform_y.getScaleMultiplier()).execute(y, timezone_y);
@@ -193,7 +193,6 @@ public:
                 adjust_value = 1;
             }
 
-
             if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeYearNumImpl<ResultPrecision::Extended>>>)
             {
                 if ((a_comp.date.month > b_comp.date.month)
@@ -202,7 +201,8 @@ public:
                     || ((a_comp.time.hour == b_comp.time.hour) && ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeQuarterNumImpl<ResultPrecision::Extended>>>)
@@ -215,7 +215,8 @@ public:
                     || ((a_comp.time.hour == b_comp.time.hour) && ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeMonthNumImpl<ResultPrecision::Extended>>>)
@@ -225,7 +226,8 @@ public:
                     || ((a_comp.time.hour == b_comp.time.hour) && ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeWeekNumImpl<ResultPrecision::Extended>>>)
@@ -237,7 +239,8 @@ public:
                     || ((a_comp.time.hour == b_comp.time.hour) && ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeDayNumImpl<ResultPrecision::Extended>>>)
@@ -246,7 +249,8 @@ public:
                     || ((a_comp.time.hour == b_comp.time.hour) && ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeHourNumImpl<ResultPrecision::Extended>>>)
@@ -254,25 +258,34 @@ public:
                 if ((a_comp.time.minute > b_comp.time.minute)
                     || ((a_comp.time.minute == b_comp.time.minute) && ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeMinuteNumImpl<ResultPrecision::Extended>>>)
             {
                 if ((a_comp.time.second > b_comp.time.second)
                     || ((a_comp.time.second == b_comp.time.second) && ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))))
                     res += adjust_value;
             }
             else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeSecondNumImpl<ResultPrecision::Extended>>>)
             {
                 if ((a_comp.millisecond > b_comp.millisecond)
-                    || ((a_comp.millisecond == b_comp.millisecond) && (a_comp.microsecond > b_comp.microsecond)))
+                    || ((a_comp.millisecond == b_comp.millisecond) && ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))))
                     res += adjust_value;
             }
-            else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeSubsecondNumImpl<1000>>>)
+            else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeSubsecondNumImpl<millisecond_multiplier>>>)
             {
-                if (a_comp.microsecond > b_comp.microsecond)
+                if ((a_comp.microsecond > b_comp.microsecond)
+                    || ((a_comp.microsecond == b_comp.microsecond) && (a_comp.nanosecond > b_comp.nanosecond)))
+                    res += adjust_value;
+            }
+            else if constexpr (std::is_same_v<TransformX, TransformDateTime64<ToRelativeSubsecondNumImpl<microsecond_multiplier>>>)
+            {
+                if (a_comp.nanosecond > b_comp.nanosecond)
                     res += adjust_value;
             }
             return res;
@@ -401,6 +414,8 @@ public:
             impl.template dispatchForColumns<ToRelativeSubsecondNumImpl<millisecond_multiplier>>(x, y, timezone_x, timezone_y, res->getData());
         else if (unit == "microsecond" || unit == "microseconds" || unit == "us" || unit == "u")
             impl.template dispatchForColumns<ToRelativeSubsecondNumImpl<microsecond_multiplier>>(x, y, timezone_x, timezone_y, res->getData());
+        else if (unit == "nanosecond" || unit == "nanoseconds" || unit == "ns")
+            impl.template dispatchForColumns<ToRelativeSubsecondNumImpl<nanosecond_multiplier>>(x, y, timezone_x, timezone_y, res->getData());
         else
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "Function {} does not support '{}' unit", getName(), unit);
diff --git a/src/Functions/date_trunc.cpp b/src/Functions/date_trunc.cpp
index c3903fef137..de5e71e09a8 100644
--- a/src/Functions/date_trunc.cpp
+++ b/src/Functions/date_trunc.cpp
@@ -1,9 +1,10 @@
 #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>
+#include <Formats/FormatSettings.h>
 #include <Functions/DateTimeTransforms.h>
 #include <Functions/FunctionFactory.h>
 
@@ -55,9 +56,13 @@ public:
             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);
+            if (datepart_kind == IntervalKind::Kind::Nanosecond || datepart_kind == IntervalKind::Kind::Microsecond
+                || datepart_kind == IntervalKind::Kind::Millisecond)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "{} doesn't support {}", getName(), datepart_param);
+
+            result_type_is_date = (datepart_kind == IntervalKind::Kind::Year)
+                || (datepart_kind == IntervalKind::Kind::Quarter) || (datepart_kind == IntervalKind::Kind::Month)
+                || (datepart_kind == IntervalKind::Kind::Week);
         };
 
         bool second_argument_is_date = false;
@@ -68,8 +73,8 @@ public:
 
             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::Kind::Hour)
+                || (datepart_kind == IntervalKind::Kind::Minute) || (datepart_kind == IntervalKind::Kind::Second)))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type Date of argument for function {}", getName());
         };
 
diff --git a/src/Functions/decodeHTMLComponent.cpp b/src/Functions/decodeHTMLComponent.cpp
index 2cd95127266..4db3c43f946 100644
--- a/src/Functions/decodeHTMLComponent.cpp
+++ b/src/Functions/decodeHTMLComponent.cpp
@@ -70,8 +70,7 @@ namespace
             const char * src_pos = src;
             const char * src_end = src + src_size;
             char * dst_pos = dst;
-            // perfect hashmap to lookup html character references
-            HTMLCharacterHash hash;
+
             // to hold char seq for lookup, reuse it
             std::vector<char> seq;
             while (true)
@@ -108,7 +107,7 @@ namespace
                     // null terminate the sequence
                     seq.push_back('\0');
                     // lookup the html sequence in the perfect hashmap.
-                    const auto * res = hash.Lookup(seq.data(), strlen(seq.data()));
+                    const auto * res = HTMLCharacterHash::Lookup(seq.data(), strlen(seq.data()));
                     // reset so that it's reused in the next iteration
                     seq.clear();
                     if (res)
diff --git a/src/Functions/divide/divide.cpp b/src/Functions/divide/divide.cpp
index cf2cd354a7d..0708964c7d4 100644
--- a/src/Functions/divide/divide.cpp
+++ b/src/Functions/divide/divide.cpp
@@ -1,5 +1,5 @@
 #include "divide.h"
-#include <Common/CpuId.h>
+#include <Common/CPUID.h>
 
 #if defined(__x86_64__)
 namespace SSE2
@@ -26,9 +26,9 @@ template <typename A, typename B, typename ResultType>
 void divideImpl(const A * __restrict a_pos, B b, ResultType * __restrict c_pos, size_t size)
 {
 #if defined(__x86_64__)
-    if (DB::Cpu::CpuFlagsCache::have_AVX2)
+    if (DB::CPU::CPUFlagsCache::have_AVX2)
         AVX2::divideImpl(a_pos, b, c_pos, size);
-    else if (DB::Cpu::CpuFlagsCache::have_SSE2)
+    else if (DB::CPU::CPUFlagsCache::have_SSE2)
         SSE2::divideImpl(a_pos, b, c_pos, size);
 #else
     Generic::divideImpl(a_pos, b, c_pos, size);
@@ -49,9 +49,9 @@ template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restric
 template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
 template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
 template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
-template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, Int8, int64_t>(const int64_t * __restrict, Int8, int64_t * __restrict, size_t);
 
 template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
 template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
 template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
-template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, Int8, int32_t>(const int32_t * __restrict, Int8, int32_t * __restrict, size_t);
diff --git a/src/Functions/divide/divideImpl.cpp b/src/Functions/divide/divideImpl.cpp
index 966d5777c1d..6d44b427582 100644
--- a/src/Functions/divide/divideImpl.cpp
+++ b/src/Functions/divide/divideImpl.cpp
@@ -12,6 +12,10 @@
 
 #include <libdivide.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wbit-int-extension"
+using Int8 = signed _BitInt(8);
+#pragma clang diagnostic pop
 
 namespace NAMESPACE
 {
@@ -62,11 +66,11 @@ template void divideImpl<uint32_t, char8_t, uint32_t>(const uint32_t * __restric
 template void divideImpl<int64_t, int64_t, int64_t>(const int64_t * __restrict, int64_t, int64_t * __restrict, size_t);
 template void divideImpl<int64_t, int32_t, int64_t>(const int64_t * __restrict, int32_t, int64_t * __restrict, size_t);
 template void divideImpl<int64_t, int16_t, int64_t>(const int64_t * __restrict, int16_t, int64_t * __restrict, size_t);
-template void divideImpl<int64_t, int8_t, int64_t>(const int64_t * __restrict, int8_t, int64_t * __restrict, size_t);
+template void divideImpl<int64_t, Int8, int64_t>(const int64_t * __restrict, Int8, int64_t * __restrict, size_t);
 
 template void divideImpl<int32_t, int64_t, int32_t>(const int32_t * __restrict, int64_t, int32_t * __restrict, size_t);
 template void divideImpl<int32_t, int32_t, int32_t>(const int32_t * __restrict, int32_t, int32_t * __restrict, size_t);
 template void divideImpl<int32_t, int16_t, int32_t>(const int32_t * __restrict, int16_t, int32_t * __restrict, size_t);
-template void divideImpl<int32_t, int8_t, int32_t>(const int32_t * __restrict, int8_t, int32_t * __restrict, size_t);
+template void divideImpl<int32_t, Int8, int32_t>(const int32_t * __restrict, Int8, int32_t * __restrict, size_t);
 
 }
diff --git a/src/Functions/equals.cpp b/src/Functions/equals.cpp
index de1cf623ea6..5c59daf0537 100644
--- a/src/Functions/equals.cpp
+++ b/src/Functions/equals.cpp
@@ -1,5 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
+#include <Functions/FunctionsLogical.h>
 
 
 namespace DB
@@ -16,9 +17,16 @@ template <>
 ColumnPtr FunctionComparison<EqualsOp, NameEquals>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
+    FunctionOverloadResolverPtr func_builder_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionEquals>(check_decimal_overflow));
+
+
+    FunctionOverloadResolverPtr func_builder_and
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+
     return executeTupleEqualityImpl(
-        FunctionFactory::instance().get("equals", context),
-        FunctionFactory::instance().get("and", context),
+        func_builder_equals,
+        func_builder_and,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/extractAll.cpp b/src/Functions/extractAll.cpp
index ad49f32f769..f0c18bf79b9 100644
--- a/src/Functions/extractAll.cpp
+++ b/src/Functions/extractAll.cpp
@@ -50,11 +50,13 @@ public:
     static bool isVariadic() { return false; }
     static size_t getNumberOfArguments() { return 2; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {1}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"haystack", &isString<IDataType>, nullptr, "String"},
-            {"pattern", &isString<IDataType>, isColumnConst, "const String"}
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"}
         };
 
         validateFunctionArgumentTypes(func, arguments, mandatory_args);
diff --git a/src/Functions/extractAllGroups.h b/src/Functions/extractAllGroups.h
index c64c9d6ccef..ac12cad1698 100644
--- a/src/Functions/extractAllGroups.h
+++ b/src/Functions/extractAllGroups.h
@@ -71,8 +71,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "const String or const FixedString"},
-            {"needle", &isStringOrFixedString<IDataType>, isColumnConst, "const String or const FixedString"},
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "const String or const FixedString"},
+            {"needle", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), isColumnConst, "const String or const FixedString"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/extractGroups.cpp b/src/Functions/extractGroups.cpp
index e22938f8565..f62352af0bd 100644
--- a/src/Functions/extractGroups.cpp
+++ b/src/Functions/extractGroups.cpp
@@ -45,8 +45,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"haystack", &isStringOrFixedString<IDataType>, nullptr, "const String or const FixedString"},
-            {"needle", &isStringOrFixedString<IDataType>, isColumnConst, "const String or const FixedString"},
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "const String or const FixedString"},
+            {"needle", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), isColumnConst, "const String or const FixedString"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/extractTimeZoneFromFunctionArguments.cpp b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
index 7168c68c9c9..cb8a834ed3b 100644
--- a/src/Functions/extractTimeZoneFromFunctionArguments.cpp
+++ b/src/Functions/extractTimeZoneFromFunctionArguments.cpp
@@ -1,10 +1,11 @@
-#include <Functions/extractTimeZoneFromFunctionArguments.h>
-#include <Functions/FunctionHelpers.h>
+#include <Columns/ColumnString.h>
 #include <Core/Block.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
-#include <Columns/ColumnString.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/extractTimeZoneFromFunctionArguments.h>
 #include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 
 
 namespace DB
diff --git a/src/Functions/formatDateTime.cpp b/src/Functions/formatDateTime.cpp
index 01ef2a733c8..87438365901 100644
--- a/src/Functions/formatDateTime.cpp
+++ b/src/Functions/formatDateTime.cpp
@@ -1832,10 +1832,10 @@ using FunctionFromUnixTimestampInJodaSyntax = FunctionFormatDateTimeImpl<NameFro
 REGISTER_FUNCTION(FormatDateTime)
 {
     factory.registerFunction<FunctionFormatDateTime>();
-    factory.registerAlias("DATE_FORMAT", FunctionFormatDateTime::name);
+    factory.registerAlias("DATE_FORMAT", FunctionFormatDateTime::name, FunctionFactory::CaseInsensitive);
 
     factory.registerFunction<FunctionFromUnixTimestamp>();
-    factory.registerAlias("FROM_UNIXTIME", FunctionFromUnixTimestamp::name);
+    factory.registerAlias("FROM_UNIXTIME", FunctionFromUnixTimestamp::name, FunctionFactory::CaseInsensitive);
 
     factory.registerFunction<FunctionFormatDateTimeInJodaSyntax>();
     factory.registerFunction<FunctionFromUnixTimestampInJodaSyntax>();
diff --git a/src/Functions/formatQuery.cpp b/src/Functions/formatQuery.cpp
index 2f6bc6f9903..d7addcc284e 100644
--- a/src/Functions/formatQuery.cpp
+++ b/src/Functions/formatQuery.cpp
@@ -17,6 +17,9 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
 }
 
+namespace
+{
+
 enum class OutputFormatting
 {
     SingleLine,
@@ -29,21 +32,16 @@ enum class ErrorHandling
     Null
 };
 
-template <OutputFormatting output_formatting, ErrorHandling error_handling, typename Name>
 class FunctionFormatQuery : public IFunction
 {
 public:
-    static constexpr auto name = Name::name;
-    static FunctionPtr create(ContextPtr context)
-    {
-        const auto & settings = context->getSettings();
-        return std::make_shared<FunctionFormatQuery>(settings.max_query_size, settings.max_parser_depth);
-    }
-
-    FunctionFormatQuery(size_t max_query_size_, size_t max_parser_depth_)
-        : max_query_size(max_query_size_)
-        , max_parser_depth(max_parser_depth_)
+    FunctionFormatQuery(ContextPtr context, String name_, OutputFormatting output_formatting_, ErrorHandling error_handling_)
+        : name(name_), output_formatting(output_formatting_), error_handling(error_handling_)
     {
+        const Settings & settings = context->getSettings();
+        max_query_size = settings.max_query_size;
+        max_parser_depth = settings.max_parser_depth;
+        max_parser_backtracks = settings.max_parser_backtracks;
     }
 
     String getName() const override { return name; }
@@ -54,12 +52,12 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"query", &isString<IDataType>, nullptr, "String"}
+            {"query", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
         DataTypePtr string_type = std::make_shared<DataTypeString>();
-        if constexpr (error_handling == ErrorHandling::Null)
+        if (error_handling == ErrorHandling::Null)
             return std::make_shared<DataTypeNullable>(string_type);
         else
             return string_type;
@@ -70,7 +68,7 @@ public:
         const ColumnPtr col_query = arguments[0].column;
 
         ColumnUInt8::MutablePtr col_null_map;
-        if constexpr (error_handling == ErrorHandling::Null)
+        if (error_handling == ErrorHandling::Null)
             col_null_map = ColumnUInt8::create(input_rows_count, 0);
 
         if (const ColumnString * col_query_string = checkAndGetColumn<ColumnString>(col_query.get()))
@@ -78,7 +76,7 @@ public:
             auto col_res = ColumnString::create();
             formatVector(col_query_string->getChars(), col_query_string->getOffsets(), col_res->getChars(), col_res->getOffsets(), col_null_map);
 
-            if constexpr (error_handling == ErrorHandling::Null)
+            if (error_handling == ErrorHandling::Null)
                 return ColumnNullable::create(std::move(col_res), std::move(col_null_map));
             else
                 return col_res;
@@ -113,11 +111,11 @@ private:
 
             try
             {
-                ast = parseQuery(parser, begin, end, /*query_description*/ {}, max_query_size, max_parser_depth);
+                ast = parseQuery(parser, begin, end, /*query_description*/ {}, max_query_size, max_parser_depth, max_parser_backtracks);
             }
             catch (...)
             {
-                if constexpr (error_handling == ErrorHandling::Null)
+                if (error_handling == ErrorHandling::Null)
                 {
                     const size_t res_data_new_size = res_data_size + 1;
                     if (res_data_new_size > res_data.size())
@@ -135,7 +133,6 @@ private:
                 }
                 else
                 {
-                    static_assert(error_handling == ErrorHandling::Exception);
                     throw;
                 }
             }
@@ -160,92 +157,91 @@ private:
         res_data.resize(res_data_size);
     }
 
-    const size_t max_query_size;
-    const size_t max_parser_depth;
+    String name;
+    OutputFormatting output_formatting;
+    ErrorHandling error_handling;
+
+    size_t max_query_size;
+    size_t max_parser_depth;
+    size_t max_parser_backtracks;
 };
 
-struct NameFormatQuery
-{
-    static constexpr auto name = "formatQuery";
-};
-
-struct NameFormatQueryOrNull
-{
-    static constexpr auto name = "formatQueryOrNull";
-};
-
-struct NameFormatQuerySingleLine
-{
-    static constexpr auto name = "formatQuerySingleLine";
-};
-
-struct NameFormatQuerySingleLineOrNull
-{
-    static constexpr auto name = "formatQuerySingleLineOrNull";
-};
+}
 
 REGISTER_FUNCTION(formatQuery)
 {
-    factory.registerFunction<FunctionFormatQuery<OutputFormatting::MultiLine, ErrorHandling::Exception, NameFormatQuery>>(FunctionDocumentation{
-        .description = "Returns a formatted, possibly multi-line, version of the given SQL query. Throws in case of a parsing error.\n[example:multiline]",
-        .syntax = "formatQuery(query)",
-        .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
-        .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
-        .examples{
-            {"multiline",
-             "SELECT formatQuery('select a,    b FRom tab WHERE a > 3 and  b < 3');",
-             "SELECT\n"
-             "    a,\n"
-             "    b\n"
-             "FROM tab\n"
-             "WHERE (a > 3) AND (b < 3)"}},
-        .categories{"Other"}});
+    factory.registerFunction(
+        "formatQuery",
+        [](ContextPtr context) { return std::make_shared<FunctionFormatQuery>(context, "formatQuery", OutputFormatting::MultiLine, ErrorHandling::Exception); },
+        FunctionDocumentation{
+            .description = "Returns a formatted, possibly multi-line, version of the given SQL query. Throws in case of a parsing error.\n[example:multiline]",
+            .syntax = "formatQuery(query)",
+            .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
+            .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
+            .examples{
+                {"multiline",
+                 "SELECT formatQuery('select a,    b FRom tab WHERE a > 3 and  b < 3');",
+                 "SELECT\n"
+                 "    a,\n"
+                 "    b\n"
+                 "FROM tab\n"
+                 "WHERE (a > 3) AND (b < 3)"}},
+            .categories{"Other"}});
 }
 
 REGISTER_FUNCTION(formatQueryOrNull)
 {
-    factory.registerFunction<FunctionFormatQuery<OutputFormatting::MultiLine, ErrorHandling::Null, NameFormatQueryOrNull>>(FunctionDocumentation{
-        .description = "Returns a formatted, possibly multi-line, version of the given SQL query. Returns NULL in case of a parsing error.\n[example:multiline]",
-        .syntax = "formatQueryOrNull(query)",
-        .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
-        .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
-        .examples{
-            {"multiline",
-             "SELECT formatQuery('select a,    b FRom tab WHERE a > 3 and  b < 3');",
-             "SELECT\n"
-             "    a,\n"
-             "    b\n"
-             "FROM tab\n"
-             "WHERE (a > 3) AND (b < 3)"}},
-        .categories{"Other"}});
+    factory.registerFunction(
+        "formatQueryOrNull",
+        [](ContextPtr context) { return std::make_shared<FunctionFormatQuery>(context, "formatQueryOrNull", OutputFormatting::MultiLine, ErrorHandling::Null); },
+        FunctionDocumentation{
+            .description = "Returns a formatted, possibly multi-line, version of the given SQL query. Returns NULL in case of a parsing error.\n[example:multiline]",
+            .syntax = "formatQueryOrNull(query)",
+            .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
+            .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
+            .examples{
+                {"multiline",
+                 "SELECT formatQuery('select a,    b FRom tab WHERE a > 3 and  b < 3');",
+                 "SELECT\n"
+                 "    a,\n"
+                 "    b\n"
+                 "FROM tab\n"
+                 "WHERE (a > 3) AND (b < 3)"}},
+            .categories{"Other"}});
 }
 
 REGISTER_FUNCTION(formatQuerySingleLine)
 {
-    factory.registerFunction<FunctionFormatQuery<OutputFormatting::SingleLine, ErrorHandling::Exception, NameFormatQuerySingleLine>>(FunctionDocumentation{
-        .description = "Like formatQuery() but the returned formatted string contains no line breaks. Throws in case of a parsing error.\n[example:multiline]",
-        .syntax = "formatQuerySingleLine(query)",
-        .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
-        .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
-        .examples{
-            {"multiline",
-             "SELECT formatQuerySingleLine('select a,    b FRom tab WHERE a > 3 and  b < 3');",
-             "SELECT a, b FROM tab WHERE (a > 3) AND (b < 3)"}},
-        .categories{"Other"}});
+    factory.registerFunction(
+        "formatQuerySingleLine",
+        [](ContextPtr context) { return std::make_shared<FunctionFormatQuery>(context, "formatQuerySingleLine", OutputFormatting::SingleLine, ErrorHandling::Exception); },
+        FunctionDocumentation{
+            .description = "Like formatQuery() but the returned formatted string contains no line breaks. Throws in case of a parsing error.\n[example:multiline]",
+            .syntax = "formatQuerySingleLine(query)",
+            .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
+            .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
+            .examples{
+                {"multiline",
+                 "SELECT formatQuerySingleLine('select a,    b FRom tab WHERE a > 3 and  b < 3');",
+                 "SELECT a, b FROM tab WHERE (a > 3) AND (b < 3)"}},
+            .categories{"Other"}});
 }
 
 REGISTER_FUNCTION(formatQuerySingleLineOrNull)
 {
-    factory.registerFunction<FunctionFormatQuery<OutputFormatting::SingleLine, ErrorHandling::Null, NameFormatQuerySingleLineOrNull>>(FunctionDocumentation{
-        .description = "Like formatQuery() but the returned formatted string contains no line breaks. Returns NULL in case of a parsing error.\n[example:multiline]",
-        .syntax = "formatQuerySingleLineOrNull(query)",
-        .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
-        .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
-        .examples{
-            {"multiline",
-             "SELECT formatQuerySingleLine('select a,    b FRom tab WHERE a > 3 and  b < 3');",
-             "SELECT a, b FROM tab WHERE (a > 3) AND (b < 3)"}},
-        .categories{"Other"}});
+    factory.registerFunction(
+        "formatQuerySingleLineOrNull",
+        [](ContextPtr context) { return std::make_shared<FunctionFormatQuery>(context, "formatQuerySingleLineOrNull", OutputFormatting::SingleLine, ErrorHandling::Null); },
+        FunctionDocumentation{
+            .description = "Like formatQuery() but the returned formatted string contains no line breaks. Returns NULL in case of a parsing error.\n[example:multiline]",
+            .syntax = "formatQuerySingleLineOrNull(query)",
+            .arguments = {{"query", "The SQL query to be formatted. [String](../../sql-reference/data-types/string.md)"}},
+            .returned_value = "The formatted query. [String](../../sql-reference/data-types/string.md).",
+            .examples{
+                {"multiline",
+                 "SELECT formatQuerySingleLine('select a,    b FRom tab WHERE a > 3 and  b < 3');",
+                 "SELECT a, b FROM tab WHERE (a > 3) AND (b < 3)"}},
+            .categories{"Other"}});
 }
 
 }
diff --git a/src/Functions/formatRow.cpp b/src/Functions/formatRow.cpp
index 12a5fc2cc27..1ac6becfb15 100644
--- a/src/Functions/formatRow.cpp
+++ b/src/Functions/formatRow.cpp
@@ -18,7 +18,6 @@ namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int UNKNOWN_FORMAT;
     extern const int BAD_ARGUMENTS;
 }
 
@@ -40,8 +39,7 @@ public:
         , 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);
+        FormatFactory::instance().checkFormatName(format_name);
     }
 
     String getName() const override { return name; }
diff --git a/src/Functions/formatString.h b/src/Functions/formatString.h
index 315e5c06227..bdd36f4aa17 100644
--- a/src/Functions/formatString.h
+++ b/src/Functions/formatString.h
@@ -18,7 +18,7 @@ struct FormatStringImpl
     static constexpr size_t right_padding = 15;
 
     template <typename... Args>
-    static inline void formatExecute(bool possibly_has_column_string, bool possibly_has_column_fixed_string, Args &&... args)
+    static void formatExecute(bool possibly_has_column_string, bool possibly_has_column_fixed_string, Args &&... args)
     {
         if (possibly_has_column_string && possibly_has_column_fixed_string)
             format<true, true>(std::forward<Args>(args)...);
@@ -38,7 +38,7 @@ struct FormatStringImpl
     /// input_rows_count is the number of rows processed.
     /// Precondition: data.size() == offsets.size() == fixed_string_N.size() == constant_strings.size().
     template <bool has_column_string, bool has_column_fixed_string>
-    static inline void format(
+    static void format(
         String pattern,
         const std::vector<const ColumnString::Chars *> & data,
         const std::vector<const ColumnString::Offsets *> & offsets,
diff --git a/src/Functions/fromDaysSinceYearZero.cpp b/src/Functions/fromDaysSinceYearZero.cpp
index a21d0cc25bf..b98c587d172 100644
--- a/src/Functions/fromDaysSinceYearZero.cpp
+++ b/src/Functions/fromDaysSinceYearZero.cpp
@@ -52,7 +52,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        FunctionArgumentDescriptors args{{"days", &isNativeInteger<IDataType>, nullptr, "Integer"}};
+        FunctionArgumentDescriptors args{{"days", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), nullptr, "Integer"}};
 
         validateFunctionArgumentTypes(*this, arguments, args);
 
diff --git a/src/Functions/fromUnixTimestamp64Micro.cpp b/src/Functions/fromUnixTimestamp64Micro.cpp
index 191e2137a0d..d96e0232335 100644
--- a/src/Functions/fromUnixTimestamp64Micro.cpp
+++ b/src/Functions/fromUnixTimestamp64Micro.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(FromUnixTimestamp64Micro)
 {
     factory.registerFunction("fromUnixTimestamp64Micro",
-        [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionFromUnixTimestamp64>(6, "fromUnixTimestamp64Micro", context)); });
+        [](ContextPtr context){ return std::make_shared<FunctionFromUnixTimestamp64>(6, "fromUnixTimestamp64Micro", context); });
 }
 
 }
diff --git a/src/Functions/fromUnixTimestamp64Milli.cpp b/src/Functions/fromUnixTimestamp64Milli.cpp
index c6d4fcd30a2..aa77e8043c1 100644
--- a/src/Functions/fromUnixTimestamp64Milli.cpp
+++ b/src/Functions/fromUnixTimestamp64Milli.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(FromUnixTimestamp64Milli)
 {
     factory.registerFunction("fromUnixTimestamp64Milli",
-        [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionFromUnixTimestamp64>(3, "fromUnixTimestamp64Milli", context)); });
+        [](ContextPtr context){ return std::make_shared<FunctionFromUnixTimestamp64>(3, "fromUnixTimestamp64Milli", context); });
 }
 
 }
diff --git a/src/Functions/fromUnixTimestamp64Nano.cpp b/src/Functions/fromUnixTimestamp64Nano.cpp
index 2b5a7addbfc..f9d69219933 100644
--- a/src/Functions/fromUnixTimestamp64Nano.cpp
+++ b/src/Functions/fromUnixTimestamp64Nano.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(FromUnixTimestamp64Nano)
 {
     factory.registerFunction("fromUnixTimestamp64Nano",
-        [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionFromUnixTimestamp64>(9, "fromUnixTimestamp64Nano", context)); });
+        [](ContextPtr context){ return std::make_shared<FunctionFromUnixTimestamp64>(9, "fromUnixTimestamp64Nano", context); });
 }
 
 }
diff --git a/src/Functions/geometryConverters.h b/src/Functions/geometryConverters.h
index dba984b4184..97162fa9dd0 100644
--- a/src/Functions/geometryConverters.h
+++ b/src/Functions/geometryConverters.h
@@ -28,9 +28,6 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
-namespace
-{
-
 template <typename Point>
 using Ring = boost::geometry::model::ring<Point>;
 
@@ -374,5 +371,3 @@ static void callOnTwoGeometryDataTypes(DataTypePtr left_type, DataTypePtr right_
 }
 
 }
-
-}
diff --git a/src/Functions/getClientHTTPHeader.cpp b/src/Functions/getClientHTTPHeader.cpp
new file mode 100644
index 00000000000..ebd070a90b9
--- /dev/null
+++ b/src/Functions/getClientHTTPHeader.cpp
@@ -0,0 +1,96 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnString.h>
+#include <Interpreters/Context.h>
+#include <Core/Field.h>
+
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int FUNCTION_NOT_ALLOWED;
+}
+
+namespace
+{
+
+class FunctionGetClientHTTPHeader : public IFunction, WithContext
+{
+public:
+    explicit FunctionGetClientHTTPHeader(ContextPtr context_)
+        : WithContext(context_)
+    {
+        if (!getContext()->getSettingsRef().allow_get_client_http_header)
+            throw Exception(ErrorCodes::FUNCTION_NOT_ALLOWED, "The function getClientHTTPHeader requires setting `allow_get_client_http_header` to be enabled.");
+    }
+
+    String getName() const override { return "getClientHTTPHeader"; }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo &) const override { return false; }
+
+    size_t getNumberOfArguments() const override
+    {
+        return 1;
+    }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
+    {
+        if (!isString(arguments[0]))
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The argument of function {} must be String", getName());
+        return std::make_shared<DataTypeString>();
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        const ClientInfo & client_info = getContext()->getClientInfo();
+
+        const auto & source = arguments[0].column;
+        auto result = result_type->createColumn();
+        result->reserve(input_rows_count);
+
+        for (size_t row = 0; row < input_rows_count; ++row)
+        {
+            Field header;
+            source->get(row, header);
+            if (auto it = client_info.http_headers.find(header.get<String>()); it != client_info.http_headers.end())
+                result->insert(it->second);
+            else
+                result->insertDefault();
+        }
+
+        return result;
+    }
+};
+
+}
+
+REGISTER_FUNCTION(GetClientHTTPHeader)
+{
+    factory.registerFunction("getClientHTTPHeader",
+        [](ContextPtr context) { return std::make_shared<FunctionGetClientHTTPHeader>(context); },
+        FunctionDocumentation{
+            .description = R"(
+Get the value of an HTTP header.
+
+If there is no such header or the current request is not performed via the HTTP interface, the function returns an empty string.
+Certain HTTP headers (e.g., `Authentication` and `X-ClickHouse-*`) are restricted.
+
+The function requires the setting `allow_get_client_http_header` to be enabled.
+The setting is not enabled by default for security reasons, because some headers, such as `Cookie`, could contain sensitive info.
+
+HTTP headers are case sensitive for this function.
+
+If the function is used in the context of a distributed query, it returns non-empty result only on the initiator node.
+",
+            .syntax = "getClientHTTPHeader(name)",
+            .arguments = {{"name", "The HTTP header name (String)"}},
+            .returned_value = "The value of the header (String).",
+            .categories{"Miscellaneous"}});
+}
+
+}
diff --git a/src/Functions/getFuzzerData.cpp b/src/Functions/getFuzzerData.cpp
index 6d748619926..a6f8dd1de2c 100644
--- a/src/Functions/getFuzzerData.cpp
+++ b/src/Functions/getFuzzerData.cpp
@@ -1,13 +1,59 @@
 #ifdef FUZZING_MODE
-#include <Functions/getFuzzerData.h>
+
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <DataTypes/DataTypeString.h>
+#include <Core/Field.h>
+
 
 namespace DB
 {
 
+namespace
+{
+
+class FunctionGetFuzzerData : public IFunction
+{
+    inline static String fuzz_data;
+
+public:
+    static constexpr auto name = "getFuzzerData";
+
+    inline static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionGetFuzzerData>(); }
+
+    inline String getName() const override { return name; }
+
+    inline size_t getNumberOfArguments() const override { return 0; }
+
+    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
+    {
+        return std::make_shared<DataTypeString>();
+    }
+
+    inline bool isDeterministic() const override { return false; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName &,
+                          const DataTypePtr &,
+                          size_t input_rows_count) const override
+    {
+        return DataTypeString().createColumnConst(input_rows_count, fuzz_data);
+    }
+
+    [[maybe_unused]] static void update(const String & fuzz_data_)
+    {
+        fuzz_data = fuzz_data_;
+    }
+};
+
+}
+
 REGISTER_FUNCTION(GetFuzzerData)
 {
     factory.registerFunction<FunctionGetFuzzerData>();
 }
 
 }
+
 #endif
diff --git a/src/Functions/getFuzzerData.h b/src/Functions/getFuzzerData.h
deleted file mode 100644
index 635ca2bdce9..00000000000
--- a/src/Functions/getFuzzerData.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypeString.h>
-#include <Core/Field.h>
-
-namespace DB
-{
-class FunctionGetFuzzerData : public IFunction
-{
-    inline static String fuzz_data;
-
-public:
-    static constexpr auto name = "getFuzzerData";
-
-    inline static FunctionPtr create(ContextPtr) { return create(); }
-
-    static FunctionPtr create()
-    {
-        return std::make_shared<FunctionGetFuzzerData>();
-    }
-
-    inline String getName() const override { return name; }
-
-    inline size_t getNumberOfArguments() const override { return 0; }
-
-    DataTypePtr getReturnTypeImpl(const DataTypes & /*arguments*/) const override
-    {
-        return std::make_shared<DataTypeString>();
-    }
-
-    inline bool isDeterministic() const override { return false; }
-
-    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
-
-    ColumnPtr executeImpl(const ColumnsWithTypeAndName &,
-                          const DataTypePtr &,
-                          size_t input_rows_count) const override
-    {
-        return DataTypeString().createColumnConst(input_rows_count, fuzz_data);
-    }
-
-    static void update(const String & fuzz_data_)
-    {
-        fuzz_data = fuzz_data_;
-    }
-};
-
-}
diff --git a/src/Functions/getScalar.cpp b/src/Functions/getScalar.cpp
index d72c84b8528..7196cbc0a36 100644
--- a/src/Functions/getScalar.cpp
+++ b/src/Functions/getScalar.cpp
@@ -83,7 +83,7 @@ public:
 
     static ColumnWithTypeAndName createScalar(ContextPtr context_)
     {
-        if (const auto * block = context_->tryGetSpecialScalar(Scalar::scalar_name))
+        if (auto block = context_->tryGetSpecialScalar(Scalar::scalar_name))
             return block->getByPosition(0);
         else if (context_->hasQueryContext())
         {
diff --git a/src/Functions/getTypeSerializationStreams.cpp b/src/Functions/getTypeSerializationStreams.cpp
index da9fce70ee9..34a4e47947f 100644
--- a/src/Functions/getTypeSerializationStreams.cpp
+++ b/src/Functions/getTypeSerializationStreams.cpp
@@ -48,7 +48,7 @@ public:
         SerializationPtr serialization = type->getDefaultSerialization();
         auto col_res = ColumnArray::create(ColumnString::create());
         ColumnString & col_res_strings = typeid_cast<ColumnString &>(col_res->getData());
-        ColumnVectorHelper::Offsets & col_res_offsets = typeid_cast<ColumnArray::Offsets &>(col_res->getOffsets());
+        ColumnFixedSizeHelper::Offsets & col_res_offsets = typeid_cast<ColumnArray::Offsets &>(col_res->getOffsets());
         serialization->enumerateStreams([&](const ISerialization::SubstreamPath & substream_path)
         {
             col_res_strings.insert(substream_path.toString());
diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index d1d1a101187..01184f74b13 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -7,7 +7,6 @@
 #include <Functions/PerformanceAdaptors.h>
 #include <Interpreters/castColumn.h>
 #include <Common/TargetSpecific.h>
-#include <base/range.h>
 #include <cmath>
 #include <numbers>
 
@@ -42,121 +41,6 @@ namespace ErrorCodes
 namespace
 {
 
-constexpr double PI = std::numbers::pi_v<double>;
-constexpr float PI_F = std::numbers::pi_v<float>;
-
-constexpr float RAD_IN_DEG = static_cast<float>(PI / 180.0);
-constexpr float RAD_IN_DEG_HALF = static_cast<float>(PI / 360.0);
-
-constexpr size_t COS_LUT_SIZE = 1024; // maxerr 0.00063%
-constexpr float COS_LUT_SIZE_F = 1024.0f; // maxerr 0.00063%
-constexpr size_t ASIN_SQRT_LUT_SIZE = 512;
-constexpr size_t METRIC_LUT_SIZE = 1024;
-
-/** Earth radius in meters using WGS84 authalic radius.
-  * We use this value to be consistent with H3 library.
-  */
-constexpr float EARTH_RADIUS = 6371007.180918475f;
-constexpr float EARTH_DIAMETER = 2 * EARTH_RADIUS;
-
-
-float cos_lut[COS_LUT_SIZE + 1];       /// cos(x) table
-float asin_sqrt_lut[ASIN_SQRT_LUT_SIZE + 1]; /// asin(sqrt(x)) * earth_diameter table
-
-float sphere_metric_lut[METRIC_LUT_SIZE + 1]; /// sphere metric, unitless: the distance in degrees for one degree across longitude depending on latitude
-float sphere_metric_meters_lut[METRIC_LUT_SIZE + 1]; /// sphere metric: the distance in meters for one degree across longitude depending on latitude
-float wgs84_metric_meters_lut[2 * (METRIC_LUT_SIZE + 1)]; /// ellipsoid metric: the distance in meters across one degree latitude/longitude depending on latitude
-
-
-inline double sqr(double v)
-{
-    return v * v;
-}
-
-inline float sqrf(float v)
-{
-    return v * v;
-}
-
-void geodistInit()
-{
-    for (size_t i = 0; i <= COS_LUT_SIZE; ++i)
-        cos_lut[i] = static_cast<float>(cos(2 * PI * i / COS_LUT_SIZE)); // [0, 2 * pi] -> [0, COS_LUT_SIZE]
-
-    for (size_t i = 0; i <= ASIN_SQRT_LUT_SIZE; ++i)
-        asin_sqrt_lut[i] = static_cast<float>(asin(
-            sqrt(static_cast<double>(i) / ASIN_SQRT_LUT_SIZE))); // [0, 1] -> [0, ASIN_SQRT_LUT_SIZE]
-
-    for (size_t i = 0; i <= METRIC_LUT_SIZE; ++i)
-    {
-        double latitude = i * (PI / METRIC_LUT_SIZE) - PI * 0.5; // [-pi / 2, pi / 2] -> [0, METRIC_LUT_SIZE]
-
-        /// Squared metric coefficients (for the distance in meters) on a tangent plane, for latitude and longitude (in degrees),
-        /// depending on the latitude (in radians).
-
-        /// https://github.com/mapbox/cheap-ruler/blob/master/index.js#L67
-        wgs84_metric_meters_lut[i * 2] = static_cast<float>(sqr(111132.09 - 566.05 * cos(2 * latitude) + 1.20 * cos(4 * latitude)));
-        wgs84_metric_meters_lut[i * 2 + 1] = static_cast<float>(sqr(111415.13 * cos(latitude) - 94.55 * cos(3 * latitude) + 0.12 * cos(5 * latitude)));
-
-        sphere_metric_meters_lut[i] = static_cast<float>(sqr((EARTH_DIAMETER * PI / 360) * cos(latitude)));
-
-        sphere_metric_lut[i] = static_cast<float>(sqr(cos(latitude)));
-    }
-}
-
-inline NO_SANITIZE_UNDEFINED size_t floatToIndex(float x)
-{
-    /// Implementation specific behaviour on overflow or infinite value.
-    return static_cast<size_t>(x);
-}
-
-inline float geodistDegDiff(float f)
-{
-    f = fabsf(f);
-    if (f > 180)
-        f = 360 - f;
-    return f;
-}
-
-inline float geodistFastCos(float x)
-{
-    float y = fabsf(x) * (COS_LUT_SIZE_F / PI_F / 2.0f);
-    size_t i = floatToIndex(y);
-    y -= i;
-    i &= (COS_LUT_SIZE - 1);
-    return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
-}
-
-inline float geodistFastSin(float x)
-{
-    float y = fabsf(x) * (COS_LUT_SIZE_F / PI_F / 2.0f);
-    size_t i = floatToIndex(y);
-    y -= i;
-    i = (i - COS_LUT_SIZE / 4) & (COS_LUT_SIZE - 1); // cos(x - pi / 2) = sin(x), costable / 4 = pi / 2
-    return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
-}
-
-/// fast implementation of asin(sqrt(x))
-/// max error in floats 0.00369%, in doubles 0.00072%
-inline float geodistFastAsinSqrt(float x)
-{
-    if (x < 0.122f)
-    {
-        // distance under 4546 km, Taylor error under 0.00072%
-        float y = sqrtf(x);
-        return y + x * y * 0.166666666666666f + x * x * y * 0.075f + x * x * x * y * 0.044642857142857f;
-    }
-    if (x < 0.948f)
-    {
-        // distance under 17083 km, 512-entry LUT error under 0.00072%
-        x *= ASIN_SQRT_LUT_SIZE;
-        size_t i = floatToIndex(x);
-        return asin_sqrt_lut[i] + (asin_sqrt_lut[i + 1] - asin_sqrt_lut[i]) * (x - i);
-    }
-    return asinf(sqrtf(x)); // distance over 17083 km, just compute exact
-}
-
-
 enum class Method
 {
     SPHERE_DEGREES,
@@ -164,18 +48,117 @@ enum class Method
     WGS84_METERS,
 };
 
-}
+constexpr size_t ASIN_SQRT_LUT_SIZE = 512;
+constexpr size_t COS_LUT_SIZE = 1024; // maxerr 0.00063%
+constexpr size_t METRIC_LUT_SIZE = 1024;
+
+/// Earth radius in meters using WGS84 authalic radius.
+/// We use this value to be consistent with H3 library.
+constexpr double EARTH_RADIUS = 6371007.180918475;
+constexpr double EARTH_DIAMETER = 2.0 * EARTH_RADIUS;
+constexpr double PI = std::numbers::pi_v<double>;
+
+template <typename T>
+T sqr(T v) { return v * v; }
+
+template <typename T>
+struct Impl
+{
+    T cos_lut[COS_LUT_SIZE + 1];       /// cos(x) table
+    T asin_sqrt_lut[ASIN_SQRT_LUT_SIZE + 1]; /// asin(sqrt(x)) * earth_diameter table
+    T sphere_metric_lut[METRIC_LUT_SIZE + 1]; /// sphere metric, unitless: the distance in degrees for one degree across longitude depending on latitude
+    T sphere_metric_meters_lut[METRIC_LUT_SIZE + 1]; /// sphere metric: the distance in meters for one degree across longitude depending on latitude
+    T wgs84_metric_meters_lut[2 * (METRIC_LUT_SIZE + 1)]; /// ellipsoid metric: the distance in meters across one degree latitude/longitude depending on latitude
+
+    Impl()
+    {
+        for (size_t i = 0; i <= COS_LUT_SIZE; ++i)
+            cos_lut[i] = T(std::cos(2 * PI * static_cast<double>(i) / COS_LUT_SIZE)); // [0, 2 * pi] -> [0, COS_LUT_SIZE]
+
+        for (size_t i = 0; i <= ASIN_SQRT_LUT_SIZE; ++i)
+            asin_sqrt_lut[i] = T(std::asin(std::sqrt(static_cast<double>(i) / ASIN_SQRT_LUT_SIZE))); // [0, 1] -> [0, ASIN_SQRT_LUT_SIZE]
+
+        for (size_t i = 0; i <= METRIC_LUT_SIZE; ++i)
+        {
+            double latitude = i * (PI / METRIC_LUT_SIZE) - PI * 0.5; // [-pi / 2, pi / 2] -> [0, METRIC_LUT_SIZE]
+
+            /// Squared metric coefficients (for the distance in meters) on a tangent plane, for latitude and longitude (in degrees),
+            /// depending on the latitude (in radians).
+
+            /// https://github.com/mapbox/cheap-ruler/blob/master/index.js#L67
+            wgs84_metric_meters_lut[i * 2] = T(sqr(111132.09 - 566.05 * std::cos(2.0 * latitude) + 1.20 * std::cos(4.0 * latitude)));
+            wgs84_metric_meters_lut[i * 2 + 1] = T(sqr(111415.13 * std::cos(latitude) - 94.55 * std::cos(3.0 * latitude) + 0.12 * std::cos(5.0 * latitude)));
+            sphere_metric_meters_lut[i] = T(sqr((EARTH_DIAMETER * PI / 360) * std::cos(latitude)));
+
+            sphere_metric_lut[i] = T(sqr(std::cos(latitude)));
+        }
+    }
+
+    static inline NO_SANITIZE_UNDEFINED size_t toIndex(T x)
+    {
+        /// Implementation specific behaviour on overflow or infinite value.
+        return static_cast<size_t>(x);
+    }
+
+    static inline T degDiff(T f)
+    {
+        f = std::abs(f);
+        if (f > 180)
+            f = 360 - f;
+        return f;
+    }
+
+    inline T fastCos(T x)
+    {
+        T y = std::abs(x) * (T(COS_LUT_SIZE) / T(PI) / T(2.0));
+        size_t i = toIndex(y);
+        y -= i;
+        i &= (COS_LUT_SIZE - 1);
+        return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
+    }
+
+    inline T fastSin(T x)
+    {
+        T y = std::abs(x) * (T(COS_LUT_SIZE) / T(PI) / T(2.0));
+        size_t i = toIndex(y);
+        y -= i;
+        i = (i - COS_LUT_SIZE / 4) & (COS_LUT_SIZE - 1); // cos(x - pi / 2) = sin(x), costable / 4 = pi / 2
+        return cos_lut[i] + (cos_lut[i + 1] - cos_lut[i]) * y;
+    }
+
+    /// fast implementation of asin(sqrt(x))
+    /// max error in floats 0.00369%, in doubles 0.00072%
+    inline T fastAsinSqrt(T x)
+    {
+        if (x < T(0.122))
+        {
+            // distance under 4546 km, Taylor error under 0.00072%
+            T y = std::sqrt(x);
+            return y + x * y * T(0.166666666666666) + x * x * y * T(0.075) + x * x * x * y * T(0.044642857142857);
+        }
+        if (x < T(0.948))
+        {
+            // distance under 17083 km, 512-entry LUT error under 0.00072%
+            x *= ASIN_SQRT_LUT_SIZE;
+            size_t i = toIndex(x);
+            return asin_sqrt_lut[i] + (asin_sqrt_lut[i + 1] - asin_sqrt_lut[i]) * (x - i);
+        }
+        return std::asin(std::sqrt(x)); /// distance is over 17083 km, just compute exact
+    }
+};
+
+template <typename T> Impl<T> impl;
 
 DECLARE_MULTITARGET_CODE(
 
 namespace
 {
 
-template <Method method>
-float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
+template <Method method, typename T>
+T distance(T lon1deg, T lat1deg, T lon2deg, T lat2deg)
 {
-    float lat_diff = geodistDegDiff(lat1deg - lat2deg);
-    float lon_diff = geodistDegDiff(lon1deg - lon2deg);
+    T lat_diff = impl<T>.degDiff(lat1deg - lat2deg);
+    T lon_diff = impl<T>.degDiff(lon1deg - lon2deg);
 
     if (lon_diff < 13)
     {
@@ -187,51 +170,54 @@ float distance(float lon1deg, float lat1deg, float lon2deg, float lat2deg)
         ///  (Remember how a plane flies from Amsterdam to New York)
         /// But if longitude is close but latitude is different enough, there is no difference between meridian and great circle line.
 
-        float latitude_midpoint = (lat1deg + lat2deg + 180) * METRIC_LUT_SIZE / 360; // [-90, 90] degrees -> [0, METRIC_LUT_SIZE] indexes
-        size_t latitude_midpoint_index = floatToIndex(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
+        T latitude_midpoint = (lat1deg + lat2deg + 180) * METRIC_LUT_SIZE / 360; // [-90, 90] degrees -> [0, METRIC_LUT_SIZE] indexes
+        size_t latitude_midpoint_index = impl<T>.toIndex(latitude_midpoint) & (METRIC_LUT_SIZE - 1);
 
         /// This is linear interpolation between two table items at index "latitude_midpoint_index" and "latitude_midpoint_index + 1".
 
-        float k_lat{};
-        float k_lon{};
+        T k_lat{};
+        T k_lon{};
 
         if constexpr (method == Method::SPHERE_DEGREES)
         {
             k_lat = 1;
 
-            k_lon = sphere_metric_lut[latitude_midpoint_index]
-                + (sphere_metric_lut[latitude_midpoint_index + 1] - sphere_metric_lut[latitude_midpoint_index]) * (latitude_midpoint - latitude_midpoint_index);
+            k_lon = impl<T>.sphere_metric_lut[latitude_midpoint_index]
+                + (impl<T>.sphere_metric_lut[latitude_midpoint_index + 1] - impl<T>.sphere_metric_lut[latitude_midpoint_index]) * (latitude_midpoint - latitude_midpoint_index);
         }
         else if constexpr (method == Method::SPHERE_METERS)
         {
-            k_lat = sqrf(EARTH_DIAMETER * PI_F / 360.0f);
+            k_lat = sqr(T(EARTH_DIAMETER) * T(PI) / T(360.0));
 
-            k_lon = sphere_metric_meters_lut[latitude_midpoint_index]
-                + (sphere_metric_meters_lut[latitude_midpoint_index + 1] - sphere_metric_meters_lut[latitude_midpoint_index]) * (latitude_midpoint - latitude_midpoint_index);
+            k_lon = impl<T>.sphere_metric_meters_lut[latitude_midpoint_index]
+                + (impl<T>.sphere_metric_meters_lut[latitude_midpoint_index + 1] - impl<T>.sphere_metric_meters_lut[latitude_midpoint_index]) * (latitude_midpoint - latitude_midpoint_index);
         }
         else if constexpr (method == Method::WGS84_METERS)
         {
-            k_lat = wgs84_metric_meters_lut[latitude_midpoint_index * 2]
-                + (wgs84_metric_meters_lut[(latitude_midpoint_index + 1) * 2] - wgs84_metric_meters_lut[latitude_midpoint_index * 2]) * (latitude_midpoint - latitude_midpoint_index);
+            k_lat = impl<T>.wgs84_metric_meters_lut[latitude_midpoint_index * 2]
+                + (impl<T>.wgs84_metric_meters_lut[(latitude_midpoint_index + 1) * 2] - impl<T>.wgs84_metric_meters_lut[latitude_midpoint_index * 2]) * (latitude_midpoint - latitude_midpoint_index);
 
-            k_lon = wgs84_metric_meters_lut[latitude_midpoint_index * 2 + 1]
-                + (wgs84_metric_meters_lut[(latitude_midpoint_index + 1) * 2 + 1] - wgs84_metric_meters_lut[latitude_midpoint_index * 2 + 1]) * (latitude_midpoint - latitude_midpoint_index);
+            k_lon = impl<T>.wgs84_metric_meters_lut[latitude_midpoint_index * 2 + 1]
+                + (impl<T>.wgs84_metric_meters_lut[(latitude_midpoint_index + 1) * 2 + 1] - impl<T>.wgs84_metric_meters_lut[latitude_midpoint_index * 2 + 1]) * (latitude_midpoint - latitude_midpoint_index);
         }
 
         /// Metric on a tangent plane: it differs from Euclidean metric only by scale of coordinates.
-        return sqrtf(k_lat * lat_diff * lat_diff + k_lon * lon_diff * lon_diff);
+        return std::sqrt(k_lat * lat_diff * lat_diff + k_lon * lon_diff * lon_diff);
     }
     else
     {
-        // points too far away; use haversine
+        /// Points are too far away: use Haversine.
 
-        float a = sqrf(geodistFastSin(lat_diff * RAD_IN_DEG_HALF))
-            + geodistFastCos(lat1deg * RAD_IN_DEG) * geodistFastCos(lat2deg * RAD_IN_DEG) * sqrf(geodistFastSin(lon_diff * RAD_IN_DEG_HALF));
+        static constexpr T RAD_IN_DEG = T(PI / 180.0);
+        static constexpr T RAD_IN_DEG_HALF = T(PI / 360.0);
+
+        T a = sqr(impl<T>.fastSin(lat_diff * RAD_IN_DEG_HALF))
+            + impl<T>.fastCos(lat1deg * RAD_IN_DEG) * impl<T>.fastCos(lat2deg * RAD_IN_DEG) * sqr(impl<T>.fastSin(lon_diff * RAD_IN_DEG_HALF));
 
         if constexpr (method == Method::SPHERE_DEGREES)
-            return (360.0f / PI_F) * geodistFastAsinSqrt(a);
+            return (T(360.0) / T(PI)) * impl<T>.fastAsinSqrt(a);
         else
-            return EARTH_DIAMETER * geodistFastAsinSqrt(a);
+            return T(EARTH_DIAMETER) * impl<T>.fastAsinSqrt(a);
     }
 }
 
@@ -241,13 +227,24 @@ template <Method method>
 class FunctionGeoDistance : public IFunction
 {
 public:
-    static constexpr auto name =
-        (method == Method::SPHERE_DEGREES) ? "greatCircleAngle"
-        : ((method == Method::SPHERE_METERS) ? "greatCircleDistance"
-            : "geoDistance");
+    explicit FunctionGeoDistance(ContextPtr context)
+    {
+        always_float32 = !context->getSettingsRef().geo_distance_returns_float64_on_float64_arguments;
+    }
 
 private:
-    String getName() const override { return name; }
+    bool always_float32;
+
+    String getName() const override
+    {
+        if constexpr (method == Method::SPHERE_DEGREES)
+            return "greatCircleAngle";
+        if constexpr (method == Method::SPHERE_METERS)
+            return "greatCircleDistance";
+        else
+            return "geoDistance";
+    }
+
     size_t getNumberOfArguments() const override { return 4; }
 
     bool useDefaultImplementationForConstants() const override { return true; }
@@ -255,22 +252,31 @@ private:
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
-        for (const auto arg_idx : collections::range(0, arguments.size()))
+        bool has_float64 = false;
+
+        for (size_t arg_idx = 0; arg_idx < 4; ++arg_idx)
         {
-            const auto * arg = arguments[arg_idx].get();
-            if (!isNumber(WhichDataType(arg)))
+            WhichDataType which(arguments[arg_idx]);
+
+            if (!isNumber(which))
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument {} of function {}. "
-                    "Must be numeric", arg->getName(), std::to_string(arg_idx + 1), getName());
+                    "Must be numeric", arguments[arg_idx]->getName(), std::to_string(arg_idx + 1), getName());
+
+            if (which.isFloat64())
+                has_float64 = true;
         }
 
-        return std::make_shared<DataTypeFloat32>();
+        if (has_float64 && !always_float32)
+            return std::make_shared<DataTypeFloat64>();
+        else
+            return std::make_shared<DataTypeFloat32>();
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
-        auto dst = ColumnVector<Float32>::create();
-        auto & dst_data = dst->getData();
-        dst_data.resize(input_rows_count);
+        bool returns_float64 = WhichDataType(result_type).isFloat64();
+
+        auto dst = result_type->createColumn();
 
         auto arguments_copy = arguments;
         for (auto & argument : arguments_copy)
@@ -280,10 +286,24 @@ private:
             argument.type = result_type;
         }
 
-        const auto * col_lon1 = convertArgumentColumnToFloat32(arguments_copy, 0);
-        const auto * col_lat1 = convertArgumentColumnToFloat32(arguments_copy, 1);
-        const auto * col_lon2 = convertArgumentColumnToFloat32(arguments_copy, 2);
-        const auto * col_lat2 = convertArgumentColumnToFloat32(arguments_copy, 3);
+        if (returns_float64)
+            run<Float64>(arguments_copy, dst, input_rows_count);
+        else
+            run<Float32>(arguments_copy, dst, input_rows_count);
+
+        return dst;
+    }
+
+    template <typename T>
+    void run(const ColumnsWithTypeAndName & arguments, MutableColumnPtr & dst, size_t input_rows_count) const
+    {
+        const auto * col_lon1 = convertArgumentColumn<T>(arguments, 0);
+        const auto * col_lat1 = convertArgumentColumn<T>(arguments, 1);
+        const auto * col_lon2 = convertArgumentColumn<T>(arguments, 2);
+        const auto * col_lat2 = convertArgumentColumn<T>(arguments, 3);
+
+        auto & dst_data = assert_cast<ColumnVector<T> &>(*dst).getData();
+        dst_data.resize(input_rows_count);
 
         for (size_t row_num = 0; row_num < input_rows_count; ++row_num)
         {
@@ -291,20 +311,20 @@ private:
                 col_lon1->getData()[row_num], col_lat1->getData()[row_num],
                 col_lon2->getData()[row_num], col_lat2->getData()[row_num]);
         }
-
-        return dst;
     }
 
-    const ColumnFloat32 * convertArgumentColumnToFloat32(const ColumnsWithTypeAndName & arguments, size_t argument_index) const
+    template <typename T>
+    const ColumnVector<T> * convertArgumentColumn(const ColumnsWithTypeAndName & arguments, size_t argument_index) const
     {
-        const auto * column_typed = checkAndGetColumn<ColumnFloat32>(arguments[argument_index].column.get());
+        const auto * column_typed = checkAndGetColumn<ColumnVector<T>>(arguments[argument_index].column.get());
         if (!column_typed)
             throw Exception(
                     ErrorCodes::ILLEGAL_COLUMN,
-                    "Illegal type {} of argument {} of function {}. Must be Float32.",
+                    "Illegal type {} of argument {} of function {}. Must be {}.",
                     arguments[argument_index].type->getName(),
                     argument_index + 1,
-                    getName());
+                    getName(),
+                    TypeName<T>);
 
         return column_typed;
     }
@@ -316,18 +336,19 @@ template <Method method>
 class FunctionGeoDistance : public TargetSpecific::Default::FunctionGeoDistance<method>
 {
 public:
-    explicit FunctionGeoDistance(ContextPtr context) : selector(context)
+    explicit FunctionGeoDistance(ContextPtr context)
+        : TargetSpecific::Default::FunctionGeoDistance<method>(context), selector(context)
     {
         selector.registerImplementation<TargetArch::Default,
-            TargetSpecific::Default::FunctionGeoDistance<method>>();
+            TargetSpecific::Default::FunctionGeoDistance<method>>(context);
 
     #if USE_MULTITARGET_CODE
         selector.registerImplementation<TargetArch::AVX,
-            TargetSpecific::AVX::FunctionGeoDistance<method>>();
+            TargetSpecific::AVX::FunctionGeoDistance<method>>(context);
         selector.registerImplementation<TargetArch::AVX2,
-            TargetSpecific::AVX2::FunctionGeoDistance<method>>();
+            TargetSpecific::AVX2::FunctionGeoDistance<method>>(context);
         selector.registerImplementation<TargetArch::AVX512F,
-            TargetSpecific::AVX512F::FunctionGeoDistance<method>>();
+            TargetSpecific::AVX512F::FunctionGeoDistance<method>>(context);
     #endif
     }
 
@@ -345,12 +366,13 @@ private:
     ImplementationSelector<IFunction> selector;
 };
 
+}
+
 REGISTER_FUNCTION(GeoDistance)
 {
-    geodistInit();
-    factory.registerFunction<FunctionGeoDistance<Method::SPHERE_DEGREES>>();
-    factory.registerFunction<FunctionGeoDistance<Method::SPHERE_METERS>>();
-    factory.registerFunction<FunctionGeoDistance<Method::WGS84_METERS>>();
+    factory.registerFunction("greatCircleAngle", [](ContextPtr context) { return std::make_shared<FunctionGeoDistance<Method::SPHERE_DEGREES>>(std::move(context)); });
+    factory.registerFunction("greatCircleDistance", [](ContextPtr context) { return std::make_shared<FunctionGeoDistance<Method::SPHERE_METERS>>(std::move(context)); });
+    factory.registerFunction("geoDistance", [](ContextPtr context) { return std::make_shared<FunctionGeoDistance<Method::WGS84_METERS>>(std::move(context)); });
 }
 
 }
diff --git a/src/Functions/greater.cpp b/src/Functions/greater.cpp
index c36f8d7acca..2b87b376ce0 100644
--- a/src/Functions/greater.cpp
+++ b/src/Functions/greater.cpp
@@ -1,11 +1,12 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
-
+#include <Functions/FunctionsLogical.h>
 
 namespace DB
 {
 
 using FunctionGreater = FunctionComparison<GreaterOp, NameGreater>;
+using FunctionEquals = FunctionComparison<EqualsOp, NameEquals>;
 
 REGISTER_FUNCTION(Greater)
 {
@@ -16,14 +17,24 @@ template <>
 ColumnPtr FunctionComparison<GreaterOp, NameGreater>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
-    auto greater = FunctionFactory::instance().get("greater", context);
+    FunctionOverloadResolverPtr greater
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGreater>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr func_builder_or
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+
+    FunctionOverloadResolverPtr func_builder_and
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+
+    FunctionOverloadResolverPtr func_builder_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionEquals>(check_decimal_overflow));
 
     return executeTupleLessGreaterImpl(
         greater,
         greater,
-        FunctionFactory::instance().get("and", context),
-        FunctionFactory::instance().get("or", context),
-        FunctionFactory::instance().get("equals", context),
+        func_builder_and,
+        func_builder_or,
+        func_builder_equals,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/greaterOrEquals.cpp b/src/Functions/greaterOrEquals.cpp
index 089ac4d5466..c77ca585c76 100644
--- a/src/Functions/greaterOrEquals.cpp
+++ b/src/Functions/greaterOrEquals.cpp
@@ -1,11 +1,14 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
+#include <Functions/FunctionsLogical.h>
 
 
 namespace DB
 {
 
 using FunctionGreaterOrEquals = FunctionComparison<GreaterOrEqualsOp, NameGreaterOrEquals>;
+using FunctionGreater = FunctionComparison<GreaterOp, NameGreater>;
+using FunctionEquals = FunctionComparison<EqualsOp, NameEquals>;
 
 REGISTER_FUNCTION(GreaterOrEquals)
 {
@@ -16,12 +19,28 @@ template <>
 ColumnPtr FunctionComparison<GreaterOrEqualsOp, NameGreaterOrEquals>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
+
+    FunctionOverloadResolverPtr greater
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGreater>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr greater_or_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionGreaterOrEquals>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr func_builder_or
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+
+    FunctionOverloadResolverPtr func_builder_and
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+
+    FunctionOverloadResolverPtr func_builder_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionEquals>(check_decimal_overflow));
+
     return executeTupleLessGreaterImpl(
-        FunctionFactory::instance().get("greater", context),
-        FunctionFactory::instance().get("greaterOrEquals", context),
-        FunctionFactory::instance().get("and", context),
-        FunctionFactory::instance().get("or", context),
-        FunctionFactory::instance().get("equals", context),
+        greater,
+        greater_or_equals,
+        func_builder_and,
+        func_builder_or,
+        func_builder_equals,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/hasColumnInTable.cpp b/src/Functions/hasColumnInTable.cpp
index 66ed515e490..48783a672e2 100644
--- a/src/Functions/hasColumnInTable.cpp
+++ b/src/Functions/hasColumnInTable.cpp
@@ -7,6 +7,7 @@
 #include <Storages/IStorage.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Storages/getStructureOfRemoteTable.h>
 
 
diff --git a/src/Functions/identity.cpp b/src/Functions/identity.cpp
index 7174f1fd318..2541e715cb1 100644
--- a/src/Functions/identity.cpp
+++ b/src/Functions/identity.cpp
@@ -9,4 +9,14 @@ REGISTER_FUNCTION(Identity)
     factory.registerFunction<FunctionIdentity>();
 }
 
+REGISTER_FUNCTION(ScalarSubqueryResult)
+{
+    factory.registerFunction<FunctionScalarSubqueryResult>();
+}
+
+REGISTER_FUNCTION(ActionName)
+{
+    factory.registerFunction<FunctionActionName>();
+}
+
 }
diff --git a/src/Functions/identity.h b/src/Functions/identity.h
index efee95841f5..3422342e20b 100644
--- a/src/Functions/identity.h
+++ b/src/Functions/identity.h
@@ -6,11 +6,12 @@
 namespace DB
 {
 
-class FunctionIdentity : public IFunction
+template<typename Name>
+class FunctionIdentityBase : public IFunction
 {
 public:
-    static constexpr auto name = "identity";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIdentity>(); }
+    static constexpr auto name = Name::name;
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIdentityBase<Name>>(); }
 
     String getName() const override { return name; }
     size_t getNumberOfArguments() const override { return 1; }
@@ -28,4 +29,31 @@ public:
     }
 };
 
+struct IdentityName
+{
+    static constexpr auto name = "identity";
+};
+
+struct ScalarSubqueryResultName
+{
+    static constexpr auto name = "__scalarSubqueryResult";
+};
+
+using FunctionIdentity = FunctionIdentityBase<IdentityName>;
+using FunctionScalarSubqueryResult = FunctionIdentityBase<ScalarSubqueryResultName>;
+
+struct ActionNameName
+{
+    static constexpr auto name = "__actionName";
+};
+
+class FunctionActionName : public FunctionIdentityBase<ActionNameName>
+{
+public:
+    using FunctionIdentityBase::FunctionIdentityBase;
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionActionName>(); }
+    size_t getNumberOfArguments() const override { return 2; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+};
+
 }
diff --git a/src/Functions/idna.cpp b/src/Functions/idna.cpp
index a73347400c6..c9682b44b2c 100644
--- a/src/Functions/idna.cpp
+++ b/src/Functions/idna.cpp
@@ -6,16 +6,12 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 
-#ifdef __clang__
-#    pragma clang diagnostic push
-#    pragma clang diagnostic ignored "-Wnewline-eof"
-#endif
-#    include <ada/idna/to_ascii.h>
-#    include <ada/idna/to_unicode.h>
-#    include <ada/idna/unicode_transcoding.h>
-#ifdef __clang__
-#    pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnewline-eof"
+#include <ada/idna/to_ascii.h>
+#include <ada/idna/to_unicode.h>
+#include <ada/idna/unicode_transcoding.h>
+#pragma clang diagnostic pop
 
 namespace DB
 {
@@ -199,4 +195,3 @@ Computes the Unicode representation of ASCII-encoded Internationalized Domain Na
 }
 
 #endif
-
diff --git a/src/Functions/if.cpp b/src/Functions/if.cpp
index cae3b720d8b..4f75042ad8d 100644
--- a/src/Functions/if.cpp
+++ b/src/Functions/if.cpp
@@ -1,28 +1,34 @@
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypesDecimal.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnDecimal.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnMap.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/MaskOperations.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/NumberTraits.h>
 #include <DataTypes/getLeastSupertype.h>
-#include <Columns/ColumnVector.h>
-#include <Columns/ColumnDecimal.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnArray.h>
-#include <Columns/ColumnFixedString.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnNullable.h>
-#include <Columns/MaskOperations.h>
-#include <Common/typeid_cast.h>
-#include <Common/assert_cast.h>
-#include <Functions/IFunction.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/GatherUtils/Algorithms.h>
-#include <Functions/FunctionIfBase.h>
-#include <Interpreters/castColumn.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/FunctionIfBase.h>
+#include <Functions/GatherUtils/Algorithms.h>
+#include <Functions/IFunction.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/castColumn.h>
+#include <Common/assert_cast.h>
+#include <Common/typeid_cast.h>
+
 #include <type_traits>
 
 namespace DB
@@ -32,6 +38,7 @@ namespace ErrorCodes
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
 }
 
 namespace
@@ -42,12 +49,32 @@ using namespace GatherUtils;
 /** Selection function by condition: if(cond, then, else).
   * cond - UInt8
   * then, else - numeric types for which there is a general type, or dates, datetimes, or strings, or arrays of these types.
-  * For better performance, try to use branch free code for numeric types(i.e. cond ? a : b --> !!cond * a + !cond * b), except floating point types because of Inf or NaN.
+  * For better performance, try to use branch free code for numeric types(i.e. cond ? a : b --> !!cond * a + !cond * b)
 */
 
+template <typename ResultType>
+concept is_native_int_or_decimal_v
+    = std::is_integral_v<ResultType> || (is_decimal<ResultType> && sizeof(ResultType) <= 8);
+
+// This macro performs a branch-free conditional assignment for floating point types.
+// It uses bitwise operations to avoid branching, which can be beneficial for performance.
+#define BRANCHFREE_IF_FLOAT(TYPE, vc, va, vb, vr) \
+    using UIntType = typename NumberTraits::Construct<false, false, sizeof(TYPE)>::Type; \
+    using IntType = typename NumberTraits::Construct<true, false, sizeof(TYPE)>::Type; \
+    auto mask = static_cast<UIntType>(static_cast<IntType>(vc) - 1); \
+    auto new_a = static_cast<ResultType>(va); \
+    auto new_b = static_cast<ResultType>(vb); \
+    UIntType uint_a; \
+    std::memcpy(&uint_a, &new_a, sizeof(UIntType)); \
+    UIntType uint_b; \
+    std::memcpy(&uint_b, &new_b, sizeof(UIntType)); \
+    UIntType tmp = (~mask & uint_a) | (mask & uint_b); \
+    (vr) = *(reinterpret_cast<ResultType *>(&tmp));
+
 template <typename ArrayCond, typename ArrayA, typename ArrayB, typename ArrayResult, typename ResultType>
 inline void fillVectorVector(const ArrayCond & cond, const ArrayA & a, const ArrayB & b, ArrayResult & res)
 {
+
     size_t size = cond.size();
     bool a_is_short = a.size() < size;
     bool b_is_short = b.size() < size;
@@ -57,47 +84,68 @@ inline void fillVectorVector(const ArrayCond & cond, const ArrayA & a, const Arr
         size_t a_index = 0, b_index = 0;
         for (size_t i = 0; i < size; ++i)
         {
-            if constexpr (std::is_integral_v<ResultType>)
-            {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[a_index]) + (!cond[i]) * static_cast<ResultType>(b[b_index]);
-                a_index += !!cond[i];
-                b_index += !cond[i];
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[a_index], b[b_index], res[i])
             }
             else
-                res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b[b_index++]);
+                res[i] = cond[i] ? static_cast<ResultType>(a[a_index]) : static_cast<ResultType>(b[b_index]);
+
+            a_index += !!cond[i];
+            b_index += !cond[i];
         }
     }
     else if (a_is_short)
     {
         size_t a_index = 0;
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
-            {
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[a_index]) + (!cond[i]) * static_cast<ResultType>(b[i]);
-                a_index += !!cond[i];
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[a_index], b[i], res[i])
             }
             else
-                res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b[i]);
+                res[i] = cond[i] ? static_cast<ResultType>(a[a_index]) : static_cast<ResultType>(b[i]);
+
+            a_index += !!cond[i];
+        }
     }
     else if (b_is_short)
     {
         size_t b_index = 0;
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
-            {
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[i]) + (!cond[i]) * static_cast<ResultType>(b[b_index]);
-                b_index += !cond[i];
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[i], b[b_index], res[i])
             }
             else
-                res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[b_index++]);
+                res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[b_index]);
+
+            b_index += !cond[i];
+        }
     }
     else
     {
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[i]) + (!cond[i]) * static_cast<ResultType>(b[i]);
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[i], b[i], res[i])
+            }
             else
+            {
                 res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b[i]);
+            }
+        }
     }
 }
 
@@ -110,21 +158,32 @@ inline void fillVectorConstant(const ArrayCond & cond, const ArrayA & a, B b, Ar
     {
         size_t a_index = 0;
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
-            {
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[a_index]) + (!cond[i]) * static_cast<ResultType>(b);
-                a_index += !!cond[i];
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[a_index], b, res[i])
             }
             else
-                res[i] = cond[i] ? static_cast<ResultType>(a[a_index++]) : static_cast<ResultType>(b);
+                res[i] = cond[i] ? static_cast<ResultType>(a[a_index]) : static_cast<ResultType>(b);
+
+            a_index += !!cond[i];
+        }
     }
     else
     {
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a[i]) + (!cond[i]) * static_cast<ResultType>(b);
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a[i], b, res[i])
+            }
             else
                 res[i] = cond[i] ? static_cast<ResultType>(a[i]) : static_cast<ResultType>(b);
+        }
     }
 }
 
@@ -137,21 +196,63 @@ inline void fillConstantVector(const ArrayCond & cond, A a, const ArrayB & b, Ar
     {
         size_t b_index = 0;
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
-            {
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a) + (!cond[i]) * static_cast<ResultType>(b[b_index]);
-                b_index += !cond[i];
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a, b[b_index], res[i])
             }
             else
-                res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[b_index++]);
+                res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[b_index]);
+
+            b_index += !cond[i];
+        }
     }
     else
     {
         for (size_t i = 0; i < size; ++i)
-            if constexpr (std::is_integral_v<ResultType>)
+        {
+            if constexpr (is_native_int_or_decimal_v<ResultType>)
                 res[i] = !!cond[i] * static_cast<ResultType>(a) + (!cond[i]) * static_cast<ResultType>(b[i]);
+            else if constexpr (std::is_floating_point_v<ResultType>)
+            {
+                BRANCHFREE_IF_FLOAT(ResultType, cond[i], a, b[i], res[i])
+            }
             else
                 res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b[i]);
+        }
+    }
+}
+
+template <typename ArrayCond, typename A, typename B, typename ArrayResult, typename ResultType>
+inline void fillConstantConstant(const ArrayCond & cond, A a, B b, ArrayResult & res)
+{
+    size_t size = cond.size();
+
+    /// We manually optimize the loop for types like (U)Int128|256 or Decimal128/256 to avoid branches
+    if constexpr (is_over_big_int<ResultType>)
+    {
+        alignas(64) const ResultType ab[2] = {static_cast<ResultType>(a), static_cast<ResultType>(b)};
+        for (size_t i = 0; i < size; ++i)
+        {
+            res[i] = ab[!cond[i]];
+        }
+    }
+    else if constexpr (std::is_same_v<ResultType, Decimal32> || std::is_same_v<ResultType, Decimal64>)
+    {
+        ResultType new_a = static_cast<ResultType>(a);
+        ResultType new_b = static_cast<ResultType>(b);
+        for (size_t i = 0; i < size; ++i)
+        {
+            /// Reuse new_a and new_b to achieve auto-vectorization
+            res[i] = cond[i] ? new_a : new_b;
+        }
+    }
+    else
+    {
+        for (size_t i = 0; i < size; ++i)
+            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
     }
 }
 
@@ -197,8 +298,7 @@ struct NumIfImpl
         auto col_res = ColVecResult::create(size);
         ArrayResult & res = col_res->getData();
 
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
+        fillConstantConstant<ArrayCond, A, B, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 };
@@ -247,8 +347,7 @@ struct NumIfImpl<Decimal<A>, Decimal<B>, Decimal<R>>
         auto col_res = ColVecResult::create(size, scale);
         ArrayResult & res = col_res->getData();
 
-        for (size_t i = 0; i < size; ++i)
-            res[i] = cond[i] ? static_cast<ResultType>(a) : static_cast<ResultType>(b);
+        fillConstantConstant<ArrayCond, A, B, ArrayResult, ResultType>(cond, a, b, res);
         return col_res;
     }
 };
@@ -258,9 +357,16 @@ class FunctionIf : public FunctionIfBase
 {
 public:
     static constexpr auto name = "if";
-    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIf>(); }
+    static FunctionPtr create(ContextPtr context)
+    {
+        return std::make_shared<FunctionIf>(context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type);
+    }
+
+    explicit FunctionIf(bool use_variant_when_no_common_type_ = false) : FunctionIfBase(), use_variant_when_no_common_type(use_variant_when_no_common_type_) {}
 
 private:
+    bool use_variant_when_no_common_type = false;
+
     template <typename T0, typename T1>
     static UInt32 decimalScale(const ColumnsWithTypeAndName & arguments [[maybe_unused]])
     {
@@ -616,7 +722,6 @@ private:
                 conditional(ConstSource<GenericArraySource>(*col_arr_then_const), ConstSource<GenericArraySource>(*col_arr_else_const), GenericArraySink(col_res->getData(), col_res->getOffsets(), rows), cond_data);
             else
                 return nullptr;
-
             return res;
         }
 
@@ -668,14 +773,102 @@ private:
         return ColumnTuple::create(tuple_columns);
     }
 
+    ColumnPtr executeMap(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
+    {
+        auto extract_kv_from_map = [](const ColumnMap * map)
+        {
+            const ColumnTuple & tuple = map->getNestedData();
+            const auto & keys = tuple.getColumnPtr(0);
+            const auto & values = tuple.getColumnPtr(1);
+            const auto & offsets = map->getNestedColumn().getOffsetsPtr();
+            return std::make_pair(ColumnArray::create(keys, offsets), ColumnArray::create(values, offsets));
+        };
+
+        /// Extract keys and values from both arguments
+        Columns key_cols(2);
+        Columns value_cols(2);
+        for (size_t i = 0; i < 2; ++i)
+        {
+            const auto & arg = arguments[i + 1];
+            if (const ColumnMap * map = checkAndGetColumn<ColumnMap>(arg.column.get()))
+            {
+                auto [key_col, value_col] = extract_kv_from_map(map);
+                key_cols[i] = std::move(key_col);
+                value_cols[i] = std::move(value_col);
+            }
+            else if (const ColumnConst * const_map = checkAndGetColumnConst<ColumnMap>(arg.column.get()))
+            {
+                const ColumnMap * map_data = assert_cast<const ColumnMap *>(&const_map->getDataColumn());
+                auto [key_col, value_col] = extract_kv_from_map(map_data);
+
+                size_t size = const_map->size();
+                key_cols[i] = ColumnConst::create(std::move(key_col), size);
+                value_cols[i] = ColumnConst::create(std::move(value_col), size);
+            }
+            else
+                return nullptr;
+        }
+
+        /// Compose temporary columns for keys and values
+        ColumnsWithTypeAndName key_columns(3);
+        key_columns[0] = arguments[0];
+        ColumnsWithTypeAndName value_columns(3);
+        value_columns[0] = arguments[0];
+        for (size_t i = 0; i < 2; ++i)
+        {
+            const auto & arg = arguments[i + 1];
+            const DataTypeMap & type = static_cast<const DataTypeMap &>(*arg.type);
+            const auto & key_type = type.getKeyType();
+            const auto & value_type = type.getValueType();
+            key_columns[i + 1] = {key_cols[i], std::make_shared<DataTypeArray>(key_type), {}};
+            value_columns[i + 1] = {value_cols[i], std::make_shared<DataTypeArray>(value_type), {}};
+        }
+
+        /// Calculate function corresponding keys and values in map
+        const DataTypeMap & map_result_type = static_cast<const DataTypeMap &>(*result_type);
+        auto key_result_type = std::make_shared<DataTypeArray>(map_result_type.getKeyType());
+        auto value_result_type = std::make_shared<DataTypeArray>(map_result_type.getValueType());
+        ColumnPtr key_result = executeImpl(key_columns, key_result_type, input_rows_count);
+        ColumnPtr value_result = executeImpl(value_columns, value_result_type, input_rows_count);
+
+        /// key_result and value_result are not constant columns otherwise we won't reach here in executeMap
+        const auto * key_array = assert_cast<const ColumnArray *>(key_result.get());
+        const auto * value_array = assert_cast<const ColumnArray *>(value_result.get());
+        if (!key_array)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Key result column should be {} instead of {} in executeMap of function {}",
+                key_result_type->getName(),
+                key_result->getName(),
+                getName());
+        if (!value_array)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Value result column should be {} instead of {} in executeMap of function {}",
+                key_result_type->getName(),
+                value_result->getName(),
+                getName());
+        if (!key_array->hasEqualOffsets(*value_array))
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR, "Key array and value array must have equal sizes in executeMap of function {}", getName());
+
+        auto nested_column = ColumnArray::create(
+            ColumnTuple::create(Columns{key_array->getDataPtr(), value_array->getDataPtr()}), key_array->getOffsetsPtr());
+        return ColumnMap::create(std::move(nested_column));
+    }
+
     static ColumnPtr executeGeneric(
-        const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, size_t input_rows_count)
+        const ColumnUInt8 * cond_col, const ColumnsWithTypeAndName & arguments, size_t input_rows_count, bool use_variant_when_no_common_type)
     {
         /// Convert both columns to the common type (if needed).
         const ColumnWithTypeAndName & arg1 = arguments[1];
         const ColumnWithTypeAndName & arg2 = arguments[2];
 
-        DataTypePtr common_type = getLeastSupertype(DataTypes{arg1.type, arg2.type});
+        DataTypePtr common_type;
+        if (use_variant_when_no_common_type)
+            common_type = getLeastSupertypeOrVariant(DataTypes{arg1.type, arg2.type});
+        else
+            common_type = getLeastSupertype(DataTypes{arg1.type, arg2.type});
 
         ColumnPtr col_then = castColumn(arg1, common_type);
         ColumnPtr col_else = castColumn(arg2, common_type);
@@ -850,6 +1043,10 @@ private:
 
     ColumnPtr executeForNullableThenElse(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const
     {
+        /// If result type is Variant, we don't need to remove Nullable.
+        if (isVariant(result_type))
+            return nullptr;
+
         const ColumnWithTypeAndName & arg_cond = arguments[0];
         const ColumnWithTypeAndName & arg_then = arguments[1];
         const ColumnWithTypeAndName & arg_else = arguments[2];
@@ -955,6 +1152,11 @@ private:
                     assert_cast<ColumnNullable &>(*result_column).applyNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column));
                     return result_column;
                 }
+                else if (auto * variant_column = typeid_cast<ColumnVariant *>(result_column.get()))
+                {
+                    variant_column->applyNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column).getData());
+                    return result_column;
+                }
                 else
                     return ColumnNullable::create(materializeColumnIfConst(result_column), arg_cond.column);
             }
@@ -993,6 +1195,11 @@ private:
                     assert_cast<ColumnNullable &>(*result_column).applyNegatedNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column));
                     return result_column;
                 }
+                else if (auto * variant_column = typeid_cast<ColumnVariant *>(result_column.get()))
+                {
+                    variant_column->applyNegatedNullMap(assert_cast<const ColumnUInt8 &>(*arg_cond.column).getData());
+                    return result_column;
+                }
                 else
                 {
                     size_t size = input_rows_count;
@@ -1059,7 +1266,7 @@ public:
     bool useDefaultImplementationForNothing() const override { return false; }
     bool isShortCircuit(ShortCircuitSettings & settings, size_t /*number_of_arguments*/) const override
     {
-        settings.enable_lazy_execution_for_first_argument = false;
+        settings.arguments_with_disabled_lazy_execution.insert(0);
         settings.enable_lazy_execution_for_common_descendants_of_arguments = false;
         settings.force_enable_lazy_execution = false;
         return true;
@@ -1082,6 +1289,9 @@ public:
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of first argument (condition) of function if. "
                 "Must be UInt8.", arguments[0]->getName());
 
+        if (use_variant_when_no_common_type)
+            return getLeastSupertypeOrVariant(DataTypes{arguments[1], arguments[2]});
+
         return getLeastSupertype(DataTypes{arguments[1], arguments[2]});
     }
 
@@ -1112,17 +1322,12 @@ public:
 
         if (cond_const_col)
         {
-            if (arg_then.type->equals(*arg_else.type))
-            {
-                return cond_const_col->getValue<UInt8>()
-                    ? arg_then.column
-                    : arg_else.column;
-            }
+            UInt8 value = cond_const_col->getValue<UInt8>();
+            const ColumnWithTypeAndName & arg = value ? arg_then : arg_else;
+            if (arg.type->equals(*result_type))
+                return arg.column;
             else
-            {
-                materialized_cond_col = cond_const_col->convertToFullColumn();
-                cond_col = typeid_cast<const ColumnUInt8 *>(&*materialized_cond_col);
-            }
+                return castColumn(arg, result_type);
         }
 
         if (!cond_col)
@@ -1159,13 +1364,16 @@ public:
         TypeIndex left_id = left_type->getTypeId();
         TypeIndex right_id = right_type->getTypeId();
 
+        /// TODO optimize for map type
+        /// TODO optimize for nullable type
         if (!(callOnBasicTypes<true, true, true, false>(left_id, right_id, call)
             || (res = executeTyped<UUID, UUID>(cond_col, arguments, result_type, input_rows_count))
             || (res = executeString(cond_col, arguments, result_type))
             || (res = executeGenericArray(cond_col, arguments, result_type))
-            || (res = executeTuple(arguments, result_type, input_rows_count))))
+            || (res = executeTuple(arguments, result_type, input_rows_count))
+            || (res = executeMap(arguments, result_type, input_rows_count))))
         {
-            return executeGeneric(cond_col, arguments, input_rows_count);
+            return executeGeneric(cond_col, arguments, input_rows_count, use_variant_when_no_common_type);
         }
 
         return res;
@@ -1205,4 +1413,9 @@ REGISTER_FUNCTION(If)
     factory.registerFunction<FunctionIf>({}, FunctionFactory::CaseInsensitive);
 }
 
+FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool allow_experimental_variant_type, bool use_variant_as_common_type)
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionIf>(allow_experimental_variant_type && use_variant_as_common_type));
+}
+
 }
diff --git a/src/Functions/if.h b/src/Functions/if.h
new file mode 100644
index 00000000000..09a7a6a3e78
--- /dev/null
+++ b/src/Functions/if.h
@@ -0,0 +1,12 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class IFunctionOverloadResolver;
+using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
+
+FunctionOverloadResolverPtr createInternalFunctionIfOverloadResolver(bool allow_experimental_variant_type, bool use_variant_as_common_type);
+
+}
diff --git a/src/Functions/isNotNull.cpp b/src/Functions/isNotNull.cpp
index cbdc08c2fab..dd5182aeade 100644
--- a/src/Functions/isNotNull.cpp
+++ b/src/Functions/isNotNull.cpp
@@ -1,13 +1,14 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionHelpers.h>
-#include <Functions/FunctionFactory.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Core/ColumnNumbers.h>
-#include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnVariant.h>
+#include <Core/ColumnNumbers.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Functions/PerformanceAdaptors.h>
 #include <Common/assert_cast.h>
 
-
 namespace DB
 {
 namespace
@@ -20,10 +21,7 @@ class FunctionIsNotNull : public IFunction
 public:
     static constexpr auto name = "isNotNull";
 
-    static FunctionPtr create(ContextPtr)
-    {
-        return std::make_shared<FunctionIsNotNull>();
-    }
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionIsNotNull>(); }
 
     std::string getName() const override
     {
@@ -45,15 +43,27 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
         const ColumnWithTypeAndName & elem = arguments[0];
+
+        if (isVariant(elem.type))
+        {
+            const auto & discriminators = checkAndGetColumn<ColumnVariant>(*elem.column)->getLocalDiscriminators();
+            auto res = DataTypeUInt8().createColumn();
+            auto & data = typeid_cast<ColumnUInt8 &>(*res).getData();
+            data.resize(discriminators.size());
+            for (size_t i = 0; i < discriminators.size(); ++i)
+                data[i] = discriminators[i] != ColumnVariant::NULL_DISCRIMINATOR;
+            return res;
+        }
+
         if (elem.type->isLowCardinalityNullable())
         {
             const auto * low_cardinality_column = checkAndGetColumn<ColumnLowCardinality>(*elem.column);
             const size_t null_index = low_cardinality_column->getDictionary().getNullValueIndex();
             auto res = DataTypeUInt8().createColumn();
             auto & data = typeid_cast<ColumnUInt8 &>(*res).getData();
-            data.reserve(low_cardinality_column->size());
+            data.resize(low_cardinality_column->size());
             for (size_t i = 0; i != low_cardinality_column->size(); ++i)
-                data.push_back(low_cardinality_column->getIndexAt(i) != null_index);
+                data[i] = (low_cardinality_column->getIndexAt(i) != null_index);
             return res;
         }
 
@@ -63,10 +73,7 @@ public:
             auto res_column = ColumnUInt8::create(input_rows_count);
             const auto & src_data = nullable->getNullMapData();
             auto & res_data = assert_cast<ColumnUInt8 &>(*res_column).getData();
-
-            for (size_t i = 0; i < input_rows_count; ++i)
-                res_data[i] = !src_data[i];
-
+            vector(src_data, res_data);
             return res_column;
         }
         else
@@ -75,8 +82,34 @@ public:
             return DataTypeUInt8().createColumnConst(elem.column->size(), 1u);
         }
     }
-};
 
+private:
+    MULTITARGET_FUNCTION_AVX2_SSE42(
+    MULTITARGET_FUNCTION_HEADER(static void NO_INLINE), vectorImpl, MULTITARGET_FUNCTION_BODY((const PaddedPODArray<UInt8> & null_map, PaddedPODArray<UInt8> & res) /// NOLINT
+    {
+        size_t size = null_map.size();
+        for (size_t i = 0; i < size; ++i)
+            res[i] = !null_map[i];
+    }))
+
+    static void NO_INLINE vector(const PaddedPODArray<UInt8> & null_map, PaddedPODArray<UInt8> & res)
+    {
+#if USE_MULTITARGET_CODE
+        if (isArchSupported(TargetArch::AVX2))
+        {
+            vectorImplAVX2(null_map, res);
+            return;
+        }
+
+        if (isArchSupported(TargetArch::SSE42))
+        {
+            vectorImplSSE42(null_map, res);
+            return;
+        }
+#endif
+        vectorImpl(null_map, res);
+    }
+};
 }
 
 REGISTER_FUNCTION(IsNotNull)
diff --git a/src/Functions/isNull.cpp b/src/Functions/isNull.cpp
index cdce037088d..4bf4e44f866 100644
--- a/src/Functions/isNull.cpp
+++ b/src/Functions/isNull.cpp
@@ -5,6 +5,7 @@
 #include <Core/ColumnNumbers.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnVariant.h>
 
 
 namespace DB
@@ -44,6 +45,18 @@ public:
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t) const override
     {
         const ColumnWithTypeAndName & elem = arguments[0];
+
+        if (isVariant(elem.type))
+        {
+            const auto & discriminators = checkAndGetColumn<ColumnVariant>(*elem.column)->getLocalDiscriminators();
+            auto res = DataTypeUInt8().createColumn();
+            auto & data = typeid_cast<ColumnUInt8 &>(*res).getData();
+            data.reserve(discriminators.size());
+            for (auto discr : discriminators)
+                data.push_back(discr == ColumnVariant::NULL_DISCRIMINATOR);
+            return res;
+        }
+
         if (elem.type->isLowCardinalityNullable())
         {
             const auto * low_cardinality_column = checkAndGetColumn<ColumnLowCardinality>(*elem.column);
diff --git a/src/Functions/keyvaluepair/ArgumentExtractor.h b/src/Functions/keyvaluepair/ArgumentExtractor.h
index e6538584d01..6ff8aa36f13 100644
--- a/src/Functions/keyvaluepair/ArgumentExtractor.h
+++ b/src/Functions/keyvaluepair/ArgumentExtractor.h
@@ -4,6 +4,7 @@
 #include <Columns/ColumnsNumber.h>
 #include <Core/ColumnsWithTypeAndName.h>
 
+#include <list>
 #include <optional>
 
 namespace DB
diff --git a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
index 34081cddb92..94f02861af0 100644
--- a/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
+++ b/src/Functions/keyvaluepair/extractKeyValuePairs.cpp
@@ -43,11 +43,11 @@ class ExtractKeyValuePairs : public IFunction
             builder.withQuotingCharacter(parsed_arguments.quoting_character.value());
         }
 
-        bool is_number_of_pairs_unlimited = context->getSettingsRef().extract_kvp_max_pairs_per_row == 0;
+        bool is_number_of_pairs_unlimited = context->getSettingsRef().extract_key_value_pairs_max_pairs_per_row == 0;
 
         if (!is_number_of_pairs_unlimited)
         {
-            builder.withMaxNumberOfPairs(context->getSettingsRef().extract_kvp_max_pairs_per_row);
+            builder.withMaxNumberOfPairs(context->getSettingsRef().extract_key_value_pairs_max_pairs_per_row);
         }
 
         return builder.build();
diff --git a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
index 687d8d95d42..cf31d30b9dc 100644
--- a/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
+++ b/src/Functions/keyvaluepair/impl/StateHandlerImpl.h
@@ -403,7 +403,7 @@ struct NoEscapingStateHandler : public StateHandlerImpl<false>
     };
 
     template <typename ... Args>
-    NoEscapingStateHandler(Args && ... args)
+    explicit NoEscapingStateHandler(Args && ... args)
     : StateHandlerImpl<false>(std::forward<Args>(args)...) {}
 };
 
@@ -465,7 +465,7 @@ struct InlineEscapingStateHandler : public StateHandlerImpl<true>
     };
 
     template <typename ... Args>
-    InlineEscapingStateHandler(Args && ... args)
+    explicit InlineEscapingStateHandler(Args && ... args)
         : StateHandlerImpl<true>(std::forward<Args>(args)...) {}
 };
 
diff --git a/src/Functions/less.cpp b/src/Functions/less.cpp
index 63bfcfc9f40..0998dc60292 100644
--- a/src/Functions/less.cpp
+++ b/src/Functions/less.cpp
@@ -1,11 +1,13 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
+#include <Functions/FunctionsLogical.h>
 
 
 namespace DB
 {
 
 using FunctionLess = FunctionComparison<LessOp, NameLess>;
+using FunctionEquals = FunctionComparison<EqualsOp, NameEquals>;
 
 REGISTER_FUNCTION(Less)
 {
@@ -16,14 +18,24 @@ template <>
 ColumnPtr FunctionComparison<LessOp, NameLess>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
-    auto less = FunctionFactory::instance().get("less", context);
+    FunctionOverloadResolverPtr less
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionLess>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr func_builder_or
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+
+    FunctionOverloadResolverPtr func_builder_and
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+
+    FunctionOverloadResolverPtr func_builder_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionEquals>(check_decimal_overflow));
 
     return executeTupleLessGreaterImpl(
         less,
         less,
-        FunctionFactory::instance().get("and", context),
-        FunctionFactory::instance().get("or", context),
-        FunctionFactory::instance().get("equals", context),
+        func_builder_and,
+        func_builder_or,
+        func_builder_equals,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/lessOrEquals.cpp b/src/Functions/lessOrEquals.cpp
index a91afabe226..e88ae34da75 100644
--- a/src/Functions/lessOrEquals.cpp
+++ b/src/Functions/lessOrEquals.cpp
@@ -1,11 +1,14 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
+#include <Functions/FunctionsLogical.h>
 
 
 namespace DB
 {
 
 using FunctionLessOrEquals = FunctionComparison<LessOrEqualsOp, NameLessOrEquals>;
+using FunctionLess = FunctionComparison<LessOp, NameLess>;
+using FunctionEquals = FunctionComparison<EqualsOp, NameEquals>;
 
 REGISTER_FUNCTION(LessOrEquals)
 {
@@ -16,12 +19,27 @@ template <>
 ColumnPtr FunctionComparison<LessOrEqualsOp, NameLessOrEquals>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
+    FunctionOverloadResolverPtr less_or_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionLessOrEquals>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr less
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionLess>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr func_builder_or
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+
+    FunctionOverloadResolverPtr func_builder_and
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+
+    FunctionOverloadResolverPtr func_builder_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionEquals>(check_decimal_overflow));
+
     return executeTupleLessGreaterImpl(
-        FunctionFactory::instance().get("less", context),
-        FunctionFactory::instance().get("lessOrEquals", context),
-        FunctionFactory::instance().get("and", context),
-        FunctionFactory::instance().get("or", context),
-        FunctionFactory::instance().get("equals", context),
+        less,
+        less_or_equals,
+        func_builder_and,
+        func_builder_or,
+        func_builder_equals,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/like.cpp b/src/Functions/like.cpp
index 5a86e37a92d..de907380265 100644
--- a/src/Functions/like.cpp
+++ b/src/Functions/like.cpp
@@ -1,5 +1,5 @@
-#include "FunctionFactory.h"
 #include "like.h"
+#include "FunctionFactory.h"
 
 
 namespace DB
diff --git a/src/Functions/locate.cpp b/src/Functions/locate.cpp
new file mode 100644
index 00000000000..9a70fbb2d72
--- /dev/null
+++ b/src/Functions/locate.cpp
@@ -0,0 +1,34 @@
+#include "FunctionsStringSearch.h"
+#include "FunctionFactory.h"
+#include "PositionImpl.h"
+
+
+namespace DB
+{
+namespace
+{
+
+struct NameLocate
+{
+    static constexpr auto name = "locate";
+};
+
+using FunctionLocate = FunctionsStringSearch<PositionImpl<NameLocate, PositionCaseSensitiveASCII>, ExecutionErrorPolicy::Throw, HaystackNeedleOrderIsConfigurable::Yes>;
+
+}
+
+REGISTER_FUNCTION(Locate)
+{
+    FunctionDocumentation::Description doc_description = "Like function `position` but with arguments `haystack` and `locate` switched. The behavior of this function depends on the ClickHouse version: In versions < v24.3, `locate` was an alias of function `position` and accepted arguments `(haystack, needle[, start_pos])`. In versions >= 24.3,, `locate` is an individual function (for better compatibility with MySQL) and accepts arguments `(needle, haystack[, start_pos])`. The previous behaviorcan be restored using setting `function_locate_has_mysql_compatible_argument_order = false`.";
+    FunctionDocumentation::Syntax doc_syntax = "location(needle, haystack[, start_pos])";
+    FunctionDocumentation::Arguments doc_arguments = {{"needle", "Substring to be searched (String)"},
+                                                      {"haystack", "String in which the search is performed (String)."},
+                                                      {"start_pos", "Position (1-based) in `haystack` at which the search starts (UInt*)."}};
+    FunctionDocumentation::ReturnedValue doc_returned_value = "Starting position in bytes and counting from 1, if the substring was found. 0, if the substring was not found.";
+    FunctionDocumentation::Examples doc_examples = {{"Example", "SELECT locate('abcabc', 'ca');", "3"}};
+    FunctionDocumentation::Categories doc_categories = {"String search"};
+
+
+    factory.registerFunction<FunctionLocate>({doc_description, doc_syntax, doc_arguments, doc_returned_value, doc_examples, doc_categories}, FunctionFactory::CaseInsensitive);
+}
+}
diff --git a/src/Functions/logTrace.cpp b/src/Functions/logTrace.cpp
index 55f387cbfeb..923ea9fd70e 100644
--- a/src/Functions/logTrace.cpp
+++ b/src/Functions/logTrace.cpp
@@ -46,7 +46,7 @@ namespace
                 throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "First argument for function {} must be Constant string",
                     getName());
 
-            static auto * log = &Poco::Logger::get("FunctionLogTrace");
+            static auto log = getLogger("FunctionLogTrace");
             LOG_TRACE(log, fmt::runtime(message));
 
             return DataTypeUInt8().createColumnConst(input_rows_count, 0);
diff --git a/src/Functions/logical.h b/src/Functions/logical.h
new file mode 100644
index 00000000000..d2d07f6cec7
--- /dev/null
+++ b/src/Functions/logical.h
@@ -0,0 +1,15 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class IFunctionOverloadResolver;
+using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
+
+FunctionOverloadResolverPtr createInternalFunctionOrOverloadResolver();
+FunctionOverloadResolverPtr createInternalFunctionAndOverloadResolver();
+FunctionOverloadResolverPtr createInternalFunctionXorOverloadResolver();
+FunctionOverloadResolverPtr createInternalFunctionNotOverloadResolver();
+
+}
diff --git a/src/Functions/makeDate.cpp b/src/Functions/makeDate.cpp
index 987cf4eb1a9..8794283a856 100644
--- a/src/Functions/makeDate.cpp
+++ b/src/Functions/makeDate.cpp
@@ -13,6 +13,7 @@
 #include <Interpreters/castColumn.h>
 
 #include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/typeid_cast.h>
 
 #include <array>
@@ -82,17 +83,17 @@ public:
         if (is_year_month_variant)
         {
             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"}
+                {mandatory_argument_names_year_month_day[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+                {mandatory_argument_names_year_month_day[1], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+                {mandatory_argument_names_year_month_day[2], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), 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"}
+                {mandatory_argument_names_year_dayofyear[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+                {mandatory_argument_names_year_dayofyear[1], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
             };
             validateFunctionArgumentTypes(*this, arguments, args);
         }
@@ -189,7 +190,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {mandatory_argument_names[0], &isNumber<IDataType>, nullptr, "Number"}
+            {mandatory_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, args);
@@ -344,16 +345,16 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         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"}
+            {mandatory_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[1], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[2], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[3], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[4], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[5], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
         };
 
         FunctionArgumentDescriptors optional_args{
-            {optional_argument_names[0], &isString<IDataType>, isColumnConst, "const String"}
+            {optional_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
@@ -425,18 +426,18 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         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"}
+            {mandatory_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[1], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[2], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[3], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[4], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {mandatory_argument_names[5], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
         };
 
         FunctionArgumentDescriptors optional_args{
-            {optional_argument_names[0], &isNumber<IDataType>, nullptr, "const Number"},
-            {optional_argument_names[1], &isNumber<IDataType>, isColumnConst, "const Number"},
-            {optional_argument_names[2], &isString<IDataType>, isColumnConst, "const String"}
+            {optional_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "const Number"},
+            {optional_argument_names[1], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), isColumnConst, "const Number"},
+            {optional_argument_names[2], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
@@ -564,11 +565,11 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args{
-            {mandatory_argument_names[0], &isNumber<IDataType>, nullptr, "Number"}
+            {mandatory_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
         };
 
         FunctionArgumentDescriptors optional_args{
-            {optional_argument_names[0], &isString<IDataType>, isColumnConst, "const String"}
+            {optional_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
@@ -643,12 +644,12 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args{
-            {mandatory_argument_names[0], &isNumber<IDataType>, nullptr, "Number"}
+            {mandatory_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"}
         };
 
         FunctionArgumentDescriptors optional_args{
-            {optional_argument_names[0], &isNumber<IDataType>, isColumnConst, "const Number"},
-            {optional_argument_names[0], &isString<IDataType>, isColumnConst, "const String"}
+            {optional_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), isColumnConst, "const Number"},
+            {optional_argument_names[0], static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
diff --git a/src/Functions/map.cpp b/src/Functions/map.cpp
index c950a0491a5..66cd10a3f0b 100644
--- a/src/Functions/map.cpp
+++ b/src/Functions/map.cpp
@@ -8,6 +8,7 @@
 #include <DataTypes/getLeastSupertype.h>
 #include <Columns/ColumnMap.h>
 #include <Interpreters/castColumn.h>
+#include <Interpreters/Context.h>
 #include <Common/HashTable/HashSet.h>
 
 
@@ -30,9 +31,11 @@ class FunctionMap : public IFunction
 public:
     static constexpr auto name = "map";
 
-    static FunctionPtr create(ContextPtr)
+    explicit FunctionMap(bool use_variant_as_common_type_) : use_variant_as_common_type(use_variant_as_common_type_) {}
+
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionMap>();
+        return std::make_shared<FunctionMap>(context->getSettingsRef().allow_experimental_variant_type && context->getSettingsRef().use_variant_as_common_type);
     }
 
     String getName() const override
@@ -77,8 +80,16 @@ public:
         }
 
         DataTypes tmp;
-        tmp.emplace_back(getLeastSupertype(keys));
-        tmp.emplace_back(getLeastSupertype(values));
+        if (use_variant_as_common_type)
+        {
+            tmp.emplace_back(getLeastSupertypeOrVariant(keys));
+            tmp.emplace_back(getLeastSupertypeOrVariant(values));
+        }
+        else
+        {
+            tmp.emplace_back(getLeastSupertype(keys));
+            tmp.emplace_back(getLeastSupertype(values));
+        }
         return std::make_shared<DataTypeMap>(tmp);
     }
 
@@ -138,6 +149,9 @@ public:
 
         return ColumnMap::create(nested_column);
     }
+
+private:
+    bool use_variant_as_common_type = false;
 };
 
 /// mapFromArrays(keys, values) is a function that allows you to make key-value pair from a pair of arrays
diff --git a/src/Functions/materialize.h b/src/Functions/materialize.h
index 73bfdec48ab..41994509745 100644
--- a/src/Functions/materialize.h
+++ b/src/Functions/materialize.h
@@ -36,6 +36,8 @@ public:
 
     bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
 
+    bool isSuitableForConstantFolding() const override { return false; }
+
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return false; }
 
     size_t getNumberOfArguments() const override
diff --git a/src/Functions/mortonEncode.cpp b/src/Functions/mortonEncode.cpp
index fee14c7784b..3b95c114b14 100644
--- a/src/Functions/mortonEncode.cpp
+++ b/src/Functions/mortonEncode.cpp
@@ -321,6 +321,9 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        if (input_rows_count == 0)
+            return ColumnUInt64::create();
+
         return selector.selectAndExecute(arguments, result_type, input_rows_count);
     }
 
diff --git a/src/Functions/multiIf.cpp b/src/Functions/multiIf.cpp
index d0f5a1ce439..49c45d0c0be 100644
--- a/src/Functions/multiIf.cpp
+++ b/src/Functions/multiIf.cpp
@@ -3,12 +3,21 @@
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnDecimal.h>
 #include <Columns/MaskOperations.h>
 #include <Interpreters/castColumn.h>
 #include <Common/assert_cast.h>
 #include <Common/typeid_cast.h>
 #include <Interpreters/Context.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypesDecimal.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDate32.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeVariant.h>
 #include <DataTypes/getLeastSupertype.h>
 
 
@@ -19,7 +28,7 @@ namespace ErrorCodes
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int NOT_IMPLEMENTED;
-    extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -39,15 +48,23 @@ class FunctionMultiIf final : public FunctionIfBase
 {
 public:
     static constexpr auto name = "multiIf";
-    static FunctionPtr create(ContextPtr context_) { return std::make_shared<FunctionMultiIf>(context_); }
+    static FunctionPtr create(ContextPtr context_)
+    {
+        const auto & settings = context_->getSettingsRef();
+        return std::make_shared<FunctionMultiIf>(settings.allow_execute_multiif_columnar, settings.allow_experimental_variant_type, settings.use_variant_as_common_type);
+    }
 
-    explicit FunctionMultiIf(ContextPtr context_) : context(context_) { }
+    explicit FunctionMultiIf(bool allow_execute_multiif_columnar_, bool allow_experimental_variant_type_, bool use_variant_as_common_type_)
+        : allow_execute_multiif_columnar(allow_execute_multiif_columnar_)
+        , allow_experimental_variant_type(allow_experimental_variant_type_)
+        , use_variant_as_common_type(use_variant_as_common_type_)
+    {}
 
     String getName() const override { return name; }
     bool isVariadic() const override { return true; }
     bool isShortCircuit(ShortCircuitSettings & settings, size_t number_of_arguments) const override
     {
-        settings.enable_lazy_execution_for_first_argument = false;
+        settings.arguments_with_disabled_lazy_execution.insert(0);
         settings.enable_lazy_execution_for_common_descendants_of_arguments = (number_of_arguments != 3);
         settings.force_enable_lazy_execution = false;
         return true;
@@ -117,6 +134,9 @@ public:
             types_of_branches.emplace_back(arg);
         });
 
+        if (allow_experimental_variant_type && use_variant_as_common_type)
+            return getLeastSupertypeOrVariant(types_of_branches);
+
         return getLeastSupertype(types_of_branches);
     }
 
@@ -137,6 +157,10 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & args, const DataTypePtr & result_type, size_t input_rows_count) const override
     {
+        /// Fast path when data is empty
+        if (input_rows_count == 0)
+            return result_type->createColumn();
+
         ColumnsWithTypeAndName arguments = args;
         executeShortCircuitArguments(arguments);
         /** We will gather values from columns in branches to result column,
@@ -236,66 +260,74 @@ public:
             }
         }
 
-        const auto & settings = context->getSettingsRef();
         const WhichDataType which(removeNullable(result_type));
-        bool execute_multiif_columnar
-            = settings.allow_execute_multiif_columnar && !contains_short && (which.isInt() || which.isUInt() || which.isFloat());
+        bool execute_multiif_columnar = allow_execute_multiif_columnar && !contains_short
+            && instructions.size() <= std::numeric_limits<UInt8>::max()
+            && (which.isInt() || which.isUInt() || which.isFloat() || which.isDecimal() || which.isDateOrDate32OrDateTimeOrDateTime64()
+                || which.isEnum() || which.isIPv4() || which.isIPv6());
 
         size_t rows = input_rows_count;
         if (!execute_multiif_columnar)
         {
             MutableColumnPtr res = return_type->createColumn();
+            res->reserve(rows);
             executeInstructions(instructions, rows, res);
             return std::move(res);
         }
 
-#define EXECUTE_INSTRUCTIONS_COLUMNAR(TYPE, INDEX) \
+#define EXECUTE_INSTRUCTIONS_COLUMNAR(TYPE, FIELD, INDEX) \
     if (which.is##TYPE()) \
     { \
-        MutableColumnPtr res = ColumnVector<TYPE>::create(rows); \
-        MutableColumnPtr null_map = result_type->isNullable() ? ColumnUInt8::create(rows) : nullptr; \
-        executeInstructionsColumnar<TYPE, INDEX>(instructions, rows, res, null_map, result_type->isNullable()); \
-        if (!result_type->isNullable()) \
-            return std::move(res); \
+        MutableColumnPtr res = result_type->createColumn(); \
+        if (result_type->isNullable()) \
+        { \
+            auto & res_nullable = assert_cast<ColumnNullable &>(*res); \
+            auto & res_data = assert_cast<ColumnVectorOrDecimal<FIELD> &>(res_nullable.getNestedColumn()).getData(); \
+            auto & res_null_map = res_nullable.getNullMapData(); \
+            executeInstructionsColumnar<FIELD, INDEX, true>(instructions, rows, res_data, &res_null_map); \
+        } \
         else \
-            return ColumnNullable::create(std::move(res), std::move(null_map)); \
+        { \
+            auto & res_data = assert_cast<ColumnVectorOrDecimal<FIELD> &>(*res).getData(); \
+            executeInstructionsColumnar<FIELD, INDEX, false>(instructions, rows, res_data, nullptr); \
+        } \
+        return std::move(res); \
     }
 
 #define ENUMERATE_NUMERIC_TYPES(M, INDEX) \
-    M(UInt8, INDEX) \
-    M(UInt16, INDEX) \
-    M(UInt32, INDEX) \
-    M(UInt64, INDEX) \
-    M(Int8, INDEX) \
-    M(Int16, INDEX) \
-    M(Int32, INDEX) \
-    M(Int64, INDEX) \
-    M(UInt128, INDEX) \
-    M(UInt256, INDEX) \
-    M(Int128, INDEX) \
-    M(Int256, INDEX) \
-    M(Float32, INDEX) \
-    M(Float64, INDEX) \
+    M(UInt8, UInt8, INDEX) \
+    M(UInt16, UInt16, INDEX) \
+    M(UInt32, UInt32, INDEX) \
+    M(UInt64, UInt64, INDEX) \
+    M(Int8, Int8, INDEX) \
+    M(Int16, Int16, INDEX) \
+    M(Int32, Int32, INDEX) \
+    M(Int64, Int64, INDEX) \
+    M(Float32, Float32, INDEX) \
+    M(Float64, Float64, INDEX) \
+    M(UInt128, UInt128, INDEX) \
+    M(UInt256, UInt256, INDEX) \
+    M(Int128, Int128, INDEX) \
+    M(Int256, Int256, INDEX) \
+    M(Decimal32, Decimal32, INDEX) \
+    M(Decimal64, Decimal64, INDEX) \
+    M(Decimal128, Decimal128, INDEX) \
+    M(Decimal256, Decimal256, INDEX) \
+    M(Date, UInt16, INDEX) \
+    M(Date32, Int32, INDEX) \
+    M(DateTime, UInt32, INDEX) \
+    M(DateTime64, DateTime64, INDEX) \
+    M(Enum8, Int8, INDEX) \
+    M(Enum16, Int16, INDEX) \
+    M(IPv4, IPv4, INDEX) \
+    M(IPv6, IPv6, INDEX) \
     throw Exception( \
         ErrorCodes::NOT_IMPLEMENTED, "Columnar execution of function {} not implemented for type {}", getName(), result_type->getName());
 
-        size_t num_instructions = instructions.size();
-        if (num_instructions <= std::numeric_limits<Int16>::max())
-        {
-            ENUMERATE_NUMERIC_TYPES(EXECUTE_INSTRUCTIONS_COLUMNAR, Int16)
-        }
-        else if (num_instructions <= std::numeric_limits<Int32>::max())
-        {
-            ENUMERATE_NUMERIC_TYPES(EXECUTE_INSTRUCTIONS_COLUMNAR, Int32)
-        }
-        else if (num_instructions <= std::numeric_limits<Int64>::max())
-        {
-            ENUMERATE_NUMERIC_TYPES(EXECUTE_INSTRUCTIONS_COLUMNAR, Int64)
-        }
-        else
-            throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Instruction size({}) of function {} is out of range", getName(), result_type->getName());
+        ENUMERATE_NUMERIC_TYPES(EXECUTE_INSTRUCTIONS_COLUMNAR, UInt8)
     }
+#undef ENUMERATE_NUMERIC_TYPES
+#undef EXECUTE_INSTRUCTIONS_COLUMNAR
 
 private:
 
@@ -337,11 +369,11 @@ private:
 
     /// We should read source from which instruction on each row?
     template <typename S>
-    static void calculateInserts(std::vector<Instruction> & instructions, size_t rows, PaddedPODArray<S> & inserts)
+    static NO_INLINE void calculateInserts(const std::vector<Instruction> & instructions, size_t rows, PaddedPODArray<S> & inserts)
     {
-        for (S i = static_cast<S>(instructions.size() - 1); i >= 0; --i)
+        for (S i = instructions.size() - 1; i != static_cast<S>(-1); --i)
         {
-            auto & instruction = instructions[i];
+            const auto & instruction = instructions[i];
             if (instruction.condition_always_true)
             {
                 for (size_t row_i = 0; row_i < rows; ++row_i)
@@ -377,60 +409,62 @@ private:
         }
     }
 
-    template <typename T, typename S>
-    static void executeInstructionsColumnar(std::vector<Instruction> & instructions, size_t rows, const MutableColumnPtr & res, const MutableColumnPtr & null_map, bool nullable)
+    template <typename T, typename S, bool nullable_result = false>
+    static NO_INLINE void executeInstructionsColumnar(
+        const std::vector<Instruction> & instructions,
+        size_t rows,
+        PaddedPODArray<T> & res_data,
+        PaddedPODArray<UInt8> * res_null_map = nullptr)
     {
         PaddedPODArray<S> inserts(rows, static_cast<S>(instructions.size()));
         calculateInserts(instructions, rows, inserts);
 
-        PaddedPODArray<T> & res_data = assert_cast<ColumnVector<T> &>(*res).getData();
-        if (!nullable)
+        res_data.resize_exact(rows);
+        if constexpr (nullable_result)
         {
-            for (size_t row_i = 0; row_i < rows; ++row_i)
+            if (!res_null_map)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "Invalid result null_map while result type is nullable");
+
+            res_null_map->resize_exact(rows);
+        }
+
+        std::vector<const T *> data_cols(instructions.size(), nullptr);
+        std::vector<const UInt8 *> null_map_cols(instructions.size(), nullptr);
+        for (size_t i = 0; i < instructions.size(); ++i)
+        {
+            const auto & instruction = instructions[i];
+            const IColumn * non_const_col = instructions[i].source_is_constant
+                ? &assert_cast<const ColumnConst &>(*instruction.source).getDataColumn()
+                : instruction.source.get();
+            const ColumnNullable * nullable_col = checkAndGetColumn<ColumnNullable>(non_const_col);
+            data_cols[i] = nullable_col ? assert_cast<const ColumnVectorOrDecimal<T> &>(nullable_col->getNestedColumn()).getData().data()
+                                        : assert_cast<const ColumnVectorOrDecimal<T> &>(*non_const_col).getData().data();
+            null_map_cols[i] = nullable_col ? assert_cast<const ColumnUInt8 &>(nullable_col->getNullMapColumn()).getData().data() : nullptr;
+        }
+
+        std::unique_ptr<PaddedPODArray<UInt8>> shared_null_map;
+        if constexpr (nullable_result)
+        {
+            for (auto & col : null_map_cols)
             {
-                auto & instruction = instructions[inserts[row_i]];
-                auto ref = instruction.source->getDataAt(row_i);
-                res_data[row_i] = *reinterpret_cast<const T*>(ref.data);
+                if (!col)
+                {
+                    if (!shared_null_map)
+                        shared_null_map = std::make_unique<PaddedPODArray<UInt8>>(rows, 0);
+
+                    col = shared_null_map->data();
+                }
             }
         }
-        else
+
+        for (size_t row_i = 0; row_i < rows; ++row_i)
         {
-            PaddedPODArray<UInt8> & null_map_data = assert_cast<ColumnUInt8 &>(*null_map).getData();
-            std::vector<const T*> data_cols(instructions.size());
-            std::vector<const UInt8 *> null_map_cols(instructions.size());
-            ColumnPtr shared_null_map_col = nullptr;
-            for (size_t i = 0; i < instructions.size(); ++i)
-            {
-                if (instructions[i].source->isNullable())
-                {
-                    const ColumnNullable * nullable_col;
-                    if (!instructions[i].source_is_constant)
-                        nullable_col = assert_cast<const ColumnNullable *>(instructions[i].source.get());
-                    else
-                    {
-                        const ColumnPtr data_column = assert_cast<const ColumnConst &>(*instructions[i].source).getDataColumnPtr();
-                        nullable_col = assert_cast<const ColumnNullable *>(data_column.get());
-                    }
-                    null_map_cols[i] = assert_cast<const ColumnUInt8 &>(*nullable_col->getNullMapColumnPtr()).getData().data();
-                    data_cols[i] = assert_cast<const ColumnVector<T> &>(*nullable_col->getNestedColumnPtr()).getData().data();
-                }
-                else
-                {
-                    if (!shared_null_map_col)
-                    {
-                        shared_null_map_col = ColumnUInt8::create(rows, 0);
-                    }
-                    null_map_cols[i] = assert_cast<const ColumnUInt8 &>(*shared_null_map_col).getData().data();
-                    data_cols[i] = assert_cast<const ColumnVector<T> &>(*instructions[i].source).getData().data();
-                }
-            }
-            for (size_t row_i = 0; row_i < rows; ++row_i)
-            {
-                auto & instruction = instructions[inserts[row_i]];
-                size_t index = instruction.source_is_constant ? 0 : row_i;
-                res_data[row_i] = *(data_cols[inserts[row_i]] + index);
-                null_map_data[row_i] = *(null_map_cols[inserts[row_i]] + index);
-            }
+            S insert = inserts[row_i];
+            const auto & instruction = instructions[insert];
+            size_t index = instruction.source_is_constant ? 0 : row_i;
+            res_data[row_i] = *(data_cols[insert] + index);
+            if constexpr (nullable_result)
+                (*res_null_map)[row_i] = *(null_map_cols[insert] + index);
         }
     }
 
@@ -503,7 +537,9 @@ private:
             executeColumnIfNeeded(arguments[i], true);
     }
 
-    ContextPtr context;
+    const bool allow_execute_multiif_columnar;
+    const bool allow_experimental_variant_type;
+    const bool use_variant_as_common_type;
 };
 
 }
@@ -513,10 +549,13 @@ REGISTER_FUNCTION(MultiIf)
     factory.registerFunction<FunctionMultiIf>();
 
     /// These are obsolete function names.
-    factory.registerFunction<FunctionMultiIf>("caseWithoutExpr");
-    factory.registerFunction<FunctionMultiIf>("caseWithoutExpression");
+    factory.registerAlias("caseWithoutExpr", "multiIf");
+    factory.registerAlias("caseWithoutExpression", "multiIf");
+}
+
+FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool allow_experimental_variant_type, bool use_variant_as_common_type)
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMultiIf>(allow_execute_multiif_columnar, allow_experimental_variant_type, use_variant_as_common_type));
 }
 
 }
-
-
diff --git a/src/Functions/multiIf.h b/src/Functions/multiIf.h
new file mode 100644
index 00000000000..617d63b89bc
--- /dev/null
+++ b/src/Functions/multiIf.h
@@ -0,0 +1,12 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class IFunctionOverloadResolver;
+using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
+
+FunctionOverloadResolverPtr createInternalMultiIfOverloadResolver(bool allow_execute_multiif_columnar, bool allow_experimental_variant_type, bool use_variant_as_common_type);
+
+}
diff --git a/src/Functions/multiMatchAny.cpp b/src/Functions/multiMatchAny.cpp
index 6e6abe61898..054a60fce2d 100644
--- a/src/Functions/multiMatchAny.cpp
+++ b/src/Functions/multiMatchAny.cpp
@@ -22,4 +22,9 @@ REGISTER_FUNCTION(MultiMatchAny)
     factory.registerFunction<FunctionMultiMatchAny>();
 }
 
+FunctionOverloadResolverPtr createInternalMultiMatchAnyOverloadResolver(bool allow_hyperscan, size_t max_hyperscan_regexp_length, size_t max_hyperscan_regexp_total_length, bool reject_expensive_hyperscan_regexps)
+{
+    return std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionMultiMatchAny>(allow_hyperscan, max_hyperscan_regexp_length, max_hyperscan_regexp_total_length, reject_expensive_hyperscan_regexps));
+}
+
 }
diff --git a/src/Functions/multiMatchAny.h b/src/Functions/multiMatchAny.h
new file mode 100644
index 00000000000..4548ec1d593
--- /dev/null
+++ b/src/Functions/multiMatchAny.h
@@ -0,0 +1,12 @@
+#pragma once
+#include <memory>
+
+namespace DB
+{
+
+class IFunctionOverloadResolver;
+using FunctionOverloadResolverPtr = std::shared_ptr<IFunctionOverloadResolver>;
+
+FunctionOverloadResolverPtr createInternalMultiMatchAnyOverloadResolver(bool allow_hyperscan, size_t max_hyperscan_regexp_length, size_t max_hyperscan_regexp_total_length, bool reject_expensive_hyperscan_regexps);
+
+}
diff --git a/src/Functions/notEquals.cpp b/src/Functions/notEquals.cpp
index 08bedff399e..3a63db46711 100644
--- a/src/Functions/notEquals.cpp
+++ b/src/Functions/notEquals.cpp
@@ -1,6 +1,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsComparison.h>
-
+#include <Functions/FunctionsLogical.h>
 
 namespace DB
 {
@@ -16,9 +16,15 @@ template <>
 ColumnPtr FunctionComparison<NotEqualsOp, NameNotEquals>::executeTupleImpl(
     const ColumnsWithTypeAndName & x, const ColumnsWithTypeAndName & y, size_t tuple_size, size_t input_rows_count) const
 {
+    FunctionOverloadResolverPtr func_builder_not_equals
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionNotEquals>(check_decimal_overflow));
+
+    FunctionOverloadResolverPtr func_builder_or
+        = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionOr>());
+
     return executeTupleEqualityImpl(
-        FunctionFactory::instance().get("notEquals", context),
-        FunctionFactory::instance().get("or", context),
+        func_builder_not_equals,
+        func_builder_or,
         x, y, tuple_size, input_rows_count);
 }
 
diff --git a/src/Functions/padString.cpp b/src/Functions/padString.cpp
index d0f22aeeb3b..b26a4ec3d6a 100644
--- a/src/Functions/padString.cpp
+++ b/src/Functions/padString.cpp
@@ -1,5 +1,6 @@
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/GatherUtils/Algorithms.h>
@@ -188,7 +189,7 @@ namespace
                     arguments[2]->getName(),
                     getName());
 
-            return arguments[0];
+            return std::make_shared<DataTypeString>();
         }
 
         ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
diff --git a/src/Functions/parseDateTime.cpp b/src/Functions/parseDateTime.cpp
index 860603dc503..7a0d7c75774 100644
--- a/src/Functions/parseDateTime.cpp
+++ b/src/Functions/parseDateTime.cpp
@@ -489,12 +489,12 @@ namespace
         DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
         {
             FunctionArgumentDescriptors mandatory_args{
-                {"time", &isString<IDataType>, nullptr, "String"},
-                {"format", &isString<IDataType>, nullptr, "String"}
+                {"time", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+                {"format", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
             };
 
             FunctionArgumentDescriptors optional_args{
-                {"timezone", &isString<IDataType>, &isColumnConst, "const String"}
+                {"timezone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), &isColumnConst, "const String"}
             };
 
             validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
@@ -1942,7 +1942,7 @@ namespace
 REGISTER_FUNCTION(ParseDateTime)
 {
     factory.registerFunction<FunctionParseDateTime>();
-    factory.registerAlias("TO_UNIXTIME", FunctionParseDateTime::name);
+    factory.registerAlias("TO_UNIXTIME", FunctionParseDateTime::name, FunctionFactory::CaseInsensitive);
     factory.registerFunction<FunctionParseDateTimeOrZero>();
     factory.registerFunction<FunctionParseDateTimeOrNull>();
     factory.registerAlias("str_to_date", FunctionParseDateTimeOrNull::name, FunctionFactory::CaseInsensitive);
diff --git a/src/Functions/position.cpp b/src/Functions/position.cpp
index 409a593b44c..29a5db2eb24 100644
--- a/src/Functions/position.cpp
+++ b/src/Functions/position.cpp
@@ -20,6 +20,5 @@ using FunctionPosition = FunctionsStringSearch<PositionImpl<NamePosition, Positi
 REGISTER_FUNCTION(Position)
 {
     factory.registerFunction<FunctionPosition>({}, FunctionFactory::CaseInsensitive);
-    factory.registerAlias("locate", NamePosition::name, FunctionFactory::CaseInsensitive);
 }
 }
diff --git a/src/Functions/punycode.cpp b/src/Functions/punycode.cpp
index 159189744bd..107302069b4 100644
--- a/src/Functions/punycode.cpp
+++ b/src/Functions/punycode.cpp
@@ -6,15 +6,11 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionStringToString.h>
 
-#ifdef __clang__
 #    pragma clang diagnostic push
 #    pragma clang diagnostic ignored "-Wnewline-eof"
-#endif
 #    include <ada/idna/punycode.h>
 #    include <ada/idna/unicode_transcoding.h>
-#ifdef __clang__
 #    pragma clang diagnostic pop
-#endif
 
 namespace DB
 {
diff --git a/src/Functions/regexpExtract.cpp b/src/Functions/regexpExtract.cpp
index 0502d2fbfdc..cfb42580cb0 100644
--- a/src/Functions/regexpExtract.cpp
+++ b/src/Functions/regexpExtract.cpp
@@ -47,12 +47,12 @@ public:
                 arguments.size());
 
         FunctionArgumentDescriptors args{
-            {"haystack", &isString<IDataType>, nullptr, "String"},
-            {"pattern", &isString<IDataType>, isColumnConst, "const String"},
+            {"haystack", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+            {"pattern", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), isColumnConst, "const String"},
         };
 
         if (arguments.size() == 3)
-            args.emplace_back(FunctionArgumentDescriptor{"index", &isInteger<IDataType>, nullptr, "Integer"});
+            args.emplace_back(FunctionArgumentDescriptor{"index", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInteger), nullptr, "Integer"});
 
         validateFunctionArgumentTypes(*this, arguments, args);
 
@@ -124,21 +124,23 @@ private:
         res_offsets.push_back(res_offset);
     }
 
-    static void vectorConstant(
+    void vectorConstant(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         const std::string & pattern,
         ssize_t index,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets)
+        ColumnString::Offsets & res_offsets) const
     {
         const OptimizedRegularExpression regexp = Regexps::createRegexp<false, false, false>(pattern);
         unsigned capture = regexp.getNumberOfSubpatterns();
         if (index < 0 || index >= capture + 1)
             throw Exception(
                 ErrorCodes::INDEX_OF_POSITIONAL_ARGUMENT_IS_OUT_OF_RANGE,
-                "Index value {} is out of range, should be in [0, {})",
+                "Index value {} for regexp pattern `{}` in function {} is out-of-range, should be in [0, {})",
                 index,
+                pattern,
+                getName(),
                 capture + 1);
 
         OptimizedRegularExpression::MatchVec matches;
@@ -161,13 +163,13 @@ private:
         }
     }
 
-    static void vectorVector(
+    void vectorVector(
         const ColumnString::Chars & data,
         const ColumnString::Offsets & offsets,
         const std::string & pattern,
         const ColumnPtr & column_index,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets)
+        ColumnString::Offsets & res_offsets) const
     {
         res_data.reserve(data.size() / 5);
         res_offsets.reserve(offsets.size());
@@ -187,8 +189,10 @@ private:
             if (index < 0 || index >= capture + 1)
                 throw Exception(
                     ErrorCodes::INDEX_OF_POSITIONAL_ARGUMENT_IS_OUT_OF_RANGE,
-                    "Index value {} is out of range, should be in [0, {})",
+                    "Index value {} for regexp pattern `{}` in function {} is out-of-range, should be in [0, {})",
                     index,
+                    pattern,
+                    getName(),
                     capture + 1);
 
             regexp.match(
@@ -202,12 +206,12 @@ private:
         }
     }
 
-    static void constantVector(
+    void constantVector(
         const std::string & str,
         const std::string & pattern,
         const ColumnPtr & column_index,
         ColumnString::Chars & res_data,
-        ColumnString::Offsets & res_offsets)
+        ColumnString::Offsets & res_offsets) const
     {
         size_t rows = column_index->size();
         res_data.reserve(str.size() / 5);
@@ -230,8 +234,10 @@ private:
             if (index < 0 || index >= capture + 1)
                 throw Exception(
                     ErrorCodes::INDEX_OF_POSITIONAL_ARGUMENT_IS_OUT_OF_RANGE,
-                    "Index value {} is out of range, should be in [0, {})",
+                    "Index value {} for regexp pattern `{}` in function {} is out-of-range, should be in [0, {})",
                     index,
+                    pattern,
+                    getName(),
                     capture + 1);
 
             saveMatch(matches, index, padded_str, 0, res_data, res_offsets, res_offset);
diff --git a/src/Functions/repeat.cpp b/src/Functions/repeat.cpp
index c1b553ac6b3..6f2078b7e48 100644
--- a/src/Functions/repeat.cpp
+++ b/src/Functions/repeat.cpp
@@ -44,7 +44,7 @@ struct RepeatImpl
         ColumnString::Offsets & res_offsets,
         T repeat_time)
     {
-        repeat_time = repeat_time < 0 ? 0 : repeat_time;
+        repeat_time = repeat_time < 0 ? static_cast<T>(0) : repeat_time;
         checkRepeatTime(repeat_time);
 
         UInt64 data_size = 0;
@@ -76,7 +76,7 @@ struct RepeatImpl
         res_offsets.assign(offsets);
         for (UInt64 i = 0; i < col_num.size(); ++i)
         {
-            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            T repeat_time = col_num[i] < 0 ? static_cast<T>(0) : col_num[i];
             size_t repeated_size = (offsets[i] - offsets[i - 1] - 1) * repeat_time + 1;
             checkStringSize(repeated_size);
             data_size += repeated_size;
@@ -86,7 +86,7 @@ struct RepeatImpl
 
         for (UInt64 i = 0; i < col_num.size(); ++i)
         {
-            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            T repeat_time = col_num[i] < 0 ? static_cast<T>(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,7 @@ struct RepeatImpl
         UInt64 col_size = col_num.size();
         for (UInt64 i = 0; i < col_size; ++i)
         {
-            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            T repeat_time = col_num[i] < 0 ? static_cast<T>(0) : col_num[i];
             size_t repeated_size = str_size * repeat_time + 1;
             checkStringSize(repeated_size);
             data_size += repeated_size;
@@ -114,7 +114,7 @@ struct RepeatImpl
         res_data.resize(data_size);
         for (UInt64 i = 0; i < col_size; ++i)
         {
-            T repeat_time = col_num[i] < 0 ? 0 : col_num[i];
+            T repeat_time = col_num[i] < 0 ? static_cast<T>(0) : col_num[i];
             checkRepeatTime(repeat_time);
             process(
                 reinterpret_cast<UInt8 *>(const_cast<char *>(copy_str.data())),
@@ -169,8 +169,19 @@ class FunctionRepeat : public IFunction
     template <typename F>
     static bool castType(const IDataType * type, F && f)
     {
-        return castTypeToEither<DataTypeInt8, DataTypeInt16, DataTypeInt32, DataTypeInt64,
-            DataTypeUInt8, DataTypeUInt16, DataTypeUInt32, DataTypeUInt64>(type, std::forward<F>(f));
+        return castTypeToEither<
+            DataTypeInt8,
+            DataTypeInt16,
+            DataTypeInt32,
+            DataTypeInt64,
+            DataTypeInt128,
+            DataTypeInt256,
+            DataTypeUInt8,
+            DataTypeUInt16,
+            DataTypeUInt32,
+            DataTypeUInt64,
+            DataTypeUInt128,
+            DataTypeUInt256>(type, std::forward<F>(f));
     }
 
 public:
@@ -186,8 +197,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"s", &isString<IDataType>, nullptr, "String"},
-            {"n", &isInteger<IDataType>, nullptr, "Integer"},
+            {"s", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"},
+            {"n", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInteger), nullptr, "Integer"},
         };
 
         validateFunctionArgumentTypes(*this, arguments, args);
@@ -208,7 +219,7 @@ public:
             if (const ColumnConst * col_num_const = checkAndGetColumn<ColumnConst>(col_num.get()))
             {
                 auto col_res = ColumnString::create();
-                castType(arguments[1].type.get(), [&](const auto & type)
+                auto success = castType(arguments[1].type.get(), [&](const auto & type)
                 {
                     using DataType = std::decay_t<decltype(type)>;
                     using T = typename DataType::FieldType;
@@ -216,6 +227,11 @@ public:
                     RepeatImpl::vectorStrConstRepeat(col->getChars(), col->getOffsets(), col_res->getChars(), col_res->getOffsets(), times);
                     return true;
                 });
+
+                if (!success)
+                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Illegal column type {} of 'n' of function {}",
+                        arguments[1].column->getName(), getName());
+
                 return col_res;
             }
             else if (castType(arguments[1].type.get(), [&](const auto & type)
diff --git a/src/Functions/runningAccumulate.cpp b/src/Functions/runningAccumulate.cpp
index b0ba10c4049..793e79cdf46 100644
--- a/src/Functions/runningAccumulate.cpp
+++ b/src/Functions/runningAccumulate.cpp
@@ -1,8 +1,9 @@
-#include <Functions/IFunction.h>
-#include <Functions/FunctionFactory.h>
-#include <Functions/FunctionHelpers.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
 #include <Common/AlignedBuffer.h>
 #include <Common/Arena.h>
 #include <Common/scope_guard_safe.h>
diff --git a/src/Functions/s2_fwd.h b/src/Functions/s2_fwd.h
index 6e0b58ae118..4ed5d4fcc1b 100644
--- a/src/Functions/s2_fwd.h
+++ b/src/Functions/s2_fwd.h
@@ -1,8 +1,6 @@
 #pragma once
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wambiguous-reversed-operator"
-#endif
 
 #include <s2/s2latlng.h>
 #include <s2/s2cell_id.h>
@@ -11,6 +9,4 @@
 #include <s2/s2cap.h>
 #include <s2/s1angle.h>
 
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
diff --git a/src/Functions/seriesDecomposeSTL.cpp b/src/Functions/seriesDecomposeSTL.cpp
index 21e36761213..618808b64ed 100644
--- a/src/Functions/seriesDecomposeSTL.cpp
+++ b/src/Functions/seriesDecomposeSTL.cpp
@@ -1,15 +1,9 @@
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wold-style-cast"
 #pragma clang diagnostic ignored "-Wshadow"
 #pragma clang diagnostic ignored "-Wimplicit-float-conversion"
-#endif
-
 #include <Functions/stl.hpp>
-
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
 
 #include <Columns/ColumnArray.h>
 #include <Columns/ColumnConst.h>
@@ -48,8 +42,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"time_series", &isArray<IDataType>, nullptr, "Array"},
-            {"period", &isNativeUInt<IDataType>, nullptr, "Unsigned Integer"},
+            {"time_series", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"},
+            {"period", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeUInt), nullptr, "Unsigned Integer"},
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
@@ -128,6 +122,10 @@ public:
                 res_data.insert(residue.begin(), residue.end());
                 res_col_offsets_data.push_back(res_data.size());
 
+                // Create Baseline = seasonal + trend
+                std::transform(seasonal.begin(), seasonal.end(), trend.begin(), std::back_inserter(res_data), std::plus<>());
+                res_col_offsets_data.push_back(res_data.size());
+
                 root_offsets_data.push_back(res_col_offsets->size());
 
                 prev_src_offset = curr_offset;
@@ -201,7 +199,7 @@ The number of data points in `series` should be at least twice the value of `per
 
 **Returned value**
 
-- An array of three arrays where the first array include seasonal components, the second array - trend, and the third array - residue component.
+- An array of four arrays where the first array include seasonal components, the second array - trend, the third array - residue component, and the fourth array - baseline(seasonal + trend) component.
 
 Type: [Array](../../sql-reference/data-types/array.md).
 
@@ -230,6 +228,10 @@ Result:
     [
         0, 0.0000019073486, -0.0000019073486, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -0.0000019073486, 0,
         0
+    ],
+    [
+        10.1, 20.449999, 40.340004, 10.100001, 20.45, 40.34, 10.100001, 20.45, 40.34, 10.1, 20.45, 40.34,
+        10.1, 20.45, 40.34, 10.1, 20.45, 40.34, 10.1, 20.45, 40.34, 10.100002, 20.45, 40.34
     ]]                                                                                                                   │
 └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```)",
diff --git a/src/Functions/seriesOutliersDetectTukey.cpp b/src/Functions/seriesOutliersDetectTukey.cpp
new file mode 100644
index 00000000000..da04d3b78d3
--- /dev/null
+++ b/src/Functions/seriesOutliersDetectTukey.cpp
@@ -0,0 +1,256 @@
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <Functions/IFunction.h>
+#include <Common/NaNUtils.h>
+#include <cmath>
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int BAD_ARGUMENTS;
+extern const int ILLEGAL_COLUMN;
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+/// Detects a possible anomaly in series using [Tukey Fences](https://en.wikipedia.org/wiki/Outlier#Tukey%27s_fences)
+class FunctionSeriesOutliersDetectTukey : public IFunction
+{
+public:
+    static constexpr auto name = "seriesOutliersDetectTukey";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionSeriesOutliersDetectTukey>(); }
+
+    std::string getName() const override { return name; }
+
+    bool isVariadic() const override { return true; }
+
+    size_t getNumberOfArguments() const override { return 0; }
+
+    bool useDefaultImplementationForConstants() const override { return true; }
+
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.size() != 1 && arguments.size() != 4)
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                "Function {} needs either 1 or 4 arguments; passed {}.",
+                getName(),
+                arguments.size());
+
+        FunctionArgumentDescriptors mandatory_args{{"time_series", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"}};
+        FunctionArgumentDescriptors optional_args{
+            {"min_percentile", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isFloat), isColumnConst, "Number"},
+            {"max_percentile", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isFloat), isColumnConst, "Number"},
+            {"k", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeNumber), isColumnConst, "Number"}};
+
+        validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
+
+        return std::make_shared<DataTypeArray>(std::make_shared<DataTypeFloat64>());
+    }
+
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1, 2, 3}; }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        ColumnPtr col = arguments[0].column;
+        const ColumnArray * col_arr = checkAndGetColumn<ColumnArray>(col.get());
+
+        const IColumn & arr_data = col_arr->getData();
+        const ColumnArray::Offsets & arr_offsets = col_arr->getOffsets();
+
+        ColumnPtr col_res;
+        if (input_rows_count == 0)
+            return ColumnArray::create(ColumnFloat64::create());
+
+        Float64 min_percentile = 0.25; /// default 25th percentile
+        Float64 max_percentile = 0.75; /// default 75th percentile
+        Float64 k = 1.50;
+
+        if (arguments.size() > 1)
+        {
+            static constexpr Float64 min_percentile_lower_bound = 0.02;
+            static constexpr Float64 max_percentile_upper_bound = 0.98;
+
+            min_percentile = arguments[1].column->getFloat64(0);
+            if (isnan(min_percentile) || !isFinite(min_percentile) || min_percentile < min_percentile_lower_bound|| min_percentile > max_percentile_upper_bound)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "The second argument of function {} must be in range [0.02, 0.98]", getName());
+
+            max_percentile = arguments[2].column->getFloat64(0);
+            if (isnan(max_percentile) || !isFinite(max_percentile) || max_percentile < min_percentile_lower_bound || max_percentile > max_percentile_upper_bound || max_percentile < min_percentile)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "The third argument of function {} must be in range [0.02, 0.98]", getName());
+
+            k = arguments[3].column->getFloat64(0);
+            if (k < 0.0 || isnan(k) || !isFinite(k))
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "The fourth argument of function {} must be a non-negative number", getName());
+        }
+
+        if (executeNumber<UInt8>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<UInt16>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<UInt32>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<UInt64>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Int8>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Int16>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Int32>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Int64>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Float32>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res)
+            || executeNumber<Float64>(arr_data, arr_offsets, min_percentile, max_percentile, k, col_res))
+        {
+            return col_res;
+        }
+        else
+            throw Exception(
+                ErrorCodes::ILLEGAL_COLUMN,
+                "Illegal column {} of first argument of function {}",
+                arguments[0].column->getName(),
+                getName());
+    }
+
+private:
+    template <typename T>
+    bool executeNumber(
+        const IColumn & arr_data,
+        const ColumnArray::Offsets & arr_offsets,
+        Float64 min_percentile,
+        Float64 max_percentile,
+        Float64 k,
+        ColumnPtr & res_ptr) const
+    {
+        const ColumnVector<T> * src_data_concrete = checkAndGetColumn<ColumnVector<T>>(&arr_data);
+        if (!src_data_concrete)
+            return false;
+
+        const PaddedPODArray<T> & src_vec = src_data_concrete->getData();
+
+        auto outliers = ColumnFloat64::create();
+        auto & outlier_data = outliers->getData();
+
+        ColumnArray::ColumnOffsets::MutablePtr res_offsets = ColumnArray::ColumnOffsets::create();
+        auto & res_offsets_data = res_offsets->getData();
+
+        std::vector<Float64> src_sorted;
+
+        ColumnArray::Offset prev_src_offset = 0;
+        for (auto src_offset : arr_offsets)
+        {
+            chassert(prev_src_offset <= src_offset);
+            size_t len = src_offset - prev_src_offset;
+            if (len < 4)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, "At least four data points are needed for function {}", getName());
+
+            src_sorted.assign(src_vec.begin() + prev_src_offset, src_vec.begin() + src_offset);
+            std::sort(src_sorted.begin(), src_sorted.end());
+
+            Float64 q1;
+            Float64 q2;
+
+            Float64 p1 = len * min_percentile;
+            if (p1 == static_cast<Int64>(p1))
+            {
+                size_t index = static_cast<size_t>(p1) - 1;
+                q1 = (src_sorted[index] + src_sorted[index + 1]) / 2;
+            }
+            else
+            {
+                size_t index = static_cast<size_t>(std::ceil(p1)) - 1;
+                q1 = src_sorted[index];
+            }
+
+            Float64 p2 = len * max_percentile;
+            if (p2 == static_cast<Int64>(p2))
+            {
+                size_t index = static_cast<size_t>(p2) - 1;
+                q2 = (src_sorted[index] + src_sorted[index + 1]) / 2;
+            }
+            else
+            {
+                size_t index = static_cast<size_t>(std::ceil(p2)) - 1;
+                q2 = src_sorted[index];
+            }
+
+            Float64 iqr = q2 - q1; /// interquantile range
+
+            Float64 lower_fence = q1 - k * iqr;
+            Float64 upper_fence = q2 + k * iqr;
+
+            for (ColumnArray::Offset j = prev_src_offset; j < src_offset; ++j)
+            {
+                auto score = std::min((src_vec[j] - lower_fence), 0.0) + std::max((src_vec[j] - upper_fence), 0.0);
+                outlier_data.push_back(score);
+            }
+            res_offsets_data.push_back(outlier_data.size());
+            prev_src_offset = src_offset;
+        }
+
+        res_ptr = ColumnArray::create(std::move(outliers), std::move(res_offsets));
+        return true;
+    }
+};
+
+REGISTER_FUNCTION(SeriesOutliersDetectTukey)
+{
+    factory.registerFunction<FunctionSeriesOutliersDetectTukey>(FunctionDocumentation{
+        .description = R"(
+Detects outliers in series data using [Tukey Fences](https://en.wikipedia.org/wiki/Outlier#Tukey%27s_fences).
+
+**Syntax**
+
+``` sql
+seriesOutliersDetectTukey(series);
+seriesOutliersDetectTukey(series, min_percentile, max_percentile, k);
+```
+
+**Arguments**
+
+- `series` - An array of numeric values.
+- `min_quantile` - The minimum quantile to be used to calculate inter-quantile range [(IQR)](https://en.wikipedia.org/wiki/Interquartile_range). The value must be in range [0.02,0.98]. The default is 0.25.
+- `max_quantile` - The maximum quantile to be used to calculate inter-quantile range (IQR). The value must be in range [0.02, 0.98]. The default is 0.75.
+- `k` - Non-negative constant value to detect mild or stronger outliers. The default value is 1.5
+
+At least four data points are required in `series` to detect outliers.
+
+**Returned value**
+
+- Returns an array of the same length as the input array where each value represents score of possible anomaly of corresponding element in the series. A non-zero score indicates a possible anomaly.
+
+Type: [Array](../../sql-reference/data-types/array.md).
+
+**Examples**
+
+Query:
+
+``` sql
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4, 5, 12, 45, 12, 3, 3, 4, 5, 6]) AS print_0;
+```
+
+Result:
+
+``` text
+┌───────────print_0─────────────────�
+│[0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0] │
+└───────────────────────────────────┘
+```
+
+Query:
+
+``` sql
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6], 0.2, 0.8, 1.5) AS print_0;
+```
+
+Result:
+
+``` text
+┌─print_0──────────────────────────────�
+│ [0,0,0,0,0,0,0,0,0,19.5,0,0,0,0,0,0] │
+└──────────────────────────────────────┘
+```)",
+        .categories{"Time series analysis"}});
+}
+}
diff --git a/src/Functions/seriesPeriodDetectFFT.cpp b/src/Functions/seriesPeriodDetectFFT.cpp
index 61e3319d810..fbaa2b14e64 100644
--- a/src/Functions/seriesPeriodDetectFFT.cpp
+++ b/src/Functions/seriesPeriodDetectFFT.cpp
@@ -1,18 +1,14 @@
 #include "config.h"
 
 #if USE_POCKETFFT
-#    ifdef __clang__
-#        pragma clang diagnostic push
-#        pragma clang diagnostic ignored "-Wshadow"
-#        pragma clang diagnostic ignored "-Wextra-semi-stmt"
-#        pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#    endif
+#    pragma clang diagnostic push
+#    pragma clang diagnostic ignored "-Wshadow"
+#    pragma clang diagnostic ignored "-Wextra-semi-stmt"
+#    pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 
 #    include <pocketfft_hdronly.h>
 
-#    ifdef __clang__
-#        pragma clang diagnostic pop
-#    endif
+#    pragma clang diagnostic pop
 
 #    include <cmath>
 #    include <Columns/ColumnArray.h>
@@ -56,7 +52,7 @@ public:
 
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
-        FunctionArgumentDescriptors args{{"time_series", &isArray<IDataType>, nullptr, "Array"}};
+        FunctionArgumentDescriptors args{{"time_series", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isArray), nullptr, "Array"}};
         validateFunctionArgumentTypes(*this, arguments, args);
 
         return std::make_shared<DataTypeFloat64>();
diff --git a/src/Functions/serverConstants.cpp b/src/Functions/serverConstants.cpp
index 9f1a3584df8..e7e423058f1 100644
--- a/src/Functions/serverConstants.cpp
+++ b/src/Functions/serverConstants.cpp
@@ -32,7 +32,7 @@ namespace
 #endif
 
 
-    /// Get the host name. Is is constant on single server, but is not constant in distributed queries.
+    /// Get the host name. It is constant on single server, but is not constant in distributed queries.
     class FunctionHostName : public FunctionConstantBase<FunctionHostName, String, DataTypeString>
     {
     public:
@@ -51,12 +51,12 @@ namespace
     };
 
 
-    class FunctionTcpPort : public FunctionConstantBase<FunctionTcpPort, UInt16, DataTypeUInt16>
+    class FunctionTCPPort : public FunctionConstantBase<FunctionTCPPort, UInt16, DataTypeUInt16>
     {
     public:
         static constexpr auto name = "tcpPort";
-        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTcpPort>(context); }
-        explicit FunctionTcpPort(ContextPtr context) : FunctionConstantBase(context->getTCPPort(), context->isDistributed()) {}
+        static FunctionPtr create(ContextPtr context) { return std::make_shared<FunctionTCPPort>(context); }
+        explicit FunctionTCPPort(ContextPtr context) : FunctionConstantBase(context->getTCPPort(), context->isDistributed()) {}
     };
 
 
@@ -153,9 +153,9 @@ REGISTER_FUNCTION(ServerUUID)
     factory.registerFunction<FunctionServerUUID>();
 }
 
-REGISTER_FUNCTION(TcpPort)
+REGISTER_FUNCTION(TCPPort)
 {
-    factory.registerFunction<FunctionTcpPort>();
+    factory.registerFunction<FunctionTCPPort>();
 }
 
 REGISTER_FUNCTION(Timezone)
diff --git a/src/Functions/sin.cpp b/src/Functions/sin.cpp
index dc75f4800c0..914f431adb4 100644
--- a/src/Functions/sin.cpp
+++ b/src/Functions/sin.cpp
@@ -13,7 +13,15 @@ using FunctionSin = FunctionMathUnary<UnaryFunctionVectorized<SinName, sin>>;
 
 REGISTER_FUNCTION(Sin)
 {
-    factory.registerFunction<FunctionSin>({}, FunctionFactory::CaseInsensitive);
+    factory.registerFunction<FunctionSin>(
+        FunctionDocumentation{
+            .description = "Returns the sine of the argument.",
+            .syntax = "sin(x)",
+            .arguments = {{"x", "The number whose sine will be returned. (U)Int*, Float* or Decimal*."}},
+            .returned_value = "The sine of x.",
+            .examples = {{.name = "simple", .query = "SELECT sin(1.23)", .result = "0.9424888019316975"}},
+            .categories{"Mathematical", "Trigonometric"}},
+        FunctionFactory::CaseInsensitive);
 }
 
 }
diff --git a/src/Functions/sleep.h b/src/Functions/sleep.h
index 73d58ca6b5b..84f08dd5440 100644
--- a/src/Functions/sleep.h
+++ b/src/Functions/sleep.h
@@ -62,32 +62,17 @@ public:
     {
     }
 
-    /// Get the name of the function.
-    String getName() const override
-    {
-        return name;
-    }
-
-    /// Do not sleep during query analysis.
-    bool isSuitableForConstantFolding() const override
-    {
-        return false;
-    }
-
-    size_t getNumberOfArguments() const override
-    {
-        return 1;
-    }
-
+    String getName() const override { return name; }
+    bool isSuitableForConstantFolding() const override { return false; } /// Do not sleep during query analysis.
+    size_t getNumberOfArguments() const override { return 1; }
     bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
 
     DataTypePtr getReturnTypeImpl(const DataTypes & arguments) const override
     {
         WhichDataType which(arguments[0]);
 
-        if (!which.isFloat()
-            && !which.isNativeUInt())
-            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}, expected Float64",
+        if (!which.isFloat() && !which.isNativeUInt())
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of argument of function {}, expected UInt* or Float*",
                 arguments[0]->getName(), getName());
 
         return std::make_shared<DataTypeUInt8>();
diff --git a/src/Functions/snowflake.cpp b/src/Functions/snowflake.cpp
index 6aafa2cb5cf..4a2d502a31a 100644
--- a/src/Functions/snowflake.cpp
+++ b/src/Functions/snowflake.cpp
@@ -47,7 +47,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"value", &isDateTime<IDataType>, nullptr, "DateTime"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isDateTime), nullptr, "DateTime"}
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
@@ -91,10 +91,10 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"value", &isInt64<IDataType>, nullptr, "Int64"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInt64), nullptr, "Int64"}
         };
         FunctionArgumentDescriptors optional_args{
-            {"time_zone", &isString<IDataType>, nullptr, "String"}
+            {"time_zone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
 
@@ -151,7 +151,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"value", &isDateTime64<IDataType>, nullptr, "DateTime64"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isDateTime64), nullptr, "DateTime64"}
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
@@ -203,10 +203,10 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"value", &isInt64<IDataType>, nullptr, "Int64"}
+            {"value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInt64), nullptr, "Int64"}
         };
         FunctionArgumentDescriptors optional_args{
-            {"time_zone", &isString<IDataType>, nullptr, "String"}
+            {"time_zone", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
 
@@ -249,28 +249,24 @@ public:
 REGISTER_FUNCTION(DateTimeToSnowflake)
 {
     factory.registerFunction("dateTimeToSnowflake",
-        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionDateTimeToSnowflake>("dateTimeToSnowflake")); });
+        [](ContextPtr){ return std::make_shared<FunctionDateTimeToSnowflake>("dateTimeToSnowflake"); });
 }
 
 REGISTER_FUNCTION(DateTime64ToSnowflake)
 {
     factory.registerFunction("dateTime64ToSnowflake",
-        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionDateTime64ToSnowflake>("dateTime64ToSnowflake")); });
+        [](ContextPtr){ return std::make_shared<FunctionDateTime64ToSnowflake>("dateTime64ToSnowflake"); });
 }
 
 REGISTER_FUNCTION(SnowflakeToDateTime)
 {
     factory.registerFunction("snowflakeToDateTime",
-        [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionSnowflakeToDateTime>("snowflakeToDateTime", context)); });
+        [](ContextPtr context){ return std::make_shared<FunctionSnowflakeToDateTime>("snowflakeToDateTime", context); });
 }
 REGISTER_FUNCTION(SnowflakeToDateTime64)
 {
     factory.registerFunction("snowflakeToDateTime64",
-        [](ContextPtr context){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionSnowflakeToDateTime64>("snowflakeToDateTime64", context)); });
+        [](ContextPtr context){ return std::make_shared<FunctionSnowflakeToDateTime64>("snowflakeToDateTime64", context); });
 }
 
 }
diff --git a/src/Functions/space.cpp b/src/Functions/space.cpp
index 009bc20e065..03dc0d06719 100644
--- a/src/Functions/space.cpp
+++ b/src/Functions/space.cpp
@@ -45,7 +45,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"n", &isInteger<IDataType>, nullptr, "Integer"}
+            {"n", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isInteger), nullptr, "Integer"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, args);
diff --git a/src/Functions/splitByChar.cpp b/src/Functions/splitByChar.cpp
index d537039dc23..d3d5dc9fe4a 100644
--- a/src/Functions/splitByChar.cpp
+++ b/src/Functions/splitByChar.cpp
@@ -40,6 +40,8 @@ public:
     static bool isVariadic() { return true; }
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {0, 2}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithSeparatorAndOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/splitByNonAlpha.cpp b/src/Functions/splitByNonAlpha.cpp
index 467e7b0b5c3..4486a33aa88 100644
--- a/src/Functions/splitByNonAlpha.cpp
+++ b/src/Functions/splitByNonAlpha.cpp
@@ -42,6 +42,8 @@ public:
     static bool isVariadic() { return true; }
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {1}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/splitByRegexp.cpp b/src/Functions/splitByRegexp.cpp
index 77328205c01..430089f14ee 100644
--- a/src/Functions/splitByRegexp.cpp
+++ b/src/Functions/splitByRegexp.cpp
@@ -44,6 +44,8 @@ public:
     static bool isVariadic() { return true; }
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {0, 2}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithSeparatorAndOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/splitByString.cpp b/src/Functions/splitByString.cpp
index 7d6803b2f27..5c97f9841e7 100644
--- a/src/Functions/splitByString.cpp
+++ b/src/Functions/splitByString.cpp
@@ -39,6 +39,8 @@ public:
     static bool isVariadic() { return true; }
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {0, 2}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithSeparatorAndOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/splitByWhitespace.cpp b/src/Functions/splitByWhitespace.cpp
index 168e429c6f5..cf21a218b15 100644
--- a/src/Functions/splitByWhitespace.cpp
+++ b/src/Functions/splitByWhitespace.cpp
@@ -30,6 +30,8 @@ public:
     static bool isVariadic() { return true; }
     static size_t getNumberOfArguments() { return 0; }
 
+    static ColumnNumbers getArgumentsThatAreAlwaysConstant() { return {1}; }
+
     static void checkArguments(const IFunction & func, const ColumnsWithTypeAndName & arguments)
     {
         checkArgumentsWithOptionalMaxSubstrings(func, arguments);
diff --git a/src/Functions/sqid.cpp b/src/Functions/sqid.cpp
index cd3875e2607..6679646fef4 100644
--- a/src/Functions/sqid.cpp
+++ b/src/Functions/sqid.cpp
@@ -98,7 +98,7 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors args{
-            {"sqid", &isString<IDataType>, nullptr, "String"}
+            {"sqid", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
         validateFunctionArgumentTypes(*this, arguments, args);
 
@@ -122,7 +122,7 @@ public:
             for (size_t i = 0; i < input_rows_count; ++i)
             {
                 std::string_view sqid = col_non_const->getDataAt(i).toView();
-                std::vector<UInt64> integers = sqids.decode(sqid);
+                std::vector<UInt64> integers = sqids.decode(String(sqid));
                 res_nested_data.insert(integers.begin(), integers.end());
                 res_offsets_data.push_back(integers.size());
             }
diff --git a/src/Functions/stl.hpp b/src/Functions/stl.hpp
index fbfc52f959c..9d4fa30e2e3 100644
--- a/src/Functions/stl.hpp
+++ b/src/Functions/stl.hpp
@@ -1,4 +1,4 @@
-// Dump of https://github.com/ankane/stl-cpp/blob/3b1b3a3e9335cda26c8b0797d8b8d24ac8e350ad/include/stl.hpp. 
+// Dump of https://github.com/ankane/stl-cpp/blob/3b1b3a3e9335cda26c8b0797d8b8d24ac8e350ad/include/stl.hpp.
 // Added to ClickHouse source code and not referenced as a submodule because its easier maintain and modify/customize.
 
 /*!
@@ -24,12 +24,12 @@
 
 namespace stl {
 
-bool est(const float* y, size_t n, size_t len, int ideg, float xs, float* ys, size_t nleft, size_t nright, float* w, bool userw, const float* rw) {
+inline bool est(const float* y, size_t n, size_t len, int ideg, float xs, float* ys, size_t nleft, size_t nright, float* w, bool userw, const float* rw) {
     auto range = ((float) n) - 1.0;
     auto h = std::max(xs - ((float) nleft), ((float) nright) - xs);
 
     if (len > n) {
-        h += (float) ((len - n) / 2);
+        h += (float) ((len - n) / 2); /// NOLINT(bugprone-integer-division)
     }
 
     auto h9 = 0.999 * h;
@@ -89,7 +89,7 @@ bool est(const float* y, size_t n, size_t len, int ideg, float xs, float* ys, si
     }
 }
 
-void ess(const float* y, size_t n, size_t len, int ideg, size_t njump, bool userw, const float* rw, float* ys, float* res) {
+inline void ess(const float* y, size_t n, size_t len, int ideg, size_t njump, bool userw, const float* rw, float* ys, float* res) {
     if (n < 2) {
         ys[0] = y[0];
         return;
@@ -165,7 +165,7 @@ void ess(const float* y, size_t n, size_t len, int ideg, size_t njump, bool user
     }
 }
 
-void ma(const float* x, size_t n, size_t len, float* ave) {
+inline void ma(const float* x, size_t n, size_t len, float* ave) {
     auto newn = n - len + 1;
     auto flen = (float) len;
     auto v = 0.0;
@@ -189,13 +189,13 @@ void ma(const float* x, size_t n, size_t len, float* ave) {
     }
 }
 
-void fts(const float* x, size_t n, size_t np, float* trend, float* work) {
+inline void fts(const float* x, size_t n, size_t np, float* trend, float* work) {
     ma(x, n, np, trend);
     ma(trend, n - np + 1, np, work);
     ma(work, n - 2 * np + 2, 3, trend);
 }
 
-void rwts(const float* y, size_t n, const float* fit, float* rw) {
+inline void rwts(const float* y, size_t n, const float* fit, float* rw) {
     for (size_t i = 0; i < n; i++) {
         rw[i] = fabs(y[i] - fit[i]);
     }
@@ -222,7 +222,7 @@ void rwts(const float* y, size_t n, const float* fit, float* rw) {
     }
 }
 
-void ss(const float* y, size_t n, size_t np, size_t ns, int isdeg, size_t nsjump, bool userw, float* rw, float* season, float* work1, float* work2, float* work3, float* work4) {
+inline void ss(const float* y, size_t n, size_t np, size_t ns, int isdeg, size_t nsjump, bool userw, float* rw, float* season, float* work1, float* work2, float* work3, float* work4) { /// NOLINT(readability-non-const-parameter)
     for (size_t j = 1; j <= np; j++) {
         size_t k = (n - j) / np + 1;
 
@@ -253,7 +253,7 @@ void ss(const float* y, size_t n, size_t np, size_t ns, int isdeg, size_t nsjump
     }
 }
 
-void onestp(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl, int isdeg, int itdeg, int ildeg, size_t nsjump, size_t ntjump, size_t nljump, size_t ni, bool userw, float* rw, float* season, float* trend, float* work1, float* work2, float* work3, float* work4, float* work5) {
+inline void onestp(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl, int isdeg, int itdeg, int ildeg, size_t nsjump, size_t ntjump, size_t nljump, size_t ni, bool userw, float* rw, float* season, float* trend, float* work1, float* work2, float* work3, float* work4, float* work5) {
     for (size_t j = 0; j < ni; j++) {
         for (size_t i = 0; i < n; i++) {
             work1[i] = y[i] - trend[i];
@@ -272,7 +272,7 @@ void onestp(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl
     }
 }
 
-void stl(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl, int isdeg, int itdeg, int ildeg, size_t nsjump, size_t ntjump, size_t nljump, size_t ni, size_t no, float* rw, float* season, float* trend) {
+inline void stl(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl, int isdeg, int itdeg, int ildeg, size_t nsjump, size_t ntjump, size_t nljump, size_t ni, size_t no, float* rw, float* season, float* trend) {
     if (ns < 3) {
         throw std::invalid_argument("seasonal_length must be at least 3");
     }
@@ -335,7 +335,7 @@ void stl(const float* y, size_t n, size_t np, size_t ns, size_t nt, size_t nl, i
     }
 }
 
-float var(const std::vector<float>& series) {
+inline float var(const std::vector<float>& series) {
     auto mean = std::accumulate(series.begin(), series.end(), 0.0) / series.size();
     std::vector<float> tmp;
     tmp.reserve(series.size());
@@ -345,7 +345,7 @@ float var(const std::vector<float>& series) {
     return std::accumulate(tmp.begin(), tmp.end(), 0.0) / (series.size() - 1);
 }
 
-float strength(const std::vector<float>& component, const std::vector<float>& remainder) {
+inline float strength(const std::vector<float>& component, const std::vector<float>& remainder) {
     std::vector<float> sr;
     sr.reserve(remainder.size());
     for (size_t i = 0; i < remainder.size(); i++) {
@@ -361,11 +361,11 @@ public:
     std::vector<float> remainder;
     std::vector<float> weights;
 
-    inline float seasonal_strength() {
+    float seasonal_strength() const {
         return strength(seasonal, remainder);
     }
 
-    inline float trend_strength() {
+    float trend_strength() const {
         return strength(trend, remainder);
     }
 };
@@ -385,62 +385,62 @@ class StlParams {
     bool robust_ = false;
 
 public:
-    inline StlParams seasonal_length(size_t ns) {
+    StlParams seasonal_length(size_t ns) {
         this->ns_ = ns;
         return *this;
     }
 
-    inline StlParams trend_length(size_t nt) {
+    StlParams trend_length(size_t nt) {
         this->nt_ = nt;
         return *this;
     }
 
-    inline StlParams low_pass_length(size_t nl) {
+    StlParams low_pass_length(size_t nl) {
         this->nl_ = nl;
         return *this;
     }
 
-    inline StlParams seasonal_degree(int isdeg) {
+    StlParams seasonal_degree(int isdeg) {
         this->isdeg_ = isdeg;
         return *this;
     }
 
-    inline StlParams trend_degree(int itdeg) {
+    StlParams trend_degree(int itdeg) {
         this->itdeg_ = itdeg;
         return *this;
     }
 
-    inline StlParams low_pass_degree(int ildeg) {
+    StlParams low_pass_degree(int ildeg) {
         this->ildeg_ = ildeg;
         return *this;
     }
 
-    inline StlParams seasonal_jump(size_t nsjump) {
+    StlParams seasonal_jump(size_t nsjump) {
         this->nsjump_ = nsjump;
         return *this;
     }
 
-    inline StlParams trend_jump(size_t ntjump) {
+    StlParams trend_jump(size_t ntjump) {
         this->ntjump_ = ntjump;
         return *this;
     }
 
-    inline StlParams low_pass_jump(size_t nljump) {
+    StlParams low_pass_jump(size_t nljump) {
         this->nljump_ = nljump;
         return *this;
     }
 
-    inline StlParams inner_loops(bool ni) {
+    StlParams inner_loops(bool ni) {
         this->ni_ = ni;
         return *this;
     }
 
-    inline StlParams outer_loops(bool no) {
+    StlParams outer_loops(bool no) {
         this->no_ = no;
         return *this;
     }
 
-    inline StlParams robust(bool robust) {
+    StlParams robust(bool robust) {
         this->robust_ = robust;
         return *this;
     }
@@ -449,11 +449,11 @@ public:
     StlResult fit(const std::vector<float>& y, size_t np);
 };
 
-StlParams params() {
+inline StlParams params() {
     return StlParams();
 }
 
-StlResult StlParams::fit(const float* y, size_t n, size_t np) {
+inline StlResult StlParams::fit(const float* y, size_t n, size_t np) {
     if (n < 2 * np) {
         throw std::invalid_argument("series has less than two periods");
     }
@@ -506,7 +506,7 @@ StlResult StlParams::fit(const float* y, size_t n, size_t np) {
     return res;
 }
 
-StlResult StlParams::fit(const std::vector<float>& y, size_t np) {
+inline StlResult StlParams::fit(const std::vector<float>& y, size_t np) {
     return StlParams::fit(y.data(), y.size(), np);
 }
 
diff --git a/src/Functions/substring.cpp b/src/Functions/substring.cpp
index e3dfdf3de5e..e809914f5f0 100644
--- a/src/Functions/substring.cpp
+++ b/src/Functions/substring.cpp
@@ -189,6 +189,7 @@ REGISTER_FUNCTION(Substring)
     factory.registerFunction<FunctionSubstring<false>>({}, FunctionFactory::CaseInsensitive);
     factory.registerAlias("substr", "substring", FunctionFactory::CaseInsensitive); // MySQL alias
     factory.registerAlias("mid", "substring", FunctionFactory::CaseInsensitive); /// MySQL alias
+    factory.registerAlias("byteSlice", "substring", FunctionFactory::CaseInsensitive); /// resembles PostgreSQL's get_byte function, similar to ClickHouse's bitSlice
 
     factory.registerFunction<FunctionSubstring<true>>({}, FunctionFactory::CaseSensitive);
 }
diff --git a/src/Functions/tests/gtest_number_traits.cpp b/src/Functions/tests/gtest_number_traits.cpp
index d0ac681e6e8..5bec8e3a8bb 100644
--- a/src/Functions/tests/gtest_number_traits.cpp
+++ b/src/Functions/tests/gtest_number_traits.cpp
@@ -178,19 +178,19 @@ static const std::map<std::pair<std::string, std::string>, std::string> answer =
     {{"Float64", "Float64"}, "Float64"}
 };
 
-static std::string getTypeString(DB::UInt8) { return "UInt8"; }
-static std::string getTypeString(DB::UInt16) { return "UInt16"; }
-static std::string getTypeString(DB::UInt32) { return "UInt32"; }
-static std::string getTypeString(DB::UInt64) { return "UInt64"; }
-static std::string getTypeString(DB::UInt256) { return "UInt256"; }
-static std::string getTypeString(DB::Int8) { return "Int8"; }
-static std::string getTypeString(DB::Int16) { return "Int16"; }
-static std::string getTypeString(DB::Int32) { return "Int32"; }
-static std::string getTypeString(DB::Int64) { return "Int64"; }
-static std::string getTypeString(DB::Int128) { return "Int128"; }
-static std::string getTypeString(DB::Int256) { return "Int256"; }
-static std::string getTypeString(DB::Float32) { return "Float32"; }
-static std::string getTypeString(DB::Float64) { return "Float64"; }
+static std::string getTypeString(UInt8) { return "UInt8"; }
+static std::string getTypeString(UInt16) { return "UInt16"; }
+static std::string getTypeString(UInt32) { return "UInt32"; }
+static std::string getTypeString(UInt64) { return "UInt64"; }
+static std::string getTypeString(UInt256) { return "UInt256"; }
+static std::string getTypeString(Int8) { return "Int8"; }
+static std::string getTypeString(Int16) { return "Int16"; }
+static std::string getTypeString(Int32) { return "Int32"; }
+static std::string getTypeString(Int64) { return "Int64"; }
+static std::string getTypeString(Int128) { return "Int128"; }
+static std::string getTypeString(Int256) { return "Int256"; }
+static std::string getTypeString(Float32) { return "Float32"; }
+static std::string getTypeString(Float64) { return "Float64"; }
 static std::string getTypeString(DB::NumberTraits::Error) { return "Error"; }
 
 template <typename T0, typename T1>
@@ -219,61 +219,60 @@ void ifRightType()
 template <typename T0>
 void ifLeftType()
 {
-    ifRightType<T0, DB::UInt8>();
-    ifRightType<T0, DB::UInt16>();
-    ifRightType<T0, DB::UInt32>();
-    ifRightType<T0, DB::UInt64>();
-    ifRightType<T0, DB::UInt256>();
-    ifRightType<T0, DB::Int8>();
-    ifRightType<T0, DB::Int16>();
-    ifRightType<T0, DB::Int32>();
-    ifRightType<T0, DB::Int64>();
-    ifRightType<T0, DB::Int128>();
-    ifRightType<T0, DB::Int256>();
-    ifRightType<T0, DB::Float32>();
-    ifRightType<T0, DB::Float64>();
+    ifRightType<T0, UInt8>();
+    ifRightType<T0, UInt16>();
+    ifRightType<T0, UInt32>();
+    ifRightType<T0, UInt64>();
+    ifRightType<T0, UInt256>();
+    ifRightType<T0, Int8>();
+    ifRightType<T0, Int16>();
+    ifRightType<T0, Int32>();
+    ifRightType<T0, Int64>();
+    ifRightType<T0, Int128>();
+    ifRightType<T0, Int256>();
+    ifRightType<T0, Float32>();
+    ifRightType<T0, Float64>();
 }
 
 
 TEST(NumberTraits, ResultOfAdditionMultiplication)
 {
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::UInt8>::Type()), "UInt16");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Int32>::Type()), "Int64");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<DB::UInt8, DB::Float32>::Type()), "Float64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<UInt8, UInt8>::Type()), "UInt16");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<UInt8, Int32>::Type()), "Int64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfAdditionMultiplication<UInt8, Float32>::Type()), "Float64");
 }
 
 
 TEST(NumberTraits, ResultOfSubtraction)
 {
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt8, DB::UInt8>::Type()), "Int16");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::UInt8>::Type()), "Int32");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<DB::UInt16, DB::Int8>::Type()), "Int32");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<UInt8, UInt8>::Type()), "Int16");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<UInt16, UInt8>::Type()), "Int32");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfSubtraction<UInt16, Int8>::Type()), "Int32");
 }
 
 
 TEST(NumberTraits, Others)
 {
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt16, DB::Int16>::Type()), "Float64");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<DB::UInt32, DB::Int16>::Type()), "Float64");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfIntegerDivision<DB::UInt8, DB::Int16>::Type()), "Int8");
-    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfModulo<DB::UInt32, DB::Int8>::Type()), "UInt8");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<UInt16, Int16>::Type()), "Float64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfFloatingPointDivision<UInt32, Int16>::Type()), "Float64");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfIntegerDivision<UInt8, Int16>::Type()), "Int8");
+    ASSERT_EQ(getTypeString(DB::NumberTraits::ResultOfModulo<UInt32, Int8>::Type()), "UInt8");
 }
 
 
 TEST(NumberTraits, FunctionIf)
 {
-    ifLeftType<DB::UInt8>();
-    ifLeftType<DB::UInt16>();
-    ifLeftType<DB::UInt32>();
-    ifLeftType<DB::UInt64>();
-    ifLeftType<DB::UInt256>();
-    ifLeftType<DB::Int8>();
-    ifLeftType<DB::Int16>();
-    ifLeftType<DB::Int32>();
-    ifLeftType<DB::Int64>();
-    ifLeftType<DB::Int128>();
-    ifLeftType<DB::Int256>();
-    ifLeftType<DB::Float32>();
-    ifLeftType<DB::Float64>();
+    ifLeftType<UInt8>();
+    ifLeftType<UInt16>();
+    ifLeftType<UInt32>();
+    ifLeftType<UInt64>();
+    ifLeftType<UInt256>();
+    ifLeftType<Int8>();
+    ifLeftType<Int16>();
+    ifLeftType<Int32>();
+    ifLeftType<Int64>();
+    ifLeftType<Int128>();
+    ifLeftType<Int256>();
+    ifLeftType<Float32>();
+    ifLeftType<Float64>();
 }
-
diff --git a/src/Functions/timestamp.cpp b/src/Functions/timestamp.cpp
index 48012c1376f..fbca08b0968 100644
--- a/src/Functions/timestamp.cpp
+++ b/src/Functions/timestamp.cpp
@@ -41,10 +41,10 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args{
-            {"timestamp", &isStringOrFixedString<IDataType>, nullptr, "String or FixedString"}
+            {"timestamp", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isStringOrFixedString), nullptr, "String or FixedString"}
         };
         FunctionArgumentDescriptors optional_args{
-            {"time", &isString<IDataType>, nullptr, "String"}
+            {"time", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isString), nullptr, "String"}
         };
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, optional_args);
 
diff --git a/src/Functions/toDecimalString.cpp b/src/Functions/toDecimalString.cpp
index cc2de8df0d4..fc621b272de 100644
--- a/src/Functions/toDecimalString.cpp
+++ b/src/Functions/toDecimalString.cpp
@@ -39,8 +39,8 @@ public:
     DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
     {
         FunctionArgumentDescriptors mandatory_args = {
-            {"Value", &isNumber<IDataType>, nullptr, "Number"},
-            {"precision", &isNativeInteger<IDataType>, &isColumnConst, "const Integer"}
+            {"Value", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNumber), nullptr, "Number"},
+            {"precision", static_cast<FunctionArgumentDescriptor::TypeValidator>(&isNativeInteger), &isColumnConst, "const Integer"}
         };
 
         validateFunctionArgumentTypes(*this, arguments, mandatory_args, {});
diff --git a/src/Functions/toFixedString.h b/src/Functions/toFixedString.h
index 7bee666c5dd..9c7ffc48004 100644
--- a/src/Functions/toFixedString.h
+++ b/src/Functions/toFixedString.h
@@ -34,7 +34,6 @@ class FunctionToFixedString : public IFunction
 public:
     static constexpr auto name = "toFixedString";
     static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionToFixedString>(); }
-    static FunctionPtr create() { return std::make_shared<FunctionToFixedString>(); }
 
     String getName() const override
     {
@@ -158,4 +157,3 @@ public:
 };
 
 }
-
diff --git a/src/Functions/toMillisecond.cpp b/src/Functions/toMillisecond.cpp
new file mode 100644
index 00000000000..aaef517c996
--- /dev/null
+++ b/src/Functions/toMillisecond.cpp
@@ -0,0 +1,33 @@
+#include <Common/FunctionDocumentation.h>
+#include <Functions/DateTimeTransforms.h>
+#include <Functions/FunctionDateOrDateTimeToSomething.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
+
+using FunctionToMillisecond = FunctionDateOrDateTimeToSomething<DataTypeUInt16, ToMillisecondImpl>;
+
+REGISTER_FUNCTION(ToMillisecond)
+{
+    factory.registerFunction<FunctionToMillisecond>(
+
+
+        FunctionDocumentation{
+            .description=R"(
+Returns the millisecond component (0-999) of a date with time.
+    )",
+            .syntax="toMillisecond(value)",
+            .arguments={{"value", "DateTime or DateTime64"}},
+            .returned_value="The millisecond in the minute (0 - 59) of the given date/time",
+            .examples{
+                {"toMillisecond", "SELECT toMillisecond(toDateTime64('2023-04-21 10:20:30.456', 3)", "456"}},
+            .categories{"Dates and Times"}
+        }
+            );
+
+    /// MySQL compatibility alias.
+    factory.registerAlias("MILLISECOND", "toMillisecond", FunctionFactory::CaseInsensitive);
+}
+
+}
diff --git a/src/Functions/toStartOfInterval.cpp b/src/Functions/toStartOfInterval.cpp
index ffabf38ef20..bdf947977b6 100644
--- a/src/Functions/toStartOfInterval.cpp
+++ b/src/Functions/toStartOfInterval.cpp
@@ -6,7 +6,6 @@
 #include <Common/DateLUTImpl.h>
 #include <Common/IntervalKind.h>
 #include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDate32.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeInterval.h>
@@ -14,7 +13,6 @@
 #include <Functions/FunctionFactory.h>
 #include <Functions/IFunction.h>
 #include <IO/WriteHelpers.h>
-#include <base/arithmeticOverflow.h>
 
 
 namespace DB
@@ -88,21 +86,21 @@ public:
             /// Determine result type for default overload (no origin)
             switch (interval_type->getKind()) // NOLINT(bugprone-switch-missing-default-case)
             {
-                case IntervalKind::Nanosecond:
-                case IntervalKind::Microsecond:
-                case IntervalKind::Millisecond:
+                case IntervalKind::Kind::Nanosecond:
+                case IntervalKind::Kind::Microsecond:
+                case IntervalKind::Kind::Millisecond:
                     result_type = ResultType::DateTime64;
                     break;
-                case IntervalKind::Second:
-                case IntervalKind::Minute:
-                case IntervalKind::Hour:
-                case IntervalKind::Day: /// weird why Day leads to DateTime but too afraid to change it
+                case IntervalKind::Kind::Second:
+                case IntervalKind::Kind::Minute:
+                case IntervalKind::Kind::Hour:
+                case IntervalKind::Kind::Day: /// weird why Day leads to DateTime but too afraid to change it
                     result_type = ResultType::DateTime;
                     break;
-                case IntervalKind::Week:
-                case IntervalKind::Month:
-                case IntervalKind::Quarter:
-                case IntervalKind::Year:
+                case IntervalKind::Kind::Week:
+                case IntervalKind::Kind::Month:
+                case IntervalKind::Kind::Quarter:
+                case IntervalKind::Kind::Year:
                     result_type = ResultType::Date;
                     break;
             }
diff --git a/src/Functions/toUnixTimestamp64Micro.cpp b/src/Functions/toUnixTimestamp64Micro.cpp
index fd35e2a7a73..964ad5a2c18 100644
--- a/src/Functions/toUnixTimestamp64Micro.cpp
+++ b/src/Functions/toUnixTimestamp64Micro.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(ToUnixTimestamp64Micro)
 {
     factory.registerFunction("toUnixTimestamp64Micro",
-        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionToUnixTimestamp64>(6, "toUnixTimestamp64Micro")); });
+        [](ContextPtr){ return std::make_shared<FunctionToUnixTimestamp64>(6, "toUnixTimestamp64Micro"); });
 }
 
 }
diff --git a/src/Functions/toUnixTimestamp64Milli.cpp b/src/Functions/toUnixTimestamp64Milli.cpp
index e6a680f941a..bc92a6d1fe3 100644
--- a/src/Functions/toUnixTimestamp64Milli.cpp
+++ b/src/Functions/toUnixTimestamp64Milli.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(ToUnixTimestamp64Milli)
 {
     factory.registerFunction("toUnixTimestamp64Milli",
-        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionToUnixTimestamp64>(3, "toUnixTimestamp64Milli")); });
+        [](ContextPtr){ return std::make_shared<FunctionToUnixTimestamp64>(3, "toUnixTimestamp64Milli"); });
 }
 
 }
diff --git a/src/Functions/toUnixTimestamp64Nano.cpp b/src/Functions/toUnixTimestamp64Nano.cpp
index 257f011603c..8829b00bf56 100644
--- a/src/Functions/toUnixTimestamp64Nano.cpp
+++ b/src/Functions/toUnixTimestamp64Nano.cpp
@@ -7,8 +7,7 @@ namespace DB
 REGISTER_FUNCTION(ToUnixTimestamp64Nano)
 {
     factory.registerFunction("toUnixTimestamp64Nano",
-        [](ContextPtr){ return std::make_unique<FunctionToOverloadResolverAdaptor>(
-            std::make_shared<FunctionToUnixTimestamp64>(9, "toUnixTimestamp64Nano")); });
+        [](ContextPtr){ return std::make_shared<FunctionToUnixTimestamp64>(9, "toUnixTimestamp64Nano"); });
 }
 
 }
diff --git a/src/Functions/today.cpp b/src/Functions/today.cpp
index 16a5b98d7ec..356660fa7b5 100644
--- a/src/Functions/today.cpp
+++ b/src/Functions/today.cpp
@@ -1,11 +1,9 @@
-#include <Common/DateLUT.h>
-
 #include <Core/Field.h>
-
 #include <DataTypes/DataTypeDate.h>
-
-#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 
 
 namespace DB
diff --git a/src/Functions/translate.cpp b/src/Functions/translate.cpp
index ad5be7d9dfd..c7173909029 100644
--- a/src/Functions/translate.cpp
+++ b/src/Functions/translate.cpp
@@ -1,12 +1,15 @@
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnConst.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnString.h>
+#include <DataTypes/DataTypeFixedString.h>
 #include <DataTypes/DataTypeString.h>
 #include <Functions/FunctionFactory.h>
-#include <Common/iota.h>
+#include <Functions/FunctionHelpers.h>
+#include <Common/HashTable/HashMap.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/UTF8Helpers.h>
-#include <Common/HashTable/HashMap.h>
+#include <Common/iota.h>
+
 #include <numeric>
 
 
@@ -298,7 +301,14 @@ public:
             throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} of third argument of function {}",
                 arguments[2]->getName(), getName());
 
-        return std::make_shared<DataTypeString>();
+        if (isString(arguments[0]))
+            return std::make_shared<DataTypeString>();
+        else
+        {
+            const auto * ptr = checkAndGetDataType<DataTypeFixedString>(arguments[0].get());
+            chassert(ptr);
+            return std::make_shared<DataTypeFixedString>(ptr->getN());
+        }
     }
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t /*input_rows_count*/) const override
diff --git a/src/Functions/trap.cpp b/src/Functions/trap.cpp
index 99430f039a4..6ce696fedb5 100644
--- a/src/Functions/trap.cpp
+++ b/src/Functions/trap.cpp
@@ -177,7 +177,7 @@ public:
             }
             else if (mode == "logical error")
             {
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: trap");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Trap");
             }
             else
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown trap mode");
diff --git a/src/Functions/tupleConcat.cpp b/src/Functions/tupleConcat.cpp
index 0556f4181e6..c48e4d61463 100644
--- a/src/Functions/tupleConcat.cpp
+++ b/src/Functions/tupleConcat.cpp
@@ -4,6 +4,8 @@
 #include <Functions/FunctionHelpers.h>
 #include <Functions/IFunction.h>
 
+#include <base/range.h>
+
 namespace DB
 {
 namespace ErrorCodes
diff --git a/src/Functions/variantElement.cpp b/src/Functions/variantElement.cpp
new file mode 100644
index 00000000000..2744a0dabb8
--- /dev/null
+++ b/src/Functions/variantElement.cpp
@@ -0,0 +1,238 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypeFactory.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Common/assert_cast.h>
+#include <memory>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+
+/** Extract element of Variant by variant type name.
+  * Also the function looks through Arrays: you can get Array of Variant elements from Array of Variants.
+  */
+class FunctionVariantElement : public IFunction
+{
+public:
+    static constexpr auto name = "variantElement";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionVariantElement>(); }
+    String getName() const override { return name; }
+    bool isVariadic() const override { return true; }
+    size_t getNumberOfArguments() const override { return 0; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    ColumnNumbers getArgumentsThatAreAlwaysConstant() const override { return {1}; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        const size_t number_of_arguments = arguments.size();
+
+        if (number_of_arguments < 2 || number_of_arguments > 3)
+            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+                            "Number of arguments for function {} doesn't match: passed {}, should be 2 or 3",
+                            getName(), number_of_arguments);
+
+        size_t count_arrays = 0;
+        const IDataType * input_type = arguments[0].type.get();
+        while (const DataTypeArray * array = checkAndGetDataType<DataTypeArray>(input_type))
+        {
+            input_type = array->getNestedType().get();
+            ++count_arrays;
+        }
+
+        const DataTypeVariant * variant_type = checkAndGetDataType<DataTypeVariant>(input_type);
+        if (!variant_type)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                    "First argument for function {} must be Variant or Array of Variant. Actual {}",
+                    getName(),
+                    arguments[0].type->getName());
+
+        std::optional<size_t> variant_global_discr = getVariantGlobalDiscriminator(arguments[1].column, *variant_type, number_of_arguments);
+        if (variant_global_discr.has_value())
+        {
+            DataTypePtr return_type = makeNullableOrLowCardinalityNullableSafe(variant_type->getVariant(variant_global_discr.value()));
+
+            for (; count_arrays; --count_arrays)
+                return_type = std::make_shared<DataTypeArray>(return_type);
+
+            return return_type;
+        }
+        else
+            return arguments[2].type;
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
+    {
+        const auto & input_arg = arguments[0];
+        const IDataType * input_type = input_arg.type.get();
+        const IColumn * input_col = input_arg.column.get();
+
+        bool input_arg_is_const = false;
+        if (typeid_cast<const ColumnConst *>(input_col))
+        {
+            input_col = assert_cast<const ColumnConst *>(input_col)->getDataColumnPtr().get();
+            input_arg_is_const = true;
+        }
+
+        Columns array_offsets;
+        while (const DataTypeArray * array_type = checkAndGetDataType<DataTypeArray>(input_type))
+        {
+            const ColumnArray * array_col = assert_cast<const ColumnArray *>(input_col);
+
+            input_type = array_type->getNestedType().get();
+            input_col = &array_col->getData();
+            array_offsets.push_back(array_col->getOffsetsPtr());
+        }
+
+        const DataTypeVariant * input_type_as_variant = checkAndGetDataType<DataTypeVariant>(input_type);
+        const ColumnVariant * input_col_as_variant = checkAndGetColumn<ColumnVariant>(input_col);
+        if (!input_type_as_variant || !input_col_as_variant)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "First argument for function {} must be Variant or array of Variants. Actual {}", getName(), input_arg.type->getName());
+
+        std::optional<size_t> variant_global_discr = getVariantGlobalDiscriminator(arguments[1].column, *input_type_as_variant, arguments.size());
+
+        if (!variant_global_discr.has_value())
+            return arguments[2].column;
+
+        const auto & variant_type = input_type_as_variant->getVariant(*variant_global_discr);
+        const auto & variant_column = input_col_as_variant->getVariantPtrByGlobalDiscriminator(*variant_global_discr);
+
+        /// If Variant has only NULLs or our variant doesn't have any real values,
+        /// just create column with default values and create null mask with 1.
+        if (input_col_as_variant->hasOnlyNulls() || variant_column->empty())
+        {
+            auto res = variant_type->createColumn();
+
+            if (variant_type->lowCardinality())
+                assert_cast<ColumnLowCardinality &>(*res).nestedToNullable();
+
+            res->insertManyDefaults(input_col_as_variant->size());
+            if (!variant_type->canBeInsideNullable())
+                return wrapInArraysAndConstIfNeeded(std::move(res), array_offsets, input_arg_is_const, input_rows_count);
+
+            auto null_map = ColumnUInt8::create();
+            auto & null_map_data = null_map->getData();
+            null_map_data.resize_fill(input_col_as_variant->size(), 1);
+            return wrapInArraysAndConstIfNeeded(ColumnNullable::create(std::move(res), std::move(null_map)), array_offsets, input_arg_is_const, input_rows_count);
+        }
+
+        /// If we extract single non-empty column and have no NULLs, then just return this variant.
+        if (auto non_empty_local_discr = input_col_as_variant->getLocalDiscriminatorOfOneNoneEmptyVariantNoNulls())
+        {
+            /// If we were trying to extract some other variant,
+            /// it would be empty and we would already processed this case above.
+            chassert(input_col_as_variant->globalDiscriminatorByLocal(*non_empty_local_discr) == variant_global_discr);
+            return wrapInArraysAndConstIfNeeded(makeNullableOrLowCardinalityNullableSafe(variant_column), array_offsets, input_arg_is_const, input_rows_count);
+        }
+
+        /// In general case we should calculate null-mask for variant
+        /// according to the discriminators column and expand
+        /// variant column by this mask to get a full column (with default values on NULLs)
+        const auto & local_discriminators = input_col_as_variant->getLocalDiscriminators();
+        auto null_map = ColumnUInt8::create();
+        auto & null_map_data = null_map->getData();
+        null_map_data.reserve(local_discriminators.size());
+        auto variant_local_discr = input_col_as_variant->localDiscriminatorByGlobal(*variant_global_discr);
+        for (auto local_discr : local_discriminators)
+            null_map_data.push_back(local_discr != variant_local_discr);
+
+        auto expanded_variant_column = IColumn::mutate(variant_column);
+        if (variant_type->lowCardinality())
+            expanded_variant_column = assert_cast<ColumnLowCardinality &>(*expanded_variant_column).cloneNullable();
+        expanded_variant_column->expand(null_map_data, /*inverted = */ true);
+        if (variant_type->canBeInsideNullable())
+            return wrapInArraysAndConstIfNeeded(ColumnNullable::create(std::move(expanded_variant_column), std::move(null_map)), array_offsets, input_arg_is_const, input_rows_count);
+        return wrapInArraysAndConstIfNeeded(std::move(expanded_variant_column), array_offsets, input_arg_is_const, input_rows_count);
+    }
+private:
+    std::optional<size_t> getVariantGlobalDiscriminator(const ColumnPtr & index_column, const DataTypeVariant & variant_type, size_t argument_size) const
+    {
+        const auto * name_col = checkAndGetColumnConst<ColumnString>(index_column.get());
+        if (!name_col)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                            "Second argument to {} with Variant argument must be a constant String",
+                            getName());
+
+        String variant_element_name = name_col->getValue<String>();
+        auto variant_element_type = DataTypeFactory::instance().tryGet(variant_element_name);
+        if (variant_element_type)
+        {
+            const auto & variants = variant_type.getVariants();
+            for (size_t i = 0; i != variants.size(); ++i)
+            {
+                if (variants[i]->getName() == variant_element_type->getName())
+                    return i;
+            }
+        }
+
+        if (argument_size == 2)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "{} doesn't contain variant with type {}", variant_type.getName(), variant_element_name);
+        return std::nullopt;
+    }
+
+    ColumnPtr wrapInArraysAndConstIfNeeded(ColumnPtr res, const Columns & array_offsets, bool input_arg_is_const, size_t input_rows_count) const
+    {
+        for (auto it = array_offsets.rbegin(); it != array_offsets.rend(); ++it)
+            res = ColumnArray::create(res, *it);
+
+        if (input_arg_is_const)
+            res = ColumnConst::create(res, input_rows_count);
+
+        return res;
+    }
+};
+
+}
+
+REGISTER_FUNCTION(VariantElement)
+{
+    factory.registerFunction<FunctionVariantElement>(FunctionDocumentation{
+        .description = R"(
+Extracts a column with specified type from a `Variant` column.
+)",
+        .syntax{"variantElement(variant, type_name, [, default_value])"},
+        .arguments{{
+            {"variant", "Variant column"},
+            {"type_name", "The name of the variant type to extract"},
+            {"default_value", "The default value that will be used if variant doesn't have variant with specified type. Can be any type. Optional"}}},
+        .examples{{{
+            "Example",
+            R"(
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT v, variantElement(v, 'String'), variantElement(v, 'UInt64'), variantElement(v, 'Array(UInt64)') FROM test;)",
+            R"(
+┌─v─────────────┬─variantElement(v, 'String')─┬─variantElement(v, 'UInt64')─┬─variantElement(v, 'Array(UInt64)')─�
+│ ᴺ�ᴸᴸ          │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ []                                 │
+│ 42            │ ᴺ�ᴸᴸ                        │                          42 │ []                                 │
+│ Hello, World! │ Hello, World!               │                        ᴺ�ᴸᴸ │ []                                 │
+│ [1,2,3]       │ ᴺ�ᴸᴸ                        │                        ᴺ�ᴸᴸ │ [1,2,3]                            │
+└───────────────┴─────────────────────────────┴─────────────────────────────┴────────────────────────────────────┘
+)"}}},
+        .categories{"Variant"},
+    });
+}
+
+}
diff --git a/src/Functions/variantType.cpp b/src/Functions/variantType.cpp
new file mode 100644
index 00000000000..e867cb03a23
--- /dev/null
+++ b/src/Functions/variantType.cpp
@@ -0,0 +1,111 @@
+#include <Functions/IFunction.h>
+#include <Functions/FunctionFactory.h>
+#include <Functions/FunctionHelpers.h>
+#include <DataTypes/IDataType.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <Columns/ColumnVariant.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnsNumber.h>
+#include <Common/assert_cast.h>
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+}
+
+namespace
+{
+
+/// Return enum with type name for each row in Variant column.
+class FunctionVariantType : public IFunction
+{
+public:
+    static constexpr auto name = "variantType";
+    static constexpr auto enum_name_for_null = "None";
+
+    static FunctionPtr create(ContextPtr) { return std::make_shared<FunctionVariantType>(); }
+    String getName() const override { return name; }
+    size_t getNumberOfArguments() const override { return 1; }
+    bool useDefaultImplementationForConstants() const override { return true; }
+    bool useDefaultImplementationForNulls() const override { return false; }
+    bool useDefaultImplementationForLowCardinalityColumns() const override { return false; }
+    bool isSuitableForShortCircuitArgumentsExecution(const DataTypesWithConstInfo & /*arguments*/) const override { return true; }
+
+    DataTypePtr getReturnTypeImpl(const ColumnsWithTypeAndName & arguments) const override
+    {
+        if (arguments.empty() || 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.empty());
+
+        const DataTypeVariant * variant_type = checkAndGetDataType<DataTypeVariant>(arguments[0].type.get());
+
+        if (!variant_type)
+            throw Exception(
+                ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "First argument for function {} must be Variant, got {} instead",
+                getName(), arguments[0].type->getName());
+
+        const auto & variants = variant_type->getVariants();
+        std::vector<std::pair<String, Int8>> enum_values;
+        enum_values.reserve(variants.size() + 1);
+        for (ColumnVariant::Discriminator i = 0; i != variants.size(); ++i)
+            enum_values.emplace_back(variants[i]->getName(), i);
+        enum_values.emplace_back(enum_name_for_null, ColumnVariant::NULL_DISCRIMINATOR);
+        return std::make_shared<DataTypeEnum<Int8>>(enum_values);
+    }
+
+    ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr & result_type, size_t input_rows_count) const override
+    {
+        const ColumnVariant * variant_column = checkAndGetColumn<ColumnVariant>(arguments[0].column.get());
+        if (!variant_column)
+            throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+                "First argument for function {} must be Variant, got {} instead",
+                getName(), arguments[0].type->getName());
+
+        auto res = result_type->createColumn();
+        auto & res_data = typeid_cast<ColumnInt8 *>(res.get())->getData();
+        res_data.reserve(input_rows_count);
+        for (size_t i = 0; i != input_rows_count; ++i)
+            res_data.push_back(variant_column->globalDiscriminatorAt(i));
+
+        return res;
+    }
+};
+
+}
+
+REGISTER_FUNCTION(VariantType)
+{
+    factory.registerFunction<FunctionVariantType>(FunctionDocumentation{
+        .description = R"(
+Returns the variant type name for each row of `Variant` column. If row contains NULL, it returns 'None' for it.
+)",
+        .syntax = {"variantType(variant)"},
+        .arguments = {{"variant", "Variant column"}},
+        .examples = {{{
+            "Example",
+            R"(
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT variantType(v) FROM test;)",
+            R"(
+┌─variantType(v)─�
+│ None           │
+│ UInt64         │
+│ String         │
+│ Array(UInt64)  │
+└────────────────┘
+)"}}},
+        .categories{"Variant"},
+    });
+}
+
+}
diff --git a/src/Functions/vectorFunctions.cpp b/src/Functions/vectorFunctions.cpp
index 33b0e9f6039..de4a6fb0a5c 100644
--- a/src/Functions/vectorFunctions.cpp
+++ b/src/Functions/vectorFunctions.cpp
@@ -1,9 +1,9 @@
 #include <Columns/ColumnTuple.h>
 #include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeInterval.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeTuple.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNothing.h>
 #include <Functions/FunctionFactory.h>
 #include <Functions/FunctionHelpers.h>
 #include <Functions/ITupleFunction.h>
@@ -1364,11 +1364,11 @@ public:
 
     ColumnPtr executeImpl(const ColumnsWithTypeAndName & arguments, const DataTypePtr &, size_t input_rows_count) const override
     {
-        if (getReturnTypeImpl(arguments)->isNullable())
-        {
-            return DataTypeNullable(std::make_shared<DataTypeNothing>())
-                   .createColumnConstWithDefaultValue(input_rows_count);
-        }
+        /// TODO: cosineDistance does not support nullable arguments
+        /// https://github.com/ClickHouse/ClickHouse/pull/27933#issuecomment-916670286
+        auto return_type = getReturnTypeImpl(arguments);
+        if (return_type->isNullable())
+            return return_type->createColumnConstWithDefaultValue(input_rows_count);
 
         FunctionDotProduct dot(context);
         ColumnWithTypeAndName dot_result{dot.executeImpl(arguments, DataTypePtr(), input_rows_count),
diff --git a/src/Functions/visibleWidth.cpp b/src/Functions/visibleWidth.cpp
index d4f6de404ff..9a3edd9fbec 100644
--- a/src/Functions/visibleWidth.cpp
+++ b/src/Functions/visibleWidth.cpp
@@ -6,22 +6,36 @@
 #include <IO/WriteBufferFromString.h>
 #include <Common/UTF8Helpers.h>
 #include <Common/assert_cast.h>
+#include <Interpreters/Context.h>
 
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+}
+
 /** visibleWidth(x) - calculates the approximate width when outputting the value in a text form to the console.
   * In fact it calculate the number of Unicode code points.
   * It does not support zero width and full width characters, combining characters, etc.
   */
 class FunctionVisibleWidth : public IFunction
 {
+private:
+    UInt64 behavior;
+
 public:
     static constexpr auto name = "visibleWidth";
-    static FunctionPtr create(ContextPtr)
+    static FunctionPtr create(ContextPtr context)
     {
-        return std::make_shared<FunctionVisibleWidth>();
+        return std::make_shared<FunctionVisibleWidth>(context);
+    }
+
+    explicit FunctionVisibleWidth(ContextPtr context)
+    {
+        behavior = context->getSettingsRef().function_visible_width_behavior;
     }
 
     bool useDefaultImplementationForNulls() const override { return false; }
@@ -56,7 +70,7 @@ public:
         auto res_col = ColumnUInt64::create(size);
         auto & res_data = assert_cast<ColumnUInt64 &>(*res_col).getData();
 
-        /// For simplicity reasons, function is implemented by serializing into temporary buffer.
+        /// For simplicity reasons, the function is implemented by serializing into temporary buffer.
 
         String tmp;
         FormatSettings format_settings;
@@ -68,7 +82,17 @@ public:
                 serialization->serializeText(*src.column, i, out, format_settings);
             }
 
-            res_data[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(tmp.data()), tmp.size());
+            switch (behavior)
+            {
+                case 0:
+                    res_data[i] = UTF8::countCodePoints(reinterpret_cast<const UInt8 *>(tmp.data()), tmp.size());
+                    break;
+                case 1:
+                    res_data[i] = UTF8::computeWidth(reinterpret_cast<const UInt8 *>(tmp.data()), tmp.size());
+                    break;
+                default:
+                    throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unsupported value {} of the `function_visible_width_behavior` setting", behavior);
+            }
         }
 
         return res_col;
diff --git a/src/Functions/visitParamExtractBool.cpp b/src/Functions/visitParamExtractBool.cpp
index 31763fe54ce..2c413ec13bb 100644
--- a/src/Functions/visitParamExtractBool.cpp
+++ b/src/Functions/visitParamExtractBool.cpp
@@ -21,7 +21,35 @@ using FunctionSimpleJSONExtractBool = FunctionsStringSearch<ExtractParamImpl<Nam
 
 REGISTER_FUNCTION(VisitParamExtractBool)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractBool>();
+    factory.registerFunction<FunctionSimpleJSONExtractBool>(FunctionDocumentation{
+        .description = "Parses a true/false value from the value of the field named field_name. The result is UInt8.",
+        .syntax = "simpleJSONExtractBool(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value
+        = R"(It returns 1 if the value of the field is true, 0 otherwise. This means this function will return 0 including (and not only) in the following cases:
+ - If the field doesn't exists.
+ - If the field contains true as a string, e.g.: {"field":"true"}.
+ - If the field contains 1 as a numerical value.)",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":false,"bar":true}');
+INSERT INTO jsons VALUES ('{"foo":"true","qux":1}');
+
+SELECT simpleJSONExtractBool(json, 'bar') FROM jsons ORDER BY json;
+SELECT simpleJSONExtractBool(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(0
+1
+0
+0)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractBool", "simpleJSONExtractBool");
 }
 
diff --git a/src/Functions/visitParamExtractFloat.cpp b/src/Functions/visitParamExtractFloat.cpp
index 6f6d5274050..fc839142cc7 100644
--- a/src/Functions/visitParamExtractFloat.cpp
+++ b/src/Functions/visitParamExtractFloat.cpp
@@ -11,7 +11,36 @@ using FunctionSimpleJSONExtractFloat = FunctionsStringSearch<ExtractParamImpl<Na
 
 REGISTER_FUNCTION(VisitParamExtractFloat)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractFloat>();
+    factory.registerFunction<FunctionSimpleJSONExtractFloat>(FunctionDocumentation{
+        .description
+        = "Parses Float64 from the value of the field named field_name. If this is a string field, it tries to parse a number from the "
+          "beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns 0.",
+        .syntax = "simpleJSONExtractFloat(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value = "It returns the number parsed from the field if the field exists and contains a number, 0 otherwise.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractFloat(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(0
+-4000
+0
+-3.4
+5)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractFloat", "simpleJSONExtractFloat");
 }
 
diff --git a/src/Functions/visitParamExtractInt.cpp b/src/Functions/visitParamExtractInt.cpp
index e020c43e8b4..4588fc55c52 100644
--- a/src/Functions/visitParamExtractInt.cpp
+++ b/src/Functions/visitParamExtractInt.cpp
@@ -11,7 +11,36 @@ using FunctionSimpleJSONExtractInt = FunctionsStringSearch<ExtractParamImpl<Name
 
 REGISTER_FUNCTION(VisitParamExtractInt)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractInt>();
+    factory.registerFunction<FunctionSimpleJSONExtractInt>(FunctionDocumentation{
+        .description
+        = "Parses Int64 from the value of the field named field_name. If this is a string field, it tries to parse a number from the "
+          "beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns 0.",
+        .syntax = "simpleJSONExtractInt(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value = "It returns the number parsed from the field if the field exists and contains a number, 0 otherwise.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractInt(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(0
+-4
+0
+-3
+5)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractInt", "simpleJSONExtractInt");
 }
 
diff --git a/src/Functions/visitParamExtractRaw.cpp b/src/Functions/visitParamExtractRaw.cpp
index 74a83170545..3cdc5001e13 100644
--- a/src/Functions/visitParamExtractRaw.cpp
+++ b/src/Functions/visitParamExtractRaw.cpp
@@ -61,7 +61,35 @@ using FunctionSimpleJSONExtractRaw = FunctionsStringSearchToString<ExtractParamT
 
 REGISTER_FUNCTION(VisitParamExtractRaw)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractRaw>();
+    factory.registerFunction<FunctionSimpleJSONExtractRaw>(FunctionDocumentation{
+        .description = "Returns the value of the field named field_name as a String, including separators.",
+        .syntax = "simpleJSONExtractRaw(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value
+        = "It returns the value of the field as a String including separators if the field exists, or an empty String otherwise.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"-4e3"}');
+INSERT INTO jsons VALUES ('{"foo":-3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":{"def":[1,2,3]}}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractRaw(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(
+"-4e3"
+-3.4
+5
+{"def":[1,2,3]})"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractRaw", "simpleJSONExtractRaw");
 }
 
diff --git a/src/Functions/visitParamExtractString.cpp b/src/Functions/visitParamExtractString.cpp
index 50d5f345189..92af725eb90 100644
--- a/src/Functions/visitParamExtractString.cpp
+++ b/src/Functions/visitParamExtractString.cpp
@@ -12,9 +12,11 @@ struct ExtractString
     {
         size_t old_size = res_data.size();
         ReadBufferFromMemory in(pos, end - pos);
-        if (!tryReadJSONStringInto(res_data, in))
+        if (!tryReadJSONStringInto(res_data, in, default_json_settings))
             res_data.resize(old_size);
     }
+
+    static const FormatSettings::JSON constexpr default_json_settings;
 };
 
 struct NameSimpleJSONExtractString { static constexpr auto name = "simpleJSONExtractString"; };
@@ -22,7 +24,35 @@ using FunctionSimpleJSONExtractString = FunctionsStringSearchToString<ExtractPar
 
 REGISTER_FUNCTION(VisitParamExtractString)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractString>();
+    factory.registerFunction<FunctionSimpleJSONExtractString>(FunctionDocumentation{
+        .description = R"(Parses String in double quotes from the value of the field named field_name.
+
+        There is currently no support for code points in the format \uXXXX\uYYYY that are not from the basic multilingual plane (they are converted to CESU-8 instead of UTF-8).)",
+        .syntax = "simpleJSONExtractString(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value = "It returns the value of a field as a String, including separators. The value is unescaped. It returns an empty "
+                          "String: if the field doesn't contain a double quoted string, if unescaping fails or if the field doesn't exist.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"\\n\\u0000"}');
+INSERT INTO jsons VALUES ('{"foo":"\\u263"}');
+INSERT INTO jsons VALUES ('{"foo":"\\u263a"}');
+INSERT INTO jsons VALUES ('{"foo":"hello}');
+
+SELECT simpleJSONExtractString(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(\n\0
+
+☺
+)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractString", "simpleJSONExtractString");
 }
 
diff --git a/src/Functions/visitParamExtractUInt.cpp b/src/Functions/visitParamExtractUInt.cpp
index fb58e417f34..777df9fdd24 100644
--- a/src/Functions/visitParamExtractUInt.cpp
+++ b/src/Functions/visitParamExtractUInt.cpp
@@ -12,7 +12,36 @@ using FunctionSimpleJSONExtractUInt = FunctionsStringSearch<ExtractParamImpl<Nam
 
 REGISTER_FUNCTION(VisitParamExtractUInt)
 {
-    factory.registerFunction<FunctionSimpleJSONExtractUInt>();
+    factory.registerFunction<FunctionSimpleJSONExtractUInt>(FunctionDocumentation{
+        .description
+        = "Parses UInt64 from the value of the field named field_name. If this is a string field, it tries to parse a number from the "
+          "beginning of the string. If the field does not exist, or it exists but does not contain a number, it returns 0.",
+        .syntax = "simpleJSONExtractUInt(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value = "It returns the number parsed from the field if the field exists and contains a number, 0 otherwise.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"4e3"}');
+INSERT INTO jsons VALUES ('{"foo":3.4}');
+INSERT INTO jsons VALUES ('{"foo":5}');
+INSERT INTO jsons VALUES ('{"foo":"not1number"}');
+INSERT INTO jsons VALUES ('{"baz":2}');
+
+SELECT simpleJSONExtractUInt(json, 'foo') FROM jsons ORDER BY json;)",
+            .result = R"(0
+4
+0
+3
+5)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamExtractUInt", "simpleJSONExtractUInt");
 }
 
diff --git a/src/Functions/visitParamHas.cpp b/src/Functions/visitParamHas.cpp
index 1ed1f1d16e7..09fec782980 100644
--- a/src/Functions/visitParamHas.cpp
+++ b/src/Functions/visitParamHas.cpp
@@ -21,7 +21,28 @@ using FunctionSimpleJSONHas = FunctionsStringSearch<ExtractParamImpl<NameSimpleJ
 
 REGISTER_FUNCTION(VisitParamHas)
 {
-    factory.registerFunction<FunctionSimpleJSONHas>();
+    factory.registerFunction<FunctionSimpleJSONHas>(FunctionDocumentation{
+        .description = "Checks whether there is a field named field_name.  The result is UInt8.",
+        .syntax = "simpleJSONHas(json, field_name)",
+        .arguments
+        = {{"json", "The JSON in which the field is searched for. String."},
+           {"field_name", "The name of the field to search for. String literal."}},
+        .returned_value = "It returns 1 if the field exists, 0 otherwise.",
+        .examples
+        = {{.name = "simple",
+            .query = R"(CREATE TABLE jsons
+(
+    json String
+)
+ENGINE = Memory;
+
+INSERT INTO jsons VALUES ('{"foo":"true","qux":1}');
+
+SELECT simpleJSONHas(json, 'foo') FROM jsons;
+SELECT simpleJSONHas(json, 'bar') FROM jsons;)",
+            .result = R"(1
+0)"}},
+        .categories{"JSON"}});
     factory.registerAlias("visitParamHas", "simpleJSONHas");
 }
 
diff --git a/src/Functions/widthBucket.cpp b/src/Functions/widthBucket.cpp
index e95f7c05756..62ed460ca9d 100644
--- a/src/Functions/widthBucket.cpp
+++ b/src/Functions/widthBucket.cpp
@@ -44,7 +44,7 @@ class FunctionWidthBucket : public IFunction
         {
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Logical error in function {}: argument {} has unexpected type or size!",
+                "Logical error in function {}: argument {} has unexpected type or size.",
                 getName(),
                 argument_index);
         }
@@ -157,7 +157,7 @@ class FunctionWidthBucket : public IFunction
         if (are_all_const_cols)
         {
             throw Exception(
-                ErrorCodes::LOGICAL_ERROR, "Logical error in function {}: unexpected combination of argument types!", getName());
+                ErrorCodes::LOGICAL_ERROR, "Logical error in function {}: unexpected combination of argument types.", getName());
         }
 
         auto result_column = ColumnVector<ResultType>::create();
diff --git a/src/Functions/yesterday.cpp b/src/Functions/yesterday.cpp
index 43832c1faaa..4d79f1fef79 100644
--- a/src/Functions/yesterday.cpp
+++ b/src/Functions/yesterday.cpp
@@ -1,11 +1,9 @@
-#include <Common/DateLUT.h>
-
 #include <Core/Field.h>
-
 #include <DataTypes/DataTypeDate.h>
-
-#include <Functions/IFunction.h>
 #include <Functions/FunctionFactory.h>
+#include <Functions/IFunction.h>
+#include <Common/DateLUT.h>
+#include <Common/DateLUTImpl.h>
 
 
 namespace DB
diff --git a/src/IO/Archives/ArchiveUtils.h b/src/IO/Archives/ArchiveUtils.h
index 810b9d8d730..1b66be005a2 100644
--- a/src/IO/Archives/ArchiveUtils.h
+++ b/src/IO/Archives/ArchiveUtils.h
@@ -4,11 +4,9 @@
 
 #if USE_LIBARCHIVE
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wreserved-macro-identifier"
 
 #include <archive.h>
 #include <archive_entry.h>
 #endif
-#endif
diff --git a/src/IO/Archives/IArchiveReader.h b/src/IO/Archives/IArchiveReader.h
index 84a1dc21f5b..ee516d2655b 100644
--- a/src/IO/Archives/IArchiveReader.h
+++ b/src/IO/Archives/IArchiveReader.h
@@ -56,6 +56,7 @@ public:
     /// It's possible to convert a file enumerator to a read buffer and vice versa.
     virtual std::unique_ptr<ReadBufferFromFileBase> readFile(std::unique_ptr<FileEnumerator> enumerator) = 0;
     virtual std::unique_ptr<FileEnumerator> nextFile(std::unique_ptr<ReadBuffer> read_buffer) = 0;
+    virtual std::unique_ptr<FileEnumerator> currentFile(std::unique_ptr<ReadBuffer> read_buffer) = 0;
 
     virtual std::vector<std::string> getAllFiles() = 0;
     virtual std::vector<std::string> getAllFiles(NameFilter filter) = 0;
diff --git a/src/IO/Archives/IArchiveWriter.h b/src/IO/Archives/IArchiveWriter.h
index cccc6dc953b..a3b06e6c4be 100644
--- a/src/IO/Archives/IArchiveWriter.h
+++ b/src/IO/Archives/IArchiveWriter.h
@@ -22,6 +22,8 @@ public:
     /// of the function `writeFile()` should be destroyed before next call of `writeFile()`.
     virtual std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename) = 0;
 
+    virtual std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename, size_t size) = 0;
+
     /// Returns true if there is an active instance of WriteBuffer returned by writeFile().
     /// This function should be used mostly for debugging purposes.
     virtual bool isWritingFile() const = 0;
@@ -34,10 +36,10 @@ public:
 
     /// Sets compression method and level.
     /// Changing them will affect next file in the archive.
-    virtual void setCompression(const String & /* compression_method */, int /* compression_level */ = kDefaultCompressionLevel) {}
+    virtual void setCompression(const String & /*compression_method*/, int /*compression_level*/) {}
 
     /// Sets password. If the password is not empty it will enable encryption in the archive.
-    virtual void setPassword(const String & /* password */) {}
+    virtual void setPassword(const String & /*password*/) {}
 };
 
 }
diff --git a/src/IO/Archives/LibArchiveReader.cpp b/src/IO/Archives/LibArchiveReader.cpp
index a411b4bb4b6..bec7f587180 100644
--- a/src/IO/Archives/LibArchiveReader.cpp
+++ b/src/IO/Archives/LibArchiveReader.cpp
@@ -1,11 +1,9 @@
+#include <IO/Archives/ArchiveUtils.h>
 #include <IO/Archives/LibArchiveReader.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <Common/quoteString.h>
 #include <Common/scope_guard_safe.h>
 
-#include <IO/Archives/ArchiveUtils.h>
-
-#include <mutex>
 
 namespace DB
 {
@@ -14,35 +12,58 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int CANNOT_UNPACK_ARCHIVE;
-    extern const int LOGICAL_ERROR;
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int UNSUPPORTED_METHOD;
+extern const int CANNOT_UNPACK_ARCHIVE;
+extern const int LOGICAL_ERROR;
+extern const int CANNOT_READ_ALL_DATA;
+extern const int UNSUPPORTED_METHOD;
 }
 
+class LibArchiveReader::StreamInfo
+{
+public:
+    explicit StreamInfo(std::unique_ptr<SeekableReadBuffer> read_buffer_) : read_buffer(std::move(read_buffer_)) { }
+
+    static ssize_t read(struct archive *, void * client_data, const void ** buff)
+    {
+        auto * read_stream = reinterpret_cast<StreamInfo *>(client_data);
+        *buff = reinterpret_cast<void *>(read_stream->buf);
+        return read_stream->read_buffer->read(read_stream->buf, DBMS_DEFAULT_BUFFER_SIZE);
+    }
+
+    std::unique_ptr<SeekableReadBuffer> read_buffer;
+    char buf[DBMS_DEFAULT_BUFFER_SIZE];
+};
+
 class LibArchiveReader::Handle
 {
 public:
     explicit Handle(std::string path_to_archive_, bool lock_on_reading_)
-        : path_to_archive(path_to_archive_), lock_on_reading(lock_on_reading_)
+        : path_to_archive(std::move(path_to_archive_)), lock_on_reading(lock_on_reading_)
     {
-        current_archive = open(path_to_archive);
+        current_archive = openWithPath(path_to_archive);
+    }
+
+    explicit Handle(std::string path_to_archive_, bool lock_on_reading_, const ReadArchiveFunction & archive_read_function_)
+        : path_to_archive(std::move(path_to_archive_)), archive_read_function(archive_read_function_), lock_on_reading(lock_on_reading_)
+    {
+        read_stream = std::make_unique<StreamInfo>(archive_read_function());
+        current_archive = openWithReader(read_stream.get());
     }
 
     Handle(const Handle &) = delete;
     Handle(Handle && other) noexcept
-        : current_archive(other.current_archive)
+        : read_stream(std::move(other.read_stream))
+        , current_archive(other.current_archive)
         , current_entry(other.current_entry)
+        , archive_read_function(std::move(other.archive_read_function))
         , lock_on_reading(other.lock_on_reading)
+
     {
         other.current_archive = nullptr;
         other.current_entry = nullptr;
     }
 
-    ~Handle()
-    {
-        close(current_archive);
-    }
+    ~Handle() { close(current_archive); }
 
     bool locateFile(const std::string & filename)
     {
@@ -64,10 +85,14 @@ public:
                 break;
 
             if (filter(archive_entry_pathname(current_entry)))
+            {
+                valid = true;
                 return true;
+            }
         }
 
         checkError(err);
+        valid = false;
         return false;
     }
 
@@ -81,17 +106,19 @@ public:
         } while (err == ARCHIVE_RETRY);
 
         checkError(err);
-        return err == ARCHIVE_OK;
+        valid = err == ARCHIVE_OK;
+        return valid;
     }
 
     std::vector<std::string> getAllFiles(NameFilter filter)
     {
-        auto * archive = open(path_to_archive);
-        SCOPE_EXIT(
-            close(archive);
-        );
+        std::unique_ptr<LibArchiveReader::StreamInfo> rs
+            = archive_read_function ? std::make_unique<StreamInfo>(archive_read_function()) : nullptr;
+        auto * archive = rs ? openWithReader(rs.get()) : openWithPath(path_to_archive);
 
-        struct archive_entry * entry = nullptr;
+        SCOPE_EXIT(close(archive););
+
+        Entry entry = nullptr;
 
         std::vector<std::string> files;
         int error = readNextHeader(archive, &entry);
@@ -112,6 +139,8 @@ public:
     const String & getFileName() const
     {
         chassert(current_entry);
+        if (!valid)
+            throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file");
         if (!file_name)
             file_name.emplace(archive_entry_pathname(current_entry));
 
@@ -121,6 +150,8 @@ public:
     const FileInfo & getFileInfo() const
     {
         chassert(current_entry);
+        if (!valid)
+            throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file");
         if (!file_info)
         {
             file_info.emplace();
@@ -132,13 +163,21 @@ public:
         return *file_info;
     }
 
-    struct archive * current_archive;
-    struct archive_entry * current_entry = nullptr;
+    la_ssize_t readData(void * buf, size_t len) { return archive_read_data(current_archive, buf, len); }
+
+    const char * getArchiveError() { return archive_error_string(current_archive); }
+
 private:
+    using Archive = struct archive *;
+    using Entry = struct archive_entry *;
+
     void checkError(int error) const
     {
         if (error == ARCHIVE_FATAL)
-            throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Failed to read archive while fetching all files: {}", archive_error_string(current_archive));
+            throw Exception(
+                ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+                "Failed to read archive while fetching all files: {}",
+                archive_error_string(current_archive));
     }
 
     void resetFileInfo()
@@ -147,15 +186,29 @@ private:
         file_info.reset();
     }
 
-    static struct archive * open(const String & path_to_archive)
+    Archive openWithReader(StreamInfo * read_stream_)
     {
         auto * archive = archive_read_new();
         try
         {
-            archive_read_support_filter_all(archive);
-            archive_read_support_format_all(archive);
-            if (archive_read_open_filename(archive, path_to_archive.c_str(), 10240) != ARCHIVE_OK)
-                throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't open archive {}: {}", quoteString(path_to_archive), archive_error_string(archive));
+            // Support for bzip2, gzip, lzip, xz, zstd and lz4
+            archive_read_support_filter_bzip2(archive);
+            archive_read_support_filter_gzip(archive);
+            archive_read_support_filter_xz(archive);
+            archive_read_support_filter_lz4(archive);
+            archive_read_support_filter_zstd(archive);
+            archive_read_support_filter_lzma(archive);
+            // Support tar, 7zip and zip
+            archive_read_support_format_tar(archive);
+            archive_read_support_format_7zip(archive);
+            archive_read_support_format_zip(archive);
+
+            if (archive_read_open(archive, read_stream_, nullptr, StreamInfo::read, nullptr) != ARCHIVE_OK)
+                throw Exception(
+                    ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+                    "Couldn't open archive {}: {}",
+                    quoteString(path_to_archive),
+                    archive_error_string(archive));
         }
         catch (...)
         {
@@ -166,7 +219,39 @@ private:
         return archive;
     }
 
-    static void close(struct archive * archive)
+    Archive openWithPath(const String & path_to_archive_)
+    {
+        auto * archive = archive_read_new();
+        try
+        {
+            // Support for bzip2, gzip, lzip, xz, zstd and lz4
+            archive_read_support_filter_bzip2(archive);
+            archive_read_support_filter_gzip(archive);
+            archive_read_support_filter_xz(archive);
+            archive_read_support_filter_lz4(archive);
+            archive_read_support_filter_zstd(archive);
+            archive_read_support_filter_lzma(archive);
+            // Support tar, 7zip and zip
+            archive_read_support_format_tar(archive);
+            archive_read_support_format_7zip(archive);
+            archive_read_support_format_zip(archive);
+            if (archive_read_open_filename(archive, path_to_archive_.c_str(), 10240) != ARCHIVE_OK)
+                throw Exception(
+                    ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+                    "Couldn't open archive {}: {}",
+                    quoteString(path_to_archive),
+                    archive_error_string(archive));
+        }
+        catch (...)
+        {
+            close(archive);
+            throw;
+        }
+
+        return archive;
+    }
+
+    static void close(Archive archive)
     {
         if (archive)
         {
@@ -184,7 +269,12 @@ private:
         return archive_read_next_header(archive, entry);
     }
 
-    const String path_to_archive;
+    String path_to_archive;
+    std::unique_ptr<StreamInfo> read_stream;
+    Archive current_archive;
+    Entry current_entry = nullptr;
+    bool valid = true;
+    IArchiveReader::ReadArchiveFunction archive_read_function;
 
     /// for some archive types when we are reading headers static variables are used
     /// which are not thread-safe
@@ -198,7 +288,7 @@ private:
 class LibArchiveReader::FileEnumeratorImpl : public FileEnumerator
 {
 public:
-    explicit FileEnumeratorImpl(Handle handle_) : handle(std::move(handle_)) {}
+    explicit FileEnumeratorImpl(Handle handle_) : handle(std::move(handle_)) { }
 
     const String & getFileName() const override { return handle.getFileName(); }
     const FileInfo & getFileInfo() const override { return handle.getFileInfo(); }
@@ -206,6 +296,7 @@ public:
 
     /// Releases owned handle to pass it to a read buffer.
     Handle releaseHandle() && { return std::move(handle); }
+
 private:
     Handle handle;
 };
@@ -217,34 +308,33 @@ public:
         : ReadBufferFromFileBase(DBMS_DEFAULT_BUFFER_SIZE, nullptr, 0)
         , handle(std::move(handle_))
         , path_to_archive(std::move(path_to_archive_))
-    {}
+    {
+    }
 
     off_t seek(off_t /* off */, int /* whence */) override
     {
         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Seek is not supported when reading from archive");
     }
+    bool checkIfActuallySeekable() override { return false; }
 
-    off_t getPosition() override
-    {
-        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "getPosition not supported when reading from archive");
-    }
-
+    off_t getPosition() override { throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "getPosition not supported when reading from archive"); }
     String getFileName() const override { return handle.getFileName(); }
 
     size_t getFileSize() override { return handle.getFileInfo().uncompressed_size; }
 
-    Handle releaseHandle() &&
-    {
-        return std::move(handle);
-    }
+    Handle releaseHandle() && { return std::move(handle); }
 
 private:
     bool nextImpl() override
     {
-        auto bytes_read = archive_read_data(handle.current_archive, internal_buffer.begin(), static_cast<int>(internal_buffer.size()));
-
+        auto bytes_read = handle.readData(internal_buffer.begin(), internal_buffer.size());
         if (bytes_read < 0)
-            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Failed to read file {} from {}: {}", handle.getFileName(), path_to_archive, archive_error_string(handle.current_archive));
+            throw Exception(
+                ErrorCodes::CANNOT_READ_ALL_DATA,
+                "Failed to read file {} from {}: {}",
+                handle.getFileName(),
+                path_to_archive,
+                handle.getArchiveError());
 
         if (!bytes_read)
             return false;
@@ -263,7 +353,17 @@ private:
 
 LibArchiveReader::LibArchiveReader(std::string archive_name_, bool lock_on_reading_, std::string path_to_archive_)
     : archive_name(std::move(archive_name_)), lock_on_reading(lock_on_reading_), path_to_archive(std::move(path_to_archive_))
-{}
+{
+}
+
+LibArchiveReader::LibArchiveReader(
+    std::string archive_name_, bool lock_on_reading_, std::string path_to_archive_, const ReadArchiveFunction & archive_read_function_)
+    : archive_name(std::move(archive_name_))
+    , lock_on_reading(lock_on_reading_)
+    , path_to_archive(std::move(path_to_archive_))
+    , archive_read_function(archive_read_function_)
+{
+}
 
 LibArchiveReader::~LibArchiveReader() = default;
 
@@ -274,21 +374,25 @@ const std::string & LibArchiveReader::getPath() const
 
 bool LibArchiveReader::fileExists(const String & filename)
 {
-    Handle handle(path_to_archive, lock_on_reading);
+    Handle handle = acquireHandle();
     return handle.locateFile(filename);
 }
 
 LibArchiveReader::FileInfo LibArchiveReader::getFileInfo(const String & filename)
 {
-    Handle handle(path_to_archive, lock_on_reading);
+    Handle handle = acquireHandle();
     if (!handle.locateFile(filename))
-        throw Exception(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't unpack archive {}: file not found", path_to_archive);
+        throw Exception(
+            ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+            "Couldn't unpack archive {}: File {} was not found in archive",
+            path_to_archive,
+            quoteString(filename));
     return handle.getFileInfo();
 }
 
 std::unique_ptr<LibArchiveReader::FileEnumerator> LibArchiveReader::firstFile()
 {
-    Handle handle(path_to_archive, lock_on_reading);
+    Handle handle = acquireHandle();
     if (!handle.nextFile())
         return nullptr;
 
@@ -297,17 +401,28 @@ std::unique_ptr<LibArchiveReader::FileEnumerator> LibArchiveReader::firstFile()
 
 std::unique_ptr<ReadBufferFromFileBase> LibArchiveReader::readFile(const String & filename, bool throw_on_not_found)
 {
-    return readFile([&](const std::string & file) { return file == filename; }, throw_on_not_found);
+    Handle handle = acquireHandle();
+    if (!handle.locateFile(filename))
+    {
+        if (throw_on_not_found)
+            throw Exception(
+                ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+                "Couldn't unpack archive {}: File {} was not found in archive",
+                path_to_archive,
+                quoteString(filename));
+        return nullptr;
+    }
+    return std::make_unique<ReadBufferFromLibArchive>(std::move(handle), path_to_archive);
 }
 
 std::unique_ptr<ReadBufferFromFileBase> LibArchiveReader::readFile(NameFilter filter, bool throw_on_not_found)
 {
-    Handle handle(path_to_archive, lock_on_reading);
+    Handle handle = acquireHandle();
     if (!handle.locateFile(filter))
     {
         if (throw_on_not_found)
             throw Exception(
-                ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't unpack archive {}: no file found satisfying the filter", path_to_archive);
+                ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't unpack archive {}: No file satisfying filter in archive", path_to_archive);
         return nullptr;
     }
     return std::make_unique<ReadBufferFromLibArchive>(std::move(handle), path_to_archive);
@@ -326,13 +441,24 @@ std::unique_ptr<LibArchiveReader::FileEnumerator> LibArchiveReader::nextFile(std
 {
     if (!dynamic_cast<ReadBufferFromLibArchive *>(read_buffer.get()))
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong ReadBuffer passed to nextFile()");
-    auto read_buffer_from_libarchive = std::unique_ptr<ReadBufferFromLibArchive>(static_cast<ReadBufferFromLibArchive *>(read_buffer.release()));
+    auto read_buffer_from_libarchive
+        = std::unique_ptr<ReadBufferFromLibArchive>(static_cast<ReadBufferFromLibArchive *>(read_buffer.release()));
     auto handle = std::move(*read_buffer_from_libarchive).releaseHandle();
     if (!handle.nextFile())
         return nullptr;
     return std::make_unique<FileEnumeratorImpl>(std::move(handle));
 }
 
+std::unique_ptr<LibArchiveReader::FileEnumerator> LibArchiveReader::currentFile(std::unique_ptr<ReadBuffer> read_buffer)
+{
+    if (!dynamic_cast<ReadBufferFromLibArchive *>(read_buffer.get()))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong ReadBuffer passed to nextFile()");
+    auto read_buffer_from_libarchive
+        = std::unique_ptr<ReadBufferFromLibArchive>(static_cast<ReadBufferFromLibArchive *>(read_buffer.release()));
+    auto handle = std::move(*read_buffer_from_libarchive).releaseHandle();
+    return std::make_unique<FileEnumeratorImpl>(std::move(handle));
+}
+
 std::vector<std::string> LibArchiveReader::getAllFiles()
 {
     return getAllFiles({});
@@ -340,13 +466,22 @@ std::vector<std::string> LibArchiveReader::getAllFiles()
 
 std::vector<std::string> LibArchiveReader::getAllFiles(NameFilter filter)
 {
-    Handle handle(path_to_archive, lock_on_reading);
+    Handle handle = acquireHandle();
     return handle.getAllFiles(filter);
 }
 
-void LibArchiveReader::setPassword(const String & /*password_*/)
+void LibArchiveReader::setPassword(const String & password_)
 {
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Can not set password to {} archive", archive_name);
+    if (password_.empty())
+        return;
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot set password to {} archive", archive_name);
+}
+
+LibArchiveReader::Handle LibArchiveReader::acquireHandle()
+{
+    std::lock_guard lock{mutex};
+    return archive_read_function ? Handle{path_to_archive, lock_on_reading, archive_read_function}
+                                 : Handle{path_to_archive, lock_on_reading};
 }
 
 #endif
diff --git a/src/IO/Archives/LibArchiveReader.h b/src/IO/Archives/LibArchiveReader.h
index 3dadd710089..148d5dd17f2 100644
--- a/src/IO/Archives/LibArchiveReader.h
+++ b/src/IO/Archives/LibArchiveReader.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "config.h"
-
+#include <mutex>
 #include <IO/Archives/IArchiveReader.h>
+#include <IO/Archives/LibArchiveReader.h>
+#include "config.h"
 
 
 namespace DB
@@ -40,6 +41,7 @@ public:
     /// It's possible to convert a file enumerator to a read buffer and vice versa.
     std::unique_ptr<ReadBufferFromFileBase> readFile(std::unique_ptr<FileEnumerator> enumerator) override;
     std::unique_ptr<FileEnumerator> nextFile(std::unique_ptr<ReadBuffer> read_buffer) override;
+    std::unique_ptr<FileEnumerator> currentFile(std::unique_ptr<ReadBuffer> read_buffer) override;
 
     std::vector<std::string> getAllFiles() override;
     std::vector<std::string> getAllFiles(NameFilter filter) override;
@@ -51,26 +53,44 @@ protected:
     /// Constructs an archive's reader that will read from a file in the local filesystem.
     LibArchiveReader(std::string archive_name_, bool lock_on_reading_, std::string path_to_archive_);
 
+    LibArchiveReader(
+        std::string archive_name_, bool lock_on_reading_, std::string path_to_archive_, const ReadArchiveFunction & archive_read_function_);
+
 private:
     class ReadBufferFromLibArchive;
     class Handle;
     class FileEnumeratorImpl;
+    class StreamInfo;
+
+    Handle acquireHandle();
 
     const std::string archive_name;
     const bool lock_on_reading;
     const String path_to_archive;
+    const ReadArchiveFunction archive_read_function;
+    mutable std::mutex mutex;
 };
 
 class TarArchiveReader : public LibArchiveReader
 {
 public:
-    explicit TarArchiveReader(std::string path_to_archive) : LibArchiveReader("tar", /*lock_on_reading_=*/ true, std::move(path_to_archive)) { }
+    explicit TarArchiveReader(std::string path_to_archive) : LibArchiveReader("tar", /*lock_on_reading_=*/true, std::move(path_to_archive))
+    {
+    }
+
+    explicit TarArchiveReader(std::string path_to_archive, const ReadArchiveFunction & archive_read_function)
+        : LibArchiveReader("tar", /*lock_on_reading_=*/true, std::move(path_to_archive), archive_read_function)
+    {
+    }
 };
 
 class SevenZipArchiveReader : public LibArchiveReader
 {
 public:
-    explicit SevenZipArchiveReader(std::string path_to_archive) : LibArchiveReader("7z", /*lock_on_reading_=*/ false, std::move(path_to_archive)) { }
+    explicit SevenZipArchiveReader(std::string path_to_archive)
+        : LibArchiveReader("7z", /*lock_on_reading_=*/false, std::move(path_to_archive))
+    {
+    }
 };
 
 #endif
diff --git a/src/IO/Archives/LibArchiveWriter.cpp b/src/IO/Archives/LibArchiveWriter.cpp
new file mode 100644
index 00000000000..55bc4c1f88c
--- /dev/null
+++ b/src/IO/Archives/LibArchiveWriter.cpp
@@ -0,0 +1,248 @@
+#include <IO/Archives/LibArchiveWriter.h>
+
+#include <filesystem>
+#include <IO/WriteBufferFromFileBase.h>
+#include <Common/quoteString.h>
+#include <Common/scope_guard_safe.h>
+
+#include <mutex>
+
+#if USE_LIBARCHIVE
+
+// this implemation follows the ZipArchiveWriter implemation as closely as possible.
+
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int CANNOT_PACK_ARCHIVE;
+extern const int NOT_IMPLEMENTED;
+}
+
+namespace
+{
+void checkResultCodeImpl(int code, const String & filename)
+{
+    if (code == ARCHIVE_OK)
+        return;
+    throw Exception(
+        ErrorCodes::CANNOT_PACK_ARCHIVE, "Couldn't pack archive: LibArchive Code = {}, filename={}", code, quoteString(filename));
+}
+}
+
+// this is a thin wrapper for libarchive to be able to write the archive to a WriteBuffer
+class LibArchiveWriter::StreamInfo
+{
+public:
+    explicit StreamInfo(std::unique_ptr<WriteBuffer> archive_write_buffer_) : archive_write_buffer(std::move(archive_write_buffer_)) { }
+    static ssize_t memory_write(struct archive *, void * client_data, const void * buff, size_t length)
+    {
+        auto * stream_info = reinterpret_cast<StreamInfo *>(client_data);
+        stream_info->archive_write_buffer->write(reinterpret_cast<const char *>(buff), length);
+        return length;
+    }
+
+    std::unique_ptr<WriteBuffer> archive_write_buffer;
+};
+
+class LibArchiveWriter::WriteBufferFromLibArchive : public WriteBufferFromFileBase
+{
+public:
+    WriteBufferFromLibArchive(std::shared_ptr<LibArchiveWriter> archive_writer_, const String & filename_, const size_t & size_)
+        : WriteBufferFromFileBase(DBMS_DEFAULT_BUFFER_SIZE, nullptr, 0), archive_writer(archive_writer_), filename(filename_), size(size_)
+    {
+        startWritingFile();
+        archive = archive_writer_->getArchive();
+        entry = nullptr;
+    }
+
+    ~WriteBufferFromLibArchive() override
+    {
+        try
+        {
+            closeFile(/* throw_if_error= */ false);
+            endWritingFile();
+        }
+        catch (...)
+        {
+            tryLogCurrentException("WriteBufferFromTarArchive");
+        }
+    }
+
+    void finalizeImpl() override
+    {
+        next();
+        closeFile(/* throw_if_error=*/true);
+        endWritingFile();
+    }
+
+    void sync() override { next(); }
+    std::string getFileName() const override { return filename; }
+
+private:
+    void nextImpl() override
+    {
+        if (!offset())
+            return;
+        if (entry == nullptr)
+            writeEntry();
+        ssize_t to_write = offset();
+        ssize_t written = archive_write_data(archive, working_buffer.begin(), offset());
+        if (written != to_write)
+        {
+            throw Exception(
+                ErrorCodes::CANNOT_PACK_ARCHIVE,
+                "Couldn't pack tar archive: Failed to write all bytes, {} of {}, filename={}",
+                written,
+                to_write,
+                quoteString(filename));
+        }
+    }
+
+    void writeEntry()
+    {
+        expected_size = getSize();
+        entry = archive_entry_new();
+        archive_entry_set_pathname(entry, filename.c_str());
+        archive_entry_set_size(entry, expected_size);
+        archive_entry_set_filetype(entry, static_cast<__LA_MODE_T>(0100000));
+        archive_entry_set_perm(entry, 0644);
+        checkResult(archive_write_header(archive, entry));
+    }
+
+    size_t getSize() const
+    {
+        if (size)
+            return size;
+        else
+            return offset();
+    }
+
+    void closeFile(bool throw_if_error)
+    {
+        if (entry)
+        {
+            archive_entry_free(entry);
+            entry = nullptr;
+        }
+        if (throw_if_error and bytes != expected_size)
+        {
+            throw Exception(
+                ErrorCodes::CANNOT_PACK_ARCHIVE,
+                "Couldn't pack tar archive: Wrote {} of expected {} , filename={}",
+                bytes,
+                expected_size,
+                quoteString(filename));
+        }
+    }
+
+    void endWritingFile()
+    {
+        if (auto archive_writer_ptr = archive_writer.lock())
+            archive_writer_ptr->endWritingFile();
+    }
+
+    void startWritingFile()
+    {
+        if (auto archive_writer_ptr = archive_writer.lock())
+            archive_writer_ptr->startWritingFile();
+    }
+
+    void checkResult(int code) { checkResultCodeImpl(code, filename); }
+
+    std::weak_ptr<LibArchiveWriter> archive_writer;
+    const String filename;
+    Entry entry;
+    Archive archive;
+    size_t size;
+    size_t expected_size;
+};
+
+LibArchiveWriter::LibArchiveWriter(const String & path_to_archive_, std::unique_ptr<WriteBuffer> archive_write_buffer_)
+    : path_to_archive(path_to_archive_)
+{
+    if (archive_write_buffer_)
+        stream_info = std::make_unique<StreamInfo>(std::move(archive_write_buffer_));
+}
+
+void LibArchiveWriter::createArchive()
+{
+    std::lock_guard lock{mutex};
+    archive = archive_write_new();
+    setFormatAndSettings();
+    if (stream_info)
+    {
+        //This allows use to write directly to a writebuffer rather than an intermediate buffer in libarchive.
+        //This has to be set otherwise zstd breaks due to extra bytes being written at the end of the archive.
+        archive_write_set_bytes_per_block(archive, 0);
+        archive_write_open2(archive, stream_info.get(), nullptr, &StreamInfo::memory_write, nullptr, nullptr);
+    }
+    else
+        archive_write_open_filename(archive, path_to_archive.c_str());
+}
+
+LibArchiveWriter::~LibArchiveWriter()
+{
+    chassert((finalized || std::uncaught_exceptions() || std::current_exception()) && "LibArchiveWriter is not finalized in destructor.");
+    if (archive)
+        archive_write_free(archive);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> LibArchiveWriter::writeFile(const String & filename, size_t size)
+{
+    return std::make_unique<WriteBufferFromLibArchive>(std::static_pointer_cast<LibArchiveWriter>(shared_from_this()), filename, size);
+}
+
+std::unique_ptr<WriteBufferFromFileBase> LibArchiveWriter::writeFile(const String & filename)
+{
+    return std::make_unique<WriteBufferFromLibArchive>(std::static_pointer_cast<LibArchiveWriter>(shared_from_this()), filename, 0);
+}
+
+bool LibArchiveWriter::isWritingFile() const
+{
+    std::lock_guard lock{mutex};
+    return is_writing_file;
+}
+
+void LibArchiveWriter::endWritingFile()
+{
+    std::lock_guard lock{mutex};
+    is_writing_file = false;
+}
+
+void LibArchiveWriter::startWritingFile()
+{
+    std::lock_guard lock{mutex};
+    if (std::exchange(is_writing_file, true))
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot write two files to a tar archive in parallel");
+}
+
+void LibArchiveWriter::finalize()
+{
+    std::lock_guard lock{mutex};
+    if (finalized)
+        return;
+    if (archive)
+        archive_write_close(archive);
+    if (stream_info)
+    {
+        stream_info->archive_write_buffer->finalize();
+        stream_info.reset();
+    }
+    finalized = true;
+}
+
+void LibArchiveWriter::setPassword(const String & password_)
+{
+    if (password_.empty())
+        return;
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Setting a password is not currently supported for libarchive");
+}
+
+LibArchiveWriter::Archive LibArchiveWriter::getArchive()
+{
+    std::lock_guard lock{mutex};
+    return archive;
+}
+}
+#endif
diff --git a/src/IO/Archives/LibArchiveWriter.h b/src/IO/Archives/LibArchiveWriter.h
new file mode 100644
index 00000000000..da566c82ff6
--- /dev/null
+++ b/src/IO/Archives/LibArchiveWriter.h
@@ -0,0 +1,77 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_LIBARCHIVE
+#    include <IO/Archives/ArchiveUtils.h>
+#    include <IO/Archives/IArchiveWriter.h>
+#    include <IO/WriteBufferFromFileBase.h>
+#    include <base/defines.h>
+
+
+namespace DB
+{
+class WriteBufferFromFileBase;
+
+/// Interface for writing an archive.
+class LibArchiveWriter : public IArchiveWriter
+{
+public:
+    /// Constructs an archive that will be written as a file in the local filesystem.
+    explicit LibArchiveWriter(const String & path_to_archive_, std::unique_ptr<WriteBuffer> archive_write_buffer_);
+
+    /// Call finalize() before destructing IArchiveWriter.
+    ~LibArchiveWriter() override;
+
+    /// Starts writing a file to the archive. The function returns a write buffer,
+    /// any data written to that buffer will be compressed and then put to the archive.
+    /// You can keep only one such buffer at a time, a buffer returned by previous call
+    /// of the function `writeFile()` should be destroyed before next call of `writeFile()`.
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename) override;
+    /// LibArchive needs to know the size of the file being written. If the file size is not
+    /// passed in the the archive writer tries to infer the size by looking at the available
+    /// data in the buffer, if next is called before all data is written to the buffer
+    /// an exception is thrown.
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename, size_t size) override;
+
+    /// Returns true if there is an active instance of WriteBuffer returned by writeFile().
+    /// This function should be used mostly for debugging purposes.
+    bool isWritingFile() const override;
+
+    /// Finalizes writing of the archive. This function must be always called at the end of writing.
+    /// (Unless an error appeared and the archive is in fact no longer needed.)
+    void finalize() override;
+
+    /// Sets compression method and level.
+    /// Changing them will affect next file in the archive.
+    //void setCompression(const String & compression_method_, int compression_level_) override;
+
+    /// Sets password. If the password is not empty it will enable encryption in the archive.
+    void setPassword(const String & password) override;
+
+protected:
+    using Archive = struct archive *;
+    using Entry = struct archive_entry *;
+
+    /// derived classes must call createArchive. CreateArchive calls setFormatAndSettings.
+    void createArchive();
+    virtual void setFormatAndSettings() = 0;
+
+    Archive archive = nullptr;
+    String path_to_archive;
+
+private:
+    class WriteBufferFromLibArchive;
+    class StreamInfo;
+
+    Archive getArchive();
+    void startWritingFile();
+    void endWritingFile();
+
+    std::unique_ptr<StreamInfo> stream_info TSA_GUARDED_BY(mutex);
+    bool is_writing_file TSA_GUARDED_BY(mutex) = false;
+    bool finalized TSA_GUARDED_BY(mutex) = false;
+    mutable std::mutex mutex;
+};
+}
+#endif
diff --git a/src/IO/Archives/TarArchiveWriter.cpp b/src/IO/Archives/TarArchiveWriter.cpp
new file mode 100644
index 00000000000..d390af89537
--- /dev/null
+++ b/src/IO/Archives/TarArchiveWriter.cpp
@@ -0,0 +1,42 @@
+#include <IO/Archives/TarArchiveWriter.h>
+
+#if USE_LIBARCHIVE
+namespace DB
+{
+namespace ErrorCodes
+{
+extern const int NOT_IMPLEMENTED;
+extern const int CANNOT_PACK_ARCHIVE;
+}
+void TarArchiveWriter::setCompression(const String & compression_method_, int compression_level_)
+{
+    // throw an error unless setCompression is passed the default value
+    if (compression_method_.empty() && compression_level_ == -1)
+        return;
+    throw Exception(
+        ErrorCodes::NOT_IMPLEMENTED, "Using compression_method and compression_level options are not supported for tar archives");
+}
+
+void TarArchiveWriter::setFormatAndSettings()
+{
+    archive_write_set_format_pax_restricted(archive);
+    inferCompressionFromPath();
+}
+
+void TarArchiveWriter::inferCompressionFromPath()
+{
+    if (path_to_archive.ends_with(".tar.gz") || path_to_archive.ends_with(".tgz"))
+        archive_write_add_filter_gzip(archive);
+    else if (path_to_archive.ends_with(".tar.bz2"))
+        archive_write_add_filter_bzip2(archive);
+    else if (path_to_archive.ends_with(".tar.lzma"))
+        archive_write_add_filter_lzma(archive);
+    else if (path_to_archive.ends_with(".tar.zst") || path_to_archive.ends_with(".tzst"))
+        archive_write_add_filter_zstd(archive);
+    else if (path_to_archive.ends_with(".tar.xz"))
+        archive_write_add_filter_xz(archive);
+    else if (!path_to_archive.ends_with(".tar"))
+        throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Unknown compression format");
+}
+}
+#endif
diff --git a/src/IO/Archives/TarArchiveWriter.h b/src/IO/Archives/TarArchiveWriter.h
new file mode 100644
index 00000000000..b04ec4083af
--- /dev/null
+++ b/src/IO/Archives/TarArchiveWriter.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_LIBARCHIVE
+
+#    include <IO/Archives/LibArchiveWriter.h>
+namespace DB
+{
+using namespace std::literals;
+
+class TarArchiveWriter : public LibArchiveWriter
+{
+public:
+    explicit TarArchiveWriter(const String & path_to_archive_, std::unique_ptr<WriteBuffer> archive_write_buffer_)
+        : LibArchiveWriter(path_to_archive_, std::move(archive_write_buffer_))
+    {
+        createArchive();
+    }
+
+    void setCompression(const String & compression_method_, int compression_level_) override;
+    void setFormatAndSettings() override;
+    void inferCompressionFromPath();
+};
+}
+#endif
diff --git a/src/IO/Archives/ZipArchiveReader.cpp b/src/IO/Archives/ZipArchiveReader.cpp
index fd7a09c4f20..2a9b7a43519 100644
--- a/src/IO/Archives/ZipArchiveReader.cpp
+++ b/src/IO/Archives/ZipArchiveReader.cpp
@@ -15,6 +15,7 @@ namespace ErrorCodes
     extern const int CANNOT_UNPACK_ARCHIVE;
     extern const int LOGICAL_ERROR;
     extern const int SEEK_POSITION_OUT_OF_BOUND;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
 }
 
 using RawHandle = unzFile;
@@ -285,23 +286,27 @@ public:
         if (new_pos > static_cast<off_t>(file_info.uncompressed_size))
             throw Exception(ErrorCodes::SEEK_POSITION_OUT_OF_BOUND, "Seek position is out of bound");
 
-        if (file_info.compression_method == MZ_COMPRESS_METHOD_STORE)
-        {
-            /// unzSeek64() works only for non-compressed files.
-            checkResult(unzSeek64(raw_handle, off, whence));
-            return unzTell64(raw_handle);
-        }
+        /// unzSeek64() works only for non-compressed files.
+        ///
+        /// We used to have a fallback here, where we would:
+        ///  * ignore() to "seek" forward,
+        ///  * unzCloseCurrentFile(raw_handle) + unzOpenCurrentFile(raw_handle) to seek to the
+        ///    beginning of the file.
+        /// But the close+open didn't work: after closing+reopening once, the second
+        /// unzCloseCurrentFile() was failing with MZ_CRC_ERROR in mz_zip_entry_read_close(). Maybe
+        /// it's a bug in minizip where some state was inadvertently left over after close+reopen.
+        /// Didn't investigate because re-reading the whole file should be avoided anyway.
+        if (file_info.compression_method != MZ_COMPRESS_METHOD_STORE)
+            throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Seek in compressed archive is not supported.");
 
-        /// As a last try we go slow way, we're going to simply ignore all data before the new position.
-        if (new_pos < current_pos)
-        {
-            checkResult(unzCloseCurrentFile(raw_handle));
-            checkResult(unzOpenCurrentFile(raw_handle));
-            current_pos = 0;
-        }
+        checkResult(unzSeek64(raw_handle, off, whence));
+        return unzTell64(raw_handle);
+    }
 
-        ignore(new_pos - current_pos);
-        return new_pos;
+    bool checkIfActuallySeekable() override
+    {
+        /// The library doesn't support seeking in compressed files.
+        return handle.getFileInfo().compression_method == MZ_COMPRESS_METHOD_STORE;
     }
 
     off_t getPosition() override
@@ -578,6 +583,15 @@ std::unique_ptr<ZipArchiveReader::FileEnumerator> ZipArchiveReader::nextFile(std
     return std::make_unique<FileEnumeratorImpl>(std::move(handle));
 }
 
+std::unique_ptr<ZipArchiveReader::FileEnumerator> ZipArchiveReader::currentFile(std::unique_ptr<ReadBuffer> read_buffer)
+{
+    if (!dynamic_cast<ReadBufferFromZipArchive *>(read_buffer.get()))
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong ReadBuffer passed to nextFile()");
+    auto read_buffer_from_zip = std::unique_ptr<ReadBufferFromZipArchive>(static_cast<ReadBufferFromZipArchive *>(read_buffer.release()));
+    auto handle = std::move(*read_buffer_from_zip).releaseHandle();
+    return std::make_unique<FileEnumeratorImpl>(std::move(handle));
+}
+
 std::vector<std::string> ZipArchiveReader::getAllFiles()
 {
     return getAllFiles({});
diff --git a/src/IO/Archives/ZipArchiveReader.h b/src/IO/Archives/ZipArchiveReader.h
index a8788064fec..4b1910839eb 100644
--- a/src/IO/Archives/ZipArchiveReader.h
+++ b/src/IO/Archives/ZipArchiveReader.h
@@ -47,6 +47,7 @@ public:
     /// It's possible to convert a file enumerator to a read buffer and vice versa.
     std::unique_ptr<ReadBufferFromFileBase> readFile(std::unique_ptr<FileEnumerator> enumerator) override;
     std::unique_ptr<FileEnumerator> nextFile(std::unique_ptr<ReadBuffer> read_buffer) override;
+    std::unique_ptr<FileEnumerator> currentFile(std::unique_ptr<ReadBuffer> read_buffer) override;
 
     std::vector<std::string> getAllFiles() override;
     std::vector<std::string> getAllFiles(NameFilter filter) override;
diff --git a/src/IO/Archives/ZipArchiveWriter.cpp b/src/IO/Archives/ZipArchiveWriter.cpp
index 785a5005f87..0cfe921f33f 100644
--- a/src/IO/Archives/ZipArchiveWriter.cpp
+++ b/src/IO/Archives/ZipArchiveWriter.cpp
@@ -246,7 +246,7 @@ ZipArchiveWriter::~ZipArchiveWriter()
         /// However it is suspicious to destroy instance without finalization at the green path.
         if (!std::uncaught_exceptions() && std::current_exception() == nullptr)
         {
-            Poco::Logger * log = &Poco::Logger::get("ZipArchiveWriter");
+            LoggerPtr log = getLogger("ZipArchiveWriter");
             LOG_ERROR(log,
                        "ZipArchiveWriter is not finalized when destructor is called. "
                        "The zip archive might not be written at all or might be truncated. "
@@ -274,6 +274,11 @@ std::unique_ptr<WriteBufferFromFileBase> ZipArchiveWriter::writeFile(const Strin
     return std::make_unique<WriteBufferFromZipArchive>(std::static_pointer_cast<ZipArchiveWriter>(shared_from_this()), filename);
 }
 
+std::unique_ptr<WriteBufferFromFileBase> ZipArchiveWriter::writeFile(const String & filename, [[maybe_unused]] size_t size)
+{
+    return ZipArchiveWriter::writeFile(filename);
+}
+
 bool ZipArchiveWriter::isWritingFile() const
 {
     std::lock_guard lock{mutex};
diff --git a/src/IO/Archives/ZipArchiveWriter.h b/src/IO/Archives/ZipArchiveWriter.h
index 891da1a2e75..b2b77dce7e1 100644
--- a/src/IO/Archives/ZipArchiveWriter.h
+++ b/src/IO/Archives/ZipArchiveWriter.h
@@ -32,6 +32,9 @@ public:
     /// of the function `writeFile()` should be destroyed before next call of `writeFile()`.
     std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename) override;
 
+    std::unique_ptr<WriteBufferFromFileBase> writeFile(const String & filename, size_t size) override;
+
+
     /// Returns true if there is an active instance of WriteBuffer returned by writeFile().
     /// This function should be used mostly for debugging purposes.
     bool isWritingFile() const override;
diff --git a/src/IO/Archives/createArchiveReader.cpp b/src/IO/Archives/createArchiveReader.cpp
index 0c998971de1..782602091ac 100644
--- a/src/IO/Archives/createArchiveReader.cpp
+++ b/src/IO/Archives/createArchiveReader.cpp
@@ -1,6 +1,6 @@
-#include <IO/Archives/createArchiveReader.h>
-#include <IO/Archives/ZipArchiveReader.h>
 #include <IO/Archives/LibArchiveReader.h>
+#include <IO/Archives/ZipArchiveReader.h>
+#include <IO/Archives/createArchiveReader.h>
 #include <Common/Exception.h>
 
 
@@ -8,8 +8,8 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int CANNOT_UNPACK_ARCHIVE;
-    extern const int SUPPORT_IS_DISABLED;
+extern const int CANNOT_UNPACK_ARCHIVE;
+extern const int SUPPORT_IS_DISABLED;
 }
 
 
@@ -25,16 +25,8 @@ std::shared_ptr<IArchiveReader> createArchiveReader(
     [[maybe_unused]] size_t archive_size)
 {
     using namespace std::literals;
-    static constexpr std::array tar_extensions
-    {
-        ".tar"sv,
-        ".tar.gz"sv,
-        ".tgz"sv,
-        ".tar.zst"sv,
-        ".tzst"sv,
-        ".tar.xz"sv,
-        ".tar.bz2"sv
-    };
+    static constexpr std::array tar_extensions{
+        ".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv, ".tar.bz2"sv, ".tar.lzma"sv};
 
     if (path_to_archive.ends_with(".zip") || path_to_archive.ends_with(".zipx"))
     {
@@ -48,7 +40,7 @@ std::shared_ptr<IArchiveReader> createArchiveReader(
                  tar_extensions.begin(), tar_extensions.end(), [&](const auto extension) { return path_to_archive.ends_with(extension); }))
     {
 #if USE_LIBARCHIVE
-        return std::make_shared<TarArchiveReader>(path_to_archive);
+        return std::make_shared<TarArchiveReader>(path_to_archive, archive_read_function);
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "libarchive library is disabled");
 #endif
diff --git a/src/IO/Archives/createArchiveWriter.cpp b/src/IO/Archives/createArchiveWriter.cpp
index 807fe66e6a9..9a169587088 100644
--- a/src/IO/Archives/createArchiveWriter.cpp
+++ b/src/IO/Archives/createArchiveWriter.cpp
@@ -1,5 +1,7 @@
-#include <IO/Archives/createArchiveWriter.h>
+#include <IO/Archives/LibArchiveWriter.h>
+#include <IO/Archives/TarArchiveWriter.h>
 #include <IO/Archives/ZipArchiveWriter.h>
+#include <IO/Archives/createArchiveWriter.h>
 #include <IO/WriteBuffer.h>
 #include <Common/Exception.h>
 
@@ -8,8 +10,8 @@ namespace DB
 {
 namespace ErrorCodes
 {
-    extern const int CANNOT_PACK_ARCHIVE;
-    extern const int SUPPORT_IS_DISABLED;
+extern const int CANNOT_PACK_ARCHIVE;
+extern const int SUPPORT_IS_DISABLED;
 }
 
 
@@ -19,20 +21,30 @@ std::shared_ptr<IArchiveWriter> createArchiveWriter(const String & path_to_archi
 }
 
 
-std::shared_ptr<IArchiveWriter> createArchiveWriter(
-    const String & path_to_archive,
-    [[maybe_unused]] std::unique_ptr<WriteBuffer> archive_write_buffer)
+std::shared_ptr<IArchiveWriter>
+createArchiveWriter(const String & path_to_archive, [[maybe_unused]] std::unique_ptr<WriteBuffer> archive_write_buffer)
 {
+    using namespace std::literals;
+    static constexpr std::array tar_extensions{
+        ".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.bz2"sv, ".tar.lzma"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv};
     if (path_to_archive.ends_with(".zip") || path_to_archive.ends_with(".zipx"))
     {
 #if USE_MINIZIP
         return std::make_shared<ZipArchiveWriter>(path_to_archive, std::move(archive_write_buffer));
 #else
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "minizip library is disabled");
+#endif
+    }
+    else if (std::any_of(
+                 tar_extensions.begin(), tar_extensions.end(), [&](const auto extension) { return path_to_archive.ends_with(extension); }))
+    {
+#if USE_LIBARCHIVE
+        return std::make_shared<TarArchiveWriter>(path_to_archive, std::move(archive_write_buffer));
+#else
+        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "libarchive library is disabled");
 #endif
     }
     else
         throw Exception(ErrorCodes::CANNOT_PACK_ARCHIVE, "Cannot determine the type of archive {}", path_to_archive);
 }
-
 }
diff --git a/src/IO/Archives/hasRegisteredArchiveFileExtension.cpp b/src/IO/Archives/hasRegisteredArchiveFileExtension.cpp
index 6b2ef29d054..2a979f500f7 100644
--- a/src/IO/Archives/hasRegisteredArchiveFileExtension.cpp
+++ b/src/IO/Archives/hasRegisteredArchiveFileExtension.cpp
@@ -6,7 +6,10 @@ namespace DB
 
 bool hasRegisteredArchiveFileExtension(const String & path)
 {
-    return path.ends_with(".zip") || path.ends_with(".zipx");
+    using namespace std::literals;
+    static constexpr std::array archive_extensions{
+        ".zip"sv, ".zipx"sv, ".tar"sv, ".tar.gz"sv, ".tgz"sv, ".tar.bz2"sv, ".tar.lzma"sv, ".tar.zst"sv, ".tzst"sv, ".tar.xz"sv};
+    return std::any_of(
+        archive_extensions.begin(), archive_extensions.end(), [&](const auto extension) { return path.ends_with(extension); });
 }
-
 }
diff --git a/src/IO/AsynchronousReadBufferFromFile.h b/src/IO/AsynchronousReadBufferFromFile.h
index 79f933cbe48..5b39b707803 100644
--- a/src/IO/AsynchronousReadBufferFromFile.h
+++ b/src/IO/AsynchronousReadBufferFromFile.h
@@ -67,10 +67,8 @@ public:
         char * existing_memory = nullptr,
         size_t alignment = 0,
         std::optional<size_t> file_size_ = std::nullopt,
-        ThrottlerPtr throttler_ = {},
-        bool use_external_buffer_ = false)
-        : AsynchronousReadBufferFromFileDescriptor(
-            reader_, priority_, -1, buf_size, existing_memory, alignment, file_size_, throttler_, use_external_buffer_)
+        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 a7c2c7bb7e3..f8c00d62732 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.cpp
@@ -97,11 +97,7 @@ bool AsynchronousReadBufferFromFileDescriptor::nextImpl()
         /// No pending request. Do synchronous read.
 
         ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::SynchronousReadWaitMicroseconds);
-        if (!use_external_buffer)
-            result = asyncReadInto(memory.data(), memory.size(), DEFAULT_PREFETCH_PRIORITY).get();
-        else
-            /// External buffer will be substituted in place of internal_buffer (see CachedOnDiskReadBufferFromFile)
-            result = asyncReadInto(internal_buffer.begin(), internal_buffer.size(), DEFAULT_PREFETCH_PRIORITY).get();
+        result = asyncReadInto(memory.data(), memory.size(), DEFAULT_PREFETCH_PRIORITY).get();
     }
 
     chassert(result.size >= result.offset);
@@ -114,9 +110,8 @@ bool AsynchronousReadBufferFromFileDescriptor::nextImpl()
     if (bytes_read)
     {
         /// Adjust the working buffer so that it ignores `offset` bytes.
-        if (!use_external_buffer)
-            internal_buffer = Buffer(memory.data(), memory.data() + memory.size());
-        working_buffer = Buffer(internal_buffer.begin() + result.offset, internal_buffer.begin() + result.size);
+        internal_buffer = Buffer(memory.data(), memory.data() + memory.size());
+        working_buffer = Buffer(memory.data() + result.offset, memory.data() + result.size);
         pos = working_buffer.begin();
     }
 
@@ -142,15 +137,13 @@ AsynchronousReadBufferFromFileDescriptor::AsynchronousReadBufferFromFileDescript
     char * existing_memory,
     size_t alignment,
     std::optional<size_t> file_size_,
-    ThrottlerPtr throttler_,
-    bool use_external_buffer_)
+    ThrottlerPtr throttler_)
     : ReadBufferFromFileBase(buf_size, existing_memory, alignment, file_size_)
     , reader(reader_)
     , base_priority(priority_)
     , required_alignment(alignment)
     , fd(fd_)
     , throttler(throttler_)
-    , use_external_buffer(use_external_buffer_)
 {
     if (required_alignment > buf_size)
         throw Exception(
@@ -228,7 +221,7 @@ off_t AsynchronousReadBufferFromFileDescriptor::seek(off_t offset, int whence)
     file_offset_of_buffer_end = seek_pos;
     bytes_to_ignore = new_pos - seek_pos;
 
-    if (bytes_to_ignore >= internal_buffer.size() && !(use_external_buffer && internal_buffer.empty()))
+    if (bytes_to_ignore >= internal_buffer.size())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
                         "Logical error in AsynchronousReadBufferFromFileDescriptor, bytes_to_ignore ({}"
                         ") >= internal_buffer.size() ({})", bytes_to_ignore, internal_buffer.size());
diff --git a/src/IO/AsynchronousReadBufferFromFileDescriptor.h b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
index dcc5819b039..82659b1aca7 100644
--- a/src/IO/AsynchronousReadBufferFromFileDescriptor.h
+++ b/src/IO/AsynchronousReadBufferFromFileDescriptor.h
@@ -29,7 +29,6 @@ protected:
     size_t bytes_to_ignore = 0;           /// How many bytes should we ignore upon a new read request.
     int fd;
     ThrottlerPtr throttler;
-    bool use_external_buffer;
 
     bool nextImpl() override;
 
@@ -47,8 +46,7 @@ public:
         char * existing_memory = nullptr,
         size_t alignment = 0,
         std::optional<size_t> file_size_ = std::nullopt,
-        ThrottlerPtr throttler_ = {},
-        bool use_external_buffer_ = false);
+        ThrottlerPtr throttler_ = {});
 
     ~AsynchronousReadBufferFromFileDescriptor() override;
 
diff --git a/src/IO/AsynchronousReader.h b/src/IO/AsynchronousReader.h
index 279a399caad..815a7b2774e 100644
--- a/src/IO/AsynchronousReader.h
+++ b/src/IO/AsynchronousReader.h
@@ -54,6 +54,9 @@ public:
 
     struct Result
     {
+        /// The read data is at [buf + offset, buf + size), where `buf` is from Request struct.
+        /// (Notice that `offset` is included in `size`.)
+
         /// size
         /// Less than requested amount of data can be returned.
         /// If size is zero - the file has ended.
@@ -66,7 +69,7 @@ public:
 
         std::unique_ptr<Stopwatch> execution_watch = {};
 
-        operator std::tuple<size_t &, size_t &>() { return {size, offset}; }
+        explicit operator std::tuple<size_t &, size_t &>() { return {size, offset}; }
     };
 
     /// Submit request and obtain a handle. This method don't perform any waits.
diff --git a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
new file mode 100644
index 00000000000..4714c795927
--- /dev/null
+++ b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.cpp
@@ -0,0 +1,340 @@
+#include <IO/AzureBlobStorage/copyAzureBlobStorageFile.h>
+
+#if USE_AZURE_BLOB_STORAGE
+
+#include <Common/ProfileEvents.h>
+#include <Common/typeid_cast.h>
+#include <Interpreters/Context.h>
+#include <IO/LimitSeekableReadBuffer.h>
+#include <IO/SeekableReadBuffer.h>
+#include <IO/StdStreamFromReadBuffer.h>
+#include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
+#include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
+#include <Common/getRandomASCIIString.h>
+#include <IO/SharedThreadPools.h>
+
+namespace ProfileEvents
+{
+    extern const Event AzureCopyObject;
+    extern const Event AzureUploadPart;
+
+    extern const Event DiskAzureCopyObject;
+    extern const Event DiskAzureUploadPart;
+}
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int INVALID_CONFIG_PARAMETER;
+    extern const int AZURE_BLOB_STORAGE_ERROR;
+}
+
+namespace
+{
+    class UploadHelper
+    {
+    public:
+        UploadHelper(
+            const CreateReadBuffer & create_read_buffer_,
+            std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> client_,
+            size_t offset_,
+            size_t total_size_,
+            const String & dest_container_for_logging_,
+            const String & dest_blob_,
+            std::shared_ptr<const AzureObjectStorageSettings> settings_,
+            ThreadPoolCallbackRunner<void> schedule_,
+            bool for_disk_azure_blob_storage_,
+            const Poco::Logger * log_)
+            : create_read_buffer(create_read_buffer_)
+            , client(client_)
+            , offset (offset_)
+            , total_size (total_size_)
+            , dest_container_for_logging(dest_container_for_logging_)
+            , dest_blob(dest_blob_)
+            , settings(settings_)
+            , schedule(schedule_)
+            , for_disk_azure_blob_storage(for_disk_azure_blob_storage_)
+            , log(log_)
+            , max_single_part_upload_size(settings_->max_single_part_upload_size)
+        {
+        }
+
+        virtual ~UploadHelper() = default;
+
+    protected:
+        std::function<std::unique_ptr<SeekableReadBuffer>()> create_read_buffer;
+        std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> client;
+        size_t offset;
+        size_t total_size;
+        const String & dest_container_for_logging;
+        const String & dest_blob;
+        std::shared_ptr<const AzureObjectStorageSettings> settings;
+        ThreadPoolCallbackRunner<void> schedule;
+        bool for_disk_azure_blob_storage;
+        const Poco::Logger * log;
+        size_t max_single_part_upload_size;
+
+        struct UploadPartTask
+        {
+            size_t part_offset;
+            size_t part_size;
+            std::vector<std::string> block_ids;
+            bool is_finished = false;
+            std::exception_ptr exception;
+        };
+
+        size_t normal_part_size;
+        std::vector<std::string> block_ids;
+
+        std::list<UploadPartTask> TSA_GUARDED_BY(bg_tasks_mutex) bg_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;
+        std::mutex bg_tasks_mutex;
+        std::condition_variable bg_tasks_condvar;
+
+        void calculatePartSize()
+        {
+            auto max_upload_part_size = settings->max_upload_part_size;
+            if (!max_upload_part_size)
+                throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "max_upload_part_size must not be 0");
+            /// We've calculated the size of a normal part (the final part can be smaller).
+            normal_part_size = max_upload_part_size;
+        }
+
+    public:
+        void performCopy()
+        {
+            performMultipartUpload();
+        }
+
+        void completeMultipartUpload()
+        {
+            auto block_blob_client = client->GetBlockBlobClient(dest_blob);
+            block_blob_client.CommitBlockList(block_ids);
+        }
+
+        void performMultipartUpload()
+        {
+            calculatePartSize();
+
+            size_t position = offset;
+            size_t end_position = offset + total_size;
+
+            try
+            {
+                while (position < end_position)
+                {
+                    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.
+
+                    uploadPart(position, part_size);
+
+                    position = next_position;
+                }
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+                waitForAllBackgroundTasks();
+                throw;
+            }
+
+            waitForAllBackgroundTasks();
+            completeMultipartUpload();
+        }
+
+
+        void uploadPart(size_t part_offset, size_t part_size)
+        {
+            LOG_TRACE(log, "Writing part. Container: {}, Blob: {}, Size: {}", dest_container_for_logging, dest_blob, part_size);
+
+            if (!part_size)
+            {
+                LOG_TRACE(log, "Skipping writing an empty part.");
+                return;
+            }
+
+            if (schedule)
+            {
+                UploadPartTask *  task = nullptr;
+
+                {
+                    std::lock_guard lock(bg_tasks_mutex);
+                    task = &bg_tasks.emplace_back();
+                    ++num_added_bg_tasks;
+                }
+
+                /// Notify waiting thread when task finished
+                auto task_finish_notify = [this, 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
+                {
+                    task->part_offset = part_offset;
+                    task->part_size = part_size;
+
+                    schedule([this, task, task_finish_notify]()
+                    {
+                        try
+                        {
+                            processUploadPartRequest(*task);
+                        }
+                        catch (...)
+                        {
+                            task->exception = std::current_exception();
+                        }
+                        task_finish_notify();
+                    }, Priority{});
+                }
+                catch (...)
+                {
+                    task_finish_notify();
+                    throw;
+                }
+            }
+            else
+            {
+                UploadPartTask task;
+                task.part_offset = part_offset;
+                task.part_size = part_size;
+                processUploadPartRequest(task);
+                block_ids.insert(block_ids.end(),task.block_ids.begin(), task.block_ids.end());
+            }
+        }
+
+        void processUploadPartRequest(UploadPartTask & task)
+        {
+            ProfileEvents::increment(ProfileEvents::AzureUploadPart);
+            if (for_disk_azure_blob_storage)
+                ProfileEvents::increment(ProfileEvents::DiskAzureUploadPart);
+
+            auto block_blob_client = client->GetBlockBlobClient(dest_blob);
+            auto read_buffer = std::make_unique<LimitSeekableReadBuffer>(create_read_buffer(), task.part_offset, task.part_size);
+            while (!read_buffer->eof())
+            {
+                  auto size = read_buffer->available();
+                  if (size > 0)
+                  {
+                      auto block_id = getRandomASCIIString(64);
+                      Azure::Core::IO::MemoryBodyStream memory(reinterpret_cast<const uint8_t *>(read_buffer->position()), size);
+                      block_blob_client.StageBlock(block_id, memory);
+                      task.block_ids.emplace_back(block_id);
+                      read_buffer->ignore(size);
+                      LOG_TRACE(log, "Writing part. Container: {}, Blob: {}, block_id: {}", dest_container_for_logging, dest_blob, block_id);
+                  }
+            }
+            std::lock_guard lock(bg_tasks_mutex); /// Protect bg_tasks from race
+            LOG_TRACE(log, "Writing part finished. Container: {}, Blob: {}, Parts: {}", dest_container_for_logging, dest_blob, bg_tasks.size());
+        }
+
+
+        void waitForAllBackgroundTasks()
+        {
+            if (!schedule)
+                return;
+
+            std::unique_lock lock(bg_tasks_mutex);
+            /// Suppress warnings because bg_tasks_mutex is actually hold, but tsa annotations do not understand std::unique_lock
+            bg_tasks_condvar.wait(lock, [this]() {return TSA_SUPPRESS_WARNING_FOR_READ(num_added_bg_tasks) == TSA_SUPPRESS_WARNING_FOR_READ(num_finished_bg_tasks); });
+
+            auto & tasks = TSA_SUPPRESS_WARNING_FOR_WRITE(bg_tasks);
+            for (auto & task : tasks)
+            {
+                if (task.exception)
+                    std::rethrow_exception(task.exception);
+                block_ids.insert(block_ids.end(),task.block_ids.begin(), task.block_ids.end());
+            }
+        }
+    };
+}
+
+
+void copyDataToAzureBlobStorageFile(
+    const std::function<std::unique_ptr<SeekableReadBuffer>()> & create_read_buffer,
+    size_t offset,
+    size_t size,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> dest_client,
+    const String & dest_container_for_logging,
+    const String & dest_blob,
+    std::shared_ptr<const AzureObjectStorageSettings> settings,
+    ThreadPoolCallbackRunner<void> schedule,
+    bool for_disk_azure_blob_storage)
+{
+    UploadHelper helper{create_read_buffer, dest_client, offset, size, dest_container_for_logging, dest_blob, settings, schedule, for_disk_azure_blob_storage, &Poco::Logger::get("copyDataToAzureBlobStorageFile")};
+    helper.performCopy();
+}
+
+
+void copyAzureBlobStorageFile(
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> src_client,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> dest_client,
+    const String & src_container_for_logging,
+    const String & src_blob,
+    size_t offset,
+    size_t size,
+    const String & dest_container_for_logging,
+    const String & dest_blob,
+    std::shared_ptr<const AzureObjectStorageSettings> settings,
+    const ReadSettings & read_settings,
+    ThreadPoolCallbackRunner<void> schedule,
+    bool for_disk_azure_blob_storage)
+{
+
+    if (settings->use_native_copy)
+    {
+        ProfileEvents::increment(ProfileEvents::AzureCopyObject);
+        if (for_disk_azure_blob_storage)
+            ProfileEvents::increment(ProfileEvents::DiskAzureCopyObject);
+
+        auto block_blob_client_src = src_client->GetBlockBlobClient(src_blob);
+        auto block_blob_client_dest = dest_client->GetBlockBlobClient(dest_blob);
+        auto source_uri = block_blob_client_src.GetUrl();
+
+        if (size < settings->max_single_part_copy_size)
+        {
+            block_blob_client_dest.CopyFromUri(source_uri);
+        }
+        else
+        {
+            Azure::Storage::Blobs::StartBlobCopyOperation operation = block_blob_client_dest.StartCopyFromUri(source_uri);
+
+            // Wait for the operation to finish, checking for status every 100 second.
+            auto copy_response = operation.PollUntilDone(std::chrono::milliseconds(100));
+            auto properties_model = copy_response.Value;
+
+            if (properties_model.CopySource.HasValue())
+            {
+                throw Exception(ErrorCodes::AZURE_BLOB_STORAGE_ERROR, "Copy failed");
+            }
+
+        }
+    }
+    else
+    {
+        LOG_TRACE(&Poco::Logger::get("copyAzureBlobStorageFile"), "Reading from Container: {}, Blob: {}", src_container_for_logging, src_blob);
+        auto create_read_buffer = [&]
+        {
+            return std::make_unique<ReadBufferFromAzureBlobStorage>(src_client, src_blob, read_settings, settings->max_single_read_retries,
+            settings->max_single_download_retries);
+        };
+
+        UploadHelper helper{create_read_buffer, dest_client, offset, size, dest_container_for_logging, dest_blob, settings, schedule, for_disk_azure_blob_storage, &Poco::Logger::get("copyAzureBlobStorageFile")};
+        helper.performCopy();
+    }
+}
+
+}
+
+#endif
diff --git a/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h
new file mode 100644
index 00000000000..1433f8d18ba
--- /dev/null
+++ b/src/IO/AzureBlobStorage/copyAzureBlobStorageFile.h
@@ -0,0 +1,56 @@
+#pragma once
+
+#include "config.h"
+
+#if USE_AZURE_BLOB_STORAGE
+
+#include <Storages/StorageAzureBlobCluster.h>
+#include <Storages/StorageAzureBlob.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <base/types.h>
+#include <functional>
+#include <memory>
+
+
+namespace DB
+{
+class SeekableReadBuffer;
+
+using CreateReadBuffer = std::function<std::unique_ptr<SeekableReadBuffer>()>;
+
+/// Copies a file from AzureBlobStorage to AzureBlobStorage.
+/// The parameters `src_offset` and `src_size` specify a part in the source to copy.
+void copyAzureBlobStorageFile(
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> src_client,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> dest_client,
+    const String & src_container_for_logging,
+    const String & src_blob,
+    size_t src_offset,
+    size_t src_size,
+    const String & dest_container_for_logging,
+    const String & dest_blob,
+    std::shared_ptr<const AzureObjectStorageSettings> settings,
+    const ReadSettings & read_settings,
+    ThreadPoolCallbackRunner<void> schedule_ = {},
+    bool for_disk_azure_blob_storage = false);
+
+
+/// Copies data from any seekable source to AzureBlobStorage.
+/// The same functionality can be done by using the function copyData() and the class WriteBufferFromS3
+/// however copyDataToS3File() is faster and spends less memory.
+/// 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 copyDataToAzureBlobStorageFile(
+    const std::function<std::unique_ptr<SeekableReadBuffer>()> & create_read_buffer,
+    size_t offset,
+    size_t size,
+    std::shared_ptr<const Azure::Storage::Blobs::BlobContainerClient> client,
+    const String & dest_container_for_logging,
+    const String & dest_blob,
+    std::shared_ptr<const AzureObjectStorageSettings> settings,
+    ThreadPoolCallbackRunner<void> schedule_ = {},
+    bool for_disk_azure_blob_storage = false);
+
+}
+
+#endif
diff --git a/src/IO/BrotliWriteBuffer.h b/src/IO/BrotliWriteBuffer.h
index d4cda7b270c..c68743ca13f 100644
--- a/src/IO/BrotliWriteBuffer.h
+++ b/src/IO/BrotliWriteBuffer.h
@@ -21,10 +21,10 @@ public:
         WriteBufferT && out_,
         int compression_level,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
+        char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
         size_t alignment = 0,
         bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment)
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment) /// NOLINT(bugprone-move-forwarding-reference)
     , brotli(std::make_unique<BrotliStateWrapper>())
     , in_available(0)
     , in_data(nullptr)
diff --git a/src/IO/BufferBase.h b/src/IO/BufferBase.h
index 4c0a467b155..e98f00270e2 100644
--- a/src/IO/BufferBase.h
+++ b/src/IO/BufferBase.h
@@ -43,7 +43,7 @@ public:
         inline void resize(size_t size) { end_pos = begin_pos + size; }
         inline bool empty() const { return size() == 0; }
 
-        inline void swap(Buffer & other)
+        inline void swap(Buffer & other) noexcept
         {
             std::swap(begin_pos, other.begin_pos);
             std::swap(end_pos, other.end_pos);
@@ -60,6 +60,9 @@ public:
     BufferBase(Position ptr, size_t size, size_t offset)
         : pos(ptr + offset), working_buffer(ptr, ptr + size), internal_buffer(ptr, ptr + size) {}
 
+    /// Assign the buffers and pos.
+    /// Be careful when calling this from ReadBuffer::nextImpl() implementations: `offset` is
+    /// effectively ignored because ReadBuffer::next() reassigns `pos`.
     void set(Position ptr, size_t size, size_t offset)
     {
         internal_buffer = Buffer(ptr, ptr + size);
@@ -82,7 +85,7 @@ public:
     /// How many bytes are available for read/write
     inline size_t available() const { return size_t(working_buffer.end() - pos); }
 
-    inline void swap(BufferBase & other)
+    inline void swap(BufferBase & other) noexcept
     {
         internal_buffer.swap(other.internal_buffer);
         working_buffer.swap(other.working_buffer);
diff --git a/src/IO/Bzip2WriteBuffer.cpp b/src/IO/Bzip2WriteBuffer.cpp
index 3421b4c3985..8edae647e22 100644
--- a/src/IO/Bzip2WriteBuffer.cpp
+++ b/src/IO/Bzip2WriteBuffer.cpp
@@ -14,27 +14,11 @@ namespace ErrorCodes
     extern const int BZIP2_STREAM_ENCODER_FAILED;
 }
 
-
-Bzip2WriteBuffer::Bzip2StateWrapper::Bzip2StateWrapper(int compression_level)
-{
-    memset(&stream, 0, sizeof(stream));
-
-    int ret = BZ2_bzCompressInit(&stream, compression_level, 0, 0);
-
-    if (ret != BZ_OK)
-        throw Exception(
-            ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
-            "bzip2 stream encoder init failed: error code: {}",
-            ret);
-}
-
-Bzip2WriteBuffer::Bzip2StateWrapper::~Bzip2StateWrapper()
+Bzip2WriteBuffer::~Bzip2WriteBuffer()
 {
     BZ2_bzCompressEnd(&stream);
 }
 
-Bzip2WriteBuffer::~Bzip2WriteBuffer() = default;
-
 void Bzip2WriteBuffer::nextImpl()
 {
     if (!offset())
@@ -42,20 +26,20 @@ void Bzip2WriteBuffer::nextImpl()
         return;
     }
 
-    bz->stream.next_in = working_buffer.begin();
-    bz->stream.avail_in = static_cast<unsigned>(offset());
+    stream.next_in = working_buffer.begin();
+    stream.avail_in = static_cast<unsigned>(offset());
 
     try
     {
         do
         {
             out->nextIfAtEnd();
-            bz->stream.next_out = out->position();
-            bz->stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
+            stream.next_out = out->position();
+            stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
-            int ret = BZ2_bzCompress(&bz->stream, BZ_RUN);
+            int ret = BZ2_bzCompress(&stream, BZ_RUN);
 
-            out->position() = out->buffer().end() - bz->stream.avail_out;
+            out->position() = out->buffer().end() - stream.avail_out;
 
             if (ret != BZ_RUN_OK)
                 throw Exception(
@@ -64,7 +48,7 @@ void Bzip2WriteBuffer::nextImpl()
                     ret);
 
         }
-        while (bz->stream.avail_in > 0);
+        while (stream.avail_in > 0);
 
         total_in += offset();
     }
@@ -84,19 +68,26 @@ void Bzip2WriteBuffer::finalizeBefore()
     if (!compress_empty && total_in == 0)
         return;
 
-    out->nextIfAtEnd();
-    bz->stream.next_out = out->position();
-    bz->stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
+    do
+    {
+        out->nextIfAtEnd();
+        stream.next_out = out->position();
+        stream.avail_out = static_cast<unsigned>(out->buffer().end() - out->position());
 
-    int ret = BZ2_bzCompress(&bz->stream, BZ_FINISH);
+        int ret = BZ2_bzCompress(&stream, BZ_FINISH);
 
-    out->position() = out->buffer().end() - bz->stream.avail_out;
+        out->position() = out->buffer().end() - stream.avail_out;
 
-    if (ret != BZ_STREAM_END && ret != BZ_FINISH_OK)
-        throw Exception(
-            ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
-            "bzip2 stream encoder failed: error code: {}",
-            ret);
+        if (ret == BZ_STREAM_END)
+            break;
+
+        if (ret != BZ_FINISH_OK)
+            throw Exception(
+                ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
+                "bzip2 stream encoder failed: error code: {}",
+                ret);
+    }
+    while (true);
 }
 
 }
diff --git a/src/IO/Bzip2WriteBuffer.h b/src/IO/Bzip2WriteBuffer.h
index 63c67461c6a..7808f8987cc 100644
--- a/src/IO/Bzip2WriteBuffer.h
+++ b/src/IO/Bzip2WriteBuffer.h
@@ -12,6 +12,11 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int BZIP2_STREAM_ENCODER_FAILED;
+}
+
 class Bzip2WriteBuffer : public WriteBufferWithOwnMemoryDecorator
 {
 public:
@@ -20,12 +25,21 @@ public:
         WriteBufferT && out_,
         int compression_level,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
+        char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
         size_t alignment = 0,
         bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), bz(std::make_unique<Bzip2StateWrapper>(compression_level))
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment) /// NOLINT(bugprone-move-forwarding-reference)
     , compress_empty(compress_empty_)
     {
+        memset(&stream, 0, sizeof(stream));
+
+        int ret = BZ2_bzCompressInit(&stream, compression_level, 0, 0);
+
+        if (ret != BZ_OK)
+            throw Exception(
+                ErrorCodes::BZIP2_STREAM_ENCODER_FAILED,
+                "bzip2 stream encoder init failed: error code: {}",
+                ret);
     }
 
     ~Bzip2WriteBuffer() override;
@@ -35,16 +49,7 @@ private:
 
     void finalizeBefore() override;
 
-    class Bzip2StateWrapper
-    {
-    public:
-        explicit Bzip2StateWrapper(int compression_level);
-        ~Bzip2StateWrapper();
-
-        bz_stream stream;
-    };
-
-    std::unique_ptr<Bzip2StateWrapper> bz;
+    bz_stream stream;
     bool compress_empty = true;
     UInt64 total_in = 0;
 };
diff --git a/src/IO/CachedInMemoryReadBufferFromFile.cpp b/src/IO/CachedInMemoryReadBufferFromFile.cpp
new file mode 100644
index 00000000000..ceaf0ca4752
--- /dev/null
+++ b/src/IO/CachedInMemoryReadBufferFromFile.cpp
@@ -0,0 +1,186 @@
+#include "CachedInMemoryReadBufferFromFile.h"
+#include <IO/SwapHelper.h>
+#include <base/scope_guard.h>
+#include <Common/logger_useful.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int UNEXPECTED_END_OF_FILE;
+    extern const int CANNOT_SEEK_THROUGH_FILE;
+    extern const int SEEK_POSITION_OUT_OF_BOUND;
+}
+
+CachedInMemoryReadBufferFromFile::CachedInMemoryReadBufferFromFile(
+    FileChunkAddress cache_key_, PageCachePtr cache_, std::unique_ptr<ReadBufferFromFileBase> in_, const ReadSettings & settings_)
+    : ReadBufferFromFileBase(0, nullptr, 0, in_->getFileSize()), cache_key(cache_key_), cache(cache_), settings(settings_), in(std::move(in_))
+    , read_until_position(file_size.value())
+{
+    cache_key.offset = 0;
+}
+
+String CachedInMemoryReadBufferFromFile::getFileName() const
+{
+    return in->getFileName();
+}
+
+off_t CachedInMemoryReadBufferFromFile::seek(off_t off, int whence)
+{
+    if (whence != SEEK_SET)
+        throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed.");
+
+    size_t offset = static_cast<size_t>(off);
+    if (offset > file_size.value())
+        throw Exception(ErrorCodes::SEEK_POSITION_OUT_OF_BOUND, "Seek position is out of bounds. Offset: {}", off);
+
+    if (offset >= file_offset_of_buffer_end - working_buffer.size() && offset <= file_offset_of_buffer_end)
+    {
+        pos = working_buffer.end() - (file_offset_of_buffer_end - offset);
+        chassert(getPosition() == off);
+        return off;
+    }
+
+    resetWorkingBuffer();
+
+    file_offset_of_buffer_end = offset;
+    chunk.reset();
+
+    chassert(getPosition() == off);
+    return off;
+}
+
+off_t CachedInMemoryReadBufferFromFile::getPosition()
+{
+    return file_offset_of_buffer_end - available();
+}
+
+size_t CachedInMemoryReadBufferFromFile::getFileOffsetOfBufferEnd() const
+{
+    return file_offset_of_buffer_end;
+}
+
+void CachedInMemoryReadBufferFromFile::setReadUntilPosition(size_t position)
+{
+    read_until_position = position;
+    if (position < static_cast<size_t>(getPosition()))
+    {
+        resetWorkingBuffer();
+        chunk.reset();
+    }
+    else if (position < file_offset_of_buffer_end)
+    {
+        size_t diff = file_offset_of_buffer_end - position;
+        working_buffer.resize(working_buffer.size() - diff);
+        file_offset_of_buffer_end -= diff;
+    }
+}
+
+void CachedInMemoryReadBufferFromFile::setReadUntilEnd()
+{
+    setReadUntilPosition(file_size.value());
+}
+
+bool CachedInMemoryReadBufferFromFile::nextImpl()
+{
+    chassert(read_until_position <= file_size.value());
+    if (file_offset_of_buffer_end >= read_until_position)
+        return false;
+
+    if (chunk.has_value() && file_offset_of_buffer_end >= cache_key.offset + cache->chunkSize())
+    {
+        chassert(file_offset_of_buffer_end == cache_key.offset + cache->chunkSize());
+        chunk.reset();
+    }
+
+    if (!chunk.has_value())
+    {
+        cache_key.offset = file_offset_of_buffer_end / cache->chunkSize() * cache->chunkSize();
+        chunk = cache->getOrSet(cache_key.hash(), settings.read_from_page_cache_if_exists_otherwise_bypass_cache, settings.page_cache_inject_eviction);
+
+        size_t chunk_size = std::min(cache->chunkSize(), file_size.value() - cache_key.offset);
+
+        std::unique_lock download_lock(chunk->getChunk()->state.download_mutex);
+
+        if (!chunk->isPrefixPopulated(chunk_size))
+        {
+            /// A few things could be improved here, which may or may not be worth the added complexity:
+            ///  * If the next file chunk is in cache, use in->setReadUntilPosition() to limit the read to
+            ///    just one chunk. More generally, look ahead in the cache to count how many next chunks
+            ///    need to be downloaded. (Up to some limit? And avoid changing `in`'s until-position if
+            ///    it's already reasonable; otherwise we'd increase it by one chunk every chunk, discarding
+            ///    a half-completed HTTP request every time.)
+            ///  * If only a subset of pages are missing from this chunk, download only them,
+            ///    with some threshold for avoiding short seeks.
+            ///    In particular, if a previous download failed in the middle of the chunk, we could
+            ///    resume from that position instead of from the beginning of the chunk.
+            ///    (It's also possible in principle that a proper subset of chunk's pages was reclaimed
+            ///    by the OS. But, for performance purposes, we should completely ignore that, because
+            ///    (a) PageCache normally uses 2 MiB transparent huge pages and has just one such page
+            ///    per chunk, and (b) even with 4 KiB pages partial chunk eviction is extremely rare.)
+            ///  * If our [position, read_until_position) covers only part of the chunk, we could download
+            ///    just that part. (Which would be bad if someone else needs the rest of the chunk and has
+            ///    to do a whole new HTTP request to get it. Unclear what the policy should be.)
+            ///  * Instead of doing in->next() in a loop until we get the whole chunk, we could return the
+            ///    results as soon as in->next() produces them.
+            ///    (But this would make the download_mutex situation much more complex, similar to the
+            ///    FileSegment::State::PARTIALLY_DOWNLOADED and FileSegment::setRemoteFileReader() stuff.)
+
+            Buffer prev_in_buffer = in->internalBuffer();
+            SCOPE_EXIT({ in->set(prev_in_buffer.begin(), prev_in_buffer.size()); });
+
+            size_t pos = 0;
+            while (pos < chunk_size)
+            {
+                char * piece_start = chunk->getChunk()->data + pos;
+                size_t piece_size = chunk_size - pos;
+                in->set(piece_start, piece_size);
+                if (pos == 0)
+                    in->seek(cache_key.offset, SEEK_SET);
+                else
+                    chassert(!in->available());
+
+                if (in->eof())
+                    throw Exception(ErrorCodes::UNEXPECTED_END_OF_FILE, "File {} ended after {} bytes, but we expected {}",
+                        getFileName(), cache_key.offset + pos, file_size.value());
+
+                chassert(in->position() >= piece_start && in->buffer().end() <= piece_start + piece_size);
+                chassert(in->getPosition() == static_cast<off_t>(cache_key.offset + pos));
+
+                size_t n = in->available();
+                chassert(n);
+                if (in->position() != piece_start)
+                    memmove(piece_start, in->position(), n);
+                in->position() += n;
+                pos += n;
+            }
+
+            chunk->markPrefixPopulated(chunk_size);
+        }
+    }
+
+    nextimpl_working_buffer_offset = file_offset_of_buffer_end - cache_key.offset;
+    working_buffer = Buffer(
+        chunk->getChunk()->data,
+        chunk->getChunk()->data + std::min(chunk->getChunk()->size, read_until_position - cache_key.offset));
+    pos = working_buffer.begin() + nextimpl_working_buffer_offset;
+
+    if (!internal_buffer.empty())
+    {
+        /// We were given an external buffer to read into. Copy the data into it.
+        /// Would be nice to avoid this copy, somehow, maybe by making ReadBufferFromRemoteFSGather
+        /// and AsynchronousBoundedReadBuffer explicitly aware of the page cache.
+        size_t n = std::min(available(), internal_buffer.size());
+        memcpy(internal_buffer.begin(), pos, n);
+        working_buffer = Buffer(internal_buffer.begin(), internal_buffer.begin() + n);
+        pos = working_buffer.begin();
+        nextimpl_working_buffer_offset = 0;
+    }
+
+    file_offset_of_buffer_end += available();
+
+    return true;
+}
+
+}
diff --git a/src/IO/CachedInMemoryReadBufferFromFile.h b/src/IO/CachedInMemoryReadBufferFromFile.h
new file mode 100644
index 00000000000..a0d07486359
--- /dev/null
+++ b/src/IO/CachedInMemoryReadBufferFromFile.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include <IO/ReadBufferFromFileBase.h>
+#include <IO/ReadSettings.h>
+#include <Common/PageCache.h>
+
+namespace DB
+{
+
+class CachedInMemoryReadBufferFromFile : public ReadBufferFromFileBase
+{
+public:
+    /// `in_` must support using external buffer. I.e. we assign its internal_buffer before each next()
+    /// call and expect the read data to be put into that buffer.
+    /// `in_` should be seekable and should be able to read the whole file from 0 to in_->getFileSize();
+    /// if you set `in_`'s read-until-position bypassing CachedInMemoryReadBufferFromFile then
+    /// CachedInMemoryReadBufferFromFile will break.
+    CachedInMemoryReadBufferFromFile(FileChunkAddress cache_key_, PageCachePtr cache_, std::unique_ptr<ReadBufferFromFileBase> in_, const ReadSettings & settings_);
+
+    String getFileName() const override;
+    off_t seek(off_t off, int whence) override;
+    off_t getPosition() override;
+    size_t getFileOffsetOfBufferEnd() const override;
+    bool supportsRightBoundedReads() const override { return true; }
+    void setReadUntilPosition(size_t position) override;
+    void setReadUntilEnd() override;
+
+private:
+    FileChunkAddress cache_key; // .offset is offset of `chunk` start
+    PageCachePtr cache;
+    ReadSettings settings;
+    std::unique_ptr<ReadBufferFromFileBase> in;
+
+    size_t file_offset_of_buffer_end = 0;
+    size_t read_until_position;
+
+    std::optional<PinnedPageChunk> chunk;
+
+    bool nextImpl() override;
+};
+
+}
diff --git a/src/IO/CompressedReadBufferWrapper.h b/src/IO/CompressedReadBufferWrapper.h
index bb58a7bfeb3..66e57488434 100644
--- a/src/IO/CompressedReadBufferWrapper.h
+++ b/src/IO/CompressedReadBufferWrapper.h
@@ -1,11 +1,12 @@
 #pragma once
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadBuffer.h>
+#include <IO/ReadBufferWrapperBase.h>
 
 namespace DB
 {
 
-class CompressedReadBufferWrapper : public BufferWithOwnMemory<ReadBuffer>
+class CompressedReadBufferWrapper : public BufferWithOwnMemory<ReadBuffer>, public ReadBufferWrapperBase
 {
 public:
     CompressedReadBufferWrapper(
@@ -16,7 +17,7 @@ public:
     : BufferWithOwnMemory<ReadBuffer>(buf_size, existing_memory, alignment)
     , in(std::move(in_)) {}
 
-    const ReadBuffer & getWrappedReadBuffer() const { return *in; }
+    const ReadBuffer & getWrappedReadBuffer() const override { return *in; }
     ReadBuffer & getWrappedReadBuffer() { return *in; }
 
     void prefetch(Priority priority) override { in->prefetch(priority); }
diff --git a/src/IO/ConnectionTimeouts.cpp b/src/IO/ConnectionTimeouts.cpp
index 88073a72d78..da6214ae477 100644
--- a/src/IO/ConnectionTimeouts.cpp
+++ b/src/IO/ConnectionTimeouts.cpp
@@ -5,81 +5,6 @@
 namespace DB
 {
 
-ConnectionTimeouts::ConnectionTimeouts(
-    Poco::Timespan connection_timeout_,
-    Poco::Timespan send_timeout_,
-    Poco::Timespan receive_timeout_)
-    : connection_timeout(connection_timeout_)
-    , send_timeout(send_timeout_)
-    , receive_timeout(receive_timeout_)
-    , tcp_keep_alive_timeout(0)
-    , http_keep_alive_timeout(0)
-    , secure_connection_timeout(connection_timeout)
-    , hedged_connection_timeout(receive_timeout_)
-    , receive_data_timeout(receive_timeout_)
-    , handshake_timeout(receive_timeout_)
-{
-}
-
-ConnectionTimeouts::ConnectionTimeouts(
-    Poco::Timespan connection_timeout_,
-    Poco::Timespan send_timeout_,
-    Poco::Timespan receive_timeout_,
-    Poco::Timespan tcp_keep_alive_timeout_,
-    Poco::Timespan handshake_timeout_)
-    : connection_timeout(connection_timeout_)
-    , send_timeout(send_timeout_)
-    , receive_timeout(receive_timeout_)
-    , tcp_keep_alive_timeout(tcp_keep_alive_timeout_)
-    , http_keep_alive_timeout(0)
-    , secure_connection_timeout(connection_timeout)
-    , hedged_connection_timeout(receive_timeout_)
-    , receive_data_timeout(receive_timeout_)
-    , handshake_timeout(handshake_timeout_)
-{
-}
-
-ConnectionTimeouts::ConnectionTimeouts(
-    Poco::Timespan connection_timeout_,
-    Poco::Timespan send_timeout_,
-    Poco::Timespan receive_timeout_,
-    Poco::Timespan tcp_keep_alive_timeout_,
-    Poco::Timespan http_keep_alive_timeout_,
-    Poco::Timespan handshake_timeout_)
-    : connection_timeout(connection_timeout_)
-    , send_timeout(send_timeout_)
-    , receive_timeout(receive_timeout_)
-    , tcp_keep_alive_timeout(tcp_keep_alive_timeout_)
-    , http_keep_alive_timeout(http_keep_alive_timeout_)
-    , secure_connection_timeout(connection_timeout)
-    , hedged_connection_timeout(receive_timeout_)
-    , receive_data_timeout(receive_timeout_)
-    , handshake_timeout(handshake_timeout_)
-{
-}
-
-ConnectionTimeouts::ConnectionTimeouts(
-    Poco::Timespan connection_timeout_,
-    Poco::Timespan send_timeout_,
-    Poco::Timespan receive_timeout_,
-    Poco::Timespan tcp_keep_alive_timeout_,
-    Poco::Timespan http_keep_alive_timeout_,
-    Poco::Timespan secure_connection_timeout_,
-    Poco::Timespan hedged_connection_timeout_,
-    Poco::Timespan receive_data_timeout_,
-    Poco::Timespan handshake_timeout_)
-    : connection_timeout(connection_timeout_)
-    , send_timeout(send_timeout_)
-    , receive_timeout(receive_timeout_)
-    , tcp_keep_alive_timeout(tcp_keep_alive_timeout_)
-    , http_keep_alive_timeout(http_keep_alive_timeout_)
-    , secure_connection_timeout(secure_connection_timeout_)
-    , hedged_connection_timeout(hedged_connection_timeout_)
-    , receive_data_timeout(receive_data_timeout_)
-    , handshake_timeout(handshake_timeout_)
-{
-}
-
 Poco::Timespan ConnectionTimeouts::saturate(Poco::Timespan timespan, Poco::Timespan limit)
 {
     if (limit.totalMicroseconds() == 0)
@@ -88,49 +13,36 @@ Poco::Timespan ConnectionTimeouts::saturate(Poco::Timespan timespan, Poco::Times
         return (timespan > limit) ? limit : timespan;
 }
 
-ConnectionTimeouts ConnectionTimeouts::getSaturated(Poco::Timespan limit) const
-{
-    return ConnectionTimeouts(saturate(connection_timeout, limit),
-                              saturate(send_timeout, limit),
-                              saturate(receive_timeout, limit),
-                              saturate(tcp_keep_alive_timeout, limit),
-                              saturate(http_keep_alive_timeout, limit),
-                              saturate(secure_connection_timeout, limit),
-                              saturate(hedged_connection_timeout, limit),
-                              saturate(receive_data_timeout, limit),
-                              saturate(handshake_timeout, limit));
-}
-
 /// Timeouts for the case when we have just single attempt to connect.
 ConnectionTimeouts ConnectionTimeouts::getTCPTimeoutsWithoutFailover(const Settings & settings)
 {
-    return ConnectionTimeouts(settings.connect_timeout, settings.send_timeout, settings.receive_timeout, settings.tcp_keep_alive_timeout, settings.handshake_timeout_ms);
+    return ConnectionTimeouts()
+        .withConnectionTimeout(settings.connect_timeout)
+        .withSendTimeout(settings.send_timeout)
+        .withReceiveTimeout(settings.receive_timeout)
+        .withTCPKeepAliveTimeout(settings.tcp_keep_alive_timeout)
+        .withHandshakeTimeout(settings.handshake_timeout_ms)
+        .withHedgedConnectionTimeout(settings.hedged_connection_timeout_ms)
+        .withReceiveDataTimeout(settings.receive_data_timeout_ms);
 }
 
 /// Timeouts for the case when we will try many addresses in a loop.
 ConnectionTimeouts ConnectionTimeouts::getTCPTimeoutsWithFailover(const Settings & settings)
 {
-    return ConnectionTimeouts(
-        settings.connect_timeout_with_failover_ms,
-        settings.send_timeout,
-        settings.receive_timeout,
-        settings.tcp_keep_alive_timeout,
-        0,
-        settings.connect_timeout_with_failover_secure_ms,
-        settings.hedged_connection_timeout_ms,
-        settings.receive_data_timeout_ms,
-        settings.handshake_timeout_ms);
+    return getTCPTimeoutsWithoutFailover(settings)
+        .withUnsecureConnectionTimeout(settings.connect_timeout_with_failover_ms)
+        .withSecureConnectionTimeout(settings.connect_timeout_with_failover_secure_ms);
 }
 
 ConnectionTimeouts ConnectionTimeouts::getHTTPTimeouts(const Settings & settings, Poco::Timespan http_keep_alive_timeout)
 {
-    return ConnectionTimeouts(
-        settings.http_connection_timeout,
-        settings.http_send_timeout,
-        settings.http_receive_timeout,
-        settings.tcp_keep_alive_timeout,
-        http_keep_alive_timeout,
-        settings.http_receive_timeout);
+    return ConnectionTimeouts()
+        .withConnectionTimeout(settings.http_connection_timeout)
+        .withSendTimeout(settings.http_send_timeout)
+        .withReceiveTimeout(settings.http_receive_timeout)
+        .withHTTPKeepAliveTimeout(http_keep_alive_timeout)
+        .withTCPKeepAliveTimeout(settings.tcp_keep_alive_timeout)
+        .withHandshakeTimeout(settings.handshake_timeout_ms);
 }
 
 ConnectionTimeouts ConnectionTimeouts::getFetchPartHTTPTimeouts(const ServerSettings & server_settings, const Settings & user_settings)
@@ -224,11 +136,29 @@ ConnectionTimeouts ConnectionTimeouts::getAdaptiveTimeouts(const String & method
 
     auto [send, recv] = SendReceiveTimeoutsForFirstAttempt::getSendReceiveTimeout(method, first_byte);
 
-    auto aggressive = *this;
-    aggressive.send_timeout = saturate(send, send_timeout);
-    aggressive.receive_timeout = saturate(recv, receive_timeout);
+    return ConnectionTimeouts(*this)
+        .withSendTimeout(saturate(send, send_timeout))
+        .withReceiveTimeout(saturate(recv, receive_timeout));
+}
 
-    return aggressive;
+void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts)
+{
+    session.setTimeout(timeouts.connection_timeout, timeouts.send_timeout, timeouts.receive_timeout);
+    /// we can not change keep alive timeout for already initiated connections
+    if (!session.connected())
+    {
+        session.setKeepAliveTimeout(timeouts.http_keep_alive_timeout);
+        session.setKeepAliveMaxRequests(int(timeouts.http_keep_alive_max_requests));
+    }
+}
+
+ConnectionTimeouts getTimeouts(const Poco::Net::HTTPClientSession & session)
+{
+    return ConnectionTimeouts()
+            .withConnectionTimeout(session.getConnectionTimeout())
+            .withSendTimeout(session.getSendTimeout())
+            .withReceiveTimeout(session.getReceiveTimeout())
+            .withHTTPKeepAliveTimeout(session.getKeepAliveTimeout());
 }
 
 }
diff --git a/src/IO/ConnectionTimeouts.h b/src/IO/ConnectionTimeouts.h
index 42c4312d1d8..b86ec44d21c 100644
--- a/src/IO/ConnectionTimeouts.h
+++ b/src/IO/ConnectionTimeouts.h
@@ -4,6 +4,7 @@
 #include <Core/ServerSettings.h>
 #include <Interpreters/Context_fwd.h>
 
+#include <Poco/Net/HTTPClientSession.h>
 #include <Poco/Timespan.h>
 
 namespace DB
@@ -11,54 +12,42 @@ namespace DB
 
 struct Settings;
 
+#define APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS(M) \
+    M(connection_timeout, withUnsecureConnectionTimeout) \
+    M(secure_connection_timeout, withSecureConnectionTimeout) \
+    M(send_timeout, withSendTimeout) \
+    M(receive_timeout, withReceiveTimeout) \
+    M(tcp_keep_alive_timeout, withTCPKeepAliveTimeout) \
+    M(http_keep_alive_timeout, withHTTPKeepAliveTimeout) \
+    M(hedged_connection_timeout, withHedgedConnectionTimeout) \
+    M(receive_data_timeout, withReceiveDataTimeout) \
+    M(handshake_timeout, withHandshakeTimeout) \
+    M(sync_request_timeout, withSyncRequestTimeout) \
+
+
 struct ConnectionTimeouts
 {
-    Poco::Timespan connection_timeout;
-    Poco::Timespan send_timeout;
-    Poco::Timespan receive_timeout;
-    Poco::Timespan tcp_keep_alive_timeout;
-    Poco::Timespan http_keep_alive_timeout;
-    Poco::Timespan secure_connection_timeout;
+    Poco::Timespan connection_timeout = Poco::Timespan(DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, 0);
+    Poco::Timespan secure_connection_timeout = Poco::Timespan(DBMS_DEFAULT_CONNECT_TIMEOUT_SEC, 0);
+
+    Poco::Timespan send_timeout = Poco::Timespan(DBMS_DEFAULT_SEND_TIMEOUT_SEC, 0);
+    Poco::Timespan receive_timeout = Poco::Timespan(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, 0);
+
+    Poco::Timespan tcp_keep_alive_timeout = Poco::Timespan(DEFAULT_TCP_KEEP_ALIVE_TIMEOUT, 0);
+    Poco::Timespan http_keep_alive_timeout = Poco::Timespan(DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT, 0);
+    size_t http_keep_alive_max_requests = DEFAULT_HTTP_KEEP_ALIVE_MAX_REQUEST;
+
 
     /// Timeouts for HedgedConnections
-    Poco::Timespan hedged_connection_timeout;
-    Poco::Timespan receive_data_timeout;
-
+    Poco::Timespan hedged_connection_timeout = Poco::Timespan(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, 0);
+    Poco::Timespan receive_data_timeout = Poco::Timespan(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, 0);
     /// Timeout for receiving HELLO packet
-    Poco::Timespan handshake_timeout;
-
+    Poco::Timespan handshake_timeout = Poco::Timespan(DBMS_DEFAULT_RECEIVE_TIMEOUT_SEC, 0);
     /// Timeout for synchronous request-result protocol call (like Ping or TablesStatus)
     Poco::Timespan sync_request_timeout = Poco::Timespan(DBMS_DEFAULT_SYNC_REQUEST_TIMEOUT_SEC, 0);
 
     ConnectionTimeouts() = default;
 
-    ConnectionTimeouts(Poco::Timespan connection_timeout_,
-                       Poco::Timespan send_timeout_,
-                       Poco::Timespan receive_timeout_);
-
-    ConnectionTimeouts(Poco::Timespan connection_timeout_,
-                       Poco::Timespan send_timeout_,
-                       Poco::Timespan receive_timeout_,
-                       Poco::Timespan tcp_keep_alive_timeout_,
-                       Poco::Timespan handshake_timeout_);
-
-    ConnectionTimeouts(Poco::Timespan connection_timeout_,
-                       Poco::Timespan send_timeout_,
-                       Poco::Timespan receive_timeout_,
-                       Poco::Timespan tcp_keep_alive_timeout_,
-                       Poco::Timespan http_keep_alive_timeout_,
-                       Poco::Timespan handshake_timeout_);
-
-    ConnectionTimeouts(Poco::Timespan connection_timeout_,
-                       Poco::Timespan send_timeout_,
-                       Poco::Timespan receive_timeout_,
-                       Poco::Timespan tcp_keep_alive_timeout_,
-                       Poco::Timespan http_keep_alive_timeout_,
-                       Poco::Timespan secure_connection_timeout_,
-                       Poco::Timespan hedged_connection_timeout_,
-                       Poco::Timespan receive_data_timeout_,
-                       Poco::Timespan handshake_timeout_);
-
     static Poco::Timespan saturate(Poco::Timespan timespan, Poco::Timespan limit);
     ConnectionTimeouts getSaturated(Poco::Timespan limit) const;
 
@@ -72,6 +61,69 @@ struct ConnectionTimeouts
     static ConnectionTimeouts getFetchPartHTTPTimeouts(const ServerSettings & server_settings, const Settings & user_settings);
 
     ConnectionTimeouts getAdaptiveTimeouts(const String & method, bool first_attempt, bool first_byte) const;
+
+#define DECLARE_BUILDER_FOR_MEMBER(member, setter_func) \
+    ConnectionTimeouts & setter_func(size_t seconds); \
+    ConnectionTimeouts & setter_func(Poco::Timespan span); \
+
+APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS(DECLARE_BUILDER_FOR_MEMBER)
+#undef DECLARE_BUILDER_FOR_MEMBER
+
+    ConnectionTimeouts & withConnectionTimeout(size_t seconds);
+    ConnectionTimeouts & withConnectionTimeout(Poco::Timespan span);
+    ConnectionTimeouts & withHTTPKeepAliveMaxRequests(size_t requests);
 };
 
+/// NOLINTBEGIN(bugprone-macro-parentheses)
+#define DEFINE_BUILDER_FOR_MEMBER(member, setter_func) \
+    inline ConnectionTimeouts & ConnectionTimeouts::setter_func(size_t seconds) \
+    { \
+        return setter_func(Poco::Timespan(seconds, 0)); \
+    } \
+    inline ConnectionTimeouts & ConnectionTimeouts::setter_func(Poco::Timespan span) \
+    { \
+        member = span; \
+        return *this; \
+    } \
+
+    APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS(DEFINE_BUILDER_FOR_MEMBER)
+/// NOLINTEND(bugprone-macro-parentheses)
+
+#undef DEFINE_BUILDER_FOR_MEMBER
+
+
+inline ConnectionTimeouts ConnectionTimeouts::getSaturated(Poco::Timespan limit) const
+{
+#define SATURATE_MEMBER(member, setter_func) \
+    .setter_func(saturate(member, limit))
+
+    return ConnectionTimeouts(*this)
+APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS(SATURATE_MEMBER);
+
+#undef SATURETE_MEMBER
+}
+
+#undef APPLY_FOR_ALL_CONNECTION_TIMEOUT_MEMBERS
+
+inline ConnectionTimeouts & ConnectionTimeouts::withConnectionTimeout(size_t seconds)
+{
+    return withConnectionTimeout(Poco::Timespan(seconds, 0));
+}
+
+inline ConnectionTimeouts & ConnectionTimeouts::withConnectionTimeout(Poco::Timespan span)
+{
+    connection_timeout = span;
+    secure_connection_timeout = span;
+    return *this;
+}
+
+inline ConnectionTimeouts & ConnectionTimeouts::withHTTPKeepAliveMaxRequests(size_t requests)
+{
+    http_keep_alive_max_requests = requests;
+    return *this;
+}
+
+void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts);
+ConnectionTimeouts getTimeouts(const Poco::Net::HTTPClientSession & session);
+
 }
diff --git a/src/IO/DoubleConverter.h b/src/IO/DoubleConverter.h
index 18cbe4e3a1d..45721da5248 100644
--- a/src/IO/DoubleConverter.h
+++ b/src/IO/DoubleConverter.h
@@ -1,17 +1,13 @@
 #pragma once
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdouble-promotion"
-#endif
 
 #include <base/defines.h>
 #include <double-conversion/double-conversion.h>
 #include <boost/noncopyable.hpp>
 
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
 
 
 namespace DB
diff --git a/src/IO/HTTPCommon.cpp b/src/IO/HTTPCommon.cpp
index cce394c67c9..6e1c886b9b0 100644
--- a/src/IO/HTTPCommon.cpp
+++ b/src/IO/HTTPCommon.cpp
@@ -2,13 +2,7 @@
 
 #include <Server/HTTP/HTTPServerResponse.h>
 #include <Poco/Any.h>
-#include <Common/Concepts.h>
-#include <Common/DNSResolver.h>
 #include <Common/Exception.h>
-#include <Common/MemoryTrackerSwitcher.h>
-#include <Common/PoolBase.h>
-#include <Common/ProfileEvents.h>
-#include <Common/SipHash.h>
 
 #include "config.h"
 
@@ -25,338 +19,19 @@
 
 #include <Poco/Util/Application.h>
 
+#include <istream>
 #include <sstream>
-#include <tuple>
 #include <unordered_map>
 #include <Common/ProxyConfiguration.h>
 
 
-namespace ProfileEvents
-{
-    extern const Event CreatedHTTPConnections;
-}
-
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int RECEIVED_ERROR_FROM_REMOTE_IO_SERVER;
     extern const int RECEIVED_ERROR_TOO_MANY_REQUESTS;
-    extern const int FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME;
-    extern const int UNSUPPORTED_URI_SCHEME;
-    extern const int LOGICAL_ERROR;
-}
-
-
-namespace
-{
-    Poco::Net::HTTPClientSession::ProxyConfig proxyConfigurationToPocoProxyConfig(const ProxyConfiguration & proxy_configuration)
-    {
-        Poco::Net::HTTPClientSession::ProxyConfig poco_proxy_config;
-
-        poco_proxy_config.host = proxy_configuration.host;
-        poco_proxy_config.port = proxy_configuration.port;
-        poco_proxy_config.protocol = ProxyConfiguration::protocolToString(proxy_configuration.protocol);
-        poco_proxy_config.tunnel = proxy_configuration.tunneling;
-        poco_proxy_config.originalRequestProtocol = ProxyConfiguration::protocolToString(proxy_configuration.original_request_protocol);
-
-        return poco_proxy_config;
-    }
-
-    template <typename Session>
-    requires std::derived_from<Session, Poco::Net::HTTPClientSession>
-    class HTTPSessionAdapter : public Session
-    {
-        static_assert(std::has_virtual_destructor_v<Session>, "The base class must have a virtual destructor");
-
-    public:
-        HTTPSessionAdapter(const std::string & host, UInt16 port) : Session(host, port), log{&Poco::Logger::get("HTTPSessionAdapter")} { }
-        ~HTTPSessionAdapter() override = default;
-
-    protected:
-        void reconnect() override
-        {
-            // First of all will try to establish connection with last used addr.
-            if (!Session::getResolvedHost().empty())
-            {
-                try
-                {
-                    Session::reconnect();
-                    return;
-                }
-                catch (...)
-                {
-                    Session::close();
-                    LOG_TRACE(
-                        log,
-                        "Last ip ({}) is unreachable for {}:{}. Will try another resolved address.",
-                        Session::getResolvedHost(),
-                        Session::getHost(),
-                        Session::getPort());
-                }
-            }
-
-            const auto endpoinds = DNSResolver::instance().resolveHostAll(Session::getHost());
-
-            for (auto it = endpoinds.begin();;)
-            {
-                try
-                {
-                    Session::setResolvedHost(it->toString());
-                    Session::reconnect();
-
-                    LOG_TRACE(
-                        log,
-                        "Created HTTP(S) session with {}:{} ({}:{})",
-                        Session::getHost(),
-                        Session::getPort(),
-                        it->toString(),
-                        Session::getPort());
-
-                    break;
-                }
-                catch (...)
-                {
-                    Session::close();
-                    if (++it == endpoinds.end())
-                    {
-                        Session::setResolvedHost("");
-                        throw;
-                    }
-                    LOG_TRACE(
-                        log,
-                        "Failed to create connection with {}:{}, Will try another resolved address. {}",
-                        Session::getResolvedHost(),
-                        Session::getPort(),
-                        getCurrentExceptionMessage(false));
-                }
-            }
-        }
-        Poco::Logger * log;
-    };
-
-    bool isHTTPS(const Poco::URI & uri)
-    {
-        if (uri.getScheme() == "https")
-            return true;
-        else if (uri.getScheme() == "http")
-            return false;
-        else
-            throw Exception(ErrorCodes::UNSUPPORTED_URI_SCHEME, "Unsupported scheme in URI '{}'", uri.toString());
-    }
-
-    HTTPSessionPtr makeHTTPSessionImpl(
-        const std::string & host,
-        UInt16 port,
-        bool https,
-        bool keep_alive,
-        DB::ProxyConfiguration proxy_configuration = {})
-    {
-        HTTPSessionPtr session;
-
-        if (!proxy_configuration.host.empty())
-        {
-            bool is_proxy_http_and_is_tunneling_off = DB::ProxyConfiguration::Protocol::HTTP == proxy_configuration.protocol
-                && !proxy_configuration.tunneling;
-
-            // If it is an HTTPS request, proxy server is HTTP and user opted for tunneling off, we must not create an HTTPS request.
-            // The desired flow is: HTTP request to the proxy server, then proxy server will initiate an HTTPS request to the target server.
-            // There is a weak link in the security, but that's what the user opted for.
-            if (https && is_proxy_http_and_is_tunneling_off)
-            {
-                https = false;
-            }
-        }
-
-        if (https)
-        {
-#if USE_SSL
-            session = std::make_shared<HTTPSessionAdapter<Poco::Net::HTTPSClientSession>>(host, port);
-#else
-            throw Exception(ErrorCodes::FEATURE_IS_NOT_ENABLED_AT_BUILD_TIME, "ClickHouse was built without HTTPS support");
-#endif
-        }
-        else
-        {
-            session = std::make_shared<HTTPSessionAdapter<Poco::Net::HTTPClientSession>>(host, port);
-        }
-
-        ProfileEvents::increment(ProfileEvents::CreatedHTTPConnections);
-
-        /// doesn't work properly without patch
-        session->setKeepAlive(keep_alive);
-
-        if (!proxy_configuration.host.empty())
-        {
-            session->setProxyConfig(proxyConfigurationToPocoProxyConfig(proxy_configuration));
-        }
-
-        return session;
-    }
-
-    class SingleEndpointHTTPSessionPool : public PoolBase<Poco::Net::HTTPClientSession>
-    {
-    private:
-        const std::string host;
-        const UInt16 port;
-        const bool https;
-        ProxyConfiguration proxy_config;
-
-        using Base = PoolBase<Poco::Net::HTTPClientSession>;
-
-        ObjectPtr allocObject() override
-        {
-            /// Pool is global, we shouldn't attribute this memory to query/user.
-            MemoryTrackerSwitcher switcher{&total_memory_tracker};
-
-            auto session = makeHTTPSessionImpl(host, port, https, true, proxy_config);
-            return session;
-        }
-
-    public:
-        SingleEndpointHTTPSessionPool(
-            const std::string & host_,
-            UInt16 port_,
-            bool https_,
-            ProxyConfiguration proxy_config_,
-            size_t max_pool_size_,
-            bool wait_on_pool_size_limit)
-            : Base(
-                static_cast<unsigned>(max_pool_size_),
-                &Poco::Logger::get("HTTPSessionPool"),
-                wait_on_pool_size_limit ? BehaviourOnLimit::Wait : BehaviourOnLimit::AllocateNewBypassingPool)
-            , host(host_)
-            , port(port_)
-            , https(https_)
-            , proxy_config(proxy_config_)
-        {
-        }
-    };
-
-    class HTTPSessionPool : private boost::noncopyable
-    {
-    public:
-        struct Key
-        {
-            String target_host;
-            UInt16 target_port;
-            bool is_target_https;
-            ProxyConfiguration proxy_config;
-            bool wait_on_pool_size_limit;
-
-            bool operator ==(const Key & rhs) const
-            {
-                return std::tie(
-                           target_host,
-                           target_port,
-                           is_target_https,
-                           proxy_config.host,
-                           proxy_config.port,
-                           proxy_config.protocol,
-                           proxy_config.tunneling,
-                           proxy_config.original_request_protocol,
-                           wait_on_pool_size_limit)
-                    == std::tie(
-                           rhs.target_host,
-                           rhs.target_port,
-                           rhs.is_target_https,
-                           rhs.proxy_config.host,
-                           rhs.proxy_config.port,
-                           rhs.proxy_config.protocol,
-                           rhs.proxy_config.tunneling,
-                           rhs.proxy_config.original_request_protocol,
-                           rhs.wait_on_pool_size_limit);
-            }
-        };
-
-    private:
-        using PoolPtr = std::shared_ptr<SingleEndpointHTTPSessionPool>;
-        using Entry = SingleEndpointHTTPSessionPool::Entry;
-
-        struct Hasher
-        {
-            size_t operator()(const Key & k) const
-            {
-                SipHash s;
-                s.update(k.target_host);
-                s.update(k.target_port);
-                s.update(k.is_target_https);
-                s.update(k.proxy_config.host);
-                s.update(k.proxy_config.port);
-                s.update(k.proxy_config.protocol);
-                s.update(k.proxy_config.tunneling);
-                s.update(k.proxy_config.original_request_protocol);
-                s.update(k.wait_on_pool_size_limit);
-                return s.get64();
-            }
-        };
-
-        std::mutex mutex;
-        std::unordered_map<Key, PoolPtr, Hasher> endpoints_pool;
-
-    protected:
-        HTTPSessionPool() = default;
-
-    public:
-        static auto & instance()
-        {
-            static HTTPSessionPool instance;
-            return instance;
-        }
-
-        Entry getSession(
-            const Poco::URI & uri,
-            const ProxyConfiguration & proxy_config,
-            const ConnectionTimeouts & timeouts,
-            size_t max_connections_per_endpoint,
-            bool wait_on_pool_size_limit)
-        {
-            std::unique_lock lock(mutex);
-            const std::string & host = uri.getHost();
-            UInt16 port = uri.getPort();
-            bool https = isHTTPS(uri);
-
-            HTTPSessionPool::Key key{host, port, https, proxy_config, wait_on_pool_size_limit};
-            auto pool_ptr = endpoints_pool.find(key);
-            if (pool_ptr == endpoints_pool.end())
-                std::tie(pool_ptr, std::ignore) = endpoints_pool.emplace(
-                    key,
-                    std::make_shared<SingleEndpointHTTPSessionPool>(
-                        host,
-                        port,
-                        https,
-                        proxy_config,
-                        max_connections_per_endpoint,
-                        wait_on_pool_size_limit));
-
-            /// Some routines held session objects until the end of its lifetime. Also this routines may create another sessions in this time frame.
-            /// If some other session holds `lock` because it waits on another lock inside `pool_ptr->second->get` it isn't possible to create any
-            /// new session and thus finish routine, return session to the pool and unlock the thread waiting inside `pool_ptr->second->get`.
-            /// To avoid such a deadlock we unlock `lock` before entering `pool_ptr->second->get`.
-            lock.unlock();
-
-            auto retry_timeout = timeouts.connection_timeout.totalMilliseconds();
-            auto session = pool_ptr->second->get(retry_timeout);
-
-            const auto & session_data = session->sessionData();
-            if (session_data.empty() || !Poco::AnyCast<HTTPSessionReuseTag>(&session_data))
-            {
-                /// Reset session if it is not reusable. See comment for HTTPSessionReuseTag.
-                session->reset();
-            }
-            session->attachSessionData({});
-
-            setTimeouts(*session, timeouts);
-
-            return session;
-        }
-    };
-}
-
-void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts)
-{
-    session.setTimeout(timeouts.connection_timeout, timeouts.send_timeout, timeouts.receive_timeout);
-    session.setKeepAliveTimeout(timeouts.http_keep_alive_timeout);
 }
 
 void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout)
@@ -370,28 +45,13 @@ void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_
 }
 
 HTTPSessionPtr makeHTTPSession(
+    HTTPConnectionGroupType group,
     const Poco::URI & uri,
     const ConnectionTimeouts & timeouts,
-    ProxyConfiguration proxy_configuration
-)
+    ProxyConfiguration proxy_configuration)
 {
-    const std::string & host = uri.getHost();
-    UInt16 port = uri.getPort();
-    bool https = isHTTPS(uri);
-
-    auto session = makeHTTPSessionImpl(host, port, https, false, proxy_configuration);
-    setTimeouts(*session, timeouts);
-    return session;
-}
-
-PooledHTTPSessionPtr makePooledHTTPSession(
-    const Poco::URI & uri,
-    const ConnectionTimeouts & timeouts,
-    size_t per_endpoint_pool_size,
-    bool wait_on_pool_size_limit,
-    ProxyConfiguration proxy_config)
-{
-    return HTTPSessionPool::instance().getSession(uri, proxy_config, timeouts, per_endpoint_pool_size, wait_on_pool_size_limit);
+    auto connection_pool = HTTPConnectionPools::instance().getPool(group, uri, proxy_configuration);
+    return connection_pool->getConnection(timeouts);
 }
 
 bool isRedirect(const Poco::Net::HTTPResponse::HTTPStatus status) { return status == Poco::Net::HTTPResponse::HTTP_MOVED_PERMANENTLY  || status == Poco::Net::HTTPResponse::HTTP_FOUND || status == Poco::Net::HTTPResponse::HTTP_SEE_OTHER  || status == Poco::Net::HTTPResponse::HTTP_TEMPORARY_REDIRECT; }
@@ -400,11 +60,11 @@ std::istream * receiveResponse(
     Poco::Net::HTTPClientSession & session, const Poco::Net::HTTPRequest & request, Poco::Net::HTTPResponse & response, const bool allow_redirects)
 {
     auto & istr = session.receiveResponse(response);
-    assertResponseIsOk(request, response, istr, allow_redirects);
+    assertResponseIsOk(request.getURI(), response, istr, allow_redirects);
     return &istr;
 }
 
-void assertResponseIsOk(const Poco::Net::HTTPRequest & request, Poco::Net::HTTPResponse & response, std::istream & istr, const bool allow_redirects)
+void assertResponseIsOk(const String & uri, Poco::Net::HTTPResponse & response, std::istream & istr, const bool allow_redirects)
 {
     auto status = response.getStatus();
 
@@ -422,7 +82,7 @@ void assertResponseIsOk(const Poco::Net::HTTPRequest & request, Poco::Net::HTTPR
         body.exceptions(std::ios::failbit);
         body << istr.rdbuf();
 
-        throw HTTPException(code, request.getURI(), status, response.getReason(), body.str());
+        throw HTTPException(code, uri, status, response.getReason(), body.str());
     }
 }
 
@@ -440,24 +100,4 @@ Exception HTTPException::makeExceptionMessage(
         uri, static_cast<int>(http_status), reason, body);
 }
 
-void markSessionForReuse(Poco::Net::HTTPSession & session)
-{
-    const auto & session_data = session.sessionData();
-    if (!session_data.empty() && !Poco::AnyCast<HTTPSessionReuseTag>(&session_data))
-        throw Exception(
-            ErrorCodes::LOGICAL_ERROR, "Data of an unexpected type ({}) is attached to the session", session_data.type().name());
-
-    session.attachSessionData(HTTPSessionReuseTag{});
-}
-
-void markSessionForReuse(HTTPSessionPtr session)
-{
-    markSessionForReuse(*session);
-}
-
-void markSessionForReuse(PooledHTTPSessionPtr session)
-{
-    markSessionForReuse(static_cast<Poco::Net::HTTPSession &>(*session));
-}
-
 }
diff --git a/src/IO/HTTPCommon.h b/src/IO/HTTPCommon.h
index c9968fc6915..63dffcf6878 100644
--- a/src/IO/HTTPCommon.h
+++ b/src/IO/HTTPCommon.h
@@ -7,9 +7,9 @@
 #include <Poco/Net/HTTPRequest.h>
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/URI.h>
-#include <Common/PoolBase.h>
-#include <Common/ProxyConfiguration.h>
 #include <Poco/URIStreamFactory.h>
+#include <Common/HTTPConnectionPool.h>
+#include <Common/ProxyConfiguration.h>
 
 #include <IO/ConnectionTimeouts.h>
 
@@ -34,9 +34,9 @@ public:
     {}
 
     HTTPException * clone() const override { return new HTTPException(*this); }
-    void rethrow() const override { throw *this; }
+    void rethrow() const override { throw *this; } /// NOLINT(cert-err60-cpp)
 
-    int getHTTPStatus() const { return http_status; }
+    Poco::Net::HTTPResponse::HTTPStatus getHTTPStatus() const { return http_status; }
 
 private:
     Poco::Net::HTTPResponse::HTTPStatus http_status{};
@@ -52,55 +52,18 @@ private:
     const char * className() const noexcept override { return "DB::HTTPException"; }
 };
 
-using PooledHTTPSessionPtr = PoolBase<Poco::Net::HTTPClientSession>::Entry; // SingleEndpointHTTPSessionPool::Entry
 using HTTPSessionPtr = std::shared_ptr<Poco::Net::HTTPClientSession>;
 
-/// If a session have this tag attached, it will be reused without calling `reset()` on it.
-/// All pooled sessions don't have this tag attached after being taken from a pool.
-/// If the request and the response were fully written/read, the client code should add this tag
-/// explicitly by calling `markSessionForReuse()`.
-///
-/// Note that HTTP response may contain extra bytes after the last byte of the payload. Specifically,
-/// when chunked encoding is used, there's an empty chunk at the end. Those extra bytes must also be
-/// read before the session can be reused. So we usually put an `istr->ignore(INT64_MAX)` call
-/// before `markSessionForReuse()`.
-struct HTTPSessionReuseTag
-{
-};
-
-void markSessionForReuse(Poco::Net::HTTPSession & session);
-void markSessionForReuse(HTTPSessionPtr session);
-void markSessionForReuse(PooledHTTPSessionPtr session);
-
-
 void setResponseDefaultHeaders(HTTPServerResponse & response, size_t keep_alive_timeout);
 
 /// Create session object to perform requests and set required parameters.
 HTTPSessionPtr makeHTTPSession(
+    HTTPConnectionGroupType group,
     const Poco::URI & uri,
     const ConnectionTimeouts & timeouts,
     ProxyConfiguration proxy_config = {}
 );
 
-/// As previous method creates session, but takes it from pool, without and with proxy uri.
-///
-/// The max_connections_per_endpoint parameter makes it look like the pool size can be different for
-/// different requests (whatever that means), but actually we just assign the endpoint's connection
-/// pool size when we see the endpoint for the first time, then we never change it.
-/// We should probably change how this configuration works, and how this pooling works in general:
-///  * Make the per_endpoint_pool_size be a global server setting instead of per-disk or per-query.
-///  * Have boolean per-disk/per-query settings for enabling/disabling pooling.
-///  * Add a limit on the number of endpoints and the total number of sessions across all endpoints.
-///  * Enable pooling by default everywhere. In particular StorageURL and StorageS3.
-///    (Enabling it for StorageURL is scary without the previous item - the user may query lots of
-///     different endpoints. So currently pooling is mainly used for S3.)
-PooledHTTPSessionPtr makePooledHTTPSession(
-    const Poco::URI & uri,
-    const ConnectionTimeouts & timeouts,
-    size_t per_endpoint_pool_size,
-    bool wait_on_pool_size_limit = true,
-    ProxyConfiguration proxy_config = {});
-
 bool isRedirect(Poco::Net::HTTPResponse::HTTPStatus status);
 
 /** Used to receive response (response headers and possibly body)
@@ -112,7 +75,6 @@ std::istream * receiveResponse(
     Poco::Net::HTTPClientSession & session, const Poco::Net::HTTPRequest & request, Poco::Net::HTTPResponse & response, bool allow_redirects);
 
 void assertResponseIsOk(
-    const Poco::Net::HTTPRequest & request, Poco::Net::HTTPResponse & response, std::istream & istr, bool allow_redirects = false);
+    const String & uri, Poco::Net::HTTPResponse & response, std::istream & istr, bool allow_redirects = false);
 
-void setTimeouts(Poco::Net::HTTPClientSession & session, const ConnectionTimeouts & timeouts);
 }
diff --git a/src/IO/LZMADeflatingWriteBuffer.h b/src/IO/LZMADeflatingWriteBuffer.h
index 797b85cd400..a3bcad7603c 100644
--- a/src/IO/LZMADeflatingWriteBuffer.h
+++ b/src/IO/LZMADeflatingWriteBuffer.h
@@ -19,10 +19,10 @@ public:
         WriteBufferT && out_,
         int compression_level,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
+        char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
         size_t alignment = 0,
         bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_)
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_) /// NOLINT(bugprone-move-forwarding-reference)
     {
         initialize(compression_level);
     }
diff --git a/src/IO/LimitReadBuffer.cpp b/src/IO/LimitReadBuffer.cpp
index e14112f8d19..84c7ac86227 100644
--- a/src/IO/LimitReadBuffer.cpp
+++ b/src/IO/LimitReadBuffer.cpp
@@ -1,5 +1,4 @@
 #include <IO/LimitReadBuffer.h>
-
 #include <Common/Exception.h>
 
 
@@ -15,7 +14,7 @@ namespace ErrorCodes
 
 bool LimitReadBuffer::nextImpl()
 {
-    assert(position() >= in->position());
+    chassert(position() >= in->position());
 
     /// Let underlying buffer calculate read bytes in `next()` call.
     in->position() = position();
@@ -39,20 +38,18 @@ bool LimitReadBuffer::nextImpl()
         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);
+        BufferBase::set(in->position(), 0, 0);
+
         return false;
     }
 
-    working_buffer = in->buffer();
-
-    if (limit - bytes < working_buffer.size())
-        working_buffer.resize(limit - bytes);
+    BufferBase::set(in->position(), std::min(in->available(), limit - bytes), 0);
 
     return true;
 }
 
 
-LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_,
+LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, size_t limit_, bool throw_exception_,
                                  std::optional<size_t> exact_limit_, std::string exception_message_)
     : ReadBuffer(in_ ? in_->position() : nullptr, 0)
     , in(in_)
@@ -62,24 +59,20 @@ LimitReadBuffer::LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, boo
     , exact_limit(exact_limit_)
     , exception_message(std::move(exception_message_))
 {
-    assert(in);
+    chassert(in);
 
-    size_t remaining_bytes_in_buffer = in->buffer().end() - in->position();
-    if (remaining_bytes_in_buffer > limit)
-        remaining_bytes_in_buffer = limit;
-
-    working_buffer = Buffer(in->position(), in->position() + remaining_bytes_in_buffer);
+    BufferBase::set(in->position(), std::min(in->available(), limit), 0);
 }
 
 
-LimitReadBuffer::LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_,
+LimitReadBuffer::LimitReadBuffer(ReadBuffer & in_, size_t 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_,
+LimitReadBuffer::LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t 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 15885c1d850..b869f2935fb 100644
--- a/src/IO/LimitReadBuffer.h
+++ b/src/IO/LimitReadBuffer.h
@@ -13,22 +13,24 @@ namespace DB
 class LimitReadBuffer : public ReadBuffer
 {
 public:
-    LimitReadBuffer(ReadBuffer & in_, UInt64 limit_, bool throw_exception_,
+    LimitReadBuffer(ReadBuffer & in_, size_t 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_,
+    LimitReadBuffer(std::unique_ptr<ReadBuffer> in_, size_t limit_, bool throw_exception_, std::optional<size_t> exact_limit_,
                     std::string exception_message_ = {});
     ~LimitReadBuffer() override;
 
 private:
     ReadBuffer * in;
-    bool owns_in;
+    const bool owns_in;
 
-    UInt64 limit;
-    bool throw_exception;
-    std::optional<size_t> exact_limit;
-    std::string exception_message;
+    const size_t limit;
+    const bool throw_exception;
+    const std::optional<size_t> exact_limit;
+    const std::string exception_message;
 
-    LimitReadBuffer(ReadBuffer * in_, bool owns, UInt64 limit_, bool throw_exception_, std::optional<size_t> exact_limit_, std::string exception_message_);
+    LoggerPtr log;
+
+    LimitReadBuffer(ReadBuffer * in_, bool owns, size_t limit_, bool throw_exception_, std::optional<size_t> exact_limit_, std::string exception_message_);
 
     bool nextImpl() override;
 };
diff --git a/src/IO/Lz4DeflatingWriteBuffer.h b/src/IO/Lz4DeflatingWriteBuffer.h
index b37d61fa732..6efd092afd0 100644
--- a/src/IO/Lz4DeflatingWriteBuffer.h
+++ b/src/IO/Lz4DeflatingWriteBuffer.h
@@ -19,10 +19,10 @@ public:
         WriteBufferT && out_,
         int compression_level,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
+        char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
         size_t alignment = 0,
         bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment)
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment) /// NOLINT(bugprone-move-forwarding-reference)
     , tmp_memory(buf_size)
     , compress_empty(compress_empty_)
     {
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.cpp b/src/IO/MMapReadBufferFromFileDescriptor.cpp
index 9b1c132cc01..f27828f71b2 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.cpp
+++ b/src/IO/MMapReadBufferFromFileDescriptor.cpp
@@ -92,7 +92,7 @@ size_t MMapReadBufferFromFileDescriptor::getFileSize()
     return getSizeFromFileDescriptor(getFD(), getFileName());
 }
 
-size_t MMapReadBufferFromFileDescriptor::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &)
+size_t MMapReadBufferFromFileDescriptor::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) const
 {
     if (offset >= mapped.getLength())
         return 0;
diff --git a/src/IO/MMapReadBufferFromFileDescriptor.h b/src/IO/MMapReadBufferFromFileDescriptor.h
index 2a039e04971..f774538374a 100644
--- a/src/IO/MMapReadBufferFromFileDescriptor.h
+++ b/src/IO/MMapReadBufferFromFileDescriptor.h
@@ -40,7 +40,7 @@ public:
 
     size_t getFileSize() override;
 
-    size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) override;
+    size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) const override;
     bool supportsReadAt() override { return true; }
 };
 
diff --git a/src/IO/MMapReadBufferFromFileWithCache.cpp b/src/IO/MMapReadBufferFromFileWithCache.cpp
index d53f3bc325d..0cfb60d6527 100644
--- a/src/IO/MMapReadBufferFromFileWithCache.cpp
+++ b/src/IO/MMapReadBufferFromFileWithCache.cpp
@@ -26,7 +26,7 @@ void MMapReadBufferFromFileWithCache::init()
 MMapReadBufferFromFileWithCache::MMapReadBufferFromFileWithCache(
     MMappedFileCache & cache, const std::string & file_name, size_t offset, size_t length)
 {
-    mapped = cache.getOrSet(cache.hash(file_name, offset, length), [&]
+    mapped = cache.getOrSet(MMappedFileCache::hash(file_name, offset, length), [&]
     {
         return std::make_shared<MMappedFile>(file_name, offset, length);
     });
@@ -37,7 +37,7 @@ MMapReadBufferFromFileWithCache::MMapReadBufferFromFileWithCache(
 MMapReadBufferFromFileWithCache::MMapReadBufferFromFileWithCache(
     MMappedFileCache & cache, const std::string & file_name, size_t offset)
 {
-    mapped = cache.getOrSet(cache.hash(file_name, offset, -1), [&]
+    mapped = cache.getOrSet(MMappedFileCache::hash(file_name, offset, -1), [&]
     {
         return std::make_shared<MMappedFile>(file_name, offset);
     });
diff --git a/src/IO/OpenedFile.h b/src/IO/OpenedFile.h
index 10c36d9e1d3..4c4de2265bc 100644
--- a/src/IO/OpenedFile.h
+++ b/src/IO/OpenedFile.h
@@ -21,7 +21,7 @@ public:
     OpenedFile(const std::string & file_name_, int flags_);
     ~OpenedFile();
 
-    /// Close prematurally.
+    /// Close prematurely.
     void close();
 
     int getFD() const;
@@ -40,4 +40,3 @@ private:
 };
 
 }
-
diff --git a/src/IO/ParallelReadBuffer.cpp b/src/IO/ParallelReadBuffer.cpp
index 8d73f221748..cdeb8a18635 100644
--- a/src/IO/ParallelReadBuffer.cpp
+++ b/src/IO/ParallelReadBuffer.cpp
@@ -50,7 +50,7 @@ ParallelReadBuffer::ParallelReadBuffer(
     , file_size(file_size_)
     , range_step(std::max(1ul, range_step_))
 {
-    LOG_TRACE(&Poco::Logger::get("ParallelReadBuffer"), "Parallel reading is used");
+    LOG_TRACE(getLogger("ParallelReadBuffer"), "Parallel reading is used");
 
     try
     {
diff --git a/src/IO/ParallelReadBuffer.h b/src/IO/ParallelReadBuffer.h
index e76b40f77b7..daac1190399 100644
--- a/src/IO/ParallelReadBuffer.h
+++ b/src/IO/ParallelReadBuffer.h
@@ -3,7 +3,7 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/ReadBuffer.h>
 #include <IO/SeekableReadBuffer.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <Common/ArenaWithFreeLists.h>
 
 namespace DB
diff --git a/src/IO/Progress.h b/src/IO/Progress.h
index 0188f636f42..d0afc9d845f 100644
--- a/src/IO/Progress.h
+++ b/src/IO/Progress.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <atomic>
-#include <cstddef>
 #include <functional>
 #include <base/types.h>
 
diff --git a/src/IO/ReadBuffer.cpp b/src/IO/ReadBuffer.cpp
index bf054d08425..0d1cd322fdd 100644
--- a/src/IO/ReadBuffer.cpp
+++ b/src/IO/ReadBuffer.cpp
@@ -1,4 +1,5 @@
 #include <IO/ReadBuffer.h>
+#include <IO/ReadBufferWrapperBase.h>
 
 
 namespace DB
@@ -7,7 +8,7 @@ namespace DB
 namespace
 {
     template <typename CustomData>
-    class ReadBufferWrapper : public ReadBuffer
+    class ReadBufferWrapper : public ReadBuffer, public ReadBufferWrapperBase
     {
     public:
         ReadBufferWrapper(ReadBuffer & in_, CustomData && custom_data_)
@@ -15,6 +16,8 @@ namespace
         {
         }
 
+        const ReadBuffer & getWrappedReadBuffer() const override { return in; }
+
     private:
         ReadBuffer & in;
         CustomData custom_data;
diff --git a/src/IO/ReadBuffer.h b/src/IO/ReadBuffer.h
index b45bc8f3dbc..056e25a5fbe 100644
--- a/src/IO/ReadBuffer.h
+++ b/src/IO/ReadBuffer.h
@@ -63,21 +63,23 @@ public:
       */
     bool next()
     {
-        assert(!hasPendingData());
-        assert(position() <= working_buffer.end());
+        chassert(!hasPendingData());
+        chassert(position() <= working_buffer.end());
 
         bytes += offset();
         bool res = nextImpl();
         if (!res)
+        {
             working_buffer = Buffer(pos, pos);
+        }
         else
         {
-            pos = working_buffer.begin() + nextimpl_working_buffer_offset;
-            assert(position() != working_buffer.end());
+            pos = working_buffer.begin() + std::min(nextimpl_working_buffer_offset, working_buffer.size());
+            chassert(position() < working_buffer.end());
         }
         nextimpl_working_buffer_offset = 0;
 
-        assert(position() <= working_buffer.end());
+        chassert(position() <= working_buffer.end());
 
         return res;
     }
@@ -225,11 +227,22 @@ public:
      *  - 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.
+     * Implementations are recommended to:
+     *  - Allow the read-until-position to go below current position, e.g.:
+     *      // Read block [300, 400)
+     *      setReadUntilPosition(400);
+     *      seek(300);
+     *      next();
+     *      // Read block [100, 200)
+     *      setReadUntilPosition(200); // oh oh, this is below the current position, but should be allowed
+     *      seek(100); // but now everything's fine again
+     *      next();
+     *      // (Swapping the order of seek and setReadUntilPosition doesn't help: then it breaks if the order of blocks is reversed.)
+     *  - Check if new read-until-position value is equal to the current value and do nothing in this case,
+     *    so that the caller doesn't have to.
      *
-     * Typical usage is to call it right after creating the ReadBuffer, before it started doing any
-     * work.
+     * Typical implementations discard any current buffers and connections when the
+     * read-until-position changes even by a small (nonzero) amount.
      */
     virtual void setReadUntilPosition(size_t /* position */) {}
 
diff --git a/src/IO/ReadBufferFromFileBase.h b/src/IO/ReadBufferFromFileBase.h
index 296edf9c689..9870d8bbe43 100644
--- a/src/IO/ReadBufferFromFileBase.h
+++ b/src/IO/ReadBufferFromFileBase.h
@@ -58,7 +58,7 @@ public:
     /// I.e. it can be read using open() or mmap(). If this buffer is a "view" into a subrange of the
     /// file, *out_view_offset is set to the start of that subrange, i.e. the difference between actual
     /// file offset and what getPosition() returns.
-    virtual bool isRegularLocalFile(size_t * /* out_view_offset */ = nullptr) { return false; }
+    virtual bool isRegularLocalFile(size_t * /*out_view_offsee*/) { return false; }
 
 protected:
     std::optional<size_t> file_size;
diff --git a/src/IO/ReadBufferFromFileDescriptor.cpp b/src/IO/ReadBufferFromFileDescriptor.cpp
index 3211f8eeb35..57442a15853 100644
--- a/src/IO/ReadBufferFromFileDescriptor.cpp
+++ b/src/IO/ReadBufferFromFileDescriptor.cpp
@@ -49,7 +49,7 @@ std::string ReadBufferFromFileDescriptor::getFileName() const
 }
 
 
-size_t ReadBufferFromFileDescriptor::readImpl(char * to, size_t min_bytes, size_t max_bytes, size_t offset)
+size_t ReadBufferFromFileDescriptor::readImpl(char * to, size_t min_bytes, size_t max_bytes, size_t offset) const
 {
     chassert(min_bytes <= max_bytes);
 
@@ -265,7 +265,7 @@ bool ReadBufferFromFileDescriptor::checkIfActuallySeekable()
     return res == 0 && S_ISREG(stat.st_mode);
 }
 
-size_t ReadBufferFromFileDescriptor::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &)
+size_t ReadBufferFromFileDescriptor::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) const
 {
     chassert(use_pread);
     return readImpl(to, n, n, offset);
diff --git a/src/IO/ReadBufferFromFileDescriptor.h b/src/IO/ReadBufferFromFileDescriptor.h
index 4762998c67b..db256ef91c7 100644
--- a/src/IO/ReadBufferFromFileDescriptor.h
+++ b/src/IO/ReadBufferFromFileDescriptor.h
@@ -34,7 +34,7 @@ protected:
     /// Doesn't seek (`offset` must match fd's position if !use_pread).
     /// Stops after min_bytes or eof. Returns 0 if eof.
     /// Thread safe.
-    size_t readImpl(char * to, size_t min_bytes, size_t max_bytes, size_t offset);
+    size_t readImpl(char * to, size_t min_bytes, size_t max_bytes, size_t offset) const;
 
 public:
     explicit ReadBufferFromFileDescriptor(
@@ -73,7 +73,7 @@ public:
 
     bool checkIfActuallySeekable() override;
 
-    size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) override;
+    size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> &) const override;
     bool supportsReadAt() override { return use_pread; }
 };
 
diff --git a/src/IO/ReadBufferFromIStream.cpp b/src/IO/ReadBufferFromIStream.cpp
index 3b3bdb5c564..325beabaf81 100644
--- a/src/IO/ReadBufferFromIStream.cpp
+++ b/src/IO/ReadBufferFromIStream.cpp
@@ -1,44 +1,51 @@
 #include <IO/ReadBufferFromIStream.h>
 #include <Common/Exception.h>
 
+#include <istream>
+
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int CANNOT_READ_FROM_ISTREAM;
-}
-
 bool ReadBufferFromIStream::nextImpl()
 {
-    istr.read(internal_buffer.begin(), internal_buffer.size());
-    size_t gcount = istr.gcount();
+    if (eof)
+        return false;
 
-    if (!gcount)
+    chassert(internal_buffer.begin() != nullptr);
+    chassert(!internal_buffer.empty());
+
+    size_t bytes_read = 0;
+    char * read_to = internal_buffer.begin();
+
+    /// It is necessary to read in a loop, since socket usually returns only data available at the moment.
+    while (bytes_read < internal_buffer.size())
     {
-        if (istr.eof())
-            return false;
+        const auto bytes_read_last_time = stream_buf.readFromDevice(read_to, internal_buffer.size() - bytes_read);
+        if (bytes_read_last_time <= 0)
+        {
+            eof = true;
+            break;
+        }
 
-        if (istr.fail())
-            throw Exception(ErrorCodes::CANNOT_READ_FROM_ISTREAM, "Cannot read from istream at offset {}", count());
-
-        throw Exception(ErrorCodes::CANNOT_READ_FROM_ISTREAM, "Unexpected state of istream at offset {}", count());
+        bytes_read += bytes_read_last_time;
+        read_to += bytes_read_last_time;
     }
-    else
-        working_buffer.resize(gcount);
 
-    return true;
+    if (bytes_read)
+    {
+        working_buffer = internal_buffer;
+        working_buffer.resize(bytes_read);
+    }
+
+    return bytes_read;
 }
 
 ReadBufferFromIStream::ReadBufferFromIStream(std::istream & istr_, size_t size)
-    : BufferWithOwnMemory<ReadBuffer>(size), istr(istr_)
+    : BufferWithOwnMemory<ReadBuffer>(size)
+    , istr(istr_)
+    , stream_buf(dynamic_cast<Poco::Net::HTTPBasicStreamBuf &>(*istr.rdbuf()))
 {
-    /// - badbit will be set if some exception will be throw from ios implementation
-    /// - failbit can be set when for instance read() reads less data, so we
-    ///   cannot set it, since we are requesting to read more data, then the
-    ///   buffer has now.
-    istr.exceptions(std::ios::badbit);
 }
 
 }
diff --git a/src/IO/ReadBufferFromIStream.h b/src/IO/ReadBufferFromIStream.h
index 8c3f62728b5..50ed8c20c06 100644
--- a/src/IO/ReadBufferFromIStream.h
+++ b/src/IO/ReadBufferFromIStream.h
@@ -3,6 +3,8 @@
 #include <IO/ReadBuffer.h>
 #include <IO/BufferWithOwnMemory.h>
 
+#include <Poco/Net/HTTPBasicStreamBuf.h>
+
 
 namespace DB
 {
@@ -11,6 +13,8 @@ class ReadBufferFromIStream : public BufferWithOwnMemory<ReadBuffer>
 {
 private:
     std::istream & istr;
+    Poco::Net::HTTPBasicStreamBuf & stream_buf;
+    bool eof = false;
 
     bool nextImpl() override;
 
diff --git a/src/IO/ReadBufferFromS3.cpp b/src/IO/ReadBufferFromS3.cpp
index 619fd40edc3..491ff253066 100644
--- a/src/IO/ReadBufferFromS3.cpp
+++ b/src/IO/ReadBufferFromS3.cpp
@@ -6,7 +6,7 @@
 
 #include <IO/ReadBufferFromIStream.h>
 #include <IO/ReadBufferFromS3.h>
-#include <IO/ResourceGuard.h>
+#include <Common/Scheduler/ResourceGuard.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/Requests.h>
 
@@ -34,61 +34,6 @@ namespace ProfileEvents
     extern const Event RemoteReadThrottlerSleepMicroseconds;
 }
 
-namespace
-{
-DB::PooledHTTPSessionPtr getSession(Aws::S3::Model::GetObjectResult & read_result)
-{
-    if (auto * session_aware_stream = dynamic_cast<DB::S3::SessionAwareIOStream<DB::PooledHTTPSessionPtr> *>(&read_result.GetBody()))
-        return static_cast<DB::PooledHTTPSessionPtr &>(session_aware_stream->getSession());
-
-    if (dynamic_cast<DB::S3::SessionAwareIOStream<DB::HTTPSessionPtr> *>(&read_result.GetBody()))
-        return {};
-
-    /// accept result from S# mock in gtest_writebuffer_s3.cpp
-    if (dynamic_cast<Aws::Utils::Stream::DefaultUnderlyingStream *>(&read_result.GetBody()))
-        return {};
-
-    throw DB::Exception(DB::ErrorCodes::LOGICAL_ERROR, "Session of unexpected type encountered");
-}
-
-void resetSession(Aws::S3::Model::GetObjectResult & read_result)
-{
-    if (auto session = getSession(read_result); !session.isNull())
-    {
-        auto & http_session = static_cast<Poco::Net::HTTPClientSession &>(*session);
-        http_session.reset();
-    }
-}
-
-void resetSessionIfNeeded(bool read_all_range_successfully, std::optional<Aws::S3::Model::GetObjectResult> & read_result)
-{
-    if (!read_result)
-        return;
-
-    if (!read_all_range_successfully)
-    {
-        /// When we abandon a session with an ongoing GetObject request and there is another one trying to delete the same object this delete
-        /// operation will hang until GetObject's session idle timeouts. So we have to call `reset()` on GetObject's session session immediately.
-        resetSession(*read_result);
-        ProfileEvents::increment(ProfileEvents::ReadBufferFromS3ResetSessions);
-    }
-    else if (auto session = getSession(*read_result); !session.isNull())
-    {
-        if (!session->getProxyHost().empty())
-        {
-            /// Reset proxified sessions because proxy can change for every request. See ProxyConfigurationResolver.
-            resetSession(*read_result);
-            ProfileEvents::increment(ProfileEvents::ReadBufferFromS3ResetSessions);
-        }
-        else
-        {
-            DB::markSessionForReuse(session);
-            ProfileEvents::increment(ProfileEvents::ReadBufferFromS3PreservedSessions);
-        }
-    }
-}
-}
-
 namespace DB
 {
 namespace ErrorCodes
@@ -228,7 +173,7 @@ bool ReadBufferFromS3::nextImpl()
 }
 
 
-size_t ReadBufferFromS3::readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & progress_callback)
+size_t ReadBufferFromS3::readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & progress_callback) const
 {
     size_t initial_n = n;
     size_t sleep_time_with_backoff_milliseconds = 100;
@@ -240,29 +185,6 @@ size_t ReadBufferFromS3::readBigAt(char * to, size_t n, size_t range_begin, cons
         ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::ReadBufferFromS3Microseconds);
 
         std::optional<Aws::S3::Model::GetObjectResult> result;
-        /// Connection is reusable if we've read the full response.
-        bool session_is_reusable = false;
-        SCOPE_EXIT(
-        {
-            if (!result.has_value())
-                return;
-            if (session_is_reusable)
-            {
-                auto session = getSession(*result);
-                if (!session.isNull())
-                {
-                    DB::markSessionForReuse(session);
-                    ProfileEvents::increment(ProfileEvents::ReadBufferFromS3PreservedSessions);
-                }
-                else
-                    session_is_reusable = false;
-            }
-            if (!session_is_reusable)
-            {
-                resetSession(*result);
-                ProfileEvents::increment(ProfileEvents::ReadBufferFromS3ResetSessions);
-            }
-        });
 
         try
         {
@@ -276,9 +198,8 @@ size_t ReadBufferFromS3::readBigAt(char * to, size_t n, size_t range_begin, cons
             if (read_settings.remote_throttler)
                 read_settings.remote_throttler->add(bytes_copied, ProfileEvents::RemoteReadThrottlerBytes, ProfileEvents::RemoteReadThrottlerSleepMicroseconds);
 
-            /// Read remaining bytes after the end of the payload, see HTTPSessionReuseTag.
+            /// Read remaining bytes after the end of the payload
             istr.ignore(INT64_MAX);
-            session_is_reusable = true;
         }
         catch (Poco::Exception & e)
         {
@@ -451,21 +372,8 @@ bool ReadBufferFromS3::atEndOfRequestedRangeGuess()
     return false;
 }
 
-ReadBufferFromS3::~ReadBufferFromS3()
-{
-    try
-    {
-        resetSessionIfNeeded(readAllRangeSuccessfully(), read_result);
-    }
-    catch (...)
-    {
-        tryLogCurrentException(log);
-    }
-}
-
 std::unique_ptr<ReadBuffer> ReadBufferFromS3::initialize(size_t attempt)
 {
-    resetSessionIfNeeded(readAllRangeSuccessfully(), read_result);
     read_all_range_successfully = false;
 
     /**
@@ -534,10 +442,6 @@ Aws::S3::Model::GetObjectResult ReadBufferFromS3::sendRequest(size_t attempt, si
     }
 }
 
-bool ReadBufferFromS3::readAllRangeSuccessfully() const
-{
-    return read_until_position ? offset == read_until_position : read_all_range_successfully;
-}
 }
 
 #endif
diff --git a/src/IO/ReadBufferFromS3.h b/src/IO/ReadBufferFromS3.h
index 101e25f8b43..003c88df7d2 100644
--- a/src/IO/ReadBufferFromS3.h
+++ b/src/IO/ReadBufferFromS3.h
@@ -39,7 +39,7 @@ private:
     std::optional<Aws::S3::Model::GetObjectResult> read_result;
     std::unique_ptr<ReadBuffer> impl;
 
-    Poco::Logger * log = &Poco::Logger::get("ReadBufferFromS3");
+    LoggerPtr log = getLogger("ReadBufferFromS3");
 
 public:
     ReadBufferFromS3(
@@ -55,7 +55,7 @@ public:
         bool restricted_seek_ = false,
         std::optional<size_t> file_size = std::nullopt);
 
-    ~ReadBufferFromS3() override;
+    ~ReadBufferFromS3() override = default;
 
     bool nextImpl() override;
 
@@ -74,7 +74,7 @@ public:
 
     String getFileName() const override { return bucket + "/" + key; }
 
-    size_t readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & progress_callback) override;
+    size_t readBigAt(char * to, size_t n, size_t range_begin, const std::function<bool(size_t)> & progress_callback) const override;
 
     bool supportsReadAt() override { return true; }
 
@@ -90,8 +90,6 @@ private:
 
     Aws::S3::Model::GetObjectResult sendRequest(size_t attempt, size_t range_begin, std::optional<size_t> range_end_incl) const;
 
-    bool readAllRangeSuccessfully() const;
-
     ReadSettings read_settings;
 
     bool use_external_buffer;
diff --git a/src/IO/ReadBufferWrapperBase.h b/src/IO/ReadBufferWrapperBase.h
new file mode 100644
index 00000000000..1c594e8018a
--- /dev/null
+++ b/src/IO/ReadBufferWrapperBase.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <IO/ReadBuffer.h>
+
+namespace DB
+{
+
+class ReadBufferWrapperBase
+{
+public:
+    virtual const ReadBuffer & getWrappedReadBuffer() const = 0;
+    virtual ~ReadBufferWrapperBase() = default;
+};
+
+}
diff --git a/src/IO/ReadHelpers.cpp b/src/IO/ReadHelpers.cpp
index 05d35a57b12..68b61e96c51 100644
--- a/src/IO/ReadHelpers.cpp
+++ b/src/IO/ReadHelpers.cpp
@@ -6,6 +6,7 @@
 #include <Formats/FormatSettings.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/BufferWithOwnMemory.h>
+#include <IO/PeekableReadBuffer.h>
 #include <IO/readFloatText.h>
 #include <IO/Operators.h>
 #include <base/find_symbols.h>
@@ -379,7 +380,7 @@ bool parseComplexEscapeSequence(String & s, ReadBuffer & buf)
 }
 
 template <typename Vector, typename ReturnType>
-static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
+static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf, bool keep_bad_sequences)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -393,7 +394,11 @@ static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
     ++buf.position();
 
     if (buf.eof())
-        return error("Cannot parse escape sequence", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+    {
+        if (keep_bad_sequences)
+            return ReturnType(true);
+        return error("Cannot parse escape sequence: unexpected eof", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+    }
 
     assert(buf.hasPendingData());
 
@@ -428,8 +433,32 @@ static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
             ++buf.position();
 
             char hex_code[4];
-            if (4 != buf.read(hex_code, 4))
-                return error("Cannot parse escape sequence: less than four bytes after \\u", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+            if (keep_bad_sequences)
+            {
+                for (size_t i = 0; i != 4; ++i)
+                {
+                    if (buf.eof() || *buf.position() == '"')
+                    {
+                        /// Save initial data without parsing of escape sequence.
+                        s.push_back('\\');
+                        s.push_back('u');
+                        for (size_t j = 0; j != i; ++j)
+                            s.push_back(hex_code[j]);
+                        return ReturnType(true);
+                    }
+
+                    hex_code[i] = *buf.position();
+                    ++buf.position();
+                }
+            }
+            else
+            {
+                if (4 != buf.read(hex_code, 4))
+                    return error(
+                        "Cannot parse escape sequence: less than four bytes after \\u. In JSON input formats you can disable setting "
+                        "input_format_json_throw_on_bad_escape_sequence to save bad escape sequences as is",
+                        ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+            }
 
             /// \u0000 - special case
             if (0 == memcmp(hex_code, "0000", 4))
@@ -454,13 +483,70 @@ static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
                 /// Surrogate pair.
                 if (code_point >= 0xD800 && code_point <= 0xDBFF)
                 {
-                    if (!checkString("\\u", buf))
-                        return error("Cannot parse escape sequence: missing second part of surrogate pair", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+                    auto restore_first_unicode = [&]()
+                    {
+                        s.push_back('\\');
+                        s.push_back('u');
+                        for (char & c : hex_code)
+                            s.push_back(c);
+                    };
+
+                    if (keep_bad_sequences)
+                    {
+                        if (buf.eof() || *buf.position() != '\\')
+                        {
+                            restore_first_unicode();
+                            return ReturnType(true);
+                        }
+
+                        ++buf.position();
+                        if (buf.eof() || *buf.position() != 'u')
+                        {
+                            restore_first_unicode();
+                            s.push_back('\\');
+                            return ReturnType(true);
+                        }
+
+                        ++buf.position();
+                    }
+                    else
+                    {
+                        if (!checkString("\\u", buf))
+                            return error(
+                                "Cannot parse escape sequence: missing second part of surrogate pair. In JSON input formats you can "
+                                "disable setting input_format_json_throw_on_bad_escape_sequence to save bad escape sequences as is",
+                                ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+                    }
 
                     char second_hex_code[4];
-                    if (4 != buf.read(second_hex_code, 4))
-                        return error("Cannot parse escape sequence: less than four bytes after \\u of second part of surrogate pair",
-                            ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+                    if (keep_bad_sequences)
+                    {
+                        for (size_t i = 0; i != 4; ++i)
+                        {
+                            if (buf.eof() || *buf.position() == '"')
+                            {
+                                /// Save initial data without parsing of escape sequence.
+                                restore_first_unicode();
+                                s.push_back('\\');
+                                s.push_back('u');
+                                for (size_t j = 0; j != i; ++j)
+                                    s.push_back(second_hex_code[j]);
+                                return ReturnType(true);
+                            }
+
+                            second_hex_code[i] = *buf.position();
+                            ++buf.position();
+                        }
+                    }
+                    else
+                    {
+                        if (4 != buf.read(second_hex_code, 4))
+                            return error(
+                                "Cannot parse escape sequence: less than four bytes after \\u of second part of surrogate pair. In JSON "
+                                "input formats you can disable setting input_format_json_throw_on_bad_escape_sequence to save bad escape "
+                                "sequences as is",
+                                ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+                    }
 
                     UInt16 second_code_point = unhex4(second_hex_code);
 
@@ -474,7 +560,21 @@ static ReturnType parseJSONEscapeSequence(Vector & s, ReadBuffer & buf)
                         s.push_back((full_code_point & 0x3F) | 0x80);
                     }
                     else
-                        return error("Incorrect surrogate pair of unicode escape sequences in JSON", ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+                    {
+                        if (!keep_bad_sequences)
+                            return error(
+                                "Incorrect surrogate pair of unicode escape sequences in JSON. In JSON input formats you can disable "
+                                "setting input_format_json_throw_on_bad_escape_sequence to save bad escape sequences as is",
+                                ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE);
+
+                        /// Save initial data without parsing of escape sequence.
+                        restore_first_unicode();
+                        s.push_back('\\');
+                        s.push_back('u');
+                        for (char & c : second_hex_code)
+                            s.push_back(c);
+                        return ReturnType(true);
+                    }
                 }
                 else
                 {
@@ -619,13 +719,16 @@ void readQuotedStringInto(Vector & s, ReadBuffer & buf)
     readAnyQuotedStringInto<'\'', enable_sql_style_quoting>(s, buf);
 }
 
-template <typename Vector>
+template <bool enable_sql_style_quoting, typename Vector>
 bool tryReadQuotedStringInto(Vector & s, ReadBuffer & buf)
 {
-    return readAnyQuotedStringInto<'\'', false, Vector, bool>(s, buf);
+    return readAnyQuotedStringInto<'\'', enable_sql_style_quoting, Vector, bool>(s, buf);
 }
 
-template bool tryReadQuotedStringInto(String & s, ReadBuffer & buf);
+template bool tryReadQuotedStringInto<true, String>(String & s, ReadBuffer & buf);
+template bool tryReadQuotedStringInto<false, String>(String & s, ReadBuffer & buf);
+template bool tryReadQuotedStringInto<true, PaddedPODArray<UInt8>>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
+template bool tryReadQuotedStringInto<false, PaddedPODArray<UInt8>>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
 
 template <bool enable_sql_style_quoting, typename Vector>
 void readDoubleQuotedStringInto(Vector & s, ReadBuffer & buf)
@@ -633,6 +736,16 @@ void readDoubleQuotedStringInto(Vector & s, ReadBuffer & buf)
     readAnyQuotedStringInto<'"', enable_sql_style_quoting>(s, buf);
 }
 
+template <bool enable_sql_style_quoting, typename Vector>
+bool tryReadDoubleQuotedStringInto(Vector & s, ReadBuffer & buf)
+{
+    return readAnyQuotedStringInto<'"', enable_sql_style_quoting, Vector, bool>(s, buf);
+}
+
+template bool tryReadDoubleQuotedStringInto<true, String>(String & s, ReadBuffer & buf);
+template bool tryReadDoubleQuotedStringInto<false, String>(String & s, ReadBuffer & buf);
+
+
 template <bool enable_sql_style_quoting, typename Vector>
 void readBackQuotedStringInto(Vector & s, ReadBuffer & buf)
 {
@@ -652,6 +765,18 @@ void readQuotedStringWithSQLStyle(String & s, ReadBuffer & buf)
     readQuotedStringInto<true>(s, buf);
 }
 
+bool tryReadQuotedString(String & s, ReadBuffer & buf)
+{
+    s.clear();
+    return tryReadQuotedStringInto<false>(s, buf);
+}
+
+bool tryReadQuotedStringWithSQLStyle(String & s, ReadBuffer & buf)
+{
+    s.clear();
+    return tryReadQuotedStringInto<true>(s, buf);
+}
+
 
 template void readQuotedStringInto<true>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
 template void readQuotedStringInto<true>(String & s, ReadBuffer & buf);
@@ -672,6 +797,18 @@ void readDoubleQuotedStringWithSQLStyle(String & s, ReadBuffer & buf)
     readDoubleQuotedStringInto<true>(s, buf);
 }
 
+bool tryReadDoubleQuotedString(String & s, ReadBuffer & buf)
+{
+    s.clear();
+    return tryReadDoubleQuotedStringInto<false>(s, buf);
+}
+
+bool tryReadDoubleQuotedStringWithSQLStyle(String & s, ReadBuffer & buf)
+{
+    s.clear();
+    return tryReadDoubleQuotedStringInto<true>(s, buf);
+}
+
 void readBackQuotedString(String & s, ReadBuffer & buf)
 {
     s.clear();
@@ -691,7 +828,7 @@ concept WithResize = requires (T value)
     { value.size() } -> std::integral<>;
 };
 
-template <typename Vector, bool include_quotes>
+template <typename Vector, bool include_quotes, bool allow_throw>
 void readCSVStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::CSV & settings)
 {
     /// Empty string
@@ -754,12 +891,20 @@ void readCSVStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::CSV &
         {
             PeekableReadBuffer * peekable_buf = dynamic_cast<PeekableReadBuffer *>(&buf);
             if (!peekable_buf)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Reading CSV string with custom delimiter is allowed only when using PeekableReadBuffer");
+            {
+                if constexpr (allow_throw)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Reading CSV string with custom delimiter is allowed only when using PeekableReadBuffer");
+                return;
+            }
 
             while (true)
             {
                 if (peekable_buf->eof())
-                    throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF while reading CSV string, expected custom delimiter \"{}\"", custom_delimiter);
+                {
+                    if constexpr (allow_throw)
+                        throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF while reading CSV string, expected custom delimiter \"{}\"", custom_delimiter);
+                    return;
+                }
 
                 char * next_pos = reinterpret_cast<char *>(memchr(peekable_buf->position(), custom_delimiter[0], peekable_buf->available()));
                 if (!next_pos)
@@ -948,10 +1093,13 @@ String readCSVFieldWithTwoPossibleDelimiters(PeekableReadBuffer & buf, const For
 
 template void readCSVStringInto<PaddedPODArray<UInt8>>(PaddedPODArray<UInt8> & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
 template void readCSVStringInto<NullOutput>(NullOutput & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
+template void readCSVStringInto<String, false, false>(String & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
+template void readCSVStringInto<String, true, false>(String & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
+template void readCSVStringInto<PaddedPODArray<UInt8>, false, false>(PaddedPODArray<UInt8> & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
 
 
 template <typename Vector, typename ReturnType>
-ReturnType readJSONStringInto(Vector & s, ReadBuffer & buf)
+ReturnType readJSONStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::JSON & settings)
 {
     static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
 
@@ -983,23 +1131,23 @@ ReturnType readJSONStringInto(Vector & s, ReadBuffer & buf)
         }
 
         if (*buf.position() == '\\')
-            parseJSONEscapeSequence<Vector, ReturnType>(s, buf);
+            parseJSONEscapeSequence<Vector, ReturnType>(s, buf, !settings.throw_on_bad_escape_sequence);
     }
 
     return error("Cannot parse JSON string: expected closing quote", ErrorCodes::CANNOT_PARSE_QUOTED_STRING);
 }
 
-void readJSONString(String & s, ReadBuffer & buf)
+void readJSONString(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings)
 {
     s.clear();
-    readJSONStringInto(s, buf);
+    readJSONStringInto(s, buf, settings);
 }
 
-template void readJSONStringInto<PaddedPODArray<UInt8>, void>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
-template bool readJSONStringInto<PaddedPODArray<UInt8>, bool>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
-template void readJSONStringInto<NullOutput>(NullOutput & s, ReadBuffer & buf);
-template void readJSONStringInto<String>(String & s, ReadBuffer & buf);
-template bool readJSONStringInto<String, bool>(String & s, ReadBuffer & buf);
+template void readJSONStringInto<PaddedPODArray<UInt8>, void>(PaddedPODArray<UInt8> & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
+template bool readJSONStringInto<PaddedPODArray<UInt8>, bool>(PaddedPODArray<UInt8> & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
+template void readJSONStringInto<NullOutput>(NullOutput & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
+template void readJSONStringInto<String>(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
+template bool readJSONStringInto<String, bool>(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
 
 template <typename Vector, typename ReturnType, char opening_bracket, char closing_bracket>
 ReturnType readJSONObjectOrArrayPossiblyInvalid(Vector & s, ReadBuffer & buf)
@@ -1069,15 +1217,18 @@ ReturnType readJSONObjectPossiblyInvalid(Vector & s, ReadBuffer & buf)
 }
 
 template void readJSONObjectPossiblyInvalid<String>(String & s, ReadBuffer & buf);
+template bool readJSONObjectPossiblyInvalid<String, bool>(String & s, ReadBuffer & buf);
 template void readJSONObjectPossiblyInvalid<PaddedPODArray<UInt8>>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
+template bool readJSONObjectPossiblyInvalid<PaddedPODArray<UInt8>, bool>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
 
-template <typename Vector>
-void readJSONArrayInto(Vector & s, ReadBuffer & buf)
+template <typename Vector, typename ReturnType>
+ReturnType readJSONArrayInto(Vector & s, ReadBuffer & buf)
 {
-    readJSONObjectOrArrayPossiblyInvalid<Vector, void, '[', ']'>(s, buf);
+    return readJSONObjectOrArrayPossiblyInvalid<Vector, ReturnType, '[', ']'>(s, buf);
 }
 
-template void readJSONArrayInto<PaddedPODArray<UInt8>>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
+template void readJSONArrayInto<PaddedPODArray<UInt8>, void>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
+template bool readJSONArrayInto<PaddedPODArray<UInt8>, bool>(PaddedPODArray<UInt8> & s, ReadBuffer & buf);
 
 template <typename ReturnType>
 ReturnType readDateTextFallback(LocalDate & date, ReadBuffer & buf)
@@ -1217,6 +1368,13 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
                 return false;
         }
 
+        if constexpr (!throw_exception)
+        {
+            if (!isNumericASCII(s[0]) || !isNumericASCII(s[1]) || !isNumericASCII(s[2]) || !isNumericASCII(s[3])
+                || !isNumericASCII(s[5]) || !isNumericASCII(s[6]) || !isNumericASCII(s[8]) || !isNumericASCII(s[9]))
+                return false;
+        }
+
         UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
         UInt8 month = (s[5] - '0') * 10 + (s[6] - '0');
         UInt8 day = (s[8] - '0') * 10 + (s[9] - '0');
@@ -1240,6 +1398,13 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
                     return false;
             }
 
+            if constexpr (!throw_exception)
+            {
+                if (!isNumericASCII(s[0]) || !isNumericASCII(s[1]) || !isNumericASCII(s[3]) || !isNumericASCII(s[4])
+                    || !isNumericASCII(s[6]) || !isNumericASCII(s[7]))
+                    return false;
+            }
+
             hour = (s[0] - '0') * 10 + (s[1] - '0');
             minute = (s[3] - '0') * 10 + (s[4] - '0');
             second = (s[6] - '0') * 10 + (s[7] - '0');
@@ -1259,7 +1424,14 @@ ReturnType readDateTimeTextFallback(time_t & datetime, ReadBuffer & buf, const D
         {
             /// Not very efficient.
             for (const char * digit_pos = s; digit_pos < s_pos; ++digit_pos)
+            {
+                if constexpr (!throw_exception)
+                {
+                    if (!isNumericASCII(*digit_pos))
+                        return false;
+                }
                 datetime = datetime * 10 + *digit_pos - '0';
+            }
         }
         datetime *= negative_multiplier;
 
@@ -1282,14 +1454,24 @@ template bool readDateTimeTextFallback<bool, false>(time_t &, ReadBuffer &, cons
 template bool readDateTimeTextFallback<bool, true>(time_t &, ReadBuffer &, const DateLUTImpl &);
 
 
-void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
+template <typename ReturnType>
+ReturnType skipJSONFieldImpl(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (buf.eof())
-        throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF for key '{}'", name_of_field.toString());
+    {
+        if constexpr (throw_exception)
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF for key '{}'", name_of_field.toString());
+        return ReturnType(false);
+    }
     else if (*buf.position() == '"') /// skip double-quoted string
     {
         NullOutput sink;
-        readJSONStringInto(sink, buf);
+        if constexpr (throw_exception)
+            readJSONStringInto(sink, buf, settings);
+        else if (!tryReadJSONStringInto(sink, buf, settings))
+            return ReturnType(false);
     }
     else if (isNumericASCII(*buf.position()) || *buf.position() == '-' || *buf.position() == '+' || *buf.position() == '.') /// skip number
     {
@@ -1298,19 +1480,32 @@ void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
 
         double v;
         if (!tryReadFloatText(v, buf))
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Expected a number field for key '{}'", name_of_field.toString());
+        {
+            if constexpr (throw_exception)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Expected a number field for key '{}'", name_of_field.toString());
+            return ReturnType(false);
+        }
     }
     else if (*buf.position() == 'n') /// skip null
     {
-        assertString("null", buf);
+        if constexpr (throw_exception)
+            assertString("null", buf);
+        else if (!checkString("null", buf))
+            return ReturnType(false);
     }
     else if (*buf.position() == 't') /// skip true
     {
-        assertString("true", buf);
+        if constexpr (throw_exception)
+            assertString("true", buf);
+        else if (!checkString("true", buf))
+            return ReturnType(false);
     }
     else if (*buf.position() == 'f') /// skip false
     {
-        assertString("false", buf);
+        if constexpr (throw_exception)
+            assertString("false", buf);
+        else if (!checkString("false", buf))
+            return ReturnType(false);
     }
     else if (*buf.position() == '[')
     {
@@ -1320,12 +1515,16 @@ void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
         if (!buf.eof() && *buf.position() == ']') /// skip empty array
         {
             ++buf.position();
-            return;
+            return ReturnType(true);
         }
 
         while (true)
         {
-            skipJSONField(buf, name_of_field);
+            if constexpr (throw_exception)
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
+                return ReturnType(false);
+
             skipWhitespaceIfAny(buf);
 
             if (!buf.eof() && *buf.position() == ',')
@@ -1339,7 +1538,11 @@ void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
                 break;
             }
             else
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+            {
+                if constexpr (throw_exception)
+                    throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+                return ReturnType(false);
+            }
         }
     }
     else if (*buf.position() == '{') /// skip whole object
@@ -1353,19 +1556,34 @@ void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
             if (*buf.position() == '"')
             {
                 NullOutput sink;
-                readJSONStringInto(sink, buf);
+                if constexpr (throw_exception)
+                    readJSONStringInto(sink, buf, settings);
+                else if (!tryReadJSONStringInto(sink, buf, settings))
+                    return ReturnType(false);
             }
             else
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+            {
+                if constexpr (throw_exception)
+                    throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+                return ReturnType(false);
+            }
 
             // ':'
             skipWhitespaceIfAny(buf);
             if (buf.eof() || !(*buf.position() == ':'))
-                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+            {
+                if constexpr (throw_exception)
+                    throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected symbol for key '{}'", name_of_field.toString());
+                return ReturnType(false);
+            }
             ++buf.position();
             skipWhitespaceIfAny(buf);
 
-            skipJSONField(buf, name_of_field);
+            if constexpr (throw_exception)
+                skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings);
+            else if (!skipJSONFieldImpl<ReturnType>(buf, name_of_field, settings))
+                return ReturnType(false);
+
             skipWhitespaceIfAny(buf);
 
             // optional ','
@@ -1377,18 +1595,37 @@ void skipJSONField(ReadBuffer & buf, StringRef name_of_field)
         }
 
         if (buf.eof())
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF for key '{}'", name_of_field.toString());
+        {
+            if constexpr (throw_exception)
+                throw Exception(ErrorCodes::INCORRECT_DATA, "Unexpected EOF for key '{}'", name_of_field.toString());
+            return ReturnType(false);
+        }
         ++buf.position();
     }
     else
     {
-        throw Exception(
-            ErrorCodes::INCORRECT_DATA,
-            "Cannot read JSON field here: '{}'. Unexpected symbol '{}'{}",
-            String(buf.position(), std::min(buf.available(), size_t(10))),
-            std::string(1, *buf.position()),
-            name_of_field.empty() ? "" : " for key " + name_of_field.toString());
+        if constexpr (throw_exception)
+            throw Exception(
+                ErrorCodes::INCORRECT_DATA,
+                "Cannot read JSON field here: '{}'. Unexpected symbol '{}'{}",
+                String(buf.position(), std::min(buf.available(), size_t(10))),
+                std::string(1, *buf.position()),
+                name_of_field.empty() ? "" : " for key " + name_of_field.toString());
+
+        return ReturnType(false);
     }
+
+    return ReturnType(true);
+}
+
+void skipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
+{
+    skipJSONFieldImpl<void>(buf, name_of_field, settings);
+}
+
+bool trySkipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings)
+{
+    return skipJSONFieldImpl<bool>(buf, name_of_field, settings);
 }
 
 
@@ -1601,23 +1838,31 @@ void skipToNextRowOrEof(PeekableReadBuffer & buf, const String & row_after_delim
 }
 
 // Use PeekableReadBuffer to copy field to string after parsing.
-template <typename Vector, typename ParseFunc>
-static void readParsedValueInto(Vector & s, ReadBuffer & buf, ParseFunc parse_func)
+template <typename ReturnType, typename Vector, typename ParseFunc>
+static ReturnType readParsedValueInto(Vector & s, ReadBuffer & buf, ParseFunc parse_func)
 {
     PeekableReadBuffer peekable_buf(buf);
     peekable_buf.setCheckpoint();
-    parse_func(peekable_buf);
+    if constexpr (std::is_same_v<ReturnType, void>)
+        parse_func(peekable_buf);
+    else if (!parse_func(peekable_buf))
+        return ReturnType(false);
     peekable_buf.makeContinuousMemoryFromCheckpointToPos();
     auto * end = peekable_buf.position();
     peekable_buf.rollbackToCheckpoint();
     s.append(peekable_buf.position(), end);
     peekable_buf.position() = end;
+    return ReturnType(true);
 }
 
-template <typename Vector>
-static void readQuotedStringFieldInto(Vector & s, ReadBuffer & buf)
+template <typename ReturnType = void, typename Vector>
+static ReturnType readQuotedStringFieldInto(Vector & s, ReadBuffer & buf)
 {
-    assertChar('\'', buf);
+    if constexpr (std::is_same_v<ReturnType, void>)
+        assertChar('\'', buf);
+    else if (!checkChar('\'', buf))
+        return ReturnType(false);
+
     s.push_back('\'');
     while (!buf.eof())
     {
@@ -1645,16 +1890,23 @@ static void readQuotedStringFieldInto(Vector & s, ReadBuffer & buf)
     }
 
     if (buf.eof())
-        return;
+        return ReturnType(false);
 
     ++buf.position();
     s.push_back('\'');
+    return ReturnType(true);
 }
 
-template <char opening_bracket, char closing_bracket, typename Vector>
-static void readQuotedFieldInBracketsInto(Vector & s, ReadBuffer & buf)
+template <typename ReturnType = void, char opening_bracket, char closing_bracket, typename Vector>
+static ReturnType readQuotedFieldInBracketsInto(Vector & s, ReadBuffer & buf)
 {
-    assertChar(opening_bracket, buf);
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
+    if constexpr (throw_exception)
+        assertChar(opening_bracket, buf);
+    else if (!checkChar(opening_bracket, buf))
+        return ReturnType(false);
+
     s.push_back(opening_bracket);
 
     size_t balance = 1;
@@ -1670,7 +1922,10 @@ static void readQuotedFieldInBracketsInto(Vector & s, ReadBuffer & buf)
 
         if (*buf.position() == '\'')
         {
-            readQuotedStringFieldInto(s, buf);
+            if constexpr (throw_exception)
+                readQuotedStringFieldInto<void>(s, buf);
+            else if (!readQuotedStringFieldInto<bool>(s, buf))
+                return ReturnType(false);
         }
         else if (*buf.position() == opening_bracket)
         {
@@ -1685,13 +1940,20 @@ static void readQuotedFieldInBracketsInto(Vector & s, ReadBuffer & buf)
             ++buf.position();
         }
     }
+
+    if (balance)
+        return ReturnType(false);
+
+    return ReturnType(true);
 }
 
-template <typename Vector>
-void readQuotedFieldInto(Vector & s, ReadBuffer & buf)
+template <typename ReturnType, typename Vector>
+ReturnType readQuotedFieldInto(Vector & s, ReadBuffer & buf)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (buf.eof())
-        return;
+        return ReturnType(false);
 
     /// Possible values in 'Quoted' field:
     /// - Strings: '...'
@@ -1703,35 +1965,47 @@ void readQuotedFieldInto(Vector & s, ReadBuffer & buf)
     /// - Number: integer, float, decimal.
 
     if (*buf.position() == '\'')
-        readQuotedStringFieldInto(s, buf);
+        return readQuotedStringFieldInto<ReturnType>(s, buf);
     else if (*buf.position() == '[')
-        readQuotedFieldInBracketsInto<'[', ']'>(s, buf);
+        return readQuotedFieldInBracketsInto<ReturnType, '[', ']'>(s, buf);
     else if (*buf.position() == '(')
-        readQuotedFieldInBracketsInto<'(', ')'>(s, buf);
+        return readQuotedFieldInBracketsInto<ReturnType, '(', ')'>(s, buf);
     else if (*buf.position() == '{')
-        readQuotedFieldInBracketsInto<'{', '}'>(s, buf);
+        return readQuotedFieldInBracketsInto<ReturnType, '{', '}'>(s, buf);
     else if (checkCharCaseInsensitive('n', buf))
     {
         /// NULL or NaN
         if (checkCharCaseInsensitive('u', buf))
         {
-            assertStringCaseInsensitive("ll", buf);
+            if constexpr (throw_exception)
+                assertStringCaseInsensitive("ll", buf);
+            else if (!checkStringCaseInsensitive("ll", buf))
+                return ReturnType(false);
             s.append("NULL");
         }
         else
         {
-            assertStringCaseInsensitive("an", buf);
+            if constexpr (throw_exception)
+                assertStringCaseInsensitive("an", buf);
+            else if (!checkStringCaseInsensitive("an", buf))
+                return ReturnType(false);
             s.append("NaN");
         }
     }
     else if (checkCharCaseInsensitive('t', buf))
     {
-        assertStringCaseInsensitive("rue", buf);
+        if constexpr (throw_exception)
+            assertStringCaseInsensitive("rue", buf);
+        else if (!checkStringCaseInsensitive("rue", buf))
+            return ReturnType(false);
         s.append("true");
     }
     else if (checkCharCaseInsensitive('f', buf))
     {
-        assertStringCaseInsensitive("alse", buf);
+        if constexpr (throw_exception)
+            assertStringCaseInsensitive("alse", buf);
+        else if (!checkStringCaseInsensitive("alse", buf))
+            return ReturnType(false);
         s.append("false");
     }
     else
@@ -1740,13 +2014,19 @@ void readQuotedFieldInto(Vector & s, ReadBuffer & buf)
         auto parse_func = [](ReadBuffer & in)
         {
             Float64 tmp;
-            readFloatText(tmp, in);
+            if constexpr (throw_exception)
+                readFloatText(tmp, in);
+            else
+                return tryReadFloatText(tmp, in);
         };
-        readParsedValueInto(s, buf, parse_func);
+
+        return readParsedValueInto<ReturnType>(s, buf, parse_func);
     }
+
+    return ReturnType(true);
 }
 
-template void readQuotedFieldInto<NullOutput>(NullOutput & s, ReadBuffer & buf);
+template void readQuotedFieldInto<void, NullOutput>(NullOutput & s, ReadBuffer & buf);
 
 void readQuotedField(String & s, ReadBuffer & buf)
 {
@@ -1754,11 +2034,24 @@ void readQuotedField(String & s, ReadBuffer & buf)
     readQuotedFieldInto(s, buf);
 }
 
-void readJSONField(String & s, ReadBuffer & buf)
+bool tryReadQuotedField(String & s, ReadBuffer & buf)
 {
     s.clear();
-    auto parse_func = [](ReadBuffer & in) { skipJSONField(in, ""); };
-    readParsedValueInto(s, buf, parse_func);
+    return readQuotedFieldInto<bool>(s, buf);
+}
+
+void readJSONField(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings)
+{
+    s.clear();
+    auto parse_func = [&settings](ReadBuffer & in) { skipJSONField(in, "", settings); };
+    readParsedValueInto<void>(s, buf, parse_func);
+}
+
+bool tryReadJSONField(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings)
+{
+    s.clear();
+    auto parse_func = [&settings](ReadBuffer & in) { return trySkipJSONField(in, "", settings); };
+    return readParsedValueInto<bool>(s, buf, parse_func);
 }
 
 void readTSVField(String & s, ReadBuffer & buf)
diff --git a/src/IO/ReadHelpers.h b/src/IO/ReadHelpers.h
index 85584d63ee8..a9c861be13c 100644
--- a/src/IO/ReadHelpers.h
+++ b/src/IO/ReadHelpers.h
@@ -38,7 +38,6 @@
 #include <IO/CompressionMethod.h>
 #include <IO/ReadBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
-#include <IO/PeekableReadBuffer.h>
 #include <IO/VarInt.h>
 
 #include <pcg_random.hpp>
@@ -51,6 +50,7 @@ namespace DB
 
 template <typename Allocator>
 struct Memory;
+class PeekableReadBuffer;
 
 namespace ErrorCodes
 {
@@ -154,9 +154,12 @@ inline void readIPv6Binary(IPv6 & ip, ReadBuffer & buf)
     size_t size = 0;
     readVarUInt(size, buf);
 
-    if (size != IPV6_BINARY_LENGTH)
-        throw Exception(ErrorCodes::SIZE_OF_FIXED_STRING_DOESNT_MATCH,
-                        "Size of the string {} doesn't match size of binary IPv6 {}", size, IPV6_BINARY_LENGTH);
+    if (size != sizeof(IPv6::UnderlyingType))
+        throw Exception(
+            ErrorCodes::SIZE_OF_FIXED_STRING_DOESNT_MATCH,
+            "Size of the string {} doesn't match size of binary IPv6 {}",
+            size,
+            sizeof(IPv6::UnderlyingType));
 
     buf.readStrict(reinterpret_cast<char*>(&ip.toUnderType()), size);
 }
@@ -258,26 +261,43 @@ inline void readBoolText(bool & x, ReadBuffer & buf)
     x = tmp != '0';
 }
 
-inline void readBoolTextWord(bool & x, ReadBuffer & buf, bool support_upper_case = false)
+template <typename ReturnType = void>
+inline ReturnType readBoolTextWord(bool & x, ReadBuffer & buf, bool support_upper_case = false)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (buf.eof()) [[unlikely]]
-        throwReadAfterEOF();
+    {
+        if constexpr (throw_exception)
+            throwReadAfterEOF();
+        else
+            return ReturnType(false);
+    }
 
     switch (*buf.position())
     {
         case 't':
-            assertString("true", buf);
+            if constexpr (throw_exception)
+                assertString("true", buf);
+            else if (!checkString("true", buf))
+                return ReturnType(false);
             x = true;
             break;
         case 'f':
-            assertString("false", buf);
+            if constexpr (throw_exception)
+                assertString("false", buf);
+            else if (!checkString("false", buf))
+                return ReturnType(false);
             x = false;
             break;
         case 'T':
         {
             if (support_upper_case)
             {
-                assertString("TRUE", buf);
+                if constexpr (throw_exception)
+                    assertString("TRUE", buf);
+                else if (!checkString("TRUE", buf))
+                    return ReturnType(false);
                 x = true;
                 break;
             }
@@ -288,7 +308,10 @@ inline void readBoolTextWord(bool & x, ReadBuffer & buf, bool support_upper_case
         {
             if (support_upper_case)
             {
-                assertString("FALSE", buf);
+                if constexpr (throw_exception)
+                    assertString("FALSE", buf);
+                else if (!checkString("FALSE", buf))
+                    return ReturnType(false);
                 x = false;
                 break;
             }
@@ -296,8 +319,15 @@ inline void readBoolTextWord(bool & x, ReadBuffer & buf, bool support_upper_case
                 [[fallthrough]];
         }
         default:
-            throw Exception(ErrorCodes::CANNOT_PARSE_BOOL, "Unexpected Bool value");
+        {
+            if constexpr (throw_exception)
+                throw Exception(ErrorCodes::CANNOT_PARSE_BOOL, "Unexpected Bool value");
+            else
+                return ReturnType(false);
+        }
     }
+
+    return ReturnType(true);
 }
 
 enum class ReadIntTextCheckOverflow
@@ -469,7 +499,10 @@ void readIntText(T & x, ReadBuffer & buf)
 template <ReadIntTextCheckOverflow check_overflow = ReadIntTextCheckOverflow::CHECK_OVERFLOW, typename T>
 bool tryReadIntText(T & x, ReadBuffer & buf)
 {
-    return readIntTextImpl<T, bool, check_overflow>(x, buf);
+    if constexpr (is_decimal<T>)
+        return tryReadIntText<check_overflow>(x.value, buf);
+    else
+        return readIntTextImpl<T, bool, check_overflow>(x, buf);
 }
 
 
@@ -478,16 +511,18 @@ bool tryReadIntText(T & x, ReadBuffer & buf)
   * - for numbers starting with zero, parsed only zero;
   * - symbol '+' before number is not supported;
   */
-template <typename T, bool throw_on_error = true>
-void readIntTextUnsafe(T & x, ReadBuffer & buf)
+template <typename T, typename ReturnType = void>
+ReturnType readIntTextUnsafe(T & x, ReadBuffer & buf)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
     bool negative = false;
     make_unsigned_t<T> res = 0;
 
     auto on_error = []
     {
-        if (throw_on_error)
+        if constexpr (throw_exception)
             throwReadAfterEOF();
+        return ReturnType(false);
     };
 
     if (buf.eof()) [[unlikely]]
@@ -505,7 +540,7 @@ void readIntTextUnsafe(T & x, ReadBuffer & buf)
     {
         ++buf.position();
         x = 0;
-        return;
+        return ReturnType(true);
     }
 
     while (!buf.eof())
@@ -524,12 +559,13 @@ void readIntTextUnsafe(T & x, ReadBuffer & buf)
 
     /// See note about undefined behaviour above.
     x = is_signed_v<T> && negative ? -res : res;
+    return ReturnType(true);
 }
 
 template <typename T>
-void tryReadIntTextUnsafe(T & x, ReadBuffer & buf)
+bool tryReadIntTextUnsafe(T & x, ReadBuffer & buf)
 {
-    return readIntTextUnsafe<T, false>(x, buf);
+    return readIntTextUnsafe<T, bool>(x, buf);
 }
 
 
@@ -551,10 +587,16 @@ void readEscapedString(String & s, ReadBuffer & buf);
 void readQuotedString(String & s, ReadBuffer & buf);
 void readQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
 
+bool tryReadQuotedString(String & s, ReadBuffer & buf);
+bool tryReadQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
+
 void readDoubleQuotedString(String & s, ReadBuffer & buf);
 void readDoubleQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
 
-void readJSONString(String & s, ReadBuffer & buf);
+bool tryReadDoubleQuotedString(String & s, ReadBuffer & buf);
+bool tryReadDoubleQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
+
+void readJSONString(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
 
 void readBackQuotedString(String & s, ReadBuffer & buf);
 void readBackQuotedStringWithSQLStyle(String & s, ReadBuffer & buf);
@@ -616,20 +658,20 @@ void readBackQuotedStringInto(Vector & s, ReadBuffer & buf);
 template <typename Vector>
 void readStringUntilEOFInto(Vector & s, ReadBuffer & buf);
 
-template <typename Vector, bool include_quotes = false>
+template <typename Vector, bool include_quotes = false, bool allow_throw = true>
 void readCSVStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::CSV & settings);
 
 /// ReturnType is either bool or void. If bool, the function will return false instead of throwing an exception.
 template <typename Vector, typename ReturnType = void>
-ReturnType readJSONStringInto(Vector & s, ReadBuffer & buf);
+ReturnType readJSONStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
 
 template <typename Vector>
-bool tryReadJSONStringInto(Vector & s, ReadBuffer & buf)
+bool tryReadJSONStringInto(Vector & s, ReadBuffer & buf, const FormatSettings::JSON & settings)
 {
-    return readJSONStringInto<Vector, bool>(s, buf);
+    return readJSONStringInto<Vector, bool>(s, buf, settings);
 }
 
-template <typename Vector>
+template <bool enable_sql_style_quoting, typename Vector>
 bool tryReadQuotedStringInto(Vector & s, ReadBuffer & buf);
 
 /// Reads chunk of data between {} in that way,
@@ -638,8 +680,8 @@ bool tryReadQuotedStringInto(Vector & s, ReadBuffer & buf);
 template <typename Vector, typename ReturnType = void>
 ReturnType readJSONObjectPossiblyInvalid(Vector & s, ReadBuffer & buf);
 
-template <typename Vector>
-void readJSONArrayInto(Vector & s, ReadBuffer & buf);
+template <typename Vector, typename ReturnType = void>
+ReturnType readJSONArrayInto(Vector & s, ReadBuffer & buf);
 
 template <typename Vector>
 void readStringUntilWhitespaceInto(Vector & s, ReadBuffer & buf);
@@ -780,7 +822,7 @@ inline ReturnType readDateTextImpl(ExtendedDayNum & date, ReadBuffer & buf, cons
         return false;
 
     /// When the parameter is out of rule or out of range, Date32 uses 1925-01-01 as the default value (-DateLUT::instance().getDayNumOffsetEpoch(), -16436) and Date uses 1970-01-01.
-    date = date_lut.makeDayNum(local_date.year(), local_date.month(), local_date.day(), -static_cast<Int32>(date_lut.getDayNumOffsetEpoch()));
+    date = date_lut.makeDayNum(local_date.year(), local_date.month(), local_date.day(), -static_cast<Int32>(DateLUTImpl::getDayNumOffsetEpoch()));
     return ReturnType(true);
 }
 
@@ -963,6 +1005,13 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
     {
         if (s[4] < '0' || s[4] > '9')
         {
+            if constexpr (!throw_exception)
+            {
+                if (!isNumericASCII(s[0]) || !isNumericASCII(s[1]) || !isNumericASCII(s[2]) || !isNumericASCII(s[3])
+                    || !isNumericASCII(s[5]) || !isNumericASCII(s[6]) || !isNumericASCII(s[8]) || !isNumericASCII(s[9]))
+                    return ReturnType(false);
+            }
+
             UInt16 year = (s[0] - '0') * 1000 + (s[1] - '0') * 100 + (s[2] - '0') * 10 + (s[3] - '0');
             UInt8 month = (s[5] - '0') * 10 + (s[6] - '0');
             UInt8 day = (s[8] - '0') * 10 + (s[9] - '0');
@@ -975,6 +1024,13 @@ inline ReturnType readDateTimeTextImpl(time_t & datetime, ReadBuffer & buf, cons
             bool dt_long = (s[10] == ' ' || s[10] == 'T');
             if (dt_long)
             {
+                if constexpr (!throw_exception)
+                {
+                    if (!isNumericASCII(s[11]) || !isNumericASCII(s[12]) || !isNumericASCII(s[14]) || !isNumericASCII(s[15])
+                        || !isNumericASCII(s[17]) || !isNumericASCII(s[18]))
+                        return ReturnType(false);
+                }
+
                 hour = (s[11] - '0') * 10 + (s[12] - '0');
                 minute = (s[14] - '0') * 10 + (s[15] - '0');
                 second = (s[17] - '0') * 10 + (s[18] - '0');
@@ -1312,6 +1368,11 @@ inline bool tryReadText(is_integer auto & x, ReadBuffer & buf)
     return tryReadIntText(x, buf);
 }
 
+inline bool tryReadText(is_floating_point auto & x, ReadBuffer & buf)
+{
+    return tryReadFloatText(x, buf);
+}
+
 inline bool tryReadText(UUID & x, ReadBuffer & buf) { return tryReadUUIDText(x, buf); }
 inline bool tryReadText(IPv4 & x, ReadBuffer & buf) { return tryReadIPv4Text(x, buf); }
 inline bool tryReadText(IPv6 & x, ReadBuffer & buf) { return tryReadIPv6Text(x, buf); }
@@ -1321,9 +1382,20 @@ inline void readText(is_floating_point auto & x, ReadBuffer & buf) { readFloatTe
 inline void readText(String & x, ReadBuffer & buf) { readEscapedString(x, buf); }
 
 inline void readText(DayNum & x, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance()) { readDateText(x, buf, time_zone); }
+inline bool tryReadText(DayNum & x, ReadBuffer & buf, const DateLUTImpl & time_zone = DateLUT::instance()) { return tryReadDateText(x, buf, time_zone); }
 
 inline void readText(LocalDate & x, ReadBuffer & buf) { readDateText(x, buf); }
+inline bool tryReadText(LocalDate & x, ReadBuffer & buf) { return tryReadDateText(x, buf); }
 inline void readText(LocalDateTime & x, ReadBuffer & buf) { readDateTimeText(x, buf); }
+inline bool tryReadText(LocalDateTime & x, ReadBuffer & buf)
+{
+    time_t time;
+    if (!tryReadDateTimeText(time, buf))
+        return false;
+    x = LocalDateTime(time, DateLUT::instance());
+    return true;
+}
+
 inline void readText(UUID & x, ReadBuffer & buf) { readUUIDText(x, buf); }
 inline void readText(IPv4 & x, ReadBuffer & buf) { readIPv4Text(x, buf); }
 inline void readText(IPv6 & x, ReadBuffer & buf) { readIPv6Text(x, buf); }
@@ -1401,39 +1473,71 @@ inline void readDoubleQuoted(LocalDateTime & x, ReadBuffer & buf)
 }
 
 /// CSV for numbers: quotes are optional, no special escaping rules.
-template <typename T>
-inline void readCSVSimple(T & x, ReadBuffer & buf)
+template <typename T, typename ReturnType = void>
+inline ReturnType readCSVSimple(T & x, ReadBuffer & buf)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (buf.eof()) [[unlikely]]
-        throwReadAfterEOF();
+    {
+        if constexpr (throw_exception)
+            throwReadAfterEOF();
+        return ReturnType(false);
+    }
 
     char maybe_quote = *buf.position();
 
     if (maybe_quote == '\'' || maybe_quote == '\"')
         ++buf.position();
 
-    readText(x, buf);
+    if constexpr (throw_exception)
+        readText(x, buf);
+    else if (!tryReadText(x, buf))
+        return ReturnType(false);
 
     if (maybe_quote == '\'' || maybe_quote == '\"')
-        assertChar(maybe_quote, buf);
+    {
+        if constexpr (throw_exception)
+            assertChar(maybe_quote, buf);
+        else if (!checkChar(maybe_quote, buf))
+            return ReturnType(false);
+    }
+
+    return ReturnType(true);
 }
 
 // standalone overload for dates: to avoid instantiating DateLUTs while parsing other types
-template <typename T>
-inline void readCSVSimple(T & x, ReadBuffer & buf, const DateLUTImpl & time_zone)
+template <typename T, typename ReturnType = void>
+inline ReturnType readCSVSimple(T & x, ReadBuffer & buf, const DateLUTImpl & time_zone)
 {
+    static constexpr bool throw_exception = std::is_same_v<ReturnType, void>;
+
     if (buf.eof()) [[unlikely]]
-        throwReadAfterEOF();
+    {
+        if constexpr (throw_exception)
+            throwReadAfterEOF();
+        return ReturnType(false);
+    }
 
     char maybe_quote = *buf.position();
 
     if (maybe_quote == '\'' || maybe_quote == '\"')
         ++buf.position();
 
-    readText(x, buf, time_zone);
+    if constexpr (throw_exception)
+        readText(x, buf, time_zone);
+    else if (!tryReadText(x, buf, time_zone))
+        return ReturnType(false);
 
     if (maybe_quote == '\'' || maybe_quote == '\"')
-        assertChar(maybe_quote, buf);
+    {
+        if constexpr (throw_exception)
+            assertChar(maybe_quote, buf);
+        else if (!checkChar(maybe_quote, buf))
+            return ReturnType(false);
+    }
+
+    return ReturnType(true);
 }
 
 template <typename T>
@@ -1443,18 +1547,52 @@ inline void readCSV(T & x, ReadBuffer & buf)
     readCSVSimple(x, buf);
 }
 
+template <typename T>
+requires is_arithmetic_v<T>
+inline bool tryReadCSV(T & x, ReadBuffer & buf)
+{
+    return readCSVSimple<T, bool>(x, buf);
+}
+
 inline void readCSV(String & x, ReadBuffer & buf, const FormatSettings::CSV & settings) { readCSVString(x, buf, settings); }
+inline bool tryReadCSV(String & x, ReadBuffer & buf, const FormatSettings::CSV & settings)
+{
+    x.clear();
+    readCSVStringInto<String, false, false>(x, buf, settings);
+    return true;
+}
+
 inline void readCSV(LocalDate & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(LocalDate & x, ReadBuffer & buf) { return readCSVSimple<LocalDate, bool>(x, buf); }
+
 inline void readCSV(DayNum & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(DayNum & x, ReadBuffer & buf) { return readCSVSimple<DayNum, bool>(x, buf); }
 inline void readCSV(DayNum & x, ReadBuffer & buf, const DateLUTImpl & time_zone) { readCSVSimple(x, buf, time_zone); }
+inline bool tryReadCSV(DayNum & x, ReadBuffer & buf, const DateLUTImpl & time_zone) { return readCSVSimple<DayNum, bool>(x, buf, time_zone); }
+
 inline void readCSV(LocalDateTime & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(LocalDateTime & x, ReadBuffer & buf) { return readCSVSimple<LocalDateTime, bool>(x, buf); }
+
 inline void readCSV(UUID & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(UUID & x, ReadBuffer & buf) { return readCSVSimple<UUID, bool>(x, buf); }
+
 inline void readCSV(IPv4 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(IPv4 & x, ReadBuffer & buf) { return readCSVSimple<IPv4, bool>(x, buf); }
+
 inline void readCSV(IPv6 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(IPv6 & x, ReadBuffer & buf) { return readCSVSimple<IPv6, bool>(x, buf); }
+
 inline void readCSV(UInt128 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(UInt128 & x, ReadBuffer & buf) { return readCSVSimple<UInt128, bool>(x, buf); }
+
 inline void readCSV(Int128 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(Int128 & x, ReadBuffer & buf) { return readCSVSimple<Int128, bool>(x, buf); }
+
 inline void readCSV(UInt256 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(UInt256 & x, ReadBuffer & buf) { return readCSVSimple<UInt256, bool>(x, buf); }
+
 inline void readCSV(Int256 & x, ReadBuffer & buf) { readCSVSimple(x, buf); }
+inline bool tryReadCSV(Int256 & x, ReadBuffer & buf) { return readCSVSimple<Int256, bool>(x, buf); }
 
 template <typename T>
 void readBinary(std::vector<T> & x, ReadBuffer & buf)
@@ -1535,7 +1673,8 @@ inline void skipWhitespaceIfAny(ReadBuffer & buf, bool one_line = false)
 }
 
 /// Skips json value.
-void skipJSONField(ReadBuffer & buf, StringRef name_of_field);
+void skipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings);
+bool trySkipJSONField(ReadBuffer & buf, StringRef name_of_field, const FormatSettings::JSON & settings);
 
 
 /** Read serialized exception.
@@ -1741,21 +1880,23 @@ struct PcgDeserializer
         assertChar(' ', buf);
         readText(state, buf);
 
-        if (multiplier != rng.multiplier())
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect multiplier in pcg32: expected {}, got {}", rng.multiplier(), multiplier);
-        if (increment != rng.increment())
-            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect increment in pcg32: expected {}, got {}", rng.increment(), increment);
+        if (multiplier != pcg32_fast::multiplier())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect multiplier in pcg32: expected {}, got {}", pcg32_fast::multiplier(), multiplier);
+        if (increment != pcg32_fast::increment())
+            throw Exception(ErrorCodes::INCORRECT_DATA, "Incorrect increment in pcg32: expected {}, got {}", pcg32_fast::increment(), increment);
 
         rng.state_ = state;
     }
 };
 
-template <typename Vector>
-void readQuotedFieldInto(Vector & s, ReadBuffer & buf);
+template <typename ReturnType = void, typename Vector>
+ReturnType readQuotedFieldInto(Vector & s, ReadBuffer & buf);
 
 void readQuotedField(String & s, ReadBuffer & buf);
+bool tryReadQuotedField(String & s, ReadBuffer & buf);
 
-void readJSONField(String & s, ReadBuffer & buf);
+void readJSONField(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
+bool tryReadJSONField(String & s, ReadBuffer & buf, const FormatSettings::JSON & settings);
 
 void readTSVField(String & s, ReadBuffer & buf);
 
diff --git a/src/IO/ReadSettings.h b/src/IO/ReadSettings.h
index a8a31d82e56..6a0cac35878 100644
--- a/src/IO/ReadSettings.h
+++ b/src/IO/ReadSettings.h
@@ -6,7 +6,7 @@
 #include <Interpreters/Cache/FileCache_fwd.h>
 #include <Common/Throttler_fwd.h>
 #include <Common/Priority.h>
-#include <IO/ResourceLink.h>
+#include <Common/Scheduler/ResourceLink.h>
 
 namespace DB
 {
@@ -61,6 +61,7 @@ enum class RemoteFSReadMethod
 };
 
 class MMappedFileCache;
+class PageCache;
 
 struct ReadSettings
 {
@@ -98,9 +99,13 @@ struct ReadSettings
     bool enable_filesystem_cache = true;
     bool read_from_filesystem_cache_if_exists_otherwise_bypass_cache = false;
     bool enable_filesystem_cache_log = false;
-    /// Don't populate cache when the read is not part of query execution (e.g. background thread).
-    bool avoid_readthrough_cache_outside_query_context = true;
     size_t filesystem_cache_segments_batch_size = 20;
+    size_t filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = 1000;
+
+    bool use_page_cache_for_disks_without_file_cache = false;
+    bool read_from_page_cache_if_exists_otherwise_bypass_cache = false;
+    bool page_cache_inject_eviction = false;
+    std::shared_ptr<PageCache> page_cache;
 
     size_t filesystem_cache_max_download_size = (128UL * 1024 * 1024 * 1024);
     bool skip_download_if_exceeds_query_cache = true;
@@ -116,7 +121,7 @@ struct ReadSettings
     // Resource to be used during reading
     ResourceLink resource_link;
 
-    size_t http_max_tries = 1;
+    size_t http_max_tries = 10;
     size_t http_retry_initial_backoff_ms = 100;
     size_t http_retry_max_backoff_ms = 1600;
     bool http_skip_not_found_url_for_globs = true;
diff --git a/src/IO/ReadWriteBufferFromHTTP.cpp b/src/IO/ReadWriteBufferFromHTTP.cpp
index 297d73303c0..303ffb744b5 100644
--- a/src/IO/ReadWriteBufferFromHTTP.cpp
+++ b/src/IO/ReadWriteBufferFromHTTP.cpp
@@ -1,13 +1,67 @@
 #include "ReadWriteBufferFromHTTP.h"
 
 #include <IO/HTTPCommon.h>
+#include <Common/NetException.h>
+#include <Poco/Net/NetException.h>
+
 
 namespace ProfileEvents
 {
-extern const Event ReadBufferSeekCancelConnection;
-extern const Event ReadWriteBufferFromHTTPPreservedSessions;
+    extern const Event ReadBufferSeekCancelConnection;
+    extern const Event ReadWriteBufferFromHTTPRequestsSent;
+    extern const Event ReadWriteBufferFromHTTPBytes;
 }
 
+
+namespace
+{
+
+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; });
+}
+
+Poco::URI getUriAfterRedirect(const Poco::URI & prev_uri, Poco::Net::HTTPResponse & response)
+{
+    chassert(DB::isRedirect(response.getStatus()));
+
+    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;
+}
+
+class ReadBufferFromSessionResponse : public DB::ReadBufferFromIStream
+{
+private:
+    DB::HTTPSessionPtr session;
+
+public:
+    ReadBufferFromSessionResponse(DB::HTTPSessionPtr && session_, std::istream & rstr, size_t size)
+    : ReadBufferFromIStream(rstr, size)
+    , session(std::move(session_))
+    {
+    }
+};
+
+}
+
+
 namespace DB
 {
 
@@ -21,94 +75,29 @@ namespace ErrorCodes
     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_))
+std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::CallResult::transformToReadBuffer(size_t buf_size) &&
 {
-    session = session_factory->buildNewSession(uri);
+    chassert(session);
+    return std::make_unique<ReadBufferFromSessionResponse>(std::move(session), *response_stream, buf_size);
 }
 
-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 {}."
-            " You can {} redirects by changing the setting 'max_http_get_redirects'."
-            " Example: `SET max_http_get_redirects = 10`."
-            " Redirects are restricted to prevent possible attack when a malicious server redirects to an internal resource, bypassing the authentication or firewall.",
-            initial_uri.toString(), max_redirects ? "increase the allowed maximum number of" : "allow");
-}
-
-template <typename TSessionFactory>
-typename UpdatableSession<TSessionFactory>::SessionPtr UpdatableSession<TSessionFactory>::createDetachedSession(const Poco::URI & uri)
-{
-    return session_factory->buildNewSession(uri);
-}
-
-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
+bool ReadWriteBufferFromHTTP::withPartialContent() 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;
+    return read_range.begin || read_range.end || getOffset() > 0;
 }
 
-template <typename UpdatableSessionPtr>
-size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getOffset() const { return read_range.begin.value_or(0) + offset_from_begin_pos; }
-
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::prepareRequest(Poco::Net::HTTPRequest & request, Poco::URI uri_, std::optional<HTTPRange> range) const
+size_t ReadWriteBufferFromHTTP::getOffset() const
 {
-    request.setHost(uri_.getHost()); // use original, not resolved host name in header
+    return read_range.begin.value_or(0) + offset_from_begin_pos;
+}
+
+void ReadWriteBufferFromHTTP::prepareRequest(Poco::Net::HTTPRequest & request, std::optional<HTTPRange> range) const
+{
+    request.setHost(current_uri.getHost());
 
     if (out_stream_callback)
         request.setChunkedTransferEncoding(true);
@@ -125,7 +114,6 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::prepareRequest(Poco::Net:
             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);
     }
 
@@ -133,45 +121,7 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::prepareRequest(Poco::Net:
         credentials.authenticate(request);
 }
 
-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("/");
-
-    std::optional<HTTPRange> range;
-    if (!for_object_info)
-    {
-        if (withPartialContent(read_range))
-            range = HTTPRange{getOffset(), read_range.end};
-    }
-
-    Poco::Net::HTTPRequest request(method_, uri_.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
-    prepareRequest(request, uri_, range);
-
-    LOG_TRACE(log, "Sending request to {}", uri_.toString());
-
-    auto sess = current_session->getSession();
-    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;
-}
-
-template <typename UpdatableSessionPtr>
-size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileSize()
+size_t ReadWriteBufferFromHTTP::getFileSize()
 {
     if (!file_info)
         file_info = getFileInfo();
@@ -179,243 +129,293 @@ size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileSize()
     if (file_info->file_size)
         return *file_info->file_size;
 
-    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", uri.toString());
+    throw Exception(ErrorCodes::UNKNOWN_FILE_SIZE, "Cannot find out file size for: {}", initial_uri.toString());
 }
 
-template <typename UpdatableSessionPtr>
-bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::supportsReadAt()
+bool ReadWriteBufferFromHTTP::supportsReadAt()
 {
     if (!file_info)
         file_info = getFileInfo();
     return method == Poco::Net::HTTPRequest::HTTP_GET && file_info->seekable;
 }
 
-template <typename UpdatableSessionPtr>
-bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::checkIfActuallySeekable()
+bool ReadWriteBufferFromHTTP::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)
+String ReadWriteBufferFromHTTP::getFileName() const
 {
-    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());
-        }
-    }
+    return initial_uri.toString();
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setupExternalBuffer()
+void ReadWriteBufferFromHTTP::getHeadResponse(Poco::Net::HTTPResponse & response)
 {
-    /**
-    * 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());
+    doWithRetries(
+        [&] ()
+        {
+            callWithRedirects(response, Poco::Net::HTTPRequest::HTTP_HEAD, {});
+        },
+        /*on_retry=*/ nullptr,
+        /*mute_logging=*/ true);
 }
 
-template <typename UpdatableSessionPtr>
-ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::ReadWriteBufferFromHTTPBase(
-    UpdatableSessionPtr session_,
-    Poco::URI uri_,
-    const Poco::Net::HTTPBasicCredentials & credentials_,
+ReadWriteBufferFromHTTP::ReadWriteBufferFromHTTP(
+    const HTTPConnectionGroupType & connection_group_,
+    const Poco::URI & uri_,
     const std::string & method_,
-    OutStreamCallback out_stream_callback_,
-    size_t buffer_size_,
-    const ReadSettings & settings_,
-    HTTPHeaderEntries http_header_entries_,
+    ProxyConfiguration proxy_config_,
+    ReadSettings read_settings_,
+    ConnectionTimeouts timeouts_,
+    const Poco::Net::HTTPBasicCredentials & credentials_,
     const RemoteHostFilter * remote_host_filter_,
-    bool delay_initialization,
+    size_t buffer_size_,
+    size_t max_redirects_,
+    OutStreamCallback out_stream_callback_,
     bool use_external_buffer_,
     bool http_skip_not_found_url_,
-    std::optional<HTTPFileInfo> file_info_,
-    ProxyConfiguration proxy_config_)
+    HTTPHeaderEntries http_header_entries_,
+    bool delay_initialization,
+    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_)
+    , connection_group(connection_group_)
+    , initial_uri(uri_)
+    , method(!method_.empty() ? method_ : out_stream_callback_ ? Poco::Net::HTTPRequest::HTTP_POST : Poco::Net::HTTPRequest::HTTP_GET)
+    , proxy_config(std::move(proxy_config_))
+    , read_settings(std::move(read_settings_))
+    , timeouts(std::move(timeouts_))
+    , credentials(credentials_)
+    , remote_host_filter(remote_host_filter_)
+    , buffer_size(buffer_size_)
+    , max_redirects(max_redirects_)
+    , use_external_buffer(use_external_buffer_)
     , http_skip_not_found_url(http_skip_not_found_url_)
-    , settings {settings_}
-    , log(&Poco::Logger::get("ReadWriteBufferFromHTTP"))
-    , proxy_config(proxy_config_)
+    , out_stream_callback(std::move(out_stream_callback_))
+    , redirects(0)
+    , http_header_entries {std::move(http_header_entries_)}
+    , file_info(file_info_)
+    , log(getLogger("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)
+    current_uri = initial_uri;
+
+    if (current_uri.getPath().empty())
+        current_uri.setPath("/");
+
+    if (read_settings.http_max_tries <= 0 || read_settings.http_retry_initial_backoff_ms <= 0
+        || read_settings.http_retry_initial_backoff_ms >= read_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);
+            read_settings.http_max_tries,
+            read_settings.http_retry_initial_backoff_ms,
+            read_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; });
+    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));
+        http_header_entries.emplace_back(user_agent, fmt::format("ClickHouse/{}", VERSION_STRING));
     }
 
+    if (!delay_initialization && use_external_buffer)
+        throw Exception(
+            ErrorCodes::BAD_ARGUMENTS,
+            "Invalid setting for ReadWriteBufferFromHTTP"
+            "delay_initialization is false and use_external_buffer it true.");
+
     if (!delay_initialization)
     {
-        initialize();
-        if (exception)
-            std::rethrow_exception(exception);
+        next();
     }
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::callWithRedirects(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors, bool for_object_info)
+ReadWriteBufferFromHTTP::CallResult ReadWriteBufferFromHTTP::callImpl(
+    Poco::Net::HTTPResponse & response, const std::string & method_, const std::optional<HTTPRange> & range, bool allow_redirects) const
 {
-    UpdatableSessionPtr current_session = nullptr;
+    if (remote_host_filter)
+        remote_host_filter->checkURL(current_uri);
 
-    /// 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;
+    Poco::Net::HTTPRequest request(method_, current_uri.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
+    prepareRequest(request, range);
 
-    call(current_session, response, method_, throw_on_all_errors, for_object_info);
-    saved_uri_redirect = uri;
+    auto session = makeHTTPSession(connection_group, current_uri, timeouts, proxy_config);
+
+    ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPRequestsSent);
+
+    auto & stream_out = session->sendRequest(request);
+    if (out_stream_callback)
+        out_stream_callback(stream_out);
+
+    auto & resp_stream = session->receiveResponse(response);
+
+    assertResponseIsOk(current_uri.toString(), response, resp_stream, allow_redirects);
+
+    return ReadWriteBufferFromHTTP::CallResult(std::move(session), resp_stream);
+}
+
+ReadWriteBufferFromHTTP::CallResult ReadWriteBufferFromHTTP::callWithRedirects(
+    Poco::Net::HTTPResponse & response, const String & method_, const std::optional<HTTPRange> & range)
+{
+    auto result = callImpl(response, method_, range, true);
 
     while (isRedirect(response.getStatus()))
     {
-        Poco::URI uri_redirect = getUriAfterRedirect(*saved_uri_redirect, response);
-        saved_uri_redirect = uri_redirect;
-        if (remote_host_filter)
-            remote_host_filter->checkURL(uri_redirect);
+        Poco::URI uri_redirect = getUriAfterRedirect(current_uri, response);
+        ++redirects;
+        if (redirects > max_redirects)
+            throw Exception(
+                ErrorCodes::TOO_MANY_REDIRECTS,
+                "Too many redirects while trying to access {}."
+                " You can {} redirects by changing the setting 'max_http_get_redirects'."
+                " Example: `SET max_http_get_redirects = 10`."
+                " Redirects are restricted to prevent possible attack when a malicious server redirects to an internal resource, bypassing the authentication or firewall.",
+                initial_uri.toString(), max_redirects ? "increase the allowed maximum number of" : "allow");
 
-        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;
+        current_uri = uri_redirect;
+        result = callImpl(response, method_, range, true);
     }
+
+    return result;
 }
 
-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)
+
+void ReadWriteBufferFromHTTP::doWithRetries(std::function<void()> && callable,
+                                            std::function<void()> on_retry,
+                                            bool mute_logging) const
 {
-    try
+    [[maybe_unused]] auto milliseconds_to_wait = read_settings.http_retry_initial_backoff_ms;
+
+    bool is_retriable = true;
+    std::exception_ptr exception = nullptr;
+
+    for (size_t attempt = 1; attempt <= read_settings.http_max_tries; ++attempt)
     {
-        /// 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;
+        [[maybe_unused]] bool last_attempt = attempt + 1 > read_settings.http_max_tries;
 
-        if (throw_on_all_errors)
-            throw;
+        String error_message;
 
-        auto http_status = response.getStatus();
-
-        if (http_status == Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND && http_skip_not_found_url)
+        try
         {
-            initialization_error = InitializeError::SKIP_NOT_FOUND_URL;
+            callable();
+            return;
         }
-        else if (!isRetriableError(http_status))
+        catch (Poco::Net::NetException & e)
         {
-            initialization_error = InitializeError::NON_RETRYABLE_ERROR;
+            error_message = e.displayText();
             exception = std::current_exception();
         }
+        catch (DB::NetException & e)
+        {
+            error_message = e.displayText();
+            exception = std::current_exception();
+        }
+        catch (DB::HTTPException & e)
+        {
+            if (!isRetriableError(e.getHTTPStatus()))
+                is_retriable = false;
+
+            error_message = e.displayText();
+            exception = std::current_exception();
+        }
+        catch (DB::Exception & e)
+        {
+            is_retriable = false;
+
+            error_message = e.displayText();
+            exception = std::current_exception();
+        }
+        catch (Poco::Exception & e)
+        {
+            if (e.code() == POCO_EMFILE)
+                is_retriable = false;
+
+            error_message = e.displayText();
+            exception = std::current_exception();
+        }
+
+        chassert(exception);
+
+        if (last_attempt || !is_retriable)
+        {
+            if (!mute_logging)
+                LOG_DEBUG(log,
+                          "Failed to make request to '{}'{}. "
+                          "Error: '{}'. "
+                          "Failed at try {}/{}.",
+                          initial_uri.toString(), current_uri == initial_uri ? String() : fmt::format(" redirect to '{}'", current_uri.toString()),
+                          error_message,
+                          attempt, read_settings.http_max_tries);
+
+            std::rethrow_exception(exception);
+        }
         else
         {
-            throw;
+            if (on_retry)
+                on_retry();
+
+            if (!mute_logging)
+                LOG_TRACE(log,
+                         "Failed to make request to '{}'{}. "
+                         "Error: {}. "
+                         "Failed at try {}/{}. "
+                         "Will retry with current backoff wait is {}/{} ms.",
+                         initial_uri.toString(), current_uri == initial_uri ? String() : fmt::format(" redirect to '{}'", current_uri.toString()),
+                         error_message,
+                         attempt + 1, read_settings.http_max_tries,
+                         milliseconds_to_wait, read_settings.http_retry_max_backoff_ms);
+
+            sleepForMilliseconds(milliseconds_to_wait);
+            milliseconds_to_wait = std::min(milliseconds_to_wait * 2, read_settings.http_retry_max_backoff_ms);
         }
     }
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::initialize()
+
+std::unique_ptr<ReadBuffer> ReadWriteBufferFromHTTP::initialize()
 {
     Poco::Net::HTTPResponse response;
 
-    call(session, response, method);
-    if (initialization_error != InitializeError::NONE)
-        return;
+    std::optional<HTTPRange> range;
+    if (withPartialContent())
+        range = HTTPRange{getOffset(), read_range.end};
 
-    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);
+    auto result = callWithRedirects(response, method, range);
 
-        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)
+    if (range.has_value() && 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)
+            /// Retry 200OK
+            if (response.getStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_OK)
             {
-                exception = std::make_exception_ptr(Exception(
+                String reason = fmt::format(
+                    "Cannot read with range: [{}, {}] (response status: {}, reason: {}), will retry",
+                    *read_range.begin, read_range.end ? toString(*read_range.end) : "-",
+                    toString(response.getStatus()), response.getReason());
+
+                /// it is retriable error
+                throw HTTPException(
+                    ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
+                    current_uri.toString(),
+                    Poco::Net::HTTPResponse::HTTP_REQUESTED_RANGE_NOT_SATISFIABLE,
+                    reason,
+                    "");
+            }
+            else
+                throw 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;
+                    toString(response.getStatus()), response.getReason());
         }
         else if (read_range.end)
         {
@@ -425,257 +425,147 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::initialize()
         }
     }
 
+    response.getCookies(cookies);
+    content_encoding = response.get("Content-Encoding", "");
+
     // 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);
+        file_info = parseFileInfo(response, range.has_value() ? getOffset() : 0);
 
-    impl = std::make_unique<ReadBufferFromIStream>(*istr, buffer_size);
-
-    if (use_external_buffer)
-        setupExternalBuffer();
+    return std::move(result).transformToReadBuffer(use_external_buffer ? 0 : buffer_size);
 }
 
-template <typename UpdatableSessionPtr>
-bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::nextImpl()
+bool ReadWriteBufferFromHTTP::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()))
-    {
-        /// Response was fully read.
-        markSessionForReuse(session->getSession());
-        ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPPreservedSessions);
-        return false;
-    }
+    bool next_result = 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
+    doWithRetries(
+        /*callable=*/ [&] ()
         {
             if (!impl)
             {
-                initialize();
-
-                if (initialization_error == InitializeError::NON_RETRYABLE_ERROR)
+                try
                 {
-                    assert(exception);
-                    break;
+                    impl = initialize();
                 }
-                else if (initialization_error == InitializeError::SKIP_NOT_FOUND_URL)
+                catch (HTTPException & e)
                 {
-                    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);
+                    if (http_skip_not_found_url && e.getHTTPStatus() == Poco::Net::HTTPResponse::HTTPStatus::HTTP_NOT_FOUND)
+                    {
+                        next_result = false;
+                        has_not_found_url = true;
+                        return;
+                    }
 
-                    assert(exception);
-                    on_retriable_error();
-                    continue;
+                    throw;
                 }
 
-                assert(!exception);
-
                 if (use_external_buffer)
                 {
-                    setupExternalBuffer();
+                    impl->set(internal_buffer.begin(), internal_buffer.size());
+                }
+                else
+                {
+                    BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset());
                 }
             }
 
-            result = impl->next();
-            exception = nullptr;
-            break;
-        }
-        catch (const Poco::Exception & e)
+            if (use_external_buffer)
+            {
+                impl->set(internal_buffer.begin(), internal_buffer.size());
+            }
+            else
+            {
+                impl->position() = position();
+            }
+
+            next_result = impl->next();
+
+            BufferBase::set(impl->buffer().begin(), impl->buffer().size(), impl->offset());
+
+            offset_from_begin_pos += working_buffer.size();
+
+            ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPBytes, working_buffer.size());
+        },
+        /*on_retry=*/ [&] ()
         {
-            /// Too many open files - non-retryable.
-            if (e.code() == POCO_EMFILE)
-                throw;
+            impl.reset();
+        });
 
-            /** 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)
-    {
-        /// Eof is reached, i.e response was fully read.
-        markSessionForReuse(session->getSession());
-        ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPPreservedSessions);
-        return false;
-    }
-
-    internal_buffer = impl->buffer();
-    working_buffer = internal_buffer;
-    offset_from_begin_pos += working_buffer.size();
-    return true;
+    return next_result;
 }
 
-template <typename UpdatableSessionPtr>
-size_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> & progress_callback)
+size_t ReadWriteBufferFromHTTP::readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> & progress_callback) const
 {
     /// Caller must have checked supportsReadAt().
-    /// This ensures we've sent at least one HTTP request and populated saved_uri_redirect.
+    /// This ensures we've sent at least one HTTP request and populated current_uri.
     chassert(file_info && file_info->seekable);
 
-    Poco::URI uri_ = saved_uri_redirect.value_or(uri);
-    if (uri_.getPath().empty())
-        uri_.setPath("/");
-
     size_t initial_n = n;
-    size_t milliseconds_to_wait = settings.http_retry_initial_backoff_ms;
+    size_t total_bytes_copied = 0;
+    size_t bytes_copied = 0;
+    bool is_canceled = false;
 
-    for (size_t attempt = 0; n > 0; ++attempt)
-    {
-        bool last_attempt = attempt + 1 >= settings.http_max_tries;
-
-        Poco::Net::HTTPRequest request(method, uri_.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
-        prepareRequest(request, uri_, HTTPRange { .begin = offset, .end = offset + n - 1});
-
-        LOG_TRACE(log, "Sending request to {} for range [{}, {})", uri_.toString(), offset, offset + n);
-
-        auto sess = session->createDetachedSession(uri_);
-
-        Poco::Net::HTTPResponse response;
-        std::istream * result_istr;
-        size_t bytes_copied = 0;
-
-        try
+    doWithRetries(
+        /*callable=*/ [&] ()
         {
-            sess->sendRequest(request);
-            result_istr = receiveResponse(*sess, request, response, /*allow_redirects*/ false);
+            auto range = HTTPRange{offset, offset + n - 1};
+
+            Poco::Net::HTTPResponse response;
+            auto result = callImpl(response, method, range, false);
 
             if (response.getStatus() != Poco::Net::HTTPResponse::HTTPStatus::HTTP_PARTIAL_CONTENT &&
                 (offset != 0 || offset + n < *file_info->file_size))
-                throw Exception(
-                    ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
-                    "Expected 206 Partial Content, got {} when reading {} range [{}, {})",
-                    toString(response.getStatus()), uri_.toString(), offset, offset + n);
-
-            copyFromIStreamWithProgressCallback(*result_istr, to, n, progress_callback, &bytes_copied);
-            if (bytes_copied == n)
             {
-                result_istr->ignore(UINT64_MAX);
-                /// Response was fully read.
-                markSessionForReuse(*sess);
-                ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPPreservedSessions);
+                String reason = fmt::format(
+                    "When reading with readBigAt {}."
+                    "Cannot read with range: [{}, {}] (response status: {}, reason: {}), will retry",
+                    initial_uri.toString(),
+                    *range.begin, *range.end,
+                    toString(response.getStatus()), response.getReason());
+
+                throw HTTPException(
+                    ErrorCodes::HTTP_RANGE_NOT_SATISFIABLE,
+                    current_uri.toString(),
+                    Poco::Net::HTTPResponse::HTTP_REQUESTED_RANGE_NOT_SATISFIABLE,
+                    reason,
+                    "");
             }
-        }
-        catch (const Poco::Exception & e)
+
+            copyFromIStreamWithProgressCallback(*result.response_stream, to, n, progress_callback, &bytes_copied, &is_canceled);
+
+            ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPBytes, bytes_copied);
+
+            offset += bytes_copied;
+            total_bytes_copied += bytes_copied;
+            to += bytes_copied;
+            n -= bytes_copied;
+            bytes_copied = 0;
+        },
+        /*on_retry=*/ [&] ()
         {
-            LOG_ERROR(
-                log,
-                "HTTP request (positioned) to `{}` with range [{}, {}) failed at try {}/{}: {}",
-                uri_.toString(), offset, offset + n, attempt + 1, settings.http_max_tries,
-                e.what());
+            ProfileEvents::increment(ProfileEvents::ReadWriteBufferFromHTTPBytes, bytes_copied);
 
-            /// Decide whether to retry.
+            offset += bytes_copied;
+            total_bytes_copied += bytes_copied;
+            to += bytes_copied;
+            n -= bytes_copied;
+            bytes_copied = 0;
+        });
 
-            if (last_attempt)
-                throw;
-
-            /// Too many open files - non-retryable.
-            if (e.code() == POCO_EMFILE)
-                throw;
-
-            if (const auto * h = dynamic_cast<const HTTPException*>(&e);
-                h && !isRetriableError(static_cast<Poco::Net::HTTPResponse::HTTPStatus>(h->getHTTPStatus())))
-                throw;
-
-            sleepForMilliseconds(milliseconds_to_wait);
-            milliseconds_to_wait = std::min(milliseconds_to_wait * 2, settings.http_retry_max_backoff_ms);
-        }
-
-        /// Make sure retries don't re-read the bytes that we've already reported to progress_callback.
-        offset += bytes_copied;
-        to += bytes_copied;
-        n -= bytes_copied;
-    }
-
-    return initial_n;
+    chassert(total_bytes_copied == initial_n || is_canceled);
+    return total_bytes_copied;
 }
 
-template <typename UpdatableSessionPtr>
-off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getPosition() { return getOffset() - available(); }
+off_t ReadWriteBufferFromHTTP::getPosition()
+{
+    return getOffset() - available();
+}
 
-template <typename UpdatableSessionPtr>
-off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int whence)
+off_t ReadWriteBufferFromHTTP::seek(off_t offset_, int whence)
 {
     if (whence != SEEK_SET)
         throw Exception(ErrorCodes::CANNOT_SEEK_THROUGH_FILE, "Only SEEK_SET mode is allowed.");
@@ -688,8 +578,8 @@ off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int
     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());
+        chassert(pos >= working_buffer.begin());
+        chassert(pos < working_buffer.end());
 
         return getPosition();
     }
@@ -697,10 +587,10 @@ off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int
     if (impl)
     {
         auto position = getPosition();
-        if (offset_ > position)
+        if (offset_ >= position)
         {
             size_t diff = offset_ - position;
-            if (diff < settings.remote_read_min_bytes_for_seek)
+            if (diff < read_settings.remote_read_min_bytes_for_seek)
             {
                 ignore(diff);
                 return offset_;
@@ -709,6 +599,7 @@ off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int
 
         if (!atEndOfRequestedRangeGuess())
             ProfileEvents::increment(ProfileEvents::ReadBufferSeekCancelConnection);
+
         impl.reset();
     }
 
@@ -719,8 +610,8 @@ off_t ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::seek(off_t offset_, int
     return offset_;
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilPosition(size_t until)
+
+void ReadWriteBufferFromHTTP::setReadUntilPosition(size_t until)
 {
     until = std::max(until, 1ul);
     if (read_range.end && *read_range.end + 1 == until)
@@ -736,8 +627,7 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilPosition(size
     }
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilEnd()
+void ReadWriteBufferFromHTTP::setReadUntilEnd()
 {
     if (!read_range.end)
         return;
@@ -752,11 +642,9 @@ void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setReadUntilEnd()
     }
 }
 
-template <typename UpdatableSessionPtr>
-bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::supportsRightBoundedReads() const { return true; }
+bool ReadWriteBufferFromHTTP::supportsRightBoundedReads() const { return true; }
 
-template <typename UpdatableSessionPtr>
-bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::atEndOfRequestedRangeGuess()
+bool ReadWriteBufferFromHTTP::atEndOfRequestedRangeGuess()
 {
     if (!impl)
         return true;
@@ -767,8 +655,7 @@ bool ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::atEndOfRequestedRangeGues
     return false;
 }
 
-template <typename UpdatableSessionPtr>
-std::string ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getResponseCookie(const std::string & name, const std::string & def) const
+std::string ReadWriteBufferFromHTTP::getResponseCookie(const std::string & name, const std::string & def) const
 {
     for (const auto & cookie : cookies)
         if (cookie.getName() == name)
@@ -776,19 +663,19 @@ std::string ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getResponseCookie(
     return def;
 }
 
-template <typename UpdatableSessionPtr>
-void ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::setNextCallback(NextCallback next_callback_)
+void ReadWriteBufferFromHTTP::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; }
+const std::string & ReadWriteBufferFromHTTP::getCompressionMethod() const
+{
+    return content_encoding;
+}
 
-template <typename UpdatableSessionPtr>
-std::optional<time_t> ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::tryGetLastModificationTime()
+std::optional<time_t> ReadWriteBufferFromHTTP::tryGetLastModificationTime()
 {
     if (!file_info)
     {
@@ -805,12 +692,11 @@ std::optional<time_t> ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::tryGetLa
     return file_info->last_modified;
 }
 
-template <typename UpdatableSessionPtr>
-HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileInfo()
+ReadWriteBufferFromHTTP::HTTPFileInfo ReadWriteBufferFromHTTP::getFileInfo()
 {
     /// May be disabled in case the user knows in advance that the server doesn't support HEAD requests.
     /// Allows to avoid making unnecessary requests in such cases.
-    if (!settings.http_make_head_request)
+    if (!read_settings.http_make_head_request)
         return HTTPFileInfo{};
 
     Poco::Net::HTTPResponse response;
@@ -832,11 +718,11 @@ HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::getFileInfo()
 
         throw;
     }
+
     return parseFileInfo(response, 0);
 }
 
-template <typename UpdatableSessionPtr>
-HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin)
+ReadWriteBufferFromHTTP::HTTPFileInfo ReadWriteBufferFromHTTP::parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin)
 {
     HTTPFileInfo res;
 
@@ -868,79 +754,3 @@ HTTPFileInfo ReadWriteBufferFromHTTPBase<UpdatableSessionPtr>::parseFileInfo(con
 }
 
 }
-
-SessionFactory::SessionFactory(const ConnectionTimeouts & timeouts_, ProxyConfiguration proxy_config_)
-    : timeouts(timeouts_), proxy_config(proxy_config_) {}
-
-SessionFactory::SessionType SessionFactory::buildNewSession(const Poco::URI & uri)
-{
-    return makeHTTPSession(uri, timeouts, proxy_config);
-}
-
-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_,
-    ProxyConfiguration proxy_config_)
-    : Parent(
-        std::make_shared<SessionType>(uri_, max_redirects, std::make_shared<SessionFactory>(timeouts, proxy_config_)),
-        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_,
-        proxy_config_) {}
-
-
-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 Poco::Net::HTTPBasicCredentials & credentials_,
-    size_t buffer_size_,
-    const UInt64 max_redirects,
-    PooledSessionFactoryPtr session_factory)
-    : Parent(
-        std::make_shared<SessionType>(uri_, max_redirects, session_factory),
-        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 29c0804bb28..f496fe3ddcd 100644
--- a/src/IO/ReadWriteBufferFromHTTP.h
+++ b/src/IO/ReadWriteBufferFromHTTP.h
@@ -20,7 +20,6 @@
 #include <Poco/Net/HTTPResponse.h>
 #include <Poco/URI.h>
 #include <Poco/URIStreamFactory.h>
-#include <Common/DNSResolver.h>
 #include <Common/RemoteHostFilter.h>
 #include "config.h"
 #include <Common/config_version.h>
@@ -30,44 +29,19 @@
 namespace DB
 {
 
-template <typename TSessionFactory>
-class UpdatableSession
+class ReadWriteBufferFromHTTP : public SeekableReadBuffer, public WithFileName, public WithFileSize
 {
 public:
-    using SessionPtr = typename TSessionFactory::SessionType;
-
-    explicit UpdatableSession(const Poco::URI & uri, UInt64 max_redirects_, std::shared_ptr<TSessionFactory> session_factory_);
-
-    SessionPtr getSession();
-
-    void updateSession(const Poco::URI & uri);
-
-    /// Thread safe.
-    SessionPtr createDetachedSession(const Poco::URI & uri);
-
-    std::shared_ptr<UpdatableSession<TSessionFactory>> clone(const Poco::URI & uri);
+    /// 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;
+    };
 
 private:
-    SessionPtr session;
-    UInt64 redirects{0};
-    UInt64 max_redirects;
-    Poco::URI initial_uri;
-    std::shared_ptr<TSessionFactory> session_factory;
-};
-
-
-/// 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
     {
@@ -75,218 +49,214 @@ namespace detail
         std::optional<size_t> end;
     };
 
-    template <typename UpdatableSessionPtr>
-    class ReadWriteBufferFromHTTPBase : public SeekableReadBuffer, public WithFileName, public WithFileSize
+    struct CallResult
     {
-    protected:
-        Poco::URI uri;
-        std::string method;
-        std::string content_encoding;
+        HTTPSessionPtr session;
+        std::istream * response_stream = nullptr;
 
-        UpdatableSessionPtr session;
-        std::istream * istr; /// owned by session
-        std::unique_ptr<ReadBuffer> impl;
-        std::function<void(std::ostream &)> out_stream_callback;
-        const Poco::Net::HTTPBasicCredentials & credentials;
-        std::vector<Poco::Net::HTTPCookie> cookies;
-        HTTPHeaderEntries http_header_entries;
-        const RemoteHostFilter * remote_host_filter = nullptr;
-        std::function<void(size_t)> next_callback;
+        CallResult(HTTPSessionPtr && session_, std::istream & response_stream_)
+            : session(session_)
+            , response_stream(&response_stream_)
+        {}
+        CallResult(CallResult &&) = default;
+        CallResult & operator= (CallResult &&) = default;
 
-        size_t buffer_size;
-        bool use_external_buffer;
-
-        size_t offset_from_begin_pos = 0;
-        HTTPRange read_range;
-        std::optional<HTTPFileInfo> file_info;
-
-        /// Delayed exception in case retries with partial content are not satisfiable.
-        std::exception_ptr exception;
-        bool retry_with_range_header = false;
-        /// In case of redirects, save result uri to use it if we retry the request.
-        std::optional<Poco::URI> saved_uri_redirect;
-
-        bool http_skip_not_found_url;
-
-        ReadSettings settings;
-        Poco::Logger * log;
-
-        ProxyConfiguration proxy_config;
-
-        bool withPartialContent(const HTTPRange & range) const;
-
-        size_t getOffset() const;
-
-        void prepareRequest(Poco::Net::HTTPRequest & request, Poco::URI uri_, std::optional<HTTPRange> range) const;
-
-        std::istream * callImpl(UpdatableSessionPtr & current_session, Poco::URI uri_, Poco::Net::HTTPResponse & response, const std::string & method_, bool for_object_info = false);
-
-        size_t getFileSize() override;
-
-        bool supportsReadAt() override;
-
-        bool checkIfActuallySeekable() override;
-
-        String getFileName() const override;
-
-        enum class InitializeError
-        {
-            RETRYABLE_ERROR,
-            /// If error is not retriable, `exception` variable must be set.
-            NON_RETRYABLE_ERROR,
-            /// Allows to skip not found urls for globs
-            SKIP_NOT_FOUND_URL,
-            NONE,
-        };
-
-        InitializeError initialization_error = InitializeError::NONE;
-
-    private:
-        void getHeadResponse(Poco::Net::HTTPResponse & response);
-
-        void setupExternalBuffer();
-
-    public:
-        using NextCallback = std::function<void(size_t)>;
-        using OutStreamCallback = std::function<void(std::ostream &)>;
-
-        explicit ReadWriteBufferFromHTTPBase(
-            UpdatableSessionPtr session_,
-            Poco::URI uri_,
-            const Poco::Net::HTTPBasicCredentials & credentials_,
-            const std::string & method_ = {},
-            OutStreamCallback out_stream_callback_ = {},
-            size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
-            const ReadSettings & settings_ = {},
-            HTTPHeaderEntries http_header_entries_ = {},
-            const RemoteHostFilter * remote_host_filter_ = nullptr,
-            bool delay_initialization = false,
-            bool use_external_buffer_ = false,
-            bool http_skip_not_found_url_ = false,
-            std::optional<HTTPFileInfo> file_info_ = std::nullopt,
-            ProxyConfiguration proxy_config_ = {});
-
-        void callWithRedirects(Poco::Net::HTTPResponse & response, const String & method_, bool throw_on_all_errors = false, bool for_object_info = false);
-
-        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();
-
-        bool nextImpl() override;
-
-        size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> & progress_callback) override;
-
-        off_t getPosition() override;
-
-        off_t seek(off_t offset_, int whence) override;
-
-        void setReadUntilPosition(size_t until) override;
-
-        void setReadUntilEnd() override;
-
-        bool supportsRightBoundedReads() const override;
-
-        // If true, if we destroy impl now, no work was wasted. Just for metrics.
-        bool atEndOfRequestedRangeGuess();
-
-        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_);
-
-        const std::string & getCompressionMethod() const;
-
-        std::optional<time_t> tryGetLastModificationTime();
-
-        HTTPFileInfo getFileInfo();
-
-        HTTPFileInfo parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin);
+        std::unique_ptr<ReadBuffer> transformToReadBuffer(size_t buf_size) &&;
     };
-}
 
-class SessionFactory
-{
-public:
-    explicit SessionFactory(const ConnectionTimeouts & timeouts_, ProxyConfiguration proxy_config_ = {});
+    const HTTPConnectionGroupType connection_group;
+    const Poco::URI initial_uri;
+    const std::string method;
+    const ProxyConfiguration proxy_config;
+    const ReadSettings read_settings;
+    const ConnectionTimeouts timeouts;
 
-    using SessionType = HTTPSessionPtr;
+    const Poco::Net::HTTPBasicCredentials & credentials;
+    const RemoteHostFilter * remote_host_filter;
 
-    SessionType buildNewSession(const Poco::URI & uri);
-private:
-    ConnectionTimeouts timeouts;
-    ProxyConfiguration proxy_config;
-};
+    const size_t buffer_size;
+    const size_t max_redirects;
 
-class ReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<SessionFactory>>>
-{
-    using SessionType = UpdatableSession<SessionFactory>;
-    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<SessionType>>;
+    const bool use_external_buffer;
+    const bool http_skip_not_found_url;
+    bool has_not_found_url = false;
+
+    std::function<void(std::ostream &)> out_stream_callback;
+
+    Poco::URI current_uri;
+    size_t redirects = 0;
+
+    std::string content_encoding;
+    std::unique_ptr<ReadBuffer> impl;
+
+    std::vector<Poco::Net::HTTPCookie> cookies;
+    HTTPHeaderEntries http_header_entries;
+    std::function<void(size_t)> next_callback;
+
+    size_t offset_from_begin_pos = 0;
+    HTTPRange read_range;
+    std::optional<HTTPFileInfo> file_info;
+
+    LoggerPtr log;
+
+    bool withPartialContent() const;
+
+    void prepareRequest(Poco::Net::HTTPRequest & request, std::optional<HTTPRange> range) const;
+
+    void doWithRetries(std::function<void()> && callable, std::function<void()> on_retry = nullptr, bool mute_logging = false) const;
+
+    CallResult  callImpl(
+        Poco::Net::HTTPResponse & response,
+        const std::string & method_,
+        const std::optional<HTTPRange> & range,
+        bool allow_redirects) const;
+
+    CallResult  callWithRedirects(
+        Poco::Net::HTTPResponse & response,
+        const String & method_,
+        const std::optional<HTTPRange> & range);
+
+    std::unique_ptr<ReadBuffer> initialize();
+
+    size_t getFileSize() override;
+
+    bool supportsReadAt() override;
+
+    bool checkIfActuallySeekable() override;
+
+    String getFileName() const override;
+
+    void getHeadResponse(Poco::Net::HTTPResponse & response);
+
+    void setupExternalBuffer();
+
+    size_t getOffset() const;
+
+    // If true, if we destroy impl now, no work was wasted. Just for metrics.
+    bool atEndOfRequestedRangeGuess();
 
 public:
+    using NextCallback = std::function<void(size_t)>;
+    using OutStreamCallback = std::function<void(std::ostream &)>;
+
     ReadWriteBufferFromHTTP(
-        Poco::URI uri_,
+        const HTTPConnectionGroupType & connection_group_,
+        const Poco::URI & uri_,
         const std::string & method_,
-        OutStreamCallback out_stream_callback_,
-        const ConnectionTimeouts & timeouts,
-        const Poco::Net::HTTPBasicCredentials & credentials_,
-        const UInt64 max_redirects = 0,
-        size_t buffer_size_ = DBMS_DEFAULT_BUFFER_SIZE,
-        const ReadSettings & settings_ = {},
-        const HTTPHeaderEntries & http_header_entries_ = {},
-        const RemoteHostFilter * remote_host_filter_ = nullptr,
-        bool delay_initialization_ = true,
-        bool use_external_buffer_ = false,
-        bool skip_not_found_url_ = false,
-        std::optional<HTTPFileInfo> file_info_ = std::nullopt,
-        ProxyConfiguration proxy_config_ = {});
-};
-
-class PooledSessionFactory
-{
-public:
-    explicit PooledSessionFactory(
-        const ConnectionTimeouts & timeouts_, size_t per_endpoint_pool_size_);
-
-    using SessionType = PooledHTTPSessionPtr;
-
-    /// Thread safe.
-    SessionType buildNewSession(const Poco::URI & uri);
-
-private:
-    ConnectionTimeouts timeouts;
-    size_t per_endpoint_pool_size;
-};
-
-using PooledSessionFactoryPtr = std::shared_ptr<PooledSessionFactory>;
-
-class PooledReadWriteBufferFromHTTP : public detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<UpdatableSession<PooledSessionFactory>>>
-{
-    using SessionType = UpdatableSession<PooledSessionFactory>;
-    using Parent = detail::ReadWriteBufferFromHTTPBase<std::shared_ptr<SessionType>>;
-
-public:
-    explicit PooledReadWriteBufferFromHTTP(
-        Poco::URI uri_,
-        const std::string & method_,
-        OutStreamCallback out_stream_callback_,
+        ProxyConfiguration proxy_config_,
+        ReadSettings read_settings_,
+        ConnectionTimeouts timeouts_,
         const Poco::Net::HTTPBasicCredentials & credentials_,
+        const RemoteHostFilter * remote_host_filter_,
         size_t buffer_size_,
-        const UInt64 max_redirects,
-        PooledSessionFactoryPtr session_factory);
+        size_t max_redirects_,
+        OutStreamCallback out_stream_callback_,
+        bool use_external_buffer_,
+        bool http_skip_not_found_url_,
+        HTTPHeaderEntries http_header_entries_,
+        bool delay_initialization,
+        std::optional<HTTPFileInfo> file_info_);
+
+    bool nextImpl() override;
+
+    size_t readBigAt(char * to, size_t n, size_t offset, const std::function<bool(size_t)> & progress_callback) const override;
+
+    off_t seek(off_t offset_, int whence) override;
+
+    void setReadUntilPosition(size_t until) override;
+
+    void setReadUntilEnd() override;
+
+    bool supportsRightBoundedReads() const override;
+
+    off_t getPosition() override;
+
+    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_);
+
+    const std::string & getCompressionMethod() const;
+
+    std::optional<time_t> tryGetLastModificationTime();
+
+    bool hasNotFoundURL() const { return has_not_found_url; }
+
+    HTTPFileInfo getFileInfo();
+    static HTTPFileInfo parseFileInfo(const Poco::Net::HTTPResponse & response, size_t requested_range_begin);
 };
 
+using ReadWriteBufferFromHTTPPtr = std::unique_ptr<ReadWriteBufferFromHTTP>;
 
-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>>>;
+class BuilderRWBufferFromHTTP
+{
+    Poco::URI uri;
+    std::string method = Poco::Net::HTTPRequest::HTTP_GET;
+    HTTPConnectionGroupType connection_group = HTTPConnectionGroupType::HTTP;
+    ProxyConfiguration proxy_config{};
+    ReadSettings read_settings{};
+    ConnectionTimeouts timeouts{};
+    const RemoteHostFilter * remote_host_filter = nullptr;
+    size_t buffer_size = DBMS_DEFAULT_BUFFER_SIZE;
+    size_t max_redirects = 0;
+    ReadWriteBufferFromHTTP::OutStreamCallback out_stream_callback = nullptr;
+    bool use_external_buffer = false;
+    bool http_skip_not_found_url = false;
+    HTTPHeaderEntries http_header_entries{};
+    bool delay_initialization = true;
+
+public:
+    explicit BuilderRWBufferFromHTTP(Poco::URI uri_)
+        : uri(uri_)
+    {}
+
+/// NOLINTBEGIN(bugprone-macro-parentheses)
+#define setterMember(name, member) \
+    BuilderRWBufferFromHTTP & name(decltype(BuilderRWBufferFromHTTP::member) arg_##member) \
+    { \
+        member = std::move(arg_##member); \
+        return *this; \
+    }
+
+    setterMember(withConnectionGroup, connection_group)
+    setterMember(withMethod, method)
+    setterMember(withProxy, proxy_config)
+    setterMember(withSettings, read_settings)
+    setterMember(withTimeouts, timeouts)
+    setterMember(withHostFilter, remote_host_filter)
+    setterMember(withBufSize, buffer_size)
+    setterMember(withRedirects, max_redirects)
+    setterMember(withOutCallback, out_stream_callback)
+    setterMember(withHeaders, http_header_entries)
+    setterMember(withExternalBuf, use_external_buffer)
+    setterMember(withDelayInit, delay_initialization)
+    setterMember(withSkipNotFound, http_skip_not_found_url)
+#undef setterMember
+/// NOLINTEND(bugprone-macro-parentheses)
+
+    ReadWriteBufferFromHTTPPtr create(const Poco::Net::HTTPBasicCredentials & credentials_)
+    {
+        return std::make_unique<ReadWriteBufferFromHTTP>(
+            connection_group,
+            uri,
+            method,
+            proxy_config,
+            read_settings,
+            timeouts,
+            credentials_,
+            remote_host_filter,
+            buffer_size,
+            max_redirects,
+            out_stream_callback,
+            use_external_buffer,
+            http_skip_not_found_url,
+            http_header_entries,
+            delay_initialization,
+            /*file_info_=*/ std::nullopt);
+    }
+};
 
 }
diff --git a/src/IO/Resource/StaticResourceManager.cpp b/src/IO/Resource/StaticResourceManager.cpp
deleted file mode 100644
index a79e8148f94..00000000000
--- a/src/IO/Resource/StaticResourceManager.cpp
+++ /dev/null
@@ -1,138 +0,0 @@
-#include <IO/Resource/StaticResourceManager.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>
-#include <algorithm>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int RESOURCE_ACCESS_DENIED;
-    extern const int RESOURCE_NOT_FOUND;
-    extern const int INVALID_SCHEDULER_NODE;
-}
-
-StaticResourceManager::Resource::Resource(
-    const String & name,
-    EventQueue * event_queue,
-    const Poco::Util::AbstractConfiguration & config,
-    const std::string & config_prefix)
-{
-    // Initialize scheduler nodes
-    Poco::Util::AbstractConfiguration::Keys keys;
-    std::sort(keys.begin(), keys.end()); // for parents to appear before children
-    config.keys(config_prefix, keys);
-    for (const auto & key : keys)
-    {
-        if (!startsWith(key, "node"))
-            continue;
-
-        // Validate path
-        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);
-
-        // Create node
-        String type = config.getString(config_prefix + "." + key + ".type", "fifo");
-        SchedulerNodePtr node = SchedulerNodeFactory::instance().get(type, event_queue, config, config_prefix + "." + key);
-        node->basename = path.substr(1);
-
-        // Take ownership
-        if (auto [_, inserted] = nodes.emplace(path, node); !inserted)
-            throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Duplicate path '{}' for resource '{}'", path, name);
-
-        // Attach created node to parent (if not root)
-        if (path != "/")
-        {
-            String parent_path = path.substr(0, path.rfind('/'));
-            if (parent_path.empty())
-                parent_path = "/";
-            if (auto parent = nodes.find(parent_path); parent != nodes.end())
-                parent->second->attachChild(node);
-            else
-                throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "Parent doesn't exist for path '{}' for resource '{}'", path, name);
-        }
-    }
-
-    if (nodes.find("/") == nodes.end())
-        throw Exception(ErrorCodes::INVALID_SCHEDULER_NODE, "undefined root node path '/' for resource '{}'", name);
-}
-
-StaticResourceManager::Classifier::Classifier(const StaticResourceManager & manager, const ClassifierDescription & cfg)
-{
-    for (auto [resource_name, path] : cfg)
-    {
-        if (auto resource_iter = manager.resources.find(resource_name); resource_iter != manager.resources.end())
-        {
-            const Resource & 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.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 - unlimited
-    }
-}
-
-ResourceLink StaticResourceManager::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);
-}
-
-void StaticResourceManager::updateConfiguration(const Poco::Util::AbstractConfiguration & config)
-{
-    if (!resources.empty())
-        return; // already initialized, configuration update is not supported
-
-    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)
-    {
-        auto [iter, _] = resources.emplace(std::piecewise_construct,
-            std::forward_as_tuple(key),
-            std::forward_as_tuple(key, scheduler.event_queue, config, config_prefix + "." + key));
-        // Attach root of resource to scheduler
-        scheduler.attachChild(iter->second.nodes.find("/")->second);
-    }
-
-    // Initialize classifiers
-    classifiers = std::make_unique<ClassifiersConfig>(config);
-
-    // Run scheduler thread
-    scheduler.start();
-}
-
-ClassifierPtr StaticResourceManager::acquire(const String & classifier_name)
-{
-    return std::make_shared<Classifier>(*this, classifiers->get(classifier_name));
-}
-
-void registerStaticResourceManager(ResourceManagerFactory & factory)
-{
-    factory.registerMethod<StaticResourceManager>("static");
-}
-
-}
diff --git a/src/IO/Resource/StaticResourceManager.h b/src/IO/Resource/StaticResourceManager.h
deleted file mode 100644
index 5ec6a35750b..00000000000
--- a/src/IO/Resource/StaticResourceManager.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#pragma once
-
-#include <IO/IResourceManager.h>
-#include <IO/SchedulerRoot.h>
-#include <IO/Resource/ClassifiersConfig.h>
-
-#include <mutex>
-
-namespace DB
-{
-
-/*
- * Reads `<resources>` from config at startup and registers them in single `SchedulerRoot`.
- * Do not support configuration updates, server restart is required.
- */
-class StaticResourceManager : public IResourceManager
-{
-public:
-    // Just initialization, any further updates are ignored for the sake of simplicity
-    // NOTE: manager must be initialized before any acquire() calls to avoid races
-    void updateConfiguration(const Poco::Util::AbstractConfiguration & config) override;
-
-    ClassifierPtr acquire(const String & classifier_name) override;
-
-    void forEachNode(VisitorFunc visitor) override
-    {
-        UNUSED(visitor);
-    }
-
-private:
-    struct Resource
-    {
-        std::unordered_map<String, SchedulerNodePtr> nodes; // by paths
-
-        Resource(
-            const String & name,
-            EventQueue * event_queue,
-            const Poco::Util::AbstractConfiguration & config,
-            const std::string & config_prefix);
-    };
-
-    struct Classifier : public IClassifier
-    {
-        Classifier(const StaticResourceManager & manager, const ClassifierDescription & cfg);
-        ResourceLink get(const String & resource_name) override;
-        std::unordered_map<String, ResourceLink> resources; // accessible resources by names
-    };
-
-    SchedulerRoot scheduler;
-    std::unordered_map<String, Resource> resources; // by name
-    std::unique_ptr<ClassifiersConfig> classifiers;
-};
-
-}
diff --git a/src/IO/Resource/tests/gtest_resource_manager_static.cpp b/src/IO/Resource/tests/gtest_resource_manager_static.cpp
deleted file mode 100644
index 9c5e86e9ffc..00000000000
--- a/src/IO/Resource/tests/gtest_resource_manager_static.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-#include <gtest/gtest.h>
-
-#include <IO/Resource/tests/ResourceTest.h>
-
-#include <IO/Resource/StaticResourceManager.h>
-#include <Poco/Util/XMLConfiguration.h>
-
-using namespace DB;
-
-using ResourceTest = ResourceTestManager<StaticResourceManager>;
-using TestGuard = ResourceTest::Guard;
-
-TEST(IOResourceStaticResourceManager, Smoke)
-{
-    ResourceTest t;
-
-    t.update(R"CONFIG(
-        <clickhouse>
-            <resources>
-                <res1>
-                    <node path="/">      <type>inflight_limit</type><max_requests>10</max_requests></node>
-                    <node path="/prio">  <type>priority</type></node>
-                    <node path="/prio/A"></node>
-                    <node path="/prio/B"><priority>1</priority></node>
-                </res1>
-            </resources>
-            <workload_classifiers>
-                <A><res1>/prio/A</res1></A>
-                <B><res1>/prio/B</res1></B>
-            </workload_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"));
-        ga.unlock();
-        ResourceGuard gb(cb->get("res1"));
-    }
-}
-
-TEST(IOResourceStaticResourceManager, Prioritization)
-{
-    std::optional<Priority> last_priority;
-    auto check = [&] (Priority 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);
-
-    t.update(R"CONFIG(
-        <clickhouse>
-            <resources>
-                <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/C">     </node>
-                    <node path="/prio/D">     </node>
-                    <node path="/prio/leader"></node>
-                </res1>
-            </resources>
-            <workload_classifiers>
-                <A><res1>/prio/A</res1></A>
-                <B><res1>/prio/B</res1></B>
-                <C><res1>/prio/C</res1></C>
-                <D><res1>/prio/D</res1></D>
-                <leader><res1>/prio/leader</res1></leader>
-            </workload_classifiers>
-        </clickhouse>
-    )CONFIG");
-
-    for (String name : {"A", "B", "C", "D"})
-    {
-        for (int thr = 0; thr < threads_per_queue; thr++)
-        {
-            t.threads.emplace_back([&, name]
-            {
-                ClassifierPtr c = t.manager->acquire(name);
-                ResourceLink link = c->get("res1");
-                t.startBusyPeriod(link, 1, requests_per_thead);
-                for (int req = 0; req < requests_per_thead; req++)
-                {
-                    TestGuard g(t, link, 1);
-                    check(link.queue->info.priority);
-                }
-            });
-        }
-    }
-
-    ClassifierPtr c = t.manager->acquire("leader");
-    ResourceLink link = c->get("res1");
-    t.blockResource(link);
-}
diff --git a/src/IO/ResourceLink.h b/src/IO/ResourceLink.h
deleted file mode 100644
index 2da5e75fcba..00000000000
--- a/src/IO/ResourceLink.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <base/types.h>
-
-#include <IO/ResourceRequest.h>
-#include <IO/ISchedulerQueue.h>
-
-
-namespace DB
-{
-
-/*
- * Everything required for resource consumption. Connection to a specific resource queue.
- */
-struct ResourceLink
-{
-    ISchedulerQueue * queue = nullptr;
-    bool operator==(const ResourceLink &) const = default;
-
-    void adjust(ResourceCost estimated_cost, ResourceCost real_cost) const
-    {
-        if (queue)
-            queue->adjustBudget(estimated_cost, real_cost);
-    }
-
-    void consumed(ResourceCost cost) const
-    {
-        if (queue)
-            queue->consumeBudget(cost);
-    }
-
-    void accumulate(ResourceCost cost) const
-    {
-        if (queue)
-            queue->accumulateBudget(cost);
-    }
-};
-
-}
diff --git a/src/IO/S3/AWSLogger.cpp b/src/IO/S3/AWSLogger.cpp
index d6162823aee..dcdba7753b2 100644
--- a/src/IO/S3/AWSLogger.cpp
+++ b/src/IO/S3/AWSLogger.cpp
@@ -41,7 +41,7 @@ AWSLogger::AWSLogger(bool enable_s3_requests_logging_)
     : enable_s3_requests_logging(enable_s3_requests_logging_)
 {
     for (auto [tag, name] : S3_LOGGER_TAG_NAMES)
-        tag_loggers[tag] = &Poco::Logger::get(name);
+        tag_loggers[tag] = getLogger(name);
 
     default_logger = tag_loggers[S3_LOGGER_TAG_NAMES[0][0]];
 }
diff --git a/src/IO/S3/AWSLogger.h b/src/IO/S3/AWSLogger.h
index fdb6eed1f86..a4987f17c0d 100644
--- a/src/IO/S3/AWSLogger.h
+++ b/src/IO/S3/AWSLogger.h
@@ -6,6 +6,7 @@
 #include <aws/core/utils/logging/LogSystemInterface.h>
 #include <base/types.h>
 #include <unordered_map>
+#include <Common/Logger.h>
 
 namespace Poco { class Logger; }
 
@@ -29,9 +30,9 @@ public:
     void Flush() final {}
 
 private:
-    Poco::Logger * default_logger;
+    LoggerPtr default_logger;
     bool enable_s3_requests_logging;
-    std::unordered_map<String, Poco::Logger *> tag_loggers;
+    std::unordered_map<String, LoggerPtr> tag_loggers;
 };
 
 }
diff --git a/src/IO/S3/BlobStorageLogWriter.cpp b/src/IO/S3/BlobStorageLogWriter.cpp
index fe33f1c8799..aaf4aea5a8e 100644
--- a/src/IO/S3/BlobStorageLogWriter.cpp
+++ b/src/IO/S3/BlobStorageLogWriter.cpp
@@ -3,6 +3,7 @@
 #if USE_AWS_S3
 
 #include <base/getThreadId.h>
+#include <Common/CurrentThread.h>
 #include <Common/setThreadName.h>
 #include <IO/S3/Client.h>
 #include <Interpreters/Context.h>
diff --git a/src/IO/S3/Client.cpp b/src/IO/S3/Client.cpp
index b65de8d34a7..b2ad4668095 100644
--- a/src/IO/S3/Client.cpp
+++ b/src/IO/S3/Client.cpp
@@ -1,4 +1,6 @@
 #include <IO/S3/Client.h>
+#include <Common/CurrentThread.h>
+#include <Common/Exception.h>
 
 #if USE_AWS_S3
 
@@ -168,7 +170,7 @@ Client::Client(
     , client_settings(client_settings_)
     , max_redirects(max_redirects_)
     , sse_kms_config(std::move(sse_kms_config_))
-    , log(&Poco::Logger::get("S3Client"))
+    , log(getLogger("S3Client"))
 {
     auto * endpoint_provider = dynamic_cast<Aws::S3::Endpoint::S3DefaultEpProviderBase *>(accessEndpointProvider().get());
     endpoint_provider->GetBuiltInParameters().GetParameter("Region").GetString(explicit_region);
@@ -218,7 +220,7 @@ Client::Client(
     , provider_type(other.provider_type)
     , max_redirects(other.max_redirects)
     , sse_kms_config(other.sse_kms_config)
-    , log(&Poco::Logger::get("S3Client"))
+    , log(getLogger("S3Client"))
 {
     cache = std::make_shared<ClientCache>(*other.cache);
     ClientCacheRegistry::instance().registerClient(cache);
@@ -304,6 +306,9 @@ Model::HeadObjectOutcome Client::HeadObject(HeadObjectRequest & request) const
 
     request.setApiMode(api_mode);
 
+    if (isS3ExpressBucket())
+        request.setIsS3ExpressBucket();
+
     addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers);
 
     if (auto region = getRegionForBucket(bucket); !region.empty())
@@ -530,7 +535,11 @@ Client::doRequest(RequestType & request, RequestFn request_fn) const
     addAdditionalAMZHeadersToCanonicalHeadersList(request, client_configuration.extra_headers);
     const auto & bucket = request.GetBucket();
     request.setApiMode(api_mode);
-    if (client_settings.disable_checksum)
+
+    /// We have to use checksums for S3Express buckets, so the order of checks should be the following
+    if (client_settings.is_s3express_bucket)
+        request.setIsS3ExpressBucket();
+    else if (client_settings.disable_checksum)
         request.disableChecksum();
 
     if (auto region = getRegionForBucket(bucket); !region.empty())
@@ -689,9 +698,9 @@ void Client::BuildHttpRequest(const Aws::AmazonWebServiceRequest& request,
     if (api_mode == ApiMode::GCS)
     {
         /// some GCS requests don't like S3 specific headers that the client sets
+        /// all "x-amz-*" headers have to be either converted or deleted
+        /// note that "amz-sdk-invocation-id" and "amz-sdk-request" are preserved
         httpRequest->DeleteHeader("x-amz-api-version");
-        httpRequest->DeleteHeader("amz-sdk-invocation-id");
-        httpRequest->DeleteHeader("amz-sdk-request");
     }
 }
 
@@ -715,7 +724,7 @@ std::string Client::getRegionForBucket(const std::string & bucket, bool force_de
     if (outcome.IsSuccess())
     {
         const auto & result = outcome.GetResult();
-        region = result.GetRegion();
+        region = result.GetBucketRegion();
     }
     else
     {
@@ -838,7 +847,7 @@ void ClientCacheRegistry::clearCacheForAll()
         }
         else
         {
-            LOG_INFO(&Poco::Logger::get("ClientCacheRegistry"), "Deleting leftover S3 client cache");
+            LOG_INFO(getLogger("ClientCacheRegistry"), "Deleting leftover S3 client cache");
             it = client_caches.erase(it);
         }
     }
@@ -915,9 +924,9 @@ std::unique_ptr<S3::Client> ClientFactory::create( // NOLINT
         std::move(sse_kms_config),
         credentials_provider,
         client_configuration, // Client configuration.
-        Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
-        client_settings
-    );
+        client_settings.is_s3express_bucket ? Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::RequestDependent
+                                            : Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
+        client_settings);
 }
 
 PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
@@ -956,6 +965,11 @@ PocoHTTPClientConfiguration ClientFactory::createClientConfiguration( // NOLINT
     return config;
 }
 
+bool isS3ExpressEndpoint(const std::string & endpoint)
+{
+    /// On one hand this check isn't 100% reliable, on the other - all it will change is whether we attach checksums to the requests.
+    return endpoint.contains("s3express");
+}
 }
 
 }
diff --git a/src/IO/S3/Client.h b/src/IO/S3/Client.h
index 677b739fd39..c79ec05c8c6 100644
--- a/src/IO/S3/Client.h
+++ b/src/IO/S3/Client.h
@@ -92,11 +92,13 @@ private:
     std::unordered_map<ClientCache *, std::weak_ptr<ClientCache>> client_caches;
 };
 
+bool isS3ExpressEndpoint(const std::string & endpoint);
+
 struct ClientSettings
 {
-    bool use_virtual_addressing;
+    bool use_virtual_addressing = false;
     /// Disable checksum to avoid extra read of the input stream
-    bool disable_checksum;
+    bool disable_checksum = false;
     /// Should client send ComposeObject request after upload to GCS.
     ///
     /// Previously ComposeObject request was required to make Copy possible,
@@ -106,7 +108,8 @@ struct ClientSettings
     ///
     /// Ability to enable it preserved since likely it is required for old
     /// files.
-    bool gcs_issue_compose_request;
+    bool gcs_issue_compose_request = false;
+    bool is_s3express_bucket = false;
 };
 
 /// Client that improves the client from the AWS SDK
@@ -208,6 +211,9 @@ public:
                           const std::shared_ptr<Aws::Http::HttpRequest>& httpRequest) const override;
 
     bool supportsMultiPartCopy() const;
+
+    bool isS3ExpressBucket() const { return client_settings.is_s3express_bucket; }
+
 private:
     friend struct ::MockS3::Client;
 
@@ -281,7 +287,7 @@ private:
 
     const ServerSideEncryptionKMSConfig sse_kms_config;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 class ClientFactory
diff --git a/src/IO/S3/Credentials.cpp b/src/IO/S3/Credentials.cpp
index b0b33244015..80366510b53 100644
--- a/src/IO/S3/Credentials.cpp
+++ b/src/IO/S3/Credentials.cpp
@@ -22,7 +22,6 @@ namespace ErrorCodes
 #    include <aws/core/utils/UUID.h>
 #    include <aws/core/http/HttpClientFactory.h>
 
-#    include <IO/S3/PocoHTTPClientFactory.h>
 #    include <aws/core/utils/HashingUtils.h>
 #    include <aws/core/platform/FileSystem.h>
 
@@ -31,9 +30,7 @@ namespace ErrorCodes
 #    include <IO/S3/Client.h>
 
 #    include <fstream>
-#    include <base/EnumReflection.h>
 
-#    include <boost/algorithm/string.hpp>
 #    include <boost/algorithm/string/split.hpp>
 #    include <boost/algorithm/string/classification.hpp>
 #    include <Poco/Exception.h>
@@ -76,7 +73,7 @@ constexpr int AVAILABILITY_ZONE_REQUEST_TIMEOUT_SECONDS = 3;
 AWSEC2MetadataClient::AWSEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration, const char * endpoint_)
     : Aws::Internal::AWSHttpResourceClient(client_configuration)
     , endpoint(endpoint_)
-    , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    , logger(getLogger("AWSEC2InstanceProfileConfigLoader"))
 {
 }
 
@@ -200,7 +197,7 @@ Aws::String AWSEC2MetadataClient::getCurrentRegion() const
 
 static Aws::String getAWSMetadataEndpoint()
 {
-    auto * logger = &Poco::Logger::get("AWSEC2InstanceProfileConfigLoader");
+    auto logger = getLogger("AWSEC2InstanceProfileConfigLoader");
     Aws::String ec2_metadata_service_endpoint = Aws::Environment::GetEnv("AWS_EC2_METADATA_SERVICE_ENDPOINT");
     if (ec2_metadata_service_endpoint.empty())
     {
@@ -285,7 +282,7 @@ String getGCPAvailabilityZoneOrException()
 
 String getRunningAvailabilityZone()
 {
-    LOG_INFO(&Poco::Logger::get("Application"), "Trying to detect the availability zone.");
+    LOG_INFO(getLogger("Application"), "Trying to detect the availability zone.");
     try
     {
         return AWSEC2MetadataClient::getAvailabilityZoneOrException();
@@ -310,7 +307,7 @@ String getRunningAvailabilityZone()
 AWSEC2InstanceProfileConfigLoader::AWSEC2InstanceProfileConfigLoader(const std::shared_ptr<AWSEC2MetadataClient> & client_, bool use_secure_pull_)
     : client(client_)
     , use_secure_pull(use_secure_pull_)
-    , logger(&Poco::Logger::get("AWSEC2InstanceProfileConfigLoader"))
+    , logger(getLogger("AWSEC2InstanceProfileConfigLoader"))
 {
 }
 
@@ -352,7 +349,7 @@ bool AWSEC2InstanceProfileConfigLoader::LoadInternal()
 AWSInstanceProfileCredentialsProvider::AWSInstanceProfileCredentialsProvider(const std::shared_ptr<AWSEC2InstanceProfileConfigLoader> & config_loader)
     : ec2_metadata_config_loader(config_loader)
     , load_frequency_ms(Aws::Auth::REFRESH_THRESHOLD)
-    , logger(&Poco::Logger::get("AWSInstanceProfileCredentialsProvider"))
+    , logger(getLogger("AWSInstanceProfileCredentialsProvider"))
 {
     LOG_INFO(logger, "Creating Instance with injected EC2MetadataClient and refresh rate.");
 }
@@ -396,7 +393,7 @@ void AWSInstanceProfileCredentialsProvider::refreshIfExpired()
 
 AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider::AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider(
     DB::S3::PocoHTTPClientConfiguration & aws_client_configuration, uint64_t expiration_window_seconds_)
-    : logger(&Poco::Logger::get("AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider"))
+    : logger(getLogger("AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider"))
     , expiration_window_seconds(expiration_window_seconds_)
 {
     // check environment variables
@@ -529,7 +526,7 @@ SSOCredentialsProvider::SSOCredentialsProvider(DB::S3::PocoHTTPClientConfigurati
     : profile_to_use(Aws::Auth::GetConfigProfileName())
     , aws_client_configuration(std::move(aws_client_configuration_))
     , expiration_window_seconds(expiration_window_seconds_)
-    , logger(&Poco::Logger::get(SSO_CREDENTIALS_PROVIDER_LOG_TAG))
+    , logger(getLogger(SSO_CREDENTIALS_PROVIDER_LOG_TAG))
 {
     LOG_TRACE(logger, "Setting sso credentials provider to read config from {}", profile_to_use);
 }
@@ -659,7 +656,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
         const Aws::Auth::AWSCredentials & credentials,
         CredentialsConfiguration credentials_configuration)
 {
-    auto * logger = &Poco::Logger::get("S3CredentialsProviderChain");
+    auto logger = getLogger("S3CredentialsProviderChain");
 
     /// we don't provide any credentials to avoid signing
     if (credentials_configuration.no_sign_request)
@@ -755,7 +752,7 @@ S3CredentialsProviderChain::S3CredentialsProviderChain(
                 configuration.put_request_throttler,
                 Aws::Http::SchemeMapper::ToString(Aws::Http::Scheme::HTTP));
 
-            /// See MakeDefaultHttpResourceClientConfiguration().
+            /// See MakeDefaultHTTPResourceClientConfiguration().
             /// This is part of EC2 metadata client, but unfortunately it can't be accessed from outside
             /// of contrib/aws/aws-cpp-sdk-core/source/internal/AWSHttpResourceClient.cpp
             aws_client_configuration.maxConnections = 2;
diff --git a/src/IO/S3/Credentials.h b/src/IO/S3/Credentials.h
index 5e83ea30798..8d586223035 100644
--- a/src/IO/S3/Credentials.h
+++ b/src/IO/S3/Credentials.h
@@ -22,6 +22,8 @@ inline static constexpr uint64_t DEFAULT_EXPIRATION_WINDOW_SECONDS = 120;
 inline static constexpr uint64_t DEFAULT_CONNECT_TIMEOUT_MS = 1000;
 inline static constexpr uint64_t DEFAULT_REQUEST_TIMEOUT_MS = 30000;
 inline static constexpr uint64_t DEFAULT_MAX_CONNECTIONS = 100;
+inline static constexpr uint64_t DEFAULT_KEEP_ALIVE_TIMEOUT = 5;
+inline static constexpr uint64_t DEFAULT_KEEP_ALIVE_MAX_REQUESTS = 100;
 
 /// In GCP metadata service can be accessed via DNS regardless of IPv4 or IPv6.
 static inline constexpr char GCP_METADATA_SERVICE_ENDPOINT[] = "http://metadata.google.internal";
@@ -70,7 +72,7 @@ private:
     const Aws::String endpoint;
     mutable std::recursive_mutex token_mutex;
     mutable Aws::String token;
-    Poco::Logger * logger;
+    LoggerPtr logger;
 };
 
 std::shared_ptr<AWSEC2MetadataClient> InitEC2MetadataClient(const Aws::Client::ClientConfiguration & client_configuration);
@@ -88,7 +90,7 @@ protected:
 private:
     std::shared_ptr<AWSEC2MetadataClient> client;
     bool use_secure_pull;
-    Poco::Logger * logger;
+    LoggerPtr logger;
 };
 
 class AWSInstanceProfileCredentialsProvider : public Aws::Auth::AWSCredentialsProvider
@@ -107,7 +109,7 @@ private:
 
     std::shared_ptr<AWSEC2InstanceProfileConfigLoader> ec2_metadata_config_loader;
     Int64 load_frequency_ms;
-    Poco::Logger * logger;
+    LoggerPtr logger;
 };
 
 class AwsAuthSTSAssumeRoleWebIdentityCredentialsProvider : public Aws::Auth::AWSCredentialsProvider
@@ -133,7 +135,7 @@ private:
     Aws::String session_name;
     Aws::String token;
     bool initialized = false;
-    Poco::Logger * logger;
+    LoggerPtr logger;
     uint64_t expiration_window_seconds;
 };
 
@@ -163,7 +165,7 @@ private:
 
     DB::S3::PocoHTTPClientConfiguration aws_client_configuration;
     uint64_t expiration_window_seconds;
-    Poco::Logger * logger;
+    LoggerPtr logger;
 
     void Reload() override;
     void refreshIfExpired();
diff --git a/src/IO/S3/PocoHTTPClient.cpp b/src/IO/S3/PocoHTTPClient.cpp
index f2acda80adf..de20a712d4c 100644
--- a/src/IO/S3/PocoHTTPClient.cpp
+++ b/src/IO/S3/PocoHTTPClient.cpp
@@ -1,5 +1,4 @@
 #include <Poco/Timespan.h>
-#include "Common/DNSResolver.h"
 #include "config.h"
 
 #if USE_AWS_S3
@@ -140,16 +139,22 @@ void PocoHTTPClientConfiguration::updateSchemeAndRegion()
     }
 }
 
+ConnectionTimeouts getTimeoutsFromConfiguration(const PocoHTTPClientConfiguration & client_configuration)
+{
+    return ConnectionTimeouts()
+        .withConnectionTimeout(Poco::Timespan(client_configuration.connectTimeoutMs * 1000))
+        .withSendTimeout(Poco::Timespan(client_configuration.requestTimeoutMs * 1000))
+        .withReceiveTimeout(Poco::Timespan(client_configuration.requestTimeoutMs * 1000))
+        .withTCPKeepAliveTimeout(Poco::Timespan(
+            client_configuration.enableTcpKeepAlive ? client_configuration.tcpKeepAliveIntervalMs * 1000 : 0))
+        .withHTTPKeepAliveTimeout(Poco::Timespan(client_configuration.http_keep_alive_timeout, 0))
+        .withHTTPKeepAliveMaxRequests(client_configuration.http_keep_alive_max_requests);
+}
 
 PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & client_configuration)
     : per_request_configuration(client_configuration.per_request_configuration)
     , error_report(client_configuration.error_report)
-    , timeouts(ConnectionTimeouts(
-          Poco::Timespan(client_configuration.connectTimeoutMs * 1000), /// connection timeout.
-          Poco::Timespan(client_configuration.requestTimeoutMs * 1000), /// send timeout.
-          Poco::Timespan(client_configuration.requestTimeoutMs * 1000), /// receive timeout.
-          Poco::Timespan(client_configuration.enableTcpKeepAlive ? client_configuration.tcpKeepAliveIntervalMs * 1000 : 0),
-          Poco::Timespan(client_configuration.http_keep_alive_timeout_ms * 1000))) /// flag indicating whether keep-alive is enabled is set to each session upon creation
+    , timeouts(getTimeoutsFromConfiguration(client_configuration))
     , remote_host_filter(client_configuration.remote_host_filter)
     , s3_max_redirects(client_configuration.s3_max_redirects)
     , s3_use_adaptive_timeouts(client_configuration.s3_use_adaptive_timeouts)
@@ -158,8 +163,6 @@ PocoHTTPClient::PocoHTTPClient(const PocoHTTPClientConfiguration & client_config
     , get_request_throttler(client_configuration.get_request_throttler)
     , put_request_throttler(client_configuration.put_request_throttler)
     , extra_headers(client_configuration.extra_headers)
-    , http_connection_pool_size(client_configuration.http_connection_pool_size)
-    , wait_on_pool_size_limit(client_configuration.wait_on_pool_size_limit)
 {
 }
 
@@ -302,12 +305,8 @@ void PocoHTTPClient::makeRequestInternal(
     Aws::Utils::RateLimits::RateLimiterInterface * readLimiter,
     Aws::Utils::RateLimits::RateLimiterInterface * writeLimiter) const
 {
-    /// Most sessions in pool are already connected and it is not possible to set proxy host/port to a connected session.
     const auto request_configuration = per_request_configuration();
-    if (http_connection_pool_size)
-        makeRequestInternalImpl<true>(request, request_configuration, response, readLimiter, writeLimiter);
-    else
-        makeRequestInternalImpl<false>(request, request_configuration, response, readLimiter, writeLimiter);
+    makeRequestInternalImpl(request, request_configuration, response, readLimiter, writeLimiter);
 }
 
 String getMethod(const Aws::Http::HttpRequest & request)
@@ -329,7 +328,6 @@ String getMethod(const Aws::Http::HttpRequest & request)
     }
 }
 
-template <bool pooled>
 void PocoHTTPClient::makeRequestInternalImpl(
     Aws::Http::HttpRequest & request,
     const DB::ProxyConfiguration & proxy_configuration,
@@ -337,9 +335,7 @@ void PocoHTTPClient::makeRequestInternalImpl(
     Aws::Utils::RateLimits::RateLimiterInterface *,
     Aws::Utils::RateLimits::RateLimiterInterface *) const
 {
-    using SessionPtr = std::conditional_t<pooled, PooledHTTPSessionPtr, HTTPSessionPtr>;
-
-    Poco::Logger * log = &Poco::Logger::get("AWSClient");
+    LoggerPtr log = getLogger("AWSClient");
 
     auto uri = request.GetUri().GetURIString();
     auto method = getMethod(request);
@@ -390,40 +386,17 @@ void PocoHTTPClient::makeRequestInternalImpl(
         for (unsigned int attempt = 0; attempt <= s3_max_redirects; ++attempt)
         {
             Poco::URI target_uri(uri);
-            SessionPtr session;
 
-            if (!proxy_configuration.host.empty())
-            {
-                if (enable_s3_requests_logging)
-                    LOG_TEST(log, "Due to reverse proxy host name ({}) won't be resolved on ClickHouse side", uri);
-                /// Reverse proxy can replace host header with resolved ip address instead of host name.
-                /// This can lead to request signature difference on S3 side.
-                if constexpr (pooled)
-                    session = makePooledHTTPSession(
-                        target_uri,
-                        getTimeouts(method, first_attempt, /*first_byte*/ true),
-                        http_connection_pool_size,
-                        wait_on_pool_size_limit,
-                        proxy_configuration);
-                else
-                    session = makeHTTPSession(
-                            target_uri,
-                            getTimeouts(method, first_attempt, /*first_byte*/ true),
-                            proxy_configuration);
-            }
-            else
-            {
-                if constexpr (pooled)
-                    session = makePooledHTTPSession(
-                        target_uri,
-                        getTimeouts(method, first_attempt, /*first_byte*/ true),
-                        http_connection_pool_size,
-                        wait_on_pool_size_limit);
-                else
-                    session = makeHTTPSession(
-                            target_uri,
-                            getTimeouts(method, first_attempt, /*first_byte*/ true));
-            }
+            if (enable_s3_requests_logging && !proxy_configuration.isEmpty())
+                LOG_TEST(log, "Due to reverse proxy host name ({}) won't be resolved on ClickHouse side", uri);
+
+            auto group = for_disk_s3 ? HTTPConnectionGroupType::DISK : HTTPConnectionGroupType::STORAGE;
+
+            auto session = makeHTTPSession(
+                group,
+                target_uri,
+                getTimeouts(method, first_attempt, /*first_byte*/ true),
+                proxy_configuration);
 
             /// In case of error this address will be written to logs
             request.SetResolvedRemoteHost(session->getResolvedAddress());
@@ -497,12 +470,12 @@ void PocoHTTPClient::makeRequestInternalImpl(
                     LOG_TEST(log, "Written {} bytes to request body", size);
             }
 
+            setTimeouts(*session, getTimeouts(method, first_attempt, /*first_byte*/ false));
+
             if (enable_s3_requests_logging)
                 LOG_TEST(log, "Receiving response...");
             auto & response_body_stream = session->receiveResponse(poco_response);
 
-            setTimeouts(*session, getTimeouts(method, first_attempt, /*first_byte*/ false));
-
             watch.stop();
             addMetric(request, S3MetricType::Microseconds, watch.elapsedMicroseconds());
 
@@ -606,10 +579,6 @@ void PocoHTTPClient::makeRequestInternalImpl(
         response->SetClientErrorMessage(getCurrentExceptionMessage(false));
 
         addMetric(request, S3MetricType::Errors);
-
-        /// Probably this is socket timeout or something more or less related to DNS
-        /// Let's just remove this host from DNS cache to be more safe
-        DNSResolver::instance().removeHostFromCache(Poco::URI(uri).getHost());
     }
 }
 
diff --git a/src/IO/S3/PocoHTTPClient.h b/src/IO/S3/PocoHTTPClient.h
index 5178d75e7b6..a0b35e9b4a9 100644
--- a/src/IO/S3/PocoHTTPClient.h
+++ b/src/IO/S3/PocoHTTPClient.h
@@ -13,7 +13,7 @@
 #include <IO/ConnectionTimeouts.h>
 #include <IO/HTTPCommon.h>
 #include <IO/HTTPHeaderEntries.h>
-#include <IO/S3/SessionAwareIOStream.h>
+#include <IO/SessionAwareIOStream.h>
 
 #include <aws/core/client/ClientConfiguration.h>
 #include <aws/core/http/HttpClient.h>
@@ -49,13 +49,10 @@ struct PocoHTTPClientConfiguration : public Aws::Client::ClientConfiguration
     ThrottlerPtr put_request_throttler;
     HTTPHeaderEntries extra_headers;
 
-    /// Not a client parameter in terms of HTTP and we won't send it to the server. Used internally to determine when connection have to be re-established.
-    uint32_t http_keep_alive_timeout_ms = 0;
-    /// Zero means pooling will not be used.
-    size_t http_connection_pool_size = 0;
     /// See PoolBase::BehaviourOnLimit
-    bool wait_on_pool_size_limit = true;
     bool s3_use_adaptive_timeouts = true;
+    size_t http_keep_alive_timeout = DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT;
+    size_t http_keep_alive_max_requests = DEFAULT_HTTP_KEEP_ALIVE_MAX_REQUEST;
 
     std::function<void(const DB::ProxyConfiguration &)> error_report;
 
@@ -98,15 +95,9 @@ public:
         );
     }
 
-    void SetResponseBody(Aws::IStream & incoming_stream, PooledHTTPSessionPtr & session_) /// NOLINT
-    {
-        body_stream = Aws::Utils::Stream::ResponseStream(
-            Aws::New<SessionAwareIOStream<PooledHTTPSessionPtr>>("http result streambuf", session_, incoming_stream.rdbuf()));
-    }
-
     void SetResponseBody(std::string & response_body) /// NOLINT
     {
-        auto stream = Aws::New<std::stringstream>("http result buf", response_body); // STYLE_CHECK_ALLOW_STD_STRING_STREAM
+        auto * stream = Aws::New<std::stringstream>("http result buf", response_body); // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         stream->exceptions(std::ios::failbit);
         body_stream = Aws::Utils::Stream::ResponseStream(std::move(stream));
     }
@@ -163,7 +154,6 @@ private:
         EnumSize,
     };
 
-    template <bool pooled>
     void makeRequestInternalImpl(
         Aws::Http::HttpRequest & request,
         const DB::ProxyConfiguration & proxy_configuration,
@@ -196,9 +186,6 @@ protected:
     ThrottlerPtr put_request_throttler;
 
     const HTTPHeaderEntries extra_headers;
-
-    size_t http_connection_pool_size = 0;
-    bool wait_on_pool_size_limit = true;
 };
 
 }
diff --git a/src/IO/S3/Requests.cpp b/src/IO/S3/Requests.cpp
index 56d2e44a2c4..50ed2e21bfc 100644
--- a/src/IO/S3/Requests.cpp
+++ b/src/IO/S3/Requests.cpp
@@ -52,6 +52,20 @@ Aws::Http::HeaderValueCollection CopyObjectRequest::GetRequestSpecificHeaders()
     return headers;
 }
 
+void CompleteMultipartUploadRequest::SetAdditionalCustomHeaderValue(const Aws::String& headerName, const Aws::String& headerValue)
+{
+    // S3's CompleteMultipartUpload doesn't support metadata headers so we skip adding them
+    if (!headerName.starts_with("x-amz-meta-"))
+        Model::CompleteMultipartUploadRequest::SetAdditionalCustomHeaderValue(headerName, headerValue);
+}
+
+void UploadPartRequest::SetAdditionalCustomHeaderValue(const Aws::String& headerName, const Aws::String& headerValue)
+{
+    // S3's UploadPart doesn't support metadata headers so we skip adding them
+    if (!headerName.starts_with("x-amz-meta-"))
+        Model::UploadPartRequest::SetAdditionalCustomHeaderValue(headerName, headerValue);
+}
+
 Aws::String ComposeObjectRequest::SerializePayload() const
 {
     if (component_names.empty())
@@ -70,6 +84,7 @@ Aws::String ComposeObjectRequest::SerializePayload() const
     return payload_doc.ConvertToString();
 }
 
+
 void ComposeObjectRequest::AddQueryStringParameters(Aws::Http::URI & /*uri*/) const
 {
 }
diff --git a/src/IO/S3/Requests.h b/src/IO/S3/Requests.h
index bfb94a5a67e..424cf65caf2 100644
--- a/src/IO/S3/Requests.h
+++ b/src/IO/S3/Requests.h
@@ -21,12 +21,44 @@
 #include <aws/s3/model/UploadPartCopyRequest.h>
 #include <aws/s3/model/DeleteObjectRequest.h>
 #include <aws/s3/model/DeleteObjectsRequest.h>
+#include <aws/s3/model/ChecksumAlgorithm.h>
+#include <aws/s3/model/CompletedPart.h>
+#include <aws/core/utils/HashingUtils.h>
+
+#include <base/defines.h>
 
 namespace DB::S3
 {
 
 namespace Model = Aws::S3::Model;
 
+/// Used only for S3Express
+namespace RequestChecksum
+{
+inline void setPartChecksum(Model::CompletedPart & part, const std::string & checksum)
+{
+    part.SetChecksumCRC32(checksum);
+}
+
+inline void setRequestChecksum(Model::UploadPartRequest & req, const std::string & checksum)
+{
+    req.SetChecksumCRC32(checksum);
+}
+
+inline std::string calculateChecksum(Model::UploadPartRequest & req)
+{
+    chassert(req.GetChecksumAlgorithm() == Aws::S3::Model::ChecksumAlgorithm::CRC32);
+    return Aws::Utils::HashingUtils::Base64Encode(Aws::Utils::HashingUtils::CalculateCRC32(*(req.GetBody())));
+}
+
+template <typename R>
+inline void setChecksumAlgorithm(R & request)
+{
+    if constexpr (requires { request.SetChecksumAlgorithm(Model::ChecksumAlgorithm::CRC32); })
+        request.SetChecksumAlgorithm(Model::ChecksumAlgorithm::CRC32);
+}
+};
+
 template <typename BaseRequest>
 class ExtendedRequest : public BaseRequest
 {
@@ -49,11 +81,13 @@ public:
 
     Aws::String GetChecksumAlgorithmName() const override
     {
+        chassert(!is_s3express_bucket || checksum);
+
         /// Return empty string is enough to disable checksums (see
         /// AWSClient::AddChecksumToRequest [1] for more details).
         ///
         ///   [1]: https://github.com/aws/aws-sdk-cpp/blob/b0ee1c0d336dbb371c34358b68fba6c56aae2c92/src/aws-cpp-sdk-core/source/client/AWSClient.cpp#L783-L839
-        if (!checksum)
+        if (!is_s3express_bucket && !checksum)
             return "";
         return BaseRequest::GetChecksumAlgorithmName();
     }
@@ -84,9 +118,12 @@ public:
     }
 
     /// Disable checksum to avoid extra read of the input stream
-    void disableChecksum() const
+    void disableChecksum() const { checksum = false; }
+
+    void setIsS3ExpressBucket()
     {
-        checksum = false;
+        is_s3express_bucket = true;
+        RequestChecksum::setChecksumAlgorithm(*this);
     }
 
 protected:
@@ -94,6 +131,7 @@ protected:
     mutable std::optional<S3::URI> uri_override;
     mutable ApiMode api_mode{ApiMode::AWS};
     mutable bool checksum = true;
+    bool is_s3express_bucket = false;
 };
 
 class CopyObjectRequest : public ExtendedRequest<Model::CopyObjectRequest>
@@ -107,10 +145,20 @@ using ListObjectsV2Request = ExtendedRequest<Model::ListObjectsV2Request>;
 using ListObjectsRequest = ExtendedRequest<Model::ListObjectsRequest>;
 using GetObjectRequest = ExtendedRequest<Model::GetObjectRequest>;
 
+class UploadPartRequest : public ExtendedRequest<Model::UploadPartRequest>
+{
+public:
+    void SetAdditionalCustomHeaderValue(const Aws::String& headerName, const Aws::String& headerValue) override;
+};
+
+class CompleteMultipartUploadRequest : public ExtendedRequest<Model::CompleteMultipartUploadRequest>
+{
+public:
+    void SetAdditionalCustomHeaderValue(const Aws::String& headerName, const Aws::String& headerValue) override;
+};
+
 using CreateMultipartUploadRequest = ExtendedRequest<Model::CreateMultipartUploadRequest>;
-using CompleteMultipartUploadRequest = ExtendedRequest<Model::CompleteMultipartUploadRequest>;
 using AbortMultipartUploadRequest = ExtendedRequest<Model::AbortMultipartUploadRequest>;
-using UploadPartRequest = ExtendedRequest<Model::UploadPartRequest>;
 using UploadPartCopyRequest = ExtendedRequest<Model::UploadPartCopyRequest>;
 
 using PutObjectRequest = ExtendedRequest<Model::PutObjectRequest>;
diff --git a/src/IO/S3/URI.cpp b/src/IO/S3/URI.cpp
index c5d92c6c0f2..4e679e6c477 100644
--- a/src/IO/S3/URI.cpp
+++ b/src/IO/S3/URI.cpp
@@ -33,20 +33,27 @@ namespace S3
 URI::URI(const std::string & uri_)
 {
     /// Case when bucket name represented in domain name of S3 URL.
-    /// E.g. (https://bucket-name.s3.Region.amazonaws.com/key)
+    /// E.g. (https://bucket-name.s3.region.amazonaws.com/key)
     /// https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#virtual-hosted-style-access
-    static const RE2 virtual_hosted_style_pattern(R"((.+)\.(s3|cos|obs|oss)([.\-][a-z0-9\-.:]+))");
+    static const RE2 virtual_hosted_style_pattern(R"((.+)\.(s3express[\-a-z0-9]+|s3|cos|obs|oss|eos)([.\-][a-z0-9\-.:]+))");
+
+    /// Case when AWS Private Link Interface is being used
+    /// E.g. (bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w.s3.us-east-1.vpce.amazonaws.com/bucket-name/key)
+    /// https://docs.aws.amazon.com/AmazonS3/latest/userguide/privatelink-interface-endpoints.html
+    static const RE2 aws_private_link_style_pattern(R"(bucket\.vpce\-([a-z0-9\-.]+)\.vpce.amazonaws.com(:\d{1,5})?)");
 
     /// Case when bucket name and key represented in path of S3 URL.
-    /// E.g. (https://s3.Region.amazonaws.com/bucket-name/key)
+    /// E.g. (https://s3.region.amazonaws.com/bucket-name/key)
     /// https://docs.aws.amazon.com/AmazonS3/latest/dev/VirtualHosting.html#path-style-access
     static const RE2 path_style_pattern("^/([^/]*)/(.*)");
 
     static constexpr auto S3 = "S3";
+    static constexpr auto S3EXPRESS = "S3EXPRESS";
     static constexpr auto COSN = "COSN";
     static constexpr auto COS = "COS";
     static constexpr auto OBS = "OBS";
     static constexpr auto OSS = "OSS";
+    static constexpr auto EOS = "EOS";
 
     uri = Poco::URI(uri_);
 
@@ -65,7 +72,7 @@ URI::URI(const std::string & uri_)
         else
         {
             mapper["s3"] = "https://{bucket}.s3.amazonaws.com";
-            mapper["gs"] = "https://{bucket}.storage.googleapis.com";
+            mapper["gs"] = "https://storage.googleapis.com/{bucket}";
             mapper["oss"] = "https://{bucket}.oss.aliyuncs.com";
         }
 
@@ -101,7 +108,10 @@ URI::URI(const std::string & uri_)
     String name;
     String endpoint_authority_from_uri;
 
-    if (re2::RE2::FullMatch(uri.getAuthority(), virtual_hosted_style_pattern, &bucket, &name, &endpoint_authority_from_uri))
+    bool is_using_aws_private_link_interface = re2::RE2::FullMatch(uri.getAuthority(), aws_private_link_style_pattern);
+
+    if (!is_using_aws_private_link_interface
+        && re2::RE2::FullMatch(uri.getAuthority(), virtual_hosted_style_pattern, &bucket, &name, &endpoint_authority_from_uri))
     {
         is_virtual_hosted_style = true;
         endpoint = uri.getScheme() + "://" + name + endpoint_authority_from_uri;
@@ -114,19 +124,16 @@ URI::URI(const std::string & uri_)
         }
 
         boost::to_upper(name);
-        if (name != S3 && name != COS && name != OBS && name != OSS)
+        /// For S3Express it will look like s3express-eun1-az1, i.e. contain region and AZ info
+        if (name != S3 && !name.starts_with(S3EXPRESS) && name != COS && name != OBS && name != OSS && name != EOS)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                             "Object storage system name is unrecognized in virtual hosted style S3 URI: {}",
                             quoteString(name));
 
-        if (name == S3)
-            storage_name = name;
-        else if (name == OBS)
-            storage_name = OBS;
-        else if (name == OSS)
-            storage_name = OSS;
-        else
+        if (name == COS)
             storage_name = COSN;
+        else
+            storage_name = name;
     }
     else if (re2::RE2::PartialMatch(uri.getPath(), path_style_pattern, &bucket, &key))
     {
diff --git a/src/IO/S3/URI.h b/src/IO/S3/URI.h
index 2873728bc78..06b7d03aa8c 100644
--- a/src/IO/S3/URI.h
+++ b/src/IO/S3/URI.h
@@ -17,6 +17,7 @@ namespace DB::S3
  * The following patterns are allowed:
  * s3://bucket/key
  * http(s)://endpoint/bucket/key
+ * http(s)://bucket.<vpce_endpoint_id>.s3.<region>.vpce.amazonaws.com<:port_number>/bucket_name/key
  */
 struct URI
 {
diff --git a/src/IO/S3/copyS3File.cpp b/src/IO/S3/copyS3File.cpp
index 25de61360fe..b780c1fc08f 100644
--- a/src/IO/S3/copyS3File.cpp
+++ b/src/IO/S3/copyS3File.cpp
@@ -61,7 +61,7 @@ namespace
             ThreadPoolCallbackRunner<void> schedule_,
             bool for_disk_s3_,
             BlobStorageLogWriterPtr blob_storage_log_,
-            const Poco::Logger * log_)
+            const LoggerPtr log_)
             : client_ptr(client_ptr_)
             , dest_bucket(dest_bucket_)
             , dest_key(dest_key_)
@@ -87,24 +87,32 @@ namespace
         ThreadPoolCallbackRunner<void> schedule;
         bool for_disk_s3;
         BlobStorageLogWriterPtr blob_storage_log;
-        const Poco::Logger * log;
+        const LoggerPtr log;
 
+        /// Represents a task uploading a single part.
+        /// Keep this struct small because there can be thousands of parts.
+        /// For example, `UploadPartTask` must not contain a read buffer or `S3::UploadPartRequest`
+        /// because such read buffer can consume about 1MB memory and it could cause memory issues when the number of parts is big enough.
         struct UploadPartTask
         {
-            std::unique_ptr<Aws::AmazonWebServiceRequest> req;
-            bool is_finished = false;
+            size_t part_number;
+            size_t part_offset;
+            size_t part_size;
             String tag;
+            bool is_finished = false;
             std::exception_ptr exception;
         };
 
+        size_t num_parts;
         size_t normal_part_size;
         String multipart_upload_id;
         std::atomic<bool> multipart_upload_aborted = false;
         Strings part_tags;
 
         std::list<UploadPartTask> TSA_GUARDED_BY(bg_tasks_mutex) bg_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;
+        size_t num_added_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
+        size_t num_finished_bg_tasks TSA_GUARDED_BY(bg_tasks_mutex) = 0;
+        size_t num_finished_parts TSA_GUARDED_BY(bg_tasks_mutex) = 0;
         std::mutex bg_tasks_mutex;
         std::condition_variable bg_tasks_condvar;
 
@@ -186,11 +194,6 @@ namespace
 
                 auto outcome = client_ptr->CompleteMultipartUpload(request);
 
-                if (blob_storage_log)
-                    blob_storage_log->addEvent(BlobStorageLogElement::EventType::MultiPartUploadComplete,
-                                               dest_bucket, dest_key, /* local_path_ */ {}, /* data_size */ 0,
-                                               outcome.IsSuccess() ? nullptr : &outcome.GetError());
-
                 if (blob_storage_log)
                     blob_storage_log->addEvent(BlobStorageLogElement::EventType::MultiPartUploadComplete,
                                                dest_bucket, dest_key, /* local_path_ */ {}, /* data_size */ 0,
@@ -299,7 +302,7 @@ namespace
                 throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "max_upload_part_size must not be less than min_upload_part_size");
 
             size_t part_size = min_upload_part_size;
-            size_t num_parts = (total_size + part_size - 1) / part_size;
+            num_parts = (total_size + part_size - 1) / part_size;
 
             if (num_parts > max_part_number)
             {
@@ -338,7 +341,7 @@ namespace
 
         void uploadPart(size_t part_number, size_t part_offset, size_t part_size)
         {
-            LOG_TRACE(log, "Writing part. Bucket: {}, Key: {}, Upload_id: {}, Size: {}", dest_bucket, dest_key, multipart_upload_id, part_size);
+            LOG_TRACE(log, "Writing part #{} of {}. Bucket: {}, Key: {}, Upload_id: {}, Size: {}", part_number, num_parts, dest_bucket, dest_key, multipart_upload_id, part_size);
 
             if (!part_size)
             {
@@ -353,6 +356,9 @@ namespace
                 {
                     std::lock_guard lock(bg_tasks_mutex);
                     task = &bg_tasks.emplace_back();
+                    task->part_number = part_number;
+                    task->part_offset = part_offset;
+                    task->part_size = part_size;
                     ++num_added_bg_tasks;
                 }
 
@@ -371,8 +377,6 @@ namespace
 
                 try
                 {
-                    task->req = fillUploadPartRequest(part_number, part_offset, part_size);
-
                     schedule([this, task, task_finish_notify]()
                     {
                         try
@@ -395,7 +399,9 @@ namespace
             else
             {
                 UploadPartTask task;
-                task.req = fillUploadPartRequest(part_number, part_offset, part_size);
+                task.part_number = part_number;
+                task.part_offset = part_offset;
+                task.part_size = part_size;
                 processUploadTask(task);
                 part_tags.push_back(task.tag);
             }
@@ -406,14 +412,18 @@ namespace
             if (multipart_upload_aborted)
                 return; /// Already aborted.
 
-            auto tag = processUploadPartRequest(*task.req);
+            auto request = makeUploadPartRequest(task.part_number, task.part_offset, task.part_size);
+            auto tag = processUploadPartRequest(*request);
 
             std::lock_guard lock(bg_tasks_mutex); /// Protect bg_tasks from race
             task.tag = tag;
-            LOG_TRACE(log, "Writing part finished. Bucket: {}, Key: {}, Upload_id: {}, Etag: {}, Parts: {}", dest_bucket, dest_key, multipart_upload_id, task.tag, bg_tasks.size());
+            ++num_finished_parts;
+            LOG_TRACE(log, "Finished writing part #{}. Bucket: {}, Key: {}, Upload_id: {}, Etag: {}, Finished parts: {} of {}",
+                      task.part_number, dest_key, multipart_upload_id, task.tag, bg_tasks.size(), num_finished_parts, num_parts);
         }
 
-        virtual std::unique_ptr<Aws::AmazonWebServiceRequest> fillUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) = 0;
+        /// These functions can be called from multiple threads, so derived class needs to take care about synchronization.
+        virtual std::unique_ptr<Aws::AmazonWebServiceRequest> makeUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) const = 0;
         virtual String processUploadPartRequest(Aws::AmazonWebServiceRequest & request) = 0;
 
         void waitForAllBackgroundTasks()
@@ -460,7 +470,7 @@ namespace
             ThreadPoolCallbackRunner<void> schedule_,
             bool for_disk_s3_,
             BlobStorageLogWriterPtr blob_storage_log_)
-            : UploadHelper(client_ptr_, dest_bucket_, dest_key_, request_settings_, object_metadata_, schedule_, for_disk_s3_, blob_storage_log_, &Poco::Logger::get("copyDataToS3File"))
+            : UploadHelper(client_ptr_, dest_bucket_, dest_key_, request_settings_, object_metadata_, schedule_, for_disk_s3_, blob_storage_log_, getLogger("copyDataToS3File"))
             , create_read_buffer(create_read_buffer_)
             , offset(offset_)
             , size(size_)
@@ -581,7 +591,7 @@ namespace
 
         void performMultipartUpload() { UploadHelper::performMultipartUpload(offset, size); }
 
-        std::unique_ptr<Aws::AmazonWebServiceRequest> fillUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) override
+        std::unique_ptr<Aws::AmazonWebServiceRequest> makeUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) const override
         {
             auto read_buffer = std::make_unique<LimitSeekableReadBuffer>(create_read_buffer(), part_offset, part_size);
 
@@ -643,7 +653,7 @@ namespace
             ThreadPoolCallbackRunner<void> schedule_,
             bool for_disk_s3_,
             BlobStorageLogWriterPtr blob_storage_log_)
-            : UploadHelper(client_ptr_, dest_bucket_, dest_key_, request_settings_, object_metadata_, schedule_, for_disk_s3_, blob_storage_log_, &Poco::Logger::get("copyS3File"))
+            : UploadHelper(client_ptr_, dest_bucket_, dest_key_, request_settings_, object_metadata_, schedule_, for_disk_s3_, blob_storage_log_, getLogger("copyS3File"))
             , src_bucket(src_bucket_)
             , src_key(src_key_)
             , offset(src_offset_)
@@ -731,7 +741,12 @@ namespace
                     break;
                 }
 
-                if (outcome.GetError().GetExceptionName() == "EntityTooLarge" || outcome.GetError().GetExceptionName() == "InvalidRequest" || outcome.GetError().GetExceptionName() == "InvalidArgument")
+                if (outcome.GetError().GetExceptionName() == "EntityTooLarge" ||
+                    outcome.GetError().GetExceptionName() == "InvalidRequest" ||
+                    outcome.GetError().GetExceptionName() == "InvalidArgument" ||
+                    (outcome.GetError().GetExceptionName() == "InternalError" &&
+                        outcome.GetError().GetResponseCode() == Aws::Http::HttpResponseCode::GATEWAY_TIMEOUT &&
+                        outcome.GetError().GetMessage().contains("use the Rewrite method in the JSON API")))
                 {
                     if (!supports_multipart_copy)
                     {
@@ -795,7 +810,7 @@ namespace
 
         void performMultipartUploadCopy() { UploadHelper::performMultipartUpload(offset, size); }
 
-        std::unique_ptr<Aws::AmazonWebServiceRequest> fillUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) override
+        std::unique_ptr<Aws::AmazonWebServiceRequest> makeUploadPartRequest(size_t part_number, size_t part_offset, size_t part_size) const override
         {
             auto request = std::make_unique<S3::UploadPartCopyRequest>();
 
diff --git a/src/IO/S3/copyS3File.h b/src/IO/S3/copyS3File.h
index 607be51ed25..5eb6f702473 100644
--- a/src/IO/S3/copyS3File.h
+++ b/src/IO/S3/copyS3File.h
@@ -5,7 +5,7 @@
 #if USE_AWS_S3
 
 #include <Storages/StorageS3Settings.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 #include <base/types.h>
 #include <functional>
@@ -14,6 +14,7 @@
 
 namespace DB
 {
+struct ReadSettings;
 class SeekableReadBuffer;
 
 using CreateReadBuffer = std::function<std::unique_ptr<SeekableReadBuffer>()>;
diff --git a/src/IO/S3/tests/TestPocoHTTPServer.h b/src/IO/S3/tests/TestPocoHTTPServer.h
index 0f5ce86b388..35ceb5e1632 100644
--- a/src/IO/S3/tests/TestPocoHTTPServer.h
+++ b/src/IO/S3/tests/TestPocoHTTPServer.h
@@ -21,8 +21,8 @@ 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_)
+    explicit MockRequestHandler(Poco::Net::MessageHeader & last_request_header_)
+    : last_request_header(last_request_header_)
     {
     }
 
@@ -38,20 +38,18 @@ class HTTPRequestHandlerFactory : public Poco::Net::HTTPRequestHandlerFactory
 {
     Poco::Net::MessageHeader & last_request_header;
 
-    virtual Poco::Net::HTTPRequestHandler * createRequestHandler(const Poco::Net::HTTPServerRequest &) override
+    Poco::Net::HTTPRequestHandler * createRequestHandler(const Poco::Net::HTTPServerRequest &) override
     {
         return new MockRequestHandler(last_request_header);
     }
 
 public:
-    HTTPRequestHandlerFactory(Poco::Net::MessageHeader & last_request_header_)
-    : Poco::Net::HTTPRequestHandlerFactory(), last_request_header(last_request_header_)
+    explicit HTTPRequestHandlerFactory(Poco::Net::MessageHeader & last_request_header_)
+    : last_request_header(last_request_header_)
     {
     }
 
-    virtual ~HTTPRequestHandlerFactory() override
-    {
-    }
+    ~HTTPRequestHandlerFactory() override = default;
 };
 
 class TestPocoHTTPServer
diff --git a/src/IO/S3/tests/gtest_aws_s3_client.cpp b/src/IO/S3/tests/gtest_aws_s3_client.cpp
index 33917314bca..0a28c578f69 100644
--- a/src/IO/S3/tests/gtest_aws_s3_client.cpp
+++ b/src/IO/S3/tests/gtest_aws_s3_client.cpp
@@ -8,7 +8,7 @@
 
 #include <memory>
 
-#include <boost/algorithm/string.hpp>
+#include <boost/algorithm/string/split.hpp>
 
 #include <Poco/URI.h>
 
@@ -45,7 +45,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)
     String content;
     for (const auto & [header_name, header_value] : message_header)
     {
-        if (boost::algorithm::starts_with(header_name, "x-amz-server-side-encryption"))
+        if (header_name.starts_with("x-amz-server-side-encryption"))
         {
             content += header_name + ": " + header_value + "\n";
         }
@@ -55,7 +55,7 @@ String getSSEAndSignedHeaders(const Poco::Net::MessageHeader & message_header)
             boost::split(parts, header_value, [](char c){ return c == ' '; });
             for (const auto & part : parts)
             {
-                if (boost::algorithm::starts_with(part, "SignedHeaders="))
+                if (part.starts_with("SignedHeaders="))
                     content += header_name + ": ... " + part + " ...\n";
             }
         }
@@ -110,7 +110,8 @@ void testServerSideEncryption(
     bool disable_checksum,
     String server_side_encryption_customer_key_base64,
     DB::S3::ServerSideEncryptionKMSConfig sse_kms_config,
-    String expected_headers)
+    String expected_headers,
+    bool is_s3express_bucket = false)
 {
     TestPocoHTTPServer http;
 
@@ -144,6 +145,7 @@ void testServerSideEncryption(
         .use_virtual_addressing = uri.is_virtual_hosted_style,
         .disable_checksum = disable_checksum,
         .gcs_issue_compose_request = false,
+        .is_s3express_bucket = is_s3express_bucket,
     };
 
     std::shared_ptr<DB::S3::Client> client = DB::S3::ClientFactory::instance().create(
@@ -157,7 +159,7 @@ void testServerSideEncryption(
         DB::S3::CredentialsConfiguration
         {
             .use_environment_credentials = use_environment_credentials,
-            .use_insecure_imds_request = use_insecure_imds_request
+            .use_insecure_imds_request = use_insecure_imds_request,
         }
     );
 
@@ -295,4 +297,25 @@ TEST(IOTestAwsS3Client, AppendExtraSSEKMSHeadersWrite)
         "x-amz-server-side-encryption-context: arn:aws:s3:::bucket_ARN\n");
 }
 
+TEST(IOTestAwsS3Client, ChecksumHeaderIsPresentForS3Express)
+{
+    /// See https://github.com/ClickHouse/ClickHouse/pull/19748
+    testServerSideEncryption(
+        doWriteRequest,
+        /* disable_checksum= */ true,
+        "",
+        {},
+        "authorization: ... SignedHeaders="
+        "amz-sdk-invocation-id;"
+        "amz-sdk-request;"
+        "content-length;"
+        "content-type;"
+        "host;"
+        "x-amz-checksum-crc32;"
+        "x-amz-content-sha256;"
+        "x-amz-date;"
+        "x-amz-sdk-checksum-algorithm, ...\n",
+        /*is_s3express_bucket=*/true);
+}
+
 #endif
diff --git a/src/IO/S3Common.cpp b/src/IO/S3Common.cpp
index 5039059f522..56e3e0df21b 100644
--- a/src/IO/S3Common.cpp
+++ b/src/IO/S3Common.cpp
@@ -1,7 +1,9 @@
 #include <IO/S3Common.h>
 
 #include <Common/Exception.h>
+#include <Common/StringUtils/StringUtils.h>
 #include <Poco/Util/AbstractConfiguration.h>
+
 #include "config.h"
 
 #if USE_AWS_S3
@@ -124,6 +126,15 @@ AuthSettings AuthSettings::loadFromConfig(const std::string & config_elem, const
     HTTPHeaderEntries headers = getHTTPHeaders(config_elem, config);
     ServerSideEncryptionKMSConfig sse_kms_config = getSSEKMSConfig(config_elem, config);
 
+    std::unordered_set<std::string> users;
+    Poco::Util::AbstractConfiguration::Keys keys;
+    config.keys(config_elem, keys);
+    for (const auto & key : keys)
+    {
+        if (startsWith(key, "user"))
+            users.insert(config.getString(config_elem + "." + key));
+    }
+
     return AuthSettings
     {
         std::move(access_key_id), std::move(secret_access_key), std::move(session_token),
@@ -134,10 +145,16 @@ AuthSettings AuthSettings::loadFromConfig(const std::string & config_elem, const
         use_environment_credentials,
         use_insecure_imds_request,
         expiration_window_seconds,
-        no_sign_request
+        no_sign_request,
+        std::move(users)
     };
 }
 
+bool AuthSettings::canBeUsedByUser(const String & user) const
+{
+    return users.empty() || users.contains(user);
+}
+
 bool AuthSettings::hasUpdates(const AuthSettings & other) const
 {
     AuthSettings copy = *this;
@@ -173,6 +190,8 @@ void AuthSettings::updateFrom(const AuthSettings & from)
 
     if (from.no_sign_request.has_value())
         no_sign_request = from.no_sign_request;
+
+    users.insert(from.users.begin(), from.users.end());
 }
 
 }
diff --git a/src/IO/S3Common.h b/src/IO/S3Common.h
index 6ee8d96ed09..b3e01bd6132 100644
--- a/src/IO/S3Common.h
+++ b/src/IO/S3Common.h
@@ -6,6 +6,7 @@
 
 #include <string>
 #include <optional>
+#include <unordered_set>
 
 #include "config.h"
 
@@ -92,9 +93,13 @@ struct AuthSettings
     std::optional<uint64_t> expiration_window_seconds;
     std::optional<bool> no_sign_request;
 
+    std::unordered_set<std::string> users;
+
     bool hasUpdates(const AuthSettings & other) const;
     void updateFrom(const AuthSettings & from);
 
+    bool canBeUsedByUser(const String & user) const;
+
 private:
     bool operator==(const AuthSettings & other) const = default;
 };
diff --git a/src/IO/SeekableReadBuffer.cpp b/src/IO/SeekableReadBuffer.cpp
index 5d83f4e1b4a..f2a114a5389 100644
--- a/src/IO/SeekableReadBuffer.cpp
+++ b/src/IO/SeekableReadBuffer.cpp
@@ -1,5 +1,6 @@
 #include <IO/SeekableReadBuffer.h>
 
+#include <istream>
 
 namespace DB
 {
diff --git a/src/IO/SeekableReadBuffer.h b/src/IO/SeekableReadBuffer.h
index c002d30e633..808efe9e6d0 100644
--- a/src/IO/SeekableReadBuffer.h
+++ b/src/IO/SeekableReadBuffer.h
@@ -82,7 +82,7 @@ public:
     ///    (e.g. next() or supportsReadAt()).
     ///  * Performance: there's no buffering. Each readBigAt() call typically translates into actual
     ///    IO operation (e.g. HTTP request). Don't use it for small adjacent reads.
-    virtual size_t readBigAt(char * /*to*/, size_t /*n*/, size_t /*offset*/, const std::function<bool(size_t m)> & /*progress_callback*/ = nullptr)
+    virtual size_t readBigAt(char * /*to*/, size_t /*n*/, size_t /*offset*/, const std::function<bool(size_t m)> & /*progress_callback*/) const
         { throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method readBigAt() not implemented"); }
 
     /// Checks if readBigAt() is allowed. May be slow, may throw (e.g. it may do an HTTP request or an fstat).
diff --git a/src/IO/S3/SessionAwareIOStream.h b/src/IO/SessionAwareIOStream.h
similarity index 97%
rename from src/IO/S3/SessionAwareIOStream.h
rename to src/IO/SessionAwareIOStream.h
index babe52545d1..2380bd0fd60 100644
--- a/src/IO/S3/SessionAwareIOStream.h
+++ b/src/IO/SessionAwareIOStream.h
@@ -3,7 +3,7 @@
 #include <iosfwd>
 
 
-namespace DB::S3
+namespace DB
 {
 /**
  * Wrapper of IOStream to store response stream and corresponding HTTP session.
diff --git a/src/IO/SharedThreadPools.cpp b/src/IO/SharedThreadPools.cpp
index c8506663bc8..2ea30400ad9 100644
--- a/src/IO/SharedThreadPools.cpp
+++ b/src/IO/SharedThreadPools.cpp
@@ -20,6 +20,9 @@ namespace CurrentMetrics
     extern const Metric MergeTreeOutdatedPartsLoaderThreads;
     extern const Metric MergeTreeOutdatedPartsLoaderThreadsActive;
     extern const Metric MergeTreeOutdatedPartsLoaderThreadsScheduled;
+    extern const Metric DatabaseReplicatedCreateTablesThreads;
+    extern const Metric DatabaseReplicatedCreateTablesThreadsActive;
+    extern const Metric DatabaseReplicatedCreateTablesThreadsScheduled;
 }
 
 namespace DB
@@ -148,4 +151,10 @@ StaticThreadPool & getOutdatedPartsLoadingThreadPool()
     return instance;
 }
 
+StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool()
+{
+    static StaticThreadPool instance("CreateTablesThreadPool", CurrentMetrics::DatabaseReplicatedCreateTablesThreads, CurrentMetrics::DatabaseReplicatedCreateTablesThreadsActive, CurrentMetrics::DatabaseReplicatedCreateTablesThreadsScheduled);
+    return instance;
+}
+
 }
diff --git a/src/IO/SharedThreadPools.h b/src/IO/SharedThreadPools.h
index f37f3acefe7..acc5368f8ac 100644
--- a/src/IO/SharedThreadPools.h
+++ b/src/IO/SharedThreadPools.h
@@ -64,4 +64,7 @@ StaticThreadPool & getPartsCleaningThreadPool();
 /// the number of threads by calling enableTurboMode() :-)
 StaticThreadPool & getOutdatedPartsLoadingThreadPool();
 
+/// ThreadPool used for creating tables in DatabaseReplicated.
+StaticThreadPool & getDatabaseReplicatedCreateTablesThreadPool();
+
 }
diff --git a/src/IO/TimeoutSetter.cpp b/src/IO/TimeoutSetter.cpp
index b8b7a814703..2e732782700 100644
--- a/src/IO/TimeoutSetter.cpp
+++ b/src/IO/TimeoutSetter.cpp
@@ -1,5 +1,5 @@
 #include <IO/TimeoutSetter.h>
-
+#include <Common/Exception.h>
 #include <Common/logger_useful.h>
 
 
@@ -38,7 +38,11 @@ TimeoutSetter::~TimeoutSetter()
     }
     catch (...)
     {
+        /// It's known that setting timeouts for a socket often does not work on Apple macOS.
+        /// Let's not confuse the users of Apple macOS with extraneous error messages.
+#if !defined(OS_DARWIN)
         tryLogCurrentException("Client", "TimeoutSetter: Can't reset timeouts");
+#endif
     }
 }
 
diff --git a/src/IO/UncompressedCache.cpp b/src/IO/UncompressedCache.cpp
new file mode 100644
index 00000000000..7309ef5d2f4
--- /dev/null
+++ b/src/IO/UncompressedCache.cpp
@@ -0,0 +1,11 @@
+#include <IO/UncompressedCache.h>
+
+namespace DB
+{
+template class CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
+
+UncompressedCache::UncompressedCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio)
+    : Base(cache_policy, max_size_in_bytes, 0, size_ratio)
+{
+}
+}
diff --git a/src/IO/UncompressedCache.h b/src/IO/UncompressedCache.h
index 702804cdda3..aa515eec357 100644
--- a/src/IO/UncompressedCache.h
+++ b/src/IO/UncompressedCache.h
@@ -33,6 +33,7 @@ struct UncompressedSizeWeightFunction
     }
 };
 
+extern template class CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
 
 /** Cache of decompressed blocks for implementation of CachedCompressedReadBuffer. thread-safe.
   */
@@ -42,8 +43,7 @@ private:
     using Base = CacheBase<UInt128, UncompressedCacheCell, UInt128TrivialHash, UncompressedSizeWeightFunction>;
 
 public:
-    UncompressedCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio)
-        : Base(cache_policy, max_size_in_bytes, 0, size_ratio) {}
+    UncompressedCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio);
 
     /// 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.h b/src/IO/VarInt.h
index 8d10055a3df..6dce8008170 100644
--- a/src/IO/VarInt.h
+++ b/src/IO/VarInt.h
@@ -5,6 +5,9 @@
 #include <IO/ReadBuffer.h>
 #include <IO/WriteBuffer.h>
 
+#include <istream>
+#include <ostream>
+
 
 namespace DB
 {
@@ -79,7 +82,7 @@ inline char * writeVarInt(Int64 x, char * ostr)
     return writeVarUInt(static_cast<UInt64>((x << 1) ^ (x >> 63)), ostr);
 }
 
-namespace impl
+namespace varint_impl
 {
 
 template <bool check_eof>
@@ -92,7 +95,7 @@ inline void readVarUInt(UInt64 & x, ReadBuffer & istr)
             if (istr.eof()) [[unlikely]]
                 throwReadAfterEOF();
 
-        UInt64 byte = *istr.position();
+        UInt64 byte = static_cast<unsigned char>(*istr.position());
         ++istr.position();
         x |= (byte & 0x7F) << (7 * i);
 
@@ -106,8 +109,8 @@ inline void readVarUInt(UInt64 & x, ReadBuffer & istr)
 inline void readVarUInt(UInt64 & x, ReadBuffer & istr)
 {
     if (istr.buffer().end() - istr.position() >= 10)
-        return impl::readVarUInt<false>(x, istr);
-    return impl::readVarUInt<true>(x, istr);
+        return varint_impl::readVarUInt<false>(x, istr);
+    return varint_impl::readVarUInt<true>(x, istr);
 }
 
 inline void readVarUInt(UInt64 & x, std::istream & istr)
@@ -133,7 +136,7 @@ inline const char * readVarUInt(UInt64 & x, const char * istr, size_t size)
         if (istr == end) [[unlikely]]
             throwReadAfterEOF();
 
-        UInt64 byte = *istr;
+        UInt64 byte = static_cast<unsigned char>(*istr);
         ++istr;
         x |= (byte & 0x7F) << (7 * i);
 
diff --git a/src/IO/WithFileName.cpp b/src/IO/WithFileName.cpp
index 2383182f7e7..7b50b205935 100644
--- a/src/IO/WithFileName.cpp
+++ b/src/IO/WithFileName.cpp
@@ -1,5 +1,5 @@
 #include <IO/WithFileName.h>
-#include <IO/CompressedReadBufferWrapper.h>
+#include <IO/ReadBufferWrapperBase.h>
 #include <IO/ParallelReadBuffer.h>
 #include <IO/PeekableReadBuffer.h>
 
@@ -16,10 +16,10 @@ static String getFileName(const T & entry)
 
 String getFileNameFromReadBuffer(const ReadBuffer & in)
 {
-    if (const auto * compressed = dynamic_cast<const CompressedReadBufferWrapper *>(&in))
-        return getFileName(compressed->getWrappedReadBuffer());
+    if (const auto * wrapper = dynamic_cast<const ReadBufferWrapperBase *>(&in))
+        return getFileNameFromReadBuffer(wrapper->getWrappedReadBuffer());
     else if (const auto * parallel = dynamic_cast<const ParallelReadBuffer *>(&in))
-        return getFileName(parallel->getReadBuffer());
+        return getFileNameFromReadBuffer(parallel->getReadBuffer());
     else if (const auto * peekable = dynamic_cast<const PeekableReadBuffer *>(&in))
         return getFileNameFromReadBuffer(peekable->getSubBuffer());
     else
diff --git a/src/IO/WriteBuffer.cpp b/src/IO/WriteBuffer.cpp
index 61fdd31e16a..bcc7445486e 100644
--- a/src/IO/WriteBuffer.cpp
+++ b/src/IO/WriteBuffer.cpp
@@ -17,7 +17,7 @@ WriteBuffer::~WriteBuffer()
         /// However it is suspicious to destroy instance without finalization at the green path
         if (!std::uncaught_exceptions() && std::current_exception() == nullptr)
         {
-            Poco::Logger * log = &Poco::Logger::get("WriteBuffer");
+            LoggerPtr log = getLogger("WriteBuffer");
             LOG_ERROR(
                 log,
                 "WriteBuffer is not finalized when destructor is called. "
diff --git a/src/IO/WriteBuffer.h b/src/IO/WriteBuffer.h
index 67dbb9b2e7a..1ceb938e454 100644
--- a/src/IO/WriteBuffer.h
+++ b/src/IO/WriteBuffer.h
@@ -172,12 +172,12 @@ public:
     WriteBufferFromPointer(Position ptr, size_t size) : WriteBuffer(ptr, size) {}
 
 private:
-    virtual void finalizeImpl() override
+    void finalizeImpl() override
     {
         /// no op
     }
 
-    virtual void sync() override
+    void sync() override
     {
         /// no on
     }
diff --git a/src/IO/WriteBufferDecorator.h b/src/IO/WriteBufferDecorator.h
index ee47834b7af..88161f8d232 100644
--- a/src/IO/WriteBufferDecorator.h
+++ b/src/IO/WriteBufferDecorator.h
@@ -32,6 +32,7 @@ public:
 
     void finalizeImpl() override
     {
+        Base::finalizeImpl();
         try
         {
             finalizeBefore();
diff --git a/src/IO/WriteBufferFromArena.h b/src/IO/WriteBufferFromArena.h
index 8e9276496b5..f901f5bff77 100644
--- a/src/IO/WriteBufferFromArena.h
+++ b/src/IO/WriteBufferFromArena.h
@@ -66,7 +66,7 @@ private:
 
     /// it is super strange,
     /// but addition next call changes the data in serializeValueIntoArena result
-    virtual void finalizeImpl() override { /* no op */ }
+    void finalizeImpl() override { /* no op */ }
 };
 
 }
diff --git a/src/IO/WriteBufferFromEncryptedFile.h b/src/IO/WriteBufferFromEncryptedFile.h
index c6edcf76533..2b59bb468d1 100644
--- a/src/IO/WriteBufferFromEncryptedFile.h
+++ b/src/IO/WriteBufferFromEncryptedFile.h
@@ -40,7 +40,7 @@ private:
 
     FileEncryption::Encryptor encryptor;
 
-    Poco::Logger * log = &Poco::Logger::get("WriteBufferFromEncryptedFile");
+    LoggerPtr log = getLogger("WriteBufferFromEncryptedFile");
 };
 
 }
diff --git a/src/IO/WriteBufferFromHTTP.cpp b/src/IO/WriteBufferFromHTTP.cpp
index 3b2721e3bff..d54e1685017 100644
--- a/src/IO/WriteBufferFromHTTP.cpp
+++ b/src/IO/WriteBufferFromHTTP.cpp
@@ -7,6 +7,7 @@ namespace DB
 {
 
 WriteBufferFromHTTP::WriteBufferFromHTTP(
+    const HTTPConnectionGroupType & connection_group,
     const Poco::URI & uri,
     const std::string & method,
     const std::string & content_type,
@@ -14,9 +15,10 @@ WriteBufferFromHTTP::WriteBufferFromHTTP(
     const HTTPHeaderEntries & additional_headers,
     const ConnectionTimeouts & timeouts,
     size_t buffer_size_,
-    ProxyConfiguration proxy_configuration)
+    ProxyConfiguration proxy_configuration
+)
     : WriteBufferFromOStream(buffer_size_)
-    , session{makeHTTPSession(uri, timeouts, proxy_configuration)}
+    , session{makeHTTPSession(connection_group, uri, timeouts, proxy_configuration)}
     , request{method, uri.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1}
 {
     request.setHost(uri.getHost());
@@ -33,7 +35,7 @@ WriteBufferFromHTTP::WriteBufferFromHTTP(
     for (const auto & header: additional_headers)
         request.add(header.name, header.value);
 
-    LOG_TRACE((&Poco::Logger::get("WriteBufferToHTTP")), "Sending request to {}", uri.toString());
+    LOG_TRACE((getLogger("WriteBufferToHTTP")), "Sending request to {}", uri.toString());
 
     ostr = &session->sendRequest(request);
 }
diff --git a/src/IO/WriteBufferFromHTTP.h b/src/IO/WriteBufferFromHTTP.h
index f1e1e2a9e91..09fd55ec290 100644
--- a/src/IO/WriteBufferFromHTTP.h
+++ b/src/IO/WriteBufferFromHTTP.h
@@ -19,7 +19,8 @@ namespace DB
 class WriteBufferFromHTTP : public WriteBufferFromOStream
 {
 public:
-    explicit WriteBufferFromHTTP(const Poco::URI & uri,
+    explicit WriteBufferFromHTTP(const HTTPConnectionGroupType & connection_group,
+                                 const Poco::URI & uri,
                                  const std::string & method = Poco::Net::HTTPRequest::HTTP_POST, // POST or PUT only
                                  const std::string & content_type = "",
                                  const std::string & content_encoding = "",
diff --git a/src/IO/WriteBufferFromOStream.cpp b/src/IO/WriteBufferFromOStream.cpp
index ffc3e62e9a6..e77ec079d1f 100644
--- a/src/IO/WriteBufferFromOStream.cpp
+++ b/src/IO/WriteBufferFromOStream.cpp
@@ -1,6 +1,7 @@
 #include <IO/WriteBufferFromOStream.h>
 #include <Common/logger_useful.h>
 
+#include <ostream>
 
 namespace DB
 {
diff --git a/src/IO/WriteBufferFromS3.cpp b/src/IO/WriteBufferFromS3.cpp
index 8605fdc004a..5e898dec9b8 100644
--- a/src/IO/WriteBufferFromS3.cpp
+++ b/src/IO/WriteBufferFromS3.cpp
@@ -4,22 +4,20 @@
 
 #include "StdIStreamFromMemory.h"
 #include "WriteBufferFromS3.h"
-#include "WriteBufferFromS3TaskTracker.h"
 
+#include <Common/ThreadPoolTaskTracker.h>
 #include <Common/logger_useful.h>
 #include <Common/ProfileEvents.h>
 #include <Common/Throttler.h>
 #include <Interpreters/Cache/FileCache.h>
 
-#include <IO/ResourceGuard.h>
+#include <Common/Scheduler/ResourceGuard.h>
 #include <IO/WriteHelpers.h>
 #include <IO/S3Common.h>
 #include <IO/S3/Requests.h>
 #include <IO/S3/getObjectInfo.h>
 #include <IO/S3/BlobStorageLogWriter.h>
 
-#include <aws/s3/model/StorageClass.h>
-
 #include <utility>
 
 
@@ -74,6 +72,19 @@ struct WriteBufferFromS3::PartData
     }
 };
 
+BufferAllocationPolicyPtr createBufferAllocationPolicy(const S3Settings::RequestSettings::PartUploadSettings & settings)
+{
+    BufferAllocationPolicy::Settings allocation_settings;
+    allocation_settings.strict_size = settings.strict_upload_part_size;
+    allocation_settings.min_size = settings.min_upload_part_size;
+    allocation_settings.max_size = settings.max_upload_part_size;
+    allocation_settings.multiply_factor = settings.upload_part_size_multiply_factor;
+    allocation_settings.multiply_parts_count_threshold = settings.upload_part_size_multiply_parts_count_threshold;
+    allocation_settings.max_single_size = settings.max_single_part_upload_size;
+
+    return BufferAllocationPolicy::create(allocation_settings);
+}
+
 
 WriteBufferFromS3::WriteBufferFromS3(
     std::shared_ptr<const S3::Client> client_ptr_,
@@ -93,9 +104,9 @@ WriteBufferFromS3::WriteBufferFromS3(
     , write_settings(write_settings_)
     , client_ptr(std::move(client_ptr_))
     , object_metadata(std::move(object_metadata_))
-    , buffer_allocation_policy(ChooseBufferPolicy(upload_settings))
+    , buffer_allocation_policy(createBufferAllocationPolicy(upload_settings))
     , task_tracker(
-          std::make_unique<WriteBufferFromS3::TaskTracker>(
+          std::make_unique<TaskTracker>(
               std::move(schedule_),
               upload_settings.max_inflight_parts_for_one_file,
               limitedLog))
@@ -178,6 +189,11 @@ void WriteBufferFromS3::preFinalize()
 
 void WriteBufferFromS3::finalizeImpl()
 {
+    OpenTelemetry::SpanHolder span("WriteBufferFromS3::finalizeImpl");
+    span.addAttribute("clickhouse.s3_bucket", bucket);
+    span.addAttribute("clickhouse.s3_key", key);
+    span.addAttribute("clickhouse.total_size", total_size);
+
     LOG_TRACE(limitedLog, "finalizeImpl WriteBufferFromS3. {}.", getShortLogDetails());
 
     if (!is_prefinalized)
@@ -188,6 +204,8 @@ void WriteBufferFromS3::finalizeImpl()
 
     task_tracker->waitAll();
 
+    span.addAttributeIfNotZero("clickhouse.multipart_upload_parts", multipart_tags.size());
+
     if (!multipart_upload_id.empty())
     {
         completeMultipartUpload();
@@ -315,14 +333,6 @@ void WriteBufferFromS3::detachBuffer()
     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());
-}
-
 void WriteBufferFromS3::allocateBuffer()
 {
     buffer_allocation_policy->nextBuffer();
@@ -335,6 +345,14 @@ void WriteBufferFromS3::allocateBuffer()
     WriteBuffer::set(memory.data(), memory.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());
+}
+
 void WriteBufferFromS3::setFakeBufferWhenPreFinalized()
 {
     WriteBuffer::set(fake_buffer_when_prefinalized, sizeof(fake_buffer_when_prefinalized));
@@ -449,6 +467,14 @@ S3::UploadPartRequest WriteBufferFromS3::getUploadRequest(size_t part_number, Pa
     /// 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");
 
+    /// Checksums need to be provided on CompleteMultipartUpload requests, so we calculate then manually and store in multipart_checksums
+    if (client_ptr->isS3ExpressBucket())
+    {
+        auto checksum = S3::RequestChecksum::calculateChecksum(req);
+        S3::RequestChecksum::setRequestChecksum(req, checksum);
+        multipart_checksums.push_back(std::move(checksum));
+    }
+
     return req;
 }
 
@@ -568,7 +594,10 @@ void WriteBufferFromS3::completeMultipartUpload()
     for (size_t i = 0; i < multipart_tags.size(); ++i)
     {
         Aws::S3::Model::CompletedPart part;
-        multipart_upload.AddParts(part.WithETag(multipart_tags[i]).WithPartNumber(static_cast<int>(i + 1)));
+        part.WithETag(multipart_tags[i]).WithPartNumber(static_cast<int>(i + 1));
+        if (!multipart_checksums.empty())
+            S3::RequestChecksum::setPartChecksum(part, multipart_checksums.at(i));
+        multipart_upload.AddParts(part);
     }
 
     req.SetMultipartUpload(multipart_upload);
diff --git a/src/IO/WriteBufferFromS3.h b/src/IO/WriteBufferFromS3.h
index 191e522c59a..e7a06f25115 100644
--- a/src/IO/WriteBufferFromS3.h
+++ b/src/IO/WriteBufferFromS3.h
@@ -10,8 +10,10 @@
 #include <IO/WriteBuffer.h>
 #include <IO/WriteSettings.h>
 #include <Storages/StorageS3Settings.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <IO/S3/BlobStorageLogWriter.h>
+#include <Common/ThreadPoolTaskTracker.h>
+#include <Common/BufferAllocationPolicy.h>
 
 #include <memory>
 #include <vector>
@@ -26,6 +28,8 @@ namespace DB
  * 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 TaskTracker;
+
 class WriteBufferFromS3 final : public WriteBufferFromFileBase
 {
 public:
@@ -46,18 +50,6 @@ public:
     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:
     /// Receives response from the server after sending all data.
     void finalizeImpl() override;
@@ -67,10 +59,10 @@ private:
 
     struct PartData;
     void hidePartialData();
-    void allocateFirstBuffer();
     void reallocateFirstBuffer();
     void detachBuffer();
     void allocateBuffer();
+    void allocateFirstBuffer();
     void setFakeBufferWhenPreFinalized();
 
     S3::UploadPartRequest getUploadRequest(size_t part_number, PartData & data);
@@ -91,15 +83,16 @@ private:
     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");
+    LoggerPtr log = getLogger("WriteBufferFromS3");
     LogSeriesLimiterPtr limitedLog = std::make_shared<LogSeriesLimiter>(log, 1, 5);
 
-    IBufferAllocationPolicyPtr buffer_allocation_policy;
+    BufferAllocationPolicyPtr 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::deque<String> multipart_tags;
+    std::deque<String> multipart_checksums; // if enabled
     bool multipart_upload_finished = false;
 
     /// Track that prefinalize() is called only once
@@ -118,7 +111,6 @@ private:
     size_t total_size = 0;
     size_t hidden_size = 0;
 
-    class TaskTracker;
     std::unique_ptr<TaskTracker> task_tracker;
 
     BlobStorageLogWriterPtr blob_log;
diff --git a/src/IO/WriteHelpers.cpp b/src/IO/WriteHelpers.cpp
index 9dddcd4b60f..88c706a590f 100644
--- a/src/IO/WriteHelpers.cpp
+++ b/src/IO/WriteHelpers.cpp
@@ -91,7 +91,8 @@ static inline void writeProbablyQuotedStringImpl(StringRef s, WriteBuffer & buf,
     if (isValidIdentifier(s.toView())
         /// This are valid identifiers but are problematic if present unquoted in SQL query.
         && !(s.size == strlen("distinct") && 0 == strncasecmp(s.data, "distinct", strlen("distinct")))
-        && !(s.size == strlen("all") && 0 == strncasecmp(s.data, "all", strlen("all"))))
+        && !(s.size == strlen("all") && 0 == strncasecmp(s.data, "all", strlen("all")))
+        && !(s.size == strlen("table") && 0 == strncasecmp(s.data, "table", strlen("table"))))
     {
         writeString(s, buf);
     }
diff --git a/src/IO/WriteHelpers.h b/src/IO/WriteHelpers.h
index b4f8b476b11..a30e2feb439 100644
--- a/src/IO/WriteHelpers.h
+++ b/src/IO/WriteHelpers.h
@@ -19,7 +19,6 @@
 #include <base/find_symbols.h>
 #include <base/StringRef.h>
 #include <base/DecomposedFloat.h>
-#include <base/EnumReflection.h>
 
 #include <Core/DecimalFunctions.h>
 #include <Core/Types.h>
@@ -29,6 +28,7 @@
 #include <Common/Exception.h>
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/NaNUtils.h>
+#include <Common/typeid_cast.h>
 
 #include <IO/CompressionMethod.h>
 #include <IO/WriteBuffer.h>
@@ -36,16 +36,13 @@
 #include <IO/VarInt.h>
 #include <IO/DoubleConverter.h>
 #include <IO/WriteBufferFromString.h>
+#include <IO/WriteBufferFromFileDescriptor.h>
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #pragma clang diagnostic ignored "-Wsign-compare"
-#endif
 #include <dragonbox/dragonbox_to_chars.h>
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
 
 #include <Formats/FormatSettings.h>
 
@@ -1393,9 +1390,9 @@ struct PcgSerializer
 {
     static void serializePcg32(const pcg32_fast & rng, WriteBuffer & buf)
     {
-        writeText(rng.multiplier(), buf);
+        writeText(pcg32_fast::multiplier(), buf);
         writeChar(' ', buf);
-        writeText(rng.increment(), buf);
+        writeText(pcg32_fast::increment(), buf);
         writeChar(' ', buf);
         writeText(rng.state_, buf);
     }
@@ -1405,6 +1402,12 @@ void writePointerHex(const void * ptr, WriteBuffer & buf);
 
 String fourSpaceIndent(size_t indent);
 
+bool inline isWritingToTerminal(const WriteBuffer & buf)
+{
+    const auto * write_buffer_to_descriptor = typeid_cast<const WriteBufferFromFileDescriptor *>(&buf);
+    return write_buffer_to_descriptor && write_buffer_to_descriptor->getFD() == STDOUT_FILENO && isatty(STDOUT_FILENO);
+}
+
 }
 
 template<>
diff --git a/src/IO/WriteSettings.h b/src/IO/WriteSettings.h
index 8f22e44145a..7d36677b468 100644
--- a/src/IO/WriteSettings.h
+++ b/src/IO/WriteSettings.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <Common/Throttler_fwd.h>
-#include <IO/ResourceLink.h>
+#include <Common/Scheduler/ResourceLink.h>
 
 namespace DB
 {
@@ -20,6 +20,7 @@ struct WriteSettings
     bool enable_filesystem_cache_on_write_operations = false;
     bool enable_filesystem_cache_log = false;
     bool throw_on_error_from_cache = false;
+    size_t filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = 1000;
 
     bool s3_allow_parallel_part_upload = true;
 
diff --git a/src/IO/ZlibDeflatingWriteBuffer.h b/src/IO/ZlibDeflatingWriteBuffer.h
index f01c41c7d13..35760b3e246 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.h
+++ b/src/IO/ZlibDeflatingWriteBuffer.h
@@ -27,10 +27,10 @@ public:
             CompressionMethod compression_method,
             int compression_level,
             size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-            char * existing_memory = nullptr,
+            char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
             size_t alignment = 0,
             bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_)
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_) /// NOLINT(bugprone-move-forwarding-reference)
     {
         zstr.zalloc = nullptr;
         zstr.zfree = nullptr;
@@ -60,8 +60,8 @@ private:
     /// Flush all pending data and write zlib footer to the underlying buffer.
     /// After the first call to this function, subsequent calls will have no effect and
     /// an attempt to write to this buffer will result in exception.
-    virtual void finalizeBefore() override;
-    virtual void finalizeAfter() override;
+    void finalizeBefore() override;
+    void finalizeAfter() override;
 
     z_stream zstr;
     bool compress_empty = true;
diff --git a/src/IO/ZstdDeflatingWriteBuffer.h b/src/IO/ZstdDeflatingWriteBuffer.h
index 15c3869062f..9d1c677e725 100644
--- a/src/IO/ZstdDeflatingWriteBuffer.h
+++ b/src/IO/ZstdDeflatingWriteBuffer.h
@@ -20,10 +20,10 @@ public:
         int compression_level,
         int window_log = 0,
         size_t buf_size = DBMS_DEFAULT_BUFFER_SIZE,
-        char * existing_memory = nullptr,
+        char * existing_memory = nullptr, /// NOLINT(readability-non-const-parameter)
         size_t alignment = 0,
         bool compress_empty_ = true)
-    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_)
+    : WriteBufferWithOwnMemoryDecorator(std::move(out_), buf_size, existing_memory, alignment), compress_empty(compress_empty_) /// NOLINT(bugprone-move-forwarding-reference)
     {
         initialize(compression_level, window_log);
     }
diff --git a/src/IO/copyData.cpp b/src/IO/copyData.cpp
index 07222a930b5..d2c7200c350 100644
--- a/src/IO/copyData.cpp
+++ b/src/IO/copyData.cpp
@@ -35,7 +35,7 @@ void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t
     }
 
     if (check_bytes && bytes > 0)
-        throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Attempt to read after EOF.");
+        throw Exception(ErrorCodes::ATTEMPT_TO_READ_AFTER_EOF, "Attempt to read after EOF, left to copy {} bytes.", bytes);
 }
 
 void copyDataImpl(ReadBuffer & from, WriteBuffer & to, bool check_bytes, size_t bytes, std::function<void()> cancellation_hook, ThrottlerPtr throttler)
diff --git a/src/IO/examples/read_buffer.cpp b/src/IO/examples/read_buffer.cpp
index 221da24715b..2621ce620af 100644
--- a/src/IO/examples/read_buffer.cpp
+++ b/src/IO/examples/read_buffer.cpp
@@ -11,9 +11,9 @@ int readAndPrint(DB::ReadBuffer & in)
 {
     try
     {
-        DB::Int64 a;
-        DB::Float64 b;
-        DB::String c, d;
+        Int64 a;
+        Float64 b;
+        String c, d;
 
         DB::readIntText(a, in);
         in.ignore();
diff --git a/src/IO/examples/read_buffer_from_hdfs.cpp b/src/IO/examples/read_buffer_from_hdfs.cpp
index 977dd2ae227..c499542fedb 100644
--- a/src/IO/examples/read_buffer_from_hdfs.cpp
+++ b/src/IO/examples/read_buffer_from_hdfs.cpp
@@ -6,6 +6,8 @@
 #include <base/types.h>
 #include <Common/Config/ConfigProcessor.h>
 
+#include <Poco/Util/MapConfiguration.h>
+
 using namespace DB;
 
 int main()
diff --git a/src/IO/examples/read_buffer_perf.cpp b/src/IO/examples/read_buffer_perf.cpp
index fd9b3b6f7cb..c136e3350ef 100644
--- a/src/IO/examples/read_buffer_perf.cpp
+++ b/src/IO/examples/read_buffer_perf.cpp
@@ -13,9 +13,9 @@ int main(int, char **)
     {
         DB::ReadBufferFromFile in("test");
 
-        DB::Int64 a = 0;
-        DB::Float64 b = 0;
-        DB::String c, d;
+        Int64 a = 0;
+        Float64 b = 0;
+        String c, d;
 
         size_t i = 0;
         while (!in.eof())
diff --git a/src/IO/examples/var_uint.cpp b/src/IO/examples/var_uint.cpp
index 0d20fa7172d..eacc1631ffd 100644
--- a/src/IO/examples/var_uint.cpp
+++ b/src/IO/examples/var_uint.cpp
@@ -17,7 +17,7 @@ int main(int argc, char ** argv)
         return 1;
     }
 
-    DB::UInt64 x = DB::parse<UInt64>(argv[1]);
+    UInt64 x = DB::parse<UInt64>(argv[1]);
 
     std::cout << std::hex << std::showbase << "Input: " << x << std::endl;
 
@@ -47,7 +47,7 @@ int main(int argc, char ** argv)
     hex << s;
     std::cout << std::endl;
 
-    DB::UInt64 y = 0;
+    UInt64 y = 0;
 
     DB::ReadBufferFromString rb(s);
     DB::readVarUInt(y, rb);
diff --git a/src/IO/examples/write_buffer.cpp b/src/IO/examples/write_buffer.cpp
index 999f9b1bb34..a0fc16df604 100644
--- a/src/IO/examples/write_buffer.cpp
+++ b/src/IO/examples/write_buffer.cpp
@@ -12,10 +12,10 @@ int main(int, char **)
 {
     try
     {
-        DB::Int64 a = -123456;
-        DB::Float64 b = 123.456;
-        DB::String c = "ва�� pe\ttya";
-        DB::String d = "'xyz\\";
+        Int64 a = -123456;
+        Float64 b = 123.456;
+        String c = "ва�� pe\ttya";
+        String d = "'xyz\\";
 
         std::stringstream s;    // STYLE_CHECK_ALLOW_STD_STRING_STREAM
         s.exceptions(std::ios::failbit);
diff --git a/src/IO/examples/write_buffer_perf.cpp b/src/IO/examples/write_buffer_perf.cpp
index 3f57ddb9a4f..de9d6aa7405 100644
--- a/src/IO/examples/write_buffer_perf.cpp
+++ b/src/IO/examples/write_buffer_perf.cpp
@@ -12,10 +12,10 @@ int main(int, char **)
 {
     try
     {
-        DB::Int64 a = -123456;
-        DB::Float64 b = 123.456;
-        DB::String c = "ва�� pe\ttya";
-        DB::String d = "'xyz\\";
+        Int64 a = -123456;
+        Float64 b = 123.456;
+        String c = "ва�� pe\ttya";
+        String d = "'xyz\\";
 
         std::ofstream s("test");
         DB::WriteBufferFromOStream out(s);
diff --git a/src/IO/parseDateTimeBestEffort.cpp b/src/IO/parseDateTimeBestEffort.cpp
index 9734ba1c84f..83928b32f2f 100644
--- a/src/IO/parseDateTimeBestEffort.cpp
+++ b/src/IO/parseDateTimeBestEffort.cpp
@@ -147,6 +147,9 @@ ReturnType parseDateTimeBestEffortImpl(
             {
                 has_comma_between_date_and_time = true;
                 ++in.position();
+
+                if (in.eof())
+                    break;
             }
         }
 
@@ -582,11 +585,18 @@ ReturnType parseDateTimeBestEffortImpl(
         day_of_month = 1;
     if (!month)
         month = 1;
+
     if (!year)
     {
+        /// If year is not specified, it will be the current year if the date is unknown or not greater than today,
+        /// otherwise it will be the previous year.
+        /// This convoluted logic is needed to parse the syslog format, which looks as follows: "Mar  3 01:33:48".
+        /// If you have questions, ask Victor Krasnov, https://www.linkedin.com/in/vickr/
+
         time_t now = time(nullptr);
-        UInt16 curr_year = local_time_zone.toYear(now);
-        year = now < local_time_zone.makeDateTime(curr_year, month, day_of_month, hour, minute, second) ? curr_year - 1 : curr_year;
+        auto today = local_time_zone.toDayNum(now);
+        UInt16 curr_year = local_time_zone.toYear(today);
+        year = local_time_zone.makeDayNum(curr_year, month, day_of_month) <= today ? curr_year : curr_year - 1;
     }
 
     auto is_leap_year = (year % 400 == 0) || (year % 100 != 0 && year % 4 == 0);
diff --git a/src/IO/readDecimalText.h b/src/IO/readDecimalText.h
index 3417310a990..f3b08065696 100644
--- a/src/IO/readDecimalText.h
+++ b/src/IO/readDecimalText.h
@@ -38,7 +38,7 @@ inline bool readDigits(ReadBuffer & buf, T & x, uint32_t & digits, int32_t & exp
         return false;
     }
 
-    switch (*buf.position())
+    switch (*buf.position()) /// NOLINT(bugprone-switch-missing-default-case)
     {
         case '-':
             sign = -1;
@@ -224,4 +224,24 @@ inline void readCSVDecimalText(ReadBuffer & buf, T & x, uint32_t precision, uint
         assertChar(maybe_quote, buf);
 }
 
+template <typename T>
+inline bool tryReadCSVDecimalText(ReadBuffer & buf, T & x, uint32_t precision, uint32_t & scale)
+{
+    if (buf.eof())
+        return false;
+
+    char maybe_quote = *buf.position();
+
+    if (maybe_quote == '\'' || maybe_quote == '\"')
+        ++buf.position();
+
+    if (!tryReadDecimalText(buf, x, precision, scale))
+        return false;
+
+    if ((maybe_quote == '\'' || maybe_quote == '\"') && !checkChar(maybe_quote, buf))
+        return false;
+
+    return true;
+}
+
 }
diff --git a/src/IO/readFloatText.cpp b/src/IO/readFloatText.cpp
index d1143f7c62c..17ccc1b25b7 100644
--- a/src/IO/readFloatText.cpp
+++ b/src/IO/readFloatText.cpp
@@ -67,4 +67,7 @@ template void readFloatText<Float64>(Float64 &, ReadBuffer &);
 template bool tryReadFloatText<Float32>(Float32 &, ReadBuffer &);
 template bool tryReadFloatText<Float64>(Float64 &, ReadBuffer &);
 
+template bool tryReadFloatTextNoExponent<Float32>(Float32 &, ReadBuffer &);
+template bool tryReadFloatTextNoExponent<Float64>(Float64 &, ReadBuffer &);
+
 }
diff --git a/src/IO/readFloatText.h b/src/IO/readFloatText.h
index 23e904f305a..597f0a06fb9 100644
--- a/src/IO/readFloatText.h
+++ b/src/IO/readFloatText.h
@@ -6,14 +6,10 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <double-conversion/double-conversion.h>
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunneeded-internal-declaration"
-#endif
 #include <fast_float/fast_float.h>
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
 
 /** Methods for reading floating point numbers from text with decimal representation.
   * There are "precise", "fast" and "simple" implementations.
@@ -324,7 +320,7 @@ static inline void readUIntTextUpToNSignificantDigits(T & x, ReadBuffer & buf)
 }
 
 
-template <typename T, typename ReturnType>
+template <typename T, typename ReturnType, bool allow_exponent = true>
 ReturnType readFloatTextFastImpl(T & x, ReadBuffer & in)
 {
     static_assert(std::is_same_v<T, double> || std::is_same_v<T, float>, "Argument for readFloatTextImpl must be float or double");
@@ -395,30 +391,33 @@ ReturnType readFloatTextFastImpl(T & x, ReadBuffer & in)
         after_point_exponent = (read_digits > significant_digits ? -significant_digits : static_cast<int>(-read_digits)) - after_point_num_leading_zeros;
     }
 
-    if (checkChar('e', in) || checkChar('E', in))
+    if constexpr (allow_exponent)
     {
-        if (in.eof())
+        if (checkChar('e', in) || checkChar('E', in))
         {
-            if constexpr (throw_exception)
-                throw Exception(ErrorCodes::CANNOT_PARSE_NUMBER, "Cannot read floating point value: nothing after exponent");
-            else
-                return false;
-        }
+            if (in.eof())
+            {
+                if constexpr (throw_exception)
+                    throw Exception(ErrorCodes::CANNOT_PARSE_NUMBER, "Cannot read floating point value: nothing after exponent");
+                else
+                    return false;
+            }
 
-        bool exponent_negative = false;
-        if (*in.position() == '-')
-        {
-            exponent_negative = true;
-            ++in.position();
-        }
-        else if (*in.position() == '+')
-        {
-            ++in.position();
-        }
+            bool exponent_negative = false;
+            if (*in.position() == '-')
+            {
+                exponent_negative = true;
+                ++in.position();
+            }
+            else if (*in.position() == '+')
+            {
+                ++in.position();
+            }
 
-        readUIntTextUpToNSignificantDigits<4>(exponent, in);
-        if (exponent_negative)
-            exponent = -exponent;
+            readUIntTextUpToNSignificantDigits<4>(exponent, in);
+            if (exponent_negative)
+                exponent = -exponent;
+        }
     }
 
     if (after_point)
@@ -604,4 +603,7 @@ template <typename T> bool tryReadFloatTextSimple(T & x, ReadBuffer & in) { retu
 template <typename T> void readFloatText(T & x, ReadBuffer & in) { readFloatTextFast(x, in); }
 template <typename T> bool tryReadFloatText(T & x, ReadBuffer & in) { return tryReadFloatTextFast(x, in); }
 
+/// Don't read exponent part of the number.
+template <typename T> bool tryReadFloatTextNoExponent(T & x, ReadBuffer & in) { return readFloatTextFastImpl<T, bool, false>(x, in); }
+
 }
diff --git a/src/IO/tests/gtest_archive_reader_and_writer.cpp b/src/IO/tests/gtest_archive_reader_and_writer.cpp
index 37fbdff901a..898c7017e7d 100644
--- a/src/IO/tests/gtest_archive_reader_and_writer.cpp
+++ b/src/IO/tests/gtest_archive_reader_and_writer.cpp
@@ -1,26 +1,29 @@
 #include <gtest/gtest.h>
 #include "config.h"
 
+#include <filesystem>
+#include <format>
 #include <IO/Archives/ArchiveUtils.h>
 #include <IO/Archives/IArchiveReader.h>
 #include <IO/Archives/IArchiveWriter.h>
 #include <IO/Archives/createArchiveReader.h>
 #include <IO/Archives/createArchiveWriter.h>
+#include <IO/ReadBufferFromFile.h>
 #include <IO/ReadBufferFromFileBase.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
+#include <IO/WriteBufferFromFile.h>
 #include <IO/WriteBufferFromFileBase.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/WriteHelpers.h>
-#include <Common/Exception.h>
 #include <Poco/TemporaryFile.h>
-#include <filesystem>
+#include <Common/Exception.h>
 
 
 namespace DB::ErrorCodes
 {
-    extern const int CANNOT_UNPACK_ARCHIVE;
-    extern const int LOGICAL_ERROR;
+extern const int CANNOT_UNPACK_ARCHIVE;
+extern const int LOGICAL_ERROR;
 }
 
 namespace fs = std::filesystem;
@@ -49,7 +52,8 @@ bool createArchiveWithFiles(const std::string & archivename, const std::map<std:
 
     archive_write_open_filename(a, archivename.c_str());
 
-    for (const auto & [filename, content] : files) {
+    for (const auto & [filename, content] : files)
+    {
         entry = archive_entry_new();
         archive_entry_set_pathname(entry, filename.c_str());
         archive_entry_set_size(entry, content.size());
@@ -59,12 +63,11 @@ bool createArchiveWithFiles(const std::string & archivename, const std::map<std:
         archive_write_data(a, content.c_str(), content.size());
         archive_entry_free(entry);
     }
-    
+
     archive_write_close(a);
     archive_write_free(a);
 
     return true;
-
 }
 
 class ArchiveReaderAndWriterTest : public ::testing::TestWithParam<const char *>
@@ -114,11 +117,13 @@ TEST_P(ArchiveReaderAndWriterTest, EmptyArchive)
 
     EXPECT_FALSE(reader->fileExists("nofile.txt"));
 
-    expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "File 'nofile.txt' was not found in archive",
-                    [&]{ reader->getFileInfo("nofile.txt"); });
+    expectException(
+        ErrorCodes::CANNOT_UNPACK_ARCHIVE, "File 'nofile.txt' was not found in archive", [&] { reader->getFileInfo("nofile.txt"); });
 
-    expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "File 'nofile.txt' was not found in archive",
-                    [&]{ reader->readFile("nofile.txt", /*throw_on_not_found=*/true); });
+    expectException(
+        ErrorCodes::CANNOT_UNPACK_ARCHIVE,
+        "File 'nofile.txt' was not found in archive",
+        [&] { reader->readFile("nofile.txt", /*throw_on_not_found=*/true); });
 
     EXPECT_EQ(reader->firstFile(), nullptr);
 }
@@ -182,11 +187,9 @@ TEST_P(ArchiveReaderAndWriterTest, SingleFileInArchive)
         auto enumerator = reader->firstFile();
         ASSERT_NE(enumerator, nullptr);
         EXPECT_FALSE(enumerator->nextFile());
-        expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file",
-                        [&]{ enumerator->getFileName(); });
+        expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file", [&] { enumerator->getFileName(); });
 
-        expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file",
-                        [&] { reader->readFile(std::move(enumerator)); });
+        expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "No current file", [&] { reader->readFile(std::move(enumerator)); });
     }
 }
 
@@ -217,6 +220,10 @@ TEST_P(ArchiveReaderAndWriterTest, TwoFilesInArchive)
     ASSERT_TRUE(reader->fileExists("a.txt"));
     ASSERT_TRUE(reader->fileExists("b/c.txt"));
 
+    // Get all files
+    auto files = reader->getAllFiles();
+    EXPECT_EQ(files.size(), 2);
+
     EXPECT_EQ(reader->getFileInfo("a.txt").uncompressed_size, a_contents.size());
     EXPECT_EQ(reader->getFileInfo("b/c.txt").uncompressed_size, c_contents.size());
 
@@ -272,6 +279,10 @@ TEST_P(ArchiveReaderAndWriterTest, TwoFilesInArchive)
         enumerator = reader->nextFile(std::move(in));
         EXPECT_EQ(enumerator, nullptr);
     }
+
+    // Get all files one last time
+    files = reader->getAllFiles();
+    EXPECT_EQ(files.size(), 2);
 }
 
 
@@ -301,7 +312,8 @@ TEST_P(ArchiveReaderAndWriterTest, InMemory)
     ASSERT_FALSE(fs::exists(getPathToArchive()));
 
     /// Read the archive.
-    auto read_archive_func = [&]() -> std::unique_ptr<SeekableReadBuffer> { return std::make_unique<ReadBufferFromString>(archive_in_memory); };
+    auto read_archive_func
+        = [&]() -> std::unique_ptr<SeekableReadBuffer> { return std::make_unique<ReadBufferFromString>(archive_in_memory); };
     auto reader = createArchiveReader(getPathToArchive(), read_archive_func, archive_in_memory.size());
 
     ASSERT_TRUE(reader->fileExists("a.txt"));
@@ -334,16 +346,163 @@ TEST_P(ArchiveReaderAndWriterTest, InMemory)
 }
 
 
+TEST_P(ArchiveReaderAndWriterTest, ManyFilesInMemory)
+{
+    String archive_in_memory;
+    int files = 1000;
+    size_t times = 1;
+    /// Make an archive.
+    {
+        auto writer = createArchiveWriter(getPathToArchive(), std::make_unique<WriteBufferFromString>(archive_in_memory));
+        {
+            for (int i = 0; i < files; i++)
+            {
+                auto filename = std::format("{}.txt", i);
+                auto contents = std::format("The contents of {}.txt", i);
+                auto out = writer->writeFile(filename, times * contents.size());
+                for (int j = 0; j < times; j++)
+                    writeString(contents, *out);
+                out->finalize();
+            }
+        }
+        writer->finalize();
+    }
+
+    /// The created archive is really in memory.
+    ASSERT_FALSE(fs::exists(getPathToArchive()));
+
+    /// Read the archive.
+    auto read_archive_func
+        = [&]() -> std::unique_ptr<SeekableReadBuffer> { return std::make_unique<ReadBufferFromString>(archive_in_memory); };
+    auto reader = createArchiveReader(getPathToArchive(), read_archive_func, archive_in_memory.size());
+
+    for (int i = 0; i < files; i++)
+    {
+        auto filename = std::format("{}.txt", i);
+        auto contents = std::format("The contents of {}.txt", i);
+        ASSERT_TRUE(reader->fileExists(filename));
+        EXPECT_EQ(reader->getFileInfo(filename).uncompressed_size, times * contents.size());
+
+        {
+            auto in = reader->readFile(filename, /*throw_on_not_found=*/true);
+            for (int j = 0; j < times; j++)
+                ASSERT_TRUE(checkString(String(contents), *in));
+        }
+    }
+}
+
 TEST_P(ArchiveReaderAndWriterTest, Password)
 {
+    auto writer = createArchiveWriter(getPathToArchive());
+    //don't support passwords for tar archives
+    if (getPathToArchive().ends_with(".tar") || getPathToArchive().ends_with(".tar.gz") || getPathToArchive().ends_with(".tar.bz2")
+        || getPathToArchive().ends_with(".tar.lzma") || getPathToArchive().ends_with(".tar.zst") || getPathToArchive().ends_with(".tar.xz"))
+    {
+        expectException(
+            ErrorCodes::NOT_IMPLEMENTED,
+            "Setting a password is not currently supported for libarchive",
+            [&] { writer->setPassword("a.txt"); });
+        writer->finalize();
+    }
+    else
+    {
+        /// Make an archive.
+        std::string_view contents = "The contents of a.txt";
+        {
+            writer->setPassword("Qwe123");
+            {
+                auto out = writer->writeFile("a.txt");
+                writeString(contents, *out);
+                out->finalize();
+            }
+            writer->finalize();
+        }
+
+        /// Read the archive.
+        auto reader = createArchiveReader(getPathToArchive());
+
+        /// Try to read without a password.
+        expectException(
+            ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Password is required", [&] { reader->readFile("a.txt", /*throw_on_not_found=*/true); });
+
+        {
+            /// Try to read with a wrong password.
+            reader->setPassword("123Qwe");
+            expectException(
+                ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Wrong password", [&] { reader->readFile("a.txt", /*throw_on_not_found=*/true); });
+        }
+
+        {
+            /// Reading with the right password is successful.
+            reader->setPassword("Qwe123");
+            auto in = reader->readFile("a.txt", /*throw_on_not_found=*/true);
+            String str;
+            readStringUntilEOF(str, *in);
+            EXPECT_EQ(str, contents);
+        }
+    }
+}
+
+
+TEST_P(ArchiveReaderAndWriterTest, ArchiveNotExist)
+{
+    expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't open", [&] { createArchiveReader(getPathToArchive()); });
+}
+
+
+TEST_P(ArchiveReaderAndWriterTest, ManyFilesOnDisk)
+{
+    int files = 1000;
+    size_t times = 1;
     /// Make an archive.
-    std::string_view contents = "The contents of a.txt";
     {
         auto writer = createArchiveWriter(getPathToArchive());
-        writer->setPassword("Qwe123");
         {
-            auto out = writer->writeFile("a.txt");
-            writeString(contents, *out);
+            for (int i = 0; i < files; i++)
+            {
+                auto filename = std::format("{}.txt", i);
+                auto contents = std::format("The contents of {}.txt", i);
+                auto out = writer->writeFile(filename, times * contents.size());
+                for (int j = 0; j < times; j++)
+                    writeString(contents, *out);
+                out->finalize();
+            }
+        }
+        writer->finalize();
+    }
+
+    /// The created archive is really in memory.
+    ASSERT_TRUE(fs::exists(getPathToArchive()));
+
+    /// Read the archive.
+    auto reader = createArchiveReader(getPathToArchive());
+
+    for (int i = 0; i < files; i++)
+    {
+        auto filename = std::format("{}.txt", i);
+        auto contents = std::format("The contents of {}.txt", i);
+        ASSERT_TRUE(reader->fileExists(filename));
+        EXPECT_EQ(reader->getFileInfo(filename).uncompressed_size, times * contents.size());
+
+        {
+            auto in = reader->readFile(filename, /*throw_on_not_found=*/true);
+            for (int j = 0; j < times; j++)
+                ASSERT_TRUE(checkString(String(contents), *in));
+        }
+    }
+}
+
+TEST_P(ArchiveReaderAndWriterTest, LargeFile)
+{
+    /// Make an archive.
+    std::string_view contents = "The contents of a.txt\n";
+    int times = 10000000;
+    {
+        auto writer = createArchiveWriter(getPathToArchive());
+        {
+            auto out = writer->writeFile("a.txt", times * contents.size());
+            for (int i = 0; i < times; i++)
+                writeString(contents, *out);
             out->finalize();
         }
         writer->finalize();
@@ -352,35 +511,31 @@ TEST_P(ArchiveReaderAndWriterTest, Password)
     /// Read the archive.
     auto reader = createArchiveReader(getPathToArchive());
 
-    /// Try to read without a password.
-    expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Password is required",
-                    [&]{ reader->readFile("a.txt", /*throw_on_not_found=*/true); });
+    ASSERT_TRUE(reader->fileExists("a.txt"));
+
+    auto file_info = reader->getFileInfo("a.txt");
+    EXPECT_EQ(file_info.uncompressed_size, contents.size() * times);
+    EXPECT_GT(file_info.compressed_size, 0);
 
     {
-        /// Try to read with a wrong password.
-        reader->setPassword("123Qwe");
-        expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Wrong password",
-                        [&]{ reader->readFile("a.txt", /*throw_on_not_found=*/true); });
-    }
-
-    {
-        /// Reading with the right password is successful.
-        reader->setPassword("Qwe123");
         auto in = reader->readFile("a.txt", /*throw_on_not_found=*/true);
-        String str;
-        readStringUntilEOF(str, *in);
-        EXPECT_EQ(str, contents);
+        for (int i = 0; i < times; i++)
+            ASSERT_TRUE(checkString(String(contents), *in));
+    }
+
+    {
+        /// Use an enumerator.
+        auto enumerator = reader->firstFile();
+        ASSERT_NE(enumerator, nullptr);
+        EXPECT_EQ(enumerator->getFileName(), "a.txt");
+        EXPECT_EQ(enumerator->getFileInfo().uncompressed_size, contents.size() * times);
+        EXPECT_GT(enumerator->getFileInfo().compressed_size, 0);
+        EXPECT_FALSE(enumerator->nextFile());
     }
 }
 
-
-TEST_P(ArchiveReaderAndWriterTest, ArchiveNotExist)
+TEST(TarArchiveReaderTest, FileExists)
 {
-    expectException(ErrorCodes::CANNOT_UNPACK_ARCHIVE, "Couldn't open",
-                    [&]{ createArchiveReader(getPathToArchive()); });
-}
-
-TEST(TarArchiveReaderTest, FileExists) {
     String archive_path = "archive.tar";
     String filename = "file.txt";
     String contents = "test";
@@ -391,7 +546,8 @@ TEST(TarArchiveReaderTest, FileExists) {
     fs::remove(archive_path);
 }
 
-TEST(TarArchiveReaderTest, ReadFile) {
+TEST(TarArchiveReaderTest, ReadFile)
+{
     String archive_path = "archive.tar";
     String filename = "file.txt";
     String contents = "test";
@@ -405,7 +561,8 @@ TEST(TarArchiveReaderTest, ReadFile) {
     fs::remove(archive_path);
 }
 
-TEST(TarArchiveReaderTest, ReadTwoFiles) {
+TEST(TarArchiveReaderTest, ReadTwoFiles)
+{
     String archive_path = "archive.tar";
     String file1 = "file1.txt";
     String contents1 = "test1";
@@ -421,14 +578,15 @@ TEST(TarArchiveReaderTest, ReadTwoFiles) {
     readStringUntilEOF(str, *in);
     EXPECT_EQ(str, contents1);
     in = reader->readFile(file2, /*throw_on_not_found=*/true);
-    
+
     readStringUntilEOF(str, *in);
     EXPECT_EQ(str, contents2);
     fs::remove(archive_path);
 }
 
 
-TEST(TarArchiveReaderTest, CheckFileInfo) {
+TEST(TarArchiveReaderTest, CheckFileInfo)
+{
     String archive_path = "archive.tar";
     String filename = "file.txt";
     String contents = "test";
@@ -441,7 +599,8 @@ TEST(TarArchiveReaderTest, CheckFileInfo) {
     fs::remove(archive_path);
 }
 
-TEST(SevenZipArchiveReaderTest, FileExists) {
+TEST(SevenZipArchiveReaderTest, FileExists)
+{
     String archive_path = "archive.7z";
     String filename = "file.txt";
     String contents = "test";
@@ -452,7 +611,8 @@ TEST(SevenZipArchiveReaderTest, FileExists) {
     fs::remove(archive_path);
 }
 
-TEST(SevenZipArchiveReaderTest, ReadFile) {
+TEST(SevenZipArchiveReaderTest, ReadFile)
+{
     String archive_path = "archive.7z";
     String filename = "file.txt";
     String contents = "test";
@@ -466,7 +626,8 @@ TEST(SevenZipArchiveReaderTest, ReadFile) {
     fs::remove(archive_path);
 }
 
-TEST(SevenZipArchiveReaderTest, CheckFileInfo) {
+TEST(SevenZipArchiveReaderTest, CheckFileInfo)
+{
     String archive_path = "archive.7z";
     String filename = "file.txt";
     String contents = "test";
@@ -479,7 +640,8 @@ TEST(SevenZipArchiveReaderTest, CheckFileInfo) {
     fs::remove(archive_path);
 }
 
-TEST(SevenZipArchiveReaderTest, ReadTwoFiles) {
+TEST(SevenZipArchiveReaderTest, ReadTwoFiles)
+{
     String archive_path = "archive.7z";
     String file1 = "file1.txt";
     String contents1 = "test1";
@@ -495,23 +657,28 @@ TEST(SevenZipArchiveReaderTest, ReadTwoFiles) {
     readStringUntilEOF(str, *in);
     EXPECT_EQ(str, contents1);
     in = reader->readFile(file2, /*throw_on_not_found=*/true);
-    
+
     readStringUntilEOF(str, *in);
     EXPECT_EQ(str, contents2);
     fs::remove(archive_path);
 }
 
 
-#if USE_MINIZIP
-
 namespace
 {
-    const char * supported_archive_file_exts[] =
-    {
-        ".zip"
-    };
+const char * supported_archive_file_exts[] = {
+#if USE_MINIZIP
+    ".zip",
+#endif
+#if USE_LIBARCHIVE
+    ".tar",
+    ".tar.gz",
+    ".tar.bz2",
+    ".tar.lzma",
+    ".tar.zst",
+    ".tar.xz",
+#endif
+};
 }
 
 INSTANTIATE_TEST_SUITE_P(All, ArchiveReaderAndWriterTest, ::testing::ValuesIn(supported_archive_file_exts));
-
-#endif
diff --git a/src/IO/tests/gtest_s3_uri.cpp b/src/IO/tests/gtest_s3_uri.cpp
index c088e41f1e8..0ec28f80072 100644
--- a/src/IO/tests/gtest_s3_uri.cpp
+++ b/src/IO/tests/gtest_s3_uri.cpp
@@ -74,6 +74,40 @@ const TestCase TestCases[] = {
      "data",
      "",
      true},
+    {S3::URI("https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w.s3.us-east-1.vpce.amazonaws.com/root/nested/file.txt"),
+     "https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w.s3.us-east-1.vpce.amazonaws.com",
+     "root",
+     "nested/file.txt",
+     "",
+     false},
+    // Test with a file with no extension
+    {S3::URI("https://bucket.vpce-03b2c987f1bd55c5f-j3b4vg7w.s3.ap-southeast-2.vpce.amazonaws.com/some_bucket/document"),
+     "https://bucket.vpce-03b2c987f1bd55c5f-j3b4vg7w.s3.ap-southeast-2.vpce.amazonaws.com",
+     "some_bucket",
+     "document",
+     "",
+     false},
+    // Test with a deeply nested file path
+    {S3::URI("https://bucket.vpce-0242cd56f1bd55c5f-l5b7vg8x.s3.sa-east-1.vpce.amazonaws.com/some_bucket/b/c/d/e/f/g/h/i/j/data.json"),
+     "https://bucket.vpce-0242cd56f1bd55c5f-l5b7vg8x.s3.sa-east-1.vpce.amazonaws.com",
+     "some_bucket",
+     "b/c/d/e/f/g/h/i/j/data.json",
+     "",
+     false},
+    // Zonal
+    {S3::URI("https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w-us-east-1a.s3.us-east-1.vpce.amazonaws.com/root/nested/file.txt"),
+     "https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w-us-east-1a.s3.us-east-1.vpce.amazonaws.com",
+     "root",
+     "nested/file.txt",
+     "",
+     false},
+    // Non standard port
+    {S3::URI("https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w-us-east-1a.s3.us-east-1.vpce.amazonaws.com:65535/root/nested/file.txt"),
+     "https://bucket.vpce-07a1cd78f1bd55c5f-j3a3vg6w-us-east-1a.s3.us-east-1.vpce.amazonaws.com:65535",
+     "root",
+     "nested/file.txt",
+     "",
+     false},
 };
 
 class S3UriTest : public testing::TestWithParam<std::string>
@@ -162,6 +196,14 @@ TEST(S3UriTest, validPatterns)
         ASSERT_EQ("", uri.version_id);
         ASSERT_EQ(false, uri.is_virtual_hosted_style);
     }
+    {
+        S3::URI uri("https://test-perf-bucket--eun1-az1--x-s3.s3express-eun1-az1.eu-north-1.amazonaws.com/test.csv");
+        ASSERT_EQ("https://s3express-eun1-az1.eu-north-1.amazonaws.com", uri.endpoint);
+        ASSERT_EQ("test-perf-bucket--eun1-az1--x-s3", uri.bucket);
+        ASSERT_EQ("test.csv", uri.key);
+        ASSERT_EQ("", uri.version_id);
+        ASSERT_EQ(true, uri.is_virtual_hosted_style);
+    }
 }
 
 TEST_P(S3UriTest, invalidPatterns)
diff --git a/src/IO/tests/gtest_writebuffer_s3.cpp b/src/IO/tests/gtest_writebuffer_s3.cpp
index 7210dc6fbbf..d9cb486c09e 100644
--- a/src/IO/tests/gtest_writebuffer_s3.cpp
+++ b/src/IO/tests/gtest_writebuffer_s3.cpp
@@ -205,16 +205,17 @@ 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,
-               DB::S3::ClientSettings{
-                   .use_virtual_addressing = true,
-                   .disable_checksum= false,
-                   .gcs_issue_compose_request = false,
-               })
+            100,
+            DB::S3::ServerSideEncryptionKMSConfig(),
+            std::make_shared<Aws::Auth::SimpleAWSCredentialsProvider>("", ""),
+            GetClientConfiguration(),
+            Aws::Client::AWSAuthV4Signer::PayloadSigningPolicy::Never,
+            DB::S3::ClientSettings{
+                .use_virtual_addressing = true,
+                .disable_checksum = false,
+                .gcs_issue_compose_request = false,
+                .is_s3express_bucket = false,
+            })
         , store(mock_s3_store)
     {}
 
@@ -1185,98 +1186,4 @@ String fillStringWithPattern(String pattern, int n)
     return data;
 }
 
-TEST_F(WBS3Test, ReadBeyondLastOffset) {
-    const String remote_file = "ReadBeyondLastOffset";
-
-    const String key = "1234567812345678";
-    const String data = fillStringWithPattern("0123456789", 10);
-
-    ReadSettings disk_read_settings;
-    disk_read_settings.enable_filesystem_cache = false;
-    disk_read_settings.local_fs_buffer_size = 70;
-    disk_read_settings.remote_fs_buffer_size = FileEncryption::Header::kSize + 60;
-
-    {
-        /// write encrypted file
-
-        FileEncryption::Header header;
-        header.algorithm = FileEncryption::Algorithm::AES_128_CTR;
-        header.key_fingerprint = FileEncryption::calculateKeyFingerprint(key);
-        header.init_vector = FileEncryption::InitVector::random();
-
-        auto wbs3 = getWriteBuffer(remote_file);
-        getAsyncPolicy().setAutoExecute(true);
-
-        WriteBufferFromEncryptedFile wb(10, std::move(wbs3), key, header);
-        wb.write(data.data(), data.size());
-        wb.finalize();
-    }
-
-    auto reader = std::make_unique<ThreadPoolRemoteFSReader>(1, 1);
-    std::unique_ptr<ReadBufferFromEncryptedFile> encrypted_read_buffer;
-
-    {
-        /// create encrypted file reader
-
-        auto cache_log = std::shared_ptr<FilesystemCacheLog>();
-        const StoredObjects objects = { StoredObject(remote_file, /* local_path */ "", data.size() + FileEncryption::Header::kSize) };
-        auto async_read_counters = std::make_shared<AsyncReadCounters>();
-        auto prefetch_log = std::shared_ptr<FilesystemReadPrefetchesLog>();
-
-        auto rb_creator = [this, disk_read_settings] (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
-        {
-            S3Settings::RequestSettings request_settings;
-            return std::make_unique<ReadBufferFromS3>(
-                client,
-                bucket,
-                path,
-                "Latest",
-                request_settings,
-                disk_read_settings,
-                /* use_external_buffer */true,
-                /* offset */0,
-                read_until_position,
-                /* restricted_seek */true);
-        };
-
-        auto rb_remote_fs = std::make_unique<ReadBufferFromRemoteFSGather>(
-            std::move(rb_creator),
-            objects,
-            disk_read_settings,
-            cache_log,
-            true);
-
-        auto rb_async = std::make_unique<AsynchronousBoundedReadBuffer>(
-            std::move(rb_remote_fs), *reader, disk_read_settings, async_read_counters, prefetch_log);
-
-        /// read the header from the buffer
-        /// as a result AsynchronousBoundedReadBuffer consists some data from the file inside working buffer
-        FileEncryption::Header header;
-        header.read(*rb_async);
-
-        ASSERT_EQ(rb_async->available(), disk_read_settings.remote_fs_buffer_size - FileEncryption::Header::kSize);
-        ASSERT_EQ(rb_async->getPosition(), FileEncryption::Header::kSize);
-        ASSERT_EQ(rb_async->getFileOffsetOfBufferEnd(), disk_read_settings.remote_fs_buffer_size);
-
-        /// ReadBufferFromEncryptedFile is constructed over a ReadBuffer which was already in use.
-        /// The 'FileEncryption::Header' has been read from `rb_async`.
-        /// 'rb_async' will read the data from `rb_async` working buffer
-        encrypted_read_buffer = std::make_unique<ReadBufferFromEncryptedFile>(
-            disk_read_settings.local_fs_buffer_size, std::move(rb_async), key, header);
-    }
-
-    /// When header is read, file is read into working buffer till some position. Tn the test the file is read until remote_fs_buffer_size (124) position.
-    /// Set the right border before that position and make sure that encrypted_read_buffer does not have access to it
-    ASSERT_GT(disk_read_settings.remote_fs_buffer_size, 50);
-    encrypted_read_buffer->setReadUntilPosition(50);
-
-    /// encrypted_read_buffer reads the data with buffer size `local_fs_buffer_size`
-    /// If the impl file has read the data beyond the ReadUntilPosition, encrypted_read_buffer does not read it
-    /// getFileOffsetOfBufferEnd should read data till `ReadUntilPosition`
-    String res;
-    readStringUntilEOF(res, *encrypted_read_buffer);
-    ASSERT_EQ(res, data.substr(0, 50));
-    ASSERT_TRUE(encrypted_read_buffer->eof());
-}
-
 #endif
diff --git a/src/Interpreters/Access/InterpreterGrantQuery.cpp b/src/Interpreters/Access/InterpreterGrantQuery.cpp
index 0f2d65abb5e..ed06b1d0fc6 100644
--- a/src/Interpreters/Access/InterpreterGrantQuery.cpp
+++ b/src/Interpreters/Access/InterpreterGrantQuery.cpp
@@ -178,6 +178,22 @@ namespace
                 elements_to_revoke.emplace_back(std::move(element_to_revoke));
         }
 
+        /// Additional check for REVOKE
+        ///
+        /// If user1 has the rights
+        /// GRANT SELECT ON *.* TO user1;
+        /// REVOKE SELECT ON system.* FROM user1;
+        /// REVOKE SELECT ON mydb.* FROM user1;
+        ///
+        /// And user2 has the rights
+        /// GRANT SELECT ON *.* TO user2;
+        /// REVOKE SELECT ON system.* FROM user2;
+        ///
+        /// the query `REVOKE SELECT ON *.* FROM user1` executed by user2 should succeed.
+        if (current_user_access.getAccessRights()->containsWithGrantOption(access_to_revoke))
+            return;
+
+        /// Technically, this check always fails if `containsWithGrantOption` returns `false`. But we still call it to get a nice exception message.
         current_user_access.checkGrantOption(elements_to_revoke);
     }
 
diff --git a/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp b/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
index a55588baeaa..1147d74c146 100644
--- a/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
+++ b/src/Interpreters/Access/InterpreterShowCreateAccessEntityQuery.cpp
@@ -206,7 +206,7 @@ namespace
             if (!filter.empty())
             {
                 ParserExpression parser;
-                ASTPtr expr = parseQuery(parser, filter, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+                ASTPtr expr = parseQuery(parser, filter, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
                 query->filters.emplace_back(type, std::move(expr));
             }
         }
diff --git a/src/Interpreters/ActionLocksManager.cpp b/src/Interpreters/ActionLocksManager.cpp
index 65f13ebd66c..28803a94c80 100644
--- a/src/Interpreters/ActionLocksManager.cpp
+++ b/src/Interpreters/ActionLocksManager.cpp
@@ -1,5 +1,6 @@
 #include "ActionLocksManager.h"
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage.h>
 
diff --git a/src/Interpreters/ActionsDAG.cpp b/src/Interpreters/ActionsDAG.cpp
index 31b7bdffb1f..09e9364a3f1 100644
--- a/src/Interpreters/ActionsDAG.cpp
+++ b/src/Interpreters/ActionsDAG.cpp
@@ -64,6 +64,37 @@ std::pair<ColumnsWithTypeAndName, bool> getFunctionArguments(const ActionsDAG::N
     return { std::move(arguments), all_const };
 }
 
+bool isConstantFromScalarSubquery(const ActionsDAG::Node * node)
+{
+    std::stack<const ActionsDAG::Node *> stack;
+    stack.push(node);
+    while (!stack.empty())
+    {
+        const auto * arg = stack.top();
+        stack.pop();
+
+        if (arg->column && isColumnConst(*arg->column))
+            continue;
+
+        while (arg->type == ActionsDAG::ActionType::ALIAS)
+            arg = arg->children.at(0);
+
+        if (arg->type != ActionsDAG::ActionType::FUNCTION)
+            return false;
+
+        if (arg->function_base->getName() == "__scalarSubqueryResult")
+            continue;
+
+        if (arg->children.empty() || !arg->function_base->isSuitableForConstantFolding())
+            return false;
+
+        for (const auto * child : arg->children)
+            stack.push(child);
+    }
+
+    return true;
+}
+
 }
 
 void ActionsDAG::Node::toTree(JSONBuilder::JSONMap & map) const
@@ -196,6 +227,19 @@ const ActionsDAG::Node & ActionsDAG::addFunction(
 {
     auto [arguments, all_const] = getFunctionArguments(children);
 
+    auto constant_args = function->getArgumentsThatAreAlwaysConstant();
+    for (size_t pos : constant_args)
+    {
+        if (pos >= children.size())
+            continue;
+
+        if (arguments[pos].column && isColumnConst(*arguments[pos].column))
+            continue;
+
+        if (isConstantFromScalarSubquery(children[pos]))
+            arguments[pos].column = arguments[pos].type->createColumnConstWithDefaultValue(0);
+    }
+
     auto function_base = function->build(arguments);
     return addFunctionImpl(
         function_base,
@@ -282,6 +326,13 @@ const ActionsDAG::Node & ActionsDAG::addFunctionImpl(
         {
             size_t num_rows = arguments.empty() ? 0 : arguments.front().column->size();
             column = node.function->execute(arguments, node.result_type, num_rows, true);
+            if (column->getDataType() != node.result_type->getColumnType())
+                throw Exception(
+                    ErrorCodes::LOGICAL_ERROR,
+                    "Unexpected return type from {}. Expected {}. Got {}",
+                    node.function->getName(),
+                    node.result_type->getColumnType(),
+                    column->getDataType());
         }
         else
         {
@@ -598,7 +649,7 @@ ActionsDAGPtr ActionsDAG::cloneSubDAG(const NodeRawConstPtrs & outputs, bool rem
     return actions;
 }
 
-static ColumnWithTypeAndName executeActionForHeader(const ActionsDAG::Node * node, ColumnsWithTypeAndName arguments)
+static ColumnWithTypeAndName executeActionForPartialResult(const ActionsDAG::Node * node, ColumnsWithTypeAndName arguments, size_t input_rows_count)
 {
     ColumnWithTypeAndName res_column;
     res_column.type = node->result_type;
@@ -608,7 +659,7 @@ static ColumnWithTypeAndName executeActionForHeader(const ActionsDAG::Node * nod
     {
         case ActionsDAG::ActionType::FUNCTION:
         {
-            res_column.column = node->function->execute(arguments, res_column.type, 0, true);
+            res_column.column = node->function->execute(arguments, res_column.type, input_rows_count, true);
             break;
         }
 
@@ -621,13 +672,24 @@ static ColumnWithTypeAndName executeActionForHeader(const ActionsDAG::Node * nod
             if (!array)
                 throw Exception(ErrorCodes::TYPE_MISMATCH,
                                 "ARRAY JOIN of not array nor map: {}", node->result_name);
-            res_column.column = array->getDataPtr()->cloneEmpty();
+
+            ColumnPtr data;
+            if (input_rows_count < array->size())
+                data = array->getDataInRange(0, input_rows_count);
+            else
+                data = array->getDataPtr();
+
+            res_column.column = data;
             break;
         }
 
         case ActionsDAG::ActionType::COLUMN:
         {
-            res_column.column = node->column->cloneResized(0);
+            auto column = node->column;
+            if (input_rows_count < column->size())
+                column = column->cloneResized(input_rows_count);
+
+            res_column.column = column;
             break;
         }
 
@@ -674,12 +736,12 @@ Block ActionsDAG::updateHeader(Block header) const
     ColumnsWithTypeAndName result_columns;
     try
     {
-        result_columns = evaluatePartialResult(node_to_column, outputs, true);
+        result_columns = evaluatePartialResult(node_to_column, outputs, /* input_rows_count= */ 0, /* throw_on_error= */ true);
     }
     catch (Exception & e)
     {
         if (e.code() == ErrorCodes::NOT_FOUND_COLUMN_IN_BLOCK)
-            e.addMessage(" in block {}", header.dumpStructure());
+            e.addMessage("in block {}", header.dumpStructure());
 
         throw;
     }
@@ -703,8 +765,11 @@ Block ActionsDAG::updateHeader(Block header) const
 ColumnsWithTypeAndName ActionsDAG::evaluatePartialResult(
     IntermediateExecutionResult & node_to_column,
     const NodeRawConstPtrs & outputs,
+    size_t input_rows_count,
     bool throw_on_error)
 {
+    chassert(input_rows_count <= 1); /// evaluatePartialResult() should be used only to evaluate headers or constants
+
     ColumnsWithTypeAndName result_columns;
     result_columns.reserve(outputs.size());
 
@@ -761,7 +826,7 @@ ColumnsWithTypeAndName ActionsDAG::evaluatePartialResult(
                                         node->result_name);
 
                     if (node->type != ActionsDAG::ActionType::INPUT && has_all_arguments)
-                        node_to_column[node] = executeActionForHeader(node, std::move(arguments));
+                        node_to_column[node] = executeActionForPartialResult(node, std::move(arguments), input_rows_count);
                 }
             }
 
@@ -1297,7 +1362,7 @@ ActionsDAGPtr ActionsDAG::makeConvertingActions(
     size_t num_result_columns = result.size();
 
     if (mode == MatchColumnsMode::Position && num_input_columns != num_result_columns)
-        throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH, "Number of columns doesn't match");
+        throw Exception(ErrorCodes::NUMBER_OF_COLUMNS_DOESNT_MATCH, "Number of columns doesn't match (source: {} and result: {})", num_input_columns, num_result_columns);
 
     if (add_casted_columns && mode != MatchColumnsMode::Name)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Converting with add_casted_columns supported only for MatchColumnsMode::Name");
@@ -1624,7 +1689,7 @@ void ActionsDAG::mergeNodes(ActionsDAG && second)
     }
 }
 
-ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split_nodes) const
+ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split_nodes, bool create_split_nodes_mapping) const
 {
     /// Split DAG into two parts.
     /// (first_nodes, first_outputs) is a part which will have split_list in result.
@@ -1756,15 +1821,6 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
 
                         child = child_data.to_second;
                     }
-
-                    /// Input from second DAG should also be in the first.
-                    if (copy.type == ActionType::INPUT)
-                    {
-                        auto & input_copy = first_nodes.emplace_back(*cur.node);
-                        assert(cur_data.to_first == nullptr);
-                        cur_data.to_first = &input_copy;
-                        new_inputs.push_back(cur.node);
-                    }
                 }
                 else
                 {
@@ -1783,11 +1839,12 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
                         /// If this node is needed in result, add it as input.
                         Node input_node;
                         input_node.type = ActionType::INPUT;
-                        input_node.result_type = node.result_type;
-                        input_node.result_name = node.result_name;
+                        input_node.result_type = cur.node->result_type;
+                        input_node.result_name = cur.node->result_name;
                         cur_data.to_second = &second_nodes.emplace_back(std::move(input_node));
 
-                        new_inputs.push_back(cur.node);
+                        if (cur.node->type != ActionType::INPUT)
+                            new_inputs.push_back(cur.node);
                     }
                 }
             }
@@ -1803,7 +1860,13 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     for (const auto * input_node : inputs)
     {
         const auto & cur = data[input_node];
-        first_inputs.push_back(cur.to_first);
+        if (cur.to_first)
+        {
+            first_inputs.push_back(cur.to_first);
+
+            if (cur.to_second)
+                first_outputs.push_back(cur.to_first);
+        }
     }
 
     for (const auto * input : new_inputs)
@@ -1813,6 +1876,13 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
         first_outputs.push_back(cur.to_first);
     }
 
+    for (const auto * input_node : inputs)
+    {
+        const auto & cur = data[input_node];
+        if (cur.to_second)
+            second_inputs.push_back(cur.to_second);
+    }
+
     auto first_actions = std::make_shared<ActionsDAG>();
     first_actions->nodes.swap(first_nodes);
     first_actions->outputs.swap(first_outputs);
@@ -1823,7 +1893,14 @@ ActionsDAG::SplitResult ActionsDAG::split(std::unordered_set<const Node *> split
     second_actions->outputs.swap(second_outputs);
     second_actions->inputs.swap(second_inputs);
 
-    return {std::move(first_actions), std::move(second_actions)};
+    std::unordered_map<const Node *, const Node *> split_nodes_mapping;
+    if (create_split_nodes_mapping)
+    {
+        for (const auto * node : split_nodes)
+            split_nodes_mapping[node] = data[node].to_first;
+    }
+
+    return {std::move(first_actions), std::move(second_actions), std::move(split_nodes_mapping)};
 }
 
 ActionsDAG::SplitResult ActionsDAG::splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const
@@ -2440,7 +2517,6 @@ 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,
     bool single_output_condition_node)
 {
     if (filter_nodes.empty())
@@ -2542,10 +2618,15 @@ ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
                     {
                         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*/);
+                            ActionsDAGPtr index_hint_filter_dag;
+                            const auto & index_hint_args = index_hint->getActions()->getOutputs();
+
+                            if (index_hint_args.empty())
+                                index_hint_filter_dag = std::make_shared<ActionsDAG>();
+                            else
+                                index_hint_filter_dag = buildFilterActionsDAG(index_hint_args,
+                                    node_name_to_input_node_column,
+                                    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));
@@ -2583,8 +2664,8 @@ ActionsDAGPtr ActionsDAG::buildFilterActionsDAG(
 
     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, {}) };
+        FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+        result_dag_outputs = { &result_dag->addFunction(func_builder_and, result_dag_outputs, {}) };
     }
 
     return result_dag;
diff --git a/src/Interpreters/ActionsDAG.h b/src/Interpreters/ActionsDAG.h
index f18ae5d5c75..469fe9ea7f1 100644
--- a/src/Interpreters/ActionsDAG.h
+++ b/src/Interpreters/ActionsDAG.h
@@ -278,6 +278,7 @@ public:
     static ColumnsWithTypeAndName evaluatePartialResult(
         IntermediateExecutionResult & node_to_column,
         const NodeRawConstPtrs & outputs,
+        size_t input_rows_count,
         bool throw_on_error);
 
     /// For apply materialize() function for every output.
@@ -326,13 +327,22 @@ public:
     /// Merge current nodes with specified dag nodes
     void mergeNodes(ActionsDAG && second);
 
-    using SplitResult = std::pair<ActionsDAGPtr, ActionsDAGPtr>;
+    struct SplitResult
+    {
+        ActionsDAGPtr first;
+        ActionsDAGPtr second;
+        std::unordered_map<const Node *, const Node *> split_nodes_mapping;
+    };
 
     /// Split ActionsDAG into two DAGs, where first part contains all nodes from split_nodes and their children.
     /// Execution of first then second parts on block is equivalent to execution of initial DAG.
-    /// First DAG and initial DAG have equal inputs, second DAG and initial DAG has equal outputs.
-    /// Second DAG inputs may contain less inputs then first DAG (but also include other columns).
-    SplitResult split(std::unordered_set<const Node *> split_nodes) const;
+    /// Inputs and outputs of original DAG are split between the first and the second DAGs.
+    /// Intermediate result can apper in first outputs and second inputs.
+    /// Example:
+    ///   initial DAG    : (a, b, c, d, e) -> (w, x, y, z)  | 1 a 2 b 3 c 4 d 5 e 6      ->  1 2 3 4 5 6 w x y z
+    ///   split (first)  : (a, c, d) -> (i, j, k, w, y)     | 1 a 2 b 3 c 4 d 5 e 6      ->  1 2 b 3 4 5 e 6 i j k w y
+    ///   split (second) : (i, j, k, y, b, e) -> (x, y, z)  | 1 2 b 3 4 5 e 6 i j k w y  ->  1 2 3 4 5 6 w x y z
+    SplitResult split(std::unordered_set<const Node *> split_nodes, bool create_split_nodes_mapping = false) const;
 
     /// Splits actions into two parts. Returned first half may be swapped with ARRAY JOIN.
     SplitResult splitActionsBeforeArrayJoin(const NameSet & array_joined_columns) const;
@@ -389,8 +399,7 @@ public:
       */
     static ActionsDAGPtr buildFilterActionsDAG(
         const NodeRawConstPtrs & filter_nodes,
-        const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column,
-        const ContextPtr & context,
+        const std::unordered_map<std::string, ColumnWithTypeAndName> & node_name_to_input_node_column = {},
         bool single_output_condition_node = true);
 
     /// Check if `predicate` is a combination of AND functions.
diff --git a/src/Interpreters/ActionsVisitor.cpp b/src/Interpreters/ActionsVisitor.cpp
index 1789cc6c4b1..504b7257563 100644
--- a/src/Interpreters/ActionsVisitor.cpp
+++ b/src/Interpreters/ActionsVisitor.cpp
@@ -44,6 +44,7 @@
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/misc.h>
 #include <Interpreters/ActionsVisitor.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/Set.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/convertFieldToType.h>
@@ -1070,7 +1071,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
 
     auto current_context = data.getContext();
 
-    if (UserDefinedExecutableFunctionFactory::instance().has(node.name, current_context))
+    if (UserDefinedExecutableFunctionFactory::instance().has(node.name, current_context)) /// NOLINT(readability-static-accessed-through-instance)
     {
         Array parameters;
         if (node.parameters)
@@ -1086,7 +1087,7 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             }
         }
 
-        function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(node.name, current_context, parameters);
+        function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(node.name, current_context, parameters); /// NOLINT(readability-static-accessed-through-instance)
     }
 
     if (!function_builder)
@@ -1129,12 +1130,11 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
             const auto * query_parameter = child->as<ASTQueryParameter>();
             if (function && function->name == "lambda")
             {
+                if (!isASTLambdaFunction(*function))
+                    throw Exception(ErrorCodes::SYNTAX_ERROR, "Lambda function definition expects two arguments, first argument must be a tuple of arguments");
+
                 /// If the argument is a lambda expression, just remember its approximate type.
-                if (function->arguments->children.size() != 2)
-                    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "lambda requires two arguments");
-
                 const auto * lambda_args_tuple = function->arguments->children.at(0)->as<ASTFunction>();
-
                 if (!lambda_args_tuple || lambda_args_tuple->name != "tuple")
                     throw Exception(ErrorCodes::TYPE_MISMATCH, "First argument of lambda must be a tuple");
 
@@ -1322,7 +1322,12 @@ void ActionsMatcher::visit(const ASTFunction & node, const ASTPtr & ast, Data &
 void ActionsMatcher::visit(const ASTLiteral & literal, const ASTPtr & /* ast */,
     Data & data)
 {
-    DataTypePtr type = applyVisitor(FieldToDataType(), literal.value);
+    DataTypePtr type;
+    if (data.getContext()->getSettingsRef().allow_experimental_variant_type && data.getContext()->getSettingsRef().use_variant_as_common_type)
+        type = applyVisitor(FieldToDataType<LeastSupertypeOnError::Variant>(), literal.value);
+    else
+        type = applyVisitor(FieldToDataType(), literal.value);
+
     const auto value = convertFieldToType(literal.value, *type);
 
     // FIXME why do we have a second pass with a clean sample block over the same
@@ -1414,10 +1419,7 @@ FutureSetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool
             set_key = right_in_operand->getTreeHash(/*ignore_aliases=*/ true);
 
         if (auto set = data.prepared_sets->findSubquery(set_key))
-        {
-            set->markAsINSubquery();
             return set;
-        }
 
         FutureSetFromSubqueryPtr external_table_set;
 
@@ -1464,7 +1466,7 @@ FutureSetPtr ActionsMatcher::makeSet(const ASTFunction & node, Data & data, bool
         }
 
         return data.prepared_sets->addFromSubquery(
-            set_key, std::move(source), nullptr, std::move(external_table_set), data.getContext()->getSettingsRef(), /*in_subquery=*/true);
+            set_key, std::move(source), nullptr, std::move(external_table_set), data.getContext()->getSettingsRef());
     }
     else
     {
diff --git a/src/Interpreters/ActionsVisitor.h b/src/Interpreters/ActionsVisitor.h
index 1e2ebaf6d87..643bf50ecd4 100644
--- a/src/Interpreters/ActionsVisitor.h
+++ b/src/Interpreters/ActionsVisitor.h
@@ -1,13 +1,14 @@
 #pragma once
 
 #include <string_view>
+#include <Core/ColumnNumbers.h>
+#include <Core/ColumnWithTypeAndName.h>
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/PreparedSets.h>
 #include <Parsers/IAST.h>
-#include <Core/ColumnNumbers.h>
-#include <Core/ColumnWithTypeAndName.h>
+#include <QueryPipeline/SizeLimits.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/AddDefaultDatabaseVisitor.h b/src/Interpreters/AddDefaultDatabaseVisitor.h
index b977a73d461..356bffa75e9 100644
--- a/src/Interpreters/AddDefaultDatabaseVisitor.h
+++ b/src/Interpreters/AddDefaultDatabaseVisitor.h
@@ -163,7 +163,7 @@ private:
         if (identifier.compound())
             return;
         /// There is temporary table with such name, should not be rewritten.
-        if (external_tables.count(identifier.shortName()))
+        if (external_tables.contains(identifier.shortName()))
             return;
 
         auto qualified_identifier = std::make_shared<ASTTableIdentifier>(database_name, identifier.name());
@@ -275,13 +275,7 @@ private:
         if (only_replace_current_database_function)
             return;
 
-        for (ASTRenameQuery::Element & elem : node.elements)
-        {
-            if (!elem.from.database)
-                elem.from.database = std::make_shared<ASTIdentifier>(database_name);
-            if (!elem.to.database)
-                elem.to.database = std::make_shared<ASTIdentifier>(database_name);
-        }
+        node.setDatabaseIfNotExists(database_name);
     }
 
     void visitDDL(ASTAlterQuery & node, ASTPtr &) const
diff --git a/src/Interpreters/AggregateDescription.cpp b/src/Interpreters/AggregateDescription.cpp
index 787e0a503f8..d4c09995b56 100644
--- a/src/Interpreters/AggregateDescription.cpp
+++ b/src/Interpreters/AggregateDescription.cpp
@@ -1,7 +1,7 @@
+#include <AggregateFunctions/IAggregateFunction.h>
+#include <IO/Operators.h>
 #include <Interpreters/AggregateDescription.h>
 #include <Common/FieldVisitorToString.h>
-#include <IO/Operators.h>
-
 #include <Common/JSONBuilder.h>
 
 
diff --git a/src/Interpreters/AggregateDescription.h b/src/Interpreters/AggregateDescription.h
index 8c3302a8b0b..0f1c0ce67ae 100644
--- a/src/Interpreters/AggregateDescription.h
+++ b/src/Interpreters/AggregateDescription.h
@@ -1,13 +1,16 @@
 #pragma once
 
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
 #include <Core/ColumnNumbers.h>
+#include <Core/Field.h>
 #include <Core/Names.h>
 #include <Core/Types.h>
 
 namespace DB
 {
 
+class WriteBuffer;
+
 namespace JSONBuilder { class JSONMap; }
 
 struct AggregateDescription
diff --git a/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h b/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
index ab01cc6a0b6..d8fae7e80ad 100644
--- a/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
+++ b/src/Interpreters/AggregateFunctionOfGroupByKeysVisitor.h
@@ -37,7 +37,7 @@ struct KeepAggregateFunctionMatcher
             return;
         }
 
-        if (!data.group_by_keys.count(function_node.getColumnName()))
+        if (!data.group_by_keys.contains(function_node.getColumnName()))
         {
             Visitor(data).visit(function_node.arguments);
         }
@@ -46,7 +46,7 @@ struct KeepAggregateFunctionMatcher
     static void visit(ASTIdentifier & ident, Data & data)
     {
         /// if variable of a function is not in GROUP BY keys, this function should not be deleted
-        if (!data.group_by_keys.count(ident.getColumnName()))
+        if (!data.group_by_keys.contains(ident.getColumnName()))
             data.keep_aggregator = true;
     }
 
diff --git a/src/Interpreters/AggregatedData.h b/src/Interpreters/AggregatedData.h
new file mode 100644
index 00000000000..4b581c682ca
--- /dev/null
+++ b/src/Interpreters/AggregatedData.h
@@ -0,0 +1,142 @@
+#pragma once
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
+
+#include <Common/HashTable/FixedHashMap.h>
+#include <Common/HashTable/StringHashMap.h>
+#include <Common/HashTable/TwoLevelHashMap.h>
+#include <Common/HashTable/TwoLevelStringHashMap.h>
+namespace DB
+{
+/** 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)
+  *  is acquired later - in `convertToBlocks` function, by the ColumnAggregateFunction object.
+  *
+  * Most data structures exist in two versions: normal and two-level (TwoLevel).
+  * A two-level hash table works a little slower with a small number of different keys,
+  *  but with a large number of different keys scales better, because it allows
+  *  parallelize some operations (merging, post-processing) in a natural way.
+  *
+  * To ensure efficient work over a wide range of conditions,
+  *  first single-level hash tables are used,
+  *  and when the number of different keys is large enough,
+  *  they are converted to two-level ones.
+  *
+  * PS. There are many different approaches to the effective implementation of parallel and distributed aggregation,
+  *  best suited for different cases, and this approach is just one of them, chosen for a combination of reasons.
+  */
+
+using AggregatedDataWithoutKey = AggregateDataPtr;
+
+using AggregatedDataWithUInt8Key = FixedImplicitZeroHashMapWithCalculatedSize<UInt8, AggregateDataPtr>;
+using AggregatedDataWithUInt16Key = FixedImplicitZeroHashMap<UInt16, AggregateDataPtr>;
+
+using AggregatedDataWithUInt32Key = HashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>>;
+using AggregatedDataWithUInt64Key = HashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>>;
+
+using AggregatedDataWithShortStringKey = StringHashMap<AggregateDataPtr>;
+
+using AggregatedDataWithStringKey = HashMapWithSavedHash<StringRef, AggregateDataPtr>;
+
+using AggregatedDataWithKeys128 = HashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
+using AggregatedDataWithKeys256 = HashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
+
+using AggregatedDataWithUInt32KeyTwoLevel = TwoLevelHashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>>;
+using AggregatedDataWithUInt64KeyTwoLevel = TwoLevelHashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>>;
+
+using AggregatedDataWithShortStringKeyTwoLevel = TwoLevelStringHashMap<AggregateDataPtr>;
+
+using AggregatedDataWithStringKeyTwoLevel = TwoLevelHashMapWithSavedHash<StringRef, AggregateDataPtr>;
+
+using AggregatedDataWithKeys128TwoLevel = TwoLevelHashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
+using AggregatedDataWithKeys256TwoLevel = TwoLevelHashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
+
+/** Variants with better hash function, using more than 32 bits for hash.
+  * Using for merging phase of external aggregation, where number of keys may be far greater than 4 billion,
+  *  but we keep in memory and merge only sub-partition of them simultaneously.
+  * TODO We need to switch for better hash function not only for external aggregation,
+  *  but also for huge aggregation results on machines with terabytes of RAM.
+  */
+
+using AggregatedDataWithUInt64KeyHash64 = HashMap<UInt64, AggregateDataPtr, DefaultHash<UInt64>>;
+using AggregatedDataWithStringKeyHash64 = HashMapWithSavedHash<StringRef, AggregateDataPtr, StringRefHash64>;
+using AggregatedDataWithKeys128Hash64 = HashMap<UInt128, AggregateDataPtr, UInt128Hash>;
+using AggregatedDataWithKeys256Hash64 = HashMap<UInt256, AggregateDataPtr, UInt256Hash>;
+
+template <typename Base>
+struct AggregationDataWithNullKey : public Base
+{
+    using Base::Base;
+
+    bool & hasNullKeyData() { return has_null_key_data; }
+    AggregateDataPtr & getNullKeyData() { return null_key_data; }
+    bool hasNullKeyData() const { return has_null_key_data; }
+    const AggregateDataPtr & getNullKeyData() const { return null_key_data; }
+    size_t size() const { return Base::size() + (has_null_key_data ? 1 : 0); }
+    bool empty() const { return Base::empty() && !has_null_key_data; }
+    void clear()
+    {
+        Base::clear();
+        has_null_key_data = false;
+    }
+    void clearAndShrink()
+    {
+        Base::clearAndShrink();
+        has_null_key_data = false;
+    }
+
+private:
+    bool has_null_key_data = false;
+    AggregateDataPtr null_key_data = nullptr;
+};
+
+template <typename Base>
+struct AggregationDataWithNullKeyTwoLevel : public Base
+{
+    using Base::Base;
+    using Base::impls;
+
+    AggregationDataWithNullKeyTwoLevel() = default;
+
+    template <typename Other>
+    explicit AggregationDataWithNullKeyTwoLevel(const Other & other) : Base(other)
+    {
+        impls[0].hasNullKeyData() = other.hasNullKeyData();
+        impls[0].getNullKeyData() = other.getNullKeyData();
+    }
+
+    bool & hasNullKeyData() { return impls[0].hasNullKeyData(); }
+    AggregateDataPtr & getNullKeyData() { return impls[0].getNullKeyData(); }
+    bool hasNullKeyData() const { return impls[0].hasNullKeyData(); }
+    const AggregateDataPtr & getNullKeyData() const { return impls[0].getNullKeyData(); }
+};
+
+template <typename ... Types>
+using HashTableWithNullKey = AggregationDataWithNullKey<HashMapTable<Types ...>>;
+template <typename ... Types>
+using StringHashTableWithNullKey = AggregationDataWithNullKey<StringHashMap<Types ...>>;
+
+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>>;
+
+using AggregatedDataWithNullableShortStringKeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
+        TwoLevelStringHashMap<AggregateDataPtr, HashTableAllocator, StringHashTableWithNullKey>>;
+
+using AggregatedDataWithNullableStringKeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
+        TwoLevelHashMapWithSavedHash<StringRef, AggregateDataPtr, DefaultHash<StringRef>,
+        TwoLevelHashTableGrower<>, HashTableAllocator, HashTableWithNullKey>>;
+}
diff --git a/src/Interpreters/AggregatedDataVariants.cpp b/src/Interpreters/AggregatedDataVariants.cpp
new file mode 100644
index 00000000000..87cfdda5948
--- /dev/null
+++ b/src/Interpreters/AggregatedDataVariants.cpp
@@ -0,0 +1,256 @@
+#include <Interpreters/AggregatedDataVariants.h>
+#include <Interpreters/Aggregator.h>
+#include <Poco/Logger.h>
+#include <Common/logger_useful.h>
+
+namespace ProfileEvents
+{
+    extern const Event AggregationPreallocatedElementsInHashTables;
+}
+
+namespace DB
+{
+namespace ErrorCodes
+{
+    extern const int UNKNOWN_AGGREGATED_DATA_VARIANT;
+    extern const int LOGICAL_ERROR;
+
+}
+using ColumnsHashing::HashMethodContext;
+using ColumnsHashing::HashMethodContextPtr;
+
+AggregatedDataVariants::AggregatedDataVariants() : aggregates_pools(1, std::make_shared<Arena>()), aggregates_pool(aggregates_pools.back().get()) {}
+
+AggregatedDataVariants::~AggregatedDataVariants()
+{
+    if (aggregator && !aggregator->all_aggregates_has_trivial_destructor)
+    {
+        try
+        {
+            aggregator->destroyAllAggregateStates(*this);
+        }
+        catch (...)
+        {
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+        }
+    }
+}
+
+// The std::is_constructible trait isn't suitable here because some classes have template constructors with semantics different from providing size hints.
+// Also string hash table variants are not supported due to the fact that both local perf tests and tests in CI showed slowdowns for them.
+template <typename...>
+struct HasConstructorOfNumberOfElements : std::false_type
+{
+};
+
+template <typename... Ts>
+struct HasConstructorOfNumberOfElements<HashMapTable<Ts...>> : std::true_type
+{
+};
+
+template <typename Key, typename Cell, typename Hash, typename Grower, typename Allocator, template <typename...> typename ImplTable>
+struct HasConstructorOfNumberOfElements<TwoLevelHashMapTable<Key, Cell, Hash, Grower, Allocator, ImplTable>> : std::true_type
+{
+};
+
+template <typename... Ts>
+struct HasConstructorOfNumberOfElements<HashTable<Ts...>> : std::true_type
+{
+};
+
+template <typename... Ts>
+struct HasConstructorOfNumberOfElements<TwoLevelHashTable<Ts...>> : std::true_type
+{
+};
+
+template <template <typename> typename Method, typename Base>
+struct HasConstructorOfNumberOfElements<Method<Base>> : HasConstructorOfNumberOfElements<Base>
+{
+};
+
+template <typename Method>
+auto constructWithReserveIfPossible(size_t size_hint)
+{
+    if constexpr (HasConstructorOfNumberOfElements<typename Method::Data>::value)
+    {
+        ProfileEvents::increment(ProfileEvents::AggregationPreallocatedElementsInHashTables, size_hint);
+        return std::make_unique<Method>(size_hint);
+    }
+    else
+        return std::make_unique<Method>();
+}
+
+void AggregatedDataVariants::init(Type type_, std::optional<size_t> size_hint)
+{
+    switch (type_)
+    {
+        case Type::EMPTY:
+        case Type::without_key:
+            break;
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: \
+            if (size_hint) \
+                (NAME) = constructWithReserveIfPossible<decltype(NAME)::element_type>(*size_hint); \
+            else \
+                (NAME) = std::make_unique<decltype(NAME)::element_type>(); \
+            break;
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+#undef M
+    }
+
+    type = type_;
+}
+
+size_t AggregatedDataVariants::size() const
+{
+    switch (type)
+    {
+        case Type::EMPTY:
+            return 0;
+        case Type::without_key:
+            return 1;
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: \
+            return (NAME)->data.size() + (without_key != nullptr);
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+    }
+
+    UNREACHABLE();
+}
+
+size_t AggregatedDataVariants::sizeWithoutOverflowRow() const
+{
+    switch (type)
+    {
+        case Type::EMPTY:
+        return 0;
+        case Type::without_key:
+        return 1;
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: \
+            return (NAME)->data.size();
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+    }
+
+    UNREACHABLE();
+}
+
+const char * AggregatedDataVariants::getMethodName() const
+{
+    switch (type)
+    {
+        case Type::EMPTY:
+        return "EMPTY";
+        case Type::without_key:
+        return "without_key";
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: \
+            return #NAME;
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+    }
+
+    UNREACHABLE();
+}
+
+bool AggregatedDataVariants::isTwoLevel() const
+{
+    switch (type)
+    {
+        case Type::EMPTY:
+        return false;
+        case Type::without_key:
+        return false;
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: \
+            return IS_TWO_LEVEL;
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+    }
+
+    UNREACHABLE();
+}
+
+bool AggregatedDataVariants::isConvertibleToTwoLevel() const
+{
+    switch (type)
+    {
+    #define M(NAME) \
+        case Type::NAME: \
+            return true;
+
+        APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M)
+
+    #undef M
+        default:
+        return false;
+    }
+}
+
+void AggregatedDataVariants::convertToTwoLevel()
+{
+    if (aggregator)
+        LOG_TRACE(aggregator->log, "Converting aggregation data to two-level.");
+
+    switch (type)
+    {
+#define M(NAME) \
+        case Type::NAME: \
+            NAME ## _two_level = std::make_unique<decltype(NAME ## _two_level)::element_type>(*(NAME)); \
+            (NAME).reset(); \
+            type = Type::NAME ## _two_level; \
+            break;
+
+        APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M)
+
+    #undef M
+
+        default:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong data variant passed.");
+    }
+}
+
+bool AggregatedDataVariants::isLowCardinality() const
+{
+    switch (type)
+    {
+    #define M(NAME) \
+        case Type::NAME: \
+            return true;
+
+        APPLY_FOR_LOW_CARDINALITY_VARIANTS(M)
+    #undef M
+        default:
+            return false;
+    }
+}
+
+HashMethodContextPtr AggregatedDataVariants::createCache(Type type, const HashMethodContext::Settings & settings)
+{
+    switch (type)
+    {
+        case Type::without_key:
+            return nullptr;
+
+    #define M(NAME, IS_TWO_LEVEL) \
+        case Type::NAME: { \
+            using TPtr##NAME = decltype(AggregatedDataVariants::NAME); \
+            using T##NAME = typename TPtr##NAME ::element_type; \
+            return T##NAME ::State::createContext(settings); \
+        }
+
+            APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+
+        default:
+            throw Exception(ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT, "Unknown aggregated data variant.");
+    }
+}
+}
diff --git a/src/Interpreters/AggregatedDataVariants.h b/src/Interpreters/AggregatedDataVariants.h
new file mode 100644
index 00000000000..9f7185db9fc
--- /dev/null
+++ b/src/Interpreters/AggregatedDataVariants.h
@@ -0,0 +1,321 @@
+#pragma once
+#include <Common/ColumnsHashing.h>
+#include <Interpreters/AggregatedData.h>
+#include <Interpreters/AggregationMethod.h>
+
+#include <memory>
+#include <boost/noncopyable.hpp>
+
+
+namespace DB
+{
+class Arena;
+class Aggregator;
+
+struct AggregatedDataVariants : private boost::noncopyable
+{
+    /** Working with states of aggregate functions in the pool is arranged in the following (inconvenient) way:
+      * - when aggregating, states are created in the pool using IAggregateFunction::create (inside - `placement new` of arbitrary structure);
+      * - they must then be destroyed using IAggregateFunction::destroy (inside - calling the destructor of arbitrary structure);
+      * - if aggregation is complete, then, in the Aggregator::convertToBlocks function, pointers to the states of aggregate functions
+      *   are written to ColumnAggregateFunction; ColumnAggregateFunction "acquires ownership" of them, that is - calls `destroy` in its destructor.
+      * - if during the aggregation, before call to Aggregator::convertToBlocks, an exception was thrown,
+      *   then the states of aggregate functions must still be destroyed,
+      *   otherwise, for complex states (eg, AggregateFunctionUniq), there will be memory leaks;
+      * - in this case, to destroy states, the destructor calls Aggregator::destroyAggregateStates method,
+      *   but only if the variable aggregator (see below) is not nullptr;
+      * - that is, until you transfer ownership of the aggregate function states in the ColumnAggregateFunction, set the variable `aggregator`,
+      *   so that when an exception occurs, the states are correctly destroyed.
+      *
+      * PS. This can be corrected by making a pool that knows about which states of aggregate functions and in which order are put in it, and knows how to destroy them.
+      * But this can hardly be done simply because it is planned to put variable-length strings into the same pool.
+      * In this case, the pool will not be able to know with what offsets objects are stored.
+      */
+    const Aggregator * aggregator = nullptr;
+
+    size_t keys_size{};  /// Number of keys. NOTE do we need this field?
+    Sizes key_sizes;     /// Dimensions of keys, if keys of fixed length
+
+    /// Pools for states of aggregate functions. Ownership will be later transferred to ColumnAggregateFunction.
+    using ArenaPtr = std::shared_ptr<Arena>;
+    using Arenas = std::vector<ArenaPtr>;
+    Arenas aggregates_pools;
+    Arena * aggregates_pool{};    /// The pool that is currently used for allocation.
+
+    /** Specialization for the case when there are no keys, and for keys not fitted into max_rows_to_group_by.
+      */
+    AggregatedDataWithoutKey without_key = nullptr;
+
+    /// Stats of a cache for consecutive keys optimization.
+    /// Stats can be used to disable the cache in case of a lot of misses.
+    ColumnsHashing::LastElementCacheStats consecutive_keys_cache_stats;
+
+    // Disable consecutive key optimization for Uint8/16, because they use a FixedHashMap
+    // and the lookup there is almost free, so we don't need to cache the last lookup result
+    std::unique_ptr<AggregationMethodOneNumber<UInt8, AggregatedDataWithUInt8Key, false>>           key8;
+    std::unique_ptr<AggregationMethodOneNumber<UInt16, AggregatedDataWithUInt16Key, false>>         key16;
+
+    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64Key>>         key32;
+    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64Key>>         key64;
+    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithShortStringKey>>               key_string;
+    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKey>>          key_fixed_string;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt16Key, false, false, false>>  keys16;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt32Key>>                   keys32;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt64Key>>                   keys64;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128>>                   keys128;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256>>                   keys256;
+    std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKey>>                          serialized;
+    std::unique_ptr<AggregationMethodNullableSerialized<AggregatedDataWithStringKey>>                  nullable_serialized;
+    std::unique_ptr<AggregationMethodPreallocSerialized<AggregatedDataWithStringKey>>                  prealloc_serialized;
+    std::unique_ptr<AggregationMethodNullablePreallocSerialized<AggregatedDataWithStringKey>>          nullable_prealloc_serialized;
+
+    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64KeyTwoLevel>> key32_two_level;
+    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyTwoLevel>> key64_two_level;
+    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>>       key_string_two_level;
+    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>>  key_fixed_string_two_level;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt32KeyTwoLevel>>           keys32_two_level;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt64KeyTwoLevel>>           keys64_two_level;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel>>           keys128_two_level;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel>>           keys256_two_level;
+    std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel>>                  serialized_two_level;
+    std::unique_ptr<AggregationMethodNullableSerialized<AggregatedDataWithStringKeyTwoLevel>>          nullable_serialized_two_level;
+    std::unique_ptr<AggregationMethodPreallocSerialized<AggregatedDataWithStringKeyTwoLevel>>          prealloc_serialized_two_level;
+    std::unique_ptr<AggregationMethodNullablePreallocSerialized<AggregatedDataWithStringKeyTwoLevel>>  nullable_prealloc_serialized_two_level;
+
+    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyHash64>>   key64_hash64;
+    std::unique_ptr<AggregationMethodString<AggregatedDataWithStringKeyHash64>>              key_string_hash64;
+    std::unique_ptr<AggregationMethodFixedString<AggregatedDataWithStringKeyHash64>>         key_fixed_string_hash64;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128Hash64>>             keys128_hash64;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256Hash64>>             keys256_hash64;
+    std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKeyHash64>>                  serialized_hash64;
+    std::unique_ptr<AggregationMethodNullableSerialized<AggregatedDataWithStringKeyHash64>>          nullable_serialized_hash64;
+    std::unique_ptr<AggregationMethodPreallocSerialized<AggregatedDataWithStringKeyHash64>>          prealloc_serialized_hash64;
+    std::unique_ptr<AggregationMethodNullablePreallocSerialized<AggregatedDataWithStringKeyHash64>>  nullable_prealloc_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;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, true>>     nullable_keys256_two_level;
+
+    /// Support for low cardinality.
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false>>> low_cardinality_key8;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false>>> low_cardinality_key16;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64Key>>> low_cardinality_key32;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key>>> low_cardinality_key64;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKey>>> low_cardinality_key_string;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKey>>> low_cardinality_key_fixed_string;
+
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64KeyTwoLevel>>> low_cardinality_key32_two_level;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>>> low_cardinality_key64_two_level;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKeyTwoLevel>>> low_cardinality_key_string_two_level;
+    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKeyTwoLevel>>> low_cardinality_key_fixed_string_two_level;
+
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128, false, true>>      low_cardinality_keys128;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256, false, true>>      low_cardinality_keys256;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel, false, true>> low_cardinality_keys128_two_level;
+    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, false, true>> low_cardinality_keys256_two_level;
+
+    /// In this and similar macros, the option without_key is not considered.
+    #define APPLY_FOR_AGGREGATED_VARIANTS(M) \
+        M(key8,                       false) \
+        M(key16,                      false) \
+        M(key32,                      false) \
+        M(key64,                      false) \
+        M(key_string,                 false) \
+        M(key_fixed_string,           false) \
+        M(keys16,                    false) \
+        M(keys32,                    false) \
+        M(keys64,                    false) \
+        M(keys128,                    false) \
+        M(keys256,                    false) \
+        M(serialized,                   false) \
+        M(nullable_serialized,          false) \
+        M(prealloc_serialized,          false) \
+        M(nullable_prealloc_serialized, false) \
+        M(key32_two_level,            true) \
+        M(key64_two_level,            true) \
+        M(key_string_two_level,       true) \
+        M(key_fixed_string_two_level, true) \
+        M(keys32_two_level,          true) \
+        M(keys64_two_level,          true) \
+        M(keys128_two_level,          true) \
+        M(keys256_two_level,          true) \
+        M(serialized_two_level,                   true) \
+        M(nullable_serialized_two_level,          true) \
+        M(prealloc_serialized_two_level,          true) \
+        M(nullable_prealloc_serialized_two_level, true) \
+        M(key64_hash64,               false) \
+        M(key_string_hash64,          false) \
+        M(key_fixed_string_hash64,    false) \
+        M(keys128_hash64,             false) \
+        M(keys256_hash64,             false) \
+        M(serialized_hash64,                   false) \
+        M(nullable_serialized_hash64,          false) \
+        M(prealloc_serialized_hash64,          false) \
+        M(nullable_prealloc_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) \
+        M(nullable_keys256_two_level, true) \
+        M(low_cardinality_key8, false) \
+        M(low_cardinality_key16, false) \
+        M(low_cardinality_key32, false) \
+        M(low_cardinality_key64, false) \
+        M(low_cardinality_keys128, false) \
+        M(low_cardinality_keys256, false) \
+        M(low_cardinality_key_string, false) \
+        M(low_cardinality_key_fixed_string, false) \
+        M(low_cardinality_key32_two_level, true) \
+        M(low_cardinality_key64_two_level, true) \
+        M(low_cardinality_keys128_two_level, true) \
+        M(low_cardinality_keys256_two_level, true) \
+        M(low_cardinality_key_string_two_level, true) \
+        M(low_cardinality_key_fixed_string_two_level, true) \
+
+    #define APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M) \
+        M(key32)            \
+        M(key64)            \
+        M(key_string)       \
+        M(key_fixed_string) \
+        M(keys32)           \
+        M(keys64)           \
+        M(keys128)          \
+        M(keys256)          \
+        M(serialized)       \
+        M(nullable_serialized) \
+        M(prealloc_serialized) \
+        M(nullable_prealloc_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) \
+        M(low_cardinality_key64) \
+        M(low_cardinality_keys128) \
+        M(low_cardinality_keys256) \
+        M(low_cardinality_key_string) \
+        M(low_cardinality_key_fixed_string) \
+
+    /// NOLINTNEXTLINE
+    #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)\
+        M(key_fixed_string_hash64) \
+        M(keys128_hash64)   \
+        M(keys256_hash64)   \
+        M(serialized_hash64) \
+        M(nullable_serialized_hash64) \
+        M(prealloc_serialized_hash64) \
+        M(nullable_prealloc_serialized_hash64) \
+        M(low_cardinality_key8) \
+        M(low_cardinality_key16) \
+
+    /// NOLINTNEXTLINE
+    #define APPLY_FOR_VARIANTS_SINGLE_LEVEL(M) \
+        APPLY_FOR_VARIANTS_NOT_CONVERTIBLE_TO_TWO_LEVEL(M) \
+        APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M) \
+
+    /// NOLINTNEXTLINE
+    #define APPLY_FOR_VARIANTS_TWO_LEVEL(M) \
+        M(key32_two_level)            \
+        M(key64_two_level)            \
+        M(key_string_two_level)       \
+        M(key_fixed_string_two_level) \
+        M(keys32_two_level)           \
+        M(keys64_two_level)           \
+        M(keys128_two_level)          \
+        M(keys256_two_level)          \
+        M(serialized_two_level)       \
+        M(nullable_serialized_two_level)       \
+        M(prealloc_serialized_two_level)       \
+        M(nullable_prealloc_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) \
+        M(low_cardinality_key64_two_level) \
+        M(low_cardinality_keys128_two_level) \
+        M(low_cardinality_keys256_two_level) \
+        M(low_cardinality_key_string_two_level) \
+        M(low_cardinality_key_fixed_string_two_level) \
+
+    #define APPLY_FOR_LOW_CARDINALITY_VARIANTS(M) \
+        M(low_cardinality_key8) \
+        M(low_cardinality_key16) \
+        M(low_cardinality_key32) \
+        M(low_cardinality_key64) \
+        M(low_cardinality_keys128) \
+        M(low_cardinality_keys256) \
+        M(low_cardinality_key_string) \
+        M(low_cardinality_key_fixed_string) \
+        M(low_cardinality_key32_two_level) \
+        M(low_cardinality_key64_two_level) \
+        M(low_cardinality_keys128_two_level) \
+        M(low_cardinality_keys256_two_level) \
+        M(low_cardinality_key_string_two_level) \
+        M(low_cardinality_key_fixed_string_two_level)
+
+    enum class Type
+    {
+        EMPTY = 0,
+        without_key,
+
+    #define M(NAME, IS_TWO_LEVEL) NAME,
+        APPLY_FOR_AGGREGATED_VARIANTS(M)
+    #undef M
+    };
+    Type type = Type::EMPTY;
+    AggregatedDataVariants();
+    ~AggregatedDataVariants();
+    bool empty() const { return type == Type::EMPTY; }
+    void invalidate() { type = Type::EMPTY; }
+    void init(Type type_, std::optional<size_t> size_hint = std::nullopt);
+    /// Number of rows (different keys).
+    size_t size() const;
+    size_t sizeWithoutOverflowRow() const;
+    const char * getMethodName() const;
+    bool isTwoLevel() const;
+    bool isConvertibleToTwoLevel() const;
+    void convertToTwoLevel();
+    bool isLowCardinality() const;
+    static ColumnsHashing::HashMethodContextPtr createCache(Type type, const ColumnsHashing::HashMethodContext::Settings & settings);
+
+};
+
+using AggregatedDataVariantsPtr = std::shared_ptr<AggregatedDataVariants>;
+using ManyAggregatedDataVariants = std::vector<AggregatedDataVariantsPtr>;
+using ManyAggregatedDataVariantsPtr = std::shared_ptr<ManyAggregatedDataVariants>;
+}
diff --git a/src/Interpreters/AggregationCommon.h b/src/Interpreters/AggregationCommon.h
index 722675f62ed..ab078d1c5e5 100644
--- a/src/Interpreters/AggregationCommon.h
+++ b/src/Interpreters/AggregationCommon.h
@@ -89,12 +89,12 @@ void fillFixedBatch(size_t keys_size, const ColumnRawPtrs & key_columns, const S
 
             /// Note: here we violate strict aliasing.
             /// It should be ok as log as we do not reffer to any value from `out` before filling.
-            const char * source = static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<sizeof(T)>();
+            const char * source = static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<sizeof(T)>();
             size_t offset_to = offset;
             if constexpr (std::endian::native == std::endian::big)
                 offset_to = sizeof(Key) - sizeof(T) - offset;
             T * dest = reinterpret_cast<T *>(reinterpret_cast<char *>(out.data()) + offset_to);
-            fillFixedBatch<T, sizeof(Key) / sizeof(T)>(num_rows, reinterpret_cast<const T *>(source), dest);
+            fillFixedBatch<T, sizeof(Key) / sizeof(T)>(num_rows, reinterpret_cast<const T *>(source), dest); /// NOLINT(bugprone-sizeof-expression)
             offset += sizeof(T);
         }
     }
@@ -151,33 +151,33 @@ static inline T ALWAYS_INLINE packFixed(
         {
             case 1:
                 {
-                    memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index, 1);
+                    memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<1>() + index, 1);
                     offset += 1;
                 }
                 break;
             case 2:
                 if constexpr (sizeof(T) >= 2)   /// To avoid warning about memcpy exceeding object size.
                 {
-                    memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<2>() + index * 2, 2);
+                    memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<2>() + index * 2, 2);
                     offset += 2;
                 }
                 break;
             case 4:
                 if constexpr (sizeof(T) >= 4)
                 {
-                    memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<4>() + index * 4, 4);
+                    memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<4>() + index * 4, 4);
                     offset += 4;
                 }
                 break;
             case 8:
                 if constexpr (sizeof(T) >= 8)
                 {
-                    memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<8>() + index * 8, 8);
+                    memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<8>() + index * 8, 8);
                     offset += 8;
                 }
                 break;
             default:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(column)->getRawDataBegin<1>() + index * key_sizes[j], key_sizes[j]);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(column)->getRawDataBegin<1>() + index * key_sizes[j], key_sizes[j]);
                 offset += key_sizes[j];
         }
     }
@@ -227,23 +227,23 @@ static inline T ALWAYS_INLINE packFixed(
         switch (key_sizes[j])
         {
             case 1:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i, 1);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(key_columns[j])->getRawDataBegin<1>() + i, 1);
                 offset += 1;
                 break;
             case 2:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<2>() + i * 2, 2);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(key_columns[j])->getRawDataBegin<2>() + i * 2, 2);
                 offset += 2;
                 break;
             case 4:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<4>() + i * 4, 4);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(key_columns[j])->getRawDataBegin<4>() + i * 4, 4);
                 offset += 4;
                 break;
             case 8:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<8>() + i * 8, 8);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(key_columns[j])->getRawDataBegin<8>() + i * 8, 8);
                 offset += 8;
                 break;
             default:
-                memcpy(bytes + offset, static_cast<const ColumnVectorHelper *>(key_columns[j])->getRawDataBegin<1>() + i * key_sizes[j], key_sizes[j]);
+                memcpy(bytes + offset, static_cast<const ColumnFixedSizeHelper *>(key_columns[j])->getRawDataBegin<1>() + i * key_sizes[j], key_sizes[j]);
                 offset += key_sizes[j];
         }
     }
diff --git a/src/Interpreters/AggregationMethod.cpp b/src/Interpreters/AggregationMethod.cpp
new file mode 100644
index 00000000000..3ff4f0cae43
--- /dev/null
+++ b/src/Interpreters/AggregationMethod.cpp
@@ -0,0 +1,215 @@
+#include <Interpreters/AggregationMethod.h>
+
+namespace DB
+{
+template <typename FieldType, typename TData, bool consecutive_keys_optimization, bool nullable>
+void AggregationMethodOneNumber<FieldType, TData, consecutive_keys_optimization, nullable>::insertKeyIntoColumns(
+    const AggregationMethodOneNumber::Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/)
+{
+    ColumnFixedSizeHelper * 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<ColumnFixedSizeHelper *>(&nullable_col.getNestedColumn());
+    }
+    else
+    {
+        column = static_cast<ColumnFixedSizeHelper *>(key_columns[0]);
+    }
+    static_assert(sizeof(FieldType) <= sizeof(Key));
+    const auto * key_holder = reinterpret_cast<const char *>(&key);
+    if constexpr (sizeof(FieldType) < sizeof(Key) && std::endian::native == std::endian::big)
+        column->insertRawData<sizeof(FieldType)>(key_holder + (sizeof(Key) - sizeof(FieldType)));
+    else
+        column->insertRawData<sizeof(FieldType)>(key_holder);
+}
+
+template struct AggregationMethodOneNumber<UInt8, AggregatedDataWithUInt8Key, false>;
+template struct AggregationMethodOneNumber<UInt16, AggregatedDataWithUInt16Key, false>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64Key>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64Key>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64KeyTwoLevel>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyTwoLevel>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyHash64>;
+template struct AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false, true>;
+template struct AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false, true>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt32Key, true, true>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key, true, true>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt32KeyTwoLevel, true, true>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel, true, true>;
+template struct AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false>;
+template struct AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64Key>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key>;
+template struct AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64KeyTwoLevel>;
+template struct AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>;
+
+template <typename TData, bool nullable>
+void AggregationMethodStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+{
+    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);
+    }
+}
+template struct AggregationMethodStringNoCache<AggregatedDataWithShortStringKey>;
+template struct AggregationMethodStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>;
+template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKey, true>;
+template struct AggregationMethodStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>;
+
+template <typename TData>
+void AggregationMethodFixedString<TData>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+{
+    assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
+}
+template struct AggregationMethodFixedString<AggregatedDataWithStringKeyHash64>;
+template struct AggregationMethodFixedString<AggregatedDataWithNullableStringKey>;
+template struct AggregationMethodFixedString<AggregatedDataWithNullableStringKeyTwoLevel>;
+
+
+template <typename TData, bool nullable>
+void AggregationMethodFixedStringNoCache<TData, nullable>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+{
+    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);
+}
+template struct AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKey>;
+template struct AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>;
+template struct AggregationMethodFixedStringNoCache<AggregatedDataWithNullableShortStringKey, true>;
+template struct AggregationMethodFixedStringNoCache<AggregatedDataWithNullableShortStringKeyTwoLevel, true>;
+
+
+template <typename SingleColumnMethod>
+void AggregationMethodSingleLowCardinalityColumn<SingleColumnMethod>::insertKeyIntoColumns(
+    const Key & key, std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/)
+{
+    auto * col = assert_cast<ColumnLowCardinality *>(key_columns_low_cardinality[0]);
+
+    if constexpr (std::is_same_v<Key, StringRef>)
+        col->insertData(key.data, key.size);
+    else
+        col->insertData(reinterpret_cast<const char *>(&key), sizeof(key));
+}
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64Key>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKey>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKey>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64KeyTwoLevel>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKeyTwoLevel>>;
+template struct AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKeyTwoLevel>>;
+
+
+template <typename TData, bool has_nullable_keys, bool has_low_cardinality, bool consecutive_keys_optimization>
+void AggregationMethodKeysFixed<TData, has_nullable_keys, has_low_cardinality,consecutive_keys_optimization>::insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
+{
+    size_t keys_size = key_columns.size();
+
+    static constexpr auto bitmap_size = has_nullable_keys ? std::tuple_size<KeysNullMap<Key>>::value : 0;
+    /// In any hash key value, column values to be read start just after the bitmap, if it exists.
+    size_t pos = bitmap_size;
+
+    for (size_t i = 0; i < keys_size; ++i)
+    {
+        IColumn * observed_column;
+        ColumnUInt8 * null_map;
+
+        bool column_nullable = false;
+        if constexpr (has_nullable_keys)
+            column_nullable = isColumnNullable(*key_columns[i]);
+
+        /// If we have a nullable column, get its nested column and its null map.
+        if (column_nullable)
+        {
+            ColumnNullable & nullable_col = assert_cast<ColumnNullable &>(*key_columns[i]);
+            observed_column = &nullable_col.getNestedColumn();
+            null_map = assert_cast<ColumnUInt8 *>(&nullable_col.getNullMapColumn());
+        }
+        else
+        {
+            observed_column = key_columns[i];
+            null_map = nullptr;
+        }
+
+        bool is_null = false;
+        if (column_nullable)
+        {
+            /// The current column is nullable. Check if the value of the
+            /// corresponding key is nullable. Update the null map accordingly.
+            size_t bucket = i / 8;
+            size_t offset = i % 8;
+            UInt8 val = (reinterpret_cast<const UInt8 *>(&key)[bucket] >> offset) & 1;
+            null_map->insertValue(val);
+            is_null = val == 1;
+        }
+
+        if (has_nullable_keys && is_null)
+            observed_column->insertDefault();
+        else
+        {
+            size_t size = key_sizes[i];
+            size_t offset_to = pos;
+            if constexpr (std::endian::native == std::endian::big)
+                offset_to = sizeof(Key) - size - pos;
+            observed_column->insertData(reinterpret_cast<const char *>(&key) + offset_to, size);
+            pos += size;
+        }
+    }
+}
+template struct AggregationMethodKeysFixed<AggregatedDataWithUInt16Key, false, false, false>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithUInt32Key>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithUInt64Key>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithUInt32KeyTwoLevel>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithUInt64KeyTwoLevel>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128Hash64>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256Hash64>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128, false, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256, false, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel, false, true>;
+template struct AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, false, true>;
+
+
+template <typename TData, bool nullable, bool prealloc>
+void AggregationMethodSerialized<TData, nullable, prealloc>::insertKeyIntoColumns(StringRef key, std::vector<IColumn *> & key_columns, const Sizes &)
+{
+    const auto * pos = key.data;
+    for (auto & column : key_columns)
+        pos = column->deserializeAndInsertFromArena(pos);
+}
+template struct AggregationMethodSerialized<AggregatedDataWithStringKey>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyHash64>;
+// AggregationMethodNullableSerialized
+template struct AggregationMethodSerialized<AggregatedDataWithStringKey, true, false>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel, true, false>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyHash64, true, false>;
+// AggregationMethodPreallocSerialized
+template struct AggregationMethodSerialized<AggregatedDataWithStringKey, false, true>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel, false, true>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyHash64, false, true>;
+// AggregationMethodNullablePreallocSerialized
+template struct AggregationMethodSerialized<AggregatedDataWithStringKey, true, true>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel, true, true>;
+template struct AggregationMethodSerialized<AggregatedDataWithStringKeyHash64, true, true>;
+
+}
diff --git a/src/Interpreters/AggregationMethod.h b/src/Interpreters/AggregationMethod.h
new file mode 100644
index 00000000000..41345d91990
--- /dev/null
+++ b/src/Interpreters/AggregationMethod.h
@@ -0,0 +1,320 @@
+#pragma once
+#include <vector>
+#include <Common/ColumnsHashing.h>
+#include <Interpreters/AggregationCommon.h>
+#include <Interpreters/AggregatedData.h>
+
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnFixedString.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnVector.h>
+#include <Columns/ColumnNullable.h>
+#include <Columns/ColumnLowCardinality.h>
+
+namespace DB
+{
+class IColumn;
+/// 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 nullable = false>
+struct AggregationMethodOneNumber
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodOneNumber() = default;
+
+    explicit AggregationMethodOneNumber(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodOneNumber(const Other & other) : data(other.data)
+    {
+    }
+
+    /// To use one `Method` in different threads, use different `State`.
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodOneNumber<
+        typename Data::value_type,
+        Mapped,
+        FieldType,
+        use_cache && consecutive_keys_optimization,
+        /*need_offset=*/ false,
+        nullable>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    /// 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 {}; }
+
+    // Insert the key from the hash table into columns.
+    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & /*key_sizes*/);
+};
+
+/// For the case where there is one string key.
+template <typename TData>
+struct AggregationMethodString
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodString() = default;
+
+    template <typename Other>
+    explicit AggregationMethodString(const Other & other) : data(other.data)
+    {
+    }
+
+    explicit AggregationMethodString(size_t size_hint) : data(size_hint) { }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, /*place_string_to_arena=*/ true, use_cache>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
+    }
+};
+
+/// Same as above but without cache
+template <typename TData, bool nullable = false>
+struct AggregationMethodStringNoCache
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodStringNoCache() = default;
+
+    explicit AggregationMethodStringNoCache(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodStringNoCache(const Other & other) : data(other.data)
+    {
+    }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, true, false, false, nullable>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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 &);
+};
+
+/// For the case where there is one fixed-length string key.
+template <typename TData>
+struct AggregationMethodFixedString
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodFixedString() = default;
+
+    explicit AggregationMethodFixedString(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodFixedString(const Other & other) : data(other.data)
+    {
+    }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, /*place_string_to_arena=*/ true, use_cache>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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 &);
+};
+
+/// Same as above but without cache
+template <typename TData, bool nullable = false>
+struct AggregationMethodFixedStringNoCache
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodFixedStringNoCache() = default;
+
+    explicit AggregationMethodFixedStringNoCache(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodFixedStringNoCache(const Other & other) : data(other.data)
+    {
+    }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, true, false, false, nullable>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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 &);
+};
+
+/// Single low cardinality column.
+template <typename SingleColumnMethod>
+struct AggregationMethodSingleLowCardinalityColumn : public SingleColumnMethod
+{
+    using Base = SingleColumnMethod;
+    using Data = typename Base::Data;
+    using Key = typename Base::Key;
+    using Mapped = typename Base::Mapped;
+    using Base::data;
+
+    template <bool use_cache>
+    using BaseStateImpl = typename Base::template StateImpl<use_cache>;
+
+    AggregationMethodSingleLowCardinalityColumn() = default;
+
+    template <typename Other>
+    explicit AggregationMethodSingleLowCardinalityColumn(const Other & other) : Base(other) {}
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodSingleLowCardinalityColumn<BaseStateImpl<use_cache>, Mapped, use_cache>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    static const bool low_cardinality_optimization = true;
+
+    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
+
+    static void insertKeyIntoColumns(const Key & key,
+         std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/);
+};
+
+/// For the case where all keys are of fixed length, and they fit in N (for example, 128) bits.
+template <typename TData, bool has_nullable_keys_ = false, bool has_low_cardinality_ = false, bool consecutive_keys_optimization = false>
+struct AggregationMethodKeysFixed
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+    static constexpr bool has_nullable_keys = has_nullable_keys_;
+    static constexpr bool has_low_cardinality = has_low_cardinality_;
+
+    Data data;
+
+    AggregationMethodKeysFixed() = default;
+
+    explicit AggregationMethodKeysFixed(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodKeysFixed(const Other & other) : data(other.data)
+    {
+    }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodKeysFixed<
+        typename Data::value_type,
+        Key,
+        Mapped,
+        has_nullable_keys,
+        has_low_cardinality,
+        use_cache && consecutive_keys_optimization>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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)
+    {
+        return State::shuffleKeyColumns(key_columns, key_sizes);
+    }
+
+    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes);
+};
+
+/** Aggregates by concatenating serialized key values.
+  * The serialized value differs in that it uniquely allows to deserialize it, having only the position with which it starts.
+  * That is, for example, for strings, it contains first the serialized length of the string, and then the bytes.
+  * Therefore, when aggregating by several strings, there is no ambiguity.
+  */
+template <typename TData, bool nullable = false, bool prealloc = false>
+struct AggregationMethodSerialized
+{
+    using Data = TData;
+    using Key = typename Data::key_type;
+    using Mapped = typename Data::mapped_type;
+
+    Data data;
+
+    AggregationMethodSerialized() = default;
+
+    explicit AggregationMethodSerialized(size_t size_hint) : data(size_hint) { }
+
+    template <typename Other>
+    explicit AggregationMethodSerialized(const Other & other) : data(other.data)
+    {
+    }
+
+    template <bool use_cache>
+    using StateImpl = ColumnsHashing::HashMethodSerialized<typename Data::value_type, Mapped, nullable, prealloc>;
+
+    using State = StateImpl<true>;
+    using StateNoCache = StateImpl<false>;
+
+    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 &);
+};
+
+template <typename TData>
+using AggregationMethodNullableSerialized = AggregationMethodSerialized<TData, true>;
+
+template <typename TData>
+using AggregationMethodPreallocSerialized = AggregationMethodSerialized<TData, false, true>;
+
+template <typename TData>
+using AggregationMethodNullablePreallocSerialized = AggregationMethodSerialized<TData, true, true>;
+
+
+}
diff --git a/src/Interpreters/AggregationUtils.cpp b/src/Interpreters/AggregationUtils.cpp
index 125a9e4f6b8..132ce93786a 100644
--- a/src/Interpreters/AggregationUtils.cpp
+++ b/src/Interpreters/AggregationUtils.cpp
@@ -1,3 +1,4 @@
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Interpreters/AggregationUtils.h>
 
 namespace DB
diff --git a/src/Interpreters/Aggregator.cpp b/src/Interpreters/Aggregator.cpp
index 0d80adb6313..2db07bb77f6 100644
--- a/src/Interpreters/Aggregator.cpp
+++ b/src/Interpreters/Aggregator.cpp
@@ -7,38 +7,37 @@
 #    include <unistd.h>
 #endif
 
-#include <base/sort.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <Columns/ColumnTuple.h>
-#include <Columns/ColumnSparse.h>
-#include <Formats/NativeWriter.h>
-#include <Compression/CompressedWriteBuffer.h>
-#include <Interpreters/Aggregator.h>
 #include <AggregateFunctions/Combinators/AggregateFunctionArray.h>
 #include <AggregateFunctions/Combinators/AggregateFunctionState.h>
-#include <IO/Operators.h>
-#include <Interpreters/JIT/compileFunction.h>
-#include <Interpreters/JIT/CompiledExpressionCache.h>
+#include <Columns/ColumnSparse.h>
+#include <Columns/ColumnTuple.h>
+#include <Compression/CompressedWriteBuffer.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <Disks/TemporaryFileOnDisk.h>
+#include <Formats/NativeWriter.h>
+#include <Functions/FunctionHelpers.h>
+#include <IO/Operators.h>
+#include <Interpreters/AggregationUtils.h>
+#include <Interpreters/Aggregator.h>
+#include <Interpreters/JIT/CompiledExpressionCache.h>
+#include <Interpreters/JIT/compileFunction.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <base/sort.h>
+#include <Common/CacheBase.h>
+#include <Common/CurrentMetrics.h>
+#include <Common/CurrentThread.h>
+#include <Common/JSONBuilder.h>
+#include <Common/MemoryTracker.h>
 #include <Common/Stopwatch.h>
-#include <Common/setThreadName.h>
+#include <Common/assert_cast.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/scope_guard_safe.h>
-
-#include <Parsers/ASTSelectQuery.h>
-
-#include <Interpreters/AggregationUtils.h>
+#include <Common/setThreadName.h>
+#include <Common/typeid_cast.h>
 
 
 namespace ProfileEvents
@@ -48,11 +47,11 @@ namespace ProfileEvents
     extern const Event ExternalAggregationUncompressedBytes;
     extern const Event ExternalProcessingCompressedBytesTotal;
     extern const Event ExternalProcessingUncompressedBytesTotal;
-    extern const Event AggregationPreallocatedElementsInHashTables;
     extern const Event AggregationHashTablesInitializedAsTwoLevel;
     extern const Event OverflowThrow;
     extern const Event OverflowBreak;
     extern const Event OverflowAny;
+    extern const Event AggregationOptimizedEqualRangesOfKeys;
 }
 
 namespace CurrentMetrics
@@ -105,7 +104,7 @@ public:
         if (const auto hint = cache->get(params.key))
         {
             LOG_TRACE(
-                &Poco::Logger::get("Aggregator"),
+                getLogger("Aggregator"),
                 "An entry for key={} found in cache: sum_of_sizes={}, median_size={}",
                 params.key,
                 hint->sum_of_sizes,
@@ -129,7 +128,7 @@ public:
             || hint->median_size < median_size)
         {
             LOG_TRACE(
-                &Poco::Logger::get("Aggregator"),
+                getLogger("Aggregator"),
                 "Statistics updated for key={}: new sum_of_sizes={}, median_size={}",
                 params.key,
                 sum_of_sizes,
@@ -229,7 +228,7 @@ void initDataVariantsWithSizeHint(
                 /// But we will also work with the big (i.e. not so cache friendly) HT from the beginning which may result in a slight slowdown.
                 /// So let's just do nothing.
                 LOG_TRACE(
-                    &Poco::Logger::get("Aggregator"),
+                    getLogger("Aggregator"),
                     "No space were preallocated in hash tables because 'max_size_to_preallocate_for_aggregation' has too small value: {}, "
                     "should be at least {}",
                     stats_collecting_params.max_size_to_preallocate_for_aggregation,
@@ -269,50 +268,6 @@ void updateStatistics(const DB::ManyAggregatedDataVariants & data_variants, cons
     getHashTablesStatistics().update(sum_of_sizes, *median_size, params);
 }
 
-// The std::is_constructible trait isn't suitable here because some classes have template constructors with semantics different from providing size hints.
-// Also string hash table variants are not supported due to the fact that both local perf tests and tests in CI showed slowdowns for them.
-template <typename...>
-struct HasConstructorOfNumberOfElements : std::false_type
-{
-};
-
-template <typename... Ts>
-struct HasConstructorOfNumberOfElements<HashMapTable<Ts...>> : std::true_type
-{
-};
-
-template <typename Key, typename Cell, typename Hash, typename Grower, typename Allocator, template <typename...> typename ImplTable>
-struct HasConstructorOfNumberOfElements<TwoLevelHashMapTable<Key, Cell, Hash, Grower, Allocator, ImplTable>> : std::true_type
-{
-};
-
-template <typename... Ts>
-struct HasConstructorOfNumberOfElements<HashTable<Ts...>> : std::true_type
-{
-};
-
-template <typename... Ts>
-struct HasConstructorOfNumberOfElements<TwoLevelHashTable<Ts...>> : std::true_type
-{
-};
-
-template <template <typename> typename Method, typename Base>
-struct HasConstructorOfNumberOfElements<Method<Base>> : HasConstructorOfNumberOfElements<Base>
-{
-};
-
-template <typename Method>
-auto constructWithReserveIfPossible(size_t size_hint)
-{
-    if constexpr (HasConstructorOfNumberOfElements<typename Method::Data>::value)
-    {
-        ProfileEvents::increment(ProfileEvents::AggregationPreallocatedElementsInHashTables, size_hint);
-        return std::make_unique<Method>(size_hint);
-    }
-    else
-        return std::make_unique<Method>();
-}
-
 DB::ColumnNumbers calculateKeysPositions(const DB::Block & header, const DB::Aggregator::Params & params)
 {
     DB::ColumnNumbers keys_positions(params.keys_size);
@@ -345,71 +300,11 @@ size_t getMinBytesForPrefetch()
 namespace DB
 {
 
-AggregatedDataVariants::~AggregatedDataVariants()
-{
-    if (aggregator && !aggregator->all_aggregates_has_trivial_destructor)
-    {
-        try
-        {
-            aggregator->destroyAllAggregateStates(*this);
-        }
-        catch (...)
-        {
-            tryLogCurrentException(__PRETTY_FUNCTION__);
-        }
-    }
-}
-
 std::optional<HashTablesCacheStatistics> getHashTablesCacheStatistics()
 {
     return getHashTablesStatistics().getCacheStats();
 }
 
-void AggregatedDataVariants::convertToTwoLevel()
-{
-    if (aggregator)
-        LOG_TRACE(aggregator->log, "Converting aggregation data to two-level.");
-
-    switch (type)
-    {
-#define M(NAME) \
-        case Type::NAME: \
-            NAME ## _two_level = std::make_unique<decltype(NAME ## _two_level)::element_type>(*(NAME)); \
-            (NAME).reset(); \
-            type = Type::NAME ## _two_level; \
-            break;
-
-        APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M)
-
-    #undef M
-
-        default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong data variant passed.");
-    }
-}
-
-void AggregatedDataVariants::init(Type type_, std::optional<size_t> size_hint)
-{
-    switch (type_)
-    {
-        case Type::EMPTY:
-        case Type::without_key:
-            break;
-
-#define M(NAME, IS_TWO_LEVEL) \
-    case Type::NAME: \
-        if (size_hint) \
-            (NAME) = constructWithReserveIfPossible<decltype(NAME)::element_type>(*size_hint); \
-        else \
-            (NAME) = std::make_unique<decltype(NAME)::element_type>(); \
-        break;
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-#undef M
-    }
-
-    type = type_;
-}
-
 Aggregator::Params::StatsCollectingParams::StatsCollectingParams() = default;
 
 Aggregator::Params::StatsCollectingParams::StatsCollectingParams(
@@ -624,7 +519,7 @@ Aggregator::Aggregator(const Block & header_, const Params & params_)
         {
             size_t alignment_of_next_state = params.aggregates[i + 1].function->alignOfData();
             if ((alignment_of_next_state & (alignment_of_next_state - 1)) != 0)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: alignOfData is not 2^N");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "`alignOfData` is not 2^N");
 
             /// Extend total_size to next alignment requirement
             /// Add padding by rounding up 'total_size_of_aggregate_states' to be a multiplier of alignment_of_next_state.
@@ -774,6 +669,17 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
         }
     }
 
+    bool all_keys_are_numbers_or_strings = true;
+    for (size_t j = 0; j < params.keys_size; ++j)
+    {
+        if (!types_removed_nullable[j]->isValueRepresentedByNumber() && !isString(types_removed_nullable[j])
+            && !isFixedString(types_removed_nullable[j]))
+        {
+            all_keys_are_numbers_or_strings = false;
+            break;
+        }
+    }
+
     if (has_nullable_key)
     {
         /// Optimization for one key
@@ -832,8 +738,11 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
                 return AggregatedDataVariants::Type::low_cardinality_key_fixed_string;
         }
 
+        if (params.keys_size > 1 && all_keys_are_numbers_or_strings)
+            return AggregatedDataVariants::Type::nullable_prealloc_serialized;
+
         /// Fallback case.
-        return AggregatedDataVariants::Type::serialized;
+        return AggregatedDataVariants::Type::nullable_serialized;
     }
 
     /// No key has been found to be nullable.
@@ -857,7 +766,7 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
                 return AggregatedDataVariants::Type::low_cardinality_keys128;
             if (size_of_field == 32)
                 return AggregatedDataVariants::Type::low_cardinality_keys256;
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: low cardinality numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "LowCardinality numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
         }
 
         if (size_of_field == 1)
@@ -872,7 +781,7 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
             return AggregatedDataVariants::Type::keys128;
         if (size_of_field == 32)
             return AggregatedDataVariants::Type::keys256;
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
     }
 
     if (params.keys_size == 1 && isFixedString(types_removed_nullable[0]))
@@ -915,6 +824,9 @@ AggregatedDataVariants::Type Aggregator::chooseAggregationMethod()
             return AggregatedDataVariants::Type::key_string;
     }
 
+    if (params.keys_size > 1 && all_keys_are_numbers_or_strings)
+        return AggregatedDataVariants::Type::prealloc_serialized;
+
     return AggregatedDataVariants::Type::serialized;
 }
 
@@ -1104,30 +1016,30 @@ void NO_INLINE Aggregator::executeImpl(
         if (compiled_aggregate_functions_holder && !hasSparseArguments(aggregate_instructions))
         {
             if (prefetch)
-                executeImplBatch<false, true, true>(
-                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, all_keys_are_const, overflow_row);
+                executeImplBatch<true>(
+                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, false, all_keys_are_const, true, overflow_row);
             else
-                executeImplBatch<false, true, false>(
-                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, all_keys_are_const, overflow_row);
+                executeImplBatch<false>(
+                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, false, all_keys_are_const, true, overflow_row);
         }
         else
 #endif
         {
             if (prefetch)
-                executeImplBatch<false, false, true>(
-                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, all_keys_are_const, overflow_row);
+                executeImplBatch<true>(
+                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, false, all_keys_are_const, false, overflow_row);
             else
-                executeImplBatch<false, false, false>(
-                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, all_keys_are_const, overflow_row);
+                executeImplBatch<false>(
+                    method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, false, all_keys_are_const, false, overflow_row);
         }
     }
     else
     {
-        executeImplBatch<true, false, false>(method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, all_keys_are_const, overflow_row);
+        executeImplBatch<false>(method, state, aggregates_pool, row_begin, row_end, aggregate_instructions, true, all_keys_are_const, false, overflow_row);
     }
 }
 
-template <bool no_more_keys, bool use_compiled_functions, bool prefetch, typename Method, typename State>
+template <bool prefetch, typename Method, typename State>
 void NO_INLINE Aggregator::executeImplBatch(
     Method & method,
     State & state,
@@ -1135,19 +1047,21 @@ void NO_INLINE Aggregator::executeImplBatch(
     size_t row_begin,
     size_t row_end,
     AggregateFunctionInstruction * aggregate_instructions,
+    bool no_more_keys,
     bool all_keys_are_const,
+    bool use_compiled_functions [[maybe_unused]],
     AggregateDataPtr overflow_row) const
 {
     using KeyHolder = decltype(state.getKeyHolder(0, std::declval<Arena &>()));
 
     /// During processing of row #i we will prefetch HashTable cell for row #(i + prefetch_look_ahead).
     PrefetchingHelper prefetching;
-    size_t prefetch_look_ahead = prefetching.getInitialLookAheadValue();
+    size_t prefetch_look_ahead = PrefetchingHelper::getInitialLookAheadValue();
 
     /// Optimization for special case when there are no aggregate functions.
     if (params.aggregates_size == 0)
     {
-        if constexpr (no_more_keys)
+        if (no_more_keys)
             return;
 
         /// This pointer is unused, but the logic will compare it for nullptr to check if the cell is set.
@@ -1163,7 +1077,7 @@ void NO_INLINE Aggregator::executeImplBatch(
             {
                 if constexpr (prefetch && HasPrefetchMemberFunc<decltype(method.data), KeyHolder>)
                 {
-                    if (i == row_begin + prefetching.iterationsToMeasure())
+                    if (i == row_begin + PrefetchingHelper::iterationsToMeasure())
                         prefetch_look_ahead = prefetching.calcPrefetchLookAhead();
 
                     if (i + prefetch_look_ahead < row_end)
@@ -1180,38 +1094,42 @@ void NO_INLINE Aggregator::executeImplBatch(
     }
 
     /// Optimization for special case when aggregating by 8bit key.
-    if constexpr (!no_more_keys && std::is_same_v<Method, typename decltype(AggregatedDataVariants::key8)::element_type>)
+    if (!no_more_keys)
     {
-        /// We use another method if there are aggregate functions with -Array combinator.
-        bool has_arrays = false;
-        for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
-        {
-            if (inst->offsets)
-            {
-                has_arrays = true;
-                break;
-            }
-        }
-
-        if (!has_arrays && !hasSparseArguments(aggregate_instructions) && !all_keys_are_const)
+        if constexpr (std::is_same_v<Method, typename decltype(AggregatedDataVariants::key8)::element_type>)
         {
+            /// We use another method if there are aggregate functions with -Array combinator.
+            bool has_arrays = false;
             for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
             {
-                inst->batch_that->addBatchLookupTable8(
-                    row_begin,
-                    row_end,
-                    reinterpret_cast<AggregateDataPtr *>(method.data.data()),
-                    inst->state_offset,
-                    [&](AggregateDataPtr & aggregate_data)
-                    {
-                        aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
-                        createAggregateStates(aggregate_data);
-                    },
-                    state.getKeyData(),
-                    inst->batch_arguments,
-                    aggregates_pool);
+                if (inst->offsets)
+                {
+                    has_arrays = true;
+                    break;
+                }
+            }
+
+            if (!has_arrays && !hasSparseArguments(aggregate_instructions) && !all_keys_are_const)
+            {
+                for (AggregateFunctionInstruction * inst = aggregate_instructions; inst->that; ++inst)
+                {
+                    inst->batch_that->addBatchLookupTable8(
+                        row_begin,
+                        row_end,
+                        reinterpret_cast<AggregateDataPtr *>(method.data.data()),
+                        inst->state_offset,
+                        [&](AggregateDataPtr & aggregate_data)
+                        {
+                            AggregateDataPtr place = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+                            createAggregateStates(place);
+                            aggregate_data = place;
+                        },
+                        state.getKeyData(),
+                        inst->batch_arguments,
+                        aggregates_pool);
+                }
+                return;
             }
-            return;
         }
     }
 
@@ -1237,15 +1155,15 @@ void NO_INLINE Aggregator::executeImplBatch(
     state.resetCache();
 
     /// For all rows.
-    for (size_t i = key_start; i < key_end; ++i)
+    if (!no_more_keys)
     {
-        AggregateDataPtr aggregate_data = nullptr;
-
-        if constexpr (!no_more_keys)
+        for (size_t i = key_start; i < key_end; ++i)
         {
+            AggregateDataPtr aggregate_data = nullptr;
+
             if constexpr (prefetch && HasPrefetchMemberFunc<decltype(method.data), KeyHolder>)
             {
-                if (i == key_start + prefetching.iterationsToMeasure())
+                if (i == key_start + PrefetchingHelper::iterationsToMeasure())
                     prefetch_look_ahead = prefetching.calcPrefetchLookAhead();
 
                 if (i + prefetch_look_ahead < row_end)
@@ -1266,7 +1184,7 @@ void NO_INLINE Aggregator::executeImplBatch(
                 aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
 
 #if USE_EMBEDDED_COMPILER
-                if constexpr (use_compiled_functions)
+                if (use_compiled_functions)
                 {
                     const auto & compiled_aggregate_functions = compiled_aggregate_functions_holder->compiled_aggregate_functions;
                     compiled_aggregate_functions.create_aggregate_states_function(aggregate_data);
@@ -1275,20 +1193,6 @@ void NO_INLINE Aggregator::executeImplBatch(
                         static constexpr bool skip_compiled_aggregate_functions = true;
                         createAggregateStates<skip_compiled_aggregate_functions>(aggregate_data);
                     }
-
-#if defined(MEMORY_SANITIZER)
-
-                    /// We compile only functions that do not allocate some data in Arena. Only store necessary state in AggregateData place.
-                    for (size_t aggregate_function_index = 0; aggregate_function_index < aggregate_functions.size(); ++aggregate_function_index)
-                    {
-                        if (!is_aggregate_function_compiled[aggregate_function_index])
-                            continue;
-
-                        auto aggregate_data_with_offset = aggregate_data + offsets_of_aggregate_states[aggregate_function_index];
-                        auto data_size = params.aggregates[aggregate_function_index].function->sizeOfData();
-                        __msan_unpoison(aggregate_data_with_offset, data_size);
-                    }
-#endif
                 }
                 else
 #endif
@@ -1302,28 +1206,52 @@ void NO_INLINE Aggregator::executeImplBatch(
                 aggregate_data = emplace_result.getMapped();
 
             assert(aggregate_data != nullptr);
+            places[i] = aggregate_data;
         }
-        else
+    }
+    else
+    {
+        for (size_t i = key_start; i < key_end; ++i)
         {
+            AggregateDataPtr aggregate_data = nullptr;
             /// Add only if the key already exists.
             auto find_result = state.findKey(method.data, i, *aggregates_pool);
             if (find_result.isFound())
-            {
                 aggregate_data = find_result.getMapped();
-            }
             else
-            {
                 aggregate_data = overflow_row;
-            }
+            places[i] = aggregate_data;
         }
-
-        places[i] = aggregate_data;
     }
 
+    executeAggregateInstructions(
+        aggregates_pool,
+        row_begin,
+        row_end,
+        aggregate_instructions,
+        places,
+        key_start,
+        state.hasOnlyOneValueSinceLastReset(),
+        all_keys_are_const,
+        use_compiled_functions);
+}
+
+void Aggregator::executeAggregateInstructions(
+    Arena * aggregates_pool,
+    size_t row_begin,
+    size_t row_end,
+    AggregateFunctionInstruction * aggregate_instructions,
+    const std::unique_ptr<AggregateDataPtr[]> &places,
+    size_t key_start,
+    bool has_only_one_value_since_last_reset,
+    bool all_keys_are_const,
+    bool use_compiled_functions [[maybe_unused]]) const
+{
 #if USE_EMBEDDED_COMPILER
-    if constexpr (use_compiled_functions)
+    if (use_compiled_functions)
     {
         std::vector<ColumnData> columns_data;
+        bool can_optimize_equal_keys_ranges = true;
 
         for (size_t i = 0; i < aggregate_functions.size(); ++i)
         {
@@ -1332,13 +1260,15 @@ void NO_INLINE Aggregator::executeImplBatch(
 
             AggregateFunctionInstruction * inst = aggregate_instructions + i;
             size_t arguments_size = inst->that->getArgumentTypes().size(); // NOLINT
+            can_optimize_equal_keys_ranges &= inst->can_optimize_equal_keys_ranges;
 
             for (size_t argument_index = 0; argument_index < arguments_size; ++argument_index)
                 columns_data.emplace_back(getColumnData(inst->batch_arguments[argument_index]));
         }
 
-        if (all_keys_are_const || (!no_more_keys && state.hasOnlyOneValueSinceLastReset()))
+        if (all_keys_are_const || (can_optimize_equal_keys_ranges && has_only_one_value_since_last_reset))
         {
+            ProfileEvents::increment(ProfileEvents::AggregationOptimizedEqualRangesOfKeys);
             auto add_into_aggregate_states_function_single_place = compiled_aggregate_functions_holder->compiled_aggregate_functions.add_into_aggregate_states_function_single_place;
             add_into_aggregate_states_function_single_place(row_begin, row_end, columns_data.data(), places[key_start]);
         }
@@ -1354,33 +1284,39 @@ void NO_INLINE Aggregator::executeImplBatch(
     for (size_t i = 0; i < aggregate_functions.size(); ++i)
     {
 #if USE_EMBEDDED_COMPILER
-        if constexpr (use_compiled_functions)
-            if (is_aggregate_function_compiled[i])
-                continue;
+        if (use_compiled_functions && is_aggregate_function_compiled[i])
+            continue;
 #endif
 
         AggregateFunctionInstruction * inst = aggregate_instructions + i;
 
-        if (all_keys_are_const || (!no_more_keys && state.hasOnlyOneValueSinceLastReset()))
+        if (all_keys_are_const || (inst->can_optimize_equal_keys_ranges && has_only_one_value_since_last_reset))
+        {
+            ProfileEvents::increment(ProfileEvents::AggregationOptimizedEqualRangesOfKeys);
             addBatchSinglePlace(row_begin, row_end, inst, places[key_start] + inst->state_offset, aggregates_pool);
+        }
         else
+        {
             addBatch(row_begin, row_end, inst, places.get(), aggregates_pool);
+        }
     }
+
 }
 
 
-template <bool use_compiled_functions>
 void NO_INLINE Aggregator::executeWithoutKeyImpl(
     AggregatedDataWithoutKey & res,
-    size_t row_begin, size_t row_end,
+    size_t row_begin,
+    size_t row_end,
     AggregateFunctionInstruction * aggregate_instructions,
-    Arena * arena) const
+    Arena * arena,
+    bool use_compiled_functions [[maybe_unused]]) const
 {
     if (row_begin == row_end)
         return;
 
 #if USE_EMBEDDED_COMPILER
-    if constexpr (use_compiled_functions)
+    if (use_compiled_functions)
     {
         std::vector<ColumnData> columns_data;
 
@@ -1400,20 +1336,6 @@ void NO_INLINE Aggregator::executeWithoutKeyImpl(
 
         auto add_into_aggregate_states_function_single_place = compiled_aggregate_functions_holder->compiled_aggregate_functions.add_into_aggregate_states_function_single_place;
         add_into_aggregate_states_function_single_place(row_begin, row_end, columns_data.data(), res);
-
-#if defined(MEMORY_SANITIZER)
-
-        /// We compile only functions that do not allocate some data in Arena. Only store necessary state in AggregateData place.
-        for (size_t aggregate_function_index = 0; aggregate_function_index < aggregate_functions.size(); ++aggregate_function_index)
-        {
-            if (!is_aggregate_function_compiled[aggregate_function_index])
-                continue;
-
-            auto aggregate_data_with_offset = res + offsets_of_aggregate_states[aggregate_function_index];
-            auto data_size = params.aggregates[aggregate_function_index].function->sizeOfData();
-            __msan_unpoison(aggregate_data_with_offset, data_size);
-        }
-#endif
     }
 #endif
 
@@ -1421,13 +1343,10 @@ void NO_INLINE Aggregator::executeWithoutKeyImpl(
     for (size_t i = 0; i < aggregate_functions.size(); ++i)
     {
         AggregateFunctionInstruction * inst = aggregate_instructions + i;
-
 #if USE_EMBEDDED_COMPILER
-        if constexpr (use_compiled_functions)
-            if (is_aggregate_function_compiled[i])
-                continue;
+        if (use_compiled_functions && is_aggregate_function_compiled[i])
+            continue;
 #endif
-
         addBatchSinglePlace(row_begin, row_end, inst, res + inst->state_offset, arena);
     }
 }
@@ -1515,13 +1434,14 @@ void NO_INLINE Aggregator::mergeOnIntervalWithoutKey(
     AggregatedDataVariants & data_variants,
     size_t row_begin,
     size_t row_end,
-    const AggregateColumnsConstData & aggregate_columns_data) const
+    const AggregateColumnsConstData & aggregate_columns_data,
+    std::atomic<bool> & is_cancelled) const
 {
     /// `data_variants` will destroy the states of aggregate functions in the destructor
     data_variants.aggregator = this;
     data_variants.init(AggregatedDataVariants::Type::without_key);
 
-    mergeWithoutKeyStreamsImpl(data_variants, row_begin, row_end, aggregate_columns_data);
+    mergeWithoutKeyStreamsImpl(data_variants, row_begin, row_end, aggregate_columns_data, is_cancelled);
 }
 
 
@@ -1570,6 +1490,7 @@ void Aggregator::prepareAggregateInstructions(
         }
 
         aggregate_functions_instructions[i].has_sparse_arguments = has_sparse_arguments;
+        aggregate_functions_instructions[i].can_optimize_equal_keys_ranges = aggregate_functions[i]->canOptimizeEqualKeysRanges();
         aggregate_functions_instructions[i].arguments = aggregate_columns[i].data();
         aggregate_functions_instructions[i].state_offset = offsets_of_aggregate_states[i];
 
@@ -1686,16 +1607,14 @@ bool Aggregator::executeOnBlock(Columns columns,
     if (result.type == AggregatedDataVariants::Type::without_key)
     {
         /// TODO: Enable compilation after investigation
-// #if USE_EMBEDDED_COMPILER
-//         if (compiled_aggregate_functions_holder)
-//         {
-//             executeWithoutKeyImpl<true>(result.without_key, row_begin, row_end, aggregate_functions_instructions.data(), result.aggregates_pool);
-//         }
-//         else
-// #endif
-        {
-            executeWithoutKeyImpl<false>(result.without_key, row_begin, row_end, aggregate_functions_instructions.data(), result.aggregates_pool);
-        }
+        bool use_compiled_functions = false;
+        executeWithoutKeyImpl(
+            result.without_key,
+            row_begin,
+            row_end,
+            aggregate_functions_instructions.data(),
+            result.aggregates_pool,
+            use_compiled_functions);
     }
     else
     {
@@ -1796,8 +1715,8 @@ void Aggregator::writeToTemporaryFile(AggregatedDataVariants & data_variants, si
         rows,
         ReadableSize(uncompressed_size),
         ReadableSize(compressed_size),
-        static_cast<double>(uncompressed_size) / rows,
-        static_cast<double>(compressed_size) / rows,
+        rows ? static_cast<double>(uncompressed_size) / rows : 0.0,
+        rows ? static_cast<double>(compressed_size) / rows : 0.0,
         static_cast<double>(uncompressed_size) / compressed_size,
         static_cast<double>(rows) / elapsed_seconds,
         ReadableSize(static_cast<double>(uncompressed_size) / elapsed_seconds),
@@ -1814,8 +1733,14 @@ Block Aggregator::convertOneBucketToBlock(
 {
     // Used in ConvertingAggregatedToChunksSource -> ConvertingAggregatedToChunksTransform (expects single chunk for each bucket_id).
     constexpr bool return_single_block = true;
-    Block block = convertToBlockImpl<return_single_block>(
-        method, method.data.impls[bucket], arena, data_variants.aggregates_pools, final, method.data.impls[bucket].size());
+    Block block = std::get<Block>(convertToBlockImpl(
+        method,
+        method.data.impls[bucket],
+        arena,
+        data_variants.aggregates_pools,
+        final,
+        method.data.impls[bucket].size(),
+        return_single_block));
 
     block.info.bucket_num = static_cast<int>(bucket);
     return block;
@@ -1826,7 +1751,7 @@ Block Aggregator::mergeAndConvertOneBucketToBlock(
     Arena * arena,
     bool final,
     Int32 bucket,
-    std::atomic<bool> * is_cancelled) const
+    std::atomic<bool> & is_cancelled) const
 {
     auto & merged_data = *variants[0];
     auto method = merged_data.type;
@@ -1836,8 +1761,8 @@ Block Aggregator::mergeAndConvertOneBucketToBlock(
 #define M(NAME) \
     else if (method == AggregatedDataVariants::Type::NAME) \
     { \
-        mergeBucketImpl<decltype(merged_data.NAME)::element_type>(variants, bucket, arena); \
-        if (is_cancelled && is_cancelled->load(std::memory_order_seq_cst)) \
+        mergeBucketImpl<decltype(merged_data.NAME)::element_type>(variants, bucket, arena, is_cancelled); \
+        if (is_cancelled.load(std::memory_order_seq_cst)) \
             return {}; \
         block = convertOneBucketToBlock(merged_data, *merged_data.NAME, arena, final, bucket); \
     }
@@ -1935,35 +1860,32 @@ bool Aggregator::checkLimits(size_t result_size, bool & no_more_keys) const
 }
 
 
-template <bool return_single_block, typename Method, typename Table>
-Aggregator::ConvertToBlockRes<return_single_block>
-Aggregator::convertToBlockImpl(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, bool final, size_t rows) const
+template <typename Method, typename Table>
+Aggregator::ConvertToBlockResVariant
+Aggregator::convertToBlockImpl(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, bool final,size_t rows, bool return_single_block) const
 {
     if (data.empty())
     {
         auto && out_cols = prepareOutputBlockColumns(params, aggregate_functions, getHeader(final), aggregates_pools, final, rows);
-        return {finalizeBlock(params, getHeader(final), std::move(out_cols), final, rows)};
+        auto finalized_block = finalizeBlock(params, getHeader(final), std::move(out_cols), final, rows);
+
+        if (return_single_block)
+            return std::move(finalized_block);
+
+        return BlocksList{std::move(finalized_block)};
     }
-
-    ConvertToBlockRes<return_single_block> res;
-
+    ConvertToBlockResVariant res;
+    bool use_compiled_functions = false;
     if (final)
     {
 #if USE_EMBEDDED_COMPILER
-        if (compiled_aggregate_functions_holder)
-        {
-            static constexpr bool use_compiled_functions = !Method::low_cardinality_optimization;
-            res = convertToBlockImplFinal<Method, use_compiled_functions, return_single_block>(method, data, arena, aggregates_pools, rows);
-        }
-        else
+        use_compiled_functions = compiled_aggregate_functions_holder != nullptr && !Method::low_cardinality_optimization;
 #endif
-        {
-            res = convertToBlockImplFinal<Method, false, return_single_block>(method, data, arena, aggregates_pools, rows);
-        }
+        res = convertToBlockImplFinal<Method>(method, data, arena, aggregates_pools, use_compiled_functions, return_single_block);
     }
     else
     {
-        res = convertToBlockImplNotFinal<return_single_block>(method, data, aggregates_pools, rows);
+        res = convertToBlockImplNotFinal(method, data, aggregates_pools, rows, return_single_block);
     }
 
     /// In order to release memory early.
@@ -2041,8 +1963,12 @@ inline void Aggregator::insertAggregatesIntoColumns(Mapped & mapped, MutableColu
 }
 
 
-template <bool use_compiled_functions>
-Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena, bool has_null_key_data [[maybe_unused]]) const
+Block Aggregator::insertResultsIntoColumns(
+    PaddedPODArray<AggregateDataPtr> & places,
+    OutputBlockColumns && out_cols,
+    Arena * arena,
+    bool has_null_key_data [[maybe_unused]],
+    bool use_compiled_functions [[maybe_unused]]) const
 {
     std::exception_ptr exception;
     size_t aggregate_functions_destroy_index = 0;
@@ -2050,7 +1976,7 @@ Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & pl
     try
     {
 #if USE_EMBEDDED_COMPILER
-        if constexpr (use_compiled_functions)
+        if (use_compiled_functions)
         {
             /** For JIT compiled functions we need to resize columns before pass them into compiled code.
               * insert_aggregates_into_columns_function function does not throw exception.
@@ -2080,14 +2006,13 @@ Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & pl
 
         for (; aggregate_functions_destroy_index < params.aggregates_size;)
         {
-            if constexpr (use_compiled_functions)
+#if USE_EMBEDDED_COMPILER
+            if (use_compiled_functions && is_aggregate_function_compiled[aggregate_functions_destroy_index])
             {
-                if (is_aggregate_function_compiled[aggregate_functions_destroy_index])
-                {
-                    ++aggregate_functions_destroy_index;
-                    continue;
-                }
+                ++aggregate_functions_destroy_index;
+                continue;
             }
+#endif
 
             auto & final_aggregate_column = out_cols.final_aggregate_columns[aggregate_functions_destroy_index];
             size_t offset = offsets_of_aggregate_states[aggregate_functions_destroy_index];
@@ -2109,14 +2034,13 @@ Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & pl
 
     for (; aggregate_functions_destroy_index < params.aggregates_size; ++aggregate_functions_destroy_index)
     {
-        if constexpr (use_compiled_functions)
+#if USE_EMBEDDED_COMPILER
+        if (use_compiled_functions && is_aggregate_function_compiled[aggregate_functions_destroy_index])
         {
-            if (is_aggregate_function_compiled[aggregate_functions_destroy_index])
-            {
-                ++aggregate_functions_destroy_index;
-                continue;
-            }
+            ++aggregate_functions_destroy_index;
+            continue;
         }
+#endif
 
         size_t offset = offsets_of_aggregate_states[aggregate_functions_destroy_index];
         aggregate_functions[aggregate_functions_destroy_index]->destroyBatch(0, places.size(), places.data(), offset);
@@ -2128,19 +2052,24 @@ Block Aggregator::insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & pl
     return finalizeBlock(params, getHeader(/* final */ true), std::move(out_cols), /* final */ true, places.size());
 }
 
-template <typename Method, bool use_compiled_functions, bool return_single_block, typename Table>
-Aggregator::ConvertToBlockRes<return_single_block> NO_INLINE
-Aggregator::convertToBlockImplFinal(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, size_t) const
+template <typename Method, typename Table>
+Aggregator::ConvertToBlockResVariant Aggregator::convertToBlockImplFinal(
+    Method & method,
+    Table & data,
+    Arena * arena,
+    Arenas & aggregates_pools,
+    bool use_compiled_functions [[maybe_unused]],
+    bool return_single_block) const
 {
     /// +1 for nullKeyData, if `data` doesn't have it - not a problem, just some memory for one excessive row will be preallocated
     const size_t max_block_size = (return_single_block ? data.size() : std::min(params.max_block_size, data.size())) + 1;
     const bool final = true;
-    ConvertToBlockRes<return_single_block> res;
 
     std::optional<OutputBlockColumns> out_cols;
     std::optional<Sizes> shuffled_key_sizes;
     PaddedPODArray<AggregateDataPtr> places;
     bool has_null_key_data = false;
+    BlocksList blocks;
 
     auto init_out_cols = [&]()
     {
@@ -2182,38 +2111,38 @@ Aggregator::convertToBlockImplFinal(Method & method, Table & data, Arena * arena
             /// Mark the cell as destroyed so it will not be destroyed in destructor.
             mapped = nullptr;
 
-            if constexpr (!return_single_block)
+            if (!return_single_block && places.size() >= max_block_size)
             {
-                if (places.size() >= max_block_size)
-                {
-                    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;
-                }
+                blocks.emplace_back(
+                    insertResultsIntoColumns(places, std::move(out_cols.value()), arena, has_null_key_data, use_compiled_functions));
+                places.clear();
+                out_cols.reset();
+                has_null_key_data = false;
             }
         });
 
-    if constexpr (return_single_block)
+    if (return_single_block)
     {
-        return insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena, has_null_key_data);
+        return insertResultsIntoColumns(places, std::move(out_cols.value()), arena, has_null_key_data, use_compiled_functions);
     }
     else
     {
         if (out_cols.has_value())
-            res.emplace_back(insertResultsIntoColumns<use_compiled_functions>(places, std::move(out_cols.value()), arena, has_null_key_data));
-        return res;
+        {
+            blocks.emplace_back(insertResultsIntoColumns(places, std::move(out_cols.value()), arena, has_null_key_data, use_compiled_functions));
+        }
+        return blocks;
     }
 }
 
-template <bool return_single_block, typename Method, typename Table>
-Aggregator::ConvertToBlockRes<return_single_block> NO_INLINE
-Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & aggregates_pools, size_t) const
+template <typename Method, typename Table>
+Aggregator::ConvertToBlockResVariant NO_INLINE
+Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & aggregates_pools, size_t, bool return_single_block) const
 {
     /// +1 for nullKeyData, if `data` doesn't have it - not a problem, just some memory for one excessive row will be preallocated
     const size_t max_block_size = (return_single_block ? data.size() : std::min(params.max_block_size, data.size())) + 1;
     const bool final = false;
-    ConvertToBlockRes<return_single_block> res;
+    BlocksList res_blocks;
 
     std::optional<OutputBlockColumns> out_cols;
     std::optional<Sizes> shuffled_key_sizes;
@@ -2243,7 +2172,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();
-
     data.forEachValue(
         [&](const auto & key, auto & mapped)
         {
@@ -2260,29 +2188,24 @@ Aggregator::convertToBlockImplNotFinal(Method & method, Table & data, Arenas & a
             mapped = nullptr;
 
             ++rows_in_current_block;
-
-            if constexpr (!return_single_block)
+            if (!return_single_block && rows_in_current_block >= max_block_size)
             {
-                if (rows_in_current_block >= max_block_size)
-                {
-                    res.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols.value()), final, rows_in_current_block));
-                    out_cols.reset();
-                    rows_in_current_block = 0;
-                }
+                res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols.value()), final, rows_in_current_block));
+                out_cols.reset();
+                rows_in_current_block = 0;
             }
         });
 
-    if constexpr (return_single_block)
+    if (return_single_block)
     {
         return finalizeBlock(params, getHeader(final), std::move(out_cols).value(), final, rows_in_current_block);
     }
     else
     {
         if (rows_in_current_block)
-            res.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols).value(), final, rows_in_current_block));
-        return res;
+            res_blocks.emplace_back(finalizeBlock(params, getHeader(final), std::move(out_cols).value(), final, rows_in_current_block));
+        return res_blocks;
     }
-    return res;
 }
 
 void Aggregator::addSingleKeyToAggregateColumns(
@@ -2388,18 +2311,23 @@ template <bool return_single_block>
 Aggregator::ConvertToBlockRes<return_single_block>
 Aggregator::prepareBlockAndFillSingleLevel(AggregatedDataVariants & data_variants, bool final) const
 {
+    ConvertToBlockResVariant res_variant;
     const size_t rows = data_variants.sizeWithoutOverflowRow();
 #define M(NAME) \
     else if (data_variants.type == AggregatedDataVariants::Type::NAME) \
     { \
-        return convertToBlockImpl<return_single_block>( \
-            *data_variants.NAME, data_variants.NAME->data, data_variants.aggregates_pool, data_variants.aggregates_pools, final, rows); \
+        res_variant = convertToBlockImpl( \
+            *data_variants.NAME, data_variants.NAME->data, data_variants.aggregates_pool, data_variants.aggregates_pools, final, rows, return_single_block); \
     }
 
     if (false) {} // NOLINT
     APPLY_FOR_VARIANTS_SINGLE_LEVEL(M)
 #undef M
     else throw Exception(ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT, "Unknown aggregated data variant.");
+    if constexpr (return_single_block)
+        return std::get<Block>(res_variant);
+    else
+        return std::get<BlocksList>(res_variant);
 }
 
 
@@ -2525,7 +2453,7 @@ BlocksList Aggregator::convertToBlocks(AggregatedDataVariants & data_variants, b
     if (data_variants.type != AggregatedDataVariants::Type::without_key)
     {
         if (!data_variants.isTwoLevel())
-            blocks.splice(blocks.end(), prepareBlockAndFillSingleLevel</* return_single_block */ false>(data_variants, final));
+            blocks.splice(blocks.end(), prepareBlockAndFillSingleLevel<false>(data_variants, final));
         else
             blocks.splice(blocks.end(), prepareBlocksAndFillTwoLevel(data_variants, final, thread_pool.get()));
     }
@@ -2591,8 +2519,9 @@ 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
+template <typename Method, typename Table>
+void NO_INLINE Aggregator::mergeDataImpl(
+    Table & table_dst, Table & table_src, Arena * arena, bool use_compiled_functions [[maybe_unused]], bool prefetch) const
 {
     if constexpr (Method::low_cardinality_optimization || Method::one_key_nullable_optimization)
         mergeDataNullKey<Method, Table>(table_dst, table_src, arena);
@@ -2615,11 +2544,14 @@ void NO_INLINE Aggregator::mergeDataImpl(Table & table_dst, Table & table_src, A
         src = nullptr;
     };
 
-    table_src.template mergeToViaEmplace<decltype(merge), prefetch>(table_dst, std::move(merge));
+    if (prefetch)
+        table_src.template mergeToViaEmplace<decltype(merge), true>(table_dst, std::move(merge));
+    else
+        table_src.template mergeToViaEmplace<decltype(merge), false>(table_dst, std::move(merge));
     table_src.clearAndShrink();
 
 #if USE_EMBEDDED_COMPILER
-    if constexpr (use_compiled_functions)
+    if (use_compiled_functions)
     {
         const auto & compiled_functions = compiled_aggregate_functions_holder->compiled_aggregate_functions;
         compiled_functions.merge_aggregate_states_function(dst_places.data(), src_places.data(), dst_places.size());
@@ -2704,7 +2636,8 @@ void NO_INLINE Aggregator::mergeDataOnlyExistingKeysImpl(
 
 
 void NO_INLINE Aggregator::mergeWithoutKeyDataImpl(
-    ManyAggregatedDataVariants & non_empty_data) const
+    ManyAggregatedDataVariants & non_empty_data,
+    std::atomic<bool> & is_cancelled) const
 {
     ThreadPool thread_pool{CurrentMetrics::AggregatorThreads, CurrentMetrics::AggregatorThreadsActive, CurrentMetrics::AggregatorThreadsScheduled, params.max_threads};
 
@@ -2720,7 +2653,7 @@ void NO_INLINE Aggregator::mergeWithoutKeyDataImpl(
             for (size_t result_num = 0; result_num < size; ++result_num)
                 data_vec.emplace_back(non_empty_data[result_num]->without_key + offsets_of_aggregate_states[i]);
 
-            aggregate_functions[i]->parallelizeMergePrepare(data_vec, thread_pool);
+            aggregate_functions[i]->parallelizeMergePrepare(data_vec, thread_pool, is_cancelled);
         }
     }
 
@@ -2736,6 +2669,7 @@ void NO_INLINE Aggregator::mergeWithoutKeyDataImpl(
                     res_data + offsets_of_aggregate_states[i],
                     current_data + offsets_of_aggregate_states[i],
                     thread_pool,
+                    is_cancelled,
                     res->aggregates_pool);
             else
                 aggregate_functions[i]->merge(
@@ -2772,22 +2706,14 @@ void NO_INLINE Aggregator::mergeSingleLevelDataImpl(
 #if USE_EMBEDDED_COMPILER
             if (compiled_aggregate_functions_holder)
             {
-                if (prefetch)
-                    mergeDataImpl<Method, true, true>(
-                        getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool);
-                else
-                    mergeDataImpl<Method, true, false>(
-                        getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool);
+                mergeDataImpl<Method>(
+                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, true, prefetch);
             }
             else
 #endif
             {
-                if (prefetch)
-                    mergeDataImpl<Method, false, true>(
-                        getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool);
-                else
-                    mergeDataImpl<Method, false, false>(
-                        getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool);
+                mergeDataImpl<Method>(
+                    getDataVariant<Method>(*res).data, getDataVariant<Method>(current).data, res->aggregates_pool, false, prefetch);
             }
         }
         else if (res->without_key)
@@ -2819,7 +2745,7 @@ void NO_INLINE Aggregator::mergeSingleLevelDataImpl(
 
 template <typename Method>
 void NO_INLINE Aggregator::mergeBucketImpl(
-    ManyAggregatedDataVariants & data, Int32 bucket, Arena * arena, std::atomic<bool> * is_cancelled) const
+    ManyAggregatedDataVariants & data, Int32 bucket, Arena * arena, std::atomic<bool> & is_cancelled) const
 {
     /// We merge all aggregation results to the first.
     AggregatedDataVariantsPtr & res = data[0];
@@ -2829,29 +2755,25 @@ void NO_INLINE Aggregator::mergeBucketImpl(
 
     for (size_t result_num = 1, size = data.size(); result_num < size; ++result_num)
     {
-        if (is_cancelled && is_cancelled->load(std::memory_order_seq_cst))
+        if (is_cancelled.load(std::memory_order_seq_cst))
             return;
 
         AggregatedDataVariants & current = *data[result_num];
 #if USE_EMBEDDED_COMPILER
         if (compiled_aggregate_functions_holder)
         {
-            if (prefetch)
-                mergeDataImpl<Method, true, true>(
-                    getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena);
-            else
-                mergeDataImpl<Method, true, false>(
-                    getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena);
+            mergeDataImpl<Method>(
+                getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena, true, prefetch);
         }
         else
 #endif
         {
-            if (prefetch)
-                mergeDataImpl<Method, false, true>(
-                    getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena);
-            else
-                mergeDataImpl<Method, false, false>(
-                    getDataVariant<Method>(*res).data.impls[bucket], getDataVariant<Method>(current).data.impls[bucket], arena);
+            mergeDataImpl<Method>(
+                getDataVariant<Method>(*res).data.impls[bucket],
+                getDataVariant<Method>(current).data.impls[bucket],
+                arena,
+                false,
+                prefetch);
         }
     }
 }
@@ -2920,11 +2842,12 @@ ManyAggregatedDataVariants Aggregator::prepareVariantsToMerge(ManyAggregatedData
     return non_empty_data;
 }
 
-template <bool no_more_keys, typename State, typename Table>
+template <typename State, typename Table>
 void NO_INLINE Aggregator::mergeStreamsImplCase(
     Arena * aggregates_pool,
     State & state,
     Table & data,
+    bool no_more_keys,
     AggregateDataPtr overflow_row,
     size_t row_begin,
     size_t row_end,
@@ -2936,36 +2859,34 @@ void NO_INLINE Aggregator::mergeStreamsImplCase(
     if (!arena_for_keys)
         arena_for_keys = aggregates_pool;
 
-    for (size_t i = row_begin; i < row_end; ++i)
+    if (no_more_keys)
     {
-        AggregateDataPtr aggregate_data = nullptr;
-
-        if constexpr (!no_more_keys)
+        for (size_t i = row_begin; i < row_end; i++)
         {
-            auto emplace_result = state.emplaceKey(data, i, *arena_for_keys); // NOLINT
-            if (emplace_result.isInserted())
+            auto find_result = state.findKey(data, i, *arena_for_keys);
+            /// aggregate_date == nullptr means that the new key did not fit in the hash table because of no_more_keys.
+            AggregateDataPtr value = find_result.isFound() ? find_result.getMapped() : overflow_row;
+            places[i] = value;
+        }
+    }
+    else
+    {
+        for (size_t i = row_begin; i < row_end; i++)
+        {
+            auto emplace_result = state.emplaceKey(data, i, *arena_for_keys);
+            if (!emplace_result.isInserted())
+                places[i] = emplace_result.getMapped();
+            else
             {
                 emplace_result.setMapped(nullptr);
 
-                aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
+                AggregateDataPtr aggregate_data = aggregates_pool->alignedAlloc(total_size_of_aggregate_states, align_aggregate_states);
                 createAggregateStates(aggregate_data);
 
                 emplace_result.setMapped(aggregate_data);
+                places[i] = aggregate_data;
             }
-            else
-                aggregate_data = emplace_result.getMapped();
         }
-        else
-        {
-            auto find_result = state.findKey(data, i, *arena_for_keys);
-            if (find_result.isFound())
-                aggregate_data = find_result.getMapped();
-        }
-
-        /// aggregate_date == nullptr means that the new key did not fit in the hash table because of no_more_keys.
-
-        AggregateDataPtr value = aggregate_data ? aggregate_data : overflow_row;
-        places[i] = value;
     }
 
     for (size_t j = 0; j < params.aggregates_size; ++j)
@@ -3019,40 +2940,38 @@ void NO_INLINE Aggregator::mergeStreamsImpl(
     if (use_cache)
     {
         typename Method::State state(key_columns, key_sizes, aggregation_state_cache);
-
-        if (!no_more_keys)
-            mergeStreamsImplCase<false>(aggregates_pool, state, data, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
-        else
-            mergeStreamsImplCase<true>(aggregates_pool, state, data, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
+        mergeStreamsImplCase(
+            aggregates_pool, state, data, no_more_keys, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
 
         consecutive_keys_cache_stats.update(row_end - row_begin, state.getCacheMissesSinceLastReset());
     }
     else
     {
         typename Method::StateNoCache state(key_columns, key_sizes, aggregation_state_cache);
-
-        if (!no_more_keys)
-            mergeStreamsImplCase<false>(aggregates_pool, state, data, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
-        else
-            mergeStreamsImplCase<true>(aggregates_pool, state, data, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
+        mergeStreamsImplCase(
+            aggregates_pool, state, data, no_more_keys, overflow_row, row_begin, row_end, aggregate_columns_data, arena_for_keys);
     }
 }
 
 
 void NO_INLINE Aggregator::mergeBlockWithoutKeyStreamsImpl(
     Block block,
-    AggregatedDataVariants & result) const
+    AggregatedDataVariants & result,
+    std::atomic<bool> & is_cancelled) const
 {
     AggregateColumnsConstData aggregate_columns = params.makeAggregateColumnsData(block);
-    mergeWithoutKeyStreamsImpl(result, 0, block.rows(), aggregate_columns);
+    mergeWithoutKeyStreamsImpl(result, 0, block.rows(), aggregate_columns, is_cancelled);
 }
 
 void NO_INLINE Aggregator::mergeWithoutKeyStreamsImpl(
     AggregatedDataVariants & result,
     size_t row_begin,
     size_t row_end,
-    const AggregateColumnsConstData & aggregate_columns_data) const
+    const AggregateColumnsConstData & aggregate_columns_data,
+    std::atomic<bool> & is_cancelled) const
 {
+    using namespace CurrentMetrics;
+
     AggregatedDataWithoutKey & res = result.without_key;
     if (!res)
     {
@@ -3061,16 +2980,31 @@ void NO_INLINE Aggregator::mergeWithoutKeyStreamsImpl(
         res = place;
     }
 
+    ThreadPool thread_pool{AggregatorThreads, AggregatorThreadsActive, AggregatorThreadsScheduled, params.max_threads};
+
     for (size_t row = row_begin; row < row_end; ++row)
     {
         /// Adding Values
         for (size_t i = 0; i < params.aggregates_size; ++i)
-            aggregate_functions[i]->merge(res + offsets_of_aggregate_states[i], (*aggregate_columns_data[i])[row], result.aggregates_pool);
+        {
+            if (aggregate_functions[i]->isParallelizeMergePrepareNeeded())
+            {
+                std::vector<AggregateDataPtr> data_vec{res + offsets_of_aggregate_states[i], (*aggregate_columns_data[i])[row]};
+                aggregate_functions[i]->parallelizeMergePrepare(data_vec, thread_pool, is_cancelled);
+            }
+
+            if (aggregate_functions[i]->isAbleToParallelizeMerge())
+                aggregate_functions[i]->merge(
+                    res + offsets_of_aggregate_states[i], (*aggregate_columns_data[i])[row], thread_pool, is_cancelled, result.aggregates_pool);
+            else
+                aggregate_functions[i]->merge(
+                    res + offsets_of_aggregate_states[i], (*aggregate_columns_data[i])[row], result.aggregates_pool);
+        }
     }
 }
 
 
-bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const
+bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys, std::atomic<bool> & is_cancelled) const
 {
     /// `result` will destroy the states of aggregate functions in the destructor
     result.aggregator = this;
@@ -3092,7 +3026,7 @@ bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool
     }
 
     if (result.type == AggregatedDataVariants::Type::without_key || block.info.is_overflows)
-        mergeBlockWithoutKeyStreamsImpl(std::move(block), result);
+        mergeBlockWithoutKeyStreamsImpl(std::move(block), result, is_cancelled);
 #define M(NAME, IS_TWO_LEVEL) \
     else if (result.type == AggregatedDataVariants::Type::NAME) \
         mergeStreamsImpl(std::move(block), result.aggregates_pool, *result.NAME, result.NAME->data, result.without_key, result.consecutive_keys_cache_stats, no_more_keys);
@@ -3140,7 +3074,7 @@ bool Aggregator::mergeOnBlock(Block block, AggregatedDataVariants & result, bool
 }
 
 
-void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads)
+void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads, std::atomic<bool> & is_cancelled)
 {
     if (bucket_to_blocks.empty())
         return;
@@ -3253,7 +3187,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
                 break;
 
             if (result.type == AggregatedDataVariants::Type::without_key || block.info.is_overflows)
-                mergeBlockWithoutKeyStreamsImpl(std::move(block), result);
+                mergeBlockWithoutKeyStreamsImpl(std::move(block), result, is_cancelled);
 
         #define M(NAME, IS_TWO_LEVEL) \
             else if (result.type == AggregatedDataVariants::Type::NAME) \
@@ -3272,7 +3206,7 @@ void Aggregator::mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVari
 }
 
 
-Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
+Block Aggregator::mergeBlocks(BlocksList & blocks, bool final, std::atomic<bool> & is_cancelled)
 {
     if (blocks.empty())
         return {};
@@ -3290,12 +3224,15 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
     auto merge_method = method_chosen;
 
 #define APPLY_FOR_VARIANTS_THAT_MAY_USE_BETTER_HASH_FUNCTION(M) \
-        M(key64)            \
-        M(key_string)       \
-        M(key_fixed_string) \
-        M(keys128)          \
-        M(keys256)          \
-        M(serialized)       \
+        M(key64)                          \
+        M(key_string)                     \
+        M(key_fixed_string)               \
+        M(keys128)                        \
+        M(keys256)                        \
+        M(serialized)                     \
+        M(nullable_serialized)            \
+        M(prealloc_serialized)            \
+        M(nullable_prealloc_serialized)   \
 
 #define M(NAME) \
     if (merge_method == AggregatedDataVariants::Type::NAME) \
@@ -3331,7 +3268,7 @@ Block Aggregator::mergeBlocks(BlocksList & blocks, bool final)
             bucket_num = -1;
 
         if (result.type == AggregatedDataVariants::Type::without_key || is_overflows)
-            mergeBlockWithoutKeyStreamsImpl(std::move(block), result);
+            mergeBlockWithoutKeyStreamsImpl(std::move(block), result, is_cancelled);
 
 #define M(NAME, IS_TWO_LEVEL) \
     else if (result.type == AggregatedDataVariants::Type::NAME) \
@@ -3551,7 +3488,4 @@ void Aggregator::destroyAllAggregateStates(AggregatedDataVariants & result) cons
         throw Exception(ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT, "Unknown aggregated data variant.");
 }
 
-
-template Aggregator::ConvertToBlockRes<false>
-Aggregator::prepareBlockAndFillSingleLevel<false>(AggregatedDataVariants & data_variants, bool final) const;
 }
diff --git a/src/Interpreters/Aggregator.h b/src/Interpreters/Aggregator.h
index f4aa78043ca..406d28597cf 100644
--- a/src/Interpreters/Aggregator.h
+++ b/src/Interpreters/Aggregator.h
@@ -4,6 +4,7 @@
 #include <memory>
 #include <mutex>
 #include <type_traits>
+#include <variant>
 
 
 #include <base/StringRef.h>
@@ -38,963 +39,21 @@
 
 #include <Parsers/IAST_fwd.h>
 
+#include <Interpreters/AggregationMethod.h>
+#include <Interpreters/AggregatedData.h>
+#include <Interpreters/AggregatedDataVariants.h>
+
 namespace DB
 {
 
-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)
-  *  is acquired later - in `convertToBlocks` function, by the ColumnAggregateFunction object.
-  *
-  * Most data structures exist in two versions: normal and two-level (TwoLevel).
-  * A two-level hash table works a little slower with a small number of different keys,
-  *  but with a large number of different keys scales better, because it allows
-  *  parallelize some operations (merging, post-processing) in a natural way.
-  *
-  * To ensure efficient work over a wide range of conditions,
-  *  first single-level hash tables are used,
-  *  and when the number of different keys is large enough,
-  *  they are converted to two-level ones.
-  *
-  * PS. There are many different approaches to the effective implementation of parallel and distributed aggregation,
-  *  best suited for different cases, and this approach is just one of them, chosen for a combination of reasons.
-  */
-
-using AggregatedDataWithoutKey = AggregateDataPtr;
-
-using AggregatedDataWithUInt8Key = FixedImplicitZeroHashMapWithCalculatedSize<UInt8, AggregateDataPtr>;
-using AggregatedDataWithUInt16Key = FixedImplicitZeroHashMap<UInt16, AggregateDataPtr>;
-
-using AggregatedDataWithUInt32Key = HashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>>;
-using AggregatedDataWithUInt64Key = HashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>>;
-
-using AggregatedDataWithShortStringKey = StringHashMap<AggregateDataPtr>;
-
-using AggregatedDataWithStringKey = HashMapWithSavedHash<StringRef, AggregateDataPtr>;
-
-using AggregatedDataWithKeys128 = HashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
-using AggregatedDataWithKeys256 = HashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
-
-using AggregatedDataWithUInt32KeyTwoLevel = TwoLevelHashMap<UInt32, AggregateDataPtr, HashCRC32<UInt32>>;
-using AggregatedDataWithUInt64KeyTwoLevel = TwoLevelHashMap<UInt64, AggregateDataPtr, HashCRC32<UInt64>>;
-
-using AggregatedDataWithShortStringKeyTwoLevel = TwoLevelStringHashMap<AggregateDataPtr>;
-
-using AggregatedDataWithStringKeyTwoLevel = TwoLevelHashMapWithSavedHash<StringRef, AggregateDataPtr>;
-
-using AggregatedDataWithKeys128TwoLevel = TwoLevelHashMap<UInt128, AggregateDataPtr, UInt128HashCRC32>;
-using AggregatedDataWithKeys256TwoLevel = TwoLevelHashMap<UInt256, AggregateDataPtr, UInt256HashCRC32>;
-
-/** Variants with better hash function, using more than 32 bits for hash.
-  * Using for merging phase of external aggregation, where number of keys may be far greater than 4 billion,
-  *  but we keep in memory and merge only sub-partition of them simultaneously.
-  * TODO We need to switch for better hash function not only for external aggregation,
-  *  but also for huge aggregation results on machines with terabytes of RAM.
-  */
-
-using AggregatedDataWithUInt64KeyHash64 = HashMap<UInt64, AggregateDataPtr, DefaultHash<UInt64>>;
-using AggregatedDataWithStringKeyHash64 = HashMapWithSavedHash<StringRef, AggregateDataPtr, StringRefHash64>;
-using AggregatedDataWithKeys128Hash64 = HashMap<UInt128, AggregateDataPtr, UInt128Hash>;
-using AggregatedDataWithKeys256Hash64 = HashMap<UInt256, AggregateDataPtr, UInt256Hash>;
-
-template <typename Base>
-struct AggregationDataWithNullKey : public Base
-{
-    using Base::Base;
-
-    bool & hasNullKeyData() { return has_null_key_data; }
-    AggregateDataPtr & getNullKeyData() { return null_key_data; }
-    bool hasNullKeyData() const { return has_null_key_data; }
-    const AggregateDataPtr & getNullKeyData() const { return null_key_data; }
-    size_t size() const { return Base::size() + (has_null_key_data ? 1 : 0); }
-    bool empty() const { return Base::empty() && !has_null_key_data; }
-    void clear()
-    {
-        Base::clear();
-        has_null_key_data = false;
-    }
-    void clearAndShrink()
-    {
-        Base::clearAndShrink();
-        has_null_key_data = false;
-    }
-
-private:
-    bool has_null_key_data = false;
-    AggregateDataPtr null_key_data = nullptr;
-};
-
-template <typename Base>
-struct AggregationDataWithNullKeyTwoLevel : public Base
-{
-    using Base::Base;
-    using Base::impls;
-
-    AggregationDataWithNullKeyTwoLevel() = default;
-
-    template <typename Other>
-    explicit AggregationDataWithNullKeyTwoLevel(const Other & other) : Base(other)
-    {
-        impls[0].hasNullKeyData() = other.hasNullKeyData();
-        impls[0].getNullKeyData() = other.getNullKeyData();
-    }
-
-    bool & hasNullKeyData() { return impls[0].hasNullKeyData(); }
-    AggregateDataPtr & getNullKeyData() { return impls[0].getNullKeyData(); }
-    bool hasNullKeyData() const { return impls[0].hasNullKeyData(); }
-    const AggregateDataPtr & getNullKeyData() const { return impls[0].getNullKeyData(); }
-};
-
-template <typename ... Types>
-using HashTableWithNullKey = AggregationDataWithNullKey<HashMapTable<Types ...>>;
-template <typename ... Types>
-using StringHashTableWithNullKey = AggregationDataWithNullKey<StringHashMap<Types ...>>;
-
-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>>;
-
-using AggregatedDataWithNullableShortStringKeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
-        TwoLevelStringHashMap<AggregateDataPtr, HashTableAllocator, StringHashTableWithNullKey>>;
-
-using AggregatedDataWithNullableStringKeyTwoLevel = AggregationDataWithNullKeyTwoLevel<
-        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 nullable = false>
-struct AggregationMethodOneNumber
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodOneNumber() = default;
-
-    explicit AggregationMethodOneNumber(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodOneNumber(const Other & other) : data(other.data)
-    {
-    }
-
-    /// To use one `Method` in different threads, use different `State`.
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodOneNumber<
-        typename Data::value_type,
-        Mapped,
-        FieldType,
-        use_cache && consecutive_keys_optimization,
-        /*need_offset=*/ false,
-        nullable>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    /// 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 {}; }
-
-    // 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);
-        if constexpr (sizeof(FieldType) < sizeof(Key) && std::endian::native == std::endian::big)
-            column->insertRawData<sizeof(FieldType)>(key_holder + (sizeof(Key) - sizeof(FieldType)));
-        else
-            column->insertRawData<sizeof(FieldType)>(key_holder);
-    }
-};
-
-
-/// For the case where there is one string key.
-template <typename TData>
-struct AggregationMethodString
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodString() = default;
-
-    template <typename Other>
-    explicit AggregationMethodString(const Other & other) : data(other.data)
-    {
-    }
-
-    explicit AggregationMethodString(size_t size_hint) : data(size_hint) { }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, /*place_string_to_arena=*/ true, use_cache>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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<ColumnString *>(key_columns[0])->insertData(key.data, key.size);
-    }
-};
-
-
-/// Same as above but without cache
-template <typename TData, bool nullable = false>
-struct AggregationMethodStringNoCache
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodStringNoCache() = default;
-
-    explicit AggregationMethodStringNoCache(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodStringNoCache(const Other & other) : data(other.data)
-    {
-    }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodString<typename Data::value_type, Mapped, true, false, false, nullable>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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 &)
-    {
-        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);
-        }
-    }
-};
-
-
-/// For the case where there is one fixed-length string key.
-template <typename TData>
-struct AggregationMethodFixedString
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodFixedString() = default;
-
-    explicit AggregationMethodFixedString(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodFixedString(const Other & other) : data(other.data)
-    {
-    }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, /*place_string_to_arena=*/ true, use_cache>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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 &)
-    {
-        assert_cast<ColumnFixedString &>(*key_columns[0]).insertData(key.data, key.size);
-    }
-};
-
-/// Same as above but without cache
-template <typename TData, bool nullable = false>
-struct AggregationMethodFixedStringNoCache
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodFixedStringNoCache() = default;
-
-    explicit AggregationMethodFixedStringNoCache(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodFixedStringNoCache(const Other & other) : data(other.data)
-    {
-    }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodFixedString<typename Data::value_type, Mapped, true, false, false, nullable>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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 &)
-    {
-        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);
-        }
-    }
-};
-
-
-/// Single low cardinality column.
-template <typename SingleColumnMethod>
-struct AggregationMethodSingleLowCardinalityColumn : public SingleColumnMethod
-{
-    using Base = SingleColumnMethod;
-    using Data = typename Base::Data;
-    using Key = typename Base::Key;
-    using Mapped = typename Base::Mapped;
-    using Base::data;
-
-    template <bool use_cache>
-    using BaseStateImpl = typename Base::template StateImpl<use_cache>;
-
-    AggregationMethodSingleLowCardinalityColumn() = default;
-
-    template <typename Other>
-    explicit AggregationMethodSingleLowCardinalityColumn(const Other & other) : Base(other) {}
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodSingleLowCardinalityColumn<BaseStateImpl<use_cache>, Mapped, use_cache>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    static const bool low_cardinality_optimization = true;
-
-    std::optional<Sizes> shuffleKeyColumns(std::vector<IColumn *> &, const Sizes &) { return {}; }
-
-    static void insertKeyIntoColumns(const Key & key,
-         std::vector<IColumn *> & key_columns_low_cardinality, const Sizes & /*key_sizes*/)
-    {
-        auto * col = assert_cast<ColumnLowCardinality *>(key_columns_low_cardinality[0]);
-
-        if constexpr (std::is_same_v<Key, StringRef>)
-        {
-            col->insertData(key.data, key.size);
-        }
-        else
-        {
-            col->insertData(reinterpret_cast<const char *>(&key), sizeof(key));
-        }
-    }
-};
-
-
-/// For the case where all keys are of fixed length, and they fit in N (for example, 128) bits.
-template <typename TData, bool has_nullable_keys_ = false, bool has_low_cardinality_ = false, bool consecutive_keys_optimization = false>
-struct AggregationMethodKeysFixed
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-    static constexpr bool has_nullable_keys = has_nullable_keys_;
-    static constexpr bool has_low_cardinality = has_low_cardinality_;
-
-    Data data;
-
-    AggregationMethodKeysFixed() = default;
-
-    explicit AggregationMethodKeysFixed(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodKeysFixed(const Other & other) : data(other.data)
-    {
-    }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodKeysFixed<
-        typename Data::value_type,
-        Key,
-        Mapped,
-        has_nullable_keys,
-        has_low_cardinality,
-        use_cache && consecutive_keys_optimization>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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)
-    {
-        return State::shuffleKeyColumns(key_columns, key_sizes);
-    }
-
-    static void insertKeyIntoColumns(const Key & key, std::vector<IColumn *> & key_columns, const Sizes & key_sizes)
-    {
-        size_t keys_size = key_columns.size();
-
-        static constexpr auto bitmap_size = has_nullable_keys ? std::tuple_size<KeysNullMap<Key>>::value : 0;
-        /// In any hash key value, column values to be read start just after the bitmap, if it exists.
-        size_t pos = bitmap_size;
-
-        for (size_t i = 0; i < keys_size; ++i)
-        {
-            IColumn * observed_column;
-            ColumnUInt8 * null_map;
-
-            bool column_nullable = false;
-            if constexpr (has_nullable_keys)
-                column_nullable = isColumnNullable(*key_columns[i]);
-
-            /// If we have a nullable column, get its nested column and its null map.
-            if (column_nullable)
-            {
-                ColumnNullable & nullable_col = assert_cast<ColumnNullable &>(*key_columns[i]);
-                observed_column = &nullable_col.getNestedColumn();
-                null_map = assert_cast<ColumnUInt8 *>(&nullable_col.getNullMapColumn());
-            }
-            else
-            {
-                observed_column = key_columns[i];
-                null_map = nullptr;
-            }
-
-            bool is_null = false;
-            if (column_nullable)
-            {
-                /// The current column is nullable. Check if the value of the
-                /// corresponding key is nullable. Update the null map accordingly.
-                size_t bucket = i / 8;
-                size_t offset = i % 8;
-                UInt8 val = (reinterpret_cast<const UInt8 *>(&key)[bucket] >> offset) & 1;
-                null_map->insertValue(val);
-                is_null = val == 1;
-            }
-
-            if (has_nullable_keys && is_null)
-                observed_column->insertDefault();
-            else
-            {
-                size_t size = key_sizes[i];
-                size_t offset_to = pos;
-                if constexpr (std::endian::native == std::endian::big)
-                   offset_to = sizeof(Key) - size - pos;
-                observed_column->insertData(reinterpret_cast<const char *>(&key) + offset_to, size);
-                pos += size;
-            }
-        }
-    }
-};
-
-
-/** Aggregates by concatenating serialized key values.
-  * The serialized value differs in that it uniquely allows to deserialize it, having only the position with which it starts.
-  * That is, for example, for strings, it contains first the serialized length of the string, and then the bytes.
-  * Therefore, when aggregating by several strings, there is no ambiguity.
-  */
-template <typename TData>
-struct AggregationMethodSerialized
-{
-    using Data = TData;
-    using Key = typename Data::key_type;
-    using Mapped = typename Data::mapped_type;
-
-    Data data;
-
-    AggregationMethodSerialized() = default;
-
-    explicit AggregationMethodSerialized(size_t size_hint) : data(size_hint) { }
-
-    template <typename Other>
-    explicit AggregationMethodSerialized(const Other & other) : data(other.data)
-    {
-    }
-
-    template <bool use_cache>
-    using StateImpl = ColumnsHashing::HashMethodSerialized<typename Data::value_type, Mapped>;
-
-    using State = StateImpl<true>;
-    using StateNoCache = StateImpl<false>;
-
-    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 &)
-    {
-        const auto * pos = key.data;
-        for (auto & column : key_columns)
-            pos = column->deserializeAndInsertFromArena(pos);
-    }
-};
-
-
-class Aggregator;
-
 using ColumnsHashing::HashMethodContext;
 using ColumnsHashing::HashMethodContextPtr;
 using ColumnsHashing::LastElementCacheStats;
 
-struct AggregatedDataVariants : private boost::noncopyable
-{
-    /** Working with states of aggregate functions in the pool is arranged in the following (inconvenient) way:
-      * - when aggregating, states are created in the pool using IAggregateFunction::create (inside - `placement new` of arbitrary structure);
-      * - they must then be destroyed using IAggregateFunction::destroy (inside - calling the destructor of arbitrary structure);
-      * - if aggregation is complete, then, in the Aggregator::convertToBlocks function, pointers to the states of aggregate functions
-      *   are written to ColumnAggregateFunction; ColumnAggregateFunction "acquires ownership" of them, that is - calls `destroy` in its destructor.
-      * - if during the aggregation, before call to Aggregator::convertToBlocks, an exception was thrown,
-      *   then the states of aggregate functions must still be destroyed,
-      *   otherwise, for complex states (eg, AggregateFunctionUniq), there will be memory leaks;
-      * - in this case, to destroy states, the destructor calls Aggregator::destroyAggregateStates method,
-      *   but only if the variable aggregator (see below) is not nullptr;
-      * - that is, until you transfer ownership of the aggregate function states in the ColumnAggregateFunction, set the variable `aggregator`,
-      *   so that when an exception occurs, the states are correctly destroyed.
-      *
-      * PS. This can be corrected by making a pool that knows about which states of aggregate functions and in which order are put in it, and knows how to destroy them.
-      * But this can hardly be done simply because it is planned to put variable-length strings into the same pool.
-      * In this case, the pool will not be able to know with what offsets objects are stored.
-      */
-    const Aggregator * aggregator = nullptr;
-
-    size_t keys_size{};  /// Number of keys. NOTE do we need this field?
-    Sizes key_sizes;     /// Dimensions of keys, if keys of fixed length
-
-    /// Pools for states of aggregate functions. Ownership will be later transferred to ColumnAggregateFunction.
-    Arenas aggregates_pools;
-    Arena * aggregates_pool{};    /// The pool that is currently used for allocation.
-
-    /** Specialization for the case when there are no keys, and for keys not fitted into max_rows_to_group_by.
-      */
-    AggregatedDataWithoutKey without_key = nullptr;
-
-    /// Stats of a cache for consecutive keys optimization.
-    /// Stats can be used to disable the cache in case of a lot of misses.
-    LastElementCacheStats consecutive_keys_cache_stats;
-
-    // Disable consecutive key optimization for Uint8/16, because they use a FixedHashMap
-    // and the lookup there is almost free, so we don't need to cache the last lookup result
-    std::unique_ptr<AggregationMethodOneNumber<UInt8, AggregatedDataWithUInt8Key, false>>           key8;
-    std::unique_ptr<AggregationMethodOneNumber<UInt16, AggregatedDataWithUInt16Key, false>>         key16;
-
-    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64Key>>         key32;
-    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64Key>>         key64;
-    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithShortStringKey>>               key_string;
-    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKey>>          key_fixed_string;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt16Key, false, false, false>>  keys16;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt32Key>>                   keys32;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt64Key>>                   keys64;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128>>                   keys128;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256>>                   keys256;
-    std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKey>>                serialized;
-
-    std::unique_ptr<AggregationMethodOneNumber<UInt32, AggregatedDataWithUInt64KeyTwoLevel>> key32_two_level;
-    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyTwoLevel>> key64_two_level;
-    std::unique_ptr<AggregationMethodStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>>       key_string_two_level;
-    std::unique_ptr<AggregationMethodFixedStringNoCache<AggregatedDataWithShortStringKeyTwoLevel>>  key_fixed_string_two_level;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt32KeyTwoLevel>>           keys32_two_level;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithUInt64KeyTwoLevel>>           keys64_two_level;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel>>           keys128_two_level;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel>>           keys256_two_level;
-    std::unique_ptr<AggregationMethodSerialized<AggregatedDataWithStringKeyTwoLevel>>        serialized_two_level;
-
-    std::unique_ptr<AggregationMethodOneNumber<UInt64, AggregatedDataWithUInt64KeyHash64>>   key64_hash64;
-    std::unique_ptr<AggregationMethodString<AggregatedDataWithStringKeyHash64>>              key_string_hash64;
-    std::unique_ptr<AggregationMethodFixedString<AggregatedDataWithStringKeyHash64>>         key_fixed_string_hash64;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128Hash64>>             keys128_hash64;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256Hash64>>             keys256_hash64;
-    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;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, true>>     nullable_keys256_two_level;
-
-    /// Support for low cardinality.
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt8, AggregatedDataWithNullableUInt8Key, false>>> low_cardinality_key8;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt16, AggregatedDataWithNullableUInt16Key, false>>> low_cardinality_key16;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64Key>>> low_cardinality_key32;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64Key>>> low_cardinality_key64;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKey>>> low_cardinality_key_string;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKey>>> low_cardinality_key_fixed_string;
-
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt32, AggregatedDataWithNullableUInt64KeyTwoLevel>>> low_cardinality_key32_two_level;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodOneNumber<UInt64, AggregatedDataWithNullableUInt64KeyTwoLevel>>> low_cardinality_key64_two_level;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodString<AggregatedDataWithNullableStringKeyTwoLevel>>> low_cardinality_key_string_two_level;
-    std::unique_ptr<AggregationMethodSingleLowCardinalityColumn<AggregationMethodFixedString<AggregatedDataWithNullableStringKeyTwoLevel>>> low_cardinality_key_fixed_string_two_level;
-
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128, false, true>>      low_cardinality_keys128;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256, false, true>>      low_cardinality_keys256;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys128TwoLevel, false, true>> low_cardinality_keys128_two_level;
-    std::unique_ptr<AggregationMethodKeysFixed<AggregatedDataWithKeys256TwoLevel, false, true>> low_cardinality_keys256_two_level;
-
-    /// In this and similar macros, the option without_key is not considered.
-    #define APPLY_FOR_AGGREGATED_VARIANTS(M) \
-        M(key8,                       false) \
-        M(key16,                      false) \
-        M(key32,                      false) \
-        M(key64,                      false) \
-        M(key_string,                 false) \
-        M(key_fixed_string,           false) \
-        M(keys16,                    false) \
-        M(keys32,                    false) \
-        M(keys64,                    false) \
-        M(keys128,                    false) \
-        M(keys256,                    false) \
-        M(serialized,                 false) \
-        M(key32_two_level,            true) \
-        M(key64_two_level,            true) \
-        M(key_string_two_level,       true) \
-        M(key_fixed_string_two_level, true) \
-        M(keys32_two_level,          true) \
-        M(keys64_two_level,          true) \
-        M(keys128_two_level,          true) \
-        M(keys256_two_level,          true) \
-        M(serialized_two_level,       true) \
-        M(key64_hash64,               false) \
-        M(key_string_hash64,          false) \
-        M(key_fixed_string_hash64,    false) \
-        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) \
-        M(nullable_keys256_two_level, true) \
-        M(low_cardinality_key8, false) \
-        M(low_cardinality_key16, false) \
-        M(low_cardinality_key32, false) \
-        M(low_cardinality_key64, false) \
-        M(low_cardinality_keys128, false) \
-        M(low_cardinality_keys256, false) \
-        M(low_cardinality_key_string, false) \
-        M(low_cardinality_key_fixed_string, false) \
-        M(low_cardinality_key32_two_level, true) \
-        M(low_cardinality_key64_two_level, true) \
-        M(low_cardinality_keys128_two_level, true) \
-        M(low_cardinality_keys256_two_level, true) \
-        M(low_cardinality_key_string_two_level, true) \
-        M(low_cardinality_key_fixed_string_two_level, true) \
-
-    enum class Type
-    {
-        EMPTY = 0,
-        without_key,
-
-    #define M(NAME, IS_TWO_LEVEL) NAME,
-        APPLY_FOR_AGGREGATED_VARIANTS(M)
-    #undef M
-    };
-    Type type = Type::EMPTY;
-
-    AggregatedDataVariants() : aggregates_pools(1, std::make_shared<Arena>()), aggregates_pool(aggregates_pools.back().get()) {}
-    bool empty() const { return type == Type::EMPTY; }
-    void invalidate() { type = Type::EMPTY; }
-
-    ~AggregatedDataVariants();
-
-    void init(Type type_, std::optional<size_t> size_hint = std::nullopt);
-
-    /// Number of rows (different keys).
-    size_t size() const
-    {
-        switch (type)
-        {
-            case Type::EMPTY:       return 0;
-            case Type::without_key: return 1;
-
-        #define M(NAME, IS_TWO_LEVEL) \
-            case Type::NAME: return (NAME)->data.size() + (without_key != nullptr);
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-        #undef M
-        }
-
-        UNREACHABLE();
-    }
-
-    /// The size without taking into account the row in which data is written for the calculation of TOTALS.
-    size_t sizeWithoutOverflowRow() const
-    {
-        switch (type)
-        {
-            case Type::EMPTY:       return 0;
-            case Type::without_key: return 1;
-
-            #define M(NAME, IS_TWO_LEVEL) \
-            case Type::NAME: return (NAME)->data.size();
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-            #undef M
-        }
-
-        UNREACHABLE();
-    }
-
-    const char * getMethodName() const
-    {
-        switch (type)
-        {
-            case Type::EMPTY:       return "EMPTY";
-            case Type::without_key: return "without_key";
-
-        #define M(NAME, IS_TWO_LEVEL) \
-            case Type::NAME: return #NAME;
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-        #undef M
-        }
-
-        UNREACHABLE();
-    }
-
-    bool isTwoLevel() const
-    {
-        switch (type)
-        {
-            case Type::EMPTY:       return false;
-            case Type::without_key: return false;
-
-        #define M(NAME, IS_TWO_LEVEL) \
-            case Type::NAME: return IS_TWO_LEVEL;
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-        #undef M
-        }
-
-        UNREACHABLE();
-    }
-
-    #define APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M) \
-        M(key32)            \
-        M(key64)            \
-        M(key_string)       \
-        M(key_fixed_string) \
-        M(keys32)           \
-        M(keys64)           \
-        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) \
-        M(low_cardinality_key64) \
-        M(low_cardinality_keys128) \
-        M(low_cardinality_keys256) \
-        M(low_cardinality_key_string) \
-        M(low_cardinality_key_fixed_string) \
-
-    /// NOLINTNEXTLINE
-    #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)\
-        M(key_fixed_string_hash64) \
-        M(keys128_hash64)   \
-        M(keys256_hash64)   \
-        M(serialized_hash64) \
-        M(low_cardinality_key8) \
-        M(low_cardinality_key16) \
-
-    /// NOLINTNEXTLINE
-    #define APPLY_FOR_VARIANTS_SINGLE_LEVEL(M) \
-        APPLY_FOR_VARIANTS_NOT_CONVERTIBLE_TO_TWO_LEVEL(M) \
-        APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M) \
-
-    bool isConvertibleToTwoLevel() const
-    {
-        switch (type)
-        {
-        #define M(NAME) \
-            case Type::NAME: return true;
-
-            APPLY_FOR_VARIANTS_CONVERTIBLE_TO_TWO_LEVEL(M)
-
-        #undef M
-            default:
-                return false;
-        }
-    }
-
-    void convertToTwoLevel();
-
-    /// NOLINTNEXTLINE
-    #define APPLY_FOR_VARIANTS_TWO_LEVEL(M) \
-        M(key32_two_level)            \
-        M(key64_two_level)            \
-        M(key_string_two_level)       \
-        M(key_fixed_string_two_level) \
-        M(keys32_two_level)           \
-        M(keys64_two_level)           \
-        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) \
-        M(low_cardinality_key64_two_level) \
-        M(low_cardinality_keys128_two_level) \
-        M(low_cardinality_keys256_two_level) \
-        M(low_cardinality_key_string_two_level) \
-        M(low_cardinality_key_fixed_string_two_level) \
-
-    #define APPLY_FOR_LOW_CARDINALITY_VARIANTS(M) \
-        M(low_cardinality_key8) \
-        M(low_cardinality_key16) \
-        M(low_cardinality_key32) \
-        M(low_cardinality_key64) \
-        M(low_cardinality_keys128) \
-        M(low_cardinality_keys256) \
-        M(low_cardinality_key_string) \
-        M(low_cardinality_key_fixed_string) \
-        M(low_cardinality_key32_two_level) \
-        M(low_cardinality_key64_two_level) \
-        M(low_cardinality_keys128_two_level) \
-        M(low_cardinality_keys256_two_level) \
-        M(low_cardinality_key_string_two_level) \
-        M(low_cardinality_key_fixed_string_two_level)
-
-    bool isLowCardinality() const
-    {
-        switch (type)
-        {
-        #define M(NAME) \
-            case Type::NAME: return true;
-
-            APPLY_FOR_LOW_CARDINALITY_VARIANTS(M)
-        #undef M
-            default:
-                return false;
-        }
-    }
-
-    static HashMethodContextPtr createCache(Type type, const HashMethodContext::Settings & settings)
-    {
-        switch (type)
-        {
-            case Type::without_key: return nullptr;
-
-            #define M(NAME, IS_TWO_LEVEL) \
-            case Type::NAME: \
-            { \
-                using TPtr ## NAME = decltype(AggregatedDataVariants::NAME); \
-                using T ## NAME = typename TPtr ## NAME ::element_type; \
-                return T ## NAME ::State::createContext(settings); \
-            }
-
-            APPLY_FOR_AGGREGATED_VARIANTS(M)
-            #undef M
-
-            default:
-                throw Exception(ErrorCodes::UNKNOWN_AGGREGATED_DATA_VARIANT, "Unknown aggregated data variant.");
-        }
-    }
-};
-
-using AggregatedDataVariantsPtr = std::shared_ptr<AggregatedDataVariants>;
-using ManyAggregatedDataVariants = std::vector<AggregatedDataVariantsPtr>;
-using ManyAggregatedDataVariantsPtr = std::shared_ptr<ManyAggregatedDataVariants>;
-
 class CompiledAggregateFunctionsHolder;
 class NativeWriter;
 struct OutputBlockColumns;
@@ -1186,6 +245,7 @@ public:
         const IColumn ** batch_arguments{};
         const UInt64 * offsets{};
         bool has_sparse_arguments = false;
+        bool can_optimize_equal_keys_ranges = true;
     };
 
     /// Used for optimize_aggregation_in_order:
@@ -1206,7 +266,10 @@ public:
         AggregateFunctionInstruction * aggregate_instructions) const;
 
     /// Used for aggregate projection.
-    bool mergeOnBlock(Block block, AggregatedDataVariants & result, bool & no_more_keys) const;
+    bool mergeOnBlock(Block block,
+        AggregatedDataVariants & result,
+        bool & no_more_keys,
+        std::atomic<bool> & is_cancelled) const;
 
     void mergeOnBlockSmall(
         AggregatedDataVariants & result,
@@ -1219,7 +282,8 @@ public:
         AggregatedDataVariants & data_variants,
         size_t row_begin,
         size_t row_end,
-        const AggregateColumnsConstData & aggregate_columns_data) const;
+        const AggregateColumnsConstData & aggregate_columns_data,
+        std::atomic<bool> & is_cancelled) const;
 
     /** Convert the aggregation data structure into a block.
       * If overflow_row = true, then aggregates for rows that are not included in max_rows_to_group_by are put in the first block.
@@ -1234,13 +298,13 @@ public:
 
     using BucketToBlocks = std::map<Int32, BlocksList>;
     /// Merge partially aggregated blocks separated to buckets into one data structure.
-    void mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads);
+    void mergeBlocks(BucketToBlocks bucket_to_blocks, AggregatedDataVariants & result, size_t max_threads, std::atomic<bool> & is_cancelled);
 
     /// Merge several partially aggregated blocks into one.
     /// Precondition: for all blocks block.info.is_overflows flag must be the same.
     /// (either all blocks are from overflow data or none blocks are).
     /// The resulting block has the same value of is_overflows flag.
-    Block mergeBlocks(BlocksList & blocks, bool final);
+    Block mergeBlocks(BlocksList & blocks, bool final, std::atomic<bool> & is_cancelled);
 
     /** Split block with partially-aggregated data to many blocks, as if two-level method of aggregation was used.
       * This is needed to simplify merging of that data with other results, that are already two-level.
@@ -1293,7 +357,7 @@ private:
     /// How many RAM were used to process the query before processing the first block.
     Int64 memory_usage_before_aggregation = 0;
 
-    Poco::Logger * log = &Poco::Logger::get("Aggregator");
+    LoggerPtr log = getLogger("Aggregator");
 
     /// For external aggregation.
     TemporaryDataOnDiskPtr tmp_data;
@@ -1360,7 +424,7 @@ private:
         AggregateDataPtr overflow_row) const;
 
     /// Specialization for a particular value no_more_keys.
-    template <bool no_more_keys, bool use_compiled_functions, bool prefetch, typename Method, typename State>
+    template <bool prefetch, typename Method, typename State>
     void executeImplBatch(
         Method & method,
         State & state,
@@ -1368,17 +432,30 @@ private:
         size_t row_begin,
         size_t row_end,
         AggregateFunctionInstruction * aggregate_instructions,
+        bool no_more_keys,
         bool all_keys_are_const,
+        bool use_compiled_functions,
         AggregateDataPtr overflow_row) const;
 
+    void executeAggregateInstructions(
+        Arena * aggregates_pool,
+        size_t row_begin,
+        size_t row_end,
+        AggregateFunctionInstruction * aggregate_instructions,
+        const std::unique_ptr<AggregateDataPtr[]> & places,
+        size_t key_start,
+        bool has_only_one_value_since_last_reset,
+        bool all_keys_are_const,
+        bool use_compiled_functions) const;
+
     /// For case when there are no keys (all aggregate into one row).
-    template <bool use_compiled_functions>
     void executeWithoutKeyImpl(
         AggregatedDataWithoutKey & res,
         size_t row_begin,
         size_t row_end,
         AggregateFunctionInstruction * aggregate_instructions,
-        Arena * arena) const;
+        Arena * arena,
+        bool use_compiled_functions) const;
 
     template <typename Method>
     void writeToTemporaryFileImpl(
@@ -1394,8 +471,8 @@ private:
             Arena * arena) const;
 
     /// Merge data from hash table `src` into `dst`.
-    template <typename Method, bool use_compiled_functions, bool prefetch, typename Table>
-    void mergeDataImpl(Table & table_dst, Table & table_src, Arena * arena) const;
+    template <typename Method, typename Table>
+    void mergeDataImpl(Table & table_dst, Table & table_src, Arena * arena, bool use_compiled_functions, bool prefetch) const;
 
     /// Merge data from hash table `src` into `dst`, but only for keys that already exist in dst. In other cases, merge the data into `overflows`.
     template <typename Method, typename Table>
@@ -1413,7 +490,8 @@ private:
         Arena * arena) const;
 
     void mergeWithoutKeyDataImpl(
-        ManyAggregatedDataVariants & non_empty_data) const;
+        ManyAggregatedDataVariants & non_empty_data,
+        std::atomic<bool> & is_cancelled) const;
 
     template <typename Method>
     void mergeSingleLevelDataImpl(
@@ -1421,10 +499,11 @@ private:
 
     template <bool return_single_block>
     using ConvertToBlockRes = std::conditional_t<return_single_block, Block, BlocksList>;
+    using ConvertToBlockResVariant = std::variant<Block, BlocksList>;
 
-    template <bool return_single_block, typename Method, typename Table>
-    ConvertToBlockRes<return_single_block>
-    convertToBlockImpl(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, bool final, size_t rows) const;
+    template <typename Method, typename Table>
+    ConvertToBlockResVariant
+    convertToBlockImpl(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, bool final, size_t rows, bool return_single_block) const;
 
     template <typename Mapped>
     void insertAggregatesIntoColumns(
@@ -1432,16 +511,25 @@ private:
         MutableColumns & final_aggregate_columns,
         Arena * arena) const;
 
-    template <bool use_compiled_functions>
-    Block insertResultsIntoColumns(PaddedPODArray<AggregateDataPtr> & places, OutputBlockColumns && out_cols, Arena * arena, bool has_null_key_data) const;
+    Block insertResultsIntoColumns(
+        PaddedPODArray<AggregateDataPtr> & places,
+        OutputBlockColumns && out_cols,
+        Arena * arena,
+        bool has_null_key_data,
+        bool use_compiled_functions) const;
 
-    template <typename Method, bool use_compiled_functions, bool return_single_block, typename Table>
-    ConvertToBlockRes<return_single_block>
-    convertToBlockImplFinal(Method & method, Table & data, Arena * arena, Arenas & aggregates_pools, size_t rows) const;
+    template <typename Method, typename Table>
+    ConvertToBlockResVariant convertToBlockImplFinal(
+        Method & method,
+        Table & data,
+        Arena * arena,
+        Arenas & aggregates_pools,
+        bool use_compiled_functions,
+        bool return_single_block) const;
 
-    template <bool return_single_block, typename Method, typename Table>
-    ConvertToBlockRes<return_single_block>
-    convertToBlockImplNotFinal(Method & method, Table & data, Arenas & aggregates_pools, size_t rows) const;
+    template <typename Method, typename Table>
+    ConvertToBlockResVariant
+    convertToBlockImplNotFinal(Method & method, Table & data, Arenas & aggregates_pools, size_t rows, bool return_single_block) const;
 
     template <typename Method>
     Block convertOneBucketToBlock(
@@ -1458,7 +546,7 @@ private:
         Arena * arena,
         bool final,
         Int32 bucket,
-        std::atomic<bool> * is_cancelled = nullptr) const;
+        std::atomic<bool> & is_cancelled) const;
 
     Block prepareBlockAndFillWithoutKey(AggregatedDataVariants & data_variants, bool final, bool is_overflows) const;
     BlocksList prepareBlocksAndFillTwoLevel(AggregatedDataVariants & data_variants, bool final, ThreadPool * thread_pool) const;
@@ -1473,11 +561,12 @@ private:
         bool final,
         ThreadPool * thread_pool) const;
 
-    template <bool no_more_keys, typename State, typename Table>
+    template <typename State, typename Table>
     void mergeStreamsImplCase(
         Arena * aggregates_pool,
         State & state,
         Table & data,
+        bool no_more_keys,
         AggregateDataPtr overflow_row,
         size_t row_begin,
         size_t row_end,
@@ -1513,17 +602,19 @@ private:
 
     void mergeBlockWithoutKeyStreamsImpl(
         Block block,
-        AggregatedDataVariants & result) const;
+        AggregatedDataVariants & result,
+        std::atomic<bool> & is_cancelled) const;
 
     void mergeWithoutKeyStreamsImpl(
         AggregatedDataVariants & result,
         size_t row_begin,
         size_t row_end,
-        const AggregateColumnsConstData & aggregate_columns_data) const;
+        const AggregateColumnsConstData & aggregate_columns_data,
+        std::atomic<bool> & is_cancelled) const;
 
     template <typename Method>
     void mergeBucketImpl(
-        ManyAggregatedDataVariants & data, Int32 bucket, Arena * arena, std::atomic<bool> * is_cancelled = nullptr) const;
+        ManyAggregatedDataVariants & data, Int32 bucket, Arena * arena, std::atomic<bool> & is_cancelled) const;
 
     template <typename Method>
     void convertBlockToTwoLevelImpl(
diff --git a/src/Interpreters/ArrayJoinedColumnsVisitor.h b/src/Interpreters/ArrayJoinedColumnsVisitor.h
index 3bbd6982213..86db342073a 100644
--- a/src/Interpreters/ArrayJoinedColumnsVisitor.h
+++ b/src/Interpreters/ArrayJoinedColumnsVisitor.h
@@ -62,7 +62,7 @@ private:
     {
         auto [array_join_expression_list, _] = node.arrayJoinExpressionList();
         if (!array_join_expression_list)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no ARRAY JOIN");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "No ARRAY JOIN");
 
         std::vector<ASTPtr *> out;
         out.reserve(array_join_expression_list->children.size());
@@ -75,7 +75,7 @@ private:
             if (nested_table_alias == nested_table_name && !ast->as<ASTIdentifier>())
                 throw Exception(ErrorCodes::ALIAS_REQUIRED, "No alias for non-trivial value in ARRAY JOIN: {}", nested_table_name);
 
-            if (data.array_join_alias_to_name.count(nested_table_alias) || data.aliases.count(nested_table_alias))
+            if (data.array_join_alias_to_name.contains(nested_table_alias) || data.aliases.contains(nested_table_alias))
                 throw Exception(ErrorCodes::MULTIPLE_EXPRESSIONS_FOR_ALIAS, "Duplicate alias in ARRAY JOIN: {}", nested_table_alias);
 
             data.array_join_alias_to_name[nested_table_alias] = nested_table_name;
@@ -100,18 +100,18 @@ private:
 
         auto split = Nested::splitName(node.name());  /// ParsedParams, Key1
 
-        if (array_join_alias_to_name.count(node.name()))
+        if (array_join_alias_to_name.contains(node.name()))
         {
             /// ARRAY JOIN was written with an array column. Example: SELECT K1 FROM ... ARRAY JOIN ParsedParams.Key1 AS K1
             array_join_result_to_source[node.name()] = array_join_alias_to_name[node.name()];    /// K1 -> ParsedParams.Key1
         }
-        else if (array_join_alias_to_name.count(split.first) && !split.second.empty())
+        else if (array_join_alias_to_name.contains(split.first) && !split.second.empty())
         {
             /// ARRAY JOIN was written with a nested table. Example: SELECT PP.KEY1 FROM ... ARRAY JOIN ParsedParams AS PP
             array_join_result_to_source[node.name()]    /// PP.Key1 -> ParsedParams.Key1
                 = Nested::concatenateName(array_join_alias_to_name[split.first], split.second);
         }
-        else if (array_join_name_to_alias.count(node.name()))
+        else if (array_join_name_to_alias.contains(node.name()))
         {
             /** Example: SELECT ParsedParams.Key1 FROM ... ARRAY JOIN ParsedParams.Key1 AS PP.Key1.
             * That is, the query uses the original array, replicated by itself.
@@ -119,7 +119,7 @@ private:
             array_join_result_to_source[    /// PP.Key1 -> ParsedParams.Key1
                 array_join_name_to_alias[node.name()]] = node.name();
         }
-        else if (array_join_name_to_alias.count(split.first) && !split.second.empty())
+        else if (array_join_name_to_alias.contains(split.first) && !split.second.empty())
         {
             /** Example: SELECT ParsedParams.Key1 FROM ... ARRAY JOIN ParsedParams AS PP.
             */
diff --git a/src/Interpreters/AsynchronousInsertLog.cpp b/src/Interpreters/AsynchronousInsertLog.cpp
index 9034f582869..0fc39c77fb4 100644
--- a/src/Interpreters/AsynchronousInsertLog.cpp
+++ b/src/Interpreters/AsynchronousInsertLog.cpp
@@ -32,27 +32,27 @@ ColumnsDescription AsynchronousInsertLogElement::getColumnsDescription()
             {"Preprocessed", static_cast<Int8>(DataKind::Preprocessed)},
         });
 
-    return ColumnsDescription
-    {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+    return ColumnsDescription{
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "The date when the async insert happened."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "The date and time when the async insert finished execution."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "The date and time when the async insert finished execution with microseconds precision."},
 
-        {"query", std::make_shared<DataTypeString>()},
-        {"database", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"table", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"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},
-        {"data_kind", type_data_kind},
+        {"query", std::make_shared<DataTypeString>(), "Query string."},
+        {"database", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "The name of the database the table is in."},
+        {"table", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Table name."},
+        {"format", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Format name."},
+        {"query_id", std::make_shared<DataTypeString>(), "ID of the initial query."},
+        {"bytes", std::make_shared<DataTypeUInt64>(), "Number of inserted bytes."},
+        {"rows", std::make_shared<DataTypeUInt64>(), "Number of inserted rows."},
+        {"exception", std::make_shared<DataTypeString>(), "Exception message."},
+        {"status", type_status, "Status of the view. Values: 'Ok' = 1 — Successful insert, 'ParsingError' = 2 — Exception when parsing the data, 'FlushError' = 3 — Exception when flushing the data"},
+        {"data_kind", type_data_kind, "The status of the data. Value: 'Parsed' and 'Preprocessed'."},
 
-        {"flush_time", std::make_shared<DataTypeDateTime>()},
-        {"flush_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"flush_query_id", std::make_shared<DataTypeString>()},
+        {"flush_time", std::make_shared<DataTypeDateTime>(), "The date and time when the flush happened."},
+        {"flush_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "The date and time when the flush happened with microseconds precision."},
+        {"flush_query_id", std::make_shared<DataTypeString>(), "ID of the flush query."},
+        {"timeout_milliseconds", std::make_shared<DataTypeUInt64>(), "The adaptive timeout calculated for this entry."},
     };
 }
 
@@ -80,6 +80,7 @@ void AsynchronousInsertLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(flush_time);
     columns[i++]->insert(flush_time_microseconds);
     columns[i++]->insert(flush_query_id);
+    columns[i++]->insert(timeout_milliseconds);
 }
 
 }
diff --git a/src/Interpreters/AsynchronousInsertLog.h b/src/Interpreters/AsynchronousInsertLog.h
index d05375002ad..b42c28ed41a 100644
--- a/src/Interpreters/AsynchronousInsertLog.h
+++ b/src/Interpreters/AsynchronousInsertLog.h
@@ -12,7 +12,7 @@ namespace DB
 
 struct AsynchronousInsertLogElement
 {
-    enum Status : Int8
+    enum Status : int8_t
     {
         Ok = 0,
         ParsingError = 1,
@@ -38,6 +38,7 @@ struct AsynchronousInsertLogElement
     time_t flush_time{};
     Decimal64 flush_time_microseconds{};
     String flush_query_id;
+    UInt64 timeout_milliseconds = 0;
 
     static std::string name() { return "AsynchronousInsertLog"; }
     static ColumnsDescription getColumnsDescription();
diff --git a/src/Interpreters/AsynchronousInsertQueue.cpp b/src/Interpreters/AsynchronousInsertQueue.cpp
index 63ee62cdef4..6b9ca34c2d7 100644
--- a/src/Interpreters/AsynchronousInsertQueue.cpp
+++ b/src/Interpreters/AsynchronousInsertQueue.cpp
@@ -11,6 +11,7 @@
 #include <IO/copyData.h>
 #include <Interpreters/AsynchronousInsertLog.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/executeQuery.h>
@@ -33,13 +34,14 @@
 #include <Common/SipHash.h>
 #include <Common/logger_useful.h>
 
-
 namespace CurrentMetrics
 {
     extern const Metric PendingAsyncInsert;
     extern const Metric AsynchronousInsertThreads;
     extern const Metric AsynchronousInsertThreadsActive;
     extern const Metric AsynchronousInsertThreadsScheduled;
+    extern const Metric AsynchronousInsertQueueSize;
+    extern const Metric AsynchronousInsertQueueBytes;
 }
 
 namespace ProfileEvents
@@ -60,6 +62,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_FORMAT;
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
+    extern const int INVALID_SETTING_VALUE;
 }
 
 static const NameSet settings_to_skip
@@ -146,19 +149,25 @@ AsynchronousInsertQueue::InsertData::Entry::Entry(
 {
 }
 
+void AsynchronousInsertQueue::InsertData::Entry::resetChunk()
+{
+    if (chunk.empty())
+        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.
+    MemoryTrackerSwitcher switcher(user_memory_tracker);
+    chunk = {};
+}
+
 void AsynchronousInsertQueue::InsertData::Entry::finish(std::exception_ptr exception_)
 {
     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.
-        MemoryTrackerSwitcher switcher(user_memory_tracker);
-        chunk = {};
-    }
+    resetChunk();
 
     if (exception_)
     {
@@ -171,60 +180,111 @@ void AsynchronousInsertQueue::InsertData::Entry::finish(std::exception_ptr excep
     }
 }
 
+AsynchronousInsertQueue::QueueShardFlushTimeHistory::TimePoints
+AsynchronousInsertQueue::QueueShardFlushTimeHistory::getRecentTimePoints() const
+{
+    std::shared_lock lock(mutex);
+    return time_points;
+}
+
+void AsynchronousInsertQueue::QueueShardFlushTimeHistory::updateWithCurrentTime()
+{
+    std::unique_lock lock(mutex);
+    time_points.first = time_points.second;
+    time_points.second = std::chrono::steady_clock::now();
+}
+
 AsynchronousInsertQueue::AsynchronousInsertQueue(ContextPtr context_, size_t pool_size_, bool flush_on_shutdown_)
     : WithContext(context_)
     , pool_size(pool_size_)
     , flush_on_shutdown(flush_on_shutdown_)
     , queue_shards(pool_size)
-    , pool(CurrentMetrics::AsynchronousInsertThreads, CurrentMetrics::AsynchronousInsertThreadsActive, CurrentMetrics::AsynchronousInsertThreadsScheduled, pool_size)
+    , flush_time_history_per_queue_shard(pool_size)
+    , pool(
+          CurrentMetrics::AsynchronousInsertThreads,
+          CurrentMetrics::AsynchronousInsertThreadsActive,
+          CurrentMetrics::AsynchronousInsertThreadsScheduled,
+          pool_size)
 {
     if (!pool_size)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "pool_size cannot be zero");
 
+    const auto & settings = getContext()->getSettingsRef();
+
+    for (size_t i = 0; i < pool_size; ++i)
+        queue_shards[i].busy_timeout_ms
+            = std::min(Milliseconds(settings.async_insert_busy_timeout_min_ms), Milliseconds(settings.async_insert_busy_timeout_max_ms));
+
     for (size_t i = 0; i < pool_size; ++i)
         dump_by_first_update_threads.emplace_back([this, i] { processBatchDeadlines(i); });
 }
 
-AsynchronousInsertQueue::~AsynchronousInsertQueue()
+void AsynchronousInsertQueue::flushAndShutdown()
 {
-    LOG_TRACE(log, "Shutting down the asynchronous insertion queue");
-    shutdown = true;
-
-    for (size_t i = 0; i < pool_size; ++i)
+    try
     {
-        auto & shard = queue_shards[i];
+        LOG_TRACE(log, "Shutting down the asynchronous insertion queue");
+        shutdown = true;
 
-        shard.are_tasks_available.notify_one();
-        assert(dump_by_first_update_threads[i].joinable());
-        dump_by_first_update_threads[i].join();
-
-        if (flush_on_shutdown)
-        {
-            for (auto & [_, elem] : shard.queue)
-                scheduleDataProcessingJob(elem.key, std::move(elem.data), getContext());
-        }
-        else
+        for (size_t i = 0; i < pool_size; ++i)
         {
+            auto & shard = queue_shards[i];
 
-            for (auto & [_, elem] : shard.queue)
-                for (const auto & entry : elem.data->entries)
-                    entry->finish(std::make_exception_ptr(Exception(
-                        ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout exceeded)")));
+            shard.are_tasks_available.notify_one();
+            chassert(dump_by_first_update_threads[i].joinable());
+            dump_by_first_update_threads[i].join();
+
+            if (flush_on_shutdown)
+            {
+                for (auto & [_, elem] : shard.queue)
+                    scheduleDataProcessingJob(elem.key, std::move(elem.data), getContext(), i);
+            }
+            else
+            {
+                for (auto & [_, elem] : shard.queue)
+                    for (const auto & entry : elem.data->entries)
+                        entry->finish(
+                            std::make_exception_ptr(Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout exceeded)")));
+            }
         }
+
+        pool.wait();
+        LOG_TRACE(log, "Asynchronous insertion queue finished");
+    }
+    catch (...)
+    {
+        tryLogCurrentException(log);
+        pool.wait();
     }
-
-    pool.wait();
-    LOG_TRACE(log, "Asynchronous insertion queue finished");
 }
 
-void AsynchronousInsertQueue::scheduleDataProcessingJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context)
+AsynchronousInsertQueue::~AsynchronousInsertQueue()
 {
+    for (const auto & shard : queue_shards)
+    {
+        for (const auto & [first_update, elem] : shard.queue)
+        {
+            const auto & insert_query = elem.key.query->as<const ASTInsertQuery &>();
+            LOG_WARNING(log, "Has unprocessed async insert for {}.{}",
+                        backQuoteIfNeed(insert_query.getDatabase()), backQuoteIfNeed(insert_query.getTable()));
+        }
+    }
+}
+
+void AsynchronousInsertQueue::scheduleDataProcessingJob(
+    const InsertQuery & key, InsertDataPtr data, ContextPtr global_context, size_t shard_num)
+{
+    /// Intuitively it seems reasonable to process first inserted blocks first.
+    /// We add new chunks in the end of entries list, so they are automatically ordered by creation time
+    chassert(!data->entries.empty());
+    const auto priority = Priority{data->entries.front()->create_time.time_since_epoch().count()};
+
     /// 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, my_data = std::make_shared<InsertDataPtr>(std::move(data))]() mutable
-    {
-        processData(key, std::move(*my_data), std::move(global_context));
-    });
+    pool.scheduleOrThrowOnError(
+        [this, key, global_context, shard_num, my_data = std::make_shared<InsertDataPtr>(std::move(data))]() mutable
+        { processData(key, std::move(*my_data), std::move(global_context), flush_time_history_per_queue_shard[shard_num]); },
+        priority);
 }
 
 void AsynchronousInsertQueue::preprocessInsertQuery(const ASTPtr & query, const ContextPtr & query_context)
@@ -234,7 +294,7 @@ void AsynchronousInsertQueue::preprocessInsertQuery(const ASTPtr & query, const
 
     InterpreterInsertQuery interpreter(query, query_context, query_context->getSettingsRef().insert_allow_materialized_columns);
     auto table = interpreter.getTable(insert_query);
-    auto sample_block = interpreter.getSampleBlock(insert_query, table, table->getInMemoryMetadataPtr());
+    auto sample_block = InterpreterInsertQuery::getSampleBlock(insert_query, table, table->getInMemoryMetadataPtr(), query_context);
 
     if (!FormatFactory::instance().isInputFormat(insert_query.format))
         throw Exception(ErrorCodes::UNKNOWN_FORMAT, "Unknown input format {}", insert_query.format);
@@ -300,6 +360,7 @@ AsynchronousInsertQueue::PushResult
 AsynchronousInsertQueue::pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr query_context)
 {
     const auto & settings = query_context->getSettingsRef();
+    validateSettings(settings, log);
     auto & insert_query = query->as<ASTInsertQuery &>();
 
     auto data_kind = chunk.getDataKind();
@@ -319,24 +380,35 @@ AsynchronousInsertQueue::pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr
 
     auto shard_num = key.hash % pool_size;
     auto & shard = queue_shards[shard_num];
-
+    const auto flush_time_points = flush_time_history_per_queue_shard[shard_num].getRecentTimePoints();
     {
         std::lock_guard lock(shard.mutex);
 
         auto [it, inserted] = shard.iterators.try_emplace(key.hash);
-        if (inserted)
+        auto now = std::chrono::steady_clock::now();
+        auto timeout_ms = getBusyWaitTimeoutMs(settings, shard, flush_time_points, now);
+        if (timeout_ms != shard.busy_timeout_ms)
         {
-            auto now = std::chrono::steady_clock::now();
-            auto timeout = now + Milliseconds{key.settings.async_insert_busy_timeout_ms};
-            it->second = shard.queue.emplace(timeout, Container{key, std::make_unique<InsertData>()}).first;
+            LOG_TRACE(
+                log,
+                "Asynchronous timeout {} from {} to {} for queue shard {}.",
+                timeout_ms < shard.busy_timeout_ms ? "decreased" : "increased",
+                shard.busy_timeout_ms.count(),
+                timeout_ms.count(),
+                size_t(shard_num));
         }
 
+        if (inserted)
+            it->second = shard.queue.emplace(now + timeout_ms, Container{key, std::make_unique<InsertData>(timeout_ms)}).first;
+
         auto queue_it = it->second;
         auto & data = queue_it->second.data;
         size_t entry_data_size = entry->chunk.byteSize();
 
         assert(data);
+        auto size_in_bytes = data->size_in_bytes;
         data->size_in_bytes += entry_data_size;
+        /// We rely on the fact that entries are being added to the list in order of creation time in `scheduleDataProcessingJob()`
         data->entries.emplace_back(entry);
         insert_future = entry->getFuture();
 
@@ -346,23 +418,50 @@ AsynchronousInsertQueue::pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr
         bool has_enough_bytes = data->size_in_bytes >= key.settings.async_insert_max_data_size;
         bool has_enough_queries = data->entries.size() >= key.settings.async_insert_max_query_number && key.settings.async_insert_deduplicate;
 
-        /// Here we check whether we hit the limit on maximum data size in the buffer.
-        /// And use setting from query context.
-        /// It works, because queries with the same set of settings are already grouped together.
-        if (!flush_stopped && (has_enough_bytes || has_enough_queries))
+        auto max_busy_timeout_exceeded = [&shard, &settings, &now, &flush_time_points]() -> bool
         {
+            if (!settings.async_insert_use_adaptive_busy_timeout || !shard.last_insert_time || !flush_time_points.first)
+                return false;
+
+            auto max_ms = Milliseconds(settings.async_insert_busy_timeout_max_ms);
+            return *shard.last_insert_time + max_ms < now && *flush_time_points.first + max_ms < *flush_time_points.second;
+        };
+
+        /// Here we check whether we have hit the limit on the maximum data size in the buffer or
+        /// if the elapsed time since the last insert exceeds the maximum busy wait timeout.
+        /// We also use the limit settings from the query context.
+        /// This works because queries with the same set of settings are already grouped together.
+        if (!flush_stopped && (has_enough_bytes || has_enough_queries || max_busy_timeout_exceeded()))
+        {
+            data->timeout_ms = Milliseconds::zero();
             data_to_process = std::move(data);
             shard.iterators.erase(it);
             shard.queue.erase(queue_it);
         }
 
+        shard.last_insert_time = now;
+        shard.busy_timeout_ms = timeout_ms;
+
         CurrentMetrics::add(CurrentMetrics::PendingAsyncInsert);
         ProfileEvents::increment(ProfileEvents::AsyncInsertQuery);
         ProfileEvents::increment(ProfileEvents::AsyncInsertBytes, entry_data_size);
+
+        if (data_to_process)
+        {
+            if (!inserted)
+                CurrentMetrics::sub(CurrentMetrics::AsynchronousInsertQueueSize);
+            CurrentMetrics::sub(CurrentMetrics::AsynchronousInsertQueueBytes, size_in_bytes);
+        }
+        else
+        {
+            if (inserted)
+                CurrentMetrics::add(CurrentMetrics::AsynchronousInsertQueueSize);
+            CurrentMetrics::add(CurrentMetrics::AsynchronousInsertQueueBytes, entry_data_size);
+        }
     }
 
     if (data_to_process)
-        scheduleDataProcessingJob(key, std::move(data_to_process), getContext());
+        scheduleDataProcessingJob(key, std::move(data_to_process), getContext(), shard_num);
     else
         shard.are_tasks_available.notify_one();
 
@@ -374,6 +473,78 @@ AsynchronousInsertQueue::pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr
     };
 }
 
+AsynchronousInsertQueue::Milliseconds AsynchronousInsertQueue::getBusyWaitTimeoutMs(
+    const Settings & settings,
+    const QueueShard & shard,
+    const QueueShardFlushTimeHistory::TimePoints & flush_time_points,
+    std::chrono::steady_clock::time_point now) const
+{
+    if (!settings.async_insert_use_adaptive_busy_timeout)
+        return settings.async_insert_busy_timeout_max_ms;
+
+    const auto max_ms = Milliseconds(settings.async_insert_busy_timeout_max_ms);
+    const auto min_ms = std::min(std::max(Milliseconds(settings.async_insert_busy_timeout_min_ms), Milliseconds(1)), max_ms);
+
+    auto normalize = [&min_ms, &max_ms](const auto & t_ms) { return std::min(std::max(t_ms, min_ms), max_ms); };
+
+    if (!shard.last_insert_time || !flush_time_points.first)
+        return normalize(shard.busy_timeout_ms);
+
+    const auto & last_insert_time = *shard.last_insert_time;
+    const auto & [t1, t2] = std::tie(*flush_time_points.first, *flush_time_points.second);
+    const double increase_rate = settings.async_insert_busy_timeout_increase_rate;
+    const double decrease_rate = settings.async_insert_busy_timeout_decrease_rate;
+
+    const auto decreased_timeout_ms = std::min(
+        std::chrono::duration_cast<Milliseconds>(shard.busy_timeout_ms / (1.0 + decrease_rate)), shard.busy_timeout_ms - Milliseconds(1));
+
+    /// Increase the timeout for frequent inserts.
+    if (last_insert_time + min_ms > now)
+    {
+        auto timeout_ms = std::max(
+            std::chrono::duration_cast<Milliseconds>(shard.busy_timeout_ms * (1.0 + increase_rate)),
+            shard.busy_timeout_ms + Milliseconds(1));
+
+        return normalize(timeout_ms);
+    }
+    /// Decrease the timeout if inserts are not frequent,
+    /// that is, if the time since the last insert and the difference between the last two queue flushes were both
+    /// long enough (exceeding the adjusted timeout).
+    /// This ensures the timeout value converges to the minimum over time for non-frequent inserts.
+    else if (last_insert_time + decreased_timeout_ms < now && t1 + decreased_timeout_ms < t2)
+        return normalize(decreased_timeout_ms);
+
+    return normalize(shard.busy_timeout_ms);
+}
+
+void AsynchronousInsertQueue::validateSettings(const Settings & settings, LoggerPtr log)
+{
+    const auto max_ms = std::chrono::milliseconds(settings.async_insert_busy_timeout_max_ms);
+
+    if (max_ms == std::chrono::milliseconds::zero())
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting 'async_insert_busy_timeout_max_ms' can't be zero");
+
+    if (!settings.async_insert_use_adaptive_busy_timeout)
+        return;
+
+    /// Adaptive timeout settings.
+    const auto min_ms = std::chrono::milliseconds(settings.async_insert_busy_timeout_min_ms);
+
+    if (min_ms > max_ms && log)
+        LOG_WARNING(
+            log,
+            "Setting 'async_insert_busy_timeout_min_ms'={} is greater than 'async_insert_busy_timeout_max_ms'={}. Ignoring "
+            "'async_insert_busy_timeout_min_ms'",
+            min_ms.count(),
+            max_ms.count());
+
+    if (settings.async_insert_busy_timeout_increase_rate <= 0)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting 'async_insert_busy_timeout_increase_rate' must be greater than zero");
+
+    if (settings.async_insert_busy_timeout_decrease_rate <= 0)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting 'async_insert_busy_timeout_decrease_rate' must be greater than zero");
+}
+
 void AsynchronousInsertQueue::flushAll()
 {
     std::lock_guard flush_lock(flush_mutex);
@@ -395,14 +566,15 @@ void AsynchronousInsertQueue::flushAll()
     size_t total_bytes = 0;
     size_t total_entries = 0;
 
-    for (auto & queue : queues_to_flush)
+    for (size_t i = 0; i < pool_size; ++i)
     {
+        auto & queue = queues_to_flush[i];
         total_queries += queue.size();
         for (auto & [_, entry] : queue)
         {
             total_bytes += entry.data->size_in_bytes;
             total_entries += entry.data->entries.size();
-            scheduleDataProcessingJob(entry.key, std::move(entry.data), getContext());
+            scheduleDataProcessingJob(entry.key, std::move(entry.data), getContext(), i);
         }
     }
 
@@ -429,17 +601,21 @@ void AsynchronousInsertQueue::processBatchDeadlines(size_t shard_num)
         {
             std::unique_lock lock(shard.mutex);
 
-            shard.are_tasks_available.wait_for(lock,
-                Milliseconds(getContext()->getSettingsRef().async_insert_busy_timeout_ms), [&shard, this]
-            {
-                if (shutdown)
-                    return true;
+            const auto rel_time
+                = std::min(shard.busy_timeout_ms, Milliseconds(getContext()->getSettingsRef().async_insert_poll_timeout_ms));
+            shard.are_tasks_available.wait_for(
+                lock,
+                rel_time,
+                [&shard, this]
+                {
+                    if (shutdown)
+                        return true;
 
-                if (!shard.queue.empty() && shard.queue.begin()->first < std::chrono::steady_clock::now())
-                    return true;
+                    if (!shard.queue.empty() && shard.queue.begin()->first < std::chrono::steady_clock::now())
+                        return true;
 
-                return false;
-            });
+                    return false;
+                });
 
             if (shutdown)
                 return;
@@ -449,21 +625,30 @@ void AsynchronousInsertQueue::processBatchDeadlines(size_t shard_num)
 
             const auto now = std::chrono::steady_clock::now();
 
+            size_t size_in_bytes = 0;
             while (true)
             {
                 if (shard.queue.empty() || shard.queue.begin()->first > now)
                     break;
 
                 auto it = shard.queue.begin();
+                size_in_bytes += it->second.data->size_in_bytes;
+
                 shard.iterators.erase(it->second.key.hash);
 
                 entries_to_flush.emplace_back(std::move(it->second));
                 shard.queue.erase(it);
             }
+
+            if (!entries_to_flush.empty())
+            {
+                CurrentMetrics::sub(CurrentMetrics::AsynchronousInsertQueueSize, entries_to_flush.size());
+                CurrentMetrics::sub(CurrentMetrics::AsynchronousInsertQueueBytes, size_in_bytes);
+            }
         }
 
         for (auto & entry : entries_to_flush)
-            scheduleDataProcessingJob(entry.key, std::move(entry.data), getContext());
+            scheduleDataProcessingJob(entry.key, std::move(entry.data), getContext(), shard_num);
     }
 }
 
@@ -507,7 +692,8 @@ String serializeQuery(const IAST & query, size_t max_length)
 }
 
 // static
-void AsynchronousInsertQueue::processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context)
+void AsynchronousInsertQueue::processData(
+    InsertQuery key, InsertDataPtr data, ContextPtr global_context, QueueShardFlushTimeHistory & queue_shard_flush_time_history)
 try
 {
     if (!data)
@@ -515,7 +701,7 @@ try
 
     SCOPE_EXIT(CurrentMetrics::sub(CurrentMetrics::PendingAsyncInsert, data->entries.size()));
 
-    const auto * log = &Poco::Logger::get("AsynchronousInsertQueue");
+    const auto log = getLogger("AsynchronousInsertQueue");
     const auto & insert_query = assert_cast<const ASTInsertQuery &>(*key.query);
 
     auto insert_context = Context::createCopy(global_context);
@@ -613,9 +799,12 @@ try
         throw;
     }
 
-    auto add_entry_to_log = [&](
-        const auto & entry, const auto & entry_query_for_logging,
-        const auto & exception, size_t num_rows, size_t num_bytes)
+    auto add_entry_to_log = [&](const auto & entry,
+                                const auto & entry_query_for_logging,
+                                const auto & exception,
+                                size_t num_rows,
+                                size_t num_bytes,
+                                Milliseconds timeout_ms)
     {
         if (!async_insert_log)
             return;
@@ -632,6 +821,7 @@ try
         elem.rows = num_rows;
         elem.exception = exception;
         elem.data_kind = entry->chunk.getDataKind();
+        elem.timeout_milliseconds = timeout_ms.count();
 
         /// If there was a parsing error,
         /// the entry won't be flushed anyway,
@@ -666,9 +856,9 @@ try
     auto header = pipeline.getHeader();
 
     if (key.data_kind == DataKind::Parsed)
-        chunk = processEntriesWithParsing(key, data->entries, header, insert_context, log, add_entry_to_log);
+        chunk = processEntriesWithParsing(key, data, header, insert_context, log, add_entry_to_log);
     else
-        chunk = processPreprocessedEntries(key, data->entries, header, insert_context, add_entry_to_log);
+        chunk = processPreprocessedEntries(key, data, header, insert_context, add_entry_to_log);
 
     ProfileEvents::increment(ProfileEvents::AsyncInsertRows, chunk.getNumRows());
 
@@ -691,6 +881,8 @@ try
 
         LOG_INFO(log, "Flushed {} rows, {} bytes for query '{}'", num_rows, num_bytes, key.query_str);
 
+        queue_shard_flush_time_history.updateWithCurrentTime();
+
         bool pulling_pipeline = false;
         logQueryFinish(query_log_elem, insert_context, key.query, pipeline, pulling_pipeline, query_span, QueryCache::Usage::None, internal);
     }
@@ -729,10 +921,10 @@ catch (...)
 template <typename LogFunc>
 Chunk AsynchronousInsertQueue::processEntriesWithParsing(
     const InsertQuery & key,
-    const std::list<InsertData::EntryPtr> & entries,
+    const InsertDataPtr & data,
     const Block & header,
     const ContextPtr & insert_context,
-    const Poco::Logger * logger,
+    LoggerPtr logger,
     LogFunc && add_to_async_insert_log)
 {
     size_t total_rows = 0;
@@ -770,7 +962,7 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
     auto chunk_info = std::make_shared<AsyncInsertInfo>();
     auto query_for_logging = serializeQuery(*key.query, insert_context->getSettingsRef().log_queries_cut_to_length);
 
-    for (const auto & entry : entries)
+    for (const auto & entry : data->entries)
     {
         current_entry = entry;
 
@@ -780,14 +972,18 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
                 "Expected entry with data kind Parsed. Got: {}", entry->chunk.getDataKind());
 
         auto buffer = std::make_unique<ReadBufferFromString>(*bytes);
+
         size_t num_bytes = bytes->size();
         size_t num_rows = executor.execute(*buffer);
+
         total_rows += num_rows;
         chunk_info->offsets.push_back(total_rows);
         chunk_info->tokens.push_back(entry->async_dedup_token);
 
-        add_to_async_insert_log(entry, query_for_logging, current_exception, num_rows, num_bytes);
+        add_to_async_insert_log(entry, query_for_logging, current_exception, num_rows, num_bytes, data->timeout_ms);
+
         current_exception.clear();
+        entry->resetChunk();
     }
 
     Chunk chunk(executor.getResultColumns(), total_rows);
@@ -798,7 +994,7 @@ Chunk AsynchronousInsertQueue::processEntriesWithParsing(
 template <typename LogFunc>
 Chunk AsynchronousInsertQueue::processPreprocessedEntries(
     const InsertQuery & key,
-    const std::list<InsertData::EntryPtr> & entries,
+    const InsertDataPtr & data,
     const Block & header,
     const ContextPtr & insert_context,
     LogFunc && add_to_async_insert_log)
@@ -821,7 +1017,7 @@ Chunk AsynchronousInsertQueue::processPreprocessedEntries(
         return it->second;
     };
 
-    for (const auto & entry : entries)
+    for (const auto & entry : data->entries)
     {
         const auto * block = entry->chunk.asBlock();
         if (!block)
@@ -837,7 +1033,9 @@ Chunk AsynchronousInsertQueue::processPreprocessedEntries(
         chunk_info->tokens.push_back(entry->async_dedup_token);
 
         const auto & query_for_logging = get_query_by_format(entry->format);
-        add_to_async_insert_log(entry, query_for_logging, "", block->rows(), block->bytes());
+        add_to_async_insert_log(entry, query_for_logging, "", block->rows(), block->bytes(), data->timeout_ms);
+
+        entry->resetChunk();
     }
 
     Chunk chunk(std::move(result_columns), total_rows);
diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
index 99394d0fb14..a8ee064877d 100644
--- a/src/Interpreters/AsynchronousInsertQueue.h
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -10,6 +10,7 @@
 #include <Processors/Chunk.h>
 
 #include <future>
+#include <shared_mutex>
 #include <variant>
 
 namespace DB
@@ -36,15 +37,15 @@ public:
         Status status;
 
         /// Future that allows to wait until the query is flushed.
-        std::future<void> future;
+        std::future<void> future{};
 
         /// Read buffer that contains extracted
         /// from query data in case of too much data.
-        std::unique_ptr<ReadBuffer> insert_data_buffer;
+        std::unique_ptr<ReadBuffer> insert_data_buffer{};
 
         /// Block that contains received by Native
         /// protocol data in case of too much data.
-        Block insert_block;
+        Block insert_block{};
     };
 
     enum class DataKind
@@ -53,6 +54,8 @@ public:
         Preprocessed = 1,
     };
 
+    static void validateSettings(const Settings & settings, LoggerPtr log);
+
     /// Force flush the whole queue.
     void flushAll();
 
@@ -60,6 +63,10 @@ public:
     PushResult pushQueryWithBlock(ASTPtr query, Block block, ContextPtr query_context);
     size_t getPoolSize() const { return pool_size; }
 
+    /// This method should be called manually because it's not flushed automatically in dtor
+    /// because all tables may be already unloaded when we destroy AsynchronousInsertQueue
+    void flushAndShutdown();
+
 private:
 
     struct InsertQuery
@@ -114,6 +121,17 @@ private:
                 return DataKind::Parsed;
         }
 
+        bool empty() const
+        {
+            return std::visit([]<typename T>(const T & arg)
+            {
+                if constexpr (std::is_same_v<T, Block>)
+                    return arg.rows() == 0;
+                else
+                    return arg.empty();
+            }, *this);
+        }
+
         const String * asString() const { return std::get_if<String>(this); }
         const Block * asBlock() const { return std::get_if<Block>(this); }
     };
@@ -137,7 +155,9 @@ private:
                 const String & format_,
                 MemoryTracker * user_memory_tracker_);
 
+            void resetChunk();
             void finish(std::exception_ptr exception_ = nullptr);
+
             std::future<void> getFuture() { return promise.get_future(); }
             bool isFinished() const { return finished; }
 
@@ -146,6 +166,9 @@ private:
             std::atomic_bool finished = false;
         };
 
+        InsertData() = default;
+        explicit InsertData(Milliseconds timeout_ms_) : timeout_ms(timeout_ms_) { }
+
         ~InsertData()
         {
             auto it = entries.begin();
@@ -163,6 +186,7 @@ private:
 
         std::list<EntryPtr> entries;
         size_t size_in_bytes = 0;
+        Milliseconds timeout_ms = Milliseconds::zero();
     };
 
     using InsertDataPtr = std::unique_ptr<InsertData>;
@@ -180,6 +204,8 @@ private:
     using QueueIterator = Queue::iterator;
     using QueueIteratorByKey = std::unordered_map<UInt128, QueueIterator>;
 
+    using OptionalTimePoint = std::optional<std::chrono::steady_clock::time_point>;
+
     struct QueueShard
     {
         mutable std::mutex mutex;
@@ -187,12 +213,30 @@ private:
 
         Queue queue;
         QueueIteratorByKey iterators;
+
+        OptionalTimePoint last_insert_time;
+        std::chrono::milliseconds busy_timeout_ms;
+    };
+
+    /// Times of the two most recent queue flushes.
+    /// Used to calculate adaptive timeout.
+    struct QueueShardFlushTimeHistory
+    {
+    public:
+        using TimePoints = std::pair<OptionalTimePoint, OptionalTimePoint>;
+        TimePoints getRecentTimePoints() const;
+        void updateWithCurrentTime();
+
+    private:
+        mutable std::shared_mutex mutex;
+        TimePoints time_points;
     };
 
     const size_t pool_size;
     const bool flush_on_shutdown;
 
     std::vector<QueueShard> queue_shards;
+    std::vector<QueueShardFlushTimeHistory> flush_time_history_per_queue_shard;
 
     /// Logic and events behind queue are as follows:
     ///  - async_insert_busy_timeout_ms:
@@ -214,29 +258,37 @@ private:
     /// Uses async_insert_busy_timeout_ms and processBatchDeadlines()
     std::vector<ThreadFromGlobalPool> dump_by_first_update_threads;
 
-    Poco::Logger * log = &Poco::Logger::get("AsynchronousInsertQueue");
+    LoggerPtr log = getLogger("AsynchronousInsertQueue");
 
     PushResult pushDataChunk(ASTPtr query, DataChunk chunk, ContextPtr query_context);
+
+    Milliseconds getBusyWaitTimeoutMs(
+        const Settings & settings,
+        const QueueShard & shard,
+        const QueueShardFlushTimeHistory::TimePoints & flush_time_points,
+        std::chrono::steady_clock::time_point now) const;
+
     void preprocessInsertQuery(const ASTPtr & query, const ContextPtr & query_context);
 
     void processBatchDeadlines(size_t shard_num);
-    void scheduleDataProcessingJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context);
+    void scheduleDataProcessingJob(const InsertQuery & key, InsertDataPtr data, ContextPtr global_context, size_t shard_num);
 
-    static void processData(InsertQuery key, InsertDataPtr data, ContextPtr global_context);
+    static void processData(
+        InsertQuery key, InsertDataPtr data, ContextPtr global_context, QueueShardFlushTimeHistory & queue_shard_flush_time_history);
 
     template <typename LogFunc>
     static Chunk processEntriesWithParsing(
         const InsertQuery & key,
-        const std::list<InsertData::EntryPtr> & entries,
+        const InsertDataPtr & data,
         const Block & header,
         const ContextPtr & insert_context,
-        const Poco::Logger * logger,
+        LoggerPtr logger,
         LogFunc && add_to_async_insert_log);
 
     template <typename LogFunc>
     static Chunk processPreprocessedEntries(
         const InsertQuery & key,
-        const std::list<InsertData::EntryPtr> & entries,
+        const InsertDataPtr & data,
         const Block & header,
         const ContextPtr & insert_context,
         LogFunc && add_to_async_insert_log);
@@ -247,7 +299,7 @@ private:
 public:
     auto getQueueLocked(size_t shard_num) const
     {
-        auto & shard = queue_shards[shard_num];
+        const auto & shard = queue_shards[shard_num];
         std::unique_lock lock(shard.mutex);
         return std::make_pair(std::ref(shard.queue), std::move(lock));
     }
diff --git a/src/Interpreters/AsynchronousMetricLog.cpp b/src/Interpreters/AsynchronousMetricLog.cpp
index f905f72e7a7..4287798c4ca 100644
--- a/src/Interpreters/AsynchronousMetricLog.cpp
+++ b/src/Interpreters/AsynchronousMetricLog.cpp
@@ -1,4 +1,3 @@
-#include <base/getFQDNOrHostName.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
@@ -6,9 +5,10 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/AsynchronousMetricLog.h>
-#include <Parsers/parseQuery.h>
 #include <Parsers/ExpressionElementParsers.h>
-#include <Common/AsynchronousMetrics.h>
+#include <Parsers/parseQuery.h>
+#include <base/getFQDNOrHostName.h>
+#include <Common/DateLUTImpl.h>
 
 
 namespace DB
@@ -22,31 +22,31 @@ ColumnsDescription AsynchronousMetricLogElement::getColumnsDescription()
         {
             "hostname",
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-            parseQuery(codec_parser, "(ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH),
+            parseQuery(codec_parser, "(ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS),
             "Hostname of the server executing the query."
         },
         {
             "event_date",
             std::make_shared<DataTypeDate>(),
-            parseQuery(codec_parser, "(Delta(2), ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH),
+            parseQuery(codec_parser, "(Delta(2), ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS),
             "Event date."
         },
         {
             "event_time",
             std::make_shared<DataTypeDateTime>(),
-            parseQuery(codec_parser, "(Delta(4), ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH),
+            parseQuery(codec_parser, "(Delta(4), ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS),
             "Event time."
         },
         {
             "metric",
             std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-            parseQuery(codec_parser, "(ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH),
+            parseQuery(codec_parser, "(ZSTD(1))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS),
             "Metric name."
         },
         {
             "value",
             std::make_shared<DataTypeFloat64>(),
-            parseQuery(codec_parser, "(ZSTD(3))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH),
+            parseQuery(codec_parser, "(ZSTD(3))", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS),
             "Metric value."
         }
     };
diff --git a/src/Interpreters/AsynchronousMetricLog.h b/src/Interpreters/AsynchronousMetricLog.h
index 0be8dbc2ec8..739b2aa5b56 100644
--- a/src/Interpreters/AsynchronousMetricLog.h
+++ b/src/Interpreters/AsynchronousMetricLog.h
@@ -29,18 +29,6 @@ struct AsynchronousMetricLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-
-    /// Returns the list of columns as in CREATE TABLE statement or nullptr.
-    /// If it's not nullptr, this list of columns will be used to create the table.
-    /// Otherwise the list will be constructed from LogElement::getNamesAndTypes and LogElement::getNamesAndAliases.
-    static const char * getCustomColumnList()
-    {
-        return "hostname LowCardinality(String) CODEC(ZSTD(1)), "
-               "event_date Date CODEC(Delta(2), ZSTD(1)), "
-               "event_time DateTime CODEC(Delta(4), ZSTD(1)), "
-               "metric LowCardinality(String) CODEC(ZSTD(1)), "
-               "value Float64 CODEC(ZSTD(3))";
-    }
 };
 
 class AsynchronousMetricLog : public SystemLog<AsynchronousMetricLogElement>
diff --git a/src/Interpreters/BackupLog.cpp b/src/Interpreters/BackupLog.cpp
index d34e982ffc3..af6c7cf6234 100644
--- a/src/Interpreters/BackupLog.cpp
+++ b/src/Interpreters/BackupLog.cpp
@@ -22,23 +22,24 @@ ColumnsDescription BackupLogElement::getColumnsDescription()
 {
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"id", std::make_shared<DataTypeString>()},
-        {"name", std::make_shared<DataTypeString>()},
-        {"base_backup_name", std::make_shared<DataTypeString>()},
-        {"status", std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues())},
-        {"error", std::make_shared<DataTypeString>()},
-        {"start_time", std::make_shared<DataTypeDateTime>()},
-        {"end_time", std::make_shared<DataTypeDateTime>()},
-        {"num_files", std::make_shared<DataTypeUInt64>()},
-        {"total_size", std::make_shared<DataTypeUInt64>()},
-        {"num_entries", std::make_shared<DataTypeUInt64>()},
-        {"uncompressed_size", std::make_shared<DataTypeUInt64>()},
-        {"compressed_size", std::make_shared<DataTypeUInt64>()},
-        {"files_read", std::make_shared<DataTypeUInt64>()},
-        {"bytes_read", std::make_shared<DataTypeUInt64>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "Date of the entry."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Time of the entry with microseconds precision."},
+        {"id", std::make_shared<DataTypeString>(), "Identifier of the backup or restore operation."},
+        {"name", std::make_shared<DataTypeString>(), "Name of the backup storage (the contents of the FROM or TO clause)."},
+        {"base_backup_name", std::make_shared<DataTypeString>(), "The name of base backup in case incremental one."},
+        {"query_id", std::make_shared<DataTypeString>(), "The ID of a query associated with a backup operation."},
+        {"status", std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues()), "Operation status."},
+        {"error", std::make_shared<DataTypeString>(), "Error message of the failed operation (empty string for successful operations)."},
+        {"start_time", std::make_shared<DataTypeDateTime>(), "Start time of the operation."},
+        {"end_time", std::make_shared<DataTypeDateTime>(), "End time of the operation."},
+        {"num_files", std::make_shared<DataTypeUInt64>(), "Number of files stored in the backup."},
+        {"total_size", std::make_shared<DataTypeUInt64>(), "Total size of files stored in the backup."},
+        {"num_entries", std::make_shared<DataTypeUInt64>(), "Number of entries in the backup, i.e. the number of files inside the folder if the backup is stored as a folder, or the number of files inside the archive if the backup is stored as an archive. It is not the same as num_files if it's an incremental backup or if it contains empty files or duplicates. The following is always true: num_entries <= num_files."},
+        {"uncompressed_size", std::make_shared<DataTypeUInt64>(), "Uncompressed size of the backup."},
+        {"compressed_size", std::make_shared<DataTypeUInt64>(), "Compressed size of the backup. If the backup is not stored as an archive it equals to uncompressed_size."},
+        {"files_read", std::make_shared<DataTypeUInt64>(), "Number of files read during the restore operation."},
+        {"bytes_read", std::make_shared<DataTypeUInt64>(), "Total size of files read during the restore operation."},
     };
 }
 
@@ -51,6 +52,7 @@ void BackupLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(info.id);
     columns[i++]->insert(info.name);
     columns[i++]->insert(info.base_backup_name);
+    columns[i++]->insert(info.query_id);
     columns[i++]->insert(static_cast<Int8>(info.status));
     columns[i++]->insert(info.error_message);
     columns[i++]->insert(static_cast<UInt32>(std::chrono::system_clock::to_time_t(info.start_time)));
diff --git a/src/Interpreters/BackupLog.h b/src/Interpreters/BackupLog.h
index 626bd55726d..e17b9b69cfd 100644
--- a/src/Interpreters/BackupLog.h
+++ b/src/Interpreters/BackupLog.h
@@ -15,7 +15,7 @@ namespace DB
 struct BackupLogElement
 {
     BackupLogElement() = default;
-    BackupLogElement(BackupOperationInfo info_);
+    explicit BackupLogElement(BackupOperationInfo info_);
     BackupLogElement(const BackupLogElement &) = default;
     BackupLogElement & operator=(const BackupLogElement &) = default;
     BackupLogElement(BackupLogElement &&) = default;
@@ -23,7 +23,7 @@ struct BackupLogElement
 
     std::chrono::system_clock::time_point event_time{};
     Decimal64 event_time_usec{};
-    BackupOperationInfo info{};
+    BackupOperationInfo info{}; /// NOLINT(bugprone-throw-keyword-missing)
 
     static std::string name() { return "BackupLog"; }
     static ColumnsDescription getColumnsDescription();
diff --git a/src/Interpreters/BlobStorageLog.cpp b/src/Interpreters/BlobStorageLog.cpp
index 520405374ca..f9d5b0d6790 100644
--- a/src/Interpreters/BlobStorageLog.cpp
+++ b/src/Interpreters/BlobStorageLog.cpp
@@ -26,23 +26,23 @@ ColumnsDescription BlobStorageLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+        {"event_date", std::make_shared<DataTypeDate>(), "Date of the event."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Time of the event."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Time of the event with microseconds precision."},
 
-        {"event_type", event_enum_type},
+        {"event_type", event_enum_type, "Type of the event. Possible values: 'Upload', 'Delete', 'MultiPartUploadCreate', 'MultiPartUploadWrite', 'MultiPartUploadComplete', 'MultiPartUploadAbort'"},
 
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
-        {"thread_name", std::make_shared<DataTypeString>()},
+        {"query_id", std::make_shared<DataTypeString>(), "Identifier of the query associated with the event, if any."},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "Identifier of the thread performing the operation."},
+        {"thread_name", std::make_shared<DataTypeString>(), "Name of the thread performing the operation."},
 
-        {"disk_name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"bucket", std::make_shared<DataTypeString>()},
-        {"remote_path", std::make_shared<DataTypeString>()},
-        {"local_path", std::make_shared<DataTypeString>()},
-        {"data_size", std::make_shared<DataTypeUInt64>()},
+        {"disk_name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Name of the associated disk."},
+        {"bucket", std::make_shared<DataTypeString>(), "Name of the bucket."},
+        {"remote_path", std::make_shared<DataTypeString>(), "Path to the remote resource."},
+        {"local_path", std::make_shared<DataTypeString>(), "Path to the metadata file on the local system, which references the remote resource."},
+        {"data_size", std::make_shared<DataTypeUInt64>(), "Size of the data involved in the upload event."},
 
-        {"error", std::make_shared<DataTypeString>()},
+        {"error", std::make_shared<DataTypeString>(), "Error message associated with the event, if any."},
     };
 }
 
diff --git a/src/Interpreters/BlobStorageLog.h b/src/Interpreters/BlobStorageLog.h
index aa57ee44c0f..15e15be4f87 100644
--- a/src/Interpreters/BlobStorageLog.h
+++ b/src/Interpreters/BlobStorageLog.h
@@ -12,7 +12,7 @@ namespace DB
 
 struct BlobStorageLogElement
 {
-    enum class EventType : Int8
+    enum class EventType : int8_t
     {
         Upload = 1,
         Delete = 2,
diff --git a/src/Interpreters/Cache/EvictionCandidates.cpp b/src/Interpreters/Cache/EvictionCandidates.cpp
index 7dceab4f95f..d20ae77d720 100644
--- a/src/Interpreters/Cache/EvictionCandidates.cpp
+++ b/src/Interpreters/Cache/EvictionCandidates.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/Cache/EvictionCandidates.h>
 #include <Interpreters/Cache/Metadata.h>
+#include <Common/CurrentThread.h>
 
 
 namespace ProfileEvents
@@ -11,62 +12,203 @@ namespace ProfileEvents
 
 namespace DB
 {
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+EvictionCandidates::EvictionCandidates()
+    : log(getLogger("EvictionCandidates"))
+{
+}
 
 EvictionCandidates::~EvictionCandidates()
 {
+    /// Here `queue_entries_to_invalidate` contains queue entries
+    /// for file segments which were successfully removed in evict().
+    /// This set is non-empty in destructor only if there was
+    /// an exception before we called finalize() or in the middle of finalize().
+    for (const auto & iterator : queue_entries_to_invalidate)
+    {
+        /// In this case we need to finalize the state of queue entries
+        /// which correspond to removed files segments to make sure
+        /// consistent state of cache.
+        iterator->invalidate();
+    }
+
+    /// We cannot reset evicting flag if we already removed queue entries.
+    if (removed_queue_entries)
+        return;
+
+    /// Here `candidates` contain only those file segments
+    /// which failed to be removed during evict()
+    /// because there was some exception before evict()
+    /// or in the middle of evict().
     for (const auto & [key, key_candidates] : candidates)
     {
+        // Reset the evicting state
+        // (as the corresponding file segments were not yet removed).
         for (const auto & candidate : key_candidates.candidates)
-            candidate->removal_candidate = false;
+            candidate->resetEvictingFlag();
     }
 }
 
-void EvictionCandidates::add(LockedKey & locked_key, const FileSegmentMetadataPtr & candidate)
+void EvictionCandidates::add(
+    const FileSegmentMetadataPtr & candidate,
+    LockedKey & locked_key,
+    const CachePriorityGuard::Lock & lock)
 {
     auto [it, inserted] = candidates.emplace(locked_key.getKey(), KeyCandidates{});
     if (inserted)
         it->second.key_metadata = locked_key.getKeyMetadata();
-    it->second.candidates.push_back(candidate);
 
-    candidate->removal_candidate = true;
+    it->second.candidates.push_back(candidate);
+    candidate->setEvictingFlag(locked_key, lock);
     ++candidates_size;
 }
 
-void EvictionCandidates::evict(FileCacheQueryLimit::QueryContext * query_context, const CacheGuard::Lock & lock)
+void EvictionCandidates::removeQueueEntries(const CachePriorityGuard::Lock & lock)
+{
+    /// Remove queue entries of eviction candidates.
+    /// This will release space we consider to be hold for them.
+
+    LOG_TEST(log, "Will remove {} eviction candidates", size());
+
+    for (const auto & [key, key_candidates] : candidates)
+    {
+        for (const auto & candidate : key_candidates.candidates)
+        {
+            auto queue_iterator = candidate->getQueueIterator();
+            queue_iterator->invalidate();
+
+            candidate->file_segment->resetQueueIterator();
+            queue_iterator->remove(lock);
+        }
+    }
+    removed_queue_entries = true;
+}
+
+void EvictionCandidates::evict()
 {
     if (candidates.empty())
         return;
 
     auto timer = DB::CurrentThread::getProfileEvents().timer(ProfileEvents::FilesystemCacheEvictMicroseconds);
 
+    /// If queue entries are already removed, then nothing to invalidate.
+    if (!removed_queue_entries)
+        queue_entries_to_invalidate.reserve(candidates_size);
+
     for (auto & [key, key_candidates] : candidates)
     {
         auto locked_key = key_candidates.key_metadata->tryLock();
         if (!locked_key)
-            continue; /// key could become invalid after we released the key lock above, just skip it.
-
-        auto & to_evict = key_candidates.candidates;
-        while (!to_evict.empty())
         {
-            auto & candidate = to_evict.back();
-            chassert(candidate->releasable());
+            /// key could become invalid after we released
+            /// the key lock above, just skip it.
+            continue;
+        }
 
+        while (!key_candidates.candidates.empty())
+        {
+            auto & candidate = key_candidates.candidates.back();
+            chassert(candidate->releasable());
             const auto segment = candidate->file_segment;
-            auto queue_it = segment->getQueueIterator();
-            chassert(queue_it);
+
+            IFileCachePriority::IteratorPtr iterator;
+            if (!removed_queue_entries)
+            {
+                iterator = segment->getQueueIterator();
+                chassert(iterator);
+            }
 
             ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictedFileSegments);
             ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictedBytes, segment->range().size());
 
-            locked_key->removeFileSegment(segment->offset(), segment->lock());
-            queue_it->remove(lock);
+            locked_key->removeFileSegment(
+                segment->offset(), segment->lock(),
+                false/* can_be_broken */, false/* invalidate_queue_entry */);
 
-            if (query_context)
-                query_context->remove(segment->key(), segment->offset(), lock);
+            /// We set invalidate_queue_entry = false in removeFileSegment() above, because:
+            ///   evict() is done without a cache priority lock while finalize() is done under the lock.
+            ///   In evict() we:
+            ///     - remove file segment from filesystem
+            ///     - remove it from cache metadata
+            ///   In finalize() we:
+            ///     - remove corresponding queue entry from priority queue
+            ///
+            ///   We do not invalidate queue entry now in evict(),
+            ///   because invalidation of queue entries needs to be done under cache lock.
+            ///   Why? Firstly, as long as queue entry exists,
+            ///   the corresponding space in cache is considered to be hold,
+            ///   and once queue entry is removed/invalidated - the space is released.
+            ///   Secondly, after evict() and finalize() stages we will also add back the
+            ///   "reserved size" (<= actually released size),
+            ///   but until we do this - we cannot allow other threads to think that
+            ///   this released space is free to take, as it is not -
+            ///   it was freed in favour of some reserver, so we can make it visibly
+            ///   free only for that particular reserver.
 
-            to_evict.pop_back();
+            if (iterator)
+                queue_entries_to_invalidate.push_back(iterator);
+
+            key_candidates.candidates.pop_back();
         }
     }
 }
 
+void EvictionCandidates::finalize(
+    FileCacheQueryLimit::QueryContext * query_context,
+    const CachePriorityGuard::Lock & lock)
+{
+    chassert(lock.owns_lock());
+
+    /// Release the hold space. It was hold only for the duration of evict() phase,
+    /// now we can release. It might also be needed for on_finalize func,
+    /// so release the space it firtst.
+    if (hold_space)
+        hold_space->release();
+
+    while (!queue_entries_to_invalidate.empty())
+    {
+        auto iterator = queue_entries_to_invalidate.back();
+        iterator->invalidate();
+        queue_entries_to_invalidate.pop_back();
+
+        /// Remove entry from per query priority queue.
+        if (query_context)
+        {
+            const auto & entry = iterator->getEntry();
+            query_context->remove(entry->key, entry->offset, lock);
+        }
+        /// Remove entry from main priority queue.
+        iterator->remove(lock);
+    }
+
+    for (auto & func : on_finalize)
+        func(lock);
+
+    /// Finalize functions might hold something (like HoldSpace object),
+    /// so we need to clear them now.
+    on_finalize.clear();
+}
+
+bool EvictionCandidates::needFinalize() const
+{
+    /// Do we need to call finalize()?
+    return !on_finalize.empty() || !queue_entries_to_invalidate.empty();
+}
+
+void EvictionCandidates::setSpaceHolder(
+    size_t size,
+    size_t elements,
+    IFileCachePriority & priority,
+    const CachePriorityGuard::Lock & lock)
+{
+    if (hold_space)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Space hold is already set");
+    else
+        hold_space = std::make_unique<IFileCachePriority::HoldSpace>(size, elements, priority, lock);
+}
+
 }
diff --git a/src/Interpreters/Cache/EvictionCandidates.h b/src/Interpreters/Cache/EvictionCandidates.h
index 0557962d97f..0dcc6bc0dda 100644
--- a/src/Interpreters/Cache/EvictionCandidates.h
+++ b/src/Interpreters/Cache/EvictionCandidates.h
@@ -4,14 +4,30 @@
 namespace DB
 {
 
-class EvictionCandidates
+class EvictionCandidates : private boost::noncopyable
 {
 public:
+    using FinalizeEvictionFunc = std::function<void(const CachePriorityGuard::Lock & lk)>;
+
+    EvictionCandidates();
     ~EvictionCandidates();
 
-    void add(LockedKey & locked_key, const FileSegmentMetadataPtr & candidate);
+    void add(
+        const FileSegmentMetadataPtr & candidate,
+        LockedKey & locked_key,
+        const CachePriorityGuard::Lock &);
 
-    void evict(FileCacheQueryLimit::QueryContext * query_context, const CacheGuard::Lock &);
+    void evict();
+
+    void removeQueueEntries(const CachePriorityGuard::Lock &);
+
+    void onFinalize(FinalizeEvictionFunc && func) { on_finalize.emplace_back(std::move(func)); }
+
+    void finalize(
+        FileCacheQueryLimit::QueryContext * query_context,
+        const CachePriorityGuard::Lock &);
+
+    bool needFinalize() const;
 
     size_t size() const { return candidates_size; }
 
@@ -19,6 +35,12 @@ public:
 
     auto end() const { return candidates.end(); }
 
+    void setSpaceHolder(
+        size_t size,
+        size_t elements,
+        IFileCachePriority & priority,
+        const CachePriorityGuard::Lock &);
+
 private:
     struct KeyCandidates
     {
@@ -28,6 +50,15 @@ private:
 
     std::unordered_map<FileCacheKey, KeyCandidates> candidates;
     size_t candidates_size = 0;
+
+    std::vector<FinalizeEvictionFunc> on_finalize;
+
+    std::vector<IFileCachePriority::IteratorPtr> queue_entries_to_invalidate;
+    bool removed_queue_entries = false;
+
+    IFileCachePriority::HoldSpacePtr hold_space;
+
+    LoggerPtr log;
 };
 
 using EvictionCandidatesPtr = std::unique_ptr<EvictionCandidates>;
diff --git a/src/Interpreters/Cache/FileCache.cpp b/src/Interpreters/Cache/FileCache.cpp
index 6b627cb07b3..be452e43bed 100644
--- a/src/Interpreters/Cache/FileCache.cpp
+++ b/src/Interpreters/Cache/FileCache.cpp
@@ -13,6 +13,7 @@
 #include <base/hex.h>
 #include <Common/ThreadPool.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
+#include <Core/ServerUUID.h>
 
 #include <filesystem>
 
@@ -26,46 +27,53 @@ namespace ProfileEvents
     extern const Event FilesystemCacheReserveMicroseconds;
     extern const Event FilesystemCacheGetOrSetMicroseconds;
     extern const Event FilesystemCacheGetMicroseconds;
-}
-
-namespace
-{
-
-size_t roundDownToMultiple(size_t num, size_t multiple)
-{
-    return (num / multiple) * multiple;
-}
-
-size_t roundUpToMultiple(size_t num, size_t multiple)
-{
-    return roundDownToMultiple(num + multiple - 1, multiple);
-}
-
+    extern const Event FilesystemCacheFailToReserveSpaceBecauseOfLockContention;
 }
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
 }
 
+namespace
+{
+    size_t roundDownToMultiple(size_t num, size_t multiple)
+    {
+        return (num / multiple) * multiple;
+    }
+
+    size_t roundUpToMultiple(size_t num, size_t multiple)
+    {
+        return roundDownToMultiple(num + multiple - 1, multiple);
+    }
+
+    std::string getCommonUserID()
+    {
+        auto user_from_context = DB::Context::getGlobalContextInstance()->getFilesystemCacheUser();
+        const auto user = user_from_context.empty() ? toString(ServerUUID::get()) : user_from_context;
+        return user;
+    }
+}
+
 void FileCacheReserveStat::update(size_t size, FileSegmentKind kind, bool releasable)
 {
     auto & local_stat = stat_by_kind[kind];
     if (releasable)
     {
-        stat.releasable_size += size;
-        ++stat.releasable_count;
+        total_stat.releasable_size += size;
+        ++total_stat.releasable_count;
 
         local_stat.releasable_size += size;
         ++local_stat.releasable_count;
     }
     else
     {
-        stat.non_releasable_size += size;
-        ++stat.non_releasable_count;
+        total_stat.non_releasable_size += size;
+        ++total_stat.non_releasable_count;
 
         local_stat.non_releasable_size += size;
         ++local_stat.non_releasable_count;
@@ -77,13 +85,20 @@ FileCache::FileCache(const std::string & cache_name, const FileCacheSettings & s
     , bypass_cache_threshold(settings.enable_bypass_cache_with_threshold ? settings.bypass_cache_threshold : 0)
     , boundary_alignment(settings.boundary_alignment)
     , load_metadata_threads(settings.load_metadata_threads)
-    , log(&Poco::Logger::get("FileCache(" + cache_name + ")"))
-    , metadata(settings.base_path, settings.background_download_queue_size_limit, settings.background_download_threads)
+    , write_cache_per_user_directory(settings.write_cache_per_user_id_directory)
+    , log(getLogger("FileCache(" + cache_name + ")"))
+    , metadata(settings.base_path, settings.background_download_queue_size_limit, settings.background_download_threads, write_cache_per_user_directory)
 {
     if (settings.cache_policy == "LRU")
-        main_priority = std::make_unique<LRUFileCachePriority>(settings.max_size, settings.max_elements);
+    {
+        main_priority = std::make_unique<LRUFileCachePriority>(
+            settings.max_size, settings.max_elements, nullptr, cache_name);
+    }
     else if (settings.cache_policy == "SLRU")
-        main_priority = std::make_unique<SLRUFileCachePriority>(settings.max_size, settings.max_elements, settings.slru_size_ratio);
+    {
+        main_priority = std::make_unique<SLRUFileCachePriority>(
+            settings.max_size, settings.max_elements, settings.slru_size_ratio, nullptr, nullptr, cache_name);
+    }
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown cache policy: {}", settings.cache_policy);
 
@@ -101,19 +116,31 @@ FileCache::Key FileCache::createKeyForPath(const String & path)
     return Key(path);
 }
 
+const FileCache::UserInfo & FileCache::getCommonUser()
+{
+    static UserInfo user(getCommonUserID(), 0);
+    return user;
+}
+
+const FileCache::UserInfo & FileCache::getInternalUser()
+{
+    static UserInfo user("internal");
+    return user;
+}
+
 const String & FileCache::getBasePath() const
 {
     return metadata.getBaseDirectory();
 }
 
-String FileCache::getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const
+String FileCache::getFileSegmentPath(const Key & key, size_t offset, FileSegmentKind segment_kind, const UserInfo & user) const
 {
-    return metadata.getPathForFileSegment(key, offset, segment_kind);
+    return metadata.getFileSegmentPath(key, offset, segment_kind, user);
 }
 
-String FileCache::getPathInLocalCache(const Key & key) const
+String FileCache::getKeyPath(const Key & key, const UserInfo & user) const
 {
-    return metadata.getPathForKey(key);
+    return metadata.getKeyPath(key, user);
 }
 
 void FileCache::assertInitialized() const
@@ -159,15 +186,21 @@ void FileCache::initialize()
     }
 
     metadata.startup();
+
     is_initialized = true;
 }
 
-CacheGuard::Lock FileCache::lockCache() const
+CachePriorityGuard::Lock FileCache::lockCache() const
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheLockCacheMicroseconds);
     return cache_guard.lock();
 }
 
+CachePriorityGuard::Lock FileCache::tryLockCache(std::optional<std::chrono::milliseconds> acquire_timeout) const
+{
+    return acquire_timeout.has_value() ? cache_guard.tryLockFor(acquire_timeout.value()) : cache_guard.tryLock();
+}
+
 FileSegments FileCache::getImpl(const LockedKey & locked_key, const FileSegment::Range & range, size_t file_segments_limit) const
 {
     /// Given range = [left, right] and non-overlapping ordered set of file segments,
@@ -190,7 +223,7 @@ FileSegments FileCache::getImpl(const LockedKey & locked_key, const FileSegment:
             return false;
 
         FileSegmentPtr file_segment;
-        if (!file_segment_metadata.evicting())
+        if (!file_segment_metadata.isEvicting(locked_key))
         {
             file_segment = file_segment_metadata.file_segment;
         }
@@ -276,9 +309,10 @@ std::vector<FileSegment::Range> FileCache::splitRange(size_t offset, size_t size
     size_t remaining_size = size;
 
     FileSegments file_segments;
+    const size_t max_size = max_file_segment_size.load();
     while (current_pos < end_pos_non_included)
     {
-        auto current_file_segment_size = std::min(remaining_size, max_file_segment_size);
+        auto current_file_segment_size = std::min(remaining_size, max_size);
         ranges.emplace_back(current_pos, current_pos + current_file_segment_size - 1);
 
         remaining_size -= current_file_segment_size;
@@ -305,9 +339,10 @@ FileSegments FileCache::splitRangeIntoFileSegments(
     size_t remaining_size = size;
 
     FileSegments file_segments;
+    const size_t max_size = max_file_segment_size.load();
     while (current_pos < end_pos_non_included && (!file_segments_limit || file_segments.size() < file_segments_limit))
     {
-        current_file_segment_size = std::min(remaining_size, max_file_segment_size);
+        current_file_segment_size = std::min(remaining_size, max_size);
         remaining_size -= current_file_segment_size;
 
         auto file_segment_metadata_it = addFileSegment(
@@ -468,11 +503,12 @@ FileSegmentsHolderPtr FileCache::set(
     const Key & key,
     size_t offset,
     size_t size,
-    const CreateFileSegmentSettings & create_settings)
+    const CreateFileSegmentSettings & create_settings,
+    const UserInfo & user)
 {
     assertInitialized();
 
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY, user);
     FileSegment::Range range(offset, offset + size - 1);
 
     auto file_segments = getImpl(*locked_key, range, /* file_segments_limit */0);
@@ -502,7 +538,8 @@ FileCache::getOrSet(
     size_t size,
     size_t file_size,
     const CreateFileSegmentSettings & create_settings,
-    size_t file_segments_limit)
+    size_t file_segments_limit,
+    const UserInfo & user)
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheGetOrSetMicroseconds);
 
@@ -516,7 +553,7 @@ FileCache::getOrSet(
     chassert(aligned_offset <= range.left);
     chassert(aligned_end_offset >= range.right);
 
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY, user);
     /// Get all segments which intersect with the given range.
     auto file_segments = getImpl(*locked_key, range, file_segments_limit);
 
@@ -631,13 +668,18 @@ FileCache::getOrSet(
     return std::make_unique<FileSegmentsHolder>(std::move(file_segments));
 }
 
-FileSegmentsHolderPtr FileCache::get(const Key & key, size_t offset, size_t size, size_t file_segments_limit)
+FileSegmentsHolderPtr FileCache::get(
+    const Key & key,
+    size_t offset,
+    size_t size,
+    size_t file_segments_limit,
+    const UserID & user_id)
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheGetMicroseconds);
 
     assertInitialized();
 
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL, UserInfo(user_id));
     if (locked_key)
     {
         FileSegment::Range range(offset, offset + size - 1);
@@ -671,7 +713,7 @@ KeyMetadata::iterator FileCache::addFileSegment(
     size_t size,
     FileSegment::State state,
     const CreateFileSegmentSettings & create_settings,
-    const CacheGuard::Lock * lock)
+    const CachePriorityGuard::Lock * lock)
 {
     /// Create a file_segment_metadata and put it in `files` map by [key][offset].
 
@@ -705,7 +747,7 @@ KeyMetadata::iterator FileCache::addFileSegment(
             auto & stash_records = stash->records;
 
             stash_records.emplace(
-                stash_key, stash->queue->add(locked_key.getKeyMetadata(), offset, 0, *lock));
+                stash_key, stash->queue->add(locked_key.getKeyMetadata(), offset, 0, locked_key.getKeyMetadata()->user, *lock));
 
             if (stash->queue->getElementsCount(*lock) > stash->queue->getElementsLimit(*lock))
                 stash->queue->pop(*lock);
@@ -738,17 +780,37 @@ KeyMetadata::iterator FileCache::addFileSegment(
     return file_segment_metadata_it;
 }
 
-bool FileCache::tryReserve(FileSegment & file_segment, const size_t size, FileCacheReserveStat & reserve_stat)
+bool FileCache::tryReserve(
+    FileSegment & file_segment,
+    const size_t size,
+    FileCacheReserveStat & reserve_stat,
+    const UserInfo & user,
+    size_t lock_wait_timeout_milliseconds)
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FilesystemCacheReserveMicroseconds);
 
     assertInitialized();
-    auto cache_lock = lockCache();
+
+    /// A logical race on cache_is_being_resized is still possible,
+    /// in this case we will try to lock cache with timeout, this is ok, timeout is small
+    /// and as resizing of cache can take a long time then this small chance of a race is
+    /// ok compared to the number of cases this check will help.
+    if (cache_is_being_resized.load(std::memory_order_relaxed))
+    {
+        ProfileEvents::increment(ProfileEvents::FilesystemCacheFailToReserveSpaceBecauseOfLockContention);
+        return false;
+    }
+
+    auto cache_lock = tryLockCache(std::chrono::milliseconds(lock_wait_timeout_milliseconds));
+    if (!cache_lock)
+    {
+        ProfileEvents::increment(ProfileEvents::FilesystemCacheFailToReserveSpaceBecauseOfLockContention);
+        return false;
+    }
 
     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(cache_lock));
+        log, "Trying to reserve space ({} bytes) for {}:{}, current usage: {}",
+        size, file_segment.key(), file_segment.offset(), main_priority->getStateInfoForLog(cache_lock));
 
     /// 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,
@@ -775,99 +837,144 @@ bool FileCache::tryReserve(FileSegment & file_segment, const size_t size, FileCa
             file_segment.key(), file_segment.offset());
     }
 
-    EvictionCandidates eviction_candidates;
-    IFileCachePriority::FinalizeEvictionFunc finalize_eviction_func;
+    auto queue_iterator = file_segment.getQueueIterator();
 
+    /// A file_segment_metadata acquires a priority iterator
+    /// on first successful space reservation attempt,
+    /// so queue_iterator == nullptr, if no space reservation took place yet.
+    chassert(!queue_iterator || file_segment.getReservedSize() > 0);
+
+    /// If it is the first space reservatiob attempt for a file segment
+    /// we need to make space for 1 element in cache,
+    /// otherwise space is already taken and we need 0 elements to free.
+    size_t required_elements_num = queue_iterator ? 0 : 1;
+
+    EvictionCandidates eviction_candidates;
+
+    /// If user has configured fs cache limit per query,
+    /// we take into account query limits here.
     if (query_priority)
     {
-        if (!query_priority->collectCandidatesForEviction(size, reserve_stat, eviction_candidates, {}, finalize_eviction_func, cache_lock))
+        if (!query_priority->collectCandidatesForEviction(
+                size, required_elements_num, reserve_stat, eviction_candidates, {}, user.user_id, cache_lock))
+        {
             return false;
+        }
+
+        LOG_TEST(log, "Query limits satisfied (while reserving for {}:{})",
+                 file_segment.key(), file_segment.offset());
 
-        LOG_TEST(log, "Query limits satisfied (while reserving for {}:{})", file_segment.key(), file_segment.offset());
         /// If we have enough space in query_priority, we are not interested about stat there anymore.
         /// Clean the stat before iterating main_priority to avoid calculating any segment stat twice.
         reserve_stat.stat_by_kind.clear();
     }
 
-    /// A file_segment_metadata acquires a priority iterator on first successful space reservation attempt,
-    auto queue_iterator = file_segment.getQueueIterator();
-    chassert(!queue_iterator || file_segment.getReservedSize() > 0);
-
-    if (!main_priority->collectCandidatesForEviction(size, reserve_stat, eviction_candidates, queue_iterator, finalize_eviction_func, cache_lock))
+    if (!main_priority->collectCandidatesForEviction(
+            size, required_elements_num, reserve_stat, eviction_candidates, queue_iterator, user.user_id, cache_lock))
+    {
         return false;
+    }
 
     if (!file_segment.getKeyMetadata()->createBaseDirectory())
         return false;
 
-    eviction_candidates.evict(query_context.get(), cache_lock);
+    if (eviction_candidates.size() > 0)
+    {
+        cache_lock.unlock();
+        try
+        {
+            /// Remove eviction candidates from filesystem.
+            eviction_candidates.evict();
+        }
+        catch (...)
+        {
+            cache_lock.lock();
+            /// Invalidate queue entries if some succeeded to be removed.
+            eviction_candidates.finalize(query_context.get(), cache_lock);
+            throw;
+        }
 
-    if (finalize_eviction_func)
-        finalize_eviction_func(cache_lock);
+        cache_lock.lock();
+
+        /// Invalidate and remove queue entries and execute finalize func.
+        eviction_candidates.finalize(query_context.get(), cache_lock);
+    }
+    else if (!main_priority->canFit(size, required_elements_num, cache_lock, queue_iterator))
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR,
+            "Cannot fit {} in cache, but collection of eviction candidates succeeded with no candidates. "
+            "This is a bug. Queue entry type: {}. Cache info: {}",
+            size, queue_iterator ? queue_iterator->getType() : FileCacheQueueEntryType::None,
+            main_priority->getStateInfoForLog(cache_lock));
+    }
 
     if (queue_iterator)
     {
-        queue_iterator->updateSize(size);
+        /// Increase size of queue entry.
+        queue_iterator->incrementSize(size, cache_lock);
     }
     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);
+        /// Create a new queue entry and assign currently reserved size to it.
+        queue_iterator = main_priority->add(file_segment.getKeyMetadata(), file_segment.offset(), size, user, cache_lock);
         file_segment.setQueueIterator(queue_iterator);
     }
 
-    file_segment.reserved_size += size;
-    chassert(file_segment.reserved_size == queue_iterator->getEntry().size);
+    main_priority->check(cache_lock);
 
     if (query_context)
     {
         auto query_queue_it = query_context->tryGet(file_segment.key(), file_segment.offset(), cache_lock);
         if (query_queue_it)
-            query_queue_it->updateSize(size);
+            query_queue_it->incrementSize(size, cache_lock);
         else
-            query_context->add(file_segment.getKeyMetadata(), file_segment.offset(), size, cache_lock);
+            query_context->add(file_segment.getKeyMetadata(), file_segment.offset(), size, user, cache_lock);
     }
 
+    file_segment.reserved_size += size;
+    chassert(file_segment.reserved_size == queue_iterator->getEntry()->size);
+
     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::iterate(IterateFunc && func)
+void FileCache::iterate(IterateFunc && func, const UserID & user_id)
 {
     return metadata.iterate([&](const LockedKey & locked_key)
     {
         for (const auto & file_segment_metadata : locked_key)
             func(FileSegment::getInfo(file_segment_metadata.second->file_segment));
-    });
+    }, user_id);
 }
 
-void FileCache::removeKey(const Key & key)
+void FileCache::removeKey(const Key & key, const UserID & user_id)
 {
     assertInitialized();
-    metadata.removeKey(key, /* if_exists */false, /* if_releasable */true);
+    metadata.removeKey(key, /* if_exists */false, /* if_releasable */true, user_id);
 }
 
-void FileCache::removeKeyIfExists(const Key & key)
+void FileCache::removeKeyIfExists(const Key & key, const UserID & user_id)
 {
     assertInitialized();
-    metadata.removeKey(key, /* if_exists */true, /* if_releasable */true);
+    metadata.removeKey(key, /* if_exists */true, /* if_releasable */true, user_id);
 }
 
-void FileCache::removeFileSegment(const Key & key, size_t offset)
+void FileCache::removeFileSegment(const Key & key, size_t offset, const UserID & user_id)
 {
     assertInitialized();
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::THROW);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::THROW, UserInfo(user_id));
     locked_key->removeFileSegment(offset);
 }
 
-void FileCache::removePathIfExists(const String & path)
+void FileCache::removePathIfExists(const String & path, const UserID & user_id)
 {
-    removeKeyIfExists(createKeyForPath(path));
+    removeKeyIfExists(createKeyForPath(path), user_id);
 }
 
-void FileCache::removeAllReleasable()
+void FileCache::removeAllReleasable(const UserID & user_id)
 {
     assertInitialized();
 
@@ -875,7 +982,7 @@ void FileCache::removeAllReleasable()
     assertCacheCorrectness();
 #endif
 
-    metadata.removeAllKeys(/* if_releasable */true);
+    metadata.removeAllKeys(/* if_releasable */true, user_id);
 
     if (stash)
     {
@@ -937,7 +1044,7 @@ void FileCache::loadMetadataImpl()
     std::mutex set_exception_mutex;
     std::atomic<bool> stop_loading = false;
 
-    LOG_INFO(log, "Loading filesystem cache with {} threads", load_metadata_threads);
+    LOG_INFO(log, "Loading filesystem cache with {} threads from {}", load_metadata_threads, metadata.getBaseDirectory());
 
     for (size_t i = 0; i < load_metadata_threads; ++i)
     {
@@ -1002,6 +1109,24 @@ void FileCache::loadMetadataForKeys(const fs::path & keys_dir)
         return;
     }
 
+    UserInfo user;
+    if (write_cache_per_user_directory)
+    {
+        auto filename = keys_dir.filename().string();
+
+        auto pos = filename.find_last_of('.');
+        if (pos == std::string::npos)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected file format: {}", filename);
+
+        user = UserInfo(filename.substr(0, pos), parse<UInt64>(filename.substr(pos + 1)));
+
+        LOG_TEST(log, "Loading cache for user {}", user.user_id);
+    }
+    else
+    {
+        user = getCommonUser();
+    }
+
     UInt64 offset = 0, size = 0;
     for (; key_it != fs::directory_iterator(); key_it++)
     {
@@ -1024,7 +1149,7 @@ void FileCache::loadMetadataForKeys(const fs::path & keys_dir)
         }
 
         const auto key = Key::fromKeyString(key_directory.filename().string());
-        auto key_metadata = metadata.getKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY, /* is_initial_load */true);
+        auto key_metadata = metadata.getKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::CREATE_EMPTY, user, /* is_initial_load */true);
 
         for (fs::directory_iterator offset_it{key_directory}; offset_it != fs::directory_iterator(); ++offset_it)
         {
@@ -1072,9 +1197,9 @@ void FileCache::loadMetadataForKeys(const fs::path & keys_dir)
                 auto lock = lockCache();
                 size_limit = main_priority->getSizeLimit(lock);
 
-                limits_satisfied = main_priority->canFit(size, lock);
+                limits_satisfied = main_priority->canFit(size, 1, lock, nullptr, true);
                 if (limits_satisfied)
-                    cache_it = main_priority->add(key_metadata, offset, size, lock, /* is_startup */true);
+                    cache_it = main_priority->add(key_metadata, offset, size, user, lock, /* best_effort */true);
 
                 /// TODO: we can get rid of this lockCache() if we first load everything in parallel
                 /// without any mutual lock between loading threads, and only after do removeOverflow().
@@ -1128,7 +1253,7 @@ void FileCache::loadMetadataForKeys(const fs::path & keys_dir)
 
         if (key_metadata->sizeUnlocked() == 0)
         {
-            metadata.removeKey(key, false, false);
+            metadata.removeKey(key, false, false, getInternalUser().user_id);
         }
     }
 }
@@ -1147,7 +1272,7 @@ void FileCache::deactivateBackgroundOperations()
     metadata.shutdown();
 }
 
-std::vector<FileSegment::Info> FileCache::getFileSegmentInfos()
+std::vector<FileSegment::Info> FileCache::getFileSegmentInfos(const UserID & user_id)
 {
     assertInitialized();
 #ifndef NDEBUG
@@ -1159,20 +1284,20 @@ std::vector<FileSegment::Info> FileCache::getFileSegmentInfos()
     {
         for (const auto & [_, file_segment_metadata] : locked_key)
             file_segments.push_back(FileSegment::getInfo(file_segment_metadata->file_segment));
-    });
+    }, user_id);
     return file_segments;
 }
 
-std::vector<FileSegment::Info> FileCache::getFileSegmentInfos(const Key & key)
+std::vector<FileSegment::Info> FileCache::getFileSegmentInfos(const Key & key, const UserID & user_id)
 {
     std::vector<FileSegment::Info> file_segments;
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::THROW_LOGICAL);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::THROW_LOGICAL, UserInfo(user_id));
     for (const auto & [_, file_segment_metadata] : *locked_key)
         file_segments.push_back(FileSegment::getInfo(file_segment_metadata->file_segment));
     return file_segments;
 }
 
-std::vector<FileSegment::Info> FileCache::dumpQueue()
+IFileCachePriority::PriorityDumpPtr FileCache::dumpQueue()
 {
     assertInitialized();
     return main_priority->dump(lockCache());
@@ -1182,7 +1307,7 @@ std::vector<String> FileCache::tryGetCachePaths(const Key & key)
 {
     assertInitialized();
 
-    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL);
+    auto locked_key = metadata.lockKeyMetadata(key, CacheMetadata::KeyNotFoundPolicy::RETURN_NULL, getInternalUser());
     if (!locked_key)
         return {};
 
@@ -1190,20 +1315,23 @@ std::vector<String> FileCache::tryGetCachePaths(const Key & key)
 
     for (const auto & [offset, file_segment_metadata] : *locked_key)
     {
-        if (file_segment_metadata->file_segment->state() == FileSegment::State::DOWNLOADED)
-            cache_paths.push_back(metadata.getPathForFileSegment(key, offset, file_segment_metadata->file_segment->getKind()));
+        const auto & file_segment = *file_segment_metadata->file_segment;
+        if (file_segment.state() == FileSegment::State::DOWNLOADED)
+            cache_paths.push_back(locked_key->getKeyMetadata()->getFileSegmentPath(file_segment));
     }
     return cache_paths;
 }
 
 size_t FileCache::getUsedCacheSize() const
 {
-    return main_priority->getSize(lockCache());
+    /// We use this method for metrics, so it is ok to get approximate result.
+    return main_priority->getSizeApprox();
 }
 
 size_t FileCache::getFileSegmentsNum() const
 {
-    return main_priority->getElementsCount(lockCache());
+    /// We use this method for metrics, so it is ok to get approximate result.
+    return main_priority->getElementsCountApprox();
 }
 
 void FileCache::assertCacheCorrectness()
@@ -1214,7 +1342,7 @@ void FileCache::assertCacheCorrectness()
         {
             chassert(file_segment_metadata->file_segment->assertCorrectness());
         }
-    });
+    }, getInternalUser().user_id);
 }
 
 void FileCache::applySettingsIfPossible(const FileCacheSettings & new_settings, FileCacheSettings & actual_settings)
@@ -1257,55 +1385,92 @@ void FileCache::applySettingsIfPossible(const FileCacheSettings & new_settings,
         }
     }
 
-
     if (new_settings.max_size != actual_settings.max_size
         || new_settings.max_elements != actual_settings.max_elements)
     {
-        auto cache_lock = lockCache();
+        EvictionCandidates eviction_candidates;
+        bool modified_size_limit = false;
 
-        bool updated = false;
-        try
+        /// In order to not block cache for the duration of cache resize,
+        /// we do:
+        /// a. Take a cache lock.
+        ///     1. Collect eviction candidates,
+        ///     2. Remove queue entries of eviction candidates.
+        ///        This will release space we consider to be hold for them,
+        ///        so that we can safely modify size limits.
+        ///     3. Modify size limits of cache.
+        /// b. Release a cache lock.
+        ///     1. Do actual eviction from filesystem.
         {
-            updated = main_priority->modifySizeLimits(
-                new_settings.max_size, new_settings.max_elements, new_settings.slru_size_ratio, cache_lock);
-        }
-        catch (...)
-        {
-            actual_settings.max_size = main_priority->getSizeLimit(cache_lock);
-            actual_settings.max_elements = main_priority->getElementsLimit(cache_lock);
-            throw;
+            cache_is_being_resized.store(true, std::memory_order_relaxed);
+            SCOPE_EXIT({
+                cache_is_being_resized.store(false, std::memory_order_relaxed);
+            });
+
+            auto cache_lock = lockCache();
+
+            FileCacheReserveStat stat;
+            if (main_priority->collectCandidatesForEviction(
+                    new_settings.max_size, new_settings.max_elements, 0/* max_candidates_to_evict */,
+                    stat, eviction_candidates, cache_lock))
+            {
+                /// Remove only queue entries of eviction candidates.
+                eviction_candidates.removeQueueEntries(cache_lock);
+                /// Note that (in-memory) metadata about corresponding file segments
+                /// (e.g. file segment info in CacheMetadata) will be removed
+                /// only after eviction from filesystem. This is needed to avoid
+                /// a race on removal of file from filesystsem and
+                /// addition of the same file as part of a newly cached file segment.
+
+                /// Modify cache size limits.
+                /// From this point cache eviction will follow them.
+                main_priority->modifySizeLimits(
+                    new_settings.max_size, new_settings.max_elements,
+                    new_settings.slru_size_ratio, cache_lock);
+
+                modified_size_limit = true;
+            }
         }
 
-        if (updated)
+        if (modified_size_limit)
         {
+            try
+            {
+                /// Do actual eviction from filesystem.
+                eviction_candidates.evict();
+            }
+            catch (...)
+            {
+                if (eviction_candidates.needFinalize())
+                    eviction_candidates.finalize(nullptr, lockCache());
+                throw;
+            }
+
+            if (eviction_candidates.needFinalize())
+                eviction_candidates.finalize(nullptr, lockCache());
+
             LOG_INFO(log, "Changed max_size from {} to {}, max_elements from {} to {}",
                     actual_settings.max_size, new_settings.max_size,
                     actual_settings.max_elements, new_settings.max_elements);
 
-            actual_settings.max_size = main_priority->getSizeLimit(cache_lock);
-            actual_settings.max_elements = main_priority->getElementsLimit(cache_lock);
+            actual_settings.max_size = new_settings.max_size;
+            actual_settings.max_elements = new_settings.max_elements;
+        }
+        else
+        {
+            LOG_WARNING(
+                log, "Unable to modify size limit from {} to {}, elements limit from {} to {}. "
+                "`max_size` and `max_elements` settings will remain inconsistent with config.xml. "
+                "Next attempt to update them will happen on the next config reload. "
+                "You can trigger it with SYSTEM RELOAD CONFIG.",
+                actual_settings.max_size, new_settings.max_size,
+                actual_settings.max_elements, new_settings.max_elements);
         }
     }
-}
 
-FileCache::QueryContextHolder::QueryContextHolder(
-    const String & query_id_,
-    FileCache * cache_,
-    FileCacheQueryLimit::QueryContextPtr context_)
-    : query_id(query_id_)
-    , cache(cache_)
-    , context(context_)
-{
-}
-
-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)
+    if (new_settings.max_file_segment_size != actual_settings.max_file_segment_size)
     {
-        auto lock = cache->lockCache();
-        cache->query_limit->removeQueryContext(query_id, lock);
+        max_file_segment_size = actual_settings.max_file_segment_size = new_settings.max_file_segment_size;
     }
 }
 
@@ -1317,7 +1482,7 @@ FileCache::QueryContextHolderPtr FileCache::getQueryContextHolder(
 
     auto lock = lockCache();
     auto context = query_limit->getOrSetQueryContext(query_id, read_settings, lock);
-    return std::make_unique<QueryContextHolder>(query_id, this, std::move(context));
+    return std::make_unique<QueryContextHolder>(query_id, this, query_limit.get(), std::move(context));
 }
 
 std::vector<FileSegment::Info> FileCache::sync()
@@ -1327,7 +1492,7 @@ std::vector<FileSegment::Info> FileCache::sync()
     {
         auto broken = locked_key.sync();
         file_segments.insert(file_segments.end(), broken.begin(), broken.end());
-    });
+    }, getInternalUser().user_id);
     return file_segments;
 }
 
diff --git a/src/Interpreters/Cache/FileCache.h b/src/Interpreters/Cache/FileCache.h
index 11d35535e9e..684ca83fff8 100644
--- a/src/Interpreters/Cache/FileCache.h
+++ b/src/Interpreters/Cache/FileCache.h
@@ -17,6 +17,8 @@
 #include <Interpreters/Cache/QueryLimit.h>
 #include <Interpreters/Cache/FileCache_fwd_internal.h>
 #include <Interpreters/Cache/FileCacheSettings.h>
+#include <Interpreters/Cache/UserInfo.h>
+#include <Core/BackgroundSchedulePool.h>
 #include <filesystem>
 
 
@@ -34,12 +36,29 @@ struct FileCacheReserveStat
 
         size_t non_releasable_size = 0;
         size_t non_releasable_count = 0;
+
+        Stat & operator +=(const Stat & other)
+        {
+            releasable_size += other.releasable_size;
+            releasable_count += other.releasable_count;
+            non_releasable_size += other.non_releasable_size;
+            non_releasable_count += other.non_releasable_count;
+            return *this;
+        }
     };
 
-    Stat stat;
+    Stat total_stat;
     std::unordered_map<FileSegmentKind, Stat> stat_by_kind;
 
     void update(size_t size, FileSegmentKind kind, bool releasable);
+
+    FileCacheReserveStat & operator +=(const FileCacheReserveStat & other)
+    {
+        total_stat += other.total_stat;
+        for (const auto & [name, stat_] : other.stat_by_kind)
+            stat_by_kind[name] += stat_;
+        return *this;
+    }
 };
 
 /// Local cache for remote filesystem files, represented as a set of non-overlapping non-empty file segments.
@@ -51,6 +70,9 @@ public:
     using QueryLimit = DB::FileCacheQueryLimit;
     using Priority = IFileCachePriority;
     using PriorityEntry = IFileCachePriority::Entry;
+    using QueryContextHolder = FileCacheQueryLimit::QueryContextHolder;
+    using UserInfo = FileCacheUserInfo;
+    using UserID = UserInfo::UserID;
 
     FileCache(const std::string & cache_name, const FileCacheSettings & settings);
 
@@ -62,9 +84,13 @@ public:
 
     static Key createKeyForPath(const String & path);
 
-    String getPathInLocalCache(const Key & key, size_t offset, FileSegmentKind segment_kind) const;
+    static const UserInfo & getCommonUser();
 
-    String getPathInLocalCache(const Key & key) const;
+    static const UserInfo & getInternalUser();
+
+    String getFileSegmentPath(const Key & key, size_t offset, FileSegmentKind segment_kind, const UserInfo & user) const;
+
+    String getKeyPath(const Key & key, const UserInfo & user) const;
 
     /**
      * Given an `offset` and `size` representing [offset, offset + size) bytes interval,
@@ -83,7 +109,8 @@ public:
         size_t size,
         size_t file_size,
         const CreateFileSegmentSettings & settings,
-        size_t file_segments_limit = 0);
+        size_t file_segments_limit,
+        const UserInfo & user);
 
     /**
      * Segments in returned list are ordered in ascending order and represent a full contiguous
@@ -94,24 +121,34 @@ public:
      * with the destruction of the holder, while in getOrSet() EMPTY file segments can eventually change
      * it's state (and become DOWNLOADED).
      */
-    FileSegmentsHolderPtr get(const Key & key, size_t offset, size_t size, size_t file_segments_limit);
+    FileSegmentsHolderPtr get(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        size_t file_segments_limit,
+        const UserID & user_id);
 
-    FileSegmentsHolderPtr set(const Key & key, size_t offset, size_t size, const CreateFileSegmentSettings & settings);
+    FileSegmentsHolderPtr set(
+        const Key & key,
+        size_t offset,
+        size_t size,
+        const CreateFileSegmentSettings & settings,
+        const UserInfo & user);
 
     /// Remove file segment by `key` and `offset`. Throws if file segment does not exist.
-    void removeFileSegment(const Key & key, size_t offset);
+    void removeFileSegment(const Key & key, size_t offset, const UserID & user_id);
 
     /// Remove files by `key`. Throws if key does not exist.
-    void removeKey(const Key & key);
+    void removeKey(const Key & key, const UserID & user_id);
 
     /// Remove files by `key`.
-    void removeKeyIfExists(const Key & key);
+    void removeKeyIfExists(const Key & key, const UserID & user_id);
 
     /// Removes files by `path`.
-    void removePathIfExists(const String & path);
+    void removePathIfExists(const String & path, const UserID & user_id);
 
     /// Remove files by `key`.
-    void removeAllReleasable();
+    void removeAllReleasable(const UserID & user_id);
 
     std::vector<String> tryGetCachePaths(const Key & key);
 
@@ -121,63 +158,59 @@ public:
 
     size_t getMaxFileSegmentSize() const { return max_file_segment_size; }
 
-    bool tryReserve(FileSegment & file_segment, size_t size, FileCacheReserveStat & stat);
+    bool tryReserve(
+        FileSegment & file_segment,
+        size_t size,
+        FileCacheReserveStat & stat,
+        const UserInfo & user,
+        size_t lock_wait_timeout_milliseconds);
 
-    std::vector<FileSegment::Info> getFileSegmentInfos();
+    std::vector<FileSegment::Info> getFileSegmentInfos(const UserID & user_id);
 
-    std::vector<FileSegment::Info> getFileSegmentInfos(const Key & key);
+    std::vector<FileSegment::Info> getFileSegmentInfos(const Key & key, const UserID & user_id);
 
-    std::vector<FileSegment::Info> dumpQueue();
+
+    IFileCachePriority::PriorityDumpPtr dumpQueue();
 
     void deactivateBackgroundOperations();
 
-    /// For per query cache limit.
-    struct QueryContextHolder : private boost::noncopyable
-    {
-        QueryContextHolder(const String & query_id_, FileCache * cache_, QueryLimit::QueryContextPtr context_);
-
-        QueryContextHolder() = default;
-
-        ~QueryContextHolder();
-
-        String query_id;
-        FileCache * cache = nullptr;
-        QueryLimit::QueryContextPtr context;
-    };
-    using QueryContextHolderPtr = std::unique_ptr<QueryContextHolder>;
-    QueryContextHolderPtr getQueryContextHolder(const String & query_id, const ReadSettings & settings);
-
-    CacheGuard::Lock lockCache() const;
+    CachePriorityGuard::Lock lockCache() const;
+    CachePriorityGuard::Lock tryLockCache(std::optional<std::chrono::milliseconds> acquire_timeout = std::nullopt) const;
 
     std::vector<FileSegment::Info> sync();
 
+    using QueryContextHolderPtr = std::unique_ptr<QueryContextHolder>;
+    QueryContextHolderPtr getQueryContextHolder(const String & query_id, const ReadSettings & settings);
+
     using IterateFunc = std::function<void(const FileSegmentInfo &)>;
-    void iterate(IterateFunc && func);
+    void iterate(IterateFunc && func, const UserID & user_id);
 
     void applySettingsIfPossible(const FileCacheSettings & new_settings, FileCacheSettings & actual_settings);
 
 private:
     using KeyAndOffset = FileCacheKeyAndOffset;
 
-    const size_t max_file_segment_size;
+    std::atomic<size_t> max_file_segment_size;
     const size_t bypass_cache_threshold;
     const size_t boundary_alignment;
     size_t load_metadata_threads;
+    const bool write_cache_per_user_directory;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::exception_ptr init_exception;
     std::atomic<bool> is_initialized = false;
     mutable std::mutex init_mutex;
     std::unique_ptr<StatusFile> status_file;
     std::atomic<bool> shutdown = false;
+    std::atomic<bool> cache_is_being_resized = false;
 
     std::mutex apply_settings_mutex;
 
     CacheMetadata metadata;
 
     FileCachePriorityPtr main_priority;
-    mutable CacheGuard cache_guard;
+    mutable CachePriorityGuard cache_guard;
 
     struct HitsCountStash
     {
@@ -249,7 +282,7 @@ private:
         size_t size,
         FileSegment::State state,
         const CreateFileSegmentSettings & create_settings,
-        const CacheGuard::Lock *);
+        const CachePriorityGuard::Lock *);
 };
 
 }
diff --git a/src/Interpreters/Cache/FileCacheFactory.cpp b/src/Interpreters/Cache/FileCacheFactory.cpp
index 3e857d8a8e3..a7a5834f03d 100644
--- a/src/Interpreters/Cache/FileCacheFactory.cpp
+++ b/src/Interpreters/Cache/FileCacheFactory.cpp
@@ -155,7 +155,17 @@ void FileCacheFactory::updateSettingsFromConfig(const Poco::Util::AbstractConfig
 
         FileCacheSettings old_settings = cache_info->getSettings();
         if (old_settings == new_settings)
+        {
             continue;
+        }
+
+        /// FIXME: registerDiskCache modifies `path` setting of FileCacheSettings if path is relative.
+        /// This can lead to calling applySettingsIfPossible even though nothing changed, which is avoidable.
+
+        // LOG_TRACE(log, "Will apply settings changes for cache {}. "
+        //           "Settings changes: {} (new settings: {}, old_settings: {})",
+        //           cache_name, fmt::join(new_settings.getSettingsDiff(old_settings), ", "),
+        //           new_settings.toString(), old_settings.toString());
 
         try
         {
@@ -166,6 +176,7 @@ void FileCacheFactory::updateSettingsFromConfig(const Poco::Util::AbstractConfig
             /// Settings changes could be partially applied in case of exception,
             /// make sure cache_info->settings show correct state of applied settings.
             cache_info->setSettings(old_settings);
+            tryLogCurrentException(__PRETTY_FUNCTION__);
             throw;
         }
 
@@ -173,4 +184,10 @@ void FileCacheFactory::updateSettingsFromConfig(const Poco::Util::AbstractConfig
     }
 }
 
+void FileCacheFactory::clear()
+{
+    std::lock_guard lock(mutex);
+    caches_by_name.clear();
+}
+
 }
diff --git a/src/Interpreters/Cache/FileCacheFactory.h b/src/Interpreters/Cache/FileCacheFactory.h
index c60b247005b..ebe6f426640 100644
--- a/src/Interpreters/Cache/FileCacheFactory.h
+++ b/src/Interpreters/Cache/FileCacheFactory.h
@@ -55,6 +55,8 @@ public:
 
     void updateSettingsFromConfig(const Poco::Util::AbstractConfiguration & config);
 
+    void clear();
+
 private:
     std::mutex mutex;
     CacheByName caches_by_name;
diff --git a/src/Interpreters/Cache/FileCacheKey.h b/src/Interpreters/Cache/FileCacheKey.h
index e788cd5e7cd..7de2a8f7800 100644
--- a/src/Interpreters/Cache/FileCacheKey.h
+++ b/src/Interpreters/Cache/FileCacheKey.h
@@ -21,6 +21,7 @@ struct FileCacheKey
     static FileCacheKey random();
 
     bool operator==(const FileCacheKey & other) const { return key == other.key; }
+    bool operator<(const FileCacheKey & other) const { return key < other.key; }
 
     static FileCacheKey fromKeyString(const std::string & key_str);
 };
diff --git a/src/Interpreters/Cache/FileCacheSettings.cpp b/src/Interpreters/Cache/FileCacheSettings.cpp
index 692d48c6ce6..ff5f48503b7 100644
--- a/src/Interpreters/Cache/FileCacheSettings.cpp
+++ b/src/Interpreters/Cache/FileCacheSettings.cpp
@@ -5,6 +5,8 @@
 #include <Common/NamedCollections/NamedCollections.h>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <IO/ReadHelpers.h>
+#include <IO/Operators.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -74,6 +76,9 @@ void FileCacheSettings::loadImpl(FuncHas has, FuncGetUInt get_uint, FuncGetStrin
 
     if (has("slru_size_ratio"))
         slru_size_ratio = get_double("slru_size_ratio");
+
+    if (has("write_cache_per_user_id_directory"))
+        slru_size_ratio = get_uint("write_cache_per_user_id_directory");
 }
 
 void FileCacheSettings::loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix)
@@ -94,4 +99,61 @@ void FileCacheSettings::loadFromCollection(const NamedCollection & collection)
     loadImpl(std::move(collection_has), std::move(collection_get_uint), std::move(collection_get_string), std::move(collection_get_double));
 }
 
+std::string FileCacheSettings::toString() const
+{
+    WriteBufferFromOwnString res;
+    res << "base_path: " << base_path << ", ";
+    res << "max_size: " << max_size << ", ";
+    res << "max_elements: " << max_elements << ", ";
+    res << "max_file_segment_size: " << max_file_segment_size << ", ";
+    res << "cache_on_write_operations: " << cache_on_write_operations << ", ";
+    res << "cache_hits_threshold: " << cache_hits_threshold << ", ";
+    res << "enable_filesystem_query_cache_limit: " << enable_filesystem_query_cache_limit << ", ";
+    res << "bypass_cache_threshold: " << bypass_cache_threshold << ", ";
+    res << "boundary_alignment: " << boundary_alignment << ", ";
+    res << "background_download_threads: " << background_download_threads << ", ";
+    res << "background_download_queue_size_limit: " << background_download_queue_size_limit << ", ";
+    res << "load_metadata_threads: " << load_metadata_threads << ", ";
+    res << "write_cache_per_user_id_directory: " << write_cache_per_user_id_directory << ", ";
+    res << "cache_policy: " << cache_policy << ", ";
+    res << "slru_size_ratio: " << slru_size_ratio << ", ";
+    return res.str();
+}
+
+std::vector<std::string> FileCacheSettings::getSettingsDiff(const FileCacheSettings & other) const
+{
+    std::vector<std::string> res;
+    if (base_path != other.base_path)
+        res.push_back("base_path");
+    if (max_size != other.max_size)
+        res.push_back("max_size");
+    if (max_elements != other.max_elements)
+        res.push_back("max_elements");
+    if (max_file_segment_size != other.max_file_segment_size)
+        res.push_back("max_file_segment_size");
+    if (cache_on_write_operations != other.cache_on_write_operations)
+        res.push_back("cache_on_write_operations");
+    if (cache_hits_threshold != other.cache_hits_threshold)
+        res.push_back("cache_hits_threshold");
+    if (enable_filesystem_query_cache_limit != other.enable_filesystem_query_cache_limit)
+        res.push_back("enable_filesystem_query_cache_limit");
+    if (bypass_cache_threshold != other.bypass_cache_threshold)
+        res.push_back("bypass_cache_threshold");
+    if (boundary_alignment != other.boundary_alignment)
+        res.push_back("boundary_alignment");
+    if (background_download_threads != other.background_download_threads)
+        res.push_back("background_download_threads");
+    if (background_download_queue_size_limit != other.background_download_queue_size_limit)
+        res.push_back("background_download_queue_size_limit");
+    if (load_metadata_threads != other.load_metadata_threads)
+        res.push_back("load_metadata_threads");
+    if (write_cache_per_user_id_directory != other.write_cache_per_user_id_directory)
+        res.push_back("write_cache_per_user_directory");
+    if (cache_policy != other.cache_policy)
+        res.push_back("cache_policy");
+    if (slru_size_ratio != other.slru_size_ratio)
+        res.push_back("slru_size_ratio");
+    return res;
+}
+
 }
diff --git a/src/Interpreters/Cache/FileCacheSettings.h b/src/Interpreters/Cache/FileCacheSettings.h
index 8fb185038fc..7dab14ac896 100644
--- a/src/Interpreters/Cache/FileCacheSettings.h
+++ b/src/Interpreters/Cache/FileCacheSettings.h
@@ -33,12 +33,17 @@ struct FileCacheSettings
 
     size_t load_metadata_threads = FILECACHE_DEFAULT_LOAD_METADATA_THREADS;
 
+    bool write_cache_per_user_id_directory = false;
+
     std::string cache_policy = "LRU";
     double slru_size_ratio = 0.5;
 
     void loadFromConfig(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
     void loadFromCollection(const NamedCollection & collection);
 
+    std::string toString() const;
+    std::vector<std::string> getSettingsDiff(const FileCacheSettings & other) const;
+
     bool operator ==(const FileCacheSettings &) const = default;
 
 private:
diff --git a/src/Interpreters/Cache/FileSegment.cpp b/src/Interpreters/Cache/FileSegment.cpp
index 170d1e1092c..20a3af60c8c 100644
--- a/src/Interpreters/Cache/FileSegment.cpp
+++ b/src/Interpreters/Cache/FileSegment.cpp
@@ -6,10 +6,12 @@
 #include <Interpreters/Cache/FileCache.h>
 #include <base/getThreadId.h>
 #include <base/hex.h>
+#include <Common/CurrentThread.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/OpenTelemetryTraceContext.h>
 #include <Common/logger_useful.h>
 #include <Common/scope_guard_safe.h>
-#include <Common/ElapsedTimeProfileEventIncrement.h>
+#include <Common/setThreadName.h>
 
 #include <magic_enum.hpp>
 
@@ -23,6 +25,7 @@ namespace ProfileEvents
     extern const Event FileSegmentWriteMicroseconds;
     extern const Event FileSegmentUseMicroseconds;
     extern const Event FileSegmentHolderCompleteMicroseconds;
+    extern const Event FileSegmentFailToIncreasePriority;
     extern const Event FilesystemCacheHoldFileSegments;
     extern const Event FilesystemCacheUnusedHoldFileSegments;
 }
@@ -65,9 +68,9 @@ FileSegment::FileSegment(
     , queue_iterator(queue_iterator_)
     , cache(cache_)
 #ifdef ABORT_ON_LOGICAL_ERROR
-    , log(&Poco::Logger::get(fmt::format("FileSegment({}) : {}", key_.toString(), range().toString())))
+    , log(getLogger(fmt::format("FileSegment({}) : {}", key_.toString(), range().toString())))
 #else
-    , log(&Poco::Logger::get("FileSegment"))
+    , log(getLogger("FileSegment"))
 #endif
 {
     /// On creation, file segment state can be EMPTY, DOWNLOADED, DOWNLOADING.
@@ -85,7 +88,7 @@ FileSegment::FileSegment(
         case (State::DOWNLOADED):
         {
             reserved_size = downloaded_size = size_;
-            chassert(fs::file_size(getPathInLocalCache()) == size_);
+            chassert(fs::file_size(getPath()) == size_);
             chassert(queue_iterator);
             chassert(key_metadata.lock());
             break;
@@ -111,16 +114,16 @@ FileSegment::Range::Range(size_t left_, size_t right_) : left(left_), right(righ
 
 FileSegment::State FileSegment::state() const
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     return download_state;
 }
 
-String FileSegment::getPathInLocalCache() const
+String FileSegment::getPath() const
 {
     return getKeyMetadata()->getFileSegmentPath(*this);
 }
 
-String FileSegment::tryGetPathInLocalCache() const
+String FileSegment::tryGetPath() const
 {
     auto metadata = tryGetKeyMetadata();
     if (!metadata)
@@ -128,7 +131,7 @@ String FileSegment::tryGetPathInLocalCache() const
     return metadata->getFileSegmentPath(*this);
 }
 
-FileSegmentGuard::Lock FileSegment::lockFileSegment() const
+FileSegmentGuard::Lock FileSegment::lock() const
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FileSegmentLockMicroseconds);
     return segment_guard.lock();
@@ -150,24 +153,30 @@ void FileSegment::setDownloadState(State state, const FileSegmentGuard::Lock & l
 
 size_t FileSegment::getReservedSize() const
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     return reserved_size;
 }
 
 FileSegment::Priority::IteratorPtr FileSegment::getQueueIterator() const
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     return queue_iterator;
 }
 
 void FileSegment::setQueueIterator(Priority::IteratorPtr iterator)
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     if (queue_iterator)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Queue iterator cannot be set twice");
     queue_iterator = iterator;
 }
 
+void FileSegment::resetQueueIterator()
+{
+    auto lk = lock();
+    queue_iterator.reset();
+}
+
 size_t FileSegment::getCurrentWriteOffset() const
 {
     return range().left + downloaded_size;
@@ -180,29 +189,28 @@ size_t FileSegment::getDownloadedSize() const
 
 void FileSegment::setDownloadedSize(size_t delta)
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     downloaded_size += delta;
-    assert(downloaded_size == std::filesystem::file_size(getPathInLocalCache()));
+    assert(downloaded_size == std::filesystem::file_size(getPath()));
 }
 
 bool FileSegment::isDownloaded() const
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     return download_state == State::DOWNLOADED;
 }
 
 String FileSegment::getCallerId()
 {
     if (!CurrentThread::isInitialized() || CurrentThread::getQueryId().empty())
-        return "None:" + toString(getThreadId());
+        return fmt::format("None:{}:{}", getThreadName(), toString(getThreadId()));
 
     return std::string(CurrentThread::getQueryId()) + ":" + toString(getThreadId());
 }
 
 String FileSegment::getDownloader() const
 {
-    auto lock = lockFileSegment();
-    return getDownloaderUnlocked(lock);
+    return getDownloaderUnlocked(lock());
 }
 
 String FileSegment::getDownloaderUnlocked(const FileSegmentGuard::Lock &) const
@@ -212,11 +220,11 @@ String FileSegment::getDownloaderUnlocked(const FileSegmentGuard::Lock &) const
 
 String FileSegment::getOrSetDownloader()
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
 
-    assertNotDetachedUnlocked(lock);
+    assertNotDetachedUnlocked(lk);
 
-    auto current_downloader = getDownloaderUnlocked(lock);
+    auto current_downloader = getDownloaderUnlocked(lk);
 
     if (current_downloader.empty())
     {
@@ -226,7 +234,7 @@ String FileSegment::getOrSetDownloader()
             return "notAllowed:" + stateToString(download_state);
 
         current_downloader = downloader_id = caller_id;
-        setDownloadState(State::DOWNLOADING, lock);
+        setDownloadState(State::DOWNLOADING, lk);
         chassert(key_metadata.lock());
     }
 
@@ -250,15 +258,15 @@ void FileSegment::resetDownloadingStateUnlocked(const FileSegmentGuard::Lock & l
 
 void FileSegment::resetDownloader()
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
 
     SCOPE_EXIT({ cv.notify_all(); });
 
-    assertNotDetachedUnlocked(lock);
-    assertIsDownloaderUnlocked("resetDownloader", lock);
+    assertNotDetachedUnlocked(lk);
+    assertIsDownloaderUnlocked("resetDownloader", lk);
 
-    resetDownloadingStateUnlocked(lock);
-    resetDownloaderUnlocked(lock);
+    resetDownloadingStateUnlocked(lk);
+    resetDownloaderUnlocked(lk);
 }
 
 void FileSegment::resetDownloaderUnlocked(const FileSegmentGuard::Lock &)
@@ -287,8 +295,8 @@ void FileSegment::assertIsDownloaderUnlocked(const std::string & operation, cons
 
 bool FileSegment::isDownloader() const
 {
-    auto lock = lockFileSegment();
-    return isDownloaderUnlocked(lock);
+    auto lk = lock();
+    return isDownloaderUnlocked(lk);
 }
 
 bool FileSegment::isDownloaderUnlocked(const FileSegmentGuard::Lock & lock) const
@@ -298,21 +306,21 @@ bool FileSegment::isDownloaderUnlocked(const FileSegmentGuard::Lock & lock) cons
 
 FileSegment::RemoteFileReaderPtr FileSegment::getRemoteFileReader()
 {
-    auto lock = lockFileSegment();
-    assertIsDownloaderUnlocked("getRemoteFileReader", lock);
+    auto lk = lock();
+    assertIsDownloaderUnlocked("getRemoteFileReader", lk);
     return remote_file_reader;
 }
 
 void FileSegment::resetRemoteFileReader()
 {
-    auto lock = lockFileSegment();
-    assertIsDownloaderUnlocked("resetRemoteFileReader", lock);
+    auto lk = lock();
+    assertIsDownloaderUnlocked("resetRemoteFileReader", lk);
     remote_file_reader.reset();
 }
 
 FileSegment::RemoteFileReaderPtr FileSegment::extractRemoteFileReader()
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     if (remote_file_reader && (download_state == State::DOWNLOADED
         || download_state == State::PARTIALLY_DOWNLOADED_NO_CONTINUATION))
     {
@@ -323,8 +331,8 @@ FileSegment::RemoteFileReaderPtr FileSegment::extractRemoteFileReader()
 
 void FileSegment::setRemoteFileReader(RemoteFileReaderPtr remote_file_reader_)
 {
-    auto lock = lockFileSegment();
-    assertIsDownloaderUnlocked("setRemoteFileReader", lock);
+    auto lk = lock();
+    assertIsDownloaderUnlocked("setRemoteFileReader", lk);
 
     if (remote_file_reader)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Remote file reader already exists");
@@ -339,30 +347,31 @@ 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");
 
-    const auto file_segment_path = getPathInLocalCache();
+    {
+        auto lk = lock();
+        assertIsDownloaderUnlocked("write", lk);
+        assertNotDetachedUnlocked(lk);
+    }
+
+    const auto file_segment_path = getPath();
 
     {
-        auto lock = lockFileSegment();
-
-        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 = getCurrentWriteOffset();
+        const size_t first_non_downloaded_offset = getCurrentWriteOffset();
         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 = getDownloadedSize();
+        const size_t current_downloaded_size = getDownloadedSize();
         chassert(reserved_size >= current_downloaded_size);
-        size_t free_reserved_size = reserved_size - current_downloaded_size;
 
+        const size_t free_reserved_size = reserved_size - current_downloaded_size;
         if (free_reserved_size < size)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
@@ -371,20 +380,24 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
         if (!is_unbound && current_downloaded_size == range().size())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "File segment is already fully downloaded");
 
-        if (!cache_writer)
-        {
-            if (current_downloaded_size > 0)
-                throw Exception(
-                    ErrorCodes::LOGICAL_ERROR,
-                    "Cache writer was finalized (downloaded size: {}, state: {})",
-                    current_downloaded_size, stateToString(download_state));
-
-            cache_writer = std::make_unique<WriteBufferFromFile>(file_segment_path);
-        }
+        if (!cache_writer && current_downloaded_size > 0)
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Cache writer was finalized (downloaded size: {}, state: {})",
+                current_downloaded_size, stateToString(download_state));
     }
 
     try
     {
+        if (!cache_writer)
+            cache_writer = std::make_unique<WriteBufferFromFile>(file_segment_path);
+
+#ifdef ABORT_ON_LOGICAL_ERROR
+        /// This mutex is only needed to have a valid assertion in assertCacheCorrectness(),
+        /// which is only executed in debug/sanitizer builds (under ABORT_ON_LOGICAL_ERROR).
+        std::lock_guard lock(write_mutex);
+#endif
+
         cache_writer->write(from, size);
         cache_writer->next();
 
@@ -393,29 +406,38 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
     }
     catch (ErrnoException & e)
     {
-        auto lock = lockFileSegment();
-        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lock)));
+        const int code = e.getErrno();
+        const bool is_no_space_left_error = code == /* No space left on device */28 || code == /* Quota exceeded */122;
 
-        int code = e.getErrno();
-        if (code == /* No space left on device */28 || code == /* Quota exceeded */122)
+        auto lk = lock();
+
+        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lk)));
+        setDownloadFailedUnlocked(lk);
+
+        if (downloaded_size == 0 && fs::exists(file_segment_path))
+        {
+            fs::remove(file_segment_path);
+        }
+        else if (is_no_space_left_error)
         {
             const auto file_size = fs::file_size(file_segment_path);
+
             chassert(downloaded_size <= file_size);
             chassert(reserved_size >= file_size);
             chassert(file_size <= range().size());
+
             if (downloaded_size != file_size)
                 downloaded_size = file_size;
         }
 
-        setDownloadFailedUnlocked(lock);
         throw;
 
     }
     catch (Exception & e)
     {
-        auto lock = lockFileSegment();
-        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lock)));
-        setDownloadFailedUnlocked(lock);
+        auto lk = lock();
+        e.addMessage(fmt::format("{}, current cache state: {}", e.what(), getInfoForLogUnlocked(lk)));
+        setDownloadFailedUnlocked(lk);
         throw;
     }
 
@@ -424,9 +446,11 @@ void FileSegment::write(const char * from, size_t size, size_t offset)
 
 FileSegment::State FileSegment::wait(size_t offset)
 {
-    OpenTelemetry::SpanHolder span{fmt::format("FileSegment::wait({})", key().toString())};
+    OpenTelemetry::SpanHolder span("FileSegment::wait");
+    span.addAttribute("clickhouse.key", key().toString());
+    span.addAttribute("clickhouse.offset", offset);
 
-    auto lock = lockFileSegment();
+    auto lk = lock();
 
     if (downloader_id.empty() || offset < getCurrentWriteOffset())
         return download_state;
@@ -439,10 +463,10 @@ FileSegment::State FileSegment::wait(size_t offset)
         LOG_TEST(log, "{} waiting on: {}, current downloader: {}", getCallerId(), range().toString(), downloader_id);
         ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::FileSegmentWaitMicroseconds);
 
-        chassert(!getDownloaderUnlocked(lock).empty());
-        chassert(!isDownloaderUnlocked(lock));
+        chassert(!getDownloaderUnlocked(lk).empty());
+        chassert(!isDownloaderUnlocked(lk));
 
-        [[maybe_unused]] const auto ok = cv.wait_for(lock, std::chrono::seconds(60), [&, this]()
+        [[maybe_unused]] const auto ok = cv.wait_for(lk, std::chrono::seconds(60), [&, this]()
         {
             return download_state != State::DOWNLOADING || offset < getCurrentWriteOffset();
         });
@@ -479,7 +503,7 @@ LockedKeyPtr FileSegment::lockKeyMetadata(bool assert_exists) const
     return metadata->tryLock();
 }
 
-bool FileSegment::reserve(size_t size_to_reserve, FileCacheReserveStat * reserve_stat)
+bool FileSegment::reserve(size_t size_to_reserve, size_t lock_wait_timeout_milliseconds, FileCacheReserveStat * reserve_stat)
 {
     if (!size_to_reserve)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Zero space reservation is not allowed");
@@ -488,10 +512,10 @@ bool FileSegment::reserve(size_t size_to_reserve, FileCacheReserveStat * reserve
 
     bool is_file_segment_size_exceeded;
     {
-        auto lock = lockFileSegment();
+        auto lk = lock();
 
-        assertNotDetachedUnlocked(lock);
-        assertIsDownloaderUnlocked("reserve", lock);
+        assertNotDetachedUnlocked(lk);
+        assertIsDownloaderUnlocked("reserve", lk);
 
         expected_downloaded_size = getDownloadedSize();
 
@@ -531,10 +555,10 @@ bool FileSegment::reserve(size_t size_to_reserve, FileCacheReserveStat * reserve
     if (!reserve_stat)
         reserve_stat = &dummy_stat;
 
-    bool reserved = cache->tryReserve(*this, size_to_reserve, *reserve_stat);
+    bool reserved = cache->tryReserve(*this, size_to_reserve, *reserve_stat, getKeyMetadata()->user, lock_wait_timeout_milliseconds);
 
     if (!reserved)
-        setDownloadFailedUnlocked(lockFileSegment());
+        setDownloadFailedUnlocked(lock());
 
     return reserved;
 }
@@ -554,13 +578,13 @@ void FileSegment::setDownloadedUnlocked(const FileSegmentGuard::Lock &)
     }
 
     chassert(downloaded_size > 0);
-    chassert(fs::file_size(getPathInLocalCache()) == downloaded_size);
+    chassert(fs::file_size(getPath()) == downloaded_size);
 }
 
 void FileSegment::setDownloadFailed()
 {
-    auto lock = lockFileSegment();
-    setDownloadFailedUnlocked(lock);
+    auto lk = lock();
+    setDownloadFailedUnlocked(lk);
 }
 
 void FileSegment::setDownloadFailedUnlocked(const FileSegmentGuard::Lock & lock)
@@ -582,22 +606,22 @@ void FileSegment::setDownloadFailedUnlocked(const FileSegmentGuard::Lock & lock)
 
 void FileSegment::completePartAndResetDownloader()
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
 
     SCOPE_EXIT({ cv.notify_all(); });
 
-    assertNotDetachedUnlocked(lock);
-    assertIsDownloaderUnlocked("completePartAndResetDownloader", lock);
+    assertNotDetachedUnlocked(lk);
+    assertIsDownloaderUnlocked("completePartAndResetDownloader", lk);
 
     chassert(download_state == State::DOWNLOADING
              || download_state == State::PARTIALLY_DOWNLOADED_NO_CONTINUATION);
 
     if (download_state == State::DOWNLOADING)
-        resetDownloadingStateUnlocked(lock);
+        resetDownloadingStateUnlocked(lk);
 
-    resetDownloaderUnlocked(lock);
+    resetDownloaderUnlocked(lk);
 
-    LOG_TEST(log, "Complete batch. ({})", getInfoForLogUnlocked(lock));
+    LOG_TEST(log, "Complete batch. ({})", getInfoForLogUnlocked(lk));
 }
 
 void FileSegment::complete()
@@ -617,7 +641,7 @@ void FileSegment::complete()
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot complete file segment: {}", getInfoForLog());
     }
 
-    auto segment_lock = lockFileSegment();
+    auto segment_lock = lock();
 
     if (isCompleted(false))
         return;
@@ -654,7 +678,7 @@ void FileSegment::complete()
         case State::DOWNLOADED:
         {
             chassert(current_downloaded_size == range().size());
-            chassert(current_downloaded_size == fs::file_size(getPathInLocalCache()));
+            chassert(current_downloaded_size == fs::file_size(getPath()));
             chassert(!cache_writer);
             chassert(!remote_file_reader);
             break;
@@ -733,8 +757,8 @@ void FileSegment::complete()
 
 String FileSegment::getInfoForLog() const
 {
-    auto lock = lockFileSegment();
-    return getInfoForLogUnlocked(lock);
+    auto lk = lock();
+    return getInfoForLogUnlocked(lk);
 }
 
 String FileSegment::getInfoForLogUnlocked(const FileSegmentGuard::Lock &) const
@@ -776,32 +800,52 @@ String FileSegment::stateToString(FileSegment::State state)
 
 bool FileSegment::assertCorrectness() const
 {
-    return assertCorrectnessUnlocked(lockFileSegment());
+    return assertCorrectnessUnlocked(lock());
 }
 
-bool FileSegment::assertCorrectnessUnlocked(const FileSegmentGuard::Lock &) const
+bool FileSegment::assertCorrectnessUnlocked(const FileSegmentGuard::Lock & lock) const
 {
-    auto check_iterator = [this](const Priority::IteratorPtr & it)
+    auto throw_logical = [&](const std::string & error)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "{}. File segment info: {}", error, getInfoForLogUnlocked(lock));
+    };
+
+    auto check_iterator = [&](const Priority::IteratorPtr & it)
     {
         UNUSED(this);
         if (!it)
             return;
 
         const auto & entry = it->getEntry();
-        UNUSED(entry);
-        chassert(entry.size == reserved_size);
-        chassert(entry.key == key());
-        chassert(entry.offset == offset());
+        if (download_state != State::DOWNLOADING && entry->size != reserved_size)
+            throw_logical(fmt::format("Expected entry.size == reserved_size ({} == {})", entry->size, reserved_size));
+
+        chassert(entry->key == key());
+        chassert(entry->offset == offset());
     };
 
+    const auto file_path = getPath();
+    if (segment_kind != FileSegmentKind::Temporary)
+    {
+        std::lock_guard lk(write_mutex);
+        if (downloaded_size == 0)
+        {
+            if (download_state != State::DOWNLOADING && fs::exists(file_path))
+                throw_logical("Expected file " + file_path + " not to exist");
+        }
+        else if (!fs::exists(file_path))
+        {
+            throw_logical("Expected file " + file_path + " to exist");
+        }
+    }
+
     if (download_state == State::DOWNLOADED)
     {
         chassert(downloader_id.empty());
         chassert(downloaded_size == reserved_size);
         chassert(downloaded_size == range().size());
         chassert(downloaded_size > 0);
-        chassert(std::filesystem::file_size(getPathInLocalCache()) > 0);
-        chassert(queue_iterator);
+        chassert(std::filesystem::file_size(getPath()) > 0);
         check_iterator(queue_iterator);
     }
     else
@@ -825,8 +869,8 @@ bool FileSegment::assertCorrectnessUnlocked(const FileSegmentGuard::Lock &) cons
 
 void FileSegment::assertNotDetached() const
 {
-    auto lock = lockFileSegment();
-    assertNotDetachedUnlocked(lock);
+    auto lk = lock();
+    assertNotDetachedUnlocked(lk);
 }
 
 void FileSegment::assertNotDetachedUnlocked(const FileSegmentGuard::Lock & lock) const
@@ -843,11 +887,12 @@ void FileSegment::assertNotDetachedUnlocked(const FileSegmentGuard::Lock & lock)
 
 FileSegment::Info FileSegment::getInfo(const FileSegmentPtr & file_segment)
 {
-    auto lock = file_segment->lockFileSegment();
+    auto lock = file_segment->lock();
+    auto key_metadata = file_segment->tryGetKeyMetadata();
     return Info{
         .key = file_segment->key(),
         .offset = file_segment->offset(),
-        .path = file_segment->tryGetPathInLocalCache(),
+        .path = file_segment->tryGetPath(),
         .range_left = file_segment->range().left,
         .range_right = file_segment->range().right,
         .kind = file_segment->segment_kind,
@@ -858,12 +903,14 @@ FileSegment::Info FileSegment::getInfo(const FileSegmentPtr & file_segment)
         .references = static_cast<uint64_t>(file_segment.use_count()),
         .is_unbound = file_segment->is_unbound,
         .queue_entry_type = file_segment->queue_iterator ? file_segment->queue_iterator->getType() : QueueEntryType::None,
+        .user_id = key_metadata->user.user_id,
+        .user_weight = key_metadata->user.weight.value(),
     };
 }
 
 bool FileSegment::isDetached() const
 {
-    auto lock = lockFileSegment();
+    auto lk = lock();
     return download_state == State::DETACHED;
 }
 
@@ -879,7 +926,7 @@ bool FileSegment::isCompleted(bool sync) const
         if (is_completed_state())
             return true;
 
-        auto lock = lockFileSegment();
+        auto lk = lock();
         return is_completed_state();
     }
 
@@ -890,7 +937,6 @@ void FileSegment::setDetachedState(const FileSegmentGuard::Lock & lock)
 {
     setDownloadState(State::DETACHED, lock);
     key_metadata.reset();
-    cache = nullptr;
     queue_iterator = nullptr;
     try
     {
@@ -926,8 +972,10 @@ void FileSegment::increasePriority()
     auto it = getQueueIterator();
     if (it)
     {
-        auto cache_lock = cache->lockCache();
-        hits_count = it->increasePriority(cache_lock);
+        if (auto cache_lock = cache->tryLockCache())
+            hits_count = it->increasePriority(cache_lock);
+        else
+            ProfileEvents::increment(ProfileEvents::FileSegmentFailToIncreasePriority);
     }
 }
 
diff --git a/src/Interpreters/Cache/FileSegment.h b/src/Interpreters/Cache/FileSegment.h
index d2c7ac9f90c..7793c50d2d5 100644
--- a/src/Interpreters/Cache/FileSegment.h
+++ b/src/Interpreters/Cache/FileSegment.h
@@ -112,7 +112,7 @@ public:
 
     bool isUnbound() const { return is_unbound; }
 
-    String getPathInLocalCache() const;
+    String getPath() const;
 
     int getFlagsForLocalRead() const { return O_RDONLY | O_CLOEXEC; }
 
@@ -171,12 +171,14 @@ public:
      * ========== Methods used by `cache` ========================
      */
 
-    FileSegmentGuard::Lock lock() const { return segment_guard.lock(); }
+    FileSegmentGuard::Lock lock() const;
 
     Priority::IteratorPtr getQueueIterator() const;
 
     void setQueueIterator(Priority::IteratorPtr iterator);
 
+    void resetQueueIterator();
+
     KeyMetadataPtr tryGetKeyMetadata() const;
 
     KeyMetadataPtr getKeyMetadata() const;
@@ -199,7 +201,7 @@ public:
 
     /// 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, FileCacheReserveStat * reserve_stat = nullptr);
+    bool reserve(size_t size_to_reserve, size_t lock_wait_timeout_milliseconds, FileCacheReserveStat * reserve_stat = nullptr);
 
     /// Write data into reserved space.
     void write(const char * from, size_t size, size_t offset);
@@ -241,9 +243,8 @@ private:
     bool assertCorrectnessUnlocked(const FileSegmentGuard::Lock &) const;
 
     LockedKeyPtr lockKeyMetadata(bool assert_exists = true) const;
-    FileSegmentGuard::Lock lockFileSegment() const;
 
-    String tryGetPathInLocalCache() const;
+    String tryGetPath() const;
 
     Key file_key;
     Range segment_range;
@@ -262,6 +263,7 @@ private:
     /// downloaded_size should always be less or equal to reserved_size
     std::atomic<size_t> downloaded_size = 0;
     std::atomic<size_t> reserved_size = 0;
+    mutable std::mutex write_mutex;
 
     mutable FileSegmentGuard segment_guard;
     std::weak_ptr<KeyMetadata> key_metadata;
@@ -269,7 +271,7 @@ private:
     FileCache * cache;
     std::condition_variable cv;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic<size_t> hits_count = 0; /// cache hits.
     std::atomic<size_t> ref_count = 0; /// Used for getting snapshot state
diff --git a/src/Interpreters/Cache/FileSegmentInfo.h b/src/Interpreters/Cache/FileSegmentInfo.h
index bb87cbbc15d..3695be55865 100644
--- a/src/Interpreters/Cache/FileSegmentInfo.h
+++ b/src/Interpreters/Cache/FileSegmentInfo.h
@@ -78,5 +78,7 @@ namespace DB
         uint64_t references;
         bool is_unbound;
         FileCacheQueueEntryType queue_entry_type;
+        std::string user_id;
+        uint64_t user_weight;
     };
 }
diff --git a/src/Interpreters/Cache/Guards.h b/src/Interpreters/Cache/Guards.h
index 09586b55c61..6193ee38755 100644
--- a/src/Interpreters/Cache/Guards.h
+++ b/src/Interpreters/Cache/Guards.h
@@ -10,17 +10,17 @@ namespace DB
  * 2. KeyGuard::Lock (hold till the end of the method)
  *
  * FileCache::tryReserve
- * 1. CacheGuard::Lock
+ * 1. CachePriorityGuard::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
+ * 1. CachePriorityGuard::Lock
  * 2. KeyGuard::Lock (taken via metadata lock)
  * 3. FileSegmentGuard::Lock
  *
  * FileCache::removeAllReleasable
- * 1. CacheGuard::Lock
+ * 1. CachePriorityGuard::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
  *
@@ -34,23 +34,23 @@ namespace DB
  * 2. FileSegmentGuard::Lock
  *
  * FileSegment::complete
- * 1. CacheGuard::Lock
+ * 1. CachePriorityGuard::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())
+ * 1. Priority of locking: CachePriorityGuard::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 CachePriorityGuard::Lock (example: tryReserve())
  *
  *
- *                                 _CacheGuard_
+ *                                 _CachePriorityGuard_
  *                                 1. FileCache::tryReserve
  *                                 2. FileCache::removeIfExists(key)
  *                                 3. FileCache::removeAllReleasable
  *                                 4. FileSegment::complete
  *
  *             _KeyGuard_                                      _CacheMetadataGuard_
- *             1. all from CacheGuard                          1. getOrSet/get/set
+ *             1. all from CachePriorityGuard                          1. getOrSet/get/set
  *             2. getOrSet/get/Set
  *
  * *This table does not include locks taken for introspection and system tables.
@@ -59,17 +59,28 @@ namespace DB
 /**
  * Cache priority queue guard.
  */
-struct CacheGuard : private boost::noncopyable
+struct CachePriorityGuard : 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>
+    using Mutex = std::timed_mutex;
+    /// struct is used (not keyword `using`) to make CachePriorityGuard::Lock non-interchangable with other guards locks
+    /// so, we wouldn't be able to pass CachePriorityGuard::Lock to a function which accepts KeyGuard::Lock, for example
+    struct Lock : public std::unique_lock<Mutex>
     {
-        explicit Lock(std::mutex & mutex_) : std::unique_lock<std::mutex>(mutex_) {}
+        using Base = std::unique_lock<Mutex>;
+        using Base::Base;
     };
 
     Lock lock() { return Lock(mutex); }
-    std::mutex mutex;
+
+    Lock tryLock() { return Lock(mutex, std::try_to_lock); }
+
+    Lock tryLockFor(const std::chrono::milliseconds & acquire_timeout)
+    {
+        return Lock(mutex, std::chrono::duration<double, std::milli>(acquire_timeout));
+    }
+
+private:
+    Mutex mutex;
 };
 
 /**
diff --git a/src/Interpreters/Cache/IFileCachePriority.cpp b/src/Interpreters/Cache/IFileCachePriority.cpp
index eb396a1e323..6532af55ed2 100644
--- a/src/Interpreters/Cache/IFileCachePriority.cpp
+++ b/src/Interpreters/Cache/IFileCachePriority.cpp
@@ -10,6 +10,11 @@ namespace CurrentMetrics
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 IFileCachePriority::IFileCachePriority(size_t max_size_, size_t max_elements_)
     : max_size(max_size_), max_elements(max_elements_)
 {
@@ -37,4 +42,13 @@ IFileCachePriority::Entry::Entry(const Entry & other)
 {
 }
 
+void IFileCachePriority::check(const CachePriorityGuard::Lock & lock) const
+{
+    if (getSize(lock) > max_size || getElementsCount(lock) > max_elements)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cache limits violated. "
+                        "{}", getStateInfoForLog(lock));
+    }
+}
+
 }
diff --git a/src/Interpreters/Cache/IFileCachePriority.h b/src/Interpreters/Cache/IFileCachePriority.h
index c07f6fb9fb4..a727aab68ee 100644
--- a/src/Interpreters/Cache/IFileCachePriority.h
+++ b/src/Interpreters/Cache/IFileCachePriority.h
@@ -7,6 +7,7 @@
 #include <Interpreters/Cache/Guards.h>
 #include <Interpreters/Cache/IFileCachePriority.h>
 #include <Interpreters/Cache/FileCache_fwd_internal.h>
+#include <Interpreters/Cache/UserInfo.h>
 
 namespace DB
 {
@@ -18,6 +19,8 @@ class IFileCachePriority : private boost::noncopyable
 public:
     using Key = FileCacheKey;
     using QueueEntryType = FileCacheQueueEntryType;
+    using UserInfo = FileCacheUserInfo;
+    using UserID = UserInfo::UserID;
 
     struct Entry
     {
@@ -30,20 +33,56 @@ public:
 
         std::atomic<size_t> size;
         size_t hits = 0;
+
+        std::string toString() const { return fmt::format("{}:{}:{}", key, offset, size); }
+
+        bool isEvicting(const CachePriorityGuard::Lock &) const { return evicting; }
+        bool isEvicting(const LockedKey &) const { return evicting; }
+        /// This does not look good to have isEvicting with two options for locks,
+        /// but still it is valid as we do setEvicting always under both of them.
+        /// (Well, not always - only always for setting it to True,
+        /// but for False we have lower guarantees and allow a logical race,
+        /// physical race is not possible because the value is atomic).
+        /// We can avoid this ambiguity for isEvicting by introducing
+        /// a separate lock `EntryGuard::Lock`, it will make this part of code more coherent,
+        /// but it will introduce one more mutex while it is avoidable.
+        /// Introducing one more mutex just for coherency does not win the trade-off (isn't it?).
+        void setEvictingFlag(const LockedKey &, const CachePriorityGuard::Lock &) const
+        {
+            auto prev = evicting.exchange(true, std::memory_order_relaxed);
+            chassert(!prev);
+            UNUSED(prev);
+        }
+
+        void resetEvictingFlag() const
+        {
+            auto prev = evicting.exchange(false, std::memory_order_relaxed);
+            chassert(prev);
+            UNUSED(prev);
+        }
+
+    private:
+        mutable std::atomic<bool> evicting = false;
     };
+    using EntryPtr = std::shared_ptr<Entry>;
 
     class Iterator
     {
     public:
         virtual ~Iterator() = default;
 
-        virtual const Entry & getEntry() const = 0;
+        virtual EntryPtr getEntry() const = 0;
 
-        virtual size_t increasePriority(const CacheGuard::Lock &) = 0;
+        virtual size_t increasePriority(const CachePriorityGuard::Lock &) = 0;
 
-        virtual void updateSize(int64_t size) = 0;
+        /// Note: IncrementSize unlike decrementSize requires a cache lock, because
+        /// it requires more consistency guarantees for eviction.
 
-        virtual void remove(const CacheGuard::Lock &) = 0;
+        virtual void incrementSize(size_t size, const CachePriorityGuard::Lock &) = 0;
+
+        virtual void decrementSize(size_t size) = 0;
+
+        virtual void remove(const CachePriorityGuard::Lock &) = 0;
 
         virtual void invalidate() = 0;
 
@@ -51,46 +90,123 @@ public:
     };
     using IteratorPtr = std::shared_ptr<Iterator>;
 
-    IFileCachePriority(size_t max_size_, size_t max_elements_);
-
     virtual ~IFileCachePriority() = default;
 
-    size_t getElementsLimit(const CacheGuard::Lock &) const { return max_elements; }
+    size_t getElementsLimit(const CachePriorityGuard::Lock &) const { return max_elements; }
 
-    size_t getSizeLimit(const CacheGuard::Lock &) const { return max_size; }
+    size_t getSizeLimit(const CachePriorityGuard::Lock &) const { return max_size; }
 
-    virtual size_t getSize(const CacheGuard::Lock &) const = 0;
+    virtual size_t getSize(const CachePriorityGuard::Lock &) const = 0;
 
-    virtual size_t getElementsCount(const CacheGuard::Lock &) const = 0;
+    virtual size_t getSizeApprox() const = 0;
+
+    virtual size_t getElementsCount(const CachePriorityGuard::Lock &) const = 0;
+
+    virtual size_t getElementsCountApprox() const = 0;
+
+    virtual std::string getStateInfoForLog(const CachePriorityGuard::Lock &) const = 0;
+
+    virtual void check(const CachePriorityGuard::Lock &) const;
 
     /// Throws exception if there is not enough size to fit it.
     virtual IteratorPtr add( /// NOLINT
         KeyMetadataPtr key_metadata,
         size_t offset,
         size_t size,
-        const CacheGuard::Lock &,
-        bool is_startup = false) = 0;
+        const UserInfo & user,
+        const CachePriorityGuard::Lock &,
+        bool best_effort = false) = 0;
 
-    virtual bool canFit(size_t size, const CacheGuard::Lock &) const = 0;
+    /// `reservee` is the entry for which are reserving now.
+    /// It does not exist, if it is the first space reservation attempt
+    /// for the corresponding file segment.
+    virtual bool canFit( /// NOLINT
+        size_t size,
+        size_t elements,
+        const CachePriorityGuard::Lock &,
+        IteratorPtr reservee = nullptr,
+        bool best_effort = false) const = 0;
 
-    virtual void shuffle(const CacheGuard::Lock &) = 0;
+    virtual void shuffle(const CachePriorityGuard::Lock &) = 0;
 
-    virtual std::vector<FileSegmentInfo> dump(const CacheGuard::Lock &) = 0;
+    struct IPriorityDump
+    {
+        virtual ~IPriorityDump() = default;
+    };
+    using PriorityDumpPtr = std::shared_ptr<IPriorityDump>;
+
+    virtual PriorityDumpPtr dump(const CachePriorityGuard::Lock &) = 0;
 
-    using FinalizeEvictionFunc = std::function<void(const CacheGuard::Lock & lk)>;
     virtual bool collectCandidatesForEviction(
         size_t size,
+        size_t elements,
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
-        IFileCachePriority::IteratorPtr reservee,
-        FinalizeEvictionFunc & finalize_eviction_func,
-        const CacheGuard::Lock &) = 0;
+        IteratorPtr reservee,
+        const UserID & user_id,
+        const CachePriorityGuard::Lock &) = 0;
 
-    virtual bool modifySizeLimits(size_t max_size_, size_t max_elements_, double size_ratio_, const CacheGuard::Lock &) = 0;
+    /// Collect eviction `candidates_num` candidates for eviction.
+    virtual bool collectCandidatesForEviction(
+        size_t desired_size,
+        size_t desired_elements_count,
+        size_t max_candidates_to_evict,
+        FileCacheReserveStat & stat,
+        EvictionCandidates & candidates,
+        const CachePriorityGuard::Lock &) = 0;
+
+    virtual bool modifySizeLimits(
+        size_t max_size_,
+        size_t max_elements_,
+        double size_ratio_,
+        const CachePriorityGuard::Lock &) = 0;
+
+    /// A space holder implementation, which allows to take hold of
+    /// some space in cache given that this space was freed.
+    /// Takes hold of the space in constructor and releases it in destructor.
+    struct HoldSpace : private boost::noncopyable
+    {
+        HoldSpace(
+            size_t size_,
+            size_t elements_,
+            IFileCachePriority & priority_,
+            const CachePriorityGuard::Lock & lock)
+            : size(size_), elements(elements_), priority(priority_)
+        {
+            priority.holdImpl(size, elements, lock);
+        }
+
+        void release()
+        {
+            if (released)
+                return;
+            released = true;
+            priority.releaseImpl(size, elements);
+        }
+
+        ~HoldSpace()
+        {
+            if (!released)
+                release();
+        }
+
+    private:
+        const size_t size;
+        const size_t elements;
+        IFileCachePriority & priority;
+        bool released = false;
+    };
+    using HoldSpacePtr = std::unique_ptr<HoldSpace>;
 
 protected:
-    size_t max_size = 0;
-    size_t max_elements = 0;
+    IFileCachePriority(size_t max_size_, size_t max_elements_);
+
+    virtual void holdImpl(size_t /* size */, size_t /* elements */, const CachePriorityGuard::Lock &) {}
+
+    virtual void releaseImpl(size_t /* size */, size_t /* elements */) {}
+
+    std::atomic<size_t> max_size = 0;
+    std::atomic<size_t> max_elements = 0;
 };
 
 }
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.cpp b/src/Interpreters/Cache/LRUFileCachePriority.cpp
index 2155d2e1f8b..1a2040f9ed2 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/LRUFileCachePriority.cpp
@@ -1,10 +1,11 @@
-#include <Interpreters/Cache/LRUFileCachePriority.h>
-#include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/EvictionCandidates.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/randomSeed.h>
-#include <Common/logger_useful.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/LRUFileCachePriority.h>
 #include <pcg-random/pcg_random.hpp>
+#include <Common/CurrentMetrics.h>
+#include <Common/CurrentThread.h>
+#include <Common/logger_useful.h>
+#include <Common/randomSeed.h>
 
 namespace CurrentMetrics
 {
@@ -16,9 +17,7 @@ namespace ProfileEvents
 {
     extern const Event FilesystemCacheEvictionSkippedFileSegments;
     extern const Event FilesystemCacheEvictionTries;
-    extern const Event FilesystemCacheEvictMicroseconds;
-    extern const Event FilesystemCacheEvictedBytes;
-    extern const Event FilesystemCacheEvictedFileSegments;
+    extern const Event FilesystemCacheEvictionSkippedEvictingFileSegments;
 }
 
 namespace DB
@@ -29,85 +28,111 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+LRUFileCachePriority::LRUFileCachePriority(
+    size_t max_size_,
+    size_t max_elements_,
+    StatePtr state_,
+    const std::string & description_)
+    : IFileCachePriority(max_size_, max_elements_)
+    , description(description_)
+    , log(getLogger("LRUFileCachePriority" + (description.empty() ? "" : "(" + description + ")")))
+{
+    if (state_)
+        state = state_;
+    else
+        state = std::make_shared<State>();
+}
+
 IFileCachePriority::IteratorPtr LRUFileCachePriority::add( /// NOLINT
     KeyMetadataPtr key_metadata,
     size_t offset,
     size_t size,
-    const CacheGuard::Lock & lock,
-    bool /* is_startup */)
+    const UserInfo &,
+    const CachePriorityGuard::Lock & lock,
+    bool)
 {
-    return std::make_shared<LRUIterator>(add(Entry(key_metadata->key, offset, size, key_metadata), lock));
+    return std::make_shared<LRUIterator>(add(std::make_shared<Entry>(key_metadata->key, offset, size, key_metadata), lock));
 }
 
-LRUFileCachePriority::LRUIterator LRUFileCachePriority::add(Entry && entry, const CacheGuard::Lock & lock)
+LRUFileCachePriority::LRUIterator LRUFileCachePriority::add(EntryPtr entry, const CachePriorityGuard::Lock & lock)
 {
-    if (entry.size == 0)
+    if (entry->size == 0)
     {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
             "Adding zero size entries to LRU queue is not allowed "
-            "(key: {}, offset: {})", entry.key, entry.offset);
+            "(key: {}, offset: {})", entry->key, entry->offset);
     }
 
 #ifndef NDEBUG
     for (const auto & queue_entry : queue)
     {
         /// entry.size == 0 means entry was invalidated.
-        if (queue_entry.size != 0 && queue_entry.key == entry.key && queue_entry.offset == entry.offset)
+        if (queue_entry->size != 0
+            && !queue_entry->isEvicting(lock)
+            && queue_entry->key == entry->key && queue_entry->offset == entry->offset)
+        {
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Attempt to add duplicate queue entry to queue. "
-                "(Key: {}, offset: {}, size: {})",
-                entry.key, entry.offset, entry.size);
+                "Attempt to add duplicate queue entry to queue: {}",
+                entry->toString());
+        }
     }
 #endif
 
-    const auto & size_limit = getSizeLimit(lock);
-    if (size_limit && current_size + entry.size > size_limit)
+    if (!canFit(entry->size, 1, lock))
     {
         throw Exception(
             ErrorCodes::LOGICAL_ERROR,
-            "Not enough space to add {}:{} with size {}: current size: {}/{}",
-            entry.key, entry.offset, entry.size, current_size, size_limit);
+            "Not enough space to add a new entry {}. Current state: {}",
+            entry->toString(), getStateInfoForLog(lock));
     }
 
     auto iterator = queue.insert(queue.end(), entry);
 
-    updateSize(entry.size);
+    updateSize(entry->size);
     updateElementsCount(1);
 
     LOG_TEST(
         log, "Added entry into LRU queue, key: {}, offset: {}, size: {}",
-        entry.key, entry.offset, entry.size);
+        entry->key, entry->offset, entry->size);
 
     return LRUIterator(this, iterator);
 }
 
-LRUFileCachePriority::LRUQueue::iterator LRUFileCachePriority::remove(LRUQueue::iterator it, const CacheGuard::Lock &)
+LRUFileCachePriority::LRUQueue::iterator
+LRUFileCachePriority::remove(LRUQueue::iterator it, const CachePriorityGuard::Lock &)
 {
     /// If size is 0, entry is invalidated, current_elements_num was already updated.
-    if (it->size)
+    const auto & entry = **it;
+    if (entry.size)
     {
-        updateSize(-it->size);
+        updateSize(-entry.size);
         updateElementsCount(-1);
     }
 
     LOG_TEST(
         log, "Removed entry from LRU queue, key: {}, offset: {}, size: {}",
-        it->key, it->offset, it->size);
+        entry.key, entry.offset, entry.size);
 
     return queue.erase(it);
 }
 
 void LRUFileCachePriority::updateSize(int64_t size)
 {
-    current_size += size;
+    chassert(size != 0);
+    chassert(size > 0 || state->current_size >= size_t(-size));
+
+    LOG_TEST(log, "Updating size with {}, current is {}",
+             size, state->current_size);
+
+    state->current_size += size;
     CurrentMetrics::add(CurrentMetrics::FilesystemCacheSize, size);
 }
 
 void LRUFileCachePriority::updateElementsCount(int64_t num)
 {
-    current_elements_num += num;
+    state->current_elements_num += num;
     CurrentMetrics::add(CurrentMetrics::FilesystemCacheElements, num);
 }
 
@@ -139,31 +164,58 @@ bool LRUFileCachePriority::LRUIterator::operator ==(const LRUIterator & other) c
     return cache_priority == other.cache_priority && iterator == other.iterator;
 }
 
-void LRUFileCachePriority::iterate(IterateFunc && func, const CacheGuard::Lock & lock)
+void LRUFileCachePriority::iterate(IterateFunc && func, const CachePriorityGuard::Lock & lock)
 {
     for (auto it = queue.begin(); it != queue.end();)
     {
-        auto locked_key = it->key_metadata->tryLock();
-        if (!locked_key || it->size == 0)
+        const auto & entry = **it;
+
+        if (entry.size == 0)
         {
+            /// entry.size == 0 means that queue entry was invalidated,
+            /// valid (active) queue entries always have size > 0,
+            /// so we can safely remove it.
             it = remove(it, lock);
             continue;
         }
 
-        auto metadata = locked_key->tryGetByOffset(it->offset);
+        if (entry.isEvicting(lock))
+        {
+            /// Skip queue entries which are in evicting state.
+            /// We threat them the same way as deleted entries.
+            ++it;
+            ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionSkippedEvictingFileSegments);
+            continue;
+        }
+
+        auto locked_key = entry.key_metadata->tryLock();
+        if (!locked_key || entry.size == 0)
+        {
+            /// locked_key == nullptr means that the cache key of
+            /// the file segment of this queue entry no longer exists.
+            /// This is normal if the key was removed from metadata,
+            /// while queue entries can be removed lazily (with delay).
+            it = remove(it, lock);
+            continue;
+        }
+
+        auto metadata = locked_key->tryGetByOffset(entry.offset);
         if (!metadata)
         {
+            /// Same as explained in comment above, metadata == nullptr,
+            /// if file segment was removed from cache metadata,
+            /// but queue entry still exists because it is lazily removed.
             it = remove(it, lock);
             continue;
         }
 
-        if (metadata->size() != it->size)
+        if (metadata->size() != entry.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());
+                entry.size, metadata->size(), metadata->file_segment->getInfoForLog());
         }
 
         auto result = func(*locked_key, metadata);
@@ -187,32 +239,113 @@ void LRUFileCachePriority::iterate(IterateFunc && func, const CacheGuard::Lock &
     }
 }
 
-bool LRUFileCachePriority::canFit(size_t size, const CacheGuard::Lock & lock) const
+bool LRUFileCachePriority::canFit( /// NOLINT
+    size_t size,
+    size_t elements,
+    const CachePriorityGuard::Lock & lock,
+    IteratorPtr,
+    bool) const
 {
-    return canFit(size, 0, 0, lock);
+    return canFit(size, elements, 0, 0, lock);
 }
 
 bool LRUFileCachePriority::canFit(
     size_t size,
+    size_t elements,
     size_t released_size_assumption,
     size_t released_elements_assumption,
-    const CacheGuard::Lock &) const
+    const CachePriorityGuard::Lock &,
+    const size_t * max_size_,
+    const size_t * max_elements_) const
 {
-    return (max_size == 0 || (current_size + size - released_size_assumption <= max_size))
-        && (max_elements == 0 || current_elements_num + 1 - released_elements_assumption <= max_elements);
+    return (max_size == 0
+            || (state->current_size + size - released_size_assumption <= (max_size_ ? *max_size_ : max_size.load())))
+        && (max_elements == 0
+            || state->current_elements_num + elements - released_elements_assumption <= (max_elements_ ? *max_elements_ : max_elements.load()));
 }
 
 bool LRUFileCachePriority::collectCandidatesForEviction(
     size_t size,
+    size_t elements,
     FileCacheReserveStat & stat,
     EvictionCandidates & res,
-    IFileCachePriority::IteratorPtr,
-    FinalizeEvictionFunc &,
-    const CacheGuard::Lock & lock)
+    IFileCachePriority::IteratorPtr /* reservee */,
+    const UserID &,
+    const CachePriorityGuard::Lock & lock)
 {
-    if (canFit(size, lock))
+    if (canFit(size, elements, 0, 0, lock))
+    {
         return true;
+    }
 
+    auto can_fit = [&]
+    {
+        return canFit(size, elements, stat.total_stat.releasable_size, stat.total_stat.releasable_count, lock);
+    };
+
+    iterateForEviction(res, stat, can_fit, lock);
+    if (can_fit())
+    {
+        /// `res` contains eviction candidates. Do we have any?
+        if (res.size() > 0)
+        {
+            /// As eviction is done without a cache priority lock,
+            /// then if some space was partially available and some needed
+            /// to be freed via eviction, we need to make sure that this
+            /// partially available space is still available
+            /// after we finish with eviction for non-available space.
+            /// So we create a space holder for the currently available part
+            /// of the required space for the duration of eviction of the other
+            /// currently non-available part of the space.
+
+            const size_t hold_size = size > stat.total_stat.releasable_size
+                ? size - stat.total_stat.releasable_size
+                : 0;
+
+            const size_t hold_elements = elements > stat.total_stat.releasable_count
+                ? elements - stat.total_stat.releasable_count
+                : 0;
+
+            if (hold_size || hold_elements)
+                res.setSpaceHolder(hold_size, hold_elements, *this, lock);
+        }
+
+        // LOG_TEST(log, "Collected {} candidates for eviction (total size: {}). "
+        //          "Took hold of size {} and elements {}",
+        //          res.size(), stat.total_stat.releasable_size, hold_size, hold_elements);
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+bool LRUFileCachePriority::collectCandidatesForEviction(
+    size_t desired_size,
+    size_t desired_elements_count,
+    size_t max_candidates_to_evict,
+    FileCacheReserveStat & stat,
+    EvictionCandidates & res,
+    const CachePriorityGuard::Lock & lock)
+{
+    auto stop_condition = [&, this]()
+    {
+        return canFit(0, 0, stat.total_stat.releasable_size, stat.total_stat.releasable_count,
+                      lock, &desired_size, &desired_elements_count)
+            || (max_candidates_to_evict && res.size() >= max_candidates_to_evict);
+    };
+    iterateForEviction(res, stat, stop_condition, lock);
+    return stop_condition();
+}
+
+void LRUFileCachePriority::iterateForEviction(
+    EvictionCandidates & res,
+    FileCacheReserveStat & stat,
+    StopConditionFunc stop_condition,
+    const CachePriorityGuard::Lock & lock)
+{
     ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionTries);
 
     IterateFunc iterate_func = [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
@@ -222,34 +355,30 @@ bool LRUFileCachePriority::collectCandidatesForEviction(
 
         if (segment_metadata->releasable())
         {
-            res.add(locked_key, segment_metadata);
+            res.add(segment_metadata, locked_key, lock);
             stat.update(segment_metadata->size(), file_segment->getKind(), true);
         }
         else
         {
-            stat.update(segment_metadata->size(), file_segment->getKind(), false);
             ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictionSkippedFileSegments);
+            stat.update(segment_metadata->size(), file_segment->getKind(), false);
         }
 
         return IterationResult::CONTINUE;
     };
 
-    auto can_fit = [&]
-    {
-        return canFit(size, stat.stat.releasable_size, stat.stat.releasable_count, lock);
-    };
-
     iterate([&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
     {
-        return can_fit() ? IterationResult::BREAK : iterate_func(locked_key, segment_metadata);
+        return stop_condition() ? IterationResult::BREAK : iterate_func(locked_key, segment_metadata);
     }, lock);
-
-    return can_fit();
 }
 
-LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(LRUIterator & it, LRUFileCachePriority & other, const CacheGuard::Lock &)
+LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(
+    LRUIterator & it,
+    LRUFileCachePriority & other,
+    const CachePriorityGuard::Lock &)
 {
-    const auto & entry = it.getEntry();
+    const auto & entry = *it.getEntry();
     if (entry.size == 0)
     {
         throw Exception(
@@ -261,12 +390,11 @@ LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(LRUIterator & it, L
     for (const auto & queue_entry : queue)
     {
         /// entry.size == 0 means entry was invalidated.
-        if (queue_entry.size != 0 && queue_entry.key == entry.key && queue_entry.offset == entry.offset)
+        if (queue_entry->size != 0 && queue_entry->key == entry.key && queue_entry->offset == entry.offset)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
-                "Attempt to add duplicate queue entry to queue. "
-                "(Key: {}, offset: {}, size: {})",
-                entry.key, entry.offset, entry.size);
+                "Attempt to add duplicate queue entry to queue: {}",
+                entry.toString());
     }
 #endif
 
@@ -280,7 +408,7 @@ LRUFileCachePriority::LRUIterator LRUFileCachePriority::move(LRUIterator & it, L
     return LRUIterator(this, it.iterator);
 }
 
-std::vector<FileSegmentInfo> LRUFileCachePriority::dump(const CacheGuard::Lock & lock)
+IFileCachePriority::PriorityDumpPtr LRUFileCachePriority::dump(const CachePriorityGuard::Lock & lock)
 {
     std::vector<FileSegmentInfo> res;
     iterate([&](LockedKey &, const FileSegmentMetadataPtr & segment_metadata)
@@ -288,55 +416,36 @@ std::vector<FileSegmentInfo> LRUFileCachePriority::dump(const CacheGuard::Lock &
         res.emplace_back(FileSegment::getInfo(segment_metadata->file_segment));
         return IterationResult::CONTINUE;
     }, lock);
-    return res;
+    return std::make_shared<LRUPriorityDump>(res);
 }
 
 bool LRUFileCachePriority::modifySizeLimits(
-    size_t max_size_, size_t max_elements_, double /* size_ratio_ */, const CacheGuard::Lock & lock)
+    size_t max_size_, size_t max_elements_, double /* size_ratio_ */, const CachePriorityGuard::Lock &)
 {
     if (max_size == max_size_ && max_elements == max_elements_)
         return false; /// Nothing to change.
 
-    auto check_limits_satisfied = [&]()
+    if (state->current_size > max_size_ || state->current_elements_num > max_elements_)
     {
-        return (max_size_ == 0 || current_size <= max_size_)
-            && (max_elements_ == 0 || current_elements_num <= max_elements_);
-    };
-
-    if (check_limits_satisfied())
-    {
-        max_size = max_size_;
-        max_elements = max_elements_;
-        return true;
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot modify size limits to {} in size and {} in elements: "
+                        "not enough space freed. Current size: {}/{}, elements: {}/{}",
+                        max_size_, max_elements_,
+                        state->current_size, max_size, state->current_elements_num, max_elements);
     }
 
-    auto iterate_func = [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
-    {
-        chassert(segment_metadata->file_segment->assertCorrectness());
-
-        if (!segment_metadata->releasable())
-            return IterationResult::CONTINUE;
-
-        auto segment = segment_metadata->file_segment;
-        locked_key.removeFileSegment(segment->offset(), segment->lock());
-
-        ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictedFileSegments);
-        ProfileEvents::increment(ProfileEvents::FilesystemCacheEvictedBytes, segment->getDownloadedSize());
-        return IterationResult::REMOVE_AND_CONTINUE;
-    };
-
-    auto timer = DB::CurrentThread::getProfileEvents().timer(ProfileEvents::FilesystemCacheEvictMicroseconds);
-    iterate(
-        [&](LockedKey & locked_key, const FileSegmentMetadataPtr & segment_metadata)
-        { return check_limits_satisfied() ? IterationResult::BREAK : iterate_func(locked_key, segment_metadata); },
-        lock);
-
     max_size = max_size_;
     max_elements = max_elements_;
     return true;
 }
 
-void LRUFileCachePriority::LRUIterator::remove(const CacheGuard::Lock & lock)
+IFileCachePriority::EntryPtr LRUFileCachePriority::LRUIterator::getEntry() const
+{
+    assertValid();
+    return *iterator;
+}
+
+void LRUFileCachePriority::LRUIterator::remove(const CachePriorityGuard::Lock & lock)
 {
     assertValid();
     cache_priority->remove(iterator, lock);
@@ -347,34 +456,66 @@ void LRUFileCachePriority::LRUIterator::invalidate()
 {
     assertValid();
 
-    LOG_TEST(
-        cache_priority->log,
-        "Invalidating entry in LRU queue. Key: {}, offset: {}, previous size: {}",
-        iterator->key, iterator->offset, iterator->size);
+    const auto & entry = *iterator;
 
-    cache_priority->updateSize(-iterator->size);
+    chassert(entry->size != 0);
+    cache_priority->updateSize(-entry->size);
     cache_priority->updateElementsCount(-1);
-    iterator->size = 0;
+
+    LOG_TEST(cache_priority->log,
+             "Invalidated entry in LRU queue {}: {}",
+             entry->toString(), cache_priority->getApproxStateInfoForLog());
+
+    entry->size = 0;
 }
 
-void LRUFileCachePriority::LRUIterator::updateSize(int64_t size)
+void LRUFileCachePriority::LRUIterator::incrementSize(size_t size, const CachePriorityGuard::Lock & lock)
+{
+    chassert(size);
+    assertValid();
+
+    const auto & entry = *iterator;
+
+    if (!cache_priority->canFit(size, /* elements */0, lock))
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot increment size by {} for entry {}. Current state: {}",
+                        size, entry->toString(), cache_priority->getStateInfoForLog(lock));
+    }
+
+    LOG_TEST(
+        cache_priority->log,
+        "Incrementing size with {} in LRU queue for entry {}",
+        size, entry->toString());
+
+    cache_priority->updateSize(size);
+    entry->size += size;
+
+    cache_priority->check(lock);
+}
+
+void LRUFileCachePriority::LRUIterator::decrementSize(size_t size)
 {
     assertValid();
 
-    LOG_TEST(
-        cache_priority->log,
-        "Update size with {} in LRU queue for key: {}, offset: {}, previous size: {}",
-        size, iterator->key, iterator->offset, iterator->size);
+    const auto & entry = *iterator;
+    LOG_TEST(cache_priority->log,
+             "Decrement size with {} in LRU queue entry {}",
+             size, entry->toString());
 
-    cache_priority->updateSize(size);
-    iterator->size += size;
+    chassert(size);
+    chassert(entry->size >= size);
+
+    cache_priority->updateSize(-size);
+    entry->size -= size;
 }
 
-size_t LRUFileCachePriority::LRUIterator::increasePriority(const CacheGuard::Lock &)
+size_t LRUFileCachePriority::LRUIterator::increasePriority(const CachePriorityGuard::Lock & lock)
 {
     assertValid();
     cache_priority->queue.splice(cache_priority->queue.end(), cache_priority->queue, iterator);
-    return ++iterator->hits;
+    cache_priority->check(lock);
+    return ++((*iterator)->hits);
 }
 
 void LRUFileCachePriority::LRUIterator::assertValid() const
@@ -383,7 +524,7 @@ void LRUFileCachePriority::LRUIterator::assertValid() const
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Attempt to use invalid iterator");
 }
 
-void LRUFileCachePriority::shuffle(const CacheGuard::Lock &)
+void LRUFileCachePriority::shuffle(const CachePriorityGuard::Lock &)
 {
     std::vector<LRUQueue::iterator> its;
     its.reserve(queue.size());
@@ -395,4 +536,48 @@ void LRUFileCachePriority::shuffle(const CacheGuard::Lock &)
         queue.splice(queue.end(), queue, it);
 }
 
+std::string LRUFileCachePriority::getStateInfoForLog(const CachePriorityGuard::Lock & lock) const
+{
+    return fmt::format("size: {}/{}, elements: {}/{} (description: {})",
+                       getSize(lock), max_size, getElementsCount(lock), max_elements, description);
+}
+
+std::string LRUFileCachePriority::getApproxStateInfoForLog() const
+{
+    return fmt::format("size: {}/{}, elements: {}/{} (description: {})",
+                       getSizeApprox(), max_size, getElementsCountApprox(), max_elements, description);
+}
+
+void LRUFileCachePriority::holdImpl(
+    size_t size,
+    size_t elements,
+    const CachePriorityGuard::Lock & lock)
+{
+    chassert(size || elements);
+
+    if (!canFit(size, elements, lock))
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot take space {} in size and {} in elements. "
+                        "Current state {}/{} in size, {}/{} in elements",
+                        size, elements, state->current_size, max_size,
+                        state->current_elements_num, max_elements);
+    }
+
+    state->current_size += size;
+    state->current_elements_num += elements;
+
+    // LOG_TEST(log, "Hold {} by size and {} by elements", size, elements);
+}
+
+void LRUFileCachePriority::releaseImpl(size_t size, size_t elements)
+{
+    chassert(size || elements);
+
+    state->current_size -= size;
+    state->current_elements_num -= elements;
+
+    // LOG_TEST(log, "Released {} by size and {} by elements", size, elements);
+}
+
 }
diff --git a/src/Interpreters/Cache/LRUFileCachePriority.h b/src/Interpreters/Cache/LRUFileCachePriority.h
index ed6ec405395..d31a3fb0f10 100644
--- a/src/Interpreters/Cache/LRUFileCachePriority.h
+++ b/src/Interpreters/Cache/LRUFileCachePriority.h
@@ -13,58 +13,100 @@ namespace DB
 /// the head of the queue, and the record with the highest priority is stored at the tail.
 class LRUFileCachePriority final : public IFileCachePriority
 {
-private:
-    class LRUIterator;
-    using LRUQueue = std::list<Entry>;
-    friend class SLRUFileCachePriority;
+protected:
+    struct State
+    {
+        std::atomic<size_t> current_size = 0;
+        std::atomic<size_t> current_elements_num = 0;
+    };
+    using StatePtr = std::shared_ptr<State>;
 
 public:
-    LRUFileCachePriority(size_t max_size_, size_t max_elements_) : IFileCachePriority(max_size_, max_elements_) {}
+    LRUFileCachePriority(
+        size_t max_size_,
+        size_t max_elements_,
+        StatePtr state_ = nullptr,
+        const std::string & description_ = "none");
 
-    size_t getSize(const CacheGuard::Lock &) const override { return current_size; }
+    size_t getSize(const CachePriorityGuard::Lock &) const override { return state->current_size; }
 
-    size_t getElementsCount(const CacheGuard::Lock &) const override { return current_elements_num; }
+    size_t getElementsCount(const CachePriorityGuard::Lock &) const override { return state->current_elements_num; }
 
-    bool canFit(size_t size, const CacheGuard::Lock &) const override;
+    size_t getSizeApprox() const override { return state->current_size; }
+
+    size_t getElementsCountApprox() const override { return state->current_elements_num; }
+
+    std::string getStateInfoForLog(const CachePriorityGuard::Lock & lock) const override;
+
+    bool canFit( /// NOLINT
+        size_t size,
+        size_t elements,
+        const CachePriorityGuard::Lock &,
+        IteratorPtr reservee = nullptr,
+        bool best_effort = false) const override;
 
     IteratorPtr add( /// NOLINT
         KeyMetadataPtr key_metadata,
         size_t offset,
         size_t size,
-        const CacheGuard::Lock &,
-        bool is_startup = false) override;
+        const UserInfo & user,
+        const CachePriorityGuard::Lock &,
+        bool best_effort = false) override;
 
     bool collectCandidatesForEviction(
         size_t size,
+        size_t elements,
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IFileCachePriority::IteratorPtr reservee,
-        FinalizeEvictionFunc & finalize_eviction_func,
-        const CacheGuard::Lock &) override;
+        const UserID & user_id,
+        const CachePriorityGuard::Lock &) override;
 
-    void shuffle(const CacheGuard::Lock &) override;
+    bool collectCandidatesForEviction(
+        size_t desired_size,
+        size_t desired_elements_count,
+        size_t max_candidates_to_evict,
+        FileCacheReserveStat & stat,
+        EvictionCandidates & res,
+        const CachePriorityGuard::Lock &) override;
 
-    std::vector<FileSegmentInfo> dump(const CacheGuard::Lock &) override;
+    void shuffle(const CachePriorityGuard::Lock &) override;
 
-    void pop(const CacheGuard::Lock & lock) { remove(queue.begin(), lock); }
+    struct LRUPriorityDump : public IPriorityDump
+    {
+        std::vector<FileSegmentInfo> infos;
+        explicit LRUPriorityDump(const std::vector<FileSegmentInfo> & infos_) : infos(infos_) {}
+        void merge(const LRUPriorityDump & other) { infos.insert(infos.end(), other.infos.begin(), other.infos.end()); }
+    };
+    PriorityDumpPtr dump(const CachePriorityGuard::Lock &) override;
 
-    bool modifySizeLimits(size_t max_size_, size_t max_elements_, double size_ratio_, const CacheGuard::Lock &) override;
+    void pop(const CachePriorityGuard::Lock & lock) { remove(queue.begin(), lock); }
+
+    bool modifySizeLimits(size_t max_size_, size_t max_elements_, double size_ratio_, const CachePriorityGuard::Lock &) override;
 
 private:
+    class LRUIterator;
+    using LRUQueue = std::list<EntryPtr>;
+    friend class SLRUFileCachePriority;
+
+    LRUQueue queue;
+    const std::string description;
+    LoggerPtr log;
+    StatePtr state;
+
     void updateElementsCount(int64_t num);
     void updateSize(int64_t size);
 
-    LRUQueue queue;
-    Poco::Logger * log = &Poco::Logger::get("LRUFileCachePriority");
+    bool canFit(
+        size_t size,
+        size_t elements,
+        size_t released_size_assumption,
+        size_t released_elements_assumption,
+        const CachePriorityGuard::Lock &,
+        const size_t * max_size_ = nullptr,
+        const size_t * max_elements_ = nullptr) const;
 
-    std::atomic<size_t> current_size = 0;
-    /// current_elements_num is not always equal to queue.size()
-    /// because of invalidated entries.
-    std::atomic<size_t> current_elements_num = 0;
-
-    bool canFit(size_t size, size_t released_size_assumption, size_t released_elements_assumption, const CacheGuard::Lock &) const;
-
-    LRUQueue::iterator remove(LRUQueue::iterator it, const CacheGuard::Lock &);
+    LRUQueue::iterator remove(LRUQueue::iterator it, const CachePriorityGuard::Lock &);
 
     enum class IterationResult
     {
@@ -73,10 +115,25 @@ private:
         REMOVE_AND_CONTINUE,
     };
     using IterateFunc = std::function<IterationResult(LockedKey &, const FileSegmentMetadataPtr &)>;
-    void iterate(IterateFunc && func, const CacheGuard::Lock &);
+    void iterate(IterateFunc && func, const CachePriorityGuard::Lock &);
 
-    LRUIterator move(LRUIterator & it, LRUFileCachePriority & other, const CacheGuard::Lock &);
-    LRUIterator add(Entry && entry, const CacheGuard::Lock &);
+    LRUIterator move(LRUIterator & it, LRUFileCachePriority & other, const CachePriorityGuard::Lock &);
+    LRUIterator add(EntryPtr entry, const CachePriorityGuard::Lock &);
+
+    using StopConditionFunc = std::function<bool()>;
+    void iterateForEviction(
+        EvictionCandidates & res,
+        FileCacheReserveStat & stat,
+        StopConditionFunc stop_condition,
+        const CachePriorityGuard::Lock &);
+
+    void holdImpl(
+        size_t size,
+        size_t elements,
+        const CachePriorityGuard::Lock & lock) override;
+
+    void releaseImpl(size_t size, size_t elements) override;
+    std::string getApproxStateInfoForLog() const;
 };
 
 class LRUFileCachePriority::LRUIterator : public IFileCachePriority::Iterator
@@ -91,15 +148,17 @@ public:
     LRUIterator & operator =(const LRUIterator & other);
     bool operator ==(const LRUIterator & other) const;
 
-    const Entry & getEntry() const override { return *iterator; }
+    EntryPtr getEntry() const override;
 
-    size_t increasePriority(const CacheGuard::Lock &) override;
+    size_t increasePriority(const CachePriorityGuard::Lock &) override;
 
-    void remove(const CacheGuard::Lock &) override;
+    void remove(const CachePriorityGuard::Lock &) override;
 
     void invalidate() override;
 
-    void updateSize(int64_t size) override;
+    void incrementSize(size_t size, const CachePriorityGuard::Lock &) override;
+
+    void decrementSize(size_t size) override;
 
     QueueEntryType getType() const override { return QueueEntryType::LRU; }
 
diff --git a/src/Interpreters/Cache/Metadata.cpp b/src/Interpreters/Cache/Metadata.cpp
index 231c3d4a8d6..2cbd56ba0bc 100644
--- a/src/Interpreters/Cache/Metadata.cpp
+++ b/src/Interpreters/Cache/Metadata.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/Cache/Metadata.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Context.h>
 #include <Common/logger_useful.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <filesystem>
@@ -26,6 +27,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int FILECACHE_ACCESS_DENIED;
 }
 
 FileSegmentMetadata::FileSegmentMetadata(FileSegmentPtr && file_segment_)
@@ -58,22 +60,36 @@ size_t FileSegmentMetadata::size() const
 
 KeyMetadata::KeyMetadata(
     const Key & key_,
-    const std::string & key_path_,
-    CleanupQueuePtr cleanup_queue_,
-    DownloadQueuePtr download_queue_,
-    Poco::Logger * log_,
-    std::shared_mutex & key_prefix_directory_mutex_,
+    const UserInfo & user_,
+    const CacheMetadata * cache_metadata_,
     bool created_base_directory_)
     : key(key_)
-    , key_path(key_path_)
-    , cleanup_queue(cleanup_queue_)
-    , download_queue(download_queue_)
-    , key_prefix_directory_mutex(key_prefix_directory_mutex_)
+    , user(user_)
+    , cache_metadata(cache_metadata_)
     , created_base_directory(created_base_directory_)
-    , log(log_)
 {
-    if (created_base_directory)
-        chassert(fs::exists(key_path));
+    if (user_ == FileCache::getInternalUser())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot create key metadata with internal user id");
+
+    if (!user_.weight.has_value())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot create key metadata without user weight");
+
+    chassert(!created_base_directory || fs::exists(getPath()));
+}
+
+bool KeyMetadata::checkAccess(const UserID & user_id_) const
+{
+    return user_id_ == user.user_id || user_id_ == FileCache::getInternalUser().user_id;
+}
+
+void KeyMetadata::assertAccess(const UserID & user_id_) const
+{
+    if (!checkAccess(user_id_))
+    {
+        throw Exception(ErrorCodes::FILECACHE_ACCESS_DENIED,
+                        "Metadata for key {} belongs to user {}, but user {} requested it",
+                        key.toString(), user.user_id, user_id_);
+    }
 }
 
 LockedKeyPtr KeyMetadata::lock()
@@ -108,8 +124,8 @@ bool KeyMetadata::createBaseDirectory()
     {
         try
         {
-            std::shared_lock lock(key_prefix_directory_mutex);
-            fs::create_directories(key_path);
+            std::shared_lock lock(cache_metadata->key_prefix_directory_mutex);
+            fs::create_directories(getPath());
         }
         catch (const fs::filesystem_error & e)
         {
@@ -117,7 +133,7 @@ bool KeyMetadata::createBaseDirectory()
 
             if (e.code() == std::errc::no_space_on_device)
             {
-                LOG_TRACE(log, "Failed to create base directory for key {}, "
+                LOG_TRACE(cache_metadata->log, "Failed to create base directory for key {}, "
                           "because no space left on device", key);
 
                 return false;
@@ -128,17 +144,31 @@ bool KeyMetadata::createBaseDirectory()
     return true;
 }
 
-std::string KeyMetadata::getFileSegmentPath(const FileSegment & file_segment) const
+std::string KeyMetadata::getPath() const
 {
-    return fs::path(key_path)
-        / CacheMetadata::getFileNameForFileSegment(file_segment.offset(), file_segment.getKind());
+    return cache_metadata->getKeyPath(key, user);
 }
 
-CacheMetadata::CacheMetadata(const std::string & path_, size_t background_download_queue_size_limit_, size_t background_download_threads_)
+std::string KeyMetadata::getFileSegmentPath(const FileSegment & file_segment) const
+{
+    return cache_metadata->getFileSegmentPath(key, file_segment.offset(), file_segment.getKind(), user);
+}
+
+LoggerPtr KeyMetadata::logger() const
+{
+    return cache_metadata->log;
+}
+
+CacheMetadata::CacheMetadata(
+    const std::string & path_,
+    size_t background_download_queue_size_limit_,
+    size_t background_download_threads_,
+    bool write_cache_per_user_directory_)
     : path(path_)
     , cleanup_queue(std::make_shared<CleanupQueue>())
     , download_queue(std::make_shared<DownloadQueue>(background_download_queue_size_limit_))
-    , log(&Poco::Logger::get("CacheMetadata"))
+    , write_cache_per_user_directory(write_cache_per_user_directory_)
+    , log(getLogger("CacheMetadata"))
     , download_threads_num(background_download_threads_)
 {
 }
@@ -157,15 +187,26 @@ String CacheMetadata::getFileNameForFileSegment(size_t offset, FileSegmentKind s
     return std::to_string(offset) + file_suffix;
 }
 
-String CacheMetadata::getPathForFileSegment(const Key & key, size_t offset, FileSegmentKind segment_kind) const
+String CacheMetadata::getFileSegmentPath(
+    const Key & key,
+    size_t offset,
+    FileSegmentKind segment_kind,
+    const UserInfo & user) const
 {
-    return fs::path(getPathForKey(key)) / getFileNameForFileSegment(offset, segment_kind);
+    return fs::path(getKeyPath(key, user)) / getFileNameForFileSegment(offset, segment_kind);
 }
 
-String CacheMetadata::getPathForKey(const Key & key) const
+String CacheMetadata::getKeyPath(const Key & key, const UserInfo & user) const
 {
-    const auto key_str = key.toString();
-    return fs::path(path) / key_str.substr(0, 3) / key_str;
+    if (write_cache_per_user_directory)
+    {
+        return fs::path(path) / fmt::format("{}.{}", user.user_id, user.weight.value()) / key.toString();
+    }
+    else
+    {
+        const auto key_str = key.toString();
+        return fs::path(path) / key_str.substr(0, 3) / key_str;
+    }
 }
 
 CacheMetadataGuard::Lock CacheMetadata::MetadataBucket::lock() const
@@ -183,9 +224,10 @@ CacheMetadata::MetadataBucket & CacheMetadata::getMetadataBucket(const Key & key
 LockedKeyPtr CacheMetadata::lockKeyMetadata(
     const FileCacheKey & key,
     KeyNotFoundPolicy key_not_found_policy,
+    const UserInfo & user,
     bool is_initial_load)
 {
-    auto key_metadata = getKeyMetadata(key, key_not_found_policy, is_initial_load);
+    auto key_metadata = getKeyMetadata(key, key_not_found_policy, user, is_initial_load);
     if (!key_metadata)
         return nullptr;
 
@@ -218,12 +260,13 @@ LockedKeyPtr CacheMetadata::lockKeyMetadata(
     /// 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);
+    return lockKeyMetadata(key, key_not_found_policy, user);
 }
 
 KeyMetadataPtr CacheMetadata::getKeyMetadata(
     const Key & key,
     KeyNotFoundPolicy key_not_found_policy,
+    const UserInfo & user,
     bool is_initial_load)
 {
     auto & bucket = getMetadataBucket(key);
@@ -240,10 +283,10 @@ KeyMetadataPtr CacheMetadata::getKeyMetadata(
             return nullptr;
 
         it = bucket.emplace(
-            key, std::make_shared<KeyMetadata>(
-                key, getPathForKey(key), cleanup_queue, download_queue, log, key_prefix_directory_mutex, is_initial_load)).first;
+            key, std::make_shared<KeyMetadata>(key, user, this, is_initial_load)).first;
     }
 
+    it->second->assertAccess(user.user_id);
     return it->second;
 }
 
@@ -255,13 +298,16 @@ bool CacheMetadata::isEmpty() const
     return true;
 }
 
-void CacheMetadata::iterate(IterateFunc && func)
+void CacheMetadata::iterate(IterateFunc && func, const KeyMetadata::UserID & user_id)
 {
     for (auto & bucket : metadata_buckets)
     {
         auto lk = bucket.lock();
         for (auto & [key, key_metadata] : bucket)
         {
+            if (!key_metadata->checkAccess(user_id))
+                continue;
+
             auto locked_key = key_metadata->lockNoStateCheck();
             const auto key_state = locked_key->getKeyState();
 
@@ -279,13 +325,16 @@ void CacheMetadata::iterate(IterateFunc && func)
     }
 }
 
-void CacheMetadata::removeAllKeys(bool if_releasable)
+void CacheMetadata::removeAllKeys(bool if_releasable, const UserID & user_id)
 {
     for (auto & bucket : metadata_buckets)
     {
         auto lock = bucket.lock();
         for (auto it = bucket.begin(); it != bucket.end();)
         {
+            if (!it->second->checkAccess(user_id))
+                continue;
+
             auto locked_key = it->second->lockNoStateCheck();
             if (locked_key->getKeyState() == KeyMetadata::KeyState::ACTIVE)
             {
@@ -301,7 +350,7 @@ void CacheMetadata::removeAllKeys(bool if_releasable)
     }
 }
 
-void CacheMetadata::removeKey(const Key & key, bool if_exists, bool if_releasable)
+void CacheMetadata::removeKey(const Key & key, bool if_exists, bool if_releasable, const UserID & user_id)
 {
     auto & bucket = getMetadataBucket(key);
     auto lock = bucket.lock();
@@ -314,6 +363,7 @@ void CacheMetadata::removeKey(const Key & key, bool if_exists, bool if_releasabl
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such key: {}", key);
     }
 
+    it->second->assertAccess(user_id);
     auto locked_key = it->second->lockNoStateCheck();
     auto state = locked_key->getKeyState();
     if (state != KeyMetadata::KeyState::ACTIVE)
@@ -321,7 +371,8 @@ void CacheMetadata::removeKey(const Key & key, bool if_exists, bool if_releasabl
         if (if_exists)
             return;
         else
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, "No such key: {} (state: {})", key, magic_enum::enum_name(state));
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                            "No such key: {} (state: {})", key, magic_enum::enum_name(state));
     }
 
     bool removed_all = locked_key->removeAllFileSegments(if_releasable);
@@ -346,7 +397,7 @@ CacheMetadata::removeEmptyKey(
 
     LOG_DEBUG(log, "Key {} is removed from metadata", key);
 
-    const fs::path key_directory = getPathForKey(key);
+    const fs::path key_directory = getKeyPath(key, locked_key.getKeyMetadata()->user);
     const fs::path key_prefix_directory = key_directory.parent_path();
 
     try
@@ -383,7 +434,7 @@ CacheMetadata::removeEmptyKey(
 
 class CleanupQueue
 {
-    friend struct CacheMetadata;
+    friend class CacheMetadata;
 public:
     void add(const FileCacheKey & key)
     {
@@ -467,7 +518,7 @@ void CacheMetadata::cleanupThreadFunc()
 
 class DownloadQueue
 {
-friend struct CacheMetadata;
+friend class CacheMetadata;
 public:
     explicit DownloadQueue(size_t queue_size_limit_) : queue_size_limit(queue_size_limit_) {}
 
@@ -504,7 +555,10 @@ private:
 
     struct DownloadInfo
     {
-        DownloadInfo(const CacheMetadata::Key & key_, const size_t & offset_, const std::weak_ptr<FileSegment> & file_segment_)
+        DownloadInfo(
+            const CacheMetadata::Key & key_,
+            const size_t & offset_,
+            const std::weak_ptr<FileSegment> & file_segment_)
             : key(key_), offset(offset_), file_segment(file_segment_) {}
 
         CacheMetadata::Key key;
@@ -556,12 +610,12 @@ void CacheMetadata::downloadThreadFunc(const bool & stop_flag)
             try
             {
                 {
-                    auto locked_key = lockKeyMetadata(key, KeyNotFoundPolicy::RETURN_NULL);
+                    auto locked_key = lockKeyMetadata(key, KeyNotFoundPolicy::RETURN_NULL, FileCache::getInternalUser());
                     if (!locked_key)
                         continue;
 
                     auto file_segment_metadata = locked_key->tryGetByOffset(offset);
-                    if (!file_segment_metadata || file_segment_metadata->evicting())
+                    if (!file_segment_metadata || file_segment_metadata->isEvicting(*locked_key))
                         continue;
 
                     auto file_segment = file_segment_weak.lock();
@@ -616,7 +670,7 @@ bool CacheMetadata::setBackgroundDownloadQueueSizeLimit(size_t size)
     return download_queue->setQueueLimit(size);
 }
 
-void CacheMetadata::downloadImpl(FileSegment & file_segment, std::optional<Memory<>> & memory)
+void CacheMetadata::downloadImpl(FileSegment & file_segment, std::optional<Memory<>> & memory) const
 {
     LOG_TEST(
         log, "Downloading {} bytes for file segment {}",
@@ -640,6 +694,9 @@ void CacheMetadata::downloadImpl(FileSegment & file_segment, std::optional<Memor
         reader->set(memory->data(), memory->size());
     }
 
+    const auto reserve_space_lock_wait_timeout_milliseconds =
+        Context::getGlobalContextInstance()->getReadSettings().filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
+
     size_t offset = file_segment.getCurrentWriteOffset();
     if (offset != static_cast<size_t>(reader->getPosition()))
         reader->seek(offset, SEEK_SET);
@@ -648,7 +705,7 @@ void CacheMetadata::downloadImpl(FileSegment & file_segment, std::optional<Memor
     {
         auto size = reader->available();
 
-        if (!file_segment.reserve(size))
+        if (!file_segment.reserve(size, reserve_space_lock_wait_timeout_milliseconds))
         {
             LOG_TEST(
                 log, "Failed to reserve space during background download "
@@ -685,7 +742,8 @@ void CacheMetadata::startup()
     for (size_t i = 0; i < download_threads_num; ++i)
     {
         download_threads.emplace_back(std::make_shared<DownloadThread>());
-        download_threads.back()->thread = std::make_unique<ThreadFromGlobalPool>([this, thread = download_threads.back()] { downloadThreadFunc(thread->stop_flag); });
+        download_threads.back()->thread = std::make_unique<ThreadFromGlobalPool>(
+            [this, thread = download_threads.back()] { downloadThreadFunc(thread->stop_flag); });
     }
     cleanup_thread = std::make_unique<ThreadFromGlobalPool>([this]{ cleanupThreadFunc(); });
 }
@@ -760,6 +818,16 @@ bool CacheMetadata::setBackgroundDownloadThreads(size_t threads_num)
     return true;
 }
 
+bool KeyMetadata::addToDownloadQueue(FileSegmentPtr file_segment)
+{
+    return cache_metadata->download_queue->add(file_segment);
+}
+
+void KeyMetadata::addToCleanupQueue()
+{
+    cache_metadata->cleanup_queue->add(key);
+}
+
 LockedKey::LockedKey(std::shared_ptr<KeyMetadata> key_metadata_)
     : key_metadata(key_metadata_)
     , lock(key_metadata->guard.lock())
@@ -778,8 +846,8 @@ LockedKey::~LockedKey()
     /// See comment near cleanupThreadFunc() for more details.
 
     key_metadata->key_state = KeyMetadata::KeyState::REMOVING;
-    LOG_DEBUG(key_metadata->log, "Submitting key {} for removal", getKey());
-    key_metadata->cleanup_queue->add(getKey());
+    LOG_DEBUG(key_metadata->logger(), "Submitting key {} for removal", getKey());
+    key_metadata->addToCleanupQueue();
 }
 
 void LockedKey::removeFromCleanupQueue()
@@ -813,7 +881,7 @@ bool LockedKey::removeAllFileSegments(bool if_releasable)
             removed_all = false;
             continue;
         }
-        else if (it->second->evicting())
+        else if (it->second->isEvicting(*this))
         {
             /// File segment is currently a removal candidate,
             /// we do not know if it will be removed or not yet,
@@ -831,36 +899,44 @@ bool LockedKey::removeAllFileSegments(bool if_releasable)
     return removed_all;
 }
 
-KeyMetadata::iterator LockedKey::removeFileSegment(size_t offset, bool can_be_broken)
+KeyMetadata::iterator LockedKey::removeFileSegment(size_t offset, bool can_be_broken, bool invalidate_queue_entry)
 {
     auto it = key_metadata->find(offset);
     if (it == key_metadata->end())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no offset {}", offset);
 
     auto file_segment = it->second->file_segment;
-    return removeFileSegmentImpl(it, file_segment->lock(), can_be_broken);
+    return removeFileSegmentImpl(it, file_segment->lock(), can_be_broken, invalidate_queue_entry);
 }
 
-KeyMetadata::iterator LockedKey::removeFileSegment(size_t offset, const FileSegmentGuard::Lock & segment_lock, bool can_be_broken)
+KeyMetadata::iterator LockedKey::removeFileSegment(
+    size_t offset,
+    const FileSegmentGuard::Lock & segment_lock,
+    bool can_be_broken,
+    bool invalidate_queue_entry)
 {
     auto it = key_metadata->find(offset);
     if (it == key_metadata->end())
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "There is no offset {} in key {}", offset, getKey());
 
-    return removeFileSegmentImpl(it, segment_lock, can_be_broken);
+    return removeFileSegmentImpl(it, segment_lock, can_be_broken, invalidate_queue_entry);
 }
 
-KeyMetadata::iterator LockedKey::removeFileSegmentImpl(KeyMetadata::iterator it, const FileSegmentGuard::Lock & segment_lock, bool can_be_broken)
+KeyMetadata::iterator LockedKey::removeFileSegmentImpl(
+    KeyMetadata::iterator it,
+    const FileSegmentGuard::Lock & segment_lock,
+    bool can_be_broken,
+    bool invalidate_queue_entry)
 {
     auto file_segment = it->second->file_segment;
 
-    LOG_DEBUG(
-        key_metadata->log, "Remove from cache. Key: {}, offset: {}, size: {}",
+    LOG_TEST(
+        key_metadata->logger(), "Remove from cache. Key: {}, offset: {}, size: {}",
         getKey(), file_segment->offset(), file_segment->reserved_size);
 
     chassert(can_be_broken || file_segment->assertCorrectnessUnlocked(segment_lock));
 
-    if (file_segment->queue_iterator)
+    if (file_segment->queue_iterator && invalidate_queue_entry)
         file_segment->queue_iterator->invalidate();
 
     file_segment->detach(segment_lock, *this);
@@ -868,8 +944,18 @@ KeyMetadata::iterator LockedKey::removeFileSegmentImpl(KeyMetadata::iterator it,
     try
     {
         const auto path = key_metadata->getFileSegmentPath(*file_segment);
-        bool exists = fs::exists(path);
-        if (exists)
+        if (file_segment->segment_kind == FileSegmentKind::Temporary)
+        {
+            /// FIXME: For temporary file segment the requirement is not as strong because
+            /// the implementation of "temporary data in cache" creates files in advance.
+            if (fs::exists(path))
+                fs::remove(path);
+        }
+        else if (file_segment->downloaded_size == 0)
+        {
+            chassert(!fs::exists(path));
+        }
+        else if (fs::exists(path))
         {
             fs::remove(path);
 
@@ -880,14 +966,14 @@ KeyMetadata::iterator LockedKey::removeFileSegmentImpl(KeyMetadata::iterator it,
             OpenedFileCache::instance().remove(path, flags);
             OpenedFileCache::instance().remove(path, flags | O_DIRECT);
 
-            LOG_TEST(key_metadata->log, "Removed file segment at path: {}", path);
+            LOG_TEST(key_metadata->logger(), "Removed file segment at path: {}", path);
         }
-        else if (file_segment->downloaded_size && !can_be_broken)
+        else if (!can_be_broken)
         {
 #ifdef ABORT_ON_LOGICAL_ERROR
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected path {} to exist", path);
 #else
-            LOG_WARNING(key_metadata->log, "Expected path {} to exist, while removing {}:{}",
+            LOG_WARNING(key_metadata->logger(), "Expected path {} to exist, while removing {}:{}",
                         path, getKey(), file_segment->offset());
 #endif
         }
@@ -932,7 +1018,7 @@ void LockedKey::shrinkFileSegmentToDownloadedSize(
         file_segment->cache, key_metadata, file_segment->queue_iterator);
 
     if (diff)
-        metadata->getQueueIterator()->updateSize(-diff);
+        metadata->getQueueIterator()->decrementSize(diff);
 
     chassert(file_segment->assertCorrectnessUnlocked(segment_lock));
 }
@@ -942,7 +1028,7 @@ bool LockedKey::addToDownloadQueue(size_t offset, const FileSegmentGuard::Lock &
     auto it = key_metadata->find(offset);
     if (it == key_metadata->end())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "There is not offset {}", offset);
-    return key_metadata->download_queue->add(it->second->file_segment);
+    return key_metadata->addToDownloadQueue(it->second->file_segment);
 }
 
 std::optional<FileSegment::Range> LockedKey::hasIntersectingRange(const FileSegment::Range & range) const
@@ -1018,7 +1104,7 @@ std::vector<FileSegment::Info> LockedKey::sync()
     std::vector<FileSegment::Info> broken;
     for (auto it = key_metadata->begin(); it != key_metadata->end();)
     {
-        if (it->second->evicting() || !it->second->releasable())
+        if (it->second->isEvicting(*this) || !it->second->releasable())
         {
             ++it;
             continue;
@@ -1042,7 +1128,7 @@ std::vector<FileSegment::Info> LockedKey::sync()
         if (!fs::exists(path))
         {
             LOG_WARNING(
-                key_metadata->log,
+                key_metadata->logger(),
                 "File segment has DOWNLOADED state, but file does not exist ({})",
                 file_segment->getInfoForLog());
 
@@ -1061,7 +1147,7 @@ std::vector<FileSegment::Info> LockedKey::sync()
         }
 
         LOG_WARNING(
-            key_metadata->log,
+            key_metadata->logger(),
             "File segment has unexpected size. Having {}, expected {} ({})",
             actual_size, expected_size, file_segment->getInfoForLog());
 
diff --git a/src/Interpreters/Cache/Metadata.h b/src/Interpreters/Cache/Metadata.h
index 0770a165ffa..7efc83c331a 100644
--- a/src/Interpreters/Cache/Metadata.h
+++ b/src/Interpreters/Cache/Metadata.h
@@ -15,8 +15,14 @@ class CleanupQueue;
 using CleanupQueuePtr = std::shared_ptr<CleanupQueue>;
 class DownloadQueue;
 using DownloadQueuePtr = std::shared_ptr<DownloadQueue>;
-using FileSegmentsHolderPtr = std::unique_ptr<FileSegmentsHolder>;
 
+using FileSegmentsHolderPtr = std::unique_ptr<FileSegmentsHolder>;
+class CacheMetadata;
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
 
 struct FileSegmentMetadata : private boost::noncopyable
 {
@@ -28,12 +34,41 @@ struct FileSegmentMetadata : private boost::noncopyable
 
     size_t size() const;
 
-    bool evicting() const { return removal_candidate.load(); }
+    bool isEvicting(const CachePriorityGuard::Lock & lock) const
+    {
+        auto iterator = getQueueIterator();
+        if (!iterator)
+            return false;
+        return iterator->getEntry()->isEvicting(lock);
+    }
+
+    bool isEvicting(const LockedKey & lock) const
+    {
+        auto iterator = getQueueIterator();
+        if (!iterator)
+            return false;
+        return iterator->getEntry()->isEvicting(lock);
+    }
+
+    void setEvictingFlag(const LockedKey & locked_key, const CachePriorityGuard::Lock & lock) const
+    {
+        auto iterator = getQueueIterator();
+        if (!iterator)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Iterator is not set");
+        iterator->getEntry()->setEvictingFlag(locked_key, lock);
+    }
+
+    void resetEvictingFlag() const
+    {
+        auto iterator = getQueueIterator();
+        if (!iterator)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Iterator is not set");
+        iterator->getEntry()->resetEvictingFlag();
+    }
 
     Priority::IteratorPtr getQueueIterator() const { return file_segment->getQueueIterator(); }
 
     FileSegmentPtr file_segment;
-    std::atomic<bool> removal_candidate{false};
 };
 
 using FileSegmentMetadataPtr = std::shared_ptr<FileSegmentMetadata>;
@@ -43,17 +78,18 @@ struct KeyMetadata : private std::map<size_t, FileSegmentMetadataPtr>,
                      private boost::noncopyable,
                      public std::enable_shared_from_this<KeyMetadata>
 {
+    friend class CacheMetadata;
     friend struct LockedKey;
+
     using Key = FileCacheKey;
     using iterator = iterator;
+    using UserInfo = FileCacheUserInfo;
+    using UserID = UserInfo::UserID;
 
     KeyMetadata(
         const Key & key_,
-        const std::string & key_path_,
-        CleanupQueuePtr cleanup_queue_,
-        DownloadQueuePtr download_queue_,
-        Poco::Logger * log_,
-        std::shared_mutex & key_prefix_directory_mutex_,
+        const UserInfo & user_id_,
+        const CacheMetadata * cache_metadata_,
         bool created_base_directory_ = false);
 
     enum class KeyState
@@ -64,19 +100,22 @@ struct KeyMetadata : private std::map<size_t, FileSegmentMetadataPtr>,
     };
 
     const Key key;
-    const std::string key_path;
+    const UserInfo user;
 
     LockedKeyPtr lock();
 
-    /// Return nullptr if key has non-ACTIVE state.
     LockedKeyPtr tryLock();
 
-    LockedKeyPtr lockNoStateCheck();
-
     bool createBaseDirectory();
 
+    std::string getPath() const;
+
     std::string getFileSegmentPath(const FileSegment & file_segment) const;
 
+    bool checkAccess(const UserID & user_id_) const;
+
+    void assertAccess(const UserID & user_id_) const;
+
     /// This method is used for loadMetadata() on server startup,
     /// where we know there is no concurrency on Key and we do not want therefore taking a KeyGuard::Lock,
     /// therefore we use this Unlocked version. This method should not be used anywhere else.
@@ -85,41 +124,52 @@ struct KeyMetadata : private std::map<size_t, FileSegmentMetadataPtr>,
     size_t sizeUnlocked() const { return size(); }
 
 private:
+    const CacheMetadata * cache_metadata;
+
     KeyState key_state = KeyState::ACTIVE;
     KeyGuard guard;
-    const CleanupQueuePtr cleanup_queue;
-    const DownloadQueuePtr download_queue;
-    std::shared_mutex & key_prefix_directory_mutex;
+
     std::atomic<bool> created_base_directory = false;
-    Poco::Logger * log;
+
+    LockedKeyPtr lockNoStateCheck();
+    LoggerPtr logger() const;
+    bool addToDownloadQueue(FileSegmentPtr file_segment);
+    void addToCleanupQueue();
 };
 
 using KeyMetadataPtr = std::shared_ptr<KeyMetadata>;
 
 
-struct CacheMetadata
+class CacheMetadata : private boost::noncopyable
 {
+    friend struct KeyMetadata;
 public:
     using Key = FileCacheKey;
     using IterateFunc = std::function<void(LockedKey &)>;
+    using UserInfo = FileCacheUserInfo;
+    using UserID = UserInfo::UserID;
 
-    explicit CacheMetadata(const std::string & path_, size_t background_download_queue_size_limit_, size_t background_download_threads_);
+    explicit CacheMetadata(
+        const std::string & path_,
+        size_t background_download_queue_size_limit_,
+        size_t background_download_threads_,
+        bool write_cache_per_user_directory_);
 
     void startup();
 
+    bool isEmpty() const;
+
     const String & getBaseDirectory() const { return path; }
 
-    String getPathForFileSegment(
+    String getKeyPath(const Key & key, const UserInfo & user) const;
+
+    String getFileSegmentPath(
         const Key & key,
         size_t offset,
-        FileSegmentKind segment_kind) const;
+        FileSegmentKind segment_kind,
+        const UserInfo & user) const;
 
-    String getPathForKey(const Key & key) const;
-    static String getFileNameForFileSegment(size_t offset, FileSegmentKind segment_kind);
-
-    void iterate(IterateFunc && func);
-
-    bool isEmpty() const;
+    void iterate(IterateFunc && func, const UserID & user_id);
 
     enum class KeyNotFoundPolicy
     {
@@ -132,15 +182,17 @@ public:
     KeyMetadataPtr getKeyMetadata(
         const Key & key,
         KeyNotFoundPolicy key_not_found_policy,
+        const UserInfo & user,
         bool is_initial_load = false);
 
     LockedKeyPtr lockKeyMetadata(
         const Key & key,
         KeyNotFoundPolicy key_not_found_policy,
+        const UserInfo & user,
         bool is_initial_load = false);
 
-    void removeKey(const Key & key, bool if_exists, bool if_releasable);
-    void removeAllKeys(bool if_releasable);
+    void removeKey(const Key & key, bool if_exists, bool if_releasable, const UserID & user_id);
+    void removeAllKeys(bool if_releasable, const UserID & user_id);
 
     void shutdown();
 
@@ -151,12 +203,15 @@ public:
     bool isBackgroundDownloadEnabled();
 
 private:
-    const std::string path; /// Cache base path
+    static constexpr size_t buckets_num = 1024;
+
+    const std::string path;
     const CleanupQueuePtr cleanup_queue;
     const DownloadQueuePtr download_queue;
+    const bool write_cache_per_user_directory;
 
-    std::shared_mutex key_prefix_directory_mutex;
-    Poco::Logger * log;
+    LoggerPtr log;
+    mutable std::shared_mutex key_prefix_directory_mutex;
 
     struct MetadataBucket : public std::unordered_map<FileCacheKey, KeyMetadataPtr>
     {
@@ -165,7 +220,6 @@ private:
         mutable CacheMetadataGuard guard;
     };
 
-    static constexpr size_t buckets_num = 1024;
     std::vector<MetadataBucket> metadata_buckets{buckets_num};
 
     struct DownloadThread
@@ -173,13 +227,15 @@ private:
         std::unique_ptr<ThreadFromGlobalPool> thread;
         bool stop_flag{false};
     };
-    std::vector<std::shared_ptr<DownloadThread>> download_threads;
-    std::atomic<size_t> download_threads_num;
 
+    std::atomic<size_t> download_threads_num;
+    std::vector<std::shared_ptr<DownloadThread>> download_threads;
     std::unique_ptr<ThreadFromGlobalPool> cleanup_thread;
 
+    static String getFileNameForFileSegment(size_t offset, FileSegmentKind segment_kind);
+
     MetadataBucket & getMetadataBucket(const Key & key);
-    void downloadImpl(FileSegment & file_segment, std::optional<Memory<>> & memory);
+    void downloadImpl(FileSegment & file_segment, std::optional<Memory<>> & memory) const;
     MetadataBucket::iterator removeEmptyKey(
         MetadataBucket & bucket,
         MetadataBucket::iterator it,
@@ -246,8 +302,16 @@ struct LockedKey : private boost::noncopyable
 
     bool removeAllFileSegments(bool if_releasable = true);
 
-    KeyMetadata::iterator removeFileSegment(size_t offset, const FileSegmentGuard::Lock &, bool can_be_broken = false);
-    KeyMetadata::iterator removeFileSegment(size_t offset, bool can_be_broken = false);
+    KeyMetadata::iterator removeFileSegment(
+        size_t offset,
+        const FileSegmentGuard::Lock &,
+        bool can_be_broken = false,
+        bool invalidate_queue_entry = true);
+
+    KeyMetadata::iterator removeFileSegment(
+        size_t offset,
+        bool can_be_broken = false,
+        bool invalidate_queue_entry = true);
 
     void shrinkFileSegmentToDownloadedSize(size_t offset, const FileSegmentGuard::Lock &);
 
@@ -266,7 +330,11 @@ struct LockedKey : private boost::noncopyable
     std::string toString() const;
 
 private:
-    KeyMetadata::iterator removeFileSegmentImpl(KeyMetadata::iterator it, const FileSegmentGuard::Lock &, bool can_be_broken = false);
+    KeyMetadata::iterator removeFileSegmentImpl(
+        KeyMetadata::iterator it,
+        const FileSegmentGuard::Lock &,
+        bool can_be_broken = false,
+        bool invalidate_queue_entry = true);
 
     const std::shared_ptr<KeyMetadata> key_metadata;
     KeyGuard::Lock lock; /// `lock` must be destructed before `key_metadata`.
diff --git a/src/Interpreters/Cache/QueryCache.cpp b/src/Interpreters/Cache/QueryCache.cpp
index 151f2ea06cc..7b1f24e93fc 100644
--- a/src/Interpreters/Cache/QueryCache.cpp
+++ b/src/Interpreters/Cache/QueryCache.cpp
@@ -2,11 +2,17 @@
 
 #include <Functions/FunctionFactory.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/IAST.h>
+#include <Parsers/IParser.h>
+#include <Parsers/TokenIterator.h>
 #include <Parsers/formatAST.h>
+#include <Parsers/parseDatabaseAndTableName.h>
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 #include <Common/TTLCachePolicy.h>
@@ -52,7 +58,54 @@ struct HasNonDeterministicFunctionsMatcher
     }
 };
 
+struct HasSystemTablesMatcher
+{
+    struct Data
+    {
+        const ContextPtr context;
+        bool has_system_tables = false;
+    };
+
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+
+    static void visit(const ASTPtr & node, Data & data)
+    {
+        if (data.has_system_tables)
+            return;
+
+        String database_table; /// or whatever else we get, e.g. just a table
+
+        /// SELECT [...] FROM <table>
+        if (const auto * table_identifier = node->as<ASTTableIdentifier>())
+        {
+            database_table = table_identifier->name();
+        }
+        /// SELECT [...] FROM clusterAllReplicas(<cluster>, <table>)
+        else if (const auto * identifier = node->as<ASTIdentifier>())
+        {
+            database_table = identifier->name();
+        }
+        /// Handle SELECT [...] FROM clusterAllReplicas(<cluster>, '<table>')
+        else if (const auto * literal = node->as<ASTLiteral>())
+        {
+            const auto & value = literal->value;
+            database_table = toString(value);
+        }
+
+        Tokens tokens(database_table.c_str(), database_table.c_str() + database_table.size(), /*max_query_size*/ 2048, /*skip_insignificant*/ true);
+        IParser::Pos pos(tokens, /*max_depth*/ 42, /*max_backtracks*/ 42);
+        Expected expected;
+        String database;
+        String table;
+        bool successfully_parsed = parseDatabaseAndTableName(pos, expected, database, table);
+        if (successfully_parsed)
+            if (DatabaseCatalog::isPredefinedDatabase(database))
+                data.has_system_tables = true;
+    }
+};
+
 using HasNonDeterministicFunctionsVisitor = InDepthNodeVisitor<HasNonDeterministicFunctionsMatcher, true>;
+using HasSystemTablesVisitor = InDepthNodeVisitor<HasSystemTablesMatcher, true>;
 
 }
 
@@ -63,6 +116,13 @@ bool astContainsNonDeterministicFunctions(ASTPtr ast, ContextPtr context)
     return finder_data.has_non_deterministic_functions;
 }
 
+bool astContainsSystemTables(ASTPtr ast, ContextPtr context)
+{
+    HasSystemTablesMatcher::Data finder_data{context};
+    HasSystemTablesVisitor(finder_data).visit(ast);
+    return finder_data.has_system_tables;
+}
+
 namespace
 {
 
diff --git a/src/Interpreters/Cache/QueryCache.h b/src/Interpreters/Cache/QueryCache.h
index 2dd4887dd20..a06f504de65 100644
--- a/src/Interpreters/Cache/QueryCache.h
+++ b/src/Interpreters/Cache/QueryCache.h
@@ -17,6 +17,9 @@ namespace DB
 /// Does AST contain non-deterministic functions like rand() and now()?
 bool astContainsNonDeterministicFunctions(ASTPtr ast, ContextPtr context);
 
+/// Does AST contain system tables like "system.processes"?
+bool astContainsSystemTables(ASTPtr ast, ContextPtr context);
+
 /// Maps queries to query results. Useful to avoid repeated query calculation.
 ///
 /// The cache does not aim to be transactionally consistent (which is difficult to get right). For example, the cache is not invalidated
@@ -156,7 +159,7 @@ public:
         Cache::MappedPtr query_result TSA_GUARDED_BY(mutex) = std::make_shared<Entry>();
         std::atomic<bool> skip_insert = false;
         bool was_finalized = false;
-        Poco::Logger * logger = &Poco::Logger::get("QueryCache");
+        LoggerPtr logger = getLogger("QueryCache");
 
         Writer(Cache & cache_, const Key & key_,
             size_t max_entry_size_in_bytes_, size_t max_entry_size_in_rows_,
@@ -183,7 +186,7 @@ public:
         std::unique_ptr<SourceFromChunks> source_from_chunks;
         std::unique_ptr<SourceFromChunks> source_from_chunks_totals;
         std::unique_ptr<SourceFromChunks> source_from_chunks_extremes;
-        Poco::Logger * logger = &Poco::Logger::get("QueryCache");
+        LoggerPtr logger = getLogger("QueryCache");
         friend class QueryCache; /// for createReader()
     };
 
diff --git a/src/Interpreters/Cache/QueryLimit.cpp b/src/Interpreters/Cache/QueryLimit.cpp
index 109e94b2971..6a5b5bf67ca 100644
--- a/src/Interpreters/Cache/QueryLimit.cpp
+++ b/src/Interpreters/Cache/QueryLimit.cpp
@@ -1,5 +1,7 @@
-#include <Interpreters/Cache/QueryLimit.h>
+#include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/Metadata.h>
+#include <Interpreters/Cache/QueryLimit.h>
+#include <Common/CurrentThread.h>
 
 namespace DB
 {
@@ -15,7 +17,7 @@ static bool isQueryInitialized()
         && !CurrentThread::getQueryId().empty();
 }
 
-FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::tryGetQueryContext(const CacheGuard::Lock &)
+FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::tryGetQueryContext(const CachePriorityGuard::Lock &)
 {
     if (!isQueryInitialized())
         return nullptr;
@@ -24,7 +26,7 @@ FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::tryGetQueryContext(con
     return (query_iter == query_map.end()) ? nullptr : query_iter->second;
 }
 
-void FileCacheQueryLimit::removeQueryContext(const std::string & query_id, const CacheGuard::Lock &)
+void FileCacheQueryLimit::removeQueryContext(const std::string & query_id, const CachePriorityGuard::Lock &)
 {
     auto query_iter = query_map.find(query_id);
     if (query_iter == query_map.end())
@@ -40,7 +42,7 @@ void FileCacheQueryLimit::removeQueryContext(const std::string & query_id, const
 FileCacheQueryLimit::QueryContextPtr FileCacheQueryLimit::getOrSetQueryContext(
     const std::string & query_id,
     const ReadSettings & settings,
-    const CacheGuard::Lock &)
+    const CachePriorityGuard::Lock &)
 {
     if (query_id.empty())
         return nullptr;
@@ -68,9 +70,10 @@ void FileCacheQueryLimit::QueryContext::add(
     KeyMetadataPtr key_metadata,
     size_t offset,
     size_t size,
-    const CacheGuard::Lock & lock)
+    const FileCache::UserInfo & user,
+    const CachePriorityGuard::Lock & lock)
 {
-    auto it = getPriority().add(key_metadata, offset, size, lock);
+    auto it = getPriority().add(key_metadata, offset, size, user, lock);
     auto [_, inserted] = records.emplace(FileCacheKeyAndOffset{key_metadata->key, offset}, it);
     if (!inserted)
     {
@@ -85,7 +88,7 @@ void FileCacheQueryLimit::QueryContext::add(
 void FileCacheQueryLimit::QueryContext::remove(
     const Key & key,
     size_t offset,
-    const CacheGuard::Lock & lock)
+    const CachePriorityGuard::Lock & lock)
 {
     auto record = records.find({key, offset});
     if (record == records.end())
@@ -98,7 +101,7 @@ void FileCacheQueryLimit::QueryContext::remove(
 IFileCachePriority::IteratorPtr FileCacheQueryLimit::QueryContext::tryGet(
     const Key & key,
     size_t offset,
-    const CacheGuard::Lock &)
+    const CachePriorityGuard::Lock &)
 {
     auto it = records.find({key, offset});
     if (it == records.end())
@@ -107,4 +110,27 @@ IFileCachePriority::IteratorPtr FileCacheQueryLimit::QueryContext::tryGet(
 
 }
 
+FileCacheQueryLimit::QueryContextHolder::QueryContextHolder(
+    const String & query_id_,
+    FileCache * cache_,
+    FileCacheQueryLimit * query_limit_,
+    FileCacheQueryLimit::QueryContextPtr context_)
+    : query_id(query_id_)
+    , cache(cache_)
+    , query_limit(query_limit_)
+    , context(context_)
+{
+}
+
+FileCacheQueryLimit::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)
+    {
+        auto lock = cache->lockCache();
+        query_limit->removeQueryContext(query_id, lock);
+    }
+}
+
 }
diff --git a/src/Interpreters/Cache/QueryLimit.h b/src/Interpreters/Cache/QueryLimit.h
index cab1ccc63ba..7553eff82ba 100644
--- a/src/Interpreters/Cache/QueryLimit.h
+++ b/src/Interpreters/Cache/QueryLimit.h
@@ -13,14 +13,14 @@ public:
     class QueryContext;
     using QueryContextPtr = std::shared_ptr<QueryContext>;
 
-    QueryContextPtr tryGetQueryContext(const CacheGuard::Lock & lock);
+    QueryContextPtr tryGetQueryContext(const CachePriorityGuard::Lock & lock);
 
     QueryContextPtr getOrSetQueryContext(
         const std::string & query_id,
         const ReadSettings & settings,
-        const CacheGuard::Lock &);
+        const CachePriorityGuard::Lock &);
 
-    void removeQueryContext(const std::string & query_id, const CacheGuard::Lock &);
+    void removeQueryContext(const std::string & query_id, const CachePriorityGuard::Lock &);
 
     class QueryContext
     {
@@ -38,18 +38,19 @@ public:
         Priority::IteratorPtr tryGet(
             const Key & key,
             size_t offset,
-            const CacheGuard::Lock &);
+            const CachePriorityGuard::Lock &);
 
         void add(
             KeyMetadataPtr key_metadata,
             size_t offset,
             size_t size,
-            const CacheGuard::Lock &);
+            const FileCacheUserInfo & user,
+            const CachePriorityGuard::Lock &);
 
         void remove(
             const Key & key,
             size_t offset,
-            const CacheGuard::Lock &);
+            const CachePriorityGuard::Lock &);
 
     private:
         using Records = std::unordered_map<FileCacheKeyAndOffset, Priority::IteratorPtr, FileCacheKeyAndOffsetHash>;
@@ -58,6 +59,21 @@ public:
         const bool recache_on_query_limit_exceeded;
     };
 
+    struct QueryContextHolder : private boost::noncopyable
+    {
+        QueryContextHolder(const String & query_id_, FileCache * cache_, FileCacheQueryLimit * query_limit_, QueryContextPtr context_);
+
+        QueryContextHolder() = default;
+
+        ~QueryContextHolder();
+
+        String query_id;
+        FileCache * cache;
+        FileCacheQueryLimit * query_limit;
+        QueryContextPtr context;
+    };
+    using QueryContextHolderPtr = std::unique_ptr<QueryContextHolder>;
+
 private:
     using QueryContextMap = std::unordered_map<String, QueryContextPtr>;
     QueryContextMap query_map;
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.cpp b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
index 8b46712731c..68bf182dd2e 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.cpp
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.cpp
@@ -10,136 +10,320 @@
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
     size_t getRatio(size_t total, double ratio)
     {
-        return static_cast<size_t>(total * std::clamp(ratio, 0.0, 1.0));
+        return std::lround(total * std::clamp(ratio, 0.0, 1.0));
     }
 }
 
 SLRUFileCachePriority::SLRUFileCachePriority(
     size_t max_size_,
     size_t max_elements_,
-    double size_ratio_)
+    double size_ratio_,
+    LRUFileCachePriority::StatePtr probationary_state_,
+    LRUFileCachePriority::StatePtr protected_state_,
+    const std::string & description_)
     : IFileCachePriority(max_size_, max_elements_)
     , size_ratio(size_ratio_)
-    , protected_queue(LRUFileCachePriority(getRatio(max_size_, size_ratio), getRatio(max_elements_, size_ratio)))
-    , probationary_queue(LRUFileCachePriority(getRatio(max_size_, 1 - size_ratio), getRatio(max_elements_, 1 - size_ratio)))
+    , protected_queue(LRUFileCachePriority(getRatio(max_size_, size_ratio),
+                                           getRatio(max_elements_, size_ratio),
+                                           protected_state_,
+                                           description_ + ", protected"))
+    , probationary_queue(LRUFileCachePriority(getRatio(max_size_, 1 - size_ratio),
+                                              getRatio(max_elements_, 1 - size_ratio),
+                                              probationary_state_,
+                                              description_ + ", probationary"))
+    , log(getLogger("SLRUFileCachePriority(" + description_ + ")"))
 {
     LOG_DEBUG(
-        log, "Using probationary queue size: {}, protected queue size: {}",
-        probationary_queue.max_size, protected_queue.max_elements);
+        log, "Probationary queue {} in size and {} in elements. "
+        "Protected queue {} in size and {} in elements",
+        probationary_queue.max_size, probationary_queue.max_elements,
+        protected_queue.max_size, protected_queue.max_elements);
 }
 
-size_t SLRUFileCachePriority::getSize(const CacheGuard::Lock & lock) const
+size_t SLRUFileCachePriority::getSize(const CachePriorityGuard::Lock & lock) const
 {
     return protected_queue.getSize(lock) + probationary_queue.getSize(lock);
 }
 
-size_t SLRUFileCachePriority::getElementsCount(const CacheGuard::Lock & lock) const
+size_t SLRUFileCachePriority::getElementsCount(const CachePriorityGuard::Lock & lock) const
 {
     return protected_queue.getElementsCount(lock) + probationary_queue.getElementsCount(lock);
 }
 
-bool SLRUFileCachePriority::canFit(size_t size, const CacheGuard::Lock & lock) const
+size_t SLRUFileCachePriority::getSizeApprox() const
 {
-    return probationary_queue.canFit(size, lock) || protected_queue.canFit(size, lock);
+    return protected_queue.getSizeApprox() + probationary_queue.getSizeApprox();
+}
+
+size_t SLRUFileCachePriority::getElementsCountApprox() const
+{
+    return protected_queue.getElementsCountApprox() + probationary_queue.getElementsCountApprox();
+}
+
+bool SLRUFileCachePriority::canFit( /// NOLINT
+    size_t size,
+    size_t elements,
+    const CachePriorityGuard::Lock & lock,
+    IteratorPtr reservee,
+    bool best_effort) const
+{
+    if (best_effort)
+        return probationary_queue.canFit(size, elements, lock) || protected_queue.canFit(size, elements, lock);
+
+    if (reservee)
+    {
+        const auto * slru_iterator = assert_cast<SLRUIterator *>(reservee.get());
+        if (slru_iterator->is_protected)
+            return protected_queue.canFit(size, elements, lock);
+        else
+            return probationary_queue.canFit(size, elements, lock);
+    }
+    else
+        return probationary_queue.canFit(size, elements, lock);
 }
 
 IFileCachePriority::IteratorPtr SLRUFileCachePriority::add( /// NOLINT
     KeyMetadataPtr key_metadata,
     size_t offset,
     size_t size,
-    const CacheGuard::Lock & lock,
+    const UserInfo &,
+    const CachePriorityGuard::Lock & lock,
     bool is_startup)
 {
+    IteratorPtr iterator;
     if (is_startup)
     {
         /// If it is server startup, we put entries in any queue it will fit in,
         /// but with preference for probationary queue,
         /// because we do not know the distribution between queues after server restart.
-        if (probationary_queue.canFit(size, lock))
+        if (probationary_queue.canFit(size, /* elements */1, lock))
         {
-            auto lru_iterator = probationary_queue.add(Entry(key_metadata->key, offset, size, key_metadata), lock);
-            return std::make_shared<SLRUIterator>(this, std::move(lru_iterator), false);
+            auto lru_iterator = probationary_queue.add(std::make_shared<Entry>(key_metadata->key, offset, size, key_metadata), lock);
+            iterator = std::make_shared<SLRUIterator>(this, std::move(lru_iterator), false);
         }
         else
         {
-            auto lru_iterator = protected_queue.add(Entry(key_metadata->key, offset, size, key_metadata), lock);
-            return std::make_shared<SLRUIterator>(this, std::move(lru_iterator), true);
+            auto lru_iterator = protected_queue.add(std::make_shared<Entry>(key_metadata->key, offset, size, key_metadata), lock);
+            iterator = std::make_shared<SLRUIterator>(this, std::move(lru_iterator), true);
         }
     }
     else
     {
-        auto lru_iterator = probationary_queue.add(Entry(key_metadata->key, offset, size, key_metadata), lock);
-        return std::make_shared<SLRUIterator>(this, std::move(lru_iterator), false);
+        auto lru_iterator = probationary_queue.add(std::make_shared<Entry>(key_metadata->key, offset, size, key_metadata), lock);
+        iterator = std::make_shared<SLRUIterator>(this, std::move(lru_iterator), false);
     }
+
+    if (getSize(lock) > max_size || getElementsCount(lock) > max_elements)
+    {
+        throw Exception(
+            ErrorCodes::LOGICAL_ERROR, "Violated cache limits. "
+            "Added {} for {} element ({}:{}). Current state: {}",
+            size, iterator->getType(), key_metadata->key, offset, getStateInfoForLog(lock));
+    }
+
+    return iterator;
 }
 
 bool SLRUFileCachePriority::collectCandidatesForEviction(
     size_t size,
+    size_t elements,
     FileCacheReserveStat & stat,
     EvictionCandidates & res,
     IFileCachePriority::IteratorPtr reservee,
-    FinalizeEvictionFunc & finalize_eviction_func,
-    const CacheGuard::Lock & lock)
+    const UserID & user_id,
+    const CachePriorityGuard::Lock & lock)
 {
-    /// If `it` is nullptr, then it is the first space reservation attempt
+    /// If `reservee` is nullptr, then it is the first space reservation attempt
     /// for a corresponding file segment, so it will be directly put into probationary queue.
     if (!reservee)
     {
-        return probationary_queue.collectCandidatesForEviction(size, stat, res, reservee, finalize_eviction_func, lock);
+        return probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, user_id, lock);
     }
 
-    /// If `it` not nullptr (e.g. is already in some queue),
+    auto * slru_iterator = assert_cast<SLRUIterator *>(reservee.get());
+    bool success = false;
+
+    /// If `reservee` is not nullptr (e.g. is already in some queue),
     /// we need to check in which queue (protected/probationary) it currently is
     /// (in order to know where we need to free space).
-    if (!assert_cast<SLRUIterator *>(reservee.get())->is_protected)
+    if (!slru_iterator->is_protected)
     {
-        return probationary_queue.collectCandidatesForEviction(size, stat, res, reservee, finalize_eviction_func, lock);
+        chassert(slru_iterator->lru_iterator.cache_priority == &probationary_queue);
+        success = probationary_queue.collectCandidatesForEviction(size, elements, stat, res, reservee, user_id, lock);
+    }
+    else
+    {
+        chassert(slru_iterator->lru_iterator.cache_priority == &protected_queue);
+        /// Entry is in protected queue.
+        /// Check if we have enough space in protected queue to fit a new size of entry.
+        /// `size` is the increment to the current entry.size we want to increase.
+        success = collectCandidatesForEvictionInProtected(size, elements, stat, res, reservee, user_id, lock);
     }
 
-    /// Entry is in protected queue.
-    /// Check if we have enough space in protected queue to fit a new size of entry.
-    /// `size` is the increment to the current entry.size we want to increase.
-    if (protected_queue.canFit(size, lock))
-        return true;
+    /// We eviction_candidates (res) set is non-empty and
+    /// space reservation was successful, we will do eviction from filesystem
+    /// which is executed without a cache priority lock.
+    /// So we made space reservation from a certain queue (protected or probationary),
+    /// but we should remember that there is an increasePriority operation
+    /// which can be called concurrently to space reservation.
+    /// This operation can move elements from one queue to another.
+    /// We need to make sure that this does not happen for the elements
+    /// which are in the process of unfinished space reservation.
+    if (success && res.size() > 0)
+    {
+        slru_iterator->movable = false;
+        res.onFinalize([=](const CachePriorityGuard::Lock &){ slru_iterator->movable = true; });
+    }
+    return success;
+}
+
+bool SLRUFileCachePriority::collectCandidatesForEvictionInProtected(
+    size_t size,
+    size_t elements,
+    FileCacheReserveStat & stat,
+    EvictionCandidates & res,
+    IFileCachePriority::IteratorPtr reservee,
+    const UserID & user_id,
+    const CachePriorityGuard::Lock & lock)
+{
+    if (protected_queue.canFit(size, elements, lock))
+    {
+        return true;
+    }
+
+    /// If not enough space - we need to "downgrade" lowest priority entries
+    /// from protected queue to probationary queue.
 
-    /// If not enough space - we need to "downgrade" lowest priority entries from protected
-    /// queue to probationary queue.
-    /// The amount of such "downgraded" entries is equal to the amount
-    /// required to make space for additionary `size` bytes for entry.
     auto downgrade_candidates = std::make_shared<EvictionCandidates>();
     FileCacheReserveStat downgrade_stat;
-    FinalizeEvictionFunc noop;
-
-    if (!protected_queue.collectCandidatesForEviction(size, downgrade_stat, *downgrade_candidates, reservee, noop, lock))
+    if (!protected_queue.collectCandidatesForEviction(size, elements, downgrade_stat, *downgrade_candidates, reservee, user_id, lock))
+    {
         return false;
+    }
+    else
+        chassert(downgrade_candidates->size() > 0);
 
-    const size_t size_to_downgrade = downgrade_stat.stat.releasable_size;
-
-    if (!probationary_queue.canFit(size_to_downgrade, lock)
-        && !probationary_queue.collectCandidatesForEviction(size_to_downgrade, stat, res, reservee, noop, lock))
+    if (!probationary_queue.collectCandidatesForEviction(
+            downgrade_stat.total_stat.releasable_size, downgrade_stat.total_stat.releasable_count,
+            stat, res, reservee, user_id, lock))
+    {
         return false;
+    }
 
-    finalize_eviction_func = [=, this](const CacheGuard::Lock & lk) mutable
+    auto downgrade_func = [=, this](const CachePriorityGuard::Lock & lk)
     {
         for (const auto & [key, key_candidates] : *downgrade_candidates)
         {
             for (const auto & candidate : key_candidates.candidates)
-            {
-                auto * candidate_it = assert_cast<SLRUIterator *>(candidate->getQueueIterator().get());
-                candidate_it->lru_iterator = probationary_queue.move(candidate_it->lru_iterator, protected_queue, lk);
-                candidate_it->is_protected = false;
-            }
+                downgrade(candidate->getQueueIterator(), lk);
         }
     };
 
+    if (res.size() > 0)
+    {
+        LOG_TEST(log, "Setting up delayed downgrade for {} elements "
+                 "from protected to probationary. Total size: {}",
+                 downgrade_candidates->size(), downgrade_stat.total_stat.releasable_size);
+
+        /// Downgrade from protected to probationary only after
+        /// we free up space in probationary (in order to fit these downgrade candidates).
+        res.onFinalize(std::move(downgrade_func));
+    }
+    else
+    {
+        LOG_TEST(log, "Downgrading {} elements from protected to probationary. "
+                 "Total size: {}",
+                 downgrade_candidates->size(), downgrade_stat.total_stat.releasable_size);
+
+        /// Enough space in probationary queue already to fit our downgrade candidates.
+        downgrade_func(lock);
+    }
+
     return true;
 }
 
-void SLRUFileCachePriority::increasePriority(SLRUIterator & iterator, const CacheGuard::Lock & lock)
+bool SLRUFileCachePriority::collectCandidatesForEviction(
+    size_t desired_size,
+    size_t desired_elements_count,
+    size_t max_candidates_to_evict,
+    FileCacheReserveStat & stat,
+    EvictionCandidates & res,
+    const CachePriorityGuard::Lock & lock)
+{
+    const auto desired_probationary_size = getRatio(desired_size, 1 - size_ratio);
+    const auto desired_probationary_elements_num = getRatio(desired_elements_count, 1 - size_ratio);
+
+    FileCacheReserveStat probationary_stat;
+    const bool probationary_limit_satisfied = probationary_queue.collectCandidatesForEviction(
+        desired_probationary_size, desired_probationary_elements_num,
+        max_candidates_to_evict, probationary_stat, res, lock);
+
+    stat += probationary_stat;
+
+    LOG_TEST(log, "Collected {} to evict from probationary queue. Total size: {}",
+             res.size(), probationary_stat.total_stat.releasable_size);
+
+    chassert(!max_candidates_to_evict || res.size() <= max_candidates_to_evict);
+    chassert(res.size() == stat.total_stat.releasable_count);
+
+    if (max_candidates_to_evict && res.size() >= max_candidates_to_evict)
+        return probationary_limit_satisfied;
+
+    const auto desired_protected_size = getRatio(max_size, size_ratio);
+    const auto desired_protected_elements_num = getRatio(max_elements, size_ratio);
+
+    FileCacheReserveStat protected_stat;
+    const bool protected_limit_satisfied = protected_queue.collectCandidatesForEviction(
+        desired_protected_size, desired_protected_elements_num,
+        max_candidates_to_evict - res.size(), protected_stat, res, lock);
+
+    stat += protected_stat;
+
+    LOG_TEST(log, "Collected {} to evict from protected queue. Total size: {}",
+             res.size(), protected_stat.total_stat.releasable_size);
+
+    return probationary_limit_satisfied && protected_limit_satisfied;
+}
+
+void SLRUFileCachePriority::downgrade(IteratorPtr iterator, const CachePriorityGuard::Lock & lock)
+{
+    auto * candidate_it = assert_cast<SLRUIterator *>(iterator.get());
+    if (!candidate_it->is_protected)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot downgrade {}: it is already in probationary queue",
+                        candidate_it->getEntry()->toString());
+    }
+    if (!candidate_it->movable)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot downgrade {}: it is non-movable",
+                        candidate_it->getEntry()->toString());
+    }
+
+    const size_t entry_size = candidate_it->entry->size;
+    if (!probationary_queue.canFit(entry_size, 1, lock))
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot downgrade {}: not enough space: {}",
+                        candidate_it->getEntry()->toString(),
+                        probationary_queue.getStateInfoForLog(lock));
+    }
+
+    candidate_it->lru_iterator = probationary_queue.move(candidate_it->lru_iterator, protected_queue, lock);
+    candidate_it->is_protected = false;
+}
+
+void SLRUFileCachePriority::increasePriority(SLRUIterator & iterator, const CachePriorityGuard::Lock & lock)
 {
     /// If entry is already in protected queue,
     /// we only need to increase its priority within the protected queue.
@@ -149,10 +333,18 @@ void SLRUFileCachePriority::increasePriority(SLRUIterator & iterator, const Cach
         return;
     }
 
+    if (!iterator.movable)
+    {
+        iterator.lru_iterator.increasePriority(lock);
+        return;
+    }
+
+    chassert(iterator.lru_iterator.cache_priority == &probationary_queue);
+
     /// Entry is in probationary queue.
     /// We need to move it to protected queue.
-    const size_t size = iterator.getEntry().size;
-    if (size > protected_queue.getSizeLimit(lock))
+    const size_t entry_size = iterator.getEntry()->size;
+    if (entry_size > protected_queue.getSizeLimit(lock))
     {
         /// Entry size is bigger than the whole protected queue limit.
         /// This is only possible if protected_queue_size_limit is less than max_file_segment_size,
@@ -161,83 +353,95 @@ void SLRUFileCachePriority::increasePriority(SLRUIterator & iterator, const Cach
         return;
     }
 
-    /// Check if there is enough space in protected queue to move entry there.
-    /// If not - we need to "downgrade" lowest priority entries from protected
-    /// queue to probationary queue.
-    EvictionCandidates downgrade_candidates;
-    FileCacheReserveStat downgrade_stat;
-    FinalizeEvictionFunc noop;
+    EntryPtr entry = iterator.getEntry();
+    /// We need to remove the entry from probationary first
+    /// in order to make space for downgrade from protected.
+    iterator.lru_iterator.remove(lock);
 
-    if (!protected_queue.collectCandidatesForEviction(size, downgrade_stat, downgrade_candidates, {}, noop, lock))
-    {
-        /// We cannot make space for entry to be moved to protected queue
-        /// (not enough releasable file segments).
-        /// Then just increase its priority within probationary queue.
-        iterator.lru_iterator.increasePriority(lock);
-        return;
-    }
-
-    /// The amount of such "downgraded" entries is equal to the amount
-    /// required to make space for entry we want to insert.
-    const size_t size_to_downgrade = downgrade_stat.stat.releasable_count;
-    size_t size_to_free = 0;
-    if (size_to_downgrade && size_to_downgrade > size)
-        size_to_free = size_to_downgrade - size;
-
-    /// Now we need to check if those "downgrade" candidates can actually
-    /// be moved to probationary queue.
     EvictionCandidates eviction_candidates;
     FileCacheReserveStat stat;
-
-    if (size_to_free)
+    try
     {
-        if (!probationary_queue.collectCandidatesForEviction(size_to_free, stat, eviction_candidates, {}, noop, lock))
+        /// Check if there is enough space in protected queue to move entry there.
+        /// If not - we need to "downgrade" lowest priority entries from protected
+        /// queue to probationary queue.
+        ///
+        if (!collectCandidatesForEvictionInProtected(
+                entry->size, /* elements */1, stat, eviction_candidates, nullptr, FileCache::getInternalUser().user_id, lock))
         {
             /// "downgrade" candidates cannot be moved to probationary queue,
             /// so entry cannot be moved to protected queue as well.
             /// Then just increase its priority within probationary queue.
-            iterator.lru_iterator.increasePriority(lock);
+            iterator.lru_iterator = addOrThrow(entry, probationary_queue, lock);
             return;
         }
-        /// Make space for "downgrade" candidates.
-        eviction_candidates.evict(nullptr, lock);
+
+        eviction_candidates.evict();
+        eviction_candidates.finalize(nullptr, lock);
     }
-
-    /// All checks passed, now we can move downgrade candidates to
-    /// probationary queue and our entry to protected queue.
-    Entry entry_copy = iterator.getEntry();
-    iterator.lru_iterator.remove(lock);
-
-    for (const auto & [key, key_candidates] : downgrade_candidates)
+    catch (...)
     {
-        for (const auto & candidate : key_candidates.candidates)
-        {
-            auto * candidate_it = assert_cast<SLRUIterator *>(candidate->getQueueIterator().get());
-            candidate_it->lru_iterator = probationary_queue.move(candidate_it->lru_iterator, protected_queue, lock);
-            candidate_it->is_protected = false;
-        }
+        iterator.lru_iterator = addOrThrow(entry, probationary_queue, lock);
+        throw;
     }
 
-    iterator.lru_iterator = protected_queue.add(std::move(entry_copy), lock);
+    iterator.lru_iterator = addOrThrow(entry, protected_queue, lock);
     iterator.is_protected = true;
 }
 
-std::vector<FileSegmentInfo> SLRUFileCachePriority::dump(const CacheGuard::Lock & lock)
+LRUFileCachePriority::LRUIterator SLRUFileCachePriority::addOrThrow(
+    EntryPtr entry, LRUFileCachePriority & queue, const CachePriorityGuard::Lock & lock)
 {
-    auto res = probationary_queue.dump(lock);
-    auto part_res = protected_queue.dump(lock);
-    res.insert(res.end(), part_res.begin(), part_res.end());
+    try
+    {
+        return queue.add(entry, lock);
+    }
+    catch (...)
+    {
+        const auto initial_exception = getCurrentExceptionMessage(true);
+        try
+        {
+            /// We cannot allow a situation that a file exists on filesystem, but
+            /// there is no corresponding entry in priority queue for it,
+            /// because it will mean that cache became inconsistent.
+            /// So let's try to fix the situation.
+            auto metadata = entry->key_metadata->tryLock();
+            chassert(metadata);
+            if (metadata)
+            {
+                auto segment_metadata = metadata->tryGetByOffset(entry->offset);
+                metadata->removeFileSegment(entry->offset, segment_metadata->file_segment->lock());
+            }
+        }
+        catch (...)
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Unexpected exception: {} (Initial exception: {}). Cache will become inconsistent",
+                            getCurrentExceptionMessage(true), initial_exception);
+        }
+
+        /// Let's try to catch such cases in CI.
+        chassert(false);
+        throw;
+    }
+}
+
+IFileCachePriority::PriorityDumpPtr SLRUFileCachePriority::dump(const CachePriorityGuard::Lock & lock)
+{
+    auto res = dynamic_pointer_cast<LRUFileCachePriority::LRUPriorityDump>(probationary_queue.dump(lock));
+    auto part_res = dynamic_pointer_cast<LRUFileCachePriority::LRUPriorityDump>(protected_queue.dump(lock));
+    res->merge(*part_res);
     return res;
 }
 
-void SLRUFileCachePriority::shuffle(const CacheGuard::Lock & lock)
+void SLRUFileCachePriority::shuffle(const CachePriorityGuard::Lock & lock)
 {
     protected_queue.shuffle(lock);
     probationary_queue.shuffle(lock);
 }
 
 bool SLRUFileCachePriority::modifySizeLimits(
-    size_t max_size_, size_t max_elements_, double size_ratio_, const CacheGuard::Lock & lock)
+    size_t max_size_, size_t max_elements_, double size_ratio_, const CachePriorityGuard::Lock & lock)
 {
     if (max_size == max_size_ && max_elements == max_elements_ && size_ratio == size_ratio_)
         return false; /// Nothing to change.
@@ -257,27 +461,34 @@ SLRUFileCachePriority::SLRUIterator::SLRUIterator(
     bool is_protected_)
     : cache_priority(cache_priority_)
     , lru_iterator(lru_iterator_)
+    , entry(lru_iterator.getEntry())
     , is_protected(is_protected_)
 {
 }
 
-const SLRUFileCachePriority::Entry & SLRUFileCachePriority::SLRUIterator::getEntry() const
+SLRUFileCachePriority::EntryPtr SLRUFileCachePriority::SLRUIterator::getEntry() const
 {
-    assertValid();
-    return lru_iterator.getEntry();
+    return entry;
 }
 
-size_t SLRUFileCachePriority::SLRUIterator::increasePriority(const CacheGuard::Lock & lock)
+size_t SLRUFileCachePriority::SLRUIterator::increasePriority(const CachePriorityGuard::Lock & lock)
 {
     assertValid();
     cache_priority->increasePriority(*this, lock);
-    return getEntry().hits;
+    cache_priority->check(lock);
+    return getEntry()->hits;
 }
 
-void SLRUFileCachePriority::SLRUIterator::updateSize(int64_t size)
+void SLRUFileCachePriority::SLRUIterator::incrementSize(size_t size, const CachePriorityGuard::Lock & lock)
 {
     assertValid();
-    lru_iterator.updateSize(size);
+    lru_iterator.incrementSize(size, lock);
+}
+
+void SLRUFileCachePriority::SLRUIterator::decrementSize(size_t size)
+{
+    assertValid();
+    lru_iterator.decrementSize(size);
 }
 
 void SLRUFileCachePriority::SLRUIterator::invalidate()
@@ -286,7 +497,7 @@ void SLRUFileCachePriority::SLRUIterator::invalidate()
     lru_iterator.invalidate();
 }
 
-void SLRUFileCachePriority::SLRUIterator::remove(const CacheGuard::Lock & lock)
+void SLRUFileCachePriority::SLRUIterator::remove(const CachePriorityGuard::Lock & lock)
 {
     assertValid();
     lru_iterator.remove(lock);
@@ -297,4 +508,23 @@ void SLRUFileCachePriority::SLRUIterator::assertValid() const
     lru_iterator.assertValid();
 }
 
+std::string SLRUFileCachePriority::getStateInfoForLog(const CachePriorityGuard::Lock & lock) const
+{
+    return fmt::format("total size {}/{}, elements {}/{}, "
+                       "probationary queue size {}/{}, elements {}/{}, "
+                       "protected queue size {}/{}, elements {}/{}",
+                       getSize(lock), max_size, getElementsCount(lock), max_elements,
+                       probationary_queue.getSize(lock), probationary_queue.max_size,
+                       probationary_queue.getElementsCount(lock), probationary_queue.max_elements,
+                       protected_queue.getSize(lock), protected_queue.max_size,
+                       protected_queue.getElementsCount(lock), protected_queue.max_elements);
+}
+
+void SLRUFileCachePriority::check(const CachePriorityGuard::Lock & lock) const
+{
+    probationary_queue.check(lock);
+    protected_queue.check(lock);
+    IFileCachePriority::check(lock);
+}
+
 }
diff --git a/src/Interpreters/Cache/SLRUFileCachePriority.h b/src/Interpreters/Cache/SLRUFileCachePriority.h
index b9ea246bc83..ee3cafe322d 100644
--- a/src/Interpreters/Cache/SLRUFileCachePriority.h
+++ b/src/Interpreters/Cache/SLRUFileCachePriority.h
@@ -11,49 +11,90 @@ namespace DB
 /// the head of the queue, and the record with the highest priority is stored at the tail.
 class SLRUFileCachePriority : public IFileCachePriority
 {
-private:
-    using LRUIterator = LRUFileCachePriority::LRUIterator;
-    using LRUQueue = std::list<Entry>;
-
 public:
     class SLRUIterator;
 
-    SLRUFileCachePriority(size_t max_size_, size_t max_elements_, double size_ratio_);
+    SLRUFileCachePriority(
+        size_t max_size_,
+        size_t max_elements_,
+        double size_ratio_,
+        LRUFileCachePriority::StatePtr probationary_state_ = nullptr,
+        LRUFileCachePriority::StatePtr protected_state_ = nullptr,
+        const std::string & description_ = "none");
 
-    size_t getSize(const CacheGuard::Lock & lock) const override;
+    size_t getSize(const CachePriorityGuard::Lock & lock) const override;
 
-    size_t getElementsCount(const CacheGuard::Lock &) const override;
+    size_t getElementsCount(const CachePriorityGuard::Lock &) const override;
 
-    bool canFit(size_t size, const CacheGuard::Lock &) const override;
+    size_t getSizeApprox() const override;
+
+    size_t getElementsCountApprox() const override;
+
+    std::string getStateInfoForLog(const CachePriorityGuard::Lock & lock) const override;
+
+    void check(const CachePriorityGuard::Lock &) const override;
+
+    bool canFit( /// NOLINT
+        size_t size,
+        size_t elements,
+        const CachePriorityGuard::Lock &,
+        IteratorPtr reservee = nullptr,
+        bool best_effort = false) const override;
 
     IteratorPtr add( /// NOLINT
         KeyMetadataPtr key_metadata,
         size_t offset,
         size_t size,
-        const CacheGuard::Lock &,
+        const UserInfo & user,
+        const CachePriorityGuard::Lock &,
         bool is_startup = false) override;
 
     bool collectCandidatesForEviction(
         size_t size,
+        size_t elements,
         FileCacheReserveStat & stat,
         EvictionCandidates & res,
         IFileCachePriority::IteratorPtr reservee,
-        FinalizeEvictionFunc & finalize_eviction_func,
-        const CacheGuard::Lock &) override;
+        const UserID & user_id,
+        const CachePriorityGuard::Lock &) override;
 
-    void shuffle(const CacheGuard::Lock &) override;
+    bool collectCandidatesForEviction(
+        size_t desired_size,
+        size_t desired_elements_count,
+        size_t max_candidates_to_evict,
+        FileCacheReserveStat & stat,
+        EvictionCandidates & res,
+        const CachePriorityGuard::Lock &) override;
 
-    std::vector<FileSegmentInfo> dump(const CacheGuard::Lock &) override;
+    void shuffle(const CachePriorityGuard::Lock &) override;
 
-    bool modifySizeLimits(size_t max_size_, size_t max_elements_, double size_ratio_, const CacheGuard::Lock &) override;
+    PriorityDumpPtr dump(const CachePriorityGuard::Lock &) override;
+
+    bool modifySizeLimits(size_t max_size_, size_t max_elements_, double size_ratio_, const CachePriorityGuard::Lock &) override;
 
 private:
     double size_ratio;
     LRUFileCachePriority protected_queue;
     LRUFileCachePriority probationary_queue;
-    Poco::Logger * log = &Poco::Logger::get("SLRUFileCachePriority");
+    LoggerPtr log;
 
-    void increasePriority(SLRUIterator & iterator, const CacheGuard::Lock & lock);
+    void increasePriority(SLRUIterator & iterator, const CachePriorityGuard::Lock & lock);
+
+    void downgrade(IteratorPtr iterator, const CachePriorityGuard::Lock &);
+
+    bool collectCandidatesForEvictionInProtected(
+        size_t size,
+        size_t elements,
+        FileCacheReserveStat & stat,
+        EvictionCandidates & res,
+        IFileCachePriority::IteratorPtr reservee,
+        const UserID & user_id,
+        const CachePriorityGuard::Lock & lock);
+
+    LRUFileCachePriority::LRUIterator addOrThrow(
+        EntryPtr entry,
+        LRUFileCachePriority & queue,
+        const CachePriorityGuard::Lock & lock);
 };
 
 class SLRUFileCachePriority::SLRUIterator : public IFileCachePriority::Iterator
@@ -62,18 +103,20 @@ class SLRUFileCachePriority::SLRUIterator : public IFileCachePriority::Iterator
 public:
     SLRUIterator(
         SLRUFileCachePriority * cache_priority_,
-        LRUIterator && lru_iterator_,
+        LRUFileCachePriority::LRUIterator && lru_iterator_,
         bool is_protected_);
 
-    const Entry & getEntry() const override;
+    EntryPtr getEntry() const override;
 
-    size_t increasePriority(const CacheGuard::Lock &) override;
+    size_t increasePriority(const CachePriorityGuard::Lock &) override;
 
-    void remove(const CacheGuard::Lock &) override;
+    void remove(const CachePriorityGuard::Lock &) override;
 
     void invalidate() override;
 
-    void updateSize(int64_t size) override;
+    void incrementSize(size_t size, const CachePriorityGuard::Lock &) override;
+
+    void decrementSize(size_t size) override;
 
     QueueEntryType getType() const override { return is_protected ? QueueEntryType::SLRU_Protected : QueueEntryType::SLRU_Probationary; }
 
@@ -81,8 +124,22 @@ private:
     void assertValid() const;
 
     SLRUFileCachePriority * cache_priority;
-    mutable LRUIterator lru_iterator;
-    bool is_protected;
+    LRUFileCachePriority::LRUIterator lru_iterator;
+    const EntryPtr entry;
+    /// Atomic,
+    /// but needed only in order to do FileSegment::getInfo() without any lock,
+    /// which is done for system tables and logging.
+    std::atomic<bool> is_protected;
+    /// Iterator can me marked as non-movable in case we are reserving
+    /// space for it. It means that we start space reservation
+    /// and prepare space in probationary queue, then do eviction without lock,
+    /// then take the lock again to finalize the eviction and we need to be sure
+    /// that the element is still in probationary queue.
+    /// Therefore we forbid concurrent priority increase for probationary entries.
+    /// Same goes for the downgrade of queue entries from protected to probationary.
+    /// (For downgrade there is no explicit check because it will fall into unreleasable state,
+    /// e.g. will not be taken for eviction anyway).
+    bool movable{true};
 };
 
 }
diff --git a/src/Interpreters/Cache/UserInfo.h b/src/Interpreters/Cache/UserInfo.h
new file mode 100644
index 00000000000..15971bbeff8
--- /dev/null
+++ b/src/Interpreters/Cache/UserInfo.h
@@ -0,0 +1,24 @@
+#pragma once
+#include <Core/UUID.h>
+
+namespace DB
+{
+
+struct FileCacheUserInfo
+{
+    using UserID = std::string;
+    using Weight = UInt64;
+
+    UserID user_id;
+    std::optional<Weight> weight = std::nullopt;
+
+    FileCacheUserInfo() = default;
+
+    explicit FileCacheUserInfo(const UserID & user_id_) : user_id(user_id_) {}
+
+    FileCacheUserInfo(const UserID & user_id_, const Weight & weight_) : user_id(user_id_), weight(weight_) {}
+
+    bool operator ==(const FileCacheUserInfo & other) const { return user_id == other.user_id; }
+};
+
+}
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
index 73d93514db5..acdfa0d5437 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.cpp
@@ -1,13 +1,15 @@
 #include <Interpreters/Cache/WriteBufferToFileSegment.h>
 #include <Interpreters/Cache/FileSegment.h>
 #include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Context.h>
 #include <IO/SwapHelper.h>
 #include <IO/ReadBufferFromFile.h>
 
 #include <base/scope_guard.h>
 
-#include <Common/logger_useful.h>
+#include <Common/CurrentThread.h>
 #include <Common/formatReadable.h>
+#include <Common/logger_useful.h>
 
 namespace DB
 {
@@ -18,19 +20,33 @@ namespace ErrorCodes
     extern const int NOT_ENOUGH_SPACE;
 }
 
+namespace
+{
+    size_t getCacheLockWaitTimeout()
+    {
+        auto query_context = CurrentThread::getQueryContext();
+        if (query_context)
+            return query_context->getReadSettings().filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
+        else
+            return Context::getGlobalContextInstance()->getReadSettings().filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
+    }
+}
+
 WriteBufferToFileSegment::WriteBufferToFileSegment(FileSegment * file_segment_)
-    : WriteBufferFromFileDecorator(std::make_unique<WriteBufferFromFile>(file_segment_->getPathInLocalCache()))
+    : WriteBufferFromFileDecorator(std::make_unique<WriteBufferFromFile>(file_segment_->getPath()))
     , file_segment(file_segment_)
+    , reserve_space_lock_wait_timeout_milliseconds(getCacheLockWaitTimeout())
 {
 }
 
 WriteBufferToFileSegment::WriteBufferToFileSegment(FileSegmentsHolderPtr segment_holder_)
     : WriteBufferFromFileDecorator(
         segment_holder_->size() == 1
-        ? std::make_unique<WriteBufferFromFile>(segment_holder_->front().getPathInLocalCache())
+        ? std::make_unique<WriteBufferFromFile>(segment_holder_->front().getPath())
         : throw Exception(ErrorCodes::LOGICAL_ERROR, "WriteBufferToFileSegment can be created only from single segment"))
     , file_segment(&segment_holder_->front())
     , segment_holder(std::move(segment_holder_))
+    , reserve_space_lock_wait_timeout_milliseconds(getCacheLockWaitTimeout())
 {
 }
 
@@ -49,7 +65,7 @@ void WriteBufferToFileSegment::nextImpl()
     FileCacheReserveStat reserve_stat;
     /// In case of an error, we don't need to finalize the file segment
     /// because it will be deleted soon and completed in the holder's destructor.
-    bool ok = file_segment->reserve(bytes_to_write, &reserve_stat);
+    bool ok = file_segment->reserve(bytes_to_write, reserve_space_lock_wait_timeout_milliseconds, &reserve_stat);
 
     if (!ok)
     {
@@ -58,6 +74,9 @@ void WriteBufferToFileSegment::nextImpl()
             reserve_stat_msg += fmt::format("{} hold {}, can release {}; ",
                 toString(kind), ReadableSize(stat.non_releasable_size), ReadableSize(stat.releasable_size));
 
+        if (std::filesystem::exists(file_segment->getPath()))
+            std::filesystem::remove(file_segment->getPath());
+
         throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Failed to reserve {} bytes for {}: {}(segment info: {})",
             bytes_to_write,
             file_segment->getKind() == FileSegmentKind::Temporary ? "temporary file" : "the file in cache",
@@ -74,7 +93,7 @@ void WriteBufferToFileSegment::nextImpl()
     }
     catch (...)
     {
-        LOG_WARNING(&Poco::Logger::get("WriteBufferToFileSegment"), "Failed to write to the underlying buffer ({})", file_segment->getInfoForLog());
+        LOG_WARNING(getLogger("WriteBufferToFileSegment"), "Failed to write to the underlying buffer ({})", file_segment->getInfoForLog());
         throw;
     }
 
@@ -84,7 +103,7 @@ void WriteBufferToFileSegment::nextImpl()
 std::unique_ptr<ReadBuffer> WriteBufferToFileSegment::getReadBufferImpl()
 {
     finalize();
-    return std::make_unique<ReadBufferFromFile>(file_segment->getPathInLocalCache());
+    return std::make_unique<ReadBufferFromFile>(file_segment->getPath());
 }
 
 WriteBufferToFileSegment::~WriteBufferToFileSegment()
diff --git a/src/Interpreters/Cache/WriteBufferToFileSegment.h b/src/Interpreters/Cache/WriteBufferToFileSegment.h
index feb33472513..822488ceb48 100644
--- a/src/Interpreters/Cache/WriteBufferToFileSegment.h
+++ b/src/Interpreters/Cache/WriteBufferToFileSegment.h
@@ -28,6 +28,8 @@ private:
 
     /// Empty if file_segment is not owned by this WriteBufferToFileSegment
     FileSegmentsHolderPtr segment_holder;
+
+    const size_t reserve_space_lock_wait_timeout_milliseconds;
 };
 
 
diff --git a/src/Interpreters/ClientInfo.cpp b/src/Interpreters/ClientInfo.cpp
index 347ec115aba..ce1efb61cc0 100644
--- a/src/Interpreters/ClientInfo.cpp
+++ b/src/Interpreters/ClientInfo.cpp
@@ -5,6 +5,7 @@
 #include <IO/WriteHelpers.h>
 #include <Core/ProtocolDefines.h>
 #include <base/getFQDNOrHostName.h>
+#include <Poco/Net/HTTPRequest.h>
 #include <unistd.h>
 
 #include <Common/config_version.h>
@@ -23,7 +24,7 @@ namespace ErrorCodes
 void ClientInfo::write(WriteBuffer & out, UInt64 server_protocol_revision) const
 {
     if (server_protocol_revision < DBMS_MIN_REVISION_WITH_CLIENT_INFO)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: method ClientInfo::write is called for unsupported server revision");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Method ClientInfo::write is called for unsupported server revision");
 
     writeBinary(static_cast<UInt8>(query_kind), out);
     if (empty())
@@ -103,7 +104,7 @@ void ClientInfo::write(WriteBuffer & out, UInt64 server_protocol_revision) const
 void ClientInfo::read(ReadBuffer & in, UInt64 client_protocol_revision)
 {
     if (client_protocol_revision < DBMS_MIN_REVISION_WITH_CLIENT_INFO)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: method ClientInfo::read is called for unsupported client revision");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Method ClientInfo::read is called for unsupported client revision");
 
     UInt8 read_query_kind = 0;
     readBinary(read_query_kind, in);
@@ -255,7 +256,29 @@ String toString(ClientInfo::Interface interface)
             return "TCP_INTERSERVER";
     }
 
-    return std::format("Unknown {}!\n", static_cast<int>(interface));
+    return std::format("Unknown server interface ({}).", static_cast<int>(interface));
+}
+
+void ClientInfo::setFromHTTPRequest(const Poco::Net::HTTPRequest & request)
+{
+    http_method = ClientInfo::HTTPMethod::UNKNOWN;
+    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_GET)
+        http_method = ClientInfo::HTTPMethod::GET;
+    else if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST)
+        http_method = ClientInfo::HTTPMethod::POST;
+
+    http_user_agent = request.get("User-Agent", "");
+    http_referer = request.get("Referer", "");
+    forwarded_for = request.get("X-Forwarded-For", "");
+
+    for (const auto & header : request)
+    {
+        /// These headers can contain authentication info and shouldn't be accessible by the user.
+        String key_lowercase = Poco::toLower(header.first);
+        if (key_lowercase.starts_with("x-clickhouse") || key_lowercase == "authentication")
+            continue;
+        http_headers[header.first] = header.second;
+    }
 }
 
 }
diff --git a/src/Interpreters/ClientInfo.h b/src/Interpreters/ClientInfo.h
index 70524333047..c2ed9f7ffa4 100644
--- a/src/Interpreters/ClientInfo.h
+++ b/src/Interpreters/ClientInfo.h
@@ -7,6 +7,12 @@
 #include <Common/VersionNumber.h>
 #include <boost/algorithm/string/trim.hpp>
 
+
+namespace Poco::Net
+{
+    class HTTPRequest;
+}
+
 namespace DB
 {
 
@@ -93,6 +99,7 @@ public:
     HTTPMethod http_method = HTTPMethod::UNKNOWN;
     String http_user_agent;
     String http_referer;
+    std::unordered_map<String, String> http_headers;
 
     /// For mysql and postgresql
     UInt64 connection_id = 0;
@@ -135,6 +142,9 @@ public:
     /// Initialize parameters on client initiating query.
     void setInitialQuery();
 
+    /// Initialize parameters related to HTTP request.
+    void setFromHTTPRequest(const Poco::Net::HTTPRequest & request);
+
     bool clientVersionEquals(const ClientInfo & other, bool compare_patch) const;
 
     String getVersionStr() const;
diff --git a/src/Interpreters/ClusterDiscovery.cpp b/src/Interpreters/ClusterDiscovery.cpp
index a5e861f29a3..d432488964d 100644
--- a/src/Interpreters/ClusterDiscovery.cpp
+++ b/src/Interpreters/ClusterDiscovery.cpp
@@ -35,6 +35,7 @@ namespace ErrorCodes
 {
     extern const int KEEPER_EXCEPTION;
     extern const int LOGICAL_ERROR;
+    extern const int NO_ELEMENTS_IN_CONFIG;
 }
 
 namespace FailPoints
@@ -115,7 +116,7 @@ ClusterDiscovery::ClusterDiscovery(
     const String & config_prefix)
     : context(Context::createCopy(context_))
     , current_node_name(toString(ServerUUID::get()))
-    , log(&Poco::Logger::get("ClusterDiscovery"))
+    , log(getLogger("ClusterDiscovery"))
 {
     LOG_DEBUG(log, "Cluster discovery is enabled");
 
@@ -124,21 +125,33 @@ ClusterDiscovery::ClusterDiscovery(
 
     for (const auto & key : config_keys)
     {
-        String prefix = config_prefix + "." + key + ".discovery";
-        if (!config.has(prefix))
+        String cluster_config_prefix = config_prefix + "." + key + ".discovery";
+        if (!config.has(cluster_config_prefix))
             continue;
 
+        String zk_root = config.getString(cluster_config_prefix + ".path");
+        if (zk_root.empty())
+            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "ZooKeeper path for cluster '{}' is empty", key);
+
+        const auto & password = config.getString(cluster_config_prefix + ".password", "");
+        const auto & cluster_secret = config.getString(cluster_config_prefix + ".secret", "");
+        if (!password.empty() && !cluster_secret.empty())
+            throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Both 'password' and 'secret' are specified for cluster '{}', only one option can be used at the same time", key);
+
         clusters_info.emplace(
             key,
             ClusterInfo(
                 /* name_= */ key,
-                /* zk_root_= */ config.getString(prefix + ".path"),
-                /* host_name= */ config.getString(prefix + ".my_hostname", getFQDNOrHostName()),
+                /* zk_root_= */ zk_root,
+                /* host_name= */ config.getString(cluster_config_prefix + ".my_hostname", getFQDNOrHostName()),
+                /* username= */ config.getString(cluster_config_prefix + ".user", context->getUserName()),
+                /* password= */ password,
+                /* cluster_secret= */ cluster_secret,
                 /* port= */ context->getTCPPort(),
-                /* secure= */ config.getBool(prefix + ".secure", false),
-                /* shard_id= */ config.getUInt(prefix + ".shard", 0),
-                /* observer_mode= */ ConfigHelper::getBool(config, prefix + ".observer"),
-                /* invisible= */ ConfigHelper::getBool(config, prefix + ".invisible")
+                /* secure= */ config.getBool(cluster_config_prefix + ".secure", false),
+                /* shard_id= */ config.getUInt(cluster_config_prefix + ".shard", 0),
+                /* observer_mode= */ ConfigHelper::getBool(config, cluster_config_prefix + ".observer"),
+                /* invisible= */ ConfigHelper::getBool(config, cluster_config_prefix + ".invisible")
             )
         );
     }
@@ -248,15 +261,15 @@ ClusterPtr ClusterDiscovery::makeCluster(const ClusterInfo & cluster_info)
 
     bool secure = cluster_info.current_node.secure;
     ClusterConnectionParameters params{
-        /* username= */ context->getUserName(),
-        /* password= */ "",
+        /* username= */ cluster_info.username,
+        /* password= */ cluster_info.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,
         /* priority= */ Priority{1},
-        /* cluster_name= */ "",
-        /* password= */ ""};
+        /* cluster_name= */ cluster_info.name,
+        /* cluster_secret= */ cluster_info.cluster_secret};
     auto cluster = std::make_shared<Cluster>(
         context->getSettingsRef(),
         shards,
@@ -306,7 +319,7 @@ bool ClusterDiscovery::updateCluster(ClusterInfo & cluster_info)
 
     if (cluster_info.current_cluster_is_invisible)
     {
-        LOG_DEBUG(log, "cluster '{}' is invisible!", cluster_info.name);
+        LOG_DEBUG(log, "Cluster '{}' is invisible.", cluster_info.name);
         return true;
     }
 
@@ -540,7 +553,7 @@ bool ClusterDiscovery::NodeInfo::parse(const String & data, NodeInfo & result)
         else
         {
             LOG_ERROR(
-                &Poco::Logger::get("ClusterDiscovery"),
+                getLogger("ClusterDiscovery"),
                 "Unsupported version '{}' of data in zk node '{}'",
                 ver, data.size() < 1024 ? data : "[data too long]");
         }
@@ -548,7 +561,7 @@ bool ClusterDiscovery::NodeInfo::parse(const String & data, NodeInfo & result)
     catch (Poco::Exception & e)
     {
         LOG_WARNING(
-            &Poco::Logger::get("ClusterDiscovery"),
+            getLogger("ClusterDiscovery"),
             "Can't parse '{}' from node: {}",
             data.size() < 1024 ? data : "[data too long]", e.displayText());
         return false;
diff --git a/src/Interpreters/ClusterDiscovery.h b/src/Interpreters/ClusterDiscovery.h
index 6547840845e..756ed3d8d9b 100644
--- a/src/Interpreters/ClusterDiscovery.h
+++ b/src/Interpreters/ClusterDiscovery.h
@@ -82,19 +82,31 @@ private:
         /// 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 invisible)
+        bool is_secure_connection = false;
+        String username;
+        String password;
+        String cluster_secret;
+
+        ClusterInfo(const String & name_,
+                    const String & zk_root_,
+                    const String & host_name,
+                    const String & username_,
+                    const String & password_,
+                    const String & cluster_secret_,
+                    UInt16 port,
+                    bool secure,
+                    size_t shard_id,
+                    bool observer_mode,
+                    bool invisible)
             : name(name_)
             , zk_root(zk_root_)
             , current_node(host_name + ":" + toString(port), secure, shard_id)
             , current_node_is_observer(observer_mode)
             , current_cluster_is_invisible(invisible)
+            , is_secure_connection(secure)
+            , username(username_)
+            , password(password_)
+            , cluster_secret(cluster_secret_)
         {
         }
     };
@@ -140,7 +152,7 @@ private:
     bool is_initialized = false;
     ThreadFromGlobalPool main_thread;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
index f8a070a6fde..94a02eacdaa 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.cpp
@@ -5,6 +5,9 @@
 #include <Common/checkStackSize.h>
 #include <Common/logger_useful.h>
 #include <Common/FailPoint.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Interpreters/SelectQueryOptions.h>
+#include <Planner/Utils.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <IO/ConnectionTimeouts.h>
 #include <Interpreters/ClusterProxy/SelectStreamFactory.h>
@@ -124,18 +127,54 @@ void SelectStreamFactory::createForShard(
     if (it != objects_by_shard.end())
         replaceMissedSubcolumnsByConstants(storage_snapshot->object_columns, it->second, query_ast);
 
+    createForShardImpl(
+        shard_info,
+        query_ast,
+        {},
+        main_table,
+        table_func_ptr,
+        std::move(context),
+        local_plans,
+        remote_shards,
+        shard_count,
+        parallel_replicas_enabled,
+        std::move(shard_filter_generator));
+}
+
+void SelectStreamFactory::createForShardImpl(
+    const Cluster::ShardInfo & shard_info,
+    const ASTPtr & query_ast,
+    const QueryTreeNodePtr & query_tree,
+    const StorageID & main_table,
+    const ASTPtr & table_func_ptr,
+    ContextPtr context,
+    std::vector<QueryPlanPtr> & local_plans,
+    Shards & remote_shards,
+    UInt32 shard_count,
+    bool parallel_replicas_enabled,
+    AdditionalShardFilterGenerator shard_filter_generator,
+    bool has_missing_objects)
+{
     auto emplace_local_stream = [&]()
     {
         local_plans.emplace_back(createLocalPlan(
-            query_ast, header, context, processed_stage, shard_info.shard_num, shard_count));
+            query_ast, header, context, processed_stage, shard_info.shard_num, shard_count, has_missing_objects));
     };
 
     auto emplace_remote_stream = [&](bool lazy = false, time_t local_delay = 0)
     {
+        Block shard_header;
+        if (context->getSettingsRef().allow_experimental_analyzer)
+            shard_header = InterpreterSelectQueryAnalyzer::getSampleBlock(query_tree, context, SelectQueryOptions(processed_stage).analyze());
+        else
+            shard_header = header;
+
         remote_shards.emplace_back(Shard{
             .query = query_ast,
+            .query_tree = query_tree,
             .main_table = main_table,
-            .header = header,
+            .header = shard_header,
+            .has_missing_objects = has_missing_objects,
             .shard_info = shard_info,
             .lazy = lazy,
             .local_delay = local_delay,
@@ -175,7 +214,7 @@ void SelectStreamFactory::createForShard(
             ProfileEvents::increment(ProfileEvents::DistributedConnectionMissingTable);
             if (shard_info.hasRemoteConnections())
             {
-                LOG_WARNING(&Poco::Logger::get("ClusterProxy::SelectStreamFactory"),
+                LOG_WARNING(getLogger("ClusterProxy::SelectStreamFactory"),
                     "There is no table {} on local replica of shard {}, will try remote replicas.",
                     main_table.getNameForLogs(), shard_info.shard_num);
                 emplace_remote_stream();
@@ -213,7 +252,7 @@ void SelectStreamFactory::createForShard(
 
         /// If we reached this point, local replica is stale.
         ProfileEvents::increment(ProfileEvents::DistributedConnectionStaleReplica);
-        LOG_WARNING(&Poco::Logger::get("ClusterProxy::SelectStreamFactory"), "Local replica of shard {} is stale (delay: {}s.)", shard_info.shard_num, local_delay);
+        LOG_WARNING(getLogger("ClusterProxy::SelectStreamFactory"), "Local replica of shard {} is stale (delay: {}s.)", shard_info.shard_num, local_delay);
 
         if (!settings.fallback_to_stale_replicas_for_distributed_queries)
         {
@@ -243,6 +282,44 @@ void SelectStreamFactory::createForShard(
         emplace_remote_stream();
 }
 
+void SelectStreamFactory::createForShard(
+    const Cluster::ShardInfo & shard_info,
+    const QueryTreeNodePtr & query_tree,
+    const StorageID & main_table,
+    const ASTPtr & table_func_ptr,
+    ContextPtr context,
+    std::vector<QueryPlanPtr> & local_plans,
+    Shards & remote_shards,
+    UInt32 shard_count,
+    bool parallel_replicas_enabled,
+    AdditionalShardFilterGenerator shard_filter_generator)
+{
+
+    auto it = objects_by_shard.find(shard_info.shard_num);
+    QueryTreeNodePtr modified_query = query_tree;
+
+    bool has_missing_objects = false;
+    if (it != objects_by_shard.end())
+        has_missing_objects = replaceMissedSubcolumnsByConstants(storage_snapshot->object_columns, it->second, modified_query, context);
+
+    auto query_ast = queryNodeToDistributedSelectQuery(modified_query);
+
+    createForShardImpl(
+        shard_info,
+        query_ast,
+        modified_query,
+        main_table,
+        table_func_ptr,
+        std::move(context),
+        local_plans,
+        remote_shards,
+        shard_count,
+        parallel_replicas_enabled,
+        std::move(shard_filter_generator),
+        has_missing_objects);
+
+}
+
 
 }
 }
diff --git a/src/Interpreters/ClusterProxy/SelectStreamFactory.h b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
index 9993ea7028d..2e7b2445c6b 100644
--- a/src/Interpreters/ClusterProxy/SelectStreamFactory.h
+++ b/src/Interpreters/ClusterProxy/SelectStreamFactory.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Analyzer/IQueryTreeNode.h>
 #include <Client/ConnectionPool.h>
 #include <Core/QueryProcessingStage.h>
 #include <Interpreters/Cluster.h>
@@ -50,10 +51,14 @@ public:
     {
         /// Query and header may be changed depending on shard.
         ASTPtr query;
+        QueryTreeNodePtr query_tree;
+
         /// Used to check the table existence on remote node
         StorageID main_table;
         Block header;
 
+        bool has_missing_objects = false;
+
         Cluster::ShardInfo shard_info;
 
         /// If we connect to replicas lazily.
@@ -83,10 +88,37 @@ public:
         bool parallel_replicas_enabled,
         AdditionalShardFilterGenerator shard_filter_generator);
 
+    void createForShard(
+        const Cluster::ShardInfo & shard_info,
+        const QueryTreeNodePtr & query_tree,
+        const StorageID & main_table,
+        const ASTPtr & table_func_ptr,
+        ContextPtr context,
+        std::vector<QueryPlanPtr> & local_plans,
+        Shards & remote_shards,
+        UInt32 shard_count,
+        bool parallel_replicas_enabled,
+        AdditionalShardFilterGenerator shard_filter_generator);
+
     const Block header;
     const ColumnsDescriptionByShardNum objects_by_shard;
     const StorageSnapshotPtr storage_snapshot;
     QueryProcessingStage::Enum processed_stage;
+
+private:
+    void createForShardImpl(
+        const Cluster::ShardInfo & shard_info,
+        const ASTPtr & query_ast,
+        const QueryTreeNodePtr & query_tree,
+        const StorageID & main_table,
+        const ASTPtr & table_func_ptr,
+        ContextPtr context,
+        std::vector<QueryPlanPtr> & local_plans,
+        Shards & remote_shards,
+        UInt32 shard_count,
+        bool parallel_replicas_enabled,
+        AdditionalShardFilterGenerator shard_filter_generator,
+        bool has_missing_objects = false);
 };
 
 }
diff --git a/src/Interpreters/ClusterProxy/executeQuery.cpp b/src/Interpreters/ClusterProxy/executeQuery.cpp
index b3a48e3e611..07ef7aa6c96 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.cpp
+++ b/src/Interpreters/ClusterProxy/executeQuery.cpp
@@ -32,6 +32,7 @@ namespace ErrorCodes
     extern const int TOO_LARGE_DISTRIBUTED_DEPTH;
     extern const int LOGICAL_ERROR;
     extern const int CLUSTER_DOESNT_EXIST;
+    extern const int UNEXPECTED_CLUSTER;
 }
 
 namespace ClusterProxy
@@ -42,7 +43,7 @@ ContextMutablePtr updateSettingsForCluster(const Cluster & cluster,
     const Settings & settings,
     const StorageID & main_table,
     ASTPtr additional_filter_ast,
-    Poco::Logger * log,
+    LoggerPtr log,
     const DistributedSettings * distributed_settings)
 {
     Settings new_settings = settings;
@@ -147,7 +148,7 @@ ContextMutablePtr updateSettingsForCluster(const Cluster & cluster,
             }
         }
         if (disable_parallel_replicas)
-            new_settings.allow_experimental_parallel_reading_from_replicas = false;
+            new_settings.allow_experimental_parallel_reading_from_replicas = 0;
     }
 
     if (settings.max_execution_time_leaf.value > 0)
@@ -202,13 +203,11 @@ void executeQuery(
     const StorageID & main_table,
     const ASTPtr & table_func_ptr,
     SelectStreamFactory & stream_factory,
-    Poco::Logger * log,
-    const ASTPtr & query_ast,
+    LoggerPtr log,
     ContextPtr context,
     const SelectQueryInfo & query_info,
     const ExpressionActionsPtr & sharding_key_expr,
     const std::string & sharding_key_column_name,
-    const ClusterPtr & not_optimized_cluster,
     const DistributedSettings & distributed_settings,
     AdditionalShardFilterGenerator shard_filter_generator)
 {
@@ -217,6 +216,8 @@ void executeQuery(
     if (settings.max_distributed_depth && context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
         throw Exception(ErrorCodes::TOO_LARGE_DISTRIBUTED_DEPTH, "Maximum distributed depth exceeded");
 
+    const ClusterPtr & not_optimized_cluster = query_info.cluster;
+
     std::vector<QueryPlanPtr> plans;
     SelectStreamFactory::Shards remote_shards;
 
@@ -236,40 +237,81 @@ void executeQuery(
     new_context->increaseDistributedDepth();
 
     const size_t shards = cluster->getShardCount();
-    for (size_t i = 0, s = cluster->getShardsInfo().size(); i < s; ++i)
+
+    if (context->getSettingsRef().allow_experimental_analyzer)
     {
-        const auto & shard_info = cluster->getShardsInfo()[i];
-
-        ASTPtr query_ast_for_shard = query_ast->clone();
-        if (sharding_key_expr && query_info.optimized_cluster && settings.optimize_skip_unused_shards_rewrite_in && shards > 1)
+        for (size_t i = 0, s = cluster->getShardsInfo().size(); i < s; ++i)
         {
-            OptimizeShardingKeyRewriteInVisitor::Data visitor_data{
-                sharding_key_expr,
-                sharding_key_expr->getSampleBlock().getByPosition(0).type,
-                sharding_key_column_name,
+            const auto & shard_info = cluster->getShardsInfo()[i];
+
+            auto query_for_shard = query_info.query_tree->clone();
+            if (sharding_key_expr && query_info.optimized_cluster && settings.optimize_skip_unused_shards_rewrite_in && shards > 1)
+            {
+                OptimizeShardingKeyRewriteInVisitor::Data visitor_data{
+                    sharding_key_expr,
+                    sharding_key_expr->getSampleBlock().getByPosition(0).type,
+                    sharding_key_column_name,
+                    shard_info,
+                    not_optimized_cluster->getSlotToShard(),
+                };
+                optimizeShardingKeyRewriteIn(query_for_shard, std::move(visitor_data), new_context);
+            }
+
+            // decide for each shard if parallel reading from replicas should be enabled
+            // according to settings and number of replicas declared per shard
+            const auto & addresses = cluster->getShardsAddresses().at(i);
+            bool parallel_replicas_enabled = addresses.size() > 1 && context->canUseTaskBasedParallelReplicas();
+
+            stream_factory.createForShard(
                 shard_info,
-                not_optimized_cluster->getSlotToShard(),
-            };
-            OptimizeShardingKeyRewriteInVisitor visitor(visitor_data);
-            visitor.visit(query_ast_for_shard);
+                query_for_shard,
+                main_table,
+                table_func_ptr,
+                new_context,
+                plans,
+                remote_shards,
+                static_cast<UInt32>(shards),
+                parallel_replicas_enabled,
+                shard_filter_generator);
         }
+    }
+    else
+    {
+        for (size_t i = 0, s = cluster->getShardsInfo().size(); i < s; ++i)
+        {
+            const auto & shard_info = cluster->getShardsInfo()[i];
 
-        // decide for each shard if parallel reading from replicas should be enabled
-        // according to settings and number of replicas declared per shard
-        const auto & addresses = cluster->getShardsAddresses().at(i);
-        bool parallel_replicas_enabled = addresses.size() > 1 && context->canUseTaskBasedParallelReplicas();
+            ASTPtr query_ast_for_shard = query_info.query->clone();
+            if (sharding_key_expr && query_info.optimized_cluster && settings.optimize_skip_unused_shards_rewrite_in && shards > 1)
+            {
+                OptimizeShardingKeyRewriteInVisitor::Data visitor_data{
+                    sharding_key_expr,
+                    sharding_key_expr->getSampleBlock().getByPosition(0).type,
+                    sharding_key_column_name,
+                    shard_info,
+                    not_optimized_cluster->getSlotToShard(),
+                };
+                OptimizeShardingKeyRewriteInVisitor visitor(visitor_data);
+                visitor.visit(query_ast_for_shard);
+            }
 
-        stream_factory.createForShard(
-            shard_info,
-            query_ast_for_shard,
-            main_table,
-            table_func_ptr,
-            new_context,
-            plans,
-            remote_shards,
-            static_cast<UInt32>(shards),
-            parallel_replicas_enabled,
-            shard_filter_generator);
+            // decide for each shard if parallel reading from replicas should be enabled
+            // according to settings and number of replicas declared per shard
+            const auto & addresses = cluster->getShardsAddresses().at(i);
+            bool parallel_replicas_enabled = addresses.size() > 1 && context->canUseTaskBasedParallelReplicas();
+
+            stream_factory.createForShard(
+                shard_info,
+                query_ast_for_shard,
+                main_table,
+                table_func_ptr,
+                new_context,
+                plans,
+                remote_shards,
+                static_cast<UInt32>(shards),
+                parallel_replicas_enabled,
+                shard_filter_generator);
+        }
     }
 
     if (!remote_shards.empty())
@@ -322,7 +364,6 @@ void executeQuery(
 
 void executeQueryWithParallelReplicas(
     QueryPlan & query_plan,
-    const StorageID & main_table,
     SelectStreamFactory & stream_factory,
     const ASTPtr & query_ast,
     ContextPtr context,
@@ -348,14 +389,14 @@ void executeQueryWithParallelReplicas(
         if (settings.use_hedged_requests.changed)
         {
             LOG_WARNING(
-                &Poco::Logger::get("executeQueryWithParallelReplicas"),
+                getLogger("executeQueryWithParallelReplicas"),
                 "Setting 'use_hedged_requests' explicitly with enabled 'allow_experimental_parallel_reading_from_replicas' has no effect. "
                 "Hedged connections are not used for parallel reading from replicas");
         }
         else
         {
             LOG_INFO(
-                &Poco::Logger::get("executeQueryWithParallelReplicas"),
+                getLogger("executeQueryWithParallelReplicas"),
                 "Disabling 'use_hedged_requests' in favor of 'allow_experimental_parallel_reading_from_replicas'. Hedged connections are "
                 "not used for parallel reading from replicas");
         }
@@ -375,12 +416,12 @@ void executeQueryWithParallelReplicas(
         shard_num = column->getUInt(0);
     }
 
-    ClusterPtr new_cluster;
+    const auto shard_count = not_optimized_cluster->getShardCount();
+    ClusterPtr new_cluster = not_optimized_cluster;
     /// if got valid shard_num from query initiator, then parallel replicas scope is the specified shard
     /// shards are numbered in order of appearance in the cluster config
     if (shard_num > 0)
     {
-        const auto shard_count = not_optimized_cluster->getShardCount();
         if (shard_num > shard_count)
             throw Exception(
                 ErrorCodes::LOGICAL_ERROR,
@@ -391,22 +432,23 @@ void executeQueryWithParallelReplicas(
 
         chassert(shard_count == not_optimized_cluster->getShardsAddresses().size());
 
-        LOG_DEBUG(&Poco::Logger::get("executeQueryWithParallelReplicas"), "Parallel replicas query in shard scope: shard_num={} cluster={}",
+        LOG_DEBUG(getLogger("executeQueryWithParallelReplicas"), "Parallel replicas query in shard scope: shard_num={} cluster={}",
                   shard_num, not_optimized_cluster->getName());
 
         // get cluster for shard specified by shard_num
         // shard_num is 1-based, but getClusterWithSingleShard expects 0-based index
-        auto single_shard_cluster = not_optimized_cluster->getClusterWithSingleShard(shard_num - 1);
-        // convert cluster to representation expected by parallel replicas
-        new_cluster = single_shard_cluster->getClusterWithReplicasAsShards(settings, settings.max_parallel_replicas);
+        new_cluster = not_optimized_cluster->getClusterWithSingleShard(shard_num - 1);
     }
     else
     {
-        new_cluster = not_optimized_cluster->getClusterWithReplicasAsShards(settings, settings.max_parallel_replicas);
+        if (not_optimized_cluster->getShardCount() > 1)
+            throw DB::Exception(
+                ErrorCodes::UNEXPECTED_CLUSTER,
+                "`cluster_for_parallel_replicas` setting refers to cluster with several shards. Expected a cluster with one shard");
     }
 
-    auto coordinator
-        = std::make_shared<ParallelReplicasReadingCoordinator>(new_cluster->getShardCount(), settings.parallel_replicas_mark_segment_size);
+    auto coordinator = std::make_shared<ParallelReplicasReadingCoordinator>(
+        new_cluster->getShardsInfo().begin()->getAllNodeCount(), settings.parallel_replicas_mark_segment_size);
     auto external_tables = new_context->getExternalTables();
     auto read_from_remote = std::make_unique<ReadFromParallelRemoteReplicasStep>(
         query_ast,
@@ -414,12 +456,11 @@ void executeQueryWithParallelReplicas(
         std::move(coordinator),
         stream_factory.header,
         stream_factory.processed_stage,
-        main_table,
         new_context,
         getThrottler(new_context),
         std::move(scalars),
         std::move(external_tables),
-        &Poco::Logger::get("ReadFromParallelRemoteReplicasStep"),
+        getLogger("ReadFromParallelRemoteReplicasStep"),
         std::move(storage_limits));
 
     query_plan.addStep(std::move(read_from_remote));
diff --git a/src/Interpreters/ClusterProxy/executeQuery.h b/src/Interpreters/ClusterProxy/executeQuery.h
index b5ee4a11df6..8f6f6300c7b 100644
--- a/src/Interpreters/ClusterProxy/executeQuery.h
+++ b/src/Interpreters/ClusterProxy/executeQuery.h
@@ -43,7 +43,7 @@ ContextMutablePtr updateSettingsForCluster(const Cluster & cluster,
     const Settings & settings,
     const StorageID & main_table,
     ASTPtr additional_filter_ast = nullptr,
-    Poco::Logger * log = nullptr,
+    LoggerPtr log = nullptr,
     const DistributedSettings * distributed_settings = nullptr);
 
 using AdditionalShardFilterGenerator = std::function<ASTPtr(uint64_t)>;
@@ -57,20 +57,17 @@ void executeQuery(
     const StorageID & main_table,
     const ASTPtr & table_func_ptr,
     SelectStreamFactory & stream_factory,
-    Poco::Logger * log,
-    const ASTPtr & query_ast,
+    LoggerPtr log,
     ContextPtr context,
     const SelectQueryInfo & query_info,
     const ExpressionActionsPtr & sharding_key_expr,
     const std::string & sharding_key_column_name,
-    const ClusterPtr & not_optimized_cluster,
     const DistributedSettings & distributed_settings,
     AdditionalShardFilterGenerator shard_filter_generator);
 
 
 void executeQueryWithParallelReplicas(
     QueryPlan & query_plan,
-    const StorageID & main_table,
     SelectStreamFactory & stream_factory,
     const ASTPtr & query_ast,
     ContextPtr context,
diff --git a/src/Interpreters/CollectJoinOnKeysVisitor.h b/src/Interpreters/CollectJoinOnKeysVisitor.h
index 194ec01bcd5..ff10db3beb5 100644
--- a/src/Interpreters/CollectJoinOnKeysVisitor.h
+++ b/src/Interpreters/CollectJoinOnKeysVisitor.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <Core/Joins.h>
 #include <Core/Names.h>
+#include <Interpreters/Aliases.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/queryToString.h>
-#include <Interpreters/InDepthNodeVisitor.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
-#include <Interpreters/Aliases.h>
 
 
 namespace DB
diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index f1c74f4195b..04b761e8b2b 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -15,9 +15,9 @@
 #include <Common/thread_local_rng.h>
 #include <Common/FieldVisitorToString.h>
 #include <Common/getMultipleKeysFromConfig.h>
-#include <Common/getNumberOfPhysicalCPUCores.h>
 #include <Common/callOnce.h>
 #include <Common/SharedLockGuard.h>
+#include <Common/PageCache.h>
 #include <Coordination/KeeperDispatcher.h>
 #include <Core/BackgroundSchedulePool.h>
 #include <Formats/FormatFactory.h>
@@ -29,6 +29,7 @@
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
+#include <Storages/Distributed/DistributedSettings.h>
 #include <Storages/CompressionCodecSelector.h>
 #include <Storages/StorageS3Settings.h>
 #include <Disks/DiskLocal.h>
@@ -43,6 +44,7 @@
 #include <Interpreters/TemporaryDataOnDisk.h>
 #include <Interpreters/Cache/QueryCache.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
+#include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/SessionTracker.h>
 #include <Core/ServerSettings.h>
 #include <Interpreters/PreparedSets.h>
@@ -59,7 +61,7 @@
 #include <Access/SettingsConstraintsAndProfileIDs.h>
 #include <Access/ExternalAuthenticators.h>
 #include <Access/GSSAcceptor.h>
-#include <IO/ResourceManagerFactory.h>
+#include <Common/Scheduler/ResourceManagerFactory.h>
 #include <Backups/BackupsWorker.h>
 #include <Dictionaries/Embedded/GeoDictionariesLoader.h>
 #include <Interpreters/EmbeddedDictionaries.h>
@@ -93,6 +95,7 @@
 #include <Common/logger_useful.h>
 #include <Common/RemoteHostFilter.h>
 #include <Common/HTTPHeaderFilter.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
@@ -110,6 +113,7 @@
 #include <Parsers/FunctionParameterValuesVisitor.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
+#include <base/defines.h>
 
 
 namespace fs = std::filesystem;
@@ -197,7 +201,7 @@ namespace ErrorCodes
   */
 struct ContextSharedPart : boost::noncopyable
 {
-    Poco::Logger * log = &Poco::Logger::get("Context");
+    LoggerPtr log = getLogger("Context");
 
     /// For access of most of shared objects.
     mutable ContextSharedMutex mutex;
@@ -215,10 +219,8 @@ struct ContextSharedPart : boost::noncopyable
     mutable zkutil::ZooKeeperPtr zookeeper TSA_GUARDED_BY(zookeeper_mutex);                 /// Client for ZooKeeper.
     ConfigurationPtr zookeeper_config TSA_GUARDED_BY(zookeeper_mutex);                      /// Stores zookeeper configs
 
-#if USE_NURAFT
-    mutable std::mutex keeper_dispatcher_mutex;
-    mutable std::shared_ptr<KeeperDispatcher> keeper_dispatcher TSA_GUARDED_BY(keeper_dispatcher_mutex);
-#endif
+    ConfigurationPtr sensitive_data_masker_config;
+
     mutable std::mutex auxiliary_zookeepers_mutex;
     mutable std::map<String, zkutil::ZooKeeperPtr> auxiliary_zookeepers TSA_GUARDED_BY(auxiliary_zookeepers_mutex);    /// Map for auxiliary ZooKeeper clients.
     ConfigurationPtr auxiliary_zookeepers_config TSA_GUARDED_BY(auxiliary_zookeepers_mutex);           /// Stores auxiliary zookeepers configs
@@ -235,6 +237,7 @@ struct ContextSharedPart : boost::noncopyable
     String dictionaries_lib_path TSA_GUARDED_BY(mutex);      /// Path to the directory with user provided binaries and libraries for external dictionaries.
     String user_scripts_path TSA_GUARDED_BY(mutex);          /// Path to the directory with user provided scripts.
     String filesystem_caches_path TSA_GUARDED_BY(mutex);     /// Path to the directory with filesystem caches.
+    String filesystem_cache_user TSA_GUARDED_BY(mutex);
     ConfigurationPtr config TSA_GUARDED_BY(mutex);           /// Global configuration settings.
     String tmp_path TSA_GUARDED_BY(mutex);                   /// Path to the temporary files that occur when processing the request.
 
@@ -287,6 +290,8 @@ struct ContextSharedPart : boost::noncopyable
     mutable QueryCachePtr query_cache TSA_GUARDED_BY(mutex);                          /// Cache of query results.
     mutable MarkCachePtr index_mark_cache TSA_GUARDED_BY(mutex);                      /// Cache of marks in compressed files of MergeTree indices.
     mutable MMappedFileCachePtr mmap_cache TSA_GUARDED_BY(mutex);                     /// Cache of mmapped files to avoid frequent open/map/unmap/close and to reuse from several threads.
+    AsynchronousMetrics * asynchronous_metrics TSA_GUARDED_BY(mutex) = nullptr;       /// Points to asynchronous metrics
+    mutable PageCachePtr page_cache TSA_GUARDED_BY(mutex);                            /// Userspace page cache.
     ProcessList process_list;                                   /// Executing queries at the moment.
     SessionTracker session_tracker;
     GlobalOvercommitTracker global_overcommit_tracker;
@@ -347,6 +352,7 @@ struct ContextSharedPart : boost::noncopyable
 
     std::optional<MergeTreeSettings> merge_tree_settings TSA_GUARDED_BY(mutex);   /// Settings of MergeTree* engines.
     std::optional<MergeTreeSettings> replicated_merge_tree_settings TSA_GUARDED_BY(mutex);   /// Settings of ReplicatedMergeTree* engines.
+    std::optional<DistributedSettings> distributed_settings TSA_GUARDED_BY(mutex);
     std::atomic_size_t max_table_size_to_drop = 50000000000lu; /// Protects MergeTree tables from accidental DROP (50GB by default)
     std::atomic_size_t max_partition_size_to_drop = 50000000000lu; /// Protects MergeTree partitions from accidental DROP (50GB by default)
     /// No lock required for format_schema_path modified only during initialization
@@ -370,11 +376,9 @@ struct ContextSharedPart : boost::noncopyable
     OrdinaryBackgroundExecutorPtr moves_executor TSA_GUARDED_BY(background_executors_mutex);
     OrdinaryBackgroundExecutorPtr fetch_executor TSA_GUARDED_BY(background_executors_mutex);
     OrdinaryBackgroundExecutorPtr common_executor TSA_GUARDED_BY(background_executors_mutex);
-    /// The global pool of HTTP sessions for background fetches.
-    PooledSessionFactoryPtr fetches_session_factory TSA_GUARDED_BY(background_executors_mutex);
 
-    RemoteHostFilter remote_host_filter TSA_GUARDED_BY(mutex);                    /// Allowed URL from config.xml
-    HTTPHeaderFilter http_header_filter TSA_GUARDED_BY(mutex);                    /// Forbidden HTTP headers from config.xml
+    RemoteHostFilter remote_host_filter;                    /// Allowed URL from config.xml
+    HTTPHeaderFilter http_header_filter;                    /// Forbidden HTTP headers from config.xml
 
     /// No lock required for trace_collector modified only during initialization
     std::optional<TraceCollector> trace_collector;          /// Thread collecting traces from threads executing queries
@@ -409,6 +413,11 @@ struct ContextSharedPart : boost::noncopyable
 
     bool is_server_completely_started TSA_GUARDED_BY(mutex) = false;
 
+#if USE_NURAFT
+    mutable std::mutex keeper_dispatcher_mutex;
+    mutable std::shared_ptr<KeeperDispatcher> keeper_dispatcher TSA_GUARDED_BY(keeper_dispatcher_mutex);
+#endif
+
     ContextSharedPart()
         : access_control(std::make_unique<AccessControl>())
         , global_overcommit_tracker(&process_list)
@@ -424,9 +433,22 @@ struct ContextSharedPart : boost::noncopyable
         }
     }
 
-
     ~ContextSharedPart()
     {
+#if USE_NURAFT
+        if (keeper_dispatcher)
+        {
+            try
+            {
+                keeper_dispatcher->shutdown();
+            }
+            catch (...)
+            {
+                tryLogCurrentException(__PRETTY_FUNCTION__);
+            }
+        }
+#endif
+
         /// Wait for thread pool for background reads and writes,
         /// since it may use per-user MemoryTracker which will be destroyed here.
         if (asynchronous_remote_fs_reader)
@@ -553,7 +575,13 @@ struct ContextSharedPart : boost::noncopyable
             return;
 
         /// Need to flush the async insert queue before shutting down the database catalog
-        async_insert_queue.reset();
+        std::shared_ptr<AsynchronousInsertQueue> delete_async_insert_queue;
+        {
+            std::lock_guard lock(mutex);
+            delete_async_insert_queue = std::move(async_insert_queue);
+        }
+        if (delete_async_insert_queue)
+            delete_async_insert_queue->flushAndShutdown();
 
         /// Stop periodic reloading of the configuration files.
         /// This must be done first because otherwise the reloading may pass a changed config
@@ -577,6 +605,8 @@ struct ContextSharedPart : boost::noncopyable
         LOG_TRACE(log, "Shutting down database catalog");
         DatabaseCatalog::shutdown();
 
+        delete_async_insert_queue.reset();
+
         SHUTDOWN(log, "merges executor", merge_mutate_executor, wait());
         SHUTDOWN(log, "fetches executor", fetch_executor, wait());
         SHUTDOWN(log, "moves executor", moves_executor, wait());
@@ -615,6 +645,7 @@ struct ContextSharedPart : boost::noncopyable
         const auto & caches = FileCacheFactory::instance().getAll();
         for (const auto & [_, cache] : caches)
             cache->cache->deactivateBackgroundOperations();
+        FileCacheFactory::instance().clear();
 
         {
             // Disk selector might not be initialized if there was some error during
@@ -715,7 +746,7 @@ struct ContextSharedPart : boost::noncopyable
     void addWarningMessage(const String & message) TSA_REQUIRES(mutex)
     {
         /// A warning goes both: into server's log; stored to be placed in `system.warnings` table.
-        log->warning(message);
+        LOG_WARNING(log, "{}", message);
         warnings.push_back(message);
     }
 
@@ -787,6 +818,7 @@ ContextMutablePtr Context::createGlobal(ContextSharedPart * shared_part)
 {
     auto res = std::shared_ptr<Context>(new Context);
     res->shared = shared_part;
+    res->query_access_info = std::make_shared<QueryAccessInfo>();
     return res;
 }
 
@@ -806,7 +838,9 @@ SharedContextHolder Context::createShared()
 ContextMutablePtr Context::createCopy(const ContextPtr & other)
 {
     SharedLockGuard lock(other->mutex);
-    return std::shared_ptr<Context>(new Context(*other));
+    auto new_context = std::shared_ptr<Context>(new Context(*other));
+    new_context->query_access_info = std::make_shared<QueryAccessInfo>(*other->query_access_info);
+    return new_context;
 }
 
 ContextMutablePtr Context::createCopy(const ContextWeakPtr & other)
@@ -886,17 +920,23 @@ String Context::getFilesystemCachesPath() const
     return shared->filesystem_caches_path;
 }
 
+String Context::getFilesystemCacheUser() const
+{
+    SharedLockGuard lock(shared->mutex);
+    return shared->filesystem_cache_user;
+}
+
 Strings Context::getWarnings() const
 {
     Strings common_warnings;
     {
         SharedLockGuard lock(shared->mutex);
         common_warnings = shared->warnings;
-        if (CurrentMetrics::get(CurrentMetrics::AttachedTable) > static_cast<DB::Int64>(shared->max_table_num_to_warn))
+        if (CurrentMetrics::get(CurrentMetrics::AttachedTable) > static_cast<Int64>(shared->max_table_num_to_warn))
             common_warnings.emplace_back(fmt::format("The number of attached tables is more than {}", shared->max_table_num_to_warn));
-        if (CurrentMetrics::get(CurrentMetrics::AttachedDatabase) > static_cast<DB::Int64>(shared->max_database_num_to_warn))
-            common_warnings.emplace_back(fmt::format("The number of attached databases is more than {}", shared->max_table_num_to_warn));
-        if (CurrentMetrics::get(CurrentMetrics::PartsActive) > static_cast<DB::Int64>(shared->max_part_num_to_warn))
+        if (CurrentMetrics::get(CurrentMetrics::AttachedDatabase) > static_cast<Int64>(shared->max_database_num_to_warn))
+            common_warnings.emplace_back(fmt::format("The number of attached databases is more than {}", shared->max_database_num_to_warn));
+        if (CurrentMetrics::get(CurrentMetrics::PartsActive) > static_cast<Int64>(shared->max_part_num_to_warn))
             common_warnings.emplace_back(fmt::format("The number of active parts is more than {}", shared->max_part_num_to_warn));
     }
     /// Make setting's name ordered
@@ -931,7 +971,7 @@ Strings Context::getWarnings() const
 /// TODO: remove, use `getTempDataOnDisk`
 VolumePtr Context::getGlobalTemporaryVolume() const
 {
-    std::lock_guard lock(shared->mutex);
+    SharedLockGuard lock(shared->mutex);
     /// 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)
@@ -993,7 +1033,13 @@ void Context::setFilesystemCachesPath(const String & path)
     shared->filesystem_caches_path = path;
 }
 
-static void setupTmpPath(Poco::Logger * log, const std::string & path)
+void Context::setFilesystemCacheUser(const String & user)
+{
+    std::lock_guard lock(shared->mutex);
+    shared->filesystem_cache_user = user;
+}
+
+static void setupTmpPath(LoggerPtr log, const std::string & path)
 try
 {
     LOG_DEBUG(log, "Setting up {} to store temporary data in it", path);
@@ -1049,7 +1095,9 @@ void Context::setTemporaryStoragePath(const String & path, size_t max_size)
         setupTmpPath(shared->log, disk->getPath());
     }
 
-    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, max_size);
+    TemporaryDataOnDiskSettings temporary_data_on_disk_settings;
+    temporary_data_on_disk_settings.max_size_on_disk = max_size;
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(std::move(volume), std::move(temporary_data_on_disk_settings));
 }
 
 void Context::setTemporaryStoragePolicy(const String & policy_name, size_t max_size)
@@ -1069,7 +1117,7 @@ void Context::setTemporaryStoragePolicy(const String & policy_name, size_t max_s
     VolumePtr volume = tmp_policy->getVolume(0);
 
     if (volume->getDisks().empty())
-         throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "No disks volume for temporary files");
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "No disks volume for temporary files");
 
     for (const auto & disk : volume->getDisks())
     {
@@ -1095,7 +1143,9 @@ void Context::setTemporaryStoragePolicy(const String & policy_name, size_t max_s
     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);
+    TemporaryDataOnDiskSettings temporary_data_on_disk_settings;
+    temporary_data_on_disk_settings.max_size_on_disk = max_size;
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(std::move(volume), std::move(temporary_data_on_disk_settings));
 }
 
 void Context::setTemporaryStorageInCache(const String & cache_disk_name, size_t max_size)
@@ -1116,7 +1166,10 @@ void Context::setTemporaryStorageInCache(const String & cache_disk_name, size_t
 
     shared->tmp_path = file_cache->getBasePath();
     VolumePtr volume = createLocalSingleDiskVolume(shared->tmp_path, shared->getConfigRefWithLock(lock));
-    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(volume, file_cache.get(), max_size);
+
+    TemporaryDataOnDiskSettings temporary_data_on_disk_settings;
+    temporary_data_on_disk_settings.max_size_on_disk = max_size;
+    shared->root_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(std::move(volume), file_cache.get(), std::move(temporary_data_on_disk_settings));
 }
 
 void Context::setFlagsPath(const String & path)
@@ -1153,6 +1206,29 @@ void Context::addWarningMessage(const String & msg) const
         shared->addWarningMessage(msg);
 }
 
+void Context::addWarningMessageAboutDatabaseOrdinary(const String & database_name) const
+{
+    std::lock_guard lock(shared->mutex);
+
+    /// We would like to report only about the first database with engine Ordinary
+    static std::atomic_bool is_called = false;
+    if (is_called.exchange(true))
+        return;
+
+    auto suppress_re = shared->getConfigRefWithLock(lock).getString("warning_supress_regexp", "");
+    /// We don't use getFlagsPath method, because it takes a shared lock.
+    auto convert_databases_flag = fs::path(shared->flags_path) / "convert_ordinary_to_atomic";
+    auto message = fmt::format("Server has databases (for example `{}`) with Ordinary engine, which was deprecated. "
+            "To convert this database to the new Atomic engine, create a flag {} and make sure that ClickHouse has write permission for it. "
+            "Example: sudo touch '{}' && sudo chmod 666 '{}'",
+            database_name,
+            convert_databases_flag.string(), convert_databases_flag.string(), convert_databases_flag.string());
+
+    bool is_supressed = !suppress_re.empty() && re2::RE2::PartialMatch(message, suppress_re);
+    if (!is_supressed)
+        shared->addWarningMessage(message);
+}
+
 void Context::setConfig(const ConfigurationPtr & config)
 {
     shared->setConfig(config);
@@ -1204,7 +1280,7 @@ void Context::setUser(const UUID & user_id_, const std::optional<const std::vect
 {
     /// Prepare lists of user's profiles, constraints, settings, roles.
     /// NOTE: AccessControl::read<User>() and other AccessControl's functions may require some IO work,
-    /// so Context::getLock() must be unlocked while we're doing this.
+    /// so Context::getLocalLock() and Context::getGlobalLock() must be unlocked while we're doing this.
 
     auto & access_control = getAccessControl();
     auto user = access_control.read<User>(user_id_);
@@ -1295,6 +1371,23 @@ std::shared_ptr<const EnabledRolesInfo> Context::getRolesInfo() const
     return getAccess()->getRolesInfo();
 }
 
+namespace
+{
+ALWAYS_INLINE inline void
+contextSanityCheckWithLock(const Context & context, const Settings & settings, const std::lock_guard<ContextSharedMutex> &)
+{
+    const auto type = context.getApplicationType();
+    if (type == Context::ApplicationType::LOCAL || type == Context::ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
+}
+
+ALWAYS_INLINE inline void contextSanityCheck(const Context & context, const Settings & settings)
+{
+    const auto type = context.getApplicationType();
+    if (type == Context::ApplicationType::LOCAL || type == Context::ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
+}
+}
 
 template <typename... Args>
 void Context::checkAccessImpl(const Args &... args) const
@@ -1317,7 +1410,7 @@ void Context::checkAccess(const AccessRightsElements & elements) const { return
 
 std::shared_ptr<const ContextAccess> Context::getAccess() const
 {
-    /// A helper function to collect parameters for calculating access rights, called with Context::getLock() acquired.
+    /// A helper function to collect parameters for calculating access rights, called with Context::getLocalSharedLock() acquired.
     auto get_params = [this]()
     {
         /// If setUserID() was never called then this must be the global context with the full access.
@@ -1344,7 +1437,8 @@ std::shared_ptr<const ContextAccess> Context::getAccess() const
     }
 
     /// Calculate new access rights according to the collected parameters.
-    /// NOTE: AccessControl::getContextAccess() may require some IO work, so Context::getLock() must be unlocked while we're doing this.
+    /// NOTE: AccessControl::getContextAccess() may require some IO work, so Context::getLocalLock()
+    ///       and Context::getGlobalLock() must be unlocked while we're doing this.
     auto res = getAccessControl().getContextAccess(*params);
 
     {
@@ -1404,6 +1498,7 @@ void Context::setCurrentProfilesWithLock(const SettingsProfilesInfo & profiles_i
         checkSettingsConstraintsWithLock(profiles_info.settings, SettingSource::PROFILE);
     applySettingsChangesWithLock(profiles_info.settings, lock);
     settings_constraints_and_current_profiles = profiles_info.getConstraintsAndProfileIDs(settings_constraints_and_current_profiles);
+    contextSanityCheckWithLock(*this, settings, lock);
 }
 
 void Context::setCurrentProfile(const String & profile_name, bool check_constraints)
@@ -1455,14 +1550,17 @@ ClassifierPtr Context::getWorkloadClassifier() const
 }
 
 
-const Scalars & Context::getScalars() const
+Scalars Context::getScalars() const
 {
+    std::lock_guard lock(mutex);
     return scalars;
 }
 
 
-const Block & Context::getScalar(const String & name) const
+Block Context::getScalar(const String & name) const
 {
+    std::lock_guard lock(mutex);
+
     auto it = scalars.find(name);
     if (scalars.end() == it)
     {
@@ -1473,12 +1571,13 @@ const Block & Context::getScalar(const String & name) const
     return it->second;
 }
 
-const Block * Context::tryGetSpecialScalar(const String & name) const
+std::optional<Block> Context::tryGetSpecialScalar(const String & name) const
 {
+    std::lock_guard lock(mutex);
     auto it = special_scalars.find(name);
     if (special_scalars.end() == it)
-        return nullptr;
-    return &it->second;
+        return std::nullopt;
+    return it->second;
 }
 
 Tables Context::getExternalTables() const
@@ -1515,7 +1614,7 @@ void Context::addExternalTable(const String & table_name, TemporaryTableHolder &
 
     std::lock_guard lock(mutex);
     if (external_tables_mapping.end() != external_tables_mapping.find(table_name))
-        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Temporary table {} already exists.", backQuoteIfNeed(table_name));
+        throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS, "Temporary table {} already exists", backQuoteIfNeed(table_name));
     external_tables_mapping.emplace(table_name, std::make_shared<TemporaryTableHolder>(std::move(temporary_table)));
 }
 
@@ -1558,6 +1657,7 @@ void Context::addScalar(const String & name, const Block & block)
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have scalars");
 
+    std::lock_guard lock(mutex);
     scalars[name] = block;
 }
 
@@ -1567,6 +1667,7 @@ void Context::addSpecialScalar(const String & name, const Block & block)
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have local scalars");
 
+    std::lock_guard lock(mutex);
     special_scalars[name] = block;
 }
 
@@ -1576,6 +1677,7 @@ bool Context::hasScalar(const String & name) const
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have scalars");
 
+    std::lock_guard lock(mutex);
     return scalars.contains(name);
 }
 
@@ -1588,12 +1690,12 @@ void Context::addQueryAccessInfo(
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have query access info");
 
-    std::lock_guard lock(query_access_info.mutex);
-    query_access_info.databases.emplace(quoted_database_name);
-    query_access_info.tables.emplace(full_quoted_table_name);
+    std::lock_guard lock(query_access_info->mutex);
+    query_access_info->databases.emplace(quoted_database_name);
+    query_access_info->tables.emplace(full_quoted_table_name);
 
     for (const auto & column_name : column_names)
-        query_access_info.columns.emplace(full_quoted_table_name + "." + backQuoteIfNeed(column_name));
+        query_access_info->columns.emplace(full_quoted_table_name + "." + backQuoteIfNeed(column_name));
 }
 
 void Context::addQueryAccessInfo(const Names & partition_names)
@@ -1601,9 +1703,9 @@ 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);
+    std::lock_guard<std::mutex> lock(query_access_info->mutex);
     for (const auto & partition_name : partition_names)
-        query_access_info.partitions.emplace(partition_name);
+        query_access_info->partitions.emplace(partition_name);
 }
 
 void Context::addViewAccessInfo(const String & view_name)
@@ -1611,8 +1713,8 @@ void Context::addViewAccessInfo(const String & view_name)
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have query access info");
 
-    std::lock_guard<std::mutex> lock(query_access_info.mutex);
-    query_access_info.views.emplace(view_name);
+    std::lock_guard<std::mutex> lock(query_access_info->mutex);
+    query_access_info->views.emplace(view_name);
 }
 
 void Context::addQueryAccessInfo(const QualifiedProjectionName & qualified_projection_name)
@@ -1623,11 +1725,16 @@ void Context::addQueryAccessInfo(const QualifiedProjectionName & qualified_proje
     if (isGlobalContext())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Global context cannot have query access info");
 
-    std::lock_guard<std::mutex> lock(query_access_info.mutex);
-    query_access_info.projections.emplace(fmt::format(
+    std::lock_guard<std::mutex> lock(query_access_info->mutex);
+    query_access_info->projections.emplace(fmt::format(
         "{}.{}", qualified_projection_name.storage_id.getFullTableName(), backQuoteIfNeed(qualified_projection_name.projection_name)));
 }
 
+Context::QueryFactoriesInfo Context::getQueryFactoriesInfo() const
+{
+    return query_factories_info;
+}
+
 void Context::addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const
 {
     if (isGlobalContext())
@@ -1743,7 +1850,7 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const
         }
 
         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())
+        if (select_query_hint && use_structure_from_insertion_table_in_table_functions && table_function_ptr->needStructureHint() && hasInsertionTable())
         {
             const auto & insert_columns = DatabaseCatalog::instance()
                                               .getTable(getInsertionTable(), shared_from_this())
@@ -1908,6 +2015,35 @@ StoragePtr Context::executeTableFunction(const ASTPtr & table_expression, const
 }
 
 
+StoragePtr Context::buildParametrizedViewStorage(const ASTPtr & table_expression, const String & database_name, const String & table_name)
+{
+    if (table_name.empty())
+        return nullptr;
+
+    StoragePtr original_view = DatabaseCatalog::instance().tryGetTable({database_name, table_name}, getQueryContext());
+    if (!original_view || !original_view->isView())
+        return nullptr;
+    auto * storage_view = original_view->as<StorageView>();
+    if (!storage_view || !storage_view->isParameterizedView())
+        return nullptr;
+
+    auto query = original_view->getInMemoryMetadataPtr()->getSelectQuery().inner_query->clone();
+    NameToNameMap parameterized_view_values = analyzeFunctionParamValues(table_expression);
+    StorageView::replaceQueryParametersIfParametrizedView(query, parameterized_view_values);
+
+    ASTCreateQuery create;
+    create.select = query->as<ASTSelectWithUnionQuery>();
+    auto sample_block = InterpreterSelectQueryAnalyzer::getSampleBlock(query, shared_from_this());
+    auto res = std::make_shared<StorageView>(StorageID(database_name, table_name),
+                                                create,
+                                                ColumnsDescription(sample_block.getNamesAndTypesList()),
+            /* comment */ "",
+            /* is_parameterized_view */ true);
+    res->startup();
+    return res;
+}
+
+
 void Context::addViewSource(const StoragePtr & storage)
 {
     if (view_source)
@@ -1938,6 +2074,7 @@ void Context::setSettings(const Settings & settings_)
     std::lock_guard lock(mutex);
     settings = settings_;
     need_recalculate_access = true;
+    contextSanityCheck(*this, settings);
 }
 
 void Context::setSettingWithLock(std::string_view name, const String & value, const std::lock_guard<ContextSharedMutex> & lock)
@@ -1950,6 +2087,7 @@ void Context::setSettingWithLock(std::string_view name, const String & value, co
     settings.set(name, value);
     if (ContextAccessParams::dependsOnSettingName(name))
         need_recalculate_access = true;
+    contextSanityCheckWithLock(*this, settings, lock);
 }
 
 void Context::setSettingWithLock(std::string_view name, const Field & value, const std::lock_guard<ContextSharedMutex> & lock)
@@ -1969,6 +2107,7 @@ void Context::applySettingChangeWithLock(const SettingChange & change, const std
     try
     {
         setSettingWithLock(change.name, change.value, lock);
+        contextSanityCheckWithLock(*this, settings, lock);
     }
     catch (Exception & e)
     {
@@ -1996,6 +2135,7 @@ void Context::setSetting(std::string_view name, const Field & value)
 {
     std::lock_guard lock(mutex);
     setSettingWithLock(name, value, lock);
+    contextSanityCheckWithLock(*this, settings, lock);
 }
 
 void Context::applySettingChange(const SettingChange & change)
@@ -2023,26 +2163,36 @@ void Context::applySettingsChanges(const SettingsChanges & changes)
 void Context::checkSettingsConstraintsWithLock(const SettingsProfileElements & profile_elements, SettingSource source) const
 {
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, profile_elements, source);
+    if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
 }
 
 void Context::checkSettingsConstraintsWithLock(const SettingChange & change, SettingSource source) const
 {
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, change, source);
+    if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
 }
 
 void Context::checkSettingsConstraintsWithLock(const SettingsChanges & changes, SettingSource source) const
 {
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
+    if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
 }
 
 void Context::checkSettingsConstraintsWithLock(SettingsChanges & changes, SettingSource source) const
 {
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
+    if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
 }
 
 void Context::clampToSettingsConstraintsWithLock(SettingsChanges & changes, SettingSource source) const
 {
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.clamp(settings, changes, source);
+    if (getApplicationType() == ApplicationType::LOCAL || getApplicationType() == ApplicationType::SERVER)
+        doSettingsSanityCheck(settings);
 }
 
 void Context::checkMergeTreeSettingsConstraintsWithLock(const MergeTreeSettings & merge_tree_settings, const SettingsChanges & changes) const
@@ -2066,6 +2216,7 @@ void Context::checkSettingsConstraints(const SettingsChanges & changes, SettingS
 {
     SharedLockGuard lock(mutex);
     getSettingsConstraintsAndCurrentProfilesWithLock()->constraints.check(settings, changes, source);
+    doSettingsSanityCheck(settings);
 }
 
 void Context::checkSettingsConstraints(SettingsChanges & changes, SettingSource source) const
@@ -2241,7 +2392,8 @@ void Context::setMacros(std::unique_ptr<Macros> && macros)
 ContextMutablePtr Context::getQueryContext() const
 {
     auto ptr = query_context.lock();
-    if (!ptr) throw Exception(ErrorCodes::THERE_IS_NO_QUERY, "There is no query or query context has expired");
+    if (!ptr)
+        throw Exception(ErrorCodes::THERE_IS_NO_QUERY, "There is no query or query context has expired");
     return ptr;
 }
 
@@ -2345,7 +2497,8 @@ AsyncLoader & Context::getAsyncLoader() const
                 }
             },
             /* log_failures = */ true,
-            /* log_progress = */ true);
+            /* log_progress = */ true,
+            /* log_events = */ true);
     });
 
     return *shared->async_loader;
@@ -2533,19 +2686,22 @@ BackupsWorker & Context::getBackupsWorker() const
 {
     callOnce(shared->backups_worker_initialized, [&] {
         const auto & config = getConfigRef();
-        const bool allow_concurrent_backups = config.getBool("backups.allow_concurrent_backups", true);
-        const bool allow_concurrent_restores = config.getBool("backups.allow_concurrent_restores", true);
-
         const auto & settings_ref = getSettingsRef();
         UInt64 backup_threads = config.getUInt64("backup_threads", settings_ref.backup_threads);
         UInt64 restore_threads = config.getUInt64("restore_threads", settings_ref.restore_threads);
 
-        shared->backups_worker.emplace(getGlobalContext(), backup_threads, restore_threads, allow_concurrent_backups, allow_concurrent_restores);
+        shared->backups_worker.emplace(getGlobalContext(), backup_threads, restore_threads);
     });
 
     return *shared->backups_worker;
 }
 
+void Context::waitAllBackupsAndRestores() const
+{
+    if (shared->backups_worker)
+        shared->backups_worker->waitAll();
+}
+
 
 void Context::setProgressCallback(ProgressCallback callback)
 {
@@ -2619,6 +2775,33 @@ void Context::clearUncompressedCache() const
         shared->uncompressed_cache->clear();
 }
 
+void Context::setPageCache(size_t bytes_per_chunk, size_t bytes_per_mmap, size_t bytes_total, bool use_madv_free, bool use_huge_pages)
+{
+    std::lock_guard lock(shared->mutex);
+
+    if (shared->page_cache)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Page cache has been already created.");
+
+    shared->page_cache = std::make_shared<PageCache>(bytes_per_chunk, bytes_per_mmap, bytes_total, use_madv_free, use_huge_pages);
+}
+
+PageCachePtr Context::getPageCache() const
+{
+    SharedLockGuard lock(shared->mutex);
+    return shared->page_cache;
+}
+
+void Context::dropPageCache() const
+{
+    PageCachePtr cache;
+    {
+        SharedLockGuard lock(shared->mutex);
+        cache = shared->page_cache;
+    }
+    if (cache)
+        cache->dropCache();
+}
+
 void Context::setMarkCache(const String & cache_policy, size_t max_cache_size_in_bytes, double size_ratio)
 {
     std::lock_guard lock(shared->mutex);
@@ -2837,6 +3020,18 @@ void Context::clearCaches() const
     /// Intentionally not clearing the query cache which is transactionally inconsistent by design.
 }
 
+void Context::setAsynchronousMetrics(AsynchronousMetrics * asynchronous_metrics_)
+{
+    std::lock_guard lock(shared->mutex);
+    shared->asynchronous_metrics = asynchronous_metrics_;
+}
+
+AsynchronousMetrics * Context::getAsynchronousMetrics() const
+{
+    SharedLockGuard lock(shared->mutex);
+    return shared->asynchronous_metrics;
+}
+
 ThreadPool & Context::getPrefetchThreadpool() const
 {
     callOnce(shared->prefetch_threadpool_initialized, [&] {
@@ -3080,7 +3275,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, zkutil::getZooKeeperConfigName(config), getZooKeeperLog());
+        shared->zookeeper = zkutil::ZooKeeper::create(config, zkutil::getZooKeeperConfigName(config), getZooKeeperLog());
     else if (shared->zookeeper->hasReachedDeadline())
         shared->zookeeper->finalize("ZooKeeper session has reached its deadline");
 
@@ -3110,7 +3305,7 @@ bool checkZooKeeperConfigIsLocal(const Poco::Util::AbstractConfiguration & confi
         if (startsWith(key, "node"))
         {
             String host = config.getString(config_name + "." + key + ".host");
-            if (isLocalAddress(DNSResolver::instance().resolveHost(host)))
+            if (isLocalAddress(DNSResolver::instance().resolveHostAllInOriginOrder(host).front()))
                 return true;
         }
     }
@@ -3232,7 +3427,7 @@ void Context::initializeKeeperDispatcher([[maybe_unused]] bool start_async) cons
 }
 
 #if USE_NURAFT
-std::shared_ptr<KeeperDispatcher> & Context::getKeeperDispatcher() const
+std::shared_ptr<KeeperDispatcher> Context::getKeeperDispatcher() const
 {
     std::lock_guard lock(shared->keeper_dispatcher_mutex);
     if (!shared->keeper_dispatcher)
@@ -3241,7 +3436,7 @@ std::shared_ptr<KeeperDispatcher> & Context::getKeeperDispatcher() const
     return shared->keeper_dispatcher;
 }
 
-std::shared_ptr<KeeperDispatcher> & Context::tryGetKeeperDispatcher() const
+std::shared_ptr<KeeperDispatcher> Context::tryGetKeeperDispatcher() const
 {
     std::lock_guard lock(shared->keeper_dispatcher_mutex);
     return shared->keeper_dispatcher;
@@ -3292,7 +3487,7 @@ zkutil::ZooKeeperPtr Context::getAuxiliaryZooKeeper(const String & name) const
                 name);
 
         zookeeper = shared->auxiliary_zookeepers.emplace(name,
-                        std::make_shared<zkutil::ZooKeeper>(config, "auxiliary_zookeepers." + name, getZooKeeperLog())).first;
+                        zkutil::ZooKeeper::create(config, "auxiliary_zookeepers." + name, getZooKeeperLog())).first;
     }
     else if (zookeeper->second->expired())
         zookeeper->second = zookeeper->second->startNewSession();
@@ -3325,7 +3520,7 @@ static void reloadZooKeeperIfChangedImpl(
         if (zk)
             zk->finalize("Config changed");
 
-        zk = std::make_shared<zkutil::ZooKeeper>(*config, config_name, std::move(zk_log));
+        zk = zkutil::ZooKeeper::create(*config, config_name, std::move(zk_log));
         if (server_started)
             zk->setServerCompletelyStarted();
     }
@@ -3369,6 +3564,16 @@ bool Context::hasAuxiliaryZooKeeper(const String & name) const
     return getConfigRef().has("auxiliary_zookeepers." + name);
 }
 
+void Context::reloadQueryMaskingRulesIfChanged(const ConfigurationPtr & config) const
+{
+    const auto old_config = shared->sensitive_data_masker_config;
+    if (old_config && isSameConfiguration(*config, *old_config, "query_masking_rules"))
+        return;
+
+    SensitiveDataMasker::setInstance(std::make_unique<SensitiveDataMasker>(*config, "query_masking_rules"));
+    shared->sensitive_data_masker_config = config;
+}
+
 InterserverCredentialsPtr Context::getInterserverCredentials() const
 {
     return shared->interserver_io_credentials.get();
@@ -3408,25 +3613,21 @@ String Context::getInterserverScheme() const
 
 void Context::setRemoteHostFilter(const Poco::Util::AbstractConfiguration & config)
 {
-    std::lock_guard lock(shared->mutex);
     shared->remote_host_filter.setValuesFromConfig(config);
 }
 
 const RemoteHostFilter & Context::getRemoteHostFilter() const
 {
-    SharedLockGuard lock(shared->mutex);
     return shared->remote_host_filter;
 }
 
 void Context::setHTTPHeaderFilter(const Poco::Util::AbstractConfiguration & config)
 {
-    std::lock_guard lock(shared->mutex);
     shared->http_header_filter.setValuesFromConfig(config);
 }
 
 const HTTPHeaderFilter & Context::getHTTPHeaderFilter() const
 {
-    SharedLockGuard lock(shared->mutex);
     return shared->http_header_filter;
 }
 
@@ -4040,6 +4241,21 @@ const MergeTreeSettings & Context::getReplicatedMergeTreeSettings() const
     return *shared->replicated_merge_tree_settings;
 }
 
+const DistributedSettings & Context::getDistributedSettings() const
+{
+    std::lock_guard lock(shared->mutex);
+
+    if (!shared->distributed_settings)
+    {
+        const auto & config = shared->getConfigRefWithLock(lock);
+        DistributedSettings distributed_settings;
+        distributed_settings.loadFromConfig("distributed", config);
+        shared->distributed_settings.emplace(distributed_settings);
+    }
+
+    return *shared->distributed_settings;
+}
+
 const StorageS3Settings & Context::getStorageS3Settings() const
 {
     std::lock_guard lock(shared->mutex);
@@ -4102,12 +4318,12 @@ void Context::setMaxTableSizeToDrop(size_t max_size)
 
 size_t Context::getMaxTableSizeToDrop() const
 {
-    return shared->max_table_size_to_drop.load(std::memory_order_relaxed);
+    return shared->max_table_size_to_drop.load();
 }
 
 void Context::checkTableCanBeDropped(const String & database, const String & table, const size_t & table_size) const
 {
-    size_t max_table_size_to_drop = shared->max_table_size_to_drop.load(std::memory_order_relaxed);
+    size_t max_table_size_to_drop = shared->max_table_size_to_drop.load();
 
     checkCanBeDropped(database, table, table_size, max_table_size_to_drop);
 }
@@ -4125,12 +4341,12 @@ void Context::setMaxPartitionSizeToDrop(size_t max_size)
 
 size_t Context::getMaxPartitionSizeToDrop() const
 {
-    return shared->max_partition_size_to_drop.load(std::memory_order_relaxed);
+    return shared->max_partition_size_to_drop.load();
 }
 
 void Context::checkPartitionCanBeDropped(const String & database, const String & table, const size_t & partition_size) const
 {
-    size_t max_partition_size_to_drop = shared->max_partition_size_to_drop.load(std::memory_order_relaxed);
+    size_t max_partition_size_to_drop = shared->max_partition_size_to_drop.load();
 
     checkCanBeDropped(database, table, partition_size, max_partition_size_to_drop);
 }
@@ -4140,7 +4356,7 @@ void Context::checkPartitionCanBeDropped(const String & database, const String &
     checkCanBeDropped(database, table, partition_size, max_partition_size_to_drop);
 }
 
-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
+InputFormatPtr Context::getInputFormat(const String & name, ReadBuffer & buf, const Block & sample, UInt64 max_block_size, const std::optional<FormatSettings> & format_settings, std::optional<size_t> max_parsing_threads) const
 {
     return FormatFactory::instance().getInput(name, buf, sample, shared_from_this(), max_block_size, format_settings, max_parsing_threads);
 }
@@ -4225,11 +4441,11 @@ void Context::setApplicationType(ApplicationType type)
     /// Lock isn't required, you should set it at start
     shared->application_type = type;
 
-    if (type == ApplicationType::SERVER)
-    {
+    if (type == ApplicationType::LOCAL || type == ApplicationType::SERVER)
         shared->server_settings.loadSettingsFromConfig(Poco::Util::Application::instance().config());
+
+    if (type == ApplicationType::SERVER)
         shared->configureServerWideThrottling();
-    }
 }
 
 void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & config)
@@ -4240,7 +4456,8 @@ void Context::setDefaultProfiles(const Poco::Util::AbstractConfiguration & confi
     shared->system_profile_name = config.getString("system_profile", shared->default_profile_name);
     setCurrentProfile(shared->system_profile_name);
 
-    applySettingsQuirks(settings, &Poco::Logger::get("SettingsQuirks"));
+    applySettingsQuirks(settings, getLogger("SettingsQuirks"));
+    doSettingsSanityCheck(settings);
 
     shared->buffer_profile_name = config.getString("buffer_profile", shared->system_profile_name);
     buffer_context = Context::createCopy(shared_from_this());
@@ -4431,11 +4648,9 @@ void Context::setClientConnectionId(uint32_t connection_id_)
     client_info.connection_id = connection_id_;
 }
 
-void Context::setHttpClientInfo(ClientInfo::HTTPMethod http_method, const String & http_user_agent, const String & http_referer)
+void Context::setHTTPClientInfo(const Poco::Net::HTTPRequest & request)
 {
-    client_info.http_method = http_method;
-    client_info.http_user_agent = http_user_agent;
-    client_info.http_referer = http_referer;
+    client_info.setFromHTTPRequest(request);
     need_recalculate_access = true;
 }
 
@@ -4803,17 +5018,20 @@ PartUUIDsPtr Context::getIgnoredPartUUIDs() const
     return ignored_part_uuids;
 }
 
-AsynchronousInsertQueue * Context::getAsynchronousInsertQueue() const
+AsynchronousInsertQueue * Context::tryGetAsynchronousInsertQueue() const
 {
+    SharedLockGuard lock(shared->mutex);
     return shared->async_insert_queue.get();
 }
 
 void Context::setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr)
 {
-    using namespace std::chrono;
+    AsynchronousInsertQueue::validateSettings(settings, getLogger("Context"));
 
-    if (std::chrono::milliseconds(settings.async_insert_busy_timeout_ms) == 0ms)
-        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting async_insert_busy_timeout_ms can't be zero");
+    SharedLockGuard lock(shared->mutex);
+
+    if (std::chrono::milliseconds(settings.async_insert_poll_timeout_ms) == std::chrono::milliseconds::zero())
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Setting async_insert_poll_timeout_ms can't be zero");
 
     shared->async_insert_queue = ptr;
 }
@@ -4857,11 +5075,6 @@ void Context::initializeBackgroundExecutorsIfNeeded()
     );
     LOG_INFO(shared->log, "Initialized background executor for move operations with num_threads={}, num_tasks={}", background_move_pool_size, background_move_pool_size);
 
-    auto timeouts = ConnectionTimeouts::getFetchPartHTTPTimeouts(getServerSettings(), getSettingsRef());
-    /// The number of background fetches is limited by the number of threads in the background thread pool.
-    /// It doesn't make any sense to limit the number of connections per host any further.
-    shared->fetches_session_factory = std::make_shared<PooledSessionFactory>(timeouts, background_fetches_pool_size);
-
     shared->fetch_executor = std::make_shared<OrdinaryBackgroundExecutor>
     (
         "Fetch",
@@ -4915,12 +5128,6 @@ OrdinaryBackgroundExecutorPtr Context::getCommonExecutor() const
     return shared->common_executor;
 }
 
-PooledSessionFactoryPtr Context::getCommonFetchesSessionFactory() const
-{
-    SharedLockGuard lock(shared->background_executors_mutex);
-    return shared->fetches_session_factory;
-}
-
 IAsynchronousReader & Context::getThreadPoolReader(FilesystemReaderType type) const
 {
     callOnce(shared->readers_initialized, [&] {
@@ -4997,10 +5204,16 @@ ReadSettings Context::getReadSettings() const
     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.filesystem_cache_segments_batch_size = settings.filesystem_cache_segments_batch_size;
+    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
 
     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;
 
+    res.page_cache = getPageCache();
+    res.use_page_cache_for_disks_without_file_cache = settings.use_page_cache_for_disks_without_file_cache;
+    res.read_from_page_cache_if_exists_otherwise_bypass_cache = settings.read_from_page_cache_if_exists_otherwise_bypass_cache;
+    res.page_cache_inject_eviction = settings.page_cache_inject_eviction;
+
     res.remote_read_min_bytes_for_seek = settings.remote_read_min_bytes_for_seek;
 
     /// Zero read buffer will not make progress.
@@ -5040,6 +5253,7 @@ WriteSettings Context::getWriteSettings() const
     res.enable_filesystem_cache_on_write_operations = settings.enable_filesystem_cache_on_write_operations;
     res.enable_filesystem_cache_log = settings.enable_filesystem_cache_log;
     res.throw_on_error_from_cache = settings.throw_on_error_from_cache_on_write_operations;
+    res.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds = settings.filesystem_cache_reserve_space_wait_lock_timeout_milliseconds;
 
     res.s3_allow_parallel_part_upload = settings.s3_allow_parallel_part_upload;
 
diff --git a/src/Interpreters/Context.h b/src/Interpreters/Context.h
index 3ef076f45f0..a0225cb2f9a 100644
--- a/src/Interpreters/Context.h
+++ b/src/Interpreters/Context.h
@@ -19,9 +19,8 @@
 #include <Disks/IO/getThreadPoolReader.h>
 #include <Interpreters/ClientInfo.h>
 #include <Interpreters/Context_fwd.h>
-#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/StorageID.h>
 #include <Interpreters/MergeTreeTransactionHolder.h>
-#include <IO/IResourceManager.h>
 #include <Parsers/IAST_fwd.h>
 #include <Server/HTTP/HTTPContext.h>
 #include <Storages/ColumnsDescription.h>
@@ -70,6 +69,7 @@ class IUserDefinedSQLObjectsStorage;
 class InterserverCredentials;
 using InterserverCredentialsPtr = std::shared_ptr<const InterserverCredentials>;
 class InterserverIOHandler;
+class AsynchronousMetrics;
 class BackgroundSchedulePool;
 class MergeList;
 class MovesList;
@@ -78,6 +78,7 @@ class RefreshSet;
 class Cluster;
 class Compiler;
 class MarkCache;
+class PageCache;
 class MMappedFileCache;
 class UncompressedCache;
 class ProcessList;
@@ -112,6 +113,7 @@ class BlobStorageLog;
 class IAsynchronousReader;
 class IOUringReader;
 struct MergeTreeSettings;
+struct DistributedSettings;
 struct InitialAllRangesAnnouncement;
 struct ParallelReadRequest;
 struct ParallelReadResponse;
@@ -126,7 +128,6 @@ using ActionLocksManagerPtr = std::shared_ptr<ActionLocksManager>;
 class ShellCommand;
 class ICompressionCodec;
 class AccessControl;
-class Credentials;
 class GSSAcceptorContext;
 struct SettingsConstraintsAndProfileIDs;
 class SettingsProfileElements;
@@ -147,6 +148,18 @@ template <class Queue>
 class MergeTreeBackgroundExecutor;
 class AsyncLoader;
 
+struct TemporaryTableHolder;
+using TemporaryTablesMapping = std::map<String, std::shared_ptr<TemporaryTableHolder>>;
+
+class LoadTask;
+using LoadTaskPtr = std::shared_ptr<LoadTask>;
+using LoadTaskPtrs = std::vector<LoadTaskPtr>;
+
+class IClassifier;
+using ClassifierPtr = std::shared_ptr<IClassifier>;
+class IResourceManager;
+using ResourceManagerPtr = std::shared_ptr<IResourceManager>;
+
 /// Scheduling policy can be changed using `background_merges_mutations_scheduling_policy` config option.
 /// By default concurrent merges are scheduled using "round_robin" to ensure fair and starvation-free operation.
 /// Previously in heavily overloaded shards big merges could possibly be starved by smaller
@@ -161,7 +174,6 @@ using OrdinaryBackgroundExecutorPtr = std::shared_ptr<OrdinaryBackgroundExecutor
 struct PartUUIDs;
 using PartUUIDsPtr = std::shared_ptr<PartUUIDs>;
 class KeeperDispatcher;
-class Session;
 struct WriteSettings;
 
 class IInputFormat;
@@ -203,9 +215,6 @@ using TemporaryDataOnDiskScopePtr = std::shared_ptr<TemporaryDataOnDiskScope>;
 class PreparedSetsCache;
 using PreparedSetsCachePtr = std::shared_ptr<PreparedSetsCache>;
 
-class PooledSessionFactory;
-using PooledSessionFactoryPtr = std::shared_ptr<PooledSessionFactory>;
-
 class SessionTracker;
 
 struct ServerSettings;
@@ -330,7 +339,7 @@ protected:
             return *this;
         }
 
-        void swap(QueryAccessInfo & rhs)
+        void swap(QueryAccessInfo & rhs) noexcept
         {
             std::swap(databases, rhs.databases);
             std::swap(tables, rhs.tables);
@@ -349,8 +358,11 @@ protected:
         std::set<std::string> projections{};
         std::set<std::string> views{};
     };
+    using QueryAccessInfoPtr = std::shared_ptr<QueryAccessInfo>;
 
-    QueryAccessInfo query_access_info;
+    /// In some situations, we want to be able to transfer the access info from children back to parents (e.g. definers context).
+    /// Therefore, query_access_info must be a pointer.
+    QueryAccessInfoPtr query_access_info;
 
     /// Record names of created objects of factories (for testing, etc)
     struct QueryFactoriesInfo
@@ -373,25 +385,6 @@ protected:
 
         QueryFactoriesInfo(QueryFactoriesInfo && rhs) = delete;
 
-        QueryFactoriesInfo & operator=(QueryFactoriesInfo rhs)
-        {
-            swap(rhs);
-            return *this;
-        }
-
-        void swap(QueryFactoriesInfo & rhs)
-        {
-            std::swap(aggregate_functions, rhs.aggregate_functions);
-            std::swap(aggregate_function_combinators, rhs.aggregate_function_combinators);
-            std::swap(database_engines, rhs.database_engines);
-            std::swap(data_type_families, rhs.data_type_families);
-            std::swap(dictionaries, rhs.dictionaries);
-            std::swap(formats, rhs.formats);
-            std::swap(functions, rhs.functions);
-            std::swap(storages, rhs.storages);
-            std::swap(table_functions, rhs.table_functions);
-        }
-
         std::unordered_set<std::string> aggregate_functions;
         std::unordered_set<std::string> aggregate_function_combinators;
         std::unordered_set<std::string> database_engines;
@@ -529,6 +522,7 @@ public:
     String getDictionariesLibPath() const;
     String getUserScriptsPath() const;
     String getFilesystemCachesPath() const;
+    String getFilesystemCacheUser() const;
 
     /// A list of warnings about server configuration to place in `system.warnings` table.
     Strings getWarnings() const;
@@ -540,6 +534,7 @@ public:
     void setTempDataOnDisk(TemporaryDataOnDiskScopePtr temp_data_on_disk_);
 
     void setFilesystemCachesPath(const String & path);
+    void setFilesystemCacheUser(const String & user);
 
     void setPath(const String & path);
     void setFlagsPath(const String & path);
@@ -548,6 +543,7 @@ public:
     void setUserScriptsPath(const String & path);
 
     void addWarningMessage(const String & msg) const;
+    void addWarningMessageAboutDatabaseOrdinary(const String & database_name) const;
 
     void setTemporaryStorageInCache(const String & cache_disk_name, size_t max_size);
     void setTemporaryStoragePolicy(const String & policy_name, size_t max_size);
@@ -646,7 +642,7 @@ public:
     void setClientInterface(ClientInfo::Interface interface);
     void setClientVersion(UInt64 client_version_major, UInt64 client_version_minor, UInt64 client_version_patch, unsigned client_tcp_protocol_version);
     void setClientConnectionId(uint32_t connection_id);
-    void setHttpClientInfo(ClientInfo::HTTPMethod http_method, const String & http_user_agent, const String & http_referer);
+    void setHTTPClientInfo(const Poco::Net::HTTPRequest & request);
     void setForwardedFor(const String & forwarded_for);
     void setQueryKind(ClientInfo::QueryKind query_kind);
     void setQueryKindInitial();
@@ -684,15 +680,17 @@ public:
     std::shared_ptr<TemporaryTableHolder> findExternalTable(const String & table_name) const;
     std::shared_ptr<TemporaryTableHolder> removeExternalTable(const String & table_name);
 
-    const Scalars & getScalars() const;
-    const Block & getScalar(const String & name) const;
+    Scalars getScalars() const;
+    Block getScalar(const String & name) const;
     void addScalar(const String & name, const Block & block);
     bool hasScalar(const String & name) const;
 
-    const Block * tryGetSpecialScalar(const String & name) const;
+    std::optional<Block> tryGetSpecialScalar(const String & name) const;
     void addSpecialScalar(const String & name, const Block & block);
 
-    const QueryAccessInfo & getQueryAccessInfo() const { return query_access_info; }
+    const QueryAccessInfo & getQueryAccessInfo() const { return *getQueryAccessInfoPtr(); }
+    QueryAccessInfoPtr getQueryAccessInfoPtr() const { return query_access_info; }
+    void setQueryAccessInfo(QueryAccessInfoPtr other) { query_access_info = other; }
 
     void addQueryAccessInfo(
         const String & quoted_database_name,
@@ -725,7 +723,7 @@ public:
         TableFunction
     };
 
-    const QueryFactoriesInfo & getQueryFactoriesInfo() const { return query_factories_info; }
+    QueryFactoriesInfo getQueryFactoriesInfo() const;
     void addQueryFactoriesInfo(QueryLogFactories factory_type, const String & created_object) const;
 
     /// For table functions s3/file/url/hdfs/input we can use structure from
@@ -734,6 +732,8 @@ public:
     /// Overload for the new analyzer. Structure inference is performed in QueryAnalysisPass.
     StoragePtr executeTableFunction(const ASTPtr & table_expression, const TableFunctionPtr & table_function_ptr);
 
+    StoragePtr buildParametrizedViewStorage(const ASTPtr & table_expression, const String & database_name, const String & table_name);
+
     void addViewSource(const StoragePtr & storage);
     StoragePtr getViewSource() const;
 
@@ -817,10 +817,11 @@ public:
 #endif
 
     BackupsWorker & getBackupsWorker() const;
+    void waitAllBackupsAndRestores() 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 std::optional<size_t> max_parsing_threads = std::nullopt) const;
+                                  const std::optional<FormatSettings> & format_settings = std::nullopt, 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;
@@ -946,8 +947,8 @@ public:
     void setClientProtocolVersion(UInt64 version);
 
 #if USE_NURAFT
-    std::shared_ptr<KeeperDispatcher> & getKeeperDispatcher() const;
-    std::shared_ptr<KeeperDispatcher> & tryGetKeeperDispatcher() const;
+    std::shared_ptr<KeeperDispatcher> getKeeperDispatcher() const;
+    std::shared_ptr<KeeperDispatcher> tryGetKeeperDispatcher() const;
 #endif
     void initializeKeeperDispatcher(bool start_async) const;
     void shutdownKeeperDispatcher() const;
@@ -964,6 +965,8 @@ public:
     // Reload Zookeeper
     void reloadZooKeeperIfChanged(const ConfigurationPtr & config) const;
 
+    void reloadQueryMaskingRulesIfChanged(const ConfigurationPtr & config) const;
+
     void setSystemZooKeeperLogAfterInitializationIfNeeded();
 
     /// --- Caches ------------------------------------------------------------------------------------------
@@ -973,6 +976,10 @@ public:
     std::shared_ptr<UncompressedCache> getUncompressedCache() const;
     void clearUncompressedCache() const;
 
+    void setPageCache(size_t bytes_per_chunk, size_t bytes_per_mmap, size_t bytes_total, bool use_madv_free, bool use_huge_pages);
+    std::shared_ptr<PageCache> getPageCache() const;
+    void dropPageCache() const;
+
     void setMarkCache(const String & cache_policy, size_t max_cache_size_in_bytes, double size_ratio);
     void updateMarkCacheConfiguration(const Poco::Util::AbstractConfiguration & config);
     std::shared_ptr<MarkCache> getMarkCache() const;
@@ -1009,6 +1016,9 @@ public:
 
     /// -----------------------------------------------------------------------------------------------------
 
+    void setAsynchronousMetrics(AsynchronousMetrics * asynchronous_metrics_);
+    AsynchronousMetrics * getAsynchronousMetrics() const;
+
     ThreadPool & getPrefetchThreadpool() const;
 
     /// Note: prefetchThreadpool is different from threadpoolReader
@@ -1083,6 +1093,7 @@ public:
 
     const MergeTreeSettings & getMergeTreeSettings() const;
     const MergeTreeSettings & getReplicatedMergeTreeSettings() const;
+    const DistributedSettings & getDistributedSettings() const;
     const StorageS3Settings & getStorageS3Settings() const;
 
     /// Prevents DROP TABLE if its size is greater than max_size (50GB by default, max_size=0 turn off this check)
@@ -1198,7 +1209,7 @@ public:
     PartUUIDsPtr getPartUUIDs() const;
     PartUUIDsPtr getIgnoredPartUUIDs() const;
 
-    AsynchronousInsertQueue * getAsynchronousInsertQueue() const;
+    AsynchronousInsertQueue * tryGetAsynchronousInsertQueue() const;
     void setAsynchronousInsertQueue(const std::shared_ptr<AsynchronousInsertQueue> & ptr);
 
     ReadTaskCallback getReadTaskCallback() const;
@@ -1221,7 +1232,6 @@ public:
     OrdinaryBackgroundExecutorPtr getMovesExecutor() const;
     OrdinaryBackgroundExecutorPtr getFetchesExecutor() const;
     OrdinaryBackgroundExecutorPtr getCommonExecutor() const;
-    PooledSessionFactoryPtr getCommonFetchesSessionFactory() const;
 
     IAsynchronousReader & getThreadPoolReader(FilesystemReaderType type) const;
 #if USE_LIBURING
diff --git a/src/Interpreters/CrashLog.cpp b/src/Interpreters/CrashLog.cpp
index 4fb81e4bcf7..4a8ef84fd5c 100644
--- a/src/Interpreters/CrashLog.cpp
+++ b/src/Interpreters/CrashLog.cpp
@@ -1,14 +1,15 @@
-#include <base/getFQDNOrHostName.h>
-#include <Interpreters/CrashLog.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/DataTypeDateTime.h>
+#include <Interpreters/CrashLog.h>
+#include <base/getFQDNOrHostName.h>
 #include <Common/ClickHouseRevision.h>
-#include <Common/SymbolIndex.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/Stopwatch.h>
+#include <Common/SymbolIndex.h>
 
 #include <Common/config_version.h>
 
@@ -23,18 +24,18 @@ ColumnsDescription CrashLogElement::getColumnsDescription()
 {
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"timestamp_ns", std::make_shared<DataTypeUInt64>()},
-        {"signal", std::make_shared<DataTypeInt32>()},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"trace_full", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"version", std::make_shared<DataTypeString>()},
-        {"revision", std::make_shared<DataTypeUInt32>()},
-        {"build_id", std::make_shared<DataTypeString>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "The hostname where the crash occurred."},
+        {"event_date", std::make_shared<DataTypeDate>(), "The date of the crash."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "The time of the crash."},
+        {"timestamp_ns", std::make_shared<DataTypeUInt64>(), "Timestamp of the event with nanoseconds."},
+        {"signal", std::make_shared<DataTypeInt32>(), "Signal number."},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "Thread ID."},
+        {"query_id", std::make_shared<DataTypeString>(), "Query ID."},
+        {"trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Stack trace at the moment of crash. Each element is a virtual memory address inside ClickHouse server process."},
+        {"trace_full", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Stack trace at the moment of crash. Each element contains a called method inside ClickHouse server process."},
+        {"version", std::make_shared<DataTypeString>(), "ClickHouse server version."},
+        {"revision", std::make_shared<DataTypeUInt32>(), "ClickHouse server revision."},
+        {"build_id", std::make_shared<DataTypeString>(), "BuildID that is generated by compiler."},
     };
 }
 
diff --git a/src/Interpreters/CrossToInnerJoinVisitor.cpp b/src/Interpreters/CrossToInnerJoinVisitor.cpp
index 005450c2a2c..e3e8b80e437 100644
--- a/src/Interpreters/CrossToInnerJoinVisitor.cpp
+++ b/src/Interpreters/CrossToInnerJoinVisitor.cpp
@@ -173,7 +173,7 @@ std::vector<JoinedElement> getTables(const ASTSelectQuery & select)
     {
         const auto * table_element = child->as<ASTTablesInSelectQueryElement>();
         if (!table_element)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: TablesInSelectQueryElement expected");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "TablesInSelectQueryElement expected");
 
         JoinedElement & t = joined_tables.emplace_back(*table_element);
         t.rewriteCommaToCross();
@@ -224,7 +224,7 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
     {
         if (joined_tables.size() != data.tables_with_columns.size())
             throw Exception(ErrorCodes::LOGICAL_ERROR,
-                            "Logical error: inconsistent number of tables: {} != {}",
+                            "Inconsistent number of tables: {} != {}",
                             joined_tables.size(), data.tables_with_columns.size());
 
         for (size_t i = 0; i < joined_tables.size(); ++i)
@@ -249,7 +249,7 @@ void CrossToInnerJoinMatcher::visit(ASTSelectQuery & select, ASTPtr &, Data & da
                 ASTPtr on_expr = makeOnExpression(expr_it->second);
                 if (rewritten = joined.rewriteCrossToInner(on_expr); rewritten)
                 {
-                    LOG_DEBUG(&Poco::Logger::get("CrossToInnerJoin"), "Rewritten '{}' to '{}'", query_before, queryToString(*joined.tableJoin()));
+                    LOG_DEBUG(getLogger("CrossToInnerJoin"), "Rewritten '{}' to '{}'", query_before, queryToString(*joined.tableJoin()));
                 }
             }
 
diff --git a/src/Interpreters/DDLTask.cpp b/src/Interpreters/DDLTask.cpp
index d418be51cc5..37954850851 100644
--- a/src/Interpreters/DDLTask.cpp
+++ b/src/Interpreters/DDLTask.cpp
@@ -2,6 +2,8 @@
 #include <base/sort.h>
 #include <Common/DNSResolver.h>
 #include <Common/isLocalAddress.h>
+#include <Databases/DatabaseReplicated.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <IO/WriteHelpers.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
@@ -14,7 +16,7 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTQueryWithTableAndOutput.h>
-#include <Databases/DatabaseReplicated.h>
+#include <Parsers/ASTDropQuery.h>
 
 
 namespace DB
@@ -44,6 +46,11 @@ bool HostID::isLocalAddress(UInt16 clickhouse_port) const
     {
         return DB::isLocalAddress(DNSResolver::instance().resolveAddress(host_name, port), clickhouse_port);
     }
+    catch (const DB::NetException &)
+    {
+        /// Avoid "Host not found" exceptions
+        return false;
+    }
     catch (const Poco::Net::NetException &)
     {
         /// Avoid "Host not found" exceptions
@@ -148,9 +155,9 @@ void DDLLogEntry::parse(const String & data)
             String settings_str;
             rb >> "settings: " >> settings_str >> "\n";
             ParserSetQuery parser{true};
-            constexpr UInt64 max_size = 4096;
             constexpr UInt64 max_depth = 16;
-            ASTPtr settings_ast = parseQuery(parser, settings_str, max_size, max_depth);
+            constexpr UInt64 max_backtracks = DBMS_DEFAULT_MAX_PARSER_BACKTRACKS;
+            ASTPtr settings_ast = parseQuery(parser, settings_str, Context::getGlobalContextInstance()->getSettingsRef().max_query_size, max_depth, max_backtracks);
             settings.emplace(std::move(settings_ast->as<ASTSetQuery>()->changes));
         }
     }
@@ -193,7 +200,15 @@ void DDLTaskBase::parseQueryFromEntry(ContextPtr context)
 
     ParserQuery parser_query(end, settings.allow_settings_after_format_in_insert);
     String description;
-    query = parseQuery(parser_query, begin, end, description, 0, settings.max_parser_depth);
+    query = parseQuery(parser_query, begin, end, description, 0, settings.max_parser_depth, settings.max_parser_backtracks);
+    if (auto * query_drop = query->as<ASTDropQuery>())
+    {
+        ASTs drops = query_drop->getRewrittenASTsOfSingleTable();
+        if (drops.size() > 1)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Not supports drop multiple tables for ddl task.");
+
+        query = drops[0];
+    }
 }
 
 void DDLTaskBase::formatRewrittenQuery(ContextPtr context)
@@ -215,7 +230,7 @@ ContextMutablePtr DDLTaskBase::makeQueryContext(ContextPtr from_context, const Z
 }
 
 
-bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log, const ZooKeeperPtr & zookeeper, const std::optional<std::string> & config_host_name)
+bool DDLTask::findCurrentHostID(ContextPtr global_context, LoggerPtr log, const ZooKeeperPtr & zookeeper, const std::optional<std::string> & config_host_name)
 {
     bool host_in_hostlist = false;
     std::exception_ptr first_exception = nullptr;
@@ -312,7 +327,7 @@ bool DDLTask::findCurrentHostID(ContextPtr global_context, Poco::Logger * log, c
     return host_in_hostlist;
 }
 
-void DDLTask::setClusterInfo(ContextPtr context, Poco::Logger * log)
+void DDLTask::setClusterInfo(ContextPtr context, LoggerPtr log)
 {
     auto * query_on_cluster = dynamic_cast<ASTQueryWithOnCluster *>(query.get());
     if (!query_on_cluster)
@@ -556,7 +571,7 @@ void ZooKeeperMetadataTransaction::commit()
     if (state != CREATED)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect state ({}), it's a bug", state);
     state = FAILED;
-    current_zookeeper->multi(ops);
+    current_zookeeper->multi(ops, /* check_session_valid */ true);
     state = COMMITTED;
 }
 
diff --git a/src/Interpreters/DDLTask.h b/src/Interpreters/DDLTask.h
index bc45b46bf0f..5a8a5bfb184 100644
--- a/src/Interpreters/DDLTask.h
+++ b/src/Interpreters/DDLTask.h
@@ -146,9 +146,9 @@ struct DDLTask : public DDLTaskBase
 {
     DDLTask(const String & name, const String & path) : DDLTaskBase(name, path) {}
 
-    bool findCurrentHostID(ContextPtr global_context, Poco::Logger * log, const ZooKeeperPtr & zookeeper, const std::optional<std::string> & config_host_name);
+    bool findCurrentHostID(ContextPtr global_context, LoggerPtr log, const ZooKeeperPtr & zookeeper, const std::optional<std::string> & config_host_name);
 
-    void setClusterInfo(ContextPtr context, Poco::Logger * log);
+    void setClusterInfo(ContextPtr context, LoggerPtr log);
 
     String getShardID() const override;
 
diff --git a/src/Interpreters/DDLWorker.cpp b/src/Interpreters/DDLWorker.cpp
index c0611dfaf7d..fd807d54eff 100644
--- a/src/Interpreters/DDLWorker.cpp
+++ b/src/Interpreters/DDLWorker.cpp
@@ -79,7 +79,7 @@ DDLWorker::DDLWorker(
     const CurrentMetrics::Metric * max_entry_metric_,
     const CurrentMetrics::Metric * max_pushed_entry_metric_)
     : context(Context::createCopy(context_))
-    , log(&Poco::Logger::get(logger_name))
+    , log(getLogger(logger_name))
     , pool_size(pool_size_)
     , max_entry_metric(max_entry_metric_)
     , max_pushed_entry_metric(max_pushed_entry_metric_)
diff --git a/src/Interpreters/DDLWorker.h b/src/Interpreters/DDLWorker.h
index adc9a491d81..9eb6606e73c 100644
--- a/src/Interpreters/DDLWorker.h
+++ b/src/Interpreters/DDLWorker.h
@@ -151,7 +151,7 @@ protected:
     void runCleanupThread();
 
     ContextMutablePtr context;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::optional<std::string> config_host_name; /// host_name from config
 
diff --git a/src/Interpreters/DNSCacheUpdater.cpp b/src/Interpreters/DNSCacheUpdater.cpp
index c6a38d85acb..4769395acaa 100644
--- a/src/Interpreters/DNSCacheUpdater.cpp
+++ b/src/Interpreters/DNSCacheUpdater.cpp
@@ -24,7 +24,7 @@ void DNSCacheUpdater::run()
     /// Reload cluster config if IP of any host has been changed since last update.
     if (resolver.updateCache(max_consecutive_failures))
     {
-        LOG_INFO(&Poco::Logger::get("DNSCacheUpdater"), "IPs of some hosts have been changed. Will reload cluster config.");
+        LOG_INFO(getLogger("DNSCacheUpdater"), "IPs of some hosts have been changed. Will reload cluster config.");
         try
         {
             getContext()->reloadClusterConfig();
@@ -45,7 +45,7 @@ void DNSCacheUpdater::run()
 
 void DNSCacheUpdater::start()
 {
-    LOG_INFO(&Poco::Logger::get("DNSCacheUpdater"), "Update period {} seconds", update_period_seconds);
+    LOG_INFO(getLogger("DNSCacheUpdater"), "Update period {} seconds", update_period_seconds);
     task_handle->activateAndSchedule();
 }
 
diff --git a/src/Interpreters/DatabaseAndTableWithAlias.cpp b/src/Interpreters/DatabaseAndTableWithAlias.cpp
index cb993611ecb..329391b45d7 100644
--- a/src/Interpreters/DatabaseAndTableWithAlias.cpp
+++ b/src/Interpreters/DatabaseAndTableWithAlias.cpp
@@ -38,7 +38,7 @@ DatabaseAndTableWithAlias::DatabaseAndTableWithAlias(const ASTIdentifier & ident
     else if (identifier.name_parts.size() == 1)
         table = identifier.name_parts[0];
     else
-        throw Exception(ErrorCodes::INVALID_IDENTIFIER, "Invalid identifier");
+        throw Exception(ErrorCodes::INVALID_IDENTIFIER, "Invalid identifier {}", backQuote(identifier.name()));
 
     if (database.empty())
         database = current_database;
@@ -71,7 +71,7 @@ DatabaseAndTableWithAlias::DatabaseAndTableWithAlias(const ASTTableExpression &
         alias = table_expression.subquery->tryGetAlias();
     }
     else
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no known elements in ASTTableExpression");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No known elements in ASTTableExpression");
 }
 
 bool DatabaseAndTableWithAlias::satisfies(const DatabaseAndTableWithAlias & db_table, bool table_may_be_an_alias) const
diff --git a/src/Interpreters/DatabaseCatalog.cpp b/src/Interpreters/DatabaseCatalog.cpp
index fc1975e8c86..0caca88c283 100644
--- a/src/Interpreters/DatabaseCatalog.cpp
+++ b/src/Interpreters/DatabaseCatalog.cpp
@@ -2,6 +2,7 @@
 #include <mutex>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/TableNameHints.h>
 #include <Interpreters/loadMetadata.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/InterpreterCreateQuery.h>
@@ -26,7 +27,8 @@
 #include <Common/noexcept_scope.h>
 #include <Common/checkStackSize.h>
 
-#include "Interpreters/Context_fwd.h"
+#include <boost/range/adaptor/map.hpp>
+
 #include "config.h"
 
 #if USE_MYSQL
@@ -198,14 +200,14 @@ void DatabaseCatalog::createBackgroundTasks()
     if (Context::getGlobalContextInstance()->getApplicationType() == Context::ApplicationType::SERVER && unused_dir_cleanup_period_sec)
     {
         auto cleanup_task_holder
-            = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this]() { this->cleanupStoreDirectoryTask(); });
+            = getContext()->getSchedulePool().createTask("DatabaseCatalogCleanupStoreDirectoryTask", [this]() { this->cleanupStoreDirectoryTask(); });
         cleanup_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(cleanup_task_holder));
     }
 
-    auto drop_task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->dropTableDataTask(); });
+    auto drop_task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalogDropTableTask", [this](){ this->dropTableDataTask(); });
     drop_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(drop_task_holder));
 
-    auto reload_disks_task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalog", [this](){ this->reloadDisksTask(); });
+    auto reload_disks_task_holder = getContext()->getSchedulePool().createTask("DatabaseCatalogReloadDisksTask", [this](){ this->reloadDisksTask(); });
     reload_disks_task = std::make_unique<BackgroundSchedulePoolTaskHolder>(std::move(reload_disks_task_holder));
 }
 
@@ -827,7 +829,7 @@ DatabaseCatalog::DatabaseCatalog(ContextMutablePtr global_context_)
     , referential_dependencies{"ReferentialDeps"}
     , loading_dependencies{"LoadingDeps"}
     , view_dependencies{"ViewDeps"}
-    , log(&Poco::Logger::get("DatabaseCatalog"))
+    , log(getLogger("DatabaseCatalog"))
     , first_async_drop_in_queue(tables_marked_dropped.end())
 {
 }
@@ -1094,7 +1096,7 @@ void DatabaseCatalog::enqueueDroppedTableCleanup(StorageID table_id, StoragePtr
             create->setTable(table_id.table_name);
             try
             {
-                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), /* force_restore */ true).second;
+                table = createTableFromAST(*create, table_id.getDatabaseName(), data_path, getContext(), LoadingStrictnessLevel::FORCE_RESTORE).second;
                 table->is_dropped = true;
             }
             catch (...)
@@ -1143,7 +1145,7 @@ void DatabaseCatalog::dequeueDroppedTableCleanup(StorageID table_id)
     TableMarkedAsDropped dropped_table;
     {
         std::lock_guard lock(tables_marked_dropped_mutex);
-        time_t latest_drop_time = std::numeric_limits<time_t>::min();
+        auto 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)
         {
@@ -1168,7 +1170,7 @@ void DatabaseCatalog::dequeueDroppedTableCleanup(StorageID table_id)
         }
         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 {} is being dropped, has been dropped, or the database engine does not support UNDROP",
                 table_id.getNameForLogs());
         latest_metadata_dropped_path = it_dropped_table->metadata_path;
         String table_metadata_path = getPathForMetadata(it_dropped_table->table_id);
@@ -1602,6 +1604,9 @@ void DatabaseCatalog::reloadDisksTask()
 
     for (auto & database : getDatabases())
     {
+        // WARNING: In case of `async_load_databases = true` getTablesIterator() call wait for all table in the database to be loaded.
+        // WARNING: It means that no database will be able to update configuration until all databases are fully loaded.
+        // TODO: We can split this task by table or by database to make loaded table operate as usual.
         auto it = database.second->getTablesIterator(getContext());
         while (it->isValid())
         {
@@ -1706,4 +1711,42 @@ DDLGuard::~DDLGuard()
     releaseTableLock();
 }
 
+std::pair<String, String> TableNameHints::getHintForTable(const String & table_name) const
+{
+    auto results = this->getHints(table_name, getAllRegisteredNames());
+    if (results.empty())
+        return getExtendedHintForTable(table_name);
+    return std::make_pair(database->getDatabaseName(), results[0]);
+}
+
+std::pair<String, String> TableNameHints::getExtendedHintForTable(const String & table_name) const
+{
+    /// load all available databases from the DatabaseCatalog instance
+    auto & database_catalog = DatabaseCatalog::instance();
+    auto all_databases = database_catalog.getDatabases();
+
+    for (const auto & [db_name, db] : all_databases)
+    {
+        /// this case should be covered already by getHintForTable
+        if (db_name == database->getDatabaseName())
+            continue;
+
+        TableNameHints hints(db, context);
+        auto results = hints.getHints(table_name);
+
+        /// if the results are not empty, return the first instance of the table_name
+        /// and the corresponding database_name that was found.
+        if (!results.empty())
+            return std::make_pair(db_name, results[0]);
+    }
+    return {};
+}
+
+Names TableNameHints::getAllRegisteredNames() const
+{
+    if (database)
+        return database->getAllTableNames(context);
+    return {};
+}
+
 }
diff --git a/src/Interpreters/DatabaseCatalog.h b/src/Interpreters/DatabaseCatalog.h
index 19882b0b828..30b49cf1fed 100644
--- a/src/Interpreters/DatabaseCatalog.h
+++ b/src/Interpreters/DatabaseCatalog.h
@@ -1,15 +1,12 @@
 #pragma once
 
 #include <Core/UUID.h>
+#include <Databases/TablesDependencyGraph.h>
 #include <Interpreters/Context_fwd.h>
 #include <Interpreters/StorageID.h>
-#include <Databases/TablesDependencyGraph.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/IStorage_fwd.h>
-#include "Common/NamePrompter.h"
 #include <Common/SharedMutex.h>
-#include "Storages/IStorage.h"
-#include "Databases/IDatabase.h"
 
 #include <boost/noncopyable.hpp>
 #include <Poco/Logger.h>
@@ -23,9 +20,6 @@
 #include <set>
 #include <unordered_map>
 #include <unordered_set>
-#include <filesystem>
-
-namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -318,7 +312,7 @@ private:
     /// View dependencies between a source table and its view.
     TablesDependencyGraph view_dependencies TSA_GUARDED_BY(databases_mutex);
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic_bool is_shutting_down = false;
 
@@ -369,68 +363,6 @@ private:
     static constexpr time_t DBMS_DEFAULT_DISK_RELOAD_PERIOD_SEC = 5;
 };
 
-class TableNameHints : public IHints<>
-{
-public:
-    TableNameHints(ConstDatabasePtr database_, ContextPtr context_)
-        : context(context_),
-        database(database_)
-    {
-    }
-
-    /// getHintForTable tries to get a hint for the provided table_name in the provided
-    /// database. If the results are empty, it goes for extended hints for the table
-    /// with getExtendedHintForTable which looks for the table name in every database that's
-    /// available in the database catalog. It finally returns a single hint which is the database
-    /// name and table_name pair which is similar to the table_name provided. Perhaps something to
-    /// consider is should we return more than one pair of hint?
-    std::pair<String, String> getHintForTable(const String & table_name) const
-    {
-        auto results = this->getHints(table_name, getAllRegisteredNames());
-        if (results.empty())
-            return getExtendedHintForTable(table_name);
-        return std::make_pair(database->getDatabaseName(), results[0]);
-    }
-
-    /// getExtendedHintsForTable tries to get hint for the given table_name across all
-    /// the databases that are available in the database catalog.
-    std::pair<String, String> getExtendedHintForTable(const String & table_name) const
-    {
-        /// load all available databases from the DatabaseCatalog instance
-        auto & database_catalog = DatabaseCatalog::instance();
-        auto all_databases = database_catalog.getDatabases();
-
-        for (const auto & [db_name, db] : all_databases)
-        {
-            /// this case should be covered already by getHintForTable
-            if (db_name == database->getDatabaseName())
-                continue;
-
-            TableNameHints hints(db, context);
-            auto results = hints.getHints(table_name);
-
-            /// if the results are not empty, return the first instance of the table_name
-            /// and the corresponding database_name that was found.
-            if (!results.empty())
-                return std::make_pair(db_name, results[0]);
-        }
-        return {};
-    }
-
-    Names getAllRegisteredNames() const override
-    {
-        Names result;
-        if (database)
-            for (auto table_it = database->getTablesIterator(context); table_it->isValid(); table_it->next())
-                result.emplace_back(table_it->name());
-        return result;
-    }
-
-private:
-    ContextPtr context;
-    ConstDatabasePtr database;
-};
-
 
 /// This class is useful when creating a table or database.
 /// Usually we create IStorage/IDatabase object first and then add it to IDatabase/DatabaseCatalog.
@@ -444,7 +376,7 @@ class TemporaryLockForUUIDDirectory : private boost::noncopyable
     UUID uuid = UUIDHelpers::Nil;
 public:
     TemporaryLockForUUIDDirectory() = default;
-    TemporaryLockForUUIDDirectory(UUID uuid_);
+    explicit TemporaryLockForUUIDDirectory(UUID uuid_);
     ~TemporaryLockForUUIDDirectory();
 
     TemporaryLockForUUIDDirectory(TemporaryLockForUUIDDirectory && rhs) noexcept;
diff --git a/src/Interpreters/DirectJoin.cpp b/src/Interpreters/DirectJoin.cpp
index 431f216436d..3255b56b3be 100644
--- a/src/Interpreters/DirectJoin.cpp
+++ b/src/Interpreters/DirectJoin.cpp
@@ -67,7 +67,7 @@ DirectKeyValueJoin::DirectKeyValueJoin(std::shared_ptr<TableJoin> table_join_,
     : table_join(table_join_)
     , storage(storage_)
     , right_sample_block(right_sample_block_)
-    , log(&Poco::Logger::get("DirectKeyValueJoin"))
+    , log(getLogger("DirectKeyValueJoin"))
 {
     if (!table_join->oneDisjunct() ||
         table_join->getOnlyClause().key_names_left.size() != 1 ||
diff --git a/src/Interpreters/DirectJoin.h b/src/Interpreters/DirectJoin.h
index 5f664314818..019e32c3130 100644
--- a/src/Interpreters/DirectJoin.h
+++ b/src/Interpreters/DirectJoin.h
@@ -31,28 +31,24 @@ public:
         const Block & right_sample_block_with_storage_column_names_);
 
     std::string getName() const override { return "DirectKeyValueJoin"; }
-    virtual const TableJoin & getTableJoin() const override { return *table_join; }
+    const TableJoin & getTableJoin() const override { return *table_join; }
 
-    virtual bool addBlockToJoin(const Block &, bool) override;
-    virtual void checkTypesOfKeys(const Block &) const override;
+    bool addBlockToJoin(const Block &, bool) override;
+    void checkTypesOfKeys(const Block &) const override;
 
     /// Join the block with data from left hand of JOIN to the right hand data (that was previously built by calls to addBlockToJoin).
     /// Could be called from different threads in parallel.
-    virtual void joinBlock(Block & block, std::shared_ptr<ExtraBlock> &) override;
+    void joinBlock(Block & block, std::shared_ptr<ExtraBlock> &) override;
 
-    virtual size_t getTotalRowCount() const override { return 0; }
+    size_t getTotalRowCount() const override { return 0; }
 
-    virtual size_t getTotalByteCount() const override { return 0; }
+    size_t getTotalByteCount() const override { return 0; }
 
-    virtual bool alwaysReturnsEmptySet() const override { return false; }
+    bool alwaysReturnsEmptySet() const override { return false; }
 
-    virtual bool isFilled() const override { return true; }
+    bool isFilled() const override { return true; }
 
-    virtual IBlocksStreamPtr
-    getNonJoinedBlocks(const Block &, const Block &, UInt64) const override
-    {
-        return nullptr;
-    }
+    IBlocksStreamPtr getNonJoinedBlocks(const Block &, const Block &, UInt64) const override { return nullptr; }
 
 private:
     std::shared_ptr<TableJoin> table_join;
@@ -60,7 +56,7 @@ private:
     Block right_sample_block;
     Block right_sample_block_with_storage_column_names;
     Block sample_block_with_columns_to_add;
-    Poco::Logger * log;
+    LoggerPtr log;
 
 };
 
diff --git a/src/Interpreters/EmbeddedDictionaries.cpp b/src/Interpreters/EmbeddedDictionaries.cpp
index 6c0ccce66b5..1435d16cb07 100644
--- a/src/Interpreters/EmbeddedDictionaries.cpp
+++ b/src/Interpreters/EmbeddedDictionaries.cpp
@@ -125,7 +125,7 @@ EmbeddedDictionaries::EmbeddedDictionaries(
     ContextPtr context_,
     const bool throw_on_error)
     : WithContext(context_)
-    , log(&Poco::Logger::get("EmbeddedDictionaries"))
+    , log(getLogger("EmbeddedDictionaries"))
     , geo_dictionaries_loader(std::move(geo_dictionaries_loader_))
     , reload_period(getContext()->getConfigRef().getInt("builtin_dictionaries_reload_interval", 3600))
 {
diff --git a/src/Interpreters/EmbeddedDictionaries.h b/src/Interpreters/EmbeddedDictionaries.h
index e71098636fe..b537146e92d 100644
--- a/src/Interpreters/EmbeddedDictionaries.h
+++ b/src/Interpreters/EmbeddedDictionaries.h
@@ -24,7 +24,7 @@ class GeoDictionariesLoader;
 class EmbeddedDictionaries : WithContext
 {
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     MultiVersion<RegionsHierarchies> regions_hierarchies;
     MultiVersion<RegionsNames> regions_names;
diff --git a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
index 77a022e066b..a70ff3c6c53 100644
--- a/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
+++ b/src/Interpreters/ExecuteScalarSubqueriesVisitor.cpp
@@ -112,7 +112,7 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
     auto hash = subquery.getTreeHash(/*ignore_aliases=*/ true);
     const auto scalar_query_hash_str = toString(hash);
 
-    std::unique_ptr<InterpreterSelectWithUnionQuery> interpreter = nullptr;
+    std::unique_ptr<InterpreterSelectWithUnionQuery> interpreter;
     bool hit = false;
     bool is_local = false;
 
@@ -281,7 +281,7 @@ void ExecuteScalarSubqueriesMatcher::visit(const ASTSubquery & subquery, ASTPtr
         if (data.only_analyze)
         {
             ast->as<ASTFunction>()->alias.clear();
-            auto func = makeASTFunction("identity", std::move(ast));
+            auto func = makeASTFunction("__scalarSubqueryResult", std::move(ast));
             func->alias = subquery_alias;
             func->prefer_alias_to_column_name = prefer_alias_to_column_name;
             ast = std::move(func);
diff --git a/src/Interpreters/ExpressionActions.cpp b/src/Interpreters/ExpressionActions.cpp
index f1c577948eb..1d193b3499c 100644
--- a/src/Interpreters/ExpressionActions.cpp
+++ b/src/Interpreters/ExpressionActions.cpp
@@ -180,14 +180,17 @@ static void setLazyExecutionInfo(
                     indexes.insert(i);
             }
 
-            if (!short_circuit_nodes.at(parent).enable_lazy_execution_for_first_argument && node == parent->children[0])
+            for (auto idx : short_circuit_nodes.at(parent).arguments_with_disabled_lazy_execution)
             {
-                /// We shouldn't add 0 index in node info in this case.
-                indexes.erase(0);
-                /// Disable lazy execution for current node only if it's disabled for short-circuit node,
-                /// because we can have nested short-circuit nodes.
-                if (!lazy_execution_infos[parent].can_be_lazy_executed)
-                    lazy_execution_info.can_be_lazy_executed = false;
+                if (idx < parent->children.size() && node == parent->children[idx])
+                {
+                    /// We shouldn't add this index in node info in this case.
+                    indexes.erase(idx);
+                    /// Disable lazy execution for current node only if it's disabled for short-circuit node,
+                    /// because we can have nested short-circuit nodes.
+                    if (!lazy_execution_infos[parent].can_be_lazy_executed)
+                        lazy_execution_info.can_be_lazy_executed = false;
+                }
             }
 
             lazy_execution_info.short_circuit_ancestors_info[parent].insert(indexes.begin(), indexes.end());
@@ -563,7 +566,7 @@ namespace
     };
 }
 
-static void executeAction(const ExpressionActions::Action & action, ExecutionContext & execution_context, bool dry_run)
+static void executeAction(const ExpressionActions::Action & action, ExecutionContext & execution_context, bool dry_run, bool allow_duplicates_in_input)
 {
     auto & inputs = execution_context.inputs;
     auto & columns = execution_context.columns;
@@ -611,6 +614,13 @@ static void executeAction(const ExpressionActions::Action & action, ExecutionCon
                     ProfileEvents::increment(ProfileEvents::CompiledFunctionExecute);
 
                 res_column.column = action.node->function->execute(arguments, res_column.type, num_rows, dry_run);
+                if (res_column.column->getDataType() != res_column.type->getColumnType())
+                    throw Exception(
+                        ErrorCodes::LOGICAL_ERROR,
+                        "Unexpected return type from {}. Expected {}. Got {}",
+                        action.node->function->getName(),
+                        res_column.type->getColumnType(),
+                        res_column.column->getDataType());
             }
             break;
         }
@@ -687,14 +697,19 @@ static void executeAction(const ExpressionActions::Action & action, ExecutionCon
                                     action.node->result_name);
             }
             else
-                columns[action.result_position] = std::move(inputs[pos]);
+            {
+                if (allow_duplicates_in_input)
+                    columns[action.result_position] = inputs[pos];
+                else
+                    columns[action.result_position] = std::move(inputs[pos]);
+            }
 
             break;
         }
     }
 }
 
-void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run) const
+void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run, bool allow_duplicates_in_input) const
 {
     ExecutionContext execution_context
     {
@@ -715,7 +730,8 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
                 if (execution_context.inputs_pos[input_pos] < 0)
                 {
                     execution_context.inputs_pos[input_pos] = pos;
-                    break;
+                    if (!allow_duplicates_in_input)
+                        break;
                 }
             }
         }
@@ -727,12 +743,8 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
     {
         try
         {
-            executeAction(action, execution_context, dry_run);
+            executeAction(action, execution_context, dry_run, allow_duplicates_in_input);
             checkLimits(execution_context.columns);
-
-            //std::cerr << "Action: " << action.toString() << std::endl;
-            //for (const auto & col : execution_context.columns)
-            //    std::cerr << col.dumpStructure() << std::endl;
         }
         catch (Exception & e)
         {
@@ -745,6 +757,12 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
     {
         block.clear();
     }
+    else if (allow_duplicates_in_input)
+    {
+        /// This case is the same as when the input is projected
+        /// since we do not need any input columns.
+        block.clear();
+    }
     else
     {
         ::sort(execution_context.inputs_pos.rbegin(), execution_context.inputs_pos.rend());
@@ -767,11 +785,11 @@ void ExpressionActions::execute(Block & block, size_t & num_rows, bool dry_run)
     num_rows = execution_context.num_rows;
 }
 
-void ExpressionActions::execute(Block & block, bool dry_run) const
+void ExpressionActions::execute(Block & block, bool dry_run, bool allow_duplicates_in_input) const
 {
     size_t num_rows = block.rows();
 
-    execute(block, num_rows, dry_run);
+    execute(block, num_rows, dry_run, allow_duplicates_in_input);
 
     if (!block)
         block.insert({DataTypeUInt8().createColumnConst(num_rows, 0), std::make_shared<DataTypeUInt8>(), "_dummy"});
diff --git a/src/Interpreters/ExpressionActions.h b/src/Interpreters/ExpressionActions.h
index db6670c50b9..cb467004d29 100644
--- a/src/Interpreters/ExpressionActions.h
+++ b/src/Interpreters/ExpressionActions.h
@@ -98,9 +98,15 @@ public:
     const NamesAndTypesList & getRequiredColumnsWithTypes() const { return required_columns; }
 
     /// Execute the expression on the block. The block must contain all the columns returned by getRequiredColumns.
-    void execute(Block & block, size_t & num_rows, bool dry_run = false) const;
+    ///
+    /// @param allow_duplicates_in_input - actions are allowed to have
+    /// duplicated input (that will refer into the block). This is needed for
+    /// preliminary query filtering (filterBlockWithDAG()), because they just
+    /// pass available virtual columns, which cannot be moved in case they are
+    /// used multiple times.
+    void execute(Block & block, size_t & num_rows, bool dry_run = false, bool allow_duplicates_in_input = false) const;
     /// The same, but without `num_rows`. If result block is empty, adds `_dummy` column to keep block size.
-    void execute(Block & block, bool dry_run = false) const;
+    void execute(Block & block, bool dry_run = false, bool allow_duplicates_in_input = false) const;
 
     bool hasArrayJoin() const;
     void assertDeterministic() const;
diff --git a/src/Interpreters/ExpressionAnalyzer.cpp b/src/Interpreters/ExpressionAnalyzer.cpp
index 5c628436d60..fefbd67bfc1 100644
--- a/src/Interpreters/ExpressionAnalyzer.cpp
+++ b/src/Interpreters/ExpressionAnalyzer.cpp
@@ -120,7 +120,7 @@ bool allowEarlyConstantFolding(const ActionsDAG & actions, const Settings & sett
     return true;
 }
 
-Poco::Logger * getLogger() { return &Poco::Logger::get("ExpressionAnalyzer"); }
+LoggerPtr getLogger() { return ::getLogger("ExpressionAnalyzer"); }
 
 }
 
diff --git a/src/Interpreters/ExpressionJIT.cpp b/src/Interpreters/ExpressionJIT.cpp
index 0eacb598fbe..16275b23053 100644
--- a/src/Interpreters/ExpressionJIT.cpp
+++ b/src/Interpreters/ExpressionJIT.cpp
@@ -38,10 +38,9 @@ static CHJIT & getJITInstance()
     return jit;
 }
 
-static Poco::Logger * getLogger()
+static LoggerPtr getLogger()
 {
-    static Poco::Logger & logger = Poco::Logger::get("ExpressionJIT");
-    return &logger;
+    return ::getLogger("ExpressionJIT");
 }
 
 class CompiledFunctionHolder : public CompiledExpressionCacheEntry
diff --git a/src/Interpreters/ExternalDictionariesLoader.cpp b/src/Interpreters/ExternalDictionariesLoader.cpp
index 080878c7d86..f48ee61dab8 100644
--- a/src/Interpreters/ExternalDictionariesLoader.cpp
+++ b/src/Interpreters/ExternalDictionariesLoader.cpp
@@ -5,6 +5,7 @@
 #include <Dictionaries/DictionaryStructure.h>
 #include <Databases/IDatabase.h>
 #include <Storages/IStorage.h>
+#include <Common/Config/AbstractConfigurationComparison.h>
 
 #include "config.h"
 
@@ -22,15 +23,16 @@ namespace ErrorCodes
 
 /// Must not acquire Context lock in constructor to avoid possibility of deadlocks.
 ExternalDictionariesLoader::ExternalDictionariesLoader(ContextPtr global_context_)
-    : ExternalLoader("external dictionary", &Poco::Logger::get("ExternalDictionariesLoader"))
+    : ExternalLoader("external dictionary", getLogger("ExternalDictionariesLoader"))
     , WithContext(global_context_)
 {
     setConfigSettings({"dictionary", "name", "database", "uuid"});
     enableAsyncLoading(true);
-    enablePeriodicUpdates(true);
+    if (getContext()->getApplicationType() == Context::ApplicationType::SERVER)
+        enablePeriodicUpdates(true);
 }
 
-ExternalLoader::LoadablePtr ExternalDictionariesLoader::create(
+ExternalLoader::LoadableMutablePtr ExternalDictionariesLoader::createObject(
         const std::string & name, const Poco::Util::AbstractConfiguration & config,
         const std::string & key_in_config, const std::string & repository_name) const
 {
@@ -40,6 +42,38 @@ ExternalLoader::LoadablePtr ExternalDictionariesLoader::create(
     return DictionaryFactory::instance().create(name, config, key_in_config, getContext(), created_from_ddl);
 }
 
+bool ExternalDictionariesLoader::doesConfigChangeRequiresReloadingObject(const Poco::Util::AbstractConfiguration & old_config, const String & old_key_in_config,
+                                                                         const Poco::Util::AbstractConfiguration & new_config, const String & new_key_in_config) const
+{
+    std::unordered_set<std::string_view> ignore_keys;
+    ignore_keys.insert("comment"); /// We always can change the comment without reloading a dictionary.
+
+    /// If the database is atomic then a dictionary can be renamed without reloading.
+    if (!old_config.getString(old_key_in_config + ".uuid", "").empty() && !new_config.getString(new_key_in_config + ".uuid", "").empty())
+    {
+        ignore_keys.insert("name");
+        ignore_keys.insert("database");
+    }
+
+    return !isSameConfiguration(old_config, old_key_in_config, new_config, new_key_in_config, ignore_keys);
+}
+
+void ExternalDictionariesLoader::updateObjectFromConfigWithoutReloading(IExternalLoadable & object, const Poco::Util::AbstractConfiguration & config, const String & key_in_config) const
+{
+    IDictionary & dict = static_cast<IDictionary &>(object);
+
+    auto new_dictionary_id = StorageID::fromDictionaryConfig(config, key_in_config);
+    auto old_dictionary_id = dict.getDictionaryID();
+    if ((new_dictionary_id.table_name != old_dictionary_id.table_name) || (new_dictionary_id.database_name != old_dictionary_id.database_name))
+    {
+        /// We can update the dictionary ID without reloading only if it's in the atomic database.
+        if ((new_dictionary_id.uuid == old_dictionary_id.uuid) && (new_dictionary_id.uuid != UUIDHelpers::Nil))
+            dict.updateDictionaryID(new_dictionary_id);
+    }
+
+    dict.updateDictionaryComment(config.getString(key_in_config + ".comment", ""));
+}
+
 ExternalDictionariesLoader::DictPtr ExternalDictionariesLoader::getDictionary(const std::string & dictionary_name, ContextPtr local_context) const
 {
     std::string resolved_dictionary_name = resolveDictionaryName(dictionary_name, local_context->getCurrentDatabase());
diff --git a/src/Interpreters/ExternalDictionariesLoader.h b/src/Interpreters/ExternalDictionariesLoader.h
index 5f27d695c8b..0fc58aa1edf 100644
--- a/src/Interpreters/ExternalDictionariesLoader.h
+++ b/src/Interpreters/ExternalDictionariesLoader.h
@@ -40,8 +40,14 @@ public:
     static void resetAll();
 
 protected:
-    LoadablePtr create(const std::string & name, const Poco::Util::AbstractConfiguration & config,
-            const std::string & key_in_config, const std::string & repository_name) const override;
+    LoadableMutablePtr createObject(const std::string & name, const Poco::Util::AbstractConfiguration & config,
+                                    const std::string & key_in_config, const std::string & repository_name) const override;
+
+    bool doesConfigChangeRequiresReloadingObject(const Poco::Util::AbstractConfiguration & old_config, const String & old_key_in_config,
+                                                 const Poco::Util::AbstractConfiguration & new_config, const String & new_key_in_config) const override;
+
+    void updateObjectFromConfigWithoutReloading(
+        IExternalLoadable & object, const Poco::Util::AbstractConfiguration & config, const String & key_in_config) const override;
 
     std::string resolveDictionaryName(const std::string & dictionary_name, const std::string & current_database_name) const;
 
diff --git a/src/Interpreters/ExternalLoader.cpp b/src/Interpreters/ExternalLoader.cpp
index 56d480d8735..a636e59fa1a 100644
--- a/src/Interpreters/ExternalLoader.cpp
+++ b/src/Interpreters/ExternalLoader.cpp
@@ -1,19 +1,20 @@
 #include "ExternalLoader.h"
 
 #include <mutex>
-#include <Common/MemoryTrackerBlockerInThread.h>
-#include <Common/Config/AbstractConfigurationComparison.h>
-#include <Common/Exception.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/ThreadPool.h>
-#include <Common/randomSeed.h>
-#include <Common/setThreadName.h>
-#include <Common/scope_guard_safe.h>
-#include <Common/logger_useful.h>
+#include <unordered_set>
 #include <base/chrono_io.h>
 #include <boost/range/adaptor/map.hpp>
 #include <boost/range/algorithm/copy.hpp>
-#include <unordered_set>
+#include <Common/Config/AbstractConfigurationComparison.h>
+#include <Common/CurrentThread.h>
+#include <Common/Exception.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/ThreadPool.h>
+#include <Common/logger_useful.h>
+#include <Common/randomSeed.h>
+#include <Common/scope_guard_safe.h>
+#include <Common/setThreadName.h>
 
 
 namespace DB
@@ -95,10 +96,7 @@ namespace
 class ExternalLoader::LoadablesConfigReader : private boost::noncopyable
 {
 public:
-    LoadablesConfigReader(const String & type_name_, Poco::Logger * log_)
-        : type_name(type_name_), log(log_)
-    {
-    }
+    LoadablesConfigReader(const String & type_name_, LoggerPtr log_) : type_name(type_name_), log(log_) { }
     ~LoadablesConfigReader() = default;
 
     using Repository = IExternalLoaderConfigRepository;
@@ -167,7 +165,7 @@ public:
 private:
     struct FileInfo
     {
-        Poco::Timestamp last_update_time = 0;
+        std::optional<Poco::Timestamp> last_update_time;
         bool in_use = true; // Whether the `FileInfo` should be destroyed because the correspondent file is deleted.
         Poco::AutoPtr<Poco::Util::AbstractConfiguration> file_contents; // Parsed contents of the file.
         std::unordered_map<String /* object name */, String /* key in file_contents */> objects;
@@ -266,7 +264,7 @@ private:
             // is updated, but in the same second).
             // The solution to this is probably switching to std::filesystem
             // -- the work is underway to do so.
-            if (update_time_from_repository == file_info.last_update_time)
+            if (update_time_from_repository && (update_time_from_repository == file_info.last_update_time))
             {
                 file_info.in_use = true;
                 return false;
@@ -377,7 +375,7 @@ private:
     }
 
     const String type_name;
-    Poco::Logger * log;
+    const LoggerPtr log;
 
     std::mutex mutex;
     ExternalLoaderConfigSettings settings;
@@ -394,17 +392,8 @@ private:
 class ExternalLoader::LoadingDispatcher : private boost::noncopyable
 {
 public:
-    /// Called to load or reload an object.
-    using CreateObjectFunction = std::function<LoadablePtr(
-        const String & /* name */, const ObjectConfig & /* config */, const LoadablePtr & /* previous_version */)>;
-
-    LoadingDispatcher(
-        const CreateObjectFunction & create_object_function_,
-        const String & type_name_,
-        Poco::Logger * log_)
-        : create_object(create_object_function_)
-        , type_name(type_name_)
-        , log(log_)
+    LoadingDispatcher(const String & type_name_, LoggerPtr log_, const ExternalLoader & external_loader_)
+        : type_name(type_name_), log(log_), external_loader(external_loader_)
     {
     }
 
@@ -457,16 +446,25 @@ public:
             else
             {
                 const auto & new_config = new_config_it->second;
-                bool config_is_same = isSameConfiguration(*info.config->config, info.config->key_in_config, *new_config->config, new_config->key_in_config);
+                auto previous_config = info.config;
                 info.config = new_config;
-                if (!config_is_same)
+
+                bool config_changed = !isSameConfiguration(*previous_config->config, previous_config->key_in_config, *new_config->config, new_config->key_in_config);
+                if (config_changed)
                 {
+                    if (info.object)
+                        external_loader.updateObjectFromConfigWithoutReloading(*info.object, *new_config->config, new_config->key_in_config);
+
                     if (info.triedToLoad())
                     {
-                        /// The object has been tried to load before, so it is currently in use or was in use
-                        /// and we should try to reload it with the new config.
-                        LOG_TRACE(log, "Will reload '{}' because its configuration has been changed and there were attempts to load it before", name);
-                        startLoading(info, true);
+                        bool config_change_requires_reloading = external_loader.doesConfigChangeRequiresReloadingObject(*previous_config->config, previous_config->key_in_config, *new_config->config, new_config->key_in_config);
+                        if (config_change_requires_reloading)
+                        {
+                            /// The object has been tried to load before, so it is currently in use or was in use
+                            /// and we should try to reload it with the new config.
+                            LOG_TRACE(log, "Will reload '{}' because its configuration has been changed and there were attempts to load it before", name);
+                            startLoading(info, true);
+                        }
                     }
                 }
             }
@@ -770,7 +768,7 @@ private:
         }
 
         String name;
-        LoadablePtr object;
+        LoadableMutablePtr object;
         std::shared_ptr<const ObjectConfig> config;
         TimePoint loading_start_time;
         TimePoint loading_end_time;
@@ -1030,17 +1028,17 @@ private:
     }
 
     /// Load one object, returns object ptr or exception.
-    std::pair<LoadablePtr, std::exception_ptr>
+    std::pair<LoadableMutablePtr, std::exception_ptr>
     loadSingleObject(const String & name, const ObjectConfig & config, LoadablePtr previous_version)
     {
         /// Use `create_function` to perform the actual loading.
         /// It's much better to do it with `mutex` unlocked because the loading can take a lot of time
         /// and require access to other objects.
-        LoadablePtr new_object;
+        LoadableMutablePtr new_object;
         std::exception_ptr new_exception;
         try
         {
-            new_object = create_object(name, config, previous_version);
+            new_object = external_loader.createOrCloneObject(name, config, previous_version);
         }
         catch (...)
         {
@@ -1054,7 +1052,7 @@ private:
         const String & name,
         size_t loading_id,
         LoadablePtr previous_version,
-        LoadablePtr new_object,
+        LoadableMutablePtr new_object,
         std::exception_ptr new_exception,
         size_t error_count,
         const LoadingGuardForAsyncLoad &)
@@ -1117,7 +1115,10 @@ private:
         }
 
         if (new_object)
+        {
+            external_loader.updateObjectFromConfigWithoutReloading(*new_object, *info->config->config, info->config->key_in_config);
             info->object = new_object;
+        }
 
         info->exception = new_exception;
         info->error_count = error_count;
@@ -1186,14 +1187,14 @@ private:
         else
         {
             auto result = std::chrono::system_clock::now() + std::chrono::seconds(calculateDurationWithBackoff(rnd_engine, error_count));
-            LOG_TRACE(log, "Supposed update time for unspecified object is {} (backoff, {} errors.", to_string(result), error_count);
+            LOG_TRACE(log, "Supposed update time for unspecified object is {} (backoff, {} errors)", to_string(result), error_count);
             return result;
         }
     }
 
-    const CreateObjectFunction create_object;
     const String type_name;
-    Poco::Logger * log;
+    const LoggerPtr log;
+    const ExternalLoader & external_loader;
 
     mutable std::mutex mutex;
     std::condition_variable event;
@@ -1273,12 +1274,9 @@ private:
 };
 
 
-ExternalLoader::ExternalLoader(const String & type_name_, Poco::Logger * log_)
+ExternalLoader::ExternalLoader(const String & type_name_, LoggerPtr log_)
     : config_files_reader(std::make_unique<LoadablesConfigReader>(type_name_, log_))
-    , loading_dispatcher(std::make_unique<LoadingDispatcher>(
-          [this](auto && a, auto && b, auto && c) { return createObject(a, b, c); },
-          type_name_,
-          log_))
+    , loading_dispatcher(std::make_unique<LoadingDispatcher>(type_name_, log_, *this))
     , periodic_updater(std::make_unique<PeriodicUpdater>(*config_files_reader, *loading_dispatcher))
     , type_name(type_name_)
     , log(log_)
@@ -1505,13 +1503,13 @@ void ExternalLoader::reloadConfig(const String & repository_name, const String &
     loading_dispatcher->setConfiguration(config_files_reader->read(repository_name, path));
 }
 
-ExternalLoader::LoadablePtr ExternalLoader::createObject(
+ExternalLoader::LoadableMutablePtr ExternalLoader::createOrCloneObject(
     const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const
 {
     if (previous_version)
         return previous_version->clone();
 
-    return create(name, *config.config, config.key_in_config, config.repository_name);
+    return createObject(name, *config.config, config.key_in_config, config.repository_name);
 }
 
 template ExternalLoader::LoadablePtr ExternalLoader::getLoadResult<ExternalLoader::LoadablePtr>(const String &) const;
diff --git a/src/Interpreters/ExternalLoader.h b/src/Interpreters/ExternalLoader.h
index 49b4ea77e0d..c746ce39b2d 100644
--- a/src/Interpreters/ExternalLoader.h
+++ b/src/Interpreters/ExternalLoader.h
@@ -8,6 +8,7 @@
 #include <Interpreters/IExternalLoaderConfigRepository.h>
 #include <base/scope_guard.h>
 #include <Common/ExternalLoaderStatus.h>
+#include <Common/Logger.h>
 #include <Core/Types.h>
 
 namespace Poco { class Logger; }
@@ -49,6 +50,7 @@ class ExternalLoader
 {
 public:
     using LoadablePtr = std::shared_ptr<const IExternalLoadable>;
+    using LoadableMutablePtr = std::shared_ptr<IExternalLoadable>;
     using Loadables = std::vector<LoadablePtr>;
     using Status = ExternalLoaderStatus;
 
@@ -84,7 +86,7 @@ public:
     template <typename T>
     static constexpr bool is_vector_load_result_type = std::is_same_v<T, LoadResults> || std::is_same_v<T, Loadables>;
 
-    ExternalLoader(const String & type_name_, Poco::Logger * log);
+    ExternalLoader(const String & type_name_, LoggerPtr log);
     virtual ~ExternalLoader();
 
     /// Adds a repository which will be used to read configurations from.
@@ -210,7 +212,15 @@ public:
     void reloadConfig(const String & repository_name, const String & path) const;
 
 protected:
-    virtual LoadablePtr create(const String & name, const Poco::Util::AbstractConfiguration & config, const String & key_in_config, const String & repository_name) const = 0;
+    virtual LoadableMutablePtr createObject(const String & name, const Poco::Util::AbstractConfiguration & config, const String & key_in_config, const String & repository_name) const = 0;
+
+    /// Returns whether the object must be reloaded after a specified change in its configuration.
+    virtual bool doesConfigChangeRequiresReloadingObject(const Poco::Util::AbstractConfiguration & /* old_config */, const String & /* old_key_in_config */,
+                                                         const Poco::Util::AbstractConfiguration & /* new_config */, const String & /* new_key_in_config */) const { return true; /* always reload */ }
+
+    /// Updates the object from the configuration without reloading as much as possible.
+    virtual void updateObjectFromConfigWithoutReloading(
+        IExternalLoadable & /* object */, const Poco::Util::AbstractConfiguration & /* config */, const String & /* key_in_config */) const {}
 
 private:
     void checkLoaded(const LoadResult & result, bool check_no_errors) const;
@@ -218,7 +228,7 @@ private:
 
     Strings getAllTriedToLoadNames() const;
 
-    LoadablePtr createObject(const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const;
+    LoadableMutablePtr createOrCloneObject(const String & name, const ObjectConfig & config, const LoadablePtr & previous_version) const;
 
     class LoadablesConfigReader;
     std::unique_ptr<LoadablesConfigReader> config_files_reader;
@@ -230,7 +240,7 @@ private:
     std::unique_ptr<PeriodicUpdater> periodic_updater;
 
     const String type_name;
-    Poco::Logger * log;
+    const LoggerPtr log;
 };
 
 }
diff --git a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp
index 86f5a9ded0a..042992fcd2e 100644
--- a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.cpp
@@ -26,11 +26,6 @@ bool ExternalLoaderDictionaryStorageConfigRepository::exists(const std::string &
     return getName() == loadable_definition_name;
 }
 
-Poco::Timestamp ExternalLoaderDictionaryStorageConfigRepository::getUpdateTime(const std::string &)
-{
-    return dictionary_storage.getUpdateTime();
-}
-
 LoadablesConfigurationPtr ExternalLoaderDictionaryStorageConfigRepository::load(const std::string &)
 {
     return dictionary_storage.getConfiguration();
diff --git a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h
index 06d2b0faf75..f357df990e6 100644
--- a/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h
@@ -19,8 +19,6 @@ public:
 
     bool exists(const std::string & loadable_definition_name) override;
 
-    Poco::Timestamp getUpdateTime(const std::string & loadable_definition_name) override;
-
     LoadablesConfigurationPtr load(const std::string & loadable_definition_name) override;
 
 private:
diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.cpp b/src/Interpreters/ExternalLoaderTempConfigRepository.cpp
index 10fc61a2ed0..0a8fc170294 100644
--- a/src/Interpreters/ExternalLoaderTempConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderTempConfigRepository.cpp
@@ -28,14 +28,6 @@ bool ExternalLoaderTempConfigRepository::exists(const String & path_)
 }
 
 
-Poco::Timestamp ExternalLoaderTempConfigRepository::getUpdateTime(const String & path_)
-{
-    if (!exists(path_))
-        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Loadable {} not found", path_);
-    return creation_time;
-}
-
-
 LoadablesConfigurationPtr ExternalLoaderTempConfigRepository::load(const String & path_)
 {
     if (!exists(path_))
diff --git a/src/Interpreters/ExternalLoaderTempConfigRepository.h b/src/Interpreters/ExternalLoaderTempConfigRepository.h
index 92816dcb7f2..a3c67b3eed6 100644
--- a/src/Interpreters/ExternalLoaderTempConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderTempConfigRepository.h
@@ -18,14 +18,12 @@ public:
 
     std::set<String> getAllLoadablesDefinitionNames() override;
     bool exists(const String & path) override;
-    Poco::Timestamp getUpdateTime(const String & path) override;
     LoadablesConfigurationPtr load(const String & path) override;
 
 private:
     String name;
     String path;
     LoadablesConfigurationPtr config;
-    Poco::Timestamp creation_time;
 };
 
 }
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
index 8b9584f1242..a15f918f457 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.cpp
@@ -24,7 +24,7 @@ ExternalLoaderXMLConfigRepository::ExternalLoaderXMLConfigRepository(
 {
 }
 
-Poco::Timestamp ExternalLoaderXMLConfigRepository::getUpdateTime(const std::string & definition_entity_name)
+std::optional<Poco::Timestamp> ExternalLoaderXMLConfigRepository::getUpdateTime(const std::string & definition_entity_name)
 {
     return FS::getModificationTimestamp(definition_entity_name);
 }
diff --git a/src/Interpreters/ExternalLoaderXMLConfigRepository.h b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
index 25646d72db3..814817cad6f 100644
--- a/src/Interpreters/ExternalLoaderXMLConfigRepository.h
+++ b/src/Interpreters/ExternalLoaderXMLConfigRepository.h
@@ -26,7 +26,7 @@ public:
     bool exists(const std::string & definition_entity_name) override;
 
     /// Return xml-file modification time via stat call
-    Poco::Timestamp getUpdateTime(const std::string & definition_entity_name) override;
+    std::optional<Poco::Timestamp> getUpdateTime(const std::string & definition_entity_name) override;
 
     /// May contain definition about several entities (several dictionaries in one .xml file)
     LoadablesConfigurationPtr load(const std::string & config_file) override;
diff --git a/src/Interpreters/FilesystemCacheLog.cpp b/src/Interpreters/FilesystemCacheLog.cpp
index ccfee49a66f..80fe1c3a8ef 100644
--- a/src/Interpreters/FilesystemCacheLog.cpp
+++ b/src/Interpreters/FilesystemCacheLog.cpp
@@ -38,20 +38,20 @@ ColumnsDescription FilesystemCacheLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"source_file_path", std::make_shared<DataTypeString>()},
-        {"file_segment_range", std::make_shared<DataTypeTuple>(types)},
-        {"total_requested_range", std::make_shared<DataTypeTuple>(types)},
-        {"key", std::make_shared<DataTypeString>()},
-        {"offset", std::make_shared<DataTypeUInt64>()},
-        {"size", std::make_shared<DataTypeUInt64>()},
-        {"read_type", std::make_shared<DataTypeString>()},
-        {"read_from_cache_attempted", std::make_shared<DataTypeUInt8>()},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
-        {"read_buffer_id", std::make_shared<DataTypeString>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname"},
+        {"event_date", std::make_shared<DataTypeDate>(), "Event date"},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Event time"},
+        {"query_id", std::make_shared<DataTypeString>(), "Id of the query"},
+        {"source_file_path", std::make_shared<DataTypeString>(), "File segment path on filesystem"},
+        {"file_segment_range", std::make_shared<DataTypeTuple>(types), "File segment range"},
+        {"total_requested_range", std::make_shared<DataTypeTuple>(types), "Full read range"},
+        {"key", std::make_shared<DataTypeString>(), "File segment key"},
+        {"offset", std::make_shared<DataTypeUInt64>(), "File segment offset"},
+        {"size", std::make_shared<DataTypeUInt64>(), "Read size"},
+        {"read_type", std::make_shared<DataTypeString>(), "Read type: READ_FROM_CACHE, READ_FROM_FS_AND_DOWNLOADED_TO_CACHE, READ_FROM_FS_BYPASSING_CACHE"},
+        {"read_from_cache_attempted", std::make_shared<DataTypeUInt8>(), "Whether reading from cache was attempted"},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "Profile events collected while reading this file segment"},
+        {"read_buffer_id", std::make_shared<DataTypeString>(), "Internal implementation read buffer id"},
     };
 }
 
diff --git a/src/Interpreters/FilesystemReadPrefetchesLog.cpp b/src/Interpreters/FilesystemReadPrefetchesLog.cpp
index 7fb2e3d1f4c..8cea05a1857 100644
--- a/src/Interpreters/FilesystemReadPrefetchesLog.cpp
+++ b/src/Interpreters/FilesystemReadPrefetchesLog.cpp
@@ -1,4 +1,3 @@
-#include <base/getFQDNOrHostName.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
@@ -6,6 +5,8 @@
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/FilesystemReadPrefetchesLog.h>
+#include <base/getFQDNOrHostName.h>
+#include <Common/DateLUTImpl.h>
 
 
 namespace DB
diff --git a/src/Interpreters/FilesystemReadPrefetchesLog.h b/src/Interpreters/FilesystemReadPrefetchesLog.h
index ee6da4966e9..088613cbeac 100644
--- a/src/Interpreters/FilesystemReadPrefetchesLog.h
+++ b/src/Interpreters/FilesystemReadPrefetchesLog.h
@@ -38,7 +38,6 @@ struct FilesystemReadPrefetchesLogElement
     static NamesAndAliases getNamesAndAliases() { return {}; }
 
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class FilesystemReadPrefetchesLog : public SystemLog<FilesystemReadPrefetchesLogElement>
diff --git a/src/Interpreters/FullSortingMergeJoin.h b/src/Interpreters/FullSortingMergeJoin.h
index 3fc9f8920ed..7e07c2004b6 100644
--- a/src/Interpreters/FullSortingMergeJoin.h
+++ b/src/Interpreters/FullSortingMergeJoin.h
@@ -21,16 +21,20 @@ namespace ErrorCodes
 class FullSortingMergeJoin : public IJoin
 {
 public:
-    explicit FullSortingMergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_)
+    explicit FullSortingMergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_sample_block_,
+                                  int null_direction_ = 1)
         : table_join(table_join_)
         , right_sample_block(right_sample_block_)
+        , null_direction(null_direction_)
     {
-        LOG_TRACE(&Poco::Logger::get("FullSortingMergeJoin"), "Will use full sorting merge join");
+        LOG_TRACE(getLogger("FullSortingMergeJoin"), "Will use full sorting merge join");
     }
 
     std::string getName() const override { return "FullSortingMergeJoin"; }
     const TableJoin & getTableJoin() const override { return *table_join; }
 
+    int getNullDirection() const { return null_direction; }
+
     bool addBlockToJoin(const Block & /* block */, bool /* check_limits */) override
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "FullSortingMergeJoin::addBlockToJoin should not be called");
@@ -119,6 +123,7 @@ private:
     std::shared_ptr<TableJoin> table_join;
     Block right_sample_block;
     Block totals;
+    int null_direction;
 };
 
 }
diff --git a/src/Interpreters/GatherFunctionQuantileVisitor.cpp b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
index 664bb9e9383..6b6dc362771 100644
--- a/src/Interpreters/GatherFunctionQuantileVisitor.cpp
+++ b/src/Interpreters/GatherFunctionQuantileVisitor.cpp
@@ -30,6 +30,7 @@ static const std::unordered_map<String, String> quantile_fuse_name_mapping =
     {"quantileTDigestWeighted", "quantilesTDigestWeighted"},
     {"quantileTiming", "quantilesTiming"},
     {"quantileTimingWeighted", "quantilesTimingWeighted"},
+    {"quantileGK", "quantilesGK"},
 };
 
 String GatherFunctionQuantileData::toFusedNameOrSelf(const String & func_name)
diff --git a/src/Interpreters/GetAggregatesVisitor.h b/src/Interpreters/GetAggregatesVisitor.h
index 863c4f81a1b..e1d22e4de82 100644
--- a/src/Interpreters/GetAggregatesVisitor.h
+++ b/src/Interpreters/GetAggregatesVisitor.h
@@ -68,7 +68,7 @@ private:
                                 node.getColumnName(), String(data.assert_no_aggregates));
 
             String column_name = node.getColumnName();
-            if (data.uniq_names.count(column_name))
+            if (data.uniq_names.contains(column_name))
                 return;
 
             data.uniq_names.insert(column_name);
@@ -81,7 +81,7 @@ private:
                                 node.getColumnName(), String(data.assert_no_windows));
 
             String column_name = node.getColumnName();
-            if (data.uniq_names.count(column_name))
+            if (data.uniq_names.contains(column_name))
                 return;
 
             data.uniq_names.insert(column_name);
diff --git a/src/Interpreters/GlobalSubqueriesVisitor.h b/src/Interpreters/GlobalSubqueriesVisitor.h
index 384b562c80c..64b6eb5dce9 100644
--- a/src/Interpreters/GlobalSubqueriesVisitor.h
+++ b/src/Interpreters/GlobalSubqueriesVisitor.h
@@ -32,6 +32,7 @@ namespace ErrorCodes
 {
     extern const int WRONG_GLOBAL_SUBQUERY;
     extern const int LOGICAL_ERROR;
+    extern const int SUPPORT_IS_DISABLED;
 }
 
 class GlobalSubqueriesMatcher
@@ -200,23 +201,33 @@ 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 ((shouldBeExecutedGlobally(data)
+        const Settings & settings = data.getContext()->getSettingsRef();
+        const bool prefer_global = settings.prefer_global_in_and_join;
+        const bool enable_parallel_processing_of_joins = data.getContext()->canUseParallelReplicasOnInitiator();
+
+        if (((prefer_global || enable_parallel_processing_of_joins)
              && (func.name == "in" || func.name == "notIn" || func.name == "nullIn" || func.name == "notNullIn"))
             || func.name == "globalIn" || func.name == "globalNotIn" || func.name == "globalNullIn" || func.name == "globalNotNullIn")
         {
             ASTPtr & ast = func.arguments->children[1];
+            if (enable_parallel_processing_of_joins)
+            {
+                /// We don't enable parallel replicas for IN (subquery)
+                if (!settings.parallel_replicas_allow_in_with_subquery && ast->as<ASTSubquery>())
+                {
+                    if (settings.allow_experimental_parallel_reading_from_replicas == 1)
+                    {
+                        LOG_DEBUG(getLogger("GlobalSubqueriesMatcher"), "IN with subquery is not supported with parallel replicas");
+                        data.getContext()->getQueryContext()->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+                        return;
+                    }
+                    else if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
+                        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "IN with subquery is not supported with parallel replicas");
+                }
+            }
 
             /// Literal or function can use regular IN.
             /// NOTE: We don't support passing table functions to IN.
@@ -241,9 +252,41 @@ private:
     /// GLOBAL JOIN
     static void visit(ASTTablesInSelectQueryElement & table_elem, ASTPtr &, Data & data)
     {
+        const Settings & settings = data.getContext()->getSettingsRef();
+        const bool prefer_global = settings.prefer_global_in_and_join;
+        const bool enable_parallel_processing_of_joins = data.getContext()->canUseParallelReplicasOnInitiator();
+
         if (table_elem.table_join
-            && (table_elem.table_join->as<ASTTableJoin &>().locality == JoinLocality::Global || shouldBeExecutedGlobally(data)))
+            && (table_elem.table_join->as<ASTTableJoin &>().locality == JoinLocality::Global || prefer_global
+                || enable_parallel_processing_of_joins))
         {
+            if (enable_parallel_processing_of_joins)
+            {
+                /// For parallel replicas we currently only support JOIN with subqueries
+                /// Note that tableA join tableB is previously converted into tableA JOIN (Select * FROM tableB) so that's ok
+                /// We don't support WITH cte as (subquery) Select table JOIN cte because we don't do conversion in AST
+                bool is_subquery = false;
+                if (const auto * ast_table_expr = table_elem.table_expression->as<ASTTableExpression>())
+                {
+                    is_subquery = ast_table_expr->subquery && ast_table_expr->subquery->as<ASTSubquery>() != nullptr
+                        && ast_table_expr->subquery->as<ASTSubquery>()->cte_name.empty();
+                }
+                else if (table_elem.table_expression->as<ASTSubquery>())
+                    is_subquery = true;
+
+                if (!is_subquery)
+                {
+                    if (settings.allow_experimental_parallel_reading_from_replicas == 1)
+                    {
+                        LOG_DEBUG(getLogger("GlobalSubqueriesMatcher"), "JOIN with parallel replicas is only supported with subqueries");
+                        data.getContext()->getQueryContext()->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+                        return;
+                    }
+                    else if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
+                        throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "JOIN with parallel replicas is only supported with subqueries");
+                }
+            }
+
             Names required_columns;
 
             /// Fill required columns for GLOBAL JOIN.
diff --git a/src/Interpreters/GraceHashJoin.cpp b/src/Interpreters/GraceHashJoin.cpp
index 26d666a8913..53d1f48c291 100644
--- a/src/Interpreters/GraceHashJoin.cpp
+++ b/src/Interpreters/GraceHashJoin.cpp
@@ -1,21 +1,18 @@
+#include <Compression/CompressedWriteBuffer.h>
+#include <Formats/NativeWriter.h>
+#include <Formats/formatBlock.h>
+#include <Interpreters/Context.h>
 #include <Interpreters/GraceHashJoin.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/TableJoin.h>
-
-#include <Formats/NativeWriter.h>
 #include <Interpreters/TemporaryDataOnDisk.h>
-
-#include <Compression/CompressedWriteBuffer.h>
+#include <base/FnTraits.h>
 #include <Common/formatReadable.h>
 #include <Common/logger_useful.h>
 #include <Common/thread_local_rng.h>
 
-#include <base/FnTraits.h>
-#include <fmt/format.h>
-
-#include <Formats/formatBlock.h>
-
 #include <numeric>
+#include <fmt/format.h>
 
 
 namespace CurrentMetrics
@@ -121,7 +118,7 @@ class GraceHashJoin::FileBucket : boost::noncopyable
 public:
     using BucketLock = std::unique_lock<std::mutex>;
 
-    explicit FileBucket(size_t bucket_index_, TemporaryFileStream & left_file_, TemporaryFileStream & right_file_, Poco::Logger * log_)
+    explicit FileBucket(size_t bucket_index_, TemporaryFileStream & left_file_, TemporaryFileStream & right_file_, LoggerPtr log_)
         : idx{bucket_index_}
         , left_file{left_file_}
         , right_file{right_file_}
@@ -223,7 +220,7 @@ private:
 
     std::atomic<State> state;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 namespace
@@ -261,7 +258,7 @@ GraceHashJoin::GraceHashJoin(
     const Block & right_sample_block_,
     TemporaryDataOnDiskScopePtr tmp_data_,
     bool any_take_last_row_)
-    : log{&Poco::Logger::get("GraceHashJoin")}
+    : log{getLogger("GraceHashJoin")}
     , context{context_}
     , table_join{std::move(table_join_)}
     , left_sample_block{left_sample_block_}
@@ -403,7 +400,7 @@ void GraceHashJoin::addBuckets(const size_t bucket_count)
         catch (...)
         {
             LOG_ERROR(
-                &Poco::Logger::get("GraceHashJoin"),
+                getLogger("GraceHashJoin"),
                 "Can't create bucket {} due to error: {}",
                 current_size + i,
                 getCurrentExceptionMessage(false));
diff --git a/src/Interpreters/GraceHashJoin.h b/src/Interpreters/GraceHashJoin.h
index 2cadeee10b9..ff396683230 100644
--- a/src/Interpreters/GraceHashJoin.h
+++ b/src/Interpreters/GraceHashJoin.h
@@ -120,7 +120,7 @@ private:
     /// Structure block to store in the HashJoin according to sample_block.
     Block prepareRightBlock(const Block & block);
 
-    Poco::Logger * log;
+    LoggerPtr log;
     ContextPtr context;
     std::shared_ptr<TableJoin> table_join;
     Block left_sample_block;
diff --git a/src/Interpreters/GroupByFunctionKeysVisitor.h b/src/Interpreters/GroupByFunctionKeysVisitor.h
index b1d40320a45..9b082291bfb 100644
--- a/src/Interpreters/GroupByFunctionKeysVisitor.h
+++ b/src/Interpreters/GroupByFunctionKeysVisitor.h
@@ -38,7 +38,7 @@ struct KeepFunctionMatcher
             return;
         }
 
-        if (!data.key_names_to_keep.count(function_node->getColumnName()))
+        if (!data.key_names_to_keep.contains(function_node->getColumnName()))
         {
             Visitor(data).visit(function_node->arguments);
         }
@@ -46,7 +46,7 @@ struct KeepFunctionMatcher
 
     static void visit(ASTIdentifier * ident, Data & data)
     {
-        if (!data.key_names_to_keep.count(ident->shortName()))
+        if (!data.key_names_to_keep.contains(ident->shortName()))
         {
             /// if variable of a function is not in GROUP BY keys, this function should not be deleted
             data.keep_key = true;
diff --git a/src/Interpreters/HashJoin.cpp b/src/Interpreters/HashJoin.cpp
index b05b10ff25e..73498b39ead 100644
--- a/src/Interpreters/HashJoin.cpp
+++ b/src/Interpreters/HashJoin.cpp
@@ -3,15 +3,16 @@
 #include <unordered_map>
 #include <vector>
 
-#include <Common/StackTrace.h>
-#include <Common/logger_useful.h>
-
 #include <Columns/ColumnConst.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnVector.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
+#include <Columns/ColumnSparse.h>
+#include <Columns/ColumnString.h>
 #include <Columns/ColumnTuple.h>
+#include <Columns/ColumnVector.h>
+#include <Common/CurrentThread.h>
+#include <Common/StackTrace.h>
+#include <Common/logger_useful.h>
 
 
 #include <DataTypes/DataTypeNullable.h>
@@ -245,7 +246,7 @@ HashJoin::HashJoin(std::shared_ptr<TableJoin> table_join_, const Block & right_s
     , right_sample_block(right_sample_block_)
     , max_joined_block_rows(table_join->maxJoinedBlockRows())
     , instance_log_id(!instance_id_.empty() ? "(" + instance_id_ + ") " : "")
-    , log(&Poco::Logger::get("HashJoin"))
+    , log(getLogger("HashJoin"))
 {
     LOG_TRACE(log, "{}Keys: {}, datatype: {}, kind: {}, strictness: {}, right header: {}",
         instance_log_id, TableJoin::formatClauses(table_join->getClauses(), true), data->type, kind, strictness, right_sample_block.dumpStructure());
@@ -368,7 +369,7 @@ HashJoin::Type HashJoin::chooseMethod(JoinKind kind, const ColumnRawPtrs & key_c
             return Type::keys128;
         if (size_of_field == 32)
             return Type::keys256;
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
     }
 
     /// If the keys fit in N bits, we will use a hash table for N-bit-packed keys
@@ -1019,6 +1020,7 @@ struct JoinOnKeyColumns
     bool isRowFiltered(size_t i) const { return join_mask_column.isRowFiltered(i); }
 };
 
+template <bool lazy>
 class AddedColumns
 {
 public:
@@ -1034,6 +1036,12 @@ public:
         }
     };
 
+    struct LazyOutput
+    {
+        PaddedPODArray<UInt64> blocks;
+        PaddedPODArray<UInt32> row_nums;
+    };
+
     AddedColumns(
         const Block & left_block,
         const Block & block_with_columns_to_add,
@@ -1050,6 +1058,13 @@ public:
         if (is_asof_join)
             ++num_columns_to_add;
 
+        if constexpr (lazy)
+        {
+            has_columns_to_add = num_columns_to_add > 0;
+            lazy_output.blocks.reserve(rows_to_add);
+            lazy_output.row_nums.reserve(rows_to_add);
+        }
+
         columns.reserve(num_columns_to_add);
         type_name.reserve(num_columns_to_add);
         right_indexes.reserve(num_columns_to_add);
@@ -1089,81 +1104,18 @@ public:
 
     size_t size() const { return columns.size(); }
 
+    void buildOutput();
+
     ColumnWithTypeAndName moveColumn(size_t i)
     {
         return ColumnWithTypeAndName(std::move(columns[i]), type_name[i].type, type_name[i].qualified_name);
     }
 
+    void appendFromBlock(const Block & block, size_t row_num, bool has_default);
 
-    template <bool has_defaults>
-    void appendFromBlock(const Block & block, size_t row_num)
-    {
-        if constexpr (has_defaults)
-            applyLazyDefaults();
+    void appendDefaultRow();
 
-#ifndef NDEBUG
-        for (size_t j = 0; j < right_indexes.size(); ++j)
-        {
-            const auto * column_from_block = block.getByPosition(right_indexes[j]).column.get();
-            const auto * dest_column = columns[j].get();
-            if (auto * nullable_col = nullable_column_ptrs[j])
-            {
-                if (!is_join_get)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Columns {} and {} can have different nullability only in joinGetOrNull",
-                        dest_column->getName(), column_from_block->getName());
-                dest_column = nullable_col->getNestedColumnPtr().get();
-            }
-            /** Using dest_column->structureEquals(*column_from_block) will not work for low cardinality columns,
-              * because dictionaries can be different, while calling insertFrom on them is safe, for example:
-              * ColumnLowCardinality(size = 0, UInt8(size = 0), ColumnUnique(size = 1, String(size = 1)))
-              * and
-              * ColumnLowCardinality(size = 0, UInt16(size = 0), ColumnUnique(size = 1, String(size = 1)))
-              */
-            if (typeid(*dest_column) != typeid(*column_from_block))
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Columns {} and {} have different types {} and {}",
-                    dest_column->getName(), column_from_block->getName(),
-                    demangle(typeid(*dest_column).name()), demangle(typeid(*column_from_block).name()));
-        }
-#endif
-
-        if (is_join_get)
-        {
-            size_t right_indexes_size = right_indexes.size();
-            for (size_t j = 0; j < right_indexes_size; ++j)
-            {
-                const auto & column_from_block = block.getByPosition(right_indexes[j]);
-                if (auto * nullable_col = nullable_column_ptrs[j])
-                    nullable_col->insertFromNotNullable(*column_from_block.column, row_num);
-                else
-                    columns[j]->insertFrom(*column_from_block.column, row_num);
-            }
-        }
-        else
-        {
-            size_t right_indexes_size = right_indexes.size();
-            for (size_t j = 0; j < right_indexes_size; ++j)
-            {
-                const auto & column_from_block = block.getByPosition(right_indexes[j]);
-                columns[j]->insertFrom(*column_from_block.column, row_num);
-            }
-        }
-    }
-
-    void appendDefaultRow()
-    {
-        ++lazy_defaults_count;
-    }
-
-    void applyLazyDefaults()
-    {
-        if (lazy_defaults_count)
-        {
-            for (size_t j = 0, size = right_indexes.size(); j < size; ++j)
-                JoinCommon::addDefaultValues(*columns[j], type_name[j].type, lazy_defaults_count);
-            lazy_defaults_count = 0;
-        }
-    }
+    void applyLazyDefaults();
 
     const IColumn & leftAsofKey() const { return *left_asof_key; }
 
@@ -1192,16 +1144,50 @@ public:
     }
 
 private:
-    std::vector<TypeAndName> type_name;
-    MutableColumns columns;
-    std::vector<ColumnNullable *> nullable_column_ptrs;
 
+    void checkBlock(const Block & block)
+    {
+        for (size_t j = 0; j < right_indexes.size(); ++j)
+        {
+            const auto * column_from_block = block.getByPosition(right_indexes[j]).column.get();
+            const auto * dest_column = columns[j].get();
+            if (auto * nullable_col = nullable_column_ptrs[j])
+            {
+                if (!is_join_get)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                    "Columns {} and {} can have different nullability only in joinGetOrNull",
+                                    dest_column->getName(), column_from_block->getName());
+                dest_column = nullable_col->getNestedColumnPtr().get();
+            }
+            /** Using dest_column->structureEquals(*column_from_block) will not work for low cardinality columns,
+              * because dictionaries can be different, while calling insertFrom on them is safe, for example:
+              * ColumnLowCardinality(size = 0, UInt8(size = 0), ColumnUnique(size = 1, String(size = 1)))
+              * and
+              * ColumnLowCardinality(size = 0, UInt16(size = 0), ColumnUnique(size = 1, String(size = 1)))
+              */
+            if (typeid(*dest_column) != typeid(*column_from_block))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Columns {} and {} have different types {} and {}",
+                                dest_column->getName(), column_from_block->getName(),
+                                demangle(typeid(*dest_column).name()), demangle(typeid(*column_from_block).name()));
+        }
+    }
+
+    MutableColumns columns;
+    bool is_join_get;
     std::vector<size_t> right_indexes;
+    std::vector<TypeAndName> type_name;
+    std::vector<ColumnNullable *> nullable_column_ptrs;
     size_t lazy_defaults_count = 0;
+
+    /// for lazy
+    // The default row is represented by an empty RowRef, so that fixed-size blocks can be generated sequentially,
+    // default_count cannot represent the position of the row
+    LazyOutput lazy_output;
+    bool has_columns_to_add;
+
     /// for ASOF
     const IColumn * left_asof_key = nullptr;
 
-    bool is_join_get;
 
     void addColumn(const ColumnWithTypeAndName & src_column, const std::string & qualified_name)
     {
@@ -1210,6 +1196,126 @@ private:
         type_name.emplace_back(src_column.type, src_column.name, qualified_name);
     }
 };
+template<> void AddedColumns<false>::buildOutput()
+{
+}
+
+template<>
+void AddedColumns<true>::buildOutput()
+{
+    for (size_t i = 0; i < this->size(); ++i)
+    {
+        auto& col = columns[i];
+        size_t default_count = 0;
+        auto apply_default = [&]()
+        {
+            if (default_count > 0)
+            {
+                JoinCommon::addDefaultValues(*col, type_name[i].type, default_count);
+                default_count = 0;
+            }
+        };
+
+        for (size_t j = 0; j < lazy_output.blocks.size(); ++j)
+        {
+            if (!lazy_output.blocks[j])
+            {
+                default_count ++;
+                continue;
+            }
+            apply_default();
+            const auto & column_from_block = reinterpret_cast<const Block *>(lazy_output.blocks[j])->getByPosition(right_indexes[i]);
+            /// If it's joinGetOrNull, we need to wrap not-nullable columns in StorageJoin.
+            if (is_join_get)
+            {
+                if (auto * nullable_col = typeid_cast<ColumnNullable *>(col.get());
+                    nullable_col && !column_from_block.column->isNullable())
+                {
+                    nullable_col->insertFromNotNullable(*column_from_block.column, lazy_output.row_nums[j]);
+                    continue;
+                }
+            }
+            col->insertFrom(*column_from_block.column, lazy_output.row_nums[j]);
+        }
+        apply_default();
+    }
+}
+
+template<>
+void AddedColumns<false>::applyLazyDefaults()
+{
+    if (lazy_defaults_count)
+    {
+        for (size_t j = 0, size = right_indexes.size(); j < size; ++j)
+            JoinCommon::addDefaultValues(*columns[j], type_name[j].type, lazy_defaults_count);
+        lazy_defaults_count = 0;
+    }
+}
+
+template<>
+void AddedColumns<true>::applyLazyDefaults()
+{
+}
+
+template <>
+void AddedColumns<false>::appendFromBlock(const Block & block, size_t row_num,const bool has_defaults)
+{
+    if (has_defaults)
+        applyLazyDefaults();
+
+#ifndef NDEBUG
+    checkBlock(block);
+#endif
+    if (is_join_get)
+    {
+        size_t right_indexes_size = right_indexes.size();
+        for (size_t j = 0; j < right_indexes_size; ++j)
+        {
+            const auto & column_from_block = block.getByPosition(right_indexes[j]);
+            if (auto * nullable_col = nullable_column_ptrs[j])
+                nullable_col->insertFromNotNullable(*column_from_block.column, row_num);
+            else
+                columns[j]->insertFrom(*column_from_block.column, row_num);
+        }
+    }
+    else
+    {
+        size_t right_indexes_size = right_indexes.size();
+        for (size_t j = 0; j < right_indexes_size; ++j)
+        {
+            const auto & column_from_block = block.getByPosition(right_indexes[j]);
+            columns[j]->insertFrom(*column_from_block.column, row_num);
+        }
+    }
+}
+
+template <>
+void AddedColumns<true>::appendFromBlock(const Block & block, size_t row_num, bool)
+{
+#ifndef NDEBUG
+    checkBlock(block);
+#endif
+    if (has_columns_to_add)
+    {
+        lazy_output.blocks.emplace_back(reinterpret_cast<UInt64>(&block));
+        lazy_output.row_nums.emplace_back(static_cast<uint32_t>(row_num));
+    }
+}
+template<>
+void AddedColumns<false>::appendDefaultRow()
+{
+    ++lazy_defaults_count;
+}
+
+template<>
+void AddedColumns<true>::appendDefaultRow()
+{
+    if (has_columns_to_add)
+    {
+        lazy_output.blocks.emplace_back(0);
+        lazy_output.row_nums.emplace_back(0);
+    }
+}
 
 template <JoinKind KIND, JoinStrictness STRICTNESS>
 struct JoinFeatures
@@ -1308,7 +1414,7 @@ public:
     }
 };
 
-template <typename Map, bool add_missing, bool multiple_disjuncts>
+template <typename Map, bool add_missing, bool multiple_disjuncts, typename AddedColumns>
 void addFoundRowAll(
     const typename Map::mapped_type & mapped,
     AddedColumns & added,
@@ -1327,7 +1433,7 @@ void addFoundRowAll(
         {
             if (!known_rows.isKnown(std::make_pair(it->block, it->row_num)))
             {
-                added.appendFromBlock<false>(*it->block, it->row_num);
+                added.appendFromBlock(*it->block, it->row_num, false);
                 ++current_offset;
                 if (!new_known_rows_ptr)
                 {
@@ -1351,13 +1457,13 @@ void addFoundRowAll(
     {
         for (auto it = mapped.begin(); it.ok(); ++it)
         {
-            added.appendFromBlock<false>(*it->block, it->row_num);
+            added.appendFromBlock(*it->block, it->row_num, false);
             ++current_offset;
         }
     }
 }
 
-template <bool add_missing, bool need_offset>
+template <bool add_missing, bool need_offset, typename AddedColumns>
 void addNotFoundRow(AddedColumns & added [[maybe_unused]], IColumn::Offset & current_offset [[maybe_unused]])
 {
     if constexpr (add_missing)
@@ -1377,7 +1483,7 @@ void setUsed(IColumn::Filter & filter [[maybe_unused]], size_t pos [[maybe_unuse
 
 /// Joins right table columns which indexes are present in right_indexes using specified map.
 /// Makes filter (1 if row presented in right table) and returns offsets to replicate (for ALL JOINS).
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool multiple_disjuncts>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, bool multiple_disjuncts, typename AddedColumns>
 NO_INLINE size_t joinRightColumns(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1440,7 +1546,7 @@ NO_INLINE size_t joinRightColumns(
                         else
                             used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
 
-                        added_columns.appendFromBlock<join_features.add_missing>(*row_ref.block, row_ref.row_num);
+                        added_columns.appendFromBlock(*row_ref.block, row_ref.row_num, join_features.add_missing);
                     }
                     else
                         addNotFoundRow<join_features.add_missing, join_features.need_replication>(added_columns, current_offset);
@@ -1471,7 +1577,7 @@ NO_INLINE size_t joinRightColumns(
                     if (used_once)
                     {
                         setUsed<need_filter>(added_columns.filter, i);
-                        added_columns.appendFromBlock<join_features.add_missing>(*mapped.block, mapped.row_num);
+                        added_columns.appendFromBlock(*mapped.block, mapped.row_num, join_features.add_missing);
                     }
 
                     break;
@@ -1489,7 +1595,7 @@ NO_INLINE size_t joinRightColumns(
                 {
                     setUsed<need_filter>(added_columns.filter, i);
                     used_flags.template setUsed<join_features.need_flags, multiple_disjuncts>(find_result);
-                    added_columns.appendFromBlock<join_features.add_missing>(*mapped.block, mapped.row_num);
+                    added_columns.appendFromBlock(*mapped.block, mapped.row_num, join_features.add_missing);
 
                     if (join_features.is_any_or_semi_join)
                     {
@@ -1516,7 +1622,7 @@ NO_INLINE size_t joinRightColumns(
     return i;
 }
 
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, bool need_filter, typename AddedColumns>
 size_t joinRightColumnsSwitchMultipleDisjuncts(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1528,7 +1634,7 @@ size_t joinRightColumnsSwitchMultipleDisjuncts(
         : joinRightColumns<KIND, STRICTNESS, KeyGetter, Map, need_filter, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
 }
 
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename KeyGetter, typename Map, typename AddedColumns>
 size_t joinRightColumnsSwitchNullability(
     std::vector<KeyGetter> && key_getter_vector,
     const std::vector<const Map *> & mapv,
@@ -1541,11 +1647,11 @@ size_t joinRightColumnsSwitchNullability(
     }
     else
     {
-        return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, true>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
+        return joinRightColumnsSwitchMultipleDisjuncts<KIND, STRICTNESS, KeyGetter, Map, false>(std::forward<std::vector<KeyGetter>>(key_getter_vector), mapv, added_columns, used_flags);
     }
 }
 
-template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps>
+template <JoinKind KIND, JoinStrictness STRICTNESS, typename Maps, typename AddedColumns>
 size_t switchJoinRightColumns(
     const std::vector<const Maps *> & mapv,
     AddedColumns & added_columns,
@@ -1680,14 +1786,9 @@ Block HashJoin::joinBlockImpl(
       *  but they will not be used at this stage of joining (and will be in `AdderNonJoined`), and they need to be skipped.
       * For ASOF, the last column is used as the ASOF column
       */
-    AddedColumns added_columns(
-        block,
-        block_with_columns_to_add,
-        savedBlockSample(),
-        *this,
-        std::move(join_on_keys),
-        join_features.is_asof_join,
-        is_join_get);
+    AddedColumns<!join_features.is_any_join> added_columns(
+        block, block_with_columns_to_add, savedBlockSample(), *this, std::move(join_on_keys), join_features.is_asof_join, is_join_get);
+
 
     bool has_required_right_keys = (required_right_keys.columns() != 0);
     added_columns.need_filter = join_features.need_filter || has_required_right_keys;
@@ -1702,6 +1803,7 @@ Block HashJoin::joinBlockImpl(
     added_columns.join_on_keys.clear();
     Block remaining_block = sliceBlock(block, num_joined);
 
+    added_columns.buildOutput();
     for (size_t i = 0; i < added_columns.size(); ++i)
         block.insert(added_columns.moveColumn(i));
 
@@ -1717,18 +1819,14 @@ Block HashJoin::joinBlockImpl(
         for (size_t i = 0; i < required_right_keys.columns(); ++i)
         {
             const auto & right_key = required_right_keys.getByPosition(i);
-            // renamed ???
-            if (!block.findByName(right_key.name))
-            {
-                /// asof column is already in block.
-                if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
-                    continue;
+            /// asof column is already in block.
+            if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                continue;
 
-                const auto & left_column = block.getByName(required_right_keys_sources[i]);
-                const auto & right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
-                auto right_col = copyLeftKeyColumnToRight(right_key.type, right_col_name, left_column);
-                block.insert(std::move(right_col));
-            }
+            const auto & left_column = block.getByName(required_right_keys_sources[i]);
+            const auto & right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
+            auto right_col = copyLeftKeyColumnToRight(right_key.type, right_col_name, left_column);
+            block.insert(std::move(right_col));
         }
     }
     else if (has_required_right_keys)
@@ -1738,19 +1836,16 @@ Block HashJoin::joinBlockImpl(
         {
             const auto & right_key = required_right_keys.getByPosition(i);
             auto right_col_name = getTableJoin().renamedRightColumnName(right_key.name);
-            if (!block.findByName(right_col_name))
-            {
-                /// asof column is already in block.
-                if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
-                    continue;
+            /// asof column is already in block.
+            if (join_features.is_asof_join && right_key.name == table_join->getOnlyClause().key_names_right.back())
+                continue;
 
-                const auto & left_column = block.getByName(required_right_keys_sources[i]);
-                auto right_col = copyLeftKeyColumnToRight(right_key.type, right_col_name, left_column, &added_columns.filter);
-                block.insert(std::move(right_col));
+            const auto & left_column = block.getByName(required_right_keys_sources[i]);
+            auto right_col = copyLeftKeyColumnToRight(right_key.type, right_col_name, left_column, &added_columns.filter);
+            block.insert(std::move(right_col));
 
-                if constexpr (join_features.need_replication)
-                    right_keys_to_replicate.push_back(block.getPositionByName(right_col_name));
-            }
+            if constexpr (join_features.need_replication)
+                right_keys_to_replicate.push_back(block.getPositionByName(right_col_name));
         }
     }
 
@@ -2009,12 +2104,14 @@ struct AdderNonJoined
 /// Based on:
 ///   - map offsetInternal saved in used_flags for single disjuncts
 ///   - flags in BlockWithFlags for multiple disjuncts
-template <bool multiple_disjuncts>
 class NotJoinedHash final : public NotJoinedBlocks::RightColumnsFiller
 {
 public:
-    NotJoinedHash(const HashJoin & parent_, UInt64 max_block_size_)
-        : parent(parent_), max_block_size(max_block_size_), current_block_start(0)
+    NotJoinedHash(const HashJoin & parent_, UInt64 max_block_size_, bool multiple_disjuncts_)
+        : parent(parent_)
+        , max_block_size(max_block_size_)
+        , multiple_disjuncts(multiple_disjuncts_)
+        , current_block_start(0)
     {
         if (parent.data == nullptr)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot join after data has been released");
@@ -2040,7 +2137,7 @@ public:
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness '{}' (must be on of: ANY, ALL, ASOF)", parent.strictness);
         }
 
-        if constexpr (!multiple_disjuncts)
+        if (!multiple_disjuncts)
         {
             fillNullsFromBlocks(columns_right, rows_added);
         }
@@ -2051,6 +2148,7 @@ public:
 private:
     const HashJoin & parent;
     UInt64 max_block_size;
+    bool multiple_disjuncts;
 
     size_t current_block_start;
 
@@ -2116,7 +2214,7 @@ private:
     {
         size_t rows_added = 0;
 
-        if constexpr (multiple_disjuncts)
+        if (multiple_disjuncts)
         {
             if (!used_position.has_value())
                 used_position = parent.data->blocks.begin();
@@ -2206,23 +2304,23 @@ IBlocksStreamPtr HashJoin::getNonJoinedBlocks(const Block & left_sample_block,
 {
     if (!JoinCommon::hasNonJoinedBlocks(*table_join))
         return {};
+    size_t left_columns_count = left_sample_block.columns();
 
     bool multiple_disjuncts = !table_join->oneDisjunct();
+    if (!multiple_disjuncts)
+    {
+        /// With multiple disjuncts, all keys are in sample_block_with_columns_to_add, so invariant is not held
+        size_t expected_columns_count = left_columns_count + required_right_keys.columns() + sample_block_with_columns_to_add.columns();
+        if (expected_columns_count != result_sample_block.columns())
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected number of columns in result sample block: {} instead of {} ({} + {} + {})",
+                            result_sample_block.columns(), expected_columns_count,
+                            left_columns_count, required_right_keys.columns(), sample_block_with_columns_to_add.columns());
+        }
+    }
 
-    if (multiple_disjuncts)
-    {
-        /// ... calculate `left_columns_count` ...
-        size_t left_columns_count = left_sample_block.columns();
-        auto non_joined = std::make_unique<NotJoinedHash<true>>(*this, max_block_size);
-        return std::make_unique<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, *table_join);
-    }
-    else
-    {
-        size_t left_columns_count = left_sample_block.columns();
-        assert(left_columns_count == result_sample_block.columns() - required_right_keys.columns() - sample_block_with_columns_to_add.columns());
-        auto non_joined = std::make_unique<NotJoinedHash<false>>(*this, max_block_size);
-        return std::make_unique<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, *table_join);
-    }
+    auto non_joined = std::make_unique<NotJoinedHash>(*this, max_block_size, multiple_disjuncts);
+    return std::make_unique<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, *table_join);
 }
 
 void HashJoin::reuseJoinedData(const HashJoin & join)
diff --git a/src/Interpreters/HashJoin.h b/src/Interpreters/HashJoin.h
index 2be58b5fd2d..3e11517edad 100644
--- a/src/Interpreters/HashJoin.h
+++ b/src/Interpreters/HashJoin.h
@@ -253,6 +253,7 @@ public:
     template <typename Mapped>
     struct MapsTemplate
     {
+/// NOLINTBEGIN(bugprone-macro-parentheses)
         using MappedType = Mapped;
         std::unique_ptr<FixedHashMap<UInt8, Mapped>>                  key8;
         std::unique_ptr<FixedHashMap<UInt16, Mapped>>                 key16;
@@ -341,6 +342,7 @@ public:
 
             UNREACHABLE();
         }
+/// NOLINTEND(bugprone-macro-parentheses)
     };
 
     using MapsOne = MapsTemplate<RowRef>;
@@ -399,7 +401,7 @@ public:
     void setMaxJoinedBlockRows(size_t value) { max_joined_block_rows = value; }
 
 private:
-    template<bool> friend class NotJoinedHash;
+    friend class NotJoinedHash;
 
     friend class JoinSource;
 
@@ -446,7 +448,7 @@ private:
     /// Several instances can be created, for example, in GraceHashJoin to handle different buckets
     String instance_log_id;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Should be set via setLock to protect hash table from modification from StorageJoin
     /// If set HashJoin instance is not available for modification (addBlockToJoin)
diff --git a/src/Interpreters/IExternalLoadable.h b/src/Interpreters/IExternalLoadable.h
index 3c004508b0a..30de1facca6 100644
--- a/src/Interpreters/IExternalLoadable.h
+++ b/src/Interpreters/IExternalLoadable.h
@@ -23,7 +23,7 @@ struct ExternalLoadableLifetime
     UInt64 max_sec = 0;
 
     ExternalLoadableLifetime(const Poco::Util::AbstractConfiguration & config, const std::string & config_prefix);
-    ExternalLoadableLifetime() {}
+    ExternalLoadableLifetime() = default;
 };
 
 /// Get delay before trying to load again after error.
@@ -43,7 +43,7 @@ public:
     /// If lifetime exceeded and isModified(), ExternalLoader replace current object with the result of clone().
     virtual bool isModified() const = 0;
     /// Returns new object with the same configuration. Is used to update modified object when lifetime exceeded.
-    virtual std::shared_ptr<const IExternalLoadable> clone() const = 0;
+    virtual std::shared_ptr<IExternalLoadable> clone() const = 0;
 };
 
 }
diff --git a/src/Interpreters/IExternalLoaderConfigRepository.h b/src/Interpreters/IExternalLoaderConfigRepository.h
index 0d0c8acc01a..6ba4add86e2 100644
--- a/src/Interpreters/IExternalLoaderConfigRepository.h
+++ b/src/Interpreters/IExternalLoaderConfigRepository.h
@@ -37,7 +37,7 @@ public:
     virtual bool exists(const std::string & path) = 0;
 
     /// Returns entity last update time
-    virtual Poco::Timestamp getUpdateTime(const std::string & path) = 0;
+    virtual std::optional<Poco::Timestamp> getUpdateTime(const std::string & /* path */) { return {}; }
 
     /// Load configuration from some concrete source to AbstractConfiguration
     virtual LoadablesConfigurationPtr load(const std::string & path) = 0;
diff --git a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
index 4aa87346e80..fed29b410db 100644
--- a/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
+++ b/src/Interpreters/IInterpreterUnionOrSelectQuery.cpp
@@ -54,6 +54,7 @@ static StreamLocalLimits getLimitsForStorage(const Settings & settings, const Se
     limits.speed_limits.max_execution_rps = settings.max_execution_speed;
     limits.speed_limits.max_execution_bps = settings.max_execution_speed_bytes;
     limits.speed_limits.timeout_before_checking_execution_speed = settings.timeout_before_checking_execution_speed;
+    limits.speed_limits.max_estimated_execution_time = settings.max_estimated_execution_time;
 
     return limits;
 }
@@ -95,7 +96,7 @@ static ASTPtr parseAdditionalPostFilter(const Context & context)
     ParserExpression parser;
     return parseQuery(
                 parser, filter.data(), filter.data() + filter.size(),
-                "additional filter", settings.max_query_size, settings.max_parser_depth);
+                "additional filter", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 }
 
 static ActionsDAGPtr makeAdditionalPostFilter(ASTPtr & ast, ContextPtr context, const Block & header)
diff --git a/src/Interpreters/IKeyValueEntity.h b/src/Interpreters/IKeyValueEntity.h
index d1ceda57f0e..856ce28bae7 100644
--- a/src/Interpreters/IKeyValueEntity.h
+++ b/src/Interpreters/IKeyValueEntity.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/Block.h>
 #include <Core/Names.h>
 #include <Processors/Chunk.h>
 
diff --git a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
index 3858830a43b..3b3ef928b42 100644
--- a/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
+++ b/src/Interpreters/InJoinSubqueriesPreprocessor.cpp
@@ -1,6 +1,7 @@
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Storages/StorageDistributed.h>
@@ -103,12 +104,12 @@ private:
                     /// Already processed.
                 }
                 else
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unexpected function name {}", concrete->name);
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected function name {}", concrete->name);
             }
             else if (table_join)
                 table_join->locality = JoinLocality::Global;
             else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unexpected AST node");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected AST node");
         }
         else if (distributed_product_mode == DistributedProductMode::DENY)
         {
diff --git a/src/Interpreters/InternalTextLogsQueue.cpp b/src/Interpreters/InternalTextLogsQueue.cpp
index 3be58a11beb..ca8461937ac 100644
--- a/src/Interpreters/InternalTextLogsQueue.cpp
+++ b/src/Interpreters/InternalTextLogsQueue.cpp
@@ -43,7 +43,7 @@ void InternalTextLogsQueue::pushBlock(Block && log_block)
     if (blocksHaveEqualStructure(sample_block, log_block))
         (void)(emplace(log_block.mutateColumns()));
     else
-        LOG_WARNING(&Poco::Logger::get("InternalTextLogsQueue"), "Log block have different structure");
+        LOG_WARNING(getLogger("InternalTextLogsQueue"), "Log block have different structure");
 }
 
 std::string_view InternalTextLogsQueue::getPriorityName(int priority)
diff --git a/src/Interpreters/InterpreterAlterQuery.cpp b/src/Interpreters/InterpreterAlterQuery.cpp
index bfcb0d6dd39..2115dc57126 100644
--- a/src/Interpreters/InterpreterAlterQuery.cpp
+++ b/src/Interpreters/InterpreterAlterQuery.cpp
@@ -1,3 +1,4 @@
+#include <Interpreters/ApplyWithSubqueryVisitor.h>
 #include <Interpreters/InterpreterAlterQuery.h>
 #include <Interpreters/InterpreterFactory.h>
 
@@ -8,6 +9,7 @@
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
+#include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/MutationsInterpreter.h>
 #include <Interpreters/MutationsNonDeterministicHelpers.h>
 #include <Interpreters/QueryLog.h>
@@ -54,14 +56,13 @@ InterpreterAlterQuery::InterpreterAlterQuery(const ASTPtr & query_ptr_, ContextP
 
 BlockIO InterpreterAlterQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
     const auto & alter = query_ptr->as<ASTAlterQuery &>();
     if (alter.alter_object == ASTAlterQuery::AlterObjectType::DATABASE)
     {
         return executeToDatabase(alter);
     }
-    else if (alter.alter_object == ASTAlterQuery::AlterObjectType::TABLE
-            || alter.alter_object == ASTAlterQuery::AlterObjectType::LIVE_VIEW)
+    else if (alter.alter_object == ASTAlterQuery::AlterObjectType::TABLE)
     {
         return executeToTable(alter);
     }
@@ -71,6 +72,17 @@ BlockIO InterpreterAlterQuery::execute()
 
 BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
 {
+    ASTSelectWithUnionQuery * modify_query = nullptr;
+
+    for (auto & child : alter.command_list->children)
+    {
+        auto * command_ast = child->as<ASTAlterCommand>();
+        if (command_ast->sql_security)
+            InterpreterCreateQuery::processSQLSecurityOption(getContext(), command_ast->sql_security->as<ASTSQLSecurity &>());
+        else if (command_ast->type == ASTAlterCommand::MODIFY_QUERY)
+            modify_query = command_ast->select->as<ASTSelectWithUnionQuery>();
+    }
+
     BlockIO res;
 
     if (!UserDefinedSQLFunctionFactory::instance().empty())
@@ -116,6 +128,12 @@ BlockIO InterpreterAlterQuery::executeToTable(const ASTAlterQuery & alter)
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is read-only");
     auto table_lock = table->lockForShare(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
 
+    if (modify_query)
+    {
+        // Expand CTE before filling default database
+        ApplyWithSubqueryVisitor::visit(*modify_query);
+    }
+
     /// Add default database to table identifiers that we can encounter in e.g. default expressions, mutation expression, etc.
     AddDefaultDatabaseVisitor visitor(getContext(), table_id.getDatabaseName());
     ASTPtr command_list_ptr = alter.command_list->ptr();
@@ -412,6 +430,7 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
         case ASTAlterCommand::APPLY_DELETED_MASK:
         case ASTAlterCommand::DROP_PARTITION:
         case ASTAlterCommand::DROP_DETACHED_PARTITION:
+        case ASTAlterCommand::FORGET_PARTITION:
         {
             required_access.emplace_back(AccessType::ALTER_DELETE, database, table);
             break;
@@ -466,11 +485,6 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_VIEW_MODIFY_REFRESH, database, table);
             break;
         }
-        case ASTAlterCommand::LIVE_VIEW_REFRESH:
-        {
-            required_access.emplace_back(AccessType::ALTER_VIEW_REFRESH, database, table);
-            break;
-        }
         case ASTAlterCommand::RENAME_COLUMN:
         {
             required_access.emplace_back(AccessType::ALTER_RENAME_COLUMN, database, table, column_name());
@@ -487,6 +501,11 @@ AccessRightsElements InterpreterAlterQuery::getRequiredAccessForCommand(const AS
             required_access.emplace_back(AccessType::ALTER_MODIFY_COMMENT, database, table);
             break;
         }
+        case ASTAlterCommand::MODIFY_SQL_SECURITY:
+        {
+            required_access.emplace_back(AccessType::ALTER_VIEW_MODIFY_SQL_SECURITY, database, table);
+            break;
+        }
     }
 
     return required_access;
diff --git a/src/Interpreters/InterpreterCheckQuery.cpp b/src/Interpreters/InterpreterCheckQuery.cpp
index 0cc4afd62f2..ae8cef3f102 100644
--- a/src/Interpreters/InterpreterCheckQuery.cpp
+++ b/src/Interpreters/InterpreterCheckQuery.cpp
@@ -16,6 +16,7 @@
 #include <DataTypes/DataTypeString.h>
 
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/ProcessList.h>
 
 #include <Parsers/ASTCheckQuery.h>
@@ -149,7 +150,7 @@ private:
 class TableCheckSource : public ISource
 {
 public:
-    TableCheckSource(Strings databases_, ContextPtr context_, Poco::Logger * log_)
+    TableCheckSource(Strings databases_, ContextPtr context_, LoggerPtr log_)
         : ISource(getSingleValueBlock(0))
         , databases(databases_)
         , context(context_)
@@ -157,7 +158,7 @@ public:
     {
     }
 
-    TableCheckSource(std::shared_ptr<TableCheckTask> table_check_task_, Poco::Logger * log_)
+    TableCheckSource(std::shared_ptr<TableCheckTask> table_check_task_, LoggerPtr log_)
         : ISource(getSingleValueBlock(0))
         , table_check_task(table_check_task_)
         , log(log_)
@@ -260,14 +261,14 @@ private:
 
     ContextPtr context;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 /// Receives TableCheckTask and returns CheckResult converted to sinle-row chunk
 class TableCheckWorkerProcessor : public ISimpleTransform
 {
 public:
-    TableCheckWorkerProcessor(bool with_table_name_, Poco::Logger * log_)
+    TableCheckWorkerProcessor(bool with_table_name_, LoggerPtr log_)
         : ISimpleTransform(getSingleValueBlock(0), getHeaderForCheckResult(with_table_name_), true)
         , with_table_name(with_table_name_)
         , log(log_)
@@ -308,7 +309,7 @@ private:
     /// If true, then output will contain columns with database and table names
     bool with_table_name;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 /// Accumulates all results and returns single value
diff --git a/src/Interpreters/InterpreterCheckQuery.h b/src/Interpreters/InterpreterCheckQuery.h
index 5ffd1d4298f..4bba3ed780c 100644
--- a/src/Interpreters/InterpreterCheckQuery.h
+++ b/src/Interpreters/InterpreterCheckQuery.h
@@ -19,7 +19,7 @@ public:
 private:
     ASTPtr query_ptr;
 
-    Poco::Logger * log = &Poco::Logger::get("InterpreterCheckQuery");
+    LoggerPtr log = getLogger("InterpreterCheckQuery");
 };
 
 }
diff --git a/src/Interpreters/InterpreterCreateFunctionQuery.cpp b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
index 18e9ba4a64b..3f4a03c3497 100644
--- a/src/Interpreters/InterpreterCreateFunctionQuery.cpp
+++ b/src/Interpreters/InterpreterCreateFunctionQuery.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
 
 BlockIO InterpreterCreateFunctionQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
     const auto updated_query_ptr = removeOnClusterClauseIfNeeded(query_ptr, getContext());
     ASTCreateFunctionQuery & create_function_query = updated_query_ptr->as<ASTCreateFunctionQuery &>();
 
diff --git a/src/Interpreters/InterpreterCreateIndexQuery.cpp b/src/Interpreters/InterpreterCreateIndexQuery.cpp
index cd2f996c74c..a439cb672c8 100644
--- a/src/Interpreters/InterpreterCreateIndexQuery.cpp
+++ b/src/Interpreters/InterpreterCreateIndexQuery.cpp
@@ -1,10 +1,11 @@
-#include <Interpreters/InterpreterFactory.h>
-#include <Interpreters/InterpreterCreateIndexQuery.h>
 
 #include <Access/ContextAccess.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Interpreters/InterpreterFactory.h>
+#include <Interpreters/InterpreterCreateIndexQuery.h>
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Parsers/ASTCreateIndexQuery.h>
 #include <Parsers/ASTIdentifier.h>
@@ -24,7 +25,7 @@ namespace ErrorCodes
 
 BlockIO InterpreterCreateIndexQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
     auto current_context = getContext();
     const auto & create_index = query_ptr->as<ASTCreateIndexQuery &>();
 
@@ -38,12 +39,12 @@ BlockIO InterpreterCreateIndexQuery::execute()
 
     }
     // Noop if allow_create_index_without_type = true. throw otherwise
-    if (!create_index.index_decl->as<ASTIndexDeclaration>()->type)
+    if (!create_index.index_decl->as<ASTIndexDeclaration>()->getType())
     {
         if (!current_context->getSettingsRef().allow_create_index_without_type)
         {
             throw Exception(ErrorCodes::INCORRECT_QUERY, "CREATE INDEX without TYPE is forbidden."
-                " SET allow_create_index_without_type=1 to ignore this statements.");
+                " SET allow_create_index_without_type=1 to ignore this statements");
         }
         else
         {
diff --git a/src/Interpreters/InterpreterCreateQuery.cpp b/src/Interpreters/InterpreterCreateQuery.cpp
index 36e864ace26..c0da510a68b 100644
--- a/src/Interpreters/InterpreterCreateQuery.cpp
+++ b/src/Interpreters/InterpreterCreateQuery.cpp
@@ -2,6 +2,9 @@
 
 #include <filesystem>
 
+#include <Access/AccessControl.h>
+#include <Access/User.h>
+
 #include "Common/Exception.h"
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/escapeForFileName.h>
@@ -11,6 +14,8 @@
 #include <Common/atomicRename.h>
 #include <Common/PoolId.h>
 #include <Common/logger_useful.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 #include <base/hex.h>
 
 #include <Core/Defines.h>
@@ -33,7 +38,6 @@
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/WindowView/StorageWindowView.h>
 #include <Storages/StorageReplicatedMergeTree.h>
-#include <Storages/BlockNumberColumn.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
@@ -48,6 +52,7 @@
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
 #include <Interpreters/GinFilter.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 
 #include <Access/Common/AccessRightsElement.h>
 
@@ -80,7 +85,8 @@
 
 #include <Functions/UserDefined/UserDefinedSQLFunctionFactory.h>
 #include <Functions/UserDefined/UserDefinedSQLFunctionVisitor.h>
-
+#include <Interpreters/ReplaceQueryParameterVisitor.h>
+#include <Parsers/QueryParameterVisitor.h>
 
 namespace DB
 {
@@ -96,7 +102,6 @@ namespace ErrorCodes
     extern const int DATABASE_ALREADY_EXISTS;
     extern const int BAD_ARGUMENTS;
     extern const int BAD_DATABASE_FOR_TEMPORARY_TABLE;
-    extern const int SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY;
     extern const int ILLEGAL_SYNTAX_FOR_DATA_TYPE;
     extern const int ILLEGAL_COLUMN;
     extern const int ILLEGAL_INDEX;
@@ -273,7 +278,7 @@ BlockIO InterpreterCreateQuery::createDatabase(ASTCreateQuery & create)
 
     bool need_write_metadata = !create.attach || !fs::exists(metadata_file_path);
     bool need_lock_uuid = internal || need_write_metadata;
-    auto mode = getLoadingStrictnessLevel(create.attach, force_attach, has_force_restore_data_flag);
+    auto mode = getLoadingStrictnessLevel(create.attach, force_attach, has_force_restore_data_flag, /*secondary*/ false);
 
     /// Lock uuid, so we will known it's already in use.
     /// We do it when attaching databases on server startup (internal) and on CREATE query (!create.attach);
@@ -376,7 +381,7 @@ ASTPtr InterpreterCreateQuery::formatColumns(const NamesAndTypesList & columns)
         String type_name = column.type->getName();
         const char * pos = type_name.data();
         const char * end = pos + type_name.size();
-        column_declaration->type = parseQuery(type_parser, pos, end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        column_declaration->type = parseQuery(type_parser, pos, end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
         columns_list->children.emplace_back(column_declaration);
     }
 
@@ -396,7 +401,7 @@ ASTPtr InterpreterCreateQuery::formatColumns(const NamesAndTypesList & columns,
         String type_name = alias_column.type->getName();
         const char * type_pos = type_name.data();
         const char * type_end = type_pos + type_name.size();
-        column_declaration->type = parseQuery(type_parser, type_pos, type_end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        column_declaration->type = parseQuery(type_parser, type_pos, type_end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         column_declaration->default_specifier = "ALIAS";
 
@@ -404,7 +409,7 @@ ASTPtr InterpreterCreateQuery::formatColumns(const NamesAndTypesList & columns,
         const char * alias_pos = alias.data();
         const char * alias_end = alias_pos + alias.size();
         ParserExpression expression_parser;
-        column_declaration->default_expression = parseQuery(expression_parser, alias_pos, alias_end, "expression", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        column_declaration->default_expression = parseQuery(expression_parser, alias_pos, alias_end, "expression", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
         column_declaration->children.push_back(column_declaration->default_expression);
 
         columns_list->children.emplace_back(column_declaration);
@@ -428,7 +433,7 @@ ASTPtr InterpreterCreateQuery::formatColumns(const ColumnsDescription & columns)
         String type_name = column.type->getName();
         const char * type_name_pos = type_name.data();
         const char * type_name_end = type_name_pos + type_name.size();
-        column_declaration->type = parseQuery(type_parser, type_name_pos, type_name_end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        column_declaration->type = parseQuery(type_parser, type_name_pos, type_name_end, "data type", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         if (column.default_desc.expression)
         {
@@ -463,6 +468,14 @@ ASTPtr InterpreterCreateQuery::formatColumns(const ColumnsDescription & columns)
             column_declaration->children.push_back(column_declaration->ttl);
         }
 
+        if (!column.settings.empty())
+        {
+            auto settings = std::make_shared<ASTSetQuery>();
+            settings->is_standalone = false;
+            settings->changes = column.settings;
+            column_declaration->settings = std::move(settings);
+        }
+
         columns_list->children.push_back(column_declaration_ptr);
     }
 
@@ -500,7 +513,7 @@ ASTPtr InterpreterCreateQuery::formatProjections(const ProjectionsDescription &
 }
 
 ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
-    const ASTExpressionList & columns_ast, ContextPtr context_, bool attach, bool is_restore_from_backup)
+    const ASTExpressionList & columns_ast, ContextPtr context_, LoadingStrictnessLevel mode)
 {
     /// First, deduce implicit types.
 
@@ -509,7 +522,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
 
     ASTPtr default_expr_list = std::make_shared<ASTExpressionList>();
     NamesAndTypesList column_names_and_types;
-    bool make_columns_nullable = !attach && !is_restore_from_backup && context_->getSettingsRef().data_type_default_nullable;
+    bool make_columns_nullable = mode <= LoadingStrictnessLevel::CREATE && context_->getSettingsRef().data_type_default_nullable;
 
     for (const auto & ast : columns_ast.children)
     {
@@ -525,7 +538,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
         {
             column_type = DataTypeFactory::instance().get(col_decl.type);
 
-            if (attach)
+            if (LoadingStrictnessLevel::ATTACH <= mode)
                 setVersionToAggregateFunctions(column_type, true);
 
             if (col_decl.null_modifier)
@@ -593,10 +606,11 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
     if (!default_expr_list->children.empty())
         defaults_sample_block = validateColumnsDefaultsAndGetSampleBlock(default_expr_list, column_names_and_types, context_);
 
-    bool sanity_check_compression_codecs = !attach && !context_->getSettingsRef().allow_suspicious_codecs;
-    bool allow_experimental_codecs = attach || context_->getSettingsRef().allow_experimental_codecs;
-    bool enable_deflate_qpl_codec = attach || context_->getSettingsRef().enable_deflate_qpl_codec;
-    bool enable_zstd_qat_codec = attach || context_->getSettingsRef().enable_zstd_qat_codec;
+    bool skip_checks = LoadingStrictnessLevel::SECONDARY_CREATE <= mode;
+    bool sanity_check_compression_codecs = !skip_checks && !context_->getSettingsRef().allow_suspicious_codecs;
+    bool allow_experimental_codecs = skip_checks || context_->getSettingsRef().allow_experimental_codecs;
+    bool enable_deflate_qpl_codec = skip_checks || context_->getSettingsRef().enable_deflate_qpl_codec;
+    bool enable_zstd_qat_codec = skip_checks || context_->getSettingsRef().enable_zstd_qat_codec;
 
     ColumnsDescription res;
     auto name_type_it = column_names_and_types.begin();
@@ -662,7 +676,7 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
 
         if (col_decl.stat_type)
         {
-            if (!attach && !context_->getSettingsRef().allow_experimental_statistic)
+            if (!skip_checks && !context_->getSettingsRef().allow_experimental_statistic)
                  throw Exception(ErrorCodes::INCORRECT_QUERY, "Create table with statistic is now disabled. Turn on allow_experimental_statistic");
             column.stat = StatisticDescription::getStatisticFromColumnDeclaration(col_decl);
         }
@@ -670,12 +684,19 @@ ColumnsDescription InterpreterCreateQuery::getColumnsDescription(
         if (col_decl.ttl)
             column.ttl = col_decl.ttl;
 
+        if (col_decl.settings)
+        {
+            column.settings = col_decl.settings->as<ASTSetQuery &>().changes;
+            MergeTreeColumnSettings::validate(column.settings);
+        }
+
         res.add(std::move(column));
     }
 
-    if (!attach && !is_restore_from_backup && context_->getSettingsRef().flatten_nested)
+    if (mode <= LoadingStrictnessLevel::CREATE && context_->getSettingsRef().flatten_nested)
         res.flattenNested();
 
+
     if (res.getAllPhysical().empty())
         throw Exception(ErrorCodes::EMPTY_LIST_OF_COLUMNS_PASSED, "Cannot CREATE table without physical columns");
 
@@ -694,13 +715,14 @@ ConstraintsDescription InterpreterCreateQuery::getConstraintsDescription(const A
 }
 
 
-InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create) const
+InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTablePropertiesAndNormalizeCreateQuery(
+    ASTCreateQuery & create, LoadingStrictnessLevel mode) const
 {
     /// Set the table engine if it was not specified explicitly.
     setEngine(create);
 
     /// We have to check access rights again (in case engine was changed).
-    if (create.storage)
+    if (create.storage && create.storage->engine)
     {
         auto source_access_type = StorageFactory::instance().getSourceAccessType(create.storage->engine->name);
         if (source_access_type != AccessType::NONE)
@@ -720,7 +742,7 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
 
         if (create.columns_list->columns)
         {
-            properties.columns = getColumnsDescription(*create.columns_list->columns, getContext(), create.attach, is_restore_from_backup);
+            properties.columns = getColumnsDescription(*create.columns_list->columns, getContext(), mode);
         }
 
         if (create.columns_list->indices)
@@ -780,6 +802,9 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
     }
     else if (create.select)
     {
+        if (create.isParameterizedView())
+            return properties;
+
         Block as_select_sample;
 
         if (getContext()->getSettingsRef().allow_experimental_analyzer)
@@ -788,28 +813,7 @@ InterpreterCreateQuery::TableProperties InterpreterCreateQuery::getTableProperti
         }
         else
         {
-            /** To get valid sample block we need to prepare query without only_analyze, because we need to execute scalar
-              * subqueries. Otherwise functions that expect only constant arguments will throw error during query analysis,
-              * because the result of scalar subquery is not a constant.
-              *
-              * Example:
-              * CREATE MATERIALIZED VIEW test_mv ENGINE=MergeTree ORDER BY arr
-              * AS
-              * WITH (SELECT '\d[a-z]') AS constant_value
-              * SELECT extractAll(concat(toString(number), 'a'), assumeNotNull(constant_value)) AS arr
-              * FROM test_table;
-              *
-              * For new analyzer this issue does not exists because we always execute scalar subqueries.
-              * We can improve this in new analyzer, and execute scalar subqueries only in contexts when we expect constant
-              * for example: LIMIT, OFFSET, functions parameters, functions constant only arguments.
-              */
-
-            SelectQueryOptions options;
-            if (create.isParameterizedView())
-                options = options.createParameterizedView();
-
-            InterpreterSelectWithUnionQuery interpreter(create.select->clone(), getContext(), options);
-            as_select_sample = interpreter.getSampleBlock();
+            as_select_sample = InterpreterSelectWithUnionQuery::getSampleBlock(create.select->clone(), getContext());
         }
 
         properties.columns = ColumnsDescription(as_select_sample.getNamesAndTypesList());
@@ -874,78 +878,35 @@ void InterpreterCreateQuery::validateTableStructure(const ASTCreateQuery & creat
             throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Column {} already exists", backQuoteIfNeed(column.name));
     }
 
-    /// Check if _row_exists for lightweight delete column in column_lists for merge tree family.
-    if (create.storage && create.storage->engine && endsWith(create.storage->engine->name, "MergeTree"))
-    {
-        auto search = all_columns.find(LightweightDeleteDescription::FILTER_COLUMN.name);
-        if (search != all_columns.end())
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                            "Cannot create table with column '{}' for *MergeTree engines because it "
-                            "is reserved for lightweight delete feature",
-                            LightweightDeleteDescription::FILTER_COLUMN.name);
-
-        auto search_block_number = all_columns.find(BlockNumberColumn::name);
-        if (search_block_number != all_columns.end())
-            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                            "Cannot create table with column '{}' for *MergeTree engines because it "
-                            "is reserved for storing block number",
-                            BlockNumberColumn::name);
-    }
-
     const auto & settings = getContext()->getSettingsRef();
 
-    /// Check low cardinality types in creating table if it was not allowed in setting
-    if (!create.attach && !settings.allow_suspicious_low_cardinality_types && !create.is_materialized_view)
+    /// If it's not attach and not materialized view to existing table,
+    /// we need to validate data types (check for experimental or suspicious types).
+    if (!create.attach && !create.is_materialized_view)
     {
+        DataTypeValidationSettings validation_settings(settings);
         for (const auto & name_and_type_pair : properties.columns.getAllPhysical())
-        {
-            if (const auto * current_type_ptr = typeid_cast<const DataTypeLowCardinality *>(name_and_type_pair.type.get()))
-            {
-                if (!isStringOrFixedString(*removeNullable(current_type_ptr->getDictionaryType())))
-                    throw Exception(ErrorCodes::SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY,
-                                    "Creating columns of type {} is prohibited by default "
-                                    "due to expected negative impact on performance. "
-                                    "It can be enabled with the \"allow_suspicious_low_cardinality_types\" setting.",
-                                    current_type_ptr->getName());
-            }
-        }
+            validateDataType(name_and_type_pair.type, validation_settings);
     }
+}
 
-    if (!create.attach && !settings.allow_experimental_object_type)
+void validateVirtualColumns(const IStorage & storage)
+{
+    auto virtual_columns = storage.getVirtualsPtr();
+    for (const auto & storage_column : storage.getInMemoryMetadataPtr()->getColumns())
     {
-        for (const auto & [name, type] : properties.columns.getAllPhysical())
+        if (virtual_columns->tryGet(storage_column.name, VirtualsKind::Persistent))
         {
-            if (type->hasDynamicSubcolumns())
-            {
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create table with column '{}' which type is '{}' "
-                    "because experimental Object type is not allowed. "
-                    "Set setting allow_experimental_object_type = 1 in order to allow it",
-                    name, type->getName());
-            }
-        }
-    }
-    if (!create.attach && !settings.allow_suspicious_fixed_string_types)
-    {
-        for (const auto & [name, type] : properties.columns.getAllPhysical())
-        {
-            auto basic_type = removeLowCardinalityAndNullable(type);
-            if (const auto * fixed_string = typeid_cast<const DataTypeFixedString *>(basic_type.get()))
-            {
-                if (fixed_string->getN() > MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS)
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-                        "Cannot create table with column '{}' which type is '{}' "
-                        "because fixed string with size > {} is suspicious. "
-                        "Set setting allow_suspicious_fixed_string_types = 1 in order to allow it",
-                        name, type->getName(), MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS);
-            }
+            throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                "Cannot create table with column '{}' for {} engines because it is reserved for persistent virtual column",
+                storage_column.name, storage.getName());
         }
     }
 }
 
 namespace
 {
-    void checkTemporaryTableEngineName(const String& name)
+    void checkTemporaryTableEngineName(const String & name)
     {
         if (name.starts_with("Replicated") || name.starts_with("Shared") || name == "KeeperMap")
             throw Exception(ErrorCodes::INCORRECT_QUERY, "Temporary tables cannot be created with Replicated, Shared or KeeperMap table engines");
@@ -1046,15 +1007,22 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
 {
     const auto * kind = create.is_dictionary ? "Dictionary" : "Table";
     const auto * kind_upper = create.is_dictionary ? "DICTIONARY" : "TABLE";
+    bool is_replicated_database_internal = database->getEngineName() == "Replicated" && getContext()->getClientInfo().is_replicated_database_internal;
+    bool from_path = create.attach_from_path.has_value();
+    bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
 
-    if (database->getEngineName() == "Replicated" && getContext()->getClientInfo().is_replicated_database_internal
-        && !internal)
+    if (is_replicated_database_internal && !internal)
     {
         if (create.uuid == UUIDHelpers::Nil)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Table UUID is not specified in DDL log");
     }
 
-    bool from_path = create.attach_from_path.has_value();
+    if (create.refresh_strategy && database->getEngineName() != "Atomic")
+        throw Exception(ErrorCodes::INCORRECT_QUERY,
+            "Refreshable materialized view requires Atomic database engine, but database {} has engine {}", create.getDatabase(), database->getEngineName());
+            /// TODO: Support Replicated databases, only with Shared/ReplicatedMergeTree.
+            ///       Figure out how to make the refreshed data appear all at once on other
+            ///       replicas; maybe a replicated SYSTEM SYNC REPLICA query before the rename?
 
     if (database->getUUID() != UUIDHelpers::Nil)
     {
@@ -1078,7 +1046,6 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
     }
     else
     {
-        bool is_on_cluster = getContext()->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY;
         bool has_uuid = create.uuid != UUIDHelpers::Nil || create.to_inner_uuid != UUIDHelpers::Nil;
         if (has_uuid && !is_on_cluster && !internal)
         {
@@ -1091,13 +1058,6 @@ void InterpreterCreateQuery::assertOrSetUUID(ASTCreateQuery & create, const Data
                             "{} UUID specified, but engine of database {} is not Atomic", kind, create.getDatabase());
         }
 
-        if (create.refresh_strategy && database->getEngineName() != "Atomic")
-            throw Exception(ErrorCodes::INCORRECT_QUERY,
-                "Refreshable materialized view requires Atomic database engine, but database {} has engine {}", create.getDatabase(), database->getEngineName());
-                /// TODO: Support Replicated databases, only with Shared/ReplicatedMergeTree.
-                ///       Figure out how to make the refreshed data appear all at once on other
-                ///       replicas; maybe a replicated SYSTEM SYNC REPLICA query before the rename?
-
         /// The database doesn't support UUID so we'll ignore it. The UUID could be set here because of either
         /// a) the initiator of `ON CLUSTER` query generated it to ensure the same UUIDs are used on different hosts; or
         /// b) `RESTORE from backup` query generated it to ensure the same UUIDs are used on different hosts.
@@ -1118,13 +1078,20 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     String current_database = getContext()->getCurrentDatabase();
     auto database_name = create.database ? create.getDatabase() : current_database;
 
+    if (!create.sql_security && !getContext()->getServerSettings().ignore_empty_sql_security_in_create_view_query)
+        create.sql_security = std::make_shared<ASTSQLSecurity>();
+
+    if (create.sql_security)
+        processSQLSecurityOption(getContext(), create.sql_security->as<ASTSQLSecurity &>(), create.attach, create.is_materialized_view);
+
     DDLGuardPtr ddl_guard;
 
     // If this is a stub ATTACH query, read the query definition from the database
     if (create.attach && !create.storage && !create.columns_list)
     {
-        auto database = DatabaseCatalog::instance().getDatabase(database_name);
-        if (database->shouldReplicateQuery(getContext(), query_ptr))
+        // In case of an ON CLUSTER query, the database may not be present on the initiator node
+        auto database = DatabaseCatalog::instance().tryGetDatabase(database_name);
+        if (database && database->shouldReplicateQuery(getContext(), query_ptr))
         {
             auto guard = DatabaseCatalog::instance().getDDLGuard(database_name, create.getTable());
             create.setDatabase(database_name);
@@ -1135,6 +1102,9 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
         if (!create.cluster.empty())
             return executeQueryOnCluster(create);
 
+        if (!database)
+            throw Exception(ErrorCodes::UNKNOWN_DATABASE, "Database {} does not exist", backQuoteIfNeed(database_name));
+
         /// For short syntax of ATTACH query we have to lock table name here, before reading metadata
         /// and hold it until table is attached
         if (likely(need_ddl_guard))
@@ -1144,7 +1114,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
         // Table SQL definition is available even if the table is detached (even permanently)
         auto query = database->getCreateTableQuery(create.getTable(), getContext());
-        FunctionNameNormalizer().visit(query.get());
+        FunctionNameNormalizer::visit(query.get());
         auto create_query = query->as<ASTCreateQuery &>();
 
         if (!create.is_dictionary && create_query.is_dictionary)
@@ -1198,7 +1168,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     }
     else if (create.attach && !create.attach_short_syntax && getContext()->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY)
     {
-        auto * log = &Poco::Logger::get("InterpreterCreateQuery");
+        auto log = getLogger("InterpreterCreateQuery");
         LOG_WARNING(log, "ATTACH TABLE query with full table definition is not recommended: "
                          "use either ATTACH TABLE {}; to attach existing table "
                          "or CREATE TABLE {} <table definition>; to create new table "
@@ -1214,7 +1184,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (create.select && create.isView())
     {
         // Expand CTE before filling default database
-        ApplyWithSubqueryVisitor().visit(*create.select);
+        ApplyWithSubqueryVisitor::visit(*create.select);
         AddDefaultDatabaseVisitor visitor(getContext(), current_database);
         visitor.visit(*create.select);
     }
@@ -1239,11 +1209,14 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (!UserDefinedSQLFunctionFactory::instance().empty())
         UserDefinedSQLFunctionVisitor::visit(query_ptr);
 
+    bool is_secondary_query = getContext()->getZooKeeperMetadataTransaction() && !getContext()->getZooKeeperMetadataTransaction()->isInitialQuery();
+    auto mode = getLoadingStrictnessLevel(create.attach, /*force_attach*/ false, /*has_force_restore_data_flag*/ false, is_secondary_query || is_restore_from_backup);
+
     /// Set and retrieve list of columns, indices and constraints. Set table engine if needed. Rewrite query in canonical way.
-    TableProperties properties = getTablePropertiesAndNormalizeCreateQuery(create);
+    TableProperties properties = getTablePropertiesAndNormalizeCreateQuery(create, mode);
 
     /// Check type compatible for materialized dest table and select columns
-    if (create.select && create.is_materialized_view && create.to_table_id && !create.attach && !is_restore_from_backup)
+    if (create.select && create.is_materialized_view && create.to_table_id && mode <= LoadingStrictnessLevel::CREATE)
     {
         if (StoragePtr to_table = DatabaseCatalog::instance().tryGetTable(
             {create.to_table_id.database_name, create.to_table_id.table_name, create.to_table_id.uuid},
@@ -1260,7 +1233,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
             {
                 input_block = InterpreterSelectWithUnionQuery(create.select->clone(),
                     getContext(),
-                    {}).getSampleBlock();
+                    SelectQueryOptions().analyze()).getSampleBlock();
             }
 
             Block output_block = to_table->getInMemoryMetadataPtr()->getSampleBlock();
@@ -1286,6 +1259,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
     DatabasePtr database;
     bool need_add_to_database = !create.temporary;
+    // In case of an ON CLUSTER query, the database may not be present on the initiator node
     if (need_add_to_database)
         database = DatabaseCatalog::instance().tryGetDatabase(database_name);
 
@@ -1306,7 +1280,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
                 "CREATE AS SELECT is not supported with Replicated databases. Use separate CREATE and INSERT queries");
     }
 
-    if (need_add_to_database && database && database->shouldReplicateQuery(getContext(), query_ptr))
+    if (database && database->shouldReplicateQuery(getContext(), query_ptr))
     {
         chassert(!ddl_guard);
         auto guard = DatabaseCatalog::instance().getDDLGuard(create.getDatabase(), create.getTable());
@@ -1327,11 +1301,11 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
     if (create.replace_table)
     {
         chassert(!ddl_guard);
-        return doCreateOrReplaceTable(create, properties);
+        return doCreateOrReplaceTable(create, properties, mode);
     }
 
     /// Actually creates table
-    bool created = doCreateTable(create, properties, ddl_guard);
+    bool created = doCreateTable(create, properties, ddl_guard, mode);
     ddl_guard.reset();
 
     if (!created)   /// Table already exists
@@ -1348,7 +1322,7 @@ BlockIO InterpreterCreateQuery::createTable(ASTCreateQuery & create)
 
 bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                                            const InterpreterCreateQuery::TableProperties & properties,
-                                           DDLGuardPtr & ddl_guard)
+                                           DDLGuardPtr & ddl_guard, LoadingStrictnessLevel mode)
 {
     if (create.temporary)
     {
@@ -1366,7 +1340,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
                 getContext()->getGlobalContext(),
                 properties.columns,
                 properties.constraints,
-                false);
+                mode);
         };
         auto temporary_table = TemporaryTableHolder(getContext(), creator, query_ptr);
 
@@ -1405,8 +1379,14 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
             interpreter.execute();
         }
         else
-            throw Exception(storage_already_exists_error_code,
-                "{} {}.{} already exists", storage_name, backQuoteIfNeed(create.getDatabase()), backQuoteIfNeed(create.getTable()));
+        {
+            if (database->getTable(create.getTable(), getContext())->isDictionary())
+                throw Exception(ErrorCodes::DICTIONARY_ALREADY_EXISTS,
+                                "Dictionary {}.{} already exists", backQuoteIfNeed(create.getDatabase()), backQuoteIfNeed(create.getTable()));
+            else
+                throw Exception(ErrorCodes::TABLE_ALREADY_EXISTS,
+                                "Table {}.{} already exists", backQuoteIfNeed(create.getDatabase()), backQuoteIfNeed(create.getTable()));
+        }
     }
     else if (!create.attach)
     {
@@ -1439,7 +1419,7 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
             /// so the existing directory probably contains some leftovers from previous unsuccessful attempts to create the table
 
             fs::path trash_path = fs::path{getContext()->getPath()} / "trash" / data_path / getHexUIntLowercase(thread_local_rng());
-            LOG_WARNING(&Poco::Logger::get("InterpreterCreateQuery"), "Directory for {} data {} already exists. Will move it to {}",
+            LOG_WARNING(getLogger("InterpreterCreateQuery"), "Directory for {} data {} already exists. Will move it to {}",
                         Poco::toLower(storage_name), String(data_path), trash_path);
             fs::create_directories(trash_path.parent_path());
             renameNoReplace(full_data_path, trash_path);
@@ -1508,12 +1488,22 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
             getContext()->getGlobalContext(),
             properties.columns,
             properties.constraints,
-            false);
+            mode);
 
         /// If schema wes inferred while storage creation, add columns description to create query.
         addColumnsDescriptionToCreateQueryIfNecessary(query_ptr->as<ASTCreateQuery &>(), res);
     }
 
+    validateVirtualColumns(*res);
+
+    if (!res->supportsDynamicSubcolumns() && hasDynamicSubcolumns(res->getInMemoryMetadataPtr()->getColumns()))
+    {
+        throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+            "Cannot create table with column of type Object, "
+            "because storage {} doesn't support dynamic subcolumns",
+            res->getName());
+    }
+
     if (!create.attach && getContext()->getSettingsRef().database_replicated_allow_only_replicated_engine)
     {
         bool is_replicated_storage = typeid_cast<const StorageReplicatedMergeTree *>(res.get()) != nullptr;
@@ -1563,21 +1553,13 @@ bool InterpreterCreateQuery::doCreateTable(ASTCreateQuery & create,
     /// we can safely destroy the object without a call to "shutdown", because there is guarantee
     /// that no background threads/similar resources remain after exception from "startup".
 
-    if (!res->supportsDynamicSubcolumns() && hasDynamicSubcolumns(res->getInMemoryMetadataPtr()->getColumns()))
-    {
-        throw Exception(ErrorCodes::ILLEGAL_COLUMN,
-            "Cannot create table with column of type Object, "
-            "because storage {} doesn't support dynamic subcolumns",
-            res->getName());
-    }
-
     res->startup();
     return true;
 }
 
 
 BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
-                                                       const InterpreterCreateQuery::TableProperties & properties)
+                                                       const InterpreterCreateQuery::TableProperties & properties, LoadingStrictnessLevel mode)
 {
     /// Replicated database requires separate contexts for each DDL query
     ContextPtr current_context = getContext();
@@ -1627,7 +1609,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
     {
         /// Create temporary table (random name will be generated)
         DDLGuardPtr ddl_guard;
-        [[maybe_unused]] bool done = InterpreterCreateQuery(query_ptr, create_context).doCreateTable(create, properties, ddl_guard);
+        [[maybe_unused]] bool done = InterpreterCreateQuery(query_ptr, create_context).doCreateTable(create, properties, ddl_guard, mode);
         ddl_guard.reset();
         assert(done);
         created = true;
@@ -1637,7 +1619,6 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
         executeTrivialBlockIO(fill_io, getContext());
 
         /// Replace target table with created one
-        auto ast_rename = std::make_shared<ASTRenameQuery>();
         ASTRenameQuery::Element elem
         {
             ASTRenameQuery::Table
@@ -1652,7 +1633,7 @@ BlockIO InterpreterCreateQuery::doCreateOrReplaceTable(ASTCreateQuery & create,
             }
         };
 
-        ast_rename->elements.push_back(std::move(elem));
+        auto ast_rename = std::make_shared<ASTRenameQuery>(ASTRenameQuery::Elements{std::move(elem)});
         ast_rename->dictionary = create.is_dictionary;
         if (create.create_or_replace)
         {
@@ -1782,7 +1763,7 @@ BlockIO InterpreterCreateQuery::executeQueryOnCluster(ASTCreateQuery & create)
 
 BlockIO InterpreterCreateQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
     auto & create = query_ptr->as<ASTCreateQuery &>();
 
     bool is_create_database = create.database && !create.table;
@@ -1878,10 +1859,12 @@ void InterpreterCreateQuery::addColumnsDescriptionToCreateQueryIfNecessary(ASTCr
 
     auto ast_storage = std::make_shared<ASTStorage>();
     unsigned max_parser_depth = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_depth);
+    unsigned max_parser_backtracks = static_cast<unsigned>(getContext()->getSettingsRef().max_parser_backtracks);
     auto query_from_storage = DB::getCreateQueryFromStorage(storage,
                                                             ast_storage,
                                                             false,
                                                             max_parser_depth,
+                                                            max_parser_backtracks,
                                                             true);
     auto & create_query_from_storage = query_from_storage->as<ASTCreateQuery &>();
 
@@ -1897,6 +1880,61 @@ void InterpreterCreateQuery::addColumnsDescriptionToCreateQueryIfNecessary(ASTCr
     }
 }
 
+void InterpreterCreateQuery::processSQLSecurityOption(ContextPtr context_, ASTSQLSecurity & sql_security, bool is_attach, bool is_materialized_view)
+{
+    /// If no SQL security is specified, apply default from default_*_view_sql_security setting.
+    if (!sql_security.type)
+    {
+        SQLSecurityType default_security;
+
+        if (is_materialized_view)
+            default_security = context_->getSettingsRef().default_materialized_view_sql_security;
+        else
+            default_security = context_->getSettingsRef().default_normal_view_sql_security;
+
+        if (default_security == SQLSecurityType::DEFINER)
+        {
+            String default_definer = context_->getSettingsRef().default_view_definer;
+            if (default_definer == "CURRENT_USER")
+                sql_security.is_definer_current_user = true;
+            else
+                sql_security.definer = std::make_shared<ASTUserNameWithHost>(default_definer);
+        }
+
+        sql_security.type = default_security;
+    }
+
+    /// Resolves `DEFINER = CURRENT_USER`. Can change the SQL security type if we try to resolve the user during the attachment.
+    const auto current_user_name = context_->getUserName();
+    if (sql_security.is_definer_current_user)
+    {
+        if (current_user_name.empty())
+            /// This can happen only when attaching a view for the first time after migration and with `CURRENT_USER` default.
+            if (is_materialized_view)
+                sql_security.type = SQLSecurityType::NONE;
+            else
+                sql_security.type = SQLSecurityType::INVOKER;
+        else if (sql_security.definer)
+            sql_security.definer->replace(current_user_name);
+        else
+            sql_security.definer = std::make_shared<ASTUserNameWithHost>(current_user_name);
+    }
+
+    /// Checks the permissions for the specified definer user.
+    if (sql_security.definer && !sql_security.is_definer_current_user && !is_attach)
+    {
+        const auto definer_name = sql_security.definer->toString();
+
+        /// Validate that the user exists.
+        context_->getAccessControl().getID<User>(definer_name);
+        if (definer_name != current_user_name)
+            context_->checkAccess(AccessType::SET_DEFINER, definer_name);
+    }
+
+    if (sql_security.type == SQLSecurityType::NONE && !is_attach)
+        context_->checkAccess(AccessType::ALLOW_SQL_SECURITY_NONE);
+}
+
 void registerInterpreterCreateQuery(InterpreterFactory & factory)
 {
     auto create_fn = [] (const InterpreterFactory::Arguments & args)
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index 0843a7ad15a..71bdeda05df 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -3,6 +3,7 @@
 #include <Core/NamesAndAliases.h>
 #include <Core/SettingsEnums.h>
 #include <Access/Common/AccessRightsElement.h>
+#include <Databases/LoadingStrictnessLevel.h>
 #include <Interpreters/IInterpreter.h>
 #include <Storages/ColumnsDescription.h>
 #include <Storages/ConstraintsDescription.h>
@@ -73,13 +74,16 @@ public:
 
     /// 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, bool is_restore_from_backup);
+    static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, ContextPtr context, LoadingStrictnessLevel mode);
     static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);
 
     static void prepareOnClusterQuery(ASTCreateQuery & create, ContextPtr context, const String & cluster_name);
 
     void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const override;
 
+    /// Check access right, validate definer statement and replace `CURRENT USER` with actual name.
+    static void processSQLSecurityOption(ContextPtr context_, ASTSQLSecurity & sql_security, bool is_attach = false, bool is_materialized_view = false);
+
 private:
     struct TableProperties
     {
@@ -93,14 +97,14 @@ private:
     BlockIO createTable(ASTCreateQuery & create);
 
     /// Calculate list of columns, constraints, indices, etc... of table. Rewrite query in canonical way.
-    TableProperties getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create) const;
+    TableProperties getTablePropertiesAndNormalizeCreateQuery(ASTCreateQuery & create, LoadingStrictnessLevel mode) const;
     void validateTableStructure(const ASTCreateQuery & create, const TableProperties & properties) const;
     void setEngine(ASTCreateQuery & create) const;
     AccessRightsElements getRequiredAccess() const;
 
     /// Create IStorage and add it to database. If table already exists and IF NOT EXISTS specified, do nothing and return false.
-    bool doCreateTable(ASTCreateQuery & create, const TableProperties & properties, DDLGuardPtr & ddl_guard);
-    BlockIO doCreateOrReplaceTable(ASTCreateQuery & create, const InterpreterCreateQuery::TableProperties & properties);
+    bool doCreateTable(ASTCreateQuery & create, const TableProperties & properties, DDLGuardPtr & ddl_guard, LoadingStrictnessLevel mode);
+    BlockIO doCreateOrReplaceTable(ASTCreateQuery & create, const InterpreterCreateQuery::TableProperties & properties, LoadingStrictnessLevel mode);
     /// Inserts data in created table if it's CREATE ... SELECT
     BlockIO fillTableIfNeeded(const ASTCreateQuery & create);
 
diff --git a/src/Interpreters/InterpreterDeleteQuery.cpp b/src/Interpreters/InterpreterDeleteQuery.cpp
index 5c13a1145d1..ee774994145 100644
--- a/src/Interpreters/InterpreterDeleteQuery.cpp
+++ b/src/Interpreters/InterpreterDeleteQuery.cpp
@@ -15,7 +15,6 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
 #include <Storages/MutationCommands.h>
-#include <Storages/LightweightDeleteDescription.h>
 
 
 namespace DB
@@ -36,7 +35,7 @@ InterpreterDeleteQuery::InterpreterDeleteQuery(const ASTPtr & query_ptr_, Contex
 
 BlockIO InterpreterDeleteQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
     const ASTDeleteQuery & delete_query = query_ptr->as<ASTDeleteQuery &>();
     auto table_id = getContext()->resolveStorageID(delete_query, Context::ResolveOrdinary);
 
@@ -98,10 +97,11 @@ BlockIO InterpreterDeleteQuery::execute()
             alter_query.data() + alter_query.size(),
             "ALTER query",
             0,
-            DBMS_DEFAULT_MAX_PARSER_DEPTH);
+            DBMS_DEFAULT_MAX_PARSER_DEPTH,
+            DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         auto context = Context::createCopy(getContext());
-        context->setSetting("mutations_sync", 2);   /// Lightweight delete is always synchronous
+        context->setSetting("mutations_sync", Field(context->getSettingsRef().lightweight_deletes_sync));
         InterpreterAlterQuery alter_interpreter(alter_ast, context);
         return alter_interpreter.execute();
     }
diff --git a/src/Interpreters/InterpreterDescribeQuery.cpp b/src/Interpreters/InterpreterDescribeQuery.cpp
index 1aab72afcc1..87b0eb89302 100644
--- a/src/Interpreters/InterpreterDescribeQuery.cpp
+++ b/src/Interpreters/InterpreterDescribeQuery.cpp
@@ -9,6 +9,7 @@
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterDescribeQuery.h>
 #include <Interpreters/IdentifierSemantic.h>
@@ -123,28 +124,29 @@ BlockIO InterpreterDescribeQuery::execute()
 
 void InterpreterDescribeQuery::fillColumnsFromSubquery(const ASTTableExpression & table_expression)
 {
-    NamesAndTypesList names_and_types;
+    Block sample_block;
     auto select_query = table_expression.subquery->children.at(0);
     auto current_context = getContext();
 
     if (settings.allow_experimental_analyzer)
     {
         SelectQueryOptions select_query_options;
-        names_and_types = InterpreterSelectQueryAnalyzer(select_query, current_context, select_query_options).getSampleBlock().getNamesAndTypesList();
+        sample_block = InterpreterSelectQueryAnalyzer(select_query, current_context, select_query_options).getSampleBlock();
     }
     else
     {
-        names_and_types = InterpreterSelectWithUnionQuery::getSampleBlock(select_query, current_context).getNamesAndTypesList();
+        sample_block = InterpreterSelectWithUnionQuery::getSampleBlock(select_query, current_context);
     }
 
-    for (auto && [name, type] : names_and_types)
-        columns.emplace_back(std::move(name), std::move(type));
+    for (auto && column : sample_block)
+        columns.emplace_back(std::move(column.name), std::move(column.type));
 }
 
 void InterpreterDescribeQuery::fillColumnsFromTableFunction(const ASTTableExpression & table_expression)
 {
     auto current_context = getContext();
     TableFunctionPtr table_function_ptr = TableFunctionFactory::instance().get(table_expression.table_function, current_context);
+
     auto column_descriptions = table_function_ptr->getActualTableStructure(getContext(), /*is_insert_query*/ true);
     for (const auto & column : column_descriptions)
         columns.emplace_back(column);
@@ -154,14 +156,16 @@ void InterpreterDescribeQuery::fillColumnsFromTableFunction(const ASTTableExpres
         auto table = table_function_ptr->execute(table_expression.table_function, getContext(), table_function_ptr->getName());
         if (table)
         {
-            for (const auto & column : table->getVirtuals())
+            auto virtuals = table->getVirtualsPtr();
+            for (const auto & column : *virtuals)
             {
                 if (!column_descriptions.has(column.name))
-                    virtual_columns.emplace_back(column.name, column.type);
+                    virtual_columns.push_back(column);
             }
         }
     }
 }
+
 void InterpreterDescribeQuery::fillColumnsFromTable(const ASTTableExpression & table_expression)
 {
     auto table_id = getContext()->resolveStorageID(table_expression.database_and_table_name);
@@ -176,10 +180,11 @@ void InterpreterDescribeQuery::fillColumnsFromTable(const ASTTableExpression & t
 
     if (settings.describe_include_virtual_columns)
     {
-        for (const auto & column : table->getVirtuals())
+        auto virtuals = table->getVirtualsPtr();
+        for (const auto & column : *virtuals)
         {
             if (!column_descriptions.has(column.name))
-                virtual_columns.emplace_back(column.name, column.type);
+                virtual_columns.push_back(column);
         }
     }
 
diff --git a/src/Interpreters/InterpreterDropFunctionQuery.cpp b/src/Interpreters/InterpreterDropFunctionQuery.cpp
index 2661fd9058c..7a273d4969b 100644
--- a/src/Interpreters/InterpreterDropFunctionQuery.cpp
+++ b/src/Interpreters/InterpreterDropFunctionQuery.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
 
 BlockIO InterpreterDropFunctionQuery::execute()
 {
-    FunctionNameNormalizer().visit(query_ptr.get());
+    FunctionNameNormalizer::visit(query_ptr.get());
 
     const auto updated_query_ptr = removeOnClusterClauseIfNeeded(query_ptr, getContext());
     ASTDropFunctionQuery & drop_function_query = updated_query_ptr->as<ASTDropFunctionQuery &>();
diff --git a/src/Interpreters/InterpreterDropIndexQuery.cpp b/src/Interpreters/InterpreterDropIndexQuery.cpp
index 025677eeb91..f052aa201f1 100644
--- a/src/Interpreters/InterpreterDropIndexQuery.cpp
+++ b/src/Interpreters/InterpreterDropIndexQuery.cpp
@@ -1,6 +1,7 @@
 #include <Access/ContextAccess.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterDropIndexQuery.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
diff --git a/src/Interpreters/InterpreterDropQuery.cpp b/src/Interpreters/InterpreterDropQuery.cpp
index 711100b5de1..e3e5354d081 100644
--- a/src/Interpreters/InterpreterDropQuery.cpp
+++ b/src/Interpreters/InterpreterDropQuery.cpp
@@ -1,5 +1,6 @@
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterDropQuery.h>
@@ -7,6 +8,7 @@
 #include <Interpreters/QueryLog.h>
 #include <Access/Common/AccessRightsElement.h>
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Common/escapeForFileName.h>
@@ -53,16 +55,27 @@ InterpreterDropQuery::InterpreterDropQuery(const ASTPtr & query_ptr_, ContextMut
 {
 }
 
-
 BlockIO InterpreterDropQuery::execute()
 {
+    BlockIO res;
     auto & drop = query_ptr->as<ASTDropQuery &>();
+    ASTs drops = drop.getRewrittenASTsOfSingleTable();
+    for (const auto & drop_query_ptr : drops)
+    {
+        current_query_ptr = drop_query_ptr;
+        res = executeSingleDropQuery(drop_query_ptr);
+    }
+    return res;
+}
 
-    if (!drop.cluster.empty() && drop.table && !drop.if_empty && !maybeRemoveOnCluster(query_ptr, getContext()))
+BlockIO InterpreterDropQuery::executeSingleDropQuery(const ASTPtr & drop_query_ptr)
+{
+    auto & drop = drop_query_ptr->as<ASTDropQuery &>();
+    if (!drop.cluster.empty() && drop.table && !drop.if_empty && !maybeRemoveOnCluster(current_query_ptr, getContext()))
     {
         DDLQueryOnClusterParams params;
         params.access_to_check = getRequiredAccessForDDLOnCluster();
-        return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+        return executeDDLQueryOnCluster(current_query_ptr, getContext(), params);
     }
 
     if (getContext()->getSettingsRef().database_atomic_wait_for_drop_and_detach_synchronously)
@@ -70,11 +83,11 @@ BlockIO InterpreterDropQuery::execute()
 
     if (drop.table)
         return executeToTable(drop);
-    else if (drop.database && !drop.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
+    else if (drop.database && !drop.cluster.empty() && !maybeRemoveOnCluster(current_query_ptr, getContext()))
     {
-            DDLQueryOnClusterParams params;
-            params.access_to_check = getRequiredAccessForDDLOnCluster();
-            return executeDDLQueryOnCluster(query_ptr, getContext(), params);
+        DDLQueryOnClusterParams params;
+        params.access_to_check = getRequiredAccessForDDLOnCluster();
+        return executeDDLQueryOnCluster(current_query_ptr, getContext(), params);
     }
     else if (drop.database)
         return executeToDatabase(drop);
@@ -82,7 +95,6 @@ BlockIO InterpreterDropQuery::execute()
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Nothing to drop, both names are empty");
 }
 
-
 void InterpreterDropQuery::waitForTableToBeActuallyDroppedOrDetached(const ASTDropQuery & query, const DatabasePtr & db, const UUID & uuid_to_wait)
 {
     if (uuid_to_wait == UUIDHelpers::Nil)
@@ -155,7 +167,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ContextPtr context_, ASTDropQue
         table_id.uuid = database->tryGetTableUUID(table_id.table_name);
 
         /// Prevents recursive drop from drop database query. The original query must specify a table.
-        bool is_drop_or_detach_database = !query_ptr->as<ASTDropQuery>()->table;
+        bool is_drop_or_detach_database = !current_query_ptr->as<ASTDropQuery>()->table;
 
         AccessFlags drop_storage;
 
@@ -178,7 +190,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ContextPtr context_, ASTDropQue
             return executeDDLQueryOnCluster(new_query_ptr, getContext(), params);
         }
 
-        if (database->shouldReplicateQuery(getContext(), query_ptr))
+        if (database->shouldReplicateQuery(getContext(), current_query_ptr))
         {
             if (query.kind == ASTDropQuery::Kind::Detach)
                 context_->checkAccess(drop_storage, table_id);
@@ -248,7 +260,7 @@ BlockIO InterpreterDropQuery::executeToTableImpl(ContextPtr context_, ASTDropQue
 
             auto metadata_snapshot = table->getInMemoryMetadataPtr();
             /// Drop table data, don't touch metadata
-            table->truncate(query_ptr, metadata_snapshot, context_, table_excl_lock);
+            table->truncate(current_query_ptr, metadata_snapshot, context_, table_excl_lock);
         }
         else if (query.kind == ASTDropQuery::Kind::Drop)
         {
@@ -307,7 +319,7 @@ BlockIO InterpreterDropQuery::executeToTemporaryTable(const String & table_name,
                     = table->lockExclusively(getContext()->getCurrentQueryId(), getContext()->getSettingsRef().lock_acquire_timeout);
                 /// Drop table data, don't touch metadata
                 auto metadata_snapshot = table->getInMemoryMetadataPtr();
-                table->truncate(query_ptr, metadata_snapshot, getContext(), table_lock);
+                table->truncate(current_query_ptr, metadata_snapshot, getContext(), table_lock);
             }
             else if (kind == ASTDropQuery::Kind::Drop)
             {
@@ -387,7 +399,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 query_for_table.kind = query.kind;
                 // For truncate operation on database, drop the tables
                 if (truncate)
-                    query_for_table.kind = ASTDropQuery::Kind::Drop;
+                    query_for_table.kind = query.has_all_tables ? ASTDropQuery::Kind::Truncate : ASTDropQuery::Kind::Drop;
                 query_for_table.if_exists = true;
                 query_for_table.if_empty = false;
                 query_for_table.setDatabase(database_name);
@@ -400,6 +412,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                 table_context->setInternalQuery(true);
                 /// Do not hold extra shared pointers to tables
                 std::vector<std::pair<String, bool>> tables_to_drop;
+                // NOTE: This means we wait for all tables to be loaded inside getTablesIterator() call in case of `async_load_databases = true`.
                 for (auto iterator = database->getTablesIterator(table_context); iterator->isValid(); iterator->next())
                 {
                     auto table_ptr = iterator->table();
@@ -417,7 +430,7 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
                     uuids_to_wait.push_back(table_to_wait);
                 }
             }
-           // only if operation is DETACH
+            // only if operation is DETACH
             if ((!drop || !truncate) && query.sync)
             {
                 /// Avoid "some tables are still in use" when sync mode is enabled
@@ -440,11 +453,39 @@ BlockIO InterpreterDropQuery::executeToDatabaseImpl(const ASTDropQuery & query,
     return {};
 }
 
+void InterpreterDropQuery::extendQueryLogElemImpl(DB::QueryLogElement & elem, const DB::ASTPtr & ast, DB::ContextPtr context_) const
+{
+    auto & drop = ast->as<ASTDropQuery &>();
+    if (drop.database_and_tables)
+    {
+        auto & list = drop.database_and_tables->as<ASTExpressionList &>();
+        for (auto & child : list.children)
+        {
+            auto identifier = dynamic_pointer_cast<ASTTableIdentifier>(child);
+            if (!identifier)
+                throw Exception(ErrorCodes::SYNTAX_ERROR, "Unexpected type for list of table names.");
+
+            String query_database = identifier->getDatabaseName();
+            String query_table = identifier->shortName();
+            if (!query_database.empty() && query_table.empty())
+            {
+                elem.query_databases.insert(backQuoteIfNeed(query_database));
+            }
+            else if (!query_table.empty())
+            {
+                auto quoted_database = query_database.empty() ? backQuoteIfNeed(context_->getCurrentDatabase())
+                                                              : backQuoteIfNeed(query_database);
+                elem.query_databases.insert(quoted_database);
+                elem.query_tables.insert(quoted_database + "." + backQuoteIfNeed(query_table));
+            }
+        }
+    }
+}
 
 AccessRightsElements InterpreterDropQuery::getRequiredAccessForDDLOnCluster() const
 {
     AccessRightsElements required_access;
-    const auto & drop = query_ptr->as<const ASTDropQuery &>();
+    const auto & drop = current_query_ptr->as<const ASTDropQuery &>();
 
     if (!drop.table)
     {
@@ -517,7 +558,7 @@ bool InterpreterDropQuery::supportsTransactions() const
     return drop.cluster.empty()
             && !drop.temporary
             && drop.kind == ASTDropQuery::Kind::Truncate
-            && drop.table;
+            && drop.database_and_tables;
 }
 
 void registerInterpreterDropQuery(InterpreterFactory & factory)
diff --git a/src/Interpreters/InterpreterDropQuery.h b/src/Interpreters/InterpreterDropQuery.h
index 7ae544a7356..08668f47225 100644
--- a/src/Interpreters/InterpreterDropQuery.h
+++ b/src/Interpreters/InterpreterDropQuery.h
@@ -29,10 +29,14 @@ public:
 
     bool supportsTransactions() const override;
 
+    void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context_) const override;
+
 private:
     AccessRightsElements getRequiredAccessForDDLOnCluster() const;
     ASTPtr query_ptr;
+    ASTPtr current_query_ptr;
 
+    BlockIO executeSingleDropQuery(const ASTPtr & drop_query_ptr);
     BlockIO executeToDatabase(const ASTDropQuery & query);
     BlockIO executeToDatabaseImpl(const ASTDropQuery & query, DatabasePtr & database, std::vector<UUID> & uuids_to_wait);
 
diff --git a/src/Interpreters/InterpreterExistsQuery.cpp b/src/Interpreters/InterpreterExistsQuery.cpp
index e4176a44533..14ca9eaed0a 100644
--- a/src/Interpreters/InterpreterExistsQuery.cpp
+++ b/src/Interpreters/InterpreterExistsQuery.cpp
@@ -5,6 +5,7 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <Columns/ColumnsNumber.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterExistsQuery.h>
 #include <Access/Common/AccessFlags.h>
diff --git a/src/Interpreters/InterpreterFactory.cpp b/src/Interpreters/InterpreterFactory.cpp
index 84432415f5e..387d056ffe7 100644
--- a/src/Interpreters/InterpreterFactory.cpp
+++ b/src/Interpreters/InterpreterFactory.cpp
@@ -65,6 +65,7 @@
 namespace ProfileEvents
 {
     extern const Event Query;
+    extern const Event InitialQuery;
     extern const Event QueriesWithSubqueries;
     extern const Event SelectQuery;
     extern const Event InsertQuery;
@@ -94,7 +95,8 @@ void InterpreterFactory::registerInterpreter(const std::string & name, CreatorFn
 InterpreterFactory::InterpreterPtr InterpreterFactory::get(ASTPtr & query, ContextMutablePtr context, const SelectQueryOptions & options)
 {
     ProfileEvents::increment(ProfileEvents::Query);
-
+    if (context->getClientInfo().query_kind == ClientInfo::QueryKind::INITIAL_QUERY)
+        ProfileEvents::increment(ProfileEvents::InitialQuery);
     /// SELECT and INSERT query will handle QueriesWithSubqueries on their own.
     if (!(query->as<ASTSelectQuery>() ||
         query->as<ASTSelectWithUnionQuery>() ||
@@ -104,7 +106,8 @@ InterpreterFactory::InterpreterPtr InterpreterFactory::get(ASTPtr & query, Conte
         ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
     }
 
-    Arguments arguments {
+    Arguments arguments
+    {
         .query = query,
         .context = context,
         .options = options
@@ -216,6 +219,10 @@ InterpreterFactory::InterpreterPtr InterpreterFactory::get(ASTPtr & query, Conte
     }
     else if (query->as<ASTExplainQuery>())
     {
+        const auto kind = query->as<ASTExplainQuery>()->getKind();
+        if (kind == ASTExplainQuery::ParsedAST || kind == ASTExplainQuery::AnalyzedSyntax)
+            context->setSetting("allow_experimental_analyzer", false);
+
         interpreter_name = "InterpreterExplainQuery";
     }
     else if (query->as<ASTShowProcesslistQuery>())
diff --git a/src/Interpreters/InterpreterFactory.h b/src/Interpreters/InterpreterFactory.h
index 3cf3b02d826..9c29e5ff7b4 100644
--- a/src/Interpreters/InterpreterFactory.h
+++ b/src/Interpreters/InterpreterFactory.h
@@ -21,7 +21,7 @@ public:
         ASTPtr & query;
         ContextMutablePtr context;
         const SelectQueryOptions & options;
-        bool allow_materialized;
+        bool allow_materialized = false;
     };
 
     using InterpreterPtr = std::unique_ptr<IInterpreter>;
diff --git a/src/Interpreters/InterpreterInsertQuery.cpp b/src/Interpreters/InterpreterInsertQuery.cpp
index c8e05fcd5e3..35ff65c2335 100644
--- a/src/Interpreters/InterpreterInsertQuery.cpp
+++ b/src/Interpreters/InterpreterInsertQuery.cpp
@@ -7,6 +7,7 @@
 #include <Columns/ColumnNullable.h>
 #include <Processors/Transforms/buildPushingToViewsChain.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/InterpreterWatchQuery.h>
 #include <Interpreters/QueryLog.h>
@@ -125,7 +126,10 @@ StoragePtr InterpreterInsertQuery::getTable(ASTInsertQuery & query)
 Block InterpreterInsertQuery::getSampleBlock(
     const ASTInsertQuery & query,
     const StoragePtr & table,
-    const StorageMetadataPtr & metadata_snapshot) const
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context_,
+    bool no_destination,
+    bool allow_materialized)
 {
     /// If the query does not include information about columns
     if (!query.columns)
@@ -133,13 +137,13 @@ Block InterpreterInsertQuery::getSampleBlock(
         if (auto * window_view = dynamic_cast<StorageWindowView *>(table.get()))
             return window_view->getInputHeader();
         else if (no_destination)
-            return metadata_snapshot->getSampleBlockWithVirtuals(table->getVirtuals());
+            return metadata_snapshot->getSampleBlockWithVirtuals(table->getVirtualsList());
         else
             return metadata_snapshot->getSampleBlockNonMaterialized();
     }
 
     /// Form the block based on the column names from the query
-    const auto columns_ast = processColumnTransformers(getContext()->getCurrentDatabase(), table, metadata_snapshot, query.columns);
+    const auto columns_ast = processColumnTransformers(context_->getCurrentDatabase(), table, metadata_snapshot, query.columns);
     Names names;
     names.reserve(columns_ast->children.size());
     for (const auto & identifier : columns_ast->children)
@@ -148,7 +152,7 @@ Block InterpreterInsertQuery::getSampleBlock(
         names.emplace_back(std::move(current_name));
     }
 
-    return getSampleBlock(names, table, metadata_snapshot);
+    return getSampleBlockImpl(names, table, metadata_snapshot, no_destination, allow_materialized);
 }
 
 std::optional<Names> InterpreterInsertQuery::getInsertColumnNames() const
@@ -170,12 +174,18 @@ std::optional<Names> InterpreterInsertQuery::getInsertColumnNames() const
     return names;
 }
 
-Block InterpreterInsertQuery::getSampleBlock(
+Block InterpreterInsertQuery::getSampleBlockImpl(
     const Names & names,
     const StoragePtr & table,
-    const StorageMetadataPtr & metadata_snapshot) const
+    const StorageMetadataPtr & metadata_snapshot,
+    bool no_destination,
+    bool allow_materialized)
 {
     Block table_sample_physical = metadata_snapshot->getSampleBlock();
+    Block table_sample_virtuals;
+    if (no_destination)
+        table_sample_virtuals = table->getVirtualsHeader();
+
     Block table_sample_insertable = metadata_snapshot->getSampleBlockInsertable();
     Block res;
     for (const auto & current_name : names)
@@ -190,13 +200,19 @@ Block InterpreterInsertQuery::getSampleBlock(
             if (table_sample_physical.has(current_name))
             {
                 if (!allow_materialized)
-                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert column {}, because it is MATERIALIZED column.",
-                        current_name);
+                    throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot insert column {}, because it is MATERIALIZED column", current_name);
                 res.insert(ColumnWithTypeAndName(table_sample_physical.getByName(current_name).type, current_name));
             }
-            else /// The table does not have a column with that name
+            else if (table_sample_virtuals.has(current_name))
+            {
+                res.insert(ColumnWithTypeAndName(table_sample_virtuals.getByName(current_name).type, current_name));
+            }
+            else
+            {
+                /// The table does not have a column with that name
                 throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "No such column {} in table {}",
                     current_name, table->getStorageID().getNameForLogs());
+            }
         }
         else
             res.insert(ColumnWithTypeAndName(table_sample_insertable.getByName(current_name).type, current_name));
@@ -260,7 +276,8 @@ Chain InterpreterInsertQuery::buildChain(
     const StorageMetadataPtr & metadata_snapshot,
     const Names & columns,
     ThreadStatusesHolderPtr thread_status_holder,
-    std::atomic_uint64_t * elapsed_counter_ms)
+    std::atomic_uint64_t * elapsed_counter_ms,
+    bool check_access)
 {
     ProfileEvents::increment(ProfileEvents::InsertQueriesWithSubqueries);
     ProfileEvents::increment(ProfileEvents::QueriesWithSubqueries);
@@ -271,10 +288,12 @@ Chain InterpreterInsertQuery::buildChain(
     if (!running_group)
         running_group = std::make_shared<ThreadGroup>(getContext());
 
-    auto sample = getSampleBlock(columns, table, metadata_snapshot);
+    auto sample = getSampleBlockImpl(columns, table, metadata_snapshot, no_destination, allow_materialized);
+    if (check_access)
+        getContext()->checkAccess(AccessType::INSERT, table->getStorageID(), sample.getNames());
 
     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 chain = buildPreSinkChain(sink.getInputHeader(), table, metadata_snapshot, sample);
 
     chain.appendChain(std::move(sink));
     return chain;
@@ -317,25 +336,28 @@ Chain InterpreterInsertQuery::buildSink(
     return out;
 }
 
+bool InterpreterInsertQuery::shouldAddSquashingFroStorage(const StoragePtr & table) const
+{
+    auto context_ptr = getContext();
+    const Settings & settings = context_ptr->getSettingsRef();
+
+    /// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
+    /// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
+    return !(settings.distributed_foreground_insert && table->isRemote()) && !async_insert && !no_squash;
+}
+
 Chain InterpreterInsertQuery::buildPreSinkChain(
     const Block & subsequent_header,
     const StoragePtr & table,
     const StorageMetadataPtr & metadata_snapshot,
-    const Block & query_sample_block,
-    ThreadStatusesHolderPtr thread_status_holder)
+    const Block & query_sample_block)
 {
-    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.
@@ -366,26 +388,6 @@ Chain InterpreterInsertQuery::buildPreSinkChain(
     /// because some clients break insertion protocol (columns != header)
     out.addSource(std::make_shared<ConvertingTransform>(query_sample_block, adding_missing_defaults_actions));
 
-    /// It's important to squash blocks as early as possible (before other transforms),
-    ///  because other transforms may work inefficient if block size is small.
-
-    /// Do not squash blocks if it is a sync INSERT into Distributed, since it lead to double bufferization on client and server side.
-    /// Client-side bufferization might cause excessive timeouts (especially in case of big blocks).
-    if (!(settings.distributed_foreground_insert && table->isRemote()) && !async_insert && !no_squash && !(query && query->watch))
-    {
-        bool table_prefers_large_blocks = table->prefersLargeBlocks();
-
-        out.addSource(std::make_shared<SquashingChunksTransform>(
-            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>(input_header(), thread_status, getContext()->getQuota());
-    counting->setProcessListElement(context_ptr->getProcessListElement());
-    counting->setProgressCallback(context_ptr->getProgressCallback());
-    out.addSource(std::move(counting));
-
     return out;
 }
 
@@ -411,7 +413,7 @@ BlockIO InterpreterInsertQuery::execute()
     auto table_lock = table->lockForShare(getContext()->getInitialQueryId(), settings.lock_acquire_timeout);
     auto metadata_snapshot = table->getInMemoryMetadataPtr();
 
-    auto query_sample_block = getSampleBlock(query, table, metadata_snapshot);
+    auto query_sample_block = getSampleBlock(query, table, metadata_snapshot, getContext(), no_destination, allow_materialized);
 
     /// For table functions we check access while executing
     /// getTable() -> ITableFunction::execute().
@@ -424,7 +426,7 @@ BlockIO InterpreterInsertQuery::execute()
 
     std::vector<Chain> presink_chains;
     std::vector<Chain> sink_chains;
-    if (!distributed_pipeline || query.watch)
+    if (!distributed_pipeline)
     {
         /// Number of streams works like this:
         ///  * For the SELECT, use `max_threads`, or `max_insert_threads`, or whatever
@@ -513,7 +515,23 @@ BlockIO InterpreterInsertQuery::execute()
 
             if (settings.max_insert_threads > 1)
             {
-                pre_streams_size = std::min(static_cast<size_t>(settings.max_insert_threads), pipeline.getNumStreams());
+                auto table_id = table->getStorageID();
+                auto views = DatabaseCatalog::instance().getDependentViews(table_id);
+
+                /// It breaks some views-related tests and we have dedicated `parallel_view_processing` for views, so let's just skip them.
+                const bool resize_to_max_insert_threads = !table->isView() && views.empty();
+                pre_streams_size = resize_to_max_insert_threads ? settings.max_insert_threads
+                                                                : std::min<size_t>(settings.max_insert_threads, pipeline.getNumStreams());
+
+                /// Deduplication when passing insert_deduplication_token breaks if using more than one thread
+                if (!settings.insert_deduplication_token.toString().empty())
+                {
+                    LOG_DEBUG(
+                        getLogger("InsertQuery"),
+                        "Insert-select query using insert_deduplication_token, setting streams to 1 to avoid deduplication issues");
+                    pre_streams_size = 1;
+                }
+
                 if (table->supportsParallelInsert())
                     sink_streams_size = pre_streams_size;
             }
@@ -533,17 +551,12 @@ BlockIO InterpreterInsertQuery::execute()
                     {
                         /// Change query sample block columns to Nullable to allow inserting nullable columns, where NULL values will be substituted with
                         /// default column values (in AddingDefaultsTransform), so all values will be cast correctly.
-                        if (isNullableOrLowCardinalityNullable(input_columns[col_idx].type) && !isNullableOrLowCardinalityNullable(query_columns[col_idx].type) && output_columns.has(query_columns[col_idx].name))
+                        if (isNullableOrLowCardinalityNullable(input_columns[col_idx].type) && !isNullableOrLowCardinalityNullable(query_columns[col_idx].type) && !isVariant(query_columns[col_idx].type) && output_columns.has(query_columns[col_idx].name))
                             query_sample_block.setColumn(col_idx, ColumnWithTypeAndName(makeNullableOrLowCardinalityNullable(query_columns[col_idx].column), makeNullableOrLowCardinalityNullable(query_columns[col_idx].type), query_columns[col_idx].name));
                     }
                 }
             }
         }
-        else if (query.watch)
-        {
-            InterpreterWatchQuery interpreter_watch{ query.watch, getContext() };
-            pipeline = interpreter_watch.buildQueryPipeline();
-        }
 
         ThreadGroupPtr running_group;
         if (current_thread)
@@ -558,8 +571,7 @@ BlockIO InterpreterInsertQuery::execute()
         }
         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);
+            auto out = buildPreSinkChain(sink_chains[0].getInputHeader(), table, metadata_snapshot, query_sample_block);
             presink_chains.emplace_back(std::move(out));
         }
     }
@@ -571,7 +583,7 @@ BlockIO InterpreterInsertQuery::execute()
     {
         res.pipeline = std::move(*distributed_pipeline);
     }
-    else if (query.select || query.watch)
+    else if (query.select)
     {
         const auto & header = presink_chains.at(0).getInputHeader();
         auto actions_dag = ActionsDAG::makeConvertingActions(
@@ -592,6 +604,29 @@ BlockIO InterpreterInsertQuery::execute()
             return std::make_shared<MaterializingTransform>(in_header);
         });
 
+        pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
+        {
+            auto context_ptr = getContext();
+            auto counting = std::make_shared<CountingTransform>(in_header, nullptr, context_ptr->getQuota());
+            counting->setProcessListElement(context_ptr->getProcessListElement());
+            counting->setProgressCallback(context_ptr->getProgressCallback());
+
+            return counting;
+        });
+
+        if (shouldAddSquashingFroStorage(table))
+        {
+            bool table_prefers_large_blocks = table->prefersLargeBlocks();
+
+            pipeline.addSimpleTransform([&](const Block & in_header) -> ProcessorPtr
+            {
+                return std::make_shared<SimpleSquashingChunksTransform>(
+                    in_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);
+            });
+        }
+
         size_t num_select_threads = pipeline.getNumThreads();
 
         for (auto & chain : presink_chains)
@@ -634,7 +669,27 @@ BlockIO InterpreterInsertQuery::execute()
     }
     else
     {
-        presink_chains.at(0).appendChain(std::move(sink_chains.at(0)));
+        auto & chain = presink_chains.at(0);
+        chain.appendChain(std::move(sink_chains.at(0)));
+
+        if (shouldAddSquashingFroStorage(table))
+        {
+            bool table_prefers_large_blocks = table->prefersLargeBlocks();
+
+            auto squashing = std::make_shared<SimpleSquashingChunksTransform>(
+                chain.getInputHeader(),
+                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);
+
+            chain.addSource(std::move(squashing));
+        }
+
+        auto context_ptr = getContext();
+        auto counting = std::make_shared<CountingTransform>(chain.getInputHeader(), nullptr, context_ptr->getQuota());
+        counting->setProcessListElement(context_ptr->getProcessListElement());
+        counting->setProgressCallback(context_ptr->getProgressCallback());
+        chain.addSource(std::move(counting));
+
         res.pipeline = QueryPipeline(std::move(presink_chains[0]));
         res.pipeline.setNumThreads(std::min<size_t>(res.pipeline.getNumThreads(), settings.max_threads));
         res.pipeline.setConcurrencyControl(settings.use_concurrency_control);
diff --git a/src/Interpreters/InterpreterInsertQuery.h b/src/Interpreters/InterpreterInsertQuery.h
index 845cb6b730b..bf73fb2a319 100644
--- a/src/Interpreters/InterpreterInsertQuery.h
+++ b/src/Interpreters/InterpreterInsertQuery.h
@@ -46,21 +46,30 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         const Names & columns,
         ThreadStatusesHolderPtr thread_status_holder = {},
-        std::atomic_uint64_t * elapsed_counter_ms = nullptr);
+        std::atomic_uint64_t * elapsed_counter_ms = nullptr,
+        bool check_access = false);
 
     static void extendQueryLogElemImpl(QueryLogElement & elem, ContextPtr context_);
 
     void extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr context_) const override;
 
     StoragePtr getTable(ASTInsertQuery & query);
-    Block getSampleBlock(const ASTInsertQuery & query, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
+    static Block getSampleBlock(
+        const ASTInsertQuery & query,
+        const StoragePtr & table,
+        const StorageMetadataPtr & metadata_snapshot,
+        ContextPtr context_,
+        bool no_destination = false,
+        bool allow_materialized = false);
 
     bool supportsTransactions() const override { return true; }
 
     void addBuffer(std::unique_ptr<ReadBuffer> buffer) { owned_buffers.push_back(std::move(buffer)); }
 
+    bool shouldAddSquashingFroStorage(const StoragePtr & table) const;
+
 private:
-    Block getSampleBlock(const Names & names, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot) const;
+    static Block getSampleBlockImpl(const Names & names, const StoragePtr & table, const StorageMetadataPtr & metadata_snapshot, bool no_destination, bool allow_materialized);
 
     ASTPtr query_ptr;
     const bool allow_materialized;
@@ -81,8 +90,7 @@ private:
         const Block & subsequent_header,
         const StoragePtr & table,
         const StorageMetadataPtr & metadata_snapshot,
-        const Block & query_sample_block,
-        ThreadStatusesHolderPtr thread_status_holder);
+        const Block & query_sample_block);
 };
 
 
diff --git a/src/Interpreters/InterpreterKillQueryQuery.cpp b/src/Interpreters/InterpreterKillQueryQuery.cpp
index 5efffdaa194..6d6b1085ffb 100644
--- a/src/Interpreters/InterpreterKillQueryQuery.cpp
+++ b/src/Interpreters/InterpreterKillQueryQuery.cpp
@@ -3,6 +3,7 @@
 #include <Parsers/ASTKillQueryQuery.h>
 #include <Parsers/queryToString.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/executeQuery.h>
@@ -161,7 +162,7 @@ public:
                 if (curr_process.processed)
                     continue;
 
-                LOG_DEBUG(&Poco::Logger::get("KillQuery"), "Will kill query {} (synchronously)", curr_process.query_id);
+                LOG_DEBUG(getLogger("KillQuery"), "Will kill query {} (synchronously)", curr_process.query_id);
 
                 auto code = process_list.sendCancelToQuery(curr_process.query_id, curr_process.user, true);
 
@@ -229,7 +230,7 @@ BlockIO InterpreterKillQueryQuery::execute()
             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);
+                    LOG_DEBUG(getLogger("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);
             }
@@ -277,9 +278,11 @@ BlockIO InterpreterKillQueryQuery::execute()
                     code = CancellationCode::NotFound;
                 else
                 {
-                    ParserAlterCommand parser;
+                    const auto alter_command = command_col.getDataAt(i).toString();
+                    const auto with_round_bracket = alter_command.front() == '(';
+                    ParserAlterCommand parser{with_round_bracket};
                     auto command_ast
-                        = parseQuery(parser, command_col.getDataAt(i).toString(), 0, getContext()->getSettingsRef().max_parser_depth);
+                        = parseQuery(parser, alter_command, 0, getContext()->getSettingsRef().max_parser_depth, getContext()->getSettingsRef().max_parser_backtracks);
                     required_access_rights = InterpreterAlterQuery::getRequiredAccessForCommand(
                         command_ast->as<const ASTAlterCommand &>(), table_id.database_name, table_id.table_name);
                     if (!access->isGranted(required_access_rights))
diff --git a/src/Interpreters/InterpreterOptimizeQuery.cpp b/src/Interpreters/InterpreterOptimizeQuery.cpp
index 1e2eaa50ab1..907a01b0432 100644
--- a/src/Interpreters/InterpreterOptimizeQuery.cpp
+++ b/src/Interpreters/InterpreterOptimizeQuery.cpp
@@ -2,6 +2,7 @@
 #include <Parsers/ASTOptimizeQuery.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterOptimizeQuery.h>
 #include <Access/Common/AccessRightsElement.h>
diff --git a/src/Interpreters/InterpreterRenameQuery.cpp b/src/Interpreters/InterpreterRenameQuery.cpp
index 52001fdcaf4..b63672f1757 100644
--- a/src/Interpreters/InterpreterRenameQuery.cpp
+++ b/src/Interpreters/InterpreterRenameQuery.cpp
@@ -1,6 +1,7 @@
 #include <Parsers/ASTRenameQuery.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterRenameQuery.h>
 #include <Storages/IStorage.h>
@@ -47,12 +48,12 @@ BlockIO InterpreterRenameQuery::execute()
       */
 
     RenameDescriptions descriptions;
-    descriptions.reserve(rename.elements.size());
+    descriptions.reserve(rename.getElements().size());
 
     /// Don't allow to drop tables (that we are renaming); don't allow to create tables in places where tables will be renamed.
     TableGuards table_guards;
 
-    for (const auto & elem : rename.elements)
+    for (const auto & elem : rename.getElements())
     {
         descriptions.emplace_back(elem, current_database);
         const auto & description = descriptions.back();
@@ -186,7 +187,7 @@ AccessRightsElements InterpreterRenameQuery::getRequiredAccess(InterpreterRename
 {
     AccessRightsElements required_access;
     const auto & rename = query_ptr->as<const ASTRenameQuery &>();
-    for (const auto & elem : rename.elements)
+    for (const auto & elem : rename.getElements())
     {
         if (type == RenameType::RenameTable)
         {
@@ -214,7 +215,7 @@ AccessRightsElements InterpreterRenameQuery::getRequiredAccess(InterpreterRename
 void InterpreterRenameQuery::extendQueryLogElemImpl(QueryLogElement & elem, const ASTPtr & ast, ContextPtr) const
 {
     const auto & rename = ast->as<const ASTRenameQuery &>();
-    for (const auto & element : rename.elements)
+    for (const auto & element : rename.getElements())
     {
         {
             String database = backQuoteIfNeed(!element.from.database ? getContext()->getCurrentDatabase() : element.from.getDatabase());
diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
index f7cb6d4d849..efc37fd76af 100644
--- a/src/Interpreters/InterpreterSelectQuery.cpp
+++ b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -13,12 +13,12 @@
 #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>
 
 #include <AggregateFunctions/AggregateFunctionCount.h>
+#include <DataTypes/DataTypeNullable.h>
 
 #include <Interpreters/ApplyWithAliasVisitor.h>
 #include <Interpreters/ApplyWithSubqueryVisitor.h>
@@ -73,9 +73,10 @@
 #include <Processors/Transforms/FilterTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
-#include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
 #include <Storages/StorageDistributed.h>
+#include <Storages/StorageDummy.h>
+#include <Storages/StorageMerge.h>
 #include <Storages/StorageValues.h>
 #include <Storages/StorageView.h>
 
@@ -83,7 +84,6 @@
 #include <Core/ColumnNumbers.h>
 #include <Core/Field.h>
 #include <Core/ProtocolDefines.h>
-#include <Functions/IFunction.h>
 #include <Interpreters/Aggregator.h>
 #include <Interpreters/IJoin.h>
 #include <QueryPipeline/SizeLimits.h>
@@ -94,6 +94,7 @@
 #include <Common/scope_guard_safe.h>
 #include <Common/typeid_cast.h>
 #include <Common/ProfileEvents.h>
+#include <Common/NaNUtils.h>
 
 
 namespace ProfileEvents
@@ -158,7 +159,7 @@ FilterDAGInfoPtr generateFilterActions(
     {
         ParserExpression expr_parser;
         /// 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));
+        expr_list->children.push_back(parseQuery(expr_parser, backQuoteIfNeed(column_str), 0, context->getSettingsRef().max_parser_depth, context->getSettingsRef().max_parser_backtracks));
     }
 
     select_ast->setExpression(ASTSelectQuery::Expression::TABLES, std::make_shared<ASTTablesInSelectQuery>());
@@ -224,8 +225,10 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     const StoragePtr & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
     const SelectQueryOptions & options_)
-    : InterpreterSelectQuery(query_ptr_, context_, std::nullopt, storage_, options_.copy().noSubquery(), {}, metadata_snapshot_)
-{}
+    : InterpreterSelectQuery(
+        query_ptr_, context_, std::nullopt, storage_, options_.copy().noSubquery(), {}, metadata_snapshot_)
+{
+}
 
 InterpreterSelectQuery::InterpreterSelectQuery(
     const ASTPtr & query_ptr_,
@@ -327,7 +330,7 @@ ASTPtr parseAdditionalFilterConditionForTable(
             const auto & settings = context.getSettingsRef();
             return parseQuery(
                 parser, filter.data(), filter.data() + filter.size(),
-                "additional filter", settings.max_query_size, settings.max_parser_depth);
+                "additional filter", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
         }
     }
 
@@ -381,7 +384,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     : IInterpreterUnionOrSelectQuery(options_.modify_inplace ? query_ptr_ : query_ptr_->clone(), context_, options_)
     , storage(storage_)
     , input_pipe(std::move(input_pipe_))
-    , log(&Poco::Logger::get("InterpreterSelectQuery"))
+    , log(getLogger("InterpreterSelectQuery"))
     , metadata_snapshot(metadata_snapshot_)
     , prepared_sets(prepared_sets_)
 {
@@ -410,8 +413,8 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     if (!options.is_subquery)
     {
         if (context->getSettingsRef().enable_global_with_statement)
-            ApplyWithAliasVisitor().visit(query_ptr);
-        ApplyWithSubqueryVisitor().visit(query_ptr);
+            ApplyWithAliasVisitor::visit(query_ptr);
+        ApplyWithSubqueryVisitor::visit(query_ptr);
     }
 
     query_info.query = query_ptr->clone();
@@ -486,7 +489,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             LOG_DEBUG(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));
         }
-        else if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+        else if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
         {
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "FINAL modifier is not supported with parallel replicas");
         }
@@ -501,7 +504,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             LOG_DEBUG(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)
+        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`");
         }
@@ -607,7 +610,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         if (view)
         {
             query_info.is_parameterized_view = view->isParameterizedView();
-            view->replaceWithSubquery(getSelectQuery(), view_table, metadata_snapshot, view->isParameterizedView());
+            StorageView::replaceWithSubquery(getSelectQuery(), view_table, metadata_snapshot, view->isParameterizedView());
         }
 
         syntax_analyzer_result = TreeRewriter(context).analyzeSelect(
@@ -618,7 +621,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
             required_result_column_names,
             table_join);
 
-
         query_info.syntax_analyzer_result = syntax_analyzer_result;
         context->setDistributed(syntax_analyzer_result->is_remote_storage);
 
@@ -628,7 +630,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         if (view)
         {
             /// Restore original view name. Save rewritten subquery for future usage in StorageView.
-            query_info.view_query = view->restoreViewName(getSelectQuery(), view_table);
+            query_info.view_query = StorageView::restoreViewName(getSelectQuery(), view_table);
             view = nullptr;
         }
 
@@ -777,12 +779,30 @@ InterpreterSelectQuery::InterpreterSelectQuery(
         result_header = getSampleBlockImpl();
     };
 
-    analyze(shouldMoveToPrewhere());
+
+    /// This is a hack to make sure we reanalyze if GlobalSubqueriesVisitor changed allow_experimental_parallel_reading_from_replicas
+    /// inside the query context (because it doesn't have write access to the main context)
+    UInt64 parallel_replicas_before_analysis
+        = context->hasQueryContext() ? context->getQueryContext()->getSettingsRef().allow_experimental_parallel_reading_from_replicas : 0;
+
+    /// Conditionally support AST-based PREWHERE optimization.
+    analyze(shouldMoveToPrewhere() && (!settings.query_plan_optimize_prewhere || !settings.query_plan_enable_optimizations));
+
 
     bool need_analyze_again = false;
     bool can_analyze_again = false;
+
     if (context->hasQueryContext())
     {
+        /// As this query can't be executed with parallel replicas, we must reanalyze it
+        if (context->getQueryContext()->getSettingsRef().allow_experimental_parallel_reading_from_replicas
+            != parallel_replicas_before_analysis)
+        {
+            context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+            context->setSetting("max_parallel_replicas", UInt64{1});
+            need_analyze_again = true;
+        }
+
         /// Check number of calls of 'analyze' function.
         /// If it is too big, we will not analyze the query again not to have exponential blowup.
         std::atomic<size_t> & current_query_analyze_count = context->getQueryContext()->kitchen_sink.analyze_counter;
@@ -830,7 +850,7 @@ InterpreterSelectQuery::InterpreterSelectQuery(
     if (query.prewhere() && !query.where())
         analysis_result.prewhere_info->need_filter = true;
 
-    if (table_id && got_storage_from_query && !joined_tables.isLeftTableFunction())
+    if (table_id && got_storage_from_query && !joined_tables.isLeftTableFunction() && !options.ignore_access_check)
     {
         /// The current user should have the SELECT privilege. If this table_id is for a table
         /// function we don't check access rights here because in this case they have been already
@@ -864,45 +884,14 @@ bool InterpreterSelectQuery::adjustParallelReplicasAfterAnalysis()
     ASTSelectQuery & query = getSelectQuery();
 
     /// While only_analyze we don't know anything about parts, so any decision about how many parallel replicas to use would be wrong
-    if (!storage || !context->canUseParallelReplicasOnInitiator())
-        return false;
-
-    /// check if IN operator with subquery is present in the query
-    /// if so, disable parallel replicas
-    if (query_analyzer->getPreparedSets()->hasSubqueries())
-    {
-        bool in_subqueries = false;
-        const auto & sets = query_analyzer->getPreparedSets();
-        const auto subqueries = sets->getSubqueries();
-        for (const auto & subquery : subqueries)
-        {
-            if (subquery->isINSubquery())
-            {
-                in_subqueries = true;
-                break;
-            }
-        }
-
-        if (in_subqueries)
-        {
-            if (settings.allow_experimental_parallel_reading_from_replicas == 2)
-                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "IN with subquery is not supported with parallel replicas");
-
-            context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-            context->setSetting("max_parallel_replicas", UInt64{0});
-            LOG_DEBUG(log, "Disabling parallel replicas to execute a query with IN with subquery");
-            return true;
-        }
-    }
-
-    if (options.only_analyze)
+    if (!storage || options.only_analyze || !context->canUseParallelReplicasOnInitiator())
         return false;
 
     if (getTrivialCount(0).has_value())
     {
         /// The query could use trivial count if it didn't use parallel replicas, so let's disable it and reanalyze
         context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-        context->setSetting("max_parallel_replicas", UInt64{0});
+        context->setSetting("max_parallel_replicas", UInt64{1});
         LOG_DEBUG(log, "Disabling parallel replicas to be able to use a trivial count optimization");
         return true;
     }
@@ -932,7 +921,24 @@ bool InterpreterSelectQuery::adjustParallelReplicasAfterAnalysis()
     }
 
     ActionDAGNodes added_filter_nodes = MergeTreeData::getFiltersForPrimaryKeyAnalysis(*this);
-    UInt64 rows_to_read = storage_merge_tree->estimateNumberOfRowsToRead(context, storage_snapshot, query_info_copy, added_filter_nodes);
+    if (query_info_copy.prewhere_info)
+    {
+        {
+            const auto & node
+                = query_info_copy.prewhere_info->prewhere_actions->findInOutputs(query_info_copy.prewhere_info->prewhere_column_name);
+            added_filter_nodes.nodes.push_back(&node);
+        }
+
+        if (query_info_copy.prewhere_info->row_level_filter)
+        {
+            const auto & node
+                = query_info_copy.prewhere_info->row_level_filter->findInOutputs(query_info_copy.prewhere_info->row_level_column_name);
+            added_filter_nodes.nodes.push_back(&node);
+        }
+    }
+
+    query_info_copy.filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    UInt64 rows_to_read = storage_merge_tree->estimateNumberOfRowsToRead(context, storage_snapshot, query_info_copy);
     /// Note that we treat an estimation of 0 rows as a real estimation
     size_t number_of_replicas_to_use = rows_to_read / settings.parallel_replicas_min_number_of_rows_per_replica;
     LOG_TRACE(log, "Estimated {} rows to read. It is enough work for {} parallel replicas", rows_to_read, number_of_replicas_to_use);
@@ -940,7 +946,7 @@ bool InterpreterSelectQuery::adjustParallelReplicasAfterAnalysis()
     if (number_of_replicas_to_use <= 1)
     {
         context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-        context->setSetting("max_parallel_replicas", UInt64{0});
+        context->setSetting("max_parallel_replicas", UInt64{1});
         LOG_DEBUG(log, "Disabling parallel replicas because there aren't enough rows to read");
         return true;
     }
@@ -1160,13 +1166,13 @@ static FillColumnDescription getWithFillDescription(const ASTOrderByElement & or
 {
     FillColumnDescription descr;
 
-    if (order_by_elem.fill_from)
-        std::tie(descr.fill_from, descr.fill_from_type) = getWithFillFieldValue(order_by_elem.fill_from, context);
-    if (order_by_elem.fill_to)
-        std::tie(descr.fill_to, descr.fill_to_type) = getWithFillFieldValue(order_by_elem.fill_to, context);
+    if (order_by_elem.getFillFrom())
+        std::tie(descr.fill_from, descr.fill_from_type) = getWithFillFieldValue(order_by_elem.getFillFrom(), context);
+    if (order_by_elem.getFillTo())
+        std::tie(descr.fill_to, descr.fill_to_type) = getWithFillFieldValue(order_by_elem.getFillTo(), context);
 
-    if (order_by_elem.fill_step)
-        std::tie(descr.fill_step, descr.step_kind) = getWithFillStep(order_by_elem.fill_step, context);
+    if (order_by_elem.getFillStep())
+        std::tie(descr.fill_step, descr.step_kind) = getWithFillStep(order_by_elem.getFillStep(), context);
     else
         descr.fill_step = order_by_elem.direction;
 
@@ -1212,8 +1218,8 @@ SortDescription InterpreterSelectQuery::getSortDescription(const ASTSelectQuery
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
         std::shared_ptr<Collator> collator;
-        if (order_by_elem.collation)
-            collator = std::make_shared<Collator>(order_by_elem.collation->as<ASTLiteral &>().value.get<String>());
+        if (order_by_elem.getCollation())
+            collator = std::make_shared<Collator>(order_by_elem.getCollation()->as<ASTLiteral &>().value.get<String>());
 
         if (order_by_elem.with_fill)
         {
@@ -1572,7 +1578,7 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, std::optional<P
                     executeLimitBy(query_plan);
                 }
 
-                if (query.limitLength())
+                if (query.limitLength() && !query.limitBy())
                     executePreLimit(query_plan, true);
             }
         };
@@ -2104,8 +2110,7 @@ void InterpreterSelectQuery::applyFiltersToPrewhereInAnalysis(ExpressionAnalysis
         if (does_storage_support_prewhere && shouldMoveToPrewhere())
         {
             /// Execute row level filter in prewhere as a part of "move to prewhere" optimization.
-            analysis.prewhere_info
-                = std::make_shared<PrewhereInfo>(std::move(analysis.filter_info->actions), std::move(analysis.filter_info->column_name));
+            analysis.prewhere_info = std::make_shared<PrewhereInfo>(analysis.filter_info->actions, analysis.filter_info->column_name);
             analysis.prewhere_info->prewhere_actions->projectInput(false);
             analysis.prewhere_info->remove_prewhere_column = analysis.filter_info->do_remove_column;
             analysis.prewhere_info->need_filter = true;
@@ -2115,8 +2120,8 @@ void InterpreterSelectQuery::applyFiltersToPrewhereInAnalysis(ExpressionAnalysis
     else
     {
         /// Add row level security actions to prewhere.
-        analysis.prewhere_info->row_level_filter = std::move(analysis.filter_info->actions);
-        analysis.prewhere_info->row_level_column_name = std::move(analysis.filter_info->column_name);
+        analysis.prewhere_info->row_level_filter = analysis.filter_info->actions;
+        analysis.prewhere_info->row_level_column_name = analysis.filter_info->column_name;
         analysis.prewhere_info->row_level_filter->projectInput(false);
         analysis.filter_info = nullptr;
     }
@@ -2294,7 +2299,7 @@ std::optional<UInt64> InterpreterSelectQuery::getTrivialCount(UInt64 max_paralle
         && !settings.allow_experimental_query_deduplication
         && !settings.empty_result_for_aggregation_by_empty_set
         && storage
-        && storage->supportsTrivialCountOptimization()
+        && storage->supportsTrivialCountOptimization(storage_snapshot, getContext())
         && query_info.filter_asts.empty()
         && query_analyzer->hasAggregation()
         && (query_analyzer->aggregates().size() == 1)
@@ -2329,7 +2334,7 @@ std::optional<UInt64> InterpreterSelectQuery::getTrivialCount(UInt64 max_paralle
             filter_nodes.push_back(&analysis_result.before_where->findInOutputs(analysis_result.where_column_name));
         }
 
-        auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes, {}, context);
+        auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes);
         if (!filter_actions_dag)
             return {};
 
@@ -2367,6 +2372,49 @@ UInt64 InterpreterSelectQuery::maxBlockSizeByLimit() const
     return 0;
 }
 
+/** Storages can rely that filters that for storage will be available for analysis before
+  * plan is fully constructed and optimized.
+  *
+  * StorageMerge common header calculation and prewhere push-down relies on this.
+  *
+  * This is similar to Planner::collectFiltersForAnalysis
+  */
+void collectFiltersForAnalysis(
+    const ASTPtr & query_ptr,
+    const ContextPtr & query_context,
+    const StorageSnapshotPtr & storage_snapshot,
+    const SelectQueryOptions & options,
+    SelectQueryInfo & query_info)
+{
+    auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
+
+    auto dummy = std::make_shared<StorageDummy>(
+        storage_snapshot->storage.getStorageID(), ColumnsDescription(storage_snapshot->getColumns(get_column_options)), storage_snapshot);
+
+    QueryPlan query_plan;
+    InterpreterSelectQuery(query_ptr, query_context, dummy, dummy->getInMemoryMetadataPtr(), options).buildQueryPlan(query_plan);
+
+    auto optimization_settings = QueryPlanOptimizationSettings::fromContext(query_context);
+    query_plan.optimize(optimization_settings);
+
+    std::vector<QueryPlan::Node *> nodes_to_process;
+    nodes_to_process.push_back(query_plan.getRootNode());
+
+    while (!nodes_to_process.empty())
+    {
+        const auto * node_to_process = nodes_to_process.back();
+        nodes_to_process.pop_back();
+        nodes_to_process.insert(nodes_to_process.end(), node_to_process->children.begin(), node_to_process->children.end());
+
+        auto * read_from_dummy = typeid_cast<ReadFromDummy *>(node_to_process->step.get());
+        if (!read_from_dummy)
+            continue;
+
+        query_info.filter_actions_dag = read_from_dummy->getFilterActionsDAG();
+        query_info.optimized_prewhere_info = read_from_dummy->getPrewhereInfo();
+    }
+}
+
 void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum processing_stage, QueryPlan & query_plan)
 {
     auto & query = getSelectQuery();
@@ -2387,7 +2435,7 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
         agg_count.create(place);
         SCOPE_EXIT_MEMORY_SAFE(agg_count.destroy(place));
 
-        agg_count.set(place, *num_rows);
+        AggregateFunctionCount::set(place, *num_rows);
 
         auto column = ColumnAggregateFunction::create(func);
         column->insertFrom(place);
@@ -2493,13 +2541,25 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
     }
     else if (storage)
     {
+        if (shouldMoveToPrewhere() && settings.query_plan_optimize_prewhere && settings.query_plan_enable_optimizations
+            && typeid_cast<const StorageMerge *>(storage.get()))
+            collectFiltersForAnalysis(query_ptr, context, storage_snapshot, options, query_info);
+
         /// Table.
         if (max_streams == 0)
             max_streams = 1;
 
         /// If necessary, we request more sources than the number of threads - to distribute the work evenly over the threads.
         if (max_streams > 1 && !is_sync_remote)
-            max_streams = static_cast<size_t>(max_streams * settings.max_streams_to_max_threads_ratio);
+        {
+            if (auto streams_with_ratio = max_streams * settings.max_streams_to_max_threads_ratio; canConvertTo<size_t>(streams_with_ratio))
+                max_streams = static_cast<size_t>(streams_with_ratio);
+            else
+                throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND,
+                    "Exceeded limit for `max_streams` with `max_streams_to_max_threads_ratio`. "
+                    "Make sure that `max_streams * max_streams_to_max_threads_ratio` is in some reasonable boundaries, current value: {}",
+                    streams_with_ratio);
+        }
 
         auto & prewhere_info = analysis_result.prewhere_info;
 
@@ -2536,6 +2596,10 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc
 
         query_info.storage_limits = std::make_shared<StorageLimitsList>(storage_limits);
         query_info.settings_limit_offset_done = options.settings_limit_offset_done;
+        /// Possible filters: row-security, additional filter, replica filter (before array join), where (after array join)
+        query_info.has_filters_and_no_array_join_before_filter = row_policy_filter || additional_filter_info
+            || parallel_replicas_custom_filter_info
+            || (analysis_result.hasWhere() && !analysis_result.before_where->hasArrayJoin() && !analysis_result.array_join);
         storage->read(query_plan, required_columns, storage_snapshot, query_info, context, processing_stage, max_block_size, max_streams);
 
         if (context->hasQueryContext() && !options.is_internal)
diff --git a/src/Interpreters/InterpreterSelectQuery.h b/src/Interpreters/InterpreterSelectQuery.h
index fbb53d71755..c307e457649 100644
--- a/src/Interpreters/InterpreterSelectQuery.h
+++ b/src/Interpreters/InterpreterSelectQuery.h
@@ -253,7 +253,7 @@ private:
     /// Used when we read from prepared input, not table or subquery.
     std::optional<Pipe> input_pipe;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     StorageMetadataPtr metadata_snapshot;
     StorageSnapshotPtr storage_snapshot;
 
diff --git a/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp b/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
index f498fc7ec85..539d7a59f6f 100644
--- a/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
+++ b/src/Interpreters/InterpreterSelectQueryAnalyzer.cpp
@@ -74,60 +74,26 @@ ContextMutablePtr buildContext(const ContextPtr & context, const SelectQueryOpti
 
 void replaceStorageInQueryTree(QueryTreeNodePtr & query_tree, const ContextPtr & context, const StoragePtr & storage)
 {
-    auto query_to_replace_table_expression = query_tree;
-    QueryTreeNodePtr table_expression_to_replace;
+    auto nodes = extractAllTableReferences(query_tree);
+    IQueryTreeNode::ReplacementMap replacement_map;
 
-    while (!table_expression_to_replace)
+    for (auto & node : nodes)
     {
-        if (auto * union_node = query_to_replace_table_expression->as<UnionNode>())
-            query_to_replace_table_expression = union_node->getQueries().getNodes().at(0);
+        auto & table_node = node->as<TableNode &>();
 
-        auto & query_to_replace_table_expression_typed = query_to_replace_table_expression->as<QueryNode &>();
-        auto left_table_expression = extractLeftTableExpression(query_to_replace_table_expression_typed.getJoinTree());
-        auto left_table_expression_node_type = left_table_expression->getNodeType();
+        /// Don't replace storage if table name differs
+        if (table_node.getStorageID().getFullNameNotQuoted() != storage->getStorageID().getFullNameNotQuoted())
+            continue;
 
-        switch (left_table_expression_node_type)
-        {
-            case QueryTreeNodeType::QUERY:
-            case QueryTreeNodeType::UNION:
-            {
-                query_to_replace_table_expression = std::move(left_table_expression);
-                break;
-            }
-            case QueryTreeNodeType::TABLE:
-            case QueryTreeNodeType::TABLE_FUNCTION:
-            case QueryTreeNodeType::IDENTIFIER:
-            {
-                table_expression_to_replace = std::move(left_table_expression);
-                break;
-            }
-            default:
-            {
-                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-                    "Expected table, table function or identifier node to replace with storage. Actual {}",
-                    left_table_expression->formatASTForErrorMessage());
-            }
-        }
+        auto replacement_table_expression = std::make_shared<TableNode>(storage, context);
+        replacement_table_expression->setAlias(node->getAlias());
+
+        if (auto table_expression_modifiers = table_node.getTableExpressionModifiers())
+            replacement_table_expression->setTableExpressionModifiers(*table_expression_modifiers);
+
+        replacement_map.emplace(node.get(), std::move(replacement_table_expression));
     }
-
-    /// Don't replace storage if table name differs
-    if (auto * table_node = table_expression_to_replace->as<TableNode>(); table_node && table_node->getStorageID().getFullNameNotQuoted() != storage->getStorageID().getFullNameNotQuoted())
-        return;
-
-    auto replacement_table_expression = std::make_shared<TableNode>(storage, context);
-    std::optional<TableExpressionModifiers> table_expression_modifiers;
-
-    if (auto * table_node = table_expression_to_replace->as<TableNode>())
-        table_expression_modifiers = table_node->getTableExpressionModifiers();
-    else if (auto * table_function_node = table_expression_to_replace->as<TableFunctionNode>())
-        table_expression_modifiers = table_function_node->getTableExpressionModifiers();
-    else if (auto * identifier_node = table_expression_to_replace->as<IdentifierNode>())
-        table_expression_modifiers = identifier_node->getTableExpressionModifiers();
-
-    if (table_expression_modifiers)
-        replacement_table_expression->setTableExpressionModifiers(*table_expression_modifiers);
-
-    query_tree = query_tree->cloneAndReplace(table_expression_to_replace, std::move(replacement_table_expression));
+    query_tree = query_tree->cloneAndReplace(replacement_map);
 }
 
 QueryTreeNodePtr buildQueryTreeAndRunPasses(const ASTPtr & query,
@@ -138,13 +104,13 @@ QueryTreeNodePtr buildQueryTreeAndRunPasses(const ASTPtr & query,
     auto query_tree = buildQueryTree(query, context);
 
     QueryTreePassManager query_tree_pass_manager(context);
-    addQueryTreePasses(query_tree_pass_manager);
+    addQueryTreePasses(query_tree_pass_manager, select_query_options.only_analyze);
 
     /// We should not apply any query tree level optimizations on shards
     /// because it can lead to a changed header.
     if (select_query_options.ignore_ast_optimizations
         || context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY)
-        query_tree_pass_manager.run(query_tree, 1 /*up_to_pass_index*/);
+        query_tree_pass_manager.runOnlyResolve(query_tree);
     else
         query_tree_pass_manager.run(query_tree);
 
diff --git a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
index 16bc4b1fe2e..cc1d7dd6531 100644
--- a/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
+++ b/src/Interpreters/InterpreterSelectWithUnionQuery.cpp
@@ -56,7 +56,7 @@ InterpreterSelectWithUnionQuery::InterpreterSelectWithUnionQuery(
 
     size_t num_children = ast->list_of_selects->children.size();
     if (!num_children)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no children in ASTSelectWithUnionQuery");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No children in ASTSelectWithUnionQuery");
 
     /// Note that we pass 'required_result_column_names' to first SELECT.
     /// And for the rest, we pass names at the corresponding positions of 'required_result_column_names' in the result of first SELECT,
diff --git a/src/Interpreters/InterpreterSetQuery.cpp b/src/Interpreters/InterpreterSetQuery.cpp
index 261c781e0ba..7e68fc5c4c1 100644
--- a/src/Interpreters/InterpreterSetQuery.cpp
+++ b/src/Interpreters/InterpreterSetQuery.cpp
@@ -19,7 +19,7 @@ BlockIO InterpreterSetQuery::execute()
     getContext()->checkSettingsConstraints(ast.changes, SettingSource::QUERY);
     auto session_context = getContext()->getSessionContext();
     session_context->applySettingsChanges(ast.changes);
-    session_context->addQueryParameters(ast.query_parameters);
+    session_context->addQueryParameters(NameToNameMap{ast.query_parameters.begin(), ast.query_parameters.end()});
     session_context->resetSettingsToDefaultValue(ast.default_settings);
     return {};
 }
diff --git a/src/Interpreters/InterpreterShowColumnsQuery.cpp b/src/Interpreters/InterpreterShowColumnsQuery.cpp
index 149ba6d7575..f32ebceaa63 100644
--- a/src/Interpreters/InterpreterShowColumnsQuery.cpp
+++ b/src/Interpreters/InterpreterShowColumnsQuery.cpp
@@ -107,7 +107,7 @@ SELECT
     '' 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.
+    // IStorage::getVirtualsList(). We can't easily do that via SQL.
 
     if (query.full)
     {
diff --git a/src/Interpreters/InterpreterShowCreateQuery.cpp b/src/Interpreters/InterpreterShowCreateQuery.cpp
index 9edac1fd8e1..0fca7b64d5a 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/DatabaseCatalog.h>
 #include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterShowCreateQuery.h>
diff --git a/src/Interpreters/InterpreterShowFunctionsQuery.cpp b/src/Interpreters/InterpreterShowFunctionsQuery.cpp
index e83f61eac53..96a730f6527 100644
--- a/src/Interpreters/InterpreterShowFunctionsQuery.cpp
+++ b/src/Interpreters/InterpreterShowFunctionsQuery.cpp
@@ -1,8 +1,8 @@
-#include <Interpreters/InterpreterFactory.h>
-#include <Interpreters/InterpreterShowFunctionsQuery.h>
-
+#include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/InterpreterFactory.h>
+#include <Interpreters/InterpreterShowFunctionsQuery.h>
 #include <Interpreters/executeQuery.h>
 #include <Parsers/ASTShowFunctionsQuery.h>
 
@@ -25,13 +25,13 @@ String InterpreterShowFunctionsQuery::getRewrittenQuery()
 
     const auto & query = query_ptr->as<ASTShowFunctionsQuery &>();
 
-    DatabasePtr systemDb = DatabaseCatalog::instance().getSystemDatabase();
+    DatabasePtr system_db = DatabaseCatalog::instance().getSystemDatabase();
 
     String rewritten_query = fmt::format(
         R"(
 SELECT *
 FROM {}.{})",
-        systemDb->getDatabaseName(),
+        system_db->getDatabaseName(),
         functions_table);
 
     if (!query.like.empty())
diff --git a/src/Interpreters/InterpreterSystemQuery.cpp b/src/Interpreters/InterpreterSystemQuery.cpp
index 6aa707b8082..9b4534601c3 100644
--- a/src/Interpreters/InterpreterSystemQuery.cpp
+++ b/src/Interpreters/InterpreterSystemQuery.cpp
@@ -10,6 +10,8 @@
 #include <Common/ShellCommand.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/FailPoint.h>
+#include <Common/PageCache.h>
+#include <Common/HostResolvePool.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Context.h>
@@ -20,7 +22,6 @@
 #include <Interpreters/ActionLocksManager.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
-#include <Interpreters/QueryLog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/QueryThreadLog.h>
 #include <Interpreters/QueryViewsLog.h>
@@ -36,7 +37,6 @@
 #include <Interpreters/ProcessorsProfileLog.h>
 #include <Interpreters/AsynchronousInsertLog.h>
 #include <Interpreters/BackupLog.h>
-#include <IO/S3/BlobStorageLogWriter.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
 #include <Interpreters/TransactionLog.h>
 #include <Interpreters/AsynchronousInsertQueue.h>
@@ -44,7 +44,6 @@
 #include <Access/AccessControl.h>
 #include <Access/ContextAccess.h>
 #include <Access/Common/AllowedClientHosts.h>
-#include <Databases/IDatabase.h>
 #include <Databases/DatabaseReplicated.h>
 #include <Disks/ObjectStorages/IMetadataStorage.h>
 #include <Storages/StorageDistributed.h>
@@ -60,6 +59,8 @@
 #include <Storages/System/StorageSystemFilesystemCache.h>
 #include <Parsers/ASTSystemQuery.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Common/ThreadFuzzer.h>
 #include <base/coverage.h>
 #include <csignal>
@@ -221,7 +222,7 @@ void InterpreterSystemQuery::startStopAction(StorageActionBlockType action_type,
 
 void InterpreterSystemQuery::startStopActionInDatabase(StorageActionBlockType action_type, bool start,
                                                        const String & database_name, const DatabasePtr & database,
-                                                       const ContextPtr & local_context, Poco::Logger * log)
+                                                       const ContextPtr & local_context, LoggerPtr log)
 {
     auto manager = local_context->getActionLocksManager();
     auto access = local_context->getAccess();
@@ -251,7 +252,7 @@ void InterpreterSystemQuery::startStopActionInDatabase(StorageActionBlockType ac
 
 
 InterpreterSystemQuery::InterpreterSystemQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
-        : WithMutableContext(context_), query_ptr(query_ptr_->clone()), log(&Poco::Logger::get("InterpreterSystemQuery"))
+        : WithMutableContext(context_), query_ptr(query_ptr_->clone()), log(getLogger("InterpreterSystemQuery"))
 {
 }
 
@@ -334,10 +335,17 @@ BlockIO InterpreterSystemQuery::execute()
         {
             getContext()->checkAccess(AccessType::SYSTEM_DROP_DNS_CACHE);
             DNSResolver::instance().dropCache();
+            HostResolversPool::instance().dropCache();
             /// Reinitialize clusters to update their resolved_addresses
             system_context->reloadClusterConfig();
             break;
         }
+        case Type::DROP_CONNECTIONS_CACHE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_CONNECTIONS_CACHE);
+            HTTPConnectionPools::instance().dropCache();
+            break;
+        }
         case Type::DROP_MARK_CACHE:
             getContext()->checkAccess(AccessType::SYSTEM_DROP_MARK_CACHE);
             system_context->clearMarkCache();
@@ -362,44 +370,49 @@ BlockIO InterpreterSystemQuery::execute()
             getContext()->checkAccess(AccessType::SYSTEM_DROP_QUERY_CACHE);
             getContext()->clearQueryCache();
             break;
-#if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
+#if USE_EMBEDDED_COMPILER
             getContext()->checkAccess(AccessType::SYSTEM_DROP_COMPILED_EXPRESSION_CACHE);
             if (auto * cache = CompiledExpressionCacheFactory::instance().tryGetCache())
                 cache->clear();
             break;
+#else
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "The server was compiled without the support for JIT compilation");
 #endif
-#if USE_AWS_S3
         case Type::DROP_S3_CLIENT_CACHE:
+#if USE_AWS_S3
             getContext()->checkAccess(AccessType::SYSTEM_DROP_S3_CLIENT_CACHE);
             S3::ClientCacheRegistry::instance().clearCacheForAll();
             break;
+#else
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "The server was compiled without the support for AWS S3");
 #endif
 
         case Type::DROP_FILESYSTEM_CACHE:
         {
             getContext()->checkAccess(AccessType::SYSTEM_DROP_FILESYSTEM_CACHE);
+            const auto user_id = FileCache::getCommonUser().user_id;
 
             if (query.filesystem_cache_name.empty())
             {
                 auto caches = FileCacheFactory::instance().getAll();
                 for (const auto & [_, cache_data] : caches)
-                    cache_data->cache->removeAllReleasable();
+                    cache_data->cache->removeAllReleasable(user_id);
             }
             else
             {
                 auto cache = FileCacheFactory::instance().getByName(query.filesystem_cache_name)->cache;
                 if (query.key_to_drop.empty())
                 {
-                    cache->removeAllReleasable();
+                    cache->removeAllReleasable(user_id);
                 }
                 else
                 {
                     auto key = FileCacheKey::fromKeyString(query.key_to_drop);
                     if (query.offset_to_drop.has_value())
-                        cache->removeFileSegment(key, query.offset_to_drop.value());
+                        cache->removeFileSegment(key, query.offset_to_drop.value(), user_id);
                     else
-                        cache->removeKey(key);
+                        cache->removeKey(key, user_id);
                 }
             }
             break;
@@ -424,7 +437,9 @@ BlockIO InterpreterSystemQuery::execute()
                 for (const auto & file_segment : file_segments)
                 {
                     size_t i = 0;
-                    const auto path = cache->getPathInLocalCache(file_segment.key, file_segment.offset, file_segment.kind);
+                    const auto path = cache->getFileSegmentPath(
+                        file_segment.key, file_segment.offset, file_segment.kind,
+                        FileCache::UserInfo(file_segment.user_id, file_segment.user_weight));
                     res_columns[i++]->insert(cache_name);
                     res_columns[i++]->insert(path);
                     res_columns[i++]->insert(file_segment.downloaded_size);
@@ -456,6 +471,13 @@ BlockIO InterpreterSystemQuery::execute()
         {
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Not implemented");
         }
+        case Type::DROP_PAGE_CACHE:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_DROP_PAGE_CACHE);
+
+            getContext()->dropPageCache();
+            break;
+        }
         case Type::DROP_SCHEMA_CACHE:
         {
             getContext()->checkAccess(AccessType::SYSTEM_DROP_SCHEMA_CACHE);
@@ -559,6 +581,14 @@ BlockIO InterpreterSystemQuery::execute()
             getContext()->checkAccess(AccessType::SYSTEM_RELOAD_USERS);
             system_context->getAccessControl().reload(AccessControl::ReloadMode::ALL);
             break;
+        case Type::RELOAD_ASYNCHRONOUS_METRICS:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_RELOAD_ASYNCHRONOUS_METRICS);
+            auto * asynchronous_metrics = system_context->getAsynchronousMetrics();
+            if (asynchronous_metrics)
+                asynchronous_metrics->update(std::chrono::system_clock::now(), /*force_update*/ true);
+            break;
+        }
         case Type::STOP_MERGES:
             startStopAction(ActionLocks::PartsMerge, false);
             break;
@@ -690,7 +720,7 @@ BlockIO InterpreterSystemQuery::execute()
         case Type::FLUSH_ASYNC_INSERT_QUEUE:
         {
             getContext()->checkAccess(AccessType::SYSTEM_FLUSH_ASYNC_INSERT_QUEUE);
-            auto * queue = getContext()->getAsynchronousInsertQueue();
+            auto * queue = getContext()->tryGetAsynchronousInsertQueue();
             if (!queue)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS,
                     "Cannot flush asynchronous insert queue because it is not initialized");
@@ -725,6 +755,14 @@ BlockIO InterpreterSystemQuery::execute()
             FailPointInjection::disableFailPoint(query.fail_point_name);
             break;
         }
+        case Type::WAIT_FAILPOINT:
+        {
+            getContext()->checkAccess(AccessType::SYSTEM_FAILPOINT);
+            LOG_TRACE(log, "waiting for failpoint {}", query.fail_point_name);
+            FailPointInjection::pauseFailPoint(query.fail_point_name);
+            LOG_TRACE(log, "finished failpoint {}", query.fail_point_name);
+            break;
+        }
         case Type::RESET_COVERAGE:
         {
             getContext()->checkAccess(AccessType::SYSTEM);
@@ -757,6 +795,12 @@ BlockIO InterpreterSystemQuery::execute()
             flushJemallocProfile("/tmp/jemalloc_clickhouse");
             break;
         }
+#else
+        case Type::JEMALLOC_PURGE:
+        case Type::JEMALLOC_ENABLE_PROFILE:
+        case Type::JEMALLOC_DISABLE_PROFILE:
+        case Type::JEMALLOC_FLUSH_PROFILE:
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "The server was compiled without JEMalloc");
 #endif
         default:
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unknown type of SYSTEM query");
@@ -818,7 +862,7 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
     auto & create = create_ast->as<ASTCreateQuery &>();
     create.attach = true;
 
-    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, true, false);
+    auto columns = InterpreterCreateQuery::getColumnsDescription(*create.columns_list->columns, system_context, LoadingStrictnessLevel::ATTACH);
     auto constraints = InterpreterCreateQuery::getConstraintsDescription(create.columns_list->constraints);
     auto data_path = database->getTableDataPath(create);
 
@@ -828,7 +872,7 @@ StoragePtr InterpreterSystemQuery::tryRestartReplica(const StorageID & replica,
         system_context->getGlobalContext(),
         columns,
         constraints,
-        false);
+        LoadingStrictnessLevel::ATTACH);
 
     database->attachTable(system_context, replica.table_name, table, data_path);
 
@@ -1070,9 +1114,11 @@ void InterpreterSystemQuery::syncReplica(ASTSystemQuery & query)
     {
         LOG_TRACE(log, "Synchronizing entries in replica's queue with table's log and waiting for current last entry to be processed");
         auto sync_timeout = getContext()->getSettingsRef().receive_timeout.totalMilliseconds();
-        if (!storage_replicated->waitForProcessingQueue(sync_timeout, query.sync_replica_mode))
+
+        std::unordered_set<std::string> replicas(query.src_replicas.begin(), query.src_replicas.end());
+        if (!storage_replicated->waitForProcessingQueue(sync_timeout, query.sync_replica_mode, replicas))
         {
-            LOG_ERROR(log, "SYNC REPLICA {}: Timed out!", table_id.getNameForLogs());
+            LOG_ERROR(log, "SYNC REPLICA {}: Timed out.", table_id.getNameForLogs());
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "SYNC REPLICA {}: command timed out. " \
                     "See the 'receive_timeout' setting", table_id.getNameForLogs());
         }
@@ -1128,12 +1174,16 @@ void InterpreterSystemQuery::syncTransactionLog()
 }
 
 
-void InterpreterSystemQuery::flushDistributed(ASTSystemQuery &)
+void InterpreterSystemQuery::flushDistributed(ASTSystemQuery & query)
 {
     getContext()->checkAccess(AccessType::SYSTEM_FLUSH_DISTRIBUTED, table_id);
 
+    SettingsChanges settings_changes;
+    if (query.query_settings)
+        settings_changes = query.query_settings->as<ASTSetQuery>()->changes;
+
     if (auto * storage_distributed = dynamic_cast<StorageDistributed *>(DatabaseCatalog::instance().getTable(table_id, getContext()).get()))
-        storage_distributed->flushClusterNodesAllData(getContext());
+        storage_distributed->flushClusterNodesAllData(getContext(), settings_changes);
     else
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table {} is not distributed", table_id.getNameForLogs());
 }
@@ -1172,22 +1222,20 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             break;
         }
         case Type::DROP_DNS_CACHE:
+        case Type::DROP_CONNECTIONS_CACHE:
         case Type::DROP_MARK_CACHE:
         case Type::DROP_MMAP_CACHE:
         case Type::DROP_QUERY_CACHE:
-#if USE_EMBEDDED_COMPILER
         case Type::DROP_COMPILED_EXPRESSION_CACHE:
-#endif
         case Type::DROP_UNCOMPRESSED_CACHE:
         case Type::DROP_INDEX_MARK_CACHE:
         case Type::DROP_INDEX_UNCOMPRESSED_CACHE:
         case Type::DROP_FILESYSTEM_CACHE:
         case Type::SYNC_FILESYSTEM_CACHE:
+        case Type::DROP_PAGE_CACHE:
         case Type::DROP_SCHEMA_CACHE:
         case Type::DROP_FORMAT_SCHEMA_CACHE:
-#if USE_AWS_S3
         case Type::DROP_S3_CLIENT_CACHE:
-#endif
         {
             required_access.emplace_back(AccessType::SYSTEM_DROP_CACHE);
             break;
@@ -1223,6 +1271,11 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_RELOAD_USERS);
             break;
         }
+        case Type::RELOAD_ASYNCHRONOUS_METRICS:
+        {
+            required_access.emplace_back(AccessType::SYSTEM_RELOAD_ASYNCHRONOUS_METRICS);
+            break;
+        }
         case Type::STOP_MERGES:
         case Type::START_MERGES:
         {
@@ -1398,7 +1451,6 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_LISTEN);
             break;
         }
-#if USE_JEMALLOC
         case Type::JEMALLOC_PURGE:
         case Type::JEMALLOC_ENABLE_PROFILE:
         case Type::JEMALLOC_DISABLE_PROFILE:
@@ -1407,10 +1459,10 @@ AccessRightsElements InterpreterSystemQuery::getRequiredAccessForDDLOnCluster()
             required_access.emplace_back(AccessType::SYSTEM_JEMALLOC);
             break;
         }
-#endif
         case Type::STOP_THREAD_FUZZER:
         case Type::START_THREAD_FUZZER:
         case Type::ENABLE_FAILPOINT:
+        case Type::WAIT_FAILPOINT:
         case Type::DISABLE_FAILPOINT:
         case Type::RESET_COVERAGE:
         case Type::UNKNOWN:
diff --git a/src/Interpreters/InterpreterSystemQuery.h b/src/Interpreters/InterpreterSystemQuery.h
index 89de7402b4d..1419c430aca 100644
--- a/src/Interpreters/InterpreterSystemQuery.h
+++ b/src/Interpreters/InterpreterSystemQuery.h
@@ -43,11 +43,11 @@ public:
 
     static void startStopActionInDatabase(StorageActionBlockType action_type, bool start,
                                           const String & database_name, const DatabasePtr & database,
-                                          const ContextPtr & local_context, Poco::Logger * log);
+                                          const ContextPtr & local_context, LoggerPtr log);
 
 private:
     ASTPtr query_ptr;
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
     StorageID table_id = StorageID::createEmpty();      /// Will be set up if query contains table name
     VolumePtr volume_ptr;
 
diff --git a/src/Interpreters/InterpreterTransactionControlQuery.cpp b/src/Interpreters/InterpreterTransactionControlQuery.cpp
index b1758013f18..d31ace758c4 100644
--- a/src/Interpreters/InterpreterTransactionControlQuery.cpp
+++ b/src/Interpreters/InterpreterTransactionControlQuery.cpp
@@ -52,7 +52,12 @@ BlockIO InterpreterTransactionControlQuery::executeCommit(ContextMutablePtr sess
 {
     auto txn = session_context->getCurrentTransaction();
     if (!txn)
-        throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
+    {
+        if (session_context->getClientInfo().interface == ClientInfo::Interface::MYSQL)
+            return {};
+        else
+            throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
+    }
     if (txn->getState() != MergeTreeTransaction::RUNNING)
         throw Exception(ErrorCodes::INVALID_TRANSACTION, "Transaction is not in RUNNING state");
 
@@ -111,7 +116,12 @@ BlockIO InterpreterTransactionControlQuery::executeRollback(ContextMutablePtr se
 {
     auto txn = session_context->getCurrentTransaction();
     if (!txn)
-        throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
+    {
+        if (session_context->getClientInfo().interface == ClientInfo::Interface::MYSQL)
+            return {};
+        else
+            throw Exception(ErrorCodes::INVALID_TRANSACTION, "There is no current transaction");
+    }
     if (txn->getState() == MergeTreeTransaction::COMMITTED)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Transaction is in COMMITTED state");
     if (txn->getState() == MergeTreeTransaction::COMMITTING)
diff --git a/src/Interpreters/InterpreterUndropQuery.cpp b/src/Interpreters/InterpreterUndropQuery.cpp
index 8401c47df6b..920df3d6aed 100644
--- a/src/Interpreters/InterpreterUndropQuery.cpp
+++ b/src/Interpreters/InterpreterUndropQuery.cpp
@@ -1,4 +1,5 @@
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/executeDDLQueryOnCluster.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterUndropQuery.h>
@@ -17,14 +18,16 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
 }
 
-InterpreterUndropQuery::InterpreterUndropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_) : WithMutableContext(context_), query_ptr(query_ptr_)
+InterpreterUndropQuery::InterpreterUndropQuery(const ASTPtr & query_ptr_, ContextMutablePtr context_)
+    : WithMutableContext(context_)
+    , query_ptr(query_ptr_)
 {
 }
 
-
 BlockIO InterpreterUndropQuery::execute()
 {
     getContext()->checkAccess(AccessType::UNDROP_TABLE);
+
     auto & undrop = query_ptr->as<ASTUndropQuery &>();
     if (!undrop.cluster.empty() && !maybeRemoveOnCluster(query_ptr, getContext()))
     {
diff --git a/src/Interpreters/InterpreterWatchQuery.cpp b/src/Interpreters/InterpreterWatchQuery.cpp
index 2b68c5d7a10..4937d8660e0 100644
--- a/src/Interpreters/InterpreterWatchQuery.cpp
+++ b/src/Interpreters/InterpreterWatchQuery.cpp
@@ -12,9 +12,10 @@ limitations under the License. */
 #include <Core/Settings.h>
 #include <Common/typeid_cast.h>
 #include <Parsers/ASTWatchQuery.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterFactory.h>
 #include <Interpreters/InterpreterWatchQuery.h>
-#include <Interpreters/Context.h>
 #include <Access/Common/AccessFlags.h>
 #include <QueryPipeline/StreamLocalLimits.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
diff --git a/src/Interpreters/InterserverCredentials.cpp b/src/Interpreters/InterserverCredentials.cpp
index 094b58789a8..c344732a262 100644
--- a/src/Interpreters/InterserverCredentials.cpp
+++ b/src/Interpreters/InterserverCredentials.cpp
@@ -35,7 +35,7 @@ InterserverCredentials::CurrentCredentials InterserverCredentials::parseCredenti
     const Poco::Util::AbstractConfiguration & config,
     const std::string & root_tag)
 {
-    auto * log = &Poco::Logger::get("InterserverCredentials");
+    auto log = getLogger("InterserverCredentials");
     CurrentCredentials store;
     store.emplace_back(current_user_, current_password_);
     if (config.getBool(root_tag + ".allow_empty", false))
diff --git a/src/Interpreters/JIT/compileFunction.cpp b/src/Interpreters/JIT/compileFunction.cpp
index f50a122f9a2..31d3920ccfd 100644
--- a/src/Interpreters/JIT/compileFunction.cpp
+++ b/src/Interpreters/JIT/compileFunction.cpp
@@ -2,16 +2,17 @@
 
 #if USE_EMBEDDED_COMPILER
 
-#include <llvm/IR/BasicBlock.h>
-#include <llvm/IR/Function.h>
-#include <llvm/IR/IRBuilder.h>
+#    include <AggregateFunctions/IAggregateFunction.h>
+#    include <Columns/ColumnNullable.h>
+#    include <DataTypes/DataTypeNullable.h>
+#    include <DataTypes/Native.h>
+#    include <Interpreters/JIT/CHJIT.h>
+#    include <Common/ProfileEvents.h>
+#    include <Common/Stopwatch.h>
 
-#include <Common/Stopwatch.h>
-#include <Common/ProfileEvents.h>
-#include <DataTypes/Native.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <Columns/ColumnNullable.h>
-#include <Interpreters/JIT/CHJIT.h>
+#    include <llvm/IR/BasicBlock.h>
+#    include <llvm/IR/Function.h>
+#    include <llvm/IR/IRBuilder.h>
 
 namespace
 {
diff --git a/src/Interpreters/JIT/compileFunction.h b/src/Interpreters/JIT/compileFunction.h
index 84abfa0925a..551e4d0bb11 100644
--- a/src/Interpreters/JIT/compileFunction.h
+++ b/src/Interpreters/JIT/compileFunction.h
@@ -4,10 +4,10 @@
 
 #if USE_EMBEDDED_COMPILER
 
-#include <Core/SortDescription.h>
-#include <Functions/IFunction.h>
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <Interpreters/JIT/CHJIT.h>
+#    include <AggregateFunctions/IAggregateFunction_fwd.h>
+#    include <Core/SortDescription.h>
+#    include <Functions/IFunction.h>
+#    include <Interpreters/JIT/CHJIT.h>
 
 
 namespace DB
diff --git a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
index bf2d1eb79cd..5cda4c982b4 100644
--- a/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
+++ b/src/Interpreters/JoinToSubqueryTransformVisitor.cpp
@@ -15,11 +15,10 @@
 #include <Parsers/ASTColumnsTransformers.h>
 #include <Parsers/ASTQualifiedAsterisk.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
-#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
-#include <IO/WriteHelpers.h>
 #include <Core/Defines.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Common/re2.h>
 
 namespace DB
 {
@@ -30,6 +29,7 @@ namespace ErrorCodes
     extern const int AMBIGUOUS_COLUMN_NAME;
     extern const int NOT_IMPLEMENTED;
     extern const int UNKNOWN_IDENTIFIER;
+    extern const int CANNOT_COMPILE_REGEXP;
 }
 
 namespace
@@ -43,7 +43,7 @@ ASTPtr makeSubqueryTemplate(const String & table_alias)
     String query_template = "(select * from _t)";
     if (!table_alias.empty())
         query_template += " as " + table_alias;
-    ASTPtr subquery_template = parseQuery(parser, query_template, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr subquery_template = parseQuery(parser, query_template, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     if (!subquery_template)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot parse subquery template");
     return subquery_template;
@@ -168,7 +168,7 @@ private:
                 has_asterisks = true;
 
                 if (!qualified_asterisk->qualifier)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: qualified asterisk must have a qualifier");
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Qualified asterisk must have a qualifier");
 
                 auto & identifier = qualified_asterisk->qualifier->as<ASTIdentifier &>();
 
@@ -183,7 +183,7 @@ private:
                             transformer->as<ASTColumnsReplaceTransformer>())
                             IASTColumnsTransformer::transform(transformer, columns);
                         else
-                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: qualified asterisk must only have children of IASTColumnsTransformer type");
+                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Qualified asterisk must only have children of IASTColumnsTransformer type");
                     }
                 }
             }
@@ -204,11 +204,17 @@ private:
             {
                 has_asterisks = true;
 
+                String pattern = columns_regexp_matcher->getPattern();
+                re2::RE2 regexp(pattern, re2::RE2::Quiet);
+                if (!regexp.ok())
+                    throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP,
+                        "COLUMNS pattern {} cannot be compiled: {}", pattern, regexp.error());
+
                 for (auto & table_name : data.tables_order)
                     data.addTableColumns(
                         table_name,
                         columns,
-                        [&](const String & column_name) { return columns_regexp_matcher->isColumnMatching(column_name); });
+                        [&](const String & column_name) { return re2::RE2::PartialMatch(column_name, regexp); });
 
                 if (columns_regexp_matcher->transformers)
                 {
diff --git a/src/Interpreters/JoinedTables.cpp b/src/Interpreters/JoinedTables.cpp
index c104af770f0..5b549a19083 100644
--- a/src/Interpreters/JoinedTables.cpp
+++ b/src/Interpreters/JoinedTables.cpp
@@ -2,6 +2,7 @@
 
 #include <Core/SettingsEnums.h>
 
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/IdentifierSemantic.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/InJoinSubqueriesPreprocessor.h>
@@ -272,7 +273,7 @@ void JoinedTables::makeFakeTable(StoragePtr storage, const StorageMetadataPtr &
         auto & table = tables_with_columns.back();
         table.addHiddenColumns(storage_columns.getMaterialized());
         table.addHiddenColumns(storage_columns.getAliases());
-        table.addHiddenColumns(storage->getVirtuals());
+        table.addHiddenColumns(storage->getVirtualsList());
     }
     else
         tables_with_columns.emplace_back(DatabaseAndTableWithAlias{}, source_header.getNamesAndTypesList());
@@ -335,12 +336,12 @@ std::shared_ptr<TableJoin> JoinedTables::makeTableJoin(const ASTSelectQuery & se
                 auto dictionary = dictionary_helper.getDictionary(dictionary_name);
                 if (!dictionary)
                 {
-                    LOG_TRACE(&Poco::Logger::get("JoinedTables"), "Can't use dictionary join: dictionary '{}' was not found", dictionary_name);
+                    LOG_TRACE(getLogger("JoinedTables"), "Can't use dictionary join: dictionary '{}' was not found", dictionary_name);
                     return nullptr;
                 }
                 if (dictionary->getSpecialKeyType() == DictionarySpecialKeyType::Range)
                 {
-                    LOG_TRACE(&Poco::Logger::get("JoinedTables"), "Can't use dictionary join: dictionary '{}' is a range dictionary", dictionary_name);
+                    LOG_TRACE(getLogger("JoinedTables"), "Can't use dictionary join: dictionary '{}' is a range dictionary", dictionary_name);
                     return nullptr;
                 }
 
diff --git a/src/Interpreters/MergeJoin.cpp b/src/Interpreters/MergeJoin.cpp
index f0427b5a6ca..d5fb0208d45 100644
--- a/src/Interpreters/MergeJoin.cpp
+++ b/src/Interpreters/MergeJoin.cpp
@@ -239,7 +239,7 @@ public:
 
         /// SortCursorImpl can work with permutation, but MergeJoinCursor can't.
         if (impl.permutation)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: MergeJoinCursor doesn't support permutation");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "MergeJoinCursor doesn't support permutation");
     }
 
     size_t position() const { return impl.getRow(); }
@@ -492,7 +492,7 @@ MergeJoin::MergeJoin(std::shared_ptr<TableJoin> table_join_, const Block & right
     , max_joined_block_rows(table_join->maxJoinedBlockRows())
     , max_rows_in_right_block(table_join->maxRowsInRightBlock())
     , max_files_to_merge(table_join->maxFilesToMerge())
-    , log(&Poco::Logger::get("MergeJoin"))
+    , log(getLogger("MergeJoin"))
 {
     switch (table_join->strictness())
     {
@@ -1124,7 +1124,7 @@ IBlocksStreamPtr MergeJoin::getNonJoinedBlocks(
     if (table_join->strictness() == JoinStrictness::All && (is_right || is_full))
     {
         size_t left_columns_count = left_sample_block.columns();
-        assert(left_columns_count == result_sample_block.columns() - right_columns_to_add.columns());
+        chassert(left_columns_count == result_sample_block.columns() - right_columns_to_add.columns());
         auto non_joined = std::make_unique<NotJoinedMerge>(*this, max_block_size);
         return std::make_unique<NotJoinedBlocks>(std::move(non_joined), result_sample_block, left_columns_count, *table_join);
     }
diff --git a/src/Interpreters/MergeJoin.h b/src/Interpreters/MergeJoin.h
index 98fae1d419f..4486c134d51 100644
--- a/src/Interpreters/MergeJoin.h
+++ b/src/Interpreters/MergeJoin.h
@@ -117,7 +117,7 @@ private:
 
     Names lowcard_right_keys;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     void changeLeftColumns(Block & block, MutableColumns && columns) const;
     void addRightColumns(Block & block, MutableColumns && columns);
diff --git a/src/Interpreters/MetricLog.cpp b/src/Interpreters/MetricLog.cpp
index 5f6db0da520..6ed29cfadcb 100644
--- a/src/Interpreters/MetricLog.cpp
+++ b/src/Interpreters/MetricLog.cpp
@@ -1,12 +1,13 @@
-#include <base/getFQDNOrHostName.h>
-#include <Interpreters/MetricLog.h>
-#include <Common/ThreadPool.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/MetricLog.h>
+#include <base/getFQDNOrHostName.h>
+#include <Common/DateLUTImpl.h>
+#include <Common/ThreadPool.h>
 
 
 namespace DB
diff --git a/src/Interpreters/MetricLog.h b/src/Interpreters/MetricLog.h
index 482681d8276..4f1e8fafc11 100644
--- a/src/Interpreters/MetricLog.h
+++ b/src/Interpreters/MetricLog.h
@@ -31,7 +31,6 @@ struct MetricLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 
diff --git a/src/Interpreters/MonotonicityCheckVisitor.h b/src/Interpreters/MonotonicityCheckVisitor.h
index cc386825024..e1df45ed36b 100644
--- a/src/Interpreters/MonotonicityCheckVisitor.h
+++ b/src/Interpreters/MonotonicityCheckVisitor.h
@@ -41,7 +41,7 @@ public:
             /// if GROUP BY contains the same function ORDER BY shouldn't be optimized
             const auto hash = ast_function.getTreeHash(/*ignore_aliases=*/ true);
             const auto key = toString(hash);
-            if (group_by_function_hashes.count(key))
+            if (group_by_function_hashes.contains(key))
                 return false;
 
             /// if ORDER BY contains aggregate function or window functions, it
diff --git a/src/Interpreters/MutationsInterpreter.cpp b/src/Interpreters/MutationsInterpreter.cpp
index b478382b10d..35fd549559b 100644
--- a/src/Interpreters/MutationsInterpreter.cpp
+++ b/src/Interpreters/MutationsInterpreter.cpp
@@ -7,7 +7,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/StorageMergeTree.h>
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/CreatingSetsTransform.h>
@@ -31,7 +31,6 @@
 #include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <DataTypes/NestedUtils.h>
 #include <Interpreters/PreparedSets.h>
-#include <Storages/LightweightDeleteDescription.h>
 #include <Storages/MergeTree/MergeTreeSequentialSource.h>
 #include <Processors/Sources/ThrowingExceptionSource.h>
 #include <Analyzer/QueryTreeBuilder.h>
@@ -262,16 +261,16 @@ MutationCommand createCommandToApplyDeletedMask(const MutationCommand & command)
 
     auto alter_command = std::make_shared<ASTAlterCommand>();
     alter_command->type = ASTAlterCommand::DELETE;
-    alter_command->partition = command.partition;
+    alter_command->partition = alter_command->children.emplace_back(command.partition).get();
 
     auto row_exists_predicate = makeASTFunction("equals",
-        std::make_shared<ASTIdentifier>(LightweightDeleteDescription::FILTER_COLUMN.name),
+        std::make_shared<ASTIdentifier>(RowExistsColumn::name),
         std::make_shared<ASTLiteral>(Field(0)));
 
     if (command.predicate)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Mutation command APPLY DELETED MASK does not support WHERE clause");
 
-    alter_command->predicate = row_exists_predicate;
+    alter_command->predicate = alter_command->children.emplace_back(std::move(row_exists_predicate)).get();
 
     auto mutation_command = MutationCommand::parse(alter_command.get());
     if (!mutation_command)
@@ -342,6 +341,11 @@ bool MutationsInterpreter::Source::hasProjection(const String & name) const
     return part && part->hasProjection(name);
 }
 
+bool MutationsInterpreter::Source::hasBrokenProjection(const String & name) const
+{
+    return part && part->hasBrokenProjection(name);
+}
+
 bool MutationsInterpreter::Source::isCompactPart() const
 {
     return part && part->getType() == MergeTreeDataPartType::Compact;
@@ -350,7 +354,8 @@ bool MutationsInterpreter::Source::isCompactPart() const
 static Names getAvailableColumnsWithVirtuals(StorageMetadataPtr metadata_snapshot, const IStorage & storage)
 {
     auto all_columns = metadata_snapshot->getColumns().getNamesOfPhysical();
-    for (const auto & column : storage.getVirtuals())
+    auto virtuals = storage.getVirtualsPtr();
+    for (const auto & column : *virtuals)
         all_columns.push_back(column.name);
     return all_columns;
 }
@@ -402,10 +407,18 @@ MutationsInterpreter::MutationsInterpreter(
     , metadata_snapshot(metadata_snapshot_)
     , commands(std::move(commands_))
     , available_columns(std::move(available_columns_))
-    , context(Context::createCopy(context_))
     , settings(std::move(settings_))
     , select_limits(SelectQueryOptions().analyze(!settings.can_execute).ignoreLimits())
+    , logger(getLogger("MutationsInterpreter(" + source.getStorage()->getStorageID().getFullTableName() + ")"))
 {
+    auto new_context = Context::createCopy(context_);
+    if (new_context->getSettingsRef().allow_experimental_analyzer)
+    {
+        new_context->setSetting("allow_experimental_analyzer", false);
+        LOG_DEBUG(logger, "Will use old analyzer to prepare mutation");
+    }
+    context = std::move(new_context);
+
     prepare(!settings.can_execute);
 }
 
@@ -435,60 +448,54 @@ static NameSet getKeyColumns(const MutationsInterpreter::Source & source, const
 
 static void validateUpdateColumns(
     const MutationsInterpreter::Source & source,
-    const StorageMetadataPtr & metadata_snapshot, const NameSet & updated_columns,
-    const std::unordered_map<String, Names> & column_to_affected_materialized)
+    const StorageMetadataPtr & metadata_snapshot,
+    const NameSet & updated_columns,
+    const std::unordered_map<String, Names> & column_to_affected_materialized,
+    const ContextPtr & context)
 {
+    auto storage_snapshot = source.getStorageSnapshot(metadata_snapshot, context);
     NameSet key_columns = getKeyColumns(source, metadata_snapshot);
 
-    for (const String & column_name : updated_columns)
+    const auto & storage_columns = storage_snapshot->metadata->getColumns();
+    const auto & virtual_columns = *storage_snapshot->virtual_columns;
+
+    for (const auto & column_name : updated_columns)
     {
-        auto found = false;
-        for (const auto & col : metadata_snapshot->getColumns().getOrdinary())
-        {
-            if (col.name == column_name)
-            {
-                found = true;
-                break;
-            }
-        }
-
-        /// Allow to override value of lightweight delete filter virtual column
-        if (!found && column_name == LightweightDeleteDescription::FILTER_COLUMN.name)
-        {
-            if (!source.supportsLightweightDelete())
-                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Lightweight delete is not supported for table");
-            found = true;
-        }
-
-        /// Dont allow to override value of block number virtual column
-        if (!found && column_name == BlockNumberColumn::name)
-        {
-            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Update is not supported for virtual column {} ", backQuote(column_name));
-        }
-
-        if (!found)
-        {
-            for (const auto & col : metadata_snapshot->getColumns().getMaterialized())
-            {
-                if (col.name == column_name)
-                    throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN, "Cannot UPDATE materialized column {}", backQuote(column_name));
-            }
-
-            throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no column {} in table", backQuote(column_name));
-        }
-
         if (key_columns.contains(column_name))
             throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN, "Cannot UPDATE key column {}", backQuote(column_name));
 
+        if (storage_columns.tryGetColumn(GetColumnsOptions::Materialized, column_name))
+            throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN, "Cannot UPDATE materialized column {}", backQuote(column_name));
+
         auto materialized_it = column_to_affected_materialized.find(column_name);
         if (materialized_it != column_to_affected_materialized.end())
         {
-            for (const String & materialized : materialized_it->second)
+            for (const auto & materialized : materialized_it->second)
             {
                 if (key_columns.contains(materialized))
+                {
                     throw Exception(ErrorCodes::CANNOT_UPDATE_COLUMN,
                                     "Updated column {} affects MATERIALIZED column {}, which is a key column. "
                                     "Cannot UPDATE it.", backQuote(column_name), backQuote(materialized));
+                }
+            }
+        }
+
+        if (!storage_columns.tryGetColumn(GetColumnsOptions::Ordinary, column_name))
+        {
+            /// Allow to override value of lightweight delete filter virtual column
+            if (column_name == RowExistsColumn::name)
+            {
+                if (!source.supportsLightweightDelete())
+                    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Lightweight delete is not supported for table");
+            }
+            else if (virtual_columns.tryGet(column_name))
+            {
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Update is not supported for virtual column {} ", backQuote(column_name));
+            }
+            else
+            {
+                throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no column {} in table", backQuote(column_name));
             }
         }
     }
@@ -546,8 +553,8 @@ void MutationsInterpreter::prepare(bool dry_run)
     /// 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);
+        all_columns.emplace_back(RowExistsColumn::name, RowExistsColumn::type);
+        available_columns_set.insert(RowExistsColumn::name);
     }
 
     NameSet updated_columns;
@@ -563,9 +570,7 @@ void MutationsInterpreter::prepare(bool dry_run)
 
         for (const auto & [name, _] : command.column_to_update_expression)
         {
-            if (!available_columns_set.contains(name)
-                && name != LightweightDeleteDescription::FILTER_COLUMN.name
-                && name != BlockNumberColumn::name)
+            if (!available_columns_set.contains(name) && name != RowExistsColumn::name)
                 throw Exception(ErrorCodes::THERE_IS_NO_COLUMN,
                     "Column {} is updated but not requested to read", name);
 
@@ -590,7 +595,7 @@ void MutationsInterpreter::prepare(bool dry_run)
             }
         }
 
-        validateUpdateColumns(source, metadata_snapshot, updated_columns, column_to_affected_materialized);
+        validateUpdateColumns(source, metadata_snapshot, updated_columns, column_to_affected_materialized, context);
     }
 
     StorageInMemoryMetadata::HasDependencyCallback has_dependency =
@@ -666,15 +671,11 @@ void MutationsInterpreter::prepare(bool dry_run)
                 {
                     type = physical_column->type;
                 }
-                else if (column_name == LightweightDeleteDescription::FILTER_COLUMN.name)
+                else if (column_name == RowExistsColumn::name)
                 {
-                    type = LightweightDeleteDescription::FILTER_COLUMN.type;
+                    type = RowExistsColumn::type;
                     deleted_mask_updated = true;
                 }
-                else if (column_name == BlockNumberColumn::name)
-                {
-                    type = BlockNumberColumn::type;
-                }
                 else
                 {
                     throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown column {}", column_name);
@@ -807,7 +808,7 @@ void MutationsInterpreter::prepare(bool dry_run)
         {
             mutation_kind.set(MutationKind::MUTATE_INDEX_STATISTIC_PROJECTION);
             const auto & projection = projections_desc.get(command.projection_name);
-            if (!source.hasProjection(projection.name))
+            if (!source.hasProjection(projection.name) || source.hasBrokenProjection(projection.name))
             {
                 for (const auto & column : projection.required_columns)
                     dependencies.emplace(column, ColumnDependency::PROJECTION);
@@ -994,6 +995,14 @@ void MutationsInterpreter::prepare(bool dry_run)
         if (!source.hasProjection(projection.name))
             continue;
 
+        /// Always rebuild broken projections.
+        if (source.hasBrokenProjection(projection.name))
+        {
+            LOG_DEBUG(logger, "Will rebuild broken projection {}", projection.name);
+            materialized_projections.insert(projection.name);
+            continue;
+        }
+
         if (need_rebuild_projections)
         {
             materialized_projections.insert(projection.name);
@@ -1028,7 +1037,7 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
 
     /// Add _row_exists column if it is present in the part
     if (source.hasLightweightDeleteMask() || deleted_mask_updated)
-        all_columns.push_back(LightweightDeleteDescription::FILTER_COLUMN);
+        all_columns.emplace_back(RowExistsColumn::name, RowExistsColumn::type);
 
     bool has_filters = false;
     /// Next, for each stage calculate columns changed by this and previous stages.
@@ -1038,7 +1047,7 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
         {
             for (const auto & column : all_columns)
             {
-                if (column.name == LightweightDeleteDescription::FILTER_COLUMN.name && !deleted_mask_updated)
+                if (column.name == RowExistsColumn::name && !deleted_mask_updated)
                     continue;
 
                 prepared_stages[i].output_columns.insert(column.name);
@@ -1057,7 +1066,7 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
             /// and so it is not in the list of AllPhysical columns.
             for (const auto & [column_name, _] : prepared_stages[i].column_to_updated)
             {
-                if (column_name == LightweightDeleteDescription::FILTER_COLUMN.name && has_filters && !deleted_mask_updated)
+                if (column_name == RowExistsColumn::name && has_filters && !deleted_mask_updated)
                     continue;
 
                 prepared_stages[i].output_columns.insert(column_name);
@@ -1148,93 +1157,6 @@ void MutationsInterpreter::prepareMutationStages(std::vector<Stage> & prepared_s
     }
 }
 
-/// This structure re-implements adding virtual columns while reading from MergeTree part.
-/// It would be good to unify it with IMergeTreeSelectAlgorithm.
-struct VirtualColumns
-{
-    struct ColumnAndPosition
-    {
-        ColumnWithTypeAndName column;
-        size_t position;
-    };
-
-    using Columns = std::vector<ColumnAndPosition>;
-
-    Columns virtuals;
-    Names columns_to_read;
-
-    VirtualColumns(Names required_columns, const MergeTreeData::DataPartPtr & part) : columns_to_read(std::move(required_columns))
-    {
-        for (size_t i = 0; i < columns_to_read.size(); ++i)
-        {
-            if (columns_to_read[i] == LightweightDeleteDescription::FILTER_COLUMN.name)
-            {
-                if (!part->getColumns().contains(LightweightDeleteDescription::FILTER_COLUMN.name))
-                {
-                    ColumnWithTypeAndName mask_column;
-                    mask_column.type = LightweightDeleteDescription::FILTER_COLUMN.type;
-                    mask_column.column = mask_column.type->createColumnConst(0, 1);
-                    mask_column.name = std::move(columns_to_read[i]);
-
-                    virtuals.emplace_back(ColumnAndPosition{.column = std::move(mask_column), .position = i});
-                }
-            }
-            else if (columns_to_read[i] == "_partition_id")
-            {
-                ColumnWithTypeAndName column;
-                column.type = std::make_shared<DataTypeString>();
-                column.column = column.type->createColumnConst(0, part->info.partition_id);
-                column.name = std::move(columns_to_read[i]);
-
-                virtuals.emplace_back(ColumnAndPosition{.column = std::move(column), .position = i});
-            }
-            else if (columns_to_read[i] == BlockNumberColumn::name)
-            {
-                if (!part->getColumns().contains(BlockNumberColumn::name))
-                {
-                    ColumnWithTypeAndName block_number_column;
-                    block_number_column.type = BlockNumberColumn::type;
-                    block_number_column.column = block_number_column.type->createColumnConst(0, part->info.min_block);
-                    block_number_column.name = std::move(columns_to_read[i]);
-
-                    virtuals.emplace_back(ColumnAndPosition{.column = std::move(block_number_column), .position = i});
-                }
-            }
-        }
-
-        if (!virtuals.empty())
-        {
-            Names columns_no_virtuals;
-            columns_no_virtuals.reserve(columns_to_read.size());
-            size_t next_virtual = 0;
-            for (size_t i = 0; i < columns_to_read.size(); ++i)
-            {
-                if (next_virtual < virtuals.size() && i == virtuals[next_virtual].position)
-                    ++next_virtual;
-                else
-                    columns_no_virtuals.emplace_back(std::move(columns_to_read[i]));
-            }
-
-            columns_to_read.swap(columns_no_virtuals);
-        }
-    }
-
-    void addVirtuals(QueryPlan & plan)
-    {
-        auto dag = std::make_unique<ActionsDAG>(plan.getCurrentDataStream().header.getColumnsWithTypeAndName());
-
-        for (auto & column : virtuals)
-        {
-            const auto & adding_const = dag->addColumn(std::move(column.column));
-            auto & outputs = dag->getOutputs();
-            outputs.insert(outputs.begin() + column.position, &adding_const);
-        }
-
-        auto step = std::make_unique<ExpressionStep>(plan.getCurrentDataStream(), std::move(dag));
-        plan.addStep(std::move(step));
-    }
-};
-
 void MutationsInterpreter::Source::read(
     Stage & first_stage,
     QueryPlan & plan,
@@ -1274,19 +1196,15 @@ void MutationsInterpreter::Source::read(
             for (size_t i = 0; i < num_filters; ++i)
                 nodes[i] = &steps[i]->actions()->findInOutputs(names[i]);
 
-            filter = ActionsDAG::buildFilterActionsDAG(nodes, {}, context_);
+            filter = ActionsDAG::buildFilterActionsDAG(nodes);
         }
 
-        VirtualColumns virtual_columns(std::move(required_columns), part);
-
         createReadFromPartStep(
             MergeTreeSequentialSourceType::Mutation,
-            plan, *data, storage_snapshot, part,
-            std::move(virtual_columns.columns_to_read),
+            plan, *data, storage_snapshot,
+            part, required_columns,
             apply_deleted_mask_, filter, context_,
-            &Poco::Logger::get("MutationsInterpreter"));
-
-        virtual_columns.addVirtuals(plan);
+            getLogger("MutationsInterpreter"));
     }
     else
     {
diff --git a/src/Interpreters/MutationsInterpreter.h b/src/Interpreters/MutationsInterpreter.h
index eda94190185..2d01c7154c8 100644
--- a/src/Interpreters/MutationsInterpreter.h
+++ b/src/Interpreters/MutationsInterpreter.h
@@ -126,6 +126,7 @@ public:
         bool materializeTTLRecalculateOnly() const;
         bool hasSecondaryIndex(const String & name) const;
         bool hasProjection(const String & name) const;
+        bool hasBrokenProjection(const String & name) const;
         bool isCompactPart() const;
 
         void read(
@@ -174,6 +175,8 @@ private:
     Settings settings;
     SelectQueryOptions select_limits;
 
+    LoggerPtr logger;
+
     /// 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
diff --git a/src/Interpreters/MutationsNonDeterministicHelpers.cpp b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
index 119759265ef..7a4cb91acc0 100644
--- a/src/Interpreters/MutationsNonDeterministicHelpers.cpp
+++ b/src/Interpreters/MutationsNonDeterministicHelpers.cpp
@@ -172,6 +172,30 @@ ASTPtr replaceNonDeterministicToScalars(const ASTAlterCommand & alter_command, C
     auto query = alter_command.clone();
     auto & new_alter_command = *query->as<ASTAlterCommand>();
 
+    auto remove_child = [](auto & children, IAST *& erase_ptr)
+    {
+        auto it = std::find_if(children.begin(), children.end(), [&](const auto & ptr) { return ptr.get() == erase_ptr; });
+        erase_ptr = nullptr;
+        children.erase(it);
+    };
+    auto visit = [&](auto & visitor)
+    {
+        if (new_alter_command.update_assignments)
+        {
+            ASTPtr update_assignments = new_alter_command.update_assignments->clone();
+            remove_child(new_alter_command.children, new_alter_command.update_assignments);
+            visitor.visit(update_assignments);
+            new_alter_command.update_assignments = new_alter_command.children.emplace_back(std::move(update_assignments)).get();
+        }
+        if (new_alter_command.predicate)
+        {
+            ASTPtr predicate = new_alter_command.predicate->clone();
+            remove_child(new_alter_command.children, new_alter_command.predicate);
+            visitor.visit(predicate);
+            new_alter_command.predicate = new_alter_command.children.emplace_back(std::move(predicate)).get();
+        }
+    };
+
     if (settings.mutations_execute_subqueries_on_initiator)
     {
         Scalars scalars;
@@ -188,10 +212,7 @@ ASTPtr replaceNonDeterministicToScalars(const ASTAlterCommand & alter_command, C
             settings.mutations_max_literal_size_to_replace};
 
         ExecuteScalarSubqueriesVisitor visitor(data);
-        if (new_alter_command.update_assignments)
-            visitor.visit(new_alter_command.update_assignments);
-        if (new_alter_command.predicate)
-            visitor.visit(new_alter_command.predicate);
+        visit(visitor);
     }
 
     if (settings.mutations_execute_nondeterministic_on_initiator)
@@ -200,10 +221,7 @@ ASTPtr replaceNonDeterministicToScalars(const ASTAlterCommand & alter_command, C
             context, settings.mutations_max_literal_size_to_replace};
 
         ExecuteNonDeterministicConstFunctionsVisitor visitor(data);
-        if (new_alter_command.update_assignments)
-            visitor.visit(new_alter_command.update_assignments);
-        if (new_alter_command.predicate)
-            visitor.visit(new_alter_command.predicate);
+        visit(visitor);
     }
 
     return query;
diff --git a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
index d95a7a42159..4821d607d0e 100644
--- a/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
+++ b/src/Interpreters/MySQL/InterpretersMySQLDDLQuery.cpp
@@ -337,7 +337,7 @@ static ASTPtr getPartitionPolicy(const NamesAndTypesList & primary_keys)
         WhichDataType which(type);
 
         if (which.isNullable())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: MySQL primary key must be not null, it is a bug.");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "MySQL's primary key must be not null, it is a bug.");
 
         if (which.isDate() || which.isDate32() || which.isDateTime() || which.isDateTime64())
         {
@@ -498,14 +498,12 @@ ASTs InterpreterCreateImpl::getRewrittenQueries(
     columns->columns->children.emplace_back(create_materialized_column_declaration(version_column_name, "UInt64", UInt64(1)));
 
     /// Add minmax skipping index for _version column.
-    auto version_index = std::make_shared<ASTIndexDeclaration>();
-    version_index->name = version_column_name;
     auto index_expr = std::make_shared<ASTIdentifier>(version_column_name);
     auto index_type = makeASTFunction("minmax");
     index_type->no_empty_args = true;
-    version_index->set(version_index->expr, index_expr);
-    version_index->set(version_index->type, index_type);
+    auto version_index = std::make_shared<ASTIndexDeclaration>(index_expr, index_type, version_column_name);
     version_index->granularity = 1;
+
     ASTPtr indices = std::make_shared<ASTExpressionList>();
     indices->children.push_back(version_index);
     columns->set(columns->indices, indices);
@@ -579,7 +577,7 @@ ASTs InterpreterRenameImpl::getRewrittenQueries(
     const InterpreterRenameImpl::TQuery & rename_query, ContextPtr context, const String & mapped_to_database, const String & mysql_database)
 {
     ASTRenameQuery::Elements elements;
-    for (const auto & rename_element : rename_query.elements)
+    for (const auto & rename_element : rename_query.getElements())
     {
         const auto & to_database = resolveDatabase(rename_element.to.getDatabase(), mysql_database, mapped_to_database, context);
         const auto & from_database = resolveDatabase(rename_element.from.getDatabase(), mysql_database, mapped_to_database, context);
@@ -600,8 +598,7 @@ ASTs InterpreterRenameImpl::getRewrittenQueries(
     if (elements.empty())
         return ASTs{};
 
-    auto rewritten_query = std::make_shared<ASTRenameQuery>();
-    rewritten_query->elements = elements;
+    auto rewritten_query = std::make_shared<ASTRenameQuery>(std::move(elements));
     return ASTs{rewritten_query};
 }
 
@@ -616,7 +613,8 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
         return {};
 
     auto rewritten_alter_query = std::make_shared<ASTAlterQuery>();
-    auto rewritten_rename_query = std::make_shared<ASTRenameQuery>();
+    ASTRenameQuery::Elements rename_elements;
+
     rewritten_alter_query->setDatabase(mapped_to_database);
     rewritten_alter_query->setTable(alter_query.table);
     rewritten_alter_query->alter_object = ASTAlterQuery::AlterObjectType::TABLE;
@@ -638,7 +636,7 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
                 auto rewritten_command = std::make_shared<ASTAlterCommand>();
                 rewritten_command->type = ASTAlterCommand::ADD_COLUMN;
                 rewritten_command->first = alter_command->first;
-                rewritten_command->col_decl = additional_columns->children[index]->clone();
+                rewritten_command->col_decl = rewritten_command->children.emplace_back(additional_columns->children[index]->clone()).get();
 
                 const auto & column_declare = alter_command->additional_columns->children[index]->as<MySQLParser::ASTDeclareColumn>();
                 if (column_declare && column_declare->column_options)
@@ -667,8 +665,7 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
 
                 if (!alter_command->column_name.empty())
                 {
-                    rewritten_command->column = std::make_shared<ASTIdentifier>(alter_command->column_name);
-                    rewritten_command->children.push_back(rewritten_command->column);
+                    rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->column_name)).get();
 
                     /// For example(when add_column_1 is last column):
                     /// ALTER TABLE test_database.test_table_2 ADD COLUMN add_column_3 INT AFTER add_column_1, ADD COLUMN add_column_4 INT
@@ -679,12 +676,10 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
                 }
                 else
                 {
-                    rewritten_command->column = std::make_shared<ASTIdentifier>(default_after_column);
-                    rewritten_command->children.push_back(rewritten_command->column);
+                    rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(default_after_column)).get();
                     default_after_column = rewritten_command->col_decl->as<ASTColumnDeclaration>()->name;
                 }
 
-                rewritten_command->children.push_back(rewritten_command->col_decl);
                 rewritten_alter_query->command_list->children.push_back(rewritten_command);
             }
         }
@@ -692,7 +687,7 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
         {
             auto rewritten_command = std::make_shared<ASTAlterCommand>();
             rewritten_command->type = ASTAlterCommand::DROP_COLUMN;
-            rewritten_command->column = std::make_shared<ASTIdentifier>(alter_command->column_name);
+            rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->column_name)).get();
             rewritten_alter_query->command_list->children.push_back(rewritten_command);
         }
         else if (alter_command->type == MySQLParser::ASTAlterCommand::RENAME_COLUMN)
@@ -702,8 +697,8 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
                 /// 'RENAME column_name TO column_name' is not allowed in Clickhouse
                 auto rewritten_command = std::make_shared<ASTAlterCommand>();
                 rewritten_command->type = ASTAlterCommand::RENAME_COLUMN;
-                rewritten_command->column = std::make_shared<ASTIdentifier>(alter_command->old_name);
-                rewritten_command->rename_to = std::make_shared<ASTIdentifier>(alter_command->column_name);
+                rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->old_name)).get();
+                rewritten_command->rename_to = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->column_name)).get();
                 rewritten_alter_query->command_list->children.push_back(rewritten_command);
             }
         }
@@ -726,13 +721,10 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
                     modify_columns.front().name = alter_command->old_name;
 
                 const auto & modify_columns_description = createColumnsDescription(modify_columns, alter_command->additional_columns);
-                rewritten_command->col_decl = InterpreterCreateQuery::formatColumns(modify_columns_description)->children[0];
+                rewritten_command->col_decl = rewritten_command->children.emplace_back(InterpreterCreateQuery::formatColumns(modify_columns_description)->children[0]).get();
 
                 if (!alter_command->column_name.empty())
-                {
-                    rewritten_command->column = std::make_shared<ASTIdentifier>(alter_command->column_name);
-                    rewritten_command->children.push_back(rewritten_command->column);
-                }
+                    rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->column_name)).get();
 
                 rewritten_alter_query->command_list->children.push_back(rewritten_command);
             }
@@ -741,8 +733,8 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
             {
                 auto rewritten_command = std::make_shared<ASTAlterCommand>();
                 rewritten_command->type = ASTAlterCommand::RENAME_COLUMN;
-                rewritten_command->column = std::make_shared<ASTIdentifier>(alter_command->old_name);
-                rewritten_command->rename_to = std::make_shared<ASTIdentifier>(new_column_name);
+                rewritten_command->column = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(alter_command->old_name)).get();
+                rewritten_command->rename_to = rewritten_command->children.emplace_back(std::make_shared<ASTIdentifier>(new_column_name)).get();
                 rewritten_alter_query->command_list->children.push_back(rewritten_command);
             }
         }
@@ -755,13 +747,13 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
 
             /// For ALTER TABLE table_name RENAME TO new_table_name_1, RENAME TO new_table_name_2;
             /// We just need to generate RENAME TABLE table_name TO new_table_name_2;
-            if (rewritten_rename_query->elements.empty())
-                rewritten_rename_query->elements.push_back(ASTRenameQuery::Element());
+            if (rename_elements.empty())
+                rename_elements.push_back(ASTRenameQuery::Element());
 
-            rewritten_rename_query->elements.back().from.database = std::make_shared<ASTIdentifier>(mapped_to_database);
-            rewritten_rename_query->elements.back().from.table = std::make_shared<ASTIdentifier>(alter_query.table);
-            rewritten_rename_query->elements.back().to.database = std::make_shared<ASTIdentifier>(mapped_to_database);
-            rewritten_rename_query->elements.back().to.table = std::make_shared<ASTIdentifier>(alter_command->new_table_name);
+            rename_elements.back().from.database = std::make_shared<ASTIdentifier>(mapped_to_database);
+            rename_elements.back().from.table = std::make_shared<ASTIdentifier>(alter_query.table);
+            rename_elements.back().to.database = std::make_shared<ASTIdentifier>(mapped_to_database);
+            rename_elements.back().to.table = std::make_shared<ASTIdentifier>(alter_command->new_table_name);
         }
     }
 
@@ -771,8 +763,11 @@ ASTs InterpreterAlterImpl::getRewrittenQueries(
     if (!rewritten_alter_query->command_list->children.empty())
         rewritten_queries.push_back(rewritten_alter_query);
 
-    if (!rewritten_rename_query->elements.empty())
+    if (!rename_elements.empty())
+    {
+        auto rewritten_rename_query = std::make_shared<ASTRenameQuery>(std::move(rename_elements));
         rewritten_queries.push_back(rewritten_rename_query);
+    }
 
     return rewritten_queries;
 }
diff --git a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
index 9f6e9b930fd..6d6077a0295 100644
--- a/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
+++ b/src/Interpreters/MySQL/tests/gtest_create_rewritten.cpp
@@ -19,7 +19,7 @@ using namespace DB;
 static inline ASTPtr tryRewrittenCreateQuery(const String & query, ContextPtr context)
 {
     ParserExternalDDLQuery external_ddl_parser;
-    ASTPtr ast = parseQuery(external_ddl_parser, "EXTERNAL DDL FROM MySQL(test_database, test_database) " + query, 0, 0);
+    ASTPtr ast = parseQuery(external_ddl_parser, "EXTERNAL DDL FROM MySQL(test_database, test_database) " + query, 0, 0, 0);
 
     return MySQLInterpreter::InterpreterCreateImpl::getRewrittenQueries(
         *ast->as<ASTExternalDDLQuery>()->external_ddl->as<MySQLParser::ASTCreateQuery>(),
diff --git a/src/Interpreters/OpenTelemetrySpanLog.cpp b/src/Interpreters/OpenTelemetrySpanLog.cpp
index fffc1e50da0..aa11749f8a6 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.cpp
+++ b/src/Interpreters/OpenTelemetrySpanLog.cpp
@@ -32,12 +32,17 @@ ColumnsDescription OpenTelemetrySpanLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", low_cardinality_string},
-        {"trace_id", std::make_shared<DataTypeUUID>()},
-        {"span_id", std::make_shared<DataTypeUInt64>()},
-        {"parent_span_id", std::make_shared<DataTypeUInt64>()},
-        {"operation_name", low_cardinality_string},
-        {"kind", std::move(span_kind_type)},
+        {"hostname", low_cardinality_string, "The hostname where this span was captured."},
+        {"trace_id", std::make_shared<DataTypeUUID>(), "ID of the trace for executed query."},
+        {"span_id", std::make_shared<DataTypeUInt64>(), "ID of the trace span."},
+        {"parent_span_id", std::make_shared<DataTypeUInt64>(), "ID of the parent trace span."},
+        {"operation_name", low_cardinality_string, "The name of the operation."},
+        {"kind", std::move(span_kind_type), "The 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."},
         // 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
@@ -48,10 +53,10 @@ ColumnsDescription OpenTelemetrySpanLogElement::getColumnsDescription()
         // Also subtraction of two DateTime64 points doesn't work, so you can't
         // get duration.
         // It is much less hassle to just use UInt64 of microseconds.
-        {"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>(low_cardinality_string, std::make_shared<DataTypeString>())},
+        {"start_time_us", std::make_shared<DataTypeUInt64>(), "The start time of the trace span (in microseconds)."},
+        {"finish_time_us", std::make_shared<DataTypeUInt64>(), "The finish time of the trace span (in microseconds)."},
+        {"finish_date", std::make_shared<DataTypeDate>(), "The finish date of the trace span."},
+        {"attribute", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeString>()), "Attribute depending on the trace span. They are filled in according to the recommendations in the OpenTelemetry standard."},
     };
 }
 
diff --git a/src/Interpreters/OpenTelemetrySpanLog.h b/src/Interpreters/OpenTelemetrySpanLog.h
index 4907a8feb5a..ef63044d323 100644
--- a/src/Interpreters/OpenTelemetrySpanLog.h
+++ b/src/Interpreters/OpenTelemetrySpanLog.h
@@ -12,7 +12,7 @@ namespace DB
 struct OpenTelemetrySpanLogElement : public OpenTelemetry::Span
 {
     OpenTelemetrySpanLogElement() = default;
-    OpenTelemetrySpanLogElement(const OpenTelemetry::Span & span)
+    explicit OpenTelemetrySpanLogElement(const OpenTelemetry::Span & span)
         : OpenTelemetry::Span(span) {}
 
     static std::string name() { return "OpenTelemetrySpanLog"; }
@@ -20,7 +20,6 @@ struct OpenTelemetrySpanLogElement : public OpenTelemetry::Span
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases();
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 // OpenTelemetry standardizes some Log data as well, so it's not just
diff --git a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
index 13b6311a877..f3504f3f403 100644
--- a/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
+++ b/src/Interpreters/OptimizeIfWithConstantConditionVisitor.cpp
@@ -53,7 +53,7 @@ static bool tryExtractConstValueFromCondition(const ASTPtr & condition, bool & v
                 }
             }
         }
-        else if (function->name == "toUInt8" || function->name == "toInt8" || function->name == "identity")
+        else if (function->name == "toUInt8" || function->name == "toInt8" || function->name == "identity" || function->name == "__scalarSubqueryResult")
         {
             if (const auto * expr_list = function->arguments->as<ASTExpressionList>())
             {
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
index 3a592c0fe55..84279282d92 100644
--- a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.cpp
@@ -1,11 +1,18 @@
-#include <Interpreters/ExpressionActions.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Parsers/ASTFunction.h>
-#include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTIdentifier.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <Interpreters/OptimizeShardingKeyRewriteInVisitor.h>
 
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/ConstantNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/Utils.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context_fwd.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTLiteral.h>
+
 namespace
 {
 
@@ -119,4 +126,66 @@ void OptimizeShardingKeyRewriteInMatcher::visit(ASTFunction & function, Data & d
     }
 }
 
+
+class OptimizeShardingKeyRewriteIn : public InDepthQueryTreeVisitorWithContext<OptimizeShardingKeyRewriteIn>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<OptimizeShardingKeyRewriteIn>;
+
+    OptimizeShardingKeyRewriteIn(OptimizeShardingKeyRewriteInVisitor::Data data_, ContextPtr context)
+        : Base(std::move(context))
+        , data(std::move(data_))
+    {}
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        auto * function_node = node->as<FunctionNode>();
+        if (!function_node || function_node->getFunctionName() != "in")
+            return;
+
+        auto & arguments = function_node->getArguments().getNodes();
+        auto * column = arguments[0]->as<ColumnNode>();
+        if (!column)
+            return;
+
+        auto name = column->getColumnName();
+
+        if (!data.sharding_key_expr->getRequiredColumnsWithTypes().contains(column->getColumnName()))
+            return;
+
+        if (auto * constant = arguments[1]->as<ConstantNode>())
+        {
+            if (isTuple(constant->getResultType()))
+            {
+                const auto & tuple = constant->getValue().get<Tuple &>();
+                Tuple new_tuple;
+                new_tuple.reserve(tuple.size());
+
+                for (const auto & child : tuple)
+                {
+                    if (shardContains(child, name, data))
+                        new_tuple.push_back(child);
+                }
+
+                if (new_tuple.empty())
+                    new_tuple.push_back(tuple.back());
+
+                if (new_tuple.size() == tuple.size())
+                    return;
+
+                arguments[1] = std::make_shared<ConstantNode>(new_tuple);
+                rerunFunctionResolve(function_node, getContext());
+            }
+        }
+    }
+
+    OptimizeShardingKeyRewriteInVisitor::Data data;
+};
+
+void optimizeShardingKeyRewriteIn(QueryTreeNodePtr & node, OptimizeShardingKeyRewriteInVisitor::Data data, ContextPtr context)
+{
+    OptimizeShardingKeyRewriteIn visitor(std::move(data), std::move(context));
+    visitor.visit(node);
+}
+
 }
diff --git a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
index d546db40df7..1b2d5a8fc15 100644
--- a/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
+++ b/src/Interpreters/OptimizeShardingKeyRewriteInVisitor.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Analyzer/IQueryTreeNode.h>
 #include <Interpreters/InDepthNodeVisitor.h>
 #include <Interpreters/Cluster.h>
 
@@ -44,4 +45,6 @@ struct OptimizeShardingKeyRewriteInMatcher
 
 using OptimizeShardingKeyRewriteInVisitor = InDepthNodeVisitor<OptimizeShardingKeyRewriteInMatcher, true>;
 
+void optimizeShardingKeyRewriteIn(QueryTreeNodePtr & node, OptimizeShardingKeyRewriteInVisitor::Data data, ContextPtr context);
+
 }
diff --git a/src/Interpreters/PartLog.cpp b/src/Interpreters/PartLog.cpp
index 9819b8e3ec4..66f933f1afa 100644
--- a/src/Interpreters/PartLog.cpp
+++ b/src/Interpreters/PartLog.cpp
@@ -123,7 +123,7 @@ ColumnsDescription PartLogElement::getColumnsDescription()
         {"table_uuid", std::make_shared<DataTypeUUID>(), "UUID of the table the data part belongs to."},
         {"part_name", std::make_shared<DataTypeString>(), "Name of the data part."},
         {"partition_id", std::make_shared<DataTypeString>(), "ID of the partition that the data part was inserted to. The column takes the `all` value if the partitioning is by `tuple()`."},
-        {"partition", std::make_shared<DataTypeString>()},
+        {"partition", std::make_shared<DataTypeString>(), "The partition name."},
         {"part_type", std::make_shared<DataTypeString>(), "The type of the part. Possible values: Wide and Compact."},
         {"disk_name", std::make_shared<DataTypeString>(), "The disk name data part lies on."},
         {"path_on_disk", std::make_shared<DataTypeString>(), "Absolute path to the folder with data part files."},
@@ -271,7 +271,7 @@ bool PartLog::addNewParts(
     }
     catch (...)
     {
-        tryLogCurrentException(part_log ? part_log->log : &Poco::Logger::get("PartLog"), __PRETTY_FUNCTION__);
+        tryLogCurrentException(part_log ? part_log->log : getLogger("PartLog"), __PRETTY_FUNCTION__);
         return false;
     }
 
diff --git a/src/Interpreters/PartLog.h b/src/Interpreters/PartLog.h
index d4cd571d69b..6dc3116ad48 100644
--- a/src/Interpreters/PartLog.h
+++ b/src/Interpreters/PartLog.h
@@ -96,7 +96,6 @@ struct PartLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases();
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class IMergeTreeDataPart;
diff --git a/src/Interpreters/PasteJoin.h b/src/Interpreters/PasteJoin.h
index df7bb2f280c..f87a7021551 100644
--- a/src/Interpreters/PasteJoin.h
+++ b/src/Interpreters/PasteJoin.h
@@ -24,7 +24,7 @@ public:
         : table_join(table_join_)
         , right_sample_block(right_sample_block_)
     {
-        LOG_TRACE(&Poco::Logger::get("PasteJoin"), "Will use paste join");
+        LOG_TRACE(getLogger("PasteJoin"), "Will use paste join");
     }
 
     std::string getName() const override { return "PasteJoin"; }
diff --git a/src/Interpreters/PreparedSets.cpp b/src/Interpreters/PreparedSets.cpp
index cc3db726f01..b04c8b1b725 100644
--- a/src/Interpreters/PreparedSets.cpp
+++ b/src/Interpreters/PreparedSets.cpp
@@ -98,12 +98,8 @@ FutureSetFromSubquery::FutureSetFromSubquery(
     std::unique_ptr<QueryPlan> source_,
     StoragePtr external_table_,
     std::shared_ptr<FutureSetFromSubquery> external_table_set_,
-    const Settings & settings,
-    bool in_subquery_)
-    : external_table(std::move(external_table_))
-    , external_table_set(std::move(external_table_set_))
-    , source(std::move(source_))
-    , in_subquery(in_subquery_)
+    const Settings & settings)
+    : external_table(std::move(external_table_)), external_table_set(std::move(external_table_set_)), source(std::move(source_))
 {
     set_and_key = std::make_shared<SetAndKey>();
     set_and_key->key = std::move(key);
@@ -126,6 +122,8 @@ FutureSetFromSubquery::FutureSetFromSubquery(
     set_and_key->set = std::make_shared<Set>(size_limits, settings.use_index_for_in_with_subqueries_max_values, settings.transform_null_in);
 }
 
+FutureSetFromSubquery::~FutureSetFromSubquery() = default;
+
 SetPtr FutureSetFromSubquery::get() const
 {
     if (set_and_key->set != nullptr && set_and_key->set->isCreated())
@@ -281,16 +279,10 @@ FutureSetFromSubqueryPtr PreparedSets::addFromSubquery(
     std::unique_ptr<QueryPlan> source,
     StoragePtr external_table,
     FutureSetFromSubqueryPtr external_table_set,
-    const Settings & settings,
-    bool in_subquery)
+    const Settings & settings)
 {
     auto from_subquery = std::make_shared<FutureSetFromSubquery>(
-        toString(key, {}),
-        std::move(source),
-        std::move(external_table),
-        std::move(external_table_set),
-        settings,
-        in_subquery);
+        toString(key, {}), std::move(source), std::move(external_table), std::move(external_table_set), settings);
 
     auto [it, inserted] = sets_from_subqueries.emplace(key, from_subquery);
 
@@ -340,15 +332,6 @@ std::shared_ptr<FutureSetFromSubquery> PreparedSets::findSubquery(const Hash & k
     return it->second;
 }
 
-void PreparedSets::markAsINSubquery(const Hash & key)
-{
-    auto it = sets_from_subqueries.find(key);
-    if (it == sets_from_subqueries.end())
-        return;
-
-    it->second->markAsINSubquery();
-}
-
 std::shared_ptr<FutureSetFromStorage> PreparedSets::findStorage(const Hash & key) const
 {
     auto it = sets_from_storage.find(key);
diff --git a/src/Interpreters/PreparedSets.h b/src/Interpreters/PreparedSets.h
index 7178cff73b9..bf99a8ece3c 100644
--- a/src/Interpreters/PreparedSets.h
+++ b/src/Interpreters/PreparedSets.h
@@ -101,14 +101,15 @@ public:
         std::unique_ptr<QueryPlan> source_,
         StoragePtr external_table_,
         std::shared_ptr<FutureSetFromSubquery> external_table_set_,
-        const Settings & settings,
-        bool in_subquery_);
+        const Settings & settings);
 
     FutureSetFromSubquery(
         String key,
         QueryTreeNodePtr query_tree_,
         const Settings & settings);
 
+    ~FutureSetFromSubquery() override;
+
     SetPtr get() const override;
     DataTypes getTypes() const override;
     SetPtr buildOrderedSetInplace(const ContextPtr & context) override;
@@ -118,8 +119,6 @@ public:
 
     QueryTreeNodePtr detachQueryTree() { return std::move(query_tree); }
     void setQueryPlan(std::unique_ptr<QueryPlan> source_);
-    void markAsINSubquery() { in_subquery = true; }
-    bool isINSubquery() const { return in_subquery; }
 
 private:
     SetAndKeyPtr set_and_key;
@@ -128,11 +127,6 @@ private:
 
     std::unique_ptr<QueryPlan> source;
     QueryTreeNodePtr query_tree;
-    bool in_subquery = false; // subquery used in IN operator
-                              // the flag can be removed after enabling new analyzer and removing interpreter
-                              // or after enabling support IN operator with subqueries in parallel replicas
-                              // Note: it's necessary with interpreter since prepared sets used also for GLOBAL JOINs,
-                              //       with new analyzer it's not a case
 };
 
 using FutureSetFromSubqueryPtr = std::shared_ptr<FutureSetFromSubquery>;
@@ -160,8 +154,7 @@ public:
         std::unique_ptr<QueryPlan> source,
         StoragePtr external_table,
         FutureSetFromSubqueryPtr external_table_set,
-        const Settings & settings,
-        bool in_subquery = false);
+        const Settings & settings);
 
     FutureSetFromSubqueryPtr addFromSubquery(
         const Hash & key,
@@ -171,7 +164,6 @@ public:
     FutureSetFromTuplePtr findTuple(const Hash & key, const DataTypes & types) const;
     FutureSetFromStoragePtr findStorage(const Hash & key) const;
     FutureSetFromSubqueryPtr findSubquery(const Hash & key) const;
-    void markAsINSubquery(const Hash & key);
 
     using Subqueries = std::vector<FutureSetFromSubqueryPtr>;
     Subqueries getSubqueries() const;
diff --git a/src/Interpreters/ProcessList.cpp b/src/Interpreters/ProcessList.cpp
index 752d3c4a12b..5b07852d9e3 100644
--- a/src/Interpreters/ProcessList.cpp
+++ b/src/Interpreters/ProcessList.cpp
@@ -83,25 +83,31 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
         IAST::QueryKind query_kind = ast->getQueryKind();
 
         const auto queue_max_wait_ms = settings.queue_max_wait_ms.totalMilliseconds();
-        if (!is_unlimited_query && max_size && processes.size() >= max_size)
+        UInt64 waiting_queries = waiting_queries_amount.load();
+        if (!is_unlimited_query && max_size && processes.size() >= max_size + waiting_queries)
         {
             if (queue_max_wait_ms)
-                LOG_WARNING(&Poco::Logger::get("ProcessList"), "Too many simultaneous queries, will wait {} ms.", queue_max_wait_ms);
-            if (!queue_max_wait_ms || !have_space.wait_for(lock, std::chrono::milliseconds(queue_max_wait_ms), [&]{ return processes.size() < max_size; }))
-                throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES, "Too many simultaneous queries. Maximum: {}", max_size);
+                LOG_WARNING(getLogger("ProcessList"), "Too many simultaneous queries, will wait {} ms.", queue_max_wait_ms);
+            if (!queue_max_wait_ms || !have_space.wait_for(lock, std::chrono::milliseconds(queue_max_wait_ms),
+                    [&]{ waiting_queries = waiting_queries_amount.load(); return processes.size() < max_size + waiting_queries; }))
+                throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
+                                "Too many simultaneous queries. Maximum: {}{}",
+                                max_size, waiting_queries == 0 ? "" : fmt::format(", waiting: {}", waiting_queries));
         }
 
         if (!is_unlimited_query)
         {
             QueryAmount amount = getQueryKindAmount(query_kind);
-            if (max_insert_queries_amount && query_kind == IAST::QueryKind::Insert && amount >= max_insert_queries_amount)
+            UInt64 waiting_inserts = waiting_insert_queries_amount.load();
+            UInt64 waiting_selects = waiting_select_queries_amount.load();
+            if (max_insert_queries_amount && query_kind == IAST::QueryKind::Insert && amount >= max_insert_queries_amount + waiting_inserts)
                 throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
-                                "Too many simultaneous insert queries. Maximum: {}, current: {}",
-                                max_insert_queries_amount, amount);
-            if (max_select_queries_amount && query_kind == IAST::QueryKind::Select && amount >= max_select_queries_amount)
+                                "Too many simultaneous insert queries. Maximum: {}, current: {}{}",
+                                max_insert_queries_amount, amount, waiting_inserts == 0 ? "" : fmt::format(", waiting: {}", waiting_inserts));
+            if (max_select_queries_amount && query_kind == IAST::QueryKind::Select && amount >= max_select_queries_amount + waiting_selects)
                 throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
-                                "Too many simultaneous select queries. Maximum: {}, current: {}",
-                                max_select_queries_amount, amount);
+                                "Too many simultaneous select queries. Maximum: {}, current: {}{}",
+                                max_select_queries_amount, amount, waiting_selects == 0 ? "" : fmt::format(", waiting: {}", waiting_selects));
         }
 
         {
@@ -124,10 +130,12 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
              * once is already processing 50+ concurrent queries (including analysts or any other users).
              */
 
+            waiting_queries = waiting_queries_amount.load();
             if (!is_unlimited_query && settings.max_concurrent_queries_for_all_users
-                && processes.size() >= settings.max_concurrent_queries_for_all_users)
+                && processes.size() >= settings.max_concurrent_queries_for_all_users + waiting_queries_amount)
                 throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES, "Too many simultaneous queries for all users. "
-                    "Current: {}, maximum: {}", processes.size(), settings.max_concurrent_queries_for_all_users.toString());
+                    "Current: {}, maximum: {}{}", processes.size(), settings.max_concurrent_queries_for_all_users.toString(),
+                    waiting_queries == 0 ? "" : fmt::format(", waiting: {}", waiting_queries));
         }
 
         /** Why we use current user?
@@ -145,13 +153,15 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
 
             if (user_process_list != user_to_queries.end())
             {
+                UInt64 user_waiting_queries = user_process_list->second.waiting_queries_amount.load();
                 if (!is_unlimited_query && settings.max_concurrent_queries_for_user
-                    && user_process_list->second.queries.size() >= settings.max_concurrent_queries_for_user)
+                    && user_process_list->second.queries.size() >= settings.max_concurrent_queries_for_user + user_waiting_queries)
                     throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
                                     "Too many simultaneous queries for user {}. "
-                                    "Current: {}, maximum: {}",
+                                    "Current: {}, maximum: {}{}",
                                     client_info.current_user, user_process_list->second.queries.size(),
-                                    settings.max_concurrent_queries_for_user.toString());
+                                    settings.max_concurrent_queries_for_user.toString(),
+                                    user_waiting_queries == 0 ? "" : fmt::format(", waiting: {}", user_waiting_queries));
 
                 auto running_query = user_process_list->second.queries.find(client_info.current_query_id);
 
@@ -208,8 +218,13 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
             thread_group->memory_tracker.setParent(&user_process_list.user_memory_tracker);
             if (user_process_list.user_temp_data_on_disk)
             {
+                TemporaryDataOnDiskSettings temporary_data_on_disk_settings
+                {
+                    .max_size_on_disk = settings.max_temporary_data_on_disk_size_for_query,
+                    .compression_codec = settings.temporary_files_codec
+                };
                 query_context->setTempDataOnDisk(std::make_shared<TemporaryDataOnDiskScope>(
-                    user_process_list.user_temp_data_on_disk, settings.max_temporary_data_on_disk_size_for_query));
+                    user_process_list.user_temp_data_on_disk, std::move(temporary_data_on_disk_settings)));
             }
 
             /// Set query-level memory trackers
@@ -254,6 +269,7 @@ ProcessList::insert(const String & query_, const IAST * ast, ContextMutablePtr q
         res = std::make_shared<Entry>(*this, process_it);
 
         (*process_it)->setUserProcessList(&user_process_list);
+        (*process_it)->setProcessListEntry(res);
 
         user_process_list.queries.emplace(client_info.current_query_id, res->getQueryStatus());
         queries_to_user.emplace(client_info.current_query_id, client_info.current_user);
@@ -294,7 +310,7 @@ ProcessListEntry::~ProcessListEntry()
     auto user_process_list_it = parent.user_to_queries.find(user);
     if (user_process_list_it == parent.user_to_queries.end())
     {
-        LOG_ERROR(&Poco::Logger::get("ProcessList"), "Logical error: cannot find user in ProcessList");
+        LOG_ERROR(getLogger("ProcessList"), "Cannot find user in ProcessList");
         std::terminate();
     }
 
@@ -322,7 +338,7 @@ ProcessListEntry::~ProcessListEntry()
 
     if (!found)
     {
-        LOG_ERROR(&Poco::Logger::get("ProcessList"), "Logical error: cannot find query by query_id and pointer to ProcessListElement in ProcessListForUser");
+        LOG_ERROR(getLogger("ProcessList"), "Cannot find query by query_id and pointer to ProcessListElement in ProcessListForUser");
         std::terminate();
     }
 
@@ -481,6 +497,22 @@ void QueryStatus::setUserProcessList(ProcessListForUser * user_process_list_)
 }
 
 
+void QueryStatus::setProcessListEntry(std::weak_ptr<ProcessListEntry> process_list_entry_)
+{
+    /// Synchronization is not required here because this function is only called from ProcessList::insert()
+    /// when `ProcessList::mutex` is locked.
+    if (!process_list_entry.expired() && !process_list_entry_.expired())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Two entries in the process list cannot both use the same query status");
+    process_list_entry = process_list_entry_;
+}
+
+
+std::shared_ptr<ProcessListEntry> QueryStatus::getProcessListEntry() const
+{
+    return process_list_entry.lock();
+}
+
+
 ThrottlerPtr QueryStatus::getUserNetworkThrottler()
 {
     if (!user_process_list)
@@ -541,6 +573,28 @@ CancellationCode ProcessList::sendCancelToQuery(const String & current_query_id,
 }
 
 
+CancellationCode ProcessList::sendCancelToQuery(QueryStatusPtr elem, bool kill)
+{
+    /// Cancelling the query should be done without the lock.
+    /// So here we first set is_cancelling, and later reset it.
+    /// The ProcessListEntry cannot be destroy if is_cancelling is true.
+    {
+        auto lock = safeLock();
+        elem->is_cancelling = true;
+    }
+
+    SCOPE_EXIT({
+        DENY_ALLOCATIONS_IN_SCOPE;
+
+        auto lock = unsafeLock();
+        elem->is_cancelling = false;
+        cancelled_cv.notify_all();
+    });
+
+    return elem->cancelQuery(kill);
+}
+
+
 void ProcessList::killAllQueries()
 {
     std::vector<QueryStatusPtr> cancelled_processes;
@@ -643,8 +697,15 @@ 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->getSharedTempDataOnDisk(), size_limit);
+        const auto & settings = global_context->getSettingsRef();
+        TemporaryDataOnDiskSettings temporary_data_on_disk_settings
+        {
+            .max_size_on_disk = settings.max_temporary_data_on_disk_size_for_user,
+            .compression_codec = settings.temporary_files_codec
+        };
+
+        user_temp_data_on_disk = std::make_shared<TemporaryDataOnDiskScope>(global_context->getSharedTempDataOnDisk(),
+            std::move(temporary_data_on_disk_settings));
     }
 }
 
@@ -706,4 +767,69 @@ ProcessList::QueryAmount ProcessList::getQueryKindAmount(const IAST::QueryKind &
     return found->second;
 }
 
+void ProcessList::increaseWaitingQueryAmount(const QueryStatusPtr & status)
+{
+    UInt64 limit = max_waiting_queries_amount.load();
+    UInt64 value = waiting_queries_amount.load();
+    while (true)
+    {
+        if (value >= limit)
+            throw Exception(ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
+                            "Too many simultaneous waiting queries. Maximum: {}, waiting: {}",
+                            limit, value);
+        if (waiting_queries_amount.compare_exchange_strong(value, value + 1))
+            break;
+    }
+
+    // WARNING: After this point we should not throw, otherwise corresponding `decreaseWaitingQueryAmount` will not be called.
+
+    // Update query kind counters
+    if (status->query_kind == IAST::QueryKind::Insert)
+        waiting_insert_queries_amount.fetch_add(1);
+    if (status->query_kind == IAST::QueryKind::Select)
+        waiting_select_queries_amount.fetch_add(1);
+
+    // Update per-user counter
+    status->getUserProcessList()->waiting_queries_amount.fetch_add(1);
+
+    // We have to notify because some queries might be waiting on `have_space`
+    // and this query leaves its space by transitioning to waiting state
+    have_space.notify_all();
+}
+
+void ProcessList::decreaseWaitingQueryAmount(const QueryStatusPtr & status)
+{
+    if (status->getUserProcessList()->waiting_queries_amount.fetch_sub(1) == 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong insert waiting query amount for user: decrease to negative");
+
+    if (status->query_kind == IAST::QueryKind::Insert && waiting_insert_queries_amount.fetch_sub(1) == 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong insert waiting query amount: decrease to negative");
+
+    if (status->query_kind == IAST::QueryKind::Select && waiting_select_queries_amount.fetch_sub(1) == 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong select waiting query amount: decrease to negative");
+
+    if (waiting_queries_amount.fetch_sub(1) == 0)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong waiting query amount: decrease to negative");
+}
+
+void ProcessList::incrementWaiters()
+{
+    ContextPtr context = CurrentThread::getQueryContext();
+    QueryStatusPtr status = context->getProcessListElement();
+
+    // Query became "waiting" with the first thread that waits
+    if (status->waiting_threads.fetch_add(1) == 0)
+        increaseWaitingQueryAmount(status);
+}
+
+void ProcessList::decrementWaiters()
+{
+    ContextPtr context = CurrentThread::getQueryContext();
+    QueryStatusPtr status = context->getProcessListElement();
+
+    // Query became "non-waiting" with the last thread that no longer waits
+    if (status->waiting_threads.fetch_sub(1) == 1)
+        decreaseWaitingQueryAmount(status);
+}
+
 }
diff --git a/src/Interpreters/ProcessList.h b/src/Interpreters/ProcessList.h
index 7b0196db981..19f9b9afdda 100644
--- a/src/Interpreters/ProcessList.h
+++ b/src/Interpreters/ProcessList.h
@@ -42,10 +42,6 @@ class ThreadStatus;
 class ProcessListEntry;
 
 
-/** List of currently executing queries.
-  * Also implements limit on their number.
-  */
-
 /** Information of process list element.
   * To output in SHOW PROCESSLIST query. Does not contain any complex objects, that do something on copy or destructor.
   */
@@ -114,15 +110,25 @@ protected:
     /// Including EndOfStream or Exception.
     std::atomic<bool> is_all_data_sent { false };
 
+    /// Number of threads for the query that are waiting for load jobs
+    std::atomic<UInt64> waiting_threads{0};
+
+    /// For initialization of ProcessListForUser during process insertion.
     void setUserProcessList(ProcessListForUser * user_process_list_);
     /// Be careful using it. For example, queries field of ProcessListForUser could be modified concurrently.
+    ProcessListForUser * getUserProcessList() { return user_process_list; }
     const ProcessListForUser * getUserProcessList() const { return user_process_list; }
 
+    /// Sets an entry in the ProcessList associated with this QueryStatus.
+    /// Be careful using it (this function contains no synchronization).
+    /// A weak pointer is used here because it's a ProcessListEntry which owns this QueryStatus, and not vice versa.
+    void setProcessListEntry(std::weak_ptr<ProcessListEntry> process_list_entry_);
+
     mutable std::mutex executors_mutex;
 
     struct ExecutorHolder
     {
-        ExecutorHolder(PipelineExecutor * e) : executor(e) {}
+        explicit ExecutorHolder(PipelineExecutor * e) : executor(e) {}
 
         void cancel();
 
@@ -148,6 +154,8 @@ protected:
 
     ProcessListForUser * user_process_list = nullptr;
 
+    std::weak_ptr<ProcessListEntry> process_list_entry;
+
     OvercommitTracker * global_overcommit_tracker = nullptr;
 
     /// This is used to control the maximum number of SELECT or INSERT queries.
@@ -219,6 +227,9 @@ public:
 
     bool isKilled() const { return is_killed; }
 
+    /// Returns an entry in the ProcessList associated with this QueryStatus. The function can return nullptr.
+    std::shared_ptr<ProcessListEntry> getProcessListEntry() const;
+
     bool isAllDataSent() const { return is_all_data_sent; }
     void setAllDataSent() { is_all_data_sent = true; }
 
@@ -273,6 +284,9 @@ struct ProcessListForUser
     /// Count network usage for all simultaneously running queries of single user.
     ThrottlerPtr user_throttler;
 
+    /// Number of queries waiting on load jobs
+    std::atomic<UInt64> waiting_queries_amount{0};
+
     ProcessListForUserInfo getInfo(bool get_profile_events = false) const;
 
     /// Clears MemoryTracker for the user.
@@ -308,7 +322,7 @@ public:
     ~ProcessListEntry();
 
     QueryStatusPtr getQueryStatus() { return *it; }
-    const QueryStatusPtr getQueryStatus() const { return *it; }
+    QueryStatusPtr getQueryStatus() const { return *it; }
 };
 
 
@@ -331,6 +345,9 @@ protected:
 };
 
 
+/** List of currently executing queries.
+  * Also implements limit on their number.
+  */
 class ProcessList : public ProcessListBase
 {
 public:
@@ -389,10 +406,21 @@ protected:
     /// amount of queries by query kind.
     QueryKindAmounts query_kind_amounts;
 
+    /// limit for waiting queries. 0 means no limit. Otherwise, when limit exceeded, an exception is thrown.
+    std::atomic<UInt64> max_waiting_queries_amount{0};
+
+    /// amounts of waiting queries
+    std::atomic<UInt64> waiting_queries_amount{0};
+    std::atomic<UInt64> waiting_insert_queries_amount{0};
+    std::atomic<UInt64> waiting_select_queries_amount{0};
+
     void increaseQueryKindAmount(const IAST::QueryKind & query_kind);
     void decreaseQueryKindAmount(const IAST::QueryKind & query_kind);
     QueryAmount getQueryKindAmount(const IAST::QueryKind & query_kind) const;
 
+    void increaseWaitingQueryAmount(const QueryStatusPtr & status);
+    void decreaseWaitingQueryAmount(const QueryStatusPtr & status);
+
 public:
     using EntryPtr = std::shared_ptr<ProcessListEntry>;
 
@@ -448,8 +476,24 @@ public:
         return max_select_queries_amount;
     }
 
+    void setMaxWaitingQueriesAmount(UInt64 max_waiting_queries_amount_)
+    {
+        max_waiting_queries_amount.store(max_waiting_queries_amount_);
+        // NOTE: We cannot cancel waiting queries when limit is lowered. They have to wait anyways, but new queries will be canceled instead of waiting.
+    }
+
+    size_t getMaxWaitingQueriesAmount() const
+    {
+        return max_waiting_queries_amount.load();
+    }
+
+    // Handlers for AsyncLoader waiters
+    void incrementWaiters();
+    void decrementWaiters();
+
     /// Try call cancel() for input and output streams of query with specified id and user
     CancellationCode sendCancelToQuery(const String & current_query_id, const String & current_user, bool kill = false);
+    CancellationCode sendCancelToQuery(QueryStatusPtr elem, bool kill = false);
 
     void killAllQueries();
 };
diff --git a/src/Interpreters/ProcessorsProfileLog.cpp b/src/Interpreters/ProcessorsProfileLog.cpp
index 088d193257c..7dec2a3163a 100644
--- a/src/Interpreters/ProcessorsProfileLog.cpp
+++ b/src/Interpreters/ProcessorsProfileLog.cpp
@@ -1,15 +1,16 @@
 #include <Interpreters/ProcessorsProfileLog.h>
 
-#include <base/getFQDNOrHostName.h>
-#include <Common/ClickHouseRevision.h>
+#include <DataTypes/DataTypeArray.h>
 #include <DataTypes/DataTypeDate.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeDateTime64.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNullable.h>
-#include <DataTypes/DataTypeArray.h>
+#include <base/getFQDNOrHostName.h>
+#include <Common/ClickHouseRevision.h>
+#include <Common/DateLUTImpl.h>
 #include <Common/logger_useful.h>
 
 #include <array>
@@ -21,26 +22,26 @@ ColumnsDescription ProcessorProfileLogElement::getColumnsDescription()
 {
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "The date when the event happened."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "The date and time when the event happened."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "The date and time with microseconds precision when the event happened."},
 
-        {"id", std::make_shared<DataTypeUInt64>()},
-        {"parent_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"plan_step", std::make_shared<DataTypeUInt64>()},
-        {"plan_group", std::make_shared<DataTypeUInt64>()},
+        {"id", std::make_shared<DataTypeUInt64>(), "ID of processor."},
+        {"parent_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Parent processors IDs."},
+        {"plan_step", std::make_shared<DataTypeUInt64>(), "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", std::make_shared<DataTypeUInt64>(), "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", 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>()},
-        {"input_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
-        {"output_wait_elapsed_us", std::make_shared<DataTypeUInt64>()},
-        {"input_rows", std::make_shared<DataTypeUInt64>()},
-        {"input_bytes", std::make_shared<DataTypeUInt64>()},
-        {"output_rows", std::make_shared<DataTypeUInt64>()},
-        {"output_bytes", std::make_shared<DataTypeUInt64>()},
+        {"initial_query_id", std::make_shared<DataTypeString>(), "ID of the initial query (for distributed query execution)."},
+        {"query_id", std::make_shared<DataTypeString>(), "ID of the query."},
+        {"name", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Name of the processor."},
+        {"elapsed_us", std::make_shared<DataTypeUInt64>(), "Number of microseconds this processor was executed."},
+        {"input_wait_elapsed_us", std::make_shared<DataTypeUInt64>(), "Number of microseconds this processor was waiting for data (from other processor)."},
+        {"output_wait_elapsed_us", std::make_shared<DataTypeUInt64>(), "Number of microseconds this processor was waiting because output port was full."},
+        {"input_rows", std::make_shared<DataTypeUInt64>(), "The number of rows consumed by processor."},
+        {"input_bytes", std::make_shared<DataTypeUInt64>(), "The number of bytes consumed by processor."},
+        {"output_rows", std::make_shared<DataTypeUInt64>(), "The number of rows generated by processor."},
+        {"output_bytes", std::make_shared<DataTypeUInt64>(), "The number of bytes generated by processor."},
     };
 }
 
diff --git a/src/Interpreters/ProcessorsProfileLog.h b/src/Interpreters/ProcessorsProfileLog.h
index 49d2c21af89..8319d373f39 100644
--- a/src/Interpreters/ProcessorsProfileLog.h
+++ b/src/Interpreters/ProcessorsProfileLog.h
@@ -40,7 +40,6 @@ struct ProcessorProfileLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class ProcessorsProfileLog : public SystemLog<ProcessorProfileLogElement>
diff --git a/src/Interpreters/ProfileEventsExt.cpp b/src/Interpreters/ProfileEventsExt.cpp
index bd421ae8e33..dd8306066e7 100644
--- a/src/Interpreters/ProfileEventsExt.cpp
+++ b/src/Interpreters/ProfileEventsExt.cpp
@@ -99,7 +99,7 @@ static void dumpMemoryTracker(ProfileEventsSnapshot const & snapshot, DB::Mutabl
 }
 
 void getProfileEvents(
-    const String & server_display_name,
+    const String & host_name,
     DB::InternalProfileEventsQueuePtr profile_queue,
     DB::Block & block,
     ThreadIdToCountersSnapshot & last_sent_snapshots)
@@ -139,8 +139,8 @@ void getProfileEvents(
     }
     last_sent_snapshots = std::move(new_snapshots);
 
-    dumpProfileEvents(group_snapshot, columns, server_display_name);
-    dumpMemoryTracker(group_snapshot, columns, server_display_name);
+    dumpProfileEvents(group_snapshot, columns, host_name);
+    dumpMemoryTracker(group_snapshot, columns, host_name);
 
     Block curr_block;
 
diff --git a/src/Interpreters/ProfileEventsExt.h b/src/Interpreters/ProfileEventsExt.h
index cc338530510..9099e6902ec 100644
--- a/src/Interpreters/ProfileEventsExt.h
+++ b/src/Interpreters/ProfileEventsExt.h
@@ -26,7 +26,7 @@ using ThreadIdToCountersSnapshot = std::unordered_map<UInt64, Counters::Snapshot
 void dumpToMapColumn(const Counters::Snapshot & counters, DB::IColumn * column, bool nonzero_only = true);
 
 void getProfileEvents(
-    const String & server_display_name,
+    const String & host_name,
     DB::InternalProfileEventsQueuePtr profile_queue,
     DB::Block & block,
     ThreadIdToCountersSnapshot & last_sent_snapshots);
diff --git a/src/Interpreters/QueryLog.cpp b/src/Interpreters/QueryLog.cpp
index ad6e344655b..92f8ddae141 100644
--- a/src/Interpreters/QueryLog.cpp
+++ b/src/Interpreters/QueryLog.cpp
@@ -134,13 +134,13 @@ ColumnsDescription QueryLogElement::getColumnsDescription()
         {"used_storages", array_low_cardinality_string, "Canonical names of storages, which were used during query execution."},
         {"used_table_functions", array_low_cardinality_string, "Canonical names of table functions, which were used during query execution."},
 
-        {"used_row_policies", array_low_cardinality_string},
+        {"used_row_policies", array_low_cardinality_string, "The list of row policies names that were used during query execution."},
 
-        {"transaction_id", getTransactionIDDataType()},
+        {"transaction_id", getTransactionIDDataType(), "The identifier of the transaction in scope of which this query was executed."},
 
         {"query_cache_usage", std::move(query_cache_usage_datatype), "Usage of the query cache during query execution. Values: 'Unknown' = Status unknown, 'None' = The query result was neither written into nor read from the query cache, 'Write' = The query result was written into the query cache, 'Read' = The query result was read from the query cache."},
 
-        {"asynchronous_read_counters", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>())},
+        {"asynchronous_read_counters", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>()), "Metrics for asynchronous reading."},
     };
 }
 
diff --git a/src/Interpreters/QueryLog.h b/src/Interpreters/QueryLog.h
index be5cb5835c5..f9ed8a2fb9e 100644
--- a/src/Interpreters/QueryLog.h
+++ b/src/Interpreters/QueryLog.h
@@ -106,7 +106,6 @@ struct QueryLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases();
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 
     static void appendClientInfo(const ClientInfo & client_info, MutableColumns & columns, size_t & i);
 };
diff --git a/src/Interpreters/QueryThreadLog.cpp b/src/Interpreters/QueryThreadLog.cpp
index d153e30a4ce..f50458745b9 100644
--- a/src/Interpreters/QueryThreadLog.cpp
+++ b/src/Interpreters/QueryThreadLog.cpp
@@ -28,58 +28,58 @@ ColumnsDescription QueryThreadLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", low_cardinality_string},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"query_start_time", std::make_shared<DataTypeDateTime>()},
-        {"query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"query_duration_ms", std::make_shared<DataTypeUInt64>()},
+        {"hostname", low_cardinality_string, "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "The date when the thread has finished execution of the query."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "The date and time when the thread has finished execution of the query."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "The date and time when the thread has finished execution of the query with microseconds precision."},
+        {"query_start_time", std::make_shared<DataTypeDateTime>(), "Start time of query execution."},
+        {"query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Start time of query execution with microsecond precision."},
+        {"query_duration_ms", std::make_shared<DataTypeUInt64>(), "Duration of query execution."},
 
-        {"read_rows", std::make_shared<DataTypeUInt64>()},
-        {"read_bytes", std::make_shared<DataTypeUInt64>()},
-        {"written_rows", std::make_shared<DataTypeUInt64>()},
-        {"written_bytes", std::make_shared<DataTypeUInt64>()},
-        {"memory_usage", std::make_shared<DataTypeInt64>()},
-        {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
+        {"read_rows", std::make_shared<DataTypeUInt64>(), "Number of read rows."},
+        {"read_bytes", std::make_shared<DataTypeUInt64>(), "Number of read bytes."},
+        {"written_rows", std::make_shared<DataTypeUInt64>(), "For INSERT queries, the number of written rows. For other queries, the column value is 0."},
+        {"written_bytes", std::make_shared<DataTypeUInt64>(), "For INSERT queries, the number of written bytes. For other queries, the column value is 0."},
+        {"memory_usage", std::make_shared<DataTypeInt64>(), "The difference between the amount of allocated and freed memory in context of this thread."},
+        {"peak_memory_usage", std::make_shared<DataTypeInt64>(), "The maximum difference between the amount of allocated and freed memory in context of this thread."},
 
-        {"thread_name", low_cardinality_string},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
-        {"master_thread_id", std::make_shared<DataTypeUInt64>()},
-        {"current_database", low_cardinality_string},
-        {"query", std::make_shared<DataTypeString>()},
-        {"normalized_query_hash", std::make_shared<DataTypeUInt64>()},
+        {"thread_name", low_cardinality_string, "Name of the thread."},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "Internal thread ID."},
+        {"master_thread_id", std::make_shared<DataTypeUInt64>(), "OS initial ID of initial thread."},
+        {"current_database", low_cardinality_string, "Name of the current database."},
+        {"query", std::make_shared<DataTypeString>(), "Query string."},
+        {"normalized_query_hash", std::make_shared<DataTypeUInt64>(), "The hash of normalized query - with wiped constanstans, etc."},
 
-        {"is_initial_query", std::make_shared<DataTypeUInt8>()},
-        {"user", low_cardinality_string},
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"address", DataTypeFactory::instance().get("IPv6")},
-        {"port", std::make_shared<DataTypeUInt16>()},
-        {"initial_user", low_cardinality_string},
-        {"initial_query_id", std::make_shared<DataTypeString>()},
-        {"initial_address", DataTypeFactory::instance().get("IPv6")},
-        {"initial_port", std::make_shared<DataTypeUInt16>()},
-        {"initial_query_start_time", std::make_shared<DataTypeDateTime>()},
-        {"initial_query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"interface", std::make_shared<DataTypeUInt8>()},
-        {"is_secure", std::make_shared<DataTypeUInt8>()},
-        {"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", low_cardinality_string},
-        {"http_referer", std::make_shared<DataTypeString>()},
-        {"forwarded_for", std::make_shared<DataTypeString>()},
-        {"quota_key", std::make_shared<DataTypeString>()},
-        {"distributed_depth", std::make_shared<DataTypeUInt64>()},
+        {"is_initial_query", std::make_shared<DataTypeUInt8>(), "Query type. Possible values: 1 — Query was initiated by the client, 0 — Query was initiated by another query for distributed query execution."},
+        {"user", low_cardinality_string, "Name of the user who initiated the current query."},
+        {"query_id", std::make_shared<DataTypeString>(), "ID of the query."},
+        {"address", DataTypeFactory::instance().get("IPv6"), "IP address that was used to make the query."},
+        {"port", std::make_shared<DataTypeUInt16>(), "The client port that was used to make the query."},
+        {"initial_user", low_cardinality_string, "Name of the user who ran the initial query (for distributed query execution)."},
+        {"initial_query_id", std::make_shared<DataTypeString>(), "ID of the initial query (for distributed query execution)."},
+        {"initial_address", DataTypeFactory::instance().get("IPv6"), "IP address that the parent query was launched from."},
+        {"initial_port", std::make_shared<DataTypeUInt16>(), "The client port that was used to make the parent query."},
+        {"initial_query_start_time", std::make_shared<DataTypeDateTime>(), "Start time of the initial query execution."},
+        {"initial_query_start_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Start time of the initial query execution "},
+        {"interface", std::make_shared<DataTypeUInt8>(), "Interface that the query was initiated from. Possible values: 1 — TCP, 2 — HTTP."},
+        {"is_secure", std::make_shared<DataTypeUInt8>(), "The flag which shows whether the connection was secure."},
+        {"os_user", low_cardinality_string, "OSs username who runs clickhouse-client."},
+        {"client_hostname", low_cardinality_string, "Hostname of the client machine where the clickhouse-client or another TCP client is run."},
+        {"client_name", low_cardinality_string, "The clickhouse-client or another TCP client name."},
+        {"client_revision", std::make_shared<DataTypeUInt32>(), "Revision of the clickhouse-client or another TCP client."},
+        {"client_version_major", std::make_shared<DataTypeUInt32>(), "Major version of the clickhouse-client or another TCP client."},
+        {"client_version_minor", std::make_shared<DataTypeUInt32>(), "Minor version of the clickhouse-client or another TCP client."},
+        {"client_version_patch", std::make_shared<DataTypeUInt32>(), "Patch component of the clickhouse-client or another TCP client version."},
+        {"http_method", std::make_shared<DataTypeUInt8>(), "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", low_cardinality_string, "The UserAgent header passed in the HTTP request."},
+        {"http_referer", std::make_shared<DataTypeString>(), "HTTP header `Referer` passed in the HTTP query (contains an absolute or partial address of the page making the query)."},
+        {"forwarded_for", std::make_shared<DataTypeString>(), "HTTP header `X-Forwarded-For` passed in the HTTP query."},
+        {"quota_key", std::make_shared<DataTypeString>(), "The 'quota key' specified in the quotas setting."},
+        {"distributed_depth", std::make_shared<DataTypeUInt64>(), "How many times a query was forwarded between servers."},
 
-        {"revision", std::make_shared<DataTypeUInt32>()},
+        {"revision", std::make_shared<DataTypeUInt32>(), "ClickHouse revision."},
 
-        {"ProfileEvents", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>())},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(low_cardinality_string, std::make_shared<DataTypeUInt64>()), "ProfileEvents that measure different metrics for this thread. The description of them could be found in the table system.events."},
     };
 }
 
diff --git a/src/Interpreters/QueryThreadLog.h b/src/Interpreters/QueryThreadLog.h
index fcce9232dc1..0bffc218a10 100644
--- a/src/Interpreters/QueryThreadLog.h
+++ b/src/Interpreters/QueryThreadLog.h
@@ -49,7 +49,6 @@ struct QueryThreadLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases();
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 
diff --git a/src/Interpreters/QueryViewsLog.cpp b/src/Interpreters/QueryViewsLog.cpp
index c426f2d3cf0..a5441363340 100644
--- a/src/Interpreters/QueryViewsLog.cpp
+++ b/src/Interpreters/QueryViewsLog.cpp
@@ -35,30 +35,34 @@ ColumnsDescription QueryViewsLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"view_duration_ms", std::make_shared<DataTypeUInt64>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "The date when the last event of the view happened."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "The date and time when the view finished execution."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "The date and time when the view finished execution with microseconds precision."},
+        {"view_duration_ms", std::make_shared<DataTypeUInt64>(), "Duration of view execution (sum of its stages) in milliseconds."},
 
-        {"initial_query_id", std::make_shared<DataTypeString>()},
-        {"view_name", std::make_shared<DataTypeString>()},
-        {"view_uuid", std::make_shared<DataTypeUUID>()},
-        {"view_type", std::move(view_type_datatype)},
-        {"view_query", std::make_shared<DataTypeString>()},
-        {"view_target", std::make_shared<DataTypeString>()},
+        {"initial_query_id", std::make_shared<DataTypeString>(), "ID of the initial query (for distributed query execution)."},
+        {"view_name", std::make_shared<DataTypeString>(), "Name of the view."},
+        {"view_uuid", std::make_shared<DataTypeUUID>(), "UUID of the view."},
+        {"view_type", std::move(view_type_datatype), "Type of the view. Values: 'Default' = 1 — Default views. Should not appear in this log, 'Materialized' = 2 — Materialized views, 'Live' = 3 — Live views."},
+        {"view_query", std::make_shared<DataTypeString>(), "The query executed by the view."},
+        {"view_target", std::make_shared<DataTypeString>(), "The name of the view target table."},
 
-        {"read_rows", std::make_shared<DataTypeUInt64>()},
-        {"read_bytes", std::make_shared<DataTypeUInt64>()},
-        {"written_rows", std::make_shared<DataTypeUInt64>()},
-        {"written_bytes", std::make_shared<DataTypeUInt64>()},
-        {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
+        {"read_rows", std::make_shared<DataTypeUInt64>(), "Number of read rows."},
+        {"read_bytes", std::make_shared<DataTypeUInt64>(), "Number of read bytes."},
+        {"written_rows", std::make_shared<DataTypeUInt64>(), "Number of written rows."},
+        {"written_bytes", std::make_shared<DataTypeUInt64>(), "Number of written bytes."},
+        {"peak_memory_usage", std::make_shared<DataTypeInt64>(), "The maximum difference between the amount of allocated and freed memory in context of this view."},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "ProfileEvents that measure different metrics. The description of them could be found in the table system.events."},
 
-        {"status", std::move(view_status_datatype)},
-        {"exception_code", std::make_shared<DataTypeInt32>()},
-        {"exception", std::make_shared<DataTypeString>()},
-        {"stack_trace", std::make_shared<DataTypeString>()}
+        {"status", std::move(view_status_datatype), "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", std::make_shared<DataTypeInt32>(), "Code of an exception."},
+        {"exception", std::make_shared<DataTypeString>(), "Exception message."},
+        {"stack_trace", std::make_shared<DataTypeString>(), "Stack trace. An empty string, if the query was completed successfully."}
     };
 }
 
diff --git a/src/Interpreters/QueryViewsLog.h b/src/Interpreters/QueryViewsLog.h
index 000d0bd385a..2de06fe3ddc 100644
--- a/src/Interpreters/QueryViewsLog.h
+++ b/src/Interpreters/QueryViewsLog.h
@@ -81,7 +81,6 @@ struct QueryViewsLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases();
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 
diff --git a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
index 60c9fcf2a24..516e6f0a9d4 100644
--- a/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
+++ b/src/Interpreters/RedundantFunctionsInOrderByVisitor.h
@@ -61,7 +61,7 @@ public:
 
             /// Allow known identifiers: they are present in ORDER BY before current item
             if (auto * identifier = arg->as<ASTIdentifier>())
-                if (data.keys.count(getIdentifierName(identifier)))
+                if (data.keys.contains(getIdentifierName(identifier)))
                     continue;
 
             /// Reject erase others
diff --git a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
index 506fa13b7ba..f0202199752 100644
--- a/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
+++ b/src/Interpreters/RewriteFunctionToSubcolumnVisitor.cpp
@@ -1,9 +1,10 @@
-#include <Interpreters/RewriteFunctionToSubcolumnVisitor.h>
-#include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/NestedUtils.h>
+#include <Interpreters/RewriteFunctionToSubcolumnVisitor.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
-#include <Parsers/ASTFunction.h>
+#include <Common/assert_cast.h>
 
 namespace DB
 {
@@ -122,6 +123,21 @@ void RewriteFunctionToSubcolumnData::visit(ASTFunction & function, ASTPtr & ast)
             ast = transformToSubcolumn(name_in_storage, subcolumn_name);
             ast->setAlias(alias);
         }
+        else if (function.name == "variantElement" && column_type_id == TypeIndex::Variant)
+        {
+            const auto * literal = arguments[1]->as<ASTLiteral>();
+            if (!literal)
+                return;
+
+            String subcolumn_name;
+            auto value_type = literal->value.getType();
+            if (value_type != Field::Types::String)
+                return;
+
+            subcolumn_name = literal->value.get<const String &>();
+            ast = transformToSubcolumn(name_in_storage, subcolumn_name);
+            ast->setAlias(alias);
+        }
         else
         {
             auto it = binary_function_to_subcolumn.find(function.name);
diff --git a/src/Interpreters/RewriteOrderByVisitor.cpp b/src/Interpreters/RewriteOrderByVisitor.cpp
index 694dec84b7a..26817b70dc0 100644
--- a/src/Interpreters/RewriteOrderByVisitor.cpp
+++ b/src/Interpreters/RewriteOrderByVisitor.cpp
@@ -39,9 +39,8 @@ void RewriteOrderBy::visit(ASTPtr & ast, Data &)
         {
             // clone w/o children
             auto clone = std::make_shared<ASTOrderByElement>(*order_by_elem);
-            clone->children.clear();
 
-            clone->children.emplace_back(identifier);
+            clone->children[0] = identifier;
             new_order_by->children.emplace_back(clone);
         }
         if (!new_order_by->children.empty())
diff --git a/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.cpp b/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.cpp
new file mode 100644
index 00000000000..8e60603cca9
--- /dev/null
+++ b/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.cpp
@@ -0,0 +1,131 @@
+#include <Interpreters/RewriteSumFunctionWithSumAndCountVisitor.h>
+#include <Interpreters/IdentifierSemantic.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+
+#include <Poco/String.h>
+
+namespace DB
+{
+
+void RewriteSumFunctionWithSumAndCountMatcher::visit(ASTPtr & ast, const Data & data)
+{
+    if (auto * func = ast->as<ASTFunction>())
+        visit(*func, ast, data);
+}
+
+/** Rewrites `sum(column +/- literal)` into two individual functions
+ * `sum(column)` and `literal * count(column)`.
+ * sum(column + literal) -> sum(column) + literal * count(column)
+ * sum(literal + column) -> literal * count(column) + sum(column)
+ * sum(column - literal) -> sum(column) - literal * count(column)
+ * sum(literal - column) -> literal * count(column) - sum(column)
+ */
+void RewriteSumFunctionWithSumAndCountMatcher::visit(const ASTFunction & function, ASTPtr & ast, const Data & data)
+{
+    static const std::unordered_set<String> function_supported = {
+        "plus",
+        "minus"
+    };
+
+    if (!function.arguments || Poco::toLower(function.name) != "sum" || function.arguments->children.size() != 1)
+        return;
+
+    const auto * func_plus_minus = function.arguments->children[0]->as<ASTFunction>();
+
+    if (!func_plus_minus || !function_supported.contains(Poco::toLower(func_plus_minus->name)) || func_plus_minus->arguments->children.size() != 2)
+        return;
+
+    size_t column_id;
+    if (func_plus_minus->arguments->children[0]->as<ASTIdentifier>() && func_plus_minus->arguments->children[1]->as<ASTLiteral>())
+        column_id = 0;
+    else if (func_plus_minus->arguments->children[0]->as<ASTLiteral>() && func_plus_minus->arguments->children[1]->as<ASTIdentifier>())
+        column_id = 1;
+    else
+        return;
+
+    size_t literal_id = 1 - column_id;
+    const auto * literal = func_plus_minus->arguments->children[literal_id]->as<ASTLiteral>();
+    if (!literal)
+        return;
+
+    ///all the types listed are numbers and supported by 'plus' and 'minus'.
+    Field::Types::Which literal_type = literal->value.getType();
+    if (literal_type != Field::Types::UInt64 &&
+        literal_type != Field::Types::Int64 &&
+        literal_type != Field::Types::UInt128 &&
+        literal_type != Field::Types::Int128 &&
+        literal_type != Field::Types::UInt256 &&
+        literal_type != Field::Types::Int256 &&
+        literal_type != Field::Types::Float64 &&
+        literal_type != Field::Types::Decimal32 &&
+        literal_type != Field::Types::Decimal64 &&
+        literal_type != Field::Types::Decimal128 &&
+        literal_type != Field::Types::Decimal256)
+        return;
+
+    const auto * column = func_plus_minus->arguments->children[column_id]->as<ASTIdentifier>();
+    if (!column)
+        return;
+
+    auto pos = IdentifierSemantic::getMembership(*column);
+    if (!pos)
+        pos = IdentifierSemantic::chooseTableColumnMatch(*column, data.tables, true);
+    if (!pos)
+        return;
+
+    if (*pos >= data.tables.size())
+        return;
+
+    auto column_type_name = data.tables[*pos].columns.tryGetByName(column->shortName());
+    if (!column_type_name)
+        return;
+
+    const auto column_type = column_type_name->type;
+    if (!column_type || !isNumber(*column_type))
+        return;
+
+    const String & column_name = column_type_name->name;
+
+    if (column_id == 0)
+    {
+        const auto new_ast = makeASTFunction(func_plus_minus->name,
+                                                makeASTFunction("sum",
+                                                                std::make_shared<ASTIdentifier>(column_name)
+                                                                ),
+                                                makeASTFunction("multiply",
+                                                                std::make_shared<ASTLiteral>(* literal),
+                                                                makeASTFunction("count", std::make_shared<ASTIdentifier>(column_name))
+                                                                )
+                                                );
+        if (!new_ast)
+            return;
+        else
+        {
+            new_ast->setAlias(ast->tryGetAlias());
+            ast = new_ast;
+        }
+    }
+    else if (column_id == 1)
+    {
+        const auto new_ast = makeASTFunction(func_plus_minus->name,
+                                                makeASTFunction("multiply",
+                                                                std::make_shared<ASTLiteral>(* literal),
+                                                                makeASTFunction("count", std::make_shared<ASTIdentifier>(column_name))
+                                                                ),
+                                                makeASTFunction("sum",
+                                                                std::make_shared<ASTIdentifier>(column_name)
+                                                                )
+                                                );
+        if (!new_ast)
+            return;
+        else
+        {
+            new_ast->setAlias(ast->tryGetAlias());
+            ast = new_ast;
+        }
+    }
+}
+
+}
diff --git a/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.h b/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.h
new file mode 100644
index 00000000000..68bc5e0ba31
--- /dev/null
+++ b/src/Interpreters/RewriteSumFunctionWithSumAndCountVisitor.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/InDepthNodeVisitor.h>
+
+namespace DB
+{
+
+class ASTFunction;
+
+class RewriteSumFunctionWithSumAndCountMatcher
+{
+public:
+    struct Data
+    {
+        const TablesWithColumns & tables;
+    };
+
+    static void visit(ASTPtr & ast, const Data & data);
+    static void visit(const ASTFunction &, ASTPtr & ast, const Data & data);
+    static bool needChildVisit(const ASTPtr &, const ASTPtr &) { return true; }
+};
+
+using RewriteSumFunctionWithSumAndCountVisitor = InDepthNodeVisitor<RewriteSumFunctionWithSumAndCountMatcher, true>;
+}
diff --git a/src/Interpreters/RewriteUniqToCountVisitor.cpp b/src/Interpreters/RewriteUniqToCountVisitor.cpp
index ddec6fe063e..a2e3a790c27 100644
--- a/src/Interpreters/RewriteUniqToCountVisitor.cpp
+++ b/src/Interpreters/RewriteUniqToCountVisitor.cpp
@@ -156,7 +156,11 @@ void RewriteUniqToCountMatcher::visit(ASTPtr & ast, Data & /*data*/)
     };
 
     if (match_subquery_with_distinct() || match_subquery_with_group_by())
+    {
+        auto main_alias = expr_list->children[0]->tryGetAlias();
         expr_list->children[0] = makeASTFunction("count");
+        expr_list->children[0]->setAlias(main_alias);
+    }
 }
 
 }
diff --git a/src/Interpreters/RowRefs.cpp b/src/Interpreters/RowRefs.cpp
index 4335cde47f9..9785ba46dab 100644
--- a/src/Interpreters/RowRefs.cpp
+++ b/src/Interpreters/RowRefs.cpp
@@ -175,45 +175,42 @@ private:
     // the array becomes immutable
     void sort()
     {
-        if (!sorted.load(std::memory_order_acquire))
+        if (sorted.load(std::memory_order_acquire))
+            return;
+
+        std::lock_guard<std::mutex> l(lock);
+
+        if (sorted.load(std::memory_order_relaxed))
+            return;
+
+        if constexpr (std::is_arithmetic_v<TKey> && !std::is_floating_point_v<TKey>)
         {
-            std::lock_guard<std::mutex> l(lock);
-
-            if (!sorted.load(std::memory_order_relaxed))
+            if (likely(entries.size() > 256))
             {
-                if constexpr (std::is_arithmetic_v<TKey> && !std::is_floating_point_v<TKey>)
+                struct RadixSortTraits : RadixSortNumTraits<TKey>
                 {
-                    if (likely(entries.size() > 256))
-                    {
-                        struct RadixSortTraits : RadixSortNumTraits<TKey>
-                        {
-                            using Element = Entry;
-                            using Result = Element;
+                    using Element = Entry;
+                    using Result = Element;
 
-                            static TKey & extractKey(Element & elem) { return elem.value; }
-                            static Result extractResult(Element & elem) { return elem; }
-                        };
-
-                        if constexpr (is_descending)
-                            RadixSort<RadixSortTraits>::executeLSD(entries.data(), entries.size(), true);
-                        else
-                            RadixSort<RadixSortTraits>::executeLSD(entries.data(), entries.size(), false);
-
-                        sorted.store(true, std::memory_order_release);
-                        return;
-                    }
-                }
-
-                if constexpr (is_descending)
-                    ::sort(entries.begin(), entries.end(), GreaterEntryOperator());
-                else
-                    ::sort(entries.begin(), entries.end(), LessEntryOperator());
+                    static TKey & extractKey(Element & elem) { return elem.value; }
+                    static Result extractResult(Element & elem) { return elem; }
+                };
 
+                RadixSort<RadixSortTraits>::executeLSDWithTrySort(entries.data(), entries.size(), is_descending /*reverse*/);
                 sorted.store(true, std::memory_order_release);
+                return;
             }
         }
+
+        if constexpr (is_descending)
+            ::sort(entries.begin(), entries.end(), GreaterEntryOperator());
+        else
+            ::sort(entries.begin(), entries.end(), LessEntryOperator());
+
+        sorted.store(true, std::memory_order_release);
     }
 };
+
 }
 
 AsofRowRefs createAsofRowRef(TypeIndex type, ASOFJoinInequality inequality)
diff --git a/src/Interpreters/S3QueueLog.cpp b/src/Interpreters/S3QueueLog.cpp
index 967becb6e0f..ba990a8ac25 100644
--- a/src/Interpreters/S3QueueLog.cpp
+++ b/src/Interpreters/S3QueueLog.cpp
@@ -25,17 +25,19 @@ ColumnsDescription S3QueueLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"table_uuid", std::make_shared<DataTypeString>()},
-        {"file_name", std::make_shared<DataTypeString>()},
-        {"rows_processed", std::make_shared<DataTypeUInt64>()},
-        {"status", status_datatype},
-        {"processing_start_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
-        {"processing_end_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
-        {"exception", std::make_shared<DataTypeString>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname"},
+        {"event_date", std::make_shared<DataTypeDate>(), "Event date of writing this log row"},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Event time of writing this log row"},
+        {"database", std::make_shared<DataTypeString>(), "The name of a database where current S3Queue table lives."},
+        {"table", std::make_shared<DataTypeString>(), "The name of S3Queue table."},
+        {"uuid", std::make_shared<DataTypeString>(), "The UUID of S3Queue table"},
+        {"file_name", std::make_shared<DataTypeString>(), "File name of the processing file"},
+        {"rows_processed", std::make_shared<DataTypeUInt64>(), "Number of processed rows"},
+        {"status", status_datatype, "Status of the processing file"},
+        {"processing_start_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "Time of the start of processing the file"},
+        {"processing_end_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "Time of the end of processing the file"},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "Profile events collected while loading this file"},
+        {"exception", std::make_shared<DataTypeString>(), "Exception message if happened"},
     };
 }
 
@@ -45,7 +47,9 @@ void S3QueueLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insert(getFQDNOrHostName());
     columns[i++]->insert(DateLUT::instance().toDayNum(event_time).toUnderType());
     columns[i++]->insert(event_time);
-    columns[i++]->insert(table_uuid);
+    columns[i++]->insert(database);
+    columns[i++]->insert(table);
+    columns[i++]->insert(uuid);
     columns[i++]->insert(file_name);
     columns[i++]->insert(rows_processed);
     columns[i++]->insert(status);
diff --git a/src/Interpreters/S3QueueLog.h b/src/Interpreters/S3QueueLog.h
index e0362bf9716..a7adbf28b3d 100644
--- a/src/Interpreters/S3QueueLog.h
+++ b/src/Interpreters/S3QueueLog.h
@@ -12,7 +12,11 @@ namespace DB
 struct S3QueueLogElement
 {
     time_t event_time{};
-    std::string table_uuid;
+
+    std::string database;
+    std::string table;
+    std::string uuid;
+
     std::string file_name;
     size_t rows_processed = 0;
 
@@ -33,7 +37,6 @@ struct S3QueueLogElement
     static NamesAndAliases getNamesAndAliases() { return {}; }
 
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class S3QueueLog : public SystemLog<S3QueueLogElement>
diff --git a/src/Interpreters/SelectQueryOptions.h b/src/Interpreters/SelectQueryOptions.h
index 1e08aec3813..877f95cbb74 100644
--- a/src/Interpreters/SelectQueryOptions.h
+++ b/src/Interpreters/SelectQueryOptions.h
@@ -46,13 +46,17 @@ struct SelectQueryOptions
     /// Bypass setting constraints for some internal queries such as projection ASTs.
     bool ignore_setting_constraints = false;
 
+    /// Bypass access check for select query.
+    /// This allows to skip double access check in some specific cases (e.g. insert into table with materialized view)
+    bool ignore_access_check = false;
+
     /// These two fields are used to evaluate shardNum() and shardCount() function when
     /// prefer_localhost_replica == 1 and local instance is selected. They are needed because local
     /// instance might have multiple shards and scalars can only hold one value.
     std::optional<UInt32> shard_num;
     std::optional<UInt32> shard_count;
 
-    SelectQueryOptions(
+    SelectQueryOptions( /// NOLINT(google-explicit-constructor)
         QueryProcessingStage::Enum stage = QueryProcessingStage::Complete,
         size_t depth = 0,
         bool is_subquery_ = false,
@@ -129,6 +133,12 @@ struct SelectQueryOptions
         return *this;
     }
 
+    SelectQueryOptions & ignoreAccessCheck(bool value = true)
+    {
+        ignore_access_check = value;
+        return *this;
+    }
+
     SelectQueryOptions & setInternal(bool value = false)
     {
         is_internal = value;
diff --git a/src/Interpreters/ServerAsynchronousMetrics.cpp b/src/Interpreters/ServerAsynchronousMetrics.cpp
index 31d4a4e51a4..7703a352130 100644
--- a/src/Interpreters/ServerAsynchronousMetrics.cpp
+++ b/src/Interpreters/ServerAsynchronousMetrics.cpp
@@ -9,6 +9,8 @@
 #include <Interpreters/Cache/QueryCache.h>
 #include <Interpreters/JIT/CompiledExpressionCache.h>
 
+#include <Common/PageCache.h>
+
 #include <Databases/IDatabase.h>
 
 #include <IO/UncompressedCache.h>
@@ -69,7 +71,7 @@ ServerAsynchronousMetrics::~ServerAsynchronousMetrics()
     stop();
 }
 
-void ServerAsynchronousMetrics::updateImpl(AsynchronousMetricValues & new_values, TimePoint update_time, TimePoint current_time)
+void ServerAsynchronousMetrics::updateImpl(TimePoint update_time, TimePoint current_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values)
 {
     if (auto mark_cache = getContext()->getMarkCache())
     {
@@ -77,6 +79,16 @@ void ServerAsynchronousMetrics::updateImpl(AsynchronousMetricValues & new_values
         new_values["MarkCacheFiles"] = { mark_cache->count(), "Total number of mark files cached in the mark cache" };
     }
 
+    if (auto page_cache = getContext()->getPageCache())
+    {
+        auto rss = page_cache->getResidentSetSize();
+        new_values["PageCacheBytes"] = { rss.page_cache_rss, "Userspace page cache memory usage in bytes" };
+        new_values["PageCachePinnedBytes"] = { page_cache->getPinnedSize(), "Userspace page cache memory that's currently in use and can't be evicted" };
+
+        if (rss.unreclaimable_rss.has_value())
+            new_values["UnreclaimableRSS"] = { *rss.unreclaimable_rss, "The amount of physical memory used by the server process, in bytes, excluding memory reclaimable by the OS (MADV_FREE)" };
+    }
+
     if (auto uncompressed_cache = getContext()->getUncompressedCache())
     {
         new_values["UncompressedCacheBytes"] = { uncompressed_cache->sizeInBytes(),
@@ -266,7 +278,8 @@ void ServerAsynchronousMetrics::updateImpl(AsynchronousMetricValues & new_values
 
             bool is_system = db.first == DatabaseCatalog::SYSTEM_DATABASE;
 
-            for (auto iterator = db.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
+            // Note that we skip not yet loaded tables, so metrics could possibly be lower than expected on fully loaded database just after server start if `async_load_databases = true`.
+            for (auto iterator = db.second->getTablesIterator(getContext(), {}, /*skip_not_loaded=*/true); iterator->isValid(); iterator->next())
             {
                 ++total_number_of_tables;
                 if (is_system)
@@ -377,7 +390,7 @@ void ServerAsynchronousMetrics::updateImpl(AsynchronousMetricValues & new_values
     }
 #endif
 
-    updateHeavyMetricsIfNeeded(current_time, update_time, new_values);
+    updateHeavyMetricsIfNeeded(current_time, update_time, force_update, first_run, new_values);
 }
 
 void ServerAsynchronousMetrics::logImpl(AsynchronousMetricValues & new_values)
@@ -396,7 +409,7 @@ void ServerAsynchronousMetrics::updateDetachedPartsStats()
         if (!db.second->canContainMergeTreeTables())
             continue;
 
-        for (auto iterator = db.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
+        for (auto iterator = db.second->getTablesIterator(getContext(), {}, true); iterator->isValid(); iterator->next())
         {
             const auto & table = iterator->table();
             if (!table)
@@ -421,19 +434,19 @@ void ServerAsynchronousMetrics::updateDetachedPartsStats()
     detached_parts_stats = current_values;
 }
 
-void ServerAsynchronousMetrics::updateHeavyMetricsIfNeeded(TimePoint current_time, TimePoint update_time, AsynchronousMetricValues & new_values)
+void ServerAsynchronousMetrics::updateHeavyMetricsIfNeeded(TimePoint current_time, TimePoint update_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values)
 {
-    const auto time_after_previous_update = current_time - heavy_metric_previous_update_time;
-    const bool update_heavy_metric = time_after_previous_update >= heavy_metric_update_period || first_run;
+    const auto time_since_previous_update = current_time - heavy_metric_previous_update_time;
+    const bool update_heavy_metrics = (time_since_previous_update >= heavy_metric_update_period) || force_update || first_run;
 
     Stopwatch watch;
-    if (update_heavy_metric)
+    if (update_heavy_metrics)
     {
         heavy_metric_previous_update_time = update_time;
         if (first_run)
             heavy_update_interval = heavy_metric_update_period.count();
         else
-            heavy_update_interval = std::chrono::duration_cast<std::chrono::microseconds>(time_after_previous_update).count() / 1e6;
+            heavy_update_interval = std::chrono::duration_cast<std::chrono::microseconds>(time_since_previous_update).count() / 1e6;
 
         /// Test shows that listing 100000 entries consuming around 0.15 sec.
         updateDetachedPartsStats();
diff --git a/src/Interpreters/ServerAsynchronousMetrics.h b/src/Interpreters/ServerAsynchronousMetrics.h
index a579d12de2c..b0cf8efbfd7 100644
--- a/src/Interpreters/ServerAsynchronousMetrics.h
+++ b/src/Interpreters/ServerAsynchronousMetrics.h
@@ -18,7 +18,7 @@ public:
     ~ServerAsynchronousMetrics() override;
 
 private:
-    void updateImpl(AsynchronousMetricValues & new_values, TimePoint update_time, TimePoint current_time) override;
+    void updateImpl(TimePoint update_time, TimePoint current_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values) override;
     void logImpl(AsynchronousMetricValues & new_values) override;
 
     const Duration heavy_metric_update_period;
@@ -34,7 +34,7 @@ private:
     DetachedPartsStats detached_parts_stats{};
 
     void updateDetachedPartsStats();
-    void updateHeavyMetricsIfNeeded(TimePoint current_time, TimePoint update_time, AsynchronousMetricValues & new_values);
+    void updateHeavyMetricsIfNeeded(TimePoint current_time, TimePoint update_time, bool force_update, bool first_run, AsynchronousMetricValues & new_values);
 };
 
 }
diff --git a/src/Interpreters/Session.cpp b/src/Interpreters/Session.cpp
index d2f9fe8b325..9f64380ab43 100644
--- a/src/Interpreters/Session.cpp
+++ b/src/Interpreters/Session.cpp
@@ -265,7 +265,7 @@ private:
     ThreadFromGlobalPool thread;
     bool quit = false;
 
-    Poco::Logger * log = &Poco::Logger::get("NamedSessionsStorage");
+    LoggerPtr log = getLogger("NamedSessionsStorage");
 };
 
 
@@ -282,7 +282,7 @@ void Session::shutdownNamedSessions()
 Session::Session(const ContextPtr & global_context_, ClientInfo::Interface interface_, bool is_secure, const std::string & certificate)
     : auth_id(UUIDHelpers::generateV4()),
       global_context(global_context_),
-      log(&Poco::Logger::get(String{magic_enum::enum_name(interface_)} + "-Session"))
+      log(getLogger(String{magic_enum::enum_name(interface_)} + "-Session"))
 {
     prepared_client_info.emplace();
     prepared_client_info->interface = interface_;
@@ -349,10 +349,9 @@ void Session::authenticate(const Credentials & credentials_, const Poco::Net::So
 
     try
     {
-        auto auth_result = global_context->getAccessControl().authenticate(credentials_, address.host());
+        auto auth_result = global_context->getAccessControl().authenticate(credentials_, address.host(), getClientInfo().getLastForwardedFor());
         user_id = auth_result.user_id;
         settings_from_auth_server = auth_result.settings;
-
         LOG_DEBUG(log, "{} Authenticated with global context as user {}",
                 toString(auth_id), toString(*user_id));
     }
@@ -430,18 +429,12 @@ void Session::setClientConnectionId(uint32_t connection_id)
         prepared_client_info->connection_id = connection_id;
 }
 
-void Session::setHttpClientInfo(ClientInfo::HTTPMethod http_method, const String & http_user_agent, const String & http_referer)
+void Session::setHTTPClientInfo(const Poco::Net::HTTPRequest & request)
 {
     if (session_context)
-    {
-        session_context->setHttpClientInfo(http_method, http_user_agent, http_referer);
-    }
+        session_context->setHTTPClientInfo(request);
     else
-    {
-        prepared_client_info->http_method = http_method;
-        prepared_client_info->http_user_agent = http_user_agent;
-        prepared_client_info->http_referer = http_referer;
-    }
+        prepared_client_info->setFromHTTPRequest(request);
 }
 
 void Session::setForwardedFor(const String & forwarded_for)
diff --git a/src/Interpreters/Session.h b/src/Interpreters/Session.h
index 75e1414b8cb..e6cb7ca20cd 100644
--- a/src/Interpreters/Session.h
+++ b/src/Interpreters/Session.h
@@ -65,7 +65,7 @@ public:
     void setClientInterface(ClientInfo::Interface interface);
     void setClientVersion(UInt64 client_version_major, UInt64 client_version_minor, UInt64 client_version_patch, unsigned client_tcp_protocol_version);
     void setClientConnectionId(uint32_t connection_id);
-    void setHttpClientInfo(ClientInfo::HTTPMethod http_method, const String & http_user_agent, const String & http_referer);
+    void setHTTPClientInfo(const Poco::Net::HTTPRequest & request);
     void setForwardedFor(const String & forwarded_for);
     void setQuotaClientKey(const String & quota_key);
     void setConnectionClientVersion(UInt64 client_version_major, UInt64 client_version_minor, UInt64 client_version_patch, unsigned client_tcp_protocol_version);
@@ -123,7 +123,7 @@ private:
     /// to set when creating a session context
     SettingsChanges settings_from_auth_server;
 
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
 };
 
 }
diff --git a/src/Interpreters/SessionLog.cpp b/src/Interpreters/SessionLog.cpp
index a5bc5012292..adb94cae0c2 100644
--- a/src/Interpreters/SessionLog.cpp
+++ b/src/Interpreters/SessionLog.cpp
@@ -77,7 +77,7 @@ ColumnsDescription SessionLogElement::getColumnsDescription()
             {"Logout",                 static_cast<Int8>(SESSION_LOGOUT)}
         });
 
-#define AUTH_TYPE_NAME_AND_VALUE(v) std::make_pair(AuthenticationTypeInfo::get(v).raw_name, static_cast<Int8>(v))
+#define AUTH_TYPE_NAME_AND_VALUE(v) std::make_pair(toString(v), static_cast<Int8>(v))
     auto identified_with_column = std::make_shared<DataTypeEnum8>(
         DataTypeEnum8::Values
         {
@@ -121,33 +121,36 @@ ColumnsDescription SessionLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", lc_string_datatype},
-        {"type", std::move(event_type)},
-        {"auth_id", std::make_shared<DataTypeUUID>()},
-        {"session_id", std::make_shared<DataTypeString>()},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
+        {"hostname", lc_string_datatype, "Hostname of the server executing the query."},
+        {"type", std::move(event_type), "Login/logout result. Possible values: "
+            "LoginFailure — Login error. "
+            "LoginSuccess — Successful login. "
+            "Logout — Logout from the system."},
+        {"auth_id", std::make_shared<DataTypeUUID>(), "Authentication ID, which is a UUID that is automatically generated each time user logins."},
+        {"session_id", std::make_shared<DataTypeString>(), "Session ID that is passed by client via HTTP interface."},
+        {"event_date", std::make_shared<DataTypeDate>(), "Login/logout date."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Login/logout time."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Login/logout starting time with microseconds precision."},
 
-        {"user", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"auth_type", std::make_shared<DataTypeNullable>(std::move(identified_with_column))},
+        {"user", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "User name."},
+        {"auth_type", std::make_shared<DataTypeNullable>(std::move(identified_with_column)), "The authentication type."},
 
-        {"profiles", std::make_shared<DataTypeArray>(lc_string_datatype)},
-        {"roles", std::make_shared<DataTypeArray>(lc_string_datatype)},
-        {"settings", std::move(settings_type_column)},
+        {"profiles", std::make_shared<DataTypeArray>(lc_string_datatype), "The list of profiles set for all roles and/or users."},
+        {"roles", std::make_shared<DataTypeArray>(lc_string_datatype), "The list of roles to which the profile is applied."},
+        {"settings", std::move(settings_type_column), "Settings that were changed when the client logged in/out."},
 
-        {"client_address", DataTypeFactory::instance().get("IPv6")},
-        {"client_port", std::make_shared<DataTypeUInt16>()},
-        {"interface", std::move(interface_type_column)},
+        {"client_address", DataTypeFactory::instance().get("IPv6"), "The IP address that was used to log in/out."},
+        {"client_port", std::make_shared<DataTypeUInt16>(), "The client port that was used to log in/out."},
+        {"interface", std::move(interface_type_column), "The interface from which the login was initiated."},
 
-        {"client_hostname", std::make_shared<DataTypeString>()},
-        {"client_name", std::make_shared<DataTypeString>()},
-        {"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>()},
+        {"client_hostname", std::make_shared<DataTypeString>(), "The hostname of the client machine where the clickhouse-client or another TCP client is run."},
+        {"client_name", std::make_shared<DataTypeString>(), "The clickhouse-client or another TCP client name."},
+        {"client_revision", std::make_shared<DataTypeUInt32>(), "Revision of the clickhouse-client or another TCP client."},
+        {"client_version_major", std::make_shared<DataTypeUInt32>(), "The major version of the clickhouse-client or another TCP client."},
+        {"client_version_minor", std::make_shared<DataTypeUInt32>(), "The minor version of the clickhouse-client or another TCP client."},
+        {"client_version_patch", std::make_shared<DataTypeUInt32>(), "Patch component of the clickhouse-client or another TCP client version."},
 
-        {"failure_reason", std::make_shared<DataTypeString>()},
+        {"failure_reason", std::make_shared<DataTypeString>(), "The exception message containing the reason for the login/logout failure."},
     };
 }
 
diff --git a/src/Interpreters/SessionLog.h b/src/Interpreters/SessionLog.h
index 0f79a3e5ca7..5bacb9677c0 100644
--- a/src/Interpreters/SessionLog.h
+++ b/src/Interpreters/SessionLog.h
@@ -37,7 +37,7 @@ struct SessionLogElement
     SessionLogElement(const UUID & auth_id_, Type type_);
     SessionLogElement(const SessionLogElement &) = default;
     SessionLogElement & operator=(const SessionLogElement &) = default;
-    SessionLogElement(SessionLogElement &&) = default;
+    SessionLogElement(SessionLogElement &&) = default; /// NOLINT(performance-noexcept-move-constructor,hicpp-noexcept-move)
     SessionLogElement & operator=(SessionLogElement &&) = default;
 
     UUID auth_id;
@@ -64,7 +64,6 @@ struct SessionLogElement
     static NamesAndAliases getNamesAndAliases() { return {}; }
 
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 
diff --git a/src/Interpreters/Set.cpp b/src/Interpreters/Set.cpp
index 84260faafd4..d1520c92dbc 100644
--- a/src/Interpreters/Set.cpp
+++ b/src/Interpreters/Set.cpp
@@ -168,7 +168,7 @@ void Set::setHeader(const ColumnsWithTypeAndName & header)
     }
 
     /// Choose data structure to use for the set.
-    data.init(data.chooseMethod(key_columns, key_sizes));
+    data.init(SetVariants::chooseMethod(key_columns, key_sizes));
 }
 
 void Set::fillSetElements()
@@ -275,7 +275,7 @@ void Set::appendSetElements(SetKeyColumns & holder)
 void Set::checkIsCreated() const
 {
     if (!is_created.load())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Trying to use set before it has been built.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Trying to use set before it has been built.");
 }
 
 ColumnPtr Set::execute(const ColumnsWithTypeAndName & columns, bool negative) const
@@ -283,7 +283,7 @@ ColumnPtr Set::execute(const ColumnsWithTypeAndName & columns, bool negative) co
     size_t num_key_columns = columns.size();
 
     if (0 == num_key_columns)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no columns passed to Set::execute method.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No columns passed to Set::execute method.");
 
     auto res = ColumnUInt8::create();
     ColumnUInt8::Container & vec_res = res->getData();
diff --git a/src/Interpreters/Set.h b/src/Interpreters/Set.h
index 7136b090c42..8b44f36b278 100644
--- a/src/Interpreters/Set.h
+++ b/src/Interpreters/Set.h
@@ -33,7 +33,7 @@ public:
     /// store all set elements in explicit form.
     /// This is needed for subsequent use for index.
     Set(const SizeLimits & limits_, size_t max_elements_to_fill_, bool transform_null_in_)
-        : log(&Poco::Logger::get("Set")),
+        : log(getLogger("Set")),
         limits(limits_), max_elements_to_fill(max_elements_to_fill_), transform_null_in(transform_null_in_),
         cast_cache(std::make_unique<InternalCastFunctionCache>())
     {}
@@ -77,6 +77,7 @@ public:
     const DataTypes & getElementsTypes() const { return set_elements_types; }
 
     bool hasExplicitSetElements() const { return fill_set_elements || (!set_elements.empty() && set_elements.front()->size() == data.getTotalRowCount()); }
+    bool hasSetElements() const { return !set_elements.empty(); }
     Columns getSetElements() const { checkIsCreated(); return { set_elements.begin(), set_elements.end() }; }
 
     void checkColumnsNumber(size_t num_key_columns) const;
@@ -114,7 +115,7 @@ private:
     /// Types for set_elements.
     DataTypes set_elements_types;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Limitations on the maximum size of the set
     SizeLimits limits;
diff --git a/src/Interpreters/SetVariants.cpp b/src/Interpreters/SetVariants.cpp
index cd9148a01cf..0fb2e5189d4 100644
--- a/src/Interpreters/SetVariants.cpp
+++ b/src/Interpreters/SetVariants.cpp
@@ -146,7 +146,7 @@ typename SetVariantsTemplate<Variant>::Type SetVariantsTemplate<Variant>::choose
             return Type::keys128;
         if (size_of_field == 32)
             return Type::keys256;
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Numeric column has sizeOfField not in 1, 2, 4, 8, 16, 32.");
     }
 
     /// If the keys fit in N bits, we will use a hash table for N-bit-packed keys
diff --git a/src/Interpreters/SetVariants.h b/src/Interpreters/SetVariants.h
index 71187c9f109..ff527102080 100644
--- a/src/Interpreters/SetVariants.h
+++ b/src/Interpreters/SetVariants.h
@@ -80,7 +80,7 @@ protected:
 
         for (const auto & col : key_columns)
         {
-            if (auto * nullable = checkAndGetColumn<ColumnNullable>(*col))
+            if (const auto * nullable = checkAndGetColumn<ColumnNullable>(*col))
             {
                 actual_columns.push_back(&nullable->getNestedColumn());
                 null_maps.push_back(&nullable->getNullMapColumn());
@@ -96,7 +96,7 @@ protected:
     /// Return the columns which actually contain the values of the keys.
     /// For a given key column, if it is nullable, we return its nested
     /// column. Otherwise we return the key column itself.
-    inline const ColumnRawPtrs & getActualColumns() const
+    const ColumnRawPtrs & getActualColumns() const
     {
         return actual_columns;
     }
diff --git a/src/Interpreters/SquashingTransform.cpp b/src/Interpreters/SquashingTransform.cpp
index 4ed0dddc191..41f024df7a7 100644
--- a/src/Interpreters/SquashingTransform.cpp
+++ b/src/Interpreters/SquashingTransform.cpp
@@ -6,6 +6,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SIZES_OF_COLUMNS_DOESNT_MATCH;
+    extern const int LOGICAL_ERROR;
 }
 
 SquashingTransform::SquashingTransform(size_t min_block_size_rows_, size_t min_block_size_bytes_)
@@ -89,13 +90,25 @@ void SquashingTransform::append(ReferenceType input_block)
 
     assert(blocksHaveEqualStructure(input_block, accumulated_block));
 
-    for (size_t i = 0, size = accumulated_block.columns(); i < size; ++i)
+    try
     {
-        const auto source_column = input_block.getByPosition(i).column;
+        for (size_t i = 0, size = accumulated_block.columns(); i < size; ++i)
+        {
+            const auto source_column = input_block.getByPosition(i).column;
 
-        auto mutable_column = IColumn::mutate(std::move(accumulated_block.getByPosition(i).column));
-        mutable_column->insertRangeFrom(*source_column, 0, source_column->size());
-        accumulated_block.getByPosition(i).column = std::move(mutable_column);
+            auto mutable_column = IColumn::mutate(std::move(accumulated_block.getByPosition(i).column));
+            mutable_column->insertRangeFrom(*source_column, 0, source_column->size());
+            accumulated_block.getByPosition(i).column = std::move(mutable_column);
+        }
+    }
+    catch (...)
+    {
+        /// add() may be called again even after a previous add() threw an exception.
+        /// Keep accumulated_block in a valid state.
+        /// Seems ok to discard accumulated data because we're throwing an exception, which the caller will
+        /// hopefully interpret to mean "this block and all *previous* blocks are potentially lost".
+        accumulated_block.clear();
+        throw;
     }
 }
 
@@ -107,6 +120,9 @@ bool SquashingTransform::isEnoughSize(const Block & block)
 
     for (const auto & [column, type, name] : block)
     {
+        if (!column)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Invalid column in block.");
+
         if (!rows)
             rows = column->size();
         else if (rows != column->size())
diff --git a/src/Interpreters/SubstituteColumnOptimizer.h b/src/Interpreters/SubstituteColumnOptimizer.h
index 63867e80386..28aa8be0801 100644
--- a/src/Interpreters/SubstituteColumnOptimizer.h
+++ b/src/Interpreters/SubstituteColumnOptimizer.h
@@ -15,7 +15,7 @@ struct StorageInMemoryMetadata;
 using StorageMetadataPtr = std::shared_ptr<const StorageInMemoryMetadata>;
 
 /// Optimizer that tries to replace columns to equal columns (according to constraints)
-/// with lower size (accorsing to compressed and uncomressed size).
+/// with lower size (according to compressed and uncomressed size).
 class SubstituteColumnOptimizer
 {
 public:
diff --git a/src/Interpreters/SystemLog.cpp b/src/Interpreters/SystemLog.cpp
index c06fe8f5c90..db73fe038c0 100644
--- a/src/Interpreters/SystemLog.cpp
+++ b/src/Interpreters/SystemLog.cpp
@@ -1,8 +1,19 @@
-#include <IO/WriteHelpers.h>
+#include <Interpreters/SystemLog.h>
+
+#include <base/scope_guard.h>
+#include <Common/logger_useful.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
+#include <Common/quoteString.h>
+#include <Common/setThreadName.h>
 #include <Interpreters/AsynchronousInsertLog.h>
 #include <Interpreters/AsynchronousMetricLog.h>
+#include <Interpreters/BackupLog.h>
+#include <Interpreters/BlobStorageLog.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/CrashLog.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/FilesystemCacheLog.h>
+#include <Interpreters/FilesystemReadPrefetchesLog.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/InterpreterRenameQuery.h>
@@ -10,38 +21,31 @@
 #include <Interpreters/OpenTelemetrySpanLog.h>
 #include <Interpreters/PartLog.h>
 #include <Interpreters/ProcessorsProfileLog.h>
-#include <Interpreters/BlobStorageLog.h>
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/QueryThreadLog.h>
 #include <Interpreters/QueryViewsLog.h>
+#include <Interpreters/S3QueueLog.h>
 #include <Interpreters/SessionLog.h>
 #include <Interpreters/TextLog.h>
 #include <Interpreters/TraceLog.h>
 #include <Interpreters/TransactionsInfoLog.h>
-#include <Interpreters/FilesystemCacheLog.h>
-#include <Interpreters/FilesystemReadPrefetchesLog.h>
-#include <Interpreters/S3QueueLog.h>
 #include <Interpreters/ZooKeeperLog.h>
-#include <Interpreters/BackupLog.h>
+#include <IO/WriteHelpers.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIndexDeclaration.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTRenameQuery.h>
-#include <Parsers/ParserCreateQuery.h>
+#include <Parsers/CommonParsers.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/ParserCreateQuery.h>
+#include <Poco/Util/AbstractConfiguration.h>
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeSettings.h>
-#include <base/scope_guard.h>
-#include <fmt/core.h>
-#include <Poco/Util/AbstractConfiguration.h>
-#include "Common/quoteString.h"
-#include <Common/MemoryTrackerBlockerInThread.h>
-#include <Common/logger_useful.h>
-#include <Common/setThreadName.h>
 
+#include <fmt/core.h>
 
 namespace DB
 {
@@ -91,7 +95,7 @@ namespace
             if (!storage_p.parse(pos, storage, expected))
                 return false;
 
-            ParserKeyword s_comment("COMMENT");
+            ParserKeyword s_comment(Keyword::COMMENT);
             ParserStringLiteral string_literal_parser;
             ASTPtr comment;
 
@@ -125,13 +129,13 @@ std::shared_ptr<TSystemLog> createSystemLog(
 {
     if (!config.has(config_prefix))
     {
-        LOG_DEBUG(&Poco::Logger::get("SystemLog"),
+        LOG_DEBUG(getLogger("SystemLog"),
                 "Not creating {}.{} since corresponding section '{}' is missing from config",
                 default_database_name, default_table_name, config_prefix);
 
         return {};
     }
-    LOG_DEBUG(&Poco::Logger::get("SystemLog"),
+    LOG_DEBUG(getLogger("SystemLog"),
               "Creating {}.{} from {}", default_database_name, default_table_name, config_prefix);
 
     SystemLogSettings log_settings;
@@ -143,7 +147,7 @@ std::shared_ptr<TSystemLog> createSystemLog(
     {
         /// System tables must be loaded before other tables, but loading order is undefined for all databases except `system`
         LOG_ERROR(
-            &Poco::Logger::get("SystemLog"),
+            getLogger("SystemLog"),
             "Custom database name for a system table specified in config."
             " Table `{}` will be created in `system` database instead of `{}`",
             log_settings.queue_settings.table,
@@ -211,16 +215,17 @@ std::shared_ptr<TSystemLog> createSystemLog(
             if (!settings.empty())
                 log_settings.engine += (storage_policy.empty() ? " " : ", ") + settings;
         }
-
-        /// Add comment to AST. So it will be saved when the table will be renamed.
-        log_settings.engine += fmt::format(" COMMENT {} ", quoteString(comment));
     }
 
     /// Validate engine definition syntax to prevent some configuration errors.
     ParserStorageWithComment storage_parser;
+    auto storage_ast = parseQuery(storage_parser, log_settings.engine.data(), log_settings.engine.data() + log_settings.engine.size(),
+            "Storage to create table for " + config_prefix, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+    auto & storage_with_comment = storage_ast->as<StorageWithComment &>();
 
-    parseQuery(storage_parser, log_settings.engine.data(), log_settings.engine.data() + log_settings.engine.size(),
-            "Storage to create table for " + config_prefix, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    /// Add comment to AST. So it will be saved when the table will be renamed.
+    if (!storage_with_comment.comment || storage_with_comment.comment->as<ASTLiteral &>().value.safeGet<String>().empty())
+        log_settings.engine += fmt::format(" COMMENT {} ", quoteString(comment));
 
     log_settings.queue_settings.flush_interval_milliseconds = config.getUInt64(config_prefix + ".flush_interval_milliseconds",
                                                                                TSystemLog::getDefaultFlushIntervalMilliseconds());
@@ -395,7 +400,7 @@ SystemLog<LogElement>::SystemLog(
     std::shared_ptr<SystemLogQueue<LogElement>> queue_)
     : Base(settings_.queue_settings, queue_)
     , WithContext(context_)
-    , log(&Poco::Logger::get("SystemLog (" + settings_.queue_settings.database + "." + settings_.queue_settings.table + ")"))
+    , log(getLogger("SystemLog (" + settings_.queue_settings.database + "." + settings_.queue_settings.table + ")"))
     , table_id(settings_.queue_settings.database, settings_.queue_settings.table)
     , storage_def(settings_.engine)
     , create_query(serializeAST(*getCreateTableQuery()))
@@ -562,7 +567,6 @@ void SystemLog<LogElement>::prepareTable()
                 {table_id.database_name, table_id.table_name + "_" + toString(suffix)}, getContext()))
                 ++suffix;
 
-            auto rename = std::make_shared<ASTRenameQuery>();
             ASTRenameQuery::Element elem
             {
                 ASTRenameQuery::Table
@@ -585,7 +589,7 @@ void SystemLog<LogElement>::prepareTable()
                 old_create_query,
                 create_query);
 
-            rename->elements.emplace_back(std::move(elem));
+            auto rename = std::make_shared<ASTRenameQuery>(ASTRenameQuery::Elements{std::move(elem)});
 
             ActionLock merges_lock;
             if (DatabaseCatalog::instance().getDatabase(table_id.database_name)->getUUID() == UUIDHelpers::Nil)
@@ -647,7 +651,7 @@ ASTPtr SystemLog<LogElement>::getCreateTableQuery()
 
     ASTPtr storage_with_comment_ast = parseQuery(
         storage_parser, storage_def.data(), storage_def.data() + storage_def.size(),
-        "Storage to create table for " + LogElement::name(), 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        "Storage to create table for " + LogElement::name(), 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     StorageWithComment & storage_with_comment = storage_with_comment_ast->as<StorageWithComment &>();
 
@@ -660,7 +664,7 @@ ASTPtr SystemLog<LogElement>::getCreateTableQuery()
     if (endsWith(engine.name, "MergeTree"))
     {
         auto storage_settings = std::make_unique<MergeTreeSettings>(getContext()->getMergeTreeSettings());
-        storage_settings->loadFromQuery(*create->storage, getContext());
+        storage_settings->loadFromQuery(*create->storage, getContext(), false);
     }
 
     return create;
diff --git a/src/Interpreters/SystemLog.h b/src/Interpreters/SystemLog.h
index 8c357e43be9..e5b79585701 100644
--- a/src/Interpreters/SystemLog.h
+++ b/src/Interpreters/SystemLog.h
@@ -1,8 +1,9 @@
 #pragma once
 
+#include <Interpreters/StorageID.h>
 #include <Common/SystemLogBase.h>
 
-#include <Interpreters/StorageID.h>
+#include <boost/noncopyable.hpp>
 
 namespace DB
 {
@@ -131,7 +132,7 @@ public:
     void stopFlushThread() override;
 
 protected:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     using ISystemLog::is_shutdown;
     using ISystemLog::saving_thread;
diff --git a/src/Interpreters/TableJoin.cpp b/src/Interpreters/TableJoin.cpp
index efe3fd7f740..e9fa224df11 100644
--- a/src/Interpreters/TableJoin.cpp
+++ b/src/Interpreters/TableJoin.cpp
@@ -683,7 +683,7 @@ void TableJoin::inferJoinKeyCommonType(const LeftNamesAndTypes & left, const Rig
     if (!left_type_map.empty() || !right_type_map.empty())
     {
         LOG_TRACE(
-            &Poco::Logger::get("TableJoin"),
+            getLogger("TableJoin"),
             "Infer supertype for joined columns. Left: [{}], Right: [{}]",
             formatTypeMap(left_type_map, left_types),
             formatTypeMap(right_type_map, right_types));
@@ -876,7 +876,7 @@ static void addJoinConditionWithAnd(ASTPtr & current_cond, const ASTPtr & new_co
 void TableJoin::addJoinCondition(const ASTPtr & ast, bool is_left)
 {
     auto & cond_ast = is_left ? clauses.back().on_filter_condition_left : clauses.back().on_filter_condition_right;
-    LOG_TRACE(&Poco::Logger::get("TableJoin"), "Adding join condition for {} table: {} -> {}",
+    LOG_TRACE(getLogger("TableJoin"), "Adding join condition for {} table: {} -> {}",
               (is_left ? "left" : "right"), ast ? queryToString(ast) : "NULL", cond_ast ? queryToString(cond_ast) : "NULL");
     addJoinConditionWithAnd(cond_ast, ast);
 }
diff --git a/src/Interpreters/TableNameHints.h b/src/Interpreters/TableNameHints.h
new file mode 100644
index 00000000000..d3d8d10c50c
--- /dev/null
+++ b/src/Interpreters/TableNameHints.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <Core/Names.h>
+#include <Interpreters/Context_fwd.h>
+#include <Common/NamePrompter.h>
+
+#include <memory>
+
+namespace DB
+{
+
+class IDatabase;
+using ConstDatabasePtr = std::shared_ptr<const IDatabase>;
+
+class TableNameHints : public IHints<>
+{
+public:
+    TableNameHints(ConstDatabasePtr database_, ContextPtr context_) : context(context_), database(database_) { }
+
+    /// getHintForTable tries to get a hint for the provided table_name in the provided
+    /// database. If the results are empty, it goes for extended hints for the table
+    /// with getExtendedHintForTable which looks for the table name in every database that's
+    /// available in the database catalog. It finally returns a single hint which is the database
+    /// name and table_name pair which is similar to the table_name provided. Perhaps something to
+    /// consider is should we return more than one pair of hint?
+    std::pair<String, String> getHintForTable(const String & table_name) const;
+
+    /// getExtendedHintsForTable tries to get hint for the given table_name across all
+    /// the databases that are available in the database catalog.
+    std::pair<String, String> getExtendedHintForTable(const String & table_name) const;
+
+    Names getAllRegisteredNames() const override;
+
+private:
+    ContextPtr context;
+    ConstDatabasePtr database;
+};
+
+}
diff --git a/src/Interpreters/TablesStatus.cpp b/src/Interpreters/TablesStatus.cpp
index 005a4515c3a..a830ac16de6 100644
--- a/src/Interpreters/TablesStatus.cpp
+++ b/src/Interpreters/TablesStatus.cpp
@@ -13,29 +13,33 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-void TableStatus::write(WriteBuffer & out) const
+void TableStatus::write(WriteBuffer & out, UInt64 client_protocol_revision) const
 {
     writeBinary(is_replicated, out);
     if (is_replicated)
     {
         writeVarUInt(absolute_delay, out);
+        if (client_protocol_revision >= DBMS_MIN_REVISION_WITH_TABLE_READ_ONLY_CHECK)
+            writeVarUInt(is_readonly, out);
     }
 }
 
-void TableStatus::read(ReadBuffer & in)
+void TableStatus::read(ReadBuffer & in, UInt64 server_protocol_revision)
 {
     absolute_delay = 0;
     readBinary(is_replicated, in);
     if (is_replicated)
     {
         readVarUInt(absolute_delay, in);
+        if (server_protocol_revision >= DBMS_MIN_REVISION_WITH_TABLE_READ_ONLY_CHECK)
+            readVarUInt(is_readonly, in);
     }
 }
 
 void TablesStatusRequest::write(WriteBuffer & out, UInt64 server_protocol_revision) const
 {
     if (server_protocol_revision < DBMS_MIN_REVISION_WITH_TABLES_STATUS)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: method TablesStatusRequest::write is called for unsupported server revision");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Method TablesStatusRequest::write is called for unsupported server revision");
 
     writeVarUInt(tables.size(), out);
     for (const auto & table_name : tables)
@@ -71,14 +75,14 @@ void TablesStatusResponse::write(WriteBuffer & out, UInt64 client_protocol_revis
         throw Exception(ErrorCodes::LOGICAL_ERROR, "method TablesStatusResponse::write is called for unsupported client revision");
 
     writeVarUInt(table_states_by_id.size(), out);
-    for (const auto & kv: table_states_by_id)
+    for (const auto & kv : table_states_by_id)
     {
         const QualifiedTableName & table_name = kv.first;
         writeBinary(table_name.database, out);
         writeBinary(table_name.table, out);
 
         const TableStatus & status = kv.second;
-        status.write(out);
+        status.write(out, client_protocol_revision);
     }
 }
 
@@ -100,7 +104,7 @@ void TablesStatusResponse::read(ReadBuffer & in, UInt64 server_protocol_revision
         readBinary(table_name.table, in);
 
         TableStatus status;
-        status.read(in);
+        status.read(in, server_protocol_revision);
         table_states_by_id.emplace(std::move(table_name), std::move(status));
     }
 }
diff --git a/src/Interpreters/TablesStatus.h b/src/Interpreters/TablesStatus.h
index 2323e751fc9..ddd0a721701 100644
--- a/src/Interpreters/TablesStatus.h
+++ b/src/Interpreters/TablesStatus.h
@@ -28,9 +28,11 @@ struct TableStatus
 {
     bool is_replicated = false;
     UInt32 absolute_delay = 0;
+    /// Used to filter such nodes out for INSERTs
+    bool is_readonly = false;
 
-    void write(WriteBuffer & out) const;
-    void read(ReadBuffer & in);
+    void write(WriteBuffer & out, UInt64 client_protocol_revision) const;
+    void read(ReadBuffer & in, UInt64 server_protocol_revision);
 };
 
 struct TablesStatusRequest
diff --git a/src/Interpreters/TemporaryDataOnDisk.cpp b/src/Interpreters/TemporaryDataOnDisk.cpp
index 96aa642295c..4a30c0ae726 100644
--- a/src/Interpreters/TemporaryDataOnDisk.cpp
+++ b/src/Interpreters/TemporaryDataOnDisk.cpp
@@ -4,6 +4,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Compression/CompressedReadBuffer.h>
+#include <Interpreters/Cache/FileCache.h>
 #include <Formats/NativeWriter.h>
 #include <Formats/NativeReader.h>
 #include <Core/ProtocolDefines.h>
@@ -43,20 +44,20 @@ void TemporaryDataOnDiskScope::deltaAllocAndCheck(ssize_t compressed_delta, ssiz
     }
 
     size_t new_consumprion = stat.compressed_size + compressed_delta;
-    if (compressed_delta > 0 && limit && new_consumprion > limit)
+    if (compressed_delta > 0 && settings.max_size_on_disk && new_consumprion > settings.max_size_on_disk)
         throw Exception(ErrorCodes::TOO_MANY_ROWS_OR_BYTES,
-            "Limit for temporary files size exceeded (would consume {} / {} bytes)", new_consumprion, limit);
+            "Limit for temporary files size exceeded (would consume {} / {} bytes)", new_consumprion, settings.max_size_on_disk);
 
     stat.compressed_size += compressed_delta;
     stat.uncompressed_size += uncompressed_delta;
 }
 
 TemporaryDataOnDisk::TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_)
-    : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
+    : TemporaryDataOnDiskScope(parent_, parent_->getSettings())
 {}
 
 TemporaryDataOnDisk::TemporaryDataOnDisk(TemporaryDataOnDiskScopePtr parent_, CurrentMetrics::Metric metric_scope)
-    : TemporaryDataOnDiskScope(std::move(parent_), /* limit_ = */ 0)
+    : TemporaryDataOnDiskScope(parent_, parent_->getSettings())
     , current_metric_scope(metric_scope)
 {}
 
@@ -105,7 +106,9 @@ FileSegmentsHolderPtr TemporaryDataOnDisk::createCacheFile(size_t max_file_size)
     ProfileEvents::increment(ProfileEvents::ExternalProcessingFilesTotal);
 
     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));
+    auto holder = file_cache->set(
+        key, 0, std::max(10_MiB, max_file_size),
+        CreateFileSegmentSettings(FileSegmentKind::Temporary, /* unbounded */ true), FileCache::getCommonUser());
 
     chassert(holder->size() == 1);
     holder->back().getKeyMetadata()->createBaseDirectory();
@@ -150,11 +153,19 @@ bool TemporaryDataOnDisk::empty() const
     return streams.empty();
 }
 
+static inline CompressionCodecPtr getCodec(const TemporaryDataOnDiskSettings & settings)
+{
+    if (settings.compression_codec.empty())
+        return CompressionCodecFactory::instance().get("NONE");
+
+    return CompressionCodecFactory::instance().get(settings.compression_codec);
+}
+
 struct TemporaryFileStream::OutputWriter
 {
-    OutputWriter(std::unique_ptr<WriteBuffer> out_buf_, const Block & header_)
+    OutputWriter(std::unique_ptr<WriteBuffer> out_buf_, const Block & header_, const TemporaryDataOnDiskSettings & settings)
         : out_buf(std::move(out_buf_))
-        , out_compressed_buf(*out_buf)
+        , out_compressed_buf(*out_buf, getCodec(settings))
         , out_writer(out_compressed_buf, DBMS_TCP_PROTOCOL_VERSION, header_)
     {
     }
@@ -220,7 +231,7 @@ struct TemporaryFileStream::InputReader
         , in_compressed_buf(in_file_buf)
         , in_reader(in_compressed_buf, header_, DBMS_TCP_PROTOCOL_VERSION)
     {
-        LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Reading {} from {}", header_.dumpStructure(), path);
+        LOG_TEST(getLogger("TemporaryFileStream"), "Reading {} from {}", header_.dumpStructure(), path);
     }
 
     explicit InputReader(const String & path, size_t size = 0)
@@ -228,7 +239,7 @@ struct TemporaryFileStream::InputReader
         , in_compressed_buf(in_file_buf)
         , in_reader(in_compressed_buf, DBMS_TCP_PROTOCOL_VERSION)
     {
-        LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Reading from {}", path);
+        LOG_TEST(getLogger("TemporaryFileStream"), "Reading from {}", path);
     }
 
     Block read()
@@ -245,9 +256,9 @@ TemporaryFileStream::TemporaryFileStream(TemporaryFileOnDiskHolder file_, const
     : parent(parent_)
     , header(header_)
     , file(std::move(file_))
-    , out_writer(std::make_unique<OutputWriter>(std::make_unique<WriteBufferFromFile>(file->getAbsolutePath()), header))
+    , out_writer(std::make_unique<OutputWriter>(std::make_unique<WriteBufferFromFile>(file->getAbsolutePath()), header, parent->settings))
 {
-    LOG_TEST(&Poco::Logger::get("TemporaryFileStream"), "Writing to temporary file {}", file->getAbsolutePath());
+    LOG_TEST(getLogger("TemporaryFileStream"), "Writing to temporary file {}", file->getAbsolutePath());
 }
 
 TemporaryFileStream::TemporaryFileStream(FileSegmentsHolderPtr segments_, const Block & header_, TemporaryDataOnDisk * parent_)
@@ -259,8 +270,8 @@ TemporaryFileStream::TemporaryFileStream(FileSegmentsHolderPtr segments_, const
         throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryFileStream can be created only from single segment");
     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);
+    LOG_TEST(getLogger("TemporaryFileStream"), "Writing to temporary file {}", out_buf->getFileName());
+    out_writer = std::make_unique<OutputWriter>(std::move(out_buf), header, parent_->settings);
 }
 
 size_t TemporaryFileStream::write(const Block & block)
@@ -377,7 +388,7 @@ String TemporaryFileStream::getPath() const
     if (file)
         return file->getAbsolutePath();
     if (segment_holder && !segment_holder->empty())
-        return segment_holder->front().getPathInLocalCache();
+        return segment_holder->front().getPath();
 
     throw Exception(ErrorCodes::LOGICAL_ERROR, "TemporaryFileStream has no file");
 }
diff --git a/src/Interpreters/TemporaryDataOnDisk.h b/src/Interpreters/TemporaryDataOnDisk.h
index 0c35cd63d13..40100a62b44 100644
--- a/src/Interpreters/TemporaryDataOnDisk.h
+++ b/src/Interpreters/TemporaryDataOnDisk.h
@@ -2,12 +2,11 @@
 
 #include <boost/noncopyable.hpp>
 
-#include <Interpreters/Context.h>
-#include <Disks/TemporaryFileOnDisk.h>
+#include <Core/Block.h>
 #include <Disks/IVolume.h>
-#include <Common/CurrentMetrics.h>
+#include <Disks/TemporaryFileOnDisk.h>
 #include <Interpreters/Cache/FileSegment.h>
-#include <Interpreters/Cache/FileCache.h>
+#include <Common/CurrentMetrics.h>
 
 
 namespace CurrentMetrics
@@ -27,6 +26,17 @@ using TemporaryDataOnDiskPtr = std::unique_ptr<TemporaryDataOnDisk>;
 class TemporaryFileStream;
 using TemporaryFileStreamPtr = std::unique_ptr<TemporaryFileStream>;
 
+class FileCache;
+
+struct TemporaryDataOnDiskSettings
+{
+    /// Max size on disk, if 0 there will be no limit
+    size_t max_size_on_disk = 0;
+
+    /// Compression codec for temporary data, if empty no compression will be used. LZ4 by default
+    String compression_codec = "LZ4";
+};
+
 /*
  * Used to account amount of temporary data written to disk.
  * If limit is set, throws exception if limit is exceeded.
@@ -42,22 +52,30 @@ public:
         std::atomic<size_t> uncompressed_size;
     };
 
-    explicit TemporaryDataOnDiskScope(VolumePtr volume_, size_t limit_)
-        : volume(std::move(volume_)), limit(limit_)
+    explicit TemporaryDataOnDiskScope(VolumePtr volume_, TemporaryDataOnDiskSettings settings_)
+        : volume(std::move(volume_))
+        , settings(std::move(settings_))
     {}
 
-    explicit TemporaryDataOnDiskScope(VolumePtr volume_, FileCache * file_cache_, size_t limit_)
-        : volume(std::move(volume_)), file_cache(file_cache_), limit(limit_)
+    explicit TemporaryDataOnDiskScope(VolumePtr volume_, FileCache * file_cache_, TemporaryDataOnDiskSettings settings_)
+        : volume(std::move(volume_))
+        , file_cache(file_cache_)
+        , settings(std::move(settings_))
     {}
 
-    explicit TemporaryDataOnDiskScope(TemporaryDataOnDiskScopePtr parent_, size_t limit_)
-        : parent(std::move(parent_)), volume(parent->volume), file_cache(parent->file_cache), limit(limit_)
+    explicit TemporaryDataOnDiskScope(TemporaryDataOnDiskScopePtr parent_, TemporaryDataOnDiskSettings settings_)
+        : parent(std::move(parent_))
+        , volume(parent->volume)
+        , file_cache(parent->file_cache)
+        , settings(std::move(settings_))
     {}
 
     /// TODO: remove
     /// Refactor all code that uses volume directly to use TemporaryDataOnDisk.
     VolumePtr getVolume() const { return volume; }
 
+    const TemporaryDataOnDiskSettings & getSettings() const { return settings; }
+
 protected:
     void deltaAllocAndCheck(ssize_t compressed_delta, ssize_t uncompressed_delta);
 
@@ -67,14 +85,14 @@ protected:
     FileCache * file_cache = nullptr;
 
     StatAtomic stat;
-    size_t limit = 0;
+    const TemporaryDataOnDiskSettings settings;
 };
 
 /*
  * Holds the set of temporary files.
  * New file stream is created with `createStream`.
  * Streams are owned by this object and will be deleted when it is deleted.
- * It's a leaf node in temorarty data scope tree.
+ * It's a leaf node in temporary data scope tree.
  */
 class TemporaryDataOnDisk : private TemporaryDataOnDiskScope
 {
diff --git a/src/Interpreters/TextLog.h b/src/Interpreters/TextLog.h
index cdb4de76722..90fc4ef36a0 100644
--- a/src/Interpreters/TextLog.h
+++ b/src/Interpreters/TextLog.h
@@ -34,7 +34,6 @@ struct TextLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class TextLog : public SystemLog<TextLogElement>
diff --git a/src/Interpreters/ThreadStatusExt.cpp b/src/Interpreters/ThreadStatusExt.cpp
index 7ae137c01d2..2b8e8bef6d4 100644
--- a/src/Interpreters/ThreadStatusExt.cpp
+++ b/src/Interpreters/ThreadStatusExt.cpp
@@ -21,6 +21,7 @@
 #include <Common/DateLUT.h>
 #include <Common/logger_useful.h>
 #include <base/errnoToString.h>
+#include <Core/ServerSettings.h>
 
 #if defined(OS_LINUX)
 #   include <Common/hasLinuxCapability.h>
@@ -474,12 +475,22 @@ void ThreadStatus::initQueryProfiler()
     try
     {
         if (settings.query_profiler_real_time_period_ns > 0)
-            query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
-                /* period= */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
+        {
+            if (!query_profiler_real)
+                query_profiler_real = std::make_unique<QueryProfilerReal>(thread_id,
+                   /* period= */ static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
+            else
+                query_profiler_real->setPeriod(static_cast<UInt32>(settings.query_profiler_real_time_period_ns));
+        }
 
         if (settings.query_profiler_cpu_time_period_ns > 0)
-            query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
-                /* period= */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
+        {
+            if (!query_profiler_cpu)
+                query_profiler_cpu = std::make_unique<QueryProfilerCPU>(thread_id,
+                  /* period= */ static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
+            else
+                query_profiler_cpu->setPeriod(static_cast<UInt32>(settings.query_profiler_cpu_time_period_ns));
+        }
     }
     catch (...)
     {
@@ -546,7 +557,7 @@ void ThreadStatus::logToQueryThreadLog(QueryThreadLog & thread_log, const String
 static String getCleanQueryAst(const ASTPtr q, ContextPtr context)
 {
     String res = serializeAST(*q);
-    if (auto * masker = SensitiveDataMasker::getInstance())
+    if (auto masker = SensitiveDataMasker::getInstance())
         masker->wipeSensitiveData(res);
 
     res = res.substr(0, context->getSettingsRef().log_queries_cut_to_length);
diff --git a/src/Interpreters/TraceCollector.cpp b/src/Interpreters/TraceCollector.cpp
index 30fbe26d038..8e9c397b7a1 100644
--- a/src/Interpreters/TraceCollector.cpp
+++ b/src/Interpreters/TraceCollector.cpp
@@ -6,7 +6,6 @@
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/WriteHelpers.h>
 #include <Interpreters/TraceLog.h>
-#include <Poco/Logger.h>
 #include <Common/ProfileEvents.h>
 #include <Common/setThreadName.h>
 #include <Common/logger_useful.h>
@@ -65,7 +64,7 @@ TraceCollector::~TraceCollector()
     if (thread.joinable())
         thread.join();
     else
-        LOG_ERROR(&Poco::Logger::get("TraceCollector"), "TraceCollector thread is malformed and cannot be joined");
+        LOG_ERROR(getLogger("TraceCollector"), "TraceCollector thread is malformed and cannot be joined");
 }
 
 
diff --git a/src/Interpreters/TraceLog.cpp b/src/Interpreters/TraceLog.cpp
index 26adb0cfc3f..01bedf34f15 100644
--- a/src/Interpreters/TraceLog.cpp
+++ b/src/Interpreters/TraceLog.cpp
@@ -29,20 +29,27 @@ ColumnsDescription TraceLogElement::getColumnsDescription()
 {
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime>()},
-        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6)},
-        {"timestamp_ns", std::make_shared<DataTypeUInt64>()},
-        {"revision", std::make_shared<DataTypeUInt32>()},
-        {"trace_type", std::make_shared<TraceDataType>(trace_values)},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"size", std::make_shared<DataTypeInt64>()},
-        {"ptr", std::make_shared<DataTypeUInt64>()},
-        {"event", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"increment", std::make_shared<DataTypeInt64>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"event_date", std::make_shared<DataTypeDate>(), "Date of sampling moment."},
+        {"event_time", std::make_shared<DataTypeDateTime>(), "Timestamp of the sampling moment."},
+        {"event_time_microseconds", std::make_shared<DataTypeDateTime64>(6), "Timestamp of the sampling moment with microseconds precision."},
+        {"timestamp_ns", std::make_shared<DataTypeUInt64>(), "Timestamp of the sampling moment in nanoseconds."},
+        {"revision", std::make_shared<DataTypeUInt32>(), "ClickHouse server build revision."},
+        {"trace_type", std::make_shared<TraceDataType>(trace_values), "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."
+        },
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "Thread identifier."},
+        {"query_id", std::make_shared<DataTypeString>(), "Query identifier that can be used to get details about a query that was running from the query_log system table."},
+        {"trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Stack trace at the moment of sampling. Each element is a virtual memory address inside ClickHouse server process."},
+        {"size", std::make_shared<DataTypeInt64>(), "For trace types Memory, MemorySample or MemoryPeak is the amount of memory allocated, for other trace types is 0."},
+        {"ptr", std::make_shared<DataTypeUInt64>(), "The address of the allocated chunk."},
+        {"event", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "For trace type ProfileEvent is the name of updated profile event, for other trace types is an empty string."},
+        {"increment", std::make_shared<DataTypeInt64>(), "For trace type ProfileEvent is the amount of increment of profile event, for other trace types is 0."},
     };
 }
 
diff --git a/src/Interpreters/TraceLog.h b/src/Interpreters/TraceLog.h
index f4cd29a7a2d..418b8d546a0 100644
--- a/src/Interpreters/TraceLog.h
+++ b/src/Interpreters/TraceLog.h
@@ -41,7 +41,6 @@ struct TraceLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class TraceLog : public SystemLog<TraceLogElement>
diff --git a/src/Interpreters/TransactionLog.cpp b/src/Interpreters/TransactionLog.cpp
index a86f6110a84..e0c5d01e153 100644
--- a/src/Interpreters/TransactionLog.cpp
+++ b/src/Interpreters/TransactionLog.cpp
@@ -21,7 +21,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_STATUS_OF_TRANSACTION;
 }
 
-static void tryWriteEventToSystemLog(Poco::Logger * log, ContextPtr context,
+static void tryWriteEventToSystemLog(LoggerPtr log, ContextPtr context,
                                      TransactionsInfoLogElement::Type type, const TransactionID & tid, CSN csn = Tx::UnknownCSN)
 try
 {
@@ -44,7 +44,7 @@ catch (...)
 
 TransactionLog::TransactionLog()
     : global_context(Context::getGlobalContextInstance())
-    , log(&Poco::Logger::get("TransactionLog"))
+    , log(getLogger("TransactionLog"))
     , zookeeper_path(global_context->getConfigRef().getString("transaction_log.zookeeper_path", "/clickhouse/txn"))
     , zookeeper_path_log(zookeeper_path + "/log")
     , fault_probability_before_commit(global_context->getConfigRef().getDouble("transaction_log.fault_probability_before_commit", 0))
@@ -407,8 +407,13 @@ CSN TransactionLog::commitTransaction(const MergeTreeTransactionPtr & txn, bool
         {
             Coordination::SimpleFaultInjection fault(fault_probability_before_commit, fault_probability_after_commit, "commit");
 
+            Coordination::Requests requests;
+            requests.push_back(zkutil::makeCreateRequest(zookeeper_path_log + "/csn-", serializeTID(txn->tid), zkutil::CreateMode::PersistentSequential));
+
             /// Commit point
-            csn_path_created = current_zookeeper->create(zookeeper_path_log + "/csn-", serializeTID(txn->tid), zkutil::CreateMode::PersistentSequential);
+            auto res = current_zookeeper->multi(requests, /* check_session_valid */ true);
+
+            csn_path_created = dynamic_cast<const Coordination::CreateResponse *>(res.back().get())->path_created;
         }
         catch (const Coordination::Exception & e)
         {
diff --git a/src/Interpreters/TransactionLog.h b/src/Interpreters/TransactionLog.h
index 6e8777d8519..58847553dfd 100644
--- a/src/Interpreters/TransactionLog.h
+++ b/src/Interpreters/TransactionLog.h
@@ -154,7 +154,7 @@ private:
     CSN getCSNImpl(const TIDHash & tid_hash, const std::atomic<CSN> * failback_with_strict_load_csn = nullptr) const;
 
     const ContextPtr global_context;
-    Poco::Logger * const log;
+    LoggerPtr const log;
 
     /// The newest snapshot available for reading
     std::atomic<CSN> latest_snapshot;
diff --git a/src/Interpreters/TransactionVersionMetadata.cpp b/src/Interpreters/TransactionVersionMetadata.cpp
index 01735a798b9..7bedca5d5c7 100644
--- a/src/Interpreters/TransactionVersionMetadata.cpp
+++ b/src/Interpreters/TransactionVersionMetadata.cpp
@@ -23,7 +23,7 @@ namespace ErrorCodes
 VersionMetadata::VersionMetadata()
 {
     /// It would be better to make it static, but static loggers do not work for some reason (initialization order?)
-    log = &Poco::Logger::get("VersionMetadata");
+    log = getLogger("VersionMetadata");
 }
 
 /// It can be used for introspection purposes only
diff --git a/src/Interpreters/TransactionVersionMetadata.h b/src/Interpreters/TransactionVersionMetadata.h
index 18ac445cc29..4309975d195 100644
--- a/src/Interpreters/TransactionVersionMetadata.h
+++ b/src/Interpreters/TransactionVersionMetadata.h
@@ -72,7 +72,7 @@ struct VersionMetadata
 
     String toString(bool one_line = true) const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     VersionMetadata();
 };
 
diff --git a/src/Interpreters/TransactionsInfoLog.cpp b/src/Interpreters/TransactionsInfoLog.cpp
index e893be814ca..d13b31518d2 100644
--- a/src/Interpreters/TransactionsInfoLog.cpp
+++ b/src/Interpreters/TransactionsInfoLog.cpp
@@ -34,22 +34,22 @@ ColumnsDescription TransactionsInfoLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"type", std::move(type_enum)},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime64>(6)},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "The hostname where transaction was executed."},
+        {"type", std::move(type_enum), "The type of the transaction. Possible values: Begin, Commit, Rollback, AddPart, LockPart, UnlockPart."},
+        {"event_date", std::make_shared<DataTypeDate>(), "Date of the entry."},
+        {"event_time", std::make_shared<DataTypeDateTime64>(6), "Time of the entry"},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "The identifier of a thread."}, /// which thread?
 
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"tid", getTransactionIDDataType()},
-        {"tid_hash", std::make_shared<DataTypeUInt64>()},
+        {"query_id", std::make_shared<DataTypeString>(), "The ID of a query executed in a scope of transaction."},
+        {"tid", getTransactionIDDataType(), "The identifier of a transaction."},
+        {"tid_hash", std::make_shared<DataTypeUInt64>(), "The hash of the identifier."},
 
-        {"csn", std::make_shared<DataTypeUInt64>()},
+        {"csn", std::make_shared<DataTypeUInt64>(), "The Commit Sequence Number"},
 
-        {"database", std::make_shared<DataTypeString>()},
-        {"table", std::make_shared<DataTypeString>()},
-        {"uuid", std::make_shared<DataTypeUUID>()},
-        {"part", std::make_shared<DataTypeString>()},
+        {"database", std::make_shared<DataTypeString>(), "The name of the database the transaction was executed against."},
+        {"table", std::make_shared<DataTypeString>(), "The name of the table the transaction was executed against."},
+        {"uuid", std::make_shared<DataTypeUUID>(), "The uuid of the table the transaction was executed against."},
+        {"part", std::make_shared<DataTypeString>(), "The name of the part participated in the transaction."}, // ?
     };
 }
 
@@ -92,7 +92,7 @@ void TransactionsInfoLogElement::appendToBlock(MutableColumns & columns) const
 }
 
 
-void tryWriteEventToSystemLog(Poco::Logger * log,
+void tryWriteEventToSystemLog(LoggerPtr log,
                               TransactionsInfoLogElement::Type type, const TransactionID & tid,
                               const TransactionInfoContext & context)
 try
diff --git a/src/Interpreters/TransactionsInfoLog.h b/src/Interpreters/TransactionsInfoLog.h
index 0a607704e74..e0d4e8b299a 100644
--- a/src/Interpreters/TransactionsInfoLog.h
+++ b/src/Interpreters/TransactionsInfoLog.h
@@ -43,7 +43,6 @@ struct TransactionsInfoLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 
     void fillCommonFields(const TransactionInfoContext * context = nullptr);
 };
@@ -54,7 +53,7 @@ class TransactionsInfoLog : public SystemLog<TransactionsInfoLogElement>
 };
 
 
-void tryWriteEventToSystemLog(Poco::Logger * log, TransactionsInfoLogElement::Type type,
+void tryWriteEventToSystemLog(LoggerPtr log, TransactionsInfoLogElement::Type type,
                               const TransactionID & tid, const TransactionInfoContext & context);
 
 }
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
index 130ce2194fd..03df7283992 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.cpp
@@ -1,4 +1,3 @@
-#include <cstring>
 #include <Poco/String.h>
 
 #include <Interpreters/TranslateQualifiedNamesVisitor.h>
@@ -6,7 +5,6 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/StringUtils/StringUtils.h>
-#include <Core/Names.h>
 #include <DataTypes/DataTypeTuple.h>
 
 #include <Parsers/ASTIdentifier.h>
@@ -21,6 +19,7 @@
 #include <Parsers/ASTColumnsMatcher.h>
 #include <Parsers/ASTColumnsTransformers.h>
 #include <Storages/StorageView.h>
+#include <Common/re2.h>
 
 
 namespace DB
@@ -31,7 +30,10 @@ namespace ErrorCodes
     extern const int UNKNOWN_IDENTIFIER;
     extern const int UNSUPPORTED_JOIN_KEYS;
     extern const int LOGICAL_ERROR;
+    extern const int CANNOT_COMPILE_REGEXP;
 }
+
+
 bool TranslateQualifiedNamesMatcher::Data::matchColumnName(std::string_view name, const String & column_name, DataTypePtr column_type)
 {
     if (name.size() < column_name.size())
@@ -158,7 +160,7 @@ void TranslateQualifiedNamesMatcher::visit(ASTFunction & node, const ASTPtr &, D
 void TranslateQualifiedNamesMatcher::visit(const ASTQualifiedAsterisk & node, const ASTPtr &, Data & data)
 {
     if (!node.qualifier)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: qualified asterisk must have a qualifier");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Qualified asterisk must have a qualifier");
 
     /// @note it could contain table alias as table name.
     DatabaseAndTableWithAlias db_and_table(node.qualifier);
@@ -275,12 +277,19 @@ void TranslateQualifiedNamesMatcher::visit(ASTExpressionList & node, const ASTPt
         }
         else if (const auto * asterisk_regexp_pattern = child->as<ASTColumnsRegexpMatcher>())
         {
+            String pattern = asterisk_regexp_pattern->getPattern();
+            re2::RE2 regexp(pattern, re2::RE2::Quiet);
+            if (!regexp.ok())
+                throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP,
+                    "COLUMNS pattern {} cannot be compiled: {}", pattern, regexp.error());
+
             bool first_table = true;
             for (const auto & table : tables_with_columns)
             {
                 for (const auto & column : table.columns)
                 {
-                    if (asterisk_regexp_pattern->isColumnMatching(column.name) && (first_table || !data.join_using_columns.contains(column.name)))
+                    if (re2::RE2::PartialMatch(column.name, regexp)
+                        && (first_table || !data.join_using_columns.contains(column.name)))
                     {
                         addIdentifier(columns, table.table, column.name);
                     }
diff --git a/src/Interpreters/TranslateQualifiedNamesVisitor.h b/src/Interpreters/TranslateQualifiedNamesVisitor.h
index 73e45fc7ea0..00c85d08873 100644
--- a/src/Interpreters/TranslateQualifiedNamesVisitor.h
+++ b/src/Interpreters/TranslateQualifiedNamesVisitor.h
@@ -35,7 +35,7 @@ public:
             , has_columns(has_columns_)
         {}
 
-        bool hasColumn(const String & name) const { return source_columns.count(name); }
+        bool hasColumn(const String & name) const { return source_columns.contains(name); }
         bool hasTable() const { return !tables.empty(); }
         bool processAsterisks() const { return hasTable() && has_columns; }
         bool unknownColumn(size_t table_pos, const ASTIdentifier & identifier) const;
diff --git a/src/Interpreters/TreeCNFConverter.h b/src/Interpreters/TreeCNFConverter.h
index 3cc8b05d6c6..8258412f1a6 100644
--- a/src/Interpreters/TreeCNFConverter.h
+++ b/src/Interpreters/TreeCNFConverter.h
@@ -58,7 +58,7 @@ public:
         for (const auto & or_group : statements)
         {
             OrGroup filtered_group;
-            for (auto ast : or_group)
+            for (const auto & ast : or_group)
             {
                 if (predicate_is_unknown(ast))
                     filtered_group.insert(ast);
diff --git a/src/Interpreters/TreeOptimizer.cpp b/src/Interpreters/TreeOptimizer.cpp
index b740852b808..7b979088170 100644
--- a/src/Interpreters/TreeOptimizer.cpp
+++ b/src/Interpreters/TreeOptimizer.cpp
@@ -24,6 +24,7 @@
 #include <Interpreters/GatherFunctionQuantileVisitor.h>
 #include <Interpreters/RewriteSumIfFunctionVisitor.h>
 #include <Interpreters/RewriteArrayExistsFunctionVisitor.h>
+#include <Interpreters/RewriteSumFunctionWithSumAndCountVisitor.h>
 #include <Interpreters/OptimizeDateOrDateTimeConverterWithPreimageVisitor.h>
 
 #include <Parsers/ASTExpressionList.h>
@@ -76,11 +77,10 @@ const std::unordered_set<String> possibly_injective_function_names
   */
 void appendUnusedGroupByColumn(ASTSelectQuery * select_query)
 {
-    /// You must insert a constant that is not the name of the column in the table. Such a case is rare, but it happens.
-    /// Also start unused_column integer must not intersect with ([1, source_columns.size()])
-    /// might be in positional GROUP BY.
+    /// Since ASTLiteral is different from ASTIdentifier, so we can use a special constant String Literal for this,
+    /// and do not need to worry about it conflict with the name of the column in the table.
     select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, std::make_shared<ASTExpressionList>());
-    select_query->groupBy()->children.emplace_back(std::make_shared<ASTLiteral>(static_cast<Int64>(-1)));
+    select_query->groupBy()->children.emplace_back(std::make_shared<ASTLiteral>("__unused_group_by_column"));
 }
 
 /// Eliminates injective function calls and constant expressions from group by statement.
@@ -144,7 +144,7 @@ void optimizeGroupBy(ASTSelectQuery * select_query, ContextPtr context)
             }
             else
             {
-                FunctionOverloadResolverPtr function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(function->name, context);
+                FunctionOverloadResolverPtr function_builder = UserDefinedExecutableFunctionFactory::instance().tryGet(function->name, context); /// NOLINT(readability-static-accessed-through-instance)
 
                 if (!function_builder)
                     function_builder = function_factory.get(function->name, context);
@@ -277,7 +277,7 @@ void optimizeDuplicatesInOrderBy(const ASTSelectQuery * select_query)
         const auto & order_by_elem = elem->as<ASTOrderByElement &>();
 
         if (order_by_elem.with_fill /// Always keep elements WITH FILL as they affects other.
-            || elems_set.emplace(name, order_by_elem.collation ? order_by_elem.collation->getColumnName() : "").second)
+            || elems_set.emplace(name, order_by_elem.getCollation() ? order_by_elem.getCollation()->getColumnName() : "").second)
             unique_elems.emplace_back(elem);
     }
 
@@ -641,6 +641,12 @@ void optimizeDateFilters(ASTSelectQuery * select_query, const std::vector<TableW
     }
 }
 
+void rewriteSumFunctionWithSumAndCount(ASTPtr & query, const std::vector<TableWithColumnNamesAndTypes> & tables_with_columns)
+{
+    RewriteSumFunctionWithSumAndCountVisitor::Data data = {tables_with_columns};
+    RewriteSumFunctionWithSumAndCountVisitor(data).visit(query);
+}
+
 void transformIfStringsIntoEnum(ASTPtr & query)
 {
     std::unordered_set<String> function_names = {"if", "transform"};
@@ -744,8 +750,13 @@ void TreeOptimizer::apply(ASTPtr & query, TreeRewriterResult & result,
                 tables_with_columns, result.storage_snapshot->metadata, result.storage);
     }
 
+    /// Rewrite sum(column +/- literal) function with sum(column) +/- literal * count(column).
+    if (settings.optimize_arithmetic_operations_in_aggregate_functions)
+        rewriteSumFunctionWithSumAndCount(query, tables_with_columns);
+
     /// Rewrite date filters to avoid the calls of converters such as toYear, toYYYYMM, etc.
-    optimizeDateFilters(select_query, tables_with_columns, context);
+    if (settings.optimize_time_filter_with_preimage)
+        optimizeDateFilters(select_query, tables_with_columns, context);
 
     /// GROUP BY injective function elimination.
     optimizeGroupBy(select_query, context);
diff --git a/src/Interpreters/TreeRewriter.cpp b/src/Interpreters/TreeRewriter.cpp
index 6ed3ff2f1e6..914b3c3037d 100644
--- a/src/Interpreters/TreeRewriter.cpp
+++ b/src/Interpreters/TreeRewriter.cpp
@@ -56,10 +56,13 @@
 #include <Storages/IStorage.h>
 #include <Storages/StorageJoin.h>
 #include <Common/checkStackSize.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/StorageView.h>
 
 #include <AggregateFunctions/AggregateFunctionFactory.h>
 
+#include <boost/algorithm/string.hpp>
+
 namespace DB
 {
 
@@ -262,8 +265,7 @@ struct ExistsExpressionData
         select_with_union_query->list_of_selects->children.push_back(std::move(select_query));
         select_with_union_query->children.push_back(select_with_union_query->list_of_selects);
 
-        auto new_subquery = std::make_shared<ASTSubquery>();
-        new_subquery->children.push_back(select_with_union_query);
+        auto new_subquery = std::make_shared<ASTSubquery>(std::move(select_with_union_query));
 
         auto function = makeASTFunction("in", std::make_shared<ASTLiteral>(1u), new_subquery);
         func = *function;
@@ -642,13 +644,13 @@ bool tryJoinOnConst(TableJoin & analyzed_join, const ASTPtr & on_expression, Con
         if (eval_const_res.value())
         {
             /// JOIN ON 1 == 1
-            LOG_DEBUG(&Poco::Logger::get("TreeRewriter"), "Join on constant executed as cross join");
+            LOG_DEBUG(getLogger("TreeRewriter"), "Join on constant executed as cross join");
             analyzed_join.resetToCross();
         }
         else
         {
             /// JOIN ON 1 != 1
-            LOG_DEBUG(&Poco::Logger::get("TreeRewriter"), "Join on constant executed as empty join");
+            LOG_DEBUG(getLogger("TreeRewriter"), "Join on constant executed as empty join");
             analyzed_join.resetKeys();
         }
         return true;
@@ -777,7 +779,7 @@ void expandGroupByAll(ASTSelectQuery * select_query)
     select_query->setExpression(ASTSelectQuery::Expression::GROUP_BY, group_expression_list);
 }
 
-void expandOrderByAll(ASTSelectQuery * select_query)
+void expandOrderByAll(ASTSelectQuery * select_query, [[maybe_unused]] const TablesWithColumns & tables_with_columns)
 {
     auto * all_elem = select_query->orderBy()->children[0]->as<ASTOrderByElement>();
     if (!all_elem)
@@ -787,16 +789,32 @@ void expandOrderByAll(ASTSelectQuery * select_query)
 
     for (const auto & expr : select_query->select()->children)
     {
+        /// Detect and reject ambiguous statements:
+        /// E.g. for a table with columns "all", "a", "b":
+        /// - SELECT all, a, b ORDER BY all;        -- should we sort by all columns in SELECT or by column "all"?
+        /// - SELECT a, b AS all ORDER BY all;      -- like before but "all" as alias
+        /// - SELECT func(...) AS all ORDER BY all; -- like before but "all" as function
+        /// - SELECT a, b ORDER BY all;             -- tricky in other way: does the user want to sort by columns in SELECT clause or by not SELECTed column "all"?
+
+        static const String all = "all";
         if (auto * identifier = expr->as<ASTIdentifier>(); identifier != nullptr)
-            if (Poco::toUpper(identifier->name()) == "ALL" || Poco::toUpper(identifier->alias) == "ALL")
+            if (boost::iequals(identifier->name(), all) || boost::iequals(identifier->alias, all))
                 throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION,
                                 "Cannot use ORDER BY ALL to sort a column with name 'all', please disable setting `enable_order_by_all` and try again");
 
         if (auto * function = expr->as<ASTFunction>(); function != nullptr)
-            if (Poco::toUpper(function->alias) == "ALL")
+            if (boost::iequals(function->alias, all))
                 throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION,
                                 "Cannot use ORDER BY ALL to sort a column with name 'all', please disable setting `enable_order_by_all` and try again");
 
+        for (const auto & table_with_columns : tables_with_columns)
+        {
+            const auto & columns = table_with_columns.columns;
+            if (columns.containsCaseInsensitive(all))
+                throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION,
+                                "Cannot use ORDER BY ALL to sort a column with name 'all', please disable setting `enable_order_by_all` and try again");
+        }
+
         auto elem = std::make_shared<ASTOrderByElement>();
         elem->direction = all_elem->direction;
         elem->nulls_direction = all_elem->nulls_direction;
@@ -973,8 +991,7 @@ void TreeRewriterResult::collectSourceColumns(bool add_special)
     {
         auto options = GetColumnsOptions(add_special ? GetColumnsOptions::All : GetColumnsOptions::AllPhysical);
         options.withExtendedObjects();
-        if (storage->supportsSubcolumns())
-            options.withSubcolumns();
+        options.withSubcolumns(storage->supportsSubcolumns());
 
         auto columns_from_storage = storage_snapshot->getColumns(options);
 
@@ -984,8 +1001,7 @@ void TreeRewriterResult::collectSourceColumns(bool add_special)
             source_columns.insert(source_columns.end(), columns_from_storage.begin(), columns_from_storage.end());
 
         auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-        auto metadata_column_descriptions = metadata_snapshot->getColumns();
-        source_columns_ordinary = metadata_column_descriptions.getOrdinary();
+        source_columns_ordinary = metadata_snapshot->getColumns().getOrdinary();
     }
 
     source_columns_set = removeDuplicateColumns(source_columns);
@@ -1092,16 +1108,16 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
         const auto & partition_desc = storage_snapshot->metadata->getPartitionKey();
         if (partition_desc.expression)
         {
-            auto partition_source_columns = partition_desc.expression->getRequiredColumns();
-            partition_source_columns.push_back("_part");
-            partition_source_columns.push_back("_partition_id");
-            partition_source_columns.push_back("_part_uuid");
-            partition_source_columns.push_back("_partition_value");
+            auto partition_columns = partition_desc.expression->getRequiredColumns();
+            NameSet partition_columns_set(partition_columns.begin(), partition_columns.end());
+
+            const auto & parititon_virtuals = MergeTreeData::virtuals_useful_for_filter;
+            partition_columns_set.insert(parititon_virtuals.begin(), parititon_virtuals.end());
+
             optimize_trivial_count = true;
             for (const auto & required_column : required)
             {
-                if (std::find(partition_source_columns.begin(), partition_source_columns.end(), required_column)
-                    == partition_source_columns.end())
+                if (!partition_columns_set.contains(required_column))
                 {
                     optimize_trivial_count = false;
                     break;
@@ -1112,7 +1128,7 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
 
     NameSet unknown_required_source_columns = required;
 
-    for (NamesAndTypesList::iterator it = source_columns.begin(); it != source_columns.end();)
+    for (auto it = source_columns.begin(); it != source_columns.end();)
     {
         const String & column_name = it->name;
         unknown_required_source_columns.erase(column_name);
@@ -1126,32 +1142,23 @@ bool TreeRewriterResult::collectUsedColumns(const ASTPtr & query, bool is_select
     has_virtual_shard_num = false;
     /// If there are virtual columns among the unknown columns. Remove them from the list of unknown and add
     /// in columns list, so that when further processing they are also considered.
-    if (storage)
+    if (storage_snapshot)
     {
-        const auto storage_virtuals = storage->getVirtuals();
+        const auto & virtuals = storage_snapshot->virtual_columns;
         for (auto it = unknown_required_source_columns.begin(); it != unknown_required_source_columns.end();)
         {
-            auto column = storage_virtuals.tryGetByName(*it);
-            if (column)
+            if (auto column = virtuals->tryGet(*it))
             {
                 source_columns.push_back(*column);
                 it = unknown_required_source_columns.erase(it);
             }
             else
-                ++it;
-        }
-
-        if (is_remote_storage)
-        {
-            for (const auto & name_type : storage_virtuals)
             {
-                if (name_type.name == "_shard_num" && storage->isVirtualColumn("_shard_num", storage_snapshot->getMetadataForQuery()))
-                {
-                    has_virtual_shard_num = true;
-                    break;
-                }
+                ++it;
             }
         }
+
+        has_virtual_shard_num = is_remote_storage && storage->isVirtualColumn("_shard_num", storage_snapshot->getMetadataForQuery()) && virtuals->has("_shard_num");
     }
 
     /// Collect missed object subcolumns
@@ -1325,7 +1332,7 @@ TreeRewriterResultPtr TreeRewriter::analyzeSelect(
 
     // expand ORDER BY ALL
     if (settings.enable_order_by_all && select_query->order_by_all)
-        expandOrderByAll(select_query);
+        expandOrderByAll(select_query, tables_with_columns);
 
     /// Remove unneeded columns according to 'required_result_columns'.
     /// Leave all selected columns in case of DISTINCT; columns that contain arrayJoin function inside.
@@ -1580,7 +1587,7 @@ void TreeRewriter::normalize(
     /// already normalized on initiator node, or not normalized and should remain unnormalized for
     /// compatibility.
     if (context_->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY && settings.normalize_function_names)
-        FunctionNameNormalizer().visit(query.get());
+        FunctionNameNormalizer::visit(query.get());
 
     if (settings.optimize_move_to_prewhere)
     {
diff --git a/src/Interpreters/WindowDescription.cpp b/src/Interpreters/WindowDescription.cpp
index 8a7a5024d69..31a881001e3 100644
--- a/src/Interpreters/WindowDescription.cpp
+++ b/src/Interpreters/WindowDescription.cpp
@@ -1,10 +1,10 @@
-#include <Interpreters/WindowDescription.h>
-
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Core/Field.h>
-#include <Common/FieldVisitorsAccurateComparison.h>
-#include <Common/FieldVisitorToString.h>
 #include <IO/Operators.h>
+#include <Interpreters/WindowDescription.h>
 #include <Parsers/ASTFunction.h>
+#include <Common/FieldVisitorToString.h>
+#include <Common/FieldVisitorsAccurateComparison.h>
 
 
 namespace DB
diff --git a/src/Interpreters/WindowDescription.h b/src/Interpreters/WindowDescription.h
index d14908fe993..05269c9d2c3 100644
--- a/src/Interpreters/WindowDescription.h
+++ b/src/Interpreters/WindowDescription.h
@@ -1,12 +1,12 @@
 #pragma once
 
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
 #include <Core/Field.h>
-#include <Parsers/IAST_fwd.h>
-#include <AggregateFunctions/IAggregateFunction.h>
-#include <Core/SortDescription.h>
-#include <DataTypes/IDataType.h>
 #include <Core/Names.h>
+#include <Core/SortDescription.h>
 #include <Core/Types.h>
+#include <DataTypes/IDataType.h>
+#include <Parsers/IAST_fwd.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/ZooKeeperLog.cpp b/src/Interpreters/ZooKeeperLog.cpp
index 9cc31edfe56..0d3063a569e 100644
--- a/src/Interpreters/ZooKeeperLog.cpp
+++ b/src/Interpreters/ZooKeeperLog.cpp
@@ -122,49 +122,49 @@ ColumnsDescription ZooKeeperLogElement::getColumnsDescription()
 
     return ColumnsDescription
     {
-        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"type", std::move(type_enum)},
-        {"event_date", std::make_shared<DataTypeDate>()},
-        {"event_time", std::make_shared<DataTypeDateTime64>(6)},
-        {"thread_id", std::make_shared<DataTypeUInt64>()},
-        {"query_id", std::make_shared<DataTypeString>()},
-        {"address", DataTypeFactory::instance().get("IPv6")},
-        {"port", std::make_shared<DataTypeUInt16>()},
-        {"session_id", std::make_shared<DataTypeInt64>()},
-        {"duration_ms", std::make_shared<DataTypeUInt64>()},
+        {"hostname", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Hostname of the server executing the query."},
+        {"type", std::move(type_enum), "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", std::make_shared<DataTypeDate>(), "The date when the event happened."},
+        {"event_time", std::make_shared<DataTypeDateTime64>(6), "The date and time when the event happened."},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "The ID of the thread executed this request."},
+        {"query_id", std::make_shared<DataTypeString>(), "The ID of a query in scope of which this request was executed."},
+        {"address", DataTypeFactory::instance().get("IPv6"), "IP address of ZooKeeper server that was used to make the request."},
+        {"port", std::make_shared<DataTypeUInt16>(), "The port of ZooKeeper server that was used to make the request."},
+        {"session_id", std::make_shared<DataTypeInt64>(), "The session ID that the ZooKeeper server sets for each connection."},
+        {"duration_microseconds", std::make_shared<DataTypeUInt64>(), "The time taken by ZooKeeper to execute the request."},
 
-        {"xid", std::make_shared<DataTypeInt32>()},
-        {"has_watch", std::make_shared<DataTypeUInt8>()},
-        {"op_num", op_num_enum},
-        {"path", std::make_shared<DataTypeString>()},
+        {"xid", std::make_shared<DataTypeInt32>(), "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", std::make_shared<DataTypeUInt8>(), "The request whether the watch has been set."},
+        {"op_num", op_num_enum, "The type of request or response."},
+        {"path", std::make_shared<DataTypeString>(), "The path to the ZooKeeper node specified in the request, or an empty string if the request not requires specifying a path."},
 
-        {"data", std::make_shared<DataTypeString>()},
+        {"data", std::make_shared<DataTypeString>(), "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", std::make_shared<DataTypeUInt8>()},
-        {"is_sequential", std::make_shared<DataTypeUInt8>()},
+        {"is_ephemeral", std::make_shared<DataTypeUInt8>(), "Is the ZooKeeper node being created as an ephemeral."},
+        {"is_sequential", std::make_shared<DataTypeUInt8>(), "Is the ZooKeeper node being created as an sequential."},
 
-        {"version", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt32>())},
+        {"version", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt32>()), "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", std::make_shared<DataTypeUInt32>()},
-        {"request_idx", std::make_shared<DataTypeUInt32>()},
+        {"requests_size", std::make_shared<DataTypeUInt32>(), "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", std::make_shared<DataTypeUInt32>(), "The number of the request included in multi request (for multi request — 0, then in order from 1)."},
 
-        {"zxid", std::make_shared<DataTypeInt64>()},
-        {"error", std::make_shared<DataTypeNullable>(error_enum)},
+        {"zxid", std::make_shared<DataTypeInt64>(), "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", std::make_shared<DataTypeNullable>(error_enum), "Error code. Can have many values, here are just some of them: ZOK — The request was executed successfully, ZCONNECTIONLOSS — The connection was lost, ZOPERATIONTIMEOUT — The request execution timeout has expired, ZSESSIONEXPIRED — The session has expired, NULL — The request is completed."},
 
-        {"watch_type", std::make_shared<DataTypeNullable>(watch_type_enum)},
-        {"watch_state", std::make_shared<DataTypeNullable>(watch_state_enum)},
+        {"watch_type", std::make_shared<DataTypeNullable>(watch_type_enum), "The type of the watch event (for responses with op_num = Watch), for the remaining responses: NULL."},
+        {"watch_state", std::make_shared<DataTypeNullable>(watch_state_enum), "The status of the watch event (for responses with op_num = Watch), for the remaining responses: NULL."},
 
-        {"path_created", std::make_shared<DataTypeString>()},
+        {"path_created", std::make_shared<DataTypeString>(), "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", std::make_shared<DataTypeInt64>()},
-        {"stat_mzxid", std::make_shared<DataTypeInt64>()},
-        {"stat_pzxid", std::make_shared<DataTypeInt64>()},
-        {"stat_version", std::make_shared<DataTypeInt32>()},
-        {"stat_cversion", std::make_shared<DataTypeInt32>()},
-        {"stat_dataLength", std::make_shared<DataTypeInt32>()},
-        {"stat_numChildren", std::make_shared<DataTypeInt32>()},
+        {"stat_czxid", std::make_shared<DataTypeInt64>(), "The zxid of the change that caused this ZooKeeper node to be created."},
+        {"stat_mzxid", std::make_shared<DataTypeInt64>(), "The zxid of the change that last modified this ZooKeeper node."},
+        {"stat_pzxid", std::make_shared<DataTypeInt64>(), "The transaction ID of the change that last modified children of this ZooKeeper node."},
+        {"stat_version", std::make_shared<DataTypeInt32>(), "The number of changes to the data of this ZooKeeper node."},
+        {"stat_cversion", std::make_shared<DataTypeInt32>(), "The number of changes to the children of this ZooKeeper node."},
+        {"stat_dataLength", std::make_shared<DataTypeInt32>(), "The length of the data field of this ZooKeeper node."},
+        {"stat_numChildren", std::make_shared<DataTypeInt32>(), "The number of children of this ZooKeeper node."},
 
-        {"children", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"children", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of child ZooKeeper nodes (for responses to LIST request)."},
     };
 }
 
@@ -183,7 +183,7 @@ void ZooKeeperLogElement::appendToBlock(MutableColumns & columns) const
     columns[i++]->insertData(IPv6ToBinary(address.host()).data(), 16);
     columns[i++]->insert(address.port());
     columns[i++]->insert(session_id);
-    columns[i++]->insert(duration_ms);
+    columns[i++]->insert(duration_microseconds);
 
     columns[i++]->insert(xid);
     columns[i++]->insert(has_watch);
diff --git a/src/Interpreters/ZooKeeperLog.h b/src/Interpreters/ZooKeeperLog.h
index 90d36d22a59..d3868c01202 100644
--- a/src/Interpreters/ZooKeeperLog.h
+++ b/src/Interpreters/ZooKeeperLog.h
@@ -28,7 +28,7 @@ struct ZooKeeperLogElement
     Poco::Net::SocketAddress address;
     Int64 session_id = 0;
 
-    UInt64 duration_ms = 0;
+    UInt64 duration_microseconds = 0;
 
     /// Common request info
     Int32 xid = 0;
@@ -72,7 +72,6 @@ struct ZooKeeperLogElement
     static ColumnsDescription getColumnsDescription();
     static NamesAndAliases getNamesAndAliases() { return {}; }
     void appendToBlock(MutableColumns & columns) const;
-    static const char * getCustomColumnList() { return nullptr; }
 };
 
 class ZooKeeperLog : public SystemLog<ZooKeeperLogElement>
diff --git a/src/Interpreters/convertFieldToType.cpp b/src/Interpreters/convertFieldToType.cpp
index 4e38103ac1f..25085ff4823 100644
--- a/src/Interpreters/convertFieldToType.cpp
+++ b/src/Interpreters/convertFieldToType.cpp
@@ -16,6 +16,7 @@
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/DataTypeVariant.h>
 
 #include <Core/AccurateComparison.h>
 
@@ -251,8 +252,21 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
 
         if (which_type.isDateTime64() && src.getType() == Field::Types::Decimal64)
         {
-            /// Already in needed type.
-            return src;
+            const auto & from_type = src.get<Decimal64>();
+            const auto & to_type = static_cast<const DataTypeDateTime64 &>(type);
+
+            const auto scale_from = from_type.getScale();
+            const auto scale_to = to_type.getScale();
+            const auto scale_multiplier_diff = scale_from > scale_to ? from_type.getScaleMultiplier() / to_type.getScaleMultiplier() : to_type.getScaleMultiplier() / from_type.getScaleMultiplier();
+
+            if (scale_multiplier_diff == 1) /// Already in needed type.
+                return src;
+
+            /// in case if we need to make DateTime64(a) from DateTime64(b), a != b, we need to convert datetime value to the right scale
+            const UInt64 value = scale_from > scale_to ? from_type.getValue().value / scale_multiplier_diff : from_type.getValue().value * scale_multiplier_diff;
+            return DecimalField(
+                DecimalUtils::decimalFromComponentsWithMultiplier<DateTime64>(value, 0, 1),
+                scale_to);
         }
 
         /// For toDate('xxx') in 1::Int64, we CAST `src` to UInt64, which may
@@ -487,15 +501,30 @@ Field convertFieldToTypeImpl(const Field & src, const IDataType & type, const ID
             return object;
         }
     }
+    else if (const DataTypeVariant * type_variant = typeid_cast<const DataTypeVariant *>(&type))
+    {
+        /// If we have type hint and Variant contains such type, no need to convert field.
+        if (from_type_hint && type_variant->tryGetVariantDiscriminator(*from_type_hint))
+            return src;
+
+        /// Create temporary column and check if we can insert this field to the variant.
+        /// If we can insert, no need to convert anything.
+        auto col = type_variant->createColumn();
+        if (col->tryInsert(src))
+            return src;
+    }
 
     /// Conversion from string by parsing.
     if (src.getType() == Field::Types::String)
     {
         /// Promote data type to avoid overflows. Note that overflows in the largest data type are still possible.
+        /// But don't promote Float32, since we want to keep the exact same value
+        /// Also don't promote domain types (like bool) because we would otherwise use the serializer of the promoted type (e.g. UInt64 for
+        /// bool, which does not allow 'true' and 'false' as input values)
         const IDataType * type_to_parse = &type;
         DataTypePtr holder;
 
-        if (type.canBePromoted())
+        if (type.canBePromoted() && !which_type.isFloat32() && !type.getCustomSerialization())
         {
             holder = type.promoteNumericType();
             type_to_parse = holder.get();
diff --git a/src/Interpreters/evaluateConstantExpression.cpp b/src/Interpreters/evaluateConstantExpression.cpp
index af8bd19370b..4e1a2bcf5ee 100644
--- a/src/Interpreters/evaluateConstantExpression.cpp
+++ b/src/Interpreters/evaluateConstantExpression.cpp
@@ -73,7 +73,7 @@ std::optional<EvaluateConstantExpressionResult> evaluateConstantExpressionImpl(c
     /// already normalized on initiator node, or not normalized and should remain unnormalized for
     /// compatibility.
     if (context->getClientInfo().query_kind != ClientInfo::QueryKind::SECONDARY_QUERY && context->getSettingsRef().normalize_function_names)
-        FunctionNameNormalizer().visit(ast.get());
+        FunctionNameNormalizer::visit(ast.get());
 
     auto syntax_result = TreeRewriter(context, no_throw).analyze(ast, source_columns);
     if (!syntax_result)
@@ -106,7 +106,7 @@ std::optional<EvaluateConstantExpressionResult> evaluateConstantExpressionImpl(c
 
     if (result_column->empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Logical error: empty result column after evaluation "
+                        "Empty result column after evaluation "
                         "of constant expression for IN, VALUES, or LIMIT, or aggregate function parameter, or a table function argument");
 
     /// Expressions like rand() or now() are not constant
@@ -661,7 +661,7 @@ namespace
         const ActionsDAG::NodeRawConstPtrs & target_expr,
         ConjunctionMap && conjunction)
     {
-        auto columns = ActionsDAG::evaluatePartialResult(conjunction, target_expr, false);
+        auto columns = ActionsDAG::evaluatePartialResult(conjunction, target_expr, /* input_rows_count= */ 1, /* throw_on_error= */ false);
         for (const auto & column : columns)
             if (!column.column)
                 return {};
diff --git a/src/Interpreters/examples/CMakeLists.txt b/src/Interpreters/examples/CMakeLists.txt
index 11c219ff64e..8bb7f9eeb98 100644
--- a/src/Interpreters/examples/CMakeLists.txt
+++ b/src/Interpreters/examples/CMakeLists.txt
@@ -1,35 +1,35 @@
 clickhouse_add_executable (hash_map hash_map.cpp)
-target_link_libraries (hash_map PRIVATE dbms ch_contrib::sparsehash)
+target_link_libraries (hash_map PRIVATE dbms clickhouse_functions ch_contrib::sparsehash)
 
 clickhouse_add_executable (hash_map_lookup hash_map_lookup.cpp)
-target_link_libraries (hash_map_lookup PRIVATE dbms)
+target_link_libraries (hash_map_lookup PRIVATE clickhouse_common_io clickhouse_compression)
 
 clickhouse_add_executable (hash_map3 hash_map3.cpp)
-target_link_libraries (hash_map3 PRIVATE dbms ch_contrib::farmhash ch_contrib::metrohash)
+target_link_libraries (hash_map3 PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::farmhash ch_contrib::metrohash)
 
 clickhouse_add_executable (hash_map_string hash_map_string.cpp)
-target_link_libraries (hash_map_string PRIVATE dbms ch_contrib::sparsehash)
+target_link_libraries (hash_map_string PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::sparsehash)
 
 clickhouse_add_executable (hash_map_string_2 hash_map_string_2.cpp)
-target_link_libraries (hash_map_string_2 PRIVATE dbms)
+target_link_libraries (hash_map_string_2 PRIVATE clickhouse_common_io clickhouse_compression)
 
 clickhouse_add_executable (hash_map_string_3 hash_map_string_3.cpp)
-target_link_libraries (hash_map_string_3 PRIVATE dbms ch_contrib::farmhash ch_contrib::metrohash)
+target_link_libraries (hash_map_string_3 PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::farmhash ch_contrib::metrohash)
 
 clickhouse_add_executable (hash_map_string_small hash_map_string_small.cpp)
-target_link_libraries (hash_map_string_small PRIVATE dbms ch_contrib::sparsehash)
+target_link_libraries (hash_map_string_small PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::sparsehash)
 
 clickhouse_add_executable (string_hash_map string_hash_map.cpp)
-target_link_libraries (string_hash_map PRIVATE dbms ch_contrib::sparsehash)
+target_link_libraries (string_hash_map PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::sparsehash)
 
 clickhouse_add_executable (string_hash_map_aggregation string_hash_map.cpp)
-target_link_libraries (string_hash_map_aggregation PRIVATE dbms)
+target_link_libraries (string_hash_map_aggregation PRIVATE clickhouse_common_io clickhouse_compression)
 
 clickhouse_add_executable (string_hash_set string_hash_set.cpp)
-target_link_libraries (string_hash_set PRIVATE dbms)
+target_link_libraries (string_hash_set PRIVATE clickhouse_common_io clickhouse_compression)
 
 clickhouse_add_executable (two_level_hash_map two_level_hash_map.cpp)
-target_link_libraries (two_level_hash_map PRIVATE dbms ch_contrib::sparsehash)
+target_link_libraries (two_level_hash_map PRIVATE clickhouse_common_io clickhouse_compression ch_contrib::sparsehash)
 
 clickhouse_add_executable (jit_example jit_example.cpp)
 target_link_libraries (jit_example PRIVATE dbms)
diff --git a/src/Interpreters/examples/hash_map.cpp b/src/Interpreters/examples/hash_map.cpp
index b55f174678e..0a91d00809f 100644
--- a/src/Interpreters/examples/hash_map.cpp
+++ b/src/Interpreters/examples/hash_map.cpp
@@ -15,7 +15,6 @@
 #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/hash_map_lookup.cpp b/src/Interpreters/examples/hash_map_lookup.cpp
index fd6b231cf73..829a234c537 100644
--- a/src/Interpreters/examples/hash_map_lookup.cpp
+++ b/src/Interpreters/examples/hash_map_lookup.cpp
@@ -8,10 +8,8 @@
 #define DBMS_HASH_MAP_DEBUG_RESIZES
 
 #include <Compression/CompressedReadBuffer.h>
-#include <base/types.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
-#include <Interpreters/AggregationCommon.h>
 #include <Common/HashTable/FixedHashMap.h>
 #include <Common/HashTable/HashMap.h>
 
diff --git a/src/Interpreters/examples/hash_map_string.cpp b/src/Interpreters/examples/hash_map_string.cpp
index f3ec104a5f7..f30a9a4cac1 100644
--- a/src/Interpreters/examples/hash_map_string.cpp
+++ b/src/Interpreters/examples/hash_map_string.cpp
@@ -20,9 +20,7 @@
 #include <Common/HashTable/HashMap.h>
 #include <Interpreters/AggregationCommon.h>
 
-#if defined(__clang__)
-    #pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
-#endif
+#pragma clang diagnostic ignored "-Wgnu-anonymous-struct"
 
 
 struct CompactStringRef
diff --git a/src/Interpreters/executeDDLQueryOnCluster.cpp b/src/Interpreters/executeDDLQueryOnCluster.cpp
index 6b6054fdae3..fbcb57b6125 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.cpp
+++ b/src/Interpreters/executeDDLQueryOnCluster.cpp
@@ -1,4 +1,5 @@
 #include <Interpreters/executeDDLQueryOnCluster.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/DDLWorker.h>
 #include <Interpreters/DDLTask.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
@@ -221,7 +222,7 @@ private:
     String node_path;
     ContextPtr context;
     Stopwatch watch;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     NameSet waiting_hosts;  /// hosts from task host list
     NameSet finished_hosts; /// finished hosts from host list
@@ -252,7 +253,8 @@ BlockIO getDistributedDDLStatus(const String & node_path, const DDLLogEntry & en
     auto source = std::make_shared<DDLQueryStatusSource>(node_path, entry, context, hosts_to_wait);
     io.pipeline = QueryPipeline(std::move(source));
 
-    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE)
+    if (context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE ||
+        context->getSettingsRef().distributed_ddl_output_mode == DistributedDDLOutputMode::NONE_ONLY_ACTIVE)
         io.pipeline.complete(std::make_shared<EmptySink>(io.pipeline.getHeader()));
 
     return io;
@@ -264,7 +266,9 @@ Block DDLQueryStatusSource::getSampleBlock(ContextPtr context_, bool hosts_to_wa
 
     auto maybe_make_nullable = [&](const DataTypePtr & type) -> DataTypePtr
     {
-        if (output_mode == DistributedDDLOutputMode::THROW || output_mode == DistributedDDLOutputMode::NONE)
+        if (output_mode == DistributedDDLOutputMode::THROW ||
+            output_mode == DistributedDDLOutputMode::NONE ||
+            output_mode == DistributedDDLOutputMode::NONE_ONLY_ACTIVE)
             return type;
         return std::make_shared<DataTypeNullable>(type);
     };
@@ -309,18 +313,19 @@ DDLQueryStatusSource::DDLQueryStatusSource(
     , node_path(zk_node_path)
     , context(context_)
     , watch(CLOCK_MONOTONIC_COARSE)
-    , log(&Poco::Logger::get("DDLQueryStatusSource"))
+    , log(getLogger("DDLQueryStatusSource"))
 {
     auto output_mode = context->getSettingsRef().distributed_ddl_output_mode;
     throw_on_timeout = output_mode == DistributedDDLOutputMode::THROW || output_mode == DistributedDDLOutputMode::THROW_ONLY_ACTIVE
-        || output_mode == DistributedDDLOutputMode::NONE;
+        || output_mode == DistributedDDLOutputMode::NONE || output_mode == DistributedDDLOutputMode::NONE_ONLY_ACTIVE;
 
     if (hosts_to_wait)
     {
         waiting_hosts = NameSet(hosts_to_wait->begin(), hosts_to_wait->end());
         is_replicated_database = true;
         only_running_hosts = output_mode == DistributedDDLOutputMode::THROW_ONLY_ACTIVE ||
-                            output_mode == DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT_ONLY_ACTIVE;
+                             output_mode == DistributedDDLOutputMode::NULL_STATUS_ON_TIMEOUT_ONLY_ACTIVE ||
+                             output_mode == DistributedDDLOutputMode::NONE_ONLY_ACTIVE;
     }
     else
     {
@@ -382,7 +387,7 @@ Chunk DDLQueryStatusSource::generateChunkWithUnfinishedHosts() const
     return Chunk(std::move(columns), unfinished_hosts.size());
 }
 
-static NameSet getOfflineHosts(const String & node_path, const NameSet & hosts_to_wait, const ZooKeeperPtr & zookeeper, Poco::Logger * log)
+static NameSet getOfflineHosts(const String & node_path, const NameSet & hosts_to_wait, const ZooKeeperPtr & zookeeper, LoggerPtr log)
 {
     fs::path replicas_path;
     if (node_path.ends_with('/'))
@@ -442,14 +447,16 @@ Chunk DDLQueryStatusSource::generate()
             size_t num_unfinished_hosts = waiting_hosts.size() - num_hosts_finished;
             size_t num_active_hosts = current_active_hosts.size();
 
-            constexpr auto msg_format = "Watching task {} is executing longer than distributed_ddl_task_timeout (={}) seconds. "
-                                                "There are {} unfinished hosts ({} of them are currently executing the task), "
-                                                "they are going to execute the query in background";
+            constexpr auto msg_format = "Distributed DDL task {} is not finished on {} of {} hosts "
+                                        "({} of them are currently executing the task, {} are inactive). "
+                                        "They are going to execute the query in background. Was waiting for {} seconds{}";
+
             if (throw_on_timeout)
             {
                 if (!first_exception)
                     first_exception = std::make_unique<Exception>(Exception(ErrorCodes::TIMEOUT_EXCEEDED,
-                        msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts));
+                        msg_format, node_path, num_unfinished_hosts, waiting_hosts.size(), num_active_hosts, offline_hosts.size(),
+                        watch.elapsedSeconds(), stop_waiting_offline_hosts ? "" : ", which is longer than distributed_ddl_task_timeout"));
 
                 /// For Replicated database print a list of unfinished hosts as well. Will return empty block on next iteration.
                 if (is_replicated_database)
@@ -457,7 +464,8 @@ Chunk DDLQueryStatusSource::generate()
                 return {};
             }
 
-            LOG_INFO(log, msg_format, node_path, timeout_seconds, num_unfinished_hosts, num_active_hosts);
+            LOG_INFO(log, msg_format, node_path, num_unfinished_hosts, waiting_hosts.size(), num_active_hosts, offline_hosts.size(),
+                     watch.elapsedSeconds(), stop_waiting_offline_hosts ? "" : "which is longer than distributed_ddl_task_timeout");
 
             return generateChunkWithUnfinishedHosts();
         }
@@ -470,7 +478,7 @@ Chunk DDLQueryStatusSource::generate()
 
         {
             auto retries_ctl = ZooKeeperRetriesControl(
-                "executeDDLQueryOnCluster", &Poco::Logger::get("DDLQueryStatusSource"), getRetriesInfo(), context->getProcessListElement());
+                "executeDDLQueryOnCluster", getLogger("DDLQueryStatusSource"), getRetriesInfo(), context->getProcessListElement());
             retries_ctl.retryLoop([&]()
             {
                 auto zookeeper = context->getZooKeeper();
@@ -540,7 +548,7 @@ Chunk DDLQueryStatusSource::generate()
 
                 auto retries_ctl = ZooKeeperRetriesControl(
                     "executeDDLQueryOnCluster",
-                    &Poco::Logger::get("DDLQueryStatusSource"),
+                    getLogger("DDLQueryStatusSource"),
                     getRetriesInfo(),
                     context->getProcessListElement());
                 retries_ctl.retryLoop([&]()
diff --git a/src/Interpreters/executeDDLQueryOnCluster.h b/src/Interpreters/executeDDLQueryOnCluster.h
index 7daf9babf9f..d3365553875 100644
--- a/src/Interpreters/executeDDLQueryOnCluster.h
+++ b/src/Interpreters/executeDDLQueryOnCluster.h
@@ -5,7 +5,7 @@
 #include <Processors/ISource.h>
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
-#include <Storages/MergeTree/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 
 
 namespace zkutil
diff --git a/src/Interpreters/executeQuery.cpp b/src/Interpreters/executeQuery.cpp
index 4b5a6a84e17..db8753000d8 100644
--- a/src/Interpreters/executeQuery.cpp
+++ b/src/Interpreters/executeQuery.cpp
@@ -4,6 +4,7 @@
 #include <Common/ThreadProfileEvents.h>
 #include <Common/MemoryTrackerBlockerInThread.h>
 #include <Common/SensitiveDataMasker.h>
+#include <Common/FailPoint.h>
 
 #include <Interpreters/AsynchronousInsertQueue.h>
 #include <Interpreters/Cache/QueryCache.h>
@@ -96,14 +97,22 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int QUERY_CACHE_USED_WITH_NONDETERMINISTIC_FUNCTIONS;
+    extern const int QUERY_CACHE_USED_WITH_SYSTEM_TABLE;
     extern const int INTO_OUTFILE_NOT_ALLOWED;
     extern const int INVALID_TRANSACTION;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
     extern const int QUERY_WAS_CANCELLED;
     extern const int INCORRECT_DATA;
+    extern const int SYNTAX_ERROR;
+    extern const int SUPPORT_IS_DISABLED;
+    extern const int INCORRECT_QUERY;
 }
 
+namespace FailPoints
+{
+    extern const char execute_query_calling_empty_set_result_func_on_exception[];
+}
 
 static void checkASTSizeLimits(const IAST & ast, const Settings & settings)
 {
@@ -119,7 +128,7 @@ static void logQuery(const String & query, ContextPtr context, bool internal, Qu
 {
     if (internal)
     {
-        LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(internal) {} (stage: {})", toOneLineQuery(query), QueryProcessingStage::toString(stage));
+        LOG_DEBUG(getLogger("executeQuery"), "(internal) {} (stage: {})", toOneLineQuery(query), QueryProcessingStage::toString(stage));
     }
     else
     {
@@ -142,7 +151,7 @@ static void logQuery(const String & query, ContextPtr context, bool internal, Qu
         if (auto txn = context->getCurrentTransaction())
             transaction_info = fmt::format(" (TID: {}, TIDH: {})", txn->tid, txn->tid.getHash());
 
-        LOG_DEBUG(&Poco::Logger::get("executeQuery"), "(from {}{}{}){}{} {} (stage: {})",
+        LOG_DEBUG(getLogger("executeQuery"), "(from {}{}{}){}{} {} (stage: {})",
             client_info.current_address.toString(),
             (current_user != "default" ? ", user: " + current_user : ""),
             (!initial_query_id.empty() && current_query_id != initial_query_id ? ", initial_query_id: " + initial_query_id : std::string()),
@@ -153,7 +162,7 @@ static void logQuery(const String & query, ContextPtr context, bool internal, Qu
 
         if (client_info.client_trace_context.trace_id != UUID())
         {
-            LOG_TRACE(&Poco::Logger::get("executeQuery"),
+            LOG_TRACE(getLogger("executeQuery"),
                 "OpenTelemetry traceparent '{}'",
                 client_info.client_trace_context.composeTraceparentHeader());
         }
@@ -207,9 +216,9 @@ static void logException(ContextPtr context, QueryLogElement & elem, bool log_er
             elem.stack_trace);
 
     if (log_error)
-        LOG_ERROR(&Poco::Logger::get("executeQuery"), message);
+        LOG_ERROR(getLogger("executeQuery"), message);
     else
-        LOG_INFO(&Poco::Logger::get("executeQuery"), message);
+        LOG_INFO(getLogger("executeQuery"), message);
 }
 
 static void
@@ -257,7 +266,7 @@ addStatusInfoToQueryLogElement(QueryLogElement & element, const QueryStatusInfo
     element.query_projections.insert(access_info.projections.begin(), access_info.projections.end());
     element.query_views.insert(access_info.views.begin(), access_info.views.end());
 
-    const auto & factories_info = context_ptr->getQueryFactoriesInfo();
+    const auto factories_info = context_ptr->getQueryFactoriesInfo();
     element.used_aggregate_functions = factories_info.aggregate_functions;
     element.used_aggregate_function_combinators = factories_info.aggregate_function_combinators;
     element.used_database_engines = factories_info.database_engines;
@@ -396,7 +405,7 @@ void logQueryFinish(
             double elapsed_seconds = static_cast<double>(info.elapsed_microseconds) / 1000000.0;
             double rows_per_second = static_cast<double>(elem.read_rows) / elapsed_seconds;
             LOG_DEBUG(
-                &Poco::Logger::get("executeQuery"),
+                getLogger("executeQuery"),
                 "Read {} rows, {} in {} sec., {} rows/sec., {}/sec.",
                 elem.read_rows,
                 ReadableSize(elem.read_bytes),
@@ -598,6 +607,9 @@ void logExceptionBeforeStart(
     if (auto txn = context->getCurrentTransaction())
         elem.tid = txn->tid;
 
+    if (settings.log_query_settings)
+        elem.query_settings = std::make_shared<Settings>(context->getSettingsRef());
+
     if (settings.calculate_text_stack_trace)
         setExceptionStackTrace(elem);
     logException(context, elem);
@@ -633,12 +645,33 @@ void logExceptionBeforeStart(
     }
 }
 
-static void setQuerySpecificSettings(ASTPtr & ast, ContextMutablePtr context)
+void validateAnalyzerSettings(ASTPtr ast, bool context_value)
 {
-    if (auto * ast_insert_into = ast->as<ASTInsertQuery>())
+    if (ast->as<ASTSetQuery>())
+        return;
+
+    bool top_level = context_value;
+
+    std::vector<ASTPtr> nodes_to_process{ ast };
+    while (!nodes_to_process.empty())
     {
-        if (ast_insert_into->watch)
-            context->setSetting("output_format_enable_streaming", 1);
+        auto node = nodes_to_process.back();
+        nodes_to_process.pop_back();
+
+        if (auto * set_query = node->as<ASTSetQuery>())
+        {
+            if (auto * value = set_query->changes.tryGet("allow_experimental_analyzer"))
+            {
+                if (top_level != value->safeGet<bool>())
+                    throw Exception(ErrorCodes::INCORRECT_QUERY, "Setting 'allow_experimental_analyzer' is changed in the subquery. Top level value: {}", top_level);
+            }
+        }
+
+        for (auto child : node->children)
+        {
+            if (child)
+                nodes_to_process.push_back(std::move(child));
+        }
     }
 }
 
@@ -660,17 +693,19 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
     /// we still have enough span logs for the execution of external queries.
     std::shared_ptr<OpenTelemetry::SpanHolder> query_span = internal ? nullptr : std::make_shared<OpenTelemetry::SpanHolder>("query");
     if (query_span && query_span->trace_id != UUID{})
-        LOG_TRACE(&Poco::Logger::get("executeQuery"), "Query span trace_id for opentelemetry log: {}", query_span->trace_id);
+        LOG_TRACE(getLogger("executeQuery"), "Query span trace_id for opentelemetry log: {}", query_span->trace_id);
 
+    /// Used for logging query start time in system.query_log
     auto query_start_time = std::chrono::system_clock::now();
 
-    /// Used to set the watch in QueryStatus and the output formats. It is not based on query_start_time as that might be based on
-    /// the value passed by the client
+    /// Used for:
+    /// * Setting the watch in QueryStatus (controls timeouts and progress) and the output formats
+    /// * Logging query duration (system.query_log)
     Stopwatch start_watch{CLOCK_MONOTONIC};
 
     const auto & client_info = context->getClientInfo();
 
-    if (!internal)
+    if (!internal && client_info.initial_query_start_time == 0)
     {
         // If it's not an internal query and we don't see an initial_query_start_time yet, initialize it
         // to current time. Internal queries are those executed without an independent client context,
@@ -678,15 +713,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         // possible to have unset initial_query_start_time for non-internal and non-initial queries. For
         // example, the query is from an initiator that is running an old version of clickhouse.
         // On the other hand, if it's initialized then take it as the start of the query
-        if (client_info.initial_query_start_time == 0)
-        {
-            context->setInitialQueryStartTime(query_start_time);
-        }
-        else
-        {
-            query_start_time = std::chrono::time_point<std::chrono::system_clock>(
-                std::chrono::microseconds{client_info.initial_query_start_time_microseconds});
-        }
+        context->setInitialQueryStartTime(query_start_time);
     }
 
     assert(internal || CurrentThread::get().getQueryContext());
@@ -710,20 +737,56 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         if (settings.dialect == Dialect::kusto && !internal)
         {
             ParserKQLStatement parser(end, settings.allow_settings_after_format_in_insert);
-
             /// TODO: parser should fail early when max_query_size limit is reached.
-            ast = parseKQLQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth);
+            ast = parseKQLQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
         }
         else if (settings.dialect == Dialect::prql && !internal)
         {
-            ParserPRQLQuery parser(max_query_size, settings.max_parser_depth);
-            ast = parseQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth);
+            ParserPRQLQuery parser(max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
+            ast = parseQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
         }
         else
         {
             ParserQuery parser(end, settings.allow_settings_after_format_in_insert);
             /// TODO: parser should fail early when max_query_size limit is reached.
-            ast = parseQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth);
+            ast = parseQuery(parser, begin, end, "", max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
+
+#ifndef NDEBUG
+            /// Verify that AST formatting is consistent:
+            /// If you format AST, parse it back, and format it again, you get the same string.
+
+            String formatted1 = ast->formatWithPossiblyHidingSensitiveData(0, true, true);
+
+            /// The query can become more verbose after formatting, so:
+            size_t new_max_query_size = max_query_size > 0 ? (1000 + 2 * max_query_size) : 0;
+
+            ASTPtr ast2;
+            try
+            {
+                ast2 = parseQuery(parser,
+                    formatted1.data(),
+                    formatted1.data() + formatted1.size(),
+                    "", new_max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
+            }
+            catch (const Exception & e)
+            {
+                if (e.code() == ErrorCodes::SYNTAX_ERROR)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Inconsistent AST formatting: the query:\n{}\ncannot parse.",
+                        formatted1);
+                else
+                    throw;
+            }
+
+            chassert(ast2);
+
+            String formatted2 = ast2->formatWithPossiblyHidingSensitiveData(0, true, true);
+
+            if (formatted1 != formatted2)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Inconsistent AST formatting: the query:\n{}\nWas parsed and formatted back as:\n{}",
+                    formatted1, formatted2);
+#endif
         }
 
         const char * query_end = end;
@@ -822,12 +885,11 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         /// Interpret SETTINGS clauses as early as possible (before invoking the corresponding interpreter),
         /// to allow settings to take effect.
         InterpreterSetQuery::applySettingsFromQuery(ast, context);
+        validateAnalyzerSettings(ast, context->getSettingsRef().allow_experimental_analyzer);
 
         if (auto * insert_query = ast->as<ASTInsertQuery>())
             insert_query->tail = istr;
 
-        setQuerySpecificSettings(ast, context);
-
         /// There is an option of probabilistic logging of queries.
         /// If it is used - do the random sampling and "collapse" the settings.
         /// It allows to consistently log queries with all the subqueries in distributed query processing
@@ -851,7 +913,7 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         /// Propagate WITH statement to children ASTSelect.
         if (settings.enable_global_with_statement)
         {
-            ApplyWithGlobalVisitor().visit(ast);
+            ApplyWithGlobalVisitor::visit(ast);
         }
 
         {
@@ -924,8 +986,8 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
         std::unique_ptr<IInterpreter> interpreter;
 
         bool async_insert = false;
-        auto * queue = context->getAsynchronousInsertQueue();
-        auto * logger = &Poco::Logger::get("executeQuery");
+        auto * queue = context->tryGetAsynchronousInsertQueue();
+        auto logger = getLogger("executeQuery");
 
         if (insert_query && async_insert_enabled)
         {
@@ -952,6 +1014,21 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
             if (settings.implicit_transaction && settings.throw_on_unsupported_query_inside_transaction)
                 throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Async inserts with 'implicit_transaction' are not supported");
 
+            /// Let's agree on terminology and say that a mini-INSERT is an asynchronous INSERT
+            /// which typically contains not a lot of data inside and a big-INSERT in an INSERT
+            /// which was formed by concatenating several mini-INSERTs together.
+            /// In case when the client had to retry some mini-INSERTs then they will be properly deduplicated
+            /// by the source tables. This functionality is controlled by a setting `async_insert_deduplicate`.
+            /// But then they will be glued together into a block and pushed through a chain of Materialized Views if any.
+            /// The process of forming such blocks is not deteministic so each time we retry mini-INSERTs the resulting
+            /// block may be concatenated differently.
+            /// That's why deduplication in dependent Materialized Views doesn't make sense in presence of async INSERTs.
+            if (settings.throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert &&
+                settings.deduplicate_blocks_in_dependent_materialized_views)
+                throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                        "Deduplication is dependent materialized view cannot work together with async inserts. "\
+                        "Please disable eiher `deduplicate_blocks_in_dependent_materialized_views` or `async_insert` setting.");
+
             quota = context->getQuota();
             if (quota)
             {
@@ -1111,15 +1188,26 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                     /// top of the pipeline which stores the result in the query cache.
                     if (can_use_query_cache && settings.enable_writes_to_query_cache)
                     {
+                        /// Only use the query cache if the query does not contain non-deterministic functions or system tables (which are typically non-deterministic)
+
                         const bool ast_contains_nondeterministic_functions = astContainsNonDeterministicFunctions(ast, context);
+                        const bool ast_contains_system_tables = astContainsSystemTables(ast, context);
+
                         const QueryCacheNondeterministicFunctionHandling nondeterministic_function_handling = settings.query_cache_nondeterministic_function_handling;
+                        const QueryCacheSystemTableHandling system_table_handling = settings.query_cache_system_table_handling;
 
                         if (ast_contains_nondeterministic_functions && nondeterministic_function_handling == QueryCacheNondeterministicFunctionHandling::Throw)
                             throw Exception(ErrorCodes::QUERY_CACHE_USED_WITH_NONDETERMINISTIC_FUNCTIONS,
                                 "The query result was not cached because the query contains a non-deterministic function."
                                 " Use setting `query_cache_nondeterministic_function_handling = 'save'` or `= 'ignore'` to cache the query result regardless or to omit caching");
 
-                        if (!ast_contains_nondeterministic_functions || nondeterministic_function_handling == QueryCacheNondeterministicFunctionHandling::Save)
+                        if (ast_contains_system_tables && system_table_handling == QueryCacheSystemTableHandling::Throw)
+                            throw Exception(ErrorCodes::QUERY_CACHE_USED_WITH_SYSTEM_TABLE,
+                                "The query result was not cached because the query contains a system table."
+                                " Use setting `query_cache_system_table_handling = 'save'` or `= 'ignore'` to cache the query result regardless or to omit caching");
+
+                        if ((!ast_contains_nondeterministic_functions || nondeterministic_function_handling == QueryCacheNondeterministicFunctionHandling::Save)
+                            && (!ast_contains_system_tables || system_table_handling == QueryCacheSystemTableHandling::Save))
                         {
                             QueryCache::Key key(
                                 ast, res.pipeline.getHeader(),
@@ -1128,10 +1216,10 @@ static std::tuple<ASTPtr, BlockIO> executeQueryImpl(
                                 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);
+                            const size_t num_query_runs = settings.query_cache_min_query_runs ? query_cache->recordQueryRun(key) : 1; /// try to avoid locking a mutex in recordQueryRun()
                             if (num_query_runs <= settings.query_cache_min_query_runs)
                             {
-                                LOG_TRACE(&Poco::Logger::get("QueryCache"),
+                                LOG_TRACE(getLogger("QueryCache"),
                                         "Skipped insert because the query ran {} times but the minimum required number of query runs to cache the query result is {}",
                                         num_query_runs, settings.query_cache_min_query_runs);
                             }
@@ -1366,28 +1454,41 @@ void executeQuery(
     ASTPtr ast;
     BlockIO streams;
     OutputFormatPtr output_format;
+    String format_name;
 
-    auto update_format_for_exception_if_needed = [&]()
+    auto update_format_on_exception_if_needed = [&]()
     {
         if (!output_format)
         {
             try
             {
-                String format_name = context->getDefaultFormat();
+                format_name = context->getDefaultFormat();
                 output_format = FormatFactory::instance().getOutputFormat(format_name, ostr, {}, context, output_format_settings);
                 if (output_format && output_format->supportsWritingException())
                 {
                     /// Force an update of the headers before we start writing
                     result_details.content_type = output_format->getContentType();
                     result_details.format = format_name;
-                    set_result_details(result_details);
-                    set_result_details = nullptr;
+
+                    fiu_do_on(FailPoints::execute_query_calling_empty_set_result_func_on_exception, {
+                        // it will throw std::bad_function_call
+                        set_result_details = nullptr;
+                        set_result_details(result_details);
+                    });
+
+                    if (set_result_details)
+                    {
+                        /// reset set_result_details func to avoid calling in SCOPE_EXIT()
+                        auto set_result_details_copy = set_result_details;
+                        set_result_details = nullptr;
+                        set_result_details_copy(result_details);
+                    }
                 }
             }
             catch (const DB::Exception & e)
             {
                 /// Ignore this exception and report the original one
-                LOG_WARNING(&Poco::Logger::get("executeQuery"), getExceptionMessageAndPattern(e, true));
+                LOG_WARNING(getLogger("executeQuery"), getExceptionMessageAndPattern(e, true));
             }
         }
     };
@@ -1400,9 +1501,9 @@ void executeQuery(
     {
         if (handle_exception_in_output_format)
         {
-            update_format_for_exception_if_needed();
+            update_format_on_exception_if_needed();
             if (output_format)
-                handle_exception_in_output_format(*output_format);
+                handle_exception_in_output_format(*output_format, format_name, context, output_format_settings);
         }
         throw;
     }
@@ -1444,7 +1545,7 @@ void executeQuery(
                 );
             }
 
-            String format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
+            format_name = ast_query_with_output && (ast_query_with_output->format != nullptr)
                                     ? getIdentifierName(ast_query_with_output->format)
                                     : context->getDefaultFormat();
 
@@ -1501,13 +1602,17 @@ void executeQuery(
     }
     catch (...)
     {
+        /// first execute on exception callback, it includes updating query_log
+        /// otherwise closing record ('ExceptionWhileProcessing') can be not appended in query_log
+        /// due to possible exceptions in functions called below (passed as parameter here)
+        streams.onException();
+
         if (handle_exception_in_output_format)
         {
-            update_format_for_exception_if_needed();
+            update_format_on_exception_if_needed();
             if (output_format)
-                handle_exception_in_output_format(*output_format);
+                handle_exception_in_output_format(*output_format, format_name, context, output_format_settings);
         }
-        streams.onException();
         throw;
     }
 
diff --git a/src/Interpreters/executeQuery.h b/src/Interpreters/executeQuery.h
index 0f599922668..c6b3e1fc34e 100644
--- a/src/Interpreters/executeQuery.h
+++ b/src/Interpreters/executeQuery.h
@@ -27,7 +27,7 @@ struct QueryResultDetails
 };
 
 using SetResultDetailsFunc = std::function<void(const QueryResultDetails &)>;
-using HandleExceptionInOutputFormatFunc = std::function<void(IOutputFormat & output_format)>;
+using HandleExceptionInOutputFormatFunc = std::function<void(IOutputFormat & output_format, const String & format_name, const ContextPtr & context, const std::optional<FormatSettings> & format_settings)>;
 
 struct QueryFlags
 {
diff --git a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
index 6f84a60f2af..a02ce66e6b5 100644
--- a/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
+++ b/src/Interpreters/fuzzers/execute_query_fuzzer.cpp
@@ -3,7 +3,7 @@
 #include <Interpreters/registerInterpreters.h>
 #include "Processors/Executors/PullingPipelineExecutor.h"
 
-#include <Functions/registerDatabases.h>
+#include <Databases/registerDatabases.h>
 #include <Functions/registerFunctions.h>
 #include <AggregateFunctions/registerAggregateFunctions.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -25,6 +25,9 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 
         auto initialize = [&]() mutable
         {
+            if (context)
+                return true;
+
             shared_context = Context::createShared();
             context = Context::createGlobal(shared_context.get());
             context->makeGlobalContext();
diff --git a/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
index 1295a4d5a75..d78b6ab0c4d 100644
--- a/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
+++ b/src/Interpreters/getCustomKeyFilterForParallelReplicas.cpp
@@ -122,7 +122,7 @@ ASTPtr parseCustomKeyForTable(const String & custom_key, const Context & context
     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);
+        "parallel replicas custom key", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 }
 
 }
diff --git a/src/Interpreters/getHeaderForProcessingStage.cpp b/src/Interpreters/getHeaderForProcessingStage.cpp
index d16e01ef2d2..06c5d424d2f 100644
--- a/src/Interpreters/getHeaderForProcessingStage.cpp
+++ b/src/Interpreters/getHeaderForProcessingStage.cpp
@@ -98,23 +98,7 @@ Block getHeaderForProcessingStage(
         case QueryProcessingStage::FetchColumns:
         {
             Block header = storage_snapshot->getSampleBlockForColumns(column_names);
-
-            if (query_info.prewhere_info)
-            {
-                auto & prewhere_info = *query_info.prewhere_info;
-
-                if (prewhere_info.row_level_filter)
-                {
-                    header = prewhere_info.row_level_filter->updateHeader(std::move(header));
-                    header.erase(prewhere_info.row_level_column_name);
-                }
-
-                if (prewhere_info.prewhere_actions)
-                    header = prewhere_info.prewhere_actions->updateHeader(std::move(header));
-
-                if (prewhere_info.remove_prewhere_column)
-                    header.erase(prewhere_info.prewhere_column_name);
-            }
+            header = SourceStepWithFilter::applyPrewhereActions(header, query_info.prewhere_info);
             return header;
         }
         case QueryProcessingStage::WithMergeableState:
@@ -137,7 +121,12 @@ Block getHeaderForProcessingStage(
 
                     auto & table_expression_data = query_info.planner_context->getTableExpressionDataOrThrow(left_table_expression);
                     const auto & query_context = query_info.planner_context->getQueryContext();
-                    auto columns = table_expression_data.getColumns();
+
+                    NamesAndTypes columns;
+                    const auto & column_name_to_column = table_expression_data.getColumnNameToColumn();
+                    for (const auto & column_name : table_expression_data.getSelectedColumnsNames())
+                        columns.push_back(column_name_to_column.at(column_name));
+
                     auto new_query_node = buildSubqueryToReadColumnsFromTableExpression(columns, left_table_expression, query_context);
                     query = new_query_node->toAST();
                 }
@@ -153,7 +142,9 @@ Block getHeaderForProcessingStage(
 
             if (context->getSettingsRef().allow_experimental_analyzer)
             {
-                auto storage = std::make_shared<StorageDummy>(storage_snapshot->storage.getStorageID(), storage_snapshot->metadata->getColumns());
+                auto storage = std::make_shared<StorageDummy>(storage_snapshot->storage.getStorageID(),
+                                                                                        storage_snapshot->getAllColumnsDescription(),
+                                                                                        storage_snapshot);
                 InterpreterSelectQueryAnalyzer interpreter(query, context, storage, SelectQueryOptions(processed_stage).analyze());
                 result = interpreter.getSampleBlock();
             }
@@ -167,8 +158,7 @@ Block getHeaderForProcessingStage(
             return result;
         }
     }
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical Error: unknown processed stage.");
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown processed stage.");
 }
 
 }
-
diff --git a/src/Interpreters/getTableExpressions.cpp b/src/Interpreters/getTableExpressions.cpp
index 70e38526648..cd92d9ecbf3 100644
--- a/src/Interpreters/getTableExpressions.cpp
+++ b/src/Interpreters/getTableExpressions.cpp
@@ -1,5 +1,6 @@
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTSelectQuery.h>
@@ -99,7 +100,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
         names_and_type_list = columns.getOrdinary();
         materialized = columns.getMaterialized();
         aliases = columns.getAliases();
-        virtuals = function_storage->getVirtuals();
+        virtuals = function_storage->getVirtualsList();
     }
     else if (table_expression.database_and_table_name)
     {
@@ -110,7 +111,7 @@ static NamesAndTypesList getColumnsFromTableExpression(
         names_and_type_list = columns.getOrdinary();
         materialized = columns.getMaterialized();
         aliases = columns.getAliases();
-        virtuals = table->getVirtuals();
+        virtuals = table->getVirtualsList();
     }
 
     return names_and_type_list;
diff --git a/src/Interpreters/inplaceBlockConversions.cpp b/src/Interpreters/inplaceBlockConversions.cpp
index c7a1cab8bac..239cce5b427 100644
--- a/src/Interpreters/inplaceBlockConversions.cpp
+++ b/src/Interpreters/inplaceBlockConversions.cpp
@@ -20,7 +20,6 @@
 #include <Columns/ColumnArray.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Storages/StorageInMemoryMetadata.h>
-#include <Storages/BlockNumberColumn.h>
 
 
 namespace DB
@@ -237,17 +236,36 @@ static std::unordered_map<String, ColumnPtr> collectOffsetsColumns(
             {
                 auto & offsets_column = offsets_columns[stream_name];
                 if (!offsets_column)
+                {
                     offsets_column = current_offsets_column;
+                }
+                else
+                {
+                    /// If we are inside Variant element, it may happen that
+                    /// offsets are different, because when we read Variant
+                    /// element as a subcolumn, we expand this column according
+                    /// to the discriminators, so, offsets column can be changed.
+                    /// In this case we should select the original offsets column
+                    /// of this stream, which is the smallest one.
+                    bool inside_variant_element = false;
+                    for (const auto & elem : subpath)
+                        inside_variant_element |= elem.type == ISerialization::Substream::VariantElement;
 
-            #ifndef NDEBUG
-                const auto & offsets_data = assert_cast<const ColumnUInt64 &>(*offsets_column).getData();
-                const auto & current_offsets_data = assert_cast<const ColumnUInt64 &>(*current_offsets_column).getData();
+                    if (offsets_column->size() != current_offsets_column->size() && inside_variant_element)
+                        offsets_column = offsets_column->size() < current_offsets_column->size() ? offsets_column : current_offsets_column;
+#ifndef NDEBUG
+                    else
+                    {
+                        const auto & offsets_data = assert_cast<const ColumnUInt64 &>(*offsets_column).getData();
+                        const auto & current_offsets_data = assert_cast<const ColumnUInt64 &>(*current_offsets_column).getData();
 
-                if (offsets_data != current_offsets_data)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Found non-equal columns with offsets (sizes: {} and {}) for stream {}",
-                        offsets_data.size(), current_offsets_data.size(), stream_name);
-            #endif
+                        if (offsets_data != current_offsets_data)
+                            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                            "Found non-equal columns with offsets (sizes: {} and {}) for stream {}",
+                                            offsets_data.size(), current_offsets_data.size(), stream_name);
+                    }
+#endif
+                }
             }
         }, available_column->type, res_columns[i]);
     }
@@ -261,7 +279,7 @@ void fillMissingColumns(
     const NamesAndTypesList & requested_columns,
     const NamesAndTypesList & available_columns,
     const NameSet & partially_read_columns,
-    StorageMetadataPtr metadata_snapshot, size_t block_number)
+    StorageMetadataPtr metadata_snapshot)
 {
     size_t num_columns = requested_columns.size();
     if (num_columns != res_columns.size())
@@ -340,14 +358,9 @@ void fillMissingColumns(
         }
         else
         {
-            if (requested_column->name == BlockNumberColumn::name)
-                res_columns[i] = type->createColumnConst(num_rows, block_number)->convertToFullColumnIfConst();
-            else
-                /// We must turn a constant column into a full column because the interpreter could infer
-                /// that it is constant everywhere but in some blocks (from other parts) it can be a full column.
-                res_columns[i] = type->createColumnConstWithDefaultValue(num_rows)->convertToFullColumnIfConst();
-
-
+            /// We must turn a constant column into a full column because the interpreter could infer
+            /// that it is constant everywhere but in some blocks (from other parts) it can be a full column.
+            res_columns[i] = type->createColumnConstWithDefaultValue(num_rows)->convertToFullColumnIfConst();
         }
     }
 }
diff --git a/src/Interpreters/inplaceBlockConversions.h b/src/Interpreters/inplaceBlockConversions.h
index 7a13a75ec8b..bea44bf6db9 100644
--- a/src/Interpreters/inplaceBlockConversions.h
+++ b/src/Interpreters/inplaceBlockConversions.h
@@ -46,6 +46,6 @@ void fillMissingColumns(
     const NamesAndTypesList & requested_columns,
     const NamesAndTypesList & available_columns,
     const NameSet & partially_read_columns,
-    StorageMetadataPtr metadata_snapshot, size_t block_number = 0);
+    StorageMetadataPtr metadata_snapshot);
 
 }
diff --git a/src/Interpreters/interpretSubquery.cpp b/src/Interpreters/interpretSubquery.cpp
index 5f00be07fa5..6b42345f1d6 100644
--- a/src/Interpreters/interpretSubquery.cpp
+++ b/src/Interpreters/interpretSubquery.cpp
@@ -10,9 +10,10 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
-#include <Interpreters/interpretSubquery.h>
-#include <Interpreters/DatabaseAndTableWithAlias.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseAndTableWithAlias.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/interpretSubquery.h>
 
 namespace DB
 {
diff --git a/src/Interpreters/joinDispatch.h b/src/Interpreters/joinDispatch.h
index ca2fcd27cda..dccbe68fdb6 100644
--- a/src/Interpreters/joinDispatch.h
+++ b/src/Interpreters/joinDispatch.h
@@ -113,10 +113,9 @@ inline bool joinDispatch(JoinKind kind, JoinStrictness strictness, std::vector<c
         {
             using MapType = typename MapGetter<KINDS[i], STRICTNESSES[j]>::Map;
             std::vector<const MapType *> v;
+            v.reserve(mapsv.size());
             for (const auto & el : mapsv)
-            {
                 v.push_back(&std::get<MapType>(*el));
-            }
 
             func(
                 std::integral_constant<JoinKind, KINDS[i]>(),
diff --git a/src/Interpreters/loadMetadata.cpp b/src/Interpreters/loadMetadata.cpp
index b2fd43c178c..9c3922b8bda 100644
--- a/src/Interpreters/loadMetadata.cpp
+++ b/src/Interpreters/loadMetadata.cpp
@@ -6,11 +6,12 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/parseQuery.h>
 
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterSystemQuery.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/loadMetadata.h>
 #include <Interpreters/executeQuery.h>
+#include <Interpreters/loadMetadata.h>
 
 #include <Databases/DatabaseOrdinary.h>
 #include <Databases/TablesLoader.h>
@@ -55,9 +56,11 @@ static void executeCreateQuery(
     bool create,
     bool has_force_restore_data_flag)
 {
+    const Settings & settings = context->getSettingsRef();
     ParserCreateQuery parser;
     ASTPtr ast = parseQuery(
-        parser, query.data(), query.data() + query.size(), "in file " + file_name, 0, context->getSettingsRef().max_parser_depth);
+        parser, query.data(), query.data() + query.size(), "in file " + file_name,
+        0, settings.max_parser_depth, settings.max_parser_backtracks);
 
     auto & ast_create_query = ast->as<ASTCreateQuery &>();
     ast_create_query.setDatabase(database);
@@ -156,7 +159,7 @@ static void checkIncompleteOrdinaryToAtomicConversion(ContextPtr context, const
 
 LoadTaskPtrs loadMetadata(ContextMutablePtr context, const String & default_database_name, bool async_load_databases)
 {
-    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
+    LoggerPtr log = getLogger("loadMetadata");
 
     String path = context->getPath() + "metadata";
 
@@ -234,7 +237,7 @@ LoadTaskPtrs loadMetadata(ContextMutablePtr context, const String & default_data
         loaded_databases.insert({name, DatabaseCatalog::instance().getDatabase(name)});
     }
 
-    auto mode = getLoadingStrictnessLevel(/* attach */ true, /* force_attach */ true, has_force_restore_data_flag);
+    auto mode = getLoadingStrictnessLevel(/* attach */ true, /* force_attach */ true, has_force_restore_data_flag, /*secondary*/ false);
     TablesLoader loader{context, std::move(loaded_databases), mode};
     auto load_tasks = loader.loadTablesAsync();
     auto startup_tasks = loader.startupTablesAsync();
@@ -257,10 +260,10 @@ LoadTaskPtrs loadMetadata(ContextMutablePtr context, const String & default_data
     }
     else
     {
+        // NOTE: some tables can still be started up in the "loading" phase if they are required by dependencies during loading of other tables
         LOG_INFO(log, "Start synchronous loading of databases");
-
-        // Note that wait implicitly calls schedule
         waitLoad(TablesLoaderForegroundPoolId, load_tasks); // First prioritize, schedule and wait all the load table tasks
+        LOG_INFO(log, "Start synchronous startup of databases");
         waitLoad(TablesLoaderForegroundPoolId, startup_tasks); // Only then prioritize, schedule and wait all the startup tasks
         return {};
     }
@@ -290,7 +293,7 @@ static void loadSystemDatabaseImpl(ContextMutablePtr context, const String & dat
     }
 }
 
-static void convertOrdinaryDatabaseToAtomic(Poco::Logger * log, ContextMutablePtr context, const DatabasePtr & database,
+static void convertOrdinaryDatabaseToAtomic(LoggerPtr log, ContextMutablePtr context, const DatabasePtr & database,
                                             const String & name, const String tmp_name)
 {
     /// It's kind of C++ script that creates temporary database with Atomic engine,
@@ -369,7 +372,7 @@ static void convertOrdinaryDatabaseToAtomic(Poco::Logger * log, ContextMutablePt
 /// Can be called only during server startup when there are no queries from users.
 static void maybeConvertOrdinaryDatabaseToAtomic(ContextMutablePtr context, const String & database_name, LoadTaskPtrs * startup_tasks = nullptr)
 {
-    Poco::Logger * log = &Poco::Logger::get("loadMetadata");
+    LoggerPtr log = getLogger("loadMetadata");
 
     auto database = DatabaseCatalog::instance().getDatabase(database_name);
     if (!database)
@@ -482,7 +485,7 @@ void convertDatabasesEnginesIfNeed(const LoadTaskPtrs & load_metadata, ContextMu
     if (!fs::exists(convert_flag_path))
         return;
 
-    LOG_INFO(&Poco::Logger::get("loadMetadata"), "Found convert_ordinary_to_atomic file in flags directory, "
+    LOG_INFO(getLogger("loadMetadata"), "Found convert_ordinary_to_atomic file in flags directory, "
                                                  "will try to convert all Ordinary databases to Atomic");
 
     // Wait for all table to be loaded and started
@@ -492,7 +495,7 @@ void convertDatabasesEnginesIfNeed(const LoadTaskPtrs & load_metadata, ContextMu
         if (name != DatabaseCatalog::SYSTEM_DATABASE)
             maybeConvertOrdinaryDatabaseToAtomic(context, name);
 
-    LOG_INFO(&Poco::Logger::get("loadMetadata"), "Conversion finished, removing convert_ordinary_to_atomic flag");
+    LOG_INFO(getLogger("loadMetadata"), "Conversion finished, removing convert_ordinary_to_atomic flag");
     fs::remove(convert_flag_path);
 }
 
diff --git a/src/Interpreters/parseColumnsListForTableFunction.cpp b/src/Interpreters/parseColumnsListForTableFunction.cpp
index 87f76f7f824..27c364073ae 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.cpp
+++ b/src/Interpreters/parseColumnsListForTableFunction.cpp
@@ -1,65 +1,117 @@
+#include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeVariant.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/InterpreterCreateQuery.h>
+#include <Interpreters/parseColumnsListForTableFunction.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/parseQuery.h>
-#include <Interpreters/InterpreterCreateQuery.h>
-#include <Interpreters/Context.h>
-#include <Interpreters/parseColumnsListForTableFunction.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeFixedString.h>
-#include <DataTypes/DataTypeNullable.h>
-
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
-    extern const int LOGICAL_ERROR;
-    extern const int SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY;
-    extern const int ILLEGAL_COLUMN;
+extern const int LOGICAL_ERROR;
+extern const int SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY;
+extern const int ILLEGAL_COLUMN;
 
 }
 
-void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings)
+void validateDataType(const DataTypePtr & type_to_check, const DataTypeValidationSettings & settings)
 {
-    if (!settings.allow_suspicious_low_cardinality_types)
+    auto validate_callback = [&](const IDataType & data_type)
     {
-        if (const auto * lc_type = typeid_cast<const DataTypeLowCardinality *>(type.get()))
+        if (!settings.allow_suspicious_low_cardinality_types)
         {
-            if (!isStringOrFixedString(*removeNullable(lc_type->getDictionaryType())))
-                throw Exception(
-                    ErrorCodes::SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY,
-                    "Creating columns of type {} is prohibited by default due to expected negative impact on performance. "
-                    "It can be enabled with the \"allow_suspicious_low_cardinality_types\" setting.",
-                    lc_type->getName());
+            if (const auto * lc_type = typeid_cast<const DataTypeLowCardinality *>(&data_type))
+            {
+                if (!isStringOrFixedString(*removeNullable(lc_type->getDictionaryType())))
+                    throw Exception(
+                        ErrorCodes::SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY,
+                        "Creating columns of type {} is prohibited by default due to expected negative impact on performance. "
+                        "It can be enabled with the \"allow_suspicious_low_cardinality_types\" setting.",
+                        lc_type->getName());
+            }
         }
-    }
 
-    if (!settings.allow_experimental_object_type)
-    {
-        if (type->hasDynamicSubcolumns())
+        if (!settings.allow_experimental_object_type)
         {
-            throw Exception(
-                ErrorCodes::ILLEGAL_COLUMN,
-                "Cannot create column with type '{}' because experimental Object type is not allowed. "
-                "Set setting allow_experimental_object_type = 1 in order to allow it", type->getName());
-        }
-    }
-
-    if (!settings.allow_suspicious_fixed_string_types)
-    {
-        auto basic_type = removeLowCardinalityAndNullable(type);
-        if (const auto * fixed_string = typeid_cast<const DataTypeFixedString *>(basic_type.get()))
-        {
-            if (fixed_string->getN() > MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS)
+            if (data_type.hasDynamicSubcolumns())
+            {
                 throw Exception(
                     ErrorCodes::ILLEGAL_COLUMN,
-                    "Cannot create column with type '{}' because fixed string with size > {} is suspicious. "
-                    "Set setting allow_suspicious_fixed_string_types = 1 in order to allow it",
-                    type->getName(),
-                    MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS);
+                    "Cannot create column with type '{}' because experimental Object type is not allowed. "
+                    "Set setting allow_experimental_object_type = 1 in order to allow it",
+                    data_type.getName());
+            }
         }
-    }
+
+        if (!settings.allow_suspicious_fixed_string_types)
+        {
+            if (const auto * fixed_string = typeid_cast<const DataTypeFixedString *>(&data_type))
+            {
+                if (fixed_string->getN() > MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS)
+                    throw Exception(
+                        ErrorCodes::ILLEGAL_COLUMN,
+                        "Cannot create column with type '{}' because fixed string with size > {} is suspicious. "
+                        "Set setting allow_suspicious_fixed_string_types = 1 in order to allow it",
+                        data_type.getName(),
+                        MAX_FIXEDSTRING_SIZE_WITHOUT_SUSPICIOUS);
+            }
+        }
+
+        if (!settings.allow_experimental_variant_type)
+        {
+            if (isVariant(data_type))
+            {
+                throw Exception(
+                    ErrorCodes::ILLEGAL_COLUMN,
+                    "Cannot create column with type '{}' because experimental Variant type is not allowed. "
+                    "Set setting allow_experimental_variant_type = 1 in order to allow it",
+                    data_type.getName());
+            }
+        }
+
+        if (!settings.allow_suspicious_variant_types)
+        {
+            if (const auto * variant_type = typeid_cast<const DataTypeVariant *>(&data_type))
+            {
+                const auto & variants = variant_type->getVariants();
+                chassert(!variants.empty());
+                for (size_t i = 0; i < variants.size() - 1; ++i)
+                {
+                    for (size_t j = i + 1; j < variants.size(); ++j)
+                    {
+                        /// Don't consider bool as similar to something (like number).
+                        if (isBool(variants[i]) || isBool(variants[j]))
+                            continue;
+
+                        if (auto supertype = tryGetLeastSupertype(DataTypes{variants[i], variants[j]}))
+                        {
+                            throw Exception(
+                                ErrorCodes::ILLEGAL_COLUMN,
+                                "Cannot create column with type '{}' because variants '{}' and '{}' have similar types and working with values "
+                                "of these types may lead to ambiguity. "
+                                "Consider using common single variant '{}' instead of these 2 variants or set setting allow_suspicious_variant_types = 1 "
+                                "in order to allow it",
+                                data_type.getName(),
+                                variants[i]->getName(),
+                                variants[j]->getName(),
+                                supertype->getName());
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    validate_callback(*type_to_check);
+    if (settings.validate_nested_types)
+        type_to_check->forEachChild(validate_callback);
 }
 
 ColumnsDescription parseColumnsListFromString(const std::string & structure, const ContextPtr & context)
@@ -67,13 +119,13 @@ ColumnsDescription parseColumnsListFromString(const std::string & structure, con
     ParserColumnDeclarationList parser(true, true);
     const Settings & settings = context->getSettingsRef();
 
-    ASTPtr columns_list_raw = parseQuery(parser, structure, "columns declaration list", settings.max_query_size, settings.max_parser_depth);
+    ASTPtr columns_list_raw = parseQuery(parser, structure, "columns declaration list", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 
     auto * columns_list = dynamic_cast<ASTExpressionList *>(columns_list_raw.get());
     if (!columns_list)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Could not cast AST to ASTExpressionList");
 
-    auto columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false, false);
+    auto columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, LoadingStrictnessLevel::CREATE);
     auto validation_settings = DataTypeValidationSettings(context->getSettingsRef());
     for (const auto & [name, type] : columns.getAll())
         validateDataType(type, validation_settings);
@@ -87,7 +139,8 @@ bool tryParseColumnsListFromString(const std::string & structure, ColumnsDescrip
 
     const char * start = structure.data();
     const char * end = structure.data() + structure.size();
-    ASTPtr columns_list_raw = tryParseQuery(parser, start, end, error, false, "columns declaration list", false, settings.max_query_size, settings.max_parser_depth);
+    ASTPtr columns_list_raw = tryParseQuery(
+        parser, start, end, error, false, "columns declaration list", false, settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks, true);
     if (!columns_list_raw)
         return false;
 
@@ -100,7 +153,7 @@ bool tryParseColumnsListFromString(const std::string & structure, ColumnsDescrip
 
     try
     {
-        columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, false, false);
+        columns = InterpreterCreateQuery::getColumnsDescription(*columns_list, context, LoadingStrictnessLevel::CREATE);
         auto validation_settings = DataTypeValidationSettings(context->getSettingsRef());
         for (const auto & [name, type] : columns.getAll())
             validateDataType(type, validation_settings);
diff --git a/src/Interpreters/parseColumnsListForTableFunction.h b/src/Interpreters/parseColumnsListForTableFunction.h
index ef1bbe5498e..ffb59bfa457 100644
--- a/src/Interpreters/parseColumnsListForTableFunction.h
+++ b/src/Interpreters/parseColumnsListForTableFunction.h
@@ -18,12 +18,18 @@ struct DataTypeValidationSettings
         : allow_suspicious_low_cardinality_types(settings.allow_suspicious_low_cardinality_types)
         , allow_experimental_object_type(settings.allow_experimental_object_type)
         , allow_suspicious_fixed_string_types(settings.allow_suspicious_fixed_string_types)
+        , allow_experimental_variant_type(settings.allow_experimental_variant_type)
+        , allow_suspicious_variant_types(settings.allow_suspicious_variant_types)
+        , validate_nested_types(settings.validate_experimental_and_suspicious_types_inside_nested_types)
     {
     }
 
     bool allow_suspicious_low_cardinality_types = true;
     bool allow_experimental_object_type = true;
     bool allow_suspicious_fixed_string_types = true;
+    bool allow_experimental_variant_type = true;
+    bool allow_suspicious_variant_types = true;
+    bool validate_nested_types = true;
 };
 
 void validateDataType(const DataTypePtr & type, const DataTypeValidationSettings & settings);
diff --git a/src/Interpreters/processColumnTransformers.cpp b/src/Interpreters/processColumnTransformers.cpp
index 2a704d4a937..5ef331eb119 100644
--- a/src/Interpreters/processColumnTransformers.cpp
+++ b/src/Interpreters/processColumnTransformers.cpp
@@ -32,7 +32,7 @@ ASTPtr processColumnTransformers(
 
     tables_with_columns[0].addHiddenColumns(columns.getMaterialized());
     tables_with_columns[0].addHiddenColumns(columns.getAliases());
-    tables_with_columns[0].addHiddenColumns(table->getVirtuals());
+    tables_with_columns[0].addHiddenColumns(table->getVirtualsList());
 
     NameSet source_columns_set;
     for (const auto & identifier : query_columns->children)
diff --git a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
index f8df03ed830..44167fe7242 100644
--- a/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
+++ b/src/Interpreters/removeOnClusterClauseIfNeeded.cpp
@@ -52,7 +52,7 @@ ASTPtr removeOnClusterClauseIfNeeded(const ASTPtr & query, ContextPtr context, c
             && context->getSettings().ignore_on_cluster_for_replicated_access_entities_queries
             && context->getAccessControl().containsStorage(ReplicatedAccessStorage::STORAGE_TYPE)))
     {
-        LOG_DEBUG(&Poco::Logger::get("removeOnClusterClauseIfNeeded"), "ON CLUSTER clause was ignored for query {}", query->getID());
+        LOG_DEBUG(getLogger("removeOnClusterClauseIfNeeded"), "ON CLUSTER clause was ignored for query {}", query->getID());
         return query_on_cluster->getRewrittenASTWithoutOnCluster(params);
     }
 
diff --git a/src/Interpreters/replaceForPositionalArguments.cpp b/src/Interpreters/replaceForPositionalArguments.cpp
index 241dd7cf92c..cceb0650fcd 100644
--- a/src/Interpreters/replaceForPositionalArguments.cpp
+++ b/src/Interpreters/replaceForPositionalArguments.cpp
@@ -10,7 +10,8 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int BAD_ARGUMENTS;
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
 }
 
 bool replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * select_query, ASTSelectQuery::Expression expression)
@@ -27,14 +28,38 @@ bool replaceForPositionalArguments(ASTPtr & argument, const ASTSelectQuery * sel
         return false;
 
     auto which = ast_literal->value.getType();
-    if (which != Field::Types::UInt64)
+    if (which != Field::Types::UInt64 && which != Field::Types::Int64)
         return false;
 
-    auto pos = ast_literal->value.get<UInt64>();
+    UInt64 pos;
+
+    if (which == Field::Types::UInt64)
+    {
+        pos = ast_literal->value.get<UInt64>();
+    }
+    else if (which == Field::Types::Int64)
+    {
+        auto value = ast_literal->value.get<Int64>();
+        if (value > 0)
+            pos = value;
+        else
+        {
+            if (static_cast<size_t>(std::abs(value)) > columns.size())
+                throw Exception(
+                    ErrorCodes::BAD_ARGUMENTS,
+                    "Negative positional argument number {} is out of bounds. Expected in range [-{}, -1]",
+                    value,
+                    columns.size());
+            pos = columns.size() + value + 1;
+        }
+    }
+    else
+    {
+        return false;
+    }
+
     if (!pos || pos > columns.size())
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
-                "Positional argument out of bounds: {} (expected in range [1, {}]",
-                        pos, columns.size());
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Positional argument out of bounds: {} (expected in range [1, {}]", pos, columns.size());
 
     const auto & column = columns[--pos];
     if (typeid_cast<const ASTIdentifier *>(column.get()) || typeid_cast<const ASTLiteral *>(column.get()))
diff --git a/src/Interpreters/tests/gtest_comparison_graph.cpp b/src/Interpreters/tests/gtest_comparison_graph.cpp
index 96a78241c8e..ac24a8de368 100644
--- a/src/Interpreters/tests/gtest_comparison_graph.cpp
+++ b/src/Interpreters/tests/gtest_comparison_graph.cpp
@@ -12,7 +12,7 @@ using namespace DB;
 static ComparisonGraph<ASTPtr> getGraph(const String & query)
 {
     ParserExpressionList parser(false);
-    ASTPtr ast = parseQuery(parser, query, 0, 0);
+    ASTPtr ast = parseQuery(parser, query, 0, 0, 0);
     return ComparisonGraph<ASTPtr>(ast->children);
 }
 
diff --git a/src/Interpreters/tests/gtest_convertFieldToType.cpp b/src/Interpreters/tests/gtest_convertFieldToType.cpp
index cda9311dcbe..ea1c5c43a25 100644
--- a/src/Interpreters/tests/gtest_convertFieldToType.cpp
+++ b/src/Interpreters/tests/gtest_convertFieldToType.cpp
@@ -74,9 +74,9 @@ INSTANTIATE_TEST_SUITE_P(
         // Max value of Date
         {
             "Date",
-            Field(std::numeric_limits<DB::UInt16>::max()),
+            Field(std::numeric_limits<UInt16>::max()),
             "DateTime64(0, 'UTC')",
-            DecimalField(DateTime64(std::numeric_limits<DB::UInt16>::max() * Day), 0)
+            DecimalField(DateTime64(std::numeric_limits<UInt16>::max() * Day), 0)
         },
         // check that scale is respected
         {
diff --git a/src/Interpreters/tests/gtest_cycle_aliases.cpp b/src/Interpreters/tests/gtest_cycle_aliases.cpp
index 2bdeac90f8f..5ff3fbe1c2d 100644
--- a/src/Interpreters/tests/gtest_cycle_aliases.cpp
+++ b/src/Interpreters/tests/gtest_cycle_aliases.cpp
@@ -14,10 +14,10 @@ TEST(QueryNormalizer, SimpleLoopAlias)
 {
     String query = "a as a";
     ParserExpressionList parser(false);
-    ASTPtr ast = parseQuery(parser, query, 0, 0);
+    ASTPtr ast = parseQuery(parser, query, 0, 0, 0);
 
     Aliases aliases;
-    aliases["a"] = parseQuery(parser, "a as a", 0, 0)->children[0];
+    aliases["a"] = parseQuery(parser, "a as a", 0, 0, 0)->children[0];
 
     Settings settings;
     QueryNormalizer::Data normalizer_data(aliases, {}, false, settings, false);
@@ -28,11 +28,11 @@ TEST(QueryNormalizer, SimpleCycleAlias)
 {
     String query = "a as b, b as a";
     ParserExpressionList parser(false);
-    ASTPtr ast = parseQuery(parser, query, 0, 0);
+    ASTPtr ast = parseQuery(parser, query, 0, 0, 0);
 
     Aliases aliases;
-    aliases["a"] = parseQuery(parser, "b as a", 0, 0)->children[0];
-    aliases["b"] = parseQuery(parser, "a as b", 0, 0)->children[0];
+    aliases["a"] = parseQuery(parser, "b as a", 0, 0, 0)->children[0];
+    aliases["b"] = parseQuery(parser, "a as b", 0, 0, 0)->children[0];
 
     Settings settings;
     QueryNormalizer::Data normalizer_data(aliases, {}, false, settings, true);
diff --git a/src/Interpreters/tests/gtest_filecache.cpp b/src/Interpreters/tests/gtest_filecache.cpp
index 3e061db4f56..41191ba1605 100644
--- a/src/Interpreters/tests/gtest_filecache.cpp
+++ b/src/Interpreters/tests/gtest_filecache.cpp
@@ -1,14 +1,11 @@
 #include <gtest/gtest.h>
 
 #include <filesystem>
-#include <iomanip>
 #include <iostream>
 
 
 #include <algorithm>
 #include <numeric>
-#include <random>
-#include <memory>
 #include <thread>
 
 #include <Common/iota.h>
@@ -49,6 +46,11 @@ using namespace DB;
 
 static constexpr auto TEST_LOG_LEVEL = "debug";
 
+namespace DB::ErrorCodes
+{
+    extern const int FILECACHE_ACCESS_DENIED;
+}
+
 void printRanges(const auto & segments)
 {
     std::cerr << "\nHaving file segments: ";
@@ -86,6 +88,7 @@ using HolderPtr = FileSegmentsHolderPtr;
 fs::path caches_dir = fs::current_path() / "lru_cache_test";
 std::string cache_base_path = caches_dir / "cache1" / "";
 std::string cache_base_path2 = caches_dir / "cache2" / "";
+std::string cache_base_path3 = caches_dir / "cache3" / "";
 
 
 void assertEqual(const FileSegmentsHolderPtr & file_segments, const Ranges & expected_ranges, const States & expected_states = {})
@@ -147,6 +150,18 @@ void assertEqual(const std::vector<FileSegment::Info> & file_segments, const Ran
     }
 }
 
+void assertEqual(const IFileCachePriority::PriorityDumpPtr & dump, const Ranges & expected_ranges, const States & expected_states = {})
+{
+    if (const auto * lru = dynamic_cast<const LRUFileCachePriority::LRUPriorityDump *>(dump.get()))
+    {
+        assertEqual(lru->infos, expected_ranges, expected_states);
+    }
+    else
+    {
+        ASSERT_TRUE(false);
+    }
+}
+
 void assertProtectedOrProbationary(const std::vector<FileSegmentInfo> & file_segments, const Ranges & expected, bool assert_protected)
 {
     std::cerr << "\nFile segments: ";
@@ -190,6 +205,30 @@ void assertProbationary(const std::vector<FileSegmentInfo> & file_segments, cons
     assertProtectedOrProbationary(file_segments, expected, false);
 }
 
+void assertProtected(const IFileCachePriority::PriorityDumpPtr & dump, const Ranges & expected)
+{
+    if (const auto * lru = dynamic_cast<const LRUFileCachePriority::LRUPriorityDump *>(dump.get()))
+    {
+        assertProtected(lru->infos, expected);
+    }
+    else
+    {
+        ASSERT_TRUE(false);
+    }
+}
+
+void assertProbationary(const IFileCachePriority::PriorityDumpPtr & dump, const Ranges & expected)
+{
+    if (const auto * lru = dynamic_cast<const LRUFileCachePriority::LRUPriorityDump *>(dump.get()))
+    {
+        assertProbationary(lru->infos, expected);
+    }
+    else
+    {
+        ASSERT_TRUE(false);
+    }
+}
+
 FileSegment & get(const HolderPtr & holder, int i)
 {
     auto it = std::next(holder->begin(), i);
@@ -206,7 +245,7 @@ void download(FileSegment & file_segment)
     ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
     ASSERT_EQ(file_segment.getDownloadedSize(), 0);
 
-    ASSERT_TRUE(file_segment.reserve(file_segment.range().size()));
+    ASSERT_TRUE(file_segment.reserve(file_segment.range().size(), 1000));
     download(cache_base_path, file_segment);
     ASSERT_EQ(file_segment.state(), State::DOWNLOADING);
 
@@ -218,7 +257,7 @@ void assertDownloadFails(FileSegment & file_segment)
 {
     ASSERT_EQ(file_segment.getOrSetDownloader(), FileSegment::getCallerId());
     ASSERT_EQ(file_segment.getDownloadedSize(), 0);
-    ASSERT_FALSE(file_segment.reserve(file_segment.range().size()));
+    ASSERT_FALSE(file_segment.reserve(file_segment.range().size(), 1000));
     file_segment.complete();
 }
 
@@ -320,14 +359,20 @@ TEST_F(FileCacheTest, LRUPolicy)
 
     const size_t file_size = INT_MAX; // the value doesn't really matter because boundary_alignment == 1.
 
+    const auto user = FileCache::getCommonUser();
     {
         std::cerr << "Step 1\n";
         auto cache = DB::FileCache("1", settings);
         cache.initialize();
-        auto key = cache.createKeyForPath("key1");
+        auto key = DB::FileCache::createKeyForPath("key1");
+
+        auto get_or_set = [&](size_t offset, size_t size)
+        {
+            return cache.getOrSet(key, offset, size, file_size, {}, 0, user);
+        };
 
         {
-            auto holder = cache.getOrSet(key, 0, 10, file_size, {}); /// Add range [0, 9]
+            auto holder = get_or_set(0, 10); /// Add range [0, 9]
             assertEqual(holder, { Range(0, 9) }, { State::EMPTY });
             download(holder->front());
             assertEqual(holder, { Range(0, 9) }, { State::DOWNLOADED });
@@ -337,7 +382,7 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [__________]
         ///                   ^          ^
         ///                   0          9
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { Range(0, 9) });
         assertEqual(cache.dumpQueue(), { Range(0, 9) });
         ASSERT_EQ(cache.getFileSegmentsNum(), 1);
         ASSERT_EQ(cache.getUsedCacheSize(), 10);
@@ -346,7 +391,7 @@ TEST_F(FileCacheTest, LRUPolicy)
 
         {
             /// 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, file_size, {});
+            auto holder = get_or_set(5, 10);
             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 });
@@ -356,7 +401,7 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [__________][_____]
         ///                   ^          ^^     ^
         ///                   0          910    14
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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);
@@ -365,23 +410,23 @@ TEST_F(FileCacheTest, LRUPolicy)
 
         /// Get [9, 9]
         {
-            auto holder = cache.getOrSet(key, 9, 1, file_size, {});
+            auto holder = get_or_set(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, file_size, {}), {Range(0, 9), Range(10, 14)}, {State::DOWNLOADED, State::DOWNLOADED});
+        assertEqual(get_or_set(9, 2), {Range(0, 9), Range(10, 14)}, {State::DOWNLOADED, State::DOWNLOADED});
 
         /// Get [10, 10]
         {
-            auto holder = cache.getOrSet(key, 10, 1, file_size, {});
+            auto holder = get_or_set(10, 1);
             assertEqual(holder, { Range(10, 14) }, { State::DOWNLOADED });
             increasePriority(holder);
         }
 
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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);
@@ -389,19 +434,19 @@ TEST_F(FileCacheTest, LRUPolicy)
         std::cerr << "Step 4\n";
 
         {
-            auto holder = cache.getOrSet(key, 17, 4, file_size, {});
+            auto holder = get_or_set(17, 4);
             download(holder); /// Get [17, 20]
             increasePriority(holder);
         }
 
         {
-            auto holder = cache.getOrSet(key, 24, 3, file_size, {});
+            auto holder = get_or_set(24, 3);
             download(holder); /// Get [24, 26]
             increasePriority(holder);
         }
 
         {
-            auto holder = cache.getOrSet(key, 27, 1, file_size, {});
+            auto holder = get_or_set(27, 1);
             download(holder); /// Get [27, 27]
             increasePriority(holder);
         }
@@ -410,14 +455,14 @@ TEST_F(FileCacheTest, LRUPolicy)
         ///                   ^          ^^     ^   ^    ^    ^   ^^^
         ///                   0          910    14  17   20   24  2627
         ///
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14), Range(17, 20), Range(24, 26), Range(27, 27) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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, file_size, {}); /// Get [0, 25]
+            auto holder = get_or_set(0, 26);
             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 });
@@ -434,12 +479,12 @@ TEST_F(FileCacheTest, LRUPolicy)
             /// 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, file_size, {});
+            auto holder2 = get_or_set(27, 1);
             assertEqual(holder2, { Range(27, 27) }, { State::EMPTY });
             assertDownloadFails(holder2->front());
             assertEqual(holder2, { Range(27, 27) }, { State::DETACHED });
 
-            auto holder3 = cache.getOrSet(key, 28, 3, file_size, {});
+            auto holder3 = get_or_set(28, 3);
             assertEqual(holder3, { Range(28, 30) }, { State::EMPTY });
             assertDownloadFails(holder3->front());
             assertEqual(holder3, { Range(28, 30) }, { State::DETACHED });
@@ -453,7 +498,7 @@ TEST_F(FileCacheTest, LRUPolicy)
         ///                   ^                            ^    ^
         ///                   0                            20   24
         ///
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14), Range(15, 16), Range(17, 20), Range(24, 26) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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);
@@ -461,7 +506,7 @@ TEST_F(FileCacheTest, LRUPolicy)
         std::cerr << "Step 6\n";
 
         {
-            auto holder = cache.getOrSet(key, 12, 10, file_size, {}); /// Get [12, 21]
+            auto holder = get_or_set(12, 10);
             assertEqual(holder,
                         { Range(10, 14),     Range(15, 16),     Range(17, 20),     Range(21, 21) },
                         { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADED, State::EMPTY });
@@ -475,14 +520,14 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [_____][__][____][_]   [___]
         ///                   ^          ^       ^   ^   ^
         ///                   10         17      21  24  26
-        assertEqual(cache.getFileSegmentInfos(key), { Range(10, 14), Range(15, 16), Range(17, 20), Range(21, 21), Range(24, 26) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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, file_size, {}); /// Get [23, 27]
+            auto holder = get_or_set(23, 5);
             assertEqual(holder,
                         { Range(23, 23), Range(24, 26),     Range(27, 27) },
                         { State::EMPTY,  State::DOWNLOADED, State::EMPTY });
@@ -494,32 +539,32 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [____][_]  [][___][__]
         ///                   ^       ^  ^^^   ^^  ^
         ///                   17      21 2324  26  27
-        assertEqual(cache.getFileSegmentInfos(key), { Range(17, 20), Range(21, 21), Range(23, 23), Range(24, 26), Range(27, 27) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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, file_size, {}); /// Get [2, 4]
+            auto holder = get_or_set(2, 3); /// Get [2, 4]
             assertEqual(holder, { Range(2, 4) }, { State::EMPTY });
 
-            auto holder2 = cache.getOrSet(key, 30, 2, file_size, {}); /// Get [30, 31]
+            auto holder2 = get_or_set(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, file_size, {}); /// Get [23, 23]
+            auto holder3 = get_or_set(23, 1); /// Get [23, 23]
             assertEqual(holder3, { Range(23, 23) }, { State::DOWNLOADED });
 
-            auto holder4 = cache.getOrSet(key, 24, 3, file_size, {}); /// Get [24, 26]
+            auto holder4 = get_or_set(24, 3); /// Get [24, 26]
             assertEqual(holder4, { Range(24, 26) }, { State::DOWNLOADED });
 
-            auto holder5 = cache.getOrSet(key, 27, 1, file_size, {}); /// Get [27, 27]
+            auto holder5 = get_or_set(27, 1); /// Get [27, 27]
             assertEqual(holder5, { Range(27, 27) }, { State::DOWNLOADED });
 
-            auto holder6 = cache.getOrSet(key, 0, 40, file_size, {});
+            auto holder6 = get_or_set(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 });
@@ -540,21 +585,21 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [___]       [_][___][_]   [__]
         ///                   ^   ^       ^  ^   ^  ^   ^  ^
         ///                   2   4       23 24  26 27  30 31
-        assertEqual(cache.getFileSegmentInfos(key), { Range(2, 4), Range(23, 23), Range(24, 26), Range(27, 27), Range(30, 31) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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, file_size, {});
+            auto holder = get_or_set(2, 3);
             assertEqual(holder, { Range(2, 4) }, { State::DOWNLOADED });
             increasePriority(holder);
         }
 
 
         {
-            auto holder = cache.getOrSet(key, 25, 5, file_size, {}); /// Get [25, 29]
+            auto holder = get_or_set(25, 5); /// Get [25, 29]
             assertEqual(holder,
                         { Range(24, 26),     Range(27, 27),     Range(28, 29) },
                         { State::DOWNLOADED, State::DOWNLOADED, State::EMPTY });
@@ -576,7 +621,7 @@ TEST_F(FileCacheTest, LRUPolicy)
                 chassert(&DB::CurrentThread::get() == &thread_status_1);
                 DB::CurrentThread::QueryScope query_scope_holder_1(query_context_1);
 
-                auto holder2 = cache.getOrSet(key, 25, 5, file_size, {}); /// Get [25, 29] once again.
+                auto holder2 = get_or_set(25, 5); /// Get [25, 29] once again.
                 assertEqual(holder2,
                             { Range(24, 26),     Range(27, 27),     Range(28, 29) },
                             { State::DOWNLOADED, State::DOWNLOADED, State::DOWNLOADING });
@@ -611,7 +656,7 @@ TEST_F(FileCacheTest, LRUPolicy)
         /// Current cache:    [___]       [___][_][__][__]
         ///                   ^   ^       ^   ^  ^^  ^^  ^
         ///                   2   4       24  26 27  2930 31
-        assertEqual(cache.getFileSegmentInfos(key), { Range(2, 4), Range(24, 26), Range(27, 27), Range(28, 29), Range(30, 31) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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";
@@ -620,7 +665,7 @@ TEST_F(FileCacheTest, LRUPolicy)
             /// state is changed not manually via segment->completeWithState(state) but from destructor of holder
             /// and notify_all() is also called from destructor of holder.
 
-            auto holder = cache.getOrSet(key, 3, 23, file_size, {}); /// Get [3, 25]
+            auto holder = get_or_set(3, 23); /// Get [3, 25]
             assertEqual(holder,
                         { Range(2, 4),       Range(5, 23), Range(24, 26) },
                         { State::DOWNLOADED, State::EMPTY, State::DOWNLOADED });
@@ -642,7 +687,7 @@ TEST_F(FileCacheTest, LRUPolicy)
                 chassert(&DB::CurrentThread::get() == &thread_status_1);
                 DB::CurrentThread::QueryScope query_scope_holder_1(query_context_1);
 
-                auto holder2 = cache.getOrSet(key, 3, 23, file_size, {}); /// Get [3, 25] once again
+                auto holder2 = get_or_set(3, 23); /// get [3, 25] once again.
                 assertEqual(holder,
                             { Range(2, 4),       Range(5, 23),       Range(24, 26) },
                             { State::DOWNLOADED, State::DOWNLOADING, State::DOWNLOADED });
@@ -683,11 +728,11 @@ TEST_F(FileCacheTest, LRUPolicy)
 
         auto cache2 = DB::FileCache("2", settings);
         cache2.initialize();
-        auto key = cache2.createKeyForPath("key1");
+        auto key = DB::FileCache::createKeyForPath("key1");
 
         /// Get [2, 29]
         assertEqual(
-            cache2.getOrSet(key, 2, 28, file_size, {}),
+            cache2.getOrSet(key, 2, 28, file_size, {}, 0, user),
             {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});
     }
@@ -702,11 +747,11 @@ TEST_F(FileCacheTest, LRUPolicy)
         fs::create_directories(settings2.base_path);
         auto cache2 = DB::FileCache("3", settings2);
         cache2.initialize();
-        auto key = cache2.createKeyForPath("key1");
+        auto key = DB::FileCache::createKeyForPath("key1");
 
         /// Get [0, 24]
         assertEqual(
-            cache2.getOrSet(key, 0, 25, file_size, {}),
+            cache2.getOrSet(key, 0, 25, file_size, {}, 0, user),
             {Range(0, 9), Range(10, 19), Range(20, 24)},
             {State::EMPTY, State::EMPTY, State::EMPTY});
     }
@@ -717,22 +762,22 @@ TEST_F(FileCacheTest, LRUPolicy)
 
         auto cache = FileCache("4", settings);
         cache.initialize();
-        const auto key = cache.createKeyForPath("key10");
-        const auto key_path = cache.getPathInLocalCache(key);
+        const auto key = FileCache::createKeyForPath("key10");
+        const auto key_path = cache.getKeyPath(key, user);
 
-        cache.removeAllReleasable();
+        cache.removeAllReleasable(user.user_id);
         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, file_size, {}));
+        download(cache.getOrSet(key, 0, 10, file_size, {}, 0, user));
         ASSERT_EQ(cache.getUsedCacheSize(), 10);
-        ASSERT_TRUE(fs::exists(cache.getPathInLocalCache(key, 0, FileSegmentKind::Regular)));
+        ASSERT_TRUE(fs::exists(cache.getFileSegmentPath(key, 0, FileSegmentKind::Regular, user)));
 
-        cache.removeAllReleasable();
+        cache.removeAllReleasable(user.user_id);
         ASSERT_EQ(cache.getUsedCacheSize(), 0);
         ASSERT_TRUE(!fs::exists(key_path));
-        ASSERT_TRUE(!fs::exists(cache.getPathInLocalCache(key, 0, FileSegmentKind::Regular)));
+        ASSERT_TRUE(!fs::exists(cache.getFileSegmentPath(key, 0, FileSegmentKind::Regular, user)));
     }
 
     std::cerr << "Step 14\n";
@@ -741,19 +786,19 @@ TEST_F(FileCacheTest, LRUPolicy)
 
         auto cache = DB::FileCache("5", settings);
         cache.initialize();
-        const auto key = cache.createKeyForPath("key10");
-        const auto key_path = cache.getPathInLocalCache(key);
+        const auto key = FileCache::createKeyForPath("key10");
+        const auto key_path = cache.getKeyPath(key, user);
 
-        cache.removeAllReleasable();
+        cache.removeAllReleasable(user.user_id);
         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, file_size, {}));
+        download(cache.getOrSet(key, 0, 10, file_size, {}, 0, user));
         ASSERT_EQ(cache.getUsedCacheSize(), 10);
         ASSERT_TRUE(fs::exists(key_path));
 
-        cache.removeAllReleasable();
+        cache.removeAllReleasable(user.user_id);
         ASSERT_EQ(cache.getUsedCacheSize(), 0);
         sleepForSeconds(2);
         ASSERT_TRUE(!fs::exists(key_path));
@@ -770,17 +815,18 @@ TEST_F(FileCacheTest, writeBuffer)
 
     FileCache cache("6", settings);
     cache.initialize();
+    const auto user = FileCache::getCommonUser();
 
-    auto write_to_cache = [&cache, this](const String & key, const Strings & data, bool flush, ReadBufferPtr * out_read_buffer = nullptr)
+    auto write_to_cache = [&, this](const String & key, const Strings & data, bool flush, ReadBufferPtr * out_read_buffer = nullptr)
     {
         CreateFileSegmentSettings segment_settings;
         segment_settings.kind = FileSegmentKind::Temporary;
         segment_settings.unbounded = true;
 
-        auto cache_key = cache.createKeyForPath(key);
-        auto holder = cache.set(cache_key, 0, 3, segment_settings);
+        auto cache_key = FileCache::createKeyForPath(key);
+        auto holder = cache.set(cache_key, 0, 3, segment_settings, user);
         /// The same is done in TemporaryDataOnDisk::createStreamToCacheFile.
-        std::filesystem::create_directories(cache.getPathInLocalCache(cache_key));
+        std::filesystem::create_directories(cache.getKeyPath(cache_key, user));
         EXPECT_EQ(holder->size(), 1);
         auto & segment = holder->front();
         WriteBufferToFileSegment out(&segment);
@@ -818,7 +864,7 @@ TEST_F(FileCacheTest, writeBuffer)
     std::vector<fs::path> file_segment_paths;
     {
         auto holder = write_to_cache("key1", {"abc", "defg"}, false);
-        file_segment_paths.emplace_back(holder->front().getPathInLocalCache());
+        file_segment_paths.emplace_back(holder->front().getPath());
 
         ASSERT_EQ(fs::file_size(file_segment_paths.back()), 7);
         EXPECT_EQ(holder->front().range().size(), 7);
@@ -829,7 +875,7 @@ TEST_F(FileCacheTest, writeBuffer)
             ReadBufferPtr reader = nullptr;
 
             auto holder2 = write_to_cache("key2", {"22", "333", "4444", "55555", "1"}, true, &reader);
-            file_segment_paths.emplace_back(holder2->front().getPathInLocalCache());
+            file_segment_paths.emplace_back(holder2->front().getPath());
 
             std::cerr << "\nFile segments: " << holder2->toString() << "\n";
 
@@ -900,16 +946,17 @@ TEST_F(FileCacheTest, temporaryData)
     DB::FileCache file_cache("7", settings);
     file_cache.initialize();
 
-    auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(nullptr, &file_cache, 0);
+    const auto user = FileCache::getCommonUser();
+    auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(nullptr, &file_cache, TemporaryDataOnDiskSettings{});
 
-    auto some_data_holder = file_cache.getOrSet(file_cache.createKeyForPath("some_data"), 0, 5_KiB, 5_KiB, CreateFileSegmentSettings{});
+    auto some_data_holder = file_cache.getOrSet(FileCache::createKeyForPath("some_data"), 0, 5_KiB, 5_KiB, CreateFileSegmentSettings{}, 0, user);
 
     {
         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()));
+            ASSERT_TRUE(segment->reserve(segment->range().size(), 1000));
             download(*segment);
             segment->complete();
         }
@@ -1041,10 +1088,11 @@ TEST_F(FileCacheTest, CachedReadBuffer)
     auto cache = std::make_shared<DB::FileCache>("8", settings);
     cache->initialize();
     auto key = cache->createKeyForPath(file_path);
+    const auto user = FileCache::getCommonUser();
 
     {
         auto cached_buffer = std::make_shared<CachedOnDiskReadBufferFromFile>(
-            file_path, key, cache, read_buffer_creator, read_settings, "test", s.size(), false, false, std::nullopt, nullptr);
+            file_path, key, cache, user, read_buffer_creator, read_settings, "test", s.size(), false, false, std::nullopt, nullptr);
 
         WriteBufferFromOwnString result;
         copyData(*cached_buffer, result);
@@ -1059,7 +1107,7 @@ TEST_F(FileCacheTest, CachedReadBuffer)
         modified_settings.remote_fs_buffer_size = 10;
 
         auto cached_buffer = std::make_shared<CachedOnDiskReadBufferFromFile>(
-            file_path, key, cache, read_buffer_creator, modified_settings, "test", s.size(), false, false, std::nullopt, nullptr);
+            file_path, key, cache, user, read_buffer_creator, modified_settings, "test", s.size(), false, false, std::nullopt, nullptr);
 
         cached_buffer->next();
         assertEqual(cache->dumpQueue(), {Range(10, 14), Range(15, 19), Range(20, 24), Range(25, 29), Range(0, 4), Range(5, 9)});
@@ -1082,7 +1130,7 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
         DB::FileCache file_cache("cache", settings);
         file_cache.initialize();
 
-        auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(/*volume=*/nullptr, &file_cache, /*limit=*/0);
+        auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(/*volume=*/nullptr, &file_cache, /*settings=*/TemporaryDataOnDiskSettings{});
 
         auto tmp_data = std::make_unique<TemporaryDataOnDisk>(tmp_data_scope);
 
@@ -1104,7 +1152,7 @@ TEST_F(FileCacheTest, TemporaryDataReadBufferSize)
         disk = createDisk("temporary_data_read_buffer_size_test_dir");
         VolumePtr volume = std::make_shared<SingleDiskVolume>("volume", disk);
 
-        auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(/*volume=*/volume, /*cache=*/nullptr, /*limit=*/0);
+        auto tmp_data_scope = std::make_shared<TemporaryDataOnDiskScope>(/*volume=*/volume, /*cache=*/nullptr, /*settings=*/TemporaryDataOnDiskSettings{});
 
         auto tmp_data = std::make_unique<TemporaryDataOnDisk>(tmp_data_scope);
 
@@ -1146,17 +1194,18 @@ TEST_F(FileCacheTest, SLRUPolicy)
 
     const size_t file_size = -1; // the value doesn't really matter because boundary_alignment == 1.
     size_t file_cache_name = 0;
+    const auto user = FileCache::getCommonUser();
 
     {
         auto cache = DB::FileCache(std::to_string(++file_cache_name), settings);
         cache.initialize();
-        auto key = cache.createKeyForPath("key1");
+        auto key = FileCache::createKeyForPath("key1");
 
         auto add_range = [&](size_t offset, size_t size)
         {
             std::cerr << "Add [" << offset << ", " << offset + size - 1 << "]" << std::endl;
 
-            auto holder = cache.getOrSet(key, offset, size, file_size, {});
+            auto holder = cache.getOrSet(key, offset, size, file_size, {}, 0, user);
             assertEqual(holder, { Range(offset, offset + size - 1) }, { State::EMPTY });
             download(holder->front());
             assertEqual(holder, { Range(offset, offset + size - 1) }, { State::DOWNLOADED });
@@ -1164,7 +1213,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
 
         auto check_covering_range = [&](size_t offset, size_t size, Ranges covering_ranges)
         {
-            auto holder = cache.getOrSet(key, offset, size, file_size, {});
+            auto holder = cache.getOrSet(key, offset, size, file_size, {}, 0, user);
             std::vector<State> states(covering_ranges.size(), State::DOWNLOADED);
             assertEqual(holder, covering_ranges, states);
             increasePriority(holder);
@@ -1173,7 +1222,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
         add_range(0, 10);
         add_range(10, 5);
 
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { Range(0, 9), Range(10, 14) });
         assertEqual(cache.dumpQueue(), { Range(0, 9), Range(10, 14) });
 
         ASSERT_EQ(cache.getFileSegmentsNum(), 2);
@@ -1203,7 +1252,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
         assertProbationary(cache.dumpQueue(), { Range(17, 20), Range(24, 26), Range(27, 27) });
         assertProtected(cache.dumpQueue(), { Range(0, 9), Range(10, 14) });
 
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14), Range(17, 20), Range(24, 26), Range(27, 27) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { 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);
 
@@ -1223,7 +1272,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
         assertProbationary(cache.dumpQueue(), { Range(24, 26), Range(10, 14) });
         assertProtected(cache.dumpQueue(), { Range(0, 9), Range(27, 27), Range(28, 30) });
 
-        assertEqual(cache.getFileSegmentInfos(key), { Range(0, 9), Range(10, 14), Range(24, 26), Range(27, 27), Range(28, 30) });
+        assertEqual(cache.getFileSegmentInfos(key, user.user_id), { Range(0, 9), Range(10, 14), Range(24, 26), Range(27, 27), Range(28, 30) });
         ASSERT_EQ(cache.getFileSegmentsNum(), 5);
         ASSERT_EQ(cache.getUsedCacheSize(), 22);
     }
@@ -1263,7 +1312,7 @@ TEST_F(FileCacheTest, SLRUPolicy)
             };
 
             auto cached_buffer = std::make_shared<CachedOnDiskReadBufferFromFile>(
-                file, key, cache, read_buffer_creator, read_settings, "test", expect_result.size(), false, false, std::nullopt, nullptr);
+                file, key, cache, user, read_buffer_creator, read_settings, "test", expect_result.size(), false, false, std::nullopt, nullptr);
 
             WriteBufferFromOwnString result;
             copyData(*cached_buffer, result);
@@ -1295,11 +1344,12 @@ TEST_F(FileCacheTest, SLRUPolicy)
         auto dump = cache->dumpQueue();
         assertEqual(dump, { Range(0, 4), Range(5, 9), Range(0, 4), Range(5, 9), Range(10, 14) });
 
-        ASSERT_EQ(dump[0].key, key2);
-        ASSERT_EQ(dump[1].key, key2);
-        ASSERT_EQ(dump[2].key, key1);
-        ASSERT_EQ(dump[3].key, key1);
-        ASSERT_EQ(dump[4].key, key1);
+        const auto & infos = dynamic_cast<const LRUFileCachePriority::LRUPriorityDump *>(dump.get())->infos;
+        ASSERT_EQ(infos[0].key, key2);
+        ASSERT_EQ(infos[1].key, key2);
+        ASSERT_EQ(infos[2].key, key1);
+        ASSERT_EQ(infos[3].key, key1);
+        ASSERT_EQ(infos[4].key, key1);
 
         assertProbationary(cache->dumpQueue(), { Range(0, 4), Range(5, 9) });
         assertProtected(cache->dumpQueue(), { Range(0, 4), Range(5, 9), Range(10, 14) });
@@ -1309,11 +1359,12 @@ TEST_F(FileCacheTest, SLRUPolicy)
         dump = cache->dumpQueue();
         assertEqual(dump, { Range(0, 4), Range(5, 9), Range(10, 14), Range(0, 4), Range(5, 9)  });
 
-        ASSERT_EQ(dump[0].key, key1);
-        ASSERT_EQ(dump[1].key, key1);
-        ASSERT_EQ(dump[2].key, key1);
-        ASSERT_EQ(dump[3].key, key2);
-        ASSERT_EQ(dump[4].key, key2);
+        const auto & infos2 = dynamic_cast<const LRUFileCachePriority::LRUPriorityDump *>(dump.get())->infos;
+        ASSERT_EQ(infos2[0].key, key1);
+        ASSERT_EQ(infos2[1].key, key1);
+        ASSERT_EQ(infos2[2].key, key1);
+        ASSERT_EQ(infos2[3].key, key2);
+        ASSERT_EQ(infos2[4].key, key2);
 
         assertProbationary(cache->dumpQueue(), { Range(0, 4), Range(5, 9) });
         assertProtected(cache->dumpQueue(), { Range(10, 14), Range(0, 4), Range(5, 9)  });
diff --git a/src/Interpreters/tests/gtest_page_cache.cpp b/src/Interpreters/tests/gtest_page_cache.cpp
new file mode 100644
index 00000000000..30fa3b921c9
--- /dev/null
+++ b/src/Interpreters/tests/gtest_page_cache.cpp
@@ -0,0 +1,269 @@
+#include <Common/CurrentThread.h>
+#include <Common/PageCache.h>
+
+#include <gtest/gtest.h>
+#include <thread>
+
+#ifdef OS_LINUX
+#include <sys/sysinfo.h>
+#endif
+
+using namespace DB;
+
+namespace ProfileEvents
+{
+    extern const Event PageCacheChunkMisses;
+    extern const Event PageCacheChunkShared;
+    extern const Event PageCacheChunkDataHits;
+    extern const Event PageCacheChunkDataPartialHits;
+    extern const Event PageCacheChunkDataMisses;
+}
+
+#define CHECK(x)                                                                           \
+    do {                                                                                   \
+    if (!(x))                                                                              \
+        {                                                                                  \
+            std::cerr << "check on line " << __LINE__ << " failed: " << #x << std::endl;   \
+            std::abort();                                                                  \
+        }                                                                                  \
+    } while (false)
+
+size_t estimateRAMSize()
+{
+#ifdef OS_LINUX
+    struct sysinfo info;
+    int r = sysinfo(&info);
+    CHECK(r == 0);
+    return static_cast<size_t>(info.totalram * info.mem_unit);
+#else
+    return 128ul << 30;
+#endif
+}
+
+/// Do random reads and writes in PageCache from multiple threads, check that the data read matches the data written.
+TEST(PageCache, DISABLED_Stress)
+{
+    /// There doesn't seem to be a reasonable way to simulate memory pressure or force the eviction of MADV_FREE-d pages.
+    /// So we actually map more virtual memory than we have RAM and fill it all up a few times.
+    /// This takes an eternity (a few minutes), but idk how else to hit MADV_FREE eviction.
+    /// Expect ~1 GB/s, bottlenecked by page faults.
+    size_t ram_size = estimateRAMSize();
+    PageCache cache(2 << 20, 1 << 30, ram_size + ram_size / 10, /* use_madv_free */ true, /* use_huge_pages */ true);
+
+    CHECK(cache.getResidentSetSize().page_cache_rss);
+
+    const size_t num_keys = static_cast<size_t>(cache.maxChunks() * 1.5);
+    const size_t pages_per_chunk = cache.chunkSize() / cache.pageSize();
+    const size_t items_per_page = cache.pageSize() / 8;
+
+    const size_t passes = 2;
+    const size_t step = 20;
+    const size_t num_threads = 20;
+    const size_t chunks_touched = num_keys * passes * num_threads / step;
+    std::atomic<size_t> progress {0};
+    std::atomic<size_t> threads_finished {0};
+
+    std::atomic<size_t> total_racing_writes {0};
+
+    auto thread_func = [&]
+    {
+        pcg64 rng(randomSeed());
+        std::vector<PinnedPageChunk> pinned;
+
+        /// Stats.
+        size_t racing_writes = 0;
+
+        for (size_t i = 0; i < num_keys * passes; i += step)
+        {
+            progress += 1;
+
+            /// Touch the chunks sequentially + noise (to increase interference across threads), or at random 10% of the time.
+            size_t key_idx;
+            if (rng() % 10 == 0)
+                key_idx = std::uniform_int_distribution<size_t>(0, num_keys - 1)(rng);
+            else
+                key_idx = (i + std::uniform_int_distribution<size_t>(0, num_keys / 1000)(rng)) % num_keys;
+
+            /// For some keys, always use detached_if_missing = true and check that cache always misses.
+            bool key_detached_if_missing = key_idx % 100 == 42;
+            bool detached_if_missing = key_detached_if_missing || i % 101 == 42;
+
+            PageCacheKey key = key_idx * 0xcafebabeb0bad00dul; // a simple reversible hash (the constant can be any odd number)
+
+            PinnedPageChunk chunk = cache.getOrSet(key, detached_if_missing, /* inject_eviction */ false);
+
+            if (key_detached_if_missing)
+                CHECK(!chunk.getChunk()->pages_populated.any());
+
+            for (size_t page_idx = 0; page_idx < pages_per_chunk; ++page_idx)
+            {
+                bool populated = chunk.getChunk()->pages_populated.get(page_idx);
+                /// Generate page contents deterministically from key and page index.
+                size_t start = key_idx * page_idx;
+                if (start % 37 == 13)
+                {
+                    /// Leave ~1/37 of the pages unpopulated.
+                    CHECK(!populated);
+                }
+                else
+                {
+                    /// We may write/read the same memory from multiple threads in parallel here.
+                    std::atomic<size_t> * items = reinterpret_cast<std::atomic<size_t> *>(chunk.getChunk()->data + cache.pageSize() * page_idx);
+                    if (populated)
+                    {
+                        for (size_t j = 0; j < items_per_page; ++j)
+                            CHECK(items[j].load(std::memory_order_relaxed) == start + j);
+                    }
+                    else
+                    {
+                        for (size_t j = 0; j < items_per_page; ++j)
+                            items[j].store(start + j, std::memory_order_relaxed);
+                        if (!chunk.markPagePopulated(page_idx))
+                            racing_writes += 1;
+                    }
+                }
+            }
+
+            pinned.push_back(std::move(chunk));
+            CHECK(cache.getPinnedSize() >= cache.chunkSize());
+            /// Unpin 2 chunks on average.
+            while (rng() % 3 != 0 && !pinned.empty())
+            {
+                size_t idx = rng() % pinned.size();
+                if (idx != pinned.size() - 1)
+                    pinned[idx] = std::move(pinned.back());
+                pinned.pop_back();
+            }
+        }
+
+        total_racing_writes += racing_writes;
+        threads_finished += 1;
+    };
+
+    std::cout << fmt::format("doing {:.1f} passes over {:.1f} GiB of virtual memory\nthis will take a few minutes, progress printed every 10 seconds",
+        chunks_touched * 1. / cache.maxChunks(), cache.maxChunks() * cache.chunkSize() * 1. / (1ul << 30)) << std::endl;
+
+    auto start_time = std::chrono::steady_clock::now();
+
+    std::vector<std::thread> threads;
+    for (size_t i = 0; i < num_threads; ++i)
+        threads.emplace_back(thread_func);
+
+    for (size_t poll = 0;; ++poll)
+    {
+        if (threads_finished == num_threads)
+            break;
+        if (poll % 100 == 0)
+            std::cout << fmt::format("{:.3f}%", progress.load() * 100. / num_keys / passes / num_threads * step) << std::endl;
+        std::this_thread::sleep_for(std::chrono::milliseconds(100));
+    }
+    for (std::thread & t : threads)
+        t.join();
+
+    auto end_time = std::chrono::steady_clock::now();
+    double elapsed_seconds = std::chrono::duration_cast<std::chrono::duration<double>>(end_time - start_time).count();
+    double touched_gib = chunks_touched * cache.chunkSize() * 1. / (1ul << 30);
+    std::cout << fmt::format("touched {:.1f} GiB in {:.1f} seconds, that's {:.3f} GiB/s",
+        touched_gib, elapsed_seconds, touched_gib / elapsed_seconds) << std::endl;
+
+    auto & counters = CurrentThread::getProfileEvents();
+
+    std::cout << "stats:"
+        << "\nchunk misses: " << counters[ProfileEvents::PageCacheChunkMisses].load()
+        << "\nchunk shared: " << counters[ProfileEvents::PageCacheChunkShared].load()
+        << "\nchunk data misses: " << counters[ProfileEvents::PageCacheChunkDataMisses].load()
+        << "\nchunk data partial hits: " << counters[ProfileEvents::PageCacheChunkDataPartialHits].load()
+        << "\nchunk data hits: " << counters[ProfileEvents::PageCacheChunkDataHits].load()
+        << "\nracing page writes: " << total_racing_writes << std::endl;
+
+    /// Check that we at least hit all the cases.
+    CHECK(counters[ProfileEvents::PageCacheChunkMisses].load() > 0);
+    CHECK(counters[ProfileEvents::PageCacheChunkShared].load() > 0);
+    CHECK(counters[ProfileEvents::PageCacheChunkDataMisses].load() > 0);
+    /// Partial hits are rare enough that sometimes this is zero, so don't check it.
+    /// That's good news because we don't need to implement downloading parts of a chunk.
+    /// CHECK(counters[ProfileEvents::PageCacheChunkDataPartialHits].load() > 0);
+    CHECK(counters[ProfileEvents::PageCacheChunkDataHits].load() > 0);
+    CHECK(total_racing_writes > 0);
+    CHECK(cache.getPinnedSize() == 0);
+
+    size_t rss = cache.getResidentSetSize().page_cache_rss;
+    std::cout << "RSS: " << rss * 1. / (1ul << 30) << " GiB" << std::endl;
+    /// This can be flaky if the system has < 10% free memory. If this turns out to be a problem, feel free to remove or reduce.
+    CHECK(rss > ram_size / 10);
+
+    cache.dropCache();
+
+#ifdef OS_LINUX
+    /// MADV_DONTNEED is not synchronous, and we're freeing lots of pages. Let's give Linux a lot of time.
+    std::this_thread::sleep_for(std::chrono::seconds(10));
+    size_t new_rss = cache.getResidentSetSize().page_cache_rss;
+    std::cout << "RSS after dropping cache: " << new_rss * 1. / (1ul << 30) << " GiB" << std::endl;
+    CHECK(new_rss < rss / 2);
+#endif
+}
+
+/// Benchmark that measures the PageCache overhead for cache hits. Doesn't touch the actual data, so
+/// memory bandwidth mostly doesn't factor into this.
+/// This measures the overhead of things like madvise(MADV_FREE) and probing the pages (restoreChunkFromLimbo()).
+/// Disabled in CI, run manually with --gtest_also_run_disabled_tests --gtest_filter=PageCache.DISABLED_HitsBench
+TEST(PageCache, DISABLED_HitsBench)
+{
+    /// Do a few runs, with and without MADV_FREE.
+    for (size_t num_threads = 1; num_threads <= 16; num_threads *= 2)
+    {
+        for (size_t run = 0; run < 8; ++ run)
+        {
+            bool use_madv_free = run % 2 == 1;
+            bool use_huge_pages = run % 4 / 2 == 1;
+
+            PageCache cache(2 << 20, 1ul << 30, 20ul << 30, use_madv_free, use_huge_pages);
+            size_t passes = 3;
+            std::atomic<size_t> total_misses {0};
+
+            /// Prepopulate all chunks.
+            for (size_t i = 0; i < cache.maxChunks(); ++i)
+            {
+                PageCacheKey key = i * 0xcafebabeb0bad00dul;
+                PinnedPageChunk chunk = cache.getOrSet(key, /* detache_if_missing */ false, /* inject_eviction */ false);
+                memset(chunk.getChunk()->data, 42, chunk.getChunk()->size);
+                chunk.markPrefixPopulated(cache.chunkSize());
+            }
+
+            auto thread_func = [&]
+            {
+                pcg64 rng(randomSeed());
+                size_t misses = 0;
+                for (size_t i = 0; i < cache.maxChunks() * passes; ++i)
+                {
+                    PageCacheKey key = rng() % cache.maxChunks() * 0xcafebabeb0bad00dul;
+                    PinnedPageChunk chunk = cache.getOrSet(key, /* detache_if_missing */ false, /* inject_eviction */ false);
+                    if (!chunk.isPrefixPopulated(cache.chunkSize()))
+                        misses += 1;
+                }
+                total_misses += misses;
+            };
+
+            auto start_time = std::chrono::steady_clock::now();
+
+            std::vector<std::thread> threads;
+            for (size_t i = 0; i < num_threads; ++i)
+                threads.emplace_back(thread_func);
+
+            for (std::thread & t : threads)
+                t.join();
+
+            auto end_time = std::chrono::steady_clock::now();
+            double elapsed_seconds = std::chrono::duration_cast<std::chrono::duration<double>>(end_time - start_time).count();
+            double fetched_gib = cache.chunkSize() * cache.maxChunks() * passes * 1. / (1ul << 30);
+            std::cout << fmt::format(
+                "threads {}, run {}, use_madv_free = {}, use_huge_pages = {}\nrequested {:.1f} GiB in {:.1f} seconds\n"
+                "that's {:.1f} GiB/s, or overhead of {:.3}us/{:.1}MiB\n",
+                num_threads, run, use_madv_free, use_huge_pages, fetched_gib, elapsed_seconds, fetched_gib / elapsed_seconds,
+                elapsed_seconds * 1e6 / cache.maxChunks() / passes, cache.chunkSize() * 1. / (1 << 20)) << std::endl;
+
+            if (total_misses != 0)
+                std::cout << "!got " << total_misses.load() << " misses! perhaps your system doesn't have enough free memory, consider decreasing cache size in the benchmark code" << std::endl;
+        }
+    }
+}
diff --git a/src/Interpreters/tests/gtest_table_overrides.cpp b/src/Interpreters/tests/gtest_table_overrides.cpp
index 779bc7a53a4..09aa2e1f37f 100644
--- a/src/Interpreters/tests/gtest_table_overrides.cpp
+++ b/src/Interpreters/tests/gtest_table_overrides.cpp
@@ -34,11 +34,11 @@ TEST_P(TableOverrideTest, applyOverrides)
     const auto & [database_query, table_query, expected_query] = GetParam();
     ParserCreateQuery parser;
     ASTPtr database_ast;
-    ASSERT_NO_THROW(database_ast = parseQuery(parser, database_query, 0, 0));
+    ASSERT_NO_THROW(database_ast = parseQuery(parser, database_query, 0, 0, 0));
     auto * database = database_ast->as<ASTCreateQuery>();
     ASSERT_NE(nullptr, database);
     ASTPtr table_ast;
-    ASSERT_NO_THROW(table_ast = parseQuery(parser, table_query, 0, 0));
+    ASSERT_NO_THROW(table_ast = parseQuery(parser, table_query, 0, 0, 0));
     auto * table = table_ast->as<ASTCreateQuery>();
     ASSERT_NE(nullptr, table);
     auto table_name = table->table->as<ASTIdentifier>()->name();
diff --git a/src/Loggers/Loggers.cpp b/src/Loggers/Loggers.cpp
index 258853e8162..f794ad336e2 100644
--- a/src/Loggers/Loggers.cpp
+++ b/src/Loggers/Loggers.cpp
@@ -1,14 +1,17 @@
 #include "Loggers.h"
 
-#include <iostream>
-#include <Poco/SyslogChannel.h>
-#include <Poco/Util/AbstractConfiguration.h>
 #include "OwnFormattingChannel.h"
 #include "OwnPatternFormatter.h"
 #include "OwnSplitChannel.h"
+
+#include <iostream>
+#include <sstream>
+
 #include <Poco/ConsoleChannel.h>
 #include <Poco/Logger.h>
 #include <Poco/Net/RemoteSyslogChannel.h>
+#include <Poco/SyslogChannel.h>
+#include <Poco/Util/AbstractConfiguration.h>
 
 #ifndef WITHOUT_TEXT_LOG
     #include <Interpreters/TextLog.h>
@@ -50,6 +53,8 @@ static std::string renderFileNameTemplate(time_t now, const std::string & file_p
     return path.replace_filename(ss.str());
 }
 
+/// NOLINTBEGIN(readability-static-accessed-through-instance)
+
 void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Logger & logger /*_root*/, const std::string & cmd_name)
 {
     auto current_logger = config.getString("logger", "");
@@ -159,7 +164,6 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
 
     if (config.getBool("logger.use_syslog", false))
     {
-        //const std::string & cmd_name = commandName();
         auto syslog_level = Poco::Logger::parseLevel(config.getString("logger.syslog_level", log_level_string));
         if (syslog_level > max_log_level)
         {
@@ -228,22 +232,24 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
 
     split->open();
     logger.close();
-    logger.setChannel(split);
 
-    // Global logging level (it can be overridden for specific loggers).
+    logger.setChannel(split);
     logger.setLevel(max_log_level);
 
-    // Set level to all already created loggers
-    std::vector<std::string> names;
-    //logger_root = Logger::root();
-    logger.root().names(names);
-    for (const auto & name : names)
-        logger.root().get(name).setLevel(max_log_level);
-
-    // Attach to the root logger.
+    // Global logging level and channel (it can be overridden for specific loggers).
     logger.root().setLevel(max_log_level);
     logger.root().setChannel(logger.getChannel());
 
+    // Set level and channel to all already created loggers
+    std::vector<std::string> names;
+    logger.names(names);
+
+    for (const auto & name : names)
+    {
+        logger.get(name).setLevel(max_log_level);
+        logger.get(name).setChannel(split);
+    }
+
     // Explicitly specified log levels for specific loggers.
     {
         Poco::Util::AbstractConfiguration::Keys loggers_level;
@@ -303,6 +309,9 @@ void Loggers::buildLoggers(Poco::Util::AbstractConfiguration & config, Poco::Log
 
         log_settings.turn_off_logger = DB::TextLog::shouldTurnOffLogger();
 
+        log_settings.database = config.getString("text_log.database", "system");
+        log_settings.table = config.getString("text_log.table", "text_log");
+
         split->addTextLog(DB::TextLog::getLogQueue(log_settings), text_log_level);
     }
 #endif
@@ -386,6 +395,8 @@ void Loggers::updateLevels(Poco::Util::AbstractConfiguration & config, Poco::Log
     }
 }
 
+/// NOLINTEND(readability-static-accessed-through-instance)
+
 void Loggers::closeLogs(Poco::Logger & logger)
 {
     if (log_file)
diff --git a/src/Loggers/OwnFormattingChannel.h b/src/Loggers/OwnFormattingChannel.h
index da7cde315f9..00300fe99ff 100644
--- a/src/Loggers/OwnFormattingChannel.h
+++ b/src/Loggers/OwnFormattingChannel.h
@@ -16,11 +16,11 @@ class OwnFormattingChannel : public Poco::Channel, public ExtendedLogChannel
 public:
     explicit OwnFormattingChannel(
         Poco::AutoPtr<OwnPatternFormatter> pFormatter_ = nullptr, Poco::AutoPtr<Poco::Channel> pChannel_ = nullptr)
-        : pFormatter(std::move(pFormatter_)), pChannel(std::move(pChannel_)), priority(Poco::Message::PRIO_TRACE)
+        : pFormatter(pFormatter_), pChannel(pChannel_), priority(Poco::Message::PRIO_TRACE)
     {
     }
 
-    void setChannel(Poco::AutoPtr<Poco::Channel> pChannel_) { pChannel = std::move(pChannel_); }
+    void setChannel(Poco::AutoPtr<Poco::Channel> pChannel_) { pChannel = pChannel_; }
 
     void setLevel(Poco::Message::Priority priority_) { priority = priority_; }
 
diff --git a/src/Loggers/OwnJSONPatternFormatter.cpp b/src/Loggers/OwnJSONPatternFormatter.cpp
index e4f8e0facae..4263ad5925a 100644
--- a/src/Loggers/OwnJSONPatternFormatter.cpp
+++ b/src/Loggers/OwnJSONPatternFormatter.cpp
@@ -118,7 +118,7 @@ void OwnJSONPatternFormatter::formatExtended(const DB::ExtendedLogMessage & msg_
         writeJSONString(level, wb, settings);
         DB::writeChar(':', wb);
         int priority = static_cast<int>(msg.getPriority());
-        writeJSONString(std::to_string(priority), wb, settings);
+        writeJSONString(getPriorityName(priority), wb, settings);
     }
 
     if (!query_id.empty())
diff --git a/src/Loggers/OwnJSONPatternFormatter.h b/src/Loggers/OwnJSONPatternFormatter.h
index 6a31e6bbd8a..51827f34b22 100644
--- a/src/Loggers/OwnJSONPatternFormatter.h
+++ b/src/Loggers/OwnJSONPatternFormatter.h
@@ -26,7 +26,7 @@ class Loggers;
 class OwnJSONPatternFormatter : public OwnPatternFormatter
 {
 public:
-    OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config);
+    explicit OwnJSONPatternFormatter(Poco::Util::AbstractConfiguration & config);
 
     void format(const Poco::Message & msg, std::string & text) override;
     void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const override;
diff --git a/src/Loggers/OwnPatternFormatter.h b/src/Loggers/OwnPatternFormatter.h
index 8b0d11bcec1..176dbcd85c1 100644
--- a/src/Loggers/OwnPatternFormatter.h
+++ b/src/Loggers/OwnPatternFormatter.h
@@ -25,7 +25,7 @@ class Loggers;
 class OwnPatternFormatter : public Poco::PatternFormatter
 {
 public:
-    OwnPatternFormatter(bool color_ = false);
+    explicit OwnPatternFormatter(bool color_ = false);
 
     void format(const Poco::Message & msg, std::string & text) override;
     virtual void formatExtended(const DB::ExtendedLogMessage & msg_ext, std::string & text) const;
diff --git a/src/Loggers/OwnSplitChannel.cpp b/src/Loggers/OwnSplitChannel.cpp
index 958be928509..68fad2fbaf6 100644
--- a/src/Loggers/OwnSplitChannel.cpp
+++ b/src/Loggers/OwnSplitChannel.cpp
@@ -1,25 +1,23 @@
 #include "OwnSplitChannel.h"
 #include "OwnFormattingChannel.h"
 
-#include <Core/Block.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/TextLog.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
-#include <sys/time.h>
 #include <Poco/Message.h>
 #include <Common/CurrentThread.h>
 #include <Common/DNSResolver.h>
 #include <Common/setThreadName.h>
 #include <Common/LockMemoryExceptionInThread.h>
-#include <base/getThreadId.h>
 #include <Common/SensitiveDataMasker.h>
 #include <Common/IO.h>
 
+
 namespace DB
 {
+
 void OwnSplitChannel::log(const Poco::Message & msg)
 {
-
 #ifndef WITHOUT_TEXT_LOG
     auto logs_queue = CurrentThread::getInternalTextLogsQueue();
 
@@ -27,7 +25,7 @@ void OwnSplitChannel::log(const Poco::Message & msg)
         return;
 #endif
 
-    if (auto * masker = SensitiveDataMasker::getInstance())
+    if (auto masker = SensitiveDataMasker::getInstance())
     {
         auto message_text = msg.getText();
         auto matches = masker->wipeSensitiveData(message_text);
diff --git a/src/Loggers/OwnSplitChannel.h b/src/Loggers/OwnSplitChannel.h
index a6ee8af5b14..b75554eefc4 100644
--- a/src/Loggers/OwnSplitChannel.h
+++ b/src/Loggers/OwnSplitChannel.h
@@ -1,12 +1,13 @@
 #pragma once
+
 #include <atomic>
 #include <vector>
 #include <map>
-#include <mutex>
 #include <Poco/AutoPtr.h>
 #include <Poco/Channel.h>
 #include "ExtendedLogChannel.h"
 
+
 #ifndef WITHOUT_TEXT_LOG
 namespace DB
 {
diff --git a/src/NOTICE b/src/NOTICE
index c68280b1529..4e5f66c65c9 100644
--- a/src/NOTICE
+++ b/src/NOTICE
@@ -13,18 +13,9 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 
-Common/ErrorCodes.cpp
-Common/UInt128.h
-Core/Block.h
-Core/Defines.h
-Core/Settings.h
-Databases/DatabasesCommon.cpp
-IO/WriteBufferValidUTF8.cpp
-Interpreters/InterpreterAlterQuery.cpp
 Interpreters/InterpreterCreateQuery.cpp
 Interpreters/InterpreterFactory.cpp
 Parsers/ASTAlterQuery.cpp
-Parsers/ASTAlterQuery.h
 Parsers/ASTCreateQuery.cpp
 Parsers/ASTCreateQuery.h
 Parsers/ParserAlterQuery.cpp
diff --git a/src/Parsers/ASTAlterQuery.cpp b/src/Parsers/ASTAlterQuery.cpp
index 84355817b2c..f104e715452 100644
--- a/src/Parsers/ASTAlterQuery.cpp
+++ b/src/Parsers/ASTAlterQuery.cpp
@@ -1,6 +1,7 @@
-#include <iomanip>
-#include <IO/Operators.h>
 #include <Parsers/ASTAlterQuery.h>
+
+#include <Core/ServerSettings.h>
+#include <IO/Operators.h>
 #include <Common/quoteString.h>
 
 
@@ -22,66 +23,54 @@ ASTPtr ASTAlterCommand::clone() const
     res->children.clear();
 
     if (col_decl)
-    {
-        res->col_decl = col_decl->clone();
-        res->children.push_back(res->col_decl);
-    }
+        res->col_decl = res->children.emplace_back(col_decl->clone()).get();
     if (column)
-    {
-        res->column = column->clone();
-        res->children.push_back(res->column);
-    }
+        res->column = res->children.emplace_back(column->clone()).get();
     if (order_by)
-    {
-        res->order_by = order_by->clone();
-        res->children.push_back(res->order_by);
-    }
+        res->order_by = res->children.emplace_back(order_by->clone()).get();
+    if (sample_by)
+        res->sample_by = res->children.emplace_back(sample_by->clone()).get();
+    if (index_decl)
+        res->index_decl = res->children.emplace_back(index_decl->clone()).get();
+    if (index)
+        res->index = res->children.emplace_back(index->clone()).get();
+    if (constraint_decl)
+        res->constraint_decl = res->children.emplace_back(constraint_decl->clone()).get();
+    if (constraint)
+        res->constraint = res->children.emplace_back(constraint->clone()).get();
+    if (projection_decl)
+        res->projection_decl = res->children.emplace_back(projection_decl->clone()).get();
+    if (projection)
+        res->projection = res->children.emplace_back(projection->clone()).get();
+    if (statistic_decl)
+        res->statistic_decl = res->children.emplace_back(statistic_decl->clone()).get();
     if (partition)
-    {
-        res->partition = partition->clone();
-        res->children.push_back(res->partition);
-    }
+        res->partition = res->children.emplace_back(partition->clone()).get();
     if (predicate)
-    {
-        res->predicate = predicate->clone();
-        res->children.push_back(res->predicate);
-    }
-    if (ttl)
-    {
-        res->ttl = ttl->clone();
-        res->children.push_back(res->ttl);
-    }
-    if (settings_changes)
-    {
-        res->settings_changes = settings_changes->clone();
-        res->children.push_back(res->settings_changes);
-    }
-    if (settings_resets)
-    {
-        res->settings_resets = settings_resets->clone();
-        res->children.push_back(res->settings_resets);
-    }
-    if (values)
-    {
-        res->values = values->clone();
-        res->children.push_back(res->values);
-    }
-    if (rename_to)
-    {
-        res->rename_to = rename_to->clone();
-        res->children.push_back(res->rename_to);
-    }
+        res->predicate = res->children.emplace_back(predicate->clone()).get();
+    if (update_assignments)
+        res->update_assignments = res->children.emplace_back(update_assignments->clone()).get();
     if (comment)
-    {
-        res->comment = comment->clone();
-        res->children.push_back(res->comment);
-    }
+        res->comment = res->children.emplace_back(comment->clone()).get();
+    if (ttl)
+        res->ttl = res->children.emplace_back(ttl->clone()).get();
+    if (settings_changes)
+        res->settings_changes = res->children.emplace_back(settings_changes->clone()).get();
+    if (settings_resets)
+        res->settings_resets = res->children.emplace_back(settings_resets->clone()).get();
+    if (select)
+        res->select = res->children.emplace_back(select->clone()).get();
+    if (rename_to)
+        res->rename_to = res->children.emplace_back(rename_to->clone()).get();
 
     return res;
 }
 
 void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
+    if (format_alter_commands_with_parentheses)
+        settings.ostr << "(";
+
     if (type == ASTAlterCommand::ADD_COLUMN)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << "ADD COLUMN " << (if_not_exists ? "IF NOT EXISTS " : "")
@@ -117,6 +106,16 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " REMOVE " << remove_property;
         }
+        else if (settings_changes)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " MODIFY SETTING " << (settings.hilite ? hilite_none : "");
+            settings_changes->formatImpl(settings, state, frame);
+        }
+        else if (settings_resets)
+        {
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << " RESET SETTING " << (settings.hilite ? hilite_none : "");
+            settings_resets->formatImpl(settings, state, frame);
+        }
         else
         {
             if (first)
@@ -287,6 +286,12 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
                       << (settings.hilite ? hilite_none : "");
         partition->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::FORGET_PARTITION)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "FORGET PARTITION "
+                      << (settings.hilite ? hilite_none : "");
+        partition->formatImpl(settings, state, frame);
+    }
     else if (type == ASTAlterCommand::ATTACH_PARTITION)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << "ATTACH " << (part ? "PART " : "PARTITION ")
@@ -449,20 +454,16 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
     }
     else if (type == ASTAlterCommand::MODIFY_QUERY)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY QUERY " << settings.nl_or_ws
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY QUERY" << settings.nl_or_ws
                       << (settings.hilite ? hilite_none : "");
         select->formatImpl(settings, state, frame);
     }
     else if (type == ASTAlterCommand::MODIFY_REFRESH)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY REFRESH " << settings.nl_or_ws
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY" << settings.nl_or_ws
                       << (settings.hilite ? hilite_none : "");
         refresh->formatImpl(settings, state, frame);
     }
-    else if (type == ASTAlterCommand::LIVE_VIEW_REFRESH)
-    {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "REFRESH " << (settings.hilite ? hilite_none : "");
-    }
     else if (type == ASTAlterCommand::RENAME_COLUMN)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << "RENAME COLUMN " << (if_exists ? "IF EXISTS " : "")
@@ -472,6 +473,11 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " TO ";
         rename_to->formatImpl(settings, state, frame);
     }
+    else if (type == ASTAlterCommand::MODIFY_SQL_SECURITY)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "MODIFY " << (settings.hilite ? hilite_none : "");
+        sql_security->formatImpl(settings, state, frame);
+    }
     else if (type == ASTAlterCommand::APPLY_DELETED_MASK)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << "APPLY DELETED MASK" << (settings.hilite ? hilite_none : "");
@@ -484,8 +490,36 @@ void ASTAlterCommand::formatImpl(const FormatSettings & settings, FormatState &
     }
     else
         throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE, "Unexpected type of ALTER");
+
+    if (format_alter_commands_with_parentheses)
+        settings.ostr << ")";
 }
 
+void ASTAlterCommand::forEachPointerToChild(std::function<void(void**)> f)
+{
+    f(reinterpret_cast<void **>(&col_decl));
+    f(reinterpret_cast<void **>(&column));
+    f(reinterpret_cast<void **>(&order_by));
+    f(reinterpret_cast<void **>(&sample_by));
+    f(reinterpret_cast<void **>(&index_decl));
+    f(reinterpret_cast<void **>(&index));
+    f(reinterpret_cast<void **>(&constraint_decl));
+    f(reinterpret_cast<void **>(&constraint));
+    f(reinterpret_cast<void **>(&projection_decl));
+    f(reinterpret_cast<void **>(&projection));
+    f(reinterpret_cast<void **>(&statistic_decl));
+    f(reinterpret_cast<void **>(&partition));
+    f(reinterpret_cast<void **>(&predicate));
+    f(reinterpret_cast<void **>(&update_assignments));
+    f(reinterpret_cast<void **>(&comment));
+    f(reinterpret_cast<void **>(&ttl));
+    f(reinterpret_cast<void **>(&settings_changes));
+    f(reinterpret_cast<void **>(&settings_resets));
+    f(reinterpret_cast<void **>(&select));
+    f(reinterpret_cast<void **>(&rename_to));
+}
+
+
 bool ASTAlterQuery::isOneCommandTypeOnly(const ASTAlterCommand::Type & type) const
 {
     if (command_list)
@@ -585,9 +619,6 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
         case AlterObjectType::DATABASE:
             settings.ostr << "ALTER DATABASE ";
             break;
-        case AlterObjectType::LIVE_VIEW:
-            settings.ostr << "ALTER LIVE VIEW ";
-            break;
         default:
             break;
     }
@@ -596,16 +627,20 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
 
     if (table)
     {
+        settings.ostr << indent_str;
         if (database)
         {
-            settings.ostr << indent_str << backQuoteIfNeed(getDatabase());
-            settings.ostr << ".";
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
         }
-        settings.ostr << indent_str << backQuoteIfNeed(getTable());
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
     }
     else if (alter_object == AlterObjectType::DATABASE && database)
     {
-        settings.ostr << indent_str << backQuoteIfNeed(getDatabase());
+        settings.ostr << indent_str;
+        database->formatImpl(settings, state, frame);
     }
 
     formatOnCluster(settings);
@@ -624,4 +659,11 @@ void ASTAlterQuery::formatQueryImpl(const FormatSettings & settings, FormatState
     }
 }
 
+void ASTAlterQuery::forEachPointerToChild(std::function<void(void**)> f)
+{
+    for (const auto & child : command_list->children)
+        child->as<ASTAlterCommand &>().forEachPointerToChild(f);
+    f(reinterpret_cast<void **>(&command_list));
+}
+
 }
diff --git a/src/Parsers/ASTAlterQuery.h b/src/Parsers/ASTAlterQuery.h
index 0b115537a6d..1799b75fce4 100644
--- a/src/Parsers/ASTAlterQuery.h
+++ b/src/Parsers/ASTAlterQuery.h
@@ -17,12 +17,12 @@ namespace DB
  *      MODIFY COLUMN col_name type,
  *      DROP PARTITION partition,
  *      COMMENT_COLUMN col_name 'comment',
- *  ALTER LIVE VIEW [db.]name_type
- *      REFRESH
  */
 
 class ASTAlterCommand : public IAST
 {
+    friend class ASTAlterQuery;
+
 public:
     enum Type
     {
@@ -61,6 +61,7 @@ public:
 
         DROP_PARTITION,
         DROP_DETACHED_PARTITION,
+        FORGET_PARTITION,
         ATTACH_PARTITION,
         MOVE_PARTITION,
         REPLACE_PARTITION,
@@ -76,11 +77,10 @@ public:
 
         NO_TYPE,
 
-        LIVE_VIEW_REFRESH,
-
         MODIFY_DATABASE_SETTING,
 
         MODIFY_COMMENT,
+        MODIFY_SQL_SECURITY,
     };
 
     Type type = NO_TYPE;
@@ -89,83 +89,85 @@ public:
      *  This field is not used in the DROP query
      *  In MODIFY query, the column name and the new type are stored here
      */
-    ASTPtr col_decl;
+    IAST * col_decl = nullptr;
 
     /** The ADD COLUMN and MODIFY COLUMN query here optionally stores the name of the column following AFTER
      * The DROP query stores the column name for deletion here
      * Also used for RENAME COLUMN.
      */
-    ASTPtr column;
+    IAST * column = nullptr;
 
     /** For MODIFY ORDER BY
      */
-    ASTPtr order_by;
+    IAST * order_by = nullptr;
 
     /** For MODIFY SAMPLE BY
      */
-    ASTPtr sample_by;
+    IAST * sample_by = nullptr;
 
     /** The ADD INDEX query stores the IndexDeclaration there.
      */
-    ASTPtr index_decl;
+    IAST * index_decl = nullptr;
 
     /** The ADD INDEX query stores the name of the index following AFTER.
      *  The DROP INDEX query stores the name for deletion.
      *  The MATERIALIZE INDEX query stores the name of the index to materialize.
      *  The CLEAR INDEX query stores the name of the index to clear.
      */
-    ASTPtr index;
+    IAST * index = nullptr;
 
     /** The ADD CONSTRAINT query stores the ConstraintDeclaration there.
     */
-    ASTPtr constraint_decl;
+    IAST * constraint_decl = nullptr;
 
     /** The DROP CONSTRAINT query stores the name for deletion.
     */
-    ASTPtr constraint;
+    IAST * constraint = nullptr;
 
     /** The ADD PROJECTION query stores the ProjectionDeclaration there.
      */
-    ASTPtr projection_decl;
+    IAST * projection_decl = nullptr;
 
     /** The ADD PROJECTION query stores the name of the projection following AFTER.
      *  The DROP PROJECTION query stores the name for deletion.
      *  The MATERIALIZE PROJECTION query stores the name of the projection to materialize.
      *  The CLEAR PROJECTION query stores the name of the projection to clear.
      */
-    ASTPtr projection;
+    IAST * projection = nullptr;
 
-    ASTPtr statistic_decl;
+    IAST * statistic_decl = nullptr;
 
-    /** Used in DROP PARTITION, ATTACH PARTITION FROM, UPDATE, DELETE queries.
+    /** Used in DROP PARTITION, ATTACH PARTITION FROM, FORGET PARTITION, UPDATE, DELETE queries.
      *  The value or ID of the partition is stored here.
      */
-    ASTPtr partition;
+    IAST * partition = nullptr;
 
     /// For DELETE/UPDATE WHERE: the predicate that filters the rows to delete/update.
-    ASTPtr predicate;
+    IAST * predicate = nullptr;
 
     /// A list of expressions of the form `column = expr` for the UPDATE command.
-    ASTPtr update_assignments;
+    IAST * update_assignments = nullptr;
 
     /// A column comment
-    ASTPtr comment;
+    IAST * comment = nullptr;
 
     /// For MODIFY TTL query
-    ASTPtr ttl;
+    IAST * ttl = nullptr;
 
     /// FOR MODIFY_SETTING
-    ASTPtr settings_changes;
+    IAST * settings_changes = nullptr;
 
     /// FOR RESET_SETTING
-    ASTPtr settings_resets;
+    IAST * settings_resets = nullptr;
 
     /// For MODIFY_QUERY
-    ASTPtr select;
+    IAST * select = nullptr;
 
-    /** In ALTER CHANNEL, ADD, DROP, SUSPEND, RESUME, REFRESH, MODIFY queries, the list of live views is stored here
-     */
-    ASTPtr values;
+    /// For MODIFY_SQL_SECURITY
+    IAST * sql_security = nullptr;
+
+    /// Target column name
+    IAST * rename_to = nullptr;
 
     /// For MODIFY REFRESH
     ASTPtr refresh;
@@ -211,9 +213,6 @@ public:
     String to_database;
     String to_table;
 
-    /// Target column name
-    ASTPtr rename_to;
-
     /// Which property user want to remove
     String remove_property;
 
@@ -221,8 +220,16 @@ public:
 
     ASTPtr clone() const override;
 
+    // This function is only meant to be called during application startup
+    // For reasons see https://github.com/ClickHouse/ClickHouse/pull/59532
+    static void setFormatAlterCommandsWithParentheses(bool value) { format_alter_commands_with_parentheses = value; }
+
 protected:
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+
+    void forEachPointerToChild(std::function<void(void**)> f) override;
+
+    static inline bool format_alter_commands_with_parentheses = false;
 };
 
 class ASTAlterQuery : public ASTQueryWithTableAndOutput, public ASTQueryWithOnCluster
@@ -232,7 +239,6 @@ public:
     {
         TABLE,
         DATABASE,
-        LIVE_VIEW,
         UNKNOWN,
     };
 
@@ -270,10 +276,7 @@ protected:
 
     bool isOneCommandTypeOnly(const ASTAlterCommand::Type & type) const;
 
-    void forEachPointerToChild(std::function<void(void**)> f) override
-    {
-        f(reinterpret_cast<void **>(&command_list));
-    }
+    void forEachPointerToChild(std::function<void(void**)> f) override;
 };
 
 }
diff --git a/src/Parsers/ASTBackupQuery.cpp b/src/Parsers/ASTBackupQuery.cpp
index 2c26e723687..bdb78eaf971 100644
--- a/src/Parsers/ASTBackupQuery.cpp
+++ b/src/Parsers/ASTBackupQuery.cpp
@@ -261,23 +261,24 @@ ASTPtr ASTBackupQuery::clone() const
     if (settings)
         res->settings = settings->clone();
 
+    cloneOutputOptions(*res);
+
     return res;
 }
 
 
-void ASTBackupQuery::formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const
+void ASTBackupQuery::formatQueryImpl(const FormatSettings & fs, FormatState &, FormatStateStacked) const
 {
-    format.ostr << (format.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? "BACKUP " : "RESTORE ")
-                << (format.hilite ? hilite_none : "");
+    fs.ostr << (fs.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? "BACKUP " : "RESTORE ") << (fs.hilite ? hilite_none : "");
 
-    formatElements(elements, format);
-    formatOnCluster(format);
+    formatElements(elements, fs);
+    formatOnCluster(fs);
 
-    format.ostr << (format.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? " TO " : " FROM ") << (format.hilite ? hilite_none : "");
-    backup_name->format(format);
+    fs.ostr << (fs.hilite ? hilite_keyword : "") << ((kind == Kind::BACKUP) ? " TO " : " FROM ") << (fs.hilite ? hilite_none : "");
+    backup_name->format(fs);
 
     if (settings || base_backup_name)
-        formatSettings(settings, base_backup_name, cluster_host_ids, format);
+        formatSettings(settings, base_backup_name, cluster_host_ids, fs);
 }
 
 ASTPtr ASTBackupQuery::getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams & params) const
diff --git a/src/Parsers/ASTBackupQuery.h b/src/Parsers/ASTBackupQuery.h
index 0201c2b14f9..a56cdebc7b3 100644
--- a/src/Parsers/ASTBackupQuery.h
+++ b/src/Parsers/ASTBackupQuery.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <Parsers/IAST.h>
+#include <Parsers/ASTQueryWithOutput.h>
 #include <Parsers/ASTQueryWithOnCluster.h>
 
 
@@ -40,7 +40,7 @@ class ASTFunction;
   * For the BACKUP command this clause allows to set the name which an object will have inside the backup.
   * And for the RESTORE command this clause allows to set the name which an object will have after RESTORE has finished.
   */
-class ASTBackupQuery : public IAST, public ASTQueryWithOnCluster
+class ASTBackupQuery : public ASTQueryWithOutput, public ASTQueryWithOnCluster
 {
 public:
     enum Kind
@@ -91,7 +91,7 @@ public:
 
     String getID(char) const override;
     ASTPtr clone() const override;
-    void formatImpl(const FormatSettings & format, FormatState &, FormatStateStacked) const override;
+    void formatQueryImpl(const FormatSettings & fs, FormatState &, FormatStateStacked) const override;
     ASTPtr getRewrittenASTWithoutOnCluster(const WithoutOnClusterASTRewriteParams &) const override;
     QueryKind getQueryKind() const override;
 
diff --git a/src/Parsers/ASTCheckQuery.h b/src/Parsers/ASTCheckQuery.h
index c9a17ca4a54..eca08b2b094 100644
--- a/src/Parsers/ASTCheckQuery.h
+++ b/src/Parsers/ASTCheckQuery.h
@@ -49,10 +49,12 @@ protected:
         {
             if (database)
             {
-                settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << backQuoteIfNeed(getDatabase()) << (settings.hilite ? hilite_none : "");
-                settings.ostr << ".";
+                database->formatImpl(settings, state, frame);
+                settings.ostr << '.';
             }
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << indent_str << backQuoteIfNeed(getTable()) << (settings.hilite ? hilite_none : "");
+
+            chassert(table);
+            table->formatImpl(settings, state, frame);
         }
 
         if (partition)
diff --git a/src/Parsers/ASTColumnDeclaration.cpp b/src/Parsers/ASTColumnDeclaration.cpp
index b0d812eec6b..6c29e0bf9d5 100644
--- a/src/Parsers/ASTColumnDeclaration.cpp
+++ b/src/Parsers/ASTColumnDeclaration.cpp
@@ -57,70 +57,83 @@ ASTPtr ASTColumnDeclaration::clone() const
         res->children.push_back(res->collation);
     }
 
+    if (settings)
+    {
+        res->settings = settings->clone();
+        res->children.push_back(res->settings);
+    }
+
     return res;
 }
 
-void ASTColumnDeclaration::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+void ASTColumnDeclaration::formatImpl(const FormatSettings & format_settings, FormatState & state, FormatStateStacked frame) const
 {
     frame.need_parens = false;
 
     /// We have to always backquote column names to avoid ambiguouty with INDEX and other declarations in CREATE query.
-    settings.ostr << backQuote(name);
+    format_settings.ostr << backQuote(name);
 
     if (type)
     {
-        settings.ostr << ' ';
+        format_settings.ostr << ' ';
 
         FormatStateStacked type_frame = frame;
         type_frame.indent = 0;
 
-        type->formatImpl(settings, state, type_frame);
+        type->formatImpl(format_settings, state, type_frame);
     }
 
     if (null_modifier)
     {
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "")
-                      << (*null_modifier ? "" : "NOT ") << "NULL" << (settings.hilite ? hilite_none : "");
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "")
+                      << (*null_modifier ? "" : "NOT ") << "NULL" << (format_settings.hilite ? hilite_none : "");
     }
 
     if (default_expression)
     {
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << default_specifier << (settings.hilite ? hilite_none : "");
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "") << default_specifier << (format_settings.hilite ? hilite_none : "");
         if (!ephemeral_default)
         {
-            settings.ostr << ' ';
-            default_expression->formatImpl(settings, state, frame);
+            format_settings.ostr << ' ';
+            default_expression->formatImpl(format_settings, state, frame);
         }
     }
 
     if (comment)
     {
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "COMMENT" << (settings.hilite ? hilite_none : "") << ' ';
-        comment->formatImpl(settings, state, frame);
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "") << "COMMENT" << (format_settings.hilite ? hilite_none : "") << ' ';
+        comment->formatImpl(format_settings, state, frame);
     }
 
     if (codec)
     {
-        settings.ostr << ' ';
-        codec->formatImpl(settings, state, frame);
+        format_settings.ostr << ' ';
+        codec->formatImpl(format_settings, state, frame);
     }
 
     if (stat_type)
     {
-        settings.ostr << ' ';
-        stat_type->formatImpl(settings, state, frame);
+        format_settings.ostr << ' ';
+        stat_type->formatImpl(format_settings, state, frame);
     }
 
     if (ttl)
     {
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "TTL" << (settings.hilite ? hilite_none : "") << ' ';
-        ttl->formatImpl(settings, state, frame);
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "") << "TTL" << (format_settings.hilite ? hilite_none : "") << ' ';
+        ttl->formatImpl(format_settings, state, frame);
     }
 
     if (collation)
     {
-        settings.ostr << ' ' << (settings.hilite ? hilite_keyword : "") << "COLLATE" << (settings.hilite ? hilite_none : "") << ' ';
-        collation->formatImpl(settings, state, frame);
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "") << "COLLATE" << (format_settings.hilite ? hilite_none : "") << ' ';
+        collation->formatImpl(format_settings, state, frame);
+    }
+
+    if (settings)
+    {
+        format_settings.ostr << ' ' << (format_settings.hilite ? hilite_keyword : "") << "SETTINGS" << (format_settings.hilite ? hilite_none : "") << ' ' << '(';
+        settings->formatImpl(format_settings, state, frame);
+        format_settings.ostr << ')';
     }
 }
 
diff --git a/src/Parsers/ASTColumnDeclaration.h b/src/Parsers/ASTColumnDeclaration.h
index a54abae97ea..d775928d05c 100644
--- a/src/Parsers/ASTColumnDeclaration.h
+++ b/src/Parsers/ASTColumnDeclaration.h
@@ -22,12 +22,13 @@ public:
     ASTPtr stat_type;
     ASTPtr ttl;
     ASTPtr collation;
+    ASTPtr settings;
     bool primary_key_specifier = false;
 
     String getID(char delim) const override { return "ColumnDeclaration" + (delim + name); }
 
     ASTPtr clone() const override;
-    void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+    void formatImpl(const FormatSettings & format_settings, FormatState & state, FormatStateStacked frame) const override;
 };
 
 }
diff --git a/src/Parsers/ASTColumnsMatcher.cpp b/src/Parsers/ASTColumnsMatcher.cpp
index c2854e2235c..518fd9b722d 100644
--- a/src/Parsers/ASTColumnsMatcher.cpp
+++ b/src/Parsers/ASTColumnsMatcher.cpp
@@ -4,17 +4,11 @@
 #include <IO/WriteHelpers.h>
 #include <Common/SipHash.h>
 #include <Common/quoteString.h>
-#include <Common/re2.h>
 
 
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int CANNOT_COMPILE_REGEXP;
-}
-
 ASTPtr ASTColumnsRegexpMatcher::clone() const
 {
     auto clone = std::make_shared<ASTColumnsRegexpMatcher>(*this);
@@ -34,14 +28,14 @@ void ASTColumnsRegexpMatcher::appendColumnName(WriteBuffer & ostr) const
         writeCString(".", ostr);
     }
     writeCString("COLUMNS(", ostr);
-    writeQuotedString(original_pattern, ostr);
+    writeQuotedString(pattern, ostr);
     writeChar(')', ostr);
 }
 
 void ASTColumnsRegexpMatcher::updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const
 {
-    hash_state.update(original_pattern.size());
-    hash_state.update(original_pattern);
+    hash_state.update(pattern.size());
+    hash_state.update(pattern);
     IAST::updateTreeHashImpl(hash_state, ignore_aliases);
 }
 
@@ -56,7 +50,7 @@ void ASTColumnsRegexpMatcher::formatImpl(const FormatSettings & settings, Format
     }
 
     settings.ostr << "COLUMNS" << (settings.hilite ? hilite_none : "") << "(";
-    settings.ostr << quoteString(original_pattern);
+    settings.ostr << quoteString(pattern);
     settings.ostr << ")";
 
     if (transformers)
@@ -65,28 +59,14 @@ void ASTColumnsRegexpMatcher::formatImpl(const FormatSettings & settings, Format
     }
 }
 
-void ASTColumnsRegexpMatcher::setPattern(String pattern)
+void ASTColumnsRegexpMatcher::setPattern(String pattern_)
 {
-    original_pattern = std::move(pattern);
-    column_matcher = std::make_shared<RE2>(original_pattern, RE2::Quiet);
-    if (!column_matcher->ok())
-        throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP,
-            "COLUMNS pattern {} cannot be compiled: {}", original_pattern, column_matcher->error());
+    pattern = std::move(pattern_);
 }
 
 const String & ASTColumnsRegexpMatcher::getPattern() const
 {
-    return original_pattern;
-}
-
-const std::shared_ptr<re2::RE2> & ASTColumnsRegexpMatcher::getMatcher() const
-{
-    return column_matcher;
-}
-
-bool ASTColumnsRegexpMatcher::isColumnMatching(const String & column_name) const
-{
-    return RE2::PartialMatch(column_name, *column_matcher);
+    return pattern;
 }
 
 ASTPtr ASTColumnsListMatcher::clone() const
@@ -166,37 +146,24 @@ void ASTQualifiedColumnsRegexpMatcher::appendColumnName(WriteBuffer & ostr) cons
 {
     qualifier->appendColumnName(ostr);
     writeCString(".COLUMNS(", ostr);
-    writeQuotedString(original_pattern, ostr);
+    writeQuotedString(pattern, ostr);
     writeChar(')', ostr);
 }
 
-void ASTQualifiedColumnsRegexpMatcher::setPattern(String pattern, bool set_matcher)
+void ASTQualifiedColumnsRegexpMatcher::setPattern(String pattern_)
 {
-    original_pattern = std::move(pattern);
-
-    if (!set_matcher)
-        return;
-
-    column_matcher = std::make_shared<RE2>(original_pattern, RE2::Quiet);
-    if (!column_matcher->ok())
-        throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP,
-            "COLUMNS pattern {} cannot be compiled: {}", original_pattern, column_matcher->error());
+    pattern = std::move(pattern_);
 }
 
-void ASTQualifiedColumnsRegexpMatcher::setMatcher(std::shared_ptr<re2::RE2> matcher)
+const String & ASTQualifiedColumnsRegexpMatcher::getPattern() const
 {
-    column_matcher = std::move(matcher);
-}
-
-const std::shared_ptr<re2::RE2> & ASTQualifiedColumnsRegexpMatcher::getMatcher() const
-{
-    return column_matcher;
+    return pattern;
 }
 
 void ASTQualifiedColumnsRegexpMatcher::updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const
 {
-    hash_state.update(original_pattern.size());
-    hash_state.update(original_pattern);
+    hash_state.update(pattern.size());
+    hash_state.update(pattern);
     IAST::updateTreeHashImpl(hash_state, ignore_aliases);
 }
 
@@ -207,7 +174,7 @@ void ASTQualifiedColumnsRegexpMatcher::formatImpl(const FormatSettings & setting
     qualifier->formatImpl(settings, state, frame);
 
     settings.ostr << ".COLUMNS" << (settings.hilite ? hilite_none : "") << "(";
-    settings.ostr << quoteString(original_pattern);
+    settings.ostr << quoteString(pattern);
     settings.ostr << ")";
 
     if (transformers)
diff --git a/src/Parsers/ASTColumnsMatcher.h b/src/Parsers/ASTColumnsMatcher.h
index 6fc5581a4eb..e5191b74b72 100644
--- a/src/Parsers/ASTColumnsMatcher.h
+++ b/src/Parsers/ASTColumnsMatcher.h
@@ -2,11 +2,6 @@
 
 #include <Parsers/IAST.h>
 
-namespace re2
-{
-class RE2;
-}
-
 
 namespace DB
 {
@@ -25,8 +20,6 @@ public:
     void appendColumnName(WriteBuffer & ostr) const override;
     void setPattern(String pattern);
     const String & getPattern() const;
-    const std::shared_ptr<re2::RE2> & getMatcher() const;
-    bool isColumnMatching(const String & column_name) const;
     void updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const override;
 
     ASTPtr expression;
@@ -35,8 +28,7 @@ protected:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
 
 private:
-    std::shared_ptr<re2::RE2> column_matcher;
-    String original_pattern;
+    String pattern;
 };
 
 /// Same as the above but use a list of column names to do matching.
@@ -62,9 +54,8 @@ public:
     ASTPtr clone() const override;
 
     void appendColumnName(WriteBuffer & ostr) const override;
-    const std::shared_ptr<re2::RE2> & getMatcher() const;
-    void setPattern(String pattern, bool set_matcher = true);
-    void setMatcher(std::shared_ptr<re2::RE2> matcher);
+    void setPattern(String pattern_);
+    const String & getPattern() const;
     void updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const override;
 
     ASTPtr qualifier;
@@ -73,8 +64,7 @@ protected:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
 
 private:
-    std::shared_ptr<re2::RE2> column_matcher;
-    String original_pattern;
+    String pattern;
 };
 
 /// Same as ASTColumnsListMatcher. Qualified identifier is first child.
diff --git a/src/Parsers/ASTColumnsTransformers.cpp b/src/Parsers/ASTColumnsTransformers.cpp
index 34a1ae6e8e0..2a61892f8cc 100644
--- a/src/Parsers/ASTColumnsTransformers.cpp
+++ b/src/Parsers/ASTColumnsTransformers.cpp
@@ -12,6 +12,7 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int ILLEGAL_TYPE_OF_ARGUMENT;
@@ -179,8 +180,8 @@ void ASTColumnsExceptTransformer::formatImpl(const FormatSettings & settings, Fo
         (*it)->formatImpl(settings, state, frame);
     }
 
-    if (!original_pattern.empty())
-        settings.ostr << quoteString(original_pattern);
+    if (pattern)
+        settings.ostr << quoteString(*pattern);
 
     if (children.size() > 1)
         settings.ostr << ")";
@@ -202,8 +203,8 @@ void ASTColumnsExceptTransformer::appendColumnName(WriteBuffer & ostr) const
         (*it)->appendColumnName(ostr);
     }
 
-    if (!original_pattern.empty())
-        writeQuotedString(original_pattern, ostr);
+    if (pattern)
+        writeQuotedString(*pattern, ostr);
 
     if (children.size() > 1)
         writeChar(')', ostr);
@@ -212,8 +213,11 @@ void ASTColumnsExceptTransformer::appendColumnName(WriteBuffer & ostr) const
 void ASTColumnsExceptTransformer::updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const
 {
     hash_state.update(is_strict);
-    hash_state.update(original_pattern.size());
-    hash_state.update(original_pattern);
+    if (pattern)
+    {
+        hash_state.update(pattern->size());
+        hash_state.update(*pattern);
+    }
 
     IAST::updateTreeHashImpl(hash_state, ignore_aliases);
 }
@@ -221,7 +225,7 @@ void ASTColumnsExceptTransformer::updateTreeHashImpl(SipHash & hash_state, bool
 void ASTColumnsExceptTransformer::transform(ASTs & nodes) const
 {
     std::set<String> expected_columns;
-    if (original_pattern.empty())
+    if (!pattern)
     {
         for (const auto & child : children)
             expected_columns.insert(child->as<const ASTIdentifier &>().name());
@@ -243,11 +247,13 @@ void ASTColumnsExceptTransformer::transform(ASTs & nodes) const
     }
     else
     {
+        auto regexp = getMatcher();
+
         for (auto * it = nodes.begin(); it != nodes.end();)
         {
             if (const auto * id = it->get()->as<ASTIdentifier>())
             {
-                if (isColumnMatching(id->shortName()))
+                if (RE2::PartialMatch(id->shortName(), *regexp))
                 {
                     it = nodes.erase(it);
                     continue;
@@ -268,23 +274,21 @@ void ASTColumnsExceptTransformer::transform(ASTs & nodes) const
     }
 }
 
-void ASTColumnsExceptTransformer::setPattern(String pattern)
+void ASTColumnsExceptTransformer::setPattern(String pattern_)
 {
-    original_pattern = std::move(pattern);
-    column_matcher = std::make_shared<RE2>(original_pattern, RE2::Quiet);
-    if (!column_matcher->ok())
-        throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP, "COLUMNS pattern {} cannot be compiled: {}",
-            original_pattern, column_matcher->error());
+    pattern = std::move(pattern_);
 }
 
-const std::shared_ptr<re2::RE2> & ASTColumnsExceptTransformer::getMatcher() const
+std::shared_ptr<re2::RE2> ASTColumnsExceptTransformer::getMatcher() const
 {
-    return column_matcher;
-}
+    if (!pattern)
+        return {};
 
-bool ASTColumnsExceptTransformer::isColumnMatching(const String & column_name) const
-{
-    return RE2::PartialMatch(column_name, *column_matcher);
+    auto regexp = std::make_shared<re2::RE2>(*pattern, re2::RE2::Quiet);
+    if (!regexp->ok())
+        throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP,
+            "COLUMNS pattern {} cannot be compiled: {}", *pattern, regexp->error());
+    return regexp;
 }
 
 void ASTColumnsReplaceTransformer::Replacement::formatImpl(
diff --git a/src/Parsers/ASTColumnsTransformers.h b/src/Parsers/ASTColumnsTransformers.h
index a2a138e13c9..cedf955bee2 100644
--- a/src/Parsers/ASTColumnsTransformers.h
+++ b/src/Parsers/ASTColumnsTransformers.h
@@ -2,6 +2,7 @@
 
 #include <Parsers/IAST.h>
 
+
 namespace re2
 {
     class RE2;
@@ -76,16 +77,14 @@ public:
         return clone;
     }
     void transform(ASTs & nodes) const override;
-    void setPattern(String pattern);
-    const std::shared_ptr<re2::RE2> & getMatcher() const;
-    bool isColumnMatching(const String & column_name) const;
+    void setPattern(String pattern_);
+    std::shared_ptr<re2::RE2> getMatcher() const;
     void appendColumnName(WriteBuffer & ostr) const override;
     void updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const override;
 
 protected:
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
-    std::shared_ptr<re2::RE2> column_matcher;
-    String original_pattern;
+    std::optional<String> pattern;
 };
 
 class ASTColumnsReplaceTransformer : public IASTColumnsTransformer
diff --git a/src/Parsers/ASTCreateIndexQuery.cpp b/src/Parsers/ASTCreateIndexQuery.cpp
index 17d4b9a9d58..f6def3ed85c 100644
--- a/src/Parsers/ASTCreateIndexQuery.cpp
+++ b/src/Parsers/ASTCreateIndexQuery.cpp
@@ -48,10 +48,12 @@ void ASTCreateIndexQuery::formatQueryImpl(const FormatSettings & settings, Forma
     {
         if (database)
         {
-            settings.ostr << indent_str << backQuoteIfNeed(getDatabase());
-            settings.ostr << ".";
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
         }
-        settings.ostr << indent_str << backQuoteIfNeed(getTable());
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
     }
 
     formatOnCluster(settings);
@@ -64,11 +66,13 @@ void ASTCreateIndexQuery::formatQueryImpl(const FormatSettings & settings, Forma
 ASTPtr ASTCreateIndexQuery::convertToASTAlterCommand() const
 {
     auto command = std::make_shared<ASTAlterCommand>();
+
     command->type = ASTAlterCommand::ADD_INDEX;
-    command->index = index_name->clone();
-    command->index_decl = index_decl->clone();
     command->if_not_exists = if_not_exists;
 
+    command->index = command->children.emplace_back(index_name).get();
+    command->index_decl = command->children.emplace_back(index_decl).get();
+
     return command;
 }
 
diff --git a/src/Parsers/ASTCreateIndexQuery.h b/src/Parsers/ASTCreateIndexQuery.h
index b7577f2634e..f5e35e270e9 100644
--- a/src/Parsers/ASTCreateIndexQuery.h
+++ b/src/Parsers/ASTCreateIndexQuery.h
@@ -16,7 +16,7 @@ class ASTCreateIndexQuery : public ASTQueryWithTableAndOutput, public ASTQueryWi
 public:
     ASTPtr index_name;
 
-    /// Stores the IndexDeclaration here.
+    /// Stores the ASTIndexDeclaration here.
     ASTPtr index_decl;
 
     bool if_not_exists{false};
diff --git a/src/Parsers/ASTCreateQuery.cpp b/src/Parsers/ASTCreateQuery.cpp
index 9d5f0bcddbd..0403dc33164 100644
--- a/src/Parsers/ASTCreateQuery.cpp
+++ b/src/Parsers/ASTCreateQuery.cpp
@@ -12,6 +12,37 @@
 namespace DB
 {
 
+void ASTSQLSecurity::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    if (!type)
+        return;
+
+    if (definer || is_definer_current_user)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DEFINER" << (settings.hilite ? hilite_none : "");
+        settings.ostr << " = ";
+        if (definer)
+            definer->formatImpl(settings, state, frame);
+        else
+            settings.ostr << "CURRENT_USER";
+        settings.ostr << " ";
+    }
+
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "SQL SECURITY" << (settings.hilite ? hilite_none : "");
+    switch (*type)
+    {
+        case SQLSecurityType::INVOKER:
+            settings.ostr << " INVOKER";
+            break;
+        case SQLSecurityType::DEFINER:
+            settings.ostr << " DEFINER";
+            break;
+        case SQLSecurityType::NONE:
+            settings.ostr << " NONE";
+            break;
+    }
+}
+
 ASTPtr ASTStorage::clone() const
 {
     auto res = std::make_shared<ASTStorage>(*this);
@@ -241,8 +272,9 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
         settings.ostr << (settings.hilite ? hilite_keyword : "")
             << (attach ? "ATTACH DATABASE " : "CREATE DATABASE ")
             << (if_not_exists ? "IF NOT EXISTS " : "")
-            << (settings.hilite ? hilite_none : "")
-            << backQuoteIfNeed(getDatabase());
+            << (settings.hilite ? hilite_none : "");
+
+        database->formatImpl(settings, state, frame);
 
         if (uuid != UUIDHelpers::Nil)
         {
@@ -292,14 +324,21 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
         else if (is_window_view)
             what = "WINDOW VIEW";
 
-        settings.ostr
-            << (settings.hilite ? hilite_keyword : "")
-                << action << " "
-                << (temporary ? "TEMPORARY " : "")
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << action << (settings.hilite ? hilite_none : "");
+        settings.ostr << " ";
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << (temporary ? "TEMPORARY " : "")
                 << what << " "
                 << (if_not_exists ? "IF NOT EXISTS " : "")
-            << (settings.hilite ? hilite_none : "")
-            << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+            << (settings.hilite ? hilite_none : "");
+
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
 
         if (uuid != UUIDHelpers::Nil)
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " UUID " << (settings.hilite ? hilite_none : "")
@@ -310,13 +349,6 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "")
                           << quoteString(*attach_from_path);
 
-        if (live_view_periodic_refresh)
-        {
-            settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH" << (settings.hilite ? hilite_none : "")
-                << (settings.hilite ? hilite_keyword : "") << " PERIODIC REFRESH " << (settings.hilite ? hilite_none : "")
-                << *live_view_periodic_refresh;
-        }
-
         formatOnCluster(settings);
     }
     else
@@ -331,8 +363,17 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
 
         /// Always DICTIONARY
         settings.ostr << (settings.hilite ? hilite_keyword : "") << action << " DICTIONARY "
-                      << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "")
-                      << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+                      << (if_not_exists ? "IF NOT EXISTS " : "") << (settings.hilite ? hilite_none : "");
+
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
+
         if (uuid != UUIDHelpers::Nil)
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " UUID " << (settings.hilite ? hilite_none : "")
                           << quoteString(toString(uuid));
@@ -444,10 +485,16 @@ void ASTCreateQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
     else if (is_create_empty)
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " EMPTY" << (settings.hilite ? hilite_none : "");
 
+    if (sql_security && sql_security->as<ASTSQLSecurity &>().type.has_value())
+    {
+        settings.ostr << settings.nl_or_ws;
+        sql_security->formatImpl(settings, state, frame);
+    }
+
     if (select)
     {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << " AS"
-                      << settings.nl_or_ws
+        settings.ostr << settings.nl_or_ws;
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "AS "
                       << (comment ? "(" : "") << (settings.hilite ? hilite_none : "");
         select->formatImpl(settings, state, frame);
         settings.ostr << (settings.hilite ? hilite_keyword : "") << (comment ? ")" : "") << (settings.hilite ? hilite_none : "");
diff --git a/src/Parsers/ASTCreateQuery.h b/src/Parsers/ASTCreateQuery.h
index 49a0140625c..64e6bc8ce48 100644
--- a/src/Parsers/ASTCreateQuery.h
+++ b/src/Parsers/ASTCreateQuery.h
@@ -5,6 +5,7 @@
 #include <Parsers/ASTDictionary.h>
 #include <Parsers/ASTDictionaryAttributeDeclaration.h>
 #include <Parsers/ASTTableOverrides.h>
+#include <Parsers/ASTSQLSecurity.h>
 #include <Parsers/ASTRefreshStrategy.h>
 #include <Interpreters/StorageID.h>
 
@@ -15,6 +16,7 @@ class ASTFunction;
 class ASTSetQuery;
 class ASTSelectWithUnionQuery;
 
+
 class ASTStorage : public IAST
 {
 public:
@@ -96,6 +98,7 @@ public:
     bool is_populate{false};
     bool is_create_empty{false};    /// CREATE TABLE ... EMPTY AS SELECT ...
     bool replace_view{false}; /// CREATE OR REPLACE VIEW
+    bool has_uuid{false}; // CREATE TABLE x UUID '...'
 
     ASTColumns * columns_list = nullptr;
 
@@ -110,6 +113,7 @@ public:
     IAST * as_table_function = nullptr;
     ASTSelectWithUnionQuery * select = nullptr;
     IAST * comment = nullptr;
+    ASTPtr sql_security = nullptr;
 
     ASTTableOverrideList * table_overrides = nullptr; /// For CREATE DATABASE with engines that automatically create tables
 
@@ -118,7 +122,6 @@ public:
     ASTDictionary * dictionary = nullptr; /// dictionary definition (layout, primary key, etc.)
 
     ASTRefreshStrategy * refresh_strategy = nullptr; // For CREATE MATERIALIZED VIEW ... REFRESH ...
-    std::optional<UInt64> live_view_periodic_refresh;    /// For CREATE LIVE VIEW ... WITH [PERIODIC] REFRESH ...
 
     bool is_watermark_strictly_ascending{false}; /// STRICTLY ASCENDING WATERMARK STRATEGY FOR WINDOW VIEW
     bool is_watermark_ascending{false}; /// ASCENDING WATERMARK STRATEGY FOR WINDOW VIEW
diff --git a/src/Parsers/ASTDeleteQuery.cpp b/src/Parsers/ASTDeleteQuery.cpp
index 09dc4b936ae..67f3a85c9a5 100644
--- a/src/Parsers/ASTDeleteQuery.cpp
+++ b/src/Parsers/ASTDeleteQuery.cpp
@@ -36,10 +36,12 @@ void ASTDeleteQuery::formatQueryImpl(const FormatSettings & settings, FormatStat
 
     if (database)
     {
-        settings.ostr << backQuoteIfNeed(getDatabase());
-        settings.ostr << ".";
+        database->formatImpl(settings, state, frame);
+        settings.ostr << '.';
     }
-    settings.ostr << backQuoteIfNeed(getTable());
+
+    chassert(table);
+    table->formatImpl(settings, state, frame);
 
     formatOnCluster(settings);
 
diff --git a/src/Parsers/ASTDescribeCacheQuery.cpp b/src/Parsers/ASTDescribeCacheQuery.cpp
new file mode 100644
index 00000000000..6daedfdb3a4
--- /dev/null
+++ b/src/Parsers/ASTDescribeCacheQuery.cpp
@@ -0,0 +1,23 @@
+#include <Parsers/ASTDescribeCacheQuery.h>
+#include <Common/quoteString.h>
+
+
+namespace DB
+{
+
+String ASTDescribeCacheQuery::getID(char) const { return "DescribeCacheQuery"; }
+
+ASTPtr ASTDescribeCacheQuery::clone() const
+{
+    auto res = std::make_shared<ASTDescribeCacheQuery>(*this);
+    cloneOutputOptions(*res);
+    return res;
+}
+
+void ASTDescribeCacheQuery::formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+{
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "DESCRIBE FILESYSTEM CACHE" << (settings.hilite ? hilite_none : "")
+        << " " << quoteString(cache_name);
+}
+
+}
diff --git a/src/Parsers/ASTDescribeCacheQuery.h b/src/Parsers/ASTDescribeCacheQuery.h
index 3d1cbaef070..55b841e03f6 100644
--- a/src/Parsers/ASTDescribeCacheQuery.h
+++ b/src/Parsers/ASTDescribeCacheQuery.h
@@ -1,6 +1,8 @@
 #pragma once
+
 #include <Parsers/ASTQueryWithOutput.h>
 
+
 namespace DB
 {
 
@@ -9,20 +11,11 @@ class ASTDescribeCacheQuery : public ASTQueryWithOutput
 public:
     String cache_name;
 
-    String getID(char) const override { return "DescribeCacheQuery"; }
-
-    ASTPtr clone() const override
-    {
-        auto res = std::make_shared<ASTDescribeCacheQuery>(*this);
-        cloneOutputOptions(*res);
-        return res;
-    }
+    String getID(char) const override;
+    ASTPtr clone() const override;
 
 protected:
-    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
-    {
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DESCRIBE FILESYSTEM CACHE" << (settings.hilite ? hilite_none : "") << " " << cache_name;
-    }
+    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
 };
 
 }
diff --git a/src/Parsers/ASTDropIndexQuery.cpp b/src/Parsers/ASTDropIndexQuery.cpp
index 43de582ba8a..1109f32f019 100644
--- a/src/Parsers/ASTDropIndexQuery.cpp
+++ b/src/Parsers/ASTDropIndexQuery.cpp
@@ -43,10 +43,12 @@ void ASTDropIndexQuery::formatQueryImpl(const FormatSettings & settings, FormatS
     {
         if (database)
         {
-            settings.ostr << indent_str << backQuoteIfNeed(getDatabase());
-            settings.ostr << ".";
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
         }
-        settings.ostr << indent_str << backQuoteIfNeed(getTable());
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
     }
 
     formatOnCluster(settings);
@@ -55,10 +57,12 @@ void ASTDropIndexQuery::formatQueryImpl(const FormatSettings & settings, FormatS
 ASTPtr ASTDropIndexQuery::convertToASTAlterCommand() const
 {
     auto command = std::make_shared<ASTAlterCommand>();
+
     command->type = ASTAlterCommand::DROP_INDEX;
-    command->index = index_name->clone();
     command->if_exists = if_exists;
 
+    command->index = command->children.emplace_back(index_name).get();
+
     return command;
 }
 
diff --git a/src/Parsers/ASTDropQuery.cpp b/src/Parsers/ASTDropQuery.cpp
index ad1294c6e71..ecb9ad8169b 100644
--- a/src/Parsers/ASTDropQuery.cpp
+++ b/src/Parsers/ASTDropQuery.cpp
@@ -1,4 +1,6 @@
 #include <Parsers/ASTDropQuery.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTExpressionList.h>
 #include <Common/quoteString.h>
 #include <IO/Operators.h>
 
@@ -32,7 +34,7 @@ ASTPtr ASTDropQuery::clone() const
     return res;
 }
 
-void ASTDropQuery::formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+void ASTDropQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
     settings.ostr << (settings.hilite ? hilite_keyword : "");
     if (kind == ASTDropQuery::Kind::Drop)
@@ -47,8 +49,9 @@ void ASTDropQuery::formatQueryImpl(const FormatSettings & settings, FormatState
     if (temporary)
         settings.ostr << "TEMPORARY ";
 
-
-    if (!table && database)
+    if (has_all_tables)
+        settings.ostr << "ALL TABLES ";
+    else if (!table && !database_and_tables && database)
         settings.ostr << "DATABASE ";
     else if (is_dictionary)
         settings.ostr << "DICTIONARY ";
@@ -65,10 +68,44 @@ void ASTDropQuery::formatQueryImpl(const FormatSettings & settings, FormatState
 
     settings.ostr << (settings.hilite ? hilite_none : "");
 
-    if (!table && database)
-        settings.ostr << backQuoteIfNeed(getDatabase());
+    if (!table && !database_and_tables && database)
+    {
+        database->formatImpl(settings, state, frame);
+    }
+    else if (database_and_tables)
+    {
+        auto & list = database_and_tables->as<ASTExpressionList &>();
+        for (auto * it = list.children.begin(); it != list.children.end(); ++it)
+        {
+            if (it != list.children.begin())
+                settings.ostr << ", ";
+
+            auto identifier = dynamic_pointer_cast<ASTTableIdentifier>(*it);
+            if (!identifier)
+                throw Exception(ErrorCodes::SYNTAX_ERROR, "Unexpected type for list of table names.");
+
+            if (auto db = identifier->getDatabase())
+            {
+                db->formatImpl(settings, state, frame);
+                settings.ostr << '.';
+            }
+
+            auto tb = identifier->getTable();
+            chassert(tb);
+            tb->formatImpl(settings, state, frame);
+        }
+    }
     else
-        settings.ostr << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+    {
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
+    }
 
     formatOnCluster(settings);
 
@@ -79,4 +116,39 @@ void ASTDropQuery::formatQueryImpl(const FormatSettings & settings, FormatState
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " SYNC" << (settings.hilite ? hilite_none : "");
 }
 
+ASTs ASTDropQuery::getRewrittenASTsOfSingleTable()
+{
+    ASTs res;
+    if (database_and_tables == nullptr)
+    {
+        res.push_back(shared_from_this());
+        return res;
+    }
+
+    auto & list = database_and_tables->as<ASTExpressionList &>();
+    for (const auto & child : list.children)
+    {
+        auto cloned = clone();
+        auto & query = cloned->as<ASTDropQuery &>();
+        query.database_and_tables = nullptr;
+        query.children.clear();
+
+        auto database_and_table = dynamic_pointer_cast<ASTTableIdentifier>(child);
+        if (!database_and_table)
+            throw Exception(ErrorCodes::SYNTAX_ERROR, "Unexpected type for list of table names.");
+
+        query.database = database_and_table->getDatabase();
+        query.table = database_and_table->getTable();
+
+        if (query.database)
+            query.children.push_back(query.database);
+
+        if (query.table)
+            query.children.push_back(query.table);
+
+        res.push_back(cloned);
+    }
+    return res;
+}
+
 }
diff --git a/src/Parsers/ASTDropQuery.h b/src/Parsers/ASTDropQuery.h
index a732b354260..e0e908733e5 100644
--- a/src/Parsers/ASTDropQuery.h
+++ b/src/Parsers/ASTDropQuery.h
@@ -26,6 +26,9 @@ public:
     /// Useful if we already have a DDL lock
     bool no_ddl_lock{false};
 
+    /// For `TRUNCATE ALL TABLES` query
+    bool has_all_tables{false};
+
     /// We dropping dictionary, so print correct word
     bool is_dictionary{false};
 
@@ -37,6 +40,9 @@ public:
     // We detach the object permanently, so it will not be reattached back during server restart.
     bool permanently{false};
 
+    /// Example: Drop TABLE t1, t2, t3...
+    ASTPtr database_and_tables;
+
     /** Get the text that identifies this element. */
     String getID(char) const override;
     ASTPtr clone() const override;
@@ -46,6 +52,8 @@ public:
         return removeOnCluster<ASTDropQuery>(clone(), params.default_database);
     }
 
+    ASTs getRewrittenASTsOfSingleTable();
+
     QueryKind getQueryKind() const override { return QueryKind::Drop; }
 
 protected:
diff --git a/src/Parsers/ASTExpressionList.cpp b/src/Parsers/ASTExpressionList.cpp
index 2590c6b2941..61ac482af82 100644
--- a/src/Parsers/ASTExpressionList.cpp
+++ b/src/Parsers/ASTExpressionList.cpp
@@ -17,21 +17,23 @@ void ASTExpressionList::formatImpl(const FormatSettings & settings, FormatState
     if (frame.expression_list_prepend_whitespace)
         settings.ostr << ' ';
 
-    for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
+    for (size_t i = 0, size = children.size(); i < size; ++i)
     {
-        if (it != children.begin())
+        if (i)
         {
             if (separator)
                 settings.ostr << separator;
             settings.ostr << ' ';
         }
 
+        FormatStateStacked frame_nested = frame;
+        frame_nested.surround_each_list_element_with_parens = false;
+        frame_nested.list_element_index = i;
+
         if (frame.surround_each_list_element_with_parens)
             settings.ostr << "(";
 
-        FormatStateStacked frame_nested = frame;
-        frame_nested.surround_each_list_element_with_parens = false;
-        (*it)->formatImpl(settings, state, frame_nested);
+        children[i]->formatImpl(settings, state, frame_nested);
 
         if (frame.surround_each_list_element_with_parens)
             settings.ostr << ")";
@@ -50,25 +52,23 @@ void ASTExpressionList::formatImplMultiline(const FormatSettings & settings, For
 
     ++frame.indent;
 
-    for (ASTs::const_iterator it = children.begin(); it != children.end(); ++it)
+    for (size_t i = 0, size = children.size(); i < size; ++i)
     {
-        if (it != children.begin())
-        {
-            if (separator)
-                settings.ostr << separator;
-        }
+        if (i && separator)
+            settings.ostr << separator;
 
-        if (children.size() > 1 || frame.expression_list_always_start_on_new_line)
+        if (size > 1 || frame.expression_list_always_start_on_new_line)
             settings.ostr << indent_str;
 
         FormatStateStacked frame_nested = frame;
         frame_nested.expression_list_always_start_on_new_line = false;
         frame_nested.surround_each_list_element_with_parens = false;
+        frame_nested.list_element_index = i;
 
         if (frame.surround_each_list_element_with_parens)
             settings.ostr << "(";
 
-        (*it)->formatImpl(settings, state, frame_nested);
+        children[i]->formatImpl(settings, state, frame_nested);
 
         if (frame.surround_each_list_element_with_parens)
             settings.ostr << ")";
diff --git a/src/Parsers/ASTFunction.cpp b/src/Parsers/ASTFunction.cpp
index e309dec2131..cdc9a471e98 100644
--- a/src/Parsers/ASTFunction.cpp
+++ b/src/Parsers/ASTFunction.cpp
@@ -18,6 +18,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTSetQuery.h>
+#include <Parsers/FunctionSecretArgumentsFinderAST.h>
 #include <Core/QualifiedTableName.h>
 
 #include <boost/algorithm/string.hpp>
@@ -36,464 +37,6 @@ namespace ErrorCodes
 }
 
 
-namespace
-{
-    /// Finds arguments of a specified function which should not be displayed for most users for security reasons.
-    /// That involves passwords and secret keys.
-    class FunctionSecretArgumentsFinder
-    {
-    public:
-        explicit FunctionSecretArgumentsFinder(const ASTFunction & function_) : function(function_)
-        {
-            if (!function.arguments)
-                return;
-
-            const auto * expr_list = function.arguments->as<ASTExpressionList>();
-            if (!expr_list)
-                return;
-
-            arguments = &expr_list->children;
-            switch (function.kind)
-            {
-                case ASTFunction::Kind::ORDINARY_FUNCTION: findOrdinaryFunctionSecretArguments(); break;
-                case ASTFunction::Kind::WINDOW_FUNCTION: break;
-                case ASTFunction::Kind::LAMBDA_FUNCTION:  break;
-                case ASTFunction::Kind::TABLE_ENGINE: findTableEngineSecretArguments(); break;
-                case ASTFunction::Kind::DATABASE_ENGINE: findDatabaseEngineSecretArguments(); break;
-                case ASTFunction::Kind::BACKUP_NAME: findBackupNameSecretArguments(); break;
-            }
-        }
-
-        struct Result
-        {
-            /// Result constructed by default means no arguments will be hidden.
-            size_t start = static_cast<size_t>(-1);
-            size_t count = 0; /// Mostly it's either 0 or 1. There are only a few cases where `count` can be greater than 1 (e.g. see `encrypt`).
-                              /// In all known cases secret arguments are consecutive
-            bool are_named = false; /// Arguments like `password = 'password'` are considered as named arguments.
-        };
-
-        Result getResult() const { return result; }
-
-    private:
-        const ASTFunction & function;
-        const ASTs * arguments = nullptr;
-        Result result;
-
-        void markSecretArgument(size_t index, bool argument_is_named = false)
-        {
-            if (index >= arguments->size())
-                return;
-            if (!result.count)
-            {
-                result.start = index;
-                result.are_named = argument_is_named;
-            }
-            chassert(index >= result.start); /// We always check arguments consecutively
-            result.count = index + 1 - result.start;
-            if (!argument_is_named)
-                result.are_named = false;
-        }
-
-        void findOrdinaryFunctionSecretArguments()
-        {
-            if ((function.name == "mysql") || (function.name == "postgresql") || (function.name == "mongodb"))
-            {
-                /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
-                /// postgresql('host:port', 'database', 'table', 'user', 'password', ...)
-                /// mongodb('host:port', 'database', 'collection', 'user', 'password', ...)
-                findMySQLFunctionSecretArguments();
-            }
-            else if ((function.name == "s3") || (function.name == "cosn") || (function.name == "oss") ||
-                     (function.name == "deltaLake") || (function.name == "hudi") || (function.name == "iceberg"))
-            {
-                /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
-                findS3FunctionSecretArguments(/* is_cluster_function= */ false);
-            }
-            else if (function.name == "s3Cluster")
-            {
-                /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', ...)
-                findS3FunctionSecretArguments(/* is_cluster_function= */ true);
-            }
-            else if ((function.name == "remote") || (function.name == "remoteSecure"))
-            {
-                /// remote('addresses_expr', 'db', 'table', 'user', 'password', ...)
-                findRemoteFunctionSecretArguments();
-            }
-            else if ((function.name == "encrypt") || (function.name == "decrypt") ||
-                     (function.name == "aes_encrypt_mysql") || (function.name == "aes_decrypt_mysql") ||
-                     (function.name == "tryDecrypt"))
-            {
-                /// encrypt('mode', 'plaintext', 'key' [, iv, aad])
-                findEncryptionFunctionSecretArguments();
-            }
-        }
-
-        void findMySQLFunctionSecretArguments()
-        {
-            if (isNamedCollectionName(0))
-            {
-                /// mysql(named_collection, ..., password = 'password', ...)
-                findSecretNamedArgument("password", 1);
-            }
-            else
-            {
-                /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
-                markSecretArgument(4);
-            }
-        }
-
-        void findS3FunctionSecretArguments(bool is_cluster_function)
-        {
-            /// s3Cluster('cluster_name', 'url', ...) has 'url' as its second argument.
-            size_t url_arg_idx = is_cluster_function ? 1 : 0;
-
-            if (!is_cluster_function && isNamedCollectionName(0))
-            {
-                /// s3(named_collection, ..., secret_access_key = 'secret_access_key', ...)
-                findSecretNamedArgument("secret_access_key", 1);
-                return;
-            }
-
-            /// We should check other arguments first because we don't need to do any replacement in case of
-            /// s3('url', NOSIGN, 'format' [, 'compression'])
-            /// s3('url', 'format', 'structure' [, 'compression'])
-            if ((url_arg_idx + 3 <= arguments->size()) && (arguments->size() <= url_arg_idx + 4))
-            {
-                String second_arg;
-                if (tryGetStringFromArgument(url_arg_idx + 1, &second_arg))
-                {
-                    if (boost::iequals(second_arg, "NOSIGN"))
-                        return; /// The argument after 'url' is "NOSIGN".
-
-                    if (second_arg == "auto" || KnownFormatNames::instance().exists(second_arg))
-                        return; /// The argument after 'url' is a format: s3('url', 'format', ...)
-                }
-            }
-
-            /// We're going to replace 'aws_secret_access_key' with '[HIDDEN]' for the following signatures:
-            /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
-            /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', 'format', 'compression')
-            markSecretArgument(url_arg_idx + 2);
-        }
-
-        bool tryGetStringFromArgument(size_t arg_idx, String * res, bool allow_identifier = true) const
-        {
-            if (arg_idx >= arguments->size())
-                return false;
-
-            return tryGetStringFromArgument(*(*arguments)[arg_idx], res, allow_identifier);
-        }
-
-        static bool tryGetStringFromArgument(const IAST & argument, String * res, bool allow_identifier = true)
-        {
-            if (const auto * literal = argument.as<ASTLiteral>())
-            {
-                if (literal->value.getType() != Field::Types::String)
-                    return false;
-                if (res)
-                    *res = literal->value.safeGet<String>();
-                return true;
-            }
-
-            if (allow_identifier)
-            {
-                if (const auto * id = argument.as<ASTIdentifier>())
-                {
-                    if (res)
-                        *res = id->name();
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        void findRemoteFunctionSecretArguments()
-        {
-            if (isNamedCollectionName(0))
-            {
-                /// remote(named_collection, ..., password = 'password', ...)
-                findSecretNamedArgument("password", 1);
-                return;
-            }
-
-            /// We're going to replace 'password' with '[HIDDEN'] for the following signatures:
-            /// remote('addresses_expr', db.table, 'user' [, 'password'] [, sharding_key])
-            /// remote('addresses_expr', 'db', 'table', 'user' [, 'password'] [, sharding_key])
-            /// remote('addresses_expr', table_function(), 'user' [, 'password'] [, sharding_key])
-
-            /// But we should check the number of arguments first because we don't need to do any replacements in case of
-            /// remote('addresses_expr', db.table)
-            if (arguments->size() < 3)
-                return;
-
-            size_t arg_num = 1;
-
-            /// Skip 1 or 2 arguments with table_function() or db.table or 'db', 'table'.
-            const auto * table_function = (*arguments)[arg_num]->as<ASTFunction>();
-            if (table_function && KnownTableFunctionNames::instance().exists(table_function->name))
-            {
-                ++arg_num;
-            }
-            else
-            {
-                std::optional<String> database;
-                std::optional<QualifiedTableName> qualified_table_name;
-                if (!tryGetDatabaseNameOrQualifiedTableName(arg_num, database, qualified_table_name))
-                {
-                    /// We couldn't evaluate the argument so we don't know whether it is 'db.table' or just 'db'.
-                    /// Hence we can't figure out whether we should skip one argument 'user' or two arguments 'table', 'user'
-                    /// before the argument 'password'. So it's safer to wipe two arguments just in case.
-                    /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
-                    /// before wiping it (because the `password` argument is always a literal string).
-                    if (tryGetStringFromArgument(arg_num + 2, nullptr, /* allow_identifier= */ false))
-                    {
-                        /// Wipe either `password` or `user`.
-                        markSecretArgument(arg_num + 2);
-                    }
-                    if (tryGetStringFromArgument(arg_num + 3, nullptr, /* allow_identifier= */ false))
-                    {
-                        /// Wipe either `password` or `sharding_key`.
-                        markSecretArgument(arg_num + 3);
-                    }
-                    return;
-                }
-
-                /// Skip the current argument (which is either a database name or a qualified table name).
-                ++arg_num;
-                if (database)
-                {
-                    /// Skip the 'table' argument if the previous argument was a database name.
-                    ++arg_num;
-                }
-            }
-
-            /// Skip username.
-            ++arg_num;
-
-            /// Do our replacement:
-            /// remote('addresses_expr', db.table, 'user', 'password', ...) -> remote('addresses_expr', db.table, 'user', '[HIDDEN]', ...)
-            /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
-            /// before wiping it (because the `password` argument is always a literal string).
-            bool can_be_password = tryGetStringFromArgument(arg_num, nullptr, /* allow_identifier= */ false);
-            if (can_be_password)
-                markSecretArgument(arg_num);
-        }
-
-        /// Tries to get either a database name or a qualified table name from an argument.
-        /// Empty string is also allowed (it means the default database).
-        /// The function is used by findRemoteFunctionSecretArguments() to determine how many arguments to skip before a password.
-        bool tryGetDatabaseNameOrQualifiedTableName(
-            size_t arg_idx,
-            std::optional<String> & res_database,
-            std::optional<QualifiedTableName> & res_qualified_table_name) const
-        {
-            res_database.reset();
-            res_qualified_table_name.reset();
-
-            String str;
-            if (!tryGetStringFromArgument(arg_idx, &str, /* allow_identifier= */ true))
-                return false;
-
-            if (str.empty())
-            {
-                res_database = "";
-                return true;
-            }
-
-            auto qualified_table_name = QualifiedTableName::tryParseFromString(str);
-            if (!qualified_table_name)
-                return false;
-
-            if (qualified_table_name->database.empty())
-                res_database = std::move(qualified_table_name->table);
-            else
-                res_qualified_table_name = std::move(qualified_table_name);
-            return true;
-        }
-
-        void findEncryptionFunctionSecretArguments()
-        {
-            if (arguments->empty())
-                return;
-
-            /// We replace all arguments after 'mode' with '[HIDDEN]':
-            /// encrypt('mode', 'plaintext', 'key' [, iv, aad]) -> encrypt('mode', '[HIDDEN]')
-            result.start = 1;
-            result.count = arguments->size() - 1;
-        }
-
-        void findTableEngineSecretArguments()
-        {
-            const String & engine_name = function.name;
-            if (engine_name == "ExternalDistributed")
-            {
-                /// ExternalDistributed('engine', 'host:port', 'database', 'table', 'user', 'password')
-                findExternalDistributedTableEngineSecretArguments();
-            }
-            else if ((engine_name == "MySQL") || (engine_name == "PostgreSQL") ||
-                     (engine_name == "MaterializedPostgreSQL") || (engine_name == "MongoDB"))
-            {
-                /// MySQL('host:port', 'database', 'table', 'user', 'password', ...)
-                /// PostgreSQL('host:port', 'database', 'table', 'user', 'password', ...)
-                /// MaterializedPostgreSQL('host:port', 'database', 'table', 'user', 'password', ...)
-                /// MongoDB('host:port', 'database', 'collection', 'user', 'password', ...)
-                findMySQLFunctionSecretArguments();
-            }
-            else if ((engine_name == "S3") || (engine_name == "COSN") || (engine_name == "OSS") ||
-                     (engine_name == "DeltaLake") || (engine_name == "Hudi") || (engine_name == "Iceberg"))
-            {
-                /// S3('url', ['aws_access_key_id', 'aws_secret_access_key',] ...)
-                findS3TableEngineSecretArguments();
-            }
-        }
-
-        void findExternalDistributedTableEngineSecretArguments()
-        {
-            if (isNamedCollectionName(1))
-            {
-                /// ExternalDistributed('engine', named_collection, ..., password = 'password', ...)
-                findSecretNamedArgument("password", 2);
-            }
-            else
-            {
-                /// ExternalDistributed('engine', 'host:port', 'database', 'table', 'user', 'password')
-                markSecretArgument(5);
-            }
-        }
-
-        void findS3TableEngineSecretArguments()
-        {
-            if (isNamedCollectionName(0))
-            {
-                /// S3(named_collection, ..., secret_access_key = 'secret_access_key')
-                findSecretNamedArgument("secret_access_key", 1);
-                return;
-            }
-
-            /// We should check other arguments first because we don't need to do any replacement in case of
-            /// S3('url', NOSIGN, 'format' [, 'compression'])
-            /// S3('url', 'format', 'compression')
-            if ((3 <= arguments->size()) && (arguments->size() <= 4))
-            {
-                String second_arg;
-                if (tryGetStringFromArgument(1, &second_arg))
-                {
-                    if (boost::iequals(second_arg, "NOSIGN"))
-                        return; /// The argument after 'url' is "NOSIGN".
-
-                    if (arguments->size() == 3)
-                    {
-                        if (second_arg == "auto" || KnownFormatNames::instance().exists(second_arg))
-                            return; /// The argument after 'url' is a format: S3('url', 'format', ...)
-                    }
-                }
-            }
-
-            /// We replace 'aws_secret_access_key' with '[HIDDEN'] for the following signatures:
-            /// 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')
-            markSecretArgument(2);
-        }
-
-        void findDatabaseEngineSecretArguments()
-        {
-            const String & engine_name = function.name;
-            if ((engine_name == "MySQL") || (engine_name == "MaterializeMySQL") ||
-                (engine_name == "MaterializedMySQL") || (engine_name == "PostgreSQL") ||
-                (engine_name == "MaterializedPostgreSQL"))
-            {
-                /// MySQL('host:port', 'database', 'user', 'password')
-                /// PostgreSQL('host:port', 'database', 'user', 'password')
-                findMySQLDatabaseSecretArguments();
-            }
-            else if (engine_name == "S3")
-            {
-                /// S3('url', 'access_key_id', 'secret_access_key')
-                findS3DatabaseSecretArguments();
-            }
-        }
-
-        void findMySQLDatabaseSecretArguments()
-        {
-            if (isNamedCollectionName(0))
-            {
-                /// MySQL(named_collection, ..., password = 'password', ...)
-                findSecretNamedArgument("password", 1);
-            }
-            else
-            {
-                /// MySQL('host:port', 'database', 'user', 'password')
-                markSecretArgument(3);
-            }
-        }
-
-        void findS3DatabaseSecretArguments()
-        {
-            if (isNamedCollectionName(0))
-            {
-                /// S3(named_collection, ..., secret_access_key = 'password', ...)
-                findSecretNamedArgument("secret_access_key", 1);
-            }
-            else
-            {
-                /// S3('url', 'access_key_id', 'secret_access_key')
-                markSecretArgument(2);
-            }
-        }
-
-        void findBackupNameSecretArguments()
-        {
-            const String & engine_name = function.name;
-            if (engine_name == "S3")
-            {
-                /// BACKUP ... TO S3(url, [aws_access_key_id, aws_secret_access_key])
-                markSecretArgument(2);
-            }
-        }
-
-        /// Whether a specified argument can be the name of a named collection?
-        bool isNamedCollectionName(size_t arg_idx) const
-        {
-            if (arguments->size() <= arg_idx)
-                return false;
-
-            const auto * identifier = (*arguments)[arg_idx]->as<ASTIdentifier>();
-            return identifier != nullptr;
-        }
-
-        /// Looks for a secret argument with a specified name. This function looks for arguments in format `key=value` where the key is specified.
-        void findSecretNamedArgument(const std::string_view & key, size_t start = 0)
-        {
-            for (size_t i = start; i < arguments->size(); ++i)
-            {
-                const auto & argument = (*arguments)[i];
-                const auto * equals_func = argument->as<ASTFunction>();
-                if (!equals_func || (equals_func->name != "equals"))
-                    continue;
-
-                const auto * expr_list = equals_func->arguments->as<ASTExpressionList>();
-                if (!expr_list)
-                    continue;
-
-                const auto & equal_args = expr_list->children;
-                if (equal_args.size() != 2)
-                    continue;
-
-                String found_key;
-                if (!tryGetStringFromArgument(*equal_args[0], &found_key))
-                    continue;
-
-                if (found_key == key)
-                    markSecretArgument(i, /* argument_is_named= */ true);
-            }
-        }
-    };
-}
-
-
 void ASTFunction::appendColumnNameImpl(WriteBuffer & ostr) const
 {
     /// These functions contain some unexpected ASTs in arguments (e.g. SETTINGS or even a SELECT query)
@@ -724,6 +267,25 @@ ASTSelectWithUnionQuery * ASTFunction::tryGetQueryArgument() const
 }
 
 
+static bool formatNamedArgWithHiddenValue(IAST * arg, const IAST::FormatSettings & settings, IAST::FormatState & state, IAST::FormatStateStacked frame)
+{
+    const auto * equals_func = arg->as<ASTFunction>();
+    if (!equals_func || (equals_func->name != "equals"))
+        return false;
+    const auto * expr_list = equals_func->arguments->as<ASTExpressionList>();
+    if (!expr_list)
+        return false;
+    const auto & equal_args = expr_list->children;
+    if (equal_args.size() != 2)
+        return false;
+
+    equal_args[0]->formatImpl(settings, state, frame);
+    settings.ostr << (settings.hilite ? IAST::hilite_operator : "") << " = " << (settings.hilite ? IAST::hilite_none : "");
+    settings.ostr << "'[HIDDEN]'";
+
+    return true;
+}
+
 void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
     frame.expression_list_prepend_whitespace = false;
@@ -750,8 +312,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
     /// Should this function to be written as operator?
     bool written = false;
-
-    if (arguments && !parameters)
+    if (arguments && !parameters && nulls_action == NullsAction::EMPTY)
     {
         /// Unary prefix operators.
         if (arguments->children.size() == 1)
@@ -772,34 +333,37 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
                 const auto * literal = arguments->children[0]->as<ASTLiteral>();
                 const auto * function = arguments->children[0]->as<ASTFunction>();
-                bool negate = name == "negate";
                 bool is_tuple = literal && literal->value.getType() == Field::Types::Tuple;
                 // do not add parentheses for tuple literal, otherwise extra parens will be added `-((3, 7, 3), 1)` -> `-(((3, 7, 3), 1))`
                 bool literal_need_parens = literal && !is_tuple;
+
                 // negate always requires parentheses, otherwise -(-1) will be printed as --1
-                bool negate_need_parens = negate && (literal_need_parens || (function && function->name == "negate"));
-                // We don't need parentheses around a single literal.
-                bool need_parens = !literal && frame.need_parens && !negate_need_parens;
+                bool inside_parens = name == "negate" && (literal_need_parens || (function && function->name == "negate"));
+
+                /// We DO need parentheses around a single literal
+                /// For example, SELECT (NOT 0) + (NOT 0) cannot be transformed into SELECT NOT 0 + NOT 0, since
+                /// this is equal to SELECT NOT (0 + NOT 0)
+                bool outside_parens = frame.need_parens && !inside_parens;
 
                 // do not add extra parentheses for functions inside negate, i.e. -(-toUInt64(-(1)))
-                if (negate_need_parens)
+                if (inside_parens)
                     nested_need_parens.need_parens = false;
 
-                if (need_parens)
+                if (outside_parens)
                     settings.ostr << '(';
 
                 settings.ostr << (settings.hilite ? hilite_operator : "") << func[1] << (settings.hilite ? hilite_none : "");
 
-                if (negate_need_parens)
+                if (inside_parens)
                     settings.ostr << '(';
 
                 arguments->formatImpl(settings, state, nested_need_parens);
                 written = true;
 
-                if (negate_need_parens)
+                if (inside_parens)
                     settings.ostr << ')';
 
-                if (need_parens)
+                if (outside_parens)
                     settings.ostr << ')';
 
                 break;
@@ -971,31 +535,39 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                 }
             }
 
-            if (!written && name == "lambda"sv)
+            const auto & first_argument = arguments->children[0];
+            const ASTIdentifier * first_argument_identifier = first_argument->as<ASTIdentifier>();
+            const ASTFunction * first_argument_function = first_argument->as<ASTFunction>();
+            bool first_argument_is_tuple = first_argument_function && first_argument_function->name == "tuple";
+
+            /// Only these types of arguments are accepted by the parser of the '->' operator.
+            bool acceptable_first_argument_for_lambda_expression = first_argument_identifier || first_argument_is_tuple;
+
+            if (!written && name == "lambda"sv && acceptable_first_argument_for_lambda_expression)
             {
                 /// Special case: zero elements tuple in lhs of lambda is printed as ().
                 /// Special case: one-element tuple in lhs of lambda is printed as its element.
+                /// If lambda function is not the first element in the list, it has to be put in parentheses.
+                /// Example: f(x, (y -> z)) should not be printed as f((x, y) -> z).
 
-                if (frame.need_parens)
+                if (frame.need_parens || frame.list_element_index > 0)
                     settings.ostr << '(';
 
-                const auto * first_arg_func = arguments->children[0]->as<ASTFunction>();
-                if (first_arg_func
-                    && first_arg_func->name == "tuple"
-                    && first_arg_func->arguments
-                    && (first_arg_func->arguments->children.size() == 1 || first_arg_func->arguments->children.empty()))
+                if (first_argument_is_tuple
+                    && first_argument_function->arguments
+                    && (first_argument_function->arguments->children.size() == 1 || first_argument_function->arguments->children.empty()))
                 {
-                    if (first_arg_func->arguments->children.size() == 1)
-                        first_arg_func->arguments->children[0]->formatImpl(settings, state, nested_need_parens);
+                    if (first_argument_function->arguments->children.size() == 1)
+                        first_argument_function->arguments->children[0]->formatImpl(settings, state, nested_need_parens);
                     else
                         settings.ostr << "()";
                 }
                 else
-                    arguments->children[0]->formatImpl(settings, state, nested_need_parens);
+                    first_argument->formatImpl(settings, state, nested_need_parens);
 
                 settings.ostr << (settings.hilite ? hilite_operator : "") << " -> " << (settings.hilite ? hilite_none : "");
                 arguments->children[1]->formatImpl(settings, state, nested_need_parens);
-                if (frame.need_parens)
+                if (frame.need_parens || frame.list_element_index > 0)
                     settings.ostr << ')';
                 written = true;
             }
@@ -1122,7 +694,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
         FunctionSecretArgumentsFinder::Result secret_arguments;
         if (!settings.show_secrets)
-            secret_arguments = FunctionSecretArgumentsFinder{*this}.getResult();
+            secret_arguments = FunctionSecretArgumentsFinderAST(*this).getResult();
 
         for (size_t i = 0, size = arguments->children.size(); i < size; ++i)
         {
@@ -1133,17 +705,37 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
             if (argument->as<ASTSetQuery>())
                 settings.ostr << "SETTINGS ";
 
-            if (!settings.show_secrets && (secret_arguments.start <= i) && (i < secret_arguments.start + secret_arguments.count))
+            if (!settings.show_secrets)
             {
-                if (secret_arguments.are_named)
+                if (secret_arguments.start <= i && i < secret_arguments.start + secret_arguments.count)
                 {
-                   assert_cast<const ASTFunction *>(argument.get())->arguments->children[0]->formatImpl(settings, state, nested_dont_need_parens);
-                   settings.ostr << (settings.hilite ? hilite_operator : "") << " = " << (settings.hilite ? hilite_none : "");
+                    if (secret_arguments.are_named)
+                    {
+                        assert_cast<const ASTFunction *>(argument.get())->arguments->children[0]->formatImpl(settings, state, nested_dont_need_parens);
+                        settings.ostr << (settings.hilite ? hilite_operator : "") << " = " << (settings.hilite ? hilite_none : "");
+                    }
+                    settings.ostr << "'[HIDDEN]'";
+                    if (size <= secret_arguments.start + secret_arguments.count && !secret_arguments.are_named)
+                        break; /// All other arguments should also be hidden.
+                    continue;
+                }
+
+                const ASTFunction * function = argument->as<ASTFunction>();
+                if (function && function->arguments && std::count(secret_arguments.nested_maps.begin(), secret_arguments.nested_maps.end(), function->name) != 0)
+                {
+                    /// headers('foo' = '[HIDDEN]', 'bar' = '[HIDDEN]')
+                    settings.ostr << (settings.hilite ? hilite_function : "") << function->name << (settings.hilite ? hilite_none : "") << "(";
+                    for (size_t j = 0; j < function->arguments->children.size(); ++j)
+                    {
+                        if (j != 0)
+                            settings.ostr << ", ";
+                        auto inner_arg = function->arguments->children[j];
+                        if (!formatNamedArgWithHiddenValue(inner_arg.get(), settings, state, nested_dont_need_parens))
+                            inner_arg->formatImpl(settings, state, nested_dont_need_parens);
+                    }
+                    settings.ostr << ")";
+                    continue;
                 }
-                settings.ostr << "'[HIDDEN]'";
-                if (size <= secret_arguments.start + secret_arguments.count && !secret_arguments.are_named)
-                    break; /// All other arguments should also be hidden.
-                continue;
             }
 
             if ((i == 1) && special_hilite_regexp
@@ -1152,6 +744,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
                 continue;
             }
 
+            nested_dont_need_parens.list_element_index = i;
             argument->formatImpl(settings, state, nested_dont_need_parens);
         }
     }
@@ -1166,7 +759,7 @@ void ASTFunction::formatImplWithoutAlias(const FormatSettings & settings, Format
 
 bool ASTFunction::hasSecretParts() const
 {
-    return (FunctionSecretArgumentsFinder{*this}.getResult().count > 0) || childrenHaveSecretParts();
+    return (FunctionSecretArgumentsFinderAST(*this).getResult().hasSecrets()) || childrenHaveSecretParts();
 }
 
 String getFunctionName(const IAST * ast)
@@ -1200,4 +793,15 @@ bool tryGetFunctionNameInto(const IAST * ast, String & name)
     return false;
 }
 
+bool isASTLambdaFunction(const ASTFunction & function)
+{
+    if (function.name == "lambda" && function.arguments && function.arguments->children.size() == 2)
+    {
+        const auto * lambda_args_tuple = function.arguments->children.at(0)->as<ASTFunction>();
+        return lambda_args_tuple && lambda_args_tuple->name == "tuple";
+    }
+
+    return false;
+}
+
 }
diff --git a/src/Parsers/ASTFunction.h b/src/Parsers/ASTFunction.h
index 631b6285bfa..3a94691f25d 100644
--- a/src/Parsers/ASTFunction.h
+++ b/src/Parsers/ASTFunction.h
@@ -111,4 +111,7 @@ inline String getFunctionName(const ASTPtr & ast) { return getFunctionName(ast.g
 inline std::optional<String> tryGetFunctionName(const ASTPtr & ast) { return tryGetFunctionName(ast.get()); }
 inline bool tryGetFunctionNameInto(const ASTPtr & ast, String & name) { return tryGetFunctionNameInto(ast.get(), name); }
 
+/// Checks if function is a lambda function definition `lambda((x, y), x + y)`
+bool isASTLambdaFunction(const ASTFunction & function);
+
 }
diff --git a/src/Parsers/ASTIndexDeclaration.cpp b/src/Parsers/ASTIndexDeclaration.cpp
index 12d59681cc3..0c36644356f 100644
--- a/src/Parsers/ASTIndexDeclaration.cpp
+++ b/src/Parsers/ASTIndexDeclaration.cpp
@@ -8,24 +8,63 @@
 namespace DB
 {
 
-ASTPtr ASTIndexDeclaration::clone() const
+namespace ErrorCodes
 {
-    auto res = std::make_shared<ASTIndexDeclaration>();
-
-    res->name = name;
-    if (granularity)
-        res->granularity = granularity;
-    if (expr)
-        res->set(res->expr, expr->clone());
-    if (type)
-        res->set(res->type, type->clone());
-    return res;
+    extern const int LOGICAL_ERROR;
 }
 
 
+ASTIndexDeclaration::ASTIndexDeclaration(ASTPtr expression, ASTPtr type, const String & name_)
+    : name(name_)
+{
+    if (!expression)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Index declaration must have an expression");
+    children.push_back(expression);
+
+    if (type)
+    {
+        if (!dynamic_cast<const ASTFunction *>(type.get()))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Index declaration type must be a function");
+        children.push_back(type);
+    }
+}
+
+ASTPtr ASTIndexDeclaration::clone() const
+{
+    ASTPtr expr = getExpression();
+    if (expr)
+        expr = expr->clone();
+
+    ASTPtr type = getType();
+    if (type)
+        type = type->clone();
+
+    auto res = std::make_shared<ASTIndexDeclaration>(expr, type, name);
+    res->granularity = granularity;
+
+    return res;
+}
+
+ASTPtr ASTIndexDeclaration::getExpression() const
+{
+    if (children.size() <= expression_idx)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Index declaration must have an expression");
+    return children[expression_idx];
+}
+
+std::shared_ptr<ASTFunction> ASTIndexDeclaration::getType() const
+{
+    if (children.size() <= type_idx)
+        return nullptr;
+    auto func_ast = std::dynamic_pointer_cast<ASTFunction>(children[type_idx]);
+    if (!func_ast)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Index declaration type must be a function");
+    return func_ast;
+}
+
 void ASTIndexDeclaration::formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const
 {
-    if (expr)
+    if (auto expr = getExpression())
     {
         if (part_of_create_index_query)
         {
@@ -36,7 +75,7 @@ void ASTIndexDeclaration::formatImpl(const FormatSettings & s, FormatState & sta
                 s.ostr << ")";
             }
             else
-            expr->formatImpl(s, state, frame);
+                expr->formatImpl(s, state, frame);
         }
         else
         {
@@ -46,11 +85,12 @@ void ASTIndexDeclaration::formatImpl(const FormatSettings & s, FormatState & sta
         }
     }
 
-    if (type)
+    if (auto type = getType())
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << " TYPE " << (s.hilite ? hilite_none : "");
         type->formatImpl(s, state, frame);
     }
+
     if (granularity)
     {
         s.ostr << (s.hilite ? hilite_keyword : "") << " GRANULARITY " << (s.hilite ? hilite_none : "");
@@ -59,4 +99,3 @@ void ASTIndexDeclaration::formatImpl(const FormatSettings & s, FormatState & sta
 }
 
 }
-
diff --git a/src/Parsers/ASTIndexDeclaration.h b/src/Parsers/ASTIndexDeclaration.h
index 1fbf5e12695..dd05ad08184 100644
--- a/src/Parsers/ASTIndexDeclaration.h
+++ b/src/Parsers/ASTIndexDeclaration.h
@@ -16,9 +16,9 @@ public:
     static const auto DEFAULT_ANNOY_INDEX_GRANULARITY = 100'000'000uz;
     static const auto DEFAULT_USEARCH_INDEX_GRANULARITY = 100'000'000uz;
 
+    ASTIndexDeclaration(ASTPtr expression, ASTPtr type, const String & name_);
+
     String name;
-    IAST * expr;
-    ASTFunction * type;
     UInt64 granularity;
     bool part_of_create_index_query = false;
 
@@ -28,11 +28,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));
-    }
+    ASTPtr getExpression() const;
+    std::shared_ptr<ASTFunction> getType() const;
+
+private:
+    static constexpr size_t expression_idx = 0;
+    static constexpr size_t type_idx = 1;
 };
 
 }
diff --git a/src/Parsers/ASTInsertQuery.cpp b/src/Parsers/ASTInsertQuery.cpp
index 88e087dd4ee..8e3458539f3 100644
--- a/src/Parsers/ASTInsertQuery.cpp
+++ b/src/Parsers/ASTInsertQuery.cpp
@@ -68,8 +68,14 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
     }
     else
     {
-        settings.ostr << (settings.hilite ? hilite_none : "")
-                      << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
     }
 
     if (columns)
@@ -117,13 +123,8 @@ void ASTInsertQuery::formatImpl(const FormatSettings & settings, FormatState & s
         settings.ostr << delim;
         select->formatImpl(settings, state, frame);
     }
-    else if (watch)
-    {
-        settings.ostr << delim;
-        watch->formatImpl(settings, state, frame);
-    }
 
-    if (!select && !watch)
+    if (!select)
     {
         if (!format.empty())
         {
diff --git a/src/Parsers/ASTInsertQuery.h b/src/Parsers/ASTInsertQuery.h
index 6a4ce078f79..aeab0f148be 100644
--- a/src/Parsers/ASTInsertQuery.h
+++ b/src/Parsers/ASTInsertQuery.h
@@ -24,7 +24,6 @@ public:
     ASTPtr settings_ast;
 
     ASTPtr select;
-    ASTPtr watch;
     ASTPtr infile;
     ASTPtr compression;
 
@@ -59,11 +58,12 @@ public:
         if (database) { res->database = database->clone(); res->children.push_back(res->database); }
         if (table) { res->table = table->clone(); res->children.push_back(res->table); }
         if (columns) { res->columns = columns->clone(); res->children.push_back(res->columns); }
-        if (select) { res->select = select->clone(); res->children.push_back(res->select); }
-        if (watch) { res->watch = watch->clone(); res->children.push_back(res->watch); }
         if (table_function) { res->table_function = table_function->clone(); res->children.push_back(res->table_function); }
         if (partition_by) { res->partition_by = partition_by->clone(); res->children.push_back(res->partition_by); }
         if (settings_ast) { res->settings_ast = settings_ast->clone(); res->children.push_back(res->settings_ast); }
+        if (select) { res->select = select->clone(); res->children.push_back(res->select); }
+        if (infile) { res->infile = infile->clone(); res->children.push_back(res->infile); }
+        if (compression) { res->compression = compression->clone(); res->children.push_back(res->compression); }
 
         return res;
     }
diff --git a/src/Parsers/ASTOptimizeQuery.cpp b/src/Parsers/ASTOptimizeQuery.cpp
index 173310f7930..397a37586fc 100644
--- a/src/Parsers/ASTOptimizeQuery.cpp
+++ b/src/Parsers/ASTOptimizeQuery.cpp
@@ -7,8 +7,16 @@ namespace DB
 
 void ASTOptimizeQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    settings.ostr << (settings.hilite ? hilite_keyword : "") << "OPTIMIZE TABLE " << (settings.hilite ? hilite_none : "")
-                  << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "OPTIMIZE TABLE " << (settings.hilite ? hilite_none : "");
+
+    if (database)
+    {
+        database->formatImpl(settings, state, frame);
+        settings.ostr << '.';
+    }
+
+    chassert(table);
+    table->formatImpl(settings, state, frame);
 
     formatOnCluster(settings);
 
diff --git a/src/Parsers/ASTOrderByElement.cpp b/src/Parsers/ASTOrderByElement.cpp
index 318849812aa..be0416359a1 100644
--- a/src/Parsers/ASTOrderByElement.cpp
+++ b/src/Parsers/ASTOrderByElement.cpp
@@ -31,7 +31,7 @@ void ASTOrderByElement::formatImpl(const FormatSettings & settings, FormatState
             << (settings.hilite ? hilite_none : "");
     }
 
-    if (collation)
+    if (auto collation = getCollation())
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " COLLATE " << (settings.hilite ? hilite_none : "");
         collation->formatImpl(settings, state, frame);
@@ -40,17 +40,17 @@ void ASTOrderByElement::formatImpl(const FormatSettings & settings, FormatState
     if (with_fill)
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " WITH FILL" << (settings.hilite ? hilite_none : "");
-        if (fill_from)
+        if (auto fill_from = getFillFrom())
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " FROM " << (settings.hilite ? hilite_none : "");
             fill_from->formatImpl(settings, state, frame);
         }
-        if (fill_to)
+        if (auto fill_to = getFillTo())
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " TO " << (settings.hilite ? hilite_none : "");
             fill_to->formatImpl(settings, state, frame);
         }
-        if (fill_step)
+        if (auto fill_step = getFillStep())
         {
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " STEP " << (settings.hilite ? hilite_none : "");
             fill_step->formatImpl(settings, state, frame);
diff --git a/src/Parsers/ASTOrderByElement.h b/src/Parsers/ASTOrderByElement.h
index 4cebc30be31..6edf84d7bde 100644
--- a/src/Parsers/ASTOrderByElement.h
+++ b/src/Parsers/ASTOrderByElement.h
@@ -10,18 +10,34 @@ namespace DB
   */
 class ASTOrderByElement : public IAST
 {
+private:
+    enum class Child : uint8_t
+    {
+        EXPRESSION,
+        COLLATION,
+        FILL_FROM,
+        FILL_TO,
+        FILL_STEP,
+    };
+
 public:
     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 = false;
-    ASTPtr fill_from;
-    ASTPtr fill_to;
-    ASTPtr fill_step;
+
+    /** Collation for locale-specific string comparison. If empty, then sorting done by bytes. */
+    void setCollation(ASTPtr node) { setChild(Child::COLLATION, node); }
+    void setFillFrom(ASTPtr node)  { setChild(Child::FILL_FROM, node); }
+    void setFillTo(ASTPtr node)    { setChild(Child::FILL_TO, node);   }
+    void setFillStep(ASTPtr node)  { setChild(Child::FILL_STEP, node); }
+
+    /** Collation for locale-specific string comparison. If empty, then sorting done by bytes. */
+    ASTPtr getCollation() const { return getChild(Child::COLLATION); }
+    ASTPtr getFillFrom()  const { return getChild(Child::FILL_FROM); }
+    ASTPtr getFillTo()    const { return getChild(Child::FILL_TO);   }
+    ASTPtr getFillStep()  const { return getChild(Child::FILL_STEP); }
 
     String getID(char) const override { return "OrderByElement"; }
 
@@ -36,6 +52,34 @@ public:
 
 protected:
     void formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override;
+private:
+
+    ASTPtr getChild(Child child) const
+    {
+        auto it = positions.find(child);
+        if (it != positions.end())
+            return children[it->second];
+        return {};
+    }
+
+    void setChild(Child child, ASTPtr node)
+    {
+        if (node == nullptr)
+            return;
+
+        auto it = positions.find(child);
+        if (it != positions.end())
+        {
+            children[it->second] = node;
+        }
+        else
+        {
+            positions[child] = children.size();
+            children.push_back(node);
+        }
+    }
+
+    std::unordered_map<Child, size_t> positions;
 };
 
 }
diff --git a/src/Parsers/ASTQueryWithOnCluster.cpp b/src/Parsers/ASTQueryWithOnCluster.cpp
index d0b6d82ab13..1281a97fa00 100644
--- a/src/Parsers/ASTQueryWithOnCluster.cpp
+++ b/src/Parsers/ASTQueryWithOnCluster.cpp
@@ -19,7 +19,7 @@ std::string ASTQueryWithOnCluster::getRewrittenQueryWithoutOnCluster(const Witho
 
 bool ASTQueryWithOnCluster::parse(Pos & pos, std::string & cluster_str, Expected & expected)
 {
-    if (!ParserKeyword{"CLUSTER"}.ignore(pos, expected))
+    if (!ParserKeyword(Keyword::CLUSTER).ignore(pos, expected))
         return false;
 
     return parseIdentifierOrStringLiteral(pos, expected, cluster_str);
diff --git a/src/Parsers/ASTQueryWithOutput.cpp b/src/Parsers/ASTQueryWithOutput.cpp
index 4bf1e6cb231..c57aa759969 100644
--- a/src/Parsers/ASTQueryWithOutput.cpp
+++ b/src/Parsers/ASTQueryWithOutput.cpp
@@ -23,6 +23,16 @@ void ASTQueryWithOutput::cloneOutputOptions(ASTQueryWithOutput & cloned) const
         cloned.settings_ast = settings_ast->clone();
         cloned.children.push_back(cloned.settings_ast);
     }
+    if (compression)
+    {
+        cloned.compression = compression->clone();
+        cloned.children.push_back(cloned.compression);
+    }
+    if (compression_level)
+    {
+        cloned.compression_level = compression_level->clone();
+        cloned.children.push_back(cloned.compression_level);
+    }
 }
 
 void ASTQueryWithOutput::formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const
@@ -64,9 +74,23 @@ bool ASTQueryWithOutput::resetOutputASTIfExist(IAST & ast)
     /// FIXME: try to prettify this cast using `as<>()`
     if (auto * ast_with_output = dynamic_cast<ASTQueryWithOutput *>(&ast))
     {
-        ast_with_output->format.reset();
-        ast_with_output->out_file.reset();
-        ast_with_output->settings_ast.reset();
+        auto remove_if_exists = [&](ASTPtr & p)
+        {
+            if (p)
+            {
+                if (auto * it = std::find(ast_with_output->children.begin(), ast_with_output->children.end(), p);
+                    it != ast_with_output->children.end())
+                    ast_with_output->children.erase(it);
+                p.reset();
+            }
+        };
+
+        remove_if_exists(ast_with_output->out_file);
+        remove_if_exists(ast_with_output->format);
+        remove_if_exists(ast_with_output->settings_ast);
+        remove_if_exists(ast_with_output->compression);
+        remove_if_exists(ast_with_output->compression_level);
+
         return true;
     }
 
diff --git a/src/Parsers/ASTQueryWithTableAndOutput.cpp b/src/Parsers/ASTQueryWithTableAndOutput.cpp
index a216aeaa11f..85bfe2ae80f 100644
--- a/src/Parsers/ASTQueryWithTableAndOutput.cpp
+++ b/src/Parsers/ASTQueryWithTableAndOutput.cpp
@@ -64,11 +64,5 @@ void ASTQueryWithTableAndOutput::cloneTableOptions(ASTQueryWithTableAndOutput &
         cloned.children.push_back(cloned.table);
     }
 }
-void ASTQueryWithTableAndOutput::formatHelper(const FormatSettings & settings, const char * name) const
-{
-    settings.ostr << (settings.hilite ? hilite_keyword : "") << name << " " << (settings.hilite ? hilite_none : "");
-    settings.ostr << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
-}
 
 }
-
diff --git a/src/Parsers/ASTQueryWithTableAndOutput.h b/src/Parsers/ASTQueryWithTableAndOutput.h
index 10f0e76f29c..b0227d68672 100644
--- a/src/Parsers/ASTQueryWithTableAndOutput.h
+++ b/src/Parsers/ASTQueryWithTableAndOutput.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <base/defines.h>
 #include <Parsers/IAST.h>
 #include <Parsers/ASTQueryWithOutput.h>
 #include <Core/UUID.h>
@@ -28,9 +29,6 @@ public:
     void setTable(const String & name);
 
     void cloneTableOptions(ASTQueryWithTableAndOutput & cloned) const;
-
-protected:
-    void formatHelper(const FormatSettings & settings, const char * name) const;
 };
 
 
@@ -52,9 +50,20 @@ public:
     QueryKind getQueryKind() const override { return QueryKind::Show; }
 
 protected:
-    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
-        formatHelper(settings, temporary ? AstIDAndQueryNames::QueryTemporary : AstIDAndQueryNames::Query);
+        settings.ostr << (settings.hilite ? hilite_keyword : "")
+            << (temporary ? AstIDAndQueryNames::QueryTemporary : AstIDAndQueryNames::Query)
+            << " " << (settings.hilite ? hilite_none : "");
+
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table != nullptr, "Table is empty for the ASTQueryWithTableAndOutputImpl.");
+        table->formatImpl(settings, state, frame);
     }
 };
 
diff --git a/src/Parsers/ASTRenameQuery.h b/src/Parsers/ASTRenameQuery.h
index 5d07cb976af..d51c382f374 100644
--- a/src/Parsers/ASTRenameQuery.h
+++ b/src/Parsers/ASTRenameQuery.h
@@ -45,7 +45,6 @@ public:
     };
 
     using Elements = std::vector<Element>;
-    Elements elements;
 
     bool exchange{false};   /// For EXCHANGE TABLES
     bool database{false};   /// For RENAME DATABASE
@@ -54,12 +53,65 @@ public:
     /// Special flag for CREATE OR REPLACE. Do not throw if the second table does not exist.
     bool rename_if_cannot_exchange{false};
 
+    explicit ASTRenameQuery(Elements elements_ = {})
+        : elements(std::move(elements_))
+    {
+        for (const auto & elem : elements)
+        {
+            if (elem.from.database)
+                children.push_back(elem.from.database);
+            if (elem.from.table)
+                children.push_back(elem.from.table);
+            if (elem.to.database)
+                children.push_back(elem.to.database);
+            if (elem.to.table)
+                children.push_back(elem.to.table);
+        }
+    }
+
+    void setDatabaseIfNotExists(const String & database_name)
+    {
+        for (auto & elem : elements)
+        {
+            if (!elem.from.database)
+            {
+                elem.from.database = std::make_shared<ASTIdentifier>(database_name);
+                children.push_back(elem.from.database);
+            }
+            if (!elem.to.database)
+            {
+                elem.to.database = std::make_shared<ASTIdentifier>(database_name);
+                children.push_back(elem.to.database);
+            }
+        }
+    }
+
+    const Elements & getElements() const { return elements; }
+
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Rename"; }
 
     ASTPtr clone() const override
     {
         auto res = std::make_shared<ASTRenameQuery>(*this);
+        res->children.clear();
+
+        auto clone_child = [&res](ASTPtr & node)
+        {
+            if (node)
+            {
+                node = node->clone();
+                res->children.push_back(node);
+            }
+        };
+
+        for (auto & elem : res->elements)
+        {
+            clone_child(elem.from.database);
+            clone_child(elem.from.table);
+            clone_child(elem.to.database);
+            clone_child(elem.to.table);
+        }
         cloneOutputOptions(*res);
         return res;
     }
@@ -73,9 +125,15 @@ public:
         for (Element & elem : query.elements)
         {
             if (!elem.from.database)
+            {
                 elem.from.database = std::make_shared<ASTIdentifier>(params.default_database);
+                query.children.push_back(elem.from.database);
+            }
             if (!elem.to.database)
+            {
                 elem.to.database = std::make_shared<ASTIdentifier>(params.default_database);
+                query.children.push_back(elem.to.database);
+            }
         }
 
         return query_ptr;
@@ -84,7 +142,7 @@ public:
     QueryKind getQueryKind() const override { return QueryKind::Rename; }
 
 protected:
-    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
         if (database)
         {
@@ -93,9 +151,9 @@ protected:
             if (elements.at(0).if_exists)
                 settings.ostr << (settings.hilite ? hilite_keyword : "") << "IF EXISTS " << (settings.hilite ? hilite_none : "");
 
-            settings.ostr << backQuoteIfNeed(elements.at(0).from.getDatabase());
+            elements.at(0).from.database->formatImpl(settings, state, frame);
             settings.ostr << (settings.hilite ? hilite_keyword : "") << " TO " << (settings.hilite ? hilite_none : "");
-            settings.ostr << backQuoteIfNeed(elements.at(0).to.getDatabase());
+            elements.at(0).to.database->formatImpl(settings, state, frame);
             formatOnCluster(settings);
             return;
         }
@@ -119,13 +177,34 @@ protected:
 
             if (it->if_exists)
                 settings.ostr << (settings.hilite ? hilite_keyword : "") << "IF EXISTS " << (settings.hilite ? hilite_none : "");
-            settings.ostr << (it->from.database ? backQuoteIfNeed(it->from.getDatabase()) + "." : "") << backQuoteIfNeed(it->from.getTable())
-                << (settings.hilite ? hilite_keyword : "") << (exchange ? " AND " : " TO ") << (settings.hilite ? hilite_none : "")
-                << (it->to.database ? backQuoteIfNeed(it->to.getDatabase()) + "." : "") << backQuoteIfNeed(it->to.getTable());
+
+
+            if (it->from.database)
+            {
+                it->from.database->formatImpl(settings, state, frame);
+                settings.ostr << '.';
+            }
+
+            chassert(it->from.table);
+            it->from.table->formatImpl(settings, state, frame);
+
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << (exchange ? " AND " : " TO ") << (settings.hilite ? hilite_none : "");
+
+            if (it->to.database)
+            {
+                it->to.database->formatImpl(settings, state, frame);
+                settings.ostr << '.';
+            }
+
+            chassert(it->to.table);
+            it->to.table->formatImpl(settings, state, frame);
+
         }
 
         formatOnCluster(settings);
     }
+
+    Elements elements;
 };
 
 }
diff --git a/src/Parsers/ASTSQLSecurity.cpp b/src/Parsers/ASTSQLSecurity.cpp
new file mode 100644
index 00000000000..d6f1c21d035
--- /dev/null
+++ b/src/Parsers/ASTSQLSecurity.cpp
@@ -0,0 +1,39 @@
+
+#include <Parsers/ASTSQLSecurity.h>
+#include <IO/Operators.h>
+
+namespace DB
+{
+
+void ASTSQLSecurity::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
+{
+    if (!type.has_value())
+        return;
+
+    if (definer || is_definer_current_user)
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "DEFINER" << (settings.hilite ? hilite_none : "");
+        settings.ostr << " = ";
+        if (definer)
+            definer->formatImpl(settings, state, frame);
+        else
+            settings.ostr << "CURRENT_USER";
+        settings.ostr << " ";
+    }
+
+    settings.ostr << (settings.hilite ? hilite_keyword : "") << "SQL SECURITY" << (settings.hilite ? hilite_none : "");
+    switch (*type)
+    {
+        case SQLSecurityType::INVOKER:
+            settings.ostr << " INVOKER";
+            break;
+        case SQLSecurityType::DEFINER:
+            settings.ostr << " DEFINER";
+            break;
+        case SQLSecurityType::NONE:
+            settings.ostr << " NONE";
+            break;
+    }
+}
+
+}
diff --git a/src/Parsers/ASTSQLSecurity.h b/src/Parsers/ASTSQLSecurity.h
new file mode 100644
index 00000000000..47fd8752a67
--- /dev/null
+++ b/src/Parsers/ASTSQLSecurity.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <Parsers/Access/ASTUserNameWithHost.h>
+#include <Access/Common/SQLSecurityDefs.h>
+
+
+namespace DB
+{
+
+/// DEFINER = <user_name | CURRENT_USER> SQL SECURITY <DEFINER | INVOKER | NONE>
+/// If type was not set during parsing, the default type from settings will be used.
+/// Currently supports only views.
+class ASTSQLSecurity : public IAST
+{
+public:
+    bool is_definer_current_user{false};
+    std::shared_ptr<ASTUserNameWithHost> definer = nullptr;
+    std::optional<SQLSecurityType> type = std::nullopt;
+
+    String getID(char) const override { return "View SQL Security"; }
+    ASTPtr clone() const override { return std::make_shared<ASTSQLSecurity>(*this); }
+
+    void formatImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override;
+};
+
+}
diff --git a/src/Parsers/ASTSelectQuery.cpp b/src/Parsers/ASTSelectQuery.cpp
index 2115de1c124..586477e1cfd 100644
--- a/src/Parsers/ASTSelectQuery.cpp
+++ b/src/Parsers/ASTSelectQuery.cpp
@@ -108,12 +108,6 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
     if (group_by_all)
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "GROUP BY ALL" << (s.hilite ? hilite_none : "");
 
-    if (group_by_with_rollup)
-        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH ROLLUP" << (s.hilite ? hilite_none : "");
-
-    if (group_by_with_cube)
-        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH CUBE" << (s.hilite ? hilite_none : "");
-
     if (group_by_with_grouping_sets && groupBy())
     {
         auto nested_frame = frame;
@@ -128,6 +122,12 @@ void ASTSelectQuery::formatImpl(const FormatSettings & s, FormatState & state, F
         s.ostr << ")";
     }
 
+    if (group_by_with_rollup)
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH ROLLUP" << (s.hilite ? hilite_none : "");
+
+    if (group_by_with_cube)
+        s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH CUBE" << (s.hilite ? hilite_none : "");
+
     if (group_by_with_totals)
         s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << (s.one_line ? "" : "    ") << "WITH TOTALS" << (s.hilite ? hilite_none : "");
 
diff --git a/src/Parsers/ASTSelectWithUnionQuery.cpp b/src/Parsers/ASTSelectWithUnionQuery.cpp
index 48b4ae3c38d..cf72358dea7 100644
--- a/src/Parsers/ASTSelectWithUnionQuery.cpp
+++ b/src/Parsers/ASTSelectWithUnionQuery.cpp
@@ -63,18 +63,12 @@ void ASTSelectWithUnionQuery::formatQueryImpl(const FormatSettings & settings, F
 
         if (auto * node = (*it)->as<ASTSelectWithUnionQuery>())
         {
-            settings.ostr << settings.nl_or_ws << indent_str;
+            if (it != list_of_selects->children.begin())
+                settings.ostr << settings.nl_or_ws;
 
-            if (node->list_of_selects->children.size() == 1)
-            {
-                (node->list_of_selects->children.at(0))->formatImpl(settings, state, frame);
-            }
-            else
-            {
-                auto sub_query = std::make_shared<ASTSubquery>();
-                sub_query->children.push_back(*it);
-                sub_query->formatImpl(settings, state, frame);
-            }
+            settings.ostr << indent_str;
+            auto sub_query = std::make_shared<ASTSubquery>(*it);
+            sub_query->formatImpl(settings, state, frame);
         }
         else
         {
diff --git a/src/Parsers/ASTSetQuery.cpp b/src/Parsers/ASTSetQuery.cpp
index d41e9aba4cc..94b44ed2fa7 100644
--- a/src/Parsers/ASTSetQuery.cpp
+++ b/src/Parsers/ASTSetQuery.cpp
@@ -3,6 +3,7 @@
 #include <Common/SipHash.h>
 #include <Common/FieldVisitorHash.h>
 #include <Common/FieldVisitorToString.h>
+#include <Common/quoteString.h>
 #include <IO/Operators.h>
 #include <IO/WriteBufferFromString.h>
 
@@ -106,7 +107,7 @@ void ASTSetQuery::formatImpl(const FormatSettings & format, FormatState &, Forma
             first = false;
 
         formatSettingName(QUERY_PARAMETER_NAME_PREFIX + name, format.ostr);
-        format.ostr << " = " << value;
+        format.ostr << " = " << quoteString(value);
     }
 }
 
diff --git a/src/Parsers/ASTSetQuery.h b/src/Parsers/ASTSetQuery.h
index 944f08dcbaa..42d63944b4f 100644
--- a/src/Parsers/ASTSetQuery.h
+++ b/src/Parsers/ASTSetQuery.h
@@ -25,7 +25,7 @@ public:
     SettingsChanges changes;
     /// settings that will be reset to default value
     std::vector<String> default_settings;
-    NameToNameMap query_parameters;
+    NameToNameVector query_parameters;
 
     /** Get the text that identifies this element. */
     String getID(char) const override { return "Set"; }
diff --git a/src/Parsers/ASTSubquery.h b/src/Parsers/ASTSubquery.h
index ef277a63126..c48307ed68c 100644
--- a/src/Parsers/ASTSubquery.h
+++ b/src/Parsers/ASTSubquery.h
@@ -26,6 +26,13 @@ public:
         return clone;
     }
 
+    ASTSubquery() = default;
+
+    explicit ASTSubquery(ASTPtr child)
+    {
+        children.emplace_back(std::move(child));
+    }
+
     void updateTreeHashImpl(SipHash & hash_state, bool ignore_aliases) const override;
     String getAliasOrColumnName() const override;
     String tryGetAlias() const override;
diff --git a/src/Parsers/ASTSystemQuery.cpp b/src/Parsers/ASTSystemQuery.cpp
index c005d49a93d..ed122b2b191 100644
--- a/src/Parsers/ASTSystemQuery.cpp
+++ b/src/Parsers/ASTSystemQuery.cpp
@@ -7,9 +7,15 @@
 
 #include <magic_enum.hpp>
 
+
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
 namespace
 {
     std::vector<std::string> getTypeIndexToTypeName()
@@ -85,7 +91,7 @@ void ASTSystemQuery::setTable(const String & name)
     }
 }
 
-void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
     auto print_identifier = [&](const String & identifier) -> WriteBuffer &
     {
@@ -104,9 +110,12 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
     {
         if (database)
         {
-            print_identifier(getDatabase()) << ".";
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
         }
-        print_identifier(getTable());
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
         return settings.ostr;
     };
 
@@ -144,168 +153,291 @@ void ASTSystemQuery::formatImpl(const FormatSettings & settings, FormatState &,
     if (!cluster.empty())
         formatOnCluster(settings);
 
-    if (   type == Type::STOP_MERGES
-        || type == Type::START_MERGES
-        || type == Type::STOP_TTL_MERGES
-        || type == Type::START_TTL_MERGES
-        || type == Type::STOP_MOVES
-        || type == Type::START_MOVES
-        || type == Type::STOP_FETCHES
-        || type == Type::START_FETCHES
-        || type == Type::STOP_REPLICATED_SENDS
-        || type == Type::START_REPLICATED_SENDS
-        || type == Type::STOP_REPLICATION_QUEUES
-        || type == Type::START_REPLICATION_QUEUES
-        || type == Type::STOP_DISTRIBUTED_SENDS
-        || type == Type::START_DISTRIBUTED_SENDS
-        || type == Type::STOP_PULLING_REPLICATION_LOG
-        || type == Type::START_PULLING_REPLICATION_LOG
-        || type == Type::STOP_CLEANUP
-        || type == Type::START_CLEANUP)
+    switch (type)
     {
-        if (table)
+        case Type::STOP_MERGES:
+        case Type::START_MERGES:
+        case Type::STOP_TTL_MERGES:
+        case Type::START_TTL_MERGES:
+        case Type::STOP_MOVES:
+        case Type::START_MOVES:
+        case Type::STOP_FETCHES:
+        case Type::START_FETCHES:
+        case Type::STOP_REPLICATED_SENDS:
+        case Type::START_REPLICATED_SENDS:
+        case Type::STOP_REPLICATION_QUEUES:
+        case Type::START_REPLICATION_QUEUES:
+        case Type::STOP_DISTRIBUTED_SENDS:
+        case Type::START_DISTRIBUTED_SENDS:
+        case Type::STOP_PULLING_REPLICATION_LOG:
+        case Type::START_PULLING_REPLICATION_LOG:
+        case Type::STOP_CLEANUP:
+        case Type::START_CLEANUP:
         {
-            settings.ostr << ' ';
-            print_database_table();
-        }
-        else if (!volume.empty())
-            print_on_volume();
-    }
-    else if (  type == Type::RESTART_REPLICA
-            || type == Type::RESTORE_REPLICA
-            || type == Type::SYNC_REPLICA
-            || type == Type::WAIT_LOADING_PARTS
-            || type == Type::FLUSH_DISTRIBUTED
-            || type == Type::RELOAD_DICTIONARY
-            || type == Type::RELOAD_MODEL
-            || type == Type::RELOAD_FUNCTION
-            || type == Type::RESTART_DISK
-            || type == Type::DROP_DISK_METADATA_CACHE)
-    {
-        if (table)
-        {
-            settings.ostr << ' ';
-            print_database_table();
-        }
-        else if (!target_model.empty())
-        {
-            settings.ostr << ' ';
-            print_identifier(target_model);
-        }
-        else if (!target_function.empty())
-        {
-            settings.ostr << ' ';
-            print_identifier(target_function);
-        }
-        else if (!disk.empty())
-        {
-            settings.ostr << ' ';
-            print_identifier(disk);
-        }
-
-        if (sync_replica_mode != SyncReplicaMode::DEFAULT)
-        {
-            settings.ostr << ' ';
-            print_keyword(magic_enum::enum_name(sync_replica_mode));
-        }
-    }
-    else if (type == Type::SYNC_DATABASE_REPLICA)
-    {
-        settings.ostr << ' ';
-        print_identifier(database->as<ASTIdentifier>()->name());
-    }
-    else if (type == Type::DROP_REPLICA || type == Type::DROP_DATABASE_REPLICA)
-    {
-        print_drop_replica();
-    }
-    else if (type == Type::SUSPEND)
-    {
-        print_keyword(" FOR ") << seconds;
-        print_keyword(" SECOND");
-    }
-    else if (type == Type::DROP_FORMAT_SCHEMA_CACHE)
-    {
-        if (!schema_cache_format.empty())
-        {
-            print_keyword(" FOR ");
-            print_identifier(schema_cache_format);
-        }
-    }
-    else if (type == Type::DROP_FILESYSTEM_CACHE)
-    {
-        if (!filesystem_cache_name.empty())
-        {
-            settings.ostr << ' ';
-            print_identifier(filesystem_cache_name);
-            if (!key_to_drop.empty())
+            if (table)
             {
-                print_keyword(" KEY ");
-                print_identifier(key_to_drop);
-                if (offset_to_drop.has_value())
+                settings.ostr << ' ';
+                print_database_table();
+            }
+            else if (!volume.empty())
+            {
+                print_on_volume();
+            }
+            break;
+        }
+        case Type::RESTART_REPLICA:
+        case Type::RESTORE_REPLICA:
+        case Type::SYNC_REPLICA:
+        case Type::WAIT_LOADING_PARTS:
+        case Type::FLUSH_DISTRIBUTED:
+        {
+            if (table)
+            {
+                settings.ostr << ' ';
+                print_database_table();
+            }
+
+            if (query_settings)
+            {
+                settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << "SETTINGS " << (settings.hilite ? hilite_none : "");
+                query_settings->formatImpl(settings, state, frame);
+            }
+
+            break;
+        }
+        case Type::RELOAD_DICTIONARY:
+        case Type::RELOAD_MODEL:
+        case Type::RELOAD_FUNCTION:
+        case Type::RESTART_DISK:
+        case Type::DROP_DISK_METADATA_CACHE:
+        {
+            if (table)
+            {
+                settings.ostr << ' ';
+                print_database_table();
+            }
+            else if (!target_model.empty())
+            {
+                settings.ostr << ' ';
+                print_identifier(target_model);
+            }
+            else if (!target_function.empty())
+            {
+                settings.ostr << ' ';
+                print_identifier(target_function);
+            }
+            else if (!disk.empty())
+            {
+                settings.ostr << ' ';
+                print_identifier(disk);
+            }
+
+            if (sync_replica_mode != SyncReplicaMode::DEFAULT)
+            {
+                settings.ostr << ' ';
+                print_keyword(magic_enum::enum_name(sync_replica_mode));
+
+                // If the mode is LIGHTWEIGHT and specific source replicas are specified
+                if (sync_replica_mode == SyncReplicaMode::LIGHTWEIGHT && !src_replicas.empty())
                 {
-                    print_keyword(" OFFSET ");
-                    settings.ostr << offset_to_drop.value();
+                    settings.ostr << ' ';
+                    print_keyword("FROM");
+                    settings.ostr << ' ';
+
+                    bool first = true;
+                    for (const auto & src : src_replicas)
+                    {
+                        if (!first)
+                            settings.ostr << ", ";
+                        first = false;
+                        settings.ostr << quoteString(src);
+                    }
                 }
             }
+            break;
         }
-    }
-    else if (type == Type::DROP_SCHEMA_CACHE)
-    {
-        if (!schema_cache_storage.empty())
+        case Type::SYNC_DATABASE_REPLICA:
         {
-            print_keyword(" FOR ");
-            print_identifier(schema_cache_storage);
+            settings.ostr << ' ';
+            print_identifier(database->as<ASTIdentifier>()->name());
+            break;
         }
-    }
-    else if (type == Type::UNFREEZE)
-    {
-        print_keyword(" WITH NAME ");
-        settings.ostr << quoteString(backup_name);
-    }
-    else if (type == Type::START_LISTEN || type == Type::STOP_LISTEN)
-    {
-        settings.ostr << ' ';
-        print_keyword(ServerType::serverTypeToString(server_type.type));
-
-        if (server_type.type == ServerType::Type::CUSTOM)
-            settings.ostr << ' ' << quoteString(server_type.custom_name);
-
-        bool comma = false;
-
-        if (!server_type.exclude_types.empty())
+        case Type::DROP_REPLICA:
+        case Type::DROP_DATABASE_REPLICA:
         {
-            print_keyword(" EXCEPT");
-
-            for (auto cur_type : server_type.exclude_types)
+            print_drop_replica();
+            break;
+        }
+        case Type::SUSPEND:
+        {
+            print_keyword(" FOR ") << seconds;
+            print_keyword(" SECOND");
+            break;
+        }
+        case Type::DROP_FORMAT_SCHEMA_CACHE:
+        {
+            if (!schema_cache_format.empty())
             {
-                if (cur_type == ServerType::Type::CUSTOM)
-                    continue;
-
-                if (comma)
-                    settings.ostr << ',';
-                else
-                    comma = true;
-
-                settings.ostr << ' ';
-                print_keyword(ServerType::serverTypeToString(cur_type));
+                print_keyword(" FOR ");
+                print_identifier(schema_cache_format);
             }
-
-            if (server_type.exclude_types.contains(ServerType::Type::CUSTOM))
+            break;
+        }
+        case Type::DROP_FILESYSTEM_CACHE:
+        {
+            if (!filesystem_cache_name.empty())
             {
-                for (const auto & cur_name : server_type.exclude_custom_names)
+                settings.ostr << ' ' << quoteString(filesystem_cache_name);
+                if (!key_to_drop.empty())
                 {
+                    print_keyword(" KEY ");
+                    print_identifier(key_to_drop);
+                    if (offset_to_drop.has_value())
+                    {
+                        print_keyword(" OFFSET ");
+                        settings.ostr << offset_to_drop.value();
+                    }
+                }
+            }
+            break;
+        }
+        case Type::DROP_SCHEMA_CACHE:
+        {
+            if (!schema_cache_storage.empty())
+            {
+                print_keyword(" FOR ");
+                print_identifier(schema_cache_storage);
+            }
+            break;
+        }
+        case Type::UNFREEZE:
+        {
+            print_keyword(" WITH NAME ");
+            settings.ostr << quoteString(backup_name);
+            break;
+        }
+        case Type::START_LISTEN:
+        case Type::STOP_LISTEN:
+        {
+            settings.ostr << ' ';
+            print_keyword(ServerType::serverTypeToString(server_type.type));
+
+            if (server_type.type == ServerType::Type::CUSTOM)
+                settings.ostr << ' ' << quoteString(server_type.custom_name);
+
+            bool comma = false;
+
+            if (!server_type.exclude_types.empty())
+            {
+                print_keyword(" EXCEPT");
+
+                for (auto cur_type : server_type.exclude_types)
+                {
+                    if (cur_type == ServerType::Type::CUSTOM)
+                        continue;
+
                     if (comma)
                         settings.ostr << ',';
                     else
                         comma = true;
 
                     settings.ostr << ' ';
-                    print_keyword(ServerType::serverTypeToString(ServerType::Type::CUSTOM));
-                    settings.ostr << " " << quoteString(cur_name);
+                    print_keyword(ServerType::serverTypeToString(cur_type));
+                }
+
+                if (server_type.exclude_types.contains(ServerType::Type::CUSTOM))
+                {
+                    for (const auto & cur_name : server_type.exclude_custom_names)
+                    {
+                        if (comma)
+                            settings.ostr << ',';
+                        else
+                            comma = true;
+
+                        settings.ostr << ' ';
+                        print_keyword(ServerType::serverTypeToString(ServerType::Type::CUSTOM));
+                        settings.ostr << " " << quoteString(cur_name);
+                    }
                 }
             }
+            break;
         }
+        case Type::ENABLE_FAILPOINT:
+        case Type::DISABLE_FAILPOINT:
+        case Type::WAIT_FAILPOINT:
+        {
+            settings.ostr << ' ';
+            print_identifier(fail_point_name);
+            break;
+        }
+        case Type::REFRESH_VIEW:
+        case Type::START_VIEW:
+        case Type::STOP_VIEW:
+        case Type::CANCEL_VIEW:
+        {
+            settings.ostr << ' ';
+            print_database_table();
+            break;
+        }
+        case Type::TEST_VIEW:
+        {
+            settings.ostr << ' ';
+            print_database_table();
 
+            if (!fake_time_for_view)
+            {
+                settings.ostr << ' ';
+                print_keyword("UNSET FAKE TIME");
+            }
+            else
+            {
+                settings.ostr << ' ';
+                print_keyword("SET FAKE TIME");
+                settings.ostr << " '" << LocalDateTime(*fake_time_for_view) << "'";
+            }
+            break;
+        }
+        case Type::KILL:
+        case Type::SHUTDOWN:
+        case Type::DROP_DNS_CACHE:
+        case Type::DROP_CONNECTIONS_CACHE:
+        case Type::DROP_MMAP_CACHE:
+        case Type::DROP_QUERY_CACHE:
+        case Type::DROP_MARK_CACHE:
+        case Type::DROP_INDEX_MARK_CACHE:
+        case Type::DROP_UNCOMPRESSED_CACHE:
+        case Type::DROP_INDEX_UNCOMPRESSED_CACHE:
+        case Type::DROP_COMPILED_EXPRESSION_CACHE:
+        case Type::DROP_S3_CLIENT_CACHE:
+        case Type::RESET_COVERAGE:
+        case Type::RESTART_REPLICAS:
+        case Type::JEMALLOC_PURGE:
+        case Type::JEMALLOC_ENABLE_PROFILE:
+        case Type::JEMALLOC_DISABLE_PROFILE:
+        case Type::JEMALLOC_FLUSH_PROFILE:
+        case Type::SYNC_TRANSACTION_LOG:
+        case Type::SYNC_FILE_CACHE:
+        case Type::SYNC_FILESYSTEM_CACHE:
+        case Type::REPLICA_READY:   /// Obsolete
+        case Type::REPLICA_UNREADY: /// Obsolete
+        case Type::RELOAD_DICTIONARIES:
+        case Type::RELOAD_EMBEDDED_DICTIONARIES:
+        case Type::RELOAD_MODELS:
+        case Type::RELOAD_FUNCTIONS:
+        case Type::RELOAD_CONFIG:
+        case Type::RELOAD_USERS:
+        case Type::RELOAD_ASYNCHRONOUS_METRICS:
+        case Type::FLUSH_LOGS:
+        case Type::FLUSH_ASYNC_INSERT_QUEUE:
+        case Type::START_THREAD_FUZZER:
+        case Type::STOP_THREAD_FUZZER:
+        case Type::START_VIEWS:
+        case Type::STOP_VIEWS:
+        case Type::DROP_PAGE_CACHE:
+            break;
+        case Type::UNKNOWN:
+        case Type::END:
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown SYSTEM command");
     }
 }
 
diff --git a/src/Parsers/ASTSystemQuery.h b/src/Parsers/ASTSystemQuery.h
index 908b5049bc9..65c3f0eb328 100644
--- a/src/Parsers/ASTSystemQuery.h
+++ b/src/Parsers/ASTSystemQuery.h
@@ -22,22 +22,20 @@ public:
         KILL,
         SUSPEND,
         DROP_DNS_CACHE,
+        DROP_CONNECTIONS_CACHE,
         DROP_MARK_CACHE,
         DROP_UNCOMPRESSED_CACHE,
         DROP_INDEX_MARK_CACHE,
         DROP_INDEX_UNCOMPRESSED_CACHE,
         DROP_MMAP_CACHE,
         DROP_QUERY_CACHE,
-#if USE_EMBEDDED_COMPILER
         DROP_COMPILED_EXPRESSION_CACHE,
-#endif
         DROP_FILESYSTEM_CACHE,
         DROP_DISK_METADATA_CACHE,
+        DROP_PAGE_CACHE,
         DROP_SCHEMA_CACHE,
         DROP_FORMAT_SCHEMA_CACHE,
-#if USE_AWS_S3
         DROP_S3_CLIENT_CACHE,
-#endif
         STOP_LISTEN,
         START_LISTEN,
         RESTART_REPLICAS,
@@ -46,12 +44,10 @@ public:
         WAIT_LOADING_PARTS,
         DROP_REPLICA,
         DROP_DATABASE_REPLICA,
-#if USE_JEMALLOC
         JEMALLOC_PURGE,
         JEMALLOC_ENABLE_PROFILE,
         JEMALLOC_DISABLE_PROFILE,
         JEMALLOC_FLUSH_PROFILE,
-#endif
         SYNC_REPLICA,
         SYNC_DATABASE_REPLICA,
         SYNC_TRANSACTION_LOG,
@@ -67,6 +63,7 @@ public:
         RELOAD_EMBEDDED_DICTIONARIES,
         RELOAD_CONFIG,
         RELOAD_USERS,
+        RELOAD_ASYNCHRONOUS_METRICS,
         RESTART_DISK,
         STOP_MERGES,
         START_MERGES,
@@ -90,6 +87,7 @@ public:
         UNFREEZE,
         ENABLE_FAILPOINT,
         DISABLE_FAILPOINT,
+        WAIT_FAILPOINT,
         SYNC_FILESYSTEM_CACHE,
         STOP_PULLING_REPLICATION_LOG,
         START_PULLING_REPLICATION_LOG,
@@ -112,6 +110,7 @@ public:
 
     ASTPtr database;
     ASTPtr table;
+    ASTPtr query_settings;
 
     String getDatabase() const;
     String getTable() const;
@@ -144,6 +143,8 @@ public:
 
     SyncReplicaMode sync_replica_mode = SyncReplicaMode::DEFAULT;
 
+    std::vector<String> src_replicas;
+
     ServerType server_type;
 
     /// For SYSTEM TEST VIEW <name> (SET FAKE TIME <time> | UNSET FAKE TIME).
@@ -159,6 +160,7 @@ public:
 
         if (database) { res->database = database->clone(); res->children.push_back(res->database); }
         if (table) { res->table = table->clone(); res->children.push_back(res->table); }
+        if (query_settings) { res->query_settings = query_settings->clone(); res->children.push_back(res->query_settings); }
 
         return res;
     }
diff --git a/src/Parsers/ASTTablesInSelectQuery.h b/src/Parsers/ASTTablesInSelectQuery.h
index 67370eaee14..39ef0b21f6d 100644
--- a/src/Parsers/ASTTablesInSelectQuery.h
+++ b/src/Parsers/ASTTablesInSelectQuery.h
@@ -1,7 +1,5 @@
 #pragma once
 
-#include <base/EnumReflection.h>
-
 #include <Core/Joins.h>
 
 #include <Parsers/IAST.h>
diff --git a/src/Parsers/ASTUndropQuery.cpp b/src/Parsers/ASTUndropQuery.cpp
index 0b8a18b12c9..7212e264c0e 100644
--- a/src/Parsers/ASTUndropQuery.cpp
+++ b/src/Parsers/ASTUndropQuery.cpp
@@ -19,18 +19,26 @@ ASTPtr ASTUndropQuery::clone() const
     return res;
 }
 
-void ASTUndropQuery::formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
+void ASTUndropQuery::formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const
 {
-    settings.ostr << (settings.hilite ? hilite_keyword : "");
-    settings.ostr << "UNDROP ";
-    settings.ostr << "TABLE ";
-    settings.ostr << (settings.hilite ? hilite_none : "");
+    settings.ostr << (settings.hilite ? hilite_keyword : "")
+        << "UNDROP TABLE"
+        << (settings.hilite ? hilite_none : "")
+        << " ";
 
-    assert (table);
-    if (!database)
-        settings.ostr << backQuoteIfNeed(getTable());
-    else
-        settings.ostr << backQuoteIfNeed(getDatabase()) + "." << backQuoteIfNeed(getTable());
+    chassert(table);
+
+    if (table)
+    {
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
+    }
 
     if (uuid != UUIDHelpers::Nil)
         settings.ostr << (settings.hilite ? hilite_keyword : "") << " UUID " << (settings.hilite ? hilite_none : "")
diff --git a/src/Parsers/ASTWatchQuery.h b/src/Parsers/ASTWatchQuery.h
index 156fe6828bc..a5b76c07605 100644
--- a/src/Parsers/ASTWatchQuery.h
+++ b/src/Parsers/ASTWatchQuery.h
@@ -40,22 +40,30 @@ public:
     QueryKind getQueryKind() const override { return QueryKind::Create; }
 
 protected:
-    void formatQueryImpl(const FormatSettings & s, FormatState & state, FormatStateStacked frame) const override
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
-        std::string indent_str = s.one_line ? "" : std::string(4 * frame.indent, ' ');
+        std::string indent_str = settings.one_line ? "" : std::string(4 * frame.indent, ' ');
 
-        s.ostr << (s.hilite ? hilite_keyword : "") << "WATCH " << (s.hilite ? hilite_none : "")
-            << (database ? backQuoteIfNeed(getDatabase()) + "." : "") << backQuoteIfNeed(getTable());
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "WATCH " << (settings.hilite ? hilite_none : "");
+
+        if (database)
+        {
+            database->formatImpl(settings, state, frame);
+            settings.ostr << '.';
+        }
+
+        chassert(table);
+        table->formatImpl(settings, state, frame);
 
         if (is_watch_events)
         {
-            s.ostr << " " << (s.hilite ? hilite_keyword : "") << "EVENTS" << (s.hilite ? hilite_none : "");
+            settings.ostr << " " << (settings.hilite ? hilite_keyword : "") << "EVENTS" << (settings.hilite ? hilite_none : "");
         }
 
         if (limit_length)
         {
-            s.ostr << (s.hilite ? hilite_keyword : "") << s.nl_or_ws << indent_str << "LIMIT " << (s.hilite ? hilite_none : "");
-            limit_length->formatImpl(s, state, frame);
+            settings.ostr << (settings.hilite ? hilite_keyword : "") << settings.nl_or_ws << indent_str << "LIMIT " << (settings.hilite ? hilite_none : "");
+            limit_length->formatImpl(settings, state, frame);
         }
     }
 };
diff --git a/src/Parsers/ASTWindowDefinition.cpp b/src/Parsers/ASTWindowDefinition.cpp
index 29e42de3ce0..21c44a166af 100644
--- a/src/Parsers/ASTWindowDefinition.cpp
+++ b/src/Parsers/ASTWindowDefinition.cpp
@@ -94,9 +94,9 @@ void ASTWindowDefinition::formatImpl(const FormatSettings & settings,
     if (!frame_is_default)
     {
         if (need_space)
-        {
             settings.ostr << " ";
-        }
+
+        format_frame.need_parens = true;
 
         settings.ostr << frame_type << " BETWEEN ";
         if (frame_begin_type == WindowFrame::BoundaryType::Current)
diff --git a/src/Parsers/ASTWindowDefinition.h b/src/Parsers/ASTWindowDefinition.h
index 507825f11d2..72ad8f6abda 100644
--- a/src/Parsers/ASTWindowDefinition.h
+++ b/src/Parsers/ASTWindowDefinition.h
@@ -41,7 +41,6 @@ struct ASTWindowListElement : public IAST
     // ASTWindowDefinition
     ASTPtr definition;
 
-
     ASTPtr clone() const override;
 
     String getID(char delimiter) const override;
diff --git a/src/Parsers/Access/ASTCreateSettingsProfileQuery.cpp b/src/Parsers/Access/ASTCreateSettingsProfileQuery.cpp
index 3379486d789..e1b42bfb33d 100644
--- a/src/Parsers/Access/ASTCreateSettingsProfileQuery.cpp
+++ b/src/Parsers/Access/ASTCreateSettingsProfileQuery.cpp
@@ -17,7 +17,7 @@ namespace
         {
             if (std::exchange(need_comma, true))
                 settings.ostr << ", ";
-            settings.ostr << backQuoteIfNeed(name);
+            settings.ostr << backQuote(name);
         }
     }
 
diff --git a/src/Parsers/Access/ASTCreateUserQuery.cpp b/src/Parsers/Access/ASTCreateUserQuery.cpp
index 96306fa0dd2..02735568a04 100644
--- a/src/Parsers/Access/ASTCreateUserQuery.cpp
+++ b/src/Parsers/Access/ASTCreateUserQuery.cpp
@@ -18,7 +18,6 @@ namespace
                       << quoteString(new_name);
     }
 
-
     void formatAuthenticationData(const ASTAuthenticationData & auth_data, const IAST::FormatSettings & settings)
     {
         auth_data.format(settings);
diff --git a/src/Parsers/Access/ASTGrantQuery.cpp b/src/Parsers/Access/ASTGrantQuery.cpp
index 331f1798d77..f60fa7e4a23 100644
--- a/src/Parsers/Access/ASTGrantQuery.cpp
+++ b/src/Parsers/Access/ASTGrantQuery.cpp
@@ -93,6 +93,29 @@ namespace
         if (no_output)
             settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << "USAGE ON " << (settings.hilite ? IAST::hilite_none : "") << "*.*";
     }
+
+
+    void formatCurrentGrantsElements(const AccessRightsElements & elements, const IAST::FormatSettings & settings)
+    {
+        for (size_t i = 0; i != elements.size(); ++i)
+        {
+            const auto & element = elements[i];
+
+            bool next_element_on_same_db_and_table = false;
+            if (i != elements.size() - 1)
+            {
+                const auto & next_element = elements[i + 1];
+                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, settings);
+            }
+        }
+    }
 }
 
 
@@ -148,9 +171,14 @@ void ASTGrantQuery::formatImpl(const FormatSettings & settings, FormatState &, F
                             "to grant or revoke, not both of them");
     }
     else if (current_grants)
-        settings.ostr << (settings.hilite ? hilite_keyword : "") << " CURRENT GRANTS" << (settings.hilite ? hilite_none : "");
+    {
+        settings.ostr << (settings.hilite ? hilite_keyword : "") << "CURRENT GRANTS" << (settings.hilite ? hilite_none : "");
+        formatCurrentGrantsElements(access_rights_elements, settings);
+    }
     else
+    {
         formatElementsWithoutOptions(access_rights_elements, settings);
+    }
 
     settings.ostr << (settings.hilite ? IAST::hilite_keyword : "") << (is_revoke ? " FROM " : " TO ")
                   << (settings.hilite ? IAST::hilite_none : "");
diff --git a/src/Parsers/Access/ASTSettingsProfileElement.cpp b/src/Parsers/Access/ASTSettingsProfileElement.cpp
index 7b29b15cb29..014b97132de 100644
--- a/src/Parsers/Access/ASTSettingsProfileElement.cpp
+++ b/src/Parsers/Access/ASTSettingsProfileElement.cpp
@@ -18,7 +18,7 @@ namespace
         }
         else
         {
-            settings.ostr << backQuoteIfNeed(str);
+            settings.ostr << backQuote(str);
         }
     }
 }
diff --git a/src/Parsers/Access/ASTUserNameWithHost.cpp b/src/Parsers/Access/ASTUserNameWithHost.cpp
index af84399ae45..667a8e37414 100644
--- a/src/Parsers/Access/ASTUserNameWithHost.cpp
+++ b/src/Parsers/Access/ASTUserNameWithHost.cpp
@@ -28,6 +28,12 @@ void ASTUserNameWithHost::concatParts()
     host_pattern.clear();
 }
 
+void ASTUserNameWithHost::replace(const String name_)
+{
+    base_name = name_;
+    host_pattern.clear();
+}
+
 
 void ASTUserNamesWithHost::formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const
 {
diff --git a/src/Parsers/Access/ASTUserNameWithHost.h b/src/Parsers/Access/ASTUserNameWithHost.h
index bd28b42b48a..8e6a7e78987 100644
--- a/src/Parsers/Access/ASTUserNameWithHost.h
+++ b/src/Parsers/Access/ASTUserNameWithHost.h
@@ -27,6 +27,7 @@ public:
     String getID(char) const override { return "UserNameWithHost"; }
     ASTPtr clone() const override { return std::make_shared<ASTUserNameWithHost>(*this); }
     void formatImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override;
+    void replace(String name_);
 };
 
 
diff --git a/src/Parsers/Access/ParserCreateQuotaQuery.cpp b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
index bc3512e3fc0..ddfdbe38903 100644
--- a/src/Parsers/Access/ParserCreateQuotaQuery.cpp
+++ b/src/Parsers/Access/ParserCreateQuotaQuery.cpp
@@ -33,7 +33,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"RENAME TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::RENAME_TO}.ignore(pos, expected))
                 return false;
 
             return parseIdentifierOrStringLiteral(pos, expected, new_name);
@@ -44,13 +44,13 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (ParserKeyword{"NOT KEYED"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::NOT_KEYED}.ignore(pos, expected))
             {
                 key_type = QuotaKeyType::NONE;
                 return true;
             }
 
-            if (!ParserKeyword{"KEY BY"}.ignore(pos, expected) && !ParserKeyword{"KEYED BY"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::KEY_BY}.ignore(pos, expected) && !ParserKeyword{Keyword::KEYED_BY}.ignore(pos, expected))
                 return false;
 
             Strings names;
@@ -84,7 +84,7 @@ namespace
         {
             for (auto qt : collections::range(QuotaType::MAX))
             {
-                if (ParserKeyword{QuotaTypeInfo::get(qt).keyword}.ignore(pos, expected))
+                if (ParserKeyword::createDeprecated(QuotaTypeInfo::get(qt).keyword).ignore(pos, expected))
                 {
                     quota_type = qt;
                     return true;
@@ -141,7 +141,7 @@ namespace
 
         auto parse_limit = [&]
         {
-            max_prefix_encountered |= ParserKeyword{"MAX"}.ignore(pos, expected);
+            max_prefix_encountered |= ParserKeyword{Keyword::MAX}.ignore(pos, expected);
 
             QuotaType quota_type;
             if (!parseQuotaType(pos, expected, quota_type))
@@ -153,7 +153,7 @@ namespace
             }
             else
             {
-                if (!ParserKeyword{"MAX"}.ignore(pos, expected))
+                if (!ParserKeyword{Keyword::MAX}.ignore(pos, expected))
                     return false;
             }
 
@@ -178,13 +178,13 @@ namespace
 
         auto parse_interval_with_limits = [&]
         {
-            if (!ParserKeyword{"FOR"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::FOR}.ignore(pos, expected))
                 return false;
 
             ASTCreateQuotaQuery::Limits limits;
-            limits.randomize_interval = ParserKeyword{"RANDOMIZED"}.ignore(pos, expected);
+            limits.randomize_interval = ParserKeyword{Keyword::RANDOMIZED}.ignore(pos, expected);
 
-            ParserKeyword{"INTERVAL"}.ignore(pos, expected);
+            ParserKeyword{Keyword::INTERVAL}.ignore(pos, expected);
 
             ASTPtr num_intervals_ast;
             if (!ParserNumber{}.parse(pos, num_intervals_ast, expected))
@@ -199,11 +199,11 @@ namespace
             limits.duration = std::chrono::seconds(static_cast<UInt64>(num_intervals * interval_kind.toAvgSeconds()));
             std::vector<std::pair<QuotaType, QuotaValue>> new_limits;
 
-            if (ParserKeyword{"NO LIMITS"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::NO_LIMITS}.ignore(pos, expected))
             {
                 limits.drop = true;
             }
-            else if (ParserKeyword{"TRACKING ONLY"}.ignore(pos, expected))
+            else if (ParserKeyword{Keyword::TRACKING_ONLY}.ignore(pos, expected))
             {
             }
             else if (parseLimits(pos, expected, new_limits))
@@ -232,7 +232,7 @@ namespace
             ASTPtr node;
             ParserRolesOrUsersSet roles_p;
             roles_p.allowAll().allowRoles().allowUsers().allowCurrentUser().useIDMode(id_mode);
-            if (!ParserKeyword{"TO"}.ignore(pos, expected) || !roles_p.parse(pos, node, expected))
+            if (!ParserKeyword{Keyword::TO}.ignore(pos, expected) || !roles_p.parse(pos, node, expected))
                 return false;
 
             roles = std::static_pointer_cast<ASTRolesOrUsersSet>(node);
@@ -244,7 +244,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -255,14 +255,14 @@ bool ParserCreateQuotaQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     bool alter = false;
     if (attach_mode)
     {
-        if (!ParserKeyword{"ATTACH QUOTA"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::ATTACH_QUOTA}.ignore(pos, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword{"ALTER QUOTA"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ALTER_QUOTA}.ignore(pos, expected))
             alter = true;
-        else if (!ParserKeyword{"CREATE QUOTA"}.ignore(pos, expected))
+        else if (!ParserKeyword{Keyword::CREATE_QUOTA}.ignore(pos, expected))
             return false;
     }
 
@@ -271,14 +271,14 @@ bool ParserCreateQuotaQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     bool or_replace = false;
     if (alter)
     {
-        if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
             if_exists = true;
     }
     else
     {
-        if (ParserKeyword{"IF NOT EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_NOT_EXISTS}.ignore(pos, expected))
             if_not_exists = true;
-        else if (ParserKeyword{"OR REPLACE"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::OR_REPLACE}.ignore(pos, expected))
             or_replace = true;
     }
 
@@ -313,7 +313,7 @@ bool ParserCreateQuotaQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         if (cluster.empty() && parseOnCluster(pos, expected, cluster))
             continue;
 
-        if (storage_name.empty() && ParserKeyword{"IN"}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
+        if (storage_name.empty() && ParserKeyword{Keyword::IN}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
             continue;
 
         break;
diff --git a/src/Parsers/Access/ParserCreateRoleQuery.cpp b/src/Parsers/Access/ParserCreateRoleQuery.cpp
index 99a97f6901d..cdcb399e408 100644
--- a/src/Parsers/Access/ParserCreateRoleQuery.cpp
+++ b/src/Parsers/Access/ParserCreateRoleQuery.cpp
@@ -18,7 +18,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"RENAME TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::RENAME_TO}.ignore(pos, expected))
                 return false;
 
             return parseRoleName(pos, expected, new_name);
@@ -29,7 +29,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::SETTINGS}.ignore(pos, expected))
                 return false;
 
             ASTPtr new_settings_ast;
@@ -47,7 +47,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -58,14 +58,14 @@ bool ParserCreateRoleQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     bool alter = false;
     if (attach_mode)
     {
-        if (!ParserKeyword{"ATTACH ROLE"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::ATTACH_ROLE}.ignore(pos, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword{"ALTER ROLE"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ALTER_ROLE}.ignore(pos, expected))
             alter = true;
-        else if (!ParserKeyword{"CREATE ROLE"}.ignore(pos, expected))
+        else if (!ParserKeyword{Keyword::CREATE_ROLE}.ignore(pos, expected))
             return false;
     }
 
@@ -74,14 +74,14 @@ bool ParserCreateRoleQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     bool or_replace = false;
     if (alter)
     {
-        if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
             if_exists = true;
     }
     else
     {
-        if (ParserKeyword{"IF NOT EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_NOT_EXISTS}.ignore(pos, expected))
             if_not_exists = true;
-        else if (ParserKeyword{"OR REPLACE"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::OR_REPLACE}.ignore(pos, expected))
             or_replace = true;
     }
 
@@ -112,7 +112,7 @@ bool ParserCreateRoleQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         if (cluster.empty() && parseOnCluster(pos, expected, cluster))
             continue;
 
-        if (storage_name.empty() && ParserKeyword{"IN"}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
+        if (storage_name.empty() && ParserKeyword{Keyword::IN}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
             continue;
 
         break;
diff --git a/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp b/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
index f9e9466e35d..b49e153c5b0 100644
--- a/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
+++ b/src/Parsers/Access/ParserCreateRowPolicyQuery.cpp
@@ -23,7 +23,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"RENAME TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::RENAME_TO}.ignore(pos, expected))
                 return false;
 
             return parseIdentifierOrStringLiteral(pos, expected, new_short_name);
@@ -34,16 +34,16 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"AS"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::AS}.ignore(pos, expected))
                 return false;
 
-            if (ParserKeyword{"RESTRICTIVE"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::RESTRICTIVE}.ignore(pos, expected))
             {
                 is_restrictive = true;
                 return true;
             }
 
-            if (!ParserKeyword{"PERMISSIVE"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::PERMISSIVE}.ignore(pos, expected))
                 return false;
 
             is_restrictive = false;
@@ -55,7 +55,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (ParserKeyword("NONE").ignore(pos, expected))
+            if (ParserKeyword(Keyword::NONE).ignore(pos, expected))
             {
                 expr = nullptr;
                 return true;
@@ -89,7 +89,7 @@ namespace
 
         auto parse_command = [&]
         {
-            if (ParserKeyword{"ALL"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::ALL}.ignore(pos, expected))
             {
                 addAllCommands(res_commands);
                 return true;
@@ -98,7 +98,7 @@ namespace
             for (auto filter_type : collections::range(RowPolicyFilterType::MAX))
             {
                 std::string_view command = RowPolicyFilterTypeInfo::get(filter_type).command;
-                if (ParserKeyword{command.data()}.ignore(pos, expected))
+                if (ParserKeyword::createDeprecated(command.data()).ignore(pos, expected))
                 {
                     res_commands.emplace(command);
                     return true;
@@ -125,7 +125,7 @@ namespace
         {
             boost::container::flat_set<std::string_view> commands;
 
-            if (ParserKeyword{"FOR"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::FOR}.ignore(pos, expected))
             {
                 if (!parseCommands(pos, expected, commands))
                     return false;
@@ -135,12 +135,12 @@ namespace
 
             std::optional<ASTPtr> filter;
             std::optional<ASTPtr> check;
-            if (ParserKeyword{"USING"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::USING}.ignore(pos, expected))
             {
                 if (!parseFilterExpression(pos, expected, filter.emplace()))
                     return false;
             }
-            if (ParserKeyword{"WITH CHECK"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::WITH_CHECK}.ignore(pos, expected))
             {
                 if (!parseFilterExpression(pos, expected, check.emplace()))
                     return false;
@@ -179,7 +179,7 @@ namespace
         return IParserBase::wrapParseImpl(pos, [&]
         {
             ASTPtr ast;
-            if (!ParserKeyword{"TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::TO}.ignore(pos, expected))
                 return false;
 
             ParserRolesOrUsersSet roles_p;
@@ -196,7 +196,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -207,14 +207,14 @@ bool ParserCreateRowPolicyQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     bool alter = false;
     if (attach_mode)
     {
-        if (!ParserKeyword{"ATTACH POLICY"}.ignore(pos, expected) && !ParserKeyword{"ATTACH ROW POLICY"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::ATTACH_POLICY}.ignore(pos, expected) && !ParserKeyword{Keyword::ATTACH_ROW_POLICY}.ignore(pos, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword{"ALTER POLICY"}.ignore(pos, expected) || ParserKeyword{"ALTER ROW POLICY"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ALTER_POLICY}.ignore(pos, expected) || ParserKeyword{Keyword::ALTER_ROW_POLICY}.ignore(pos, expected))
             alter = true;
-        else if (!ParserKeyword{"CREATE POLICY"}.ignore(pos, expected) && !ParserKeyword{"CREATE ROW POLICY"}.ignore(pos, expected))
+        else if (!ParserKeyword{Keyword::CREATE_POLICY}.ignore(pos, expected) && !ParserKeyword{Keyword::CREATE_ROW_POLICY}.ignore(pos, expected))
             return false;
     }
 
@@ -223,14 +223,14 @@ bool ParserCreateRowPolicyQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     bool or_replace = false;
     if (alter)
     {
-        if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
             if_exists = true;
     }
     else
     {
-        if (ParserKeyword{"IF NOT EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_NOT_EXISTS}.ignore(pos, expected))
             if_not_exists = true;
-        else if (ParserKeyword{"OR REPLACE"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::OR_REPLACE}.ignore(pos, expected))
             or_replace = true;
     }
 
@@ -273,7 +273,7 @@ bool ParserCreateRowPolicyQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
         if (cluster.empty() && parseOnCluster(pos, expected, cluster))
             continue;
 
-        if (storage_name.empty() && ParserKeyword{"IN"}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
+        if (storage_name.empty() && ParserKeyword{Keyword::IN}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
             continue;
 
         break;
diff --git a/src/Parsers/Access/ParserCreateSettingsProfileQuery.cpp b/src/Parsers/Access/ParserCreateSettingsProfileQuery.cpp
index fcb6ebd8806..6526aaf4fc5 100644
--- a/src/Parsers/Access/ParserCreateSettingsProfileQuery.cpp
+++ b/src/Parsers/Access/ParserCreateSettingsProfileQuery.cpp
@@ -20,7 +20,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"RENAME TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::RENAME_TO}.ignore(pos, expected))
                 return false;
 
             return parseIdentifierOrStringLiteral(pos, expected, new_name);
@@ -31,7 +31,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::SETTINGS}.ignore(pos, expected))
                 return false;
 
             ASTPtr new_settings_ast;
@@ -50,7 +50,7 @@ namespace
         return IParserBase::wrapParseImpl(pos, [&]
         {
             ASTPtr ast;
-            if (!ParserKeyword{"TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::TO}.ignore(pos, expected))
                 return false;
 
             ParserRolesOrUsersSet roles_p;
@@ -67,7 +67,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -78,14 +78,14 @@ bool ParserCreateSettingsProfileQuery::parseImpl(Pos & pos, ASTPtr & node, Expec
     bool alter = false;
     if (attach_mode)
     {
-        if (!ParserKeyword{"ATTACH SETTINGS PROFILE"}.ignore(pos, expected) && !ParserKeyword{"ATTACH PROFILE"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::ATTACH_SETTINGS_PROFILE}.ignore(pos, expected) && !ParserKeyword{Keyword::ATTACH_PROFILE}.ignore(pos, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword{"ALTER SETTINGS PROFILE"}.ignore(pos, expected) || ParserKeyword{"ALTER PROFILE"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ALTER_SETTINGS_PROFILE}.ignore(pos, expected) || ParserKeyword{Keyword::ALTER_PROFILE}.ignore(pos, expected))
             alter = true;
-        else if (!ParserKeyword{"CREATE SETTINGS PROFILE"}.ignore(pos, expected) && !ParserKeyword{"CREATE PROFILE"}.ignore(pos, expected))
+        else if (!ParserKeyword{Keyword::CREATE_SETTINGS_PROFILE}.ignore(pos, expected) && !ParserKeyword{Keyword::CREATE_PROFILE}.ignore(pos, expected))
             return false;
     }
 
@@ -94,14 +94,14 @@ bool ParserCreateSettingsProfileQuery::parseImpl(Pos & pos, ASTPtr & node, Expec
     bool or_replace = false;
     if (alter)
     {
-        if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
             if_exists = true;
     }
     else
     {
-        if (ParserKeyword{"IF NOT EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_NOT_EXISTS}.ignore(pos, expected))
             if_not_exists = true;
-        else if (ParserKeyword{"OR REPLACE"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::OR_REPLACE}.ignore(pos, expected))
             or_replace = true;
     }
 
@@ -132,7 +132,7 @@ bool ParserCreateSettingsProfileQuery::parseImpl(Pos & pos, ASTPtr & node, Expec
         if (cluster.empty() && parseOnCluster(pos, expected, cluster))
             continue;
 
-        if (storage_name.empty() && ParserKeyword{"IN"}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
+        if (storage_name.empty() && ParserKeyword{Keyword::IN}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
             continue;
 
         break;
diff --git a/src/Parsers/Access/ParserCreateUserQuery.cpp b/src/Parsers/Access/ParserCreateUserQuery.cpp
index 6fec40ec84a..d4729ab796a 100644
--- a/src/Parsers/Access/ParserCreateUserQuery.cpp
+++ b/src/Parsers/Access/ParserCreateUserQuery.cpp
@@ -15,6 +15,7 @@
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/ParserDatabaseOrNone.h>
+#include <Parsers/ParserStringAndSubstitution.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <base/range.h>
 #include <boost/algorithm/string/predicate.hpp>
@@ -31,7 +32,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"RENAME TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::RENAME_TO}.ignore(pos, expected))
                 return false;
 
             String maybe_new_name;
@@ -43,25 +44,11 @@ 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);
-        }
-
-    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))
+            if (ParserKeyword{Keyword::NOT_IDENTIFIED}.ignore(pos, expected))
             {
                 auth_data = std::make_shared<ASTAuthenticationData>();
                 auth_data->type = AuthenticationType::NO_PASSWORD;
@@ -69,7 +56,7 @@ namespace
                 return true;
             }
 
-            if (!ParserKeyword{"IDENTIFIED"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::IDENTIFIED}.ignore(pos, expected))
                 return false;
 
             std::optional<AuthenticationType> type;
@@ -82,12 +69,11 @@ namespace
             bool expect_public_ssh_key = false;
             bool expect_http_auth_server = false;
 
-
-            if (ParserKeyword{"WITH"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::WITH}.ignore(pos, expected))
             {
                 for (auto check_type : collections::range(AuthenticationType::MAX))
                 {
-                    if (ParserKeyword{AuthenticationTypeInfo::get(check_type).raw_name}.ignore(pos, expected))
+                    if (ParserKeyword{AuthenticationTypeInfo::get(check_type).keyword}.ignore(pos, expected))
                     {
                         type = check_type;
 
@@ -110,17 +96,17 @@ namespace
 
                 if (!type)
                 {
-                    if (ParserKeyword{"SHA256_HASH"}.ignore(pos, expected))
+                    if (ParserKeyword{Keyword::SHA256_HASH}.ignore(pos, expected))
                     {
                         type = AuthenticationType::SHA256_PASSWORD;
                         expect_hash = true;
                     }
-                    else if (ParserKeyword{"DOUBLE_SHA1_HASH"}.ignore(pos, expected))
+                    else if (ParserKeyword{Keyword::DOUBLE_SHA1_HASH}.ignore(pos, expected))
                     {
                         type = AuthenticationType::DOUBLE_SHA1_PASSWORD;
                         expect_hash = true;
                     }
-                    else if (ParserKeyword{"BCRYPT_HASH"}.ignore(pos, expected))
+                    else if (ParserKeyword{Keyword::BCRYPT_HASH}.ignore(pos, expected))
                     {
                         type = AuthenticationType::BCRYPT_PASSWORD;
                         expect_hash = true;
@@ -142,12 +128,12 @@ namespace
 
             if (expect_password || expect_hash)
             {
-                if (!ParserKeyword{"BY"}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
+                if (!ParserKeyword{Keyword::BY}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
                     return false;
 
                 if (expect_hash && type == AuthenticationType::SHA256_PASSWORD)
                 {
-                    if (ParserKeyword{"SALT"}.ignore(pos, expected))
+                    if (ParserKeyword{Keyword::SALT}.ignore(pos, expected))
                     {
                         if (!ParserStringAndSubstitution{}.parse(pos, parsed_salt, expected))
                             return false;
@@ -156,12 +142,12 @@ namespace
             }
             else if (expect_ldap_server_name)
             {
-                if (!ParserKeyword{"SERVER"}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
+                if (!ParserKeyword{Keyword::SERVER}.ignore(pos, expected) || !ParserStringAndSubstitution{}.parse(pos, value, expected))
                     return false;
             }
             else if (expect_kerberos_realm)
             {
-                if (ParserKeyword{"REALM"}.ignore(pos, expected))
+                if (ParserKeyword{Keyword::REALM}.ignore(pos, expected))
                 {
                     if (!ParserStringAndSubstitution{}.parse(pos, value, expected))
                         return false;
@@ -169,7 +155,7 @@ namespace
             }
             else if (expect_common_names)
             {
-                if (!ParserKeyword{"CN"}.ignore(pos, expected))
+                if (!ParserKeyword{Keyword::CN}.ignore(pos, expected))
                     return false;
 
                 if (!ParserList{std::make_unique<ParserStringAndSubstitution>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, common_names, expected))
@@ -177,7 +163,7 @@ namespace
             }
             else if (expect_public_ssh_key)
             {
-                if (!ParserKeyword{"BY"}.ignore(pos, expected))
+                if (!ParserKeyword{Keyword::BY}.ignore(pos, expected))
                     return false;
 
                 if (!ParserList{std::make_unique<ParserPublicSSHKey>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, common_names, expected))
@@ -185,12 +171,12 @@ namespace
             }
             else if (expect_http_auth_server)
             {
-                if (!ParserKeyword{"SERVER"}.ignore(pos, expected))
+                if (!ParserKeyword{Keyword::SERVER}.ignore(pos, expected))
                     return false;
                 if (!ParserStringAndSubstitution{}.parse(pos, value, expected))
                     return false;
 
-                if (ParserKeyword{"SCHEME"}.ignore(pos, expected))
+                if (ParserKeyword{Keyword::SCHEME}.ignore(pos, expected))
                 {
                     if (!ParserStringAndSubstitution{}.parse(pos, http_auth_scheme, expected))
                         return false;
@@ -229,22 +215,22 @@ namespace
 
         auto parse_host = [&]
         {
-            if (ParserKeyword{"NONE"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::NONE}.ignore(pos, expected))
                 return true;
 
-            if (ParserKeyword{"ANY"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::ANY}.ignore(pos, expected))
             {
                 res_hosts.addAnyHost();
                 return true;
             }
 
-            if (ParserKeyword{"LOCAL"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::LOCAL}.ignore(pos, expected))
             {
                 res_hosts.addLocalHost();
                 return true;
             }
 
-            if (ParserKeyword{"REGEXP"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::REGEXP}.ignore(pos, expected))
             {
                 ASTPtr ast;
                 if (!ParserList{std::make_unique<ParserStringLiteral>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, ast, expected))
@@ -255,7 +241,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"NAME"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::NAME}.ignore(pos, expected))
             {
                 ASTPtr ast;
                 if (!ParserList{std::make_unique<ParserStringLiteral>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, ast, expected))
@@ -267,7 +253,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"IP"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::IP}.ignore(pos, expected))
             {
                 ASTPtr ast;
                 if (!ParserList{std::make_unique<ParserStringLiteral>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, ast, expected))
@@ -279,7 +265,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"LIKE"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::LIKE}.ignore(pos, expected))
             {
                 ASTPtr ast;
                 if (!ParserList{std::make_unique<ParserStringLiteral>(), std::make_unique<ParserToken>(TokenType::Comma), false}.parse(pos, ast, expected))
@@ -306,10 +292,10 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!prefix.empty() && !ParserKeyword{prefix}.ignore(pos, expected))
+            if (!prefix.empty() && !ParserKeyword::createDeprecated(prefix).ignore(pos, expected))
                 return false;
 
-            if (!ParserKeyword{"HOST"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::HOST}.ignore(pos, expected))
                 return false;
 
             AllowedClientHosts res_hosts;
@@ -326,7 +312,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"DEFAULT ROLE"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::DEFAULT_ROLE}.ignore(pos, expected))
                 return false;
 
             ASTPtr ast;
@@ -346,7 +332,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::SETTINGS}.ignore(pos, expected))
                 return false;
 
             ASTPtr new_settings_ast;
@@ -364,7 +350,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"GRANTEES"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::GRANTEES}.ignore(pos, expected))
                 return false;
 
             ASTPtr ast;
@@ -382,7 +368,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 
@@ -390,7 +376,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"DEFAULT DATABASE"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::DEFAULT_DATABASE}.ignore(pos, expected))
                 return false;
 
             ASTPtr ast;
@@ -407,7 +393,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"VALID UNTIL"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::VALID_UNTIL}.ignore(pos, expected))
                 return false;
 
             ParserStringAndSubstitution until_p;
@@ -423,14 +409,14 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     bool alter = false;
     if (attach_mode)
     {
-        if (!ParserKeyword{"ATTACH USER"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::ATTACH_USER}.ignore(pos, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword{"ALTER USER"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ALTER_USER}.ignore(pos, expected))
             alter = true;
-        else if (!ParserKeyword{"CREATE USER"}.ignore(pos, expected))
+        else if (!ParserKeyword{Keyword::CREATE_USER}.ignore(pos, expected))
             return false;
     }
 
@@ -439,14 +425,14 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     bool or_replace = false;
     if (alter)
     {
-        if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
             if_exists = true;
     }
     else
     {
-        if (ParserKeyword{"IF NOT EXISTS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IF_NOT_EXISTS}.ignore(pos, expected))
             if_not_exists = true;
-        else if (ParserKeyword{"OR REPLACE"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::OR_REPLACE}.ignore(pos, expected))
             or_replace = true;
     }
 
@@ -522,7 +508,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             if (!new_name && (names->size() == 1) && parseRenameTo(pos, expected, new_name))
                 continue;
 
-            if (parseHosts(pos, expected, "ADD", new_hosts))
+            if (parseHosts(pos, expected, toStringView(Keyword::ADD), new_hosts))
             {
                 if (!add_hosts)
                     add_hosts.emplace();
@@ -530,7 +516,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
                 continue;
             }
 
-            if (parseHosts(pos, expected, "DROP", new_hosts))
+            if (parseHosts(pos, expected, toStringView(Keyword::DROP), new_hosts))
             {
                 if (!remove_hosts)
                     remove_hosts.emplace();
@@ -539,7 +525,7 @@ bool ParserCreateUserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             }
         }
 
-        if (storage_name.empty() && ParserKeyword{"IN"}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
+        if (storage_name.empty() && ParserKeyword{Keyword::IN}.ignore(pos, expected) && parseAccessStorageName(pos, expected, storage_name))
             continue;
 
         break;
diff --git a/src/Parsers/Access/ParserDropAccessEntityQuery.cpp b/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
index 7fd34a6f8e4..973bf07e346 100644
--- a/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
+++ b/src/Parsers/Access/ParserDropAccessEntityQuery.cpp
@@ -18,8 +18,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.name}.ignore(pos, expected)
-                || (!type_info.alias.empty() && ParserKeyword{type_info.alias}.ignore(pos, expected)))
+            if (ParserKeyword::createDeprecated(type_info.name).ignore(pos, expected)
+                || (!type_info.alias.empty() && ParserKeyword::createDeprecated(type_info.alias).ignore(pos, expected)))
             {
                 type = i;
                 return true;
@@ -33,7 +33,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -41,7 +41,7 @@ namespace
 
 bool ParserDropAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"DROP"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::DROP}.ignore(pos, expected))
         return false;
 
     AccessEntityType type;
@@ -49,7 +49,7 @@ bool ParserDropAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
         return false;
 
     bool if_exists = false;
-    if (ParserKeyword{"IF EXISTS"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::IF_EXISTS}.ignore(pos, expected))
         if_exists = true;
 
     Strings names;
@@ -78,7 +78,7 @@ bool ParserDropAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
             return false;
     }
 
-    if (ParserKeyword{"FROM"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::FROM}.ignore(pos, expected))
         parseAccessStorageName(pos, expected, storage_name);
 
     if (cluster.empty())
diff --git a/src/Parsers/Access/ParserGrantQuery.cpp b/src/Parsers/Access/ParserGrantQuery.cpp
index f495cb60786..799cd65dd5c 100644
--- a/src/Parsers/Access/ParserGrantQuery.cpp
+++ b/src/Parsers/Access/ParserGrantQuery.cpp
@@ -28,7 +28,7 @@ namespace
             if (pos_->type != TokenType::BareWord)
                 return false;
             std::string_view word{pos_->begin, pos_->size()};
-            return !(boost::iequals(word, "ON") || boost::iequals(word, "TO") || boost::iequals(word, "FROM"));
+            return !(boost::iequals(word, toStringView(Keyword::ON)) || boost::iequals(word, toStringView(Keyword::TO)) || boost::iequals(word, toStringView(Keyword::FROM)));
         };
 
         expected.add(pos, "access type");
@@ -132,7 +132,7 @@ namespace
                         ++is_global_with_parameter;
                 }
 
-                if (!ParserKeyword{"ON"}.ignore(pos, expected))
+                if (!ParserKeyword{Keyword::ON}.ignore(pos, expected))
                     return false;
 
                 if (is_global_with_parameter && is_global_with_parameter == access_and_columns.size())
@@ -197,11 +197,13 @@ namespace
         {
             AccessRightsElement default_element(AccessType::ALL);
 
-            if (!ParserKeyword{"ON"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::ON}.ignore(pos, expected))
                 return false;
 
-            String database_name, table_name;
-            bool any_database = false, any_table = false;
+            String database_name;
+            String table_name;
+            bool any_database = false;
+            bool any_table = false;
             if (!parseDatabaseAndTableNameOrAsterisks(pos, expected, database_name, any_database, table_name, any_table))
                 return false;
 
@@ -263,7 +265,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{is_revoke ? "FROM" : "TO"}.ignore(pos, expected))
+            if (!ParserKeyword{is_revoke ? Keyword::FROM : Keyword::TO}.ignore(pos, expected))
                 return false;
 
             ASTPtr ast;
@@ -281,7 +283,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -289,14 +291,14 @@ namespace
 
 bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (attach_mode && !ParserKeyword{"ATTACH"}.ignore(pos, expected))
+    if (attach_mode && !ParserKeyword{Keyword::ATTACH}.ignore(pos, expected))
         return false;
 
     bool is_replace = false;
     bool is_revoke = false;
-    if (ParserKeyword{"REVOKE"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::REVOKE}.ignore(pos, expected))
         is_revoke = true;
-    else if (!ParserKeyword{"GRANT"}.ignore(pos, expected))
+    else if (!ParserKeyword{Keyword::GRANT}.ignore(pos, expected))
         return false;
 
     String cluster;
@@ -306,9 +308,9 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     bool admin_option = false;
     if (is_revoke)
     {
-        if (ParserKeyword{"GRANT OPTION FOR"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::GRANT_OPTION_FOR}.ignore(pos, expected))
             grant_option = true;
-        else if (ParserKeyword{"ADMIN OPTION FOR"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::ADMIN_OPTION_FOR}.ignore(pos, expected))
             admin_option = true;
     }
 
@@ -316,7 +318,7 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     std::shared_ptr<ASTRolesOrUsersSet> roles;
 
     bool current_grants = false;
-    if (!is_revoke && ParserKeyword{"CURRENT GRANTS"}.ignore(pos, expected))
+    if (!is_revoke && ParserKeyword{Keyword::CURRENT_GRANTS}.ignore(pos, expected))
     {
         current_grants = true;
         if (!parseCurrentGrants(pos, expected, elements))
@@ -340,12 +342,12 @@ bool ParserGrantQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     if (!is_revoke)
     {
-        if (ParserKeyword{"WITH GRANT OPTION"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::WITH_GRANT_OPTION}.ignore(pos, expected))
             grant_option = true;
-        else if (ParserKeyword{"WITH ADMIN OPTION"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::WITH_ADMIN_OPTION}.ignore(pos, expected))
             admin_option = true;
 
-        if (ParserKeyword{"WITH REPLACE OPTION"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::WITH_REPLACE_OPTION}.ignore(pos, expected))
             is_replace = true;
     }
 
diff --git a/src/Parsers/Access/ParserMoveAccessEntityQuery.cpp b/src/Parsers/Access/ParserMoveAccessEntityQuery.cpp
index 798e200bfb3..571b03f6f3c 100644
--- a/src/Parsers/Access/ParserMoveAccessEntityQuery.cpp
+++ b/src/Parsers/Access/ParserMoveAccessEntityQuery.cpp
@@ -18,8 +18,8 @@ namespace
         for (auto i : collections::range(AccessEntityType::MAX))
         {
             const auto & type_info = AccessEntityTypeInfo::get(i);
-            if (ParserKeyword{type_info.name}.ignore(pos, expected)
-                || (!type_info.alias.empty() && ParserKeyword{type_info.alias}.ignore(pos, expected)))
+            if (ParserKeyword::createDeprecated(type_info.name).ignore(pos, expected)
+                || (!type_info.alias.empty() && ParserKeyword::createDeprecated(type_info.alias).ignore(pos, expected)))
             {
                 type = i;
                 return true;
@@ -33,7 +33,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -41,7 +41,7 @@ namespace
 
 bool ParserMoveAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"MOVE"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::MOVE}.ignore(pos, expected))
         return false;
 
     AccessEntityType type;
@@ -74,7 +74,7 @@ bool ParserMoveAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
             return false;
     }
 
-    if (!ParserKeyword{"TO"}.ignore(pos, expected) || !parseAccessStorageName(pos, expected, storage_name))
+    if (!ParserKeyword{Keyword::TO}.ignore(pos, expected) || !parseAccessStorageName(pos, expected, storage_name))
         return false;
 
     if (cluster.empty())
diff --git a/src/Parsers/Access/ParserPublicSSHKey.cpp b/src/Parsers/Access/ParserPublicSSHKey.cpp
index 725fe67a75b..9102044900d 100644
--- a/src/Parsers/Access/ParserPublicSSHKey.cpp
+++ b/src/Parsers/Access/ParserPublicSSHKey.cpp
@@ -1,6 +1,6 @@
 #include <Parsers/Access/ParserPublicSSHKey.h>
-#include <Parsers/Access/ASTPublicSSHKey.h>
 
+#include <Parsers/Access/ASTPublicSSHKey.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 
@@ -15,11 +15,11 @@ namespace
         return IParserBase::wrapParseImpl(pos, [&]
         {
             String key_base64;
-            if (!ParserKeyword{"KEY"}.ignore(pos, expected) || !parseIdentifierOrStringLiteral(pos, expected, key_base64))
+            if (!ParserKeyword{Keyword::KEY}.ignore(pos, expected) || !parseIdentifierOrStringLiteral(pos, expected, key_base64))
                 return false;
 
             String type;
-            if (!ParserKeyword{"TYPE"}.ignore(pos, expected) || !parseIdentifierOrStringLiteral(pos, expected, type))
+            if (!ParserKeyword{Keyword::TYPE}.ignore(pos, expected) || !parseIdentifierOrStringLiteral(pos, expected, type))
                 return false;
 
             ast = std::make_shared<ASTPublicSSHKey>();
diff --git a/src/Parsers/Access/ParserRolesOrUsersSet.cpp b/src/Parsers/Access/ParserRolesOrUsersSet.cpp
index 6f426d89bb3..6c46bff459b 100644
--- a/src/Parsers/Access/ParserRolesOrUsersSet.cpp
+++ b/src/Parsers/Access/ParserRolesOrUsersSet.cpp
@@ -19,7 +19,7 @@ namespace
             if (!id_mode)
                 return parseRoleName(pos, expected, res);
 
-            if (!ParserKeyword{"ID"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::ID}.ignore(pos, expected))
                 return false;
             if (!ParserToken(TokenType::OpeningRoundBracket).ignore(pos, expected))
                 return false;
@@ -53,16 +53,16 @@ namespace
 
         auto parse_element = [&]
         {
-            if (ParserKeyword{"NONE"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::NONE}.ignore(pos, expected))
                 return true;
 
-            if (allow_all && ParserKeyword{"ALL"}.ignore(pos, expected))
+            if (allow_all && ParserKeyword{Keyword::ALL}.ignore(pos, expected))
             {
                 res_all = true;
                 return true;
             }
 
-            if (allow_any && ParserKeyword{"ANY"}.ignore(pos, expected))
+            if (allow_any && ParserKeyword{Keyword::ANY}.ignore(pos, expected))
             {
                 res_all = true;
                 return true;
@@ -102,7 +102,7 @@ namespace
         bool & except_current_user)
     {
         return IParserBase::wrapParseImpl(pos, [&] {
-            if (!ParserKeyword{"EXCEPT"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::EXCEPT}.ignore(pos, expected))
                 return false;
 
             bool unused;
diff --git a/src/Parsers/Access/ParserRowPolicyName.cpp b/src/Parsers/Access/ParserRowPolicyName.cpp
index efdff3c24bf..e15b8b471e6 100644
--- a/src/Parsers/Access/ParserRowPolicyName.cpp
+++ b/src/Parsers/Access/ParserRowPolicyName.cpp
@@ -16,7 +16,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 
@@ -39,13 +39,13 @@ namespace
                 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").
+            /// If table is specified without DB it cannot be followed by Keyword::ON
+            /// (but can be followed by Keyword::ON CLUSTER).
             /// The following code is necessary to figure out while parsing something like
             /// policy1 ON table1, policy2 ON table2
             /// that policy2 is another policy, not another table.
             auto end_pos = pos;
-            if (res_database.empty() && ParserKeyword{"ON"}.ignore(pos, expected))
+            if (res_database.empty() && ParserKeyword{Keyword::ON}.ignore(pos, expected))
             {
                 String unused;
                 if (ASTQueryWithOnCluster::parse(pos, unused, expected))
@@ -65,7 +65,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && parseDBAndTableName(pos, expected, database, table_name);
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected) && parseDBAndTableName(pos, expected, database, table_name);
         });
     }
 
@@ -74,7 +74,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"ON"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::ON}.ignore(pos, expected))
                 return false;
 
             std::vector<std::pair<String, String>> res;
diff --git a/src/Parsers/Access/ParserSetRoleQuery.cpp b/src/Parsers/Access/ParserSetRoleQuery.cpp
index 50ccc67a372..251b33e9c11 100644
--- a/src/Parsers/Access/ParserSetRoleQuery.cpp
+++ b/src/Parsers/Access/ParserSetRoleQuery.cpp
@@ -29,7 +29,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"TO"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::TO}.ignore(pos, expected))
                 return false;
 
             ASTPtr ast;
@@ -50,11 +50,11 @@ bool ParserSetRoleQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 {
     using Kind = ASTSetRoleQuery::Kind;
     Kind kind;
-    if (ParserKeyword{"SET ROLE DEFAULT"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::SET_ROLE_DEFAULT}.ignore(pos, expected))
         kind = Kind::SET_ROLE_DEFAULT;
-    else if (ParserKeyword{"SET ROLE"}.ignore(pos, expected))
+    else if (ParserKeyword{Keyword::SET_ROLE}.ignore(pos, expected))
         kind = Kind::SET_ROLE;
-    else if (ParserKeyword{"SET DEFAULT ROLE"}.ignore(pos, expected))
+    else if (ParserKeyword{Keyword::SET_DEFAULT_ROLE}.ignore(pos, expected))
         kind = Kind::SET_DEFAULT_ROLE;
     else
         return false;
diff --git a/src/Parsers/Access/ParserSettingsProfileElement.cpp b/src/Parsers/Access/ParserSettingsProfileElement.cpp
index 36330b96622..78002d1b425 100644
--- a/src/Parsers/Access/ParserSettingsProfileElement.cpp
+++ b/src/Parsers/Access/ParserSettingsProfileElement.cpp
@@ -15,12 +15,12 @@ namespace
 {
     bool parseProfileKeyword(IParserBase::Pos & pos, Expected & expected, bool use_inherit_keyword)
     {
-        if (ParserKeyword{"PROFILE"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::PROFILE}.ignore(pos, expected))
             return true;
 
-        if (use_inherit_keyword && ParserKeyword{"INHERIT"}.ignore(pos, expected))
+        if (use_inherit_keyword && ParserKeyword{Keyword::INHERIT}.ignore(pos, expected))
         {
-            ParserKeyword{"PROFILE"}.ignore(pos, expected);
+            ParserKeyword{Keyword::PROFILE}.ignore(pos, expected);
             return true;
         }
 
@@ -36,7 +36,7 @@ namespace
             if (!id_mode)
                 return parseIdentifierOrStringLiteral(pos, expected, res);
 
-            if (!ParserKeyword{"ID"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::ID}.ignore(pos, expected))
                 return false;
             if (!ParserToken(TokenType::OpeningRoundBracket).ignore(pos, expected))
                 return false;
@@ -73,8 +73,8 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            bool is_min_value = ParserKeyword{"MIN"}.ignore(pos, expected);
-            bool is_max_value = !is_min_value && ParserKeyword{"MAX"}.ignore(pos, expected);
+            bool is_min_value = ParserKeyword{Keyword::MIN}.ignore(pos, expected);
+            bool is_max_value = !is_min_value && ParserKeyword{Keyword::MAX}.ignore(pos, expected);
             if (!is_min_value && !is_max_value)
                 return false;
 
@@ -99,17 +99,17 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (ParserKeyword{"READONLY"}.ignore(pos, expected) || ParserKeyword{"CONST"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::READONLY}.ignore(pos, expected) || ParserKeyword{Keyword::CONST}.ignore(pos, expected))
             {
                 writability = SettingConstraintWritability::CONST;
                 return true;
             }
-            else if (ParserKeyword{"WRITABLE"}.ignore(pos, expected))
+            else if (ParserKeyword{Keyword::WRITABLE}.ignore(pos, expected))
             {
                 writability = SettingConstraintWritability::WRITABLE;
                 return true;
             }
-            else if (ParserKeyword{"CHANGEABLE_IN_READONLY"}.ignore(pos, expected))
+            else if (ParserKeyword{Keyword::CHANGEABLE_IN_READONLY}.ignore(pos, expected))
             {
                 writability = SettingConstraintWritability::CHANGEABLE_IN_READONLY;
                 return true;
@@ -151,7 +151,7 @@ namespace
             if (!has_value_or_constraint)
                 return false;
 
-            if (boost::iequals(res_setting_name, "PROFILE") && !res_value && !res_min_value && !res_max_value
+            if (boost::iequals(res_setting_name, toStringView(Keyword::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
@@ -224,7 +224,7 @@ bool ParserSettingsProfileElements::parseImpl(Pos & pos, ASTPtr & node, Expected
 {
     std::vector<std::shared_ptr<ASTSettingsProfileElement>> elements;
 
-    if (ParserKeyword{"NONE"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::NONE}.ignore(pos, expected))
     {
     }
     else
diff --git a/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp b/src/Parsers/Access/ParserShowAccessEntitiesQuery.cpp
index 15cb815f457..898971a02b3 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}.ignore(pos, expected)
-                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias}.ignore(pos, expected)))
+            if (ParserKeyword::createDeprecated(type_info.plural_name).ignore(pos, expected)
+                || (!type_info.plural_alias.empty() && ParserKeyword::createDeprecated(type_info.plural_alias).ignore(pos, expected)))
             {
                 type = i;
                 return true;
@@ -29,7 +29,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected)
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected)
                 && parseDatabaseAndTableNameOrAsterisks(pos, expected, database, any_database, table, any_table);
         });
     }
@@ -38,7 +38,7 @@ namespace
 
 bool ParserShowAccessEntitiesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"SHOW"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::SHOW}.ignore(pos, expected))
         return false;
 
     AccessEntityType type;
@@ -51,17 +51,17 @@ bool ParserShowAccessEntitiesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected
     {
         all = true;
     }
-    else if (ParserKeyword{"CURRENT ROLES"}.ignore(pos, expected))
+    else if (ParserKeyword{Keyword::CURRENT_ROLES}.ignore(pos, expected))
     {
         type = AccessEntityType::ROLE;
         current_roles = true;
     }
-    else if (ParserKeyword{"ENABLED ROLES"}.ignore(pos, expected))
+    else if (ParserKeyword{Keyword::ENABLED_ROLES}.ignore(pos, expected))
     {
         type = AccessEntityType::ROLE;
         enabled_roles = true;
     }
-    else if (ParserKeyword{"CURRENT QUOTA"}.ignore(pos, expected) || ParserKeyword{"QUOTA"}.ignore(pos, expected))
+    else if (ParserKeyword{Keyword::CURRENT_QUOTA}.ignore(pos, expected) || ParserKeyword{Keyword::QUOTA}.ignore(pos, expected))
     {
         type = AccessEntityType::QUOTA;
         current_quota = true;
diff --git a/src/Parsers/Access/ParserShowAccessQuery.h b/src/Parsers/Access/ParserShowAccessQuery.h
index da0d6ff449f..51ccf84b349 100644
--- a/src/Parsers/Access/ParserShowAccessQuery.h
+++ b/src/Parsers/Access/ParserShowAccessQuery.h
@@ -20,7 +20,7 @@ protected:
     {
         auto query = std::make_shared<ASTShowAccessQuery>();
 
-        if (!ParserKeyword("SHOW ACCESS").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::SHOW_ACCESS).ignore(pos, expected))
             return false;
 
         node = query;
diff --git a/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp b/src/Parsers/Access/ParserShowCreateAccessEntityQuery.cpp
index 17caa6366f1..8e8321dad28 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}.ignore(pos, expected)
-                || (!type_info.alias.empty() && ParserKeyword{type_info.alias}.ignore(pos, expected)))
+            if (ParserKeyword::createDeprecated(type_info.name).ignore(pos, expected)
+                || (!type_info.alias.empty() && ParserKeyword::createDeprecated(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}.ignore(pos, expected)
-                || (!type_info.plural_alias.empty() && ParserKeyword{type_info.plural_alias}.ignore(pos, expected)))
+            if (ParserKeyword::createDeprecated(type_info.plural_name).ignore(pos, expected)
+                || (!type_info.plural_alias.empty() && ParserKeyword::createDeprecated(type_info.plural_alias).ignore(pos, expected)))
             {
                 type = i;
                 plural = true;
@@ -53,7 +53,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected)
+            return ParserKeyword{Keyword::ON}.ignore(pos, expected)
                 && parseDatabaseAndTableNameOrAsterisks(pos, expected, database, any_database, table, any_table);
         });
     }
@@ -62,7 +62,7 @@ namespace
 
 bool ParserShowCreateAccessEntityQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"SHOW CREATE"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::SHOW_CREATE}.ignore(pos, expected))
         return false;
 
     AccessEntityType type;
diff --git a/src/Parsers/Access/ParserShowGrantsQuery.cpp b/src/Parsers/Access/ParserShowGrantsQuery.cpp
index 02d85d2f90b..092334e8a6f 100644
--- a/src/Parsers/Access/ParserShowGrantsQuery.cpp
+++ b/src/Parsers/Access/ParserShowGrantsQuery.cpp
@@ -10,12 +10,12 @@ namespace DB
 {
 bool ParserShowGrantsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"SHOW GRANTS"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::SHOW_GRANTS}.ignore(pos, expected))
         return false;
 
     std::shared_ptr<ASTRolesOrUsersSet> for_roles;
 
-    if (ParserKeyword{"FOR"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::FOR}.ignore(pos, expected))
     {
         ASTPtr for_roles_ast;
         ParserRolesOrUsersSet for_roles_p;
diff --git a/src/Parsers/Access/ParserShowPrivilegesQuery.cpp b/src/Parsers/Access/ParserShowPrivilegesQuery.cpp
index a120d4ed7c2..33bf118bdad 100644
--- a/src/Parsers/Access/ParserShowPrivilegesQuery.cpp
+++ b/src/Parsers/Access/ParserShowPrivilegesQuery.cpp
@@ -10,7 +10,7 @@ bool ParserShowPrivilegesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
 {
     auto query = std::make_shared<ASTShowPrivilegesQuery>();
 
-    if (!ParserKeyword("SHOW PRIVILEGES").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::SHOW_PRIVILEGES).ignore(pos, expected))
         return false;
 
     node = query;
diff --git a/src/Parsers/Access/ParserUserNameWithHost.h b/src/Parsers/Access/ParserUserNameWithHost.h
index 453b816a98d..8c85e733bef 100644
--- a/src/Parsers/Access/ParserUserNameWithHost.h
+++ b/src/Parsers/Access/ParserUserNameWithHost.h
@@ -5,6 +5,7 @@
 
 namespace DB
 {
+
 /** Parses a user name.
   * It can be a simple string or identifier or something like `name@host`.
   */
diff --git a/src/Parsers/Access/parseUserName.cpp b/src/Parsers/Access/parseUserName.cpp
index a4c5c7e8946..2c638094fce 100644
--- a/src/Parsers/Access/parseUserName.cpp
+++ b/src/Parsers/Access/parseUserName.cpp
@@ -32,7 +32,7 @@ bool parseCurrentUserTag(IParser::Pos & pos, Expected & expected)
 {
     return IParserBase::wrapParseImpl(pos, [&]
     {
-        if (!ParserKeyword{"CURRENT_USER"}.ignore(pos, expected) && !ParserKeyword{"currentUser"}.ignore(pos, expected))
+        if (!ParserKeyword{Keyword::CURRENTUSER}.ignore(pos, expected) && !ParserKeyword{Keyword::CURRENT_USER}.ignore(pos, expected))
             return false;
 
         if (ParserToken{TokenType::OpeningRoundBracket}.ignore(pos, expected))
diff --git a/src/Parsers/CommonParsers.cpp b/src/Parsers/CommonParsers.cpp
index 275679d61f0..ed8d58d5a68 100644
--- a/src/Parsers/CommonParsers.cpp
+++ b/src/Parsers/CommonParsers.cpp
@@ -1,9 +1,117 @@
 #include <Parsers/CommonParsers.h>
+#include <Common/ErrorCodes.h>
 #include <base/find_symbols.h>
+#include <algorithm>
+#include <cctype>
 
 namespace DB
 {
 
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace
+{
+using Strings = std::vector<String>;
+
+class KeyWordToStringConverter
+{
+public:
+    static const KeyWordToStringConverter & instance()
+    {
+        static const KeyWordToStringConverter res;
+        return res;
+    }
+
+    std::string_view convert(Keyword type) const
+    {
+        return mapping[static_cast<size_t>(type)];
+    }
+
+    const std::vector<String> & getMapping() const
+    {
+        return mapping;
+    }
+
+private:
+    KeyWordToStringConverter()
+    {
+#define KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING(identifier, value) \
+        checkUnderscore(value); \
+        addToMapping(Keyword::identifier, value);
+        APPLY_FOR_PARSER_KEYWORDS(KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING)
+#undef KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING
+
+#define KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING(identifier, value) \
+        addToMapping(Keyword::identifier, value);
+        APPLY_FOR_PARSER_KEYWORDS_WITH_UNDERSCORES(KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING)
+#undef KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING
+
+#ifndef NDEBUG
+#define KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING(identifier, value) \
+        check(#identifier, value);
+        APPLY_FOR_PARSER_KEYWORDS(KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING)
+        APPLY_FOR_PARSER_KEYWORDS_WITH_UNDERSCORES(KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING)
+#undef KEYWORD_TYPE_TO_STRING_CONVERTER_ADD_TO_MAPPING
+#endif
+    }
+
+    void addToMapping(Keyword identifier, std::string_view value)
+    {
+        size_t index = static_cast<size_t>(identifier);
+        mapping.resize(std::max(index + 1, mapping.size()));
+        mapping[index] = value;
+    }
+
+    void checkUnderscore(std::string_view value)
+    {
+        if (value.contains('_'))
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "The keyword {} has underscore. If this is intentional, please declare it in another list.", value);
+    }
+
+    [[ maybe_unused ]] void check(std::string_view identifier, std::string_view value)
+    {
+        if (value == "TRUE" || value == "FALSE" || value == "NULL")
+            return;
+
+        if (identifier.size() != value.size())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "The length of the keyword identifier and the length of its value are different.");
+
+        for (size_t i = 0; i < identifier.size(); ++i)
+        {
+            if (std::tolower(identifier[i]) == '_' && std::tolower(value[i]) == ' ')
+                continue;
+            if (std::tolower(identifier[i]) == std::tolower(value[i]))
+                continue;
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Keyword identifier {} differs from its value {} in {} position: {} and {}",
+                identifier, value, i, identifier[i], value[i]);
+        }
+
+    }
+
+    Strings mapping;
+};
+}
+
+
+std::string_view toStringView(Keyword type)
+{
+    return KeyWordToStringConverter::instance().convert(type);
+}
+
+const std::vector<String> & getAllKeyWords()
+{
+    return KeyWordToStringConverter::instance().getMapping();
+}
+
+ParserKeyword::ParserKeyword(Keyword keyword)
+    : s(toStringView(keyword))
+{}
+
 bool ParserKeyword::parseImpl(Pos & pos, [[maybe_unused]] ASTPtr & node, Expected & expected)
 {
     if (pos->type != TokenType::BareWord)
@@ -38,4 +146,5 @@ bool ParserKeyword::parseImpl(Pos & pos, [[maybe_unused]] ASTPtr & node, Expecte
     return true;
 }
 
+
 }
diff --git a/src/Parsers/CommonParsers.h b/src/Parsers/CommonParsers.h
index f6c5c9c0520..49964b5c728 100644
--- a/src/Parsers/CommonParsers.h
+++ b/src/Parsers/CommonParsers.h
@@ -3,10 +3,577 @@
 #include <Parsers/IParserBase.h>
 
 #include <cassert>
+#include <string_view>
 
 namespace DB
 {
 
+#define APPLY_FOR_PARSER_KEYWORDS(MR_MACROS) \
+    MR_MACROS(ADD_COLUMN, "ADD COLUMN") \
+    MR_MACROS(ADD_CONSTRAINT, "ADD CONSTRAINT") \
+    MR_MACROS(ADD_INDEX, "ADD INDEX") \
+    MR_MACROS(ADD_PROJECTION, "ADD PROJECTION") \
+    MR_MACROS(ADD_STATISTIC, "ADD STATISTIC") \
+    MR_MACROS(ADD, "ADD") \
+    MR_MACROS(ADMIN_OPTION_FOR, "ADMIN OPTION FOR") \
+    MR_MACROS(AFTER, "AFTER") \
+    MR_MACROS(ALGORITHM, "ALGORITHM") \
+    MR_MACROS(ALIAS, "ALIAS") \
+    MR_MACROS(ALL, "ALL") \
+    MR_MACROS(ALTER_COLUMN, "ALTER COLUMN") \
+    MR_MACROS(ALTER_DATABASE, "ALTER DATABASE") \
+    MR_MACROS(ALTER_LIVE_VIEW, "ALTER LIVE VIEW") \
+    MR_MACROS(ALTER_POLICY, "ALTER POLICY") \
+    MR_MACROS(ALTER_PROFILE, "ALTER PROFILE") \
+    MR_MACROS(ALTER_QUOTA, "ALTER QUOTA") \
+    MR_MACROS(ALTER_ROLE, "ALTER ROLE") \
+    MR_MACROS(ALTER_ROW_POLICY, "ALTER ROW POLICY") \
+    MR_MACROS(ALTER_SETTINGS_PROFILE, "ALTER SETTINGS PROFILE") \
+    MR_MACROS(ALTER_TABLE, "ALTER TABLE") \
+    MR_MACROS(ALTER_TEMPORARY_TABLE, "ALTER TEMPORARY TABLE") \
+    MR_MACROS(ALTER_USER, "ALTER USER") \
+    MR_MACROS(ALTER, "ALTER") \
+    MR_MACROS(AND_STDOUT, "AND STDOUT") \
+    MR_MACROS(AND, "AND") \
+    MR_MACROS(ANTI, "ANTI") \
+    MR_MACROS(ANY, "ANY") \
+    MR_MACROS(APPEND, "APPEND") \
+    MR_MACROS(APPLY_DELETED_MASK, "APPLY DELETED MASK") \
+    MR_MACROS(APPLY, "APPLY") \
+    MR_MACROS(ARRAY_JOIN, "ARRAY JOIN") \
+    MR_MACROS(AS, "AS") \
+    MR_MACROS(ASC, "ASC") \
+    MR_MACROS(ASCENDING, "ASCENDING") \
+    MR_MACROS(ASOF, "ASOF") \
+    MR_MACROS(ASSUME, "ASSUME") \
+    MR_MACROS(AST, "AST") \
+    MR_MACROS(ASYNC, "ASYNC") \
+    MR_MACROS(ATTACH_PART, "ATTACH PART") \
+    MR_MACROS(ATTACH_PARTITION, "ATTACH PARTITION") \
+    MR_MACROS(ATTACH_POLICY, "ATTACH POLICY") \
+    MR_MACROS(ATTACH_PROFILE, "ATTACH PROFILE") \
+    MR_MACROS(ATTACH_QUOTA, "ATTACH QUOTA") \
+    MR_MACROS(ATTACH_ROLE, "ATTACH ROLE") \
+    MR_MACROS(ATTACH_ROW_POLICY, "ATTACH ROW POLICY") \
+    MR_MACROS(ATTACH_SETTINGS_PROFILE, "ATTACH SETTINGS PROFILE") \
+    MR_MACROS(ATTACH_USER, "ATTACH USER") \
+    MR_MACROS(ATTACH, "ATTACH") \
+    MR_MACROS(AZURE, "AZURE") \
+    MR_MACROS(BACKUP, "BACKUP") \
+    MR_MACROS(BAGEXPANSION, "bagexpansion") \
+    MR_MACROS(BEGIN_TRANSACTION, "BEGIN TRANSACTION") \
+    MR_MACROS(BETWEEN, "BETWEEN") \
+    MR_MACROS(BIDIRECTIONAL, "BIDIRECTIONAL") \
+    MR_MACROS(BOTH, "BOTH") \
+    MR_MACROS(BY, "BY") \
+    MR_MACROS(CASCADE, "CASCADE") \
+    MR_MACROS(CASE, "CASE") \
+    MR_MACROS(CAST, "CAST") \
+    MR_MACROS(CHANGE, "CHANGE") \
+    MR_MACROS(CHANGED, "CHANGED") \
+    MR_MACROS(CHAR_VARYING, "CHAR VARYING") \
+    MR_MACROS(CHAR, "CHAR") \
+    MR_MACROS(CHARACTER_LARGE_OBJECT, "CHARACTER LARGE OBJECT") \
+    MR_MACROS(CHARACTER_VARYING, "CHARACTER VARYING") \
+    MR_MACROS(CHARACTER, "CHARACTER") \
+    MR_MACROS(CHECK_ALL_TABLES, "CHECK ALL TABLES") \
+    MR_MACROS(CHECK_TABLE, "CHECK TABLE") \
+    MR_MACROS(CHECK, "CHECK") \
+    MR_MACROS(CLEANUP, "CLEANUP") \
+    MR_MACROS(CLEAR_COLUMN, "CLEAR COLUMN") \
+    MR_MACROS(CLEAR_INDEX, "CLEAR INDEX") \
+    MR_MACROS(CLEAR_PROJECTION, "CLEAR PROJECTION") \
+    MR_MACROS(CLEAR_STATISTIC, "CLEAR STATISTIC") \
+    MR_MACROS(CLUSTER, "CLUSTER") \
+    MR_MACROS(CLUSTERS, "CLUSTERS") \
+    MR_MACROS(CN, "CN") \
+    MR_MACROS(CODEC, "CODEC") \
+    MR_MACROS(COLLATE, "COLLATE") \
+    MR_MACROS(COLUMN, "COLUMN") \
+    MR_MACROS(COLUMNS, "COLUMNS") \
+    MR_MACROS(COMMENT_COLUMN, "COMMENT COLUMN") \
+    MR_MACROS(COMMENT, "COMMENT") \
+    MR_MACROS(COMMIT, "COMMIT") \
+    MR_MACROS(COMPRESSION, "COMPRESSION") \
+    MR_MACROS(CONST, "CONST") \
+    MR_MACROS(CONSTRAINT, "CONSTRAINT") \
+    MR_MACROS(CREATE_POLICY, "CREATE POLICY") \
+    MR_MACROS(CREATE_PROFILE, "CREATE PROFILE") \
+    MR_MACROS(CREATE_QUOTA, "CREATE QUOTA") \
+    MR_MACROS(CREATE_ROLE, "CREATE ROLE") \
+    MR_MACROS(CREATE_ROW_POLICY, "CREATE ROW POLICY") \
+    MR_MACROS(CREATE_SETTINGS_PROFILE, "CREATE SETTINGS PROFILE") \
+    MR_MACROS(CREATE_TABLE, "CREATE TABLE") \
+    MR_MACROS(CREATE_TEMPORARY_TABLE, "CREATE TEMPORARY TABLE") \
+    MR_MACROS(CREATE_USER, "CREATE USER") \
+    MR_MACROS(CREATE, "CREATE") \
+    MR_MACROS(CROSS, "CROSS") \
+    MR_MACROS(CUBE, "CUBE") \
+    MR_MACROS(CURRENT_GRANTS, "CURRENT GRANTS") \
+    MR_MACROS(CURRENT_QUOTA, "CURRENT QUOTA") \
+    MR_MACROS(CURRENT_ROLES, "CURRENT ROLES") \
+    MR_MACROS(CURRENT_ROW, "CURRENT ROW") \
+    MR_MACROS(CURRENT_TRANSACTION, "CURRENT TRANSACTION") \
+    MR_MACROS(CURRENTUSER, "CURRENTUSER") \
+    MR_MACROS(D, "D") \
+    MR_MACROS(DATABASE, "DATABASE") \
+    MR_MACROS(DATABASES, "DATABASES") \
+    MR_MACROS(DATE, "DATE") \
+    MR_MACROS(DAY, "DAY") \
+    MR_MACROS(DAYS, "DAYS") \
+    MR_MACROS(DD, "DD") \
+    MR_MACROS(DEDUPLICATE, "DEDUPLICATE") \
+    MR_MACROS(DEFAULT_DATABASE, "DEFAULT DATABASE") \
+    MR_MACROS(DEFAULT_ROLE, "DEFAULT ROLE") \
+    MR_MACROS(DEFAULT, "DEFAULT") \
+    MR_MACROS(DEFINER, "DEFINER") \
+    MR_MACROS(DELETE, "DELETE") \
+    MR_MACROS(DEPENDS_ON, "DEPENDS ON") \
+    MR_MACROS(DESC, "DESC") \
+    MR_MACROS(DESCENDING, "DESCENDING") \
+    MR_MACROS(DESCRIBE, "DESCRIBE") \
+    MR_MACROS(DETACH_PART, "DETACH PART") \
+    MR_MACROS(DETACH_PARTITION, "DETACH PARTITION") \
+    MR_MACROS(DETACH, "DETACH") \
+    MR_MACROS(DICTIONARIES, "DICTIONARIES") \
+    MR_MACROS(DICTIONARY, "DICTIONARY") \
+    MR_MACROS(DISK, "DISK") \
+    MR_MACROS(DISTINCT_ON, "DISTINCT ON") \
+    MR_MACROS(DISTINCT, "DISTINCT") \
+    MR_MACROS(DIV, "DIV") \
+    MR_MACROS(DROP_COLUMN, "DROP COLUMN") \
+    MR_MACROS(DROP_CONSTRAINT, "DROP CONSTRAINT") \
+    MR_MACROS(DROP_DEFAULT, "DROP DEFAULT") \
+    MR_MACROS(DROP_DETACHED_PART, "DROP DETACHED PART") \
+    MR_MACROS(DROP_DETACHED_PARTITION, "DROP DETACHED PARTITION") \
+    MR_MACROS(DROP_INDEX, "DROP INDEX") \
+    MR_MACROS(DROP_PART, "DROP PART") \
+    MR_MACROS(DROP_PARTITION, "DROP PARTITION") \
+    MR_MACROS(DROP_PROJECTION, "DROP PROJECTION") \
+    MR_MACROS(DROP_STATISTIC, "DROP STATISTIC") \
+    MR_MACROS(DROP_TABLE, "DROP TABLE") \
+    MR_MACROS(DROP_TEMPORARY_TABLE, "DROP TEMPORARY TABLE") \
+    MR_MACROS(DROP, "DROP") \
+    MR_MACROS(ELSE, "ELSE") \
+    MR_MACROS(EMPTY_AS, "EMPTY AS") \
+    MR_MACROS(EMPTY, "EMPTY") \
+    MR_MACROS(ENABLED_ROLES, "ENABLED ROLES") \
+    MR_MACROS(END, "END") \
+    MR_MACROS(ENFORCED, "ENFORCED") \
+    MR_MACROS(ENGINE, "ENGINE") \
+    MR_MACROS(EPHEMERAL_SEQUENTIAL, "EPHEMERAL SEQUENTIAL") \
+    MR_MACROS(EPHEMERAL, "EPHEMERAL") \
+    MR_MACROS(ESTIMATE, "ESTIMATE") \
+    MR_MACROS(EVENT, "EVENT") \
+    MR_MACROS(EVENTS, "EVENTS") \
+    MR_MACROS(EVERY, "EVERY") \
+    MR_MACROS(EXCEPT_DATABASE, "EXCEPT DATABASE") \
+    MR_MACROS(EXCEPT_DATABASES, "EXCEPT DATABASES") \
+    MR_MACROS(EXCEPT_TABLE, "EXCEPT TABLE") \
+    MR_MACROS(EXCEPT_TABLES, "EXCEPT TABLES") \
+    MR_MACROS(EXCEPT, "EXCEPT") \
+    MR_MACROS(EXCHANGE_DICTIONARIES, "EXCHANGE DICTIONARIES") \
+    MR_MACROS(EXCHANGE_TABLES, "EXCHANGE TABLES") \
+    MR_MACROS(EXISTS, "EXISTS") \
+    MR_MACROS(EXPLAIN, "EXPLAIN") \
+    MR_MACROS(EXPRESSION, "EXPRESSION") \
+    MR_MACROS(EXTENDED, "EXTENDED") \
+    MR_MACROS(EXTERNAL_DDL_FROM, "EXTERNAL DDL FROM") \
+    MR_MACROS(FALSE_KEYWORD, "FALSE") /*The name differs from the value*/ \
+    MR_MACROS(FETCH_PART, "FETCH PART") \
+    MR_MACROS(FETCH_PARTITION, "FETCH PARTITION") \
+    MR_MACROS(FETCH, "FETCH") \
+    MR_MACROS(FIELDS, "FIELDS") \
+    MR_MACROS(FILE, "FILE") \
+    MR_MACROS(FILESYSTEM_CACHE, "FILESYSTEM CACHE") \
+    MR_MACROS(FILESYSTEM_CACHES, "FILESYSTEM CACHES") \
+    MR_MACROS(FILTER, "FILTER") \
+    MR_MACROS(FINAL, "FINAL") \
+    MR_MACROS(FIRST, "FIRST") \
+    MR_MACROS(FOLLOWING, "FOLLOWING") \
+    MR_MACROS(FOR, "FOR") \
+    MR_MACROS(FOREIGN_KEY, "FOREIGN KEY") \
+    MR_MACROS(FOREIGN, "FOREIGN") \
+    MR_MACROS(FORGET_PARTITION, "FORGET PARTITION") \
+    MR_MACROS(FORMAT, "FORMAT") \
+    MR_MACROS(FREEZE, "FREEZE") \
+    MR_MACROS(FROM_INFILE, "FROM INFILE") \
+    MR_MACROS(FROM_SHARD, "FROM SHARD") \
+    MR_MACROS(FROM, "FROM") \
+    MR_MACROS(FULL, "FULL") \
+    MR_MACROS(FULLTEXT, "FULLTEXT") \
+    MR_MACROS(FUNCTION, "FUNCTION") \
+    MR_MACROS(GLOBAL_IN, "GLOBAL IN") \
+    MR_MACROS(GLOBAL_NOT_IN, "GLOBAL NOT IN") \
+    MR_MACROS(GLOBAL, "GLOBAL") \
+    MR_MACROS(GRANT_OPTION_FOR, "GRANT OPTION FOR") \
+    MR_MACROS(GRANT, "GRANT") \
+    MR_MACROS(GRANTEES, "GRANTEES") \
+    MR_MACROS(GRANULARITY, "GRANULARITY") \
+    MR_MACROS(GROUP_BY, "GROUP BY") \
+    MR_MACROS(GROUPING_SETS, "GROUPING SETS") \
+    MR_MACROS(GROUPS, "GROUPS") \
+    MR_MACROS(H, "H") \
+    MR_MACROS(HASH, "HASH") \
+    MR_MACROS(HAVING, "HAVING") \
+    MR_MACROS(HDFS, "HDFS") \
+    MR_MACROS(HH, "HH") \
+    MR_MACROS(HIERARCHICAL, "HIERARCHICAL") \
+    MR_MACROS(HOST, "HOST") \
+    MR_MACROS(HOUR, "HOUR") \
+    MR_MACROS(HOURS, "HOURS") \
+    MR_MACROS(HTTP, "HTTP") \
+    MR_MACROS(ID, "ID") \
+    MR_MACROS(IDENTIFIED, "IDENTIFIED") \
+    MR_MACROS(IF_EMPTY, "IF EMPTY") \
+    MR_MACROS(IF_EXISTS, "IF EXISTS") \
+    MR_MACROS(IF_NOT_EXISTS, "IF NOT EXISTS") \
+    MR_MACROS(IGNORE_NULLS, "IGNORE NULLS") \
+    MR_MACROS(ILIKE, "ILIKE") \
+    MR_MACROS(IN_PARTITION, "IN PARTITION") \
+    MR_MACROS(IN, "IN") \
+    MR_MACROS(INDEX, "INDEX") \
+    MR_MACROS(INDEXES, "INDEXES") \
+    MR_MACROS(INDICES, "INDICES") \
+    MR_MACROS(INHERIT, "INHERIT") \
+    MR_MACROS(INJECTIVE, "INJECTIVE") \
+    MR_MACROS(INNER, "INNER") \
+    MR_MACROS(INSERT_INTO, "INSERT INTO") \
+    MR_MACROS(INTERPOLATE, "INTERPOLATE") \
+    MR_MACROS(INTERSECT, "INTERSECT") \
+    MR_MACROS(INTERVAL, "INTERVAL") \
+    MR_MACROS(INTO_OUTFILE, "INTO OUTFILE") \
+    MR_MACROS(INVISIBLE, "INVISIBLE") \
+    MR_MACROS(INVOKER, "INVOKER") \
+    MR_MACROS(IP, "IP") \
+    MR_MACROS(IS_NOT_DISTINCT_FROM, "IS NOT DISTINCT FROM") \
+    MR_MACROS(IS_NOT_NULL, "IS NOT NULL") \
+    MR_MACROS(IS_NULL, "IS NULL") \
+    MR_MACROS(JOIN, "JOIN") \
+    MR_MACROS(KERBEROS, "KERBEROS") \
+    MR_MACROS(KEY_BY, "KEY BY") \
+    MR_MACROS(KEY, "KEY") \
+    MR_MACROS(KEYED_BY, "KEYED BY") \
+    MR_MACROS(KEYS, "KEYS") \
+    MR_MACROS(KILL, "KILL") \
+    MR_MACROS(KIND, "KIND") \
+    MR_MACROS(LARGE_OBJECT, "LARGE OBJECT") \
+    MR_MACROS(LAST, "LAST") \
+    MR_MACROS(LAYOUT, "LAYOUT") \
+    MR_MACROS(LDAP, "LDAP") \
+    MR_MACROS(LEADING, "LEADING") \
+    MR_MACROS(LEFT_ARRAY_JOIN, "LEFT ARRAY JOIN") \
+    MR_MACROS(LEFT, "LEFT") \
+    MR_MACROS(LESS_THAN, "LESS THAN") \
+    MR_MACROS(LEVEL, "LEVEL") \
+    MR_MACROS(LIFETIME, "LIFETIME") \
+    MR_MACROS(LIGHTWEIGHT, "LIGHTWEIGHT") \
+    MR_MACROS(LIKE, "LIKE") \
+    MR_MACROS(LIMIT, "LIMIT") \
+    MR_MACROS(LINEAR, "LINEAR") \
+    MR_MACROS(LIST, "LIST") \
+    MR_MACROS(LIVE, "LIVE") \
+    MR_MACROS(LOCAL, "LOCAL") \
+    MR_MACROS(M, "M") \
+    MR_MACROS(MATCH, "MATCH") \
+    MR_MACROS(MATERIALIZE_COLUMN, "MATERIALIZE COLUMN") \
+    MR_MACROS(MATERIALIZE_INDEX, "MATERIALIZE INDEX") \
+    MR_MACROS(MATERIALIZE_PROJECTION, "MATERIALIZE PROJECTION") \
+    MR_MACROS(MATERIALIZE_STATISTIC, "MATERIALIZE STATISTIC") \
+    MR_MACROS(MATERIALIZE_TTL, "MATERIALIZE TTL") \
+    MR_MACROS(MATERIALIZE, "MATERIALIZE") \
+    MR_MACROS(MATERIALIZED, "MATERIALIZED") \
+    MR_MACROS(MAX, "MAX") \
+    MR_MACROS(MCS, "MCS") \
+    MR_MACROS(MEMORY, "MEMORY") \
+    MR_MACROS(MERGES, "MERGES") \
+    MR_MACROS(MI, "MI") \
+    MR_MACROS(MICROSECOND, "MICROSECOND") \
+    MR_MACROS(MICROSECONDS, "MICROSECONDS") \
+    MR_MACROS(MILLISECOND, "MILLISECOND") \
+    MR_MACROS(MILLISECONDS, "MILLISECONDS") \
+    MR_MACROS(MIN, "MIN") \
+    MR_MACROS(MINUTE, "MINUTE") \
+    MR_MACROS(MINUTES, "MINUTES") \
+    MR_MACROS(MM, "MM") \
+    MR_MACROS(MOD, "MOD") \
+    MR_MACROS(MODIFY_COLUMN, "MODIFY COLUMN") \
+    MR_MACROS(MODIFY_COMMENT, "MODIFY COMMENT") \
+    MR_MACROS(MODIFY_DEFINER, "MODIFY DEFINER") \
+    MR_MACROS(MODIFY_ORDER_BY, "MODIFY ORDER BY") \
+    MR_MACROS(MODIFY_QUERY, "MODIFY QUERY") \
+    MR_MACROS(MODIFY_REFRESH, "MODIFY REFRESH") \
+    MR_MACROS(MODIFY_SAMPLE_BY, "MODIFY SAMPLE BY") \
+    MR_MACROS(MODIFY_SETTING, "MODIFY SETTING") \
+    MR_MACROS(MODIFY_SQL_SECURITY, "MODIFY SQL SECURITY") \
+    MR_MACROS(MODIFY_TTL, "MODIFY TTL") \
+    MR_MACROS(MODIFY, "MODIFY") \
+    MR_MACROS(MONTH, "MONTH") \
+    MR_MACROS(MONTHS, "MONTHS") \
+    MR_MACROS(MOVE_PART, "MOVE PART") \
+    MR_MACROS(MOVE_PARTITION, "MOVE PARTITION") \
+    MR_MACROS(MOVE, "MOVE") \
+    MR_MACROS(MS, "MS") \
+    MR_MACROS(MUTATION, "MUTATION") \
+    MR_MACROS(N, "N") \
+    MR_MACROS(NAME, "NAME") \
+    MR_MACROS(NAMED_COLLECTION, "NAMED COLLECTION") \
+    MR_MACROS(NANOSECOND, "NANOSECOND") \
+    MR_MACROS(NANOSECONDS, "NANOSECONDS") \
+    MR_MACROS(NEXT, "NEXT") \
+    MR_MACROS(NO_ACTION, "NO ACTION") \
+    MR_MACROS(NO_DELAY, "NO DELAY") \
+    MR_MACROS(NO_LIMITS, "NO LIMITS") \
+    MR_MACROS(NONE, "NONE") \
+    MR_MACROS(NOT_BETWEEN, "NOT BETWEEN") \
+    MR_MACROS(NOT_IDENTIFIED, "NOT IDENTIFIED") \
+    MR_MACROS(NOT_ILIKE, "NOT ILIKE") \
+    MR_MACROS(NOT_IN, "NOT IN") \
+    MR_MACROS(NOT_KEYED, "NOT KEYED") \
+    MR_MACROS(NOT_LIKE, "NOT LIKE") \
+    MR_MACROS(NOT_OVERRIDABLE, "NOT OVERRIDABLE") \
+    MR_MACROS(NOT, "NOT") \
+    MR_MACROS(NS, "NS") \
+    MR_MACROS(NULL_KEYWORD, "NULL") \
+    MR_MACROS(NULLS, "NULLS") \
+    MR_MACROS(OFFSET, "OFFSET") \
+    MR_MACROS(ON_DELETE, "ON DELETE") \
+    MR_MACROS(ON_UPDATE, "ON UPDATE") \
+    MR_MACROS(ON_VOLUME, "ON VOLUME") \
+    MR_MACROS(ON, "ON") \
+    MR_MACROS(ONLY, "ONLY") \
+    MR_MACROS(OPTIMIZE_TABLE, "OPTIMIZE TABLE") \
+    MR_MACROS(OR_REPLACE, "OR REPLACE") \
+    MR_MACROS(OR, "OR") \
+    MR_MACROS(ORDER_BY, "ORDER BY") \
+    MR_MACROS(OUTER, "OUTER") \
+    MR_MACROS(OVER, "OVER") \
+    MR_MACROS(OVERRIDABLE, "OVERRIDABLE") \
+    MR_MACROS(PART, "PART") \
+    MR_MACROS(PARTIAL, "PARTIAL") \
+    MR_MACROS(PARTITION_BY, "PARTITION BY") \
+    MR_MACROS(PARTITION, "PARTITION") \
+    MR_MACROS(PARTITIONS, "PARTITIONS") \
+    MR_MACROS(PASTE, "PASTE") \
+    MR_MACROS(PERIODIC_REFRESH, "PERIODIC REFRESH") \
+    MR_MACROS(PERMANENTLY, "PERMANENTLY") \
+    MR_MACROS(PERMISSIVE, "PERMISSIVE") \
+    MR_MACROS(PERSISTENT_SEQUENTIAL, "PERSISTENT SEQUENTIAL") \
+    MR_MACROS(PERSISTENT, "PERSISTENT") \
+    MR_MACROS(PIPELINE, "PIPELINE") \
+    MR_MACROS(PLAN, "PLAN") \
+    MR_MACROS(POPULATE, "POPULATE") \
+    MR_MACROS(PRECEDING, "PRECEDING") \
+    MR_MACROS(PRECISION, "PRECISION") \
+    MR_MACROS(PREWHERE, "PREWHERE") \
+    MR_MACROS(PRIMARY_KEY, "PRIMARY KEY") \
+    MR_MACROS(PRIMARY, "PRIMARY") \
+    MR_MACROS(PROFILE, "PROFILE") \
+    MR_MACROS(PROJECTION, "PROJECTION") \
+    MR_MACROS(PROTOBUF, "Protobuf") \
+    MR_MACROS(PULL, "PULL") \
+    MR_MACROS(Q, "Q") \
+    MR_MACROS(QQ, "QQ") \
+    MR_MACROS(QUARTER, "QUARTER") \
+    MR_MACROS(QUARTERS, "QUARTERS") \
+    MR_MACROS(QUERY_TREE, "QUERY TREE") \
+    MR_MACROS(QUERY, "QUERY") \
+    MR_MACROS(QUOTA, "QUOTA") \
+    MR_MACROS(RANDOMIZE_FOR, "RANDOMIZE FOR") \
+    MR_MACROS(RANDOMIZED, "RANDOMIZED") \
+    MR_MACROS(RANGE, "RANGE") \
+    MR_MACROS(READONLY, "READONLY") \
+    MR_MACROS(REALM, "REALM") \
+    MR_MACROS(RECOMPRESS, "RECOMPRESS") \
+    MR_MACROS(REFERENCES, "REFERENCES") \
+    MR_MACROS(REFRESH, "REFRESH") \
+    MR_MACROS(REGEXP, "REGEXP") \
+    MR_MACROS(REMOVE_SAMPLE_BY, "REMOVE SAMPLE BY") \
+    MR_MACROS(REMOVE_TTL, "REMOVE TTL") \
+    MR_MACROS(REMOVE, "REMOVE") \
+    MR_MACROS(RENAME_COLUMN, "RENAME COLUMN") \
+    MR_MACROS(RENAME_DATABASE, "RENAME DATABASE") \
+    MR_MACROS(RENAME_DICTIONARY, "RENAME DICTIONARY") \
+    MR_MACROS(RENAME_TABLE, "RENAME TABLE") \
+    MR_MACROS(RENAME_TO, "RENAME TO") \
+    MR_MACROS(RENAME, "RENAME") \
+    MR_MACROS(REPLACE_PARTITION, "REPLACE PARTITION") \
+    MR_MACROS(REPLACE, "REPLACE") \
+    MR_MACROS(RESET_SETTING, "RESET SETTING") \
+    MR_MACROS(RESPECT_NULLS, "RESPECT NULLS") \
+    MR_MACROS(RESTORE, "RESTORE") \
+    MR_MACROS(RESTRICT, "RESTRICT") \
+    MR_MACROS(RESTRICTIVE, "RESTRICTIVE") \
+    MR_MACROS(RESUME, "RESUME") \
+    MR_MACROS(REVOKE, "REVOKE") \
+    MR_MACROS(RIGHT, "RIGHT") \
+    MR_MACROS(ROLLBACK, "ROLLBACK") \
+    MR_MACROS(ROLLUP, "ROLLUP") \
+    MR_MACROS(ROW, "ROW") \
+    MR_MACROS(ROWS, "ROWS") \
+    MR_MACROS(S, "S") \
+    MR_MACROS(S3, "S3") \
+    MR_MACROS(SALT, "SALT") \
+    MR_MACROS(SAMPLE_BY, "SAMPLE BY") \
+    MR_MACROS(SAMPLE, "SAMPLE") \
+    MR_MACROS(SCHEME, "SCHEME") \
+    MR_MACROS(SECOND, "SECOND") \
+    MR_MACROS(SECONDS, "SECONDS") \
+    MR_MACROS(SELECT, "SELECT") \
+    MR_MACROS(SEMI, "SEMI") \
+    MR_MACROS(SERVER, "SERVER") \
+    MR_MACROS(SET_DEFAULT_ROLE, "SET DEFAULT ROLE") \
+    MR_MACROS(SET_DEFAULT, "SET DEFAULT") \
+    MR_MACROS(SET_FAKE_TIME, "SET FAKE TIME") \
+    MR_MACROS(SET_NULL, "SET NULL") \
+    MR_MACROS(SET_ROLE_DEFAULT, "SET ROLE DEFAULT") \
+    MR_MACROS(SET_ROLE, "SET ROLE") \
+    MR_MACROS(SET_TRANSACTION_SNAPSHOT, "SET TRANSACTION SNAPSHOT") \
+    MR_MACROS(SET, "SET") \
+    MR_MACROS(SETTINGS, "SETTINGS") \
+    MR_MACROS(SHOW_ACCESS, "SHOW ACCESS") \
+    MR_MACROS(SHOW_CREATE, "SHOW CREATE") \
+    MR_MACROS(SHOW_ENGINES, "SHOW ENGINES") \
+    MR_MACROS(SHOW_FUNCTIONS, "SHOW FUNCTIONS") \
+    MR_MACROS(SHOW_GRANTS, "SHOW GRANTS") \
+    MR_MACROS(SHOW_PRIVILEGES, "SHOW PRIVILEGES") \
+    MR_MACROS(SHOW_PROCESSLIST, "SHOW PROCESSLIST") \
+    MR_MACROS(SHOW_SETTING, "SHOW SETTING") \
+    MR_MACROS(SHOW, "SHOW") \
+    MR_MACROS(SIGNED, "SIGNED") \
+    MR_MACROS(SIMPLE, "SIMPLE") \
+    MR_MACROS(SOURCE, "SOURCE") \
+    MR_MACROS(SPATIAL, "SPATIAL") \
+    MR_MACROS(SQL_SECURITY, "SQL SECURITY") \
+    MR_MACROS(SS, "SS") \
+    MR_MACROS(START_TRANSACTION, "START TRANSACTION") \
+    MR_MACROS(STATISTIC, "STATISTIC") \
+    MR_MACROS(STEP, "STEP") \
+    MR_MACROS(STORAGE, "STORAGE") \
+    MR_MACROS(STRICT, "STRICT") \
+    MR_MACROS(SUBPARTITION_BY, "SUBPARTITION BY") \
+    MR_MACROS(SUBPARTITION, "SUBPARTITION") \
+    MR_MACROS(SUBPARTITIONS, "SUBPARTITIONS") \
+    MR_MACROS(SUSPEND, "SUSPEND") \
+    MR_MACROS(SYNC, "SYNC") \
+    MR_MACROS(SYNTAX, "SYNTAX") \
+    MR_MACROS(SYSTEM, "SYSTEM") \
+    MR_MACROS(TABLE_OVERRIDE, "TABLE OVERRIDE") \
+    MR_MACROS(TABLE, "TABLE") \
+    MR_MACROS(TABLES, "TABLES") \
+    MR_MACROS(TEMPORARY_TABLE, "TEMPORARY TABLE") \
+    MR_MACROS(TEMPORARY, "TEMPORARY") \
+    MR_MACROS(TEST, "TEST") \
+    MR_MACROS(THEN, "THEN") \
+    MR_MACROS(TIMESTAMP, "TIMESTAMP") \
+    MR_MACROS(TO_DISK, "TO DISK") \
+    MR_MACROS(TO_INNER_UUID, "TO INNER UUID") \
+    MR_MACROS(TO_SHARD, "TO SHARD") \
+    MR_MACROS(TO_TABLE, "TO TABLE") \
+    MR_MACROS(TO_VOLUME, "TO VOLUME") \
+    MR_MACROS(TO, "TO") \
+    MR_MACROS(TOP, "TOP") \
+    MR_MACROS(TOTALS, "TOTALS") \
+    MR_MACROS(TRACKING_ONLY, "TRACKING ONLY") \
+    MR_MACROS(TRAILING, "TRAILING") \
+    MR_MACROS(TRANSACTION, "TRANSACTION") \
+    MR_MACROS(TRIGGER, "TRIGGER") \
+    MR_MACROS(TRUE_KEYWORD, "TRUE") /*The name differs from the value*/ \
+    MR_MACROS(TRUNCATE, "TRUNCATE") \
+    MR_MACROS(TTL, "TTL") \
+    MR_MACROS(TYPE, "TYPE") \
+    MR_MACROS(TYPEOF, "TYPEOF") \
+    MR_MACROS(UNBOUNDED, "UNBOUNDED") \
+    MR_MACROS(UNDROP, "UNDROP") \
+    MR_MACROS(UNFREEZE, "UNFREEZE") \
+    MR_MACROS(UNION, "UNION") \
+    MR_MACROS(UNIQUE, "UNIQUE") \
+    MR_MACROS(UNSET_FAKE_TIME, "UNSET FAKE TIME") \
+    MR_MACROS(UNSIGNED, "UNSIGNED") \
+    MR_MACROS(UPDATE, "UPDATE") \
+    MR_MACROS(URL, "URL") \
+    MR_MACROS(USE, "USE") \
+    MR_MACROS(USING, "USING") \
+    MR_MACROS(UUID, "UUID") \
+    MR_MACROS(VALID_UNTIL, "VALID UNTIL") \
+    MR_MACROS(VALUES, "VALUES") \
+    MR_MACROS(VARYING, "VARYING") \
+    MR_MACROS(VIEW, "VIEW") \
+    MR_MACROS(VISIBLE, "VISIBLE") \
+    MR_MACROS(WATCH, "WATCH") \
+    MR_MACROS(WATERMARK, "WATERMARK") \
+    MR_MACROS(WEEK, "WEEK") \
+    MR_MACROS(WEEKS, "WEEKS") \
+    MR_MACROS(WHEN, "WHEN") \
+    MR_MACROS(WHERE, "WHERE") \
+    MR_MACROS(WINDOW, "WINDOW") \
+    MR_MACROS(WITH_ADMIN_OPTION, "WITH ADMIN OPTION") \
+    MR_MACROS(WITH_CHECK, "WITH CHECK") \
+    MR_MACROS(WITH_FILL, "WITH FILL") \
+    MR_MACROS(WITH_GRANT_OPTION, "WITH GRANT OPTION") \
+    MR_MACROS(WITH_NAME, "WITH NAME") \
+    MR_MACROS(WITH_REPLACE_OPTION, "WITH REPLACE OPTION") \
+    MR_MACROS(WITH_TIES, "WITH TIES") \
+    MR_MACROS(WITH, "WITH") \
+    MR_MACROS(WK, "WK") \
+    MR_MACROS(WRITABLE, "WRITABLE") \
+    MR_MACROS(WW, "WW") \
+    MR_MACROS(YEAR, "YEAR") \
+    MR_MACROS(YEARS, "YEARS") \
+    MR_MACROS(YY, "YY") \
+    MR_MACROS(YYYY, "YYYY") \
+    MR_MACROS(ZKPATH, "ZKPATH") \
+
+/// The list of keywords where underscore is intentional
+#define APPLY_FOR_PARSER_KEYWORDS_WITH_UNDERSCORES(MR_MACROS) \
+    MR_MACROS(ALLOWED_LATENESS, "ALLOWED_LATENESS") \
+    MR_MACROS(AUTO_INCREMENT, "AUTO_INCREMENT") \
+    MR_MACROS(BASE_BACKUP, "base_backup") \
+    MR_MACROS(BCRYPT_HASH, "BCRYPT_HASH") \
+    MR_MACROS(BCRYPT_PASSWORD, "BCRYPT_PASSWORD") \
+    MR_MACROS(CHANGEABLE_IN_READONLY, "CHANGEABLE_IN_READONLY") \
+    MR_MACROS(CLUSTER_HOST_IDS, "cluster_host_ids") \
+    MR_MACROS(CURRENT_USER, "CURRENT_USER") \
+    MR_MACROS(DOUBLE_SHA1_HASH, "DOUBLE_SHA1_HASH") \
+    MR_MACROS(DOUBLE_SHA1_PASSWORD, "DOUBLE_SHA1_PASSWORD") \
+    MR_MACROS(IS_OBJECT_ID, "IS_OBJECT_ID") \
+    MR_MACROS(NO_PASSWORD, "NO_PASSWORD") \
+    MR_MACROS(PART_MOVE_TO_SHARD, "PART_MOVE_TO_SHARD") \
+    MR_MACROS(PLAINTEXT_PASSWORD, "PLAINTEXT_PASSWORD") \
+    MR_MACROS(SHA256_HASH, "SHA256_HASH") \
+    MR_MACROS(SHA256_PASSWORD, "SHA256_PASSWORD") \
+    MR_MACROS(SQL_TSI_DAY, "SQL_TSI_DAY") \
+    MR_MACROS(SQL_TSI_HOUR, "SQL_TSI_HOUR") \
+    MR_MACROS(SQL_TSI_MICROSECOND, "SQL_TSI_MICROSECOND") \
+    MR_MACROS(SQL_TSI_MILLISECOND, "SQL_TSI_MILLISECOND") \
+    MR_MACROS(SQL_TSI_MINUTE, "SQL_TSI_MINUTE") \
+    MR_MACROS(SQL_TSI_MONTH, "SQL_TSI_MONTH") \
+    MR_MACROS(SQL_TSI_NANOSECOND, "SQL_TSI_NANOSECOND") \
+    MR_MACROS(SQL_TSI_QUARTER, "SQL_TSI_QUARTER") \
+    MR_MACROS(SQL_TSI_SECOND, "SQL_TSI_SECOND") \
+    MR_MACROS(SQL_TSI_WEEK, "SQL_TSI_WEEK") \
+    MR_MACROS(SQL_TSI_YEAR, "SQL_TSI_YEAR") \
+    MR_MACROS(SSH_KEY, "SSH_KEY") \
+    MR_MACROS(SSL_CERTIFICATE, "SSL_CERTIFICATE") \
+    MR_MACROS(STRICTLY_ASCENDING, "STRICTLY_ASCENDING") \
+    MR_MACROS(WITH_ITEMINDEX, "WITH_ITEMINDEX") \
+
+enum class Keyword : size_t
+{
+#define DECLARE_PARSER_KEYWORD_ENUM(identifier, name) \
+    identifier,
+
+    APPLY_FOR_PARSER_KEYWORDS(DECLARE_PARSER_KEYWORD_ENUM)
+    APPLY_FOR_PARSER_KEYWORDS_WITH_UNDERSCORES(DECLARE_PARSER_KEYWORD_ENUM)
+#undef DECLARE_PARSER_KEYWORD_ENUM
+};
+
+
+std::string_view toStringView(Keyword type);
+
+const std::vector<String> & getAllKeyWords();
+
+
 /** Parse specified keyword such as SELECT or compound keyword such as ORDER BY.
   * All case insensitive. Requires word boundary.
   * For compound keywords, any whitespace characters and comments could be in the middle.
@@ -17,9 +584,20 @@ class ParserKeyword : public IParserBase
 private:
     std::string_view s;
 
+    explicit ParserKeyword(std::string_view s_): s(s_) { assert(!s.empty()); }
+
 public:
-    //NOLINTNEXTLINE Want to be able to init ParserKeyword("literal")
-    constexpr ParserKeyword(std::string_view s_): s(s_) { assert(!s.empty()); }
+    static ParserKeyword createDeprecated(std::string_view s_)
+    {
+        return ParserKeyword(s_);
+    }
+
+    static std::shared_ptr<ParserKeyword> createDeprecatedPtr(std::string_view s_)
+    {
+        return std::shared_ptr<ParserKeyword>(new ParserKeyword(s_));
+    }
+
+    explicit ParserKeyword(Keyword keyword);
 
     constexpr const char * getName() const override { return s.data(); }
 
diff --git a/src/Parsers/DumpASTNode.h b/src/Parsers/DumpASTNode.h
index 60fcece5590..5efc0e018f4 100644
--- a/src/Parsers/DumpASTNode.h
+++ b/src/Parsers/DumpASTNode.h
@@ -165,7 +165,7 @@ public:
         : log(nullptr)
     {
         if constexpr (_enable)
-            log = &Poco::Logger::get("AST");
+            log = getLogger("AST");
     }
 
     ~DebugASTLog()
@@ -177,7 +177,7 @@ public:
     WriteBuffer * stream() { return (_enable ? &buf : nullptr); }
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     WriteBufferFromOwnString buf;
 };
 
diff --git a/src/Parsers/ExpressionElementParsers.cpp b/src/Parsers/ExpressionElementParsers.cpp
index 594221fe050..2c8ab65d1fc 100644
--- a/src/Parsers/ExpressionElementParsers.cpp
+++ b/src/Parsers/ExpressionElementParsers.cpp
@@ -5,9 +5,11 @@
 #include <IO/ReadBufferFromMemory.h>
 #include <IO/ReadHelpers.h>
 
-#include <Common/typeid_cast.h>
-#include <Common/StringUtils/StringUtils.h>
 #include <Common/BinStringDecodeHelper.h>
+#include <Common/PODArray.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/typeid_cast.h>
+#include "Parsers/CommonParsers.h"
 
 #include <Parsers/DumpASTNode.h>
 #include <Parsers/ASTAsterisk.h>
@@ -35,7 +37,6 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ParserSelectWithUnionQuery.h>
-#include <Parsers/ParserCase.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserExplainQuery.h>
@@ -43,6 +44,7 @@
 
 #include <Interpreters/StorageID.h>
 
+
 namespace DB
 {
 
@@ -123,7 +125,7 @@ bool ParserSubquery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "EXPLAIN in a subquery cannot have a table function or table override");
 
         /// Replace subquery `(EXPLAIN <kind> <explain_settings> SELECT ...)`
-        /// with `(SELECT * FROM viewExplain("<kind>", "<explain_settings>", SELECT ...))`
+        /// with `(SELECT * FROM viewExplain('<kind>', '<explain_settings>', (SELECT ...)))`
 
         String kind_str = ASTExplainQuery::toString(explain_query.getKind());
 
@@ -141,7 +143,7 @@ bool ParserSubquery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             auto view_explain = makeASTFunction("viewExplain",
                 std::make_shared<ASTLiteral>(kind_str),
                 std::make_shared<ASTLiteral>(settings_str),
-                explained_ast);
+                std::make_shared<ASTSubquery>(explained_ast));
             result_node = buildSelectFromTableFunction(view_explain);
         }
         else
@@ -161,8 +163,7 @@ bool ParserSubquery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         return false;
     ++pos;
 
-    node = std::make_shared<ASTSubquery>();
-    node->children.push_back(result_node);
+    node = std::make_shared<ASTSubquery>(std::move(result_node));
     return true;
 }
 
@@ -250,7 +251,7 @@ bool ParserTableAsStringLiteralIdentifier::parseImpl(Pos & pos, ASTPtr & node, E
     ReadBufferFromMemory in(pos->begin, pos->size());
     String s;
 
-    if (!tryReadQuotedStringInto(s, in))
+    if (!tryReadQuotedString(s, in))
     {
         expected.add(pos, "string literal");
         return false;
@@ -291,7 +292,7 @@ bool ParserCompoundIdentifier::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
             params.push_back(child->as<ASTIdentifier>()->getParam());
     }
 
-    ParserKeyword s_uuid("UUID");
+    ParserKeyword s_uuid(Keyword::UUID);
     UUID uuid = UUIDHelpers::Nil;
 
     if (table_name_with_optional_uuid)
@@ -338,7 +339,7 @@ bool ParserFilterClause::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         return false;
     }
 
-    ParserKeyword parser_where("WHERE");
+    ParserKeyword parser_where(Keyword::WHERE);
     if (!parser_where.ignore(pos, expected))
     {
         return false;
@@ -392,9 +393,9 @@ bool ParserWindowReference::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & pos,
     Expected & expected)
 {
-    ParserKeyword keyword_rows("ROWS");
-    ParserKeyword keyword_groups("GROUPS");
-    ParserKeyword keyword_range("RANGE");
+    ParserKeyword keyword_rows(Keyword::ROWS);
+    ParserKeyword keyword_groups(Keyword::GROUPS);
+    ParserKeyword keyword_range(Keyword::RANGE);
 
     node->frame_is_default = false;
     if (keyword_rows.ignore(pos, expected))
@@ -416,12 +417,12 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
         return true;
     }
 
-    ParserKeyword keyword_between("BETWEEN");
-    ParserKeyword keyword_unbounded("UNBOUNDED");
-    ParserKeyword keyword_preceding("PRECEDING");
-    ParserKeyword keyword_following("FOLLOWING");
-    ParserKeyword keyword_and("AND");
-    ParserKeyword keyword_current_row("CURRENT ROW");
+    ParserKeyword keyword_between(Keyword::BETWEEN);
+    ParserKeyword keyword_unbounded(Keyword::UNBOUNDED);
+    ParserKeyword keyword_preceding(Keyword::PRECEDING);
+    ParserKeyword keyword_following(Keyword::FOLLOWING);
+    ParserKeyword keyword_and(Keyword::AND);
+    ParserKeyword keyword_current_row(Keyword::CURRENT_ROW);
 
     // There are two variants of grammar for the frame:
     // 1) ROWS BETWEEN UNBOUNDED PRECEDING AND CURRENT ROW
@@ -525,10 +526,10 @@ static bool tryParseFrameDefinition(ASTWindowDefinition * node, IParser::Pos & p
 static bool parseWindowDefinitionParts(IParser::Pos & pos,
     ASTWindowDefinition & node, Expected & expected)
 {
-    ParserKeyword keyword_partition_by("PARTITION BY");
+    ParserKeyword keyword_partition_by(Keyword::PARTITION_BY);
     ParserNotEmptyExpressionList columns_partition_by(
         false /* we don't allow declaring aliases here*/);
-    ParserKeyword keyword_order_by("ORDER BY");
+    ParserKeyword keyword_order_by(Keyword::ORDER_BY);
     ParserOrderByExpressionList columns_order_by;
 
     if (keyword_partition_by.ignore(pos, expected))
@@ -627,7 +628,7 @@ bool ParserWindowList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         }
         elem->name = getIdentifierName(window_name_identifier);
 
-        ParserKeyword keyword_as("AS");
+        ParserKeyword keyword_as(Keyword::AS);
         if (!keyword_as.ignore(pos, expected))
         {
             return false;
@@ -855,7 +856,7 @@ bool ParserCastOperator::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
 bool ParserNull::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword nested_parser("NULL");
+    ParserKeyword nested_parser(Keyword::NULL_KEYWORD);
     if (nested_parser.parse(pos, node, expected))
     {
         node = std::make_shared<ASTLiteral>(Null());
@@ -868,12 +869,12 @@ bool ParserNull::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserBool::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (ParserKeyword("true").parse(pos, node, expected))
+    if (ParserKeyword(Keyword::TRUE_KEYWORD).parse(pos, node, expected))
     {
         node = std::make_shared<ASTLiteral>(true);
         return true;
     }
-    else if (ParserKeyword("false").parse(pos, node, expected))
+    else if (ParserKeyword(Keyword::FALSE_KEYWORD).parse(pos, node, expected))
     {
         node = std::make_shared<ASTLiteral>(false);
         return true;
@@ -935,7 +936,7 @@ bool ParserNumber::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         {
             if (float_value < 0)
                 throw Exception(ErrorCodes::LOGICAL_ERROR,
-                                "Logical error: token number cannot begin with minus, "
+                                "Token number cannot begin with minus, "
                                 "but parsed float number is less than zero.");
 
             if (negative)
@@ -1451,6 +1452,7 @@ const char * ParserAlias::restricted_keywords[] =
     "ASOF",
     "BETWEEN",
     "CROSS",
+    "PASTE",
     "FINAL",
     "FORMAT",
     "FROM",
@@ -1488,7 +1490,7 @@ const char * ParserAlias::restricted_keywords[] =
 
 bool ParserAlias::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_as("AS");
+    ParserKeyword s_as(Keyword::AS);
     ParserIdentifier id_p;
 
     bool has_as_word = s_as.ignore(pos, expected);
@@ -1519,11 +1521,11 @@ bool ParserAlias::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword apply("APPLY");
-    ParserKeyword except("EXCEPT");
-    ParserKeyword replace("REPLACE");
-    ParserKeyword as("AS");
-    ParserKeyword strict("STRICT");
+    ParserKeyword apply(Keyword::APPLY);
+    ParserKeyword except(Keyword::EXCEPT);
+    ParserKeyword replace(Keyword::REPLACE);
+    ParserKeyword as(Keyword::AS);
+    ParserKeyword strict(Keyword::STRICT);
 
     if (allowed_transformers.isSet(ColumnTransformer::APPLY) && apply.ignore(pos, expected))
     {
@@ -1544,8 +1546,8 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         {
             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");
+                if (!isASTLambdaFunction(*func))
+                    throw Exception(ErrorCodes::SYNTAX_ERROR, "Lambda function definition expects two arguments, first argument must be a tuple of arguments");
 
                 const auto * lambda_args_tuple = func->arguments->children.at(0)->as<ASTFunction>();
                 if (!lambda_args_tuple || lambda_args_tuple->name != "tuple")
@@ -1627,7 +1629,7 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
             is_strict = true;
 
         ASTs identifiers;
-        ASTPtr regex_node;
+        ASTPtr regexp_node;
         ParserStringLiteral regex;
         auto parse_id = [&identifiers, &pos, &expected]
         {
@@ -1643,7 +1645,7 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         {
             // support one or more parameter
             ++pos;
-            if (!ParserList::parseUtil(pos, expected, parse_id, false) && !regex.parse(pos, regex_node, expected))
+            if (!ParserList::parseUtil(pos, expected, parse_id, false) && !regex.parse(pos, regexp_node, expected))
                 return false;
 
             if (pos->type != TokenType::ClosingRoundBracket)
@@ -1653,13 +1655,13 @@ bool ParserColumnsTransformers::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         else
         {
             // only one parameter
-            if (!parse_id() && !regex.parse(pos, regex_node, expected))
+            if (!parse_id() && !regex.parse(pos, regexp_node, expected))
                 return false;
         }
 
         auto res = std::make_shared<ASTColumnsExceptTransformer>();
-        if (regex_node)
-            res->setPattern(regex_node->as<ASTLiteral &>().value.get<String>());
+        if (regexp_node)
+            res->setPattern(regexp_node->as<ASTLiteral &>().value.get<String>());
         else
             res->children = std::move(identifiers);
         res->is_strict = is_strict;
@@ -1793,11 +1795,11 @@ static bool parseColumnsMatcherBody(IParser::Pos & pos, ASTPtr & node, Expected
     ++pos;
 
     ParserList columns_p(std::make_unique<ParserCompoundIdentifier>(false, true), std::make_unique<ParserToken>(TokenType::Comma), false);
-    ParserStringLiteral regex;
+    ParserStringLiteral regexp;
 
     ASTPtr column_list;
-    ASTPtr regex_node;
-    if (!columns_p.parse(pos, column_list, expected) && !regex.parse(pos, regex_node, expected))
+    ASTPtr regexp_node;
+    if (!columns_p.parse(pos, column_list, expected) && !regexp.parse(pos, regexp_node, expected))
         return false;
 
     if (pos->type != TokenType::ClosingRoundBracket)
@@ -1831,7 +1833,7 @@ static bool parseColumnsMatcherBody(IParser::Pos & pos, ASTPtr & node, Expected
     else
     {
         auto regexp_matcher = std::make_shared<ASTColumnsRegexpMatcher>();
-        regexp_matcher->setPattern(regex_node->as<ASTLiteral &>().value.get<String>());
+        regexp_matcher->setPattern(regexp_node->as<ASTLiteral &>().value.get<String>());
 
         if (!transformers->children.empty())
         {
@@ -1847,7 +1849,7 @@ static bool parseColumnsMatcherBody(IParser::Pos & pos, ASTPtr & node, Expected
 
 bool ParserColumnsMatcher::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword columns("COLUMNS");
+    ParserKeyword columns(Keyword::COLUMNS);
 
     if (!columns.ignore(pos, expected))
         return false;
@@ -1894,8 +1896,7 @@ bool ParserQualifiedColumnsMatcher::parseImpl(Pos & pos, ASTPtr & node, Expected
     else if (auto * column_regexp_matcher = node->as<ASTColumnsRegexpMatcher>())
     {
         auto result = std::make_shared<ASTQualifiedColumnsRegexpMatcher>();
-        result->setPattern(column_regexp_matcher->getPattern(), false);
-        result->setMatcher(column_regexp_matcher->getMatcher());
+        result->setPattern(column_regexp_matcher->getPattern());
 
         result->qualifier = std::move(identifier_node);
         result->children.push_back(result->qualifier);
@@ -2052,18 +2053,18 @@ bool ParserWithOptionalAlias::parseImpl(Pos & pos, ASTPtr & node, Expected & exp
 bool ParserOrderByElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserExpressionWithOptionalAlias elem_p(false);
-    ParserKeyword ascending("ASCENDING");
-    ParserKeyword descending("DESCENDING");
-    ParserKeyword asc("ASC");
-    ParserKeyword desc("DESC");
-    ParserKeyword nulls("NULLS");
-    ParserKeyword first("FIRST");
-    ParserKeyword last("LAST");
-    ParserKeyword collate("COLLATE");
-    ParserKeyword with_fill("WITH FILL");
-    ParserKeyword from("FROM");
-    ParserKeyword to("TO");
-    ParserKeyword step("STEP");
+    ParserKeyword ascending(Keyword::ASCENDING);
+    ParserKeyword descending(Keyword::DESCENDING);
+    ParserKeyword asc(Keyword::ASC);
+    ParserKeyword desc(Keyword::DESC);
+    ParserKeyword nulls(Keyword::NULLS);
+    ParserKeyword first(Keyword::FIRST);
+    ParserKeyword last(Keyword::LAST);
+    ParserKeyword collate(Keyword::COLLATE);
+    ParserKeyword with_fill(Keyword::WITH_FILL);
+    ParserKeyword from(Keyword::FROM);
+    ParserKeyword to(Keyword::TO);
+    ParserKeyword step(Keyword::STEP);
     ParserStringLiteral collate_locale_parser;
     ParserExpressionWithOptionalAlias exp_parser(false);
 
@@ -2120,17 +2121,16 @@ bool ParserOrderByElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
 
     auto elem = std::make_shared<ASTOrderByElement>();
 
+    elem->children.push_back(expr_elem);
+
     elem->direction = direction;
     elem->nulls_direction = nulls_direction;
     elem->nulls_direction_was_explicitly_specified = nulls_direction_was_explicitly_specified;
-    elem->collation = locale_node;
+    elem->setCollation(locale_node);
     elem->with_fill = has_with_fill;
-    elem->fill_from = fill_from;
-    elem->fill_to = fill_to;
-    elem->fill_step = fill_step;
-    elem->children.push_back(expr_elem);
-    if (locale_node)
-        elem->children.push_back(locale_node);
+    elem->setFillFrom(fill_from);
+    elem->setFillTo(fill_to);
+    elem->setFillStep(fill_step);
 
     node = elem;
 
@@ -2139,7 +2139,7 @@ bool ParserOrderByElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
 
 bool ParserInterpolateElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword as("AS");
+    ParserKeyword as(Keyword::AS);
     ParserExpression element_p;
     ParserIdentifier ident_p;
 
@@ -2210,18 +2210,18 @@ bool ParserFunctionWithKeyValueArguments::parseImpl(Pos & pos, ASTPtr & node, Ex
 
 bool ParserTTLElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_to_disk("TO DISK");
-    ParserKeyword s_to_volume("TO VOLUME");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_delete("DELETE");
-    ParserKeyword s_where("WHERE");
-    ParserKeyword s_group_by("GROUP BY");
-    ParserKeyword s_set("SET");
-    ParserKeyword s_recompress("RECOMPRESS");
-    ParserKeyword s_codec("CODEC");
-    ParserKeyword s_materialize("MATERIALIZE");
-    ParserKeyword s_remove("REMOVE");
-    ParserKeyword s_modify("MODIFY");
+    ParserKeyword s_to_disk(Keyword::TO_DISK);
+    ParserKeyword s_to_volume(Keyword::TO_VOLUME);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_delete(Keyword::DELETE);
+    ParserKeyword s_where(Keyword::WHERE);
+    ParserKeyword s_group_by(Keyword::GROUP_BY);
+    ParserKeyword s_set(Keyword::SET);
+    ParserKeyword s_recompress(Keyword::RECOMPRESS);
+    ParserKeyword s_codec(Keyword::CODEC);
+    ParserKeyword s_materialize(Keyword::MATERIALIZE);
+    ParserKeyword s_remove(Keyword::REMOVE);
+    ParserKeyword s_modify(Keyword::MODIFY);
 
     ParserIdentifier parser_identifier;
     ParserStringLiteral parser_string_literal;
diff --git a/src/Parsers/ExpressionElementParsers.h b/src/Parsers/ExpressionElementParsers.h
index 2104a71cd0d..b29f5cc4251 100644
--- a/src/Parsers/ExpressionElementParsers.h
+++ b/src/Parsers/ExpressionElementParsers.h
@@ -39,7 +39,7 @@ protected:
 class ParserTableAsStringLiteralIdentifier : public IParserBase
 {
 public:
-    explicit ParserTableAsStringLiteralIdentifier() {}
+    explicit ParserTableAsStringLiteralIdentifier() = default;
 
 protected:
     const char * getName() const override { return "string literal table identifier"; }
diff --git a/src/Parsers/ExpressionListParsers.cpp b/src/Parsers/ExpressionListParsers.cpp
index 1e9383f96ae..05691529f43 100644
--- a/src/Parsers/ExpressionListParsers.cpp
+++ b/src/Parsers/ExpressionListParsers.cpp
@@ -69,11 +69,11 @@ bool ParserList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 bool ParserUnionList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserUnionQueryElement elem_parser;
-    ParserKeyword s_union_parser("UNION");
-    ParserKeyword s_all_parser("ALL");
-    ParserKeyword s_distinct_parser("DISTINCT");
-    ParserKeyword s_except_parser("EXCEPT");
-    ParserKeyword s_intersect_parser("INTERSECT");
+    ParserKeyword s_union_parser(Keyword::UNION);
+    ParserKeyword s_all_parser(Keyword::ALL);
+    ParserKeyword s_distinct_parser(Keyword::DISTINCT);
+    ParserKeyword s_except_parser(Keyword::EXCEPT);
+    ParserKeyword s_intersect_parser(Keyword::INTERSECT);
     ASTs elements;
 
     auto parse_element = [&]
@@ -135,7 +135,7 @@ static bool parseOperator(IParser::Pos & pos, std::string_view op, Expected & ex
 {
     if (!op.empty() && isWordCharASCII(op.front()))
     {
-        return ParserKeyword(op).ignore(pos, expected);
+        return ParserKeyword::createDeprecated(op).ignore(pos, expected);
     }
     else if (op.length() == pos->size() && 0 == memcmp(op.data(), pos->begin, pos->size()))
     {
@@ -225,8 +225,7 @@ static bool modifyAST(ASTPtr ast, SubqueryFunctionType type)
     select_with_union_query->list_of_selects->children.push_back(std::move(select_query));
     select_with_union_query->children.push_back(select_with_union_query->list_of_selects);
 
-    auto new_subquery = std::make_shared<ASTSubquery>();
-    new_subquery->children.push_back(select_with_union_query);
+    auto new_subquery = std::make_shared<ASTSubquery>(std::move(select_with_union_query));
     ast->children[0]->children.back() = std::move(new_subquery);
 
     return true;
@@ -807,7 +806,6 @@ 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;
 
@@ -820,8 +818,8 @@ struct ParserExpressionImpl
     ParserSubstitution substitution_parser;
     ParserMySQLGlobalVariable mysql_global_variable_parser;
 
-    ParserKeyword any_parser{"ANY"};
-    ParserKeyword all_parser{"ALL"};
+    ParserKeyword any_parser{Keyword::ANY};
+    ParserKeyword all_parser{Keyword::ALL};
 
     // Recursion
     ParserQualifiedAsterisk qualified_asterisk_parser;
@@ -886,7 +884,7 @@ public:
             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))
+                if (!ParserKeyword(Keyword::FROM).ignore(test_pos, test_expected))
                     return true;
 
                 // If there is a comma after 'from' then the first one was a name of a column
@@ -894,7 +892,7 @@ public:
                     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))
+                if (ParserKeyword(Keyword::FROM).ignore(test_pos, test_expected))
                     return true;
 
                 /// If we parse an explicit alias to FROM, then it was a name of a column
@@ -982,8 +980,8 @@ public:
             auto pos_after_bracket = pos;
             auto old_expected = expected;
 
-            ParserKeyword all("ALL");
-            ParserKeyword distinct("DISTINCT");
+            ParserKeyword all(Keyword::ALL);
+            ParserKeyword distinct(Keyword::DISTINCT);
 
             if (all.ignore(pos, expected))
                 has_all = true;
@@ -1066,8 +1064,8 @@ public:
                     auto pos_after_bracket = pos;
                     auto old_expected = expected;
 
-                    ParserKeyword all("ALL");
-                    ParserKeyword distinct("DISTINCT");
+                    ParserKeyword all(Keyword::ALL);
+                    ParserKeyword distinct(Keyword::DISTINCT);
 
                     if (all.ignore(pos, expected))
                         has_all = true;
@@ -1113,10 +1111,10 @@ public:
                 function_node->children.push_back(function_node->parameters);
             }
 
-            ParserKeyword filter("FILTER");
-            ParserKeyword over("OVER");
-            ParserKeyword respect_nulls("RESPECT NULLS");
-            ParserKeyword ignore_nulls("IGNORE NULLS");
+            ParserKeyword filter(Keyword::FILTER);
+            ParserKeyword over(Keyword::OVER);
+            ParserKeyword respect_nulls(Keyword::RESPECT_NULLS);
+            ParserKeyword ignore_nulls(Keyword::IGNORE_NULLS);
 
             if (filter.ignore(pos, expected))
             {
@@ -1268,7 +1266,7 @@ public:
         /// 0. Parse all the cases (-> 1)
         /// 1. Parse closing token (finished)
 
-        ParserKeyword as_keyword_parser("AS");
+        ParserKeyword as_keyword_parser(Keyword::AS);
         ASTPtr alias;
 
         /// expr AS type
@@ -1349,7 +1347,7 @@ public:
                 if (elements.size() != 2)
                     return false;
 
-                elements = {makeASTFunction("CAST", elements[0], elements[1])};
+                elements = {makeASTFunction(toString(toStringView(Keyword::CAST)), elements[0], elements[1])};
                 finished = true;
                 return true;
             }
@@ -1375,7 +1373,7 @@ public:
         if (state == 0)
         {
             IParser::Pos begin = pos;
-            ParserKeyword s_from("FROM");
+            ParserKeyword s_from(Keyword::FROM);
 
             if (parseIntervalKind(pos, expected, interval_kind) && s_from.ignore(pos, expected))
             {
@@ -1448,7 +1446,7 @@ public:
         if (state == 0)
         {
             if (ParserToken(TokenType::Comma).ignore(pos, expected) ||
-                ParserKeyword("FROM").ignore(pos, expected))
+                ParserKeyword(Keyword::FROM).ignore(pos, expected))
             {
                 action = Action::OPERAND;
 
@@ -1462,7 +1460,7 @@ public:
         if (state == 1)
         {
             if (ParserToken(TokenType::Comma).ignore(pos, expected) ||
-                ParserKeyword("FOR").ignore(pos, expected))
+                ParserKeyword(Keyword::FOR).ignore(pos, expected))
             {
                 action = Action::OPERAND;
 
@@ -1519,7 +1517,7 @@ public:
 
                 state = 1;
             }
-            if (ParserKeyword("IN").ignore(pos, expected))
+            if (ParserKeyword(Keyword::IN).ignore(pos, expected))
             {
                 action = Action::OPERAND;
 
@@ -1582,8 +1580,7 @@ public:
         if (!ParserToken(TokenType::ClosingRoundBracket).ignore(pos, expected))
             return false;
 
-        auto subquery = std::make_shared<ASTSubquery>();
-        subquery->children.push_back(std::move(node));
+        auto subquery = std::make_shared<ASTSubquery>(std::move(node));
         elements = {makeASTFunction("exists", subquery)};
 
         finished = true;
@@ -1612,18 +1609,18 @@ public:
         {
             if (!trim_left && !trim_right)
             {
-                if (ParserKeyword("BOTH").ignore(pos, expected))
+                if (ParserKeyword(Keyword::BOTH).ignore(pos, expected))
                 {
                     trim_left = true;
                     trim_right = true;
                     char_override = true;
                 }
-                else if (ParserKeyword("LEADING").ignore(pos, expected))
+                else if (ParserKeyword(Keyword::LEADING).ignore(pos, expected))
                 {
                     trim_left = true;
                     char_override = true;
                 }
-                else if (ParserKeyword("TRAILING").ignore(pos, expected))
+                else if (ParserKeyword(Keyword::TRAILING).ignore(pos, expected))
                 {
                     trim_right = true;
                     char_override = true;
@@ -1647,7 +1644,7 @@ public:
 
         if (state == 1)
         {
-            if (ParserKeyword("FROM").ignore(pos, expected))
+            if (ParserKeyword(Keyword::FROM).ignore(pos, expected))
             {
                 action = Action::OPERAND;
 
@@ -1920,7 +1917,7 @@ public:
                 && string_literal->as<ASTLiteral &>().value.tryGet(literal))
             {
                 Tokens tokens(literal.data(), literal.data() + literal.size());
-                IParser::Pos token_pos(tokens, 0);
+                IParser::Pos token_pos(tokens, pos.max_depth, pos.max_backtracks);
                 Expected token_expected;
                 ASTPtr expr;
 
@@ -2004,7 +2001,7 @@ public:
         if (state == 0)
         {
             auto old_pos = pos;
-            has_case_expr = !ParserKeyword("WHEN").ignore(pos, expected);
+            has_case_expr = !ParserKeyword(Keyword::WHEN).ignore(pos, expected);
             pos = old_pos;
 
             state = 1;
@@ -2012,7 +2009,7 @@ public:
 
         if (state == 1)
         {
-            if (ParserKeyword("WHEN").ignore(pos, expected))
+            if (ParserKeyword(Keyword::WHEN).ignore(pos, expected))
             {
                 if ((has_case_expr || !elements.empty()) && !mergeElement())
                     return false;
@@ -2020,7 +2017,7 @@ public:
                 action = Action::OPERAND;
                 state = 2;
             }
-            else if (ParserKeyword("ELSE").ignore(pos, expected))
+            else if (ParserKeyword(Keyword::ELSE).ignore(pos, expected))
             {
                 if (!mergeElement())
                     return false;
@@ -2028,7 +2025,7 @@ public:
                 action = Action::OPERAND;
                 state = 3;
             }
-            else if (ParserKeyword("END").ignore(pos, expected))
+            else if (ParserKeyword(Keyword::END).ignore(pos, expected))
             {
                 if (!mergeElement())
                     return false;
@@ -2047,7 +2044,7 @@ public:
 
         if (state == 2)
         {
-            if (ParserKeyword("THEN").ignore(pos, expected))
+            if (ParserKeyword(Keyword::THEN).ignore(pos, expected))
             {
                 if (!mergeElement())
                     return false;
@@ -2059,7 +2056,7 @@ public:
 
         if (state == 3)
         {
-            if (ParserKeyword("END").ignore(pos, expected))
+            if (ParserKeyword(Keyword::END).ignore(pos, expected))
             {
                 if (!mergeElement())
                     return false;
@@ -2121,7 +2118,7 @@ public:
                 return true;
             }
 
-            if (!ParserKeyword{"ELSE"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::ELSE}.ignore(pos, expected))
                 return false;
 
             state = 1;
@@ -2305,7 +2302,7 @@ bool ParseDateOperatorExpression(IParser::Pos & pos, ASTPtr & node, Expected & e
     auto begin = pos;
 
     /// If no DATE keyword, go to the nested parser.
-    if (!ParserKeyword("DATE").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::DATE).ignore(pos, expected))
         return false;
 
     ASTPtr expr;
@@ -2324,7 +2321,7 @@ bool ParseTimestampOperatorExpression(IParser::Pos & pos, ASTPtr & node, Expecte
     auto begin = pos;
 
     /// If no TIMESTAMP keyword, go to the nested parser.
-    if (!ParserKeyword("TIMESTAMP").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::TIMESTAMP).ignore(pos, expected))
         return false;
 
     ASTPtr expr;
@@ -2380,13 +2377,13 @@ const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::o
     {"->",            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)},
-    {"IS NOT DISTINCT FROM", Operator("isNotDistinctFrom", 6, 2)},
-    {"IS NULL",       Operator("isNull",          6,  1, OperatorType::IsNull)},
-    {"IS NOT NULL",   Operator("isNotNull",       6,  1, OperatorType::IsNull)},
-    {"BETWEEN",       Operator("",                7,  0, OperatorType::StartBetween)},
-    {"NOT BETWEEN",   Operator("",                7,  0, OperatorType::StartNotBetween)},
+    {toStringView(Keyword::OR),            Operator("or",              3,  2, OperatorType::Mergeable)},
+    {toStringView(Keyword::AND),           Operator("and",             4,  2, OperatorType::Mergeable)},
+    {toStringView(Keyword::IS_NOT_DISTINCT_FROM), Operator("isNotDistinctFrom", 6, 2)},
+    {toStringView(Keyword::IS_NULL),       Operator("isNull",          6,  1, OperatorType::IsNull)},
+    {toStringView(Keyword::IS_NOT_NULL),   Operator("isNotNull",       6,  1, OperatorType::IsNull)},
+    {toStringView(Keyword::BETWEEN),       Operator("",                7,  0, OperatorType::StartBetween)},
+    {toStringView(Keyword::NOT_BETWEEN),   Operator("",                7,  0, OperatorType::StartNotBetween)},
     {"==",            Operator("equals",          9,  2, OperatorType::Comparison)},
     {"!=",            Operator("notEquals",       9,  2, OperatorType::Comparison)},
     {"<=>",           Operator("isNotDistinctFrom", 9, 2, OperatorType::Comparison)},
@@ -2396,15 +2393,15 @@ const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::o
     {"<",             Operator("less",            9,  2, OperatorType::Comparison)},
     {">",             Operator("greater",         9,  2, OperatorType::Comparison)},
     {"=",             Operator("equals",          9,  2, OperatorType::Comparison)},
-    {"LIKE",          Operator("like",            9,  2)},
-    {"ILIKE",         Operator("ilike",           9,  2)},
-    {"NOT LIKE",      Operator("notLike",         9,  2)},
-    {"NOT ILIKE",     Operator("notILike",        9,  2)},
-    {"REGEXP",        Operator("match",           9,  2)},
-    {"IN",            Operator("in",              9,  2)},
-    {"NOT IN",        Operator("notIn",           9,  2)},
-    {"GLOBAL IN",     Operator("globalIn",        9,  2)},
-    {"GLOBAL NOT IN", Operator("globalNotIn",     9,  2)},
+    {toStringView(Keyword::LIKE),          Operator("like",            9,  2)},
+    {toStringView(Keyword::ILIKE),         Operator("ilike",           9,  2)},
+    {toStringView(Keyword::NOT_LIKE),      Operator("notLike",         9,  2)},
+    {toStringView(Keyword::NOT_ILIKE),     Operator("notILike",        9,  2)},
+    {toStringView(Keyword::REGEXP),        Operator("match",           9,  2)},
+    {toStringView(Keyword::IN),            Operator("in",              9,  2)},
+    {toStringView(Keyword::NOT_IN),        Operator("notIn",           9,  2)},
+    {toStringView(Keyword::GLOBAL_IN),     Operator("globalIn",        9,  2)},
+    {toStringView(Keyword::GLOBAL_NOT_IN), Operator("globalNotIn",     9,  2)},
     {"||",            Operator("concat",          10, 2, OperatorType::Mergeable)},
     {"+",             Operator("plus",            11, 2)},
     {"-",             Operator("minus",           11, 2)},
@@ -2412,26 +2409,22 @@ const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::o
     {"*",             Operator("multiply",        12, 2)},
     {"/",             Operator("divide",          12, 2)},
     {"%",             Operator("modulo",          12, 2)},
-    {"MOD",           Operator("modulo",          12, 2)},
-    {"DIV",           Operator("intDiv",          12, 2)},
+    {toStringView(Keyword::MOD),           Operator("modulo",          12, 2)},
+    {toStringView(Keyword::DIV),           Operator("intDiv",          12, 2)},
     {".",             Operator("tupleElement",    14, 2, OperatorType::TupleElement)},
     {"[",             Operator("arrayElement",    14, 2, OperatorType::ArrayElement)},
-    {"::",            Operator("CAST",            14, 2, OperatorType::Cast)},
+    {"::",            Operator(toString(toStringView(Keyword::CAST)),            14, 2, OperatorType::Cast)},
 };
 
 const std::vector<std::pair<std::string_view, Operator>> ParserExpressionImpl::unary_operators_table
 {
-    {"NOT",           Operator("not",             5,  1, OperatorType::Not)},
-    {"-",             Operator("negate",          13, 1)},
-    {"−",             Operator("negate",          13, 1)}
+    {toStringView(Keyword::NOT), Operator("not", 5, 1, OperatorType::Not)},
+    {"-", Operator("negate", 13, 1)},
+    {"−", Operator("negate", 13, 1)},
 };
 
 const Operator ParserExpressionImpl::finish_between_operator("", 8, 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)
 {
@@ -2518,7 +2511,7 @@ Action ParserExpressionImpl::tryParseOperand(Layers & layers, IParser::Pos & pos
         if (layers.back()->isCurrentElementEmpty())
         {
             auto old_pos = pos;
-            ParserKeyword s_settings("SETTINGS");
+            ParserKeyword s_settings(Keyword::SETTINGS);
             if (s_settings.ignore(pos, expected))
             {
                 ParserSetQuery parser_settings(true);
@@ -2610,13 +2603,13 @@ Action ParserExpressionImpl::tryParseOperand(Layers & layers, IParser::Pos & pos
     auto current_checkpoint = layers.back()->current_checkpoint;
     layers.back()->current_checkpoint = Checkpoint::None;
 
-    if (current_checkpoint != Checkpoint::Interval && parseOperator(pos, "INTERVAL", expected))
+    if (current_checkpoint != Checkpoint::Interval && parseOperator(pos, toStringView(Keyword::INTERVAL), expected))
     {
         layers.back()->saved_checkpoint = {old_pos, Checkpoint::Interval};
         layers.push_back(std::make_unique<IntervalLayer>());
         return Action::OPERAND;
     }
-    else if (current_checkpoint != Checkpoint::Case && parseOperator(pos, "CASE", expected))
+    else if (current_checkpoint != Checkpoint::Case && parseOperator(pos, toStringView(Keyword::CASE), expected))
     {
         layers.back()->saved_checkpoint = {old_pos, Checkpoint::Case};
         layers.push_back(std::make_unique<CaseLayer>());
@@ -2691,9 +2684,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 auto & it : overlapping_operators_to_skip)
-        if (ParserKeyword{it}.checkWithoutMoving(pos, stub))
-            return Action::NONE;
+    if (ParserKeyword(Keyword::IN_PARTITION).checkWithoutMoving(pos, stub))
+        return Action::NONE;
 
     /// Try to find operators from 'operators_table'
     auto cur_op = operators_table.begin();
diff --git a/src/Parsers/ExpressionListParsers.h b/src/Parsers/ExpressionListParsers.h
index 6dba5a9c31f..235d5782630 100644
--- a/src/Parsers/ExpressionListParsers.h
+++ b/src/Parsers/ExpressionListParsers.h
@@ -9,10 +9,8 @@
 #include <Parsers/SelectUnionMode.h>
 #include <Common/IntervalKind.h>
 
-#ifdef __clang__
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wc99-extensions"
-#endif
 
 namespace DB
 {
@@ -297,6 +295,4 @@ protected:
 
 }
 
-#ifdef __clang__
 #pragma clang diagnostic pop
-#endif
diff --git a/src/Parsers/FunctionSecretArgumentsFinder.h b/src/Parsers/FunctionSecretArgumentsFinder.h
new file mode 100644
index 00000000000..002ad94f6ea
--- /dev/null
+++ b/src/Parsers/FunctionSecretArgumentsFinder.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <vector>
+
+namespace DB
+{
+
+class FunctionSecretArgumentsFinder
+{
+public:
+    struct Result
+    {
+        /// Result constructed by default means no arguments will be hidden.
+        size_t start = static_cast<size_t>(-1);
+        size_t count = 0; /// Mostly it's either 0 or 1. There are only a few cases where `count` can be greater than 1 (e.g. see `encrypt`).
+                            /// In all known cases secret arguments are consecutive
+        bool are_named = false; /// Arguments like `password = 'password'` are considered as named arguments.
+        /// E.g. "headers" in `url('..', headers('foo' = '[HIDDEN]'))`
+        std::vector<std::string> nested_maps;
+
+        bool hasSecrets() const
+        {
+            return count != 0 || !nested_maps.empty();
+        }
+    };
+};
+
+}
diff --git a/src/Parsers/FunctionSecretArgumentsFinderAST.h b/src/Parsers/FunctionSecretArgumentsFinderAST.h
new file mode 100644
index 00000000000..348b2ca9e3a
--- /dev/null
+++ b/src/Parsers/FunctionSecretArgumentsFinderAST.h
@@ -0,0 +1,499 @@
+#pragma once
+
+#include <Parsers/FunctionSecretArgumentsFinder.h>
+#include <Core/QualifiedTableName.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTLiteral.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Common/KnownObjectNames.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+
+namespace DB
+{
+
+
+/// Finds arguments of a specified function which should not be displayed for most users for security reasons.
+/// That involves passwords and secret keys.
+class FunctionSecretArgumentsFinderAST
+{
+public:
+    explicit FunctionSecretArgumentsFinderAST(const ASTFunction & function_) : function(function_)
+    {
+        if (!function.arguments)
+            return;
+
+        const auto * expr_list = function.arguments->as<ASTExpressionList>();
+        if (!expr_list)
+            return;
+
+        arguments = &expr_list->children;
+        switch (function.kind)
+        {
+            case ASTFunction::Kind::ORDINARY_FUNCTION: findOrdinaryFunctionSecretArguments(); break;
+            case ASTFunction::Kind::WINDOW_FUNCTION: break;
+            case ASTFunction::Kind::LAMBDA_FUNCTION:  break;
+            case ASTFunction::Kind::TABLE_ENGINE: findTableEngineSecretArguments(); break;
+            case ASTFunction::Kind::DATABASE_ENGINE: findDatabaseEngineSecretArguments(); break;
+            case ASTFunction::Kind::BACKUP_NAME: findBackupNameSecretArguments(); break;
+        }
+    }
+
+    FunctionSecretArgumentsFinder::Result getResult() const { return result; }
+
+private:
+    const ASTFunction & function;
+    const ASTs * arguments = nullptr;
+    FunctionSecretArgumentsFinder::Result result;
+
+    void markSecretArgument(size_t index, bool argument_is_named = false)
+    {
+        if (index >= arguments->size())
+            return;
+        if (!result.count)
+        {
+            result.start = index;
+            result.are_named = argument_is_named;
+        }
+        chassert(index >= result.start); /// We always check arguments consecutively
+        result.count = index + 1 - result.start;
+        if (!argument_is_named)
+            result.are_named = false;
+    }
+
+    void findOrdinaryFunctionSecretArguments()
+    {
+        if ((function.name == "mysql") || (function.name == "postgresql") || (function.name == "mongodb"))
+        {
+            /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
+            /// postgresql('host:port', 'database', 'table', 'user', 'password', ...)
+            /// mongodb('host:port', 'database', 'collection', 'user', 'password', ...)
+            findMySQLFunctionSecretArguments();
+        }
+        else if ((function.name == "s3") || (function.name == "cosn") || (function.name == "oss") ||
+                    (function.name == "deltaLake") || (function.name == "hudi") || (function.name == "iceberg"))
+        {
+            /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+            findS3FunctionSecretArguments(/* is_cluster_function= */ false);
+        }
+        else if (function.name == "s3Cluster")
+        {
+            /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+            findS3FunctionSecretArguments(/* is_cluster_function= */ true);
+        }
+        else if ((function.name == "remote") || (function.name == "remoteSecure"))
+        {
+            /// remote('addresses_expr', 'db', 'table', 'user', 'password', ...)
+            findRemoteFunctionSecretArguments();
+        }
+        else if ((function.name == "encrypt") || (function.name == "decrypt") ||
+                    (function.name == "aes_encrypt_mysql") || (function.name == "aes_decrypt_mysql") ||
+                    (function.name == "tryDecrypt"))
+        {
+            /// encrypt('mode', 'plaintext', 'key' [, iv, aad])
+            findEncryptionFunctionSecretArguments();
+        }
+        else if (function.name == "url")
+        {
+            findURLSecretArguments();
+        }
+    }
+
+    void findMySQLFunctionSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// mysql(named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 1);
+        }
+        else
+        {
+            /// mysql('host:port', 'database', 'table', 'user', 'password', ...)
+            markSecretArgument(4);
+        }
+    }
+
+    /// Returns the number of arguments excluding "headers" and "extra_credentials" (which should
+    /// always be at the end). Marks "headers" as secret, if found.
+    size_t excludeS3OrURLNestedMaps()
+    {
+        size_t count = arguments->size();
+        while (count > 0)
+        {
+            const ASTFunction * f = arguments->at(count - 1)->as<ASTFunction>();
+            if (!f)
+                break;
+            if (f->name == "headers")
+                result.nested_maps.push_back(f->name);
+            else if (f->name != "extra_credentials")
+                break;
+            count -= 1;
+        }
+        return count;
+    }
+
+    void findS3FunctionSecretArguments(bool is_cluster_function)
+    {
+        /// s3Cluster('cluster_name', 'url', ...) has 'url' as its second argument.
+        size_t url_arg_idx = is_cluster_function ? 1 : 0;
+
+        if (!is_cluster_function && isNamedCollectionName(0))
+        {
+            /// s3(named_collection, ..., secret_access_key = 'secret_access_key', ...)
+            findSecretNamedArgument("secret_access_key", 1);
+            return;
+        }
+
+        /// We should check other arguments first because we don't need to do any replacement in case of
+        /// s3('url', NOSIGN, 'format' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
+        /// s3('url', 'format', 'structure' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
+        size_t count = excludeS3OrURLNestedMaps();
+        if ((url_arg_idx + 3 <= count) && (count <= url_arg_idx + 4))
+        {
+            String second_arg;
+            if (tryGetStringFromArgument(url_arg_idx + 1, &second_arg))
+            {
+                if (boost::iequals(second_arg, "NOSIGN"))
+                    return; /// The argument after 'url' is "NOSIGN".
+
+                if (second_arg == "auto" || KnownFormatNames::instance().exists(second_arg))
+                    return; /// The argument after 'url' is a format: s3('url', 'format', ...)
+            }
+        }
+
+        /// We're going to replace 'aws_secret_access_key' with '[HIDDEN]' for the following signatures:
+        /// s3('url', 'aws_access_key_id', 'aws_secret_access_key', ...)
+        /// s3Cluster('cluster_name', 'url', 'aws_access_key_id', 'aws_secret_access_key', 'format', 'compression')
+        if (url_arg_idx + 2 < count)
+            markSecretArgument(url_arg_idx + 2);
+    }
+
+    void findURLSecretArguments()
+    {
+        if (!isNamedCollectionName(0))
+            excludeS3OrURLNestedMaps();
+    }
+
+    bool tryGetStringFromArgument(size_t arg_idx, String * res, bool allow_identifier = true) const
+    {
+        if (arg_idx >= arguments->size())
+            return false;
+
+        return tryGetStringFromArgument(*(*arguments)[arg_idx], res, allow_identifier);
+    }
+
+    static bool tryGetStringFromArgument(const IAST & argument, String * res, bool allow_identifier = true)
+    {
+        if (const auto * literal = argument.as<ASTLiteral>())
+        {
+            if (literal->value.getType() != Field::Types::String)
+                return false;
+            if (res)
+                *res = literal->value.safeGet<String>();
+            return true;
+        }
+
+        if (allow_identifier)
+        {
+            if (const auto * id = argument.as<ASTIdentifier>())
+            {
+                if (res)
+                    *res = id->name();
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    void findRemoteFunctionSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// remote(named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 1);
+            return;
+        }
+
+        /// We're going to replace 'password' with '[HIDDEN'] for the following signatures:
+        /// remote('addresses_expr', db.table, 'user' [, 'password'] [, sharding_key])
+        /// remote('addresses_expr', 'db', 'table', 'user' [, 'password'] [, sharding_key])
+        /// remote('addresses_expr', table_function(), 'user' [, 'password'] [, sharding_key])
+
+        /// But we should check the number of arguments first because we don't need to do any replacements in case of
+        /// remote('addresses_expr', db.table)
+        if (arguments->size() < 3)
+            return;
+
+        size_t arg_num = 1;
+
+        /// Skip 1 or 2 arguments with table_function() or db.table or 'db', 'table'.
+        const auto * table_function = (*arguments)[arg_num]->as<ASTFunction>();
+        if (table_function && KnownTableFunctionNames::instance().exists(table_function->name))
+        {
+            ++arg_num;
+        }
+        else
+        {
+            std::optional<String> database;
+            std::optional<QualifiedTableName> qualified_table_name;
+            if (!tryGetDatabaseNameOrQualifiedTableName(arg_num, database, qualified_table_name))
+            {
+                /// We couldn't evaluate the argument so we don't know whether it is 'db.table' or just 'db'.
+                /// Hence we can't figure out whether we should skip one argument 'user' or two arguments 'table', 'user'
+                /// before the argument 'password'. So it's safer to wipe two arguments just in case.
+                /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
+                /// before wiping it (because the `password` argument is always a literal string).
+                if (tryGetStringFromArgument(arg_num + 2, nullptr, /* allow_identifier= */ false))
+                {
+                    /// Wipe either `password` or `user`.
+                    markSecretArgument(arg_num + 2);
+                }
+                if (tryGetStringFromArgument(arg_num + 3, nullptr, /* allow_identifier= */ false))
+                {
+                    /// Wipe either `password` or `sharding_key`.
+                    markSecretArgument(arg_num + 3);
+                }
+                return;
+            }
+
+            /// Skip the current argument (which is either a database name or a qualified table name).
+            ++arg_num;
+            if (database)
+            {
+                /// Skip the 'table' argument if the previous argument was a database name.
+                ++arg_num;
+            }
+        }
+
+        /// Skip username.
+        ++arg_num;
+
+        /// Do our replacement:
+        /// remote('addresses_expr', db.table, 'user', 'password', ...) -> remote('addresses_expr', db.table, 'user', '[HIDDEN]', ...)
+        /// The last argument can be also a `sharding_key`, so we need to check that argument is a literal string
+        /// before wiping it (because the `password` argument is always a literal string).
+        bool can_be_password = tryGetStringFromArgument(arg_num, nullptr, /* allow_identifier= */ false);
+        if (can_be_password)
+            markSecretArgument(arg_num);
+    }
+
+    /// Tries to get either a database name or a qualified table name from an argument.
+    /// Empty string is also allowed (it means the default database).
+    /// The function is used by findRemoteFunctionSecretArguments() to determine how many arguments to skip before a password.
+    bool tryGetDatabaseNameOrQualifiedTableName(
+        size_t arg_idx,
+        std::optional<String> & res_database,
+        std::optional<QualifiedTableName> & res_qualified_table_name) const
+    {
+        res_database.reset();
+        res_qualified_table_name.reset();
+
+        String str;
+        if (!tryGetStringFromArgument(arg_idx, &str, /* allow_identifier= */ true))
+            return false;
+
+        if (str.empty())
+        {
+            res_database = "";
+            return true;
+        }
+
+        auto qualified_table_name = QualifiedTableName::tryParseFromString(str);
+        if (!qualified_table_name)
+            return false;
+
+        if (qualified_table_name->database.empty())
+            res_database = std::move(qualified_table_name->table);
+        else
+            res_qualified_table_name = std::move(qualified_table_name);
+        return true;
+    }
+
+    void findEncryptionFunctionSecretArguments()
+    {
+        if (arguments->empty())
+            return;
+
+        /// We replace all arguments after 'mode' with '[HIDDEN]':
+        /// encrypt('mode', 'plaintext', 'key' [, iv, aad]) -> encrypt('mode', '[HIDDEN]')
+        result.start = 1;
+        result.count = arguments->size() - 1;
+    }
+
+    void findTableEngineSecretArguments()
+    {
+        const String & engine_name = function.name;
+        if (engine_name == "ExternalDistributed")
+        {
+            /// ExternalDistributed('engine', 'host:port', 'database', 'table', 'user', 'password')
+            findExternalDistributedTableEngineSecretArguments();
+        }
+        else if ((engine_name == "MySQL") || (engine_name == "PostgreSQL") ||
+                    (engine_name == "MaterializedPostgreSQL") || (engine_name == "MongoDB"))
+        {
+            /// MySQL('host:port', 'database', 'table', 'user', 'password', ...)
+            /// PostgreSQL('host:port', 'database', 'table', 'user', 'password', ...)
+            /// MaterializedPostgreSQL('host:port', 'database', 'table', 'user', 'password', ...)
+            /// MongoDB('host:port', 'database', 'collection', 'user', 'password', ...)
+            findMySQLFunctionSecretArguments();
+        }
+        else if ((engine_name == "S3") || (engine_name == "COSN") || (engine_name == "OSS") ||
+                    (engine_name == "DeltaLake") || (engine_name == "Hudi") || (engine_name == "Iceberg") || (engine_name == "S3Queue"))
+        {
+            /// S3('url', ['aws_access_key_id', 'aws_secret_access_key',] ...)
+            findS3TableEngineSecretArguments();
+        }
+        else if (engine_name == "URL")
+        {
+            findURLSecretArguments();
+        }
+    }
+
+    void findExternalDistributedTableEngineSecretArguments()
+    {
+        if (isNamedCollectionName(1))
+        {
+            /// ExternalDistributed('engine', named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 2);
+        }
+        else
+        {
+            /// ExternalDistributed('engine', 'host:port', 'database', 'table', 'user', 'password')
+            markSecretArgument(5);
+        }
+    }
+
+    void findS3TableEngineSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// S3(named_collection, ..., secret_access_key = 'secret_access_key')
+            findSecretNamedArgument("secret_access_key", 1);
+            return;
+        }
+
+        /// We should check other arguments first because we don't need to do any replacement in case of
+        /// S3('url', NOSIGN, 'format' [, 'compression'] [, extra_credentials(..)] [, headers(..)])
+        /// S3('url', 'format', 'compression' [, extra_credentials(..)] [, headers(..)])
+        size_t count = excludeS3OrURLNestedMaps();
+        if ((3 <= count) && (count <= 4))
+        {
+            String second_arg;
+            if (tryGetStringFromArgument(1, &second_arg))
+            {
+                if (boost::iequals(second_arg, "NOSIGN"))
+                    return; /// The argument after 'url' is "NOSIGN".
+
+                if (count == 3)
+                {
+                    if (second_arg == "auto" || KnownFormatNames::instance().exists(second_arg))
+                        return; /// The argument after 'url' is a format: S3('url', 'format', ...)
+                }
+            }
+        }
+
+        /// We replace 'aws_secret_access_key' with '[HIDDEN]' for the following signatures:
+        /// 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')
+        if (2 < count)
+            markSecretArgument(2);
+    }
+
+    void findDatabaseEngineSecretArguments()
+    {
+        const String & engine_name = function.name;
+        if ((engine_name == "MySQL") || (engine_name == "MaterializeMySQL") ||
+            (engine_name == "MaterializedMySQL") || (engine_name == "PostgreSQL") ||
+            (engine_name == "MaterializedPostgreSQL"))
+        {
+            /// MySQL('host:port', 'database', 'user', 'password')
+            /// PostgreSQL('host:port', 'database', 'user', 'password')
+            findMySQLDatabaseSecretArguments();
+        }
+        else if (engine_name == "S3")
+        {
+            /// S3('url', 'access_key_id', 'secret_access_key')
+            findS3DatabaseSecretArguments();
+        }
+    }
+
+    void findMySQLDatabaseSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// MySQL(named_collection, ..., password = 'password', ...)
+            findSecretNamedArgument("password", 1);
+        }
+        else
+        {
+            /// MySQL('host:port', 'database', 'user', 'password')
+            markSecretArgument(3);
+        }
+    }
+
+    void findS3DatabaseSecretArguments()
+    {
+        if (isNamedCollectionName(0))
+        {
+            /// S3(named_collection, ..., secret_access_key = 'password', ...)
+            findSecretNamedArgument("secret_access_key", 1);
+        }
+        else
+        {
+            /// S3('url', 'access_key_id', 'secret_access_key')
+            markSecretArgument(2);
+        }
+    }
+
+    void findBackupNameSecretArguments()
+    {
+        const String & engine_name = function.name;
+        if (engine_name == "S3")
+        {
+            /// BACKUP ... TO S3(url, [aws_access_key_id, aws_secret_access_key])
+            markSecretArgument(2);
+        }
+    }
+
+    /// Whether a specified argument can be the name of a named collection?
+    bool isNamedCollectionName(size_t arg_idx) const
+    {
+        if (arguments->size() <= arg_idx)
+            return false;
+
+        const auto * identifier = (*arguments)[arg_idx]->as<ASTIdentifier>();
+        return identifier != nullptr;
+    }
+
+    /// Looks for a secret argument with a specified name. This function looks for arguments in format `key=value` where the key is specified.
+    void findSecretNamedArgument(const std::string_view & key, size_t start = 0)
+    {
+        for (size_t i = start; i < arguments->size(); ++i)
+        {
+            const auto & argument = (*arguments)[i];
+            const auto * equals_func = argument->as<ASTFunction>();
+            if (!equals_func || (equals_func->name != "equals"))
+                continue;
+
+            const auto * expr_list = equals_func->arguments->as<ASTExpressionList>();
+            if (!expr_list)
+                continue;
+
+            const auto & equal_args = expr_list->children;
+            if (equal_args.size() != 2)
+                continue;
+
+            String found_key;
+            if (!tryGetStringFromArgument(*equal_args[0], &found_key))
+                continue;
+
+            if (found_key == key)
+                markSecretArgument(i, /* argument_is_named= */ true);
+        }
+    }
+};
+
+}
diff --git a/src/Parsers/IAST.h b/src/Parsers/IAST.h
index fa2b3b0d1c0..ee70fed0f07 100644
--- a/src/Parsers/IAST.h
+++ b/src/Parsers/IAST.h
@@ -256,6 +256,7 @@ public:
         bool expression_list_always_start_on_new_line = false;  /// Line feed and indent before expression list even if it's of single element.
         bool expression_list_prepend_whitespace = false; /// Prepend whitespace (if it is required)
         bool surround_each_list_element_with_parens = false;
+        size_t list_element_index = 0;
         const IAST * current_select = nullptr;
     };
 
diff --git a/src/Parsers/IAST_fwd.h b/src/Parsers/IAST_fwd.h
index 53d41d42d65..ff66d42dba3 100644
--- a/src/Parsers/IAST_fwd.h
+++ b/src/Parsers/IAST_fwd.h
@@ -18,7 +18,7 @@ using ASTs = absl::InlinedVector<ASTPtr, 7>;
 namespace std
 {
 
-inline typename DB::ASTs::size_type erase(DB::ASTs & asts, const DB::ASTPtr & element)
+inline typename DB::ASTs::size_type erase(DB::ASTs & asts, const DB::ASTPtr & element) /// NOLINT(cert-dcl58-cpp)
 {
     auto old_size = asts.size();
     asts.erase(std::remove(asts.begin(), asts.end(), element), asts.end());
@@ -26,7 +26,7 @@ inline typename DB::ASTs::size_type erase(DB::ASTs & asts, const DB::ASTPtr & el
 }
 
 template <class Predicate>
-inline typename DB::ASTs::size_type erase_if(DB::ASTs & asts, Predicate pred)
+inline typename DB::ASTs::size_type erase_if(DB::ASTs & asts, Predicate pred) /// NOLINT(cert-dcl58-cpp)
 {
     auto old_size = asts.size();
     asts.erase(std::remove_if(asts.begin(), asts.end(), pred), asts.end());
diff --git a/src/Parsers/IParser.cpp b/src/Parsers/IParser.cpp
new file mode 100644
index 00000000000..41981a4bb8a
--- /dev/null
+++ b/src/Parsers/IParser.cpp
@@ -0,0 +1,35 @@
+#include <Parsers/IParser.h>
+#include <iostream>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int TOO_SLOW_PARSING;
+}
+
+IParser::Pos & IParser::Pos::operator=(const IParser::Pos & rhs)
+{
+    depth = rhs.depth;
+    max_depth = rhs.max_depth;
+
+    if (rhs.backtracks > backtracks)
+        backtracks = rhs.backtracks;
+
+    max_backtracks = rhs.max_backtracks;
+
+    if (rhs < *this)
+    {
+        ++backtracks;
+        if (max_backtracks && backtracks > max_backtracks)
+            throw Exception(ErrorCodes::TOO_SLOW_PARSING, "Maximum amount of backtracking ({}) exceeded in the parser. "
+                "Consider rising max_parser_backtracks parameter.", max_backtracks);
+    }
+
+    TokenIterator::operator=(rhs);
+
+    return *this;
+}
+
+}
diff --git a/src/Parsers/IParser.h b/src/Parsers/IParser.h
index d53b58baa7c..291f8ee7d44 100644
--- a/src/Parsers/IParser.h
+++ b/src/Parsers/IParser.h
@@ -9,6 +9,7 @@
 #include <Parsers/TokenIterator.h>
 #include <base/types.h>
 #include <Common/Exception.h>
+#include <Common/checkStackSize.h>
 
 
 namespace DB
@@ -61,11 +62,18 @@ public:
         uint32_t depth = 0;
         uint32_t max_depth = 0;
 
-        Pos(Tokens & tokens_, uint32_t max_depth_) : TokenIterator(tokens_), max_depth(max_depth_)
+        uint32_t backtracks = 0;
+        uint32_t max_backtracks = 0;
+
+        Pos(Tokens & tokens_, uint32_t max_depth_, uint32_t max_backtracks_)
+            : TokenIterator(tokens_), max_depth(max_depth_), max_backtracks(max_backtracks_)
         {
         }
 
-        Pos(TokenIterator token_iterator_, uint32_t max_depth_) : TokenIterator(token_iterator_), max_depth(max_depth_) { }
+        Pos(TokenIterator token_iterator_, uint32_t max_depth_, uint32_t max_backtracks_)
+            : TokenIterator(token_iterator_), max_depth(max_depth_), max_backtracks(max_backtracks_)
+        {
+        }
 
         ALWAYS_INLINE void increaseDepth()
         {
@@ -73,6 +81,21 @@ public:
             if (unlikely(max_depth > 0 && depth > max_depth))
                 throw Exception(ErrorCodes::TOO_DEEP_RECURSION, "Maximum parse depth ({}) exceeded. "
                     "Consider rising max_parser_depth parameter.", max_depth);
+
+            /** Sometimes the maximum parser depth can be set to a high value by the user,
+              * but we still want to avoid stack overflow.
+              * For this purpose, we can use the checkStackSize function, but it is too heavy.
+              * The solution is to check not too frequently.
+              * The frequency is arbitrary, but not too large, not too small,
+              * and a power of two to simplify the division.
+              */
+#if defined(USE_MUSL) || defined(SANITIZER) || !defined(NDEBUG)
+            static constexpr uint32_t check_frequency = 128;
+#else
+            static constexpr uint32_t check_frequency = 8192;
+#endif
+            if (depth % check_frequency == 0)
+                checkStackSize();
         }
 
         ALWAYS_INLINE void decreaseDepth()
@@ -81,6 +104,10 @@ public:
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error in parser: incorrect calculation of parse depth");
             --depth;
         }
+
+        Pos(const Pos & rhs) = default;
+
+        Pos & operator=(const Pos & rhs);
     };
 
     /** Get the text of this parser parses. */
diff --git a/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.cpp b/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.cpp
index 6ef4a52ceff..1d77007a37c 100644
--- a/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.cpp
@@ -73,7 +73,7 @@ bool IParserKQLFunction::directMapping(
 
     int argument_count = 0;
     const auto begin = pos;
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         if (pos != begin)
             out.append(", ");
@@ -148,11 +148,11 @@ String IParserKQLFunction::getConvertedArgument(const String & fn_name, IParser:
     if (pos->type == TokenType::ClosingRoundBracket || pos->type == TokenType::ClosingSquareBracket)
         return {};
 
-    if (pos->isEnd() || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
+    if (!isValidKQLPos(pos) || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Need more argument(s) in function: {}", fn_name);
 
     std::vector<String> tokens;
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         if (pos->type == TokenType::OpeningRoundBracket)
             ++round_bracket_count;
@@ -191,7 +191,7 @@ String IParserKQLFunction::getConvertedArgument(const String & fn_name, IParser:
                 {
                     ++pos;
                     String array_index;
-                    while (!pos->isEnd() && pos->type != TokenType::ClosingSquareBracket)
+                    while (isValidKQLPos(pos) && pos->type != TokenType::ClosingSquareBracket)
                     {
                         array_index += getExpression(pos);
                         ++pos;
@@ -246,7 +246,7 @@ IParserKQLFunction::getOptionalArgument(const String & function_name, DB::IParse
 
     const auto * begin = pos->begin;
     std::stack<DB::TokenType> scopes;
-    while (!pos->isEnd() && (!scopes.empty() || (pos->type != DB::TokenType::Comma && pos->type != DB::TokenType::ClosingRoundBracket)))
+    while (isValidKQLPos(pos) && (!scopes.empty() || (pos->type != DB::TokenType::Comma && pos->type != DB::TokenType::ClosingRoundBracket)))
     {
         const auto token_type = pos->type;
         if (isOpeningBracket(token_type))
@@ -279,13 +279,13 @@ String IParserKQLFunction::getKQLFunctionName(IParser::Pos & pos)
 }
 
 String IParserKQLFunction::kqlCallToExpression(
-    const std::string_view function_name, const std::initializer_list<const std::string_view> params, const uint32_t max_depth)
+    const std::string_view function_name, const std::initializer_list<const std::string_view> params, uint32_t max_depth, uint32_t max_backtracks)
 {
-    return kqlCallToExpression(function_name, std::span(params), max_depth);
+    return kqlCallToExpression(function_name, std::span(params), max_depth, max_backtracks);
 }
 
 String IParserKQLFunction::kqlCallToExpression(
-    const std::string_view function_name, const std::span<const std::string_view> params, const uint32_t max_depth)
+    const std::string_view function_name, const std::span<const std::string_view> params, uint32_t max_depth, uint32_t max_backtracks)
 {
     const auto params_str = std::accumulate(
         std::cbegin(params),
@@ -302,7 +302,7 @@ String IParserKQLFunction::kqlCallToExpression(
 
     const auto kql_call = std::format("{}({})", function_name, params_str);
     DB::Tokens call_tokens(kql_call.c_str(), kql_call.c_str() + kql_call.length());
-    DB::IParser::Pos tokens_pos(call_tokens, max_depth);
+    DB::IParser::Pos tokens_pos(call_tokens, max_depth, max_backtracks);
     return DB::IParserKQLFunction::getExpression(tokens_pos);
 }
 
@@ -357,7 +357,7 @@ String IParserKQLFunction::getExpression(IParser::Pos & pos)
     {
         ++pos;
         String array_index;
-        while (!pos->isEnd() && pos->type != TokenType::ClosingSquareBracket)
+        while (isValidKQLPos(pos) && pos->type != TokenType::ClosingSquareBracket)
         {
             array_index += getExpression(pos);
             ++pos;
diff --git a/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.h b/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.h
index 147436551f9..f5069e80745 100644
--- a/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.h
+++ b/src/Parsers/Kusto/KustoFunctions/IParserKQLFunction.h
@@ -77,8 +77,8 @@ public:
     static std::optional<String>
     getOptionalArgument(const String & function_name, DB::IParser::Pos & pos, ArgumentState argument_state = ArgumentState::Parsed);
     static String
-    kqlCallToExpression(std::string_view function_name, std::initializer_list<const std::string_view> params, uint32_t max_depth);
-    static String kqlCallToExpression(std::string_view function_name, std::span<const std::string_view> params, uint32_t max_depth);
+    kqlCallToExpression(std::string_view function_name, std::initializer_list<const std::string_view> params, uint32_t max_depth, uint32_t max_backtracks);
+    static String kqlCallToExpression(std::string_view function_name, std::span<const std::string_view> params, uint32_t max_depth, uint32_t max_backtracks);
     static String escapeSingleQuotes(const String & input);
 
 protected:
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLCastingFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLCastingFunctions.cpp
index b0eec16f56f..87841e295ba 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLCastingFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLCastingFunctions.cpp
@@ -99,7 +99,7 @@ bool ToTimeSpan::convertImpl(String & out, IParser::Pos & pos)
         ++pos;
         try
         {
-            auto result = kqlCallToExpression("time", {arg}, pos.max_depth);
+            auto result = kqlCallToExpression("time", {arg}, pos.max_depth, pos.max_backtracks);
             out = std::format("{}", result);
         }
         catch (...)
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLDataTypeFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLDataTypeFunctions.cpp
index 8530fa6623d..cca4fb3ce33 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLDataTypeFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLDataTypeFunctions.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/Kusto/ParserKQLDateTypeTimespan.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLStatement.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSetQuery.h>
 #include "Poco/String.h"
 #include <format>
@@ -51,7 +52,7 @@ bool DatatypeDatetime::convertImpl(String & out, IParser::Pos & pos)
     else
     {
         auto start = pos;
-        while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+        while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
         {
             ++pos;
             if (pos->type == TokenType::ClosingRoundBracket)
@@ -77,7 +78,7 @@ bool DatatypeDynamic::convertImpl(String & out, IParser::Pos & pos)
     if (pos->type == TokenType::OpeningCurlyBrace)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Property bags are not supported for now in {}", function_name);
 
-    while (!pos->isEnd() && pos->type != TokenType::ClosingRoundBracket)
+    while (isValidKQLPos(pos) && pos->type != TokenType::ClosingRoundBracket)
     {
         if (const auto token_type = pos->type; token_type == TokenType::BareWord || token_type == TokenType::Number
             || token_type == TokenType::QuotedIdentifier || token_type == TokenType::StringLiteral)
@@ -117,7 +118,7 @@ bool DatatypeGuid::convertImpl(String & out, IParser::Pos & pos)
     else
     {
         auto start = pos;
-        while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+        while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
         {
             ++pos;
             if (pos->type == TokenType::ClosingRoundBracket)
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLDateTimeFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLDateTimeFunctions.cpp
index e5f40ee604d..f059fd9aa6b 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLDateTimeFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLDateTimeFunctions.cpp
@@ -14,6 +14,7 @@
 #include <Parsers/Kusto/KustoFunctions/KQLTimeSeriesFunctions.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLStatement.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSetQuery.h>
 #include "Poco/String.h"
 namespace DB::ErrorCodes
@@ -521,7 +522,7 @@ bool MakeTimeSpan::convertImpl(String & out, IParser::Pos & pos)
     String second;
     int arg_count = 0;
     std::vector<String> args;
-    while (!pos->isEnd() && pos->type != TokenType::ClosingRoundBracket)
+    while (isValidKQLPos(pos) && pos->type != TokenType::ClosingRoundBracket)
     {
         String arg = getConvertedArgument(fn_name, pos);
         args.insert(args.begin(), arg);
@@ -588,7 +589,7 @@ bool MakeDateTime::convertImpl(String & out, IParser::Pos & pos)
     String arguments;
     int arg_count = 0;
 
-    while (!pos->isEnd() && pos->type != TokenType::ClosingRoundBracket)
+    while (isValidKQLPos(pos) && pos->type != TokenType::ClosingRoundBracket)
     {
         String arg = getConvertedArgument(fn_name, pos);
         if (pos->type == TokenType::Comma)
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLDynamicFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLDynamicFunctions.cpp
index 924ac9f6490..e90be363e4b 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLDynamicFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLDynamicFunctions.cpp
@@ -99,7 +99,7 @@ bool ArrayRotateRight::convertImpl(String & out, IParser::Pos & pos)
 
     const auto array = getArgument(function_name, pos, ArgumentState::Raw);
     const auto count = getArgument(function_name, pos, ArgumentState::Raw);
-    out = kqlCallToExpression("array_rotate_left", {array, "-1 * " + count}, pos.max_depth);
+    out = kqlCallToExpression("array_rotate_left", {array, "-1 * " + count}, pos.max_depth, pos.max_backtracks);
 
     return true;
 }
@@ -140,7 +140,7 @@ bool ArrayShiftRight::convertImpl(String & out, IParser::Pos & pos)
         "array_shift_left",
         fill ? std::initializer_list<std::string_view>{array, negated_count, *fill}
              : std::initializer_list<std::string_view>{array, negated_count},
-        pos.max_depth);
+        pos.max_depth, pos.max_backtracks);
 
     return true;
 }
@@ -233,8 +233,8 @@ bool JaccardIndex::convertImpl(String & out, IParser::Pos & pos)
     const auto rhs = getArgument(function_name, pos, ArgumentState::Raw);
     out = std::format(
         "divide(length({0}), length({1}))",
-        kqlCallToExpression("set_intersect", {lhs, rhs}, pos.max_depth),
-        kqlCallToExpression("set_union", {lhs, rhs}, pos.max_depth));
+        kqlCallToExpression("set_intersect", {lhs, rhs}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("set_union", {lhs, rhs}, pos.max_depth, pos.max_backtracks));
 
     return true;
 }
@@ -292,7 +292,7 @@ bool SetDifference::convertImpl(String & out, IParser::Pos & pos)
             while (auto next_array = getOptionalArgument(function_name, pos, ArgumentState::Raw))
                 arrays.push_back(*next_array);
 
-            return kqlCallToExpression("set_union", std::vector<std::string_view>(arrays.cbegin(), arrays.cend()), pos.max_depth);
+            return kqlCallToExpression("set_union", std::vector<std::string_view>(arrays.cbegin(), arrays.cend()), pos.max_depth, pos.max_backtracks);
         });
 
     out = std::format("arrayFilter(x -> not has({1}, x), arrayDistinct({0}))", lhs, rhs);
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLFunctionFactory.cpp b/src/Parsers/Kusto/KustoFunctions/KQLFunctionFactory.cpp
index adac892b49d..044cc2e0622 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLFunctionFactory.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLFunctionFactory.cpp
@@ -359,7 +359,7 @@ std::unique_ptr<IParserKQLFunction> KQLFunctionFactory::get(String & kql_functio
             return std::make_unique<ExtractAll>();
 
         case KQLFunctionValue::extract_json:
-            return std::make_unique<ExtractJson>();
+            return std::make_unique<ExtractJSON>();
 
         case KQLFunctionValue::has_any_index:
             return std::make_unique<HasAnyIndex>();
@@ -389,7 +389,7 @@ std::unique_ptr<IParserKQLFunction> KQLFunctionFactory::get(String & kql_functio
             return std::make_unique<ParseCSV>();
 
         case KQLFunctionValue::parse_json:
-            return std::make_unique<ParseJson>();
+            return std::make_unique<ParseJSON>();
 
         case KQLFunctionValue::parse_url:
             return std::make_unique<ParseURL>();
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLIPFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLIPFunctions.cpp
index 6f853b16fbc..06566dc54ec 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLIPFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLIPFunctions.cpp
@@ -34,10 +34,10 @@ bool Ipv4Compare::convertImpl(String & out, IParser::Pos & pos)
         "sign(IPv4StringToNumOrNull(toString((tupleElement(IPv4CIDRToRange(assumeNotNull(lhs_ip_{5}), "
         "toUInt8(min2({4}, min2(assumeNotNull(lhs_mask_{5}), assumeNotNull(rhs_mask_{5})))) as mask_{5}), 1))))"
         "   - IPv4StringToNumOrNull(toString((tupleElement(IPv4CIDRToRange(assumeNotNull(rhs_ip_{5}), mask_{5}), 1))))))",
-        kqlCallToExpression("parse_ipv4", {lhs}, pos.max_depth),
-        kqlCallToExpression("ipv4_netmask_suffix", {lhs}, pos.max_depth),
-        kqlCallToExpression("parse_ipv4", {rhs}, pos.max_depth),
-        kqlCallToExpression("ipv4_netmask_suffix", {rhs}, pos.max_depth),
+        kqlCallToExpression("parse_ipv4", {lhs}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("ipv4_netmask_suffix", {lhs}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("parse_ipv4", {rhs}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("ipv4_netmask_suffix", {rhs}, pos.max_depth, pos.max_backtracks),
         mask ? *mask : "32",
         generateUniqueIdentifier());
     return true;
@@ -56,8 +56,8 @@ bool Ipv4IsInRange::convertImpl(String & out, IParser::Pos & pos)
         "or isNull({1} as range_start_ip_{3}) or isNull({2} as range_mask_{3}), null, "
         "bitXor(range_start_ip_{3}, bitAnd(ip_{3}, bitNot(toUInt32(intExp2(toInt32(32 - range_mask_{3})) - 1)))) = 0) ",
         ip_address,
-        kqlCallToExpression("parse_ipv4", {ip_range}, pos.max_depth),
-        kqlCallToExpression("ipv4_netmask_suffix", {ip_range}, pos.max_depth),
+        kqlCallToExpression("parse_ipv4", {ip_range}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("ipv4_netmask_suffix", {ip_range}, pos.max_depth, pos.max_backtracks),
         generateUniqueIdentifier());
     return true;
 }
@@ -71,7 +71,7 @@ bool Ipv4IsMatch::convertImpl(String & out, IParser::Pos & pos)
     const auto lhs = getArgument(function_name, pos, ArgumentState::Raw);
     const auto rhs = getArgument(function_name, pos, ArgumentState::Raw);
     const auto mask = getOptionalArgument(function_name, pos, ArgumentState::Raw);
-    out = std::format("equals({}, 0)", kqlCallToExpression("ipv4_compare", {lhs, rhs, mask ? *mask : "32"}, pos.max_depth));
+    out = std::format("equals({}, 0)", kqlCallToExpression("ipv4_compare", {lhs, rhs, mask ? *mask : "32"}, pos.max_depth, pos.max_backtracks));
     return true;
 }
 
@@ -196,7 +196,7 @@ bool Ipv6IsMatch::convertImpl(String & out, IParser::Pos & pos)
     const auto lhs = getArgument(function_name, pos, ArgumentState::Raw);
     const auto rhs = getArgument(function_name, pos, ArgumentState::Raw);
     const auto mask = getOptionalArgument(function_name, pos, ArgumentState::Raw);
-    out = std::format("equals({}, 0)", kqlCallToExpression("ipv6_compare", {lhs, rhs, mask ? *mask : "128"}, pos.max_depth));
+    out = std::format("equals({}, 0)", kqlCallToExpression("ipv6_compare", {lhs, rhs, mask ? *mask : "128"}, pos.max_depth, pos.max_backtracks));
     return true;
 }
 
@@ -228,9 +228,9 @@ bool ParseIpv6Mask::convertImpl(String & out, IParser::Pos & pos)
     const auto unique_identifier = generateUniqueIdentifier();
     out = std::format(
         "if(empty({0} as ipv4_{3}), {1}, {2})",
-        kqlCallToExpression("format_ipv4", {"trim_start('::', " + ip_address + ")", mask + " - 96"}, pos.max_depth),
-        kqlCallToExpression("parse_ipv6", {"strcat(tostring(parse_ipv6(" + ip_address + ")), '/', tostring(" + mask + "))"}, pos.max_depth),
-        kqlCallToExpression("parse_ipv6", {"ipv4_" + unique_identifier}, pos.max_depth),
+        kqlCallToExpression("format_ipv4", {"trim_start('::', " + ip_address + ")", mask + " - 96"}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("parse_ipv6", {"strcat(tostring(parse_ipv6(" + ip_address + ")), '/', tostring(" + mask + "))"}, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("parse_ipv6", {"ipv4_" + unique_identifier}, pos.max_depth, pos.max_backtracks),
         unique_identifier);
     return true;
 }
@@ -247,9 +247,9 @@ bool FormatIpv4::convertImpl(String & out, IParser::Pos & pos)
         "ifNull(if(isNotNull(toUInt32OrNull(toString({0})) as param_as_uint32_{3}) and toTypeName({0}) = 'String' or ({1}) < 0 "
         "or isNull(ifNull(param_as_uint32_{3}, {2}) as ip_as_number_{3}), null, "
         "IPv4NumToString(bitAnd(ip_as_number_{3}, bitNot(toUInt32(intExp2(toInt32(32 - ({1}))) - 1))))), '')",
-        ParserKQLBase::getExprFromToken(ip_address, pos.max_depth),
+        ParserKQLBase::getExprFromToken(ip_address, pos.max_depth, pos.max_backtracks),
         mask ? *mask : "32",
-        kqlCallToExpression("parse_ipv4", {"tostring(" + ip_address + ")"}, pos.max_depth),
+        kqlCallToExpression("parse_ipv4", {"tostring(" + ip_address + ")"}, pos.max_depth, pos.max_backtracks),
         generateUniqueIdentifier());
     return true;
 }
@@ -266,10 +266,10 @@ bool FormatIpv4Mask::convertImpl(String & out, IParser::Pos & pos)
     out = std::format(
         "if(empty({1} as formatted_ip_{2}) or position(toTypeName({0}), 'Int') = 0 or not {0} between 0 and 32, '', "
         "concat(formatted_ip_{2}, '/', toString(toInt64(min2({0}, ifNull({3} as suffix_{2}, 32))))))",
-        ParserKQLBase::getExprFromToken(calculated_mask, pos.max_depth),
-        kqlCallToExpression("format_ipv4", {ip_address, calculated_mask}, pos.max_depth),
+        ParserKQLBase::getExprFromToken(calculated_mask, pos.max_depth, pos.max_backtracks),
+        kqlCallToExpression("format_ipv4", {ip_address, calculated_mask}, pos.max_depth, pos.max_backtracks),
         generateUniqueIdentifier(),
-        kqlCallToExpression("ipv4_netmask_suffix", {"tostring(" + ip_address + ")"}, pos.max_depth));
+        kqlCallToExpression("ipv4_netmask_suffix", {"tostring(" + ip_address + ")"}, pos.max_depth, pos.max_backtracks));
     return true;
 }
 }
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.cpp b/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.cpp
index 0f9ca67d6dc..991a3139fcb 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.cpp
+++ b/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.cpp
@@ -3,7 +3,7 @@
 #include <Parsers/Kusto/KustoFunctions/IParserKQLFunction.h>
 #include <Parsers/Kusto/KustoFunctions/KQLFunctionFactory.h>
 #include <Parsers/Kusto/KustoFunctions/KQLStringFunctions.h>
-
+#include <Parsers/Kusto/Utilities.h>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <Poco/String.h>
@@ -102,7 +102,7 @@ bool CountOf::convertImpl(String & out, IParser::Pos & pos)
 
 bool Extract::convertImpl(String & out, IParser::Pos & pos)
 {
-    ParserKeyword s_kql("typeof");
+    ParserKeyword s_kql(Keyword::TYPEOF);
     ParserToken open_bracket(TokenType::OpeningRoundBracket);
     ParserToken close_bracket(TokenType::ClosingRoundBracket);
     Expected expected;
@@ -240,10 +240,10 @@ bool ExtractAll::convertImpl(String & out, IParser::Pos & pos)
     return true;
 }
 
-bool ExtractJson::convertImpl(String & out, IParser::Pos & pos)
+bool ExtractJSON::convertImpl(String & out, IParser::Pos & pos)
 {
     String datatype = "String";
-    ParserKeyword s_kql("typeof");
+    ParserKeyword s_kql(Keyword::TYPEOF);
     ParserToken open_bracket(TokenType::OpeningRoundBracket);
     ParserToken close_bracket(TokenType::ClosingRoundBracket);
     Expected expected;
@@ -431,7 +431,7 @@ bool ParseCSV::convertImpl(String & out, IParser::Pos & pos)
     return true;
 }
 
-bool ParseJson::convertImpl(String & out, IParser::Pos & pos)
+bool ParseJSON::convertImpl(String & out, IParser::Pos & pos)
 {
     const String fn_name = getKQLFunctionName(pos);
     if (fn_name.empty())
@@ -442,7 +442,7 @@ bool ParseJson::convertImpl(String & out, IParser::Pos & pos)
     {
         --pos;
         auto arg = getArgument(fn_name, pos);
-        auto result = kqlCallToExpression("dynamic", {arg}, pos.max_depth);
+        auto result = kqlCallToExpression("dynamic", {arg}, pos.max_depth, pos.max_backtracks);
         out = std::format("{}", result);
     }
     else
@@ -590,7 +590,7 @@ bool StrCatDelim::convertImpl(String & out, IParser::Pos & pos)
     int arg_count = 0;
     String args;
 
-    while (!pos->isEnd() && pos->type != TokenType::Semicolon && pos->type != TokenType::ClosingRoundBracket)
+    while (isValidKQLPos(pos) && pos->type != TokenType::Semicolon && pos->type != TokenType::ClosingRoundBracket)
     {
         ++pos;
         String arg = getConvertedArgument(fn_name, pos);
@@ -729,7 +729,7 @@ bool Trim::convertImpl(String & out, IParser::Pos & pos)
 
     const auto regex = getArgument(fn_name, pos, ArgumentState::Raw);
     const auto source = getArgument(fn_name, pos, ArgumentState::Raw);
-    out = kqlCallToExpression("trim_start", {regex, std::format("trim_end({0}, {1})", regex, source)}, pos.max_depth);
+    out = kqlCallToExpression("trim_start", {regex, std::format("trim_end({0}, {1})", regex, source)}, pos.max_depth, pos.max_backtracks);
 
     return true;
 }
diff --git a/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.h b/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.h
index 492a59263ec..9b0c6327e01 100644
--- a/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.h
+++ b/src/Parsers/Kusto/KustoFunctions/KQLStringFunctions.h
@@ -62,7 +62,7 @@ protected:
     bool convertImpl(String & out, IParser::Pos & pos) override;
 };
 
-class ExtractJson : public IParserKQLFunction
+class ExtractJSON : public IParserKQLFunction
 {
 protected:
     const char * getName() const override { return "extract_json(), extractjson()"; }
@@ -125,7 +125,7 @@ protected:
     bool convertImpl(String & out, IParser::Pos & pos) override;
 };
 
-class ParseJson : public IParserKQLFunction
+class ParseJSON : public IParserKQLFunction
 {
 protected:
     const char * getName() const override { return "parse_json()"; }
diff --git a/src/Parsers/Kusto/ParserKQLDistinct.cpp b/src/Parsers/Kusto/ParserKQLDistinct.cpp
index 2de4d2c28e7..3ec823a61b5 100644
--- a/src/Parsers/Kusto/ParserKQLDistinct.cpp
+++ b/src/Parsers/Kusto/ParserKQLDistinct.cpp
@@ -12,7 +12,7 @@ bool ParserKQLDistinct::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     expr = getExprFromToken(pos);
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     if (!ParserNotEmptyExpressionList(false).parse(new_pos, select_expression_list, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLExtend.cpp b/src/Parsers/Kusto/ParserKQLExtend.cpp
index ac5beb80576..41ce296bd25 100644
--- a/src/Parsers/Kusto/ParserKQLExtend.cpp
+++ b/src/Parsers/Kusto/ParserKQLExtend.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/Kusto/ParserKQLOperators.h>
 #include <Parsers/Kusto/ParserKQLProject.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSelectQuery.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 
@@ -22,7 +23,7 @@ bool ParserKQLExtend ::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     String except_str;
     String new_extend_str;
     Tokens ntokens(extend_expr.c_str(), extend_expr.c_str() + extend_expr.size());
-    IParser::Pos npos(ntokens, pos.max_depth);
+    IParser::Pos npos(ntokens, pos.max_depth, pos.max_backtracks);
 
     String alias;
 
@@ -44,7 +45,7 @@ bool ParserKQLExtend ::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     int32_t round_bracket_count = 0;
     int32_t square_bracket_count = 0;
-    while (!npos->isEnd())
+    while (isValidKQLPos(npos))
     {
         if (npos->type == TokenType::OpeningRoundBracket)
             ++round_bracket_count;
@@ -76,7 +77,7 @@ bool ParserKQLExtend ::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     String expr = std::format("SELECT * {}, {} from prev", except_str, new_extend_str);
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     if (!ParserSelectQuery().parse(new_pos, select_query, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLFilter.cpp b/src/Parsers/Kusto/ParserKQLFilter.cpp
index 74d8610ecd4..b060ce8d2c7 100644
--- a/src/Parsers/Kusto/ParserKQLFilter.cpp
+++ b/src/Parsers/Kusto/ParserKQLFilter.cpp
@@ -14,7 +14,7 @@ bool ParserKQLFilter::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ASTPtr where_expression;
 
     Tokens token_filter(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos pos_filter(token_filter, pos.max_depth);
+    IParser::Pos pos_filter(token_filter, pos.max_depth, pos.max_backtracks);
     if (!ParserExpressionWithOptionalAlias(false).parse(pos_filter, where_expression, expected))
         return false;
 
diff --git a/src/Parsers/Kusto/ParserKQLLimit.cpp b/src/Parsers/Kusto/ParserKQLLimit.cpp
index 910f0e8e1a3..0eb460757b1 100644
--- a/src/Parsers/Kusto/ParserKQLLimit.cpp
+++ b/src/Parsers/Kusto/ParserKQLLimit.cpp
@@ -14,7 +14,7 @@ bool ParserKQLLimit::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     auto expr = getExprFromToken(pos);
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     if (!ParserExpressionWithOptionalAlias(false).parse(new_pos, limit_length, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLMVExpand.cpp b/src/Parsers/Kusto/ParserKQLMVExpand.cpp
index bf5fbe64d0b..9beb1c39e34 100644
--- a/src/Parsers/Kusto/ParserKQLMVExpand.cpp
+++ b/src/Parsers/Kusto/ParserKQLMVExpand.cpp
@@ -7,6 +7,7 @@
 #include <Parsers/Kusto/ParserKQLMakeSeries.h>
 #include <Parsers/Kusto/ParserKQLOperators.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSelectQuery.h>
 #include <Parsers/ParserSetQuery.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
@@ -38,8 +39,8 @@ bool ParserKQLMVExpand::parseColumnArrayExprs(ColumnArrayExprs & column_array_ex
     ParserToken close_bracket(TokenType::ClosingRoundBracket);
     ParserToken comma(TokenType::Comma);
 
-    ParserKeyword s_to("to");
-    ParserKeyword s_type("typeof");
+    ParserKeyword s_to(Keyword::TO);
+    ParserKeyword s_type(Keyword::TYPEOF);
     uint16_t bracket_count = 0;
     Pos expr_begin_pos = pos;
     Pos expr_end_pos = pos;
@@ -49,7 +50,7 @@ bool ParserKQLMVExpand::parseColumnArrayExprs(ColumnArrayExprs & column_array_ex
     String to_type;
     --expr_end_pos;
 
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         if (pos->type == TokenType::OpeningRoundBracket)
             ++bracket_count;
@@ -68,7 +69,7 @@ bool ParserKQLMVExpand::parseColumnArrayExprs(ColumnArrayExprs & column_array_ex
 
         auto add_columns = [&]
         {
-            column_array_expr = getExprFromToken(String(expr_begin_pos->begin, expr_end_pos->end), pos.max_depth);
+            column_array_expr = getExprFromToken(String(expr_begin_pos->begin, expr_end_pos->end), pos.max_depth, pos.max_backtracks);
 
             if (alias.empty())
             {
@@ -125,9 +126,9 @@ bool ParserKQLMVExpand::parseColumnArrayExprs(ColumnArrayExprs & column_array_ex
 
         if (String(pos->begin, pos->end) == "limit")
             break;
-        if (!pos->isEnd())
+        if (isValidKQLPos(pos))
             ++pos;
-        if (pos->isEnd() || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
+        if (!isValidKQLPos(pos) || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
         {
             if (expr_end_pos < expr_begin_pos)
             {
@@ -143,10 +144,10 @@ bool ParserKQLMVExpand::parseColumnArrayExprs(ColumnArrayExprs & column_array_ex
 
 bool ParserKQLMVExpand::parserMVExpand(KQLMVExpand & kql_mv_expand, Pos & pos, Expected & expected)
 {
-    ParserKeyword s_bagexpansion("bagexpansion");
-    ParserKeyword s_kind("kind");
-    ParserKeyword s_with_itemindex("with_itemindex");
-    ParserKeyword s_limit("limit");
+    ParserKeyword s_bagexpansion(Keyword::BAGEXPANSION);
+    ParserKeyword s_kind(Keyword::KIND);
+    ParserKeyword s_with_itemindex(Keyword::WITH_ITEMINDEX);
+    ParserKeyword s_limit(Keyword::LIMIT);
 
     ParserToken equals(TokenType::Equals);
     ParserToken comma(TokenType::Comma);
@@ -188,7 +189,7 @@ bool ParserKQLMVExpand::parserMVExpand(KQLMVExpand & kql_mv_expand, Pos & pos, E
     return true;
 }
 
-bool ParserKQLMVExpand::genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_node, int32_t max_depth)
+bool ParserKQLMVExpand::genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks)
 {
     String expand_str;
     String cast_type_column_remove, cast_type_column_rename;
@@ -252,7 +253,7 @@ bool ParserKQLMVExpand::genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_no
     if (cast_type_column_remove.empty())
     {
         query = std::format("Select {} {} From {} {}", columns, extra_columns, input, expand_str);
-        if (!parseSQLQueryByString(std::make_unique<ParserSelectQuery>(), query, sub_query_node, max_depth))
+        if (!parseSQLQueryByString(std::make_unique<ParserSelectQuery>(), query, sub_query_node, max_depth, max_backtracks))
             return false;
         if (!setSubQuerySource(sub_query_node, select_node, false, false))
             return false;
@@ -261,14 +262,14 @@ bool ParserKQLMVExpand::genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_no
     else
     {
         query = std::format("(Select {} {} From {} {})", columns, extra_columns, input, expand_str);
-        if (!parseSQLQueryByString(std::make_unique<ParserTablesInSelectQuery>(), query, sub_query_node, max_depth))
+        if (!parseSQLQueryByString(std::make_unique<ParserTablesInSelectQuery>(), query, sub_query_node, max_depth, max_backtracks))
             return false;
         if (!setSubQuerySource(sub_query_node, select_node, true, false))
             return false;
         select_node = std::move(sub_query_node);
 
         auto rename_query = std::format("(Select * {}, {} From {})", cast_type_column_remove, cast_type_column_rename, "query");
-        if (!parseSQLQueryByString(std::make_unique<ParserTablesInSelectQuery>(), rename_query, sub_query_node, max_depth))
+        if (!parseSQLQueryByString(std::make_unique<ParserTablesInSelectQuery>(), rename_query, sub_query_node, max_depth, max_backtracks))
             return false;
         if (!setSubQuerySource(sub_query_node, select_node, true, true))
             return false;
@@ -276,7 +277,7 @@ bool ParserKQLMVExpand::genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_no
         select_node = std::move(sub_query_node);
         query = std::format("Select * {}, {} from {}", cast_type_column_restore, cast_type_column_restore_name, "rename_query");
 
-        if (!parseSQLQueryByString(std::make_unique<ParserSelectQuery>(), query, sub_query_node, max_depth))
+        if (!parseSQLQueryByString(std::make_unique<ParserSelectQuery>(), query, sub_query_node, max_depth, max_backtracks))
             return false;
         sub_query_node->as<ASTSelectQuery>()->setExpression(ASTSelectQuery::Expression::TABLES, std::move(select_node));
         select_node = std::move(sub_query_node);
@@ -293,12 +294,12 @@ bool ParserKQLMVExpand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     KQLMVExpand kql_mv_expand;
     if (!parserMVExpand(kql_mv_expand, pos, expected))
         return false;
-    if (!genQuery(kql_mv_expand, node, pos.max_depth))
+    if (!genQuery(kql_mv_expand, node, pos.max_depth, pos.max_backtracks))
         return false;
 
     const String setting_str = "enable_unaligned_array_join = 1";
     Tokens token_settings(setting_str.c_str(), setting_str.c_str() + setting_str.size());
-    IParser::Pos pos_settings(token_settings, pos.max_depth);
+    IParser::Pos pos_settings(token_settings, pos.max_depth, pos.max_backtracks);
 
     if (!ParserSetQuery(true).parse(pos_settings, setting, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLMVExpand.h b/src/Parsers/Kusto/ParserKQLMVExpand.h
index 61f206bb00d..068aee53f58 100644
--- a/src/Parsers/Kusto/ParserKQLMVExpand.h
+++ b/src/Parsers/Kusto/ParserKQLMVExpand.h
@@ -33,7 +33,7 @@ protected:
 
     static bool parseColumnArrayExprs(ColumnArrayExprs & column_array_exprs, Pos & pos, Expected & expected);
     static bool parserMVExpand(KQLMVExpand & kql_mv_expand, Pos & pos, Expected & expected);
-    static bool genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_node, int32_t max_depth);
+    static bool genQuery(KQLMVExpand & kql_mv_expand, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks);
 
     const char * getName() const override { return "KQL mv-expand"; }
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
diff --git a/src/Parsers/Kusto/ParserKQLMakeSeries.cpp b/src/Parsers/Kusto/ParserKQLMakeSeries.cpp
index a3727653049..f1ad9d9738b 100644
--- a/src/Parsers/Kusto/ParserKQLMakeSeries.cpp
+++ b/src/Parsers/Kusto/ParserKQLMakeSeries.cpp
@@ -6,6 +6,7 @@
 #include <Parsers/Kusto/ParserKQLMakeSeries.h>
 #include <Parsers/Kusto/ParserKQLOperators.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSelectQuery.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 
@@ -33,13 +34,13 @@ bool ParserKQLMakeSeries ::parseAggregationColumns(AggregationColumns & aggregat
          "variance"});
 
     Expected expected;
-    ParserKeyword s_default("default");
+    ParserKeyword s_default(Keyword::DEFAULT);
     ParserToken equals(TokenType::Equals);
     ParserToken open_bracket(TokenType::OpeningRoundBracket);
     ParserToken close_bracket(TokenType::ClosingRoundBracket);
     ParserToken comma(TokenType::Comma);
 
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         String alias;
         String aggregation_fun;
@@ -96,7 +97,7 @@ bool ParserKQLMakeSeries ::parseFromToStepClause(FromToStepClause & from_to_step
     auto step_pos = begin;
     auto end_pos = begin;
 
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         if (String(pos->begin, pos->end) == "from")
             from_pos = pos;
@@ -141,7 +142,7 @@ bool ParserKQLMakeSeries ::parseFromToStepClause(FromToStepClause & from_to_step
         || ParserKQLDateTypeTimespan().parseConstKQLTimespan(from_to_step.step_str))
     {
         from_to_step.is_timespan = true;
-        from_to_step.step = std::stod(getExprFromToken(from_to_step.step_str, pos.max_depth));
+        from_to_step.step = std::stod(getExprFromToken(from_to_step.step_str, pos.max_depth, pos.max_backtracks));
     }
     else
         from_to_step.step = std::stod(from_to_step.step_str);
@@ -149,7 +150,7 @@ bool ParserKQLMakeSeries ::parseFromToStepClause(FromToStepClause & from_to_step
     return true;
 }
 
-bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr & select_node, const uint32_t & max_depth)
+bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks)
 {
     const uint64_t era_diff
         = 62135596800; // this magic number is the differicen is second form 0001-01-01 (Azure start time ) and 1970-01-01 (CH start time)
@@ -165,17 +166,17 @@ bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr &
     auto step = from_to_step.step;
 
     if (!kql_make_series.from_to_step.from_str.empty())
-        start_str = getExprFromToken(kql_make_series.from_to_step.from_str, max_depth);
+        start_str = getExprFromToken(kql_make_series.from_to_step.from_str, max_depth, max_backtracks);
 
     if (!kql_make_series.from_to_step.to_str.empty())
-        end_str = getExprFromToken(from_to_step.to_str, max_depth);
+        end_str = getExprFromToken(from_to_step.to_str, max_depth, max_backtracks);
 
     auto date_type_cast = [&](String & src)
     {
         Tokens tokens(src.c_str(), src.c_str() + src.size());
-        IParser::Pos pos(tokens, max_depth);
+        IParser::Pos pos(tokens, max_depth, max_backtracks);
         String res;
-        while (!pos->isEnd())
+        while (isValidKQLPos(pos))
         {
             String tmp = String(pos->begin, pos->end);
             if (tmp == "parseDateTime64BestEffortOrNull")
@@ -200,8 +201,8 @@ bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr &
     {
         std::vector<String> group_expression_tokens;
         Tokens tokens(group_expression.c_str(), group_expression.c_str() + group_expression.size());
-        IParser::Pos pos(tokens, max_depth);
-        while (!pos->isEnd())
+        IParser::Pos pos(tokens, max_depth, max_backtracks);
+        while (isValidKQLPos(pos))
         {
             if (String(pos->begin, pos->end) == "AS")
             {
@@ -295,7 +296,7 @@ bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr &
 
     ASTPtr sub_query_node;
 
-    if (!ParserSimpleCHSubquery(select_node).parseByString(sub_sub_query, sub_query_node, max_depth))
+    if (!ParserSimpleCHSubquery(select_node).parseByString(sub_sub_query, sub_query_node, max_depth, max_backtracks))
         return false;
     select_node->as<ASTSelectQuery>()->setExpression(ASTSelectQuery::Expression::TABLES, std::move(sub_query_node));
 
@@ -350,7 +351,7 @@ bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr &
     else
         main_query = std::format("{},{}", group_expression_alias, final_axis_agg_alias_list);
 
-    if (!ParserSimpleCHSubquery(select_node).parseByString(sub_query, sub_query_node, max_depth))
+    if (!ParserSimpleCHSubquery(select_node).parseByString(sub_query, sub_query_node, max_depth, max_backtracks))
         return false;
     select_node->as<ASTSelectQuery>()->setExpression(ASTSelectQuery::Expression::TABLES, std::move(sub_query_node));
 
@@ -363,8 +364,8 @@ bool ParserKQLMakeSeries ::makeSeries(KQLMakeSeries & kql_make_series, ASTPtr &
 bool ParserKQLMakeSeries ::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     auto begin = pos;
-    ParserKeyword s_on("on");
-    ParserKeyword s_by("by");
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_by(Keyword::BY);
 
     ParserToken equals(TokenType::Equals);
     ParserToken comma(TokenType::Comma);
@@ -410,10 +411,10 @@ bool ParserKQLMakeSeries ::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
             subquery_columns += ", " + column_str;
     }
 
-    makeSeries(kql_make_series, node, pos.max_depth);
+    makeSeries(kql_make_series, node, pos.max_depth, pos.max_backtracks);
 
     Tokens token_main_query(kql_make_series.main_query.c_str(), kql_make_series.main_query.c_str() + kql_make_series.main_query.size());
-    IParser::Pos pos_main_query(token_main_query, pos.max_depth);
+    IParser::Pos pos_main_query(token_main_query, pos.max_depth, pos.max_backtracks);
 
     if (!ParserNotEmptyExpressionList(true).parse(pos_main_query, select_expression_list, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLMakeSeries.h b/src/Parsers/Kusto/ParserKQLMakeSeries.h
index ef7cc4976f6..6a32e76eff3 100644
--- a/src/Parsers/Kusto/ParserKQLMakeSeries.h
+++ b/src/Parsers/Kusto/ParserKQLMakeSeries.h
@@ -42,7 +42,7 @@ protected:
         String main_query;
     };
 
-    static bool makeSeries(KQLMakeSeries & kql_make_series, ASTPtr & select_node, const uint32_t & max_depth);
+    static bool makeSeries(KQLMakeSeries & kql_make_series, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks);
     static bool parseAggregationColumns(AggregationColumns & aggregation_columns, Pos & pos);
     static bool parseFromToStepClause(FromToStepClause & from_to_step, Pos & pos);
 
diff --git a/src/Parsers/Kusto/ParserKQLOperators.cpp b/src/Parsers/Kusto/ParserKQLOperators.cpp
index 17b9bd74d0b..d7364cb5fd7 100644
--- a/src/Parsers/Kusto/ParserKQLOperators.cpp
+++ b/src/Parsers/Kusto/ParserKQLOperators.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/Kusto/ParserKQLOperators.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLStatement.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/formatAST.h>
@@ -148,7 +149,7 @@ String KQLOperators::genHasAnyAllOpExpr(std::vector<String> & tokens, IParser::P
 
     String logic_op = (kql_op == "has_all") ? " and " : " or ";
 
-    while (!token_pos->isEnd() && token_pos->type != TokenType::PipeMark && token_pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(token_pos) && token_pos->type != TokenType::PipeMark && token_pos->type != TokenType::Semicolon)
     {
         auto tmp_arg = IParserKQLFunction::getExpression(token_pos);
         if (token_pos->type == TokenType::Comma)
@@ -165,14 +166,14 @@ String KQLOperators::genHasAnyAllOpExpr(std::vector<String> & tokens, IParser::P
     return new_expr;
 }
 
-String genEqOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos, const DB::String & ch_op)
+String genEqOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos, const String & ch_op)
 {
-    DB::String tmp_arg(token_pos->begin, token_pos->end);
+    String tmp_arg(token_pos->begin, token_pos->end);
 
     if (tokens.empty() || tmp_arg != "~")
         return tmp_arg;
 
-    DB::String new_expr;
+    String new_expr;
     new_expr += "lower(" + tokens.back() + ")" + " ";
     new_expr += ch_op + " ";
     ++token_pos;
@@ -186,14 +187,14 @@ String genEqOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos
     return new_expr;
 }
 
-String genInOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos, const DB::String & kql_op, const DB::String & ch_op)
+String genInOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos, const String & kql_op, const String & ch_op)
 {
     DB::ParserKQLTableFunction kqlfun_p;
     DB::ParserToken s_lparen(DB::TokenType::OpeningRoundBracket);
 
     DB::ASTPtr select;
     DB::Expected expected;
-    DB::String new_expr;
+    String new_expr;
 
     ++token_pos;
     if (!s_lparen.ignore(token_pos, expected))
@@ -217,9 +218,9 @@ String genInOpExprCis(std::vector<String> & tokens, DB::IParser::Pos & token_pos
     --token_pos;
 
     new_expr += ch_op;
-    while (!token_pos->isEnd() && token_pos->type != DB::TokenType::PipeMark && token_pos->type != DB::TokenType::Semicolon)
+    while (isValidKQLPos(token_pos) && token_pos->type != DB::TokenType::PipeMark && token_pos->type != DB::TokenType::Semicolon)
     {
-        auto tmp_arg = DB::String(token_pos->begin, token_pos->end);
+        auto tmp_arg = String(token_pos->begin, token_pos->end);
         if (token_pos->type != DB::TokenType::Comma && token_pos->type != DB::TokenType::ClosingRoundBracket
             && token_pos->type != DB::TokenType::OpeningRoundBracket && token_pos->type != DB::TokenType::OpeningSquareBracket
             && token_pos->type != DB::TokenType::ClosingSquareBracket && tmp_arg != "~" && tmp_arg != "dynamic")
@@ -329,7 +330,7 @@ bool KQLOperators::convert(std::vector<String> & tokens, IParser::Pos & pos)
 {
     auto begin = pos;
 
-    if (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    if (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         KQLOperatorValue op_value = KQLOperatorValue::none;
 
@@ -339,14 +340,14 @@ bool KQLOperators::convert(std::vector<String> & tokens, IParser::Pos & pos)
         if (token == "!")
         {
             ++pos;
-            if (pos->isEnd() || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
+            if (!isValidKQLPos(pos) || pos->type == TokenType::PipeMark || pos->type == TokenType::Semicolon)
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "Invalid negative operator");
             op = "!" + String(pos->begin, pos->end);
         }
         else if (token == "matches")
         {
             ++pos;
-            if (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+            if (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
             {
                 if (String(pos->begin, pos->end) == "regex")
                     op += " regex";
@@ -360,7 +361,7 @@ bool KQLOperators::convert(std::vector<String> & tokens, IParser::Pos & pos)
         }
 
         ++pos;
-        if (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+        if (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
         {
             if (String(pos->begin, pos->end) == "~")
                 op += "~";
diff --git a/src/Parsers/Kusto/ParserKQLPrint.cpp b/src/Parsers/Kusto/ParserKQLPrint.cpp
index bd9980ea96d..37483439f14 100644
--- a/src/Parsers/Kusto/ParserKQLPrint.cpp
+++ b/src/Parsers/Kusto/ParserKQLPrint.cpp
@@ -10,7 +10,7 @@ bool ParserKQLPrint::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     const String expr = getExprFromToken(pos);
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     if (!ParserNotEmptyExpressionList(true).parse(new_pos, select_expression_list, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLProject.cpp b/src/Parsers/Kusto/ParserKQLProject.cpp
index fdc458b7707..eab9ee082c5 100644
--- a/src/Parsers/Kusto/ParserKQLProject.cpp
+++ b/src/Parsers/Kusto/ParserKQLProject.cpp
@@ -12,7 +12,7 @@ bool ParserKQLProject ::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     expr = getExprFromToken(pos);
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     if (!ParserNotEmptyExpressionList(false).parse(new_pos, select_expression_list, expected))
         return false;
diff --git a/src/Parsers/Kusto/ParserKQLQuery.cpp b/src/Parsers/Kusto/ParserKQLQuery.cpp
index 47986943662..99b2d1da890 100644
--- a/src/Parsers/Kusto/ParserKQLQuery.cpp
+++ b/src/Parsers/Kusto/ParserKQLQuery.cpp
@@ -20,6 +20,7 @@
 #include <Parsers/Kusto/ParserKQLStatement.h>
 #include <Parsers/Kusto/ParserKQLSummarize.h>
 #include <Parsers/Kusto/ParserKQLTable.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSelectWithUnionQuery.h>
 #include <Parsers/ParserTablesInSelectQuery.h>
 
@@ -32,20 +33,20 @@ namespace ErrorCodes
     extern const int SYNTAX_ERROR;
 }
 
-bool ParserKQLBase::parseByString(const String expr, ASTPtr & node, const uint32_t max_depth)
+bool ParserKQLBase::parseByString(String expr, ASTPtr & node, uint32_t max_depth, uint32_t max_backtracks)
 {
     Expected expected;
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos pos(tokens, max_depth);
+    IParser::Pos pos(tokens, max_depth, max_backtracks);
     return parse(pos, node, expected);
 }
 
-bool ParserKQLBase::parseSQLQueryByString(ParserPtr && parser, String & query, ASTPtr & select_node, int32_t max_depth)
+bool ParserKQLBase::parseSQLQueryByString(ParserPtr && parser, String & query, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks)
 {
     Expected expected;
     Tokens token_subquery(query.c_str(), query.c_str() + query.size());
-    IParser::Pos pos_subquery(token_subquery, max_depth);
+    IParser::Pos pos_subquery(token_subquery, max_depth, max_backtracks);
     if (!parser->parse(pos_subquery, select_node, expected))
         return false;
     return true;
@@ -59,33 +60,34 @@ bool ParserKQLBase::setSubQuerySource(ASTPtr & select_query, ASTPtr & source, bo
         if (!select_query || !select_query->as<ASTSelectQuery>()->tables()
             || select_query->as<ASTSelectQuery>()->tables()->as<ASTTablesInSelectQuery>()->children.empty())
             return false;
-        table_expr = select_query->as<ASTSelectQuery>()->tables()->as<ASTTablesInSelectQuery>()->children[0];
+        table_expr = select_query->as<ASTSelectQuery>()->tables()->as<ASTTablesInSelectQuery>()->children.at(0);
         table_expr->as<ASTTablesInSelectQueryElement>()->table_expression
-            = source->as<ASTSelectQuery>()->tables()->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression;
+            = source->as<ASTSelectQuery>()->tables()->children.at(0)->as<ASTTablesInSelectQueryElement>()->table_expression;
+        table_expr->children.at(0) = table_expr->as<ASTTablesInSelectQueryElement>()->table_expression;
         return true;
     }
 
     if (!select_query || select_query->as<ASTTablesInSelectQuery>()->children.empty()
-        || !select_query->as<ASTTablesInSelectQuery>()->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression
+        || !select_query->as<ASTTablesInSelectQuery>()->children.at(0)->as<ASTTablesInSelectQueryElement>()->table_expression
         || select_query->as<ASTTablesInSelectQuery>()
-               ->children[0]
+               ->children.at(0)
                ->as<ASTTablesInSelectQueryElement>()
                ->table_expression->as<ASTTableExpression>()
                ->subquery->children.empty()
         || select_query->as<ASTTablesInSelectQuery>()
-               ->children[0]
+               ->children.at(0)
                ->as<ASTTablesInSelectQueryElement>()
                ->table_expression->as<ASTTableExpression>()
-               ->subquery->children[0]
+               ->subquery->children.at(0)
                ->as<ASTSelectWithUnionQuery>()
                ->list_of_selects->children.empty()
         || select_query->as<ASTTablesInSelectQuery>()
-               ->children[0]
+               ->children.at(0)
                ->as<ASTTablesInSelectQueryElement>()
                ->table_expression->as<ASTTableExpression>()
-               ->subquery->children[0]
+               ->subquery->children.at(0)
                ->as<ASTSelectWithUnionQuery>()
-               ->list_of_selects->children[0]
+               ->list_of_selects->children.at(0)
                ->as<ASTSelectQuery>()
                ->tables()
                ->as<ASTTablesInSelectQuery>()
@@ -93,35 +95,36 @@ bool ParserKQLBase::setSubQuerySource(ASTPtr & select_query, ASTPtr & source, bo
         return false;
 
     table_expr = select_query->as<ASTTablesInSelectQuery>()
-                     ->children[0]
+                     ->children.at(0)
                      ->as<ASTTablesInSelectQueryElement>()
                      ->table_expression->as<ASTTableExpression>()
-                     ->subquery->children[0]
+                     ->subquery->children.at(0)
                      ->as<ASTSelectWithUnionQuery>()
-                     ->list_of_selects->children[0]
+                     ->list_of_selects->children.at(0)
                      ->as<ASTSelectQuery>()
                      ->tables()
                      ->as<ASTTablesInSelectQuery>()
-                     ->children[0];
+                     ->children.at(0);
 
     if (!src_is_subquery)
     {
         table_expr->as<ASTTablesInSelectQueryElement>()->table_expression
-            = source->as<ASTSelectQuery>()->tables()->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression;
+            = source->as<ASTSelectQuery>()->tables()->children.at(0)->as<ASTTablesInSelectQueryElement>()->table_expression;
     }
     else
     {
         table_expr->as<ASTTablesInSelectQueryElement>()->table_expression
-            = source->children[0]->as<ASTTablesInSelectQueryElement>()->table_expression;
+            = source->children.at(0)->as<ASTTablesInSelectQueryElement>()->table_expression;
     }
 
+    table_expr->children.at(0) = table_expr->as<ASTTablesInSelectQueryElement>()->table_expression;
     return true;
 }
 
-String ParserKQLBase::getExprFromToken(const String & text, const uint32_t max_depth)
+String ParserKQLBase::getExprFromToken(const String & text, uint32_t max_depth, uint32_t max_backtracks)
 {
     Tokens tokens(text.c_str(), text.c_str() + text.size());
-    IParser::Pos pos(tokens, max_depth);
+    IParser::Pos pos(tokens, max_depth, max_backtracks);
 
     return getExprFromToken(pos);
 }
@@ -130,7 +133,7 @@ String ParserKQLBase::getExprFromPipe(Pos & pos)
 {
     BracketCount bracket_count;
     auto end = pos;
-    while (!end->isEnd() && end->type != TokenType::Semicolon)
+    while (isValidKQLPos(end) && end->type != TokenType::Semicolon)
     {
         bracket_count.count(end);
         if (end->type == TokenType::PipeMark && bracket_count.isZero())
@@ -149,7 +152,7 @@ String ParserKQLBase::getExprFromToken(Pos & pos)
     comma_pos.push_back(pos);
 
     size_t paren_count = 0;
-    while (!pos->isEnd() && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::Semicolon)
     {
         if (pos->type == TokenType::PipeMark && paren_count == 0)
             break;
@@ -373,7 +376,7 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     uint16_t bracket_count = 0;
 
-    while (!pos->isEnd() && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::Semicolon)
     {
         if (pos->type == TokenType::OpeningRoundBracket)
             ++bracket_count;
@@ -383,6 +386,9 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         if (pos->type == TokenType::PipeMark && bracket_count == 0)
         {
             ++pos;
+            if (!isValidKQLPos(pos))
+                return false;
+
             String kql_operator(pos->begin, pos->end);
 
             auto validate_kql_operator = [&]
@@ -390,7 +396,10 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
                 if (kql_operator == "order" || kql_operator == "sort")
                 {
                     ++pos;
-                    ParserKeyword s_by("by");
+                    if (!isValidKQLPos(pos))
+                        return false;
+
+                    ParserKeyword s_by(Keyword::BY);
                     if (s_by.ignore(pos, expected))
                     {
                         kql_operator = "order by";
@@ -401,11 +410,15 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
                 {
                     auto op_pos_begin = pos;
                     ++pos;
+                    if (!isValidKQLPos(pos))
+                        return false;
+
                     ParserToken s_dash(TokenType::Minus);
                     if (s_dash.ignore(pos, expected))
                     {
-                        String tmp_op(op_pos_begin->begin, pos->end);
-                        kql_operator = tmp_op;
+                        if (!isValidKQLPos(pos))
+                            return false;
+                        kql_operator = String(op_pos_begin->begin, pos->end);
                     }
                     else
                         --pos;
@@ -418,6 +431,9 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             if (!validate_kql_operator())
                 return false;
             ++pos;
+            if (!isValidKQLPos(pos))
+                return false;
+
             operation_pos.push_back(std::make_pair(kql_operator, pos));
         }
         else
@@ -507,7 +523,7 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
             String sub_query = std::format("({})", String(operation_pos.front().second->begin, last_pos->end));
             Tokens token_subquery(sub_query.c_str(), sub_query.c_str() + sub_query.size());
-            IParser::Pos pos_subquery(token_subquery, pos.max_depth);
+            IParser::Pos pos_subquery(token_subquery, pos.max_depth, pos.max_backtracks);
 
             if (!ParserKQLSubquery().parse(pos_subquery, tables, expected))
                 return false;
@@ -528,7 +544,7 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             if (oprator)
             {
                 Tokens token_clause(op_calsue.c_str(), op_calsue.c_str() + op_calsue.size());
-                IParser::Pos pos_clause(token_clause, pos.max_depth);
+                IParser::Pos pos_clause(token_clause, pos.max_depth, pos.max_backtracks);
                 if (!oprator->parse(pos_clause, node, expected))
                     return false;
             }
@@ -561,7 +577,7 @@ bool ParserKQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     {
         auto expr = String("*");
         Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-        IParser::Pos new_pos(tokens, pos.max_depth);
+        IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
         if (!std::make_unique<ParserKQLProject>()->parse(new_pos, node, expected))
             return false;
     }
@@ -576,20 +592,19 @@ bool ParserKQLSubquery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     if (!ParserKQLTableFunction().parse(pos, select_node, expected))
         return false;
 
-    ASTPtr node_subquery = std::make_shared<ASTSubquery>();
-    node_subquery->children.push_back(select_node);
+    ASTPtr node_subquery = std::make_shared<ASTSubquery>(std::move(select_node));
 
     ASTPtr node_table_expr = std::make_shared<ASTTableExpression>();
     node_table_expr->as<ASTTableExpression>()->subquery = node_subquery;
 
     node_table_expr->children.emplace_back(node_subquery);
 
-    ASTPtr node_table_in_select_query_emlement = std::make_shared<ASTTablesInSelectQueryElement>();
-    node_table_in_select_query_emlement->as<ASTTablesInSelectQueryElement>()->table_expression = node_table_expr;
+    ASTPtr node_table_in_select_query_element = std::make_shared<ASTTablesInSelectQueryElement>();
+    node_table_in_select_query_element->as<ASTTablesInSelectQueryElement>()->table_expression = node_table_expr;
 
     ASTPtr res = std::make_shared<ASTTablesInSelectQuery>();
 
-    res->children.emplace_back(node_table_in_select_query_emlement);
+    res->children.emplace_back(node_table_in_select_query_element);
 
     node = res;
     return true;
@@ -618,20 +633,20 @@ bool ParserSimpleCHSubquery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
             ASTSelectQuery::Expression::TABLES, parent_select_node->as<ASTSelectQuery>()->tables());
     }
 
-    ASTPtr node_subquery = std::make_shared<ASTSubquery>();
-    node_subquery->children.push_back(sub_select_node);
+    ASTPtr node_subquery = std::make_shared<ASTSubquery>(std::move(sub_select_node));
 
     ASTPtr node_table_expr = std::make_shared<ASTTableExpression>();
     node_table_expr->as<ASTTableExpression>()->subquery = node_subquery;
 
     node_table_expr->children.emplace_back(node_subquery);
 
-    ASTPtr node_table_in_select_query_emlement = std::make_shared<ASTTablesInSelectQueryElement>();
-    node_table_in_select_query_emlement->as<ASTTablesInSelectQueryElement>()->table_expression = node_table_expr;
+    ASTPtr node_table_in_select_query_element = std::make_shared<ASTTablesInSelectQueryElement>();
+    node_table_in_select_query_element->as<ASTTablesInSelectQueryElement>()->table_expression = node_table_expr;
 
+    node_table_in_select_query_element->children.emplace_back(node_table_expr);
     ASTPtr res = std::make_shared<ASTTablesInSelectQuery>();
 
-    res->children.emplace_back(node_table_in_select_query_emlement);
+    res->children.emplace_back(node_table_in_select_query_element);
 
     node = res;
     return true;
diff --git a/src/Parsers/Kusto/ParserKQLQuery.h b/src/Parsers/Kusto/ParserKQLQuery.h
index 516acb09dea..e003ee3ee8b 100644
--- a/src/Parsers/Kusto/ParserKQLQuery.h
+++ b/src/Parsers/Kusto/ParserKQLQuery.h
@@ -9,11 +9,11 @@ class ParserKQLBase : public IParserBase
 {
 public:
     static String getExprFromToken(Pos & pos);
-    static String getExprFromToken(const String & text, const uint32_t max_depth);
+    static String getExprFromToken(const String & text, uint32_t max_depth, uint32_t max_backtracks);
     static String getExprFromPipe(Pos & pos);
     static bool setSubQuerySource(ASTPtr & select_query, ASTPtr & source, bool dest_is_subquery, bool src_is_subquery);
-    static bool parseSQLQueryByString(ParserPtr && parser, String & query, ASTPtr & select_node, int32_t max_depth);
-    bool parseByString(const String expr, ASTPtr & node, const uint32_t max_depth);
+    static bool parseSQLQueryByString(ParserPtr && parser, String & query, ASTPtr & select_node, uint32_t max_depth, uint32_t max_backtracks);
+    bool parseByString(String expr, ASTPtr & node, uint32_t max_depth, uint32_t max_backtracks);
 };
 
 class ParserKQLQuery : public IParserBase
@@ -34,7 +34,7 @@ protected:
 class ParserSimpleCHSubquery : public ParserKQLBase
 {
 public:
-    ParserSimpleCHSubquery(ASTPtr parent_select_node_ = nullptr) { parent_select_node = parent_select_node_; }
+    explicit ParserSimpleCHSubquery(ASTPtr parent_select_node_ = nullptr) { parent_select_node = parent_select_node_; }
 
 protected:
     const char * getName() const override { return "Simple ClickHouse subquery"; }
diff --git a/src/Parsers/Kusto/ParserKQLSort.cpp b/src/Parsers/Kusto/ParserKQLSort.cpp
index 193b75567aa..852ba50698d 100644
--- a/src/Parsers/Kusto/ParserKQLSort.cpp
+++ b/src/Parsers/Kusto/ParserKQLSort.cpp
@@ -4,6 +4,7 @@
 #include <Parsers/IParserBase.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLSort.h>
+#include <Parsers/Kusto/Utilities.h>
 
 namespace DB
 {
@@ -18,13 +19,13 @@ bool ParserKQLSort::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     auto expr = getExprFromToken(pos);
 
     Tokens tokens(expr.c_str(), expr.c_str() + expr.size());
-    IParser::Pos new_pos(tokens, pos.max_depth);
+    IParser::Pos new_pos(tokens, pos.max_depth, pos.max_backtracks);
 
     auto pos_backup = new_pos;
     if (!order_list.parse(pos_backup, order_expression_list, expected))
         return false;
 
-    while (!new_pos->isEnd() && new_pos->type != TokenType::PipeMark && new_pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(new_pos) && new_pos->type != TokenType::PipeMark && new_pos->type != TokenType::Semicolon)
     {
         String tmp(new_pos->begin, new_pos->end);
         if (tmp == "desc" || tmp == "asc")
diff --git a/src/Parsers/Kusto/ParserKQLStatement.cpp b/src/Parsers/Kusto/ParserKQLStatement.cpp
index f61e2e99ffb..fbf2110e664 100644
--- a/src/Parsers/Kusto/ParserKQLStatement.cpp
+++ b/src/Parsers/Kusto/ParserKQLStatement.cpp
@@ -5,6 +5,7 @@
 #include <Parsers/Kusto/KustoFunctions/KQLFunctionFactory.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLStatement.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSetQuery.h>
 
 namespace DB
@@ -79,7 +80,7 @@ bool ParserKQLTableFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         {
             ++paren_count;
             auto pos_start = pos;
-            while (!pos->isEnd())
+            while (isValidKQLPos(pos))
             {
                 if (pos->type == TokenType::ClosingRoundBracket)
                     --paren_count;
@@ -94,7 +95,7 @@ bool ParserKQLTableFunction::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         }
         ++pos;
         Tokens token_kql(kql_statement.c_str(), kql_statement.c_str() + kql_statement.size());
-        IParser::Pos pos_kql(token_kql, pos.max_depth);
+        IParser::Pos pos_kql(token_kql, pos.max_depth, pos.max_backtracks);
 
         if (kql_p.parse(pos_kql, select, expected))
         {
diff --git a/src/Parsers/Kusto/ParserKQLSummarize.cpp b/src/Parsers/Kusto/ParserKQLSummarize.cpp
index 11518fcc684..47d706d0b4b 100644
--- a/src/Parsers/Kusto/ParserKQLSummarize.cpp
+++ b/src/Parsers/Kusto/ParserKQLSummarize.cpp
@@ -15,6 +15,7 @@
 #include <Parsers/IParserBase.h>
 #include <Parsers/Kusto/ParserKQLQuery.h>
 #include <Parsers/Kusto/ParserKQLSummarize.h>
+#include <Parsers/Kusto/Utilities.h>
 #include <Parsers/ParserSampleRatio.h>
 #include <Parsers/ParserSelectQuery.h>
 #include <Parsers/ParserSetQuery.h>
@@ -120,7 +121,7 @@ bool ParserKQLSummarize::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             if (String(equal_pos->begin, equal_pos->end) != "=")
             {
                 String groupby_fun = String(begin_pos->begin, begin_pos->end);
-                if (equal_pos->isEnd() || equal_pos->type == TokenType::Comma || equal_pos->type == TokenType::Semicolon
+                if (!equal_pos.isValid() || equal_pos->type == TokenType::Comma || equal_pos->type == TokenType::Semicolon
                     || equal_pos->type == TokenType::PipeMark)
                 {
                     expr = groupby_fun;
@@ -151,7 +152,7 @@ bool ParserKQLSummarize::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         }
     };
 
-    while (!pos->isEnd() && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
+    while (isValidKQLPos(pos) && pos->type != TokenType::PipeMark && pos->type != TokenType::Semicolon)
     {
         if (pos->type == TokenType::OpeningRoundBracket)
             ++bracket_count;
@@ -191,10 +192,10 @@ bool ParserKQLSummarize::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             expr_columns = expr_columns + "," + expr_aggregation;
     }
 
-    String converted_columns = getExprFromToken(expr_columns, pos.max_depth);
+    String converted_columns = getExprFromToken(expr_columns, pos.max_depth, pos.max_backtracks);
 
     Tokens token_converted_columns(converted_columns.c_str(), converted_columns.c_str() + converted_columns.size());
-    IParser::Pos pos_converted_columns(token_converted_columns, pos.max_depth);
+    IParser::Pos pos_converted_columns(token_converted_columns, pos.max_depth, pos.max_backtracks);
 
     if (!ParserNotEmptyExpressionList(true).parse(pos_converted_columns, select_expression_list, expected))
         return false;
@@ -203,10 +204,10 @@ bool ParserKQLSummarize::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
     if (groupby)
     {
-        String converted_groupby = getExprFromToken(expr_groupby, pos.max_depth);
+        String converted_groupby = getExprFromToken(expr_groupby, pos.max_depth, pos.max_backtracks);
 
         Tokens token_converted_groupby(converted_groupby.c_str(), converted_groupby.c_str() + converted_groupby.size());
-        IParser::Pos postoken_converted_groupby(token_converted_groupby, pos.max_depth);
+        IParser::Pos postoken_converted_groupby(token_converted_groupby, pos.max_depth, pos.max_backtracks);
 
         if (!ParserNotEmptyExpressionList(false).parse(postoken_converted_groupby, group_expression_list, expected))
             return false;
diff --git a/src/Parsers/Kusto/Utilities.cpp b/src/Parsers/Kusto/Utilities.cpp
index 72c1ee86628..c43c9784328 100644
--- a/src/Parsers/Kusto/Utilities.cpp
+++ b/src/Parsers/Kusto/Utilities.cpp
@@ -71,4 +71,12 @@ ASTPtr wrapInSelectWithUnion(const ASTPtr & select_query)
 
     return select_with_union_query;
 }
+
+bool isValidKQLPos(IParser::Pos & pos)
+{
+    return (pos.isValid() ||
+            pos->type == TokenType::ErrorSingleExclamationMark || // allow kql negative operators
+            pos->type == TokenType::ErrorWrongNumber || // allow kql timespan data type with decimal like 2.6h
+            std::string_view(pos->begin, pos->end) == "~");  // allow kql Case-Sensitive operators
+}
 }
diff --git a/src/Parsers/Kusto/Utilities.h b/src/Parsers/Kusto/Utilities.h
index f19fad72287..ae84a13a100 100644
--- a/src/Parsers/Kusto/Utilities.h
+++ b/src/Parsers/Kusto/Utilities.h
@@ -10,4 +10,5 @@ String extractTokenWithoutQuotes(IParser::Pos & pos);
 void setSelectAll(ASTSelectQuery & select_query);
 String wildcardToRegex(const String & wildcard);
 ASTPtr wrapInSelectWithUnion(const ASTPtr & select_query);
+bool isValidKQLPos(IParser::Pos & pos);
 }
diff --git a/src/Parsers/Kusto/parseKQLQuery.cpp b/src/Parsers/Kusto/parseKQLQuery.cpp
index bcc04ef7001..34a009873f8 100644
--- a/src/Parsers/Kusto/parseKQLQuery.cpp
+++ b/src/Parsers/Kusto/parseKQLQuery.cpp
@@ -322,12 +322,13 @@ ASTPtr tryParseKQLQuery(
     bool allow_multi_statements,
     size_t max_query_size,
     size_t max_parser_depth,
+    size_t max_parser_backtracks,
     bool skip_insignificant)
 {
     const char * query_begin = _out_query_end;
     Tokens tokens(query_begin, all_queries_end, max_query_size, skip_insignificant);
     /// NOTE: consider use UInt32 for max_parser_depth setting.
-    IParser::Pos token_iterator(tokens, static_cast<uint32_t>(max_parser_depth));
+    IParser::Pos token_iterator(tokens, static_cast<uint32_t>(max_parser_depth), static_cast<uint32_t>(max_parser_backtracks));
 
     if (token_iterator->isEnd()
         || token_iterator->type == TokenType::Semicolon)
@@ -441,10 +442,11 @@ ASTPtr parseKQLQueryAndMovePosition(
     const std::string & query_description,
     bool allow_multi_statements,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
     std::string error_message;
-    ASTPtr res = tryParseKQLQuery(parser, pos, end, error_message, false, query_description, allow_multi_statements, max_query_size, max_parser_depth);
+    ASTPtr res = tryParseKQLQuery(parser, pos, end, error_message, false, query_description, allow_multi_statements, max_query_size, max_parser_depth, max_parser_backtracks);
 
     if (res)
         return res;
@@ -458,9 +460,10 @@ ASTPtr parseKQLQuery(
     const char * end,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseKQLQueryAndMovePosition(parser, begin, end, query_description, false, max_query_size, max_parser_depth);
+    return parseKQLQueryAndMovePosition(parser, begin, end, query_description, false, max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 ASTPtr parseKQLQuery(
@@ -468,18 +471,20 @@ ASTPtr parseKQLQuery(
     const std::string & query,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseKQLQuery(parser, query.data(), query.data() + query.size(), query_description, max_query_size, max_parser_depth);
+    return parseKQLQuery(parser, query.data(), query.data() + query.size(), query_description, max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 ASTPtr parseKQLQuery(
     IParser & parser,
     const std::string & query,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseKQLQuery(parser, query.data(), query.data() + query.size(), parser.getName(), max_query_size, max_parser_depth);
+    return parseKQLQuery(parser, query.data(), query.data() + query.size(), parser.getName(), max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 }
diff --git a/src/Parsers/Kusto/parseKQLQuery.h b/src/Parsers/Kusto/parseKQLQuery.h
index fca017e70fe..9e52ba56307 100644
--- a/src/Parsers/Kusto/parseKQLQuery.h
+++ b/src/Parsers/Kusto/parseKQLQuery.h
@@ -3,6 +3,7 @@
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/parseQuery.h>
 #include <IO/WriteBufferFromString.h>
+
 namespace DB
 {
 
@@ -10,10 +11,6 @@ namespace DB
   * Used in syntax error message.
   */
 
-}
-namespace DB
-{
-
 class IParser;
 
 /// Parse query or set 'out_error_message'.
@@ -24,11 +21,11 @@ ASTPtr tryParseKQLQuery(
     std::string & out_error_message,
     bool hilite,
     const std::string & description,
-    bool allow_multi_statements,    /// If false, check for non-space characters after semicolon and set error message if any.
-    size_t max_query_size,          /// If (end - pos) > max_query_size and query is longer than max_query_size then throws "Max query size exceeded".
-                                    /// Disabled if zero. Is used in order to check query size if buffer can contains data for INSERT query.
+    bool allow_multi_statements,
+    size_t max_query_size,
     size_t max_parser_depth,
-    bool skip_insignificant = true);  /// If true, lexer will skip all insignificant tokens (e.g. whitespaces)
+    size_t max_parser_backtracks,
+    bool skip_insignificant = true);
 
 
 /// Parse query or throw an exception with error message.
@@ -39,7 +36,8 @@ ASTPtr parseKQLQueryAndMovePosition(
     const std::string & description,
     bool allow_multi_statements,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseKQLQuery(
     IParser & parser,
@@ -47,18 +45,22 @@ ASTPtr parseKQLQuery(
     const char * end,
     const std::string & description,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseKQLQuery(
     IParser & parser,
     const std::string & query,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseKQLQuery(
     IParser & parser,
     const std::string & query,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
+
 }
diff --git a/src/Parsers/MySQL/ASTAlterCommand.cpp b/src/Parsers/MySQL/ASTAlterCommand.cpp
index 10446d40172..733cb657efc 100644
--- a/src/Parsers/MySQL/ASTAlterCommand.cpp
+++ b/src/Parsers/MySQL/ASTAlterCommand.cpp
@@ -55,7 +55,7 @@ static inline bool parseAddCommand(IParser::Pos & pos, ASTPtr & node, Expected &
     else
     {
         alter_command->type = ASTAlterCommand::ADD_COLUMN;
-        ParserKeyword("COLUMN").ignore(pos, expected);
+        ParserKeyword(Keyword::COLUMN).ignore(pos, expected);
 
         if (ParserToken(TokenType::OpeningRoundBracket).ignore(pos, expected))
         {
@@ -76,9 +76,9 @@ static inline bool parseAddCommand(IParser::Pos & pos, ASTPtr & node, Expected &
             additional_columns = std::make_shared<ASTExpressionList>();
             additional_columns->children.emplace_back(declare_column);
 
-            if (ParserKeyword("FIRST").ignore(pos, expected))
+            if (ParserKeyword(Keyword::FIRST).ignore(pos, expected))
                 alter_command->first = true;
-            else if (ParserKeyword("AFTER").ignore(pos, expected))
+            else if (ParserKeyword(Keyword::AFTER).ignore(pos, expected))
             {
                 ASTPtr after_column;
                 ParserIdentifier identifier_p;
@@ -103,12 +103,12 @@ static inline bool parseDropCommand(IParser::Pos & pos, ASTPtr & node, Expected
 
     auto alter_command = std::make_shared<ASTAlterCommand>();
 
-    if (ParserKeyword("PRIMARY KEY").ignore(pos, expected))
+    if (ParserKeyword(Keyword::PRIMARY_KEY).ignore(pos, expected))
     {
         alter_command->index_type = "PRIMARY_KEY";
         alter_command->type = ASTAlterCommand::DROP_INDEX;
     }
-    else if (ParserKeyword("FOREIGN KEY").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::FOREIGN_KEY).ignore(pos, expected))
     {
         if (!identifier_p.parse(pos, name, expected))
             return false;
@@ -117,7 +117,7 @@ static inline bool parseDropCommand(IParser::Pos & pos, ASTPtr & node, Expected
         alter_command->type = ASTAlterCommand::DROP_INDEX;
         alter_command->index_name = getIdentifierName(name);
     }
-    else if (ParserKeyword("INDEX").ignore(pos, expected) || ParserKeyword("KEY").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::INDEX).ignore(pos, expected) || ParserKeyword(Keyword::KEY).ignore(pos, expected))
     {
         if (!identifier_p.parse(pos, name, expected))
             return false;
@@ -126,7 +126,7 @@ static inline bool parseDropCommand(IParser::Pos & pos, ASTPtr & node, Expected
         alter_command->type = ASTAlterCommand::DROP_INDEX;
         alter_command->index_name = getIdentifierName(name);
     }
-    else if (ParserKeyword("CONSTRAINT").ignore(pos, expected) || ParserKeyword("CHECK").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::CONSTRAINT).ignore(pos, expected) || ParserKeyword(Keyword::CHECK).ignore(pos, expected))
     {
         if (!identifier_p.parse(pos, name, expected))
             return false;
@@ -136,7 +136,7 @@ static inline bool parseDropCommand(IParser::Pos & pos, ASTPtr & node, Expected
     }
     else
     {
-        ParserKeyword("COLUMN").ignore(pos, expected);
+        ParserKeyword(Keyword::COLUMN).ignore(pos, expected);
 
         if (!identifier_p.parse(pos, name, expected))
             return false;
@@ -156,30 +156,30 @@ static inline bool parseAlterCommand(IParser::Pos & pos, ASTPtr & node, Expected
     ParserIdentifier identifier_p;
     auto alter_command = std::make_shared<ASTAlterCommand>();
 
-    if (ParserKeyword("INDEX").ignore(pos, expected))
+    if (ParserKeyword(Keyword::INDEX).ignore(pos, expected))
     {
         /// ALTER INDEX index_name {VISIBLE | INVISIBLE}
 
         if (!identifier_p.parse(pos, name, expected))
             return false;
 
-        alter_command->index_visible = ParserKeyword("VISIBLE").ignore(pos, expected);
+        alter_command->index_visible = ParserKeyword(Keyword::VISIBLE).ignore(pos, expected);
 
-        if (!alter_command->index_visible && !ParserKeyword("INVISIBLE").ignore(pos, expected))
+        if (!alter_command->index_visible && !ParserKeyword(Keyword::INVISIBLE).ignore(pos, expected))
             return false;
 
         alter_command->type = ASTAlterCommand::MODIFY_INDEX_VISIBLE;
         alter_command->index_name = getIdentifierName(name);
     }
-    else if (ParserKeyword("CHECK").ignore(pos, expected) || ParserKeyword("CONSTRAINT").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::CHECK).ignore(pos, expected) || ParserKeyword(Keyword::CONSTRAINT).ignore(pos, expected))
     {
         /// ALTER {CHECK | CONSTRAINT} symbol [NOT] ENFORCED
         if (!identifier_p.parse(pos, name, expected))
             return false;
 
-        alter_command->not_check_enforced = ParserKeyword("NOT").ignore(pos, expected);
+        alter_command->not_check_enforced = ParserKeyword(Keyword::NOT).ignore(pos, expected);
 
-        if (!ParserKeyword("ENFORCED").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::ENFORCED).ignore(pos, expected))
             return false;
 
         alter_command->type = ASTAlterCommand::MODIFY_CHECK;
@@ -189,14 +189,14 @@ static inline bool parseAlterCommand(IParser::Pos & pos, ASTPtr & node, Expected
     {
         /// ALTER [COLUMN] col_name {SET DEFAULT {literal | (expr)} | DROP DEFAULT}
 
-        ParserKeyword("COLUMN").ignore(pos, expected);
+        ParserKeyword(Keyword::COLUMN).ignore(pos, expected);
 
         if (!identifier_p.parse(pos, name, expected))
             return false;
 
-        if (ParserKeyword("DROP DEFAULT").ignore(pos, expected))
+        if (ParserKeyword(Keyword::DROP_DEFAULT).ignore(pos, expected))
             alter_command->type = ASTAlterCommand::DROP_COLUMN_DEFAULT;
-        else if (ParserKeyword("SET DEFAULT").ignore(pos, expected))
+        else if (ParserKeyword(Keyword::SET_DEFAULT).ignore(pos, expected))
         {
             ASTPtr default_expression;
             ParserExpression expression_p;
@@ -225,12 +225,12 @@ static inline bool parseRenameCommand(IParser::Pos & pos, ASTPtr & node, Expecte
     ParserIdentifier identifier_p;
     auto alter_command = std::make_shared<ASTAlterCommand>();
 
-    if (ParserKeyword("COLUMN").ignore(pos, expected))
+    if (ParserKeyword(Keyword::COLUMN).ignore(pos, expected))
     {
         if (!identifier_p.parse(pos, old_name, expected))
             return false;
 
-        if (!ParserKeyword("TO").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::TO).ignore(pos, expected))
             return false;
 
         if (!identifier_p.parse(pos, new_name, expected))
@@ -240,7 +240,7 @@ static inline bool parseRenameCommand(IParser::Pos & pos, ASTPtr & node, Expecte
         alter_command->old_name = getIdentifierName(old_name);
         alter_command->column_name = getIdentifierName(new_name);
     }
-    else if (ParserKeyword("TO").ignore(pos, expected) || ParserKeyword("AS").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::TO).ignore(pos, expected) || ParserKeyword(Keyword::AS).ignore(pos, expected))
     {
         if (!ParserCompoundIdentifier(true).parse(pos, new_name, expected))
             return false;
@@ -250,12 +250,12 @@ static inline bool parseRenameCommand(IParser::Pos & pos, ASTPtr & node, Expecte
         alter_command->new_table_name = new_table_id.table_name;
         alter_command->new_database_name = new_table_id.database_name;
     }
-    else if (ParserKeyword("INDEX").ignore(pos, expected) || ParserKeyword("KEY").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::INDEX).ignore(pos, expected) || ParserKeyword(Keyword::KEY).ignore(pos, expected))
     {
         if (!identifier_p.parse(pos, old_name, expected))
             return false;
 
-        if (!ParserKeyword("TO").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::TO).ignore(pos, expected))
             return false;
 
         if (!identifier_p.parse(pos, new_name, expected))
@@ -283,7 +283,7 @@ static inline bool parseOtherCommand(IParser::Pos & pos, ASTPtr & node, Expected
 {
     auto alter_command = std::make_shared<ASTAlterCommand>();
 
-    if (ParserKeyword("ORDER BY").ignore(pos, expected))
+    if (ParserKeyword(Keyword::ORDER_BY).ignore(pos, expected))
     {
         /// ORDER BY col_name [, col_name] ...
         ASTPtr columns;
@@ -335,7 +335,7 @@ static inline bool parseModifyCommand(IParser::Pos & pos, ASTPtr & node, Expecte
     ASTPtr old_column_name;
     auto alter_command = std::make_shared<ASTAlterCommand>();
 
-    ParserKeyword("COLUMN").ignore(pos, expected);
+    ParserKeyword(Keyword::COLUMN).ignore(pos, expected);
     if (exists_old_column_name && !ParserIdentifier().parse(pos, old_column_name, expected))
         return false;
 
@@ -343,9 +343,9 @@ static inline bool parseModifyCommand(IParser::Pos & pos, ASTPtr & node, Expecte
     if (!ParserDeclareColumn().parse(pos, additional_column, expected))
         return false;
 
-    if (ParserKeyword("FIRST").ignore(pos, expected))
+    if (ParserKeyword(Keyword::FIRST).ignore(pos, expected))
         alter_command->first = true;
-    else if (ParserKeyword("AFTER").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::AFTER).ignore(pos, expected))
     {
         ASTPtr after_column;
         ParserIdentifier identifier_p;
@@ -368,12 +368,12 @@ static inline bool parseModifyCommand(IParser::Pos & pos, ASTPtr & node, Expecte
 
 bool ParserAlterCommand::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword k_add("ADD");
-    ParserKeyword k_drop("DROP");
-    ParserKeyword k_alter("ALTER");
-    ParserKeyword k_rename("RENAME");
-    ParserKeyword k_modify("MODIFY");
-    ParserKeyword k_change("CHANGE");
+    ParserKeyword k_add(Keyword::ADD);
+    ParserKeyword k_drop(Keyword::DROP);
+    ParserKeyword k_alter(Keyword::ALTER);
+    ParserKeyword k_rename(Keyword::RENAME);
+    ParserKeyword k_modify(Keyword::MODIFY);
+    ParserKeyword k_change(Keyword::CHANGE);
 
     if (k_add.ignore(pos, expected))
         return parseAddCommand(pos, node, expected);
diff --git a/src/Parsers/MySQL/ASTAlterQuery.cpp b/src/Parsers/MySQL/ASTAlterQuery.cpp
index 59f0ada4e32..4e8c2cb5a6b 100644
--- a/src/Parsers/MySQL/ASTAlterQuery.cpp
+++ b/src/Parsers/MySQL/ASTAlterQuery.cpp
@@ -33,7 +33,7 @@ bool ParserAlterQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & e
     ASTPtr table;
     ASTPtr command_list;
 
-    if (!ParserKeyword("ALTER TABLE").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::ALTER_TABLE).ignore(pos, expected))
         return false;
 
     if (!ParserCompoundIdentifier(true).parse(pos, table, expected))
diff --git a/src/Parsers/MySQL/ASTCreateQuery.cpp b/src/Parsers/MySQL/ASTCreateQuery.cpp
index 227ac62f86d..d8b053591d6 100644
--- a/src/Parsers/MySQL/ASTCreateQuery.cpp
+++ b/src/Parsers/MySQL/ASTCreateQuery.cpp
@@ -51,29 +51,29 @@ bool ParserCreateQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     bool is_temporary = false;
     bool if_not_exists = false;
 
-    if (!ParserKeyword("CREATE").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::CREATE).ignore(pos, expected))
         return false;
 
-    if (ParserKeyword("TEMPORARY").ignore(pos, expected))
+    if (ParserKeyword(Keyword::TEMPORARY).ignore(pos, expected))
         is_temporary = true;
 
-    if (!ParserKeyword("TABLE").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::TABLE).ignore(pos, expected))
         return false;
 
-    if (ParserKeyword("IF NOT EXISTS").ignore(pos, expected))
+    if (ParserKeyword(Keyword::IF_NOT_EXISTS).ignore(pos, expected))
         if_not_exists = true;
 
     if (!ParserCompoundIdentifier(true).parse(pos, table, expected))
         return false;
 
-    if (ParserKeyword("LIKE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::LIKE).ignore(pos, expected))
     {
         if (!ParserCompoundIdentifier(true).parse(pos, like_table, expected))
             return false;
     }
     else if (ParserToken(TokenType::OpeningRoundBracket).ignore(pos, expected))
     {
-        if (ParserKeyword("LIKE").ignore(pos, expected))
+        if (ParserKeyword(Keyword::LIKE).ignore(pos, expected))
         {
             if (!ParserCompoundIdentifier(true).parse(pos, like_table, expected))
                 return false;
diff --git a/src/Parsers/MySQL/ASTDeclareConstraint.cpp b/src/Parsers/MySQL/ASTDeclareConstraint.cpp
index 96184dfc89d..414e259f08d 100644
--- a/src/Parsers/MySQL/ASTDeclareConstraint.cpp
+++ b/src/Parsers/MySQL/ASTDeclareConstraint.cpp
@@ -32,22 +32,22 @@ bool ParserDeclareConstraint::parseImpl(IParser::Pos & pos, ASTPtr & node, Expec
     ASTPtr index_check_expression;
     ParserExpression p_expression;
 
-    if (ParserKeyword("CONSTRAINT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::CONSTRAINT).ignore(pos, expected))
     {
-        if (!ParserKeyword("CHECK").checkWithoutMoving(pos, expected))
+        if (!ParserKeyword(Keyword::CHECK).checkWithoutMoving(pos, expected))
             ParserIdentifier().parse(pos, constraint_symbol, expected);
     }
 
 
-    if (!ParserKeyword("CHECK").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::CHECK).ignore(pos, expected))
         return false;
 
     if (!p_expression.parse(pos, index_check_expression, expected))
         return false;
 
-    if (ParserKeyword("NOT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::NOT).ignore(pos, expected))
     {
-        if (!ParserKeyword("ENFORCED").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::ENFORCED).ignore(pos, expected))
             return false;
 
         enforced = false;
@@ -55,7 +55,7 @@ bool ParserDeclareConstraint::parseImpl(IParser::Pos & pos, ASTPtr & node, Expec
     else
     {
         enforced = true;
-        ParserKeyword("ENFORCED").ignore(pos, expected);
+        ParserKeyword(Keyword::ENFORCED).ignore(pos, expected);
     }
 
     auto declare_constraint = std::make_shared<ASTDeclareConstraint>();
diff --git a/src/Parsers/MySQL/ASTDeclareIndex.cpp b/src/Parsers/MySQL/ASTDeclareIndex.cpp
index c5b4686e976..146f803e650 100644
--- a/src/Parsers/MySQL/ASTDeclareIndex.cpp
+++ b/src/Parsers/MySQL/ASTDeclareIndex.cpp
@@ -24,8 +24,8 @@ protected:
         if (!p_expression.parse(pos, node, expected))
             return false;
 
-        ParserKeyword("ASC").ignore(pos, expected);
-        ParserKeyword("DESC").ignore(pos, expected);
+        ParserKeyword(Keyword::ASC).ignore(pos, expected);
+        ParserKeyword(Keyword::DESC).ignore(pos, expected);
         return true;
     }
 };
@@ -61,12 +61,12 @@ ASTPtr ASTDeclareIndex::clone() const
 static inline bool parseDeclareOrdinaryIndex(IParser::Pos & pos, String & index_name, String & index_type, Expected & expected)
 {
     ASTPtr temp_node;
-    ParserKeyword k_key("KEY");
-    ParserKeyword k_index("INDEX");
+    ParserKeyword k_key(Keyword::KEY);
+    ParserKeyword k_index(Keyword::INDEX);
 
     ParserIdentifier p_identifier;
 
-    if (ParserKeyword("SPATIAL").ignore(pos, expected))
+    if (ParserKeyword(Keyword::SPATIAL).ignore(pos, expected))
     {
         if (!k_key.ignore(pos, expected))
             k_index.ignore(pos, expected);
@@ -75,7 +75,7 @@ static inline bool parseDeclareOrdinaryIndex(IParser::Pos & pos, String & index_
         if (p_identifier.parse(pos, temp_node, expected))
             index_name = temp_node->as<ASTIdentifier>()->name();
     }
-    else if (ParserKeyword("FULLTEXT").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::FULLTEXT).ignore(pos, expected))
     {
         if (!k_key.ignore(pos, expected))
             k_index.ignore(pos, expected);
@@ -96,7 +96,7 @@ static inline bool parseDeclareOrdinaryIndex(IParser::Pos & pos, String & index_
         if (p_identifier.parse(pos, temp_node, expected))
             index_name = temp_node->as<ASTIdentifier>()->name();
 
-        if (ParserKeyword("USING").ignore(pos, expected))
+        if (ParserKeyword(Keyword::USING).ignore(pos, expected))
         {
             if (!p_identifier.parse(pos, temp_node, expected))
                 return false;
@@ -113,11 +113,11 @@ static inline bool parseDeclareConstraintIndex(IParser::Pos & pos, String & inde
     ASTPtr temp_node;
     ParserIdentifier p_identifier;
 
-    if (ParserKeyword("CONSTRAINT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::CONSTRAINT).ignore(pos, expected))
     {
 
-        if (!ParserKeyword("PRIMARY").checkWithoutMoving(pos, expected) && !ParserKeyword("UNIQUE").checkWithoutMoving(pos, expected)
-            && !ParserKeyword("FOREIGN").checkWithoutMoving(pos, expected))
+        if (!ParserKeyword(Keyword::PRIMARY).checkWithoutMoving(pos, expected) && !ParserKeyword(Keyword::UNIQUE).checkWithoutMoving(pos, expected)
+            && !ParserKeyword(Keyword::FOREIGN).checkWithoutMoving(pos, expected))
         {
             if (!p_identifier.parse(pos, temp_node, expected))
                 return false;
@@ -126,16 +126,16 @@ static inline bool parseDeclareConstraintIndex(IParser::Pos & pos, String & inde
         }
     }
 
-    if (ParserKeyword("UNIQUE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::UNIQUE).ignore(pos, expected))
     {
-        if (!ParserKeyword("KEY").ignore(pos, expected))
-            ParserKeyword("INDEX").ignore(pos, expected);
+        if (!ParserKeyword(Keyword::KEY).ignore(pos, expected))
+            ParserKeyword(Keyword::INDEX).ignore(pos, expected);
 
         if (p_identifier.parse(pos, temp_node, expected))
             index_name = temp_node->as<ASTIdentifier>()->name();  /// reset index_name
 
         index_type = "UNIQUE_BTREE"; /// default btree index_type
-        if (ParserKeyword("USING").ignore(pos, expected))
+        if (ParserKeyword(Keyword::USING).ignore(pos, expected))
         {
             if (!p_identifier.parse(pos, temp_node, expected))
                 return false;
@@ -143,10 +143,10 @@ static inline bool parseDeclareConstraintIndex(IParser::Pos & pos, String & inde
             index_type = "UNIQUE_" + temp_node->as<ASTIdentifier>()->name();
         }
     }
-    else if (ParserKeyword("PRIMARY KEY").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::PRIMARY_KEY).ignore(pos, expected))
     {
         index_type = "PRIMARY_KEY_BTREE"; /// default btree index_type
-        if (ParserKeyword("USING").ignore(pos, expected))
+        if (ParserKeyword(Keyword::USING).ignore(pos, expected))
         {
             if (!p_identifier.parse(pos, temp_node, expected))
                 return false;
@@ -154,7 +154,7 @@ static inline bool parseDeclareConstraintIndex(IParser::Pos & pos, String & inde
             index_type = "PRIMARY_KEY_" + temp_node->as<ASTIdentifier>()->name();
         }
     }
-    else if (ParserKeyword("FOREIGN KEY").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::FOREIGN_KEY).ignore(pos, expected))
     {
         index_type = "FOREIGN";
         if (p_identifier.parse(pos, temp_node, expected))
diff --git a/src/Parsers/MySQL/ASTDeclareOption.cpp b/src/Parsers/MySQL/ASTDeclareOption.cpp
index 740d049bafd..f4be38f4f2d 100644
--- a/src/Parsers/MySQL/ASTDeclareOption.cpp
+++ b/src/Parsers/MySQL/ASTDeclareOption.cpp
@@ -23,7 +23,7 @@ bool ParserDeclareOptionImpl<recursive>::parseImpl(Pos & pos, ASTPtr & node, Exp
     {
         auto iterator = usage_parsers_cached.find(usage_name);
         if (iterator == usage_parsers_cached.end())
-            iterator = usage_parsers_cached.insert(std::make_pair(usage_name, std::make_shared<ParserKeyword>(usage_name))).first;
+            iterator = usage_parsers_cached.insert(std::make_pair(usage_name, ParserKeyword::createDeprecatedPtr(usage_name))).first;
 
         return iterator->second;
     };
diff --git a/src/Parsers/MySQL/ASTDeclareOption.h b/src/Parsers/MySQL/ASTDeclareOption.h
index 6e248b647c9..62fb42ded28 100644
--- a/src/Parsers/MySQL/ASTDeclareOption.h
+++ b/src/Parsers/MySQL/ASTDeclareOption.h
@@ -79,7 +79,7 @@ protected:
 
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 public:
-    ParserDeclareOptionImpl(const std::vector<OptionDescribe> & options_collection_) : options_collection(options_collection_) {}
+    explicit ParserDeclareOptionImpl(const std::vector<OptionDescribe> & options_collection_) : options_collection(options_collection_) {}
 };
 
 using ParserDeclareOption = ParserDeclareOptionImpl<false>;
diff --git a/src/Parsers/MySQL/ASTDeclarePartition.cpp b/src/Parsers/MySQL/ASTDeclarePartition.cpp
index 76f864fcc44..2647131fde5 100644
--- a/src/Parsers/MySQL/ASTDeclarePartition.cpp
+++ b/src/Parsers/MySQL/ASTDeclarePartition.cpp
@@ -46,7 +46,7 @@ ASTPtr ASTDeclarePartition::clone() const
 
 bool ParserDeclarePartition::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"PARTITION"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::PARTITION}.ignore(pos, expected))
         return false;
 
     ASTPtr options;
@@ -60,15 +60,15 @@ bool ParserDeclarePartition::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
     if (!p_identifier.parse(pos, partition_name, expected))
         return false;
 
-    ParserKeyword p_values("VALUES");
+    ParserKeyword p_values(Keyword::VALUES);
     if (p_values.ignore(pos, expected))
     {
-        if (ParserKeyword{"IN"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::IN}.ignore(pos, expected))
         {
             if (!p_expression.parse(pos, in_expression, expected))
                 return false;
         }
-        else if (ParserKeyword{"LESS THAN"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::LESS_THAN}.ignore(pos, expected))
         {
             if (!p_expression.parse(pos, less_than, expected))
                 return false;
diff --git a/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp b/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
index 199a5e2dd26..744beffe8e1 100644
--- a/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
+++ b/src/Parsers/MySQL/ASTDeclarePartitionOptions.cpp
@@ -49,30 +49,30 @@ static inline bool parsePartitionExpression(IParser::Pos & pos, std::string & ty
 {
     ASTPtr expression;
     ParserExpression p_expression;
-    if (!subpartition && ParserKeyword("LIST").ignore(pos, expected))
+    if (!subpartition && ParserKeyword(Keyword::LIST).ignore(pos, expected))
     {
         type = "list";
-        ParserKeyword("COLUMNS").ignore(pos, expected);
+        ParserKeyword(Keyword::COLUMNS).ignore(pos, expected);
         if (!p_expression.parse(pos, expression, expected))
             return false;
     }
-    else if (!subpartition && ParserKeyword("RANGE").ignore(pos, expected))
+    else if (!subpartition && ParserKeyword(Keyword::RANGE).ignore(pos, expected))
     {
         type = "range";
-        ParserKeyword("COLUMNS").ignore(pos, expected);
+        ParserKeyword(Keyword::COLUMNS).ignore(pos, expected);
         if (!p_expression.parse(pos, expression, expected))
             return false;
     }
     else
     {
-        if (ParserKeyword("LINEAR").ignore(pos, expected))
+        if (ParserKeyword(Keyword::LINEAR).ignore(pos, expected))
             type = "linear_";
 
-        if (ParserKeyword("KEY").ignore(pos, expected))
+        if (ParserKeyword(Keyword::KEY).ignore(pos, expected))
         {
             type += "key";
 
-            if (ParserKeyword("ALGORITHM").ignore(pos, expected))
+            if (ParserKeyword(Keyword::ALGORITHM).ignore(pos, expected))
             {
                 if (!ParserToken(TokenType::Equals).ignore(pos, expected))
                     return false;
@@ -93,7 +93,7 @@ static inline bool parsePartitionExpression(IParser::Pos & pos, std::string & ty
             if (!p_expression.parse(pos, expression, expected))
                 return false;
         }
-        else if (ParserKeyword("HASH").ignore(pos, expected))
+        else if (ParserKeyword(Keyword::HASH).ignore(pos, expected))
         {
             type += "hash";
             if (!p_expression.parse(pos, expression, expected))
@@ -117,25 +117,25 @@ bool ParserDeclarePartitionOptions::parseImpl(Pos & pos, ASTPtr & node, Expected
     ASTPtr subpartition_expression;
     ASTPtr declare_partitions;
 
-    if (!ParserKeyword("PARTITION BY").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::PARTITION_BY).ignore(pos, expected))
         return false;
 
     if (!parsePartitionExpression(pos, partition_type, partition_expression, expected))
         return false;
 
-    if (ParserKeyword("PARTITIONS").ignore(pos, expected))
+    if (ParserKeyword(Keyword::PARTITIONS).ignore(pos, expected))
     {
         ParserLiteral p_literal;
         if (!p_literal.parse(pos, partition_numbers, expected))
             return false;
     }
 
-    if (ParserKeyword("SUBPARTITION BY").ignore(pos, expected))
+    if (ParserKeyword(Keyword::SUBPARTITION_BY).ignore(pos, expected))
     {
         if (!parsePartitionExpression(pos, subpartition_type, subpartition_expression, expected, true))
             return false;
 
-        if (ParserKeyword("SUBPARTITIONS").ignore(pos, expected))
+        if (ParserKeyword(Keyword::SUBPARTITIONS).ignore(pos, expected))
         {
             ParserLiteral p_literal;
             if (!p_literal.parse(pos, subpartition_numbers, expected))
diff --git a/src/Parsers/MySQL/ASTDeclareReference.cpp b/src/Parsers/MySQL/ASTDeclareReference.cpp
index 862d35e2b76..c8d6c4cd2ee 100644
--- a/src/Parsers/MySQL/ASTDeclareReference.cpp
+++ b/src/Parsers/MySQL/ASTDeclareReference.cpp
@@ -13,15 +13,15 @@ namespace MySQLParser
 
 bool parseReferenceOption(IParser::Pos & pos, ASTDeclareReference::ReferenceOption & option, Expected & expected)
 {
-    if (ParserKeyword("RESTRICT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::RESTRICT).ignore(pos, expected))
         option = ASTDeclareReference::RESTRICT;
-    else if (ParserKeyword("CASCADE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::CASCADE).ignore(pos, expected))
         option = ASTDeclareReference::CASCADE;
-    else if (ParserKeyword("SET NULL").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::SET_NULL).ignore(pos, expected))
         option = ASTDeclareReference::SET_NULL;
-    else if (ParserKeyword("NO ACTION").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::NO_ACTION).ignore(pos, expected))
         option = ASTDeclareReference::NO_ACTION;
-    else if (ParserKeyword("SET DEFAULT").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::SET_DEFAULT).ignore(pos, expected))
         option = ASTDeclareReference::SET_DEFAULT;
     else
         return false;
@@ -53,7 +53,7 @@ bool ParserDeclareReference::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
     ASTDeclareReference::ReferenceOption delete_option = ASTDeclareReference::RESTRICT;
     ASTDeclareReference::ReferenceOption update_option = ASTDeclareReference::RESTRICT;
 
-    if (!ParserKeyword("REFERENCES").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::REFERENCES).ignore(pos, expected))
         return false;
 
     if (!p_identifier.parse(pos, table_name, expected))
@@ -62,13 +62,13 @@ bool ParserDeclareReference::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
     if (!p_expression.parse(pos, expression, expected))
         return false;
 
-    if (ParserKeyword("MATCH").ignore(pos, expected))
+    if (ParserKeyword(Keyword::MATCH).ignore(pos, expected))
     {
-        if (ParserKeyword("FULL").ignore(pos, expected))
+        if (ParserKeyword(Keyword::FULL).ignore(pos, expected))
             match_kind = ASTDeclareReference::MATCH_FULL;
-        else if (ParserKeyword("SIMPLE").ignore(pos, expected))
+        else if (ParserKeyword(Keyword::SIMPLE).ignore(pos, expected))
             match_kind = ASTDeclareReference::MATCH_SIMPLE;
-        else if (ParserKeyword("PARTIAL").ignore(pos, expected))
+        else if (ParserKeyword(Keyword::PARTIAL).ignore(pos, expected))
             match_kind = ASTDeclareReference::MATCH_PARTIAL;
         else
             return false;
@@ -76,12 +76,12 @@ bool ParserDeclareReference::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
 
     while (true)
     {
-        if (ParserKeyword("ON DELETE").ignore(pos, expected))
+        if (ParserKeyword(Keyword::ON_DELETE).ignore(pos, expected))
         {
             if (!parseReferenceOption(pos, delete_option, expected))
                 return false;
         }
-        else if (ParserKeyword("ON UPDATE").ignore(pos, expected))
+        else if (ParserKeyword(Keyword::ON_UPDATE).ignore(pos, expected))
         {
             if (!parseReferenceOption(pos, update_option, expected))
                 return false;
diff --git a/src/Parsers/MySQL/ASTDeclareSubPartition.cpp b/src/Parsers/MySQL/ASTDeclareSubPartition.cpp
index d77fba271c4..e0f8098501e 100644
--- a/src/Parsers/MySQL/ASTDeclareSubPartition.cpp
+++ b/src/Parsers/MySQL/ASTDeclareSubPartition.cpp
@@ -13,7 +13,7 @@ namespace MySQLParser
 
 bool ParserDeclareSubPartition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"SUBPARTITION"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::SUBPARTITION}.ignore(pos, expected))
         return false;
 
     ASTPtr options;
diff --git a/src/Parsers/MySQL/ASTDeclareTableOptions.cpp b/src/Parsers/MySQL/ASTDeclareTableOptions.cpp
index c903c7d2fa7..05008e79f19 100644
--- a/src/Parsers/MySQL/ASTDeclareTableOptions.cpp
+++ b/src/Parsers/MySQL/ASTDeclareTableOptions.cpp
@@ -23,7 +23,7 @@ protected:
     {
         if constexpr (allow_default)
         {
-            if (ParserKeyword("DEFAULT").ignore(pos, expected))
+            if (ParserKeyword(Keyword::DEFAULT).ignore(pos, expected))
             {
                 node = std::make_shared<ASTIdentifier>("DEFAULT");
                 return true;
@@ -49,11 +49,11 @@ protected:
         if (!p_identifier.parse(pos, node, expected))
             return false;
 
-        if (ParserKeyword("STORAGE").ignore(pos, expected))
+        if (ParserKeyword(Keyword::STORAGE).ignore(pos, expected))
         {
-            if (!ParserKeyword("DISK").ignore(pos, expected))
+            if (!ParserKeyword(Keyword::DISK).ignore(pos, expected))
             {
-                if (!ParserKeyword("MEMORY").ignore(pos, expected))
+                if (!ParserKeyword(Keyword::MEMORY).ignore(pos, expected))
                     return false;
             }
         }
diff --git a/src/Parsers/MySQL/ASTDropQuery.cpp b/src/Parsers/MySQL/ASTDropQuery.cpp
index 890451e3e55..0879186a775 100644
--- a/src/Parsers/MySQL/ASTDropQuery.cpp
+++ b/src/Parsers/MySQL/ASTDropQuery.cpp
@@ -23,20 +23,20 @@ ASTPtr ASTDropQuery::clone() const
 
 bool ParserDropQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_truncate("TRUNCATE");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_database("DATABASE");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword on("ON");
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_truncate(Keyword::TRUNCATE);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_database(Keyword::DATABASE);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword on(Keyword::ON);
     ParserIdentifier name_p(false);
 
-    ParserKeyword s_event("EVENT");
-    ParserKeyword s_function("FUNCTION");
-    ParserKeyword s_index("INDEX");
-    ParserKeyword s_server("SERVER");
-    ParserKeyword s_trigger("TRIGGER");
+    ParserKeyword s_event(Keyword::EVENT);
+    ParserKeyword s_function(Keyword::FUNCTION);
+    ParserKeyword s_index(Keyword::INDEX);
+    ParserKeyword s_server(Keyword::SERVER);
+    ParserKeyword s_trigger(Keyword::TRIGGER);
 
     auto query = std::make_shared<ASTDropQuery>();
     node = query;
diff --git a/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp b/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
index d406cdbd3b9..4db96646e16 100644
--- a/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_alter_command_parser.cpp
@@ -11,7 +11,7 @@ using namespace DB::MySQLParser;
 
 static inline ASTPtr tryParserQuery(IParser & parser, const String & query)
 {
-    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, 0);
+    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, 0, 0);
 }
 
 TEST(ParserAlterCommand, AddAlterCommand)
diff --git a/src/Parsers/MySQL/tests/gtest_alter_parser.cpp b/src/Parsers/MySQL/tests/gtest_alter_parser.cpp
index 4ebbe332710..2b12d7bdcf1 100644
--- a/src/Parsers/MySQL/tests/gtest_alter_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_alter_parser.cpp
@@ -9,7 +9,7 @@ using namespace DB::MySQLParser;
 
 static inline ASTPtr tryParserQuery(IParser & parser, const String & query)
 {
-    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, 0);
+    return parseQuery(parser, query.data(), query.data() + query.size(), "", 0, 0, 0);
 }
 
 TEST(ParserAlterQuery, AlterQuery)
diff --git a/src/Parsers/MySQL/tests/gtest_column_parser.cpp b/src/Parsers/MySQL/tests/gtest_column_parser.cpp
index 4adc24033d2..21c37e4ee2e 100644
--- a/src/Parsers/MySQL/tests/gtest_column_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_column_parser.cpp
@@ -17,7 +17,7 @@ TEST(ParserColumn, AllNonGeneratedColumnOption)
 
     String input = "col_01 VARCHAR(100) NOT NULL DEFAULT NULL AUTO_INCREMENT UNIQUE KEY PRIMARY KEY COMMENT 'column comment' COLLATE utf8 "
                    "COLUMN_FORMAT FIXED STORAGE MEMORY REFERENCES tbl_name (col_01) CHECK 1";
-    ASTPtr ast = parseQuery(p_column, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_column, input.data(), input.data() + input.size(), "", 0, 0, 0);
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->name, "col_01");
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTFunction>()->name, "VARCHAR");
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTFunction>()->arguments->children[0]->as<ASTLiteral>()->value.safeGet<UInt64>(), 100);
@@ -28,7 +28,7 @@ TEST(ParserColumn, AllNonGeneratedColumnOption)
     EXPECT_EQ(declare_options->changes["auto_increment"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
     EXPECT_EQ(declare_options->changes["unique_key"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
     EXPECT_EQ(declare_options->changes["primary_key"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
-    EXPECT_EQ(declare_options->changes["comment"]->as<ASTLiteral>()->value.safeGet<DB::String>(), "column comment");
+    EXPECT_EQ(declare_options->changes["comment"]->as<ASTLiteral>()->value.safeGet<String>(), "column comment");
     EXPECT_EQ(declare_options->changes["collate"]->as<ASTIdentifier>()->name(), "utf8");
     EXPECT_EQ(declare_options->changes["column_format"]->as<ASTIdentifier>()->name(), "FIXED");
     EXPECT_EQ(declare_options->changes["storage"]->as<ASTIdentifier>()->name(), "MEMORY");
@@ -42,7 +42,7 @@ TEST(ParserColumn, AllGeneratedColumnOption)
 
     String input = "col_01 VARCHAR(100) NULL UNIQUE KEY PRIMARY KEY COMMENT 'column comment' COLLATE utf8 "
                    "REFERENCES tbl_name (col_01) CHECK 1 GENERATED ALWAYS AS (1) STORED";
-    ASTPtr ast = parseQuery(p_column, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_column, input.data(), input.data() + input.size(), "", 0, 0, 0);
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->name, "col_01");
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTFunction>()->name, "VARCHAR");
     EXPECT_EQ(ast->as<ASTDeclareColumn>()->data_type->as<ASTFunction>()->arguments->children[0]->as<ASTLiteral>()->value.safeGet<UInt64>(), 100);
@@ -51,7 +51,7 @@ TEST(ParserColumn, AllGeneratedColumnOption)
     EXPECT_EQ(declare_options->changes["is_null"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
     EXPECT_EQ(declare_options->changes["unique_key"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
     EXPECT_EQ(declare_options->changes["primary_key"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
-    EXPECT_EQ(declare_options->changes["comment"]->as<ASTLiteral>()->value.safeGet<DB::String>(), "column comment");
+    EXPECT_EQ(declare_options->changes["comment"]->as<ASTLiteral>()->value.safeGet<String>(), "column comment");
     EXPECT_EQ(declare_options->changes["collate"]->as<ASTIdentifier>()->name(), "utf8");
     EXPECT_EQ(declare_options->changes["generated"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
     EXPECT_EQ(declare_options->changes["is_stored"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
diff --git a/src/Parsers/MySQL/tests/gtest_constraint_parser.cpp b/src/Parsers/MySQL/tests/gtest_constraint_parser.cpp
index 9c9124c9f58..a06f2ade24a 100644
--- a/src/Parsers/MySQL/tests/gtest_constraint_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_constraint_parser.cpp
@@ -14,7 +14,7 @@ TEST(ParserConstraint, CheckConstraint)
     ParserDeclareConstraint p_constraint;
 
     String constraint_01 = "CONSTRAINT symbol_name CHECK col_01 = 1";
-    ASTPtr ast_constraint_01 = parseQuery(p_constraint, constraint_01.data(), constraint_01.data() + constraint_01.size(), "", 0, 0);
+    ASTPtr ast_constraint_01 = parseQuery(p_constraint, constraint_01.data(), constraint_01.data() + constraint_01.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_constraint_01->as<ASTDeclareConstraint>()->constraint_name, "symbol_name");
     auto * check_expression_01 = ast_constraint_01->as<ASTDeclareConstraint>()->check_expression->as<ASTFunction>();
     EXPECT_EQ(check_expression_01->name, "equals");
@@ -22,7 +22,7 @@ TEST(ParserConstraint, CheckConstraint)
     EXPECT_EQ(check_expression_01->arguments->children[1]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
 
     String constraint_02 = "CONSTRAINT CHECK col_01 = 1";
-    ASTPtr ast_constraint_02 = parseQuery(p_constraint, constraint_02.data(), constraint_02.data() + constraint_02.size(), "", 0, 0);
+    ASTPtr ast_constraint_02 = parseQuery(p_constraint, constraint_02.data(), constraint_02.data() + constraint_02.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_constraint_02->as<ASTDeclareConstraint>()->constraint_name, "");
     auto * check_expression_02 = ast_constraint_02->as<ASTDeclareConstraint>()->check_expression->as<ASTFunction>();
     EXPECT_EQ(check_expression_02->name, "equals");
@@ -30,7 +30,7 @@ TEST(ParserConstraint, CheckConstraint)
     EXPECT_EQ(check_expression_02->arguments->children[1]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
 
     String constraint_03 = "CHECK col_01 = 1";
-    ASTPtr ast_constraint_03 = parseQuery(p_constraint, constraint_03.data(), constraint_03.data() + constraint_03.size(), "", 0, 0);
+    ASTPtr ast_constraint_03 = parseQuery(p_constraint, constraint_03.data(), constraint_03.data() + constraint_03.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_constraint_03->as<ASTDeclareConstraint>()->constraint_name, "");
     auto * check_expression_03 = ast_constraint_03->as<ASTDeclareConstraint>()->check_expression->as<ASTFunction>();
     EXPECT_EQ(check_expression_03->name, "equals");
@@ -38,7 +38,7 @@ TEST(ParserConstraint, CheckConstraint)
     EXPECT_EQ(check_expression_03->arguments->children[1]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
 
     String constraint_04 = "CONSTRAINT CHECK col_01 = 1 ENFORCED";
-    ASTPtr ast_constraint_04 = parseQuery(p_constraint, constraint_04.data(), constraint_04.data() + constraint_04.size(), "", 0, 0);
+    ASTPtr ast_constraint_04 = parseQuery(p_constraint, constraint_04.data(), constraint_04.data() + constraint_04.size(), "", 0, 0, 0);
     EXPECT_TRUE(ast_constraint_04->as<ASTDeclareConstraint>()->enforced);
     EXPECT_EQ(ast_constraint_04->as<ASTDeclareConstraint>()->constraint_name, "");
     auto * check_expression_04 = ast_constraint_04->as<ASTDeclareConstraint>()->check_expression->as<ASTFunction>();
@@ -47,7 +47,7 @@ TEST(ParserConstraint, CheckConstraint)
     EXPECT_EQ(check_expression_04->arguments->children[1]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
 
     String constraint_05 = "CONSTRAINT CHECK col_01 = 1 NOT ENFORCED";
-    ASTPtr ast_constraint_05 = parseQuery(p_constraint, constraint_05.data(), constraint_05.data() + constraint_05.size(), "", 0, 0);
+    ASTPtr ast_constraint_05 = parseQuery(p_constraint, constraint_05.data(), constraint_05.data() + constraint_05.size(), "", 0, 0, 0);
     EXPECT_FALSE(ast_constraint_05->as<ASTDeclareConstraint>()->enforced);
     EXPECT_EQ(ast_constraint_05->as<ASTDeclareConstraint>()->constraint_name, "");
     auto * check_expression_05 = ast_constraint_05->as<ASTDeclareConstraint>()->check_expression->as<ASTFunction>();
diff --git a/src/Parsers/MySQL/tests/gtest_create_parser.cpp b/src/Parsers/MySQL/tests/gtest_create_parser.cpp
index 2f65eb6e592..8512b88ffc1 100644
--- a/src/Parsers/MySQL/tests/gtest_create_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_create_parser.cpp
@@ -15,16 +15,16 @@ TEST(CreateTableParser, LikeCreate)
 {
     ParserCreateQuery p_create_query;
     String like_create_01 = "CREATE TABLE IF NOT EXISTS table_name LIKE table_name_01";
-    parseQuery(p_create_query, like_create_01.data(), like_create_01.data() + like_create_01.size(), "", 0, 0);
+    parseQuery(p_create_query, like_create_01.data(), like_create_01.data() + like_create_01.size(), "", 0, 0, 0);
     String like_create_02 = "CREATE TABLE IF NOT EXISTS table_name (LIKE table_name_01)";
-    parseQuery(p_create_query, like_create_02.data(), like_create_02.data() + like_create_02.size(), "", 0, 0);
+    parseQuery(p_create_query, like_create_02.data(), like_create_02.data() + like_create_02.size(), "", 0, 0, 0);
 }
 
 TEST(CreateTableParser, SimpleCreate)
 {
     ParserCreateQuery p_create_query;
     String input = "CREATE TABLE IF NOT EXISTS table_name(col_01 VARCHAR(100), INDEX (col_01), CHECK 1) ENGINE INNODB PARTITION BY HASH(col_01)";
-    ASTPtr ast = parseQuery(p_create_query, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_create_query, input.data(), input.data() + input.size(), "", 0, 0, 0);
     EXPECT_TRUE(ast->as<ASTCreateQuery>()->if_not_exists);
     EXPECT_EQ(ast->as<ASTCreateQuery>()->columns_list->as<ASTCreateDefines>()->columns->children.size(), 1);
     EXPECT_EQ(ast->as<ASTCreateQuery>()->columns_list->as<ASTCreateDefines>()->indices->children.size(), 1);
@@ -37,7 +37,7 @@ TEST(CreateTableParser, SS)
 {
     ParserCreateQuery p_create_query;
     String input = "CREATE TABLE `test_table_1` (`a` int DEFAULT NULL, `b` int DEFAULT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci";
-    ASTPtr ast = parseQuery(p_create_query, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_create_query, input.data(), input.data() + input.size(), "", 0, 0, 0);
     WriteBufferFromOStream buf(std::cerr, 4096);
     ast->dumpTree(buf);
     buf.finalize();
diff --git a/src/Parsers/MySQL/tests/gtest_index_parser.cpp b/src/Parsers/MySQL/tests/gtest_index_parser.cpp
index a8be6787b2c..187bac3e090 100644
--- a/src/Parsers/MySQL/tests/gtest_index_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_index_parser.cpp
@@ -14,7 +14,7 @@ TEST(ParserIndex, AllIndexOptions)
     String input = "INDEX (col_01, col_02(100), col_03 DESC) KEY_BLOCK_SIZE 3 USING HASH WITH PARSER parser_name COMMENT 'index comment' VISIBLE";
 
     ParserDeclareIndex p_index;
-    ASTPtr ast = parseQuery(p_index, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_index, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareIndex * declare_index = ast->as<ASTDeclareIndex>();
     EXPECT_EQ(declare_index->index_columns->children[0]->as<ASTIdentifier>()->name(), "col_01");
@@ -33,7 +33,7 @@ TEST(ParserIndex, OptionalIndexOptions)
     String input = "INDEX (col_01, col_02(100), col_03 DESC) USING HASH INVISIBLE KEY_BLOCK_SIZE 3";
 
     ParserDeclareIndex p_index;
-    ASTPtr ast = parseQuery(p_index, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_index, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareIndex * declare_index = ast->as<ASTDeclareIndex>();
     EXPECT_EQ(declare_index->index_columns->children[0]->as<ASTIdentifier>()->name(), "col_01");
@@ -50,28 +50,28 @@ TEST(ParserIndex, OrdinaryIndex)
 {
     ParserDeclareIndex p_index;
     String non_unique_index_01 = "KEY index_name USING HASH (col_01) INVISIBLE";
-    parseQuery(p_index, non_unique_index_01.data(), non_unique_index_01.data() + non_unique_index_01.size(), "", 0, 0);
+    parseQuery(p_index, non_unique_index_01.data(), non_unique_index_01.data() + non_unique_index_01.size(), "", 0, 0, 0);
 
     String non_unique_index_02 = "INDEX index_name USING HASH (col_01) INVISIBLE";
-    parseQuery(p_index, non_unique_index_02.data(), non_unique_index_02.data() + non_unique_index_02.size(), "", 0, 0);
+    parseQuery(p_index, non_unique_index_02.data(), non_unique_index_02.data() + non_unique_index_02.size(), "", 0, 0, 0);
 
     String fulltext_index_01 = "FULLTEXT index_name (col_01) INVISIBLE";
-    parseQuery(p_index, fulltext_index_01.data(), fulltext_index_01.data() + fulltext_index_01.size(), "", 0, 0);
+    parseQuery(p_index, fulltext_index_01.data(), fulltext_index_01.data() + fulltext_index_01.size(), "", 0, 0, 0);
 
     String fulltext_index_02 = "FULLTEXT INDEX index_name (col_01) INVISIBLE";
-    parseQuery(p_index, fulltext_index_02.data(), fulltext_index_02.data() + fulltext_index_02.size(), "", 0, 0);
+    parseQuery(p_index, fulltext_index_02.data(), fulltext_index_02.data() + fulltext_index_02.size(), "", 0, 0, 0);
 
     String fulltext_index_03 = "FULLTEXT KEY index_name (col_01) INVISIBLE";
-    parseQuery(p_index, fulltext_index_03.data(), fulltext_index_03.data() + fulltext_index_03.size(), "", 0, 0);
+    parseQuery(p_index, fulltext_index_03.data(), fulltext_index_03.data() + fulltext_index_03.size(), "", 0, 0, 0);
 
     String spatial_index_01 = "SPATIAL index_name (col_01) INVISIBLE";
-    parseQuery(p_index, spatial_index_01.data(), spatial_index_01.data() + spatial_index_01.size(), "", 0, 0);
+    parseQuery(p_index, spatial_index_01.data(), spatial_index_01.data() + spatial_index_01.size(), "", 0, 0, 0);
 
     String spatial_index_02 = "SPATIAL INDEX index_name (col_01) INVISIBLE";
-    parseQuery(p_index, spatial_index_02.data(), spatial_index_02.data() + spatial_index_02.size(), "", 0, 0);
+    parseQuery(p_index, spatial_index_02.data(), spatial_index_02.data() + spatial_index_02.size(), "", 0, 0, 0);
 
     String spatial_index_03 = "SPATIAL KEY index_name (col_01) INVISIBLE";
-    parseQuery(p_index, spatial_index_03.data(), spatial_index_03.data() + spatial_index_03.size(), "", 0, 0);
+    parseQuery(p_index, spatial_index_03.data(), spatial_index_03.data() + spatial_index_03.size(), "", 0, 0, 0);
 }
 
 TEST(ParserIndex, ConstraintIndex)
@@ -79,47 +79,47 @@ TEST(ParserIndex, ConstraintIndex)
     ParserDeclareIndex p_index;
 
     String primary_key_01 = "PRIMARY KEY (col_01) INVISIBLE";
-    parseQuery(p_index, primary_key_01.data(), primary_key_01.data() + primary_key_01.size(), "", 0, 0);
+    parseQuery(p_index, primary_key_01.data(), primary_key_01.data() + primary_key_01.size(), "", 0, 0, 0);
 
     String primary_key_02 = "PRIMARY KEY USING BTREE (col_01) INVISIBLE";
-    parseQuery(p_index, primary_key_02.data(), primary_key_02.data() + primary_key_02.size(), "", 0, 0);
+    parseQuery(p_index, primary_key_02.data(), primary_key_02.data() + primary_key_02.size(), "", 0, 0, 0);
 
     String primary_key_03 = "CONSTRAINT PRIMARY KEY USING BTREE (col_01) INVISIBLE";
-    parseQuery(p_index, primary_key_03.data(), primary_key_03.data() + primary_key_03.size(), "", 0, 0);
+    parseQuery(p_index, primary_key_03.data(), primary_key_03.data() + primary_key_03.size(), "", 0, 0, 0);
 
     String primary_key_04 = "CONSTRAINT index_name PRIMARY KEY USING BTREE (col_01) INVISIBLE";
-    parseQuery(p_index, primary_key_04.data(), primary_key_04.data() + primary_key_04.size(), "", 0, 0);
+    parseQuery(p_index, primary_key_04.data(), primary_key_04.data() + primary_key_04.size(), "", 0, 0, 0);
 
     String unique_key_01 = "UNIQUE (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_01.data(), unique_key_01.data() + unique_key_01.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_01.data(), unique_key_01.data() + unique_key_01.size(), "", 0, 0, 0);
 
     String unique_key_02 = "UNIQUE INDEX (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_02.data(), unique_key_02.data() + unique_key_02.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_02.data(), unique_key_02.data() + unique_key_02.size(), "", 0, 0, 0);
 
     String unique_key_03 = "UNIQUE KEY (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_03.data(), unique_key_03.data() + unique_key_03.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_03.data(), unique_key_03.data() + unique_key_03.size(), "", 0, 0, 0);
 
     String unique_key_04 = "UNIQUE KEY index_name (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_04.data(), unique_key_04.data() + unique_key_04.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_04.data(), unique_key_04.data() + unique_key_04.size(), "", 0, 0, 0);
 
     String unique_key_05 = "UNIQUE KEY index_name USING HASH (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_05.data(), unique_key_05.data() + unique_key_05.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_05.data(), unique_key_05.data() + unique_key_05.size(), "", 0, 0, 0);
 
     String unique_key_06 = "CONSTRAINT UNIQUE KEY index_name USING HASH (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_06.data(), unique_key_06.data() + unique_key_06.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_06.data(), unique_key_06.data() + unique_key_06.size(), "", 0, 0, 0);
 
     String unique_key_07 = "CONSTRAINT index_name UNIQUE KEY index_name_1 USING HASH (col_01) INVISIBLE";
-    parseQuery(p_index, unique_key_07.data(), unique_key_07.data() + unique_key_07.size(), "", 0, 0);
+    parseQuery(p_index, unique_key_07.data(), unique_key_07.data() + unique_key_07.size(), "", 0, 0, 0);
 
     String foreign_key_01 = "FOREIGN KEY (col_01) REFERENCES tbl_name (col_01)";
-    parseQuery(p_index, foreign_key_01.data(), foreign_key_01.data() + foreign_key_01.size(), "", 0, 0);
+    parseQuery(p_index, foreign_key_01.data(), foreign_key_01.data() + foreign_key_01.size(), "", 0, 0, 0);
 
     String foreign_key_02 = "FOREIGN KEY index_name (col_01) REFERENCES tbl_name (col_01)";
-    parseQuery(p_index, foreign_key_02.data(), foreign_key_02.data() + foreign_key_02.size(), "", 0, 0);
+    parseQuery(p_index, foreign_key_02.data(), foreign_key_02.data() + foreign_key_02.size(), "", 0, 0, 0);
 
     String foreign_key_03 = "CONSTRAINT FOREIGN KEY index_name (col_01) REFERENCES tbl_name (col_01)";
-    parseQuery(p_index, foreign_key_03.data(), foreign_key_03.data() + foreign_key_03.size(), "", 0, 0);
+    parseQuery(p_index, foreign_key_03.data(), foreign_key_03.data() + foreign_key_03.size(), "", 0, 0, 0);
 
     String foreign_key_04 = "CONSTRAINT index_name FOREIGN KEY index_name_01 (col_01) REFERENCES tbl_name (col_01)";
-    parseQuery(p_index, foreign_key_04.data(), foreign_key_04.data() + foreign_key_04.size(), "", 0, 0);
+    parseQuery(p_index, foreign_key_04.data(), foreign_key_04.data() + foreign_key_04.size(), "", 0, 0, 0);
 }
diff --git a/src/Parsers/MySQL/tests/gtest_partition_options_parser.cpp b/src/Parsers/MySQL/tests/gtest_partition_options_parser.cpp
index 01b757e5891..6ec8d73530e 100644
--- a/src/Parsers/MySQL/tests/gtest_partition_options_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_partition_options_parser.cpp
@@ -14,14 +14,14 @@ TEST(ParserPartitionOptions, HashPatitionOptions)
     String hash_partition = "PARTITION BY HASH(col_01)";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast_01 = parseQuery(p_partition_options, hash_partition.data(), hash_partition.data() + hash_partition.size(), "", 0, 0);
+    ASTPtr ast_01 = parseQuery(p_partition_options, hash_partition.data(), hash_partition.data() + hash_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_01 = ast_01->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_01->partition_type, "hash");
     EXPECT_EQ(declare_partition_options_01->partition_expression->as<ASTIdentifier>()->name(), "col_01");
 
     String linear_hash_partition = "PARTITION BY LINEAR HASH(col_01)";
-    ASTPtr ast_02 = parseQuery(p_partition_options, linear_hash_partition.data(), linear_hash_partition.data() + linear_hash_partition.size(), "", 0, 0);
+    ASTPtr ast_02 = parseQuery(p_partition_options, linear_hash_partition.data(), linear_hash_partition.data() + linear_hash_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_02 = ast_02->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_02->partition_type, "linear_hash");
@@ -33,14 +33,14 @@ TEST(ParserPartitionOptions, KeyPatitionOptions)
     String key_partition = "PARTITION BY KEY(col_01)";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast_01 = parseQuery(p_partition_options, key_partition.data(), key_partition.data() + key_partition.size(), "", 0, 0);
+    ASTPtr ast_01 = parseQuery(p_partition_options, key_partition.data(), key_partition.data() + key_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_01 = ast_01->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_01->partition_type, "key");
     EXPECT_EQ(declare_partition_options_01->partition_expression->as<ASTIdentifier>()->name(), "col_01");
 
     String linear_key_partition = "PARTITION BY LINEAR KEY(col_01, col_02)";
-    ASTPtr ast_02 = parseQuery(p_partition_options, linear_key_partition.data(), linear_key_partition.data() + linear_key_partition.size(), "", 0, 0);
+    ASTPtr ast_02 = parseQuery(p_partition_options, linear_key_partition.data(), linear_key_partition.data() + linear_key_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_02 = ast_02->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_02->partition_type, "linear_key");
@@ -49,7 +49,7 @@ TEST(ParserPartitionOptions, KeyPatitionOptions)
     EXPECT_EQ(columns_list->children[1]->as<ASTIdentifier>()->name(), "col_02");
 
     String key_partition_with_algorithm = "PARTITION BY KEY ALGORITHM=1 (col_01)";
-    ASTPtr ast_03 = parseQuery(p_partition_options, key_partition_with_algorithm.data(), key_partition_with_algorithm.data() + key_partition_with_algorithm.size(), "", 0, 0);
+    ASTPtr ast_03 = parseQuery(p_partition_options, key_partition_with_algorithm.data(), key_partition_with_algorithm.data() + key_partition_with_algorithm.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_03 = ast_03->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_03->partition_type, "key_1");
@@ -61,14 +61,14 @@ TEST(ParserPartitionOptions, RangePatitionOptions)
     String range_partition = "PARTITION BY RANGE(col_01)";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast_01 = parseQuery(p_partition_options, range_partition.data(), range_partition.data() + range_partition.size(), "", 0, 0);
+    ASTPtr ast_01 = parseQuery(p_partition_options, range_partition.data(), range_partition.data() + range_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_01 = ast_01->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_01->partition_type, "range");
     EXPECT_EQ(declare_partition_options_01->partition_expression->as<ASTIdentifier>()->name(), "col_01");
 
     String range_columns_partition = "PARTITION BY RANGE COLUMNS(col_01, col_02)";
-    ASTPtr ast_02 = parseQuery(p_partition_options, range_columns_partition.data(), range_columns_partition.data() + range_columns_partition.size(), "", 0, 0);
+    ASTPtr ast_02 = parseQuery(p_partition_options, range_columns_partition.data(), range_columns_partition.data() + range_columns_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_02 = ast_02->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_02->partition_type, "range");
@@ -82,14 +82,14 @@ TEST(ParserPartitionOptions, ListPatitionOptions)
     String range_partition = "PARTITION BY LIST(col_01)";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast_01 = parseQuery(p_partition_options, range_partition.data(), range_partition.data() + range_partition.size(), "", 0, 0);
+    ASTPtr ast_01 = parseQuery(p_partition_options, range_partition.data(), range_partition.data() + range_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_01 = ast_01->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_01->partition_type, "list");
     EXPECT_EQ(declare_partition_options_01->partition_expression->as<ASTIdentifier>()->name(), "col_01");
 
     String range_columns_partition = "PARTITION BY LIST COLUMNS(col_01, col_02)";
-    ASTPtr ast_02 = parseQuery(p_partition_options, range_columns_partition.data(), range_columns_partition.data() + range_columns_partition.size(), "", 0, 0);
+    ASTPtr ast_02 = parseQuery(p_partition_options, range_columns_partition.data(), range_columns_partition.data() + range_columns_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options_02 = ast_02->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options_02->partition_type, "list");
@@ -103,7 +103,7 @@ TEST(ParserPartitionOptions, PatitionNumberOptions)
     String numbers_partition = "PARTITION BY KEY(col_01) PARTITIONS 2";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast = parseQuery(p_partition_options, numbers_partition.data(), numbers_partition.data() + numbers_partition.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_partition_options, numbers_partition.data(), numbers_partition.data() + numbers_partition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options = ast->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options->partition_type, "key");
@@ -116,7 +116,7 @@ TEST(ParserPartitionOptions, PatitionWithSubpartitionOptions)
     String partition_with_subpartition = "PARTITION BY KEY(col_01) PARTITIONS 3 SUBPARTITION BY HASH(col_02) SUBPARTITIONS 4";
 
     ParserDeclarePartitionOptions p_partition_options;
-    ASTPtr ast = parseQuery(p_partition_options, partition_with_subpartition.data(), partition_with_subpartition.data() + partition_with_subpartition.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_partition_options, partition_with_subpartition.data(), partition_with_subpartition.data() + partition_with_subpartition.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options = ast->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options->partition_type, "key");
@@ -134,7 +134,7 @@ TEST(ParserPartitionOptions, PatitionOptionsWithDeclarePartition)
     ParserDeclarePartitionOptions p_partition_options;
     ASTPtr ast = parseQuery(p_partition_options,
         partition_options_with_declare.data(),
-        partition_options_with_declare.data() + partition_options_with_declare.size(), "", 0, 0);
+        partition_options_with_declare.data() + partition_options_with_declare.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options = ast->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options->partition_type, "key");
@@ -153,7 +153,7 @@ TEST(ParserPartitionOptions, PatitionOptionsWithDeclarePartitions)
     ParserDeclarePartitionOptions p_partition_options;
     ASTPtr ast = parseQuery(p_partition_options,
                             partition_options_with_declare.data(),
-                            partition_options_with_declare.data() + partition_options_with_declare.size(), "", 0, 0);
+                            partition_options_with_declare.data() + partition_options_with_declare.size(), "", 0, 0, 0);
 
     ASTDeclarePartitionOptions * declare_partition_options = ast->as<ASTDeclarePartitionOptions>();
     EXPECT_EQ(declare_partition_options->partition_type, "key");
diff --git a/src/Parsers/MySQL/tests/gtest_partition_parser.cpp b/src/Parsers/MySQL/tests/gtest_partition_parser.cpp
index 458c7acd553..07c7c03dbb7 100644
--- a/src/Parsers/MySQL/tests/gtest_partition_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_partition_parser.cpp
@@ -17,7 +17,7 @@ TEST(ParserPartition, AllPatitionOptions)
                    " TABLESPACE table_space_name";
 
     ParserDeclarePartition p_partition;
-    ASTPtr ast = parseQuery(p_partition, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_partition, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition = ast->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition->partition_name, "partition_name");
@@ -35,7 +35,7 @@ TEST(ParserPartition, OptionalPatitionOptions)
 {
     String input = "PARTITION partition_name STORAGE engine = engine_name max_rows 1000 min_rows 0 tablespace table_space_name";
     ParserDeclarePartition p_partition;
-    ASTPtr ast = parseQuery(p_partition, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_partition, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition = ast->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition->partition_name, "partition_name");
@@ -50,7 +50,7 @@ TEST(ParserPartition, PatitionOptionsWithLessThan)
 {
     ParserDeclarePartition p_partition;
     String partition_01 = "PARTITION partition_01 VALUES LESS THAN (1991) STORAGE engine = engine_name";
-    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0);
+    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_01 = ast_partition_01->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_01->partition_name, "partition_01");
@@ -59,7 +59,7 @@ TEST(ParserPartition, PatitionOptionsWithLessThan)
     EXPECT_EQ(declare_options_01->changes["engine"]->as<ASTIdentifier>()->name(), "engine_name");
 
     String partition_02 = "PARTITION partition_02 VALUES LESS THAN MAXVALUE STORAGE engine = engine_name";
-    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0);
+    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_02 = ast_partition_02->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_02->partition_name, "partition_02");
@@ -68,7 +68,7 @@ TEST(ParserPartition, PatitionOptionsWithLessThan)
     EXPECT_EQ(declare_options_02->changes["engine"]->as<ASTIdentifier>()->name(), "engine_name");
 
     String partition_03 = "PARTITION partition_03 VALUES LESS THAN (50, MAXVALUE) STORAGE engine = engine_name";
-    ASTPtr ast_partition_03 = parseQuery(p_partition, partition_03.data(), partition_03.data() + partition_03.size(), "", 0, 0);
+    ASTPtr ast_partition_03 = parseQuery(p_partition, partition_03.data(), partition_03.data() + partition_03.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_03 = ast_partition_03->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_03->partition_name, "partition_03");
@@ -79,7 +79,7 @@ TEST(ParserPartition, PatitionOptionsWithLessThan)
     EXPECT_EQ(declare_options_03->changes["engine"]->as<ASTIdentifier>()->name(), "engine_name");
 
     String partition_04 = "PARTITION partition_04 VALUES LESS THAN (MAXVALUE, MAXVALUE) STORAGE engine = engine_name";
-    ASTPtr ast_partition_04 = parseQuery(p_partition, partition_04.data(), partition_04.data() + partition_04.size(), "", 0, 0);
+    ASTPtr ast_partition_04 = parseQuery(p_partition, partition_04.data(), partition_04.data() + partition_04.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_04 = ast_partition_04->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_04->partition_name, "partition_04");
@@ -94,7 +94,7 @@ TEST(ParserPartition, PatitionOptionsWithInExpression)
 {
     ParserDeclarePartition p_partition;
     String partition_01 = "PARTITION partition_01 VALUES IN (NULL, 1991, MAXVALUE) STORAGE engine = engine_name";
-    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0);
+    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_01 = ast_partition_01->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_01->partition_name, "partition_01");
@@ -106,7 +106,7 @@ TEST(ParserPartition, PatitionOptionsWithInExpression)
     EXPECT_EQ(declare_options_01->changes["engine"]->as<ASTIdentifier>()->name(), "engine_name");
 
     String partition_02 = "PARTITION partition_02 VALUES IN ((NULL, 1991), (1991, NULL), (MAXVALUE, MAXVALUE)) STORAGE engine = engine_name";
-    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0);
+    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_02 = ast_partition_02->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_02->partition_name, "partition_02");
@@ -132,18 +132,17 @@ TEST(ParserPartition, PatitionOptionsWithSubpartitions)
 {
     ParserDeclarePartition p_partition;
     String partition_01 = "PARTITION partition_01 VALUES IN (NULL, 1991, MAXVALUE) STORAGE engine = engine_name (SUBPARTITION s_p01)";
-    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0);
+    ASTPtr ast_partition_01 = parseQuery(p_partition, partition_01.data(), partition_01.data() + partition_01.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_01 = ast_partition_01->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_01->partition_name, "partition_01");
     EXPECT_TRUE(declare_partition_01->subpartitions->as<ASTExpressionList>()->children[0]->as<ASTDeclareSubPartition>());
 
     String partition_02 = "PARTITION partition_02 VALUES IN (NULL, 1991, MAXVALUE) STORAGE engine = engine_name (SUBPARTITION s_p01, SUBPARTITION s_p02)";
-    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0);
+    ASTPtr ast_partition_02 = parseQuery(p_partition, partition_02.data(), partition_02.data() + partition_02.size(), "", 0, 0, 0);
 
     ASTDeclarePartition * declare_partition_02 = ast_partition_02->as<ASTDeclarePartition>();
     EXPECT_EQ(declare_partition_02->partition_name, "partition_02");
     EXPECT_TRUE(declare_partition_02->subpartitions->as<ASTExpressionList>()->children[0]->as<ASTDeclareSubPartition>());
     EXPECT_TRUE(declare_partition_02->subpartitions->as<ASTExpressionList>()->children[1]->as<ASTDeclareSubPartition>());
 }
-
diff --git a/src/Parsers/MySQL/tests/gtest_reference_parser.cpp b/src/Parsers/MySQL/tests/gtest_reference_parser.cpp
index 7447f16fc7c..d5b3c9b596d 100644
--- a/src/Parsers/MySQL/tests/gtest_reference_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_reference_parser.cpp
@@ -12,12 +12,12 @@ TEST(ParserReference, SimpleReference)
     ParserDeclareReference p_reference;
 
     String reference_01 = "REFERENCES table_name (ref_col_01)";
-    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0);
+    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
 
     String reference_02 = "REFERENCES table_name (ref_col_01, ref_col_02)";
-    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0);
+    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->reference_table_name, "table_name");
     ASTPtr arguments = ast_reference_02->as<ASTDeclareReference>()->reference_expression->as<ASTFunction>()->arguments;
     EXPECT_EQ(arguments->children[0]->as<ASTIdentifier>()->name(), "ref_col_01");
@@ -28,19 +28,19 @@ TEST(ParserReference, ReferenceDifferenceKind)
 {
     ParserDeclareReference p_reference;
     String reference_01 = "REFERENCES table_name (ref_col_01) MATCH FULL";
-    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0);
+    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
 
     String reference_02 = "REFERENCES table_name (ref_col_01) MATCH PARTIAL";
-    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0);
+    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_PARTIAL);
 
     String reference_03 = "REFERENCES table_name (ref_col_01) MATCH SIMPLE";
-    ASTPtr ast_reference_03 = parseQuery(p_reference, reference_03.data(), reference_03.data() + reference_03.size(), "", 0, 0);
+    ASTPtr ast_reference_03 = parseQuery(p_reference, reference_03.data(), reference_03.data() + reference_03.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_SIMPLE);
@@ -50,7 +50,7 @@ TEST(ParserReference, ReferenceDifferenceOption)
 {
     ParserDeclareReference p_reference;
     String reference_01 = "REFERENCES table_name (ref_col_01) MATCH FULL ON DELETE RESTRICT ON UPDATE RESTRICT";
-    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0);
+    ASTPtr ast_reference_01 = parseQuery(p_reference, reference_01.data(), reference_01.data() + reference_01.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
@@ -58,7 +58,7 @@ TEST(ParserReference, ReferenceDifferenceOption)
     EXPECT_EQ(ast_reference_01->as<ASTDeclareReference>()->on_update_option, ASTDeclareReference::RESTRICT);
 
     String reference_02 = "REFERENCES table_name (ref_col_01) MATCH FULL ON DELETE CASCADE ON UPDATE CASCADE";
-    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0);
+    ASTPtr ast_reference_02 = parseQuery(p_reference, reference_02.data(), reference_02.data() + reference_02.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
@@ -66,7 +66,7 @@ TEST(ParserReference, ReferenceDifferenceOption)
     EXPECT_EQ(ast_reference_02->as<ASTDeclareReference>()->on_update_option, ASTDeclareReference::CASCADE);
 
     String reference_03 = "REFERENCES table_name (ref_col_01) MATCH FULL ON DELETE SET NULL ON UPDATE SET NULL";
-    ASTPtr ast_reference_03 = parseQuery(p_reference, reference_03.data(), reference_03.data() + reference_03.size(), "", 0, 0);
+    ASTPtr ast_reference_03 = parseQuery(p_reference, reference_03.data(), reference_03.data() + reference_03.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
@@ -74,7 +74,7 @@ TEST(ParserReference, ReferenceDifferenceOption)
     EXPECT_EQ(ast_reference_03->as<ASTDeclareReference>()->on_update_option, ASTDeclareReference::SET_NULL);
 
     String reference_04 = "REFERENCES table_name (ref_col_01) MATCH FULL ON UPDATE NO ACTION ON DELETE NO ACTION";
-    ASTPtr ast_reference_04 = parseQuery(p_reference, reference_04.data(), reference_04.data() + reference_04.size(), "", 0, 0);
+    ASTPtr ast_reference_04 = parseQuery(p_reference, reference_04.data(), reference_04.data() + reference_04.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_04->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_04->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_04->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
@@ -82,11 +82,10 @@ TEST(ParserReference, ReferenceDifferenceOption)
     EXPECT_EQ(ast_reference_04->as<ASTDeclareReference>()->on_update_option, ASTDeclareReference::NO_ACTION);
 
     String reference_05 = "REFERENCES table_name (ref_col_01) MATCH FULL ON UPDATE SET DEFAULT ON DELETE SET DEFAULT";
-    ASTPtr ast_reference_05 = parseQuery(p_reference, reference_05.data(), reference_05.data() + reference_05.size(), "", 0, 0);
+    ASTPtr ast_reference_05 = parseQuery(p_reference, reference_05.data(), reference_05.data() + reference_05.size(), "", 0, 0, 0);
     EXPECT_EQ(ast_reference_05->as<ASTDeclareReference>()->reference_table_name, "table_name");
     EXPECT_EQ(ast_reference_05->as<ASTDeclareReference>()->reference_expression->as<ASTIdentifier>()->name(), "ref_col_01");
     EXPECT_EQ(ast_reference_05->as<ASTDeclareReference>()->kind, ASTDeclareReference::MATCH_FULL);
     EXPECT_EQ(ast_reference_05->as<ASTDeclareReference>()->on_delete_option, ASTDeclareReference::SET_DEFAULT);
     EXPECT_EQ(ast_reference_05->as<ASTDeclareReference>()->on_update_option, ASTDeclareReference::SET_DEFAULT);
 }
-
diff --git a/src/Parsers/MySQL/tests/gtest_subpartition_parser.cpp b/src/Parsers/MySQL/tests/gtest_subpartition_parser.cpp
index b375f73c55c..1876cd1d028 100644
--- a/src/Parsers/MySQL/tests/gtest_subpartition_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_subpartition_parser.cpp
@@ -14,7 +14,7 @@ TEST(ParserSubpartition, AllSubpatitionOptions)
                    " DATA DIRECTORY 'data_directory' INDEX DIRECTORY 'index_directory' max_rows 1000 MIN_ROWs 0"
                    " TABLESPACE table_space_name";
     MySQLParser::ParserDeclareSubPartition p_subpartition;
-    ASTPtr ast = parseQuery(p_subpartition, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_subpartition, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareSubPartition * declare_subpartition = ast->as<ASTDeclareSubPartition>();
     EXPECT_EQ(declare_subpartition->logical_name, "subpartition_name");
@@ -32,7 +32,7 @@ TEST(ParserSubpartition, OptionalSubpatitionOptions)
 {
     String input = "SUBPARTITION subpartition_name STORAGE engine = engine_name max_rows 1000 min_rows 0 tablespace table_space_name";
     MySQLParser::ParserDeclareSubPartition p_subpartition;
-    ASTPtr ast = parseQuery(p_subpartition, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_subpartition, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareSubPartition * declare_subpartition = ast->as<ASTDeclareSubPartition>();
     EXPECT_EQ(declare_subpartition->logical_name, "subpartition_name");
@@ -42,4 +42,3 @@ TEST(ParserSubpartition, OptionalSubpatitionOptions)
     EXPECT_EQ(declare_options->changes["max_rows"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1000);
     EXPECT_EQ(declare_options->changes["tablespace"]->as<ASTIdentifier>()->name(), "table_space_name");
 }
-
diff --git a/src/Parsers/MySQL/tests/gtest_table_options_parser.cpp b/src/Parsers/MySQL/tests/gtest_table_options_parser.cpp
index 42b9279c96d..a84da7cb9d5 100644
--- a/src/Parsers/MySQL/tests/gtest_table_options_parser.cpp
+++ b/src/Parsers/MySQL/tests/gtest_table_options_parser.cpp
@@ -18,7 +18,7 @@ TEST(ParserTableOptions, AllSubpatitionOptions)
                    " STATS_PERSISTENT DEFAULT STATS_SAMPLE_PAGES 3 TABLESPACE tablespace_name STORAGE MEMORY UNION (table_01, table_02)";
 
     ParserDeclareTableOptions p_table_options;
-    ASTPtr ast = parseQuery(p_table_options, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_table_options, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareOptions * declare_options = ast->as<ASTDeclareOptions>();
     EXPECT_EQ(declare_options->changes["auto_increment"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
@@ -56,7 +56,7 @@ TEST(ParserTableOptions, OptionalTableOptions)
 {
     String input = "STATS_AUTO_RECALC DEFAULT AUTO_INCREMENt = 1 ";
     ParserDeclareTableOptions p_table_options;
-    ASTPtr ast = parseQuery(p_table_options, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(p_table_options, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     ASTDeclareOptions * declare_options = ast->as<ASTDeclareOptions>();
     EXPECT_EQ(declare_options->changes["auto_increment"]->as<ASTLiteral>()->value.safeGet<UInt64>(), 1);
diff --git a/src/Parsers/PRQL/ParserPRQLQuery.cpp b/src/Parsers/PRQL/ParserPRQLQuery.cpp
index b3733b727dc..fb1796714cb 100644
--- a/src/Parsers/PRQL/ParserPRQLQuery.cpp
+++ b/src/Parsers/PRQL/ParserPRQLQuery.cpp
@@ -69,7 +69,9 @@ bool ParserPRQLQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         "",
         false,
         max_query_size,
-        max_parser_depth);
+        max_parser_depth,
+        max_parser_backtracks,
+        true);
 
     if (!node)
         throw Exception(
diff --git a/src/Parsers/PRQL/ParserPRQLQuery.h b/src/Parsers/PRQL/ParserPRQLQuery.h
index 4fc450df6b6..88bf97f69d1 100644
--- a/src/Parsers/PRQL/ParserPRQLQuery.h
+++ b/src/Parsers/PRQL/ParserPRQLQuery.h
@@ -13,9 +13,10 @@ private:
     // These fields are not used when PRQL is disabled at build time.
     [[maybe_unused]] size_t max_query_size;
     [[maybe_unused]] size_t max_parser_depth;
+    [[maybe_unused]] size_t max_parser_backtracks;
 
 public:
-    ParserPRQLQuery(size_t max_query_size_, size_t max_parser_depth_) : max_query_size{max_query_size_}, max_parser_depth{max_parser_depth_}
+    ParserPRQLQuery(size_t max_query_size_, size_t max_parser_depth_, size_t max_parser_backtracks_) : max_query_size(max_query_size_), max_parser_depth(max_parser_depth_), max_parser_backtracks(max_parser_backtracks_)
     {
     }
 
diff --git a/src/Parsers/ParserAlterNamedCollectionQuery.cpp b/src/Parsers/ParserAlterNamedCollectionQuery.cpp
index 9b33aa253ba..3c6f764a190 100644
--- a/src/Parsers/ParserAlterNamedCollectionQuery.cpp
+++ b/src/Parsers/ParserAlterNamedCollectionQuery.cpp
@@ -11,15 +11,16 @@ namespace DB
 
 bool ParserAlterNamedCollectionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_alter("ALTER");
-    ParserKeyword s_collection("NAMED COLLECTION");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_on("ON");
-    ParserKeyword s_delete("DELETE");
+    ParserKeyword s_alter(Keyword::ALTER);
+    ParserKeyword s_collection(Keyword::NAMED_COLLECTION);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_delete(Keyword::DELETE);
+
     ParserIdentifier name_p;
-    ParserKeyword s_set("SET");
-    ParserKeyword s_overridable("OVERRIDABLE");
-    ParserKeyword s_not_overridable("NOT OVERRIDABLE");
+    ParserKeyword s_set(Keyword::SET);
+    ParserKeyword s_overridable(Keyword::OVERRIDABLE);
+    ParserKeyword s_not_overridable(Keyword::NOT_OVERRIDABLE);
     ParserToken s_comma(TokenType::Comma);
 
     String cluster_str;
diff --git a/src/Parsers/ParserAlterQuery.cpp b/src/Parsers/ParserAlterQuery.cpp
index 64df192bfda..1baff45113b 100644
--- a/src/Parsers/ParserAlterQuery.cpp
+++ b/src/Parsers/ParserAlterQuery.cpp
@@ -1,4 +1,5 @@
 #include <Common/typeid_cast.h>
+#include <Parsers/ParserStringAndSubstitution.h>
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ExpressionElementParsers.h>
@@ -23,100 +24,105 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     auto command = std::make_shared<ASTAlterCommand>();
     node = command;
 
-    ParserKeyword s_add_column("ADD COLUMN");
-    ParserKeyword s_drop_column("DROP COLUMN");
-    ParserKeyword s_clear_column("CLEAR COLUMN");
-    ParserKeyword s_modify_column("MODIFY COLUMN");
-    ParserKeyword s_alter_column("ALTER COLUMN");
-    ParserKeyword s_rename_column("RENAME COLUMN");
-    ParserKeyword s_comment_column("COMMENT COLUMN");
-    ParserKeyword s_materialize_column("MATERIALIZE COLUMN");
+    ParserKeyword s_add_column(Keyword::ADD_COLUMN);
+    ParserKeyword s_drop_column(Keyword::DROP_COLUMN);
+    ParserKeyword s_clear_column(Keyword::CLEAR_COLUMN);
+    ParserKeyword s_modify_column(Keyword::MODIFY_COLUMN);
+    ParserKeyword s_alter_column(Keyword::ALTER_COLUMN);
+    ParserKeyword s_rename_column(Keyword::RENAME_COLUMN);
+    ParserKeyword s_comment_column(Keyword::COMMENT_COLUMN);
+    ParserKeyword s_materialize_column(Keyword::MATERIALIZE_COLUMN);
 
-    ParserKeyword s_modify_order_by("MODIFY ORDER BY");
-    ParserKeyword s_modify_sample_by("MODIFY SAMPLE BY");
-    ParserKeyword s_modify_ttl("MODIFY TTL");
-    ParserKeyword s_materialize_ttl("MATERIALIZE TTL");
-    ParserKeyword s_modify_setting("MODIFY SETTING");
-    ParserKeyword s_reset_setting("RESET SETTING");
-    ParserKeyword s_modify_query("MODIFY QUERY");
-    ParserKeyword s_modify_refresh("MODIFY REFRESH");
+    ParserKeyword s_modify_order_by(Keyword::MODIFY_ORDER_BY);
+    ParserKeyword s_modify_sample_by(Keyword::MODIFY_SAMPLE_BY);
+    ParserKeyword s_modify_ttl(Keyword::MODIFY_TTL);
+    ParserKeyword s_materialize_ttl(Keyword::MATERIALIZE_TTL);
+    ParserKeyword s_modify_setting(Keyword::MODIFY_SETTING);
+    ParserKeyword s_reset_setting(Keyword::RESET_SETTING);
+    ParserKeyword s_modify_query(Keyword::MODIFY_QUERY);
+    ParserKeyword s_modify_sql_security(Keyword::MODIFY_SQL_SECURITY);
+    ParserKeyword s_modify_definer(Keyword::MODIFY_DEFINER);
+    ParserKeyword s_modify_refresh(Keyword::MODIFY_REFRESH);
 
-    ParserKeyword s_add_index("ADD INDEX");
-    ParserKeyword s_drop_index("DROP INDEX");
-    ParserKeyword s_clear_index("CLEAR INDEX");
-    ParserKeyword s_materialize_index("MATERIALIZE INDEX");
+    ParserKeyword s_add_index(Keyword::ADD_INDEX);
+    ParserKeyword s_drop_index(Keyword::DROP_INDEX);
+    ParserKeyword s_clear_index(Keyword::CLEAR_INDEX);
+    ParserKeyword s_materialize_index(Keyword::MATERIALIZE_INDEX);
 
-    ParserKeyword s_add_statistic("ADD STATISTIC");
-    ParserKeyword s_drop_statistic("DROP STATISTIC");
-    ParserKeyword s_clear_statistic("CLEAR STATISTIC");
-    ParserKeyword s_materialize_statistic("MATERIALIZE STATISTIC");
+    ParserKeyword s_add_statistic(Keyword::ADD_STATISTIC);
+    ParserKeyword s_drop_statistic(Keyword::DROP_STATISTIC);
+    ParserKeyword s_clear_statistic(Keyword::CLEAR_STATISTIC);
+    ParserKeyword s_materialize_statistic(Keyword::MATERIALIZE_STATISTIC);
 
-    ParserKeyword s_add_constraint("ADD CONSTRAINT");
-    ParserKeyword s_drop_constraint("DROP CONSTRAINT");
+    ParserKeyword s_add_constraint(Keyword::ADD_CONSTRAINT);
+    ParserKeyword s_drop_constraint(Keyword::DROP_CONSTRAINT);
 
-    ParserKeyword s_add_projection("ADD PROJECTION");
-    ParserKeyword s_drop_projection("DROP PROJECTION");
-    ParserKeyword s_clear_projection("CLEAR PROJECTION");
-    ParserKeyword s_materialize_projection("MATERIALIZE PROJECTION");
-    ParserKeyword s_modify_comment("MODIFY COMMENT");
+    ParserKeyword s_add_projection(Keyword::ADD_PROJECTION);
+    ParserKeyword s_drop_projection(Keyword::DROP_PROJECTION);
+    ParserKeyword s_clear_projection(Keyword::CLEAR_PROJECTION);
+    ParserKeyword s_materialize_projection(Keyword::MATERIALIZE_PROJECTION);
+    ParserKeyword s_modify_comment(Keyword::MODIFY_COMMENT);
 
-    ParserKeyword s_add("ADD");
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_suspend("SUSPEND");
-    ParserKeyword s_resume("RESUME");
-    ParserKeyword s_refresh("REFRESH");
-    ParserKeyword s_modify("MODIFY");
+    ParserKeyword s_add(Keyword::ADD);
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_modify(Keyword::MODIFY);
 
-    ParserKeyword s_attach_partition("ATTACH PARTITION");
-    ParserKeyword s_attach_part("ATTACH PART");
-    ParserKeyword s_detach_partition("DETACH PARTITION");
-    ParserKeyword s_detach_part("DETACH PART");
-    ParserKeyword s_drop_partition("DROP PARTITION");
-    ParserKeyword s_drop_part("DROP PART");
-    ParserKeyword s_move_partition("MOVE PARTITION");
-    ParserKeyword s_move_part("MOVE PART");
-    ParserKeyword s_drop_detached_partition("DROP DETACHED PARTITION");
-    ParserKeyword s_drop_detached_part("DROP DETACHED PART");
-    ParserKeyword s_fetch_partition("FETCH PARTITION");
-    ParserKeyword s_fetch_part("FETCH PART");
-    ParserKeyword s_replace_partition("REPLACE PARTITION");
-    ParserKeyword s_freeze("FREEZE");
-    ParserKeyword s_unfreeze("UNFREEZE");
-    ParserKeyword s_partition("PARTITION");
+    ParserKeyword s_attach_partition(Keyword::ATTACH_PARTITION);
+    ParserKeyword s_attach_part(Keyword::ATTACH_PART);
+    ParserKeyword s_detach_partition(Keyword::DETACH_PARTITION);
+    ParserKeyword s_detach_part(Keyword::DETACH_PART);
+    ParserKeyword s_drop_partition(Keyword::DROP_PARTITION);
+    ParserKeyword s_drop_part(Keyword::DROP_PART);
+    ParserKeyword s_forget_partition(Keyword::FORGET_PARTITION);
+    ParserKeyword s_move_partition(Keyword::MOVE_PARTITION);
+    ParserKeyword s_move_part(Keyword::MOVE_PART);
+    ParserKeyword s_drop_detached_partition(Keyword::DROP_DETACHED_PARTITION);
+    ParserKeyword s_drop_detached_part(Keyword::DROP_DETACHED_PART);
+    ParserKeyword s_fetch_partition(Keyword::FETCH_PARTITION);
+    ParserKeyword s_fetch_part(Keyword::FETCH_PART);
+    ParserKeyword s_replace_partition(Keyword::REPLACE_PARTITION);
+    ParserKeyword s_freeze(Keyword::FREEZE);
+    ParserKeyword s_unfreeze(Keyword::UNFREEZE);
+    ParserKeyword s_partition(Keyword::PARTITION);
 
-    ParserKeyword s_first("FIRST");
-    ParserKeyword s_after("AFTER");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_from("FROM");
-    ParserKeyword s_in_partition("IN PARTITION");
-    ParserKeyword s_with("WITH");
-    ParserKeyword s_name("NAME");
+    ParserKeyword s_first(Keyword::FIRST);
+    ParserKeyword s_after(Keyword::AFTER);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_from(Keyword::FROM);
+    ParserKeyword s_in_partition(Keyword::IN_PARTITION);
+    ParserKeyword s_with(Keyword::WITH);
+    ParserKeyword s_name(Keyword::NAME);
 
-    ParserKeyword s_to_disk("TO DISK");
-    ParserKeyword s_to_volume("TO VOLUME");
-    ParserKeyword s_to_table("TO TABLE");
-    ParserKeyword s_to_shard("TO SHARD");
+    ParserKeyword s_to_disk(Keyword::TO_DISK);
+    ParserKeyword s_to_volume(Keyword::TO_VOLUME);
+    ParserKeyword s_to_table(Keyword::TO_TABLE);
+    ParserKeyword s_to_shard(Keyword::TO_SHARD);
 
-    ParserKeyword s_delete("DELETE");
-    ParserKeyword s_update("UPDATE");
-    ParserKeyword s_where("WHERE");
-    ParserKeyword s_to("TO");
+    ParserKeyword s_delete(Keyword::DELETE);
+    ParserKeyword s_update(Keyword::UPDATE);
+    ParserKeyword s_where(Keyword::WHERE);
+    ParserKeyword s_to(Keyword::TO);
 
-    ParserKeyword s_remove("REMOVE");
-    ParserKeyword s_default("DEFAULT");
-    ParserKeyword s_materialized("MATERIALIZED");
-    ParserKeyword s_alias("ALIAS");
-    ParserKeyword s_comment("COMMENT");
-    ParserKeyword s_codec("CODEC");
-    ParserKeyword s_ttl("TTL");
+    ParserKeyword s_remove(Keyword::REMOVE);
+    ParserKeyword s_default(Keyword::DEFAULT);
+    ParserKeyword s_materialized(Keyword::MATERIALIZED);
+    ParserKeyword s_alias(Keyword::ALIAS);
+    ParserKeyword s_comment(Keyword::COMMENT);
+    ParserKeyword s_codec(Keyword::CODEC);
+    ParserKeyword s_ttl(Keyword::TTL);
+    ParserKeyword s_settings(Keyword::SETTINGS);
 
-    ParserKeyword s_remove_ttl("REMOVE TTL");
-    ParserKeyword s_remove_sample_by("REMOVE SAMPLE BY");
-    ParserKeyword s_apply_deleted_mask("APPLY DELETED MASK");
+    ParserKeyword s_remove_ttl(Keyword::REMOVE_TTL);
+    ParserKeyword s_remove_sample_by(Keyword::REMOVE_SAMPLE_BY);
+    ParserKeyword s_apply_deleted_mask(Keyword::APPLY_DELETED_MASK);
+
+    ParserToken parser_opening_round_bracket(TokenType::OpeningRoundBracket);
+    ParserToken parser_closing_round_bracket(TokenType::ClosingRoundBracket);
 
     ParserCompoundIdentifier parser_name;
     ParserStringLiteral parser_string_literal;
+    ParserStringAndSubstitution parser_string_and_substituion;
     ParserIdentifier parser_remove_property;
     ParserCompoundColumnDeclaration parser_col_decl;
     ParserIndexDeclaration parser_idx_decl;
@@ -133,28 +139,46 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
     ParserList parser_reset_setting(
         std::make_unique<ParserIdentifier>(), std::make_unique<ParserToken>(TokenType::Comma),
         /* allow_empty = */ false);
-    ParserNameList values_p;
     ParserSelectWithUnionQuery select_p;
+    ParserSQLSecurity sql_security_p;
     ParserRefreshStrategy refresh_p;
     ParserTTLExpressionList parser_ttl_list;
 
+    ASTPtr command_col_decl;
+    ASTPtr command_column;
+    ASTPtr command_order_by;
+    ASTPtr command_sample_by;
+    ASTPtr command_index_decl;
+    ASTPtr command_index;
+    ASTPtr command_constraint_decl;
+    ASTPtr command_constraint;
+    ASTPtr command_projection_decl;
+    ASTPtr command_projection;
+    ASTPtr command_statistic_decl;
+    ASTPtr command_partition;
+    ASTPtr command_predicate;
+    ASTPtr command_update_assignments;
+    ASTPtr command_comment;
+    ASTPtr command_ttl;
+    ASTPtr command_settings_changes;
+    ASTPtr command_settings_resets;
+    ASTPtr command_select;
+    ASTPtr command_rename_to;
+    ASTPtr command_sql_security;
+
+    if (with_round_bracket)
+    {
+        if (!parser_opening_round_bracket.ignore(pos, expected))
+            return false;
+    }
+
     switch (alter_object)
     {
-        case ASTAlterQuery::AlterObjectType::LIVE_VIEW:
-        {
-            if (s_refresh.ignore(pos, expected))
-            {
-                command->type = ASTAlterCommand::LIVE_VIEW_REFRESH;
-            }
-            else
-                return false;
-            break;
-        }
         case ASTAlterQuery::AlterObjectType::DATABASE:
         {
             if (s_modify_setting.ignore(pos, expected))
             {
-                if (!parser_settings.parse(pos, command->settings_changes, expected))
+                if (!parser_settings.parse(pos, command_settings_changes, expected))
                     return false;
                 command->type = ASTAlterCommand::MODIFY_DATABASE_SETTING;
             }
@@ -171,14 +195,14 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_not_exists.ignore(pos, expected))
                     command->if_not_exists = true;
 
-                if (!parser_col_decl.parse(pos, command->col_decl, expected))
+                if (!parser_col_decl.parse(pos, command_col_decl, expected))
                     return false;
 
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))
                 {
-                    if (!parser_name.parse(pos, command->column, expected))
+                    if (!parser_name.parse(pos, command_column, expected))
                         return false;
                 }
 
@@ -189,20 +213,20 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->column, expected))
+                if (!parser_name.parse(pos, command_column, expected))
                     return false;
 
                 if (!s_to.ignore(pos, expected))
                     return false;
 
-                if (!parser_name.parse(pos, command->rename_to, expected))
+                if (!parser_name.parse(pos, command_rename_to, expected))
                     return false;
 
                 command->type = ASTAlterCommand::RENAME_COLUMN;
             }
             else if (s_materialize_column.ignore(pos, expected))
             {
-                if (!parser_name.parse(pos, command->column, expected))
+                if (!parser_name.parse(pos, command_column, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MATERIALIZE_COLUMN;
@@ -210,35 +234,42 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
             else if (s_drop_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PARTITION;
             }
             else if (s_drop_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PARTITION;
                 command->part = true;
             }
+            else if (s_forget_partition.ignore(pos, expected))
+            {
+                if (!parser_partition.parse(pos, command_partition, expected))
+                    return false;
+
+                command->type = ASTAlterCommand::FORGET_PARTITION;
+            }
             else if (s_drop_detached_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
             }
             else if (s_drop_detached_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_DETACHED_PARTITION;
@@ -249,7 +280,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->column, expected))
+                if (!parser_name.parse(pos, command_column, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_COLUMN;
@@ -260,7 +291,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->column, expected))
+                if (!parser_name.parse(pos, command_column, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_COLUMN;
@@ -269,7 +300,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -278,14 +309,14 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_not_exists.ignore(pos, expected))
                     command->if_not_exists = true;
 
-                if (!parser_idx_decl.parse(pos, command->index_decl, expected))
+                if (!parser_idx_decl.parse(pos, command_index_decl, expected))
                     return false;
 
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))
                 {
-                    if (!parser_name.parse(pos, command->index, expected))
+                    if (!parser_name.parse(pos, command_index, expected))
                         return false;
                 }
 
@@ -296,7 +327,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->index, expected))
+                if (!parser_name.parse(pos, command_index, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_INDEX;
@@ -307,7 +338,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->index, expected))
+                if (!parser_name.parse(pos, command_index, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_INDEX;
@@ -316,7 +347,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -325,7 +356,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->index, expected))
+                if (!parser_name.parse(pos, command_index, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MATERIALIZE_INDEX;
@@ -333,7 +364,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -342,7 +373,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_not_exists.ignore(pos, expected))
                     command->if_not_exists = true;
 
-                if (!parser_stat_decl.parse(pos, command->statistic_decl, expected))
+                if (!parser_stat_decl.parse(pos, command_statistic_decl, expected))
                     return false;
 
                 command->type = ASTAlterCommand::ADD_STATISTIC;
@@ -352,7 +383,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_stat_decl.parse(pos, command->statistic_decl, expected))
+                if (!parser_stat_decl.parse(pos, command_statistic_decl, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_STATISTIC;
@@ -362,7 +393,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_stat_decl.parse(pos, command->statistic_decl, expected))
+                if (!parser_stat_decl.parse(pos, command_statistic_decl, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_STATISTIC;
@@ -371,7 +402,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -380,7 +411,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_stat_decl.parse(pos, command->statistic_decl, expected))
+                if (!parser_stat_decl.parse(pos, command_statistic_decl, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MATERIALIZE_STATISTIC;
@@ -388,7 +419,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -397,14 +428,14 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_not_exists.ignore(pos, expected))
                     command->if_not_exists = true;
 
-                if (!parser_projection_decl.parse(pos, command->projection_decl, expected))
+                if (!parser_projection_decl.parse(pos, command_projection_decl, expected))
                     return false;
 
                 if (s_first.ignore(pos, expected))
                     command->first = true;
                 else if (s_after.ignore(pos, expected))
                 {
-                    if (!parser_name.parse(pos, command->projection, expected))
+                    if (!parser_name.parse(pos, command_projection, expected))
                         return false;
                 }
 
@@ -415,7 +446,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->projection, expected))
+                if (!parser_name.parse(pos, command_projection, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PROJECTION;
@@ -426,7 +457,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->projection, expected))
+                if (!parser_name.parse(pos, command_projection, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PROJECTION;
@@ -435,7 +466,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -444,7 +475,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->projection, expected))
+                if (!parser_name.parse(pos, command_projection, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MATERIALIZE_PROJECTION;
@@ -452,13 +483,13 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
             else if (s_move_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MOVE_PARTITION;
@@ -483,7 +514,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_move_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MOVE_PARTITION;
@@ -515,7 +546,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_not_exists.ignore(pos, expected))
                     command->if_not_exists = true;
 
-                if (!parser_constraint_decl.parse(pos, command->constraint_decl, expected))
+                if (!parser_constraint_decl.parse(pos, command_constraint_decl, expected))
                     return false;
 
                 command->type = ASTAlterCommand::ADD_CONSTRAINT;
@@ -525,7 +556,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->constraint, expected))
+                if (!parser_name.parse(pos, command_constraint, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_CONSTRAINT;
@@ -533,7 +564,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_detach_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PARTITION;
@@ -541,7 +572,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_detach_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DROP_PARTITION;
@@ -550,7 +581,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_attach_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 if (s_from.ignore(pos))
@@ -568,7 +599,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_replace_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 if (!s_from.ignore(pos, expected))
@@ -582,7 +613,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_attach_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 command->part = true;
@@ -590,7 +621,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_fetch_partition.ignore(pos, expected))
             {
-                if (!parser_partition.parse(pos, command->partition, expected))
+                if (!parser_partition.parse(pos, command_partition, expected))
                     return false;
 
                 if (!s_from.ignore(pos, expected))
@@ -605,7 +636,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_fetch_part.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->partition, expected))
+                if (!parser_string_and_substituion.parse(pos, command_partition, expected))
                     return false;
 
                 if (!s_from.ignore(pos, expected))
@@ -622,7 +653,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             {
                 if (s_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
 
                     command->type = ASTAlterCommand::FREEZE_PARTITION;
@@ -649,7 +680,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             {
                 if (s_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
 
                     command->type = ASTAlterCommand::UNFREEZE_PARTITION;
@@ -684,33 +715,45 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (!is_modify)
                     parser_modify_col_decl.enableCheckTypeKeyword();
 
-                if (!parser_modify_col_decl.parse(pos, command->col_decl, expected))
+                if (!parser_modify_col_decl.parse(pos, command_col_decl, expected))
                     return false;
 
                 if (s_remove.ignore(pos, expected))
                 {
                     if (s_default.ignore(pos, expected))
-                        command->remove_property = "DEFAULT";
+                        command->remove_property = toStringView(Keyword::DEFAULT);
                     else if (s_materialized.ignore(pos, expected))
-                        command->remove_property = "MATERIALIZED";
+                        command->remove_property = toStringView(Keyword::MATERIALIZED);
                     else if (s_alias.ignore(pos, expected))
-                        command->remove_property = "ALIAS";
+                        command->remove_property = toStringView(Keyword::ALIAS);
                     else if (s_comment.ignore(pos, expected))
-                        command->remove_property = "COMMENT";
+                        command->remove_property = toStringView(Keyword::COMMENT);
                     else if (s_codec.ignore(pos, expected))
-                        command->remove_property = "CODEC";
+                        command->remove_property = toStringView(Keyword::CODEC);
                     else if (s_ttl.ignore(pos, expected))
-                        command->remove_property = "TTL";
+                        command->remove_property = toStringView(Keyword::TTL);
+                    else if (s_settings.ignore(pos, expected))
+                        command->remove_property = toStringView(Keyword::SETTINGS);
                     else
                         return false;
                 }
+                else if (s_modify_setting.ignore(pos, expected))
+                {
+                    if (!parser_settings.parse(pos, command_settings_changes, expected))
+                        return false;
+                }
+                else if (s_reset_setting.ignore(pos, expected))
+                {
+                    if (!parser_reset_setting.parse(pos, command_settings_resets, expected))
+                        return false;
+                }
                 else
                 {
                     if (s_first.ignore(pos, expected))
                         command->first = true;
                     else if (s_after.ignore(pos, expected))
                     {
-                        if (!parser_name.parse(pos, command->column, expected))
+                        if (!parser_name.parse(pos, command_column, expected))
                             return false;
                     }
                 }
@@ -718,14 +761,14 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_modify_order_by.ignore(pos, expected))
             {
-                if (!parser_exp_elem.parse(pos, command->order_by, expected))
+                if (!parser_exp_elem.parse(pos, command_order_by, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MODIFY_ORDER_BY;
             }
             else if (s_modify_sample_by.ignore(pos, expected))
             {
-                if (!parser_exp_elem.parse(pos, command->sample_by, expected))
+                if (!parser_exp_elem.parse(pos, command_sample_by, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MODIFY_SAMPLE_BY;
@@ -738,33 +781,33 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             {
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
 
                 if (!s_where.ignore(pos, expected))
                     return false;
 
-                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                if (!parser_exp_elem.parse(pos, command_predicate, expected))
                     return false;
 
                 command->type = ASTAlterCommand::DELETE;
             }
             else if (s_update.ignore(pos, expected))
             {
-                if (!parser_assignment_list.parse(pos, command->update_assignments, expected))
+                if (!parser_assignment_list.parse(pos, command_update_assignments, expected))
                     return false;
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
 
                 if (!s_where.ignore(pos, expected))
                     return false;
 
-                if (!parser_exp_elem.parse(pos, command->predicate, expected))
+                if (!parser_exp_elem.parse(pos, command_predicate, expected))
                     return false;
 
                 command->type = ASTAlterCommand::UPDATE;
@@ -774,17 +817,17 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
                 if (s_if_exists.ignore(pos, expected))
                     command->if_exists = true;
 
-                if (!parser_name.parse(pos, command->column, expected))
+                if (!parser_name.parse(pos, command_column, expected))
                     return false;
 
-                if (!parser_string_literal.parse(pos, command->comment, expected))
+                if (!parser_string_literal.parse(pos, command_comment, expected))
                     return false;
 
                 command->type = ASTAlterCommand::COMMENT_COLUMN;
             }
             else if (s_modify_ttl.ignore(pos, expected))
             {
-                if (!parser_ttl_list.parse(pos, command->ttl, expected))
+                if (!parser_ttl_list.parse(pos, command_ttl, expected))
                     return false;
                 command->type = ASTAlterCommand::MODIFY_TTL;
             }
@@ -798,28 +841,42 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
             else if (s_modify_setting.ignore(pos, expected))
             {
-                if (!parser_settings.parse(pos, command->settings_changes, expected))
+                if (!parser_settings.parse(pos, command_settings_changes, expected))
                     return false;
                 command->type = ASTAlterCommand::MODIFY_SETTING;
             }
             else if (s_reset_setting.ignore(pos, expected))
             {
-                if (!parser_reset_setting.parse(pos, command->settings_resets, expected))
+                if (!parser_reset_setting.parse(pos, command_settings_resets, expected))
                     return false;
                 command->type = ASTAlterCommand::RESET_SETTING;
             }
             else if (s_modify_query.ignore(pos, expected))
             {
-                if (!select_p.parse(pos, command->select, expected))
+                if (!select_p.parse(pos, command_select, expected))
                     return false;
                 command->type = ASTAlterCommand::MODIFY_QUERY;
             }
+            else if (s_modify_sql_security.checkWithoutMoving(pos, expected))
+            {
+                s_modify.ignore(pos, expected);
+                if (!sql_security_p.parse(pos, command_sql_security, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_SQL_SECURITY;
+            }
+            else if (s_modify_definer.checkWithoutMoving(pos, expected))
+            {
+                s_modify.ignore(pos, expected);
+                if (!sql_security_p.parse(pos, command_sql_security, expected))
+                    return false;
+                command->type = ASTAlterCommand::MODIFY_SQL_SECURITY;
+            }
             else if (s_modify_refresh.ignore(pos, expected))
             {
                 if (!refresh_p.parse(pos, command->refresh, expected))
@@ -828,7 +885,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
             }
             else if (s_modify_comment.ignore(pos, expected))
             {
-                if (!parser_string_literal.parse(pos, command->comment, expected))
+                if (!parser_string_literal.parse(pos, command_comment, expected))
                     return false;
 
                 command->type = ASTAlterCommand::MODIFY_COMMENT;
@@ -839,7 +896,7 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 
                 if (s_in_partition.ignore(pos, expected))
                 {
-                    if (!parser_partition.parse(pos, command->partition, expected))
+                    if (!parser_partition.parse(pos, command_partition, expected))
                         return false;
                 }
             }
@@ -848,44 +905,54 @@ bool ParserAlterCommand::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
         }
     }
 
-    if (command->col_decl)
-        command->children.push_back(command->col_decl);
-    if (command->column)
-        command->children.push_back(command->column);
-    if (command->partition)
-        command->children.push_back(command->partition);
-    if (command->order_by)
-        command->children.push_back(command->order_by);
-    if (command->sample_by)
-        command->children.push_back(command->sample_by);
-    if (command->index_decl)
-        command->children.push_back(command->index_decl);
-    if (command->index)
-        command->children.push_back(command->index);
-    if (command->constraint_decl)
-        command->children.push_back(command->constraint_decl);
-    if (command->constraint)
-        command->children.push_back(command->constraint);
-    if (command->projection_decl)
-        command->children.push_back(command->projection_decl);
-    if (command->projection)
-        command->children.push_back(command->projection);
-    if (command->predicate)
-        command->children.push_back(command->predicate);
-    if (command->update_assignments)
-        command->children.push_back(command->update_assignments);
-    if (command->values)
-        command->children.push_back(command->values);
-    if (command->comment)
-        command->children.push_back(command->comment);
-    if (command->ttl)
-        command->children.push_back(command->ttl);
-    if (command->settings_changes)
-        command->children.push_back(command->settings_changes);
-    if (command->select)
-        command->children.push_back(command->select);
-    if (command->rename_to)
-        command->children.push_back(command->rename_to);
+    if (with_round_bracket)
+    {
+        if (!parser_closing_round_bracket.ignore(pos, expected))
+            return false;
+    }
+
+    if (command_col_decl)
+        command->col_decl = command->children.emplace_back(std::move(command_col_decl)).get();
+    if (command_column)
+        command->column = command->children.emplace_back(std::move(command_column)).get();
+    if (command_order_by)
+        command->order_by = command->children.emplace_back(std::move(command_order_by)).get();
+    if (command_sample_by)
+        command->sample_by = command->children.emplace_back(std::move(command_sample_by)).get();
+    if (command_index_decl)
+        command->index_decl = command->children.emplace_back(std::move(command_index_decl)).get();
+    if (command_index)
+        command->index = command->children.emplace_back(std::move(command_index)).get();
+    if (command_constraint_decl)
+        command->constraint_decl = command->children.emplace_back(std::move(command_constraint_decl)).get();
+    if (command_constraint)
+        command->constraint = command->children.emplace_back(std::move(command_constraint)).get();
+    if (command_projection_decl)
+        command->projection_decl = command->children.emplace_back(std::move(command_projection_decl)).get();
+    if (command_projection)
+        command->projection = command->children.emplace_back(std::move(command_projection)).get();
+    if (command_statistic_decl)
+        command->statistic_decl = command->children.emplace_back(std::move(command_statistic_decl)).get();
+    if (command_partition)
+        command->partition = command->children.emplace_back(std::move(command_partition)).get();
+    if (command_predicate)
+        command->predicate = command->children.emplace_back(std::move(command_predicate)).get();
+    if (command_update_assignments)
+        command->update_assignments = command->children.emplace_back(std::move(command_update_assignments)).get();
+    if (command_comment)
+        command->comment = command->children.emplace_back(std::move(command_comment)).get();
+    if (command_ttl)
+        command->ttl = command->children.emplace_back(std::move(command_ttl)).get();
+    if (command_settings_changes)
+        command->settings_changes = command->children.emplace_back(std::move(command_settings_changes)).get();
+    if (command_settings_resets)
+        command->settings_resets = command->children.emplace_back(std::move(command_settings_resets)).get();
+    if (command_select)
+        command->select = command->children.emplace_back(std::move(command_select)).get();
+    if (command_sql_security)
+        command->sql_security = command->children.emplace_back(std::move(command_sql_security)).get();
+    if (command_rename_to)
+        command->rename_to = command->children.emplace_back(std::move(command_rename_to)).get();
 
     return true;
 }
@@ -897,7 +964,10 @@ bool ParserAlterCommandList::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     node = command_list;
 
     ParserToken s_comma(TokenType::Comma);
-    ParserAlterCommand p_command(alter_object);
+
+    const auto with_round_bracket = pos->type == TokenType::OpeningRoundBracket;
+
+    ParserAlterCommand p_command(with_round_bracket, alter_object);
 
     do
     {
@@ -917,10 +987,9 @@ bool ParserAlterQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     auto query = std::make_shared<ASTAlterQuery>();
     node = query;
 
-    ParserKeyword s_alter_table("ALTER TABLE");
-    ParserKeyword s_alter_temporary_table("ALTER TEMPORARY TABLE");
-    ParserKeyword s_alter_live_view("ALTER LIVE VIEW");
-    ParserKeyword s_alter_database("ALTER DATABASE");
+    ParserKeyword s_alter_table(Keyword::ALTER_TABLE);
+    ParserKeyword s_alter_temporary_table(Keyword::ALTER_TEMPORARY_TABLE);
+    ParserKeyword s_alter_database(Keyword::ALTER_DATABASE);
 
     ASTAlterQuery::AlterObjectType alter_object_type;
 
@@ -928,10 +997,6 @@ bool ParserAlterQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     {
         alter_object_type = ASTAlterQuery::AlterObjectType::TABLE;
     }
-    else if (s_alter_live_view.ignore(pos, expected))
-    {
-        alter_object_type = ASTAlterQuery::AlterObjectType::LIVE_VIEW;
-    }
     else if (s_alter_database.ignore(pos, expected))
     {
         alter_object_type = ASTAlterQuery::AlterObjectType::DATABASE;
@@ -950,7 +1015,7 @@ bool ParserAlterQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
 
         String cluster_str;
-        if (ParserKeyword{"ON"}.ignore(pos, expected))
+        if (ParserKeyword(Keyword::ON).ignore(pos, expected))
         {
             if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
                 return false;
diff --git a/src/Parsers/ParserAlterQuery.h b/src/Parsers/ParserAlterQuery.h
index b0029ff88fd..50a8f6f68d4 100644
--- a/src/Parsers/ParserAlterQuery.h
+++ b/src/Parsers/ParserAlterQuery.h
@@ -28,8 +28,6 @@ namespace DB
   *     [DROP INDEX [IF EXISTS] index_name]
   *     [CLEAR INDEX [IF EXISTS] index_name IN PARTITION partition]
   *     [MATERIALIZE INDEX [IF EXISTS] index_name [IN PARTITION partition]]
-  * ALTER LIVE VIEW [db.name]
-  *     [REFRESH]
   */
 
 class ParserAlterQuery : public IParserBase
@@ -49,7 +47,7 @@ protected:
 public:
     ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommandList(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+    explicit ParserAlterCommandList(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
         : alter_object(alter_object_) {}
 };
 
@@ -61,10 +59,15 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 
 public:
+    bool with_round_bracket;
     ASTAlterQuery::AlterObjectType alter_object;
 
-    ParserAlterCommand(ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
-        : alter_object(alter_object_) {}
+
+    explicit ParserAlterCommand(
+        bool with_round_bracket_, ASTAlterQuery::AlterObjectType alter_object_ = ASTAlterQuery::AlterObjectType::TABLE)
+        : with_round_bracket(with_round_bracket_), alter_object(alter_object_)
+    {
+    }
 };
 
 
diff --git a/src/Parsers/ParserBackupQuery.cpp b/src/Parsers/ParserBackupQuery.cpp
index cbe4567ee90..5eab0cb288d 100644
--- a/src/Parsers/ParserBackupQuery.cpp
+++ b/src/Parsers/ParserBackupQuery.cpp
@@ -24,7 +24,7 @@ namespace
 
     bool parsePartitions(IParser::Pos & pos, Expected & expected, std::optional<ASTs> & partitions)
     {
-        if (!ParserKeyword{"PARTITION"}.ignore(pos, expected) && !ParserKeyword{"PARTITIONS"}.ignore(pos, expected))
+        if (!ParserKeyword(Keyword::PARTITION).ignore(pos, expected) && !ParserKeyword(Keyword::PARTITIONS).ignore(pos, expected))
             return false;
 
         ASTs result;
@@ -47,7 +47,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"EXCEPT DATABASE"}.ignore(pos, expected) && !ParserKeyword{"EXCEPT DATABASES"}.ignore(pos, expected))
+            if (!ParserKeyword(Keyword::EXCEPT_DATABASE).ignore(pos, expected) && !ParserKeyword(Keyword::EXCEPT_DATABASES).ignore(pos, expected))
                 return false;
 
             std::set<String> result;
@@ -71,7 +71,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"EXCEPT TABLE"}.ignore(pos, expected) && !ParserKeyword{"EXCEPT TABLES"}.ignore(pos, expected))
+            if (!ParserKeyword(Keyword::EXCEPT_TABLE).ignore(pos, expected) && !ParserKeyword(Keyword::EXCEPT_TABLES).ignore(pos, expected))
                 return false;
 
             std::set<DatabaseAndTableName> result;
@@ -107,8 +107,8 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (ParserKeyword{"TABLE"}.ignore(pos, expected) || ParserKeyword{"DICTIONARY"}.ignore(pos, expected) ||
-                ParserKeyword{"VIEW"}.ignore(pos, expected))
+            if (ParserKeyword(Keyword::TABLE).ignore(pos, expected) || ParserKeyword(Keyword::DICTIONARY).ignore(pos, expected) ||
+                ParserKeyword(Keyword::VIEW).ignore(pos, expected))
             {
                 element.type = ElementType::TABLE;
                 if (!parseDatabaseAndTableName(pos, expected, element.database_name, element.table_name))
@@ -116,7 +116,7 @@ namespace
 
                 element.new_database_name = element.database_name;
                 element.new_table_name = element.table_name;
-                if (ParserKeyword("AS").ignore(pos, expected))
+                if (ParserKeyword(Keyword::AS).ignore(pos, expected))
                 {
                     if (!parseDatabaseAndTableName(pos, expected, element.new_database_name, element.new_table_name))
                         return false;
@@ -126,7 +126,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"TEMPORARY TABLE"}.ignore(pos, expected))
+            if (ParserKeyword(Keyword::TEMPORARY_TABLE).ignore(pos, expected))
             {
                 element.type = ElementType::TEMPORARY_TABLE;
 
@@ -136,7 +136,7 @@ namespace
                 element.table_name = getIdentifierName(ast);
                 element.new_table_name = element.table_name;
 
-                if (ParserKeyword("AS").ignore(pos, expected))
+                if (ParserKeyword(Keyword::AS).ignore(pos, expected))
                 {
                     ast = nullptr;
                     if (!ParserIdentifier{}.parse(pos, ast, expected))
@@ -147,7 +147,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"DATABASE"}.ignore(pos, expected))
+            if (ParserKeyword(Keyword::DATABASE).ignore(pos, expected))
             {
                 element.type = ElementType::DATABASE;
 
@@ -157,7 +157,7 @@ namespace
                 element.database_name = getIdentifierName(ast);
                 element.new_database_name = element.database_name;
 
-                if (ParserKeyword("AS").ignore(pos, expected))
+                if (ParserKeyword(Keyword::AS).ignore(pos, expected))
                 {
                     ast = nullptr;
                     if (!ParserIdentifier{}.parse(pos, ast, expected))
@@ -169,7 +169,7 @@ namespace
                 return true;
             }
 
-            if (ParserKeyword{"ALL"}.ignore(pos, expected))
+            if (ParserKeyword(Keyword::ALL).ignore(pos, expected))
             {
                 element.type = ElementType::ALL;
                 parseExceptDatabases(pos, expected, element.except_databases);
@@ -219,7 +219,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"base_backup"}.ignore(pos, expected)
+            return ParserKeyword{Keyword::BASE_BACKUP}.ignore(pos, expected)
                 && ParserToken(TokenType::Equals).ignore(pos, expected)
                 && parseBackupName(pos, expected, base_backup_name);
         });
@@ -234,7 +234,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"cluster_host_ids"}.ignore(pos, expected)
+            return ParserKeyword{Keyword::CLUSTER_HOST_IDS}.ignore(pos, expected)
                 && ParserToken(TokenType::Equals).ignore(pos, expected)
                 && parseClusterHostIDs(pos, expected, cluster_host_ids);
         });
@@ -244,7 +244,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            if (!ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+            if (!ParserKeyword(Keyword::SETTINGS).ignore(pos, expected))
                 return false;
 
             SettingsChanges settings_changes;
@@ -291,9 +291,9 @@ namespace
     bool parseSyncOrAsync(IParser::Pos & pos, Expected & expected, ASTPtr & settings)
     {
         bool async;
-        if (ParserKeyword{"ASYNC"}.ignore(pos, expected))
+        if (ParserKeyword(Keyword::ASYNC).ignore(pos, expected))
             async = true;
-        else if (ParserKeyword{"SYNC"}.ignore(pos, expected))
+        else if (ParserKeyword(Keyword::SYNC).ignore(pos, expected))
             async = false;
         else
             return false;
@@ -318,7 +318,7 @@ namespace
     {
         return IParserBase::wrapParseImpl(pos, [&]
         {
-            return ParserKeyword{"ON"}.ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
+            return ParserKeyword(Keyword::ON).ignore(pos, expected) && ASTQueryWithOnCluster::parse(pos, cluster, expected);
         });
     }
 }
@@ -327,9 +327,9 @@ namespace
 bool ParserBackupQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     Kind kind;
-    if (ParserKeyword{"BACKUP"}.ignore(pos, expected))
+    if (ParserKeyword(Keyword::BACKUP).ignore(pos, expected))
         kind = Kind::BACKUP;
-    else if (ParserKeyword{"RESTORE"}.ignore(pos, expected))
+    else if (ParserKeyword(Keyword::RESTORE).ignore(pos, expected))
         kind = Kind::RESTORE;
     else
         return false;
@@ -341,7 +341,7 @@ bool ParserBackupQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     String cluster;
     parseOnCluster(pos, expected, cluster);
 
-    if (!ParserKeyword{(kind == Kind::BACKUP) ? "TO" : "FROM"}.ignore(pos, expected))
+    if (!ParserKeyword((kind == Kind::BACKUP) ? Keyword::TO : Keyword::FROM).ignore(pos, expected))
         return false;
 
     ASTPtr backup_name;
diff --git a/src/Parsers/ParserCase.cpp b/src/Parsers/ParserCase.cpp
index 521eec212da..e73ff0e0844 100644
--- a/src/Parsers/ParserCase.cpp
+++ b/src/Parsers/ParserCase.cpp
@@ -10,11 +10,11 @@ namespace DB
 
 bool ParserCase::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_case{"CASE"};
-    ParserKeyword s_when{"WHEN"};
-    ParserKeyword s_then{"THEN"};
-    ParserKeyword s_else{"ELSE"};
-    ParserKeyword s_end{ "END"};
+    ParserKeyword s_case{Keyword::CASE};
+    ParserKeyword s_when{Keyword::WHEN};
+    ParserKeyword s_then{Keyword::THEN};
+    ParserKeyword s_else{Keyword::ELSE};
+    ParserKeyword s_end{ Keyword::END};
     ParserExpressionWithOptionalAlias p_expr{false};
 
     if (!s_case.ignore(pos, expected))
diff --git a/src/Parsers/ParserCheckQuery.cpp b/src/Parsers/ParserCheckQuery.cpp
index a840cfbae5e..42716ba7f2c 100644
--- a/src/Parsers/ParserCheckQuery.cpp
+++ b/src/Parsers/ParserCheckQuery.cpp
@@ -12,7 +12,7 @@ namespace DB
 
 bool ParserCheckQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_check_table("CHECK ALL TABLES");
+    ParserKeyword s_check_table(Keyword::CHECK_ALL_TABLES);
     if (s_check_table.ignore(pos, expected))
     {
         auto query = std::make_shared<ASTCheckAllTablesQuery>();
@@ -25,9 +25,9 @@ bool ParserCheckQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserCheckQuery::parseCheckTable(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_check_table("CHECK TABLE");
-    ParserKeyword s_partition("PARTITION");
-    ParserKeyword s_part("PART");
+    ParserKeyword s_check_table(Keyword::CHECK_TABLE);
+    ParserKeyword s_partition(Keyword::PARTITION);
+    ParserKeyword s_part(Keyword::PART);
     ParserToken s_dot(TokenType::Dot);
 
     ParserPartition partition_parser;
diff --git a/src/Parsers/ParserCreateFunctionQuery.cpp b/src/Parsers/ParserCreateFunctionQuery.cpp
index 2b3cf98a8a7..b912016a439 100644
--- a/src/Parsers/ParserCreateFunctionQuery.cpp
+++ b/src/Parsers/ParserCreateFunctionQuery.cpp
@@ -13,13 +13,13 @@ namespace DB
 
 bool ParserCreateFunctionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_function("FUNCTION");
-    ParserKeyword s_or_replace("OR REPLACE");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_function(Keyword::FUNCTION);
+    ParserKeyword s_or_replace(Keyword::OR_REPLACE);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
     ParserIdentifier function_name_p;
-    ParserKeyword s_as("AS");
+    ParserKeyword s_as(Keyword::AS);
     ParserExpression lambda_p;
 
     ASTPtr function_name;
diff --git a/src/Parsers/ParserCreateIndexQuery.cpp b/src/Parsers/ParserCreateIndexQuery.cpp
index 81954e3c247..fd2bbbab177 100644
--- a/src/Parsers/ParserCreateIndexQuery.cpp
+++ b/src/Parsers/ParserCreateIndexQuery.cpp
@@ -15,17 +15,17 @@ namespace DB
 
 bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_type("TYPE");
-    ParserKeyword s_granularity("GRANULARITY");
+    ParserKeyword s_type(Keyword::TYPE);
+    ParserKeyword s_granularity(Keyword::GRANULARITY);
     ParserToken open(TokenType::OpeningRoundBracket);
     ParserToken close(TokenType::ClosingRoundBracket);
     ParserOrderByExpressionList order_list;
+
     ParserDataType data_type_p;
     ParserExpression expression_p;
     ParserUnsignedInteger granularity_p;
 
     ASTPtr expr;
-    ASTPtr order;
     ASTPtr type;
     ASTPtr granularity;
 
@@ -35,7 +35,7 @@ bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected
     }
     else if (open.ignore(pos, expected))
     {
-        if (!order_list.parse(pos, order, expected))
+        if (!order_list.parse(pos, expr, expected))
             return false;
 
         if (!close.ignore(pos, expected))
@@ -54,25 +54,23 @@ bool ParserCreateIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected
             return false;
     }
 
-    auto index = std::make_shared<ASTIndexDeclaration>();
+    /// name is set below in ParserCreateIndexQuery
+    auto index = std::make_shared<ASTIndexDeclaration>(expr, type, "");
     index->part_of_create_index_query = true;
-    index->set(index->expr, expr);
-    if (type)
-        index->set(index->type, type);
 
     if (granularity)
         index->granularity = granularity->as<ASTLiteral &>().value.safeGet<UInt64>();
     else
     {
-        if (index->type && index->type->name == "annoy")
+        auto index_type = index->getType();
+        if (index_type && index_type->name == "annoy")
             index->granularity = ASTIndexDeclaration::DEFAULT_ANNOY_INDEX_GRANULARITY;
-        else if (index->type && index->type->name == "usearch")
+        else if (index_type && index_type->name == "usearch")
             index->granularity = ASTIndexDeclaration::DEFAULT_USEARCH_INDEX_GRANULARITY;
         else
             index->granularity = ASTIndexDeclaration::DEFAULT_INDEX_GRANULARITY;
     }
     node = index;
-
     return true;
 }
 
@@ -81,11 +79,12 @@ bool ParserCreateIndexQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
     auto query = std::make_shared<ASTCreateIndexQuery>();
     node = query;
 
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_unique("UNIQUE");
-    ParserKeyword s_index("INDEX");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_unique(Keyword::UNIQUE);
+    ParserKeyword s_index(Keyword::INDEX);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
+
     ParserIdentifier index_name_p;
     ParserCreateIndexDeclaration parser_create_idx_decl;
 
diff --git a/src/Parsers/ParserCreateQuery.cpp b/src/Parsers/ParserCreateQuery.cpp
index 1f6f68c9d8e..ff88b58760b 100644
--- a/src/Parsers/ParserCreateQuery.cpp
+++ b/src/Parsers/ParserCreateQuery.cpp
@@ -1,4 +1,5 @@
 #include <IO/ReadHelpers.h>
+#include <Parsers/Access/ParserUserNameWithHost.h>
 #include <Parsers/ASTConstraintDeclaration.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
@@ -39,7 +40,7 @@ namespace
 
 ASTPtr parseComment(IParser::Pos & pos, Expected & expected)
 {
-    ParserKeyword s_comment("COMMENT");
+    ParserKeyword s_comment(Keyword::COMMENT);
     ParserStringLiteral string_literal_parser;
     ASTPtr comment;
 
@@ -84,6 +85,69 @@ bool ParserNestedTable::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     return true;
 }
 
+bool ParserSQLSecurity::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    ParserToken s_eq(TokenType::Equals);
+    ParserKeyword s_definer(Keyword::DEFINER);
+    ParserKeyword s_current_user{Keyword::CURRENT_USER};
+    ParserKeyword s_sql_security{Keyword::SQL_SECURITY};
+    ParserKeyword s_invoker{Keyword::INVOKER};
+    ParserKeyword s_none{Keyword::NONE};
+
+    bool is_definer_current_user = false;
+    ASTPtr definer;
+    std::optional<SQLSecurityType> type;
+
+    while (true)
+    {
+        if (!definer && s_definer.ignore(pos, expected))
+        {
+            s_eq.ignore(pos, expected);
+            if (s_current_user.ignore(pos, expected))
+                is_definer_current_user = true;
+            else if (!ParserUserNameWithHost{}.parse(pos, definer, expected))
+                return false;
+
+            continue;
+        }
+
+        if (!type && s_sql_security.ignore(pos, expected))
+        {
+            if (s_definer.ignore(pos, expected))
+                type = SQLSecurityType::DEFINER;
+            else if (s_invoker.ignore(pos, expected))
+                type = SQLSecurityType::INVOKER;
+            else if (s_none.ignore(pos, expected))
+                type = SQLSecurityType::NONE;
+            else
+                return false;
+
+            continue;
+        }
+
+        break;
+    }
+
+    if (!type)
+    {
+        if (is_definer_current_user || definer)
+            type = SQLSecurityType::DEFINER;
+        else
+            return false;
+    }
+    else if (type == SQLSecurityType::DEFINER && !definer)
+        is_definer_current_user = true;
+
+    auto result = std::make_shared<ASTSQLSecurity>();
+    result->is_definer_current_user = is_definer_current_user;
+    result->type = type;
+    if (definer)
+        result->definer = typeid_cast<std::shared_ptr<ASTUserNameWithHost>>(definer);
+
+    node = std::move(result);
+    return true;
+}
+
 
 bool ParserIdentifierWithParameters::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
@@ -104,14 +168,14 @@ bool ParserColumnDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
 bool ParserNameList::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    return ParserList(std::make_unique<ParserCompoundIdentifier>(), std::make_unique<ParserToken>(TokenType::Comma), false)
+    return ParserList(std::make_unique<ParserCompoundIdentifier>(true, true), std::make_unique<ParserToken>(TokenType::Comma), false)
         .parse(pos, node, expected);
 }
 
 bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_type("TYPE");
-    ParserKeyword s_granularity("GRANULARITY");
+    ParserKeyword s_type(Keyword::TYPE);
+    ParserKeyword s_granularity(Keyword::GRANULARITY);
 
     ParserIdentifier name_p;
     ParserDataType data_type_p;
@@ -141,18 +205,16 @@ bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
             return false;
     }
 
-    auto index = std::make_shared<ASTIndexDeclaration>();
-    index->name = name->as<ASTIdentifier &>().name();
-    index->set(index->expr, expr);
-    index->set(index->type, type);
+    auto index = std::make_shared<ASTIndexDeclaration>(expr, type, name->as<ASTIdentifier &>().name());
 
     if (granularity)
         index->granularity = granularity->as<ASTLiteral &>().value.safeGet<UInt64>();
     else
     {
-        if (index->type->name == "annoy")
+        auto index_type = index->getType();
+        if (index_type->name == "annoy")
             index->granularity = ASTIndexDeclaration::DEFAULT_ANNOY_INDEX_GRANULARITY;
-        else if (index->type->name == "usearch")
+        else if (index_type->name == "usearch")
             index->granularity = ASTIndexDeclaration::DEFAULT_USEARCH_INDEX_GRANULARITY;
         else
             index->granularity = ASTIndexDeclaration::DEFAULT_INDEX_GRANULARITY;
@@ -165,7 +227,7 @@ bool ParserIndexDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
 bool ParserStatisticDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_type("TYPE");
+    ParserKeyword s_type(Keyword::TYPE);
 
     ParserList columns_p(std::make_unique<ParserIdentifier>(), std::make_unique<ParserToken>(TokenType::Comma), false);
     ParserIdentifier type_p;
@@ -192,8 +254,8 @@ bool ParserStatisticDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
 bool ParserConstraintDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_check("CHECK");
-    ParserKeyword s_assume("ASSUME");
+    ParserKeyword s_check(Keyword::CHECK);
+    ParserKeyword s_assume(Keyword::ASSUME);
 
     ParserIdentifier name_p;
     ParserExpression expression_p;
@@ -257,7 +319,7 @@ bool ParserProjectionDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
 bool ParserForeignKeyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_references("REFERENCES");
+    ParserKeyword s_references(Keyword::REFERENCES);
     ParserCompoundIdentifier table_name_p(true, true);
     ParserExpression expression_p;
 
@@ -276,20 +338,20 @@ bool ParserForeignKeyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
     if (!expression_p.parse(pos, expr, expected))
         return false;
 
-    ParserKeyword s_on("ON");
+    ParserKeyword s_on(Keyword::ON);
     while (s_on.ignore(pos, expected))
     {
-        ParserKeyword s_delete("DELETE");
-        ParserKeyword s_update("UPDATE");
+        ParserKeyword s_delete(Keyword::DELETE);
+        ParserKeyword s_update(Keyword::UPDATE);
 
         if (!s_delete.ignore(pos, expected) && !s_update.ignore(pos, expected))
             return false;
 
-        ParserKeyword s_restrict("RESTRICT");
-        ParserKeyword s_cascade("CASCADE");
-        ParserKeyword s_set_null("SET NULL");
-        ParserKeyword s_no_action("NO ACTION");
-        ParserKeyword s_set_default("SET DEFAULT");
+        ParserKeyword s_restrict(Keyword::RESTRICT);
+        ParserKeyword s_cascade(Keyword::CASCADE);
+        ParserKeyword s_set_null(Keyword::SET_NULL);
+        ParserKeyword s_no_action(Keyword::NO_ACTION);
+        ParserKeyword s_set_default(Keyword::SET_DEFAULT);
 
         if (!s_restrict.ignore(pos, expected) && !s_cascade.ignore(pos, expected) &&
             !s_set_null.ignore(pos, expected) && !s_no_action.ignore(pos, expected) &&
@@ -308,11 +370,11 @@ bool ParserForeignKeyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
 bool ParserTablePropertyDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_index("INDEX");
-    ParserKeyword s_constraint("CONSTRAINT");
-    ParserKeyword s_projection("PROJECTION");
-    ParserKeyword s_foreign_key("FOREIGN KEY");
-    ParserKeyword s_primary_key("PRIMARY KEY");
+    ParserKeyword s_index(Keyword::INDEX);
+    ParserKeyword s_constraint(Keyword::CONSTRAINT);
+    ParserKeyword s_projection(Keyword::PROJECTION);
+    ParserKeyword s_foreign_key(Keyword::FOREIGN_KEY);
+    ParserKeyword s_primary_key(Keyword::PRIMARY_KEY);
 
     ParserIndexDeclaration index_p;
     ParserConstraintDeclaration constraint_p;
@@ -452,14 +514,14 @@ bool ParserTablePropertiesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, E
 
 bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_engine("ENGINE");
+    ParserKeyword s_engine(Keyword::ENGINE);
     ParserToken s_eq(TokenType::Equals);
-    ParserKeyword s_partition_by("PARTITION BY");
-    ParserKeyword s_primary_key("PRIMARY KEY");
-    ParserKeyword s_order_by("ORDER BY");
-    ParserKeyword s_sample_by("SAMPLE BY");
-    ParserKeyword s_ttl("TTL");
-    ParserKeyword s_settings("SETTINGS");
+    ParserKeyword s_partition_by(Keyword::PARTITION_BY);
+    ParserKeyword s_primary_key(Keyword::PRIMARY_KEY);
+    ParserKeyword s_order_by(Keyword::ORDER_BY);
+    ParserKeyword s_sample_by(Keyword::SAMPLE_BY);
+    ParserKeyword s_ttl(Keyword::TTL);
+    ParserKeyword s_settings(Keyword::SETTINGS);
 
     ParserIdentifierWithOptionalParameters ident_with_optional_params_p;
     ParserExpression expression_p;
@@ -591,16 +653,16 @@ bool ParserStorage::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_replace("REPLACE");
-    ParserKeyword s_or_replace("OR REPLACE");
-    ParserKeyword s_temporary("TEMPORARY");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_replace(Keyword::REPLACE);
+    ParserKeyword s_or_replace(Keyword::OR_REPLACE);
+    ParserKeyword s_temporary(Keyword::TEMPORARY);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
     ParserCompoundIdentifier table_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ true);
-    ParserKeyword s_from("FROM");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_from(Keyword::FROM);
+    ParserKeyword s_on(Keyword::ON);
     ParserToken s_dot(TokenType::Dot);
     ParserToken s_comma(TokenType::Comma);
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
@@ -684,6 +746,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         query->database = table_id->getDatabase();
         query->table = table_id->getTable();
         query->uuid = table_id->uuid;
+        query->has_uuid = table_id->uuid != UUIDHelpers::Nil;
 
         if (query->database)
             query->children.push_back(query->database);
@@ -695,13 +758,13 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
     auto need_parse_as_select = [&is_create_empty, &pos, &expected]()
     {
-        if (ParserKeyword{"EMPTY AS"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::EMPTY_AS}.ignore(pos, expected))
         {
             is_create_empty = true;
             return true;
         }
 
-        return ParserKeyword{"AS"}.ignore(pos, expected);
+        return ParserKeyword{Keyword::AS}.ignore(pos, expected);
     };
 
     /// List of columns.
@@ -783,6 +846,7 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     query->database = table_id->getDatabase();
     query->table = table_id->getTable();
     query->uuid = table_id->uuid;
+    query->has_uuid = table_id->uuid != UUIDHelpers::Nil;
     query->cluster = cluster_str;
 
     if (query->database)
@@ -833,13 +897,13 @@ bool ParserCreateTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
 bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
     ParserCompoundIdentifier table_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ true);
-    ParserKeyword s_as("AS");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword s_live("LIVE");
+    ParserKeyword s_as(Keyword::AS);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword s_live(Keyword::LIVE);
     ParserToken s_dot(TokenType::Dot);
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
     ParserToken s_rparen(TokenType::ClosingRoundBracket);
@@ -847,6 +911,7 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     ParserStorage storage_inner{ParserStorage::TABLE_ENGINE};
     ParserTablePropertiesDeclarationList table_properties_p;
     ParserSelectWithUnionQuery select_p;
+    ParserSQLSecurity sql_security_p;
 
     ASTPtr table;
     ASTPtr to_table;
@@ -854,14 +919,11 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     ASTPtr as_database;
     ASTPtr as_table;
     ASTPtr select;
-    ASTPtr live_view_periodic_refresh;
+    ASTPtr sql_security;
 
     String cluster_str;
     bool attach = false;
     bool if_not_exists = false;
-    bool with_and = false;
-    bool with_timeout = false;
-    bool with_periodic_refresh = false;
 
     if (!s_create.ignore(pos, expected))
     {
@@ -871,6 +933,8 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
             return false;
     }
 
+    sql_security_p.parse(pos, sql_security, expected);
+
     if (!s_live.ignore(pos, expected))
         return false;
 
@@ -883,31 +947,14 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     if (!table_name_p.parse(pos, table, expected))
         return false;
 
-    if (ParserKeyword{"WITH"}.ignore(pos, expected))
-    {
-        if (ParserKeyword{"REFRESH"}.ignore(pos, expected) || ParserKeyword{"PERIODIC REFRESH"}.ignore(pos, expected))
-        {
-            if (!ParserNumber{}.parse(pos, live_view_periodic_refresh, expected))
-                live_view_periodic_refresh = std::make_shared<ASTLiteral>(static_cast<UInt64>(DEFAULT_PERIODIC_LIVE_VIEW_REFRESH_SEC));
-
-            with_periodic_refresh = true;
-        }
-
-        else if (with_and)
-            return false;
-
-        if (!with_timeout && !with_periodic_refresh)
-            return false;
-    }
-
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
     }
 
     // TO [db.]table
-    if (ParserKeyword{"TO"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::TO}.ignore(pos, expected))
     {
         if (!table_name_p.parse(pos, to_table, expected))
             return false;
@@ -923,6 +970,9 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
             return false;
     }
 
+    if (!sql_security && !sql_security_p.parse(pos, sql_security, expected))
+        sql_security = std::make_shared<ASTSQLSecurity>();
+
     /// AS SELECT ...
     if (!s_as.ignore(pos, expected))
         return false;
@@ -959,26 +1009,32 @@ bool ParserCreateLiveViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     tryGetIdentifierNameInto(as_table, query->as_table);
     query->set(query->select, select);
 
-    if (live_view_periodic_refresh)
-        query->live_view_periodic_refresh.emplace(live_view_periodic_refresh->as<ASTLiteral &>().value.safeGet<UInt64>());
-
     if (comment)
         query->set(query->comment, comment);
 
+    if (sql_security)
+        query->sql_security = typeid_cast<std::shared_ptr<ASTSQLSecurity>>(sql_security);
+
     return true;
 }
 
 bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_temporary("TEMPORARY");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_temporary(Keyword::TEMPORARY);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
     ParserCompoundIdentifier table_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ true);
-    ParserKeyword s_as("AS");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword s_window("WINDOW");
-    ParserKeyword s_populate("POPULATE");
+    ParserKeyword s_as(Keyword::AS);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword s_window(Keyword::WINDOW);
+    ParserKeyword s_populate(Keyword::POPULATE);
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_to(Keyword::TO);
+    ParserKeyword s_inner(Keyword::INNER);
+    ParserKeyword s_watermark(Keyword::WATERMARK);
+    ParserKeyword s_allowed_lateness(Keyword::ALLOWED_LATENESS);
+    ParserKeyword s_empty(Keyword::EMPTY);
     ParserToken s_dot(TokenType::Dot);
     ParserToken s_eq(TokenType::Equals);
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
@@ -1031,14 +1087,14 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     if (!table_name_p.parse(pos, table, expected))
         return false;
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (s_on.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
     }
 
     // TO [db.]table
-    if (ParserKeyword{"TO"}.ignore(pos, expected))
+    if (s_to.ignore(pos, expected))
     {
         if (!table_name_p.parse(pos, to_table, expected))
             return false;
@@ -1054,7 +1110,7 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
             return false;
     }
 
-    if (ParserKeyword{"INNER"}.ignore(pos, expected))
+    if (s_inner.ignore(pos, expected))
     {
         /// Inner table ENGINE for WINDOW VIEW
         storage_inner.parse(pos, inner_storage, expected);
@@ -1067,13 +1123,13 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     }
 
     // WATERMARK
-    if (ParserKeyword{"WATERMARK"}.ignore(pos, expected))
+    if (s_watermark.ignore(pos, expected))
     {
         s_eq.ignore(pos, expected);
 
-        if (ParserKeyword("STRICTLY_ASCENDING").ignore(pos,expected))
+        if (ParserKeyword(Keyword::STRICTLY_ASCENDING).ignore(pos,expected))
             is_watermark_strictly_ascending = true;
-        else if (ParserKeyword("ASCENDING").ignore(pos,expected))
+        else if (ParserKeyword(Keyword::ASCENDING).ignore(pos,expected))
             is_watermark_ascending = true;
         else if (watermark_p.parse(pos, watermark, expected))
             is_watermark_bounded = true;
@@ -1082,7 +1138,7 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     }
 
     // ALLOWED LATENESS
-    if (ParserKeyword{"ALLOWED_LATENESS"}.ignore(pos, expected))
+    if (s_allowed_lateness.ignore(pos, expected))
     {
         s_eq.ignore(pos, expected);
         allowed_lateness = true;
@@ -1093,7 +1149,7 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
     if (s_populate.ignore(pos, expected))
         is_populate = true;
-    else if (ParserKeyword{"EMPTY"}.ignore(pos, expected))
+    else if (s_empty.ignore(pos, expected))
         is_create_empty = true;
 
     /// AS SELECT ...
@@ -1146,19 +1202,19 @@ bool ParserCreateWindowViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
 
 bool ParserTableOverrideDeclaration::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_table_override("TABLE OVERRIDE");
+    ParserKeyword s_table_override(Keyword::TABLE_OVERRIDE);
     ParserIdentifier table_name_p;
     ParserToken lparen_p(TokenType::OpeningRoundBracket);
     ParserToken rparen_p(TokenType::ClosingRoundBracket);
     ParserTablePropertiesDeclarationList table_properties_p;
     ParserExpression expression_p;
     ParserTTLExpressionList parser_ttl_list;
-    ParserKeyword s_columns("COLUMNS");
-    ParserKeyword s_partition_by("PARTITION BY");
-    ParserKeyword s_primary_key("PRIMARY KEY");
-    ParserKeyword s_order_by("ORDER BY");
-    ParserKeyword s_sample_by("SAMPLE BY");
-    ParserKeyword s_ttl("TTL");
+    ParserKeyword s_columns(Keyword::COLUMNS);
+    ParserKeyword s_partition_by(Keyword::PARTITION_BY);
+    ParserKeyword s_primary_key(Keyword::PRIMARY_KEY);
+    ParserKeyword s_order_by(Keyword::ORDER_BY);
+    ParserKeyword s_sample_by(Keyword::SAMPLE_BY);
+    ParserKeyword s_ttl(Keyword::TTL);
     ASTPtr table_name;
     ASTPtr columns;
     ASTPtr partition_by;
@@ -1284,10 +1340,12 @@ bool ParserTableOverridesDeclarationList::parseImpl(Pos & pos, ASTPtr & node, Ex
 
 bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_database("DATABASE");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_database(Keyword::DATABASE);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_uuid(Keyword::UUID);
     ParserStorage storage_p{ParserStorage::DATABASE_ENGINE};
     ParserIdentifier name_p(true);
     ParserTableOverridesDeclarationList table_overrides_p;
@@ -1318,7 +1376,7 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
     if (!name_p.parse(pos, database, expected))
         return false;
 
-    if (ParserKeyword("UUID").ignore(pos, expected))
+    if (s_uuid.ignore(pos, expected))
     {
         ParserStringLiteral uuid_p;
         ASTPtr ast_uuid;
@@ -1327,7 +1385,7 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
         uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
     }
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (s_on.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
@@ -1363,17 +1421,18 @@ bool ParserCreateDatabaseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & e
 
 bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
     ParserCompoundIdentifier table_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ true);
     ParserCompoundIdentifier to_table_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ false);
-    ParserKeyword s_as("AS");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword s_materialized("MATERIALIZED");
-    ParserKeyword s_populate("POPULATE");
-    ParserKeyword s_empty("EMPTY");
-    ParserKeyword s_or_replace("OR REPLACE");
+    ParserKeyword s_as(Keyword::AS);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword s_materialized(Keyword::MATERIALIZED);
+    ParserKeyword s_populate(Keyword::POPULATE);
+    ParserKeyword s_empty(Keyword::EMPTY);
+    ParserKeyword s_or_replace(Keyword::OR_REPLACE);
+    ParserKeyword s_to{Keyword::TO};
     ParserToken s_dot(TokenType::Dot);
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
     ParserToken s_rparen(TokenType::ClosingRoundBracket);
@@ -1382,6 +1441,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     ParserTablePropertiesDeclarationList table_properties_p;
     ParserSelectWithUnionQuery select_p;
     ParserNameList names_p;
+    ParserSQLSecurity sql_security_p;
 
     ASTPtr table;
     ASTPtr to_table;
@@ -1391,6 +1451,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     ASTPtr as_database;
     ASTPtr as_table;
     ASTPtr select;
+    ASTPtr sql_security;
     ASTPtr refresh_strategy;
 
     String cluster_str;
@@ -1416,6 +1477,8 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         replace_view = true;
     }
 
+    sql_security_p.parse(pos, sql_security, expected);
+
     if (!replace_view && s_materialized.ignore(pos, expected))
     {
         is_materialized_view = true;
@@ -1432,13 +1495,13 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     if (!table_name_p.parse(pos, table, expected))
         return false;
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
     }
 
-    if (ParserKeyword{"REFRESH"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::REFRESH}.ignore(pos, expected))
     {
         // REFRESH only with materialized views
         if (!is_materialized_view)
@@ -1447,13 +1510,13 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             return false;
     }
 
-    if (is_materialized_view && ParserKeyword{"TO INNER UUID"}.ignore(pos, expected))
+    if (is_materialized_view && ParserKeyword{Keyword::TO_INNER_UUID}.ignore(pos, expected))
     {
         ParserStringLiteral literal_p;
         if (!literal_p.parse(pos, to_inner_uuid, expected))
             return false;
     }
-    else if (is_materialized_view && ParserKeyword{"TO"}.ignore(pos, expected))
+    else if (is_materialized_view && ParserKeyword{Keyword::TO}.ignore(pos, expected))
     {
         // TO [db.]table
         if (!table_name_p.parse(pos, to_table, expected))
@@ -1483,7 +1546,7 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             else if (s_empty.ignore(pos, expected))
                 is_create_empty = true;
 
-            if (ParserKeyword{"TO"}.ignore(pos, expected))
+            if (s_to.ignore(pos, expected))
                 throw Exception(
                     ErrorCodes::SYNTAX_ERROR, "When creating a materialized view you can't declare both 'ENGINE' and 'TO [db].[table]'");
         }
@@ -1508,6 +1571,9 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         }
     }
 
+    if (!sql_security)
+        sql_security_p.parse(pos, sql_security, expected);
+
     /// AS SELECT ...
     if (!s_as.ignore(pos, expected))
         return false;
@@ -1550,6 +1616,8 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         query->set(query->refresh_strategy, refresh_strategy);
     if (comment)
         query->set(query->comment, comment);
+    if (sql_security)
+        query->sql_security = typeid_cast<std::shared_ptr<ASTSQLSecurity>>(sql_security);
 
     tryGetIdentifierNameInto(as_database, query->as_database);
     tryGetIdentifierNameInto(as_table, query->as_table);
@@ -1560,13 +1628,13 @@ bool ParserCreateViewQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
 bool ParserCreateNamedCollectionQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_named_collection("NAMED COLLECTION");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
-    ParserKeyword s_on("ON");
-    ParserKeyword s_as("AS");
-    ParserKeyword s_not_overridable("NOT OVERRIDABLE");
-    ParserKeyword s_overridable("OVERRIDABLE");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_named_collection(Keyword::NAMED_COLLECTION);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_as(Keyword::AS);
+    ParserKeyword s_not_overridable(Keyword::NOT_OVERRIDABLE);
+    ParserKeyword s_overridable(Keyword::OVERRIDABLE);
     ParserIdentifier name_p;
     ParserToken s_comma(TokenType::Comma);
 
@@ -1587,6 +1655,7 @@ bool ParserCreateNamedCollectionQuery::parseImpl(Pos & pos, ASTPtr & node, Expec
     if (!name_p.parse(pos, collection_name, expected))
         return false;
 
+
     if (s_on.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
@@ -1628,13 +1697,13 @@ bool ParserCreateNamedCollectionQuery::parseImpl(Pos & pos, ASTPtr & node, Expec
 
 bool ParserCreateDictionaryQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_attach("ATTACH");
-    ParserKeyword s_replace("REPLACE");
-    ParserKeyword s_or_replace("OR REPLACE");
-    ParserKeyword s_dictionary("DICTIONARY");
-    ParserKeyword s_if_not_exists("IF NOT EXISTS");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_attach(Keyword::ATTACH);
+    ParserKeyword s_replace(Keyword::REPLACE);
+    ParserKeyword s_or_replace(Keyword::OR_REPLACE);
+    ParserKeyword s_dictionary(Keyword::DICTIONARY);
+    ParserKeyword s_if_not_exists(Keyword::IF_NOT_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
     ParserCompoundIdentifier dict_name_p(/*table_name_with_optional_uuid*/ true, /*allow_query_parameter*/ true);
     ParserToken s_left_paren(TokenType::OpeningRoundBracket);
     ParserToken s_right_paren(TokenType::ClosingRoundBracket);
diff --git a/src/Parsers/ParserCreateQuery.h b/src/Parsers/ParserCreateQuery.h
index 910ee048442..d001c097114 100644
--- a/src/Parsers/ParserCreateQuery.h
+++ b/src/Parsers/ParserCreateQuery.h
@@ -10,6 +10,7 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/IParserBase.h>
 #include <Parsers/ParserDataType.h>
+#include <Parsers/ParserSetQuery.h>
 #include <Poco/String.h>
 
 namespace DB
@@ -24,6 +25,14 @@ protected:
     bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
 };
 
+/** Parses sql security option. DEFINER = user_name SQL SECURITY DEFINER
+ */
+class ParserSQLSecurity : public IParserBase
+{
+protected:
+    const char * getName() const override { return "sql security"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+};
 
 /** Storage engine or Codec. For example:
  *         Memory()
@@ -120,23 +129,27 @@ using ParserCompoundColumnDeclaration = IParserColumnDeclaration<ParserCompoundI
 template <typename NameParser>
 bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    ParserKeyword s_default{Keyword::DEFAULT};
+    ParserKeyword s_null{Keyword::NULL_KEYWORD};
+    ParserKeyword s_not{Keyword::NOT};
+    ParserKeyword s_materialized{Keyword::MATERIALIZED};
+    ParserKeyword s_ephemeral{Keyword::EPHEMERAL};
+    ParserKeyword s_alias{Keyword::ALIAS};
+    ParserKeyword s_auto_increment{Keyword::AUTO_INCREMENT};
+    ParserKeyword s_comment{Keyword::COMMENT};
+    ParserKeyword s_codec{Keyword::CODEC};
+    ParserKeyword s_stat{Keyword::STATISTIC};
+    ParserKeyword s_ttl{Keyword::TTL};
+    ParserKeyword s_remove{Keyword::REMOVE};
+    ParserKeyword s_modify_setting(Keyword::MODIFY_SETTING);
+    ParserKeyword s_reset_setting(Keyword::RESET_SETTING);
+    ParserKeyword s_settings(Keyword::SETTINGS);
+    ParserKeyword s_type{Keyword::TYPE};
+    ParserKeyword s_collate{Keyword::COLLATE};
+    ParserKeyword s_primary_key{Keyword::PRIMARY_KEY};
+
     NameParser name_parser;
     ParserDataType type_parser;
-    ParserKeyword s_default{"DEFAULT"};
-    ParserKeyword s_null{"NULL"};
-    ParserKeyword s_not{"NOT"};
-    ParserKeyword s_materialized{"MATERIALIZED"};
-    ParserKeyword s_ephemeral{"EPHEMERAL"};
-    ParserKeyword s_alias{"ALIAS"};
-    ParserKeyword s_auto_increment{"AUTO_INCREMENT"};
-    ParserKeyword s_comment{"COMMENT"};
-    ParserKeyword s_codec{"CODEC"};
-    ParserKeyword s_stat{"STATISTIC"};
-    ParserKeyword s_ttl{"TTL"};
-    ParserKeyword s_remove{"REMOVE"};
-    ParserKeyword s_type{"TYPE"};
-    ParserKeyword s_collate{"COLLATE"};
-    ParserKeyword s_primary_key{"PRIMARY KEY"};
     ParserExpression expr_parser;
     ParserStringLiteral string_literal_parser;
     ParserLiteral literal_parser;
@@ -144,6 +157,7 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
     ParserCollation collation_parser;
     ParserStatisticType stat_type_parser;
     ParserExpression expression_parser;
+    ParserSetQuery settings_parser(true);
 
     /// mandatory column name
     ASTPtr name;
@@ -155,11 +169,12 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
 
     /// This keyword may occur only in MODIFY COLUMN query. We check it here
     /// because ParserDataType parses types as an arbitrary identifiers and
-    /// doesn't check that parsed string is existing data type. In this way
-    /// REMOVE keyword can be parsed as data type and further parsing will fail.
-    /// So we just check this keyword and in case of success return column
-    /// declaration with name only.
-    if (!require_type && s_remove.checkWithoutMoving(pos, expected))
+    /// doesn't check that parsed string is existing data type. In this way,
+    /// REMOVE, MODIFY SETTING, or RESET SETTING can be parsed as data type
+    /// and further parsing will fail. So we just check these keyword and in
+    /// case of success return column declaration with name only.
+    if (!require_type
+        && (s_remove.checkWithoutMoving(pos, expected) || s_modify_setting.checkWithoutMoving(pos, expected) || s_reset_setting.checkWithoutMoving(pos, expected)))
     {
         if (!check_keywords_after_name)
             return false;
@@ -181,6 +196,7 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
     ASTPtr stat_type_expression;
     ASTPtr ttl_expression;
     ASTPtr collation_expression;
+    ASTPtr settings;
     bool primary_key_specifier = false;
 
     auto null_check_without_moving = [&]() -> bool
@@ -212,11 +228,9 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
             return false;
         if (!type_parser.parse(pos, type, expected))
             return false;
-        if (s_collate.ignore(pos, expected))
-        {
-            if (!collation_parser.parse(pos, collation_expression, expected))
-                return false;
-        }
+        if (s_collate.ignore(pos, expected)
+            && !collation_parser.parse(pos, collation_expression, expected))
+            return false;
     }
 
     if (allow_null_modifiers)
@@ -231,6 +245,11 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
             null_modifier.emplace(true);
     }
 
+    /// Collate is also allowed after NULL/NOT NULL
+    if (!collation_expression && s_collate.ignore(pos, expected)
+        && !collation_parser.parse(pos, collation_expression, expected))
+        return false;
+
     Pos pos_before_specifier = pos;
     if (s_default.ignore(pos, expected) || s_materialized.ignore(pos, expected) || s_alias.ignore(pos, expected))
     {
@@ -267,7 +286,7 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
         {
             const String type_int("INT");
             Tokens tokens(type_int.data(), type_int.data() + type_int.size());
-            Pos tmp_pos(tokens, 0);
+            Pos tmp_pos(tokens, pos.max_depth, pos.max_backtracks);
             Expected tmp_expected;
             ParserDataType().parse(tmp_pos, type, tmp_expected);
         }
@@ -321,6 +340,28 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
         primary_key_specifier = true;
     }
 
+    auto old_pos = pos;
+    if (s_settings.ignore(pos, expected))
+    {
+        /// When the keyword `SETTINGS` appear here, it can be a column settings declaration or query settings
+        /// For example:
+        /// - Column settings: `ALTER TABLE xx MODIFY COLUMN yy <new_type> SETTINGS (name = value)`
+        /// - Query settings: ` ALTER TABLE xx MODIFY COLUMN yy <new_type> SETTINGS mutation_sync = 2`
+        /// So after parsing keyword `SETTINGS`, we check if it's followed by an `(` then it's the column
+        /// settings, otherwise it's the query settings and we need to move `pos` back to origin position.
+        ParserToken parser_opening_bracket(TokenType::OpeningRoundBracket);
+        if (parser_opening_bracket.ignore(pos, expected))
+        {
+            if (!settings_parser.parse(pos, settings, expected))
+                return false;
+            ParserToken parser_closing_bracket(TokenType::ClosingRoundBracket);
+            if (!parser_closing_bracket.ignore(pos, expected))
+                return false;
+        }
+        else
+            pos = old_pos;
+    }
+
     node = column_declaration;
 
     if (type)
@@ -351,6 +392,12 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
         column_declaration->children.push_back(std::move(codec_expression));
     }
 
+    if (settings)
+    {
+        column_declaration->settings = settings;
+        column_declaration->children.push_back(std::move(settings));
+    }
+
     if (stat_type_expression)
     {
         column_declaration->stat_type = stat_type_expression;
@@ -362,6 +409,7 @@ bool IParserColumnDeclaration<NameParser>::parseImpl(Pos & pos, ASTPtr & node, E
         column_declaration->ttl = ttl_expression;
         column_declaration->children.push_back(std::move(ttl_expression));
     }
+
     if (collation_expression)
     {
         column_declaration->collation = collation_expression;
@@ -486,7 +534,7 @@ public:
         DATABASE_ENGINE,
     };
 
-    ParserStorage(EngineKind engine_kind_) : engine_kind(engine_kind_) {}
+    explicit ParserStorage(EngineKind engine_kind_) : engine_kind(engine_kind_) {}
 
 protected:
     const char * getName() const override { return "storage definition"; }
diff --git a/src/Parsers/ParserDataType.cpp b/src/Parsers/ParserDataType.cpp
index 3e2a6facac6..fcf189e51f4 100644
--- a/src/Parsers/ParserDataType.cpp
+++ b/src/Parsers/ParserDataType.cpp
@@ -64,39 +64,39 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     /// only for certain first words, otherwise we don't know how many words to parse
     if (type_name_upper == "NATIONAL")
     {
-        if (ParserKeyword("CHARACTER LARGE OBJECT").ignore(pos))
-            type_name_suffix = "CHARACTER LARGE OBJECT";
-        else if (ParserKeyword("CHARACTER VARYING").ignore(pos))
-            type_name_suffix = "CHARACTER VARYING";
-        else if (ParserKeyword("CHAR VARYING").ignore(pos))
-            type_name_suffix = "CHAR VARYING";
-        else if (ParserKeyword("CHARACTER").ignore(pos))
-            type_name_suffix = "CHARACTER";
-        else if (ParserKeyword("CHAR").ignore(pos))
-            type_name_suffix = "CHAR";
+        if (ParserKeyword(Keyword::CHARACTER_LARGE_OBJECT).ignore(pos))
+            type_name_suffix = toStringView(Keyword::CHARACTER_LARGE_OBJECT);
+        else if (ParserKeyword(Keyword::CHARACTER_VARYING).ignore(pos))
+            type_name_suffix = toStringView(Keyword::CHARACTER_VARYING);
+        else if (ParserKeyword(Keyword::CHAR_VARYING).ignore(pos))
+            type_name_suffix = toStringView(Keyword::CHAR_VARYING);
+        else if (ParserKeyword(Keyword::CHARACTER).ignore(pos))
+            type_name_suffix = toStringView(Keyword::CHARACTER);
+        else if (ParserKeyword(Keyword::CHAR).ignore(pos))
+            type_name_suffix = toStringView(Keyword::CHAR);
     }
     else if (type_name_upper == "BINARY" ||
              type_name_upper == "CHARACTER" ||
              type_name_upper == "CHAR" ||
              type_name_upper == "NCHAR")
     {
-        if (ParserKeyword("LARGE OBJECT").ignore(pos))
-            type_name_suffix = "LARGE OBJECT";
-        else if (ParserKeyword("VARYING").ignore(pos))
-            type_name_suffix = "VARYING";
+        if (ParserKeyword(Keyword::LARGE_OBJECT).ignore(pos))
+            type_name_suffix = toStringView(Keyword::LARGE_OBJECT);
+        else if (ParserKeyword(Keyword::VARYING).ignore(pos))
+            type_name_suffix = toStringView(Keyword::VARYING);
     }
     else if (type_name_upper == "DOUBLE")
     {
-        if (ParserKeyword("PRECISION").ignore(pos))
-            type_name_suffix = "PRECISION";
+        if (ParserKeyword(Keyword::PRECISION).ignore(pos))
+            type_name_suffix = toStringView(Keyword::PRECISION);
     }
     else if (type_name_upper.find("INT") != std::string::npos)
     {
         /// Support SIGNED and UNSIGNED integer type modifiers for compatibility with MySQL
-        if (ParserKeyword("SIGNED").ignore(pos))
-            type_name_suffix = "SIGNED";
-        else if (ParserKeyword("UNSIGNED").ignore(pos))
-            type_name_suffix = "UNSIGNED";
+        if (ParserKeyword(Keyword::SIGNED).ignore(pos))
+            type_name_suffix = toStringView(Keyword::SIGNED);
+        else if (ParserKeyword(Keyword::UNSIGNED).ignore(pos))
+            type_name_suffix = toStringView(Keyword::UNSIGNED);
         else if (pos->type == TokenType::OpeningRoundBracket)
         {
             ++pos;
@@ -105,10 +105,10 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             if (pos->type != TokenType::ClosingRoundBracket)
                return false;
             ++pos;
-            if (ParserKeyword("SIGNED").ignore(pos))
-                type_name_suffix = "SIGNED";
-            else if (ParserKeyword("UNSIGNED").ignore(pos))
-                type_name_suffix = "UNSIGNED";
+            if (ParserKeyword(Keyword::SIGNED).ignore(pos))
+                type_name_suffix = toStringView(Keyword::SIGNED);
+            else if (ParserKeyword(Keyword::UNSIGNED).ignore(pos))
+                type_name_suffix = toStringView(Keyword::UNSIGNED);
         }
 
     }
@@ -116,6 +116,18 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     if (!type_name_suffix.empty())
         type_name = type_name_upper + " " + type_name_suffix;
 
+    /// skip trailing comma in types, e.g. Tuple(Int, String,)
+    if (pos->type == TokenType::Comma)
+    {
+        Expected test_expected;
+        auto test_pos = pos;
+        ++test_pos;
+        if (ParserToken(TokenType::ClosingRoundBracket).ignore(test_pos, test_expected))
+        { // the end of the type definition was reached and there was a trailing comma
+            ++pos;
+        }
+    }
+
     auto function_node = std::make_shared<ASTFunction>();
     function_node->name = type_name;
     function_node->no_empty_args = true;
@@ -133,6 +145,9 @@ bool ParserDataType::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     if (!args_parser.parse(pos, expr_list_args, expected))
         return false;
+    if (pos->type == TokenType::Comma)
+        // ignore trailing comma inside Nested structures like Tuple(Int, Tuple(Int, String),)
+        ++pos;
     if (pos->type != TokenType::ClosingRoundBracket)
         return false;
     ++pos;
diff --git a/src/Parsers/ParserDatabaseOrNone.cpp b/src/Parsers/ParserDatabaseOrNone.cpp
index c53c547aedd..6b319c80f11 100644
--- a/src/Parsers/ParserDatabaseOrNone.cpp
+++ b/src/Parsers/ParserDatabaseOrNone.cpp
@@ -10,7 +10,7 @@ bool ParserDatabaseOrNone::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
     auto result = std::make_shared<ASTDatabaseOrNone>();
     node = result;
 
-    if (ParserKeyword{"NONE"}.ignore(pos, expected))
+    if (ParserKeyword(Keyword::NONE).ignore(pos, expected))
     {
         result->none = true;
         return true;
diff --git a/src/Parsers/ParserDeleteQuery.cpp b/src/Parsers/ParserDeleteQuery.cpp
index 7b27651d82d..00fac45c8ed 100644
--- a/src/Parsers/ParserDeleteQuery.cpp
+++ b/src/Parsers/ParserDeleteQuery.cpp
@@ -13,12 +13,12 @@ bool ParserDeleteQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     auto query = std::make_shared<ASTDeleteQuery>();
     node = query;
 
-    ParserKeyword s_delete("DELETE");
-    ParserKeyword s_from("FROM");
-    ParserKeyword s_where("WHERE");
+    ParserKeyword s_delete(Keyword::DELETE);
+    ParserKeyword s_from(Keyword::FROM);
+    ParserKeyword s_where(Keyword::WHERE);
     ParserExpression parser_exp_elem;
-    ParserKeyword s_settings("SETTINGS");
-    ParserKeyword s_on{"ON"};
+    ParserKeyword s_settings(Keyword::SETTINGS);
+    ParserKeyword s_on{Keyword::ON};
 
     if (s_delete.ignore(pos, expected))
     {
diff --git a/src/Parsers/ParserDescribeCacheQuery.cpp b/src/Parsers/ParserDescribeCacheQuery.cpp
index c6c9cbe8bc0..d0219600892 100644
--- a/src/Parsers/ParserDescribeCacheQuery.cpp
+++ b/src/Parsers/ParserDescribeCacheQuery.cpp
@@ -9,9 +9,9 @@ namespace DB
 
 bool ParserDescribeCacheQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword p_describe("DESCRIBE");
-    ParserKeyword p_desc("DESC");
-    ParserKeyword p_cache("FILESYSTEM CACHE");
+    ParserKeyword p_describe(Keyword::DESCRIBE);
+    ParserKeyword p_desc(Keyword::DESC);
+    ParserKeyword p_cache(Keyword::FILESYSTEM_CACHE);
     ParserLiteral p_cache_name;
 
     if ((!p_describe.ignore(pos, expected) && !p_desc.ignore(pos, expected))
diff --git a/src/Parsers/ParserDescribeTableQuery.cpp b/src/Parsers/ParserDescribeTableQuery.cpp
index fcfc4799dbe..92c0cfacd9b 100644
--- a/src/Parsers/ParserDescribeTableQuery.cpp
+++ b/src/Parsers/ParserDescribeTableQuery.cpp
@@ -14,10 +14,10 @@ namespace DB
 
 bool ParserDescribeTableQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_describe("DESCRIBE");
-    ParserKeyword s_desc("DESC");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_settings("SETTINGS");
+    ParserKeyword s_describe(Keyword::DESCRIBE);
+    ParserKeyword s_desc(Keyword::DESC);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_settings(Keyword::SETTINGS);
     ParserToken s_dot(TokenType::Dot);
     ParserIdentifier name_p;
     ParserSetQuery parser_settings(true);
diff --git a/src/Parsers/ParserDictionary.cpp b/src/Parsers/ParserDictionary.cpp
index ef914e2264a..539ce30e010 100644
--- a/src/Parsers/ParserDictionary.cpp
+++ b/src/Parsers/ParserDictionary.cpp
@@ -165,12 +165,12 @@ bool ParserDictionarySettings::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
 
 bool ParserDictionary::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword primary_key_keyword("PRIMARY KEY");
-    ParserKeyword source_keyword("SOURCE");
-    ParserKeyword lifetime_keyword("LIFETIME");
-    ParserKeyword range_keyword("RANGE");
-    ParserKeyword layout_keyword("LAYOUT");
-    ParserKeyword settings_keyword("SETTINGS");
+    ParserKeyword primary_key_keyword(Keyword::PRIMARY_KEY);
+    ParserKeyword source_keyword(Keyword::SOURCE);
+    ParserKeyword lifetime_keyword(Keyword::LIFETIME);
+    ParserKeyword range_keyword(Keyword::RANGE);
+    ParserKeyword layout_keyword(Keyword::LAYOUT);
+    ParserKeyword settings_keyword(Keyword::SETTINGS);
     ParserToken open(TokenType::OpeningRoundBracket);
     ParserToken close(TokenType::ClosingRoundBracket);
     ParserFunctionWithKeyValueArguments key_value_pairs_p;
diff --git a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
index 9910c73e541..376cad136ae 100644
--- a/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
+++ b/src/Parsers/ParserDictionaryAttributeDeclaration.cpp
@@ -12,12 +12,12 @@ bool ParserDictionaryAttributeDeclaration::parseImpl(Pos & pos, ASTPtr & node, E
 {
     ParserIdentifier name_parser;
     ParserDataType type_parser;
-    ParserKeyword s_default{"DEFAULT"};
-    ParserKeyword s_expression{"EXPRESSION"};
-    ParserKeyword s_hierarchical{"HIERARCHICAL"};
-    ParserKeyword s_bidirectional{"BIDIRECTIONAL"};
-    ParserKeyword s_injective{"INJECTIVE"};
-    ParserKeyword s_is_object_id{"IS_OBJECT_ID"};
+    ParserKeyword s_default{Keyword::DEFAULT};
+    ParserKeyword s_expression{Keyword::EXPRESSION};
+    ParserKeyword s_hierarchical{Keyword::HIERARCHICAL};
+    ParserKeyword s_bidirectional{Keyword::BIDIRECTIONAL};
+    ParserKeyword s_injective{Keyword::INJECTIVE};
+    ParserKeyword s_is_object_id{Keyword::IS_OBJECT_ID};
     ParserLiteral default_parser;
     ParserArrayOfLiterals array_literals_parser;
     ParserExpression expression_parser;
diff --git a/src/Parsers/ParserDropFunctionQuery.cpp b/src/Parsers/ParserDropFunctionQuery.cpp
index 3f35124f9ab..d98acef3252 100644
--- a/src/Parsers/ParserDropFunctionQuery.cpp
+++ b/src/Parsers/ParserDropFunctionQuery.cpp
@@ -9,10 +9,10 @@ namespace DB
 
 bool ParserDropFunctionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_function("FUNCTION");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_function(Keyword::FUNCTION);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
     ParserIdentifier function_name_p;
 
     String cluster_str;
diff --git a/src/Parsers/ParserDropIndexQuery.cpp b/src/Parsers/ParserDropIndexQuery.cpp
index 5843d8b94bf..1363c00f252 100644
--- a/src/Parsers/ParserDropIndexQuery.cpp
+++ b/src/Parsers/ParserDropIndexQuery.cpp
@@ -13,10 +13,10 @@ bool ParserDropIndexQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected
     auto query = std::make_shared<ASTDropIndexQuery>();
     node = query;
 
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_index("INDEX");
-    ParserKeyword s_on("ON");
-    ParserKeyword s_if_exists("IF EXISTS");
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_index(Keyword::INDEX);
+    ParserKeyword s_on(Keyword::ON);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
     ParserIdentifier index_name_p;
 
     String cluster_str;
diff --git a/src/Parsers/ParserDropNamedCollectionQuery.cpp b/src/Parsers/ParserDropNamedCollectionQuery.cpp
index b0b010b5ef6..b438f3b5f4f 100644
--- a/src/Parsers/ParserDropNamedCollectionQuery.cpp
+++ b/src/Parsers/ParserDropNamedCollectionQuery.cpp
@@ -9,10 +9,10 @@ namespace DB
 
 bool ParserDropNamedCollectionQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_collection("NAMED COLLECTION");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_on("ON");
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_collection(Keyword::NAMED_COLLECTION);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_on(Keyword::ON);
     ParserIdentifier name_p;
 
     String cluster_str;
diff --git a/src/Parsers/ParserDropQuery.cpp b/src/Parsers/ParserDropQuery.cpp
index 450c8a1afec..09f15e9649f 100644
--- a/src/Parsers/ParserDropQuery.cpp
+++ b/src/Parsers/ParserDropQuery.cpp
@@ -2,7 +2,7 @@
 
 #include <Parsers/CommonParsers.h>
 #include <Parsers/ParserDropQuery.h>
-
+#include <Parsers/ParserCreateQuery.h>
 
 namespace DB
 {
@@ -12,24 +12,28 @@ namespace
 
 bool parseDropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected, const ASTDropQuery::Kind kind)
 {
-    ParserKeyword s_temporary("TEMPORARY");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_dictionary("DICTIONARY");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword s_database("DATABASE");
+    ParserKeyword s_temporary(Keyword::TEMPORARY);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_dictionary(Keyword::DICTIONARY);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword s_database(Keyword::DATABASE);
+    ParserKeyword s_all(Keyword::ALL);
+    ParserKeyword s_tables(Keyword::TABLES);
     ParserToken s_dot(TokenType::Dot);
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_if_empty("IF EMPTY");
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_if_empty(Keyword::IF_EMPTY);
     ParserIdentifier name_p(true);
-    ParserKeyword s_permanently("PERMANENTLY");
-    ParserKeyword s_no_delay("NO DELAY");
-    ParserKeyword s_sync("SYNC");
+    ParserKeyword s_permanently(Keyword::PERMANENTLY);
+    ParserKeyword s_no_delay(Keyword::NO_DELAY);
+    ParserKeyword s_sync(Keyword::SYNC);
+    ParserNameList tables_p;
 
     ASTPtr database;
-    ASTPtr table;
+    ASTPtr database_and_tables;
     String cluster_str;
     bool if_exists = false;
     bool if_empty = false;
+    bool has_all_tables = false;
     bool temporary = false;
     bool is_dictionary = false;
     bool is_view = false;
@@ -47,6 +51,16 @@ bool parseDropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected, cons
         if (!name_p.parse(pos, database, expected))
             return false;
     }
+    else if (s_all.ignore(pos, expected) && s_tables.ignore(pos, expected) && kind == ASTDropQuery::Kind::Truncate)
+    {
+        has_all_tables = true;
+
+        if (s_if_exists.ignore(pos, expected))
+            if_exists = true;
+
+        if (!name_p.parse(pos, database, expected))
+            return false;
+    }
     else
     {
         if (s_view.ignore(pos, expected))
@@ -68,19 +82,12 @@ bool parseDropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected, cons
         if (s_if_empty.ignore(pos, expected))
             if_empty = true;
 
-        if (!name_p.parse(pos, table, expected))
+        if (!tables_p.parse(pos, database_and_tables, expected))
             return false;
-
-        if (s_dot.ignore(pos, expected))
-        {
-            database = table;
-            if (!name_p.parse(pos, table, expected))
-                return false;
-        }
     }
 
     /// common for tables / dictionaries / databases
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
@@ -99,19 +106,20 @@ bool parseDropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected, cons
     query->kind = kind;
     query->if_exists = if_exists;
     query->if_empty = if_empty;
+    query->has_all_tables = has_all_tables;
     query->temporary = temporary;
     query->is_dictionary = is_dictionary;
     query->is_view = is_view;
     query->sync = sync;
     query->permanently = permanently;
     query->database = database;
-    query->table = table;
+    query->database_and_tables = database_and_tables;
 
     if (database)
         query->children.push_back(database);
 
-    if (table)
-        query->children.push_back(table);
+    if (database_and_tables)
+        query->children.push_back(database_and_tables);
 
     query->cluster = cluster_str;
 
@@ -122,9 +130,9 @@ bool parseDropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected, cons
 
 bool ParserDropQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_drop("DROP");
-    ParserKeyword s_detach("DETACH");
-    ParserKeyword s_truncate("TRUNCATE");
+    ParserKeyword s_drop(Keyword::DROP);
+    ParserKeyword s_detach(Keyword::DETACH);
+    ParserKeyword s_truncate(Keyword::TRUNCATE);
 
     if (s_drop.ignore(pos, expected))
         return parseDropQuery(pos, node, expected, ASTDropQuery::Kind::Drop);
diff --git a/src/Parsers/ParserExplainQuery.cpp b/src/Parsers/ParserExplainQuery.cpp
index 148b671af71..16ba0701992 100644
--- a/src/Parsers/ParserExplainQuery.cpp
+++ b/src/Parsers/ParserExplainQuery.cpp
@@ -16,15 +16,15 @@ bool ParserExplainQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected
 {
     ASTExplainQuery::ExplainKind kind;
 
-    ParserKeyword s_ast("AST");
-    ParserKeyword s_explain("EXPLAIN");
-    ParserKeyword s_syntax("SYNTAX");
-    ParserKeyword s_query_tree("QUERY TREE");
-    ParserKeyword s_pipeline("PIPELINE");
-    ParserKeyword s_plan("PLAN");
-    ParserKeyword s_estimates("ESTIMATE");
-    ParserKeyword s_table_override("TABLE OVERRIDE");
-    ParserKeyword s_current_transaction("CURRENT TRANSACTION");
+    ParserKeyword s_ast(Keyword::AST);
+    ParserKeyword s_explain(Keyword::EXPLAIN);
+    ParserKeyword s_syntax(Keyword::SYNTAX);
+    ParserKeyword s_query_tree(Keyword::QUERY_TREE);
+    ParserKeyword s_pipeline(Keyword::PIPELINE);
+    ParserKeyword s_plan(Keyword::PLAN);
+    ParserKeyword s_estimates(Keyword::ESTIMATE);
+    ParserKeyword s_table_override(Keyword::TABLE_OVERRIDE);
+    ParserKeyword s_current_transaction(Keyword::CURRENT_TRANSACTION);
 
     if (s_explain.ignore(pos, expected))
     {
diff --git a/src/Parsers/ParserExternalDDLQuery.cpp b/src/Parsers/ParserExternalDDLQuery.cpp
index 01e8fff4f3c..ebe210a953a 100644
--- a/src/Parsers/ParserExternalDDLQuery.cpp
+++ b/src/Parsers/ParserExternalDDLQuery.cpp
@@ -27,7 +27,7 @@ namespace ErrorCodes
 bool ParserExternalDDLQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserFunction p_function;
-    ParserKeyword s_external("EXTERNAL DDL FROM");
+    ParserKeyword s_external(Keyword::EXTERNAL_DDL_FROM);
 
     ASTPtr from;
     auto external_ddl_query = std::make_shared<ASTExternalDDLQuery>();
@@ -61,16 +61,16 @@ bool ParserExternalDDLQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expect
         {
             /// Syntax error is ignored, so we need to convert the error code for parsing failure
 
-            if (ParserKeyword("ALTER TABLE").ignore(pos))
+            if (ParserKeyword(Keyword::ALTER_TABLE).ignore(pos))
                 throw Exception(ErrorCodes::MYSQL_SYNTAX_ERROR, "Cannot parse MySQL alter query.");
 
-            if (ParserKeyword("RENAME TABLE").ignore(pos))
+            if (ParserKeyword(Keyword::RENAME_TABLE).ignore(pos))
                 throw Exception(ErrorCodes::MYSQL_SYNTAX_ERROR, "Cannot parse MySQL rename query.");
 
-            if (ParserKeyword("DROP TABLE").ignore(pos) || ParserKeyword("TRUNCATE").ignore(pos))
+            if (ParserKeyword(Keyword::DROP_TABLE).ignore(pos) || ParserKeyword(Keyword::TRUNCATE).ignore(pos))
                 throw Exception(ErrorCodes::MYSQL_SYNTAX_ERROR, "Cannot parse MySQL drop query.");
 
-            if (ParserKeyword("CREATE TABLE").ignore(pos) || ParserKeyword("CREATE TEMPORARY TABLE").ignore(pos))
+            if (ParserKeyword(Keyword::CREATE_TABLE).ignore(pos) || ParserKeyword(Keyword::CREATE_TEMPORARY_TABLE).ignore(pos))
                 throw Exception(ErrorCodes::MYSQL_SYNTAX_ERROR, "Cannot parse MySQL create query.");
         }
 #endif
diff --git a/src/Parsers/ParserInsertQuery.cpp b/src/Parsers/ParserInsertQuery.cpp
index 8601e12ebcb..9373e6a1c93 100644
--- a/src/Parsers/ParserInsertQuery.cpp
+++ b/src/Parsers/ParserInsertQuery.cpp
@@ -26,19 +26,18 @@ namespace ErrorCodes
 bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     /// Create parsers
-    ParserKeyword s_insert_into("INSERT INTO");
-    ParserKeyword s_from_infile("FROM INFILE");
-    ParserKeyword s_compression("COMPRESSION");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_function("FUNCTION");
+    ParserKeyword s_insert_into(Keyword::INSERT_INTO);
+    ParserKeyword s_from_infile(Keyword::FROM_INFILE);
+    ParserKeyword s_compression(Keyword::COMPRESSION);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_function(Keyword::FUNCTION);
     ParserToken s_dot(TokenType::Dot);
-    ParserKeyword s_values("VALUES");
-    ParserKeyword s_format("FORMAT");
-    ParserKeyword s_settings("SETTINGS");
-    ParserKeyword s_select("SELECT");
-    ParserKeyword s_watch("WATCH");
-    ParserKeyword s_partition_by("PARTITION BY");
-    ParserKeyword s_with("WITH");
+    ParserKeyword s_values(Keyword::VALUES);
+    ParserKeyword s_format(Keyword::FORMAT);
+    ParserKeyword s_settings(Keyword::SETTINGS);
+    ParserKeyword s_select(Keyword::SELECT);
+    ParserKeyword s_partition_by(Keyword::PARTITION_BY);
+    ParserKeyword s_with(Keyword::WITH);
     ParserToken s_lparen(TokenType::OpeningRoundBracket);
     ParserToken s_rparen(TokenType::ClosingRoundBracket);
     ParserToken s_semicolon(TokenType::Semicolon);
@@ -56,7 +55,6 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ASTPtr columns;
     ASTPtr format;
     ASTPtr select;
-    ASTPtr watch;
     ASTPtr table_function;
     ASTPtr settings_ast;
     ASTPtr partition_by_expr;
@@ -143,7 +141,7 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     String format_str;
     Pos before_values = pos;
 
-    /// VALUES or FORMAT or SELECT or WITH or WATCH.
+    /// VALUES or FORMAT or SELECT or WITH.
     /// After FROM INFILE we expect FORMAT, SELECT, WITH or nothing.
     if (!infile && s_values.ignore(pos, expected))
     {
@@ -175,14 +173,6 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
         tryGetIdentifierNameInto(format, format_str);
     }
-    else if (!infile && s_watch.ignore(pos, expected))
-    {
-        /// If WATCH is defined, return to position before WATCH and parse
-        /// rest of query as WATCH query.
-        pos = before_values;
-        ParserWatchQuery watch_p;
-        watch_p.parse(pos, watch, expected);
-    }
     else if (!infile)
     {
         /// If all previous conditions were false and it's not FROM INFILE, query is incorrect
@@ -286,7 +276,6 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     query->columns = columns;
     query->format = std::move(format_str);
     query->select = select;
-    query->watch = watch;
     query->settings_ast = settings_ast;
     query->data = data != end ? data : nullptr;
     query->end = end;
@@ -295,8 +284,6 @@ bool ParserInsertQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         query->children.push_back(columns);
     if (select)
         query->children.push_back(select);
-    if (watch)
-        query->children.push_back(watch);
     if (settings_ast)
         query->children.push_back(settings_ast);
 
diff --git a/src/Parsers/ParserKillQueryQuery.cpp b/src/Parsers/ParserKillQueryQuery.cpp
index 0b1b37e61bf..55bd5100009 100644
--- a/src/Parsers/ParserKillQueryQuery.cpp
+++ b/src/Parsers/ParserKillQueryQuery.cpp
@@ -14,16 +14,16 @@ bool ParserKillQueryQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expect
     String cluster_str;
     auto query = std::make_shared<ASTKillQueryQuery>();
 
-    ParserKeyword p_kill{"KILL"};
-    ParserKeyword p_query{"QUERY"};
-    ParserKeyword p_mutation{"MUTATION"};
-    ParserKeyword p_part_move_to_shard{"PART_MOVE_TO_SHARD"};
-    ParserKeyword p_transaction{"TRANSACTION"};
-    ParserKeyword p_on{"ON"};
-    ParserKeyword p_test{"TEST"};
-    ParserKeyword p_sync{"SYNC"};
-    ParserKeyword p_async{"ASYNC"};
-    ParserKeyword p_where{"WHERE"};
+    ParserKeyword p_kill{Keyword::KILL};
+    ParserKeyword p_query{Keyword::QUERY};
+    ParserKeyword p_mutation{Keyword::MUTATION};
+    ParserKeyword p_part_move_to_shard{Keyword::PART_MOVE_TO_SHARD};
+    ParserKeyword p_transaction{Keyword::TRANSACTION};
+    ParserKeyword p_on{Keyword::ON};
+    ParserKeyword p_test{Keyword::TEST};
+    ParserKeyword p_sync{Keyword::SYNC};
+    ParserKeyword p_async{Keyword::ASYNC};
+    ParserKeyword p_where{Keyword::WHERE};
     ParserExpression p_where_expression;
 
     if (!p_kill.ignore(pos, expected))
diff --git a/src/Parsers/ParserOptimizeQuery.cpp b/src/Parsers/ParserOptimizeQuery.cpp
index e887ff445d2..7162f2ac3da 100644
--- a/src/Parsers/ParserOptimizeQuery.cpp
+++ b/src/Parsers/ParserOptimizeQuery.cpp
@@ -24,12 +24,12 @@ bool ParserOptimizeQueryColumnsSpecification::parseImpl(Pos & pos, ASTPtr & node
 
 bool ParserOptimizeQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_optimize_table("OPTIMIZE TABLE");
-    ParserKeyword s_partition("PARTITION");
-    ParserKeyword s_final("FINAL");
-    ParserKeyword s_deduplicate("DEDUPLICATE");
-    ParserKeyword s_cleanup("CLEANUP");
-    ParserKeyword s_by("BY");
+    ParserKeyword s_optimize_table(Keyword::OPTIMIZE_TABLE);
+    ParserKeyword s_partition(Keyword::PARTITION);
+    ParserKeyword s_final(Keyword::FINAL);
+    ParserKeyword s_deduplicate(Keyword::DEDUPLICATE);
+    ParserKeyword s_cleanup(Keyword::CLEANUP);
+    ParserKeyword s_by(Keyword::BY);
     ParserToken s_dot(TokenType::Dot);
     ParserIdentifier name_p(true);
     ParserPartition partition_p;
@@ -55,7 +55,7 @@ bool ParserOptimizeQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expecte
             return false;
     }
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected) && !ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected) && !ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
         return false;
 
     if (s_partition.ignore(pos, expected))
diff --git a/src/Parsers/ParserPartition.cpp b/src/Parsers/ParserPartition.cpp
index 80debc13c67..80a28f4803e 100644
--- a/src/Parsers/ParserPartition.cpp
+++ b/src/Parsers/ParserPartition.cpp
@@ -14,12 +14,10 @@ namespace DB
 
 bool ParserPartition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_id("ID");
-    ParserKeyword s_all("ALL");
+    ParserKeyword s_id(Keyword::ID);
+    ParserKeyword s_all(Keyword::ALL);
     ParserStringLiteral parser_string_literal;
     ParserSubstitution parser_substitution;
-    ParserLiteral literal_parser;
-    ParserTupleOfLiterals tuple_of_literals;
     ParserExpression parser_expr;
 
     auto partition = std::make_shared<ASTPartition>();
@@ -45,34 +43,35 @@ bool ParserPartition::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     {
         ASTPtr value;
         std::optional<size_t> fields_count;
-        if (literal_parser.parse(pos, value, expected) || tuple_of_literals.parse(pos, value, expected))
-        {
-            auto * literal = value->as<ASTLiteral>();
-            if (literal->value.getType() == Field::Types::Tuple)
-            {
-                fields_count = literal->value.get<const Tuple &>().size();
-            }
-            else
-            {
-                fields_count = 1;
-            }
-        }
-        else if (parser_substitution.parse(pos, value, expected))
+        if (parser_substitution.parse(pos, value, expected))
         {
             /// It can be tuple substitution
             fields_count = std::nullopt;
         }
         else if (parser_expr.parse(pos, value, expected))
         {
-            const auto * tuple_ast = value->as<ASTFunction>();
-            if (tuple_ast && tuple_ast->name == "tuple")
+            if (const auto * tuple_ast = value->as<ASTFunction>(); tuple_ast)
             {
+                if (tuple_ast->name != "tuple")
+                    return false;
+
                 const auto * arguments_ast = tuple_ast->arguments->as<ASTExpressionList>();
                 if (arguments_ast)
                     fields_count = arguments_ast->children.size();
                 else
                     fields_count = 0;
             }
+            else if (const auto* literal_ast = value->as<ASTLiteral>(); literal_ast)
+            {
+                if (literal_ast->value.getType() == Field::Types::Tuple)
+                {
+                    fields_count = literal_ast->value.get<const Tuple &>().size();
+                }
+                else
+                {
+                    fields_count = 1;
+                }
+            }
             else
                 return false;
         }
diff --git a/src/Parsers/ParserProjectionSelectQuery.cpp b/src/Parsers/ParserProjectionSelectQuery.cpp
index b2adb5cf154..9ddd536f847 100644
--- a/src/Parsers/ParserProjectionSelectQuery.cpp
+++ b/src/Parsers/ParserProjectionSelectQuery.cpp
@@ -15,10 +15,10 @@ bool ParserProjectionSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     auto select_query = std::make_shared<ASTProjectionSelectQuery>();
     node = select_query;
 
-    ParserKeyword s_with("WITH");
-    ParserKeyword s_select("SELECT");
-    ParserKeyword s_group_by("GROUP BY");
-    ParserKeyword s_order_by("ORDER BY");
+    ParserKeyword s_with(Keyword::WITH);
+    ParserKeyword s_select(Keyword::SELECT);
+    ParserKeyword s_group_by(Keyword::GROUP_BY);
+    ParserKeyword s_order_by(Keyword::ORDER_BY);
 
     ParserNotEmptyExpressionList exp_list_for_with_clause(false);
     ParserNotEmptyExpressionList exp_list_for_select_clause(true); /// Allows aliases without AS keyword.
diff --git a/src/Parsers/ParserQuery.cpp b/src/Parsers/ParserQuery.cpp
index 7ed69940bed..22ddc25019f 100644
--- a/src/Parsers/ParserQuery.cpp
+++ b/src/Parsers/ParserQuery.cpp
@@ -1,6 +1,5 @@
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/ParserCreateFunctionQuery.h>
-#include <Parsers/ParserBackupQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserCreateIndexQuery.h>
 #include <Parsers/ParserDropFunctionQuery.h>
@@ -61,7 +60,6 @@ bool ParserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     ParserExternalDDLQuery external_ddl_p;
     ParserTransactionControl transaction_control_p;
     ParserDeleteQuery delete_p;
-    ParserBackupQuery backup_p;
 
     bool res = query_with_output_p.parse(pos, node, expected)
         || insert_p.parse(pos, node, expected)
@@ -86,8 +84,7 @@ bool ParserQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         || grant_p.parse(pos, node, expected)
         || external_ddl_p.parse(pos, node, expected)
         || transaction_control_p.parse(pos, node, expected)
-        || delete_p.parse(pos, node, expected)
-        || backup_p.parse(pos, node, expected);
+        || delete_p.parse(pos, node, expected);
 
     return res;
 }
diff --git a/src/Parsers/ParserQueryWithOutput.cpp b/src/Parsers/ParserQueryWithOutput.cpp
index f03df6cacfe..cb0c10cd1c9 100644
--- a/src/Parsers/ParserQueryWithOutput.cpp
+++ b/src/Parsers/ParserQueryWithOutput.cpp
@@ -2,6 +2,7 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ParserAlterQuery.h>
+#include <Parsers/ParserBackupQuery.h>
 #include <Parsers/ParserCheckQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserDescribeTableQuery.h>
@@ -65,6 +66,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     ParserShowGrantsQuery show_grants_p;
     ParserShowPrivilegesQuery show_privileges_p;
     ParserExplainQuery explain_p(end, allow_settings_after_format_in_insert);
+    ParserBackupQuery backup_p;
 
     ASTPtr query;
 
@@ -94,7 +96,8 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         || show_access_p.parse(pos, query, expected)
         || show_access_entities_p.parse(pos, query, expected)
         || show_grants_p.parse(pos, query, expected)
-        || show_privileges_p.parse(pos, query, expected);
+        || show_privileges_p.parse(pos, query, expected)
+        || backup_p.parse(pos, query, expected);
 
     if (!parsed)
         return false;
@@ -102,44 +105,46 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     /// FIXME: try to prettify this cast using `as<>()`
     auto & query_with_output = dynamic_cast<ASTQueryWithOutput &>(*query);
 
-    ParserKeyword s_into_outfile("INTO OUTFILE");
+    ParserKeyword s_into_outfile(Keyword::INTO_OUTFILE);
     if (s_into_outfile.ignore(pos, expected))
     {
         ParserStringLiteral out_file_p;
         if (!out_file_p.parse(pos, query_with_output.out_file, expected))
             return false;
 
-        ParserKeyword s_append("APPEND");
+        ParserKeyword s_append(Keyword::APPEND);
         if (s_append.ignore(pos, expected))
         {
             query_with_output.is_outfile_append = true;
         }
 
-        ParserKeyword s_truncate("TRUNCATE");
+        ParserKeyword s_truncate(Keyword::TRUNCATE);
         if (s_truncate.ignore(pos, expected))
         {
             query_with_output.is_outfile_truncate = true;
         }
 
-        ParserKeyword s_stdout("AND STDOUT");
+        ParserKeyword s_stdout(Keyword::AND_STDOUT);
         if (s_stdout.ignore(pos, expected))
         {
             query_with_output.is_into_outfile_with_stdout = true;
         }
 
-        ParserKeyword s_compression_method("COMPRESSION");
+        ParserKeyword s_compression_method(Keyword::COMPRESSION);
         if (s_compression_method.ignore(pos, expected))
         {
             ParserStringLiteral compression;
             if (!compression.parse(pos, query_with_output.compression, expected))
                 return false;
+            query_with_output.children.push_back(query_with_output.compression);
 
-            ParserKeyword s_compression_level("LEVEL");
+            ParserKeyword s_compression_level(Keyword::LEVEL);
             if (s_compression_level.ignore(pos, expected))
             {
                 ParserNumber compression_level;
                 if (!compression_level.parse(pos, query_with_output.compression_level, expected))
                     return false;
+                query_with_output.children.push_back(query_with_output.compression_level);
             }
         }
 
@@ -147,7 +152,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
     }
 
-    ParserKeyword s_format("FORMAT");
+    ParserKeyword s_format(Keyword::FORMAT);
 
     if (s_format.ignore(pos, expected))
     {
@@ -161,7 +166,7 @@ bool ParserQueryWithOutput::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     }
 
     // SETTINGS key1 = value1, key2 = value2, ...
-    ParserKeyword s_settings("SETTINGS");
+    ParserKeyword s_settings(Keyword::SETTINGS);
     if (!query_with_output.settings_ast && s_settings.ignore(pos, expected))
     {
         ParserSetQuery parser_settings(true);
diff --git a/src/Parsers/ParserRefreshStrategy.cpp b/src/Parsers/ParserRefreshStrategy.cpp
index b41473e2aa5..e7912293d85 100644
--- a/src/Parsers/ParserRefreshStrategy.cpp
+++ b/src/Parsers/ParserRefreshStrategy.cpp
@@ -18,9 +18,16 @@ namespace ErrorCodes
 
 bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
+    ParserKeyword s_after{Keyword::AFTER};
+    ParserKeyword s_every{Keyword::EVERY};
+    ParserKeyword s_offset{Keyword::OFFSET};
+    ParserKeyword s_randomize_for{Keyword::RANDOMIZE_FOR};
+    ParserKeyword s_depends_on{Keyword::DEPENDS_ON};
+    ParserKeyword s_settings{Keyword::SETTINGS};
+
     auto refresh = std::make_shared<ASTRefreshStrategy>();
 
-    if (ParserKeyword{"AFTER"}.ignore(pos, expected))
+    if (s_after.ignore(pos, expected))
     {
         refresh->schedule_kind = RefreshScheduleKind::AFTER;
         ASTPtr period;
@@ -29,14 +36,14 @@ bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
 
         refresh->set(refresh->period, period);
     }
-    else if (ParserKeyword{"EVERY"}.ignore(pos, expected))
+    else if (s_every.ignore(pos, expected))
     {
         refresh->schedule_kind = RefreshScheduleKind::EVERY;
         ASTPtr period;
         if (!ParserTimeInterval{{.allow_mixing_calendar_and_clock_units = false}}.parse(pos, period, expected))
             return false;
         refresh->set(refresh->period, period);
-        if (ParserKeyword{"OFFSET"}.ignore(pos, expected))
+        if (s_offset.ignore(pos, expected))
         {
             ASTPtr periodic_offset;
             if (!ParserTimeInterval{{.allow_zero = true}}.parse(pos, periodic_offset, expected))
@@ -53,7 +60,7 @@ bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     if (refresh->schedule_kind == RefreshScheduleKind::UNKNOWN)
         return false;
 
-    if (ParserKeyword{"RANDOMIZE FOR"}.ignore(pos, expected))
+    if (s_randomize_for.ignore(pos, expected))
     {
         ASTPtr spread;
         if (!ParserTimeInterval{{.allow_zero = true}}.parse(pos, spread, expected))
@@ -62,7 +69,7 @@ bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         refresh->set(refresh->spread, spread);
     }
 
-    if (ParserKeyword{"DEPENDS ON"}.ignore(pos, expected))
+    if (s_depends_on.ignore(pos, expected))
     {
         if (refresh->schedule_kind == RefreshScheduleKind::AFTER)
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
@@ -81,7 +88,7 @@ bool ParserRefreshStrategy::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
     }
 
     // Refresh SETTINGS
-    if (ParserKeyword{"SETTINGS"}.ignore(pos, expected))
+    if (s_settings.ignore(pos, expected))
     {
         /// Settings are written like SET query, so parse them with ParserSetQuery
         ASTPtr settings;
diff --git a/src/Parsers/ParserRenameQuery.cpp b/src/Parsers/ParserRenameQuery.cpp
index 27f2ed1cd22..6b652c27f6c 100644
--- a/src/Parsers/ParserRenameQuery.cpp
+++ b/src/Parsers/ParserRenameQuery.cpp
@@ -11,15 +11,15 @@ namespace DB
 
 bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_rename("RENAME");
-    ParserKeyword s_rename_table("RENAME TABLE");
-    ParserKeyword s_exchange_tables("EXCHANGE TABLES");
-    ParserKeyword s_rename_dictionary("RENAME DICTIONARY");
-    ParserKeyword s_exchange_dictionaries("EXCHANGE DICTIONARIES");
-    ParserKeyword s_rename_database("RENAME DATABASE");
-    ParserKeyword s_if_exists("IF EXISTS");
-    ParserKeyword s_to("TO");
-    ParserKeyword s_and("AND");
+    ParserKeyword s_rename(Keyword::RENAME);
+    ParserKeyword s_rename_table(Keyword::RENAME_TABLE);
+    ParserKeyword s_exchange_tables(Keyword::EXCHANGE_TABLES);
+    ParserKeyword s_rename_dictionary(Keyword::RENAME_DICTIONARY);
+    ParserKeyword s_exchange_dictionaries(Keyword::EXCHANGE_DICTIONARIES);
+    ParserKeyword s_rename_database(Keyword::RENAME_DATABASE);
+    ParserKeyword s_if_exists(Keyword::IF_EXISTS);
+    ParserKeyword s_to(Keyword::TO);
+    ParserKeyword s_and(Keyword::AND);
     ParserToken s_comma(TokenType::Comma);
 
     bool exchange = false;
@@ -39,20 +39,19 @@ bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
 
         String cluster_str;
-        if (ParserKeyword{"ON"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
         {
             if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
                 return false;
         }
+        ASTRenameQuery::Elements rename_elements;
+        rename_elements.emplace_back();
+        rename_elements.back().if_exists = if_exists;
+        rename_elements.back().from.database = from_db;
+        rename_elements.back().to.database = to_db;
 
-        auto query = std::make_shared<ASTRenameQuery>();
+        auto query = std::make_shared<ASTRenameQuery>(std::move(rename_elements));
         query->database = true;
-        query->elements.emplace({});
-        query->elements.front().if_exists = if_exists;
-        query->elements.front().from.database = from_db;
-        query->elements.front().to.database = to_db;
-        query->children.push_back(std::move(from_db));
-        query->children.push_back(std::move(to_db));
         query->cluster = cluster_str;
         node = query;
         return true;
@@ -75,9 +74,8 @@ bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     const auto ignore_delim = [&] { return exchange ? s_and.ignore(pos) : s_to.ignore(pos); };
 
-    auto query = std::make_shared<ASTRenameQuery>();
 
-    ASTRenameQuery::Elements & elements = query->elements;
+    ASTRenameQuery::Elements elements;
 
     while (true)
     {
@@ -93,24 +91,16 @@ bool ParserRenameQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             || !ignore_delim()
             || !parseDatabaseAndTableAsAST(pos, expected, ref.to.database, ref.to.table))
             return false;
-
-        if (ref.from.database)
-            query->children.push_back(ref.from.database);
-        if (ref.from.table)
-            query->children.push_back(ref.from.table);
-        if (ref.to.database)
-            query->children.push_back(ref.to.database);
-        if (ref.to.table)
-            query->children.push_back(ref.to.table);
     }
 
     String cluster_str;
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
     }
 
+    auto query = std::make_shared<ASTRenameQuery>(std::move(elements));
     query->cluster = cluster_str;
     query->exchange = exchange;
     query->dictionary = dictionary;
diff --git a/src/Parsers/ParserSelectQuery.cpp b/src/Parsers/ParserSelectQuery.cpp
index 641e74b5f18..ce15c7b03fd 100644
--- a/src/Parsers/ParserSelectQuery.cpp
+++ b/src/Parsers/ParserSelectQuery.cpp
@@ -37,35 +37,35 @@ bool ParserSelectQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     auto select_query = std::make_shared<ASTSelectQuery>();
     node = select_query;
 
-    ParserKeyword s_select("SELECT");
-    ParserKeyword s_all("ALL");
-    ParserKeyword s_distinct("DISTINCT");
-    ParserKeyword s_distinct_on("DISTINCT ON");
-    ParserKeyword s_from("FROM");
-    ParserKeyword s_prewhere("PREWHERE");
-    ParserKeyword s_where("WHERE");
-    ParserKeyword s_group_by("GROUP BY");
-    ParserKeyword s_with("WITH");
-    ParserKeyword s_totals("TOTALS");
-    ParserKeyword s_having("HAVING");
-    ParserKeyword s_window("WINDOW");
-    ParserKeyword s_order_by("ORDER BY");
-    ParserKeyword s_limit("LIMIT");
-    ParserKeyword s_settings("SETTINGS");
-    ParserKeyword s_by("BY");
-    ParserKeyword s_rollup("ROLLUP");
-    ParserKeyword s_cube("CUBE");
-    ParserKeyword s_grouping_sets("GROUPING SETS");
-    ParserKeyword s_top("TOP");
-    ParserKeyword s_with_ties("WITH TIES");
-    ParserKeyword s_offset("OFFSET");
-    ParserKeyword s_fetch("FETCH");
-    ParserKeyword s_only("ONLY");
-    ParserKeyword s_row("ROW");
-    ParserKeyword s_rows("ROWS");
-    ParserKeyword s_first("FIRST");
-    ParserKeyword s_next("NEXT");
-    ParserKeyword s_interpolate("INTERPOLATE");
+    ParserKeyword s_select(Keyword::SELECT);
+    ParserKeyword s_all(Keyword::ALL);
+    ParserKeyword s_distinct(Keyword::DISTINCT);
+    ParserKeyword s_distinct_on(Keyword::DISTINCT_ON);
+    ParserKeyword s_from(Keyword::FROM);
+    ParserKeyword s_prewhere(Keyword::PREWHERE);
+    ParserKeyword s_where(Keyword::WHERE);
+    ParserKeyword s_group_by(Keyword::GROUP_BY);
+    ParserKeyword s_with(Keyword::WITH);
+    ParserKeyword s_totals(Keyword::TOTALS);
+    ParserKeyword s_having(Keyword::HAVING);
+    ParserKeyword s_window(Keyword::WINDOW);
+    ParserKeyword s_order_by(Keyword::ORDER_BY);
+    ParserKeyword s_limit(Keyword::LIMIT);
+    ParserKeyword s_settings(Keyword::SETTINGS);
+    ParserKeyword s_by(Keyword::BY);
+    ParserKeyword s_rollup(Keyword::ROLLUP);
+    ParserKeyword s_cube(Keyword::CUBE);
+    ParserKeyword s_grouping_sets(Keyword::GROUPING_SETS);
+    ParserKeyword s_top(Keyword::TOP);
+    ParserKeyword s_with_ties(Keyword::WITH_TIES);
+    ParserKeyword s_offset(Keyword::OFFSET);
+    ParserKeyword s_fetch(Keyword::FETCH);
+    ParserKeyword s_only(Keyword::ONLY);
+    ParserKeyword s_row(Keyword::ROW);
+    ParserKeyword s_rows(Keyword::ROWS);
+    ParserKeyword s_first(Keyword::FIRST);
+    ParserKeyword s_next(Keyword::NEXT);
+    ParserKeyword s_interpolate(Keyword::INTERPOLATE);
 
     ParserNotEmptyExpressionList exp_list(false);
     ParserNotEmptyExpressionList exp_list_for_with_clause(false);
diff --git a/src/Parsers/ParserSetQuery.cpp b/src/Parsers/ParserSetQuery.cpp
index 4df74c2dd82..13b881635cd 100644
--- a/src/Parsers/ParserSetQuery.cpp
+++ b/src/Parsers/ParserSetQuery.cpp
@@ -210,9 +210,9 @@ bool ParserSetQuery::parseNameValuePair(SettingChange & change, IParser::Pos & p
     if (!s_eq.ignore(pos, expected))
         return false;
 
-    if (ParserKeyword("TRUE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::TRUE_KEYWORD).ignore(pos, expected))
         value = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(1)));
-    else if (ParserKeyword("FALSE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::FALSE_KEYWORD).ignore(pos, expected))
         value = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(0)));
     /// for SETTINGS disk=disk(type='s3', path='', ...)
     else if (function_p.parse(pos, function_ast, expected) && function_ast->as<ASTFunction>()->name == "disk")
@@ -269,16 +269,16 @@ bool ParserSetQuery::parseNameValuePairWithParameterOrDefault(
     }
 
     /// Default
-    if (ParserKeyword("DEFAULT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::DEFAULT).ignore(pos, expected))
     {
         default_settings = name;
         return true;
     }
 
     /// Setting
-    if (ParserKeyword("TRUE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::TRUE_KEYWORD).ignore(pos, expected))
         node = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(1)));
-    else if (ParserKeyword("FALSE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::FALSE_KEYWORD).ignore(pos, expected))
         node = std::make_shared<ASTLiteral>(Field(static_cast<UInt64>(0)));
     else if (function_p.parse(pos, function_ast, expected) && function_ast->as<ASTFunction>()->name == "disk")
     {
@@ -303,18 +303,18 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
     if (!parse_only_internals)
     {
-        ParserKeyword s_set("SET");
+        ParserKeyword s_set(Keyword::SET);
 
         if (!s_set.ignore(pos, expected))
             return false;
 
         /// Parse SET TRANSACTION ... queries using ParserTransactionControl
-        if (ParserKeyword{"TRANSACTION"}.check(pos, expected))
+        if (ParserKeyword{Keyword::TRANSACTION}.check(pos, expected))
             return false;
     }
 
     SettingsChanges changes;
-    NameToNameMap query_parameters;
+    NameToNameVector query_parameters;
     std::vector<String> default_settings;
 
     while (true)
@@ -330,7 +330,7 @@ bool ParserSetQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
             return false;
 
         if (!parameter.first.empty())
-            query_parameters.emplace(std::move(parameter));
+            query_parameters.emplace_back(std::move(parameter));
         else if (!name_of_default_setting.empty())
             default_settings.emplace_back(std::move(name_of_default_setting));
         else
diff --git a/src/Parsers/ParserShowColumnsQuery.cpp b/src/Parsers/ParserShowColumnsQuery.cpp
index e5fc5c39701..5d26d7bf1d4 100644
--- a/src/Parsers/ParserShowColumnsQuery.cpp
+++ b/src/Parsers/ParserShowColumnsQuery.cpp
@@ -23,19 +23,19 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
     auto query = std::make_shared<ASTShowColumnsQuery>();
 
-    if (!ParserKeyword("SHOW").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::SHOW).ignore(pos, expected))
         return false;
 
-    if (ParserKeyword("EXTENDED").ignore(pos, expected))
+    if (ParserKeyword(Keyword::EXTENDED).ignore(pos, expected))
         query->extended = true;
 
-    if (ParserKeyword("FULL").ignore(pos, expected))
+    if (ParserKeyword(Keyword::FULL).ignore(pos, expected))
         query->full = true;
 
-    if (!(ParserKeyword("COLUMNS").ignore(pos, expected) || ParserKeyword("FIELDS").ignore(pos, expected)))
+    if (!(ParserKeyword(Keyword::COLUMNS).ignore(pos, expected) || ParserKeyword(Keyword::FIELDS).ignore(pos, expected)))
         return false;
 
-    if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+    if (ParserKeyword(Keyword::FROM).ignore(pos, expected) || ParserKeyword(Keyword::IN).ignore(pos, expected))
     {
         if (!ParserCompoundIdentifier().parse(pos, from1, expected))
             return false;
@@ -55,7 +55,7 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     }
     else
     {
-        if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+        if (ParserKeyword(Keyword::FROM).ignore(pos, expected) || ParserKeyword(Keyword::IN).ignore(pos, expected))
             if (!ParserIdentifier().parse(pos, from2, expected))
                 return false;
 
@@ -65,10 +65,10 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         query->database = from2_str;
     }
 
-    if (ParserKeyword("NOT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::NOT).ignore(pos, expected))
         query->not_like = true;
 
-    if (bool insensitive = ParserKeyword("ILIKE").ignore(pos, expected); insensitive || ParserKeyword("LIKE").ignore(pos, expected))
+    if (bool insensitive = ParserKeyword(Keyword::ILIKE).ignore(pos, expected); insensitive || ParserKeyword(Keyword::LIKE).ignore(pos, expected))
     {
         if (insensitive)
             query->case_insensitive_like = true;
@@ -78,11 +78,11 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     }
     else if (query->not_like)
         return false;
-    else if (ParserKeyword("WHERE").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::WHERE).ignore(pos, expected))
         if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->where_expression, expected))
             return false;
 
-    if (ParserKeyword("LIMIT").ignore(pos, expected))
+    if (ParserKeyword(Keyword::LIMIT).ignore(pos, expected))
         if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->limit_length, expected))
             return false;
 
diff --git a/src/Parsers/ParserShowEngineQuery.h b/src/Parsers/ParserShowEngineQuery.h
index e06326436f1..0e9a742c0e9 100644
--- a/src/Parsers/ParserShowEngineQuery.h
+++ b/src/Parsers/ParserShowEngineQuery.h
@@ -20,7 +20,7 @@ protected:
     {
         auto query = std::make_shared<ASTShowEnginesQuery>();
 
-        if (!ParserKeyword("SHOW ENGINES").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::SHOW_ENGINES).ignore(pos, expected))
             return false;
 
         node = query;
diff --git a/src/Parsers/ParserShowFunctionsQuery.cpp b/src/Parsers/ParserShowFunctionsQuery.cpp
index 524d936c4f1..37b68dcec08 100644
--- a/src/Parsers/ParserShowFunctionsQuery.cpp
+++ b/src/Parsers/ParserShowFunctionsQuery.cpp
@@ -13,10 +13,10 @@ bool ParserShowFunctionsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
     ASTPtr like;
 
     auto query = std::make_shared<ASTShowFunctionsQuery>();
-    if (!ParserKeyword("SHOW FUNCTIONS").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::SHOW_FUNCTIONS).ignore(pos, expected))
         return false;
 
-    if (bool insensitive = ParserKeyword("ILIKE").ignore(pos, expected); insensitive || ParserKeyword("LIKE").ignore(pos, expected))
+    if (bool insensitive = ParserKeyword(Keyword::ILIKE).ignore(pos, expected); insensitive || ParserKeyword(Keyword::LIKE).ignore(pos, expected))
     {
         if (insensitive)
             query->case_insensitive_like = true;
diff --git a/src/Parsers/ParserShowIndexesQuery.cpp b/src/Parsers/ParserShowIndexesQuery.cpp
index 7852ed9806d..495dfc5101f 100644
--- a/src/Parsers/ParserShowIndexesQuery.cpp
+++ b/src/Parsers/ParserShowIndexesQuery.cpp
@@ -22,16 +22,16 @@ bool ParserShowIndexesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
 
     auto query = std::make_shared<ASTShowIndexesQuery>();
 
-    if (!ParserKeyword("SHOW").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::SHOW).ignore(pos, expected))
         return false;
 
-    if (ParserKeyword("EXTENDED").ignore(pos, expected))
+    if (ParserKeyword(Keyword::EXTENDED).ignore(pos, expected))
         query->extended = true;
 
-    if (!(ParserKeyword("INDEX").ignore(pos, expected) || ParserKeyword("INDEXES").ignore(pos, expected) || ParserKeyword("INDICES").ignore(pos, expected) || ParserKeyword("KEYS").ignore(pos, expected)))
+    if (!(ParserKeyword(Keyword::INDEX).ignore(pos, expected) || ParserKeyword(Keyword::INDEXES).ignore(pos, expected) || ParserKeyword(Keyword::INDICES).ignore(pos, expected) || ParserKeyword(Keyword::KEYS).ignore(pos, expected)))
         return false;
 
-    if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+    if (ParserKeyword(Keyword::FROM).ignore(pos, expected) || ParserKeyword(Keyword::IN).ignore(pos, expected))
     {
         if (!ParserCompoundIdentifier().parse(pos, from1, expected))
             return false;
@@ -51,7 +51,7 @@ bool ParserShowIndexesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     }
     else
     {
-        if (ParserKeyword("FROM").ignore(pos, expected) || ParserKeyword("IN").ignore(pos, expected))
+        if (ParserKeyword(Keyword::FROM).ignore(pos, expected) || ParserKeyword(Keyword::IN).ignore(pos, expected))
             if (!ParserIdentifier().parse(pos, from2, expected))
                 return false;
 
@@ -61,7 +61,7 @@ bool ParserShowIndexesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
         query->database = from2_str;
     }
 
-    if (ParserKeyword("WHERE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::WHERE).ignore(pos, expected))
         if (!ParserExpressionWithOptionalAlias(false).parse(pos, query->where_expression, expected))
             return false;
 
diff --git a/src/Parsers/ParserShowProcesslistQuery.h b/src/Parsers/ParserShowProcesslistQuery.h
index de08894e059..29c2970a8a1 100644
--- a/src/Parsers/ParserShowProcesslistQuery.h
+++ b/src/Parsers/ParserShowProcesslistQuery.h
@@ -20,7 +20,7 @@ protected:
     {
         auto query = std::make_shared<ASTShowProcesslistQuery>();
 
-        if (!ParserKeyword("SHOW PROCESSLIST").ignore(pos, expected))
+        if (!ParserKeyword(Keyword::SHOW_PROCESSLIST).ignore(pos, expected))
             return false;
 
         node = query;
diff --git a/src/Parsers/ParserShowSettingQuery.cpp b/src/Parsers/ParserShowSettingQuery.cpp
index 2586cbdfb43..9e4736a5eb7 100644
--- a/src/Parsers/ParserShowSettingQuery.cpp
+++ b/src/Parsers/ParserShowSettingQuery.cpp
@@ -11,7 +11,7 @@ namespace DB
 
 bool ParserShowSettingQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword("SHOW SETTING").ignore(pos, expected))
+    if (!ParserKeyword(Keyword::SHOW_SETTING).ignore(pos, expected))
         return false;
 
     ASTPtr setting_name_identifier;
diff --git a/src/Parsers/ParserShowTablesQuery.cpp b/src/Parsers/ParserShowTablesQuery.cpp
index 2b220dd0a0c..68b89bd0551 100644
--- a/src/Parsers/ParserShowTablesQuery.cpp
+++ b/src/Parsers/ParserShowTablesQuery.cpp
@@ -17,25 +17,25 @@ namespace DB
 
 bool ParserShowTablesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_show("SHOW");
-    ParserKeyword s_full("FULL");
-    ParserKeyword s_temporary("TEMPORARY");
-    ParserKeyword s_tables("TABLES");
-    ParserKeyword s_databases("DATABASES");
-    ParserKeyword s_clusters("CLUSTERS");
-    ParserKeyword s_cluster("CLUSTER");
-    ParserKeyword s_dictionaries("DICTIONARIES");
-    ParserKeyword s_caches("FILESYSTEM CACHES");
-    ParserKeyword s_settings("SETTINGS");
-    ParserKeyword s_merges("MERGES");
-    ParserKeyword s_changed("CHANGED");
-    ParserKeyword s_from("FROM");
-    ParserKeyword s_in("IN");
-    ParserKeyword s_not("NOT");
-    ParserKeyword s_like("LIKE");
-    ParserKeyword s_ilike("ILIKE");
-    ParserKeyword s_where("WHERE");
-    ParserKeyword s_limit("LIMIT");
+    ParserKeyword s_show(Keyword::SHOW);
+    ParserKeyword s_full(Keyword::FULL);
+    ParserKeyword s_temporary(Keyword::TEMPORARY);
+    ParserKeyword s_tables(Keyword::TABLES);
+    ParserKeyword s_databases(Keyword::DATABASES);
+    ParserKeyword s_clusters(Keyword::CLUSTERS);
+    ParserKeyword s_cluster(Keyword::CLUSTER);
+    ParserKeyword s_dictionaries(Keyword::DICTIONARIES);
+    ParserKeyword s_caches(Keyword::FILESYSTEM_CACHES);
+    ParserKeyword s_settings(Keyword::SETTINGS);
+    ParserKeyword s_merges(Keyword::MERGES);
+    ParserKeyword s_changed(Keyword::CHANGED);
+    ParserKeyword s_from(Keyword::FROM);
+    ParserKeyword s_in(Keyword::IN);
+    ParserKeyword s_not(Keyword::NOT);
+    ParserKeyword s_like(Keyword::LIKE);
+    ParserKeyword s_ilike(Keyword::ILIKE);
+    ParserKeyword s_where(Keyword::WHERE);
+    ParserKeyword s_limit(Keyword::LIMIT);
     ParserStringLiteral like_p;
     ParserIdentifier name_p(true);
     ParserExpressionWithOptionalAlias exp_elem(false);
@@ -147,7 +147,7 @@ bool ParserShowTablesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
                 return false;
         }
 
-        /// Not expected due to "SHOW SETTINGS PROFILES"
+        /// Not expected due to Keyword::SHOW SETTINGS PROFILES
         if (bool insensitive = s_ilike.ignore(pos, expected); insensitive || s_like.ignore(pos, expected))
         {
             if (insensitive)
diff --git a/src/Parsers/ParserStringAndSubstitution.cpp b/src/Parsers/ParserStringAndSubstitution.cpp
new file mode 100644
index 00000000000..a8bfeb9bb1c
--- /dev/null
+++ b/src/Parsers/ParserStringAndSubstitution.cpp
@@ -0,0 +1,12 @@
+#include <Parsers/ParserStringAndSubstitution.h>
+#include <Parsers/ExpressionElementParsers.h>
+
+namespace DB
+{
+
+bool ParserStringAndSubstitution::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
+{
+    return ParserStringLiteral{}.parse(pos, node, expected) || ParserSubstitution{}.parse(pos, node, expected);
+}
+
+}
diff --git a/src/Parsers/ParserStringAndSubstitution.h b/src/Parsers/ParserStringAndSubstitution.h
new file mode 100644
index 00000000000..72e62c85ded
--- /dev/null
+++ b/src/Parsers/ParserStringAndSubstitution.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include <Parsers/IParserBase.h>
+
+namespace DB
+{
+
+class ParserStringAndSubstitution : public IParserBase
+{
+private:
+    const char * getName() const override { return "ParserStringAndSubstitution"; }
+    bool parseImpl(Pos & pos, ASTPtr & node, Expected & expected) override;
+
+public:
+    explicit ParserStringAndSubstitution() = default;
+};
+
+}
diff --git a/src/Parsers/ParserSystemQuery.cpp b/src/Parsers/ParserSystemQuery.cpp
index a53d12c29ad..b660f947290 100644
--- a/src/Parsers/ParserSystemQuery.cpp
+++ b/src/Parsers/ParserSystemQuery.cpp
@@ -4,6 +4,7 @@
 #include <Parsers/ExpressionElementParsers.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
+#include <Parsers/ParserSetQuery.h>
 #include <Parsers/parseDatabaseAndTableName.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -28,7 +29,7 @@ namespace ErrorCodes
     String cluster;
     bool parsed_on_cluster = false;
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster, expected))
             return false;
@@ -52,7 +53,7 @@ namespace ErrorCodes
     if (!parsed_table && require_table)
         return false;
 
-    if (!parsed_on_cluster && ParserKeyword{"ON"}.ignore(pos, expected))
+    if (!parsed_on_cluster && ParserKeyword{Keyword::ON}.ignore(pos, expected))
         if (!ASTQueryWithOnCluster::parse(pos, cluster, expected))
             return false;
 
@@ -82,7 +83,7 @@ enum class SystemQueryTargetType
     String cluster;
     bool parsed_on_cluster = false;
 
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster, expected))
             return false;
@@ -108,7 +109,7 @@ enum class SystemQueryTargetType
             return false;
     }
 
-    if (!parsed_on_cluster && ParserKeyword{"ON"}.ignore(pos, expected))
+    if (!parsed_on_cluster && ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster, expected))
             return false;
@@ -142,7 +143,7 @@ enum class SystemQueryTargetType
                                     Expected & expected)
 {
     String cluster_str;
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
@@ -162,29 +163,29 @@ enum class SystemQueryTargetType
         return false;
     res->replica = ast->as<ASTLiteral &>().value.safeGet<String>();
 
-    if (ParserKeyword{"FROM SHARD"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::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))
+    if (ParserKeyword{Keyword::FROM}.ignore(pos, expected))
     {
         // way 1. parse replica database
         // way 2. parse replica table
         // way 3. parse replica zkpath
-        if (ParserKeyword{"DATABASE"}.ignore(pos, expected))
+        if (ParserKeyword{Keyword::DATABASE}.ignore(pos, expected))
         {
             ParserIdentifier database_parser;
             if (!database_parser.parse(pos, res->database, expected))
                 return false;
         }
-        else if (!database && ParserKeyword{"TABLE"}.ignore(pos, expected))
+        else if (!database && ParserKeyword{Keyword::TABLE}.ignore(pos, expected))
         {
             parseDatabaseAndTableAsAST(pos, expected, res->database, res->table);
         }
-        else if (ParserKeyword{"ZKPATH"}.ignore(pos, expected))
+        else if (ParserKeyword{Keyword::ZKPATH}.ignore(pos, expected))
         {
             ASTPtr path_ast;
             if (!ParserStringLiteral{}.parse(pos, path_ast, expected))
@@ -205,7 +206,7 @@ enum class SystemQueryTargetType
 
 bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    if (!ParserKeyword{"SYSTEM"}.ignore(pos, expected))
+    if (!ParserKeyword{Keyword::SYSTEM}.ignore(pos, expected))
         return false;
 
     using Type = ASTSystemQuery::Type;
@@ -216,7 +217,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
     for (const auto & type : magic_enum::enum_values<Type>())
     {
-        if (ParserKeyword{ASTSystemQuery::typeToString(type)}.ignore(pos, expected))
+        if (ParserKeyword::createDeprecated(ASTSystemQuery::typeToString(type)).ignore(pos, expected))
         {
             res->type = type;
             found = true;
@@ -262,6 +263,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         }
         case Type::ENABLE_FAILPOINT:
         case Type::DISABLE_FAILPOINT:
+        case Type::WAIT_FAILPOINT:
         {
             ASTPtr ast;
             if (ParserIdentifier{}.parse(pos, ast, expected))
@@ -281,11 +283,23 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
             if (res->type == Type::SYNC_REPLICA)
             {
-                if (ParserKeyword{"STRICT"}.ignore(pos, expected))
+                if (ParserKeyword{Keyword::STRICT}.ignore(pos, expected))
                     res->sync_replica_mode = SyncReplicaMode::STRICT;
-                else if (ParserKeyword{"LIGHTWEIGHT"}.ignore(pos, expected))
+                else if (ParserKeyword{Keyword::LIGHTWEIGHT}.ignore(pos, expected))
+                {
                     res->sync_replica_mode = SyncReplicaMode::LIGHTWEIGHT;
-                else if (ParserKeyword{"PULL"}.ignore(pos, expected))
+                    if (ParserKeyword{Keyword::FROM}.ignore(pos, expected))
+                    {
+                        do
+                        {
+                            ASTPtr replica_ast;
+                            if (!ParserStringLiteral{}.parse(pos, replica_ast, expected))
+                                return false;
+                            res->src_replicas.emplace_back(replica_ast->as<ASTLiteral &>().value.safeGet<String>());
+                        } while (ParserToken{TokenType::Comma}.ignore(pos, expected));
+                    }
+                }
+                else if (ParserKeyword{Keyword::PULL}.ignore(pos, expected))
                     res->sync_replica_mode = SyncReplicaMode::PULL;
             }
             break;
@@ -316,6 +330,21 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         }
 
         case Type::FLUSH_DISTRIBUTED:
+        {
+            if (!parseQueryWithOnClusterAndMaybeTable(res, pos, expected, /* require table = */ true, /* allow_string_literal = */ false))
+                return false;
+
+            ParserKeyword s_settings(Keyword::SETTINGS);
+            if (s_settings.ignore(pos, expected))
+            {
+                ParserSetQuery parser_settings(/* parse_only_internals_= */ true);
+                if (!parser_settings.parse(pos, res->query_settings, expected))
+                    return false;
+            }
+
+            break;
+        }
+
         case Type::RESTORE_REPLICA:
         {
             if (!parseQueryWithOnClusterAndMaybeTable(res, pos, expected, /* require table = */ true, /* allow_string_literal = */ false))
@@ -348,7 +377,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return true;
             };
 
-            if (ParserKeyword{"ON VOLUME"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::ON_VOLUME}.ignore(pos, expected))
             {
                 if (!parse_on_volume())
                     return false;
@@ -357,7 +386,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             {
                 if (!parseQueryWithOnCluster(res, pos, expected))
                     return false;
-                if (ParserKeyword{"ON VOLUME"}.ignore(pos, expected))
+                if (ParserKeyword{Keyword::ON_VOLUME}.ignore(pos, expected))
                 {
                     if (!parse_on_volume())
                         return false;
@@ -407,10 +436,10 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             if (!parseDatabaseAndTableAsAST(pos, expected, res->database, res->table))
                 return false;
 
-            if (ParserKeyword{"UNSET FAKE TIME"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::UNSET_FAKE_TIME}.ignore(pos, expected))
                 break;
 
-            if (!ParserKeyword{"SET FAKE TIME"}.ignore(pos, expected))
+            if (!ParserKeyword{Keyword::SET_FAKE_TIME}.ignore(pos, expected))
                 return false;
             ASTPtr ast;
             if (!ParserStringLiteral{}.parse(pos, ast, expected))
@@ -430,9 +459,9 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
                 return false;
 
             ASTPtr seconds;
-            if (!(ParserKeyword{"FOR"}.ignore(pos, expected)
+            if (!(ParserKeyword{Keyword::FOR}.ignore(pos, expected)
                 && ParserUnsignedInteger().parse(pos, seconds, expected)
-                && ParserKeyword{"SECOND"}.ignore(pos, expected)))   /// SECOND, not SECONDS to be consistent with INTERVAL parsing in SQL
+                && ParserKeyword{Keyword::SECOND}.ignore(pos, expected)))   /// SECOND, not SECONDS to be consistent with INTERVAL parsing in SQL
             {
                 return false;
             }
@@ -447,10 +476,10 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             if (path_parser.parse(pos, ast, expected))
             {
                 res->filesystem_cache_name = ast->as<ASTLiteral>()->value.safeGet<String>();
-                if (ParserKeyword{"KEY"}.ignore(pos, expected) && ParserIdentifier().parse(pos, ast, expected))
+                if (ParserKeyword{Keyword::KEY}.ignore(pos, expected) && ParserIdentifier().parse(pos, ast, expected))
                 {
                     res->key_to_drop = ast->as<ASTIdentifier>()->name();
-                    if (ParserKeyword{"OFFSET"}.ignore(pos, expected) && ParserLiteral().parse(pos, ast, expected))
+                    if (ParserKeyword{Keyword::OFFSET}.ignore(pos, expected) && ParserLiteral().parse(pos, ast, expected))
                         res->offset_to_drop = ast->as<ASTLiteral>()->value.safeGet<UInt64>();
                 }
             }
@@ -474,18 +503,18 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         }
         case Type::DROP_SCHEMA_CACHE:
         {
-            if (ParserKeyword{"FOR"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::FOR}.ignore(pos, expected))
             {
-                if (ParserKeyword{"FILE"}.ignore(pos, expected))
-                    res->schema_cache_storage = "FILE";
-                else if (ParserKeyword{"S3"}.ignore(pos, expected))
-                    res->schema_cache_storage = "S3";
-                else if (ParserKeyword{"HDFS"}.ignore(pos, expected))
-                    res->schema_cache_storage = "HDFS";
-                else if (ParserKeyword{"URL"}.ignore(pos, expected))
-                    res->schema_cache_storage = "URL";
-                else if (ParserKeyword{"AZURE"}.ignore(pos, expected))
-                    res->schema_cache_storage = "AZURE";
+                if (ParserKeyword{Keyword::FILE}.ignore(pos, expected))
+                    res->schema_cache_storage = toStringView(Keyword::FILE);
+                else if (ParserKeyword{Keyword::S3}.ignore(pos, expected))
+                    res->schema_cache_storage = toStringView(Keyword::S3);
+                else if (ParserKeyword{Keyword::HDFS}.ignore(pos, expected))
+                    res->schema_cache_storage = toStringView(Keyword::HDFS);
+                else if (ParserKeyword{Keyword::URL}.ignore(pos, expected))
+                    res->schema_cache_storage = toStringView(Keyword::URL);
+                else if (ParserKeyword{Keyword::AZURE}.ignore(pos, expected))
+                    res->schema_cache_storage = toStringView(Keyword::AZURE);
                 else
                     return false;
             }
@@ -493,10 +522,11 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         }
         case Type::DROP_FORMAT_SCHEMA_CACHE:
         {
-            if (ParserKeyword{"FOR"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::FOR}.ignore(pos, expected))
             {
-                if (ParserKeyword{"Protobuf"}.ignore(pos, expected))
-                    res->schema_cache_format = "Protobuf";
+                if (ParserKeyword{Keyword::PROTOBUF}.ignore(pos, expected))
+                    res->schema_cache_format = toStringView(Keyword::PROTOBUF);
+
                 else
                     return false;
             }
@@ -505,7 +535,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         case Type::UNFREEZE:
         {
             ASTPtr ast;
-            if (ParserKeyword{"WITH NAME"}.ignore(pos, expected) && ParserStringLiteral{}.parse(pos, ast, expected))
+            if (ParserKeyword{Keyword::WITH_NAME}.ignore(pos, expected) && ParserStringLiteral{}.parse(pos, ast, expected))
             {
                 res->backup_name = ast->as<ASTLiteral &>().value.get<const String &>();
             }
@@ -529,7 +559,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
 
                 for (const auto & cur_type : magic_enum::enum_values<ServerType::Type>())
                 {
-                    if (ParserKeyword{ServerType::serverTypeToString(cur_type)}.ignore(pos, expected))
+                    if (ParserKeyword::createDeprecated(ServerType::serverTypeToString(cur_type)).ignore(pos, expected))
                     {
                         type = cur_type;
                         break;
@@ -561,7 +591,7 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
             if (!parse_server_type(base_type, base_custom_name))
                 return false;
 
-            if (ParserKeyword{"EXCEPT"}.ignore(pos, expected))
+            if (ParserKeyword{Keyword::EXCEPT}.ignore(pos, expected))
             {
                 if (base_type != ServerType::Type::QUERIES_ALL &&
                     base_type != ServerType::Type::QUERIES_DEFAULT &&
@@ -603,6 +633,8 @@ bool ParserSystemQuery::parseImpl(IParser::Pos & pos, ASTPtr & node, Expected &
         res->children.push_back(res->database);
     if (res->table)
         res->children.push_back(res->table);
+    if (res->query_settings)
+        res->children.push_back(res->query_settings);
 
     node = std::move(res);
     return true;
diff --git a/src/Parsers/ParserTablePropertiesQuery.cpp b/src/Parsers/ParserTablePropertiesQuery.cpp
index 94f264fcc89..48a5c0ebde0 100644
--- a/src/Parsers/ParserTablePropertiesQuery.cpp
+++ b/src/Parsers/ParserTablePropertiesQuery.cpp
@@ -12,14 +12,14 @@ namespace DB
 
 bool ParserTablePropertiesQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_exists("EXISTS");
-    ParserKeyword s_temporary("TEMPORARY");
-    ParserKeyword s_show("SHOW");
-    ParserKeyword s_create("CREATE");
-    ParserKeyword s_database("DATABASE");
-    ParserKeyword s_table("TABLE");
-    ParserKeyword s_view("VIEW");
-    ParserKeyword s_dictionary("DICTIONARY");
+    ParserKeyword s_exists(Keyword::EXISTS);
+    ParserKeyword s_temporary(Keyword::TEMPORARY);
+    ParserKeyword s_show(Keyword::SHOW);
+    ParserKeyword s_create(Keyword::CREATE);
+    ParserKeyword s_database(Keyword::DATABASE);
+    ParserKeyword s_table(Keyword::TABLE);
+    ParserKeyword s_view(Keyword::VIEW);
+    ParserKeyword s_dictionary(Keyword::DICTIONARY);
     ParserToken s_dot(TokenType::Dot);
     ParserIdentifier name_p(true);
 
diff --git a/src/Parsers/ParserTablesInSelectQuery.cpp b/src/Parsers/ParserTablesInSelectQuery.cpp
index ca209739dad..ab35141403a 100644
--- a/src/Parsers/ParserTablesInSelectQuery.cpp
+++ b/src/Parsers/ParserTablesInSelectQuery.cpp
@@ -31,11 +31,11 @@ bool ParserTableExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
         return false;
 
     /// FINAL
-    if (ParserKeyword("FINAL").ignore(pos, expected))
+    if (ParserKeyword(Keyword::FINAL).ignore(pos, expected))
         res->final = true;
 
     /// SAMPLE number
-    if (ParserKeyword("SAMPLE").ignore(pos, expected))
+    if (ParserKeyword(Keyword::SAMPLE).ignore(pos, expected))
     {
         ParserSampleRatio ratio;
 
@@ -43,7 +43,7 @@ bool ParserTableExpression::parseImpl(Pos & pos, ASTPtr & node, Expected & expec
             return false;
 
         /// OFFSET number
-        if (ParserKeyword("OFFSET").ignore(pos, expected))
+        if (ParserKeyword(Keyword::OFFSET).ignore(pos, expected))
         {
             if (!ratio.parse(pos, res->sample_offset, expected))
                 return false;
@@ -76,7 +76,7 @@ bool ParserArrayJoin::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
     Pos saved_pos = pos;
     bool has_array_join = false;
 
-    if (ParserKeyword("LEFT ARRAY JOIN").ignore(pos, expected))
+    if (ParserKeyword(Keyword::LEFT_ARRAY_JOIN).ignore(pos, expected))
     {
         res->kind = ASTArrayJoin::Kind::Left;
         has_array_join = true;
@@ -86,9 +86,9 @@ bool ParserArrayJoin::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
         pos = saved_pos;
 
         /// INNER may be specified explicitly, otherwise it is assumed as default.
-        ParserKeyword("INNER").ignore(pos, expected);
+        ParserKeyword(Keyword::INNER).ignore(pos, expected);
 
-        if (ParserKeyword("ARRAY JOIN").ignore(pos, expected))
+        if (ParserKeyword(Keyword::ARRAY_JOIN).ignore(pos, expected))
         {
             res->kind = ASTArrayJoin::Kind::Inner;
             has_array_join = true;
@@ -111,15 +111,15 @@ bool ParserArrayJoin::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 
 void ParserTablesInSelectQueryElement::parseJoinStrictness(Pos & pos, ASTTableJoin & table_join)
 {
-    if (ParserKeyword("ANY").ignore(pos))
+    if (ParserKeyword(Keyword::ANY).ignore(pos))
         table_join.strictness = JoinStrictness::Any;
-    else if (ParserKeyword("ALL").ignore(pos))
+    else if (ParserKeyword(Keyword::ALL).ignore(pos))
         table_join.strictness = JoinStrictness::All;
-    else if (ParserKeyword("ASOF").ignore(pos))
+    else if (ParserKeyword(Keyword::ASOF).ignore(pos))
         table_join.strictness = JoinStrictness::Asof;
-    else if (ParserKeyword("SEMI").ignore(pos))
+    else if (ParserKeyword(Keyword::SEMI).ignore(pos))
         table_join.strictness = JoinStrictness::Semi;
-    else if (ParserKeyword("ANTI").ignore(pos) || ParserKeyword("ONLY").ignore(pos))
+    else if (ParserKeyword(Keyword::ANTI).ignore(pos) || ParserKeyword(Keyword::ONLY).ignore(pos))
         table_join.strictness = JoinStrictness::Anti;
 }
 
@@ -146,9 +146,9 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
         }
         else
         {
-            if (ParserKeyword("GLOBAL").ignore(pos))
+            if (ParserKeyword(Keyword::GLOBAL).ignore(pos))
                 table_join->locality = JoinLocality::Global;
-            else if (ParserKeyword("LOCAL").ignore(pos))
+            else if (ParserKeyword(Keyword::LOCAL).ignore(pos))
                 table_join->locality = JoinLocality::Local;
 
             table_join->strictness = JoinStrictness::Unspecified;
@@ -157,17 +157,17 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
             parseJoinStrictness(pos, *table_join);
 
             bool no_kind = false;
-            if (ParserKeyword("INNER").ignore(pos))
+            if (ParserKeyword(Keyword::INNER).ignore(pos))
                 table_join->kind = JoinKind::Inner;
-            else if (ParserKeyword("LEFT").ignore(pos))
+            else if (ParserKeyword(Keyword::LEFT).ignore(pos))
                 table_join->kind = JoinKind::Left;
-            else if (ParserKeyword("RIGHT").ignore(pos))
+            else if (ParserKeyword(Keyword::RIGHT).ignore(pos))
                 table_join->kind = JoinKind::Right;
-            else if (ParserKeyword("FULL").ignore(pos))
+            else if (ParserKeyword(Keyword::FULL).ignore(pos))
                 table_join->kind = JoinKind::Full;
-            else if (ParserKeyword("CROSS").ignore(pos))
+            else if (ParserKeyword(Keyword::CROSS).ignore(pos))
                 table_join->kind = JoinKind::Cross;
-            else if (ParserKeyword("PASTE").ignore(pos))
+            else if (ParserKeyword(Keyword::PASTE).ignore(pos))
                 table_join->kind = JoinKind::Paste;
             else
                 no_kind = true;
@@ -180,7 +180,7 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
                 || table_join->kind == JoinKind::Right
                 || table_join->kind == JoinKind::Full)
             {
-                ParserKeyword("OUTER").ignore(pos);
+                ParserKeyword(Keyword::OUTER).ignore(pos);
             }
 
             if (no_kind)
@@ -201,7 +201,7 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
                 (table_join->kind != JoinKind::Left && table_join->kind != JoinKind::Right))
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "SEMI|ANTI JOIN should be LEFT or RIGHT.");
 
-            if (!ParserKeyword("JOIN").ignore(pos, expected))
+            if (!ParserKeyword(Keyword::JOIN).ignore(pos, expected))
                 return false;
         }
 
@@ -211,7 +211,7 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
         if (table_join->kind != JoinKind::Comma
             && table_join->kind != JoinKind::Cross && table_join->kind != JoinKind::Paste)
         {
-            if (ParserKeyword("USING").ignore(pos, expected))
+            if (ParserKeyword(Keyword::USING).ignore(pos, expected))
             {
                 /// Expression for USING could be in parentheses or not.
                 bool in_parens = pos->type == TokenType::OpeningRoundBracket;
@@ -228,7 +228,7 @@ bool ParserTablesInSelectQueryElement::parseImpl(Pos & pos, ASTPtr & node, Expec
                     ++pos;
                 }
             }
-            else if (ParserKeyword("ON").ignore(pos, expected))
+            else if (ParserKeyword(Keyword::ON).ignore(pos, expected))
             {
                 if (!ParserExpression().parse(pos, table_join->on_expression, expected))
                     return false;
diff --git a/src/Parsers/ParserTransactionControl.cpp b/src/Parsers/ParserTransactionControl.cpp
index da593170002..62ed02c779f 100644
--- a/src/Parsers/ParserTransactionControl.cpp
+++ b/src/Parsers/ParserTransactionControl.cpp
@@ -12,13 +12,15 @@ bool ParserTransactionControl::parseImpl(Pos & pos, ASTPtr & node, Expected & ex
     ASTTransactionControl::QueryType action;
     UInt64 snapshot = 0;
 
-    if (ParserKeyword("BEGIN TRANSACTION").ignore(pos, expected))
+    if (ParserKeyword(Keyword::BEGIN_TRANSACTION).ignore(pos, expected))
         action = ASTTransactionControl::BEGIN;
-    else if (ParserKeyword("COMMIT").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::START_TRANSACTION).ignore(pos, expected))
+        action = ASTTransactionControl::BEGIN;
+    else if (ParserKeyword(Keyword::COMMIT).ignore(pos, expected))
         action = ASTTransactionControl::COMMIT;
-    else if (ParserKeyword("ROLLBACK").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::ROLLBACK).ignore(pos, expected))
         action = ASTTransactionControl::ROLLBACK;
-    else if (ParserKeyword("SET TRANSACTION SNAPSHOT").ignore(pos, expected))
+    else if (ParserKeyword(Keyword::SET_TRANSACTION_SNAPSHOT).ignore(pos, expected))
     {
         action = ASTTransactionControl::SET_SNAPSHOT;
         ASTPtr ast;
diff --git a/src/Parsers/ParserUndropQuery.cpp b/src/Parsers/ParserUndropQuery.cpp
index 3784ab0f353..07ca8a3b5fd 100644
--- a/src/Parsers/ParserUndropQuery.cpp
+++ b/src/Parsers/ParserUndropQuery.cpp
@@ -13,7 +13,7 @@ namespace
 
 bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_table("TABLE");
+    ParserKeyword s_table(Keyword::TABLE);
     ParserToken s_dot(TokenType::Dot);
     ParserIdentifier name_p(true);
 
@@ -35,7 +35,7 @@ bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
         if (!name_p.parse(pos, table, expected))
             return false;
     }
-    if (ParserKeyword("UUID").ignore(pos, expected))
+    if (ParserKeyword(Keyword::UUID).ignore(pos, expected))
     {
         ParserStringLiteral uuid_p;
         ASTPtr ast_uuid;
@@ -43,7 +43,7 @@ bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
             return false;
         uuid = parseFromString<UUID>(ast_uuid->as<ASTLiteral>()->value.get<String>());
     }
-    if (ParserKeyword{"ON"}.ignore(pos, expected))
+    if (ParserKeyword{Keyword::ON}.ignore(pos, expected))
     {
         if (!ASTQueryWithOnCluster::parse(pos, cluster_str, expected))
             return false;
@@ -58,7 +58,7 @@ bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
     if (database)
         query->children.push_back(database);
 
-    assert (table);
+    chassert(table);
     query->children.push_back(table);
 
     query->cluster = cluster_str;
@@ -70,7 +70,7 @@ bool parseUndropQuery(IParser::Pos & pos, ASTPtr & node, Expected & expected)
 
 bool ParserUndropQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_undrop("UNDROP");
+    ParserKeyword s_undrop(Keyword::UNDROP);
 
     if (s_undrop.ignore(pos, expected))
         return parseUndropQuery(pos, node, expected);
diff --git a/src/Parsers/ParserUseQuery.cpp b/src/Parsers/ParserUseQuery.cpp
index 350e573281c..b510ab9e59b 100644
--- a/src/Parsers/ParserUseQuery.cpp
+++ b/src/Parsers/ParserUseQuery.cpp
@@ -10,7 +10,7 @@ namespace DB
 
 bool ParserUseQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_use("USE");
+    ParserKeyword s_use(Keyword::USE);
     ParserIdentifier name_p{/*allow_query_parameter*/ true};
 
     if (!s_use.ignore(pos, expected))
diff --git a/src/Parsers/ParserWatchQuery.cpp b/src/Parsers/ParserWatchQuery.cpp
index 913d9c4ff3f..ad3aeb6385d 100644
--- a/src/Parsers/ParserWatchQuery.cpp
+++ b/src/Parsers/ParserWatchQuery.cpp
@@ -20,11 +20,11 @@ namespace DB
 
 bool ParserWatchQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
-    ParserKeyword s_watch("WATCH");
+    ParserKeyword s_watch(Keyword::WATCH);
     ParserToken s_dot(TokenType::Dot);
     ParserIdentifier name_p(true);
-    ParserKeyword s_events("EVENTS");
-    ParserKeyword s_limit("LIMIT");
+    ParserKeyword s_events(Keyword::EVENTS);
+    ParserKeyword s_limit(Keyword::LIMIT);
 
     ASTPtr database;
     ASTPtr table;
diff --git a/src/Parsers/ParserWithElement.cpp b/src/Parsers/ParserWithElement.cpp
index a882af19dd9..5b31c929685 100644
--- a/src/Parsers/ParserWithElement.cpp
+++ b/src/Parsers/ParserWithElement.cpp
@@ -13,7 +13,7 @@ namespace DB
 bool ParserWithElement::parseImpl(Pos & pos, ASTPtr & node, Expected & expected)
 {
     ParserIdentifier s_ident;
-    ParserKeyword s_as("AS");
+    ParserKeyword s_as(Keyword::AS);
     ParserSubquery s_subquery;
 
     auto old_pos = pos;
diff --git a/src/Parsers/QueryParameterVisitor.cpp b/src/Parsers/QueryParameterVisitor.cpp
index b8679cc3b96..9afd9a8615c 100644
--- a/src/Parsers/QueryParameterVisitor.cpp
+++ b/src/Parsers/QueryParameterVisitor.cpp
@@ -43,7 +43,7 @@ NameSet analyzeReceiveQueryParams(const std::string & query)
     const char * query_end = query.data() + query.size();
 
     ParserQuery parser(query_end);
-    ASTPtr extract_query_ast = parseQuery(parser, query_begin, query_end, "analyzeReceiveQueryParams", 0, 0);
+    ASTPtr extract_query_ast = parseQuery(parser, query_begin, query_end, "analyzeReceiveQueryParams", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     QueryParameterVisitor(query_params).visit(extract_query_ast);
 
     NameSet query_param_names;
diff --git a/src/Parsers/TablePropertiesQueriesASTs.h b/src/Parsers/TablePropertiesQueriesASTs.h
index 038936a0297..81ad975aa37 100644
--- a/src/Parsers/TablePropertiesQueriesASTs.h
+++ b/src/Parsers/TablePropertiesQueriesASTs.h
@@ -85,11 +85,21 @@ using ASTShowCreateDictionaryQuery = ASTQueryWithTableAndOutputImpl<ASTShowCreat
 
 class ASTExistsDatabaseQuery : public ASTQueryWithTableAndOutputImpl<ASTExistsDatabaseQueryIDAndQueryNames>
 {
+public:
+    ASTPtr clone() const override
+    {
+        auto res = std::make_shared<ASTExistsDatabaseQuery>(*this);
+        res->children.clear();
+        cloneTableOptions(*res);
+        return res;
+    }
+
 protected:
-    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << ASTExistsDatabaseQueryIDAndQueryNames::Query
-                    << " " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(getDatabase());
+                    << " " << (settings.hilite ? hilite_none : "");
+        database->formatImpl(settings, state, frame);
     }
 
     QueryKind getQueryKind() const override { return QueryKind::Exists; }
@@ -97,11 +107,21 @@ protected:
 
 class ASTShowCreateDatabaseQuery : public ASTQueryWithTableAndOutputImpl<ASTShowCreateDatabaseQueryIDAndQueryNames>
 {
+public:
+    ASTPtr clone() const override
+    {
+        auto res = std::make_shared<ASTShowCreateDatabaseQuery>(*this);
+        res->children.clear();
+        cloneTableOptions(*res);
+        return res;
+    }
+
 protected:
-    void formatQueryImpl(const FormatSettings & settings, FormatState &, FormatStateStacked) const override
+    void formatQueryImpl(const FormatSettings & settings, FormatState & state, FormatStateStacked frame) const override
     {
         settings.ostr << (settings.hilite ? hilite_keyword : "") << ASTShowCreateDatabaseQueryIDAndQueryNames::Query
-                      << " " << (settings.hilite ? hilite_none : "") << backQuoteIfNeed(getDatabase());
+                      << " " << (settings.hilite ? hilite_none : "");
+        database->formatImpl(settings, state, frame);
     }
 };
 
diff --git a/src/Parsers/examples/create_parser.cpp b/src/Parsers/examples/create_parser.cpp
index c241b353b4f..b628c79435c 100644
--- a/src/Parsers/examples/create_parser.cpp
+++ b/src/Parsers/examples/create_parser.cpp
@@ -13,7 +13,7 @@ int main(int, char **)
 
     std::string input = "CREATE TABLE hits (URL String, UserAgentMinor2 FixedString(2), EventTime DateTime) ENGINE = Log";
     ParserCreateQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     WriteBufferFromOStream out(std::cerr, 4096);
     formatAST(*ast, out);
diff --git a/src/Parsers/examples/select_parser.cpp b/src/Parsers/examples/select_parser.cpp
index 15295170c6b..3ed358121f6 100644
--- a/src/Parsers/examples/select_parser.cpp
+++ b/src/Parsers/examples/select_parser.cpp
@@ -23,7 +23,7 @@ try
         " FORMAT TabSeparated";
 
     ParserQueryWithOutput parser(input.data() + input.size());
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
 
     std::cout << "Success." << std::endl;
     WriteBufferFromOStream out(std::cerr, 4096);
diff --git a/src/Parsers/fuzzers/lexer_fuzzer.cpp b/src/Parsers/fuzzers/lexer_fuzzer.cpp
index 0f9471a8e4f..43586ac2416 100644
--- a/src/Parsers/fuzzers/lexer_fuzzer.cpp
+++ b/src/Parsers/fuzzers/lexer_fuzzer.cpp
@@ -10,7 +10,7 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
 {
     try
     {
-        DB::String query;
+        String query;
         DB::ReadBufferFromMemory in(data, size);
         readStringUntilEOF(query, in);
 
diff --git a/src/Parsers/fuzzers/select_parser_fuzzer.cpp b/src/Parsers/fuzzers/select_parser_fuzzer.cpp
index ae490ed4e56..aed83853c33 100644
--- a/src/Parsers/fuzzers/select_parser_fuzzer.cpp
+++ b/src/Parsers/fuzzers/select_parser_fuzzer.cpp
@@ -15,7 +15,8 @@ extern "C" int LLVMFuzzerTestOneInput(const uint8_t * data, size_t size)
         DB::ParserQueryWithOutput parser(input.data() + input.size());
 
         const UInt64 max_parser_depth = 1000;
-        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, max_parser_depth);
+        const UInt64 max_parser_backtracks = 1000000;
+        DB::ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, max_parser_depth, max_parser_backtracks);
 
         const UInt64 max_ast_depth = 1000;
         ast->checkDepth(max_ast_depth);
diff --git a/src/Parsers/parseIdentifierOrStringLiteral.cpp b/src/Parsers/parseIdentifierOrStringLiteral.cpp
index 3f2bd8ac8ad..bb93145772a 100644
--- a/src/Parsers/parseIdentifierOrStringLiteral.cpp
+++ b/src/Parsers/parseIdentifierOrStringLiteral.cpp
@@ -7,8 +7,10 @@
 #include <Parsers/ExpressionListParsers.h>
 #include <Common/typeid_cast.h>
 
+
 namespace DB
 {
+
 bool parseIdentifierOrStringLiteral(IParser::Pos & pos, Expected & expected, String & result)
 {
     return IParserBase::wrapParseImpl(pos, [&]
@@ -23,7 +25,7 @@ bool parseIdentifierOrStringLiteral(IParser::Pos & pos, Expected & expected, Str
         if (ParserStringLiteral().parse(pos, ast, expected))
         {
             result = ast->as<ASTLiteral &>().value.safeGet<String>();
-            return true;
+            return !result.empty();
         }
 
         return false;
diff --git a/src/Parsers/parseIdentifierOrStringLiteral.h b/src/Parsers/parseIdentifierOrStringLiteral.h
index d029c0c1371..b450ce8f2f0 100644
--- a/src/Parsers/parseIdentifierOrStringLiteral.h
+++ b/src/Parsers/parseIdentifierOrStringLiteral.h
@@ -3,11 +3,14 @@
 #include <Core/Types.h>
 #include <Parsers/IParser.h>
 
+
 namespace DB
 {
 
-/** Parses a name of an object which could be written in 3 forms:
-  * name, `name` or 'name' */
+/** Parses a name of an object which could be written in the following forms:
+  * name / `name` / "name" (identifier) or 'name'.
+  * Note that empty strings are not allowed.
+  */
 bool parseIdentifierOrStringLiteral(IParser::Pos & pos, Expected & expected, String & result);
 
 /** Parse a list of identifiers or string literals. */
diff --git a/src/Parsers/parseIntervalKind.cpp b/src/Parsers/parseIntervalKind.cpp
index fe052287083..bbcff8826be 100644
--- a/src/Parsers/parseIntervalKind.cpp
+++ b/src/Parsers/parseIntervalKind.cpp
@@ -7,91 +7,90 @@ namespace DB
 {
 bool parseIntervalKind(IParser::Pos & pos, Expected & expected, IntervalKind & result)
 {
-    if (ParserKeyword("NANOSECOND").ignore(pos, expected) || ParserKeyword("NANOSECONDS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_NANOSECOND").ignore(pos, expected)
-        || ParserKeyword("NS").ignore(pos, expected))
+    if (ParserKeyword(Keyword::NANOSECOND).ignore(pos, expected) || ParserKeyword(Keyword::NANOSECONDS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_NANOSECOND).ignore(pos, expected)
+        || ParserKeyword(Keyword::NS).ignore(pos, expected))
     {
-        result = IntervalKind::Nanosecond;
+        result = IntervalKind::Kind::Nanosecond;
         return true;
     }
 
-    if (ParserKeyword("MICROSECOND").ignore(pos, expected) || ParserKeyword("MICROSECONDS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_MICROSECOND").ignore(pos, expected)
-        || ParserKeyword("MCS").ignore(pos, expected))
+    if (ParserKeyword(Keyword::MICROSECOND).ignore(pos, expected) || ParserKeyword(Keyword::MICROSECONDS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_MICROSECOND).ignore(pos, expected))
     {
-        result = IntervalKind::Microsecond;
+        result = IntervalKind::Kind::Microsecond;
         return true;
     }
 
-    if (ParserKeyword("MILLISECOND").ignore(pos, expected) || ParserKeyword("MILLISECONDS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_MILLISECOND").ignore(pos, expected)
-        || ParserKeyword("MS").ignore(pos, expected))
+    if (ParserKeyword(Keyword::MILLISECOND).ignore(pos, expected) || ParserKeyword(Keyword::MILLISECONDS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_MILLISECOND).ignore(pos, expected)
+        || ParserKeyword(Keyword::MS).ignore(pos, expected))
     {
-        result = IntervalKind::Millisecond;
+        result = IntervalKind::Kind::Millisecond;
         return true;
     }
 
-    if (ParserKeyword("SECOND").ignore(pos, expected) || ParserKeyword("SECONDS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_SECOND").ignore(pos, expected)
-        || ParserKeyword("SS").ignore(pos, expected) || ParserKeyword("S").ignore(pos, expected))
+    if (ParserKeyword(Keyword::SECOND).ignore(pos, expected) || ParserKeyword(Keyword::SECONDS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_SECOND).ignore(pos, expected)
+        || ParserKeyword(Keyword::SS).ignore(pos, expected) || ParserKeyword(Keyword::S).ignore(pos, expected))
     {
-        result = IntervalKind::Second;
+        result = IntervalKind::Kind::Second;
         return true;
     }
 
-    if (ParserKeyword("MINUTE").ignore(pos, expected) || ParserKeyword("MINUTES").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_MINUTE").ignore(pos, expected)
-        || ParserKeyword("MI").ignore(pos, expected) || ParserKeyword("N").ignore(pos, expected))
+    if (ParserKeyword(Keyword::MINUTE).ignore(pos, expected) || ParserKeyword(Keyword::MINUTES).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_MINUTE).ignore(pos, expected)
+        || ParserKeyword(Keyword::MI).ignore(pos, expected) || ParserKeyword(Keyword::N).ignore(pos, expected))
     {
-        result = IntervalKind::Minute;
+        result = IntervalKind::Kind::Minute;
         return true;
     }
 
-    if (ParserKeyword("HOUR").ignore(pos, expected) || ParserKeyword("HOURS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_HOUR").ignore(pos, expected)
-        || ParserKeyword("HH").ignore(pos, expected) || ParserKeyword("H").ignore(pos, expected))
+    if (ParserKeyword(Keyword::HOUR).ignore(pos, expected) || ParserKeyword(Keyword::HOURS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_HOUR).ignore(pos, expected)
+        || ParserKeyword(Keyword::HH).ignore(pos, expected) || ParserKeyword(Keyword::H).ignore(pos, expected))
     {
-        result = IntervalKind::Hour;
+        result = IntervalKind::Kind::Hour;
         return true;
     }
 
-    if (ParserKeyword("DAY").ignore(pos, expected) || ParserKeyword("DAYS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_DAY").ignore(pos, expected)
-        || ParserKeyword("DD").ignore(pos, expected) || ParserKeyword("D").ignore(pos, expected))
+    if (ParserKeyword(Keyword::DAY).ignore(pos, expected) || ParserKeyword(Keyword::DAYS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_DAY).ignore(pos, expected)
+        || ParserKeyword(Keyword::DD).ignore(pos, expected) || ParserKeyword(Keyword::D).ignore(pos, expected))
     {
-        result = IntervalKind::Day;
+        result = IntervalKind::Kind::Day;
         return true;
     }
 
-    if (ParserKeyword("WEEK").ignore(pos, expected) || ParserKeyword("WEEKS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_WEEK").ignore(pos, expected)
-        || ParserKeyword("WK").ignore(pos, expected) || ParserKeyword("WW").ignore(pos, expected))
+    if (ParserKeyword(Keyword::WEEK).ignore(pos, expected) || ParserKeyword(Keyword::WEEKS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_WEEK).ignore(pos, expected)
+        || ParserKeyword(Keyword::WK).ignore(pos, expected) || ParserKeyword(Keyword::WW).ignore(pos, expected))
     {
-        result = IntervalKind::Week;
+        result = IntervalKind::Kind::Week;
         return true;
     }
 
-    if (ParserKeyword("MONTH").ignore(pos, expected) || ParserKeyword("MONTHS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_MONTH").ignore(pos, expected)
-        || ParserKeyword("MM").ignore(pos, expected) || ParserKeyword("M").ignore(pos, expected))
+    if (ParserKeyword(Keyword::MONTH).ignore(pos, expected) || ParserKeyword(Keyword::MONTHS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_MONTH).ignore(pos, expected)
+        || ParserKeyword(Keyword::MM).ignore(pos, expected) || ParserKeyword(Keyword::M).ignore(pos, expected))
     {
-        result = IntervalKind::Month;
+        result = IntervalKind::Kind::Month;
         return true;
     }
 
-    if (ParserKeyword("QUARTER").ignore(pos, expected) || ParserKeyword("QUARTERS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_QUARTER").ignore(pos, expected)
-        || ParserKeyword("QQ").ignore(pos, expected) || ParserKeyword("Q").ignore(pos, expected))
+    if (ParserKeyword(Keyword::QUARTER).ignore(pos, expected) || ParserKeyword(Keyword::QUARTERS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_QUARTER).ignore(pos, expected)
+        || ParserKeyword(Keyword::QQ).ignore(pos, expected) || ParserKeyword(Keyword::Q).ignore(pos, expected))
     {
-        result = IntervalKind::Quarter;
+        result = IntervalKind::Kind::Quarter;
         return true;
     }
 
-    if (ParserKeyword("YEAR").ignore(pos, expected) || ParserKeyword("YEARS").ignore(pos, expected)
-        || ParserKeyword("SQL_TSI_YEAR").ignore(pos, expected)
-        || ParserKeyword("YYYY").ignore(pos, expected) || ParserKeyword("YY").ignore(pos, expected))
+    if (ParserKeyword(Keyword::YEAR).ignore(pos, expected) || ParserKeyword(Keyword::YEARS).ignore(pos, expected)
+        || ParserKeyword(Keyword::SQL_TSI_YEAR).ignore(pos, expected)
+        || ParserKeyword(Keyword::YYYY).ignore(pos, expected) || ParserKeyword(Keyword::YY).ignore(pos, expected))
     {
-        result = IntervalKind::Year;
+        result = IntervalKind::Kind::Year;
         return true;
     }
 
diff --git a/src/Parsers/parseQuery.cpp b/src/Parsers/parseQuery.cpp
index 8f9977c0b8d..51878efa706 100644
--- a/src/Parsers/parseQuery.cpp
+++ b/src/Parsers/parseQuery.cpp
@@ -92,7 +92,9 @@ void writeQueryWithHighlightedErrorPositions(
         }
         else
         {
-            size_t bytes_to_hilite = UTF8::seqLength(*current_position_to_hilite);
+            ssize_t bytes_to_hilite = UTF8::seqLength(*current_position_to_hilite);
+            if (bytes_to_hilite > end - current_position_to_hilite)
+                bytes_to_hilite = end - current_position_to_hilite;
 
             /// Bright on red background.
             out << "\033[41;1m";
@@ -234,12 +236,13 @@ ASTPtr tryParseQuery(
     bool allow_multi_statements,
     size_t max_query_size,
     size_t max_parser_depth,
+    size_t max_parser_backtracks,
     bool skip_insignificant)
 {
     const char * query_begin = _out_query_end;
     Tokens tokens(query_begin, all_queries_end, max_query_size, skip_insignificant);
     /// NOTE: consider use UInt32 for max_parser_depth setting.
-    IParser::Pos token_iterator(tokens, static_cast<uint32_t>(max_parser_depth));
+    IParser::Pos token_iterator(tokens, static_cast<uint32_t>(max_parser_depth), static_cast<uint32_t>(max_parser_backtracks));
 
     if (token_iterator->isEnd()
         || token_iterator->type == TokenType::Semicolon)
@@ -356,10 +359,13 @@ ASTPtr parseQueryAndMovePosition(
     const std::string & query_description,
     bool allow_multi_statements,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
     std::string error_message;
-    ASTPtr res = tryParseQuery(parser, pos, end, error_message, false, query_description, allow_multi_statements, max_query_size, max_parser_depth);
+    ASTPtr res = tryParseQuery(
+        parser, pos, end, error_message, false, query_description, allow_multi_statements,
+        max_query_size, max_parser_depth, max_parser_backtracks, true);
 
     if (res)
         return res;
@@ -374,9 +380,10 @@ ASTPtr parseQuery(
     const char * end,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseQueryAndMovePosition(parser, begin, end, query_description, false, max_query_size, max_parser_depth);
+    return parseQueryAndMovePosition(parser, begin, end, query_description, false, max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 
@@ -385,9 +392,10 @@ ASTPtr parseQuery(
     const std::string & query,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseQuery(parser, query.data(), query.data() + query.size(), query_description, max_query_size, max_parser_depth);
+    return parseQuery(parser, query.data(), query.data() + query.size(), query_description, max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 
@@ -395,9 +403,10 @@ ASTPtr parseQuery(
     IParser & parser,
     const std::string & query,
     size_t max_query_size,
-    size_t max_parser_depth)
+    size_t max_parser_depth,
+    size_t max_parser_backtracks)
 {
-    return parseQuery(parser, query.data(), query.data() + query.size(), parser.getName(), max_query_size, max_parser_depth);
+    return parseQuery(parser, query.data(), query.data() + query.size(), parser.getName(), max_query_size, max_parser_depth, max_parser_backtracks);
 }
 
 
@@ -406,6 +415,7 @@ std::pair<const char *, bool> splitMultipartQuery(
     std::vector<std::string> & queries_list,
     size_t max_query_size,
     size_t max_parser_depth,
+    size_t max_parser_backtracks,
     bool allow_settings_after_format_in_insert)
 {
     ASTPtr ast;
@@ -422,7 +432,7 @@ std::pair<const char *, bool> splitMultipartQuery(
     {
         begin = pos;
 
-        ast = parseQueryAndMovePosition(parser, pos, end, "", true, max_query_size, max_parser_depth);
+        ast = parseQueryAndMovePosition(parser, pos, end, "", true, max_query_size, max_parser_depth, max_parser_backtracks);
 
         auto * insert = ast->as<ASTInsertQuery>();
 
diff --git a/src/Parsers/parseQuery.h b/src/Parsers/parseQuery.h
index a087f145d2c..93c1a465267 100644
--- a/src/Parsers/parseQuery.h
+++ b/src/Parsers/parseQuery.h
@@ -19,7 +19,8 @@ ASTPtr tryParseQuery(
     size_t max_query_size,          /// If (end - pos) > max_query_size and query is longer than max_query_size then throws "Max query size exceeded".
                                     /// Disabled if zero. Is used in order to check query size if buffer can contains data for INSERT query.
     size_t max_parser_depth,
-    bool skip_insignificant = true);  /// If true, lexer will skip all insignificant tokens (e.g. whitespaces)
+    size_t max_parser_backtracks,
+    bool skip_insignificant);  /// If true, lexer will skip all insignificant tokens (e.g. whitespaces)
 
 
 /// Parse query or throw an exception with error message.
@@ -30,7 +31,8 @@ ASTPtr parseQueryAndMovePosition(
     const std::string & description,
     bool allow_multi_statements,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseQuery(
     IParser & parser,
@@ -38,20 +40,23 @@ ASTPtr parseQuery(
     const char * end,
     const std::string & description,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseQuery(
     IParser & parser,
     const std::string & query,
     const std::string & query_description,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 ASTPtr parseQuery(
     IParser & parser,
     const std::string & query,
     size_t max_query_size,
-    size_t max_parser_depth);
+    size_t max_parser_depth,
+    size_t max_parser_backtracks);
 
 
 /** Split queries separated by ; on to list of single queries
@@ -63,6 +68,7 @@ std::pair<const char *, bool> splitMultipartQuery(
     std::vector<std::string> & queries_list,
     size_t max_query_size,
     size_t max_parser_depth,
+    size_t max_parser_backtracks,
     bool allow_settings_after_format_in_insert);
 
 }
diff --git a/src/Parsers/queryNormalization.cpp b/src/Parsers/queryNormalization.cpp
index 416e86b1f32..4a9dd8ceb98 100644
--- a/src/Parsers/queryNormalization.cpp
+++ b/src/Parsers/queryNormalization.cpp
@@ -167,6 +167,8 @@ void normalizeQueryToPODArray(const char * begin, const char * end, PaddedPODArr
                 continue;
             }
         }
+        else if (prev_comma && (token.type == TokenType::Plus || token.type == TokenType::Minus))
+            continue;
         else
         {
             if (num_literals_in_sequence > 1)
diff --git a/src/Parsers/tests/gtest_Parser.cpp b/src/Parsers/tests/gtest_Parser.cpp
index 4914c3889dd..f0abc68f966 100644
--- a/src/Parsers/tests/gtest_Parser.cpp
+++ b/src/Parsers/tests/gtest_Parser.cpp
@@ -1,7 +1,4 @@
-#include <IO/WriteBufferFromOStream.h>
-#include <Interpreters/applyTableOverride.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/Access/ASTCreateUserQuery.h>
 #include <Parsers/Access/ParserCreateUserQuery.h>
@@ -9,7 +6,7 @@
 #include <Parsers/ParserAlterQuery.h>
 #include <Parsers/ParserCreateQuery.h>
 #include <Parsers/ParserOptimizeQuery.h>
-#include <Parsers/ParserQueryWithOutput.h>
+#include <Parsers/ParserRenameQuery.h>
 #include <Parsers/ParserAttachAccessEntity.h>
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
@@ -53,19 +50,38 @@ TEST_P(ParserTest, parseQuery)
     {
         if (std::string(expected_ast).starts_with("throws"))
         {
-            EXPECT_THROW(parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0), DB::Exception);
+            EXPECT_THROW(parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0), DB::Exception);
         }
         else
         {
             ASTPtr ast;
-            ASSERT_NO_THROW(ast = parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0));
+            ASSERT_NO_THROW(ast = parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0));
             if (std::string("CREATE USER or ALTER USER query") != parser->getName()
                     && std::string("ATTACH access entity query") != parser->getName())
             {
-                WriteBufferFromOwnString buf;
-                formatAST(*ast->clone(), buf, false, false);
-                String formatted_ast = buf.str();
-                EXPECT_EQ(expected_ast, formatted_ast);
+                ASTPtr ast_clone = ast->clone();
+                {
+                    WriteBufferFromOwnString buf;
+                    formatAST(*ast_clone, buf, false, false);
+                    String formatted_ast = buf.str();
+                    EXPECT_EQ(expected_ast, formatted_ast);
+                }
+
+
+                ASTPtr ast_clone2 = ast_clone->clone();
+                /// Break `ast_clone2`, it should not affect `ast_clone` if `clone()` implemented properly
+                for (auto & child : ast_clone2->children)
+                {
+                    if (auto * identifier = dynamic_cast<ASTIdentifier *>(child.get()))
+                        identifier->setShortName("new_name");
+                }
+
+                {
+                    WriteBufferFromOwnString buf;
+                    formatAST(*ast_clone, buf, false, false);
+                    String formatted_ast = buf.str();
+                    EXPECT_EQ(expected_ast, formatted_ast);
+                }
             }
             else
             {
@@ -86,7 +102,7 @@ TEST_P(ParserTest, parseQuery)
     }
     else
     {
-        ASSERT_THROW(parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0), DB::Exception);
+        ASSERT_THROW(parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0), DB::Exception);
     }
 }
 
@@ -132,7 +148,7 @@ INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery, ParserTest,
 
 INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery_FAIL, ParserTest,
     ::testing::Combine(
-        ::testing::Values(std::make_shared<ParserAlterCommand>()),
+        ::testing::Values(std::make_shared<ParserAlterCommand>(false)),
         ::testing::ValuesIn(std::initializer_list<ParserTestCase>
         {
             {
@@ -159,7 +175,7 @@ INSTANTIATE_TEST_SUITE_P(ParserOptimizeQuery_FAIL, ParserTest,
 
 INSTANTIATE_TEST_SUITE_P(ParserAlterCommand_MODIFY_COMMENT, ParserTest,
     ::testing::Combine(
-        ::testing::Values(std::make_shared<ParserAlterCommand>()),
+        ::testing::Values(std::make_shared<ParserAlterCommand>(false)),
         ::testing::ValuesIn(std::initializer_list<ParserTestCase>
         {
             {
@@ -299,6 +315,16 @@ INSTANTIATE_TEST_SUITE_P(ParserAttachUserQuery, ParserTest,
         }
 })));
 
+INSTANTIATE_TEST_SUITE_P(ParserRenameQuery, ParserTest,
+    ::testing::Combine(
+        ::testing::Values(std::make_shared<ParserRenameQuery>()),
+        ::testing::ValuesIn(std::initializer_list<ParserTestCase>{
+        {
+            "RENAME TABLE eligible_test TO eligible_test2",
+            "RENAME TABLE eligible_test TO eligible_test2"
+        }
+})));
+
 INSTANTIATE_TEST_SUITE_P(ParserKQLQuery, ParserKQLTest,
     ::testing::Combine(
         ::testing::Values(std::make_shared<ParserKQLQuery>()),
@@ -619,12 +645,13 @@ INSTANTIATE_TEST_SUITE_P(ParserKQLQuery, ParserKQLTest,
 
 static constexpr size_t kDummyMaxQuerySize = 256 * 1024;
 static constexpr size_t kDummyMaxParserDepth = 256;
+static constexpr size_t kDummyMaxParserBacktracks = 1000000;
 
 INSTANTIATE_TEST_SUITE_P(
     ParserPRQL,
     ParserTest,
     ::testing::Combine(
-        ::testing::Values(std::make_shared<ParserPRQLQuery>(kDummyMaxQuerySize, kDummyMaxParserDepth)),
+        ::testing::Values(std::make_shared<ParserPRQLQuery>(kDummyMaxQuerySize, kDummyMaxParserDepth, kDummyMaxParserBacktracks)),
         ::testing::ValuesIn(std::initializer_list<ParserTestCase>{
             {
                 "from albums\ngroup {author_id} (\n  aggregate {first_published = min published}\n)\njoin a=author side:left (==author_id)\njoin p=purchases side:right (==author_id)\ngroup {a.id, p.purchase_id} (\n  aggregate {avg_sell = min first_published}\n)",
diff --git a/src/Parsers/tests/gtest_common.cpp b/src/Parsers/tests/gtest_common.cpp
index 52d3ceb47e2..8ff9400d8a2 100644
--- a/src/Parsers/tests/gtest_common.cpp
+++ b/src/Parsers/tests/gtest_common.cpp
@@ -28,7 +28,7 @@ TEST_P(ParserRegexTest, parseQuery)
     ASSERT_TRUE(expected_ast);
 
     DB::ASTPtr ast;
-    ASSERT_NO_THROW(ast = parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0));
+    ASSERT_NO_THROW(ast = parseQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0));
     DB::WriteBufferFromOwnString buf;
     formatAST(*ast->clone(), buf, false, false);
     EXPECT_THAT(buf.str(), ::testing::MatchesRegex(expected_ast));
@@ -45,12 +45,12 @@ TEST_P(ParserKQLTest, parseKQLQuery)
     {
         if (std::string(expected_ast).starts_with("throws"))
         {
-            EXPECT_THROW(parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0), DB::Exception);
+            EXPECT_THROW(parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0), DB::Exception);
         }
         else
         {
             DB::ASTPtr ast;
-            ASSERT_NO_THROW(ast = parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0));
+            ASSERT_NO_THROW(ast = parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0));
             if (std::string("CREATE USER or ALTER USER query") != parser->getName()
                     && std::string("ATTACH access entity query") != parser->getName())
             {
@@ -78,6 +78,6 @@ TEST_P(ParserKQLTest, parseKQLQuery)
     }
     else
     {
-        ASSERT_THROW(parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0), DB::Exception);
+        ASSERT_THROW(parseKQLQuery(*parser, input_text.begin(), input_text.end(), 0, 0, 0), DB::Exception);
     }
 }
diff --git a/src/Parsers/tests/gtest_dictionary_parser.cpp b/src/Parsers/tests/gtest_dictionary_parser.cpp
index c0a975f7a38..44205975cdc 100644
--- a/src/Parsers/tests/gtest_dictionary_parser.cpp
+++ b/src/Parsers/tests/gtest_dictionary_parser.cpp
@@ -40,7 +40,7 @@ TEST(ParserDictionaryDDL, SimpleDictionary)
                    " RANGE(MIN second_column MAX third_column)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     EXPECT_EQ(create->getTable(), "dict1");
     EXPECT_EQ(create->getDatabase(), "test");
@@ -136,7 +136,7 @@ TEST(ParserDictionaryDDL, AttributesWithMultipleProperties)
                    " SOURCE(CLICKHOUSE(HOST 'localhost'))";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     EXPECT_EQ(create->getTable(), "dict2");
     EXPECT_EQ(create->getDatabase(), "");
@@ -183,7 +183,7 @@ TEST(ParserDictionaryDDL, CustomAttributePropertiesOrder)
                    " LIFETIME(300)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
 
     /// test attributes
@@ -238,7 +238,7 @@ TEST(ParserDictionaryDDL, NestedSource)
                    " RANGE(MIN second_column MAX third_column)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     EXPECT_EQ(create->getTable(), "dict4");
     EXPECT_EQ(create->getDatabase(), "");
@@ -286,7 +286,7 @@ TEST(ParserDictionaryDDL, Formatting)
                    " RANGE(MIN second_column MAX third_column)";
 
     ParserCreateDictionaryQuery parser;
-    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0);
+    ASTPtr ast = parseQuery(parser, input.data(), input.data() + input.size(), "", 0, 0, 0);
     ASTCreateQuery * create = ast->as<ASTCreateQuery>();
     auto str = serializeAST(*create);
     EXPECT_EQ(str, "CREATE DICTIONARY test.dict5 (`key_column1` UInt64 DEFAULT 1 HIERARCHICAL INJECTIVE, `key_column2` String DEFAULT '', `second_column` UInt8 EXPRESSION intDiv(50, rand() % 1000), `third_column` UInt8) PRIMARY KEY key_column1, key_column2 SOURCE(MYSQL(HOST 'localhost' PORT 9000 USER 'default' REPLICA (HOST '127.0.0.1' PRIORITY 1) PASSWORD '')) LIFETIME(MIN 1 MAX 10) LAYOUT(CACHE(SIZE_IN_CELLS 50)) RANGE(MIN second_column MAX third_column)");
@@ -297,23 +297,27 @@ TEST(ParserDictionaryDDL, ParseDropQuery)
     String input1 = "DROP DICTIONARY test.dict1";
 
     ParserDropQuery parser;
-    ASTPtr ast1 = parseQuery(parser, input1.data(), input1.data() + input1.size(), "", 0, 0);
+    ASTPtr ast1 = parseQuery(parser, input1.data(), input1.data() + input1.size(), "", 0, 0, 0);
     ASTDropQuery * drop1 = ast1->as<ASTDropQuery>();
 
     EXPECT_TRUE(drop1->is_dictionary);
-    EXPECT_EQ(drop1->getDatabase(), "test");
-    EXPECT_EQ(drop1->getTable(), "dict1");
+    auto & database_and_tables1 = drop1->database_and_tables->as<ASTExpressionList &>();
+    auto identifier1 = dynamic_pointer_cast<ASTTableIdentifier>(database_and_tables1.children[0]);
+    EXPECT_EQ(identifier1->getDatabaseName(), "test");
+    EXPECT_EQ(identifier1->shortName(), "dict1");
     auto str1 = serializeAST(*drop1);
     EXPECT_EQ(input1, str1);
 
     String input2 = "DROP DICTIONARY IF EXISTS dict2";
 
-    ASTPtr ast2 = parseQuery(parser, input2.data(), input2.data() + input2.size(), "", 0, 0);
+    ASTPtr ast2 = parseQuery(parser, input2.data(), input2.data() + input2.size(), "", 0, 0, 0);
     ASTDropQuery * drop2 = ast2->as<ASTDropQuery>();
 
     EXPECT_TRUE(drop2->is_dictionary);
-    EXPECT_EQ(drop2->getDatabase(), "");
-    EXPECT_EQ(drop2->getTable(), "dict2");
+    auto & database_and_tables2 = drop2->database_and_tables->as<ASTExpressionList &>();
+    auto identifier2 = dynamic_pointer_cast<ASTTableIdentifier>(database_and_tables2.children[0]);
+    EXPECT_EQ(identifier2->getDatabaseName(), "");
+    EXPECT_EQ(identifier2->shortName(), "dict2");
     auto str2 = serializeAST(*drop2);
     EXPECT_EQ(input2, str2);
 }
@@ -323,7 +327,7 @@ TEST(ParserDictionaryDDL, ParsePropertiesQueries)
     String input1 = "SHOW CREATE DICTIONARY test.dict1";
 
     ParserTablePropertiesQuery parser;
-    ASTPtr ast1 = parseQuery(parser, input1.data(), input1.data() + input1.size(), "", 0, 0);
+    ASTPtr ast1 = parseQuery(parser, input1.data(), input1.data() + input1.size(), "", 0, 0, 0);
     ASTShowCreateDictionaryQuery * show1 = ast1->as<ASTShowCreateDictionaryQuery>();
 
     EXPECT_EQ(show1->getTable(), "dict1");
@@ -332,7 +336,7 @@ TEST(ParserDictionaryDDL, ParsePropertiesQueries)
 
     String input2 = "EXISTS DICTIONARY dict2";
 
-    ASTPtr ast2 = parseQuery(parser, input2.data(), input2.data() + input2.size(), "", 0, 0);
+    ASTPtr ast2 = parseQuery(parser, input2.data(), input2.data() + input2.size(), "", 0, 0, 0);
     ASTExistsDictionaryQuery * show2 = ast2->as<ASTExistsDictionaryQuery>();
 
     EXPECT_EQ(show2->getTable(), "dict2");
diff --git a/src/Parsers/tests/gtest_format_hiliting.cpp b/src/Parsers/tests/gtest_format_hiliting.cpp
index a4c3ed86182..00e8197af1f 100644
--- a/src/Parsers/tests/gtest_format_hiliting.cpp
+++ b/src/Parsers/tests/gtest_format_hiliting.cpp
@@ -5,9 +5,11 @@
 #include <Parsers/parseQuery.h>
 #include <Parsers/HiliteComparator/HiliteComparator.h>
 #include <gtest/gtest.h>
-#include <Common/StackTrace.h>
+#include <Common/quoteString.h>
 
 
+using namespace DB;
+
 String hilite(const String & s, const char * hilite_type)
 {
     return hilite_type + s + DB::IAST::hilite_none;
@@ -20,12 +22,12 @@ String keyword(const String & s)
 
 String identifier(const String & s)
 {
-    return hilite(s, DB::IAST::hilite_identifier);
+    return hilite(backQuoteIfNeed(s), DB::IAST::hilite_identifier);
 }
 
 String alias(const String & s)
 {
-    return hilite(s, DB::IAST::hilite_alias);
+    return hilite(backQuoteIfNeed(s), DB::IAST::hilite_alias);
 }
 
 String op(const String & s)
@@ -48,7 +50,7 @@ void compare(const String & expected, const String & query)
 {
     using namespace DB;
     ParserQuery parser(query.data() + query.size());
-    ASTPtr ast = parseQuery(parser, query, 0, 0);
+    ASTPtr ast = parseQuery(parser, query, 0, 0, 0);
 
     WriteBufferFromOwnString write_buffer;
     IAST::FormatSettings settings(write_buffer, true, true);
@@ -61,65 +63,65 @@ void compare(const String & expected, const String & query)
 const std::vector<std::pair<std::string, std::string>> expected_and_query_pairs = {
     // Simple select
     {
-        keyword("SELECT ") + "* " + keyword("FROM ") + identifier("table"),
-        "select * from table"
+        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"
+        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"),
+        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)"
+            + 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("CREATE DICTIONARY ") + identifier("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("CREATE DICTIONARY ") + identifier("name") + " "
+            + "(`Name`" + " " + function("ClickHouseDataType ")
+            + keyword("DEFAULT") + " '' "
+            + keyword("EXPRESSION") + " " + function("rand64()") + " "
             + keyword("IS_OBJECT_ID") + ") "
-            + keyword("SOURCE") + "(" + keyword("FILE") + "(" + keyword("PATH ") + "'path'))",
+            + 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("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'",
+        keyword("CREATE TABLE ") + identifier("name") + " " + keyword("AS (SELECT") + " *" + keyword(")") + " "
+            + keyword("COMMENT") + " 'hello'",
         "CREATE TABLE name AS (SELECT *) COMMENT 'hello'"
     },
 };
diff --git a/src/Planner/CollectSets.cpp b/src/Planner/CollectSets.cpp
index e150b8a5956..f00b1e6ab16 100644
--- a/src/Planner/CollectSets.cpp
+++ b/src/Planner/CollectSets.cpp
@@ -89,27 +89,8 @@ public:
                 return;
 
             auto subquery_to_execute = in_second_argument;
-            if (auto * table_node = in_second_argument->as<TableNode>())
-            {
-                auto storage_snapshot = table_node->getStorageSnapshot();
-                auto columns_to_select = storage_snapshot->getColumns(GetColumnsOptions(GetColumnsOptions::Ordinary));
-                size_t columns_to_select_size = columns_to_select.size();
-                auto column_nodes_to_select = std::make_shared<ListNode>();
-                column_nodes_to_select->getNodes().reserve(columns_to_select_size);
-                NamesAndTypes projection_columns;
-                projection_columns.reserve(columns_to_select_size);
-                for (auto & column : columns_to_select)
-                {
-                    column_nodes_to_select->getNodes().emplace_back(std::make_shared<ColumnNode>(column, subquery_to_execute));
-                    projection_columns.emplace_back(column.name, column.type);
-                }
-                auto subquery_for_table = std::make_shared<QueryNode>(Context::createCopy(planner_context.getQueryContext()));
-                subquery_for_table->setIsSubquery(true);
-                subquery_for_table->getProjectionNode() = std::move(column_nodes_to_select);
-                subquery_for_table->getJoinTree() = std::move(subquery_to_execute);
-                subquery_for_table->resolveProjectionColumns(std::move(projection_columns));
-                subquery_to_execute = std::move(subquery_for_table);
-            }
+            if (in_second_argument->as<TableNode>())
+                subquery_to_execute = buildSubqueryToReadColumnsFromTableExpression(std::move(subquery_to_execute), planner_context.getQueryContext());
 
             sets.addFromSubquery(set_key, std::move(subquery_to_execute), settings);
         }
diff --git a/src/Planner/CollectTableExpressionData.cpp b/src/Planner/CollectTableExpressionData.cpp
index 78a7c7074c3..27b5909c13b 100644
--- a/src/Planner/CollectTableExpressionData.cpp
+++ b/src/Planner/CollectTableExpressionData.cpp
@@ -29,34 +29,13 @@ namespace
 class CollectSourceColumnsVisitor : public InDepthQueryTreeVisitor<CollectSourceColumnsVisitor>
 {
 public:
-    explicit CollectSourceColumnsVisitor(PlannerContext & planner_context_)
+    explicit CollectSourceColumnsVisitor(PlannerContextPtr & planner_context_, bool keep_alias_columns_ = true)
         : planner_context(planner_context_)
+        , keep_alias_columns(keep_alias_columns_)
     {}
 
     void visitImpl(QueryTreeNodePtr & node)
     {
-        /// Special case for USING clause which contains references to ALIAS columns.
-        /// We can not modify such ColumnNode.
-        if (auto * join_node = node->as<JoinNode>())
-        {
-            if (!join_node->isUsingJoinExpression())
-                return;
-
-            auto & using_list = join_node->getJoinExpression()->as<ListNode&>();
-            for (auto & using_element : using_list)
-            {
-                auto & column_node = using_element->as<ColumnNode&>();
-                /// This list contains column nodes from left and right tables.
-                auto & columns_from_subtrees = column_node.getExpressionOrThrow()->as<ListNode&>().getNodes();
-
-                /// Visit left table column node.
-                visitUsingColumn(columns_from_subtrees[0]);
-                /// Visit right table column node.
-                visitUsingColumn(columns_from_subtrees[1]);
-            }
-            return;
-        }
-
         auto * column_node = node->as<ColumnNode>();
         if (!column_node)
             return;
@@ -72,22 +51,55 @@ public:
 
         /// JOIN using expression
         if (column_node->hasExpression() && column_source_node_type == QueryTreeNodeType::JOIN)
-            return;
-
-        auto & table_expression_data = planner_context.getOrCreateTableExpressionData(column_source_node);
-
-        if (column_node->hasExpression() && column_source_node_type != QueryTreeNodeType::ARRAY_JOIN)
         {
-            /// Replace ALIAS column with expression
+            auto & columns_from_subtrees = column_node->getExpression()->as<ListNode &>().getNodes();
+            if (columns_from_subtrees.size() != 2)
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                    "Expected two columns in JOIN using expression for column {}", column_node->dumpTree());
+
+            visit(columns_from_subtrees[0]);
+            visit(columns_from_subtrees[1]);
+            return;
+        }
+
+        auto & table_expression_data = planner_context->getOrCreateTableExpressionData(column_source_node);
+
+        if (isAliasColumn(node))
+        {
+            /// Column is an ALIAS column with expression
             bool column_already_exists = table_expression_data.hasColumn(column_node->getColumnName());
             if (!column_already_exists)
             {
-                auto column_identifier = planner_context.getGlobalPlannerContext()->createColumnIdentifier(node);
-                table_expression_data.addAliasColumnName(column_node->getColumnName(), column_identifier);
+                CollectSourceColumnsVisitor visitor_for_alias_column(planner_context);
+                /// While we are processing expression of ALIAS columns we should not add source columns to selected.
+                /// See also comment for `select_added_columns`
+                visitor_for_alias_column.select_added_columns = false;
+                visitor_for_alias_column.keep_alias_columns = keep_alias_columns;
+                visitor_for_alias_column.visit(column_node->getExpression());
+
+                if (!keep_alias_columns)
+                {
+                    /// For PREWHERE we can just replace ALIAS column with it's expression,
+                    /// because ActionsDAG for PREWHERE applied right on top of table expression
+                    /// and cannot affect subqueries or other table expressions.
+                    node = column_node->getExpression();
+                    return;
+                }
+
+                auto column_identifier = planner_context->getGlobalPlannerContext()->createColumnIdentifier(node);
+
+                ActionsDAGPtr alias_column_actions_dag = std::make_shared<ActionsDAG>();
+                PlannerActionsVisitor actions_visitor(planner_context, false);
+                auto outputs = actions_visitor.visit(alias_column_actions_dag, column_node->getExpression());
+                if (outputs.size() != 1)
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Expected single output in actions dag for alias column {}. Actual {}", column_node->dumpTree(), outputs.size());
+                const auto & column_name = column_node->getColumnName();
+                const auto & alias_node = alias_column_actions_dag->addAlias(*outputs[0], column_name);
+                alias_column_actions_dag->addOrReplaceInOutputs(alias_node);
+                table_expression_data.addAliasColumn(column_node->getColumn(), column_identifier, alias_column_actions_dag, select_added_columns);
             }
 
-            node = column_node->getExpression();
-            visitImpl(node);
             return;
         }
 
@@ -102,45 +114,58 @@ public:
 
         bool column_already_exists = table_expression_data.hasColumn(column_node->getColumnName());
         if (column_already_exists)
+        {
+            /// Column may be added when we collected data for ALIAS column
+            /// But now we see it directly in the query, so make sure it's marked as selected
+            if (select_added_columns)
+                table_expression_data.markSelectedColumn(column_node->getColumnName());
             return;
+        }
 
-        auto column_identifier = planner_context.getGlobalPlannerContext()->createColumnIdentifier(node);
-        table_expression_data.addColumn(column_node->getColumn(), column_identifier);
+        auto column_identifier = planner_context->getGlobalPlannerContext()->createColumnIdentifier(node);
+        table_expression_data.addColumn(column_node->getColumn(), column_identifier, select_added_columns);
     }
 
-    static bool needChildVisit(const QueryTreeNodePtr & parent, const QueryTreeNodePtr & child_node)
+    static bool isAliasColumn(const QueryTreeNodePtr & node)
+    {
+        const auto * column_node = node->as<ColumnNode>();
+        if (!column_node || !column_node->hasExpression())
+            return false;
+        const auto & column_source = column_node->getColumnSourceOrNull();
+        if (!column_source)
+            return false;
+        return column_source->getNodeType() != QueryTreeNodeType::JOIN &&
+               column_source->getNodeType() != QueryTreeNodeType::ARRAY_JOIN;
+    }
+
+    static bool needChildVisit(const QueryTreeNodePtr & parent_node, const QueryTreeNodePtr & child_node)
     {
-        if (auto * join_node = parent->as<JoinNode>())
-        {
-            if (join_node->getJoinExpression() == child_node && join_node->isUsingJoinExpression())
-                return false;
-        }
         auto child_node_type = child_node->getNodeType();
-        return !(child_node_type == QueryTreeNodeType::QUERY || child_node_type == QueryTreeNodeType::UNION);
+        return !(child_node_type == QueryTreeNodeType::QUERY ||
+                 child_node_type == QueryTreeNodeType::UNION ||
+                 isAliasColumn(parent_node));
+    }
+
+    void setKeepAliasColumns(bool keep_alias_columns_)
+    {
+        keep_alias_columns = keep_alias_columns_;
     }
 
 private:
+    PlannerContextPtr & planner_context;
 
-    void visitUsingColumn(QueryTreeNodePtr & node)
-    {
-        auto & column_node = node->as<ColumnNode&>();
-        if (column_node.hasExpression())
-        {
-            auto & table_expression_data = planner_context.getOrCreateTableExpressionData(column_node.getColumnSource());
-            bool column_already_exists = table_expression_data.hasColumn(column_node.getColumnName());
-            if (column_already_exists)
-                return;
+    /// Replace ALIAS columns with their expressions or register them in table expression data.
+    /// Usually we can replace them when we build some "local" actions DAG
+    /// (for example Row Policy or PREWHERE) that is applied on top of the table expression.
+    /// In other cases, we keep ALIAS columns as ColumnNode with an expression child node,
+    /// and handle them in the Planner by inserting ActionsDAG to compute them after reading from storage.
+    bool keep_alias_columns = true;
 
-            auto column_identifier = planner_context.getGlobalPlannerContext()->createColumnIdentifier(node);
-            table_expression_data.addAliasColumnName(column_node.getColumnName(), column_identifier);
-
-            visitImpl(column_node.getExpressionOrThrow());
-        }
-        else
-            visitImpl(node);
-    }
-
-    PlannerContext & planner_context;
+    /// Flag `select_added_columns` indicates if we should mark column as explicitly selected.
+    /// For example, for table with columns (a Int32, b ALIAS a+1) and query SELECT b FROM table
+    /// Column `b` is selected explicitly by user, but not `a` (that is also read though).
+    /// Distinguishing such columns is important for checking access rights for ALIAS columns.
+    bool select_added_columns = true;
 };
 
 class CollectPrewhereTableExpressionVisitor : public ConstInDepthQueryTreeVisitor<CollectPrewhereTableExpressionVisitor>
@@ -210,7 +235,9 @@ public:
     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);
+        return child_node_type != QueryTreeNodeType::QUERY &&
+               child_node_type != QueryTreeNodeType::UNION &&
+               child_node_type != QueryTreeNodeType::LAMBDA;
     }
 
 private:
@@ -274,7 +301,7 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr
         }
     }
 
-    CollectSourceColumnsVisitor collect_source_columns_visitor(*planner_context);
+    CollectSourceColumnsVisitor collect_source_columns_visitor(planner_context);
     for (auto & node : query_node_typed.getChildren())
     {
         if (!node || node == query_node_typed.getPrewhere())
@@ -300,21 +327,26 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr
         }
 
         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());
+        const auto & read_column_names = table_expression_data.getColumnNames();
+        NameSet required_column_names_without_prewhere(read_column_names.begin(), read_column_names.end());
+        const auto & selected_column_names = table_expression_data.getSelectedColumnsNames();
+        required_column_names_without_prewhere.insert(selected_column_names.begin(), selected_column_names.end());
 
+        collect_source_columns_visitor.setKeepAliasColumns(false);
         collect_source_columns_visitor.visit(query_node_typed.getPrewhere());
 
         auto prewhere_actions_dag = std::make_shared<ActionsDAG>();
 
+        QueryTreeNodePtr query_tree_node = query_node_typed.getPrewhere();
+
         PlannerActionsVisitor visitor(planner_context, false /*use_column_identifier_as_action_node_name*/);
-        auto expression_nodes = visitor.visit(prewhere_actions_dag, query_node_typed.getPrewhere());
+        auto expression_nodes = visitor.visit(prewhere_actions_dag, query_tree_node);
         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]);
+        prewhere_actions_dag->getOutputs().push_back(expression_nodes.back());
 
         for (const auto & prewhere_input_node : prewhere_actions_dag->getInputs())
             if (required_column_names_without_prewhere.contains(prewhere_input_node->result_name))
@@ -324,9 +356,9 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr
     }
 }
 
-void collectSourceColumns(QueryTreeNodePtr & expression_node, PlannerContextPtr & planner_context)
+void collectSourceColumns(QueryTreeNodePtr & expression_node, PlannerContextPtr & planner_context, bool keep_alias_columns)
 {
-    CollectSourceColumnsVisitor collect_source_columns_visitor(*planner_context);
+    CollectSourceColumnsVisitor collect_source_columns_visitor(planner_context, keep_alias_columns);
     collect_source_columns_visitor.visit(expression_node);
 }
 
diff --git a/src/Planner/CollectTableExpressionData.h b/src/Planner/CollectTableExpressionData.h
index ed3f0ff7a47..b0cebc15682 100644
--- a/src/Planner/CollectTableExpressionData.h
+++ b/src/Planner/CollectTableExpressionData.h
@@ -19,6 +19,6 @@ void collectTableExpressionData(QueryTreeNodePtr & query_node, PlannerContextPtr
   *
   * 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);
+void collectSourceColumns(QueryTreeNodePtr & expression_node, PlannerContextPtr & planner_context, bool keep_alias_columns = true);
 
 }
diff --git a/src/Planner/Planner.cpp b/src/Planner/Planner.cpp
index bbe138705f7..d75573c8d99 100644
--- a/src/Planner/Planner.cpp
+++ b/src/Planner/Planner.cpp
@@ -1,9 +1,10 @@
 #include <Planner/Planner.h>
 
-#include <Core/ProtocolDefines.h>
-#include <Common/logger_useful.h>
-#include <Common/ProfileEvents.h>
+#include <Columns/ColumnConst.h>
 #include <Columns/ColumnSet.h>
+#include <Core/ProtocolDefines.h>
+#include <Common/ProfileEvents.h>
+#include <Common/logger_useful.h>
 
 #include <DataTypes/DataTypeString.h>
 
@@ -45,6 +46,7 @@
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageDistributed.h>
 #include <Storages/StorageDummy.h>
+#include <Storages/StorageMerge.h>
 
 #include <Analyzer/Utils.h>
 #include <Analyzer/ColumnNode.h>
@@ -64,6 +66,7 @@
 #include <Analyzer/AggregationUtils.h>
 #include <Analyzer/WindowFunctionsUtils.h>
 
+#include <Planner/findQueryForParallelReplicas.h>
 #include <Planner/Utils.h>
 #include <Planner/PlannerContext.h>
 #include <Planner/PlannerActionsVisitor.h>
@@ -71,7 +74,6 @@
 #include <Planner/PlannerAggregation.h>
 #include <Planner/PlannerSorting.h>
 #include <Planner/PlannerWindowFunctions.h>
-#include <Planner/ActionsChain.h>
 #include <Planner/CollectSets.h>
 #include <Planner/CollectTableExpressionData.h>
 #include <Planner/PlannerJoinTree.h>
@@ -98,14 +100,6 @@ namespace ErrorCodes
     extern const int SUPPORT_IS_DISABLED;
 }
 
-/** ClickHouse query planner.
-  *
-  * TODO: Support projections.
-  * TODO: Support trivial count using partition predicates.
-  * TODO: Support trivial count for table functions.
-  * TODO: Support indexes for IN function.
-  */
-
 namespace
 {
 
@@ -143,6 +137,7 @@ void checkStoragesSupportTransactions(const PlannerContextPtr & planner_context)
   *
   * StorageDistributed skip unused shards optimization relies on this.
   * Parallel replicas estimation relies on this too.
+  * StorageMerge common header calculation relies on this too.
   *
   * To collect filters that will be applied to specific table in case we have JOINs requires
   * to run query plan optimization pipeline.
@@ -153,16 +148,16 @@ void checkStoragesSupportTransactions(const PlannerContextPtr & planner_context)
   * 3. Optimize query plan.
   * 4. Extract filters from ReadFromDummy query plan steps from query plan leaf nodes.
   */
-void collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const PlannerContextPtr & planner_context)
+
+FiltersForTableExpressionMap collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const QueryTreeNodes & table_nodes, const ContextPtr & query_context)
 {
     bool collect_filters = false;
-    const auto & query_context = planner_context->getQueryContext();
     const auto & settings = query_context->getSettingsRef();
 
     bool parallel_replicas_estimation_enabled
         = query_context->canUseParallelReplicasOnInitiator() && settings.parallel_replicas_min_number_of_rows_per_replica > 0;
 
-    for (auto & [table_expression, table_expression_data] : planner_context->getTableExpressionNodeToData())
+    for (const auto & table_expression : table_nodes)
     {
         auto * table_node = table_expression->as<TableNode>();
         auto * table_function_node = table_expression->as<TableFunctionNode>();
@@ -170,7 +165,7 @@ void collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const Planne
             continue;
 
         const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
-        if (typeid_cast<const StorageDistributed *>(storage.get())
+        if (typeid_cast<const StorageDistributed *>(storage.get()) || typeid_cast<const StorageMerge *>(storage.get())
             || (parallel_replicas_estimation_enabled && std::dynamic_pointer_cast<MergeTreeData>(storage)))
         {
             collect_filters = true;
@@ -179,18 +174,18 @@ void collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const Planne
     }
 
     if (!collect_filters)
-        return;
+        return {};
 
     ResultReplacementMap replacement_map;
-    auto updated_query_tree = replaceTableExpressionsWithDummyTables(query_tree, planner_context->getQueryContext(), &replacement_map);
 
-    std::unordered_map<const IStorage *, TableExpressionData *> dummy_storage_to_table_expression_data;
+    auto updated_query_tree = replaceTableExpressionsWithDummyTables(query_tree, table_nodes, query_context, &replacement_map);
+
+    std::unordered_map<const IStorage *, QueryTreeNodePtr> dummy_storage_to_table;
 
     for (auto & [from_table_expression, dummy_table_expression] : replacement_map)
     {
         auto * dummy_storage = dummy_table_expression->as<TableNode &>().getStorage().get();
-        auto * table_expression_data = &planner_context->getTableExpressionDataOrThrow(from_table_expression);
-        dummy_storage_to_table_expression_data.emplace(dummy_storage, table_expression_data);
+        dummy_storage_to_table.emplace(dummy_storage, from_table_expression);
     }
 
     SelectQueryOptions select_query_options;
@@ -202,6 +197,8 @@ void collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const Planne
     auto optimization_settings = QueryPlanOptimizationSettings::fromContext(query_context);
     result_query_plan.optimize(optimization_settings);
 
+    FiltersForTableExpressionMap res;
+
     std::vector<QueryPlan::Node *> nodes_to_process;
     nodes_to_process.push_back(result_query_plan.getRootNode());
 
@@ -215,10 +212,33 @@ void collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree, const Planne
         if (!read_from_dummy)
             continue;
 
-        auto filter_actions = ActionsDAG::buildFilterActionsDAG(read_from_dummy->getFilterNodes().nodes, {}, query_context);
-        auto & table_expression_data = dummy_storage_to_table_expression_data.at(&read_from_dummy->getStorage());
-        table_expression_data->setFilterActions(std::move(filter_actions));
+        auto filter_actions = read_from_dummy->getFilterActionsDAG();
+        const auto & table_node = dummy_storage_to_table.at(&read_from_dummy->getStorage());
+        res[table_node] = FiltersForTableExpression{std::move(filter_actions), read_from_dummy->getPrewhereInfo()};
     }
+
+    return res;
+}
+
+FiltersForTableExpressionMap collectFiltersForAnalysis(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options)
+{
+    if (select_query_options.only_analyze)
+        return {};
+
+    auto * query_node = query_tree_node->as<QueryNode>();
+    auto * union_node = query_tree_node->as<UnionNode>();
+
+    if (!query_node && !union_node)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Expected QUERY or UNION node. Actual {}",
+            query_tree_node->formatASTForErrorMessage());
+
+    auto context = query_node ? query_node->getContext() : union_node->getContext();
+
+    auto table_expressions_nodes
+        = extractTableExpressions(query_tree_node, false /* add_array_join */, true /* recursive */);
+
+    return collectFiltersForAnalysis(query_tree_node, table_expressions_nodes, context);
 }
 
 /// Extend lifetime of query context, storages, and table locks
@@ -257,8 +277,9 @@ public:
             && !query_node.isGroupByWithTotals() && !query_node.isGroupByWithRollup() && !query_node.isGroupByWithCube();
         aggregation_with_rollup_or_cube_or_grouping_sets = query_node.isGroupByWithRollup() || query_node.isGroupByWithCube() ||
             query_node.isGroupByWithGroupingSets();
-        aggregation_should_produce_results_in_order_of_bucket_number = query_processing_info.getToStage() == QueryProcessingStage::WithMergeableState &&
-            settings.distributed_aggregation_memory_efficient;
+        aggregation_should_produce_results_in_order_of_bucket_number
+            = query_processing_info.getToStage() == QueryProcessingStage::WithMergeableState
+            && (settings.distributed_aggregation_memory_efficient || settings.enable_memory_bound_merging_of_aggregation_results);
 
         query_has_array_join_in_join_tree = queryHasArrayJoinInJoinTree(query_tree);
         query_has_with_totals_in_any_subquery_in_join_tree = queryHasWithTotalsInAnySubqueryInJoinTree(query_tree);
@@ -1009,9 +1030,12 @@ void addExtremesStepIfNeeded(QueryPlan & query_plan, const PlannerContextPtr & p
 
 void addOffsetStep(QueryPlan & query_plan, const QueryAnalysisResult & query_analysis_result)
 {
-    UInt64 limit_offset = query_analysis_result.limit_offset;
-    auto offsets_step = std::make_unique<OffsetStep>(query_plan.getCurrentDataStream(), limit_offset);
-    query_plan.addStep(std::move(offsets_step));
+    /// If there is not a LIMIT but an offset
+    if (!query_analysis_result.limit_length && query_analysis_result.limit_offset)
+    {
+        auto offsets_step = std::make_unique<OffsetStep>(query_plan.getCurrentDataStream(), query_analysis_result.limit_offset);
+        query_plan.addStep(std::move(offsets_step));
+    }
 }
 
 void collectSetsFromActionsDAG(const ActionsDAGPtr & dag, std::unordered_set<const FutureSet *> & useful_sets)
@@ -1062,10 +1086,15 @@ void addBuildSubqueriesForSetsStepIfNeeded(
     {
         auto query_tree = subquery->detachQueryTree();
         auto subquery_options = select_query_options.subquery();
+        /// I don't know if this is a good decision,
+        /// But for now it is done in the same way as in old analyzer.
+        /// This would not ignore limits for subqueries (affects mutations only).
+        /// See test_build_sets_from_multiple_threads-analyzer.
+        subquery_options.ignore_limits = false;
         Planner subquery_planner(
             query_tree,
             subquery_options,
-            std::make_shared<GlobalPlannerContext>()); //planner_context->getGlobalPlannerContext());
+            std::make_shared<GlobalPlannerContext>(nullptr, nullptr, FiltersForTableExpressionMap{}));
         subquery_planner.buildQueryPlanIfNeeded();
 
         subquery->setQueryPlan(std::make_unique<QueryPlan>(std::move(subquery_planner).extractQueryPlan()));
@@ -1161,14 +1190,18 @@ PlannerContextPtr buildPlannerContext(const QueryTreeNodePtr & query_tree_node,
     if (select_query_options.is_subquery)
         updateContextForSubqueryExecution(mutable_context);
 
-    return std::make_shared<PlannerContext>(mutable_context, std::move(global_planner_context));
+    return std::make_shared<PlannerContext>(mutable_context, std::move(global_planner_context), select_query_options);
 }
 
 Planner::Planner(const QueryTreeNodePtr & query_tree_,
     SelectQueryOptions & select_query_options_)
     : query_tree(query_tree_)
     , select_query_options(select_query_options_)
-    , planner_context(buildPlannerContext(query_tree, select_query_options, std::make_shared<GlobalPlannerContext>()))
+    , planner_context(buildPlannerContext(query_tree, select_query_options,
+        std::make_shared<GlobalPlannerContext>(
+            findQueryForParallelReplicas(query_tree, select_query_options),
+            findTableForParallelReplicas(query_tree, select_query_options),
+            collectFiltersForAnalysis(query_tree, select_query_options))))
 {
 }
 
@@ -1195,7 +1228,7 @@ void Planner::buildQueryPlanIfNeeded()
     if (query_plan.isInitialized())
         return;
 
-    LOG_TRACE(&Poco::Logger::get("Planner"), "Query {} to stage {}{}",
+    LOG_TRACE(getLogger("Planner"), "Query {} to stage {}{}",
         query_tree->formatConvertedASTForErrorMessage(),
         QueryProcessingStage::toString(select_query_options.to_stage),
         select_query_options.only_analyze ? " only analyze" : "");
@@ -1231,6 +1264,8 @@ void Planner::buildPlanForUnionNode()
         query_planner.buildQueryPlanIfNeeded();
         for (const auto & row_policy : query_planner.getUsedRowPolicies())
             used_row_policies.insert(row_policy);
+        const auto & mapping = query_planner.getQueryNodeToPlanStepMapping();
+        query_node_to_plan_step_mapping.insert(mapping.begin(), mapping.end());
         auto query_node_plan = std::make_unique<QueryPlan>(std::move(query_planner).extractQueryPlan());
         query_plans_headers.push_back(query_node_plan->getCurrentDataStream().header);
         query_plans.push_back(std::move(query_node_plan));
@@ -1347,22 +1382,34 @@ void Planner::buildPlanForQueryNode()
     const auto & settings = query_context->getSettingsRef();
     if (query_context->canUseTaskBasedParallelReplicas())
     {
-        if (planner_context->getPreparedSets().hasSubqueries())
+        if (!settings.parallel_replicas_allow_in_with_subquery && planner_context->getPreparedSets().hasSubqueries())
         {
-            if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+            if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
                 throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "IN with subquery is not supported with parallel replicas");
 
             auto & mutable_context = planner_context->getMutableQueryContext();
             mutable_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-            LOG_DEBUG(&Poco::Logger::get("Planner"), "Disabling parallel replicas to execute a query with IN with subquery");
+            LOG_DEBUG(getLogger("Planner"), "Disabling parallel replicas to execute a query with IN with subquery");
         }
     }
 
     collectTableExpressionData(query_tree, planner_context);
     checkStoragesSupportTransactions(planner_context);
 
-    if (!select_query_options.only_analyze)
-        collectFiltersForAnalysis(query_tree, planner_context);
+    const auto & table_filters = planner_context->getGlobalPlannerContext()->filters_for_table_expressions;
+    if (!select_query_options.only_analyze && !table_filters.empty()) // && top_level)
+    {
+        for (auto & [table_node, table_expression_data] : planner_context->getTableExpressionNodeToData())
+        {
+            auto it = table_filters.find(table_node);
+            if (it != table_filters.end())
+            {
+                const auto & filters = it->second;
+                table_expression_data.setFilterActions(filters.filter_actions);
+                table_expression_data.setPrewhereInfo(filters.prewhere_info);
+            }
+        }
+    }
 
     if (query_context->canUseTaskBasedParallelReplicas())
     {
@@ -1376,12 +1423,12 @@ void Planner::buildPlanForQueryNode()
             const auto & modifiers = table_node->getTableExpressionModifiers();
             if (modifiers.has_value() && modifiers->hasFinal())
             {
-                if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+                if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
                     throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "FINAL modifier is not supported with parallel replicas");
                 else
                 {
                     LOG_DEBUG(
-                        &Poco::Logger::get("Planner"),
+                        getLogger("Planner"),
                         "FINAL modifier is not supported with parallel replicas. Query will be executed without using them.");
                     auto & mutable_context = planner_context->getMutableQueryContext();
                     mutable_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
@@ -1390,17 +1437,17 @@ void Planner::buildPlanForQueryNode()
         }
     }
 
-    if (query_context->canUseTaskBasedParallelReplicas() || !settings.parallel_replicas_custom_key.value.empty())
+    if (!settings.parallel_replicas_custom_key.value.empty())
     {
         /// Check support for JOIN for parallel replicas with custom key
         if (planner_context->getTableExpressionNodeToData().size() > 1)
         {
-            if (settings.allow_experimental_parallel_reading_from_replicas == 2)
+            if (settings.allow_experimental_parallel_reading_from_replicas >= 2)
                 throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "JOINs are not supported with parallel replicas");
             else
             {
                 LOG_DEBUG(
-                    &Poco::Logger::get("Planner"),
+                    getLogger("Planner"),
                     "JOINs are not supported with parallel replicas. Query will be executed without using them.");
 
                 auto & mutable_context = planner_context->getMutableQueryContext();
@@ -1410,18 +1457,29 @@ void Planner::buildPlanForQueryNode()
         }
     }
 
-    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);
+    JoinTreeQueryPlan join_tree_query_plan;
+    if (planner_context->getMutableQueryContext()->canUseTaskBasedParallelReplicas()
+        && planner_context->getGlobalPlannerContext()->parallel_replicas_node == &query_node)
+    {
+        join_tree_query_plan = buildQueryPlanForParallelReplicas(query_node, planner_context, select_query_info.storage_limits);
+    }
+    else
+    {
+        auto top_level_identifiers = collectTopLevelColumnIdentifiers(query_tree, planner_context);
+        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);
     used_row_policies = std::move(join_tree_query_plan.used_row_policies);
+    auto & mapping = join_tree_query_plan.query_node_to_plan_step_mapping;
+    query_node_to_plan_step_mapping.insert(mapping.begin(), mapping.end());
 
-    LOG_TRACE(&Poco::Logger::get("Planner"), "Query {} from stage {} to stage {}{}",
+    LOG_TRACE(getLogger("Planner"), "Query {} from stage {} to stage {}{}",
         query_tree->formatConvertedASTForErrorMessage(),
         QueryProcessingStage::toString(from_stage),
         QueryProcessingStage::toString(select_query_options.to_stage),
@@ -1689,6 +1747,8 @@ void Planner::buildPlanForQueryNode()
 
     if (!select_query_options.only_analyze)
         addBuildSubqueriesForSetsStepIfNeeded(query_plan, select_query_options, planner_context, result_actions_to_execute);
+
+    query_node_to_plan_step_mapping[&query_node] = query_plan.getRootNode();
 }
 
 SelectQueryInfo Planner::buildSelectQueryInfo() const
diff --git a/src/Planner/Planner.h b/src/Planner/Planner.h
index 2177ed59fc6..ae78f05cbd4 100644
--- a/src/Planner/Planner.h
+++ b/src/Planner/Planner.h
@@ -65,6 +65,11 @@ public:
         return planner_context;
     }
 
+    /// We support mapping QueryNode -> QueryPlanStep (the last step added to plan from this query)
+    /// It is useful for parallel replicas analysis.
+    using QueryNodeToPlanStepMapping = std::unordered_map<const QueryNode *, const QueryPlan::Node *>;
+    const QueryNodeToPlanStepMapping & getQueryNodeToPlanStepMapping() const { return query_node_to_plan_step_mapping; }
+
 private:
     void buildPlanForUnionNode();
 
@@ -76,6 +81,7 @@ private:
     QueryPlan query_plan;
     StorageLimitsList storage_limits;
     std::set<std::string> used_row_policies;
+    QueryNodeToPlanStepMapping query_node_to_plan_step_mapping;
 };
 
 }
diff --git a/src/Planner/PlannerActionsVisitor.cpp b/src/Planner/PlannerActionsVisitor.cpp
index aef6f11aa26..656b6cdaa6e 100644
--- a/src/Planner/PlannerActionsVisitor.cpp
+++ b/src/Planner/PlannerActionsVisitor.cpp
@@ -44,6 +44,27 @@ namespace ErrorCodes
 namespace
 {
 
+/* Calculates Action node name for ConstantNode.
+ *
+ * If converting to AST will add a '_CAST' function call,
+ * the result action name will also include it.
+ */
+String calculateActionNodeNameWithCastIfNeeded(const ConstantNode & constant_node)
+{
+    WriteBufferFromOwnString buffer;
+    if (constant_node.requiresCastCall())
+        buffer << "_CAST(";
+
+    buffer << calculateConstantActionNodeName(constant_node.getValue(), constant_node.getResultType());
+
+    if (constant_node.requiresCastCall())
+    {
+        buffer << ", '" << constant_node.getResultType()->getName() << "'_String)";
+    }
+
+    return buffer.str();
+}
+
 class ActionNodeNameHelper
 {
 public:
@@ -88,19 +109,67 @@ public:
             case QueryTreeNodeType::CONSTANT:
             {
                 const auto & constant_node = node->as<ConstantNode &>();
-                result = calculateConstantActionNodeName(constant_node.getValue(), constant_node.getResultType());
+                /* To ensure that headers match during distributed query we need to simulate action node naming on
+                * secondary servers. If we don't do that headers will mismatch due to constant folding.
+                *
+                *                                +--------+
+                *               -----------------| Server |----------------
+                *              /                 +--------+                \
+                *             /                                             \
+                *            v                                               v
+                *      +-----------+                                   +-----------+
+                *      | Initiator |                            ------ | Secondary |------
+                *      +-----------+                           /       +-----------+      \
+                *            |                                /                            \
+                *            |                               /                              \
+                *            v                              /                                \
+                *    +---------------+                     v                                  v
+                *    | Wrap in _CAST |      +----------------------------+        +----------------------+
+                *    | if needed     |      | Constant folded from _CAST |        | Constant folded from |
+                *    +---------------+      +----------------------------+        | another expression   |
+                *                                          |                      +----------------------+
+                *                                          v                                  |
+                *                           +----------------------------+                    v
+                *                           | Name ConstantNode the same |      +--------------------------+
+                *                           | as on initiator server     |      | Generate action name for |
+                *                           | (wrap in _CAST if needed)  |      | original expression      |
+                *                           +----------------------------+      +--------------------------+
+                */
+                if (planner_context.isASTLevelOptimizationAllowed())
+                {
+                    result = calculateActionNodeNameWithCastIfNeeded(constant_node);
+                }
+                else
+                {
+                    // Need to check if constant folded from QueryNode until https://github.com/ClickHouse/ClickHouse/issues/60847 is fixed.
+                    if (constant_node.hasSourceExpression() && constant_node.getSourceExpression()->getNodeType() != QueryTreeNodeType::QUERY)
+                    {
+                        if (constant_node.receivedFromInitiatorServer())
+                            result = calculateActionNodeNameWithCastIfNeeded(constant_node);
+                        else
+                            result = calculateActionNodeName(constant_node.getSourceExpression());
+                    }
+                    else
+                        result = calculateConstantActionNodeName(constant_node.getValue(), constant_node.getResultType());
+                }
                 break;
             }
             case QueryTreeNodeType::FUNCTION:
             {
                 const auto & function_node = node->as<FunctionNode &>();
+                if (function_node.getFunctionName() == "__actionName")
+                {
+                    result = toString(function_node.getArguments().getNodes().at(1)->as<ConstantNode>()->getValue());
+                    break;
+                }
+
                 String in_function_second_argument_node_name;
 
                 if (isNameOfInFunction(function_node.getFunctionName()))
                 {
                     const auto & in_first_argument_node = function_node.getArguments().getNodes().at(0);
                     const auto & in_second_argument_node = function_node.getArguments().getNodes().at(1);
-                    in_function_second_argument_node_name = planner_context.createSetKey(in_first_argument_node->getResultType(), in_second_argument_node);
+                    in_function_second_argument_node_name = PlannerContext::createSetKey(in_first_argument_node->getResultType(), in_second_argument_node);
                 }
 
                 WriteBufferFromOwnString buffer;
@@ -451,6 +520,7 @@ private:
     std::unordered_map<QueryTreeNodePtr, std::string> node_to_node_name;
     const PlannerContextPtr planner_context;
     ActionNodeNameHelper action_node_name_helper;
+    bool use_column_identifier_as_action_node_name;
 };
 
 PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag,
@@ -458,6 +528,7 @@ PlannerActionsVisitorImpl::PlannerActionsVisitorImpl(ActionsDAGPtr actions_dag,
     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_)
+    , use_column_identifier_as_action_node_name(use_column_identifier_as_action_node_name_)
 {
     actions_stack.emplace_back(std::move(actions_dag), nullptr);
 }
@@ -495,15 +566,16 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
         return visitFunction(node);
 
     throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
-        "Expected column, constant, function. Actual {}",
-        node->formatASTForErrorMessage());
+        "Expected column, constant, function. Actual {} with type: {}",
+        node->formatASTForErrorMessage(), node_type);
 }
 
 PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::visitColumn(const QueryTreeNodePtr & node)
 {
     auto column_node_name = action_node_name_helper.calculateActionNodeName(node);
     const auto & column_node = node->as<ColumnNode &>();
-
+    if (column_node.hasExpression() && !use_column_identifier_as_action_node_name)
+        return visitImpl(column_node.getExpression());
     Int64 actions_stack_size = static_cast<Int64>(actions_stack.size() - 1);
     for (Int64 i = actions_stack_size; i >= 0; --i)
     {
@@ -527,7 +599,52 @@ PlannerActionsVisitorImpl::NodeNameAndNodeMinLevel PlannerActionsVisitorImpl::vi
     const auto & constant_literal = constant_node.getValue();
     const auto & constant_type = constant_node.getResultType();
 
-    auto constant_node_name = calculateConstantActionNodeName(constant_literal, constant_type);
+    auto constant_node_name = [&]()
+    {
+        /* To ensure that headers match during distributed query we need to simulate action node naming on
+         * secondary servers. If we don't do that headers will mismatch due to constant folding.
+         *
+         *                                +--------+
+         *               -----------------| Server |----------------
+         *              /                 +--------+                \
+         *             /                                             \
+         *            v                                               v
+         *      +-----------+                                   +-----------+
+         *      | Initiator |                            ------ | Secondary |------
+         *      +-----------+                           /       +-----------+      \
+         *            |                                /                            \
+         *            |                               /                              \
+         *            v                              /                                \
+         *    +---------------+                     v                                  v
+         *    | Wrap in _CAST |      +----------------------------+        +----------------------+
+         *    | if needed     |      | Constant folded from _CAST |        | Constant folded from |
+         *    +---------------+      +----------------------------+        | another expression   |
+         *                                          |                      +----------------------+
+         *                                          v                                  |
+         *                           +----------------------------+                    v
+         *                           | Name ConstantNode the same |      +--------------------------+
+         *                           | as on initiator server     |      | Generate action name for |
+         *                           | (wrap in _CAST if needed)  |      | original expression      |
+         *                           +----------------------------+      +--------------------------+
+         */
+        if (planner_context->isASTLevelOptimizationAllowed())
+        {
+            return calculateActionNodeNameWithCastIfNeeded(constant_node);
+        }
+        else
+        {
+            // Need to check if constant folded from QueryNode until https://github.com/ClickHouse/ClickHouse/issues/60847 is fixed.
+            if (constant_node.hasSourceExpression() && constant_node.getSourceExpression()->getNodeType() != QueryTreeNodeType::QUERY)
+            {
+                if (constant_node.receivedFromInitiatorServer())
+                    return calculateActionNodeNameWithCastIfNeeded(constant_node);
+                else
+                    return action_node_name_helper.calculateActionNodeName(constant_node.getSourceExpression());
+            }
+            else
+                return calculateConstantActionNodeName(constant_literal, constant_type);
+        }
+    }();
 
     ColumnWithTypeAndName column;
     column.name = constant_node_name;
diff --git a/src/Planner/PlannerContext.cpp b/src/Planner/PlannerContext.cpp
index 422c8c1d01f..c9187e6aa2a 100644
--- a/src/Planner/PlannerContext.cpp
+++ b/src/Planner/PlannerContext.cpp
@@ -3,6 +3,7 @@
 #include <Analyzer/TableNode.h>
 #include <Analyzer/ColumnNode.h>
 #include <Analyzer/ConstantNode.h>
+#include <Interpreters/Context.h>
 
 namespace DB
 {
@@ -31,6 +32,9 @@ const ColumnIdentifier & GlobalPlannerContext::createColumnIdentifier(const Name
         column_identifier = column.name;
 
     auto [it, inserted] = column_identifiers.emplace(column_identifier);
+    if (!inserted)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Column identifier {} is already registered", column_identifier);
+
     assert(inserted);
 
     return *it;
@@ -41,9 +45,16 @@ bool GlobalPlannerContext::hasColumnIdentifier(const ColumnIdentifier & column_i
     return column_identifiers.contains(column_identifier);
 }
 
-PlannerContext::PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_)
+PlannerContext::PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_, const SelectQueryOptions & select_query_options_)
     : query_context(std::move(query_context_))
     , global_planner_context(std::move(global_planner_context_))
+    , is_ast_level_optimization_allowed(!(query_context->getClientInfo().query_kind == ClientInfo::QueryKind::SECONDARY_QUERY || select_query_options_.ignore_ast_optimizations))
+{}
+
+PlannerContext::PlannerContext(ContextMutablePtr query_context_, PlannerContextPtr planner_context_)
+    : query_context(std::move(query_context_))
+    , global_planner_context(planner_context_->global_planner_context)
+    , is_ast_level_optimization_allowed(planner_context_->is_ast_level_optimization_allowed)
 {}
 
 TableExpressionData & PlannerContext::getOrCreateTableExpressionData(const QueryTreeNodePtr & table_expression_node)
diff --git a/src/Planner/PlannerContext.h b/src/Planner/PlannerContext.h
index d7ea4fd95dd..418240fa34e 100644
--- a/src/Planner/PlannerContext.h
+++ b/src/Planner/PlannerContext.h
@@ -10,6 +10,7 @@
 #include <Analyzer/IQueryTreeNode.h>
 
 #include <Planner/TableExpressionData.h>
+#include <Interpreters/SelectQueryOptions.h>
 
 namespace DB
 {
@@ -18,10 +19,31 @@ namespace DB
   *
   * 1. Column identifiers.
   */
+
+class QueryNode;
+class TableNode;
+
+struct FiltersForTableExpression
+{
+    ActionsDAGPtr filter_actions;
+    PrewhereInfoPtr prewhere_info;
+};
+
+using FiltersForTableExpressionMap = std::map<QueryTreeNodePtr, FiltersForTableExpression>;
+
+
 class GlobalPlannerContext
 {
 public:
-    GlobalPlannerContext() = default;
+    GlobalPlannerContext(
+        const QueryNode * parallel_replicas_node_,
+        const TableNode * parallel_replicas_table_,
+        FiltersForTableExpressionMap filters_for_table_expressions_)
+        : parallel_replicas_node(parallel_replicas_node_)
+        , parallel_replicas_table(parallel_replicas_table_)
+        , filters_for_table_expressions(std::move(filters_for_table_expressions_))
+    {
+    }
 
     /** Create column identifier for column node.
       *
@@ -38,17 +60,32 @@ public:
     /// Check if context has column identifier
     bool hasColumnIdentifier(const ColumnIdentifier & column_identifier);
 
+    /// The query which will be executed with parallel replicas.
+    /// In case if only the most inner subquery can be executed with parallel replicas, node is nullptr.
+    const QueryNode * const parallel_replicas_node = nullptr;
+    /// Table which is used with parallel replicas reading. Now, only one table is supported by the protocol.
+    /// It is the left-most table of the query (in JOINs, UNIONs and subqueries).
+    const TableNode * const parallel_replicas_table = nullptr;
+
+    const FiltersForTableExpressionMap filters_for_table_expressions;
+
 private:
     std::unordered_set<ColumnIdentifier> column_identifiers;
 };
 
 using GlobalPlannerContextPtr = std::shared_ptr<GlobalPlannerContext>;
 
+class PlannerContext;
+using PlannerContextPtr = std::shared_ptr<PlannerContext>;
+
 class PlannerContext
 {
 public:
     /// Create planner context with query context and global planner context
-    PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_);
+    PlannerContext(ContextMutablePtr query_context_, GlobalPlannerContextPtr global_planner_context_, const SelectQueryOptions & select_query_options_);
+
+    /// Create planner with modified query_context
+    PlannerContext(ContextMutablePtr query_context_, PlannerContextPtr planner_context_);
 
     /// Get planner context query context
     ContextPtr getQueryContext() const
@@ -135,6 +172,12 @@ public:
     static SetKey createSetKey(const DataTypePtr & left_operand_type, const QueryTreeNodePtr & set_source_node);
 
     PreparedSets & getPreparedSets() { return prepared_sets; }
+
+    /// Returns false if any of following conditions met:
+    /// 1. Query is executed on a follower node.
+    /// 2. ignore_ast_optimizations is set.
+    bool isASTLevelOptimizationAllowed() const { return is_ast_level_optimization_allowed; }
+
 private:
     /// Query context
     ContextMutablePtr query_context;
@@ -142,6 +185,8 @@ private:
     /// Global planner context
     GlobalPlannerContextPtr global_planner_context;
 
+    bool is_ast_level_optimization_allowed;
+
     /// Column node to column identifier
     std::unordered_map<QueryTreeNodePtr, ColumnIdentifier> column_node_to_column_identifier;
 
@@ -152,6 +197,4 @@ private:
     PreparedSets prepared_sets;
 };
 
-using PlannerContextPtr = std::shared_ptr<PlannerContext>;
-
 }
diff --git a/src/Planner/PlannerExpressionAnalysis.cpp b/src/Planner/PlannerExpressionAnalysis.cpp
index 52001eb27c5..dd3769ee10b 100644
--- a/src/Planner/PlannerExpressionAnalysis.cpp
+++ b/src/Planner/PlannerExpressionAnalysis.cpp
@@ -1,8 +1,12 @@
 #include <Planner/PlannerExpressionAnalysis.h>
 
+#include <Columns/ColumnNullable.h>
+
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeNullable.h>
 
+#include <Interpreters/Context.h>
+
 #include <Analyzer/FunctionNode.h>
 #include <Analyzer/ConstantNode.h>
 #include <Analyzer/WindowNode.h>
@@ -109,7 +113,8 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
                             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);
+                        auto column_after_aggregation = group_by_use_nulls && expression_dag_node->column != nullptr ? makeNullableSafe(expression_dag_node->column) : expression_dag_node->column;
+                        available_columns_after_aggregation.emplace_back(std::move(column_after_aggregation), 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);
@@ -159,7 +164,8 @@ std::optional<AggregationAnalysisResult> analyzeAggregation(const QueryTreeNodeP
                         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);
+                    auto column_after_aggregation = group_by_use_nulls && expression_dag_node->column != nullptr ? makeNullableSafe(expression_dag_node->column) : expression_dag_node->column;
+                    available_columns_after_aggregation.emplace_back(std::move(column_after_aggregation), 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);
diff --git a/src/Planner/PlannerJoinTree.cpp b/src/Planner/PlannerJoinTree.cpp
index 552f25d7035..ba4f9718107 100644
--- a/src/Planner/PlannerJoinTree.cpp
+++ b/src/Planner/PlannerJoinTree.cpp
@@ -51,6 +51,7 @@
 
 #include <Interpreters/ArrayJoinAction.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/HashJoin.h>
 #include <Interpreters/IJoin.h>
 #include <Interpreters/TableJoin.h>
@@ -84,32 +85,38 @@ namespace
 {
 
 /// Check if current user has privileges to SELECT columns from table
-void checkAccessRights(const TableNode & table_node, const Names & column_names, const ContextPtr & query_context)
+/// Throws an exception if access to any column from `column_names` is not granted
+/// If `column_names` is empty, check access to any columns and return names of accessible columns
+NameSet checkAccessRights(const TableNode & table_node, const Names & column_names, const ContextPtr & query_context)
 {
     /// StorageDummy is created on preliminary stage, ignore access check for it.
     if (typeid_cast<const StorageDummy *>(table_node.getStorage().get()))
-        return;
+        return {};
 
     const auto & storage_id = table_node.getStorageID();
     const auto & storage_snapshot = table_node.getStorageSnapshot();
 
     if (column_names.empty())
     {
+        NameSet accessible_columns;
         /** For a trivial queries like "SELECT count() FROM table", "SELECT 1 FROM table" access is granted if at least
           * one table column is accessible.
           */
         auto access = query_context->getAccess();
-
         for (const auto & column : storage_snapshot->metadata->getColumns())
         {
             if (access->isGranted(AccessType::SELECT, storage_id.database_name, storage_id.table_name, column.name))
-                return;
+                accessible_columns.insert(column.name);
         }
 
-        throw Exception(ErrorCodes::ACCESS_DENIED,
-            "{}: Not enough privileges. To execute this query, it's necessary to have the grant SELECT for at least one column on {}",
-            query_context->getUserName(),
-            storage_id.getFullTableName());
+        if (accessible_columns.empty())
+        {
+            throw Exception(ErrorCodes::ACCESS_DENIED,
+                "{}: Not enough privileges. To execute this query, it's necessary to have the grant SELECT for at least one column on {}",
+                query_context->getUserName(),
+                storage_id.getFullTableName());
+        }
+        return accessible_columns;
     }
 
     // In case of cross-replication we don't know what database is used for the table.
@@ -117,6 +124,8 @@ void checkAccessRights(const TableNode & table_node, const Names & column_names,
     // Each shard will use the default database (in the case of cross-replication shards may have different defaults).
     if (storage_id.hasDatabase())
         query_context->checkAccess(AccessType::SELECT, storage_id, column_names);
+
+    return {};
 }
 
 bool shouldIgnoreQuotaAndLimits(const TableNode & table_node)
@@ -133,7 +142,7 @@ bool shouldIgnoreQuotaAndLimits(const TableNode & table_node)
     return false;
 }
 
-NameAndTypePair chooseSmallestColumnToReadFromStorage(const StoragePtr & storage, const StorageSnapshotPtr & storage_snapshot)
+NameAndTypePair chooseSmallestColumnToReadFromStorage(const StoragePtr & storage, const StorageSnapshotPtr & storage_snapshot, const NameSet & column_names_allowed_to_select)
 {
     /** We need to read at least one column to find the number of rows.
       * We will find a column with minimum <compressed_size, type_size, uncompressed_size>.
@@ -167,6 +176,18 @@ NameAndTypePair chooseSmallestColumnToReadFromStorage(const StoragePtr & storage
     auto column_sizes = storage->getColumnSizes();
     auto column_names_and_types = storage_snapshot->getColumns(GetColumnsOptions(GetColumnsOptions::AllPhysical).withSubcolumns());
 
+    if (!column_names_allowed_to_select.empty())
+    {
+        auto it = column_names_and_types.begin();
+        while (it != column_names_and_types.end())
+        {
+            if (!column_names_allowed_to_select.contains(it->name))
+                it = column_names_and_types.erase(it);
+            else
+                ++it;
+        }
+    }
+
     if (!column_sizes.empty())
     {
         for (auto & column_name_and_type : column_names_and_types)
@@ -204,7 +225,8 @@ bool applyTrivialCountIfPossible(
         return false;
 
     const auto & storage = table_node ? table_node->getStorage() : table_function_node->getStorage();
-    if (!storage->supportsTrivialCountOptimization())
+    if (!storage->supportsTrivialCountOptimization(
+            table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot(), query_context))
         return false;
 
     auto storage_id = storage->getStorageID();
@@ -241,9 +263,6 @@ bool applyTrivialCountIfPossible(
     if (main_query_node.hasGroupBy() || main_query_node.hasPrewhere() || main_query_node.hasWhere())
         return false;
 
-    if (storage->hasLightweightDeletedMask())
-        return false;
-
     if (settings.allow_experimental_query_deduplication
         || settings.empty_result_for_aggregation_by_empty_set)
         return false;
@@ -275,8 +294,8 @@ bool applyTrivialCountIfPossible(
 
         /// The query could use trivial count if it didn't use parallel replicas, so let's disable it
         query_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
-        query_context->setSetting("max_parallel_replicas", UInt64{0});
-        LOG_TRACE(&Poco::Logger::get("Planner"), "Disabling parallel replicas to be able to use a trivial count optimization");
+        query_context->setSetting("max_parallel_replicas", UInt64{1});
+        LOG_TRACE(getLogger("Planner"), "Disabling parallel replicas to be able to use a trivial count optimization");
 
     }
 
@@ -286,7 +305,7 @@ bool applyTrivialCountIfPossible(
     AggregateDataPtr place = state.data();
     agg_count.create(place);
     SCOPE_EXIT_MEMORY_SAFE(agg_count.destroy(place));
-    agg_count.set(place, num_rows.value());
+    AggregateFunctionCount::set(place, num_rows.value());
 
     auto column = ColumnAggregateFunction::create(function_node.getAggregateFunction());
     column->insertFrom(place);
@@ -330,12 +349,11 @@ void prepareBuildQueryPlanForTableExpression(const QueryTreeNodePtr & table_expr
     /** 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().
       */
+    NameSet columns_names_allowed_to_select;
     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);
+        const auto & column_names_with_aliases = table_expression_data.getSelectedColumnsNames();
+        columns_names_allowed_to_select = checkAccessRights(*table_node, column_names_with_aliases, query_context);
     }
 
     if (columns_names.empty())
@@ -346,8 +364,7 @@ void prepareBuildQueryPlanForTableExpression(const QueryTreeNodePtr & table_expr
         {
             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);
-
+            additional_column_to_read = chooseSmallestColumnToReadFromStorage(storage, storage_snapshot, columns_names_allowed_to_select);
         }
         else if (query_node || union_node)
         {
@@ -478,7 +495,7 @@ FilterDAGInfo buildCustomKeyFilterIfNeeded(const StoragePtr & storage,
                 "(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);
+    LOG_TRACE(getLogger("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,
@@ -520,7 +537,7 @@ FilterDAGInfo buildAdditionalFiltersIfNeeded(const StoragePtr & storage,
             ParserExpression parser;
             additional_filter_ast = parseQuery(
                 parser, filter.data(), filter.data() + filter.size(),
-                "additional filter", settings.max_query_size, settings.max_parser_depth);
+                "additional filter", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
             break;
         }
     }
@@ -567,6 +584,28 @@ UInt64 mainQueryNodeBlockSizeByLimit(const SelectQueryInfo & select_query_info)
     return 0;
 }
 
+std::unique_ptr<ExpressionStep> createComputeAliasColumnsStep(
+    const std::unordered_map<std::string, ActionsDAGPtr> & alias_column_expressions, const DataStream & current_data_stream)
+{
+    ActionsDAGPtr merged_alias_columns_actions_dag = std::make_shared<ActionsDAG>(current_data_stream.header.getColumnsWithTypeAndName());
+    ActionsDAG::NodeRawConstPtrs action_dag_outputs = merged_alias_columns_actions_dag->getInputs();
+
+    for (const auto & [column_name, alias_column_actions_dag] : alias_column_expressions)
+    {
+        const auto & current_outputs = alias_column_actions_dag->getOutputs();
+        action_dag_outputs.insert(action_dag_outputs.end(), current_outputs.begin(), current_outputs.end());
+        merged_alias_columns_actions_dag->mergeNodes(std::move(*alias_column_actions_dag));
+    }
+
+    for (const auto * output_node : action_dag_outputs)
+        merged_alias_columns_actions_dag->addOrReplaceInOutputs(*output_node);
+    merged_alias_columns_actions_dag->removeUnusedActions(false);
+
+    auto alias_column_step = std::make_unique<ExpressionStep>(current_data_stream, std::move(merged_alias_columns_actions_dag));
+    alias_column_step->setStepDescription("Compute alias columns");
+    return alias_column_step;
+}
+
 JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expression,
     const SelectQueryInfo & select_query_info,
     const SelectQueryOptions & select_query_options,
@@ -593,6 +632,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
     auto * union_node = table_expression->as<UnionNode>();
 
     QueryPlan query_plan;
+    std::unordered_map<const QueryNode *, const QueryPlan::Node *> query_node_to_plan_step_mapping;
     std::set<std::string> used_row_policies;
 
     if (table_node || table_function_node)
@@ -603,6 +643,8 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
         auto table_expression_query_info = select_query_info;
         table_expression_query_info.table_expression = table_expression;
         table_expression_query_info.filter_actions_dag = table_expression_data.getFilterActions();
+        table_expression_query_info.optimized_prewhere_info = table_expression_data.getPrewhereInfo();
+        table_expression_query_info.analyzer_can_use_parallel_replicas_on_follower = table_node == planner_context->getGlobalPlannerContext()->parallel_replicas_table;
 
         size_t max_streams = settings.max_threads;
         size_t max_threads_execute_query = settings.max_threads;
@@ -695,12 +737,16 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
         }
 
         /// Apply trivial_count optimization if possible
-        bool is_trivial_count_applied = !select_query_options.only_analyze &&
-            is_single_table_expression &&
-            (table_node || table_function_node) &&
-            select_query_info.has_aggregates &&
-            settings.additional_table_filters.value.empty() &&
-            applyTrivialCountIfPossible(query_plan, table_expression_query_info, table_node, table_function_node, select_query_info.query_tree, planner_context->getMutableQueryContext(), table_expression_data.getColumnNames());
+        bool is_trivial_count_applied = !select_query_options.only_analyze && is_single_table_expression
+            && (table_node || table_function_node) && select_query_info.has_aggregates && settings.additional_table_filters.value.empty()
+            && applyTrivialCountIfPossible(
+                query_plan,
+                table_expression_query_info,
+                table_node,
+                table_function_node,
+                select_query_info.query_tree,
+                planner_context->getMutableQueryContext(),
+                table_expression_data.getColumnNames());
 
         if (is_trivial_count_applied)
         {
@@ -714,18 +760,15 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 if (storage_merge_tree && query_context->canUseParallelReplicasOnInitiator()
                     && settings.parallel_replicas_min_number_of_rows_per_replica > 0)
                 {
-                    ActionDAGNodes filter_nodes;
-                    if (table_expression_query_info.filter_actions_dag)
-                        filter_nodes.nodes = table_expression_query_info.filter_actions_dag->getOutputs();
-                    UInt64 rows_to_read = storage_merge_tree->estimateNumberOfRowsToRead(
-                        query_context, storage_snapshot, table_expression_query_info, filter_nodes);
+                    UInt64 rows_to_read
+                        = storage_merge_tree->estimateNumberOfRowsToRead(query_context, storage_snapshot, table_expression_query_info);
 
                     if (max_block_size_limited && (max_block_size_limited < rows_to_read))
                         rows_to_read = max_block_size_limited;
 
                     size_t number_of_replicas_to_use = rows_to_read / settings.parallel_replicas_min_number_of_rows_per_replica;
                     LOG_TRACE(
-                        &Poco::Logger::get("Planner"),
+                        getLogger("Planner"),
                         "Estimated {} rows to read. It is enough work for {} parallel replicas",
                         rows_to_read,
                         number_of_replicas_to_use);
@@ -734,25 +777,26 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     {
                         planner_context->getMutableQueryContext()->setSetting(
                             "allow_experimental_parallel_reading_from_replicas", Field(0));
-                        planner_context->getMutableQueryContext()->setSetting("max_parallel_replicas", UInt64{0});
-                        LOG_DEBUG(&Poco::Logger::get("Planner"), "Disabling parallel replicas because there aren't enough rows to read");
+                        planner_context->getMutableQueryContext()->setSetting("max_parallel_replicas", UInt64{1});
+                        LOG_DEBUG(getLogger("Planner"), "Disabling parallel replicas because there aren't enough rows to read");
                     }
                     else if (number_of_replicas_to_use < settings.max_parallel_replicas)
                     {
                         planner_context->getMutableQueryContext()->setSetting("max_parallel_replicas", number_of_replicas_to_use);
-                        LOG_DEBUG(&Poco::Logger::get("Planner"), "Reducing the number of replicas to use to {}", number_of_replicas_to_use);
+                        LOG_DEBUG(getLogger("Planner"), "Reducing the number of replicas to use to {}", number_of_replicas_to_use);
                     }
                 }
 
+                auto & prewhere_info = table_expression_query_info.prewhere_info;
                 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;
+                    prewhere_info = std::make_shared<PrewhereInfo>();
+                    prewhere_info->prewhere_actions = prewhere_actions;
+                    prewhere_info->prewhere_column_name = prewhere_actions->getOutputs().at(0)->result_name;
+                    prewhere_info->remove_prewhere_column = true;
+                    prewhere_info->need_filter = true;
                 }
 
                 updatePrewhereOutputsIfNeeded(table_expression_query_info, table_expression_data.getColumnNames(), storage_snapshot);
@@ -765,28 +809,35 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     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);
+                    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)
+                    auto supported_prewhere_columns = storage->supportedPrewhereColumns();
+                    if (storage->canMoveConditionsToPrewhere() && optimize_move_to_prewhere && (!supported_prewhere_columns || supported_prewhere_columns->contains(filter_info.column_name)))
                     {
-                        if (!table_expression_query_info.prewhere_info)
-                            table_expression_query_info.prewhere_info = std::make_shared<PrewhereInfo>();
+                        if (!prewhere_info)
+                            prewhere_info = std::make_shared<PrewhereInfo>();
 
-                        if (!table_expression_query_info.prewhere_info->prewhere_actions)
+                        if (!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;
+                            prewhere_info->prewhere_actions = filter_info.actions;
+                            prewhere_info->prewhere_column_name = filter_info.column_name;
+                            prewhere_info->remove_prewhere_column = filter_info.do_remove_column;
+                            prewhere_info->need_filter = true;
+                        }
+                        else if (!prewhere_info->row_level_filter)
+                        {
+                            prewhere_info->row_level_filter = filter_info.actions;
+                            prewhere_info->row_level_column_name = filter_info.column_name;
+                            prewhere_info->need_filter = true;
                         }
                         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;
+                            where_filters.emplace_back(filter_info, std::move(description));
                         }
 
-                        table_expression_query_info.prewhere_info->need_filter = true;
                     }
                     else
                     {
@@ -794,7 +845,8 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                     }
                 };
 
-                auto row_policy_filter_info = buildRowPolicyFilterIfNeeded(storage, table_expression_query_info, planner_context, used_row_policies);
+                auto row_policy_filter_info
+                    = buildRowPolicyFilterIfNeeded(storage, table_expression_query_info, planner_context, used_row_policies);
                 add_filter(row_policy_filter_info, "Row-level security filter");
                 if (row_policy_filter_info.actions)
                     table_expression_data.setRowLevelFilterActions(row_policy_filter_info.actions);
@@ -803,25 +855,41 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
                 {
                     if (settings.parallel_replicas_count > 1)
                     {
-                        auto parallel_replicas_custom_key_filter_info = buildCustomKeyFilterIfNeeded(storage, table_expression_query_info, planner_context);
+                        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
+                    else if (auto * distributed = typeid_cast<StorageDistributed *>(storage.get());
+                             distributed && query_context->canUseParallelReplicasCustomKey(*distributed->getCluster()))
                     {
-                        if (auto * distributed = typeid_cast<StorageDistributed *>(storage.get());
-                            distributed && query_context->canUseParallelReplicasCustomKey(*distributed->getCluster()))
-                        {
-                            planner_context->getMutableQueryContext()->setSetting("distributed_group_by_no_merge", 2);
-                        }
+                        planner_context->getMutableQueryContext()->setSetting("distributed_group_by_no_merge", 2);
                     }
                 }
 
                 const auto & table_expression_alias = table_expression->getOriginalAlias();
-                auto additional_filters_info = buildAdditionalFiltersIfNeeded(storage, table_expression_alias, table_expression_query_info, planner_context);
+                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);
+                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);
+
+                const auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
+                if (!alias_column_expressions.empty() && query_plan.isInitialized() && from_stage == QueryProcessingStage::FetchColumns)
+                {
+                    auto alias_column_step = createComputeAliasColumnsStep(alias_column_expressions, query_plan.getCurrentDataStream());
+                    query_plan.addStep(std::move(alias_column_step));
+                }
 
                 for (const auto & filter_info_and_description : where_filters)
                 {
@@ -866,7 +934,8 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
             else
             {
                 /// Create step which reads from empty source if storage has no data.
-                auto source_header = storage_snapshot->getSampleBlockForColumns(table_expression_data.getColumnNames());
+                const auto & column_names = table_expression_data.getSelectedColumnsNames();
+                auto source_header = storage_snapshot->getSampleBlockForColumns(column_names);
                 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");
@@ -890,13 +959,28 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
         }
         else
         {
+            std::shared_ptr<GlobalPlannerContext> subquery_planner_context;
+            if (wrap_read_columns_in_subquery)
+                subquery_planner_context = std::make_shared<GlobalPlannerContext>(nullptr, nullptr, FiltersForTableExpressionMap{});
+            else
+                subquery_planner_context = planner_context->getGlobalPlannerContext();
+
             auto subquery_options = select_query_options.subquery();
-            Planner subquery_planner(table_expression, subquery_options, planner_context->getGlobalPlannerContext());
+            Planner subquery_planner(table_expression, subquery_options, subquery_planner_context);
             /// Propagate storage limits to subquery
             subquery_planner.addStorageLimits(*select_query_info.storage_limits);
             subquery_planner.buildQueryPlanIfNeeded();
+            const auto & mapping = subquery_planner.getQueryNodeToPlanStepMapping();
+            query_node_to_plan_step_mapping.insert(mapping.begin(), mapping.end());
             query_plan = std::move(subquery_planner).extractQueryPlan();
         }
+
+        const auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
+        if (!alias_column_expressions.empty() && query_plan.isInitialized() && from_stage == QueryProcessingStage::FetchColumns)
+        {
+            auto alias_column_step = createComputeAliasColumnsStep(alias_column_expressions, query_plan.getCurrentDataStream());
+            query_plan.addStep(std::move(alias_column_step));
+        }
     }
     else
     {
@@ -954,6 +1038,7 @@ JoinTreeQueryPlan buildQueryPlanForTableExpression(QueryTreeNodePtr table_expres
         .query_plan = std::move(query_plan),
         .from_stage = from_stage,
         .used_row_policies = std::move(used_row_policies),
+        .query_node_to_plan_step_mapping = std::move(query_node_to_plan_step_mapping),
     };
 }
 
@@ -980,57 +1065,6 @@ void joinCastPlanColumnsToNullable(QueryPlan & plan_to_add_cast, PlannerContextP
     plan_to_add_cast.addStep(std::move(cast_join_columns_step));
 }
 
-/// Actions to calculate table columns that have a functional representation (ALIASes and subcolumns)
-/// and used in USING clause of JOIN expression.
-struct UsingAliasKeyActions
-{
-    UsingAliasKeyActions(
-        const ColumnsWithTypeAndName & left_plan_output_columns,
-        const ColumnsWithTypeAndName & right_plan_output_columns
-    )
-        : left_alias_columns_keys(std::make_shared<ActionsDAG>(left_plan_output_columns))
-        , right_alias_columns_keys(std::make_shared<ActionsDAG>(right_plan_output_columns))
-    {}
-
-    void addLeftColumn(QueryTreeNodePtr & node, const ColumnsWithTypeAndName & plan_output_columns, const PlannerContextPtr & planner_context)
-    {
-        addColumnImpl(left_alias_columns_keys, node, plan_output_columns, planner_context);
-    }
-
-    void addRightColumn(QueryTreeNodePtr & node, const ColumnsWithTypeAndName & plan_output_columns, const PlannerContextPtr & planner_context)
-    {
-        addColumnImpl(right_alias_columns_keys, node, plan_output_columns, planner_context);
-    }
-
-    ActionsDAGPtr getLeftActions()
-    {
-        left_alias_columns_keys->projectInput();
-        return std::move(left_alias_columns_keys);
-    }
-
-    ActionsDAGPtr getRightActions()
-    {
-        right_alias_columns_keys->projectInput();
-        return std::move(right_alias_columns_keys);
-    }
-
-private:
-    void addColumnImpl(ActionsDAGPtr & alias_columns_keys, QueryTreeNodePtr & node, const ColumnsWithTypeAndName & plan_output_columns, const PlannerContextPtr & planner_context)
-    {
-        auto & column_node = node->as<ColumnNode&>();
-        if (column_node.hasExpression())
-        {
-            auto dag = buildActionsDAGFromExpressionNode(column_node.getExpressionOrThrow(), plan_output_columns, planner_context);
-            const auto & left_inner_column_identifier = planner_context->getColumnNodeIdentifierOrThrow(node);
-            dag->addOrReplaceInOutputs(dag->addAlias(*dag->getOutputs().front(), left_inner_column_identifier));
-            alias_columns_keys->mergeInplace(std::move(*dag));
-        }
-    }
-
-    ActionsDAGPtr left_alias_columns_keys;
-    ActionsDAGPtr right_alias_columns_keys;
-};
-
 JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_expression,
     JoinTreeQueryPlan left_join_tree_query_plan,
     JoinTreeQueryPlan right_join_tree_query_plan,
@@ -1099,8 +1133,6 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
 
     if (join_node.isUsingJoinExpression())
     {
-        UsingAliasKeyActions using_alias_key_actions{left_plan_output_columns, right_plan_output_columns};
-
         auto & join_node_using_columns_list = join_node.getJoinExpression()->as<ListNode &>();
         for (auto & join_node_using_node : join_node_using_columns_list.getNodes())
         {
@@ -1110,13 +1142,9 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
             auto & left_inner_column_node = inner_columns_list.getNodes().at(0);
             auto & left_inner_column = left_inner_column_node->as<ColumnNode &>();
 
-            using_alias_key_actions.addLeftColumn(left_inner_column_node, left_plan_output_columns, planner_context);
-
             auto & right_inner_column_node = inner_columns_list.getNodes().at(1);
             auto & right_inner_column = right_inner_column_node->as<ColumnNode &>();
 
-            using_alias_key_actions.addRightColumn(right_inner_column_node, right_plan_output_columns, planner_context);
-
             const auto & join_node_using_column_node_type = join_node_using_column_node.getColumnType();
             if (!left_inner_column.getColumnType()->equals(*join_node_using_column_node_type))
             {
@@ -1130,14 +1158,6 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
                 right_plan_column_name_to_cast_type.emplace(right_inner_column_identifier, join_node_using_column_node_type);
             }
         }
-
-        auto left_alias_columns_keys_step = std::make_unique<ExpressionStep>(left_plan.getCurrentDataStream(), using_alias_key_actions.getLeftActions());
-        left_alias_columns_keys_step->setStepDescription("Actions for left table alias column keys");
-        left_plan.addStep(std::move(left_alias_columns_keys_step));
-
-        auto right_alias_columns_keys_step = std::make_unique<ExpressionStep>(right_plan.getCurrentDataStream(), using_alias_key_actions.getRightActions());
-        right_alias_columns_keys_step->setStepDescription("Actions for right table alias column keys");
-        right_plan.addStep(std::move(right_alias_columns_keys_step));
     }
 
     auto join_cast_plan_output_nodes = [&](QueryPlan & plan_to_add_cast, std::unordered_map<std::string, DataTypePtr> & plan_column_name_to_cast_type)
@@ -1500,11 +1520,16 @@ JoinTreeQueryPlan buildQueryPlanForJoinNode(const QueryTreeNodePtr & join_table_
     if (join_clauses_and_actions.right_join_expressions_actions)
         left_join_tree_query_plan.actions_dags.emplace_back(std::move(join_clauses_and_actions.right_join_expressions_actions));
 
+    auto mapping = std::move(left_join_tree_query_plan.query_node_to_plan_step_mapping);
+    auto & r_mapping = right_join_tree_query_plan.query_node_to_plan_step_mapping;
+    mapping.insert(r_mapping.begin(), r_mapping.end());
+
     return JoinTreeQueryPlan{
         .query_plan = std::move(result_plan),
         .from_stage = QueryProcessingStage::FetchColumns,
         .used_row_policies = std::move(left_join_tree_query_plan.used_row_policies),
         .actions_dags = std::move(left_join_tree_query_plan.actions_dags),
+        .query_node_to_plan_step_mapping = std::move(mapping),
     };
 }
 
@@ -1591,6 +1616,7 @@ JoinTreeQueryPlan buildQueryPlanForArrayJoinNode(const QueryTreeNodePtr & array_
         .from_stage = QueryProcessingStage::FetchColumns,
         .used_row_policies = std::move(join_tree_query_plan.used_row_policies),
         .actions_dags = std::move(join_tree_query_plan.actions_dags),
+        .query_node_to_plan_step_mapping = std::move(join_tree_query_plan.query_node_to_plan_step_mapping),
     };
 }
 
diff --git a/src/Planner/PlannerJoinTree.h b/src/Planner/PlannerJoinTree.h
index c5a7d14fa55..9110b2bfef9 100644
--- a/src/Planner/PlannerJoinTree.h
+++ b/src/Planner/PlannerJoinTree.h
@@ -15,8 +15,9 @@ struct JoinTreeQueryPlan
 {
     QueryPlan query_plan;
     QueryProcessingStage::Enum from_stage;
-    std::set<std::string> used_row_policies;
-    std::vector<ActionsDAGPtr> actions_dags;
+    std::set<std::string> used_row_policies{};
+    std::vector<ActionsDAGPtr> actions_dags{};
+    std::unordered_map<const QueryNode *, const QueryPlan::Node *> query_node_to_plan_step_mapping{};
 };
 
 /// Build JOIN TREE query plan for query node
diff --git a/src/Planner/PlannerJoins.cpp b/src/Planner/PlannerJoins.cpp
index 9b249d21a24..94ee249106a 100644
--- a/src/Planner/PlannerJoins.cpp
+++ b/src/Planner/PlannerJoins.cpp
@@ -388,8 +388,8 @@ JoinClausesAndActions buildJoinClausesAndActions(//const ColumnsWithTypeAndName
     ActionsDAGPtr left_join_actions = std::make_shared<ActionsDAG>(left_table_expression_columns);
     ActionsDAGPtr right_join_actions = std::make_shared<ActionsDAG>(right_table_expression_columns);
 
-    // LOG_TRACE(&Poco::Logger::get("Planner"), "buildJoinClausesAndActions cols {} ", left_join_actions->dumpDAG());
-    // LOG_TRACE(&Poco::Logger::get("Planner"), "buildJoinClausesAndActions cols {} ", right_join_actions->dumpDAG());
+    // LOG_TRACE(getLogger("Planner"), "buildJoinClausesAndActions cols {} ", left_join_actions->dumpDAG());
+    // LOG_TRACE(getLogger("Planner"), "buildJoinClausesAndActions cols {} ", right_join_actions->dumpDAG());
 
     /** In ActionsDAG if input node has constant representation additional constant column is added.
       * That way we cannot simply check that node has INPUT type during resolution of expression join table side.
@@ -411,8 +411,8 @@ JoinClausesAndActions buildJoinClausesAndActions(//const ColumnsWithTypeAndName
       * ON (t1.id = t2.id) AND 1 != 1 AND (t1.value >= t1.value);
       */
     auto join_expression = join_node.getJoinExpression();
-    // LOG_TRACE(&Poco::Logger::get("Planner"), "buildJoinClausesAndActions expr {} ", join_expression->formatConvertedASTForErrorMessage());
-    // LOG_TRACE(&Poco::Logger::get("Planner"), "buildJoinClausesAndActions expr {} ", join_expression->dumpTree());
+    // LOG_TRACE(getLogger("Planner"), "buildJoinClausesAndActions expr {} ", join_expression->formatConvertedASTForErrorMessage());
+    // LOG_TRACE(getLogger("Planner"), "buildJoinClausesAndActions expr {} ", join_expression->dumpTree());
 
     auto * constant_join_expression = join_expression->as<ConstantNode>();
 
diff --git a/src/Planner/TableExpressionData.h b/src/Planner/TableExpressionData.h
index f6ef4017c98..9ab7a8e64fe 100644
--- a/src/Planner/TableExpressionData.h
+++ b/src/Planner/TableExpressionData.h
@@ -17,6 +17,9 @@ using ColumnIdentifier = std::string;
 using ColumnIdentifiers = std::vector<ColumnIdentifier>;
 using ColumnIdentifierSet = std::unordered_set<ColumnIdentifier>;
 
+struct PrewhereInfo;
+using PrewhereInfoPtr = std::shared_ptr<PrewhereInfo>;
+
 /** Table expression data is created for each table expression that take part in query.
   * Table expression data has information about columns that participate in query, their name to identifier mapping,
   * and additional table expression properties.
@@ -52,7 +55,7 @@ public:
     /// Return true if column with name exists, false otherwise
     bool hasColumn(const std::string & column_name) const
     {
-        return alias_columns_names.contains(column_name) || column_name_to_column.contains(column_name);
+        return column_name_to_column.contains(column_name);
     }
 
     /** Add column in table expression data.
@@ -60,37 +63,40 @@ public:
       *
       * Logical error exception is thrown if column already exists.
       */
-    void addColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier)
+    void addColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, bool is_selected_column = true)
     {
         if (hasColumn(column.name))
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Column with name {} already exists", column.name);
 
-        addColumnImpl(column, column_identifier);
+        column_names.push_back(column.name);
+        addColumnImpl(column, column_identifier, is_selected_column);
     }
 
-    /** Add column if it does not exists in table expression data.
-      * Column identifier must be created using global planner context.
-      */
-    void addColumnIfNotExists(const NameAndTypePair & column, const ColumnIdentifier & column_identifier)
+    /// Add alias column
+    void addAliasColumn(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, ActionsDAGPtr actions_dag, bool is_selected_column = true)
     {
-        if (hasColumn(column.name))
-            return;
-
-        addColumnImpl(column, column_identifier);
+        alias_column_expressions.emplace(column.name, std::move(actions_dag));
+        addColumnImpl(column, column_identifier, is_selected_column);
     }
 
-    /// Add alias column name
-    void addAliasColumnName(const std::string & column_name, const ColumnIdentifier & column_identifier)
+    /// Mark existing column as selected
+    void markSelectedColumn(const std::string & column_name)
     {
-        alias_columns_names.insert(column_name);
-
-        column_name_to_column_identifier.emplace(column_name, column_identifier);
+        auto [_, inserted] = selected_column_names_set.emplace(column_name);
+        if (inserted)
+            selected_column_names.push_back(column_name);
     }
 
-    /// Get alias columns names
-    const NameSet & getAliasColumnsNames() const
+    /// Get columns that are requested from table expression, including ALIAS columns
+    const Names & getSelectedColumnsNames() const
     {
-        return alias_columns_names;
+        return selected_column_names;
+    }
+
+    /// Get ALIAS columns names mapped to expressions
+    const std::unordered_map<std::string, ActionsDAGPtr> & getAliasColumnExpressions() const
+    {
+        return alias_column_expressions;
     }
 
     /// Get column name to column map
@@ -99,7 +105,7 @@ public:
         return column_name_to_column;
     }
 
-    /// Get column names
+    /// Get column names that are read from table expression
     const Names & getColumnNames() const
     {
         return column_names;
@@ -116,23 +122,6 @@ public:
         return result;
     }
 
-    ColumnIdentifiers getColumnIdentifiers() const
-    {
-        ColumnIdentifiers result;
-        result.reserve(column_identifier_to_column_name.size());
-
-        for (const auto & [column_identifier, _] : column_identifier_to_column_name)
-            result.push_back(column_identifier);
-
-        return result;
-    }
-
-    /// Get column name to column identifier map
-    const ColumnNameToColumnIdentifier & getColumnNameToIdentifier() const
-    {
-        return column_name_to_column_identifier;
-    }
-
     /// Get column identifier to column name map
     const ColumnNameToColumnIdentifier & getColumnIdentifierToColumnName() const
     {
@@ -156,18 +145,6 @@ public:
         return it->second;
     }
 
-    /** Get column for column name.
-      * Null is returned if there are no column for column name.
-      */
-    const NameAndTypePair * getColumnOrNull(const std::string & column_name) const
-    {
-        auto it = column_name_to_column.find(column_name);
-        if (it == column_name_to_column.end())
-            return nullptr;
-
-        return &it->second;
-    }
-
     /** Get column identifier for column name.
       * Exception is thrown if there are no column identifier for column name.
       */
@@ -197,24 +174,6 @@ public:
         return &it->second;
     }
 
-    /** Get column name for column identifier.
-      * Exception is thrown if there are no column name for column identifier.
-      */
-    const std::string & getColumnNameOrThrow(const ColumnIdentifier & column_identifier) const
-    {
-        auto it = column_identifier_to_column_name.find(column_identifier);
-        if (it == column_identifier_to_column_name.end())
-        {
-            auto column_identifiers = getColumnIdentifiers();
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
-                "Column name for column identifier {} does not exists. There are only column identifiers: {}",
-                column_identifier,
-                fmt::join(column_identifiers.begin(), column_identifiers.end(), ", "));
-        }
-
-        return it->second;
-    }
-
     /** Get column name for column identifier.
       * Null is returned if there are no column name for column identifier.
       */
@@ -282,24 +241,47 @@ public:
         filter_actions = std::move(filter_actions_value);
     }
 
-private:
-    void addColumnImpl(const NameAndTypePair & column, const ColumnIdentifier & column_identifier)
+    const PrewhereInfoPtr & getPrewhereInfo() const
     {
-        column_names.push_back(column.name);
+        return prewhere_info;
+    }
+
+    void setPrewhereInfo(PrewhereInfoPtr prewhere_info_value)
+    {
+        prewhere_info = std::move(prewhere_info_value);
+    }
+
+private:
+    void addColumnImpl(const NameAndTypePair & column, const ColumnIdentifier & column_identifier, bool add_to_selected_columns)
+    {
+        if (add_to_selected_columns)
+            markSelectedColumn(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
+    /// Set of columns that are physically read from table expression
+    /// In case of ALIAS columns it contains source column names that are used to calculate alias
+    /// This source column may be not used by user
     Names column_names;
 
+    /// Set of columns that are SELECTed from table expression
+    /// It may contain ALIAS columns.
+    /// Mainly it's used to determine access to which columns to check
+    /// For example user may have an access to column `a ALIAS x + y` but not to `x` and `y`
+    /// In that case we can read `x` and `y` and calculate `a`, but not return `x` and `y` to user
+    Names selected_column_names;
+    /// To deduplicate columns in `selected_column_names`
+    NameSet selected_column_names_set;
+
+    /// Expression to calculate ALIAS columns
+    std::unordered_map<std::string, ActionsDAGPtr> alias_column_expressions;
+
     /// Valid for table, table function, array join, query, union nodes
     ColumnNameToColumn column_name_to_column;
 
-    /// Valid only for table node
-    NameSet alias_columns_names;
-
     /// Valid for table, table function, array join, query, union nodes
     ColumnNameToColumnIdentifier column_name_to_column_identifier;
 
@@ -309,6 +291,9 @@ private:
     /// Valid for table, table function
     ActionsDAGPtr filter_actions;
 
+    /// Valid for table, table function
+    PrewhereInfoPtr prewhere_info;
+
     /// Valid for table, table function
     ActionsDAGPtr prewhere_filter_actions;
 
diff --git a/src/Planner/Utils.cpp b/src/Planner/Utils.cpp
index 2df5915c72a..a04f9f502e2 100644
--- a/src/Planner/Utils.cpp
+++ b/src/Planner/Utils.cpp
@@ -37,6 +37,8 @@
 #include <Planner/CollectTableExpressionData.h>
 #include <Planner/CollectSets.h>
 
+#include <stack>
+
 namespace DB
 {
 
@@ -130,6 +132,34 @@ ASTPtr queryNodeToSelectQuery(const QueryTreeNodePtr & query_node)
     return result_ast;
 }
 
+static void removeCTEs(ASTPtr & ast)
+{
+    std::stack<IAST *> stack;
+    stack.push(ast.get());
+    while (!stack.empty())
+    {
+        auto * node = stack.top();
+        stack.pop();
+
+        if (auto * subquery = typeid_cast<ASTSubquery *>(node))
+            subquery->cte_name = {};
+
+        for (const auto & child : node->children)
+            stack.push(child.get());
+    }
+}
+
+ASTPtr queryNodeToDistributedSelectQuery(const QueryTreeNodePtr & query_node)
+{
+    auto ast = queryNodeToSelectQuery(query_node);
+    /// Remove CTEs information from distributed queries.
+    /// Now, if cte_name is set for subquery node, AST -> String serialization will only print cte name.
+    /// But CTE is defined only for top-level query part, so may not be sent.
+    /// Removing cte_name forces subquery to be always printed.
+    removeCTEs(ast);
+    return ast;
+}
+
 /** 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.
   */
@@ -179,6 +209,7 @@ StreamLocalLimits getLimitsForStorage(const Settings & settings, const SelectQue
     limits.speed_limits.max_execution_rps = settings.max_execution_speed;
     limits.speed_limits.max_execution_bps = settings.max_execution_speed_bytes;
     limits.speed_limits.timeout_before_checking_execution_speed = settings.timeout_before_checking_execution_speed;
+    limits.speed_limits.max_estimated_execution_time = settings.max_estimated_execution_time;
 
     return limits;
 }
@@ -355,66 +386,37 @@ QueryTreeNodePtr mergeConditionNodes(const QueryTreeNodes & condition_nodes, con
     return function_node;
 }
 
-QueryTreeNodePtr replaceTableExpressionsWithDummyTables(const QueryTreeNodePtr & query_node,
+QueryTreeNodePtr replaceTableExpressionsWithDummyTables(
+    const QueryTreeNodePtr & query_node,
+    const QueryTreeNodes & table_nodes,
     const ContextPtr & context,
-    //PlannerContext & planner_context,
     ResultReplacementMap * result_replacement_map)
 {
-    auto & query_node_typed = query_node->as<QueryNode &>();
-    auto table_expressions = extractTableExpressions(query_node_typed.getJoinTree());
     std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
-    size_t subquery_index = 0;
 
-    for (auto & table_expression : table_expressions)
+    for (const auto & table_expression : table_nodes)
     {
         auto * table_node = table_expression->as<TableNode>();
         auto * table_function_node = table_expression->as<TableFunctionNode>();
-        auto * subquery_node = table_expression->as<QueryNode>();
-        auto * union_node = table_expression->as<UnionNode>();
-
-        StoragePtr storage_dummy;
 
         if (table_node || table_function_node)
         {
             const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
             auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
 
-            storage_dummy
-                = std::make_shared<StorageDummy>(storage_snapshot->storage.getStorageID(), ColumnsDescription(storage_snapshot->getColumns(get_column_options)));
+            StoragePtr storage_dummy = std::make_shared<StorageDummy>(
+                storage_snapshot->storage.getStorageID(),
+                ColumnsDescription(storage_snapshot->getColumns(get_column_options)),
+                storage_snapshot);
+
+            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);
+
+            dummy_table_node->setAlias(table_expression->getAlias());
+            replacement_map.emplace(table_expression.get(), std::move(dummy_table_node));
         }
-        else if (subquery_node || union_node)
-        {
-            const auto & subquery_projection_columns
-                = subquery_node ? subquery_node->getProjectionColumns() : union_node->computeProjectionColumns();
-
-            NameSet unique_column_names;
-            NamesAndTypes storage_dummy_columns;
-            storage_dummy_columns.reserve(subquery_projection_columns.size());
-
-            for (const auto & projection_column : subquery_projection_columns)
-            {
-                auto [_, inserted] = unique_column_names.insert(projection_column.name);
-                if (inserted)
-                    storage_dummy_columns.emplace_back(projection_column);
-            }
-
-            storage_dummy = std::make_shared<StorageDummy>(StorageID{"dummy", "subquery_" + std::to_string(subquery_index)}, ColumnsDescription::fromNamesAndTypes(storage_dummy_columns));
-            ++subquery_index;
-        }
-
-        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);
-
-        dummy_table_node->setAlias(table_expression->getAlias());
-
-        // auto & src_table_expression_data = planner_context.getOrCreateTableExpressionData(table_expression);
-        // auto & dst_table_expression_data = planner_context.getOrCreateTableExpressionData(dummy_table_node);
-
-        // dst_table_expression_data = src_table_expression_data;
-
-        replacement_map.emplace(table_expression.get(), std::move(dummy_table_node));
     }
 
     return query_node->cloneAndReplace(replacement_map);
@@ -467,12 +469,19 @@ FilterDAGInfo buildFilterInfo(ASTPtr filter_expression,
         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);
 
+    return buildFilterInfo(std::move(filter_query_tree), table_expression, planner_context, std::move(table_expression_required_names_without_filter));
+}
+
+FilterDAGInfo buildFilterInfo(QueryTreeNodePtr filter_query_tree,
+        const QueryTreeNodePtr & table_expression,
+        PlannerContextPtr & planner_context,
+        NameSet table_expression_required_names_without_filter)
+{
     if (table_expression_required_names_without_filter.empty())
     {
         auto & table_expression_data = planner_context->getTableExpressionDataOrThrow(table_expression);
@@ -480,7 +489,7 @@ FilterDAGInfo buildFilterInfo(ASTPtr filter_expression,
         table_expression_required_names_without_filter.insert(table_expression_names.begin(), table_expression_names.end());
     }
 
-    collectSourceColumns(filter_query_tree, planner_context);
+    collectSourceColumns(filter_query_tree, planner_context, false /*keep_alias_columns*/);
     collectSets(filter_query_tree, *planner_context);
 
     auto filter_actions_dag = std::make_shared<ActionsDAG>();
@@ -514,7 +523,7 @@ ASTPtr parseAdditionalResultFilter(const Settings & settings)
     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);
+                "additional result filter", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
     return additional_result_filter_ast;
 }
 
diff --git a/src/Planner/Utils.h b/src/Planner/Utils.h
index 1b8397f47cc..bf45770552b 100644
--- a/src/Planner/Utils.h
+++ b/src/Planner/Utils.h
@@ -34,6 +34,9 @@ Block buildCommonHeaderForUnion(const Blocks & queries_headers, SelectUnionMode
 /// Convert query node to ASTSelectQuery
 ASTPtr queryNodeToSelectQuery(const QueryTreeNodePtr & query_node);
 
+/// Convert query node to ASTSelectQuery for distributed processing
+ASTPtr queryNodeToDistributedSelectQuery(const QueryTreeNodePtr & query_node);
+
 /// Build context for subquery execution
 ContextPtr buildSubqueryContext(const ContextPtr & context);
 
@@ -67,7 +70,9 @@ QueryTreeNodePtr mergeConditionNodes(const QueryTreeNodes & condition_nodes, con
 
 /// Replace table expressions from query JOIN TREE with dummy tables
 using ResultReplacementMap = std::unordered_map<QueryTreeNodePtr, QueryTreeNodePtr>;
-QueryTreeNodePtr replaceTableExpressionsWithDummyTables(const QueryTreeNodePtr & query_node,
+QueryTreeNodePtr replaceTableExpressionsWithDummyTables(
+    const QueryTreeNodePtr & query_node,
+    const QueryTreeNodes & table_nodes,
     const ContextPtr & context,
     ResultReplacementMap * result_replacement_map = nullptr);
 
@@ -84,6 +89,11 @@ FilterDAGInfo buildFilterInfo(ASTPtr filter_expression,
         PlannerContextPtr & planner_context,
         NameSet table_expression_required_names_without_filter = {});
 
+FilterDAGInfo buildFilterInfo(QueryTreeNodePtr filter_query_tree,
+        const QueryTreeNodePtr & table_expression,
+        PlannerContextPtr & planner_context,
+        NameSet table_expression_required_names_without_filter = {});
+
 ASTPtr parseAdditionalResultFilter(const Settings & settings);
 
 }
diff --git a/src/Planner/findParallelReplicasQuery.cpp b/src/Planner/findParallelReplicasQuery.cpp
new file mode 100644
index 00000000000..ef640bcd42d
--- /dev/null
+++ b/src/Planner/findParallelReplicasQuery.cpp
@@ -0,0 +1,446 @@
+#include <Planner/findQueryForParallelReplicas.h>
+#include <Interpreters/ClusterProxy/SelectStreamFactory.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Processors/QueryPlan/JoinStep.h>
+#include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <Storages/buildQueryTreeForShard.h>
+#include <Interpreters/ClusterProxy/executeQuery.h>
+#include <Planner/PlannerJoinTree.h>
+#include <Planner/Utils.h>
+#include <Analyzer/ArrayJoinNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/JoinNode.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/TableNode.h>
+#include <Analyzer/UnionNode.h>
+#include <Parsers/ASTSubquery.h>
+#include <Parsers/queryToString.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/FilterStep.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/StorageDummy.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+    extern const int UNSUPPORTED_METHOD;
+}
+
+/// Returns a list of (sub)queries (candidates) which may support parallel replicas.
+/// The rule is :
+/// subquery has only LEFT or ALL INNER JOIN (or none), and left part is MergeTree table or subquery candidate as well.
+///
+/// Additional checks are required, so we return many candidates. The innermost subquery is on top.
+std::stack<const QueryNode *> getSupportingParallelReplicasQuery(const IQueryTreeNode * query_tree_node)
+{
+    std::stack<const QueryNode *> res;
+
+    while (query_tree_node)
+    {
+        auto join_tree_node_type = query_tree_node->getNodeType();
+
+        switch (join_tree_node_type)
+        {
+            case QueryTreeNodeType::TABLE:
+            {
+                const auto & table_node = query_tree_node->as<TableNode &>();
+                const auto & storage = table_node.getStorage();
+                /// Here we check StorageDummy as well, to support a query tree with replaced storages.
+                if (std::dynamic_pointer_cast<MergeTreeData>(storage) || typeid_cast<const StorageDummy *>(storage.get()))
+                    return res;
+
+                return {};
+            }
+            case QueryTreeNodeType::TABLE_FUNCTION:
+            {
+                return {};
+            }
+            case QueryTreeNodeType::QUERY:
+            {
+                const auto & query_node_to_process = query_tree_node->as<QueryNode &>();
+                query_tree_node = query_node_to_process.getJoinTree().get();
+                res.push(&query_node_to_process);
+                break;
+            }
+            case QueryTreeNodeType::UNION:
+            {
+                const auto & union_node = query_tree_node->as<UnionNode &>();
+                const auto & union_queries = union_node.getQueries().getNodes();
+
+                if (union_queries.empty())
+                    return {};
+
+                query_tree_node = union_queries.front().get();
+                break;
+            }
+            case QueryTreeNodeType::ARRAY_JOIN:
+            {
+                const auto & array_join_node = query_tree_node->as<ArrayJoinNode &>();
+                query_tree_node = array_join_node.getTableExpression().get();
+                break;
+            }
+            case QueryTreeNodeType::JOIN:
+            {
+                const auto & join_node = query_tree_node->as<JoinNode &>();
+                auto join_kind = join_node.getKind();
+                auto join_strictness = join_node.getStrictness();
+
+                bool can_parallelize_join =
+                    join_kind == JoinKind::Left
+                    || (join_kind == JoinKind::Inner && join_strictness == JoinStrictness::All);
+
+                if (!can_parallelize_join)
+                    return {};
+
+                query_tree_node = join_node.getLeftTableExpression().get();
+                break;
+            }
+            default:
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Unexpected node type for table expression. "
+                                "Expected table, table function, query, union, join or array join. Actual {}",
+                                query_tree_node->getNodeTypeName());
+            }
+        }
+    }
+
+    return res;
+}
+
+class ReplaceTableNodeToDummyVisitor : public InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>
+{
+public:
+    using Base = InDepthQueryTreeVisitor<ReplaceTableNodeToDummyVisitor, true>;
+    using Base::Base;
+
+    void visitImpl(const QueryTreeNodePtr & node)
+    {
+        auto * table_node = node->as<TableNode>();
+        auto * table_function_node = node->as<TableFunctionNode>();
+
+        if (table_node || table_function_node)
+        {
+            const auto & storage_snapshot = table_node ? table_node->getStorageSnapshot() : table_function_node->getStorageSnapshot();
+            auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
+
+            auto storage_dummy = std::make_shared<StorageDummy>(
+                storage_snapshot->storage.getStorageID(),
+                ColumnsDescription(storage_snapshot->getColumns(get_column_options)),
+                storage_snapshot);
+
+            auto dummy_table_node = std::make_shared<TableNode>(std::move(storage_dummy), context);
+
+            dummy_table_node->setAlias(node->getAlias());
+            replacement_map.emplace(node.get(), std::move(dummy_table_node));
+        }
+    }
+
+    ContextPtr context;
+    std::unordered_map<const IQueryTreeNode *, QueryTreeNodePtr> replacement_map;
+};
+
+QueryTreeNodePtr replaceTablesWithDummyTables(const QueryTreeNodePtr & query, const ContextPtr & context)
+{
+    ReplaceTableNodeToDummyVisitor visitor;
+    visitor.context = context;
+    visitor.visit(query);
+
+    return query->cloneAndReplace(visitor.replacement_map);
+}
+
+/// Find the best candidate for parallel replicas execution by verifying query plan.
+/// If query plan has only Expression, Filter of Join steps, we can execute it fully remotely and check the next query.
+/// Otherwise we can execute current query up to WithMergableStage only.
+const QueryNode * findQueryForParallelReplicas(
+    std::stack<const QueryNode *> stack,
+    const std::unordered_map<const QueryNode *, const QueryPlan::Node *> & mapping,
+    const Settings & settings)
+{
+    const QueryPlan::Node * prev_checked_node = nullptr;
+    const QueryNode * res = nullptr;
+
+    while (!stack.empty())
+    {
+        const QueryNode * subquery_node = stack.top();
+        stack.pop();
+
+        auto it = mapping.find(subquery_node);
+        /// This should not happen ideally.
+        if (it == mapping.end())
+            break;
+
+        const QueryPlan::Node * curr_node = it->second;
+        const QueryPlan::Node * next_node_to_check = curr_node;
+        bool can_distribute_full_node = true;
+
+        while (next_node_to_check && next_node_to_check != prev_checked_node)
+        {
+            const auto & children = next_node_to_check->children;
+            auto * step = next_node_to_check->step.get();
+
+            if (children.empty())
+            {
+                /// Found a source step. This should be possible only in the first iteration.
+                if (prev_checked_node)
+                    return nullptr;
+
+                next_node_to_check = nullptr;
+            }
+            else if (children.size() == 1)
+            {
+                const auto * expression = typeid_cast<ExpressionStep *>(step);
+                const auto * filter = typeid_cast<FilterStep *>(step);
+
+                const auto * creating_sets = typeid_cast<DelayedCreatingSetsStep *>(step);
+                bool allowed_creating_sets = settings.parallel_replicas_allow_in_with_subquery && creating_sets;
+
+                if (!expression && !filter && !allowed_creating_sets)
+                    can_distribute_full_node = false;
+
+                next_node_to_check = children.front();
+            }
+            else
+            {
+                const auto * join = typeid_cast<JoinStep *>(step);
+                /// We've checked that JOIN is INNER/LEFT in query tree.
+                /// Don't distribute UNION node.
+                if (!join)
+                    return res;
+
+                next_node_to_check = children.front();
+            }
+        }
+
+        /// Current node contains steps like GROUP BY / DISTINCT
+        /// Will try to execute query up to WithMergableStage
+        if (!can_distribute_full_node)
+        {
+            /// Current query node does not contain subqueries.
+            /// We can execute parallel replicas over storage::read.
+            if (!res)
+                return nullptr;
+
+            return subquery_node;
+        }
+
+        /// Query is simple enough to be fully distributed.
+        res = subquery_node;
+        prev_checked_node = curr_node;
+    }
+
+    return res;
+}
+
+const QueryNode * findQueryForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options)
+{
+    if (select_query_options.only_analyze)
+        return nullptr;
+
+    auto * query_node = query_tree_node->as<QueryNode>();
+    auto * union_node = query_tree_node->as<UnionNode>();
+
+    if (!query_node && !union_node)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Expected QUERY or UNION node. Actual {}",
+            query_tree_node->formatASTForErrorMessage());
+
+    auto context = query_node ? query_node->getContext() : union_node->getContext();
+
+    if (!context->canUseParallelReplicasOnInitiator())
+        return nullptr;
+
+    auto stack = getSupportingParallelReplicasQuery(query_tree_node.get());
+    /// Empty stack means that storage does not support parallel replicas.
+    if (stack.empty())
+        return nullptr;
+
+    /// We don't have any subquery and storage can process parallel replicas by itself.
+    if (stack.top() == query_tree_node.get())
+        return nullptr;
+
+    /// This is needed to avoid infinite recursion.
+    auto mutable_context = Context::createCopy(context);
+    mutable_context->setSetting("allow_experimental_parallel_reading_from_replicas", Field(0));
+
+    /// Here we replace tables to dummy, in order to build a temporary query plan for parallel replicas analysis.
+    ResultReplacementMap replacement_map;
+    auto updated_query_tree = replaceTablesWithDummyTables(query_tree_node, mutable_context);
+
+    SelectQueryOptions options;
+    Planner planner(updated_query_tree, options, std::make_shared<GlobalPlannerContext>(nullptr, nullptr, FiltersForTableExpressionMap{}));
+    planner.buildQueryPlanIfNeeded();
+
+    /// This part is a bit clumsy.
+    /// We updated a query_tree with dummy storages, and mapping is using updated_query_tree now.
+    /// But QueryNode result should be taken from initial query tree.
+    /// So that we build a list of candidates again, and call findQueryForParallelReplicas for it.
+    auto new_stack = getSupportingParallelReplicasQuery(updated_query_tree.get());
+    const auto & mapping = planner.getQueryNodeToPlanStepMapping();
+    const auto * res = findQueryForParallelReplicas(new_stack, mapping, context->getSettingsRef());
+
+    /// Now, return a query from initial stack.
+    if (res)
+    {
+        while (!new_stack.empty())
+        {
+            if (res == new_stack.top())
+                return stack.top();
+
+            stack.pop();
+            new_stack.pop();
+        }
+    }
+
+    return res;
+}
+
+static const TableNode * findTableForParallelReplicas(const IQueryTreeNode * query_tree_node)
+{
+    std::stack<const IQueryTreeNode *> right_join_nodes;
+    while (query_tree_node || !right_join_nodes.empty())
+    {
+        if (!query_tree_node)
+        {
+            query_tree_node = right_join_nodes.top();
+            right_join_nodes.pop();
+        }
+
+        auto join_tree_node_type = query_tree_node->getNodeType();
+
+        switch (join_tree_node_type)
+        {
+            case QueryTreeNodeType::TABLE:
+            {
+                const auto & table_node = query_tree_node->as<TableNode &>();
+                const auto & storage = table_node.getStorage();
+                if (std::dynamic_pointer_cast<MergeTreeData>(storage) || typeid_cast<const StorageDummy *>(storage.get()))
+                    return &table_node;
+
+                query_tree_node = nullptr;
+                break;
+            }
+            case QueryTreeNodeType::TABLE_FUNCTION:
+            {
+                query_tree_node = nullptr;
+                break;
+            }
+            case QueryTreeNodeType::QUERY:
+            {
+                const auto & query_node_to_process = query_tree_node->as<QueryNode &>();
+                query_tree_node = query_node_to_process.getJoinTree().get();
+                break;
+            }
+            case QueryTreeNodeType::UNION:
+            {
+                const auto & union_node = query_tree_node->as<UnionNode &>();
+                const auto & union_queries = union_node.getQueries().getNodes();
+
+                query_tree_node = nullptr;
+                if (!union_queries.empty())
+                    query_tree_node = union_queries.front().get();
+
+                break;
+            }
+            case QueryTreeNodeType::ARRAY_JOIN:
+            {
+                const auto & array_join_node = query_tree_node->as<ArrayJoinNode &>();
+                query_tree_node = array_join_node.getTableExpression().get();
+                break;
+            }
+            case QueryTreeNodeType::JOIN:
+            {
+                const auto & join_node = query_tree_node->as<JoinNode &>();
+                query_tree_node = join_node.getLeftTableExpression().get();
+                right_join_nodes.push(join_node.getRightTableExpression().get());
+                break;
+            }
+            default:
+            {
+                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                "Unexpected node type for table expression. "
+                                "Expected table, table function, query, union, join or array join. Actual {}",
+                                query_tree_node->getNodeTypeName());
+            }
+        }
+    }
+
+    return nullptr;
+}
+
+const TableNode * findTableForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options)
+{
+    if (select_query_options.only_analyze)
+        return nullptr;
+
+    auto * query_node = query_tree_node->as<QueryNode>();
+    auto * union_node = query_tree_node->as<UnionNode>();
+
+    if (!query_node && !union_node)
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+            "Expected QUERY or UNION node. Actual {}",
+            query_tree_node->formatASTForErrorMessage());
+
+    auto context = query_node ? query_node->getContext() : union_node->getContext();
+
+    if (!context->canUseParallelReplicasOnFollower())
+        return nullptr;
+
+    return findTableForParallelReplicas(query_tree_node.get());
+}
+
+JoinTreeQueryPlan buildQueryPlanForParallelReplicas(
+    const QueryNode & query_node,
+    const PlannerContextPtr & planner_context,
+    std::shared_ptr<const StorageLimitsList> storage_limits)
+{
+    auto processed_stage = QueryProcessingStage::WithMergeableState;
+    auto context = planner_context->getQueryContext();
+
+    QueryTreeNodePtr modified_query_tree = query_node.clone();
+
+    Block initial_header = InterpreterSelectQueryAnalyzer::getSampleBlock(
+        modified_query_tree, context, SelectQueryOptions(processed_stage).analyze());
+
+    rewriteJoinToGlobalJoin(modified_query_tree, context);
+    modified_query_tree = buildQueryTreeForShard(planner_context, modified_query_tree);
+    ASTPtr modified_query_ast = queryNodeToDistributedSelectQuery(modified_query_tree);
+
+    Block header = InterpreterSelectQueryAnalyzer::getSampleBlock(
+        modified_query_tree, context, SelectQueryOptions(processed_stage).analyze());
+
+    ClusterProxy::SelectStreamFactory select_stream_factory =
+        ClusterProxy::SelectStreamFactory(
+            header,
+            {},
+            {},
+            processed_stage);
+
+    QueryPlan query_plan;
+    ClusterProxy::executeQueryWithParallelReplicas(
+        query_plan,
+        select_stream_factory,
+        modified_query_ast,
+        context,
+        storage_limits);
+
+    auto converting = ActionsDAG::makeConvertingActions(
+        header.getColumnsWithTypeAndName(),
+        initial_header.getColumnsWithTypeAndName(),
+        ActionsDAG::MatchColumnsMode::Position);
+
+    /// initial_header is a header expected by initial query.
+    /// header is a header which is returned by the follower.
+    /// They are different because tables will have different aliases (e.g. _table1 or _table5).
+    /// Here we just rename columns by position, with the hope the types would match.
+    auto step = std::make_unique<ExpressionStep>(query_plan.getCurrentDataStream(), std::move(converting));
+    step->setStepDescription("Convert distributed names");
+    query_plan.addStep(std::move(step));
+
+    return {std::move(query_plan), std::move(processed_stage), {}, {}, {}};
+}
+
+}
diff --git a/src/Planner/findQueryForParallelReplicas.h b/src/Planner/findQueryForParallelReplicas.h
new file mode 100644
index 00000000000..f5dc69dfa0e
--- /dev/null
+++ b/src/Planner/findQueryForParallelReplicas.h
@@ -0,0 +1,38 @@
+#pragma once
+#include <list>
+#include <memory>
+
+namespace DB
+{
+
+class QueryNode;
+class TableNode;
+
+class IQueryTreeNode;
+using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
+
+struct SelectQueryOptions;
+
+/// Find a qury which can be executed with parallel replicas up to WithMergableStage.
+/// Returned query will always contain some (>1) subqueries, possibly with joins.
+const QueryNode * findQueryForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options);
+
+/// Find a table from which we should read on follower replica. It's the left-most table within all JOINs and UNIONs.
+const TableNode * findTableForParallelReplicas(const QueryTreeNodePtr & query_tree_node, SelectQueryOptions & select_query_options);
+
+struct JoinTreeQueryPlan;
+
+class PlannerContext;
+using PlannerContextPtr = std::shared_ptr<PlannerContext>;
+
+struct StorageLimits;
+using StorageLimitsList = std::list<StorageLimits>;
+
+/// Execute QueryNode with parallel replicas up to WithMergableStage and return a plan.
+/// This method does not check that QueryNode is valid. Ideally it should be a result of findParallelReplicasQuery.
+JoinTreeQueryPlan buildQueryPlanForParallelReplicas(
+    const QueryNode & query_node,
+    const PlannerContextPtr & planner_context,
+    std::shared_ptr<const StorageLimitsList> storage_limits);
+
+}
diff --git a/src/Processors/CMakeLists.txt b/src/Processors/CMakeLists.txt
index 7e965188b4c..e69de29bb2d 100644
--- a/src/Processors/CMakeLists.txt
+++ b/src/Processors/CMakeLists.txt
@@ -1,4 +0,0 @@
-if (ENABLE_EXAMPLES)
-    add_subdirectory(examples)
-endif ()
-
diff --git a/src/Processors/Chunk.h b/src/Processors/Chunk.h
index 9a7d6bc294d..4f753798eaa 100644
--- a/src/Processors/Chunk.h
+++ b/src/Processors/Chunk.h
@@ -59,7 +59,7 @@ public:
 
     Chunk clone() const;
 
-    void swap(Chunk & other)
+    void swap(Chunk & other) noexcept
     {
         columns.swap(other.columns);
         chunk_info.swap(other.chunk_info);
diff --git a/src/Processors/Executors/ExecutingGraph.h b/src/Processors/Executors/ExecutingGraph.h
index 1a7659d3e08..e6d41321edd 100644
--- a/src/Processors/Executors/ExecutingGraph.h
+++ b/src/Processors/Executors/ExecutingGraph.h
@@ -3,6 +3,7 @@
 #include <Processors/Port.h>
 #include <Processors/IProcessor.h>
 #include <Common/SharedMutex.h>
+#include <Common/AllocatorWithMemoryTracking.h>
 #include <mutex>
 #include <queue>
 #include <stack>
@@ -117,7 +118,11 @@ public:
         }
     };
 
-    using Queue = std::queue<Node *>;
+    /// This queue can grow a lot and lead to OOM. That is why we use non-default
+    /// allocator for container which throws exceptions in operator new
+    using DequeWithMemoryTracker = std::deque<ExecutingGraph::Node *, AllocatorWithMemoryTracking<ExecutingGraph::Node *>>;
+    using Queue = std::queue<ExecutingGraph::Node *, DequeWithMemoryTracker>;
+
     using NodePtr = std::unique_ptr<Node>;
     using Nodes = std::vector<NodePtr>;
     Nodes nodes;
diff --git a/src/Processors/Executors/ExecutorTasks.cpp b/src/Processors/Executors/ExecutorTasks.cpp
index ec1fc539884..1039cf0e97a 100644
--- a/src/Processors/Executors/ExecutorTasks.cpp
+++ b/src/Processors/Executors/ExecutorTasks.cpp
@@ -121,7 +121,7 @@ void ExecutorTasks::pushTasks(Queue & queue, Queue & async_queue, ExecutionThrea
 
     /// Take local task from queue if has one.
     if (!queue.empty() && !context.hasAsyncTasks()
-        && context.num_scheduled_local_tasks < context.max_scheduled_local_tasks)
+        && context.num_scheduled_local_tasks < ExecutionThreadContext::max_scheduled_local_tasks)
     {
         ++context.num_scheduled_local_tasks;
         context.setTask(queue.front());
diff --git a/src/Processors/Executors/ExecutorTasks.h b/src/Processors/Executors/ExecutorTasks.h
index d35f8de94d1..202ca253c6c 100644
--- a/src/Processors/Executors/ExecutorTasks.h
+++ b/src/Processors/Executors/ExecutorTasks.h
@@ -47,7 +47,10 @@ class ExecutorTasks
 
 public:
     using Stack = std::stack<UInt64>;
-    using Queue = std::queue<ExecutingGraph::Node *>;
+    /// This queue can grow a lot and lead to OOM. That is why we use non-default
+    /// allocator for container which throws exceptions in operator new
+    using DequeWithMemoryTracker = std::deque<ExecutingGraph::Node *, AllocatorWithMemoryTracking<ExecutingGraph::Node *>>;
+    using Queue = std::queue<ExecutingGraph::Node *, DequeWithMemoryTracker>;
 
     void finish();
     bool isFinished() const { return finished; }
diff --git a/src/Processors/Executors/PipelineExecutor.cpp b/src/Processors/Executors/PipelineExecutor.cpp
index 580aaa2b259..5b5880759e6 100644
--- a/src/Processors/Executors/PipelineExecutor.cpp
+++ b/src/Processors/Executors/PipelineExecutor.cpp
@@ -138,8 +138,8 @@ bool PipelineExecutor::executeStep(std::atomic_bool * yield_flag)
         initializeExecution(1, true);
 
         // Acquire slot until we are done
-        single_thread_slot = slots->tryAcquire();
-        chassert(single_thread_slot && "Unable to allocate slot for the first thread, but we just allocated at least one slot");
+        single_thread_cpu_slot = cpu_slots->tryAcquire();
+        chassert(single_thread_cpu_slot && "Unable to allocate cpu slot for the first thread, but we just allocated at least one slot");
 
         if (yield_flag && *yield_flag)
             return true;
@@ -155,7 +155,7 @@ bool PipelineExecutor::executeStep(std::atomic_bool * yield_flag)
         if (node->exception)
             std::rethrow_exception(node->exception);
 
-    single_thread_slot.reset();
+    single_thread_cpu_slot.reset();
     finalizeExecution();
 
     return false;
@@ -333,8 +333,8 @@ void PipelineExecutor::initializeExecution(size_t num_threads, bool concurrency_
 
     /// Allocate CPU slots from concurrency control
     size_t min_threads = concurrency_control ? 1uz : num_threads;
-    slots = ConcurrencyControl::instance().allocate(min_threads, num_threads);
-    use_threads = slots->grantedCount();
+    cpu_slots = ConcurrencyControl::instance().allocate(min_threads, num_threads);
+    use_threads = cpu_slots->grantedCount();
 
     Queue queue;
     graph->initializeExecution(queue);
@@ -348,7 +348,7 @@ void PipelineExecutor::initializeExecution(size_t num_threads, bool concurrency_
 
 void PipelineExecutor::spawnThreads()
 {
-    while (auto slot = slots->tryAcquire())
+    while (auto slot = cpu_slots->tryAcquire())
     {
         size_t thread_num = threads.fetch_add(1);
 
@@ -391,7 +391,9 @@ void PipelineExecutor::executeImpl(size_t num_threads, bool concurrency_control)
     SCOPE_EXIT_SAFE(
         if (!finished_flag)
         {
-            finish();
+            /// If finished_flag is not set, there was an exception.
+            /// Cancel execution in this case.
+            cancel();
             if (pool)
                 pool->wait();
         }
@@ -405,7 +407,7 @@ void PipelineExecutor::executeImpl(size_t num_threads, bool concurrency_control)
     }
     else
     {
-        auto slot = slots->tryAcquire();
+        auto slot = cpu_slots->tryAcquire();
         executeSingleThread(0);
     }
 
diff --git a/src/Processors/Executors/PipelineExecutor.h b/src/Processors/Executors/PipelineExecutor.h
index dee12dad282..03f0f7f1a0a 100644
--- a/src/Processors/Executors/PipelineExecutor.h
+++ b/src/Processors/Executors/PipelineExecutor.h
@@ -5,7 +5,9 @@
 #include <Common/EventCounter.h>
 #include <Common/ThreadPool_fwd.h>
 #include <Common/ConcurrencyControl.h>
+#include <Common/AllocatorWithMemoryTracking.h>
 
+#include <deque>
 #include <queue>
 #include <mutex>
 #include <memory>
@@ -68,8 +70,8 @@ private:
     ExecutorTasks tasks;
 
     /// Concurrency control related
-    ConcurrencyControl::AllocationPtr slots;
-    ConcurrencyControl::SlotPtr single_thread_slot; // slot for single-thread mode to work using executeStep()
+    SlotAllocationPtr cpu_slots;
+    AcquiredSlotPtr single_thread_cpu_slot; // cpu slot for single-thread mode to work using executeStep()
     std::unique_ptr<ThreadPool> pool;
     std::atomic_size_t threads = 0;
 
@@ -83,14 +85,17 @@ private:
     std::atomic_bool cancelled = false;
     std::atomic_bool cancelled_reading = false;
 
-    Poco::Logger * log = &Poco::Logger::get("PipelineExecutor");
+    LoggerPtr log = getLogger("PipelineExecutor");
 
     /// Now it's used to check if query was killed.
     QueryStatusPtr process_list_element;
 
     ReadProgressCallbackPtr read_progress_callback;
 
-    using Queue = std::queue<ExecutingGraph::Node *>;
+    /// This queue can grow a lot and lead to OOM. That is why we use non-default
+    /// allocator for container which throws exceptions in operator new
+    using DequeWithMemoryTracker = std::deque<ExecutingGraph::Node *, AllocatorWithMemoryTracking<ExecutingGraph::Node *>>;
+    using Queue = std::queue<ExecutingGraph::Node *, DequeWithMemoryTracker>;
 
     void initializeExecution(size_t num_threads, bool concurrency_control); /// Initialize executor contexts and task_queue.
     void finalizeExecution(); /// Check all processors are finished.
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
index 345bec395b2..d27002197d2 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.cpp
@@ -23,7 +23,6 @@ struct PullingAsyncPipelineExecutor::Data
     std::atomic_bool is_finished = false;
     std::atomic_bool has_exception = false;
     ThreadFromGlobalPool thread;
-    Poco::Event finish_event;
 
     ~Data()
     {
@@ -89,12 +88,10 @@ static void threadFunction(
         data.has_exception = true;
 
         /// Finish lazy format in case of exception. Otherwise thread.join() may hung.
-        if (data.lazy_format)
-            data.lazy_format->finalize();
+        data.lazy_format->finalize();
     }
 
     data.is_finished = true;
-    data.finish_event.set();
 }
 
 
@@ -129,20 +126,8 @@ bool PullingAsyncPipelineExecutor::pull(Chunk & chunk, uint64_t milliseconds)
         return false;
     }
 
-    if (lazy_format)
-    {
-        chunk = lazy_format->getChunk(milliseconds);
-        data->rethrowExceptionIfHas();
-        return true;
-    }
-
-    chunk.clear();
-
-    if (milliseconds)
-        data->finish_event.tryWait(milliseconds);
-    else
-        data->finish_event.wait();
-
+    chunk = lazy_format->getChunk(milliseconds);
+    data->rethrowExceptionIfHas();
     return true;
 }
 
@@ -230,14 +215,12 @@ void PullingAsyncPipelineExecutor::cancelWithExceptionHandling(CancelFunc && can
 
 Chunk PullingAsyncPipelineExecutor::getTotals()
 {
-    return lazy_format ? lazy_format->getTotals()
-                       : Chunk();
+    return lazy_format->getTotals();
 }
 
 Chunk PullingAsyncPipelineExecutor::getExtremes()
 {
-    return lazy_format ? lazy_format->getExtremes()
-                       : Chunk();
+    return lazy_format->getExtremes();
 }
 
 Block PullingAsyncPipelineExecutor::getTotalsBlock()
@@ -264,15 +247,7 @@ Block PullingAsyncPipelineExecutor::getExtremesBlock()
 
 ProfileInfo & PullingAsyncPipelineExecutor::getProfileInfo()
 {
-    if (lazy_format)
-        return lazy_format->getProfileInfo();
-
-    static ProfileInfo profile_info;
-    static std::once_flag flag;
-    /// Calculate rows before limit here to avoid race.
-    std::call_once(flag, []() { profile_info.getRowsBeforeLimit(); });
-
-    return profile_info;
+    return lazy_format->getProfileInfo();
 }
 
 }
diff --git a/src/Processors/Executors/PullingAsyncPipelineExecutor.h b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
index 361bcc0155c..618a7e790ab 100644
--- a/src/Processors/Executors/PullingAsyncPipelineExecutor.h
+++ b/src/Processors/Executors/PullingAsyncPipelineExecutor.h
@@ -58,7 +58,6 @@ private:
 
     void cancelWithExceptionHandling(CancelFunc && cancel_func);
 
-private:
     QueryPipeline & pipeline;
     std::shared_ptr<LazyOutputFormat> lazy_format;
     std::unique_ptr<Data> data;
diff --git a/src/Processors/Executors/PushingAsyncPipelineExecutor.h b/src/Processors/Executors/PushingAsyncPipelineExecutor.h
index 4b4b83a90b5..f976cd4c339 100644
--- a/src/Processors/Executors/PushingAsyncPipelineExecutor.h
+++ b/src/Processors/Executors/PushingAsyncPipelineExecutor.h
@@ -1,6 +1,5 @@
 #pragma once
 #include <memory>
-#include <atomic>
 #include <vector>
 
 namespace DB
diff --git a/src/Processors/Formats/IRowInputFormat.cpp b/src/Processors/Formats/IRowInputFormat.cpp
index 5f27fa78c55..0b6c81923db 100644
--- a/src/Processors/Formats/IRowInputFormat.cpp
+++ b/src/Processors/Formats/IRowInputFormat.cpp
@@ -29,6 +29,7 @@ namespace ErrorCodes
     extern const int CANNOT_PARSE_IPV4;
     extern const int CANNOT_PARSE_IPV6;
     extern const int UNKNOWN_ELEMENT_OF_ENUM;
+    extern const int CANNOT_PARSE_ESCAPE_SEQUENCE;
 }
 
 
@@ -50,7 +51,8 @@ bool isParseError(int code)
         || code == ErrorCodes::CANNOT_PARSE_DOMAIN_VALUE_FROM_STRING
         || code == ErrorCodes::CANNOT_PARSE_IPV4
         || code == ErrorCodes::CANNOT_PARSE_IPV6
-        || code == ErrorCodes::UNKNOWN_ELEMENT_OF_ENUM;
+        || code == ErrorCodes::UNKNOWN_ELEMENT_OF_ENUM
+        || code == ErrorCodes::CANNOT_PARSE_ESCAPE_SEQUENCE;
 }
 
 IRowInputFormat::IRowInputFormat(Block header, ReadBuffer & in_, Params params_)
@@ -230,7 +232,7 @@ Chunk IRowInputFormat::read()
     {
         if (num_errors && (params.allow_errors_num > 0 || params.allow_errors_ratio > 0))
         {
-            Poco::Logger * log = &Poco::Logger::get("IRowInputFormat");
+            LoggerPtr log = getLogger("IRowInputFormat");
             LOG_DEBUG(log, "Skipped {} rows with errors while reading the input stream", num_errors);
         }
 
diff --git a/src/Processors/Formats/IRowOutputFormat.h b/src/Processors/Formats/IRowOutputFormat.h
index 3a648f00eba..6083e1a6bc8 100644
--- a/src/Processors/Formats/IRowOutputFormat.h
+++ b/src/Processors/Formats/IRowOutputFormat.h
@@ -50,13 +50,13 @@ protected:
     virtual void writeFieldDelimiter() {}       /// delimiter between values
     virtual void writeRowStartDelimiter() {}    /// delimiter before each row
     virtual void writeRowEndDelimiter() {}      /// delimiter after each row
-    virtual void writePrefix() override {}      /// delimiter before resultset
-    virtual void writeSuffix() override {}      /// delimiter after resultset
+    void writePrefix() override {}      /// delimiter before resultset
+    void writeSuffix() override {}      /// delimiter after resultset
     virtual void writeBeforeTotals() {}
     virtual void writeAfterTotals() {}
     virtual void writeBeforeExtremes() {}
     virtual void writeAfterExtremes() {}
-    virtual void finalizeImpl() override {}  /// Write something after resultset, totals end extremes.
+    void finalizeImpl() override {}  /// Write something after resultset, totals end extremes.
 
     bool haveWrittenData() { return !first_row || getRowsReadBefore() != 0; }
 
diff --git a/src/Processors/Formats/ISchemaReader.cpp b/src/Processors/Formats/ISchemaReader.cpp
index 26c632b83dc..45523700a5d 100644
--- a/src/Processors/Formats/ISchemaReader.cpp
+++ b/src/Processors/Formats/ISchemaReader.cpp
@@ -81,7 +81,7 @@ IIRowSchemaReader::IIRowSchemaReader(ReadBuffer & in_, const FormatSettings & fo
 {
 }
 
-void IIRowSchemaReader::setContext(ContextPtr & context)
+void IIRowSchemaReader::setContext(const ContextPtr & context)
 {
     ColumnsDescription columns;
     if (tryParseColumnsListFromString(hints_str, columns, context, hints_parsing_error))
@@ -91,7 +91,7 @@ void IIRowSchemaReader::setContext(ContextPtr & context)
     }
     else
     {
-        LOG_WARNING(&Poco::Logger::get("IIRowSchemaReader"), "Couldn't parse schema inference hints: {}. This setting will be ignored", hints_parsing_error);
+        LOG_WARNING(getLogger("IIRowSchemaReader"), "Couldn't parse schema inference hints: {}. This setting will be ignored", hints_parsing_error);
     }
 }
 
diff --git a/src/Processors/Formats/ISchemaReader.h b/src/Processors/Formats/ISchemaReader.h
index 94df71a88b4..23c6606a6bd 100644
--- a/src/Processors/Formats/ISchemaReader.h
+++ b/src/Processors/Formats/ISchemaReader.h
@@ -34,7 +34,7 @@ public:
     virtual bool hasStrictOrderOfColumns() const { return true; }
 
     virtual bool needContext() const { return false; }
-    virtual void setContext(ContextPtr &) {}
+    virtual void setContext(const ContextPtr &) {}
 
     virtual void setMaxRowsAndBytesToRead(size_t, size_t) {}
     virtual size_t getNumRowsRead() const { return 0; }
@@ -56,7 +56,7 @@ public:
     IIRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, DataTypePtr default_type_ = nullptr);
 
     bool needContext() const override { return !hints_str.empty(); }
-    void setContext(ContextPtr & context) override;
+    void setContext(const ContextPtr & context) override;
 
 protected:
     void setMaxRowsAndBytesToRead(size_t max_rows, size_t max_bytes) override
diff --git a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
index 206e244c75f..fc9a827be66 100644
--- a/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockInputFormat.cpp
@@ -86,7 +86,7 @@ Chunk ArrowBlockInputFormat::read()
     /// 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, *table_result, (*table_result)->num_rows(), block_missing_values_ptr);
+    res = arrow_column_to_ch_column->arrowTableToCHChunk(*table_result, (*table_result)->num_rows(), block_missing_values_ptr);
 
     /// There is no easy way to get original record batch size from Arrow metadata.
     /// Let's just use the number of bytes read from read buffer.
diff --git a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
index 8bd1cf3897d..42ff26b0f9d 100644
--- a/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ArrowBlockOutputFormat.cpp
@@ -53,9 +53,14 @@ void ArrowBlockOutputFormat::consume(Chunk chunk)
         ch_column_to_arrow_column = std::make_unique<CHColumnToArrowColumn>(
             header,
             "Arrow",
-            format_settings.arrow.low_cardinality_as_dictionary,
-            format_settings.arrow.output_string_as_string,
-            format_settings.arrow.output_fixed_string_as_fixed_byte_array);
+            CHColumnToArrowColumn::Settings
+            {
+                format_settings.arrow.output_string_as_string,
+                format_settings.arrow.output_fixed_string_as_fixed_byte_array,
+                format_settings.arrow.low_cardinality_as_dictionary,
+                format_settings.arrow.use_signed_indexes_for_dictionary,
+                format_settings.arrow.use_64_bit_indexes_for_dictionary
+            });
     }
 
     auto chunks = std::vector<Chunk>();
diff --git a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
index 83d7a8b7bbd..c6e951ada6a 100644
--- a/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
+++ b/src/Processors/Formats/Impl/ArrowBufferedStreams.cpp
@@ -154,7 +154,7 @@ arrow::Result<int64_t> RandomAccessFileFromRandomAccessReadBuffer::GetSize()
 
 arrow::Result<int64_t> RandomAccessFileFromRandomAccessReadBuffer::ReadAt(int64_t position, int64_t nbytes, void* out)
 {
-    return in.readBigAt(reinterpret_cast<char*>(out), nbytes, position);
+    return in.readBigAt(reinterpret_cast<char*>(out), nbytes, position, nullptr);
 }
 
 arrow::Result<std::shared_ptr<arrow::Buffer>> RandomAccessFileFromRandomAccessReadBuffer::ReadAt(int64_t position, int64_t nbytes)
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
index ce2e9e6571d..ec2d17d73cb 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.cpp
@@ -42,25 +42,25 @@
 
 /// UINT16 and UINT32 are processed separately, see comments in readColumnFromArrowColumn.
 #define FOR_ARROW_NUMERIC_TYPES(M) \
-        M(arrow::Type::UINT8, DB::UInt8) \
-        M(arrow::Type::INT8, DB::Int8) \
-        M(arrow::Type::INT16, DB::Int16) \
-        M(arrow::Type::UINT64, DB::UInt64) \
-        M(arrow::Type::INT64, DB::Int64) \
-        M(arrow::Type::DURATION, DB::Int64) \
-        M(arrow::Type::HALF_FLOAT, DB::Float32) \
-        M(arrow::Type::FLOAT, DB::Float32) \
-        M(arrow::Type::DOUBLE, DB::Float64)
+        M(arrow::Type::UINT8, UInt8) \
+        M(arrow::Type::INT8, Int8) \
+        M(arrow::Type::INT16, Int16) \
+        M(arrow::Type::UINT64, UInt64) \
+        M(arrow::Type::INT64, Int64) \
+        M(arrow::Type::DURATION, Int64) \
+        M(arrow::Type::HALF_FLOAT, Float32) \
+        M(arrow::Type::FLOAT, Float32) \
+        M(arrow::Type::DOUBLE, Float64)
 
 #define FOR_ARROW_INDEXES_TYPES(M) \
-        M(arrow::Type::UINT8, DB::UInt8) \
-        M(arrow::Type::INT8, DB::UInt8) \
-        M(arrow::Type::UINT16, DB::UInt16) \
-        M(arrow::Type::INT16, DB::UInt16) \
-        M(arrow::Type::UINT32, DB::UInt32) \
-        M(arrow::Type::INT32, DB::UInt32) \
-        M(arrow::Type::UINT64, DB::UInt64) \
-        M(arrow::Type::INT64, DB::UInt64)
+        M(arrow::Type::UINT8, UInt8) \
+        M(arrow::Type::INT8, UInt8) \
+        M(arrow::Type::UINT16, UInt16) \
+        M(arrow::Type::INT16, UInt16) \
+        M(arrow::Type::UINT32, UInt32) \
+        M(arrow::Type::INT32, UInt32) \
+        M(arrow::Type::UINT64, UInt64) \
+        M(arrow::Type::INT64, UInt64)
 
 namespace DB
 {
@@ -78,7 +78,7 @@ namespace ErrorCodes
 
 /// Inserts numeric data right into internal column data to reduce an overhead
 template <typename NumericType, typename VectorType = ColumnVector<NumericType>>
-static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithNumericData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = std::make_shared<DataTypeNumber<NumericType>>();
     auto internal_column = internal_type->createColumn();
@@ -103,7 +103,7 @@ static ColumnWithTypeAndName readColumnWithNumericData(std::shared_ptr<arrow::Ch
 /// Internal offsets are shifted by one to the right in comparison with Arrow ones. So the last offset should map to the end of all chars.
 /// Also internal strings are null terminated.
 template <typename ArrowArray>
-static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithStringData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = std::make_shared<DataTypeString>();
     auto internal_column = internal_type->createColumn();
@@ -147,7 +147,7 @@ static ColumnWithTypeAndName readColumnWithStringData(std::shared_ptr<arrow::Chu
     return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-static ColumnWithTypeAndName readColumnWithFixedStringData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithFixedStringData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     const auto * fixed_type = assert_cast<arrow::FixedSizeBinaryType *>(arrow_column->type().get());
     size_t fixed_len = fixed_type->byte_width();
@@ -166,7 +166,7 @@ static ColumnWithTypeAndName readColumnWithFixedStringData(std::shared_ptr<arrow
 }
 
 template <typename ValueType>
-static ColumnWithTypeAndName readColumnWithBigIntegerFromFixedBinaryData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, const DataTypePtr & column_type)
+static ColumnWithTypeAndName readColumnWithBigIntegerFromFixedBinaryData(const 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();
@@ -193,7 +193,7 @@ static ColumnWithTypeAndName readColumnWithBigIntegerFromFixedBinaryData(std::sh
 }
 
 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)
+static ColumnWithTypeAndName readColumnWithBigNumberFromBinaryData(const 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)
@@ -229,7 +229,7 @@ static ColumnWithTypeAndName readColumnWithBigNumberFromBinaryData(std::shared_p
     return {std::move(internal_column), column_type, column_name};
 }
 
-static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithBooleanData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = DataTypeFactory::instance().get("Bool");
     auto internal_column = internal_type->createColumn();
@@ -248,7 +248,7 @@ static ColumnWithTypeAndName readColumnWithBooleanData(std::shared_ptr<arrow::Ch
     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(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name,
                                                       const DataTypePtr & type_hint, FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior)
 {
     DataTypePtr internal_type;
@@ -310,7 +310,7 @@ static ColumnWithTypeAndName readColumnWithDate32Data(std::shared_ptr<arrow::Chu
 }
 
 /// Arrow stores Parquet::DATETIME in Int64, while ClickHouse stores DateTime in UInt32. Therefore, it should be checked before saving
-static ColumnWithTypeAndName readColumnWithDate64Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithDate64Data(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = std::make_shared<DataTypeDateTime>();
     auto internal_column = internal_type->createColumn();
@@ -329,7 +329,7 @@ static ColumnWithTypeAndName readColumnWithDate64Data(std::shared_ptr<arrow::Chu
     return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-static ColumnWithTypeAndName readColumnWithTimestampData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithTimestampData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     const auto & arrow_type = static_cast<const arrow::TimestampType &>(*(arrow_column->type()));
     const UInt8 scale = arrow_type.unit() * 3;
@@ -350,7 +350,7 @@ static ColumnWithTypeAndName readColumnWithTimestampData(std::shared_ptr<arrow::
 }
 
 template <typename TimeType, typename TimeArray>
-static ColumnWithTypeAndName readColumnWithTimeData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithTimeData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     const auto & arrow_type = static_cast<const TimeType &>(*(arrow_column->type()));
     const UInt8 scale = arrow_type.unit() * 3;
@@ -373,18 +373,18 @@ static ColumnWithTypeAndName readColumnWithTimeData(std::shared_ptr<arrow::Chunk
     return {std::move(internal_column), std::move(internal_type), column_name};
 }
 
-static ColumnWithTypeAndName readColumnWithTime32Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithTime32Data(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     return readColumnWithTimeData<arrow::Time32Type, arrow::Time32Array>(arrow_column, column_name);
 }
 
-static ColumnWithTypeAndName readColumnWithTime64Data(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithTime64Data(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     return readColumnWithTimeData<arrow::Time64Type, arrow::Time64Array>(arrow_column, column_name);
 }
 
 template <typename DecimalType, typename DecimalArray>
-static ColumnWithTypeAndName readColumnWithDecimalDataImpl(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, DataTypePtr internal_type)
+static ColumnWithTypeAndName readColumnWithDecimalDataImpl(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name, DataTypePtr internal_type)
 {
     auto internal_column = internal_type->createColumn();
     auto & column = assert_cast<ColumnDecimal<DecimalType> &>(*internal_column);
@@ -403,7 +403,7 @@ static ColumnWithTypeAndName readColumnWithDecimalDataImpl(std::shared_ptr<arrow
 }
 
 template <typename DecimalArray>
-static ColumnWithTypeAndName readColumnWithDecimalData(std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
+static ColumnWithTypeAndName readColumnWithDecimalData(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     const auto * arrow_decimal_type = static_cast<arrow::DecimalType *>(arrow_column->type().get());
     size_t precision = arrow_decimal_type->precision();
@@ -418,7 +418,7 @@ static ColumnWithTypeAndName readColumnWithDecimalData(std::shared_ptr<arrow::Ch
 }
 
 /// Creates a null bytemap from arrow's null bitmap
-static ColumnPtr readByteMapFromArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+static ColumnPtr readByteMapFromArrowColumn(const std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
     if (!arrow_column->null_count())
         return ColumnUInt8::create(arrow_column->length(), 0);
@@ -453,7 +453,7 @@ struct ArrowOffsetArray<arrow::LargeListArray>
 };
 
 template <typename ArrowListArray>
-static ColumnPtr readOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+static ColumnPtr readOffsetsFromArrowListColumn(const std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
     auto offsets_column = ColumnUInt64::create();
     ColumnArray::Offsets & offsets_data = assert_cast<ColumnVector<UInt64> &>(*offsets_column).getData();
@@ -463,7 +463,7 @@ static ColumnPtr readOffsetsFromArrowListColumn(std::shared_ptr<arrow::ChunkedAr
     {
         ArrowListArray & list_chunk = dynamic_cast<ArrowListArray &>(*(arrow_column->chunk(chunk_i)));
         auto arrow_offsets_array = list_chunk.offsets();
-        auto & arrow_offsets = dynamic_cast<ArrowOffsetArray<ArrowListArray>::type &>(*arrow_offsets_array);
+        auto & arrow_offsets = dynamic_cast<typename ArrowOffsetArray<ArrowListArray>::type &>(*arrow_offsets_array);
 
         /*
          * CH uses element size as "offsets", while arrow uses actual offsets as offsets.
@@ -620,7 +620,7 @@ static ColumnPtr readColumnWithIndexesData(std::shared_ptr<arrow::ChunkedArray>
 }
 
 template <typename ArrowListArray>
-static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(std::shared_ptr<arrow::ChunkedArray> & arrow_column)
+static std::shared_ptr<arrow::ChunkedArray> getNestedArrowColumn(const std::shared_ptr<arrow::ChunkedArray> & arrow_column)
 {
     arrow::ArrayVector array_vector;
     array_vector.reserve(arrow_column->num_chunks());
@@ -648,7 +648,7 @@ 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)
+static ColumnWithTypeAndName readIPv6ColumnFromBinaryData(const 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)
@@ -684,7 +684,7 @@ static ColumnWithTypeAndName readIPv6ColumnFromBinaryData(std::shared_ptr<arrow:
     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)
+static ColumnWithTypeAndName readIPv4ColumnWithInt32Data(const std::shared_ptr<arrow::ChunkedArray> & arrow_column, const String & column_name)
 {
     auto internal_type = std::make_shared<DataTypeIPv4>();
     auto internal_column = internal_type->createColumn();
@@ -705,35 +705,31 @@ static ColumnWithTypeAndName readIPv4ColumnWithInt32Data(std::shared_ptr<arrow::
     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,
-    const std::string & format_name,
-    bool is_nullable,
-    std::unordered_map<String, ArrowColumnToCHColumn::DictionaryInfo> & dictionary_infos,
-    bool allow_null_type,
-    bool skip_columns_with_unsupported_types,
-    bool & skipped,
-    FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior = FormatSettings::DateTimeOverflowBehavior::Ignore,
-    DataTypePtr type_hint = nullptr,
-    bool is_map_nested = false)
+struct ReadColumnFromArrowColumnSettings
 {
-    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 &&
-        arrow_column->type()->id() != arrow::Type::DICTIONARY)
-    {
-        DataTypePtr nested_type_hint;
-        if (type_hint)
-            nested_type_hint = removeNullable(type_hint);
-        auto nested_column = readColumnFromArrowColumn(arrow_column, column_name, format_name, true, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, date_time_overflow_behavior, nested_type_hint);
-        if (skipped)
-            return {};
-        auto nullmap_column = readByteMapFromArrowColumn(arrow_column);
-        auto nullable_type = std::make_shared<DataTypeNullable>(std::move(nested_column.type));
-        auto nullable_column = ColumnNullable::create(nested_column.column, nullmap_column);
-        return {std::move(nullable_column), std::move(nullable_type), column_name};
-    }
+    std::string format_name;
+    FormatSettings::DateTimeOverflowBehavior date_time_overflow_behavior;
+    bool allow_arrow_null_type;
+    bool skip_columns_with_unsupported_types;
+};
 
+static ColumnWithTypeAndName readColumnFromArrowColumn(
+    const std::shared_ptr<arrow::ChunkedArray> & arrow_column,
+    std::string column_name,
+    std::unordered_map<String, ArrowColumnToCHColumn::DictionaryInfo> dictionary_infos,
+    DataTypePtr type_hint,
+    bool is_nullable_column,
+    bool is_map_nested_column,
+    const ReadColumnFromArrowColumnSettings & settings);
+
+static ColumnWithTypeAndName readNonNullableColumnFromArrowColumn(
+    const std::shared_ptr<arrow::ChunkedArray> & arrow_column,
+    std::string column_name,
+    std::unordered_map<String, ArrowColumnToCHColumn::DictionaryInfo> dictionary_infos,
+    DataTypePtr type_hint,
+    bool is_map_nested_column,
+    const ReadColumnFromArrowColumnSettings & settings)
+{
     switch (arrow_column->type()->id())
     {
         case arrow::Type::STRING:
@@ -790,7 +786,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         case arrow::Type::BOOL:
             return readColumnWithBooleanData(arrow_column, column_name);
         case arrow::Type::DATE32:
-            return readColumnWithDate32Data(arrow_column, column_name, type_hint, date_time_overflow_behavior);
+            return readColumnWithDate32Data(arrow_column, column_name, type_hint, settings.date_time_overflow_behavior);
         case arrow::Type::DATE64:
             return readColumnWithDate64Data(arrow_column, column_name);
         // ClickHouse writes Date as arrow UINT16 and DateTime as arrow UINT32,
@@ -837,9 +833,16 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                     key_type_hint = map_type_hint->getKeyType();
                 }
             }
+
             auto arrow_nested_column = getNestedArrowColumn<arrow::ListArray>(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, date_time_overflow_behavior, nested_type_hint, true);
-            if (skipped)
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column,
+                column_name,
+                dictionary_infos,
+                nested_type_hint,
+                false /*is_nullable_column*/,
+                true /*is_map_nested_column*/,
+                settings);
+            if (!nested_column.column)
                 return {};
 
             auto offsets_column = readOffsetsFromArrowListColumn<arrow::ListArray>(arrow_column);
@@ -866,7 +869,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         case arrow::Type::LIST:
         case arrow::Type::LARGE_LIST:
         {
-            bool is_large = arrow_column->type()->id() == arrow::Type::LARGE_LIST;
+            bool is_large_list = arrow_column->type()->id() == arrow::Type::LARGE_LIST;
             DataTypePtr nested_type_hint;
             if (type_hint)
             {
@@ -874,12 +877,33 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                 if (array_type_hint)
                     nested_type_hint = array_type_hint->getNestedType();
             }
-            auto arrow_nested_column = is_large ? getNestedArrowColumn<arrow::LargeListArray>(arrow_column) : getNestedArrowColumn<arrow::ListArray>(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, date_time_overflow_behavior, nested_type_hint);
-            if (skipped)
+
+            bool is_nested_nullable_column = false;
+            if (is_large_list)
+            {
+                auto * arrow_large_list_type = assert_cast<arrow::LargeListType *>(arrow_column->type().get());
+                is_nested_nullable_column = arrow_large_list_type->value_field()->nullable();
+            }
+            else
+            {
+                auto * arrow_list_type = assert_cast<arrow::ListType *>(arrow_column->type().get());
+                is_nested_nullable_column = arrow_list_type->value_field()->nullable();
+            }
+
+            auto arrow_nested_column = is_large_list ? getNestedArrowColumn<arrow::LargeListArray>(arrow_column) : getNestedArrowColumn<arrow::ListArray>(arrow_column);
+            auto nested_column = readColumnFromArrowColumn(arrow_nested_column,
+                column_name,
+                dictionary_infos,
+                nested_type_hint,
+                is_nested_nullable_column,
+                false /*is_map_nested_column*/,
+                settings);
+            if (!nested_column.column)
                 return {};
-            auto offsets_column = is_large ? readOffsetsFromArrowListColumn<arrow::LargeListArray>(arrow_column) : readOffsetsFromArrowListColumn<arrow::ListArray>(arrow_column);
+
+            auto offsets_column = is_large_list ? readOffsetsFromArrowListColumn<arrow::LargeListArray>(arrow_column) : readOffsetsFromArrowListColumn<arrow::ListArray>(arrow_column);
             auto array_column = ColumnArray::create(nested_column.column, offsets_column);
+
             DataTypePtr array_type;
             /// If type hint is Nested, we should return Nested type,
             /// because we differentiate Nested and simple Array(Tuple)
@@ -913,11 +937,13 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
 
             for (int i = 0; i != arrow_struct_type->num_fields(); ++i)
             {
-                auto field_name = arrow_struct_type->field(i)->name();
+                const auto & field = arrow_struct_type->field(i);
+                const auto & field_name = field->name();
+
                 DataTypePtr nested_type_hint;
                 if (tuple_type_hint)
                 {
-                    if (tuple_type_hint->haveExplicitNames() && !is_map_nested)
+                    if (tuple_type_hint->haveExplicitNames() && !is_map_nested_column)
                     {
                         auto pos = tuple_type_hint->tryGetPositionByName(field_name);
                         if (pos)
@@ -926,13 +952,21 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                     else if (size_t(i) < tuple_type_hint->getElements().size())
                         nested_type_hint = tuple_type_hint->getElement(i);
                 }
+
                 auto nested_arrow_column = std::make_shared<arrow::ChunkedArray>(nested_arrow_columns[i]);
-                auto element = readColumnFromArrowColumn(nested_arrow_column, field_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, date_time_overflow_behavior, nested_type_hint);
-                if (skipped)
+                auto column_with_type_and_name = readColumnFromArrowColumn(nested_arrow_column,
+                    field_name,
+                    dictionary_infos,
+                    nested_type_hint,
+                    field->nullable(),
+                    false /*is_map_nested_column*/,
+                    settings);
+                if (!column_with_type_and_name.column)
                     return {};
-                tuple_elements.emplace_back(std::move(element.column));
-                tuple_types.emplace_back(std::move(element.type));
-                tuple_names.emplace_back(std::move(element.name));
+
+                tuple_elements.emplace_back(std::move(column_with_type_and_name.column));
+                tuple_types.emplace_back(std::move(column_with_type_and_name.type));
+                tuple_names.emplace_back(std::move(column_with_type_and_name.name));
             }
 
             auto tuple_column = ColumnTuple::create(std::move(tuple_elements));
@@ -953,8 +987,19 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                     arrow::DictionaryArray & dict_chunk = dynamic_cast<arrow::DictionaryArray &>(*(arrow_column->chunk(chunk_i)));
                     dict_array.emplace_back(dict_chunk.dictionary());
                 }
+
                 auto arrow_dict_column = std::make_shared<arrow::ChunkedArray>(dict_array);
-                auto dict_column = readColumnFromArrowColumn(arrow_dict_column, column_name, format_name, false, dictionary_infos, allow_null_type, skip_columns_with_unsupported_types, skipped, date_time_overflow_behavior);
+                auto dict_column = readColumnFromArrowColumn(arrow_dict_column,
+                    column_name,
+                    dictionary_infos,
+                    nullptr /*nested_type_hint*/,
+                    false /*is_nullable_column*/,
+                    false /*is_map_nested_column*/,
+                    settings);
+
+                if (!dict_column.column)
+                    return {};
+
                 for (size_t i = 0; i != dict_column.column->size(); ++i)
                 {
                     if (dict_column.column->isDefaultAt(i))
@@ -963,6 +1008,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                         break;
                     }
                 }
+
                 auto lc_type = std::make_shared<DataTypeLowCardinality>(is_lc_nullable ? makeNullable(dict_column.type) : dict_column.type);
                 auto tmp_lc_column = lc_type->createColumn();
                 auto tmp_dict_column = IColumn::mutate(assert_cast<ColumnLowCardinality *>(tmp_lc_column.get())->getDictionaryPtr());
@@ -1002,7 +1048,7 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
             // TODO: read UUID as a string?
         case arrow::Type::NA:
         {
-            if (allow_null_type)
+            if (settings.allow_arrow_null_type)
             {
                 auto type = std::make_shared<DataTypeNothing>();
                 auto column = ColumnNothing::create(arrow_column->length());
@@ -1012,11 +1058,8 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
         }
         default:
         {
-            if (skip_columns_with_unsupported_types)
-            {
-                skipped = true;
+            if (settings.skip_columns_with_unsupported_types)
                 return {};
-            }
 
             throw Exception(
                             ErrorCodes::UNKNOWN_TYPE,
@@ -1024,14 +1067,59 @@ static ColumnWithTypeAndName readColumnFromArrowColumn(
                             "If it happens during schema inference and you want to skip columns with "
                             "unsupported types, you can enable setting input_format_{}"
                             "_skip_columns_with_unsupported_types_in_schema_inference",
-                            format_name,
+                            settings.format_name,
                             arrow_column->type()->name(),
                             column_name,
-                            boost::algorithm::to_lower_copy(format_name));
+                            boost::algorithm::to_lower_copy(settings.format_name));
         }
     }
 }
 
+static ColumnWithTypeAndName readColumnFromArrowColumn(
+    const std::shared_ptr<arrow::ChunkedArray> & arrow_column,
+    std::string column_name,
+    std::unordered_map<String, ArrowColumnToCHColumn::DictionaryInfo> dictionary_infos,
+    DataTypePtr type_hint,
+    bool is_nullable_column,
+    bool is_map_nested_column,
+    const ReadColumnFromArrowColumnSettings & settings)
+{
+    bool read_as_nullable_column = arrow_column->null_count() || is_nullable_column || (type_hint && type_hint->isNullable());
+    if (read_as_nullable_column &&
+        arrow_column->type()->id() != arrow::Type::LIST &&
+        arrow_column->type()->id() != arrow::Type::LARGE_LIST &&
+        arrow_column->type()->id() != arrow::Type::MAP &&
+        arrow_column->type()->id() != arrow::Type::STRUCT &&
+        arrow_column->type()->id() != arrow::Type::DICTIONARY)
+    {
+        DataTypePtr nested_type_hint;
+        if (type_hint)
+            nested_type_hint = removeNullable(type_hint);
+
+        auto nested_column = readNonNullableColumnFromArrowColumn(arrow_column,
+            column_name,
+            dictionary_infos,
+            nested_type_hint,
+            is_map_nested_column,
+            settings);
+
+        if (!nested_column.column)
+            return {};
+
+        auto nullmap_column = readByteMapFromArrowColumn(arrow_column);
+        auto nullable_type = std::make_shared<DataTypeNullable>(std::move(nested_column.type));
+        auto nullable_column = ColumnNullable::create(nested_column.column, nullmap_column);
+
+        return {std::move(nullable_column), std::move(nullable_type), column_name};
+    }
+
+    return readNonNullableColumnFromArrowColumn(arrow_column,
+        column_name,
+        dictionary_infos,
+        type_hint,
+        is_map_nested_column,
+        settings);
+}
 
 // Creating CH header by arrow schema. Will be useful in task about inserting
 // data from file without knowing table structure.
@@ -1042,44 +1130,56 @@ static void checkStatus(const arrow::Status & status, const String & column_name
         throw Exception{ErrorCodes::UNKNOWN_EXCEPTION, "Error with a {} column '{}': {}.", format_name, column_name, status.ToString()};
 }
 
+/// Create empty arrow column using specified field
+static std::shared_ptr<arrow::ChunkedArray> createArrowColumn(const std::shared_ptr<arrow::Field> & field, const String & format_name)
+{
+    arrow::MemoryPool * pool = arrow::default_memory_pool();
+    std::unique_ptr<arrow::ArrayBuilder> array_builder;
+    arrow::Status status = MakeBuilder(pool, field->type(), &array_builder);
+    checkStatus(status, field->name(), format_name);
+
+    std::shared_ptr<arrow::Array> arrow_array;
+    status = array_builder->Finish(&arrow_array);
+    checkStatus(status, field->name(), format_name);
+
+    return std::make_shared<arrow::ChunkedArray>(arrow::ArrayVector{arrow_array});
+}
 
 Block ArrowColumnToCHColumn::arrowSchemaToCHHeader(
-    const arrow::Schema & schema, const std::string & format_name,
-    bool skip_columns_with_unsupported_types, const Block * hint_header, bool ignore_case)
+    const arrow::Schema & schema,
+    const std::string & format_name,
+    bool skip_columns_with_unsupported_types)
 {
+    ReadColumnFromArrowColumnSettings settings
+    {
+        .format_name = format_name,
+        .date_time_overflow_behavior = FormatSettings::DateTimeOverflowBehavior::Ignore,
+        .allow_arrow_null_type = false,
+        .skip_columns_with_unsupported_types = skip_columns_with_unsupported_types
+    };
+
     ColumnsWithTypeAndName sample_columns;
-    std::unordered_set<String> nested_table_names;
-    if (hint_header)
-        nested_table_names = Nested::getAllTableNames(*hint_header, ignore_case);
 
     for (const auto & field : schema.fields())
     {
-        if (hint_header && !hint_header->has(field->name(), ignore_case)
-            && !nested_table_names.contains(ignore_case ? boost::to_lower_copy(field->name()) : field->name()))
-            continue;
-
         /// Create empty arrow column by it's type and convert it to ClickHouse column.
-        arrow::MemoryPool * pool = arrow::default_memory_pool();
-        std::unique_ptr<arrow::ArrayBuilder> array_builder;
-        arrow::Status status = MakeBuilder(pool, field->type(), &array_builder);
-        checkStatus(status, field->name(), format_name);
+        auto arrow_column = createArrowColumn(field, format_name);
 
-        std::shared_ptr<arrow::Array> arrow_array;
-        status = array_builder->Finish(&arrow_array);
-        checkStatus(status, field->name(), format_name);
-
-        arrow::ArrayVector array_vector = {arrow_array};
-        auto arrow_column = std::make_shared<arrow::ChunkedArray>(array_vector);
         std::unordered_map<std::string, DictionaryInfo> dict_infos;
-        bool skipped = false;
-        bool allow_null_type = false;
-        if (hint_header && hint_header->has(field->name()) && hint_header->getByName(field->name()).type->isNullable())
-            allow_null_type = true;
-        ColumnWithTypeAndName sample_column = readColumnFromArrowColumn(
-            arrow_column, field->name(), format_name, false, dict_infos, allow_null_type, skip_columns_with_unsupported_types, skipped);
-        if (!skipped)
+
+        auto sample_column = readColumnFromArrowColumn(
+            arrow_column,
+            field->name(),
+            dict_infos,
+            nullptr /*nested_type_hint*/,
+            field->nullable() /*is_nullable_column*/,
+            false /*is_map_nested_column*/,
+            settings);
+
+        if (sample_column.column)
             sample_columns.emplace_back(std::move(sample_column));
     }
+
     return Block(std::move(sample_columns));
 }
 
@@ -1101,30 +1201,43 @@ ArrowColumnToCHColumn::ArrowColumnToCHColumn(
 {
 }
 
-void ArrowColumnToCHColumn::arrowTableToCHChunk(Chunk & res, std::shared_ptr<arrow::Table> & table, size_t num_rows, BlockMissingValues * block_missing_values)
+Chunk ArrowColumnToCHColumn::arrowTableToCHChunk(const std::shared_ptr<arrow::Table> & table, size_t num_rows, BlockMissingValues * block_missing_values)
 {
-    NameToColumnPtr name_to_column_ptr;
+    NameToArrowColumn name_to_arrow_column;
+
     for (auto column_name : table->ColumnNames())
     {
-        std::shared_ptr<arrow::ChunkedArray> arrow_column = table->GetColumnByName(column_name);
+        auto arrow_column = table->GetColumnByName(column_name);
         if (!arrow_column)
             throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Column '{}' is duplicated", column_name);
 
+        auto arrow_field = table->schema()->GetFieldByName(column_name);
+
         if (case_insensitive_matching)
             boost::to_lower(column_name);
-        name_to_column_ptr[std::move(column_name)] = arrow_column;
+
+        name_to_arrow_column[std::move(column_name)] = {std::move(arrow_column), std::move(arrow_field)};
     }
 
-    arrowColumnsToCHChunk(res, name_to_column_ptr, num_rows, block_missing_values);
+    return arrowColumnsToCHChunk(name_to_arrow_column, num_rows, block_missing_values);
 }
 
-void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr & name_to_column_ptr, size_t num_rows, BlockMissingValues * block_missing_values)
+Chunk ArrowColumnToCHColumn::arrowColumnsToCHChunk(const NameToArrowColumn & name_to_arrow_column, size_t num_rows, BlockMissingValues * block_missing_values)
 {
-    Columns columns_list;
-    columns_list.reserve(header.columns());
+    ReadColumnFromArrowColumnSettings settings
+    {
+        .format_name = format_name,
+        .date_time_overflow_behavior = date_time_overflow_behavior,
+        .allow_arrow_null_type = true,
+        .skip_columns_with_unsupported_types = false
+    };
+
+    Columns columns;
+    columns.reserve(header.columns());
+
     std::unordered_map<String, std::pair<BlockPtr, std::shared_ptr<NestedColumnExtractHelper>>> nested_tables;
-    bool skipped = false;
-    for (size_t column_i = 0, columns = header.columns(); column_i < columns; ++column_i)
+
+    for (size_t column_i = 0, header_columns = header.columns(); column_i < header_columns; ++column_i)
     {
         const ColumnWithTypeAndName & header_column = header.getByPosition(column_i);
 
@@ -1133,15 +1246,17 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
             boost::to_lower(search_column_name);
 
         ColumnWithTypeAndName column;
-        if (!name_to_column_ptr.contains(search_column_name))
+        if (!name_to_arrow_column.contains(search_column_name))
         {
             bool read_from_nested = false;
+
             /// Check if it's a subcolumn from some struct.
             String nested_table_name = Nested::extractTableName(header_column.name);
             String search_nested_table_name = nested_table_name;
             if (case_insensitive_matching)
                 boost::to_lower(search_nested_table_name);
-            if (name_to_column_ptr.contains(search_nested_table_name))
+
+            if (name_to_arrow_column.contains(search_nested_table_name))
             {
                 if (!nested_tables.contains(search_nested_table_name))
                 {
@@ -1153,10 +1268,19 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
                     }
                     auto nested_table_type = Nested::collect(nested_columns).front().type;
 
-                    std::shared_ptr<arrow::ChunkedArray> arrow_column = name_to_column_ptr[search_nested_table_name];
-                    ColumnsWithTypeAndName cols = {
-                        readColumnFromArrowColumn(arrow_column, nested_table_name, format_name, false, dictionary_infos, true, false,
-                                                  skipped, date_time_overflow_behavior, nested_table_type)};
+                    const auto & arrow_column = name_to_arrow_column.find(search_nested_table_name)->second;
+
+                    ColumnsWithTypeAndName cols =
+                    {
+                        readColumnFromArrowColumn(arrow_column.column,
+                            nested_table_name,
+                            dictionary_infos,
+                            nested_table_type,
+                            arrow_column.field->nullable() /*is_nullable_column*/,
+                            false /*is_map_nested_column*/,
+                            settings)
+                    };
+
                     BlockPtr block_ptr = std::make_shared<Block>(cols);
                     auto column_extractor = std::make_shared<NestedColumnExtractHelper>(*block_ptr, case_insensitive_matching);
                     nested_tables[search_nested_table_name] = {block_ptr, column_extractor};
@@ -1180,7 +1304,7 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
                     column.name = header_column.name;
                     column.type = header_column.type;
                     column.column = header_column.column->cloneResized(num_rows);
-                    columns_list.push_back(std::move(column.column));
+                    columns.push_back(std::move(column.column));
                     if (block_missing_values)
                         block_missing_values->setBits(column_i, num_rows);
                     continue;
@@ -1189,9 +1313,14 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
         }
         else
         {
-            auto arrow_column = name_to_column_ptr[search_column_name];
-            column = readColumnFromArrowColumn(
-                arrow_column, header_column.name, format_name, false, dictionary_infos, true, false, skipped, date_time_overflow_behavior, header_column.type);
+            const auto & arrow_column = name_to_arrow_column.find(search_column_name)->second;
+            column = readColumnFromArrowColumn(arrow_column.column,
+                header_column.name,
+                dictionary_infos,
+                header_column.type,
+                arrow_column.field->nullable(),
+                false /*is_map_nested_column*/,
+                settings);
         }
 
         if (null_as_default)
@@ -1216,10 +1345,10 @@ void ArrowColumnToCHColumn::arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr &
         }
 
         column.type = header_column.type;
-        columns_list.push_back(std::move(column.column));
+        columns.push_back(std::move(column.column));
     }
 
-    res.setColumns(columns_list, num_rows);
+    return Chunk(std::move(columns), num_rows);
 }
 
 }
diff --git a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
index 079e0374917..27e9afdf763 100644
--- a/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
+++ b/src/Processors/Formats/Impl/ArrowColumnToCHColumn.h
@@ -19,8 +19,6 @@ class Chunk;
 class ArrowColumnToCHColumn
 {
 public:
-    using NameToColumnPtr = std::unordered_map<std::string, std::shared_ptr<arrow::ChunkedArray>>;
-
     ArrowColumnToCHColumn(
         const Block & header_,
         const std::string & format_name_,
@@ -30,18 +28,13 @@ public:
         bool case_insensitive_matching_ = false,
         bool is_stream_ = false);
 
-    void arrowTableToCHChunk(Chunk & res, std::shared_ptr<arrow::Table> & table, size_t num_rows, BlockMissingValues * block_missing_values = nullptr);
+    Chunk arrowTableToCHChunk(const std::shared_ptr<arrow::Table> & table, size_t num_rows, BlockMissingValues * block_missing_values = nullptr);
 
-    void arrowColumnsToCHChunk(Chunk & res, NameToColumnPtr & name_to_column_ptr, size_t num_rows, BlockMissingValues * block_missing_values = nullptr);
-
-    /// Transform arrow schema to ClickHouse header. If hint_header is provided,
-    /// we will skip columns in schema that are not in hint_header.
+    /// Transform arrow schema to ClickHouse header
     static Block arrowSchemaToCHHeader(
         const arrow::Schema & schema,
         const std::string & format_name,
-        bool skip_columns_with_unsupported_types = false,
-        const Block * hint_header = nullptr,
-        bool ignore_case = false);
+        bool skip_columns_with_unsupported_types = false);
 
     struct DictionaryInfo
     {
@@ -52,6 +45,16 @@ public:
 
 
 private:
+    struct ArrowColumn
+    {
+        std::shared_ptr<arrow::ChunkedArray> column;
+        std::shared_ptr<arrow::Field> field;
+    };
+
+    using NameToArrowColumn = std::unordered_map<std::string, ArrowColumn>;
+
+    Chunk arrowColumnsToCHChunk(const NameToArrowColumn & name_to_arrow_column, size_t num_rows, BlockMissingValues * block_missing_values);
+
     const Block & header;
     const std::string format_name;
     /// If false, throw exception if some columns in header not exists in arrow table.
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
index 46d1c426ef4..2ed55cca30c 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.cpp
@@ -212,7 +212,7 @@ static AvroDeserializer::DeserializeFn createDecimalDeserializeFn(const avro::No
     };
 }
 
-static std::string nodeToJson(avro::NodePtr root_node)
+static std::string nodeToJSON(avro::NodePtr root_node)
 {
     std::ostringstream ss;      // STYLE_CHECK_ALLOW_STD_STRING_STREAM
     ss.exceptions(std::ios::failbit);
@@ -641,7 +641,7 @@ AvroDeserializer::DeserializeFn AvroDeserializer::createDeserializeFn(const avro
 
     throw Exception(ErrorCodes::ILLEGAL_COLUMN,
         "Type {} is not compatible with Avro {}:\n{}",
-        target_type->getName(), avro::toString(root_node->type()), nodeToJson(root_node));
+        target_type->getName(), avro::toString(root_node->type()), nodeToJSON(root_node));
 }
 
 AvroDeserializer::SkipFn AvroDeserializer::createSkipFn(const avro::NodePtr & root_node)
@@ -984,10 +984,13 @@ private:
             try
             {
                 Poco::URI url(base_url, base_url.getPath() + "/schemas/ids/" + std::to_string(id));
-                LOG_TRACE((&Poco::Logger::get("AvroConfluentRowInputFormat")), "Fetching schema id = {} from url {}", id, url.toString());
+                LOG_TRACE((getLogger("AvroConfluentRowInputFormat")), "Fetching schema id = {} from url {}", id, url.toString());
 
                 /// One second for connect/send/receive. Just in case.
-                ConnectionTimeouts timeouts({1, 0}, {1, 0}, {1, 0});
+                auto timeouts = ConnectionTimeouts()
+                    .withConnectionTimeout(1)
+                    .withSendTimeout(1)
+                    .withReceiveTimeout(1);
 
                 Poco::Net::HTTPRequest request(Poco::Net::HTTPRequest::HTTP_GET, url.getPathAndQuery(), Poco::Net::HTTPRequest::HTTP_1_1);
                 request.setHost(url.getHost());
@@ -1013,7 +1016,7 @@ private:
                     http_basic_credentials.authenticate(request);
                 }
 
-                auto session = makePooledHTTPSession(url, timeouts, 1);
+                auto session = makeHTTPSession(HTTPConnectionGroupType::HTTP, url, timeouts);
                 session->sendRequest(request);
 
                 Poco::Net::HTTPResponse response;
@@ -1022,11 +1025,9 @@ private:
                 Poco::JSON::Parser parser;
                 auto json_body = parser.parse(*response_body).extract<Poco::JSON::Object::Ptr>();
 
-                /// Response was fully read.
-                markSessionForReuse(session);
 
                 auto schema = json_body->getValue<std::string>("schema");
-                LOG_TRACE((&Poco::Logger::get("AvroConfluentRowInputFormat")), "Successfully fetched schema id = {}\n{}", id, schema);
+                LOG_TRACE((getLogger("AvroConfluentRowInputFormat")), "Successfully fetched schema id = {}\n{}", id, schema);
                 return avro::compileJsonSchemaFromString(schema);
             }
             catch (const Exception &)
diff --git a/src/Processors/Formats/Impl/AvroRowInputFormat.h b/src/Processors/Formats/Impl/AvroRowInputFormat.h
index a8364df6e80..78dfe65fa5e 100644
--- a/src/Processors/Formats/Impl/AvroRowInputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowInputFormat.h
@@ -183,7 +183,7 @@ public:
     class SchemaRegistry;
 
 private:
-    virtual bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
+    bool readRow(MutableColumns & columns, RowReadExtension & ext) override;
     void readPrefix() override;
 
     bool allowSyncAfterError() const override { return true; }
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
index 38df7ad0d0a..a79a7d10c78 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.cpp
@@ -52,7 +52,7 @@ public:
         : string_to_string_regexp(settings_.avro.string_column_pattern)
     {
         if (!string_to_string_regexp.ok())
-            throw DB::Exception(DB::ErrorCodes::CANNOT_COMPILE_REGEXP, "Avro: cannot compile re2: {}, error: {}. "
+            throw Exception(ErrorCodes::CANNOT_COMPILE_REGEXP, "Avro: cannot compile re2: {}, error: {}. "
                 "Look at https://github.com/google/re2/wiki/Syntax for reference.",
                 settings_.avro.string_column_pattern, string_to_string_regexp.error());
     }
@@ -520,8 +520,11 @@ static avro::Codec getCodec(const std::string & codec_name)
 
     if (codec_name == "null")    return avro::Codec::NULL_CODEC;
     if (codec_name == "deflate") return avro::Codec::DEFLATE_CODEC;
+    if (codec_name == "zstd")
+        return avro::Codec::ZSTD_CODEC;
 #ifdef SNAPPY_CODEC_AVAILABLE
-    if (codec_name == "snappy")  return avro::Codec::SNAPPY_CODEC;
+    if (codec_name == "snappy")
+        return avro::Codec::SNAPPY_CODEC;
 #endif
 
     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Avro codec {} is not available", codec_name);
diff --git a/src/Processors/Formats/Impl/AvroRowOutputFormat.h b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
index c526936b383..5d308d78966 100644
--- a/src/Processors/Formats/Impl/AvroRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/AvroRowOutputFormat.h
@@ -48,16 +48,16 @@ class AvroRowOutputFormat final : public IRowOutputFormat
 {
 public:
     AvroRowOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & settings_);
-    virtual ~AvroRowOutputFormat() override;
+    ~AvroRowOutputFormat() override;
 
     String getName() const override { return "AvroRowOutputFormat"; }
 
 private:
     void write(const Columns & columns, size_t row_num) override;
     void writeField(const IColumn &, const ISerialization &, size_t) override {}
-    virtual void writePrefix() override;
-    virtual void finalizeImpl() override;
-    virtual void resetFormatterImpl() override;
+    void writePrefix() override;
+    void finalizeImpl() override;
+    void resetFormatterImpl() override;
 
     void createFileWriter();
 
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
index 2ca52a92c77..2b40e796c5c 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.cpp
@@ -2,7 +2,6 @@
 
 #if USE_ARROW || USE_PARQUET
 
-// #include <base/Decimal.h>
 #include <Columns/ColumnFixedString.h>
 #include <Columns/ColumnNullable.h>
 #include <Columns/ColumnString.h>
@@ -10,6 +9,7 @@
 #include <Columns/ColumnTuple.h>
 #include <Columns/ColumnLowCardinality.h>
 #include <Columns/ColumnMap.h>
+#include <Common/DateLUTImpl.h>
 #include <Core/callOnTypeIndex.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesDecimal.h>
@@ -130,6 +130,11 @@ namespace DB
                 reinterpret_cast<const uint8_t *>(internal_data.data() + start),
                 end - start,
                 reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
+        else if constexpr (std::is_same_v<NumericType, Int8>)
+            status = builder.AppendValues(
+                reinterpret_cast<const int8_t *>(internal_data.data() + start),
+                end - start,
+                reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
         else
             status = builder.AppendValues(internal_data.data() + start, end - start, reinterpret_cast<const uint8_t *>(arrow_null_bytemap_raw_ptr));
         checkStatus(status, write_column->getName(), format_name);
@@ -200,8 +205,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values);
 
     template <typename Builder>
@@ -214,8 +218,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_array = assert_cast<const ColumnArray *>(column.get());
@@ -236,7 +239,7 @@ namespace DB
             /// Pass null null_map, because fillArrowArray will decide whether nested_type is nullable, if nullable, it will create a new null_map from nested_column
             /// Note that it is only needed by gluten(https://github.com/oap-project/gluten), because array type in gluten is by default nullable.
             /// And it does not influence the original ClickHouse logic, because null_map passed to fillArrowArrayWithArrayColumnData is always nullptr for ClickHouse doesn't allow nullable complex types including array type.
-            fillArrowArray(column_name, nested_column, nested_type, nullptr, value_builder, format_name, offsets[array_idx - 1], offsets[array_idx], output_string_as_string, output_fixed_string_as_fixed_byte_array, dictionary_values);
+            fillArrowArray(column_name, nested_column, nested_type, nullptr, value_builder, format_name, offsets[array_idx - 1], offsets[array_idx], settings, dictionary_values);
         }
     }
 
@@ -249,8 +252,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_tuple = assert_cast<const ColumnTuple *>(column.get());
@@ -269,8 +271,7 @@ namespace DB
                 builder.field_builder(static_cast<int>(i)),
                 format_name,
                 start, end,
-                output_string_as_string,
-                output_fixed_string_as_fixed_byte_array,
+                settings,
                 dictionary_values);
         }
 
@@ -360,13 +361,15 @@ namespace DB
     static void checkIfIndexesTypeIsExceeded(const std::shared_ptr<arrow::DataType> & arrow_type, size_t dict_size)
     {
         const auto & dict_indexes_arrow_type = assert_cast<const arrow::DictionaryType *>(arrow_type.get())->index_type();
-        /// We use UInt32 or UInt64 type for indexes. It makes sense to check overflow only for UInt32.
+        /// We can use Int32/UInt32/Int64/UInt64 type for indexes.
+        const auto * indexes_int32_type = typeid_cast<const arrow::Int32Type *>(dict_indexes_arrow_type.get());
         const auto * indexes_uint32_type = typeid_cast<const arrow::UInt32Type *>(dict_indexes_arrow_type.get());
-        if (indexes_uint32_type && dict_size > UINT32_MAX)
+        const auto * indexes_int64_type = typeid_cast<const arrow::UInt32Type *>(dict_indexes_arrow_type.get());
+        if ((indexes_int32_type && dict_size > INT32_MAX) || (indexes_uint32_type && dict_size > UINT32_MAX) || (indexes_int64_type && dict_size > INT64_MAX))
             throw Exception(
                 ErrorCodes::ILLEGAL_COLUMN,
                 "Cannot convert ClickHouse LowCardinality column to Arrow Dictionary column:"
-                " resulting dictionary size exceeds the max value of index type UInt32");
+                " resulting dictionary size exceeds the max value of index type {}", dict_indexes_arrow_type->name());
     }
 
     template<typename ValueType>
@@ -379,8 +382,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         const auto * column_lc = assert_cast<const ColumnLowCardinality *>(column.get());
@@ -422,7 +424,7 @@ namespace DB
 
         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);
+        fillArrowArray(column_name, dict_column, dict_type, nullptr, values_builder.get(), format_name, is_nullable, dict_column->size(), settings, dictionary_values);
         std::shared_ptr<arrow::Array> arrow_dict_array;
         status = values_builder->Finish(&arrow_dict_array);
         checkStatus(status, column->getName(), format_name);
@@ -462,8 +464,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         auto value_type = assert_cast<arrow::DictionaryType *>(array_builder->type().get())->value_type();
@@ -471,7 +472,7 @@ namespace DB
 #define DISPATCH(ARROW_TYPE_ID, ARROW_TYPE) \
         if (arrow::Type::ARROW_TYPE_ID == value_type->id()) \
         { \
-            fillArrowArrayWithLowCardinalityColumnDataImpl<ARROW_TYPE>(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); \
+            fillArrowArrayWithLowCardinalityColumnDataImpl<ARROW_TYPE>(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, settings, dictionary_values); \
             return; \
         }
 
@@ -694,8 +695,7 @@ namespace DB
         String format_name,
         size_t start,
         size_t end,
-        bool output_string_as_string,
-        bool output_fixed_string_as_fixed_byte_array,
+        const CHColumnToArrowColumn::Settings & settings,
         std::unordered_map<String, MutableColumnPtr> & dictionary_values)
     {
         switch (column_type->getTypeId())
@@ -707,12 +707,12 @@ namespace DB
                 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);
+                fillArrowArray(column_name, nested_column, nested_type, &bytemap, array_builder, format_name, start, end, settings, dictionary_values);
                 break;
             }
             case TypeIndex::String:
             {
-                if (output_string_as_string)
+                if (settings.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);
@@ -720,9 +720,9 @@ namespace DB
             }
             case TypeIndex::FixedString:
             {
-                if (output_fixed_string_as_fixed_byte_array)
+                if (settings.output_fixed_string_as_fixed_byte_array)
                     fillArrowArrayWithFixedStringColumnData(column, null_bytemap, format_name, array_builder, start, end);
-                else if (output_string_as_string)
+                else if (settings.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);
@@ -744,19 +744,19 @@ namespace DB
                 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);
+                fillArrowArrayWithArrayColumnData<arrow::ListBuilder>(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, settings, 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);
+                fillArrowArrayWithTupleColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, settings, 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);
+                fillArrowArrayWithLowCardinalityColumnData(column_name, column, column_type, null_bytemap, array_builder, format_name, start, end, settings, 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);
+                fillArrowArrayWithArrayColumnData<arrow::MapBuilder>(column_name, column_array, array_type, null_bytemap, array_builder, format_name, start, end, settings, dictionary_values);
                 break;
             }
             case TypeIndex::Decimal32:
@@ -811,7 +811,7 @@ namespace DB
         }
     }
 
-    static std::shared_ptr<arrow::DataType> getArrowTypeForLowCardinalityIndexes(ColumnPtr indexes_column)
+    static std::shared_ptr<arrow::DataType> getArrowTypeForLowCardinalityIndexes(ColumnPtr indexes_column, const CHColumnToArrowColumn::Settings & settings)
     {
         switch (indexes_column->getDataType())
         {
@@ -827,12 +827,16 @@ namespace DB
             /// In most cases UInt32 should be enough (with more unique values using dictionary is quite meaningless).
             /// So we use minimum UInt32 type here (actually maybe even UInt16 will be enough).
             /// In case if it's exceeded during dictionary extension, an exception will be thrown.
+            /// There are also 2 settings that can change the indexes type that will be used for Dictionary indexes:
+            /// use_64_bit_indexes_for_dictionary and use_signed_indexes_for_dictionary.
             case TypeIndex::UInt8:
             case TypeIndex::UInt16:
             case TypeIndex::UInt32:
-                return arrow::uint32();
+                if (!settings.use_64_bit_indexes_for_dictionary)
+                    return settings.use_signed_indexes_for_dictionary ? arrow::int32() : arrow::uint32();
+                [[fallthrough]];
             case TypeIndex::UInt64:
-                return arrow::uint64();
+                return settings.use_signed_indexes_for_dictionary ? arrow::int64() : arrow::uint64();
             default:
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Indexes column for getUniqueIndex must be ColumnUInt, got {}.", indexes_column->getName());
         }
@@ -851,13 +855,13 @@ namespace DB
     }
 
     static std::shared_ptr<arrow::DataType> getArrowType(
-        DataTypePtr column_type, ColumnPtr column, const std::string & column_name, const std::string & format_name, bool output_string_as_string, bool output_fixed_string_as_fixed_byte_array, bool * out_is_column_nullable)
+        DataTypePtr column_type, ColumnPtr column, const std::string & column_name, const std::string & format_name, const CHColumnToArrowColumn::Settings & settings, bool * out_is_column_nullable)
     {
         if (column_type->isNullable())
         {
             DataTypePtr nested_type = assert_cast<const DataTypeNullable *>(column_type.get())->getNestedType();
             ColumnPtr nested_column = assert_cast<const ColumnNullable *>(column.get())->getNestedColumnPtr();
-            auto arrow_type = getArrowType(nested_type, nested_column, column_name, format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable);
+            auto arrow_type = getArrowType(nested_type, nested_column, column_name, format_name, settings, out_is_column_nullable);
             *out_is_column_nullable = true;
             return arrow_type;
         }
@@ -891,7 +895,7 @@ namespace DB
         {
             auto nested_type = assert_cast<const DataTypeArray *>(column_type.get())->getNestedType();
             auto nested_column = assert_cast<const ColumnArray *>(column.get())->getDataPtr();
-            auto nested_arrow_type = getArrowType(nested_type, nested_column, column_name, format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable);
+            auto nested_arrow_type = getArrowType(nested_type, nested_column, column_name, format_name, settings, out_is_column_nullable);
             return arrow::list(nested_arrow_type);
         }
 
@@ -904,7 +908,7 @@ namespace DB
             std::vector<std::shared_ptr<arrow::Field>> nested_fields;
             for (size_t i = 0; i != nested_types.size(); ++i)
             {
-                auto nested_arrow_type = getArrowType(nested_types[i], tuple_column->getColumnPtr(i), nested_names[i], format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable);
+                auto nested_arrow_type = getArrowType(nested_types[i], tuple_column->getColumnPtr(i), nested_names[i], format_name, settings, out_is_column_nullable);
                 nested_fields.push_back(std::make_shared<arrow::Field>(nested_names[i], nested_arrow_type, *out_is_column_nullable));
             }
             return arrow::struct_(nested_fields);
@@ -917,8 +921,8 @@ namespace DB
             const auto & nested_column = lc_column->getDictionary().getNestedColumn();
             const auto & indexes_column = lc_column->getIndexesPtr();
             return arrow::dictionary(
-                getArrowTypeForLowCardinalityIndexes(indexes_column),
-                getArrowType(nested_type, nested_column, column_name, format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable));
+                getArrowTypeForLowCardinalityIndexes(indexes_column, settings),
+                getArrowType(nested_type, nested_column, column_name, format_name, settings, out_is_column_nullable));
         }
 
         if (isMap(column_type))
@@ -929,8 +933,8 @@ namespace DB
 
             const auto & columns =  assert_cast<const ColumnMap *>(column.get())->getNestedData().getColumns();
             return arrow::map(
-                getArrowType(key_type, columns[0], column_name, format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable),
-                getArrowType(val_type, columns[1], column_name, format_name, output_string_as_string, output_fixed_string_as_fixed_byte_array, out_is_column_nullable));
+                getArrowType(key_type, columns[0], column_name, format_name, settings, out_is_column_nullable),
+                getArrowType(val_type, columns[1], column_name, format_name, settings, out_is_column_nullable));
         }
 
         if (isDateTime64(column_type))
@@ -939,13 +943,13 @@ namespace DB
             return arrow::timestamp(getArrowTimeUnit(datetime64_type), datetime64_type->getTimeZone().getTimeZone());
         }
 
-        if (isFixedString(column_type) && output_fixed_string_as_fixed_byte_array)
+        if (isFixedString(column_type) && settings.output_fixed_string_as_fixed_byte_array)
         {
             size_t fixed_length = assert_cast<const DataTypeFixedString *>(column_type.get())->getN();
             return arrow::fixed_size_binary(static_cast<int32_t>(fixed_length));
         }
 
-        if (isStringOrFixedString(column_type) && output_string_as_string)
+        if (isStringOrFixedString(column_type) && settings.output_string_as_string)
             return arrow::utf8();
 
         if (isBool(column_type))
@@ -972,22 +976,14 @@ namespace DB
             column_type->getName(), column_name, format_name);
     }
 
-    CHColumnToArrowColumn::CHColumnToArrowColumn(
-        const Block & header,
-        const std::string & format_name_,
-        bool low_cardinality_as_dictionary_,
-        bool output_string_as_string_,
-        bool output_fixed_string_as_fixed_byte_array_)
-        : format_name(format_name_)
-        , low_cardinality_as_dictionary(low_cardinality_as_dictionary_)
-        , output_string_as_string(output_string_as_string_)
-        , output_fixed_string_as_fixed_byte_array(output_fixed_string_as_fixed_byte_array_)
+    CHColumnToArrowColumn::CHColumnToArrowColumn(const Block & header, const std::string & format_name_, const Settings & settings_)
+        : format_name(format_name_), settings(settings_)
     {
         arrow_fields.reserve(header.columns());
         header_columns.reserve(header.columns());
         for (auto column : header.getColumnsWithTypeAndName())
         {
-            if (!low_cardinality_as_dictionary)
+            if (!settings.low_cardinality_as_dictionary)
             {
                 column.type = recursiveRemoveLowCardinality(column.type);
                 column.column = recursiveRemoveLowCardinality(column.column);
@@ -1013,7 +1009,7 @@ namespace DB
                 const ColumnWithTypeAndName & header_column = header_columns[column_i];
                 auto column = chunk.getColumns()[column_i];
 
-                if (!low_cardinality_as_dictionary)
+                if (!settings.low_cardinality_as_dictionary)
                     column = recursiveRemoveLowCardinality(column);
 
                 if (!is_arrow_fields_initialized)
@@ -1024,8 +1020,7 @@ namespace DB
                         column,
                         header_column.name,
                         format_name,
-                        output_string_as_string,
-                        output_fixed_string_as_fixed_byte_array,
+                        settings,
                         &is_column_nullable);
                     arrow_fields.emplace_back(std::make_shared<arrow::Field>(header_column.name, arrow_type, is_column_nullable));
                 }
@@ -1044,8 +1039,7 @@ namespace DB
                     format_name,
                     0,
                     column->size(),
-                    output_string_as_string,
-                    output_fixed_string_as_fixed_byte_array,
+                    settings,
                     dictionary_values);
 
                 std::shared_ptr<arrow::Array> arrow_array;
diff --git a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
index 02766e299a0..801ed8faa65 100644
--- a/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
+++ b/src/Processors/Formats/Impl/CHColumnToArrowColumn.h
@@ -14,7 +14,24 @@ namespace DB
 class CHColumnToArrowColumn
 {
 public:
-    CHColumnToArrowColumn(const Block & header, const std::string & format_name_, bool low_cardinality_as_dictionary_, bool output_string_as_string_, bool output_fixed_string_as_fixed_byte_array_);
+    struct Settings
+    {
+        /// Output columns with String data type as Arrow::String type.
+        /// By default Arrow::Binary is used.
+        bool output_string_as_string = false;
+
+        /// Output columns with String data type as Arrow::FixedByteArray type.
+        bool output_fixed_string_as_fixed_byte_array = true;
+
+        /// Output LowCardinality type as Arrow::Dictionary type.
+        bool low_cardinality_as_dictionary = false;
+        /// Use Int types for indexes in Arrow::Dictionary instead of UInt
+        bool use_signed_indexes_for_dictionary = false;
+        /// Always use (U)Int64 type for indexes in Arrow::Dictionary.
+        bool use_64_bit_indexes_for_dictionary = false;
+    };
+
+    CHColumnToArrowColumn(const Block & header, const std::string & format_name_, const Settings & settings_);
 
     void chChunkToArrowTable(std::shared_ptr<arrow::Table> & res, const std::vector<Chunk> & chunk, size_t columns_num);
 
@@ -22,7 +39,8 @@ private:
     ColumnsWithTypeAndName header_columns;
     std::vector<std::shared_ptr<arrow::Field>> arrow_fields;
     const std::string format_name;
-    bool low_cardinality_as_dictionary;
+    Settings settings;
+
     /// Map {column name : arrow dictionary}.
     /// To avoid converting dictionary from LowCardinality to Arrow
     /// Dictionary every chunk we save it and reuse.
@@ -32,13 +50,6 @@ private:
     /// because LowCardinality column from header always has indexes type UInt8, so, we should get
     /// proper indexes type from first chunk of data.
     bool is_arrow_fields_initialized = false;
-
-    /// Output columns with String data type as Arrow::String type.
-    /// By default Arrow::Binary is used.
-    bool output_string_as_string = false;
-
-    /// Output columns with String data type as Arrow::FixedByteArray type.
-    bool output_fixed_string_as_fixed_byte_array = true;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
index 2c0a2524357..dd7d6c6b024 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.cpp
@@ -392,7 +392,7 @@ bool CSVFormatReader::readFieldImpl(ReadBuffer & istr, DB::IColumn & column, con
     if (format_settings.null_as_default && !isNullableOrLowCardinalityNullable(type))
     {
         /// If value is null but type is not nullable then use default value instead.
-        return SerializationNullable::deserializeTextCSVImpl(column, istr, format_settings, serialization);
+        return SerializationNullable::deserializeNullAsDefaultOrNestedTextCSV(column, istr, format_settings, serialization);
     }
 
     /// Read the column normally.
diff --git a/src/Processors/Formats/Impl/CSVRowInputFormat.h b/src/Processors/Formats/Impl/CSVRowInputFormat.h
index c4b3c8feb8c..fe4d4e3be08 100644
--- a/src/Processors/Formats/Impl/CSVRowInputFormat.h
+++ b/src/Processors/Formats/Impl/CSVRowInputFormat.h
@@ -7,6 +7,7 @@
 #include <Processors/Formats/RowInputFormatWithNamesAndTypes.h>
 #include <Processors/Formats/ISchemaReader.h>
 #include <Formats/FormatSettings.h>
+#include <IO/PeekableReadBuffer.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
index 316a84fe94f..9d056b42101 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.cpp
@@ -16,7 +16,6 @@
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/convertFieldToType.h>
-#include <Interpreters/ExpressionActions.h>
 #include <Interpreters/castColumn.h>
 #include <IO/ReadHelpers.h>
 #include <Parsers/ASTExpressionList.h>
@@ -28,7 +27,6 @@
 #include <Processors/Formats/Impl/ConstantExpressionTemplate.h>
 #include <Parsers/ExpressionElementParsers.h>
 #include <boost/functional/hash.hpp>
-#include <base/sort.h>
 
 
 namespace DB
@@ -539,7 +537,7 @@ bool ConstantExpressionTemplate::parseLiteralAndAssertType(
         ParserArrayOfLiterals parser_array;
         ParserTupleOfLiterals parser_tuple;
 
-        IParser::Pos iterator(token_iterator, static_cast<unsigned>(settings.max_parser_depth));
+        IParser::Pos iterator(token_iterator, static_cast<unsigned>(settings.max_parser_depth), static_cast<unsigned>(settings.max_parser_backtracks));
         while (iterator->begin < istr.position())
             ++iterator;
         Expected expected;
@@ -603,27 +601,26 @@ bool ConstantExpressionTemplate::parseLiteralAndAssertType(
             memcpy(buf, istr.position(), bytes_to_copy);
             buf[bytes_to_copy] = 0;
 
-            /// Skip leading zeroes - we don't want any funny octal business
-            char * non_zero_buf = find_first_not_symbols<'0'>(buf, buf + bytes_to_copy);
+            const bool hex_like = bytes_to_copy >= 2 && buf[0] == '0' && (buf[1] == 'x' || buf[1] == 'X');
 
-            char * pos_double = non_zero_buf;
+            char * pos_double = buf;
             errno = 0;
-            Float64 float_value = std::strtod(non_zero_buf, &pos_double);
-            if (pos_double == non_zero_buf || errno == ERANGE || float_value < 0)
+            Float64 float_value = std::strtod(buf, &pos_double);
+            if (pos_double == buf || errno == ERANGE || float_value < 0)
                 return false;
 
             if (negative)
                 float_value = -float_value;
 
-            char * pos_integer = non_zero_buf;
+            char * pos_integer = buf;
             errno = 0;
-            UInt64 uint_value = std::strtoull(non_zero_buf, &pos_integer, 0);
+            UInt64 uint_value = std::strtoull(buf, &pos_integer, hex_like ? 16 : 10);
             if (pos_integer == pos_double && errno != ERANGE && (!negative || uint_value <= (1ULL << 63)))
             {
                 istr.position() += pos_integer - buf;
                 if (negative && type_info.main_type == Type::Int64)
                     number = static_cast<Int64>(-uint_value);
-                else if (!negative && type_info.main_type == Type::UInt64)
+                else if (type_info.main_type == Type::UInt64 && (!negative || uint_value == 0))
                     number = uint_value;
                 else
                     return false;
diff --git a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
index 71d0d0f7134..11165d5c449 100644
--- a/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
+++ b/src/Processors/Formats/Impl/ConstantExpressionTemplate.h
@@ -92,7 +92,6 @@ private:
     bool parseLiteralAndAssertType(
         ReadBuffer & istr, const TokenIterator & token_iterator, const IDataType * type, size_t column_idx, const Settings & settings);
 
-private:
     TemplateStructurePtr structure;
     MutableColumns columns;
 
diff --git a/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp b/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
index 43ef2521032..00a0d426dcf 100644
--- a/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/DWARFBlockInputFormat.cpp
@@ -198,7 +198,7 @@ void DWARFBlockInputFormat::initializeIfNeeded()
     if (elf.has_value())
         return;
 
-    LOG_DEBUG(&Poco::Logger::get("DWARF"), "Opening ELF");
+    LOG_DEBUG(getLogger("DWARF"), "Opening ELF");
     initELF();
     if (is_stopped)
         return;
@@ -209,7 +209,7 @@ void DWARFBlockInputFormat::initializeIfNeeded()
     auto abbrev_section = elf->findSectionByName(".debug_abbrev");
     if (!abbrev_section.has_value())
         throw Exception(ErrorCodes::CANNOT_PARSE_ELF, "No .debug_abbrev section");
-    LOG_DEBUG(&Poco::Logger::get("DWARF"), ".debug_abbrev is {:.3f} MiB, .debug_info is {:.3f} MiB", abbrev_section->size() * 1. / (1 << 20), info_section->size() * 1. / (1 << 20));
+    LOG_DEBUG(getLogger("DWARF"), ".debug_abbrev is {:.3f} MiB, .debug_info is {:.3f} MiB", abbrev_section->size() * 1. / (1 << 20), info_section->size() * 1. / (1 << 20));
 
     /// (The StringRef points into Elf's mmap of the whole file, or into file_contents.)
     extractor.emplace(llvm::StringRef(info_section->begin(), info_section->size()), /*IsLittleEndian*/ true, /*AddressSize*/ 8);
@@ -237,7 +237,7 @@ void DWARFBlockInputFormat::initializeIfNeeded()
     for (std::unique_ptr<llvm::DWARFUnit> & unit : dwarf_context->info_section_units())
         units_queue.emplace_back(unit.get());
 
-    LOG_DEBUG(&Poco::Logger::get("DWARF"), "{} units, reading in {} threads", units_queue.size(), num_threads);
+    LOG_DEBUG(getLogger("DWARF"), "{} units, reading in {} threads", units_queue.size(), num_threads);
 
     pool.emplace(CurrentMetrics::DWARFReaderThreads, CurrentMetrics::DWARFReaderThreadsActive, CurrentMetrics::DWARFReaderThreadsScheduled, num_threads);
     for (size_t i = 0; i < num_threads; ++i)
@@ -325,11 +325,21 @@ void DWARFBlockInputFormat::skipAttribute(
     const llvm::DWARFAbbreviationDeclaration::AttributeSpec & attr, uint64_t * offset,
     const UnitState & unit) const
 {
-    if (!llvm::DWARFFormValue::skipValue(
-        attr.Form, *extractor, offset, unit.dwarf_unit->getFormParams()))
-            throw Exception(ErrorCodes::CANNOT_PARSE_DWARF,
-                "Failed to skip attribute {} of form {} at offset {}",
-                llvm::dwarf::AttributeString(attr.Attr), attr.Form, *offset);
+    if (attr.Form == llvm::dwarf::DW_FORM_strx3)
+    {
+        /// DWARFFormValue::skipValue() fails on DW_FORM_strx3 because the `switch` statement is
+        /// missing this form for some reason. Maybe it's a bug in llvm.
+        /// Use extractValue() to work around.
+        parseAttribute(attr, offset, unit);
+    }
+    else
+    {
+        if (!llvm::DWARFFormValue::skipValue(
+            attr.Form, *extractor, offset, unit.dwarf_unit->getFormParams()))
+                throw Exception(ErrorCodes::CANNOT_PARSE_DWARF,
+                    "Failed to skip attribute {} of form {} at offset {}",
+                    llvm::dwarf::AttributeString(attr.Attr), attr.Form, *offset);
+    }
 }
 
 uint64_t DWARFBlockInputFormat::parseAddress(llvm::dwarf::Attribute attr, const llvm::DWARFFormValue & val, const UnitState & unit)
@@ -782,7 +792,7 @@ void DWARFBlockInputFormat::parseFilenameTable(UnitState & unit, uint64_t offset
     auto error = prologue.parse(*debug_line_extractor, &offset, /*RecoverableErrorHandler*/ [&](auto e)
         {
             if (++seen_debug_line_warnings < 10)
-                LOG_INFO(&Poco::Logger::get("DWARF"), "Parsing error: {}", llvm::toString(std::move(e)));
+                LOG_INFO(getLogger("DWARF"), "Parsing error: {}", llvm::toString(std::move(e)));
         }, *dwarf_context, unit.dwarf_unit);
 
     if (error)
diff --git a/src/Processors/Formats/Impl/DWARFBlockInputFormat.h b/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
index 0345a264d47..d8f5fc3d896 100644
--- a/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/DWARFBlockInputFormat.h
@@ -124,7 +124,7 @@ private:
 class DWARFSchemaReader : public ISchemaReader
 {
 public:
-    DWARFSchemaReader(ReadBuffer & in_);
+    explicit DWARFSchemaReader(ReadBuffer & in_);
 
     NamesAndTypesList readSchema() override;
 };
diff --git a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
index e90dae31afd..16112325a97 100644
--- a/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONAsStringRowInputFormat.h
@@ -69,7 +69,7 @@ public:
 class JSONAsObjectExternalSchemaReader : public IExternalSchemaReader
 {
 public:
-    JSONAsObjectExternalSchemaReader(const FormatSettings & settings);
+    explicit JSONAsObjectExternalSchemaReader(const FormatSettings & settings);
 
     NamesAndTypesList readSchema() override
     {
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.cpp b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.cpp
index 3d003658e64..c1a1ef6ddf9 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.cpp
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-JSONColumnsReader::JSONColumnsReader(ReadBuffer & in_) : JSONColumnsReaderBase(in_)
+JSONColumnsReader::JSONColumnsReader(ReadBuffer & in_, const FormatSettings & format_settings_) : JSONColumnsReaderBase(in_), format_settings(format_settings_)
 {
 }
 
@@ -18,7 +18,7 @@ void JSONColumnsReader::readChunkStart()
 
 std::optional<String> JSONColumnsReader::readColumnStart()
 {
-    auto name = JSONUtils::readFieldName(*in);
+    auto name = JSONUtils::readFieldName(*in, format_settings.json);
     JSONUtils::skipArrayStart(*in);
     return name;
 }
@@ -38,7 +38,7 @@ void registerInputFormatJSONColumns(FormatFactory & factory)
            const RowInputFormatParams &,
            const FormatSettings & settings)
         {
-            return std::make_shared<JSONColumnsBlockInputFormatBase>(buf, sample, settings, std::make_unique<JSONColumnsReader>(buf));
+            return std::make_shared<JSONColumnsBlockInputFormatBase>(buf, sample, settings, std::make_unique<JSONColumnsReader>(buf, settings));
         }
     );
     factory.markFormatSupportsSubsetOfColumns("JSONColumns");
@@ -50,7 +50,7 @@ void registerJSONColumnsSchemaReader(FormatFactory & factory)
         "JSONColumns",
         [](ReadBuffer & buf, const FormatSettings & settings)
         {
-            return std::make_shared<JSONColumnsSchemaReaderBase>(buf, settings, std::make_unique<JSONColumnsReader>(buf));
+            return std::make_shared<JSONColumnsSchemaReaderBase>(buf, settings, std::make_unique<JSONColumnsReader>(buf, settings));
         }
     );
     factory.registerAdditionalInfoForSchemaCacheGetter("JSONColumns", [](const FormatSettings & settings)
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.h b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.h
index f8b8a80731e..3494d1b9289 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormat.h
@@ -15,11 +15,14 @@ namespace DB
 class JSONColumnsReader : public JSONColumnsReaderBase
 {
 public:
-    JSONColumnsReader(ReadBuffer & in_);
+    explicit JSONColumnsReader(ReadBuffer & in_, const FormatSettings & format_settings_);
 
     void readChunkStart() override;
     std::optional<String> readColumnStart() override;
     bool checkChunkEnd() override;
+
+protected:
+    const FormatSettings format_settings;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
index 53cb5a77898..faa4f36bbb0 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.cpp
@@ -134,7 +134,7 @@ Chunk JSONColumnsBlockInputFormatBase::read()
         {
             do
             {
-                skipJSONField(*in, "skip_field");
+                skipJSONField(*in, "skip_field", format_settings.json);
                 ++num_rows;
             } while (!reader->checkColumnEndOrSkipFieldDelimiter());
         }
@@ -215,7 +215,7 @@ JSONColumnsSchemaReaderBase::JSONColumnsSchemaReaderBase(
 {
 }
 
-void JSONColumnsSchemaReaderBase::setContext(ContextPtr & ctx)
+void JSONColumnsSchemaReaderBase::setContext(const ContextPtr & ctx)
 {
     ColumnsDescription columns;
     if (tryParseColumnsListFromString(hints_str, columns, ctx, hints_parsing_error))
@@ -326,7 +326,7 @@ DataTypePtr JSONColumnsSchemaReaderBase::readColumnAndGetDataType(const String &
             break;
         }
 
-        readJSONField(field, in);
+        readJSONField(field, in, format_settings.json);
         DataTypePtr field_type = tryInferDataTypeForSingleJSONField(field, format_settings, &inference_info);
         chooseResultColumnType(*this, column_type, field_type, nullptr, column_name, rows_read);
         ++rows_read;
diff --git a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
index fe80d77cd87..b1fd86bb806 100644
--- a/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
+++ b/src/Processors/Formats/Impl/JSONColumnsBlockInputFormatBase.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <Core/NamesAndTypes.h>
 #include <Formats/FormatSettings.h>
 #include <Formats/SchemaInferenceUtils.h>
 #include <Processors/Formats/IInputFormat.h>
@@ -16,7 +17,7 @@ class ReadBuffer;
 class JSONColumnsReaderBase
 {
 public:
-    JSONColumnsReaderBase(ReadBuffer & in_);
+    explicit JSONColumnsReaderBase(ReadBuffer & in_);
 
     virtual ~JSONColumnsReaderBase() = default;
 
@@ -84,7 +85,7 @@ public:
     void transformTypesFromDifferentFilesIfNeeded(DataTypePtr & type, DataTypePtr & new_type) override;
 
     bool needContext() const override { return !hints_str.empty(); }
-    void setContext(ContextPtr & ctx) override;
+    void setContext(const ContextPtr & ctx) override;
 
     void setMaxRowsAndBytesToRead(size_t max_rows, size_t max_bytes) override
     {
diff --git a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.cpp b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.cpp
index 23c6114fb39..6541e5eddf4 100644
--- a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.cpp
@@ -12,8 +12,8 @@ namespace ErrorCodes
     extern const int INCORRECT_DATA;
 }
 
-JSONColumnsWithMetadataReader::JSONColumnsWithMetadataReader(ReadBuffer & in_, const Block & header_, const FormatSettings & settings)
-    : JSONColumnsReader(in_), header(header_), validate_types_from_metadata(settings.json.validate_types_from_metadata)
+JSONColumnsWithMetadataReader::JSONColumnsWithMetadataReader(ReadBuffer & in_, const Block & header_, const FormatSettings & format_settings_)
+    : JSONColumnsReader(in_, format_settings_), header(header_)
 {
 }
 
@@ -21,13 +21,13 @@ void JSONColumnsWithMetadataReader::readChunkStart()
 {
     skipBOMIfExists(*in);
     JSONUtils::skipObjectStart(*in);
-    if (validate_types_from_metadata)
-        JSONUtils::readMetadataAndValidateHeader(*in, header);
+    if (format_settings.json.validate_types_from_metadata)
+        JSONUtils::readMetadataAndValidateHeader(*in, header, format_settings.json);
     else
-        JSONUtils::readMetadata(*in);
+        JSONUtils::readMetadata(*in, format_settings.json);
 
     JSONUtils::skipComma(*in);
-    if (!JSONUtils::skipUntilFieldInObject(*in, "data"))
+    if (!JSONUtils::skipUntilFieldInObject(*in, "data", format_settings.json))
         throw Exception(ErrorCodes::INCORRECT_DATA, "Expected field \"data\" with table content");
 
     JSONUtils::skipObjectStart(*in);
@@ -39,12 +39,12 @@ bool JSONColumnsWithMetadataReader::checkChunkEnd()
     if (!JSONUtils::checkAndSkipObjectEnd(*in))
         return false;
 
-    JSONUtils::skipTheRestOfObject(*in);
+    JSONUtils::skipTheRestOfObject(*in, format_settings.json);
     assertEOF(*in);
     return true;
 }
 
-JSONColumnsWithMetadataSchemaReader::JSONColumnsWithMetadataSchemaReader(ReadBuffer & in_) : ISchemaReader(in_)
+JSONColumnsWithMetadataSchemaReader::JSONColumnsWithMetadataSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_) : ISchemaReader(in_), format_settings(format_settings_)
 {
 }
 
@@ -52,7 +52,7 @@ NamesAndTypesList JSONColumnsWithMetadataSchemaReader::readSchema()
 {
     skipBOMIfExists(in);
     JSONUtils::skipObjectStart(in);
-    return JSONUtils::readMetadata(in);
+    return JSONUtils::readMetadata(in, format_settings.json);
 }
 
 void registerInputFormatJSONColumnsWithMetadata(FormatFactory & factory)
@@ -60,7 +60,7 @@ void registerInputFormatJSONColumnsWithMetadata(FormatFactory & factory)
     factory.registerInputFormat(
         "JSONColumnsWithMetadata",
         [](ReadBuffer & buf,
-           const Block &sample,
+           const Block & sample,
            const RowInputFormatParams &,
            const FormatSettings & settings)
         {
@@ -74,9 +74,9 @@ void registerJSONColumnsWithMetadataSchemaReader(FormatFactory & factory)
 {
     factory.registerSchemaReader(
         "JSONColumnsWithMetadata",
-        [](ReadBuffer & buf, const FormatSettings &)
+        [](ReadBuffer & buf, const FormatSettings & format_settings)
         {
-            return std::make_shared<JSONColumnsWithMetadataSchemaReader>(buf);
+            return std::make_shared<JSONColumnsWithMetadataSchemaReader>(buf, format_settings);
         }
     );
 }
diff --git a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.h b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.h
index 9a6ed79c522..1b3f6159bb1 100644
--- a/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONColumnsWithMetadataBlockInputFormat.h
@@ -9,22 +9,24 @@ namespace DB
 class JSONColumnsWithMetadataReader : public JSONColumnsReader
 {
 public:
-    JSONColumnsWithMetadataReader(ReadBuffer & in_, const Block & header_, const FormatSettings & settings);
+    JSONColumnsWithMetadataReader(ReadBuffer & in_, const Block & header_, const FormatSettings & format_settings_);
 
     void readChunkStart() override;
     bool checkChunkEnd() override;
 
 private:
-    const Block & header;
-    const bool validate_types_from_metadata;
+    const Block header;
 };
 
 class JSONColumnsWithMetadataSchemaReader : public ISchemaReader
 {
 public:
-    JSONColumnsWithMetadataSchemaReader(ReadBuffer & in_);
+    explicit JSONColumnsWithMetadataSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_);
 
     NamesAndTypesList readSchema() override;
+
+private:
+    const FormatSettings format_settings;
 };
 
 
diff --git a/src/Processors/Formats/Impl/JSONCompactColumnsBlockInputFormat.h b/src/Processors/Formats/Impl/JSONCompactColumnsBlockInputFormat.h
index 7f23e127ab4..7ec28995482 100644
--- a/src/Processors/Formats/Impl/JSONCompactColumnsBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactColumnsBlockInputFormat.h
@@ -15,7 +15,7 @@ namespace DB
 class JSONCompactColumnsReader : public JSONColumnsReaderBase
 {
 public:
-    JSONCompactColumnsReader(ReadBuffer & in_);
+    explicit JSONCompactColumnsReader(ReadBuffer & in_);
 
     void readChunkStart() override;
     std::optional<String> readColumnStart() override;
diff --git a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
index 6fbd9d7ad22..ee06ae91740 100644
--- a/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactEachRowRowInputFormat.cpp
@@ -75,7 +75,7 @@ void JSONCompactEachRowFormatReader::skipRowBetweenDelimiter()
 void JSONCompactEachRowFormatReader::skipField()
 {
     skipWhitespaceIfAny(*in);
-    skipJSONField(*in, "skipped_field");
+    skipJSONField(*in, "skipped_field", format_settings.json);
 }
 
 void JSONCompactEachRowFormatReader::skipHeaderRow()
@@ -114,7 +114,7 @@ std::vector<String> JSONCompactEachRowFormatReader::readHeaderRow()
     do
     {
         skipWhitespaceIfAny(*in);
-        readJSONString(field, *in);
+        readJSONString(field, *in, format_settings.json);
         fields.push_back(field);
         skipWhitespaceIfAny(*in);
     }
diff --git a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
index fbb361f4b05..63066fc8220 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.cpp
@@ -16,7 +16,6 @@ JSONCompactRowInputFormat::JSONCompactRowInputFormat(
     const Block & header_, ReadBuffer & in_, Params params_, const FormatSettings & format_settings_)
     : RowInputFormatWithNamesAndTypes(
         header_, in_, params_, false, false, false, format_settings_, std::make_unique<JSONCompactFormatReader>(in_, format_settings_))
-    , validate_types_from_metadata(format_settings_.json.validate_types_from_metadata)
 {
 }
 
@@ -24,9 +23,9 @@ void JSONCompactRowInputFormat::readPrefix()
 {
     skipBOMIfExists(*in);
     JSONUtils::skipObjectStart(*in);
-    if (validate_types_from_metadata)
+    if (format_settings.json.validate_types_from_metadata)
     {
-        auto names_and_types = JSONUtils::readMetadataAndValidateHeader(*in, getPort().getHeader());
+        auto names_and_types = JSONUtils::readMetadataAndValidateHeader(*in, getPort().getHeader(), format_settings.json);
         Names column_names;
         for (const auto & [name, type] : names_and_types)
             column_names.push_back(name);
@@ -34,12 +33,12 @@ void JSONCompactRowInputFormat::readPrefix()
     }
     else
     {
-        JSONUtils::readMetadata(*in);
+        JSONUtils::readMetadata(*in, format_settings.json);
         column_mapping->setupByHeader(getPort().getHeader());
     }
 
     JSONUtils::skipComma(*in);
-    if (!JSONUtils::skipUntilFieldInObject(*in, "data"))
+    if (!JSONUtils::skipUntilFieldInObject(*in, "data", format_settings.json))
         throw Exception(ErrorCodes::INCORRECT_DATA, "Expected field \"data\" with table content");
 
     JSONUtils::skipArrayStart(*in);
@@ -48,7 +47,7 @@ void JSONCompactRowInputFormat::readPrefix()
 void JSONCompactRowInputFormat::readSuffix()
 {
     /// Array end was skipped in JSONCompactFormatReader::checkForSuffix
-    JSONUtils::skipTheRestOfObject(*in);
+    JSONUtils::skipTheRestOfObject(*in, format_settings.json);
 }
 
 void JSONCompactRowInputFormat::syncAfterError()
diff --git a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
index 09f2f77268d..3a93e7149b0 100644
--- a/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONCompactRowInputFormat.h
@@ -20,8 +20,6 @@ private:
 
     void readPrefix() override;
     void readSuffix() override;
-
-    const bool validate_types_from_metadata;
 };
 
 class JSONCompactFormatReader : public JSONCompactEachRowFormatReader
diff --git a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
index 0ef19a9c14f..b4b40d5dcc6 100644
--- a/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONEachRowRowInputFormat.cpp
@@ -114,7 +114,7 @@ StringRef JSONEachRowRowInputFormat::readColumnName(ReadBuffer & buf)
     }
 
     current_column_name.resize(nested_prefix_length);
-    readJSONStringInto(current_column_name, buf);
+    readJSONStringInto(current_column_name, buf, format_settings.json);
     return current_column_name;
 }
 
@@ -123,7 +123,7 @@ void JSONEachRowRowInputFormat::skipUnknownField(StringRef name_ref)
     if (!format_settings.skip_unknown_fields)
         throw Exception(ErrorCodes::INCORRECT_DATA, "Unknown field found while parsing JSONEachRow format: {}", name_ref.toString());
 
-    skipJSONField(*in, name_ref);
+    skipJSONField(*in, name_ref, format_settings.json);
 }
 
 void JSONEachRowRowInputFormat::readField(size_t index, MutableColumns & columns)
@@ -179,7 +179,7 @@ void JSONEachRowRowInputFormat::readJSONObject(MutableColumns & columns)
             else if (column_index == NESTED_FIELD)
                 readNestedData(name_ref.toString(), columns);
             else
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: illegal value of column_index");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Illegal value of column_index");
         }
         else
         {
diff --git a/src/Processors/Formats/Impl/JSONObjectEachRowRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONObjectEachRowRowInputFormat.cpp
index ac3ef59e88b..b332dcfc6a6 100644
--- a/src/Processors/Formats/Impl/JSONObjectEachRowRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONObjectEachRowRowInputFormat.cpp
@@ -46,7 +46,7 @@ void JSONObjectEachRowInputFormat::readPrefix()
 
 void JSONObjectEachRowInputFormat::readRowStart(MutableColumns & columns)
 {
-    auto object_name = JSONUtils::readFieldName(*in);
+    auto object_name = JSONUtils::readFieldName(*in, format_settings.json);
     if (field_index_for_object_name)
     {
         columns[*field_index_for_object_name]->insertData(object_name.data(), object_name.size());
@@ -57,7 +57,7 @@ void JSONObjectEachRowInputFormat::readRowStart(MutableColumns & columns)
 
 void JSONObjectEachRowInputFormat::skipRowStart()
 {
-    JSONUtils::readFieldName(*in);
+    JSONUtils::readFieldName(*in, format_settings.json);
 }
 
 bool JSONObjectEachRowInputFormat::checkEndOfData(bool is_first_row)
@@ -90,7 +90,7 @@ NamesAndTypesList JSONObjectEachRowSchemaReader::readRowAndGetNamesAndDataTypes(
     else
         JSONUtils::skipComma(in);
 
-    JSONUtils::readFieldName(in);
+    JSONUtils::readFieldName(in, format_settings.json);
     return JSONUtils::readRowAndGetNamesAndDataTypesForJSONEachRow(in, format_settings, &inference_info);
 }
 
diff --git a/src/Processors/Formats/Impl/JSONRowInputFormat.cpp b/src/Processors/Formats/Impl/JSONRowInputFormat.cpp
index f78ce530ecb..615b85ab32c 100644
--- a/src/Processors/Formats/Impl/JSONRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/JSONRowInputFormat.cpp
@@ -2,6 +2,7 @@
 #include <Formats/JSONUtils.h>
 #include <Formats/FormatFactory.h>
 #include <Formats/EscapingRuleUtils.h>
+#include <IO/PeekableReadBuffer.h>
 #include <IO/ReadHelpers.h>
 
 namespace DB
@@ -26,9 +27,9 @@ void JSONRowInputFormat::readPrefix()
 
     /// Try to parse metadata, if failed, try to parse data as JSONEachRow format.
     if (JSONUtils::checkAndSkipObjectStart(*peekable_buf)
-        && JSONUtils::tryReadMetadata(*peekable_buf, names_and_types_from_metadata)
+        && JSONUtils::tryReadMetadata(*peekable_buf, names_and_types_from_metadata, format_settings.json)
         && JSONUtils::checkAndSkipComma(*peekable_buf)
-        && JSONUtils::skipUntilFieldInObject(*peekable_buf, "data")
+        && JSONUtils::skipUntilFieldInObject(*peekable_buf, "data", format_settings.json)
         && JSONUtils::checkAndSkipArrayStart(*peekable_buf))
     {
         data_in_square_brackets = true;
@@ -54,7 +55,7 @@ void JSONRowInputFormat::readSuffix()
     else
     {
         JSONUtils::skipArrayEnd(*peekable_buf);
-        JSONUtils::skipTheRestOfObject(*peekable_buf);
+        JSONUtils::skipTheRestOfObject(*peekable_buf, format_settings.json);
     }
 }
 
@@ -70,27 +71,36 @@ void JSONRowInputFormat::resetReadBuffer()
     JSONEachRowRowInputFormat::resetReadBuffer();
 }
 
-JSONRowSchemaReader::JSONRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_)
-    : JSONRowSchemaReader(std::make_unique<PeekableReadBuffer>(in_), format_settings_)
+JSONRowSchemaReader::JSONRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, bool fallback_to_json_each_row_)
+    : JSONRowSchemaReader(std::make_unique<PeekableReadBuffer>(in_), format_settings_, fallback_to_json_each_row_)
 {
 }
 
-JSONRowSchemaReader::JSONRowSchemaReader(std::unique_ptr<PeekableReadBuffer> buf, const DB::FormatSettings & format_settings_)
-    : JSONEachRowSchemaReader(*buf, format_settings_), peekable_buf(std::move(buf))
+JSONRowSchemaReader::JSONRowSchemaReader(std::unique_ptr<PeekableReadBuffer> buf, const DB::FormatSettings & format_settings_, bool fallback_to_json_each_row_)
+    : JSONEachRowSchemaReader(*buf, format_settings_), peekable_buf(std::move(buf)), fallback_to_json_each_row(fallback_to_json_each_row_)
 {
 }
 
 NamesAndTypesList JSONRowSchemaReader::readSchema()
 {
     skipBOMIfExists(*peekable_buf);
-    PeekableReadBufferCheckpoint checkpoint(*peekable_buf);
-    /// Try to parse metadata, if failed, try to parse data as JSONEachRow format
-    NamesAndTypesList names_and_types;
-    if (JSONUtils::checkAndSkipObjectStart(*peekable_buf) && JSONUtils::tryReadMetadata(*peekable_buf, names_and_types))
-        return names_and_types;
 
-    peekable_buf->rollbackToCheckpoint(true);
-    return JSONEachRowSchemaReader::readSchema();
+    if (fallback_to_json_each_row)
+    {
+        PeekableReadBufferCheckpoint checkpoint(*peekable_buf);
+        /// Try to parse metadata, if failed, try to parse data as JSONEachRow format
+        NamesAndTypesList names_and_types;
+        if (JSONUtils::checkAndSkipObjectStart(*peekable_buf) && JSONUtils::tryReadMetadata(*peekable_buf, names_and_types, format_settings.json))
+            return names_and_types;
+
+        peekable_buf->rollbackToCheckpoint(true);
+        return JSONEachRowSchemaReader::readSchema();
+    }
+    else
+    {
+        JSONUtils::skipObjectStart(*peekable_buf);
+        return JSONUtils::readMetadata(*peekable_buf, format_settings.json);
+    }
 }
 
 void registerInputFormatJSON(FormatFactory & factory)
@@ -109,19 +119,19 @@ void registerInputFormatJSON(FormatFactory & factory)
 
 void registerJSONSchemaReader(FormatFactory & factory)
 {
-    auto register_schema_reader = [&](const String & format)
+    auto register_schema_reader = [&](const String & format, bool fallback_to_json_each_row)
     {
         factory.registerSchemaReader(
-            format, [](ReadBuffer & buf, const FormatSettings & format_settings) { return std::make_unique<JSONRowSchemaReader>(buf, format_settings); });
+            format, [fallback_to_json_each_row](ReadBuffer & buf, const FormatSettings & format_settings) { return std::make_unique<JSONRowSchemaReader>(buf, format_settings, fallback_to_json_each_row); });
 
         factory.registerAdditionalInfoForSchemaCacheGetter(format, [](const FormatSettings & settings)
         {
             return getAdditionalFormatInfoByEscapingRule(settings, FormatSettings::EscapingRule::JSON);
         });
     };
-    register_schema_reader("JSON");
+    register_schema_reader("JSON", true);
     /// JSONCompact has the same suffix with metadata.
-    register_schema_reader("JSONCompact");
+    register_schema_reader("JSONCompact", false);
 }
 
 }
diff --git a/src/Processors/Formats/Impl/JSONRowInputFormat.h b/src/Processors/Formats/Impl/JSONRowInputFormat.h
index b2e1d8a3d6d..6db5cee380a 100644
--- a/src/Processors/Formats/Impl/JSONRowInputFormat.h
+++ b/src/Processors/Formats/Impl/JSONRowInputFormat.h
@@ -45,16 +45,17 @@ private:
 class JSONRowSchemaReader : public JSONEachRowSchemaReader
 {
 public:
-    JSONRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_);
+    JSONRowSchemaReader(ReadBuffer & in_, const FormatSettings & format_settings_, bool fallback_to_json_each_row_);
 
     NamesAndTypesList readSchema() override;
 
     bool hasStrictOrderOfColumns() const override { return false; }
 
 private:
-    JSONRowSchemaReader(std::unique_ptr<PeekableReadBuffer> buf, const FormatSettings & format_settings_);
+    JSONRowSchemaReader(std::unique_ptr<PeekableReadBuffer> buf, const FormatSettings & format_settings_, bool fallback_to_json_each_row_);
 
     std::unique_ptr<PeekableReadBuffer> peekable_buf;
+    bool fallback_to_json_each_row;
 };
 
 }
diff --git a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
index ae2ce386665..76c468b3983 100644
--- a/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
+++ b/src/Processors/Formats/Impl/MsgPackRowInputFormat.h
@@ -19,7 +19,7 @@ class ReadBuffer;
 class MsgPackVisitor : public msgpack::null_visitor
 {
 public:
-    MsgPackVisitor(bool null_as_default_) : null_as_default(null_as_default_) {}
+    explicit MsgPackVisitor(bool null_as_default_) : null_as_default(null_as_default_) {}
 
     struct Info
     {
diff --git a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
index 7e8b4accf4d..67bdd1cf877 100644
--- a/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/MySQLDumpRowInputFormat.cpp
@@ -274,7 +274,8 @@ static bool tryToExtractStructureFromCreateQuery(ReadBuffer & in, NamesAndTypesL
     String error;
     const char * start = create_query_str.data();
     const char * end = create_query_str.data() + create_query_str.size();
-    ASTPtr query = tryParseQuery(parser, start, end, error, false, "MySQL create query", false, DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr query = tryParseQuery(parser, start, end, error, false, "MySQL create query", false,
+        DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS, true);
     if (!query)
         return false;
 
@@ -409,7 +410,7 @@ bool MySQLDumpRowInputFormat::readField(IColumn & column, size_t column_idx)
     const auto & type = types[column_idx];
     const auto & serialization = serializations[column_idx];
     if (format_settings.null_as_default && !isNullableOrLowCardinalityNullable(type))
-        return SerializationNullable::deserializeTextQuotedImpl(column, *in, format_settings, serialization);
+        return SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(column, *in, format_settings, serialization);
 
     serialization->deserializeTextQuoted(column, *in, format_settings);
     return true;
diff --git a/src/Processors/Formats/Impl/NativeFormat.cpp b/src/Processors/Formats/Impl/NativeFormat.cpp
index 73ffc02bbc1..a7a49ab6a8c 100644
--- a/src/Processors/Formats/Impl/NativeFormat.cpp
+++ b/src/Processors/Formats/Impl/NativeFormat.cpp
@@ -82,7 +82,7 @@ public:
 
     std::string getContentType() const override
     {
-        return writer.getContentType();
+        return NativeWriter::getContentType();
     }
 
 protected:
diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
index a41eacf26b7..aa83b87b2d2 100644
--- a/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.cpp
@@ -71,12 +71,10 @@ Chunk ORCBlockInputFormat::read()
     approx_bytes_read_for_chunk = file_reader->GetRawORCReader()->getStripe(stripe_current)->getDataLength();
     ++stripe_current;
 
-    Chunk res;
     /// 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, table, num_rows, block_missing_values_ptr);
-    return res;
+    return arrow_column_to_ch_column->arrowTableToCHChunk(table, num_rows, block_missing_values_ptr);
 }
 
 void ORCBlockInputFormat::resetParser()
diff --git a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
index c2f08479730..b04c1b0c16e 100644
--- a/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelFormattingOutputFormat.h
@@ -84,7 +84,7 @@ public:
         , pool(CurrentMetrics::ParallelFormattingOutputFormatThreads, CurrentMetrics::ParallelFormattingOutputFormatThreadsActive, CurrentMetrics::ParallelFormattingOutputFormatThreadsScheduled, params.max_threads_for_parallel_formatting)
 
     {
-        LOG_TEST(&Poco::Logger::get("ParallelFormattingOutputFormat"), "Parallel formatting is being used");
+        LOG_TEST(getLogger("ParallelFormattingOutputFormat"), "Parallel formatting is being used");
 
         NullWriteBuffer buf;
         save_totals_and_extremes_in_statistics = internal_formatter_creator(buf)->areTotalsAndExtremesUsedInFinalize();
@@ -154,7 +154,7 @@ public:
     void setException(const String & exception_message_) override { exception_message = exception_message_; }
 
 private:
-    void consume(Chunk chunk) override final
+    void consume(Chunk chunk) final
     {
         addChunk(std::move(chunk), ProcessingUnitType::PLAIN, /*can_throw_exception*/ true);
     }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
index 8b6969bbfcc..447adb1ed48 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.cpp
@@ -224,7 +224,9 @@ Chunk ParallelParsingInputFormat::read()
             /// skipped all rows. For example, it can happen while using settings
             /// input_format_allow_errors_num/input_format_allow_errors_ratio
             /// and this segment contained only rows with errors.
-            /// Process the next unit.
+            /// Return this empty unit back to segmentator and process the next unit.
+            unit->status = READY_TO_INSERT;
+            segmentator_condvar.notify_all();
             ++reader_ticket_number;
             unit = &processing_units[reader_ticket_number % processing_units.size()];
         }
diff --git a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
index ff97afa8348..963ccd88def 100644
--- a/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
+++ b/src/Processors/Formats/Impl/ParallelParsingInputFormat.h
@@ -34,7 +34,7 @@ class Context;
 /**
  * ORDER-PRESERVING parallel parsing of data formats.
  * It splits original data into chunks. Then each chunk is parsed by different thread.
- * The number of chunks equals to the number or parser threads.
+ * The number of chunks equals to the number of parser threads.
  * The size of chunk is equal to min_chunk_bytes_for_parallel_parsing setting.
  *
  *                    Parsers
@@ -111,7 +111,7 @@ public:
         // bump into reader thread on wraparound.
         processing_units.resize(params.max_threads + 2);
 
-        LOG_TRACE(&Poco::Logger::get("ParallelParsingInputFormat"), "Parallel parsing is used");
+        LOG_TRACE(getLogger("ParallelParsingInputFormat"), "Parallel parsing is used");
     }
 
     ~ParallelParsingInputFormat() override
@@ -119,25 +119,25 @@ public:
         finishAndWait();
     }
 
-    void resetParser() override final
+    void resetParser() final
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR, "resetParser() is not allowed for {}", getName());
     }
 
-    const BlockMissingValues & getMissingValues() const override final
+    const BlockMissingValues & getMissingValues() const final
     {
         return last_block_missing_values;
     }
 
     size_t getApproxBytesReadForChunk() const override { return last_approx_bytes_read_for_chunk; }
 
-    String getName() const override final { return "ParallelParsingBlockInputFormat"; }
+    String getName() const final { return "ParallelParsingBlockInputFormat"; }
 
 private:
 
-    Chunk read() override final;
+    Chunk read() final;
 
-    void onCancel() override final
+    void onCancel() final
     {
         /*
          * The format parsers themselves are not being cancelled here, so we'll
diff --git a/src/Processors/Formats/Impl/Parquet/Write.cpp b/src/Processors/Formats/Impl/Parquet/Write.cpp
index 02ca2734ff8..4d71e0102d8 100644
--- a/src/Processors/Formats/Impl/Parquet/Write.cpp
+++ b/src/Processors/Formats/Impl/Parquet/Write.cpp
@@ -409,7 +409,7 @@ PODArray<char> & compress(PODArray<char> & source, PODArray<char> & scratch, Com
             #pragma clang diagnostic pop
 
             if (max_dest_size > std::numeric_limits<int>::max())
-                throw Exception(ErrorCodes::CANNOT_COMPRESS, "Cannot compress column of size {}", formatReadableSizeWithBinarySuffix(source.size()));
+                throw Exception(ErrorCodes::CANNOT_COMPRESS, "Cannot compress column of size {}", ReadableSize(source.size()));
 
             scratch.resize(max_dest_size);
 
diff --git a/src/Processors/Formats/Impl/Parquet/Write.h b/src/Processors/Formats/Impl/Parquet/Write.h
index 24733ac276b..f162984fd5e 100644
--- a/src/Processors/Formats/Impl/Parquet/Write.h
+++ b/src/Processors/Formats/Impl/Parquet/Write.h
@@ -2,6 +2,7 @@
 
 #include <Processors/Formats/Impl/Parquet/ThriftUtil.h>
 #include <Columns/IColumn.h>
+#include <Core/Block.h>
 #include <DataTypes/IDataType.h>
 #include <Common/PODArray.h>
 #include <IO/CompressionMethod.h>
diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
index 62e576d4953..d41cb3447de 100644
--- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.cpp
@@ -601,7 +601,7 @@ void ParquetBlockInputFormat::decodeOneChunk(size_t row_group_batch_idx, std::un
     /// 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_batch.arrow_column_to_ch_column->arrowTableToCHChunk(res.chunk, *tmp_table, (*tmp_table)->num_rows(), block_missing_values_ptr);
+    res.chunk = row_group_batch.arrow_column_to_ch_column->arrowTableToCHChunk(*tmp_table, (*tmp_table)->num_rows(), block_missing_values_ptr);
 
     lock.lock();
 
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
index fb9f853dc01..9c85dab70c4 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.cpp
@@ -302,9 +302,11 @@ void ParquetBlockOutputFormat::writeUsingArrow(std::vector<Chunk> chunks)
         ch_column_to_arrow_column = std::make_unique<CHColumnToArrowColumn>(
             header,
             "Parquet",
-            false,
-            format_settings.parquet.output_string_as_string,
-            format_settings.parquet.output_fixed_string_as_fixed_byte_array);
+            CHColumnToArrowColumn::Settings
+            {
+                .output_string_as_string = format_settings.parquet.output_string_as_string,
+                .output_fixed_string_as_fixed_byte_array = format_settings.parquet.output_fixed_string_as_fixed_byte_array
+            });
     }
 
     ch_column_to_arrow_column->chChunkToArrowTable(arrow_table, chunks, columns_num);
diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
index aededc39dc4..422bae5c315 100644
--- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h
@@ -48,10 +48,10 @@ private:
             set(b);
         }
 
-        MemoryToken(MemoryToken && t)
+        MemoryToken(MemoryToken && t) /// NOLINT
           : parent(std::exchange(t.parent, nullptr)), bytes(std::exchange(t.bytes, 0)) {}
 
-        MemoryToken & operator=(MemoryToken && t)
+        MemoryToken & operator=(MemoryToken && t) /// NOLINT
         {
             parent = std::exchange(t.parent, nullptr);
             bytes = std::exchange(t.bytes, 0);
@@ -79,7 +79,7 @@ private:
 
         MemoryToken mem;
 
-        ColumnChunk(ParquetBlockOutputFormat * p) : mem(p) {}
+        explicit ColumnChunk(ParquetBlockOutputFormat * p) : mem(p) {}
     };
 
     struct RowGroupState
diff --git a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
index 1aa2d99ca76..ff63d78fa44 100644
--- a/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
+++ b/src/Processors/Formats/Impl/ParquetMetadataInputFormat.h
@@ -83,7 +83,7 @@ private:
 class ParquetMetadataSchemaReader : public ISchemaReader
 {
 public:
-    ParquetMetadataSchemaReader(ReadBuffer & in_);
+    explicit ParquetMetadataSchemaReader(ReadBuffer & in_);
 
     NamesAndTypesList readSchema() override;
 };
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
index 14648e68f94..086b5bfada2 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.cpp
@@ -6,15 +6,17 @@
 #include <IO/Operators.h>
 #include <Common/UTF8Helpers.h>
 #include <Common/PODArray.h>
+#include <Common/formatReadable.h>
 
 
 namespace DB
 {
 
 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_)
+    WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_, bool color_)
+     : IOutputFormat(header_, out_), format_settings(format_settings_), serializations(header_.getSerializations()), color(color_), mono_block(mono_block_)
 {
+    readable_number_tip = header_.getColumns().size() == 1 && WhichDataType(header_.getDataTypes()[0]->getTypeId()).isNumber();
 }
 
 
@@ -162,6 +164,10 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
     const auto & columns = chunk.getColumns();
     const auto & header = getPort(port_kind).getHeader();
 
+    size_t cut_to_width = format_settings.pretty.max_value_width;
+    if (!format_settings.pretty.max_value_width_apply_for_single_value && num_rows == 1 && num_columns == 1 && total_rows == 0)
+        cut_to_width = 0;
+
     WidthsPerColumn widths;
     Widths max_widths;
     Widths name_widths;
@@ -237,7 +243,7 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
 
         const auto & col = header.getByPosition(i);
 
-        if (format_settings.pretty.color)
+        if (color)
             writeCString("\033[1m", out);
 
         if (col.type->shouldAlignRightInPrettyFormats())
@@ -255,7 +261,7 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
                 writeChar(' ', out);
         }
 
-        if (format_settings.pretty.color)
+        if (color)
             writeCString("\033[0m", out);
     }
     writeCString(" ", out);
@@ -285,11 +291,14 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
         {
             // Write row number;
             auto row_num_string = std::to_string(i + 1 + total_rows) + ". ";
+
             for (size_t j = 0; j < row_number_width - row_num_string.size(); ++j)
-            {
-                writeCString(" ", out);
-            }
+                writeChar(' ', out);
+            if (color)
+                writeCString("\033[90m", out);
             writeString(row_num_string, out);
+            if (color)
+                writeCString("\033[0m", out);
         }
 
         writeCString(grid_symbols.bar, out);
@@ -301,10 +310,11 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
             const auto & type = *header.getByPosition(j).type;
             writeValueWithPadding(*columns[j], *serializations[j], i,
                 widths[j].empty() ? max_widths[j] : widths[j][i],
-                max_widths[j], type.shouldAlignRightInPrettyFormats());
+                max_widths[j], cut_to_width, type.shouldAlignRightInPrettyFormats(), isNumber(type));
         }
 
         writeCString(grid_symbols.bar, out);
+        writeReadableNumberTip(chunk);
         writeCString("\n", out);
     }
 
@@ -319,9 +329,75 @@ void PrettyBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port_kind
 }
 
 
+static String highlightDigitGroups(String source)
+{
+    if (source.size() <= 4)
+        return source;
+
+    bool is_regular_number = true;
+    size_t num_digits_before_decimal = 0;
+    for (auto c : source)
+    {
+        if (c == '-' || c == ' ')
+            continue;
+        if (c == '.')
+            break;
+        if (c >= '0' && c <= '9')
+        {
+            ++num_digits_before_decimal;
+        }
+        else
+        {
+            is_regular_number = false;
+            break;
+        }
+    }
+
+    if (!is_regular_number || num_digits_before_decimal <= 4)
+        return source;
+
+    String result;
+    size_t size = source.size();
+    result.reserve(2 * size);
+
+    bool before_decimal = true;
+    size_t digit_num = 0;
+    for (size_t i = 0; i < size; ++i)
+    {
+        auto c = source[i];
+        if (before_decimal && c >= '0' && c <= '9')
+        {
+            ++digit_num;
+            size_t offset = num_digits_before_decimal - digit_num;
+            if (offset && offset % 3 == 0)
+            {
+                result += "\033[4m";
+                result += c;
+                result += "\033[0m";
+            }
+            else
+            {
+                result += c;
+            }
+        }
+        else if (c == '.')
+        {
+            before_decimal = false;
+            result += c;
+        }
+        else
+        {
+            result += c;
+        }
+    }
+
+    return result;
+}
+
+
 void PrettyBlockOutputFormat::writeValueWithPadding(
     const IColumn & column, const ISerialization & serialization, size_t row_num,
-    size_t value_width, size_t pad_to_width, bool align_right)
+    size_t value_width, size_t pad_to_width, size_t cut_to_width, bool align_right, bool is_number)
 {
     String serialized_value = " ";
     {
@@ -329,13 +405,13 @@ void PrettyBlockOutputFormat::writeValueWithPadding(
         serialization.serializeText(column, row_num, out_serialize, format_settings);
     }
 
-    if (value_width > format_settings.pretty.max_value_width)
+    if (cut_to_width && value_width > cut_to_width)
     {
         serialized_value.resize(UTF8::computeBytesBeforeWidth(
             reinterpret_cast<const UInt8 *>(serialized_value.data()), serialized_value.size(), 0, 1 + format_settings.pretty.max_value_width));
 
         const char * ellipsis = format_settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8 ? "⋯" : "~";
-        if (format_settings.pretty.color)
+        if (color)
         {
             serialized_value += "\033[31;1m";
             serialized_value += ellipsis;
@@ -356,6 +432,10 @@ void PrettyBlockOutputFormat::writeValueWithPadding(
                 writeChar(' ', out);
     };
 
+    /// Highlight groups of thousands.
+    if (color && is_number && format_settings.pretty.highlight_digit_groups)
+        serialized_value = highlightDigitGroups(serialized_value);
+
     if (align_right)
     {
         write_padding();
@@ -410,6 +490,27 @@ void PrettyBlockOutputFormat::writeSuffix()
     }
 }
 
+void PrettyBlockOutputFormat::writeReadableNumberTip(const Chunk & chunk)
+{
+    auto columns = chunk.getColumns();
+    auto is_single_number = readable_number_tip && chunk.getNumRows() == 1 && chunk.getNumColumns() == 1;
+    if (!is_single_number)
+        return;
+
+    auto value = columns[0]->getFloat64(0);
+    auto threshold = format_settings.pretty.output_format_pretty_single_large_number_tip_threshold;
+
+    if (threshold && isFinite(value) && abs(value) > threshold)
+    {
+        if (color)
+            writeCString("\033[90m", out);
+        writeCString(" -- ", out);
+        formatReadableQuantity(value, out, 2);
+        if (color)
+            writeCString("\033[0m", out);
+    }
+}
+
 void registerOutputFormatPretty(FormatFactory & factory)
 {
     registerPrettyFormatWithNoEscapesAndMonoBlock<PrettyBlockOutputFormat>(factory, "Pretty");
diff --git a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
index dfb23ac63f9..4c52300fbd1 100644
--- a/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyBlockOutputFormat.h
@@ -5,7 +5,6 @@
 #include <Formats/FormatSettings.h>
 #include <Formats/FormatFactory.h>
 
-
 namespace DB
 {
 
@@ -19,10 +18,8 @@ class PrettyBlockOutputFormat : public IOutputFormat
 {
 public:
     /// no_escapes - do not use ANSI escape sequences - to display in the browser, not in the console.
-    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_);
-
+    PrettyBlockOutputFormat(WriteBuffer & out_, const Block & header_, const FormatSettings & format_settings_, bool mono_block_, bool color_);
     String getName() const override { return "PrettyBlockOutputFormat"; }
-
 protected:
     void consume(Chunk) override;
     void consumeTotals(Chunk) override;
@@ -41,6 +38,7 @@ protected:
     virtual void writeChunk(const Chunk & chunk, PortKind port_kind);
     void writeMonoChunkIfNeeded();
     void writeSuffix() override;
+    void writeReadableNumberTip(const Chunk & chunk);
 
     void onRowsReadBeforeUpdate() override { total_rows = getRowsReadBefore(); }
 
@@ -50,14 +48,17 @@ protected:
 
     void writeValueWithPadding(
         const IColumn & column, const ISerialization & serialization, size_t row_num,
-        size_t value_width, size_t pad_to_width, bool align_right);
+        size_t value_width, size_t pad_to_width, size_t cut_to_width, bool align_right, bool is_number);
 
     void resetFormatterImpl() override
     {
         total_rows = 0;
     }
 
+    bool color;
+
 private:
+    bool readable_number_tip = false;
     bool mono_block;
     /// For mono_block == true only
     Chunk mono_chunk;
@@ -73,13 +74,8 @@ void registerPrettyFormatWithNoEscapesAndMonoBlock(FormatFactory & factory, cons
             const Block & sample,
             const FormatSettings & format_settings)
         {
-            if (no_escapes)
-            {
-                FormatSettings changed_settings = format_settings;
-                changed_settings.pretty.color = false;
-                return std::make_shared<OutputFormat>(buf, sample, changed_settings, mono_block);
-            }
-            return std::make_shared<OutputFormat>(buf, sample, format_settings, mono_block);
+            bool color = !no_escapes && format_settings.pretty.color.valueOr(format_settings.is_writing_to_terminal);
+            return std::make_shared<OutputFormat>(buf, sample, format_settings, mono_block, color);
         });
         if (!mono_block)
             factory.markOutputFormatSupportsParallelFormatting(name);
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
index 2ba9ec725e2..e1cbf69dbf0 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.cpp
@@ -1,4 +1,5 @@
 #include <Common/PODArray.h>
+#include <Common/formatReadable.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
 #include <IO/Operators.h>
@@ -48,8 +49,8 @@ GridSymbols ascii_grid_symbols {
 
 }
 
-PrettyCompactBlockOutputFormat::PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
-    : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_)
+PrettyCompactBlockOutputFormat::PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_, bool color_)
+    : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_, color_)
 {
 }
 
@@ -87,18 +88,18 @@ void PrettyCompactBlockOutputFormat::writeHeader(
             for (size_t k = 0; k < max_widths[i] - name_widths[i]; ++k)
                 writeCString(grid_symbols.dash, out);
 
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[1m", out);
             writeString(col.name, out);
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[0m", out);
         }
         else
         {
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[1m", out);
             writeString(col.name, out);
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[0m", out);
 
             for (size_t k = 0; k < max_widths[i] - name_widths[i]; ++k)
@@ -137,7 +138,7 @@ void PrettyCompactBlockOutputFormat::writeBottom(const Widths & max_widths)
 void PrettyCompactBlockOutputFormat::writeRow(
     size_t row_num,
     const Block & header,
-    const Columns & columns,
+    const Chunk & chunk,
     const WidthsPerColumn & widths,
     const Widths & max_widths)
 {
@@ -146,10 +147,12 @@ void PrettyCompactBlockOutputFormat::writeRow(
         // Write row number;
         auto row_num_string = std::to_string(row_num + 1 + total_rows) + ". ";
         for (size_t i = 0; i < row_number_width - row_num_string.size(); ++i)
-        {
-            writeCString(" ", out);
-        }
+            writeChar(' ', out);
+        if (color)
+            writeCString("\033[90m", out);
         writeString(row_num_string, out);
+        if (color)
+            writeCString("\033[0m", out);
     }
 
     const GridSymbols & grid_symbols = format_settings.pretty.charset == FormatSettings::Pretty::Charset::UTF8 ?
@@ -157,6 +160,11 @@ void PrettyCompactBlockOutputFormat::writeRow(
                                        ascii_grid_symbols;
 
     size_t num_columns = max_widths.size();
+    const auto & columns = chunk.getColumns();
+
+    size_t cut_to_width = format_settings.pretty.max_value_width;
+    if (!format_settings.pretty.max_value_width_apply_for_single_value && chunk.getNumRows() == 1 && num_columns == 1 && total_rows == 0)
+        cut_to_width = 0;
 
     writeCString(grid_symbols.bar, out);
 
@@ -167,10 +175,11 @@ void PrettyCompactBlockOutputFormat::writeRow(
 
         const auto & type = *header.getByPosition(j).type;
         const auto & cur_widths = widths[j].empty() ? max_widths[j] : widths[j][row_num];
-        writeValueWithPadding(*columns[j], *serializations[j], row_num, cur_widths, max_widths[j], type.shouldAlignRightInPrettyFormats());
+        writeValueWithPadding(*columns[j], *serializations[j], row_num, cur_widths, max_widths[j], cut_to_width, type.shouldAlignRightInPrettyFormats(), isNumber(type));
     }
 
     writeCString(grid_symbols.bar, out);
+    writeReadableNumberTip(chunk);
     writeCString("\n", out);
 }
 
@@ -180,7 +189,6 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
 
     size_t num_rows = chunk.getNumRows();
     const auto & header = getPort(port_kind).getHeader();
-    const auto & columns = chunk.getColumns();
 
     WidthsPerColumn widths;
     Widths max_widths;
@@ -190,7 +198,8 @@ void PrettyCompactBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind po
     writeHeader(header, max_widths, name_widths);
 
     for (size_t i = 0; i < num_rows && total_rows + i < max_rows; ++i)
-        writeRow(i, header, columns, widths, max_widths);
+        writeRow(i, header, chunk, widths, max_widths);
+
 
     writeBottom(max_widths);
 
diff --git a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
index 432ff0ee120..911fc2e950c 100644
--- a/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettyCompactBlockOutputFormat.h
@@ -13,7 +13,7 @@ namespace DB
 class PrettyCompactBlockOutputFormat : public PrettyBlockOutputFormat
 {
 public:
-    PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_);
+    PrettyCompactBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_, bool color);
     String getName() const override { return "PrettyCompactBlockOutputFormat"; }
 
 private:
@@ -22,7 +22,7 @@ private:
     void writeRow(
         size_t row_num,
         const Block & header,
-        const Columns & columns,
+        const Chunk & chunk,
         const WidthsPerColumn & widths,
         const Widths & max_widths);
 
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
index 0fb1a413a6c..3f224f034aa 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.cpp
@@ -1,8 +1,8 @@
-#include <Common/PODArray.h>
+#include <Formats/FormatFactory.h>
 #include <IO/WriteBuffer.h>
 #include <IO/WriteHelpers.h>
-#include <Formats/FormatFactory.h>
 #include <Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h>
+#include <Common/PODArray.h>
 
 
 namespace DB
@@ -24,15 +24,17 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
     const auto & header = getPort(port_kind).getHeader();
     const auto & columns = chunk.getColumns();
 
+    size_t cut_to_width = format_settings.pretty.max_value_width;
+    if (!format_settings.pretty.max_value_width_apply_for_single_value && num_rows == 1 && num_columns == 1 && total_rows == 0)
+        cut_to_width = 0;
+
     WidthsPerColumn widths;
     Widths max_widths;
     Widths name_widths;
     calculateWidths(header, chunk, widths, max_widths, name_widths);
 
     if (format_settings.pretty.output_format_pretty_row_numbers)
-    {
         writeString(String(row_number_width, ' '), out);
-    }
     /// Names
     for (size_t i = 0; i < num_columns; ++i)
     {
@@ -48,18 +50,18 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
             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)
+            if (color)
                 writeCString("\033[1m", out);
             writeString(col.name, out);
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[0m", out);
         }
         else
         {
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[1m", out);
             writeString(col.name, out);
-            if (format_settings.pretty.color)
+            if (color)
                 writeCString("\033[0m", out);
 
             for (ssize_t k = 0; k < std::max(0z, static_cast<ssize_t>(max_widths[i] - name_widths[i])); ++k)
@@ -75,10 +77,13 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
             // Write row number;
             auto row_num_string = std::to_string(row + 1 + total_rows) + ". ";
             for (size_t i = 0; i < row_number_width - row_num_string.size(); ++i)
-            {
-                writeCString(" ", out);
-            }
+                writeChar(' ', out);
+            if (color)
+                writeCString("\033[90m", out);
             writeString(row_num_string, out);
+            if (color)
+                writeCString("\033[0m", out);
+
         }
         for (size_t column = 0; column < num_columns; ++column)
         {
@@ -87,10 +92,11 @@ void PrettySpaceBlockOutputFormat::writeChunk(const Chunk & chunk, PortKind port
 
             const auto & type = *header.getByPosition(column).type;
             auto & cur_width = widths[column].empty() ? max_widths[column] : widths[column][row];
-            writeValueWithPadding(*columns[column], *serializations[column],
-                row, cur_width, max_widths[column], type.shouldAlignRightInPrettyFormats());
+            writeValueWithPadding(
+                *columns[column], *serializations[column], row, cur_width, max_widths[column], cut_to_width, type.shouldAlignRightInPrettyFormats(), isNumber(type));
         }
 
+        writeReadableNumberTip(chunk);
         writeChar('\n', out);
     }
 
diff --git a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
index 1cccd5fb476..032bba3e827 100644
--- a/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
+++ b/src/Processors/Formats/Impl/PrettySpaceBlockOutputFormat.h
@@ -11,8 +11,8 @@ namespace DB
 class PrettySpaceBlockOutputFormat : public PrettyBlockOutputFormat
 {
 public:
-    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_)
-        : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_) {}
+    PrettySpaceBlockOutputFormat(WriteBuffer & out_, const Block & header, const FormatSettings & format_settings_, bool mono_block_, bool color_)
+        : PrettyBlockOutputFormat(out_, header, format_settings_, mono_block_, color_) {}
 
     String getName() const override { return "PrettySpaceBlockOutputFormat"; }
 
diff --git a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
index c2ee5923c01..3578401a0f8 100644
--- a/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/PrometheusTextOutputFormat.cpp
@@ -12,6 +12,7 @@
 #include <Columns/IColumn.h>
 
 #include <Common/assert_cast.h>
+#include "DataTypes/IDataType.h"
 
 #include <DataTypes/DataTypeMap.h>
 #include <DataTypes/DataTypeNullable.h>
@@ -35,9 +36,12 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
 }
 
+namespace
+{
+
 constexpr auto FORMAT_NAME = "Prometheus";
 
-static bool isDataTypeMapString(const DataTypePtr & type)
+bool isDataTypeMapString(const DataTypePtr & type)
 {
     if (!isMap(type))
         return false;
@@ -45,8 +49,8 @@ static bool isDataTypeMapString(const DataTypePtr & type)
     return isStringOrFixedString(type_map->getKeyType()) && isStringOrFixedString(type_map->getValueType());
 }
 
-template <typename ResType, typename Pred>
-static void getColumnPos(const Block & header, const String & col_name, Pred pred, ResType & res)
+template <typename ResType>
+void getColumnPos(const Block & header, const String & col_name, bool (*pred)(const DataTypePtr &), ResType & res)
 {
     static_assert(std::is_same_v<ResType, size_t> || std::is_same_v<ResType, std::optional<size_t>>, "Illegal ResType");
 
@@ -71,7 +75,7 @@ static void getColumnPos(const Block & header, const String & col_name, Pred pre
     }
 }
 
-static Float64 tryParseFloat(const String & s)
+Float64 tryParseFloat(const String & s)
 {
     Float64 t = 0;
     ReadBufferFromString buf(s);
@@ -79,6 +83,8 @@ static Float64 tryParseFloat(const String & s)
     return t;
 }
 
+}
+
 PrometheusTextOutputFormat::PrometheusTextOutputFormat(
     WriteBuffer & out_,
     const Block & header_,
@@ -89,12 +95,12 @@ PrometheusTextOutputFormat::PrometheusTextOutputFormat(
 {
     const Block & header = getPort(PortKind::Main).getHeader();
 
-    getColumnPos(header, "name", isStringOrFixedString<DataTypePtr>, pos.name);
-    getColumnPos(header, "value", isNumber<DataTypePtr>, pos.value);
+    getColumnPos(header, "name", isStringOrFixedString, pos.name);
+    getColumnPos(header, "value", isNumber, pos.value);
 
-    getColumnPos(header, "help", isStringOrFixedString<DataTypePtr>, pos.help);
-    getColumnPos(header, "type", isStringOrFixedString<DataTypePtr>, pos.type);
-    getColumnPos(header, "timestamp", isNumber<DataTypePtr>, pos.timestamp);
+    getColumnPos(header, "help", isStringOrFixedString, pos.help);
+    getColumnPos(header, "type", isStringOrFixedString, pos.type);
+    getColumnPos(header, "timestamp", isNumber, pos.timestamp);
     getColumnPos(header, "labels", isDataTypeMapString, pos.labels);
 }
 
diff --git a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
index 432e944a246..29bc0012dc0 100644
--- a/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TSKVRowInputFormat.cpp
@@ -147,7 +147,7 @@ bool TSKVRowInputFormat::readRow(MutableColumns & columns, RowReadExtension & ex
                     const auto & type = getPort().getHeader().getByPosition(index).type;
                     const auto & serialization = serializations[index];
                     if (format_settings.null_as_default && !isNullableOrLowCardinalityNullable(type))
-                        read_columns[index] = SerializationNullable::deserializeTextEscapedImpl(*columns[index], *in, format_settings, serialization);
+                        read_columns[index] = SerializationNullable::deserializeNullAsDefaultOrNestedTextEscaped(*columns[index], *in, format_settings, serialization);
                     else
                         serialization->deserializeTextEscaped(*columns[index], *in, format_settings);
                 }
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
index 6f6dae334e5..85b1797dab8 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.cpp
@@ -168,7 +168,7 @@ bool TabSeparatedFormatReader::readField(IColumn & column, const DataTypePtr & t
     if (is_raw)
     {
         if (as_nullable)
-            return SerializationNullable::deserializeTextRawImpl(column, *buf, format_settings, serialization);
+            return SerializationNullable::deserializeNullAsDefaultOrNestedTextRaw(column, *buf, format_settings, serialization);
 
         serialization->deserializeTextRaw(column, *buf, format_settings);
         return true;
@@ -176,7 +176,7 @@ bool TabSeparatedFormatReader::readField(IColumn & column, const DataTypePtr & t
 
 
     if (as_nullable)
-        return SerializationNullable::deserializeTextEscapedImpl(column, *buf, format_settings, serialization);
+        return SerializationNullable::deserializeNullAsDefaultOrNestedTextEscaped(column, *buf, format_settings, serialization);
 
     serialization->deserializeTextEscaped(column, *buf, format_settings);
     return true;
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
index 00a270e9611..32abd532a52 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowInputFormat.h
@@ -4,6 +4,7 @@
 #include <Formats/FormatSettings.h>
 #include <Processors/Formats/RowInputFormatWithNamesAndTypes.h>
 #include <Processors/Formats/ISchemaReader.h>
+#include <IO/PeekableReadBuffer.h>
 
 
 namespace DB
diff --git a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
index 9facba2052a..a514323873e 100644
--- a/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
+++ b/src/Processors/Formats/Impl/TabSeparatedRowOutputFormat.h
@@ -34,14 +34,14 @@ public:
 
 protected:
     void writeField(const IColumn & column, const ISerialization & serialization, size_t row_num) override;
-    void writeFieldDelimiter() override final;
+    void writeFieldDelimiter() final;
     void writeRowEndDelimiter() override;
 
     bool supportTotals() const override { return true; }
     bool supportExtremes() const override { return true; }
 
-    void writeBeforeTotals() override final;
-    void writeBeforeExtremes() override final;
+    void writeBeforeTotals() final;
+    void writeBeforeExtremes() final;
 
     void writePrefix() override;
     void writeLine(const std::vector<String> & values);
diff --git a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
index 6d8fe1e5a2c..1c43a0fa331 100644
--- a/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateBlockOutputFormat.cpp
@@ -11,6 +11,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int SYNTAX_ERROR;
+    extern const int INVALID_TEMPLATE_FORMAT;
 }
 
 TemplateBlockOutputFormat::TemplateBlockOutputFormat(const Block & header_, WriteBuffer & out_, const FormatSettings & settings_,
@@ -193,13 +194,25 @@ void registerOutputFormatTemplate(FormatFactory & factory)
             const FormatSettings & settings)
     {
         ParsedTemplateFormatString resultset_format;
+        auto idx_resultset_by_name = [&](const String & partName)
+        {
+            return static_cast<size_t>(TemplateBlockOutputFormat::stringToResultsetPart(partName));
+        };
         if (settings.template_settings.resultset_format.empty())
         {
             /// Default format string: "${data}"
-            resultset_format.delimiters.resize(2);
-            resultset_format.escaping_rules.emplace_back(ParsedTemplateFormatString::EscapingRule::None);
-            resultset_format.format_idx_to_column_idx.emplace_back(0);
-            resultset_format.column_names.emplace_back("data");
+            if (settings.template_settings.resultset_format_template.empty())
+            {
+                resultset_format.delimiters.resize(2);
+                resultset_format.escaping_rules.emplace_back(ParsedTemplateFormatString::EscapingRule::None);
+                resultset_format.format_idx_to_column_idx.emplace_back(0);
+                resultset_format.column_names.emplace_back("data");
+            }
+            else
+            {
+                resultset_format = ParsedTemplateFormatString();
+                resultset_format.parse(settings.template_settings.resultset_format_template, idx_resultset_by_name);
+            }
         }
         else
         {
@@ -207,20 +220,34 @@ void registerOutputFormatTemplate(FormatFactory & factory)
             resultset_format = ParsedTemplateFormatString(
                     FormatSchemaInfo(settings.template_settings.resultset_format, "Template", false,
                             settings.schema.is_server, settings.schema.format_schema_path),
-                    [&](const String & partName)
-                    {
-                        return static_cast<size_t>(TemplateBlockOutputFormat::stringToResultsetPart(partName));
-                    });
+                    idx_resultset_by_name);
+            if (!settings.template_settings.resultset_format_template.empty())
+            {
+                throw Exception(DB::ErrorCodes::INVALID_TEMPLATE_FORMAT, "Expected either format_template_resultset or format_template_resultset_format, but not both");
+            }
         }
 
-        ParsedTemplateFormatString row_format = ParsedTemplateFormatString(
+        ParsedTemplateFormatString row_format;
+        auto idx_row_by_name = [&](const String & colName)
+        {
+            return sample.getPositionByName(colName);
+        };
+        if (settings.template_settings.row_format.empty())
+        {
+            row_format = ParsedTemplateFormatString();
+            row_format.parse(settings.template_settings.row_format_template, idx_row_by_name);
+        }
+        else
+        {
+            row_format = ParsedTemplateFormatString(
                 FormatSchemaInfo(settings.template_settings.row_format, "Template", false,
                         settings.schema.is_server, settings.schema.format_schema_path),
-                [&](const String & colName)
-                {
-                    return sample.getPositionByName(colName);
-                });
-
+                idx_row_by_name);
+            if (!settings.template_settings.row_format_template.empty())
+            {
+                throw Exception(DB::ErrorCodes::INVALID_TEMPLATE_FORMAT, "Expected either format_template_row or format_template_row_format, but not both");
+            }
+        }
         return std::make_shared<TemplateBlockOutputFormat>(sample, buf, settings, resultset_format, row_format, settings.template_settings.row_between_delimiter);
     });
 
diff --git a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
index a6e4600d83b..f5edfb7c9d4 100644
--- a/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
+++ b/src/Processors/Formats/Impl/TemplateRowInputFormat.cpp
@@ -609,7 +609,9 @@ void registerTemplateSchemaReader(FormatFactory & factory)
         {
             size_t index = 0;
             auto idx_getter = [&](const String &) -> std::optional<size_t> { return index++; };
-            auto row_format = fillRowFormat(settings, idx_getter, false);
+            ParsedTemplateFormatString row_format;
+            if (!settings.template_settings.row_format.empty())
+                row_format = fillRowFormat(settings, idx_getter, false);
             std::unordered_set<FormatSettings::EscapingRule> visited_escaping_rules;
             String result = fmt::format("row_format={}, resultset_format={}, row_between_delimiter={}",
                 settings.template_settings.row_format,
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
index aa193ffd36a..353de76eea8 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.cpp
@@ -194,7 +194,7 @@ void ValuesBlockInputFormat::readUntilTheEndOfRowAndReTokenize(size_t current_co
     auto * row_end = buf->position();
     buf->rollbackToCheckpoint();
     tokens.emplace(buf->position(), row_end);
-    token_iterator.emplace(*tokens, static_cast<unsigned>(context->getSettingsRef().max_parser_depth));
+    token_iterator.emplace(*tokens, static_cast<unsigned>(context->getSettingsRef().max_parser_depth), static_cast<unsigned>(context->getSettingsRef().max_parser_backtracks));
     auto const & first = (*token_iterator).get();
     if (first.isError() || first.isEnd())
     {
@@ -293,7 +293,7 @@ bool ValuesBlockInputFormat::tryReadValue(IColumn & column, size_t column_idx)
             const auto & type = types[column_idx];
             const auto & serialization = serializations[column_idx];
             if (format_settings.null_as_default && !isNullableOrLowCardinalityNullable(type))
-                read = SerializationNullable::deserializeTextQuotedImpl(column, *buf, format_settings, serialization);
+                read = SerializationNullable::deserializeNullAsDefaultOrNestedTextQuoted(column, *buf, format_settings, serialization);
             else
                 serialization->deserializeTextQuoted(column, *buf, format_settings);
         }
@@ -418,7 +418,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
     {
         Expected expected;
         /// Keep a copy to the start of the column tokens to use if later if necessary
-        ti_start = IParser::Pos(*token_iterator, static_cast<unsigned>(settings.max_parser_depth));
+        ti_start = IParser::Pos(*token_iterator, static_cast<unsigned>(settings.max_parser_depth), static_cast<unsigned>(settings.max_parser_backtracks));
 
         parsed = parser.parse(*token_iterator, ast, expected);
 
@@ -492,7 +492,7 @@ bool ValuesBlockInputFormat::parseExpression(IColumn & column, size_t column_idx
                 &found_in_cache,
                 delimiter);
 
-            LOG_TEST(&Poco::Logger::get("ValuesBlockInputFormat"), "Will use an expression template to parse column {}: {}",
+            LOG_TEST(getLogger("ValuesBlockInputFormat"), "Will use an expression template to parse column {}: {}",
                      column_idx, structure->dumpTemplate());
 
             templates[column_idx].emplace(structure);
diff --git a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
index bf2765bfd1e..f82a8c8ab64 100644
--- a/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
+++ b/src/Processors/Formats/Impl/ValuesBlockInputFormat.h
@@ -37,7 +37,7 @@ public:
     void resetReadBuffer() override;
 
     /// TODO: remove context somehow.
-    void setContext(ContextPtr & context_) { context = Context::createCopy(context_); }
+    void setContext(const ContextPtr & context_) { context = Context::createCopy(context_); }
 
     const BlockMissingValues & getMissingValues() const override { return block_missing_values; }
 
diff --git a/src/Processors/Formats/InputFormatErrorsLogger.h b/src/Processors/Formats/InputFormatErrorsLogger.h
index b30246ff705..2230490f66a 100644
--- a/src/Processors/Formats/InputFormatErrorsLogger.h
+++ b/src/Processors/Formats/InputFormatErrorsLogger.h
@@ -18,7 +18,7 @@ public:
         String raw_data;
     };
 
-    InputFormatErrorsLogger(const ContextPtr & context);
+    explicit InputFormatErrorsLogger(const ContextPtr & context);
 
     virtual ~InputFormatErrorsLogger();
 
@@ -45,7 +45,7 @@ using InputFormatErrorsLoggerPtr = std::shared_ptr<InputFormatErrorsLogger>;
 class ParallelInputFormatErrorsLogger : public InputFormatErrorsLogger
 {
 public:
-    ParallelInputFormatErrorsLogger(const ContextPtr & context) : InputFormatErrorsLogger(context) { }
+    explicit ParallelInputFormatErrorsLogger(const ContextPtr & context) : InputFormatErrorsLogger(context) { }
 
     ~ParallelInputFormatErrorsLogger() override;
 
diff --git a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
index a56c24a740a..fcf338577f8 100644
--- a/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
+++ b/src/Processors/Formats/RowInputFormatWithDiagnosticInfo.cpp
@@ -136,7 +136,7 @@ bool RowInputFormatWithDiagnosticInfo::deserializeFieldAndPrintDiagnosticInfo(co
     auto * curr_position = in->position();
 
     if (curr_position < prev_position)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: parsing is non-deterministic.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Parsing is non-deterministic.");
 
     if (isNativeNumber(type) || isDate(type) || isDateTime(type) || isDateTime64(type))
     {
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
index 478ce41f924..2ad6a825c8f 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.cpp
@@ -7,6 +7,7 @@
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
+#include <IO/PeekableReadBuffer.h>
 #include <Formats/EscapingRuleUtils.h>
 
 
diff --git a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
index d0457990714..b7d9507151e 100644
--- a/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
+++ b/src/Processors/Formats/RowInputFormatWithNamesAndTypes.h
@@ -175,7 +175,7 @@ public:
     void transformTypesIfNeeded(DataTypePtr & type, DataTypePtr & new_type) override;
 
 protected:
-    virtual std::optional<DataTypes> readRowAndGetDataTypes() override;
+    std::optional<DataTypes> readRowAndGetDataTypes() override;
 
     virtual std::optional<DataTypes> readRowAndGetDataTypesImpl()
     {
diff --git a/src/Processors/IProcessor.h b/src/Processors/IProcessor.h
index c6bef186877..56b4509fe00 100644
--- a/src/Processors/IProcessor.h
+++ b/src/Processors/IProcessor.h
@@ -369,6 +369,8 @@ public:
 protected:
     virtual void onCancel() {}
 
+    std::atomic<bool> is_cancelled{false};
+
 private:
     /// For:
     /// - elapsed_us
@@ -378,8 +380,6 @@ private:
     /// - output_wait_elapsed_us
     friend class ExecutingGraph;
 
-    std::atomic<bool> is_cancelled{false};
-
     std::string processor_description;
 
     /// For processors_profile_log
diff --git a/src/Processors/ISource.h b/src/Processors/ISource.h
index 8c140d0d0a3..778042c5b56 100644
--- a/src/Processors/ISource.h
+++ b/src/Processors/ISource.h
@@ -44,7 +44,7 @@ public:
     void setStorageLimits(const std::shared_ptr<const StorageLimitsList> & storage_limits_) override;
 
     /// Default implementation for all the sources.
-    std::optional<ReadProgress> getReadProgress() final;
+    std::optional<ReadProgress> getReadProgress() override;
 
     void addTotalRowsApprox(size_t value);
     void addTotalBytes(size_t value);
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
index d2d2434c477..3bd0b532d90 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.cpp
@@ -126,7 +126,7 @@ static void postprocessChunk(Chunk & chunk, const AggregatingSortedAlgorithm::Co
 
 
 AggregatingSortedAlgorithm::SimpleAggregateDescription::SimpleAggregateDescription(
-    AggregateFunctionPtr function_, const size_t column_number_,
+    AggregateFunctionPtr function_, size_t column_number_,
     DataTypePtr nested_type_, DataTypePtr real_type_)
     : function(std::move(function_)), column_number(column_number_)
     , nested_type(std::move(nested_type_)), real_type(std::move(real_type_))
diff --git a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
index 72a1f4871d8..db8ee66ab2b 100644
--- a/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/AggregatingSortedAlgorithm.h
@@ -1,9 +1,10 @@
 #pragma once
 
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Columns/ColumnAggregateFunction.h>
-#include <Common/AlignedBuffer.h>
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithDelayedChunk.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
+#include <Common/AlignedBuffer.h>
 
 namespace DB
 {
@@ -47,7 +48,7 @@ public:
         bool created = false;
 
         SimpleAggregateDescription(
-            AggregateFunctionPtr function_, const size_t column_number_,
+            AggregateFunctionPtr function_, size_t column_number_,
             DataTypePtr nested_type_, DataTypePtr real_type_);
 
         void createState();
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
index 14325223602..8948cee217c 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.cpp
@@ -28,7 +28,7 @@ CollapsingSortedAlgorithm::CollapsingSortedAlgorithm(
     bool only_positive_sign_,
     size_t max_block_size_rows_,
     size_t max_block_size_bytes_,
-    Poco::Logger * log_,
+    LoggerPtr 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)
diff --git a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
index 28bb87cb394..be1a3a3bf33 100644
--- a/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/CollapsingSortedAlgorithm.h
@@ -34,7 +34,7 @@ public:
         bool only_positive_sign_, /// For select final. Skip rows with sum(sign) < 0.
         size_t max_block_size_rows_,
         size_t max_block_size_bytes_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false);
 
@@ -64,7 +64,7 @@ private:
     PODArray<RowSourcePart> current_row_sources;   /// Sources of rows with the current primary key
 
     size_t count_incorrect_data = 0;    /// To prevent too many error messages from writing to the log.
-    Poco::Logger * log;
+    LoggerPtr log;
 
     void reportIncorrectData();
     void insertRow(RowRef & row);
diff --git a/src/Processors/Merges/Algorithms/Graphite.cpp b/src/Processors/Merges/Algorithms/Graphite.cpp
index 817961b709c..0865ec8c0bb 100644
--- a/src/Processors/Merges/Algorithms/Graphite.cpp
+++ b/src/Processors/Merges/Algorithms/Graphite.cpp
@@ -1,16 +1,17 @@
-#include <base/find_symbols.h>
-#include <Interpreters/Context.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <AggregateFunctions/parseAggregateFunctionParameters.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
 #include <Processors/Merges/Algorithms/Graphite.h>
+#include <base/find_symbols.h>
+#include <base/sort.h>
 
 #include <string_view>
 #include <vector>
 #include <unordered_map>
 
 #include <fmt/format.h>
-#include <base/sort.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -61,6 +62,23 @@ RuleType ruleType(const String & s)
         throw Exception(DB::ErrorCodes::BAD_ARGUMENTS, "invalid rule type: {}", s);
 }
 
+void Pattern::updateHash(SipHash & hash) const
+{
+    hash.update(rule_type);
+    hash.update(regexp_str);
+    if (function)
+    {
+        hash.update(function->getName());
+        for (const auto & p : function->getParameters())
+            hash.update(toString(p));
+    }
+    for (const auto & r : retentions)
+    {
+        hash.update(r.age);
+        hash.update(r.precision);
+    }
+}
+
 static const Graphite::Pattern undef_pattern =
 { /// empty pattern for selectPatternForPath
         .rule_type = RuleTypeAll,
@@ -68,7 +86,7 @@ static const Graphite::Pattern undef_pattern =
         .regexp_str = "",
         .function = nullptr,
         .retentions = Graphite::Retentions(),
-        .type = undef_pattern.TypeUndef,
+        .type = Graphite::Pattern::TypeUndef,
 };
 
 inline static const Patterns & selectPatternsForMetricType(const Graphite::Params & params, std::string_view path)
@@ -76,7 +94,7 @@ inline static const Patterns & selectPatternsForMetricType(const Graphite::Param
     if (params.patterns_typed)
     {
         std::string_view path_view = path;
-        if (path_view.find("?"sv) == path_view.npos)
+        if (path_view.find("?"sv) == std::string::npos)
             return params.patterns_plain;
         else
             return params.patterns_tagged;
@@ -100,18 +118,18 @@ Graphite::RollupRule selectPatternForPath(
         if (!pattern.regexp)
         {
             /// Default pattern
-            if (first_match->type == first_match->TypeUndef && pattern.type == pattern.TypeAll)
+            if (first_match->type == Graphite::Pattern::TypeUndef && pattern.type == Graphite::Pattern::TypeAll)
             {
                 /// There is only default pattern for both retention and aggregation
                 return {&pattern, &pattern};
             }
             if (pattern.type != first_match->type)
             {
-                if (first_match->type == first_match->TypeRetention)
+                if (first_match->type == Graphite::Pattern::TypeRetention)
                 {
                     return {first_match, &pattern};
                 }
-                if (first_match->type == first_match->TypeAggregation)
+                if (first_match->type == Graphite::Pattern::TypeAggregation)
                 {
                     return {&pattern, first_match};
                 }
@@ -122,23 +140,23 @@ Graphite::RollupRule selectPatternForPath(
             if (pattern.regexp->match(path.data(), path.size()))
             {
                 /// General pattern with matched path
-                if (pattern.type == pattern.TypeAll)
+                if (pattern.type == Graphite::Pattern::TypeAll)
                 {
                     /// Only for not default patterns with both function and retention parameters
                     return {&pattern, &pattern};
                 }
-                if (first_match->type == first_match->TypeUndef)
+                if (first_match->type == Graphite::Pattern::TypeUndef)
                 {
                     first_match = &pattern;
                     continue;
                 }
                 if (pattern.type != first_match->type)
                 {
-                    if (first_match->type == first_match->TypeRetention)
+                    if (first_match->type == Graphite::Pattern::TypeRetention)
                     {
                         return {first_match, &pattern};
                     }
-                    if (first_match->type == first_match->TypeAggregation)
+                    if (first_match->type == Graphite::Pattern::TypeAggregation)
                     {
                         return {&pattern, first_match};
                     }
@@ -397,24 +415,24 @@ static const Pattern & appendGraphitePattern(
 
     if (!pattern.function)
     {
-        pattern.type = pattern.TypeRetention;
+        pattern.type = Graphite::Pattern::TypeRetention;
     }
     else if (pattern.retentions.empty())
     {
-        pattern.type = pattern.TypeAggregation;
+        pattern.type = Graphite::Pattern::TypeAggregation;
     }
     else
     {
-        pattern.type = pattern.TypeAll;
+        pattern.type = Graphite::Pattern::TypeAll;
     }
 
-    if (pattern.type & pattern.TypeAggregation) /// TypeAggregation or TypeAll
+    if (pattern.type & Graphite::Pattern::TypeAggregation) /// TypeAggregation or TypeAll
         if (pattern.function->allocatesMemoryInArena())
             throw Exception(DB::ErrorCodes::NOT_IMPLEMENTED,
                             "Aggregate function {} isn't supported in GraphiteMergeTree", pattern.function->getName());
 
     /// retention should be in descending order of age.
-    if (pattern.type & pattern.TypeRetention) /// TypeRetention or TypeAll
+    if (pattern.type & Graphite::Pattern::TypeRetention) /// TypeRetention or TypeAll
         ::sort(pattern.retentions.begin(), pattern.retentions.end(), compareRetentions);
 
     patterns.emplace_back(pattern);
diff --git a/src/Processors/Merges/Algorithms/Graphite.h b/src/Processors/Merges/Algorithms/Graphite.h
index 04bb4548c14..ce3331053d1 100644
--- a/src/Processors/Merges/Algorithms/Graphite.h
+++ b/src/Processors/Merges/Algorithms/Graphite.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include <Common/SipHash.h>
+#include <AggregateFunctions/IAggregateFunction_fwd.h>
+#include <Interpreters/Context_fwd.h>
 #include <Common/OptimizedRegularExpression.h>
-#include <AggregateFunctions/IAggregateFunction.h>
+#include <Common/SipHash.h>
 
 /** Intended for implementation of "rollup" - aggregation (rounding) of older data
   *  for a table with Graphite data (Graphite is the system for time series monitoring).
@@ -123,22 +124,7 @@ struct Pattern
     AggregateFunctionPtr function;
     Retentions retentions;    /// Must be ordered by 'age' descending.
     enum { TypeUndef, TypeRetention, TypeAggregation, TypeAll } type = TypeAll; /// The type of defined pattern, filled automatically
-    void updateHash(SipHash & hash) const
-    {
-        hash.update(rule_type);
-        hash.update(regexp_str);
-        if (function)
-        {
-            hash.update(function->getName());
-            for (const auto & p : function->getParameters())
-                hash.update(toString(p));
-        }
-        for (const auto & r : retentions)
-        {
-            hash.update(r.age);
-            hash.update(r.precision);
-        }
-    }
+    void updateHash(SipHash & hash) const;
 };
 
 bool operator==(const Pattern & a, const Pattern & b);
diff --git a/src/Processors/Merges/Algorithms/IMergingAlgorithm.h b/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
index d55ceb78af4..6e352c3f104 100644
--- a/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/IMergingAlgorithm.h
@@ -31,7 +31,7 @@ public:
 
         IColumn::Permutation * permutation = nullptr;
 
-        void swap(Input & other)
+        void swap(Input & other) noexcept
         {
             chunk.swap(other.chunk);
             std::swap(skip_last_row, other.skip_last_row);
diff --git a/src/Processors/Merges/Algorithms/MergedData.h b/src/Processors/Merges/Algorithms/MergedData.h
index f92d20d22e1..7ffde835ad0 100644
--- a/src/Processors/Merges/Algorithms/MergedData.h
+++ b/src/Processors/Merges/Algorithms/MergedData.h
@@ -100,7 +100,7 @@ public:
         merged_rows = 0;
         sum_blocks_granularity = 0;
         ++total_chunks;
-        total_allocated_bytes += chunk.allocatedBytes();
+        total_allocated_bytes += chunk.bytes();
         need_flush = false;
 
         return chunk;
@@ -122,7 +122,7 @@ public:
         {
             size_t merged_bytes = 0;
             for (const auto & column : columns)
-                merged_bytes += column->allocatedBytes();
+                merged_bytes += column->byteSize();
             if (merged_bytes >= max_block_size_bytes)
                 return true;
         }
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
index c1d68dfa6b4..9e5c1249c4e 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.cpp
@@ -1,16 +1,34 @@
+#include <memory>
 #include <Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h>
 
 #include <Columns/ColumnsNumber.h>
 #include <IO/WriteBuffer.h>
+#include <Columns/IColumn.h>
+#include <Processors/Merges/Algorithms/RowRef.h>
 
 namespace DB
 {
 
 namespace ErrorCodes
 {
+    extern const int LOGICAL_ERROR;
     extern const int INCORRECT_DATA;
 }
 
+static IMergingAlgorithm::Status emitChunk(detail::SharedChunkPtr & chunk, bool finished = false)
+{
+    chunk->setChunkInfo(std::make_shared<ChunkSelectFinalIndices>(std::move(chunk->replace_final_selection)));
+    return IMergingAlgorithm::Status(std::move(*chunk), finished);
+}
+
+ChunkSelectFinalIndices::ChunkSelectFinalIndices(MutableColumnPtr select_final_indices_)
+    : column_holder(std::move(select_final_indices_))
+    , select_final_indices(typeid_cast<const ColumnUInt64 *>(column_holder.get()))
+{
+    if (!select_final_indices)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Column passed to 'ChunkSelectFinalIndices' must be ColumnUInt64");
+}
+
 ReplacingSortedAlgorithm::ReplacingSortedAlgorithm(
     const Block & header_,
     size_t num_inputs,
@@ -21,9 +39,11 @@ ReplacingSortedAlgorithm::ReplacingSortedAlgorithm(
     size_t max_block_size_bytes,
     WriteBuffer * out_row_sources_buf_,
     bool use_average_block_sizes,
-    bool cleanup_)
+    bool cleanup_,
+    bool enable_vertical_final_)
     : 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_rows, max_block_size_bytes), cleanup(cleanup_)
+    , enable_vertical_final(enable_vertical_final_)
 {
     if (!is_deleted_column.empty())
         is_deleted_column_number = header_.getPositionByName(is_deleted_column);
@@ -43,19 +63,40 @@ void ReplacingSortedAlgorithm::insertRow()
         current_row_sources.resize(0);
     }
 
-    merged_data.insertRow(*selected_row.all_columns, selected_row.row_num, selected_row.owned_chunk->getNumRows());
+    if (enable_vertical_final)
+    {
+        /// We just record the position to be selected in the chunk
+        if (!selected_row.owned_chunk->replace_final_selection)
+            selected_row.owned_chunk->replace_final_selection = ColumnUInt64::create();
+        selected_row.owned_chunk->replace_final_selection->insert(selected_row.row_num);
+
+        /// This is the last row we can select from `selected_row.owned_chunk`, keep it to emit later
+        if (selected_row.current_cursor == nullptr)
+            to_be_emitted.push(std::move(selected_row.owned_chunk));
+    }
+    else
+        merged_data.insertRow(*selected_row.all_columns, selected_row.row_num, selected_row.owned_chunk->getNumRows());
+
     selected_row.clear();
 }
 
 IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
 {
+    /// Skipping final: we've done processing some chunk and can emit them
+    if (!to_be_emitted.empty())
+    {
+        auto chunk = std::move(to_be_emitted.front());
+        to_be_emitted.pop();
+        return emitChunk(chunk);
+    }
+
     /// Take the rows in needed order and put them into `merged_columns` until rows no more than `max_block_size`
     while (queue.isValid())
     {
         SortCursor current = queue.current();
-
         if (current->isLast() && skipLastRowFor(current->order))
         {
+            saveChunkForSkippingFinalFromSource(current.impl->order);
             /// Get the next block from the corresponding source, if there is one.
             queue.removeTop();
             return Status(current.impl->order);
@@ -67,7 +108,7 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
         bool key_differs = selected_row.empty() || rowsHaveDifferentSortColumns(selected_row, current_row);
         if (key_differs)
         {
-            /// if there are enough rows and the last one is calculated completely
+            /// If there are enough rows and the last one is calculated completely
             if (merged_data.hasEnoughRows())
                 return Status(merged_data.pull());
 
@@ -81,6 +122,8 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
                 }
                 else
                     insertRow();
+                /// insertRow() may has not been called
+                saveChunkForSkippingFinalFromSelectedRow();
             }
 
             selected_row.clear();
@@ -107,6 +150,7 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
                 /* nan_direction_hint = */ 1) >= 0)
         {
             max_pos = current_pos;
+            saveChunkForSkippingFinalFromSelectedRow();
             setRowRef(selected_row, current);
         }
 
@@ -116,6 +160,7 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
         }
         else
         {
+            saveChunkForSkippingFinalFromSource(current.impl->order);
             /// We get the next block from the corresponding source, if there is one.
             queue.removeTop();
             return Status(current.impl->order);
@@ -136,9 +181,48 @@ IMergingAlgorithm::Status ReplacingSortedAlgorithm::merge()
         }
         else
             insertRow();
+        /// insertRow() may has not been called
+        saveChunkForSkippingFinalFromSelectedRow();
+    }
+
+    /// Skipping final: emit the remaining chunks
+    if (!to_be_emitted.empty())
+    {
+        auto chunk = std::move(to_be_emitted.front());
+        to_be_emitted.pop();
+        return emitChunk(chunk, to_be_emitted.empty());
     }
 
     return Status(merged_data.pull(), true);
 }
 
+void ReplacingSortedAlgorithm::saveChunkForSkippingFinalFromSelectedRow()
+{
+    if (selected_row.owned_chunk && selected_row.owned_chunk->replace_final_selection && selected_row.current_cursor == nullptr)
+        to_be_emitted.push(std::move(selected_row.owned_chunk));
+}
+
+void ReplacingSortedAlgorithm::saveChunkForSkippingFinalFromSource(size_t current_source_index)
+{
+    if (enable_vertical_final)
+    {
+        auto & chunk = sources[current_source_index].chunk;
+        if (selected_row.owned_chunk.get() == chunk.get())
+        {
+            /// selected_row is the last row (or the row before last row) of chunk, so we cannot emit the chunk now.
+            /// But after this function, queue.removeTop() will destroy the chunk's cursor, so we mark `selected_row.current_cursor` to `nullptr`
+            /// to indicate that `selected_row` is now the sole owner of the chunk
+            /// Later when we change the value of `selected_row`, if `selected_row` is the sole owner of its chunk and the chunk has selected rows,
+            /// we will emit it
+            selected_row.current_cursor = nullptr;
+        }
+        else
+        {
+            /// Otherwise, its safe to emit the chunk
+            if (chunk->replace_final_selection)
+                to_be_emitted.push(std::move(chunk));
+        }
+    }
+}
+
 }
diff --git a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
index d57bab4708c..2fbd73c9072 100644
--- a/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
+++ b/src/Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h
@@ -2,6 +2,7 @@
 #include <Processors/Merges/Algorithms/IMergingAlgorithmWithSharedChunks.h>
 #include <Processors/Merges/Algorithms/MergedData.h>
 #include <Processors/Transforms/ColumnGathererTransform.h>
+#include <Processors/Merges/Algorithms/RowRef.h>
 
 namespace Poco
 {
@@ -11,6 +12,15 @@ class Logger;
 namespace DB
 {
 
+/** Use in skipping final to keep list of indices of selected row after merging final
+  */
+struct ChunkSelectFinalIndices : public ChunkInfo
+{
+    const ColumnPtr column_holder;
+    const ColumnUInt64 * select_final_indices = nullptr;
+    explicit ChunkSelectFinalIndices(MutableColumnPtr select_final_indices_);
+};
+
 /** Merges several sorted inputs into one.
   * For each group of consecutive identical values of the primary key (the columns by which the data is sorted),
   *  keeps row with max `version` value.
@@ -27,7 +37,8 @@ public:
         size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
-        bool cleanup = false);
+        bool cleanup = false,
+        bool enable_vertical_final_ = false);
 
     const char * getName() const override { return "ReplacingSortedAlgorithm"; }
     Status merge() override;
@@ -39,15 +50,27 @@ private:
     ssize_t version_column_number = -1;
     bool cleanup = false;
 
+    bool enable_vertical_final = false; /// Either we use skipping final algorithm
+    std::queue<detail::SharedChunkPtr> to_be_emitted;   /// To save chunks when using skipping final
+
     using RowRef = detail::RowRefWithOwnedChunk;
     static constexpr size_t max_row_refs = 2; /// last, current.
-    RowRef selected_row; /// Last row with maximum version for current primary key.
+    RowRef selected_row; /// Last row with maximum version for current primary key, may extend lifetime of chunk in input source
     size_t max_pos = 0; /// The position (into current_row_sources) of the row with the highest version.
 
     /// Sources of rows with the current primary key.
     PODArray<RowSourcePart> current_row_sources;
 
     void insertRow();
+
+    /// Method for using in skipping FINAL logic
+    /// Skipping FINAL doesn't merge rows to new chunks but marks selected rows in input chunks and emit them
+
+    /// When removing a source from queue, if source 's chunk has selected rows then we keep it
+    void saveChunkForSkippingFinalFromSource(size_t current_source_index);
+    /// When changing current `selected_row`, if selected_row is the last owner of an input chunk and that chunk
+    /// has selected rows, we also keep it
+    void saveChunkForSkippingFinalFromSelectedRow();
 };
 
 }
diff --git a/src/Processors/Merges/Algorithms/RowRef.h b/src/Processors/Merges/Algorithms/RowRef.h
index c4dea2e3faa..af379ec59f6 100644
--- a/src/Processors/Merges/Algorithms/RowRef.h
+++ b/src/Processors/Merges/Algorithms/RowRef.h
@@ -29,6 +29,9 @@ struct SharedChunk : Chunk
     ColumnRawPtrs all_columns;
     ColumnRawPtrs sort_columns;
 
+    /// Used in ReplacingSortedAlgorithm when using skipping final
+    MutableColumnPtr replace_final_selection;
+
     using Chunk::Chunk;
     using Chunk::operator=;
 
@@ -83,7 +86,7 @@ public:
     {
         if (free_chunks.size() != chunks.size())
         {
-            LOG_ERROR(&Poco::Logger::get("SharedChunkAllocator"), "SharedChunkAllocator was destroyed before RowRef was released. StackTrace: {}", StackTrace().toString());
+            LOG_ERROR(getLogger("SharedChunkAllocator"), "SharedChunkAllocator was destroyed before RowRef was released. StackTrace: {}", StackTrace().toString());
 
             return;
         }
@@ -100,7 +103,7 @@ private:
             /// This may happen if allocator was removed before chunks.
             /// Log message and exit, because we don't want to throw exception in destructor.
 
-            LOG_ERROR(&Poco::Logger::get("SharedChunkAllocator"), "SharedChunkAllocator was destroyed before RowRef was released. StackTrace: {}", StackTrace().toString());
+            LOG_ERROR(getLogger("SharedChunkAllocator"), "SharedChunkAllocator was destroyed before RowRef was released. StackTrace: {}", StackTrace().toString());
 
             return;
         }
@@ -174,14 +177,17 @@ struct RowRefWithOwnedChunk
     ColumnRawPtrs * sort_columns = nullptr;
     UInt64 row_num = 0;
 
+    const SortCursorImpl * current_cursor = nullptr;
+
     UInt64 source_stream_index = 0;
 
-    void swap(RowRefWithOwnedChunk & other)
+    void swap(RowRefWithOwnedChunk & other) /// NOLINT(performance-noexcept-swap)
     {
         owned_chunk.swap(other.owned_chunk);
         std::swap(all_columns, other.all_columns);
         std::swap(sort_columns, other.sort_columns);
         std::swap(row_num, other.row_num);
+        std::swap(current_cursor, other.current_cursor);
         std::swap(source_stream_index, other.source_stream_index);
     }
 
@@ -193,6 +199,7 @@ struct RowRefWithOwnedChunk
         all_columns = nullptr;
         sort_columns = nullptr;
         row_num = 0;
+        current_cursor = nullptr;
         source_stream_index = 0;
     }
 
@@ -202,6 +209,7 @@ struct RowRefWithOwnedChunk
         row_num = cursor.impl->getRow();
         all_columns = &owned_chunk->all_columns;
         sort_columns = &owned_chunk->sort_columns;
+        current_cursor = cursor.impl;
         source_stream_index = cursor.impl->order;
     }
 
diff --git a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
index 845cf561968..79b5dae2d6e 100644
--- a/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
+++ b/src/Processors/Merges/Algorithms/SummingSortedAlgorithm.cpp
@@ -12,7 +12,7 @@
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <IO/WriteHelpers.h>
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 
 
 namespace DB
@@ -224,7 +224,7 @@ static SummingSortedAlgorithm::ColumnsDefinition defineColumns(
         const ColumnWithTypeAndName & column = header.safeGetByPosition(i);
 
         const auto * simple = dynamic_cast<const DataTypeCustomSimpleAggregateFunction *>(column.type->getCustomName());
-        if (column.name == BlockNumberColumn::name)
+        if (column.name == BlockNumberColumn::name || column.name == BlockOffsetColumn::name)
         {
             def.column_numbers_not_to_aggregate.push_back(i);
             continue;
diff --git a/src/Processors/Merges/CollapsingSortedTransform.h b/src/Processors/Merges/CollapsingSortedTransform.h
index b0cb6bc6d62..4479ac82f66 100644
--- a/src/Processors/Merges/CollapsingSortedTransform.h
+++ b/src/Processors/Merges/CollapsingSortedTransform.h
@@ -29,7 +29,7 @@ public:
             only_positive_sign,
             max_block_size_rows,
             max_block_size_bytes,
-            &Poco::Logger::get("CollapsingSortedTransform"),
+            getLogger("CollapsingSortedTransform"),
             out_row_sources_buf_,
             use_average_block_sizes)
     {
diff --git a/src/Processors/Merges/MergingSortedTransform.cpp b/src/Processors/Merges/MergingSortedTransform.cpp
index 62275f37857..338b1ff7935 100644
--- a/src/Processors/Merges/MergingSortedTransform.cpp
+++ b/src/Processors/Merges/MergingSortedTransform.cpp
@@ -53,7 +53,7 @@ void MergingSortedTransform::onFinish()
 
     const auto & merged_data = algorithm.getMergedData();
 
-    auto * log = &Poco::Logger::get("MergingSortedTransform");
+    auto log = getLogger("MergingSortedTransform");
 
     double seconds = total_stopwatch.elapsedSeconds();
 
diff --git a/src/Processors/Merges/ReplacingSortedTransform.h b/src/Processors/Merges/ReplacingSortedTransform.h
index 9cd2f29a862..2657987f161 100644
--- a/src/Processors/Merges/ReplacingSortedTransform.h
+++ b/src/Processors/Merges/ReplacingSortedTransform.h
@@ -19,7 +19,8 @@ public:
         size_t max_block_size_bytes,
         WriteBuffer * out_row_sources_buf_ = nullptr,
         bool use_average_block_sizes = false,
-        bool cleanup = false)
+        bool cleanup = false,
+        bool enable_vertical_final = false)
         : IMergingTransform(
             num_inputs, header, header, /*have_all_inputs_=*/ true, /*limit_hint_=*/ 0, /*always_read_till_end_=*/ false,
             header,
@@ -31,7 +32,8 @@ public:
             max_block_size_bytes,
             out_row_sources_buf_,
             use_average_block_sizes,
-            cleanup)
+            cleanup,
+            enable_vertical_final)
     {
     }
 
diff --git a/src/Processors/Port.h b/src/Processors/Port.h
index 67af2f041aa..f3c7bbb5fee 100644
--- a/src/Processors/Port.h
+++ b/src/Processors/Port.h
@@ -110,7 +110,7 @@ protected:
                 return result;
             }
 
-            uintptr_t ALWAYS_INLINE swap(std::atomic<Data *> & value, std::uintptr_t flags, std::uintptr_t mask)
+            uintptr_t ALWAYS_INLINE swap(std::atomic<Data *> & value, std::uintptr_t flags, std::uintptr_t mask) /// NOLINT
             {
                 Data * expected = nullptr;
                 Data * desired = getPtr(flags | getUInt(data));
diff --git a/src/Processors/QueryPlan/AggregatingStep.cpp b/src/Processors/QueryPlan/AggregatingStep.cpp
index f374a7b7b10..0d7e05af1de 100644
--- a/src/Processors/QueryPlan/AggregatingStep.cpp
+++ b/src/Processors/QueryPlan/AggregatingStep.cpp
@@ -3,11 +3,13 @@
 #include <memory>
 #include <Columns/ColumnFixedString.h>
 #include <DataTypes/DataTypeFixedString.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypesNumber.h>
 #include <Functions/FunctionFactory.h>
 #include <IO/Operators.h>
 #include <Interpreters/Aggregator.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/ExpressionActions.h>
 #include <Processors/Merges/AggregatingSortedTransform.h>
 #include <Processors/Merges/FinishAggregatingInOrderTransform.h>
 #include <Processors/QueryPlan/AggregatingStep.h>
@@ -190,20 +192,24 @@ void AggregatingStep::transformPipeline(QueryPipelineBuilder & pipeline, const B
         const size_t streams = pipeline.getNumStreams();
 
         auto input_header = pipeline.getHeader();
-        pipeline.transform([&](OutputPortRawPtrs ports)
+
+        if (grouping_sets_size > 1)
         {
-            Processors copiers;
-            copiers.reserve(ports.size());
-
-            for (auto * port : ports)
+            pipeline.transform([&](OutputPortRawPtrs ports)
             {
-                auto copier = std::make_shared<CopyTransform>(input_header, grouping_sets_size);
-                connect(*port, copier->getInputPort());
-                copiers.push_back(copier);
-            }
+                Processors copiers;
+                copiers.reserve(ports.size());
 
-            return copiers;
-        });
+                for (auto * port : ports)
+                {
+                    auto copier = std::make_shared<CopyTransform>(input_header, grouping_sets_size);
+                    connect(*port, copier->getInputPort());
+                    copiers.push_back(copier);
+                }
+
+                return copiers;
+            });
+        }
 
         pipeline.transform([&](OutputPortRawPtrs ports)
         {
diff --git a/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.h b/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.h
index 023901dba02..70ae4c6156e 100644
--- a/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.h
+++ b/src/Processors/QueryPlan/CreateSetAndFilterOnTheFlyStep.h
@@ -54,7 +54,7 @@ private:
 
     JoinTableSide position;
 
-    Poco::Logger * log = &Poco::Logger::get("CreateSetAndFilterOnTheFlyStep");
+    LoggerPtr log = getLogger("CreateSetAndFilterOnTheFlyStep");
 };
 
 }
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.cpp b/src/Processors/QueryPlan/CreatingSetsStep.cpp
index 3e4dfb0c7d1..f13a717004f 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.cpp
+++ b/src/Processors/QueryPlan/CreatingSetsStep.cpp
@@ -157,6 +157,34 @@ void addCreatingSetsStep(QueryPlan & query_plan, PreparedSets::Subqueries subque
     query_plan.unitePlans(std::move(creating_sets), std::move(plans));
 }
 
+QueryPipelineBuilderPtr addCreatingSetsTransform(QueryPipelineBuilderPtr pipeline, PreparedSets::Subqueries subqueries, ContextPtr context)
+{
+    DataStreams input_streams;
+    input_streams.emplace_back(DataStream{pipeline->getHeader()});
+
+    QueryPipelineBuilders pipelines;
+    pipelines.reserve(1 + subqueries.size());
+    pipelines.push_back(std::move(pipeline));
+
+    auto plan_settings = QueryPlanOptimizationSettings::fromContext(context);
+    auto pipeline_settings = BuildQueryPipelineSettings::fromContext(context);
+
+    for (auto & future_set : subqueries)
+    {
+        if (future_set->get())
+            continue;
+
+        auto plan = future_set->build(context);
+        if (!plan)
+            continue;
+
+        input_streams.emplace_back(plan->getCurrentDataStream());
+        pipelines.emplace_back(plan->buildQueryPipeline(plan_settings, pipeline_settings));
+    }
+
+    return CreatingSetsStep(input_streams).updatePipeline(std::move(pipelines), pipeline_settings);
+}
+
 std::vector<std::unique_ptr<QueryPlan>> DelayedCreatingSetsStep::makePlansForSets(DelayedCreatingSetsStep && step)
 {
     std::vector<std::unique_ptr<QueryPlan>> plans;
diff --git a/src/Processors/QueryPlan/CreatingSetsStep.h b/src/Processors/QueryPlan/CreatingSetsStep.h
index a90b70a2fa4..292ec19914c 100644
--- a/src/Processors/QueryPlan/CreatingSetsStep.h
+++ b/src/Processors/QueryPlan/CreatingSetsStep.h
@@ -72,4 +72,6 @@ void addCreatingSetsStep(QueryPlan & query_plan, PreparedSets::Subqueries subque
 
 void addCreatingSetsStep(QueryPlan & query_plan, PreparedSetsPtr prepared_sets, ContextPtr context);
 
+QueryPipelineBuilderPtr addCreatingSetsTransform(QueryPipelineBuilderPtr pipeline, PreparedSets::Subqueries subqueries, ContextPtr context);
+
 }
diff --git a/src/Processors/QueryPlan/CubeStep.cpp b/src/Processors/QueryPlan/CubeStep.cpp
index 0c632c346c7..d010a3327a6 100644
--- a/src/Processors/QueryPlan/CubeStep.cpp
+++ b/src/Processors/QueryPlan/CubeStep.cpp
@@ -1,10 +1,11 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Functions/FunctionFactory.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Processors/QueryPlan/AggregatingStep.h>
 #include <Processors/QueryPlan/CubeStep.h>
 #include <Processors/Transforms/CubeTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/QueryPlan/AggregatingStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Functions/FunctionFactory.h>
 
 namespace DB
 {
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
index 4d4bc6220e9..c8d230c87d9 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.cpp
@@ -14,12 +14,14 @@ namespace DB
 namespace
 {
 
-void addConvertingActions(QueryPlan & plan, const Block & header)
+void addConvertingActions(QueryPlan & plan, const Block & header, bool has_missing_objects)
 {
     if (blocksHaveEqualStructure(plan.getCurrentDataStream().header, header))
         return;
 
-    auto get_converting_dag = [](const Block & block_, const Block & header_)
+    auto mode = has_missing_objects ? ActionsDAG::MatchColumnsMode::Position : ActionsDAG::MatchColumnsMode::Name;
+
+    auto get_converting_dag = [mode](const Block & block_, const Block & header_)
     {
         /// Convert header structure to expected.
         /// Also we ignore constants from result and replace it with constants from header.
@@ -27,7 +29,7 @@ void addConvertingActions(QueryPlan & plan, const Block & header)
         return ActionsDAG::makeConvertingActions(
             block_.getColumnsWithTypeAndName(),
             header_.getColumnsWithTypeAndName(),
-            ActionsDAG::MatchColumnsMode::Name,
+            mode,
             true);
     };
 
@@ -44,7 +46,8 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t shard_num,
-    size_t shard_count)
+    size_t shard_count,
+    bool has_missing_objects)
 {
     checkStackSize();
 
@@ -74,7 +77,7 @@ std::unique_ptr<QueryPlan> createLocalPlan(
         interpreter.buildQueryPlan(*query_plan);
     }
 
-    addConvertingActions(*query_plan, header);
+    addConvertingActions(*query_plan, header, has_missing_objects);
     return query_plan;
 }
 
diff --git a/src/Processors/QueryPlan/DistributedCreateLocalPlan.h b/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
index 489d2607849..50545d9ae81 100644
--- a/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
+++ b/src/Processors/QueryPlan/DistributedCreateLocalPlan.h
@@ -18,5 +18,6 @@ std::unique_ptr<QueryPlan> createLocalPlan(
     ContextPtr context,
     QueryProcessingStage::Enum processed_stage,
     size_t shard_num,
-    size_t shard_count);
+    size_t shard_count,
+    bool has_missing_objects);
 }
diff --git a/src/Processors/QueryPlan/IQueryPlanStep.h b/src/Processors/QueryPlan/IQueryPlanStep.h
index df5c13a7f3b..ac5ea259d2e 100644
--- a/src/Processors/QueryPlan/IQueryPlanStep.h
+++ b/src/Processors/QueryPlan/IQueryPlanStep.h
@@ -64,6 +64,9 @@ public:
 
 using DataStreams = std::vector<DataStream>;
 
+class QueryPlan;
+using QueryPlanRawPtrs = std::list<QueryPlan *>;
+
 /// Single step of query plan.
 class IQueryPlanStep
 {
@@ -109,6 +112,9 @@ public:
     /// Get description of processors added in current step. Should be called after updatePipeline().
     virtual void describePipeline(FormatSettings & /*settings*/) const {}
 
+    /// Get child plans contained inside some steps (e.g ReadFromMerge) so that they are visible when doing EXPLAIN.
+    virtual QueryPlanRawPtrs getChildPlans() { return {}; }
+
     /// Append extra processors for this step.
     void appendExtraProcessors(const Processors & extra_processors);
 
diff --git a/src/Processors/QueryPlan/JoinStep.cpp b/src/Processors/QueryPlan/JoinStep.cpp
index 1931b1eb3a1..8fe2515e323 100644
--- a/src/Processors/QueryPlan/JoinStep.cpp
+++ b/src/Processors/QueryPlan/JoinStep.cpp
@@ -31,7 +31,7 @@ std::vector<std::pair<String, String>> describeJoinActions(const JoinPtr & join)
         description.emplace_back("ASOF inequality", toString(table_join.getAsofInequality()));
 
     if (!table_join.getClauses().empty())
-        description.emplace_back("Clauses", table_join.formatClauses(table_join.getClauses(), true /*short_format*/));
+        description.emplace_back("Clauses", TableJoin::formatClauses(table_join.getClauses(), true /*short_format*/));
 
     return description;
 }
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
index 55b8cb5ed53..81ea1707717 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.cpp
@@ -22,6 +22,8 @@ QueryPlanOptimizationSettings QueryPlanOptimizationSettings::fromSettings(const
 
     settings.filter_push_down = from.query_plan_enable_optimizations && from.query_plan_filter_push_down;
 
+    settings.optimize_prewhere = from.query_plan_enable_optimizations && from.query_plan_optimize_prewhere;
+
     settings.execute_functions_after_sorting = from.query_plan_enable_optimizations && from.query_plan_execute_functions_after_sorting;
 
     settings.reuse_storage_ordering_for_window_functions = from.query_plan_enable_optimizations && from.query_plan_reuse_storage_ordering_for_window_functions;
diff --git a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
index 791b8e57475..68c2efc8b0e 100644
--- a/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
+++ b/src/Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h
@@ -61,6 +61,8 @@ struct QueryPlanOptimizationSettings
     /// If remove-redundant-distinct-steps optimization is enabled.
     bool remove_redundant_distinct = true;
 
+    bool optimize_prewhere = true;
+
     /// If reading from projection can be applied
     bool optimize_projection = false;
     bool force_use_projection = false;
diff --git a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
index 3b31a809f9d..e71bcc5602a 100644
--- a/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
+++ b/src/Processors/QueryPlan/Optimizations/filterPushDown.cpp
@@ -383,7 +383,7 @@ size_t tryPushDownFilter(QueryPlan::Node * parent_node, QueryPlan::Nodes & nodes
             const size_t updated_steps = tryAddNewFilterStep(parent_node, nodes, split_filter, can_remove_filter, child_idx);
             if (updated_steps > 0)
             {
-                LOG_DEBUG(&Poco::Logger::get("QueryPlanOptimizations"), "Pushed down filter {} to the {} side of join", split_filter_column_name, kind);
+                LOG_DEBUG(getLogger("QueryPlanOptimizations"), "Pushed down filter {} to the {} side of join", split_filter_column_name, kind);
             }
             return updated_steps;
         };
diff --git a/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp b/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
index 34a1fc2bb88..b280e2d3cc6 100644
--- a/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
+++ b/src/Processors/QueryPlan/Optimizations/liftUpFunctions.cpp
@@ -29,14 +29,14 @@ const DB::DataStream & getChildOutputStream(DB::QueryPlan::Node & node)
 namespace DB::QueryPlanOptimizations
 {
 
-/// This is a check that output columns does not have the same name
+/// This is a check that nodes columns does not have the same name
 /// This is ok for DAG, but may introduce a bug in a SotringStep cause columns are selected by name.
-static bool areOutputsConvertableToBlock(const ActionsDAG::NodeRawConstPtrs & outputs)
+static bool areNodesConvertableToBlock(const ActionsDAG::NodeRawConstPtrs & nodes)
 {
     std::unordered_set<std::string_view> names;
-    for (const auto & output : outputs)
+    for (const auto & node : nodes)
     {
-        if (!names.emplace(output->result_name).second)
+        if (!names.emplace(node->result_name).second)
             return false;
     }
 
@@ -66,13 +66,13 @@ size_t tryExecuteFunctionsAfterSorting(QueryPlan::Node * parent_node, QueryPlan:
     NameSet sort_columns;
     for (const auto & col : sorting_step->getSortDescription())
         sort_columns.insert(col.column_name);
-    auto [needed_for_sorting, unneeded_for_sorting] = expression_step->getExpression()->splitActionsBySortingDescription(sort_columns);
+    auto [needed_for_sorting, unneeded_for_sorting, _] = expression_step->getExpression()->splitActionsBySortingDescription(sort_columns);
 
     // No calculations can be postponed.
     if (unneeded_for_sorting->trivial())
         return 0;
 
-    if (!areOutputsConvertableToBlock(needed_for_sorting->getOutputs()))
+    if (!areNodesConvertableToBlock(needed_for_sorting->getOutputs()) || !areNodesConvertableToBlock(unneeded_for_sorting->getInputs()))
         return 0;
 
     // Sorting (parent_node) -> Expression (child_node)
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
index 5c5171d4296..8c5839a9803 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrewhere.cpp
@@ -1,151 +1,73 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
-#include <Processors/QueryPlan/ReadFromMergeTree.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <Storages/MergeTree/MergeTreeWhereOptimizer.h>
+#include <Storages/StorageDummy.h>
 #include <Interpreters/ActionsDAG.h>
-#include <Planner/ActionsChain.h>
-#include <deque>
+#include <Functions/FunctionsLogical.h>
+#include <Functions/IFunctionAdaptors.h>
 
 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)
+static void removeFromOutput(ActionsDAG & dag, const std::string name)
+{
+    const auto * node = &dag.findInOutputs(name);
+    auto & outputs = dag.getOutputs();
+    for (size_t i = 0; i < outputs.size(); ++i)
+    {
+        if (node == outputs[i])
+        {
+            outputs.erase(outputs.begin() + i);
+            return;
+        }
+    }
+}
+
+void optimizePrewhere(Stack & stack, QueryPlan::Nodes &)
 {
     if (stack.size() < 3)
         return;
 
-    const auto & frame = stack.back();
+    auto & frame = stack.back();
 
     /** Assume that on stack there are at least 3 nodes:
       *
       * 1. SomeNode
       * 2. FilterNode
-      * 3. ReadFromMergeTreeNode
+      * 3. SourceStepWithFilterNode
       */
-    auto * read_from_merge_tree = typeid_cast<ReadFromMergeTree *>(frame.node->step.get());
-    if (!read_from_merge_tree)
+    auto * source_step_with_filter = dynamic_cast<SourceStepWithFilter *>(frame.node->step.get());
+    if (!source_step_with_filter)
         return;
 
-    const auto & storage_prewhere_info = read_from_merge_tree->getPrewhereInfo();
+    const auto & storage_snapshot = source_step_with_filter->getStorageSnapshot();
+    const auto & storage = storage_snapshot->storage;
+    if (!storage.canMoveConditionsToPrewhere())
+        return;
+
+    const auto & storage_prewhere_info = source_step_with_filter->getPrewhereInfo();
     if (storage_prewhere_info && storage_prewhere_info->prewhere_actions)
         return;
 
-    const QueryPlan::Node * filter_node = (stack.rbegin() + 1)->node;
+    /// TODO: We can also check for UnionStep, such as StorageBuffer and local distributed plans.
+    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 & context = source_step_with_filter->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 is_final = source_step_with_filter->isQueryWithFinal();
     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_source_columns = sampling_key.expression->getRequiredColumnsWithTypes();
-        for (const auto & column : sampling_source_columns)
-            required_columns_after_filter.push_back(ColumnWithTypeAndName(column.type, column.name));
-        const auto & sampling_result_columns = sampling_key.sample_block.getColumnsWithTypeAndName();
-        required_columns_after_filter.insert(required_columns_after_filter.end(), sampling_result_columns.begin(), sampling_result_columns.end());
-    }
-
-    const auto & storage = storage_snapshot->storage;
     const auto & storage_metadata = storage_snapshot->metadata;
     auto column_sizes = storage.getColumnSizes();
     if (column_sizes.empty())
@@ -156,21 +78,22 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes & nodes)
     for (const auto & [name, sizes] : column_sizes)
         column_compressed_sizes[name] = sizes.data_compressed;
 
-    Names queried_columns = read_from_merge_tree->getRealColumnNames();
+    Names queried_columns = source_step_with_filter->requiredSourceColumns();
 
     MergeTreeWhereOptimizer where_optimizer{
         std::move(column_compressed_sizes),
         storage_metadata,
-        storage.getConditionEstimatorByPredicate(read_from_merge_tree->getQueryInfo(), storage_snapshot, context),
+        storage.getConditionEstimatorByPredicate(source_step_with_filter->getQueryInfo(), storage_snapshot, context),
         queried_columns,
         storage.supportedPrewhereColumns(),
-        &Poco::Logger::get("QueryPlanOptimizePrewhere")};
+        getLogger("QueryPlanOptimizePrewhere")};
 
     auto optimize_result = where_optimizer.optimize(filter_step->getExpression(),
         filter_step->getFilterColumnName(),
-        read_from_merge_tree->getContext(),
+        source_step_with_filter->getContext(),
         is_final);
-    if (!optimize_result.has_value())
+
+    if (optimize_result.prewhere_nodes.empty())
         return;
 
     PrewhereInfoPtr prewhere_info;
@@ -180,202 +103,90 @@ void optimizePrewhere(Stack & stack, QueryPlan::Nodes & nodes)
         prewhere_info = std::make_shared<PrewhereInfo>();
 
     prewhere_info->need_filter = true;
+    prewhere_info->remove_prewhere_column = optimize_result.fully_moved_to_prewhere && filter_step->removesFilterColumn();
 
-    auto & prewhere_filter_actions = optimize_result->prewhere_filter_actions;
+    auto filter_expression = filter_step->getExpression();
+    const auto & filter_column_name = filter_step->getFilterColumnName();
 
-    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)
+    if (prewhere_info->remove_prewhere_column)
     {
-        /// 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);
+        removeFromOutput(*filter_expression, filter_column_name);
+        auto & outputs = filter_expression->getOutputs();
+        size_t size = outputs.size();
+        outputs.insert(outputs.end(), optimize_result.prewhere_nodes.begin(), optimize_result.prewhere_nodes.end());
+        filter_expression->removeUnusedActions(false);
+        outputs.resize(size);
+    }
 
-        for (auto & required_column : required_columns_after_filter)
+    auto split_result = filter_step->getExpression()->split(optimize_result.prewhere_nodes, true);
+
+    /// This is the leak of abstraction.
+    /// Splited actions may have inputs which are needed only for PREWHERE.
+    /// This is fine for ActionsDAG to have such a split, but it breaks defaults calculation.
+    ///
+    /// See 00950_default_prewhere for example.
+    /// Table has structure `APIKey UInt8, SessionType UInt8` and default `OperatingSystem = SessionType+1`
+    /// For a query with `SELECT OperatingSystem WHERE APIKey = 42 AND SessionType = 42` we push everything to PREWHERE
+    /// and columns APIKey, SessionType are removed from inputs (cause only OperatingSystem is needed).
+    /// However, column OperatingSystem is calculated after PREWHERE stage, based on SessionType value.
+    /// If column SessionType is removed by PREWHERE actions, we use zero as default, and get a wrong result.
+    ///
+    /// So, here we restore removed inputs for PREWHERE actions
+    {
+        std::unordered_set<const ActionsDAG::Node *> first_outputs(
+            split_result.first->getOutputs().begin(), split_result.first->getOutputs().end());
+        for (const auto * input : split_result.first->getInputs())
         {
-            if (!possible_prewhere_output_nodes.contains(required_column.name) &&
-                !output_nodes_mapped_to_input.contains(required_column.name))
+            if (!first_outputs.contains(input))
             {
-                need_additional_filter_after_prewhere = true;
-                break;
+                split_result.first->getOutputs().push_back(input);
+                /// Add column to second actions as input.
+                /// Do not add it to result, so it would be removed.
+                split_result.second->addInput(input->result_name, input->result_type);
             }
         }
     }
 
-    /** 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)
+    ActionsDAG::NodeRawConstPtrs conditions;
+    conditions.reserve(split_result.split_nodes_mapping.size());
+    for (const auto * condition : optimize_result.prewhere_nodes_list)
+        conditions.push_back(split_result.split_nodes_mapping.at(condition));
+
+    prewhere_info->prewhere_actions = std::move(split_result.first);
+    prewhere_info->remove_prewhere_column = optimize_result.fully_moved_to_prewhere && filter_step->removesFilterColumn();
+
+    if (conditions.size() == 1)
     {
-        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;
+        prewhere_info->prewhere_column_name = conditions.front()->result_name;
+        if (prewhere_info->remove_prewhere_column)
+            prewhere_info->prewhere_actions->getOutputs().push_back(conditions.front());
     }
     else
     {
-        auto rename_actions_dag = std::make_shared<ActionsDAG>(read_from_merge_tree->getOutputStream().header.getColumnsWithTypeAndName());
-        bool apply_rename_step = false;
+        prewhere_info->remove_prewhere_column = true;
 
-        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;
-        }
+        FunctionOverloadResolverPtr func_builder_and = std::make_unique<FunctionToOverloadResolverAdaptor>(std::make_shared<FunctionAnd>());
+        const auto * node = &prewhere_info->prewhere_actions->addFunction(func_builder_and, std::move(conditions), {});
+        prewhere_info->prewhere_column_name = node->result_name;
+        prewhere_info->prewhere_actions->getOutputs().push_back(node);
     }
 
-    QueryPlan::Node * filter_parent_node = (stack.rbegin() + 2)->node;
+    source_step_with_filter->updatePrewhereInfo(prewhere_info);
 
-    for (auto & filter_parent_child : filter_parent_node->children)
+    if (!optimize_result.fully_moved_to_prewhere)
     {
-        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;
-        }
+        filter_node->step = std::make_unique<FilterStep>(
+            source_step_with_filter->getOutputStream(),
+            std::move(split_result.second),
+            filter_step->getFilterColumnName(),
+            filter_step->removesFilterColumn());
+    }
+    else
+    {
+        /// Have to keep this expression to change column names to column identifiers
+        filter_node->step = std::make_unique<ExpressionStep>(
+            source_step_with_filter->getOutputStream(),
+            std::move(split_result.second));
     }
 }
 
diff --git a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
index e98386a6ee9..dbcaf5f00a7 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizePrimaryKeyCondition.cpp
@@ -1,8 +1,8 @@
 #include <Processors/QueryPlan/Optimizations/Optimizations.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/FilterStep.h>
+#include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Processors/QueryPlan/SourceStepWithFilter.h>
-#include <deque>
 
 namespace DB::QueryPlanOptimizations
 {
@@ -15,6 +15,14 @@ void optimizePrimaryKeyCondition(const Stack & stack)
     if (!source_step_with_filter)
         return;
 
+    const auto & storage_prewhere_info = source_step_with_filter->getPrewhereInfo();
+    if (storage_prewhere_info)
+    {
+        source_step_with_filter->addFilter(storage_prewhere_info->prewhere_actions, storage_prewhere_info->prewhere_column_name);
+        if (storage_prewhere_info->row_level_filter)
+            source_step_with_filter->addFilter(storage_prewhere_info->row_level_filter, storage_prewhere_info->row_level_column_name);
+    }
+
     for (auto iter = stack.rbegin() + 1; iter != stack.rend(); ++iter)
     {
         if (auto * filter_step = typeid_cast<FilterStep *>(iter->node->step.get()))
@@ -28,6 +36,8 @@ void optimizePrimaryKeyCondition(const Stack & stack)
         else
             break;
     }
+
+    source_step_with_filter->applyFilters();
 }
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
index c8c95e7443f..915e664ea8f 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeTree.cpp
@@ -114,10 +114,41 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
 
     while (!stack.empty())
     {
-        /// NOTE: optimizePrewhere can modify the stack.
-        optimizePrewhere(stack, nodes);
         optimizePrimaryKeyCondition(stack);
 
+        /// NOTE: optimizePrewhere can modify the stack.
+        /// Prewhere optimization relies on PK optimization (getConditionEstimatorByPredicate)
+        if (optimization_settings.optimize_prewhere)
+            optimizePrewhere(stack, nodes);
+
+        auto & frame = stack.back();
+
+        if (frame.next_child == 0)
+        {
+
+            if (optimization_settings.read_in_order)
+                optimizeReadInOrder(*frame.node, nodes);
+
+            if (optimization_settings.distinct_in_order)
+                tryDistinctReadInOrder(frame.node);
+        }
+
+        /// Traverse all children first.
+        if (frame.next_child < frame.node->children.size())
+        {
+            auto next_frame = Frame{.node = frame.node->children[frame.next_child]};
+            ++frame.next_child;
+            stack.push_back(next_frame);
+            continue;
+        }
+
+        stack.pop_back();
+    }
+
+    stack.push_back({.node = &root});
+
+    while (!stack.empty())
+    {
         {
             /// NOTE: frame cannot be safely used after stack was modified.
             auto & frame = stack.back();
@@ -126,19 +157,14 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
             {
                 has_reading_from_mt |= typeid_cast<const ReadFromMergeTree *>(frame.node->step.get()) != nullptr;
 
-                if (optimization_settings.read_in_order)
-                    optimizeReadInOrder(*frame.node, nodes);
-
                 /// Projection optimization relies on PK optimization
                 if (optimization_settings.optimize_projection)
                     num_applied_projection
                         += optimizeUseAggregateProjections(*frame.node, nodes, optimization_settings.optimize_use_implicit_projections);
 
+
                 if (optimization_settings.aggregation_in_order)
                     optimizeAggregationInOrder(*frame.node, nodes);
-
-                if (optimization_settings.distinct_in_order)
-                    tryDistinctReadInOrder(frame.node);
             }
 
             /// Traverse all children first.
@@ -200,11 +226,6 @@ void optimizeTreeThirdPass(QueryPlan & plan, QueryPlan::Node & root, QueryPlan::
             continue;
         }
 
-        if (auto * source_step_with_filter = dynamic_cast<SourceStepWithFilter *>(frame.node->step.get()))
-        {
-            source_step_with_filter->applyFilters();
-        }
-
         addPlansForSets(plan, *frame.node, nodes);
 
         stack.pop_back();
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
index c3e651154ae..b40fea47b3c 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseAggregateProjection.cpp
@@ -18,6 +18,7 @@
 
 #include <Common/logger_useful.h>
 #include <Storages/StorageDummy.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Planner/PlannerExpressionAnalysis.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
@@ -123,7 +124,7 @@ std::optional<AggregateFunctionMatches> matchAggregateFunctions(
         if (it == projection_aggregate_functions.end())
         {
             // LOG_TRACE(
-            //     &Poco::Logger::get("optimizeUseProjections"),
+            //     getLogger("optimizeUseProjections"),
             //     "Cannot match agg func {} by name {}",
             //     aggregate.column_name, aggregate.function->getName());
 
@@ -151,7 +152,7 @@ std::optional<AggregateFunctionMatches> matchAggregateFunctions(
             /// not match.
             if (!candidate.function->getStateType()->equals(*aggregate.function->getStateType()))
             {
-                // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Cannot match agg func {} vs {} by state {} vs {}",
+                // LOG_TRACE(getLogger("optimizeUseProjections"), "Cannot match agg func {} vs {} by state {} vs {}",
                 //     aggregate.column_name, candidate.column_name,
                 //     candidate.function->getStateType()->getName(), aggregate.function->getStateType()->getName());
                 continue;
@@ -194,7 +195,7 @@ std::optional<AggregateFunctionMatches> matchAggregateFunctions(
                 if (mt == matches.end())
                 {
                     // LOG_TRACE(
-                    //     &Poco::Logger::get("optimizeUseProjections"),
+                    //     getLogger("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);
 
@@ -205,7 +206,7 @@ std::optional<AggregateFunctionMatches> matchAggregateFunctions(
                 if (node_match.node != proj_node || node_match.monotonicity)
                 {
                     // LOG_TRACE(
-                    //     &Poco::Logger::get("optimizeUseProjections"),
+                    //     getLogger("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);
 
@@ -285,7 +286,7 @@ ActionsDAGPtr analyzeAggregateProjection(
 
     // for (const auto & [node, match] : matches)
     // {
-    //     LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Match {} {} -> {} {} (with monotonicity : {})",
+    //     LOG_TRACE(getLogger("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);
     // }
@@ -379,7 +380,7 @@ ActionsDAGPtr analyzeAggregateProjection(
             /// 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);
+                // LOG_TRACE(getLogger("optimizeUseProjections"), "Cannot find match for {}", frame.node->result_name);
                 return {};
             }
 
@@ -389,7 +390,7 @@ ActionsDAGPtr analyzeAggregateProjection(
         }
     }
 
-    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Folding actions by projection");
+    // LOG_TRACE(getLogger("optimizeUseProjections"), "Folding actions by projection");
 
     auto proj_dag = query.dag->foldActionsByProjection(new_inputs, query_key_nodes);
     appendAggregateFunctions(*proj_dag, aggregates, *matched_aggregates);
@@ -431,7 +432,7 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
 {
     const auto & keys = aggregating.getParams().keys;
     const auto & aggregates = aggregating.getParams().aggregates;
-    Block key_virtual_columns = reading.getMergeTreeData().getSampleBlockWithVirtualColumns();
+    Block key_virtual_columns = reading.getMergeTreeData().getHeaderWithVirtualsForFilter();
 
     AggregateProjectionCandidates candidates;
 
@@ -453,7 +454,7 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
     if (!can_use_minmax_projection && agg_projections.empty())
         return candidates;
 
-    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Has agg projection");
+    // LOG_TRACE(getLogger("optimizeUseProjections"), "Has agg projection");
 
     QueryDAG dag;
     if (!dag.build(*node.children.front()))
@@ -461,22 +462,25 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
 
     auto query_index = buildDAGIndex(*dag.dag);
 
-    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Query DAG: {}", dag.dag->dumpDAG());
+    // LOG_TRACE(getLogger("optimizeUseProjections"), "Query DAG: {}", dag.dag->dumpDAG());
 
     candidates.has_filter = dag.filter_node;
+    /// We can't use minmax projection if filter has non-deterministic functions.
+    if (dag.filter_node && !VirtualColumnUtils::isDeterministicInScopeOfQuery(dag.filter_node))
+        can_use_minmax_projection = false;
 
     if (can_use_minmax_projection)
     {
         const auto * projection = &*(metadata->minmax_count_projection);
-        // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Try projection {}", projection->name);
+        // LOG_TRACE(getLogger("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());
+        // LOG_TRACE(getLogger("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());
+            // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection analyzed DAG {}", proj_dag->dumpDAG());
             AggregateProjectionCandidate candidate{.info = std::move(info), .dag = std::move(proj_dag)};
 
-            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection sample block {}", sample_block.dumpStructure());
+            // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection sample block {}", sample_block.dumpStructure());
             auto block = reading.getMergeTreeData().getMinMaxCountProjectionBlock(
                 metadata,
                 candidate.dag->getRequiredColumnsNames(),
@@ -485,7 +489,7 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
                 max_added_blocks.get(),
                 context);
 
-            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection sample block 2 {}", block.dumpStructure());
+            // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection sample block 2 {}", block.dumpStructure());
 
             // minmax_count_projection cannot be used when there is no data to process, because
             // it will produce incorrect result during constant aggregation.
@@ -518,12 +522,12 @@ AggregateProjectionCandidates getAggregateProjectionCandidates(
         candidates.real.reserve(agg_projections.size());
         for (const auto * projection : agg_projections)
         {
-            // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Try projection {}", projection->name);
+            // LOG_TRACE(getLogger("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());
+            // LOG_TRACE(getLogger("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());
+                // LOG_TRACE(getLogger("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));
@@ -605,9 +609,6 @@ bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes &
         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,
@@ -618,7 +619,7 @@ bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes &
                 query_info,
                 context,
                 max_added_blocks,
-                added_filter_nodes);
+                candidate.dag);
 
             if (!analyzed)
                 continue;
@@ -650,7 +651,7 @@ bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes &
     /// Add reading from projection step.
     if (candidates.minmax_projection)
     {
-        // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Minmax proj block {}",
+        // LOG_TRACE(getLogger("optimizeUseProjections"), "Minmax proj block {}",
         //           candidates.minmax_projection->block.dumpStructure());
 
         Pipe pipe(std::make_shared<SourceFromSingleChunk>(std::move(candidates.minmax_projection->block)));
@@ -669,15 +670,16 @@ bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes &
         auto proj_snapshot = std::make_shared<StorageSnapshot>(storage_snapshot->storage, storage_snapshot->metadata);
         proj_snapshot->addProjection(best_candidate->projection);
 
-        auto query_info_copy = query_info;
-        query_info_copy.prewhere_info = nullptr;
+        auto projection_query_info = query_info;
+        projection_query_info.prewhere_info = nullptr;
+        projection_query_info.filter_actions_dag = nullptr;
 
         projection_reading = reader.readFromParts(
             /* parts = */ {},
             /* alter_conversions = */ {},
             best_candidate->dag->getRequiredColumnsNames(),
             proj_snapshot,
-            query_info_copy,
+            projection_query_info,
             context,
             reading->getMaxBlockSize(),
             reading->getNumStreams(),
@@ -712,7 +714,7 @@ bool optimizeUseAggregateProjections(QueryPlan::Node & node, QueryPlan::Nodes &
         });
     }
 
-    // LOG_TRACE(&Poco::Logger::get("optimizeUseProjections"), "Projection reading header {}",
+    // LOG_TRACE(getLogger("optimizeUseProjections"), "Projection reading header {}",
     //           projection_reading->getOutputStream().header.dumpStructure());
 
     projection_reading->setStepDescription(best_candidate->projection->name);
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
index 4e2fa5b2389..cac172a856f 100644
--- a/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
+++ b/src/Processors/QueryPlan/Optimizations/optimizeUseNormalProjection.cpp
@@ -135,7 +135,7 @@ bool optimizeUseNormalProjections(Stack & stack, QueryPlan::Nodes & nodes)
     std::list<NormalProjectionCandidate> candidates;
     NormalProjectionCandidate * best_candidate = nullptr;
 
-    const Names & required_columns = reading->getRealColumnNames();
+    const Names & required_columns = reading->getAllColumnNames();
     const auto & parts = reading->getParts();
     const auto & alter_conversions = reading->getAlterConvertionsForParts();
     const auto & query_info = reading->getQueryInfo();
@@ -163,10 +163,6 @@ bool optimizeUseNormalProjections(Stack & stack, QueryPlan::Nodes & nodes)
         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,
@@ -176,7 +172,7 @@ bool optimizeUseNormalProjections(Stack & stack, QueryPlan::Nodes & nodes)
             query_info,
             context,
             max_added_blocks,
-            added_filter_nodes);
+            query.filter_node ? query.dag : nullptr);
 
         if (!analyzed)
             continue;
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
index 1ac759df1d1..3009460a468 100644
--- a/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp
@@ -214,7 +214,7 @@ bool analyzeProjectionCandidate(
     const SelectQueryInfo & query_info,
     const ContextPtr & context,
     const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
-    const ActionDAGNodes & added_filter_nodes)
+    const ActionsDAGPtr & dag)
 {
     MergeTreeData::DataPartsVector projection_parts;
     MergeTreeData::DataPartsVector normal_parts;
@@ -223,7 +223,7 @@ bool analyzeProjectionCandidate(
     {
         const auto & created_projections = part_with_ranges.data_part->getProjectionParts();
         auto it = created_projections.find(candidate.projection->name);
-        if (it != created_projections.end())
+        if (it != created_projections.end() && !it->second->is_broken)
         {
             projection_parts.push_back(it->second);
         }
@@ -237,13 +237,15 @@ bool analyzeProjectionCandidate(
     if (projection_parts.empty())
         return false;
 
+    auto projection_query_info = query_info;
+    projection_query_info.prewhere_info = nullptr;
+    projection_query_info.filter_actions_dag = dag;
+
     auto projection_result_ptr = reader.estimateNumMarksToRead(
         std::move(projection_parts),
-        nullptr,
         required_column_names,
         candidate.projection->metadata,
-        query_info, /// How it is actually used? I hope that for index we need only added_filter_nodes
-        added_filter_nodes,
+        projection_query_info,
         context,
         context->getSettingsRef().max_threads,
         max_added_blocks);
diff --git a/src/Processors/QueryPlan/Optimizations/projectionsCommon.h b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
index cc833a86925..e1e106b988e 100644
--- a/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
+++ b/src/Processors/QueryPlan/Optimizations/projectionsCommon.h
@@ -60,6 +60,6 @@ bool analyzeProjectionCandidate(
     const SelectQueryInfo & query_info,
     const ContextPtr & context,
     const std::shared_ptr<PartitionIdToMaxBlock> & max_added_blocks,
-    const ActionDAGNodes & added_filter_nodes);
+    const ActionsDAGPtr & dag);
 
 }
diff --git a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
index a6029d673e3..232d3118612 100644
--- a/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
+++ b/src/Processors/QueryPlan/Optimizations/removeRedundantDistinct.cpp
@@ -39,14 +39,14 @@ namespace
             else
                 ss << value;
 
-            LOG_DEBUG(&Poco::Logger::get("redundantDistinct"), "{}{}{}", key, separator, ss.str());
+            LOG_DEBUG(getLogger("redundantDistinct"), "{}{}{}", key, separator, ss.str());
         }
     }
 
     void logActionsDAG(const String & prefix, const ActionsDAGPtr & actions)
     {
         if constexpr (debug_logging_enabled)
-            LOG_DEBUG(&Poco::Logger::get("redundantDistinct"), "{} :\n{}", prefix, actions->dumpDAG());
+            LOG_DEBUG(getLogger("redundantDistinct"), "{} :\n{}", prefix, actions->dumpDAG());
     }
 
     using DistinctColumns = std::set<std::string_view>;
diff --git a/src/Processors/QueryPlan/Optimizations/splitFilter.cpp b/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
index 8c212936195..561ad7302c6 100644
--- a/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
+++ b/src/Processors/QueryPlan/Optimizations/splitFilter.cpp
@@ -14,19 +14,33 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
         return 0;
 
     const auto & expr = filter_step->getExpression();
+    const std::string & filter_column_name = filter_step->getFilterColumnName();
 
     /// Do not split if there are function like runningDifference.
     if (expr->hasStatefulFunctions())
         return 0;
 
-    auto split = expr->splitActionsForFilter(filter_step->getFilterColumnName());
+    bool filter_name_clashs_with_input = false;
+    if (filter_step->removesFilterColumn())
+    {
+        for (const auto * input : expr->getInputs())
+        {
+            if (input->result_name == filter_column_name)
+            {
+                filter_name_clashs_with_input = true;
+                break;
+            }
+        }
+    }
+
+    auto split = expr->splitActionsForFilter(filter_column_name);
 
     if (split.second->trivial())
         return 0;
 
     bool remove_filter = false;
     if (filter_step->removesFilterColumn())
-        remove_filter = split.second->removeUnusedResult(filter_step->getFilterColumnName());
+        remove_filter = split.second->removeUnusedResult(filter_column_name);
 
     auto description = filter_step->getStepDescription();
 
@@ -34,10 +48,25 @@ size_t trySplitFilter(QueryPlan::Node * node, QueryPlan::Nodes & nodes)
     node->children.swap(filter_node.children);
     node->children.push_back(&filter_node);
 
+    std::string split_filter_name = filter_column_name;
+    if (filter_name_clashs_with_input)
+    {
+        split_filter_name = "__split_filter";
+
+        for (auto & filter_output : split.first->getOutputs())
+        {
+            if (filter_output->result_name == filter_column_name)
+            {
+                filter_output = &split.first->addAlias(*filter_output, split_filter_name);
+                break;
+            }
+        }
+    }
+
     filter_node.step = std::make_unique<FilterStep>(
             filter_node.children.at(0)->step->getOutputStream(),
             std::move(split.first),
-            filter_step->getFilterColumnName(),
+            std::move(split_filter_name),
             remove_filter);
 
     node->step = std::make_unique<ExpressionStep>(filter_node.step->getOutputStream(), std::move(split.second));
diff --git a/src/Processors/QueryPlan/PartsSplitter.cpp b/src/Processors/QueryPlan/PartsSplitter.cpp
index 7c66c0cc8df..64af48dd53c 100644
--- a/src/Processors/QueryPlan/PartsSplitter.cpp
+++ b/src/Processors/QueryPlan/PartsSplitter.cpp
@@ -1,4 +1,5 @@
 #include <algorithm>
+#include <limits>
 #include <memory>
 #include <numeric>
 #include <queue>
@@ -8,6 +9,10 @@
 #include <Core/Field.h>
 #include <DataTypes/DataTypeLowCardinality.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeMap.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypeVariant.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Parsers/ASTFunction.h>
@@ -30,11 +35,82 @@ std::string toString(const Values & value)
     return fmt::format("({})", fmt::join(value, ", "));
 }
 
+/** We rely that FieldVisitorAccurateLess will have strict weak ordering for any Field values including
+  * NaN, Null and containers (Array, Tuple, Map) that contain NaN or Null. But right now it does not properly
+  * support NaN and Nulls inside containers, because it uses Field operator< or accurate::lessOp for comparison
+  * that compares Nulls and NaNs differently than FieldVisitorAccurateLess.
+  * TODO: Update Field operator< to compare NaNs and Nulls the same way as FieldVisitorAccurateLess.
+  */
+bool isSafePrimaryDataKeyType(const IDataType & data_type)
+{
+    auto type_id = data_type.getTypeId();
+    switch (type_id)
+    {
+        case TypeIndex::Float32:
+        case TypeIndex::Float64:
+        case TypeIndex::Nullable:
+        case TypeIndex::Object:
+            return false;
+        case TypeIndex::Array:
+        {
+            const auto & data_type_array = static_cast<const DataTypeArray &>(data_type);
+            return isSafePrimaryDataKeyType(*data_type_array.getNestedType());
+        }
+        case TypeIndex::Tuple:
+        {
+            const auto & data_type_tuple = static_cast<const DataTypeTuple &>(data_type);
+            const auto & data_type_tuple_elements = data_type_tuple.getElements();
+            for (const auto & data_type_tuple_element : data_type_tuple_elements)
+                if (!isSafePrimaryDataKeyType(*data_type_tuple_element))
+                    return false;
+
+            return true;
+        }
+        case TypeIndex::LowCardinality:
+        {
+            const auto & data_type_low_cardinality = static_cast<const DataTypeLowCardinality &>(data_type);
+            return isSafePrimaryDataKeyType(*data_type_low_cardinality.getDictionaryType());
+        }
+        case TypeIndex::Map:
+        {
+            const auto & data_type_map = static_cast<const DataTypeMap &>(data_type);
+            return isSafePrimaryDataKeyType(*data_type_map.getKeyType()) && isSafePrimaryDataKeyType(*data_type_map.getValueType());
+        }
+        case TypeIndex::Variant:
+        {
+            const auto & data_type_variant = static_cast<const DataTypeVariant &>(data_type);
+            const auto & data_type_variant_elements = data_type_variant.getVariants();
+            for (const auto & data_type_variant_element : data_type_variant_elements)
+                if (!isSafePrimaryDataKeyType(*data_type_variant_element))
+                    return false;
+
+            return false;
+        }
+        default:
+        {
+            break;
+        }
+    }
+
+    return true;
+}
+
+bool isSafePrimaryKey(const KeyDescription & primary_key)
+{
+    for (const auto & type : primary_key.data_types)
+    {
+        if (!isSafePrimaryDataKeyType(*type))
+            return false;
+    }
+
+    return true;
+}
+
 int compareValues(const Values & lhs, const Values & rhs)
 {
-    chassert(lhs.size() == rhs.size());
+    size_t size = std::min(lhs.size(), rhs.size());
 
-    for (size_t i = 0; i < lhs.size(); ++i)
+    for (size_t i = 0; i < size; ++i)
     {
         if (applyVisitor(FieldVisitorAccurateLess(), lhs[i], rhs[i]))
             return -1;
@@ -50,13 +126,20 @@ int compareValues(const Values & lhs, const Values & rhs)
 class IndexAccess
 {
 public:
-    explicit IndexAccess(const RangesInDataParts & parts_) : parts(parts_) { }
+    explicit IndexAccess(const RangesInDataParts & parts_) : parts(parts_)
+    {
+        /// Some suffix of index columns might not be loaded (see `primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns`)
+        /// and we need to use the same set of index columns across all parts.
+        for (const auto & part : parts)
+            loaded_columns = std::min(loaded_columns, part.data_part->getIndex().size());
+    }
 
     Values getValue(size_t part_idx, size_t mark) const
     {
-        const auto & index = parts[part_idx].data_part->index;
-        Values values(index.size());
-        for (size_t i = 0; i < values.size(); ++i)
+        const auto & index = parts[part_idx].data_part->getIndex();
+        chassert(index.size() >= loaded_columns);
+        Values values(loaded_columns);
+        for (size_t i = 0; i < loaded_columns; ++i)
         {
             index[i]->get(mark, values[i]);
             if (values[i].isNull())
@@ -117,10 +200,13 @@ public:
         return findLeftmostMarkGreaterThanValueInRange(part_index, value, mark_range.begin, mark_range.end);
     }
 
-    size_t getMarkRows(size_t part_idx, size_t mark) const { return parts[part_idx].data_part->index_granularity.getMarkRows(mark); }
-
+    size_t getMarkRows(size_t part_idx, size_t mark) const
+    {
+        return parts[part_idx].data_part->index_granularity.getMarkRows(mark);
+    }
 private:
     const RangesInDataParts & parts;
+    size_t loaded_columns = std::numeric_limits<size_t>::max();
 };
 
 class RangesInDataPartsBuilder
@@ -174,23 +260,20 @@ struct PartsRangesIterator
         else if (compare_result == 1)
             return false;
 
-        if (part_index == other.part_index)
-        {
-            /// Within the same part we should process events in order of mark numbers,
-            /// because they already ordered by value and range ends have greater mark numbers than the beginnings.
-            /// Otherwise we could get invalid ranges with the right bound that is less than the left bound.
-            const auto ev_mark = event == EventType::RangeStart ? range.begin : range.end;
-            const auto other_ev_mark = other.event == EventType::RangeStart ? other.range.begin : other.range.end;
-
-            // Start event always before end event
-            if (ev_mark == other_ev_mark)
-                return event < other.event;
-
-            return ev_mark < other_ev_mark;
-        }
-
         if (event == other.event)
+        {
+            if (part_index == other.part_index)
+            {
+                /// Within the same part we should process events in order of mark numbers,
+                /// because they already ordered by value and range ends have greater mark numbers than the beginnings.
+                /// Otherwise we could get invalid ranges with the right bound that is less than the left bound.
+                const auto ev_mark = event == EventType::RangeStart ? range.begin : range.end;
+                const auto other_ev_mark = other.event == EventType::RangeStart ? other.range.begin : other.range.end;
+                return ev_mark < other_ev_mark;
+            }
+
             return part_index < other.part_index;
+        }
 
         // Start event always before end event
         return event < other.event;
@@ -216,19 +299,83 @@ struct PartsRangesIterator
         return true;
     }
 
+    void dump(WriteBuffer & buffer) const
+    {
+        buffer << "Part index " << part_index;
+        buffer << " event " << (event == PartsRangesIterator::EventType::RangeStart ? "Range Start" : "Range End");
+        buffer << " range begin " << range.begin;
+        buffer << " end " << range.end;
+        buffer << " value " << ::toString(value) << '\n';
+    }
+
+    [[maybe_unused]] String toString() const
+    {
+        WriteBufferFromOwnString buffer;
+        dump(buffer);
+        return buffer.str();
+    }
+
     Values value;
     MarkRange range;
     size_t part_index;
     EventType event;
 };
 
+struct PartRangeIndex
+{
+    explicit PartRangeIndex(PartsRangesIterator & ranges_iterator)
+        : part_index(ranges_iterator.part_index)
+        , range(ranges_iterator.range)
+    {}
+
+    bool operator==(const PartRangeIndex & other) const
+    {
+        return std::tie(part_index, range.begin, range.end) == std::tie(other.part_index, other.range.begin, other.range.end);
+    }
+
+    bool operator<(const PartRangeIndex & other) const
+    {
+        return std::tie(part_index, range.begin, range.end) < std::tie(other.part_index, other.range.begin, other.range.end);
+    }
+
+    size_t part_index;
+    MarkRange range;
+};
+
+struct PartRangeIndexHash
+{
+    size_t operator()(const PartRangeIndex & part_range_index) const noexcept
+    {
+        size_t result = 0;
+
+        boost::hash_combine(result, part_range_index.part_index);
+        boost::hash_combine(result, part_range_index.range.begin);
+        boost::hash_combine(result, part_range_index.range.end);
+
+        return result;
+    }
+};
+
 struct SplitPartsRangesResult
 {
     RangesInDataParts non_intersecting_parts_ranges;
     RangesInDataParts intersecting_parts_ranges;
 };
 
-SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
+void dump(const std::vector<PartsRangesIterator> & ranges_iterators, WriteBuffer & buffer)
+{
+    for (const auto & range_iterator : ranges_iterators)
+        range_iterator.dump(buffer);
+}
+
+String toString(const std::vector<PartsRangesIterator> & ranges_iterators)
+{
+    WriteBufferFromOwnString buffer;
+    dump(ranges_iterators, buffer);
+    return buffer.str();
+}
+
+SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts, const LoggerPtr & logger)
 {
     /** Split ranges in data parts into intersecting ranges in data parts and non intersecting ranges in data parts.
       *
@@ -307,7 +454,11 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
         }
     }
 
-    std::sort(parts_ranges.begin(), parts_ranges.end());
+    LOG_TEST(logger, "Parts ranges before sort {}", toString(parts_ranges));
+
+    ::sort(parts_ranges.begin(), parts_ranges.end());
+
+    LOG_TEST(logger, "Parts ranges after sort {}", toString(parts_ranges));
 
     RangesInDataPartsBuilder intersecting_ranges_in_data_parts_builder(ranges_in_data_parts);
     RangesInDataPartsBuilder non_intersecting_ranges_in_data_parts_builder(ranges_in_data_parts);
@@ -324,24 +475,27 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
         intersecting_ranges_in_data_parts_builder.addRange(part_index, mark_range);
     };
 
-    std::unordered_map<size_t, MarkRange> part_index_start_to_range;
+    std::unordered_map<PartRangeIndex, MarkRange, PartRangeIndexHash> part_index_start_to_range;
 
     chassert(!parts_ranges.empty());
     chassert(parts_ranges[0].event == PartsRangesIterator::EventType::RangeStart);
-    part_index_start_to_range[parts_ranges[0].part_index] = parts_ranges[0].range;
+    part_index_start_to_range[PartRangeIndex(parts_ranges[0])] = parts_ranges[0].range;
 
     size_t parts_ranges_size = parts_ranges.size();
     for (size_t i = 1; i < parts_ranges_size; ++i)
     {
         auto & previous_part_range = parts_ranges[i - 1];
+        PartRangeIndex previous_part_range_index(previous_part_range);
         auto & current_part_range = parts_ranges[i];
+        PartRangeIndex current_part_range_index(current_part_range);
         size_t intersecting_parts = part_index_start_to_range.size();
         bool range_start = current_part_range.event == PartsRangesIterator::EventType::RangeStart;
 
         if (range_start)
         {
-            auto [it, inserted] = part_index_start_to_range.emplace(current_part_range.part_index, current_part_range.range);
-            chassert(inserted);
+            auto [it, inserted] = part_index_start_to_range.emplace(current_part_range_index, current_part_range.range);
+            if (!inserted)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "PartsSplitter expected unique range");
 
             if (intersecting_parts != 1)
                 continue;
@@ -365,7 +519,7 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
 
                 if (end - begin >= min_number_of_marks_for_non_intersecting_range)
                 {
-                    part_index_start_to_range[previous_part_range.part_index].begin = end;
+                    part_index_start_to_range[previous_part_range_index].begin = end;
                     add_non_intersecting_range(previous_part_range.part_index, MarkRange{begin, end});
                 }
 
@@ -379,8 +533,10 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
                     break;
             }
 
-            chassert(other_interval_it != part_index_start_to_range.end());
-            size_t other_interval_part_index = other_interval_it->first;
+            if (!(other_interval_it != part_index_start_to_range.end() && other_interval_it != it))
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "PartsSplitter expected single other interval");
+
+            size_t other_interval_part_index = other_interval_it->first.part_index;
             MarkRange other_interval_range = other_interval_it->second;
 
             /// If part level is 0, we must process whole other intersecting part because it can contain duplicate primary keys
@@ -413,6 +569,7 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
         }
 
         chassert(current_part_range.event == PartsRangesIterator::EventType::RangeEnd);
+        chassert(part_index_start_to_range.contains(current_part_range_index));
 
         /** If there are more than 1 part ranges that we are currently processing
           * that means that this part range is intersecting with other range.
@@ -421,8 +578,8 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
           */
         if (intersecting_parts != 1 || ranges_in_data_parts[current_part_range.part_index].data_part->info.level == 0)
         {
-            add_intersecting_range(current_part_range.part_index, part_index_start_to_range[current_part_range.part_index]);
-            part_index_start_to_range.erase(current_part_range.part_index);
+            add_intersecting_range(current_part_range.part_index, part_index_start_to_range[current_part_range_index]);
+            part_index_start_to_range.erase(current_part_range_index);
             continue;
         }
 
@@ -432,13 +589,12 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
             chassert(current_part_range.range == previous_part_range.range);
 
             /// Case 3 Range End after Range Start
-            non_intersecting_ranges_in_data_parts_builder.addRange(current_part_range.part_index, current_part_range.range);
-            part_index_start_to_range.erase(current_part_range.part_index);
+            add_non_intersecting_range(current_part_range.part_index, current_part_range.range);
+            part_index_start_to_range.erase(current_part_range_index);
             continue;
         }
 
         chassert(previous_part_range.event == PartsRangesIterator::EventType::RangeEnd);
-        chassert(previous_part_range.part_index != current_part_range.part_index);
 
         /// Case 4 Range End after Range End
         std::optional<size_t> begin_optional = index_access.findLeftmostMarkGreaterThanValueInRange(current_part_range.part_index,
@@ -449,25 +605,25 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
         if (begin_optional && end - *begin_optional >= min_number_of_marks_for_non_intersecting_range)
         {
             size_t begin = *begin_optional;
-            add_intersecting_range(current_part_range.part_index, MarkRange{part_index_start_to_range[current_part_range.part_index].begin, begin});
+            add_intersecting_range(current_part_range.part_index, MarkRange{part_index_start_to_range[current_part_range_index].begin, begin});
             add_non_intersecting_range(current_part_range.part_index, MarkRange{begin, end});
         }
         else
         {
-            add_intersecting_range(current_part_range.part_index, MarkRange{part_index_start_to_range[current_part_range.part_index].begin, end});
+            add_intersecting_range(current_part_range.part_index, MarkRange{part_index_start_to_range[current_part_range_index].begin, end});
         }
 
-        part_index_start_to_range.erase(current_part_range.part_index);
+        part_index_start_to_range.erase(current_part_range_index);
     }
 
     /// Process parts ranges with undefined value at end mark
     bool is_intersecting = part_index_start_to_range.size() > 1;
-    for (const auto & [part_index, mark_range] : part_index_start_to_range)
+    for (const auto & [part_range_index, mark_range] : part_index_start_to_range)
     {
         if (is_intersecting)
-            add_intersecting_range(part_index, mark_range);
+            add_intersecting_range(part_range_index.part_index, mark_range);
         else
-            add_non_intersecting_range(part_index, mark_range);
+            add_non_intersecting_range(part_range_index.part_index, mark_range);
     }
 
     auto && non_intersecting_ranges_in_data_parts = std::move(non_intersecting_ranges_in_data_parts_builder.getCurrentRangesInDataParts());
@@ -483,40 +639,52 @@ SplitPartsRangesResult splitPartsRanges(RangesInDataParts ranges_in_data_parts)
         intersecting_ranges_in_data_parts.end(),
         [](const auto & lhs, const auto & rhs) { return lhs.part_index_in_query < rhs.part_index_in_query; });
 
+    LOG_TEST(logger, "Non intersecting ranges in data parts {}", non_intersecting_ranges_in_data_parts.getDescriptions().describe());
+    LOG_TEST(logger, "Intersecting ranges in data parts {}", intersecting_ranges_in_data_parts.getDescriptions().describe());
+
     return {std::move(non_intersecting_ranges_in_data_parts), std::move(intersecting_ranges_in_data_parts)};
 }
 
-std::pair<std::vector<RangesInDataParts>, std::vector<Values>> splitIntersectingPartsRangesIntoLayers(RangesInDataParts intersecting_ranges_in_data_parts, size_t max_layers)
+std::pair<std::vector<RangesInDataParts>, std::vector<Values>> splitIntersectingPartsRangesIntoLayers(RangesInDataParts intersecting_ranges_in_data_parts,
+    size_t max_layers,
+    const LoggerPtr & logger)
 {
-    // We will advance the iterator pointing to the mark with the smallest PK value until
-    // there will be not less than rows_per_layer rows in the current layer (roughly speaking).
-    // Then we choose the last observed value as the new border, so the current layer will consists
-    // of granules with values greater than the previous mark and less or equal than the new border.
-
+    /** We will advance the iterator pointing to the mark with the smallest PK value until
+      * there will be not less than rows_per_layer rows in the current layer (roughly speaking).
+      * Then we choose the last observed value as the new border, so the current layer will consists
+      * of granules with values greater than the previous mark and less or equal than the new border.
+      *
+      * We use PartRangeIndex to track currently processing ranges, because after sort, RangeStart event is always placed
+      * before Range End event and it is possible to encounter overlapping Range Start events for the same part.
+      */
     IndexAccess index_access(intersecting_ranges_in_data_parts);
-    std::priority_queue<PartsRangesIterator, std::vector<PartsRangesIterator>, std::greater<>> parts_ranges_queue;
+
+    using PartsRangesIteratorWithIndex = std::pair<PartsRangesIterator, PartRangeIndex>;
+    std::priority_queue<PartsRangesIteratorWithIndex, std::vector<PartsRangesIteratorWithIndex>, std::greater<>> parts_ranges_queue;
 
     for (size_t part_index = 0; part_index < intersecting_ranges_in_data_parts.size(); ++part_index)
     {
         for (const auto & range : intersecting_ranges_in_data_parts[part_index].ranges)
         {
             const auto & index_granularity = intersecting_ranges_in_data_parts[part_index].data_part->index_granularity;
-            parts_ranges_queue.push(
-                {index_access.getValue(part_index, range.begin), range, part_index, PartsRangesIterator::EventType::RangeStart});
+            PartsRangesIterator parts_range_start{index_access.getValue(part_index, range.begin), range, part_index, PartsRangesIterator::EventType::RangeStart};
+            PartRangeIndex parts_range_start_index(parts_range_start);
+            parts_ranges_queue.push({std::move(parts_range_start), std::move(parts_range_start_index)});
 
             const bool value_is_defined_at_end_mark = range.end < index_granularity.getMarksCount();
             if (!value_is_defined_at_end_mark)
                 continue;
 
-            parts_ranges_queue.push(
-                {index_access.getValue(part_index, range.end), range, part_index, PartsRangesIterator::EventType::RangeEnd});
+            PartsRangesIterator parts_range_end{index_access.getValue(part_index, range.end), range, part_index, PartsRangesIterator::EventType::RangeEnd};
+            PartRangeIndex parts_range_end_index(parts_range_end);
+            parts_ranges_queue.push({std::move(parts_range_end), std::move(parts_range_end_index)});
         }
     }
 
     /// The beginning of currently started (but not yet finished) range of marks of a part in the current layer.
-    std::unordered_map<size_t, size_t> current_part_range_begin;
+    std::unordered_map<PartRangeIndex, size_t, PartRangeIndexHash> current_part_range_begin;
     /// The current ending of a range of marks of a part in the current layer.
-    std::unordered_map<size_t, size_t> current_part_range_end;
+    std::unordered_map<PartRangeIndex, size_t, PartRangeIndexHash> current_part_range_end;
 
     /// Determine borders between layers.
     std::vector<Values> borders;
@@ -546,17 +714,19 @@ std::pair<std::vector<RangesInDataParts>, std::vector<Values>> splitIntersecting
         {
             // We're advancing iterators until a new value showed up.
             Values last_value;
-            while (!parts_ranges_queue.empty() && (last_value.empty() || last_value == parts_ranges_queue.top().value))
+            while (!parts_ranges_queue.empty() && (last_value.empty() || last_value == parts_ranges_queue.top().first.value))
             {
-                auto current = parts_ranges_queue.top();
+                auto [current, current_range_index] = parts_ranges_queue.top();
+                PartRangeIndex current_part_range_index(current);
                 parts_ranges_queue.pop();
+
                 const auto part_index = current.part_index;
 
                 if (current.event == PartsRangesIterator::EventType::RangeEnd)
                 {
-                    current_layer_builder.addRange(part_index, MarkRange{current_part_range_begin[part_index], current.range.end});
-                    current_part_range_begin.erase(part_index);
-                    current_part_range_end.erase(part_index);
+                    current_layer_builder.addRange(part_index, MarkRange{current_part_range_begin[current_range_index], current.range.end});
+                    current_part_range_begin.erase(current_range_index);
+                    current_part_range_end.erase(current_range_index);
                     continue;
                 }
 
@@ -564,14 +734,14 @@ std::pair<std::vector<RangesInDataParts>, std::vector<Values>> splitIntersecting
                 rows_in_current_layer += index_access.getMarkRows(part_index, current.range.begin);
                 ++marks_in_current_layer;
 
-                current_part_range_begin.try_emplace(part_index, current.range.begin);
-                current_part_range_end[part_index] = current.range.begin;
+                current_part_range_begin.try_emplace(current_range_index, current.range.begin);
+                current_part_range_end[current_range_index] = current.range.begin;
 
                 if (current.range.begin + 1 < current.range.end)
                 {
                     ++current.range.begin;
                     current.value = index_access.getValue(part_index, current.range.begin);
-                    parts_ranges_queue.push(std::move(current));
+                    parts_ranges_queue.push({std::move(current), current_range_index});
                 }
             }
 
@@ -582,17 +752,27 @@ std::pair<std::vector<RangesInDataParts>, std::vector<Values>> splitIntersecting
                 borders.push_back(last_value);
         }
 
-        for (const auto & [part_index, last_mark] : current_part_range_end)
+        for (const auto & [current_range_index, last_mark] : current_part_range_end)
         {
-            current_layer_builder.addRange(part_index, MarkRange{current_part_range_begin[part_index], last_mark + 1});
-            current_part_range_begin[part_index] = current_part_range_end[part_index];
+            current_layer_builder.addRange(current_range_index.part_index, MarkRange{current_part_range_begin[current_range_index], last_mark + 1});
+            current_part_range_begin[current_range_index] = current_part_range_end[current_range_index];
         }
 
         result_layers.back() = std::move(current_layer_builder.getCurrentRangesInDataParts());
     }
 
-    for (auto & layer : result_layers)
+    size_t result_layers_size = result_layers.size();
+    LOG_TEST(logger, "Split intersecting ranges into {} layers", result_layers_size);
+
+    for (size_t i = 0; i < result_layers_size; ++i)
     {
+        auto & layer = result_layers[i];
+
+        LOG_TEST(logger, "Layer {} {} filter values in ({}, {}])",
+            i,
+            layer.getDescriptions().describe(),
+            i ? ::toString(borders[i - 1]) : "-inf", i < borders.size() ? ::toString(borders[i]) : "+inf");
+
         std::stable_sort(
             layer.begin(),
             layer.end(),
@@ -620,7 +800,7 @@ ASTs buildFilters(const KeyDescription & primary_key, const std::vector<Values>
             const auto & type = primary_key.data_types.at(i);
 
             // PK may contain functions of the table columns, so we need the actual PK AST with all expressions it contains.
-            auto pk_ast = primary_key.expression_list_ast->children.at(i);
+            auto pk_ast = primary_key.expression_list_ast->children.at(i)->clone();
 
             // If PK is nullable, prepend a null mask column for > comparison.
             // Also transform the AST into assumeNotNull(pk) so that the result type is not-nullable.
@@ -643,10 +823,10 @@ ASTs buildFilters(const KeyDescription & primary_key, const std::vector<Values>
             {
                 ASTPtr component_ast = std::make_shared<ASTLiteral>(values[i]);
                 auto decayed_type = removeNullable(removeLowCardinality(primary_key.data_types.at(i)));
+
                 // Values of some types (e.g. Date, DateTime) are stored in columns as numbers and we get them as just numbers from the index.
                 // So we need an explicit Cast for them.
-                if (isColumnedAsNumber(decayed_type->getTypeId()) && !isNumber(decayed_type->getTypeId()))
-                    component_ast = makeASTFunction("cast", std::move(component_ast), std::make_shared<ASTLiteral>(decayed_type->getName()));
+                component_ast = makeASTFunction("cast", std::move(component_ast), std::make_shared<ASTLiteral>(decayed_type->getName()));
 
                 values_ast.push_back(std::move(component_ast));
             }
@@ -712,23 +892,38 @@ SplitPartsWithRangesByPrimaryKeyResult splitPartsWithRangesByPrimaryKey(
     size_t max_layers,
     ContextPtr context,
     ReadingInOrderStepGetter && in_order_reading_step_getter,
-    bool force_process_all_ranges)
+    bool split_parts_ranges_into_intersecting_and_non_intersecting_final,
+    bool split_intersecting_parts_ranges_into_layers)
 {
-    if (max_layers <= 1)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "max_layer should be greater than 1");
+    auto logger = getLogger("PartsSplitter");
 
     SplitPartsWithRangesByPrimaryKeyResult result;
 
     RangesInDataParts intersecting_parts_ranges = std::move(parts);
 
-    if (!force_process_all_ranges)
+    if (!isSafePrimaryKey(primary_key))
     {
-        SplitPartsRangesResult split_result = splitPartsRanges(intersecting_parts_ranges);
+        result.merging_pipes.emplace_back(in_order_reading_step_getter(intersecting_parts_ranges));
+        return result;
+    }
+
+    if (split_parts_ranges_into_intersecting_and_non_intersecting_final)
+    {
+        SplitPartsRangesResult split_result = splitPartsRanges(intersecting_parts_ranges, logger);
         result.non_intersecting_parts_ranges = std::move(split_result.non_intersecting_parts_ranges);
         intersecting_parts_ranges = std::move(split_result.intersecting_parts_ranges);
     }
 
-    auto && [layers, borders] = splitIntersectingPartsRangesIntoLayers(intersecting_parts_ranges, max_layers);
+    if (!split_intersecting_parts_ranges_into_layers)
+    {
+        result.merging_pipes.emplace_back(in_order_reading_step_getter(intersecting_parts_ranges));
+        return result;
+    }
+
+    if (max_layers <= 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "max_layer should be greater than 1");
+
+    auto && [layers, borders] = splitIntersectingPartsRangesIntoLayers(intersecting_parts_ranges, max_layers, logger);
     auto filters = buildFilters(primary_key, borders);
     result.merging_pipes.resize(layers.size());
 
diff --git a/src/Processors/QueryPlan/PartsSplitter.h b/src/Processors/QueryPlan/PartsSplitter.h
index f1ed1cb0b9c..9bceb344589 100644
--- a/src/Processors/QueryPlan/PartsSplitter.h
+++ b/src/Processors/QueryPlan/PartsSplitter.h
@@ -34,5 +34,6 @@ SplitPartsWithRangesByPrimaryKeyResult splitPartsWithRangesByPrimaryKey(
     size_t max_layers,
     ContextPtr context,
     ReadingInOrderStepGetter && in_order_reading_step_getter,
-    bool force_process_all_ranges);
+    bool split_parts_ranges_into_intersecting_and_non_intersecting,
+    bool split_intersecting_parts_ranges_into_layers);
 }
diff --git a/src/Processors/QueryPlan/QueryPlan.cpp b/src/Processors/QueryPlan/QueryPlan.cpp
index 2d2dc66a8c9..0fae7e8df4d 100644
--- a/src/Processors/QueryPlan/QueryPlan.cpp
+++ b/src/Processors/QueryPlan/QueryPlan.cpp
@@ -275,6 +275,14 @@ JSONBuilder::ItemPtr QueryPlan::explainPlan(const ExplainPlanOptions & options)
         }
         else
         {
+            auto child_plans = frame.node->step->getChildPlans();
+
+            if (!frame.children_array && !child_plans.empty())
+                frame.children_array = std::make_unique<JSONBuilder::JSONArray>();
+
+            for (const auto & child_plan : child_plans)
+                frame.children_array->add(child_plan->explainPlan(options));
+
             if (frame.children_array)
                 frame.node_map->add("Plans", std::move(frame.children_array));
 
@@ -360,7 +368,7 @@ std::string debugExplainStep(const IQueryPlanStep & step)
     return out.str();
 }
 
-void QueryPlan::explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & options)
+void QueryPlan::explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & options, size_t indent)
 {
     checkInitialized();
 
@@ -382,7 +390,7 @@ void QueryPlan::explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & opt
 
         if (!frame.is_description_printed)
         {
-            settings.offset = (stack.size() - 1) * settings.indent;
+            settings.offset = (indent + stack.size() - 1) * settings.indent;
             explainStep(*frame.node->step, settings, options);
             frame.is_description_printed = true;
         }
@@ -393,7 +401,14 @@ void QueryPlan::explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & opt
             ++frame.next_child;
         }
         else
+        {
+            auto child_plans = frame.node->step->getChildPlans();
+
+            for (const auto & child_plan : child_plans)
+                child_plan->explainPlan(buffer, options, indent + stack.size());
+
             stack.pop();
+        }
     }
 }
 
diff --git a/src/Processors/QueryPlan/QueryPlan.h b/src/Processors/QueryPlan/QueryPlan.h
index 62d658ddccd..bf135ba3cd6 100644
--- a/src/Processors/QueryPlan/QueryPlan.h
+++ b/src/Processors/QueryPlan/QueryPlan.h
@@ -82,7 +82,7 @@ public:
     };
 
     JSONBuilder::ItemPtr explainPlan(const ExplainPlanOptions & options);
-    void explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & options);
+    void explainPlan(WriteBuffer & buffer, const ExplainPlanOptions & options, size_t indent = 0);
     void explainPipeline(WriteBuffer & buffer, const ExplainPipelineOptions & options);
     void explainEstimate(MutableColumns & columns);
 
diff --git a/src/Processors/QueryPlan/QueryPlanVisitor.h b/src/Processors/QueryPlan/QueryPlanVisitor.h
index 0f265216649..aed1a2b2249 100644
--- a/src/Processors/QueryPlan/QueryPlanVisitor.h
+++ b/src/Processors/QueryPlan/QueryPlanVisitor.h
@@ -99,7 +99,7 @@ protected:
         {
             const IQueryPlanStep * current_step = node->step.get();
             LOG_DEBUG(
-                &Poco::Logger::get("QueryPlanVisitor"),
+                getLogger("QueryPlanVisitor"),
                 "{}: {}: {}",
                 prefix,
                 getStepId(current_step),
diff --git a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
index 188956b34fc..22ad53a39e0 100644
--- a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.cpp
@@ -95,17 +95,24 @@ private:
     InitializerFunc initializer_func;
 };
 
-ReadFromMemoryStorageStep::ReadFromMemoryStorageStep(const Names & columns_to_read_,
-                                                     StoragePtr storage_,
-                                                     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(std::move(storage_)),
-    storage_snapshot(storage_snapshot_),
-    num_streams(num_streams_),
-    delay_read_for_global_sub_queries(delay_read_for_global_sub_queries_)
+ReadFromMemoryStorageStep::ReadFromMemoryStorageStep(
+    const Names & columns_to_read_,
+    const SelectQueryInfo & query_info_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
+    StoragePtr storage_,
+    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_,
+        query_info_,
+        storage_snapshot_,
+        context_)
+    , columns_to_read(columns_to_read_)
+    , storage(std::move(storage_))
+    , num_streams(num_streams_)
+    , delay_read_for_global_sub_queries(delay_read_for_global_sub_queries_)
 {
 }
 
diff --git a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h
index 1122bfbb2a5..238c1a3aad0 100644
--- a/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h
+++ b/src/Processors/QueryPlan/ReadFromMemoryStorageStep.h
@@ -15,11 +15,14 @@ class QueryPipelineBuilder;
 class ReadFromMemoryStorageStep final : public SourceStepWithFilter
 {
 public:
-    ReadFromMemoryStorageStep(const Names & columns_to_read_,
-                              StoragePtr storage_,
-                              const StorageSnapshotPtr & storage_snapshot_,
-                              size_t num_streams_,
-                              bool delay_read_for_global_sub_queries_);
+    ReadFromMemoryStorageStep(
+        const Names & columns_to_read_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        StoragePtr storage_,
+        size_t num_streams_,
+        bool delay_read_for_global_sub_queries_);
 
     ReadFromMemoryStorageStep() = delete;
     ReadFromMemoryStorageStep(const ReadFromMemoryStorageStep &) = delete;
@@ -37,7 +40,6 @@ private:
 
     Names columns_to_read;
     StoragePtr storage;
-    StorageSnapshotPtr storage_snapshot;
     size_t num_streams;
     bool delay_read_for_global_sub_queries;
 
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.cpp b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
index 74f48c45be2..bee42c3ddde 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.cpp
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.cpp
@@ -21,6 +21,7 @@
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/Transforms/ReverseTransform.h>
+#include <Processors/Transforms/SelectByIndicesTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
 #include <Storages/MergeTree/MergeTreeIndexAnnoy.h>
@@ -39,17 +40,14 @@
 #include <Common/JSONBuilder.h>
 #include <Common/isLocalAddress.h>
 #include <Common/logger_useful.h>
+#include <Processors/QueryPlan/IQueryPlanStep.h>
 #include <Parsers/parseIdentifierOrStringLiteral.h>
 #include <Parsers/ExpressionListParsers.h>
+#include <Storages/MergeTree/MergeTreeIndexMinMax.h>
 
 #include <algorithm>
-#include <functional>
 #include <iterator>
-#include <limits>
 #include <memory>
-#include <numeric>
-#include <queue>
-#include <stdexcept>
 #include <unordered_map>
 
 using namespace DB;
@@ -87,6 +85,34 @@ size_t countPartitions(const MergeTreeData::DataPartsVector & prepared_parts)
     return countPartitions(prepared_parts, get_partition_id);
 }
 
+bool restoreDAGInputs(ActionsDAG & dag, const NameSet & inputs)
+{
+    std::unordered_set<const ActionsDAG::Node *> outputs(dag.getOutputs().begin(), dag.getOutputs().end());
+    bool added = false;
+    for (const auto * input : dag.getInputs())
+    {
+        if (inputs.contains(input->result_name) && !outputs.contains(input))
+        {
+            dag.getOutputs().push_back(input);
+            added = true;
+        }
+    }
+
+    return added;
+}
+
+bool restorePrewhereInputs(PrewhereInfo & info, const NameSet & inputs)
+{
+    bool added = false;
+    if (info.row_level_filter)
+        added = added || restoreDAGInputs(*info.row_level_filter, inputs);
+
+    if (info.prewhere_actions)
+        added = added || restoreDAGInputs(*info.prewhere_actions, inputs);
+
+    return added;
+}
+
 }
 
 namespace ProfileEvents
@@ -105,6 +131,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int TOO_MANY_ROWS;
     extern const int CANNOT_PARSE_TEXT;
+    extern const int PARAMETER_OUT_OF_BOUND;
 }
 
 static MergeTreeReaderSettings getMergeTreeReaderSettings(
@@ -136,7 +163,7 @@ static bool checkAllPartsOnRemoteFS(const RangesInDataParts & parts)
 
 /// build sort description for output stream
 static void updateSortDescriptionForOutputStream(
-    DataStream & output_stream, const Names & sorting_key_columns, const int sort_direction, InputOrderInfoPtr input_order_info, PrewhereInfoPtr prewhere_info)
+    DataStream & output_stream, const Names & sorting_key_columns, const int sort_direction, InputOrderInfoPtr input_order_info, PrewhereInfoPtr prewhere_info, bool enable_vertical_final)
 {
     /// Updating sort description can be done after PREWHERE actions are applied to the header.
     /// Aftert PREWHERE actions are applied, column names in header can differ from storage column names due to aliases
@@ -183,7 +210,7 @@ static void updateSortDescriptionForOutputStream(
 
     if (!sort_description.empty())
     {
-        if (input_order_info)
+        if (input_order_info && !enable_vertical_final)
         {
             output_stream.sort_scope = DataStream::SortScope::Stream;
             const size_t used_prefix_of_sorting_key_size = input_order_info->used_prefix_of_sorting_key_size;
@@ -235,55 +262,37 @@ void ReadFromMergeTree::AnalysisResult::checkLimits(const Settings & settings, c
 ReadFromMergeTree::ReadFromMergeTree(
     MergeTreeData::DataPartsVector parts_,
     std::vector<AlterConversionsPtr> alter_conversions_,
-    Names real_column_names_,
-    Names virt_column_names_,
+    Names all_column_names_,
     const MergeTreeData & data_,
     const SelectQueryInfo & query_info_,
-    StorageSnapshotPtr storage_snapshot_,
-    ContextPtr context_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
     size_t max_block_size_,
     size_t num_streams_,
-    bool sample_factor_column_queried_,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     AnalysisResultPtr analyzed_result_ptr_,
     bool enable_parallel_reading)
     : SourceStepWithFilter(DataStream{.header = MergeTreeSelectProcessor::transformHeader(
-        storage_snapshot_->getSampleBlockForColumns(real_column_names_),
-        query_info_.prewhere_info,
-        data_.getPartitionValueType(),
-        virt_column_names_)})
+        storage_snapshot_->getSampleBlockForColumns(all_column_names_),
+        query_info_.prewhere_info)}, all_column_names_, query_info_, storage_snapshot_, context_)
     , 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_))
+    , all_column_names(std::move(all_column_names_))
     , data(data_)
-    , query_info(query_info_)
-    , prewhere_info(query_info_.prewhere_info)
     , actions_settings(ExpressionActionsSettings::fromContext(context_))
-    , storage_snapshot(std::move(storage_snapshot_))
     , metadata_for_reading(storage_snapshot->getMetadataForQuery())
-    , context(std::move(context_))
     , block_size{
         .max_block_size_rows = max_block_size_,
         .preferred_block_size_bytes = context->getSettingsRef().preferred_block_size_bytes,
         .preferred_max_column_in_block_size_bytes = context->getSettingsRef().preferred_max_column_in_block_size_bytes}
     , requested_num_streams(num_streams_)
-    , sample_factor_column_queried(sample_factor_column_queried_)
     , max_block_numbers_to_read(std::move(max_block_numbers_to_read_))
-    , log(log_)
+    , log(std::move(log_))
     , analyzed_result_ptr(analyzed_result_ptr_)
     , is_parallel_reading_from_replicas(enable_parallel_reading)
 {
-    if (sample_factor_column_queried)
-    {
-        /// Only _sample_factor virtual column is added by ReadFromMergeTree
-        /// Other virtual columns are added by MergeTreeSelectProcessor.
-        auto type = std::make_shared<DataTypeFloat64>();
-        output_stream->header.insert({type->createColumn(), type, "_sample_factor"});
-    }
-
     if (is_parallel_reading_from_replicas)
     {
         all_ranges_callback = context->getMergeTreeAllRangesCallback();
@@ -310,13 +319,15 @@ ReadFromMergeTree::ReadFromMergeTree(
 
     /// Add explicit description.
     setStepDescription(data.getStorageID().getFullNameNotQuoted());
+    enable_vertical_final = query_info.isFinal() && context->getSettingsRef().enable_vertical_final && data.merging_params.mode == MergeTreeData::MergingParams::Replacing;
 
     updateSortDescriptionForOutputStream(
         *output_stream,
         storage_snapshot->getMetadataForQuery()->getSortingKeyColumns(),
         getSortDirection(),
         query_info.input_order_info,
-        prewhere_info);
+        prewhere_info,
+        enable_vertical_final);
 }
 
 
@@ -338,17 +349,24 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
 
     /// 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.
-    pool_settings.min_marks_for_concurrent_read = static_cast<size_t>(pool_settings.min_marks_for_concurrent_read * context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier);
+    const auto multiplier = context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier;
+    if (auto result = pool_settings.min_marks_for_concurrent_read * multiplier; canConvertTo<size_t>(result))
+        pool_settings.min_marks_for_concurrent_read = static_cast<size_t>(result);
+    else
+        throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND,
+            "Exceeded limit for the number of marks per a single task for parallel replicas. "
+            "Make sure that `parallel_replicas_single_task_marks_count_multiplier` is in some reasonable boundaries, current value is: {}",
+            multiplier);
 
     auto pool = std::make_shared<MergeTreeReadPoolParallelReplicas>(
         std::move(extension),
         std::move(parts_with_range),
+        shared_virtual_fields,
         storage_snapshot,
         prewhere_info,
         actions_settings,
         reader_settings,
         required_columns,
-        virt_column_names,
         pool_settings,
         context);
 
@@ -362,8 +380,8 @@ Pipe ReadFromMergeTree::readFromPoolParallelReplicas(
         auto algorithm = std::make_unique<MergeTreeThreadSelectAlgorithm>(i);
 
         auto processor = std::make_unique<MergeTreeSelectProcessor>(
-            pool, std::move(algorithm), data, prewhere_info,
-            actions_settings, block_size_copy, reader_settings, virt_column_names);
+            pool, std::move(algorithm), storage_snapshot, prewhere_info,
+            actions_settings, block_size_copy, reader_settings);
 
         auto source = std::make_shared<MergeTreeSource>(std::move(processor));
         pipes.emplace_back(std::move(source));
@@ -424,12 +442,12 @@ Pipe ReadFromMergeTree::readFromPool(
     {
         pool = std::make_shared<MergeTreePrefetchedReadPool>(
             std::move(parts_with_range),
+            shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
             actions_settings,
             reader_settings,
             required_columns,
-            virt_column_names,
             pool_settings,
             context);
     }
@@ -437,12 +455,12 @@ Pipe ReadFromMergeTree::readFromPool(
     {
         pool = std::make_shared<MergeTreeReadPool>(
             std::move(parts_with_range),
+            shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
             actions_settings,
             reader_settings,
             required_columns,
-            virt_column_names,
             pool_settings,
             context);
     }
@@ -461,8 +479,8 @@ Pipe ReadFromMergeTree::readFromPool(
         auto algorithm = std::make_unique<MergeTreeThreadSelectAlgorithm>(i);
 
         auto processor = std::make_unique<MergeTreeSelectProcessor>(
-            pool, std::move(algorithm), data, prewhere_info,
-            actions_settings, block_size_copy, reader_settings, virt_column_names);
+            pool, std::move(algorithm), storage_snapshot, prewhere_info,
+            actions_settings, block_size_copy, reader_settings);
 
         auto source = std::make_shared<MergeTreeSource>(std::move(processor));
 
@@ -502,8 +520,14 @@ Pipe ReadFromMergeTree::readInOrder(
             .columns_to_read = required_columns,
         };
 
-        pool_settings.min_marks_for_concurrent_read = static_cast<size_t>(
-            pool_settings.min_marks_for_concurrent_read * context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier);
+        const auto multiplier = context->getSettingsRef().parallel_replicas_single_task_marks_count_multiplier;
+        if (auto result = pool_settings.min_marks_for_concurrent_read * multiplier; canConvertTo<size_t>(result))
+            pool_settings.min_marks_for_concurrent_read = static_cast<size_t>(result);
+        else
+            throw Exception(ErrorCodes::PARAMETER_OUT_OF_BOUND,
+                "Exceeded limit for the number of marks per a single task for parallel replicas. "
+                "Make sure that `parallel_replicas_single_task_marks_count_multiplier` is in some reasonable boundaries, current value is: {}",
+                multiplier);
 
         CoordinationMode mode = read_type == ReadType::InOrder
             ? CoordinationMode::WithOrder
@@ -513,12 +537,12 @@ Pipe ReadFromMergeTree::readInOrder(
             std::move(extension),
             mode,
             parts_with_ranges,
+            shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
             actions_settings,
             reader_settings,
             required_columns,
-            virt_column_names,
             pool_settings,
             context);
     }
@@ -528,12 +552,12 @@ Pipe ReadFromMergeTree::readInOrder(
             has_limit_below_one_block,
             read_type,
             parts_with_ranges,
+            shared_virtual_fields,
             storage_snapshot,
             prewhere_info,
             actions_settings,
             reader_settings,
             required_columns,
-            virt_column_names,
             pool_settings,
             context);
     }
@@ -567,8 +591,8 @@ Pipe ReadFromMergeTree::readInOrder(
             algorithm = std::make_unique<MergeTreeInOrderSelectAlgorithm>(i);
 
         auto processor = std::make_unique<MergeTreeSelectProcessor>(
-            pool, std::move(algorithm), data, prewhere_info,
-            actions_settings, block_size, reader_settings, virt_column_names);
+            pool, std::move(algorithm), storage_snapshot, prewhere_info,
+            actions_settings, block_size, reader_settings);
 
         processor->addPartLevelToChunk(isQueryWithFinal());
 
@@ -742,6 +766,82 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreams(RangesInDataParts && parts_
 
     auto read_type = is_parallel_reading_from_replicas ? ReadType::ParallelReplicas : ReadType::Default;
 
+    double read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = settings.merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability;
+    std::bernoulli_distribution fault(read_split_ranges_into_intersecting_and_non_intersecting_injection_probability);
+
+    if (read_type != ReadType::ParallelReplicas &&
+        num_streams > 1 &&
+        read_split_ranges_into_intersecting_and_non_intersecting_injection_probability > 0.0 &&
+        fault(thread_local_rng) &&
+        !isQueryWithFinal() &&
+        data.merging_params.is_deleted_column.empty() &&
+        !prewhere_info)
+    {
+        NameSet column_names_set(column_names.begin(), column_names.end());
+        Names in_order_column_names_to_read(column_names);
+
+        /// Add columns needed to calculate the sorting expression
+        for (const auto & column_name : metadata_for_reading->getColumnsRequiredForSortingKey())
+        {
+            if (column_names_set.contains(column_name))
+                continue;
+
+            in_order_column_names_to_read.push_back(column_name);
+            column_names_set.insert(column_name);
+        }
+
+        auto in_order_reading_step_getter = [this, &in_order_column_names_to_read, &info](auto parts)
+        {
+            return this->read(
+                std::move(parts),
+                in_order_column_names_to_read,
+                ReadType::InOrder,
+                1 /* num_streams */,
+                0 /* min_marks_for_concurrent_read */,
+                info.use_uncompressed_cache);
+        };
+
+        auto sorting_expr = std::make_shared<ExpressionActions>(metadata_for_reading->getSortingKey().expression->getActionsDAG().clone());
+
+        SplitPartsWithRangesByPrimaryKeyResult split_ranges_result = splitPartsWithRangesByPrimaryKey(
+            metadata_for_reading->getPrimaryKey(),
+            std::move(sorting_expr),
+            std::move(parts_with_ranges),
+            num_streams,
+            context,
+            std::move(in_order_reading_step_getter),
+            true /*split_parts_ranges_into_intersecting_and_non_intersecting_final*/,
+            true /*split_intersecting_parts_ranges_into_layers*/);
+
+        auto merging_pipes = std::move(split_ranges_result.merging_pipes);
+        auto non_intersecting_parts_ranges_read_pipe = read(std::move(split_ranges_result.non_intersecting_parts_ranges),
+            column_names,
+            read_type,
+            num_streams,
+            info.min_marks_for_concurrent_read,
+            info.use_uncompressed_cache);
+
+        if (merging_pipes.empty())
+            return non_intersecting_parts_ranges_read_pipe;
+
+        Pipes pipes;
+        pipes.resize(2);
+        pipes[0] = Pipe::unitePipes(std::move(merging_pipes));
+        pipes[1] = std::move(non_intersecting_parts_ranges_read_pipe);
+
+        auto conversion_action = ActionsDAG::makeConvertingActions(
+            pipes[0].getHeader().getColumnsWithTypeAndName(),
+            pipes[1].getHeader().getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name);
+        pipes[0].addSimpleTransform(
+            [conversion_action](const Block & header)
+            {
+                auto converting_expr = std::make_shared<ExpressionActions>(conversion_action);
+                return std::make_shared<ExpressionTransform>(header, converting_expr);
+            });
+        return Pipe::unitePipes(std::move(pipes));
+    }
+
     return read(std::move(parts_with_ranges),
         column_names,
         read_type,
@@ -782,18 +882,13 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
     /// To fix this, we prohibit removing any input in prewhere actions. Instead, projection actions will be added after sorting.
     /// See 02354_read_in_order_prewhere.sql as an example.
     bool have_input_columns_removed_after_prewhere = false;
-    if (prewhere_info && prewhere_info->prewhere_actions)
+    if (prewhere_info)
     {
-        auto & outputs = prewhere_info->prewhere_actions->getOutputs();
-        std::unordered_set<const ActionsDAG::Node *> outputs_set(outputs.begin(), outputs.end());
-        for (const auto * input : prewhere_info->prewhere_actions->getInputs())
-        {
-            if (!outputs_set.contains(input))
-            {
-                outputs.push_back(input);
-                have_input_columns_removed_after_prewhere = true;
-            }
-        }
+        NameSet sorting_columns;
+        for (const auto & column : metadata_for_reading->getSortingKey().expression->getRequiredColumnsWithTypes())
+            sorting_columns.insert(column.name);
+
+        have_input_columns_removed_after_prewhere = restorePrewhereInputs(*prewhere_info, sorting_columns);
     }
 
     /// Let's split ranges to avoid reading much data.
@@ -980,7 +1075,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsWithOrder(
             /// Thus we need to merge all partition parts into a single sorted stream.
             Pipe pipe = Pipe::unitePipes(std::move(pipes));
             merge_streams(pipe);
-            out_projection = createProjection(pipe_header);
             return pipe;
         }
 
@@ -1000,7 +1094,9 @@ static void addMergingFinal(
     const SortDescription & sort_description,
     MergeTreeData::MergingParams merging_params,
     Names partition_key_columns,
-    size_t max_block_size_rows)
+    size_t max_block_size_rows,
+    bool enable_vertical_final,
+    bool can_merge_final_indices_to_next_step_filter)
 {
     const auto & header = pipe.getHeader();
     size_t num_outputs = pipe.numOutputPorts();
@@ -1029,7 +1125,7 @@ static void addMergingFinal(
 
             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_rows, /*max_block_size_bytes=*/0, /*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_rows, /*max_block_size_bytes=*/0, /*out_row_sources_buf_*/ nullptr, /*use_average_block_sizes*/ false, /*cleanup*/ !merging_params.is_deleted_column.empty(), enable_vertical_final);
 
             case MergeTreeData::MergingParams::VersionedCollapsing:
                 return std::make_shared<VersionedCollapsingTransform>(header, num_outputs,
@@ -1044,6 +1140,9 @@ static void addMergingFinal(
     };
 
     pipe.addTransform(get_merging_processor());
+    if (enable_vertical_final && !can_merge_final_indices_to_next_step_filter)
+        pipe.addSimpleTransform([](const Block & header_)
+                                { return std::make_shared<SelectByIndicesTransform>(header_); });
 }
 
 bool ReadFromMergeTree::doNotMergePartsAcrossPartitionsFinal() const
@@ -1084,7 +1183,6 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 {
     const auto & settings = context->getSettingsRef();
     const auto & data_settings = data.getSettings();
-
     PartRangesReadInfo info(parts_with_ranges, settings, *data_settings);
 
     assert(num_streams == requested_num_streams);
@@ -1125,6 +1223,14 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 
     auto sorting_expr = std::make_shared<ExpressionActions>(metadata_for_reading->getSortingKey().expression->getActionsDAG().clone());
 
+    if (prewhere_info)
+    {
+        NameSet sorting_columns;
+        for (const auto & column : metadata_for_reading->getSortingKey().expression->getRequiredColumnsWithTypes())
+            sorting_columns.insert(column.name);
+        restorePrewhereInputs(*prewhere_info, sorting_columns);
+    }
+
     for (size_t range_index = 0; range_index < parts_to_merge_ranges.size() - 1; ++range_index)
     {
         /// If do_not_merge_across_partitions_select_final is true and there is only one part in partition
@@ -1167,7 +1273,8 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
 
                 /// Parts of non-zero level still may contain duplicate PK values to merge on FINAL if there's is_deleted column,
                 /// so we have to process all ranges. It would be more optimal to remove this flag and add an extra filtering step.
-                bool force_process_all_ranges = !data.merging_params.is_deleted_column.empty();
+                bool split_parts_ranges_into_intersecting_and_non_intersecting_final = settings.split_parts_ranges_into_intersecting_and_non_intersecting_final &&
+                    data.merging_params.is_deleted_column.empty();
 
                 SplitPartsWithRangesByPrimaryKeyResult split_ranges_result = splitPartsWithRangesByPrimaryKey(
                     metadata_for_reading->getPrimaryKey(),
@@ -1176,7 +1283,8 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                     num_streams,
                     context,
                     std::move(in_order_reading_step_getter),
-                    force_process_all_ranges);
+                    split_parts_ranges_into_intersecting_and_non_intersecting_final,
+                    settings.split_intersecting_parts_ranges_into_layers_final);
 
                 for (auto && non_intersecting_parts_range : split_ranges_result.non_intersecting_parts_ranges)
                     non_intersecting_parts_by_primary_key.push_back(std::move(non_intersecting_parts_range));
@@ -1220,7 +1328,9 @@ Pipe ReadFromMergeTree::spreadMarkRangesAmongStreamsFinal(
                 sort_description,
                 data.merging_params,
                 partition_key_columns,
-                block_size.max_block_size_rows);
+                block_size.max_block_size_rows,
+                enable_vertical_final,
+                query_info.has_filters_and_no_array_join_before_filter);
 
         merging_pipes.emplace_back(Pipe::unitePipes(std::move(pipes)));
     }
@@ -1261,61 +1371,17 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     return selectRangesToRead(
         std::move(parts),
         std::move(alter_conversions),
-        prewhere_info,
-        filter_nodes,
         metadata_for_reading,
         query_info,
         context,
         requested_num_streams,
         max_block_numbers_to_read,
         data,
-        real_column_names,
-        sample_factor_column_queried,
+        all_column_names,
         log,
         indexes);
 }
 
-static ActionsDAGPtr buildFilterDAG(
-    const ContextPtr & context,
-    const PrewhereInfoPtr & prewhere_info,
-    const ActionDAGNodes & added_filter_nodes,
-    const SelectQueryInfo & query_info)
-{
-    const auto & settings = context->getSettingsRef();
-    ActionsDAG::NodeRawConstPtrs nodes;
-
-    if (prewhere_info)
-    {
-        {
-            const auto & node = prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name);
-            nodes.push_back(&node);
-        }
-
-        if (prewhere_info->row_level_filter)
-        {
-            const auto & node = prewhere_info->row_level_filter->findInOutputs(prewhere_info->row_level_column_name);
-            nodes.push_back(&node);
-        }
-    }
-
-    for (const auto & node : added_filter_nodes.nodes)
-        nodes.push_back(node);
-
-    std::unordered_map<std::string, ColumnWithTypeAndName> node_name_to_input_node_column;
-
-    if (settings.allow_experimental_analyzer && query_info.planner_context)
-    {
-        const auto & table_expression_data = query_info.planner_context->getTableExpressionDataOrThrow(query_info.table_expression);
-        for (const auto & [column_identifier, column_name] : table_expression_data.getColumnIdentifierToColumnName())
-        {
-            const auto & column = table_expression_data.getColumnOrThrow(column_name);
-            node_name_to_input_node_column.emplace(column_identifier, ColumnWithTypeAndName(column.type, column_name));
-        }
-    }
-
-    return ActionsDAG::buildFilterActionsDAG(nodes, node_name_to_input_node_column, context);
-}
-
 static void buildIndexes(
     std::optional<ReadFromMergeTree::Indexes> & indexes,
     ActionsDAGPtr filter_actions_dag,
@@ -1342,14 +1408,13 @@ static void buildIndexes(
     if (metadata_snapshot->hasPartitionKey())
     {
         const auto & partition_key = metadata_snapshot->getPartitionKey();
-        auto minmax_columns_names = data.getMinMaxColumnsNames(partition_key);
-        auto minmax_expression_actions = data.getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context));
+        auto minmax_columns_names = MergeTreeData::getMinMaxColumnsNames(partition_key);
+        auto minmax_expression_actions = MergeTreeData::getMinMaxExpr(partition_key, ExpressionActionsSettings::fromContext(context));
 
         indexes->minmax_idx_condition.emplace(filter_actions_dag, context, minmax_columns_names, minmax_expression_actions);
         indexes->partition_pruner.emplace(metadata_snapshot, filter_actions_dag, context, false /* strict */);
     }
 
-    /// TODO Support row_policy_filter and additional_filters
     indexes->part_values = MergeTreeDataSelectExecutor::filterPartsByVirtualColumns(data, parts, filter_actions_dag, context);
     MergeTreeDataSelectExecutor::buildKeyConditionFromPartOffset(indexes->part_offset_condition, filter_actions_dag, context);
 
@@ -1362,26 +1427,13 @@ static void buildIndexes(
     if (!indexes->use_skip_indexes)
         return;
 
-    std::optional<SelectQueryInfo> info_copy;
-    auto get_query_info = [&]() -> const SelectQueryInfo &
-    {
-        if (settings.allow_experimental_analyzer)
-        {
-            info_copy.emplace(query_info);
-            info_copy->filter_actions_dag = filter_actions_dag;
-            return *info_copy;
-        }
-
-        return query_info;
-    };
-
     std::unordered_set<std::string> ignored_index_names;
 
     if (settings.ignore_data_skipping_indices.changed)
     {
         const auto & indices = settings.ignore_data_skipping_indices.toString();
         Tokens tokens(indices.data(), indices.data() + indices.size(), settings.max_query_size);
-        IParser::Pos pos(tokens, static_cast<unsigned>(settings.max_parser_depth));
+        IParser::Pos pos(tokens, static_cast<unsigned>(settings.max_parser_depth), static_cast<unsigned>(settings.max_parser_backtracks));
         Expected expected;
 
         /// Use an unordered list rather than string vector
@@ -1414,7 +1466,7 @@ static void buildIndexes(
                 if (inserted)
                 {
                     skip_indexes.merged_indices.emplace_back();
-                    skip_indexes.merged_indices.back().condition = index_helper->createIndexMergedCondition(get_query_info(), metadata_snapshot);
+                    skip_indexes.merged_indices.back().condition = index_helper->createIndexMergedCondition(query_info, metadata_snapshot);
                 }
 
                 skip_indexes.merged_indices[it->second].addIndex(index_helper);
@@ -1426,11 +1478,11 @@ static void buildIndexes(
                 {
 #ifdef ENABLE_ANNOY
                     if (const auto * annoy = typeid_cast<const MergeTreeIndexAnnoy *>(index_helper.get()))
-                        condition = annoy->createIndexCondition(get_query_info(), context);
+                        condition = annoy->createIndexCondition(query_info, context);
 #endif
 #ifdef ENABLE_USEARCH
                     if (const auto * usearch = typeid_cast<const MergeTreeIndexUSearch *>(index_helper.get()))
-                        condition = usearch->createIndexCondition(get_query_info(), context);
+                        condition = usearch->createIndexCondition(query_info, context);
 #endif
                     if (!condition)
                         throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown vector search index {}", index_helper->index.name);
@@ -1444,45 +1496,87 @@ static void buildIndexes(
         }
     }
 
+    // move minmax indices to first positions, so they will be applied first as cheapest ones
+    std::stable_sort(begin(skip_indexes.useful_indices), end(skip_indexes.useful_indices), [](const auto & l, const auto & r)
+    {
+        const bool l_min_max = (typeid_cast<const MergeTreeIndexMinMax *>(l.index.get()));
+        const bool r_min_max = (typeid_cast<const MergeTreeIndexMinMax *>(r.index.get()));
+        if (l_min_max == r_min_max)
+            return false;
+
+        if (l_min_max)
+            return true; // left is min max but right is not
+
+        return false; // right is min max but left is not
+    });
+
     indexes->skip_indexes = std::move(skip_indexes);
 }
 
-void ReadFromMergeTree::applyFilters()
+void ReadFromMergeTree::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = buildFilterDAG(context, prewhere_info, filter_nodes, query_info);
-    buildIndexes(indexes, filter_actions_dag, data, prepared_parts, context, query_info, metadata_for_reading);
+    if (!indexes)
+    {
+        /// Analyzer generates unique ColumnIdentifiers like __table1.__partition_id in filter nodes,
+        /// while key analysis still requires unqualified column names.
+        std::unordered_map<std::string, ColumnWithTypeAndName> node_name_to_input_node_column;
+        if (query_info.planner_context)
+        {
+            const auto & table_expression_data = query_info.planner_context->getTableExpressionDataOrThrow(query_info.table_expression);
+            const auto & alias_column_expressions = table_expression_data.getAliasColumnExpressions();
+            for (const auto & [column_identifier, column_name] : table_expression_data.getColumnIdentifierToColumnName())
+            {
+                /// ALIAS columns cannot be used in the filter expression without being calculated in ActionsDAG,
+                /// so they should not be added to the input nodes.
+                if (alias_column_expressions.contains(column_name))
+                    continue;
+                const auto & column = table_expression_data.getColumnOrThrow(column_name);
+                node_name_to_input_node_column.emplace(column_identifier, ColumnWithTypeAndName(column.type, column_name));
+            }
+        }
+
+        filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes, node_name_to_input_node_column);
+
+        /// NOTE: Currently we store two DAGs for analysis:
+        /// (1) SourceStepWithFilter::filter_nodes, (2) query_info.filter_actions_dag. Make sure there are consistent.
+        /// TODO: Get rid of filter_actions_dag in query_info after we move analysis of
+        /// parallel replicas and unused shards into optimization, similar to projection analysis.
+        query_info.filter_actions_dag = filter_actions_dag;
+
+        buildIndexes(
+            indexes,
+            filter_actions_dag,
+            data,
+            prepared_parts,
+            context,
+            query_info,
+            metadata_for_reading);
+    }
 }
 
 ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToRead(
     MergeTreeData::DataPartsVector parts,
     std::vector<AlterConversionsPtr> alter_conversions,
-    const PrewhereInfoPtr & prewhere_info,
-    const ActionDAGNodes & added_filter_nodes,
     const StorageMetadataPtr & metadata_snapshot,
-    const SelectQueryInfo & query_info,
-    ContextPtr context,
+    const SelectQueryInfo & query_info_,
+    ContextPtr context_,
     size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
     const MergeTreeData & data,
-    const Names & real_column_names,
-    bool sample_factor_column_queried,
-    Poco::Logger * log,
+    const Names & all_column_names,
+    LoggerPtr log,
     std::optional<Indexes> & indexes)
 {
-    auto updated_query_info_with_filter_dag = query_info;
-    updated_query_info_with_filter_dag.filter_actions_dag = buildFilterDAG(context, prewhere_info, added_filter_nodes, query_info);
-
     return selectRangesToReadImpl(
         std::move(parts),
         std::move(alter_conversions),
         metadata_snapshot,
-        updated_query_info_with_filter_dag,
-        context,
+        query_info_,
+        context_,
         num_streams,
         max_block_numbers_to_read,
         data,
-        real_column_names,
-        sample_factor_column_queried,
+        all_column_names,
         log,
         indexes);
 }
@@ -1491,22 +1585,21 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
     MergeTreeData::DataPartsVector parts,
     std::vector<AlterConversionsPtr> alter_conversions,
     const StorageMetadataPtr & metadata_snapshot,
-    const SelectQueryInfo & query_info,
-    ContextPtr context,
+    const SelectQueryInfo & query_info_,
+    ContextPtr context_,
     size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
     const MergeTreeData & data,
-    const Names & real_column_names,
-    bool sample_factor_column_queried,
-    Poco::Logger * log,
+    const Names & all_column_names,
+    LoggerPtr log,
     std::optional<Indexes> & indexes)
 {
     AnalysisResult result;
-    const auto & settings = context->getSettingsRef();
+    const auto & settings = context_->getSettingsRef();
 
     size_t total_parts = parts.size();
 
-    result.column_names_to_read = real_column_names;
+    result.column_names_to_read = all_column_names;
 
     /// If there are only virtual columns in the query, you must request at least one non-virtual one.
     if (result.column_names_to_read.empty())
@@ -1520,7 +1613,7 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
     const Names & primary_key_column_names = primary_key.column_names;
 
     if (!indexes)
-        buildIndexes(indexes, query_info.filter_actions_dag, data, parts, context, query_info, metadata_snapshot);
+        buildIndexes(indexes, query_info_.filter_actions_dag, data, parts, context_, query_info_, metadata_snapshot);
 
     if (indexes->part_values && indexes->part_values->empty())
         return std::make_shared<AnalysisResult>(std::move(result));
@@ -1552,20 +1645,19 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
             indexes->part_values,
             metadata_snapshot,
             data,
-            context,
+            context_,
             max_block_numbers_to_read.get(),
             log,
             result.index_stats);
 
         result.sampling = MergeTreeDataSelectExecutor::getSampling(
-            query_info,
+            query_info_,
             metadata_snapshot->getColumns().getAllPhysical(),
             parts,
             indexes->key_condition,
             data,
             metadata_snapshot,
-            context,
-            sample_factor_column_queried,
+            context_,
             log);
 
         if (result.sampling.read_nothing)
@@ -1575,12 +1667,12 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
             total_marks_pk += part->index_granularity.getMarksCountWithoutFinal();
         parts_before_pk = parts.size();
 
-        auto reader_settings = getMergeTreeReaderSettings(context, query_info);
+        auto reader_settings = getMergeTreeReaderSettings(context_, query_info_);
         result.parts_with_ranges = MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipIndexes(
             std::move(parts),
             std::move(alter_conversions),
             metadata_snapshot,
-            context,
+            context_,
             indexes->key_condition,
             indexes->part_offset_condition,
             indexes->skip_indexes,
@@ -1616,8 +1708,8 @@ ReadFromMergeTree::AnalysisResultPtr ReadFromMergeTree::selectRangesToReadImpl(
     result.total_marks_pk = total_marks_pk;
     result.selected_rows = sum_rows;
 
-    if (query_info.input_order_info)
-        result.read_type = (query_info.input_order_info->direction > 0)
+    if (query_info_.input_order_info)
+        result.read_type = (query_info_.input_order_info->direction > 0)
             ? ReadType::InOrder
             : ReadType::InReverseOrder;
 
@@ -1664,6 +1756,10 @@ bool ReadFromMergeTree::requestReadingInOrder(size_t prefix_size, int direction,
         output_stream->sort_scope = DataStream::SortScope::Stream;
     }
 
+    /// All *InOrder optimization rely on an assumption that output stream is sorted, but vertical FINAL breaks this rule
+    /// Let prefer in-order optimization over vertical FINAL for now
+    enable_vertical_final = false;
+
     return true;
 }
 
@@ -1678,17 +1774,16 @@ void ReadFromMergeTree::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info
     prewhere_info = prewhere_info_value;
 
     output_stream = DataStream{.header = MergeTreeSelectProcessor::transformHeader(
-        storage_snapshot->getSampleBlockForColumns(real_column_names),
-        prewhere_info_value,
-        data.getPartitionValueType(),
-        virt_column_names)};
+        storage_snapshot->getSampleBlockForColumns(all_column_names),
+        prewhere_info_value)};
 
     updateSortDescriptionForOutputStream(
         *output_stream,
         storage_snapshot->getMetadataForQuery()->getSortingKeyColumns(),
         getSortDirection(),
         query_info.input_order_info,
-        prewhere_info);
+        prewhere_info,
+        enable_vertical_final);
 }
 
 bool ReadFromMergeTree::requestOutputEachPartitionThroughSeparatePort()
@@ -1761,11 +1856,6 @@ ReadFromMergeTree::AnalysisResult ReadFromMergeTree::getAnalysisResult() const
     return *result_ptr;
 }
 
-bool ReadFromMergeTree::isQueryWithFinal() const
-{
-    return query_info.isFinal();
-}
-
 bool ReadFromMergeTree::isQueryWithSampling() const
 {
     if (context->getSettingsRef().parallel_replicas_count > 1 && data.supportsSampling())
@@ -1787,13 +1877,20 @@ Pipe ReadFromMergeTree::spreadMarkRanges(
 
     if (!final && result.sampling.use_sampling)
     {
+        NameSet sampling_columns;
+
         /// Add columns needed for `sample_by_ast` to `column_names_to_read`.
         /// Skip this if final was used, because such columns were already added from PK.
         for (const auto & column : result.sampling.filter_expression->getRequiredColumns().getNames())
         {
             if (!names.contains(column))
                 column_names_to_read.push_back(column);
+
+            sampling_columns.insert(column);
         }
+
+        if (prewhere_info)
+            restorePrewhereInputs(*prewhere_info, sampling_columns);
     }
 
     if (final)
@@ -1866,7 +1963,13 @@ Pipe ReadFromMergeTree::groupStreamsByPartition(AnalysisResult & result, Actions
 void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     auto result = getAnalysisResult();
+
+    /// Do not keep data parts in snapshot.
+    /// They are stored separately, and some could be released after PK analysis.
+    storage_snapshot->data = std::make_unique<MergeTreeData::SnapshotData>();
+
     result.checkLimits(context->getSettingsRef(), query_info);
+    shared_virtual_fields.emplace("_sample_factor", result.sampling.used_sample_factor);
 
     LOG_DEBUG(
         log,
@@ -1951,18 +2054,6 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
             result_projection = ActionsDAG::merge(std::move(*result_projection), std::move(*actions));
     };
 
-    /// By the way, if a distributed query or query to a Merge table is made, then the `_sample_factor` column can have different values.
-    if (sample_factor_column_queried)
-    {
-        ColumnWithTypeAndName column;
-        column.name = "_sample_factor";
-        column.type = std::make_shared<DataTypeFloat64>();
-        column.column = column.type->createColumnConst(0, Field(result.sampling.used_sample_factor));
-
-        auto adding_column = ActionsDAG::makeAddingColumnActions(std::move(column));
-        append_actions(std::move(adding_column));
-    }
-
     if (result_projection)
         cur_header = result_projection->updateHeader(cur_header);
 
@@ -1987,6 +2078,24 @@ void ReadFromMergeTree::initializePipeline(QueryPipelineBuilder & pipeline, cons
         });
     }
 
+    /// Some extra columns could be added by sample/final/in-order/etc
+    /// Remove them from header if not needed.
+    if (!blocksHaveEqualStructure(pipe.getHeader(), getOutputStream().header))
+    {
+        auto convert_actions_dag = ActionsDAG::makeConvertingActions(
+            pipe.getHeader().getColumnsWithTypeAndName(),
+            getOutputStream().header.getColumnsWithTypeAndName(),
+            ActionsDAG::MatchColumnsMode::Name,
+            true);
+
+        auto converting_dag_expr = std::make_shared<ExpressionActions>(convert_actions_dag);
+
+        pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, converting_dag_expr);
+        });
+    }
+
     for (const auto & processor : pipe.getProcessors())
         processors.emplace_back(processor);
 
diff --git a/src/Processors/QueryPlan/ReadFromMergeTree.h b/src/Processors/QueryPlan/ReadFromMergeTree.h
index 58258f8db4d..5ed742a9bfd 100644
--- a/src/Processors/QueryPlan/ReadFromMergeTree.h
+++ b/src/Processors/QueryPlan/ReadFromMergeTree.h
@@ -110,17 +110,15 @@ public:
     ReadFromMergeTree(
         MergeTreeData::DataPartsVector parts_,
         std::vector<AlterConversionsPtr> alter_conversions_,
-        Names real_column_names_,
-        Names virt_column_names_,
+        Names all_column_names_,
         const MergeTreeData & data_,
         const SelectQueryInfo & query_info_,
-        StorageSnapshotPtr storage_snapshot,
-        ContextPtr context_,
+        const StorageSnapshotPtr & storage_snapshot,
+        const ContextPtr & context_,
         size_t max_block_size_,
         size_t num_streams_,
-        bool sample_factor_column_queried_,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         AnalysisResultPtr analyzed_result_ptr_,
         bool enable_parallel_reading);
 
@@ -135,11 +133,9 @@ public:
     void describeActions(JSONBuilder::JSONMap & map) const override;
     void describeIndexes(JSONBuilder::JSONMap & map) const override;
 
-    const Names & getRealColumnNames() const { return real_column_names; }
-    const Names & getVirtualColumnNames() const { return virt_column_names; }
+    const Names & getAllColumnNames() const { return all_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; }
@@ -158,34 +154,27 @@ public:
     static AnalysisResultPtr selectRangesToRead(
         MergeTreeData::DataPartsVector parts,
         std::vector<AlterConversionsPtr> alter_conversions,
-        const PrewhereInfoPtr & prewhere_info,
-        const ActionDAGNodes & added_filter_nodes,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
         ContextPtr context,
         size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
         const MergeTreeData & data,
-        const Names & real_column_names,
-        bool sample_factor_column_queried,
-        Poco::Logger * log,
+        const Names & all_column_names,
+        LoggerPtr log,
         std::optional<Indexes> & indexes);
 
     AnalysisResultPtr 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 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);
     bool readsInOrder() const;
 
-    void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value);
-    bool isQueryWithFinal() const;
+    void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value) override;
     bool isQueryWithSampling() const;
 
     /// Returns true if the optimization is applicable (and applies it then).
@@ -203,7 +192,7 @@ public:
     size_t getNumStreams() const { return requested_num_streams; }
     bool isParallelReadingEnabled() const { return read_task_callback != std::nullopt; }
 
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
 private:
     static AnalysisResultPtr selectRangesToReadImpl(
@@ -215,9 +204,8 @@ private:
         size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read,
         const MergeTreeData & data,
-        const Names & real_column_names,
-        bool sample_factor_column_queried,
-        Poco::Logger * log,
+        const Names & all_column_names,
+        LoggerPtr log,
         std::optional<Indexes> & indexes);
 
     int getSortDirection() const
@@ -233,23 +221,17 @@ private:
     MergeTreeData::DataPartsVector prepared_parts;
     std::vector<AlterConversionsPtr> alter_conversions_for_parts;
 
-    Names real_column_names;
-    Names virt_column_names;
+    Names all_column_names;
 
     const MergeTreeData & data;
-    SelectQueryInfo query_info;
-    PrewhereInfoPtr prewhere_info;
     ExpressionActionsSettings actions_settings;
 
-    StorageSnapshotPtr storage_snapshot;
     StorageMetadataPtr metadata_for_reading;
 
-    ContextPtr context;
     const MergeTreeReadTask::BlockSizeParams block_size;
 
     size_t requested_num_streams;
     size_t output_streams_limit = 0;
-    const bool sample_factor_column_queried;
 
     /// Used for aggregation optimization (see DB::QueryPlanOptimizations::tryAggregateEachPartitionIndependently).
     bool output_each_partition_through_separate_port = false;
@@ -259,7 +241,7 @@ private:
     /// Pre-computed value, needed to trigger sets creating for PK
     mutable std::optional<Indexes> indexes;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     UInt64 selected_parts = 0;
     UInt64 selected_rows = 0;
     UInt64 selected_marks = 0;
@@ -290,11 +272,14 @@ private:
         RangesInDataParts && parts, size_t num_streams, const Names & origin_column_names, const Names & column_names, ActionsDAGPtr & out_projection);
 
     ReadFromMergeTree::AnalysisResult getAnalysisResult() const;
+
     AnalysisResultPtr analyzed_result_ptr;
+    VirtualFields shared_virtual_fields;
 
     bool is_parallel_reading_from_replicas;
     std::optional<MergeTreeAllRangesCallback> all_ranges_callback;
     std::optional<MergeTreeReadTaskCallback> read_task_callback;
+    bool enable_vertical_final = false;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
index bf2e49727ed..b845101125b 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 
 ReadFromPreparedSource::ReadFromPreparedSource(Pipe pipe_)
-    : SourceStepWithFilter(DataStream{.header = pipe_.getHeader()})
+    : ISourceStep(DataStream{.header = pipe_.getHeader()})
     , pipe(std::move(pipe_))
 {
 }
@@ -35,11 +35,4 @@ ReadFromStorageStep::ReadFromStorageStep(
         processor->setStorageLimits(query_info.storage_limits);
 }
 
-void ReadFromStorageStep::applyFilters()
-{
-    for (const auto & processor : pipe.getProcessors())
-        if (auto * source = dynamic_cast<SourceWithKeyCondition *>(processor.get()))
-            source->setKeyCondition(filter_nodes.nodes, context);
-}
-
 }
diff --git a/src/Processors/QueryPlan/ReadFromPreparedSource.h b/src/Processors/QueryPlan/ReadFromPreparedSource.h
index 2eea48553b3..b40a656cee3 100644
--- a/src/Processors/QueryPlan/ReadFromPreparedSource.h
+++ b/src/Processors/QueryPlan/ReadFromPreparedSource.h
@@ -2,7 +2,6 @@
 
 #include <Interpreters/Context.h>
 #include <Processors/QueryPlan/ISourceStep.h>
-#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <QueryPipeline/Pipe.h>
 #include <Storages/SelectQueryInfo.h>
 
@@ -10,7 +9,7 @@ namespace DB
 {
 
 /// Create source from prepared pipe.
-class ReadFromPreparedSource : public SourceStepWithFilter
+class ReadFromPreparedSource : public ISourceStep
 {
 public:
     explicit ReadFromPreparedSource(Pipe pipe_);
@@ -28,7 +27,6 @@ public:
     ReadFromStorageStep(Pipe pipe_, String storage_name, ContextPtr context_, const SelectQueryInfo & query_info_);
 
     String getName() const override { return "ReadFromStorage"; }
-    void applyFilters() override;
 
 private:
     ContextPtr context;
diff --git a/src/Processors/QueryPlan/ReadFromRemote.cpp b/src/Processors/QueryPlan/ReadFromRemote.cpp
index 56371a5de56..119710d06d8 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.cpp
+++ b/src/Processors/QueryPlan/ReadFromRemote.cpp
@@ -11,8 +11,9 @@
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/Sources/DelayedSource.h>
 #include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/MaterializingTransform.h>
 #include <Interpreters/ActionsDAG.h>
-#include "Common/logger_useful.h"
+#include <Common/logger_useful.h>
 #include <Common/checkStackSize.h>
 #include <Core/QueryProcessingStage.h>
 #include <Client/ConnectionPool.h>
@@ -31,12 +32,14 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-static void addConvertingActions(Pipe & pipe, const Block & header)
+static void addConvertingActions(Pipe & pipe, const Block & header, bool use_positions_to_match = false)
 {
     if (blocksHaveEqualStructure(pipe.getHeader(), header))
         return;
 
-    auto get_converting_dag = [](const Block & block_, const Block & header_)
+    auto match_mode = use_positions_to_match ? ActionsDAG::MatchColumnsMode::Position : ActionsDAG::MatchColumnsMode::Name;
+
+    auto get_converting_dag = [mode = match_mode](const Block & block_, const Block & header_)
     {
         /// Convert header structure to expected.
         /// Also we ignore constants from result and replace it with constants from header.
@@ -44,10 +47,13 @@ static void addConvertingActions(Pipe & pipe, const Block & header)
         return ActionsDAG::makeConvertingActions(
             block_.getColumnsWithTypeAndName(),
             header_.getColumnsWithTypeAndName(),
-            ActionsDAG::MatchColumnsMode::Name,
+            mode,
             true);
     };
 
+    if (use_positions_to_match)
+        pipe.addSimpleTransform([](const Block & stream_header) { return std::make_shared<MaterializingTransform>(stream_header); });
+
     auto convert_actions = std::make_shared<ExpressionActions>(get_converting_dag(pipe.getHeader(), header));
     pipe.addSimpleTransform([&](const Block & cur_header, Pipe::StreamType) -> ProcessorPtr
     {
@@ -102,7 +108,7 @@ ReadFromRemote::ReadFromRemote(
     ThrottlerPtr throttler_,
     Scalars scalars_,
     Tables external_tables_,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     UInt32 shard_count_,
     std::shared_ptr<const StorageLimitsList> storage_limits_,
     const String & cluster_name_)
@@ -156,9 +162,9 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
         -> QueryPipelineBuilder
     {
         auto current_settings = my_context->getSettingsRef();
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(
-            current_settings).getSaturated(
-                current_settings.max_execution_time);
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings)
+                            .getSaturated(current_settings.max_execution_time);
+
         std::vector<ConnectionPoolWithFailover::TryResult> try_results;
         try
         {
@@ -172,23 +178,23 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
         catch (const Exception & ex)
         {
             if (ex.code() == ErrorCodes::ALL_CONNECTION_TRIES_FAILED)
-                LOG_WARNING(&Poco::Logger::get("ClusterProxy::SelectStreamFactory"),
+                LOG_WARNING(getLogger("ClusterProxy::SelectStreamFactory"),
                     "Connections to remote replicas of local shard {} failed, will use stale local replica", my_shard.shard_info.shard_num);
             else
                 throw;
         }
 
-        double max_remote_delay = 0.0;
+        UInt32 max_remote_delay = 0;
         for (const auto & try_result : try_results)
         {
             if (!try_result.is_up_to_date)
-                max_remote_delay = std::max(try_result.staleness, max_remote_delay);
+                max_remote_delay = std::max(try_result.delay, max_remote_delay);
         }
 
         if (try_results.empty() || local_delay < max_remote_delay)
         {
             auto plan = createLocalPlan(
-                query, header, my_context, my_stage, my_shard.shard_info.shard_num, my_shard_count);
+                query, header, my_context, my_stage, my_shard.shard_info.shard_num, my_shard_count, my_shard.has_missing_objects);
 
             return std::move(*plan->buildQueryPipeline(
                 QueryPlanOptimizationSettings::fromContext(my_context),
@@ -216,7 +222,7 @@ void ReadFromRemote::addLazyPipe(Pipes & pipes, const ClusterProxy::SelectStream
     };
 
     pipes.emplace_back(createDelayedPipe(shard.header, lazily_create_stream, add_totals, add_extremes));
-    addConvertingActions(pipes.back(), output_stream->header);
+    addConvertingActions(pipes.back(), output_stream->header, shard.has_missing_objects);
 }
 
 void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFactory::Shard & shard)
@@ -281,7 +287,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
             auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
                 shard.shard_info.pool,
                 query_string,
-                output_stream->header,
+                shard.header,
                 context,
                 throttler,
                 scalars,
@@ -297,7 +303,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
 
             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);
+            addConvertingActions(pipes.back(), output_stream->header, shard.has_missing_objects);
         }
     }
     else
@@ -305,7 +311,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
         const String query_string = formattedAST(shard.query);
 
         auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-            shard.shard_info.pool, query_string, output_stream->header, context, throttler, scalars, external_tables, stage);
+            shard.shard_info.pool, query_string, shard.header, context, throttler, scalars, external_tables, stage);
         remote_query_executor->setLogger(log);
 
         if (context->canUseTaskBasedParallelReplicas())
@@ -326,7 +332,7 @@ void ReadFromRemote::addPipe(Pipes & pipes, const ClusterProxy::SelectStreamFact
 
         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);
+        addConvertingActions(pipes.back(), output_stream->header, shard.has_missing_objects);
     }
 }
 
@@ -357,19 +363,17 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     ParallelReplicasReadingCoordinatorPtr coordinator_,
     Block header_,
     QueryProcessingStage::Enum stage_,
-    StorageID main_table_,
     ContextMutablePtr context_,
     ThrottlerPtr throttler_,
     Scalars scalars_,
     Tables external_tables_,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     std::shared_ptr<const StorageLimitsList> storage_limits_)
     : ISourceStep(DataStream{.header = std::move(header_)})
     , cluster(cluster_)
     , query_ast(query_ast_)
     , coordinator(std::move(coordinator_))
     , stage(std::move(stage_))
-    , main_table(std::move(main_table_))
     , context(context_)
     , throttler(throttler_)
     , scalars(scalars_)
@@ -377,10 +381,11 @@ ReadFromParallelRemoteReplicasStep::ReadFromParallelRemoteReplicasStep(
     , storage_limits(std::move(storage_limits_))
     , log(log_)
 {
-    std::vector<String> description;
+    chassert(cluster->getShardCount() == 1);
 
-    for (const auto & address : cluster->getShardsAddresses())
-        description.push_back(fmt::format("Replica: {}", address[0].host_name));
+    std::vector<String> description;
+    for (const auto & pool : cluster->getShardsInfo().front().per_replica_pools)
+        description.push_back(fmt::format("Replica: {}", pool->getHost()));
 
     setStepDescription(boost::algorithm::join(description, ", "));
 }
@@ -401,51 +406,44 @@ void ReadFromParallelRemoteReplicasStep::initializePipeline(QueryPipelineBuilder
     const Settings & current_settings = context->getSettingsRef();
     auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
 
+    const auto & shard = cluster->getShardsInfo().at(0);
     size_t all_replicas_count = current_settings.max_parallel_replicas;
-    if (all_replicas_count > cluster->getShardsInfo().size())
+    if (all_replicas_count > shard.getAllNodeCount())
     {
-        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, cluster->getShardsInfo().size());
-        all_replicas_count = cluster->getShardsInfo().size();
+        LOG_INFO(
+            getLogger("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.getAllNodeCount());
+        all_replicas_count = shard.getAllNodeCount();
     }
 
-    /// Find local shard. It might happen that there is no local shard, but that's fine
-    for (const auto & shard: cluster->getShardsInfo())
-    {
-        if (shard.isLocal())
-        {
-            IConnections::ReplicaInfo replica_info
-            {
-                .all_replicas_count = all_replicas_count,
-                /// `shard_num` will be equal to the number of the given replica in the cluster (set by `Cluster::getClusterWithReplicasAsShards`).
-                /// we should use this number specifically because efficiency of data distribution by consistent hash depends on it.
-                .number_of_current_replica = shard.shard_num - 1,
-            };
 
-            addPipeForSingeReplica(pipes, shard.pool, replica_info);
-        }
+    std::vector<ConnectionPoolWithFailover::Base::ShuffledPool> shuffled_pool;
+    if (all_replicas_count < shard.getAllNodeCount())
+    {
+        shuffled_pool = shard.pool->getShuffledPools(current_settings);
+        shuffled_pool.resize(all_replicas_count);
+    }
+    else
+    {
+        /// try to preserve replicas order if all replicas in cluster are used for query execution
+        /// it's important for data locality during query execution
+        auto priority_func = [](size_t i) { return Priority{static_cast<Int64>(i)}; };
+        shuffled_pool = shard.pool->getShuffledPools(current_settings, priority_func);
     }
 
-    auto current_shard = cluster->getShardsInfo().begin();
-    while (pipes.size() != all_replicas_count)
+    for (size_t i=0; i < all_replicas_count; ++i)
     {
-        if (current_shard->isLocal())
-        {
-            ++current_shard;
-            continue;
-        }
-
         IConnections::ReplicaInfo replica_info
         {
             .all_replicas_count = all_replicas_count,
-            /// `shard_num` will be equal to the number of the given replica in the cluster (set by `Cluster::getClusterWithReplicasAsShards`).
             /// we should use this number specifically because efficiency of data distribution by consistent hash depends on it.
-            .number_of_current_replica = current_shard->shard_num - 1,
+            .number_of_current_replica = i,
         };
 
-        addPipeForSingeReplica(pipes, current_shard->pool, replica_info);
-        ++current_shard;
+        addPipeForSingeReplica(pipes, shuffled_pool[i].pool, replica_info);
     }
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
@@ -458,7 +456,8 @@ void ReadFromParallelRemoteReplicasStep::initializePipeline(QueryPipelineBuilder
 }
 
 
-void ReadFromParallelRemoteReplicasStep::addPipeForSingeReplica(Pipes & pipes, std::shared_ptr<ConnectionPoolWithFailover> pool, IConnections::ReplicaInfo replica_info)
+void ReadFromParallelRemoteReplicasStep::addPipeForSingeReplica(
+    Pipes & pipes, const ConnectionPoolPtr & pool, IConnections::ReplicaInfo replica_info)
 {
     bool add_agg_info = stage == QueryProcessingStage::WithMergeableState;
     bool add_totals = false;
@@ -478,7 +477,14 @@ void ReadFromParallelRemoteReplicasStep::addPipeForSingeReplica(Pipes & pipes, s
     assert(output_stream);
 
     auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-        pool, query_string, output_stream->header, context, throttler, scalars, external_tables, stage,
+        pool,
+        query_string,
+        output_stream->header,
+        context,
+        throttler,
+        scalars,
+        external_tables,
+        stage,
         RemoteQueryExecutor::Extension{.parallel_reading_coordinator = coordinator, .replica_info = std::move(replica_info)});
 
     remote_query_executor->setLogger(log);
diff --git a/src/Processors/QueryPlan/ReadFromRemote.h b/src/Processors/QueryPlan/ReadFromRemote.h
index f6fd7b3a630..498d584e85a 100644
--- a/src/Processors/QueryPlan/ReadFromRemote.h
+++ b/src/Processors/QueryPlan/ReadFromRemote.h
@@ -9,10 +9,6 @@
 
 namespace DB
 {
-
-class ConnectionPoolWithFailover;
-using ConnectionPoolWithFailoverPtr = std::shared_ptr<ConnectionPoolWithFailover>;
-
 class Throttler;
 using ThrottlerPtr = std::shared_ptr<Throttler>;
 
@@ -35,7 +31,7 @@ public:
         ThrottlerPtr throttler_,
         Scalars scalars_,
         Tables external_tables_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         UInt32 shard_count_,
         std::shared_ptr<const StorageLimitsList> storage_limits_,
         const String & cluster_name_);
@@ -57,7 +53,7 @@ private:
     Scalars scalars;
     Tables external_tables;
     std::shared_ptr<const StorageLimitsList> storage_limits;
-    Poco::Logger * log;
+    LoggerPtr log;
     UInt32 shard_count;
     const String cluster_name;
     std::optional<GetPriorityForLoadBalancing> priority_func_factory;
@@ -76,12 +72,11 @@ public:
         ParallelReplicasReadingCoordinatorPtr coordinator_,
         Block header_,
         QueryProcessingStage::Enum stage_,
-        StorageID main_table_,
         ContextMutablePtr context_,
         ThrottlerPtr throttler_,
         Scalars scalars_,
         Tables external_tables_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         std::shared_ptr<const StorageLimitsList> storage_limits_);
 
     String getName() const override { return "ReadFromRemoteParallelReplicas"; }
@@ -92,20 +87,18 @@ public:
     void enforceAggregationInOrder();
 
 private:
-
-    void addPipeForSingeReplica(Pipes & pipes, std::shared_ptr<ConnectionPoolWithFailover> pool, IConnections::ReplicaInfo replica_info);
+    void addPipeForSingeReplica(Pipes & pipes, const ConnectionPoolPtr & pool, IConnections::ReplicaInfo replica_info);
 
     ClusterPtr cluster;
     ASTPtr query_ast;
     ParallelReplicasReadingCoordinatorPtr coordinator;
     QueryProcessingStage::Enum stage;
-    StorageID main_table;
     ContextMutablePtr context;
     ThrottlerPtr throttler;
     Scalars scalars;
     Tables external_tables;
     std::shared_ptr<const StorageLimitsList> storage_limits;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp
new file mode 100644
index 00000000000..4a257bba922
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.cpp
@@ -0,0 +1,43 @@
+#include <Processors/QueryPlan/ReadFromStreamLikeEngine.h>
+
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int QUERY_NOT_ALLOWED;
+}
+
+ReadFromStreamLikeEngine::ReadFromStreamLikeEngine(
+    const Names & column_names_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    std::shared_ptr<const StorageLimitsList> storage_limits_,
+    ContextPtr context_)
+    : ISourceStep{DataStream{.header = storage_snapshot_->getSampleBlockForColumns(column_names_)}}
+    , WithContext{context_}
+    , storage_limits{std::move(storage_limits_)}
+{
+}
+
+void ReadFromStreamLikeEngine::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    if (!getContext()->getSettingsRef().stream_like_engine_allow_direct_select)
+        throw Exception(
+            ErrorCodes::QUERY_NOT_ALLOWED, "Direct select is not allowed. To enable use setting `stream_like_engine_allow_direct_select`");
+
+    auto pipe = makePipe();
+
+    /// Add storage limits.
+    for (const auto & processor : pipe.getProcessors())
+        processor->setStorageLimits(storage_limits);
+
+    /// Add to processors to get processor info through explain pipeline statement.
+    for (const auto & processor : pipe.getProcessors())
+        processors.emplace_back(processor);
+
+    pipeline.init(std::move(pipe));
+}
+}
diff --git a/src/Processors/QueryPlan/ReadFromStreamLikeEngine.h b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.h
new file mode 100644
index 00000000000..2416dca8004
--- /dev/null
+++ b/src/Processors/QueryPlan/ReadFromStreamLikeEngine.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Storages/IStorage.h>
+#include <Storages/StorageSnapshot.h>
+
+namespace DB
+{
+class ReadFromStreamLikeEngine : public ISourceStep, protected WithContext
+{
+public:
+    ReadFromStreamLikeEngine(
+        const Names & column_names_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        std::shared_ptr<const StorageLimitsList> storage_limits_,
+        ContextPtr context_);
+
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & /*settings*/) final;
+
+protected:
+    virtual Pipe makePipe() = 0;
+
+    std::shared_ptr<const StorageLimitsList> storage_limits;
+};
+}
diff --git a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
index 5173b18c6bf..7a61d09bdd2 100644
--- a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
+++ b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.cpp
@@ -9,8 +9,11 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Storages/System/StorageSystemNumbers.h>
+#include <fmt/format.h>
 #include <Common/iota.h>
 #include <Common/typeid_cast.h>
+#include "Core/Types.h"
+#include "base/types.h"
 
 namespace DB
 {
@@ -23,67 +26,108 @@ extern const int TOO_MANY_ROWS;
 namespace
 {
 
+template <iota_supported_types T>
+inline void iotaWithStepOptimized(T * begin, size_t count, T first_value, T step)
+{
+    if (step == 1)
+        iota(begin, count, first_value);
+    else
+        iotaWithStep(begin, count, first_value, step);
+}
+
 class NumbersSource : public ISource
 {
 public:
-    NumbersSource(UInt64 block_size_, UInt64 offset_, UInt64 step_)
-        : ISource(createHeader()), block_size(block_size_), next(offset_), step(step_)
+    NumbersSource(UInt64 block_size_, UInt64 offset_, std::optional<UInt64> limit_, UInt64 chunk_step_, const std::string & column_name, UInt64 step_)
+        : ISource(createHeader(column_name))
+        , block_size(block_size_)
+        , next(offset_)
+        , chunk_step(chunk_step_)
+        , step(step_)
     {
+        if (limit_.has_value())
+            end = limit_.value() + offset_;
     }
-
     String getName() const override { return "Numbers"; }
 
-    static Block createHeader() { return {ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), "number")}; }
+    static Block createHeader(const std::string & column_name)
+    {
+        return {ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), column_name)};
+    }
 
 protected:
     Chunk generate() override
     {
-        auto column = ColumnUInt64::create(block_size);
+        UInt64 real_block_size = block_size;
+        if (end.has_value())
+        {
+            if (end.value() <= next)
+                return {};
+            real_block_size = std::min(block_size, end.value() - next);
+        }
+        auto column = ColumnUInt64::create(real_block_size);
         ColumnUInt64::Container & vec = column->getData();
 
         UInt64 curr = next; /// The local variable for some reason works faster (>20%) than member of class.
         UInt64 * pos = vec.data(); /// This also accelerates the code.
-        UInt64 * end = &vec[block_size];
-        iota(pos, static_cast<size_t>(end - pos), curr);
 
-        next += step;
+        UInt64 * current_end = &vec[real_block_size];
+
+        iotaWithStepOptimized(pos, static_cast<size_t>(current_end - pos), curr, step);
+
+        next += chunk_step;
 
         progress(column->size(), column->byteSize());
 
-        return {Columns{std::move(column)}, block_size};
+        return {Columns{std::move(column)}, real_block_size};
     }
 
 private:
     UInt64 block_size;
     UInt64 next;
+    UInt64 chunk_step;
+    std::optional<UInt64> end; /// not included
     UInt64 step;
 };
 
-
-UInt128 sizeOfRange(const Range & r)
+struct RangeWithStep
 {
+    UInt64 left;
+    UInt64 step;
     UInt128 size;
-    if (r.right.isPositiveInfinity())
-        return static_cast<UInt128>(std::numeric_limits<uint64_t>::max()) - r.left.get<UInt64>() + r.left_included;
-
-    size = static_cast<UInt128>(r.right.get<UInt64>()) - r.left.get<UInt64>() + 1;
-
-    if (!r.left_included)
-        size--;
-
-    if (!r.right_included)
-        size--;
-    assert(size >= 0);
-    return size;
 };
 
-auto sizeOfRanges(const Ranges & rs)
+using RangesWithStep = std::vector<RangeWithStep>;
+
+std::optional<RangeWithStep> steppedRangeFromRange(const Range & r, UInt64 step, UInt64 remainder)
+{
+    if ((r.right.get<UInt64>() == 0) && (!r.right_included))
+        return std::nullopt;
+    UInt64 begin = (r.left.get<UInt64>() / step) * step;
+    if (begin > std::numeric_limits<UInt64>::max() - remainder)
+        return std::nullopt;
+    begin += remainder;
+
+    while ((r.left_included <= r.left.get<UInt64>()) && (begin <= r.left.get<UInt64>() - r.left_included))
+    {
+        if (std::numeric_limits<UInt64>::max() - step < begin)
+            return std::nullopt;
+        begin += step;
+    }
+
+    if ((begin >= r.right_included) && (begin - r.right_included >= r.right.get<UInt64>()))
+        return std::nullopt;
+    UInt64 right_edge_included = r.right.get<UInt64>() - (1 - r.right_included);
+    return std::optional{RangeWithStep{begin, step, static_cast<UInt128>(right_edge_included - begin) / step + 1}};
+}
+
+auto sizeOfRanges(const RangesWithStep & rs)
 {
     UInt128 total_size{};
-    for (const Range & r : rs)
+    for (const RangeWithStep & r : rs)
     {
         /// total_size will never overflow
-        total_size += sizeOfRange(r);
+        total_size += r.size;
     }
     return total_size;
 };
@@ -109,8 +153,17 @@ public:
 
     using RangesStatePtr = std::shared_ptr<RangesState>;
 
-    NumbersRangedSource(const Ranges & ranges_, RangesStatePtr & ranges_state_, UInt64 base_block_size_)
-        : ISource(NumbersSource::createHeader()), ranges(ranges_), ranges_state(ranges_state_), base_block_size(base_block_size_)
+    NumbersRangedSource(
+        const RangesWithStep & ranges_,
+        RangesStatePtr & ranges_state_,
+        UInt64 base_block_size_,
+        UInt64 step_,
+        const std::string & column_name)
+        : ISource(NumbersSource::createHeader(column_name))
+        , ranges(ranges_)
+        , ranges_state(ranges_state_)
+        , base_block_size(base_block_size_)
+        , step(step_)
     {
     }
 
@@ -123,6 +176,7 @@ protected:
     {
         std::lock_guard lock(ranges_state->mutex);
 
+
         UInt64 need = base_block_size_;
         UInt64 size = 0; /// how many item found.
 
@@ -134,7 +188,7 @@ protected:
         while (need != 0)
         {
             UInt128 can_provide = end.offset_in_ranges == ranges.size() ? static_cast<UInt128>(0)
-                                                                        : sizeOfRange(ranges[end.offset_in_ranges]) - end.offset_in_range;
+                                                                        : ranges[end.offset_in_ranges].size - end.offset_in_range;
             if (can_provide == 0)
                 break;
 
@@ -161,6 +215,7 @@ protected:
         }
 
         ranges_state->pos = end;
+
         return size;
     }
 
@@ -169,10 +224,6 @@ protected:
         if (ranges.empty())
             return {};
 
-        auto first_value = [](const Range & r) { return r.left.get<UInt64>() + (r.left_included ? 0 : 1); };
-
-        auto last_value = [](const Range & r) { return r.right.get<UInt64>() - (r.right_included ? 0 : 1); };
-
         /// Find the data range.
         /// If data left is small, shrink block size.
         RangesPos start, end;
@@ -197,41 +248,43 @@ protected:
 
             UInt128 can_provide = cursor.offset_in_ranges == end.offset_in_ranges
                 ? end.offset_in_range - cursor.offset_in_range
-                : static_cast<UInt128>(last_value(range)) - first_value(range) + 1 - cursor.offset_in_range;
+                : range.size - cursor.offset_in_range;
 
             /// set value to block
-            auto set_value = [&pos](UInt128 & start_value, UInt128 & end_value)
+            auto set_value = [&pos, this](UInt128 & start_value, UInt128 & end_value)
             {
                 if (end_value > std::numeric_limits<UInt64>::max())
                 {
                     while (start_value < end_value)
-                        *(pos++) = start_value++;
+                    {
+                        *(pos++) = start_value;
+                        start_value += this->step;
+                    }
                 }
                 else
                 {
                     auto start_value_64 = static_cast<UInt64>(start_value);
                     auto end_value_64 = static_cast<UInt64>(end_value);
-                    auto size = end_value_64 - start_value_64;
-                    iota(pos, static_cast<size_t>(size), start_value_64);
+                    auto size = (end_value_64 - start_value_64) / this->step;
+                    iotaWithStepOptimized(pos, static_cast<size_t>(size), start_value_64, step);
                     pos += size;
                 }
             };
 
             if (can_provide > need)
             {
-                UInt64 start_value = first_value(range) + cursor.offset_in_range;
+                UInt64 start_value = range.left + cursor.offset_in_range * step;
                 /// end_value will never overflow
-                iota(pos, static_cast<size_t>(need), start_value);
+                iotaWithStepOptimized(pos, static_cast<size_t>(need), start_value, step);
                 pos += need;
-
                 provided += need;
                 cursor.offset_in_range += need;
             }
             else if (can_provide == need)
             {
                 /// to avoid UInt64 overflow
-                UInt128 start_value = static_cast<UInt128>(first_value(range)) + cursor.offset_in_range;
-                UInt128 end_value = start_value + need;
+                UInt128 start_value = static_cast<UInt128>(range.left) + cursor.offset_in_range * step;
+                UInt128 end_value = start_value + need * step;
                 set_value(start_value, end_value);
 
                 provided += need;
@@ -241,8 +294,8 @@ protected:
             else
             {
                 /// to avoid UInt64 overflow
-                UInt128 start_value = static_cast<UInt128>(first_value(range)) + cursor.offset_in_range;
-                UInt128 end_value = start_value + can_provide;
+                UInt128 start_value = static_cast<UInt128>(range.left) + cursor.offset_in_range * step;
+                UInt128 end_value = start_value + can_provide * step;
                 set_value(start_value, end_value);
 
                 provided += static_cast<UInt64>(can_provide);
@@ -259,13 +312,15 @@ protected:
 
 private:
     /// The ranges is shared between all streams.
-    Ranges ranges;
+    RangesWithStep ranges;
 
     /// Ranges state shared between all streams, actually is the start of the ranges.
     RangesStatePtr ranges_state;
 
     /// Base block size, will shrink when data left is not enough.
     UInt64 base_block_size;
+
+    UInt64 step;
 };
 
 }
@@ -286,12 +341,12 @@ bool shouldPushdownLimit(SelectQueryInfo & query_info, UInt64 limit_length)
 
 /// Shrink ranges to size.
 ///     For example: ranges: [1, 5], [8, 100]; size: 7, we will get [1, 5], [8, 9]
-void shrinkRanges(Ranges & ranges, size_t size)
+void shrinkRanges(RangesWithStep & ranges, size_t size)
 {
     size_t last_range_idx = 0;
     for (size_t i = 0; i < ranges.size(); i++)
     {
-        auto range_size = sizeOfRange(ranges[i]);
+        auto range_size = ranges[i].size;
         if (range_size < size)
         {
             size -= static_cast<UInt64>(range_size);
@@ -305,9 +360,7 @@ void shrinkRanges(Ranges & ranges, size_t size)
         else
         {
             auto & range = ranges[i];
-            UInt64 right = range.left.get<UInt64>() + static_cast<UInt64>(size);
-            range.right = Field(right);
-            range.right_included = !range.left_included;
+            range.size = static_cast<UInt128>(size);
             last_range_idx = i;
             break;
         }
@@ -321,21 +374,24 @@ void shrinkRanges(Ranges & ranges, size_t size)
 
 ReadFromSystemNumbersStep::ReadFromSystemNumbersStep(
     const Names & column_names_,
-    StoragePtr storage_,
+    const SelectQueryInfo & query_info_,
     const StorageSnapshotPtr & storage_snapshot_,
-    SelectQueryInfo & query_info,
-    ContextPtr context_,
+    const ContextPtr & context_,
+    StoragePtr storage_,
     size_t max_block_size_,
     size_t num_streams_)
-    : SourceStepWithFilter{DataStream{.header = storage_snapshot_->getSampleBlockForColumns(column_names_)}}
+    : SourceStepWithFilter(
+        DataStream{.header = storage_snapshot_->getSampleBlockForColumns(column_names_)},
+        column_names_,
+        query_info_,
+        storage_snapshot_,
+        context_)
     , column_names{column_names_}
     , storage{std::move(storage_)}
-    , storage_snapshot{storage_snapshot_}
-    , context{std::move(context_)}
     , key_expression{KeyDescription::parse(column_names[0], storage_snapshot->metadata->columns, context).expression}
     , max_block_size{max_block_size_}
     , num_streams{num_streams_}
-    , limit_length_and_offset(InterpreterSelectQuery::getLimitLengthAndOffset(query_info.query->as<ASTSelectQuery&>(), context))
+    , limit_length_and_offset(InterpreterSelectQuery::getLimitLengthAndOffset(query_info.query->as<ASTSelectQuery &>(), context))
     , should_pushdown_limit(shouldPushdownLimit(query_info, limit_length_and_offset.first))
     , limit(query_info.limit)
     , storage_limits(query_info.storage_limits)
@@ -374,12 +430,20 @@ Pipe ReadFromSystemNumbersStep::makePipe()
     if (!numbers_storage.multithreaded)
         num_streams = 1;
 
-    /// Build rpn of query filters
-    KeyCondition condition(buildFilterDAG(), context, column_names, key_expression);
-
     Pipe pipe;
     Ranges ranges;
 
+    if (numbers_storage.limit.has_value() && (numbers_storage.limit.value() == 0))
+    {
+        pipe.addSource(std::make_shared<NullSource>(NumbersSource::createHeader(numbers_storage.column_name)));
+        return pipe;
+    }
+    chassert(numbers_storage.step != UInt64{0});
+
+    /// Build rpn of query filters
+    KeyCondition condition(filter_actions_dag, context, column_names, key_expression);
+
+
     if (condition.extractPlainRanges(ranges))
     {
         /// Intersect ranges with table range
@@ -390,7 +454,8 @@ Pipe ReadFromSystemNumbersStep::makePipe()
         {
             if (std::numeric_limits<UInt64>::max() - numbers_storage.offset >= *(numbers_storage.limit))
             {
-                table_range.emplace(FieldRef(numbers_storage.offset), true, FieldRef(numbers_storage.offset + *(numbers_storage.limit)), false);
+                table_range.emplace(
+                    FieldRef(numbers_storage.offset), true, FieldRef(numbers_storage.offset + *(numbers_storage.limit)), false);
             }
             /// UInt64 overflow, for example: SELECT number FROM numbers(18446744073709551614, 5)
             else
@@ -406,13 +471,20 @@ Pipe ReadFromSystemNumbersStep::makePipe()
             table_range.emplace(FieldRef(numbers_storage.offset), true, FieldRef(std::numeric_limits<UInt64>::max()), true);
         }
 
-        Ranges intersected_ranges;
+        RangesWithStep intersected_ranges;
         for (auto & r : ranges)
         {
             auto intersected_range = table_range->intersectWith(r);
-            if (intersected_range)
-                intersected_ranges.push_back(*intersected_range);
+            if (intersected_range.has_value())
+            {
+                auto range_with_step
+                    = steppedRangeFromRange(intersected_range.value(), numbers_storage.step, numbers_storage.offset % numbers_storage.step);
+                if (range_with_step.has_value())
+                    intersected_ranges.push_back(*range_with_step);
+            }
         }
+
+
         /// intersection with overflowed_table_range goes back.
         if (overflowed_table_range.has_value())
         {
@@ -420,66 +492,78 @@ Pipe ReadFromSystemNumbersStep::makePipe()
             {
                 auto intersected_range = overflowed_table_range->intersectWith(r);
                 if (intersected_range)
-                    intersected_ranges.push_back(*overflowed_table_range);
+                {
+                    auto range_with_step = steppedRangeFromRange(
+                        intersected_range.value(),
+                        numbers_storage.step,
+                        static_cast<UInt64>(
+                            (static_cast<UInt128>(numbers_storage.offset) + std::numeric_limits<UInt64>::max() + 1)
+                            % numbers_storage.step));
+                    if (range_with_step)
+                        intersected_ranges.push_back(*range_with_step);
+                }
             }
         }
 
+
         /// ranges is blank, return a source who has no data
         if (intersected_ranges.empty())
         {
-            pipe.addSource(std::make_shared<NullSource>(NumbersSource::createHeader()));
+            pipe.addSource(std::make_shared<NullSource>(NumbersSource::createHeader(numbers_storage.column_name)));
             return pipe;
         }
         const auto & limit_length = limit_length_and_offset.first;
         const auto & limit_offset = limit_length_and_offset.second;
 
-        /// If intersected ranges is limited or we can pushdown limit.
-        if (!intersected_ranges.rbegin()->right.isPositiveInfinity() || should_pushdown_limit)
+        UInt128 total_size = sizeOfRanges(intersected_ranges);
+        UInt128 query_limit = limit_length + limit_offset;
+
+        /// limit total_size by query_limit
+        if (should_pushdown_limit && query_limit < total_size)
         {
-            UInt128 total_size = sizeOfRanges(intersected_ranges);
-            UInt128 query_limit = limit_length + limit_offset;
-
-            /// limit total_size by query_limit
-            if (should_pushdown_limit && query_limit < total_size)
-            {
-                total_size = query_limit;
-                /// We should shrink intersected_ranges for case:
-                ///     intersected_ranges: [1, 4], [7, 100]; query_limit: 2
-                shrinkRanges(intersected_ranges, total_size);
-            }
-
-            checkLimits(size_t(total_size));
-
-            if (total_size / max_block_size < num_streams)
-                num_streams = static_cast<size_t>(total_size / max_block_size);
-
-            if (num_streams == 0)
-                num_streams = 1;
-
-            /// Ranges state, all streams will share the state.
-            auto ranges_state = std::make_shared<NumbersRangedSource::RangesState>();
-            for (size_t i = 0; i < num_streams; ++i)
-            {
-                auto source = std::make_shared<NumbersRangedSource>(intersected_ranges, ranges_state, max_block_size);
-
-                if (i == 0)
-                    source->addTotalRowsApprox(total_size);
-
-                pipe.addSource(std::move(source));
-            }
-            return pipe;
+            total_size = query_limit;
+            /// We should shrink intersected_ranges for case:
+            ///     intersected_ranges: [1, 4], [7, 100]; query_limit: 2
+            shrinkRanges(intersected_ranges, total_size);
         }
+
+        checkLimits(size_t(total_size));
+
+        if (total_size / max_block_size < num_streams)
+            num_streams = static_cast<size_t>(total_size / max_block_size);
+
+        if (num_streams == 0)
+            num_streams = 1;
+
+        /// Ranges state, all streams will share the state.
+        auto ranges_state = std::make_shared<NumbersRangedSource::RangesState>();
+        for (size_t i = 0; i < num_streams; ++i)
+        {
+            auto source = std::make_shared<NumbersRangedSource>(
+                intersected_ranges, ranges_state, max_block_size, numbers_storage.step, numbers_storage.column_name);
+
+            if (i == 0)
+                source->addTotalRowsApprox(total_size);
+
+            pipe.addSource(std::move(source));
+        }
+        return pipe;
     }
 
     /// Fall back to NumbersSource
     for (size_t i = 0; i < num_streams; ++i)
     {
-        auto source
-            = std::make_shared<NumbersSource>(max_block_size, numbers_storage.offset + i * max_block_size, num_streams * max_block_size);
+        auto source = std::make_shared<NumbersSource>(
+            max_block_size,
+            numbers_storage.offset + i * max_block_size * numbers_storage.step,
+            numbers_storage.limit,
+            num_streams * max_block_size * numbers_storage.step,
+            numbers_storage.column_name,
+            numbers_storage.step);
 
         if (numbers_storage.limit && i == 0)
         {
-            auto rows_appr = *(numbers_storage.limit);
+            auto rows_appr = (*numbers_storage.limit - 1) / numbers_storage.step + 1;
             if (limit > 0 && limit < rows_appr)
                 rows_appr = limit;
             source->addTotalRowsApprox(rows_appr);
@@ -491,7 +575,7 @@ Pipe ReadFromSystemNumbersStep::makePipe()
     if (numbers_storage.limit)
     {
         size_t i = 0;
-        auto storage_limit = *(numbers_storage.limit);
+        auto storage_limit = (*numbers_storage.limit - 1) / numbers_storage.step + 1;
         /// This formula is how to split 'limit' elements to 'num_streams' chunks almost uniformly.
         pipe.addSimpleTransform(
             [&](const Block & header)
@@ -504,12 +588,6 @@ Pipe ReadFromSystemNumbersStep::makePipe()
     return pipe;
 }
 
-ActionsDAGPtr ReadFromSystemNumbersStep::buildFilterDAG()
-{
-    std::unordered_map<std::string, ColumnWithTypeAndName> node_name_to_input_node_column;
-    return ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, node_name_to_input_node_column, context);
-}
-
 void ReadFromSystemNumbersStep::checkLimits(size_t rows)
 {
     const auto & settings = context->getSettingsRef();
diff --git a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.h b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.h
index 0a8c62b30af..cab0686474b 100644
--- a/src/Processors/QueryPlan/ReadFromSystemNumbersStep.h
+++ b/src/Processors/QueryPlan/ReadFromSystemNumbersStep.h
@@ -16,10 +16,10 @@ class ReadFromSystemNumbersStep final : public SourceStepWithFilter
 public:
     ReadFromSystemNumbersStep(
         const Names & column_names_,
-        StoragePtr storage_,
+        const SelectQueryInfo & query_info_,
         const StorageSnapshotPtr & storage_snapshot_,
-        SelectQueryInfo & query_info,
-        ContextPtr context_,
+        const ContextPtr & context_,
+        StoragePtr storage_,
         size_t max_block_size_,
         size_t num_streams_);
 
@@ -32,12 +32,9 @@ private:
     void checkLimits(size_t rows);
 
     Pipe makePipe();
-    ActionsDAGPtr buildFilterDAG();
 
     const Names column_names;
     StoragePtr storage;
-    StorageSnapshotPtr storage_snapshot;
-    ContextPtr context;
     ExpressionActionsPtr key_expression;
     size_t max_block_size;
     size_t num_streams;
diff --git a/src/Processors/QueryPlan/SortingStep.cpp b/src/Processors/QueryPlan/SortingStep.cpp
index 641b9036d4c..d0491cb4b82 100644
--- a/src/Processors/QueryPlan/SortingStep.cpp
+++ b/src/Processors/QueryPlan/SortingStep.cpp
@@ -1,6 +1,7 @@
 #include <memory>
 #include <stdexcept>
 #include <IO/Operators.h>
+#include <Interpreters/Context.h>
 #include <Processors/Merges/MergingSortedTransform.h>
 #include <Processors/QueryPlan/SortingStep.h>
 #include <Processors/Transforms/FinishSortingTransform.h>
diff --git a/src/Processors/QueryPlan/SourceStepWithFilter.cpp b/src/Processors/QueryPlan/SourceStepWithFilter.cpp
new file mode 100644
index 00000000000..5893c2aeb4f
--- /dev/null
+++ b/src/Processors/QueryPlan/SourceStepWithFilter.cpp
@@ -0,0 +1,160 @@
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <IO/Operators.h>
+#include <Interpreters/Context.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Common/JSONBuilder.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
+}
+
+Block SourceStepWithFilter::applyPrewhereActions(Block block, const PrewhereInfoPtr & prewhere_info)
+{
+    if (prewhere_info)
+    {
+        if (prewhere_info->row_level_filter)
+        {
+            block = prewhere_info->row_level_filter->updateHeader(std::move(block));
+            auto & row_level_column = block.getByName(prewhere_info->row_level_column_name);
+            if (!row_level_column.type->canBeUsedInBooleanContext())
+            {
+                throw Exception(
+                    ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER,
+                    "Invalid type for filter in PREWHERE: {}",
+                    row_level_column.type->getName());
+            }
+
+            block.erase(prewhere_info->row_level_column_name);
+        }
+
+        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());
+            }
+
+            if (prewhere_info->remove_prewhere_column)
+            {
+                block.erase(prewhere_info->prewhere_column_name);
+            }
+            else if (prewhere_info->need_filter)
+            {
+                if (const auto * type = typeid_cast<const DataTypeNullable *>(prewhere_column.type.get()); type && type->onlyNull())
+                {
+                    prewhere_column.column = prewhere_column.type->createColumnConst(block.rows(), Null());
+                }
+                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());
+                }
+            }
+        }
+    }
+
+    return block;
+}
+
+void SourceStepWithFilter::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+}
+
+void SourceStepWithFilter::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value)
+{
+    query_info.prewhere_info = prewhere_info_value;
+    prewhere_info = prewhere_info_value;
+    output_stream = DataStream{.header = applyPrewhereActions(output_stream->header, prewhere_info)};
+}
+
+void SourceStepWithFilter::describeActions(FormatSettings & format_settings) const
+{
+    std::string prefix(format_settings.offset, format_settings.indent_char);
+
+    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 SourceStepWithFilter::describeActions(JSONBuilder::JSONMap & map) const
+{
+    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));
+    }
+}
+
+}
diff --git a/src/Processors/QueryPlan/SourceStepWithFilter.h b/src/Processors/QueryPlan/SourceStepWithFilter.h
index dbaff06fde6..0971b99d828 100644
--- a/src/Processors/QueryPlan/SourceStepWithFilter.h
+++ b/src/Processors/QueryPlan/SourceStepWithFilter.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <Processors/QueryPlan/ISourceStep.h>
 #include <Interpreters/ActionsDAG.h>
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageSnapshot.h>
 
 namespace DB
 {
@@ -15,15 +17,31 @@ public:
     using Base = ISourceStep;
     using Base::Base;
 
-    const std::vector<ActionsDAGPtr> & getFilters() const
+    SourceStepWithFilter(
+        DataStream output_stream_,
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_)
+        : ISourceStep(std::move(output_stream_))
+        , required_source_columns(column_names_)
+        , query_info(query_info_)
+        , prewhere_info(query_info.prewhere_info)
+        , storage_snapshot(storage_snapshot_)
+        , context(context_)
     {
-        return filter_dags;
     }
 
-    const ActionDAGNodes & getFilterNodes() const
-    {
-        return filter_nodes;
-    }
+    const ActionsDAGPtr & getFilterActionsDAG() const { return filter_actions_dag; }
+
+    const SelectQueryInfo & getQueryInfo() const { return query_info; }
+    const PrewhereInfoPtr & getPrewhereInfo() const { return prewhere_info; }
+    ContextPtr getContext() const { return context; }
+    const StorageSnapshotPtr & getStorageSnapshot() const { return storage_snapshot; }
+
+    bool isQueryWithFinal() const { return query_info.isFinal(); }
+
+    const Names & requiredSourceColumns() const { return required_source_columns; }
 
     void addFilter(ActionsDAGPtr filter_dag, std::string column_name)
     {
@@ -31,18 +49,41 @@ public:
         filter_dags.push_back(std::move(filter_dag));
     }
 
-    void addFilter(ActionsDAGPtr filter_dag, const ActionsDAG::Node * filter_node)
+    void addFilterFromParentStep(const ActionsDAG::Node * filter_node)
     {
         filter_nodes.nodes.push_back(filter_node);
-        filter_dags.push_back(std::move(filter_dag));
     }
 
     /// Apply filters that can optimize reading from storage.
-    virtual void applyFilters() {}
+    void applyFilters()
+    {
+        applyFilters(std::move(filter_nodes));
+        filter_dags = {};
+    }
+
+    virtual void applyFilters(ActionDAGNodes added_filter_nodes);
+
+    virtual void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value);
+
+    void describeActions(FormatSettings & format_settings) const override;
+
+    void describeActions(JSONBuilder::JSONMap & map) const override;
+
+    static Block applyPrewhereActions(Block block, const PrewhereInfoPtr & prewhere_info);
 
 protected:
-    std::vector<ActionsDAGPtr> filter_dags;
+    Names required_source_columns;
+    SelectQueryInfo query_info;
+    PrewhereInfoPtr prewhere_info;
+    StorageSnapshotPtr storage_snapshot;
+    ContextPtr context;
+
+    ActionsDAGPtr filter_actions_dag;
+
+private:
+    /// Will be cleared after applyFilters() is called.
     ActionDAGNodes filter_nodes;
+    std::vector<ActionsDAGPtr> filter_dags;
 };
 
 }
diff --git a/src/Processors/QueryPlan/WindowStep.cpp b/src/Processors/QueryPlan/WindowStep.cpp
index bb4f429d626..3d1faf7c079 100644
--- a/src/Processors/QueryPlan/WindowStep.cpp
+++ b/src/Processors/QueryPlan/WindowStep.cpp
@@ -1,10 +1,10 @@
-#include <Processors/QueryPlan/WindowStep.h>
-
-#include <Processors/Transforms/WindowTransform.h>
-#include <Processors/Transforms/ExpressionTransform.h>
-#include <QueryPipeline/QueryPipelineBuilder.h>
-#include <Interpreters/ExpressionActions.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <IO/Operators.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Processors/QueryPlan/WindowStep.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/WindowTransform.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Common/JSONBuilder.h>
 
 namespace DB
diff --git a/src/Processors/SourceWithKeyCondition.h b/src/Processors/SourceWithKeyCondition.h
index 82d46eb74a4..ee155d6f78c 100644
--- a/src/Processors/SourceWithKeyCondition.h
+++ b/src/Processors/SourceWithKeyCondition.h
@@ -16,13 +16,8 @@ protected:
     /// Represents pushed down filters in source
     std::shared_ptr<const KeyCondition> key_condition;
 
-    void setKeyConditionImpl(const ActionsDAG::NodeRawConstPtrs & nodes, ContextPtr context, const Block & keys)
+    void setKeyConditionImpl(const ActionsDAGPtr & filter_actions_dag, ContextPtr context, const Block & keys)
     {
-        std::unordered_map<std::string, DB::ColumnWithTypeAndName> node_name_to_input_column;
-        for (const auto & column : keys.getColumnsWithTypeAndName())
-            node_name_to_input_column.insert({column.name, column});
-
-        auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(nodes, node_name_to_input_column, context);
         key_condition = std::make_shared<const KeyCondition>(
             filter_actions_dag,
             context,
@@ -37,7 +32,7 @@ public:
     /// Set key_condition directly. It is used for filter push down in source.
     virtual void setKeyCondition(const std::shared_ptr<const KeyCondition> & key_condition_) { key_condition = key_condition_; }
 
-    /// Set key_condition created by nodes and context.
-    virtual void setKeyCondition(const ActionsDAG::NodeRawConstPtrs & /*nodes*/, ContextPtr /*context*/) { }
+    /// Set key_condition created by filter_actions_dag and context.
+    virtual void setKeyCondition(const ActionsDAGPtr & /*filter_actions_dag*/, ContextPtr /*context*/) { }
 };
 }
diff --git a/src/Processors/Sources/MySQLSource.cpp b/src/Processors/Sources/MySQLSource.cpp
index 81225d1cdf2..be691fd5b2e 100644
--- a/src/Processors/Sources/MySQLSource.cpp
+++ b/src/Processors/Sources/MySQLSource.cpp
@@ -58,7 +58,7 @@ MySQLSource::MySQLSource(
     const Block & sample_block,
     const StreamSettings & settings_)
     : ISource(sample_block.cloneEmpty())
-    , log(&Poco::Logger::get("MySQLSource"))
+    , log(getLogger("MySQLSource"))
     , connection{std::make_unique<Connection>(entry, query_str)}
     , settings{std::make_unique<StreamSettings>(settings_)}
 {
@@ -69,7 +69,7 @@ MySQLSource::MySQLSource(
 /// For descendant MySQLWithFailoverSource
 MySQLSource::MySQLSource(const Block &sample_block_, const StreamSettings & settings_)
     : ISource(sample_block_.cloneEmpty())
-    , log(&Poco::Logger::get("MySQLSource"))
+    , log(getLogger("MySQLSource"))
     , settings(std::make_unique<StreamSettings>(settings_))
 {
     description.init(sample_block_);
diff --git a/src/Processors/Sources/MySQLSource.h b/src/Processors/Sources/MySQLSource.h
index c4d447886c0..4ae5af22dab 100644
--- a/src/Processors/Sources/MySQLSource.h
+++ b/src/Processors/Sources/MySQLSource.h
@@ -20,7 +20,7 @@ struct StreamSettings
     bool fetch_by_name;
     size_t default_num_tries_on_connection_loss;
 
-    StreamSettings(const Settings & settings, bool auto_close_ = false, bool fetch_by_name_ = false, size_t max_retry_ = 5);
+    explicit StreamSettings(const Settings & settings, bool auto_close_ = false, bool fetch_by_name_ = false, size_t max_retry_ = 5);
 
 };
 
@@ -50,7 +50,7 @@ protected:
         mysqlxx::UseQueryResult result;
     };
 
-    Poco::Logger * log;
+    LoggerPtr log;
     std::unique_ptr<Connection> connection;
 
     const std::unique_ptr<StreamSettings> settings;
diff --git a/src/Processors/Sources/RemoteSource.cpp b/src/Processors/Sources/RemoteSource.cpp
index dfa311a7079..3d7dd3f76b8 100644
--- a/src/Processors/Sources/RemoteSource.cpp
+++ b/src/Processors/Sources/RemoteSource.cpp
@@ -1,4 +1,3 @@
-#include <variant>
 #include <Processors/Sources/RemoteSource.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 #include <QueryPipeline/RemoteQueryExecutorReadContext.h>
@@ -72,19 +71,36 @@ ISource::Status RemoteSource::prepare()
     if (is_async_state)
         return Status::Async;
 
+    if (executor_finished)
+        return Status::Finished;
+
     Status status = ISource::prepare();
     /// To avoid resetting the connection (because of "unfinished" query) in the
     /// RemoteQueryExecutor it should be finished explicitly.
     if (status == Status::Finished)
     {
-        query_executor->finish();
         is_async_state = false;
-        return status;
+        need_drain = true;
+        return Status::Ready;
     }
 
     return status;
 }
 
+void RemoteSource::work()
+{
+    /// Connection drain is a heavy operation that may take a long time.
+    /// Therefore we move connection drain from prepare() to work(), and drain multiple connections in parallel.
+    /// See issue: https://github.com/ClickHouse/ClickHouse/issues/60844
+    if (need_drain)
+    {
+        query_executor->finish();
+        executor_finished = true;
+        return;
+    }
+    ISource::work();
+}
+
 std::optional<Chunk> RemoteSource::tryGenerate()
 {
     /// onCancel() will do the cancel if the query was sent.
diff --git a/src/Processors/Sources/RemoteSource.h b/src/Processors/Sources/RemoteSource.h
index dbfa0156331..052567bc261 100644
--- a/src/Processors/Sources/RemoteSource.h
+++ b/src/Processors/Sources/RemoteSource.h
@@ -4,7 +4,6 @@
 #include <Processors/RowsBeforeLimitCounter.h>
 #include <QueryPipeline/Pipe.h>
 #include <Core/UUID.h>
-#include <atomic>
 
 namespace DB
 {
@@ -23,6 +22,7 @@ public:
     ~RemoteSource() override;
 
     Status prepare() override;
+    void work() override;
     String getName() const override { return "Remote"; }
 
     void setRowsBeforeLimitCounter(RowsBeforeLimitCounterPtr counter) override { rows_before_limit.swap(counter); }
@@ -40,6 +40,8 @@ protected:
 
 private:
     bool was_query_sent = false;
+    bool need_drain = false;
+    bool executor_finished = false;
     bool add_aggregation_info = false;
     RemoteQueryExecutorPtr query_executor;
     RowsBeforeLimitCounterPtr rows_before_limit;
diff --git a/src/Processors/Sources/ShellCommandSource.cpp b/src/Processors/Sources/ShellCommandSource.cpp
index 1f23292c6b3..55eaf67eb3b 100644
--- a/src/Processors/Sources/ShellCommandSource.cpp
+++ b/src/Processors/Sources/ShellCommandSource.cpp
@@ -158,7 +158,7 @@ public:
                         throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Executable generates stderr: {}", str);
                     else if (stderr_reaction == ExternalCommandStderrReaction::LOG)
                         LOG_WARNING(
-                            &::Poco::Logger::get("TimeoutReadBufferFromFileDescriptor"), "Executable generates stderr: {}", str);
+                            getLogger("TimeoutReadBufferFromFileDescriptor"), "Executable generates stderr: {}", str);
                     else if (stderr_reaction == ExternalCommandStderrReaction::LOG_FIRST)
                     {
                         res = std::min(ssize_t(stderr_result_buf.reserve()), res);
@@ -217,7 +217,7 @@ public:
             stderr_result.reserve(stderr_result_buf.size());
             stderr_result.append(stderr_result_buf.begin(), stderr_result_buf.end());
             LOG_WARNING(
-                &::Poco::Logger::get("ShellCommandSource"),
+                getLogger("ShellCommandSource"),
                 "Executable generates stderr at the {}: {}",
                 stderr_reaction == ExternalCommandStderrReaction::LOG_FIRST ? "beginning" : "end",
                 stderr_result);
diff --git a/src/Processors/Sources/WaitForAsyncInsertSource.h b/src/Processors/Sources/WaitForAsyncInsertSource.h
index 1029c164941..78af6294202 100644
--- a/src/Processors/Sources/WaitForAsyncInsertSource.h
+++ b/src/Processors/Sources/WaitForAsyncInsertSource.h
@@ -33,7 +33,7 @@ protected:
     {
         auto status = insert_future.wait_for(std::chrono::milliseconds(timeout_ms));
         if (status == std::future_status::deferred)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: got future in deferred state");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got future in deferred state");
 
         if (status == std::future_status::timeout)
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout ({} ms) exceeded)", timeout_ms);
diff --git a/src/Processors/TTL/ITTLAlgorithm.cpp b/src/Processors/TTL/ITTLAlgorithm.cpp
index 79140137df8..761f43e2422 100644
--- a/src/Processors/TTL/ITTLAlgorithm.cpp
+++ b/src/Processors/TTL/ITTLAlgorithm.cpp
@@ -11,8 +11,9 @@ namespace ErrorCodes
 }
 
 ITTLAlgorithm::ITTLAlgorithm(
-    const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
-    : description(description_)
+    const TTLExpressions & ttl_expressions_, const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
+    : ttl_expressions(ttl_expressions_)
+    , description(description_)
     , old_ttl_info(old_ttl_info_)
     , current_time(current_time_)
     , force(force_)
diff --git a/src/Processors/TTL/ITTLAlgorithm.h b/src/Processors/TTL/ITTLAlgorithm.h
index 49cd2c46d9d..d79aa8a8dfc 100644
--- a/src/Processors/TTL/ITTLAlgorithm.h
+++ b/src/Processors/TTL/ITTLAlgorithm.h
@@ -8,6 +8,12 @@
 namespace DB
 {
 
+struct TTLExpressions
+{
+    ExpressionActionsPtr expression;
+    ExpressionActionsPtr where_expression;
+};
+
 /**
  * Represents the actions, which are required to do
  * with data, when TTL is expired: delete, aggregate, etc.
@@ -18,7 +24,7 @@ public:
     using TTLInfo = IMergeTreeDataPart::TTLInfo;
     using MutableDataPartPtr = MergeTreeMutableDataPartPtr;
 
-    ITTLAlgorithm(const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
+    ITTLAlgorithm(const TTLExpressions & ttl_expressions_, const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
     virtual ~ITTLAlgorithm() = default;
 
     virtual void execute(Block & block) = 0;
@@ -39,6 +45,7 @@ protected:
     bool isTTLExpired(time_t ttl) const;
     UInt32 getTimestampByIndex(const IColumn * column, size_t index) const;
 
+    const TTLExpressions ttl_expressions;
     const TTLDescription description;
     const TTLInfo old_ttl_info;
     const time_t current_time;
diff --git a/src/Processors/TTL/TTLAggregationAlgorithm.cpp b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
index 2537e21dd40..45e8a96412e 100644
--- a/src/Processors/TTL/TTLAggregationAlgorithm.cpp
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.cpp
@@ -5,13 +5,14 @@ namespace DB
 {
 
 TTLAggregationAlgorithm::TTLAggregationAlgorithm(
+    const TTLExpressions & ttl_expressions_,
     const TTLDescription & description_,
     const TTLInfo & old_ttl_info_,
     time_t current_time_,
     bool force_,
     const Block & header_,
     const MergeTreeData & storage_)
-    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
+    : ITTLAlgorithm(ttl_expressions_, description_, old_ttl_info_, current_time_, force_)
     , header(header_)
 {
     current_key_value.resize(description.group_by_keys.size());
@@ -75,8 +76,8 @@ void TTLAggregationAlgorithm::execute(Block & block)
         const auto & column_names = header.getNames();
         MutableColumns aggregate_columns = header.cloneEmptyColumns();
 
-        auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
-        auto where_column = executeExpressionAndGetColumn(description.where_expression, block, description.where_result_column);
+        auto ttl_column = executeExpressionAndGetColumn(ttl_expressions.expression, block, description.result_column);
+        auto where_column = executeExpressionAndGetColumn(ttl_expressions.where_expression, block, description.where_result_column);
 
         size_t rows_aggregated = 0;
         size_t current_key_start = 0;
@@ -157,8 +158,8 @@ void TTLAggregationAlgorithm::execute(Block & block)
     /// If some rows were aggregated we have to recalculate ttl info's
     if (some_rows_were_aggregated)
     {
-        auto ttl_column_after_aggregation = executeExpressionAndGetColumn(description.expression, block, description.result_column);
-        auto where_column_after_aggregation = executeExpressionAndGetColumn(description.where_expression, block, description.where_result_column);
+        auto ttl_column_after_aggregation = executeExpressionAndGetColumn(ttl_expressions.expression, block, description.result_column);
+        auto where_column_after_aggregation = executeExpressionAndGetColumn(ttl_expressions.where_expression, block, description.where_result_column);
         for (size_t i = 0; i < block.rows(); ++i)
         {
             bool where_filter_passed = !where_column_after_aggregation || where_column_after_aggregation->getBool(i);
diff --git a/src/Processors/TTL/TTLAggregationAlgorithm.h b/src/Processors/TTL/TTLAggregationAlgorithm.h
index 0e4bf092ed6..f7bf19a202b 100644
--- a/src/Processors/TTL/TTLAggregationAlgorithm.h
+++ b/src/Processors/TTL/TTLAggregationAlgorithm.h
@@ -13,6 +13,7 @@ class TTLAggregationAlgorithm final : public ITTLAlgorithm
 {
 public:
     TTLAggregationAlgorithm(
+        const TTLExpressions & ttl_expressions_,
         const TTLDescription & description_,
         const TTLInfo & old_ttl_info_,
         time_t current_time_,
diff --git a/src/Processors/TTL/TTLColumnAlgorithm.cpp b/src/Processors/TTL/TTLColumnAlgorithm.cpp
index 04c4d7b9348..e27050564ce 100644
--- a/src/Processors/TTL/TTLColumnAlgorithm.cpp
+++ b/src/Processors/TTL/TTLColumnAlgorithm.cpp
@@ -4,6 +4,7 @@ namespace DB
 {
 
 TTLColumnAlgorithm::TTLColumnAlgorithm(
+    const TTLExpressions & ttl_expressions_,
     const TTLDescription & description_,
     const TTLInfo & old_ttl_info_,
     time_t current_time_,
@@ -12,7 +13,7 @@ TTLColumnAlgorithm::TTLColumnAlgorithm(
     const ExpressionActionsPtr & default_expression_,
     const String & default_column_name_,
     bool is_compact_part_)
-    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
+    : ITTLAlgorithm(ttl_expressions_, description_, old_ttl_info_, current_time_, force_)
     , column_name(column_name_)
     , default_expression(default_expression_)
     , default_column_name(default_column_name_)
@@ -49,7 +50,7 @@ void TTLColumnAlgorithm::execute(Block & block)
     if (default_column)
         default_column = default_column->convertToFullColumnIfConst();
 
-    auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
+    auto ttl_column = executeExpressionAndGetColumn(ttl_expressions.expression, block, description.result_column);
 
     auto & column_with_type = block.getByName(column_name);
     const IColumn * values_column = column_with_type.column.get();
diff --git a/src/Processors/TTL/TTLColumnAlgorithm.h b/src/Processors/TTL/TTLColumnAlgorithm.h
index 30de77dcc2a..f34dae952d1 100644
--- a/src/Processors/TTL/TTLColumnAlgorithm.h
+++ b/src/Processors/TTL/TTLColumnAlgorithm.h
@@ -11,6 +11,7 @@ class TTLColumnAlgorithm final : public ITTLAlgorithm
 {
 public:
     TTLColumnAlgorithm(
+        const TTLExpressions & ttl_expressions_,
         const TTLDescription & description_,
         const TTLInfo & old_ttl_info_,
         time_t current_time_,
diff --git a/src/Processors/TTL/TTLDeleteAlgorithm.cpp b/src/Processors/TTL/TTLDeleteAlgorithm.cpp
index f176df2d003..6f9bc315276 100644
--- a/src/Processors/TTL/TTLDeleteAlgorithm.cpp
+++ b/src/Processors/TTL/TTLDeleteAlgorithm.cpp
@@ -4,8 +4,8 @@ namespace DB
 {
 
 TTLDeleteAlgorithm::TTLDeleteAlgorithm(
-    const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
-    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
+    const TTLExpressions & ttl_expressions_, const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_)
+    : ITTLAlgorithm(ttl_expressions_, description_, old_ttl_info_, current_time_, force_)
 {
     if (!isMinTTLExpired())
         new_ttl_info = old_ttl_info;
@@ -19,8 +19,8 @@ void TTLDeleteAlgorithm::execute(Block & block)
     if (!block || !isMinTTLExpired())
         return;
 
-    auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
-    auto where_column = executeExpressionAndGetColumn(description.where_expression, block, description.where_result_column);
+    auto ttl_column = executeExpressionAndGetColumn(ttl_expressions.expression, block, description.result_column);
+    auto where_column = executeExpressionAndGetColumn(ttl_expressions.where_expression, block, description.where_result_column);
 
     MutableColumns result_columns;
     const auto & column_names = block.getNames();
@@ -54,7 +54,7 @@ void TTLDeleteAlgorithm::execute(Block & block)
 
 void TTLDeleteAlgorithm::finalize(const MutableDataPartPtr & data_part) const
 {
-    if (description.where_expression)
+    if (ttl_expressions.where_expression)
         data_part->ttl_infos.rows_where_ttl[description.result_column] = new_ttl_info;
     else
         data_part->ttl_infos.table_ttl = new_ttl_info;
diff --git a/src/Processors/TTL/TTLDeleteAlgorithm.h b/src/Processors/TTL/TTLDeleteAlgorithm.h
index 292a29bfa27..622e45acecb 100644
--- a/src/Processors/TTL/TTLDeleteAlgorithm.h
+++ b/src/Processors/TTL/TTLDeleteAlgorithm.h
@@ -10,7 +10,7 @@ namespace DB
 class TTLDeleteAlgorithm final : public ITTLAlgorithm
 {
 public:
-    TTLDeleteAlgorithm(const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
+    TTLDeleteAlgorithm(const TTLExpressions & ttl_expressions_, const TTLDescription & description_, const TTLInfo & old_ttl_info_, time_t current_time_, bool force_);
 
     void execute(Block & block) override;
     void finalize(const MutableDataPartPtr & data_part) const override;
diff --git a/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp b/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp
index eba364aa2b8..13d3030bbb8 100644
--- a/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp
+++ b/src/Processors/TTL/TTLUpdateInfoAlgorithm.cpp
@@ -4,13 +4,14 @@ namespace DB
 {
 
 TTLUpdateInfoAlgorithm::TTLUpdateInfoAlgorithm(
+    const TTLExpressions & ttl_expressions_,
     const TTLDescription & description_,
-    const TTLUpdateField ttl_update_field_,
-    const String ttl_update_key_,
+    TTLUpdateField ttl_update_field_,
+    String ttl_update_key_,
     const TTLInfo & old_ttl_info_,
     time_t current_time_,
     bool force_)
-    : ITTLAlgorithm(description_, old_ttl_info_, current_time_, force_)
+    : ITTLAlgorithm(ttl_expressions_, description_, old_ttl_info_, current_time_, force_)
     , ttl_update_field(ttl_update_field_)
     , ttl_update_key(ttl_update_key_)
 {
@@ -21,7 +22,7 @@ void TTLUpdateInfoAlgorithm::execute(Block & block)
     if (!block)
         return;
 
-    auto ttl_column = executeExpressionAndGetColumn(description.expression, block, description.result_column);
+    auto ttl_column = executeExpressionAndGetColumn(ttl_expressions.expression, block, description.result_column);
     for (size_t i = 0; i < block.rows(); ++i)
     {
         UInt32 cur_ttl = ITTLAlgorithm::getTimestampByIndex(ttl_column.get(), i);
diff --git a/src/Processors/TTL/TTLUpdateInfoAlgorithm.h b/src/Processors/TTL/TTLUpdateInfoAlgorithm.h
index 45eecbde3d0..b6aee6f7cb0 100644
--- a/src/Processors/TTL/TTLUpdateInfoAlgorithm.h
+++ b/src/Processors/TTL/TTLUpdateInfoAlgorithm.h
@@ -20,9 +20,10 @@ class TTLUpdateInfoAlgorithm : public ITTLAlgorithm
 {
 public:
     TTLUpdateInfoAlgorithm(
+        const TTLExpressions & ttl_expressions_,
         const TTLDescription & description_,
-        const TTLUpdateField ttl_update_field_,
-        const String ttl_update_key_,
+        TTLUpdateField ttl_update_field_,
+        String ttl_update_key_,
         const TTLInfo & old_ttl_info_,
         time_t current_time_, bool force_
     );
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.cpp b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
index a39a0db1311..9ffe15d0f85 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.cpp
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.cpp
@@ -160,7 +160,7 @@ void AggregatingInOrderTransform::consume(Chunk chunk)
                 if (group_by_key)
                     params->aggregator.mergeOnBlockSmall(variants, key_begin, key_end, aggregate_columns_data, key_columns_raw);
                 else
-                    params->aggregator.mergeOnIntervalWithoutKey(variants, key_begin, key_end, aggregate_columns_data);
+                    params->aggregator.mergeOnIntervalWithoutKey(variants, key_begin, key_end, aggregate_columns_data, is_cancelled);
             }
             else
             {
diff --git a/src/Processors/Transforms/AggregatingInOrderTransform.h b/src/Processors/Transforms/AggregatingInOrderTransform.h
index af63ac61c3c..5d50e97f552 100644
--- a/src/Processors/Transforms/AggregatingInOrderTransform.h
+++ b/src/Processors/Transforms/AggregatingInOrderTransform.h
@@ -83,7 +83,7 @@ private:
     Chunk current_chunk;
     Chunk to_push_chunk;
 
-    Poco::Logger * log = &Poco::Logger::get("AggregatingInOrderTransform");
+    LoggerPtr log = getLogger("AggregatingInOrderTransform");
 };
 
 
diff --git a/src/Processors/Transforms/AggregatingTransform.cpp b/src/Processors/Transforms/AggregatingTransform.cpp
index d8888773054..b48d435720a 100644
--- a/src/Processors/Transforms/AggregatingTransform.cpp
+++ b/src/Processors/Transforms/AggregatingTransform.cpp
@@ -1,3 +1,4 @@
+#include <atomic>
 #include <Processors/Transforms/AggregatingTransform.h>
 
 #include <Formats/NativeReader.h>
@@ -79,6 +80,8 @@ namespace
             return convertToChunk(block);
         }
 
+        std::optional<ReadProgress> getReadProgress() override { return std::nullopt; }
+
     private:
         TemporaryFileStream * tmp_stream;
     };
@@ -129,7 +132,7 @@ protected:
             return {};
         }
 
-        Block block = params->aggregator.mergeAndConvertOneBucketToBlock(*data, arena, params->final, bucket_num, &shared_data->is_cancelled);
+        Block block = params->aggregator.mergeAndConvertOneBucketToBlock(*data, arena, params->final, bucket_num, shared_data->is_cancelled);
         Chunk chunk = convertToChunk(block);
 
         shared_data->is_bucket_processed[bucket_num] = true;
@@ -282,7 +285,11 @@ class ConvertingAggregatedToChunksTransform : public IProcessor
 {
 public:
     ConvertingAggregatedToChunksTransform(AggregatingTransformParamsPtr params_, ManyAggregatedDataVariantsPtr data_, size_t num_threads_)
-        : IProcessor({}, {params_->getHeader()}), params(std::move(params_)), data(std::move(data_)), num_threads(num_threads_)
+        : IProcessor({}, {params_->getHeader()})
+        , params(std::move(params_))
+        , data(std::move(data_))
+        , shared_data(std::make_shared<ConvertingAggregatedToChunksWithMergingSource::SharedData>())
+        , num_threads(num_threads_)
     {
     }
 
@@ -343,8 +350,7 @@ public:
             for (auto & input : inputs)
                 input.close();
 
-            if (shared_data)
-                shared_data->is_cancelled.store(true);
+            shared_data->is_cancelled.store(true, std::memory_order_seq_cst);
 
             return Status::Finished;
         }
@@ -369,6 +375,11 @@ public:
         return prepareTwoLevel();
     }
 
+    void onCancel() override
+    {
+        shared_data->is_cancelled.store(true, std::memory_order_seq_cst);
+    }
+
 private:
     IProcessor::Status preparePushToOutput()
     {
@@ -461,7 +472,7 @@ private:
 
         if (first->type == AggregatedDataVariants::Type::without_key || params->params.overflow_row)
         {
-            params->aggregator.mergeWithoutKeyDataImpl(*data);
+            params->aggregator.mergeWithoutKeyDataImpl(*data, shared_data->is_cancelled);
             auto block = params->aggregator.prepareBlockAndFillWithoutKey(
                 *first, params->final, first->type != AggregatedDataVariants::Type::without_key);
 
@@ -503,7 +514,7 @@ private:
     void createSources()
     {
         AggregatedDataVariantsPtr & first = data->at(0);
-        shared_data = std::make_shared<ConvertingAggregatedToChunksWithMergingSource::SharedData>();
+        processors.reserve(num_threads);
 
         for (size_t thread = 0; thread < num_threads; ++thread)
         {
@@ -578,7 +589,7 @@ IProcessor::Status AggregatingTransform::prepare()
     }
 
     /// Finish data processing, prepare to generating.
-    if (is_consume_finished && !is_generate_initialized)
+    if (is_consume_finished && !is_generate_initialized.test())
     {
         /// Close input port in case max_rows_to_group_by was reached but not all data was read.
         inputs.front().close();
@@ -586,7 +597,7 @@ IProcessor::Status AggregatingTransform::prepare()
         return Status::Ready;
     }
 
-    if (is_generate_initialized && !is_pipeline_created && !processors.empty())
+    if (is_generate_initialized.test() && !is_pipeline_created && !processors.empty())
         return Status::ExpandPipeline;
 
     /// Only possible while consuming.
@@ -599,6 +610,12 @@ IProcessor::Status AggregatingTransform::prepare()
         if (is_consume_finished)
         {
             output.finish();
+            /// input.isFinished() means that merging is done. Now we can release our reference to aggregation states.
+            /// TODO: there is another case, when output port is getting closed first.
+            /// E.g. `select ... group by x limit 10`, if it was two-level aggregation and first few buckets contained already enough rows
+            /// limit will stop merging. It turned out to be not trivial to both release aggregation states and ensure that
+            /// ManyAggregatedData holds the last references to them to trigger parallel destruction in its dtor. Will work on that.
+            many_data.reset();
             return Status::Finished;
         }
         else
@@ -675,7 +692,7 @@ void AggregatingTransform::consume(Chunk chunk)
     {
         auto block = getInputs().front().getHeader().cloneWithColumns(chunk.detachColumns());
         block = materializeBlock(block);
-        if (!params->aggregator.mergeOnBlock(block, variants, no_more_keys))
+        if (!params->aggregator.mergeOnBlock(block, variants, no_more_keys, is_cancelled))
             is_consume_finished = true;
     }
     else
@@ -687,17 +704,15 @@ void AggregatingTransform::consume(Chunk chunk)
 
 void AggregatingTransform::initGenerate()
 {
-    if (is_generate_initialized.load(std::memory_order_acquire))
+    if (is_generate_initialized.test_and_set())
         return;
 
-    is_generate_initialized.store(true, std::memory_order_release);
-
     /// If there was no data, and we aggregate without keys, and we must return single row with the result of empty aggregation.
     /// To do this, we pass a block with zero rows to aggregate.
     if (variants.empty() && params->params.keys_size == 0 && !params->params.empty_result_for_aggregation_by_empty_set)
     {
         if (params->params.only_merge)
-            params->aggregator.mergeOnBlock(getInputs().front().getHeader(), variants, no_more_keys);
+            params->aggregator.mergeOnBlock(getInputs().front().getHeader(), variants, no_more_keys, is_cancelled);
         else
             params->aggregator.executeOnBlock(getInputs().front().getHeader(), variants, key_columns, aggregate_columns, no_more_keys);
     }
@@ -829,8 +844,6 @@ void AggregatingTransform::initGenerate()
 
         processors = Pipe::detachProcessors(std::move(pipe));
     }
-
-    many_data.reset();
 }
 
 }
diff --git a/src/Processors/Transforms/AggregatingTransform.h b/src/Processors/Transforms/AggregatingTransform.h
index 61a6acd6bc8..e167acde067 100644
--- a/src/Processors/Transforms/AggregatingTransform.h
+++ b/src/Processors/Transforms/AggregatingTransform.h
@@ -71,16 +71,12 @@ struct AggregatingTransformParams
 struct ManyAggregatedData
 {
     ManyAggregatedDataVariants variants;
-    std::vector<std::unique_ptr<std::mutex>> mutexes;
     std::atomic<UInt32> num_finished = 0;
 
-    explicit ManyAggregatedData(size_t num_threads = 0) : variants(num_threads), mutexes(num_threads)
+    explicit ManyAggregatedData(size_t num_threads = 0) : variants(num_threads)
     {
         for (auto & elem : variants)
             elem = std::make_shared<AggregatedDataVariants>();
-
-        for (auto & mut : mutexes)
-            mut = std::make_unique<std::mutex>();
     }
 
     ~ManyAggregatedData()
@@ -180,7 +176,7 @@ private:
     Processors processors;
 
     AggregatingTransformParamsPtr params;
-    Poco::Logger * log = &Poco::Logger::get("AggregatingTransform");
+    LoggerPtr log = getLogger("AggregatingTransform");
 
     ColumnRawPtrs key_columns;
     Aggregator::AggregateColumns aggregate_columns;
@@ -205,7 +201,7 @@ private:
     UInt64 src_rows = 0;
     UInt64 src_bytes = 0;
 
-    std::atomic<bool> is_generate_initialized = false;
+    std::atomic_flag is_generate_initialized;
     bool is_consume_finished = false;
     bool is_pipeline_created = false;
 
diff --git a/src/Processors/Transforms/ColumnGathererTransform.cpp b/src/Processors/Transforms/ColumnGathererTransform.cpp
index 7c2b93faa91..b2e8e9bc89e 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.cpp
+++ b/src/Processors/Transforms/ColumnGathererTransform.cpp
@@ -17,9 +17,14 @@ namespace ErrorCodes
 }
 
 ColumnGathererStream::ColumnGathererStream(
-    size_t num_inputs, ReadBuffer & row_sources_buf_, size_t block_preferred_size_)
-    : sources(num_inputs), row_sources_buf(row_sources_buf_)
-    , block_preferred_size(block_preferred_size_)
+    size_t num_inputs,
+    ReadBuffer & row_sources_buf_,
+    size_t block_preferred_size_rows_,
+    size_t block_preferred_size_bytes_)
+    : sources(num_inputs)
+    , row_sources_buf(row_sources_buf_)
+    , block_preferred_size_rows(block_preferred_size_rows_)
+    , block_preferred_size_bytes(block_preferred_size_bytes_)
 {
     if (num_inputs == 0)
         throw Exception(ErrorCodes::EMPTY_DATA_PASSED, "There are no streams to gather");
@@ -124,11 +129,12 @@ ColumnGathererTransform::ColumnGathererTransform(
     const Block & header,
     size_t num_inputs,
     ReadBuffer & row_sources_buf_,
-    size_t block_preferred_size_)
+    size_t block_preferred_size_rows_,
+    size_t block_preferred_size_bytes_)
     : IMergingTransform<ColumnGathererStream>(
         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"))
+        num_inputs, row_sources_buf_, block_preferred_size_rows_, block_preferred_size_bytes_)
+    , log(getLogger("ColumnGathererStream"))
 {
     if (header.columns() != 1)
         throw Exception(ErrorCodes::INCORRECT_NUMBER_OF_COLUMNS, "Header should have 1 column, but contains {}",
diff --git a/src/Processors/Transforms/ColumnGathererTransform.h b/src/Processors/Transforms/ColumnGathererTransform.h
index b5bbbff9aca..4e56cffa46a 100644
--- a/src/Processors/Transforms/ColumnGathererTransform.h
+++ b/src/Processors/Transforms/ColumnGathererTransform.h
@@ -5,7 +5,6 @@
 #include <Processors/Merges/Algorithms/IMergingAlgorithm.h>
 #include <Processors/Merges/IMergingTransform.h>
 
-
 namespace Poco { class Logger; }
 
 
@@ -57,7 +56,11 @@ using MergedRowSources = PODArray<RowSourcePart>;
 class ColumnGathererStream final : public IMergingAlgorithm
 {
 public:
-    ColumnGathererStream(size_t num_inputs, ReadBuffer & row_sources_buf_, size_t block_preferred_size_ = DEFAULT_BLOCK_SIZE);
+    ColumnGathererStream(
+        size_t num_inputs,
+        ReadBuffer & row_sources_buf_,
+        size_t block_preferred_size_rows_,
+        size_t block_preferred_size_bytes_);
 
     const char * getName() const override { return "ColumnGathererStream"; }
     void initialize(Inputs inputs) override;
@@ -92,13 +95,12 @@ private:
     std::vector<Source> sources;
     ReadBuffer & row_sources_buf;
 
-    const size_t block_preferred_size;
+    const size_t block_preferred_size_rows;
+    const size_t block_preferred_size_bytes;
 
     Source * source_to_fully_copy = nullptr;
 
     ssize_t next_required_source = -1;
-    size_t cur_block_preferred_size = 0;
-
     UInt64 merged_rows = 0;
     UInt64 merged_bytes = 0;
 };
@@ -110,7 +112,8 @@ public:
         const Block & header,
         size_t num_inputs,
         ReadBuffer & row_sources_buf_,
-        size_t block_preferred_size_ = DEFAULT_BLOCK_SIZE);
+        size_t block_preferred_size_rows_,
+        size_t block_preferred_size_bytes_);
 
     String getName() const override { return "ColumnGathererTransform"; }
 
@@ -120,7 +123,7 @@ protected:
     void onFinish() override;
     UInt64 elapsed_ns = 0;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
@@ -134,15 +137,22 @@ void ColumnGathererStream::gather(Column & column_res)
     if (next_required_source == -1)
     {
         /// Start new column.
-        cur_block_preferred_size = std::min(static_cast<size_t>(row_sources_end - row_source_pos), block_preferred_size);
-        column_res.reserve(cur_block_preferred_size);
+        /// Actually reserve works only for fixed size columns.
+        /// So it's safe to ignore preferred size in bytes and call reserve for number of rows.
+        size_t size_to_reserve = std::min(static_cast<size_t>(row_sources_end - row_source_pos), block_preferred_size_rows);
+        column_res.reserve(size_to_reserve);
     }
 
-    size_t cur_size = column_res.size();
     next_required_source = -1;
 
-    while (row_source_pos < row_sources_end && cur_size < cur_block_preferred_size)
+
+    /// We use do ... while here to ensure there will be at least one iteration of this loop.
+    /// Because the column_res.byteSize() could be bigger than block_preferred_size_bytes already at this point.
+    do
     {
+        if (row_source_pos >= row_sources_end)
+            break;
+
         RowSourcePart row_source = *row_source_pos;
         size_t source_num = row_source.getSourceNum();
         Source & source = sources[source_num];
@@ -159,6 +169,7 @@ void ColumnGathererStream::gather(Column & column_res)
         /// Consecutive optimization. TODO: precompute lengths
         size_t len = 1;
         size_t max_len = std::min(static_cast<size_t>(row_sources_end - row_source_pos), source.size - source.pos); // interval should be in the same block
+
         while (len < max_len && row_source_pos->data == row_source.data)
         {
             ++len;
@@ -181,12 +192,10 @@ void ColumnGathererStream::gather(Column & column_res)
                 column_res.insertFrom(*source.column, source.pos);
             else
                 column_res.insertRangeFrom(*source.column, source.pos, len);
-
-            cur_size += len;
         }
 
         source.pos += len;
-    }
+    } while (column_res.size() < block_preferred_size_rows && column_res.byteSize() < block_preferred_size_bytes);
 }
 
 }
diff --git a/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.cpp b/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.cpp
index 83a75318d61..c38e9e97ed5 100644
--- a/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.cpp
+++ b/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.cpp
@@ -12,6 +12,8 @@
 #include <Core/ColumnWithTypeAndName.h>
 #include <base/types.h>
 
+#include <Poco/String.h>
+
 namespace DB
 {
 
diff --git a/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.h b/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.h
index d214a310a8c..0f5dab06fc9 100644
--- a/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.h
+++ b/src/Processors/Transforms/CreateSetAndFilterOnTheFlyTransform.h
@@ -67,7 +67,7 @@ private:
     /// Set to fill
     SetWithStatePtr set;
 
-    Poco::Logger * log = &Poco::Logger::get("CreatingSetsOnTheFlyTransform");
+    LoggerPtr log = getLogger("CreatingSetsOnTheFlyTransform");
 };
 
 /*
@@ -108,7 +108,7 @@ private:
         size_t result_rows = 0;
     } stat;
 
-    Poco::Logger * log = &Poco::Logger::get("FilterBySetOnTheFlyTransform");
+    LoggerPtr log = getLogger("FilterBySetOnTheFlyTransform");
 };
 
 }
diff --git a/src/Processors/Transforms/CreatingSetsTransform.cpp b/src/Processors/Transforms/CreatingSetsTransform.cpp
index cc0b5926e66..eeb8f4a6060 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.cpp
+++ b/src/Processors/Transforms/CreatingSetsTransform.cpp
@@ -163,7 +163,7 @@ void CreatingSetsTransform::startSubquery()
     done_with_table = !external_table;
 
     if ((done_with_set && !set_from_cache) && done_with_table)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: nothing to do with subquery");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Nothing to do with subquery");
 
     if (table_out.initialized())
     {
diff --git a/src/Processors/Transforms/CreatingSetsTransform.h b/src/Processors/Transforms/CreatingSetsTransform.h
index d1ec7dcbca7..74dcd829b4d 100644
--- a/src/Processors/Transforms/CreatingSetsTransform.h
+++ b/src/Processors/Transforms/CreatingSetsTransform.h
@@ -63,7 +63,7 @@ private:
     size_t bytes_to_transfer = 0;
 
     using Logger = Poco::Logger;
-    Poco::Logger * log = &Poco::Logger::get("CreatingSetsTransform");
+    LoggerPtr log = getLogger("CreatingSetsTransform");
 
     bool is_initialized = false;
 
diff --git a/src/Processors/Transforms/DistinctTransform.cpp b/src/Processors/Transforms/DistinctTransform.cpp
index 3619fa51bf6..d528303a642 100644
--- a/src/Processors/Transforms/DistinctTransform.cpp
+++ b/src/Processors/Transforms/DistinctTransform.cpp
@@ -55,6 +55,7 @@ void DistinctTransform::transform(Chunk & chunk)
 
     /// Convert to full column, because SetVariant for sparse column is not implemented.
     convertToFullIfSparse(chunk);
+    convertToFullIfConst(chunk);
 
     const auto num_rows = chunk.getNumRows();
     auto columns = chunk.detachColumns();
diff --git a/src/Processors/Transforms/FillingTransform.cpp b/src/Processors/Transforms/FillingTransform.cpp
index b725c3e1a5f..879d61bb241 100644
--- a/src/Processors/Transforms/FillingTransform.cpp
+++ b/src/Processors/Transforms/FillingTransform.cpp
@@ -28,7 +28,7 @@ void logDebug(String key, const T & value, const char * separator = " : ")
         else
             ss << value;
 
-        LOG_DEBUG(&Poco::Logger::get("FillingTransform"), "{}{}{}", key, separator, ss.str());
+        LOG_DEBUG(getLogger("FillingTransform"), "{}{}{}", key, separator, ss.str());
     }
 }
 
@@ -53,13 +53,13 @@ Block FillingTransform::transformHeader(Block header, const SortDescription & so
 
 template <typename T>
 static FillColumnDescription::StepFunction getStepFunction(
-    IntervalKind kind, Int64 step, const DateLUTImpl & date_lut, UInt16 scale = DataTypeDateTime64::default_scale)
+    IntervalKind::Kind kind, Int64 step, const DateLUTImpl & date_lut, UInt16 scale = DataTypeDateTime64::default_scale)
 {
     static const DateLUTImpl & utc_time_zone = DateLUT::instance("UTC");
     switch (kind) // NOLINT(bugprone-switch-missing-default-case)
     {
 #define DECLARE_CASE(NAME) \
-        case IntervalKind::NAME: \
+        case IntervalKind::Kind::NAME: \
             return [step, scale, &date_lut](Field & field) { \
                 field = Add##NAME##sImpl::execute(static_cast<T>(\
                     field.get<T>()), static_cast<Int32>(step), date_lut, utc_time_zone, scale); };
@@ -161,7 +161,7 @@ static bool tryConvertFields(FillColumnDescription & descr, const DataTypePtr &
             switch (*descr.step_kind) // NOLINT(bugprone-switch-missing-default-case)
             {
 #define DECLARE_CASE(NAME) \
-                case IntervalKind::NAME: \
+                case IntervalKind::Kind::NAME: \
                     descr.step_func = [step, &time_zone = date_time64->getTimeZone()](Field & field) \
                     { \
                         auto field_decimal = field.get<DecimalField<DateTime64>>(); \
@@ -237,10 +237,21 @@ FillingTransform::FillingTransform(
     }
     logDebug("fill description", dumpSortDescription(fill_description));
 
-    std::set<size_t> unique_positions;
+    std::unordered_set<size_t> ordinary_sort_positions;
+    for (const auto & desc : sort_description)
+    {
+        if (!desc.with_fill)
+            ordinary_sort_positions.insert(header_.getPositionByName(desc.column_name));
+    }
+
+    std::unordered_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 (ordinary_sort_positions.contains(pos))
+            throw Exception(ErrorCodes::INVALID_WITH_FILL_EXPRESSION, "ORDER BY containing the same expression with and without WITH FILL modifier is not supported");
+    }
 
     if (use_with_fill_by_sorting_prefix)
     {
diff --git a/src/Processors/Transforms/FilterTransform.cpp b/src/Processors/Transforms/FilterTransform.cpp
index 089393a1430..b3be9246f43 100644
--- a/src/Processors/Transforms/FilterTransform.cpp
+++ b/src/Processors/Transforms/FilterTransform.cpp
@@ -1,3 +1,4 @@
+#include <algorithm>
 #include <Processors/Transforms/FilterTransform.h>
 
 #include <Interpreters/ExpressionActions.h>
@@ -5,6 +6,7 @@
 #include <Core/Field.h>
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h>
 
 namespace DB
 {
@@ -34,6 +36,143 @@ static void replaceFilterToConstant(Block & block, const String & filter_column_
     }
 }
 
+static std::shared_ptr<const ChunkSelectFinalIndices> getSelectByFinalIndices(Chunk & chunk)
+{
+    if (auto select_final_indices_info = std::dynamic_pointer_cast<const ChunkSelectFinalIndices>(chunk.getChunkInfo()))
+    {
+        const auto & index_column = select_final_indices_info->select_final_indices;
+        chunk.setChunkInfo(nullptr);
+        if (index_column && index_column->size() != chunk.getNumRows())
+            return select_final_indices_info;
+    }
+    return nullptr;
+}
+
+static void
+executeSelectByIndices(Columns & columns, std::shared_ptr<const ChunkSelectFinalIndices> & select_final_indices_info, size_t & num_rows)
+{
+    if (select_final_indices_info)
+    {
+        const auto & index_column = select_final_indices_info->select_final_indices;
+
+        for (auto & column : columns)
+            column = column->index(*index_column, 0);
+
+        num_rows = index_column->size();
+    }
+}
+
+static std::unique_ptr<IFilterDescription> combineFilterAndIndices(
+    std::unique_ptr<FilterDescription> description,
+    std::shared_ptr<const ChunkSelectFinalIndices> & select_final_indices_info,
+    size_t num_rows)
+{
+    if (select_final_indices_info)
+    {
+        const auto * index_column = select_final_indices_info->select_final_indices;
+
+        if (description->hasOne())
+        {
+            const auto & selected_by_indices = index_column->getData();
+            const auto * selected_by_filter = description->data->data();
+            /// We will recompute new has_one
+            description->has_one = 0;
+            /// At this point we know that the filter is not constant, just create a new filter
+            auto mutable_holder = ColumnUInt8::create(num_rows, 0);
+            auto & data = mutable_holder->getData();
+            for (auto idx : selected_by_indices)
+                data[idx] = 1;
+
+            /// AND two filters
+            auto * begin = data.data();
+            const auto * end = begin + num_rows;
+#if defined(__AVX2__)
+            while (end - begin >= 32)
+            {
+                _mm256_storeu_si256(
+                    reinterpret_cast<__m256i *>(begin),
+                    _mm256_and_si256(
+                        _mm256_loadu_si256(reinterpret_cast<const __m256i *>(begin)),
+                        _mm256_loadu_si256(reinterpret_cast<const __m256i *>(selected_by_filter))));
+                description->has_one |= !memoryIsZero(begin, 0, 32);
+                begin += 32;
+                selected_by_filter += 32;
+            }
+#elif defined(__SSE2__)
+            while (end - begin >= 16)
+            {
+                _mm_storeu_si128(
+                    reinterpret_cast<__m128i *>(begin),
+                    _mm_and_si128(
+                        _mm_loadu_si128(reinterpret_cast<const __m128i *>(begin)),
+                        _mm_loadu_si128(reinterpret_cast<const __m128i *>(selected_by_filter))));
+                description->has_one |= !memoryIsZero(begin, 0, 16);
+                begin += 16;
+                selected_by_filter += 16;
+            }
+#endif
+
+            while (end - begin >= 8)
+            {
+                *reinterpret_cast<UInt64 *>(begin) &= *reinterpret_cast<const UInt64 *>(selected_by_filter);
+                description->has_one |= *reinterpret_cast<UInt64 *>(begin);
+                begin += 8;
+                selected_by_filter += 8;
+            }
+
+            while (end - begin > 0)
+            {
+                *begin &= *selected_by_filter;
+                description->has_one |= *begin;
+                begin++;
+                selected_by_filter++;
+            }
+
+            description->data_holder = std::move(mutable_holder);
+            description->data = &data;
+        }
+    }
+    return std::move(description);
+}
+
+static std::unique_ptr<IFilterDescription> combineFilterAndIndices(
+    std::unique_ptr<SparseFilterDescription> description,
+    std::shared_ptr<const ChunkSelectFinalIndices> & select_final_indices_info,
+    size_t num_rows)
+{
+    /// Iterator interface to decorate data from output of std::set_intersection
+    struct Iterator
+    {
+        UInt8 * data;
+        Int64 & pop_cnt;
+        explicit Iterator(UInt8 * data_, Int64 & pop_cnt_) : data(data_), pop_cnt(pop_cnt_) {}
+        Iterator & operator = (UInt64 index) { data[index] = 1; ++pop_cnt; return *this; }
+        Iterator & operator ++ () { return *this; }
+        Iterator & operator * () { return *this; }
+    };
+
+    if (select_final_indices_info)
+    {
+        const auto * index_column = select_final_indices_info->select_final_indices;
+
+        if (description->hasOne())
+        {
+            std::unique_ptr<FilterDescription> res;
+            res->has_one = 0;
+            const auto & selected_by_indices = index_column->getData();
+            const auto & selected_by_filter = description->filter_indices->getData();
+            auto mutable_holder = ColumnUInt8::create(num_rows, 0);
+            auto & data = mutable_holder->getData();
+            Iterator decorator(data.data(), res->has_one);
+            std::set_intersection(selected_by_indices.begin(), selected_by_indices.end(), selected_by_filter.begin(), selected_by_filter.end(), decorator);
+            res->data_holder = std::move(mutable_holder);
+            res->data = &data;
+            return res;
+        }
+    }
+    return std::move(description);
+}
+
 Block FilterTransform::transformHeader(
     Block header,
     const ActionsDAG * expression,
@@ -126,6 +265,8 @@ void FilterTransform::doTransform(Chunk & chunk)
 {
     size_t num_rows_before_filtration = chunk.getNumRows();
     auto columns = chunk.detachColumns();
+    DataTypes types;
+    auto select_final_indices_info = getSelectByFinalIndices(chunk);
 
     {
         Block block = getInputPort().getHeader().cloneWithColumns(columns);
@@ -135,10 +276,12 @@ void FilterTransform::doTransform(Chunk & chunk)
             expression->execute(block, num_rows_before_filtration);
 
         columns = block.getColumns();
+        types = block.getDataTypes();
     }
 
     if (constant_filter_description.always_true || on_totals)
     {
+        executeSelectByIndices(columns, select_final_indices_info, num_rows_before_filtration);
         chunk.setColumns(std::move(columns), num_rows_before_filtration);
         removeFilterIfNeed(chunk);
         return;
@@ -159,30 +302,44 @@ void FilterTransform::doTransform(Chunk & chunk)
 
     if (constant_filter_description.always_true)
     {
+        executeSelectByIndices(columns, select_final_indices_info, num_rows_before_filtration);
         chunk.setColumns(std::move(columns), num_rows_before_filtration);
         removeFilterIfNeed(chunk);
         return;
     }
 
+    std::unique_ptr<IFilterDescription> filter_description;
+    if (filter_column->isSparse())
+        filter_description = combineFilterAndIndices(
+            std::make_unique<SparseFilterDescription>(*filter_column), select_final_indices_info, num_rows_before_filtration);
+    else
+        filter_description = combineFilterAndIndices(
+            std::make_unique<FilterDescription>(*filter_column), select_final_indices_info, num_rows_before_filtration);
+
+
+    if (!filter_description->has_one)
+        return;
+
     /** Let's find out how many rows will be in result.
       * To do this, we filter out the first non-constant column
       *  or calculate number of set bytes in the filter.
       */
     size_t first_non_constant_column = num_columns;
+    size_t min_size_in_memory = std::numeric_limits<size_t>::max();
     for (size_t i = 0; i < num_columns; ++i)
     {
-        if (i != filter_column_position && !isColumnConst(*columns[i]))
+        DataTypePtr type_not_null = removeNullableOrLowCardinalityNullable(types[i]);
+        if (i != filter_column_position && !isColumnConst(*columns[i]) && type_not_null->isValueRepresentedByNumber())
         {
-            first_non_constant_column = i;
-            break;
+            size_t size_in_memory = type_not_null->getSizeOfValueInMemory() + (isNullableOrLowCardinalityNullable(types[i]) ? 1 : 0);
+            if (size_in_memory < min_size_in_memory)
+            {
+                min_size_in_memory = size_in_memory;
+                first_non_constant_column = i;
+            }
         }
     }
-
-    std::unique_ptr<IFilterDescription> filter_description;
-    if (filter_column->isSparse())
-        filter_description = std::make_unique<SparseFilterDescription>(*filter_column);
-    else
-        filter_description = std::make_unique<FilterDescription>(*filter_column);
+    (void)min_size_in_memory; /// Suppress error of clang-analyzer-deadcode.DeadStores
 
     size_t num_filtered_rows = 0;
     if (first_non_constant_column != num_columns)
diff --git a/src/Processors/Transforms/JoiningTransform.cpp b/src/Processors/Transforms/JoiningTransform.cpp
index 4e7868ea1c2..0c0a86ce270 100644
--- a/src/Processors/Transforms/JoiningTransform.cpp
+++ b/src/Processors/Transforms/JoiningTransform.cpp
@@ -14,12 +14,12 @@ namespace ErrorCodes
 
 Block JoiningTransform::transformHeader(Block header, const JoinPtr & join)
 {
-    LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "Before join block: '{}'", header.dumpStructure());
+    LOG_DEBUG(getLogger("JoiningTransform"), "Before join block: '{}'", header.dumpStructure());
     join->checkTypesOfKeys(header);
     join->initialize(header);
     ExtraBlockPtr tmp;
     join->joinBlock(header, tmp);
-    LOG_DEBUG(&Poco::Logger::get("JoiningTransform"), "After join block: '{}'", header.dumpStructure());
+    LOG_DEBUG(getLogger("JoiningTransform"), "After join block: '{}'", header.dumpStructure());
     return header;
 }
 
diff --git a/src/Processors/Transforms/MergeJoinTransform.cpp b/src/Processors/Transforms/MergeJoinTransform.cpp
index 15c88244cbd..62361bef5e2 100644
--- a/src/Processors/Transforms/MergeJoinTransform.cpp
+++ b/src/Processors/Transforms/MergeJoinTransform.cpp
@@ -16,6 +16,7 @@
 #include <Core/SortCursor.h>
 #include <Core/SortDescription.h>
 #include <IO/WriteHelpers.h>
+#include <Interpreters/FullSortingMergeJoin.h>
 #include <Interpreters/TableJoin.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Processors/Transforms/MergeJoinTransform.h>
@@ -43,7 +44,7 @@ FullMergeJoinCursorPtr createCursor(const Block & block, const Names & columns)
 }
 
 template <bool has_left_nulls, bool has_right_nulls>
-int nullableCompareAt(const IColumn & left_column, const IColumn & right_column, size_t lhs_pos, size_t rhs_pos, int null_direction_hint = 1)
+int nullableCompareAt(const IColumn & left_column, const IColumn & right_column, size_t lhs_pos, size_t rhs_pos, int null_direction_hint)
 {
     if constexpr (has_left_nulls && has_right_nulls)
     {
@@ -88,35 +89,36 @@ int nullableCompareAt(const IColumn & left_column, const IColumn & right_column,
 }
 
 int ALWAYS_INLINE compareCursors(const SortCursorImpl & lhs, size_t lpos,
-                                 const SortCursorImpl & rhs, size_t rpos)
+                                 const SortCursorImpl & rhs, size_t rpos,
+                                 int null_direction_hint)
 {
     for (size_t i = 0; i < lhs.sort_columns_size; ++i)
     {
         /// TODO(@vdimir): use nullableCompareAt only if there's nullable columns
-        int cmp = nullableCompareAt<true, true>(*lhs.sort_columns[i], *rhs.sort_columns[i], lpos, rpos);
+        int cmp = nullableCompareAt<true, true>(*lhs.sort_columns[i], *rhs.sort_columns[i], lpos, rpos, null_direction_hint);
         if (cmp != 0)
             return cmp;
     }
     return 0;
 }
 
-int ALWAYS_INLINE compareCursors(const SortCursorImpl & lhs, const SortCursorImpl & rhs)
+int ALWAYS_INLINE compareCursors(const SortCursorImpl & lhs, const SortCursorImpl & rhs, int null_direction_hint)
 {
-    return compareCursors(lhs, lhs.getRow(), rhs, rhs.getRow());
+    return compareCursors(lhs, lhs.getRow(), rhs, rhs.getRow(), null_direction_hint);
 }
 
-bool ALWAYS_INLINE totallyLess(SortCursorImpl & lhs, SortCursorImpl & rhs)
+bool ALWAYS_INLINE totallyLess(SortCursorImpl & lhs, SortCursorImpl & rhs, int null_direction_hint)
 {
     /// The last row of left cursor is less than the current row of the right cursor.
-    int cmp = compareCursors(lhs, lhs.rows - 1, rhs, rhs.getRow());
+    int cmp = compareCursors(lhs, lhs.rows - 1, rhs, rhs.getRow(), null_direction_hint);
     return cmp < 0;
 }
 
-int ALWAYS_INLINE totallyCompare(SortCursorImpl & lhs, SortCursorImpl & rhs)
+int ALWAYS_INLINE totallyCompare(SortCursorImpl & lhs, SortCursorImpl & rhs, int null_direction_hint)
 {
-    if (totallyLess(lhs, rhs))
+    if (totallyLess(lhs, rhs, null_direction_hint))
         return -1;
-    if (totallyLess(rhs, lhs))
+    if (totallyLess(rhs, lhs, null_direction_hint))
         return 1;
     return 0;
 }
@@ -273,7 +275,7 @@ MergeJoinAlgorithm::MergeJoinAlgorithm(
     size_t max_block_size_)
     : table_join(table_join_)
     , max_block_size(max_block_size_)
-    , log(&Poco::Logger::get("MergeJoinAlgorithm"))
+    , log(getLogger("MergeJoinAlgorithm"))
 {
     if (input_headers.size() != 2)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "MergeJoinAlgorithm requires exactly two inputs");
@@ -302,6 +304,13 @@ MergeJoinAlgorithm::MergeJoinAlgorithm(
         size_t right_idx = input_headers[1].getPositionByName(right_key);
         left_to_right_key_remap[left_idx] = right_idx;
     }
+
+    const auto *smjPtr = typeid_cast<const FullSortingMergeJoin *>(table_join.get());
+    if (smjPtr)
+    {
+        null_direction_hint = smjPtr->getNullDirection();
+    }
+
 }
 
 void MergeJoinAlgorithm::logElapsed(double seconds)
@@ -366,7 +375,8 @@ struct AllJoinImpl
                      size_t max_block_size,
                      PaddedPODArray<UInt64> & left_map,
                      PaddedPODArray<UInt64> & right_map,
-                     std::unique_ptr<AllJoinState> & state)
+                     std::unique_ptr<AllJoinState> & state,
+                     int null_direction_hint)
     {
         right_map.clear();
         right_map.reserve(max_block_size);
@@ -382,7 +392,7 @@ struct AllJoinImpl
             lpos = left_cursor->getRow();
             rpos = right_cursor->getRow();
 
-            cmp = compareCursors(left_cursor.cursor, right_cursor.cursor);
+            cmp = compareCursors(left_cursor.cursor, right_cursor.cursor, null_direction_hint);
             if (cmp == 0)
             {
                 size_t lnum = nextDistinct(left_cursor.cursor);
@@ -517,7 +527,7 @@ MergeJoinAlgorithm::Status MergeJoinAlgorithm::allJoin(JoinKind kind)
 {
     PaddedPODArray<UInt64> idx_map[2];
 
-    dispatchKind<AllJoinImpl>(kind, *cursors[0], *cursors[1], max_block_size, idx_map[0], idx_map[1], all_join_state);
+    dispatchKind<AllJoinImpl>(kind, *cursors[0], *cursors[1], max_block_size, idx_map[0], idx_map[1], all_join_state, null_direction_hint);
     assert(idx_map[0].size() == idx_map[1].size());
 
     Chunk result;
@@ -576,7 +586,8 @@ struct AnyJoinImpl
                      FullMergeJoinCursor & right_cursor,
                      PaddedPODArray<UInt64> & left_map,
                      PaddedPODArray<UInt64> & right_map,
-                     AnyJoinState & state)
+                     AnyJoinState & state,
+                     int null_direction_hint)
     {
         assert(enabled);
 
@@ -599,7 +610,7 @@ struct AnyJoinImpl
             lpos = left_cursor->getRow();
             rpos = right_cursor->getRow();
 
-            cmp = compareCursors(left_cursor.cursor, right_cursor.cursor);
+            cmp = compareCursors(left_cursor.cursor, right_cursor.cursor, null_direction_hint);
             if (cmp == 0)
             {
                 if constexpr (isLeftOrFull(kind))
@@ -723,7 +734,7 @@ MergeJoinAlgorithm::Status MergeJoinAlgorithm::anyJoin(JoinKind kind)
     PaddedPODArray<UInt64> idx_map[2];
     size_t prev_pos[] = {current_left.getRow(), current_right.getRow()};
 
-    dispatchKind<AnyJoinImpl>(kind, *cursors[0], *cursors[1], idx_map[0], idx_map[1], any_join_state);
+    dispatchKind<AnyJoinImpl>(kind, *cursors[0], *cursors[1], idx_map[0], idx_map[1], any_join_state, null_direction_hint);
 
     assert(idx_map[0].empty() || idx_map[1].empty() || idx_map[0].size() == idx_map[1].size());
     size_t num_result_rows = std::max(idx_map[0].size(), idx_map[1].size());
@@ -816,7 +827,7 @@ IMergingAlgorithm::Status MergeJoinAlgorithm::merge()
     }
 
     /// check if blocks are not intersecting at all
-    if (int cmp = totallyCompare(cursors[0]->cursor, cursors[1]->cursor); cmp != 0)
+    if (int cmp = totallyCompare(cursors[0]->cursor, cursors[1]->cursor, null_direction_hint); cmp != 0)
     {
         if (cmp < 0)
         {
@@ -860,7 +871,7 @@ MergeJoinTransform::MergeJoinTransform(
         /* always_read_till_end_= */ false,
         /* empty_chunk_on_finish_= */ true,
         table_join, input_headers, max_block_size)
-    , log(&Poco::Logger::get("MergeJoinTransform"))
+    , log(getLogger("MergeJoinTransform"))
 {
     LOG_TRACE(log, "Use MergeJoinTransform");
 }
diff --git a/src/Processors/Transforms/MergeJoinTransform.h b/src/Processors/Transforms/MergeJoinTransform.h
index eb45169a2b0..cf9331abd59 100644
--- a/src/Processors/Transforms/MergeJoinTransform.h
+++ b/src/Processors/Transforms/MergeJoinTransform.h
@@ -230,9 +230,9 @@ public:
     explicit MergeJoinAlgorithm(JoinPtr table_join, const Blocks & input_headers, size_t max_block_size_);
 
     const char * getName() const override { return "MergeJoinAlgorithm"; }
-    virtual void initialize(Inputs inputs) override;
-    virtual void consume(Input & input, size_t source_num) override;
-    virtual Status merge() override;
+    void initialize(Inputs inputs) override;
+    void consume(Input & input, size_t source_num) override;
+    Status merge() override;
 
     void logElapsed(double seconds);
 
@@ -258,6 +258,7 @@ private:
     JoinPtr table_join;
 
     size_t max_block_size;
+    int null_direction_hint = 1;
 
     struct Statistic
     {
@@ -269,7 +270,7 @@ private:
 
     Statistic stat;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 class MergeJoinTransform final : public IMergingTransform<MergeJoinAlgorithm>
@@ -289,7 +290,7 @@ public:
 protected:
     void onFinish() override;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Processors/Transforms/MergeSortingTransform.cpp b/src/Processors/Transforms/MergeSortingTransform.cpp
index de77711d129..64d84ea4b00 100644
--- a/src/Processors/Transforms/MergeSortingTransform.cpp
+++ b/src/Processors/Transforms/MergeSortingTransform.cpp
@@ -30,7 +30,7 @@ namespace DB
 class BufferingToFileTransform : public IAccumulatingTransform
 {
 public:
-    BufferingToFileTransform(const Block & header, TemporaryFileStream & tmp_stream_, Poco::Logger * log_)
+    BufferingToFileTransform(const Block & header, TemporaryFileStream & tmp_stream_, LoggerPtr log_)
         : IAccumulatingTransform(header, header)
         , tmp_stream(tmp_stream_)
         , log(log_)
@@ -73,7 +73,7 @@ public:
 private:
     TemporaryFileStream & tmp_stream;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 MergeSortingTransform::MergeSortingTransform(
diff --git a/src/Processors/Transforms/MergeSortingTransform.h b/src/Processors/Transforms/MergeSortingTransform.h
index e8c180b6903..4478d5a07e8 100644
--- a/src/Processors/Transforms/MergeSortingTransform.h
+++ b/src/Processors/Transforms/MergeSortingTransform.h
@@ -50,7 +50,7 @@ private:
     size_t sum_rows_in_blocks = 0;
     size_t sum_bytes_in_blocks = 0;
 
-    Poco::Logger * log = &Poco::Logger::get("MergeSortingTransform");
+    LoggerPtr log = getLogger("MergeSortingTransform");
 
     /// If remerge doesn't save memory at least several times, mark it as useless and don't do it anymore.
     bool remerge_is_useful = true;
diff --git a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
index a92e2253314..fc40c6894bb 100644
--- a/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedMemoryEfficientTransform.cpp
@@ -363,7 +363,7 @@ void MergingAggregatedBucketTransform::transform(Chunk & chunk)
     res_info->chunk_num = chunks_to_merge->chunk_num;
     chunk.setChunkInfo(std::move(res_info));
 
-    auto block = params->aggregator.mergeBlocks(blocks_list, params->final);
+    auto block = params->aggregator.mergeBlocks(blocks_list, params->final, is_cancelled);
 
     if (!required_sort_description.empty())
         sortBlock(block, required_sort_description);
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.cpp b/src/Processors/Transforms/MergingAggregatedTransform.cpp
index e4955d06859..ad723da7527 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.cpp
+++ b/src/Processors/Transforms/MergingAggregatedTransform.cpp
@@ -39,11 +39,10 @@ void MergingAggregatedTransform::consume(Chunk chunk)
     if (const auto * agg_info = typeid_cast<const AggregatedChunkInfo *>(info.get()))
     {
         /** If the remote servers used a two-level aggregation method,
-        *  then blocks will contain information about the number of the bucket.
-        * Then the calculations can be parallelized by buckets.
-        * We decompose the blocks to the bucket numbers indicated in them.
-        */
-
+          * then blocks will contain information about the number of the bucket.
+          * Then the calculations can be parallelized by buckets.
+          * We decompose the blocks to the bucket numbers indicated in them.
+          */
         auto block = getInputPort().getHeader().cloneWithColumns(chunk.getColumns());
         block.info.is_overflows = agg_info->is_overflows;
         block.info.bucket_num = agg_info->bucket_num;
@@ -73,7 +72,7 @@ Chunk MergingAggregatedTransform::generate()
         next_block = blocks.begin();
 
         /// TODO: this operation can be made async. Add async for IAccumulatingTransform.
-        params->aggregator.mergeBlocks(std::move(bucket_to_blocks), data_variants, max_threads);
+        params->aggregator.mergeBlocks(std::move(bucket_to_blocks), data_variants, max_threads, is_cancelled);
         blocks = params->aggregator.convertToBlocks(data_variants, params->final, max_threads);
         next_block = blocks.begin();
     }
diff --git a/src/Processors/Transforms/MergingAggregatedTransform.h b/src/Processors/Transforms/MergingAggregatedTransform.h
index 73e0d8cd013..ade76b2f304 100644
--- a/src/Processors/Transforms/MergingAggregatedTransform.h
+++ b/src/Processors/Transforms/MergingAggregatedTransform.h
@@ -21,7 +21,7 @@ protected:
 
 private:
     AggregatingTransformParamsPtr params;
-    Poco::Logger * log = &Poco::Logger::get("MergingAggregatedTransform");
+    LoggerPtr log = getLogger("MergingAggregatedTransform");
     size_t max_threads;
 
     AggregatedDataVariants data_variants;
diff --git a/src/Processors/Transforms/PasteJoinTransform.cpp b/src/Processors/Transforms/PasteJoinTransform.cpp
index ff3e2fb85e5..d2fa7eed256 100644
--- a/src/Processors/Transforms/PasteJoinTransform.cpp
+++ b/src/Processors/Transforms/PasteJoinTransform.cpp
@@ -33,7 +33,7 @@ PasteJoinAlgorithm::PasteJoinAlgorithm(
     size_t max_block_size_)
     : table_join(table_join_)
     , max_block_size(max_block_size_)
-    , log(&Poco::Logger::get("PasteJoinAlgorithm"))
+    , log(getLogger("PasteJoinAlgorithm"))
 {
     if (input_headers.size() != 2)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "PasteJoinAlgorithm requires exactly two inputs");
@@ -117,7 +117,7 @@ PasteJoinTransform::PasteJoinTransform(
         /* always_read_till_end_= */ false,
         /* empty_chunk_on_finish_= */ true,
         table_join, input_headers, max_block_size)
-    , log(&Poco::Logger::get("PasteJoinTransform"))
+    , log(getLogger("PasteJoinTransform"))
 {
     LOG_TRACE(log, "Use PasteJoinTransform");
 }
diff --git a/src/Processors/Transforms/PasteJoinTransform.h b/src/Processors/Transforms/PasteJoinTransform.h
index 7ecf70e18dc..6a7e65ee27c 100644
--- a/src/Processors/Transforms/PasteJoinTransform.h
+++ b/src/Processors/Transforms/PasteJoinTransform.h
@@ -32,9 +32,9 @@ public:
     explicit PasteJoinAlgorithm(JoinPtr table_join, const Blocks & input_headers, size_t max_block_size_);
 
     const char * getName() const override { return "PasteJoinAlgorithm"; }
-    virtual void initialize(Inputs inputs) override;
-    virtual void consume(Input & input, size_t source_num) override;
-    virtual Status merge() override;
+    void initialize(Inputs inputs) override;
+    void consume(Input & input, size_t source_num) override;
+    Status merge() override;
 
     void logElapsed(double seconds);
 
@@ -61,7 +61,7 @@ private:
 
     Statistic stat;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     UInt64 last_used_row[2] = {0, 0};
 };
 
@@ -82,7 +82,7 @@ public:
 protected:
     void onFinish() override;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Processors/Transforms/RollupTransform.cpp b/src/Processors/Transforms/RollupTransform.cpp
index a5d67fb2f15..bc5a7aeb7bf 100644
--- a/src/Processors/Transforms/RollupTransform.cpp
+++ b/src/Processors/Transforms/RollupTransform.cpp
@@ -57,7 +57,8 @@ Chunk GroupByModifierTransform::merge(Chunks && chunks, bool is_input, bool fina
     for (auto & chunk : chunks)
         blocks.emplace_back(header.cloneWithColumns(chunk.detachColumns()));
 
-    auto current_block = is_input ? params->aggregator.mergeBlocks(blocks, final) : output_aggregator->mergeBlocks(blocks, final);
+    auto & aggregator = is_input ? params->aggregator : *output_aggregator;
+    auto current_block = aggregator.mergeBlocks(blocks, final, is_cancelled);
     auto num_rows = current_block.rows();
     return Chunk(current_block.getColumns(), num_rows);
 }
diff --git a/src/Processors/Transforms/SelectByIndicesTransform.h b/src/Processors/Transforms/SelectByIndicesTransform.h
new file mode 100644
index 00000000000..480ab1a0f61
--- /dev/null
+++ b/src/Processors/Transforms/SelectByIndicesTransform.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <memory>
+#include <Processors/ISimpleTransform.h>
+#include <Processors/Merges/Algorithms/ReplacingSortedAlgorithm.h>
+#include <Common/Exception.h>
+
+namespace ErrorCodes
+{
+    extern const int LOGICAL_ERROR;
+}
+
+namespace DB
+{
+
+class SelectByIndicesTransform : public ISimpleTransform
+{
+public:
+    explicit SelectByIndicesTransform(const Block & header)
+        : ISimpleTransform(header, header, true)
+    {
+    }
+
+    String getName() const override { return "SelectByIndicesTransform"; }
+
+    void transform(Chunk & chunk) override
+    {
+        size_t num_rows = chunk.getNumRows();
+        const auto * select_final_indices_info = typeid_cast<const ChunkSelectFinalIndices *>(chunk.getChunkInfo().get());
+
+        if (!select_final_indices_info || !select_final_indices_info->select_final_indices)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Chunk passed to SelectByIndicesTransform without indices column");
+
+        const auto & index_column = select_final_indices_info->select_final_indices;
+
+        if (index_column->size() != num_rows)
+        {
+            auto columns = chunk.detachColumns();
+            for (auto & column : columns)
+                column = column->index(*index_column, 0);
+
+            chunk.setColumns(std::move(columns), index_column->size());
+        }
+        chunk.setChunkInfo(nullptr);
+    }
+};
+
+}
diff --git a/src/Processors/Transforms/TTLCalcTransform.cpp b/src/Processors/Transforms/TTLCalcTransform.cpp
index 31fb61239ef..0e55507cb3a 100644
--- a/src/Processors/Transforms/TTLCalcTransform.cpp
+++ b/src/Processors/Transforms/TTLCalcTransform.cpp
@@ -4,7 +4,24 @@
 namespace DB
 {
 
+static TTLExpressions getExpressions(const TTLDescription & ttl_descr, PreparedSets::Subqueries & subqueries_for_sets, const ContextPtr & context)
+{
+    auto expr = ttl_descr.buildExpression(context);
+    auto expr_queries = expr.sets->getSubqueries();
+    subqueries_for_sets.insert(subqueries_for_sets.end(), expr_queries.begin(), expr_queries.end());
+
+    auto where_expr = ttl_descr.buildWhereExpression(context);
+    if (where_expr.sets)
+    {
+        auto where_expr_queries = where_expr.sets->getSubqueries();
+        subqueries_for_sets.insert(subqueries_for_sets.end(), where_expr_queries.begin(), where_expr_queries.end());
+    }
+
+    return {expr.expression, where_expr.expression};
+}
+
 TTLCalcTransform::TTLCalcTransform(
+    const ContextPtr & context,
     const Block & header_,
     const MergeTreeData & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
@@ -13,7 +30,7 @@ TTLCalcTransform::TTLCalcTransform(
     bool force_)
     : IAccumulatingTransform(header_, header_)
     , data_part(data_part_)
-    , log(&Poco::Logger::get(storage_.getLogName() + " (TTLCalcTransform)"))
+    , log(getLogger(storage_.getLogName() + " (TTLCalcTransform)"))
 {
     auto old_ttl_infos = data_part->ttl_infos;
 
@@ -21,33 +38,39 @@ TTLCalcTransform::TTLCalcTransform(
     {
         const auto & rows_ttl = metadata_snapshot_->getRowsTTL();
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            rows_ttl, TTLUpdateField::TABLE_TTL, rows_ttl.result_column, old_ttl_infos.table_ttl, current_time_, force_));
+            getExpressions(rows_ttl, subqueries_for_sets, context), rows_ttl,
+            TTLUpdateField::TABLE_TTL, rows_ttl.result_column, old_ttl_infos.table_ttl, current_time_, force_));
     }
 
     for (const auto & where_ttl : metadata_snapshot_->getRowsWhereTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            where_ttl, TTLUpdateField::ROWS_WHERE_TTL, where_ttl.result_column, old_ttl_infos.rows_where_ttl[where_ttl.result_column], current_time_, force_));
+            getExpressions(where_ttl, subqueries_for_sets, context), where_ttl,
+            TTLUpdateField::ROWS_WHERE_TTL, where_ttl.result_column, old_ttl_infos.rows_where_ttl[where_ttl.result_column], current_time_, force_));
 
     for (const auto & group_by_ttl : metadata_snapshot_->getGroupByTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            group_by_ttl, TTLUpdateField::GROUP_BY_TTL, group_by_ttl.result_column, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_));
+            getExpressions(group_by_ttl, subqueries_for_sets, context), group_by_ttl,
+            TTLUpdateField::GROUP_BY_TTL, group_by_ttl.result_column, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_));
 
     if (metadata_snapshot_->hasAnyColumnTTL())
     {
         for (const auto & [name, description] : metadata_snapshot_->getColumnTTLs())
         {
             algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-                description, TTLUpdateField::COLUMNS_TTL, name, old_ttl_infos.columns_ttl[name], current_time_, force_));
+                getExpressions(description, subqueries_for_sets, context), description,
+                TTLUpdateField::COLUMNS_TTL, name, old_ttl_infos.columns_ttl[name], current_time_, force_));
         }
     }
 
     for (const auto & move_ttl : metadata_snapshot_->getMoveTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            move_ttl, TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
+            getExpressions(move_ttl, subqueries_for_sets, context), move_ttl,
+            TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
 
     for (const auto & recompression_ttl : metadata_snapshot_->getRecompressionTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            recompression_ttl, TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
+            getExpressions(recompression_ttl, subqueries_for_sets, context), recompression_ttl,
+            TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
 }
 
 void TTLCalcTransform::consume(Chunk chunk)
diff --git a/src/Processors/Transforms/TTLCalcTransform.h b/src/Processors/Transforms/TTLCalcTransform.h
index 495879400dc..37b378bc5de 100644
--- a/src/Processors/Transforms/TTLCalcTransform.h
+++ b/src/Processors/Transforms/TTLCalcTransform.h
@@ -15,6 +15,7 @@ class TTLCalcTransform : public IAccumulatingTransform
 {
 public:
     TTLCalcTransform(
+        const ContextPtr & context,
         const Block & header_,
         const MergeTreeData & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
@@ -23,6 +24,8 @@ public:
         bool force_
     );
 
+    PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); }
+
     String getName() const override { return "TTL_CALC"; }
     Status prepare() override;
 
@@ -35,10 +38,11 @@ protected:
 
 private:
     std::vector<TTLAlgorithmPtr> algorithms;
+    PreparedSets::Subqueries subqueries_for_sets;
 
     /// ttl_infos and empty_columns are updating while reading
     const MergeTreeData::MutableDataPartPtr & data_part;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Processors/Transforms/TTLTransform.cpp b/src/Processors/Transforms/TTLTransform.cpp
index 7cde86098c7..42b932becec 100644
--- a/src/Processors/Transforms/TTLTransform.cpp
+++ b/src/Processors/Transforms/TTLTransform.cpp
@@ -16,7 +16,24 @@
 namespace DB
 {
 
+static TTLExpressions getExpressions(const TTLDescription & ttl_descr, PreparedSets::Subqueries & subqueries_for_sets, const ContextPtr & context)
+{
+    auto expr = ttl_descr.buildExpression(context);
+    auto expr_queries = expr.sets->getSubqueries();
+    subqueries_for_sets.insert(subqueries_for_sets.end(), expr_queries.begin(), expr_queries.end());
+
+    auto where_expr = ttl_descr.buildWhereExpression(context);
+    if (where_expr.sets)
+    {
+        auto where_expr_queries = where_expr.sets->getSubqueries();
+        subqueries_for_sets.insert(subqueries_for_sets.end(), where_expr_queries.begin(), where_expr_queries.end());
+    }
+
+    return {expr.expression, where_expr.expression};
+}
+
 TTLTransform::TTLTransform(
+    const ContextPtr & context,
     const Block & header_,
     const MergeTreeData & storage_,
     const StorageMetadataPtr & metadata_snapshot_,
@@ -25,7 +42,7 @@ TTLTransform::TTLTransform(
     bool force_)
     : IAccumulatingTransform(header_, header_)
     , data_part(data_part_)
-    , log(&Poco::Logger::get(storage_.getLogName() + " (TTLTransform)"))
+    , log(getLogger(storage_.getLogName() + " (TTLTransform)"))
 {
     auto old_ttl_infos = data_part->ttl_infos;
 
@@ -33,10 +50,11 @@ TTLTransform::TTLTransform(
     {
         const auto & rows_ttl = metadata_snapshot_->getRowsTTL();
         auto algorithm = std::make_unique<TTLDeleteAlgorithm>(
-            rows_ttl, old_ttl_infos.table_ttl, current_time_, force_);
+            getExpressions(rows_ttl, subqueries_for_sets, context), rows_ttl,
+            old_ttl_infos.table_ttl, current_time_, force_);
 
         /// Skip all data if table ttl is expired for part
-        if (algorithm->isMaxTTLExpired() && !rows_ttl.where_expression)
+        if (algorithm->isMaxTTLExpired() && !rows_ttl.where_expression_ast)
             all_data_dropped = true;
 
         delete_algorithm = algorithm.get();
@@ -45,11 +63,13 @@ TTLTransform::TTLTransform(
 
     for (const auto & where_ttl : metadata_snapshot_->getRowsWhereTTLs())
         algorithms.emplace_back(std::make_unique<TTLDeleteAlgorithm>(
-            where_ttl, old_ttl_infos.rows_where_ttl[where_ttl.result_column], current_time_, force_));
+            getExpressions(where_ttl, subqueries_for_sets, context), where_ttl,
+            old_ttl_infos.rows_where_ttl[where_ttl.result_column], current_time_, force_));
 
     for (const auto & group_by_ttl : metadata_snapshot_->getGroupByTTLs())
         algorithms.emplace_back(std::make_unique<TTLAggregationAlgorithm>(
-                group_by_ttl, old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_,
+                getExpressions(group_by_ttl, subqueries_for_sets, context), group_by_ttl,
+                old_ttl_infos.group_by_ttl[group_by_ttl.result_column], current_time_, force_,
                 getInputPort().getHeader(), storage_));
 
     if (metadata_snapshot_->hasAnyColumnTTL())
@@ -75,18 +95,21 @@ TTLTransform::TTLTransform(
             }
 
             algorithms.emplace_back(std::make_unique<TTLColumnAlgorithm>(
-                description, old_ttl_infos.columns_ttl[name], current_time_,
+                getExpressions(description, subqueries_for_sets, context), description,
+                old_ttl_infos.columns_ttl[name], current_time_,
                 force_, name, default_expression, default_column_name, isCompactPart(data_part)));
         }
     }
 
     for (const auto & move_ttl : metadata_snapshot_->getMoveTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            move_ttl, TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
+            getExpressions(move_ttl, subqueries_for_sets, context), move_ttl,
+            TTLUpdateField::MOVES_TTL, move_ttl.result_column, old_ttl_infos.moves_ttl[move_ttl.result_column], current_time_, force_));
 
     for (const auto & recompression_ttl : metadata_snapshot_->getRecompressionTTLs())
         algorithms.emplace_back(std::make_unique<TTLUpdateInfoAlgorithm>(
-            recompression_ttl, TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
+            getExpressions(recompression_ttl, subqueries_for_sets, context), recompression_ttl,
+            TTLUpdateField::RECOMPRESSION_TTL, recompression_ttl.result_column, old_ttl_infos.recompression_ttl[recompression_ttl.result_column], current_time_, force_));
 }
 
 Block reorderColumns(Block block, const Block & header)
diff --git a/src/Processors/Transforms/TTLTransform.h b/src/Processors/Transforms/TTLTransform.h
index 3f0dffd1998..57563116711 100644
--- a/src/Processors/Transforms/TTLTransform.h
+++ b/src/Processors/Transforms/TTLTransform.h
@@ -16,6 +16,7 @@ class TTLTransform : public IAccumulatingTransform
 {
 public:
     TTLTransform(
+        const ContextPtr & context,
         const Block & header_,
         const MergeTreeData & storage_,
         const StorageMetadataPtr & metadata_snapshot_,
@@ -28,6 +29,8 @@ public:
 
     Status prepare() override;
 
+    PreparedSets::Subqueries getSubqueries() { return std::move(subqueries_for_sets); }
+
 protected:
     void consume(Chunk chunk) override;
     Chunk generate() override;
@@ -40,9 +43,11 @@ private:
     const TTLDeleteAlgorithm * delete_algorithm = nullptr;
     bool all_data_dropped = false;
 
+    PreparedSets::Subqueries subqueries_for_sets;
+
     /// ttl_infos and empty_columns are updating while reading
     const MergeTreeData::MutableDataPartPtr & data_part;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Processors/Transforms/WindowTransform.cpp b/src/Processors/Transforms/WindowTransform.cpp
index 47b5b900400..f43b9a2e794 100644
--- a/src/Processors/Transforms/WindowTransform.cpp
+++ b/src/Processors/Transforms/WindowTransform.cpp
@@ -1,22 +1,23 @@
-#include <Processors/Transforms/WindowTransform.h>
-
-#include <limits>
-
 #include <AggregateFunctions/AggregateFunctionFactory.h>
+#include <Columns/ColumnAggregateFunction.h>
+#include <Columns/ColumnConst.h>
+#include <Columns/ColumnLowCardinality.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeDateTime64.h>
+#include <DataTypes/DataTypeInterval.h>
+#include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/getLeastSupertype.h>
+#include <Functions/FunctionHelpers.h>
+#include <Interpreters/ExpressionActions.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Processors/Transforms/WindowTransform.h>
+#include <base/arithmeticOverflow.h>
 #include <Common/Arena.h>
 #include <Common/FieldVisitorConvertToNumber.h>
 #include <Common/FieldVisitorsAccurateComparison.h>
-#include <Columns/ColumnLowCardinality.h>
-#include <base/arithmeticOverflow.h>
-#include <Columns/ColumnConst.h>
-#include <Columns/ColumnAggregateFunction.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/getLeastSupertype.h>
-#include <DataTypes/DataTypeLowCardinality.h>
-#include <DataTypes/DataTypeInterval.h>
-#include <Interpreters/ExpressionActions.h>
-#include <Interpreters/convertFieldToType.h>
-#include <DataTypes/DataTypeDateTime64.h>
+
+#include <limits>
 
 
 /// See https://fmt.dev/latest/api.html#formatting-user-defined-types
@@ -172,6 +173,79 @@ static int compareValuesWithOffsetFloat(const IColumn * _compared_column,
     return result;
 }
 
+// Helper macros to dispatch on type of the ORDER BY column
+#define APPLY_FOR_ONE_NEST_TYPE(FUNCTION, TYPE) \
+else if (typeid_cast<const TYPE *>(nest_compared_column.get())) \
+{ \
+    /* clang-tidy you're dumb, I can't put FUNCTION in braces here. */ \
+    nest_compare_function = FUNCTION<TYPE>; /* NOLINT */ \
+}
+
+#define APPLY_FOR_NEST_TYPES(FUNCTION) \
+if (false) /* NOLINT */ \
+{ \
+    /* Do nothing, a starter condition. */ \
+} \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<UInt8>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<UInt16>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<UInt32>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<UInt64>) \
+\
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<Int8>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<Int16>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<Int32>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<Int64>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION, ColumnVector<Int128>) \
+\
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION##Float, ColumnVector<Float32>) \
+APPLY_FOR_ONE_NEST_TYPE(FUNCTION##Float, ColumnVector<Float64>) \
+\
+else \
+{ \
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, \
+        "The RANGE OFFSET frame for '{}' ORDER BY nest column is not implemented", \
+        demangle(typeid(nest_compared_column).name())); \
+}
+
+// A specialization of compareValuesWithOffset for nullable.
+template <typename ColumnType>
+static int compareValuesWithOffsetNullable(const IColumn * _compared_column,
+    size_t compared_row, const IColumn * _reference_column,
+    size_t reference_row,
+    const Field & _offset,
+    bool offset_is_preceding)
+{
+    const auto * compared_column = assert_cast<const ColumnType *>(
+        _compared_column);
+    const auto * reference_column = assert_cast<const ColumnType *>(
+        _reference_column);
+
+    if (compared_column->isNullAt(compared_row) && !reference_column->isNullAt(reference_row))
+    {
+        return -1;
+    }
+    else if (compared_column->isNullAt(compared_row) && reference_column->isNullAt(reference_row))
+    {
+        return 0;
+    }
+    else if (!compared_column->isNullAt(compared_row) && reference_column->isNullAt(reference_row))
+    {
+        return 1;
+    }
+
+    ColumnPtr nest_compared_column = compared_column->getNestedColumnPtr();
+    ColumnPtr nest_reference_column = reference_column->getNestedColumnPtr();
+
+    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)> nest_compare_function;
+    APPLY_FOR_NEST_TYPES(compareValuesWithOffset)
+    return nest_compare_function(nest_compared_column.get(), compared_row,
+        nest_reference_column.get(), reference_row, _offset, offset_is_preceding);
+}
+
 // Helper macros to dispatch on type of the ORDER BY column
 #define APPLY_FOR_ONE_TYPE(FUNCTION, TYPE) \
 else if (typeid_cast<const TYPE *>(column)) \
@@ -199,6 +273,7 @@ APPLY_FOR_ONE_TYPE(FUNCTION, ColumnVector<Int128>) \
 APPLY_FOR_ONE_TYPE(FUNCTION##Float, ColumnVector<Float32>) \
 APPLY_FOR_ONE_TYPE(FUNCTION##Float, ColumnVector<Float64>) \
 \
+APPLY_FOR_ONE_TYPE(FUNCTION##Nullable, ColumnNullable) \
 else \
 { \
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, \
diff --git a/src/Processors/Transforms/WindowTransform.h b/src/Processors/Transforms/WindowTransform.h
index 347c2516230..43fa6b28019 100644
--- a/src/Processors/Transforms/WindowTransform.h
+++ b/src/Processors/Transforms/WindowTransform.h
@@ -21,6 +21,8 @@ using ExpressionActionsPtr = std::shared_ptr<ExpressionActions>;
 
 class Arena;
 
+class IWindowFunction;
+
 // Runtime data for computing one window function.
 struct WindowFunctionWorkspace
 {
diff --git a/src/Processors/Transforms/buildPushingToViewsChain.cpp b/src/Processors/Transforms/buildPushingToViewsChain.cpp
index 71d652e74d0..aa5a1c0cc1a 100644
--- a/src/Processors/Transforms/buildPushingToViewsChain.cpp
+++ b/src/Processors/Transforms/buildPushingToViewsChain.cpp
@@ -5,6 +5,7 @@
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Processors/Transforms/CountingTransform.h>
 #include <Processors/Transforms/SquashingChunksTransform.h>
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
@@ -65,7 +66,6 @@ struct ViewsData
     StorageID source_storage_id;
     StorageMetadataPtr source_metadata_snapshot;
     StoragePtr source_storage;
-    /// This value is actually only for logs.
     size_t max_threads = 1;
 
     /// In case of exception happened while inserting into main table, it is pushed to pipeline.
@@ -187,6 +187,244 @@ private:
     std::exception_ptr any_exception;
 };
 
+/// Generates one chain part for every view in buildPushingToViewsChain
+std::optional<Chain> generateViewChain(
+    ContextPtr context,
+    const StorageID & view_id,
+    ThreadGroupPtr running_group,
+    Chain & result_chain,
+    ViewsDataPtr views_data,
+    ThreadStatusesHolderPtr thread_status_holder,
+    bool async_insert,
+    const Block & storage_header,
+    bool disable_deduplication_for_children)
+{
+    auto view = DatabaseCatalog::instance().tryGetTable(view_id, context);
+    if (view == nullptr)
+    {
+        LOG_WARNING(
+            getLogger("PushingToViews"), "Trying to access table {} but it doesn't exist", view_id.getFullTableName());
+        return std::nullopt;
+    }
+
+    auto view_metadata_snapshot = view->getInMemoryMetadataPtr();
+    auto select_context = view_metadata_snapshot->getSQLSecurityOverriddenContext(context);
+    select_context->setQueryAccessInfo(context->getQueryAccessInfoPtr());
+
+    auto insert_context = Context::createCopy(select_context);
+
+    const auto & insert_settings = insert_context->getSettingsRef();
+
+    // Do not deduplicate insertions into MV if the main insertion is Ok
+    if (disable_deduplication_for_children)
+    {
+        insert_context->setSetting("insert_deduplicate", Field{false});
+    }
+    else if (insert_settings.update_insert_deduplication_token_in_dependent_materialized_views &&
+        !insert_settings.insert_deduplication_token.value.empty())
+    {
+        /** Update deduplication token passed to dependent MV with current view id. So it is possible to properly handle
+              * deduplication in complex INSERT flows.
+              *
+              * Example:
+              *
+              * landing -┬--> mv_1_1 ---> ds_1_1 ---> mv_2_1 --┬-> ds_2_1 ---> mv_3_1 ---> ds_3_1
+              *          |                                     |
+              *          └--> mv_1_2 ---> ds_1_2 ---> mv_2_2 --┘
+              *
+              * Here we want to avoid deduplication for two different blocks generated from `mv_2_1` and `mv_2_2` that will
+              * be inserted into `ds_2_1`.
+              *
+              * We are forced to use view id instead of table id because there are some possible INSERT flows where no tables
+              * are involved.
+              *
+              * Example:
+              *
+              * landing -┬--> mv_1_1 --┬-> ds_1_1
+              *          |             |
+              *          └--> mv_1_2 --┘
+              *
+              */
+        auto insert_deduplication_token = insert_settings.insert_deduplication_token.value;
+
+        if (view_id.hasUUID())
+            insert_deduplication_token += "_" + toString(view_id.uuid);
+        else
+            insert_deduplication_token += "_" + view_id.getFullNameNotQuoted();
+
+        insert_context->setSetting("insert_deduplication_token", insert_deduplication_token);
+    }
+
+    // Processing of blocks for MVs is done block by block, and there will
+    // be no parallel reading after (plus it is not a costless operation)
+    select_context->setSetting("parallelize_output_from_storages", Field{false});
+
+    // Separate min_insert_block_size_rows/min_insert_block_size_bytes for children
+    if (insert_settings.min_insert_block_size_rows_for_materialized_views)
+        insert_context->setSetting("min_insert_block_size_rows", insert_settings.min_insert_block_size_rows_for_materialized_views.value);
+    if (insert_settings.min_insert_block_size_bytes_for_materialized_views)
+        insert_context->setSetting("min_insert_block_size_bytes", insert_settings.min_insert_block_size_bytes_for_materialized_views.value);
+
+    ASTPtr query;
+    Chain out;
+
+    /// 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,
+    /// and switch back to the original thread_status.
+    auto * original_thread = current_thread;
+    SCOPE_EXIT({ current_thread = original_thread; });
+    current_thread = nullptr;
+    std::unique_ptr<ThreadStatus> view_thread_status_ptr = std::make_unique<ThreadStatus>(/*check_current_thread_on_destruction=*/ false);
+    /// Copy of a ThreadStatus should be internal.
+    view_thread_status_ptr->setInternalThread();
+    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));
+
+    auto runtime_stats = std::make_unique<QueryViewsLogElement::ViewRuntimeStats>();
+    runtime_stats->target_name = view_id.getFullTableName();
+    runtime_stats->thread_status = view_thread_status;
+    runtime_stats->event_time = std::chrono::system_clock::now();
+    runtime_stats->event_status = QueryViewsLogElement::ViewStatus::EXCEPTION_BEFORE_START;
+
+    auto & type = runtime_stats->type;
+    auto & target_name = runtime_stats->target_name;
+    auto * view_counter_ms = &runtime_stats->elapsed_ms;
+
+    if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(view.get()))
+    {
+        auto lock = materialized_view->tryLockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout);
+
+        if (lock == nullptr)
+        {
+            // In case the materialized view is dropped/detached at this point, we register a warning and ignore it
+            assert(materialized_view->is_dropped || materialized_view->is_detached);
+            LOG_WARNING(
+                getLogger("PushingToViews"), "Trying to access table {} but it doesn't exist", view_id.getFullTableName());
+            return std::nullopt;
+        }
+
+        type = QueryViewsLogElement::ViewType::MATERIALIZED;
+        result_chain.addTableLock(lock);
+
+        StoragePtr inner_table = materialized_view->tryGetTargetTable();
+        /// If target table was dropped, ignore this materialized view.
+        if (!inner_table)
+        {
+            if (context->getSettingsRef().ignore_materialized_views_with_dropped_target_table)
+                return std::nullopt;
+
+            throw Exception(
+                ErrorCodes::UNKNOWN_TABLE,
+                "Target table '{}' of view '{}' doesn't exists. To ignore this view use setting "
+                "ignore_materialized_views_with_dropped_target_table",
+                materialized_view->getTargetTableId().getFullTableName(),
+                view_id.getFullTableName());
+        }
+
+        auto inner_table_id = inner_table->getStorageID();
+        auto inner_metadata_snapshot = inner_table->getInMemoryMetadataPtr();
+
+        const auto & select_query = view_metadata_snapshot->getSelectQuery();
+        if (select_query.select_table_id != views_data->source_storage_id)
+        {
+            /// It may happen if materialize view query was changed and it doesn't depend on this source table anymore.
+            /// See setting `allow_experimental_alter_materialized_view_structure`
+            LOG_DEBUG(
+                getLogger("PushingToViews"), "Table '{}' is not a source for view '{}' anymore, current source is '{}'",
+                select_query.select_table_id.getFullTableName(), view_id.getFullTableName(), views_data->source_storage_id);
+            return std::nullopt;
+        }
+
+        query = select_query.inner_query;
+
+        target_name = inner_table_id.getFullTableName();
+
+        Block header;
+
+        /// Get list of columns we get from select query.
+        if (select_context->getSettingsRef().allow_experimental_analyzer)
+            header = InterpreterSelectQueryAnalyzer::getSampleBlock(query, select_context);
+        else
+            header = InterpreterSelectQuery(query, select_context, SelectQueryOptions()).getSampleBlock();
+
+        /// Insert only columns returned by select.
+        Names insert_columns;
+        const auto & inner_table_columns = inner_metadata_snapshot->getColumns();
+        for (const auto & column : header)
+        {
+            /// But skip columns which storage doesn't have.
+            if (inner_table_columns.hasNotAlias(column.name))
+                insert_columns.emplace_back(column.name);
+        }
+
+        InterpreterInsertQuery interpreter(nullptr, insert_context, false, false, false);
+        out = interpreter.buildChain(inner_table, inner_metadata_snapshot, insert_columns, thread_status_holder, view_counter_ms, !materialized_view->hasInnerTable());
+
+        if (interpreter.shouldAddSquashingFroStorage(inner_table))
+        {
+            bool table_prefers_large_blocks = inner_table->prefersLargeBlocks();
+            const auto & settings = insert_context->getSettingsRef();
+
+            out.addSource(std::make_shared<SquashingChunksTransform>(
+                out.getInputHeader(),
+                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(), current_thread, insert_context->getQuota());
+        counting->setProcessListElement(insert_context->getProcessListElement());
+        counting->setProgressCallback(insert_context->getProgressCallback());
+        out.addSource(std::move(counting));
+
+        out.addStorageHolder(view);
+        out.addStorageHolder(inner_table);
+    }
+    else if (auto * live_view = dynamic_cast<StorageLiveView *>(view.get()))
+    {
+        runtime_stats->type = QueryViewsLogElement::ViewType::LIVE;
+        query = live_view->getInnerQuery();
+        out = buildPushingToViewsChain(
+            view, view_metadata_snapshot, insert_context, ASTPtr(),
+            /* no_destination= */ true,
+            thread_status_holder, running_group, view_counter_ms, async_insert, storage_header);
+    }
+    else if (auto * window_view = dynamic_cast<StorageWindowView *>(view.get()))
+    {
+        runtime_stats->type = QueryViewsLogElement::ViewType::WINDOW;
+        query = window_view->getMergeableQuery();
+        out = buildPushingToViewsChain(
+            view, view_metadata_snapshot, insert_context, ASTPtr(),
+            /* no_destination= */ true,
+            thread_status_holder, running_group, view_counter_ms, async_insert);
+    }
+    else
+        out = buildPushingToViewsChain(
+            view, view_metadata_snapshot, insert_context, ASTPtr(),
+            /* no_destination= */ false,
+            thread_status_holder, running_group, view_counter_ms, async_insert);
+
+    views_data->views.emplace_back(ViewRuntimeData{
+        std::move(query),
+        out.getInputHeader(),
+        view_id,
+        nullptr,
+        std::move(runtime_stats)});
+
+    if (type == QueryViewsLogElement::ViewType::MATERIALIZED)
+    {
+        auto executing_inner_query = std::make_shared<ExecutingInnerQueryFromViewTransform>(
+            storage_header, views_data->views.back(), views_data);
+        executing_inner_query->setRuntimeData(view_thread_status, view_counter_ms);
+
+        out.addSource(std::move(executing_inner_query));
+    }
+
+    return out;
+}
+
 
 Chain buildPushingToViewsChain(
     const StoragePtr & storage,
@@ -213,7 +451,7 @@ Chain buildPushingToViewsChain(
 
     /// If we don't write directly to the destination
     /// then expect that we're inserting with precalculated virtual columns
-    auto storage_header = no_destination ? metadata_snapshot->getSampleBlockWithVirtuals(storage->getVirtuals())
+    auto storage_header = no_destination ? metadata_snapshot->getSampleBlockWithVirtuals(storage->getVirtualsList())
                                          : metadata_snapshot->getSampleBlock();
 
     /** TODO This is a very important line. At any insertion into the table one of chains should own lock.
@@ -231,200 +469,45 @@ Chain buildPushingToViewsChain(
     auto table_id = storage->getStorageID();
     auto views = DatabaseCatalog::instance().getDependentViews(table_id);
 
-    /// We need special context for materialized views insertions
-    ContextMutablePtr select_context;
-    ContextMutablePtr insert_context;
     ViewsDataPtr views_data;
     if (!views.empty())
     {
-        select_context = Context::createCopy(context);
-        insert_context = Context::createCopy(context);
-
-        const auto & insert_settings = insert_context->getSettingsRef();
-
-        // Do not deduplicate insertions into MV if the main insertion is Ok
-        if (disable_deduplication_for_children)
-            insert_context->setSetting("insert_deduplicate", Field{false});
-
-        // Processing of blocks for MVs is done block by block, and there will
-        // be no parallel reading after (plus it is not a costless operation)
-        select_context->setSetting("parallelize_output_from_storages", Field{false});
-
-        // Separate min_insert_block_size_rows/min_insert_block_size_bytes for children
-        if (insert_settings.min_insert_block_size_rows_for_materialized_views)
-            insert_context->setSetting("min_insert_block_size_rows", insert_settings.min_insert_block_size_rows_for_materialized_views.value);
-        if (insert_settings.min_insert_block_size_bytes_for_materialized_views)
-            insert_context->setSetting("min_insert_block_size_bytes", insert_settings.min_insert_block_size_bytes_for_materialized_views.value);
-
-        views_data = std::make_shared<ViewsData>(thread_status_holder, select_context, table_id, metadata_snapshot, storage);
+        auto process_context = Context::createCopy(context);  /// This context will be used in `process` function
+        views_data = std::make_shared<ViewsData>(thread_status_holder, process_context, table_id, metadata_snapshot, storage);
     }
 
     std::vector<Chain> chains;
 
     for (const auto & view_id : views)
     {
-        auto view = DatabaseCatalog::instance().tryGetTable(view_id, context);
-        if (view == nullptr)
+        try
         {
-            LOG_WARNING(
-                &Poco::Logger::get("PushingToViews"), "Trying to access table {} but it doesn't exist", view_id.getFullTableName());
-            continue;
-        }
+            auto out = generateViewChain(
+                context, view_id, running_group, result_chain,
+                views_data, thread_status_holder, async_insert, storage_header, disable_deduplication_for_children);
 
-        auto view_metadata_snapshot = view->getInMemoryMetadataPtr();
-
-        ASTPtr query;
-        Chain out;
-
-        /// 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,
-        /// and switch back to the original thread_status.
-        auto * original_thread = current_thread;
-        SCOPE_EXIT({ current_thread = original_thread; });
-        current_thread = nullptr;
-        std::unique_ptr<ThreadStatus> view_thread_status_ptr = std::make_unique<ThreadStatus>(/*check_current_thread_on_destruction=*/ false);
-        /// Copy of a ThreadStatus should be internal.
-        view_thread_status_ptr->setInternalThread();
-        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));
-
-        auto runtime_stats = std::make_unique<QueryViewsLogElement::ViewRuntimeStats>();
-        runtime_stats->target_name = view_id.getFullTableName();
-        runtime_stats->thread_status = view_thread_status;
-        runtime_stats->event_time = std::chrono::system_clock::now();
-        runtime_stats->event_status = QueryViewsLogElement::ViewStatus::EXCEPTION_BEFORE_START;
-
-        auto & type = runtime_stats->type;
-        auto & target_name = runtime_stats->target_name;
-        auto * view_counter_ms = &runtime_stats->elapsed_ms;
-
-        if (auto * materialized_view = dynamic_cast<StorageMaterializedView *>(view.get()))
-        {
-            auto lock = materialized_view->tryLockForShare(context->getInitialQueryId(), context->getSettingsRef().lock_acquire_timeout);
-
-            if (lock == nullptr)
-            {
-                // In case the materialized view is dropped/detached at this point, we register a warning and ignore it
-                assert(materialized_view->is_dropped || materialized_view->is_detached);
-                LOG_WARNING(
-                    &Poco::Logger::get("PushingToViews"), "Trying to access table {} but it doesn't exist", view_id.getFullTableName());
+            if (!out.has_value())
                 continue;
-            }
 
-            type = QueryViewsLogElement::ViewType::MATERIALIZED;
-            result_chain.addTableLock(lock);
+            chains.emplace_back(std::move(*out));
 
-            StoragePtr inner_table = materialized_view->tryGetTargetTable();
-            /// If target table was dropped, ignore this materialized view.
-            if (!inner_table)
+            /// Add the view to the query access info so it can appear in system.query_log
+            /// hasQueryContext - for materialized tables with background replication process query context is not added
+            if (!no_destination && context->hasQueryContext())
             {
-                if (context->getSettingsRef().ignore_materialized_views_with_dropped_target_table)
-                    continue;
+                context->getQueryContext()->addQueryAccessInfo(
+                    backQuoteIfNeed(view_id.getDatabaseName()),
+                    views_data->views.back().runtime_stats->target_name,
+                    /*column_names=*/ {});
 
-                throw Exception(
-                    ErrorCodes::UNKNOWN_TABLE,
-                    "Target table '{}' of view '{}' doesn't exists. To ignore this view use setting "
-                    "ignore_materialized_views_with_dropped_target_table",
-                    materialized_view->getTargetTableId().getFullTableName(),
-                    view_id.getFullTableName());
+                context->getQueryContext()->addViewAccessInfo(view_id.getFullTableName());
             }
-
-            auto inner_table_id = inner_table->getStorageID();
-            auto inner_metadata_snapshot = inner_table->getInMemoryMetadataPtr();
-
-            const auto & select_query = view_metadata_snapshot->getSelectQuery();
-            if (select_query.select_table_id != table_id)
-            {
-                /// It may happen if materialize view query was changed and it doesn't depend on this source table anymore.
-                /// See setting `allow_experimental_alter_materialized_view_structure`
-                LOG_DEBUG(
-                    &Poco::Logger::get("PushingToViews"), "Table '{}' is not a source for view '{}' anymore, current source is '{}'",
-                        select_query.select_table_id.getFullTableName(), view_id.getFullTableName(), table_id);
-                continue;
-            }
-
-            query = select_query.inner_query;
-
-            target_name = inner_table_id.getFullTableName();
-
-            Block header;
-
-            /// Get list of columns we get from select query.
-            if (select_context->getSettingsRef().allow_experimental_analyzer)
-                header = InterpreterSelectQueryAnalyzer::getSampleBlock(query, select_context);
-            else
-                header = InterpreterSelectQuery(query, select_context, SelectQueryOptions()).getSampleBlock();
-
-            /// Insert only columns returned by select.
-            Names insert_columns;
-            const auto & inner_table_columns = inner_metadata_snapshot->getColumns();
-            for (const auto & column : header)
-            {
-                /// But skip columns which storage doesn't have.
-                if (inner_table_columns.hasNotAlias(column.name))
-                    insert_columns.emplace_back(column.name);
-            }
-
-            InterpreterInsertQuery interpreter(nullptr, insert_context, false, false, false);
-            out = interpreter.buildChain(inner_table, inner_metadata_snapshot, insert_columns, thread_status_holder, view_counter_ms);
-            out.addStorageHolder(view);
-            out.addStorageHolder(inner_table);
         }
-        else if (auto * live_view = dynamic_cast<StorageLiveView *>(view.get()))
+        catch (const Exception & e)
         {
-            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(),
-                /* no_destination= */ true,
-                thread_status_holder, running_group, view_counter_ms, async_insert, 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(),
-                /* no_destination= */ true,
-                thread_status_holder, running_group, view_counter_ms, async_insert);
-        }
-        else
-            out = buildPushingToViewsChain(
-                view, view_metadata_snapshot, insert_context, ASTPtr(),
-                /* no_destination= */ false,
-                thread_status_holder, running_group, view_counter_ms, async_insert);
-
-        views_data->views.emplace_back(ViewRuntimeData{
-            std::move(query),
-            out.getInputHeader(),
-            view_id,
-            nullptr,
-            std::move(runtime_stats)});
-
-        if (type == QueryViewsLogElement::ViewType::MATERIALIZED)
-        {
-            auto executing_inner_query = std::make_shared<ExecutingInnerQueryFromViewTransform>(
-                storage_header, views_data->views.back(), views_data);
-            executing_inner_query->setRuntimeData(view_thread_status, view_counter_ms);
-
-            out.addSource(std::move(executing_inner_query));
-        }
-
-        chains.emplace_back(std::move(out));
-
-        /// Add the view to the query access info so it can appear in system.query_log
-        /// hasQueryContext - for materialized tables with background replication process query context is not added
-        if (!no_destination && context->hasQueryContext())
-        {
-            context->getQueryContext()->addQueryAccessInfo(
-                backQuoteIfNeed(view_id.getDatabaseName()),
-                views_data->views.back().runtime_stats->target_name,
-                /*column_names=*/ {});
-
-            context->getQueryContext()->addViewAccessInfo(view_id.getFullTableName());
+            LOG_ERROR(&Poco::Logger::get("PushingToViews"), "Failed to push block to view {}, {}", view_id, e.message());
+            if (!context->getSettingsRef().materialized_views_ignore_errors)
+                throw;
         }
     }
 
@@ -488,7 +571,6 @@ Chain buildPushingToViewsChain(
         result_chain.addSource(std::move(sink));
     }
 
-    /// TODO: add pushing to live view
     if (result_chain.empty())
         result_chain.addSink(std::make_shared<NullSinkToStorage>(storage_header));
 
@@ -515,18 +597,18 @@ static QueryPipeline process(Block block, ViewRuntimeData & view, const ViewsDat
         views_data.source_storage_id,
         views_data.source_metadata_snapshot->getColumns(),
         std::move(block),
-        views_data.source_storage->getVirtuals()));
+        *views_data.source_storage->getVirtualsPtr()));
 
     QueryPipelineBuilder pipeline;
 
     if (local_context->getSettingsRef().allow_experimental_analyzer)
     {
-        InterpreterSelectQueryAnalyzer interpreter(view.query, local_context, local_context->getViewSource(), SelectQueryOptions());
+        InterpreterSelectQueryAnalyzer interpreter(view.query, local_context, local_context->getViewSource(), SelectQueryOptions().ignoreAccessCheck());
         pipeline = interpreter.buildQueryPipeline();
     }
     else
     {
-        InterpreterSelectQuery interpreter(view.query, local_context, SelectQueryOptions());
+        InterpreterSelectQuery interpreter(view.query, local_context, SelectQueryOptions().ignoreAccessCheck());
         pipeline = interpreter.buildQueryPipeline();
     }
 
@@ -835,14 +917,14 @@ void FinalizingViewsTransform::work()
 
             /// 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");
+                tryLogException(view.exception, getLogger("PushingToViews"), "Cannot push to the storage, ignoring the error");
         }
         else
         {
             view.runtime_stats->setStatus(QueryViewsLogElement::ViewStatus::QUERY_FINISH);
 
             LOG_TRACE(
-                &Poco::Logger::get("PushingToViews"),
+                getLogger("PushingToViews"),
                 "Pushing ({}) from {} to {} took {} ms.",
                 views_data->max_threads <= 1 ? "sequentially" : ("parallel " + std::to_string(views_data->max_threads)),
                 views_data->source_storage_id.getNameForLogs(),
diff --git a/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
index 6c7c7447070..a2a42f27c3f 100644
--- a/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
+++ b/src/Processors/Transforms/getSourceFromASTInsertQuery.cpp
@@ -1,5 +1,6 @@
 #include <Parsers/ASTInsertQuery.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSetQuery.h>
 #include <IO/ConcatReadBuffer.h>
 #include <IO/ReadBufferFromMemory.h>
@@ -37,7 +38,7 @@ InputFormatPtr getInputFormatFromASTInsertQuery(
     const auto * ast_insert_query = ast->as<ASTInsertQuery>();
 
     if (!ast_insert_query)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: query requires data to insert, but it is not INSERT query");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Query requires data to insert, but it is not INSERT query");
 
     if (ast_insert_query->infile && context->getApplicationType() == Context::ApplicationType::SERVER)
         throw Exception(ErrorCodes::UNKNOWN_TYPE_OF_QUERY, "Query has infile and was send directly to server");
@@ -47,7 +48,7 @@ InputFormatPtr getInputFormatFromASTInsertQuery(
         if (input_function)
             throw Exception(ErrorCodes::INVALID_USAGE_OF_INPUT, "FORMAT must be specified for function input()");
         else
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: INSERT query requires format to be set");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "INSERT query requires format to be set");
     }
 
     /// Data could be in parsed (ast_insert_query.data) and in not parsed yet (input_buffer_tail_part) part of query.
@@ -105,7 +106,7 @@ std::unique_ptr<ReadBuffer> getReadBufferFromASTInsertQuery(const ASTPtr & ast)
 {
     const auto * insert_query = ast->as<ASTInsertQuery>();
     if (!insert_query)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: query requires data to insert, but it is not INSERT query");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Query requires data to insert, but it is not INSERT query");
 
     if (insert_query->infile)
     {
diff --git a/src/Processors/examples/CMakeLists.txt b/src/Processors/examples/CMakeLists.txt
deleted file mode 100644
index 5d43a0d7d08..00000000000
--- a/src/Processors/examples/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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/examples/comma_separated_streams.cpp b/src/Processors/examples/comma_separated_streams.cpp
deleted file mode 100644
index 2ec5564f346..00000000000
--- a/src/Processors/examples/comma_separated_streams.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <string>
-#include <iostream>
-#include <fstream>
-
-#include <IO/ReadBufferFromFile.h>
-#include <IO/WriteBufferFromFile.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeString.h>
-#include <Processors/Formats/Impl/HiveTextRowInputFormat.h>
-#include <Processors/Formats/Impl/CSVRowOutputFormat.h>
-#include <Formats/FormatFactory.h>
-#include <QueryPipeline/QueryPipeline.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-
-using namespace DB;
-
-int main()
-try
-{
-    Block sample;
-    {
-        // a
-        ColumnWithTypeAndName col;
-        col.name = "a";
-        col.type = std::make_shared<DataTypeInt64>();
-        sample.insert(std::move(col));
-    }
-    {
-        // b
-        ColumnWithTypeAndName col;
-        col.name = "b";
-        col.type = std::make_shared<DataTypeFloat64>();
-        sample.insert(std::move(col));
-    }
-    {
-        // c
-        ColumnWithTypeAndName col;
-        col.name = "c";
-        col.type = std::make_shared<DataTypeInt64>();
-        sample.insert(std::move(col));
-    }
-    {
-        // d
-        ColumnWithTypeAndName col;
-        col.name = "d";
-        col.type = std::make_shared<DataTypeString>();
-        sample.insert(std::move(col));
-    }
-    {
-        // e
-        ColumnWithTypeAndName col;
-        col.name = "e";
-        col.type = std::make_shared<DataTypeString>();
-        sample.insert(std::move(col));
-    }
-    {
-        // f
-        ColumnWithTypeAndName col;
-        col.name = "f";
-        col.type = std::make_shared<DataTypeString>();
-        sample.insert(std::move(col));
-    }
-    {
-        // g
-        ColumnWithTypeAndName col;
-        col.name = "g";
-        col.type = std::make_shared<DataTypeInt64>();
-        sample.insert(std::move(col));
-    }
-    {
-        // h
-        ColumnWithTypeAndName col;
-        col.name = "h";
-        col.type = std::make_shared<DataTypeInt64>();
-        sample.insert(std::move(col));
-    }
-
-
-    ReadBufferFromFile in_buf("test_in");
-    WriteBufferFromFile out_buf("test_out");
-
-    FormatSettings format_settings;
-    format_settings.with_names_use_header = true;
-    format_settings.skip_unknown_fields = true;
-    format_settings.csv.delimiter = '\x01';
-    format_settings.hive_text.input_field_names =
-    {
-        "d",
-        "e",
-        "f",
-        "a",
-        "b",
-        "c",
-        "g",
-        "h",
-        "i",
-        "j",
-    };
-
-    RowInputFormatParams in_params{DEFAULT_INSERT_BLOCK_SIZE};
-    InputFormatPtr input_format = std::make_shared<HiveTextRowInputFormat>(sample, in_buf, in_params, format_settings);
-    auto pipeline = QueryPipeline(std::move(input_format));
-    auto reader = std::make_unique<PullingPipelineExecutor>(pipeline);
-
-    OutputFormatPtr output_format = std::make_shared<CSVRowOutputFormat>(out_buf, sample, true, true, format_settings);
-    Block res;
-    while (reader->pull(res))
-    {
-        output_format->write(res);
-    }
-    return 0;
-}
-catch (...)
-{
-    std::cerr << getCurrentExceptionMessage(true) << '\n';
-    return 1;
-}
diff --git a/src/Processors/examples/test_in b/src/Processors/examples/test_in
deleted file mode 100644
index c7df97a26a6..00000000000
--- a/src/Processors/examples/test_in
+++ /dev/null
@@ -1,8 +0,0 @@
-2021-09-14
JP
all
2
0.0
2
0
0
-2021-09-14
CI
all
2
0.0
1
0
0
-2021-09-14
JM
all
4
0.25
4
1
1
-2021-09-14
MM
all
31
0.1935483870967742
27
6
6
-2021-09-14
TZ
Android
3
0.3333333333333333
3
1
1
-2021-09-14
SG
all
8
0.25
4
1
2
-2021-09-14
PY
all
1
1.0
0
0
1
-2021-09-14
MX
all
1
0.0
1
0
0
diff --git a/src/QueryPipeline/ExecutionSpeedLimits.cpp b/src/QueryPipeline/ExecutionSpeedLimits.cpp
index 9ceaa4921c7..05fd394db77 100644
--- a/src/QueryPipeline/ExecutionSpeedLimits.cpp
+++ b/src/QueryPipeline/ExecutionSpeedLimits.cpp
@@ -78,17 +78,17 @@ void ExecutionSpeedLimits::throttle(
                     read_bytes / elapsed_seconds,
                     min_execution_bps);
 
-            /// If the predicted execution time is longer than `max_execution_time`.
-            if (max_execution_time != 0 && total_rows_to_read && read_rows)
+            /// If the predicted execution time is longer than `max_estimated_execution_time`.
+            if (max_estimated_execution_time != 0 && total_rows_to_read && read_rows)
             {
                 double estimated_execution_time_seconds = elapsed_seconds * (static_cast<double>(total_rows_to_read) / read_rows);
 
-                if (timeout_overflow_mode == OverflowMode::THROW && estimated_execution_time_seconds > max_execution_time.totalSeconds())
+                if (timeout_overflow_mode == OverflowMode::THROW && estimated_execution_time_seconds > max_estimated_execution_time.totalSeconds())
                     throw Exception(
                         ErrorCodes::TOO_SLOW,
                         "Estimated query execution time ({} seconds) is too long. Maximum: {}. Estimated rows to process: {}",
                         estimated_execution_time_seconds,
-                        max_execution_time.totalSeconds(),
+                        max_estimated_execution_time.totalSeconds(),
                         total_rows_to_read);
             }
 
@@ -113,7 +113,7 @@ static bool handleOverflowMode(OverflowMode mode, int code, FormatStringHelper<A
             ProfileEvents::increment(ProfileEvents::OverflowBreak);
             return false;
         default:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unknown overflow mode");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown overflow mode");
     }
 }
 
diff --git a/src/QueryPipeline/ExecutionSpeedLimits.h b/src/QueryPipeline/ExecutionSpeedLimits.h
index eed8b5c3248..0def483123a 100644
--- a/src/QueryPipeline/ExecutionSpeedLimits.h
+++ b/src/QueryPipeline/ExecutionSpeedLimits.h
@@ -21,6 +21,7 @@ public:
     size_t max_execution_bps = 0;
 
     Poco::Timespan max_execution_time = 0;
+    Poco::Timespan max_estimated_execution_time = 0;
     /// Verify that the speed is not too low after the specified time has elapsed.
     Poco::Timespan timeout_before_checking_execution_speed = 0;
 
diff --git a/src/QueryPipeline/QueryPipelineBuilder.h b/src/QueryPipeline/QueryPipelineBuilder.h
index 5d273df7068..f0b2ead687e 100644
--- a/src/QueryPipeline/QueryPipelineBuilder.h
+++ b/src/QueryPipeline/QueryPipelineBuilder.h
@@ -188,7 +188,7 @@ public:
         concurrency_control = concurrency_control_;
     }
 
-    bool getConcurrencyControl()
+    bool getConcurrencyControl() const
     {
         return concurrency_control;
     }
diff --git a/src/QueryPipeline/ReadProgressCallback.cpp b/src/QueryPipeline/ReadProgressCallback.cpp
index 59843d8791d..e90fc24d882 100644
--- a/src/QueryPipeline/ReadProgressCallback.cpp
+++ b/src/QueryPipeline/ReadProgressCallback.cpp
@@ -126,8 +126,6 @@ bool ReadProgressCallback::onProgress(uint64_t read_rows, uint64_t read_bytes, c
 
         CurrentThread::updatePerformanceCountersIfNeeded();
 
-        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_stopwatch.elapsedMicroseconds(), limits.local_limits.timeout_overflow_mode);
diff --git a/src/QueryPipeline/ReadProgressCallback.h b/src/QueryPipeline/ReadProgressCallback.h
index 5dbf3344bdf..7dfed9df5da 100644
--- a/src/QueryPipeline/ReadProgressCallback.h
+++ b/src/QueryPipeline/ReadProgressCallback.h
@@ -41,7 +41,6 @@ private:
     /// The total number of bytes to read. For progress bar.
     std::atomic_size_t total_bytes = 0;
 
-    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 a43571c8114..1686a101bde 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.cpp
+++ b/src/QueryPipeline/RemoteQueryExecutor.cpp
@@ -4,7 +4,7 @@
 
 #include <Columns/ColumnConst.h>
 #include <Common/CurrentThread.h>
-#include "Core/Protocol.h"
+#include <Core/Protocol.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
@@ -17,6 +17,7 @@
 #include <Interpreters/Context.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <IO/ConnectionTimeouts.h>
+#include <Client/ConnectionEstablisher.h>
 #include <Client/MultiplexedConnections.h>
 #include <Client/HedgedConnections.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
@@ -29,6 +30,7 @@ namespace ProfileEvents
     extern const Event SuspendSendingQueryToShard;
     extern const Event ReadTaskRequestsReceived;
     extern const Event MergeTreeReadTaskRequestsReceived;
+    extern const Event ParallelReplicasAvailableCount;
 }
 
 namespace DB
@@ -62,11 +64,65 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 {
 }
 
+RemoteQueryExecutor::RemoteQueryExecutor(
+    ConnectionPoolPtr pool,
+    const String & query_,
+    const Block & header_,
+    ContextPtr context_,
+    ThrottlerPtr throttler,
+    const Scalars & scalars_,
+    const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_,
+    std::optional<Extension> extension_)
+    : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
+{
+    create_connections = [this, pool, throttler, extension_](AsyncCallback)
+    {
+        const Settings & current_settings = context->getSettingsRef();
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
+
+        ConnectionPoolWithFailover::TryResult result;
+        std::string fail_message;
+        if (main_table)
+        {
+            auto table_name = main_table.getQualifiedName();
+
+            ConnectionEstablisher connection_establisher(pool, &timeouts, current_settings, log, &table_name);
+            connection_establisher.run(result, fail_message);
+        }
+        else
+        {
+            ConnectionEstablisher connection_establisher(pool, &timeouts, current_settings, log, nullptr);
+            connection_establisher.run(result, fail_message);
+        }
+
+        std::vector<IConnectionPool::Entry> connection_entries;
+        if (!result.entry.isNull() && result.is_usable)
+        {
+            if (extension_ && extension_->parallel_reading_coordinator)
+                ProfileEvents::increment(ProfileEvents::ParallelReplicasAvailableCount);
+
+            connection_entries.emplace_back(std::move(result.entry));
+        }
+
+        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;
+    };
+}
+
 RemoteQueryExecutor::RemoteQueryExecutor(
     Connection & connection,
-    const String & query_, const Block & header_, ContextPtr context_,
-    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_,
-    QueryProcessingStage::Enum stage_, std::optional<Extension> extension_)
+    const String & query_,
+    const Block & header_,
+    ContextPtr context_,
+    ThrottlerPtr throttler,
+    const Scalars & scalars_,
+    const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_,
+    std::optional<Extension> extension_)
     : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
 {
     create_connections = [this, &connection, throttler, extension_](AsyncCallback)
@@ -80,9 +136,14 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     std::shared_ptr<Connection> connection_ptr,
-    const String & query_, const Block & header_, ContextPtr context_,
-    ThrottlerPtr throttler, const Scalars & scalars_, const Tables & external_tables_,
-    QueryProcessingStage::Enum stage_, std::optional<Extension> extension_)
+    const String & query_,
+    const Block & header_,
+    ContextPtr context_,
+    ThrottlerPtr throttler,
+    const Scalars & scalars_,
+    const Tables & external_tables_,
+    QueryProcessingStage::Enum stage_,
+    std::optional<Extension> extension_)
     : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
 {
     create_connections = [this, connection_ptr, throttler, extension_](AsyncCallback)
@@ -96,12 +157,18 @@ RemoteQueryExecutor::RemoteQueryExecutor(
 
 RemoteQueryExecutor::RemoteQueryExecutor(
     std::vector<IConnectionPool::Entry> && connections_,
-    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_)
+    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_)
     : RemoteQueryExecutor(query_, header_, context_, scalars_, external_tables_, stage_, extension_)
 {
-    create_connections = [this, connections_, throttler, extension_](AsyncCallback) mutable {
+    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);
@@ -182,7 +249,19 @@ RemoteQueryExecutor::~RemoteQueryExecutor()
     {
         /// Set was_cancelled, so the query won't be sent after creating connections.
         was_cancelled = true;
-        read_context->cancel();
+
+        /// Cancellation may throw (i.e. some timeout), and in case of pipeline
+        /// had not been properly created properly (EXCEPTION_BEFORE_START)
+        /// cancel will not be sent, so cancellation will be done from dtor and
+        /// will throw.
+        try
+        {
+            read_context->cancel();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log ? log : getLogger("RemoteQueryExecutor"));
+        }
     }
 
     /** If interrupted in the middle of the loop of communication with replicas, then interrupt
@@ -190,7 +269,17 @@ RemoteQueryExecutor::~RemoteQueryExecutor()
       * these connections did not remain hanging in the out-of-sync state.
       */
     if (established || (isQueryPending() && connections))
-        connections->disconnect();
+    {
+        /// May also throw (so as cancel() above)
+        try
+        {
+            connections->disconnect();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log ? log : getLogger("RemoteQueryExecutor"));
+        }
+    }
 }
 
 /** If we receive a block with slightly different column types, or with excessive columns,
@@ -716,6 +805,7 @@ void RemoteQueryExecutor::sendExternalTables()
         limits.mode = LimitsMode::LIMITS_TOTAL;
         limits.speed_limits.max_execution_time = settings.max_execution_time;
         limits.timeout_overflow_mode = settings.timeout_overflow_mode;
+        limits.speed_limits.max_estimated_execution_time = settings.max_estimated_execution_time;
 
         for (size_t i = 0; i < count; ++i)
         {
diff --git a/src/QueryPipeline/RemoteQueryExecutor.h b/src/QueryPipeline/RemoteQueryExecutor.h
index 5a8ccc2592b..6b1539bd08e 100644
--- a/src/QueryPipeline/RemoteQueryExecutor.h
+++ b/src/QueryPipeline/RemoteQueryExecutor.h
@@ -50,29 +50,55 @@ public:
         std::shared_ptr<TaskIterator> task_iterator = nullptr;
         std::shared_ptr<ParallelReplicasReadingCoordinator> parallel_reading_coordinator = nullptr;
         std::optional<IConnections::ReplicaInfo> replica_info = {};
-        GetPriorityForLoadBalancing::Func priority_func;
     };
 
+    /// Takes a connection pool for a node (not cluster)
+    RemoteQueryExecutor(
+        ConnectionPoolPtr pool,
+        const String & query_,
+        const Block & header_,
+        ContextPtr context_,
+        ThrottlerPtr throttler = nullptr,
+        const Scalars & scalars_ = Scalars(),
+        const Tables & external_tables_ = Tables(),
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete,
+        std::optional<Extension> extension_ = std::nullopt);
+
     /// Takes already set connection.
     RemoteQueryExecutor(
         Connection & connection,
-        const String & query_, const Block & header_, ContextPtr context_,
-        ThrottlerPtr throttler_ = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::optional<Extension> extension_ = std::nullopt);
+        const String & query_,
+        const Block & header_,
+        ContextPtr context_,
+        ThrottlerPtr throttler_ = nullptr,
+        const Scalars & scalars_ = Scalars(),
+        const Tables & external_tables_ = Tables(),
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete,
+        std::optional<Extension> extension_ = std::nullopt);
 
     /// Takes already set connection.
     RemoteQueryExecutor(
         std::shared_ptr<Connection> connection,
-        const String & query_, const Block & header_, ContextPtr context_,
-        ThrottlerPtr throttler_ = nullptr, const Scalars & scalars_ = Scalars(), const Tables & external_tables_ = Tables(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::optional<Extension> extension_ = std::nullopt);
+        const String & query_,
+        const Block & header_,
+        ContextPtr context_,
+        ThrottlerPtr throttler_ = nullptr,
+        const Scalars & scalars_ = Scalars(),
+        const Tables & external_tables_ = Tables(),
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete,
+        std::optional<Extension> extension_ = std::nullopt);
 
     /// Accepts several connections already taken from pool.
     RemoteQueryExecutor(
         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(),
-        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete, std::optional<Extension> extension_ = std::nullopt);
+        const String & query_,
+        const Block & header_,
+        ContextPtr context_,
+        const ThrottlerPtr & throttler = nullptr,
+        const Scalars & scalars_ = Scalars(),
+        const Tables & external_tables_ = Tables(),
+        QueryProcessingStage::Enum stage_ = QueryProcessingStage::Complete,
+        std::optional<Extension> extension_ = std::nullopt);
 
     /// Takes a pool and gets one or several connections from it.
     RemoteQueryExecutor(
@@ -186,7 +212,7 @@ public:
 
     void setMainTable(StorageID main_table_) { main_table = std::move(main_table_); }
 
-    void setLogger(Poco::Logger * logger) { log = logger; }
+    void setLogger(LoggerPtr logger) { log = logger; }
 
     const Block & getHeader() const { return header; }
 
@@ -283,7 +309,7 @@ private:
     PoolMode pool_mode = PoolMode::GET_MANY;
     StorageID main_table = StorageID::createEmpty();
 
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
 
     GetPriorityForLoadBalancing::Func priority_func;
 
diff --git a/src/QueryPipeline/RemoteQueryExecutorReadContext.h b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
index adfc0c5eacf..4e62b42a067 100644
--- a/src/QueryPipeline/RemoteQueryExecutorReadContext.h
+++ b/src/QueryPipeline/RemoteQueryExecutorReadContext.h
@@ -5,7 +5,6 @@
 #include <mutex>
 #include <atomic>
 #include <Common/Fiber.h>
-#include <Common/FiberStack.h>
 #include <Common/TimerDescriptor.h>
 #include <Common/Epoll.h>
 #include <Common/AsyncTaskExecutor.h>
@@ -54,7 +53,7 @@ private:
 
     struct Task : public AsyncTask
     {
-        Task(RemoteQueryExecutorReadContext & read_context_) : read_context(read_context_) {}
+        explicit Task(RemoteQueryExecutorReadContext & read_context_) : read_context(read_context_) {}
 
         RemoteQueryExecutorReadContext & read_context;
 
diff --git a/src/Server/CertificateReloader.cpp b/src/Server/CertificateReloader.cpp
index 8795d4807de..98d7a362bd7 100644
--- a/src/Server/CertificateReloader.cpp
+++ b/src/Server/CertificateReloader.cpp
@@ -1,7 +1,8 @@
-#include "CertificateReloader.h"
+#include <Server/CertificateReloader.h>
 
 #if USE_SSL
 
+#include <Common/Exception.h>
 #include <Common/logger_useful.h>
 #include <base/errnoToString.h>
 #include <Poco/Net/Context.h>
@@ -22,7 +23,6 @@ int callSetCertificate(SSL * ssl, [[maybe_unused]] void * arg)
 
 }
 
-
 /// This is callback for OpenSSL. It will be called on every connection to obtain a certificate and private key.
 int CertificateReloader::setCertificate(SSL * ssl)
 {
@@ -30,17 +30,37 @@ int CertificateReloader::setCertificate(SSL * ssl)
     if (!current)
         return -1;
 
-    SSL_use_certificate(ssl, const_cast<X509 *>(current->cert.certificate()));
-    SSL_use_PrivateKey(ssl, const_cast<EVP_PKEY *>(static_cast<const EVP_PKEY *>(current->key)));
+    if (current->certs_chain.empty())
+        return -1;
 
-    int err = SSL_check_private_key(ssl);
-    if (err != 1)
+    if (auto err = SSL_clear_chain_certs(ssl); err != 1)
     {
-        std::string msg = Poco::Net::Utility::getLastError();
-        LOG_ERROR(log, "Unusable key-pair {}", msg);
+        LOG_ERROR(log, "Clear certificates {}", Poco::Net::Utility::getLastError());
+        return -1;
+    }
+    if (auto err = SSL_use_certificate(ssl, const_cast<X509 *>(current->certs_chain[0].certificate())); err != 1)
+    {
+        LOG_ERROR(log, "Use certificate {}", Poco::Net::Utility::getLastError());
+        return -1;
+    }
+    for (auto cert = current->certs_chain.begin() + 1; cert != current->certs_chain.end(); cert++)
+    {
+        if (auto err = SSL_add1_chain_cert(ssl, const_cast<X509 *>(cert->certificate())); err != 1)
+        {
+            LOG_ERROR(log, "Add certificate to chain {}", Poco::Net::Utility::getLastError());
+            return -1;
+        }
+    }
+    if (auto err = SSL_use_PrivateKey(ssl, const_cast<EVP_PKEY *>(static_cast<const EVP_PKEY *>(current->key))); err != 1)
+    {
+        LOG_ERROR(log, "Use private key {}", Poco::Net::Utility::getLastError());
+        return -1;
+    }
+    if (auto err = SSL_check_private_key(ssl); err != 1)
+    {
+        LOG_ERROR(log, "Unusable key-pair {}", Poco::Net::Utility::getLastError());
         return -1;
     }
-
     return 1;
 }
 
@@ -100,12 +120,12 @@ void CertificateReloader::tryLoad(const Poco::Util::AbstractConfiguration & conf
 
 
 CertificateReloader::Data::Data(std::string cert_path, std::string key_path, std::string pass_phrase)
-    : cert(cert_path), key(/* public key */ "", /* private key */ key_path, pass_phrase)
+    : certs_chain(Poco::Crypto::X509Certificate::readPEM(cert_path)), key(/* public key */ "", /* private key */ key_path, pass_phrase)
 {
 }
 
 
-bool CertificateReloader::File::changeIfModified(std::string new_path, Poco::Logger * logger)
+bool CertificateReloader::File::changeIfModified(std::string new_path, LoggerPtr logger)
 {
     std::error_code ec;
     std::filesystem::file_time_type new_modification_time = std::filesystem::last_write_time(new_path, ec);
diff --git a/src/Server/CertificateReloader.h b/src/Server/CertificateReloader.h
index 9f04179b8d6..5ab799037d5 100644
--- a/src/Server/CertificateReloader.h
+++ b/src/Server/CertificateReloader.h
@@ -14,6 +14,7 @@
 #include <Poco/Crypto/RSAKey.h>
 #include <Poco/Crypto/X509Certificate.h>
 #include <Common/MultiVersion.h>
+#include <Common/Logger.h>
 
 
 namespace DB
@@ -51,7 +52,7 @@ public:
 private:
     CertificateReloader() = default;
 
-    Poco::Logger * log = &Poco::Logger::get("CertificateReloader");
+    LoggerPtr log = getLogger("CertificateReloader");
 
     struct File
     {
@@ -61,7 +62,7 @@ private:
         std::string path;
         std::filesystem::file_time_type modification_time;
 
-        bool changeIfModified(std::string new_path, Poco::Logger * logger);
+        bool changeIfModified(std::string new_path, LoggerPtr logger);
     };
 
     File cert_file{"certificate"};
@@ -69,7 +70,7 @@ private:
 
     struct Data
     {
-        Poco::Crypto::X509Certificate cert;
+        Poco::Crypto::X509Certificate::List certs_chain;
         Poco::Crypto::EVPPKey key;
 
         Data(std::string cert_path, std::string key_path, std::string pass_phrase);
diff --git a/src/Server/CloudPlacementInfo.cpp b/src/Server/CloudPlacementInfo.cpp
new file mode 100644
index 00000000000..0790f825a45
--- /dev/null
+++ b/src/Server/CloudPlacementInfo.cpp
@@ -0,0 +1,83 @@
+#include <Server/CloudPlacementInfo.h>
+#include <Common/logger_useful.h>
+#include <IO/ReadBufferFromFile.h>
+#include <IO/ReadHelpers.h>
+#include <IO/S3/Credentials.h>
+#include <Poco/String.h>
+#include <fmt/core.h>
+#include <filesystem>
+
+
+namespace DB
+{
+
+namespace PlacementInfo
+{
+
+namespace
+{
+    std::string getConfigPath(std::string_view path)
+    {
+        return fmt::format("{}.{}", PLACEMENT_CONFIG_PREFIX, path);
+    }
+
+    String loadAvailabilityZoneFromFile(const Poco::Util::AbstractConfiguration & config)
+    {
+        auto az_file = config.getString(getConfigPath("availability_zone_from_file"), DEFAULT_AZ_FILE_PATH);
+
+        if (!std::filesystem::exists(az_file))
+            return "";
+
+        String availability_zone_from_file;
+
+        ReadBufferFromFile in(az_file);
+        readStringUntilEOF(availability_zone_from_file, in);
+        Poco::trimInPlace(availability_zone_from_file);
+
+        return availability_zone_from_file;
+    }
+}
+
+
+PlacementInfo & PlacementInfo::instance()
+{
+    static PlacementInfo instance;
+    return instance;
+}
+
+void PlacementInfo::initialize(const Poco::Util::AbstractConfiguration & config)
+{
+    use_imds = config.getBool(getConfigPath("use_imds"), false);
+
+    if (use_imds)
+    {
+        availability_zone = S3::getRunningAvailabilityZone();
+    }
+    else
+    {
+        availability_zone = config.getString(getConfigPath("availability_zone"), "");
+
+        if (availability_zone.empty())
+            availability_zone = loadAvailabilityZoneFromFile(config);
+
+        if (availability_zone.empty())
+            LOG_WARNING(log, "Availability zone info not found");
+    }
+
+    LOG_DEBUG(log, "Loaded info: availability_zone: {}", availability_zone);
+    initialized = true;
+}
+
+std::string PlacementInfo::getAvailabilityZone() const
+{
+    if (!initialized)
+    {
+        LOG_WARNING(log, "Placement info has not been loaded");
+        return "";
+    }
+
+    return availability_zone;
+}
+
+}
+}
diff --git a/src/Server/CloudPlacementInfo.h b/src/Server/CloudPlacementInfo.h
new file mode 100644
index 00000000000..407f668142f
--- /dev/null
+++ b/src/Server/CloudPlacementInfo.h
@@ -0,0 +1,39 @@
+#pragma once
+
+#include <string>
+#include <boost/core/noncopyable.hpp>
+#include <Poco/Util/AbstractConfiguration.h>
+#include <Common/Logger.h>
+
+namespace DB
+{
+
+namespace PlacementInfo
+{
+
+static constexpr auto PLACEMENT_CONFIG_PREFIX = "placement";
+static constexpr auto DEFAULT_AZ_FILE_PATH = "/run/instance-metadata/node-zone";
+
+/// A singleton providing information on where in cloud server is running.
+class PlacementInfo : private boost::noncopyable
+{
+public:
+    static PlacementInfo & instance();
+
+    void initialize(const Poco::Util::AbstractConfiguration & config);
+
+    std::string getAvailabilityZone() const;
+
+private:
+    PlacementInfo() = default;
+
+    LoggerPtr log = getLogger("CloudPlacementInfo");
+
+    bool initialized;
+
+    bool use_imds;
+    std::string availability_zone;
+};
+
+}
+}
diff --git a/src/Server/GRPCServer.cpp b/src/Server/GRPCServer.cpp
index 6bb6ba139ad..72135157117 100644
--- a/src/Server/GRPCServer.cpp
+++ b/src/Server/GRPCServer.cpp
@@ -13,6 +13,7 @@
 #include <DataTypes/DataTypeFactory.h>
 #include <QueryPipeline/ProfileInfo.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InternalTextLogsQueue.h>
 #include <Interpreters/executeQuery.h>
 #include <Interpreters/Session.h>
@@ -76,7 +77,7 @@ namespace
         static std::once_flag once_flag;
         std::call_once(once_flag, [&config]
         {
-            static Poco::Logger * logger = &Poco::Logger::get("grpc");
+            static LoggerRawPtr logger = getRawLogger("grpc");
             gpr_set_log_function([](gpr_log_func_args* args)
             {
                 if (args->severity == GPR_LOG_SEVERITY_DEBUG)
@@ -419,7 +420,11 @@ namespace
         void read(GRPCQueryInfo & query_info_, const CompletionCallback & callback) override
         {
             if (!query_info.has_value())
+            {
                 callback(false);
+                return;
+            }
+
             query_info_ = std::move(query_info).value();
             query_info.reset();
             callback(true);
@@ -486,7 +491,11 @@ namespace
         void read(GRPCQueryInfo & query_info_, const CompletionCallback & callback) override
         {
             if (!query_info.has_value())
+            {
                 callback(false);
+                return;
+            }
+
             query_info_ = std::move(query_info).value();
             query_info.reset();
             callback(true);
@@ -610,11 +619,10 @@ namespace
 
 
     /// Handles a connection after a responder is started (i.e. after getting a new call).
-// NOLINTBEGIN(clang-analyzer-optin.performance.Padding)
     class Call
     {
     public:
-        Call(CallType call_type_, std::unique_ptr<BaseResponder> responder_, IServer & iserver_, Poco::Logger * log_);
+        Call(CallType call_type_, std::unique_ptr<BaseResponder> responder_, IServer & iserver_, LoggerRawPtr log_);
         ~Call();
 
         void start(const std::function<void(void)> & on_finish_call_callback);
@@ -656,7 +664,7 @@ namespace
         const CallType call_type;
         std::unique_ptr<BaseResponder> responder;
         IServer & iserver;
-        Poco::Logger * log = nullptr;
+        LoggerRawPtr log = nullptr;
 
         std::optional<Session> session;
         ContextMutablePtr query_context;
@@ -716,9 +724,8 @@ namespace
 
         ThreadFromGlobalPool call_thread;
     };
-// NOLINTEND(clang-analyzer-optin.performance.Padding)
 
-    Call::Call(CallType call_type_, std::unique_ptr<BaseResponder> responder_, IServer & iserver_, Poco::Logger * log_)
+    Call::Call(CallType call_type_, std::unique_ptr<BaseResponder> responder_, IServer & iserver_, LoggerRawPtr log_)
         : call_type(call_type_), responder(std::move(responder_)), iserver(iserver_), log(log_)
     {
     }
@@ -877,7 +884,7 @@ namespace
         const char * begin = query_text.data();
         const char * end = begin + query_text.size();
         ParserQuery parser(end, settings.allow_settings_after_format_in_insert);
-        ast = parseQuery(parser, begin, end, "", settings.max_query_size, settings.max_parser_depth);
+        ast = parseQuery(parser, begin, end, "", settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
 
         /// Choose input format.
         insert_query = ast->as<ASTInsertQuery>();
@@ -1843,7 +1850,7 @@ private:
 GRPCServer::GRPCServer(IServer & iserver_, const Poco::Net::SocketAddress & address_to_listen_)
     : iserver(iserver_)
     , address_to_listen(address_to_listen_)
-    , log(&Poco::Logger::get("GRPCServer"))
+    , log(getRawLogger("GRPCServer"))
     , runner(std::make_unique<Runner>(*this))
 {}
 
diff --git a/src/Server/GRPCServer.h b/src/Server/GRPCServer.h
index 359a2506e95..70c16d3e9af 100644
--- a/src/Server/GRPCServer.h
+++ b/src/Server/GRPCServer.h
@@ -3,9 +3,11 @@
 #include "config.h"
 
 #if USE_GRPC
+
+#include "clickhouse_grpc.grpc.pb.h"
 #include <Poco/Net/SocketAddress.h>
 #include <base/types.h>
-#include "clickhouse_grpc.grpc.pb.h"
+#include <Common/Logger.h>
 
 namespace Poco { class Logger; }
 
@@ -46,7 +48,7 @@ private:
 
     IServer & iserver;
     const Poco::Net::SocketAddress address_to_listen;
-    Poco::Logger * log;
+    LoggerRawPtr log;
     GRPCService grpc_service;
     std::unique_ptr<grpc::Server> grpc_server;
     std::unique_ptr<grpc::ServerCompletionQueue> queue;
diff --git a/src/Server/HTTP/HTTPServerRequest.cpp b/src/Server/HTTP/HTTPServerRequest.cpp
index 4a6e85ba0fb..9db02eac220 100644
--- a/src/Server/HTTP/HTTPServerRequest.cpp
+++ b/src/Server/HTTP/HTTPServerRequest.cpp
@@ -65,7 +65,7 @@ HTTPServerRequest::HTTPServerRequest(HTTPContextPtr context, HTTPServerResponse
     {
         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 "
+            LOG_WARNING(LogFrequencyLimiter(getLogger("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
diff --git a/src/Server/HTTP/HTTPServerResponse.cpp b/src/Server/HTTP/HTTPServerResponse.cpp
index 3c2d54a67df..b6207f2d302 100644
--- a/src/Server/HTTP/HTTPServerResponse.cpp
+++ b/src/Server/HTTP/HTTPServerResponse.cpp
@@ -123,4 +123,20 @@ void HTTPServerResponse::requireAuthentication(const std::string & realm)
     set("WWW-Authenticate", auth);
 }
 
+void HTTPServerResponse::redirect(const std::string & uri, HTTPStatus status)
+{
+    poco_assert(!stream);
+
+    setContentLength(0);
+    setChunkedTransferEncoding(false);
+
+    setStatusAndReason(status);
+    set("Location", uri);
+
+    // Send header
+    Poco::Net::HTTPHeaderOutputStream hs(session);
+    write(hs);
+    hs.flush();
+}
+
 }
diff --git a/src/Server/HTTP/HTTPServerResponse.h b/src/Server/HTTP/HTTPServerResponse.h
index 6efe48667eb..8edb785e7c5 100644
--- a/src/Server/HTTP/HTTPServerResponse.h
+++ b/src/Server/HTTP/HTTPServerResponse.h
@@ -90,7 +90,7 @@ public:
         resizeIfNeeded(buf_size);
     }
 
-    bool isChunked()
+    bool isChunked() const
     {
         return chunked;
     }
@@ -103,7 +103,7 @@ public:
         resizeIfNeeded(length);
     }
 
-    size_t isFixedLength()
+    size_t isFixedLength() const
     {
         return chunked ? 0 : fixed_length;
     }
@@ -116,7 +116,7 @@ public:
         resizeIfNeeded(buf_size);
     }
 
-    bool isPlain()
+    bool isPlain() const
     {
         return !(isChunked() || isFixedLength());
     }
@@ -231,6 +231,16 @@ public:
     /// Returns true if the response (header) has been sent.
     bool sent() const { return !!stream; }
 
+    /// Sets the status code, which must be one of
+    /// HTTP_MOVED_PERMANENTLY (301), HTTP_FOUND (302),
+    /// or HTTP_SEE_OTHER (303),
+    /// and sets the "Location" header field
+    /// to the given URI, which according to
+    /// the HTTP specification, must be absolute.
+    ///
+    /// Must not be called after send() has been called.
+    void redirect(const std::string & uri, HTTPStatus status = HTTP_FOUND);
+
     Poco::Net::StreamSocket & getSocket() { return session.socket(); }
 
     void attachRequest(HTTPServerRequest * request_) { request = request_; }
diff --git a/src/Server/HTTP/ReadHeaders.cpp b/src/Server/HTTP/ReadHeaders.cpp
index b7057501064..d6c7b8ddc0f 100644
--- a/src/Server/HTTP/ReadHeaders.cpp
+++ b/src/Server/HTTP/ReadHeaders.cpp
@@ -77,7 +77,7 @@ void readHeaders(
         skipToNextLineOrEOF(in);
 
         Poco::trimRightInPlace(value);
-        headers.add(name, headers.decodeWord(value));
+        headers.add(name, Poco::Net::MessageHeader::decodeWord(value));
         ++fields;
     }
 }
diff --git a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
index a3e7c28c8dc..8098671a903 100644
--- a/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
+++ b/src/Server/HTTP/WriteBufferFromHTTPServerResponse.cpp
@@ -1,4 +1,3 @@
-#include "Common/StackTrace.h"
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
 #include <IO/HTTPCommon.h>
 #include <IO/Progress.h>
@@ -20,6 +19,13 @@ void WriteBufferFromHTTPServerResponse::startSendHeaders()
 
         if (response.getChunkedTransferEncoding())
             setChunked();
+        else if (response.getContentLength() == Poco::Net::HTTPMessage::UNKNOWN_CONTENT_LENGTH)
+        {
+            /// In case there is no Content-Length we cannot use keep-alive,
+            /// since there is no way to know when the server send all the
+            /// data, so "Connection: close" should be sent.
+            response.setKeepAlive(false);
+        }
 
         if (add_cors_header)
             response.set("Access-Control-Allow-Origin", "*");
diff --git a/src/Server/HTTPHandler.cpp b/src/Server/HTTPHandler.cpp
index bdc8e7d59c9..07a89b60a8f 100644
--- a/src/Server/HTTPHandler.cpp
+++ b/src/Server/HTTPHandler.cpp
@@ -125,7 +125,7 @@ namespace ErrorCodes
 
 namespace
 {
-bool tryAddHttpOptionHeadersFromConfig(HTTPServerResponse & response, const Poco::Util::LayeredConfiguration & config)
+bool tryAddHTTPOptionHeadersFromConfig(HTTPServerResponse & response, const Poco::Util::LayeredConfiguration & config)
 {
     if (config.has("http_options_response"))
     {
@@ -137,7 +137,7 @@ bool tryAddHttpOptionHeadersFromConfig(HTTPServerResponse & response, const Poco
             {
                 /// If there is empty header name, it will not be processed and message about it will be in logs
                 if (config.getString("http_options_response." + config_key + ".name", "").empty())
-                    LOG_WARNING(&Poco::Logger::get("processOptionsRequest"), "Empty header was found in config. It will not be processed.");
+                    LOG_WARNING(getLogger("processOptionsRequest"), "Empty header was found in config. It will not be processed.");
                 else
                     response.add(config.getString("http_options_response." + config_key + ".name", ""),
                                     config.getString("http_options_response." + config_key + ".value", ""));
@@ -153,7 +153,7 @@ bool tryAddHttpOptionHeadersFromConfig(HTTPServerResponse & response, const Poco
 void processOptionsRequest(HTTPServerResponse & response, const Poco::Util::LayeredConfiguration & config)
 {
     /// If can add some headers from config
-    if (tryAddHttpOptionHeadersFromConfig(response, config))
+    if (tryAddHTTPOptionHeadersFromConfig(response, config))
     {
         response.setKeepAlive(false);
         response.setStatusAndReason(HTTPResponse::HTTP_NO_CONTENT);
@@ -328,7 +328,7 @@ void HTTPHandler::pushDelayedResults(Output & used_output)
 
 HTTPHandler::HTTPHandler(IServer & server_, const std::string & name, const std::optional<String> & content_type_override_)
     : server(server_)
-    , log(&Poco::Logger::get(name))
+    , log(getLogger(name))
     , default_settings(server.context()->getSettingsRef())
     , content_type_override(content_type_override_)
 {
@@ -490,14 +490,7 @@ bool HTTPHandler::authenticateUser(
 
     /// Set client info. It will be used for quota accounting parameters in 'setUser' method.
 
-    ClientInfo::HTTPMethod http_method = ClientInfo::HTTPMethod::UNKNOWN;
-    if (request.getMethod() == HTTPServerRequest::HTTP_GET)
-        http_method = ClientInfo::HTTPMethod::GET;
-    else if (request.getMethod() == HTTPServerRequest::HTTP_POST)
-        http_method = ClientInfo::HTTPMethod::POST;
-
-    session->setHttpClientInfo(http_method, request.get("User-Agent", ""), request.get("Referer", ""));
-    session->setForwardedFor(request.get("X-Forwarded-For", ""));
+    session->setHTTPClientInfo(request);
     session->setQuotaClientKey(quota_key);
 
     /// Extract the last entry from comma separated list of forwarded_for addresses.
@@ -880,13 +873,33 @@ void HTTPHandler::processQuery(
             response.add("X-ClickHouse-Timezone", *details.timezone);
     };
 
-    auto handle_exception_in_output_format = [&](IOutputFormat & output_format)
+    auto handle_exception_in_output_format = [&](IOutputFormat & current_output_format, const String & format_name, const ContextPtr & context_, const std::optional<FormatSettings> & format_settings)
     {
-        if (settings.http_write_exception_in_output_format && output_format.supportsWritingException())
+        if (settings.http_write_exception_in_output_format && current_output_format.supportsWritingException())
         {
-            output_format.setException(getCurrentExceptionMessage(false));
-            output_format.finalize();
-            used_output.exception_is_written = true;
+            /// If wait_end_of_query=true in case of an exception all data written to output format during query execution will be
+            /// ignored, so we cannot write exception message in current output format as it will be also ignored.
+            /// Instead, we create exception_writer function that will write exception in required format
+            /// and will use it later in trySendExceptionToClient when all buffers will be prepared.
+            if (buffer_until_eof)
+            {
+                auto header = current_output_format.getPort(IOutputFormat::PortKind::Main).getHeader();
+                used_output.exception_writer = [format_name, header, context_, format_settings](WriteBuffer & buf, const String & message)
+                {
+                    auto output_format = FormatFactory::instance().getOutputFormat(format_name, buf, header, context_, format_settings);
+                    output_format->setException(message);
+                    output_format->finalize();
+                };
+            }
+            else
+            {
+                bool with_stacktrace = (params.getParsed<bool>("stacktrace", false) && server.config().getBool("enable_http_stacktrace", true));
+                ExecutionStatus status = ExecutionStatus::fromCurrentException("", with_stacktrace);
+                formatExceptionForClient(status.code, request, response, used_output);
+                current_output_format.setException(status.message);
+                current_output_format.finalize();
+                used_output.exception_is_written = true;
+            }
         }
     };
 
@@ -916,31 +929,7 @@ void HTTPHandler::trySendExceptionToClient(
     const std::string & s, int exception_code, HTTPServerRequest & request, HTTPServerResponse & response, Output & used_output)
 try
 {
-    if (used_output.out_holder)
-        used_output.out_holder->setExceptionCode(exception_code);
-    else
-        response.set("X-ClickHouse-Exception-Code", toString<int>(exception_code));
-
-    /// FIXME: make sure that no one else is reading from the same stream at the moment.
-
-    /// If HTTP method is POST and Keep-Alive is turned on, we should read the whole request body
-    /// to avoid reading part of the current request body in the next request.
-    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST
-        && response.getKeepAlive()
-        && exception_code != ErrorCodes::HTTP_LENGTH_REQUIRED
-        && !request.getStream().eof())
-    {
-        request.getStream().ignoreAll();
-    }
-
-    if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
-    {
-        response.requireAuthentication("ClickHouse server HTTP API");
-    }
-    else
-    {
-        response.setStatusAndReason(exceptionCodeToHTTPStatus(exception_code));
-    }
+    formatExceptionForClient(exception_code, request, response, used_output);
 
     if (!used_output.out_holder && !used_output.exception_is_written)
     {
@@ -974,8 +963,16 @@ try
                 used_output.out_holder->position() = used_output.out_holder->buffer().begin();
             }
 
-            writeString(s, *used_output.out_maybe_compressed);
-            writeChar('\n', *used_output.out_maybe_compressed);
+            /// We might have special formatter for exception message.
+            if (used_output.exception_writer)
+            {
+                used_output.exception_writer(*used_output.out_maybe_compressed, s);
+            }
+            else
+            {
+                writeString(s, *used_output.out_maybe_compressed);
+                writeChar('\n', *used_output.out_maybe_compressed);
+            }
         }
 
         used_output.out_maybe_compressed->next();
@@ -1001,6 +998,28 @@ catch (...)
     }
 }
 
+void HTTPHandler::formatExceptionForClient(int exception_code, HTTPServerRequest & request, HTTPServerResponse & response, Output & used_output)
+{
+    if (used_output.out_holder)
+        used_output.out_holder->setExceptionCode(exception_code);
+    else
+        response.set("X-ClickHouse-Exception-Code", toString<int>(exception_code));
+
+    /// FIXME: make sure that no one else is reading from the same stream at the moment.
+
+    /// If HTTP method is POST and Keep-Alive is turned on, we should read the whole request body
+    /// to avoid reading part of the current request body in the next request.
+    if (request.getMethod() == Poco::Net::HTTPRequest::HTTP_POST && response.getKeepAlive()
+        && exception_code != ErrorCodes::HTTP_LENGTH_REQUIRED && !request.getStream().eof())
+    {
+        request.getStream().ignoreAll();
+    }
+
+    if (exception_code == ErrorCodes::REQUIRED_PASSWORD)
+        response.requireAuthentication("ClickHouse server HTTP API");
+    else
+        response.setStatusAndReason(exceptionCodeToHTTPStatus(exception_code));
+}
 
 void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event)
 {
@@ -1065,7 +1084,7 @@ void HTTPHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse
         response.set("X-ClickHouse-Server-Display-Name", server_display_name);
 
         if (!request.get("Origin", "").empty())
-            tryAddHttpOptionHeadersFromConfig(response, server.config());
+            tryAddHTTPOptionHeadersFromConfig(response, server.config());
 
         /// For keep-alive to work.
         if (request.getVersion() == HTTPServerRequest::HTTP_1_1)
@@ -1295,9 +1314,7 @@ HTTPRequestHandlerFactoryPtr createDynamicHandlerFactory(IServer & server,
     };
 
     auto factory = std::make_shared<HandlingRuleHTTPHandlerFactory<DynamicQueryHandler>>(std::move(creator));
-
     factory->addFiltersFromConfig(config, config_prefix);
-
     return factory;
 }
 
diff --git a/src/Server/HTTPHandler.h b/src/Server/HTTPHandler.h
index 026bda43d14..ae4cf034276 100644
--- a/src/Server/HTTPHandler.h
+++ b/src/Server/HTTPHandler.h
@@ -32,7 +32,7 @@ class HTTPHandler : public HTTPRequestHandler
 {
 public:
     HTTPHandler(IServer & server_, const std::string & name, const std::optional<String> & content_type_override_);
-    virtual ~HTTPHandler() override;
+    ~HTTPHandler() override;
 
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 
@@ -75,6 +75,7 @@ private:
         bool finalized = false;
 
         bool exception_is_written = false;
+        std::function<void(WriteBuffer &, const String &)> exception_writer;
 
         inline bool hasDelayed() const
         {
@@ -87,9 +88,9 @@ private:
                 return;
             finalized = true;
 
-            if (out_maybe_compressed)
-                out_maybe_compressed->finalize();
-            else if (out)
+            if (out_compressed_holder)
+                out_compressed_holder->finalize();
+            if (out)
                 out->finalize();
         }
 
@@ -100,7 +101,7 @@ private:
     };
 
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// It is the name of the server that will be sent in an http-header X-ClickHouse-Server-Display-Name.
     String server_display_name;
@@ -148,6 +149,12 @@ private:
         HTTPServerResponse & response,
         Output & used_output);
 
+    void formatExceptionForClient(
+        int exception_code,
+        HTTPServerRequest & request,
+        HTTPServerResponse & response,
+        Output & used_output);
+
     static void pushDelayedResults(Output & used_output);
 };
 
diff --git a/src/Server/HTTPHandlerFactory.cpp b/src/Server/HTTPHandlerFactory.cpp
index 66b55f68217..9a67e576345 100644
--- a/src/Server/HTTPHandlerFactory.cpp
+++ b/src/Server/HTTPHandlerFactory.cpp
@@ -1,3 +1,4 @@
+#include <memory>
 #include <Server/HTTPHandlerFactory.h>
 
 #include <Server/HTTP/HTTPRequestHandler.h>
@@ -7,6 +8,7 @@
 #include <Poco/Util/AbstractConfiguration.h>
 
 #include "HTTPHandler.h"
+#include "Server/PrometheusMetricsWriter.h"
 #include "StaticRequestHandler.h"
 #include "ReplicasStatusHandler.h"
 #include "InterserverIOHTTPHandler.h"
@@ -24,6 +26,42 @@ namespace ErrorCodes
     extern const int INVALID_CONFIG_PARAMETER;
 }
 
+namespace
+{
+
+class RedirectRequestHandler : public HTTPRequestHandler
+{
+private:
+    std::string url;
+
+public:
+    explicit RedirectRequestHandler(std::string url_)
+        : url(std::move(url_))
+    {
+    }
+
+    void handleRequest(HTTPServerRequest &, HTTPServerResponse & response, const ProfileEvents::Event &) override
+    {
+        response.redirect(url);
+    }
+};
+
+HTTPRequestHandlerFactoryPtr createRedirectHandlerFactory(
+    const Poco::Util::AbstractConfiguration & config,
+    const std::string & config_prefix)
+{
+    std::string url = config.getString(config_prefix + ".handler.location");
+
+    auto factory = std::make_shared<HandlingRuleHTTPHandlerFactory<RedirectRequestHandler>>(
+        [my_url = std::move(url)]() { return std::make_unique<RedirectRequestHandler>(my_url); });
+
+    factory->addFiltersFromConfig(config, config_prefix);
+    return factory;
+}
+
+}
+
+
 static void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IServer & server);
 static void addDefaultHandlersFactory(
     HTTPRequestHandlerFactoryMain & factory,
@@ -31,6 +69,16 @@ static void addDefaultHandlersFactory(
     const Poco::Util::AbstractConfiguration & config,
     AsynchronousMetrics & async_metrics);
 
+static auto createPingHandlerFactory(IServer & server)
+{
+    auto creator = [&server]() -> std::unique_ptr<StaticRequestHandler>
+    {
+        constexpr auto ping_response_expression = "Ok.\n";
+        return std::make_unique<StaticRequestHandler>(server, ping_response_expression);
+    };
+    return std::make_shared<HandlingRuleHTTPHandlerFactory<StaticRequestHandler>>(std::move(creator));
+}
+
 static inline auto createHandlersFactoryFromConfig(
     IServer & server,
     const Poco::Util::AbstractConfiguration & config,
@@ -58,15 +106,53 @@ static inline auto createHandlersFactoryFromConfig(
                     "{}.{}.handler.type", prefix, key);
 
             if (handler_type == "static")
+            {
                 main_handler_factory->addHandler(createStaticHandlerFactory(server, config, prefix + "." + key));
+            }
+            else if (handler_type == "redirect")
+            {
+                main_handler_factory->addHandler(createRedirectHandlerFactory(config, prefix + "." + key));
+            }
             else if (handler_type == "dynamic_query_handler")
+            {
                 main_handler_factory->addHandler(createDynamicHandlerFactory(server, config, prefix + "." + key));
+            }
             else if (handler_type == "predefined_query_handler")
+            {
                 main_handler_factory->addHandler(createPredefinedHandlerFactory(server, config, prefix + "." + key));
+            }
             else if (handler_type == "prometheus")
+            {
                 main_handler_factory->addHandler(createPrometheusHandlerFactory(server, config, async_metrics, prefix + "." + key));
+            }
             else if (handler_type == "replicas_status")
+            {
                 main_handler_factory->addHandler(createReplicasStatusHandlerFactory(server, config, prefix + "." + key));
+            }
+            else if (handler_type == "ping")
+            {
+                auto handler = createPingHandlerFactory(server);
+                handler->addFiltersFromConfig(config, prefix + "." + key);
+                main_handler_factory->addHandler(std::move(handler));
+            }
+            else if (handler_type == "play")
+            {
+                auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<PlayWebUIRequestHandler>>(server);
+                handler->addFiltersFromConfig(config, prefix + "." + key);
+                main_handler_factory->addHandler(std::move(handler));
+            }
+            else if (handler_type == "dashboard")
+            {
+                auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<DashboardWebUIRequestHandler>>(server);
+                handler->addFiltersFromConfig(config, prefix + "." + key);
+                main_handler_factory->addHandler(std::move(handler));
+            }
+            else if (handler_type == "binary")
+            {
+                auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<BinaryWebUIRequestHandler>>(server);
+                handler->addFiltersFromConfig(config, prefix + "." + key);
+                main_handler_factory->addHandler(std::move(handler));
+            }
             else
                 throw Exception(ErrorCodes::INVALID_CONFIG_PARAMETER, "Unknown handler type '{}' in config here: {}.{}.handler.type",
                     handler_type, prefix, key);
@@ -106,6 +192,7 @@ static inline HTTPRequestHandlerFactoryPtr createInterserverHTTPHandlerFactory(I
     return factory;
 }
 
+
 HTTPRequestHandlerFactoryPtr createHandlerFactory(IServer & server, const Poco::Util::AbstractConfiguration & config, AsynchronousMetrics & async_metrics, const std::string & name)
 {
     if (name == "HTTPHandler-factory" || name == "HTTPSHandler-factory")
@@ -113,9 +200,12 @@ HTTPRequestHandlerFactoryPtr createHandlerFactory(IServer & server, const Poco::
     else if (name == "InterserverIOHTTPHandler-factory" || name == "InterserverIOHTTPSHandler-factory")
         return createInterserverHTTPHandlerFactory(server, name);
     else if (name == "PrometheusHandler-factory")
-        return createPrometheusMainHandlerFactory(server, config, async_metrics, name);
+    {
+        auto metrics_writer = std::make_shared<PrometheusMetricsWriter>(config, "prometheus", async_metrics);
+        return createPrometheusMainHandlerFactory(server, config, metrics_writer, name);
+    }
 
-    throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: Unknown HTTP handler factory name.");
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown HTTP handler factory name.");
 }
 
 
@@ -131,12 +221,7 @@ void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IS
     root_handler->allowGetAndHeadRequest();
     factory.addHandler(root_handler);
 
-    auto ping_creator = [&server]() -> std::unique_ptr<StaticRequestHandler>
-    {
-        constexpr auto ping_response_expression = "Ok.\n";
-        return std::make_unique<StaticRequestHandler>(server, ping_response_expression);
-    };
-    auto ping_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<StaticRequestHandler>>(std::move(ping_creator));
+    auto ping_handler = createPingHandlerFactory(server);
     ping_handler->attachStrictPath("/ping");
     ping_handler->allowGetAndHeadRequest();
     factory.addPathToHints("/ping");
@@ -148,25 +233,25 @@ void addCommonDefaultHandlersFactory(HTTPRequestHandlerFactoryMain & factory, IS
     factory.addPathToHints("/replicas_status");
     factory.addHandler(replicas_status_handler);
 
-    auto play_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<WebUIRequestHandler>>(server);
+    auto play_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<PlayWebUIRequestHandler>>(server);
     play_handler->attachNonStrictPath("/play");
     play_handler->allowGetAndHeadRequest();
     factory.addPathToHints("/play");
     factory.addHandler(play_handler);
 
-    auto dashboard_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<WebUIRequestHandler>>(server);
+    auto dashboard_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<DashboardWebUIRequestHandler>>(server);
     dashboard_handler->attachNonStrictPath("/dashboard");
     dashboard_handler->allowGetAndHeadRequest();
     factory.addPathToHints("/dashboard");
     factory.addHandler(dashboard_handler);
 
-    auto binary_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<WebUIRequestHandler>>(server);
+    auto binary_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<BinaryWebUIRequestHandler>>(server);
     binary_handler->attachNonStrictPath("/binary");
     binary_handler->allowGetAndHeadRequest();
     factory.addPathToHints("/binary");
     factory.addHandler(binary_handler);
 
-    auto js_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<WebUIRequestHandler>>(server);
+    auto js_handler = std::make_shared<HandlingRuleHTTPHandlerFactory<JavaScriptWebUIRequestHandler>>(server);
     js_handler->attachNonStrictPath("/js/");
     js_handler->allowGetAndHeadRequest();
     factory.addHandler(js_handler);
@@ -208,7 +293,7 @@ void addDefaultHandlersFactory(
     /// Otherwise it will be created separately, see createHandlerFactory(...).
     if (config.has("prometheus") && config.getInt("prometheus.port", 0) == 0)
     {
-        PrometheusMetricsWriter writer(config, "prometheus", async_metrics);
+        auto writer = std::make_shared<PrometheusMetricsWriter>(config, "prometheus", async_metrics);
         auto creator = [&server, writer] () -> std::unique_ptr<PrometheusRequestHandler>
         {
             return std::make_unique<PrometheusRequestHandler>(server, writer);
diff --git a/src/Server/HTTPHandlerFactory.h b/src/Server/HTTPHandlerFactory.h
index 94b02e52277..ac18c36e6c9 100644
--- a/src/Server/HTTPHandlerFactory.h
+++ b/src/Server/HTTPHandlerFactory.h
@@ -6,6 +6,7 @@
 #include <Server/HTTPHandlerRequestFilter.h>
 #include <Server/HTTPRequestHandlerFactoryMain.h>
 #include <Common/StringUtils/StringUtils.h>
+#include <Server/PrometheusMetricsWriter.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
 
@@ -35,7 +36,6 @@ public:
         creator = [&server]() -> std::unique_ptr<TEndpoint> { return std::make_unique<TEndpoint>(server); };
     }
 
-
     void addFilter(Filter cur_filter)
     {
         Filter prev_filter = filter;
@@ -56,6 +56,8 @@ public:
                 continue;
             else if (filter_type == "url")
                 addFilter(urlFilter(config, prefix + ".url"));
+            else if (filter_type == "empty_query_string")
+                addFilter(emptyQueryStringFilter());
             else if (filter_type == "headers")
                 addFilter(headersFilter(config, prefix + ".headers"));
             else if (filter_type == "methods")
@@ -130,10 +132,10 @@ createPrometheusHandlerFactory(IServer & server,
     AsynchronousMetrics & async_metrics,
     const std::string & config_prefix);
 
-HTTPRequestHandlerFactoryPtr
-createPrometheusMainHandlerFactory(IServer & server,
+HTTPRequestHandlerFactoryPtr createPrometheusMainHandlerFactory(
+    IServer & server,
     const Poco::Util::AbstractConfiguration & config,
-    AsynchronousMetrics & async_metrics,
+    PrometheusMetricsWriterPtr metrics_writer,
     const std::string & name);
 
 /// @param server - used in handlers to check IServer::isCancelled()
diff --git a/src/Server/HTTPHandlerRequestFilter.h b/src/Server/HTTPHandlerRequestFilter.h
index 1f5db283323..15e64cf7f48 100644
--- a/src/Server/HTTPHandlerRequestFilter.h
+++ b/src/Server/HTTPHandlerRequestFilter.h
@@ -37,7 +37,7 @@ static inline bool checkExpression(std::string_view match_str, const std::pair<S
     return match_str == expression.first;
 }
 
-static inline auto methodsFilter(const Poco::Util::AbstractConfiguration & config, const std::string & config_path) /// NOLINT
+static inline auto methodsFilter(const Poco::Util::AbstractConfiguration & config, const std::string & config_path)
 {
     std::vector<String> methods;
     Poco::StringTokenizer tokenizer(config.getString(config_path), ",");
@@ -62,7 +62,7 @@ static inline auto getExpression(const std::string & expression)
     return std::make_pair(expression, compiled_regex);
 }
 
-static inline auto urlFilter(const Poco::Util::AbstractConfiguration & config, const std::string & config_path) /// NOLINT
+static inline auto urlFilter(const Poco::Util::AbstractConfiguration & config, const std::string & config_path)
 {
     return [expression = getExpression(config.getString(config_path))](const HTTPServerRequest & request)
     {
@@ -73,7 +73,16 @@ static inline auto urlFilter(const Poco::Util::AbstractConfiguration & config, c
     };
 }
 
-static inline auto headersFilter(const Poco::Util::AbstractConfiguration & config, const std::string & prefix) /// NOLINT
+static inline auto emptyQueryStringFilter()
+{
+    return [](const HTTPServerRequest & request)
+    {
+        const auto & uri = request.getURI();
+        return std::string::npos == uri.find('?');
+    };
+}
+
+static inline auto headersFilter(const Poco::Util::AbstractConfiguration & config, const std::string & prefix)
 {
     std::unordered_map<String, std::pair<String, CompiledRegexPtr>> headers_expression;
     Poco::Util::AbstractConfiguration::Keys headers_name;
diff --git a/src/Server/HTTPRequestHandlerFactoryMain.cpp b/src/Server/HTTPRequestHandlerFactoryMain.cpp
index 5481bcd5083..48c2ab21468 100644
--- a/src/Server/HTTPRequestHandlerFactoryMain.cpp
+++ b/src/Server/HTTPRequestHandlerFactoryMain.cpp
@@ -7,7 +7,7 @@ namespace DB
 {
 
 HTTPRequestHandlerFactoryMain::HTTPRequestHandlerFactoryMain(const std::string & name_)
-    : log(&Poco::Logger::get(name_)), name(name_)
+    : log(getLogger(name_)), name(name_)
 {
 }
 
diff --git a/src/Server/HTTPRequestHandlerFactoryMain.h b/src/Server/HTTPRequestHandlerFactoryMain.h
index 07b278d831c..1075b7d1d60 100644
--- a/src/Server/HTTPRequestHandlerFactoryMain.h
+++ b/src/Server/HTTPRequestHandlerFactoryMain.h
@@ -21,7 +21,7 @@ public:
     std::unique_ptr<HTTPRequestHandler> createRequestHandler(const HTTPServerRequest & request) override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string name;
     HTTPPathHints hints;
 
diff --git a/src/Server/InterserverIOHTTPHandler.cpp b/src/Server/InterserverIOHTTPHandler.cpp
index c41d68bab02..0d79aaa227b 100644
--- a/src/Server/InterserverIOHTTPHandler.cpp
+++ b/src/Server/InterserverIOHTTPHandler.cpp
@@ -8,8 +8,9 @@
 #include <Interpreters/InterserverIOHandler.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/WriteBufferFromHTTPServerResponse.h>
-#include <Common/setThreadName.h>
+#include <Common/ThreadStatus.h>
 #include <Common/logger_useful.h>
+#include <Common/setThreadName.h>
 
 #include <Poco/Net/HTTPBasicCredentials.h>
 #include <Poco/Util/LayeredConfiguration.h>
@@ -91,24 +92,35 @@ void InterserverIOHTTPHandler::handleRequest(HTTPServerRequest & request, HTTPSe
     used_output.out = std::make_shared<WriteBufferFromHTTPServerResponse>(
         response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout, write_event);
 
+    auto finalize_output = [&]
+    {
+        try
+        {
+            used_output.out->finalize();
+        }
+        catch (...)
+        {
+            tryLogCurrentException(log, "Failed to finalize response write buffer");
+        }
+    };
+
     auto write_response = [&](const std::string & message)
     {
-        auto & out = *used_output.out;
         if (response.sent())
         {
-            out.finalize();
+            finalize_output();
             return;
         }
 
         try
         {
-            writeString(message, out);
-            out.finalize();
+            writeString(message, *used_output.out);
+            finalize_output();
         }
         catch (...)
         {
             tryLogCurrentException(log);
-            out.finalize();
+            finalize_output();
         }
     };
 
@@ -117,7 +129,7 @@ void InterserverIOHTTPHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         if (auto [message, success] = checkAuthentication(request); success)
         {
             processQuery(request, response, used_output);
-            used_output.out->finalize();
+            finalize_output();
             LOG_DEBUG(log, "Done processing query");
         }
         else
diff --git a/src/Server/InterserverIOHTTPHandler.h b/src/Server/InterserverIOHTTPHandler.h
index 66042ad3d1d..226a06f5a45 100644
--- a/src/Server/InterserverIOHTTPHandler.h
+++ b/src/Server/InterserverIOHTTPHandler.h
@@ -26,7 +26,7 @@ class InterserverIOHTTPHandler : public HTTPRequestHandler
 public:
     explicit InterserverIOHTTPHandler(IServer & server_)
         : server(server_)
-        , log(&Poco::Logger::get("InterserverIOHTTPHandler"))
+        , log(getLogger("InterserverIOHTTPHandler"))
     {
     }
 
@@ -39,7 +39,7 @@ private:
     };
 
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     CurrentMetrics::Increment metric_increment{CurrentMetrics::InterserverConnection};
 
diff --git a/src/Server/KeeperReadinessHandler.cpp b/src/Server/KeeperReadinessHandler.cpp
index de6edd199d7..c973be040c8 100644
--- a/src/Server/KeeperReadinessHandler.cpp
+++ b/src/Server/KeeperReadinessHandler.cpp
@@ -63,7 +63,7 @@ void KeeperReadinessHandler::handleRequest(HTTPServerRequest & /*request*/, HTTP
         }
         catch (...)
         {
-            LOG_ERROR((&Poco::Logger::get("KeeperReadinessHandler")), "Cannot send exception to client");
+            LOG_ERROR((getLogger("KeeperReadinessHandler")), "Cannot send exception to client");
         }
     }
 }
diff --git a/src/Server/KeeperTCPHandler.cpp b/src/Server/KeeperTCPHandler.cpp
index 76b84f0ce6e..6709cd298e5 100644
--- a/src/Server/KeeperTCPHandler.cpp
+++ b/src/Server/KeeperTCPHandler.cpp
@@ -220,7 +220,7 @@ KeeperTCPHandler::KeeperTCPHandler(
     Poco::Timespan send_timeout_,
     const Poco::Net::StreamSocket & socket_)
     : Poco::Net::TCPServerConnection(socket_)
-    , log(&Poco::Logger::get("KeeperTCPHandler"))
+    , log(getLogger("KeeperTCPHandler"))
     , keeper_dispatcher(keeper_dispatcher_)
     , operation_timeout(
           0,
diff --git a/src/Server/KeeperTCPHandler.h b/src/Server/KeeperTCPHandler.h
index adb1baa084f..c1c522eee89 100644
--- a/src/Server/KeeperTCPHandler.h
+++ b/src/Server/KeeperTCPHandler.h
@@ -63,7 +63,7 @@ public:
     ~KeeperTCPHandler() override;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     std::shared_ptr<KeeperDispatcher> keeper_dispatcher;
     Poco::Timespan operation_timeout;
     Poco::Timespan min_session_timeout;
diff --git a/src/Server/KeeperTCPHandlerFactory.h b/src/Server/KeeperTCPHandlerFactory.h
index 36f284442c6..239bf8b5524 100644
--- a/src/Server/KeeperTCPHandlerFactory.h
+++ b/src/Server/KeeperTCPHandlerFactory.h
@@ -17,7 +17,7 @@ class KeeperTCPHandlerFactory : public TCPServerConnectionFactory
 private:
     ConfigGetter config_getter;
     std::shared_ptr<KeeperDispatcher> keeper_dispatcher;
-    Poco::Logger * log;
+    LoggerPtr log;
     Poco::Timespan receive_timeout;
     Poco::Timespan send_timeout;
 
@@ -37,7 +37,7 @@ public:
         bool secure)
         : config_getter(config_getter_)
         , keeper_dispatcher(keeper_dispatcher_)
-        , log(&Poco::Logger::get(std::string{"KeeperTCP"} + (secure ? "S" : "") + "HandlerFactory"))
+        , log(getLogger(std::string{"KeeperTCP"} + (secure ? "S" : "") + "HandlerFactory"))
         , receive_timeout(/* seconds = */ receive_timeout_seconds, /* microseconds = */ 0)
         , send_timeout(/* seconds = */ send_timeout_seconds, /* microseconds = */ 0)
     {
diff --git a/src/Server/MySQLHandler.cpp b/src/Server/MySQLHandler.cpp
index cb912e000e5..6456f6d24ff 100644
--- a/src/Server/MySQLHandler.cpp
+++ b/src/Server/MySQLHandler.cpp
@@ -15,17 +15,20 @@
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <IO/WriteBufferFromString.h>
 #include <IO/copyData.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/Session.h>
 #include <Interpreters/executeQuery.h>
 #include <Server/TCPServer.h>
 #include <Storages/IStorage.h>
 #include <base/scope_guard.h>
+#include <Common/CurrentThread.h>
 #include <Common/NetException.h>
 #include <Common/OpenSSLHelpers.h>
-#include <Common/logger_useful.h>
-#include <Common/setThreadName.h>
+#include <Common/ThreadStatus.h>
 #include <Common/config_version.h>
+#include <Common/logger_useful.h>
 #include <Common/re2.h>
+#include <Common/setThreadName.h>
 
 #if USE_SSL
 #    include <Poco/Crypto/RSAKey.h>
@@ -57,14 +60,109 @@ namespace ErrorCodes
     extern const int UNSUPPORTED_METHOD;
 }
 
-
 static const size_t PACKET_HEADER_SIZE = 4;
 static const size_t SSL_REQUEST_PAYLOAD_SIZE = 32;
 
-static String selectEmptyReplacementQuery(const String & query);
-static String showTableStatusReplacementQuery(const String & query);
-static String killConnectionIdReplacementQuery(const String & query);
-static String selectLimitReplacementQuery(const String & query);
+static bool checkShouldReplaceQuery(const String & query, const String & prefix)
+{
+    return query.length() >= prefix.length()
+        && std::equal(prefix.begin(), prefix.end(), query.begin(), [](char a, char b) { return std::tolower(a) == std::tolower(b); });
+}
+
+static bool isFederatedServerSetupSetCommand(const String & query)
+{
+    re2::RE2::Options regexp_options;
+    regexp_options.set_case_sensitive(false);
+    static const re2::RE2 expr(
+        "(^(SET NAMES(.*)))"
+        "|(^(SET character_set_results(.*)))"
+        "|(^(SET FOREIGN_KEY_CHECKS(.*)))"
+        "|(^(SET AUTOCOMMIT(.*)))"
+        "|(^(SET sql_mode(.*)))"
+        "|(^(SET @@(.*)))"
+        "|(^(SET SESSION TRANSACTION ISOLATION LEVEL(.*)))", regexp_options);
+    assert(expr.ok());
+    return re2::RE2::FullMatch(query, expr);
+}
+
+/// Always return an empty set with appropriate column definitions for SHOW WARNINGS queries
+/// See also: https://dev.mysql.com/doc/refman/8.0/en/show-warnings.html
+static String showWarningsReplacementQuery([[maybe_unused]] const String & query)
+{
+    return "SELECT '' AS Level, 0::UInt32 AS Code, '' AS Message WHERE false";
+}
+
+static String showCountWarningsReplacementQuery([[maybe_unused]] const String & query)
+{
+    return "SELECT 0::UInt64 AS `@@session.warning_count`";
+}
+
+/// Replace "[query(such as SHOW VARIABLES...)]" into "".
+static String selectEmptyReplacementQuery(const String & query)
+{
+    std::ignore = query;
+    return "select ''";
+}
+
+/// Replace "SHOW TABLE STATUS LIKE 'xx'" into "SELECT ... FROM system.tables WHERE name LIKE 'xx'".
+static String showTableStatusReplacementQuery(const String & query)
+{
+    const String prefix = "SHOW TABLE STATUS LIKE ";
+    if (query.size() > prefix.size())
+    {
+        String suffix = query.data() + prefix.length();
+        return (
+            "SELECT"
+            " name AS Name,"
+            " engine AS Engine,"
+            " '10' AS Version,"
+            " 'Dynamic' AS Row_format,"
+            " 0 AS Rows,"
+            " 0 AS Avg_row_length,"
+            " 0 AS Data_length,"
+            " 0 AS Max_data_length,"
+            " 0 AS Index_length,"
+            " 0 AS Data_free,"
+            " 'NULL' AS Auto_increment,"
+            " metadata_modification_time AS Create_time,"
+            " metadata_modification_time AS Update_time,"
+            " metadata_modification_time AS Check_time,"
+            " 'utf8_bin' AS Collation,"
+            " 'NULL' AS Checksum,"
+            " '' AS Create_options,"
+            " '' AS Comment"
+            " FROM system.tables"
+            " WHERE name LIKE "
+            + suffix);
+    }
+    return query;
+}
+
+static std::optional<String> setSettingReplacementQuery(const String & query, const String & mysql_setting, const String & clickhouse_setting)
+{
+    const String prefix = "SET " + mysql_setting;
+    // if (query.length() >= prefix.length() && boost::iequals(std::string_view(prefix), std::string_view(query.data(), 3)))
+    if (checkShouldReplaceQuery(query, prefix))
+        return "SET " + clickhouse_setting + String(query.data() + prefix.length());
+    return std::nullopt;
+}
+
+/// Replace "KILL QUERY [connection_id]" into "KILL QUERY WHERE query_id LIKE 'mysql:[connection_id]:xxx'".
+static String killConnectionIdReplacementQuery(const String & query)
+{
+    const String prefix = "KILL QUERY ";
+    if (query.size() > prefix.size())
+    {
+        String suffix = query.data() + prefix.length();
+        static const re2::RE2 expr("^[0-9]");
+        if (re2::RE2::FullMatch(suffix, expr))
+        {
+            String replacement = fmt::format("KILL QUERY WHERE query_id LIKE 'mysql:{}:%'", suffix);
+            return replacement;
+        }
+    }
+    return query;
+}
 
 MySQLHandler::MySQLHandler(
     IServer & server_,
@@ -76,7 +174,7 @@ MySQLHandler::MySQLHandler(
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , tcp_server(tcp_server_)
-    , log(&Poco::Logger::get("MySQLHandler"))
+    , log(getLogger("MySQLHandler"))
     , connection_id(connection_id_)
     , auth_plugin(new MySQLProtocol::Authentication::Native41())
     , read_event(read_event_)
@@ -86,12 +184,18 @@ MySQLHandler::MySQLHandler(
     if (ssl_enabled)
         server_capabilities |= CLIENT_SSL;
 
-    replacements.emplace("KILL QUERY", killConnectionIdReplacementQuery);
-    replacements.emplace("SHOW TABLE STATUS LIKE", showTableStatusReplacementQuery);
-    replacements.emplace("SHOW VARIABLES", selectEmptyReplacementQuery);
-    replacements.emplace("SET SQL_SELECT_LIMIT", selectLimitReplacementQuery);
+    queries_replacements.emplace("SHOW WARNINGS", showWarningsReplacementQuery);
+    queries_replacements.emplace("SHOW COUNT(*) WARNINGS", showCountWarningsReplacementQuery);
+    queries_replacements.emplace("KILL QUERY", killConnectionIdReplacementQuery);
+    queries_replacements.emplace("SHOW TABLE STATUS LIKE", showTableStatusReplacementQuery);
+    queries_replacements.emplace("SHOW VARIABLES", selectEmptyReplacementQuery);
+    settings_replacements.emplace("SQL_SELECT_LIMIT", "limit");
+    settings_replacements.emplace("NET_WRITE_TIMEOUT", "send_timeout");
+    settings_replacements.emplace("NET_READ_TIMEOUT", "receive_timeout");
 }
 
+MySQLHandler::~MySQLHandler() = default;
+
 void MySQLHandler::run()
 {
     setThreadName("MySQLHandler");
@@ -320,8 +424,6 @@ void MySQLHandler::comPing()
     packet_endpoint->sendPacket(OKPacket(0x0, client_capabilities, 0, 0, 0), true);
 }
 
-static bool isFederatedServerSetupSetCommand(const String & query);
-
 void MySQLHandler::comQuery(ReadBuffer & payload, bool binary_protocol)
 {
     String query = String(payload.position(), payload.buffer().end());
@@ -338,20 +440,38 @@ void MySQLHandler::comQuery(ReadBuffer & payload, bool binary_protocol)
         bool should_replace = false;
         bool with_output = false;
 
-        for (auto const & x : replacements)
+        // Queries replacements
+        for (auto const & [query_to_replace, replacement_fn] : queries_replacements)
         {
-            if (0 == strncasecmp(x.first.c_str(), query.c_str(), x.first.size()))
+            if (checkShouldReplaceQuery(query, query_to_replace))
             {
                 should_replace = true;
-                replacement_query = x.second(query);
+                replacement_query = replacement_fn(query);
                 break;
             }
         }
 
-        ReadBufferFromString replacement(replacement_query);
+        // Settings replacements
+        if (!should_replace)
+            for (auto const & [mysql_setting, clickhouse_setting] : settings_replacements)
+            {
+                const auto replacement_query_opt = setSettingReplacementQuery(query, mysql_setting, clickhouse_setting);
+                if (replacement_query_opt.has_value())
+                {
+                    should_replace = true;
+                    replacement_query = replacement_query_opt.value();
+                    break;
+                }
+            }
 
         auto query_context = session->makeQueryContext();
         query_context->setCurrentQueryId(fmt::format("mysql:{}:{}", connection_id, toString(UUIDHelpers::generateV4())));
+
+        /// --- Workaround for Bug 56173. Can be removed when the analyzer is on by default.
+        auto settings = query_context->getSettings();
+        settings.prefer_column_name_to_alias = true;
+        query_context->setSettings(settings);
+
         CurrentThread::QueryScope query_scope{query_context};
 
         std::atomic<size_t> affected_rows {0};
@@ -381,7 +501,14 @@ void MySQLHandler::comQuery(ReadBuffer & payload, bool binary_protocol)
             }
         };
 
-        executeQuery(should_replace ? replacement : payload, *out, false, query_context, set_result_details, QueryFlags{}, format_settings);
+        if (should_replace)
+        {
+            ReadBufferFromString replacement(replacement_query);
+            executeQuery(replacement, *out, false, query_context, set_result_details, QueryFlags{}, format_settings);
+        }
+        else
+            executeQuery(payload, *out, false, query_context, set_result_details, QueryFlags{}, format_settings);
+
 
         if (!with_output)
             packet_endpoint->sendPacket(OKPacket(0x00, client_capabilities, affected_rows, 0, 0), true);
@@ -527,87 +654,4 @@ void MySQLHandlerSSL::finishHandshakeSSL(
 }
 
 #endif
-
-static bool isFederatedServerSetupSetCommand(const String & query)
-{
-    re2::RE2::Options regexp_options;
-    regexp_options.set_case_sensitive(false);
-    static const re2::RE2 expr(
-        "(^(SET NAMES(.*)))"
-        "|(^(SET character_set_results(.*)))"
-        "|(^(SET FOREIGN_KEY_CHECKS(.*)))"
-        "|(^(SET AUTOCOMMIT(.*)))"
-        "|(^(SET sql_mode(.*)))"
-        "|(^(SET @@(.*)))"
-        "|(^(SET SESSION TRANSACTION ISOLATION LEVEL(.*)))", regexp_options);
-    assert(expr.ok());
-    return re2::RE2::FullMatch(query, expr);
-}
-
-/// Replace "[query(such as SHOW VARIABLES...)]" into "".
-static String selectEmptyReplacementQuery(const String & query)
-{
-    std::ignore = query;
-    return "select ''";
-}
-
-/// Replace "SHOW TABLE STATUS LIKE 'xx'" into "SELECT ... FROM system.tables WHERE name LIKE 'xx'".
-static String showTableStatusReplacementQuery(const String & query)
-{
-    const String prefix = "SHOW TABLE STATUS LIKE ";
-    if (query.size() > prefix.size())
-    {
-        String suffix = query.data() + prefix.length();
-        return (
-            "SELECT"
-            " name AS Name,"
-            " engine AS Engine,"
-            " '10' AS Version,"
-            " 'Dynamic' AS Row_format,"
-            " 0 AS Rows,"
-            " 0 AS Avg_row_length,"
-            " 0 AS Data_length,"
-            " 0 AS Max_data_length,"
-            " 0 AS Index_length,"
-            " 0 AS Data_free,"
-            " 'NULL' AS Auto_increment,"
-            " metadata_modification_time AS Create_time,"
-            " metadata_modification_time AS Update_time,"
-            " metadata_modification_time AS Check_time,"
-            " 'utf8_bin' AS Collation,"
-            " 'NULL' AS Checksum,"
-            " '' AS Create_options,"
-            " '' AS Comment"
-            " FROM system.tables"
-            " WHERE name LIKE "
-            + suffix);
-    }
-    return query;
-}
-
-static String selectLimitReplacementQuery(const String & query)
-{
-    const String prefix = "SET SQL_SELECT_LIMIT";
-    if (query.starts_with(prefix))
-        return "SET limit" + std::string(query.data() + prefix.length());
-    return query;
-}
-
-/// Replace "KILL QUERY [connection_id]" into "KILL QUERY WHERE query_id LIKE 'mysql:[connection_id]:xxx'".
-static String killConnectionIdReplacementQuery(const String & query)
-{
-    const String prefix = "KILL QUERY ";
-    if (query.size() > prefix.size())
-    {
-        String suffix = query.data() + prefix.length();
-        static const re2::RE2 expr("^[0-9]");
-        if (re2::RE2::FullMatch(suffix, expr))
-        {
-            String replacement = fmt::format("KILL QUERY WHERE query_id LIKE 'mysql:{}:%'", suffix);
-            return replacement;
-        }
-    }
-    return query;
-}
-
 }
diff --git a/src/Server/MySQLHandler.h b/src/Server/MySQLHandler.h
index 36d63ebca84..2f891ebf810 100644
--- a/src/Server/MySQLHandler.h
+++ b/src/Server/MySQLHandler.h
@@ -46,6 +46,8 @@ public:
         const ProfileEvents::Event & read_event_ = ProfileEvents::end(),
         const ProfileEvents::Event & write_event_ = ProfileEvents::end());
 
+    ~MySQLHandler() override;
+
     void run() final;
 
 protected:
@@ -81,7 +83,7 @@ protected:
 
     IServer & server;
     TCPServer & tcp_server;
-    Poco::Logger * log;
+    LoggerPtr log;
     uint32_t connection_id = 0;
 
     uint32_t server_capabilities = 0;
@@ -92,9 +94,13 @@ protected:
     MySQLProtocol::PacketEndpointPtr packet_endpoint;
     std::unique_ptr<Session> session;
 
-    using ReplacementFn = std::function<String(const String & query)>;
-    using Replacements = std::unordered_map<std::string, ReplacementFn>;
-    Replacements replacements;
+    using QueryReplacementFn = std::function<String(const String & query)>;
+    using QueriesReplacements = std::unordered_map<std::string, QueryReplacementFn>;
+    QueriesReplacements queries_replacements;
+
+    /// MySQL setting name --> ClickHouse setting name
+    using SettingsReplacements = std::unordered_map<std::string, std::string>;
+    SettingsReplacements settings_replacements;
 
     std::mutex prepared_statements_mutex;
     UInt32 current_prepared_statement_id TSA_GUARDED_BY(prepared_statements_mutex) = 0;
diff --git a/src/Server/MySQLHandlerFactory.cpp b/src/Server/MySQLHandlerFactory.cpp
index 79234c647aa..1dd43e6dab2 100644
--- a/src/Server/MySQLHandlerFactory.cpp
+++ b/src/Server/MySQLHandlerFactory.cpp
@@ -23,7 +23,7 @@ namespace ErrorCodes
 
 MySQLHandlerFactory::MySQLHandlerFactory(IServer & server_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
     : server(server_)
-    , log(&Poco::Logger::get("MySQLHandlerFactory"))
+    , log(getLogger("MySQLHandlerFactory"))
     , read_event(read_event_)
     , write_event(write_event_)
 {
diff --git a/src/Server/MySQLHandlerFactory.h b/src/Server/MySQLHandlerFactory.h
index 307ee3b2f0d..4108269d738 100644
--- a/src/Server/MySQLHandlerFactory.h
+++ b/src/Server/MySQLHandlerFactory.h
@@ -20,7 +20,7 @@ class MySQLHandlerFactory : public TCPServerConnectionFactory
 {
 private:
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
 
 #if USE_SSL
     struct RSADeleter
diff --git a/src/Server/NotFoundHandler.h b/src/Server/NotFoundHandler.h
index a484d237771..9820c185a3d 100644
--- a/src/Server/NotFoundHandler.h
+++ b/src/Server/NotFoundHandler.h
@@ -9,7 +9,7 @@ namespace DB
 class NotFoundHandler : public HTTPRequestHandler
 {
 public:
-    NotFoundHandler(std::vector<std::string> hints_) : hints(std::move(hints_)) {}
+    explicit NotFoundHandler(std::vector<std::string> hints_) : hints(std::move(hints_)) {}
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 private:
     std::vector<std::string> hints;
diff --git a/src/Server/PostgreSQLHandler.cpp b/src/Server/PostgreSQLHandler.cpp
index c62dc8109ea..473d681ddb2 100644
--- a/src/Server/PostgreSQLHandler.cpp
+++ b/src/Server/PostgreSQLHandler.cpp
@@ -1,17 +1,19 @@
+#include "PostgreSQLHandler.h"
 #include <IO/ReadBufferFromPocoSocket.h>
-#include <IO/ReadHelpers.h>
 #include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromPocoSocket.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/executeQuery.h>
-#include "PostgreSQLHandler.h"
 #include <Parsers/parseQuery.h>
 #include <Server/TCPServer.h>
-#include <Common/randomSeed.h>
-#include <Common/setThreadName.h>
 #include <base/scope_guard.h>
 #include <pcg_random.hpp>
+#include <Common/CurrentThread.h>
+#include <Common/ThreadStatus.h>
 #include <Common/config_version.h>
+#include <Common/randomSeed.h>
+#include <Common/setThreadName.h>
 
 #if USE_SSL
 #   include <Poco/Net/SecureStreamSocket.h>
@@ -284,6 +286,7 @@ void PostgreSQLHandler::processQuery()
         auto parse_res = splitMultipartQuery(query->query, queries,
             settings.max_query_size,
             settings.max_parser_depth,
+            settings.max_parser_backtracks,
             settings.allow_settings_after_format_in_insert);
         if (!parse_res.second)
             throw Exception(ErrorCodes::SYNTAX_ERROR, "Cannot parse and execute the following part of query: {}", String(parse_res.first));
diff --git a/src/Server/PostgreSQLHandler.h b/src/Server/PostgreSQLHandler.h
index 57b91a0ad04..1c23d896415 100644
--- a/src/Server/PostgreSQLHandler.h
+++ b/src/Server/PostgreSQLHandler.h
@@ -40,7 +40,7 @@ public:
     void run() final;
 
 private:
-    Poco::Logger * log = &Poco::Logger::get("PostgreSQLHandler");
+    LoggerPtr log = getLogger("PostgreSQLHandler");
 
     IServer & server;
     TCPServer & tcp_server;
diff --git a/src/Server/PostgreSQLHandlerFactory.cpp b/src/Server/PostgreSQLHandlerFactory.cpp
index 096bbbdcda9..29eb7567976 100644
--- a/src/Server/PostgreSQLHandlerFactory.cpp
+++ b/src/Server/PostgreSQLHandlerFactory.cpp
@@ -7,7 +7,7 @@ namespace DB
 
 PostgreSQLHandlerFactory::PostgreSQLHandlerFactory(IServer & server_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
     : server(server_)
-    , log(&Poco::Logger::get("PostgreSQLHandlerFactory"))
+    , log(getLogger("PostgreSQLHandlerFactory"))
     , read_event(read_event_)
     , write_event(write_event_)
 {
diff --git a/src/Server/PostgreSQLHandlerFactory.h b/src/Server/PostgreSQLHandlerFactory.h
index e5f762fca6d..43674306ff6 100644
--- a/src/Server/PostgreSQLHandlerFactory.h
+++ b/src/Server/PostgreSQLHandlerFactory.h
@@ -14,7 +14,7 @@ class PostgreSQLHandlerFactory : public TCPServerConnectionFactory
 {
 private:
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
     ProfileEvents::Event read_event;
     ProfileEvents::Event write_event;
 
diff --git a/src/Server/PrometheusMetricsWriter.cpp b/src/Server/PrometheusMetricsWriter.cpp
index 3d09c2165e5..85eafbe4808 100644
--- a/src/Server/PrometheusMetricsWriter.cpp
+++ b/src/Server/PrometheusMetricsWriter.cpp
@@ -1,9 +1,13 @@
 #include "PrometheusMetricsWriter.h"
 
 #include <IO/WriteHelpers.h>
+#include <Common/ErrorCodes.h>
 #include <Common/re2.h>
+
 #include <algorithm>
 
+#include "config.h"
+
 namespace
 {
 
@@ -38,8 +42,83 @@ void convertHelpToSingleLine(std::string & help)
     std::replace(help.begin(), help.end(), '\n', ' ');
 }
 
+constexpr auto profile_events_prefix = "ClickHouseProfileEvents_";
+constexpr auto current_metrics_prefix = "ClickHouseMetrics_";
+constexpr auto asynchronous_metrics_prefix = "ClickHouseAsyncMetrics_";
+constexpr auto error_metrics_prefix = "ClickHouseErrorMetric_";
+
+void writeEvent(DB::WriteBuffer & wb, ProfileEvents::Event event)
+{
+    const auto counter = ProfileEvents::global_counters[event].load(std::memory_order_relaxed);
+
+    std::string metric_name{ProfileEvents::getName(static_cast<ProfileEvents::Event>(event))};
+    std::string metric_doc{ProfileEvents::getDocumentation(static_cast<ProfileEvents::Event>(event))};
+
+    convertHelpToSingleLine(metric_doc);
+
+    if (!replaceInvalidChars(metric_name))
+        return;
+
+    std::string key{profile_events_prefix + metric_name};
+
+    writeOutLine(wb, "# HELP", key, metric_doc);
+    writeOutLine(wb, "# TYPE", key, "counter");
+    writeOutLine(wb, key, counter);
 }
 
+void writeMetric(DB::WriteBuffer & wb, size_t metric)
+{
+    const auto value = CurrentMetrics::values[metric].load(std::memory_order_relaxed);
+
+    std::string metric_name{CurrentMetrics::getName(static_cast<CurrentMetrics::Metric>(metric))};
+    std::string metric_doc{CurrentMetrics::getDocumentation(static_cast<CurrentMetrics::Metric>(metric))};
+
+    convertHelpToSingleLine(metric_doc);
+
+    if (!replaceInvalidChars(metric_name))
+        return;
+
+    std::string key{current_metrics_prefix + metric_name};
+
+    writeOutLine(wb, "# HELP", key, metric_doc);
+    writeOutLine(wb, "# TYPE", key, "gauge");
+    writeOutLine(wb, key, value);
+}
+
+void writeAsyncMetrics(DB::WriteBuffer & wb, const DB::AsynchronousMetricValues & values)
+{
+    for (const auto & name_value : values)
+    {
+        std::string key{asynchronous_metrics_prefix + name_value.first};
+
+        if (!replaceInvalidChars(key))
+            continue;
+
+        auto value = name_value.second;
+
+        std::string metric_doc{value.documentation};
+        convertHelpToSingleLine(metric_doc);
+
+        writeOutLine(wb, "# HELP", key, metric_doc);
+        writeOutLine(wb, "# TYPE", key, "gauge");
+        writeOutLine(wb, key, value.value);
+    }
+}
+
+}
+
+#if USE_NURAFT
+namespace ProfileEvents
+{
+    extern const std::vector<Event> keeper_profile_events;
+}
+
+namespace CurrentMetrics
+{
+    extern const std::vector<Metric> keeper_metrics;
+}
+#endif
+
 
 namespace DB
 {
@@ -60,65 +139,17 @@ void PrometheusMetricsWriter::write(WriteBuffer & wb) const
     if (send_events)
     {
         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 metric_name{ProfileEvents::getName(static_cast<ProfileEvents::Event>(i))};
-            std::string metric_doc{ProfileEvents::getDocumentation(static_cast<ProfileEvents::Event>(i))};
-
-            convertHelpToSingleLine(metric_doc);
-
-            if (!replaceInvalidChars(metric_name))
-                continue;
-            std::string key{profile_events_prefix + metric_name};
-
-            writeOutLine(wb, "# HELP", key, metric_doc);
-            writeOutLine(wb, "# TYPE", key, "counter");
-            writeOutLine(wb, key, counter);
-        }
+            writeEvent(wb, i);
     }
 
     if (send_metrics)
     {
         for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
-        {
-            const auto value = CurrentMetrics::values[i].load(std::memory_order_relaxed);
-
-            std::string metric_name{CurrentMetrics::getName(static_cast<CurrentMetrics::Metric>(i))};
-            std::string metric_doc{CurrentMetrics::getDocumentation(static_cast<CurrentMetrics::Metric>(i))};
-
-            convertHelpToSingleLine(metric_doc);
-
-            if (!replaceInvalidChars(metric_name))
-                continue;
-            std::string key{current_metrics_prefix + metric_name};
-
-            writeOutLine(wb, "# HELP", key, metric_doc);
-            writeOutLine(wb, "# TYPE", key, "gauge");
-            writeOutLine(wb, key, value);
-        }
+            writeMetric(wb, i);
     }
 
     if (send_asynchronous_metrics)
-    {
-        auto async_metrics_values = async_metrics.getValues();
-        for (const auto & name_value : async_metrics_values)
-        {
-            std::string key{asynchronous_metrics_prefix + name_value.first};
-
-            if (!replaceInvalidChars(key))
-                continue;
-
-            auto value = name_value.second;
-
-            std::string metric_doc{value.documentation};
-            convertHelpToSingleLine(metric_doc);
-
-            writeOutLine(wb, "# HELP", key, metric_doc);
-            writeOutLine(wb, "# TYPE", key, "gauge");
-            writeOutLine(wb, key, value.value);
-        }
-    }
+        writeAsyncMetrics(wb, async_metrics.getValues());
 
     if (send_errors)
     {
@@ -152,4 +183,24 @@ void PrometheusMetricsWriter::write(WriteBuffer & wb) const
 
 }
 
+void KeeperPrometheusMetricsWriter::write([[maybe_unused]] WriteBuffer & wb) const
+{
+#if USE_NURAFT
+    if (send_events)
+    {
+        for (auto event : ProfileEvents::keeper_profile_events)
+            writeEvent(wb, event);
+    }
+
+    if (send_metrics)
+    {
+        for (auto metric : CurrentMetrics::keeper_metrics)
+            writeMetric(wb, metric);
+    }
+
+    if (send_asynchronous_metrics)
+        writeAsyncMetrics(wb, async_metrics.getValues());
+#endif
+}
+
 }
diff --git a/src/Server/PrometheusMetricsWriter.h b/src/Server/PrometheusMetricsWriter.h
index b909a0ddcf6..933ad909ee0 100644
--- a/src/Server/PrometheusMetricsWriter.h
+++ b/src/Server/PrometheusMetricsWriter.h
@@ -3,6 +3,7 @@
 #include <string>
 
 #include <Common/AsynchronousMetrics.h>
+#include <Common/ProfileEvents.h>
 #include <IO/WriteBuffer.h>
 
 #include <Poco/Util/AbstractConfiguration.h>
@@ -19,20 +20,25 @@ public:
         const Poco::Util::AbstractConfiguration & config, const std::string & config_name,
         const AsynchronousMetrics & async_metrics_);
 
-    void write(WriteBuffer & wb) const;
+    virtual void write(WriteBuffer & wb) const;
 
-private:
+    virtual ~PrometheusMetricsWriter() = default;
+
+protected:
     const AsynchronousMetrics & async_metrics;
-
     const bool send_events;
     const bool send_metrics;
     const bool send_asynchronous_metrics;
     const bool send_errors;
-
-    static inline constexpr auto profile_events_prefix = "ClickHouseProfileEvents_";
-    static inline constexpr auto current_metrics_prefix = "ClickHouseMetrics_";
-    static inline constexpr auto asynchronous_metrics_prefix = "ClickHouseAsyncMetrics_";
-    static inline constexpr auto error_metrics_prefix = "ClickHouseErrorMetric_";
 };
 
+class KeeperPrometheusMetricsWriter : public PrometheusMetricsWriter
+{
+    using PrometheusMetricsWriter::PrometheusMetricsWriter;
+
+    void write(WriteBuffer & wb) const override;
+};
+
+using PrometheusMetricsWriterPtr = std::shared_ptr<PrometheusMetricsWriter>;
+
 }
diff --git a/src/Server/PrometheusRequestHandler.cpp b/src/Server/PrometheusRequestHandler.cpp
index 12caad5eea1..dff960f7031 100644
--- a/src/Server/PrometheusRequestHandler.cpp
+++ b/src/Server/PrometheusRequestHandler.cpp
@@ -7,6 +7,7 @@
 #include <Common/CurrentMetrics.h>
 #include <Common/Exception.h>
 #include <Common/ProfileEvents.h>
+#include "Server/PrometheusMetricsWriter.h"
 
 #include <Poco/Util/LayeredConfiguration.h>
 
@@ -23,6 +24,10 @@ void PrometheusRequestHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         const auto & config = server.config();
         unsigned keep_alive_timeout = config.getUInt("keep_alive_timeout", DEFAULT_HTTP_KEEP_ALIVE_TIMEOUT);
 
+        /// In order to make keep-alive works.
+        if (request.getVersion() == HTTPServerRequest::HTTP_1_1)
+            response.setChunkedTransferEncoding(true);
+
         setResponseDefaultHeaders(response, keep_alive_timeout);
 
         response.setContentType("text/plain; version=0.0.4; charset=UTF-8");
@@ -30,7 +35,7 @@ void PrometheusRequestHandler::handleRequest(HTTPServerRequest & request, HTTPSe
         WriteBufferFromHTTPServerResponse wb(response, request.getMethod() == Poco::Net::HTTPRequest::HTTP_HEAD, keep_alive_timeout, write_event);
         try
         {
-            metrics_writer.write(wb);
+            metrics_writer->write(wb);
             wb.finalize();
         }
         catch (...)
@@ -50,7 +55,7 @@ HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactory(
     AsynchronousMetrics & async_metrics,
     const std::string & config_prefix)
 {
-    PrometheusMetricsWriter writer(config, config_prefix + ".handler", async_metrics);
+    auto writer = std::make_shared<PrometheusMetricsWriter>(config, config_prefix + ".handler", async_metrics);
     auto creator = [&server, writer]() -> std::unique_ptr<PrometheusRequestHandler>
     {
         return std::make_unique<PrometheusRequestHandler>(server, writer);
@@ -62,13 +67,12 @@ HTTPRequestHandlerFactoryPtr createPrometheusHandlerFactory(
 }
 
 HTTPRequestHandlerFactoryPtr createPrometheusMainHandlerFactory(
-    IServer & server, const Poco::Util::AbstractConfiguration & config, AsynchronousMetrics & async_metrics, const std::string & name)
+    IServer & server, const Poco::Util::AbstractConfiguration & config, PrometheusMetricsWriterPtr metrics_writer, const std::string & name)
 {
     auto factory = std::make_shared<HTTPRequestHandlerFactoryMain>(name);
-    PrometheusMetricsWriter writer(config, "prometheus", async_metrics);
-    auto creator = [&server, writer]() -> std::unique_ptr<PrometheusRequestHandler>
+    auto creator = [&server, metrics_writer]
     {
-        return std::make_unique<PrometheusRequestHandler>(server, writer);
+        return std::make_unique<PrometheusRequestHandler>(server, metrics_writer);
     };
 
     auto handler = std::make_shared<HandlingRuleHTTPHandlerFactory<PrometheusRequestHandler>>(std::move(creator));
diff --git a/src/Server/PrometheusRequestHandler.h b/src/Server/PrometheusRequestHandler.h
index 9ec54cc2e4e..d120752c8c5 100644
--- a/src/Server/PrometheusRequestHandler.h
+++ b/src/Server/PrometheusRequestHandler.h
@@ -13,12 +13,12 @@ class PrometheusRequestHandler : public HTTPRequestHandler
 {
 private:
     IServer & server;
-    const PrometheusMetricsWriter & metrics_writer;
+    PrometheusMetricsWriterPtr metrics_writer;
 
 public:
-    PrometheusRequestHandler(IServer & server_, const PrometheusMetricsWriter & metrics_writer_)
+    PrometheusRequestHandler(IServer & server_, PrometheusMetricsWriterPtr metrics_writer_)
         : server(server_)
-        , metrics_writer(metrics_writer_)
+        , metrics_writer(std::move(metrics_writer_))
     {
     }
 
diff --git a/src/Server/ProxyV1Handler.h b/src/Server/ProxyV1Handler.h
index b50c2acbc55..a044b9a966b 100644
--- a/src/Server/ProxyV1Handler.h
+++ b/src/Server/ProxyV1Handler.h
@@ -13,7 +13,7 @@ class ProxyV1Handler : public Poco::Net::TCPServerConnection
     using StreamSocket = Poco::Net::StreamSocket;
 public:
     explicit ProxyV1Handler(const StreamSocket & socket, IServer & server_, const std::string & conf_name_, TCPProtocolStackData & stack_data_)
-        : Poco::Net::TCPServerConnection(socket), log(&Poco::Logger::get("ProxyV1Handler")), server(server_), conf_name(conf_name_), stack_data(stack_data_) {}
+        : Poco::Net::TCPServerConnection(socket), log(getLogger("ProxyV1Handler")), server(server_), conf_name(conf_name_), stack_data(stack_data_) {}
 
     void run() override;
 
@@ -21,7 +21,7 @@ protected:
     bool readWord(int max_len, std::string & word, bool & eol);
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     IServer & server;
     std::string conf_name;
     TCPProtocolStackData & stack_data;
diff --git a/src/Server/ProxyV1HandlerFactory.h b/src/Server/ProxyV1HandlerFactory.h
index 028596d745d..0398c8c1ccf 100644
--- a/src/Server/ProxyV1HandlerFactory.h
+++ b/src/Server/ProxyV1HandlerFactory.h
@@ -16,7 +16,7 @@ class ProxyV1HandlerFactory : public TCPServerConnectionFactory
 {
 private:
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string conf_name;
 
     class DummyTCPHandler : public Poco::Net::TCPServerConnection
@@ -28,7 +28,7 @@ private:
 
 public:
     explicit ProxyV1HandlerFactory(IServer & server_, const std::string & conf_name_)
-        : server(server_), log(&Poco::Logger::get("ProxyV1HandlerFactory")), conf_name(conf_name_)
+        : server(server_), log(getLogger("ProxyV1HandlerFactory")), conf_name(conf_name_)
     {
     }
 
diff --git a/src/Server/ReplicasStatusHandler.cpp b/src/Server/ReplicasStatusHandler.cpp
index 07f3b67b6a7..67823117758 100644
--- a/src/Server/ReplicasStatusHandler.cpp
+++ b/src/Server/ReplicasStatusHandler.cpp
@@ -51,7 +51,10 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
             if (!db.second->canContainMergeTreeTables())
                 continue;
 
-            for (auto iterator = db.second->getTablesIterator(getContext()); iterator->isValid(); iterator->next())
+            // Note that in case `async_load_databases = true` we do not want replica status handler to be hanging
+            // and waiting (in getTablesIterator() call) for every table to be load, so we just skip not-yet-loaded tables.
+            // If they have some lag it will be reflected as soon as they are load.
+            for (auto iterator = db.second->getTablesIterator(getContext(), {}, true); iterator->isValid(); iterator->next())
             {
                 const auto & table = iterator->table();
                 if (!table)
@@ -118,7 +121,7 @@ void ReplicasStatusHandler::handleRequest(HTTPServerRequest & request, HTTPServe
         }
         catch (...)
         {
-            LOG_ERROR((&Poco::Logger::get("ReplicasStatusHandler")), "Cannot send exception to client");
+            LOG_ERROR((getLogger("ReplicasStatusHandler")), "Cannot send exception to client");
         }
     }
 }
diff --git a/src/Server/TCPHandler.cpp b/src/Server/TCPHandler.cpp
index fa7206eeaac..4e3d6ab69f6 100644
--- a/src/Server/TCPHandler.cpp
+++ b/src/Server/TCPHandler.cpp
@@ -1,5 +1,4 @@
 #include "Interpreters/AsynchronousInsertQueue.h"
-#include "Interpreters/Context_fwd.h"
 #include "Interpreters/SquashingTransform.h"
 #include "Parsers/ASTInsertQuery.h"
 #include <algorithm>
@@ -35,12 +34,10 @@
 #include <Server/TCPServer.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/MergeTreeDataPartUUID.h>
-#include <Storages/StorageS3Cluster.h>
 #include <Core/ExternalTable.h>
 #include <Core/ServerSettings.h>
 #include <Access/AccessControl.h>
 #include <Access/Credentials.h>
-#include <DataTypes/DataTypeLowCardinality.h>
 #include <Compression/CompressionFactory.h>
 #include <Common/logger_useful.h>
 #include <Common/CurrentMetrics.h>
@@ -184,29 +181,47 @@ void validateClientInfo(const ClientInfo & session_client_info, const ClientInfo
 namespace DB
 {
 
-TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
+TCPHandler::TCPHandler(
+    IServer & server_,
+    TCPServer & tcp_server_,
+    const Poco::Net::StreamSocket & socket_,
+    bool parse_proxy_protocol_,
+    std::string server_display_name_,
+    std::string host_name_,
+    const ProfileEvents::Event & read_event_,
+    const ProfileEvents::Event & write_event_)
     : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , tcp_server(tcp_server_)
     , parse_proxy_protocol(parse_proxy_protocol_)
-    , log(&Poco::Logger::get("TCPHandler"))
+    , log(getLogger("TCPHandler"))
     , read_event(read_event_)
     , write_event(write_event_)
     , server_display_name(std::move(server_display_name_))
+    , host_name(std::move(host_name_))
 {
 }
 
-TCPHandler::TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_, const ProfileEvents::Event & read_event_, const ProfileEvents::Event & write_event_)
-: Poco::Net::TCPServerConnection(socket_)
+TCPHandler::TCPHandler(
+    IServer & server_,
+    TCPServer & tcp_server_,
+    const Poco::Net::StreamSocket & socket_,
+    TCPProtocolStackData & stack_data,
+    std::string server_display_name_,
+    std::string host_name_,
+    const ProfileEvents::Event & read_event_,
+    const ProfileEvents::Event & write_event_)
+    : Poco::Net::TCPServerConnection(socket_)
     , server(server_)
     , tcp_server(tcp_server_)
-    , log(&Poco::Logger::get("TCPHandler"))
+    , log(getLogger("TCPHandler"))
     , forwarded_for(stack_data.forwarded_for)
     , certificate(stack_data.certificate)
     , read_event(read_event_)
     , write_event(write_event_)
     , default_database(stack_data.default_database)
     , server_display_name(std::move(server_display_name_))
+    , host_name(std::move(host_name_))
 {
     if (!forwarded_for.empty())
         LOG_TRACE(log, "Forwarded client address: {}", forwarded_for);
@@ -521,7 +536,7 @@ void TCPHandler::runImpl()
             }
             else if (state.io.pipeline.pulling())
             {
-                processOrdinaryQueryWithProcessors();
+                processOrdinaryQuery();
                 finish_or_cancel();
             }
             else if (state.io.pipeline.completed())
@@ -907,7 +922,7 @@ void TCPHandler::processInsertQuery()
     Block processed_block;
     const auto & settings = query_context->getSettingsRef();
 
-    auto * insert_queue = query_context->getAsynchronousInsertQueue();
+    auto * insert_queue = query_context->tryGetAsynchronousInsertQueue();
     const auto & insert_query = assert_cast<const ASTInsertQuery &>(*state.parsed_query);
 
     bool async_insert_enabled = settings.async_insert;
@@ -917,16 +932,33 @@ void TCPHandler::processInsertQuery()
 
     if (insert_queue && async_insert_enabled && !insert_query.select)
     {
+        /// Let's agree on terminology and say that a mini-INSERT is an asynchronous INSERT
+        /// which typically contains not a lot of data inside and a big-INSERT in an INSERT
+        /// which was formed by concatenating several mini-INSERTs together.
+        /// In case when the client had to retry some mini-INSERTs then they will be properly deduplicated
+        /// by the source tables. This functionality is controlled by a setting `async_insert_deduplicate`.
+        /// But then they will be glued together into a block and pushed through a chain of Materialized Views if any.
+        /// The process of forming such blocks is not deteministic so each time we retry mini-INSERTs the resulting
+        /// block may be concatenated differently.
+        /// That's why deduplication in dependent Materialized Views doesn't make sense in presence of async INSERTs.
+        if (settings.throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert &&
+            settings.deduplicate_blocks_in_dependent_materialized_views)
+            throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
+                    "Deduplication is dependent materialized view cannot work together with async inserts. "\
+                    "Please disable eiher `deduplicate_blocks_in_dependent_materialized_views` or `async_insert` setting.");
+
         auto result = processAsyncInsertQuery(*insert_queue);
         if (result.status == AsynchronousInsertQueue::PushResult::OK)
         {
+            /// Reset pipeline because it may hold write lock for some storages.
+            state.io.pipeline.reset();
             if (settings.wait_for_async_insert)
             {
                 size_t timeout_ms = settings.wait_for_async_insert_timeout.totalMilliseconds();
                 auto wait_status = result.future.wait_for(std::chrono::milliseconds(timeout_ms));
 
                 if (wait_status == std::future_status::deferred)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: got future in deferred state");
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Got future in deferred state");
 
                 if (wait_status == std::future_status::timeout)
                     throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Wait for async insert timeout ({} ms) exceeded)", timeout_ms);
@@ -952,14 +984,14 @@ void TCPHandler::processInsertQuery()
     else
     {
         PushingPipelineExecutor executor(state.io.pipeline);
-        run_executor(executor, processed_block);
+        run_executor(executor, std::move(processed_block));
     }
 
     sendInsertProfileEvents();
 }
 
 
-void TCPHandler::processOrdinaryQueryWithProcessors()
+void TCPHandler::processOrdinaryQuery()
 {
     auto & pipeline = state.io.pipeline;
 
@@ -1092,6 +1124,7 @@ void TCPHandler::processTablesStatusRequest()
         {
             status.is_replicated = true;
             status.absolute_delay = static_cast<UInt32>(replicated_table->getAbsoluteDelay());
+            status.is_readonly = replicated_table->isTableReadOnly();
         }
         else
             status.is_replicated = false;
@@ -1201,7 +1234,7 @@ void TCPHandler::sendExtremes(const Block & extremes)
 void TCPHandler::sendProfileEvents()
 {
     Block block;
-    ProfileEvents::getProfileEvents(server_display_name, state.profile_queue, block, last_sent_snapshots);
+    ProfileEvents::getProfileEvents(host_name, state.profile_queue, block, last_sent_snapshots);
     if (block.rows() != 0)
     {
         initProfileEventsBlockOutput(block);
@@ -1338,17 +1371,6 @@ std::string formatHTTPErrorResponseWhenUserIsConnectedToWrongPort(const Poco::Ut
     return result;
 }
 
-[[ maybe_unused ]] String createChallenge()
-{
-#if USE_SSL
-    pcg64_fast rng(randomSeed());
-    UInt64 rand = rng();
-    return encodeSHA256(&rand, sizeof(rand));
-#else
-    throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Can't generate challenge, because ClickHouse was built without OpenSSL");
-#endif
-}
-
 }
 
 std::unique_ptr<Session> TCPHandler::makeSession()
@@ -1366,16 +1388,6 @@ std::unique_ptr<Session> TCPHandler::makeSession()
     return res;
 }
 
-String TCPHandler::prepareStringForSshValidation(String username, String challenge)
-{
-    String output;
-    output.append(std::to_string(client_tcp_protocol_version));
-    output.append(default_database);
-    output.append(username);
-    output.append(challenge);
-    return output;
-}
-
 void TCPHandler::receiveHello()
 {
     /// Receive `hello` packet.
@@ -1433,11 +1445,9 @@ void TCPHandler::receiveHello()
         return;
     }
 
-    is_ssh_based_auth = startsWith(user, EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER) && password.empty();
+    is_ssh_based_auth = user.starts_with(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER) && password.empty();
     if (is_ssh_based_auth)
-    {
-        user.erase(0, String(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER).size());
-    }
+        user.erase(0, std::string_view(EncodedUserInfo::SSH_KEY_AUTHENTICAION_MARKER).size());
 
     session = makeSession();
     const auto & client_info = session->getClientInfo();
@@ -1465,7 +1475,9 @@ void TCPHandler::receiveHello()
             }
         }
     }
+#endif
 
+#if USE_SSH
     /// Perform handshake for SSH authentication
     if (is_ssh_based_auth)
     {
@@ -1479,7 +1491,14 @@ void TCPHandler::receiveHello()
         if (packet_type != Protocol::Client::SSHChallengeRequest)
             throw Exception(ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT, "Server expected to receive a packet for requesting a challenge string");
 
-        auto challenge = createChallenge();
+        auto create_challenge = []()
+        {
+            pcg64_fast rng(randomSeed());
+            UInt64 rand = rng();
+            return encodeSHA256(&rand, sizeof(rand));
+        };
+
+        String challenge = create_challenge();
         writeVarUInt(Protocol::Server::SSHChallenge, *out);
         writeStringBinary(challenge, *out);
         out->next();
@@ -1490,7 +1509,17 @@ void TCPHandler::receiveHello()
             throw Exception(ErrorCodes::UNEXPECTED_PACKET_FROM_CLIENT, "Server expected to receive a packet with a response for a challenge");
         readStringBinary(signature, *in);
 
-        auto cred = SshCredentials(user, signature, prepareStringForSshValidation(user, challenge));
+        auto prepare_string_for_ssh_validation = [&](const String & username, const String & challenge_)
+        {
+            String output;
+            output.append(std::to_string(client_tcp_protocol_version));
+            output.append(default_database);
+            output.append(username);
+            output.append(challenge_);
+            return output;
+        };
+
+        auto cred = SshCredentials(user, signature, prepare_string_for_ssh_validation(user, challenge));
         session->authenticate(cred, getClientAddress(client_info));
         return;
     }
@@ -2151,7 +2180,7 @@ void TCPHandler::sendData(const Block & block)
         /// For testing hedged requests
         if (unknown_packet_in_send_data)
         {
-            constexpr UInt64 marker = (1ULL<<63) - 1;
+            constexpr UInt64 marker = (1ULL << 63) - 1;
             --unknown_packet_in_send_data;
             if (unknown_packet_in_send_data == 0)
                 writeVarUInt(marker, *out);
diff --git a/src/Server/TCPHandler.h b/src/Server/TCPHandler.h
index 4eb84ee5eee..191617f1905 100644
--- a/src/Server/TCPHandler.h
+++ b/src/Server/TCPHandler.h
@@ -147,8 +147,24 @@ public:
       *  because it allows to check the IP ranges of the trusted proxy.
       * Proxy-forwarded (original client) IP address is used for quota accounting if quota is keyed by forwarded IP.
       */
-    TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, bool parse_proxy_protocol_, std::string server_display_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
-    TCPHandler(IServer & server_, TCPServer & tcp_server_, const Poco::Net::StreamSocket & socket_, TCPProtocolStackData & stack_data, std::string server_display_name_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end());
+    TCPHandler(
+        IServer & server_,
+        TCPServer & tcp_server_,
+        const Poco::Net::StreamSocket & socket_,
+        bool parse_proxy_protocol_,
+        String server_display_name_,
+        String host_name_,
+        const ProfileEvents::Event & read_event_ = ProfileEvents::end(),
+        const ProfileEvents::Event & write_event_ = ProfileEvents::end());
+    TCPHandler(
+        IServer & server_,
+        TCPServer & tcp_server_,
+        const Poco::Net::StreamSocket & socket_,
+        TCPProtocolStackData & stack_data,
+        String server_display_name_,
+        String host_name_,
+        const ProfileEvents::Event & read_event_ = ProfileEvents::end(),
+        const ProfileEvents::Event & write_event_ = ProfileEvents::end());
     ~TCPHandler() override;
 
     void run() override;
@@ -160,7 +176,7 @@ private:
     IServer & server;
     TCPServer & tcp_server;
     bool parse_proxy_protocol = false;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     String forwarded_for;
     String certificate;
@@ -200,7 +216,7 @@ private:
 
     String default_database;
 
-    bool is_ssh_based_auth = false;
+    bool is_ssh_based_auth = false; /// authentication is via SSH pub-key challenge
     /// For inter-server secret (remote_server.*.secret)
     bool is_interserver_mode = false;
     bool is_interserver_authenticated = false;
@@ -225,13 +241,13 @@ private:
 
     /// It is the name of the server that will be sent to the client.
     String server_display_name;
+    String host_name;
 
     void runImpl();
 
     void extractConnectionSettingsFromContext(const ContextPtr & context);
 
     std::unique_ptr<Session> makeSession();
-    String prepareStringForSshValidation(String user, String challenge);
 
     bool receiveProxyHeader();
     void receiveHello();
@@ -261,8 +277,6 @@ private:
     /// Process a request that does not require the receiving of data blocks from the client
     void processOrdinaryQuery();
 
-    void processOrdinaryQueryWithProcessors();
-
     void processTablesStatusRequest();
 
     void sendHello();
diff --git a/src/Server/TCPHandlerFactory.h b/src/Server/TCPHandlerFactory.h
index 3eb032f4250..4e9963d2c6e 100644
--- a/src/Server/TCPHandlerFactory.h
+++ b/src/Server/TCPHandlerFactory.h
@@ -18,7 +18,8 @@ class TCPHandlerFactory : public TCPServerConnectionFactory
 private:
     IServer & server;
     bool parse_proxy_protocol = false;
-    Poco::Logger * log;
+    LoggerPtr log;
+    std::string host_name;
     std::string server_display_name;
 
     ProfileEvents::Event read_event;
@@ -38,11 +39,12 @@ public:
       */
     TCPHandlerFactory(IServer & server_, bool secure_, bool parse_proxy_protocol_, const ProfileEvents::Event & read_event_ = ProfileEvents::end(), const ProfileEvents::Event & write_event_ = ProfileEvents::end())
         : server(server_), parse_proxy_protocol(parse_proxy_protocol_)
-        , log(&Poco::Logger::get(std::string("TCP") + (secure_ ? "S" : "") + "HandlerFactory"))
+        , log(getLogger(std::string("TCP") + (secure_ ? "S" : "") + "HandlerFactory"))
         , read_event(read_event_)
         , write_event(write_event_)
     {
-        server_display_name = server.config().getString("display_name", getFQDNOrHostName());
+        host_name = getFQDNOrHostName();
+        server_display_name = server.config().getString("display_name", host_name);
     }
 
     Poco::Net::TCPServerConnection * createConnection(const Poco::Net::StreamSocket & socket, TCPServer & tcp_server) override
@@ -50,7 +52,7 @@ public:
         try
         {
             LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
-            return new TCPHandler(server, tcp_server, socket, parse_proxy_protocol, server_display_name, read_event, write_event);
+            return new TCPHandler(server, tcp_server, socket, parse_proxy_protocol, server_display_name, host_name, read_event, write_event);
         }
         catch (const Poco::Net::NetException &)
         {
@@ -64,7 +66,7 @@ public:
         try
         {
             LOG_TRACE(log, "TCP Request. Address: {}", socket.peerAddress().toString());
-            return new TCPHandler(server, tcp_server, socket, stack_data, server_display_name, read_event, write_event);
+            return new TCPHandler(server, tcp_server, socket, stack_data, server_display_name, host_name, read_event, write_event);
         }
         catch (const Poco::Net::NetException &)
         {
diff --git a/src/Server/TCPProtocolStackFactory.h b/src/Server/TCPProtocolStackFactory.h
index 7373e6e1c4e..b76bb8d72fd 100644
--- a/src/Server/TCPProtocolStackFactory.h
+++ b/src/Server/TCPProtocolStackFactory.h
@@ -23,7 +23,7 @@ class TCPProtocolStackFactory : public TCPServerConnectionFactory
 {
 private:
     IServer & server [[maybe_unused]];
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string conf_name;
     std::vector<TCPServerConnectionFactory::Ptr> stack;
     AllowedClientHosts allowed_client_hosts;
@@ -38,7 +38,7 @@ private:
 public:
     template <typename... T>
     explicit TCPProtocolStackFactory(IServer & server_, const std::string & conf_name_, T... factory)
-        : server(server_), log(&Poco::Logger::get("TCPProtocolStackFactory")), conf_name(conf_name_), stack({factory...})
+        : server(server_), log(getLogger("TCPProtocolStackFactory")), conf_name(conf_name_), stack({factory...})
     {
         const auto & config = server.config();
         /// Fill list of allowed hosts.
diff --git a/src/Server/TLSHandlerFactory.h b/src/Server/TLSHandlerFactory.h
index 9e3002d2971..19602c7d25e 100644
--- a/src/Server/TLSHandlerFactory.h
+++ b/src/Server/TLSHandlerFactory.h
@@ -19,7 +19,7 @@ class TLSHandlerFactory : public TCPServerConnectionFactory
 {
 private:
     IServer & server;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::string conf_name;
 
     class DummyTCPHandler : public Poco::Net::TCPServerConnection
@@ -31,7 +31,7 @@ private:
 
 public:
     explicit TLSHandlerFactory(IServer & server_, const std::string & conf_name_)
-        : server(server_), log(&Poco::Logger::get("TLSHandlerFactory")), conf_name(conf_name_)
+        : server(server_), log(getLogger("TLSHandlerFactory")), conf_name(conf_name_)
     {
     }
 
diff --git a/src/Server/WebUIRequestHandler.cpp b/src/Server/WebUIRequestHandler.cpp
index ac7a3bfccf3..68d3ff0b325 100644
--- a/src/Server/WebUIRequestHandler.cpp
+++ b/src/Server/WebUIRequestHandler.cpp
@@ -17,65 +17,77 @@
 INCBIN(resource_play_html, SOURCE_DIR "/programs/server/play.html");
 INCBIN(resource_dashboard_html, SOURCE_DIR "/programs/server/dashboard.html");
 INCBIN(resource_uplot_js, SOURCE_DIR "/programs/server/js/uplot.js");
+INCBIN(resource_lz_string_js, SOURCE_DIR "/programs/server/js/lz-string.js");
 INCBIN(resource_binary_html, SOURCE_DIR "/programs/server/binary.html");
 
 
 namespace DB
 {
 
-WebUIRequestHandler::WebUIRequestHandler(IServer & server_)
-    : server(server_)
-{
-}
+PlayWebUIRequestHandler::PlayWebUIRequestHandler(IServer & server_) : server(server_) {}
+DashboardWebUIRequestHandler::DashboardWebUIRequestHandler(IServer & server_) : server(server_) {}
+BinaryWebUIRequestHandler::BinaryWebUIRequestHandler(IServer & server_) : server(server_) {}
+JavaScriptWebUIRequestHandler::JavaScriptWebUIRequestHandler(IServer & server_) : server(server_) {}
 
-
-void WebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & /*write_event*/)
+static void handle(const IServer & server, HTTPServerRequest & request, HTTPServerResponse & response, std::string_view html)
 {
     auto keep_alive_timeout = server.context()->getServerSettings().keep_alive_timeout.totalSeconds();
 
     response.setContentType("text/html; charset=UTF-8");
-
     if (request.getVersion() == HTTPServerRequest::HTTP_1_1)
         response.setChunkedTransferEncoding(true);
 
     setResponseDefaultHeaders(response, keep_alive_timeout);
+    response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
+    WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(html.data(), html.size());
 
-    if (request.getURI().starts_with("/play"))
+}
+
+void PlayWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
+{
+    handle(server, request, response, {reinterpret_cast<const char *>(gresource_play_htmlData), gresource_play_htmlSize});
+}
+
+void DashboardWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
+{
+    std::string html(reinterpret_cast<const char *>(gresource_dashboard_htmlData), gresource_dashboard_htmlSize);
+
+    /// Replace a link to external JavaScript file to embedded file.
+    /// This allows to open the HTML without running a server and to host it on server.
+    /// Note: we can embed the JavaScript file inline to the HTML,
+    /// but we don't do it to keep the "view-source" perfectly readable.
+
+    static re2::RE2 uplot_url = R"(https://[^\s"'`]+u[Pp]lot[^\s"'`]*\.js)";
+    RE2::Replace(&html, uplot_url, "/js/uplot.js");
+
+    static re2::RE2 lz_string_url = R"(https://[^\s"'`]+lz-string[^\s"'`]*\.js)";
+    RE2::Replace(&html, lz_string_url, "/js/lz-string.js");
+
+    handle(server, request, response, html);
+}
+
+void BinaryWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
+{
+    handle(server, request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize});
+}
+
+void JavaScriptWebUIRequestHandler::handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event &)
+{
+    if (request.getURI() == "/js/uplot.js")
     {
-        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
-        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(reinterpret_cast<const char *>(gresource_play_htmlData), gresource_play_htmlSize);
+        handle(server, request, response, {reinterpret_cast<const char *>(gresource_uplot_jsData), gresource_uplot_jsSize});
     }
-    else if (request.getURI().starts_with("/dashboard"))
+    else if (request.getURI() == "/js/lz-string.js")
     {
-        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
-
-        std::string html(reinterpret_cast<const char *>(gresource_dashboard_htmlData), gresource_dashboard_htmlSize);
-
-        /// Replace a link to external JavaScript file to embedded file.
-        /// This allows to open the HTML without running a server and to host it on server.
-        /// Note: we can embed the JavaScript file inline to the HTML,
-        /// but we don't do it to keep the "view-source" perfectly readable.
-
-        static re2::RE2 uplot_url = R"(https://[^\s"'`]+u[Pp]lot[^\s"'`]*\.js)";
-        RE2::Replace(&html, uplot_url, "/js/uplot.js");
-
-        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(html);
-    }
-    else if (request.getURI().starts_with("/binary"))
-    {
-        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
-        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize);
-    }
-    else if (request.getURI() == "/js/uplot.js")
-    {
-        response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_OK);
-        WriteBufferFromHTTPServerResponse(response, request.getMethod() == HTTPRequest::HTTP_HEAD, keep_alive_timeout).write(reinterpret_cast<const char *>(gresource_uplot_jsData), gresource_uplot_jsSize);
+        handle(server, request, response, {reinterpret_cast<const char *>(gresource_lz_string_jsData), gresource_lz_string_jsSize});
     }
     else
     {
         response.setStatusAndReason(Poco::Net::HTTPResponse::HTTP_NOT_FOUND);
         *response.send() << "Not found.\n";
     }
+
+    handle(server, request, response, {reinterpret_cast<const char *>(gresource_binary_htmlData), gresource_binary_htmlSize});
 }
 
 }
diff --git a/src/Server/WebUIRequestHandler.h b/src/Server/WebUIRequestHandler.h
index c52946e2089..b84c8f6534d 100644
--- a/src/Server/WebUIRequestHandler.h
+++ b/src/Server/WebUIRequestHandler.h
@@ -9,13 +9,40 @@ namespace DB
 class IServer;
 
 /// Response with HTML page that allows to send queries and show results in browser.
-class WebUIRequestHandler : public HTTPRequestHandler
+
+class PlayWebUIRequestHandler : public HTTPRequestHandler
 {
 private:
     IServer & server;
-
 public:
-    WebUIRequestHandler(IServer & server_);
+    explicit PlayWebUIRequestHandler(IServer & server_);
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
+};
+
+class DashboardWebUIRequestHandler : public HTTPRequestHandler
+{
+private:
+    IServer & server;
+public:
+    explicit DashboardWebUIRequestHandler(IServer & server_);
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
+};
+
+class BinaryWebUIRequestHandler : public HTTPRequestHandler
+{
+private:
+    IServer & server;
+public:
+    explicit BinaryWebUIRequestHandler(IServer & server_);
+    void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
+};
+
+class JavaScriptWebUIRequestHandler : public HTTPRequestHandler
+{
+private:
+    IServer & server;
+public:
+    explicit JavaScriptWebUIRequestHandler(IServer & server_);
     void handleRequest(HTTPServerRequest & request, HTTPServerResponse & response, const ProfileEvents::Event & write_event) override;
 };
 
diff --git a/src/Server/waitServersToFinish.h b/src/Server/waitServersToFinish.h
index b6daa025964..2eb3092fc0c 100644
--- a/src/Server/waitServersToFinish.h
+++ b/src/Server/waitServersToFinish.h
@@ -1,4 +1,7 @@
 #pragma once
+
+#include <mutex>
+
 #include <Core/Types.h>
 
 namespace DB
diff --git a/src/Storages/AlterCommands.cpp b/src/Storages/AlterCommands.cpp
index 1fb53475801..281fc72dfc4 100644
--- a/src/Storages/AlterCommands.cpp
+++ b/src/Storages/AlterCommands.cpp
@@ -31,11 +31,10 @@
 #include <Parsers/queryToString.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/IStorage.h>
-#include <Storages/LightweightDeleteDescription.h>
-#include <Storages/BlockNumberColumn.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Common/typeid_cast.h>
 #include <Common/randomSeed.h>
+#include <Storages/MergeTree/MergeTreeSettings.h>
 
 #include <ranges>
 
@@ -74,6 +73,8 @@ AlterCommand::RemoveProperty removePropertyFromString(const String & property)
         return AlterCommand::RemoveProperty::CODEC;
     else if (property == "TTL")
         return AlterCommand::RemoveProperty::TTL;
+    else if (property == "SETTINGS")
+        return AlterCommand::RemoveProperty::SETTINGS;
 
     throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot remove unknown property '{}'", property);
 }
@@ -137,7 +138,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
             command.clear = true;
 
         if (command_ast->partition)
-            command.partition = command_ast->partition;
+            command.partition = command_ast->partition->clone();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::MODIFY_COLUMN)
@@ -173,6 +174,25 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         if (ast_col_decl.codec)
             command.codec = ast_col_decl.codec;
 
+        if (ast_col_decl.settings)
+            command.settings_changes = ast_col_decl.settings->as<ASTSetQuery &>().changes;
+
+        /// At most only one of ast_col_decl.settings or command_ast->settings_changes is non-null
+        if (command_ast->settings_changes)
+        {
+            command.settings_changes = command_ast->settings_changes->as<ASTSetQuery &>().changes;
+            command.append_column_setting = true;
+        }
+
+        if (command_ast->settings_resets)
+        {
+            for (const ASTPtr & identifier_ast : command_ast->settings_resets->children)
+            {
+                const auto & identifier = identifier_ast->as<ASTIdentifier &>();
+                command.settings_resets.emplace(identifier.name());
+            }
+        }
+
         if (command_ast->column)
             command.after_column = getIdentifierName(command_ast->column);
 
@@ -206,7 +226,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         AlterCommand command;
         command.ast = command_ast->clone();
         command.type = AlterCommand::MODIFY_ORDER_BY;
-        command.order_by = command_ast->order_by;
+        command.order_by = command_ast->order_by->clone();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::MODIFY_SAMPLE_BY)
@@ -214,7 +234,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         AlterCommand command;
         command.ast = command_ast->clone();
         command.type = AlterCommand::MODIFY_SAMPLE_BY;
-        command.sample_by = command_ast->sample_by;
+        command.sample_by = command_ast->sample_by->clone();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::REMOVE_SAMPLE_BY)
@@ -228,7 +248,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
     {
         AlterCommand command;
         command.ast = command_ast->clone();
-        command.index_decl = command_ast->index_decl;
+        command.index_decl = command_ast->index_decl->clone();
         command.type = AlterCommand::ADD_INDEX;
 
         const auto & ast_index_decl = command_ast->index_decl->as<ASTIndexDeclaration &>();
@@ -247,7 +267,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
     {
         AlterCommand command;
         command.ast = command_ast->clone();
-        command.statistic_decl = command_ast->statistic_decl;
+        command.statistic_decl = command_ast->statistic_decl->clone();
         command.type = AlterCommand::ADD_STATISTIC;
 
         const auto & ast_stat_decl = command_ast->statistic_decl->as<ASTStatisticDeclaration &>();
@@ -262,7 +282,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
     {
         AlterCommand command;
         command.ast = command_ast->clone();
-        command.constraint_decl = command_ast->constraint_decl;
+        command.constraint_decl = command_ast->constraint_decl->clone();
         command.type = AlterCommand::ADD_CONSTRAINT;
 
         const auto & ast_constraint_decl = command_ast->constraint_decl->as<ASTConstraintDeclaration &>();
@@ -277,7 +297,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
     {
         AlterCommand command;
         command.ast = command_ast->clone();
-        command.projection_decl = command_ast->projection_decl;
+        command.projection_decl = command_ast->projection_decl->clone();
         command.type = AlterCommand::ADD_PROJECTION;
 
         const auto & ast_projection_decl = command_ast->projection_decl->as<ASTProjectionDeclaration &>();
@@ -313,7 +333,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
             command.clear = true;
 
         if (command_ast->partition)
-            command.partition = command_ast->partition;
+            command.partition = command_ast->partition->clone();
 
         return command;
     }
@@ -330,7 +350,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.clear = command_ast->clear_statistic;
 
         if (command_ast->partition)
-            command.partition = command_ast->partition;
+            command.partition = command_ast->partition->clone();
 
         return command;
     }
@@ -345,7 +365,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
             command.clear = true;
 
         if (command_ast->partition)
-            command.partition = command_ast->partition;
+            command.partition = command_ast->partition->clone();
 
         return command;
     }
@@ -354,7 +374,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         AlterCommand command;
         command.ast = command_ast->clone();
         command.type = AlterCommand::MODIFY_TTL;
-        command.ttl = command_ast->ttl;
+        command.ttl = command_ast->ttl->clone();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::REMOVE_TTL)
@@ -399,7 +419,7 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         AlterCommand command;
         command.ast = command_ast->clone();
         command.type = AlterCommand::MODIFY_QUERY;
-        command.select = command_ast->select;
+        command.select = command_ast->select->clone();
         return command;
     }
     else if (command_ast->type == ASTAlterCommand::MODIFY_REFRESH)
@@ -420,6 +440,14 @@ std::optional<AlterCommand> AlterCommand::parse(const ASTAlterCommand * command_
         command.if_exists = command_ast->if_exists;
         return command;
     }
+    else if (command_ast->type == ASTAlterCommand::MODIFY_SQL_SECURITY)
+    {
+        AlterCommand command;
+        command.ast = command_ast->clone();
+        command.type = AlterCommand::MODIFY_SQL_SECURITY;
+        command.sql_security = command_ast->sql_security->clone();
+        return command;
+    }
     else
         return {};
 }
@@ -501,6 +529,10 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
             {
                 column.ttl.reset();
             }
+            else if (to_remove == RemoveProperty::SETTINGS)
+            {
+                column.settings.clear();
+            }
             else
             {
                 if (codec)
@@ -515,6 +547,22 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
                 if (data_type)
                     column.type = data_type;
 
+                if (!settings_changes.empty())
+                {
+                    MergeTreeColumnSettings::validate(settings_changes);
+                    if (append_column_setting)
+                        for (const auto & change : settings_changes)
+                            column.settings.setSetting(change.name, change.value);
+                    else
+                        column.settings = settings_changes;
+                }
+
+                if (!settings_resets.empty())
+                {
+                    for (const auto & setting : settings_resets)
+                        column.settings.removeSetting(setting);
+                }
+
                 /// User specified default expression or changed
                 /// datatype. We have to replace default.
                 if (default_expression || data_type)
@@ -812,6 +860,8 @@ void AlterCommand::apply(StorageInMemoryMetadata & metadata, ContextPtr context)
         for (auto & index : metadata.secondary_indices)
             rename_visitor.visit(index.definition_ast);
     }
+    else if (type == MODIFY_SQL_SECURITY)
+        metadata.setSQLSecurity(sql_security->as<ASTSQLSecurity &>());
     else
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Wrong parameter type in ALTER query");
 }
@@ -913,8 +963,7 @@ bool AlterCommand::isRequireMutationStage(const StorageInMemoryMetadata & metada
 
     /// Drop alias is metadata alter, in other case mutation is required.
     if (type == DROP_COLUMN)
-        return metadata.columns.hasColumnOrNested(GetColumnsOptions::AllPhysical, column_name) ||
-            column_name == LightweightDeleteDescription::FILTER_COLUMN.name || column_name == BlockNumberColumn::name;
+        return metadata.columns.hasColumnOrNested(GetColumnsOptions::AllPhysical, column_name);
 
     if (type != MODIFY_COLUMN || data_type == nullptr)
         return false;
@@ -1094,7 +1143,7 @@ void AlterCommands::apply(StorageInMemoryMetadata & metadata, ContextPtr context
         {
             auto minmax_columns = metadata_copy.getColumnsRequiredForPartitionKey();
             auto partition_key = metadata_copy.partition_key.expression_list_ast->clone();
-            FunctionNameNormalizer().visit(partition_key.get());
+            FunctionNameNormalizer::visit(partition_key.get());
             auto primary_key_asts = metadata_copy.primary_key.expression_list_ast->children;
             metadata_copy.minmax_count_projection.emplace(ProjectionDescription::getMinMaxCountProjection(
                 metadata_copy.columns, partition_key, minmax_columns, primary_key_asts, context));
@@ -1204,7 +1253,9 @@ void AlterCommands::prepare(const StorageInMemoryMetadata & metadata)
 
 void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
 {
-    const StorageInMemoryMetadata & metadata = table->getInMemoryMetadata();
+    const auto & metadata = table->getInMemoryMetadata();
+    auto virtuals = table->getVirtualsPtr();
+
     auto all_columns = metadata.columns;
     /// Default expression for all added/modified columns
     ASTPtr default_expr_list = std::make_shared<ASTExpressionList>();
@@ -1240,16 +1291,20 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
             if (command.data_type->hasDynamicSubcolumns())
                 throw Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Adding a new column of a type which has dynamic subcolumns to an existing table is not allowed. It has known bugs");
 
-            if (column_name == LightweightDeleteDescription::FILTER_COLUMN.name && std::dynamic_pointer_cast<MergeTreeData>(table))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot add column {}: "
-                                "this column name is reserved for lightweight delete feature", backQuote(column_name));
-
-            if (column_name == BlockNumberColumn::name && std::dynamic_pointer_cast<MergeTreeData>(table))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot add column {}: "
-                                                            "this column name is reserved for _block_number persisting feature", backQuote(column_name));
+            if (virtuals->tryGet(column_name, VirtualsKind::Persistent))
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Cannot add column {}: this column name is reserved for persistent virtual column", backQuote(column_name));
 
             if (command.codec)
-                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(command.codec, command.data_type, !context->getSettingsRef().allow_suspicious_codecs, context->getSettingsRef().allow_experimental_codecs, context->getSettingsRef().enable_deflate_qpl_codec, context->getSettingsRef().enable_zstd_qat_codec);
+            {
+                const auto & settings = context->getSettingsRef();
+                CompressionCodecFactory::instance().validateCodecAndGetPreprocessedAST(
+                    command.codec, command.data_type,
+                    !settings.allow_suspicious_codecs,
+                    settings.allow_experimental_codecs,
+                    settings.enable_deflate_qpl_codec,
+                    settings.enable_zstd_qat_codec);
+            }
 
             all_columns.add(ColumnDescription(column_name, command.data_type));
         }
@@ -1357,16 +1412,13 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
                         ErrorCodes::BAD_ARGUMENTS,
                         "Column {} doesn't have COMMENT, cannot remove it",
                         backQuote(column_name));
-
             }
 
             modified_columns.emplace(column_name);
         }
         else if (command.type == AlterCommand::DROP_COLUMN)
         {
-            if (all_columns.has(command.column_name) ||
-                all_columns.hasNested(command.column_name) ||
-                (command.clear && column_name == LightweightDeleteDescription::FILTER_COLUMN.name))
+            if (all_columns.has(command.column_name) || all_columns.hasNested(command.column_name))
             {
                 if (!command.clear) /// CLEAR column is Ok even if there are dependencies.
                 {
@@ -1450,16 +1502,12 @@ void AlterCommands::validate(const StoragePtr & table, ContextPtr context) const
             }
 
             if (all_columns.has(command.rename_to))
-                throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Cannot rename to {}: "
-                                "column with this name already exists", backQuote(command.rename_to));
+                throw Exception(ErrorCodes::DUPLICATE_COLUMN,
+                    "Cannot rename to {}: column with this name already exists", backQuote(command.rename_to));
 
-            if (command.rename_to == LightweightDeleteDescription::FILTER_COLUMN.name && std::dynamic_pointer_cast<MergeTreeData>(table))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot rename to {}: "
-                                "this column name is reserved for lightweight delete feature", backQuote(command.rename_to));
-
-            if (command.rename_to == BlockNumberColumn::name && std::dynamic_pointer_cast<MergeTreeData>(table))
-                throw Exception(ErrorCodes::ILLEGAL_COLUMN, "Cannot rename to {}: "
-                                                            "this column name is reserved for _block_number persisting feature", backQuote(command.rename_to));
+            if (virtuals->tryGet(command.rename_to, VirtualsKind::Persistent))
+                throw Exception(ErrorCodes::ILLEGAL_COLUMN,
+                    "Cannot rename to {}: this column name is reserved for persistent virtual column", backQuote(command.rename_to));
 
             if (modified_columns.contains(column_name))
                 throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Cannot rename and modify the same column {} "
diff --git a/src/Storages/AlterCommands.h b/src/Storages/AlterCommands.h
index f40fdc954ec..b1b6c8308f9 100644
--- a/src/Storages/AlterCommands.h
+++ b/src/Storages/AlterCommands.h
@@ -50,6 +50,7 @@ struct AlterCommand
         MODIFY_DATABASE_SETTING,
         COMMENT_TABLE,
         REMOVE_SAMPLE_BY,
+        MODIFY_SQL_SECURITY,
     };
 
     /// Which property user wants to remove from column
@@ -64,7 +65,8 @@ struct AlterCommand
         /// Other properties
         COMMENT,
         CODEC,
-        TTL
+        TTL,
+        SETTINGS
     };
 
     Type type = UNKNOWN;
@@ -137,15 +139,18 @@ struct AlterCommand
     /// For ADD and MODIFY
     ASTPtr codec = nullptr;
 
-    /// For MODIFY SETTING
+    /// For MODIFY SETTING or MODIFY COLUMN MODIFY SETTING
     SettingsChanges settings_changes;
 
-    /// For RESET SETTING
+    /// For RESET SETTING or MODIFY COLUMN RESET SETTING
     std::set<String> settings_resets;
 
     /// For MODIFY_QUERY
     ASTPtr select = nullptr;
 
+    /// For MODIFY_SQL_SECURITY
+    ASTPtr sql_security = nullptr;
+
     /// For MODIFY_REFRESH
     ASTPtr refresh = nullptr;
 
@@ -155,6 +160,9 @@ struct AlterCommand
     /// What to remove from column (or TTL)
     RemoveProperty to_remove = RemoveProperty::NO_PROPERTY;
 
+    /// Is this MODIFY COLUMN MODIFY SETTING or MODIFY COLUMN column with settings declaration)
+    bool append_column_setting = false;
+
     static std::optional<AlterCommand> parse(const ASTAlterCommand * command);
 
     void apply(StorageInMemoryMetadata & metadata, ContextPtr context) const;
diff --git a/src/Storages/BlockNumberColumn.cpp b/src/Storages/BlockNumberColumn.cpp
deleted file mode 100644
index 8c9e1fd902a..00000000000
--- a/src/Storages/BlockNumberColumn.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#include <Storages/BlockNumberColumn.h>
-#include <Compression/CompressionCodecMultiple.h>
-
-namespace DB
-{
-
-CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
-
-CompressionCodecPtr getCompressionCodecForBlockNumberColumn()
-{
-    std::vector <CompressionCodecPtr> codecs;
-    codecs.reserve(2);
-    auto data_bytes_size = BlockNumberColumn::type->getSizeOfValueInMemory();
-    codecs.emplace_back(getCompressionCodecDelta(data_bytes_size));
-    codecs.emplace_back(CompressionCodecFactory::instance().get("LZ4", {}));
-    return std::make_shared<CompressionCodecMultiple>(codecs);
-}
-
-const String BlockNumberColumn::name = "_block_number";
-const DataTypePtr BlockNumberColumn::type = std::make_shared<DataTypeUInt64>();
-const CompressionCodecPtr BlockNumberColumn::compression_codec = getCompressionCodecForBlockNumberColumn();
-
-}
diff --git a/src/Storages/BlockNumberColumn.h b/src/Storages/BlockNumberColumn.h
deleted file mode 100644
index fffa68bfd49..00000000000
--- a/src/Storages/BlockNumberColumn.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-#include <Core/NamesAndTypes.h>
-#include <DataTypes/DataTypesNumber.h>
-#include <Compression/CompressionFactory.h>
-
-namespace DB
-{
-
-struct BlockNumberColumn
-{
-    static const String name;
-    static const DataTypePtr type;
-    static const CompressionCodecPtr compression_codec;
-};
-
-}
diff --git a/src/Storages/Cache/ExternalDataSourceCache.h b/src/Storages/Cache/ExternalDataSourceCache.h
index 937801c4767..a5dea2f63db 100644
--- a/src/Storages/Cache/ExternalDataSourceCache.h
+++ b/src/Storages/Cache/ExternalDataSourceCache.h
@@ -91,7 +91,7 @@ private:
     std::mutex mutex;
     std::unique_ptr<RemoteFileCacheType> lru_caches;
 
-    Poco::Logger * log = &Poco::Logger::get("ExternalDataSourceCache");
+    LoggerPtr log = getLogger("ExternalDataSourceCache");
 
     String calculateLocalPath(IRemoteFileMetadataPtr meta) const;
 
diff --git a/src/Storages/Cache/RemoteCacheController.cpp b/src/Storages/Cache/RemoteCacheController.cpp
index b72f5336ea4..403d0c8e43b 100644
--- a/src/Storages/Cache/RemoteCacheController.cpp
+++ b/src/Storages/Cache/RemoteCacheController.cpp
@@ -20,7 +20,7 @@ namespace ErrorCodes
 
 std::shared_ptr<RemoteCacheController> RemoteCacheController::recover(const std::filesystem::path & local_path_)
 {
-    auto * log = &Poco::Logger::get("RemoteCacheController");
+    auto log = getLogger("RemoteCacheController");
 
     if (!std::filesystem::exists(local_path_ / "data.bin"))
     {
diff --git a/src/Storages/Cache/RemoteCacheController.h b/src/Storages/Cache/RemoteCacheController.h
index fafe363bbd4..782a6b89519 100644
--- a/src/Storages/Cache/RemoteCacheController.h
+++ b/src/Storages/Cache/RemoteCacheController.h
@@ -116,7 +116,7 @@ private:
     //std::shared_ptr<ReadBuffer> remote_read_buffer;
     std::unique_ptr<WriteBufferFromFileBase> data_file_writer;
 
-    Poco::Logger * log = &Poco::Logger::get("RemoteCacheController");
+    LoggerPtr log = getLogger("RemoteCacheController");
 };
 using RemoteCacheControllerPtr = std::shared_ptr<RemoteCacheController>;
 
diff --git a/src/Storages/Cache/SchemaCache.h b/src/Storages/Cache/SchemaCache.h
index 1bfc18bddab..bb6c91fc9f0 100644
--- a/src/Storages/Cache/SchemaCache.h
+++ b/src/Storages/Cache/SchemaCache.h
@@ -22,7 +22,7 @@ const size_t DEFAULT_SCHEMA_CACHE_ELEMENTS = 4096;
 class SchemaCache
 {
 public:
-    SchemaCache(size_t max_elements_);
+    explicit SchemaCache(size_t max_elements_);
 
     struct Key
     {
diff --git a/src/Storages/ColumnsDescription.cpp b/src/Storages/ColumnsDescription.cpp
index 1712b984596..16b89f24243 100644
--- a/src/Storages/ColumnsDescription.cpp
+++ b/src/Storages/ColumnsDescription.cpp
@@ -24,21 +24,18 @@
 #include <Interpreters/Context.h>
 #include <Storages/IStorage.h>
 #include <Common/typeid_cast.h>
+#include "Parsers/ASTSetQuery.h"
 #include <Core/Defines.h>
 #include <Compression/CompressionFactory.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/FunctionNameNormalizer.h>
-#include <Storages/BlockNumberColumn.h>
 
 
 namespace DB
 {
 
-CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
-
-
 namespace ErrorCodes
 {
     extern const int NO_SUCH_COLUMN_IN_TABLE;
@@ -72,6 +69,7 @@ bool ColumnDescription::operator==(const ColumnDescription & other) const
         && default_desc == other.default_desc
         && stat == other.stat
         && ast_to_str(codec) == ast_to_str(other.codec)
+        && settings == other.settings
         && ast_to_str(ttl) == ast_to_str(other.ttl);
 }
 
@@ -104,6 +102,18 @@ void ColumnDescription::writeText(WriteBuffer & buf) const
         writeEscapedString(queryToString(codec), buf);
     }
 
+    if (!settings.empty())
+    {
+        writeChar('\t', buf);
+        DB::writeText("SETTINGS ", buf);
+        DB::writeText("(", buf);
+        ASTSetQuery ast;
+        ast.is_standalone = false;
+        ast.changes = settings;
+        writeEscapedString(queryToString(ast), buf);
+        DB::writeText(")", buf);
+    }
+
     if (stat)
     {
         writeChar('\t', buf);
@@ -135,7 +145,7 @@ void ColumnDescription::readText(ReadBuffer & buf)
         readEscapedStringUntilEOL(modifiers, buf);
 
         ParserColumnDeclaration column_parser(/* require type */ true);
-        ASTPtr ast = parseQuery(column_parser, "x T " + modifiers, "column parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        ASTPtr ast = parseQuery(column_parser, "x T " + modifiers, "column parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         if (auto * col_ast = ast->as<ASTColumnDeclaration>())
         {
@@ -154,6 +164,9 @@ void ColumnDescription::readText(ReadBuffer & buf)
 
             if (col_ast->ttl)
                 ttl = col_ast->ttl;
+
+            if (col_ast->settings)
+                settings = col_ast->settings->as<ASTSetQuery &>().changes;
         }
         else
             throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse column description");
@@ -198,7 +211,7 @@ void ColumnsDescription::setAliases(NamesAndAliases aliases)
         const char * alias_expression_pos = alias.expression.data();
         const char * alias_expression_end = alias_expression_pos + alias.expression.size();
         ParserExpression expression_parser;
-        description.default_desc.expression = parseQuery(expression_parser, alias_expression_pos, alias_expression_end, "expression", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        description.default_desc.expression = parseQuery(expression_parser, alias_expression_pos, alias_expression_end, "expression", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         add(std::move(description));
     }
@@ -465,6 +478,10 @@ NamesAndTypesList ColumnsDescription::get(const GetColumnsOptions & options) con
     NamesAndTypesList res;
     switch (options.kind)
     {
+        case GetColumnsOptions::None:
+        {
+            break;
+        }
         case GetColumnsOptions::All:
         {
             res = getAll();
@@ -542,6 +559,12 @@ const ColumnDescription & ColumnsDescription::get(const String & column_name) co
     return *it;
 }
 
+const ColumnDescription * ColumnsDescription::tryGet(const String & column_name) const
+{
+    auto it = columns.get<1>().find(column_name);
+    return it == columns.get<1>().end() ? nullptr : &(*it);
+}
+
 static GetColumnsOptions::Kind defaultKindToGetKind(ColumnDefaultKind kind)
 {
     switch (kind)
@@ -555,7 +578,8 @@ static GetColumnsOptions::Kind defaultKindToGetKind(ColumnDefaultKind kind)
         case ColumnDefaultKind::Ephemeral:
             return GetColumnsOptions::Ephemeral;
     }
-    UNREACHABLE();
+
+    return GetColumnsOptions::None;
 }
 
 NamesAndTypesList ColumnsDescription::getByNames(const GetColumnsOptions & options, const Names & names) const
@@ -767,33 +791,6 @@ bool ColumnsDescription::hasCompressionCodec(const String & column_name) const
     return it != columns.get<1>().end() && it->codec != nullptr;
 }
 
-CompressionCodecPtr ColumnsDescription::getCodecOrDefault(const String & column_name, CompressionCodecPtr default_codec) const
-{
-    const auto it = columns.get<1>().find(column_name);
-
-    if (it == columns.get<1>().end() || !it->codec)
-        return default_codec;
-
-    return CompressionCodecFactory::instance().get(it->codec, it->type, default_codec);
-}
-
-CompressionCodecPtr ColumnsDescription::getCodecOrDefault(const String & column_name) const
-{
-    assert (column_name != BlockNumberColumn::name);
-    return getCodecOrDefault(column_name, CompressionCodecFactory::instance().getDefaultCodec());
-}
-
-ASTPtr ColumnsDescription::getCodecDescOrDefault(const String & column_name, CompressionCodecPtr default_codec) const
-{
-    assert (column_name != BlockNumberColumn::name);
-    const auto it = columns.get<1>().find(column_name);
-
-    if (it == columns.get<1>().end() || !it->codec)
-        return default_codec->getFullCodecDesc();
-
-    return it->codec;
-}
-
 ColumnsDescription::ColumnTTLs ColumnsDescription::getColumnTTLs() const
 {
     ColumnTTLs ret;
diff --git a/src/Storages/ColumnsDescription.h b/src/Storages/ColumnsDescription.h
index 9a133f81d7a..82e55e29073 100644
--- a/src/Storages/ColumnsDescription.h
+++ b/src/Storages/ColumnsDescription.h
@@ -7,6 +7,7 @@
 #include <Core/NamesAndAliases.h>
 #include <Interpreters/Context_fwd.h>
 #include <Storages/ColumnDefault.h>
+#include <Common/SettingsChanges.h>
 #include <Storages/StatisticsDescription.h>
 #include <Common/Exception.h>
 
@@ -28,10 +29,19 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+enum class VirtualsKind : UInt8
+{
+    None = 0,
+    Ephemeral = 1,
+    Persistent = 2,
+    All = Ephemeral | Persistent,
+};
+
 struct GetColumnsOptions
 {
     enum Kind : UInt8
     {
+        None = 0,
         Ordinary = 1,
         Materialized = 2,
         Aliases = 4,
@@ -42,7 +52,7 @@ struct GetColumnsOptions
         All = AllPhysical | Aliases | Ephemeral,
     };
 
-    GetColumnsOptions(Kind kind_) : kind(kind_) {}
+    GetColumnsOptions(Kind kind_) : kind(kind_) {} /// NOLINT(google-explicit-constructor)
 
     GetColumnsOptions & withSubcolumns(bool value = true)
     {
@@ -50,9 +60,9 @@ struct GetColumnsOptions
         return *this;
     }
 
-    GetColumnsOptions & withVirtuals(bool value = true)
+    GetColumnsOptions & withVirtuals(VirtualsKind value = VirtualsKind::All)
     {
-        with_virtuals = value;
+        virtuals_kind = value;
         return *this;
     }
 
@@ -62,17 +72,11 @@ struct GetColumnsOptions
         return *this;
     }
 
-    GetColumnsOptions & withSystemColumns(bool value = true)
-    {
-        with_system_columns = value;
-        return *this;
-    }
-
     Kind kind;
+    VirtualsKind virtuals_kind = VirtualsKind::None;
+
     bool with_subcolumns = false;
-    bool with_virtuals = false;
     bool with_extended_objects = false;
-    bool with_system_columns = false;
 };
 
 /// Description of a single table column (in CREATE TABLE for example).
@@ -83,6 +87,7 @@ struct ColumnDescription
     ColumnDefault default_desc;
     String comment;
     ASTPtr codec;
+    SettingsChanges settings;
     ASTPtr ttl;
     std::optional<StatisticDescription> stat;
 
@@ -111,7 +116,7 @@ public:
 
     explicit ColumnsDescription(NamesAndTypesList ordinary);
 
-    explicit ColumnsDescription(std::initializer_list<ColumnDescription> ordinary);
+    ColumnsDescription(std::initializer_list<ColumnDescription> ordinary);
 
     explicit ColumnsDescription(NamesAndTypesList ordinary, NamesAndAliases aliases);
 
@@ -158,6 +163,7 @@ public:
     bool hasNested(const String & column_name) const;
     bool hasSubcolumn(const String & column_name) const;
     const ColumnDescription & get(const String & column_name) const;
+    const ColumnDescription * tryGet(const String & column_name) const;
 
     template <typename F>
     void modify(const String & column_name, F && f)
@@ -211,9 +217,6 @@ public:
 
     /// Does column has non default specified compression codec
     bool hasCompressionCodec(const String & column_name) const;
-    CompressionCodecPtr getCodecOrDefault(const String & column_name, CompressionCodecPtr default_codec) const;
-    CompressionCodecPtr getCodecOrDefault(const String & column_name) const;
-    ASTPtr getCodecDescOrDefault(const String & column_name, CompressionCodecPtr default_codec) const;
 
     String toString() const;
     static ColumnsDescription parse(const String & str);
@@ -267,4 +270,5 @@ private:
 /// don't have strange constructions in default expression like SELECT query or
 /// arrayJoin function.
 Block validateColumnsDefaultsAndGetSampleBlock(ASTPtr default_expr_list, const NamesAndTypesList & all_columns, ContextPtr context);
+
 }
diff --git a/src/Storages/ConstraintsDescription.cpp b/src/Storages/ConstraintsDescription.cpp
index 219c3fd0c97..d492de2c2b2 100644
--- a/src/Storages/ConstraintsDescription.cpp
+++ b/src/Storages/ConstraintsDescription.cpp
@@ -45,7 +45,7 @@ ConstraintsDescription ConstraintsDescription::parse(const String & str)
 
     ConstraintsDescription res;
     ParserConstraintDeclarationList parser;
-    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     for (const auto & constraint : list->children)
         res.constraints.push_back(constraint);
diff --git a/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp b/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
index b8bffb267e5..14a912a180d 100644
--- a/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
+++ b/src/Storages/DataLakes/DeltaLakeMetadataParser.cpp
@@ -282,11 +282,10 @@ struct DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::Impl
             format_settings.date_time_overflow_behavior,
             /* 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());
+        Chunk res = column_reader.arrowTableToCHChunk(table, reader->parquet_reader()->metadata()->num_rows());
         const auto & res_columns = res.getColumns();
 
         if (res_columns.size() != 2)
@@ -314,7 +313,7 @@ struct DeltaLakeMetadataParser<Configuration, MetadataReadHelper>::Impl
         return version;
     }
 
-    Poco::Logger * log = &Poco::Logger::get("DeltaLakeMetadataParser");
+    LoggerPtr log = getLogger("DeltaLakeMetadataParser");
 };
 
 
diff --git a/src/Storages/DataLakes/HudiMetadataParser.cpp b/src/Storages/DataLakes/HudiMetadataParser.cpp
index 78d69c83989..699dfe8fda0 100644
--- a/src/Storages/DataLakes/HudiMetadataParser.cpp
+++ b/src/Storages/DataLakes/HudiMetadataParser.cpp
@@ -50,7 +50,7 @@ struct HudiMetadataParser<Configuration, MetadataReadHelper>::Impl
       */
     Strings processMetadataFiles(const Configuration & configuration)
     {
-        auto * log = &Poco::Logger::get("HudiMetadataParser");
+        auto log = getLogger("HudiMetadataParser");
 
         const auto keys = MetadataReadHelper::listFiles(configuration, "", Poco::toLower(configuration.format));
 
diff --git a/src/Storages/DataLakes/IStorageDataLake.h b/src/Storages/DataLakes/IStorageDataLake.h
index 77a22cd00fc..711abbde38c 100644
--- a/src/Storages/DataLakes/IStorageDataLake.h
+++ b/src/Storages/DataLakes/IStorageDataLake.h
@@ -6,6 +6,7 @@
 
 #include <Storages/IStorage.h>
 #include <Common/logger_useful.h>
+#include <Databases/LoadingStrictnessLevel.h>
 #include <Storages/StorageFactory.h>
 #include <Formats/FormatFactory.h>
 #include <filesystem>
@@ -22,15 +23,15 @@ public:
     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)...)
+    explicit IStorageDataLake(const Configuration & configuration_, ContextPtr context_, LoadingStrictnessLevel mode, Args && ...args)
+        : Storage(getConfigurationForDataRead(configuration_, context_, {}, mode), context_, std::forward<Args>(args)...)
         , base_configuration(configuration_)
-        , log(&Poco::Logger::get(getName())) {} // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
+        , log(getLogger(getName())) {} // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
 
     template <class ...Args>
-    static StoragePtr create(const Configuration & configuration_, ContextPtr context_, Args && ...args)
+    static StoragePtr create(const Configuration & configuration_, ContextPtr context_, LoadingStrictnessLevel mode, Args && ...args)
     {
-        return std::make_shared<IStorageDataLake<Storage, Name, MetadataParser>>(configuration_, context_, std::forward<Args>(args)...);
+        return std::make_shared<IStorageDataLake<Storage, Name, MetadataParser>>(configuration_, context_, mode, std::forward<Args>(args)...);
     }
 
     String getName() const override { return name; }
@@ -38,25 +39,25 @@ public:
     static ColumnsDescription getTableStructureFromData(
         Configuration & base_configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr local_context)
+        const 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)
+    static Configuration getConfiguration(ASTs & engine_args, const ContextPtr & local_context)
     {
         return Storage::getConfiguration(engine_args, local_context, /* get_format_from_file */false);
     }
 
-    Configuration updateConfigurationAndGetCopy(ContextPtr local_context) override
+    Configuration updateConfigurationAndGetCopy(const ContextPtr & local_context) override
     {
         std::lock_guard lock(configuration_update_mutex);
         updateConfigurationImpl(local_context);
         return Storage::getConfiguration();
     }
 
-    void updateConfiguration(ContextPtr local_context) override
+    void updateConfiguration(const ContextPtr & local_context) override
     {
         std::lock_guard lock(configuration_update_mutex);
         updateConfigurationImpl(local_context);
@@ -64,32 +65,43 @@ public:
 
 private:
     static Configuration getConfigurationForDataRead(
-        const Configuration & base_configuration, ContextPtr local_context, const Strings & keys = {})
+        const Configuration & base_configuration, const ContextPtr & local_context, const Strings & keys = {},
+        LoadingStrictnessLevel mode = LoadingStrictnessLevel::CREATE)
     {
         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;
+        try
+        {
+            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, ", "));
+            LOG_TRACE(
+                getLogger("DataLake"),
+                "New configuration path: {}, keys: {}",
+                configuration.getPath(), fmt::join(configuration.keys, ", "));
 
-        configuration.connect(local_context);
-        return configuration;
+            configuration.connect(local_context);
+            return configuration;
+        }
+        catch (...)
+        {
+            if (mode <= LoadingStrictnessLevel::CREATE)
+                throw;
+            tryLogCurrentException(__PRETTY_FUNCTION__);
+            return configuration;
+        }
     }
 
-    static Strings getDataFiles(const Configuration & configuration, ContextPtr local_context)
+    static Strings getDataFiles(const Configuration & configuration, const ContextPtr & local_context)
     {
         return MetadataParser().getFiles(configuration, local_context);
     }
 
-    void updateConfigurationImpl(ContextPtr local_context)
+    void updateConfigurationImpl(const ContextPtr & local_context)
     {
         const bool updated = base_configuration.update(local_context);
         auto new_keys = getDataFiles(base_configuration, local_context);
@@ -102,7 +114,7 @@ private:
 
     Configuration base_configuration;
     std::mutex configuration_update_mutex;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
@@ -115,7 +127,7 @@ static StoragePtr createDataLakeStorage(const StorageFactory::Arguments & args)
     if (configuration.format == "auto")
         configuration.format = "Parquet";
 
-    return DataLake::create(configuration, args.getContext(), args.table_id, args.columns, args.constraints,
+    return DataLake::create(configuration, args.getContext(), args.mode, args.table_id, args.columns, args.constraints,
         args.comment, getFormatSettings(args.getContext()));
 }
 
diff --git a/src/Storages/DataLakes/Iceberg/IcebergMetadata.cpp b/src/Storages/DataLakes/Iceberg/IcebergMetadata.cpp
index 40a81b59c36..df1536f53fc 100644
--- a/src/Storages/DataLakes/Iceberg/IcebergMetadata.cpp
+++ b/src/Storages/DataLakes/Iceberg/IcebergMetadata.cpp
@@ -46,10 +46,10 @@ namespace ErrorCodes
 IcebergMetadata::IcebergMetadata(
     const StorageS3::Configuration & configuration_,
     DB::ContextPtr context_,
-    DB::Int32 metadata_version_,
-    DB::Int32 format_version_,
-    DB::String manifest_list_file_,
-    DB::Int32 current_schema_id_,
+    Int32 metadata_version_,
+    Int32 format_version_,
+    String manifest_list_file_,
+    Int32 current_schema_id_,
     DB::NamesAndTypesList schema_)
     : WithContext(context_)
     , configuration(configuration_)
@@ -58,7 +58,7 @@ IcebergMetadata::IcebergMetadata(
     , manifest_list_file(std::move(manifest_list_file_))
     , current_schema_id(current_schema_id_)
     , schema(std::move(schema_))
-    , log(&Poco::Logger::get("IcebergMetadata"))
+    , log(getLogger("IcebergMetadata"))
 {
 }
 
@@ -240,7 +240,7 @@ DataTypePtr getFieldType(const Poco::JSON::Object::Ptr & field, const String & t
 
 }
 
-std::pair<NamesAndTypesList, Int32> parseTableSchema(const Poco::JSON::Object::Ptr & metadata_object, int format_version)
+std::pair<NamesAndTypesList, Int32> parseTableSchema(const Poco::JSON::Object::Ptr & metadata_object, int format_version, bool ignore_schema_evolution)
 {
     Poco::JSON::Object::Ptr schema;
     Int32 current_schema_id;
@@ -253,13 +253,39 @@ std::pair<NamesAndTypesList, Int32> parseTableSchema(const Poco::JSON::Object::P
     {
         current_schema_id = metadata_object->getValue<int>("current-schema-id");
         auto schemas = metadata_object->get("schemas").extract<Poco::JSON::Array::Ptr>();
-        if (schemas->size() != 1)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is not supported");
+        if (schemas->size() == 0)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot parse Iceberg table schema: schemas field is empty");
 
-        /// Now we sure that there is only one schema.
-        schema = schemas->getObject(0);
-        if (schema->getValue<int>("schema-id") != current_schema_id)
-            throw Exception(ErrorCodes::BAD_ARGUMENTS, R"(Field "schema-id" of the schema doesn't match "current-schema-id" in metadata)");
+        if (ignore_schema_evolution)
+        {
+            /// If we ignore schema evolution, we will just use latest schema for all data files.
+            /// Find schema with 'schema-id' equal to 'current_schema_id'.
+            for (uint32_t i = 0; i != schemas->size(); ++i)
+            {
+                auto current_schema = schemas->getObject(i);
+                if (current_schema->getValue<int>("schema-id") == current_schema_id)
+                {
+                    schema = current_schema;
+                    break;
+                }
+            }
+
+            if (!schema)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, R"(There is no schema with "schema-id" that matches "current-schema-id" in metadata)");
+        }
+        else
+        {
+            if (schemas->size() != 1)
+                throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                    "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is "
+                    "supported. If you want to ignore schema evolution and read all files using latest schema saved on table creation, enable setting "
+                    "iceberg_engine_ignore_schema_evolution (Note: enabling this setting can lead to incorrect result)");
+
+            /// Now we sure that there is only one schema.
+            schema = schemas->getObject(0);
+            if (schema->getValue<int>("schema-id") != current_schema_id)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS, R"(Field "schema-id" of the schema doesn't match "current-schema-id" in metadata)");
+        }
     }
     else
     {
@@ -267,8 +293,11 @@ std::pair<NamesAndTypesList, Int32> parseTableSchema(const Poco::JSON::Object::P
         current_schema_id = schema->getValue<int>("schema-id");
         /// Field "schemas" is optional for version 1, but after version 2 was introduced,
         /// in most cases this field is added for new tables in version 1 as well.
-        if (metadata_object->has("schemas") && metadata_object->get("schemas").extract<Poco::JSON::Array::Ptr>()->size() > 1)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is not supported");
+        if (!ignore_schema_evolution && metadata_object->has("schemas") && metadata_object->get("schemas").extract<Poco::JSON::Array::Ptr>()->size() > 1)
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD,
+                "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is not "
+                "supported. If you want to ignore schema evolution and read all files using latest schema saved on table creation, enable setting "
+                "iceberg_engine_ignore_schema_evolution (Note: enabling this setting can lead to incorrect result)");
     }
 
     NamesAndTypesList names_and_types;
@@ -346,7 +375,7 @@ std::pair<Int32, String> getMetadataFileAndVersion(const StorageS3::Configuratio
 std::unique_ptr<IcebergMetadata> parseIcebergMetadata(const StorageS3::Configuration & configuration, ContextPtr context_)
 {
     const auto [metadata_version, metadata_file_path] = getMetadataFileAndVersion(configuration);
-    LOG_DEBUG(&Poco::Logger::get("IcebergMetadata"), "Parse metadata {}", metadata_file_path);
+    LOG_DEBUG(getLogger("IcebergMetadata"), "Parse metadata {}", metadata_file_path);
     auto buf = S3DataLakeMetadataReadHelper::createReadBuffer(metadata_file_path, context_, configuration);
     String json_str;
     readJSONObjectPossiblyInvalid(json_str, *buf);
@@ -356,7 +385,7 @@ std::unique_ptr<IcebergMetadata> parseIcebergMetadata(const StorageS3::Configura
     Poco::JSON::Object::Ptr object = json.extract<Poco::JSON::Object::Ptr>();
 
     auto format_version = object->getValue<int>("format-version");
-    auto [schema, schema_id] = parseTableSchema(object, format_version);
+    auto [schema, schema_id] = parseTableSchema(object, format_version, context_->getSettingsRef().iceberg_engine_ignore_schema_evolution);
 
     auto current_snapshot_id = object->getValue<Int64>("current-snapshot-id");
     auto snapshots = object->get("snapshots").extract<Poco::JSON::Array::Ptr>();
@@ -453,8 +482,12 @@ Strings IcebergMetadata::getDataFiles()
         Poco::JSON::Parser parser;
         Poco::Dynamic::Var json = parser.parse(schema_json_string);
         Poco::JSON::Object::Ptr schema_object = json.extract<Poco::JSON::Object::Ptr>();
-        if (schema_object->getValue<int>("schema-id") != current_schema_id)
-            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is not supported");
+        if (!getContext()->getSettingsRef().iceberg_engine_ignore_schema_evolution && schema_object->getValue<int>("schema-id") != current_schema_id)
+            throw Exception(
+                ErrorCodes::UNSUPPORTED_METHOD,
+                "Cannot read Iceberg table: the table schema has been changed at least 1 time, reading tables with evolved schema is not "
+                "supported. If you want to ignore schema evolution and read all files using latest schema saved on table creation, enable setting "
+                "iceberg_engine_ignore_schema_evolution (Note: enabling this setting can lead to incorrect result)");
 
         avro::NodePtr root_node = manifest_file_reader->dataSchema().root();
         size_t leaves_num = root_node->leaves();
@@ -563,10 +596,11 @@ Strings IcebergMetadata::getDataFiles()
             const auto status = status_int_column->getInt(i);
             const auto data_path = std::string(file_path_string_column->getDataAt(i).toView());
             const auto pos = data_path.find(configuration.url.key);
-            const auto file_path = data_path.substr(pos);
             if (pos == std::string::npos)
                 throw Exception(ErrorCodes::BAD_ARGUMENTS, "Expected to find {} in data path: {}", configuration.url.key, data_path);
 
+            const auto file_path = data_path.substr(pos);
+
             if (ManifestEntryStatus(status) == ManifestEntryStatus::DELETED)
             {
                 LOG_TEST(log, "Processing delete file for path: {}", file_path);
diff --git a/src/Storages/DataLakes/Iceberg/IcebergMetadata.h b/src/Storages/DataLakes/Iceberg/IcebergMetadata.h
index d42ad84f472..3e6a2ec3415 100644
--- a/src/Storages/DataLakes/Iceberg/IcebergMetadata.h
+++ b/src/Storages/DataLakes/Iceberg/IcebergMetadata.h
@@ -84,7 +84,7 @@ private:
     Int32 current_schema_id;
     NamesAndTypesList schema;
     Strings data_files;
-    Poco::Logger * log;
+    LoggerPtr log;
 
 };
 
diff --git a/src/Storages/DataLakes/Iceberg/StorageIceberg.cpp b/src/Storages/DataLakes/Iceberg/StorageIceberg.cpp
index 165ecce5142..19cd97c3d4f 100644
--- a/src/Storages/DataLakes/Iceberg/StorageIceberg.cpp
+++ b/src/Storages/DataLakes/Iceberg/StorageIceberg.cpp
@@ -8,18 +8,39 @@ namespace DB
 StoragePtr StorageIceberg::create(
     const DB::StorageIceberg::Configuration & base_configuration,
     DB::ContextPtr context_,
+    LoadingStrictnessLevel mode,
     const DB::StorageID & table_id_,
     const DB::ColumnsDescription & columns_,
     const DB::ConstraintsDescription & constraints_,
-    const DB::String & comment,
+    const String & comment,
     std::optional<FormatSettings> format_settings_)
 {
     auto configuration{base_configuration};
     configuration.update(context_);
-    auto metadata = parseIcebergMetadata(configuration, context_);
-    auto schema_from_metadata = metadata->getTableSchema();
-    configuration.keys = metadata->getDataFiles();
-    return std::make_shared<StorageIceberg>(std::move(metadata), configuration, context_, table_id_, columns_.empty() ? ColumnsDescription(schema_from_metadata) : columns_, constraints_, comment, format_settings_);
+    std::unique_ptr<IcebergMetadata> metadata;
+    NamesAndTypesList schema_from_metadata;
+    try
+    {
+        metadata = parseIcebergMetadata(configuration, context_);
+        schema_from_metadata = metadata->getTableSchema();
+        configuration.keys = metadata->getDataFiles();
+    }
+    catch (...)
+    {
+        if (mode <= LoadingStrictnessLevel::CREATE)
+            throw;
+        tryLogCurrentException(__PRETTY_FUNCTION__);
+    }
+
+    return std::make_shared<StorageIceberg>(
+        std::move(metadata),
+        configuration,
+        context_,
+        table_id_,
+        columns_.empty() ? ColumnsDescription(schema_from_metadata) : columns_,
+        constraints_,
+        comment,
+        format_settings_);
 }
 
 StorageIceberg::StorageIceberg(
@@ -40,7 +61,7 @@ StorageIceberg::StorageIceberg(
 ColumnsDescription StorageIceberg::getTableStructureFromData(
     Configuration & base_configuration,
     const std::optional<FormatSettings> &,
-    ContextPtr local_context)
+    const ContextPtr & local_context)
 {
     auto configuration{base_configuration};
     configuration.update(local_context);
@@ -48,16 +69,15 @@ ColumnsDescription StorageIceberg::getTableStructureFromData(
     return ColumnsDescription(metadata->getTableSchema());
 }
 
-void StorageIceberg::updateConfigurationImpl(ContextPtr local_context)
+void StorageIceberg::updateConfigurationImpl(const ContextPtr & local_context)
 {
     const bool updated = base_configuration.update(local_context);
     auto new_metadata = parseIcebergMetadata(base_configuration, local_context);
-    /// Check if nothing was changed.
-    if (updated && new_metadata->getVersion() == current_metadata->getVersion())
-        return;
 
-    if (new_metadata->getVersion() != current_metadata->getVersion())
+    if (!current_metadata || new_metadata->getVersion() != current_metadata->getVersion())
         current_metadata = std::move(new_metadata);
+    else if (!updated)
+        return;
 
     auto updated_configuration{base_configuration};
     /// If metadata wasn't changed, we won't list data files again.
diff --git a/src/Storages/DataLakes/Iceberg/StorageIceberg.h b/src/Storages/DataLakes/Iceberg/StorageIceberg.h
index a18865b5a54..45cbef0b41b 100644
--- a/src/Storages/DataLakes/Iceberg/StorageIceberg.h
+++ b/src/Storages/DataLakes/Iceberg/StorageIceberg.h
@@ -30,6 +30,7 @@ public:
 
     static StoragePtr create(const Configuration & base_configuration,
         ContextPtr context_,
+        LoadingStrictnessLevel mode,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
@@ -51,28 +52,28 @@ public:
     static ColumnsDescription getTableStructureFromData(
         Configuration & base_configuration,
         const std::optional<FormatSettings> &,
-        ContextPtr local_context);
+        const ContextPtr & local_context);
 
     static Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context)
     {
         return StorageS3::getConfiguration(engine_args, local_context, /* get_format_from_file */false);
     }
 
-    Configuration updateConfigurationAndGetCopy(ContextPtr local_context) override
+    Configuration updateConfigurationAndGetCopy(const ContextPtr & local_context) override
     {
         std::lock_guard lock(configuration_update_mutex);
         updateConfigurationImpl(local_context);
         return StorageS3::getConfiguration();
     }
 
-    void updateConfiguration(ContextPtr local_context) override
+    void updateConfiguration(const ContextPtr & local_context) override
     {
         std::lock_guard lock(configuration_update_mutex);
         updateConfigurationImpl(local_context);
     }
 
 private:
-    void updateConfigurationImpl(ContextPtr local_context);
+    void updateConfigurationImpl(const ContextPtr & local_context);
 
     std::unique_ptr<IcebergMetadata> current_metadata;
     Configuration base_configuration;
diff --git a/src/Storages/DataLakes/S3MetadataReader.cpp b/src/Storages/DataLakes/S3MetadataReader.cpp
index ac472c190e4..d66e21550a3 100644
--- a/src/Storages/DataLakes/S3MetadataReader.cpp
+++ b/src/Storages/DataLakes/S3MetadataReader.cpp
@@ -77,7 +77,7 @@ std::vector<String> S3DataLakeMetadataReadHelper::listFiles(
         is_finished = !outcome.GetResult().GetIsTruncated();
     }
 
-    LOG_TRACE(&Poco::Logger::get("S3DataLakeMetadataReadHelper"), "Listed {} files", res.size());
+    LOG_TRACE(getLogger("S3DataLakeMetadataReadHelper"), "Listed {} files", res.size());
 
     return res;
 }
diff --git a/src/Storages/DataLakes/S3MetadataReader.h b/src/Storages/DataLakes/S3MetadataReader.h
index cae7dd1fa3d..c29a66b3813 100644
--- a/src/Storages/DataLakes/S3MetadataReader.h
+++ b/src/Storages/DataLakes/S3MetadataReader.h
@@ -6,11 +6,11 @@
 
 #include <Storages/StorageS3.h>
 
-class ReadBuffer;
-
 namespace DB
 {
 
+class ReadBuffer;
+
 struct S3DataLakeMetadataReadHelper
 {
     static std::shared_ptr<ReadBuffer> createReadBuffer(
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
index 97268cf1389..2d052255ac5 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.cpp
@@ -60,7 +60,7 @@ bool DistributedAsyncInsertBatch::isEnoughSize() const
         || (parent.min_batched_block_size_bytes && total_bytes >= parent.min_batched_block_size_bytes);
 }
 
-void DistributedAsyncInsertBatch::send()
+void DistributedAsyncInsertBatch::send(const SettingsChanges & settings_changes)
 {
     if (files.empty())
         return;
@@ -84,14 +84,14 @@ void DistributedAsyncInsertBatch::send()
     {
         try
         {
-            sendBatch();
+            sendBatch(settings_changes);
         }
         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();
+                sendSeparateFiles(settings_changes);
             }
             else
                 throw;
@@ -201,13 +201,12 @@ void DistributedAsyncInsertBatch::readText(ReadBuffer & in)
     recovered = true;
 }
 
-void DistributedAsyncInsertBatch::sendBatch()
+void DistributedAsyncInsertBatch::sendBatch(const SettingsChanges & settings_changes)
 {
+    IConnectionPool::Entry connection;
     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).
@@ -228,8 +227,12 @@ void DistributedAsyncInsertBatch::sendBatch()
 
             if (!remote)
             {
-                auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
-                connection = parent.pool->get(timeouts);
+                Settings insert_settings = distributed_header.insert_settings;
+                insert_settings.applyChanges(settings_changes);
+
+                auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
+                auto result = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
+                connection = std::move(result.front().entry);
                 compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
                 LOG_DEBUG(parent.log, "Sending a batch of {} files to {} ({} rows, {} bytes).",
@@ -240,7 +243,7 @@ void DistributedAsyncInsertBatch::sendBatch()
 
                 remote = std::make_unique<RemoteInserter>(*connection, timeouts,
                     distributed_header.insert_query,
-                    distributed_header.insert_settings,
+                    insert_settings,
                     distributed_header.client_info);
             }
             writeRemoteConvert(distributed_header, *remote, compression_expected, in, parent.log);
@@ -264,7 +267,7 @@ void DistributedAsyncInsertBatch::sendBatch()
     }
 }
 
-void DistributedAsyncInsertBatch::sendSeparateFiles()
+void DistributedAsyncInsertBatch::sendSeparateFiles(const SettingsChanges & settings_changes)
 {
     size_t broken_files = 0;
 
@@ -277,18 +280,22 @@ void DistributedAsyncInsertBatch::sendSeparateFiles()
             ReadBufferFromFile in(file);
             const auto & distributed_header = DistributedAsyncInsertHeader::read(in, parent.log);
 
+            Settings insert_settings = distributed_header.insert_settings;
+            insert_settings.applyChanges(settings_changes);
+
             // 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);
+            auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
+            auto result = parent.pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, parent.storage.remote_storage.getQualifiedName());
+            auto connection = std::move(result.front().entry);
             bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
 
             RemoteInserter remote(*connection, timeouts,
                 distributed_header.insert_query,
-                distributed_header.insert_settings,
+                insert_settings,
                 distributed_header.client_info);
 
             writeRemoteConvert(distributed_header, remote, compression_expected, in, parent.log);
diff --git a/src/Storages/Distributed/DistributedAsyncInsertBatch.h b/src/Storages/Distributed/DistributedAsyncInsertBatch.h
index db96634d6f1..e37c3ae6134 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertBatch.h
+++ b/src/Storages/Distributed/DistributedAsyncInsertBatch.h
@@ -9,6 +9,7 @@ namespace DB
 class DistributedAsyncInsertDirectoryQueue;
 class WriteBuffer;
 class ReadBuffer;
+class SettingsChanges;
 
 class DistributedAsyncInsertBatch
 {
@@ -16,7 +17,7 @@ public:
     explicit DistributedAsyncInsertBatch(DistributedAsyncInsertDirectoryQueue & parent_);
 
     bool isEnoughSize() const;
-    void send();
+    void send(const SettingsChanges & settings_changes);
 
     /// Write batch to current_batch.txt
     void serialize();
@@ -35,8 +36,8 @@ public:
 private:
     void writeText(WriteBuffer & out);
     void readText(ReadBuffer & in);
-    void sendBatch();
-    void sendSeparateFiles();
+    void sendBatch(const SettingsChanges & settings_changes);
+    void sendSeparateFiles(const SettingsChanges & settings_changes);
 
     DistributedAsyncInsertDirectoryQueue & parent;
 
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
index 26fa489a63d..1ee77611191 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.cpp
@@ -60,7 +60,7 @@ namespace
 {
 
 template <typename PoolFactory>
-ConnectionPoolPtrs createPoolsForAddresses(const Cluster::Addresses & addresses, PoolFactory && factory, Poco::Logger * log)
+ConnectionPoolPtrs createPoolsForAddresses(const Cluster::Addresses & addresses, PoolFactory && factory, LoggerPtr log)
 {
     ConnectionPoolPtrs pools;
 
@@ -101,7 +101,7 @@ DistributedAsyncInsertDirectoryQueue::DistributedAsyncInsertDirectoryQueue(
     StorageDistributed & storage_,
     const DiskPtr & disk_,
     const std::string & relative_path_,
-    ConnectionPoolPtr pool_,
+    ConnectionPoolWithFailoverPtr pool_,
     ActionBlocker & monitor_blocker_,
     BackgroundSchedulePool & bg_pool)
     : storage(storage_)
@@ -121,7 +121,7 @@ DistributedAsyncInsertDirectoryQueue::DistributedAsyncInsertDirectoryQueue(
     , default_sleep_time(storage.getDistributedSettingsRef().background_insert_sleep_time_ms.totalMilliseconds())
     , sleep_time(default_sleep_time)
     , max_sleep_time(storage.getDistributedSettingsRef().background_insert_max_sleep_time_ms.totalMilliseconds())
-    , log(&Poco::Logger::get(getLoggerName()))
+    , log(getLogger(getLoggerName()))
     , monitor_blocker(monitor_blocker_)
     , metric_pending_bytes(CurrentMetrics::DistributedBytesToInsert, 0)
     , metric_pending_files(CurrentMetrics::DistributedFilesToInsert, 0)
@@ -146,7 +146,7 @@ DistributedAsyncInsertDirectoryQueue::~DistributedAsyncInsertDirectoryQueue()
     }
 }
 
-void DistributedAsyncInsertDirectoryQueue::flushAllData()
+void DistributedAsyncInsertDirectoryQueue::flushAllData(const SettingsChanges & settings_changes)
 {
     if (pending_files.isFinished())
         return;
@@ -154,7 +154,7 @@ void DistributedAsyncInsertDirectoryQueue::flushAllData()
     std::lock_guard lock{mutex};
     if (!hasPendingFiles())
         return;
-    processFiles();
+    processFiles(settings_changes);
 }
 
 void DistributedAsyncInsertDirectoryQueue::shutdownAndDropAllData()
@@ -237,7 +237,7 @@ void DistributedAsyncInsertDirectoryQueue::run()
 }
 
 
-ConnectionPoolPtr DistributedAsyncInsertDirectoryQueue::createPool(const Cluster::Addresses & addresses, const StorageDistributed & storage)
+ConnectionPoolWithFailoverPtr DistributedAsyncInsertDirectoryQueue::createPool(const Cluster::Addresses & addresses, const StorageDistributed & storage)
 {
     const auto pool_factory = [&storage] (const Cluster::Address & address) -> ConnectionPoolPtr
     {
@@ -284,7 +284,7 @@ ConnectionPoolPtr DistributedAsyncInsertDirectoryQueue::createPool(const Cluster
     auto pools = createPoolsForAddresses(addresses, pool_factory, storage.log);
 
     const auto settings = storage.getContext()->getSettings();
-    return pools.size() == 1 ? pools.front() : std::make_shared<ConnectionPoolWithFailover>(pools,
+    return std::make_shared<ConnectionPoolWithFailover>(std::move(pools),
         settings.load_balancing,
         settings.distributed_replica_error_half_life.totalSeconds(),
         settings.distributed_replica_error_cap);
@@ -362,19 +362,19 @@ void DistributedAsyncInsertDirectoryQueue::initializeFilesFromDisk()
         status.broken_bytes_count = broken_bytes_count;
     }
 }
-void DistributedAsyncInsertDirectoryQueue::processFiles()
+void DistributedAsyncInsertDirectoryQueue::processFiles(const SettingsChanges & settings_changes)
 try
 {
     if (should_batch_inserts)
-        processFilesWithBatching();
+        processFilesWithBatching(settings_changes);
     else
     {
         /// Process unprocessed file.
         if (!current_file.empty())
-            processFile(current_file);
+            processFile(current_file, settings_changes);
 
         while (!pending_files.isFinished() && pending_files.tryPop(current_file))
-            processFile(current_file);
+            processFile(current_file, settings_changes);
     }
 
     std::lock_guard status_lock(status_mutex);
@@ -393,7 +393,7 @@ catch (...)
     throw;
 }
 
-void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path)
+void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path, const SettingsChanges & settings_changes)
 {
     OpenTelemetry::TracingContextHolderPtr thread_trace_context;
 
@@ -408,8 +408,13 @@ void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path)
             __PRETTY_FUNCTION__,
             storage.getContext()->getOpenTelemetrySpanLog());
 
-        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(distributed_header.insert_settings);
-        auto connection = pool->get(timeouts, distributed_header.insert_settings);
+        Settings insert_settings = distributed_header.insert_settings;
+        insert_settings.applyChanges(settings_changes);
+
+        auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(insert_settings);
+        auto result = pool->getManyCheckedForInsert(timeouts, insert_settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
+        auto connection = std::move(result.front().entry);
+
         LOG_DEBUG(log, "Sending `{}` to {} ({} rows, {} bytes)",
             file_path,
             connection->getDescription(),
@@ -418,7 +423,7 @@ void DistributedAsyncInsertDirectoryQueue::processFile(std::string & file_path)
 
         RemoteInserter remote{*connection, timeouts,
             distributed_header.insert_query,
-            distributed_header.insert_settings,
+            insert_settings,
             distributed_header.client_info};
         bool compression_expected = connection->getCompression() == Protocol::Compression::Enable;
         writeRemoteConvert(distributed_header, remote, compression_expected, in, log);
@@ -515,7 +520,7 @@ DistributedAsyncInsertDirectoryQueue::Status DistributedAsyncInsertDirectoryQueu
     return current_status;
 }
 
-void DistributedAsyncInsertDirectoryQueue::processFilesWithBatching()
+void DistributedAsyncInsertDirectoryQueue::processFilesWithBatching(const SettingsChanges & settings_changes)
 {
     /// 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))
@@ -533,7 +538,7 @@ void DistributedAsyncInsertDirectoryQueue::processFilesWithBatching()
         /// file was missing, then the batch is not complete and there is no
         /// point in trying to pretend that it will not break deduplication.
         if (batch.valid())
-            batch.send();
+            batch.send(settings_changes);
 
         auto dir_sync_guard = getDirectorySyncGuard(relative_path);
         fs::remove(current_batch_file_path);
@@ -615,14 +620,14 @@ void DistributedAsyncInsertDirectoryQueue::processFilesWithBatching()
 
             if (batch.isEnoughSize())
             {
-                batch.send();
+                batch.send(settings_changes);
             }
         }
 
         for (auto & kv : header_to_batch)
         {
             DistributedAsyncInsertBatch & batch = kv.second;
-            batch.send();
+            batch.send(settings_changes);
         }
     }
     catch (...)
diff --git a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
index 8bbd99c786a..ba4d264f967 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
+++ b/src/Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h
@@ -6,9 +6,7 @@
 #include <IO/ReadBufferFromFile.h>
 #include <Interpreters/Cluster.h>
 #include <Disks/IDisk.h>
-#include <atomic>
 #include <mutex>
-#include <condition_variable>
 
 
 namespace CurrentMetrics { class Increment; }
@@ -22,6 +20,7 @@ using DiskPtr = std::shared_ptr<IDisk>;
 class StorageDistributed;
 class ActionBlocker;
 class BackgroundSchedulePool;
+class SettingsChanges;
 
 class IProcessor;
 using ProcessorPtr = std::shared_ptr<IProcessor>;
@@ -51,17 +50,17 @@ public:
         StorageDistributed & storage_,
         const DiskPtr & disk_,
         const std::string & relative_path_,
-        ConnectionPoolPtr pool_,
+        ConnectionPoolWithFailoverPtr pool_,
         ActionBlocker & monitor_blocker_,
         BackgroundSchedulePool & bg_pool);
 
     ~DistributedAsyncInsertDirectoryQueue();
 
-    static ConnectionPoolPtr createPool(const Cluster::Addresses & addresses, const StorageDistributed & storage);
+    static ConnectionPoolWithFailoverPtr createPool(const Cluster::Addresses & addresses, const StorageDistributed & storage);
 
     void updatePath(const std::string & new_relative_path);
 
-    void flushAllData();
+    void flushAllData(const SettingsChanges & settings_changes);
 
     void shutdownAndDropAllData();
 
@@ -100,9 +99,9 @@ private:
 
     void addFile(const std::string & file_path);
     void initializeFilesFromDisk();
-    void processFiles();
-    void processFile(std::string & file_path);
-    void processFilesWithBatching();
+    void processFiles(const SettingsChanges & settings_changes = {});
+    void processFile(std::string & file_path, const SettingsChanges & settings_changes);
+    void processFilesWithBatching(const SettingsChanges & settings_changes);
 
     void markAsBroken(const std::string & file_path);
     void markAsSend(const std::string & file_path);
@@ -112,7 +111,7 @@ private:
     std::string getLoggerName() const;
 
     StorageDistributed & storage;
-    const ConnectionPoolPtr pool;
+    const ConnectionPoolWithFailoverPtr pool;
 
     DiskPtr disk;
     std::string relative_path;
@@ -145,7 +144,7 @@ private:
     const std::chrono::milliseconds max_sleep_time;
     std::chrono::time_point<std::chrono::system_clock> last_decrease_time {std::chrono::system_clock::now()};
     std::mutex mutex;
-    Poco::Logger * log;
+    LoggerPtr log;
     ActionBlocker & monitor_blocker;
 
     BackgroundSchedulePoolTaskHolder task_handle;
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp b/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp
index a8ed89e66f1..cfcee4dc8a2 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertHeader.cpp
@@ -18,7 +18,7 @@ namespace ErrorCodes
     extern const int CHECKSUM_DOESNT_MATCH;
 }
 
-DistributedAsyncInsertHeader DistributedAsyncInsertHeader::read(ReadBufferFromFile & in, Poco::Logger * log)
+DistributedAsyncInsertHeader DistributedAsyncInsertHeader::read(ReadBufferFromFile & in, LoggerPtr log)
 {
     DistributedAsyncInsertHeader distributed_header;
 
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHeader.h b/src/Storages/Distributed/DistributedAsyncInsertHeader.h
index a7330fa5ef1..fb4b4696463 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertHeader.h
+++ b/src/Storages/Distributed/DistributedAsyncInsertHeader.h
@@ -38,7 +38,7 @@ struct DistributedAsyncInsertHeader
     std::string block_header_string;
     Block block_header;
 
-    static DistributedAsyncInsertHeader read(ReadBufferFromFile & in, Poco::Logger * log);
+    static DistributedAsyncInsertHeader read(ReadBufferFromFile & in, LoggerPtr 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
index 98073ba1e08..a9bdef31711 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertHelpers.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertHelpers.cpp
@@ -72,7 +72,7 @@ void writeRemoteConvert(
     RemoteInserter & remote,
     bool compression_expected,
     ReadBufferFromFile & in,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     if (!remote.getHeader())
     {
diff --git a/src/Storages/Distributed/DistributedAsyncInsertHelpers.h b/src/Storages/Distributed/DistributedAsyncInsertHelpers.h
index 9543450418c..202d9ff6fff 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertHelpers.h
+++ b/src/Storages/Distributed/DistributedAsyncInsertHelpers.h
@@ -1,9 +1,7 @@
 #pragma once
 
-namespace Poco
-{
-class Logger;
-}
+#include <Common/Logger.h>
+
 
 namespace DB
 {
@@ -30,6 +28,6 @@ void writeRemoteConvert(
     RemoteInserter & remote,
     bool compression_expected,
     ReadBufferFromFile & in,
-    Poco::Logger * log);
+    LoggerPtr log);
 
 }
diff --git a/src/Storages/Distributed/DistributedAsyncInsertSource.cpp b/src/Storages/Distributed/DistributedAsyncInsertSource.cpp
index 7992636ac11..33e53da2857 100644
--- a/src/Storages/Distributed/DistributedAsyncInsertSource.cpp
+++ b/src/Storages/Distributed/DistributedAsyncInsertSource.cpp
@@ -10,7 +10,7 @@ namespace DB
 
 struct DistributedAsyncInsertSource::Data
 {
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
 
     ReadBufferFromFile in;
     CompressedReadBuffer decompressing_in;
@@ -19,7 +19,7 @@ struct DistributedAsyncInsertSource::Data
     Block first_block;
 
     explicit Data(const String & file_name)
-        : log(&Poco::Logger::get("DistributedAsyncInsertSource"))
+        : log(getLogger("DistributedAsyncInsertSource"))
         , in(file_name)
         , decompressing_in(in)
         , block_in(decompressing_in, DistributedAsyncInsertHeader::read(in, log).revision)
diff --git a/src/Storages/Distributed/DistributedSettings.cpp b/src/Storages/Distributed/DistributedSettings.cpp
index 555aeba7c58..1f6aa6c72fa 100644
--- a/src/Storages/Distributed/DistributedSettings.cpp
+++ b/src/Storages/Distributed/DistributedSettings.cpp
@@ -1,9 +1,12 @@
-#include <Storages/Distributed/DistributedSettings.h>
+#include <Core/BaseSettings.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Storages/Distributed/DistributedSettings.h>
 #include <Common/Exception.h>
 
+#include <Poco/Util/AbstractConfiguration.h>
+
 
 namespace DB
 {
@@ -15,6 +18,27 @@ namespace ErrorCodes
 
 IMPLEMENT_SETTINGS_TRAITS(DistributedSettingsTraits, LIST_OF_DISTRIBUTED_SETTINGS)
 
+void DistributedSettings::loadFromConfig(const String & config_elem, const Poco::Util::AbstractConfiguration & config)
+{
+    if (!config.has(config_elem))
+        return;
+
+    Poco::Util::AbstractConfiguration::Keys config_keys;
+    config.keys(config_elem, config_keys);
+
+    try
+    {
+        for (const String & key : config_keys)
+            set(key, config.getString(config_elem + "." + key));
+    }
+    catch (Exception & e)
+    {
+        if (e.code() == ErrorCodes::UNKNOWN_SETTING)
+            e.addMessage("in Distributed config");
+        throw;
+    }
+}
+
 void DistributedSettings::loadFromQuery(ASTStorage & storage_def)
 {
     if (storage_def.settings)
diff --git a/src/Storages/Distributed/DistributedSettings.h b/src/Storages/Distributed/DistributedSettings.h
index a326e6310dc..efbd6900b07 100644
--- a/src/Storages/Distributed/DistributedSettings.h
+++ b/src/Storages/Distributed/DistributedSettings.h
@@ -37,6 +37,7 @@ DECLARE_SETTINGS_TRAITS(DistributedSettingsTraits, LIST_OF_DISTRIBUTED_SETTINGS)
   */
 struct DistributedSettings : public BaseSettings<DistributedSettingsTraits>
 {
+    void loadFromConfig(const String & config_elem, const Poco::Util::AbstractConfiguration & config);
     void loadFromQuery(ASTStorage & storage_def);
 };
 
diff --git a/src/Storages/Distributed/DistributedSink.cpp b/src/Storages/Distributed/DistributedSink.cpp
index 650539ef1e9..b89a8d7bcfd 100644
--- a/src/Storages/Distributed/DistributedSink.cpp
+++ b/src/Storages/Distributed/DistributedSink.cpp
@@ -62,7 +62,7 @@ namespace ErrorCodes
     extern const int ABORTED;
 }
 
-static Block adoptBlock(const Block & header, const Block & block, Poco::Logger * log)
+static Block adoptBlock(const Block & header, const Block & block, LoggerPtr log)
 {
     if (blocksHaveEqualStructure(header, block))
         return block;
@@ -84,7 +84,7 @@ static Block adoptBlock(const Block & header, const Block & block, Poco::Logger
 }
 
 
-static void writeBlockConvert(PushingPipelineExecutor & executor, const Block & block, size_t repeats, Poco::Logger * log)
+static void writeBlockConvert(PushingPipelineExecutor & executor, const Block & block, size_t repeats, LoggerPtr log)
 {
     Block adopted_block = adoptBlock(executor.getHeader(), block, log);
     for (size_t i = 0; i < repeats; ++i)
@@ -112,21 +112,19 @@ DistributedSink::DistributedSink(
     const ClusterPtr & cluster_,
     bool insert_sync_,
     UInt64 insert_timeout_,
-    StorageID main_table_,
     const Names & columns_to_send_)
     : SinkToStorage(metadata_snapshot_->getSampleBlock())
     , context(Context::createCopy(context_))
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
-    , query_ast(createInsertToRemoteTableQuery(main_table_.database_name, main_table_.table_name, columns_to_send_))
+    , query_ast(createInsertToRemoteTableQuery(storage.remote_storage.database_name, storage.remote_storage.table_name, columns_to_send_))
     , query_string(queryToString(query_ast))
     , cluster(cluster_)
     , insert_sync(insert_sync_)
     , allow_materialized(context->getSettingsRef().insert_allow_materialized_columns)
     , insert_timeout(insert_timeout_)
-    , main_table(main_table_)
     , columns_to_send(columns_to_send_.begin(), columns_to_send_.end())
-    , log(&Poco::Logger::get("DistributedSink"))
+    , log(getLogger("DistributedSink"))
 {
     const auto & settings = context->getSettingsRef();
     if (settings.max_distributed_depth && context->getClientInfo().distributed_depth >= settings.max_distributed_depth)
@@ -372,10 +370,9 @@ DistributedSink::runWritingJob(JobReplica & job, const Block & current_block, si
                         throw Exception(ErrorCodes::LOGICAL_ERROR, "There are several writing job for an automatically replicated shard");
 
                     /// TODO: it make sense to rewrite skip_unavailable_shards and max_parallel_replicas here
-                    auto results = shard_info.pool->getManyChecked(timeouts, settings, PoolMode::GET_ONE, main_table.getQualifiedName());
-                    if (results.empty() || results.front().entry.isNull())
-                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected exactly one connection for shard {}", toString(job.shard_index));
-
+                    /// NOTE: INSERT will also take into account max_replica_delay_for_distributed_queries
+                    /// (anyway fallback_to_stale_replicas_for_distributed_queries=true by default)
+                    auto results = shard_info.pool->getManyCheckedForInsert(timeouts, settings, PoolMode::GET_ONE, storage.remote_storage.getQualifiedName());
                     job.connection_entry = std::move(results.front().entry);
                 }
                 else
@@ -616,7 +613,7 @@ IColumn::Selector DistributedSink::createSelector(const Block & source_block) co
 
     const auto & key_column = current_block_with_sharding_key_expr.getByName(storage.getShardingKeyColumnName());
 
-    return storage.createSelector(cluster, key_column);
+    return StorageDistributed::createSelector(cluster, key_column);
 }
 
 
diff --git a/src/Storages/Distributed/DistributedSink.h b/src/Storages/Distributed/DistributedSink.h
index 1bb4419e1a5..7a9e89c9e94 100644
--- a/src/Storages/Distributed/DistributedSink.h
+++ b/src/Storages/Distributed/DistributedSink.h
@@ -46,7 +46,6 @@ public:
         const ClusterPtr & cluster_,
         bool insert_sync_,
         UInt64 insert_timeout_,
-        StorageID main_table_,
         const Names & columns_to_send_);
 
     String getName() const override { return "DistributedSink"; }
@@ -108,7 +107,6 @@ private:
 
     /// Sync-related stuff
     UInt64 insert_timeout; // in seconds
-    StorageID main_table;
     NameSet columns_to_send;
     Stopwatch watch;
     Stopwatch watch_current_block;
@@ -152,7 +150,7 @@ private:
 
     std::atomic<unsigned> finished_jobs_count{0};
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/ExecutableSettings.cpp b/src/Storages/ExecutableSettings.cpp
index dc462350a06..d00e4098181 100644
--- a/src/Storages/ExecutableSettings.cpp
+++ b/src/Storages/ExecutableSettings.cpp
@@ -1,10 +1,10 @@
 #include "ExecutableSettings.h"
 
-#include <Common/Exception.h>
-
+#include <Core/BaseSettings.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSetQuery.h>
+#include <Common/Exception.h>
 
 namespace DB
 {
diff --git a/src/Storages/ExecutableSettings.h b/src/Storages/ExecutableSettings.h
index 10dbae8ac9f..95627f08d16 100644
--- a/src/Storages/ExecutableSettings.h
+++ b/src/Storages/ExecutableSettings.h
@@ -2,6 +2,7 @@
 
 #include <Core/Defines.h>
 #include <Core/BaseSettings.h>
+#include <Core/SettingsEnums.h>
 
 namespace DB
 {
diff --git a/src/Storages/FileLog/DirectoryWatcherBase.cpp b/src/Storages/FileLog/DirectoryWatcherBase.cpp
index 8209483fac9..f1cf0866de7 100644
--- a/src/Storages/FileLog/DirectoryWatcherBase.cpp
+++ b/src/Storages/FileLog/DirectoryWatcherBase.cpp
@@ -34,8 +34,8 @@ DirectoryWatcherBase::DirectoryWatcherBase(
     if (!std::filesystem::is_directory(path))
         throw Exception(ErrorCodes::BAD_FILE_TYPE, "Path {} is not a directory", path);
 
-    fd = inotify_init();
-    if (fd == -1)
+    inotify_fd = inotify_init();
+    if (inotify_fd == -1)
         throw ErrnoException(ErrorCodes::IO_SETUP_ERROR, "Cannot initialize inotify");
 
     watch_task = getContext()->getSchedulePool().createTask("directory_watch", [this] { watchFunc(); });
@@ -56,7 +56,7 @@ void DirectoryWatcherBase::watchFunc()
     if (eventMask() & DirectoryWatcherBase::DW_ITEM_MOVED_TO)
         mask |= IN_MOVED_TO;
 
-    int wd = inotify_add_watch(fd, path.c_str(), mask);
+    int wd = inotify_add_watch(inotify_fd, path.c_str(), mask);
     if (wd == -1)
     {
         owner.onError(Exception(ErrorCodes::IO_SETUP_ERROR, "Watch directory {} failed", path));
@@ -65,16 +65,20 @@ void DirectoryWatcherBase::watchFunc()
 
     std::string buffer;
     buffer.resize(buffer_size);
-    pollfd pfd;
-    pfd.fd = fd;
-    pfd.events = POLLIN;
+    pollfd pfds[2];
+    /// inotify descriptor
+    pfds[0].fd = inotify_fd;
+    pfds[0].events = POLLIN;
+    // notifier
+    pfds[1].fd = event_pipe.fds_rw[0];
+    pfds[1].events = POLLIN;
     while (!stopped)
     {
         const auto & settings = owner.storage.getFileLogSettings();
-        if (poll(&pfd, 1, static_cast<int>(milliseconds_to_wait)) > 0 && pfd.revents & POLLIN)
+        if (poll(pfds, 2, static_cast<int>(milliseconds_to_wait)) > 0 && pfds[0].revents & POLLIN)
         {
             milliseconds_to_wait = settings->poll_directory_watch_events_backoff_init.totalMilliseconds();
-            ssize_t n = read(fd, buffer.data(), buffer.size());
+            ssize_t n = read(inotify_fd, buffer.data(), buffer.size());
             int i = 0;
             if (n > 0)
             {
@@ -130,7 +134,7 @@ void DirectoryWatcherBase::watchFunc()
 DirectoryWatcherBase::~DirectoryWatcherBase()
 {
     stop();
-    int err = ::close(fd);
+    int err = ::close(inotify_fd);
     chassert(!err || errno == EINTR);
 }
 
@@ -143,6 +147,7 @@ void DirectoryWatcherBase::start()
 void DirectoryWatcherBase::stop()
 {
     stopped = true;
+    ::write(event_pipe.fds_rw[1], "\0", 1);
     if (watch_task)
         watch_task->deactivate();
 }
diff --git a/src/Storages/FileLog/DirectoryWatcherBase.h b/src/Storages/FileLog/DirectoryWatcherBase.h
index a640f686c8a..3bf93415b8f 100644
--- a/src/Storages/FileLog/DirectoryWatcherBase.h
+++ b/src/Storages/FileLog/DirectoryWatcherBase.h
@@ -1,6 +1,8 @@
 #pragma once
 
 #include <Core/BackgroundSchedulePool.h>
+#include <Common/PipeFDs.h>
+#include <Interpreters/Context_fwd.h>
 
 #include <atomic>
 #include <memory>
@@ -85,10 +87,6 @@ public:
 
     void watchFunc();
 
-protected:
-    void start();
-    void stop();
-
 private:
     FileLogDirectoryWatcher & owner;
 
@@ -102,7 +100,11 @@ private:
     int event_mask;
     uint64_t milliseconds_to_wait;
 
-    int fd;
+    int inotify_fd;
+    PipeFDs event_pipe;
+
+    void start();
+    void stop();
 };
 
 }
diff --git a/src/Storages/FileLog/FileLogConsumer.cpp b/src/Storages/FileLog/FileLogConsumer.cpp
index bfe081c7bad..1bd3026ab8c 100644
--- a/src/Storages/FileLog/FileLogConsumer.cpp
+++ b/src/Storages/FileLog/FileLogConsumer.cpp
@@ -22,7 +22,7 @@ FileLogConsumer::FileLogConsumer(
     ContextPtr context_,
     size_t stream_number_,
     size_t max_streams_number_)
-    : log(&Poco::Logger::get("FileLogConsumer " + toString(stream_number_)))
+    : log(getLogger("FileLogConsumer " + toString(stream_number_)))
     , storage(storage_)
     , batch_size(max_batch_size)
     , poll_timeout(poll_timeout_)
diff --git a/src/Storages/FileLog/FileLogConsumer.h b/src/Storages/FileLog/FileLogConsumer.h
index b19f3a9350b..e44bfeb1806 100644
--- a/src/Storages/FileLog/FileLogConsumer.h
+++ b/src/Storages/FileLog/FileLogConsumer.h
@@ -42,7 +42,7 @@ private:
 
     BufferStatus buffer_status = BufferStatus::INIT;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     StorageFileLog & storage;
 
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.cpp b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
index 9d488616e85..844b31fd7c9 100644
--- a/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.cpp
@@ -6,7 +6,7 @@ namespace DB
 FileLogDirectoryWatcher::FileLogDirectoryWatcher(const std::string & path_, StorageFileLog & storage_, ContextPtr context_)
     : path(path_)
     , storage(storage_)
-    , log(&Poco::Logger::get("FileLogDirectoryWatcher(" + path + ")"))
+    , log(getLogger("FileLogDirectoryWatcher(" + path + ")"))
     , dw(std::make_unique<DirectoryWatcherBase>(*this, path, context_))
 {
 }
diff --git a/src/Storages/FileLog/FileLogDirectoryWatcher.h b/src/Storages/FileLog/FileLogDirectoryWatcher.h
index 9b7afcf8e12..1cf3697c7c0 100644
--- a/src/Storages/FileLog/FileLogDirectoryWatcher.h
+++ b/src/Storages/FileLog/FileLogDirectoryWatcher.h
@@ -65,7 +65,7 @@ private:
     /// accessed in thread created by dw.
     Events events;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::mutex mutex;
 
diff --git a/src/Storages/FileLog/FileLogSettings.cpp b/src/Storages/FileLog/FileLogSettings.cpp
index 2cd42c35870..8e245285b9a 100644
--- a/src/Storages/FileLog/FileLogSettings.cpp
+++ b/src/Storages/FileLog/FileLogSettings.cpp
@@ -11,6 +11,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_SETTING;
+    extern const int INVALID_SETTING_VALUE;
 }
 
 IMPLEMENT_SETTINGS_TRAITS(FileLogSettingsTraits, LIST_OF_FILELOG_SETTINGS)
@@ -36,6 +37,11 @@ void FileLogSettings::loadFromQuery(ASTStorage & storage_def)
         settings_ast->is_standalone = false;
         storage_def.set(storage_def.settings, settings_ast);
     }
+
+    /// Check that batch size is not too high (the same as we check setting max_block_size).
+    constexpr UInt64 max_sane_block_rows_size = 4294967296; // 2^32
+    if (poll_max_batch_size > max_sane_block_rows_size)
+        throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Sanity check: 'poll_max_batch_size' value is too high ({})", poll_max_batch_size);
 }
 
 }
diff --git a/src/Storages/FileLog/FileLogSource.cpp b/src/Storages/FileLog/FileLogSource.cpp
index b1192af4ced..eb3ff0436a5 100644
--- a/src/Storages/FileLog/FileLogSource.cpp
+++ b/src/Storages/FileLog/FileLogSource.cpp
@@ -31,7 +31,7 @@ FileLogSource::FileLogSource(
     , max_streams_number(max_streams_number_)
     , handle_error_mode(handle_error_mode_)
     , non_virtual_header(storage_snapshot->metadata->getSampleBlockNonMaterialized())
-    , virtual_header(storage_snapshot->getSampleBlockForColumns(storage.getVirtuals().getNames()))
+    , virtual_header(storage_snapshot->virtual_columns->getSampleBlock())
 {
     consumer = std::make_unique<FileLogConsumer>(storage, max_block_size, poll_time_out, context, stream_number_, max_streams_number_);
 
diff --git a/src/Storages/FileLog/FileLogSource.h b/src/Storages/FileLog/FileLogSource.h
index 281b109ff4b..3ac2b407e10 100644
--- a/src/Storages/FileLog/FileLogSource.h
+++ b/src/Storages/FileLog/FileLogSource.h
@@ -30,7 +30,7 @@ public:
 
     void onFinish();
 
-    virtual ~FileLogSource() override;
+    ~FileLogSource() override;
 
 protected:
     Chunk generate() override;
diff --git a/src/Storages/FileLog/StorageFileLog.cpp b/src/Storages/FileLog/StorageFileLog.cpp
index 2eea619d654..d3e31101d3b 100644
--- a/src/Storages/FileLog/StorageFileLog.cpp
+++ b/src/Storages/FileLog/StorageFileLog.cpp
@@ -1,21 +1,25 @@
 #include <DataTypes/DataTypeLowCardinality.h>
+#include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
-#include <DataTypes/DataTypeNullable.h>
 #include <Disks/StoragePolicy.h>
 #include <IO/ReadBufferFromFile.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteBufferFromFile.h>
 #include <IO/WriteIntText.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/ReadFromStreamLikeEngine.h>
 #include <QueryPipeline/Pipe.h>
 #include <Storages/FileLog/FileLogSource.h>
 #include <Storages/FileLog/StorageFileLog.h>
+#include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
 #include <Storages/checkAndGetLiteralArgument.h>
@@ -50,6 +54,76 @@ namespace
 
 static constexpr auto TMP_SUFFIX = ".tmp";
 
+
+class ReadFromStorageFileLog final : public ReadFromStreamLikeEngine
+{
+public:
+    ReadFromStorageFileLog(
+        const Names & column_names_,
+        StoragePtr storage_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        SelectQueryInfo & query_info,
+        ContextPtr context_)
+        : ReadFromStreamLikeEngine{column_names_, storage_snapshot_, query_info.storage_limits, context_}
+        , column_names{column_names_}
+        , storage{storage_}
+        , storage_snapshot{storage_snapshot_}
+    {
+    }
+
+    String getName() const override { return "ReadFromStorageFileLog"; }
+
+private:
+    Pipe makePipe() final
+    {
+        auto & file_log = storage->as<StorageFileLog &>();
+        if (file_log.mv_attached)
+            throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Cannot read from StorageFileLog with attached materialized views");
+
+        std::lock_guard lock(file_log.file_infos_mutex);
+        if (file_log.running_streams)
+            throw Exception(ErrorCodes::CANNOT_SELECT, "Another select query is running on this table, need to wait it finish.");
+
+        file_log.updateFileInfos();
+
+        /// No files to parse
+        if (file_log.file_infos.file_names.empty())
+        {
+            LOG_WARNING(file_log.log, "There is a idle table named {}, no files need to parse.", getName());
+            return Pipe{};
+        }
+
+        auto modified_context = Context::createCopy(getContext());
+
+        auto max_streams_number = std::min<UInt64>(file_log.filelog_settings->max_threads, file_log.file_infos.file_names.size());
+
+        /// Each stream responsible for closing it's files and store meta
+        file_log.openFilesAndSetPos();
+
+        Pipes pipes;
+        pipes.reserve(max_streams_number);
+        for (size_t stream_number = 0; stream_number < max_streams_number; ++stream_number)
+        {
+            pipes.emplace_back(std::make_shared<FileLogSource>(
+                file_log,
+                storage_snapshot,
+                modified_context,
+                column_names,
+                file_log.getMaxBlockSize(),
+                file_log.getPollTimeoutMillisecond(),
+                stream_number,
+                max_streams_number,
+                file_log.filelog_settings->handle_error_mode));
+        }
+
+        return Pipe::unitePipes(std::move(pipes));
+    }
+
+    const Names column_names;
+    StoragePtr storage;
+    StorageSnapshotPtr storage_snapshot;
+};
+
 StorageFileLog::StorageFileLog(
     const StorageID & table_id_,
     ContextPtr context_,
@@ -59,14 +133,14 @@ StorageFileLog::StorageFileLog(
     const String & format_name_,
     std::unique_ptr<FileLogSettings> settings,
     const String & comment,
-    bool attach)
+    LoadingStrictnessLevel mode)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
     , filelog_settings(std::move(settings))
     , path(path_)
     , metadata_base_path(std::filesystem::path(metadata_base_path_) / "metadata")
     , format_name(format_name_)
-    , log(&Poco::Logger::get("StorageFileLog (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageFileLog (" + table_id_.table_name + ")"))
     , disk(getContext()->getStoragePolicy("default")->getDisks().at(0))
     , milliseconds_to_wait(filelog_settings->poll_directory_watch_events_backoff_init.totalMilliseconds())
 {
@@ -74,10 +148,11 @@ StorageFileLog::StorageFileLog(
     storage_metadata.setColumns(columns_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals(filelog_settings->handle_error_mode));
 
     if (!fileOrSymlinkPathStartsWith(path, getContext()->getUserFilesPath()))
     {
-        if (attach)
+        if (LoadingStrictnessLevel::SECONDARY_CREATE <= mode)
         {
             LOG_ERROR(log, "The absolute data path should be inside `user_files_path`({})", getContext()->getUserFilesPath());
             return;
@@ -92,7 +167,7 @@ StorageFileLog::StorageFileLog(
     bool created_metadata_directory = false;
     try
     {
-        if (!attach)
+        if (mode < LoadingStrictnessLevel::ATTACH)
         {
             if (disk->exists(metadata_base_path))
             {
@@ -105,7 +180,7 @@ StorageFileLog::StorageFileLog(
             created_metadata_directory = true;
         }
 
-        loadMetaFiles(attach);
+        loadMetaFiles(LoadingStrictnessLevel::ATTACH <= mode);
         loadFiles();
 
         assert(file_infos.file_names.size() == file_infos.meta_by_inode.size());
@@ -119,7 +194,7 @@ StorageFileLog::StorageFileLog(
     }
     catch (...)
     {
-        if (!attach)
+        if (mode <= LoadingStrictnessLevel::ATTACH)
         {
             if (created_metadata_directory)
                 disk->removeRecursive(metadata_base_path);
@@ -130,6 +205,22 @@ StorageFileLog::StorageFileLog(
     }
 }
 
+VirtualColumnsDescription StorageFileLog::createVirtuals(StreamingHandleErrorMode handle_error_mode)
+{
+    VirtualColumnsDescription desc;
+
+    desc.addEphemeral("_filename", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "");
+    desc.addEphemeral("_offset", std::make_shared<DataTypeUInt64>(), "");
+
+    if (handle_error_mode == StreamingHandleErrorMode::STREAM)
+    {
+        desc.addEphemeral("_raw_record", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+        desc.addEphemeral("_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+    }
+
+    return desc;
+}
+
 void StorageFileLog::loadMetaFiles(bool attach)
 {
     /// Attach table
@@ -296,62 +387,19 @@ UInt64 StorageFileLog::getInode(const String & file_name)
     return file_stat.st_ino;
 }
 
-Pipe StorageFileLog::read(
+void StorageFileLog::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /* query_info */,
-    ContextPtr local_context,
+    SelectQueryInfo & query_info,
+    ContextPtr query_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
     size_t /* num_streams */)
+
 {
-    /// If there are MVs depended on this table, we just forbid reading
-    if (!local_context->getSettingsRef().stream_like_engine_allow_direct_select)
-        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED,
-                        "Direct select is not allowed. To enable use setting `stream_like_engine_allow_direct_select`");
-
-    if (mv_attached)
-        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Cannot read from StorageFileLog with attached materialized views");
-
-    std::lock_guard lock(file_infos_mutex);
-    if (running_streams)
-    {
-        throw Exception(ErrorCodes::CANNOT_SELECT, "Another select query is running on this table, need to wait it finish.");
-    }
-
-    updateFileInfos();
-
-    /// No files to parse
-    if (file_infos.file_names.empty())
-    {
-        LOG_WARNING(log, "There is a idle table named {}, no files need to parse.", getName());
-        return Pipe{};
-    }
-
-    auto modified_context = Context::createCopy(local_context);
-
-    auto max_streams_number = std::min<UInt64>(filelog_settings->max_threads, file_infos.file_names.size());
-
-    /// Each stream responsible for closing it's files and store meta
-    openFilesAndSetPos();
-
-    Pipes pipes;
-    pipes.reserve(max_streams_number);
-    for (size_t stream_number = 0; stream_number < max_streams_number; ++stream_number)
-    {
-        pipes.emplace_back(std::make_shared<FileLogSource>(
-            *this,
-            storage_snapshot,
-            modified_context,
-            column_names,
-            getMaxBlockSize(),
-            getPollTimeoutMillisecond(),
-            stream_number,
-            max_streams_number,
-            filelog_settings->handle_error_mode));
-    }
-
-    return Pipe::unitePipes(std::move(pipes));
+    query_plan.addStep(
+        std::make_unique<ReadFromStorageFileLog>(column_names, shared_from_this(), storage_snapshot, query_info, std::move(query_context)));
 }
 
 void StorageFileLog::increaseStreams()
@@ -419,7 +467,7 @@ void StorageFileLog::openFilesAndSetPos()
             auto & reader = file_ctx.reader.value();
             assertStreamGood(reader);
 
-            reader.seekg(0, reader.end);
+            reader.seekg(0, reader.end); /// NOLINT(readability-static-accessed-through-instance)
             assertStreamGood(reader);
 
             auto file_end = reader.tellg();
@@ -815,7 +863,7 @@ void registerStorageFileLog(StorageFactory & factory)
             format,
             std::move(filelog_settings),
             args.comment,
-            args.attach);
+            args.mode);
     };
 
     factory.registerStorage(
@@ -979,19 +1027,4 @@ bool StorageFileLog::updateFileInfos()
     return events.empty() || file_infos.file_names.empty();
 }
 
-NamesAndTypesList StorageFileLog::getVirtuals() const
-{
-    auto virtuals = NamesAndTypesList{
-        {"_filename", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_offset", std::make_shared<DataTypeUInt64>()}};
-
-    if (filelog_settings->handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        virtuals.push_back({"_raw_record", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-        virtuals.push_back({"_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-    }
-
-    return virtuals;
-}
-
 }
diff --git a/src/Storages/FileLog/StorageFileLog.h b/src/Storages/FileLog/StorageFileLog.h
index 3cb6ac1fbbf..0434213c558 100644
--- a/src/Storages/FileLog/StorageFileLog.h
+++ b/src/Storages/FileLog/StorageFileLog.h
@@ -38,7 +38,7 @@ public:
         const String & format_name_,
         std::unique_ptr<FileLogSettings> settings,
         const String & comment,
-        bool attach);
+        LoadingStrictnessLevel mode);
 
     using Files = std::vector<String>;
 
@@ -49,7 +49,8 @@ public:
     void startup() override;
     void shutdown(bool is_drop) override;
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
@@ -101,8 +102,6 @@ public:
     String getFullMetaPath(const String & file_name) const { return std::filesystem::path(metadata_base_path) / file_name; }
     String getFullDataPath(const String & file_name) const { return std::filesystem::path(root_data_path) / file_name; }
 
-    NamesAndTypesList getVirtuals() const override;
-
     static UInt64 getInode(const String & file_name);
 
     void openFilesAndSetPos();
@@ -133,6 +132,8 @@ public:
     const auto & getFileLogSettings() const { return filelog_settings; }
 
 private:
+    friend class ReadFromStorageFileLog;
+
     std::unique_ptr<FileLogSettings> filelog_settings;
 
     const String path;
@@ -146,7 +147,7 @@ private:
     FileInfos file_infos;
 
     const String format_name;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     DiskPtr disk;
 
@@ -176,7 +177,7 @@ private:
     };
     std::shared_ptr<TaskContext> task;
 
-    std::unique_ptr<FileLogDirectoryWatcher> directory_watch = nullptr;
+    std::unique_ptr<FileLogDirectoryWatcher> directory_watch;
 
     void loadFiles();
 
@@ -209,6 +210,8 @@ private:
         UInt64 inode = 0;
     };
     ReadMetadataResult readMetadata(const String & filename) const;
+
+    static VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
 };
 
 }
diff --git a/src/Storages/Freeze.cpp b/src/Storages/Freeze.cpp
index b9642ec7907..a5a5a07c9a1 100644
--- a/src/Storages/Freeze.cpp
+++ b/src/Storages/Freeze.cpp
@@ -76,7 +76,7 @@ bool FreezeMetaData::load(DiskPtr data_disk, const String & path)
     readIntText(version, buffer);
     if (version < 1 || version > 2)
     {
-        LOG_ERROR(&Poco::Logger::get("FreezeMetaData"), "Unknown frozen metadata version: {}", version);
+        LOG_ERROR(getLogger("FreezeMetaData"), "Unknown frozen metadata version: {}", version);
         return false;
     }
     DB::assertChar('\n', buffer);
diff --git a/src/Storages/Freeze.h b/src/Storages/Freeze.h
index a64be7465dd..035786fc90d 100644
--- a/src/Storages/Freeze.h
+++ b/src/Storages/Freeze.h
@@ -32,13 +32,13 @@ public:
 class Unfreezer
 {
 public:
-    Unfreezer(ContextPtr context);
+    explicit Unfreezer(ContextPtr context);
     PartitionCommandsResultInfo unfreezePartitionsFromTableDirectory(MergeTreeData::MatcherFn matcher, const String & backup_name, const Disks & disks, const fs::path & table_directory);
     BlockIO systemUnfreeze(const String & backup_name);
 private:
     ContextPtr local_context;
     zkutil::ZooKeeperPtr zookeeper;
-    Poco::Logger * log = &Poco::Logger::get("Unfreezer");
+    LoggerPtr log = getLogger("Unfreezer");
     static constexpr std::string_view backup_directory_prefix = "shadow";
     static bool removeFreezedPart(DiskPtr disk, const String & path, const String & part_name, ContextPtr local_context, zkutil::ZooKeeperPtr zookeeper);
 };
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
index b490c5cac63..6b6151f5474 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.cpp
@@ -44,7 +44,7 @@ AsynchronousReadBufferFromHDFS::AsynchronousReadBufferFromHDFS(
     , prefetch_buffer(settings_.remote_fs_buffer_size)
     , read_until_position(impl->getFileSize())
     , use_prefetch(settings_.remote_fs_prefetch)
-    , log(&Poco::Logger::get("AsynchronousReadBufferFromHDFS"))
+    , log(getLogger("AsynchronousReadBufferFromHDFS"))
 {
     ProfileEvents::increment(ProfileEvents::RemoteFSBuffers);
 }
diff --git a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
index d89aa60ab71..10e2749fd4a 100644
--- a/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
+++ b/src/Storages/HDFS/AsynchronousReadBufferFromHDFS.h
@@ -62,7 +62,7 @@ private:
     std::optional<size_t> read_until_position;
     bool use_prefetch;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Metrics to profile prefetch
     Stopwatch interval_watch;
diff --git a/src/Storages/HDFS/HDFSCommon.cpp b/src/Storages/HDFS/HDFSCommon.cpp
index 12b32b740de..f9a55a1285a 100644
--- a/src/Storages/HDFS/HDFSCommon.cpp
+++ b/src/Storages/HDFS/HDFSCommon.cpp
@@ -55,7 +55,7 @@ void HDFSBuilderWrapper::loadFromConfig(
             need_kinit = true;
             hadoop_kerberos_keytab = config.getString(key_path);
             #else // USE_KRB5
-            LOG_WARNING(&Poco::Logger::get("HDFSClient"), "hadoop_kerberos_keytab parameter is ignored because ClickHouse was built without support of krb5 library.");
+            LOG_WARNING(getLogger("HDFSClient"), "hadoop_kerberos_keytab parameter is ignored because ClickHouse was built without support of krb5 library.");
             #endif // USE_KRB5
             continue;
         }
@@ -66,7 +66,7 @@ void HDFSBuilderWrapper::loadFromConfig(
             hadoop_kerberos_principal = config.getString(key_path);
             hdfsBuilderSetPrincipal(hdfs_builder, hadoop_kerberos_principal.c_str());
             #else // USE_KRB5
-            LOG_WARNING(&Poco::Logger::get("HDFSClient"), "hadoop_kerberos_principal parameter is ignored because ClickHouse was built without support of krb5 library.");
+            LOG_WARNING(getLogger("HDFSClient"), "hadoop_kerberos_principal parameter is ignored because ClickHouse was built without support of krb5 library.");
             #endif // USE_KRB5
             continue;
         }
@@ -81,7 +81,7 @@ void HDFSBuilderWrapper::loadFromConfig(
             hadoop_security_kerberos_ticket_cache_path = config.getString(key_path);
             // standard param - pass further
             #else // USE_KRB5
-            LOG_WARNING(&Poco::Logger::get("HDFSClient"), "hadoop.security.kerberos.ticket.cache.path parameter is ignored because ClickHouse was built without support of krb5 library.");
+            LOG_WARNING(getLogger("HDFSClient"), "hadoop.security.kerberos.ticket.cache.path parameter is ignored because ClickHouse was built without support of krb5 library.");
             #endif // USE_KRB5
         }
 
@@ -95,7 +95,7 @@ void HDFSBuilderWrapper::loadFromConfig(
 #if USE_KRB5
 void HDFSBuilderWrapper::runKinit()
 {
-    LOG_DEBUG(&Poco::Logger::get("HDFSClient"), "Running KerberosInit");
+    LOG_DEBUG(getLogger("HDFSClient"), "Running KerberosInit");
     try
     {
         kerberosInit(hadoop_kerberos_keytab,hadoop_kerberos_principal,hadoop_security_kerberos_ticket_cache_path);
@@ -104,7 +104,7 @@ void HDFSBuilderWrapper::runKinit()
     {
         throw Exception(ErrorCodes::KERBEROS_ERROR, "KerberosInit failure: {}", getExceptionMessage(e, false));
     }
-    LOG_DEBUG(&Poco::Logger::get("HDFSClient"), "Finished KerberosInit");
+    LOG_DEBUG(getLogger("HDFSClient"), "Finished KerberosInit");
 }
 #endif // USE_KRB5
 
diff --git a/src/Storages/HDFS/ReadBufferFromHDFS.cpp b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
index ca84719b793..4df05d47003 100644
--- a/src/Storages/HDFS/ReadBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/ReadBufferFromHDFS.cpp
@@ -2,7 +2,7 @@
 
 #if USE_HDFS
 #include <Storages/HDFS/HDFSCommon.h>
-#include <IO/ResourceGuard.h>
+#include <Common/Scheduler/ResourceGuard.h>
 #include <IO/Progress.h>
 #include <Common/Throttler.h>
 #include <Common/safe_cast.h>
diff --git a/src/Storages/HDFS/StorageHDFS.cpp b/src/Storages/HDFS/StorageHDFS.cpp
index c1c327de74a..93cf64f30a0 100644
--- a/src/Storages/HDFS/StorageHDFS.cpp
+++ b/src/Storages/HDFS/StorageHDFS.cpp
@@ -67,6 +67,7 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_COMPILE_REGEXP;
+    extern const int CANNOT_DETECT_FORMAT;
 }
 namespace
 {
@@ -194,7 +195,7 @@ StorageHDFS::StorageHDFS(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    ContextPtr context_,
+    const ContextPtr & context_,
     const String & compression_method_,
     const bool distributed_processing_,
     ASTPtr partition_by_)
@@ -206,7 +207,8 @@ StorageHDFS::StorageHDFS(
     , distributed_processing(distributed_processing_)
     , partition_by(partition_by_)
 {
-    FormatFactory::instance().checkFormatName(format_name);
+    if (format_name != "auto")
+        FormatFactory::instance().checkFormatName(format_name);
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri_));
     checkHDFSURL(uri_);
 
@@ -217,11 +219,19 @@ StorageHDFS::StorageHDFS(
 
     if (columns_.empty())
     {
-        auto columns = getTableStructureFromData(format_name, uri_, compression_method, context_);
+        ColumnsDescription columns;
+        if (format_name == "auto")
+            std::tie(columns, format_name) = getTableStructureAndFormatFromData(uri_, compression_method_, context_);
+        else
+            columns = getTableStructureFromData(format_name, uri_, compression_method, context_);
+
         storage_metadata.setColumns(columns);
     }
     else
     {
+        if (format_name == "auto")
+            format_name = getTableStructureAndFormatFromData(uri_, compression_method_, context_).second;
+
         /// We don't allow special columns in HDFS storage.
         if (!columns_.hasOnlyOrdinary())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table engine HDFS doesn't support special columns like MATERIALIZED, ALIAS or EPHEMERAL");
@@ -231,8 +241,7 @@ StorageHDFS::StorageHDFS(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 namespace
@@ -243,25 +252,25 @@ namespace
         ReadBufferIterator(
             const std::vector<StorageHDFS::PathWithInfo> & paths_with_info_,
             const String & uri_without_path_,
-            const String & format_,
+            std::optional<String> format_,
             const String & compression_method_,
             const ContextPtr & context_)
         : WithContext(context_)
         , paths_with_info(paths_with_info_)
         , uri_without_path(uri_without_path_)
-        , format(format_)
+        , format(std::move(format_))
         , compression_method(compression_method_)
         {
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
             bool is_first = current_index == 0;
             /// For default mode check cached columns for all paths on first iteration.
             if (is_first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
             {
                 if (auto cached_columns = tryGetColumnsFromCache(paths_with_info))
-                    return {nullptr, cached_columns};
+                    return {nullptr, cached_columns, format};
             }
 
             StorageHDFS::PathWithInfo path_with_info;
@@ -271,10 +280,17 @@ namespace
                 if (current_index == paths_with_info.size())
                 {
                     if (is_first)
-                        throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                                        "Cannot extract table structure from {} format file, because all files are empty. "
-                                        "You must specify table structure manually", format);
-                    return {nullptr, std::nullopt};
+                    {
+                        if (format)
+                            throw Exception(ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                                            "The table structure cannot be extracted from a {} format file, because all files are empty. "
+                                            "You can specify table structure manually", *format);
+
+                        throw Exception(
+                            ErrorCodes::CANNOT_DETECT_FORMAT,
+                            "The data format cannot be detected by the contents of the files, because all files are empty. You can specify table structure manually");
+                    }
+                    return {nullptr, std::nullopt, format};
                 }
 
                 path_with_info = paths_with_info[current_index++];
@@ -285,7 +301,7 @@ namespace
                 {
                     std::vector<StorageHDFS::PathWithInfo> paths = {path_with_info};
                     if (auto cached_columns = tryGetColumnsFromCache(paths))
-                        return {nullptr, cached_columns};
+                        return {nullptr, cached_columns, format};
                 }
 
                 auto compression = chooseCompressionMethod(path_with_info.path, compression_method);
@@ -293,7 +309,7 @@ namespace
                 if (!getContext()->getSettingsRef().hdfs_skip_empty_files || !impl->eof())
                 {
                     const Int64 zstd_window_log_max = getContext()->getSettingsRef().zstd_window_log_max;
-                    return {wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max)), std::nullopt};
+                    return {wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max)), std::nullopt, format};
                 }
             }
         }
@@ -304,7 +320,7 @@ namespace
                 return;
 
             String source = uri_without_path + paths_with_info[current_index - 1].path;
-            auto key = getKeyForSchemaCache(source, format, std::nullopt, getContext());
+            auto key = getKeyForSchemaCache(source, *format, std::nullopt, getContext());
             StorageHDFS::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -315,7 +331,7 @@ namespace
                 return;
 
             String source = uri_without_path + paths_with_info[current_index - 1].path;
-            auto key = getKeyForSchemaCache(source, format, std::nullopt, getContext());
+            auto key = getKeyForSchemaCache(source, *format, std::nullopt, getContext());
             StorageHDFS::getSchemaCache(getContext()).addColumns(key, columns);
         }
 
@@ -328,10 +344,15 @@ namespace
             Strings sources;
             sources.reserve(paths_with_info.size());
             std::transform(paths_with_info.begin(), paths_with_info.end(), std::back_inserter(sources), [&](const StorageHDFS::PathWithInfo & path_with_info){ return uri_without_path + path_with_info.path; });
-            auto cache_keys = getKeysForSchemaCache(sources, format, {}, getContext());
+            auto cache_keys = getKeysForSchemaCache(sources, *format, {}, getContext());
             StorageHDFS::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
         String getLastFileName() const override
         {
             if (current_index != 0)
@@ -340,13 +361,27 @@ namespace
             return "";
         }
 
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            chassert(current_index > 0 && current_index <= paths_with_info.size());
+            auto path_with_info = paths_with_info[current_index - 1];
+            auto compression = chooseCompressionMethod(path_with_info.path, compression_method);
+            auto impl = std::make_unique<ReadBufferFromHDFS>(uri_without_path, path_with_info.path, getContext()->getGlobalContext()->getConfigRef(), getContext()->getReadSettings());
+            const Int64 zstd_window_log_max = getContext()->getSettingsRef().zstd_window_log_max;
+            return wrapReadBufferWithCompressionMethod(std::move(impl), compression, static_cast<int>(zstd_window_log_max));
+        }
+
     private:
         std::optional<ColumnsDescription> tryGetColumnsFromCache(const std::vector<StorageHDFS::PathWithInfo> & paths_with_info_)
         {
-            if (!getContext()->getSettingsRef().schema_inference_use_cache_for_hdfs)
+            auto context = getContext();
+
+            if (!context->getSettingsRef().schema_inference_use_cache_for_hdfs)
                 return std::nullopt;
 
-            auto & schema_cache = StorageHDFS::getSchemaCache(getContext());
+            auto & schema_cache = StorageHDFS::getSchemaCache(context);
             for (const auto & path_with_info : paths_with_info_)
             {
                 auto get_last_mod_time = [&]() -> std::optional<time_t>
@@ -354,7 +389,7 @@ namespace
                     if (path_with_info.info)
                         return path_with_info.info->last_mod_time;
 
-                    auto builder = createHDFSBuilder(uri_without_path + "/", getContext()->getGlobalContext()->getConfigRef());
+                    auto builder = createHDFSBuilder(uri_without_path + "/", context->getGlobalContext()->getConfigRef());
                     auto fs = createHDFSFS(builder.get());
                     HDFSFileInfoPtr hdfs_info(hdfsGetPathInfo(fs.get(), path_with_info.path.c_str()));
                     if (hdfs_info)
@@ -364,10 +399,28 @@ namespace
                 };
 
                 String url = uri_without_path + path_with_info.path;
-                auto cache_key = getKeyForSchemaCache(url, format, {}, getContext());
-                auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-                if (columns)
-                    return columns;
+                if (format)
+                {
+                    auto cache_key = getKeyForSchemaCache(url, *format, {}, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        return columns;
+                }
+                else
+                {
+                    /// If format is unknown, we can iterate through all possible input formats
+                    /// and check if we have an entry with this format and this file in schema cache.
+                    /// If we have such entry for some format, we can use this format to read the file.
+                    for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                    {
+                        auto cache_key = getKeyForSchemaCache(url, format_name, {}, context);
+                        if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        {
+                            /// Now format is known. It should be the same for all files.
+                            format = format_name;
+                            return columns;
+                        }
+                    }
+                }
             }
 
             return std::nullopt;
@@ -375,29 +428,49 @@ namespace
 
         const std::vector<StorageHDFS::PathWithInfo> & paths_with_info;
         const String & uri_without_path;
-        const String & format;
+        std::optional<String> format;
         const String & compression_method;
         size_t current_index = 0;
     };
 }
 
-ColumnsDescription StorageHDFS::getTableStructureFromData(
-    const String & format,
+std::pair<ColumnsDescription, String> StorageHDFS::getTableStructureAndFormatFromDataImpl(
+    std::optional<String> format,
     const String & uri,
     const String & compression_method,
-    ContextPtr ctx)
+    const ContextPtr & ctx)
 {
     const auto [path_from_uri, uri_without_path] = getPathFromUriAndUriWithoutPath(uri);
     auto paths_with_info = getPathsList(path_from_uri, uri, ctx);
 
-    if (paths_with_info.empty() && !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(format))
+    if (paths_with_info.empty() && (!format || !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(*format)))
+    {
+        if (format)
+            throw Exception(
+                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                "The table structure cannot be extracted from a {} format file, because there are no files in HDFS with provided path."
+                " You can specify table structure manually", *format);
+
         throw Exception(
             ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-            "Cannot extract table structure from {} format file, because there are no files in HDFS with provided path."
-            " You must specify table structure manually", format);
+            "The data format cannot be detected by the contents of the files, because there are no files in HDFS with provided path."
+            " You can specify the format manually");
+    }
 
     ReadBufferIterator read_buffer_iterator(paths_with_info, uri_without_path, format, compression_method, ctx);
-    return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, paths_with_info.size() > 1, ctx);
+    if (format)
+        return {readSchemaFromFormat(*format, std::nullopt, read_buffer_iterator, ctx), *format};
+    return detectFormatAndReadSchema(std::nullopt, read_buffer_iterator, ctx);
+}
+
+std::pair<ColumnsDescription, String> StorageHDFS::getTableStructureAndFormatFromData(const String & uri, const String & compression_method, const ContextPtr & ctx)
+{
+    return getTableStructureAndFormatFromDataImpl(std::nullopt, uri, compression_method, ctx);
+}
+
+ColumnsDescription StorageHDFS::getTableStructureFromData(const String & format, const String & uri, const String & compression_method, const DB::ContextPtr & ctx)
+{
+    return getTableStructureAndFormatFromDataImpl(format, uri, compression_method, ctx).first;
 }
 
 class HDFSSource::DisclosedGlobIterator::Impl
@@ -533,7 +606,7 @@ StorageHDFS::PathWithInfo HDFSSource::URISIterator::next()
 HDFSSource::HDFSSource(
     const ReadFromFormatInfo & info,
     StorageHDFSPtr storage_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     UInt64 max_block_size_,
     std::shared_ptr<IteratorWrapper> file_iterator_,
     bool need_only_count_)
@@ -551,6 +624,8 @@ HDFSSource::HDFSSource(
     initialize();
 }
 
+HDFSSource::~HDFSSource() = default;
+
 bool HDFSSource::initialize()
 {
     bool skip_empty_files = getContext()->getSettingsRef().hdfs_skip_empty_files;
@@ -687,7 +762,7 @@ Chunk HDFSSource::generate()
     return {};
 }
 
-void HDFSSource::addNumRowsToCache(const DB::String & path, size_t num_rows)
+void HDFSSource::addNumRowsToCache(const String & path, size_t num_rows)
 {
     auto cache_key = getKeyForSchemaCache(path, storage->format_name, std::nullopt, getContext());
     StorageHDFS::getSchemaCache(getContext()).addNumRows(cache_key, num_rows);
@@ -712,7 +787,7 @@ public:
     HDFSSink(const String & uri,
         const String & format,
         const Block & sample_block,
-        ContextPtr context,
+        const ContextPtr & context,
         const CompressionMethod compression_method)
         : SinkToStorage(sample_block)
     {
@@ -841,21 +916,28 @@ class ReadFromHDFS : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromHDFS"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromHDFS(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         ReadFromFormatInfo info_,
         bool need_only_count_,
         std::shared_ptr<StorageHDFS> storage_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
         , info(std::move(info_))
         , need_only_count(need_only_count_)
         , storage(std::move(storage_))
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
     {
@@ -866,7 +948,6 @@ private:
     const bool need_only_count;
     std::shared_ptr<StorageHDFS> storage;
 
-    ContextPtr context;
     size_t max_block_size;
     size_t num_streams;
 
@@ -875,9 +956,9 @@ private:
     void createIterator(const ActionsDAG::Node * predicate);
 };
 
-void ReadFromHDFS::applyFilters()
+void ReadFromHDFS::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -895,18 +976,21 @@ void StorageHDFS::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(context_), virtual_columns);
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(context_));
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && context_->getSettingsRef().optimize_count_from_files;
 
     auto this_ptr = std::static_pointer_cast<StorageHDFS>(shared_from_this());
 
     auto reading = std::make_unique<ReadFromHDFS>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        context_,
         read_from_format_info.source_header,
         std::move(read_from_format_info),
         need_only_count,
         std::move(this_ptr),
-        context_,
         max_block_size,
         num_streams);
 
@@ -928,7 +1012,7 @@ void ReadFromHDFS::createIterator(const ActionsDAG::Node * predicate)
     else if (storage->is_path_with_globs)
     {
         /// Iterate through disclosed globs and make a source for each file
-        auto glob_iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(storage->uris[0], predicate, storage->virtual_columns, context);
+        auto glob_iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(storage->uris[0], predicate, storage->getVirtualsList(), context);
         iterator_wrapper = std::make_shared<HDFSSource::IteratorWrapper>([glob_iterator]()
         {
             return glob_iterator->next();
@@ -936,7 +1020,7 @@ void ReadFromHDFS::createIterator(const ActionsDAG::Node * predicate)
     }
     else
     {
-        auto uris_iterator = std::make_shared<HDFSSource::URISIterator>(storage->uris, predicate, storage->virtual_columns, context);
+        auto uris_iterator = std::make_shared<HDFSSource::URISIterator>(storage->uris, predicate, storage->getVirtualsList(), context);
         iterator_wrapper = std::make_shared<HDFSSource::IteratorWrapper>([uris_iterator]()
         {
             return uris_iterator->next();
@@ -1073,7 +1157,7 @@ void registerStorageHDFS(StorageFactory & factory)
         }
 
         if (format_name == "auto")
-            format_name = FormatFactory::instance().getFormatFromFileName(url, true);
+            format_name = FormatFactory::instance().tryGetFormatFromFileName(url).value_or("auto");
 
         String compression_method;
         if (engine_args.size() == 3)
@@ -1096,16 +1180,6 @@ void registerStorageHDFS(StorageFactory & factory)
     });
 }
 
-NamesAndTypesList StorageHDFS::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-Names StorageHDFS::getVirtualColumnNames()
-{
-    return VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage({}).getNames();
-}
-
 SchemaCache & StorageHDFS::getSchemaCache(const ContextPtr & ctx)
 {
     static SchemaCache schema_cache(ctx->getConfigRef().getUInt("schema_inference_cache_max_elements_for_hdfs", DEFAULT_SCHEMA_CACHE_ELEMENTS));
diff --git a/src/Storages/HDFS/StorageHDFS.h b/src/Storages/HDFS/StorageHDFS.h
index f1f0019d3e0..b8faa27d678 100644
--- a/src/Storages/HDFS/StorageHDFS.h
+++ b/src/Storages/HDFS/StorageHDFS.h
@@ -44,7 +44,7 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const String & compression_method_ = "",
         bool distributed_processing_ = false,
         ASTPtr partition_by = nullptr);
@@ -69,9 +69,6 @@ public:
         ContextPtr local_context,
         TableExclusiveLockHolder &) override;
 
-    NamesAndTypesList getVirtuals() const override;
-    static Names getVirtualColumnNames();
-
     bool supportsPartitionBy() const override { return true; }
 
     /// Check if the format is column-oriented.
@@ -86,26 +83,36 @@ public:
         const String & format,
         const String & uri,
         const String & compression_method,
-        ContextPtr ctx);
+        const ContextPtr & ctx);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromData(
+        const String & uri,
+        const String & compression_method,
+        const ContextPtr & ctx);
 
     static SchemaCache & getSchemaCache(const ContextPtr & ctx);
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 protected:
     friend class HDFSSource;
     friend class ReadFromHDFS;
 
 private:
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromDataImpl(
+        std::optional<String> format,
+        const String & uri,
+        const String & compression_method,
+        const ContextPtr & ctx);
+
     std::vector<String> uris;
     String format_name;
     String compression_method;
     const bool distributed_processing;
     ASTPtr partition_by;
     bool is_path_with_globs;
-    NamesAndTypesList virtual_columns;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageHDFS");
+    LoggerPtr log = getLogger("StorageHDFS");
 };
 
 class PullingPipelineExecutor;
@@ -141,11 +148,13 @@ public:
     HDFSSource(
         const ReadFromFormatInfo & info,
         StorageHDFSPtr storage_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         UInt64 max_block_size_,
         std::shared_ptr<IteratorWrapper> file_iterator_,
         bool need_only_count_);
 
+    ~HDFSSource() override;
+
     String getName() const override;
 
     Chunk generate() override;
diff --git a/src/Storages/HDFS/StorageHDFSCluster.cpp b/src/Storages/HDFS/StorageHDFSCluster.cpp
index 2e8129b9845..bde8b84e349 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.cpp
+++ b/src/Storages/HDFS/StorageHDFSCluster.cpp
@@ -43,12 +43,10 @@ StorageHDFSCluster::StorageHDFSCluster(
     const String & format_name_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    const String & compression_method_,
-    bool structure_argument_was_provided_)
-    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageHDFSCluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
+    const String & compression_method)
+    : IStorageCluster(cluster_name_, table_id_, getLogger("StorageHDFSCluster (" + table_id_.table_name + ")"))
     , uri(uri_)
     , format_name(format_name_)
-    , compression_method(compression_method_)
 {
     checkHDFSURL(uri_);
     context_->getRemoteHostFilter().checkURL(Poco::URI(uri_));
@@ -57,42 +55,44 @@ StorageHDFSCluster::StorageHDFSCluster(
 
     if (columns_.empty())
     {
-        auto columns = StorageHDFS::getTableStructureFromData(format_name, uri_, compression_method, context_);
+        ColumnsDescription columns;
+        if (format_name == "auto")
+            std::tie(columns, format_name) = StorageHDFS::getTableStructureAndFormatFromData(uri_, compression_method, context_);
+        else
+            columns = StorageHDFS::getTableStructureFromData(format_name, uri_, compression_method, context_);
         storage_metadata.setColumns(columns);
     }
     else
+    {
+        if (format_name == "auto")
+            format_name = StorageHDFS::getTableStructureAndFormatFromData(uri_, compression_method, context_).second;
+
         storage_metadata.setColumns(columns_);
+    }
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
-void StorageHDFSCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+void StorageHDFSCluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const DB::StorageSnapshotPtr & storage_snapshot, const DB::ContextPtr & context)
 {
     ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
     if (!expression_list)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function hdfsCluster, got '{}'", queryToString(query));
 
-    TableFunctionHDFSCluster::addColumnsStructureToArguments(expression_list->children, structure, context);
+    TableFunctionHDFSCluster::updateStructureAndFormatArgumentsIfNeeded(
+        expression_list->children, storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(), format_name, context);
 }
 
 
 RemoteQueryExecutor::Extension StorageHDFSCluster::getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const
 {
-    auto iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(uri, predicate, virtual_columns, context);
+    auto iterator = std::make_shared<HDFSSource::DisclosedGlobIterator>(uri, predicate, getVirtualsList(), context);
     auto callback = std::make_shared<std::function<String()>>([iter = std::move(iterator)]() mutable -> String { return iter->next().path; });
     return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
 }
 
-NamesAndTypesList StorageHDFSCluster::getVirtuals() const
-{
-    return NamesAndTypesList{
-        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_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 7c4c41a573a..0b5c6242aa9 100644
--- a/src/Storages/HDFS/StorageHDFSCluster.h
+++ b/src/Storages/HDFS/StorageHDFSCluster.h
@@ -28,26 +28,21 @@ public:
         const String & format_name_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const String & compression_method_,
-        bool structure_argument_was_provided_);
+        const String & compression_method);
 
     std::string getName() const override { return "HDFSCluster"; }
 
-    NamesAndTypesList getVirtuals() const override;
-
     RemoteQueryExecutor::Extension getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
     bool supportsSubcolumns() const override { return true; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
-    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+    void updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context) override;
 
     String uri;
     String format_name;
-    String compression_method;
-    NamesAndTypesList virtual_columns;
 };
 
 
diff --git a/src/Storages/HDFS/WriteBufferFromHDFS.cpp b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
index 6360bb2a3d5..173dd899ada 100644
--- a/src/Storages/HDFS/WriteBufferFromHDFS.cpp
+++ b/src/Storages/HDFS/WriteBufferFromHDFS.cpp
@@ -4,7 +4,7 @@
 
 #include <Storages/HDFS/WriteBufferFromHDFS.h>
 #include <Storages/HDFS/HDFSCommon.h>
-#include <IO/ResourceGuard.h>
+#include <Common/Scheduler/ResourceGuard.h>
 #include <Common/Throttler.h>
 #include <Common/safe_cast.h>
 #include <hdfs/hdfs.h>
diff --git a/src/Storages/Hive/HiveCommon.cpp b/src/Storages/Hive/HiveCommon.cpp
index 609adcf65c9..b58302f262e 100644
--- a/src/Storages/Hive/HiveCommon.cpp
+++ b/src/Storages/Hive/HiveCommon.cpp
@@ -25,7 +25,7 @@ static const int hive_metastore_client_recv_timeout_ms = 10000;
 static const int hive_metastore_client_send_timeout_ms = 10000;
 
 ThriftHiveMetastoreClientPool::ThriftHiveMetastoreClientPool(ThriftHiveMetastoreClientBuilder builder_)
-    : PoolBase<Object>(max_hive_metastore_client_connections, &Poco::Logger::get("ThriftHiveMetastoreClientPool")), builder(builder_)
+    : PoolBase<Object>(max_hive_metastore_client_connections, getLogger("ThriftHiveMetastoreClientPool")), builder(builder_)
 {
 }
 
diff --git a/src/Storages/Hive/HiveCommon.h b/src/Storages/Hive/HiveCommon.h
index e2c19fb1684..0f9d3364ffd 100644
--- a/src/Storages/Hive/HiveCommon.h
+++ b/src/Storages/Hive/HiveCommon.h
@@ -115,7 +115,7 @@ public:
         const bool empty_partition_keys;
         const HiveFilesCachePtr hive_files_cache;
 
-        Poco::Logger * log = &Poco::Logger::get("HiveMetastoreClient");
+        LoggerPtr log = getLogger("HiveMetastoreClient");
     };
 
 
@@ -138,7 +138,7 @@ private:
     CacheBase<String, HiveTableMetadata> table_metadata_cache;
     ThriftHiveMetastoreClientPool client_pool;
 
-    Poco::Logger * log = &Poco::Logger::get("HiveMetastoreClient");
+    LoggerPtr log = getLogger("HiveMetastoreClient");
 };
 
 using HiveMetastoreClientPtr = std::shared_ptr<HiveMetastoreClient>;
diff --git a/src/Storages/Hive/HiveFile.h b/src/Storages/Hive/HiveFile.h
index 1f5e31f1d54..601c7f2a310 100644
--- a/src/Storages/Hive/HiveFile.h
+++ b/src/Storages/Hive/HiveFile.h
@@ -65,7 +65,7 @@ public:
         {ORC_INPUT_FORMAT, FileFormat::ORC},
     };
 
-    static inline bool isFormatClass(const String & format_class) { return VALID_HDFS_FORMATS.count(format_class) > 0; }
+    static inline bool isFormatClass(const String & format_class) { return VALID_HDFS_FORMATS.contains(format_class); }
     static inline FileFormat toFileFormat(const String & format_class)
     {
         if (isFormatClass(format_class))
diff --git a/src/Storages/Hive/StorageHive.cpp b/src/Storages/Hive/StorageHive.cpp
index 0c4e4f956a0..88ab8e15e76 100644
--- a/src/Storages/Hive/StorageHive.cpp
+++ b/src/Storages/Hive/StorageHive.cpp
@@ -45,6 +45,7 @@
 #include <Storages/MergeTree/KeyCondition.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/checkAndGetLiteralArgument.h>
+#include <Storages/VirtualColumnUtils.h>
 
 namespace CurrentMetrics
 {
@@ -228,21 +229,27 @@ public:
                 {
                     auto get_raw_read_buf = [&]() -> std::unique_ptr<ReadBuffer>
                     {
-                        auto buf = std::make_unique<ReadBufferFromHDFS>(
-                            hdfs_namenode_url,
-                            current_path,
-                            getContext()->getGlobalContext()->getConfigRef(),
-                            getContext()->getReadSettings());
-
                         bool thread_pool_read = read_settings.remote_fs_method == RemoteFSReadMethod::threadpool;
                         if (thread_pool_read)
                         {
+                            auto buf = std::make_unique<ReadBufferFromHDFS>(
+                                hdfs_namenode_url,
+                                current_path,
+                                getContext()->getGlobalContext()->getConfigRef(),
+                                getContext()->getReadSettings(),
+                                /* read_until_position */0,
+                                /* use_external_buffer */true);
+
                             return std::make_unique<AsynchronousReadBufferFromHDFS>(
                                 getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER), read_settings, std::move(buf));
                         }
                         else
                         {
-                            return buf;
+                            return std::make_unique<ReadBufferFromHDFS>(
+                                hdfs_namenode_url,
+                                current_path,
+                                getContext()->getGlobalContext()->getConfigRef(),
+                                getContext()->getReadSettings());
                         }
                     };
 
@@ -405,7 +412,7 @@ private:
     bool generate_chunk_from_metadata{false};
     UInt64 current_file_remained_rows = 0;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageHive");
+    LoggerPtr log = getLogger("StorageHive");
 };
 
 
@@ -438,6 +445,7 @@ StorageHive::StorageHive(
     storage_metadata.partition_key = KeyDescription::getKeyFromAST(partition_by_ast, storage_metadata.columns, getContext());
 
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 void StorageHive::lazyInitialize()
@@ -764,9 +772,12 @@ class ReadFromHive : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromHive"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
 
     ReadFromHive(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block header,
         std::shared_ptr<StorageHive> storage_,
         std::shared_ptr<StorageHiveSource::SourcesInfo> sources_info_,
@@ -774,11 +785,15 @@ public:
         HDFSFSPtr fs_,
         HiveMetastoreClient::HiveTableMetadataPtr hive_table_metadata_,
         Block sample_block_,
-        Poco::Logger * log_,
-        ContextPtr context_,
+        LoggerPtr log_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(header)})
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(header)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
         , storage(std::move(storage_))
         , sources_info(std::move(sources_info_))
         , builder(std::move(builder_))
@@ -786,7 +801,6 @@ public:
         , hive_table_metadata(std::move(hive_table_metadata_))
         , sample_block(std::move(sample_block_))
         , log(log_)
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
     {
@@ -799,24 +813,17 @@ private:
     HDFSFSPtr fs;
     HiveMetastoreClient::HiveTableMetadataPtr hive_table_metadata;
     Block sample_block;
-    Poco::Logger * log;
+    LoggerPtr log;
 
-    ContextPtr context;
     size_t max_block_size;
     size_t num_streams;
 
     std::optional<HiveFiles> hive_files;
 
-    void createFiles(const ActionsDAGPtr & filter_actions_dag);
+    void createFiles();
 };
 
-void ReadFromHive::applyFilters()
-{
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
-    createFiles(filter_actions_dag);
-}
-
-void ReadFromHive::createFiles(const ActionsDAGPtr & filter_actions_dag)
+void ReadFromHive::createFiles()
 {
     if (hive_files)
         return;
@@ -829,7 +836,7 @@ void StorageHive::read(
     QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo &,
+    SelectQueryInfo & query_info,
     ContextPtr context_,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t max_block_size,
@@ -885,6 +892,10 @@ void StorageHive::read(
     auto this_ptr = std::static_pointer_cast<StorageHive>(shared_from_this());
 
     auto reading = std::make_unique<ReadFromHive>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        context_,
         StorageHiveSource::getHeader(sample_block, sources_info),
         std::move(this_ptr),
         std::move(sources_info),
@@ -893,7 +904,6 @@ void StorageHive::read(
         std::move(hive_table_metadata),
         std::move(sample_block),
         log,
-        context_,
         max_block_size,
         num_streams);
 
@@ -902,7 +912,7 @@ void StorageHive::read(
 
 void ReadFromHive::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
-    createFiles(nullptr);
+    createFiles();
 
     if (hive_files->empty())
     {
@@ -1012,13 +1022,6 @@ SinkToStoragePtr StorageHive::write(const ASTPtr & /*query*/, const StorageMetad
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method write is not implemented for StorageHive");
 }
 
-NamesAndTypesList StorageHive::getVirtuals() const
-{
-    return NamesAndTypesList{
-        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
-}
-
 std::optional<UInt64> StorageHive::totalRows(const Settings & settings) const
 {
     /// query_info is not used when prune_level == PruneLevel::None
diff --git a/src/Storages/Hive/StorageHive.h b/src/Storages/Hive/StorageHive.h
index b0ec96604cc..67ef153af0e 100644
--- a/src/Storages/Hive/StorageHive.h
+++ b/src/Storages/Hive/StorageHive.h
@@ -54,8 +54,6 @@ public:
 
     SinkToStoragePtr write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr /*context*/, bool async_insert) override;
 
-    NamesAndTypesList getVirtuals() const override;
-
     bool supportsSubsetOfColumns() const;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
@@ -149,7 +147,7 @@ private:
 
     std::shared_ptr<HiveSettings> storage_settings;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageHive");
+    LoggerPtr log = getLogger("StorageHive");
 };
 
 }
diff --git a/src/Storages/IMessageProducer.cpp b/src/Storages/IMessageProducer.cpp
index cf314696041..20c47f6f0b4 100644
--- a/src/Storages/IMessageProducer.cpp
+++ b/src/Storages/IMessageProducer.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-IMessageProducer::IMessageProducer(Poco::Logger * log_) : log(log_)
+IMessageProducer::IMessageProducer(LoggerPtr log_) : log(log_)
 {
 }
 
@@ -12,7 +12,16 @@ void AsynchronousMessageProducer::start(const ContextPtr & context)
 {
     LOG_TEST(log, "Executing startup");
 
-    initialize();
+    try
+    {
+        initialize();
+    }
+    catch (...)
+    {
+        finished = true;
+        throw;
+    }
+
     producing_task = context->getSchedulePool().createTask(getProducingTaskName(), [this]
     {
         LOG_TEST(log, "Starting producing task loop");
diff --git a/src/Storages/IMessageProducer.h b/src/Storages/IMessageProducer.h
index 12580d5f94a..c769c325191 100644
--- a/src/Storages/IMessageProducer.h
+++ b/src/Storages/IMessageProducer.h
@@ -16,7 +16,7 @@ namespace DB
 class IMessageProducer
 {
 public:
-    explicit IMessageProducer(Poco::Logger * log_);
+    explicit IMessageProducer(LoggerPtr log_);
 
     /// Do some preparations.
     virtual void start(const ContextPtr & context) = 0;
@@ -30,14 +30,14 @@ public:
     virtual ~IMessageProducer() = default;
 
 protected:
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 /// Implements interface for concurrent message producing.
 class AsynchronousMessageProducer : public IMessageProducer
 {
 public:
-    explicit AsynchronousMessageProducer(Poco::Logger * log_) : IMessageProducer(log_) {}
+    explicit AsynchronousMessageProducer(LoggerPtr log_) : IMessageProducer(log_) {}
 
     /// Create and schedule task in BackgroundSchedulePool that will produce messages.
     void start(const ContextPtr & context) override;
diff --git a/src/Storages/IStorage.cpp b/src/Storages/IStorage.cpp
index 85ef6a0bb35..b532abc9074 100644
--- a/src/Storages/IStorage.cpp
+++ b/src/Storages/IStorage.cpp
@@ -27,10 +27,17 @@ namespace ErrorCodes
     extern const int CANNOT_RESTORE_TABLE;
 }
 
+IStorage::IStorage(StorageID storage_id_)
+    : storage_id(std::move(storage_id_))
+    , metadata(std::make_unique<StorageInMemoryMetadata>())
+    , virtuals(std::make_unique<VirtualColumnsDescription>())
+{
+}
+
 bool IStorage::isVirtualColumn(const String & column_name, const StorageMetadataPtr & metadata_snapshot) const
 {
     /// Virtual column maybe overridden by real column
-    return !metadata_snapshot->getColumns().has(column_name) && getVirtuals().contains(column_name);
+    return !metadata_snapshot->getColumns().has(column_name) && virtuals.get()->has(column_name);
 }
 
 RWLockImpl::LockHolder IStorage::tryLockTimed(
@@ -237,11 +244,6 @@ void IStorage::renameInMemory(const StorageID & new_table_id)
     storage_id = new_table_id;
 }
 
-NamesAndTypesList IStorage::getVirtuals() const
-{
-    return {};
-}
-
 Names IStorage::getAllRegisteredNames() const
 {
     Names result;
@@ -303,7 +305,7 @@ void IStorage::backupData(BackupEntriesCollector &, const String &, const std::o
 void IStorage::restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> &)
 {
     /// If an inherited class doesn't override restoreDataFromBackup() that means it doesn't backup any data.
-    auto filenames = restorer.getBackup()->listFiles(data_path_in_backup);
+    auto filenames = restorer.getBackup()->listFiles(data_path_in_backup, /*recursive*/ false);
     if (!filenames.empty())
         throw Exception(ErrorCodes::CANNOT_RESTORE_TABLE, "Cannot restore table {}: Folder {} in backup must be empty",
                         getStorageID().getFullTableName(), data_path_in_backup);
diff --git a/src/Storages/IStorage.h b/src/Storages/IStorage.h
index 4fa6bfdd617..87a04c3fcc6 100644
--- a/src/Storages/IStorage.h
+++ b/src/Storages/IStorage.h
@@ -11,6 +11,7 @@
 #include <Storages/IStorage_fwd.h>
 #include <Storages/SelectQueryDescription.h>
 #include <Storages/StorageInMemoryMetadata.h>
+#include <Storages/VirtualColumnsDescription.h>
 #include <Storages/TableLockHolder.h>
 #include <Storages/StorageSnapshot.h>
 #include <Common/ActionLock.h>
@@ -98,9 +99,7 @@ class IStorage : public std::enable_shared_from_this<IStorage>, public TypePromo
 public:
     IStorage() = delete;
     /// Storage metadata can be set separately in setInMemoryMetadata method
-    explicit IStorage(StorageID storage_id_)
-        : storage_id(std::move(storage_id_))
-        , metadata(std::make_unique<StorageInMemoryMetadata>()) {}
+    explicit IStorage(StorageID storage_id_);
 
     IStorage(const IStorage &) = delete;
     IStorage & operator=(const IStorage &) = delete;
@@ -215,6 +214,10 @@ public:
         metadata.set(std::make_unique<StorageInMemoryMetadata>(metadata_));
     }
 
+    void setVirtuals(VirtualColumnsDescription virtuals_)
+    {
+        virtuals.set(std::make_unique<VirtualColumnsDescription>(std::move(virtuals_)));
+    }
 
     /// Return list of virtual columns (like _part, _table, etc). In the vast
     /// majority of cases virtual columns are static constant part of Storage
@@ -226,7 +229,9 @@ public:
     /// virtual column will be overridden and inaccessible.
     ///
     /// By default return empty list of columns.
-    virtual NamesAndTypesList getVirtuals() const;
+    VirtualsDescriptionPtr getVirtualsPtr() const { return virtuals.get(); }
+    NamesAndTypesList getVirtualsList() const { return virtuals.get()->getNamesAndTypesList(); }
+    Block getVirtualsHeader() const { return virtuals.get()->getSampleBlock(); }
 
     Names getAllRegisteredNames() const override;
 
@@ -260,18 +265,22 @@ public:
 
     /// Return true if the trivial count query could be optimized without reading the data at all
     /// in totalRows() or totalRowsByPartitionPredicate() methods or with optimized reading in read() method.
-    virtual bool supportsTrivialCountOptimization() const { return false; }
+    virtual bool supportsTrivialCountOptimization(const StorageSnapshotPtr & /*storage_snapshot*/, ContextPtr /*query_context*/) const
+    {
+        return false;
+    }
 
 private:
-
     StorageID storage_id;
 
     mutable std::mutex id_mutex;
 
-    /// Multiversion storage metadata. Allows to read/write storage metadata
-    /// without locks.
+    /// Multiversion storage metadata. Allows to read/write storage metadata without locks.
     MultiVersionStorageMetadataPtr metadata;
 
+    /// Description of virtual columns. Optional, may be set in constructor.
+    MultiVersionVirtualsDescriptionPtr virtuals;
+
 protected:
     RWLockImpl::LockHolder tryLockTimed(
         const RWLock & rwlock, RWLockImpl::Type type, const String & query_id, const std::chrono::milliseconds & acquire_timeout) const;
diff --git a/src/Storages/IStorageCluster.cpp b/src/Storages/IStorageCluster.cpp
index 6f42d8f855c..ab45ce877c2 100644
--- a/src/Storages/IStorageCluster.cpp
+++ b/src/Storages/IStorageCluster.cpp
@@ -32,12 +32,10 @@ namespace DB
 IStorageCluster::IStorageCluster(
     const String & cluster_name_,
     const StorageID & table_id_,
-    Poco::Logger * log_,
-    bool structure_argument_was_provided_)
+    LoggerPtr log_)
     : IStorage(table_id_)
     , log(log_)
     , cluster_name(cluster_name_)
-    , structure_argument_was_provided(structure_argument_was_provided_)
 {
 }
 
@@ -46,23 +44,30 @@ class ReadFromCluster : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromCluster"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromCluster(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         std::shared_ptr<IStorageCluster> storage_,
         ASTPtr query_to_send_,
         QueryProcessingStage::Enum processed_stage_,
         ClusterPtr cluster_,
-        Poco::Logger * log_,
-        ContextPtr context_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        LoggerPtr log_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
         , storage(std::move(storage_))
         , query_to_send(std::move(query_to_send_))
         , processed_stage(processed_stage_)
         , cluster(std::move(cluster_))
         , log(log_)
-        , context(std::move(context_))
     {
     }
 
@@ -71,8 +76,7 @@ private:
     ASTPtr query_to_send;
     QueryProcessingStage::Enum processed_stage;
     ClusterPtr cluster;
-    Poco::Logger * log;
-    ContextPtr context;
+    LoggerPtr log;
 
     std::optional<RemoteQueryExecutor::Extension> extension;
 
@@ -80,9 +84,9 @@ private:
     ContextPtr updateSettings(const Settings & settings);
 };
 
-void ReadFromCluster::applyFilters()
+void ReadFromCluster::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -130,8 +134,7 @@ void IStorageCluster::read(
         query_to_send = interpreter.getQueryInfo().query->clone();
     }
 
-    if (!structure_argument_was_provided)
-        addColumnsStructureToQuery(query_to_send, storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(), context);
+    updateQueryToSendIfNeeded(query_to_send, storage_snapshot, context);
 
     RestoreQualifiedNamesVisitor::Data data;
     data.distributed_table = DatabaseAndTableWithAlias(*getTableExpression(query_info.query->as<ASTSelectQuery &>(), 0));
@@ -146,13 +149,16 @@ void IStorageCluster::read(
     auto this_ptr = std::static_pointer_cast<IStorageCluster>(shared_from_this());
 
     auto reading = std::make_unique<ReadFromCluster>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        context,
         sample_block,
         std::move(this_ptr),
         std::move(query_to_send),
         processed_stage,
         cluster,
-        log,
-        context);
+        log);
 
     query_plan.addStep(std::move(reading));
 }
@@ -185,7 +191,11 @@ void ReadFromCluster::initializePipeline(QueryPipelineBuilder & pipeline, const
                 extension);
 
             remote_query_executor->setLogger(log);
-            pipes.emplace_back(std::make_shared<RemoteSource>(remote_query_executor, add_agg_info, false, false));
+            pipes.emplace_back(std::make_shared<RemoteSource>(
+                remote_query_executor,
+                add_agg_info,
+                current_settings.async_socket_for_remote,
+                current_settings.async_query_sending_for_remote));
         }
     }
 
diff --git a/src/Storages/IStorageCluster.h b/src/Storages/IStorageCluster.h
index b233f20103d..f3283247672 100644
--- a/src/Storages/IStorageCluster.h
+++ b/src/Storages/IStorageCluster.h
@@ -19,8 +19,7 @@ public:
     IStorageCluster(
         const String & cluster_name_,
         const StorageID & table_id_,
-        Poco::Logger * log_,
-        bool structure_argument_was_provided_);
+        LoggerPtr log_);
 
     void read(
         QueryPlan & query_plan,
@@ -42,13 +41,11 @@ public:
 
 protected:
     virtual void updateBeforeRead(const ContextPtr &) {}
-
-    virtual void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) = 0;
+    virtual void updateQueryToSendIfNeeded(ASTPtr & /*query*/, const StorageSnapshotPtr & /*storage_snapshot*/, const ContextPtr & /*context*/) {}
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
     String cluster_name;
-    bool structure_argument_was_provided;
 };
 
 
diff --git a/src/Storages/IndicesDescription.cpp b/src/Storages/IndicesDescription.cpp
index c723fa4225c..cef8fd85f97 100644
--- a/src/Storages/IndicesDescription.cpp
+++ b/src/Storages/IndicesDescription.cpp
@@ -85,22 +85,23 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
     if (index_definition->name.empty())
         throw Exception(ErrorCodes::INCORRECT_QUERY, "Skip index must have name in definition.");
 
-    if (!index_definition->type)
+    auto index_type = index_definition->getType();
+    if (!index_type)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "TYPE is required for index");
 
-    if (index_definition->type->parameters && !index_definition->type->parameters->children.empty())
+    if (index_type->parameters && !index_type->parameters->children.empty())
         throw Exception(ErrorCodes::INCORRECT_QUERY, "Index type cannot have parameters");
 
     IndexDescription result;
     result.definition_ast = index_definition->clone();
     result.name = index_definition->name;
-    result.type = Poco::toLower(index_definition->type->name);
+    result.type = Poco::toLower(index_type->name);
     result.granularity = index_definition->granularity;
 
     ASTPtr expr_list;
-    if (index_definition->expr)
+    if (auto index_expression = index_definition->getExpression())
     {
-        expr_list = extractKeyExpressionList(index_definition->expr->clone());
+        expr_list = extractKeyExpressionList(index_expression);
 
         ReplaceAliasToExprVisitor::Data data{columns};
         ReplaceAliasToExprVisitor{data}.visit(expr_list);
@@ -125,12 +126,11 @@ IndexDescription IndexDescription::getIndexFromAST(const ASTPtr & definition_ast
         result.data_types.push_back(elem.type);
     }
 
-    const auto & definition_arguments = index_definition->type->arguments;
-    if (definition_arguments)
+    if (index_type && index_type->arguments)
     {
-        for (size_t i = 0; i < definition_arguments->children.size(); ++i)
+        for (size_t i = 0; i < index_type->arguments->children.size(); ++i)
         {
-            const auto * argument = definition_arguments->children[i]->as<ASTLiteral>();
+            const auto * argument = index_type->arguments->children[i]->as<ASTLiteral>();
             if (!argument)
                 throw Exception(ErrorCodes::INCORRECT_QUERY, "Only literals can be skip index arguments");
             result.arguments.emplace_back(argument->value);
@@ -173,7 +173,7 @@ IndicesDescription IndicesDescription::parse(const String & str, const ColumnsDe
         return result;
 
     ParserIndexDeclarationList parser;
-    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     for (const auto & index : list->children)
         result.emplace_back(IndexDescription::getIndexFromAST(index, columns, context));
diff --git a/src/Storages/IndicesDescription.h b/src/Storages/IndicesDescription.h
index e56642b8c76..21ba5fb632e 100644
--- a/src/Storages/IndicesDescription.h
+++ b/src/Storages/IndicesDescription.h
@@ -2,7 +2,6 @@
 
 #include <base/types.h>
 
-#include <memory>
 #include <vector>
 #include <Core/Field.h>
 #include <Interpreters/ExpressionActions.h>
diff --git a/src/Storages/KVStorageUtils.cpp b/src/Storages/KVStorageUtils.cpp
index 3031fc6bf9d..94319aef3b8 100644
--- a/src/Storages/KVStorageUtils.cpp
+++ b/src/Storages/KVStorageUtils.cpp
@@ -231,12 +231,11 @@ bool traverseDAGFilter(
 }
 
 std::pair<FieldVectorPtr, bool> getFilterKeys(
-    const String & primary_key, const DataTypePtr & primary_key_type, const ActionDAGNodes & filter_nodes, const ContextPtr & context)
+    const String & primary_key, const DataTypePtr & primary_key_type, const ActionsDAGPtr & filter_actions_dag, const ContextPtr & context)
 {
-    if (filter_nodes.nodes.empty())
+    if (!filter_actions_dag)
         return {{}, true};
 
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
     const auto * predicate = filter_actions_dag->getOutputs().at(0);
 
     FieldVectorPtr res = std::make_shared<FieldVector>();
diff --git a/src/Storages/KVStorageUtils.h b/src/Storages/KVStorageUtils.h
index c6d63b800df..e20a1ce4f37 100644
--- a/src/Storages/KVStorageUtils.h
+++ b/src/Storages/KVStorageUtils.h
@@ -22,7 +22,7 @@ std::pair<FieldVectorPtr, bool> getFilterKeys(
     const std::string & primary_key, const DataTypePtr & primary_key_type, const SelectQueryInfo & query_info, const ContextPtr & context);
 
 std::pair<FieldVectorPtr, bool> getFilterKeys(
-    const String & primary_key, const DataTypePtr & primary_key_type, const ActionDAGNodes & filter_nodes, const ContextPtr & context);
+    const String & primary_key, const DataTypePtr & primary_key_type, const ActionsDAGPtr & filter_actions_dag, const ContextPtr & context);
 
 template <typename K, typename V>
 void fillColumns(const K & key, const V & value, size_t key_pos, const Block & header, MutableColumns & columns)
diff --git a/src/Storages/Kafka/KafkaConsumer.cpp b/src/Storages/Kafka/KafkaConsumer.cpp
index 40f2897322d..7075dcb71ca 100644
--- a/src/Storages/Kafka/KafkaConsumer.cpp
+++ b/src/Storages/Kafka/KafkaConsumer.cpp
@@ -47,7 +47,7 @@ const auto DRAIN_TIMEOUT_MS = 5000ms;
 
 
 KafkaConsumer::KafkaConsumer(
-    Poco::Logger * log_,
+    LoggerPtr log_,
     size_t max_batch_size,
     size_t poll_timeout_,
     bool intermediate_commit_,
@@ -599,24 +599,14 @@ void KafkaConsumer::setExceptionInfo(const std::string & text, bool with_stacktr
     exceptions_buffer.push_back({enriched_text, static_cast<UInt64>(Poco::Timestamp().epochTime())});
 }
 
-/*
- * Needed until
- * https://github.com/mfontanini/cppkafka/pull/309
- * is merged,
- * because consumer->get_member_id() contains a leak
- */
 std::string KafkaConsumer::getMemberId() const
 {
     if (!consumer)
         return "";
 
-    char * memberid_ptr = rd_kafka_memberid(consumer->get_handle());
-    std::string memberid_string = memberid_ptr;
-    rd_kafka_mem_free(nullptr, memberid_ptr);
-    return memberid_string;
+    return consumer->get_member_id();
 }
 
-
 KafkaConsumer::Stat KafkaConsumer::getStat() const
 {
     KafkaConsumer::Stat::Assignments assignments;
diff --git a/src/Storages/Kafka/KafkaConsumer.h b/src/Storages/Kafka/KafkaConsumer.h
index c4dfc56312f..f160d1c0855 100644
--- a/src/Storages/Kafka/KafkaConsumer.h
+++ b/src/Storages/Kafka/KafkaConsumer.h
@@ -62,7 +62,7 @@ public:
     };
 
     KafkaConsumer(
-        Poco::Logger * log_,
+        LoggerPtr log_,
         size_t max_batch_size,
         size_t poll_timeout_,
         bool intermediate_commit_,
@@ -150,7 +150,7 @@ private:
     std::string rdkafka_stat;
 
     ConsumerPtr consumer;
-    Poco::Logger * log;
+    LoggerPtr log;
     const size_t batch_size = 1;
     const size_t poll_timeout = 0;
     size_t offsets_stored = 0;
@@ -184,7 +184,7 @@ private:
     std::atomic<UInt64> last_rebalance_timestamp_usec = 0;
     std::atomic<UInt64> num_rebalance_assignments = 0;
     std::atomic<UInt64> num_rebalance_revocations = 0;
-    std::atomic<bool> in_use = 0;
+    std::atomic<bool> in_use = false;
     /// Last used time (for TTL)
     std::atomic<UInt64> last_used_usec = 0;
 
diff --git a/src/Storages/Kafka/KafkaProducer.cpp b/src/Storages/Kafka/KafkaProducer.cpp
index edbfc76ef93..77676fb010b 100644
--- a/src/Storages/Kafka/KafkaProducer.cpp
+++ b/src/Storages/Kafka/KafkaProducer.cpp
@@ -18,7 +18,7 @@ namespace DB
 
 KafkaProducer::KafkaProducer(
     ProducerPtr producer_, const std::string & topic_, std::chrono::milliseconds poll_timeout, std::atomic<bool> & shutdown_called_, const Block & header)
-    : IMessageProducer(&Poco::Logger::get("KafkaProducer"))
+    : IMessageProducer(getLogger("KafkaProducer"))
     , producer(producer_)
     , topic(topic_)
     , timeout(poll_timeout)
diff --git a/src/Storages/Kafka/KafkaSource.cpp b/src/Storages/Kafka/KafkaSource.cpp
index 1fbd7e2d705..9c68107872e 100644
--- a/src/Storages/Kafka/KafkaSource.cpp
+++ b/src/Storages/Kafka/KafkaSource.cpp
@@ -33,7 +33,7 @@ KafkaSource::KafkaSource(
     const StorageSnapshotPtr & storage_snapshot_,
     const ContextPtr & context_,
     const Names & columns,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     size_t max_block_size_,
     bool commit_in_suffix_)
     : ISource(storage_snapshot_->getSampleBlockForColumns(columns))
@@ -45,7 +45,7 @@ KafkaSource::KafkaSource(
     , max_block_size(max_block_size_)
     , commit_in_suffix(commit_in_suffix_)
     , non_virtual_header(storage_snapshot->metadata->getSampleBlockNonMaterialized())
-    , virtual_header(storage_snapshot->getSampleBlockForColumns(storage.getVirtualColumnNames()))
+    , virtual_header(storage.getVirtualsHeader())
     , handle_error_mode(storage.getStreamingHandleErrorMode())
 {
 }
diff --git a/src/Storages/Kafka/KafkaSource.h b/src/Storages/Kafka/KafkaSource.h
index 485a8e55b6a..a1b94b15a19 100644
--- a/src/Storages/Kafka/KafkaSource.h
+++ b/src/Storages/Kafka/KafkaSource.h
@@ -22,7 +22,7 @@ public:
         const StorageSnapshotPtr & storage_snapshot_,
         const ContextPtr & context_,
         const Names & columns,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         size_t max_block_size_,
         bool commit_in_suffix = false);
     ~KafkaSource() override;
@@ -41,7 +41,7 @@ private:
     StorageSnapshotPtr storage_snapshot;
     ContextPtr context;
     Names column_names;
-    Poco::Logger * log;
+    LoggerPtr log;
     UInt64 max_block_size;
 
     KafkaConsumerPtr consumer;
diff --git a/src/Storages/Kafka/StorageKafka.cpp b/src/Storages/Kafka/StorageKafka.cpp
index 1cb810cf8ad..a6c15149e15 100644
--- a/src/Storages/Kafka/StorageKafka.cpp
+++ b/src/Storages/Kafka/StorageKafka.cpp
@@ -8,8 +8,10 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Formats/FormatFactory.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
@@ -17,18 +19,19 @@
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
-#include <QueryPipeline/QueryPipeline.h>
+#include <Processors/QueryPlan/ISourceStep.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 #include <QueryPipeline/Pipe.h>
-#include <Storages/MessageQueueSink.h>
+#include <QueryPipeline/QueryPipeline.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Storages/Kafka/KafkaProducer.h>
 #include <Storages/Kafka/KafkaSettings.h>
 #include <Storages/Kafka/KafkaSource.h>
+#include <Storages/MessageQueueSink.h>
+#include <Storages/NamedCollectionsHelpers.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMaterializedView.h>
-#include <Storages/NamedCollectionsHelpers.h>
 #include <base/getFQDNOrHostName.h>
-#include <Common/Stopwatch.h>
-#include <Common/logger_useful.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/trim.hpp>
@@ -37,11 +40,13 @@
 #include <Poco/Util/AbstractConfiguration.h>
 #include <Common/Exception.h>
 #include <Common/Macros.h>
+#include <Common/Stopwatch.h>
 #include <Common/formatReadable.h>
 #include <Common/getNumberOfPhysicalCPUCores.h>
+#include <Processors/QueryPlan/ReadFromStreamLikeEngine.h>
+#include <Common/logger_useful.h>
 #include <Common/quoteString.h>
 #include <Common/setThreadName.h>
-#include <Formats/FormatFactory.h>
 
 #include <Storages/ColumnDefault.h>
 #include <Common/config_version.h>
@@ -174,70 +179,150 @@ struct StorageKafkaInterceptors
     }
 };
 
+class ReadFromStorageKafka final : public ReadFromStreamLikeEngine
+{
+public:
+    ReadFromStorageKafka(
+        const Names & column_names_,
+        StoragePtr storage_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        SelectQueryInfo & query_info,
+        ContextPtr context_)
+        : ReadFromStreamLikeEngine{column_names_, storage_snapshot_, query_info.storage_limits, context_}
+        , column_names{column_names_}
+        , storage{storage_}
+        , storage_snapshot{storage_snapshot_}
+    {
+    }
+
+    String getName() const override { return "ReadFromStorageKafka"; }
+
+private:
+    Pipe makePipe() final
+    {
+        auto & kafka_storage = storage->as<StorageKafka &>();
+        if (kafka_storage.shutdown_called)
+            throw Exception(ErrorCodes::ABORTED, "Table is detached");
+
+        if (kafka_storage.mv_attached)
+            throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Cannot read from StorageKafka with attached materialized views");
+
+        ProfileEvents::increment(ProfileEvents::KafkaDirectReads);
+
+        /// Always use all consumers at once, otherwise SELECT may not read messages from all partitions.
+        Pipes pipes;
+        pipes.reserve(kafka_storage.num_consumers);
+        auto modified_context = Context::createCopy(getContext());
+        modified_context->applySettingsChanges(kafka_storage.settings_adjustments);
+
+        // Claim as many consumers as requested, but don't block
+        for (size_t i = 0; i < kafka_storage.num_consumers; ++i)
+        {
+            /// Use block size of 1, otherwise LIMIT won't work properly as it will buffer excess messages in the last block
+            /// TODO: probably that leads to awful performance.
+            /// FIXME: seems that doesn't help with extra reading and committing unprocessed messages.
+            pipes.emplace_back(std::make_shared<KafkaSource>(
+                kafka_storage,
+                storage_snapshot,
+                modified_context,
+                column_names,
+                kafka_storage.log,
+                1,
+                kafka_storage.kafka_settings->kafka_commit_on_select));
+        }
+
+        LOG_DEBUG(kafka_storage.log, "Starting reading {} streams", pipes.size());
+        return Pipe::unitePipes(std::move(pipes));
+    }
+
+    const Names column_names;
+    StoragePtr storage;
+    StorageSnapshotPtr storage_snapshot;
+};
+
 namespace
 {
     const String CONFIG_KAFKA_TAG = "kafka";
     const String CONFIG_KAFKA_TOPIC_TAG = "kafka_topic";
     const String CONFIG_NAME_TAG = "name";
 
+    void setKafkaConfigValue(cppkafka::Configuration & kafka_config, const String & key, const String & value)
+   {
+        if (key.starts_with(CONFIG_KAFKA_TOPIC_TAG) || key == CONFIG_NAME_TAG) /// multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
+                return; /// used by new per-topic configuration, ignore
+
+        /// "log_level" has valid underscore, the remaining librdkafka setting use dot.separated.format which isn't acceptable for XML.
+        /// See https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md
+        const String setting_name_in_kafka_config = (key == "log_level") ? key : boost::replace_all_copy(key, "_", ".");
+        kafka_config.set(setting_name_in_kafka_config, value);
+    }
+
     /// Read server configuration into cppkafka configuration, used by global configuration and by legacy per-topic configuration
-    void loadFromConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & config_prefix)
+    void loadFromConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String& collection_name, const String & config_prefix)
     {
+        if (!collection_name.empty())
+        {
+            const auto & collection = NamedCollectionFactory::instance().get(collection_name);
+            for (const auto & key : collection->getKeys(-1, config_prefix))
+            {
+                // Cut prefix with '.' before actual config tag.
+                const auto param_name = key.substr(config_prefix.size() + 1);
+                setKafkaConfigValue(kafka_config, param_name, collection->get<String>(key));
+            }
+            return;
+        }
+
         /// Read all tags one level below <kafka>
         Poco::Util::AbstractConfiguration::Keys tags;
         config.keys(config_prefix, tags);
 
         for (const auto & tag : tags)
         {
-            if (tag.starts_with(CONFIG_KAFKA_TOPIC_TAG)) /// multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
-                continue; /// used by new per-topic configuration, ignore
-
-            const String setting_path = config_prefix + "." + tag;
-            const String setting_value = config.getString(setting_path);
-
-            /// "log_level" has valid underscore, the remaining librdkafka setting use dot.separated.format which isn't acceptable for XML.
-            /// See https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md
-            const String setting_name_in_kafka_config = (tag == "log_level") ? tag : boost::replace_all_copy(tag, "_", ".");
-            kafka_config.set(setting_name_in_kafka_config, setting_value);
+            const String setting_path = fmt::format("{}.{}", config_prefix, tag);
+            setKafkaConfigValue(kafka_config, tag, config.getString(setting_path));
         }
     }
 
     /// Read server configuration into cppkafa configuration, used by new per-topic configuration
-    void loadTopicConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String & config_prefix, const String & topic)
+    void loadTopicConfig(cppkafka::Configuration & kafka_config, const Poco::Util::AbstractConfiguration & config, const String& collection_name, const String& config_prefix, const String& topic)
     {
-        /// Read all tags one level below <kafka>
-        Poco::Util::AbstractConfiguration::Keys tags;
-        config.keys(config_prefix, tags);
-
-        for (const auto & tag : tags)
+        if (!collection_name.empty())
         {
-            /// Only consider tag <kafka_topic>. Multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
-            if (!tag.starts_with(CONFIG_KAFKA_TOPIC_TAG))
-                continue;
-
-            /// Read topic name between <name>...</name>
-            const String kafka_topic_path = config_prefix + "." + tag;
-            const String kafpa_topic_name_path = kafka_topic_path + "." + CONFIG_NAME_TAG;
-
-            const String topic_name = config.getString(kafpa_topic_name_path);
-            if (topic_name == topic)
+            const auto topic_prefix = fmt::format("{}.{}", config_prefix, CONFIG_KAFKA_TOPIC_TAG);
+            const auto & collection = NamedCollectionFactory::instance().get(collection_name);
+            for (const auto & key : collection->getKeys(1, config_prefix))
             {
-                /// Found it! Now read the per-topic configuration into cppkafka.
-                Poco::Util::AbstractConfiguration::Keys inner_tags;
-                config.keys(kafka_topic_path, inner_tags);
-                for (const auto & inner_tag : inner_tags)
-                {
-                    if (inner_tag == CONFIG_NAME_TAG)
-                        continue; // ignore <name>
+                /// Only consider key <kafka_topic>. Multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
+                if (!key.starts_with(topic_prefix))
+                    continue;
 
-                    /// "log_level" has valid underscore, the remaining librdkafka setting use dot.separated.format which isn't acceptable for XML.
-                    /// See https://github.com/edenhill/librdkafka/blob/master/CONFIGURATION.md
-                    const String setting_path = kafka_topic_path + "." + inner_tag;
-                    const String setting_value = config.getString(setting_path);
+                const String kafka_topic_path = config_prefix + "." + key;
+                const String kafka_topic_name_path = kafka_topic_path + "." + CONFIG_NAME_TAG;
+                if (topic == collection->get<String>(kafka_topic_name_path))
+                    /// Found it! Now read the per-topic configuration into cppkafka.
+                    loadFromConfig(kafka_config, config, collection_name, kafka_topic_path);
+            }
+        }
+        else
+        {
+            /// Read all tags one level below <kafka>
+            Poco::Util::AbstractConfiguration::Keys tags;
+            config.keys(config_prefix, tags);
 
-                    const String setting_name_in_kafka_config = (inner_tag == "log_level") ? inner_tag : boost::replace_all_copy(inner_tag, "_", ".");
-                    kafka_config.set(setting_name_in_kafka_config, setting_value);
-                }
+            for (const auto & tag : tags)
+            {
+                /// Only consider tag <kafka_topic>. Multiple occurrences given as "kafka_topic", "kafka_topic[1]", etc.
+                if (!tag.starts_with(CONFIG_KAFKA_TOPIC_TAG))
+                    continue;
+
+                /// Read topic name between <name>...</name>
+                const String kafka_topic_path = fmt::format("{}.{}", config_prefix, tag);
+                const String kafka_topic_name_path = fmt::format("{}.{}", kafka_topic_path, CONFIG_NAME_TAG);
+
+                const String topic_name = config.getString(kafka_topic_name_path);
+                if (topic_name == topic)
+                    /// Found it! Now read the per-topic configuration into cppkafka.
+                    loadFromConfig(kafka_config, config, collection_name, kafka_topic_path);
             }
         }
     }
@@ -261,7 +346,7 @@ StorageKafka::StorageKafka(
     , max_rows_per_message(kafka_settings->kafka_max_rows_per_message.value)
     , schema_name(getContext()->getMacros()->expand(kafka_settings->kafka_schema.value, macros_info))
     , num_consumers(kafka_settings->kafka_num_consumers.value)
-    , log(&Poco::Logger::get("StorageKafka (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageKafka (" + table_id_.table_name + ")"))
     , intermediate_commit(kafka_settings->kafka_commit_every_batch.value)
     , settings_adjustments(createSettingsAdjustments())
     , thread_per_consumer(kafka_settings->kafka_thread_per_consumer.value)
@@ -278,6 +363,8 @@ StorageKafka::StorageKafka(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals(kafka_settings->kafka_handle_error_mode));
+
     auto task_count = thread_per_consumer ? num_consumers : 1;
     for (size_t i = 0; i < task_count; ++i)
     {
@@ -299,6 +386,30 @@ StorageKafka::StorageKafka(
     });
 }
 
+StorageKafka::~StorageKafka() = default;
+
+VirtualColumnsDescription StorageKafka::createVirtuals(StreamingHandleErrorMode handle_error_mode)
+{
+    VirtualColumnsDescription desc;
+
+    desc.addEphemeral("_topic", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "");
+    desc.addEphemeral("_key", std::make_shared<DataTypeString>(), "");
+    desc.addEphemeral("_offset", std::make_shared<DataTypeUInt64>(), "");
+    desc.addEphemeral("_partition", std::make_shared<DataTypeUInt64>(), "");
+    desc.addEphemeral("_timestamp", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "");
+    desc.addEphemeral("_timestamp_ms", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime64>(3)), "");
+    desc.addEphemeral("_headers.name", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "");
+    desc.addEphemeral("_headers.value", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "");
+
+    if (handle_error_mode == StreamingHandleErrorMode::STREAM)
+    {
+        desc.addEphemeral("_raw_message", std::make_shared<DataTypeString>(), "");
+        desc.addEphemeral("_error", std::make_shared<DataTypeString>(), "");
+    }
+
+    return desc;
+}
+
 SettingsChanges StorageKafka::createSettingsAdjustments()
 {
     SettingsChanges result;
@@ -347,45 +458,18 @@ String StorageKafka::getDefaultClientId(const StorageID & table_id_)
     return fmt::format("{}-{}-{}-{}", VERSION_NAME, getFQDNOrHostName(), table_id_.database_name, table_id_.table_name);
 }
 
-
-Pipe StorageKafka::read(
+void StorageKafka::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /* query_info */,
-    ContextPtr local_context,
+    SelectQueryInfo & query_info,
+    ContextPtr query_context,
     QueryProcessingStage::Enum /* processed_stage */,
     size_t /* max_block_size */,
     size_t /* num_streams */)
 {
-    if (shutdown_called)
-        throw Exception(ErrorCodes::ABORTED, "Table is detached");
-
-    if (!local_context->getSettingsRef().stream_like_engine_allow_direct_select)
-        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED,
-                        "Direct select is not allowed. To enable use setting `stream_like_engine_allow_direct_select`");
-
-    if (mv_attached)
-        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "Cannot read from StorageKafka with attached materialized views");
-
-    ProfileEvents::increment(ProfileEvents::KafkaDirectReads);
-
-    /// Always use all consumers at once, otherwise SELECT may not read messages from all partitions.
-    Pipes pipes;
-    pipes.reserve(num_consumers);
-    auto modified_context = Context::createCopy(local_context);
-    modified_context->applySettingsChanges(settings_adjustments);
-
-    // Claim as many consumers as requested, but don't block
-    for (size_t i = 0; i < num_consumers; ++i)
-    {
-        /// Use block size of 1, otherwise LIMIT won't work properly as it will buffer excess messages in the last block
-        /// TODO: probably that leads to awful performance.
-        /// FIXME: seems that doesn't help with extra reading and committing unprocessed messages.
-        pipes.emplace_back(std::make_shared<KafkaSource>(*this, storage_snapshot, modified_context, column_names, log, 1, kafka_settings->kafka_commit_on_select));
-    }
-
-    LOG_DEBUG(log, "Starting reading {} streams", pipes.size());
-    return Pipe::unitePipes(std::move(pipes));
+    query_plan.addStep(std::make_unique<ReadFromStorageKafka>(
+        column_names, shared_from_this(), storage_snapshot, query_info, std::move(query_context)));
 }
 
 
@@ -689,13 +773,6 @@ size_t StorageKafka::getPollTimeoutMillisecond() const
         : getContext()->getSettingsRef().stream_poll_timeout_ms.totalMilliseconds();
 }
 
-String StorageKafka::getConfigPrefix() const
-{
-    if (!collection_name.empty())
-        return "named_collections." + collection_name + "." + CONFIG_KAFKA_TAG; /// Add one more level to separate librdkafka configuration.
-    return CONFIG_KAFKA_TAG;
-}
-
 void StorageKafka::updateConfiguration(cppkafka::Configuration & kafka_config)
 {
     // Update consumer configuration from the configuration. Example:
@@ -704,9 +781,7 @@ void StorageKafka::updateConfiguration(cppkafka::Configuration & kafka_config)
     //         <fetch_min_bytes>100000</fetch_min_bytes>
     //     </kafka>
     const auto & config = getContext()->getConfigRef();
-    auto config_prefix = getConfigPrefix();
-    if (config.has(config_prefix))
-        loadFromConfig(kafka_config, config, config_prefix);
+    loadFromConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG);
 
 #if USE_KRB5
     if (kafka_config.has_property("sasl.kerberos.kinit.cmd"))
@@ -745,9 +820,7 @@ void StorageKafka::updateConfiguration(cppkafka::Configuration & kafka_config)
     // as <kafka> are ugly.
     for (const auto & topic : topics)
     {
-        const auto topic_config_key = config_prefix + "_" + topic;
-        if (config.has(topic_config_key))
-            loadFromConfig(kafka_config, config, topic_config_key);
+        loadFromConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG + "_" + topic);
     }
 
     // Update consumer topic-specific configuration (new syntax). Example with topics "football" and "baseball":
@@ -766,8 +839,7 @@ void StorageKafka::updateConfiguration(cppkafka::Configuration & kafka_config)
     // Advantages: The period restriction no longer applies (e.g. <name>sports.football</name> will work), everything
     // Kafka-related is below <kafka>.
     for (const auto & topic : topics)
-        if (config.has(config_prefix))
-            loadTopicConfig(kafka_config, config, config_prefix, topic);
+        loadTopicConfig(kafka_config, config, collection_name, CONFIG_KAFKA_TAG, topic);
 
     // No need to add any prefix, messages can be distinguished
     kafka_config.set_log_callback([this](cppkafka::KafkaHandleBase &, int level, const std::string & facility, const std::string & message)
@@ -778,7 +850,7 @@ void StorageKafka::updateConfiguration(cppkafka::Configuration & kafka_config)
 
     /// NOTE: statistics should be consumed, otherwise it creates too much
     /// entries in the queue, that leads to memory leak and slow shutdown.
-    if (!config.has(config_prefix + "." + "statistics_interval_ms"))
+    if (!kafka_config.has_property("statistics.interval.ms"))
     {
         // every 3 seconds by default. set to 0 to disable.
         kafka_config.set("statistics.interval.ms", "3000");
@@ -1148,43 +1220,4 @@ void registerStorageKafka(StorageFactory & factory)
     factory.registerStorage("Kafka", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
 }
 
-NamesAndTypesList StorageKafka::getVirtuals() const
-{
-    auto result = NamesAndTypesList{
-        {"_topic", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_key", std::make_shared<DataTypeString>()},
-        {"_offset", std::make_shared<DataTypeUInt64>()},
-        {"_partition", std::make_shared<DataTypeUInt64>()},
-        {"_timestamp", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
-        {"_timestamp_ms", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime64>(3))},
-        {"_headers.name", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"_headers.value", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())}};
-    if (kafka_settings->kafka_handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        result.push_back({"_raw_message", std::make_shared<DataTypeString>()});
-        result.push_back({"_error", std::make_shared<DataTypeString>()});
-    }
-    return result;
-}
-
-Names StorageKafka::getVirtualColumnNames() const
-{
-    auto result = Names {
-        "_topic",
-        "_key",
-        "_offset",
-        "_partition",
-        "_timestamp",
-        "_timestamp_ms",
-        "_headers.name",
-        "_headers.value",
-    };
-    if (kafka_settings->kafka_handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        result.push_back({"_raw_message"});
-        result.push_back({"_error"});
-    }
-    return result;
-}
-
 }
diff --git a/src/Storages/Kafka/StorageKafka.h b/src/Storages/Kafka/StorageKafka.h
index f60719538cf..6479902f0f2 100644
--- a/src/Storages/Kafka/StorageKafka.h
+++ b/src/Storages/Kafka/StorageKafka.h
@@ -19,7 +19,9 @@
 namespace DB
 {
 
+class ReadFromStorageKafka;
 class StorageSystemKafkaConsumers;
+class ThreadStatus;
 
 struct StorageKafkaInterceptors;
 
@@ -41,6 +43,8 @@ public:
         std::unique_ptr<KafkaSettings> kafka_settings_,
         const String & collection_name_);
 
+    ~StorageKafka() override;
+
     std::string getName() const override { return "Kafka"; }
 
     bool noPushingToViews() const override { return true; }
@@ -48,7 +52,8 @@ public:
     void startup() override;
     void shutdown(bool is_drop) override;
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
@@ -72,8 +77,6 @@ public:
 
     const auto & getFormatName() const { return format_name; }
 
-    NamesAndTypesList getVirtuals() const override;
-    Names getVirtualColumnNames() const;
     StreamingHandleErrorMode getStreamingHandleErrorMode() const { return kafka_settings->kafka_handle_error_mode; }
 
     struct SafeConsumers
@@ -86,6 +89,8 @@ public:
     SafeConsumers getSafeConsumers() { return {shared_from_this(), std::unique_lock(mutex), consumers};  }
 
 private:
+    friend class ReadFromStorageKafka;
+
     // Configuration and state
     std::unique_ptr<KafkaSettings> kafka_settings;
     Macros::MacroExpansionInfo macros_info;
@@ -97,7 +102,7 @@ private:
     const size_t max_rows_per_message;
     const String schema_name;
     const size_t num_consumers; /// total number of consumers
-    Poco::Logger * log;
+    LoggerPtr log;
     const bool intermediate_commit;
     const SettingsChanges settings_adjustments;
 
@@ -141,7 +146,6 @@ private:
     // Update Kafka configuration with values from CH user configuration.
     void updateConfiguration(cppkafka::Configuration & kafka_config);
 
-    String getConfigPrefix() const;
     void threadFunc(size_t idx);
 
     size_t getPollMaxBatchSize() const;
@@ -155,6 +159,8 @@ private:
     bool checkDependencies(const StorageID & table_id);
 
     void cleanConsumers();
+
+    static VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
 };
 
 }
diff --git a/src/Storages/Kafka/parseSyslogLevel.cpp b/src/Storages/Kafka/parseSyslogLevel.cpp
index f4358a13efe..43630a5001f 100644
--- a/src/Storages/Kafka/parseSyslogLevel.cpp
+++ b/src/Storages/Kafka/parseSyslogLevel.cpp
@@ -4,7 +4,7 @@
 /// Must be in a separate compilation unit due to macros overlaps:
 /// - syslog (LOG_DEBUG/...)
 /// - logger_useful.h (LOG_DEBUG(...)/...)
-std::pair<Poco::Message::Priority, DB::LogsLevel> parseSyslogLevel(const int level)
+std::pair<Poco::Message::Priority, DB::LogsLevel> parseSyslogLevel(int level)
 {
     using DB::LogsLevel;
     using Poco::Message;
diff --git a/src/Storages/Kafka/parseSyslogLevel.h b/src/Storages/Kafka/parseSyslogLevel.h
index f0fb4968631..a004fc3d29f 100644
--- a/src/Storages/Kafka/parseSyslogLevel.h
+++ b/src/Storages/Kafka/parseSyslogLevel.h
@@ -4,4 +4,4 @@
 #include <Poco/Message.h>
 #include <Common/CurrentThread.h>
 
-std::pair<Poco::Message::Priority, DB::LogsLevel> parseSyslogLevel(const int level);
+std::pair<Poco::Message::Priority, DB::LogsLevel> parseSyslogLevel(int level);
diff --git a/src/Storages/KeyDescription.cpp b/src/Storages/KeyDescription.cpp
index c407cef627d..2a697fa5654 100644
--- a/src/Storages/KeyDescription.cpp
+++ b/src/Storages/KeyDescription.cpp
@@ -171,8 +171,8 @@ KeyDescription KeyDescription::parse(const String & str, const ColumnsDescriptio
         return result;
 
     ParserExpression parser;
-    ASTPtr ast = parseQuery(parser, "(" + str + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-    FunctionNameNormalizer().visit(ast.get());
+    ASTPtr ast = parseQuery(parser, "(" + str + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+    FunctionNameNormalizer::visit(ast.get());
 
     return getKeyFromAST(ast, columns, context);
 }
diff --git a/src/Storages/LightweightDeleteDescription.cpp b/src/Storages/LightweightDeleteDescription.cpp
deleted file mode 100644
index ae5e68da9c2..00000000000
--- a/src/Storages/LightweightDeleteDescription.cpp
+++ /dev/null
@@ -1,9 +0,0 @@
-#include <Storages/LightweightDeleteDescription.h>
-#include <DataTypes/DataTypesNumber.h>
-
-namespace DB
-{
-
-const NameAndTypePair LightweightDeleteDescription::FILTER_COLUMN {"_row_exists", std::make_shared<DataTypeUInt8>()};
-
-}
diff --git a/src/Storages/LightweightDeleteDescription.h b/src/Storages/LightweightDeleteDescription.h
deleted file mode 100644
index 45bde59ea71..00000000000
--- a/src/Storages/LightweightDeleteDescription.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-#include <Core/NamesAndTypes.h>
-#include "Storages/TTLDescription.h"
-
-namespace DB
-{
-
-struct LightweightDeleteDescription
-{
-    static const NameAndTypePair FILTER_COLUMN;
-};
-
-}
diff --git a/src/Storages/LiveView/StorageLiveView.cpp b/src/Storages/LiveView/StorageLiveView.cpp
index 3c116321083..c3aacfd67d3 100644
--- a/src/Storages/LiveView/StorageLiveView.cpp
+++ b/src/Storages/LiveView/StorageLiveView.cpp
@@ -57,7 +57,7 @@ namespace ErrorCodes
 {
     extern const int INCORRECT_QUERY;
     extern const int TABLE_WAS_NOT_DROPPED;
-    extern const int QUERY_IS_NOT_SUPPORTED_IN_LIVE_VIEW;
+    extern const int NOT_IMPLEMENTED;
     extern const int SUPPORT_IS_DISABLED;
     extern const int UNSUPPORTED_METHOD;
 }
@@ -86,14 +86,14 @@ SelectQueryDescription buildSelectQueryDescription(const ASTPtr & select_query,
         if (inner_select_with_union_query)
         {
             if (inner_select_with_union_query->list_of_selects->children.size() != 1)
-                throw Exception(ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_LIVE_VIEW, "UNION is not supported for LIVE VIEW");
+                throw Exception(ErrorCodes::NOT_IMPLEMENTED, "UNION is not supported for LIVE VIEW");
 
             inner_query = inner_select_with_union_query->list_of_selects->children[0];
         }
 
         auto * inner_select_query = inner_query->as<ASTSelectQuery>();
         if (!inner_select_query)
-            throw Exception(DB::ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_LIVE_VIEW,
+            throw Exception(DB::ErrorCodes::NOT_IMPLEMENTED,
                 "LIVE VIEWs are only supported for queries from tables, "
                 "but there is no table name in select query.");
 
@@ -209,7 +209,7 @@ StorageLiveView::StorageLiveView(
     live_view_context = Context::createCopy(getContext());
     live_view_context->makeQueryContext();
 
-    log = &Poco::Logger::get("StorageLiveView (" + table_id_.database_name + "." + table_id_.table_name + ")");
+    log = getLogger("StorageLiveView (" + table_id_.database_name + "." + table_id_.table_name + ")");
 
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -218,6 +218,10 @@ StorageLiveView::StorageLiveView(
 
     setInMemoryMetadata(storage_metadata);
 
+    VirtualColumnsDescription virtuals;
+    virtuals.addEphemeral("_version", std::make_shared<DataTypeUInt64>(), "");
+    setVirtuals(std::move(virtuals));
+
     if (!query.select)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "SELECT query is not specified for {}", getName());
 
@@ -226,29 +230,9 @@ StorageLiveView::StorageLiveView(
 
     DatabaseCatalog::instance().addViewDependency(select_query_description.select_table_id, table_id_);
 
-    if (query.live_view_periodic_refresh)
-    {
-        is_periodically_refreshed = true;
-        periodic_live_view_refresh = Seconds {*query.live_view_periodic_refresh};
-    }
-
     blocks_ptr = std::make_shared<BlocksPtr>();
     blocks_metadata_ptr = std::make_shared<BlocksMetadataPtr>();
     active_ptr = std::make_shared<bool>(true);
-
-    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();
 }
 
 StorageLiveView::~StorageLiveView()
@@ -256,13 +240,6 @@ StorageLiveView::~StorageLiveView()
     shutdown(false);
 }
 
-NamesAndTypesList StorageLiveView::getVirtuals() const
-{
-    return NamesAndTypesList{
-        NameAndTypePair("_version", std::make_shared<DataTypeUInt64>())
-    };
-}
-
 void StorageLiveView::checkTableCanBeDropped([[ maybe_unused ]] ContextPtr query_context) const
 {
     auto table_id = getStorageID();
@@ -285,17 +262,12 @@ void StorageLiveView::drop()
 
 void StorageLiveView::startup()
 {
-    if (is_periodically_refreshed)
-        periodic_refresh_task->activate();
 }
 
 void StorageLiveView::shutdown(bool)
 {
     shutdown_called = true;
 
-    if (is_periodically_refreshed)
-        periodic_refresh_task->deactivate();
-
     DatabaseCatalog::instance().removeViewDependency(select_query_description.select_table_id, getStorageID());
 }
 
@@ -311,17 +283,7 @@ Pipe StorageLiveView::read(
     std::lock_guard lock(mutex);
 
     if (!(*blocks_ptr))
-    {
         refreshImpl(lock);
-    }
-    else if (is_periodically_refreshed)
-    {
-        Seconds current_time = std::chrono::duration_cast<Seconds>(std::chrono::system_clock::now().time_since_epoch());
-        Seconds blocks_time = std::chrono::duration_cast<Seconds>(getBlocksTime(lock).time_since_epoch());
-
-        if ((current_time - periodic_live_view_refresh) >= blocks_time)
-            refreshImpl(lock);
-    }
 
     return Pipe(std::make_shared<BlocksSource>(*blocks_ptr, getHeader()));
 }
@@ -362,9 +324,6 @@ Pipe StorageLiveView::watch(
 
         if (!(*blocks_ptr))
             refreshImpl(lock);
-
-        if (is_periodically_refreshed)
-            scheduleNextPeriodicRefresh(lock);
     }
 
     processed_stage = QueryProcessingStage::Complete;
@@ -746,44 +705,11 @@ bool StorageLiveView::getNewBlocks(const std::lock_guard<std::mutex> & lock)
     return updated;
 }
 
-void StorageLiveView::periodicRefreshTaskFunc()
-{
-    LOG_TRACE(log, "periodic refresh task");
-
-    std::lock_guard lock(mutex);
-
-    if (hasActiveUsers(lock))
-        scheduleNextPeriodicRefresh(lock);
-}
-
-void StorageLiveView::scheduleNextPeriodicRefresh(const std::lock_guard<std::mutex> & lock)
-{
-    Seconds current_time = std::chrono::duration_cast<Seconds>(std::chrono::system_clock::now().time_since_epoch());
-    Seconds blocks_time = std::chrono::duration_cast<Seconds>(getBlocksTime(lock).time_since_epoch());
-
-    if ((current_time - periodic_live_view_refresh) >= blocks_time)
-    {
-        refreshImpl(lock);
-        blocks_time = std::chrono::duration_cast<Seconds>(getBlocksTime(lock).time_since_epoch());
-    }
-    current_time = std::chrono::duration_cast<Seconds>(std::chrono::system_clock::now().time_since_epoch());
-
-    auto next_refresh_time = blocks_time + periodic_live_view_refresh;
-
-    if (current_time >= next_refresh_time)
-        periodic_refresh_task->scheduleAfter(0);
-    else
-    {
-        auto schedule_time = std::chrono::duration_cast<MilliSeconds> (next_refresh_time - current_time);
-        periodic_refresh_task->scheduleAfter(static_cast<size_t>(schedule_time.count()));
-    }
-}
-
 void registerStorageLiveView(StorageFactory & factory)
 {
     factory.registerStorage("LiveView", [](const StorageFactory::Arguments & args)
     {
-        if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_experimental_live_view)
+        if (args.mode <= LoadingStrictnessLevel::CREATE && !args.getLocalContext()->getSettingsRef().allow_experimental_live_view)
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
                             "Experimental LIVE VIEW feature is not enabled (the setting 'allow_experimental_live_view')");
 
diff --git a/src/Storages/LiveView/StorageLiveView.h b/src/Storages/LiveView/StorageLiveView.h
index e0566d586ee..91daac32c7b 100644
--- a/src/Storages/LiveView/StorageLiveView.h
+++ b/src/Storages/LiveView/StorageLiveView.h
@@ -21,6 +21,7 @@ limitations under the License. */
 namespace DB
 {
 
+using BlocksPtrs = std::shared_ptr<std::vector<BlocksPtr>>;
 
 struct BlocksMetadata
 {
@@ -73,8 +74,6 @@ public:
 
     bool supportsFinal() const override { return true; }
 
-    NamesAndTypesList getVirtuals() const override;
-
     void checkTableCanBeDropped([[ maybe_unused ]] ContextPtr query_context) const override;
 
     void drop() override;
@@ -172,11 +171,6 @@ private:
     /// Read new data blocks that store query result
     bool getNewBlocks(const std::lock_guard<std::mutex> & lock);
 
-    void periodicRefreshTaskFunc();
-
-    /// Must be called with mutex locked
-    void scheduleNextPeriodicRefresh(const std::lock_guard<std::mutex> & lock);
-
     SelectQueryDescription select_query_description;
 
     /// Query over the mergeable blocks to produce final result
@@ -184,10 +178,7 @@ private:
 
     ContextMutablePtr live_view_context;
 
-    Poco::Logger * log;
-
-    bool is_periodically_refreshed = false;
-    Seconds periodic_live_view_refresh;
+    LoggerPtr log;
 
     /// Mutex to protect access to sample block and inner_blocks_query
     mutable std::mutex sample_block_lock;
@@ -208,9 +199,6 @@ private:
     MergeableBlocksPtr mergeable_blocks;
 
     std::atomic<bool> shutdown_called = false;
-
-    /// Periodic refresh task used when [PERIODIC] REFRESH is specified in create statement
-    BackgroundSchedulePool::TaskHolder periodic_refresh_task;
 };
 
 }
diff --git a/src/Storages/MarkCache.cpp b/src/Storages/MarkCache.cpp
new file mode 100644
index 00000000000..85f0aeac692
--- /dev/null
+++ b/src/Storages/MarkCache.cpp
@@ -0,0 +1,11 @@
+#include <Storages/MarkCache.h>
+
+namespace DB
+{
+template class CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
+
+MarkCache::MarkCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio)
+    : Base(cache_policy, max_size_in_bytes, 0, size_ratio)
+{
+}
+}
diff --git a/src/Storages/MarkCache.h b/src/Storages/MarkCache.h
index bcb6ae96c68..311fccdf810 100644
--- a/src/Storages/MarkCache.h
+++ b/src/Storages/MarkCache.h
@@ -31,7 +31,7 @@ struct MarksWeightFunction
     }
 };
 
-
+extern template class CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
 /** Cache of 'marks' for StorageMergeTree.
   * Marks is an index structure that addresses ranges in column file, corresponding to ranges of primary key.
   */
@@ -41,8 +41,7 @@ private:
     using Base = CacheBase<UInt128, MarksInCompressedFile, UInt128TrivialHash, MarksWeightFunction>;
 
 public:
-    MarkCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio)
-        : Base(cache_policy, max_size_in_bytes, 0, size_ratio) {}
+    MarkCache(const String & cache_policy, size_t max_size_in_bytes, double size_ratio);
 
     /// Calculate key from path to file and offset.
     static UInt128 hash(const String & path_to_file)
diff --git a/src/Storages/MaterializedView/RefreshSet.cpp b/src/Storages/MaterializedView/RefreshSet.cpp
index ac83d3d99c2..0125b958a41 100644
--- a/src/Storages/MaterializedView/RefreshSet.cpp
+++ b/src/Storages/MaterializedView/RefreshSet.cpp
@@ -73,7 +73,7 @@ void RefreshSet::Handle::reset()
 
 RefreshSet::RefreshSet() = default;
 
-RefreshSet::Handle RefreshSet::emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task)
+void RefreshSet::emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task)
 {
     std::lock_guard guard(mutex);
     auto [it, is_inserted] = tasks.emplace(id, task);
@@ -81,7 +81,7 @@ RefreshSet::Handle RefreshSet::emplace(StorageID id, const std::vector<StorageID
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Refresh set entry already exists for table {}", id.getFullTableName());
     addDependenciesLocked(id, dependencies);
 
-    return Handle(this, id, dependencies);
+    task->setRefreshSetHandleUnlock(Handle(this, id, dependencies));
 }
 
 void RefreshSet::addDependenciesLocked(const StorageID & id, const std::vector<StorageID> & dependencies)
diff --git a/src/Storages/MaterializedView/RefreshSet.h b/src/Storages/MaterializedView/RefreshSet.h
index 63e022b6d4d..eff445023a6 100644
--- a/src/Storages/MaterializedView/RefreshSet.h
+++ b/src/Storages/MaterializedView/RefreshSet.h
@@ -1,9 +1,9 @@
 #pragma once
 
+#include <IO/Progress.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Storages/IStorage.h>
 #include <Storages/MaterializedView/RefreshTask_fwd.h>
-
 #include <Common/CurrentMetrics.h>
 
 namespace DB
@@ -82,7 +82,7 @@ public:
 
     RefreshSet();
 
-    Handle emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task);
+    void emplace(StorageID id, const std::vector<StorageID> & dependencies, RefreshTaskHolder task);
 
     RefreshTaskHolder getTask(const StorageID & id) const;
 
diff --git a/src/Storages/MaterializedView/RefreshTask.cpp b/src/Storages/MaterializedView/RefreshTask.cpp
index bc26301e3b9..bc8cb0ce69a 100644
--- a/src/Storages/MaterializedView/RefreshTask.cpp
+++ b/src/Storages/MaterializedView/RefreshTask.cpp
@@ -27,7 +27,7 @@ namespace ErrorCodes
 
 RefreshTask::RefreshTask(
     const ASTRefreshStrategy & strategy)
-    : log(&Poco::Logger::get("RefreshTask"))
+    : log(getLogger("RefreshTask"))
     , refresh_schedule(strategy)
 {}
 
@@ -50,7 +50,7 @@ RefreshTaskHolder RefreshTask::create(
         for (auto && dependency : strategy.dependencies->children)
             deps.emplace_back(dependency->as<const ASTTableIdentifier &>());
 
-    task->set_handle = context->getRefreshSet().emplace(view.getStorageID(), deps, task);
+    context->getRefreshSet().emplace(view.getStorageID(), deps, task);
 
     return task;
 }
@@ -509,4 +509,9 @@ std::chrono::system_clock::time_point RefreshTask::currentTime() const
         return std::chrono::system_clock::time_point(std::chrono::seconds(fake));
 }
 
+void RefreshTask::setRefreshSetHandleUnlock(RefreshSet::Handle && set_handle_)
+{
+    set_handle = std::move(set_handle_);
+}
+
 }
diff --git a/src/Storages/MaterializedView/RefreshTask.h b/src/Storages/MaterializedView/RefreshTask.h
index 8a062f6f359..1f050a97cd9 100644
--- a/src/Storages/MaterializedView/RefreshTask.h
+++ b/src/Storages/MaterializedView/RefreshTask.h
@@ -61,8 +61,11 @@ public:
     /// For tests
     void setFakeTime(std::optional<Int64> t);
 
+    /// RefreshSet will set handle for refresh tasks, to avoid race condition.
+    void setRefreshSetHandleUnlock(RefreshSet::Handle && set_handle_);
+
 private:
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
     std::weak_ptr<IStorage> view_to_refresh;
 
     /// Protects interrupt_execution and running_executor.
diff --git a/src/Storages/MemorySettings.cpp b/src/Storages/MemorySettings.cpp
index f5e182b3484..30ae4e12668 100644
--- a/src/Storages/MemorySettings.cpp
+++ b/src/Storages/MemorySettings.cpp
@@ -1,6 +1,5 @@
 #include <Storages/MemorySettings.h>
 #include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Common/Exception.h>
 
@@ -11,6 +10,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int UNKNOWN_SETTING;
+    extern const int SETTING_CONSTRAINT_VIOLATION;
 }
 
 IMPLEMENT_SETTINGS_TRAITS(memorySettingsTraits, MEMORY_SETTINGS)
@@ -32,5 +32,31 @@ void MemorySettings::loadFromQuery(ASTStorage & storage_def)
     }
 }
 
+ASTPtr MemorySettings::getSettingsChangesQuery()
+{
+    auto settings_ast = std::make_shared<ASTSetQuery>();
+    settings_ast->is_standalone = false;
+    for (const auto & change : changes())
+        settings_ast->changes.push_back(change);
+
+    return settings_ast;
+}
+
+void MemorySettings::sanityCheck() const
+{
+    if (min_bytes_to_keep > max_bytes_to_keep)
+        throw Exception(ErrorCodes::SETTING_CONSTRAINT_VIOLATION,
+                        "Setting `min_bytes_to_keep` cannot be higher than the `max_bytes_to_keep`. `min_bytes_to_keep`: {}, `max_bytes_to_keep`: {}",
+                        min_bytes_to_keep,
+                        max_bytes_to_keep);
+
+
+    if (min_rows_to_keep > max_rows_to_keep)
+        throw Exception(ErrorCodes::SETTING_CONSTRAINT_VIOLATION,
+                        "Setting `min_rows_to_keep` cannot be higher than the `max_rows_to_keep`. `min_rows_to_keep`: {}, `max_rows_to_keep`: {}",
+                        min_rows_to_keep,
+                        max_rows_to_keep);
+}
+
 }
 
diff --git a/src/Storages/MemorySettings.h b/src/Storages/MemorySettings.h
index 9e1a8db3595..f650746c4b2 100644
--- a/src/Storages/MemorySettings.h
+++ b/src/Storages/MemorySettings.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Core/BaseSettings.h>
+#include <Parsers/ASTSetQuery.h>
 
 
 namespace DB
@@ -10,6 +11,10 @@ class ASTStorage;
 
 #define MEMORY_SETTINGS(M, ALIAS) \
     M(Bool, compress, false, "Compress data in memory", 0) \
+    M(UInt64, min_rows_to_keep, 0, "Minimum block size (in rows) to retain in Memory table buffer.", 0) \
+    M(UInt64, max_rows_to_keep, 0, "Maximum block size (in rows) to retain in Memory table buffer.", 0) \
+    M(UInt64, min_bytes_to_keep, 0, "Minimum block size (in bytes) to retain in Memory table buffer.", 0) \
+    M(UInt64, max_bytes_to_keep, 0, "Maximum block size (in bytes) to retain in Memory table buffer.", 0) \
 
 DECLARE_SETTINGS_TRAITS(memorySettingsTraits, MEMORY_SETTINGS)
 
@@ -20,6 +25,8 @@ DECLARE_SETTINGS_TRAITS(memorySettingsTraits, MEMORY_SETTINGS)
 struct MemorySettings : public BaseSettings<memorySettingsTraits>
 {
     void loadFromQuery(ASTStorage & storage_def);
+    ASTPtr getSettingsChangesQuery();
+    void sanityCheck() const;
 };
 
 }
diff --git a/src/Storages/MergeTree/AlterConversions.cpp b/src/Storages/MergeTree/AlterConversions.cpp
index a98cd6d99f9..31f8f17e2c1 100644
--- a/src/Storages/MergeTree/AlterConversions.cpp
+++ b/src/Storages/MergeTree/AlterConversions.cpp
@@ -9,6 +9,11 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+bool AlterConversions::supportsMutationCommandType(MutationCommand::Type t)
+{
+    return t == MutationCommand::Type::RENAME_COLUMN;
+}
+
 void AlterConversions::addMutationCommand(const MutationCommand & command)
 {
     /// Currently only RENAME_COLUMN is applied on-fly.
diff --git a/src/Storages/MergeTree/AlterConversions.h b/src/Storages/MergeTree/AlterConversions.h
index 4410b9c56e2..0f857d351dd 100644
--- a/src/Storages/MergeTree/AlterConversions.h
+++ b/src/Storages/MergeTree/AlterConversions.h
@@ -35,6 +35,8 @@ public:
     /// Get column old name before rename (lookup by key in rename_map)
     std::string getColumnOldName(const std::string & new_name) const;
 
+    static bool supportsMutationCommandType(MutationCommand::Type);
+
 private:
     /// Rename map new_name -> old_name.
     std::vector<RenamePair> rename_map;
diff --git a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
index cc3bc8fc2a8..9d64592ed64 100644
--- a/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
+++ b/src/Storages/MergeTree/AsyncBlockIDsCache.cpp
@@ -60,7 +60,7 @@ AsyncBlockIDsCache<TStorage>::AsyncBlockIDsCache(TStorage & storage_)
     , update_wait(storage.getSettings()->async_block_ids_cache_update_wait_ms)
     , path(storage.getZooKeeperPath() + "/async_blocks")
     , log_name(storage.getStorageID().getFullTableName() + " (AsyncBlockIDsCache)")
-    , log(&Poco::Logger::get(log_name))
+    , log(getLogger(log_name))
 {
     task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ update(); });
 }
diff --git a/src/Storages/MergeTree/AsyncBlockIDsCache.h b/src/Storages/MergeTree/AsyncBlockIDsCache.h
index 38c38da0033..bea012f1d32 100644
--- a/src/Storages/MergeTree/AsyncBlockIDsCache.h
+++ b/src/Storages/MergeTree/AsyncBlockIDsCache.h
@@ -43,7 +43,7 @@ private:
     BackgroundSchedulePool::TaskHolder task;
 
     const String log_name;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/MergeTree/BackgroundJobsAssignee.h b/src/Storages/MergeTree/BackgroundJobsAssignee.h
index 65fefce0917..9369ebe9135 100644
--- a/src/Storages/MergeTree/BackgroundJobsAssignee.h
+++ b/src/Storages/MergeTree/BackgroundJobsAssignee.h
@@ -1,7 +1,9 @@
 #pragma once
 
-#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
 #include <Core/BackgroundSchedulePool.h>
+#include <Interpreters/Context_fwd.h>
+#include <Storages/MergeTree/MergeTreeBackgroundExecutor.h>
+
 #include <pcg_random.hpp>
 
 
diff --git a/src/Storages/MergeTree/CMakeLists.txt b/src/Storages/MergeTree/CMakeLists.txt
index 390835f17ae..e69de29bb2d 100644
--- a/src/Storages/MergeTree/CMakeLists.txt
+++ b/src/Storages/MergeTree/CMakeLists.txt
@@ -1,3 +0,0 @@
-if(ENABLE_EXAMPLES)
-    add_subdirectory(examples)
-endif()
diff --git a/src/Storages/MergeTree/ColumnSizeEstimator.h b/src/Storages/MergeTree/ColumnSizeEstimator.h
index 597dc80e525..1307a5f493e 100644
--- a/src/Storages/MergeTree/ColumnSizeEstimator.h
+++ b/src/Storages/MergeTree/ColumnSizeEstimator.h
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 
 
 namespace DB
@@ -10,7 +9,7 @@ namespace DB
 /* Allow to compute more accurate progress statistics */
 class ColumnSizeEstimator
 {
-    using ColumnToSize = MergeTreeDataPartInMemory::ColumnToSize;
+    using ColumnToSize = std::map<String, UInt64>;
     ColumnToSize map;
 public:
 
@@ -24,9 +23,9 @@ public:
         : map(std::move(map_))
     {
         for (const auto & name : key_columns)
-            if (!map.count(name)) map[name] = 0;
+            if (!map.contains(name)) map[name] = 0;
         for (const auto & name : ordinary_columns)
-            if (!map.count(name)) map[name] = 0;
+            if (!map.contains(name)) map[name] = 0;
 
         for (const auto & name : key_columns)
             sum_index_columns += map.at(name);
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
index 6c1377505d5..052e3ba4b74 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.cpp
@@ -1,3 +1,4 @@
+#include <string_view>
 #include <Storages/MergeTree/DataPartStorageOnDiskBase.h>
 #include <Storages/MergeTree/MergeTreeDataPartChecksum.h>
 #include <Disks/TemporaryFileOnDisk.h>
@@ -13,6 +14,7 @@
 #include <Backups/BackupEntryWrappedWith.h>
 #include <Backups/BackupSettings.h>
 #include <Disks/SingleDiskVolume.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 
 namespace DB
@@ -57,14 +59,14 @@ std::string DataPartStorageOnDiskBase::getRelativePath() const
     return fs::path(root_path) / part_dir / "";
 }
 
-std::optional<String> DataPartStorageOnDiskBase::getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached, bool broken) const
+std::optional<String> DataPartStorageOnDiskBase::getRelativePathForPrefix(LoggerPtr log, const String & prefix, bool detached, bool broken) const
 {
     assert(!broken || detached);
     String res;
 
     auto full_relative_path = fs::path(root_path);
     if (detached)
-        full_relative_path /= "detached";
+        full_relative_path /= MergeTreeData::DETACHED_DIR_NAME;
 
     std::optional<String> original_checksums_content;
     std::optional<Strings> original_files_list;
@@ -109,7 +111,7 @@ bool DataPartStorageOnDiskBase::looksLikeBrokenDetachedPartHasTheSameContent(con
     if (!exists("checksums.txt"))
         return false;
 
-    auto storage_from_detached = create(volume, fs::path(root_path) / "detached", detached_part_path, /*initialize=*/ true);
+    auto storage_from_detached = create(volume, fs::path(root_path) / MergeTreeData::DETACHED_DIR_NAME, detached_part_path, /*initialize=*/ true);
     if (!storage_from_detached->exists("checksums.txt"))
         return false;
 
@@ -195,7 +197,7 @@ std::string DataPartStorageOnDiskBase::getDiskName() const
 
 std::string DataPartStorageOnDiskBase::getDiskType() const
 {
-    return toString(volume->getDisk()->getDataSourceDescription().type);
+    return volume->getDisk()->getDataSourceDescription().toString();
 }
 
 bool DataPartStorageOnDiskBase::isStoredOnRemoteDisk() const
@@ -335,7 +337,9 @@ void DataPartStorageOnDiskBase::backup(
     const ReadSettings & read_settings,
     bool make_temporary_hard_links,
     BackupEntries & backup_entries,
-    TemporaryFilesOnDisks * temp_dirs) const
+    TemporaryFilesOnDisks * temp_dirs,
+    bool is_projection_part,
+    bool allow_backup_broken_projection) const
 {
     fs::path part_path_on_disk = fs::path{root_path} / part_dir;
     fs::path part_path_in_backup = fs::path{path_in_backup} / part_dir;
@@ -377,7 +381,7 @@ void DataPartStorageOnDiskBase::backup(
 
     bool copy_encrypted = !backup_settings.decrypt_files_from_encrypted_disks;
 
-    for (const auto & filepath : files_to_backup)
+    auto backup_file = [&](const String & filepath)
     {
         auto filepath_on_disk = part_path_on_disk / filepath;
         auto filepath_in_backup = part_path_in_backup / filepath;
@@ -385,8 +389,10 @@ void DataPartStorageOnDiskBase::backup(
         if (files_without_checksums.contains(filepath))
         {
             backup_entries.emplace_back(filepath_in_backup, std::make_unique<BackupEntryFromSmallFile>(disk, filepath_on_disk, read_settings, copy_encrypted));
-            continue;
+            return;
         }
+        else if (is_projection_part && allow_backup_broken_projection && !disk->exists(filepath_on_disk))
+            return;
 
         if (make_temporary_hard_links)
         {
@@ -411,6 +417,31 @@ void DataPartStorageOnDiskBase::backup(
             backup_entry = wrapBackupEntryWith(std::move(backup_entry), temp_dir_owner);
 
         backup_entries.emplace_back(filepath_in_backup, std::move(backup_entry));
+    };
+
+    auto * log = &Poco::Logger::get("DataPartStorageOnDiskBase::backup");
+
+    for (const auto & filepath : files_to_backup)
+    {
+        if (is_projection_part && allow_backup_broken_projection)
+        {
+            try
+            {
+                backup_file(filepath);
+            }
+            catch (Exception & e)
+            {
+                if (e.code() != ErrorCodes::FILE_DOESNT_EXIST)
+                    throw;
+
+                LOG_ERROR(log, "Cannot backup file {} of projection part {}. Will try to ignore it", filepath, part_dir);
+                continue;
+            }
+        }
+        else
+        {
+            backup_file(filepath);
+        }
     }
 }
 
@@ -461,7 +492,7 @@ MutableDataPartStoragePtr DataPartStorageOnDiskBase::freeze(
     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/");
+    bool to_detached = dir_path.starts_with(std::string_view((fs::path(MergeTreeData::DETACHED_DIR_NAME) / "").string()));
     return create(single_disk_volume, to, dir_path, /*initialize=*/ !to_detached && !params.external_transaction);
 }
 
@@ -471,7 +502,7 @@ MutableDataPartStoragePtr DataPartStorageOnDiskBase::clonePart(
     const DiskPtr & dst_disk,
     const ReadSettings & read_settings,
     const WriteSettings & write_settings,
-    Poco::Logger * log,
+    LoggerPtr log,
     const std::function<void()> & cancellation_hook) const
 {
     String path_to_clone = fs::path(to) / dir_path / "";
@@ -505,7 +536,7 @@ MutableDataPartStoragePtr DataPartStorageOnDiskBase::clonePart(
 void DataPartStorageOnDiskBase::rename(
     std::string new_root_path,
     std::string new_part_dir,
-    Poco::Logger * log,
+    LoggerPtr log,
     bool remove_new_dir_if_exists,
     bool fsync_part_dir)
 {
@@ -564,7 +595,7 @@ void DataPartStorageOnDiskBase::remove(
     const MergeTreeDataPartChecksums & checksums,
     std::list<ProjectionChecksums> projections,
     bool is_temp,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     /// NOTE We rename part to delete_tmp_<relative_path> instead of delete_tmp_<name> to avoid race condition
     /// when we try to remove two parts with the same name, but different relative paths,
@@ -589,7 +620,7 @@ void DataPartStorageOnDiskBase::remove(
         if (part_dir_without_slash.has_parent_path())
         {
             auto parent_path = part_dir_without_slash.parent_path();
-            if (parent_path == "detached")
+            if (parent_path == MergeTreeData::DETACHED_DIR_NAME)
                 throw Exception(
                     ErrorCodes::LOGICAL_ERROR,
                     "Trying to remove detached part {} with path {} in remove function. It shouldn't happen",
@@ -623,6 +654,15 @@ void DataPartStorageOnDiskBase::remove(
             }
         }
 
+        if (!disk->exists(from))
+        {
+            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;
+        }
+
         try
         {
             disk->moveDirectory(from, to);
@@ -672,7 +712,9 @@ void DataPartStorageOnDiskBase::remove(
             if (file_name.starts_with(proj_dir_name))
                 files_not_to_remove_for_projection.emplace(fs::path(file_name).filename());
 
-        LOG_DEBUG(log, "Will not remove files [{}] for projection {}", fmt::join(files_not_to_remove_for_projection, ", "), projection.name);
+        if (!files_not_to_remove_for_projection.empty())
+            LOG_DEBUG(
+                log, "Will not remove files [{}] for projection {}", fmt::join(files_not_to_remove_for_projection, ", "), projection.name);
 
         CanRemoveDescription proj_description
         {
@@ -722,7 +764,7 @@ void DataPartStorageOnDiskBase::clearDirectory(
     const CanRemoveDescription & can_remove_description,
     const MergeTreeDataPartChecksums & checksums,
     bool is_temp,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     auto disk = volume->getDisk();
     auto [can_remove_shared_data, names_not_to_remove] = can_remove_description;
@@ -751,8 +793,12 @@ void DataPartStorageOnDiskBase::clearDirectory(
         /// Remove each expected file in directory, then remove directory itself.
         RemoveBatchRequest request;
         for (const auto & file : names_to_remove)
-            request.emplace_back(fs::path(dir) / file);
+        {
+            if (isGinFile(file) && (!disk->isFile(fs::path(dir) / file)))
+                continue;
 
+            request.emplace_back(fs::path(dir) / file);
+        }
         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);
diff --git a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
index 339acce5953..75bf3d6f93c 100644
--- a/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
+++ b/src/Storages/MergeTree/DataPartStorageOnDiskBase.h
@@ -25,7 +25,7 @@ public:
     UInt64 calculateTotalSizeOnDisk() const override;
 
     /// Returns path to place detached part in or nullopt if we don't need to detach part (if it already exists and has the same content)
-    std::optional<String> getRelativePathForPrefix(Poco::Logger * log, const String & prefix, bool detached, bool broken) const override;
+    std::optional<String> getRelativePathForPrefix(LoggerPtr log, const String & prefix, bool detached, bool broken) const override;
 
     /// Returns true if detached part already exists and has the same content (compares checksums.txt and the list of files)
     bool looksLikeBrokenDetachedPartHasTheSameContent(const String & detached_part_path, std::optional<String> & original_checksums_content,
@@ -58,7 +58,9 @@ public:
         const ReadSettings & read_settings,
         bool make_temporary_hard_links,
         BackupEntries & backup_entries,
-        TemporaryFilesOnDisks * temp_dirs) const override;
+        TemporaryFilesOnDisks * temp_dirs,
+        bool is_projection_part,
+        bool allow_backup_broken_projection) const override;
 
     MutableDataPartStoragePtr freeze(
         const std::string & to,
@@ -74,14 +76,14 @@ public:
         const DiskPtr & dst_disk,
         const ReadSettings & read_settings,
         const WriteSettings & write_settings,
-        Poco::Logger * log,
+        LoggerPtr log,
         const std::function<void()> & cancellation_hook
         ) const override;
 
     void rename(
         std::string new_root_path,
         std::string new_part_dir,
-        Poco::Logger * log,
+        LoggerPtr log,
         bool remove_new_dir_if_exists,
         bool fsync_part_dir) override;
 
@@ -90,7 +92,7 @@ public:
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
         bool is_temp,
-        Poco::Logger * log) override;
+        LoggerPtr log) override;
 
     void changeRootPath(const std::string & from_root, const std::string & to_root) override;
     void createDirectories() override;
@@ -130,7 +132,7 @@ private:
         const CanRemoveDescription & can_remove_description,
         const MergeTreeDataPartChecksums & checksums,
         bool is_temp,
-        Poco::Logger * log);
+        LoggerPtr log);
 
     /// For names of expected data part files returns the actual names
     /// of files in filesystem to which data of these files is written.
diff --git a/src/Storages/MergeTree/DataPartsExchange.cpp b/src/Storages/MergeTree/DataPartsExchange.cpp
index 95b7c17ae78..cf7889c0aee 100644
--- a/src/Storages/MergeTree/DataPartsExchange.cpp
+++ b/src/Storages/MergeTree/DataPartsExchange.cpp
@@ -10,18 +10,18 @@
 #include <IO/S3Common.h>
 #include <Server/HTTP/HTMLForm.h>
 #include <Server/HTTP/HTTPServerResponse.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergedBlockOutputStream.h>
 #include <Storages/MergeTree/ReplicatedFetchList.h>
 #include <Storages/StorageReplicatedMergeTree.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/NetException.h>
+#include <Common/randomDelay.h>
 #include <Disks/IO/createReadBufferFromFileBase.h>
 #include <base/scope_guard.h>
 #include <Poco/Net/HTTPRequest.h>
 #include <boost/algorithm/string/join.hpp>
-#include <iterator>
 #include <base/sort.h>
 
 
@@ -44,10 +44,8 @@ namespace ErrorCodes
     extern const int CANNOT_WRITE_TO_OSTREAM;
     extern const int CHECKSUM_DOESNT_MATCH;
     extern const int INSECURE_PATH;
-    extern const int CORRUPTED_DATA;
     extern const int LOGICAL_ERROR;
     extern const int S3_ERROR;
-    extern const int INCORRECT_PART_TYPE;
     extern const int ZERO_COPY_REPLICATION_ERROR;
 }
 
@@ -99,7 +97,7 @@ struct ReplicatedFetchReadCallback
 
 Service::Service(StorageReplicatedMergeTree & data_)
     : data(data_)
-    , log(&Poco::Logger::get(data.getStorageID().getNameForLogs() + " (Replicated PartsService)"))
+    , log(getLogger(data.getStorageID().getNameForLogs() + " (Replicated PartsService)"))
 {}
 
 std::string Service::getId(const std::string & node_id) const
@@ -123,6 +121,10 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
 
     LOG_TRACE(log, "Sending part {}", part_name);
 
+    static const auto test_delay = data.getContext()->getConfigRef().getUInt64("test.data_parts_exchange.delay_before_sending_part_ms", 0);
+    if (test_delay)
+        randomDelayForMaxMilliseconds(test_delay, log, "DataPartsExchange: Before sending part");
+
     MergeTreeData::DataPartPtr part;
 
     auto report_broken_part = [&]()
@@ -191,8 +193,6 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
         }
 
         if (data_settings->allow_remote_fs_zero_copy_replication &&
-            /// In memory data part does not have metadata yet.
-            !isInMemoryPart(part) &&
             client_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_ZERO_COPY)
         {
             auto disk_type = part->getDataPartStorage().getDiskType();
@@ -205,11 +205,7 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
             }
         }
 
-        if (isInMemoryPart(part))
-            sendPartFromMemory(part, out, send_projections);
-        else
-            sendPartFromDisk(part, out, client_protocol_version, false, send_projections);
-
+        sendPartFromDisk(part, out, client_protocol_version, false, send_projections);
         data.addLastSentPart(part->info);
     }
     catch (const NetException &)
@@ -231,36 +227,6 @@ void Service::processQuery(const HTMLForm & params, ReadBuffer & /*body*/, Write
     }
 }
 
-void Service::sendPartFromMemory(
-    const MergeTreeData::DataPartPtr & part, WriteBuffer & out, bool send_projections)
-{
-    auto metadata_snapshot = data.getInMemoryMetadataPtr();
-    if (send_projections)
-    {
-        for (const auto & [name, projection] : part->getProjectionParts())
-        {
-            auto projection_sample_block = metadata_snapshot->projections.get(name).sample_block;
-            auto part_in_memory = asInMemoryPart(projection);
-            if (!part_in_memory)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Projection {} of part {} is not stored in memory", name, part->name);
-
-            writeStringBinary(name, out);
-            projection->checksums.write(out);
-            NativeWriter block_out(out, 0, projection_sample_block);
-            block_out.write(part_in_memory->block);
-        }
-    }
-
-    auto part_in_memory = asInMemoryPart(part);
-    if (!part_in_memory)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Part {} is not stored in memory", part->name);
-
-    NativeWriter block_out(out, 0, metadata_snapshot->getSampleBlock());
-    part->checksums.write(out);
-    block_out.write(part_in_memory->block);
-
-    data.getSendsThrottler()->add(part_in_memory->block.bytes());
-}
 
 MergeTreeData::DataPart::Checksums Service::sendPartFromDisk(
     const MergeTreeData::DataPartPtr & part,
@@ -415,7 +381,7 @@ MergeTreeData::DataPartPtr Service::findPart(const String & name)
 
 Fetcher::Fetcher(StorageReplicatedMergeTree & data_)
     : data(data_)
-    , log(&Poco::Logger::get(data.getStorageID().getNameForLogs() + " (Fetcher)"))
+    , log(getLogger(data.getStorageID().getNameForLogs() + " (Fetcher)"))
 {}
 
 std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelectedPart(
@@ -474,7 +440,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
 
     if (disk)
     {
-        LOG_TRACE(log, "Will fetch to disk {} with type {}", disk->getName(), toString(disk->getDataSourceDescription().type));
+        LOG_TRACE(log, "Will fetch to disk {} with type {}", disk->getName(), disk->getDataSourceDescription().toString());
         UInt64 revision = disk->getRevision();
         if (revision)
             uri.addQueryParameter("disk_revision", toString(revision));
@@ -489,18 +455,18 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
             Disks disks = data.getDisks();
             for (const auto & data_disk : disks)
             {
-                LOG_TRACE(log, "Checking disk {} with type {}", data_disk->getName(), toString(data_disk->getDataSourceDescription().type));
+                LOG_TRACE(log, "Checking disk {} with type {}", data_disk->getName(), data_disk->getDataSourceDescription().toString());
                 if (data_disk->supportZeroCopyReplication())
                 {
-                    LOG_TRACE(log, "Disk {} (with type {}) supports zero-copy replication", data_disk->getName(), toString(data_disk->getDataSourceDescription().type));
-                    capability.push_back(toString(data_disk->getDataSourceDescription().type));
+                    LOG_TRACE(log, "Disk {} (with type {}) supports zero-copy replication", data_disk->getName(), data_disk->getDataSourceDescription().toString());
+                    capability.push_back(data_disk->getDataSourceDescription().toString());
                 }
             }
         }
         else if (disk->supportZeroCopyReplication())
         {
-            LOG_TRACE(log, "Trying to fetch with zero copy replication, provided disk {} with type {}", disk->getName(), toString(disk->getDataSourceDescription().type));
-            capability.push_back(toString(disk->getDataSourceDescription().type));
+            LOG_TRACE(log, "Trying to fetch with zero copy replication, provided disk {} with type {}", disk->getName(), disk->getDataSourceDescription().toString());
+            capability.push_back(disk->getDataSourceDescription().toString());
         }
     }
 
@@ -526,14 +492,17 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
         creds.setPassword(password);
     }
 
-    std::unique_ptr<PooledReadWriteBufferFromHTTP> in = std::make_unique<PooledReadWriteBufferFromHTTP>(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        nullptr,
-        creds,
-        DBMS_DEFAULT_BUFFER_SIZE,
-        0, /* no redirects */
-        context->getCommonFetchesSessionFactory());
+    ReadSettings read_settings = context->getReadSettings();
+    /// Disable retries for fetches, this will be done by the engine itself.
+    read_settings.http_max_tries = 1;
+
+    auto in = BuilderRWBufferFromHTTP(uri)
+                  .withConnectionGroup(HTTPConnectionGroupType::HTTP)
+                  .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                  .withTimeouts(timeouts)
+                  .withSettings(read_settings)
+                  .withDelayInit(false)
+                  .create(creds);
 
     int server_protocol_version = parse<int>(in->getResponseCookie("server_protocol_version", "0"));
     String remote_fs_metadata = parse<String>(in->getResponseCookie("remote_fs_metadata", ""));
@@ -544,7 +513,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
     {
         for (const auto & disk_candidate : data.getDisks())
         {
-            if (toString(disk_candidate->getDataSourceDescription().type) == remote_fs_metadata)
+            if (disk_candidate->getDataSourceDescription().toString() == remote_fs_metadata)
             {
                 preffered_disk = disk_candidate;
                 break;
@@ -557,11 +526,13 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
     if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE)
     {
         readBinary(sum_files_size, *in);
+
         if (server_protocol_version >= REPLICATION_PROTOCOL_VERSION_WITH_PARTS_SIZE_AND_TTL_INFOS)
         {
             IMergeTreeDataPart::TTLInfos ttl_infos;
             String ttl_infos_string;
             readBinary(ttl_infos_string, *in);
+
             ReadBufferFromString ttl_infos_buffer(ttl_infos_string);
             assertString("ttl format version: 1\n", ttl_infos_buffer);
             ttl_infos.read(ttl_infos_buffer);
@@ -601,14 +572,15 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
     if (!disk)
     {
         disk = reservation->getDisk();
-        LOG_TRACE(log, "Disk for fetch is not provided, getting disk from reservation {} with type '{}'", disk->getName(), toString(disk->getDataSourceDescription().type));
+        LOG_TRACE(log, "Disk for fetch is not provided, getting disk from reservation {} with type '{}'", disk->getName(), disk->getDataSourceDescription().toString());
     }
     else
     {
-        LOG_TEST(log, "Disk for fetch is disk {} with type {}", disk->getName(), toString(disk->getDataSourceDescription().type));
+        LOG_TEST(log, "Disk for fetch is disk {} with type {}", disk->getName(), disk->getDataSourceDescription().toString());
     }
 
     UInt64 revision = parse<UInt64>(in->getResponseCookie("disk_revision", "0"));
+
     if (revision)
         disk->syncRevision(revision);
 
@@ -641,8 +613,6 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
                             remote_fs_metadata, fmt::join(capability, ", "));
         if (server_protocol_version < REPLICATION_PROTOCOL_VERSION_WITH_PARTS_ZERO_COPY)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Got 'remote_fs_metadata' cookie with old protocol version {}", server_protocol_version);
-        if (part_type == PartType::InMemory)
-            throw Exception(ErrorCodes::INCORRECT_PART_TYPE, "Got 'remote_fs_metadata' cookie for in-memory part");
 
         try
         {
@@ -701,7 +671,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
     }
 
     auto storage_id = data.getStorageID();
-    String new_part_path = part_type == PartType::InMemory ? "memory" : fs::path(data.getFullPathOnDisk(disk)) / part_name / "";
+    String new_part_path = fs::path(data.getFullPathOnDisk(disk)) / part_name / "";
     auto entry = data.getContext()->getReplicatedFetchList().insert(
         storage_id.getDatabaseName(), storage_id.getTableName(),
         part_info.partition_id, part_name, new_part_path,
@@ -709,22 +679,6 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
 
     in->setNextCallback(ReplicatedFetchReadCallback(*entry));
 
-    if (part_type == PartType::InMemory)
-    {
-        auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
-
-        auto data_part_storage = std::make_shared<DataPartStorageOnDiskFull>(
-            volume,
-            data.getRelativeDataPath(),
-            part_name);
-
-        return std::make_pair(downloadPartToMemory(
-            data_part_storage, part_name,
-            MergeTreePartInfo::fromPartName(part_name, data.format_version),
-            part_uuid, metadata_snapshot, context, *in,
-            projections, false, throttler), std::move(temporary_directory_lock));
-    }
-
     auto output_buffer_getter = [](IDataPartStorage & part_storage, const String & file_name, size_t file_size)
     {
         return part_storage.writeFile(file_name, std::min<UInt64>(file_size, DBMS_DEFAULT_BUFFER_SIZE), {});
@@ -736,70 +690,11 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> Fetcher::fetchSelected
         projections, throttler, sync),std::move(temporary_directory_lock));
 }
 
-MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToMemory(
-    MutableDataPartStoragePtr data_part_storage,
-    const String & part_name,
-    const MergeTreePartInfo & part_info,
-    const UUID & part_uuid,
-    const StorageMetadataPtr & metadata_snapshot,
-    ContextPtr context,
-    PooledReadWriteBufferFromHTTP & in,
-    size_t projections,
-    bool is_projection,
-    ThrottlerPtr throttler)
-{
-    auto new_data_part = std::make_shared<MergeTreeDataPartInMemory>(data, part_name, part_info, data_part_storage);
-
-    for (size_t i = 0; i < projections; ++i)
-    {
-        String projection_name;
-        readStringBinary(projection_name, in);
-
-        MergeTreePartInfo new_part_info("all", 0, 0, 0);
-        auto projection_part_storage = data_part_storage->getProjection(projection_name + ".proj");
-
-        auto new_projection_part = downloadPartToMemory(
-            projection_part_storage, projection_name,
-            new_part_info, part_uuid, metadata_snapshot,
-            context, in, 0, true, throttler);
-
-        new_data_part->addProjectionPart(projection_name, std::move(new_projection_part));
-    }
-
-    MergeTreeData::DataPart::Checksums checksums;
-    if (!checksums.read(in))
-        throw Exception(ErrorCodes::CORRUPTED_DATA, "Cannot deserialize checksums");
-
-    NativeReader block_in(in, 0);
-    auto block = block_in.read();
-    throttler->add(block.bytes());
-
-    new_data_part->setColumns(block.getNamesAndTypesList(), {}, metadata_snapshot->getMetadataVersion());
-
-    if (!is_projection)
-    {
-        new_data_part->version.setCreationTID(Tx::PrehistoricTID, nullptr);
-        new_data_part->uuid = part_uuid;
-        new_data_part->is_temp = true;
-        new_data_part->minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
-        new_data_part->partition.create(metadata_snapshot, block, 0, context);
-    }
-
-    MergedBlockOutputStream part_out(
-        new_data_part, metadata_snapshot, block.getNamesAndTypesList(), {}, {},
-        CompressionCodecFactory::instance().get("NONE", {}), NO_TRANSACTION_PTR);
-
-    part_out.write(block);
-    part_out.finalizePart(new_data_part, false);
-    new_data_part->checksums.checkEqual(checksums, /* have_uncompressed = */ true);
-
-    return new_data_part;
-}
 
 void Fetcher::downloadBaseOrProjectionPartToDisk(
     const String & replica_path,
     const MutableDataPartStoragePtr & data_part_storage,
-    PooledReadWriteBufferFromHTTP & in,
+    ReadWriteBufferFromHTTP & in,
     OutputBufferGetter output_buffer_getter,
     MergeTreeData::DataPart::Checksums & checksums,
     ThrottlerPtr throttler,
@@ -807,6 +702,8 @@ void Fetcher::downloadBaseOrProjectionPartToDisk(
 {
     size_t files;
     readBinary(files, in);
+    LOG_DEBUG(log, "Downloading files {}", files);
+
 
     std::vector<std::unique_ptr<WriteBufferFromFileBase>> written_files;
 
@@ -872,7 +769,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
     const String & tmp_prefix,
     DiskPtr disk,
     bool to_remote_disk,
-    PooledReadWriteBufferFromHTTP & in,
+    ReadWriteBufferFromHTTP & in,
     OutputBufferGetter output_buffer_getter,
     size_t projections,
     ThrottlerPtr throttler,
@@ -888,7 +785,7 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
         readStringBinary(part_id, in);
 
         if (!disk->supportZeroCopyReplication() || !disk->checkUniqueId(part_id))
-            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));
+            throw Exception(ErrorCodes::ZERO_COPY_REPLICATION_ERROR, "Part {} unique id {} doesn't exist on {} (with type {}).", part_name, part_id, disk->getName(), disk->getDataSourceDescription().toString());
 
         LOG_DEBUG(log, "Downloading part {} unique id {} metadata onto disk {}.", part_name, part_id, disk->getName());
         zero_copy_temporary_lock_holder = data.lockSharedDataTemporary(part_name, part_id, disk);
@@ -903,10 +800,10 @@ MergeTreeData::MutableDataPartPtr Fetcher::downloadPartToDisk(
         || part_name.empty()
         || std::string::npos != tmp_prefix.find_first_of("/.")
         || std::string::npos != part_name.find_first_of("/."))
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: tmp_prefix and part_name cannot be empty or contain '.' or '/' characters.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "`tmp_prefix` and `part_name` cannot be empty or contain '.' or '/' characters.");
 
     auto part_dir = tmp_prefix + part_name;
-    auto part_relative_path = data.getRelativeDataPath() + String(to_detached ? "detached/" : "");
+    auto part_relative_path = data.getRelativeDataPath() + String(to_detached ? MergeTreeData::DETACHED_DIR_NAME : "");
     auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk);
 
     /// Create temporary part storage to write sent files.
diff --git a/src/Storages/MergeTree/DataPartsExchange.h b/src/Storages/MergeTree/DataPartsExchange.h
index 07939a660a8..6d532037806 100644
--- a/src/Storages/MergeTree/DataPartsExchange.h
+++ b/src/Storages/MergeTree/DataPartsExchange.h
@@ -20,7 +20,7 @@ namespace DB
 {
 
 class StorageReplicatedMergeTree;
-class PooledReadWriteBufferFromHTTP;
+class ReadWriteBufferFromHTTP;
 
 namespace DataPartsExchange
 {
@@ -40,10 +40,6 @@ public:
 
 private:
     MergeTreeData::DataPartPtr findPart(const String & name);
-    void sendPartFromMemory(
-        const MergeTreeData::DataPartPtr & part,
-        WriteBuffer & out,
-        bool send_projections);
 
     MergeTreeData::DataPart::Checksums sendPartFromDisk(
         const MergeTreeData::DataPartPtr & part,
@@ -55,7 +51,7 @@ private:
     /// StorageReplicatedMergeTree::shutdown() waits for all parts exchange handlers to finish,
     /// so Service will never access dangling reference to storage
     StorageReplicatedMergeTree & data;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 /** Client for getting the parts from the table *MergeTree.
@@ -94,7 +90,7 @@ private:
     void downloadBaseOrProjectionPartToDisk(
         const String & replica_path,
         const MutableDataPartStoragePtr & data_part_storage,
-        PooledReadWriteBufferFromHTTP & in,
+        ReadWriteBufferFromHTTP & in,
         OutputBufferGetter output_buffer_getter,
         MergeTreeData::DataPart::Checksums & checksums,
         ThrottlerPtr throttler,
@@ -107,37 +103,25 @@ private:
         const String & tmp_prefix_,
         DiskPtr disk,
         bool to_remote_disk,
-        PooledReadWriteBufferFromHTTP & in,
+        ReadWriteBufferFromHTTP & in,
         OutputBufferGetter output_buffer_getter,
         size_t projections,
         ThrottlerPtr throttler,
         bool sync);
 
-    MergeTreeData::MutableDataPartPtr downloadPartToMemory(
-       MutableDataPartStoragePtr data_part_storage,
-       const String & part_name,
-       const MergeTreePartInfo & part_info,
-       const UUID & part_uuid,
-       const StorageMetadataPtr & metadata_snapshot,
-       ContextPtr context,
-       PooledReadWriteBufferFromHTTP & in,
-       size_t projections,
-       bool is_projection,
-       ThrottlerPtr throttler);
-
     MergeTreeData::MutableDataPartPtr downloadPartToDiskRemoteMeta(
        const String & part_name,
        const String & replica_path,
        bool to_detached,
        const String & tmp_prefix_,
        DiskPtr disk,
-       PooledReadWriteBufferFromHTTP & in,
+       ReadWriteBufferFromHTTP & in,
        size_t projections,
        MergeTreeData::DataPart::Checksums & checksums,
        ThrottlerPtr throttler);
 
     StorageReplicatedMergeTree & data;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
index 5741e11aa22..cbdeabffa97 100644
--- a/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
+++ b/src/Storages/MergeTree/EphemeralLockInZooKeeper.cpp
@@ -17,7 +17,7 @@ EphemeralLockInZooKeeper::EphemeralLockInZooKeeper(const String & path_prefix_,
     : zookeeper(zookeeper_), path_prefix(path_prefix_), path(path_), conflict_path(conflict_path_)
 {
     if (conflict_path.empty() && path.size() <= path_prefix.size())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: name of the main node is shorter than prefix.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Name of the main node is shorter than prefix.");
 }
 
 template <typename T>
@@ -64,7 +64,7 @@ std::optional<EphemeralLockInZooKeeper> createEphemeralLockInZooKeeper(
                 {
                     const String & failed_op_path = ops[failed_idx]->getPath();
                     LOG_DEBUG(
-                        &Poco::Logger::get("createEphemeralLockInZooKeeper"),
+                        getLogger("createEphemeralLockInZooKeeper"),
                         "Deduplication path already exists: deduplication_path={}",
                         failed_op_path);
                     return EphemeralLockInZooKeeper{"", nullptr, "", failed_op_path};
@@ -73,7 +73,7 @@ std::optional<EphemeralLockInZooKeeper> createEphemeralLockInZooKeeper(
             else if (responses[0]->error == Coordination::Error::ZNODEEXISTS)
             {
                 LOG_DEBUG(
-                    &Poco::Logger::get("createEphemeralLockInZooKeeper"),
+                    getLogger("createEphemeralLockInZooKeeper"),
                     "Deduplication path already exists: deduplication_path={}",
                     deduplication_path);
                 return {};
@@ -119,7 +119,7 @@ EphemeralLockInZooKeeper::~EphemeralLockInZooKeeper()
     {
         if (Coordination::isHardwareError(e.code))
             LOG_DEBUG(
-                &Poco::Logger::get("EphemeralLockInZooKeeper"),
+                getLogger("EphemeralLockInZooKeeper"),
                 "ZooKeeper communication error during unlock: code={} message='{}'",
                 e.code,
                 e.message());
@@ -130,7 +130,7 @@ EphemeralLockInZooKeeper::~EphemeralLockInZooKeeper()
             /// But it's possible that the multi op request can be executed on server side, and client will not get response due to network issue.
             /// In such case, assumeUnlocked() will not be called, so we'll get ZNONODE error here since the noded is already deleted
             LOG_DEBUG(
-                &Poco::Logger::get("EphemeralLockInZooKeeper"),
+                getLogger("EphemeralLockInZooKeeper"),
                 "ZooKeeper node was already deleted: code={} message={}",
                 e.code,
                 e.message());
@@ -168,7 +168,7 @@ EphemeralLocksInAllPartitions::EphemeralLocksInAllPartitions(
         Coordination::Error rc = zookeeper->tryMulti(lock_ops, lock_responses);
         if (rc == Coordination::Error::ZBADVERSION)
         {
-            LOG_TRACE(&Poco::Logger::get("EphemeralLocksInAllPartitions"), "Someone has inserted a block in a new partition while we were creating locks. Retry.");
+            LOG_TRACE(getLogger("EphemeralLocksInAllPartitions"), "Someone has inserted a block in a new partition while we were creating locks. Retry.");
             continue;
         }
         else if (rc != Coordination::Error::ZOK)
@@ -179,7 +179,7 @@ EphemeralLocksInAllPartitions::EphemeralLocksInAllPartitions(
             size_t prefix_size = block_numbers_path.size() + 1 + partitions[i].size() + 1 + path_prefix.size();
             const String & path = dynamic_cast<const Coordination::CreateResponse &>(*lock_responses[i]).path_created;
             if (path.size() <= prefix_size)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: name of the sequential node is shorter than prefix.");
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Name of the sequential node is shorter than prefix.");
 
             UInt64 number = parse<UInt64>(path.c_str() + prefix_size, path.size() - prefix_size);
             locks.push_back(LockInfo{path, partitions[i], number});
diff --git a/src/Storages/MergeTree/GinIndexStore.h b/src/Storages/MergeTree/GinIndexStore.h
index 3ed624995e5..ad14a142318 100644
--- a/src/Storages/MergeTree/GinIndexStore.h
+++ b/src/Storages/MergeTree/GinIndexStore.h
@@ -300,4 +300,9 @@ private:
     std::mutex mutex;
 };
 
+inline bool isGinFile(const String &file_name)
+{
+    return (file_name.ends_with(".gin_dict") || file_name.ends_with(".gin_post") || file_name.ends_with(".gin_seg") || file_name.ends_with(".gin_sid"));
+}
+
 }
diff --git a/src/Storages/MergeTree/IDataPartStorage.h b/src/Storages/MergeTree/IDataPartStorage.h
index afbe91a8a6d..d06d9791a53 100644
--- a/src/Storages/MergeTree/IDataPartStorage.h
+++ b/src/Storages/MergeTree/IDataPartStorage.h
@@ -151,12 +151,12 @@ public:
         const MergeTreeDataPartChecksums & checksums,
         std::list<ProjectionChecksums> projections,
         bool is_temp,
-        Poco::Logger * log) = 0;
+        LoggerPtr log) = 0;
 
     /// Get a name like 'prefix_partdir_tryN' which does not exist in a root dir.
     /// TODO: remove it.
     virtual std::optional<String> getRelativePathForPrefix(
-        Poco::Logger * log, const String & prefix, bool detached, bool broken) const = 0;
+        LoggerPtr log, const String & prefix, bool detached, bool broken) const = 0;
 
     /// Reset part directory, used for in-memory parts.
     /// TODO: remove it.
@@ -223,7 +223,9 @@ public:
         const ReadSettings & read_settings,
         bool make_temporary_hard_links,
         BackupEntries & backup_entries,
-        TemporaryFilesOnDisks * temp_dirs) const = 0;
+        TemporaryFilesOnDisks * temp_dirs,
+        bool is_projection_part,
+        bool allow_backup_broken_projection) const = 0;
 
     /// Creates hardlinks into 'to/dir_path' for every file in data part.
     /// Callback is called after hardlinks are created, but before 'delete-on-destroy.txt' marker is removed.
@@ -263,7 +265,7 @@ public:
         const DiskPtr & disk,
         const ReadSettings & read_settings,
         const WriteSettings & write_settings,
-        Poco::Logger * log,
+        LoggerPtr log,
         const std::function<void()> & cancellation_hook
         ) const = 0;
 
@@ -314,7 +316,7 @@ public:
     virtual void rename(
         std::string new_root_path,
         std::string new_part_dir,
-        Poco::Logger * log,
+        LoggerPtr log,
         bool remove_new_dir_if_exists,
         bool fsync_part_dir) = 0;
 
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index 87f23b0da2a..441437855ab 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -2,38 +2,41 @@
 #include <Storages/MergeTree/IDataPartStorage.h>
 #include <base/types.h>
 
+#include <exception>
 #include <optional>
-#include <boost/algorithm/string/join.hpp>
 #include <string_view>
+#include <Compression/CompressedReadBuffer.h>
+#include <Compression/getCompressionCodecForFile.h>
 #include <Core/Defines.h>
-#include <IO/HashingWriteBuffer.h>
+#include <Core/NamesAndTypes.h>
+#include <Core/SettingsEnums.h>
+#include <DataTypes/DataTypeAggregateFunction.h>
+#include <DataTypes/NestedUtils.h>
 #include <IO/HashingReadBuffer.h>
+#include <IO/HashingWriteBuffer.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/WriteHelpers.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#include <Storages/MergeTree/localBackup.h>
-#include <Storages/MergeTree/checkDataPart.h>
-#include <Storages/StorageReplicatedMergeTree.h>
-#include <Storages/MergeTree/PartMetadataManagerOrdinary.h>
-#include <Core/NamesAndTypes.h>
-#include <Storages/ColumnsDescription.h>
-#include <Compression/CompressedReadBuffer.h>
-#include <Common/StringUtils/StringUtils.h>
-#include <Common/escapeForFileName.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/FieldVisitorsAccurateComparison.h>
-#include <Common/MemoryTrackerBlockerInThread.h>
-#include <base/JSON.h>
-#include <Common/logger_useful.h>
-#include <Compression/getCompressionCodecForFile.h>
-#include <Parsers/parseQuery.h>
-#include <Parsers/queryToString.h>
-#include <Parsers/ExpressionElementParsers.h>
-#include <DataTypes/NestedUtils.h>
-#include <DataTypes/DataTypeAggregateFunction.h>
 #include <Interpreters/MergeTreeTransaction.h>
 #include <Interpreters/TransactionLog.h>
+#include <Parsers/ExpressionElementParsers.h>
+#include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/MergeTree/PartMetadataManagerOrdinary.h>
+#include <Storages/MergeTree/checkDataPart.h>
+#include <Storages/MergeTree/localBackup.h>
+#include <Storages/StorageReplicatedMergeTree.h>
+#include <base/JSON.h>
+#include <boost/algorithm/string/join.hpp>
+#include <Common/CurrentMetrics.h>
+#include <Common/Exception.h>
+#include <Common/FieldVisitorsAccurateComparison.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
+#include <Common/StringUtils/StringUtils.h>
+#include <Common/escapeForFileName.h>
+#include <Common/logger_useful.h>
 
 #include <Disks/IO/CachedOnDiskReadBufferFromFile.h>
 
@@ -51,7 +54,6 @@ namespace CurrentMetrics
 
     extern const Metric PartsWide;
     extern const Metric PartsCompact;
-    extern const Metric PartsInMemory;
 }
 
 namespace DB
@@ -77,8 +79,8 @@ void IMergeTreeDataPart::MinMaxIndex::load(const MergeTreeData & data, const Par
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
     const auto & partition_key = metadata_snapshot->getPartitionKey();
 
-    auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
-    auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
+    auto minmax_column_names = MergeTreeData::getMinMaxColumnsNames(partition_key);
+    auto minmax_column_types = MergeTreeData::getMinMaxColumnsTypes(partition_key);
     size_t minmax_idx_size = minmax_column_types.size();
 
     hyperrectangle.reserve(minmax_idx_size);
@@ -110,8 +112,8 @@ IMergeTreeDataPart::MinMaxIndex::WrittenFiles IMergeTreeDataPart::MinMaxIndex::s
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
     const auto & partition_key = metadata_snapshot->getPartitionKey();
 
-    auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
-    auto minmax_column_types = data.getMinMaxColumnsTypes(partition_key);
+    auto minmax_column_names = MergeTreeData::getMinMaxColumnsNames(partition_key);
+    auto minmax_column_types = MergeTreeData::getMinMaxColumnsTypes(partition_key);
 
     return store(minmax_column_names, minmax_column_types, part_storage, out_checksums);
 }
@@ -202,7 +204,7 @@ void IMergeTreeDataPart::MinMaxIndex::appendFiles(const MergeTreeData & data, St
 {
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
     const auto & partition_key = metadata_snapshot->getPartitionKey();
-    auto minmax_column_names = data.getMinMaxColumnsNames(partition_key);
+    auto minmax_column_names = MergeTreeData::getMinMaxColumnsNames(partition_key);
     size_t minmax_idx_size = minmax_column_names.size();
     for (size_t i = 0; i < minmax_idx_size; ++i)
     {
@@ -278,9 +280,6 @@ static void incrementTypeMetric(MergeTreeDataPartType type)
         case MergeTreeDataPartType::Compact:
             CurrentMetrics::add(CurrentMetrics::PartsCompact);
             return;
-        case MergeTreeDataPartType::InMemory:
-            CurrentMetrics::add(CurrentMetrics::PartsInMemory);
-            return;
         case MergeTreeDataPartType::Unknown:
             return;
     }
@@ -296,9 +295,6 @@ static void decrementTypeMetric(MergeTreeDataPartType type)
         case MergeTreeDataPartType::Compact:
             CurrentMetrics::sub(CurrentMetrics::PartsCompact);
             return;
-        case MergeTreeDataPartType::InMemory:
-            CurrentMetrics::sub(CurrentMetrics::PartsInMemory);
-            return;
         case MergeTreeDataPartType::Unknown:
             return;
     }
@@ -313,13 +309,13 @@ IMergeTreeDataPart::IMergeTreeDataPart(
     const IMergeTreeDataPart * parent_part_)
     : DataPartStorageHolder(data_part_storage_)
     , storage(storage_)
-    , mutable_name(name_)
     , name(mutable_name)
     , info(info_)
     , index_granularity_info(storage_, part_type_)
     , part_type(part_type_)
     , parent_part(parent_part_)
     , parent_part_name(parent_part ? parent_part->name : "")
+    , mutable_name(name_)
 {
     if (parent_part)
     {
@@ -342,6 +338,27 @@ IMergeTreeDataPart::~IMergeTreeDataPart()
     decrementTypeMetric(part_type);
 }
 
+
+const IMergeTreeDataPart::Index & IMergeTreeDataPart::getIndex() const
+{
+    std::scoped_lock lock(index_mutex);
+    if (!index_loaded)
+        loadIndex();
+    index_loaded = true;
+    return TSA_SUPPRESS_WARNING_FOR_READ(index); /// The variable is guaranteed to be unchanged after return.
+}
+
+
+void IMergeTreeDataPart::setIndex(Columns index_)
+{
+    std::scoped_lock lock(index_mutex);
+    if (!index.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "The index of data part can be set only once");
+    index = std::move(index_);
+    index_loaded = true;
+}
+
+
 void IMergeTreeDataPart::setName(const String & new_name)
 {
     mutable_name = new_name;
@@ -548,6 +565,7 @@ void IMergeTreeDataPart::removeIfNeeded()
 
 UInt64 IMergeTreeDataPart::getIndexSizeInBytes() const
 {
+    std::scoped_lock lock(index_mutex);
     UInt64 res = 0;
     for (const ColumnPtr & column : index)
         res += column->byteSize();
@@ -556,6 +574,7 @@ UInt64 IMergeTreeDataPart::getIndexSizeInBytes() const
 
 UInt64 IMergeTreeDataPart::getIndexSizeInAllocatedBytes() const
 {
+    std::scoped_lock lock(index_mutex);
     UInt64 res = 0;
     for (const ColumnPtr & column : index)
         res += column->allocatedBytes();
@@ -593,6 +612,15 @@ UInt64 IMergeTreeDataPart::getMarksCount() const
     return index_granularity.getMarksCount();
 }
 
+UInt64 IMergeTreeDataPart::getExistingBytesOnDisk() const
+{
+    if (storage.getSettings()->exclude_deleted_rows_for_part_size_in_merge && supportLightweightDeleteMutate() && hasLightweightDelete()
+        && existing_rows_count.has_value() && existing_rows_count.value() < rows_count && rows_count > 0)
+        return bytes_on_disk * existing_rows_count.value() / rows_count;
+    else
+        return bytes_on_disk;
+}
+
 size_t IMergeTreeDataPart::getFileSizeOrZero(const String & file_name) const
 {
     auto checksum = checksums.files.find(file_name);
@@ -669,26 +697,34 @@ void IMergeTreeDataPart::loadColumnsChecksumsIndexes(bool require_columns_checks
         loadColumns(require_columns_checksums);
         loadChecksums(require_columns_checksums);
         loadIndexGranularity();
+
+        if (!storage.getSettings()->primary_key_lazy_load)
+            getIndex();
+
         calculateColumnsAndSecondaryIndicesSizesOnDisk();
-        loadIndex(); /// Must be called after loadIndexGranularity as it uses the value of `index_granularity`
         loadRowsCount(); /// Must be called after loadIndexGranularity() as it uses the value of `index_granularity`.
+        loadExistingRowsCount(); /// Must be called after loadRowsCount() as it uses the value of `rows_count`.
         loadPartitionAndMinMaxIndex();
+        bool has_broken_projections = false;
         if (!parent_part)
         {
             loadTTLInfos();
-            loadProjections(require_columns_checksums, check_consistency, false /* if_not_loaded */);
+            loadProjections(require_columns_checksums, check_consistency, has_broken_projections, false /* if_not_loaded */);
         }
 
-        if (check_consistency)
+        if (check_consistency && !has_broken_projections)
             checkConsistency(require_columns_checksums);
 
         loadDefaultCompressionCodec();
     }
     catch (...)
     {
+        /// Don't scare people with broken part error
+        if (!isRetryableException(std::current_exception()))
+            LOG_ERROR(storage.log, "Part {} is broken and need manual correction", getDataPartStorage().getFullPath());
+
         // There could be conditions that data part to be loaded is broken, but some of meta infos are already written
         // into meta data before exception, need to clean them all.
-        LOG_ERROR(storage.log, "Part {} is broken and need manual correction", getDataPartStorage().getFullPath());
         metadata_manager->deleteAll(/*include_projection*/ true);
         metadata_manager->assertAllDeleted(/*include_projection*/ true);
         throw;
@@ -741,7 +777,7 @@ void IMergeTreeDataPart::addProjectionPart(
     projection_parts[projection_name] = std::move(projection_part);
 }
 
-void IMergeTreeDataPart::loadProjections(bool require_columns_checksums, bool check_consistency, bool if_not_loaded)
+void IMergeTreeDataPart::loadProjections(bool require_columns_checksums, bool check_consistency, bool & has_broken_projection, bool if_not_loaded)
 {
     auto metadata_snapshot = storage.getInMemoryMetadataPtr();
     for (const auto & projection : metadata_snapshot->projections)
@@ -758,10 +794,36 @@ void IMergeTreeDataPart::loadProjections(bool require_columns_checksums, bool ch
             else
             {
                 auto part = getProjectionPartBuilder(projection.name).withPartFormatFromDisk().build();
-                part->loadColumnsChecksumsIndexes(require_columns_checksums, check_consistency);
+
+                try
+                {
+                    part->loadColumnsChecksumsIndexes(require_columns_checksums, check_consistency);
+                }
+                catch (...)
+                {
+                    if (isRetryableException(std::current_exception()))
+                        throw;
+
+                    auto message = getCurrentExceptionMessage(true);
+                    LOG_WARNING(storage.log, "Cannot load projection {}, "
+                                "will consider it broken. Reason: {}", projection.name, message);
+
+                    has_broken_projection = true;
+                    part->setBrokenReason(message, getCurrentExceptionCode());
+                }
+
                 addProjectionPart(projection.name, std::move(part));
             }
         }
+        else if (check_consistency && checksums.has(path))
+        {
+            auto part = getProjectionPartBuilder(projection.name).withPartFormatFromDisk().build();
+            part->setBrokenReason(
+                "Projection directory " + path + " does not exist while loading projections. Stacktrace: " + StackTrace().toString(),
+                ErrorCodes::NO_FILE_IN_DATA_PART);
+            addProjectionPart(projection.name, std::move(part));
+            has_broken_projection = true;
+        }
     }
 }
 
@@ -776,8 +838,11 @@ void IMergeTreeDataPart::appendFilesOfIndexGranularity(Strings & /* files */) co
 {
 }
 
-void IMergeTreeDataPart::loadIndex()
+void IMergeTreeDataPart::loadIndex() const
 {
+    /// Memory for index must not be accounted as memory usage for query, because it belongs to a table.
+    MemoryTrackerBlockerInThread temporarily_disable_memory_tracker;
+
     /// It can be empty in case of mutations
     if (!index_granularity.isInitialized())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Index granularity is not loaded before index loading");
@@ -812,8 +877,30 @@ void IMergeTreeDataPart::loadIndex()
             for (size_t j = 0; j < key_size; ++j)
                 key_serializations[j]->deserializeBinary(*loaded_index[j], *index_file, {});
 
+        /// Cut useless suffix columns, if necessary.
+        Float64 ratio_to_drop_suffix_columns = storage.getSettings()->primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns;
+        if (key_size > 1 && ratio_to_drop_suffix_columns > 0 && ratio_to_drop_suffix_columns < 1)
+        {
+            chassert(marks_count > 0);
+            for (size_t j = 0; j < key_size - 1; ++j)
+            {
+                size_t num_changes = 0;
+                for (size_t i = 1; i < marks_count; ++i)
+                    if (0 != loaded_index[j]->compareAt(i, i - 1, *loaded_index[j], 0))
+                        ++num_changes;
+
+                if (static_cast<Float64>(num_changes) / marks_count >= ratio_to_drop_suffix_columns)
+                {
+                    key_size = j + 1;
+                    loaded_index.resize(key_size);
+                    break;
+                }
+            }
+        }
+
         for (size_t i = 0; i < key_size; ++i)
         {
+            loaded_index[i]->shrinkToFit();
             loaded_index[i]->protect();
             if (loaded_index[i]->size() != marks_count)
                 throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read all data from index file {}(expected size: "
@@ -900,7 +987,7 @@ void IMergeTreeDataPart::loadDefaultCompressionCodec()
         try
         {
             ParserCodec codec_parser;
-            auto codec_ast = parseQuery(codec_parser, codec_line.data() + buf.getPosition(), codec_line.data() + codec_line.length(), "codec parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+            auto codec_ast = parseQuery(codec_parser, codec_line.data() + buf.getPosition(), codec_line.data() + codec_line.length(), "codec parser", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
             default_codec = CompressionCodecFactory::instance().get(codec_ast, {});
         }
         catch (const DB::Exception & ex)
@@ -1126,7 +1213,7 @@ void IMergeTreeDataPart::appendFilesOfPartitionAndMinMaxIndex(Strings & files) c
         return;
 
     if (!parent_part)
-        partition.appendFiles(storage, files);
+        MergeTreePartition::appendFiles(storage, files);
 
     if (!parent_part)
         minmax_idx->appendFiles(storage, files);
@@ -1156,7 +1243,8 @@ void IMergeTreeDataPart::loadChecksums(bool require)
         /// Check the data while we are at it.
         LOG_WARNING(storage.log, "Checksums for part {} not found. Will calculate them from data on disk.", name);
 
-        checksums = checkDataPart(shared_from_this(), false);
+        bool noop;
+        checksums = checkDataPart(shared_from_this(), false, noop, /* is_cancelled */[]{ return false; }, /* throw_on_broken_projection */false);
         writeChecksums(checksums, {});
 
         bytes_on_disk = checksums.getTotalSizeOnDisk();
@@ -1287,6 +1375,88 @@ void IMergeTreeDataPart::loadRowsCount()
     }
 }
 
+void IMergeTreeDataPart::loadExistingRowsCount()
+{
+    if (existing_rows_count.has_value())
+        return;
+
+    if (!rows_count || !supportLightweightDeleteMutate() || !hasLightweightDelete()
+        || !storage.getSettings()->exclude_deleted_rows_for_part_size_in_merge
+        || !storage.getSettings()->load_existing_rows_count_for_old_parts)
+        existing_rows_count = rows_count;
+    else
+        existing_rows_count = readExistingRowsCount();
+}
+
+UInt64 IMergeTreeDataPart::readExistingRowsCount()
+{
+    const size_t total_mark = getMarksCount();
+    if (!total_mark)
+        return rows_count;
+
+    NamesAndTypesList cols;
+    cols.emplace_back(RowExistsColumn::name, RowExistsColumn::type);
+
+    StorageMetadataPtr metadata_ptr = storage.getInMemoryMetadataPtr();
+    StorageSnapshotPtr storage_snapshot_ptr = std::make_shared<StorageSnapshot>(storage, metadata_ptr);
+
+    MergeTreeReaderPtr reader = getReader(
+        cols,
+        storage_snapshot_ptr,
+        MarkRanges{MarkRange(0, total_mark)},
+        /*virtual_fields=*/ {},
+        /*uncompressed_cache=*/{},
+        storage.getContext()->getMarkCache().get(),
+        std::make_shared<AlterConversions>(),
+        MergeTreeReaderSettings{},
+        ValueSizeMap{},
+        ReadBufferFromFileBase::ProfileCallback{});
+
+    if (!reader)
+    {
+        LOG_WARNING(storage.log, "Create reader failed while reading existing rows count");
+        return rows_count;
+    }
+
+    size_t current_mark = 0;
+    bool continue_reading = false;
+    size_t current_row = 0;
+    size_t existing_count = 0;
+
+    while (current_row < rows_count)
+    {
+        size_t rows_to_read = index_granularity.getMarkRows(current_mark);
+        continue_reading = (current_mark != 0);
+
+        Columns result;
+        result.resize(1);
+
+        size_t rows_read = reader->readRows(current_mark, total_mark, continue_reading, rows_to_read, result);
+        if (!rows_read)
+        {
+            LOG_WARNING(storage.log, "Part {} has lightweight delete, but _row_exists column not found", name);
+            return rows_count;
+        }
+
+        current_row += rows_read;
+        current_mark += (rows_to_read == rows_read);
+
+        const ColumnUInt8 * row_exists_col = typeid_cast<const ColumnUInt8 *>(result[0].get());
+        if (!row_exists_col)
+        {
+            LOG_WARNING(storage.log, "Part {} _row_exists column type is not UInt8", name);
+            return rows_count;
+        }
+
+        for (UInt8 row_exists : row_exists_col->getData())
+            if (row_exists)
+                existing_count++;
+    }
+
+    LOG_DEBUG(storage.log, "Part {} existing_rows_count = {}", name, existing_count);
+    return existing_count;
+}
+
 void IMergeTreeDataPart::appendFilesOfRowsCount(Strings & files)
 {
     files.push_back("count.txt");
@@ -1418,6 +1588,11 @@ bool IMergeTreeDataPart::supportLightweightDeleteMutate() const
         parent_part == nullptr && projection_parts.empty();
 }
 
+bool IMergeTreeDataPart::hasLightweightDelete() const
+{
+    return columns.contains(RowExistsColumn::name);
+}
+
 void IMergeTreeDataPart::assertHasVersionMetadata(MergeTreeTransaction * txn) const
 {
     TransactionID expected_tid = txn ? txn->tid : Tx::PrehistoricTID;
@@ -1604,10 +1779,6 @@ 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;
@@ -1663,7 +1834,7 @@ try
 
     metadata_manager->deleteAll(true);
     metadata_manager->assertAllDeleted(true);
-    getDataPartStorage().rename(to.parent_path(), to.filename(), storage.log, remove_new_dir_if_exists, fsync_dir);
+    getDataPartStorage().rename(to.parent_path(), to.filename(), storage.log.load(), remove_new_dir_if_exists, fsync_dir);
     metadata_manager->updateAll(true);
 
     auto new_projection_root_path = to.string();
@@ -1673,7 +1844,7 @@ try
 }
 catch (...)
 {
-    if (startsWith(new_relative_path, "detached/"))
+    if (startsWith(new_relative_path, fs::path(MergeTreeData::DETACHED_DIR_NAME) / ""))
     {
         // Don't throw when the destination is to the detached folder. It might be able to
         // recover in some cases, such as fetching parts into multi-disks while some of the
@@ -1758,7 +1929,7 @@ void IMergeTreeDataPart::remove()
     }
 
     bool is_temporary_part = is_temp || state == MergeTreeDataPartState::Temporary;
-    getDataPartStorage().remove(std::move(can_remove_callback), checksums, projection_checksums, is_temporary_part, storage.log);
+    getDataPartStorage().remove(std::move(can_remove_callback), checksums, projection_checksums, is_temporary_part, storage.log.load());
 }
 
 std::optional<String> IMergeTreeDataPart::getRelativePathForPrefix(const String & prefix, bool detached, bool broken) const
@@ -1775,7 +1946,7 @@ std::optional<String> IMergeTreeDataPart::getRelativePathForPrefix(const String
     if (detached && parent_part)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot detach projection");
 
-    return getDataPartStorage().getRelativePathForPrefix(storage.log, prefix, detached, broken);
+    return getDataPartStorage().getRelativePathForPrefix(storage.log.load(), prefix, detached, broken);
 }
 
 std::optional<String> IMergeTreeDataPart::getRelativePathForDetachedPart(const String & prefix, bool broken) const
@@ -1786,7 +1957,7 @@ std::optional<String> IMergeTreeDataPart::getRelativePathForDetachedPart(const S
                                        DetachedPartInfo::DETACH_REASONS.end(),
                                        prefix) != DetachedPartInfo::DETACH_REASONS.end());
     if (auto path = getRelativePathForPrefix(prefix, /* detached */ true, broken))
-        return "detached/" + *path;
+        return fs::path(MergeTreeData::DETACHED_DIR_NAME) / *path;
     return {};
 }
 
@@ -1841,7 +2012,7 @@ MutableDataPartStoragePtr IMergeTreeDataPart::makeCloneOnDisk(
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Can not clone data part {} to empty directory.", name);
 
     String path_to_clone = fs::path(storage.relative_data_path) / directory_name / "";
-    return getDataPartStorage().clonePart(path_to_clone, getDataPartStorage().getPartDirectory(), disk, read_settings, write_settings, storage.log, cancellation_hook);
+    return getDataPartStorage().clonePart(path_to_clone, getDataPartStorage().getPartDirectory(), disk, read_settings, write_settings, storage.log.load(), cancellation_hook);
 }
 
 UInt64 IMergeTreeDataPart::getIndexSizeFromFile() const
@@ -1890,7 +2061,7 @@ void IMergeTreeDataPart::checkConsistencyBase() const
 
             if (!isEmpty() && !parent_part)
             {
-                for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
+                for (const String & col_name : MergeTreeData::getMinMaxColumnsNames(partition_key))
                 {
                     if (!checksums.files.contains("minmax_" + escapeForFileName(col_name) + ".idx"))
                         throw Exception(ErrorCodes::NO_FILE_IN_DATA_PART, "No minmax idx file checksum for column {}", col_name);
@@ -1930,14 +2101,46 @@ void IMergeTreeDataPart::checkConsistencyBase() const
 
             if (!parent_part)
             {
-                for (const String & col_name : storage.getMinMaxColumnsNames(partition_key))
+                for (const String & col_name : MergeTreeData::getMinMaxColumnsNames(partition_key))
                     check_file_not_empty("minmax_" + escapeForFileName(col_name) + ".idx");
             }
         }
     }
 }
 
-void IMergeTreeDataPart::checkConsistency(bool /* require_part_metadata */) const
+void IMergeTreeDataPart::checkConsistency(bool require_part_metadata) const
+{
+    try
+    {
+        checkConsistencyBase();
+        doCheckConsistency(require_part_metadata);
+    }
+    catch (Exception & e)
+    {
+        const auto part_state = fmt::format(
+            "state: {}, is_unexpected_local_part: {}, is_frozen: {}, is_duplicate: {}",
+            stateString(),
+            is_unexpected_local_part,
+            is_frozen,
+            is_duplicate,
+            is_temp);
+
+        const auto debug_info = fmt::format(
+            "columns: {}, getMarkSizeInBytes: {}, getMarksCount: {}, index_granularity_info: [{}], index_granularity: [{}], "
+            "part_state: [{}]",
+            columns.toString(),
+            index_granularity_info.getMarkSizeInBytes(columns.size()),
+            index_granularity.getMarksCount(),
+            index_granularity_info.describe(),
+            index_granularity.describe(),
+            part_state);
+
+        e.addMessage(debug_info);
+        e.rethrow();
+    }
+}
+
+void IMergeTreeDataPart::doCheckConsistency(bool /* require_part_metadata */) const
 {
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Method 'checkConsistency' is not implemented for part with type {}", getType().toString());
 }
@@ -2163,6 +2366,32 @@ std::optional<String> IMergeTreeDataPart::getStreamNameForColumn(
     return getStreamNameOrHash(stream_name, extension, storage_);
 }
 
+void IMergeTreeDataPart::markProjectionPartAsBroken(const String & projection_name, const String & message, int code) const
+{
+    auto it = projection_parts.find(projection_name);
+    if (it == projection_parts.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "There is no projection part '{}'", projection_name);
+    it->second->setBrokenReason(message, code);
+}
+
+bool IMergeTreeDataPart::hasBrokenProjection(const String & projection_name) const
+{
+    auto it = projection_parts.find(projection_name);
+    if (it == projection_parts.end())
+        return false;
+    return it->second->is_broken;
+}
+
+void IMergeTreeDataPart::setBrokenReason(const String & message, int code) const
+{
+    std::lock_guard lock(broken_reason_mutex);
+    if (is_broken)
+        return;
+    is_broken = true;
+    exception = message;
+    exception_code = code;
+}
+
 bool isCompactPart(const MergeTreeDataPartPtr & data_part)
 {
     return (data_part && data_part->getType() == MergeTreeDataPartType::Compact);
@@ -2173,11 +2402,6 @@ bool isWidePart(const MergeTreeDataPartPtr & data_part)
     return (data_part && data_part->getType() == MergeTreeDataPartType::Wide);
 }
 
-bool isInMemoryPart(const MergeTreeDataPartPtr & data_part)
-{
-    return (data_part && data_part->getType() == MergeTreeDataPartType::InMemory);
-}
-
 std::optional<std::string> getIndexExtensionFromFilesystem(const IDataPartStorage & data_part_storage)
 {
     if (data_part_storage.exists())
diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.h b/src/Storages/MergeTree/IMergeTreeDataPart.h
index 640a1f1d0a3..7519980a7a3 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.h
@@ -1,11 +1,12 @@
 #pragma once
 
+#include <unordered_map>
 #include <IO/WriteSettings.h>
 #include <Core/Block.h>
 #include <base/types.h>
+#include <base/defines.h>
 #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>
@@ -47,6 +48,8 @@ class MarkCache;
 class UncompressedCache;
 class MergeTreeTransaction;
 
+struct MergeTreeReadTaskInfo;
+using MergeTreeReadTaskInfoPtr = std::shared_ptr<const MergeTreeReadTaskInfo>;
 
 enum class DataPartRemovalState
 {
@@ -68,6 +71,7 @@ public:
     using Checksums = MergeTreeDataPartChecksums;
     using Checksum = MergeTreeDataPartChecksums::Checksum;
     using ValueSizeMap = std::map<std::string, double>;
+    using VirtualFields = std::unordered_map<String, Field>;
 
     using MergeTreeReaderPtr = std::unique_ptr<IMergeTreeReader>;
     using MergeTreeWriterPtr = std::unique_ptr<IMergeTreeDataPartWriter>;
@@ -75,6 +79,7 @@ public:
     using ColumnSizeByName = std::unordered_map<std::string, ColumnSize>;
     using NameToNumber = std::unordered_map<std::string, size_t>;
 
+    using Index = Columns;
     using IndexSizeByName = std::unordered_map<std::string, ColumnSize>;
 
     using Type = MergeTreeDataPartType;
@@ -93,6 +98,7 @@ public:
         const NamesAndTypesList & columns_,
         const StorageSnapshotPtr & storage_snapshot,
         const MarkRanges & mark_ranges,
+        const VirtualFields & virtual_fields,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
         const AlterConversionsPtr & alter_conversions,
@@ -212,11 +218,6 @@ public:
 
     const MergeTreeData & storage;
 
-private:
-    String mutable_name;
-    mutable MergeTreeDataPartState state{MergeTreeDataPartState::Temporary};
-
-public:
     const String & name;    // const ref to private mutable_name
     MergeTreePartInfo info;
 
@@ -229,6 +230,9 @@ public:
 
     size_t rows_count = 0;
 
+    /// Existing rows count (excluding lightweight deleted rows)
+    std::optional<size_t> existing_rows_count;
+
     time_t modification_time = 0;
     /// When the part is removed from the working set. Changes once.
     mutable std::atomic<time_t> remove_time { std::numeric_limits<time_t>::max() };
@@ -261,6 +265,12 @@ public:
     /// Frozen by ALTER TABLE ... FREEZE ... It is used for information purposes in system.parts table.
     mutable std::atomic<bool> is_frozen {false};
 
+    /// If it is a projection part, it can be broken sometimes.
+    mutable std::atomic<bool> is_broken {false};
+    mutable std::string exception;
+    mutable int exception_code = 0;
+    mutable std::mutex broken_reason_mutex;
+
     /// Indicates that the part was marked Outdated by PartCheckThread because the part was not committed to ZooKeeper
     mutable bool is_unexpected_local_part = false;
 
@@ -303,12 +313,6 @@ public:
     /// Throws an exception if state of the part is not in affordable_states
     void assertState(const std::initializer_list<MergeTreeDataPartState> & affordable_states) const;
 
-    /// Primary key (correspond to primary.idx file).
-    /// Always loaded in RAM. Contains each index_granularity-th value of primary key tuple.
-    /// Note that marks (also correspond to primary key) is not always in RAM, but cached. See MarkCache.h.
-    using Index = Columns;
-    Index index;
-
     MergeTreePartition partition;
 
     /// Amount of rows between marks
@@ -363,6 +367,9 @@ public:
     /// Version of part metadata (columns, pk and so on). Managed properly only for replicated merge tree.
     int32_t metadata_version;
 
+    const Index & getIndex() const;
+    void setIndex(Columns index_);
+
     /// For data in RAM ('index')
     UInt64 getIndexSizeInBytes() const;
     UInt64 getIndexSizeInAllocatedBytes() const;
@@ -374,6 +381,10 @@ public:
     void setBytesOnDisk(UInt64 bytes_on_disk_) { bytes_on_disk = bytes_on_disk_; }
     void setBytesUncompressedOnDisk(UInt64 bytes_uncompressed_on_disk_) { bytes_uncompressed_on_disk = bytes_uncompressed_on_disk_; }
 
+    /// Returns estimated size of existing rows if setting exclude_deleted_rows_for_part_size_in_merge is true
+    /// Otherwise returns bytes_on_disk
+    UInt64 getExistingBytesOnDisk() const;
+
     size_t getFileSizeOrZero(const String & file_name) const;
     auto getFilesChecksums() const { return checksums.files; }
 
@@ -423,9 +434,16 @@ public:
 
     void addProjectionPart(const String & projection_name, std::shared_ptr<IMergeTreeDataPart> && projection_part);
 
+    void markProjectionPartAsBroken(const String & projection_name, const String & message, int code) const;
+
     bool hasProjection(const String & projection_name) const { return projection_parts.contains(projection_name); }
 
-    void loadProjections(bool require_columns_checksums, bool check_consistency, bool if_not_loaded = false);
+    bool hasBrokenProjection(const String & projection_name) const;
+
+    /// Return true, if all projections were loaded successfully and none was marked as broken.
+    void loadProjections(bool require_columns_checksums, bool check_consistency, bool & has_broken_projection, bool if_not_loaded = false);
+
+    void setBrokenReason(const String & message, int code) const;
 
     /// Return set of metadata file names without checksums. For example,
     /// columns.txt or checksums.txt itself.
@@ -498,12 +516,15 @@ public:
     bool supportLightweightDeleteMutate() const;
 
     /// True if here is lightweight deleted mask file in part.
-    bool hasLightweightDelete() const { return columns.contains(LightweightDeleteDescription::FILTER_COLUMN.name); }
+    bool hasLightweightDelete() const;
+
+    /// Read existing rows count from _row_exists column
+    UInt64 readExistingRowsCount();
 
     void writeChecksums(const MergeTreeDataPartChecksums & checksums_, const WriteSettings & settings);
 
     /// Checks the consistency of this data part.
-    virtual void checkConsistency(bool require_part_metadata) const;
+    void checkConsistency(bool require_part_metadata) const;
 
     /// Checks the consistency of this data part, and check the consistency of its projections (if any) as well.
     void checkConsistencyWithProjections(bool require_part_metadata) const;
@@ -554,6 +575,12 @@ public:
     mutable std::atomic<time_t> last_removal_attempt_time = 0;
 
 protected:
+    /// Primary key (correspond to primary.idx file).
+    /// Lazily loaded in RAM. Contains each index_granularity-th value of primary key tuple.
+    /// Note that marks (also correspond to primary key) are not always in RAM, but cached. See MarkCache.h.
+    mutable std::mutex index_mutex;
+    mutable Index index TSA_GUARDED_BY(index_mutex);
+    mutable bool index_loaded TSA_GUARDED_BY(index_mutex) = false;
 
     /// Total size of all columns, calculated once in calcuateColumnSizesOnDisk
     ColumnSize total_columns_size;
@@ -579,14 +606,12 @@ protected:
     const IMergeTreeDataPart * parent_part;
     String parent_part_name;
 
-    std::map<String, std::shared_ptr<IMergeTreeDataPart>> projection_parts;
+    mutable std::map<String, std::shared_ptr<IMergeTreeDataPart>> projection_parts;
 
     mutable PartMetadataManagerPtr metadata_manager;
 
     void removeIfNeeded();
 
-    void checkConsistencyBase() const;
-
     /// Fill each_columns_size and total_size with sizes from columns files on
     /// disk using columns and checksums.
     virtual void calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const = 0;
@@ -609,7 +634,12 @@ protected:
 
     void initializeIndexGranularityInfo();
 
+    virtual void doCheckConsistency(bool require_part_metadata) const;
+
 private:
+    String mutable_name;
+    mutable MergeTreeDataPartState state{MergeTreeDataPartState::Temporary};
+
     /// In compact parts order of columns is necessary
     NameToNumber column_name_to_position;
 
@@ -647,8 +677,8 @@ private:
 
     virtual void appendFilesOfIndexGranularity(Strings & files) const;
 
-    /// Loads index file.
-    void loadIndex();
+    /// Loads the index file.
+    void loadIndex() const TSA_REQUIRES(index_mutex);
 
     void appendFilesOfIndex(Strings & files) const;
 
@@ -656,6 +686,10 @@ private:
     /// For the older format version calculates rows count from the size of a column with a fixed size.
     void loadRowsCount();
 
+    /// Load existing rows count from _row_exists column
+    /// if load_existing_rows_count_for_old_parts and exclude_deleted_rows_for_part_size_in_merge are both enabled.
+    void loadExistingRowsCount();
+
     static void appendFilesOfRowsCount(Strings & files);
 
     /// Loads ttl infos in json format from file ttl.txt. If file doesn't exists assigns ttl infos with all zeros
@@ -693,6 +727,8 @@ private:
     void incrementStateMetric(MergeTreeDataPartState state) const;
     void decrementStateMetric(MergeTreeDataPartState state) const;
 
+    void checkConsistencyBase() const;
+
     /// This ugly flag is needed for debug assertions only
     mutable bool part_is_probably_removed_from_disk = false;
 };
@@ -702,7 +738,6 @@ using MergeTreeMutableDataPartPtr = std::shared_ptr<IMergeTreeDataPart>;
 
 bool isCompactPart(const MergeTreeDataPartPtr & data_part);
 bool isWidePart(const MergeTreeDataPartPtr & data_part);
-bool isInMemoryPart(const MergeTreeDataPartPtr & data_part);
 
 inline String getIndexExtension(bool is_compressed_primary_key) { return is_compressed_primary_key ? ".cidx" : ".idx"; }
 std::optional<String> getIndexExtensionFromFilesystem(const IDataPartStorage & data_part_storage);
diff --git a/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h b/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
index 2cc73556f04..ccc88079daa 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
+++ b/src/Storages/MergeTree/IMergeTreeDataPartInfoForReader.h
@@ -15,6 +15,7 @@ struct MergeTreeDataPartChecksums;
 struct MergeTreeIndexGranularityInfo;
 class ISerialization;
 using SerializationPtr = std::shared_ptr<const ISerialization>;
+class SerializationInfoByName;
 
 /**
  * A class which contains all information about a data part that is required
@@ -34,8 +35,6 @@ public:
 
     virtual bool isWidePart() const = 0;
 
-    virtual bool isInMemoryPart() const = 0;
-
     virtual bool isProjectionPart() const = 0;
 
     virtual DataPartStoragePtr getDataPartStorage() const = 0;
diff --git a/src/Storages/MergeTree/IMergeTreeReader.cpp b/src/Storages/MergeTree/IMergeTreeReader.cpp
index 120edd81e30..cf6b64aac85 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.cpp
+++ b/src/Storages/MergeTree/IMergeTreeReader.cpp
@@ -1,6 +1,8 @@
 #include <Storages/MergeTree/IMergeTreeReader.h>
+#include <Storages/MergeTree/MergeTreeReadTask.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
+#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <DataTypes/NestedUtils.h>
-#include <DataTypes/DataTypeArray.h>
 #include <Common/escapeForFileName.h>
 #include <Compression/CachedCompressedReadBuffer.h>
 #include <Columns/ColumnArray.h>
@@ -18,12 +20,13 @@ namespace
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
 }
 
-
 IMergeTreeReader::IMergeTreeReader(
     MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
     const NamesAndTypesList & columns_,
+    const VirtualFields & virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     UncompressedCache * uncompressed_cache_,
     MarkCache * mark_cache_,
@@ -46,6 +49,7 @@ IMergeTreeReader::IMergeTreeReader(
     , part_columns(data_part_info_for_read->isWidePart()
         ? data_part_info_for_read->getColumnsDescriptionWithCollectedNested()
         : data_part_info_for_read->getColumnsDescription())
+    , virtual_fields(virtual_fields_)
 {
     columns_to_read.reserve(requested_columns.size());
     serializations.reserve(requested_columns.size());
@@ -62,7 +66,49 @@ const IMergeTreeReader::ValueSizeMap & IMergeTreeReader::getAvgValueSizeHints()
     return avg_value_size_hints;
 }
 
-void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_evaluate_missing_defaults, size_t num_rows, size_t block_number) const
+void IMergeTreeReader::fillVirtualColumns(Columns & columns, size_t rows) const
+{
+    chassert(columns.size() == requested_columns.size());
+
+    const auto * loaded_part_info = typeid_cast<const LoadedMergeTreeDataPartInfoForReader *>(data_part_info_for_read.get());
+    if (!loaded_part_info)
+        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Filling of virtual columns is supported only for LoadedMergeTreeDataPartInfoForReader");
+
+    const auto & data_part = loaded_part_info->getDataPart();
+    const auto & storage_columns = storage_snapshot->getMetadataForQuery()->getColumns();
+    const auto & virtual_columns = storage_snapshot->virtual_columns;
+
+    auto it = requested_columns.begin();
+    for (size_t pos = 0; pos < columns.size(); ++pos, ++it)
+    {
+        if (columns[pos] || storage_columns.has(it->name))
+            continue;
+
+        auto virtual_column = virtual_columns->tryGet(it->name);
+        if (!virtual_column)
+            continue;
+
+        if (!it->type->equals(*virtual_column->type))
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                "Data type for virtual column {} mismatched. Requested type: {}, virtual column type: {}",
+                it->name, it->type->getName(), virtual_column->type->getName());
+        }
+
+        if (MergeTreeRangeReader::virtuals_to_fill.contains(it->name))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Virtual column {} must be filled by range reader", it->name);
+
+        Field field;
+        if (auto field_it = virtual_fields.find(it->name); field_it != virtual_fields.end())
+            field = field_it->second;
+        else
+            field = getFieldForConstVirtualColumn(it->name, *data_part);
+
+        columns[pos] = virtual_column->type->createColumnConst(rows, field)->convertToFullColumnIfConst();
+    }
+}
+
+void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_evaluate_missing_defaults, size_t num_rows) const
 {
     try
     {
@@ -71,7 +117,7 @@ void IMergeTreeReader::fillMissingColumns(Columns & res_columns, bool & should_e
             res_columns, num_rows,
             Nested::convertToSubcolumns(requested_columns),
             Nested::convertToSubcolumns(available_columns),
-            partially_read_columns, storage_snapshot->metadata, block_number);
+            partially_read_columns, storage_snapshot->metadata);
 
         should_evaluate_missing_defaults = std::any_of(
             res_columns.begin(), res_columns.end(), [](const auto & column) { return column == nullptr; });
@@ -140,16 +186,29 @@ void IMergeTreeReader::evaluateMissingDefaults(Block additional_columns, Columns
     }
 }
 
+bool IMergeTreeReader::isSubcolumnOffsetsOfNested(const String & name_in_storage, const String & subcolumn_name) const
+{
+    /// We cannot read separate subcolumn with offsets from compact parts.
+    if (!data_part_info_for_read->isWidePart() || subcolumn_name != "size0")
+        return false;
+
+    return Nested::isSubcolumnOfNested(name_in_storage, part_columns);
+}
+
 String IMergeTreeReader::getColumnNameInPart(const NameAndTypePair & required_column) const
 {
     auto name_in_storage = required_column.getNameInStorage();
-    if (alter_conversions->isColumnRenamed(name_in_storage))
-    {
-        name_in_storage = alter_conversions->getColumnOldName(name_in_storage);
-        return Nested::concatenateName(name_in_storage, required_column.getSubcolumnName());
-    }
+    auto subcolumn_name = required_column.getSubcolumnName();
 
-    return required_column.name;
+    if (alter_conversions->isColumnRenamed(name_in_storage))
+        name_in_storage = alter_conversions->getColumnOldName(name_in_storage);
+
+    /// A special case when we read subcolumn of shared offsets of Nested.
+    /// E.g. instead of requested column "n.arr1.size0" we must read column "n.size0" from disk.
+    if (isSubcolumnOffsetsOfNested(name_in_storage, subcolumn_name))
+        name_in_storage = Nested::splitName(name_in_storage).first;
+
+    return Nested::concatenateName(name_in_storage, subcolumn_name);
 }
 
 NameAndTypePair IMergeTreeReader::getColumnInPart(const NameAndTypePair & required_column) const
diff --git a/src/Storages/MergeTree/IMergeTreeReader.h b/src/Storages/MergeTree/IMergeTreeReader.h
index f3ea0c6c361..a5b84eba241 100644
--- a/src/Storages/MergeTree/IMergeTreeReader.h
+++ b/src/Storages/MergeTree/IMergeTreeReader.h
@@ -9,8 +9,6 @@
 namespace DB
 {
 
-class IDataType;
-
 /// Reads the data between pairs of marks in the same part. When reading consecutive ranges, avoids unnecessary seeks.
 /// When ranges are almost consecutive, seeks are fast because they are performed inside the buffer.
 /// Avoids loading the marks file if it is not needed (e.g. when reading the whole part).
@@ -18,11 +16,13 @@ class IMergeTreeReader : private boost::noncopyable
 {
 public:
     using ValueSizeMap = std::map<std::string, double>;
+    using VirtualFields = std::unordered_map<String, Field>;
     using DeserializeBinaryBulkStateMap = std::map<std::string, ISerialization::DeserializeBinaryBulkStatePtr>;
 
     IMergeTreeReader(
         MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
         const NamesAndTypesList & columns_,
+        const VirtualFields & virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         UncompressedCache * uncompressed_cache_,
         MarkCache * mark_cache_,
@@ -42,10 +42,13 @@ public:
 
     const ValueSizeMap & getAvgValueSizeHints() const;
 
+    /// Add virtual columns that are not present in the block.
+    void fillVirtualColumns(Columns & columns, size_t rows) const;
+
     /// Add columns from ordered_names that are not present in the block.
     /// Missing columns are added in the order specified by ordered_names.
     /// num_rows is needed in case if all res_columns are nullptr.
-    void fillMissingColumns(Columns & res_columns, bool & should_evaluate_missing_defaults, size_t num_rows, size_t block_number = 0) const;
+    void fillMissingColumns(Columns & res_columns, bool & should_evaluate_missing_defaults, size_t num_rows) const;
     /// Evaluate defaulted columns if necessary.
     void evaluateMissingDefaults(Block additional_columns, Columns & res_columns) const;
 
@@ -65,14 +68,14 @@ public:
 protected:
     /// Returns actual column name in part, which can differ from table metadata.
     String getColumnNameInPart(const NameAndTypePair & required_column) const;
-
     /// Returns actual column name and type in part, which can differ from table metadata.
     NameAndTypePair getColumnInPart(const NameAndTypePair & required_column) const;
     /// Returns actual serialization in part, which can differ from table metadata.
     SerializationPtr getSerializationInPart(const NameAndTypePair & required_column) const;
+    /// Returns true if requested column is a subcolumn with offsets of Array which is part of Nested column.
+    bool isSubcolumnOffsetsOfNested(const String & name_in_storage, const String & subcolumn_name) const;
 
     void checkNumberOfColumns(size_t num_columns_to_read) const;
-
     String getMessageForDiagnosticOfBrokenPart(size_t from_mark, size_t max_rows_to_read) const;
 
     /// avg_value_size_hints are used to reduce the number of reallocations when creating columns of variable size.
@@ -113,6 +116,9 @@ private:
 
     /// Actual columns description in part.
     const ColumnsDescription & part_columns;
+
+    /// Fields of virtual columns that were filled in previous stages.
+    VirtualFields virtual_fields;
 };
 
 }
diff --git a/src/Storages/MergeTree/InsertBlockInfo.cpp b/src/Storages/MergeTree/InsertBlockInfo.cpp
index ac900f8cf09..2de3ae8996a 100644
--- a/src/Storages/MergeTree/InsertBlockInfo.cpp
+++ b/src/Storages/MergeTree/InsertBlockInfo.cpp
@@ -9,7 +9,7 @@ namespace ErrorCodes
 }
 
 AsyncInsertBlockInfo::AsyncInsertBlockInfo(
-    Poco::Logger * log_,
+    LoggerPtr log_,
     std::vector<std::string> && block_id_,
     BlockWithPartition && block_,
     std::optional<BlockWithPartition> && unmerged_block_with_partition_)
diff --git a/src/Storages/MergeTree/InsertBlockInfo.h b/src/Storages/MergeTree/InsertBlockInfo.h
index 3882373c0fa..7d7ec0c9f29 100644
--- a/src/Storages/MergeTree/InsertBlockInfo.h
+++ b/src/Storages/MergeTree/InsertBlockInfo.h
@@ -8,7 +8,7 @@ namespace DB
 struct SyncInsertBlockInfo
 {
     SyncInsertBlockInfo(
-        Poco::Logger * /*log_*/,
+        LoggerPtr /*log_*/,
         std::string && block_id_,
         BlockWithPartition && /*block_*/,
         std::optional<BlockWithPartition> && /*unmerged_block_with_partition_*/)
@@ -25,7 +25,7 @@ struct SyncInsertBlockInfo
 
 struct AsyncInsertBlockInfo
 {
-    Poco::Logger * log;
+    LoggerPtr log;
     std::vector<std::string> block_id;
     BlockWithPartition block_with_partition;
     /// Some merging algorithms can mofidy the block which loses the information about the async insert offsets
@@ -34,7 +34,7 @@ struct AsyncInsertBlockInfo
     std::unordered_map<String, std::vector<size_t>> block_id_to_offset_idx;
 
     AsyncInsertBlockInfo(
-        Poco::Logger * log_,
+        LoggerPtr log_,
         std::vector<std::string> && block_id_,
         BlockWithPartition && block_,
         std::optional<BlockWithPartition> && unmerged_block_with_partition_);
diff --git a/src/Storages/MergeTree/IntersectionsIndexes.h b/src/Storages/MergeTree/IntersectionsIndexes.h
deleted file mode 100644
index d9445f446ce..00000000000
--- a/src/Storages/MergeTree/IntersectionsIndexes.h
+++ /dev/null
@@ -1,237 +0,0 @@
-#pragma once
-
-#include <fmt/format.h>
-#include <Storages/MergeTree/RequestResponse.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-/// A boundary of a segment (left or right)
-struct PartToRead
-{
-    PartBlockRange range;
-    struct PartAndProjectionNames
-    {
-        String part;
-        String projection;
-        bool operator<(const PartAndProjectionNames & rhs) const
-        {
-            if (part == rhs.part)
-                return projection < rhs.projection;
-            return part < rhs.part;
-        }
-        bool operator==(const PartAndProjectionNames & rhs) const
-        {
-            return part == rhs.part && projection == rhs.projection;
-        }
-    };
-
-    PartAndProjectionNames name;
-
-    bool operator==(const PartToRead & rhs) const
-    {
-        return range == rhs.range && name == rhs.name;
-    }
-
-    bool operator<(const PartToRead & rhs) const
-    {
-        /// We allow only consecutive non-intersecting ranges
-        const bool intersection =
-            (range.begin <= rhs.range.begin && rhs.range.begin < range.end) ||
-            (rhs.range.begin <= range.begin && range.begin <= rhs.range.end);
-        if (intersection)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Got intersecting parts. First [{}, {}]. Second [{}, {}]",
-                range.begin, range.end, rhs.range.begin, rhs.range.end);
-        return range.begin < rhs.range.begin && range.end <= rhs.range.begin;
-    }
-};
-
-/// MergeTreeDataPart is described as a segment (min block and max block)
-/// During request handling we have to know how many intersection
-/// current part has with already saved parts in our state.
-struct PartSegments
-{
-    enum class IntersectionResult
-    {
-        NO_INTERSECTION,
-        EXACTLY_ONE_INTERSECTION,
-        REJECT
-    };
-
-    void addPart(PartToRead part) { segments.insert(std::move(part)); }
-
-    IntersectionResult getIntersectionResult(PartToRead part)
-    {
-        bool intersected_before = false;
-        for (const auto & segment: segments)
-        {
-            auto are_intersect = [](auto & x, auto & y)
-            {
-                /// <= is important here, because we are working with segments [a, b]
-                if ((x.begin <= y.begin) && (y.begin <= x.end))
-                    return true;
-                if ((y.begin <= x.begin) && (x.begin <= y.end))
-                    return true;
-                return false;
-            };
-
-            if (are_intersect(segment.range, part.range))
-            {
-                /// We have two or possibly more intersections
-                if (intersected_before)
-                    return IntersectionResult::REJECT;
-
-                /// We have intersection with part with different name
-                /// or with different min or max block
-                /// It could happens if we have merged part on one replica
-                /// but not on another.
-                if (segment != part)
-                    return IntersectionResult::REJECT;
-
-                /// We allow only the intersection with the same part as we have
-                intersected_before = true;
-            }
-        }
-
-        return intersected_before ? IntersectionResult::EXACTLY_ONE_INTERSECTION : IntersectionResult::NO_INTERSECTION;
-    }
-
-    using OrderedSegments = std::set<PartToRead>;
-    OrderedSegments segments;
-};
-
-/// This is used only in parallel reading from replicas
-/// This struct is an ordered set of half intervals and it is responsible for
-/// giving an inversion of that intervals (e.g. [a, b) => {[-inf, a), [b, +inf)})
-/// or giving an intersection of two sets of intervals
-/// This is needed, because MarkRange is actually a half-opened interval
-/// and during the query execution we receive some kind of request from every replica
-/// to read some ranges from a specific part.
-/// We have to avoid the situation, where some range is read twice.
-/// This struct helps us to do it using only two operations (intersection and inversion)
-/// over a set of half opened intervals.
-struct HalfIntervals
-{
-    static HalfIntervals initializeWithEntireSpace()
-    {
-        auto left_inf = std::numeric_limits<decltype(MarkRange::begin)>::min();
-        auto right_inf = std::numeric_limits<decltype(MarkRange::end)>::max();
-        return HalfIntervals{{{left_inf, right_inf}}};
-    }
-
-    static HalfIntervals initializeFromMarkRanges(MarkRanges ranges)
-    {
-        OrderedRanges new_intervals;
-        for (const auto & range : ranges)
-            new_intervals.insert(range);
-
-        return HalfIntervals{std::move(new_intervals)};
-    }
-
-    MarkRanges convertToMarkRangesFinal()
-    {
-        MarkRanges result;
-        std::copy(intervals.begin(), intervals.end(), std::back_inserter(result));
-        return result;
-    }
-
-    HalfIntervals & intersect(const HalfIntervals & rhs)
-    {
-        /**
-         * first   [   ) [   ) [   ) [  ) [  )
-         * second    [       ) [ ) [   )  [    )
-         */
-        OrderedRanges intersected;
-
-        const auto & first_intervals = intervals;
-        auto first = first_intervals.begin();
-        const auto & second_intervals = rhs.intervals;
-        auto second = second_intervals.begin();
-
-        while (first != first_intervals.end() && second != second_intervals.end())
-        {
-            auto curr_intersection = MarkRange{
-                std::max(second->begin, first->begin),
-                std::min(second->end, first->end)
-            };
-
-            /// Insert only if segments are intersect
-            if (curr_intersection.begin < curr_intersection.end)
-                intersected.insert(std::move(curr_intersection));
-
-            if (first->end <= second->end)
-                ++first;
-            else
-                ++second;
-        }
-
-        std::swap(intersected, intervals);
-
-        return *this;
-    }
-
-    HalfIntervals & negate()
-    {
-        auto left_inf = std::numeric_limits<decltype(MarkRange::begin)>::min();
-        auto right_inf = std::numeric_limits<decltype(MarkRange::end)>::max();
-
-        if (intervals.empty())
-        {
-            intervals.insert(MarkRange{left_inf, right_inf});
-            return *this;
-        }
-
-        OrderedRanges new_ranges;
-
-        /// Possibly add (-inf; begin)
-        if (auto begin = intervals.begin()->begin; begin != left_inf)
-            new_ranges.insert(MarkRange{left_inf, begin});
-
-        auto prev = intervals.begin();
-        for (auto it = std::next(intervals.begin()); it != intervals.end(); ++it)
-        {
-            if (prev->end != it->begin)
-                new_ranges.insert(MarkRange{prev->end, it->begin});
-            prev = it;
-        }
-
-        /// Try to add (end; +inf)
-        if (auto end = intervals.rbegin()->end; end != right_inf)
-            new_ranges.insert(MarkRange{end, right_inf});
-
-        std::swap(new_ranges, intervals);
-
-        return *this;
-    }
-
-    bool operator==(const HalfIntervals & rhs) const
-    {
-        return intervals == rhs.intervals;
-    }
-
-    using OrderedRanges = std::set<MarkRange>;
-    OrderedRanges intervals;
-};
-
-
-[[ maybe_unused ]] static std::ostream & operator<< (std::ostream & out, const HalfIntervals & ranges)
-{
-    for (const auto & range: ranges.intervals)
-        out << fmt::format("({}, {}) ", range.begin, range.end);
-    return out;
-}
-
-/// This is needed for tests where we don't need to modify objects
-[[ maybe_unused ]] static HalfIntervals getIntersection(const HalfIntervals & first, const HalfIntervals & second)
-{
-    auto result = first;
-    result.intersect(second);
-    return result;
-}
-
-}
diff --git a/src/Storages/MergeTree/KeyCondition.cpp b/src/Storages/MergeTree/KeyCondition.cpp
index d5922ae1bc2..2d57ea40c9c 100644
--- a/src/Storages/MergeTree/KeyCondition.cpp
+++ b/src/Storages/MergeTree/KeyCondition.cpp
@@ -565,7 +565,7 @@ static const ActionsDAG::Node & cloneASTWithInversionPushDown(
             if (const auto * column_const = typeid_cast<const ColumnConst *>(node.column.get()))
                 /// Re-generate column name for constant.
                 /// DAG form query (with enabled analyzer) uses suffixes for constants, like 1_UInt8.
-                /// DAG from PK does not use it. This is breakig match by column name sometimes.
+                /// DAG from PK does not use it. This breaks matching by column name sometimes.
                 /// Ideally, we should not compare manes, but DAG subtrees instead.
                 name = ASTLiteral(column_const->getDataColumn()[0]).getColumnName();
             else
diff --git a/src/Storages/MergeTree/LeaderElection.h b/src/Storages/MergeTree/LeaderElection.h
index 2e48892563b..b7dc9c31655 100644
--- a/src/Storages/MergeTree/LeaderElection.h
+++ b/src/Storages/MergeTree/LeaderElection.h
@@ -19,7 +19,7 @@ namespace zkutil
   * For now, every replica can become leader if there is no leader among replicas with old version.
   */
 
-void checkNoOldLeaders(Poco::Logger * log, ZooKeeper & zookeeper, const String path)
+inline void checkNoOldLeaders(LoggerPtr log, ZooKeeper & zookeeper, const String path)
 {
     /// Previous versions (before 21.12) used to create ephemeral sequential node path/leader_election-
     /// Replica with the lexicographically smallest node name becomes leader (before 20.6) or enables multi-leader mode (since 20.6)
diff --git a/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h b/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
index f1cb8b34ecf..f5111ccaacc 100644
--- a/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
+++ b/src/Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h
@@ -22,8 +22,6 @@ public:
 
     bool isWidePart() const override { return DB::isWidePart(data_part); }
 
-    bool isInMemoryPart() const override { return DB::isInMemoryPart(data_part); }
-
     bool isProjectionPart() const override { return data_part->isProjectionPart(); }
 
     DataPartStoragePtr getDataPartStorage() const override { return data_part->getDataPartStoragePtr(); }
diff --git a/src/Storages/MergeTree/MarkRange.cpp b/src/Storages/MergeTree/MarkRange.cpp
index bd8546f04cc..c6e98b4e5a1 100644
--- a/src/Storages/MergeTree/MarkRange.cpp
+++ b/src/Storages/MergeTree/MarkRange.cpp
@@ -81,6 +81,11 @@ size_t MarkRanges::getNumberOfMarks() const
     return result;
 }
 
+bool MarkRanges::isOneRangeForWholePart(size_t num_marks_in_part) const
+{
+    return size() == 1 && front().begin == 0 && front().end == num_marks_in_part;
+}
+
 void MarkRanges::serialize(WriteBuffer & out) const
 {
     writeBinaryLittleEndian(this->size(), out);
diff --git a/src/Storages/MergeTree/MarkRange.h b/src/Storages/MergeTree/MarkRange.h
index f31d6a2a73b..f36d5d89825 100644
--- a/src/Storages/MergeTree/MarkRange.h
+++ b/src/Storages/MergeTree/MarkRange.h
@@ -33,9 +33,10 @@ struct MarkRange
 
 struct MarkRanges : public std::deque<MarkRange>
 {
-    using std::deque<MarkRange>::deque;
+    using std::deque<MarkRange>::deque; /// NOLINT(modernize-type-traits)
 
     size_t getNumberOfMarks() const;
+    bool isOneRangeForWholePart(size_t num_marks_in_part) const;
 
     void serialize(WriteBuffer & out) const;
     String describe() const;
diff --git a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
index 23037b1ee7a..e8d55f75b08 100644
--- a/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MergeFromLogEntryTask.cpp
@@ -28,7 +28,7 @@ MergeFromLogEntryTask::MergeFromLogEntryTask(
     StorageReplicatedMergeTree & storage_,
     IExecutableTask::TaskResultCallback & task_result_callback_)
     : ReplicatedMergeMutateTaskBase(
-        &Poco::Logger::get(
+        getLogger(
             storage_.getStorageID().getShortName() + "::" + selected_entry_->log_entry->new_part_name + " (MergeFromLogEntryTask)"),
         storage_,
         selected_entry_,
@@ -47,13 +47,22 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
     int32_t metadata_version = metadata_snapshot->getMetadataVersion();
     const auto storage_settings_ptr = storage.getSettings();
 
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+    auto part_log_writer = [this, stopwatch = *stopwatch_ptr](const ExecutionStatus & execution_status)
+    {
+        auto profile_counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(profile_counters.getPartiallyAtomicSnapshot());
+        storage.writePartLog(
+            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
+            entry.new_part_name, part, parts, merge_mutate_entry.get(), std::move(profile_counters_snapshot));
+    };
+
     if (storage_settings_ptr->always_fetch_merged_part)
     {
         LOG_INFO(log, "Will fetch part {} because setting 'always_fetch_merged_part' is true", entry.new_part_name);
         return PrepareResult{
             .prepared_successfully = false,
             .need_to_check_missing_part_in_fetch = true,
-            .part_log_writer = {}
+            .part_log_writer = part_log_writer,
         };
     }
 
@@ -68,7 +77,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = false,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
     }
 
@@ -88,7 +97,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = true,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
         }
     }
@@ -107,7 +116,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = true,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
         }
 
@@ -127,7 +136,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = true,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
         }
 
@@ -139,7 +148,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = false,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
         }
 
@@ -167,14 +176,14 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = false,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
         }
     }
 
     /// Start to make the main work
-    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts);
+    size_t estimated_space_for_merge = MergeTreeDataMergerMutator::estimateNeededDiskSpace(parts, true);
 
     /// Can throw an exception while reserving space.
     IMergeTreeDataPart::TTLInfos ttl_infos;
@@ -227,7 +236,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = false,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
 
@@ -267,7 +276,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = false,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
             else if (storage.findReplicaHavingCoveringPart(entry.new_part_name, /* active */ false))
@@ -284,7 +293,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = true,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
             else
@@ -311,7 +320,6 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
         task_context);
 
     transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage, NO_TRANSACTION_RAW);
-    stopwatch_ptr = std::make_unique<Stopwatch>();
 
     merge_task = storage.merger_mutator.mergePartsToTemporaryPart(
             future_merged_part,
@@ -333,13 +341,11 @@ ReplicatedMergeMutateTaskBase::PrepareResult MergeFromLogEntryTask::prepare()
     for (auto & item : future_merged_part->parts)
         priority.value += item->getBytesOnDisk();
 
-    return {true, true, [this, stopwatch = *stopwatch_ptr] (const ExecutionStatus & execution_status)
-    {
-        auto profile_counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(profile_counters.getPartiallyAtomicSnapshot());
-        storage.writePartLog(
-            PartLogElement::MERGE_PARTS, execution_status, stopwatch.elapsed(),
-            entry.new_part_name, part, parts, merge_mutate_entry.get(), std::move(profile_counters_snapshot));
-    }};
+    return PrepareResult{
+        .prepared_successfully = true,
+        .need_to_check_missing_part_in_fetch = true,
+        .part_log_writer = part_log_writer,
+    };
 }
 
 
@@ -420,7 +426,7 @@ bool MergeFromLogEntryTask::finalize(ReplicatedMergeMutateTaskBase::PartLogWrite
     ProfileEvents::increment(ProfileEvents::ReplicatedPartMerges);
 
     write_part_log({});
-    storage.incrementMergedPartsProfileEvent(part->getType());
+    StorageReplicatedMergeTree::incrementMergedPartsProfileEvent(part->getType());
 
     return true;
 }
diff --git a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
index c218acce903..866a63911c3 100644
--- a/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MergePlainMergeTreeTask.cpp
@@ -149,7 +149,7 @@ void MergePlainMergeTreeTask::finish()
     ThreadFuzzer::maybeInjectMemoryLimitException();
 
     write_part_log({});
-    storage.incrementMergedPartsProfileEvent(new_part->getType());
+    StorageMergeTree::incrementMergedPartsProfileEvent(new_part->getType());
     transfer_profile_counters_to_initial_query();
 
     if (auto txn_ = txn_holder.getTransaction())
diff --git a/src/Storages/MergeTree/MergeTask.cpp b/src/Storages/MergeTree/MergeTask.cpp
index 4b5b7ca8018..34e17e40a74 100644
--- a/src/Storages/MergeTree/MergeTask.cpp
+++ b/src/Storages/MergeTree/MergeTask.cpp
@@ -8,7 +8,6 @@
 #include <Common/logger_useful.h>
 #include <Common/ActionBlocker.h>
 #include <Processors/Transforms/CheckSortedTransform.h>
-#include <Storages/LightweightDeleteDescription.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 
 #include <DataTypes/ObjectUtils.h>
@@ -33,6 +32,9 @@
 #include <Processors/Transforms/TTLCalcTransform.h>
 #include <Processors/Transforms/DistinctSortedTransform.h>
 #include <Processors/Transforms/DistinctTransform.h>
+#include <Processors/QueryPlan/CreatingSetsStep.h>
+#include <Interpreters/PreparedSets.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 namespace DB
 {
@@ -222,13 +224,11 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     ctx->need_remove_expired_values = false;
     ctx->force_ttl = false;
 
-    if (supportsBlockNumberColumn(global_ctx) && !global_ctx->storage_columns.contains(BlockNumberColumn::name))
-    {
-        global_ctx->storage_columns.emplace_back(NameAndTypePair{BlockNumberColumn::name,BlockNumberColumn::type});
-        global_ctx->all_column_names.emplace_back(BlockNumberColumn::name);
-        global_ctx->gathering_columns.emplace_back(NameAndTypePair{BlockNumberColumn::name,BlockNumberColumn::type});
-        global_ctx->gathering_column_names.emplace_back(BlockNumberColumn::name);
-    }
+    if (enabledBlockNumberColumn(global_ctx))
+        addGatheringColumn(global_ctx, BlockNumberColumn::name, BlockNumberColumn::type);
+
+    if (enabledBlockOffsetColumn(global_ctx))
+        addGatheringColumn(global_ctx, BlockOffsetColumn::name, BlockOffsetColumn::type);
 
     SerializationInfo::Settings info_settings =
     {
@@ -294,7 +294,7 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
 
     switch (global_ctx->chosen_merge_algorithm)
     {
-        case MergeAlgorithm::Horizontal :
+        case MergeAlgorithm::Horizontal:
         {
             global_ctx->merging_columns = global_ctx->storage_columns;
             global_ctx->merging_column_names = global_ctx->all_column_names;
@@ -302,12 +302,12 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
             global_ctx->gathering_column_names.clear();
             break;
         }
-        case MergeAlgorithm::Vertical :
+        case MergeAlgorithm::Vertical:
         {
             ctx->rows_sources_uncompressed_write_buf = ctx->tmp_disk->createRawStream();
             ctx->rows_sources_write_buf = std::make_unique<CompressedWriteBuffer>(*ctx->rows_sources_uncompressed_write_buf);
 
-            MergeTreeDataPartInMemory::ColumnToSize local_merged_column_to_size;
+            std::map<String, UInt64> local_merged_column_to_size;
             for (const MergeTreeData::DataPartPtr & part : global_ctx->future_part->parts)
                 part->accumulateColumnSizes(local_merged_column_to_size);
 
@@ -400,6 +400,17 @@ bool MergeTask::ExecuteAndFinalizeHorizontalPart::prepare()
     return false;
 }
 
+void MergeTask::addGatheringColumn(GlobalRuntimeContextPtr global_ctx, const String & name, const DataTypePtr & type)
+{
+    if (global_ctx->storage_columns.contains(name))
+        return;
+
+    global_ctx->storage_columns.emplace_back(name, type);
+    global_ctx->all_column_names.emplace_back(name);
+    global_ctx->gathering_columns.emplace_back(name, type);
+    global_ctx->gathering_column_names.emplace_back(name);
+}
+
 
 MergeTask::StageRuntimeContextPtr MergeTask::ExecuteAndFinalizeHorizontalPart::getContextForNextStage()
 {
@@ -433,7 +444,7 @@ MergeTask::StageRuntimeContextPtr MergeTask::VerticalMergeStage::getContextForNe
 bool MergeTask::ExecuteAndFinalizeHorizontalPart::execute()
 {
     assert(subtasks_iterator != subtasks.end());
-    if ((*subtasks_iterator)())
+    if ((this->**subtasks_iterator)())
         return true;
 
     /// Move to the next subtask in an array of subtasks
@@ -588,7 +599,15 @@ void MergeTask::VerticalMergeStage::prepareVerticalMergeForOneColumn() const
     auto pipe = Pipe::unitePipes(std::move(pipes));
 
     ctx->rows_sources_read_buf->seek(0, 0);
-    auto transform = std::make_unique<ColumnGathererTransform>(pipe.getHeader(), pipe.numOutputPorts(), *ctx->rows_sources_read_buf);
+
+    const auto data_settings = global_ctx->data->getSettings();
+    auto transform = std::make_unique<ColumnGathererTransform>(
+        pipe.getHeader(),
+        pipe.numOutputPorts(),
+        *ctx->rows_sources_read_buf,
+        data_settings->merge_max_block_size,
+        data_settings->merge_max_block_size_bytes);
+
     pipe.addTransform(std::move(transform));
 
     ctx->column_parts_pipeline = QueryPipeline(std::move(pipe));
@@ -720,8 +739,9 @@ bool MergeTask::MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections() c
         MergeTreeData::DataPartsVector projection_parts;
         for (const auto & part : global_ctx->future_part->parts)
         {
-            auto it = part->getProjectionParts().find(projection.name);
-            if (it != part->getProjectionParts().end())
+            auto actual_projection_parts = part->getProjectionParts();
+            auto it = actual_projection_parts.find(projection.name);
+            if (it != actual_projection_parts.end() && !it->second->is_broken)
                 projection_parts.push_back(it->second);
         }
         if (projection_parts.size() < global_ctx->future_part->parts.size())
@@ -815,7 +835,7 @@ bool MergeTask::MergeProjectionsStage::finalizeProjectionsAndWholeMerge() const
 bool MergeTask::VerticalMergeStage::execute()
 {
     assert(subtasks_iterator != subtasks.end());
-    if ((*subtasks_iterator)())
+    if ((this->**subtasks_iterator)())
         return true;
 
     /// Move to the next subtask in an array of subtasks
@@ -826,7 +846,7 @@ bool MergeTask::VerticalMergeStage::execute()
 bool MergeTask::MergeProjectionsStage::execute()
 {
     assert(subtasks_iterator != subtasks.end());
-    if ((*subtasks_iterator)())
+    if ((this->**subtasks_iterator)())
         return true;
 
     /// Move to the next subtask in an array of subtasks
@@ -1047,13 +1067,14 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
             break;
     }
 
-    auto res_pipe = Pipe::unitePipes(std::move(pipes));
-    res_pipe.addTransform(std::move(merged_transform));
+    auto builder = std::make_unique<QueryPipelineBuilder>();
+    builder->init(Pipe::unitePipes(std::move(pipes)));
+    builder->addTransform(std::move(merged_transform));
 
 #ifndef NDEBUG
     if (!sort_description.empty())
     {
-        res_pipe.addSimpleTransform([&](const Block & header_)
+        builder->addSimpleTransform([&](const Block & header_)
         {
             auto transform = std::make_shared<CheckSortedTransform>(header_, sort_description);
             return transform;
@@ -1063,38 +1084,50 @@ void MergeTask::ExecuteAndFinalizeHorizontalPart::createMergedStream()
 
     if (global_ctx->deduplicate)
     {
-        /// We don't want to deduplicate by block number column
-        /// so if deduplicate_by_columns is empty, add all columns except _block_number
-        if (supportsBlockNumberColumn(global_ctx) && global_ctx->deduplicate_by_columns.empty())
+        const auto & virtuals = *global_ctx->data->getVirtualsPtr();
+
+        /// We don't want to deduplicate by virtual persistent column.
+        /// If deduplicate_by_columns is empty, add all columns except virtuals.
+        if (global_ctx->deduplicate_by_columns.empty())
         {
-            for (const auto & col : global_ctx->merging_column_names)
+            for (const auto & column_name : global_ctx->merging_column_names)
             {
-                if (col != BlockNumberColumn::name)
-                    global_ctx->deduplicate_by_columns.emplace_back(col);
+                if (virtuals.tryGet(column_name, VirtualsKind::Persistent))
+                    continue;
+
+                global_ctx->deduplicate_by_columns.emplace_back(column_name);
             }
         }
 
         if (DistinctSortedTransform::isApplicable(header, sort_description, global_ctx->deduplicate_by_columns))
-            res_pipe.addTransform(std::make_shared<DistinctSortedTransform>(
-                res_pipe.getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+            builder->addTransform(std::make_shared<DistinctSortedTransform>(
+                builder->getHeader(), sort_description, SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
         else
-            res_pipe.addTransform(std::make_shared<DistinctTransform>(
-                res_pipe.getHeader(), SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
+            builder->addTransform(std::make_shared<DistinctTransform>(
+                builder->getHeader(), SizeLimits(), 0 /*limit_hint*/, global_ctx->deduplicate_by_columns));
     }
 
+    PreparedSets::Subqueries subqueries;
+
     if (ctx->need_remove_expired_values)
-        res_pipe.addTransform(std::make_shared<TTLTransform>(
-            res_pipe.getHeader(), *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl));
+    {
+        auto transform = std::make_shared<TTLTransform>(global_ctx->context, builder->getHeader(), *global_ctx->data, global_ctx->metadata_snapshot, global_ctx->new_data_part, global_ctx->time_of_merge, ctx->force_ttl);
+        subqueries = transform->getSubqueries();
+        builder->addTransform(std::move(transform));
+    }
 
     if (global_ctx->metadata_snapshot->hasSecondaryIndices())
     {
         const auto & indices = global_ctx->metadata_snapshot->getSecondaryIndices();
-        res_pipe.addTransform(std::make_shared<ExpressionTransform>(
-            res_pipe.getHeader(), indices.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext())));
-        res_pipe.addTransform(std::make_shared<MaterializingTransform>(res_pipe.getHeader()));
+        builder->addTransform(std::make_shared<ExpressionTransform>(
+            builder->getHeader(), indices.getSingleExpressionForIndices(global_ctx->metadata_snapshot->getColumns(), global_ctx->data->getContext())));
+        builder->addTransform(std::make_shared<MaterializingTransform>(builder->getHeader()));
     }
 
-    global_ctx->merged_pipeline = QueryPipeline(std::move(res_pipe));
+    if (!subqueries.empty())
+        builder = addCreatingSetsTransform(std::move(builder), std::move(subqueries), global_ctx->context);
+
+    global_ctx->merged_pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
     /// Dereference unique_ptr and pass horizontal_stage_progress by reference
     global_ctx->merged_pipeline.setProgressCallback(MergeProgressCallback(global_ctx->merge_list_element_ptr, global_ctx->watch_prev_elapsed, *global_ctx->horizontal_stage_progress));
     /// Is calculated inside MergeProgressCallback.
diff --git a/src/Storages/MergeTree/MergeTask.h b/src/Storages/MergeTree/MergeTask.h
index b2a5796737d..f6268886b14 100644
--- a/src/Storages/MergeTree/MergeTask.h
+++ b/src/Storages/MergeTree/MergeTask.h
@@ -15,7 +15,7 @@
 
 #include <QueryPipeline/QueryPipeline.h>
 
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Storages/MergeTree/ColumnSizeEstimator.h>
 #include <Storages/MergeTree/FutureMergedMutatedPart.h>
 #include <Storages/MergeTree/IExecutableTask.h>
@@ -228,7 +228,7 @@ private:
         size_t sum_compressed_bytes_upper_bound{0};
         bool blocks_are_granules_size{false};
 
-        Poco::Logger * log{&Poco::Logger::get("MergeTask::PrepareStage")};
+        LoggerPtr log{getLogger("MergeTask::PrepareStage")};
 
         /// Dependencies for next stages
         std::list<DB::NameAndTypePair>::const_iterator it_name_and_type;
@@ -246,15 +246,16 @@ private:
         bool prepare();
         bool executeImpl();
 
-        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<std::function<bool()>, 2>;
+        /// NOTE: Using pointer-to-member instead of std::function and lambda makes stacktraces much more concise and readable
+        using ExecuteAndFinalizeHorizontalPartSubtasks = std::array<bool(ExecuteAndFinalizeHorizontalPart::*)(), 2>;
 
-        ExecuteAndFinalizeHorizontalPartSubtasks subtasks
+        const ExecuteAndFinalizeHorizontalPartSubtasks subtasks
         {
-            [this] () { return prepare(); },
-            [this] () { return executeImpl(); }
+            &ExecuteAndFinalizeHorizontalPart::prepare,
+            &ExecuteAndFinalizeHorizontalPart::executeImpl
         };
 
-        ExecuteAndFinalizeHorizontalPartSubtasks::iterator subtasks_iterator = subtasks.begin();
+        ExecuteAndFinalizeHorizontalPartSubtasks::const_iterator subtasks_iterator = subtasks.begin();
 
 
         MergeAlgorithm chooseMergeAlgorithm() const;
@@ -323,16 +324,17 @@ private:
         bool executeVerticalMergeForAllColumns() const;
         bool finalizeVerticalMergeForAllColumns() const;
 
-        using VerticalMergeStageSubtasks = std::array<std::function<bool()>, 3>;
+        /// NOTE: Using pointer-to-member instead of std::function and lambda makes stacktraces much more concise and readable
+        using VerticalMergeStageSubtasks = std::array<bool(VerticalMergeStage::*)()const, 3>;
 
-        VerticalMergeStageSubtasks subtasks
+        const VerticalMergeStageSubtasks subtasks
         {
-            [this] () { return prepareVerticalMergeForAllColumns(); },
-            [this] () { return executeVerticalMergeForAllColumns(); },
-            [this] () { return finalizeVerticalMergeForAllColumns(); }
+            &VerticalMergeStage::prepareVerticalMergeForAllColumns,
+            &VerticalMergeStage::executeVerticalMergeForAllColumns,
+            &VerticalMergeStage::finalizeVerticalMergeForAllColumns
         };
 
-        VerticalMergeStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+        VerticalMergeStageSubtasks::const_iterator subtasks_iterator = subtasks.begin();
 
         void prepareVerticalMergeForOneColumn() const;
         bool executeVerticalMergeForOneColumn() const;
@@ -354,7 +356,7 @@ private:
         MergeTasks tasks_for_projections;
         MergeTasks::iterator projections_iterator;
 
-        Poco::Logger * log{&Poco::Logger::get("MergeTask::MergeProjectionsStage")};
+        LoggerPtr log{getLogger("MergeTask::MergeProjectionsStage")};
     };
 
     using MergeProjectionsRuntimeContextPtr = std::shared_ptr<MergeProjectionsRuntimeContext>;
@@ -373,16 +375,17 @@ private:
         bool executeProjections() const;
         bool finalizeProjectionsAndWholeMerge() const;
 
-        using MergeProjectionsStageSubtasks = std::array<std::function<bool()>, 3>;
+        /// NOTE: Using pointer-to-member instead of std::function and lambda makes stacktraces much more concise and readable
+        using MergeProjectionsStageSubtasks = std::array<bool(MergeProjectionsStage::*)()const, 3>;
 
-        MergeProjectionsStageSubtasks subtasks
+        const MergeProjectionsStageSubtasks subtasks
         {
-            [this] () { return mergeMinMaxIndexAndPrepareProjections(); },
-            [this] () { return executeProjections(); },
-            [this] () { return finalizeProjectionsAndWholeMerge(); }
+            &MergeProjectionsStage::mergeMinMaxIndexAndPrepareProjections,
+            &MergeProjectionsStage::executeProjections,
+            &MergeProjectionsStage::finalizeProjectionsAndWholeMerge
         };
 
-        MergeProjectionsStageSubtasks::iterator subtasks_iterator = subtasks.begin();
+        MergeProjectionsStageSubtasks::const_iterator subtasks_iterator = subtasks.begin();
 
         MergeProjectionsRuntimeContextPtr ctx;
         GlobalRuntimeContextPtr global_ctx;
@@ -392,21 +395,26 @@ private:
 
     using Stages = std::array<StagePtr, 3>;
 
-    Stages stages
+    const Stages stages
     {
         std::make_shared<ExecuteAndFinalizeHorizontalPart>(),
         std::make_shared<VerticalMergeStage>(),
         std::make_shared<MergeProjectionsStage>()
     };
 
-    Stages::iterator stages_iterator = stages.begin();
+    Stages::const_iterator stages_iterator = stages.begin();
 
-    /// Check for persisting block number column
-    static bool supportsBlockNumberColumn(GlobalRuntimeContextPtr global_ctx)
+    static bool enabledBlockNumberColumn(GlobalRuntimeContextPtr global_ctx)
     {
-        return global_ctx->data->getSettings()->allow_experimental_block_number_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
+        return global_ctx->data->getSettings()->enable_block_number_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
     }
 
+    static bool enabledBlockOffsetColumn(GlobalRuntimeContextPtr global_ctx)
+    {
+        return global_ctx->data->getSettings()->enable_block_offset_column && global_ctx->metadata_snapshot->getGroupByTTLs().empty();
+    }
+
+    static void addGatheringColumn(GlobalRuntimeContextPtr global_ctx, const String & name, const DataTypePtr & type);
 };
 
 /// FIXME
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
index a3f8e02f5eb..8cb0badc19b 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.cpp
@@ -144,7 +144,7 @@ bool MergeTreeBackgroundExecutor<Queue>::trySchedule(ExecutableTaskPtr task)
     return true;
 }
 
-void printExceptionWithRespectToAbort(Poco::Logger * log, const String & query_id)
+void printExceptionWithRespectToAbort(LoggerPtr log, const String & query_id)
 {
     std::exception_ptr ex = std::current_exception();
 
diff --git a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
index 63f75ffc8d9..0ed03293589 100644
--- a/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeBackgroundExecutor.h
@@ -307,7 +307,7 @@ private:
     std::condition_variable has_tasks TSA_GUARDED_BY(mutex);
     bool shutdown TSA_GUARDED_BY(mutex) = false;
     std::unique_ptr<ThreadPool> pool;
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeBackgroundExecutor");
+    LoggerPtr log = getLogger("MergeTreeBackgroundExecutor");
 };
 
 extern template class MergeTreeBackgroundExecutor<RoundRobinRuntimeQueue>;
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
index f5f0fa6f726..570387a7046 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.cpp
@@ -6,6 +6,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Common/checkStackSize.h>
 #include <Common/typeid_cast.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
 #include <Columns/ColumnConst.h>
 #include <IO/WriteBufferFromString.h>
@@ -106,16 +107,14 @@ NameSet injectRequiredColumns(
 
     auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical)
         .withExtendedObjects()
-        .withSystemColumns();
-
-    if (with_subcolumns)
-        options.withSubcolumns();
+        .withVirtuals()
+        .withSubcolumns(with_subcolumns);
 
     for (size_t i = 0; i < columns.size(); ++i)
     {
-        /// We are going to fetch only physical columns and system columns
+        /// We are going to fetch physical columns and system columns first
         if (!storage_snapshot->tryGetColumn(options, columns[i]))
-            throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no physical column or subcolumn {} in table", columns[i]);
+            throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no column or subcolumn {} in table", columns[i]);
 
         have_at_least_one_physical_column |= injectRequiredColumnsRecursively(
             columns[i], storage_snapshot, alter_conversions,
@@ -258,11 +257,10 @@ void MergeTreeBlockSizePredictor::update(const Block & sample_block, const Colum
 }
 
 
-MergeTreeReadTask::Columns getReadTaskColumns(
+MergeTreeReadTaskColumns getReadTaskColumns(
     const IMergeTreeDataPartInfoForReader & data_part_info_for_reader,
     const StorageSnapshotPtr & storage_snapshot,
     const Names & required_columns,
-    const Names & system_columns,
     const PrewhereInfoPtr & prewhere_info,
     const ExpressionActionsSettings & actions_settings,
     const MergeTreeReaderSettings & reader_settings,
@@ -270,28 +268,30 @@ MergeTreeReadTask::Columns getReadTaskColumns(
 {
     Names column_to_read_after_prewhere = required_columns;
 
-    /// 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(
         data_part_info_for_reader, storage_snapshot, with_subcolumns, column_to_read_after_prewhere);
 
-    MergeTreeReadTask::Columns result;
+    MergeTreeReadTaskColumns result;
     auto options = GetColumnsOptions(GetColumnsOptions::All)
         .withExtendedObjects()
-        .withSystemColumns();
-
-    if (with_subcolumns)
-        options.withSubcolumns();
+        .withVirtuals()
+        .withSubcolumns(with_subcolumns);
 
     NameSet columns_from_previous_steps;
     auto add_step = [&](const PrewhereExprStep & step)
     {
         Names step_column_names;
 
+        /// Virtual columns that are filled by RangeReader
+        /// must be read in the first step before any filtering.
+        if (columns_from_previous_steps.empty())
+        {
+            for (const auto & required_column : required_columns)
+                if (MergeTreeRangeReader::virtuals_to_fill.contains(required_column))
+                    step_column_names.push_back(required_column);
+        }
+
         /// Computation results from previous steps might be used in the current step as well. In such a case these
         /// computed columns will be present in the current step inputs. They don't need to be read from the disk so
         /// exclude them from the list of columns to read. This filtering must be done before injecting required
diff --git a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
index 9417d47814a..b19c42c8db8 100644
--- a/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
+++ b/src/Storages/MergeTree/MergeTreeBlockReadUtils.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <optional>
 #include <Core/NamesAndTypes.h>
 #include <Storages/MergeTree/MergeTreeReadTask.h>
 
@@ -22,11 +21,10 @@ NameSet injectRequiredColumns(
     bool with_subcolumns,
     Names & columns);
 
-MergeTreeReadTask::Columns getReadTaskColumns(
+MergeTreeReadTaskColumns getReadTaskColumns(
     const IMergeTreeDataPartInfoForReader & data_part_info_for_reader,
     const StorageSnapshotPtr & storage_snapshot,
     const Names & required_columns,
-    const Names & system_columns,
     const PrewhereInfoPtr & prewhere_info,
     const ExpressionActionsSettings & actions_settings,
     const MergeTreeReaderSettings & reader_settings,
diff --git a/src/Storages/MergeTree/MergeTreeData.cpp b/src/Storages/MergeTree/MergeTreeData.cpp
index e3de926570b..3e4350c2fbb 100644
--- a/src/Storages/MergeTree/MergeTreeData.cpp
+++ b/src/Storages/MergeTree/MergeTreeData.cpp
@@ -8,6 +8,7 @@
 #include <Backups/BackupEntryWrappedWith.h>
 #include <Backups/IBackup.h>
 #include <Backups/RestorerFromBackup.h>
+#include "Common/logger_useful.h"
 #include <Common/Config/ConfigHelper.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/Increment.h>
@@ -35,7 +36,6 @@
 #include <Disks/ObjectStorages/DiskObjectStorage.h>
 #include <Disks/TemporaryFileOnDisk.h>
 #include <Disks/createVolume.h>
-#include <Functions/IFunction.h>
 #include <IO/Operators.h>
 #include <IO/S3Common.h>
 #include <IO/SharedThreadPools.h>
@@ -61,7 +61,6 @@
 #include <Parsers/ASTPartition.h>
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
-#include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/ASTAlterQuery.h>
@@ -69,13 +68,11 @@
 #include <Processors/QueryPlan/QueryIdHolder.h>
 #include <Processors/QueryPlan/ReadFromMergeTree.h>
 #include <Storages/AlterCommands.h>
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Storages/Freeze.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
-#include <Storages/MergeTree/MergeTreeDataPartWide.h>
 #include <Storages/Statistics/Estimator.h>
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
 #include <Storages/MergeTree/checkDataPart.h>
@@ -93,16 +90,12 @@
 
 #include <algorithm>
 #include <atomic>
-#include <cmath>
 #include <chrono>
-#include <iomanip>
 #include <limits>
 #include <optional>
 #include <ranges>
 #include <set>
 #include <thread>
-#include <typeinfo>
-#include <typeindex>
 #include <unordered_set>
 #include <filesystem>
 
@@ -195,6 +188,7 @@ namespace ErrorCodes
     extern const int TOO_MANY_MUTATIONS;
     extern const int CANNOT_SCHEDULE_TASK;
     extern const int LIMIT_EXCEEDED;
+    extern const int CANNOT_FORGET_PARTITION;
 }
 
 static void checkSuspiciousIndices(const ASTFunction * index_function)
@@ -268,7 +262,7 @@ void MergeTreeData::initializeDirectoriesAndFormatVersion(const std::string & re
         if (need_create_directories)
         {
             disk->createDirectories(relative_data_path);
-            disk->createDirectories(fs::path(relative_data_path) / MergeTreeData::DETACHED_DIR_NAME);
+            disk->createDirectories(fs::path(relative_data_path) / DETACHED_DIR_NAME);
         }
 
         if (disk->exists(format_version_path))
@@ -300,7 +294,11 @@ void MergeTreeData::initializeDirectoriesAndFormatVersion(const std::string & re
             if (disk->isBroken())
                continue;
 
-            if (!disk->isReadOnly())
+            /// Write once disk is almost the same as read-only for MergeTree,
+            /// since it does not support move, that is required for any
+            /// operation over MergeTree, so avoid writing format_version.txt
+            /// into it as well, to avoid leaving it after DROP.
+            if (!disk->isReadOnly() && !disk->isWriteOnce())
             {
                 auto buf = disk->writeFile(format_version_path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Rewrite, getContext()->getWriteSettings());
                 writeIntText(format_version.toUnderType(), *buf);
@@ -346,7 +344,7 @@ MergeTreeData::MergeTreeData(
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> storage_settings_,
     bool require_part_metadata_,
-    bool attach,
+    LoadingStrictnessLevel mode,
     BrokenPartCallback broken_part_callback_)
     : IStorage(table_id_)
     , WithMutableContext(context_->getGlobalContext())
@@ -354,8 +352,7 @@ MergeTreeData::MergeTreeData(
     , merging_params(merging_params_)
     , require_part_metadata(require_part_metadata_)
     , broken_part_callback(broken_part_callback_)
-    , log_name(std::make_shared<String>(table_id_.getNameForLogs()))
-    , log(&Poco::Logger::get(*log_name))
+    , log(table_id_.getNameForLogs())
     , storage_settings(std::move(storage_settings_))
     , pinned_part_uuids(std::make_shared<PinnedPartUUIDs>())
     , data_parts_by_info(data_parts_indexes.get<TagByInfo>())
@@ -368,10 +365,12 @@ MergeTreeData::MergeTreeData(
 
     const auto settings = getSettings();
 
-    allow_nullable_key = attach || settings->allow_nullable_key;
+    bool sanity_checks = mode <= LoadingStrictnessLevel::CREATE;
+
+    allow_nullable_key = !sanity_checks || settings->allow_nullable_key;
 
     /// Check sanity of MergeTreeSettings. Only when table is created.
-    if (!attach)
+    if (sanity_checks)
         settings->sanityCheck(getContext()->getMergeMutateExecutor()->getMaxTasksCount());
 
     if (!date_column_name.empty())
@@ -379,7 +378,7 @@ MergeTreeData::MergeTreeData(
         try
         {
             checkPartitionKeyAndInitMinMax(metadata_.partition_key);
-            setProperties(metadata_, metadata_, attach);
+            setProperties(metadata_, metadata_, !sanity_checks);
             if (minmax_idx_date_column_pos == -1)
                 throw Exception(ErrorCodes::BAD_TYPE_OF_FIELD, "Could not find Date column");
         }
@@ -395,7 +394,7 @@ MergeTreeData::MergeTreeData(
         is_custom_partitioned = true;
         checkPartitionKeyAndInitMinMax(metadata_.partition_key);
     }
-    setProperties(metadata_, metadata_, attach);
+    setProperties(metadata_, metadata_, !sanity_checks);
 
     /// NOTE: using the same columns list as is read when performing actual merges.
     merging_params.check(metadata_);
@@ -403,11 +402,11 @@ MergeTreeData::MergeTreeData(
     if (metadata_.sampling_key.definition_ast != nullptr)
     {
         /// This is for backward compatibility.
-        checkSampleExpression(metadata_, attach || settings->compatibility_allow_sampling_expression_not_in_primary_key,
-                              settings->check_sample_column_is_correct && !attach);
+        checkSampleExpression(metadata_, !sanity_checks || settings->compatibility_allow_sampling_expression_not_in_primary_key,
+                              settings->check_sample_column_is_correct && sanity_checks);
     }
 
-    checkColumnFilenamesForCollision(metadata_.getColumns(), *settings, !attach);
+    checkColumnFilenamesForCollision(metadata_.getColumns(), *settings, sanity_checks);
     checkTTLExpressions(metadata_, metadata_);
 
     String reason;
@@ -431,6 +430,31 @@ MergeTreeData::MergeTreeData(
     };
 }
 
+VirtualColumnsDescription MergeTreeData::createVirtuals(const StorageInMemoryMetadata & metadata)
+{
+    VirtualColumnsDescription desc;
+
+    desc.addEphemeral("_part", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Name of part");
+    desc.addEphemeral("_part_index", std::make_shared<DataTypeUInt64>(), "Sequential index of the part in the query result");
+    desc.addEphemeral("_part_uuid", std::make_shared<DataTypeUUID>(), "Unique part identifier (if enabled MergeTree setting assign_part_uuids)");
+    desc.addEphemeral("_partition_id", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "Name of partition");
+    desc.addEphemeral("_sample_factor", std::make_shared<DataTypeFloat64>(), "Sample factor (from the query)");
+    desc.addEphemeral("_part_offset", std::make_shared<DataTypeUInt64>(), "Number of row in the part");
+    desc.addEphemeral("_part_data_version", std::make_shared<DataTypeUInt64>(), "Data version of part (either min block number or mutation version)");
+
+    if (metadata.hasPartitionKey())
+    {
+        auto partition_types = metadata.partition_key.sample_block.getDataTypes();
+        desc.addEphemeral("_partition_value", std::make_shared<DataTypeTuple>(std::move(partition_types)), "Value (a tuple) of a PARTITION BY expression");
+    }
+
+    desc.addPersistent(RowExistsColumn::name, RowExistsColumn::type, nullptr, "Persisted mask created by lightweight delete that show whether row exists or is deleted");
+    desc.addPersistent(BlockNumberColumn::name, BlockNumberColumn::type, BlockNumberColumn::codec, "Persisted original number of block that was assigned at insert");
+    desc.addPersistent(BlockOffsetColumn::name, BlockOffsetColumn::type, BlockOffsetColumn::codec, "Persisted original number of row in block that was assigned at insert");
+
+    return desc;
+}
+
 StoragePolicyPtr MergeTreeData::getStoragePolicy() const
 {
     auto settings = getSettings();
@@ -628,8 +652,10 @@ void MergeTreeData::checkProperties(
             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);
+                ASTPtr index_expression = index_ast ? index_ast->getExpression() : nullptr;
+                const auto * index_expression_ptr = index_expression ? typeid_cast<const ASTFunction *>(index_expression.get()) : nullptr;
+                if (index_expression_ptr)
+                    checkSuspiciousIndices(index_expression_ptr);
             }
 
             MergeTreeIndexFactory::instance().validate(index, attach);
@@ -678,6 +704,7 @@ void MergeTreeData::setProperties(
 {
     checkProperties(new_metadata, old_metadata, attach, false, allow_nullable_key, local_context);
     setInMemoryMetadata(new_metadata);
+    setVirtuals(createVirtuals(new_metadata));
 }
 
 namespace
@@ -871,7 +898,7 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
             if (is_optional)
                 return;
 
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Sign column for storage {} is empty", storage);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Sign column for storage {} is empty", storage);
         }
 
         bool miss_column = true;
@@ -898,7 +925,7 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
             if (is_optional)
                 return;
 
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Version column for storage {} is empty", storage);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Version column for storage {} is empty", storage);
         }
 
         bool miss_column = true;
@@ -927,12 +954,12 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
             if (is_optional)
                 return;
 
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: is_deleted ({}) column for storage {} is empty", is_deleted_column, storage);
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "`is_deleted` ({}) column for storage {} is empty", is_deleted_column, storage);
         }
         else
         {
             if (version_column.empty() && !is_optional)
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: Version column ({}) for storage {} is empty while is_deleted ({}) is not.",
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Version column ({}) for storage {} is empty while is_deleted ({}) is not.",
                                 version_column, storage, is_deleted_column);
 
             bool miss_is_deleted_column = true;
@@ -1003,73 +1030,38 @@ void MergeTreeData::MergingParams::check(const StorageInMemoryMetadata & metadat
     /// TODO Checks for Graphite mode.
 }
 
+const Names MergeTreeData::virtuals_useful_for_filter = {"_part", "_partition_id", "_part_uuid", "_partition_value", "_part_data_version"};
 
-DataTypePtr MergeTreeData::getPartitionValueType() const
+Block MergeTreeData::getHeaderWithVirtualsForFilter() const
 {
-    DataTypePtr partition_value_type;
-    auto partition_types = getInMemoryMetadataPtr()->partition_key.sample_block.getDataTypes();
-    if (partition_types.empty())
-        partition_value_type = std::make_shared<DataTypeUInt8>();
-    else
-        partition_value_type = std::make_shared<DataTypeTuple>(std::move(partition_types));
-    return partition_value_type;
+    Block header;
+    auto virtuals_desc = getVirtualsPtr();
+    for (const auto & name : virtuals_useful_for_filter)
+        if (auto column = virtuals_desc->tryGet(name))
+            header.insert({column->type->createColumn(), column->type, name});
+    return header;
 }
 
-
-Block MergeTreeData::getSampleBlockWithVirtualColumns() const
+Block MergeTreeData::getBlockWithVirtualsForFilter(const MergeTreeData::DataPartsVector & parts, bool ignore_empty) const
 {
-    DataTypePtr partition_value_type = getPartitionValueType();
-    return {
-        ColumnWithTypeAndName(
-            DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-            "_part"),
-        ColumnWithTypeAndName(
-            DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn(),
-            std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()),
-            "_partition_id"),
-        ColumnWithTypeAndName(ColumnUUID::create(), std::make_shared<DataTypeUUID>(), "_part_uuid"),
-        ColumnWithTypeAndName(partition_value_type->createColumn(), partition_value_type, "_partition_value")};
-}
+    auto block = getHeaderWithVirtualsForFilter();
 
-
-Block MergeTreeData::getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part, bool ignore_empty) const
-{
-    auto block = getSampleBlockWithVirtualColumns();
-    MutableColumns columns = block.mutateColumns();
-
-    auto & part_column = columns[0];
-    auto & partition_id_column = columns[1];
-    auto & part_uuid_column = columns[2];
-    auto & partition_value_column = columns[3];
-
-    bool has_partition_value = typeid_cast<const ColumnTuple *>(partition_value_column.get());
     for (const auto & part_or_projection : parts)
     {
         if (ignore_empty && part_or_projection->isEmpty())
             continue;
-        const auto * part = part_or_projection->isProjectionPart() ? part_or_projection->getParentPart() : part_or_projection.get();
-        part_column->insert(part->name);
-        partition_id_column->insert(part->info.partition_id);
-        part_uuid_column->insert(part->uuid);
-        Tuple tuple(part->partition.value.begin(), part->partition.value.end());
-        if (has_partition_value)
-            partition_value_column->insert(tuple);
 
-        if (one_part)
+        const auto * part = part_or_projection->isProjectionPart()
+            ? part_or_projection->getParentPart()
+            : part_or_projection.get();
+
+        for (auto & column : block)
         {
-            part_column = ColumnConst::create(std::move(part_column), 1);
-            partition_id_column = ColumnConst::create(std::move(partition_id_column), 1);
-            part_uuid_column = ColumnConst::create(std::move(part_uuid_column), 1);
-            if (has_partition_value)
-                partition_value_column = ColumnConst::create(std::move(partition_value_column), 1);
-            break;
+            auto field = getFieldForConstVirtualColumn(column.name, *part);
+            column.column->assumeMutableRef().insert(field);
         }
     }
 
-    block.setColumns(std::move(columns));
-    if (!has_partition_value)
-        block.erase("_partition_value");
     return block;
 }
 
@@ -1078,13 +1070,16 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     const ActionsDAGPtr & filter_actions_dag, ContextPtr local_context, const DataPartsVector & parts) const
 {
     if (parts.empty())
-        return 0u;
+        return 0;
+
     auto metadata_snapshot = getInMemoryMetadataPtr();
-    Block virtual_columns_block = getBlockWithVirtualPartColumns(parts, true /* one_part */);
+    auto virtual_columns_block = getBlockWithVirtualsForFilter({parts[0]});
 
     auto filter_dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_actions_dag->getOutputs().at(0), nullptr);
+    if (!filter_dag)
+        return {};
 
-    // Generate valid expressions for filtering
+    /// Generate valid expressions for filtering
     bool valid = true;
     for (const auto * input : filter_dag->getInputs())
         if (!virtual_columns_block.has(input->result_name))
@@ -1097,7 +1092,7 @@ std::optional<UInt64> MergeTreeData::totalRowsByPartitionPredicateImpl(
     std::unordered_set<String> part_values;
     if (valid)
     {
-        virtual_columns_block = getBlockWithVirtualPartColumns(parts, false /* one_part */);
+        virtual_columns_block = getBlockWithVirtualsForFilter(parts);
         VirtualColumnUtils::filterBlockWithDAG(filter_dag, virtual_columns_block, local_context);
         part_values = VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
         if (part_values.empty())
@@ -1222,7 +1217,7 @@ MergeTreeData::PartLoadingTree::build(PartLoadingInfos nodes)
 }
 
 static std::optional<size_t> calculatePartSizeSafe(
-    const MergeTreeData::DataPartPtr & part, Poco::Logger * log)
+    const MergeTreeData::DataPartPtr & part, const LoggerPtr & log)
 {
     try
     {
@@ -1296,7 +1291,7 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
         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);
+        res.size_of_part = calculatePartSizeSafe(res.part, log.load());
         auto part_size_str = res.size_of_part ? formatReadableSizeWithBinarySuffix(*res.size_of_part) : "failed to calculate size";
 
         LOG_ERROR(log,
@@ -1327,7 +1322,7 @@ MergeTreeData::LoadPartResult MergeTreeData::loadDataPart(
     if (part_disk_ptr->exists(marker_path))
     {
         /// NOTE: getBytesOnDisk() cannot be used here, since it may be zero if checksums.txt does not exist.
-        res.size_of_part = calculatePartSizeSafe(res.part, log);
+        res.size_of_part = calculatePartSizeSafe(res.part, log.load());
         res.is_broken = true;
 
         auto part_size_str = res.size_of_part ? formatReadableSizeWithBinarySuffix(*res.size_of_part) : "failed to calculate size";
@@ -1718,8 +1713,7 @@ void MergeTreeData::loadDataParts(bool skip_sanity_checks, std::optional<std::un
             {
                 /// Skip temporary directories, file 'format_version.txt' and directory 'detached'.
                 if (startsWith(it->name(), "tmp") || it->name() == MergeTreeData::FORMAT_VERSION_FILE_NAME
-                    || it->name() == MergeTreeData::DETACHED_DIR_NAME
-                    || startsWith(it->name(), MergeTreeWriteAheadLog::WAL_FILE_NAME))
+                    || it->name() == DETACHED_DIR_NAME)
                     continue;
 
                 if (auto part_info = MergeTreePartInfo::tryParsePartName(it->name(), format_version))
@@ -1992,6 +1986,15 @@ void MergeTreeData::waitForOutdatedPartsToBeLoaded() const TSA_NO_THREAD_SAFETY_
     if (isStaticStorage())
         return;
 
+    /// If waiting is not required, do NOT log and do NOT enable/disable turbo mode to make `waitForOutdatedPartsToBeLoaded` a lightweight check
+    {
+        std::unique_lock lock(outdated_data_parts_mutex);
+        if (outdated_data_parts_loading_canceled)
+            throw Exception(ErrorCodes::NOT_INITIALIZED, "Loading of outdated data parts was already canceled");
+        if (outdated_data_parts_loading_finished)
+            return;
+    }
+
     /// We need to load parts as fast as possible
     getOutdatedPartsLoadingThreadPool().enableTurboMode();
     SCOPE_EXIT({
@@ -2114,7 +2117,7 @@ size_t MergeTreeData::clearOldTemporaryDirectories(const String & root_path, siz
                     {
                         /// 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(LogFrequencyLimiter(log, 10), "{} is in use (by merge/mutation/INSERT) (consider increasing temporary_directories_lifetime setting)", full_path);
+                        LOG_INFO(LogFrequencyLimiter(log.load(), 10), "{} is in use (by merge/mutation/INSERT) (consider increasing temporary_directories_lifetime setting)", full_path);
                         continue;
                     }
                     else if (!disk->exists(it->path()))
@@ -2272,7 +2275,6 @@ MergeTreeData::DataPartsVector MergeTreeData::grabOldParts(bool force)
             bool reached_removal_time = part_remove_time <= time_now && time_now - part_remove_time >= getSettings()->old_parts_lifetime.totalSeconds();
             if ((reached_removal_time && !has_skipped_mutation_parent(part))
                 || force
-                || isInMemoryPart(part)     /// Remove in-memory parts immediately to not store excessive data in RAM
                 || (part->version.creation_csn == Tx::RolledBackCSN && getSettings()->remove_rolled_back_parts_immediately))
             {
                 part->removal_state.store(DataPartRemovalState::REMOVED, std::memory_order_relaxed);
@@ -2734,12 +2736,20 @@ void MergeTreeData::rename(const String & new_table_path, const StorageID & new_
 void MergeTreeData::renameInMemory(const StorageID & new_table_id)
 {
     IStorage::renameInMemory(new_table_id);
-    std::atomic_store(&log_name, std::make_shared<String>(new_table_id.getNameForLogs()));
-    log = &Poco::Logger::get(*log_name);
+    log.store(new_table_id.getNameForLogs());
 }
 
 void MergeTreeData::dropAllData()
 {
+    /// In case there is read-only/write-once disk we cannot allow to call dropAllData(), but dropping tables is allowed.
+    ///
+    /// Note, that one may think that drop on write-once disk should be
+    /// supported, since it is pretty trivial to implement
+    /// MetadataStorageFromPlainObjectStorageTransaction::removeDirectory(),
+    /// however removing part requires moveDirectory() as well.
+    if (isStaticStorage())
+        return;
+
     LOG_TRACE(log, "dropAllData: waiting for locks.");
     auto settings_ptr = getSettings();
 
@@ -2795,7 +2805,7 @@ void MergeTreeData::dropAllData()
             && settings_ptr->allow_remote_fs_zero_copy_replication;
         try
         {
-            bool keep_shared = removeDetachedPart(part.disk, fs::path(relative_data_path) / "detached" / part.dir_name / "", part.dir_name);
+            bool keep_shared = removeDetachedPart(part.disk, fs::path(relative_data_path) / DETACHED_DIR_NAME / part.dir_name / "", part.dir_name);
             LOG_DEBUG(log, "Dropped detached part {}, keep shared data: {}", part.dir_name, keep_shared);
         }
         catch (...)
@@ -2878,8 +2888,8 @@ void MergeTreeData::dropIfEmpty()
             if (disk->isBroken())
                 continue;
             /// Non recursive, exception is thrown if there are more files.
-            disk->removeFileIfExists(fs::path(relative_data_path) / MergeTreeData::FORMAT_VERSION_FILE_NAME);
-            disk->removeDirectory(fs::path(relative_data_path) / MergeTreeData::DETACHED_DIR_NAME);
+            disk->removeFileIfExists(fs::path(relative_data_path) / FORMAT_VERSION_FILE_NAME);
+            disk->removeDirectory(fs::path(relative_data_path) / DETACHED_DIR_NAME);
             disk->removeDirectory(relative_data_path);
         }
     }
@@ -2993,7 +3003,7 @@ void MergeTreeData::checkAlterIsPossible(const AlterCommands & commands, Context
 
     commands.apply(new_metadata, local_context);
 
-    if (commands.hasInvertedIndex(new_metadata) && !settings.allow_experimental_inverted_index)
+    if (AlterCommands::hasInvertedIndex(new_metadata) && !settings.allow_experimental_inverted_index)
         throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
                 "Experimental Inverted Index feature is not enabled (turn on setting 'allow_experimental_inverted_index')");
 
@@ -3442,7 +3452,7 @@ void MergeTreeData::changeSettings(
                     {
                         auto disk = new_storage_policy->getDiskByName(disk_name);
                         disk->createDirectories(relative_data_path);
-                        disk->createDirectories(fs::path(relative_data_path) / MergeTreeData::DETACHED_DIR_NAME);
+                        disk->createDirectories(fs::path(relative_data_path) / DETACHED_DIR_NAME);
                     }
                     /// FIXME how would that be done while reloading configuration???
 
@@ -3651,6 +3661,7 @@ void MergeTreeData::checkPartDynamicColumns(MutableDataPartPtr & part, DataParts
 {
     auto metadata_snapshot = getInMemoryMetadataPtr();
     const auto & columns = metadata_snapshot->getColumns();
+    auto virtuals = getVirtualsPtr();
 
     if (!hasDynamicSubcolumns(columns))
         return;
@@ -3658,7 +3669,7 @@ 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 || part_column.name == BlockNumberColumn::name)
+        if (virtuals->has(part_column.name))
             continue;
 
         auto storage_column = columns.getPhysical(part_column.name);
@@ -4878,11 +4889,20 @@ void MergeTreeData::checkAlterPartitionIsPossible(
                 const auto * partition_ast = command.partition->as<ASTPartition>();
                 if (partition_ast && partition_ast->all)
                 {
-                    if (command.type != PartitionCommand::DROP_PARTITION)
-                        throw DB::Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only support DROP/DETACH PARTITION ALL currently");
+                    if (command.type != PartitionCommand::DROP_PARTITION && command.type != PartitionCommand::ATTACH_PARTITION)
+                        throw DB::Exception(ErrorCodes::SUPPORT_IS_DISABLED, "Only support DROP/DETACH/ATTACH PARTITION ALL currently");
                 }
                 else
-                    getPartitionIDFromQuery(command.partition, local_context);
+                {
+                    String partition_id = getPartitionIDFromQuery(command.partition, local_context);
+                    if (command.type == PartitionCommand::FORGET_PARTITION)
+                    {
+                        DataPartsLock lock = lockParts();
+                        auto parts_in_partition = getDataPartsPartitionRange(partition_id);
+                        if (!parts_in_partition.empty())
+                            throw Exception(ErrorCodes::CANNOT_FORGET_PARTITION, "Partition {} is not empty", partition_id);
+                    }
+                }
             }
         }
     }
@@ -5103,6 +5123,11 @@ void MergeTreeData::fetchPartition(
     throw Exception(ErrorCodes::NOT_IMPLEMENTED, "FETCH PARTITION is not supported by storage {}", getName());
 }
 
+void MergeTreeData::forgetPartition(const ASTPtr & /*partition*/, ContextPtr /*query_context*/)
+{
+    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "FORGET PARTITION is not supported by storage {}", getName());
+}
+
 Pipe MergeTreeData::alterPartition(
     const StorageMetadataPtr & metadata_snapshot,
     const PartitionCommands & commands,
@@ -5139,6 +5164,10 @@ Pipe MergeTreeData::alterPartition(
                 dropDetached(command.partition, command.part, query_context);
                 break;
 
+            case PartitionCommand::FORGET_PARTITION:
+                forgetPartition(command.partition, query_context);
+                break;
+
             case PartitionCommand::ATTACH_PARTITION:
                 current_command_results = attachPartition(command.partition, metadata_snapshot, command.part, query_context);
                 break;
@@ -5209,14 +5238,14 @@ Pipe MergeTreeData::alterPartition(
             case PartitionCommand::FREEZE_PARTITION:
             {
                 auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
-                current_command_results = freezePartition(command.partition, metadata_snapshot, command.with_name, query_context, lock);
+                current_command_results = freezePartition(command.partition, command.with_name, query_context, lock);
             }
             break;
 
             case PartitionCommand::FREEZE_ALL_PARTITIONS:
             {
                 auto lock = lockForShare(query_context->getCurrentQueryId(), query_context->getSettingsRef().lock_acquire_timeout);
-                current_command_results = freezeAll(command.with_name, metadata_snapshot, query_context, lock);
+                current_command_results = freezeAll(command.with_name, query_context, lock);
             }
             break;
 
@@ -5286,7 +5315,7 @@ MergeTreeData::PartsBackupEntries MergeTreeData::backupParts(
         if (hold_table_lock && !table_lock)
             table_lock = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
 
-        if (backup_settings.check_parts)
+        if (backup_settings.check_projection_parts)
             part->checkConsistencyWithProjections(/* require_part_metadata= */ true);
 
         BackupEntries backup_entries_from_part;
@@ -5298,7 +5327,8 @@ MergeTreeData::PartsBackupEntries MergeTreeData::backupParts(
             read_settings,
             make_temporary_hard_links,
             backup_entries_from_part,
-            &temp_dirs);
+            &temp_dirs,
+            false, false);
 
         auto projection_parts = part->getProjectionParts();
         for (const auto & [projection_name, projection_part] : projection_parts)
@@ -5311,7 +5341,9 @@ MergeTreeData::PartsBackupEntries MergeTreeData::backupParts(
                 read_settings,
                 make_temporary_hard_links,
                 backup_entries_from_part,
-                &temp_dirs);
+                &temp_dirs,
+                projection_part->is_broken,
+                backup_settings.allow_backup_broken_projections);
         }
 
         if (hold_storage_and_part_ptrs)
@@ -5341,7 +5373,7 @@ void MergeTreeData::restoreDataFromBackup(RestorerFromBackup & restorer, const S
         return;
 
     if (!restorer.isNonEmptyTableAllowed() && getTotalActiveSizeInBytes() && backup->hasFiles(data_path_in_backup))
-        restorer.throwTableIsNotEmpty(getStorageID());
+        RestorerFromBackup::throwTableIsNotEmpty(getStorageID());
 
     restorePartsFromBackup(restorer, data_path_in_backup, partitions);
 }
@@ -5420,7 +5452,7 @@ void MergeTreeData::restorePartsFromBackup(RestorerFromBackup & restorer, const
         partition_ids = getPartitionIDsFromQuery(*partitions, restorer.getContext());
 
     auto backup = restorer.getBackup();
-    Strings part_names = backup->listFiles(data_path_in_backup);
+    Strings part_names = backup->listFiles(data_path_in_backup, /*recursive*/ false);
     boost::remove_erase(part_names, "mutations");
 
     bool restore_broken_parts_as_detached = restorer.getRestoreSettings().restore_broken_parts_as_detached;
@@ -5501,7 +5533,7 @@ void MergeTreeData::restorePartFromBackup(std::shared_ptr<RestoredPartsHolder> r
         if (filename.ends_with(IMergeTreeDataPart::TXN_VERSION_METADATA_FILE_NAME))
             continue;
 
-        size_t file_size = backup->copyFileToDisk(part_path_in_backup_fs / filename, disk, temp_part_dir / filename);
+        size_t file_size = backup->copyFileToDisk(part_path_in_backup_fs / filename, disk, temp_part_dir / filename, WriteMode::Rewrite);
         reservation->update(reservation->getSize() - file_size);
     }
 
@@ -6014,7 +6046,7 @@ DetachedPartsInfo MergeTreeData::getDetachedParts() const
 
     for (const auto & disk : getDisks())
     {
-        String detached_path = fs::path(relative_data_path) / MergeTreeData::DETACHED_DIR_NAME;
+        String detached_path = fs::path(relative_data_path) / DETACHED_DIR_NAME;
 
         /// Note: we don't care about TOCTOU issue here.
         if (disk->exists(detached_path))
@@ -6040,7 +6072,7 @@ void MergeTreeData::validateDetachedPartName(const String & name)
 
 void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr local_context)
 {
-    PartsTemporaryRename renamed_parts(*this, "detached/");
+    PartsTemporaryRename renamed_parts(*this, DETACHED_DIR_NAME);
 
     if (part)
     {
@@ -6065,7 +6097,7 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr
 
     for (auto & [old_name, new_name, disk] : renamed_parts.old_and_new_names)
     {
-        bool keep_shared = removeDetachedPart(disk, fs::path(relative_data_path) / "detached" / new_name / "", old_name);
+        bool keep_shared = removeDetachedPart(disk, fs::path(relative_data_path) / DETACHED_DIR_NAME / new_name / "", old_name);
         LOG_DEBUG(log, "Dropped detached part {}, keep shared data: {}", old_name, keep_shared);
         old_name.clear();
     }
@@ -6074,14 +6106,14 @@ void MergeTreeData::dropDetached(const ASTPtr & partition, bool part, ContextPtr
 MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const ASTPtr & partition, bool attach_part,
         ContextPtr local_context, PartsTemporaryRename & renamed_parts)
 {
-    const String source_dir = "detached/";
+    const fs::path source_dir = DETACHED_DIR_NAME;
 
     /// Let's compose a list of parts that should be added.
     if (attach_part)
     {
         const String part_id = partition->as<ASTLiteral &>().value.safeGet<String>();
         validateDetachedPartName(part_id);
-        if (temporary_parts.contains(String(DETACHED_DIR_NAME) + "/" + part_id))
+        if (temporary_parts.contains(source_dir / part_id))
         {
             LOG_WARNING(log, "Will not try to attach part {} because its directory is temporary, "
                              "probably it's being detached right now", part_id);
@@ -6094,15 +6126,23 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
     }
     else
     {
-        String partition_id = getPartitionIDFromQuery(partition, local_context);
-        LOG_DEBUG(log, "Looking for parts for partition {} in {}", partition_id, source_dir);
+        String partition_id;
+        if (partition->as<ASTPartition>()->all)
+        {
+            LOG_DEBUG(log, "Looking for parts for all partitions in {}", source_dir);
+        }
+        else
+        {
+            partition_id = getPartitionIDFromQuery(partition, local_context);
+            LOG_DEBUG(log, "Looking for parts for partition {} in {}", partition_id, source_dir);
+        }
 
         ActiveDataPartSet active_parts(format_version);
 
         auto detached_parts = getDetachedParts();
         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;
+            return !part_info.valid_name || !part_info.prefix.empty() || (!partition_id.empty() && part_info.partition_id != partition_id);
         });
 
         for (const auto & part_info : detached_parts)
@@ -6128,7 +6168,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
 
             LOG_DEBUG(log, "Found containing part {} for part {}", containing_part, part_info.dir_name);
 
-            if (!containing_part.empty() && containing_part != part_info.dir_name)
+            if (containing_part != part_info.dir_name)
                 part_info.disk->moveDirectory(fs::path(relative_data_path) / source_dir / part_info.dir_name,
                     fs::path(relative_data_path) / source_dir / ("inactive_" + part_info.dir_name));
             else
@@ -6150,7 +6190,7 @@ MergeTreeData::MutableDataPartsVector MergeTreeData::tryLoadPartsToAttach(const
         LOG_DEBUG(log, "Checking part {}", new_name);
 
         auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + old_name, disk);
-        auto part = getDataPartBuilder(old_name, single_disk_volume, source_dir + new_name)
+        auto part = getDataPartBuilder(old_name, single_disk_volume, source_dir / new_name)
             .withPartFormatFromDisk()
             .build();
 
@@ -6249,13 +6289,13 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
                     log,
                     "Would like to reserve space on volume '{}' by TTL rule of table '{}' but volume was not found",
                     move_ttl_entry->destination_name,
-                    *std::atomic_load(&log_name));
+                    log.loadName());
             else if (move_ttl_entry->destination_type == DataDestinationType::DISK && !move_ttl_entry->if_exists)
                 LOG_WARNING(
                     log,
                     "Would like to reserve space on disk '{}' by TTL rule of table '{}' but disk was not found",
                     move_ttl_entry->destination_name,
-                    *std::atomic_load(&log_name));
+                    log.loadName());
         }
         else if (is_insert && !perform_ttl_move_on_insert)
         {
@@ -6264,7 +6304,7 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
                 "TTL move on insert to {} {} for table {} is disabled",
                 (move_ttl_entry->destination_type == DataDestinationType::VOLUME ? "volume" : "disk"),
                 move_ttl_entry->destination_name,
-                *std::atomic_load(&log_name));
+                log.loadName());
         }
         else
         {
@@ -6280,13 +6320,13 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
                         log,
                         "Would like to reserve space on volume '{}' by TTL rule of table '{}' but there is not enough space",
                         move_ttl_entry->destination_name,
-                        *std::atomic_load(&log_name));
+                        log.loadName());
                 else if (move_ttl_entry->destination_type == DataDestinationType::DISK)
                     LOG_WARNING(
                         log,
                         "Would like to reserve space on disk '{}' by TTL rule of table '{}' but there is not enough space",
                         move_ttl_entry->destination_name,
-                        *std::atomic_load(&log_name));
+                        log.loadName());
             }
         }
     }
@@ -6299,7 +6339,7 @@ ReservationPtr MergeTreeData::tryReserveSpacePreferringTTLRules(
             "Trying to reserve {} on the selected disk: {} (with type {})",
             ReadableSize(expected_size),
             selected_disk->getName(),
-            toString(selected_disk->getDataSourceDescription().type));
+            selected_disk->getDataSourceDescription().toString());
         reservation = selected_disk->reserve(expected_size);
     }
 
@@ -6644,14 +6684,6 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
     const auto & primary_key_max_column_name = metadata_snapshot->minmax_count_projection->primary_key_max_column_name;
     NameSet required_columns_set(required_columns.begin(), required_columns.end());
 
-    if (required_columns_set.contains("_partition_value") && !typeid_cast<const DataTypeTuple *>(getPartitionValueType().get()))
-    {
-        throw Exception(
-            ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
-            "Missing column `_partition_value` because there is no partition column in table {}",
-            getStorageID().getTableName());
-    }
-
     if (!primary_key_max_column_name.empty())
         need_primary_key_max_column = required_columns_set.contains(primary_key_max_column_name);
 
@@ -6666,7 +6698,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
         auto * place = arena.alignedAlloc(size_of_state, align_of_state);
         func->create(place);
         if (const AggregateFunctionCount * agg_count = typeid_cast<const AggregateFunctionCount *>(func.get()))
-            agg_count->set(place, value.get<UInt64>());
+            AggregateFunctionCount::set(place, value.get<UInt64>());
         else
         {
             auto value_column = func->getArgumentTypes().front()->createColumnConst(1, value)->convertToFullColumnIfConst();
@@ -6677,11 +6709,11 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
     };
 
     Block virtual_columns_block;
-    auto virtual_block = getSampleBlockWithVirtualColumns();
+    auto virtual_block = getHeaderWithVirtualsForFilter();
     bool has_virtual_column = std::any_of(required_columns.begin(), required_columns.end(), [&](const auto & name) { return virtual_block.has(name); });
     if (has_virtual_column || filter_dag)
     {
-        virtual_columns_block = getBlockWithVirtualPartColumns(parts, false /* one_part */, true /* ignore_empty */);
+        virtual_columns_block = getBlockWithVirtualsForFilter(parts, /*ignore_empty=*/ true);
         if (virtual_columns_block.rows() == 0)
             return {};
     }
@@ -6815,7 +6847,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
         {
             for (const auto & part : real_parts)
             {
-                const auto & primary_key_column = *part->index[0];
+                const auto & primary_key_column = *part->getIndex()[0];
                 auto & min_column = assert_cast<ColumnAggregateFunction &>(*partition_minmax_count_columns[pos]);
                 insert(min_column, primary_key_column[0]);
             }
@@ -6826,7 +6858,7 @@ Block MergeTreeData::getMinMaxCountProjectionBlock(
         {
             for (const auto & part : real_parts)
             {
-                const auto & primary_key_column = *part->index[0];
+                const auto & primary_key_column = *part->getIndex()[0];
                 auto & max_column = assert_cast<ColumnAggregateFunction &>(*partition_minmax_count_columns[pos]);
                 insert(max_column, primary_key_column[primary_key_column.size() - 1]);
             }
@@ -6910,10 +6942,7 @@ QueryProcessingStage::Enum MergeTreeData::getQueryProcessingStage(
 
 
 UInt64 MergeTreeData::estimateNumberOfRowsToRead(
-    ContextPtr query_context,
-    const StorageSnapshotPtr & storage_snapshot,
-    const SelectQueryInfo & query_info,
-    const ActionDAGNodes & added_filter_nodes) const
+    ContextPtr query_context, const StorageSnapshotPtr & storage_snapshot, const SelectQueryInfo & query_info) const
 {
     const auto & snapshot_data = assert_cast<const MergeTreeData::SnapshotData &>(*storage_snapshot->data);
     const auto & parts = snapshot_data.parts;
@@ -6921,11 +6950,9 @@ UInt64 MergeTreeData::estimateNumberOfRowsToRead(
     MergeTreeDataSelectExecutor reader(*this);
     auto result_ptr = reader.estimateNumMarksToRead(
         parts,
-        query_info.prewhere_info,
         storage_snapshot->getMetadataForQuery()->getColumns().getAll().getNames(),
         storage_snapshot->metadata,
         query_info,
-        added_filter_nodes,
         query_context,
         query_context->getSettingsRef().max_threads);
 
@@ -7062,7 +7089,7 @@ MergeTreeData & MergeTreeData::checkStructureAndGetMergeTreeData(
     return checkStructureAndGetMergeTreeData(*source_table, src_snapshot, my_snapshot);
 }
 
-std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAndLoadDataPartOnSameDisk(
+std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAndLoadDataPart(
     const MergeTreeData::DataPartPtr & src_part,
     const String & tmp_part_prefix,
     const MergeTreePartInfo & dst_part_info,
@@ -7071,65 +7098,55 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
     const ReadSettings & read_settings,
     const WriteSettings & write_settings)
 {
-    /// Check that the storage policy contains the disk where the src_part is located.
-    bool does_storage_policy_allow_same_disk = false;
-    for (const DiskPtr & disk : getStoragePolicy()->getDisks())
+    chassert(!isStaticStorage());
+    bool on_same_disk = false;
+    for (const DiskPtr & disk : this->getStoragePolicy()->getDisks())
     {
         if (disk->getName() == src_part->getDataPartStorage().getDiskName())
         {
-            does_storage_policy_allow_same_disk = true;
+            on_same_disk = true;
             break;
         }
     }
-    if (!does_storage_policy_allow_same_disk)
-        throw Exception(
-            ErrorCodes::BAD_ARGUMENTS,
-            "Could not clone and load part {} because disk does not belong to storage policy",
-            quoteString(src_part->getDataPartStorage().getFullPath()));
+
 
     String dst_part_name = src_part->getNewName(dst_part_info);
     String tmp_dst_part_name = tmp_part_prefix + dst_part_name;
     auto temporary_directory_lock = getTemporaryPartDirectoryHolder(tmp_dst_part_name);
 
     /// Why it is needed if we only hardlink files?
+    /// Answer: In issue #59377, add copy when attach from different disk.
     auto reservation = src_part->getDataPartStorage().reserve(src_part->getBytesOnDisk());
     auto src_part_storage = src_part->getDataPartStoragePtr();
 
     scope_guard src_flushed_tmp_dir_lock;
     MergeTreeData::MutableDataPartPtr src_flushed_tmp_part;
 
-    /// If source part is in memory, flush it to disk and clone it already in on-disk format
-    /// Protect tmp dir from removing by cleanup thread with src_flushed_tmp_dir_lock
-    /// Construct src_flushed_tmp_part in order to delete part with its directory at destructor
-    if (auto src_part_in_memory = asInMemoryPart(src_part))
-    {
-        auto flushed_part_path = *src_part_in_memory->getRelativePathForPrefix(tmp_part_prefix);
-
-        auto tmp_src_part_file_name = fs::path(tmp_dst_part_name).filename();
-        src_flushed_tmp_dir_lock = src_part->storage.getTemporaryPartDirectoryHolder(tmp_src_part_file_name);
-
-        auto flushed_part_storage = src_part_in_memory->flushToDisk(flushed_part_path, metadata_snapshot);
-
-        src_flushed_tmp_part = MergeTreeDataPartBuilder(*this, src_part->name, flushed_part_storage)
-            .withPartInfo(src_part->info)
-            .withPartFormatFromDisk()
-            .build();
-
-        src_flushed_tmp_part->is_temp = true;
-        src_part_storage = flushed_part_storage;
-    }
-
     String with_copy;
-    if (params.copy_instead_of_hardlink)
+    if (params.copy_instead_of_hardlink || !on_same_disk)
         with_copy = " (copying data)";
 
-    auto dst_part_storage = src_part_storage->freeze(
-        relative_data_path,
-        tmp_dst_part_name,
-        read_settings,
-        write_settings,
-        /* save_metadata_callback= */ {},
-        params);
+
+    std::shared_ptr<IDataPartStorage> dst_part_storage{};
+    if (on_same_disk && !params.copy_instead_of_hardlink)
+    {
+        dst_part_storage = src_part_storage->freeze(
+            relative_data_path,
+            tmp_dst_part_name,
+            read_settings,
+            write_settings,
+            /* save_metadata_callback= */ {},
+            params);
+    }
+    else
+    {
+        auto reservation_on_dst = getStoragePolicy()->reserve(src_part->getBytesOnDisk());
+        if (!reservation_on_dst)
+            throw Exception(ErrorCodes::NOT_ENOUGH_SPACE, "Not enough space on disk.");
+        dst_part_storage = src_part_storage->clonePart(
+            this->getRelativeDataPath(), tmp_dst_part_name, reservation_on_dst->getDisk(), read_settings, write_settings, {}, {});
+    }
+
 
     if (params.metadata_version_to_write.has_value())
     {
@@ -7151,7 +7168,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
         .withPartFormatFromDisk()
         .build();
 
-    if (!params.copy_instead_of_hardlink && params.hardlinked_files)
+    if (on_same_disk && !params.copy_instead_of_hardlink && params.hardlinked_files)
     {
         params.hardlinked_files->source_part_name = src_part->name;
         params.hardlinked_files->source_table_shared_id = src_part->storage.getTableSharedID();
@@ -7195,6 +7212,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::cloneAn
     return std::make_pair(dst_data_part, std::move(temporary_directory_lock));
 }
 
+
 String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
 {
     return disk->getPath() + relative_data_path;
@@ -7203,11 +7221,10 @@ String MergeTreeData::getFullPathOnDisk(const DiskPtr & disk) const
 
 DiskPtr MergeTreeData::tryGetDiskForDetachedPart(const String & part_name) const
 {
-    String additional_path = "detached/";
     const auto disks = getStoragePolicy()->getDisks();
 
     for (const DiskPtr & disk : disks)
-        if (disk->exists(fs::path(relative_data_path) / additional_path / part_name))
+        if (disk->exists(fs::path(relative_data_path) / DETACHED_DIR_NAME / part_name))
             return disk;
 
     return nullptr;
@@ -7300,26 +7317,23 @@ MergeTreeData::MatcherFn MergeTreeData::getPartitionMatcher(const ASTPtr & parti
 
 PartitionCommandsResultInfo MergeTreeData::freezePartition(
     const ASTPtr & partition_ast,
-    const StorageMetadataPtr & metadata_snapshot,
     const String & with_name,
     ContextPtr local_context,
     TableLockHolder &)
 {
-    return freezePartitionsByMatcher(getPartitionMatcher(partition_ast, local_context), metadata_snapshot, with_name, local_context);
+    return freezePartitionsByMatcher(getPartitionMatcher(partition_ast, local_context), with_name, local_context);
 }
 
 PartitionCommandsResultInfo MergeTreeData::freezeAll(
     const String & with_name,
-    const StorageMetadataPtr & metadata_snapshot,
     ContextPtr local_context,
     TableLockHolder &)
 {
-    return freezePartitionsByMatcher([] (const String &) { return true; }, metadata_snapshot, with_name, local_context);
+    return freezePartitionsByMatcher([] (const String &) { return true; }, with_name, local_context);
 }
 
 PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
     MatcherFn matcher,
-    const StorageMetadataPtr & metadata_snapshot,
     const String & with_name,
     ContextPtr local_context)
 {
@@ -7371,22 +7385,6 @@ PartitionCommandsResultInfo MergeTreeData::freezePartitionsByMatcher(
         scope_guard src_flushed_tmp_dir_lock;
         MergeTreeData::MutableDataPartPtr src_flushed_tmp_part;
 
-        if (auto part_in_memory = asInMemoryPart(part))
-        {
-            auto flushed_part_path = *part_in_memory->getRelativePathForPrefix("tmp_freeze");
-            src_flushed_tmp_dir_lock = part->storage.getTemporaryPartDirectoryHolder("tmp_freeze" + part->name);
-
-            auto flushed_part_storage = part_in_memory->flushToDisk(flushed_part_path, metadata_snapshot);
-
-            src_flushed_tmp_part = MergeTreeDataPartBuilder(*this, part->name, flushed_part_storage)
-                .withPartInfo(part->info)
-                .withPartFormatFromDisk()
-                .build();
-
-            src_flushed_tmp_part->is_temp = true;
-            data_part_storage = flushed_part_storage;
-        }
-
         auto callback = [this, &part, &backup_part_path](const DiskPtr & disk)
         {
             // Store metadata for replicated table.
@@ -7801,25 +7799,43 @@ MovePartsOutcome MergeTreeData::moveParts(const CurrentlyMovingPartsTaggerPtr &
     return result;
 }
 
-bool MergeTreeData::partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right, String & out_reason)
+bool MergeTreeData::partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right, PreformattedMessage & out_reason)
 {
-    if (left->getProjectionParts().size() != right->getProjectionParts().size())
+    auto remove_broken_parts_from_consideration = [](auto & parts)
     {
-        out_reason = fmt::format(
+        std::set<String> broken_projection_parts;
+        for (const auto & [name, part] : parts)
+        {
+            if (part->is_broken)
+                broken_projection_parts.emplace(name);
+        }
+        for (const auto & name : broken_projection_parts)
+            parts.erase(name);
+    };
+
+    auto left_projection_parts = left->getProjectionParts();
+    auto right_projection_parts = right->getProjectionParts();
+
+    remove_broken_parts_from_consideration(left_projection_parts);
+    remove_broken_parts_from_consideration(right_projection_parts);
+
+    if (left_projection_parts.size() != right_projection_parts.size())
+    {
+        out_reason = PreformattedMessage::create(
             "Parts have different number of projections: {} in part '{}' and {} in part '{}'",
-            left->getProjectionParts().size(),
+            left_projection_parts.size(),
             left->name,
-            right->getProjectionParts().size(),
+            right_projection_parts.size(),
             right->name
         );
         return false;
     }
 
-    for (const auto & [name, _] : left->getProjectionParts())
+    for (const auto & [name, _] : left_projection_parts)
     {
-        if (!right->hasProjection(name))
+        if (!right_projection_parts.contains(name))
         {
-            out_reason = fmt::format(
+            out_reason = PreformattedMessage::create(
                 "The part '{}' doesn't have projection '{}' while part '{}' does", right->name, name, left->name
             );
             return false;
@@ -7921,31 +7937,15 @@ bool MergeTreeData::canUsePolymorphicParts(const MergeTreeSettings & settings, S
 
 AlterConversionsPtr MergeTreeData::getAlterConversionsForPart(MergeTreeDataPartPtr part) const
 {
-    auto commands_map = getAlterMutationCommandsForPart(part);
+    auto commands = getAlterMutationCommandsForPart(part);
 
     auto result = std::make_shared<AlterConversions>();
-    for (const auto & [_, commands] : commands_map)
-        for (const auto & command : commands)
-            result->addMutationCommand(command);
+    for (const auto & command : commands | std::views::reverse)
+        result->addMutationCommand(command);
 
     return result;
 }
 
-NamesAndTypesList MergeTreeData::getVirtuals() const
-{
-    return NamesAndTypesList{
-        NameAndTypePair("_part", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-        NameAndTypePair("_part_index", std::make_shared<DataTypeUInt64>()),
-        NameAndTypePair("_part_uuid", std::make_shared<DataTypeUUID>()),
-        NameAndTypePair("_partition_id", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-        NameAndTypePair("_partition_value", getPartitionValueType()),
-        NameAndTypePair("_sample_factor", std::make_shared<DataTypeFloat64>()),
-        NameAndTypePair("_part_offset", std::make_shared<DataTypeUInt64>()),
-        LightweightDeleteDescription::FILTER_COLUMN,
-        NameAndTypePair(BlockNumberColumn::name, BlockNumberColumn::type),
-    };
-}
-
 size_t MergeTreeData::getTotalMergesWithTTLInMergeList() const
 {
     return getContext()->getMergeList().getMergesWithTTLCount();
@@ -7989,7 +7989,7 @@ bool MergeTreeData::insertQueryIdOrThrowNoLock(const String & query_id, size_t m
         throw Exception(
             ErrorCodes::TOO_MANY_SIMULTANEOUS_QUERIES,
             "Too many simultaneous queries for table {}. Maximum is: {}",
-            *std::atomic_load(&log_name),
+            log.loadName(),
             max_queries);
     query_id_set.insert(query_id);
     return true;
@@ -8181,7 +8181,7 @@ ReservationPtr MergeTreeData::balancedReservation(
                     }
 
                     // Record submerging big parts in the tagger to clean them up.
-                    tagger_ptr->emplace(*this, part_name, std::move(covered_parts), log);
+                    tagger_ptr->emplace(*this, part_name, std::move(covered_parts), log.load());
                 }
             }
         }
@@ -8231,6 +8231,11 @@ void MergeTreeData::updateObjectColumns(const DataPartPtr & part, const DataPart
     DB::updateObjectColumns(object_columns, columns, part->getColumns());
 }
 
+bool MergeTreeData::supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const
+{
+    return !hasLightweightDeletedMask();
+}
+
 StorageSnapshotPtr MergeTreeData::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const
 {
     auto snapshot_data = std::make_unique<SnapshotData>();
@@ -8315,6 +8320,7 @@ std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> MergeTreeData::createE
 
     new_data_part->setColumns(columns, {}, metadata_snapshot->getMetadataVersion());
     new_data_part->rows_count = block.rows();
+    new_data_part->existing_rows_count = block.rows();
 
     new_data_part->partition = partition;
 
diff --git a/src/Storages/MergeTree/MergeTreeData.h b/src/Storages/MergeTree/MergeTreeData.h
index f0dbaf0e307..d21f87c337e 100644
--- a/src/Storages/MergeTree/MergeTreeData.h
+++ b/src/Storages/MergeTree/MergeTreeData.h
@@ -5,6 +5,7 @@
 #include <Common/SimpleIncrement.h>
 #include <Common/SharedMutex.h>
 #include <Common/MultiVersion.h>
+#include <Common/Logger.h>
 #include <Storages/IStorage.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/WriteBufferFromFile.h>
@@ -22,9 +23,7 @@
 #include <Storages/MergeTree/MergeList.h>
 #include <Storages/MergeTree/IMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreePartsMover.h>
-#include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
 #include <Storages/MergeTree/PinnedPartUUIDs.h>
 #include <Storages/MergeTree/ZeroCopyLock.h>
 #include <Storages/MergeTree/TemporaryParts.h>
@@ -34,8 +33,8 @@
 #include <Storages/extractKeyExpressionList.h>
 #include <Storages/PartitionCommands.h>
 #include <Interpreters/PartLog.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
-
+#include <Poco/Timestamp.h>
+#include <Common/threadPoolCallbackRunner.h>
 
 #include <boost/multi_index_container.hpp>
 #include <boost/multi_index/ordered_index.hpp>
@@ -390,7 +389,7 @@ public:
                   const MergingParams & merging_params_,
                   std::unique_ptr<MergeTreeSettings> settings_,
                   bool require_part_metadata_,
-                  bool attach,
+                  LoadingStrictnessLevel mode,
                   BrokenPartCallback broken_part_callback_ = [](const String &){});
 
     /// Build a block of minmax and count values of a MergeTree table. These values are extracted
@@ -419,7 +418,7 @@ public:
     static ReservationPtr tryReserveSpace(UInt64 expected_size, const IDataPartStorage & data_part_storage);
     static ReservationPtr reserveSpace(UInt64 expected_size, const IDataPartStorage & data_part_storage);
 
-    static bool partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right, String & out_reason);
+    static bool partsContainSameProjections(const DataPartPtr & left, const DataPartPtr & right, PreformattedMessage & out_reason);
 
     StoragePolicyPtr getStoragePolicy() const override;
 
@@ -441,9 +440,7 @@ public:
 
     bool areAsynchronousInsertsEnabled() const override { return getSettings()->async_insert; }
 
-    bool supportsTrivialCountOptimization() const override { return !hasLightweightDeletedMask(); }
-
-    NamesAndTypesList getVirtuals() const override;
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override;
 
     /// Snapshot for MergeTree contains the current set of data parts
     /// at the moment of the start of query.
@@ -461,14 +458,19 @@ public:
     /// Load the set of data parts from disk. Call once - immediately after the object is created.
     void loadDataParts(bool skip_sanity_checks, std::optional<std::unordered_set<std::string>> expected_parts);
 
-    String getLogName() const { return *std::atomic_load(&log_name); }
+    String getLogName() const { return log.loadName(); }
 
     Int64 getMaxBlockNumber() const;
 
     struct ProjectionPartsVector
     {
-        DataPartsVector projection_parts;
         DataPartsVector data_parts;
+
+        DataPartsVector projection_parts;
+        DataPartStateVector projection_parts_states;
+
+        DataPartsVector broken_projection_parts;
+        DataPartStateVector broken_projection_parts_states;
     };
 
     /// Returns a copy of the list so that the caller shouldn't worry about locks.
@@ -483,7 +485,7 @@ public:
         const DataPartStates & affordable_states, DataPartStateVector * out_states = nullptr) const;
     /// Same as above but only returns projection parts
     ProjectionPartsVector getProjectionPartsVectorForInternalUsage(
-        const DataPartStates & affordable_states, DataPartStateVector * out_states = nullptr) const;
+        const DataPartStates & affordable_states, MergeTreeData::DataPartStateVector * out_states) const;
 
 
     /// Returns absolutely all parts (and snapshot of their states)
@@ -753,7 +755,6 @@ public:
       */
     PartitionCommandsResultInfo freezePartition(
         const ASTPtr & partition,
-        const StorageMetadataPtr & metadata_snapshot,
         const String & with_name,
         ContextPtr context,
         TableLockHolder & table_lock_holder);
@@ -761,7 +762,6 @@ public:
     /// Freezes all parts.
     PartitionCommandsResultInfo freezeAll(
         const String & with_name,
-        const StorageMetadataPtr & metadata_snapshot,
         ContextPtr context,
         TableLockHolder & table_lock_holder);
 
@@ -825,7 +825,7 @@ public:
         return secondary_index_sizes;
     }
 
-    /// For ATTACH/DETACH/DROP PARTITION.
+    /// For ATTACH/DETACH/DROP/FORGET PARTITION.
     String getPartitionIDFromQuery(const ASTPtr & ast, ContextPtr context, DataPartsLock * acquired_lock = nullptr) const;
     std::unordered_set<String> getPartitionIDsFromQuery(const ASTs & asts, ContextPtr context) const;
     std::set<String> getPartitionIdsAffectedByCommands(const MutationCommands & commands, ContextPtr query_context) const;
@@ -839,7 +839,7 @@ public:
     MergeTreeData & checkStructureAndGetMergeTreeData(const StoragePtr & source_table, const StorageMetadataPtr & src_snapshot, const StorageMetadataPtr & my_snapshot) const;
     MergeTreeData & checkStructureAndGetMergeTreeData(IStorage & source_table, const StorageMetadataPtr & src_snapshot, const StorageMetadataPtr & my_snapshot) const;
 
-    std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> cloneAndLoadDataPartOnSameDisk(
+    std::pair<MergeTreeData::MutableDataPartPtr, scope_guard> cloneAndLoadDataPart(
         const MergeTreeData::DataPartPtr & src_part,
         const String & tmp_part_prefix,
         const MergeTreePartInfo & dst_part_info,
@@ -987,15 +987,13 @@ public:
     void removeQueryId(const String & query_id) const;
     void removeQueryIdNoLock(const String & query_id) const TSA_REQUIRES(query_id_set_mutex);
 
-    /// Return the partition expression types as a Tuple type. Return DataTypeUInt8 if partition expression is empty.
-    DataTypePtr getPartitionValueType() const;
+    static const Names virtuals_useful_for_filter;
 
     /// Construct a sample block of virtual columns.
-    Block getSampleBlockWithVirtualColumns() const;
+    Block getHeaderWithVirtualsForFilter() const;
 
     /// Construct a block consisting only of possible virtual columns for part pruning.
-    /// If one_part is true, fill in at most one part.
-    Block getBlockWithVirtualPartColumns(const MergeTreeData::DataPartsVector & parts, bool one_part, bool ignore_empty = false) const;
+    Block getBlockWithVirtualsForFilter(const MergeTreeData::DataPartsVector & parts, bool ignore_empty = false) const;
 
     /// In merge tree we do inserts with several steps. One of them:
     /// X. write part to temporary directory with some temp name
@@ -1082,13 +1080,12 @@ public:
     /// It is used to make a decision whether to enable parallel replicas (distributed processing) or not and how
     /// many to replicas to use
     UInt64 estimateNumberOfRowsToRead(
-        ContextPtr query_context,
-        const StorageSnapshotPtr & storage_snapshot,
-        const SelectQueryInfo & query_info,
-        const ActionDAGNodes & added_filter_nodes) const;
+        ContextPtr query_context, const StorageSnapshotPtr & storage_snapshot, const SelectQueryInfo & query_info) const;
 
     bool initializeDiskOnConfigChange(const std::set<String> & /*new_added_disks*/) override;
 
+    static VirtualColumnsDescription createVirtuals(const StorageInMemoryMetadata & metadata);
+
 protected:
     friend class IMergeTreeDataPart;
     friend class MergeTreeDataMergerMutator;
@@ -1114,10 +1111,7 @@ protected:
     /// Engine-specific methods
     BrokenPartCallback broken_part_callback;
 
-    /// log_name will change during table RENAME. Use atomic_shared_ptr to allow concurrent RW.
-    /// NOTE clang-14 doesn't have atomic_shared_ptr yet. Use std::atomic* operations for now.
-    std::shared_ptr<String> log_name;
-    std::atomic<Poco::Logger *> log;
+    AtomicLogger log;
 
     /// Storage settings.
     /// Use get and set to receive readonly versions.
@@ -1314,7 +1308,7 @@ protected:
     bool isPrimaryOrMinMaxKeyColumnPossiblyWrappedInFunctions(const ASTPtr & node, const StorageMetadataPtr & metadata_snapshot) const;
 
     /// Common part for |freezePartition()| and |freezeAll()|.
-    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const StorageMetadataPtr & metadata_snapshot, const String & with_name, ContextPtr context);
+    PartitionCommandsResultInfo freezePartitionsByMatcher(MatcherFn matcher, const String & with_name, ContextPtr context);
     PartitionCommandsResultInfo unfreezePartitionsByMatcher(MatcherFn matcher, const String & backup_name, ContextPtr context);
 
     // Partition helpers
@@ -1336,6 +1330,8 @@ protected:
         bool fetch_part,
         ContextPtr query_context);
 
+    virtual void forgetPartition(const ASTPtr & partition, ContextPtr context);
+
     virtual void movePartitionToShard(const ASTPtr & partition, bool move_part, const String & to, ContextPtr query_context);
 
     void writePartLog(
@@ -1348,16 +1344,104 @@ protected:
         const MergeListEntry * merge_entry,
         std::shared_ptr<ProfileEvents::Counters::Snapshot> profile_counters);
 
+    class PartMutationBackoffPolicy
+    {
+        struct PartMutationInfo
+        {
+            size_t retry_count;
+            size_t latest_fail_time_us;
+            size_t max_postpone_time_ms;
+            size_t max_postpone_power;
+
+            explicit PartMutationInfo(size_t max_postpone_time_ms_)
+                            : retry_count(0ull)
+                            , latest_fail_time_us(static_cast<size_t>(Poco::Timestamp().epochMicroseconds()))
+                            , max_postpone_time_ms(max_postpone_time_ms_)
+                            , max_postpone_power((max_postpone_time_ms_) ? (static_cast<size_t>(std::log2(max_postpone_time_ms_))) : (0ull))
+            {}
+
+
+            size_t getNextMinExecutionTimeUsResolution() const
+            {
+                if (max_postpone_time_ms == 0)
+                    return static_cast<size_t>(Poco::Timestamp().epochMicroseconds());
+                size_t current_backoff_interval_us = (1 << retry_count) * 1000ul;
+                return latest_fail_time_us + current_backoff_interval_us;
+            }
+
+            void addPartFailure()
+            {
+                if (max_postpone_time_ms == 0)
+                    return;
+                retry_count = std::min(max_postpone_power, retry_count + 1);
+                latest_fail_time_us = static_cast<size_t>(Poco::Timestamp().epochMicroseconds());
+            }
+
+            bool partCanBeMutated() const
+            {
+                if (max_postpone_time_ms == 0)
+                    return true;
+
+                auto current_time_us = static_cast<size_t>(Poco::Timestamp().epochMicroseconds());
+                return current_time_us >= getNextMinExecutionTimeUsResolution();
+            }
+        };
+
+        using DataPartsWithRetryInfo = std::unordered_map<String, PartMutationInfo>;
+        DataPartsWithRetryInfo failed_mutation_parts;
+        mutable std::mutex parts_info_lock;
+
+    public:
+
+        void resetMutationFailures()
+        {
+            std::unique_lock _lock(parts_info_lock);
+            failed_mutation_parts.clear();
+        }
+
+        void removePartFromFailed(const String & part_name)
+        {
+            std::unique_lock _lock(parts_info_lock);
+            failed_mutation_parts.erase(part_name);
+        }
+
+        void addPartMutationFailure (const String& part_name, size_t max_postpone_time_ms_)
+        {
+            std::unique_lock _lock(parts_info_lock);
+            auto part_info_it = failed_mutation_parts.find(part_name);
+            if (part_info_it == failed_mutation_parts.end())
+            {
+                auto [it, success] = failed_mutation_parts.emplace(part_name, PartMutationInfo(max_postpone_time_ms_));
+                std::swap(it, part_info_it);
+            }
+            auto& part_info = part_info_it->second;
+            part_info.addPartFailure();
+        }
+
+        bool partCanBeMutated(const String& part_name)
+        {
+
+            std::unique_lock _lock(parts_info_lock);
+            auto iter = failed_mutation_parts.find(part_name);
+            if (iter == failed_mutation_parts.end())
+                return true;
+            return iter->second.partCanBeMutated();
+        }
+    };
+    /// Controls postponing logic for failed mutations.
+    PartMutationBackoffPolicy mutation_backoff_policy;
+
     /// If part is assigned to merge or mutation (possibly replicated)
     /// Should be overridden by children, because they can have different
     /// mechanisms for parts locking
     virtual bool partIsAssignedToBackgroundOperation(const DataPartPtr & part) const = 0;
 
-    /// Return most recent mutations commands for part which weren't applied
-    /// 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 std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const = 0;
+    /// Return pending mutations that weren't applied to `part` yet and should be applied on the fly
+    /// (i.e. when reading from the part). Mutations not supported by AlterConversions
+    /// (supportsMutationCommandType()) can be omitted.
+    ///
+    /// @return list of mutations, in *reverse* order (newest to oldest)
+    virtual MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const = 0;
 
     struct PartBackupEntries
     {
@@ -1601,10 +1685,10 @@ struct CurrentlySubmergingEmergingTagger
     MergeTreeData & storage;
     String emerging_part_name;
     MergeTreeData::DataPartsVector submerging_parts;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     CurrentlySubmergingEmergingTagger(
-        MergeTreeData & storage_, const String & name_, MergeTreeData::DataPartsVector && parts_, Poco::Logger * log_)
+        MergeTreeData & storage_, const String & name_, MergeTreeData::DataPartsVector && parts_, LoggerPtr log_)
         : storage(storage_), emerging_part_name(name_), submerging_parts(std::move(parts_)), log(log_)
     {
     }
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
index 8c03aef6f99..2d49e1df19b 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.cpp
@@ -66,7 +66,7 @@ static const double DISK_USAGE_COEFFICIENT_TO_SELECT = 2;
 static const double DISK_USAGE_COEFFICIENT_TO_RESERVE = 1.1;
 
 MergeTreeDataMergerMutator::MergeTreeDataMergerMutator(MergeTreeData & data_)
-    : data(data_), log(&Poco::Logger::get(data.getLogName() + " (MergerMutator)"))
+    : data(data_), log(getLogger(data.getLogName() + " (MergerMutator)"))
 {
 }
 
@@ -85,7 +85,7 @@ UInt64 MergeTreeDataMergerMutator::getMaxSourcePartsSizeForMerge(size_t max_coun
     if (scheduled_tasks_count > max_count)
     {
         throw Exception(ErrorCodes::LOGICAL_ERROR,
-            "Logical error: invalid argument passed to getMaxSourcePartsSize: scheduled_tasks_count = {} > max_count = {}",
+            "Invalid argument passed to getMaxSourcePartsSize: scheduled_tasks_count = {} > max_count = {}",
             scheduled_tasks_count, max_count);
     }
 
@@ -136,7 +136,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
     const AllowedMergingPredicate & can_merge_callback,
     bool merge_with_ttl_allowed,
     const MergeTreeTransactionPtr & txn,
-    String & out_disable_reason,
+    PreformattedMessage & out_disable_reason,
     const PartitionIdsHint * partitions_hint)
 {
     MergeTreeData::DataPartsVector data_parts = getDataPartsToSelectMergeFrom(txn, partitions_hint);
@@ -145,7 +145,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
     if (data_parts.empty())
     {
-        out_disable_reason = "There are no parts in the table";
+        out_disable_reason = PreformattedMessage::create("There are no parts in the table");
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
@@ -153,7 +153,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
 
     if (info.parts_selected_precondition == 0)
     {
-        out_disable_reason = "No parts satisfy preconditions for merge";
+        out_disable_reason = PreformattedMessage::create("No parts satisfy preconditions for merge");
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
@@ -177,9 +177,9 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMerge(
             /*optimize_skip_merged_partitions=*/true);
     }
 
-    if (!out_disable_reason.empty())
-        out_disable_reason += ". ";
-    out_disable_reason += "There is no need to merge parts according to merge selector algorithm";
+    if (!out_disable_reason.text.empty())
+        out_disable_reason.text += ". ";
+    out_disable_reason.text += "There is no need to merge parts according to merge selector algorithm";
     return SelectPartsDecision::CANNOT_SELECT;
 }
 
@@ -196,7 +196,7 @@ MergeTreeDataMergerMutator::PartitionIdsHint MergeTreeDataMergerMutator::getPart
 
     auto metadata_snapshot = data.getInMemoryMetadataPtr();
 
-    String out_reason;
+    PreformattedMessage out_reason;
     MergeSelectingInfo info = getPossibleMergeRanges(data_parts, can_merge_callback, txn, out_reason);
 
     if (info.parts_selected_precondition == 0)
@@ -223,7 +223,7 @@ MergeTreeDataMergerMutator::PartitionIdsHint MergeTreeDataMergerMutator::getPart
     for (size_t i = 0; i < all_partition_ids.size(); ++i)
     {
         auto future_part = std::make_shared<FutureMergedMutatedPart>();
-        String out_disable_reason;
+        PreformattedMessage 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,
@@ -232,7 +232,7 @@ MergeTreeDataMergerMutator::PartitionIdsHint MergeTreeDataMergerMutator::getPart
         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);
+            LOG_TEST(log, "Nothing to merge in partition {}: {}", all_partition_ids[i], out_disable_reason.text);
     }
 
     String best_partition_id_to_optimize = getBestPartitionToOptimizeEntire(info.partitions_info);
@@ -331,7 +331,7 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
     const MergeTreeData::DataPartsVector & data_parts,
     const AllowedMergingPredicate & can_merge_callback,
     const MergeTreeTransactionPtr & txn,
-    String & out_disable_reason) const
+    PreformattedMessage & out_disable_reason) const
 {
     MergeSelectingInfo res;
 
@@ -405,7 +405,7 @@ MergeTreeDataMergerMutator::MergeSelectingInfo MergeTreeDataMergerMutator::getPo
         }
 
         IMergeSelector::Part part_info;
-        part_info.size = part->getBytesOnDisk();
+        part_info.size = part->getExistingBytesOnDisk();
         part_info.age = res.current_time - part->modification_time;
         part_info.level = part->info.level;
         part_info.data = &part;
@@ -444,7 +444,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMergeFromRanges(
     const StorageMetadataPtr & metadata_snapshot,
     const IMergeSelector::PartsRanges & parts_ranges,
     const time_t & current_time,
-    String & out_disable_reason,
+    PreformattedMessage & out_disable_reason,
     bool dry_run)
 {
     const auto data_settings = data.getSettings();
@@ -511,11 +511,11 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectPartsToMergeFromRanges(
 
         /// Do not allow to "merge" part with itself for regular merges, unless it is a TTL-merge where it is ok to remove some values with expired ttl
         if (parts_to_merge.size() == 1)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: merge selector returned only one part to merge");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Merge selector returned only one part to merge");
 
         if (parts_to_merge.empty())
         {
-            out_disable_reason = "Did not find any parts to merge (with usual merge selectors)";
+            out_disable_reason = PreformattedMessage::create("Did not find any parts to merge (with usual merge selectors)");
             return SelectPartsDecision::CANNOT_SELECT;
         }
     }
@@ -573,20 +573,20 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     bool final,
     const StorageMetadataPtr & metadata_snapshot,
     const MergeTreeTransactionPtr & txn,
-    String & out_disable_reason,
+    PreformattedMessage & out_disable_reason,
     bool optimize_skip_merged_partitions)
 {
     MergeTreeData::DataPartsVector parts = selectAllPartsFromPartition(partition_id);
 
     if (parts.empty())
     {
-        out_disable_reason = "There are no parts inside partition";
+        out_disable_reason = PreformattedMessage::create("There are no parts inside partition");
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
     if (!final && parts.size() == 1)
     {
-        out_disable_reason = "There is only one part inside partition";
+        out_disable_reason = PreformattedMessage::create("There is only one part inside partition");
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
@@ -595,7 +595,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
     if (final && optimize_skip_merged_partitions && parts.size() == 1 && parts[0]->info.level > 0 &&
         (!metadata_snapshot->hasAnyTTL() || parts[0]->checkAllTTLCalculated(metadata_snapshot)))
     {
-        out_disable_reason = "Partition skipped due to optimize_skip_merged_partitions";
+        out_disable_reason = PreformattedMessage::create("Partition skipped due to optimize_skip_merged_partitions");
         return SelectPartsDecision::NOTHING_TO_MERGE;
     }
 
@@ -611,7 +611,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
             return SelectPartsDecision::CANNOT_SELECT;
         }
 
-        sum_bytes += (*it)->getBytesOnDisk();
+        sum_bytes += (*it)->getExistingBytesOnDisk();
 
         prev_it = it;
         ++it;
@@ -636,7 +636,7 @@ SelectPartsDecision MergeTreeDataMergerMutator::selectAllPartsToMergeWithinParti
                 static_cast<int>((DISK_USAGE_COEFFICIENT_TO_SELECT - 1.0) * 100));
         }
 
-        out_disable_reason = fmt::format("Insufficient available disk space, required {}", ReadableSize(required_disk_space));
+        out_disable_reason = PreformattedMessage::create("Insufficient available disk space, required {}", ReadableSize(required_disk_space));
         return SelectPartsDecision::CANNOT_SELECT;
     }
 
@@ -793,7 +793,7 @@ MergeTreeData::DataPartPtr MergeTreeDataMergerMutator::renameMergedTemporaryPart
 }
 
 
-size_t MergeTreeDataMergerMutator::estimateNeededDiskSpace(const MergeTreeData::DataPartsVector & source_parts)
+size_t MergeTreeDataMergerMutator::estimateNeededDiskSpace(const MergeTreeData::DataPartsVector & source_parts, const bool & account_for_deleted)
 {
     size_t res = 0;
     time_t current_time = std::time(nullptr);
@@ -804,7 +804,10 @@ size_t MergeTreeDataMergerMutator::estimateNeededDiskSpace(const MergeTreeData::
         if (part_max_ttl && part_max_ttl <= current_time)
             continue;
 
-        res += part->getBytesOnDisk();
+        if (account_for_deleted)
+            res += part->getExistingBytesOnDisk();
+        else
+            res += part->getBytesOnDisk();
     }
 
     return static_cast<size_t>(res * DISK_USAGE_COEFFICIENT_TO_RESERVE);
diff --git a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
index 6eab0ee0c37..aad34bfb914 100644
--- a/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
+++ b/src/Storages/MergeTree/MergeTreeDataMergerMutator.h
@@ -43,7 +43,7 @@ public:
     using AllowedMergingPredicate = std::function<bool (const MergeTreeData::DataPartPtr &,
                                                         const MergeTreeData::DataPartPtr &,
                                                         const MergeTreeTransaction *,
-                                                        String &)>;
+                                                        PreformattedMessage &)>;
 
     explicit MergeTreeDataMergerMutator(MergeTreeData & data_);
 
@@ -92,7 +92,7 @@ public:
         const MergeTreeData::DataPartsVector & data_parts,
         const AllowedMergingPredicate & can_merge_callback,
         const MergeTreeTransactionPtr & txn,
-        String & out_disable_reason) const;
+        PreformattedMessage & out_disable_reason) 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(
@@ -103,7 +103,7 @@ public:
         const StorageMetadataPtr & metadata_snapshot,
         const IMergeSelector::PartsRanges & parts_ranges,
         const time_t & current_time,
-        String & out_disable_reason,
+        PreformattedMessage & out_disable_reason,
         bool dry_run = false);
 
     String getBestPartitionToOptimizeEntire(const PartitionsInfo & partitions_info) const;
@@ -129,7 +129,7 @@ public:
         const AllowedMergingPredicate & can_merge,
         bool merge_with_ttl_allowed,
         const MergeTreeTransactionPtr & txn,
-        String & out_disable_reason,
+        PreformattedMessage & out_disable_reason,
         const PartitionIdsHint * partitions_hint = nullptr);
 
     /** Select all the parts in the specified partition for merge, if possible.
@@ -144,7 +144,7 @@ public:
         bool final,
         const StorageMetadataPtr & metadata_snapshot,
         const MergeTreeTransactionPtr & txn,
-        String & out_disable_reason,
+        PreformattedMessage & out_disable_reason,
         bool optimize_skip_merged_partitions = false);
 
     /** Creates a task to merge parts.
@@ -193,7 +193,7 @@ public:
 
 
     /// The approximate amount of disk space needed for merge or mutation. With a surplus.
-    static size_t estimateNeededDiskSpace(const MergeTreeData::DataPartsVector & source_parts);
+    static size_t estimateNeededDiskSpace(const MergeTreeData::DataPartsVector & source_parts, const bool & account_for_deleted = false);
 
 private:
     /** Select all parts belonging to the same partition.
@@ -213,7 +213,7 @@ public :
 private:
     MergeTreeData & data;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// When the last time you wrote to the log that the disk space was running out (not to write about this too often).
     time_t disk_space_warning_time = 0;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartBuilder.cpp b/src/Storages/MergeTree/MergeTreeDataPartBuilder.cpp
index d55248df0af..146c15bbb69 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartBuilder.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartBuilder.cpp
@@ -1,5 +1,4 @@
 #include <Storages/MergeTree/MergeTreeDataPartBuilder.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
 #include <Storages/MergeTree/MergeTreeDataPartWide.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
@@ -64,8 +63,6 @@ std::shared_ptr<IMergeTreeDataPart> MergeTreeDataPartBuilder::build()
             return std::make_shared<MergeTreeDataPartWide>(data, name, *part_info, part_storage, parent_part);
         case PartType::Compact:
             return std::make_shared<MergeTreeDataPartCompact>(data, name, *part_info, part_storage, parent_part);
-        case PartType::InMemory:
-            return std::make_shared<MergeTreeDataPartInMemory>(data, name, *part_info, part_storage, parent_part);
         default:
             throw Exception(ErrorCodes::UNKNOWN_PART_TYPE,
                 "Unknown type of part {}", part_storage->getRelativePath());
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
index aa1968794f9..d60f4cc7354 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.cpp
@@ -8,6 +8,7 @@
 #include <Compression/CompressedReadBuffer.h>
 #include <Compression/CompressedWriteBuffer.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
+#include <Storages/MergeTree/GinIndexStore.h>
 #include <optional>
 
 
@@ -60,7 +61,7 @@ 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"))
+    if (isGinFile(name))
         return;
 
     if (!storage.exists(name))
diff --git a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
index 837b940e354..d4980a67a43 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartChecksum.h
@@ -54,6 +54,8 @@ struct MergeTreeDataPartChecksums
 
     bool has(const String & file_name) const { return files.find(file_name) != files.end(); }
 
+    bool remove(const String & file_name) { return files.erase(file_name); }
+
     bool empty() const { return files.empty(); }
 
     /// Checks that the set of columns and their checksums are the same. If not, throws an exception.
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
index 0ecd7abe183..418b2d8f81b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.cpp
@@ -1,11 +1,8 @@
 #include "MergeTreeDataPartCompact.h"
 #include <DataTypes/NestedUtils.h>
-#include <Storages/MergeTree/MergeTreeReaderCompact.h>
+#include <Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.h>
 #include <Storages/MergeTree/MergeTreeDataPartWriterCompact.h>
-#include <Interpreters/Context.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
-#include <Compression/CompressedReadBufferFromFile.h>
-#include <Storages/BlockNumberColumn.h>
 
 
 namespace DB
@@ -33,6 +30,7 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartCompact::getReader(
     const NamesAndTypesList & columns_to_read,
     const StorageSnapshotPtr & storage_snapshot,
     const MarkRanges & mark_ranges,
+    const VirtualFields & virtual_fields,
     UncompressedCache * uncompressed_cache,
     MarkCache * mark_cache,
     const AlterConversionsPtr & alter_conversions,
@@ -41,12 +39,12 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartCompact::getReader(
     const ReadBufferFromFileBase::ProfileCallback & profile_callback) const
 {
     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>(
-        read_info, columns_to_read, storage_snapshot, uncompressed_cache,
-        mark_cache, mark_ranges, reader_settings, load_marks_threadpool,
-        avg_value_size_hints, profile_callback);
+    return std::make_unique<MergeTreeReaderCompactSingleBuffer>(
+        read_info, columns_to_read, virtual_fields,
+        storage_snapshot, uncompressed_cache,
+        mark_cache, mark_ranges, reader_settings,
+        avg_value_size_hints, profile_callback, CLOCK_MONOTONIC_COARSE);
 }
 
 IMergeTreeDataPart::MergeTreeWriterPtr MergeTreeDataPartCompact::getWriter(
@@ -66,12 +64,6 @@ IMergeTreeDataPart::MergeTreeWriterPtr MergeTreeDataPartCompact::getWriter(
     ordered_columns_list.sort([this](const auto & lhs, const auto & rhs)
         { return *getColumnPosition(lhs.name) < *getColumnPosition(rhs.name); });
 
-    /// _block_number column is not added by user, but is persisted in a part after merge
-    /// If _block_number is not present in the parts to be merged, then it won't have a position
-    /// So check if its not present and add it at the end
-    if (columns_list.contains(BlockNumberColumn::name) && !ordered_columns_list.contains(BlockNumberColumn::name))
-        ordered_columns_list.emplace_back(NameAndTypePair{BlockNumberColumn::name, BlockNumberColumn::type});
-
     return std::make_unique<MergeTreeDataPartWriterCompact>(
         shared_from_this(), ordered_columns_list, metadata_snapshot,
         indices_to_recalc, stats_to_recalc_, getMarksFileExtension(),
@@ -157,9 +149,8 @@ std::optional<time_t> MergeTreeDataPartCompact::getColumnModificationTime(const
     return getDataPartStorage().getFileLastModified(DATA_FILE_NAME_WITH_EXTENSION).epochTime();
 }
 
-void MergeTreeDataPartCompact::checkConsistency(bool require_part_metadata) const
+void MergeTreeDataPartCompact::doCheckConsistency(bool require_part_metadata) const
 {
-    checkConsistencyBase();
     String mrk_file_name = DATA_FILE_NAME + getMarksFileExtension();
 
     if (!checksums.empty())
diff --git a/src/Storages/MergeTree/MergeTreeDataPartCompact.h b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
index 35a358b3720..3a4e7b95f33 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartCompact.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartCompact.h
@@ -32,6 +32,7 @@ public:
         const NamesAndTypesList & columns,
         const StorageSnapshotPtr & storage_snapshot,
         const MarkRanges & mark_ranges,
+        const VirtualFields & virtual_fields,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
         const AlterConversionsPtr & alter_conversions,
@@ -67,14 +68,14 @@ protected:
          MergeTreeIndexGranularity & index_granularity_, const MergeTreeIndexGranularityInfo & index_granularity_info_,
          size_t columns_count, const IDataPartStorage & data_part_storage_);
 
+     void doCheckConsistency(bool require_part_metadata) const override;
+
 private:
-    void checkConsistency(bool require_part_metadata) const override;
+     /// Loads marks index granularity into memory
+     void loadIndexGranularity() override;
 
-    /// Loads marks index granularity into memory
-    void loadIndexGranularity() override;
-
-    /// Compact parts doesn't support per column size, only total size
-    void calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const override;
+     /// Compact parts doesn't support per column size, only total size
+     void calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const override;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp b/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
deleted file mode 100644
index 2f01dbfe04b..00000000000
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.cpp
+++ /dev/null
@@ -1,108 +0,0 @@
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
-#include <Storages/MergeTree/MergeTreeReaderInMemory.h>
-#include <Storages/MergeTree/MergedBlockOutputStream.h>
-#include <Storages/MergeTree/IMergeTreeReader.h>
-#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
-#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
-#include <DataTypes/NestedUtils.h>
-#include <Disks/createVolume.h>
-#include <Interpreters/Context.h>
-#include <Poco/Logger.h>
-
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int NOT_IMPLEMENTED;
-}
-
-MergeTreeDataPartInMemory::MergeTreeDataPartInMemory(
-        const MergeTreeData & storage_,
-        const String & name_,
-        const MergeTreePartInfo & info_,
-        const MutableDataPartStoragePtr & data_part_storage_,
-        const IMergeTreeDataPart * parent_part_)
-    : IMergeTreeDataPart(storage_, name_, info_, data_part_storage_, Type::InMemory, parent_part_)
-{
-    default_codec = CompressionCodecFactory::instance().get("NONE", {});
-}
-
-IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartInMemory::getReader(
-    const NamesAndTypesList & columns_to_read,
-    const StorageSnapshotPtr & storage_snapshot,
-    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(), alter_conversions);
-    auto ptr = std::static_pointer_cast<const MergeTreeDataPartInMemory>(shared_from_this());
-
-    return std::make_unique<MergeTreeReaderInMemory>(
-        read_info, ptr, columns_to_read, storage_snapshot, mark_ranges, reader_settings);
-}
-
-IMergeTreeDataPart::MergeTreeWriterPtr MergeTreeDataPartInMemory::getWriter(
-    const NamesAndTypesList &,
-    const StorageMetadataPtr &,
-    const std::vector<MergeTreeIndexPtr> &,
-    const Statistics &,
-    const CompressionCodecPtr &,
-    const MergeTreeWriterSettings &,
-    const MergeTreeIndexGranularity &)
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "In-memory data parts are obsolete and no longer supported for writing");
-}
-
-MutableDataPartStoragePtr MergeTreeDataPartInMemory::flushToDisk(const String &, const StorageMetadataPtr &) const
-{
-    throw Exception(ErrorCodes::NOT_IMPLEMENTED, "In-memory data parts are obsolete and no longer supported for writing");
-}
-
-DataPartStoragePtr MergeTreeDataPartInMemory::makeCloneInDetached(const String & prefix,
-                                                                  const StorageMetadataPtr & metadata_snapshot,
-                                                                  const DiskTransactionPtr & disk_transaction) const
-{
-    if (disk_transaction)
-        throw Exception(ErrorCodes::NOT_IMPLEMENTED, "InMemory parts are not compatible with disk transactions");
-    String detached_path = *getRelativePathForDetachedPart(prefix, /* broken */ false);
-    return flushToDisk(detached_path, metadata_snapshot);
-}
-
-void MergeTreeDataPartInMemory::renameTo(const String & new_relative_path, bool /* remove_new_dir_if_exists */)
-{
-    getDataPartStorage().setRelativePath(new_relative_path);
-}
-
-void MergeTreeDataPartInMemory::calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const
-{
-    auto it = checksums.files.find("data.bin");
-    if (it != checksums.files.end())
-        total_size.data_uncompressed += it->second.uncompressed_size;
-
-    for (const auto & column : columns)
-        each_columns_size[column.name].data_uncompressed += block.getByName(column.name).column->byteSize();
-}
-
-IMergeTreeDataPart::Checksum MergeTreeDataPartInMemory::calculateBlockChecksum() const
-{
-    SipHash hash;
-    IMergeTreeDataPart::Checksum checksum;
-    for (const auto & column : block)
-        column.column->updateHashFast(hash);
-
-    checksum.uncompressed_size = block.bytes();
-    checksum.uncompressed_hash = getSipHash128AsPair(hash);
-    return checksum;
-}
-
-DataPartInMemoryPtr asInMemoryPart(const MergeTreeDataPartPtr & part)
-{
-    return std::dynamic_pointer_cast<const MergeTreeDataPartInMemory>(part);
-}
-}
diff --git a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h b/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
deleted file mode 100644
index 27f8ba4bccb..00000000000
--- a/src/Storages/MergeTree/MergeTreeDataPartInMemory.h
+++ /dev/null
@@ -1,69 +0,0 @@
-#pragma once
-
-#include <Storages/MergeTree/IMergeTreeDataPart.h>
-
-namespace DB
-{
-
-class UncompressedCache;
-
-class MergeTreeDataPartInMemory : public IMergeTreeDataPart
-{
-public:
-    MergeTreeDataPartInMemory(
-        const MergeTreeData & storage_,
-        const String & name_,
-        const MergeTreePartInfo & info_,
-        const MutableDataPartStoragePtr & data_part_storage_,
-        const IMergeTreeDataPart * parent_part_ = nullptr);
-
-    MergeTreeReaderPtr getReader(
-        const NamesAndTypesList & columns,
-        const StorageSnapshotPtr & storage_snapshot,
-        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;
-
-    MergeTreeWriterPtr getWriter(
-        const NamesAndTypesList & columns_list,
-        const StorageMetadataPtr & metadata_snapshot,
-        const std::vector<MergeTreeIndexPtr> & indices_to_recalc,
-        const Statistics & stats_to_recalc_,
-        const CompressionCodecPtr & default_codec_,
-        const MergeTreeWriterSettings & writer_settings,
-        const MergeTreeIndexGranularity & computed_index_granularity) override;
-
-    bool isStoredOnDisk() const override { return false; }
-    bool isStoredOnRemoteDisk() const override { return false; }
-    bool isStoredOnRemoteDiskWithZeroCopySupport() const override { return false; }
-    bool hasColumnFiles(const NameAndTypePair & column) const override { return !!getColumnPosition(column.getNameInStorage()); }
-    std::optional<String> getFileNameForColumn(const NameAndTypePair & /* column */) const override { return ""; }
-    void renameTo(const String & new_relative_path, bool remove_new_dir_if_exists) override;
-    DataPartStoragePtr makeCloneInDetached(const String & prefix, const StorageMetadataPtr & metadata_snapshot,
-                                           const DiskTransactionPtr & disk_transaction) const override;
-    std::optional<time_t> getColumnModificationTime(const String & /* column_name */) const override { return {}; }
-
-    MutableDataPartStoragePtr flushToDisk(const String & new_relative_path, const StorageMetadataPtr & metadata_snapshot) const;
-
-    /// Returns hash of parts's block
-    Checksum calculateBlockChecksum() const;
-
-    mutable Block block;
-
-private:
-    mutable std::condition_variable is_merged;
-
-    /// Calculates uncompressed sizes in memory.
-    void calculateEachColumnSizes(ColumnSizeByName & each_columns_size, ColumnSize & total_size) const override;
-};
-
-using DataPartInMemoryPtr = std::shared_ptr<const MergeTreeDataPartInMemory>;
-using MutableDataPartInMemoryPtr = std::shared_ptr<MergeTreeDataPartInMemory>;
-
-DataPartInMemoryPtr asInMemoryPart(const MergeTreeDataPartPtr & part);
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.cpp b/src/Storages/MergeTree/MergeTreeDataPartType.cpp
new file mode 100644
index 00000000000..fb5555cb13f
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.cpp
@@ -0,0 +1,47 @@
+#include <base/types.h>
+#include <Common/Exception.h>
+
+#include <magic_enum.hpp>
+
+#include <Storages/MergeTree/MergeTreeDataPartType.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+extern const int BAD_ARGUMENTS;
+}
+
+template <typename E>
+requires std::is_enum_v<E>
+static E parseEnum(const String & str)
+{
+    auto value = magic_enum::enum_cast<E>(str);
+    if (!value || *value == E::Unknown)
+        throw DB::Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected string {} for enum {}", str, magic_enum::enum_type_name<E>());
+
+    return *value;
+}
+
+String MergeTreeDataPartType::toString() const
+{
+    return String(magic_enum::enum_name(value));
+}
+
+void MergeTreeDataPartType::fromString(const String & str)
+{
+    value = parseEnum<Value>(str);
+}
+
+String MergeTreeDataPartStorageType::toString() const
+{
+    return String(magic_enum::enum_name(value));
+}
+
+void MergeTreeDataPartStorageType::fromString(const String & str)
+{
+    value = parseEnum<Value>(str);
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeDataPartType.h b/src/Storages/MergeTree/MergeTreeDataPartType.h
index 8b06da5167e..8177809d41e 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartType.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartType.h
@@ -1,35 +1,13 @@
 #pragma once
 
-#include <Common/Exception.h>
 #include <base/types.h>
-#include <magic_enum.hpp>
 
 namespace DB
 {
-
-namespace ErrorCodes
-{
-    extern const int BAD_ARGUMENTS;
-}
-
-template <typename E>
-requires std::is_enum_v<E>
-static E parseEnum(const String & str)
-{
-    auto value = magic_enum::enum_cast<E>(str);
-    if (!value || *value == E::Unknown)
-        throw DB::Exception(ErrorCodes::BAD_ARGUMENTS,
-            "Unexpected string {} for enum {}", str, magic_enum::enum_type_name<E>());
-
-    return *value;
-}
-
 /// It's a bug in clang with three-way comparison operator
 /// https://github.com/llvm/llvm-project/issues/55919
-#ifdef __clang__
-    #pragma clang diagnostic push
-    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 
 /// Types of data part format.
 class MergeTreeDataPartType
@@ -44,9 +22,6 @@ public:
         /// Data of all columns is stored in one file. Marks are also stored in single file.
         Compact,
 
-        /// Format with buffering data in RAM. Obsolete - new parts cannot be created in this format.
-        InMemory,
-
         Unknown,
     };
 
@@ -56,8 +31,8 @@ public:
     auto operator<=>(const MergeTreeDataPartType &) const = default;
 
     Value getValue() const { return value; }
-    String toString() const { return String(magic_enum::enum_name(value)); }
-    void fromString(const String & str) { value = parseEnum<Value>(str); }
+    String toString() const;
+    void fromString(const String & str);
 
 private:
     Value value;
@@ -79,16 +54,14 @@ public:
     auto operator<=>(const MergeTreeDataPartStorageType &) const = default;
 
     Value getValue() const { return value; }
-    String toString() const { return String(magic_enum::enum_name(value)); }
-    void fromString(const String & str) { value = parseEnum<Value>(str); }
+    String toString() const;
+    void fromString(const String & str);
 
 private:
     Value value;
 };
 
-#ifdef __clang__
-    #pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 struct MergeTreeDataPartFormat
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
index dc6c1f0019d..fc3108e522a 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.cpp
@@ -31,6 +31,7 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
     const NamesAndTypesList & columns_to_read,
     const StorageSnapshotPtr & storage_snapshot,
     const MarkRanges & mark_ranges,
+    const VirtualFields & virtual_fields,
     UncompressedCache * uncompressed_cache,
     MarkCache * mark_cache,
     const AlterConversionsPtr & alter_conversions,
@@ -40,10 +41,16 @@ IMergeTreeDataPart::MergeTreeReaderPtr MergeTreeDataPartWide::getReader(
 {
     auto read_info = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(shared_from_this(), alter_conversions);
     return std::make_unique<MergeTreeReaderWide>(
-        read_info, columns_to_read,
-        storage_snapshot, uncompressed_cache,
-        mark_cache, mark_ranges, reader_settings,
-        avg_value_size_hints, profile_callback);
+        read_info,
+        columns_to_read,
+        virtual_fields,
+        storage_snapshot,
+        uncompressed_cache,
+        mark_cache,
+        mark_ranges,
+        reader_settings,
+        avg_value_size_hints,
+        profile_callback);
 }
 
 IMergeTreeDataPart::MergeTreeWriterPtr MergeTreeDataPartWide::getWriter(
@@ -182,9 +189,8 @@ MergeTreeDataPartWide::~MergeTreeDataPartWide()
     removeIfNeeded();
 }
 
-void MergeTreeDataPartWide::checkConsistency(bool require_part_metadata) const
+void MergeTreeDataPartWide::doCheckConsistency(bool require_part_metadata) const
 {
-    checkConsistencyBase();
     std::string marks_file_extension = index_granularity_info.mark_type.getFileExtension();
 
     if (!checksums.empty())
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWide.h b/src/Storages/MergeTree/MergeTreeDataPartWide.h
index 14147c4ad56..84eeec4211b 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWide.h
@@ -27,6 +27,7 @@ public:
         const NamesAndTypesList & columns,
         const StorageSnapshotPtr & storage_snapshot,
         const MarkRanges & mark_ranges,
+        const VirtualFields & virtual_fields,
         UncompressedCache * uncompressed_cache,
         MarkCache * mark_cache,
         const AlterConversionsPtr & alter_conversions,
@@ -62,9 +63,9 @@ protected:
         MergeTreeIndexGranularity & index_granularity_, MergeTreeIndexGranularityInfo & index_granularity_info_,
         const IDataPartStorage & data_part_storage_, const std::string & any_column_file_name);
 
-private:
-    void checkConsistency(bool require_part_metadata) const override;
+    void doCheckConsistency(bool require_part_metadata) const override;
 
+private:
     /// Loads marks index granularity into memory
     void loadIndexGranularity() override;
 
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
index b05b4584259..1605e5cdb9a 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterCompact.cpp
@@ -1,24 +1,14 @@
 #include <Storages/MergeTree/MergeTreeDataPartWriterCompact.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
-#include <Storages/BlockNumberColumn.h>
 
 namespace DB
 {
 
-    CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
-
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
 }
 
-static CompressionCodecPtr getMarksCompressionCodec(const String & marks_compression_codec)
-{
-    ParserCodec codec_parser;
-    auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(marks_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-    return CompressionCodecFactory::instance().get(ast, nullptr);
-}
-
 MergeTreeDataPartWriterCompact::MergeTreeDataPartWriterCompact(
     const MergeTreeMutableDataPartPtr & data_part_,
     const NamesAndTypesList & columns_list_,
@@ -49,20 +39,16 @@ MergeTreeDataPartWriterCompact::MergeTreeDataPartWriterCompact(
     {
         marks_compressor = std::make_unique<CompressedWriteBuffer>(
             *marks_file_hashing,
-            getMarksCompressionCodec(settings_.marks_compression_codec),
+             CompressionCodecFactory::instance().get(settings_.marks_compression_codec),
             settings_.marks_compress_block_size);
 
         marks_source_hashing = std::make_unique<HashingWriteBuffer>(*marks_compressor);
     }
 
-    const auto & storage_columns = metadata_snapshot->getColumns();
+    auto storage_snapshot = std::make_shared<StorageSnapshot>(data_part->storage, metadata_snapshot);
     for (const auto & column : columns_list)
     {
-        ASTPtr compression;
-        if (column.name == BlockNumberColumn::name)
-            compression = BlockNumberColumn::compression_codec->getFullCodecDesc();
-        else
-            compression = storage_columns.getCodecDescOrDefault(column.name, default_codec);
+        auto compression = storage_snapshot->getCodecDescOrDefault(column.name, default_codec);
         addStreams(column, compression);
     }
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
index 6e544b4a35a..5a82357c6eb 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.cpp
@@ -1,6 +1,14 @@
 #include <Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h>
 #include <Storages/MergeTree/MergeTreeIndexInverted.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/MemoryTrackerBlockerInThread.h>
+#include <Common/logger_useful.h>
+
+namespace ProfileEvents
+{
+extern const Event MergeTreeDataWriterSkipIndicesCalculationMicroseconds;
+extern const Event MergeTreeDataWriterStatisticsCalculationMicroseconds;
+}
 
 namespace DB
 {
@@ -148,6 +156,8 @@ MergeTreeDataPartWriterOnDisk::MergeTreeDataPartWriterOnDisk(
     , default_codec(default_codec_)
     , compute_granularity(index_granularity.empty())
     , compress_primary_key(settings.compress_primary_key)
+    , execution_stats(skip_indices.size(), stats.size())
+    , log(getLogger(storage.getLogName() + " (DataPartWriter)"))
 {
     if (settings.blocks_are_granules_size && !index_granularity.empty())
         throw Exception(ErrorCodes::LOGICAL_ERROR,
@@ -232,9 +242,7 @@ void MergeTreeDataPartWriterOnDisk::initPrimaryIndex()
 
         if (compress_primary_key)
         {
-            ParserCodec codec_parser;
-            auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(settings.primary_key_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-            CompressionCodecPtr primary_key_compression_codec = CompressionCodecFactory::instance().get(ast, nullptr);
+            CompressionCodecPtr primary_key_compression_codec = CompressionCodecFactory::instance().get(settings.primary_key_compression_codec);
             index_compressor_stream = std::make_unique<CompressedWriteBuffer>(*index_file_hashing_stream, primary_key_compression_codec, settings.primary_key_compress_block_size);
             index_source_hashing_stream = std::make_unique<HashingWriteBuffer>(*index_compressor_stream);
         }
@@ -258,7 +266,7 @@ void MergeTreeDataPartWriterOnDisk::initStatistics()
 void MergeTreeDataPartWriterOnDisk::initSkipIndices()
 {
     ParserCodec codec_parser;
-    auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(settings.marks_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(settings.marks_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
     CompressionCodecPtr marks_compression_codec = CompressionCodecFactory::instance().get(ast, nullptr);
 
     for (const auto & skip_index : skip_indices)
@@ -329,9 +337,12 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializePrimaryIndex(const Bloc
 
 void MergeTreeDataPartWriterOnDisk::calculateAndSerializeStatistics(const Block & block)
 {
-    for (const auto & stat_ptr : stats)
+    for (size_t i = 0; i < stats.size(); ++i)
     {
+        const auto & stat_ptr = stats[i];
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterStatisticsCalculationMicroseconds);
         stat_ptr->update(block.getByName(stat_ptr->columnName()).column);
+        execution_stats.statistics_build_us[i] += watch.elapsed();
     }
 }
 
@@ -378,10 +389,14 @@ void MergeTreeDataPartWriterOnDisk::calculateAndSerializeSkipIndices(const Block
                     writeBinaryLittleEndian(1UL, marks_out);
             }
 
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterSkipIndicesCalculationMicroseconds);
+
             size_t pos = granule.start_row;
             skip_indices_aggregators[i]->update(skip_indexes_block, &pos, granule.rows_to_write);
             if (granule.is_complete)
                 ++skip_index_accumulated_marks[i];
+
+            execution_stats.skip_indices_build_us[i] += watch.elapsed();
         }
     }
 }
@@ -481,6 +496,9 @@ void MergeTreeDataPartWriterOnDisk::finishStatisticsSerialization(bool sync)
         if (sync)
             stream->sync();
     }
+
+    for (size_t i = 0; i < stats.size(); ++i)
+        LOG_DEBUG(log, "Spent {} ms calculating statistics {} for the part {}", execution_stats.statistics_build_us[i] / 1000, stats[i]->columnName(), data_part->name);
 }
 
 void MergeTreeDataPartWriterOnDisk::fillStatisticsChecksums(MergeTreeData::DataPart::Checksums & checksums)
@@ -504,6 +522,10 @@ void MergeTreeDataPartWriterOnDisk::finishSkipIndicesSerialization(bool sync)
     }
     for (auto & store: gin_index_stores)
         store.second->finalize();
+
+    for (size_t i = 0; i < skip_indices.size(); ++i)
+        LOG_DEBUG(log, "Spent {} ms calculating index {} for the part {}", execution_stats.skip_indices_build_us[i] / 1000, skip_indices[i]->index.name, data_part->name);
+
     gin_index_stores.clear();
     skip_indices_streams.clear();
     skip_indices_aggregators.clear();
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
index 4d081778e68..9f2cc3970fa 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h
@@ -190,6 +190,20 @@ private:
     void initStatistics();
 
     virtual void fillIndexGranularity(size_t index_granularity_for_block, size_t rows_in_block) = 0;
+
+    struct ExecutionStatistics
+    {
+        ExecutionStatistics(size_t skip_indices_cnt, size_t stats_cnt)
+            : skip_indices_build_us(skip_indices_cnt, 0), statistics_build_us(stats_cnt, 0)
+        {
+        }
+
+        std::vector<size_t> skip_indices_build_us; // [i] corresponds to the i-th index
+        std::vector<size_t> statistics_build_us; // [i] corresponds to the i-th stat
+    };
+    ExecutionStatistics execution_stats;
+
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
index d86ff3a17ff..6a3b08d4d65 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.cpp
@@ -6,11 +6,10 @@
 #include <Common/escapeForFileName.h>
 #include <Columns/ColumnSparse.h>
 #include <Common/logger_useful.h>
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/ColumnsDescription.h>
 
 namespace DB
 {
-    CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
 
 namespace ErrorCodes
 {
@@ -90,15 +89,11 @@ MergeTreeDataPartWriterWide::MergeTreeDataPartWriterWide(
            indices_to_recalc_, stats_to_recalc_, marks_file_extension_,
            default_codec_, settings_, index_granularity_)
 {
-    const auto & columns = metadata_snapshot->getColumns();
-    for (const auto & it : columns_list)
+    auto storage_snapshot = std::make_shared<StorageSnapshot>(data_part->storage, metadata_snapshot);
+    for (const auto & column : columns_list)
     {
-        ASTPtr compression;
-        if (it.name == BlockNumberColumn::name)
-            compression = BlockNumberColumn::compression_codec->getFullCodecDesc();
-        else
-            compression = columns.getCodecDescOrDefault(it.name, default_codec);
-        addStreams(it, compression);
+        auto compression = storage_snapshot->getCodecDescOrDefault(column.name, default_codec);
+        addStreams(column, compression);
     }
 }
 
@@ -140,16 +135,25 @@ void MergeTreeDataPartWriterWide::addStreams(
             compression_codec = CompressionCodecFactory::instance().get(effective_codec_desc, nullptr, default_codec, true);
 
         ParserCodec codec_parser;
-        auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(settings.marks_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+        auto ast = parseQuery(codec_parser, "(" + Poco::toUpper(settings.marks_compression_codec) + ")", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
         CompressionCodecPtr marks_compression_codec = CompressionCodecFactory::instance().get(ast, nullptr);
 
+        const auto column_desc = metadata_snapshot->columns.tryGetColumnDescription(GetColumnsOptions(GetColumnsOptions::AllPhysical), column.getNameInStorage());
+
+        UInt64 max_compress_block_size = 0;
+        if (column_desc)
+            if (const auto * value = column_desc->settings.tryGet("max_compress_block_size"))
+                max_compress_block_size = value->safeGet<UInt64>();
+        if (!max_compress_block_size)
+            max_compress_block_size = settings.max_compress_block_size;
+
         column_streams[stream_name] = std::make_unique<Stream<false>>(
             stream_name,
             data_part->getDataPartStoragePtr(),
             stream_name, DATA_FILE_EXTENSION,
             stream_name, marks_file_extension,
             compression_codec,
-            settings.max_compress_block_size,
+            max_compress_block_size,
             marks_compression_codec,
             settings.marks_compress_block_size,
             settings.query_write_settings);
@@ -323,6 +327,13 @@ StreamsWithMarks MergeTreeDataPartWriterWide::getCurrentMarksForColumn(
     WrittenOffsetColumns & offset_columns)
 {
     StreamsWithMarks result;
+    const auto column_desc = metadata_snapshot->columns.tryGetColumnDescription(GetColumnsOptions(GetColumnsOptions::AllPhysical), column.getNameInStorage());
+    UInt64 min_compress_block_size = 0;
+    if (column_desc)
+        if (const auto * value = column_desc->settings.tryGet("min_compress_block_size"))
+            min_compress_block_size = value->safeGet<UInt64>();
+    if (!min_compress_block_size)
+        min_compress_block_size = settings.min_compress_block_size;
     data_part->getSerialization(column.name)->enumerateStreams([&] (const ISerialization::SubstreamPath & substream_path)
     {
         bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
@@ -335,7 +346,7 @@ StreamsWithMarks MergeTreeDataPartWriterWide::getCurrentMarksForColumn(
         auto & stream = *column_streams[stream_name];
 
         /// There could already be enough data to compress into the new block.
-        if (stream.compressed_hashing.offset() >= settings.min_compress_block_size)
+        if (stream.compressed_hashing.offset() >= min_compress_block_size)
             stream.compressed_hashing.next();
 
         StreamNameAndMark stream_with_mark;
diff --git a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
index ae40eb03649..f5ff323563d 100644
--- a/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
+++ b/src/Storages/MergeTree/MergeTreeDataPartWriterWide.h
@@ -1,5 +1,8 @@
 #pragma once
+
 #include <Storages/MergeTree/MergeTreeDataPartWriterOnDisk.h>
+#include <Formats/MarkInCompressedFile.h>
+
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
index 66f593bbf33..bcc936c5739 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp
@@ -46,7 +46,6 @@
 #include <Functions/IFunction.h>
 
 #include <IO/WriteBufferFromOStream.h>
-#include <Storages/BlockNumberColumn.h>
 #include <Storages/MergeTree/ApproximateNearestNeighborIndexesCommon.h>
 
 namespace CurrentMetrics
@@ -69,12 +68,11 @@ namespace ErrorCodes
     extern const int CANNOT_PARSE_TEXT;
     extern const int TOO_MANY_PARTITIONS;
     extern const int DUPLICATED_PART_UUIDS;
-    extern const int NO_SUCH_COLUMN_IN_TABLE;
 }
 
 
 MergeTreeDataSelectExecutor::MergeTreeDataSelectExecutor(const MergeTreeData & data_)
-    : data(data_), log(&Poco::Logger::get(data.getLogName() + " (SelectExecutor)"))
+    : data(data_), log(getLogger(data.getLogName() + " (SelectExecutor)"))
 {
 }
 
@@ -83,7 +81,7 @@ size_t MergeTreeDataSelectExecutor::getApproximateTotalRowsToRead(
     const StorageMetadataPtr & metadata_snapshot,
     const KeyCondition & key_condition,
     const Settings & settings,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     size_t rows_count = 0;
 
@@ -166,8 +164,7 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
     const MergeTreeData & data,
     const StorageMetadataPtr & metadata_snapshot,
     ContextPtr context,
-    bool sample_factor_column_queried,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     const Settings & settings = context->getSettingsRef();
     /// Sampling.
@@ -296,7 +293,7 @@ MergeTreeDataSelectSamplingData MergeTreeDataSelectExecutor::getSampling(
 
     if (sampling.use_sampling)
     {
-        if (sample_factor_column_queried && relative_sample_size != RelativeSize(0))
+        if (relative_sample_size != RelativeSize(0))
             sampling.used_sample_factor = 1.0 / boost::rational_cast<Float64>(relative_sample_size);
 
         RelativeSize size_of_universum = 0;
@@ -483,12 +480,13 @@ std::optional<std::unordered_set<String>> MergeTreeDataSelectExecutor::filterPar
 {
     if (!filter_dag)
         return {};
-    auto sample = data.getSampleBlockWithVirtualColumns();
+
+    auto sample = data.getHeaderWithVirtualsForFilter();
     auto dag = VirtualColumnUtils::splitFilterDagForAllowedInputs(filter_dag->getOutputs().at(0), &sample);
     if (!dag)
         return {};
 
-    auto virtual_columns_block = data.getBlockWithVirtualPartColumns(parts, false /* one_part */);
+    auto virtual_columns_block = data.getBlockWithVirtualsForFilter(parts);
     VirtualColumnUtils::filterBlockWithDAG(dag, virtual_columns_block, context);
     return VirtualColumnUtils::extractSingleValueFromBlock<String>(virtual_columns_block, "_part");
 }
@@ -503,7 +501,7 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     const MergeTreeData & data,
     const ContextPtr & context,
     const PartitionIdToMaxBlock * max_block_numbers_to_read,
-    Poco::Logger * log,
+    LoggerPtr log,
     ReadFromMergeTree::IndexStats & index_stats)
 {
     chassert(alter_conversions.empty() || parts.size() == alter_conversions.size());
@@ -515,11 +513,11 @@ void MergeTreeDataSelectExecutor::filterPartsByPartition(
     {
         chassert(minmax_idx_condition && partition_pruner);
         const auto & partition_key = metadata_snapshot->getPartitionKey();
-        minmax_columns_types = data.getMinMaxColumnsTypes(partition_key);
+        minmax_columns_types = MergeTreeData::getMinMaxColumnsTypes(partition_key);
 
         if (settings.force_index_by_date && (minmax_idx_condition->alwaysUnknownOrTrue() && partition_pruner->isUseless()))
         {
-            auto minmax_columns_names = data.getMinMaxColumnsNames(partition_key);
+            auto minmax_columns_names = MergeTreeData::getMinMaxColumnsNames(partition_key);
             throw Exception(ErrorCodes::INDEX_NOT_USED,
                 "Neither MinMax index by columns ({}) nor partition expr is used and setting 'force_index_by_date' is set",
                 fmt::join(minmax_columns_names, ", "));
@@ -590,7 +588,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
     const std::optional<KeyCondition> & part_offset_condition,
     const UsefulSkipIndexes & skip_indexes,
     const MergeTreeReaderSettings & reader_settings,
-    Poco::Logger * log,
+    LoggerPtr log,
     size_t num_streams,
     ReadFromMergeTree::IndexStats & index_stats,
     bool use_skip_indexes)
@@ -608,7 +606,7 @@ RangesInDataParts MergeTreeDataSelectExecutor::filterPartsByPrimaryKeyAndSkipInd
         Strings forced_indices;
         {
             Tokens tokens(indices.data(), indices.data() + indices.size(), settings.max_query_size);
-            IParser::Pos pos(tokens, static_cast<unsigned>(settings.max_parser_depth));
+            IParser::Pos pos(tokens, static_cast<unsigned>(settings.max_parser_depth), static_cast<unsigned>(settings.max_parser_backtracks));
             Expected expected;
             if (!parseIdentifiersOrStringLiterals(pos, expected, forced_indices))
                 throw Exception(ErrorCodes::CANNOT_PARSE_TEXT, "Cannot parse force_data_skipping_indices ('{}')", indices);
@@ -868,76 +866,11 @@ std::shared_ptr<QueryIdHolder> MergeTreeDataSelectExecutor::checkLimits(
     return nullptr;
 }
 
-static void selectColumnNames(
-    const Names & column_names_to_return,
-    const MergeTreeData & data,
-    Names & real_column_names,
-    Names & virt_column_names,
-    bool & sample_factor_column_queried)
-{
-    sample_factor_column_queried = false;
-
-    for (const String & name : column_names_to_return)
-    {
-        if (name == "_part")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_part_index")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_partition_id")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_part_offset")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == LightweightDeleteDescription::FILTER_COLUMN.name)
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == BlockNumberColumn::name)
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_part_uuid")
-        {
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_partition_value")
-        {
-            if (!typeid_cast<const DataTypeTuple *>(data.getPartitionValueType().get()))
-            {
-                throw Exception(
-                    ErrorCodes::NO_SUCH_COLUMN_IN_TABLE,
-                    "Missing column `_partition_value` because there is no partition column in table {}",
-                    data.getStorageID().getTableName());
-            }
-
-            virt_column_names.push_back(name);
-        }
-        else if (name == "_sample_factor")
-        {
-            sample_factor_column_queried = true;
-            virt_column_names.push_back(name);
-        }
-        else
-        {
-            real_column_names.push_back(name);
-        }
-    }
-}
-
 ReadFromMergeTree::AnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMarksToRead(
     MergeTreeData::DataPartsVector parts,
-    const PrewhereInfoPtr & prewhere_info,
     const Names & column_names_to_return,
     const StorageMetadataPtr & metadata_snapshot,
     const SelectQueryInfo & query_info,
-    const ActionDAGNodes & added_filter_nodes,
     ContextPtr context,
     size_t num_streams,
     std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read) const
@@ -946,30 +879,19 @@ ReadFromMergeTree::AnalysisResultPtr MergeTreeDataSelectExecutor::estimateNumMar
     if (total_parts == 0)
         return std::make_shared<ReadFromMergeTree::AnalysisResult>();
 
-    Names real_column_names;
-    Names virt_column_names;
-    /// If query contains restrictions on the virtual column `_part` or `_part_index`, select only parts suitable for it.
-    /// The virtual column `_sample_factor` (which is equal to 1 / used sample rate) can be requested in the query.
-    bool sample_factor_column_queried = false;
-
-    selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
-
     std::optional<ReadFromMergeTree::Indexes> indexes;
     /// NOTE: We don't need alter_conversions because the returned analysis_result is only used for:
     /// 1. estimate the number of rows to read; 2. projection reading, which doesn't have alter_conversions.
     return ReadFromMergeTree::selectRangesToRead(
         std::move(parts),
         /*alter_conversions=*/ {},
-        prewhere_info,
-        added_filter_nodes,
         metadata_snapshot,
         query_info,
         context,
         num_streams,
         max_block_numbers_to_read,
         data,
-        real_column_names,
-        sample_factor_column_queried,
+        column_names_to_return,
         log,
         indexes);
 }
@@ -996,30 +918,16 @@ QueryPlanStepPtr MergeTreeDataSelectExecutor::readFromParts(
     else if (parts.empty())
         return {};
 
-    Names real_column_names;
-    Names virt_column_names;
-    /// If query contains restrictions on the virtual column `_part` or `_part_index`, select only parts suitable for it.
-    /// The virtual column `_sample_factor` (which is equal to 1 / used sample rate) can be requested in the query.
-    bool sample_factor_column_queried = false;
-
-    selectColumnNames(column_names_to_return, data, real_column_names, virt_column_names, sample_factor_column_queried);
-
-    /// Do not keep data parts in snapshot.
-    /// They are stored separately, and some could be released after PK analysis.
-    auto storage_snapshot_copy = storage_snapshot->clone(std::make_unique<MergeTreeData::SnapshotData>());
-
     return std::make_unique<ReadFromMergeTree>(
         std::move(parts),
         std::move(alter_conversions),
-        real_column_names,
-        virt_column_names,
+        column_names_to_return,
         data,
         query_info,
-        storage_snapshot_copy,
+        storage_snapshot,
         context,
         max_block_size,
         num_streams,
-        sample_factor_column_queried,
         max_block_numbers_to_read,
         log,
         merge_tree_select_result_ptr,
@@ -1082,12 +990,12 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     const KeyCondition & key_condition,
     const std::optional<KeyCondition> & part_offset_condition,
     const Settings & settings,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     MarkRanges res;
 
     size_t marks_count = part->index_granularity.getMarksCount();
-    const auto & index = part->index;
+    const auto & index = part->getIndex();
     if (marks_count == 0)
         return res;
 
@@ -1110,7 +1018,11 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     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]});
+        if (i < index.size())
+            index_columns->emplace_back(index[i], primary_key.data_types[i], primary_key.column_names[i]);
+        else
+            index_columns->emplace_back(); /// The column of the primary key was not loaded in memory - we'll skip it.
+
         key_types.emplace_back(primary_key.data_types[i]);
     }
 
@@ -1119,7 +1031,6 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     std::function<void(size_t, size_t, FieldRef &)> create_field_ref;
     if (key_condition.hasMonotonicFunctionsChain())
     {
-
         create_field_ref = [index_columns](size_t row, size_t column, FieldRef & field)
         {
             field = {index_columns.get(), row, column};
@@ -1159,7 +1070,11 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             {
                 for (size_t i = 0; i < used_key_size; ++i)
                 {
-                    create_field_ref(range.begin, i, index_left[i]);
+                    if ((*index_columns)[i].column)
+                        create_field_ref(range.begin, i, index_left[i]);
+                    else
+                        index_left[i] = NEGATIVE_INFINITY;
+
                     index_right[i] = POSITIVE_INFINITY;
                 }
             }
@@ -1170,8 +1085,17 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
 
                 for (size_t i = 0; i < used_key_size; ++i)
                 {
-                    create_field_ref(range.begin, i, index_left[i]);
-                    create_field_ref(range.end, i, index_right[i]);
+                    if ((*index_columns)[i].column)
+                    {
+                        create_field_ref(range.begin, i, index_left[i]);
+                        create_field_ref(range.end, i, index_right[i]);
+                    }
+                    else
+                    {
+                        /// If the PK column was not loaded in memory - exclude it from the analysis.
+                        index_left[i] = NEGATIVE_INFINITY;
+                        index_right[i] = POSITIVE_INFINITY;
+                    }
                 }
             }
             key_condition_maybe_true = key_condition.mayBeTrueInRange(used_key_size, index_left.data(), index_right.data(), key_types);
@@ -1206,6 +1130,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
     bool part_offset_condition_exact_range
         = !part_offset_condition || part_offset_condition->alwaysUnknownOrTrue() || part_offset_condition->matchesExactContinuousRange();
     const String & part_name = part->isProjectionPart() ? fmt::format("{}.{}", part->name, part->getParentPart()->name) : part->name;
+
     if (!key_condition_exact_range || !part_offset_condition_exact_range)
     {
         // Do exclusion search, where we drop ranges that do not match
@@ -1220,10 +1145,10 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             part->index_granularity_info.index_granularity_bytes);
 
         /** There will always be disjoint suspicious segments on the stack, the leftmost one at the top (back).
-        * At each step, take the left segment and check if it fits.
-        * If fits, split it into smaller ones and put them on the stack. If not, discard it.
-        * If the segment is already of one mark length, add it to response and discard it.
-        */
+          * At each step, take the left segment and check if it fits.
+          * If fits, split it into smaller ones and put them on the stack. If not, discard it.
+          * If the segment is already of one mark length, add it to response and discard it.
+          */
         std::vector<MarkRange> ranges_stack = { {0, marks_count} };
 
         size_t steps = 0;
@@ -1233,7 +1158,7 @@ MarkRanges MergeTreeDataSelectExecutor::markRangesFromPKRange(
             MarkRange range = ranges_stack.back();
             ranges_stack.pop_back();
 
-            steps++;
+            ++steps;
 
             if (!may_be_true_in_range(range))
                 continue;
@@ -1322,7 +1247,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingIndex(
     const MergeTreeReaderSettings & reader_settings,
     MarkCache * mark_cache,
     UncompressedCache * uncompressed_cache,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     if (!index_helper->getDeserializedFormat(part->getDataPartStorage(), index_helper->getFileName()))
     {
@@ -1440,7 +1365,7 @@ MarkRanges MergeTreeDataSelectExecutor::filterMarksUsingMergedIndex(
     const MergeTreeReaderSettings & reader_settings,
     MarkCache * mark_cache,
     UncompressedCache * uncompressed_cache,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     for (const auto & index_helper : indices)
     {
@@ -1596,7 +1521,7 @@ void MergeTreeDataSelectExecutor::selectPartsToReadWithUUIDFilter(
     const PartitionIdToMaxBlock * max_block_numbers_to_read,
     ContextPtr query_context,
     PartFilterCounters & counters,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     /// process_parts prepare parts that have to be read for the query,
     /// returns false if duplicated parts' UUID have been met
diff --git a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
index ba1f20054f0..b1afd7e6668 100644
--- a/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
+++ b/src/Storages/MergeTree/MergeTreeDataSelectExecutor.h
@@ -56,11 +56,9 @@ public:
     /// This method is used to select best projection for table.
     ReadFromMergeTree::AnalysisResultPtr estimateNumMarksToRead(
         MergeTreeData::DataPartsVector parts,
-        const PrewhereInfoPtr & prewhere_info,
         const Names & column_names,
         const StorageMetadataPtr & metadata_snapshot,
         const SelectQueryInfo & query_info,
-        const ActionDAGNodes & added_filter_nodes,
         ContextPtr context,
         size_t num_streams,
         std::shared_ptr<PartitionIdToMaxBlock> max_block_numbers_to_read = nullptr) const;
@@ -71,11 +69,11 @@ public:
         const KeyCondition & key_condition,
         const std::optional<KeyCondition> & part_offset_condition,
         const Settings & settings,
-        Poco::Logger * log);
+        LoggerPtr log);
 
 private:
     const MergeTreeData & data;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Get the approximate value (bottom estimate - only by full marks) of the number of rows falling under the index.
     static size_t getApproximateTotalRowsToRead(
@@ -83,7 +81,7 @@ private:
         const StorageMetadataPtr & metadata_snapshot,
         const KeyCondition & key_condition,
         const Settings & settings,
-        Poco::Logger * log);
+        LoggerPtr log);
 
     static MarkRanges filterMarksUsingIndex(
         MergeTreeIndexPtr index_helper,
@@ -94,7 +92,7 @@ private:
         const MergeTreeReaderSettings & reader_settings,
         MarkCache * mark_cache,
         UncompressedCache * uncompressed_cache,
-        Poco::Logger * log);
+        LoggerPtr log);
 
     static MarkRanges filterMarksUsingMergedIndex(
         MergeTreeIndices indices,
@@ -105,7 +103,7 @@ private:
         const MergeTreeReaderSettings & reader_settings,
         MarkCache * mark_cache,
         UncompressedCache * uncompressed_cache,
-        Poco::Logger * log);
+        LoggerPtr log);
 
     struct PartFilterCounters
     {
@@ -141,7 +139,7 @@ private:
         const PartitionIdToMaxBlock * max_block_numbers_to_read,
         ContextPtr query_context,
         PartFilterCounters & counters,
-        Poco::Logger * log);
+        LoggerPtr log);
 
 public:
     /// For given number rows and bytes, get the number of marks to read.
@@ -184,7 +182,7 @@ public:
         const MergeTreeData & data,
         const ContextPtr & context,
         const PartitionIdToMaxBlock * max_block_numbers_to_read,
-        Poco::Logger * log,
+        LoggerPtr log,
         ReadFromMergeTree::IndexStats & index_stats);
 
     /// Filter parts using primary key and secondary indexes.
@@ -199,7 +197,7 @@ public:
         const std::optional<KeyCondition> & part_offset_condition,
         const UsefulSkipIndexes & skip_indexes,
         const MergeTreeReaderSettings & reader_settings,
-        Poco::Logger * log,
+        LoggerPtr log,
         size_t num_streams,
         ReadFromMergeTree::IndexStats & index_stats,
         bool use_skip_indexes);
@@ -215,8 +213,7 @@ public:
         const MergeTreeData & data,
         const StorageMetadataPtr & metadata_snapshot,
         ContextPtr context,
-        bool sample_factor_column_queried,
-        Poco::Logger * log);
+        LoggerPtr log);
 
     /// Check query limits: max_partitions_to_read, max_concurrent_queries.
     /// Also, return QueryIdHolder. If not null, we should keep it until query finishes.
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.cpp b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
index 2a381afa805..64d4b1fd7ff 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.cpp
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.cpp
@@ -1,20 +1,22 @@
-#include <Storages/MergeTree/MergeTreeDataWriter.h>
-#include <Storages/MergeTree/MergedBlockOutputStream.h>
-#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Columns/ColumnConst.h>
-#include <Common/HashTable/HashMap.h>
-#include <Common/Exception.h>
+#include <DataTypes/DataTypeDate.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/ObjectUtils.h>
 #include <Disks/createVolume.h>
+#include <IO/HashingWriteBuffer.h>
+#include <IO/WriteHelpers.h>
 #include <Interpreters/AggregationCommon.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/MergeTreeTransaction.h>
-#include <IO/HashingWriteBuffer.h>
-#include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypeDate.h>
-#include <DataTypes/ObjectUtils.h>
-#include <IO/WriteHelpers.h>
-#include <Common/typeid_cast.h>
 #include <Processors/TTL/ITTLAlgorithm.h>
+#include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
+#include <Storages/MergeTree/MergeTreeDataWriter.h>
+#include <Storages/MergeTree/MergedBlockOutputStream.h>
+#include <Common/ElapsedTimeProfileEventIncrement.h>
+#include <Common/Exception.h>
+#include <Common/HashTable/HashMap.h>
+#include <Common/OpenTelemetryTraceContext.h>
+#include <Common/typeid_cast.h>
 
 #include <Parsers/queryToString.h>
 
@@ -34,11 +36,16 @@ namespace ProfileEvents
     extern const Event MergeTreeDataWriterRows;
     extern const Event MergeTreeDataWriterUncompressedBytes;
     extern const Event MergeTreeDataWriterCompressedBytes;
+    extern const Event MergeTreeDataWriterSortingBlocksMicroseconds;
+    extern const Event MergeTreeDataWriterMergingBlocksMicroseconds;
+    extern const Event MergeTreeDataWriterProjectionsCalculationMicroseconds;
     extern const Event MergeTreeDataProjectionWriterBlocks;
     extern const Event MergeTreeDataProjectionWriterBlocksAlreadySorted;
     extern const Event MergeTreeDataProjectionWriterRows;
     extern const Event MergeTreeDataProjectionWriterUncompressedBytes;
     extern const Event MergeTreeDataProjectionWriterCompressedBytes;
+    extern const Event MergeTreeDataProjectionWriterSortingBlocksMicroseconds;
+    extern const Event MergeTreeDataProjectionWriterMergingBlocksMicroseconds;
     extern const Event RejectedInserts;
 }
 
@@ -114,7 +121,7 @@ void buildScatterSelector(
     if (max_parts && partitions_count >= max_parts && !throw_on_limit)
     {
         const auto & client_info = context->getClientInfo();
-        Poco::Logger * log = &Poco::Logger::get("MergeTreeDataWriter");
+        LoggerPtr log = getLogger("MergeTreeDataWriter");
 
         LOG_WARNING(log, "INSERT query from initial_user {} (query ID: {}) inserted a block "
                          "that created parts in {} partitions. This is being logged "
@@ -125,13 +132,18 @@ void buildScatterSelector(
 
 /// Computes ttls and updates ttl infos
 void updateTTL(
+    const ContextPtr context,
     const TTLDescription & ttl_entry,
     IMergeTreeDataPart::TTLInfos & ttl_infos,
     DB::MergeTreeDataPartTTLInfo & ttl_info,
     const Block & block,
     bool update_part_min_max_ttls)
 {
-    auto ttl_column = ITTLAlgorithm::executeExpressionAndGetColumn(ttl_entry.expression, block, ttl_entry.result_column);
+    auto expr_and_set = ttl_entry.buildExpression(context);
+    for (auto & subquery : expr_and_set.sets->getSubqueries())
+        subquery->buildSetInplace(context);
+
+    auto ttl_column = ITTLAlgorithm::executeExpressionAndGetColumn(expr_and_set.expression, block, ttl_entry.result_column);
 
     if (const ColumnUInt16 * column_date = typeid_cast<const ColumnUInt16 *>(ttl_column.get()))
     {
@@ -229,7 +241,7 @@ std::vector<AsyncInsertInfoPtr> scatterAsyncInsertInfoBySelector(AsyncInsertInfo
 }
 
 BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(
-    const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, AsyncInsertInfoPtr async_insert_info)
+    Block && block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, AsyncInsertInfoPtr async_insert_info)
 {
     BlocksWithPartition result;
     if (!block || !block.rows())
@@ -308,14 +320,19 @@ BlocksWithPartition MergeTreeDataWriter::splitBlockIntoParts(
 }
 
 Block MergeTreeDataWriter::mergeBlock(
-    const Block & block,
+    Block && block,
     SortDescription sort_description,
     const Names & partition_key_columns,
     IColumn::Permutation *& permutation,
     const MergeTreeData::MergingParams & merging_params)
 {
+    OpenTelemetry::SpanHolder span("MergeTreeDataWriter::mergeBlock");
+
     size_t block_size = block.rows();
 
+    span.addAttribute("clickhouse.rows", block_size);
+    span.addAttribute("clickhouse.columns", block.columns());
+
     auto get_merging_algorithm = [&]() -> std::shared_ptr<IMergingAlgorithm>
     {
         switch (merging_params.mode)
@@ -329,7 +346,7 @@ Block MergeTreeDataWriter::mergeBlock(
             case MergeTreeData::MergingParams::Collapsing:
                 return std::make_shared<CollapsingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.sign_column,
-                    false, block_size + 1, /*block_size_bytes=*/0, &Poco::Logger::get("MergeTreeDataWriter"));
+                    false, block_size + 1, /*block_size_bytes=*/0, getLogger("MergeTreeDataWriter"));
             case MergeTreeData::MergingParams::Summing:
                 return std::make_shared<SummingSortedAlgorithm>(
                     block, 1, sort_description, merging_params.columns_to_sum,
@@ -351,6 +368,8 @@ Block MergeTreeDataWriter::mergeBlock(
     if (!merging_algorithm)
         return block;
 
+    span.addAttribute("clickhouse.merging_algorithm", merging_algorithm->getName());
+
     Chunk chunk(block.getColumns(), block_size);
 
     IMergingAlgorithm::Input input;
@@ -365,13 +384,13 @@ Block MergeTreeDataWriter::mergeBlock(
 
     /// Check that after first merge merging_algorithm is waiting for data from input 0.
     if (status.required_source != 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: required source after the first merge is not 0. Chunk rows: {}, is_finished: {}, required_source: {}, algorithm: {}", status.chunk.getNumRows(), status.is_finished, status.required_source, merging_algorithm->getName());
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Required source after the first merge is not 0. Chunk rows: {}, is_finished: {}, required_source: {}, algorithm: {}", status.chunk.getNumRows(), status.is_finished, status.required_source, merging_algorithm->getName());
 
     status = merging_algorithm->merge();
 
     /// Check that merge is finished.
     if (!status.is_finished)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: merge is not finished after the second merge.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Merge is not finished after the second merge.");
 
     /// Merged Block is sorted and we don't need to use permutation anymore
     permutation = nullptr;
@@ -391,7 +410,11 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartWithoutPref
 }
 
 MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
-    BlockWithPartition & block_with_partition, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, int64_t block_number, bool need_tmp_prefix)
+    BlockWithPartition & block_with_partition,
+    const StorageMetadataPtr & metadata_snapshot,
+    ContextPtr context,
+    int64_t block_number,
+    bool need_tmp_prefix)
 {
     TemporaryPart temp_part;
     Block & block = block_with_partition.block;
@@ -403,7 +426,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
             column.type = block.getByName(column.name).type;
 
     auto minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
-    minmax_idx->update(block, data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
+    minmax_idx->update(block, MergeTreeData::getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
 
     MergeTreePartition partition(block_with_partition.partition);
 
@@ -420,7 +443,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
         auto max_month = date_lut.toNumYYYYMM(max_date);
 
         if (min_month != max_month)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: part spans more than one month.");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Part spans more than one month.");
 
         part_name = new_part_info.getPartNameV0(min_date, max_date);
     }
@@ -464,6 +487,8 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
     IColumn::Permutation perm;
     if (!sort_description.empty())
     {
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterSortingBlocksMicroseconds);
+
         if (!isAlreadySorted(block, sort_description))
         {
             stableGetPermutation(block, sort_description, perm);
@@ -475,7 +500,10 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
 
     Names partition_key_columns = metadata_snapshot->getPartitionKey().column_names;
     if (context->getSettingsRef().optimize_on_insert)
-        block = mergeBlock(block, sort_description, partition_key_columns, perm_ptr, data.merging_params);
+    {
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterMergingBlocksMicroseconds);
+        block = mergeBlock(std::move(block), sort_description, partition_key_columns, perm_ptr, data.merging_params);
+    }
 
     /// Size of part would not be greater than block.bytes() + epsilon
     size_t expected_size = block.bytes();
@@ -488,7 +516,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
     DB::IMergeTreeDataPart::TTLInfos move_ttl_infos;
     const auto & move_ttl_entries = metadata_snapshot->getMoveTTLs();
     for (const auto & ttl_entry : move_ttl_entries)
-        updateTTL(ttl_entry, move_ttl_infos, move_ttl_infos.moves_ttl[ttl_entry.result_column], block, false);
+        updateTTL(context, ttl_entry, move_ttl_infos, move_ttl_infos.moves_ttl[ttl_entry.result_column], block, false);
 
     ReservationPtr reservation = data.reserveSpacePreferringTTLRules(metadata_snapshot, expected_size, move_ttl_infos, time(nullptr), 0, true);
     VolumePtr volume = data.getStoragePolicy()->getVolume(0);
@@ -513,6 +541,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
 
     new_data_part->setColumns(columns, infos, metadata_snapshot->getMetadataVersion());
     new_data_part->rows_count = block.rows();
+    new_data_part->existing_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;
@@ -543,20 +572,20 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
     }
 
     if (metadata_snapshot->hasRowsTTL())
-        updateTTL(metadata_snapshot->getRowsTTL(), new_data_part->ttl_infos, new_data_part->ttl_infos.table_ttl, block, true);
+        updateTTL(context, metadata_snapshot->getRowsTTL(), new_data_part->ttl_infos, new_data_part->ttl_infos.table_ttl, block, true);
 
     for (const auto & ttl_entry : metadata_snapshot->getGroupByTTLs())
-        updateTTL(ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.group_by_ttl[ttl_entry.result_column], block, true);
+        updateTTL(context, ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.group_by_ttl[ttl_entry.result_column], block, true);
 
     for (const auto & ttl_entry : metadata_snapshot->getRowsWhereTTLs())
-        updateTTL(ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.rows_where_ttl[ttl_entry.result_column], block, true);
+        updateTTL(context, ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.rows_where_ttl[ttl_entry.result_column], block, true);
 
     for (const auto & [name, ttl_entry] : metadata_snapshot->getColumnTTLs())
-        updateTTL(ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.columns_ttl[name], block, true);
+        updateTTL(context, ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.columns_ttl[name], block, true);
 
     const auto & recompression_ttl_entries = metadata_snapshot->getRecompressionTTLs();
     for (const auto & ttl_entry : recompression_ttl_entries)
-        updateTTL(ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.recompression_ttl[ttl_entry.result_column], block, false);
+        updateTTL(context, ttl_entry, new_data_part->ttl_infos, new_data_part->ttl_infos.recompression_ttl[ttl_entry.result_column], block, false);
 
     new_data_part->ttl_infos.update(move_ttl_infos);
 
@@ -580,7 +609,13 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempPartImpl(
 
     for (const auto & projection : metadata_snapshot->getProjections())
     {
-        auto projection_block = projection.calculate(block, context);
+        Block projection_block;
+        {
+            ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataWriterProjectionsCalculationMicroseconds);
+            projection_block = projection.calculate(block, context);
+            LOG_DEBUG(log, "Spent {} ms calculating projection {} for the part {}", watch.elapsed() / 1000, projection.name, new_data_part->name);
+        }
+
         if (projection_block.rows())
         {
             auto proj_temp_part = writeProjectionPart(data, log, projection_block, projection, new_data_part.get());
@@ -610,7 +645,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
     bool is_temp,
     IMergeTreeDataPart * parent_part,
     const MergeTreeData & data,
-    Poco::Logger * log,
+    LoggerPtr log,
     Block block,
     const ProjectionDescription & projection)
 {
@@ -618,18 +653,11 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
     const auto & metadata_snapshot = projection.metadata;
 
     MergeTreeDataPartType part_type;
-    if (parent_part->getType() == MergeTreeDataPartType::InMemory)
-    {
-        part_type = MergeTreeDataPartType::InMemory;
-    }
-    else
-    {
-        /// Size of part would not be greater than block.bytes() + epsilon
-        size_t expected_size = block.bytes();
-        // just check if there is enough space on parent volume
-        data.reserveSpace(expected_size, parent_part->getDataPartStorage());
-        part_type = data.choosePartFormatOnDisk(expected_size, block.rows()).part_type;
-    }
+    /// Size of part would not be greater than block.bytes() + epsilon
+    size_t expected_size = block.bytes();
+    // just check if there is enough space on parent volume
+    MergeTreeData::reserveSpace(expected_size, parent_part->getDataPartStorage());
+    part_type = data.choosePartFormatOnDisk(expected_size, block.rows()).part_type;
 
     auto new_data_part = parent_part->getProjectionPartBuilder(part_name, is_temp).withPartType(part_type).build();
     auto projection_part_storage = new_data_part->getDataPartStoragePtr();
@@ -677,6 +705,8 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
     IColumn::Permutation perm;
     if (!sort_description.empty())
     {
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataProjectionWriterSortingBlocksMicroseconds);
+
         if (!isAlreadySorted(block, sort_description))
         {
             stableGetPermutation(block, sort_description, perm);
@@ -688,9 +718,11 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
 
     if (projection.type == ProjectionDescription::Type::Aggregate)
     {
+        ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MergeTreeDataProjectionWriterMergingBlocksMicroseconds);
+
         MergeTreeData::MergingParams projection_merging_params;
         projection_merging_params.mode = MergeTreeData::MergingParams::Aggregating;
-        block = mergeBlock(block, sort_description, {}, perm_ptr, projection_merging_params);
+        block = mergeBlock(std::move(block), sort_description, {}, perm_ptr, projection_merging_params);
     }
 
     /// This effectively chooses minimal compression method:
@@ -721,7 +753,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPartImpl(
 
 MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPart(
     const MergeTreeData & data,
-    Poco::Logger * log,
+    LoggerPtr log,
     Block block,
     const ProjectionDescription & projection,
     IMergeTreeDataPart * parent_part)
@@ -740,7 +772,7 @@ MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeProjectionPart(
 /// projection part merges.
 MergeTreeDataWriter::TemporaryPart MergeTreeDataWriter::writeTempProjectionPart(
     const MergeTreeData & data,
-    Poco::Logger * log,
+    LoggerPtr log,
     Block block,
     const ProjectionDescription & projection,
     IMergeTreeDataPart * parent_part,
diff --git a/src/Storages/MergeTree/MergeTreeDataWriter.h b/src/Storages/MergeTree/MergeTreeDataWriter.h
index 2fb6b1f22d4..9dffea0a471 100644
--- a/src/Storages/MergeTree/MergeTreeDataWriter.h
+++ b/src/Storages/MergeTree/MergeTreeDataWriter.h
@@ -45,14 +45,15 @@ class MergeTreeDataWriter
 public:
     explicit MergeTreeDataWriter(MergeTreeData & data_)
         : data(data_)
-        , log(&Poco::Logger::get(data.getLogName() + " (Writer)"))
-    {}
+        , log(getLogger(data.getLogName() + " (Writer)"))
+    {
+    }
 
     /** Split the block to blocks, each of them must be written as separate part.
       *  (split rows by partition)
       * Works deterministically: if same block was passed, function will return same result in same order.
       */
-    static BlocksWithPartition splitBlockIntoParts(const Block & block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, AsyncInsertInfoPtr async_insert_info = nullptr);
+    static BlocksWithPartition splitBlockIntoParts(Block && block, size_t max_parts, const StorageMetadataPtr & metadata_snapshot, ContextPtr context, AsyncInsertInfoPtr async_insert_info = nullptr);
 
     /// This structure contains not completely written temporary part.
     /// Some writes may happen asynchronously, e.g. for blob storages.
@@ -91,7 +92,7 @@ public:
     /// For insertion.
     static TemporaryPart writeProjectionPart(
         const MergeTreeData & data,
-        Poco::Logger * log,
+        LoggerPtr log,
         Block block,
         const ProjectionDescription & projection,
         IMergeTreeDataPart * parent_part);
@@ -99,14 +100,14 @@ public:
     /// For mutation: MATERIALIZE PROJECTION.
     static TemporaryPart writeTempProjectionPart(
         const MergeTreeData & data,
-        Poco::Logger * log,
+        LoggerPtr log,
         Block block,
         const ProjectionDescription & projection,
         IMergeTreeDataPart * parent_part,
         size_t block_num);
 
     static Block mergeBlock(
-        const Block & block,
+        Block && block,
         SortDescription sort_description,
         const Names & partition_key_columns,
         IColumn::Permutation *& permutation,
@@ -126,12 +127,12 @@ private:
         bool is_temp,
         IMergeTreeDataPart * parent_part,
         const MergeTreeData & data,
-        Poco::Logger * log,
+        LoggerPtr log,
         Block block,
         const ProjectionDescription & projection);
 
     MergeTreeData & data;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIOSettings.h b/src/Storages/MergeTree/MergeTreeIOSettings.h
index 379d7af8569..feeb1808a6f 100644
--- a/src/Storages/MergeTree/MergeTreeIOSettings.h
+++ b/src/Storages/MergeTree/MergeTreeIOSettings.h
@@ -13,6 +13,11 @@ namespace DB
 class MMappedFileCache;
 using MMappedFileCachePtr = std::shared_ptr<MMappedFileCache>;
 
+enum class CompactPartsReadMethod
+{
+    SingleBuffer,
+    MultiBuffer,
+};
 
 struct MergeTreeReaderSettings
 {
@@ -25,12 +30,20 @@ struct MergeTreeReaderSettings
     bool checksum_on_read = true;
     /// True if we read in order of sorting key.
     bool read_in_order = false;
+    /// Use one buffer for each column or for all columns while reading from compact.
+    CompactPartsReadMethod compact_parts_read_method = CompactPartsReadMethod::SingleBuffer;
+    /// True if we read stream for dictionary of LowCardinality type.
+    bool is_low_cardinality_dictionary = false;
+    /// True if data may be compressed by different codecs in one stream.
+    bool allow_different_codecs = false;
     /// Deleted mask is applied to all reads except internal select from mutate some part columns.
     bool apply_deleted_mask = true;
     /// Put reading task in a common I/O pool, return Async state on prepare()
     bool use_asynchronous_read_from_pool = false;
     /// If PREWHERE has multiple conditions combined with AND, execute them in separate read/filtering steps.
     bool enable_multiple_prewhere_read_steps = false;
+    /// If true, try to lower size of read buffer according to granule size and compressed block size.
+    bool adjust_read_buffer_size = true;
 };
 
 struct MergeTreeWriterSettings
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
index da49814b83a..7ab90dac5b0 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.cpp
@@ -59,7 +59,7 @@ bool maybeTrueOnBloomFilter(const IColumn * hash_column, const BloomFilterPtr &
     const auto * non_const_column = typeid_cast<const ColumnUInt64 *>(hash_column);
 
     if (!const_column && !non_const_column)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: hash column must be Const Column or UInt64 Column.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Hash column must be Const or UInt64.");
 
     if (const_column)
     {
@@ -590,7 +590,7 @@ bool MergeTreeIndexConditionBloomFilter::traverseTreeEquals(
 
                 for (const auto & f : value_field.get<Array>())
                 {
-                    if ((f.isNull() && !is_nullable) || f.isDecimal(f.getType()))
+                    if ((f.isNull() && !is_nullable) || f.isDecimal(f.getType())) /// NOLINT(readability-static-accessed-through-instance)
                         return false;
 
                     auto converted = convertFieldToType(f, *actual_type);
diff --git a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
index db85c804d8d..8029d6d405b 100644
--- a/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
+++ b/src/Storages/MergeTree/MergeTreeIndexConditionBloomFilter.h
@@ -53,7 +53,7 @@ public:
         if (const auto & bf_granule = typeid_cast<const MergeTreeIndexGranuleBloomFilter *>(granule.get()))
             return mayBeTrueOnGranule(bf_granule);
 
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "LOGICAL ERROR: require bloom filter index granule.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Requires bloom filter index granule.");
     }
 
 private:
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
index 5fdd0555777..2a45ab1d927 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularity.cpp
@@ -121,5 +121,8 @@ void MergeTreeIndexGranularity::resizeWithFixedGranularity(size_t size, size_t f
     }
 }
 
-
+std::string MergeTreeIndexGranularity::describe() const
+{
+    return fmt::format("initialized: {}, marks_rows_partial_sums: [{}]", initialized, fmt::join(marks_rows_partial_sums, ", "));
+}
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularity.h b/src/Storages/MergeTree/MergeTreeIndexGranularity.h
index f5677995ae0..d67762f7293 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularity.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularity.h
@@ -95,6 +95,8 @@ public:
 
     /// Add `size` of marks with `fixed_granularity` rows
     void resizeWithFixedGranularity(size_t size, size_t fixed_granularity);
+
+    std::string describe() const;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
index 4e339964de3..62bb31dff68 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.cpp
@@ -54,9 +54,9 @@ MarkType::MarkType(bool adaptive_, bool compressed_, MergeTreeDataPartType::Valu
     : adaptive(adaptive_), compressed(compressed_), part_type(part_type_)
 {
     if (!adaptive && part_type != MergeTreeDataPartType::Wide)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: non-Wide data part type with non-adaptive granularity");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Non-Wide data part type with non-adaptive granularity");
     if (part_type == MergeTreeDataPartType::Unknown)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unknown data part type");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown data part type");
 }
 
 bool MarkType::isMarkFileExtension(std::string_view extension)
@@ -71,7 +71,7 @@ std::string MarkType::getFileExtension() const
     if (!adaptive)
     {
         if (part_type != MergeTreeDataPartType::Wide)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: non-Wide data part type with non-adaptive granularity");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Non-Wide data part type with non-adaptive granularity");
         return res;
     }
 
@@ -81,13 +81,15 @@ std::string MarkType::getFileExtension() const
             return res + "2";
         case MergeTreeDataPartType::Compact:
             return res + "3";
-        case MergeTreeDataPartType::InMemory:
-            return "";
         case MergeTreeDataPartType::Unknown:
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unknown data part type");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown data part type");
     }
 }
 
+std::string MarkType::describe() const
+{
+    return fmt::format("adaptive: {}, compressed: {}, part_type: {}", adaptive, compressed, part_type);
+}
 
 std::optional<MarkType> MergeTreeIndexGranularityInfo::getMarksTypeFromFilesystem(const IDataPartStorage & data_part_storage)
 {
@@ -126,16 +128,22 @@ size_t MergeTreeIndexGranularityInfo::getMarkSizeInBytes(size_t columns_num) con
         return mark_type.adaptive ? getAdaptiveMrkSizeWide() : getNonAdaptiveMrkSizeWide();
     else if (mark_type.part_type == MergeTreeDataPartType::Compact)
         return getAdaptiveMrkSizeCompact(columns_num);
-    else if (mark_type.part_type == MergeTreeDataPartType::InMemory)
-        return 0;
     else
         throw Exception(ErrorCodes::UNKNOWN_PART_TYPE, "Unknown part type");
 }
 
+std::string MergeTreeIndexGranularityInfo::describe() const
+{
+    return fmt::format(
+        "mark_type: [{}], index_granularity_bytes: {}, fixed_index_granularity: {}",
+        mark_type.describe(),
+        index_granularity_bytes,
+        fixed_index_granularity);
+}
+
 size_t getAdaptiveMrkSizeCompact(size_t columns_num)
 {
     /// Each mark contains number of rows in granule and two offsets for every column.
     return sizeof(UInt64) * (columns_num * 2 + 1);
 }
-
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
index 4cb35ee64b1..85006c3ffde 100644
--- a/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
+++ b/src/Storages/MergeTree/MergeTreeIndexGranularityInfo.h
@@ -18,12 +18,14 @@ class MergeTreeData;
   */
 struct MarkType
 {
-    MarkType(std::string_view extension);
+    explicit MarkType(std::string_view extension);
     MarkType(bool adaptive_, bool compressed_, MergeTreeDataPartType::Value part_type_);
 
     static bool isMarkFileExtension(std::string_view extension);
     std::string getFileExtension() const;
 
+    std::string describe() const;
+
     bool adaptive = false;
     bool compressed = false;
     MergeTreeDataPartType::Value part_type = MergeTreeDataPartType::Unknown;
@@ -58,6 +60,8 @@ public:
     size_t getMarkSizeInBytes(size_t columns_num = 1) const;
 
     static std::optional<MarkType> getMarksTypeFromFilesystem(const IDataPartStorage & data_part_storage);
+
+    std::string describe() const;
 };
 
 constexpr inline auto getNonAdaptiveMrkSizeWide() { return sizeof(UInt64) * 2; }
diff --git a/src/Storages/MergeTree/MergeTreeIndexHypothesis.h b/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
index 2296e1b717d..130e708d76f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
+++ b/src/Storages/MergeTree/MergeTreeIndexHypothesis.h
@@ -2,7 +2,6 @@
 
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/MergeTree/MergeTreeData.h>
-#include <memory>
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndexInverted.cpp b/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
index 4c28fe8f00b..baf5b0bf4de 100644
--- a/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexInverted.cpp
@@ -22,6 +22,7 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/MergeTreeIndexUtils.h>
 #include <Storages/MergeTree/RPNBuilder.h>
+#include <Common/OptimizedRegularExpression.h>
 #include <algorithm>
 
 
@@ -227,6 +228,7 @@ bool MergeTreeConditionInverted::alwaysUnknownOrTrue() const
              || element.function == RPNElement::FUNCTION_IN
              || element.function == RPNElement::FUNCTION_NOT_IN
              || element.function == RPNElement::FUNCTION_MULTI_SEARCH
+             || element.function == RPNElement::FUNCTION_MATCH
              || element.function == RPNElement::ALWAYS_FALSE)
         {
             rpn_stack.push_back(false);
@@ -294,8 +296,7 @@ bool MergeTreeConditionInverted::mayBeTrueOnGranuleInPart(MergeTreeIndexGranuleP
                     result[row] = result[row] && granule->gin_filters[key_idx].contains(gin_filters[row], cache_store);
             }
 
-            rpn_stack.emplace_back(
-                    std::find(std::cbegin(result), std::cend(result), true) != std::end(result), true);
+            rpn_stack.emplace_back(std::find(std::cbegin(result), std::cend(result), true) != std::end(result), true);
             if (element.function == RPNElement::FUNCTION_NOT_IN)
                 rpn_stack.back() = !rpn_stack.back();
         }
@@ -308,8 +309,27 @@ bool MergeTreeConditionInverted::mayBeTrueOnGranuleInPart(MergeTreeIndexGranuleP
             for (size_t row = 0; row < gin_filters.size(); ++row)
                 result[row] = result[row] && granule->gin_filters[element.key_column].contains(gin_filters[row], cache_store);
 
-            rpn_stack.emplace_back(
-                    std::find(std::cbegin(result), std::cend(result), true) != std::end(result), true);
+            rpn_stack.emplace_back(std::find(std::cbegin(result), std::cend(result), true) != std::end(result), true);
+        }
+        else if (element.function == RPNElement::FUNCTION_MATCH)
+        {
+            if (!element.set_gin_filters.empty())
+            {
+                /// Alternative substrings
+                std::vector<bool> result(element.set_gin_filters.back().size(), true);
+
+                const auto & gin_filters = element.set_gin_filters[0];
+
+                for (size_t row = 0; row < gin_filters.size(); ++row)
+                    result[row] = result[row] && granule->gin_filters[element.key_column].contains(gin_filters[row], cache_store);
+
+                rpn_stack.emplace_back(std::find(std::cbegin(result), std::cend(result), true) != std::end(result), true);
+            }
+            else if (element.gin_filter)
+            {
+                rpn_stack.emplace_back(granule->gin_filters[element.key_column].contains(*element.gin_filter, cache_store), true);
+            }
+
         }
         else if (element.function == RPNElement::FUNCTION_NOT)
         {
@@ -414,7 +434,8 @@ bool MergeTreeConditionInverted::traverseAtomAST(const RPNBuilderTreeNode & node
                  function_name == "hasTokenOrNull" ||
                  function_name == "startsWith" ||
                  function_name == "endsWith" ||
-                 function_name == "multiSearchAny")
+                 function_name == "multiSearchAny" ||
+                 function_name == "match")
         {
             Field const_value;
             DataTypePtr const_type;
@@ -605,6 +626,42 @@ bool MergeTreeConditionInverted::traverseASTEquals(
         out.set_gin_filters = std::move(gin_filters);
         return true;
     }
+    else if (function_name == "match")
+    {
+        out.key_column = key_column_num;
+        out.function = RPNElement::FUNCTION_MATCH;
+
+        auto & value = const_value.get<String>();
+        String required_substring;
+        bool dummy_is_trivial, dummy_required_substring_is_prefix;
+        std::vector<String> alternatives;
+        OptimizedRegularExpression::analyze(value, required_substring, dummy_is_trivial, dummy_required_substring_is_prefix, alternatives);
+
+        if (required_substring.empty() && alternatives.empty())
+            return false;
+
+        /// out.set_gin_filters means alternatives exist
+        /// out.gin_filter means required_substring exists
+        if (!alternatives.empty())
+        {
+            std::vector<GinFilters> gin_filters;
+            gin_filters.emplace_back();
+            for (const auto & alternative : alternatives)
+            {
+               gin_filters.back().emplace_back(params);
+               token_extractor->stringToGinFilter(alternative.data(), alternative.size(), gin_filters.back().back());
+            }
+            out.set_gin_filters = std::move(gin_filters);
+        }
+        else
+        {
+            out.gin_filter = std::make_unique<GinFilter>(params);
+            token_extractor->stringToGinFilter(required_substring.data(), required_substring.size(), *out.gin_filter);
+        }
+
+        return true;
+
+    }
 
     return false;
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexInverted.h b/src/Storages/MergeTree/MergeTreeIndexInverted.h
index 807651d0c26..f3c1f37e364 100644
--- a/src/Storages/MergeTree/MergeTreeIndexInverted.h
+++ b/src/Storages/MergeTree/MergeTreeIndexInverted.h
@@ -101,6 +101,7 @@ private:
             FUNCTION_IN,
             FUNCTION_NOT_IN,
             FUNCTION_MULTI_SEARCH,
+            FUNCTION_MATCH,
             FUNCTION_UNKNOWN, /// Can take any value.
             /// Operators of the logical expression.
             FUNCTION_NOT,
@@ -116,6 +117,7 @@ private:
                 : function(function_), key_column(key_column_), gin_filter(std::move(const_gin_filter_)) {}
 
         Function function = FUNCTION_UNKNOWN;
+
         /// For FUNCTION_EQUALS, FUNCTION_NOT_EQUALS and FUNCTION_MULTI_SEARCH
         size_t key_column;
 
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
index b1f8e09be9f..20dfed8cf8f 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.cpp
@@ -15,6 +15,7 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
+    extern const int BAD_ARGUMENTS;
 }
 
 
@@ -217,7 +218,20 @@ MergeTreeIndexPtr minmaxIndexCreator(
     return std::make_shared<MergeTreeIndexMinMax>(index);
 }
 
-void minmaxIndexValidator(const IndexDescription & /* index */, bool /* attach */)
+void minmaxIndexValidator(const IndexDescription & index, bool attach)
 {
+    if (attach)
+        return;
+
+    for (const auto & column : index.sample_block)
+    {
+        if (!column.type->isComparable())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Data type of argument for minmax index must be comparable, got {} type for column {} instead",
+                column.type->getName(), column.name);
+        }
+    }
 }
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeIndexMinMax.h b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
index 1e2abe6983f..dca26fb7b28 100644
--- a/src/Storages/MergeTree/MergeTreeIndexMinMax.h
+++ b/src/Storages/MergeTree/MergeTreeIndexMinMax.h
@@ -4,8 +4,6 @@
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/KeyCondition.h>
 
-#include <memory>
-
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndexReader.cpp b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
index f0b1aacc239..e7ae1fc5c13 100644
--- a/src/Storages/MergeTree/MergeTreeIndexReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexReader.cpp
@@ -20,14 +20,25 @@ std::unique_ptr<MergeTreeReaderStream> makeIndexReader(
     auto context = part->storage.getContext();
     auto * load_marks_threadpool = settings.read_settings.load_marks_asynchronously ? &context->getLoadMarksThreadpool() : nullptr;
 
-    return std::make_unique<MergeTreeReaderStream>(
+    auto marks_loader = std::make_shared<MergeTreeMarksLoader>(
         std::make_shared<LoadedMergeTreeDataPartInfoForReader>(part, std::make_shared<AlterConversions>()),
+        mark_cache,
+        part->index_granularity_info.getMarksFilePath(index->getFileName()),
+        marks_count,
+        part->index_granularity_info,
+        settings.save_marks_in_cache,
+        settings.read_settings,
+        load_marks_threadpool,
+        /*num_columns_in_mark=*/ 1);
+
+    marks_loader->startAsyncLoad();
+
+    return std::make_unique<MergeTreeReaderStreamSingleColumn>(
+        part->getDataPartStoragePtr(),
         index->getFileName(), extension, marks_count,
-        all_mark_ranges,
-        std::move(settings), mark_cache, uncompressed_cache,
-        part->getFileSizeOrZero(index->getFileName() + extension),
-        &part->index_granularity_info,
-        ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE, false, load_marks_threadpool);
+        all_mark_ranges, std::move(settings), uncompressed_cache,
+        part->getFileSizeOrZero(index->getFileName() + extension), std::move(marks_loader),
+        ReadBufferFromFileBase::ProfileCallback{}, CLOCK_MONOTONIC_COARSE);
 }
 
 }
@@ -56,6 +67,7 @@ MergeTreeIndexReader::MergeTreeIndexReader(
         mark_cache,
         uncompressed_cache,
         std::move(settings));
+
     version = index_format.version;
 
     stream->adjustRightMark(getLastMark(all_mark_ranges_));
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.cpp b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
index 831856f8085..dba2bc1e56c 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.cpp
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.cpp
@@ -1,5 +1,7 @@
 #include <Storages/MergeTree/MergeTreeIndexSet.h>
 
+#include <DataTypes/IDataType.h>
+
 #include <Interpreters/ExpressionActions.h>
 #include <Interpreters/ExpressionAnalyzer.h>
 #include <Interpreters/TreeRewriter.h>
@@ -490,7 +492,8 @@ bool MergeTreeIndexConditionSet::checkDAGUseless(const ActionsDAG::Node & node,
     RPNBuilderTreeContext tree_context(context);
     RPNBuilderTreeNode tree_node(node_to_check, tree_context);
 
-    if (node.column && isColumnConst(*node.column))
+    if (node.column && isColumnConst(*node.column)
+        && !WhichDataType(node.result_type).isSet())
     {
         Field literal;
         node.column->get(0, literal);
diff --git a/src/Storages/MergeTree/MergeTreeIndexSet.h b/src/Storages/MergeTree/MergeTreeIndexSet.h
index ea9f7ddef3d..7c66ba1a867 100644
--- a/src/Storages/MergeTree/MergeTreeIndexSet.h
+++ b/src/Storages/MergeTree/MergeTreeIndexSet.h
@@ -5,9 +5,6 @@
 
 #include <Interpreters/SetVariants.h>
 
-#include <memory>
-#include <set>
-
 
 namespace DB
 {
diff --git a/src/Storages/MergeTree/MergeTreeIndices.h b/src/Storages/MergeTree/MergeTreeIndices.h
index 4749470bedd..8fdadb4e5eb 100644
--- a/src/Storages/MergeTree/MergeTreeIndices.h
+++ b/src/Storages/MergeTree/MergeTreeIndices.h
@@ -1,12 +1,9 @@
 #pragma once
 
 #include <string>
-#include <map>
 #include <unordered_map>
 #include <vector>
 #include <memory>
-#include <utility>
-#include <mutex>
 #include <Core/Block.h>
 #include <Storages/StorageInMemoryMetadata.h>
 #include <Storages/MergeTree/GinIndexStore.h>
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
index 7531c03a011..1e9a320fa95 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.cpp
@@ -1,12 +1,11 @@
 #include <Compression/CompressedReadBufferFromFile.h>
 #include <IO/ReadBufferFromFile.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.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>
@@ -29,6 +28,23 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
+MergeTreeMarksGetter::MergeTreeMarksGetter(MarkCache::MappedPtr marks_, size_t num_columns_in_mark_)
+    : marks(std::move(marks_)), num_columns_in_mark(num_columns_in_mark_)
+{
+    assert(marks);
+}
+
+MarkInCompressedFile MergeTreeMarksGetter::getMark(size_t row_index, size_t column_index) const
+{
+#ifndef NDEBUG
+    if (column_index >= num_columns_in_mark)
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Column index: {} is out of range [0, {})", column_index, num_columns_in_mark);
+#endif
+
+    return marks->get(row_index * num_columns_in_mark + column_index);
+}
+
 MergeTreeMarksLoader::MergeTreeMarksLoader(
     MergeTreeDataPartInfoForReaderPtr data_part_reader_,
     MarkCache * mark_cache_,
@@ -38,75 +54,72 @@ MergeTreeMarksLoader::MergeTreeMarksLoader(
     bool save_marks_in_cache_,
     const ReadSettings & read_settings_,
     ThreadPool * load_marks_threadpool_,
-    size_t columns_in_mark_)
+    size_t num_columns_in_mark_)
     : data_part_reader(data_part_reader_)
     , mark_cache(mark_cache_)
     , mrk_path(mrk_path_)
     , marks_count(marks_count_)
     , index_granularity_info(index_granularity_info_)
     , save_marks_in_cache(save_marks_in_cache_)
-    , columns_in_mark(columns_in_mark_)
     , read_settings(read_settings_)
+    , num_columns_in_mark(num_columns_in_mark_)
     , load_marks_threadpool(load_marks_threadpool_)
+{
+}
+
+void MergeTreeMarksLoader::startAsyncLoad()
 {
     if (load_marks_threadpool)
-    {
         future = loadMarksAsync();
-    }
 }
 
 MergeTreeMarksLoader::~MergeTreeMarksLoader()
 {
     if (future.valid())
-    {
         future.wait();
-    }
 }
 
-
-MarkInCompressedFile MergeTreeMarksLoader::getMark(size_t row_index, size_t column_index)
+MergeTreeMarksGetterPtr MergeTreeMarksLoader::loadMarks()
 {
-    if (!marks)
+    std::lock_guard lock(load_mutex);
+
+    if (marks)
+        return std::make_unique<MergeTreeMarksGetter>(marks, num_columns_in_mark);
+
+    Stopwatch watch(CLOCK_MONOTONIC);
+
+    if (future.valid())
     {
-        Stopwatch watch(CLOCK_MONOTONIC);
-
-        if (future.valid())
-        {
-            marks = future.get();
-            future = {};
-        }
-        else
-        {
-            marks = loadMarks();
-        }
-
-        watch.stop();
-        ProfileEvents::increment(ProfileEvents::WaitMarksLoadMicroseconds, watch.elapsedMicroseconds());
+        marks = future.get();
+        future = {};
+    }
+    else
+    {
+        marks = loadMarksSync();
     }
 
-#ifndef NDEBUG
-    if (column_index >= columns_in_mark)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Column index: {} is out of range [0, {})", column_index, columns_in_mark);
-#endif
-
-    return marks->get(row_index * columns_in_mark + column_index);
+    watch.stop();
+    ProfileEvents::increment(ProfileEvents::WaitMarksLoadMicroseconds, watch.elapsedMicroseconds());
+    return std::make_unique<MergeTreeMarksGetter>(marks, num_columns_in_mark);
 }
 
 
 MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
 {
+    LOG_TEST(getLogger("MergeTreeMarksLoader"), "Loading marks from path {}", mrk_path);
+
     /// 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 mark_size = index_granularity_info.getMarkSizeInBytes(num_columns_in_mark);
     size_t expected_uncompressed_size = mark_size * marks_count;
 
     // 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
+    PODArray<MarkInCompressedFile> plain_marks(marks_count * num_columns_in_mark); // temporary
     auto full_mark_path = std::string(fs::path(data_part_storage->getFullPath()) / mrk_path);
 
     if (file_size == 0 && marks_count != 0)
@@ -160,7 +173,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
 
             size_t granularity;
             reader->readStrict(
-                reinterpret_cast<char *>(plain_marks.data() + i * columns_in_mark), columns_in_mark * sizeof(MarkInCompressedFile));
+                reinterpret_cast<char *>(plain_marks.data() + i * num_columns_in_mark), num_columns_in_mark * sizeof(MarkInCompressedFile));
             readBinaryLittleEndian(granularity, *reader);
         }
 
@@ -183,13 +196,13 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksImpl()
 
     auto res = std::make_shared<MarksInCompressedFile>(plain_marks);
 
-    ProfileEvents::increment(ProfileEvents::LoadedMarksCount, marks_count * columns_in_mark);
+    ProfileEvents::increment(ProfileEvents::LoadedMarksCount, marks_count * num_columns_in_mark);
     ProfileEvents::increment(ProfileEvents::LoadedMarksMemoryBytes, res->approximateMemoryUsage());
 
     return res;
 }
 
-MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
+MarkCache::MappedPtr MergeTreeMarksLoader::loadMarksSync()
 {
     MarkCache::MappedPtr loaded_marks;
 
@@ -197,7 +210,7 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
 
     if (mark_cache)
     {
-        auto key = mark_cache->hash(fs::path(data_part_storage->getFullPath()) / mrk_path);
+        auto key = MarkCache::hash(fs::path(data_part_storage->getFullPath()) / mrk_path);
         if (save_marks_in_cache)
         {
             auto callback = [this] { return loadMarksImpl(); };
@@ -211,7 +224,9 @@ MarkCache::MappedPtr MergeTreeMarksLoader::loadMarks()
         }
     }
     else
+    {
         loaded_marks = loadMarksImpl();
+    }
 
     if (!loaded_marks)
     {
@@ -228,7 +243,7 @@ std::future<MarkCache::MappedPtr> MergeTreeMarksLoader::loadMarksAsync()
         [this]() -> MarkCache::MappedPtr
         {
             ProfileEvents::increment(ProfileEvents::BackgroundLoadingMarksTasks);
-            return loadMarks();
+            return loadMarksSync();
         },
         *load_marks_threadpool,
         "LoadMarksThread");
diff --git a/src/Storages/MergeTree/MergeTreeMarksLoader.h b/src/Storages/MergeTree/MergeTreeMarksLoader.h
index 0889da0cb85..2aa4474e1c5 100644
--- a/src/Storages/MergeTree/MergeTreeMarksLoader.h
+++ b/src/Storages/MergeTree/MergeTreeMarksLoader.h
@@ -10,13 +10,33 @@ namespace DB
 {
 
 struct MergeTreeIndexGranularityInfo;
+using MarksPtr = MarkCache::MappedPtr;
 class Threadpool;
 
+/// Class that helps to get marks by indexes.
+/// Always immutable and thread safe.
+/// Marks can be shared between several threads
+/// that read columns from the same file.
+class MergeTreeMarksGetter
+{
+public:
+    MergeTreeMarksGetter(MarkCache::MappedPtr marks_, size_t num_columns_in_mark_);
+
+    MarkInCompressedFile getMark(size_t row_index, size_t column_index) const;
+    size_t getNumColumns() const { return num_columns_in_mark; }
+
+private:
+    const MarkCache::MappedPtr marks;
+    const size_t num_columns_in_mark;
+};
+
+using MergeTreeMarksGetterPtr = std::unique_ptr<const MergeTreeMarksGetter>;
+
+/// Class that helps to load marks on demand.
+/// Thread safe, but locks while loading marks.
 class MergeTreeMarksLoader
 {
 public:
-    using MarksPtr = MarkCache::MappedPtr;
-
     MergeTreeMarksLoader(
         MergeTreeDataPartInfoForReaderPtr data_part_reader_,
         MarkCache * mark_cache_,
@@ -26,24 +46,28 @@ public:
         bool save_marks_in_cache_,
         const ReadSettings & read_settings_,
         ThreadPool * load_marks_threadpool_,
-        size_t columns_in_mark_ = 1);
+        size_t num_columns_in_mark_);
 
     ~MergeTreeMarksLoader();
 
-    MarkInCompressedFile getMark(size_t row_index, size_t column_index = 0);
+    void startAsyncLoad();
+    MergeTreeMarksGetterPtr loadMarks();
+    size_t getNumColumns() const { return num_columns_in_mark; }
 
 private:
-    MergeTreeDataPartInfoForReaderPtr data_part_reader;
-    MarkCache * mark_cache = nullptr;
-    String mrk_path;
-    size_t marks_count;
+    const MergeTreeDataPartInfoForReaderPtr data_part_reader;
+    MarkCache * const mark_cache;
+    const String mrk_path;
+    const size_t marks_count;
     const MergeTreeIndexGranularityInfo & index_granularity_info;
-    bool save_marks_in_cache = false;
-    size_t columns_in_mark;
-    MarkCache::MappedPtr marks;
-    ReadSettings read_settings;
+    const bool save_marks_in_cache;
+    const ReadSettings read_settings;
+    const size_t num_columns_in_mark;
 
-    MarkCache::MappedPtr loadMarks();
+    std::mutex load_mutex;
+    MarkCache::MappedPtr marks;
+
+    MarkCache::MappedPtr loadMarksSync();
     std::future<MarkCache::MappedPtr> loadMarksAsync();
     MarkCache::MappedPtr loadMarksImpl();
 
@@ -51,4 +75,6 @@ private:
     ThreadPool * load_marks_threadpool;
 };
 
+using MergeTreeMarksLoaderPtr = std::shared_ptr<MergeTreeMarksLoader>;
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeMutationStatus.h b/src/Storages/MergeTree/MergeTreeMutationStatus.h
index b6f62e1218f..4bc9549872c 100644
--- a/src/Storages/MergeTree/MergeTreeMutationStatus.h
+++ b/src/Storages/MergeTree/MergeTreeMutationStatus.h
@@ -13,6 +13,7 @@ namespace DB
 
 struct MergeTreeMutationStatus
 {
+/// NOLINTBEGIN(readability-redundant-string-init)
     String id = "";
     String command = "";
     time_t create_time = 0;
@@ -30,6 +31,7 @@ struct MergeTreeMutationStatus
 
     /// FIXME: currently unused, but would be much better to report killed mutations with this flag.
     bool is_killed = false;
+/// NOLINTEND(readability-redundant-string-init)
 };
 
 /// Check mutation status and throw exception in case of error during mutation
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.cpp b/src/Storages/MergeTree/MergeTreePartInfo.cpp
index 8c1b630e85e..f3a974a22af 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.cpp
+++ b/src/Storages/MergeTree/MergeTreePartInfo.cpp
@@ -131,7 +131,7 @@ std::optional<MergeTreePartInfo> MergeTreePartInfo::tryParsePartName(
         /// "Part 20170601_20170630_0_2_999999999 intersects 201706_0_1_4294967295".
         /// So we replace unexpected max level to make contains(...) method and comparison operators work
         /// correctly with such virtual parts. On part name serialization we will use legacy max level to keep the name unchanged.
-        part_info.use_leagcy_max_level = true;
+        part_info.use_legacy_max_level = true;
         level = MAX_LEVEL;
     }
 
@@ -205,7 +205,7 @@ String MergeTreePartInfo::getPartNameV1() const
     writeChar('_', wb);
     writeIntText(max_block, wb);
     writeChar('_', wb);
-    if (use_leagcy_max_level)
+    if (use_legacy_max_level)
     {
         assert(level == MAX_LEVEL);
         writeIntText(LEGACY_MAX_LEVEL, wb);
@@ -244,7 +244,7 @@ String MergeTreePartInfo::getPartNameV0(DayNum left_date, DayNum right_date) con
     writeChar('_', wb);
     writeIntText(max_block, wb);
     writeChar('_', wb);
-    if (use_leagcy_max_level)
+    if (use_legacy_max_level)
     {
         assert(level == MAX_LEVEL);
         writeIntText(LEGACY_MAX_LEVEL, wb);
@@ -274,7 +274,7 @@ void MergeTreePartInfo::serialize(WriteBuffer & out) const
     writeIntBinary(max_block, out);
     writeIntBinary(level, out);
     writeIntBinary(mutation, out);
-    writeBoolText(use_leagcy_max_level, out);
+    writeBoolText(use_legacy_max_level, out);
 }
 
 
@@ -297,7 +297,7 @@ void MergeTreePartInfo::deserialize(ReadBuffer & in)
     readIntBinary(max_block, in);
     readIntBinary(level, in);
     readIntBinary(mutation, in);
-    readBoolText(use_leagcy_max_level, in);
+    readBoolText(use_legacy_max_level, in);
 }
 
 bool MergeTreePartInfo::areAllBlockNumbersCovered(const MergeTreePartInfo & blocks_range, std::vector<MergeTreePartInfo> candidates)
diff --git a/src/Storages/MergeTree/MergeTreePartInfo.h b/src/Storages/MergeTree/MergeTreePartInfo.h
index 5fbb5d70bf3..9bb79e21144 100644
--- a/src/Storages/MergeTree/MergeTreePartInfo.h
+++ b/src/Storages/MergeTree/MergeTreePartInfo.h
@@ -26,7 +26,7 @@ struct MergeTreePartInfo
     UInt32 level = 0;
     Int64 mutation = 0;   /// If the part has been mutated or contains mutated parts, is equal to mutation version number.
 
-    bool use_leagcy_max_level = false;  /// For compatibility. TODO remove it
+    bool use_legacy_max_level = false;  /// For compatibility. TODO remove it
 
     MergeTreePartInfo() = default;
 
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.cpp b/src/Storages/MergeTree/MergeTreePartsMover.cpp
index d32bc6d1826..1db70162bff 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.cpp
+++ b/src/Storages/MergeTree/MergeTreePartsMover.cpp
@@ -158,7 +158,7 @@ bool MergeTreePartsMover::selectPartsForMove(
         {
             auto destination = data->getDestinationForMoveTTL(*ttl_entry);
             if (destination && !data->isPartInTTLDestination(*ttl_entry, *part))
-                reservation = data->tryReserveSpace(part->getBytesOnDisk(), data->getDestinationForMoveTTL(*ttl_entry));
+                reservation = MergeTreeData::tryReserveSpace(part->getBytesOnDisk(), data->getDestinationForMoveTTL(*ttl_entry));
         }
 
         if (reservation) /// Found reservation by TTL rule.
diff --git a/src/Storages/MergeTree/MergeTreePartsMover.h b/src/Storages/MergeTree/MergeTreePartsMover.h
index b9109e51309..43d8ebdd6d3 100644
--- a/src/Storages/MergeTree/MergeTreePartsMover.h
+++ b/src/Storages/MergeTree/MergeTreePartsMover.h
@@ -48,7 +48,7 @@ public:
 
     explicit MergeTreePartsMover(MergeTreeData * data_)
         : data(data_)
-        , log(&Poco::Logger::get("MergeTreePartsMover"))
+        , log(getLogger("MergeTreePartsMover"))
     {
     }
 
@@ -81,7 +81,7 @@ public:
 private:
 
     MergeTreeData * data;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
index 3f9632637b6..c19b4ddd8a2 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.cpp
@@ -1,6 +1,6 @@
 #include <IO/Operators.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <Storages/MergeTree/AlterConversions.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
@@ -9,6 +9,7 @@
 #include <Storages/MergeTree/MergeTreePrefetchedReadPool.h>
 #include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <base/getThreadId.h>
 #include <Common/ElapsedTimeProfileEventIncrement.h>
 #include <Common/logger_useful.h>
@@ -108,27 +109,27 @@ MergeTreeReadTask::Readers MergeTreePrefetchedReadPool::PrefetchedReaders::get()
 
 MergeTreePrefetchedReadPool::MergeTreePrefetchedReadPool(
     RangesInDataParts && parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & settings_,
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
+        std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
         actions_settings_,
         reader_settings_,
         column_names_,
-        virtual_column_names_,
         settings_,
         context_)
     , WithContext(context_)
     , prefetch_threadpool(getContext()->getPrefetchThreadpool())
-    , log(&Poco::Logger::get("MergeTreePrefetchedReadPool(" + (parts_ranges.empty() ? "" : parts_ranges.front().data_part->storage.getStorageID().getNameForLogs()) + ")"))
+    , log(getLogger("MergeTreePrefetchedReadPool(" + (parts_ranges.empty() ? "" : parts_ranges.front().data_part->storage.getStorageID().getNameForLogs()) + ")"))
 {
     /// Tasks creation might also create a lost of readers - check they do not
     /// do any time consuming operations in ctor.
@@ -375,7 +376,7 @@ void MergeTreePrefetchedReadPool::fillPerPartStatistics()
             update_stat_for_column(column.name);
 
         if (reader_settings.apply_deleted_mask && read_info.data_part->hasLightweightDelete())
-            update_stat_for_column(LightweightDeleteDescription::FILTER_COLUMN.name);
+            update_stat_for_column(RowExistsColumn::name);
 
         for (const auto & pre_columns : read_info.task_columns.pre_columns)
             for (const auto & column : pre_columns)
diff --git a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
index 9925d4e2fa4..0c8a6716d40 100644
--- a/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
+++ b/src/Storages/MergeTree/MergeTreePrefetchedReadPool.h
@@ -18,12 +18,12 @@ class MergeTreePrefetchedReadPool : public MergeTreeReadPoolBase, private WithCo
 public:
     MergeTreePrefetchedReadPool(
         RangesInDataParts && parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
@@ -67,7 +67,7 @@ private:
 
     struct ThreadTask
     {
-        using InfoPtr = MergeTreeReadTask::InfoPtr;
+        using InfoPtr = MergeTreeReadTaskInfoPtr;
 
         ThreadTask(InfoPtr read_info_, MarkRanges ranges_, Priority priority_)
             : read_info(std::move(read_info_)), ranges(std::move(ranges_)), priority(priority_)
@@ -122,7 +122,7 @@ private:
     TasksPerThread per_thread_tasks;
     std::priority_queue<TaskHolder> prefetch_queue; /// the smallest on top
     bool started_prefetches = false;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// A struct which allows to track max number of tasks which were in the
     /// threadpool simultaneously (similar to CurrentMetrics, but the result
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.cpp b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
index 84e3c10eace..eb757e1d8c7 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.cpp
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreeRangeReader.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Columns/FilterDescription.h>
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnsCommon.h>
@@ -362,7 +363,7 @@ void MergeTreeRangeReader::ReadResult::shrink(Columns & old_columns, const NumRo
     }
 }
 
-/// The main invariant of the data in the read result is that he number of rows is
+/// The main invariant of the data in the read result is that the number of rows is
 /// either equal to total_rows_per_granule (if filter has not been applied) or to the number of
 /// 1s in the filter (if filter has been applied).
 void MergeTreeRangeReader::ReadResult::checkInternalConsistency() const
@@ -448,21 +449,16 @@ static ColumnPtr andFilters(ColumnPtr c1, ColumnPtr c2)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Size of filters don't match: {} and {}",
             c1->size(), c2->size());
 
-    // TODO: use proper vectorized implementation of AND?
     auto res = ColumnUInt8::create(c1->size());
     auto & res_data = res->getData();
     const auto & c1_data = typeid_cast<const ColumnUInt8&>(*c1).getData();
     const auto & c2_data = typeid_cast<const ColumnUInt8&>(*c2).getData();
     const size_t size = c1->size();
-    const size_t step = 16;
-    size_t i = 0;
-    /// NOTE: '&&' must be used instead of '&' for 'AND' operation because UInt8 columns might contain any non-zero
-    /// value for true and we cannot bitwise AND them to get the correct result.
-    for (; i + step < size; i += step)
-        for (size_t j = 0; j < step; ++j)
-            res_data[i+j] = (c1_data[i+j] && c2_data[i+j]);
-    for (; i < size; ++i)
-        res_data[i] = (c1_data[i] && c2_data[i]);
+    /// The double NOT operators (!!) convert the non-zeros to the bool value of true (0x01) and zeros to false (0x00).
+    /// After casting them to UInt8, '&' could replace '&&' for the 'AND' operation implementation and at the same
+    /// time enable the auto vectorization.
+    for (size_t i = 0; i < size; ++i)
+        res_data[i] = (static_cast<UInt8>(!!c1_data[i]) & static_cast<UInt8>(!!c2_data[i]));
     return res;
 }
 
@@ -808,8 +804,7 @@ MergeTreeRangeReader::MergeTreeRangeReader(
     IMergeTreeReader * merge_tree_reader_,
     MergeTreeRangeReader * prev_reader_,
     const PrewhereExprStep * prewhere_info_,
-    bool last_reader_in_chain_,
-    const Names & non_const_virtual_column_names_)
+    bool last_reader_in_chain_)
     : merge_tree_reader(merge_tree_reader_)
     , index_granularity(&(merge_tree_reader->data_part_info_for_read->getIndexGranularity()))
     , prev_reader(prev_reader_)
@@ -826,21 +821,6 @@ MergeTreeRangeReader::MergeTreeRangeReader(
         result_sample_block.insert({name_and_type.type->createColumn(), name_and_type.type, name_and_type.name});
     }
 
-    for (const auto & column_name : non_const_virtual_column_names_)
-    {
-        if (result_sample_block.has(column_name))
-            continue;
-
-        non_const_virtual_column_names.push_back(column_name);
-
-        if (column_name == "_part_offset" && !prev_reader)
-        {
-            /// _part_offset column is filled by the first reader.
-            read_sample_block.insert(ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), column_name));
-            result_sample_block.insert(ColumnWithTypeAndName(ColumnUInt64::create(), std::make_shared<DataTypeUInt64>(), column_name));
-        }
-    }
-
     if (prewhere_info)
     {
         const auto & step = *prewhere_info;
@@ -892,6 +872,8 @@ size_t MergeTreeRangeReader::currentMark() const
     return stream.currentMark();
 }
 
+const NameSet MergeTreeRangeReader::virtuals_to_fill = {"_part_offset", "_block_offset"};
+
 size_t MergeTreeRangeReader::Stream::numPendingRows() const
 {
     size_t rows_between_marks = index_granularity->getRowsCountInRange(current_mark, last_mark);
@@ -1006,6 +988,8 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             if (num_read_rows == 0)
                 num_read_rows = read_result.num_rows;
 
+            merge_tree_reader->fillVirtualColumns(columns, num_read_rows);
+
             /// fillMissingColumns() must be called after reading but befoe any filterings because
             /// some columns (e.g. arrays) might be only partially filled and thus not be valid and
             /// fillMissingColumns() fixes this.
@@ -1055,23 +1039,23 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::read(size_t max_rows, Mar
             return read_result;
 
         {
-            /// Physical columns go first and then some virtual columns follow
-            size_t physical_columns_count = merge_tree_reader->getColumns().size();
-            Columns physical_columns(read_result.columns.begin(), read_result.columns.begin() + physical_columns_count);
+            size_t columns_count = merge_tree_reader->getColumns().size();
+            Columns columns(read_result.columns.begin(), read_result.columns.begin() + columns_count);
+            merge_tree_reader->fillVirtualColumns(columns, read_result.num_rows);
 
             bool should_evaluate_missing_defaults;
-            merge_tree_reader->fillMissingColumns(physical_columns, should_evaluate_missing_defaults, read_result.num_rows);
+            merge_tree_reader->fillMissingColumns(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);
+                merge_tree_reader->evaluateMissingDefaults({}, columns);
 
             /// If result not empty, then apply on-fly alter conversions if any required
             if (!prewhere_info || prewhere_info->perform_alter_conversions)
-                merge_tree_reader->performRequiredConversions(physical_columns);
+                merge_tree_reader->performRequiredConversions(columns);
 
-            for (size_t i = 0; i < physical_columns.size(); ++i)
-                read_result.columns[i] = std::move(physical_columns[i]);
+            for (size_t i = 0; i < columns.size(); ++i)
+                read_result.columns[i] = std::move(columns[i]);
         }
 
         size_t total_bytes = 0;
@@ -1162,13 +1146,38 @@ MergeTreeRangeReader::ReadResult MergeTreeRangeReader::startReadingChain(size_t
     if (!result.rows_per_granule.empty())
         result.adjustLastGranule();
 
-    if (read_sample_block.has("_part_offset"))
-        fillPartOffsetColumn(result, leading_begin_part_offset, leading_end_part_offset);
-
+    fillVirtualColumns(result, leading_begin_part_offset, leading_end_part_offset);
     return result;
 }
 
-void MergeTreeRangeReader::fillPartOffsetColumn(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset)
+void MergeTreeRangeReader::fillVirtualColumns(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset)
+{
+    ColumnPtr part_offset_column;
+
+    auto add_offset_column = [&](const auto & column_name)
+    {
+        size_t pos = read_sample_block.getPositionByName(column_name);
+        chassert(pos < result.columns.size());
+
+        /// Column may be persisted in part.
+        if (result.columns[pos])
+            return;
+
+        if (!part_offset_column)
+            part_offset_column = createPartOffsetColumn(result, leading_begin_part_offset, leading_end_part_offset);
+
+        result.columns[pos] = part_offset_column;
+    };
+
+    if (read_sample_block.has("_part_offset"))
+        add_offset_column("_part_offset");
+
+    /// Column _block_offset is the same as _part_offset if it's not persisted in part.
+    if (read_sample_block.has(BlockOffsetColumn::name))
+        add_offset_column(BlockOffsetColumn::name);
+}
+
+ColumnPtr MergeTreeRangeReader::createPartOffsetColumn(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset)
 {
     size_t num_rows = result.numReadRows();
 
@@ -1194,7 +1203,7 @@ void MergeTreeRangeReader::fillPartOffsetColumn(ReadResult & result, UInt64 lead
             *pos++ = start_part_offset++;
     }
 
-    result.columns.emplace_back(std::move(column));
+    return column;
 }
 
 Columns MergeTreeRangeReader::continueReadingChain(const ReadResult & result, size_t & num_rows)
@@ -1208,7 +1217,7 @@ Columns MergeTreeRangeReader::continueReadingChain(const ReadResult & result, si
 
     if (result.rows_per_granule.empty())
     {
-        /// If zero rows were read on prev step, than there is no more rows to read.
+        /// If zero rows were read on prev step, there is no more rows to read.
         /// Last granule may have less rows than index_granularity, so finish reading manually.
         stream.finish();
         return columns;
@@ -1283,6 +1292,81 @@ inline void combineFiltersImpl(UInt8 * first_begin, const UInt8 * first_end, con
 }
 )
 
+/* The BMI2 intrinsic, _pdep_u64 (unsigned __int64 a, unsigned __int64 mask), works
+ * by copying contiguous low-order bits from unsigned 64-bit integer a to destination
+ * at the corresponding bit locations specified by mask. To implement the column
+ * combination with the intrinsic, 8 contiguous bytes would be loaded from second_begin
+ * as a UInt64 and act the first operand, meanwhile the mask should be constructed from
+ * first_begin so that the bytes to be replaced (non-zero elements) are mapped to 0xFF
+ * at the exact bit locations and 0x00 otherwise.
+ *
+ * The construction of mask employs the SSE intrinsic, mm_cmpeq_epi8(__m128i a, __m128i
+ * b), which compares packed 8-bit integers in first_begin and packed 0s and outputs
+ * 0xFF for equality and 0x00 for inequality. The result's negation then creates the
+ * desired bit masks for _pdep_u64.
+ *
+ * The below example visualizes how this optimization applies to the combination of
+ * two quadwords from first_begin and second_begin.
+ *
+ *                                      Addr  high                           low
+ *                                      <----------------------------------------
+ * first_begin............................0x00 0x11 0x12 0x00 0x00 0x13 0x14 0x15
+ *     |      mm_cmpeq_epi8(src, 0)        |    |    |    |    |    |    |    |
+ *     v                                   v    v    v    v    v    v    v    v
+ *  inv_mask..............................0xFF 0x00 0x00 0xFF 0xFF 0x00 0x00 0x00
+ *     |      (negation)                   |    |    |    |    |    |    |    |
+ *     v                                   v    v    v    v    v    v    v    v
+ *    mask-------------------------+......0x00 0xFF 0xFF 0x00 0x00 0xFF 0xFF 0xFF
+ *                                 |            |    |              |    |    |
+ *                                 v            v    v              v    v    v
+ *    dst = pdep_u64(second_begin, mask)..0x00 0x05 0x04 0x00 0x00 0x03 0x02 0x01
+ *                        ^                     ^    ^              ^    ^    ^
+ *                        |                     |    |              |    |    |
+ *                        |                     |    +---------+    |    |    |
+ *     +------------------+                     +---------+    |    |    |    |
+ *     |                                                  |    |    |    |    |
+ * second_begin...........................0x00 0x00 0x00 0x05 0x04 0x03 0x02 0x01
+ *
+ * References:
+ * 1. https://www.felixcloutier.com/x86/pdep
+ * 2. https://www.felixcloutier.com/x86/pcmpeqb:pcmpeqw:pcmpeqd
+ */
+DECLARE_AVX2_SPECIFIC_CODE(
+inline void combineFiltersImpl(UInt8 * first_begin, const UInt8 * first_end, const UInt8 * second_begin)
+{
+    constexpr size_t XMM_VEC_SIZE_IN_BYTES = 16;
+    const __m128i zero16 = _mm_setzero_si128();
+
+    while (first_begin + XMM_VEC_SIZE_IN_BYTES <= first_end)
+    {
+        __m128i src = _mm_loadu_si128(reinterpret_cast<__m128i *>(first_begin));
+        __m128i inv_mask = _mm_cmpeq_epi8(src, zero16);
+
+        UInt64 masks[] = {
+            ~static_cast<UInt64>(_mm_extract_epi64(inv_mask, 0)),
+            ~static_cast<UInt64>(_mm_extract_epi64(inv_mask, 1)),
+        };
+
+        for (const auto & mask: masks)
+        {
+            UInt64 dst = _pdep_u64(unalignedLoad<UInt64>(second_begin), mask);
+            unalignedStore<UInt64>(first_begin, dst);
+
+            first_begin += sizeof(UInt64);
+            second_begin += std::popcount(mask) / 8;
+        }
+    }
+
+    for (/* empty */; first_begin < first_end; ++first_begin)
+    {
+        if (*first_begin)
+        {
+            *first_begin = *second_begin++;
+        }
+    }
+}
+)
+
 /// Second filter size must be equal to number of 1s in the first filter.
 /// The result has size equal to first filter size and contains 1s only where both filters contain 1s.
 static ColumnPtr combineFilters(ColumnPtr first, ColumnPtr second)
@@ -1330,6 +1414,10 @@ static ColumnPtr combineFilters(ColumnPtr first, ColumnPtr second)
     {
         TargetSpecific::AVX512VBMI2::combineFiltersImpl(first_data.begin(), first_data.end(), second_data);
     }
+    else if (isArchSupported(TargetArch::AVX2))
+    {
+        TargetSpecific::AVX2::combineFiltersImpl(first_data.begin(), first_data.end(), second_data);
+    }
     else
 #endif
     {
diff --git a/src/Storages/MergeTree/MergeTreeRangeReader.h b/src/Storages/MergeTree/MergeTreeRangeReader.h
index 04d42138963..b282ada6038 100644
--- a/src/Storages/MergeTree/MergeTreeRangeReader.h
+++ b/src/Storages/MergeTree/MergeTreeRangeReader.h
@@ -101,8 +101,7 @@ public:
         IMergeTreeReader * merge_tree_reader_,
         MergeTreeRangeReader * prev_reader_,
         const PrewhereExprStep * prewhere_info_,
-        bool last_reader_in_chain_,
-        const Names & non_const_virtual_column_names);
+        bool last_reader_in_chain_);
 
     MergeTreeRangeReader() = default;
 
@@ -116,6 +115,9 @@ public:
     bool isCurrentRangeFinished() const;
     bool isInitialized() const { return is_initialized; }
 
+    /// Names of virtual columns that are filled in RangeReader.
+    static const NameSet virtuals_to_fill;
+
 private:
     /// Accumulates sequential read() requests to perform a large read instead of multiple small reads
     class DelayedStream
@@ -231,7 +233,7 @@ public:
 
         using RangesInfo = std::vector<RangeInfo>;
 
-        explicit ReadResult(Poco::Logger * log_) : log(log_) {}
+        explicit ReadResult(LoggerPtr log_) : log(log_) {}
 
         static size_t getLastMark(const MergeTreeRangeReader::ReadResult::RangesInfo & ranges);
 
@@ -298,7 +300,7 @@ public:
         size_t countZeroTails(const IColumn::Filter & filter, NumRows & zero_tails, bool can_read_incomplete_granules) const;
         static size_t numZerosInTail(const UInt8 * begin, const UInt8 * end);
 
-        Poco::Logger * log;
+        LoggerPtr log;
     };
 
     ReadResult read(size_t max_rows, MarkRanges & ranges);
@@ -309,7 +311,9 @@ private:
     ReadResult startReadingChain(size_t max_rows, MarkRanges & ranges);
     Columns continueReadingChain(const ReadResult & result, size_t & num_rows);
     void executePrewhereActionsAndFilterColumns(ReadResult & result) const;
-    void fillPartOffsetColumn(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset);
+
+    void fillVirtualColumns(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset);
+    ColumnPtr createPartOffsetColumn(ReadResult & result, UInt64 leading_begin_part_offset, UInt64 leading_end_part_offset);
 
     IMergeTreeReader * merge_tree_reader = nullptr;
     const MergeTreeIndexGranularity * index_granularity = nullptr;
@@ -323,9 +327,8 @@ private:
 
     bool last_reader_in_chain = false;
     bool is_initialized = false;
-    Names non_const_virtual_column_names;
 
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeRangeReader");
+    LoggerPtr log = getLogger("MergeTreeRangeReader");
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.cpp b/src/Storages/MergeTree/MergeTreeReadPool.cpp
index 8ed7a9d8707..e525f7f5f65 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPool.cpp
@@ -16,14 +16,15 @@ namespace ProfileEvents
     extern const Event ReadBackoff;
 }
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
 namespace DB
 {
 
+namespace ErrorCodes
+{
+extern const int CANNOT_SCHEDULE_TASK;
+extern const int LOGICAL_ERROR;
+}
+
 size_t getApproxSizeOfPart(const IMergeTreeDataPart & part, const Names & columns_to_read)
 {
     ColumnSize columns_size{};
@@ -34,22 +35,22 @@ size_t getApproxSizeOfPart(const IMergeTreeDataPart & part, const Names & column
 
 MergeTreeReadPool::MergeTreeReadPool(
     RangesInDataParts && parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & settings_,
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
+        std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
         actions_settings_,
         reader_settings_,
         column_names_,
-        virtual_column_names_,
         settings_,
         context_)
     , min_marks_for_concurrent_read(pool_settings.min_marks_for_concurrent_read)
@@ -217,6 +218,9 @@ void MergeTreeReadPool::profileFeedback(ReadBufferFromFileBase::ProfileInfo info
 
 void MergeTreeReadPool::fillPerThreadInfo(size_t threads, size_t sum_marks)
 {
+    if (threads > 1000000ull)
+        throw Exception(ErrorCodes::CANNOT_SCHEDULE_TASK, "Too many threads ({}) requested", threads);
+
     threads_tasks.resize(threads);
     if (parts_ranges.empty())
         return;
diff --git a/src/Storages/MergeTree/MergeTreeReadPool.h b/src/Storages/MergeTree/MergeTreeReadPool.h
index 3a1af947cae..cb0e8a9657f 100644
--- a/src/Storages/MergeTree/MergeTreeReadPool.h
+++ b/src/Storages/MergeTree/MergeTreeReadPool.h
@@ -26,12 +26,12 @@ public:
 
     MergeTreeReadPool(
         RangesInDataParts && parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
@@ -108,7 +108,7 @@ private:
     std::vector<ThreadTask> threads_tasks;
     std::set<size_t> remaining_thread_tasks;
 
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeReadPool");
+    LoggerPtr log = getLogger("MergeTreeReadPool");
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp b/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
index 446baccd961..0cbb0a86b2f 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolBase.cpp
@@ -2,26 +2,27 @@
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 
+
 namespace DB
 {
 
 MergeTreeReadPoolBase::MergeTreeReadPoolBase(
     RangesInDataParts && parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & pool_settings_,
     const ContextPtr & context_)
     : parts_ranges(std::move(parts_))
+    , shared_virtual_fields(std::move(shared_virtual_fields_))
     , storage_snapshot(storage_snapshot_)
     , prewhere_info(prewhere_info_)
     , actions_settings(actions_settings_)
     , reader_settings(reader_settings_)
     , column_names(column_names_)
-    , virtual_column_names(virtual_column_names_)
     , pool_settings(pool_settings_)
     , owned_mark_cache(context_->getGlobalContext()->getMarkCache())
     , owned_uncompressed_cache(pool_settings_.use_uncompressed_cache ? context_->getGlobalContext()->getUncompressedCache() : nullptr)
@@ -44,7 +45,7 @@ void MergeTreeReadPoolBase::fillPerPartInfos()
         assertSortedAndNonIntersecting(part_with_ranges.ranges);
 #endif
 
-        MergeTreeReadTask::Info read_task_info;
+        MergeTreeReadTaskInfo read_task_info;
 
         read_task_info.data_part = part_with_ranges.data_part;
         read_task_info.part_index_in_query = part_with_ranges.part_index_in_query;
@@ -53,9 +54,16 @@ void MergeTreeReadPoolBase::fillPerPartInfos()
         LoadedMergeTreeDataPartInfoForReader part_info(part_with_ranges.data_part, part_with_ranges.alter_conversions);
 
         read_task_info.task_columns = getReadTaskColumns(
-            part_info, storage_snapshot, column_names, virtual_column_names,
-            prewhere_info, actions_settings,
-            reader_settings, /*with_subcolumns=*/ true);
+            part_info,
+            storage_snapshot,
+            column_names,
+            prewhere_info,
+            actions_settings,
+            reader_settings,
+            /*with_subcolumns=*/true);
+
+        read_task_info.const_virtual_fields = shared_virtual_fields;
+        read_task_info.const_virtual_fields.emplace("_part_index", read_task_info.part_index_in_query);
 
         if (pool_settings.preferred_block_size_bytes > 0)
         {
@@ -75,7 +83,7 @@ void MergeTreeReadPoolBase::fillPerPartInfos()
         }
 
         is_part_on_remote_disk.push_back(part_with_ranges.data_part->isStoredOnRemoteDisk());
-        per_part_infos.push_back(std::make_shared<MergeTreeReadTask::Info>(std::move(read_task_info)));
+        per_part_infos.push_back(std::make_shared<MergeTreeReadTaskInfo>(std::move(read_task_info)));
     }
 }
 
@@ -97,7 +105,7 @@ std::vector<size_t> MergeTreeReadPoolBase::getPerPartSumMarks() const
 }
 
 MergeTreeReadTaskPtr MergeTreeReadPoolBase::createTask(
-    MergeTreeReadTask::InfoPtr read_info,
+    MergeTreeReadTaskInfoPtr read_info,
     MarkRanges ranges,
     MergeTreeReadTask * previous_task) const
 {
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolBase.h b/src/Storages/MergeTree/MergeTreeReadPoolBase.h
index 0081063cd37..1b5bfec5898 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolBase.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolBase.h
@@ -23,12 +23,12 @@ public:
 
     MergeTreeReadPoolBase(
         RangesInDataParts && parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
@@ -37,12 +37,12 @@ public:
 protected:
     /// Initialized in constructor
     const RangesInDataParts parts_ranges;
+    const VirtualFields shared_virtual_fields;
     const StorageSnapshotPtr storage_snapshot;
     const PrewhereInfoPtr prewhere_info;
     const ExpressionActionsSettings actions_settings;
     const MergeTreeReaderSettings reader_settings;
     const Names column_names;
-    const Names virtual_column_names;
     const PoolSettings pool_settings;
     const MarkCachePtr owned_mark_cache;
     const UncompressedCachePtr owned_uncompressed_cache;
@@ -52,13 +52,13 @@ protected:
     std::vector<size_t> getPerPartSumMarks() const;
 
     MergeTreeReadTaskPtr createTask(
-        MergeTreeReadTask::InfoPtr read_info,
+        MergeTreeReadTaskInfoPtr read_info,
         MarkRanges ranges,
         MergeTreeReadTask * previous_task) const;
 
     MergeTreeReadTask::Extras getExtras() const;
 
-    std::vector<MergeTreeReadTask::InfoPtr> per_part_infos;
+    std::vector<MergeTreeReadTaskInfoPtr> per_part_infos;
     std::vector<bool> is_part_on_remote_disk;
 
     ReadBufferFromFileBase::ProfileCallback profile_callback;
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
index 1b621ad5055..4c0391ffa57 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.cpp
@@ -12,22 +12,22 @@ MergeTreeReadPoolInOrder::MergeTreeReadPoolInOrder(
     bool has_limit_below_one_block_,
     MergeTreeReadType read_type_,
     RangesInDataParts parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & settings_,
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
+        std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
         actions_settings_,
         reader_settings_,
         column_names_,
-        virtual_column_names_,
         settings_,
         context_)
     , has_limit_below_one_block(has_limit_below_one_block_)
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
index d9cc1ba4984..9fedf396a6b 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolInOrder.h
@@ -11,12 +11,12 @@ public:
         bool has_limit_below_one_block_,
         MergeTreeReadType read_type_,
         RangesInDataParts parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
index 69e64d5ea98..38035d97f56 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.cpp
@@ -1,3 +1,4 @@
+#include <iterator>
 #include <Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h>
 
 
@@ -12,22 +13,22 @@ namespace ErrorCodes
 MergeTreeReadPoolParallelReplicas::MergeTreeReadPoolParallelReplicas(
     ParallelReadingExtension extension_,
     RangesInDataParts && parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & settings_,
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
+        std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
         actions_settings_,
         reader_settings_,
         column_names_,
-        virtual_column_names_,
         settings_,
         context_)
     , extension(std::move(extension_))
@@ -67,15 +68,11 @@ MergeTreeReadTaskPtr MergeTreeReadPoolParallelReplicas::getTask(size_t /*task_id
 
     auto & current_task = buffered_ranges.front();
 
-    size_t part_idx = 0;
-    for (size_t index = 0; index < per_part_infos.size(); ++index)
-    {
-        if (per_part_infos[index]->data_part->info == current_task.info)
-        {
-            part_idx = index;
-            break;
-        }
-    }
+    auto part_it
+        = std::ranges::find_if(per_part_infos, [&current_task](const auto & part) { return part->data_part->info == current_task.info; });
+    if (part_it == per_part_infos.end())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Assignment contains an unknown part (current_task: {})", current_task.describe());
+    const size_t part_idx = std::distance(per_part_infos.begin(), part_it);
 
     MarkRanges ranges_to_read;
     size_t current_sum_marks = 0;
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
index 7579a892b67..ca159edb91c 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicas.h
@@ -11,12 +11,12 @@ public:
     MergeTreeReadPoolParallelReplicas(
         ParallelReadingExtension extension_,
         RangesInDataParts && parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
@@ -34,7 +34,7 @@ private:
     const CoordinationMode coordination_mode;
     RangesInDataPartsDescription buffered_ranges;
     bool no_more_tasks_available{false};
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeReadPoolParallelReplicas");
+    LoggerPtr log = getLogger("MergeTreeReadPoolParallelReplicas");
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
index a822a517933..01c0a9f91be 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.cpp
@@ -12,22 +12,22 @@ MergeTreeReadPoolParallelReplicasInOrder::MergeTreeReadPoolParallelReplicasInOrd
     ParallelReadingExtension extension_,
     CoordinationMode mode_,
     RangesInDataParts parts_,
+    VirtualFields shared_virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReaderSettings & reader_settings_,
     const Names & column_names_,
-    const Names & virtual_column_names_,
     const PoolSettings & settings_,
     const ContextPtr & context_)
     : MergeTreeReadPoolBase(
         std::move(parts_),
+        std::move(shared_virtual_fields_),
         storage_snapshot_,
         prewhere_info_,
         actions_settings_,
         reader_settings_,
         column_names_,
-        virtual_column_names_,
         settings_,
         context_)
     , extension(std::move(extension_))
diff --git a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
index 3e5f8f5dfba..4fe3f7a699c 100644
--- a/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
+++ b/src/Storages/MergeTree/MergeTreeReadPoolParallelReplicasInOrder.h
@@ -12,12 +12,12 @@ public:
         ParallelReadingExtension extension_,
         CoordinationMode mode_,
         RangesInDataParts parts_,
+        VirtualFields shared_virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReaderSettings & reader_settings_,
         const Names & column_names_,
-        const Names & virtual_column_names_,
         const PoolSettings & settings_,
         const ContextPtr & context_);
 
diff --git a/src/Storages/MergeTree/MergeTreeReadTask.cpp b/src/Storages/MergeTree/MergeTreeReadTask.cpp
index dcfed700fac..08b30e445e2 100644
--- a/src/Storages/MergeTree/MergeTreeReadTask.cpp
+++ b/src/Storages/MergeTree/MergeTreeReadTask.cpp
@@ -1,5 +1,6 @@
 #include <Storages/MergeTree/MergeTreeReadTask.h>
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Common/Exception.h>
 
 namespace DB
@@ -10,7 +11,7 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
 }
 
-String MergeTreeReadTask::Columns::dump() const
+String MergeTreeReadTaskColumns::dump() const
 {
     WriteBufferFromOwnString s;
     for (size_t i = 0; i < pre_columns.size(); ++i)
@@ -22,7 +23,7 @@ String MergeTreeReadTask::Columns::dump() const
 }
 
 MergeTreeReadTask::MergeTreeReadTask(
-    InfoPtr info_,
+    MergeTreeReadTaskInfoPtr info_,
     Readers readers_,
     MarkRanges mark_ranges_,
     MergeTreeBlockSizePredictorPtr size_predictor_)
@@ -34,23 +35,30 @@ MergeTreeReadTask::MergeTreeReadTask(
 }
 
 MergeTreeReadTask::Readers MergeTreeReadTask::createReaders(
-    const InfoPtr & read_info, const Extras & extras, const MarkRanges & ranges)
+    const MergeTreeReadTaskInfoPtr & read_info, const Extras & extras, const MarkRanges & ranges)
 {
     Readers new_readers;
 
     auto create_reader = [&](const NamesAndTypesList & columns_to_read)
     {
         return read_info->data_part->getReader(
-            columns_to_read, extras.storage_snapshot, ranges,
-            extras.uncompressed_cache, extras.mark_cache,
-            read_info->alter_conversions, extras.reader_settings, extras.value_size_map, extras.profile_callback);
+            columns_to_read,
+            extras.storage_snapshot,
+            ranges,
+            read_info->const_virtual_fields,
+            extras.uncompressed_cache,
+            extras.mark_cache,
+            read_info->alter_conversions,
+            extras.reader_settings,
+            extras.value_size_map,
+            extras.profile_callback);
     };
 
     new_readers.main = create_reader(read_info->task_columns.columns);
 
     /// Add lightweight delete filtering step
     if (extras.reader_settings.apply_deleted_mask && read_info->data_part->hasLightweightDelete())
-        new_readers.prewhere.push_back(create_reader({LightweightDeleteDescription::FILTER_COLUMN}));
+        new_readers.prewhere.push_back(create_reader({{RowExistsColumn::name, RowExistsColumn::type}}));
 
     for (const auto & pre_columns_per_step : read_info->task_columns.pre_columns)
         new_readers.prewhere.push_back(create_reader(pre_columns_per_step));
@@ -58,10 +66,8 @@ MergeTreeReadTask::Readers MergeTreeReadTask::createReaders(
     return new_readers;
 }
 
-MergeTreeReadTask::RangeReaders MergeTreeReadTask::createRangeReaders(
-    const Readers & task_readers,
-    const PrewhereExprInfo & prewhere_actions,
-    const Names & non_const_virtual_column_names)
+MergeTreeReadTask::RangeReaders
+MergeTreeReadTask::createRangeReaders(const Readers & task_readers, const PrewhereExprInfo & prewhere_actions)
 {
     MergeTreeReadTask::RangeReaders new_range_readers;
     if (prewhere_actions.steps.size() != task_readers.prewhere.size())
@@ -77,10 +83,7 @@ MergeTreeReadTask::RangeReaders MergeTreeReadTask::createRangeReaders(
     {
         last_reader = task_readers.main->getColumns().empty() && (i + 1 == prewhere_actions.steps.size());
 
-        MergeTreeRangeReader current_reader(
-            task_readers.prewhere[i].get(),
-            prev_reader, prewhere_actions.steps[i].get(),
-            last_reader, non_const_virtual_column_names);
+        MergeTreeRangeReader current_reader(task_readers.prewhere[i].get(), prev_reader, prewhere_actions.steps[i].get(), last_reader);
 
         new_range_readers.prewhere.push_back(std::move(current_reader));
         prev_reader = &new_range_readers.prewhere.back();
@@ -88,11 +91,11 @@ MergeTreeReadTask::RangeReaders MergeTreeReadTask::createRangeReaders(
 
     if (!last_reader)
     {
-        new_range_readers.main = MergeTreeRangeReader(task_readers.main.get(), prev_reader, nullptr, true, non_const_virtual_column_names);
+        new_range_readers.main = MergeTreeRangeReader(task_readers.main.get(), prev_reader, nullptr, true);
     }
     else
     {
-        /// If all columns are read by prewhere range readers than move last prewhere range reader to main.
+        /// If all columns are read by prewhere range readers, move last prewhere range reader to main.
         new_range_readers.main = std::move(new_range_readers.prewhere.back());
         new_range_readers.prewhere.pop_back();
     }
@@ -100,14 +103,12 @@ MergeTreeReadTask::RangeReaders MergeTreeReadTask::createRangeReaders(
     return new_range_readers;
 }
 
-void MergeTreeReadTask::initializeRangeReaders(
-    const PrewhereExprInfo & prewhere_actions,
-    const Names & non_const_virtual_column_names)
+void MergeTreeReadTask::initializeRangeReaders(const PrewhereExprInfo & prewhere_actions)
 {
     if (range_readers.main.isInitialized())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Range reader is already initialized");
 
-    range_readers = createRangeReaders(readers, prewhere_actions, non_const_virtual_column_names);
+    range_readers = createRangeReaders(readers, prewhere_actions);
 }
 
 UInt64 MergeTreeReadTask::estimateNumRows(const BlockSizeParams & params) const
@@ -184,7 +185,11 @@ MergeTreeReadTask::BlockAndProgress MergeTreeReadTask::read(const BlockSizeParam
 
     Block block;
     if (read_result.num_rows != 0)
+    {
+        for (const auto & column : read_result.columns)
+            column->assumeMutableRef().shrinkToFit();
         block = sample_block.cloneWithColumns(read_result.columns);
+    }
 
     BlockAndProgress res = {
         .block = std::move(block),
diff --git a/src/Storages/MergeTree/MergeTreeReadTask.h b/src/Storages/MergeTree/MergeTreeReadTask.h
index 8d2f0657fd1..c8bb501c0e8 100644
--- a/src/Storages/MergeTree/MergeTreeReadTask.h
+++ b/src/Storages/MergeTree/MergeTreeReadTask.h
@@ -20,6 +20,8 @@ using MergeTreeBlockSizePredictorPtr = std::shared_ptr<MergeTreeBlockSizePredict
 class IMergeTreeDataPart;
 using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 using MergeTreeReaderPtr = std::unique_ptr<IMergeTreeReader>;
+using VirtualFields = std::unordered_map<String, Field>;
+
 
 enum class MergeTreeReadType
 {
@@ -40,45 +42,47 @@ enum class MergeTreeReadType
     ParallelReplicas,
 };
 
+struct MergeTreeReadTaskColumns
+{
+    /// Column names to read during WHERE
+    NamesAndTypesList columns;
+    /// Column names to read during each PREWHERE step
+    std::vector<NamesAndTypesList> pre_columns;
+
+    String dump() const;
+};
+
+struct MergeTreeReadTaskInfo
+{
+    /// Data part which should be read while performing this task
+    DataPartPtr data_part;
+    /// For `part_index` virtual column
+    size_t part_index_in_query;
+    /// Alter converversionss that should be applied on-fly for part.
+    AlterConversionsPtr alter_conversions;
+    /// Column names to read during PREWHERE and WHERE
+    MergeTreeReadTaskColumns task_columns;
+    /// Shared initialized size predictor. It is copied for each new task.
+    MergeTreeBlockSizePredictorPtr shared_size_predictor;
+    /// TODO: comment
+    VirtualFields const_virtual_fields;
+};
+
+using MergeTreeReadTaskInfoPtr = std::shared_ptr<const MergeTreeReadTaskInfo>;
+
 /// A batch of work for MergeTreeSelectProcessor
 struct MergeTreeReadTask : private boost::noncopyable
 {
 public:
-    struct Columns
-    {
-        /// Column names to read during WHERE
-        NamesAndTypesList columns;
-        /// Column names to read during each PREWHERE step
-        std::vector<NamesAndTypesList> pre_columns;
-
-        String dump() const;
-    };
-
-    struct Info
-    {
-        /// Data part which should be read while performing this task
-        DataPartPtr data_part;
-        /// For virtual `part_index` virtual column
-        size_t part_index_in_query;
-        /// Alter converversionss that should be applied on-fly for part.
-        AlterConversionsPtr alter_conversions;
-        /// Column names to read during PREWHERE and WHERE
-        Columns task_columns;
-        /// Shared initialized size predictor. It is copied for each new task.
-        MergeTreeBlockSizePredictorPtr shared_size_predictor;
-    };
-
-    using InfoPtr = std::shared_ptr<const Info>;
-
     /// Extra params that required for creation of reader.
     struct Extras
     {
         UncompressedCache * uncompressed_cache = nullptr;
         MarkCache * mark_cache = nullptr;
-        MergeTreeReaderSettings reader_settings;
-        StorageSnapshotPtr storage_snapshot;
-        IMergeTreeReader::ValueSizeMap value_size_map;
-        ReadBufferFromFileBase::ProfileCallback profile_callback;
+        MergeTreeReaderSettings reader_settings{};
+        StorageSnapshotPtr storage_snapshot{};
+        IMergeTreeReader::ValueSizeMap value_size_map{};
+        ReadBufferFromFileBase::ProfileCallback profile_callback{};
     };
 
     struct Readers
@@ -115,27 +119,32 @@ public:
         size_t num_read_bytes = 0;
     };
 
-    MergeTreeReadTask(InfoPtr info_, Readers readers_, MarkRanges mark_ranges_, MergeTreeBlockSizePredictorPtr size_predictor_);
+    MergeTreeReadTask(
+        MergeTreeReadTaskInfoPtr info_,
+        Readers readers_,
+        MarkRanges mark_ranges_,
 
-    void initializeRangeReaders(const PrewhereExprInfo & prewhere_actions, const Names & non_const_virtual_column_names);
+        MergeTreeBlockSizePredictorPtr size_predictor_);
+
+    void initializeRangeReaders(const PrewhereExprInfo & prewhere_actions);
 
     BlockAndProgress read(const BlockSizeParams & params);
     bool isFinished() const { return mark_ranges.empty() && range_readers.main.isCurrentRangeFinished(); }
 
-    const Info & getInfo() const { return *info; }
+    const MergeTreeReadTaskInfo & getInfo() const { return *info; }
     const MergeTreeRangeReader & getMainRangeReader() const { return range_readers.main; }
     const IMergeTreeReader & getMainReader() const { return *readers.main; }
 
     Readers releaseReaders() { return std::move(readers); }
 
-    static Readers createReaders(const InfoPtr & read_info, const Extras & extras, const MarkRanges & ranges);
-    static RangeReaders createRangeReaders(const Readers & readers, const PrewhereExprInfo & prewhere_actions, const Names & non_const_virtual_column_names);
+    static Readers createReaders(const MergeTreeReadTaskInfoPtr & read_info, const Extras & extras, const MarkRanges & ranges);
+    static RangeReaders createRangeReaders(const Readers & readers, const PrewhereExprInfo & prewhere_actions);
 
 private:
     UInt64 estimateNumRows(const BlockSizeParams & params) const;
 
     /// Shared information required for reading.
-    InfoPtr info;
+    MergeTreeReadTaskInfoPtr info;
 
     /// Readers for data_part of this task.
     /// May be reused and released to the next task.
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
index 02048009296..8810491b62e 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.cpp
@@ -10,114 +10,45 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int CANNOT_READ_ALL_DATA;
-    extern const int ARGUMENT_OUT_OF_BOUND;
 }
 
-
 MergeTreeReaderCompact::MergeTreeReaderCompact(
     MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
     NamesAndTypesList columns_,
+    const VirtualFields & virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     UncompressedCache * uncompressed_cache_,
     MarkCache * mark_cache_,
     MarkRanges mark_ranges_,
     MergeTreeReaderSettings settings_,
-    ThreadPool * load_marks_threadpool_,
     ValueSizeMap avg_value_size_hints_,
     const ReadBufferFromFileBase::ProfileCallback & profile_callback_,
     clockid_t clock_type_)
     : IMergeTreeReader(
         data_part_info_for_read_,
         columns_,
+        virtual_fields_,
         storage_snapshot_,
         uncompressed_cache_,
         mark_cache_,
         mark_ranges_,
         settings_,
         avg_value_size_hints_)
-    , marks_loader(
-          data_part_info_for_read_,
-          mark_cache,
-          data_part_info_for_read_->getIndexGranularityInfo().getMarksFilePath(MergeTreeDataPartCompact::DATA_FILE_NAME),
-          data_part_info_for_read_->getMarksCount(),
-          data_part_info_for_read_->getIndexGranularityInfo(),
-          settings.save_marks_in_cache,
-          settings.read_settings,
-          load_marks_threadpool_,
-          data_part_info_for_read_->getColumns().size())
+    , marks_loader(std::make_shared<MergeTreeMarksLoader>(
+        data_part_info_for_read_,
+        mark_cache,
+        data_part_info_for_read_->getIndexGranularityInfo().getMarksFilePath(MergeTreeDataPartCompact::DATA_FILE_NAME),
+        data_part_info_for_read_->getMarksCount(),
+        data_part_info_for_read_->getIndexGranularityInfo(),
+        settings.save_marks_in_cache,
+        settings.read_settings,
+        settings_.read_settings.load_marks_asynchronously
+            ? &data_part_info_for_read_->getContext()->getLoadMarksThreadpool() : nullptr,
+        data_part_info_for_read_->getColumns().size()))
     , profile_callback(profile_callback_)
     , clock_type(clock_type_)
 {
-}
-
-void MergeTreeReaderCompact::initialize()
-{
-    try
-    {
-        fillColumnPositions();
-
-        /// Do not use max_read_buffer_size, but try to lower buffer size with maximal size of granule to avoid reading much data.
-        auto buffer_size = getReadBufferSize(*data_part_info_for_read, marks_loader, column_positions, all_mark_ranges);
-        if (buffer_size)
-            settings.read_settings = settings.read_settings.adjustBufferSize(buffer_size);
-
-        if (!settings.read_settings.local_fs_buffer_size || !settings.read_settings.remote_fs_buffer_size)
-            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read to empty buffer.");
-
-        const String path = MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION;
-        auto data_part_storage = data_part_info_for_read->getDataPartStorage();
-
-        if (uncompressed_cache)
-        {
-            auto buffer = std::make_unique<CachedCompressedReadBuffer>(
-                std::string(fs::path(data_part_storage->getFullPath()) / path),
-                [this, path, data_part_storage]()
-                {
-                    return data_part_storage->readFile(
-                        path,
-                        settings.read_settings,
-                        std::nullopt, std::nullopt);
-                },
-                uncompressed_cache,
-                /* allow_different_codecs = */ true);
-
-            if (profile_callback)
-                buffer->setProfileCallback(profile_callback, clock_type);
-
-            if (!settings.checksum_on_read)
-                buffer->disableChecksumming();
-
-            cached_buffer = std::move(buffer);
-            data_buffer = cached_buffer.get();
-            compressed_data_buffer = cached_buffer.get();
-        }
-        else
-        {
-            auto buffer =
-                std::make_unique<CompressedReadBufferFromFile>(
-                    data_part_storage->readFile(
-                        path,
-                        settings.read_settings,
-                        std::nullopt, std::nullopt),
-                    /* allow_different_codecs = */ true);
-
-            if (profile_callback)
-                buffer->setProfileCallback(profile_callback, clock_type);
-
-            if (!settings.checksum_on_read)
-                buffer->disableChecksumming();
-
-            non_cached_buffer = std::move(buffer);
-            data_buffer = non_cached_buffer.get();
-            compressed_data_buffer = non_cached_buffer.get();
-        }
-    }
-    catch (...)
-    {
-        if (!isRetryableException(std::current_exception()))
-            data_part_info_for_read->reportBroken();
-        throw;
-    }
+    marks_loader->startAsyncLoad();
 }
 
 void MergeTreeReaderCompact::fillColumnPositions()
@@ -148,31 +79,7 @@ void MergeTreeReaderCompact::fillColumnPositions()
         /// we have to read its offsets if they exist.
         if (!position && is_array)
         {
-            NameAndTypePair column_to_read_with_subcolumns = column_to_read;
-            auto [name_in_storage, subcolumn_name] = Nested::splitName(column_to_read.name);
-
-            /// If it is a part of Nested, we need to get the column from
-            /// storage metadata which is converted to Nested type with subcolumns.
-            /// It is required for proper counting of shared streams.
-            if (!subcolumn_name.empty())
-            {
-                /// If column is renamed get the new name from storage metadata.
-                if (alter_conversions->columnHasNewName(name_in_storage))
-                    name_in_storage = alter_conversions->getColumnNewName(name_in_storage);
-
-                if (!storage_columns_with_collected_nested)
-                {
-                    auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withExtendedObjects();
-                    auto storage_columns_list = Nested::collect(storage_snapshot->getColumns(options));
-                    storage_columns_with_collected_nested = ColumnsDescription(std::move(storage_columns_list));
-                }
-
-                column_to_read_with_subcolumns = storage_columns_with_collected_nested
-                    ->getColumnOrSubcolumn(
-                        GetColumnsOptions::All,
-                        Nested::concatenateName(name_in_storage, subcolumn_name));
-            }
-
+            auto column_to_read_with_subcolumns = getColumnConvertedToSubcolumnOfNested(column_to_read);
             auto name_level_for_offsets = findColumnForOffsets(column_to_read_with_subcolumns);
 
             if (name_level_for_offsets.has_value())
@@ -189,189 +96,60 @@ void MergeTreeReaderCompact::fillColumnPositions()
     }
 }
 
-size_t MergeTreeReaderCompact::readRows(
-    size_t from_mark, size_t current_task_last_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
+NameAndTypePair MergeTreeReaderCompact::getColumnConvertedToSubcolumnOfNested(const NameAndTypePair & column)
 {
-    if (!initialized)
+    if (!isArray(column.type))
+        return column;
+
+    /// If it is a part of Nested, we need to get the column from
+    /// storage metadata which is converted to Nested type with subcolumns.
+    /// It is required for proper counting of shared streams.
+    auto [name_in_storage, subcolumn_name] = Nested::splitName(column.name);
+
+    if (subcolumn_name.empty())
+        return column;
+
+    /// If column is renamed get the new name from storage metadata.
+    if (alter_conversions->columnHasNewName(name_in_storage))
+        name_in_storage = alter_conversions->getColumnNewName(name_in_storage);
+
+    if (!storage_columns_with_collected_nested)
     {
-        initialize();
-        initialized = true;
+        auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical).withExtendedObjects();
+        auto storage_columns_list = Nested::collect(storage_snapshot->getColumns(options));
+        storage_columns_with_collected_nested = ColumnsDescription(std::move(storage_columns_list));
     }
 
-    if (continue_reading)
-        from_mark = next_mark;
-
-    size_t read_rows = 0;
-    size_t num_columns = columns_to_read.size();
-    checkNumberOfColumns(num_columns);
-
-    MutableColumns mutable_columns(num_columns);
-    for (size_t i = 0; i < num_columns; ++i)
-    {
-        if (column_positions[i] && res_columns[i] == nullptr)
-            res_columns[i] = columns_to_read[i].type->createColumn(*serializations[i]);
-    }
-
-    while (read_rows < max_rows_to_read)
-    {
-        size_t rows_to_read = data_part_info_for_read->getIndexGranularity().getMarkRows(from_mark);
-
-        /// If we need to read multiple subcolumns from a single column in storage,
-        /// we will read it this column only once and then reuse to extract all subcolumns.
-        std::unordered_map<String, ColumnPtr> columns_cache_for_subcolumns;
-
-        for (size_t pos = 0; pos < num_columns; ++pos)
-        {
-            if (!res_columns[pos])
-                continue;
-
-            try
-            {
-                auto & column = res_columns[pos];
-                size_t column_size_before_reading = column->size();
-
-                readData(columns_to_read[pos], column, from_mark, current_task_last_mark, *column_positions[pos], rows_to_read, columns_for_offsets[pos], columns_cache_for_subcolumns);
-
-                size_t read_rows_in_column = column->size() - column_size_before_reading;
-                if (read_rows_in_column != rows_to_read)
-                    throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
-                        "Cannot read all data in MergeTreeReaderCompact. Rows read: {}. Rows expected: {}.",
-                        read_rows_in_column, rows_to_read);
-            }
-            catch (...)
-            {
-                if (!isRetryableException(std::current_exception()))
-                    data_part_info_for_read->reportBroken();
-
-                /// Better diagnostics.
-                try
-                {
-                    rethrow_exception(std::current_exception());
-                }
-                catch (Exception & e)
-                {
-                    e.addMessage(getMessageForDiagnosticOfBrokenPart(from_mark, max_rows_to_read));
-                }
-
-                throw;
-            }
-        }
-
-        ++from_mark;
-        read_rows += rows_to_read;
-    }
-
-    next_mark = from_mark;
-
-    return read_rows;
+    return storage_columns_with_collected_nested->getColumnOrSubcolumn(
+        GetColumnsOptions::All,
+        Nested::concatenateName(name_in_storage, subcolumn_name));
 }
 
 void MergeTreeReaderCompact::readData(
-    const NameAndTypePair & name_and_type, ColumnPtr & column,
-    size_t from_mark, size_t current_task_last_mark, size_t column_position, size_t rows_to_read,
-    ColumnNameLevel name_level_for_offsets, std::unordered_map<String, ColumnPtr> & columns_cache_for_subcolumns)
+    const NameAndTypePair & name_and_type,
+    ColumnPtr & column,
+    size_t rows_to_read,
+    const InputStreamGetter & getter)
 {
-    const auto & [name, type] = name_and_type;
-    std::optional<NameAndTypePair> column_for_offsets;
-
-    if (name_level_for_offsets.has_value())
+    try
     {
-        const auto & part_columns = data_part_info_for_read->getColumnsDescription();
-        column_for_offsets = part_columns.getPhysical(name_level_for_offsets->first);
-    }
+        const auto [name, type] = name_and_type;
+        size_t column_size_before_reading = column->size();
 
-    adjustUpperBound(current_task_last_mark); /// Must go before seek.
+        ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
+        deserialize_settings.getter = getter;
+        deserialize_settings.avg_value_size_hint = avg_value_size_hints[name];
 
-    if (!isContinuousReading(from_mark, column_position))
-        seekToMark(from_mark, column_position);
-
-    /// If we read only offsets we have to read prefix anyway
-    /// to preserve correctness of serialization.
-    auto buffer_getter_for_prefix = [&](const auto &) -> ReadBuffer *
-    {
-        return data_buffer;
-    };
-
-    auto buffer_getter = [&](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer *
-    {
-        /// Offset stream from another column could be read, in case of current
-        /// column does not exists (see findColumnForOffsets() in
-        /// MergeTreeReaderCompact::fillColumnPositions())
-        if (name_level_for_offsets.has_value())
+        if (name_and_type.isSubcolumn())
         {
-            bool is_offsets = !substream_path.empty() && substream_path.back().type == ISerialization::Substream::ArraySizes;
-            if (!is_offsets)
-                return nullptr;
+            const auto & type_in_storage = name_and_type.getTypeInStorage();
+            const auto & name_in_storage = name_and_type.getNameInStorage();
 
-            /// Offset stream can be read only from columns of current level or
-            /// below (since it is OK to read all parent streams from the
-            /// alternative).
-            ///
-            /// Consider the following columns in nested "root":
-            /// - root.array Array(UInt8) - exists
-            /// - root.nested_array Array(Array(UInt8)) - does not exists (only_offsets_level=1)
-            ///
-            /// For root.nested_array it will try to read multiple streams:
-            /// - offsets (substream_path = {ArraySizes})
-            ///   OK
-            /// - root.nested_array elements (substream_path = {ArrayElements, ArraySizes})
-            ///   NOT OK - cannot use root.array offsets stream for this
-            ///
-            /// Here only_offsets_level is the level of the alternative stream,
-            /// and substream_path.size() is the level of the current stream.
-            if (name_level_for_offsets->second < ISerialization::getArrayLevel(substream_path))
-                return nullptr;
-        }
+            auto serialization = getSerializationInPart({name_in_storage, type_in_storage});
+            ColumnPtr temp_column = type_in_storage->createColumn(*serialization);
 
-        return data_buffer;
-    };
-
-    ISerialization::DeserializeBinaryBulkStatePtr state;
-    ISerialization::DeserializeBinaryBulkStatePtr state_for_prefix;
-
-    ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
-    deserialize_settings.avg_value_size_hint = avg_value_size_hints[name];
-    bool columns_cache_was_used = false;
-
-    if (name_and_type.isSubcolumn())
-    {
-        NameAndTypePair name_type_in_storage{name_and_type.getNameInStorage(), name_and_type.getTypeInStorage()};
-        ColumnPtr temp_column;
-
-        auto it = columns_cache_for_subcolumns.find(name_type_in_storage.name);
-        if (!column_for_offsets && it != columns_cache_for_subcolumns.end())
-        {
-            temp_column = it->second;
-            auto subcolumn = name_type_in_storage.type->getSubcolumn(name_and_type.getSubcolumnName(), temp_column);
-            if (column->empty())
-                column = IColumn::mutate(subcolumn);
-            else
-                column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
-
-            columns_cache_was_used = true;
-        }
-        else
-        {
-            /// In case of reading only offset use the correct serialization for reading of the prefix
-            auto serialization = getSerializationInPart(name_type_in_storage);
-            temp_column = name_type_in_storage.type->createColumn(*serialization);
-
-            if (column_for_offsets)
-            {
-                auto serialization_for_prefix = getSerializationInPart(*column_for_offsets);
-
-                deserialize_settings.getter = buffer_getter_for_prefix;
-                serialization_for_prefix->deserializeBinaryBulkStatePrefix(deserialize_settings, state_for_prefix);
-            }
-
-            deserialize_settings.getter = buffer_getter;
-            serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
-            serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, state, nullptr);
-
-            if (!column_for_offsets)
-                columns_cache_for_subcolumns[name_type_in_storage.name] = temp_column;
-
-            auto subcolumn = name_type_in_storage.type->getSubcolumn(name_and_type.getSubcolumnName(), temp_column);
+            serialization->deserializeBinaryBulkWithMultipleStreams(temp_column, rows_to_read, deserialize_settings, deserialize_binary_bulk_state_map[name], nullptr);
+            auto subcolumn = type_in_storage->getSubcolumn(name_and_type.getSubcolumnName(), temp_column);
 
             /// TODO: Avoid extra copying.
             if (column->empty())
@@ -379,185 +157,98 @@ void MergeTreeReaderCompact::readData(
             else
                 column->assumeMutable()->insertRangeFrom(*subcolumn, 0, subcolumn->size());
         }
-    }
-    else
-    {
-        /// In case of reading only offsets use the correct serialization for reading the prefix
-        auto serialization = getSerializationInPart(name_and_type);
-
-        if (column_for_offsets)
+        else
         {
-            auto serialization_for_prefix = getSerializationInPart(*column_for_offsets);
-
-            deserialize_settings.getter = buffer_getter_for_prefix;
-            serialization_for_prefix->deserializeBinaryBulkStatePrefix(deserialize_settings, state_for_prefix);
+            auto serialization = getSerializationInPart(name_and_type);
+            serialization->deserializeBinaryBulkWithMultipleStreams(column, rows_to_read, deserialize_settings, deserialize_binary_bulk_state_map[name], nullptr);
         }
 
-        deserialize_settings.getter = buffer_getter;
-        serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, state);
-        serialization->deserializeBinaryBulkWithMultipleStreams(column, rows_to_read, deserialize_settings, state, nullptr);
-    }
-
-    /// The buffer is left in inconsistent state after reading single offsets or using columns cache during subcolumns reading.
-    if (name_level_for_offsets.has_value() || columns_cache_was_used)
-        last_read_granule.reset();
-    else
-        last_read_granule.emplace(from_mark, column_position);
-}
-
-void MergeTreeReaderCompact::prefetchBeginOfRange(Priority priority)
-try
-{
-    if (!initialized)
-    {
-        initialize();
-        initialized = true;
-    }
-
-    adjustUpperBound(all_mark_ranges.back().end);
-    seekToMark(all_mark_ranges.front().begin, 0);
-    data_buffer->prefetch(priority);
-}
-catch (...)
-{
-    if (!isRetryableException(std::current_exception()))
-        data_part_info_for_read->reportBroken();
-    throw;
-}
-
-void MergeTreeReaderCompact::seekToMark(size_t row_index, size_t column_index)
-{
-    MarkInCompressedFile mark = marks_loader.getMark(row_index, column_index);
-    try
-    {
-        compressed_data_buffer->seek(mark.offset_in_compressed_file, mark.offset_in_decompressed_block);
+        size_t read_rows_in_column = column->size() - column_size_before_reading;
+        if (read_rows_in_column != rows_to_read)
+            throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA,
+                "Cannot read all data in MergeTreeReaderCompact. Rows read: {}. Rows expected: {}.",
+                read_rows_in_column, rows_to_read);
     }
     catch (Exception & e)
     {
-        /// Better diagnostics.
-        if (e.code() == ErrorCodes::ARGUMENT_OUT_OF_BOUND)
-            e.addMessage("(while seeking to mark (" + toString(row_index) + ", " + toString(column_index) + ")");
-
+        e.addMessage("(while reading column " + name_and_type.name + ")");
         throw;
     }
 }
 
-void MergeTreeReaderCompact::adjustUpperBound(size_t last_mark)
+
+void MergeTreeReaderCompact::readPrefix(
+    const NameAndTypePair & name_and_type,
+    const InputStreamGetter & buffer_getter,
+    const InputStreamGetter & buffer_getter_for_prefix,
+    const ColumnNameLevel & name_level_for_offsets)
 {
-    size_t right_offset = 0;
-    if (last_mark < data_part_info_for_read->getMarksCount()) /// Otherwise read until the end of file
-        right_offset = marks_loader.getMark(last_mark).offset_in_compressed_file;
-
-    if (right_offset == 0)
+    try
     {
-        /// If already reading till the end of file.
-        if (last_right_offset && *last_right_offset == 0)
-            return;
+        ISerialization::DeserializeBinaryBulkSettings deserialize_settings;
 
-        last_right_offset = 0; // Zero value means the end of file.
-        data_buffer->setReadUntilEnd();
+        if (name_level_for_offsets.has_value())
+        {
+            const auto & part_columns = data_part_info_for_read->getColumnsDescription();
+            auto column_for_offsets = part_columns.getPhysical(name_level_for_offsets->first);
+
+            auto serialization_for_prefix = getSerializationInPart(column_for_offsets);
+            deserialize_settings.getter = buffer_getter_for_prefix;
+            ISerialization::DeserializeBinaryBulkStatePtr state_for_prefix;
+
+            serialization_for_prefix->deserializeBinaryBulkStatePrefix(deserialize_settings, state_for_prefix);
+        }
+
+        SerializationPtr serialization;
+        if (name_and_type.isSubcolumn())
+            serialization = getSerializationInPart({name_and_type.getNameInStorage(), name_and_type.getTypeInStorage()});
+        else
+            serialization = getSerializationInPart(name_and_type);
+
+
+        deserialize_settings.getter = buffer_getter;
+        serialization->deserializeBinaryBulkStatePrefix(deserialize_settings, deserialize_binary_bulk_state_map[name_and_type.name]);
     }
-    else
+    catch (Exception & e)
     {
-        if (last_right_offset && right_offset <= last_right_offset.value())
-            return;
-
-        last_right_offset = right_offset;
-        data_buffer->setReadUntilPosition(right_offset);
+        e.addMessage("(while reading column " + name_and_type.name + ")");
+        throw;
     }
 }
 
-bool MergeTreeReaderCompact::isContinuousReading(size_t mark, size_t column_position)
+void MergeTreeReaderCompact::createColumnsForReading(Columns & res_columns) const
 {
-    if (!last_read_granule)
+    for (size_t i = 0; i < columns_to_read.size(); ++i)
+    {
+        if (column_positions[i] && res_columns[i] == nullptr)
+            res_columns[i] = columns_to_read[i].type->createColumn(*serializations[i]);
+    }
+}
+
+bool MergeTreeReaderCompact::needSkipStream(size_t column_pos, const ISerialization::SubstreamPath & substream) const
+{
+    /// Offset stream can be read only from columns of current level or
+    /// below (since it is OK to read all parent streams from the
+    /// alternative).
+    ///
+    /// Consider the following columns in nested "root":
+    /// - root.array Array(UInt8) - exists
+    /// - root.nested_array Array(Array(UInt8)) - does not exists (only_offsets_level=1)
+    ///
+    /// For root.nested_array it will try to read multiple streams:
+    /// - offsets (substream_path = {ArraySizes})
+    ///   OK
+    /// - root.nested_array elements (substream_path = {ArrayElements, ArraySizes})
+    ///   NOT OK - cannot use root.array offsets stream for this
+    ///
+    /// Here only_offsets_level is the level of the alternative stream,
+    /// and substream_path.size() is the level of the current stream.
+
+    if (!columns_for_offsets[column_pos])
         return false;
-    const auto & [last_mark, last_column] = *last_read_granule;
-    return (mark == last_mark && column_position == last_column + 1)
-        || (mark == last_mark + 1 && column_position == 0 && last_column == data_part_info_for_read->getColumns().size() - 1);
-}
 
-namespace
-{
-
-/// A simple class that helps to iterate over 2-dim marks of compact parts.
-class MarksCounter
-{
-public:
-    MarksCounter(size_t rows_num_, size_t columns_num_)
-        : rows_num(rows_num_), columns_num(columns_num_) {}
-
-    struct Iterator
-    {
-        size_t row;
-        size_t column;
-        MarksCounter * counter;
-
-        Iterator(size_t row_, size_t column_, MarksCounter * counter_)
-            : row(row_), column(column_), counter(counter_) {}
-
-        Iterator operator++()
-        {
-            if (column + 1 == counter->columns_num)
-            {
-                ++row;
-                column = 0;
-            }
-            else
-            {
-                ++column;
-            }
-
-            return *this;
-        }
-
-        bool operator==(const Iterator & other) const { return row == other.row && column == other.column; }
-        bool operator!=(const Iterator & other) const { return !(*this == other); }
-    };
-
-    Iterator get(size_t row, size_t column) { return Iterator(row, column, this); }
-    Iterator end() { return get(rows_num, 0); }
-
-private:
-    size_t rows_num;
-    size_t columns_num;
-};
-
-}
-
-size_t MergeTreeReaderCompact::getReadBufferSize(
-    const IMergeTreeDataPartInfoForReader & data_part_info_for_reader,
-    MergeTreeMarksLoader & marks_loader,
-    const ColumnPositions & column_positions,
-    const MarkRanges & mark_ranges)
-{
-    size_t buffer_size = 0;
-    size_t columns_num = column_positions.size();
-    size_t file_size = data_part_info_for_reader.getFileSizeOrZero(MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION);
-
-    MarksCounter counter(data_part_info_for_reader.getMarksCount(), data_part_info_for_reader.getColumns().size());
-
-    for (const auto & mark_range : mark_ranges)
-    {
-        for (size_t mark = mark_range.begin; mark < mark_range.end; ++mark)
-        {
-            for (size_t i = 0; i < columns_num; ++i)
-            {
-                if (!column_positions[i])
-                    continue;
-
-                auto it = counter.get(mark, *column_positions[i]);
-                size_t cur_offset = marks_loader.getMark(it.row, it.column).offset_in_compressed_file;
-
-                while (it != counter.end() && cur_offset == marks_loader.getMark(it.row, it.column).offset_in_compressed_file)
-                    ++it;
-
-                size_t next_offset = (it == counter.end() ? file_size : marks_loader.getMark(it.row, it.column).offset_in_compressed_file);
-                buffer_size = std::max(buffer_size, next_offset - cur_offset);
-            }
-        }
-    }
-
-    return buffer_size;
+    bool is_offsets = !substream.empty() && substream.back().type == ISerialization::Substream::ArraySizes;
+    return !is_offsets || columns_for_offsets[column_pos]->second < ISerialization::getArrayLevel(substream);
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompact.h b/src/Storages/MergeTree/MergeTreeReaderCompact.h
index dace4ec468e..a783e595af5 100644
--- a/src/Storages/MergeTree/MergeTreeReaderCompact.h
+++ b/src/Storages/MergeTree/MergeTreeReaderCompact.h
@@ -3,7 +3,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Storages/MergeTree/IMergeTreeReader.h>
 #include <IO/ReadBufferFromFileBase.h>
-
+#include <DataTypes/Serializations/ISerialization.h>
 
 namespace DB
 {
@@ -14,43 +14,51 @@ using DataPartCompactPtr = std::shared_ptr<const MergeTreeDataPartCompact>;
 class IMergeTreeDataPart;
 using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 
-/// Reader for compact parts
+/// Base class of readers for compact parts.
 class MergeTreeReaderCompact : public IMergeTreeReader
 {
 public:
     MergeTreeReaderCompact(
         MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
         NamesAndTypesList columns_,
+        const VirtualFields & virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         UncompressedCache * uncompressed_cache_,
         MarkCache * mark_cache_,
         MarkRanges mark_ranges_,
         MergeTreeReaderSettings settings_,
-        ThreadPool * load_marks_threadpool_,
-        ValueSizeMap avg_value_size_hints_ = {},
-        const ReadBufferFromFileBase::ProfileCallback & profile_callback_ = {},
-        clockid_t clock_type_ = CLOCK_MONOTONIC_COARSE);
+        ValueSizeMap avg_value_size_hints_,
+        const ReadBufferFromFileBase::ProfileCallback & profile_callback_,
+        clockid_t clock_type_);
 
-    /// Return the number of rows has been read or zero if there is no columns to read.
-    /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    size_t readRows(size_t from_mark, size_t current_task_last_mark,
-                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
+    bool canReadIncompleteGranules() const final { return false; }
 
-    bool canReadIncompleteGranules() const override { return false; }
-
-    void prefetchBeginOfRange(Priority priority) override;
-
-private:
-    bool isContinuousReading(size_t mark, size_t column_position);
+protected:
     void fillColumnPositions();
-    void initialize();
+    NameAndTypePair getColumnConvertedToSubcolumnOfNested(const NameAndTypePair & column);
 
-    ReadBuffer * data_buffer;
-    CompressedReadBufferBase * compressed_data_buffer;
-    std::unique_ptr<CachedCompressedReadBuffer> cached_buffer;
-    std::unique_ptr<CompressedReadBufferFromFile> non_cached_buffer;
+    using InputStreamGetter = ISerialization::InputStreamGetter;
 
-    MergeTreeMarksLoader marks_loader;
+    void readData(
+        const NameAndTypePair & name_and_type,
+        ColumnPtr & column,
+        size_t rows_to_read,
+        const InputStreamGetter & getter);
+
+    void readPrefix(
+        const NameAndTypePair & name_and_type,
+        const InputStreamGetter & buffer_getter,
+        const InputStreamGetter & buffer_getter_for_prefix,
+        const ColumnNameLevel & name_level_for_offsets);
+
+    void createColumnsForReading(Columns & res_columns) const;
+    bool needSkipStream(size_t column_pos, const ISerialization::SubstreamPath & substream) const;
+
+    const MergeTreeMarksLoaderPtr marks_loader;
+    MergeTreeMarksGetterPtr marks_getter;
+
+    ReadBufferFromFileBase::ProfileCallback profile_callback;
+    clockid_t clock_type;
 
     /// Storage columns with collected separate arrays of Nested to columns of Nested type.
     /// They maybe be needed for finding offsets of missed Nested columns in parts.
@@ -66,32 +74,9 @@ private:
     /// Element of the vector is the level of the alternative stream.
     std::vector<ColumnNameLevel> columns_for_offsets;
 
-    /// For asynchronous reading from remote fs. Same meaning as in MergeTreeReaderStream.
-    std::optional<size_t> last_right_offset;
-
+    /// Mark to read in next 'readRows' call in case,
+    /// when 'continue_reading' is true.
     size_t next_mark = 0;
-    std::optional<std::pair<size_t, size_t>> last_read_granule;
-
-    void seekToMark(size_t row_index, size_t column_index);
-
-    void readData(const NameAndTypePair & name_and_type, ColumnPtr & column, size_t from_mark,
-        size_t current_task_last_mark, size_t column_position,
-        size_t rows_to_read, ColumnNameLevel name_level_for_offsets, std::unordered_map<String, ColumnPtr> & columns_cache_for_subcolumns);
-
-    /// Returns maximal value of granule size in compressed file from @mark_ranges.
-    /// This value is used as size of read buffer.
-    static size_t getReadBufferSize(
-        const IMergeTreeDataPartInfoForReader & data_part_info_for_reader,
-        MergeTreeMarksLoader & marks_loader,
-        const ColumnPositions & column_positions,
-        const MarkRanges & mark_ranges);
-
-    /// For asynchronous reading from remote fs.
-    void adjustUpperBound(size_t last_mark);
-
-    ReadBufferFromFileBase::ProfileCallback profile_callback;
-    clockid_t clock_type;
-    bool initialized = false;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.cpp b/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.cpp
new file mode 100644
index 00000000000..2b2cf493bb5
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.cpp
@@ -0,0 +1,108 @@
+#include <Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.h>
+#include <Storages/MergeTree/MergeTreeDataPartCompact.h>
+#include <Storages/MergeTree/checkDataPart.h>
+#include <DataTypes/DataTypeArray.h>
+#include <DataTypes/NestedUtils.h>
+
+namespace DB
+{
+
+size_t MergeTreeReaderCompactSingleBuffer::readRows(
+    size_t from_mark, size_t current_task_last_mark, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
+try
+{
+    init();
+
+    if (continue_reading)
+        from_mark = next_mark;
+
+    size_t read_rows = 0;
+    size_t num_columns = columns_to_read.size();
+
+    checkNumberOfColumns(num_columns);
+    createColumnsForReading(res_columns);
+
+    while (read_rows < max_rows_to_read)
+    {
+        size_t rows_to_read = data_part_info_for_read->getIndexGranularity().getMarkRows(from_mark);
+
+        for (size_t pos = 0; pos < num_columns; ++pos)
+        {
+            if (!res_columns[pos])
+                continue;
+
+            auto & column = res_columns[pos];
+
+            stream->adjustRightMark(current_task_last_mark); /// Must go before seek.
+            stream->seekToMarkAndColumn(from_mark, *column_positions[pos]);
+
+            auto buffer_getter = [&](const ISerialization::SubstreamPath & substream_path) -> ReadBuffer *
+            {
+                if (needSkipStream(pos, substream_path))
+                    return nullptr;
+
+                return stream->getDataBuffer();
+            };
+
+            /// If we read only offsets we have to read prefix anyway
+            /// to preserve correctness of serialization.
+            auto buffer_getter_for_prefix = [&](const auto &) -> ReadBuffer *
+            {
+                return stream->getDataBuffer();
+            };
+
+            readPrefix(columns_to_read[pos], buffer_getter, buffer_getter_for_prefix, columns_for_offsets[pos]);
+            readData(columns_to_read[pos], column, rows_to_read, buffer_getter);
+        }
+
+        ++from_mark;
+        read_rows += rows_to_read;
+    }
+
+    next_mark = from_mark;
+    return read_rows;
+}
+catch (...)
+{
+    if (!isRetryableException(std::current_exception()))
+        data_part_info_for_read->reportBroken();
+
+    /// Better diagnostics.
+    try
+    {
+        rethrow_exception(std::current_exception());
+    }
+    catch (Exception & e)
+    {
+        e.addMessage(getMessageForDiagnosticOfBrokenPart(from_mark, max_rows_to_read));
+    }
+
+    throw;
+}
+
+void MergeTreeReaderCompactSingleBuffer::init()
+try
+{
+    if (initialized)
+        return;
+
+    auto stream_settings = settings;
+    stream_settings.allow_different_codecs = true;
+
+    stream = std::make_unique<MergeTreeReaderStreamAllOfMultipleColumns>(
+        data_part_info_for_read->getDataPartStorage(), MergeTreeDataPartCompact::DATA_FILE_NAME,
+        MergeTreeDataPartCompact::DATA_FILE_EXTENSION, data_part_info_for_read->getMarksCount(),
+        all_mark_ranges, stream_settings,uncompressed_cache,
+        data_part_info_for_read->getFileSizeOrZero(MergeTreeDataPartCompact::DATA_FILE_NAME_WITH_EXTENSION),
+        marks_loader, profile_callback, clock_type);
+
+    initialized = true;
+}
+catch (...)
+{
+    if (!isRetryableException(std::current_exception()))
+        data_part_info_for_read->reportBroken();
+    throw;
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.h b/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.h
new file mode 100644
index 00000000000..f358120e717
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeReaderCompactSingleBuffer.h
@@ -0,0 +1,33 @@
+#pragma once
+#include <Storages/MergeTree/MergeTreeReaderCompact.h>
+#include <Storages/MergeTree/MergeTreeReaderStream.h>
+
+namespace DB
+{
+
+/// Reader for compact parts, that uses one buffer for
+/// all column and doesn't support parallel prefetch of columns.
+/// It's suitable for compact parts with small size of stripe.
+class MergeTreeReaderCompactSingleBuffer : public MergeTreeReaderCompact
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderCompactSingleBuffer(Args &&... args)
+        : MergeTreeReaderCompact{std::forward<Args>(args)...}
+    {
+        fillColumnPositions();
+    }
+
+    /// Returns the number of rows has been read or zero if there is no columns to read.
+    /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
+    size_t readRows(size_t from_mark, size_t current_task_last_mark,
+                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
+
+private:
+    void init();
+
+    bool initialized = false;
+    std::unique_ptr<MergeTreeReaderStream> stream;
+};
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp b/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
deleted file mode 100644
index bacd86511f5..00000000000
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.cpp
+++ /dev/null
@@ -1,117 +0,0 @@
-#include <Storages/MergeTree/MergeTreeReaderInMemory.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
-#include <Interpreters/getColumnFromBlock.h>
-#include <DataTypes/DataTypeArray.h>
-#include <DataTypes/NestedUtils.h>
-#include <Columns/ColumnArray.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int ARGUMENT_OUT_OF_BOUND;
-}
-
-
-MergeTreeReaderInMemory::MergeTreeReaderInMemory(
-    MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
-    DataPartInMemoryPtr data_part_,
-    NamesAndTypesList columns_,
-    const StorageSnapshotPtr & storage_snapshot_,
-    MarkRanges mark_ranges_,
-    MergeTreeReaderSettings settings_)
-    : IMergeTreeReader(
-        data_part_info_for_read_,
-        columns_,
-        storage_snapshot_,
-        nullptr,
-        nullptr,
-        mark_ranges_,
-        settings_,
-        {})
-    , part_in_memory(std::move(data_part_))
-{
-    for (const auto & column_to_read : columns_to_read)
-    {
-        /// If array of Nested column is missing in part,
-        /// we have to read its offsets if they exist.
-        if (typeid_cast<const DataTypeArray *>(column_to_read.type.get())
-            && !tryGetColumnFromBlock(part_in_memory->block, column_to_read))
-        {
-            if (auto offsets_position = findColumnForOffsets(column_to_read))
-            {
-                positions_for_offsets[column_to_read.name] = *data_part_info_for_read->getColumnPosition(offsets_position->first);
-                partially_read_columns.insert(column_to_read.name);
-            }
-        }
-    }
-}
-
-size_t MergeTreeReaderInMemory::readRows(
-    size_t from_mark, size_t /* current_task_last_mark */, bool continue_reading, size_t max_rows_to_read, Columns & res_columns)
-{
-    if (!continue_reading)
-        total_rows_read = 0;
-
-    size_t total_marks = data_part_info_for_read->getIndexGranularity().getMarksCount();
-    if (from_mark >= total_marks)
-        throw Exception(ErrorCodes::ARGUMENT_OUT_OF_BOUND, "Mark {} is out of bound. Max mark: {}",
-            toString(from_mark), toString(total_marks));
-
-    size_t num_columns = res_columns.size();
-    checkNumberOfColumns(num_columns);
-
-    size_t part_rows = part_in_memory->block.rows();
-    if (total_rows_read >= part_rows)
-        throw Exception(ErrorCodes::CANNOT_READ_ALL_DATA, "Cannot read data in MergeTreeReaderInMemory. "
-            "Rows already read: {}. Rows in part: {}", total_rows_read, part_rows);
-
-    size_t rows_to_read = std::min(max_rows_to_read, part_rows - total_rows_read);
-    for (size_t i = 0; i < num_columns; ++i)
-    {
-        const auto & column_to_read = columns_to_read[i];
-
-        /// Copy offsets, if array of Nested column is missing in part.
-        auto offsets_it = positions_for_offsets.find(column_to_read.name);
-        if (offsets_it != positions_for_offsets.end() && !column_to_read.isSubcolumn())
-        {
-            const auto & source_offsets = assert_cast<const ColumnArray &>(
-                *part_in_memory->block.getByPosition(offsets_it->second).column).getOffsets();
-
-            if (res_columns[i] == nullptr)
-                res_columns[i] = column_to_read.type->createColumn();
-
-            auto mutable_column = res_columns[i]->assumeMutable();
-            auto & res_offstes = assert_cast<ColumnArray &>(*mutable_column).getOffsets();
-            size_t start_offset = total_rows_read ? source_offsets[total_rows_read - 1] : 0;
-            for (size_t row = 0; row < rows_to_read; ++row)
-                res_offstes.push_back(source_offsets[total_rows_read + row] - start_offset);
-
-            res_columns[i] = std::move(mutable_column);
-        }
-        else if (part_in_memory->hasColumnFiles(column_to_read))
-        {
-            auto block_column = getColumnFromBlock(part_in_memory->block, column_to_read);
-            if (rows_to_read == part_rows)
-            {
-                res_columns[i] = block_column;
-            }
-            else
-            {
-                if (res_columns[i] == nullptr)
-                    res_columns[i] = column_to_read.type->createColumn();
-
-                auto mutable_column = res_columns[i]->assumeMutable();
-                mutable_column->insertRangeFrom(*block_column, total_rows_read, rows_to_read);
-                res_columns[i] = std::move(mutable_column);
-            }
-        }
-    }
-
-    total_rows_read += rows_to_read;
-    return rows_to_read;
-}
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeReaderInMemory.h b/src/Storages/MergeTree/MergeTreeReaderInMemory.h
deleted file mode 100644
index e26a98f0916..00000000000
--- a/src/Storages/MergeTree/MergeTreeReaderInMemory.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#pragma once
-
-#include <Core/NamesAndTypes.h>
-#include <Storages/MergeTree/IMergeTreeReader.h>
-
-
-namespace DB
-{
-
-class MergeTreeDataPartInMemory;
-using DataPartInMemoryPtr = std::shared_ptr<const MergeTreeDataPartInMemory>;
-
-/// Reader for InMemory parts
-class MergeTreeReaderInMemory : public IMergeTreeReader
-{
-public:
-    MergeTreeReaderInMemory(
-        MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
-        DataPartInMemoryPtr data_part_,
-        NamesAndTypesList columns_,
-        const StorageSnapshotPtr & storage_snapshot_,
-        MarkRanges mark_ranges_,
-        MergeTreeReaderSettings settings_);
-
-    /// Return the number of rows has been read or zero if there is no columns to read.
-    /// If continue_reading is true, continue reading from last state, otherwise seek to from_mark
-    size_t readRows(size_t from_mark, size_t current_tasl_last_mark,
-                    bool continue_reading, size_t max_rows_to_read, Columns & res_columns) override;
-
-    bool canReadIncompleteGranules() const override { return true; }
-
-private:
-    size_t total_rows_read = 0;
-    DataPartInMemoryPtr part_in_memory;
-
-    std::unordered_map<String, size_t> positions_for_offsets;
-};
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.cpp b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
index 8e460630d5e..15ef02440cb 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.cpp
@@ -13,68 +13,48 @@ namespace ErrorCodes
 {
     extern const int ARGUMENT_OUT_OF_BOUND;
     extern const int CANNOT_READ_ALL_DATA;
+    extern const int LOGICAL_ERROR;
 }
 
 MergeTreeReaderStream::MergeTreeReaderStream(
-        MergeTreeDataPartInfoForReaderPtr data_part_reader_,
-        const String & path_prefix_,
-        const String & data_file_extension_,
-        size_t marks_count_,
-        const MarkRanges & all_mark_ranges_,
-        const MergeTreeReaderSettings & settings_,
-        MarkCache * mark_cache_,
-        UncompressedCache * uncompressed_cache_,
-        size_t file_size_,
-        const MergeTreeIndexGranularityInfo * index_granularity_info_,
-        const ReadBufferFromFileBase::ProfileCallback & profile_callback_,
-        clockid_t clock_type_,
-        bool is_low_cardinality_dictionary_,
-        ThreadPool * load_marks_cache_threadpool_)
-    : settings(settings_)
-    , profile_callback(profile_callback_)
+    DataPartStoragePtr data_part_storage_,
+    const String & path_prefix_,
+    const String & data_file_extension_,
+    size_t marks_count_,
+    const MarkRanges & all_mark_ranges_,
+    const MergeTreeReaderSettings & settings_,
+    UncompressedCache * uncompressed_cache_,
+    size_t file_size_,
+    MergeTreeMarksLoaderPtr marks_loader_,
+    const ReadBufferFromFileBase::ProfileCallback & profile_callback_,
+    clockid_t clock_type_)
+    : profile_callback(profile_callback_)
     , clock_type(clock_type_)
     , all_mark_ranges(all_mark_ranges_)
-    , file_size(file_size_)
-    , uncompressed_cache(uncompressed_cache_)
-    , data_part_storage(data_part_reader_->getDataPartStorage())
+    , data_part_storage(std::move(data_part_storage_))
     , path_prefix(path_prefix_)
     , data_file_extension(data_file_extension_)
-    , is_low_cardinality_dictionary(is_low_cardinality_dictionary_)
+    , uncompressed_cache(uncompressed_cache_)
+    , settings(settings_)
     , marks_count(marks_count_)
-    , mark_cache(mark_cache_)
-    , save_marks_in_cache(settings.save_marks_in_cache)
-    , index_granularity_info(index_granularity_info_)
-    , marks_loader(
-        data_part_reader_,
-        mark_cache,
-        index_granularity_info->getMarksFilePath(path_prefix),
-        marks_count,
-        *index_granularity_info,
-        save_marks_in_cache,
-        settings.read_settings,
-        load_marks_cache_threadpool_)
+    , file_size(file_size_)
+    , marks_loader(std::move(marks_loader_))
 {
 }
 
+void MergeTreeReaderStream::loadMarks()
+{
+    if (!marks_getter)
+        marks_getter = marks_loader->loadMarks();
+}
+
 void MergeTreeReaderStream::init()
 {
     if (initialized)
         return;
-    initialized = true;
+
     /// Compute the size of the buffer.
-    size_t max_mark_range_bytes = 0;
-    size_t sum_mark_range_bytes = 0;
-
-    for (const auto & mark_range : all_mark_ranges)
-    {
-        size_t left_mark = mark_range.begin;
-        size_t right_mark = mark_range.end;
-        size_t left_offset = left_mark < marks_count ? marks_loader.getMark(left_mark).offset_in_compressed_file : 0;
-        auto mark_range_bytes = getRightOffset(right_mark) - left_offset;
-
-        max_mark_range_bytes = std::max(max_mark_range_bytes, mark_range_bytes);
-        sum_mark_range_bytes += mark_range_bytes;
-    }
+    auto [max_mark_range_bytes, sum_mark_range_bytes] = estimateMarkRangeBytes(all_mark_ranges);
 
     std::optional<size_t> estimated_sum_mark_range_bytes;
     if (sum_mark_range_bytes)
@@ -83,7 +63,7 @@ void MergeTreeReaderStream::init()
     /// Avoid empty buffer. May happen while reading dictionary for DataTypeLowCardinality.
     /// For example: part has single dictionary and all marks point to the same position.
     ReadSettings read_settings = settings.read_settings;
-    if (max_mark_range_bytes != 0)
+    if (settings.adjust_read_buffer_size && max_mark_range_bytes != 0)
         read_settings = read_settings.adjustBufferSize(max_mark_range_bytes);
 
     //// Empty buffer does not makes progress.
@@ -102,7 +82,8 @@ void MergeTreeReaderStream::init()
                     read_settings,
                     estimated_sum_mark_range_bytes, std::nullopt);
             },
-            uncompressed_cache);
+            uncompressed_cache,
+            settings.allow_different_codecs);
 
         if (profile_callback)
             buffer->setProfileCallback(profile_callback, clock_type);
@@ -121,7 +102,7 @@ void MergeTreeReaderStream::init()
                 path_prefix + data_file_extension,
                 read_settings,
                 estimated_sum_mark_range_bytes,
-                std::nullopt));
+                std::nullopt), settings.allow_different_codecs);
 
         if (profile_callback)
             buffer->setProfileCallback(profile_callback, clock_type);
@@ -133,101 +114,16 @@ void MergeTreeReaderStream::init()
         data_buffer = non_cached_buffer.get();
         compressed_data_buffer = non_cached_buffer.get();
     }
+
+    initialized = true;
 }
 
-
-size_t MergeTreeReaderStream::getRightOffset(size_t right_mark)
-{
-    /// NOTE: if we are reading the whole file, then right_mark == marks_count
-    /// and we will use max_read_buffer_size for buffer size, thus avoiding the need to load marks.
-
-    /// Special case, can happen in Collapsing/Replacing engines
-    if (marks_count == 0)
-        return 0;
-
-    assert(right_mark <= marks_count);
-
-    if (0 < right_mark && right_mark < marks_count)
-    {
-        /// Find the right border of the last mark we need to read.
-        /// To do that let's find the upper bound of the offset of the last
-        /// included mark.
-
-        if (is_low_cardinality_dictionary)
-        {
-
-            /// In LowCardinality dictionary several consecutive marks can point to the same offset.
-            ///
-            /// Also, in some cases, when one granule is not-atomically written (which is possible at merges)
-            /// one granule may require reading of two dictionaries which starts from different marks.
-            /// The only correct way is to take offset from at least next different granule from the right one.
-            /// So, that's why we have to read one extra granule to the right,
-            /// while reading dictionary of LowCardinality.
-            ///
-            /// Example:
-            /// Mark 0, points to [0, 8]
-            /// Mark 1, points to [0, 8]
-            /// Mark 2, points to [0, 8]
-            /// Mark 3, points to [0, 8]
-            /// Mark 4, points to [42336, 2255]
-            /// Mark 5, points to [42336, 2255]  <--- for example need to read until 5
-            /// Mark 6, points to [42336, 2255]  <--- not suitable, because have same offset
-            /// Mark 7, points to [84995, 7738]  <--- next different mark
-            /// Mark 8, points to [84995, 7738]
-            /// Mark 9, points to [126531, 8637] <--- what we are looking for
-
-            auto indices = collections::range(right_mark, marks_count);
-            auto next_different_mark = [&](auto lhs, auto rhs)
-            {
-                return marks_loader.getMark(lhs).asTuple() < marks_loader.getMark(rhs).asTuple();
-            };
-            auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, std::move(next_different_mark));
-
-            if (it == indices.end())
-                return file_size;
-
-            right_mark = *it;
-        }
-
-        /// This is a good scenario. The compressed block is finished within the right mark,
-        /// and previous mark was different.
-        if (marks_loader.getMark(right_mark).offset_in_decompressed_block == 0
-            && marks_loader.getMark(right_mark) != marks_loader.getMark(right_mark - 1))
-            return marks_loader.getMark(right_mark).offset_in_compressed_file;
-
-        /// If right_mark has non-zero offset in decompressed block, we have to
-        /// read its compressed block in a whole, because it may consist of data from previous granule.
-        ///
-        /// For example:
-        /// Mark 6, points to [42336, 2255]
-        /// Mark 7, points to [84995, 7738]  <--- right_mark
-        /// Mark 8, points to [84995, 7738]
-        /// Mark 9, points to [126531, 8637] <--- what we are looking for
-        ///
-        /// Since mark 7 starts from offset in decompressed block 7738,
-        /// it has some data from mark 6 and we have to read
-        /// compressed block  [84995; 126531 in a whole.
-
-        auto indices = collections::range(right_mark, marks_count);
-        auto next_different_compressed_offset = [&](auto lhs, auto rhs)
-        {
-            return marks_loader.getMark(lhs).offset_in_compressed_file < marks_loader.getMark(rhs).offset_in_compressed_file;
-        };
-        auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, std::move(next_different_compressed_offset));
-
-        if (it != indices.end())
-            return marks_loader.getMark(*it).offset_in_compressed_file;
-    }
-    else if (right_mark == 0)
-        return marks_loader.getMark(right_mark).offset_in_compressed_file;
-
-    return file_size;
-}
-
-void MergeTreeReaderStream::seekToMark(size_t index)
+void MergeTreeReaderStream::seekToMarkAndColumn(size_t row_index, size_t column_position)
 {
     init();
-    MarkInCompressedFile mark = marks_loader.getMark(index);
+    loadMarks();
+
+    const auto & mark = marks_getter->getMark(row_index, column_position);
 
     try
     {
@@ -237,7 +133,7 @@ void MergeTreeReaderStream::seekToMark(size_t index)
     {
         /// Better diagnostics.
         if (e.code() == ErrorCodes::ARGUMENT_OUT_OF_BOUND)
-            e.addMessage("(while seeking to mark " + toString(index)
+            e.addMessage("(while seeking to mark " + toString(row_index)
                          + " of column " + path_prefix + "; offsets are: "
                          + toString(mark.offset_in_compressed_file) + " "
                          + toString(mark.offset_in_decompressed_block) + ")");
@@ -274,6 +170,7 @@ void MergeTreeReaderStream::adjustRightMark(size_t right_mark)
      */
     init();
     auto right_offset = getRightOffset(right_mark);
+
     if (!right_offset)
     {
         if (last_right_offset && *last_right_offset == 0)
@@ -304,4 +201,306 @@ CompressedReadBufferBase * MergeTreeReaderStream::getCompressedDataBuffer()
     return compressed_data_buffer;
 }
 
+size_t MergeTreeReaderStreamSingleColumn::getRightOffset(size_t right_mark)
+{
+    /// NOTE: if we are reading the whole file, then right_mark == marks_count
+    /// and we will use max_read_buffer_size for buffer size, thus avoiding the need to load marks.
+
+    /// Special case, can happen in Collapsing/Replacing engines
+    if (marks_count == 0)
+        return 0;
+
+    chassert(right_mark <= marks_count);
+    loadMarks();
+
+    if (right_mark == 0)
+        return marks_getter->getMark(right_mark, 0).offset_in_compressed_file;
+
+    if (right_mark == marks_count)
+        return file_size;
+
+    /// Find the right border of the last mark we need to read.
+    /// To do that let's find the upper bound of the offset of the last
+    /// included mark.
+
+    if (settings.is_low_cardinality_dictionary)
+    {
+        /// In LowCardinality dictionary several consecutive marks can point to the same offset.
+        ///
+        /// Also, in some cases, when one granule is not-atomically written (which is possible at merges)
+        /// one granule may require reading of two dictionaries which starts from different marks.
+        /// The only correct way is to take offset from at least next different granule from the right one.
+        /// So, that's why we have to read one extra granule to the right,
+        /// while reading dictionary of LowCardinality.
+        ///
+        /// Example:
+        /// Mark 0, points to [0, 8]
+        /// Mark 1, points to [0, 8]
+        /// Mark 2, points to [0, 8]
+        /// Mark 3, points to [0, 8]
+        /// Mark 4, points to [42336, 2255]
+        /// Mark 5, points to [42336, 2255]  <--- for example need to read until 5
+        /// Mark 6, points to [42336, 2255]  <--- not suitable, because have same offset
+        /// Mark 7, points to [84995, 7738]  <--- next different mark
+        /// Mark 8, points to [84995, 7738]
+        /// Mark 9, points to [126531, 8637] <--- what we are looking for
+
+        auto indices = collections::range(right_mark, marks_count);
+        auto next_different_mark = [&](auto lhs, auto rhs)
+        {
+            return marks_getter->getMark(lhs, 0).asTuple() < marks_getter->getMark(rhs, 0).asTuple();
+        };
+
+        auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, std::move(next_different_mark));
+        if (it == indices.end())
+            return file_size;
+
+        right_mark = *it;
+    }
+
+    /// This is a good scenario. The compressed block is finished within the right mark,
+    /// and previous mark was different.
+    if (marks_getter->getMark(right_mark, 0).offset_in_decompressed_block == 0
+        && marks_getter->getMark(right_mark, 0) != marks_getter->getMark(right_mark - 1, 0))
+        return marks_getter->getMark(right_mark, 0).offset_in_compressed_file;
+
+    /// If right_mark has non-zero offset in decompressed block, we have to
+    /// read its compressed block in a whole, because it may consist of data from previous granule.
+    ///
+    /// For example:
+    /// Mark 6, points to [42336, 2255]
+    /// Mark 7, points to [84995, 7738]  <--- right_mark
+    /// Mark 8, points to [84995, 7738]
+    /// Mark 9, points to [126531, 8637] <--- what we are looking for
+    ///
+    /// Since mark 7 starts from offset in decompressed block 7738,
+    /// it has some data from mark 6 and we have to read
+    /// compressed block  [84995; 126531 in a whole.
+
+    auto indices = collections::range(right_mark, marks_count);
+    auto next_different_compressed_offset = [&](auto lhs, auto rhs)
+    {
+        return marks_getter->getMark(lhs, 0).offset_in_compressed_file < marks_getter->getMark(rhs, 0).offset_in_compressed_file;
+    };
+
+    auto it = std::upper_bound(indices.begin(), indices.end(), right_mark, std::move(next_different_compressed_offset));
+    if (it != indices.end())
+        return marks_getter->getMark(*it, 0).offset_in_compressed_file;
+
+    return file_size;
+}
+
+std::pair<size_t, size_t> MergeTreeReaderStreamSingleColumn::estimateMarkRangeBytes(const MarkRanges & mark_ranges)
+{
+    loadMarks();
+
+    size_t max_range_bytes = 0;
+    size_t sum_range_bytes = 0;
+
+    for (const auto & mark_range : mark_ranges)
+    {
+        size_t left_mark = mark_range.begin;
+        size_t right_mark = mark_range.end;
+        size_t left_offset = left_mark < marks_count ? marks_getter->getMark(left_mark, 0).offset_in_compressed_file : 0;
+        auto mark_range_bytes = getRightOffset(right_mark) - left_offset;
+
+        max_range_bytes = std::max(max_range_bytes, mark_range_bytes);
+        sum_range_bytes += mark_range_bytes;
+    }
+
+    return {max_range_bytes, sum_range_bytes};
+}
+
+size_t MergeTreeReaderStreamSingleColumnWholePart::getRightOffset(size_t right_mark)
+{
+    if (right_mark != marks_count)
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Expected one right mark: {}, got: {}",
+            marks_count, right_mark);
+    }
+    return file_size;
+}
+
+std::pair<size_t, size_t> MergeTreeReaderStreamSingleColumnWholePart::estimateMarkRangeBytes(const MarkRanges & mark_ranges)
+{
+    if (!mark_ranges.isOneRangeForWholePart(marks_count))
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+            "Expected one mark range that covers the whole part, got: {}",
+            mark_ranges.describe());
+    }
+    return {file_size, file_size};
+}
+
+void MergeTreeReaderStreamSingleColumnWholePart::seekToMark(size_t)
+{
+    throw Exception(ErrorCodes::LOGICAL_ERROR, "MergeTreeReaderStreamSingleColumnWholePart cannot seek to marks");
+}
+
+size_t MergeTreeReaderStreamMultipleColumns::getRightOffsetOneColumn(size_t right_mark_non_included, size_t column_position)
+{
+    /// NOTE: if we are reading the whole file, then right_mark == marks_count
+    /// and we will use max_read_buffer_size for buffer size, thus avoiding the need to load marks.
+
+    /// Special case, can happen in Collapsing/Replacing engines
+    if (marks_count == 0)
+        return 0;
+
+    chassert(right_mark_non_included <= marks_count);
+    loadMarks();
+
+    if (right_mark_non_included == 0)
+        return marks_getter->getMark(right_mark_non_included, column_position).offset_in_compressed_file;
+
+    size_t right_mark_included = right_mark_non_included - 1;
+    if (right_mark_non_included != marks_count
+        && marks_getter->getMark(right_mark_non_included, column_position).offset_in_decompressed_block != 0)
+         ++right_mark_included;
+
+    /// The right bound for case, where there is no smaller suitable mark
+    /// is the start of the next stripe (in which the next column is written)
+    /// because each stripe always start from a new compressed block.
+    const auto & right_mark_in_file = marks_getter->getMark(right_mark_included, column_position);
+    auto next_stripe_right_mark_in_file = getStartOfNextStripeMark(right_mark_included, column_position);
+
+    /// Try to find suitable right mark in current stripe.
+    for (size_t mark = right_mark_included + 1; mark < marks_count; ++mark)
+    {
+        const auto & current_mark = marks_getter->getMark(mark, column_position);
+        /// We found first mark that starts from the new compressed block.
+        if (current_mark.offset_in_compressed_file > right_mark_in_file.offset_in_compressed_file)
+        {
+            /// If it is in current stripe return it to reduce amount of read data.
+            if (current_mark < next_stripe_right_mark_in_file)
+                return current_mark.offset_in_compressed_file;
+
+            /// Otherwise return start of new stripe as an upper bound.
+            break;
+        }
+    }
+
+    return next_stripe_right_mark_in_file.offset_in_compressed_file;
+}
+
+std::pair<size_t, size_t>
+MergeTreeReaderStreamMultipleColumns::estimateMarkRangeBytesOneColumn(const MarkRanges & mark_ranges, size_t column_position)
+{
+    loadMarks();
+
+    /// As a maximal range we return the maximal size of a whole stripe.
+    size_t max_range_bytes = 0;
+    size_t sum_range_bytes = 0;
+
+    for (const auto & mark_range : mark_ranges)
+    {
+        auto start_of_stripe_mark = marks_getter->getMark(mark_range.begin, column_position);
+        auto start_of_next_stripe_mark = getStartOfNextStripeMark(mark_range.begin, column_position);
+
+        for (size_t mark = mark_range.begin; mark < mark_range.end; ++mark)
+        {
+            const auto & current_mark = marks_getter->getMark(mark, column_position);
+
+            /// We found a start of new stripe, now update values.
+            if (current_mark > start_of_next_stripe_mark)
+            {
+                auto current_range_bytes = getRightOffsetOneColumn(mark, column_position) - start_of_stripe_mark.offset_in_compressed_file;
+
+                max_range_bytes = std::max(max_range_bytes, current_range_bytes);
+                sum_range_bytes += current_range_bytes;
+
+                start_of_stripe_mark = current_mark;
+                start_of_next_stripe_mark = getStartOfNextStripeMark(mark, column_position);
+            }
+        }
+
+        auto current_range_bytes = getRightOffsetOneColumn(mark_range.end, column_position) - start_of_stripe_mark.offset_in_compressed_file;
+
+        max_range_bytes = std::max(max_range_bytes, current_range_bytes);
+        sum_range_bytes += current_range_bytes;
+    }
+
+    return {max_range_bytes, sum_range_bytes};
+}
+
+MarkInCompressedFile MergeTreeReaderStreamMultipleColumns::getStartOfNextStripeMark(size_t row_index, size_t column_position)
+{
+    loadMarks();
+    const auto & current_mark = marks_getter->getMark(row_index, column_position);
+
+    if (marks_getter->getNumColumns() == 1)
+        return MarkInCompressedFile{file_size, 0};
+
+    if (column_position + 1 == marks_getter->getNumColumns())
+    {
+        /**
+         * In case of the last column (c3), we have the following picture:
+         *                   c1 c2 c3
+         *                   x  x  x
+         * (row_index, 0) -> o  x  o <- (row_index, column_position)
+         *                   x  x  x
+         *                   ------- <- start of new stripe
+         *    what we are -> o  x  x
+         *    looking for    x  x  x
+         *                   x  x  x
+         *                   -------
+         * So, we need to iterate forward.
+         */
+        size_t mark_index = row_index + 1;
+        while (mark_index < marks_count && marks_getter->getMark(mark_index, 0) <= current_mark)
+            ++mark_index;
+
+        return mark_index == marks_count
+            ? MarkInCompressedFile{file_size, 0}
+            : marks_getter->getMark(mark_index, 0);
+    }
+
+    /**
+    * Otherwise, we have the following picture:
+    *                c1 c2 c3
+    *                x  x  o <- what we are looking for
+    * (row, column) --> o  o <- (row, column + 1)
+    *                x  x  x
+    *                ------- <- start of new stripe
+    * So, we need to iterate backward.
+    */
+
+    ssize_t mark_index = row_index;
+    while (mark_index >= 0 && marks_getter->getMark(mark_index, column_position + 1) >= current_mark)
+        --mark_index;
+
+    return marks_getter->getMark(mark_index + 1, column_position + 1);
+}
+
+size_t MergeTreeReaderStreamOneOfMultipleColumns::getRightOffset(size_t right_mark_non_included)
+{
+    return getRightOffsetOneColumn(right_mark_non_included, column_position);
+}
+
+std::pair<size_t, size_t> MergeTreeReaderStreamOneOfMultipleColumns::estimateMarkRangeBytes(const MarkRanges & mark_ranges)
+{
+    return estimateMarkRangeBytesOneColumn(mark_ranges, column_position);
+}
+
+size_t MergeTreeReaderStreamAllOfMultipleColumns::getRightOffset(size_t right_mark_non_included)
+{
+    return getRightOffsetOneColumn(right_mark_non_included, marks_loader->getNumColumns() - 1);
+}
+
+std::pair<size_t, size_t> MergeTreeReaderStreamAllOfMultipleColumns::estimateMarkRangeBytes(const MarkRanges & mark_ranges)
+{
+    size_t max_range_bytes = 0;
+    size_t sum_range_bytes = 0;
+
+    for (size_t i = 0; i < marks_loader->getNumColumns(); ++i)
+    {
+        auto [current_max, current_sum] = estimateMarkRangeBytesOneColumn(mark_ranges, i);
+
+        max_range_bytes = std::max(max_range_bytes, current_max);
+        sum_range_bytes += current_sum;
+    }
+
+    return {max_range_bytes, sum_range_bytes};
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeReaderStream.h b/src/Storages/MergeTree/MergeTreeReaderStream.h
index baf8ec713f9..05341cd8acc 100644
--- a/src/Storages/MergeTree/MergeTreeReaderStream.h
+++ b/src/Storages/MergeTree/MergeTreeReaderStream.h
@@ -1,5 +1,4 @@
 #pragma once
-#include <tuple>
 #include <Storages/MarkCache.h>
 #include <Storages/MergeTree/MarkRange.h>
 #include <Storages/MergeTree/MergeTreeData.h>
@@ -15,28 +14,33 @@
 namespace DB
 {
 
-/// Class for reading a single column (or index).
+/// Basic and the most low-level class
+/// for reading single columns or indexes.
 class MergeTreeReaderStream
 {
 public:
     MergeTreeReaderStream(
-        MergeTreeDataPartInfoForReaderPtr data_part_reader_,
+        DataPartStoragePtr data_part_storage_,
         const String & path_prefix_,
         const String & data_file_extension_,
         size_t marks_count_,
-        const MarkRanges & all_mark_ranges,
+        const MarkRanges & all_mark_ranges_,
         const MergeTreeReaderSettings & settings_,
-        MarkCache * mark_cache,
-        UncompressedCache * uncompressed_cache,
+        UncompressedCache * uncompressed_cache_,
         size_t file_size_,
-        const MergeTreeIndexGranularityInfo * index_granularity_info_,
-        const ReadBufferFromFileBase::ProfileCallback & profile_callback,
-        clockid_t clock_type,
-        bool is_low_cardinality_dictionary_,
-        ThreadPool * load_marks_cache_threadpool_);
+        MergeTreeMarksLoaderPtr marks_loader_,
+        const ReadBufferFromFileBase::ProfileCallback & profile_callback_,
+        clockid_t clock_type_);
 
-    void seekToMark(size_t index);
+    virtual ~MergeTreeReaderStream() = default;
 
+    /// Seeks to start of @row_index mark. Column position is implementation defined.
+    virtual void seekToMark(size_t row_index) = 0;
+
+    /// Seeks to exact mark in file.
+    void seekToMarkAndColumn(size_t row_index, size_t column_position);
+
+    /// Seeks to the start of the file.
     void seekToStart();
 
     /**
@@ -49,39 +53,126 @@ public:
     CompressedReadBufferBase * getCompressedDataBuffer();
 
 private:
-    void init();
-    size_t getRightOffset(size_t right_mark);
+    /// Returns offset in file up to which it's needed to read file to read all rows up to @right_mark mark.
+    virtual size_t getRightOffset(size_t right_mark) = 0;
+
+    /// Returns estimated max amount of bytes to read among mark ranges (which is used as size for read buffer)
+    /// and total amount of bytes to read in all mark ranges.
+    virtual std::pair<size_t, size_t> estimateMarkRangeBytes(const MarkRanges & mark_ranges) = 0;
 
-    const MergeTreeReaderSettings settings;
     const ReadBufferFromFileBase::ProfileCallback profile_callback;
-    clockid_t clock_type;
+    const clockid_t clock_type;
     const MarkRanges all_mark_ranges;
-    size_t file_size;
-    UncompressedCache * uncompressed_cache;
 
-    DataPartStoragePtr data_part_storage;
-    std::string path_prefix;
-    std::string data_file_extension;
-
-    bool is_low_cardinality_dictionary = false;
-
-    size_t marks_count;
+    const DataPartStoragePtr data_part_storage;
+    const std::string path_prefix;
+    const std::string data_file_extension;
 
+    UncompressedCache * const uncompressed_cache;
 
     ReadBuffer * data_buffer;
     CompressedReadBufferBase * compressed_data_buffer;
-    MarkCache * mark_cache;
-    bool save_marks_in_cache;
+
     bool initialized = false;
-
     std::optional<size_t> last_right_offset;
 
-    const MergeTreeIndexGranularityInfo * index_granularity_info;
-
     std::unique_ptr<CachedCompressedReadBuffer> cached_buffer;
     std::unique_ptr<CompressedReadBufferFromFile> non_cached_buffer;
 
-    MergeTreeMarksLoader marks_loader;
+protected:
+    void init();
+    void loadMarks();
+
+    const MergeTreeReaderSettings settings;
+    const size_t marks_count;
+    const size_t file_size;
+
+    const MergeTreeMarksLoaderPtr marks_loader;
+    MergeTreeMarksGetterPtr marks_getter;
+};
+
+/// Class for reading a single column (or index) from file
+/// that contains a single column (for wide parts).
+class MergeTreeReaderStreamSingleColumn : public MergeTreeReaderStream
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderStreamSingleColumn(Args &&... args)
+        : MergeTreeReaderStream{std::forward<Args>(args)...}
+    {
+    }
+
+    size_t getRightOffset(size_t right_mark_non_included) override;
+    std::pair<size_t, size_t> estimateMarkRangeBytes(const MarkRanges & mark_ranges) override;
+    void seekToMark(size_t row_index) override { seekToMarkAndColumn(row_index, 0); }
+};
+
+class MergeTreeReaderStreamSingleColumnWholePart : public MergeTreeReaderStream
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderStreamSingleColumnWholePart(Args &&... args)
+        : MergeTreeReaderStream{std::forward<Args>(args)...}
+    {
+    }
+
+    size_t getRightOffset(size_t right_mark_non_included) override;
+    std::pair<size_t, size_t> estimateMarkRangeBytes(const MarkRanges & mark_ranges) override;
+    void seekToMark(size_t row_index) override;
+};
+
+/// Base class for reading from file that contains multiple columns.
+/// It is used to read from compact parts.
+/// See more details about data layout in MergeTreeDataPartCompact.h.
+class MergeTreeReaderStreamMultipleColumns : public MergeTreeReaderStream
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderStreamMultipleColumns(Args &&... args)
+        : MergeTreeReaderStream{std::forward<Args>(args)...}
+    {
+    }
+
+protected:
+    size_t getRightOffsetOneColumn(size_t right_mark_non_included, size_t column_position);
+    std::pair<size_t, size_t> estimateMarkRangeBytesOneColumn(const MarkRanges & mark_ranges, size_t column_position);
+    MarkInCompressedFile getStartOfNextStripeMark(size_t row_index, size_t column_position);
+};
+
+/// Class for reading a single column from file that contains multiple columns
+/// (for parallel reading from compact parts with large stripes).
+class MergeTreeReaderStreamOneOfMultipleColumns : public MergeTreeReaderStreamMultipleColumns
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderStreamOneOfMultipleColumns(size_t column_position_, Args &&... args)
+        : MergeTreeReaderStreamMultipleColumns{std::forward<Args>(args)...}
+        , column_position(column_position_)
+    {
+    }
+
+    size_t getRightOffset(size_t right_mark_non_included) override;
+    std::pair<size_t, size_t> estimateMarkRangeBytes(const MarkRanges & mark_ranges) override;
+    void seekToMark(size_t row_index) override { seekToMarkAndColumn(row_index, column_position); }
+
+private:
+    const size_t column_position;
+};
+
+/// Class for reading multiple columns from file that contains multiple columns
+/// (for reading from compact parts with small stripes).
+class MergeTreeReaderStreamAllOfMultipleColumns : public MergeTreeReaderStreamMultipleColumns
+{
+public:
+    template <typename... Args>
+    explicit MergeTreeReaderStreamAllOfMultipleColumns(Args &&... args)
+        : MergeTreeReaderStreamMultipleColumns{std::forward<Args>(args)...}
+    {
+    }
+
+    size_t getRightOffset(size_t right_mark_non_included) override;
+    std::pair<size_t, size_t> estimateMarkRangeBytes(const MarkRanges & mark_ranges) override;
+    void seekToMark(size_t row_index) override { seekToMarkAndColumn(row_index, 0); }
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.cpp b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
index 640432ef755..d398668d5c8 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.cpp
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.cpp
@@ -24,6 +24,7 @@ namespace
 MergeTreeReaderWide::MergeTreeReaderWide(
     MergeTreeDataPartInfoForReaderPtr data_part_info_,
     NamesAndTypesList columns_,
+    const VirtualFields & virtual_fields_,
     const StorageSnapshotPtr & storage_snapshot_,
     UncompressedCache * uncompressed_cache_,
     MarkCache * mark_cache_,
@@ -35,12 +36,14 @@ MergeTreeReaderWide::MergeTreeReaderWide(
     : IMergeTreeReader(
         data_part_info_,
         columns_,
+        virtual_fields_,
         storage_snapshot_,
         uncompressed_cache_,
         mark_cache_,
         mark_ranges_,
         settings_,
         avg_value_size_hints_)
+    , read_whole_part(all_mark_ranges.isOneRangeForWholePart(data_part_info_for_read->getMarksCount()))
 {
     try
     {
@@ -223,18 +226,43 @@ void MergeTreeReaderWide::addStreams(
             return;
         }
 
-        has_any_stream = true;
-        bool is_lc_dict = substream_path.size() > 1 && substream_path[substream_path.size() - 2].type == ISerialization::Substream::Type::DictionaryKeys;
-
         auto context = data_part_info_for_read->getContext();
         auto * load_marks_threadpool = settings.read_settings.load_marks_asynchronously ? &context->getLoadMarksThreadpool() : nullptr;
+        size_t num_marks_in_part = data_part_info_for_read->getMarksCount();
 
-        streams.emplace(*stream_name, std::make_unique<MergeTreeReaderStream>(
-            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(),
-            profile_callback, clock_type, is_lc_dict, load_marks_threadpool));
+        auto marks_loader = std::make_shared<MergeTreeMarksLoader>(
+            data_part_info_for_read,
+            mark_cache,
+            data_part_info_for_read->getIndexGranularityInfo().getMarksFilePath(*stream_name),
+            num_marks_in_part,
+            data_part_info_for_read->getIndexGranularityInfo(),
+            settings.save_marks_in_cache,
+            settings.read_settings,
+            load_marks_threadpool,
+            /*num_columns_in_mark=*/ 1);
+
+        has_any_stream = true;
+        auto stream_settings = settings;
+        stream_settings.is_low_cardinality_dictionary = substream_path.size() > 1 && substream_path[substream_path.size() - 2].type == ISerialization::Substream::Type::DictionaryKeys;
+
+        auto create_stream = [&]<typename Stream>()
+        {
+            return std::make_unique<Stream>(
+                data_part_info_for_read->getDataPartStorage(), *stream_name, DATA_FILE_EXTENSION,
+                num_marks_in_part, all_mark_ranges, stream_settings,
+                uncompressed_cache, data_part_info_for_read->getFileSizeOrZero(*stream_name + DATA_FILE_EXTENSION),
+                std::move(marks_loader), profile_callback, clock_type);
+        };
+
+        if (read_whole_part)
+        {
+            streams.emplace(*stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumnWholePart>());
+        }
+        else
+        {
+            marks_loader->startAsyncLoad();
+            streams.emplace(*stream_name, create_stream.operator()<MergeTreeReaderStreamSingleColumn>());
+        }
     };
 
     serialization->enumerateStreams(callback);
@@ -312,7 +340,8 @@ void MergeTreeReaderWide::prefetchForColumn(
 
         if (stream_name && !prefetched_streams.contains(*stream_name))
         {
-            bool seek_to_mark = !continue_reading;
+            bool seek_to_mark = !continue_reading && !read_whole_part;
+
             if (ReadBuffer * buf = getStream(false, substream_path, data_part_info_for_read->getChecksums(), streams, name_and_type, from_mark, seek_to_mark, current_task_last_mark, cache))
             {
                 buf->prefetch(priority);
@@ -336,7 +365,7 @@ void MergeTreeReaderWide::readData(
 
     deserialize_settings.getter = [&](const ISerialization::SubstreamPath & substream_path)
     {
-        bool seek_to_mark = !was_prefetched && !continue_reading;
+        bool seek_to_mark = !was_prefetched && !continue_reading && !read_whole_part;
 
         return getStream(
             /* seek_to_start = */false, substream_path,
diff --git a/src/Storages/MergeTree/MergeTreeReaderWide.h b/src/Storages/MergeTree/MergeTreeReaderWide.h
index 2a850cc2814..7ffe565d262 100644
--- a/src/Storages/MergeTree/MergeTreeReaderWide.h
+++ b/src/Storages/MergeTree/MergeTreeReaderWide.h
@@ -17,6 +17,7 @@ public:
     MergeTreeReaderWide(
         MergeTreeDataPartInfoForReaderPtr data_part_info_for_read_,
         NamesAndTypesList columns_,
+        const VirtualFields & virtual_fields_,
         const StorageSnapshotPtr & storage_snapshot_,
         UncompressedCache * uncompressed_cache_,
         MarkCache * mark_cache_,
@@ -72,6 +73,7 @@ private:
     std::unordered_map<String, ISerialization::SubstreamsCache> caches;
     std::unordered_set<std::string> prefetched_streams;
     ssize_t prefetched_from_mark = -1;
+    bool read_whole_part = false;
 };
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
index aeff438f509..fce733d47b7 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.cpp
@@ -10,8 +10,9 @@
 #include <DataTypes/DataTypeUUID.h>
 #include <DataTypes/DataTypeArray.h>
 #include <Processors/Chunk.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <Processors/Transforms/AggregatingTransform.h>
-#include <Storages/BlockNumberColumn.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <city.h>
 
 namespace DB
@@ -19,42 +20,26 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER;
-    extern const int LOGICAL_ERROR;
     extern const int QUERY_WAS_CANCELLED;
 }
 
-static void injectNonConstVirtualColumns(
-    size_t rows,
-    Block & block,
-    const Names & virtual_columns,
-    MergeTreeReadTask * task = nullptr);
-
-static void injectPartConstVirtualColumns(
-    size_t rows,
-    Block & block,
-    MergeTreeReadTask * task,
-    const DataTypePtr & partition_value_type,
-    const Names & virtual_columns);
-
 MergeTreeSelectProcessor::MergeTreeSelectProcessor(
     MergeTreeReadPoolPtr pool_,
     MergeTreeSelectAlgorithmPtr algorithm_,
-    const MergeTreeData & storage_,
+    const StorageSnapshotPtr & storage_snapshot_,
     const PrewhereInfoPtr & prewhere_info_,
     const ExpressionActionsSettings & actions_settings_,
     const MergeTreeReadTask::BlockSizeParams & block_size_params_,
-    const MergeTreeReaderSettings & reader_settings_,
-    const Names & virt_column_names_)
+    const MergeTreeReaderSettings & reader_settings_)
     : pool(std::move(pool_))
     , algorithm(std::move(algorithm_))
+    , storage_snapshot(storage_snapshot_)
     , prewhere_info(prewhere_info_)
     , actions_settings(actions_settings_)
     , prewhere_actions(getPrewhereActions(prewhere_info, actions_settings, reader_settings_.enable_multiple_prewhere_read_steps))
     , reader_settings(reader_settings_)
     , block_size_params(block_size_params_)
-    , virt_column_names(virt_column_names_)
-    , partition_value_type(storage_.getPartitionValueType())
+    , result_header(transformHeader(pool->getHeader(), prewhere_info))
 {
     if (reader_settings.apply_deleted_mask)
     {
@@ -62,7 +47,7 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
         {
             .type = PrewhereExprStep::Filter,
             .actions = nullptr,
-            .filter_column_name = LightweightDeleteDescription::FILTER_COLUMN.name,
+            .filter_column_name = RowExistsColumn::name,
             .remove_filter_column = true,
             .need_filter = true,
             .perform_alter_conversions = true,
@@ -71,16 +56,6 @@ MergeTreeSelectProcessor::MergeTreeSelectProcessor(
         lightweight_delete_filter_step = std::make_shared<PrewhereExprStep>(std::move(step));
     }
 
-    header_without_const_virtual_columns = applyPrewhereActions(pool->getHeader(), prewhere_info);
-    size_t non_const_columns_offset = header_without_const_virtual_columns.columns();
-    injectNonConstVirtualColumns(0, header_without_const_virtual_columns, virt_column_names);
-
-    for (size_t col_num = non_const_columns_offset; col_num < header_without_const_virtual_columns.columns(); ++col_num)
-        non_const_virtual_column_names.emplace_back(header_without_const_virtual_columns.getByPosition(col_num).name);
-
-    result_header = header_without_const_virtual_columns;
-    injectPartConstVirtualColumns(0, result_header, nullptr, partition_value_type, virt_column_names);
-
     if (!prewhere_actions.steps.empty())
         LOG_TRACE(log, "PREWHERE condition was split into {} steps: {}", prewhere_actions.steps.size(), prewhere_actions.dumpConditions());
 
@@ -163,8 +138,6 @@ ChunkAndProgress MergeTreeSelectProcessor::read()
 
         if (res.row_count)
         {
-            injectVirtualColumns(res.block, res.row_count, task.get(), partition_value_type, virt_column_names);
-
             /// Reorder the columns according to result_header
             Columns ordered_columns;
             ordered_columns.reserve(result_header.columns());
@@ -198,260 +171,12 @@ void MergeTreeSelectProcessor::initializeRangeReaders()
     for (const auto & step : prewhere_actions.steps)
         all_prewhere_actions.steps.push_back(step);
 
-    task->initializeRangeReaders(all_prewhere_actions, non_const_virtual_column_names);
+    task->initializeRangeReaders(all_prewhere_actions);
 }
 
-
-namespace
+Block MergeTreeSelectProcessor::transformHeader(Block block, const PrewhereInfoPtr & prewhere_info)
 {
-    struct VirtualColumnsInserter
-    {
-        explicit VirtualColumnsInserter(Block & block_) : block(block_) {}
-
-        bool columnExists(const String & name) const { return block.has(name); }
-
-        void insertUInt8Column(const ColumnPtr & column, const String & name)
-        {
-            block.insert({column, std::make_shared<DataTypeUInt8>(), name});
-        }
-
-        void insertUInt64Column(const ColumnPtr & column, const String & name)
-        {
-            block.insert({column, std::make_shared<DataTypeUInt64>(), name});
-        }
-
-        void insertUUIDColumn(const ColumnPtr & column, const String & name)
-        {
-            block.insert({column, std::make_shared<DataTypeUUID>(), name});
-        }
-
-        void insertLowCardinalityColumn(const ColumnPtr & column, const String & name)
-        {
-            block.insert({column, std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), name});
-        }
-
-        void insertPartitionValueColumn(
-            size_t rows, const Row & partition_value, const DataTypePtr & partition_value_type, const String & name)
-        {
-            ColumnPtr column;
-            if (rows)
-                column = partition_value_type->createColumnConst(rows, Tuple(partition_value.begin(), partition_value.end()))
-                             ->convertToFullColumnIfConst();
-            else
-                column = partition_value_type->createColumn();
-
-            block.insert({column, partition_value_type, name});
-        }
-
-        Block & block;
-    };
-}
-
-/// Adds virtual columns that are not const for all rows
-static void injectNonConstVirtualColumns(
-    size_t rows,
-    Block & block,
-    const Names & virtual_columns,
-    MergeTreeReadTask * task)
-{
-    VirtualColumnsInserter inserter(block);
-    for (const auto & virtual_column_name : virtual_columns)
-    {
-        if (virtual_column_name == "_part_offset")
-        {
-            if (!rows)
-            {
-                inserter.insertUInt64Column(DataTypeUInt64().createColumn(), virtual_column_name);
-            }
-            else
-            {
-                if (!inserter.columnExists(virtual_column_name))
-                    throw Exception(ErrorCodes::LOGICAL_ERROR,
-                        "Column {} must have been filled part reader",
-                        virtual_column_name);
-            }
-        }
-
-        if (virtual_column_name == LightweightDeleteDescription::FILTER_COLUMN.name)
-        {
-                /// If _row_exists column isn't present in the part then fill it here with 1s
-                ColumnPtr column;
-                if (rows)
-                    column = LightweightDeleteDescription::FILTER_COLUMN.type->createColumnConst(rows, 1)->convertToFullColumnIfConst();
-                else
-                    column = LightweightDeleteDescription::FILTER_COLUMN.type->createColumn();
-
-                inserter.insertUInt8Column(column, virtual_column_name);
-        }
-
-        if (virtual_column_name == BlockNumberColumn::name)
-        {
-            ColumnPtr column;
-            if (rows)
-            {
-                size_t value = 0;
-                if (task)
-                {
-                    value = task->getInfo().data_part ? task->getInfo().data_part->info.min_block : 0;
-                }
-                column = BlockNumberColumn::type->createColumnConst(rows, value)->convertToFullColumnIfConst();
-            }
-            else
-                column = BlockNumberColumn::type->createColumn();
-
-            inserter.insertUInt64Column(column, virtual_column_name);
-        }
-    }
-}
-
-/// Adds virtual columns that are const for the whole part
-static void injectPartConstVirtualColumns(
-    size_t rows,
-    Block & block,
-    MergeTreeReadTask * task,
-    const DataTypePtr & partition_value_type,
-    const Names & virtual_columns)
-{
-    VirtualColumnsInserter inserter(block);
-    /// add virtual columns
-    /// Except _sample_factor, which is added from the outside.
-    if (!virtual_columns.empty())
-    {
-        if (unlikely(rows && !task))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot insert virtual columns to non-empty chunk without specified task.");
-
-        const IMergeTreeDataPart * part = nullptr;
-
-        if (rows)
-        {
-            part = task->getInfo().data_part.get();
-            if (part->isProjectionPart())
-                part = part->getParentPart();
-        }
-
-        for (const auto & virtual_column_name : virtual_columns)
-        {
-            if (virtual_column_name == "_part")
-            {
-                ColumnPtr column;
-                if (rows)
-                    column = DataTypeLowCardinality{std::make_shared<DataTypeString>()}
-                                 .createColumnConst(rows, part->name)
-                                 ->convertToFullColumnIfConst();
-                else
-                    column = DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn();
-
-                inserter.insertLowCardinalityColumn(column, virtual_column_name);
-            }
-            else if (virtual_column_name == "_part_index")
-            {
-                ColumnPtr column;
-                if (rows)
-                    column = DataTypeUInt64().createColumnConst(rows, task->getInfo().part_index_in_query)->convertToFullColumnIfConst();
-                else
-                    column = DataTypeUInt64().createColumn();
-
-                inserter.insertUInt64Column(column, virtual_column_name);
-            }
-            else if (virtual_column_name == "_part_uuid")
-            {
-                ColumnPtr column;
-                if (rows)
-                    column = DataTypeUUID().createColumnConst(rows, part->uuid)->convertToFullColumnIfConst();
-                else
-                    column = DataTypeUUID().createColumn();
-
-                inserter.insertUUIDColumn(column, virtual_column_name);
-            }
-            else if (virtual_column_name == "_partition_id")
-            {
-                ColumnPtr column;
-                if (rows)
-                    column = DataTypeLowCardinality{std::make_shared<DataTypeString>()}
-                                 .createColumnConst(rows, part->info.partition_id)
-                                 ->convertToFullColumnIfConst();
-                else
-                    column = DataTypeLowCardinality{std::make_shared<DataTypeString>()}.createColumn();
-
-                inserter.insertLowCardinalityColumn(column, virtual_column_name);
-            }
-            else if (virtual_column_name == "_partition_value")
-            {
-                if (rows)
-                    inserter.insertPartitionValueColumn(rows, part->partition.value, partition_value_type, virtual_column_name);
-                else
-                    inserter.insertPartitionValueColumn(rows, {}, partition_value_type, virtual_column_name);
-            }
-        }
-    }
-}
-
-void MergeTreeSelectProcessor::injectVirtualColumns(
-    Block & block, size_t row_count, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns)
-{
-    /// First add non-const columns that are filled by the range reader and then const columns that we will fill ourselves.
-    /// Note that the order is important: virtual columns filled by the range reader must go first
-    injectNonConstVirtualColumns(row_count, block, virtual_columns,task);
-    injectPartConstVirtualColumns(row_count, block, task, partition_value_type, virtual_columns);
-}
-
-Block MergeTreeSelectProcessor::applyPrewhereActions(Block block, const PrewhereInfoPtr & prewhere_info)
-{
-    if (prewhere_info)
-    {
-        if (prewhere_info->row_level_filter)
-        {
-            block = prewhere_info->row_level_filter->updateHeader(std::move(block));
-            auto & row_level_column = block.getByName(prewhere_info->row_level_column_name);
-            if (!row_level_column.type->canBeUsedInBooleanContext())
-            {
-                throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER, "Invalid type for filter in PREWHERE: {}",
-                    row_level_column.type->getName());
-            }
-
-            block.erase(prewhere_info->row_level_column_name);
-        }
-
-        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());
-            }
-
-            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());
-            }
-        }
-    }
-
-    return block;
-}
-
-Block MergeTreeSelectProcessor::transformHeader(
-    Block block, const PrewhereInfoPtr & prewhere_info, const DataTypePtr & partition_value_type, const Names & virtual_columns)
-{
-    auto transformed = applyPrewhereActions(std::move(block), prewhere_info);
-    injectVirtualColumns(transformed, 0, nullptr, partition_value_type, virtual_columns);
-    return transformed;
+    return SourceStepWithFilter::applyPrewhereActions(std::move(block), prewhere_info);
 }
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeSelectProcessor.h b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
index cf1a6313b51..6b663e0fd36 100644
--- a/src/Storages/MergeTree/MergeTreeSelectProcessor.h
+++ b/src/Storages/MergeTree/MergeTreeSelectProcessor.h
@@ -41,21 +41,15 @@ public:
     MergeTreeSelectProcessor(
         MergeTreeReadPoolPtr pool_,
         MergeTreeSelectAlgorithmPtr algorithm_,
-        const MergeTreeData & storage_,
+        const StorageSnapshotPtr & storage_snapshot_,
         const PrewhereInfoPtr & prewhere_info_,
         const ExpressionActionsSettings & actions_settings_,
         const MergeTreeReadTask::BlockSizeParams & block_size_params_,
-        const MergeTreeReaderSettings & reader_settings_,
-        const Names & virt_column_names_);
+        const MergeTreeReaderSettings & reader_settings_);
 
     String getName() const;
 
-    static Block transformHeader(
-        Block block,
-        const PrewhereInfoPtr & prewhere_info,
-        const DataTypePtr & partition_value_type,
-        const Names & virtual_columns);
-
+    static Block transformHeader(Block block, const PrewhereInfoPtr & prewhere_info);
     Block getHeader() const { return result_header; }
 
     ChunkAndProgress read();
@@ -72,24 +66,12 @@ public:
     void addPartLevelToChunk(bool add_part_level_) { add_part_level = add_part_level_; }
 
 private:
-    /// This struct allow to return block with no columns but with non-zero number of rows similar to Chunk
-    struct BlockAndProgress
-    {
-        Block block;
-        size_t row_count = 0;
-        size_t num_read_rows = 0;
-        size_t num_read_bytes = 0;
-    };
-
-    /// Used for filling header with no rows as well as block with data
-    static void injectVirtualColumns(Block & block, size_t row_count, MergeTreeReadTask * task, const DataTypePtr & partition_value_type, const Names & virtual_columns);
-    static Block applyPrewhereActions(Block block, const PrewhereInfoPtr & prewhere_info);
-
     /// Sets up range readers corresponding to data readers
     void initializeRangeReaders();
 
     const MergeTreeReadPoolPtr pool;
     const MergeTreeSelectAlgorithmPtr algorithm;
+    const StorageSnapshotPtr storage_snapshot;
 
     const PrewhereInfoPtr prewhere_info;
     const ExpressionActionsSettings actions_settings;
@@ -97,24 +79,18 @@ private:
 
     const MergeTreeReaderSettings reader_settings;
     const MergeTreeReadTask::BlockSizeParams block_size_params;
-    const Names virt_column_names;
-    const DataTypePtr partition_value_type;
 
     /// Current task to read from.
     MergeTreeReadTaskPtr task;
     /// This step is added when the part has lightweight delete mask
     PrewhereExprStepPtr lightweight_delete_filter_step;
-    /// These columns will be filled by the merge tree range reader
-    Names non_const_virtual_column_names;
-    /// This header is used for chunks from readFromPart().
-    Block header_without_const_virtual_columns;
     /// A result of getHeader(). A chunk which this header is returned from read().
     Block result_header;
 
     /// Should we add part level to produced chunk. Part level is useful for next steps if query has FINAL
     bool add_part_level = false;
 
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeSelectProcessor");
+    LoggerPtr log = getLogger("MergeTreeSelectProcessor");
     std::atomic<bool> is_cancelled{false};
 };
 
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
index 82e9f8fd2db..47661a3ff93 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.cpp
@@ -2,6 +2,7 @@
 #include <Storages/MergeTree/MergeTreeBlockReadUtils.h>
 #include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
 #include <Storages/MergeTree/MergeTreeDataSelectExecutor.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <Processors/Transforms/FilterTransform.h>
 #include <Processors/QueryPlan/ISourceStep.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
@@ -16,6 +17,7 @@
 
 namespace DB
 {
+
 namespace ErrorCodes
 {
     extern const int MEMORY_LIMIT_EXCEEDED;
@@ -55,7 +57,6 @@ protected:
     Chunk generate() override;
 
 private:
-
     const MergeTreeData & storage;
     StorageSnapshotPtr storage_snapshot;
 
@@ -68,7 +69,7 @@ private:
     /// Should read using direct IO
     bool read_with_direct_io;
 
-    Poco::Logger * log = &Poco::Logger::get("MergeTreeSequentialSource");
+    LoggerPtr log = getLogger("MergeTreeSequentialSource");
 
     std::optional<MarkRanges> mark_ranges;
 
@@ -86,7 +87,6 @@ private:
     void finish();
 };
 
-
 MergeTreeSequentialSource::MergeTreeSequentialSource(
     MergeTreeSequentialSourceType type,
     const MergeTreeData & storage_,
@@ -136,10 +136,9 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
     {
         auto options = GetColumnsOptions(GetColumnsOptions::AllPhysical)
             .withExtendedObjects()
-            .withSystemColumns();
+            .withVirtuals()
+            .withSubcolumns(storage.supportsSubcolumns());
 
-        if (storage.supportsSubcolumns())
-            options.withSubcolumns();
         columns_for_reader = storage_snapshot->getColumnsByNames(options, columns_to_read);
     }
     else
@@ -150,12 +149,14 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
 
     const auto & context = storage.getContext();
     ReadSettings read_settings = context->getReadSettings();
-    read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = true;
+    read_settings.read_from_filesystem_cache_if_exists_otherwise_bypass_cache = !storage.getSettings()->force_read_through_cache_for_merges;
+
     /// It does not make sense to use pthread_threadpool for background merges/mutations
     /// And also to preserve backward compatibility
     read_settings.local_fs_method = LocalFSReadMethod::pread;
     if (read_with_direct_io)
         read_settings.direct_io_threshold = 1;
+
     /// Configure throttling
     switch (type)
     {
@@ -179,9 +180,48 @@ MergeTreeSequentialSource::MergeTreeSequentialSource(
         mark_ranges.emplace(MarkRanges{MarkRange(0, data_part->getMarksCount())});
 
     reader = data_part->getReader(
-        columns_for_reader, storage_snapshot,
-        *mark_ranges, /* uncompressed_cache = */ nullptr,
-        mark_cache.get(), alter_conversions, reader_settings, {}, {});
+        columns_for_reader,
+        storage_snapshot,
+        *mark_ranges,
+        /*virtual_fields=*/ {},
+        /*uncompressed_cache=*/ {},
+        mark_cache.get(),
+        alter_conversions,
+        reader_settings,
+        /*avg_value_size_hints=*/ {},
+        /*profile_callback=*/ {});
+}
+
+static void fillBlockNumberColumns(
+    Columns & res_columns,
+    const NamesAndTypesList & columns_list,
+    UInt64 block_number,
+    UInt64 block_offset,
+    UInt64 num_rows)
+{
+    chassert(res_columns.size() == columns_list.size());
+
+    auto it = columns_list.begin();
+    for (size_t i = 0; i < res_columns.size(); ++i, ++it)
+    {
+        if (res_columns[i])
+            continue;
+
+        if (it->name == BlockNumberColumn::name)
+        {
+            res_columns[i] = BlockNumberColumn::type->createColumnConst(num_rows, block_number)->convertToFullColumnIfConst();
+        }
+        else if (it->name == BlockOffsetColumn::name)
+        {
+            auto column = BlockOffsetColumn::type->createColumn();
+            auto & block_offset_data = assert_cast<ColumnUInt64 &>(*column).getData();
+
+            block_offset_data.resize(num_rows);
+            std::iota(block_offset_data.begin(), block_offset_data.end(), block_offset);
+
+            res_columns[i] = std::move(column);
+        }
+    }
 }
 
 Chunk MergeTreeSequentialSource::generate()
@@ -190,6 +230,7 @@ try
     const auto & header = getPort().getHeader();
     /// Part level is useful for next step for merging non-merge tree table
     bool add_part_level = storage.merging_params.mode != MergeTreeData::MergingParams::Ordinary;
+    size_t num_marks_in_part = data_part->getMarksCount();
 
     if (!isCancelled() && current_row < data_part->rows_count)
     {
@@ -198,20 +239,21 @@ try
 
         const auto & sample = reader->getColumns();
         Columns columns(sample.size());
-        size_t rows_read = reader->readRows(current_mark, data_part->getMarksCount(), continue_reading, rows_to_read, columns);
+        size_t rows_read = reader->readRows(current_mark, num_marks_in_part, continue_reading, rows_to_read, columns);
 
         if (rows_read)
         {
+            fillBlockNumberColumns(columns, sample, data_part->info.min_block, current_row, rows_read);
+            reader->fillVirtualColumns(columns, rows_read);
+
             current_row += rows_read;
             current_mark += (rows_to_read == rows_read);
 
             bool should_evaluate_missing_defaults = false;
-            reader->fillMissingColumns(columns, should_evaluate_missing_defaults, rows_read, data_part->info.min_block);
+            reader->fillMissingColumns(columns, should_evaluate_missing_defaults, rows_read);
 
             if (should_evaluate_missing_defaults)
-            {
                 reader->evaluateMissingDefaults({}, columns);
-            }
 
             reader->performRequiredConversions(columns);
 
@@ -224,7 +266,10 @@ try
             for (size_t i = 0; i < num_columns; ++i)
             {
                 if (header.has(it->name))
+                {
+                    columns[i]->assumeMutableRef().shrinkToFit();
                     res_columns.emplace_back(std::move(columns[i]));
+                }
 
                 ++it;
             }
@@ -273,14 +318,13 @@ Pipe createMergeTreeSequentialSource(
     bool quiet,
     std::shared_ptr<std::atomic<size_t>> filtered_rows_count)
 {
-    const auto & filter_column = LightweightDeleteDescription::FILTER_COLUMN;
 
     /// The part might have some rows masked by lightweight deletes
     const bool need_to_filter_deleted_rows = apply_deleted_mask && data_part->hasLightweightDelete();
-    const bool has_filter_column = std::ranges::find(columns_to_read, filter_column.name) != columns_to_read.end();
+    const bool has_filter_column = std::ranges::find(columns_to_read, RowExistsColumn::name) != columns_to_read.end();
 
     if (need_to_filter_deleted_rows && !has_filter_column)
-        columns_to_read.emplace_back(filter_column.name);
+        columns_to_read.emplace_back(RowExistsColumn::name);
 
     auto column_part_source = std::make_shared<MergeTreeSequentialSource>(type,
         storage, storage_snapshot, data_part, columns_to_read, std::move(mark_ranges),
@@ -294,7 +338,7 @@ Pipe createMergeTreeSequentialSource(
         pipe.addSimpleTransform([filtered_rows_count, has_filter_column](const Block & header)
         {
             return std::make_shared<FilterTransform>(
-                header, nullptr, filter_column.name, !has_filter_column, false, filtered_rows_count);
+                header, nullptr, RowExistsColumn::name, !has_filter_column, false, filtered_rows_count);
         });
     }
 
@@ -318,7 +362,7 @@ public:
         bool apply_deleted_mask_,
         ActionsDAGPtr filter_,
         ContextPtr context_,
-        Poco::Logger * log_)
+        LoggerPtr log_)
         : ISourceStep(DataStream{.header = storage_snapshot_->getSampleBlockForColumns(columns_to_read_)})
         , type(type_)
         , storage(storage_)
@@ -381,7 +425,7 @@ private:
     bool apply_deleted_mask;
     ActionsDAGPtr filter;
     ContextPtr context;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 void createReadFromPartStep(
@@ -394,7 +438,7 @@ void createReadFromPartStep(
     bool apply_deleted_mask,
     ActionsDAGPtr filter,
     ContextPtr context,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     auto reading = std::make_unique<ReadFromPart>(type,
         storage, storage_snapshot, std::move(data_part),
diff --git a/src/Storages/MergeTree/MergeTreeSequentialSource.h b/src/Storages/MergeTree/MergeTreeSequentialSource.h
index 41def48aab6..a5e36a7726f 100644
--- a/src/Storages/MergeTree/MergeTreeSequentialSource.h
+++ b/src/Storages/MergeTree/MergeTreeSequentialSource.h
@@ -41,6 +41,6 @@ void createReadFromPartStep(
     bool apply_deleted_mask,
     ActionsDAGPtr filter,
     ContextPtr context,
-    Poco::Logger * log);
+    LoggerPtr log);
 
 }
diff --git a/src/Storages/MergeTree/MergeTreeSettings.cpp b/src/Storages/MergeTree/MergeTreeSettings.cpp
index e0015cdeb40..5d6f08d3c53 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.cpp
+++ b/src/Storages/MergeTree/MergeTreeSettings.cpp
@@ -44,7 +44,7 @@ void MergeTreeSettings::loadFromConfig(const String & config_elem, const Poco::U
     }
 }
 
-void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr context)
+void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr context, bool is_attach)
 {
     if (storage_def.settings)
     {
@@ -64,8 +64,8 @@ void MergeTreeSettings::loadFromQuery(ASTStorage & storage_def, ContextPtr conte
                         auto ast = dynamic_cast<const FieldFromASTImpl &>(custom.getImpl()).ast;
                         if (ast && isDiskFunction(ast))
                         {
-                            auto disk_name = getOrCreateDiskFromDiskAST(ast, context);
-                            LOG_TRACE(&Poco::Logger::get("MergeTreeSettings"), "Created custom disk {}", disk_name);
+                            auto disk_name = getOrCreateDiskFromDiskAST(ast, context, is_attach);
+                            LOG_TRACE(getLogger("MergeTreeSettings"), "Created custom disk {}", disk_name);
                             value = disk_name;
                         }
                     }
@@ -213,6 +213,27 @@ void MergeTreeSettings::sanityCheck(size_t background_pool_tasks) const
     }
 }
 
+void MergeTreeColumnSettings::validate(const SettingsChanges & changes)
+{
+    static const MergeTreeSettings merge_tree_settings;
+    static const std::set<String> allowed_column_level_settings =
+    {
+        "min_compress_block_size",
+        "max_compress_block_size"
+    };
+
+    for (const auto & change : changes)
+    {
+        if (!allowed_column_level_settings.contains(change.name))
+            throw Exception(
+                ErrorCodes::UNKNOWN_SETTING,
+                "Setting {} is unknown or not supported at column level, supported settings: {}",
+                change.name,
+                fmt::join(allowed_column_level_settings, ", "));
+        MergeTreeSettings::checkCanSet(change.name, change.value);
+    }
+}
+
 
 std::vector<String> MergeTreeSettings::getAllRegisteredNames() const
 {
diff --git a/src/Storages/MergeTree/MergeTreeSettings.h b/src/Storages/MergeTree/MergeTreeSettings.h
index eb6c14d7754..a00508fd1c1 100644
--- a/src/Storages/MergeTree/MergeTreeSettings.h
+++ b/src/Storages/MergeTree/MergeTreeSettings.h
@@ -42,6 +42,7 @@ struct Settings;
     M(UInt64, compact_parts_max_bytes_to_buffer, 128 * 1024 * 1024, "Only available in ClickHouse Cloud", 0) \
     M(UInt64, compact_parts_max_granules_to_buffer, 128, "Only available in ClickHouse Cloud", 0) \
     M(UInt64, compact_parts_merge_max_bytes_to_prefetch_part, 16 * 1024 * 1024, "Only available in ClickHouse Cloud", 0) \
+    M(Bool, load_existing_rows_count_for_old_parts, false, "Whether to load existing_rows_count for existing parts. If false, existing_rows_count will be equal to rows_count for existing parts.", 0) \
     \
     /** Merge settings. */ \
     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) \
@@ -79,6 +80,7 @@ struct Settings;
     M(UInt64, number_of_mutations_to_throw, 1000, "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) \
+    M(Bool, exclude_deleted_rows_for_part_size_in_merge, false, "Use an estimated source part size (excluding lightweight deleted rows) when selecting parts to merge", 0) \
     \
     /** Inserts settings. */ \
     M(UInt64, parts_to_delay_insert, 1000, "If table contains at least that many active parts in single partition, artificially slow down insert into table. Disabled if set to 0", 0) \
@@ -146,6 +148,7 @@ struct Settings;
     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) \
+    M(UInt64, max_postpone_time_for_failed_mutations_ms, 5ULL * 60 * 1000, "The maximum postpone time for failed mutations.", 0) \
     \
     /** Compatibility settings */ \
     M(Bool, allow_suspicious_indices, false, "Reject primary/secondary indexes and sorting keys with identical expressions", 0) \
@@ -183,6 +186,8 @@ struct Settings;
     M(Bool, disable_freeze_partition_for_zero_copy_replication, true, "Disable FREEZE PARTITION query for zero copy replication.", 0) \
     M(Bool, disable_detach_partition_for_zero_copy_replication, true, "Disable DETACH PARTITION query for zero copy replication.", 0) \
     M(Bool, disable_fetch_partition_for_zero_copy_replication, true, "Disable FETCH PARTITION query for zero copy replication.", 0) \
+    M(Bool, enable_block_number_column, false, "Enable persisting column _block_number for each row.", 0) ALIAS(allow_experimental_block_number_column) \
+    M(Bool, enable_block_offset_column, false, "Enable persisting column _block_offset for each row.", 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) \
@@ -191,7 +196,7 @@ struct Settings;
     M(String, remote_fs_zero_copy_zookeeper_path, "/clickhouse/zero_copy", "ZooKeeper path for zero-copy table-independent info.", 0) \
     M(Bool, remote_fs_zero_copy_path_compatible_mode, false, "Run zero-copy in compatible mode during conversion process.", 0) \
     M(Bool, cache_populated_by_fetch, false, "Only available in ClickHouse Cloud", 0) \
-    M(Bool, allow_experimental_block_number_column, false, "Enable persisting column _block_number for each row.", 0) \
+    M(Bool, force_read_through_cache_for_merges, false, "Force read-through filesystem cache for merges", 0) \
     M(Bool, allow_experimental_replacing_merge_with_cleanup, false, "Allow experimental CLEANUP merges for ReplacingMergeTree with is_deleted column.", 0) \
     \
     /** Compress marks and primary key. */ \
@@ -201,7 +206,8 @@ struct Settings;
     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) \
     M(UInt64, primary_key_compress_block_size, 65536, "Primary compress block size, the actual size of the block to compress.", 0) \
-    \
+    M(Bool, primary_key_lazy_load, true, "Load primary key in memory on first use instead of on table initialization. This can save memory in the presence of a large number of tables.", 0) \
+    M(Float, primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns, 0.9f, "If the value of a column of the primary key in data part changes at least in this ratio of times, skip loading next columns in memory. This allows to save memory usage by not loading useless columns of the primary key.", 0) \
     /** Projection settings. */ \
     M(UInt64, max_projections, 25, "The maximum number of merge tree projections.", 0) \
 
@@ -255,7 +261,7 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>, public
     void loadFromConfig(const String & config_elem, const Poco::Util::AbstractConfiguration & config);
 
     /// NOTE: will rewrite the AST to add immutable settings.
-    void loadFromQuery(ASTStorage & storage_def, ContextPtr context);
+    void loadFromQuery(ASTStorage & storage_def, ContextPtr context, bool is_attach);
 
     /// We check settings after storage creation
     static bool isReadonlySetting(const String & name)
@@ -277,4 +283,11 @@ struct MergeTreeSettings : public BaseSettings<MergeTreeSettingsTraits>, public
 
 using MergeTreeSettingsPtr = std::shared_ptr<const MergeTreeSettings>;
 
+
+/// Column-level Merge-Tree settings which overwrite MergeTree settings
+namespace MergeTreeColumnSettings
+{
+    void validate(const SettingsChanges & changes);
+}
+
 }
diff --git a/src/Storages/MergeTree/MergeTreeSink.cpp b/src/Storages/MergeTree/MergeTreeSink.cpp
index 36816904a81..b7dede3cb00 100644
--- a/src/Storages/MergeTree/MergeTreeSink.cpp
+++ b/src/Storages/MergeTree/MergeTreeSink.cpp
@@ -1,5 +1,4 @@
 #include <Storages/MergeTree/MergeTreeSink.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/StorageMergeTree.h>
 #include <Interpreters/PartLog.h>
 #include <DataTypes/ObjectUtils.h>
@@ -64,7 +63,7 @@ void MergeTreeSink::consume(Chunk chunk)
     if (!storage_snapshot->object_columns.empty())
         convertDynamicColumnsToTuples(block, storage_snapshot);
 
-    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot, context);
+    auto part_blocks = MergeTreeDataWriter::splitBlockIntoParts(std::move(block), max_parts_per_block, metadata_snapshot, context);
 
     using DelayedPartitions = std::vector<MergeTreeSink::DelayedChunk::Partition>;
     DelayedPartitions partitions;
@@ -88,6 +87,10 @@ void MergeTreeSink::consume(Chunk chunk)
             elapsed_ns = watch.elapsed();
         }
 
+        /// Reset earlier to free memory
+        current_block.block.clear();
+        current_block.partition.clear();
+
         /// If optimize_on_insert setting is true, current_block could become empty after merge
         /// and we didn't create part.
         if (!temp_part.part)
@@ -109,9 +112,14 @@ void MergeTreeSink::consume(Chunk chunk)
             }
         }
 
-        size_t max_insert_delayed_streams_for_parallel_write = DEFAULT_DELAYED_STREAMS_FOR_PARALLEL_WRITE;
-        if (!support_parallel_write || settings.max_insert_delayed_streams_for_parallel_write.changed)
+        size_t max_insert_delayed_streams_for_parallel_write;
+
+        if (settings.max_insert_delayed_streams_for_parallel_write.changed)
             max_insert_delayed_streams_for_parallel_write = settings.max_insert_delayed_streams_for_parallel_write;
+        else if (support_parallel_write)
+            max_insert_delayed_streams_for_parallel_write = DEFAULT_DELAYED_STREAMS_FOR_PARALLEL_WRITE;
+        else
+            max_insert_delayed_streams_for_parallel_write = 0;
 
         /// In case of too much columns/parts in block, flush explicitly.
         streams += temp_part.streams.size();
@@ -187,7 +195,7 @@ void MergeTreeSink::finishDelayedChunk()
         {
             auto counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(partition.part_counters.getPartiallyAtomicSnapshot());
             PartLog::addNewPart(storage.getContext(), PartLog::PartLogEntry(part, partition.elapsed_ns, counters_snapshot));
-            storage.incrementInsertedPartsProfileEvent(part->getType());
+            StorageMergeTree::incrementInsertedPartsProfileEvent(part->getType());
 
             /// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
             storage.background_operations_assignee.trigger();
diff --git a/src/Storages/MergeTree/MergeTreeSource.cpp b/src/Storages/MergeTree/MergeTreeSource.cpp
index a450505f7a8..e1d1d0951e4 100644
--- a/src/Storages/MergeTree/MergeTreeSource.cpp
+++ b/src/Storages/MergeTree/MergeTreeSource.cpp
@@ -1,6 +1,6 @@
 #include <Storages/MergeTree/MergeTreeSource.h>
 #include <Storages/MergeTree/MergeTreeSelectProcessor.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <IO/SharedThreadPools.h>
 #include <Common/EventFD.h>
 
diff --git a/src/Storages/MergeTree/MergeTreeVirtualColumns.cpp b/src/Storages/MergeTree/MergeTreeVirtualColumns.cpp
new file mode 100644
index 00000000000..821724a3cfb
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeVirtualColumns.cpp
@@ -0,0 +1,59 @@
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
+#include <Storages/MergeTree/IMergeTreeDataPart.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Parsers/ASTFunction.h>
+#include <Parsers/ASTIdentifier.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
+static ASTPtr getCompressionCodecDeltaLZ4()
+{
+    return makeASTFunction("CODEC",
+        std::make_shared<ASTIdentifier>("Delta"),
+        std::make_shared<ASTIdentifier>("LZ4"));
+}
+
+const String RowExistsColumn::name = "_row_exists";
+const DataTypePtr RowExistsColumn::type = std::make_shared<DataTypeUInt8>();
+
+const String BlockNumberColumn::name = "_block_number";
+const DataTypePtr BlockNumberColumn::type = std::make_shared<DataTypeUInt64>();
+const ASTPtr BlockNumberColumn::codec = getCompressionCodecDeltaLZ4();
+
+const String BlockOffsetColumn::name = "_block_offset";
+const DataTypePtr BlockOffsetColumn::type = std::make_shared<DataTypeUInt64>();
+const ASTPtr BlockOffsetColumn::codec = getCompressionCodecDeltaLZ4();
+
+Field getFieldForConstVirtualColumn(const String & column_name, const IMergeTreeDataPart & part)
+{
+    if (column_name == RowExistsColumn::name)
+        return 1ULL;
+
+    if (column_name == BlockNumberColumn::name)
+        return part.info.min_block;
+
+    if (column_name == "_part")
+        return part.name;
+
+    if (column_name == "_part_uuid")
+        return part.uuid;
+
+    if (column_name == "_partition_id")
+        return part.info.partition_id;
+
+    if (column_name == "_part_data_version")
+        return part.info.getDataVersion();
+
+    if (column_name == "_partition_value")
+        return Tuple(part.partition.value.begin(), part.partition.value.end());
+
+    throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "Unexpected const virtual column: {}", column_name);
+}
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeVirtualColumns.h b/src/Storages/MergeTree/MergeTreeVirtualColumns.h
new file mode 100644
index 00000000000..cd9fe544ed8
--- /dev/null
+++ b/src/Storages/MergeTree/MergeTreeVirtualColumns.h
@@ -0,0 +1,33 @@
+#pragma once
+#include <Core/Types.h>
+#include <DataTypes/IDataType.h>
+#include <Parsers/IAST_fwd.h>
+
+namespace DB
+{
+
+class IMergeTreeDataPart;
+
+struct RowExistsColumn
+{
+    static const String name;
+    static const DataTypePtr type;
+};
+
+struct BlockNumberColumn
+{
+    static const String name;
+    static const DataTypePtr type;
+    static const ASTPtr codec;
+};
+
+struct BlockOffsetColumn
+{
+    static const String name;
+    static const DataTypePtr type;
+    static const ASTPtr codec;
+};
+
+Field getFieldForConstVirtualColumn(const String & column_name, const IMergeTreeDataPart & part);
+
+}
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
index 0cac051bb2c..6f1c5302b0e 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.cpp
@@ -56,7 +56,7 @@ MergeTreeWhereOptimizer::MergeTreeWhereOptimizer(
     const ConditionEstimator & estimator_,
     const Names & queried_columns_,
     const std::optional<NameSet> & supported_columns_,
-    Poco::Logger * log_)
+    LoggerPtr log_)
     : estimator(estimator_)
     , table_columns{collections::map<std::unordered_set>(
         metadata_snapshot->getColumns().getAllPhysical(), [](const NameAndTypePair & col) { return col.name; })}
@@ -112,7 +112,7 @@ void MergeTreeWhereOptimizer::optimize(SelectQueryInfo & select_query_info, cons
     LOG_DEBUG(log, "MergeTreeWhereOptimizer: condition \"{}\" moved to PREWHERE", select.prewhere()->formatForLogging(log_queries_cut_to_length));
 }
 
-std::optional<MergeTreeWhereOptimizer::FilterActionsOptimizeResult> MergeTreeWhereOptimizer::optimize(const ActionsDAGPtr & filter_dag,
+MergeTreeWhereOptimizer::FilterActionsOptimizeResult MergeTreeWhereOptimizer::optimize(const ActionsDAGPtr & filter_dag,
     const std::string & filter_column_name,
     const ContextPtr & context,
     bool is_final)
@@ -132,11 +132,19 @@ std::optional<MergeTreeWhereOptimizer::FilterActionsOptimizeResult> MergeTreeWhe
     if (!optimize_result)
         return {};
 
-    auto filter_actions = reconstructDAG(optimize_result->where_conditions, context);
-    auto prewhere_filter_actions = reconstructDAG(optimize_result->prewhere_conditions, context);
+    std::unordered_set<const ActionsDAG::Node *> prewhere_conditions;
+    std::list<const ActionsDAG::Node *> prewhere_conditions_list;
+    for (const auto & condition : optimize_result->prewhere_conditions)
+    {
+        const ActionsDAG::Node * condition_node = condition.node.getDAGNode();
+        if (prewhere_conditions.insert(condition_node).second)
+            prewhere_conditions_list.push_back(condition_node);
+    }
 
-    FilterActionsOptimizeResult result = { std::move(filter_actions), std::move(prewhere_filter_actions) };
-    return result;
+    return {
+        .prewhere_nodes = std::move(prewhere_conditions),
+        .prewhere_nodes_list = std::move(prewhere_conditions_list),
+        .fully_moved_to_prewhere = optimize_result->where_conditions.empty()};
 }
 
 static void collectColumns(const RPNBuilderTreeNode & node, const NameSet & columns_names, NameSet & result_set, bool & has_invalid_column)
@@ -343,20 +351,6 @@ ASTPtr MergeTreeWhereOptimizer::reconstructAST(const Conditions & conditions)
     return function;
 }
 
-ActionsDAGPtr MergeTreeWhereOptimizer::reconstructDAG(const Conditions & conditions, const ContextPtr & context)
-{
-    if (conditions.empty())
-        return {};
-
-    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
 {
diff --git a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
index 0ef7ac9efff..6c5ff29bc76 100644
--- a/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
+++ b/src/Storages/MergeTree/MergeTreeWhereOptimizer.h
@@ -41,17 +41,18 @@ public:
         const ConditionEstimator & estimator_,
         const Names & queried_columns_,
         const std::optional<NameSet> & supported_columns_,
-        Poco::Logger * log_);
+        LoggerPtr log_);
 
     void optimize(SelectQueryInfo & select_query_info, const ContextPtr & context) const;
 
     struct FilterActionsOptimizeResult
     {
-        ActionsDAGPtr filter_actions;
-        ActionsDAGPtr prewhere_filter_actions;
+        std::unordered_set<const ActionsDAG::Node *> prewhere_nodes;
+        std::list<const ActionsDAG::Node *> prewhere_nodes_list; /// Keep insertion order of moved prewhere_nodes
+        bool fully_moved_to_prewhere = false;
     };
 
-    std::optional<FilterActionsOptimizeResult> optimize(const ActionsDAGPtr & filter_dag,
+    FilterActionsOptimizeResult optimize(const ActionsDAGPtr & filter_dag,
         const std::string & filter_column_name,
         const ContextPtr & context,
         bool is_final);
@@ -122,9 +123,6 @@ private:
     /// 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 getColumnsSize(const NameSet & columns) const;
@@ -156,7 +154,7 @@ private:
     const std::optional<NameSet> supported_columns;
     const NameSet sorting_key_names;
     const NameToIndexMap primary_key_names_positions;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::unordered_map<std::string, UInt64> column_sizes;
     UInt64 total_size_of_queried_columns = 0;
 };
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp b/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
deleted file mode 100644
index a8b3df483ed..00000000000
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.cpp
+++ /dev/null
@@ -1,336 +0,0 @@
-#include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
-#include <Storages/MergeTree/MergeTreeData.h>
-#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 <sys/time.h>
-
-namespace DB
-{
-
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_FORMAT_VERSION;
-    extern const int CANNOT_READ_ALL_DATA;
-    extern const int BAD_DATA_PART_NAME;
-    extern const int CORRUPTED_DATA;
-}
-
-MergeTreeWriteAheadLog::MergeTreeWriteAheadLog(
-    MergeTreeData & storage_,
-    const DiskPtr & disk_,
-    const String & name_)
-    : storage(storage_)
-    , disk(disk_)
-    , name(name_)
-    , path(storage.getRelativeDataPath() + name_)
-    , pool(storage.getContext()->getSchedulePool())
-    , log(&Poco::Logger::get(storage.getLogName() + " (WriteAheadLog)"))
-{
-    init();
-    sync_task = pool.createTask("MergeTreeWriteAheadLog::sync", [this]
-    {
-        std::lock_guard lock(write_mutex);
-        out->sync();
-        sync_scheduled = false;
-        sync_cv.notify_all();
-    });
-}
-
-MergeTreeWriteAheadLog::~MergeTreeWriteAheadLog()
-{
-    try
-    {
-        shutdown();
-    }
-    catch (...)
-    {
-        tryLogCurrentException(__PRETTY_FUNCTION__);
-    }
-}
-
-
-void MergeTreeWriteAheadLog::dropAllWriteAheadLogs(DiskPtr disk_to_drop, std::string relative_data_path)
-{
-    std::vector<std::string> files;
-    disk_to_drop->listFiles(relative_data_path, files);
-    for (const auto & file : files)
-    {
-        if (file.starts_with(WAL_FILE_NAME))
-            disk_to_drop->removeFile(fs::path(relative_data_path) / file);
-    }
-}
-
-void MergeTreeWriteAheadLog::init()
-{
-    out = disk->writeFile(path, DBMS_DEFAULT_BUFFER_SIZE, WriteMode::Append);
-
-    /// Small hack: in NativeWriter header is used only in `getHeader` method.
-    /// To avoid complex logic of changing it during ALTERs we leave it empty.
-    block_out = std::make_unique<NativeWriter>(*out, 0, Block{});
-    min_block_number = std::numeric_limits<Int64>::max();
-    max_block_number = -1;
-    bytes_at_last_sync = 0;
-}
-
-void MergeTreeWriteAheadLog::dropPart(const String & part_name)
-{
-    std::unique_lock lock(write_mutex);
-
-    writeIntBinary(WAL_VERSION, *out);
-
-    ActionMetadata metadata{};
-    metadata.write(*out);
-
-    writeIntBinary(static_cast<UInt8>(ActionType::DROP_PART), *out);
-    writeStringBinary(part_name, *out);
-    out->next();
-}
-
-void MergeTreeWriteAheadLog::rotate(const std::unique_lock<std::mutex> &)
-{
-    String new_name = String(WAL_FILE_NAME) + "_"
-        + toString(min_block_number) + "_"
-        + toString(max_block_number) + WAL_FILE_EXTENSION;
-
-    /// Finalize stream before file rename
-    out->finalize();
-    disk->replaceFile(path, storage.getRelativeDataPath() + new_name);
-    init();
-}
-
-MergeTreeData::MutableDataPartsVector MergeTreeWriteAheadLog::restore(
-    const StorageMetadataPtr & metadata_snapshot,
-    ContextPtr context,
-    DataPartsLock & parts_lock,
-    bool readonly)
-{
-    std::unique_lock lock(write_mutex);
-
-    MergeTreeData::MutableDataPartsVector parts;
-    auto in = disk->readFile(path);
-    NativeReader block_in(*in, 0);
-    NameSet dropped_parts;
-
-    while (!in->eof())
-    {
-        MergeTreeData::MutableDataPartPtr part;
-        UInt8 version;
-        String part_name;
-        Block block;
-        ActionType action_type;
-
-        try
-        {
-            ActionMetadata metadata;
-
-            readIntBinary(version, *in);
-            if (version > 0)
-            {
-                metadata.read(*in);
-            }
-
-            readIntBinary(action_type, *in);
-            readStringBinary(part_name, *in);
-
-            if (action_type == ActionType::DROP_PART)
-            {
-                dropped_parts.insert(part_name);
-            }
-            else if (action_type == ActionType::ADD_PART)
-            {
-                auto single_disk_volume = std::make_shared<SingleDiskVolume>("volume_" + part_name, disk, 0);
-
-                part = storage.getDataPartBuilder(part_name, single_disk_volume, part_name)
-                    .withPartType(MergeTreeDataPartType::InMemory)
-                    .withPartStorageType(MergeTreeDataPartStorageType::Full)
-                    .build();
-
-                part->uuid = metadata.part_uuid;
-                block = block_in.read();
-
-                if (storage.getActiveContainingPart(part->info, MergeTreeDataPartState::Active, parts_lock))
-                    continue;
-            }
-            else
-            {
-                throw Exception(ErrorCodes::CORRUPTED_DATA, "Unknown action type: {}", toString(static_cast<UInt8>(action_type)));
-            }
-        }
-        catch (const Exception & e)
-        {
-            if (e.code() == ErrorCodes::CANNOT_READ_ALL_DATA
-                || e.code() == ErrorCodes::UNKNOWN_FORMAT_VERSION
-                || e.code() == ErrorCodes::BAD_DATA_PART_NAME
-                || e.code() == ErrorCodes::CORRUPTED_DATA)
-            {
-                LOG_WARNING(log, "WAL file '{}' is broken. {}", path, e.displayText());
-
-                /// If file is broken, do not write new parts to it.
-                /// But if it contains any part rotate and save them.
-                if (max_block_number == -1)
-                {
-                    if (!readonly)
-                        disk->removeFile(path);
-                }
-                else if (name == DEFAULT_WAL_FILE_NAME)
-                    rotate(lock);
-
-                break;
-            }
-            throw;
-        }
-
-        if (action_type == ActionType::ADD_PART)
-        {
-            MergedBlockOutputStream part_out(
-                part,
-                metadata_snapshot,
-                block.getNamesAndTypesList(),
-                {}, {},
-                CompressionCodecFactory::instance().get("NONE", {}),
-                NO_TRANSACTION_PTR);
-
-            part->minmax_idx->update(block, storage.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey()));
-            part->partition.create(metadata_snapshot, block, 0, context);
-            part->setColumns(block.getNamesAndTypesList(), {}, metadata_snapshot->getMetadataVersion());
-            if (metadata_snapshot->hasSortingKey())
-                metadata_snapshot->getSortingKey().expression->execute(block);
-
-            part_out.write(block);
-
-            for (const auto & projection : metadata_snapshot->getProjections())
-            {
-                auto projection_block = projection.calculate(block, context);
-                auto temp_part = MergeTreeDataWriter::writeProjectionPart(storage, log, projection_block, projection, part.get());
-                temp_part.finalize();
-                if (projection_block.rows())
-                    part->addProjectionPart(projection.name, std::move(temp_part.part));
-            }
-
-            part_out.finalizePart(part, false);
-
-            min_block_number = std::min(min_block_number, part->info.min_block);
-            max_block_number = std::max(max_block_number, part->info.max_block);
-            parts.push_back(std::move(part));
-        }
-    }
-
-    MergeTreeData::MutableDataPartsVector result;
-    std::copy_if(parts.begin(), parts.end(), std::back_inserter(result),
-        [&dropped_parts](const auto & part) { return dropped_parts.count(part->name) == 0; });
-
-    /// All parts in WAL had been already committed into the disk -> clear the WAL
-    if (!readonly && result.empty())
-    {
-        LOG_DEBUG(log, "WAL file '{}' had been completely processed. Removing.", path);
-        disk->removeFile(path);
-        init();
-        return {};
-    }
-
-    return result;
-}
-
-void MergeTreeWriteAheadLog::shutdown()
-{
-    {
-        std::unique_lock lock(write_mutex);
-        if (shutdown_called)
-             return;
-
-        if (sync_scheduled)
-            sync_cv.wait(lock, [this] { return !sync_scheduled; });
-
-        shutdown_called = true;
-        out->finalize();
-        out.reset();
-    }
-
-    /// Do it without lock, otherwise inversion between pool lock and write_mutex is possible
-    sync_task->deactivate();
-}
-
-std::optional<MergeTreeWriteAheadLog::MinMaxBlockNumber>
-MergeTreeWriteAheadLog::tryParseMinMaxBlockNumber(const String & filename)
-{
-    Int64 min_block;
-    Int64 max_block;
-    ReadBufferFromString in(filename);
-    if (!checkString(WAL_FILE_NAME, in)
-        || !checkChar('_', in)
-        || !tryReadIntText(min_block, in)
-        || !checkChar('_', in)
-        || !tryReadIntText(max_block, in))
-    {
-        return {};
-    }
-
-    return std::make_pair(min_block, max_block);
-}
-
-String MergeTreeWriteAheadLog::ActionMetadata::toJSON() const
-{
-    Poco::JSON::Object json;
-
-    if (part_uuid != UUIDHelpers::Nil)
-        json.set(JSON_KEY_PART_UUID, toString(part_uuid));
-
-    std::ostringstream oss; // STYLE_CHECK_ALLOW_STD_STRING_STREAM
-    oss.exceptions(std::ios::failbit);
-    json.stringify(oss);
-
-    return oss.str();
-}
-
-void MergeTreeWriteAheadLog::ActionMetadata::fromJSON(const String & buf)
-{
-    Poco::JSON::Parser parser;
-    auto json = parser.parse(buf).extract<Poco::JSON::Object::Ptr>();
-
-    if (json->has(JSON_KEY_PART_UUID))
-        part_uuid = parseFromString<UUID>(json->getValue<std::string>(JSON_KEY_PART_UUID));
-}
-
-void MergeTreeWriteAheadLog::ActionMetadata::read(ReadBuffer & meta_in)
-{
-    readIntBinary(min_compatible_version, meta_in);
-    if (min_compatible_version > WAL_VERSION)
-        throw Exception(ErrorCodes::UNKNOWN_FORMAT_VERSION,
-                        "WAL metadata version {} is not compatible with this ClickHouse version",
-                        toString(min_compatible_version));
-
-    size_t metadata_size;
-    readVarUInt(metadata_size, meta_in);
-
-    if (metadata_size == 0)
-        return;
-
-    String buf(metadata_size, ' ');
-    meta_in.readStrict(buf.data(), metadata_size);
-
-    fromJSON(buf);
-}
-
-void MergeTreeWriteAheadLog::ActionMetadata::write(WriteBuffer & meta_out) const
-{
-    writeIntBinary(min_compatible_version, meta_out);
-
-    String ser_meta = toJSON();
-
-    writeVarUInt(static_cast<UInt32>(ser_meta.length()), meta_out);
-    writeString(ser_meta, meta_out);
-}
-
-}
diff --git a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h b/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
deleted file mode 100644
index 5fb9dd907a1..00000000000
--- a/src/Storages/MergeTree/MergeTreeWriteAheadLog.h
+++ /dev/null
@@ -1,105 +0,0 @@
-#pragma once
-
-#include <Formats/NativeReader.h>
-#include <Formats/NativeWriter.h>
-#include <Core/BackgroundSchedulePool.h>
-#include <Disks/IDisk.h>
-#include <Storages/MergeTree/IMergeTreeDataPart.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
-
-namespace DB
-{
-
-class MergeTreeData;
-struct DataPartsLock;
-
-/** WAL stores addditions and removals of data parts in in-memory format.
-  * Format of data in WAL:
-  * - version
-  * - type of action (ADD or DROP)
-  * - part name
-  * - part's block in Native format. (for ADD action)
-  */
-class MergeTreeWriteAheadLog
-{
-public:
-    /// Append-only enum. It is serialized to WAL
-    enum class ActionType : UInt8
-    {
-        ADD_PART = 0,
-        DROP_PART = 1,
-    };
-
-    struct ActionMetadata
-    {
-        /// The minimum version of WAL reader that can understand metadata written by current ClickHouse version.
-        /// This field must be increased when making backwards incompatible changes.
-        ///
-        /// The same approach can be used recursively inside metadata.
-        UInt8 min_compatible_version = 0;
-
-        /// Actual metadata.
-        UUID part_uuid = UUIDHelpers::Nil;
-
-        void write(WriteBuffer & meta_out) const;
-        void read(ReadBuffer & meta_in);
-
-    private:
-        static constexpr auto JSON_KEY_PART_UUID = "part_uuid";
-
-        String toJSON() const;
-        void fromJSON(const String & buf);
-    };
-
-    constexpr static UInt8 WAL_VERSION = 1;
-    constexpr static auto WAL_FILE_NAME = "wal";
-    constexpr static auto WAL_FILE_EXTENSION = ".bin";
-    constexpr static auto DEFAULT_WAL_FILE_NAME = "wal.bin";
-
-    MergeTreeWriteAheadLog(MergeTreeData & storage_, const DiskPtr & disk_,
-        const String & name = DEFAULT_WAL_FILE_NAME);
-
-    ~MergeTreeWriteAheadLog();
-
-    void dropPart(const String & part_name);
-    std::vector<MergeTreeMutableDataPartPtr> restore(
-        const StorageMetadataPtr & metadata_snapshot,
-        ContextPtr context,
-        DataPartsLock & parts_lock,
-        bool readonly);
-
-    using MinMaxBlockNumber = std::pair<Int64, Int64>;
-    static std::optional<MinMaxBlockNumber> tryParseMinMaxBlockNumber(const String & filename);
-    void shutdown();
-
-    /// Drop all write ahead logs from disk. Useful during table drop.
-    static void dropAllWriteAheadLogs(DiskPtr disk_to_drop, std::string relative_data_path);
-private:
-    void init();
-    void rotate(const std::unique_lock<std::mutex> & lock);
-
-    const MergeTreeData & storage;
-    DiskPtr disk;
-    String name;
-    String path;
-
-    std::unique_ptr<WriteBuffer> out;
-    std::unique_ptr<NativeWriter> block_out;
-
-    Int64 min_block_number = std::numeric_limits<Int64>::max();
-    Int64 max_block_number = -1;
-
-    BackgroundSchedulePool & pool;
-    BackgroundSchedulePoolTaskHolder sync_task;
-    std::condition_variable sync_cv;
-
-    size_t bytes_at_last_sync = 0;
-    bool sync_scheduled = false;
-    bool shutdown_called = false;
-
-    mutable std::mutex write_mutex;
-
-    Poco::Logger * log;
-};
-
-}
diff --git a/src/Storages/MergeTree/MergedBlockOutputStream.cpp b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
index 8b34c221eec..d8555d69788 100644
--- a/src/Storages/MergeTree/MergedBlockOutputStream.cpp
+++ b/src/Storages/MergeTree/MergedBlockOutputStream.cpp
@@ -155,7 +155,7 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
     for (const auto & name : checksums_to_remove)
         checksums.files.erase(name);
 
-    LOG_TRACE(&Poco::Logger::get("MergedBlockOutputStream"), "filled checksums {}", new_part->getNameWithState());
+    LOG_TRACE(getLogger("MergedBlockOutputStream"), "filled checksums {}", new_part->getNameWithState());
 
     for (const auto & [projection_name, projection_part] : new_part->getProjectionParts())
         checksums.addFile(
@@ -181,13 +181,18 @@ MergedBlockOutputStream::Finalizer MergedBlockOutputStream::finalizePartAsync(
 
     new_part->rows_count = rows_count;
     new_part->modification_time = time(nullptr);
-    new_part->index = writer->releaseIndexColumns();
+    new_part->setIndex(writer->releaseIndexColumns());
     new_part->checksums = checksums;
     new_part->setBytesOnDisk(checksums.getTotalSizeOnDisk());
     new_part->setBytesUncompressedOnDisk(checksums.getTotalSizeUncompressedOnDisk());
     new_part->index_granularity = writer->getIndexGranularity();
     new_part->calculateColumnsAndSecondaryIndicesSizesOnDisk();
 
+    /// In mutation, existing_rows_count is already calculated in PartMergerWriter
+    /// In merge situation, lightweight deleted rows was physically deleted, existing_rows_count equals rows_count
+    if (!new_part->existing_rows_count.has_value())
+        new_part->existing_rows_count = rows_count;
+
     if (default_codec != nullptr)
         new_part->default_codec = default_codec;
 
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
index a9ff687fe4d..3415b08cebb 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.cpp
@@ -20,6 +20,22 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
     const auto storage_settings_ptr = storage.getSettings();
     LOG_TRACE(log, "Executing log entry to mutate part {} to {}", source_part_name, entry.new_part_name);
 
+    new_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version);
+
+    future_mutated_part = std::make_shared<FutureMergedMutatedPart>();
+    future_mutated_part->name = entry.new_part_name;
+    future_mutated_part->uuid = entry.new_part_uuid;
+    future_mutated_part->part_info = new_part_info;
+
+    stopwatch_ptr = std::make_unique<Stopwatch>();
+    auto part_log_writer = [this](const ExecutionStatus & execution_status)
+    {
+        auto profile_counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(profile_counters.getPartiallyAtomicSnapshot());
+        storage.writePartLog(
+            PartLogElement::MUTATE_PART, execution_status, stopwatch_ptr->elapsed(),
+            entry.new_part_name, new_part, future_mutated_part->parts, merge_mutate_entry.get(), std::move(profile_counters_snapshot));
+    };
+
     MergeTreeData::DataPartPtr source_part = storage.getActiveContainingPart(source_part_name);
     if (!source_part)
     {
@@ -29,10 +45,13 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
         return PrepareResult{
             .prepared_successfully = false,
             .need_to_check_missing_part_in_fetch = true,
-            .part_log_writer = {}
+            .part_log_writer = part_log_writer,
         };
     }
 
+    future_mutated_part->parts.push_back(source_part);
+    future_mutated_part->part_format = source_part->getFormat();
+
     if (source_part->name != source_part_name)
     {
         LOG_WARNING(log,
@@ -44,12 +63,12 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
         return PrepareResult{
             .prepared_successfully = false,
             .need_to_check_missing_part_in_fetch = true,
-            .part_log_writer = {}
+            .part_log_writer = part_log_writer,
         };
     }
 
     /// TODO - some better heuristic?
-    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part});
+    size_t estimated_space_for_result = MergeTreeDataMergerMutator::estimateNeededDiskSpace({source_part}, false);
 
     if (entry.create_time + storage_settings_ptr->prefer_fetch_merged_part_time_threshold.totalSeconds() <= time(nullptr)
         && estimated_space_for_result >= storage_settings_ptr->prefer_fetch_merged_part_size_threshold)
@@ -63,7 +82,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = true,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
         }
     }
@@ -84,13 +103,12 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
             return PrepareResult{
                 .prepared_successfully = false,
                 .need_to_check_missing_part_in_fetch = true,
-                .part_log_writer = {}
+                .part_log_writer = part_log_writer,
             };
 
         }
     }
 
-    new_part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, storage.format_version);
     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 ({}): {}",
@@ -98,7 +116,8 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
 
     /// Once we mutate part, we must reserve space on the same disk, because mutations can possibly create hardlinks.
     /// Can throw an exception.
-    reserved_space = storage.reserveSpace(estimated_space_for_result, source_part->getDataPartStorage());
+    reserved_space = StorageReplicatedMergeTree::reserveSpace(estimated_space_for_result, source_part->getDataPartStorage());
+    future_mutated_part->updatePath(storage, reserved_space.get());
 
     table_lock_holder = storage.lockForShare(
             RWLockImpl::NO_QUERY, storage_settings_ptr->lock_acquire_timeout_for_background_operations);
@@ -106,14 +125,6 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
 
     transaction_ptr = std::make_unique<MergeTreeData::Transaction>(storage, NO_TRANSACTION_RAW);
 
-    future_mutated_part = std::make_shared<FutureMergedMutatedPart>();
-    future_mutated_part->name = entry.new_part_name;
-    future_mutated_part->uuid = entry.new_part_uuid;
-    future_mutated_part->parts.push_back(source_part);
-    future_mutated_part->part_info = new_part_info;
-    future_mutated_part->updatePath(storage, reserved_space.get());
-    future_mutated_part->part_format = source_part->getFormat();
-
     if (storage_settings_ptr->allow_remote_fs_zero_copy_replication)
     {
         if (auto disk = reserved_space->getDisk(); disk->supportZeroCopyReplication())
@@ -124,7 +135,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = true,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
 
@@ -163,7 +174,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = false,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
             else if (storage.findReplicaHavingCoveringPart(entry.new_part_name, /* active */ false))
@@ -182,7 +193,7 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
                 return PrepareResult{
                     .prepared_successfully = false,
                     .need_to_check_missing_part_in_fetch = true,
-                    .part_log_writer = {}
+                    .part_log_writer = part_log_writer,
                 };
             }
             else
@@ -201,8 +212,6 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
         future_mutated_part,
         task_context);
 
-    stopwatch_ptr = std::make_unique<Stopwatch>();
-
     mutate_task = storage.merger_mutator.mutatePartToTemporaryPart(
             future_mutated_part, metadata_snapshot, commands, merge_mutate_entry.get(),
             entry.create_time, task_context, NO_TRANSACTION_PTR, reserved_space, table_lock_holder);
@@ -211,13 +220,11 @@ ReplicatedMergeMutateTaskBase::PrepareResult MutateFromLogEntryTask::prepare()
     for (auto & item : future_mutated_part->parts)
         priority.value += item->getBytesOnDisk();
 
-    return {true, true, [this] (const ExecutionStatus & execution_status)
-    {
-        auto profile_counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(profile_counters.getPartiallyAtomicSnapshot());
-        storage.writePartLog(
-            PartLogElement::MUTATE_PART, execution_status, stopwatch_ptr->elapsed(),
-            entry.new_part_name, new_part, future_mutated_part->parts, merge_mutate_entry.get(), std::move(profile_counters_snapshot));
-    }};
+    return PrepareResult{
+        .prepared_successfully = true,
+        .need_to_check_missing_part_in_fetch = true,
+        .part_log_writer = part_log_writer,
+    };
 }
 
 
diff --git a/src/Storages/MergeTree/MutateFromLogEntryTask.h b/src/Storages/MergeTree/MutateFromLogEntryTask.h
index 42d8307e948..68c7f464214 100644
--- a/src/Storages/MergeTree/MutateFromLogEntryTask.h
+++ b/src/Storages/MergeTree/MutateFromLogEntryTask.h
@@ -23,7 +23,7 @@ public:
         StorageReplicatedMergeTree & storage_,
         Callback && task_result_callback_)
         : ReplicatedMergeMutateTaskBase(
-            &Poco::Logger::get(storage_.getStorageID().getShortName() + "::" + selected_entry_->log_entry->new_part_name + " (MutateFromLogEntryTask)"),
+            getLogger(storage_.getStorageID().getShortName() + "::" + selected_entry_->log_entry->new_part_name + " (MutateFromLogEntryTask)"),
             storage_,
             selected_entry_,
             task_result_callback_)
diff --git a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
index bf8e879e3d0..0b19aebe36d 100644
--- a/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
+++ b/src/Storages/MergeTree/MutatePlainMergeTreeTask.cpp
@@ -111,7 +111,7 @@ bool MutatePlainMergeTreeTask::executeStep()
                 if (merge_mutate_entry->txn)
                     merge_mutate_entry->txn->onException();
                 PreformattedMessage exception_message = getCurrentExceptionMessageAndPattern(/* with_stacktrace */ false);
-                LOG_ERROR(&Poco::Logger::get("MutatePlainMergeTreeTask"), exception_message);
+                LOG_ERROR(getLogger("MutatePlainMergeTreeTask"), exception_message);
                 storage.updateMutationEntriesErrors(future_part, false, exception_message.text);
                 write_part_log(ExecutionStatus::fromCurrentException("", true));
                 tryLogCurrentException(__PRETTY_FUNCTION__);
diff --git a/src/Storages/MergeTree/MutateTask.cpp b/src/Storages/MergeTree/MutateTask.cpp
index e4070aa8262..a971c4fda1c 100644
--- a/src/Storages/MergeTree/MutateTask.cpp
+++ b/src/Storages/MergeTree/MutateTask.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/queryToString.h>
 #include <Interpreters/SquashingTransform.h>
 #include <Interpreters/MergeTreeTransaction.h>
+#include <Interpreters/PreparedSets.h>
 #include <Processors/Transforms/TTLTransform.h>
 #include <Processors/Transforms/TTLCalcTransform.h>
 #include <Processors/Transforms/DistinctSortedTransform.h>
@@ -16,16 +17,24 @@
 #include <Processors/Transforms/ExpressionTransform.h>
 #include <Processors/Transforms/MaterializingTransform.h>
 #include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/QueryPlan/CreatingSetsStep.h>
 #include <Storages/MergeTree/StorageFromMergeTreeDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataWriter.h>
 #include <Storages/MutationCommands.h>
 #include <Storages/MergeTree/MergeTreeDataMergerMutator.h>
 #include <Storages/MergeTree/MergeTreeIndexInverted.h>
+#include <Storages/MergeTree/MergeTreeVirtualColumns.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeVariant.h>
 #include <boost/algorithm/string/replace.hpp>
 #include <Common/ProfileEventsScope.h>
 
 
+namespace ProfileEvents
+{
+extern const Event MutateTaskProjectionsCalculationMicroseconds;
+}
+
 namespace CurrentMetrics
 {
     extern const Metric PartMutation;
@@ -51,6 +60,26 @@ static bool checkOperationIsNotCanceled(ActionBlocker & merges_blocker, MergeLis
     return true;
 }
 
+static UInt64 getExistingRowsCount(const Block & block)
+{
+    auto column = block.getByName(RowExistsColumn::name).column;
+    const ColumnUInt8 * row_exists_col = typeid_cast<const ColumnUInt8 *>(column.get());
+
+    if (!row_exists_col)
+    {
+        LOG_WARNING(&Poco::Logger::get("MutationHelpers::getExistingRowsCount"), "_row_exists column type is not UInt8");
+        return block.rows();
+    }
+
+    UInt64 existing_count = 0;
+
+    for (UInt8 row_exists : row_exists_col->getData())
+        if (row_exists)
+            existing_count++;
+
+    return existing_count;
+}
+
 /** Split mutation commands into two parts:
 *   First part should be executed by mutations interpreter.
 *   Other is just simple drop/renames, so they can be executed without interpreter.
@@ -61,9 +90,10 @@ static void splitAndModifyMutationCommands(
     const MutationCommands & commands,
     MutationCommands & for_interpreter,
     MutationCommands & for_file_renames,
-    Poco::Logger * log)
+    LoggerPtr log)
 {
     auto part_columns = part->getColumnsDescription();
+    const auto & table_columns = metadata_snapshot->getColumns();
 
     if (!isWidePart(part) || !isFullPartStorage(part->getDataPartStorage()))
     {
@@ -72,9 +102,19 @@ static void splitAndModifyMutationCommands(
 
         for (const auto & command : commands)
         {
+            if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+            {
+                /// For ordinary column with default or materialized expression, MATERIALIZE COLUMN should not override past values
+                /// So we only mutate column if `command.column_name` is a default/materialized column or if the part does not have physical column file
+                auto column_ordinary = table_columns.getOrdinary().tryGetByName(command.column_name);
+                if (!column_ordinary || !part->tryGetColumn(command.column_name) || !part->hasColumnFiles(*column_ordinary))
+                {
+                    for_interpreter.push_back(command);
+                    mutated_columns.emplace(command.column_name);
+                }
+            }
             if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
                 || command.type == MutationCommand::Type::MATERIALIZE_STATISTIC
-                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
                 || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
                 || command.type == MutationCommand::Type::DELETE
@@ -84,9 +124,6 @@ static void splitAndModifyMutationCommands(
                 for_interpreter.push_back(command);
                 for (const auto & [column_name, expr] : command.column_to_update_expression)
                     mutated_columns.emplace(column_name);
-
-                if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
-                    mutated_columns.emplace(command.column_name);
             }
             else if (command.type == MutationCommand::Type::DROP_INDEX
                      || command.type == MutationCommand::Type::DROP_PROJECTION
@@ -151,7 +188,7 @@ static void splitAndModifyMutationCommands(
         {
             if (!mutated_columns.contains(column.name))
             {
-                if (!metadata_snapshot->getColumns().has(column.name) && !part->storage.getVirtuals().contains(column.name))
+                if (!metadata_snapshot->getColumns().has(column.name) && !part->storage.getVirtualsPtr()->has(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
@@ -196,8 +233,15 @@ static void splitAndModifyMutationCommands(
     {
         for (const auto & command : commands)
         {
-            if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
-                || command.type == MutationCommand::Type::MATERIALIZE_COLUMN
+            if (command.type == MutationCommand::Type::MATERIALIZE_COLUMN)
+            {
+                /// For ordinary column with default or materialized expression, MATERIALIZE COLUMN should not override past values
+                /// So we only mutate column if `command.column_name` is a default/materialized column or if the part does not have physical column file
+                auto column_ordinary = table_columns.getOrdinary().tryGetByName(command.column_name);
+                if (!column_ordinary || !part->tryGetColumn(command.column_name) || !part->hasColumnFiles(*column_ordinary))
+                    for_interpreter.push_back(command);
+            }
+            else if (command.type == MutationCommand::Type::MATERIALIZE_INDEX
                 || command.type == MutationCommand::Type::MATERIALIZE_STATISTIC
                 || command.type == MutationCommand::Type::MATERIALIZE_PROJECTION
                 || command.type == MutationCommand::Type::MATERIALIZE_TTL
@@ -259,7 +303,6 @@ getColumnsForNewDataPart(
     ColumnsDescription part_columns(source_part->getColumns());
     NamesAndTypesList system_columns;
 
-    const auto & deleted_mask_column = LightweightDeleteDescription::FILTER_COLUMN;
     bool supports_lightweight_deletes = source_part->supportLightweightDeleteMutate();
 
     bool deleted_mask_updated = false;
@@ -275,9 +318,9 @@ getColumnsForNewDataPart(
         {
             for (const auto & [column_name, _] : command.column_to_update_expression)
             {
-                if (column_name == deleted_mask_column.name
+                if (column_name == RowExistsColumn::name
                     && supports_lightweight_deletes
-                    && !storage_columns_set.contains(deleted_mask_column.name))
+                    && !storage_columns_set.contains(RowExistsColumn::name))
                     deleted_mask_updated = true;
             }
         }
@@ -299,12 +342,23 @@ getColumnsForNewDataPart(
         }
     }
 
-    if (!storage_columns_set.contains(deleted_mask_column.name))
+    auto persistent_virtuals = source_part->storage.getVirtualsPtr()->getNamesAndTypesList(VirtualsKind::Persistent);
+
+    for (const auto & [name, type] : persistent_virtuals)
     {
-        if (deleted_mask_updated || (part_columns.has(deleted_mask_column.name) && !has_delete_command))
+        if (storage_columns_set.contains(name))
+            continue;
+
+        bool need_column = false;
+        if (name == RowExistsColumn::name)
+            need_column = deleted_mask_updated || (part_columns.has(name) && !has_delete_command);
+        else
+            need_column = part_columns.has(name);
+
+        if (need_column)
         {
-            storage_columns.push_back(deleted_mask_column);
-            storage_columns_set.insert(deleted_mask_column.name);
+            storage_columns.emplace_back(name, type);
+            storage_columns_set.insert(name);
         }
     }
 
@@ -540,7 +594,9 @@ static std::set<ProjectionDescriptionRawPtr> getProjectionsToRecalculate(
     {
         bool need_recalculate =
             materialized_projections.contains(projection.name)
-            || (!is_full_part_storage && source_part->hasProjection(projection.name));
+            || (!is_full_part_storage
+                && source_part->hasProjection(projection.name)
+                && !source_part->hasBrokenProjection(projection.name));
 
         if (need_recalculate)
             projections_to_recalc.insert(&projection);
@@ -674,15 +730,25 @@ static NameToNameVector collectFilesForRenames(
     {
         if (command.type == MutationCommand::Type::DROP_INDEX)
         {
-            if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx2"))
+            static const std::array<String, 2> suffixes = {".idx2", ".idx"};
+            static const std::array<String, 4> gin_suffixes = {".gin_dict", ".gin_post", ".gin_seg", ".gin_sid"}; /// .gin_* is inverted index
+
+            for (const auto & suffix : suffixes)
             {
-                add_rename(INDEX_FILE_PREFIX + command.column_name + ".idx2", "");
-                add_rename(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+                const String filename = INDEX_FILE_PREFIX + command.column_name + suffix;
+                const String filename_mrk = INDEX_FILE_PREFIX + command.column_name + mrk_extension;
+
+                if (source_part->checksums.has(filename))
+                {
+                    add_rename(filename, "");
+                    add_rename(filename_mrk, "");
+                }
             }
-            else if (source_part->checksums.has(INDEX_FILE_PREFIX + command.column_name + ".idx"))
+            for (const auto & gin_suffix : gin_suffixes)
             {
-                add_rename(INDEX_FILE_PREFIX + command.column_name + ".idx", "");
-                add_rename(INDEX_FILE_PREFIX + command.column_name + mrk_extension, "");
+                const String filename = INDEX_FILE_PREFIX + command.column_name + gin_suffix;
+                if (source_part->checksums.has(filename))
+                    add_rename(filename, "");
             }
         }
         else if (command.type == MutationCommand::Type::DROP_PROJECTION)
@@ -869,12 +935,13 @@ void finalizeMutatedPart(
 
     new_data_part->rows_count = source_part->rows_count;
     new_data_part->index_granularity = source_part->index_granularity;
-    new_data_part->index = source_part->index;
+    new_data_part->setIndex(source_part->getIndex());
     new_data_part->minmax_idx = source_part->minmax_idx;
     new_data_part->modification_time = time(nullptr);
 
     /// Load rest projections which are hardlinked
-    new_data_part->loadProjections(false, false, true /* if_not_loaded */);
+    bool noop;
+    new_data_part->loadProjections(false, false, noop, true /* if_not_loaded */);
 
     /// All information about sizes is stored in checksums.
     /// It doesn't make sense to touch filesystem for sizes.
@@ -896,7 +963,7 @@ struct MutationContext
     TableLockHolder * holder;
     MergeListEntry * mutate_entry;
 
-    Poco::Logger * log{&Poco::Logger::get("MutateTask")};
+    LoggerPtr log{getLogger("MutateTask")};
 
     FutureMergedMutatedPartPtr future_part;
     MergeTreeData::DataPartPtr source_part;
@@ -913,13 +980,13 @@ struct MutationContext
 
     QueryPipelineBuilder mutating_pipeline_builder;
     QueryPipeline mutating_pipeline; // in
-    std::unique_ptr<PullingPipelineExecutor> mutating_executor{nullptr};
+    std::unique_ptr<PullingPipelineExecutor> mutating_executor;
     ProgressCallback progress_callback;
     Block updated_header;
 
     std::unique_ptr<MutationsInterpreter> interpreter;
-    UInt64 watch_prev_elapsed{0};
-    std::unique_ptr<MergeStageProgress> stage_progress{nullptr};
+    UInt64 watch_prev_elapsed = 0;
+    std::unique_ptr<MergeStageProgress> stage_progress;
 
     MutationCommands commands_for_part;
     MutationCommands for_interpreter;
@@ -931,12 +998,12 @@ struct MutationContext
     NameSet materialized_statistics;
 
     MergeTreeData::MutableDataPartPtr new_data_part;
-    IMergedBlockOutputStreamPtr out{nullptr};
+    IMergedBlockOutputStreamPtr out;
 
     String mrk_extension;
 
     std::vector<ProjectionDescriptionRawPtr> projections_to_build;
-    IMergeTreeDataPart::MinMaxIndexPtr minmax_idx{nullptr};
+    IMergeTreeDataPart::MinMaxIndexPtr minmax_idx;
 
     std::set<MergeTreeIndexPtr> indices_to_recalc;
     std::set<StatisticPtr> stats_to_recalc;
@@ -955,6 +1022,9 @@ struct MutationContext
     bool need_prefix = true;
 
     scope_guard temporary_directory_lock;
+
+    /// Whether we need to count lightweight delete rows in this mutation
+    bool count_lightweight_deleted_rows;
 };
 
 using MutationContextPtr = std::shared_ptr<MutationContext>;
@@ -975,7 +1045,7 @@ public:
         , projection(projection_)
         , block_num(block_num_)
         , ctx(ctx_)
-        , log(&Poco::Logger::get("MergeProjectionPartsTask"))
+        , log(getLogger("MergeProjectionPartsTask"))
         {
             LOG_DEBUG(log, "Selected {} projection_parts from {} to {}", parts.size(), parts.front()->name, parts.back()->name);
             level_parts[current_level] = std::move(parts);
@@ -1079,7 +1149,7 @@ private:
     size_t & block_num;
     MutationContextPtr ctx;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::map<size_t, MergeTreeData::MutableDataPartsVector> level_parts;
     size_t current_level = 0;
@@ -1149,6 +1219,7 @@ public:
             }
             case State::SUCCESS:
             {
+                finalize();
                 return false;
             }
         }
@@ -1184,6 +1255,11 @@ private:
     const ProjectionsDescription & projections;
 
     ExecutableTaskPtr merge_projection_parts_task_ptr;
+
+    /// Existing rows count calculated during part writing.
+    /// It is initialized in prepare(), calculated in mutateOriginalPartAndPrepareProjections()
+    /// and set to new_data_part in finalize()
+    size_t existing_rows_count;
 };
 
 
@@ -1193,15 +1269,11 @@ void PartMergerWriter::prepare()
 
     for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
     {
-        // If the parent part is an in-memory part, squash projection output into one block and
-        // build in-memory projection because we don't support merging into a new in-memory part.
-        // Otherwise we split the materialization into multiple stages similar to the process of
-        // INSERT SELECT query.
-        if (ctx->new_data_part->getType() == MergeTreeDataPartType::InMemory)
-            projection_squashes.emplace_back(0, 0);
-        else
-            projection_squashes.emplace_back(settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
+        // We split the materialization into multiple stages similar to the process of INSERT SELECT query.
+        projection_squashes.emplace_back(settings.min_insert_block_size_rows, settings.min_insert_block_size_bytes);
     }
+
+    existing_rows_count = 0;
 }
 
 
@@ -1211,14 +1283,24 @@ bool PartMergerWriter::mutateOriginalPartAndPrepareProjections()
     if (MutationHelpers::checkOperationIsNotCanceled(*ctx->merges_blocker, ctx->mutate_entry) && ctx->mutating_executor->pull(cur_block))
     {
         if (ctx->minmax_idx)
-            ctx->minmax_idx->update(cur_block, ctx->data->getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
+            ctx->minmax_idx->update(cur_block, MergeTreeData::getMinMaxColumnsNames(ctx->metadata_snapshot->getPartitionKey()));
 
         ctx->out->write(cur_block);
 
+        /// TODO: move this calculation to DELETE FROM mutation
+        if (ctx->count_lightweight_deleted_rows)
+            existing_rows_count += MutationHelpers::getExistingRowsCount(cur_block);
+
         for (size_t i = 0, size = ctx->projections_to_build.size(); i < size; ++i)
         {
             const auto & projection = *ctx->projections_to_build[i];
-            auto projection_block = projection_squashes[i].add(projection.calculate(cur_block, ctx->context));
+
+            Block projection_block;
+            {
+                ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::MutateTaskProjectionsCalculationMicroseconds);
+                projection_block = projection_squashes[i].add(projection.calculate(cur_block, ctx->context));
+            }
+
             if (projection_block)
             {
                 auto tmp_part = MergeTreeDataWriter::writeTempProjectionPart(
@@ -1298,6 +1380,12 @@ bool PartMergerWriter::iterateThroughAllProjections()
     return true;
 }
 
+void PartMergerWriter::finalize()
+{
+    if (ctx->count_lightweight_deleted_rows)
+        ctx->new_data_part->existing_rows_count = existing_rows_count;
+}
+
 class MutateAllPartColumnsTask : public IExecutableTask
 {
 public:
@@ -1451,7 +1539,9 @@ private:
 
             bool need_recalculate =
                 ctx->materialized_projections.contains(projection.name)
-                || (!is_full_part_storage && ctx->source_part->hasProjection(projection.name));
+                || (!is_full_part_storage
+                    && ctx->source_part->hasProjection(projection.name)
+                    && !ctx->source_part->hasBrokenProjection(projection.name));
 
             if (need_recalculate)
             {
@@ -1515,21 +1605,34 @@ private:
         if (!ctx->mutating_pipeline_builder.initialized())
             throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot mutate part columns with uninitialized mutations stream. It's a bug");
 
-        QueryPipelineBuilder builder(std::move(ctx->mutating_pipeline_builder));
+        auto builder = std::make_unique<QueryPipelineBuilder>(std::move(ctx->mutating_pipeline_builder));
 
         if (ctx->metadata_snapshot->hasPrimaryKey() || ctx->metadata_snapshot->hasSecondaryIndices())
         {
-            builder.addTransform(std::make_shared<ExpressionTransform>(
-                builder.getHeader(), ctx->data->getPrimaryKeyAndSkipIndicesExpression(ctx->metadata_snapshot, skip_indices)));
+            builder->addTransform(std::make_shared<ExpressionTransform>(
+                builder->getHeader(), ctx->data->getPrimaryKeyAndSkipIndicesExpression(ctx->metadata_snapshot, skip_indices)));
 
-            builder.addTransform(std::make_shared<MaterializingTransform>(builder.getHeader()));
+            builder->addTransform(std::make_shared<MaterializingTransform>(builder->getHeader()));
         }
 
+        PreparedSets::Subqueries subqueries;
+
         if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
-            builder.addTransform(std::make_shared<TTLTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+        {
+            auto transform = std::make_shared<TTLTransform>(ctx->context, builder->getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+            subqueries = transform->getSubqueries();
+            builder->addTransform(std::move(transform));
+        }
 
         if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
-            builder.addTransform(std::make_shared<TTLCalcTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+        {
+            auto transform = std::make_shared<TTLCalcTransform>(ctx->context, builder->getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+            subqueries = transform->getSubqueries();
+            builder->addTransform(std::move(transform));
+        }
+
+        if (!subqueries.empty())
+            builder = addCreatingSetsTransform(std::move(builder), std::move(subqueries), ctx->context);
 
         ctx->minmax_idx = std::make_shared<IMergeTreeDataPart::MinMaxIndex>();
 
@@ -1563,7 +1666,7 @@ private:
             ctx->context->getWriteSettings(),
             computed_granularity);
 
-        ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+        ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
         ctx->mutating_pipeline.setProgressCallback(ctx->progress_callback);
         /// Is calculated inside MergeProgressCallback.
         ctx->mutating_pipeline.disableProfileEventUpdate();
@@ -1575,8 +1678,9 @@ private:
 
     void finalize()
     {
+        bool noop;
         ctx->new_data_part->minmax_idx = std::move(ctx->minmax_idx);
-        ctx->new_data_part->loadProjections(false, false, true /* if_not_loaded */);
+        ctx->new_data_part->loadProjections(false, false, noop, true /* if_not_loaded */);
         ctx->mutating_executor.reset();
         ctx->mutating_pipeline.reset();
 
@@ -1758,13 +1862,25 @@ private:
 
         if (ctx->mutating_pipeline_builder.initialized())
         {
-            QueryPipelineBuilder builder(std::move(ctx->mutating_pipeline_builder));
+            auto builder = std::make_unique<QueryPipelineBuilder>(std::move(ctx->mutating_pipeline_builder));
+            PreparedSets::Subqueries subqueries;
 
             if (ctx->execute_ttl_type == ExecuteTTLType::NORMAL)
-                builder.addTransform(std::make_shared<TTLTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+            {
+                auto transform = std::make_shared<TTLTransform>(ctx->context, builder->getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+                subqueries = transform->getSubqueries();
+                builder->addTransform(std::move(transform));
+            }
 
             if (ctx->execute_ttl_type == ExecuteTTLType::RECALCULATE)
-                builder.addTransform(std::make_shared<TTLCalcTransform>(builder.getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true));
+            {
+                auto transform = std::make_shared<TTLCalcTransform>(ctx->context, builder->getHeader(), *ctx->data, ctx->metadata_snapshot, ctx->new_data_part, ctx->time_of_mutation, true);
+                subqueries = transform->getSubqueries();
+                builder->addTransform(std::move(transform));
+            }
+
+            if (!subqueries.empty())
+                builder = addCreatingSetsTransform(std::move(builder), std::move(subqueries), ctx->context);
 
             ctx->out = std::make_shared<MergedColumnOnlyOutputStream>(
                 ctx->new_data_part,
@@ -1778,7 +1894,7 @@ private:
                 &ctx->source_part->index_granularity_info
             );
 
-            ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(builder));
+            ctx->mutating_pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
             ctx->mutating_pipeline.setProgressCallback(ctx->progress_callback);
             /// Is calculated inside MergeProgressCallback.
             ctx->mutating_pipeline.disableProfileEventUpdate();
@@ -1921,7 +2037,7 @@ static bool canSkipConversionToNullable(const MergeTreeDataPartPtr & part, const
     if (!part_column)
         return false;
 
-    /// For ALTER MODIFY COLUMN from 'Type' to 'Nullable(Type)' we can skip mutatation and
+    /// For ALTER MODIFY COLUMN from 'Type' to 'Nullable(Type)' we can skip mutation 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)
@@ -1937,6 +2053,20 @@ static bool canSkipConversionToNullable(const MergeTreeDataPartPtr & part, const
     return true;
 }
 
+static bool canSkipConversionToVariant(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 with Variant extension (like 'Variant(T1, T2)' to 'Variant(T1, T2, T3, ...)')
+    /// we can skip mutation and apply only metadata conversion.
+    return isVariantExtension(part_column->type, command.data_type);
+}
+
 static bool canSkipMutationCommandForPart(const MergeTreeDataPartPtr & part, const MutationCommand & command, const ContextPtr & context)
 {
     if (command.partition)
@@ -1952,6 +2082,9 @@ static bool canSkipMutationCommandForPart(const MergeTreeDataPartPtr & part, con
     if (canSkipConversionToNullable(part, command))
         return true;
 
+    if (canSkipConversionToVariant(part, command))
+        return true;
+
     return false;
 }
 
@@ -2013,7 +2146,7 @@ bool MutateTask::prepare()
         scope_guard lock;
 
         {
-            std::tie(part, lock) = ctx->data->cloneAndLoadDataPartOnSameDisk(
+            std::tie(part, lock) = ctx->data->cloneAndLoadDataPart(
                 ctx->source_part, prefix, ctx->future_part->part_info, ctx->metadata_snapshot, clone_params, ctx->context->getReadSettings(), ctx->context->getWriteSettings());
             part->getDataPartStorage().beginTransaction();
             ctx->temporary_directory_lock = std::move(lock);
@@ -2101,6 +2234,20 @@ bool MutateTask::prepare()
     if (ctx->mutating_pipeline_builder.initialized())
         ctx->execute_ttl_type = MutationHelpers::shouldExecuteTTL(ctx->metadata_snapshot, ctx->interpreter->getColumnDependencies());
 
+    if (ctx->data->getSettings()->exclude_deleted_rows_for_part_size_in_merge && ctx->updated_header.has(RowExistsColumn::name))
+    {
+        /// This mutation contains lightweight delete and we need to count the deleted rows,
+        /// Reset existing_rows_count of new data part to 0 and it will be updated while writing _row_exists column
+        ctx->count_lightweight_deleted_rows = true;
+    }
+    else
+    {
+        ctx->count_lightweight_deleted_rows = false;
+
+        /// No need to count deleted rows, copy existing_rows_count from source part
+        ctx->new_data_part->existing_rows_count = ctx->source_part->existing_rows_count.value_or(ctx->source_part->rows_count);
+    }
+
     /// 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())
diff --git a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
index bbe8c30a5c0..7d9691b847d 100644
--- a/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
+++ b/src/Storages/MergeTree/ParallelReplicasReadingCoordinator.cpp
@@ -1,28 +1,19 @@
 #include <Storages/MergeTree/ParallelReplicasReadingCoordinator.h>
 
 #include <algorithm>
-#include <cmath>
-#include <cstddef>
 #include <iterator>
-#include <map>
-#include <mutex>
 #include <numeric>
 #include <set>
 #include <string>
-#include <type_traits>
 #include <unordered_map>
 #include <vector>
 #include <consistent_hashing.h>
 
 #include <IO/Progress.h>
-#include <IO/WriteBufferFromString.h>
-#include <Storages/MergeTree/IntersectionsIndexes.h>
 #include <Storages/MergeTree/MarkRange.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
 #include <Storages/MergeTree/RangesInDataPart.h>
 #include <Storages/MergeTree/RequestResponse.h>
-#include <base/defines.h>
-#include <base/types.h>
 #include <boost/algorithm/string/split.hpp>
 #include <fmt/core.h>
 #include <fmt/format.h>
@@ -31,7 +22,7 @@
 #include <Common/ProfileEvents.h>
 #include <Common/SipHash.h>
 #include <Common/logger_useful.h>
-#include <Common/thread_local_rng.h>
+
 
 using namespace DB;
 
@@ -56,6 +47,32 @@ takeFromRange(const MarkRange & range, size_t min_number_of_marks, size_t & curr
     current_marks_amount += range_we_take.getNumberOfMarks();
     return range_we_take.getNumberOfMarks();
 }
+
+void sortResponseRanges(RangesInDataPartsDescription & result)
+{
+    std::ranges::sort(result, [](const auto & lhs, const auto & rhs) { return lhs.info < rhs.info; });
+
+    RangesInDataPartsDescription new_result;
+
+    /// Aggregate ranges for each part within a single entry
+    for (auto & ranges_in_part : result)
+    {
+        if (new_result.empty() || new_result.back().info != ranges_in_part.info)
+            new_result.push_back(RangesInDataPartDescription{.info = ranges_in_part.info});
+
+        new_result.back().ranges.insert(
+            new_result.back().ranges.end(),
+            std::make_move_iterator(ranges_in_part.ranges.begin()),
+            std::make_move_iterator(ranges_in_part.ranges.end()));
+        ranges_in_part.ranges.clear();
+    }
+
+    /// Sort ranges for each part
+    for (auto & ranges_in_part : new_result)
+        std::sort(ranges_in_part.ranges.begin(), ranges_in_part.ranges.end());
+
+    result = std::move(new_result);
+}
 }
 
 namespace ProfileEvents
@@ -71,11 +88,9 @@ extern const Event ParallelReplicasCollectingOwnedSegmentsMicroseconds;
 extern const Event ParallelReplicasReadAssignedMarks;
 extern const Event ParallelReplicasReadUnassignedMarks;
 extern const Event ParallelReplicasReadAssignedForStealingMarks;
-}
 
-namespace ProfileEvents
-{
-    extern const Event ParallelReplicasUsedCount;
+extern const Event ParallelReplicasUsedCount;
+extern const Event ParallelReplicasUnavailableCount;
 }
 
 namespace DB
@@ -219,7 +234,7 @@ private:
     };
     std::vector<ReplicaStatus> replica_status;
 
-    Poco::Logger * log = &Poco::Logger::get("DefaultCoordinator");
+    LoggerPtr log = getLogger("DefaultCoordinator");
 
     /// Workflow of a segment:
     /// 0. `all_parts_to_read` contains all the parts and thus all the segments initially present there (virtually)
@@ -429,12 +444,17 @@ void DefaultCoordinator::handleInitialAllRangesAnnouncement(InitialAllRangesAnno
         setProgressCallback();
 
     /// Sift the queue to move out all invisible segments
-    for (const auto & segment : distribution_by_hash_queue[replica_num])
+    for (auto segment_it = distribution_by_hash_queue[replica_num].begin(); segment_it != distribution_by_hash_queue[replica_num].end();)
     {
-        if (!part_visibility[segment.info.getPartNameV1()].contains(replica_num))
+        if (!part_visibility[segment_it->info.getPartNameV1()].contains(replica_num))
         {
-            chassert(segment.ranges.size() == 1);
-            enqueueToStealerOrStealingQueue(segment.info, segment.ranges.front());
+            chassert(segment_it->ranges.size() == 1);
+            enqueueToStealerOrStealingQueue(segment_it->info, segment_it->ranges.front());
+            segment_it = distribution_by_hash_queue[replica_num].erase(segment_it);
+        }
+        else
+        {
+            ++segment_it;
         }
     }
 }
@@ -599,6 +619,8 @@ void DefaultCoordinator::processPartsFurther(
 {
     ProfileEventTimeIncrement<Microseconds> watch(ProfileEvents::ParallelReplicasProcessingPartsMicroseconds);
 
+    auto replica_can_read_part = [&](auto replica, const auto & part) { return part_visibility[part.getPartNameV1()].contains(replica); };
+
     for (const auto & part : all_parts_to_read)
     {
         if (current_marks_amount >= min_number_of_marks)
@@ -622,7 +644,7 @@ void DefaultCoordinator::processPartsFurther(
                     = MarkRange{std::max(range.begin, segment_begin), std::min(range.end, segment_begin + mark_segment_size)};
 
                 const auto owner = computeConsistentHash(part.description.info.getPartNameV1(), segment_begin, scan_mode);
-                if (owner == replica_num)
+                if (owner == replica_num && replica_can_read_part(replica_num, part.description.info))
                 {
                     const auto taken = takeFromRange(cur_segment, min_number_of_marks, current_marks_amount, result);
                     if (taken == range.getNumberOfMarks())
@@ -681,7 +703,7 @@ void DefaultCoordinator::enqueueSegment(const MergeTreePartInfo & info, const Ma
     {
         /// TODO: optimize me (maybe we can store something lighter than RangesInDataPartDescription)
         distribution_by_hash_queue[owner].insert(RangesInDataPartDescription{.info = info, .ranges = {segment}});
-        LOG_TEST(log, "Segment {} is added to its owner's ({}) queue", segment, owner);
+        LOG_TEST(log, "Segment {} of {} is added to its owner's ({}) queue", segment, info.getPartNameV1(), owner);
     }
     else
         enqueueToStealerOrStealingQueue(info, segment);
@@ -695,12 +717,12 @@ void DefaultCoordinator::enqueueToStealerOrStealingQueue(const MergeTreePartInfo
     if (possiblyCanReadPart(stealer_by_hash, info))
     {
         distribution_by_hash_queue[stealer_by_hash].insert(std::move(range));
-        LOG_TEST(log, "Segment {} is added to its stealer's ({}) queue", segment, stealer_by_hash);
+        LOG_TEST(log, "Segment {} of {} is added to its stealer's ({}) queue", segment, info.getPartNameV1(), stealer_by_hash);
     }
     else
     {
         ranges_for_stealing_queue.push_back(std::move(range));
-        LOG_TEST(log, "Segment {} is added to stealing queue", segment);
+        LOG_TEST(log, "Segment {} of {} is added to stealing queue", segment, info.getPartNameV1());
     }
 }
 
@@ -768,6 +790,8 @@ ParallelReadResponse DefaultCoordinator::handleRequest(ParallelReadRequest reque
         }
     }
 
+    sortResponseRanges(response.description);
+
     LOG_DEBUG(
         log,
         "Going to respond to replica {} with {}; mine_marks={}, stolen_by_hash={}, stolen_rest={}",
@@ -800,7 +824,7 @@ public:
     Parts all_parts_to_read;
     size_t total_rows_to_read = 0;
 
-    Poco::Logger * log = &Poco::Logger::get(fmt::format("{}{}", magic_enum::enum_name(mode), "Coordinator"));
+    LoggerPtr log = getLogger(fmt::format("{}{}", magic_enum::enum_name(mode), "Coordinator"));
 };
 
 template <CoordinationMode mode>
@@ -990,6 +1014,8 @@ ParallelReadResponse ParallelReplicasReadingCoordinator::handleRequest(ParallelR
 
 void ParallelReplicasReadingCoordinator::markReplicaAsUnavailable(size_t replica_number)
 {
+    ProfileEvents::increment(ProfileEvents::ParallelReplicasUnavailableCount);
+
     std::lock_guard lock(mutex);
 
     if (!pimpl)
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
index 76b8080f64c..78fcfabb704 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.cpp
@@ -20,7 +20,7 @@ PartMovesBetweenShardsOrchestrator::PartMovesBetweenShardsOrchestrator(StorageRe
     : storage(storage_)
     , zookeeper_path(storage.zookeeper_path)
     , logger_name(storage.getStorageID().getFullTableName() + " (PartMovesBetweenShardsOrchestrator)")
-    , log(&Poco::Logger::get(logger_name))
+    , log(getLogger(logger_name))
     , entries_znode_path(zookeeper_path + "/part_moves_shard")
 {
     /// Schedule pool is not designed for long-running tasks. TODO replace with a separate thread?
diff --git a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
index af21022953c..abe259c77ab 100644
--- a/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
+++ b/src/Storages/MergeTree/PartMovesBetweenShardsOrchestrator.h
@@ -176,7 +176,7 @@ private:
 
     String zookeeper_path;
     String logger_name;
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
     std::atomic<bool> need_stop{false};
 
     BackgroundSchedulePool::TaskHolder task;
diff --git a/src/Storages/MergeTree/PartitionPruner.cpp b/src/Storages/MergeTree/PartitionPruner.cpp
index 668576f9021..eb51d600da3 100644
--- a/src/Storages/MergeTree/PartitionPruner.cpp
+++ b/src/Storages/MergeTree/PartitionPruner.cpp
@@ -59,7 +59,7 @@ bool PartitionPruner::canBePruned(const IMergeTreeDataPart & part) const
         {
             WriteBufferFromOwnString buf;
             part.partition.serializeText(part.storage, buf, FormatSettings{});
-            LOG_TRACE(&Poco::Logger::get("PartitionPruner"), "Partition {} gets pruned", buf.str());
+            LOG_TRACE(getLogger("PartitionPruner"), "Partition {} gets pruned", buf.str());
         }
     }
 
diff --git a/src/Storages/MergeTree/RPNBuilder.cpp b/src/Storages/MergeTree/RPNBuilder.cpp
index 3ffef1de718..dc8c6b0c230 100644
--- a/src/Storages/MergeTree/RPNBuilder.cpp
+++ b/src/Storages/MergeTree/RPNBuilder.cpp
@@ -14,7 +14,9 @@
 #include <Columns/ColumnConst.h>
 #include <Columns/ColumnSet.h>
 
+#include <Functions/indexHint.h>
 #include <Functions/IFunction.h>
+#include <Functions/IFunctionAdaptors.h>
 
 #include <Storages/KeyDescription.h>
 
@@ -390,6 +392,15 @@ size_t RPNBuilderFunctionTreeNode::getArgumentsSize() const
     }
     else
     {
+        // indexHint arguments are stored inside of `FunctionIndexHint` class,
+        // because they are used only for index analysis.
+        if (dag_node->function_base->getName() == "indexHint")
+        {
+            const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(dag_node->function_base.get());
+            const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get());
+            return index_hint->getActions()->getOutputs().size();
+        }
+
         return dag_node->children.size();
     }
 }
@@ -409,6 +420,15 @@ RPNBuilderTreeNode RPNBuilderFunctionTreeNode::getArgumentAt(size_t index) const
     }
     else
     {
+        // indexHint arguments are stored inside of `FunctionIndexHint` class,
+        // because they are used only for index analysis.
+        if (dag_node->function_base->getName() == "indexHint")
+        {
+            const auto * adaptor = typeid_cast<const FunctionToFunctionBaseAdaptor *>(dag_node->function_base.get());
+            const auto * index_hint = typeid_cast<const FunctionIndexHint *>(adaptor->getFunction().get());
+            return RPNBuilderTreeNode(index_hint->getActions()->getOutputs()[index], tree_context);
+        }
+
         return RPNBuilderTreeNode(dag_node->children[index], tree_context);
     }
 }
diff --git a/src/Storages/MergeTree/RPNBuilder.h b/src/Storages/MergeTree/RPNBuilder.h
index b0755ccd3ca..f8924ff6186 100644
--- a/src/Storages/MergeTree/RPNBuilder.h
+++ b/src/Storages/MergeTree/RPNBuilder.h
@@ -226,7 +226,13 @@ private:
                       * - in this case `n - 1` elements are added (where `n` is the number of arguments).
                       */
                     if (argument_index != 0 || element.function == RPNElement::FUNCTION_NOT)
-                        rpn_elements.emplace_back(std::move(element));
+                        rpn_elements.emplace_back(std::move(element)); /// NOLINT(bugprone-use-after-move,hicpp-invalid-access-moved)
+                }
+
+                if (arguments_size == 0 && function_node.getFunctionName() == "indexHint")
+                {
+                    element.function = RPNElement::ALWAYS_TRUE;
+                    rpn_elements.emplace_back(std::move(element));
                 }
 
                 return;
diff --git a/src/Storages/MergeTree/RangesInDataPart.h b/src/Storages/MergeTree/RangesInDataPart.h
index 82152ee3906..e275f2c27e7 100644
--- a/src/Storages/MergeTree/RangesInDataPart.h
+++ b/src/Storages/MergeTree/RangesInDataPart.h
@@ -19,8 +19,8 @@ using DataPartPtr = std::shared_ptr<const IMergeTreeDataPart>;
 /// they look natural here because we can fully serialize and then deserialize original DataPart class.
 struct RangesInDataPartDescription
 {
-    MergeTreePartInfo info;
-    MarkRanges ranges;
+    MergeTreePartInfo info{};
+    MarkRanges ranges{};
     size_t rows = 0;
 
     void serialize(WriteBuffer & out) const;
@@ -67,7 +67,7 @@ struct RangesInDataPart
 
 struct RangesInDataParts: public std::vector<RangesInDataPart>
 {
-    using std::vector<RangesInDataPart>::vector;
+    using std::vector<RangesInDataPart>::vector; /// NOLINT(modernize-type-traits)
 
     RangesInDataPartsDescription getDescriptions() const;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
index 94c069d789b..2fc5238827d 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.cpp
@@ -1,6 +1,7 @@
 #include <Storages/MergeTree/ReplicatedMergeMutateTaskBase.h>
 
 #include <Storages/StorageReplicatedMergeTree.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeQueue.h>
 #include <Common/ProfileEventsScope.h>
 
@@ -110,11 +111,14 @@ bool ReplicatedMergeMutateTaskBase::executeStep()
                 auto mutations_end_it = in_partition->second.upper_bound(result_data_version);
                 for (auto it = mutations_begin_it; it != mutations_end_it; ++it)
                 {
+                    auto & src_part = log_entry->source_parts.at(0);
                     ReplicatedMergeTreeQueue::MutationStatus & status = *it->second;
-                    status.latest_failed_part = log_entry->source_parts.at(0);
+                    status.latest_failed_part = src_part;
                     status.latest_failed_part_info = source_part_info;
                     status.latest_fail_time = time(nullptr);
                     status.latest_fail_reason = getExceptionMessage(saved_exception, false);
+                    if (result_data_version == it->first)
+                        storage.mutation_backoff_policy.addPartMutationFailure(src_part, storage.getSettings()->max_postpone_time_for_failed_mutations_ms);
                 }
             }
         }
@@ -142,6 +146,12 @@ bool ReplicatedMergeMutateTaskBase::executeImpl()
         {
             storage.queue.removeProcessedEntry(storage.getZooKeeper(), selected_entry->log_entry);
             state = State::SUCCESS;
+
+            auto & log_entry = selected_entry->log_entry;
+            if (log_entry->type == ReplicatedMergeTreeLogEntryData::MUTATE_PART)
+            {
+                storage.mutation_backoff_policy.removePartFromFailed(log_entry->source_parts.at(0));
+            }
         }
         catch (...)
         {
@@ -154,8 +164,16 @@ bool ReplicatedMergeMutateTaskBase::executeImpl()
 
     auto execute_fetch = [&] (bool need_to_check_missing_part) -> bool
     {
-        if (storage.executeFetch(entry, need_to_check_missing_part))
-            return remove_processed_entry();
+        try
+        {
+            if (storage.executeFetch(entry, need_to_check_missing_part))
+                return remove_processed_entry();
+        }
+        catch (...)
+        {
+            part_log_writer(ExecutionStatus::fromCurrentException("", true));
+            throw;
+        }
 
         return false;
     };
@@ -195,8 +213,7 @@ bool ReplicatedMergeMutateTaskBase::executeImpl()
             }
             catch (...)
             {
-                if (part_log_writer)
-                    part_log_writer(ExecutionStatus::fromCurrentException("", true));
+                part_log_writer(ExecutionStatus::fromCurrentException("", true));
                 throw;
             }
 
@@ -204,17 +221,8 @@ bool ReplicatedMergeMutateTaskBase::executeImpl()
         }
         case State::NEED_FINALIZE :
         {
-            try
-            {
-                if (!finalize(part_log_writer))
-                    return execute_fetch(/* need_to_check_missing = */true);
-            }
-            catch (...)
-            {
-                if (part_log_writer)
-                    part_log_writer(ExecutionStatus::fromCurrentException("", true));
-                throw;
-            }
+            if (!finalize(part_log_writer))
+                return execute_fetch(/* need_to_check_missing = */true);
 
             return remove_processed_entry();
         }
diff --git a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
index 18fcacecc9e..2b1fcec62a8 100644
--- a/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
+++ b/src/Storages/MergeTree/ReplicatedMergeMutateTaskBase.h
@@ -17,7 +17,7 @@ class ReplicatedMergeMutateTaskBase : public IExecutableTask
 {
 public:
     ReplicatedMergeMutateTaskBase(
-        Poco::Logger * log_,
+        LoggerPtr log_,
         StorageReplicatedMergeTree & storage_,
         ReplicatedMergeTreeQueue::SelectedEntryPtr & selected_entry_,
         IExecutableTask::TaskResultCallback & task_result_callback_)
@@ -66,7 +66,7 @@ protected:
     ReplicatedMergeTreeQueue::SelectedEntryPtr selected_entry;
     ReplicatedMergeTreeLogEntry & entry;
     MergeList::EntryPtr merge_mutate_entry{nullptr};
-    Poco::Logger * log;
+    LoggerPtr log;
     /// ProfileEvents for current part will be stored here
     ProfileEvents::Counters profile_counters;
     ContextMutablePtr task_context;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
index a544ac908a4..336d19692d4 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.cpp
@@ -19,7 +19,7 @@ namespace ErrorCodes
 ReplicatedMergeTreeAttachThread::ReplicatedMergeTreeAttachThread(StorageReplicatedMergeTree & storage_)
     : storage(storage_)
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeAttachThread)")
-    , log(&Poco::Logger::get(log_name))
+    , log(getLogger(log_name))
 {
     task = storage.getContext()->getSchedulePool().createTask(log_name, [this] { run(); });
     const auto storage_settings = storage.getSettings();
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
index 222b30b519b..250a5ed34d1 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeAttachThread.h
@@ -34,7 +34,7 @@ private:
     BackgroundSchedulePool::TaskHolder task;
 
     std::string log_name;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic<bool> first_try_done{false};
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
index 8daee661c75..67942491ae2 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.cpp
@@ -24,7 +24,7 @@ namespace ErrorCodes
 ReplicatedMergeTreeCleanupThread::ReplicatedMergeTreeCleanupThread(StorageReplicatedMergeTree & storage_)
     : storage(storage_)
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeCleanupThread)")
-    , log(&Poco::Logger::get(log_name))
+    , log(getLogger(log_name))
     , sleep_ms(storage.getSettings()->cleanup_delay_period * 1000)
 {
     task = storage.getContext()->getSchedulePool().createTask(log_name, [this]{ run(); });
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
index ae9aabdb4e7..5beaef56995 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeCleanupThread.h
@@ -40,7 +40,7 @@ public:
 private:
     StorageReplicatedMergeTree & storage;
     String log_name;
-    Poco::Logger * log;
+    LoggerPtr log;
     BackgroundSchedulePool::TaskHolder task;
     pcg64 rng{randomSeed()};
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
index 054c576cfc5..7693f34cc1e 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeLogEntry.h
@@ -93,6 +93,7 @@ struct ReplicatedMergeTreeLogEntryData
     MergeTreeDataPartFormat new_part_format;
     String block_id;                        /// For parts of level zero, the block identifier for deduplication (node name in /blocks/).
     mutable String actual_new_part_name;    /// GET_PART could actually fetch a part covering 'new_part_name'.
+    mutable std::unordered_set<String> replace_range_actual_new_part_names;     /// Same as above, but for REPLACE_RANGE
     UUID new_part_uuid = UUIDHelpers::Nil;
 
     Strings source_parts;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
index b1875464725..181f54688f9 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.cpp
@@ -28,7 +28,7 @@ static const auto PART_CHECK_ERROR_SLEEP_MS = 5 * 1000;
 ReplicatedMergeTreePartCheckThread::ReplicatedMergeTreePartCheckThread(StorageReplicatedMergeTree & storage_)
     : storage(storage_)
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreePartCheckThread)")
-    , log(&Poco::Logger::get(log_name))
+    , log(getLogger(log_name))
 {
     task = storage.getContext()->getSchedulePool().createTask(log_name, [this] { run(); });
     task->schedule();
@@ -63,7 +63,7 @@ void ReplicatedMergeTreePartCheckThread::enqueuePart(const String & name, time_t
     if (parts_set.contains(name))
         return;
 
-    LOG_TRACE(log, "Enqueueing {} for check after after {}s", name, delay_to_check_seconds);
+    LOG_TRACE(log, "Enqueueing {} for check after {}s", name, delay_to_check_seconds);
     parts_queue.emplace_back(name, std::chrono::steady_clock::now() + std::chrono::seconds(delay_to_check_seconds));
     parts_set.insert(name);
     task->schedule();
@@ -274,7 +274,7 @@ std::pair<bool, MergeTreeDataPartPtr> ReplicatedMergeTreePartCheckThread::findLo
     return std::make_pair(exists_in_zookeeper, part);
 }
 
-ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const String & part_name)
+ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const String & part_name, bool throw_on_broken_projection)
 {
     ReplicatedCheckResult result;
     auto [exists_in_zookeeper, part] = findLocalPart(part_name);
@@ -341,6 +341,7 @@ ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const St
         /// before the ReplicatedMergeTreePartHeader was introduced.
         String part_path = storage.replica_path + "/parts/" + part_name;
         String part_znode = zookeeper->get(part_path);
+        bool is_broken_projection = false;
 
         try
         {
@@ -362,8 +363,10 @@ ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const St
 
             checkDataPart(
                 part,
-                true,
-                [this] { return need_stop.load(); });
+                /* require_checksums */true,
+                is_broken_projection,
+                [this] { return need_stop.load(); },
+                throw_on_broken_projection);
 
             if (need_stop)
             {
@@ -382,14 +385,27 @@ ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const St
             if (isRetryableException(std::current_exception()))
                 throw;
 
-            tryLogCurrentException(log, __PRETTY_FUNCTION__);
+            PreformattedMessage message;
+            if (is_broken_projection && throw_on_broken_projection)
+            {
+                WriteBufferFromOwnString wb;
+                message = PreformattedMessage::create(
+                    "Part {} has a broken projections. It will be ignored. Broken projections info: {}",
+                    part_name, getCurrentExceptionMessage(true));
+                LOG_DEBUG(log, message);
+                result.action = ReplicatedCheckResult::DoNothing;
+            }
+            else
+            {
+                tryLogCurrentException(log, __PRETTY_FUNCTION__);
 
-            auto message = PreformattedMessage::create("Part {} looks broken. Removing it and will try to fetch.", part_name);
-            LOG_ERROR(log, message);
+                message = PreformattedMessage::create("Part {} looks broken. Removing it and will try to fetch.", part_name);
+                LOG_ERROR(log, message);
+                result.action = ReplicatedCheckResult::TryFetchMissing;
+            }
 
             /// Part is broken, let's try to find it and fetch.
             result.status = {part_name, false, message};
-            result.action = ReplicatedCheckResult::TryFetchMissing;
             return result;
 
         }
@@ -419,12 +435,12 @@ ReplicatedCheckResult ReplicatedMergeTreePartCheckThread::checkPartImpl(const St
 }
 
 
-CheckResult ReplicatedMergeTreePartCheckThread::checkPartAndFix(const String & part_name, std::optional<time_t> * recheck_after)
+CheckResult ReplicatedMergeTreePartCheckThread::checkPartAndFix(const String & part_name, std::optional<time_t> * recheck_after, bool throw_on_broken_projection)
 {
     LOG_INFO(log, "Checking part {}", part_name);
     ProfileEvents::increment(ProfileEvents::ReplicatedPartChecks);
 
-    ReplicatedCheckResult result = checkPartImpl(part_name);
+    ReplicatedCheckResult result = checkPartImpl(part_name, throw_on_broken_projection);
     switch (result.action)
     {
         case ReplicatedCheckResult::None: UNREACHABLE();
@@ -577,7 +593,7 @@ void ReplicatedMergeTreePartCheckThread::run()
         }
 
         std::optional<time_t> recheck_after;
-        checkPartAndFix(selected->name, &recheck_after);
+        checkPartAndFix(selected->name, &recheck_after, /* throw_on_broken_projection */false);
 
         if (need_stop)
             return;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
index 68dc6ca3d1d..9091f698546 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreePartCheckThread.h
@@ -65,9 +65,9 @@ public:
     size_t size() const;
 
     /// Check part by name
-    CheckResult checkPartAndFix(const String & part_name, std::optional<time_t> * recheck_after = nullptr);
+    CheckResult checkPartAndFix(const String & part_name, std::optional<time_t> * recheck_after = nullptr, bool throw_on_broken_projection = true);
 
-    ReplicatedCheckResult checkPartImpl(const String & part_name);
+    ReplicatedCheckResult checkPartImpl(const String & part_name, bool throw_on_broken_projection);
 
     std::unique_lock<std::mutex> pausePartsCheck();
 
@@ -87,7 +87,7 @@ private:
 
     StorageReplicatedMergeTree & storage;
     String log_name;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     using StringSet = std::set<String>;
     struct PartToCheck
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
index 2d0617e5826..c8523e540dd 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.cpp
@@ -13,6 +13,7 @@
 #include <base/sort.h>
 
 #include <ranges>
+#include <Poco/Timestamp.h>
 
 namespace DB
 {
@@ -36,7 +37,7 @@ ReplicatedMergeTreeQueue::ReplicatedMergeTreeQueue(StorageReplicatedMergeTree &
     zookeeper_path = storage.zookeeper_path;
     replica_path = storage.replica_path;
     logger_name = storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeQueue)";
-    log = &Poco::Logger::get(logger_name);
+    log = getLogger(logger_name);
 }
 
 
@@ -341,6 +342,11 @@ void ReplicatedMergeTreeQueue::updateStateOnQueueEntryRemoval(
             /// NOTE actual_new_part_name is very confusing and error-prone. This approach must be fixed.
             removeCoveredPartsFromMutations(entry->actual_new_part_name, /*remove_part = */ false, /*remove_covered_parts = */ true);
         }
+        for (const auto & actual_part : entry->replace_range_actual_new_part_names)
+        {
+            LOG_TEST(log, "Entry {} has actual new part name {}, removing it from mutations", entry->znode_name, actual_part);
+            removeCoveredPartsFromMutations(actual_part, /*remove_part = */ false, /*remove_covered_parts = */ true);
+        }
 
         LOG_TEST(log, "Adding parts [{}] to current parts", fmt::join(entry_virtual_parts, ", "));
 
@@ -682,7 +688,7 @@ std::pair<int32_t, int32_t> ReplicatedMergeTreeQueue::pullLogsToQueue(zkutil::Zo
                 ops.emplace_back(zkutil::makeSetRequest(
                     fs::path(replica_path) / "min_unprocessed_insert_time", toString(*min_unprocessed_insert_time_changed), -1));
 
-            auto responses = zookeeper->multi(ops);
+            auto responses = zookeeper->multi(ops, /* check_session_valid */ true);
 
             /// Now we have successfully updated the queue in ZooKeeper. Update it in RAM.
 
@@ -860,6 +866,9 @@ ActiveDataPartSet getPartNamesToMutate(
 
 int32_t ReplicatedMergeTreeQueue::updateMutations(zkutil::ZooKeeperPtr zookeeper, Coordination::WatchCallbackPtr watch_callback)
 {
+    if (pull_log_blocker.isCancelled())
+        throw Exception(ErrorCodes::ABORTED, "Log pulling is cancelled");
+
     std::lock_guard lock(update_mutations_mutex);
 
     Coordination::Stat mutations_stat;
@@ -1176,9 +1185,9 @@ bool ReplicatedMergeTreeQueue::isCoveredByFuturePartsImpl(const LogEntry & entry
     if (entry_for_same_part_it != future_parts.end())
     {
         const LogEntry & another_entry = *entry_for_same_part_it->second;
-        constexpr auto fmt_string = "Not executing log entry {} of type {} for part {} "
+        constexpr auto fmt_string = "Not executing log entry {} of type {} for part {} (actual part {})"
                                     "because another log entry {} of type {} for the same part ({}) is being processed.";
-        LOG_INFO(LogToStr(out_reason, log), fmt_string, entry.znode_name, entry.type, entry.new_part_name,
+        LOG_INFO(LogToStr(out_reason, log), fmt_string, entry.znode_name, entry.type, entry.new_part_name, new_part_name,
                  another_entry.znode_name, another_entry.type, another_entry.new_part_name);
         return true;
 
@@ -1194,6 +1203,7 @@ bool ReplicatedMergeTreeQueue::isCoveredByFuturePartsImpl(const LogEntry & entry
     auto result_part = MergeTreePartInfo::fromPartName(new_part_name, format_version);
 
     /// It can slow down when the size of `future_parts` is large. But it can not be large, since background pool is limited.
+    /// (well, it can actually, thanks to REPLACE_RANGE, but it's a rare case)
     for (const auto & future_part_elem : future_parts)
     {
         auto future_part = MergeTreePartInfo::fromPartName(future_part_elem.first, format_version);
@@ -1346,13 +1356,21 @@ bool ReplicatedMergeTreeQueue::shouldExecuteLogEntry(
             auto part = data.getPartIfExists(name, {MergeTreeDataPartState::PreActive, MergeTreeDataPartState::Active, MergeTreeDataPartState::Outdated});
             if (part)
             {
-                if (auto part_in_memory = asInMemoryPart(part))
-                    sum_parts_size_in_bytes += part_in_memory->block.bytes();
+                if (entry.type == LogEntry::MERGE_PARTS)
+                    sum_parts_size_in_bytes += part->getExistingBytesOnDisk();
                 else
                     sum_parts_size_in_bytes += part->getBytesOnDisk();
+
+                if (entry.type == LogEntry::MUTATE_PART && !storage.mutation_backoff_policy.partCanBeMutated(part->name))
+                {
+                        constexpr auto fmt_string = "Not executing log entry {} of type {} for part {} "
+                           "because recently it has failed. According to exponential backoff policy, put aside this log entry.";
+
+                        LOG_DEBUG(LogToStr(out_postpone_reason, log), fmt_string, entry.znode_name, entry.typeToString(), entry.new_part_name);
+                        return false;
+                }
             }
         }
-
         if (merger_mutator.merges_blocker.isCancelled())
         {
             constexpr auto fmt_string = "Not executing log entry {} of type {} for part {} because merges and mutations are cancelled now.";
@@ -1596,26 +1614,39 @@ void ReplicatedMergeTreeQueue::CurrentlyExecuting::setActualPartName(
     std::unique_lock<std::mutex> & state_lock,
     std::vector<LogEntryPtr> & covered_entries_to_wait)
 {
-    if (!entry.actual_new_part_name.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Entry actual part isn't empty yet. This is a bug.");
+    if (actual_part_name.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Actual part name is empty");
 
-    entry.actual_new_part_name = actual_part_name;
+    if (!entry.actual_new_part_name.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Entry {} actual part isn't empty yet: '{}'. This is a bug.",
+                        entry.znode_name, entry.actual_new_part_name);
+
+    auto actual_part_info = MergeTreePartInfo::fromPartName(actual_part_name, queue.format_version);
+    for (const auto & other_part_name : entry.replace_range_actual_new_part_names)
+        if (!MergeTreePartInfo::fromPartName(other_part_name, queue.format_version).isDisjoint(actual_part_info))
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Entry {} already has actual part {} non-disjoint with {}. This is a bug.",
+                            entry.actual_new_part_name, other_part_name, actual_part_name);
 
     /// Check if it is the same (and already added) part.
-    if (entry.actual_new_part_name == entry.new_part_name)
+    if (actual_part_name == entry.new_part_name)
         return;
 
-    if (!queue.future_parts.emplace(entry.actual_new_part_name, entry.shared_from_this()).second)
+    if (!queue.future_parts.emplace(actual_part_name, entry.shared_from_this()).second)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Attaching already existing future part {}. This is a bug. "
                                                    "It happened on attempt to execute {}: {}",
-                                                   entry.actual_new_part_name, entry.znode_name, entry.toString());
+                                                   actual_part_name, entry.znode_name, entry.toString());
+
+    if (entry.type == LogEntry::REPLACE_RANGE)
+        entry.replace_range_actual_new_part_names.insert(actual_part_name);
+    else
+        entry.actual_new_part_name = actual_part_name;
 
     for (LogEntryPtr & covered_entry : covered_entries_to_wait)
     {
         if (&entry == covered_entry.get())
             continue;
-        LOG_TRACE(queue.log, "Waiting for {} producing {} to finish before executing {} producing not disjoint part {}",
-                  covered_entry->znode_name, covered_entry->new_part_name, entry.znode_name, entry.new_part_name);
+        LOG_TRACE(queue.log, "Waiting for {} producing {} to finish before executing {} producing not disjoint part {} (actual part {})",
+                  covered_entry->znode_name, covered_entry->new_part_name, entry.znode_name, entry.new_part_name, actual_part_name);
         covered_entry->execution_complete.wait(state_lock, [&covered_entry] { return !covered_entry->currently_executing; });
     }
 }
@@ -1634,25 +1665,27 @@ ReplicatedMergeTreeQueue::CurrentlyExecuting::~CurrentlyExecuting()
     entry->currently_executing = false;
     entry->execution_complete.notify_all();
 
-    for (const String & new_part_name : entry->getVirtualPartNames(queue.format_version))
+    auto erase_and_check = [this](const String & part_name)
     {
-        if (!queue.future_parts.erase(new_part_name))
+        if (!queue.future_parts.erase(part_name))
         {
-            LOG_ERROR(queue.log, "Untagging already untagged future part {}. This is a bug.", new_part_name);
+            LOG_ERROR(queue.log, "Untagging already untagged future part {}. This is a bug.", part_name);
             assert(false);
         }
-    }
+    };
+
+    for (const String & new_part_name : entry->getVirtualPartNames(queue.format_version))
+        erase_and_check(new_part_name);
 
     if (!entry->actual_new_part_name.empty())
-    {
-        if (entry->actual_new_part_name != entry->new_part_name && !queue.future_parts.erase(entry->actual_new_part_name))
-        {
-            LOG_ERROR(queue.log, "Untagging already untagged future part {}. This is a bug.", entry->actual_new_part_name);
-            assert(false);
-        }
+        erase_and_check(entry->actual_new_part_name);
 
-        entry->actual_new_part_name.clear();
-    }
+    entry->actual_new_part_name.clear();
+
+    for (const auto & actual_part : entry->replace_range_actual_new_part_names)
+        erase_and_check(actual_part);
+
+    entry->replace_range_actual_new_part_names.clear();
 }
 
 
@@ -1786,7 +1819,7 @@ ReplicatedMergeTreeMergePredicate ReplicatedMergeTreeQueue::getMergePredicate(zk
 }
 
 
-std::map<int64_t, MutationCommands> ReplicatedMergeTreeQueue::getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
+MutationCommands ReplicatedMergeTreeQueue::getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const
 {
     std::unique_lock lock(state_mutex);
 
@@ -1796,9 +1829,8 @@ std::map<int64_t, MutationCommands> ReplicatedMergeTreeQueue::getAlterMutationCo
 
     Int64 part_data_version = part->info.getDataVersion();
     Int64 part_metadata_version = part->getMetadataVersion();
-    LOG_TEST(log, "Looking for mutations for part {} (part data version {}, part metadata version {})", part->name, part_data_version, part_metadata_version);
 
-    std::map<int64_t, MutationCommands> result;
+    MutationCommands result;
 
     bool seen_all_data_mutations = false;
     bool seen_all_metadata_mutations = false;
@@ -1811,7 +1843,15 @@ std::map<int64_t, MutationCommands> ReplicatedMergeTreeQueue::getAlterMutationCo
         if (seen_all_data_mutations && seen_all_metadata_mutations)
             break;
 
-        auto alter_version = mutation_status->entry->alter_version;
+        auto & entry = mutation_status->entry;
+
+        auto add_to_result = [&] {
+            for (const auto & command : entry->commands | std::views::reverse)
+                if (AlterConversions::supportsMutationCommandType(command.type))
+                    result.emplace_back(command);
+        };
+
+        auto alter_version = entry->alter_version;
         if (alter_version != -1)
         {
             if (alter_version > storage.getInMemoryMetadataPtr()->getMetadataVersion())
@@ -1819,22 +1859,19 @@ std::map<int64_t, MutationCommands> ReplicatedMergeTreeQueue::getAlterMutationCo
 
             /// We take commands with bigger metadata version
             if (alter_version > part_metadata_version)
-                result[mutation_version] = mutation_status->entry->commands;
+                add_to_result();
             else
                 seen_all_metadata_mutations = true;
         }
         else
         {
             if (mutation_version > part_data_version)
-                result[mutation_version] = mutation_status->entry->commands;
+                add_to_result();
             else
                 seen_all_data_mutations = true;
         }
     }
 
-    LOG_TEST(log, "Got {} commands for part {} (part data version {}, part metadata version {})",
-        result.size(), part->name, part_data_version, part_metadata_version);
-
     return result;
 }
 
@@ -2149,7 +2186,7 @@ LocalMergePredicate::LocalMergePredicate(ReplicatedMergeTreeQueue & queue_)
 
 template<typename VirtualPartsT, typename MutationsStateT>
 CommittingBlocks BaseMergePredicate<VirtualPartsT, MutationsStateT>::getCommittingBlocks(
-    zkutil::ZooKeeperPtr & zookeeper, const std::string & zookeeper_path, Poco::Logger * log_)
+    zkutil::ZooKeeperPtr & zookeeper, const std::string & zookeeper_path, LoggerPtr log_)
 {
     CommittingBlocks committing_blocks;
 
@@ -2250,7 +2287,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::operator()(
     const MergeTreeData::DataPartPtr & left,
     const MergeTreeData::DataPartPtr & right,
     const MergeTreeTransaction *,
-    String & out_reason) const
+    PreformattedMessage & out_reason) const
 {
     if (left)
         return canMergeTwoParts(left, right, out_reason);
@@ -2262,7 +2299,7 @@ template<typename VirtualPartsT, typename MutationsStateT>
 bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
     const MergeTreeData::DataPartPtr & left,
     const MergeTreeData::DataPartPtr & right,
-    String & out_reason) const
+    PreformattedMessage & out_reason) const
 {
     /// A sketch of a proof of why this method actually works:
     ///
@@ -2306,19 +2343,19 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
     {
         if (pinned_part_uuids_ && pinned_part_uuids_->part_uuids.contains(part->uuid))
         {
-            out_reason = "Part " + part->name + " has uuid " + toString(part->uuid) + " which is currently pinned";
+            out_reason = PreformattedMessage::create("Part {} has uuid {} which is currently pinned", part->name, part->uuid);
             return false;
         }
 
         if (inprogress_quorum_part_ && part->name == *inprogress_quorum_part_)
         {
-            out_reason = "Quorum insert for part " + part->name + " is currently in progress";
+            out_reason = PreformattedMessage::create("Quorum insert for part {} is currently in progress", part->name);
             return false;
         }
 
         if (prev_virtual_parts_ && prev_virtual_parts_->getContainingPart(part->info).empty())
         {
-            out_reason = "Entry for part " + part->name + " hasn't been read from the replication log yet";
+            out_reason = PreformattedMessage::create("Entry for part {} hasn't been read from the replication log yet", part->name);
             return false;
         }
     }
@@ -2332,7 +2369,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
     {
         if (partition_ids_hint && !partition_ids_hint->contains(left->info.partition_id))
         {
-            out_reason = fmt::format("Uncommitted block were not loaded for unexpected partition {}", left->info.partition_id);
+            out_reason = PreformattedMessage::create("Uncommitted block were not loaded for unexpected partition {}", left->info.partition_id);
             return false;
         }
 
@@ -2344,8 +2381,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
             auto block_it = block_numbers.upper_bound(left_max_block);
             if (block_it != block_numbers.end() && *block_it < right_min_block)
             {
-                out_reason = "Block number " + toString(*block_it) + " is still being inserted between parts "
-                    + left->name + " and " + right->name;
+                out_reason = PreformattedMessage::create("Block number {} is still being inserted between parts {} and {}", *block_it, left->name, right->name);
                 return false;
             }
         }
@@ -2364,7 +2400,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
             String containing_part = virtual_parts_->getContainingPart(part->info);
             if (containing_part != part->name)
             {
-                out_reason = "Part " + part->name + " has already been assigned a merge into " + containing_part;
+                out_reason = PreformattedMessage::create("Part {} has already been assigned a merge into {}", part->name, containing_part);
                 return false;
             }
         }
@@ -2381,9 +2417,9 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
             Strings covered = virtual_parts_->getPartsCoveredBy(gap_part_info);
             if (!covered.empty())
             {
-                out_reason = "There are " + toString(covered.size()) + " parts (from " + covered.front()
-                    + " to " + covered.back() + ") that are still not present or being processed by "
-                    + " other background process on this replica between " + left->name + " and " + right->name;
+                out_reason = PreformattedMessage::create("There are {} parts (from {} to {}) "
+                             "that are still not present or being processed by other background process "
+                             "on this replica between {} and {}", covered.size(), covered.front(), covered.back(), left->name, right->name);
                 return false;
             }
         }
@@ -2399,8 +2435,8 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
 
         if (left_mutation_ver != right_mutation_ver)
         {
-            out_reason = "Current mutation versions of parts " + left->name + " and " + right->name + " differ: "
-                + toString(left_mutation_ver) + " and " + toString(right_mutation_ver) + " respectively";
+            out_reason = PreformattedMessage::create("Current mutation versions of parts {} and {} differ: "
+                         "{} and {} respectively", left->name, right->name, left_mutation_ver, right_mutation_ver);
             return false;
         }
     }
@@ -2411,23 +2447,23 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeTwoParts(
 template<typename VirtualPartsT, typename MutationsStateT>
 bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeSinglePart(
     const MergeTreeData::DataPartPtr & part,
-    String & out_reason) const
+    PreformattedMessage & out_reason) const
 {
     if (pinned_part_uuids_ && pinned_part_uuids_->part_uuids.contains(part->uuid))
     {
-        out_reason = fmt::format("Part {} has uuid {} which is currently pinned", part->name, part->uuid);
+        out_reason = PreformattedMessage::create("Part {} has uuid {} which is currently pinned", part->name, part->uuid);
         return false;
     }
 
     if (inprogress_quorum_part_ && part->name == *inprogress_quorum_part_)
     {
-        out_reason = fmt::format("Quorum insert for part {} is currently in progress", part->name);
+        out_reason = PreformattedMessage::create("Quorum insert for part {} is currently in progress", part->name);
         return false;
     }
 
     if (prev_virtual_parts_ && prev_virtual_parts_->getContainingPart(part->info).empty())
     {
-        out_reason = fmt::format("Entry for part {} hasn't been read from the replication log yet", part->name);
+        out_reason = PreformattedMessage::create("Entry for part {} hasn't been read from the replication log yet", part->name);
         return false;
     }
 
@@ -2442,7 +2478,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeSinglePart(
         String containing_part = virtual_parts_->getContainingPart(part->info);
         if (containing_part != part->name)
         {
-            out_reason = fmt::format("Part {} has already been assigned a merge into {}", part->name, containing_part);
+            out_reason = PreformattedMessage::create("Part {} has already been assigned a merge into {}", part->name, containing_part);
             return false;
         }
     }
@@ -2451,7 +2487,7 @@ bool BaseMergePredicate<VirtualPartsT, MutationsStateT>::canMergeSinglePart(
 }
 
 
-bool ReplicatedMergeTreeMergePredicate::partParticipatesInReplaceRange(const MergeTreeData::DataPartPtr & part, String & out_reason) const
+bool ReplicatedMergeTreeMergePredicate::partParticipatesInReplaceRange(const MergeTreeData::DataPartPtr & part, PreformattedMessage & out_reason) const
 {
     std::lock_guard lock(queue.state_mutex);
     for (const auto & entry : queue.queue)
@@ -2464,7 +2500,7 @@ bool ReplicatedMergeTreeMergePredicate::partParticipatesInReplaceRange(const Mer
             if (part->info.isDisjoint(MergeTreePartInfo::fromPartName(part_name, queue.format_version)))
                 continue;
 
-            out_reason = fmt::format("Part {} participates in REPLACE_RANGE {} ({})", part_name, entry->new_part_name, entry->znode_name);
+            out_reason = PreformattedMessage::create("Part {} participates in REPLACE_RANGE {} ({})", part_name, entry->new_part_name, entry->znode_name);
             return true;
         }
     }
@@ -2622,7 +2658,8 @@ String ReplicatedMergeTreeMergePredicate::getCoveringVirtualPart(const String &
 
 ReplicatedMergeTreeQueue::SubscriberHandler
 ReplicatedMergeTreeQueue::addSubscriber(ReplicatedMergeTreeQueue::SubscriberCallBack && callback,
-                                        std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode)
+                                        std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode,
+                                        std::unordered_set<String> src_replicas)
 {
     std::lock_guard<std::mutex> lock(state_mutex);
     std::lock_guard lock_subscribers(subscribers_mutex);
@@ -2639,14 +2676,57 @@ ReplicatedMergeTreeQueue::addSubscriber(ReplicatedMergeTreeQueue::SubscriberCall
             LogEntry::REPLACE_RANGE,
             LogEntry::DROP_PART
         };
+
+        std::unordered_set<String> existing_replicas;
+        if (!src_replicas.empty())
+        {
+            Strings unfiltered_hosts;
+            unfiltered_hosts = storage.getZooKeeper()->getChildren(zookeeper_path + "/replicas");
+            for (const auto & host : unfiltered_hosts)
+                existing_replicas.insert(host);
+        }
+
         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())
+            bool entry_matches = !lightweight_entries_only || std::find(lightweight_entries.begin(), lightweight_entries.end(), entry->type) != lightweight_entries.end();
+            if (!entry_matches)
+                continue;
+
+            // `src_replicas` is used for specified sets of replicas; however, we also account for
+            // entries from removed or unknown replicas. This is necessary because the `source_replica`
+            // field in a replication queue entry doesn't always indicate the current existence or state
+            // of the part in that replica. Therefore, we include entries from replicas not listed in zookeeper.
+            // The `need_wait_for_entry` condition ensures:
+            // 1. Waiting for entries from both specified (`src_replicas`) and potentially removed
+            //    or unknown replicas, as `source_replica` may not reflect the current part status.
+            // 2. Handling cases where parts become broken (e.g., due to a hard restart) leading to
+            //    changes in the source replica or empty `source_replica` fields.
+
+            // Example Scenario:
+            // - A part is added on replica1 and fetched by replica2. If the part on replica1 breaks and
+            //   replica1 schedules a re-fetch from another source, a GET_PART entry with an empty
+            //   `source_replica` may be created.
+            // - If replica3 is added and replica2 (with the intact part) is removed, SYNC .. FROM replica2
+            //   might not account for the re-fetch need from replica1, risking data inconsistencies.
+            // - Therefore, `need_wait_for_entry` considers entries with specified sources, those not in
+            //   zookeeper->getChildren(zookeeper_path + "/replicas"), and entries with empty `source_replica`.
+
+            bool is_entry_from_specified_replica = src_replicas.contains(entry->source_replica);
+
+            chassert(!existing_replicas.contains(""));
+            bool is_entry_from_removed_or_unknown_replica = !existing_replicas.contains(entry->source_replica) || entry->source_replica.empty();
+
+            bool need_wait_for_entry = src_replicas.empty() || is_entry_from_specified_replica || is_entry_from_removed_or_unknown_replica;
+
+            if (need_wait_for_entry)
+            {
                 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, ", "));
+
+        LOG_TRACE(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));
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
index ae8ae623a30..85f3aacc766 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQueue.h
@@ -71,7 +71,7 @@ private:
     String zookeeper_path;
     String replica_path;
     String logger_name;
-    Poco::Logger * log = nullptr;
+    LoggerPtr log = nullptr;
 
     /// Protects the queue, future_parts and other queue state variables.
     mutable std::mutex state_mutex;
@@ -401,7 +401,7 @@ public:
     /// 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.
-    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const MergeTreeData::DataPartPtr & part) const;
+    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.
@@ -430,7 +430,7 @@ public:
     ActionBlocker pull_log_blocker;
 
     /// Adds a subscriber
-    SubscriberHandler addSubscriber(SubscriberCallBack && callback, std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode);
+    SubscriberHandler addSubscriber(SubscriberCallBack && callback, std::unordered_set<String> & out_entry_names, SyncReplicaMode sync_mode, std::unordered_set<String> src_replicas);
 
     void notifySubscribersOnPartialShutdown();
 
@@ -499,27 +499,27 @@ class BaseMergePredicate
 {
 public:
     BaseMergePredicate() = default;
-    BaseMergePredicate(std::optional<PartitionIdsHint> && partition_ids_hint_) : partition_ids_hint(std::move(partition_ids_hint_)) {}
+    explicit BaseMergePredicate(std::optional<PartitionIdsHint> && partition_ids_hint_) : partition_ids_hint(std::move(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,
                     const MergeTreeData::DataPartPtr & right,
                     const MergeTreeTransaction * txn,
-                    String & out_reason) const;
+                    PreformattedMessage & out_reason) const;
 
     /// Can we assign a merge with these two parts?
     /// (assuming that no merge was assigned after the predicate was constructed)
     /// If we can't and out_reason is not nullptr, set it to the reason why we can't merge.
     bool canMergeTwoParts(const MergeTreeData::DataPartPtr & left,
                           const MergeTreeData::DataPartPtr & right,
-                          String & out_reason) const;
+                          PreformattedMessage & out_reason) const;
 
     /// Can we assign a merge this part and some other part?
     /// For example a merge of a part and itself is needed for TTL.
     /// This predicate is checked for the first part of each range.
-    bool canMergeSinglePart(const MergeTreeData::DataPartPtr & part, String & out_reason) const;
+    bool canMergeSinglePart(const MergeTreeData::DataPartPtr & part, PreformattedMessage & out_reason) const;
 
-    CommittingBlocks getCommittingBlocks(zkutil::ZooKeeperPtr & zookeeper, const std::string & zookeeper_path, Poco::Logger * log_);
+    CommittingBlocks getCommittingBlocks(zkutil::ZooKeeperPtr & zookeeper, const std::string & zookeeper_path, LoggerPtr log_);
 
 protected:
     /// A list of partitions that can be used in the merge predicate
@@ -550,7 +550,7 @@ protected:
 class LocalMergePredicate : public BaseMergePredicate<ActiveDataPartSet, ReplicatedMergeTreeQueue>
 {
 public:
-    LocalMergePredicate(ReplicatedMergeTreeQueue & queue_);
+    explicit LocalMergePredicate(ReplicatedMergeTreeQueue & queue_);
 };
 
 class ReplicatedMergeTreeMergePredicate : public BaseMergePredicate<ActiveDataPartSet, ReplicatedMergeTreeQueue>
@@ -561,7 +561,7 @@ public:
 
     /// Returns true if part is needed for some REPLACE_RANGE entry.
     /// We should not drop part in this case, because replication queue may stuck without that part.
-    bool partParticipatesInReplaceRange(const MergeTreeData::DataPartPtr & part, String & out_reason) const;
+    bool partParticipatesInReplaceRange(const MergeTreeData::DataPartPtr & part, PreformattedMessage & out_reason) const;
 
     /// Return nonempty optional of desired mutation version and alter version.
     /// If we have no alter (modify/drop) mutations in mutations queue, than we return biggest possible
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
index a0b0d026693..81045460ab7 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeQuorumAddedParts.h
@@ -22,7 +22,7 @@ struct ReplicatedMergeTreeQuorumAddedParts
 
     MergeTreeDataFormatVersion format_version;
 
-    ReplicatedMergeTreeQuorumAddedParts(const MergeTreeDataFormatVersion format_version_)
+    explicit ReplicatedMergeTreeQuorumAddedParts(const MergeTreeDataFormatVersion format_version_)
         : format_version(format_version_)
     {}
 
@@ -66,7 +66,7 @@ struct ReplicatedMergeTreeQuorumAddedParts
     }
 
     /// Read added blocks when node in ZooKeeper supports only one partition.
-    PartitionIdToPartName readV1(ReadBuffer & in)
+    PartitionIdToPartName readV1(ReadBuffer & in) const
     {
         PartitionIdToPartName parts_in_quorum;
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
index 579592b0b3e..35f355d1d9b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.cpp
@@ -4,6 +4,7 @@
 #include <Storages/MergeTree/ReplicatedMergeTreeQuorumEntry.h>
 #include <Storages/MergeTree/ReplicatedMergeTreeAddress.h>
 #include <Interpreters/Context.h>
+#include <Common/FailPoint.h>
 #include <Common/ZooKeeper/KeeperException.h>
 #include <Common/randomSeed.h>
 #include <Core/ServerUUID.h>
@@ -24,6 +25,11 @@ namespace ErrorCodes
     extern const int REPLICA_IS_ALREADY_ACTIVE;
 }
 
+namespace FailPoints
+{
+    extern const char finish_clean_quorum_failed_parts[];
+};
+
 /// Used to check whether it's us who set node `is_active`, or not.
 static String generateActiveNodeIdentifier()
 {
@@ -33,7 +39,7 @@ static String generateActiveNodeIdentifier()
 ReplicatedMergeTreeRestartingThread::ReplicatedMergeTreeRestartingThread(StorageReplicatedMergeTree & storage_)
     : storage(storage_)
     , log_name(storage.getStorageID().getFullTableName() + " (ReplicatedMergeTreeRestartingThread)")
-    , log(&Poco::Logger::get(log_name))
+    , log(getLogger(log_name))
     , active_node_identifier(generateActiveNodeIdentifier())
 {
     const auto storage_settings = storage.getSettings();
@@ -241,6 +247,7 @@ void ReplicatedMergeTreeRestartingThread::removeFailedQuorumParts()
             storage.queue.removeFailedQuorumPart(part->info);
         }
     }
+    FailPointInjection::disableFailPoint(FailPoints::finish_clean_quorum_failed_parts);
 }
 
 
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
index 02103272a1f..01071d80e8b 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeRestartingThread.h
@@ -42,7 +42,7 @@ public:
 private:
     StorageReplicatedMergeTree & storage;
     String log_name;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<bool> need_stop {false};
 
     /// The random data we wrote into `/replicas/me/is_active`.
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
index 218ed3bff12..86b28f72e19 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.cpp
@@ -30,6 +30,7 @@ namespace FailPoints
     extern const char replicated_merge_tree_commit_zk_fail_after_op[];
     extern const char replicated_merge_tree_insert_quorum_fail_0[];
     extern const char replicated_merge_tree_commit_zk_fail_when_recovering_from_hw_fault[];
+    extern const char replicated_merge_tree_insert_retry_pause[];
 }
 
 namespace ErrorCodes
@@ -58,7 +59,7 @@ struct ReplicatedMergeTreeSinkImpl<async_insert>::DelayedChunk
         ProfileEvents::Counters part_counters;
 
         Partition() = default;
-        Partition(Poco::Logger * log_,
+        Partition(LoggerPtr log_,
                   MergeTreeDataWriter::TemporaryPart && temp_part_,
                   UInt64 elapsed_ns_,
                   BlockIDsType && block_id_,
@@ -92,7 +93,7 @@ std::vector<Int64> testSelfDeduplicate(std::vector<Int64> data, std::vector<size
     BlockWithPartition block1(std::move(block), Row(), std::move(offsets), std::move(tokens));
     ProfileEvents::Counters profile_counters;
     ReplicatedMergeTreeSinkImpl<true>::DelayedChunk::Partition part(
-        &Poco::Logger::get("testSelfDeduplicate"), MergeTreeDataWriter::TemporaryPart(), 0, std::move(hashes), std::move(block1), std::nullopt, std::move(profile_counters));
+        getLogger("testSelfDeduplicate"), MergeTreeDataWriter::TemporaryPart(), 0, std::move(hashes), std::move(block1), std::nullopt, std::move(profile_counters));
 
     part.filterSelfDuplicate();
 
@@ -128,7 +129,8 @@ ReplicatedMergeTreeSinkImpl<async_insert>::ReplicatedMergeTreeSinkImpl(
     bool deduplicate_,
     bool majority_quorum,
     ContextPtr context_,
-    bool is_attach_)
+    bool is_attach_,
+    bool allow_attach_while_readonly_)
     : SinkToStorage(metadata_snapshot_->getSampleBlock())
     , storage(storage_)
     , metadata_snapshot(metadata_snapshot_)
@@ -136,9 +138,10 @@ ReplicatedMergeTreeSinkImpl<async_insert>::ReplicatedMergeTreeSinkImpl(
     , quorum_timeout_ms(quorum_timeout_ms_)
     , max_parts_per_block(max_parts_per_block_)
     , is_attach(is_attach_)
+    , allow_attach_while_readonly(allow_attach_while_readonly_)
     , quorum_parallel(quorum_parallel_)
     , deduplicate(deduplicate_)
-    , log(&Poco::Logger::get(storage.getLogName() + " (Replicated OutputStream)"))
+    , log(getLogger(storage.getLogName() + " (Replicated OutputStream)"))
     , context(context_)
     , storage_snapshot(storage.getStorageSnapshotWithoutData(metadata_snapshot, context_))
 {
@@ -288,7 +291,7 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
             throw Exception(ErrorCodes::LOGICAL_ERROR, "No chunk info for async inserts");
     }
 
-    auto part_blocks = storage.writer.splitBlockIntoParts(block, max_parts_per_block, metadata_snapshot, context, async_insert_info);
+    auto part_blocks = MergeTreeDataWriter::splitBlockIntoParts(std::move(block), max_parts_per_block, metadata_snapshot, context, async_insert_info);
 
     using DelayedPartition = typename ReplicatedMergeTreeSinkImpl<async_insert>::DelayedChunk::Partition;
     using DelayedPartitions = std::vector<DelayedPartition>;
@@ -323,6 +326,9 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
         if (!temp_part.part)
             continue;
 
+        if (!support_parallel_write && temp_part.part->getDataPartStorage().supportParallelWrite())
+            support_parallel_write = true;
+
         BlockIDsType block_id;
 
         if constexpr (async_insert)
@@ -365,9 +371,13 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
         profile_events_scope.reset();
         UInt64 elapsed_ns = watch.elapsed();
 
-        size_t max_insert_delayed_streams_for_parallel_write = DEFAULT_DELAYED_STREAMS_FOR_PARALLEL_WRITE;
-        if (!support_parallel_write || settings.max_insert_delayed_streams_for_parallel_write.changed)
+        size_t max_insert_delayed_streams_for_parallel_write;
+        if (settings.max_insert_delayed_streams_for_parallel_write.changed)
             max_insert_delayed_streams_for_parallel_write = settings.max_insert_delayed_streams_for_parallel_write;
+        else if (support_parallel_write)
+            max_insert_delayed_streams_for_parallel_write = DEFAULT_DELAYED_STREAMS_FOR_PARALLEL_WRITE;
+        else
+            max_insert_delayed_streams_for_parallel_write = 0;
 
         /// In case of too much columns/parts in block, flush explicitly.
         streams += temp_part.streams.size();
@@ -383,6 +393,12 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::consume(Chunk chunk)
             partitions = DelayedPartitions{};
         }
 
+        if constexpr (!async_insert)
+        {
+            /// Reset earlier to free memory.
+            current_block.block.clear();
+            current_block.partition.clear();
+        }
 
         partitions.emplace_back(DelayedPartition(
             log,
@@ -427,7 +443,7 @@ void ReplicatedMergeTreeSinkImpl<false>::finishDelayedChunk(const ZooKeeperWithF
 
         try
         {
-            bool deduplicated = commitPart(zookeeper, part, partition.block_id, delayed_chunk->replicas_num, false).second;
+            bool deduplicated = commitPart(zookeeper, part, partition.block_id, delayed_chunk->replicas_num).second;
 
             last_block_is_duplicate = last_block_is_duplicate || deduplicated;
 
@@ -435,7 +451,7 @@ void ReplicatedMergeTreeSinkImpl<false>::finishDelayedChunk(const ZooKeeperWithF
             int error = (deduplicate && deduplicated) ? ErrorCodes::INSERT_WAS_DEDUPLICATED : 0;
             auto counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(partition.part_counters.getPartiallyAtomicSnapshot());
             PartLog::addNewPart(storage.getContext(), PartLog::PartLogEntry(part, partition.elapsed_ns, counters_snapshot), ExecutionStatus(error));
-            storage.incrementInsertedPartsProfileEvent(part->getType());
+            StorageReplicatedMergeTree::incrementInsertedPartsProfileEvent(part->getType());
         }
         catch (...)
         {
@@ -472,9 +488,16 @@ void ReplicatedMergeTreeSinkImpl<true>::finishDelayedChunk(const ZooKeeperWithFa
         while (true)
         {
             partition.temp_part.finalize();
-            auto conflict_block_ids = commitPart(zookeeper, partition.temp_part.part, partition.block_id, delayed_chunk->replicas_num, false).first;
+            auto conflict_block_ids = commitPart(zookeeper, partition.temp_part.part, partition.block_id, delayed_chunk->replicas_num).first;
             if (conflict_block_ids.empty())
+            {
+                auto counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(partition.part_counters.getPartiallyAtomicSnapshot());
+                PartLog::addNewPart(
+                    storage.getContext(),
+                    PartLog::PartLogEntry(partition.temp_part.part, partition.elapsed_ns, counters_snapshot),
+                    ExecutionStatus(0));
                 break;
+            }
 
             storage.async_block_ids_cache.triggerCacheUpdate();
             ++retry_times;
@@ -482,7 +505,14 @@ void ReplicatedMergeTreeSinkImpl<true>::finishDelayedChunk(const ZooKeeperWithFa
             /// partition clean conflict
             partition.filterBlockDuplicate(conflict_block_ids, false);
             if (partition.block_with_partition.block.rows() == 0)
+            {
+                auto counters_snapshot = std::make_shared<ProfileEvents::Counters::Snapshot>(partition.part_counters.getPartiallyAtomicSnapshot());
+                PartLog::addNewPart(
+                    storage.getContext(),
+                    PartLog::PartLogEntry(partition.temp_part.part, partition.elapsed_ns, counters_snapshot),
+                    ExecutionStatus(ErrorCodes::INSERT_WAS_DEDUPLICATED));
                 break;
+            }
             partition.block_with_partition.partition = std::move(partition.temp_part.part->partition.value);
             /// partition.temp_part is already finalized, no need to call cancel
             partition.temp_part = storage.writer.writeTempPart(partition.block_with_partition, metadata_snapshot, context);
@@ -529,7 +559,7 @@ bool ReplicatedMergeTreeSinkImpl<false>::writeExistingPart(MergeTreeData::Mutabl
     {
         part->version.setCreationTID(Tx::PrehistoricTID, nullptr);
         String block_id = deduplicate ? fmt::format("{}_{}", part->info.partition_id, part->checksums.getTotalChecksumHex()) : "";
-        bool deduplicated = commitPart(zookeeper, part, block_id, replicas_num, /* writing_existing_part */ true).second;
+        bool deduplicated = commitPart(zookeeper, part, block_id, replicas_num).second;
 
         /// Set a special error code if the block is duplicate
         int error = (deduplicate && deduplicated) ? ErrorCodes::INSERT_WAS_DEDUPLICATED : 0;
@@ -620,8 +650,7 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
     const ZooKeeperWithFaultInjectionPtr & zookeeper,
     MergeTreeData::MutableDataPartPtr & part,
     const BlockIDsType & block_id,
-    size_t replicas_num,
-    bool writing_existing_part)
+    size_t replicas_num)
 {
     /// It is possible that we alter a part with different types of source columns.
     /// In this case, if column was not altered, the result type will be different with what we have in metadata.
@@ -771,9 +800,9 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
                 throw Exception(
                     ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to shutdown: replica_path={}", storage.replica_path);
 
-            /// When we attach existing parts it's okay to be in read-only mode
-            /// For example during RESTORE REPLICA.
-            if (!writing_existing_part)
+            /// Usually parts should not be attached in read-only mode. So we retry until the table is not read-only.
+            /// However there is one case when it's necessary to attach in read-only mode - during execution of the RESTORE REPLICA command.
+            if (!allow_attach_while_readonly)
             {
                 retries_ctl.setUserError(
                     Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode: replica_path={}", storage.replica_path));
@@ -879,7 +908,7 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
         fiu_do_on(FailPoints::replicated_merge_tree_commit_zk_fail_after_op, { zookeeper->forceFailureAfterOperation(); });
 
         Coordination::Responses responses;
-        Coordination::Error multi_code = zookeeper->tryMultiNoThrow(ops, responses); /// 1 RTT
+        Coordination::Error multi_code = zookeeper->tryMultiNoThrow(ops, responses, /* check_session_valid */ true); /// 1 RTT
 
         if (multi_code == Coordination::Error::ZOK)
         {
@@ -913,14 +942,27 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
             });
 
             bool node_exists = false;
+            bool quorum_fail_exists = false;
             /// The loop will be executed at least once
             new_retry_controller.retryLoop([&]
             {
                 fiu_do_on(FailPoints::replicated_merge_tree_commit_zk_fail_when_recovering_from_hw_fault, { zookeeper->forceFailureBeforeOperation(); });
+                FailPointInjection::pauseFailPoint(FailPoints::replicated_merge_tree_insert_retry_pause);
                 zookeeper->setKeeper(storage.getZooKeeper());
                 node_exists = zookeeper->exists(fs::path(storage.replica_path) / "parts" / part->name);
+                if (isQuorumEnabled())
+                    quorum_fail_exists = zookeeper->exists(fs::path(storage.zookeeper_path) / "quorum" / "failed_parts" / part->name);
             });
 
+            /// if it has quorum fail node, the restarting thread will clean the garbage.
+            if (quorum_fail_exists)
+            {
+                LOG_INFO(log, "Part {} fails to commit and will not retry or clean garbage. Restarting Thread will do everything.", part->name);
+                transaction.clear();
+            /// `quorum/failed_parts/part_name` exists because table is read only for a while, So we return table is read only.
+                throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to shutdown: replica_path={}", storage.replica_path);
+            }
+
             if (node_exists)
             {
                 LOG_DEBUG(log, "Insert of part {} recovered from keeper successfully. It will be committed", part->name);
@@ -1089,6 +1131,7 @@ std::pair<std::vector<String>, bool> ReplicatedMergeTreeSinkImpl<async_insert>::
                     retry_context.actual_part_name,
                     quorum_info.status_path,
                     quorum_info.is_active_node_version,
+                    quorum_info.host_node_version,
                     replicas_num);
             });
         }
@@ -1117,7 +1160,8 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::waitForQuorum(
     const ZooKeeperWithFaultInjectionPtr & zookeeper,
     const std::string & part_name,
     const std::string & quorum_path,
-    Int32 is_active_node_version,
+    int is_active_node_version,
+    int host_node_version,
     size_t replicas_num) const
 {
     /// We are waiting for quorum to be satisfied.
@@ -1153,12 +1197,16 @@ void ReplicatedMergeTreeSinkImpl<async_insert>::waitForQuorum(
 
     /// And what if it is possible that the current replica at this time has ceased to be active
     /// and the quorum is marked as failed and deleted?
-    Coordination::Stat stat;
-    String value;
-    if (!zookeeper->tryGet(storage.replica_path + "/is_active", value, &stat) || stat.version != is_active_node_version)
+    /// Note: checking is_active is not enough since it's ephemeral, and the version can be the same after recreation,
+    /// so need to check host node as well
+    auto get_results = zookeeper->tryGet(Strings{storage.replica_path + "/is_active", storage.replica_path + "/host"});
+    const auto & is_active = get_results[0];
+    const auto & host = get_results[1];
+    if ((is_active.error == Coordination::Error::ZNONODE || is_active.stat.version != is_active_node_version)
+        || (host.error == Coordination::Error::ZNONODE || host.stat.version != host_node_version))
         throw Exception(
             ErrorCodes::UNKNOWN_STATUS_OF_INSERT,
-            "Unknown quorum status. The data was inserted in the local replica but we could not verify quorum. Reason: "
+            "Unknown quorum status. The data was inserted in the local replica, but we could not verify the quorum. Reason: "
             "Replica became inactive while waiting for quorum");
 
     LOG_TRACE(log, "Quorum '{}' for part {} satisfied", quorum_path, part_name);
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
index 5c70d0c76e1..39623c20584 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeSink.h
@@ -3,7 +3,7 @@
 #include <Processors/Sinks/SinkToStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <base/types.h>
-#include <Storages/MergeTree/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
 #include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
 #include <Storages/MergeTree/AsyncBlockIDsCache.h>
 
@@ -45,7 +45,8 @@ public:
         ContextPtr context_,
         // special flag to determine the ALTER TABLE ATTACH PART without the query context,
         // needed to set the special LogEntryType::ATTACH_PART
-        bool is_attach_ = false);
+        bool is_attach_ = false,
+        bool allow_attach_while_readonly_ = false);
 
     ~ReplicatedMergeTreeSinkImpl() override;
 
@@ -93,8 +94,7 @@ private:
         const ZooKeeperWithFaultInjectionPtr & zookeeper,
         MergeTreeData::MutableDataPartPtr & part,
         const BlockIDsType & block_id,
-        size_t replicas_num,
-        bool writing_existing_part);
+        size_t replicas_num);
 
 
     /// Wait for quorum to be satisfied on path (quorum_path) form part (part_name)
@@ -104,6 +104,7 @@ private:
         const std::string & part_name,
         const std::string & quorum_path,
         int is_active_node_version,
+        int host_node_version,
         size_t replicas_num) const;
 
     StorageReplicatedMergeTree & storage;
@@ -122,12 +123,13 @@ private:
     UInt64 cache_version = 0;
 
     bool is_attach = false;
+    bool allow_attach_while_readonly = false;
     bool quorum_parallel = false;
     const bool deduplicate = true;
     bool last_block_is_duplicate = false;
     UInt64 num_blocks_processed = 0;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     ContextPtr context;
     StorageSnapshotPtr storage_snapshot;
diff --git a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
index 41188891118..287a4d20543 100644
--- a/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
+++ b/src/Storages/MergeTree/ReplicatedMergeTreeTableMetadata.cpp
@@ -33,7 +33,7 @@ static String formattedASTNormalized(const ASTPtr & ast)
     if (!ast)
         return "";
     auto ast_normalized = ast->clone();
-    FunctionNameNormalizer().visit(ast_normalized.get());
+    FunctionNameNormalizer::visit(ast_normalized.get());
     WriteBufferFromOwnString buf;
     formatAST(*ast_normalized, buf, false, true);
     return buf.str();
@@ -43,7 +43,7 @@ ReplicatedMergeTreeTableMetadata::ReplicatedMergeTreeTableMetadata(const MergeTr
 {
     if (data.format_version < MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING)
     {
-        auto minmax_idx_column_names = data.getMinMaxColumnsNames(metadata_snapshot->getPartitionKey());
+        auto minmax_idx_column_names = MergeTreeData::getMinMaxColumnsNames(metadata_snapshot->getPartitionKey());
         date_column = minmax_idx_column_names[data.minmax_idx_date_column_pos];
     }
 
@@ -432,7 +432,7 @@ StorageInMemoryMetadata ReplicatedMergeTreeTableMetadata::Diff::getNewMetadata(c
         auto parse_key_expr = [] (const String & key_expr)
         {
             ParserNotEmptyExpressionList parser(false);
-            auto new_sorting_key_expr_list = parseQuery(parser, key_expr, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+            auto new_sorting_key_expr_list = parseQuery(parser, key_expr, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
             ASTPtr order_by_ast;
             if (new_sorting_key_expr_list->children.size() == 1)
@@ -489,7 +489,7 @@ StorageInMemoryMetadata ReplicatedMergeTreeTableMetadata::Diff::getNewMetadata(c
             if (!new_ttl_table.empty())
             {
                 ParserTTLExpressionList parser;
-                auto ttl_for_table_ast = parseQuery(parser, new_ttl_table, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+                auto ttl_for_table_ast = parseQuery(parser, new_ttl_table, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
                 new_metadata.table_ttl = TTLTableDescription::getTTLForTableFromAST(
                     ttl_for_table_ast, new_metadata.columns, context, new_metadata.primary_key, true /* allow_suspicious; because it is replication */);
             }
diff --git a/src/Storages/MergeTree/ReplicatedTableStatus.h b/src/Storages/MergeTree/ReplicatedTableStatus.h
index ce9ad3640f4..786a5fdb44d 100644
--- a/src/Storages/MergeTree/ReplicatedTableStatus.h
+++ b/src/Storages/MergeTree/ReplicatedTableStatus.h
@@ -24,8 +24,8 @@ struct ReplicatedTableStatus
     UInt64 log_max_index;
     UInt64 log_pointer;
     UInt64 absolute_delay;
-    UInt8 total_replicas;
-    UInt8 active_replicas;
+    UInt32 total_replicas;
+    UInt32 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.
diff --git a/src/Storages/MergeTree/SimpleMergeSelector.h b/src/Storages/MergeTree/SimpleMergeSelector.h
index c20eaa6e8de..a12b8ba48cb 100644
--- a/src/Storages/MergeTree/SimpleMergeSelector.h
+++ b/src/Storages/MergeTree/SimpleMergeSelector.h
@@ -26,7 +26,7 @@ Then we need some balance between optimization of these two metrics.
 But some optimizations may improve both metrics.
 
 For example, we can look at the "merge tree" - the tree of data parts that were merged.
-If the tree is perfectly balanced then its depth is proportonal to the log(data size),
+If the tree is perfectly balanced then its depth is proportional to the log(data size),
 the total amount of work is proportional to data_size * log(data_size)
 and the write amplification is proportional to log(data_size).
 If it's not balanced (e.g. every new data part is always merged with existing data parts),
diff --git a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
index bbb38346f38..ca8ed9abdb5 100644
--- a/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
+++ b/src/Storages/MergeTree/StorageFromMergeTreeDataPart.h
@@ -34,6 +34,7 @@ public:
         , partition_id(part_->info.partition_id)
     {
         setInMemoryMetadata(storage.getInMemoryMetadata());
+        setVirtuals(*storage.getVirtualsPtr());
     }
 
     /// Used in queries with projection.
@@ -90,11 +91,6 @@ public:
 
     bool supportsSubcolumns() const override { return true; }
 
-    NamesAndTypesList getVirtuals() const override
-    {
-        return storage.getVirtuals();
-    }
-
     String getPartitionId() const
     {
         return partition_id;
diff --git a/src/Storages/MergeTree/checkDataPart.cpp b/src/Storages/MergeTree/checkDataPart.cpp
index 7e0b69c7638..d64568e0c3e 100644
--- a/src/Storages/MergeTree/checkDataPart.cpp
+++ b/src/Storages/MergeTree/checkDataPart.cpp
@@ -7,7 +7,6 @@
 #include <Storages/MergeTree/MergeTreeIndexGranularity.h>
 #include <Storages/MergeTree/checkDataPart.h>
 #include <Storages/MergeTree/MergeTreeDataPartCompact.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/IDataPartStorage.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
@@ -43,6 +42,7 @@ namespace ErrorCodes
     extern const int NO_FILE_IN_DATA_PART;
     extern const int NETWORK_ERROR;
     extern const int SOCKET_TIMEOUT;
+    extern const int BROKEN_PROJECTION;
 }
 
 
@@ -57,7 +57,7 @@ bool isNotEnoughMemoryErrorCode(int code)
         || code == ErrorCodes::CANNOT_MREMAP;
 }
 
-bool isRetryableException(const std::exception_ptr exception_ptr)
+bool isRetryableException(std::exception_ptr exception_ptr)
 {
     try
     {
@@ -117,7 +117,9 @@ static IMergeTreeDataPart::Checksums checkDataPart(
     const NameSet & files_without_checksums,
     const ReadSettings & read_settings,
     bool require_checksums,
-    std::function<bool()> is_cancelled)
+    std::function<bool()> is_cancelled,
+    bool & is_broken_projection,
+    bool throw_on_broken_projection)
 {
     /** Responsibility:
       * - read list of columns from columns.txt;
@@ -126,6 +128,7 @@ static IMergeTreeDataPart::Checksums checkDataPart(
       */
 
     CurrentMetrics::Increment metric_increment{CurrentMetrics::ReplicatedChecks};
+    Poco::Logger * log = &Poco::Logger::get("checkDataPart");
 
     NamesAndTypesList columns_txt;
 
@@ -254,7 +257,7 @@ static IMergeTreeDataPart::Checksums checkDataPart(
         }
 
         /// Exclude files written by inverted index from check. No correct checksums are available for them currently.
-        if (file_name.ends_with(".gin_dict") || file_name.ends_with(".gin_post") || file_name.ends_with(".gin_seg") || file_name.ends_with(".gin_sid"))
+        if (isGinFile(file_name))
             continue;
 
         auto checksum_it = checksums_data.files.find(file_name);
@@ -275,17 +278,54 @@ static IMergeTreeDataPart::Checksums checkDataPart(
         }
     }
 
+    std::string broken_projections_message;
     for (const auto & [name, projection] : data_part->getProjectionParts())
     {
         if (is_cancelled())
             return {};
 
         auto projection_file = name + ".proj";
-        auto projection_checksums = checkDataPart(
-            projection, *data_part_storage.getProjection(projection_file),
-            projection->getColumns(), projection->getType(),
-            projection->getFileNamesWithoutChecksums(),
-            read_settings, require_checksums, is_cancelled);
+
+        IMergeTreeDataPart::Checksums projection_checksums;
+        try
+        {
+            bool noop;
+            projection_checksums = checkDataPart(
+                projection, *data_part_storage.getProjection(projection_file),
+                projection->getColumns(), projection->getType(),
+                projection->getFileNamesWithoutChecksums(),
+                read_settings, require_checksums, is_cancelled, noop, /* throw_on_broken_projection */false);
+        }
+        catch (...)
+        {
+            if (isRetryableException(std::current_exception()))
+                throw;
+
+            is_broken_projection = true;
+            projections_on_disk.erase(projection_file);
+            checksums_txt.remove(projection_file);
+
+            const auto exception_message = getCurrentExceptionMessage(true);
+
+            if (!projection->is_broken)
+            {
+                LOG_WARNING(log, "Marking projection {} as broken ({}). Reason: {}",
+                            name, projection_file, exception_message);
+                projection->setBrokenReason(exception_message, getCurrentExceptionCode());
+            }
+
+            if (throw_on_broken_projection)
+            {
+                if (!broken_projections_message.empty())
+                    broken_projections_message += "\n";
+
+                broken_projections_message += fmt::format(
+                    "Part {} has a broken projection {} (error: {})",
+                    data_part->name, name, exception_message);
+            }
+
+            continue;
+        }
 
         checksums_data.files[projection_file] = IMergeTreeDataPart::Checksums::Checksum(
             projection_checksums.getTotalSizeOnDisk(),
@@ -294,6 +334,11 @@ static IMergeTreeDataPart::Checksums checkDataPart(
         projections_on_disk.erase(projection_file);
     }
 
+    if (throw_on_broken_projection && !broken_projections_message.empty())
+    {
+        throw Exception(ErrorCodes::BROKEN_PROJECTION, "{}", broken_projections_message);
+    }
+
     if (require_checksums && !projections_on_disk.empty())
     {
         throw Exception(ErrorCodes::UNEXPECTED_FILE_IN_DATA_PART,
@@ -310,22 +355,13 @@ static IMergeTreeDataPart::Checksums checkDataPart(
     return checksums_data;
 }
 
-IMergeTreeDataPart::Checksums checkDataPartInMemory(const DataPartInMemoryPtr & data_part)
-{
-    IMergeTreeDataPart::Checksums data_checksums;
-    data_checksums.files["data.bin"] = data_part->calculateBlockChecksum();
-    data_part->checksums.checkEqual(data_checksums, true);
-    return data_checksums;
-}
-
 IMergeTreeDataPart::Checksums checkDataPart(
     MergeTreeData::DataPartPtr data_part,
     bool require_checksums,
-    std::function<bool()> is_cancelled)
+    bool & is_broken_projection,
+    std::function<bool()> is_cancelled,
+    bool throw_on_broken_projection)
 {
-    if (auto part_in_memory = asInMemoryPart(data_part))
-        return checkDataPartInMemory(part_in_memory);
-
     /// If check of part has failed and it is stored on disk with cache
     /// try to drop cache and check it once again because maybe the cache
     /// is broken not the part itself.
@@ -338,7 +374,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
             throw;
 
         LOG_DEBUG(
-            &Poco::Logger::get("checkDataPart"),
+            getLogger("checkDataPart"),
             "Will drop cache for data part {} and will check it once again", data_part->name);
 
         auto & cache = *FileCacheFactory::instance().getByName(*cache_name)->cache;
@@ -348,7 +384,7 @@ IMergeTreeDataPart::Checksums checkDataPart(
             if (!data_part_storage.isDirectory(file_name))
             {
                 auto remote_path = data_part_storage.getRemotePath(file_name);
-                cache.removePathIfExists(remote_path);
+                cache.removePathIfExists(remote_path, FileCache::getCommonUser().user_id);
             }
         }
 
@@ -363,7 +399,9 @@ IMergeTreeDataPart::Checksums checkDataPart(
             data_part->getFileNamesWithoutChecksums(),
             read_settings,
             require_checksums,
-            is_cancelled);
+            is_cancelled,
+            is_broken_projection,
+            throw_on_broken_projection);
     };
 
     try
@@ -377,7 +415,9 @@ IMergeTreeDataPart::Checksums checkDataPart(
             data_part->getFileNamesWithoutChecksums(),
             read_settings,
             require_checksums,
-            is_cancelled);
+            is_cancelled,
+            is_broken_projection,
+            throw_on_broken_projection);
     }
     catch (...)
     {
diff --git a/src/Storages/MergeTree/checkDataPart.h b/src/Storages/MergeTree/checkDataPart.h
index d0e48b6f80a..2f9894bc70f 100644
--- a/src/Storages/MergeTree/checkDataPart.h
+++ b/src/Storages/MergeTree/checkDataPart.h
@@ -10,9 +10,11 @@ namespace DB
 IMergeTreeDataPart::Checksums checkDataPart(
     MergeTreeData::DataPartPtr data_part,
     bool require_checksums,
-    std::function<bool()> is_cancelled = []{ return false; });
+    bool & is_broken_projection,
+    std::function<bool()> is_cancelled = []{ return false; },
+    bool throw_on_broken_projection = false);
 
 bool isNotEnoughMemoryErrorCode(int code);
-bool isRetryableException(const std::exception_ptr exception_ptr);
+bool isRetryableException(std::exception_ptr exception_ptr);
 
 }
diff --git a/src/Storages/MergeTree/examples/CMakeLists.txt b/src/Storages/MergeTree/examples/CMakeLists.txt
deleted file mode 100644
index 25bba7ae0b4..00000000000
--- a/src/Storages/MergeTree/examples/CMakeLists.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-clickhouse_add_executable (wal_action_metadata wal_action_metadata.cpp)
-target_link_libraries (wal_action_metadata PRIVATE dbms)
diff --git a/src/Storages/MergeTree/examples/wal_action_metadata.cpp b/src/Storages/MergeTree/examples/wal_action_metadata.cpp
deleted file mode 100644
index 03c38c7a186..00000000000
--- a/src/Storages/MergeTree/examples/wal_action_metadata.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-#include <iostream>
-
-#include <IO/MemoryReadWriteBuffer.h>
-#include <Storages/MergeTree/MergeTreeWriteAheadLog.h>
-
-namespace DB
-{
-namespace ErrorCodes
-{
-    extern const int UNKNOWN_FORMAT_VERSION;
-}
-}
-
-int main(int, char **)
-{
-    try
-    {
-        {
-            std::cout << "test: dummy test" << std::endl;
-
-            DB::MergeTreeWriteAheadLog::ActionMetadata metadata_out;
-            DB::MemoryWriteBuffer buf{};
-
-            metadata_out.write(buf);
-            buf.finalize();
-
-            metadata_out.read(*buf.tryGetReadBuffer());
-        }
-
-        {
-            std::cout << "test: min compatibility" << std::endl;
-
-            DB::MergeTreeWriteAheadLog::ActionMetadata metadata_out;
-            metadata_out.min_compatible_version = DB::MergeTreeWriteAheadLog::WAL_VERSION + 1;
-            DB::MemoryWriteBuffer buf{};
-
-            metadata_out.write(buf);
-            buf.finalize();
-
-            try
-            {
-                metadata_out.read(*buf.tryGetReadBuffer());
-            }
-            catch (const DB::Exception & e)
-            {
-                if (e.code() != DB::ErrorCodes::UNKNOWN_FORMAT_VERSION)
-                {
-                    std::cerr << "Expected UNKNOWN_FORMAT_VERSION exception but got: "
-                        << e.what() << ", " << e.displayText() << std::endl;
-                }
-            }
-        }
-    }
-    catch (const DB::Exception & e)
-    {
-        std::cerr << e.what() << ", " << e.displayText() << std::endl;
-        return 1;
-    }
-
-    return 0;
-}
diff --git a/src/Storages/MergeTree/extractZkPathFromCreateQuery.cpp b/src/Storages/MergeTree/extractZkPathFromCreateQuery.cpp
index 45d667047af..8ea732b0243 100644
--- a/src/Storages/MergeTree/extractZkPathFromCreateQuery.cpp
+++ b/src/Storages/MergeTree/extractZkPathFromCreateQuery.cpp
@@ -1,11 +1,12 @@
-#include <Storages/MergeTree/extractZkPathFromCreateQuery.h>
-#include <Common/Macros.h>
 #include <Databases/DatabaseReplicatedHelpers.h>
 #include <Databases/IDatabase.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
-#include <Interpreters/Context.h>
+#include <Storages/MergeTree/extractZkPathFromCreateQuery.h>
+#include <Common/Macros.h>
 
 
 namespace DB
diff --git a/src/Storages/MergeTree/registerStorageMergeTree.cpp b/src/Storages/MergeTree/registerStorageMergeTree.cpp
index 9a5af77d57c..d552a4b6fa5 100644
--- a/src/Storages/MergeTree/registerStorageMergeTree.cpp
+++ b/src/Storages/MergeTree/registerStorageMergeTree.cpp
@@ -1,6 +1,5 @@
 #include <Databases/DatabaseReplicatedHelpers.h>
 #include <Storages/MergeTree/MergeTreeIndexMinMax.h>
-#include <Storages/MergeTree/MergeTreeIndexSet.h>
 #include <Storages/MergeTree/MergeTreeIndices.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMergeTree.h>
@@ -9,16 +8,13 @@
 #include <Common/Macros.h>
 #include <Common/OptimizedRegularExpression.h>
 #include <Common/typeid_cast.h>
-#include <Common/thread_local_rng.h>
 
-#include <Parsers/ASTCreateQuery.h>
-#include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTSetQuery.h>
 
+#include <DataTypes/DataTypeCustomSimpleAggregateFunction.h>
 #include <AggregateFunctions/AggregateFunctionFactory.h>
-#include <AggregateFunctions/parseAggregateFunctionParameters.h>
 
 #include <Interpreters/Context.h>
 #include <Interpreters/FunctionNameNormalizer.h>
@@ -35,6 +31,7 @@ namespace ErrorCodes
     extern const int UNKNOWN_STORAGE;
     extern const int NO_REPLICA_NAME_GIVEN;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int DATA_TYPE_CANNOT_BE_USED_IN_KEY;
 }
 
 
@@ -115,6 +112,16 @@ static ColumnsDescription getColumnsDescriptionFromZookeeper(const String & raw_
     return ColumnsDescription::parse(zookeeper->get(fs::path(zookeeper_path) / "columns", &columns_stat));
 }
 
+static void verifySortingKey(const KeyDescription & sorting_key)
+{
+    /// Aggregate functions already forbidden, but SimpleAggregateFunction are not
+    for (const auto & data_type : sorting_key.data_types)
+    {
+        if (dynamic_cast<const DataTypeCustomSimpleAggregateFunction *>(data_type->getCustomName()))
+            throw Exception(ErrorCodes::DATA_TYPE_CANNOT_BE_USED_IN_KEY, "Column with type {} is not allowed in key expression", data_type->getCustomName()->getName());
+    }
+}
+
 
 static StoragePtr create(const StorageFactory::Arguments & args)
 {
@@ -153,6 +160,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         || (args.query.columns_list->indices && !args.query.columns_list->indices->children.empty())
         || (args.query.columns_list->projections && !args.query.columns_list->projections->children.empty());
 
+    const Settings & local_settings = args.getLocalContext()->getSettingsRef();
+
     String name_part = args.engine_name.substr(0, args.engine_name.size() - strlen("MergeTree"));
 
     bool replicated = startsWith(name_part, "Replicated");
@@ -194,7 +203,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     auto add_optional_param = [&](const char * desc)
     {
         ++max_num_params;
-        needed_params += needed_params.empty() ? "\n" : ",\n[";
+        needed_params += needed_params.empty() ? "\n[" : ",\n[";
         needed_params += desc;
         needed_params += "]";
     };
@@ -298,7 +307,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
                             arg_idx, e.message(), verbose_help_message);
         }
     }
-    else if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_deprecated_syntax_for_merge_tree)
+    else if (args.mode <= LoadingStrictnessLevel::CREATE && !local_settings.allow_deprecated_syntax_for_merge_tree)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "This syntax for *MergeTree engine is deprecated. "
                                                    "Use extended storage definition syntax with ORDER BY/PRIMARY KEY clause. "
@@ -315,12 +324,13 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         DatabaseCatalog::instance().getDatabase(args.table_id.database_name)->getEngineName() == "Replicated";
 
     /// Allow implicit {uuid} macros only for zookeeper_path in ON CLUSTER queries
-    bool allow_uuid_macro = is_on_cluster || is_replicated_database || args.query.attach;
+    /// and if UUID was explicitly passed in CREATE TABLE (like for ATTACH)
+    bool allow_uuid_macro = is_on_cluster || is_replicated_database || args.query.attach || args.query.has_uuid;
 
     auto expand_macro = [&] (ASTLiteral * ast_zk_path, ASTLiteral * ast_replica_name)
     {
         /// Unfold {database} and {table} macro on table creation, so table can be renamed.
-        if (!args.attach)
+        if (args.mode < LoadingStrictnessLevel::ATTACH)
         {
             Macros::MacroExpansionInfo info;
             /// NOTE: it's not recursive
@@ -404,10 +414,10 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         {
             /// Try use default values if arguments are not specified.
             /// Note: {uuid} macro works for ON CLUSTER queries when database engine is Atomic.
-            const auto & config = args.getContext()->getConfigRef();
-            zookeeper_path = StorageReplicatedMergeTree::getDefaultZooKeeperPath(config);
+            const auto & server_settings = args.getContext()->getServerSettings();
+            zookeeper_path = server_settings.default_replica_path;
             /// TODO maybe use hostname if {replica} is not defined?
-            replica_name = StorageReplicatedMergeTree::getDefaultReplicaName(config);
+            replica_name = server_settings.default_replica_name;
 
             /// Modify query, so default values will be written to metadata
             assert(arg_num == 0);
@@ -536,7 +546,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         if (!args.storage_def->order_by)
         {
-            if (args.getLocalContext()->getSettingsRef().create_table_empty_primary_key_by_default)
+            if (local_settings.create_table_empty_primary_key_by_default)
             {
                 args.storage_def->set(args.storage_def->order_by, makeASTFunction("tuple"));
             }
@@ -557,6 +567,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// column if sorting key will be changed.
         metadata.sorting_key = KeyDescription::getSortingKeyFromAST(
             args.storage_def->order_by->ptr(), metadata.columns, context, merging_param_key_arg);
+        if (!local_settings.allow_suspicious_primary_key)
+            verifySortingKey(metadata.sorting_key);
 
         /// If primary key explicitly defined, than get it from AST
         if (args.storage_def->primary_key)
@@ -573,15 +585,15 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         auto minmax_columns = metadata.getColumnsRequiredForPartitionKey();
         auto partition_key = metadata.partition_key.expression_list_ast->clone();
-        FunctionNameNormalizer().visit(partition_key.get());
+        FunctionNameNormalizer::visit(partition_key.get());
         auto primary_key_asts = metadata.primary_key.expression_list_ast->children;
         metadata.minmax_count_projection.emplace(ProjectionDescription::getMinMaxCountProjection(
-            args.columns, partition_key, minmax_columns, primary_key_asts, context));
+            columns, partition_key, minmax_columns, primary_key_asts, context));
 
         if (args.storage_def->sample_by)
             metadata.sampling_key = KeyDescription::getKeyFromAST(args.storage_def->sample_by->ptr(), metadata.columns, context);
 
-        bool allow_suspicious_ttl = args.attach || args.getLocalContext()->getSettingsRef().allow_suspicious_ttl_expressions;
+        bool allow_suspicious_ttl = LoadingStrictnessLevel::SECONDARY_CREATE <= args.mode || local_settings.allow_suspicious_ttl_expressions;
 
         if (args.storage_def->ttl_table)
         {
@@ -608,12 +620,12 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             metadata.column_ttls_by_name[name] = new_ttl_entry;
         }
 
-        storage_settings->loadFromQuery(*args.storage_def, context);
+        storage_settings->loadFromQuery(*args.storage_def, context, LoadingStrictnessLevel::ATTACH <= args.mode);
 
         // updates the default storage_settings with settings specified via SETTINGS arg in a query
         if (args.storage_def->settings)
         {
-            if (!args.attach)
+            if (args.mode <= LoadingStrictnessLevel::CREATE)
                 args.getLocalContext()->checkMergeTreeSettingsConstraints(initial_storage_settings, storage_settings->changes());
             metadata.settings_changes = args.storage_def->settings->ptr();
         }
@@ -669,6 +681,8 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         /// column if sorting key will be changed.
         metadata.sorting_key
             = KeyDescription::getSortingKeyFromAST(engine_args[arg_num], metadata.columns, context, merging_param_key_arg);
+        if (!local_settings.allow_suspicious_primary_key)
+            verifySortingKey(metadata.sorting_key);
 
         /// In old syntax primary_key always equals to sorting key.
         metadata.primary_key = KeyDescription::getKeyFromAST(engine_args[arg_num], metadata.columns, context);
@@ -680,16 +694,16 @@ static StoragePtr create(const StorageFactory::Arguments & args)
 
         auto minmax_columns = metadata.getColumnsRequiredForPartitionKey();
         auto partition_key = metadata.partition_key.expression_list_ast->clone();
-        FunctionNameNormalizer().visit(partition_key.get());
+        FunctionNameNormalizer::visit(partition_key.get());
         auto primary_key_asts = metadata.primary_key.expression_list_ast->children;
         metadata.minmax_count_projection.emplace(ProjectionDescription::getMinMaxCountProjection(
-            args.columns, partition_key, minmax_columns, primary_key_asts, context));
+            columns, partition_key, minmax_columns, primary_key_asts, context));
 
         const auto * ast = engine_args[arg_num]->as<ASTLiteral>();
         if (ast && ast->value.getType() == Field::Types::UInt64)
         {
             storage_settings->index_granularity = ast->value.safeGet<UInt64>();
-            if (!args.attach)
+            if (args.mode <= LoadingStrictnessLevel::CREATE)
             {
                 SettingsChanges changes;
                 changes.emplace_back("index_granularity", Field(storage_settings->index_granularity));
@@ -700,12 +714,12 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Index granularity must be a positive integer{}", verbose_help_message);
         ++arg_num;
 
-        if (args.storage_def->ttl_table && !args.attach)
+        if (args.storage_def->ttl_table && args.mode <= LoadingStrictnessLevel::CREATE)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table TTL is not allowed for MergeTree in old syntax");
     }
 
     DataTypes data_types = metadata.partition_key.data_types;
-    if (!args.attach && !storage_settings->allow_floating_point_partition_key)
+    if (args.mode <= LoadingStrictnessLevel::CREATE && !storage_settings->allow_floating_point_partition_key)
     {
         for (size_t i = 0; i < data_types.size(); ++i)
             if (isFloat(data_types[i]))
@@ -725,7 +739,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
         return std::make_shared<StorageReplicatedMergeTree>(
             zookeeper_path,
             replica_name,
-            args.attach,
+            args.mode,
             args.table_id,
             args.relative_data_path,
             metadata,
@@ -733,7 +747,6 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             date_column_name,
             merging_params,
             std::move(storage_settings),
-            args.has_force_restore_data_flag,
             renaming_restrictions,
             need_check_table_structure);
     }
@@ -742,12 +755,11 @@ static StoragePtr create(const StorageFactory::Arguments & args)
             args.table_id,
             args.relative_data_path,
             metadata,
-            args.attach,
+            args.mode,
             context,
             date_column_name,
             merging_params,
-            std::move(storage_settings),
-            args.has_force_restore_data_flag);
+            std::move(storage_settings));
 }
 
 
diff --git a/src/Storages/MergeTree/tests/gtest_combine_filters.cpp b/src/Storages/MergeTree/tests/gtest_combine_filters.cpp
index 53696474eb8..9a9e6caad81 100644
--- a/src/Storages/MergeTree/tests/gtest_combine_filters.cpp
+++ b/src/Storages/MergeTree/tests/gtest_combine_filters.cpp
@@ -138,6 +138,57 @@ bool testCombineColumns(size_t size)
     return true;
 }
 
+/* To ensure the vectorized DB::andFilters works as its scalar implementation, this test validates the AND (&&)
+ * of any combinations of the UInt8 values.
+ */
+bool testAndFilters(size_t size)
+{
+    auto generateFastIncrementColumn = [](size_t len)->ColumnPtr
+    {
+        auto filter = ColumnUInt8::create(len);
+        auto & filter_data = filter->getData();
+
+        for (size_t i = 0; i < len; ++i)
+            filter_data[i] = static_cast<UInt8>(i & 0xFF);
+
+        return filter;
+    };
+
+    auto generateSlowIncrementColumn = [](size_t len)->ColumnPtr
+    {
+        auto filter = ColumnUInt8::create(len);
+        auto & filter_data = filter->getData();
+
+        for (size_t i = 0; i < len; ++i)
+            filter_data[i] = static_cast<UInt8>((i >> 8) & 0xFF);
+
+        return filter;
+    };
+
+    auto first_filter = generateFastIncrementColumn(size);
+    auto second_filter = generateSlowIncrementColumn(size);
+
+    auto result = andFilters(first_filter, second_filter);
+
+    const auto & first_filter_data = typeid_cast<const ColumnUInt8 *>(first_filter.get())->getData();
+    const auto & second_filter_data = typeid_cast<const ColumnUInt8 *>(second_filter.get())->getData();
+    const auto & result_data = typeid_cast<const ColumnUInt8 *>(result.get())->getData();
+
+    if (result->size() != size)
+    {
+        return false;
+    }
+
+    for (size_t i = 0; i < size; i++)
+    {
+        UInt8 expected = first_filter_data[i] && second_filter_data[i];
+        if (result_data[i] != expected)
+            return false;
+    }
+
+    return true;
+}
+
 TEST(MergeTree, CombineFilters)
 {
     /// Tests with only 0/1 and fixed intervals.
@@ -159,3 +210,18 @@ TEST(MergeTree, CombineFilters)
     EXPECT_TRUE(testCombineColumns(2000));
     EXPECT_TRUE(testCombineColumns(200000));
 }
+
+TEST(MergeTree, AndFilters)
+{
+    EXPECT_TRUE(testAndFilters(1));
+    EXPECT_TRUE(testAndFilters(2));
+    EXPECT_TRUE(testAndFilters(15));
+    EXPECT_TRUE(testAndFilters(16));
+    EXPECT_TRUE(testAndFilters(200));
+    EXPECT_TRUE(testAndFilters(201));
+    EXPECT_TRUE(testAndFilters(2000));
+    EXPECT_TRUE(testAndFilters(65535));
+    EXPECT_TRUE(testAndFilters(65536));
+    EXPECT_TRUE(testAndFilters(65537));
+    EXPECT_TRUE(testAndFilters(200000));
+}
diff --git a/src/Storages/MessageQueueSink.cpp b/src/Storages/MessageQueueSink.cpp
index 1aa19c9ccde..4fb81d69070 100644
--- a/src/Storages/MessageQueueSink.cpp
+++ b/src/Storages/MessageQueueSink.cpp
@@ -20,7 +20,7 @@ MessageQueueSink::MessageQueueSink(
 void MessageQueueSink::onStart()
 {
     LOG_TEST(
-        &Poco::Logger::get("MessageQueueSink"),
+        getLogger("MessageQueueSink"),
         "Executing startup for MessageQueueSink");
 
     initialize();
diff --git a/src/Storages/MutationCommands.cpp b/src/Storages/MutationCommands.cpp
index 36388a32b41..aaf5c1b5d87 100644
--- a/src/Storages/MutationCommands.cpp
+++ b/src/Storages/MutationCommands.cpp
@@ -37,8 +37,9 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = DELETE;
-        res.predicate = command->predicate;
-        res.partition = command->partition;
+        res.predicate = command->predicate->clone();
+        if (command->partition)
+            res.partition = command->partition->clone();
         return res;
     }
     else if (command->type == ASTAlterCommand::UPDATE)
@@ -46,8 +47,9 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = UPDATE;
-        res.predicate = command->predicate;
-        res.partition = command->partition;
+        res.predicate = command->predicate->clone();
+        if (command->partition)
+            res.partition = command->partition->clone();
         for (const ASTPtr & assignment_ast : command->update_assignments->children)
         {
             const auto & assignment = assignment_ast->as<ASTAssignment &>();
@@ -64,8 +66,10 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = APPLY_DELETED_MASK;
-        res.predicate = command->predicate;
-        res.partition = command->partition;
+        if (command->predicate)
+            res.predicate = command->predicate->clone();
+        if (command->partition)
+            res.partition = command->partition->clone();
         return res;
     }
     else if (command->type == ASTAlterCommand::MATERIALIZE_INDEX)
@@ -73,7 +77,8 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MATERIALIZE_INDEX;
-        res.partition = command->partition;
+        if (command->partition)
+            res.partition = command->partition->clone();
         res.predicate = nullptr;
         res.index_name = command->index->as<ASTIdentifier &>().name();
         return res;
@@ -83,7 +88,8 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MATERIALIZE_STATISTIC;
-        res.partition = command->partition;
+        if (command->partition)
+            res.partition = command->partition->clone();
         res.predicate = nullptr;
         res.statistic_columns = command->statistic_decl->as<ASTStatisticDeclaration &>().getColumnNames();
         return res;
@@ -93,7 +99,8 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MATERIALIZE_PROJECTION;
-        res.partition = command->partition;
+        if (command->partition)
+            res.partition = command->partition->clone();
         res.predicate = nullptr;
         res.projection_name = command->projection->as<ASTIdentifier &>().name();
         return res;
@@ -103,7 +110,8 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MATERIALIZE_COLUMN;
-        res.partition = command->partition;
+        if (command->partition)
+            res.partition = command->partition->clone();
         res.column_name = getIdentifierName(command->column);
         return res;
     }
@@ -124,7 +132,7 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.type = MutationCommand::Type::DROP_COLUMN;
         res.column_name = getIdentifierName(command->column);
         if (command->partition)
-            res.partition = command->partition;
+            res.partition = command->partition->clone();
         if (command->clear_column)
             res.clear = true;
 
@@ -137,7 +145,7 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.type = MutationCommand::Type::DROP_INDEX;
         res.column_name = command->index->as<ASTIdentifier &>().name();
         if (command->partition)
-            res.partition = command->partition;
+            res.partition = command->partition->clone();
         if (command->clear_index)
             res.clear = true;
         return res;
@@ -148,7 +156,7 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.ast = command->ptr();
         res.type = MutationCommand::Type::DROP_STATISTIC;
         if (command->partition)
-            res.partition = command->partition;
+            res.partition = command->partition->clone();
         if (command->clear_index)
             res.clear = true;
         res.statistic_columns = command->statistic_decl->as<ASTStatisticDeclaration &>().getColumnNames();
@@ -161,7 +169,7 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         res.type = MutationCommand::Type::DROP_PROJECTION;
         res.column_name = command->projection->as<ASTIdentifier &>().name();
         if (command->partition)
-            res.partition = command->partition;
+            res.partition = command->partition->clone();
         if (command->clear_projection)
             res.clear = true;
         return res;
@@ -180,7 +188,8 @@ std::optional<MutationCommand> MutationCommand::parse(ASTAlterCommand * command,
         MutationCommand res;
         res.ast = command->ptr();
         res.type = MATERIALIZE_TTL;
-        res.partition = command->partition;
+        if (command->partition)
+            res.partition = command->partition->clone();
         return res;
     }
     else
@@ -219,7 +228,7 @@ void MutationCommands::readText(ReadBuffer & 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);
+        p_alter_commands, commands_str.data(), commands_str.data() + commands_str.length(), "mutation commands list", 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     for (const auto & child : commands_ast->children)
     {
diff --git a/src/Storages/NATS/NATSConnection.cpp b/src/Storages/NATS/NATSConnection.cpp
index 70b3599aa09..4d30d6b2360 100644
--- a/src/Storages/NATS/NATSConnection.cpp
+++ b/src/Storages/NATS/NATSConnection.cpp
@@ -13,7 +13,7 @@ static const auto RETRIES_MAX = 20;
 static const auto CONNECTED_TO_BUFFER_SIZE = 256;
 
 
-NATSConnectionManager::NATSConnectionManager(const NATSConfiguration & configuration_, Poco::Logger * log_)
+NATSConnectionManager::NATSConnectionManager(const NATSConfiguration & configuration_, LoggerPtr log_)
     : configuration(configuration_)
     , log(log_)
     , event_handler(loop.getLoop(), log)
@@ -91,6 +91,8 @@ void NATSConnectionManager::connectImpl()
         natsOptions_SetUserInfo(options, configuration.username.c_str(), configuration.password.c_str());
     if (!configuration.token.empty())
         natsOptions_SetToken(options, configuration.token.c_str());
+    if (!configuration.credential_file.empty())
+        natsOptions_SetUserCredentialsFromFiles(options, configuration.credential_file.c_str(), nullptr);
 
     if (configuration.secure)
     {
@@ -115,8 +117,8 @@ void NATSConnectionManager::connectImpl()
     }
     natsOptions_SetMaxReconnect(options, configuration.max_reconnect);
     natsOptions_SetReconnectWait(options, configuration.reconnect_wait);
-    natsOptions_SetDisconnectedCB(options, disconnectedCallback, log);
-    natsOptions_SetReconnectedCB(options, reconnectedCallback, log);
+    natsOptions_SetDisconnectedCB(options, disconnectedCallback, log.get());
+    natsOptions_SetReconnectedCB(options, reconnectedCallback, log.get());
     natsStatus status;
     {
         auto lock = event_handler.setThreadLocalLoop();
diff --git a/src/Storages/NATS/NATSConnection.h b/src/Storages/NATS/NATSConnection.h
index b49070473b2..859fcb72022 100644
--- a/src/Storages/NATS/NATSConnection.h
+++ b/src/Storages/NATS/NATSConnection.h
@@ -14,6 +14,7 @@ struct NATSConfiguration
     String username;
     String password;
     String token;
+    String credential_file;
 
     int max_reconnect;
     int reconnect_wait;
@@ -24,7 +25,7 @@ struct NATSConfiguration
 class NATSConnectionManager
 {
 public:
-    NATSConnectionManager(const NATSConfiguration & configuration_, Poco::Logger * log_);
+    NATSConnectionManager(const NATSConfiguration & configuration_, LoggerPtr log_);
     ~NATSConnectionManager();
 
     bool isConnected();
@@ -54,7 +55,7 @@ private:
     static void reconnectedCallback(natsConnection * nc, void * log);
 
     NATSConfiguration configuration;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     UVLoop loop;
     NATSHandler event_handler;
diff --git a/src/Storages/NATS/NATSConsumer.cpp b/src/Storages/NATS/NATSConsumer.cpp
index c7b40973b72..136cb13ddfa 100644
--- a/src/Storages/NATS/NATSConsumer.cpp
+++ b/src/Storages/NATS/NATSConsumer.cpp
@@ -21,7 +21,7 @@ NATSConsumer::NATSConsumer(
     StorageNATS & storage_,
     std::vector<String> & subjects_,
     const String & subscribe_queue_name,
-    Poco::Logger * log_,
+    LoggerPtr log_,
     uint32_t queue_size_,
     const std::atomic<bool> & stopped_)
     : connection(connection_)
diff --git a/src/Storages/NATS/NATSConsumer.h b/src/Storages/NATS/NATSConsumer.h
index a5470433303..e8d3a849c2a 100644
--- a/src/Storages/NATS/NATSConsumer.h
+++ b/src/Storages/NATS/NATSConsumer.h
@@ -24,7 +24,7 @@ public:
         StorageNATS & storage_,
         std::vector<String> & subjects_,
         const String & subscribe_queue_name,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         uint32_t queue_size_,
         const std::atomic<bool> & stopped_);
 
@@ -58,7 +58,7 @@ private:
     StorageNATS & storage;
     std::vector<SubscriptionPtr> subscriptions;
     std::vector<String> subjects;
-    Poco::Logger * log;
+    LoggerPtr log;
     const std::atomic<bool> & stopped;
 
     bool subscribed = false;
diff --git a/src/Storages/NATS/NATSHandler.cpp b/src/Storages/NATS/NATSHandler.cpp
index 7006e5633a9..f0554a7f1f0 100644
--- a/src/Storages/NATS/NATSHandler.cpp
+++ b/src/Storages/NATS/NATSHandler.cpp
@@ -1,3 +1,4 @@
+#include <Core/Defines.h>
 #include <Storages/NATS/NATSHandler.h>
 #include <adapters/libuv.h>
 #include <Common/Exception.h>
@@ -12,7 +13,7 @@ namespace DB
 
 static const auto MAX_THREAD_WORK_DURATION_MS = 60000;
 
-NATSHandler::NATSHandler(uv_loop_t * loop_, Poco::Logger * log_) :
+NATSHandler::NATSHandler(uv_loop_t * loop_, LoggerPtr log_) :
     loop(loop_),
     log(log_),
     loop_running(false),
diff --git a/src/Storages/NATS/NATSHandler.h b/src/Storages/NATS/NATSHandler.h
index e3894c888a3..6f9ec398cfa 100644
--- a/src/Storages/NATS/NATSHandler.h
+++ b/src/Storages/NATS/NATSHandler.h
@@ -6,7 +6,7 @@
 #include <thread>
 #include <nats.h>
 #include <base/types.h>
-#include <Poco/Logger.h>
+#include <Common/Logger.h>
 
 namespace DB
 {
@@ -23,7 +23,7 @@ using LockPtr = std::unique_ptr<std::lock_guard<std::mutex>>;
 class NATSHandler
 {
 public:
-    NATSHandler(uv_loop_t * loop_, Poco::Logger * log_);
+    NATSHandler(uv_loop_t * loop_, LoggerPtr log_);
 
     ~NATSHandler();
 
@@ -47,7 +47,7 @@ public:
 private:
     uv_loop_t * loop;
     natsOptions * opts = nullptr;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic<bool> loop_running;
     std::atomic<UInt8> loop_state;
diff --git a/src/Storages/NATS/NATSProducer.cpp b/src/Storages/NATS/NATSProducer.cpp
index a8510149baf..fb8abb016f8 100644
--- a/src/Storages/NATS/NATSProducer.cpp
+++ b/src/Storages/NATS/NATSProducer.cpp
@@ -23,7 +23,7 @@ NATSProducer::NATSProducer(
     const NATSConfiguration & configuration_,
     const String & subject_,
     std::atomic<bool> & shutdown_called_,
-    Poco::Logger * log_)
+    LoggerPtr log_)
     : AsynchronousMessageProducer(log_)
     , connection(configuration_, log_)
     , subject(subject_)
diff --git a/src/Storages/NATS/NATSProducer.h b/src/Storages/NATS/NATSProducer.h
index 0303d05969b..6923553a551 100644
--- a/src/Storages/NATS/NATSProducer.h
+++ b/src/Storages/NATS/NATSProducer.h
@@ -20,7 +20,7 @@ public:
         const NATSConfiguration & configuration_,
         const String & subject_,
         std::atomic<bool> & shutdown_called_,
-        Poco::Logger * log_);
+        LoggerPtr log_);
 
     void produce(const String & message, size_t rows_in_message, const Columns & columns, size_t last_row) override;
 
diff --git a/src/Storages/NATS/NATSSettings.h b/src/Storages/NATS/NATSSettings.h
index 3e3ed739d82..3273a5ff065 100644
--- a/src/Storages/NATS/NATSSettings.h
+++ b/src/Storages/NATS/NATSSettings.h
@@ -25,6 +25,7 @@ class ASTStorage;
     M(String, nats_username, "", "NATS username", 0) \
     M(String, nats_password, "", "NATS password", 0) \
     M(String, nats_token, "", "NATS token", 0) \
+    M(String, nats_credential_file, "", "Path to a NATS credentials file", 0) \
     M(UInt64, nats_startup_connect_tries, 5, "Number of connect tries at startup", 0) \
     M(UInt64, nats_max_rows_per_message, 1, "The maximum number of rows produced in one message for row-based formats.", 0) \
     M(StreamingHandleErrorMode, nats_handle_error_mode, StreamingHandleErrorMode::DEFAULT, "How to handle errors for NATS engine. Possible values: default (throw an exception after nats_skip_broken_messages broken messages), stream (save broken messages and errors in virtual columns _raw_message, _error).", 0) \
diff --git a/src/Storages/NATS/NATSSource.cpp b/src/Storages/NATS/NATSSource.cpp
index 3fc01eacb22..54f479faacc 100644
--- a/src/Storages/NATS/NATSSource.cpp
+++ b/src/Storages/NATS/NATSSource.cpp
@@ -9,10 +9,10 @@
 namespace DB
 {
 
-static std::pair<Block, Block> getHeaders(StorageNATS & storage, const StorageSnapshotPtr & storage_snapshot)
+static std::pair<Block, Block> getHeaders(const StorageSnapshotPtr & storage_snapshot)
 {
     auto non_virtual_header = storage_snapshot->metadata->getSampleBlockNonMaterialized();
-    auto virtual_header = storage_snapshot->getSampleBlockForColumns(storage.getVirtuals().getNames());
+    auto virtual_header = storage_snapshot->virtual_columns->getSampleBlock();
 
     return {non_virtual_header, virtual_header};
 }
@@ -33,7 +33,7 @@ NATSSource::NATSSource(
     const Names & columns,
     size_t max_block_size_,
     StreamingHandleErrorMode handle_error_mode_)
-    : NATSSource(storage_, storage_snapshot_, getHeaders(storage_, storage_snapshot_), context_, columns, max_block_size_, handle_error_mode_)
+    : NATSSource(storage_, storage_snapshot_, getHeaders(storage_snapshot_), context_, columns, max_block_size_, handle_error_mode_)
 {
 }
 
diff --git a/src/Storages/NATS/StorageNATS.cpp b/src/Storages/NATS/StorageNATS.cpp
index 9cb1fbd8506..0b88a9e8929 100644
--- a/src/Storages/NATS/StorageNATS.cpp
+++ b/src/Storages/NATS/StorageNATS.cpp
@@ -50,7 +50,7 @@ StorageNATS::StorageNATS(
     ContextPtr context_,
     const ColumnsDescription & columns_,
     std::unique_ptr<NATSSettings> nats_settings_,
-    bool is_attach_)
+    LoadingStrictnessLevel mode)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
     , nats_settings(std::move(nats_settings_))
@@ -59,14 +59,15 @@ StorageNATS::StorageNATS(
     , schema_name(getContext()->getMacros()->expand(nats_settings->nats_schema))
     , num_consumers(nats_settings->nats_num_consumers.value)
     , max_rows_per_message(nats_settings->nats_max_rows_per_message)
-    , log(&Poco::Logger::get("StorageNATS (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageNATS (" + table_id_.table_name + ")"))
     , semaphore(0, static_cast<int>(num_consumers))
     , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
-    , is_attach(is_attach_)
+    , throw_on_startup_failure(mode <= LoadingStrictnessLevel::CREATE)
 {
     auto nats_username = getContext()->getMacros()->expand(nats_settings->nats_username);
     auto nats_password = getContext()->getMacros()->expand(nats_settings->nats_password);
     auto nats_token = getContext()->getMacros()->expand(nats_settings->nats_token);
+    auto nats_credential_file = getContext()->getMacros()->expand(nats_settings->nats_credential_file);
 
     configuration =
     {
@@ -75,6 +76,7 @@ StorageNATS::StorageNATS(
         .username = nats_username.empty() ? getContext()->getConfigRef().getString("nats.user", "") : nats_username,
         .password = nats_password.empty() ? getContext()->getConfigRef().getString("nats.password", "") : nats_password,
         .token = nats_token.empty() ? getContext()->getConfigRef().getString("nats.token", "") : nats_token,
+        .credential_file = nats_credential_file.empty() ? getContext()->getConfigRef().getString("nats.credential_file", "") : nats_credential_file,
         .max_reconnect = static_cast<int>(nats_settings->nats_max_reconnect.value),
         .reconnect_wait = static_cast<int>(nats_settings->nats_reconnect_wait.value),
         .secure = nats_settings->nats_secure.value
@@ -86,6 +88,7 @@ StorageNATS::StorageNATS(
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals(nats_settings->nats_handle_error_mode));
 
     nats_context = addSettings(getContext());
     nats_context->makeQueryContext();
@@ -114,7 +117,7 @@ StorageNATS::StorageNATS(
     catch (...)
     {
         tryLogCurrentException(log);
-        if (!is_attach)
+        if (throw_on_startup_failure)
             throw;
     }
 
@@ -129,6 +132,19 @@ StorageNATS::StorageNATS(
     connection_task->deactivate();
 }
 
+VirtualColumnsDescription StorageNATS::createVirtuals(StreamingHandleErrorMode handle_error_mode)
+{
+    VirtualColumnsDescription desc;
+    desc.addEphemeral("_subject", std::make_shared<DataTypeString>(), "");
+
+    if (handle_error_mode == StreamingHandleErrorMode::STREAM)
+    {
+        desc.addEphemeral("_raw_message", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+        desc.addEphemeral("_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+    }
+
+    return desc;
+}
 
 Names StorageNATS::parseList(const String & list, char delim)
 {
@@ -397,7 +413,6 @@ SinkToStoragePtr StorageNATS::write(const ASTPtr &, const StorageMetadataPtr & m
 
 void StorageNATS::startup()
 {
-    (void) is_attach;
     for (size_t i = 0; i < num_consumers; ++i)
     {
         try
@@ -408,7 +423,7 @@ void StorageNATS::startup()
         }
         catch (...)
         {
-            if (!is_attach)
+            if (throw_on_startup_failure)
                 throw;
             tryLogCurrentException(log);
         }
@@ -739,26 +754,10 @@ void registerStorageNATS(StorageFactory & factory)
         if (!nats_settings->nats_subjects.changed)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "You must specify `nats_subjects` setting");
 
-        return std::make_shared<StorageNATS>(args.table_id, args.getContext(), args.columns, std::move(nats_settings), args.attach);
+        return std::make_shared<StorageNATS>(args.table_id, args.getContext(), args.columns, std::move(nats_settings), args.mode);
     };
 
     factory.registerStorage("NATS", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
 }
 
-
-NamesAndTypesList StorageNATS::getVirtuals() const
-{
-    auto virtuals = NamesAndTypesList{
-            {"_subject", std::make_shared<DataTypeString>()}
-    };
-
-    if (nats_settings->nats_handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        virtuals.push_back({"_raw_message", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-        virtuals.push_back({"_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-    }
-
-    return virtuals;
-}
-
 }
diff --git a/src/Storages/NATS/StorageNATS.h b/src/Storages/NATS/StorageNATS.h
index 16a162b8500..41d77acfde6 100644
--- a/src/Storages/NATS/StorageNATS.h
+++ b/src/Storages/NATS/StorageNATS.h
@@ -24,7 +24,7 @@ public:
         ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<NATSSettings> nats_settings_,
-        bool is_attach_);
+        LoadingStrictnessLevel mode);
 
     std::string getName() const override { return "NATS"; }
 
@@ -61,7 +61,6 @@ public:
     NATSConsumerPtr popConsumer(std::chrono::milliseconds timeout);
 
     const String & getFormatName() const { return format_name; }
-    NamesAndTypesList getVirtuals() const override;
 
     void incrementReader();
     void decrementReader();
@@ -78,7 +77,7 @@ private:
     size_t num_consumers;
     size_t max_rows_per_message;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     NATSConnectionManagerPtr connection; /// Connection for all consumers
     NATSConfiguration configuration;
@@ -117,7 +116,7 @@ private:
     std::mutex loop_mutex;
 
     mutable bool drop_table = false;
-    bool is_attach;
+    bool throw_on_startup_failure;
 
     NATSConsumerPtr createConsumer();
 
@@ -137,6 +136,7 @@ private:
 
     static Names parseList(const String & list, char delim);
     static String getTableBasedName(String name, const StorageID & table_id);
+    static VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
 
     ContextMutablePtr addSettings(ContextPtr context) const;
     size_t getMaxBlockSize() const;
diff --git a/src/Storages/NamedCollectionsHelpers.cpp b/src/Storages/NamedCollectionsHelpers.cpp
index f832c7f53f1..c1e744e8d79 100644
--- a/src/Storages/NamedCollectionsHelpers.cpp
+++ b/src/Storages/NamedCollectionsHelpers.cpp
@@ -5,6 +5,7 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTFunction.h>
+#include <Parsers/queryToString.h>
 
 namespace DB
 {
@@ -61,8 +62,31 @@ namespace
         auto value = literal_value->as<ASTLiteral>()->value;
         return std::pair{key, Field(value)};
     }
+
+    std::pair<String, Field> getKeyValueFromAST(ASTPtr ast, ContextPtr context)
+    {
+        auto res = getKeyValueFromAST(ast, true, context);
+
+        if (!res || !std::holds_alternative<Field>(res->second))
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Failed to get key value from ast '{}'", queryToString(ast));
+
+        return {res->first, std::get<Field>(res->second)};
+    }
 }
 
+std::map<String, Field> getParamsMapFromAST(ASTs asts, ContextPtr context)
+{
+    std::map<String, Field> params;
+    for (const auto & ast : asts)
+    {
+        auto [key, value] = getKeyValueFromAST(ast, context);
+        bool inserted = params.emplace(key, value).second;
+        if (!inserted)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Duplicated key '{}' in params", key);
+    }
+
+    return params;
+}
 
 MutableNamedCollectionPtr tryGetNamedCollectionWithOverrides(
     ASTs asts, ContextPtr context, bool throw_unknown_collection, std::vector<std::pair<std::string, ASTPtr>> * complex_args)
diff --git a/src/Storages/NamedCollectionsHelpers.h b/src/Storages/NamedCollectionsHelpers.h
index 657ad91e825..a1909f514ea 100644
--- a/src/Storages/NamedCollectionsHelpers.h
+++ b/src/Storages/NamedCollectionsHelpers.h
@@ -21,10 +21,16 @@ namespace DB
 /// 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, ContextPtr context);
 
+/// Parses asts as key value pairs and returns a map of them.
+/// If key or value cannot be parsed as literal or interpreted
+/// as constant expression throws an exception.
+std::map<String, Field> getParamsMapFromAST(ASTs asts, ContextPtr context);
+
 HTTPHeaderEntries getHeadersFromNamedCollection(const NamedCollection & collection);
 
 struct ExternalDatabaseEqualKeysSet
@@ -45,9 +51,9 @@ struct RedisEqualKeysSet
 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_) {}
+    NamedCollectionValidateKey(const char * value_) : value(value_) {} /// NOLINT(google-explicit-constructor)
+    NamedCollectionValidateKey(std::string_view value_) : value(value_) {} /// NOLINT(google-explicit-constructor)
+    NamedCollectionValidateKey(const String & value_) : value(value_) {} /// NOLINT(google-explicit-constructor)
 
     std::string_view value;
 
diff --git a/src/Storages/PartitionCommands.cpp b/src/Storages/PartitionCommands.cpp
index 92aea597ab3..fd5964c7034 100644
--- a/src/Storages/PartitionCommands.cpp
+++ b/src/Storages/PartitionCommands.cpp
@@ -23,7 +23,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = DROP_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.detach = command_ast->detach;
         res.part = command_ast->part;
         return res;
@@ -32,15 +32,22 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = DROP_DETACHED_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.part = command_ast->part;
         return res;
     }
+    else if (command_ast->type == ASTAlterCommand::FORGET_PARTITION)
+    {
+        PartitionCommand res;
+        res.type = FORGET_PARTITION;
+        res.partition = command_ast->partition->clone();
+        return res;
+    }
     else if (command_ast->type == ASTAlterCommand::ATTACH_PARTITION)
     {
         PartitionCommand res;
         res.type = ATTACH_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.part = command_ast->part;
         return res;
     }
@@ -48,7 +55,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = MOVE_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.part = command_ast->part;
         switch (command_ast->move_destination_type)
         {
@@ -77,7 +84,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = REPLACE_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.replace = command_ast->replace;
         res.from_database = command_ast->from_database;
         res.from_table = command_ast->from_table;
@@ -87,7 +94,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = FETCH_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.from_zookeeper_path = command_ast->from;
         res.part = command_ast->part;
         return res;
@@ -96,7 +103,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = FREEZE_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.with_name = command_ast->with_name;
         return res;
     }
@@ -111,7 +118,7 @@ std::optional<PartitionCommand> PartitionCommand::parse(const ASTAlterCommand *
     {
         PartitionCommand res;
         res.type = PartitionCommand::UNFREEZE_PARTITION;
-        res.partition = command_ast->partition;
+        res.partition = command_ast->partition->clone();
         res.with_name = command_ast->with_name;
         return res;
     }
@@ -147,6 +154,8 @@ std::string PartitionCommand::typeToString() const
             return "DROP DETACHED PART";
         else
             return "DROP DETACHED PARTITION";
+    case PartitionCommand::Type::FORGET_PARTITION:
+        return "FORGET PARTITION";
     case PartitionCommand::Type::FETCH_PARTITION:
         if (part)
             return "FETCH PART";
diff --git a/src/Storages/PartitionCommands.h b/src/Storages/PartitionCommands.h
index b8b2ec47e71..f0ecf91f567 100644
--- a/src/Storages/PartitionCommands.h
+++ b/src/Storages/PartitionCommands.h
@@ -26,6 +26,7 @@ struct PartitionCommand
         MOVE_PARTITION,
         DROP_PARTITION,
         DROP_DETACHED_PARTITION,
+        FORGET_PARTITION,
         FETCH_PARTITION,
         FREEZE_ALL_PARTITIONS,
         FREEZE_PARTITION,
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
index b2442109409..ba3cc6f58d0 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.cpp
@@ -51,7 +51,7 @@ MaterializedPostgreSQLConsumer::MaterializedPostgreSQLConsumer(
     bool schema_as_a_part_of_table_name_,
     StorageInfos storages_info_,
     const String & name_for_logger)
-    : log(&Poco::Logger::get("PostgreSQLReplicaConsumer(" + name_for_logger + ")"))
+    : log(getLogger("PostgreSQLReplicaConsumer(" + name_for_logger + ")"))
     , context(context_)
     , replication_slot_name(replication_slot_name_)
     , publication_name(publication_name_)
@@ -76,7 +76,7 @@ MaterializedPostgreSQLConsumer::MaterializedPostgreSQLConsumer(
 }
 
 
-MaterializedPostgreSQLConsumer::StorageData::StorageData(const StorageInfo & storage_info, Poco::Logger * log_)
+MaterializedPostgreSQLConsumer::StorageData::StorageData(const StorageInfo & storage_info, LoggerPtr log_)
     : storage(storage_info.storage)
     , table_description(storage_info.storage->getInMemoryMetadataPtr()->getSampleBlock())
     , columns_attributes(storage_info.attributes)
@@ -313,7 +313,7 @@ void MaterializedPostgreSQLConsumer::readTupleData(
                 Int32 col_len = readInt32(message, pos, size);
                 String value;
                 for (Int32 i = 0; i < col_len; ++i)
-                    value += readInt8(message, pos, size);
+                    value += static_cast<char>(readInt8(message, pos, size));
 
                 insertValue(storage_data, value, column_idx);
                 break;
diff --git a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
index 3e95c1cd7de..972c03e50d8 100644
--- a/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
+++ b/src/Storages/PostgreSQL/MaterializedPostgreSQLConsumer.h
@@ -32,7 +32,7 @@ class MaterializedPostgreSQLConsumer
 private:
     struct StorageData
     {
-        explicit StorageData(const StorageInfo & storage_info, Poco::Logger * log_);
+        explicit StorageData(const StorageInfo & storage_info, LoggerPtr log_);
 
         size_t getColumnsNum() const { return table_description.sample_block.columns(); }
 
@@ -137,7 +137,7 @@ private:
         return (static_cast<Int64>(upper_half) << 32) + lower_half;
     }
 
-    Poco::Logger * log;
+    LoggerPtr log;
     ContextPtr context;
     const std::string replication_slot_name, publication_name;
 
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
index 43de2069b19..2bb1e2dde0d 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.cpp
@@ -128,7 +128,7 @@ PostgreSQLReplicationHandler::PostgreSQLReplicationHandler(
     const MaterializedPostgreSQLSettings & replication_settings,
     bool is_materialized_postgresql_database_)
     : WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("PostgreSQLReplicationHandler"))
+    , log(getLogger("PostgreSQLReplicationHandler"))
     , is_attach(is_attach_)
     , postgres_database(postgres_database_)
     , postgres_schema(replication_settings.materialized_postgresql_schema)
diff --git a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
index 5d426b3c512..5c519053d84 100644
--- a/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
+++ b/src/Storages/PostgreSQL/PostgreSQLReplicationHandler.h
@@ -102,7 +102,7 @@ private:
 
     void assertInitialized() const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// If it is not attach, i.e. a create query, then if publication already exists - always drop it.
     bool is_attach;
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
index 0faf553797a..f686fbda664 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.cpp
@@ -51,7 +51,7 @@ namespace ErrorCodes
 /// For the case of single storage.
 StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
     const StorageID & table_id_,
-    bool is_attach_,
+    LoadingStrictnessLevel mode,
     const String & remote_database_name,
     const String & remote_table_name_,
     const postgres::ConnectionInfo & connection_info,
@@ -60,18 +60,19 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
     std::unique_ptr<MaterializedPostgreSQLSettings> replication_settings)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(remote_database_name, remote_table_name_) + ")"))
+    , log(getLogger("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(remote_database_name, remote_table_name_) + ")"))
     , is_materialized_postgresql_database(false)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
     , nested_table_id(StorageID(table_id_.database_name, getNestedTableName()))
     , remote_table_name(remote_table_name_)
-    , is_attach(is_attach_)
+    , is_attach(mode >= LoadingStrictnessLevel::ATTACH)
 {
     if (table_id_.uuid == UUIDHelpers::Nil)
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Storage MaterializedPostgreSQL is allowed only for Atomic database");
 
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals());
 
     replication_settings->materialized_postgresql_tables_list = remote_table_name_;
 
@@ -101,7 +102,7 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
         const String & postgres_table_name)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
+    , log(getLogger("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(false)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
@@ -120,15 +121,23 @@ StorageMaterializedPostgreSQL::StorageMaterializedPostgreSQL(
         const String & postgres_table_name)
     : IStorage(StorageID(nested_storage_->getStorageID().database_name, nested_storage_->getStorageID().table_name))
     , WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
+    , log(getLogger("StorageMaterializedPostgreSQL(" + postgres::formatNameForLogs(postgres_database_name, postgres_table_name) + ")"))
     , is_materialized_postgresql_database(true)
     , has_nested(true)
     , nested_context(makeNestedTableContext(context_->getGlobalContext()))
     , nested_table_id(nested_storage_->getStorageID())
 {
     setInMemoryMetadata(nested_storage_->getInMemoryMetadata());
+    setVirtuals(*nested_storage_->getVirtualsPtr());
 }
 
+VirtualColumnsDescription StorageMaterializedPostgreSQL::createVirtuals()
+{
+    VirtualColumnsDescription desc;
+    desc.addEphemeral("_sign", std::make_shared<DataTypeInt8>(), "");
+    desc.addEphemeral("_version", std::make_shared<DataTypeUInt64>(), "");
+    return desc;
+}
 
 /// A temporary clone table might be created for current table in order to update its schema and reload
 /// all data in the background while current table will still handle read requests.
@@ -141,7 +150,7 @@ StoragePtr StorageMaterializedPostgreSQL::createTemporary() const
     auto tmp_storage = DatabaseCatalog::instance().tryGetTable(tmp_table_id, nested_context);
     if (tmp_storage)
     {
-        LOG_TRACE(&Poco::Logger::get("MaterializedPostgreSQLStorage"), "Temporary table {} already exists, dropping", tmp_table_id.getNameForLogs());
+        LOG_TRACE(getLogger("MaterializedPostgreSQLStorage"), "Temporary table {} already exists, dropping", tmp_table_id.getNameForLogs());
         InterpreterDropQuery::executeDropQuery(ASTDropQuery::Kind::Drop, getContext(), getContext(), tmp_table_id, /* sync */true);
     }
 
@@ -254,15 +263,6 @@ void StorageMaterializedPostgreSQL::dropInnerTableIfAny(bool sync, ContextPtr lo
 }
 
 
-NamesAndTypesList StorageMaterializedPostgreSQL::getVirtuals() const
-{
-    return NamesAndTypesList{
-            {"_sign", std::make_shared<DataTypeInt8>()},
-            {"_version", std::make_shared<DataTypeUInt64>()}
-    };
-}
-
-
 bool StorageMaterializedPostgreSQL::needRewriteQueryWithFinal(const Names & column_names) const
 {
     return needRewriteQueryWithFinalForStorage(column_names, getNested());
@@ -479,7 +479,7 @@ ASTPtr StorageMaterializedPostgreSQL::getCreateNestedTableQuery(
                     ASTPtr result;
 
                     Tokens tokens(attr.attr_def.data(), attr.attr_def.data() + attr.attr_def.size());
-                    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+                    IParser::Pos pos(tokens, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
                     if (!expr_parser.parse(pos, result, expected))
                     {
                         throw Exception(ErrorCodes::BAD_ARGUMENTS, "Failed to parse default expression: {}", attr.attr_def);
@@ -573,7 +573,8 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
         metadata.setColumns(args.columns);
         metadata.setConstraints(args.constraints);
 
-        if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_experimental_materialized_postgresql_table)
+        if (args.mode <= LoadingStrictnessLevel::CREATE
+            && !args.getLocalContext()->getSettingsRef().allow_experimental_materialized_postgresql_table)
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "MaterializedPostgreSQL is an experimental table engine."
                                 " You can enable it with the `allow_experimental_materialized_postgresql_table` setting");
 
@@ -600,7 +601,7 @@ void registerStorageMaterializedPostgreSQL(StorageFactory & factory)
             postgresql_replication_settings->loadFromQuery(*args.storage_def);
 
         return std::make_shared<StorageMaterializedPostgreSQL>(
-                args.table_id, args.attach, configuration.database, configuration.table, connection_info,
+                args.table_id, args.mode, configuration.database, configuration.table, connection_info,
                 metadata, args.getContext(),
                 std::move(postgresql_replication_settings));
     };
diff --git a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
index bebbb74ddd1..af2f13bb880 100644
--- a/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
+++ b/src/Storages/PostgreSQL/StorageMaterializedPostgreSQL.h
@@ -74,7 +74,7 @@ public:
 
     StorageMaterializedPostgreSQL(
         const StorageID & table_id_,
-        bool is_attach_,
+        LoadingStrictnessLevel mode,
         const String & remote_database_name,
         const String & remote_table_name,
         const postgres::ConnectionInfo & connection_info,
@@ -89,8 +89,6 @@ public:
     /// Used only for single MaterializedPostgreSQL storage.
     void dropInnerTableIfAny(bool sync, ContextPtr local_context) override;
 
-    NamesAndTypesList getVirtuals() const override;
-
     bool needRewriteQueryWithFinal(const Names & column_names) const override;
 
     void read(
@@ -138,11 +136,13 @@ private:
     static std::shared_ptr<ASTColumnDeclaration> getMaterializedColumnsDeclaration(
             String name, String type, UInt64 default_value);
 
+    static VirtualColumnsDescription createVirtuals();
+
     ASTPtr getColumnDeclaration(const DataTypePtr & data_type) const;
 
     String getNestedTableName() const;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Not nullptr only for single MaterializedPostgreSQL storage, because for MaterializedPostgreSQL
     /// database engine there is one replication handler for all tables.
diff --git a/src/Storages/ProjectionsDescription.cpp b/src/Storages/ProjectionsDescription.cpp
index 08ebe3a10d0..0bcbedee41a 100644
--- a/src/Storages/ProjectionsDescription.cpp
+++ b/src/Storages/ProjectionsDescription.cpp
@@ -341,7 +341,7 @@ ProjectionsDescription ProjectionsDescription::parse(const String & str, const C
         return result;
 
     ParserProjectionDeclarationList parser;
-    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+    ASTPtr list = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
     for (const auto & projection_ast : list->children)
     {
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.cpp b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
index 13d065774a2..98ceba42676 100644
--- a/src/Storages/RabbitMQ/RabbitMQConnection.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.cpp
@@ -11,7 +11,7 @@ static const auto CONNECT_SLEEP = 200;
 static const auto RETRIES_MAX = 20;
 
 
-RabbitMQConnection::RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_)
+RabbitMQConnection::RabbitMQConnection(const RabbitMQConfiguration & configuration_, LoggerPtr log_)
     : configuration(configuration_)
     , log(log_)
     , event_handler(loop.getLoop(), log)
diff --git a/src/Storages/RabbitMQ/RabbitMQConnection.h b/src/Storages/RabbitMQ/RabbitMQConnection.h
index 698230b16f4..5adb6456194 100644
--- a/src/Storages/RabbitMQ/RabbitMQConnection.h
+++ b/src/Storages/RabbitMQ/RabbitMQConnection.h
@@ -22,7 +22,7 @@ struct RabbitMQConfiguration
 class RabbitMQConnection
 {
 public:
-    RabbitMQConnection(const RabbitMQConfiguration & configuration_, Poco::Logger * log_);
+    RabbitMQConnection(const RabbitMQConfiguration & configuration_, LoggerPtr log_);
 
     bool isConnected();
 
@@ -51,7 +51,7 @@ private:
     void disconnectImpl(bool immediately = false);
 
     RabbitMQConfiguration configuration;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     UVLoop loop;
     /// Preserve order of destruction here:
diff --git a/src/Storages/RabbitMQ/RabbitMQConsumer.cpp b/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
index f6facc04212..28dc239ae37 100644
--- a/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQConsumer.cpp
@@ -24,7 +24,7 @@ RabbitMQConsumer::RabbitMQConsumer(
         std::vector<String> & queues_,
         size_t channel_id_base_,
         const String & channel_base_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         uint32_t queue_size_)
         : event_handler(event_handler_)
         , queues(queues_)
@@ -128,6 +128,32 @@ bool RabbitMQConsumer::ackMessages(const CommitInfo & commit_info)
     return false;
 }
 
+bool RabbitMQConsumer::nackMessages(const CommitInfo & commit_info)
+{
+    if (state != State::OK)
+        return false;
+
+    /// Nothing to nack.
+    if (!commit_info.delivery_tag || commit_info.delivery_tag <= last_commited_delivery_tag)
+        return false;
+
+    if (consumer_channel->reject(commit_info.delivery_tag, AMQP::multiple))
+    {
+        LOG_TRACE(
+            log, "Consumer rejected messages with deliveryTags from {} to {} on channel {}",
+            last_commited_delivery_tag, commit_info.delivery_tag, channel_id);
+
+        return true;
+    }
+
+    LOG_ERROR(
+        log,
+        "Failed to reject messages for {}:{}, (current commit point {}:{})",
+        commit_info.channel_id, commit_info.delivery_tag,
+        channel_id, last_commited_delivery_tag);
+
+    return false;
+}
 
 void RabbitMQConsumer::updateChannel(RabbitMQConnection & connection)
 {
@@ -161,7 +187,7 @@ void RabbitMQConsumer::updateChannel(RabbitMQConnection & connection)
 
     consumer_channel->onError([&](const char * message)
     {
-        LOG_ERROR(log, "Channel {} in an error state: {}", channel_id, message);
+        LOG_ERROR(log, "Channel {} in in error state: {}", channel_id, message);
         state = State::ERROR;
     });
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQConsumer.h b/src/Storages/RabbitMQ/RabbitMQConsumer.h
index 89dfa060eec..9dad175dda3 100644
--- a/src/Storages/RabbitMQ/RabbitMQConsumer.h
+++ b/src/Storages/RabbitMQ/RabbitMQConsumer.h
@@ -32,7 +32,7 @@ public:
         std::vector<String> & queues_,
         size_t channel_id_base_,
         const String & channel_base_,
-        Poco::Logger * log_,
+        LoggerPtr log_,
         uint32_t queue_size_);
 
     struct CommitInfo
@@ -50,7 +50,9 @@ public:
         UInt64 delivery_tag = 0;
         String channel_id;
     };
+
     const MessageData & currentMessage() { return current; }
+    const String & getChannelID() const { return channel_id; }
 
     /// Return read buffer containing next available message
     /// or nullptr if there are no messages to process.
@@ -63,6 +65,7 @@ public:
     bool isConsumerStopped() const { return stopped.load(); }
 
     bool ackMessages(const CommitInfo & commit_info);
+    bool nackMessages(const CommitInfo & commit_info);
 
     bool hasPendingMessages() { return !received.empty(); }
 
@@ -88,7 +91,7 @@ private:
     const String channel_base;
     const size_t channel_id_base;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     std::atomic<bool> stopped;
 
     String channel_id;
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.cpp b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
index 745af0d20e3..be352f26f7b 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.cpp
@@ -8,7 +8,7 @@ namespace DB
 /* The object of this class is shared between concurrent consumers (who share the same connection == share the same
  * event loop and handler).
  */
-RabbitMQHandler::RabbitMQHandler(uv_loop_t * loop_, Poco::Logger * log_) :
+RabbitMQHandler::RabbitMQHandler(uv_loop_t * loop_, LoggerPtr log_) :
     AMQP::LibUvHandler(loop_),
     loop(loop_),
     log(log_),
diff --git a/src/Storages/RabbitMQ/RabbitMQHandler.h b/src/Storages/RabbitMQ/RabbitMQHandler.h
index 4223732a4a0..244692cf800 100644
--- a/src/Storages/RabbitMQ/RabbitMQHandler.h
+++ b/src/Storages/RabbitMQ/RabbitMQHandler.h
@@ -24,7 +24,7 @@ class RabbitMQHandler : public AMQP::LibUvHandler
 {
 
 public:
-    RabbitMQHandler(uv_loop_t * loop_, Poco::Logger * log_);
+    RabbitMQHandler(uv_loop_t * loop_, LoggerPtr log_);
 
     void onError(AMQP::TcpConnection * connection, const char * message) override;
     void onReady(AMQP::TcpConnection * connection) override;
@@ -50,7 +50,7 @@ public:
 
 private:
     uv_loop_t * loop;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic<bool> connection_running, loop_running;
     std::atomic<UInt8> loop_state;
diff --git a/src/Storages/RabbitMQ/RabbitMQProducer.cpp b/src/Storages/RabbitMQ/RabbitMQProducer.cpp
index 246569060d0..f0fbc8c5c06 100644
--- a/src/Storages/RabbitMQ/RabbitMQProducer.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQProducer.cpp
@@ -27,11 +27,11 @@ RabbitMQProducer::RabbitMQProducer(
     const RabbitMQConfiguration & configuration_,
     const Names & routing_keys_,
     const String & exchange_name_,
-    const AMQP::ExchangeType exchange_type_,
-    const size_t channel_id_base_,
-    const bool persistent_,
+    AMQP::ExchangeType exchange_type_,
+    size_t channel_id_base_,
+    bool persistent_,
     std::atomic<bool> & shutdown_called_,
-    Poco::Logger * log_)
+    LoggerPtr log_)
     : AsynchronousMessageProducer(log_)
     , connection(configuration_, log_)
     , routing_keys(routing_keys_)
diff --git a/src/Storages/RabbitMQ/RabbitMQProducer.h b/src/Storages/RabbitMQ/RabbitMQProducer.h
index 70afbbb9b90..e43518aec06 100644
--- a/src/Storages/RabbitMQ/RabbitMQProducer.h
+++ b/src/Storages/RabbitMQ/RabbitMQProducer.h
@@ -20,11 +20,11 @@ public:
         const RabbitMQConfiguration & configuration_,
         const Names & routing_keys_,
         const String & exchange_name_,
-        const AMQP::ExchangeType exchange_type_,
-        const size_t channel_id_base_,
-        const bool persistent_,
+        AMQP::ExchangeType exchange_type_,
+        size_t channel_id_base_,
+        bool persistent_,
         std::atomic<bool> & shutdown_called_,
-        Poco::Logger * log_);
+        LoggerPtr log_);
 
     void produce(const String & message, size_t rows_in_message, const Columns & columns, size_t last_row) override;
 
diff --git a/src/Storages/RabbitMQ/RabbitMQSource.cpp b/src/Storages/RabbitMQ/RabbitMQSource.cpp
index 793064c10f8..09c1bf1b2e7 100644
--- a/src/Storages/RabbitMQ/RabbitMQSource.cpp
+++ b/src/Storages/RabbitMQ/RabbitMQSource.cpp
@@ -11,10 +11,20 @@
 namespace DB
 {
 
-static std::pair<Block, Block> getHeaders(StorageRabbitMQ & storage_, const StorageSnapshotPtr & storage_snapshot)
+static std::pair<Block, Block> getHeaders(const StorageSnapshotPtr & storage_snapshot, const Names & column_names)
 {
+    auto all_columns_header = storage_snapshot->metadata->getSampleBlock();
+
     auto non_virtual_header = storage_snapshot->metadata->getSampleBlockNonMaterialized();
-    auto virtual_header = storage_snapshot->getSampleBlockForColumns(storage_.getVirtuals().getNames());
+    auto virtual_header = storage_snapshot->virtual_columns->getSampleBlock();
+
+    for (const auto & column_name : column_names)
+    {
+        if (non_virtual_header.has(column_name) || virtual_header.has(column_name))
+            continue;
+        const auto & column = all_columns_header.getByName(column_name);
+        non_virtual_header.insert(column);
+    }
 
     return {non_virtual_header, virtual_header};
 }
@@ -40,7 +50,7 @@ RabbitMQSource::RabbitMQSource(
     : RabbitMQSource(
         storage_,
         storage_snapshot_,
-        getHeaders(storage_, storage_snapshot_),
+        getHeaders(storage_snapshot_, columns),
         context_,
         columns,
         max_block_size_,
@@ -70,7 +80,7 @@ RabbitMQSource::RabbitMQSource(
     , ack_in_suffix(ack_in_suffix_)
     , non_virtual_header(std::move(headers.first))
     , virtual_header(std::move(headers.second))
-    , log(&Poco::Logger::get("RabbitMQSource"))
+    , log(getLogger("RabbitMQSource"))
     , max_execution_time_ms(max_execution_time_)
 {
     storage.incrementReader();
@@ -123,7 +133,11 @@ Chunk RabbitMQSource::generateImpl()
     }
 
     if (is_finished || !consumer || consumer->isConsumerStopped())
+    {
+        LOG_TRACE(log, "RabbitMQSource is stopped (is_finished: {}, consumer_stopped: {})",
+                  is_finished, consumer ? toString(consumer->isConsumerStopped()) : "No consumer");
         return {};
+    }
 
     /// Currently it is one time usage source: to make sure data is flushed
     /// strictly by timeout or by block size.
@@ -254,13 +268,12 @@ Chunk RabbitMQSource::generateImpl()
 
 bool RabbitMQSource::sendAck()
 {
-    if (!consumer)
-        return false;
+    return consumer && consumer->ackMessages(commit_info);
+}
 
-    if (!consumer->ackMessages(commit_info))
-        return false;
-
-    return true;
+bool RabbitMQSource::sendNack()
+{
+    return consumer && consumer->nackMessages(commit_info);
 }
 
 }
diff --git a/src/Storages/RabbitMQ/RabbitMQSource.h b/src/Storages/RabbitMQ/RabbitMQSource.h
index a25b3d50222..0d6fad97054 100644
--- a/src/Storages/RabbitMQ/RabbitMQSource.h
+++ b/src/Storages/RabbitMQ/RabbitMQSource.h
@@ -33,6 +33,7 @@ public:
     bool needChannelUpdate();
     void updateChannel();
     bool sendAck();
+    bool sendNack();
 
 private:
     StorageRabbitMQ & storage;
@@ -47,7 +48,7 @@ private:
     const Block non_virtual_header;
     const Block virtual_header;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     RabbitMQConsumerPtr consumer;
 
     uint64_t max_execution_time_ms = 0;
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
index fce2d775b15..b882fd2728c 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.cpp
@@ -8,6 +8,7 @@
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTExpressionList.h>
 #include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/Transforms/ExpressionTransform.h>
@@ -69,7 +70,7 @@ StorageRabbitMQ::StorageRabbitMQ(
         ContextPtr context_,
         const ColumnsDescription & columns_,
         std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
-        bool is_attach_)
+        LoadingStrictnessLevel mode)
         : IStorage(table_id_)
         , WithContext(context_->getGlobalContext())
         , rabbitmq_settings(std::move(rabbitmq_settings_))
@@ -86,12 +87,11 @@ StorageRabbitMQ::StorageRabbitMQ(
         , persistent(rabbitmq_settings->rabbitmq_persistent.value)
         , use_user_setup(rabbitmq_settings->rabbitmq_queue_consume.value)
         , hash_exchange(num_consumers > 1 || num_queues > 1)
-        , log(&Poco::Logger::get("StorageRabbitMQ (" + table_id_.table_name + ")"))
+        , log(getLogger("StorageRabbitMQ (" + table_id_.table_name + ")"))
         , semaphore(0, static_cast<int>(num_consumers))
         , unique_strbase(getRandomName())
         , queue_size(std::max(QUEUE_SIZE, static_cast<uint32_t>(getMaxBlockSize())))
         , milliseconds_to_wait(rabbitmq_settings->rabbitmq_empty_queue_backoff_start_ms)
-        , is_attach(is_attach_)
 {
     const auto & config = getContext()->getConfigRef();
 
@@ -134,9 +134,13 @@ StorageRabbitMQ::StorageRabbitMQ(
     if (configuration.secure)
         SSL_library_init();
 
+    if (!columns_.getMaterialized().empty() || !columns_.getAliases().empty() || !columns_.getDefaults().empty() || !columns_.getEphemeral().empty())
+        context_->addWarningMessage("RabbitMQ table engine doesn't support ALIAS, DEFAULT or MATERIALIZED columns. They will be ignored and filled with default values");
+
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals(rabbitmq_settings->rabbitmq_handle_error_mode));
 
     rabbitmq_context = addSettings(getContext());
     rabbitmq_context->makeQueryContext();
@@ -171,13 +175,13 @@ StorageRabbitMQ::StorageRabbitMQ(
         connection = std::make_unique<RabbitMQConnection>(configuration, log);
         if (connection->connect())
             initRabbitMQ();
-        else if (!is_attach)
+        else if (mode <= LoadingStrictnessLevel::CREATE)
             throw Exception(ErrorCodes::CANNOT_CONNECT_RABBITMQ, "Cannot connect to {}", connection->connectionInfoForLog());
     }
     catch (...)
     {
         tryLogCurrentException(log);
-        if (!is_attach)
+        if (mode <= LoadingStrictnessLevel::CREATE)
             throw;
     }
 
@@ -192,6 +196,26 @@ StorageRabbitMQ::StorageRabbitMQ(
     init_task->deactivate();
 }
 
+VirtualColumnsDescription StorageRabbitMQ::createVirtuals(StreamingHandleErrorMode handle_error_mode)
+{
+    VirtualColumnsDescription desc;
+
+    desc.addEphemeral("_exchange_name", std::make_shared<DataTypeString>(), "");
+    desc.addEphemeral("_channel_id", std::make_shared<DataTypeString>(), "");
+    desc.addEphemeral("_delivery_tag", std::make_shared<DataTypeUInt64>(), "");
+    desc.addEphemeral("_redelivered", std::make_shared<DataTypeUInt8>(), "");
+    desc.addEphemeral("_message_id", std::make_shared<DataTypeString>(), "");
+    desc.addEphemeral("_timestamp", std::make_shared<DataTypeUInt64>(), "");
+
+
+    if (handle_error_mode == StreamingHandleErrorMode::STREAM)
+    {
+        desc.addEphemeral("_raw_message", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+        desc.addEphemeral("_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "");
+    }
+
+    return desc;
+}
 
 Names StorageRabbitMQ::parseSettings(String settings_list)
 {
@@ -318,10 +342,11 @@ void StorageRabbitMQ::connectionFunc()
     try
     {
         if (connection->reconnect())
+        {
             initRabbitMQ();
-
-        streaming_task->scheduleAfter(RESCHEDULE_MS);
-        return;
+            streaming_task->scheduleAfter(RESCHEDULE_MS);
+            return;
+        }
     }
     catch (...)
     {
@@ -373,57 +398,37 @@ void StorageRabbitMQ::initRabbitMQ()
     }
     else
     {
-        try
+        auto rabbit_channel = connection->createChannel();
+
+        /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
+
+        initExchange(*rabbit_channel);
+        bindExchange(*rabbit_channel);
+
+        for (const auto i : collections::range(0, num_queues))
+            bindQueue(i + 1, *rabbit_channel);
+
+        if (queues.size() != num_queues)
         {
-            auto rabbit_channel = connection->createChannel();
-
-            /// Main exchange -> Bridge exchange -> ( Sharding exchange ) -> Queues -> Consumers
-
-            initExchange(*rabbit_channel);
-            bindExchange(*rabbit_channel);
-
-            for (const auto i : collections::range(0, num_queues))
-                bindQueue(i + 1, *rabbit_channel);
-
-            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;
+            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();
     }
 
     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);
-        }
+        auto consumer = createConsumer();
+        consumer->updateChannel(*connection);
+        consumers_ref.push_back(consumer);
+        pushConsumer(consumer);
+        ++num_created_consumers;
     }
 
     LOG_TRACE(log, "Registered {}/{} conumers", num_created_consumers, num_consumers);
@@ -1054,18 +1059,7 @@ bool StorageRabbitMQ::tryStreamToViews()
     if (!table)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Engine table {} doesn't exist.", table_id.getNameForLogs());
 
-    // Create an INSERT query for streaming data
-    auto insert = std::make_shared<ASTInsertQuery>();
-    insert->table_id = table_id;
-
-    // Only insert into dependent views and expect that input blocks contain virtual columns
-    InterpreterInsertQuery interpreter(insert, rabbitmq_context, false, true, true);
-    auto block_io = interpreter.execute();
-
     auto storage_snapshot = getStorageSnapshot(getInMemoryMetadataPtr(), getContext());
-    auto column_names = block_io.pipeline.getHeader().getNames();
-    auto sample_block = storage_snapshot->getSampleBlockForColumns(column_names);
-
     auto block_size = getMaxBlockSize();
 
     // Create a stream for each consumer and join them in a union stream
@@ -1081,21 +1075,50 @@ bool StorageRabbitMQ::tryStreamToViews()
     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, max_execution_time_ms, rabbitmq_settings->rabbitmq_handle_error_mode, false);
+            *this, storage_snapshot, rabbitmq_context, Names{}, block_size,
+            max_execution_time_ms, rabbitmq_settings->rabbitmq_handle_error_mode);
 
         sources.emplace_back(source);
         pipes.emplace_back(source);
     }
 
+    // Create an INSERT query for streaming data
+    auto insert = std::make_shared<ASTInsertQuery>();
+    insert->table_id = table_id;
+    if (!sources.empty())
+    {
+        auto column_list = std::make_shared<ASTExpressionList>();
+        const auto & header = sources[0]->getPort().getHeader();
+        for (const auto & column : header)
+            column_list->children.emplace_back(std::make_shared<ASTIdentifier>(column.name));
+        insert->columns = std::move(column_list);
+    }
+
+    // Only insert into dependent views and expect that input blocks contain virtual columns
+    InterpreterInsertQuery interpreter(insert, rabbitmq_context, /* allow_materialized_ */ false, /* no_squash_ */ true, /* no_destination_ */ true);
+    auto block_io = interpreter.execute();
+
     block_io.pipeline.complete(Pipe::unitePipes(std::move(pipes)));
 
+    std::atomic_size_t rows = 0;
+    block_io.pipeline.setProgressCallback([&](const Progress & progress) { rows += progress.read_rows.load(); });
+
     if (!connection->getHandler().loopRunning())
         startLoop();
 
+    bool write_failed = false;
+    try
     {
         CompletedPipelineExecutor executor(block_io.pipeline);
         executor.execute();
     }
+    catch (...)
+    {
+        LOG_ERROR(log, "Failed to push to views. Error: {}", getCurrentExceptionMessage(true));
+        write_failed = true;
+    }
+
+    LOG_TRACE(log, "Processed {} rows", rows);
 
     /* Note: sending ack() with loop running in another thread will lead to a lot of data races inside the library, but only in case
      * error occurs or connection is lost while ack is being sent
@@ -1103,13 +1126,6 @@ bool StorageRabbitMQ::tryStreamToViews()
     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)
@@ -1150,7 +1166,7 @@ bool StorageRabbitMQ::tryStreamToViews()
              *    the same channel will also commit all previously not-committed messages. Anyway I do not think that for ack frame this
              *    will ever happen.
              */
-            if (!source->sendAck())
+            if (write_failed ? source->sendNack() : source->sendAck())
             {
                 /// Iterate loop to activate error callbacks if they happened
                 connection->getHandler().iterateLoop();
@@ -1162,6 +1178,19 @@ bool StorageRabbitMQ::tryStreamToViews()
         }
     }
 
+    if (write_failed)
+    {
+        LOG_TRACE(log, "Write failed, reschedule");
+        return false;
+    }
+
+    if (!hasDependencies(getStorageID()))
+    {
+        /// Do not commit to rabbitmq if the dependency was removed.
+        LOG_TRACE(log, "No dependencies, reschedule");
+        return false;
+    }
+
     if ((queue_empty == num_created_consumers) && (++read_attempts == MAX_FAILED_READ_ATTEMPTS))
     {
         connection->heartbeat();
@@ -1208,31 +1237,10 @@ void registerStorageRabbitMQ(StorageFactory & factory)
         if (!rabbitmq_settings->rabbitmq_format.changed)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "You must specify `rabbitmq_format` setting");
 
-        return std::make_shared<StorageRabbitMQ>(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings), args.attach);
+        return std::make_shared<StorageRabbitMQ>(args.table_id, args.getContext(), args.columns, std::move(rabbitmq_settings), args.mode);
     };
 
     factory.registerStorage("RabbitMQ", creator_fn, StorageFactory::StorageFeatures{ .supports_settings = true, });
 }
 
-
-NamesAndTypesList StorageRabbitMQ::getVirtuals() const
-{
-    auto virtuals = NamesAndTypesList{
-            {"_exchange_name", std::make_shared<DataTypeString>()},
-            {"_channel_id", std::make_shared<DataTypeString>()},
-            {"_delivery_tag", std::make_shared<DataTypeUInt64>()},
-            {"_redelivered", std::make_shared<DataTypeUInt8>()},
-            {"_message_id", std::make_shared<DataTypeString>()},
-            {"_timestamp", std::make_shared<DataTypeUInt64>()}
-    };
-
-    if (rabbitmq_settings->rabbitmq_handle_error_mode == StreamingHandleErrorMode::STREAM)
-    {
-        virtuals.push_back({"_raw_message", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-        virtuals.push_back({"_error", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
-    }
-
-    return virtuals;
-}
-
 }
diff --git a/src/Storages/RabbitMQ/StorageRabbitMQ.h b/src/Storages/RabbitMQ/StorageRabbitMQ.h
index 120930cf01d..e14741d9636 100644
--- a/src/Storages/RabbitMQ/StorageRabbitMQ.h
+++ b/src/Storages/RabbitMQ/StorageRabbitMQ.h
@@ -27,7 +27,7 @@ public:
             ContextPtr context_,
             const ColumnsDescription & columns_,
             std::unique_ptr<RabbitMQSettings> rabbitmq_settings_,
-            bool is_attach_);
+            LoadingStrictnessLevel mode);
 
     std::string getName() const override { return "RabbitMQ"; }
 
@@ -68,7 +68,6 @@ public:
     RabbitMQConsumerPtr popConsumer(std::chrono::milliseconds timeout);
 
     const String & getFormatName() const { return format_name; }
-    NamesAndTypesList getVirtuals() const override;
 
     String getExchange() const { return exchange_name; }
     void unbindExchange();
@@ -102,7 +101,7 @@ private:
     bool use_user_setup;
 
     bool hash_exchange;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     RabbitMQConnectionPtr connection; /// Connection for all consumers
     RabbitMQConfiguration configuration;
@@ -158,10 +157,9 @@ private:
 
     size_t read_attempts = 0;
     mutable bool drop_table = false;
-    bool is_attach;
 
     RabbitMQConsumerPtr createConsumer();
-    bool initialized = false;
+    std::atomic<bool> initialized = false;
 
     /// Functions working in the background
     void streamingToViewsFunc();
@@ -192,6 +190,8 @@ private:
     bool tryStreamToViews();
     bool hasDependencies(const StorageID & table_id);
 
+    static VirtualColumnsDescription createVirtuals(StreamingHandleErrorMode handle_error_mode);
+
     static String getRandomName()
     {
         std::uniform_int_distribution<int> distribution('a', 'z');
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
index 4ead714c740..7c4581025e5 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.cpp
@@ -172,7 +172,7 @@ private:
 StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ContextPtr context_,
         const String & primary_key_,
         Int32 ttl_,
@@ -190,13 +190,15 @@ StorageEmbeddedRocksDB::StorageEmbeddedRocksDB(const StorageID & table_id_,
     {
         rocksdb_dir = context_->getPath() + relative_data_path_;
     }
-    if (!attach)
+    if (mode < LoadingStrictnessLevel::ATTACH)
     {
         fs::create_directories(rocksdb_dir);
     }
     initDB();
 }
 
+StorageEmbeddedRocksDB::~StorageEmbeddedRocksDB() = default;
+
 void StorageEmbeddedRocksDB::truncate(const ASTPtr &, const StorageMetadataPtr & , ContextPtr, TableExclusiveLockHolder &)
 {
     std::lock_guard lock(rocksdb_ptr_mx);
@@ -479,31 +481,26 @@ class ReadFromEmbeddedRocksDB : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromEmbeddedRocksDB"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromEmbeddedRocksDB(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
-        StorageSnapshotPtr storage_snapshot_,
         const StorageEmbeddedRocksDB & storage_,
-        SelectQueryInfo query_info_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
-        , storage_snapshot(std::move(storage_snapshot_))
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , storage(storage_)
-        , query_info(std::move(query_info_))
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
     {
     }
 
 private:
-    StorageSnapshotPtr storage_snapshot;
     const StorageEmbeddedRocksDB & storage;
-    SelectQueryInfo query_info;
-    ContextPtr context;
 
     size_t max_block_size;
     size_t num_streams;
@@ -526,13 +523,7 @@ void StorageEmbeddedRocksDB::read(
     Block sample_block = storage_snapshot->metadata->getSampleBlock();
 
     auto reading = std::make_unique<ReadFromEmbeddedRocksDB>(
-        std::move(sample_block),
-        storage_snapshot,
-        *this,
-        query_info,
-        context_,
-        max_block_size,
-        num_streams);
+        column_names, query_info, storage_snapshot, context_, std::move(sample_block), *this, max_block_size, num_streams);
 
     query_plan.addStep(std::move(reading));
 }
@@ -582,11 +573,12 @@ void ReadFromEmbeddedRocksDB::initializePipeline(QueryPipelineBuilder & pipeline
     }
 }
 
-void ReadFromEmbeddedRocksDB::applyFilters()
+void ReadFromEmbeddedRocksDB::applyFilters(ActionDAGNodes added_filter_nodes)
 {
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const auto & sample_block = getOutputStream().header;
     auto primary_key_data_type = sample_block.getByName(storage.primary_key).type;
-    std::tie(keys, all_scan) = getFilterKeys(storage.primary_key, primary_key_data_type, filter_nodes, context);
+    std::tie(keys, all_scan) = getFilterKeys(storage.primary_key, primary_key_data_type, filter_actions_dag, context);
 }
 
 SinkToStoragePtr StorageEmbeddedRocksDB::write(
@@ -630,7 +622,7 @@ static StoragePtr create(const StorageFactory::Arguments & args)
     {
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "StorageEmbeddedRocksDB must require one column in primary key");
     }
-    return std::make_shared<StorageEmbeddedRocksDB>(args.table_id, args.relative_data_path, metadata, args.attach, args.getContext(), primary_key_names[0], ttl, std::move(rocksdb_dir), read_only);
+    return std::make_shared<StorageEmbeddedRocksDB>(args.table_id, args.relative_data_path, metadata, args.mode, args.getContext(), primary_key_names[0], ttl, std::move(rocksdb_dir), read_only);
 }
 
 std::shared_ptr<rocksdb::Statistics> StorageEmbeddedRocksDB::getRocksDBStatistics() const
diff --git a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
index b09dfca7338..230464a161f 100644
--- a/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
+++ b/src/Storages/RocksDB/StorageEmbeddedRocksDB.h
@@ -32,13 +32,15 @@ public:
     StorageEmbeddedRocksDB(const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ContextPtr context_,
         const String & primary_key_,
         Int32 ttl_ = 0,
         String rocksdb_dir_ = "",
         bool read_only_ = false);
 
+    ~StorageEmbeddedRocksDB() override;
+
     std::string getName() const override { return "EmbeddedRocksDB"; }
 
     void read(
@@ -91,7 +93,7 @@ public:
     bool supportsDelete() const override { return true; }
 
     /// To turn on the optimization optimize_trivial_approximate_count_query=1 should be set for a query.
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
 
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.cpp b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
index d0533b5ba0c..4406a7c3fd4 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.cpp
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.cpp
@@ -10,6 +10,7 @@
 #include <Common/StringUtils/StringUtils.h>
 #include <Common/typeid_cast.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Databases/IDatabase.h>
 #include <rocksdb/statistics.h>
 
@@ -39,7 +40,7 @@ ColumnsDescription StorageSystemRocksDB::getColumnsDescription()
 }
 
 
-void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
@@ -87,7 +88,7 @@ void StorageSystemRocksDB::fillData(MutableColumns & res_columns, ContextPtr con
             { col_table_to_filter, std::make_shared<DataTypeString>(), "table" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
             return;
diff --git a/src/Storages/RocksDB/StorageSystemRocksDB.h b/src/Storages/RocksDB/StorageSystemRocksDB.h
index c1f10a7722d..ec351c75446 100644
--- a/src/Storages/RocksDB/StorageSystemRocksDB.h
+++ b/src/Storages/RocksDB/StorageSystemRocksDB.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements the `rocksdb` system table, which expose various rocksdb metrics.
   */
-class StorageSystemRocksDB final : public IStorageSystemOneBlock<StorageSystemRocksDB>
+class StorageSystemRocksDB final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemRocksDB"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/S3Queue/S3QueueFilesMetadata.cpp b/src/Storages/S3Queue/S3QueueFilesMetadata.cpp
index f49e1d6f25c..ed2f8d2ec1b 100644
--- a/src/Storages/S3Queue/S3QueueFilesMetadata.cpp
+++ b/src/Storages/S3Queue/S3QueueFilesMetadata.cpp
@@ -1,9 +1,5 @@
 #include "config.h"
 
-#include <base/sleep.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/randomSeed.h>
-#include <Common/getRandomASCIIString.h>
 #include <IO/Operators.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
@@ -12,6 +8,12 @@
 #include <Storages/S3Queue/S3QueueSettings.h>
 #include <Storages/StorageS3Settings.h>
 #include <Storages/StorageSnapshot.h>
+#include <base/sleep.h>
+#include <Common/CurrentThread.h>
+#include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/getRandomASCIIString.h>
+#include <Common/randomSeed.h>
+
 #include <Poco/JSON/JSON.h>
 #include <Poco/JSON/Object.h>
 #include <Poco/JSON/Parser.h>
@@ -129,11 +131,14 @@ S3QueueFilesMetadata::S3QueueFilesMetadata(const fs::path & zookeeper_path_, con
     , max_loading_retries(settings_.s3queue_loading_retries.value)
     , min_cleanup_interval_ms(settings_.s3queue_cleanup_interval_min_ms.value)
     , max_cleanup_interval_ms(settings_.s3queue_cleanup_interval_max_ms.value)
+    , shards_num(settings_.s3queue_total_shards_num)
+    , threads_per_shard(settings_.s3queue_processing_threads_num)
     , zookeeper_processing_path(zookeeper_path_ / "processing")
     , zookeeper_processed_path(zookeeper_path_ / "processed")
     , zookeeper_failed_path(zookeeper_path_ / "failed")
+    , zookeeper_shards_path(zookeeper_path_ / "shards")
     , zookeeper_cleanup_lock_path(zookeeper_path_ / "cleanup_lock")
-    , log(&Poco::Logger::get("S3QueueFilesMetadata"))
+    , log(getLogger("S3QueueFilesMetadata"))
 {
     if (mode == S3QueueMode::UNORDERED && (max_set_size || max_set_age_sec))
     {
@@ -197,6 +202,126 @@ S3QueueFilesMetadata::NodeMetadata S3QueueFilesMetadata::createNodeMetadata(
     return metadata;
 }
 
+bool S3QueueFilesMetadata::isShardedProcessing() const
+{
+    return getProcessingIdsNum() > 1 && mode == S3QueueMode::ORDERED;
+}
+
+size_t S3QueueFilesMetadata::registerNewShard()
+{
+    if (!isShardedProcessing())
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot register a new shard, because processing is not sharded");
+    }
+
+    const auto zk_client = getZooKeeper();
+    zk_client->createIfNotExists(zookeeper_shards_path, "");
+
+    std::string shard_node_path;
+    size_t shard_id = 0;
+    for (size_t i = 0; i < shards_num; ++i)
+    {
+        const auto node_path = getZooKeeperPathForShard(i);
+        auto err = zk_client->tryCreate(node_path, "", zkutil::CreateMode::Persistent);
+        if (err == Coordination::Error::ZOK)
+        {
+            shard_node_path = node_path;
+            shard_id = i;
+            break;
+        }
+        else if (err == Coordination::Error::ZNODEEXISTS)
+            continue;
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Unexpected error: {}", magic_enum::enum_name(err));
+    }
+
+    if (shard_node_path.empty())
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Failed to register a new shard");
+
+    LOG_TRACE(log, "Using shard {} (zk node: {})", shard_id, shard_node_path);
+    return shard_id;
+}
+
+std::string S3QueueFilesMetadata::getZooKeeperPathForShard(size_t shard_id) const
+{
+    return zookeeper_shards_path / ("shard" + toString(shard_id));
+}
+
+void S3QueueFilesMetadata::registerNewShard(size_t shard_id)
+{
+    if (!isShardedProcessing())
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot register a new shard, because processing is not sharded");
+    }
+
+    const auto zk_client = getZooKeeper();
+    const auto node_path = getZooKeeperPathForShard(shard_id);
+    zk_client->createAncestors(node_path);
+
+    auto err = zk_client->tryCreate(node_path, "", zkutil::CreateMode::Persistent);
+    if (err != Coordination::Error::ZOK)
+    {
+        if (err == Coordination::Error::ZNODEEXISTS)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Cannot register shard {}: already exists", shard_id);
+        else
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "Unexpected error: {}", magic_enum::enum_name(err));
+    }
+}
+
+bool S3QueueFilesMetadata::isShardRegistered(size_t shard_id)
+{
+    const auto zk_client = getZooKeeper();
+    const auto node_path = getZooKeeperPathForShard(shard_id);
+    return zk_client->exists(node_path);
+}
+
+void S3QueueFilesMetadata::unregisterShard(size_t shard_id)
+{
+    if (!isShardedProcessing())
+    {
+        throw Exception(ErrorCodes::LOGICAL_ERROR,
+                        "Cannot unregister a shard, because processing is not sharded");
+    }
+
+    const auto zk_client = getZooKeeper();
+    const auto node_path = getZooKeeperPathForShard(shard_id);
+    auto error_code = zk_client->tryRemove(node_path);
+    if (error_code != Coordination::Error::ZOK
+        && error_code != Coordination::Error::ZNONODE)
+        throw zkutil::KeeperException::fromPath(error_code, node_path);
+}
+
+size_t S3QueueFilesMetadata::getProcessingIdsNum() const
+{
+    return shards_num * threads_per_shard;
+}
+
+std::vector<size_t> S3QueueFilesMetadata::getProcessingIdsForShard(size_t shard_id) const
+{
+    std::vector<size_t> res(threads_per_shard);
+    std::iota(res.begin(), res.end(), shard_id * threads_per_shard);
+    return res;
+}
+
+bool S3QueueFilesMetadata::isProcessingIdBelongsToShard(size_t id, size_t shard_id) const
+{
+    return shard_id * threads_per_shard <= id && id < (shard_id + 1) * threads_per_shard;
+}
+
+size_t S3QueueFilesMetadata::getIdForProcessingThread(size_t thread_id, size_t shard_id) const
+{
+    return shard_id * threads_per_shard + thread_id;
+}
+
+size_t S3QueueFilesMetadata::getProcessingIdForPath(const std::string & path) const
+{
+    return sipHash64(path) % getProcessingIdsNum();
+}
+
 S3QueueFilesMetadata::ProcessingNodeHolderPtr S3QueueFilesMetadata::trySetFileAsProcessing(const std::string & path)
 {
     auto timer = DB::CurrentThread::getProfileEvents().timer(ProfileEvents::S3QueueSetFileProcessingMicroseconds);
@@ -212,16 +337,24 @@ S3QueueFilesMetadata::ProcessingNodeHolderPtr S3QueueFilesMetadata::trySetFileAs
         std::lock_guard lock(file_status->metadata_lock);
         switch (file_status->state)
         {
-            case FileStatus::State::Processing: [[fallthrough]];
+            case FileStatus::State::Processing:
+            {
+                LOG_TEST(log, "File {} is already processing", path);
+                return {};
+            }
             case FileStatus::State::Processed:
             {
+                LOG_TEST(log, "File {} is already processed", path);
                 return {};
             }
             case FileStatus::State::Failed:
             {
                 /// If max_loading_retries == 0, file is not retriable.
                 if (max_loading_retries == 0)
+                {
+                    LOG_TEST(log, "File {} is failed and processing retries are disabled", path);
                     return {};
+                }
 
                 /// Otherwise file_status->retries is also cached.
                 /// In case file_status->retries >= max_loading_retries we can fully rely that it is true
@@ -230,7 +363,10 @@ S3QueueFilesMetadata::ProcessingNodeHolderPtr S3QueueFilesMetadata::trySetFileAs
                 /// (another server could have done a try after we cached retries value),
                 /// so check with zookeeper here.
                 if (file_status->retries >= max_loading_retries)
+                {
+                    LOG_TEST(log, "File {} is failed and processing retries are exceeeded", path);
                     return {};
+                }
 
                 break;
             }
@@ -284,35 +420,31 @@ S3QueueFilesMetadata::ProcessingNodeHolderPtr S3QueueFilesMetadata::trySetFileAs
             if (!file_status->processing_start_time)
                 file_status->processing_start_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now());
 
-            break;
+            return processing_node_holder;
         }
         case SetFileProcessingResult::AlreadyProcessed:
         {
             std::lock_guard lock(file_status->metadata_lock);
             file_status->state = FileStatus::State::Processed;
-            break;
+            return {};
         }
         case SetFileProcessingResult::AlreadyFailed:
         {
             std::lock_guard lock(file_status->metadata_lock);
             file_status->state = FileStatus::State::Failed;
-            break;
+            return {};
         }
         case SetFileProcessingResult::ProcessingByOtherNode:
         {
             /// We cannot save any local state here, see comment above.
-            break;
+            return {};
         }
     }
-
-    if (result == SetFileProcessingResult::Success)
-        return processing_node_holder;
-
-    return {};
 }
 
 std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
-          S3QueueFilesMetadata::ProcessingNodeHolderPtr> S3QueueFilesMetadata::trySetFileAsProcessingForUnorderedMode(const std::string & path, const FileStatusPtr & file_status)
+          S3QueueFilesMetadata::ProcessingNodeHolderPtr>
+S3QueueFilesMetadata::trySetFileAsProcessingForUnorderedMode(const std::string & path, const FileStatusPtr & file_status)
 {
     /// In one zookeeper transaction do the following:
     /// 1. check that corresponding persistent nodes do not exist in processed/ and failed/;
@@ -339,7 +471,8 @@ std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
 
     if (code == Coordination::Error::ZOK)
     {
-        auto holder = std::make_unique<ProcessingNodeHolder>(node_metadata.processing_id, path, zookeeper_processing_path / node_name, file_status, zk_client);
+        auto holder = std::make_unique<ProcessingNodeHolder>(
+            node_metadata.processing_id, path, zookeeper_processing_path / node_name, file_status, zk_client);
         return std::pair{SetFileProcessingResult::Success, std::move(holder)};
     }
 
@@ -362,7 +495,8 @@ std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
 }
 
 std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
-          S3QueueFilesMetadata::ProcessingNodeHolderPtr> S3QueueFilesMetadata::trySetFileAsProcessingForOrderedMode(const std::string & path, const FileStatusPtr & file_status)
+          S3QueueFilesMetadata::ProcessingNodeHolderPtr>
+S3QueueFilesMetadata::trySetFileAsProcessingForOrderedMode(const std::string & path, const FileStatusPtr & file_status)
 {
     /// Same as for Unordered mode.
     /// The only difference is the check if the file is already processed.
@@ -385,10 +519,15 @@ std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
         /// If the version did change - retry (since we cannot do Get and Create requests
         /// in the same zookeeper transaction, so we use a while loop with tries).
 
-        Coordination::Stat processed_node_stat;
-        auto data = zk_client->get(zookeeper_processed_path, &processed_node_stat);
+        auto processed_node = isShardedProcessing()
+            ? zookeeper_processed_path / toString(getProcessingIdForPath(path))
+            : zookeeper_processed_path;
+
         NodeMetadata processed_node_metadata;
-        if (!data.empty())
+        Coordination::Stat processed_node_stat;
+        std::string data;
+        auto processed_node_exists = zk_client->tryGet(processed_node, data, &processed_node_stat);
+        if (processed_node_exists && !data.empty())
             processed_node_metadata = NodeMetadata::fromString(data);
 
         auto max_processed_file_path = processed_node_metadata.file_path;
@@ -403,13 +542,25 @@ std::pair<S3QueueFilesMetadata::SetFileProcessingResult,
         requests.push_back(zkutil::makeRemoveRequest(zookeeper_failed_path / node_name, -1));
 
         requests.push_back(zkutil::makeCreateRequest(zookeeper_processing_path / node_name, node_metadata.toString(), zkutil::CreateMode::Ephemeral));
-        requests.push_back(zkutil::makeCheckRequest(zookeeper_processed_path, processed_node_stat.version));
+
+        if (processed_node_exists)
+        {
+            requests.push_back(zkutil::makeCheckRequest(processed_node, processed_node_stat.version));
+        }
+        else
+        {
+            requests.push_back(zkutil::makeCreateRequest(processed_node, "", zkutil::CreateMode::Persistent));
+            requests.push_back(zkutil::makeRemoveRequest(processed_node, -1));
+        }
 
         Coordination::Responses responses;
         auto code = zk_client->tryMulti(requests, responses);
         if (code == Coordination::Error::ZOK)
         {
-            auto holder = std::make_unique<ProcessingNodeHolder>(node_metadata.processing_id, path, zookeeper_processing_path / node_name, file_status, zk_client);
+            auto holder = std::make_unique<ProcessingNodeHolder>(
+                node_metadata.processing_id, path, zookeeper_processing_path / node_name, file_status, zk_client);
+
+            LOG_TEST(log, "File {} is ready to be processed", path);
             return std::pair{SetFileProcessingResult::Success, std::move(holder)};
         }
 
@@ -491,20 +642,31 @@ void S3QueueFilesMetadata::setFileProcessedForUnorderedMode(ProcessingNodeHolder
                 "this could be a result of expired zookeeper session", path);
 }
 
+
 void S3QueueFilesMetadata::setFileProcessedForOrderedMode(ProcessingNodeHolderPtr holder)
+{
+    auto processed_node_path = isShardedProcessing()
+        ? zookeeper_processed_path / toString(getProcessingIdForPath(holder->path))
+        : zookeeper_processed_path;
+
+    return setFileProcessedForOrderedModeImpl(holder->path, holder, processed_node_path);
+}
+
+void S3QueueFilesMetadata::setFileProcessedForOrderedModeImpl(
+    const std::string & path, ProcessingNodeHolderPtr holder, const std::string & processed_node_path)
 {
     /// Update a persistent node in /processed and remove ephemeral node from /processing.
 
-    const auto & path = holder->path;
     const auto node_name = getNodeName(path);
     const auto node_metadata = createNodeMetadata(path).toString();
     const auto zk_client = getZooKeeper();
 
+    LOG_TEST(log, "Setting file `{}` as processed (at {})", path, processed_node_path);
     while (true)
     {
         std::string res;
         Coordination::Stat stat;
-        bool exists = zk_client->tryGet(zookeeper_processed_path, res, &stat);
+        bool exists = zk_client->tryGet(processed_node_path, res, &stat);
         Coordination::Requests requests;
         if (exists)
         {
@@ -513,39 +675,44 @@ void S3QueueFilesMetadata::setFileProcessedForOrderedMode(ProcessingNodeHolderPt
                 auto metadata = NodeMetadata::fromString(res);
                 if (metadata.file_path >= path)
                 {
-                    /// Here we get in the case that maximum processed file is bigger than ours.
-                    /// This is possible to achieve in case of parallel processing
-                    /// but for local processing we explicitly disable parallel mode and do everything in a single thread
-                    /// (see constructor of StorageS3Queue where s3queue_processing_threads_num is explicitly set to 1 in case of Ordered mode).
-                    /// Nevertheless, in case of distributed processing we cannot do anything with parallelism.
-                    /// What this means?
-                    /// It means that in scenario "distributed processing + Ordered mode"
-                    /// a setting s3queue_loading_retries will not work. It is possible to fix, it is in TODO.
-
-                    /// Return because there is nothing to change,
-                    /// the max processed file is already bigger than ours.
+                    LOG_TRACE(log, "File {} is already processed, current max processed file: {}", path, metadata.file_path);
                     return;
                 }
             }
-            requests.push_back(zkutil::makeSetRequest(zookeeper_processed_path, node_metadata, stat.version));
+            requests.push_back(zkutil::makeSetRequest(processed_node_path, node_metadata, stat.version));
         }
         else
         {
-            requests.push_back(zkutil::makeCreateRequest(zookeeper_processed_path, node_metadata, zkutil::CreateMode::Persistent));
+            requests.push_back(zkutil::makeCreateRequest(processed_node_path, node_metadata, zkutil::CreateMode::Persistent));
         }
 
         Coordination::Responses responses;
-        if (holder->remove(&requests, &responses))
+        if (holder)
         {
-            LOG_TEST(log, "Moved file `{}` to processed", path);
-            if (max_loading_retries)
-                zk_client->tryRemove(zookeeper_failed_path / (node_name + ".retriable"), -1);
-            return;
+            if (holder->remove(&requests, &responses))
+            {
+                LOG_TEST(log, "Moved file `{}` to processed", path);
+                if (max_loading_retries)
+                    zk_client->tryRemove(zookeeper_failed_path / (node_name + ".retriable"), -1);
+                return;
+            }
+        }
+        else
+        {
+            auto code = zk_client->tryMulti(requests, responses);
+            if (code == Coordination::Error::ZOK)
+            {
+                LOG_TEST(log, "Moved file `{}` to processed", path);
+                return;
+            }
         }
 
         /// Failed to update max processed node, retry.
         if (!responses.empty() && responses[0]->error != Coordination::Error::ZOK)
+        {
+            LOG_TRACE(log, "Failed to update processed node ({}). Will retry.", magic_enum::enum_name(responses[0]->error));
             continue;
+        }
 
         LOG_WARNING(log, "Cannot set file ({}) as processed since processing node "
                     "does not exist with expected processing id does not exist, "
@@ -554,6 +721,22 @@ void S3QueueFilesMetadata::setFileProcessedForOrderedMode(ProcessingNodeHolderPt
     }
 }
 
+void S3QueueFilesMetadata::setFileProcessed(const std::string & path, size_t shard_id)
+{
+    if (mode != S3QueueMode::ORDERED)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Can set file as preprocessed only for Ordered mode");
+
+    if (isShardedProcessing())
+    {
+        for (const auto & processor : getProcessingIdsForShard(shard_id))
+            setFileProcessedForOrderedModeImpl(path, nullptr, zookeeper_processed_path / toString(processor));
+    }
+    else
+    {
+        setFileProcessedForOrderedModeImpl(path, nullptr, zookeeper_processed_path);
+    }
+}
+
 void S3QueueFilesMetadata::setFileFailed(ProcessingNodeHolderPtr holder, const String & exception_message)
 {
     auto timer = DB::CurrentThread::getProfileEvents().timer(ProfileEvents::S3QueueSetFileFailedMicroseconds);
@@ -689,7 +872,7 @@ S3QueueFilesMetadata::ProcessingNodeHolder::ProcessingNodeHolder(
     , path(path_)
     , zk_node_path(zk_node_path_)
     , processing_id(processing_id_)
-    , log(&Poco::Logger::get("ProcessingNodeHolder"))
+    , log(getLogger("ProcessingNodeHolder"))
 {
 }
 
diff --git a/src/Storages/S3Queue/S3QueueFilesMetadata.h b/src/Storages/S3Queue/S3QueueFilesMetadata.h
index f3be7c5c3a0..9301ea7ceb8 100644
--- a/src/Storages/S3Queue/S3QueueFilesMetadata.h
+++ b/src/Storages/S3Queue/S3QueueFilesMetadata.h
@@ -42,6 +42,7 @@ public:
     ~S3QueueFilesMetadata();
 
     void setFileProcessed(ProcessingNodeHolderPtr holder);
+    void setFileProcessed(const std::string & path, size_t shard_id);
 
     void setFileFailed(ProcessingNodeHolderPtr holder, const std::string & exception_message);
 
@@ -80,6 +81,38 @@ public:
 
     void deactivateCleanupTask();
 
+    /// Should the table use sharded processing?
+    /// We use sharded processing for Ordered mode of S3Queue table.
+    /// It allows to parallelize processing within a single server
+    /// and to allow distributed processing.
+    bool isShardedProcessing() const;
+
+    /// Register a new shard for processing.
+    /// Return a shard id of registered shard.
+    size_t registerNewShard();
+    /// Register a new shard for processing by given id.
+    /// Throws exception if shard by this id is already registered.
+    void registerNewShard(size_t shard_id);
+    /// Unregister shard from keeper.
+    void unregisterShard(size_t shard_id);
+    bool isShardRegistered(size_t shard_id);
+
+    /// Total number of processing ids.
+    /// A processing id identifies a single processing thread.
+    /// There might be several processing ids per shard.
+    size_t getProcessingIdsNum() const;
+    /// Get processing ids identified with requested shard.
+    std::vector<size_t> getProcessingIdsForShard(size_t shard_id) const;
+    /// Check if given processing id belongs to a given shard.
+    bool isProcessingIdBelongsToShard(size_t id, size_t shard_id) const;
+    /// Get a processing id for processing thread by given thread id.
+    /// thread id is a value in range [0, threads_per_shard].
+    size_t getIdForProcessingThread(size_t thread_id, size_t shard_id) const;
+
+    /// Calculate which processing id corresponds to a given file path.
+    /// The file will be processed by a thread related to this processing id.
+    size_t getProcessingIdForPath(const std::string & path) const;
+
 private:
     const S3QueueMode mode;
     const UInt64 max_set_size;
@@ -87,13 +120,16 @@ private:
     const UInt64 max_loading_retries;
     const size_t min_cleanup_interval_ms;
     const size_t max_cleanup_interval_ms;
+    const size_t shards_num;
+    const size_t threads_per_shard;
 
     const fs::path zookeeper_processing_path;
     const fs::path zookeeper_processed_path;
     const fs::path zookeeper_failed_path;
+    const fs::path zookeeper_shards_path;
     const fs::path zookeeper_cleanup_lock_path;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::atomic_bool shutdown = false;
     BackgroundSchedulePool::TaskHolder task;
@@ -104,6 +140,10 @@ private:
 
     void setFileProcessedForOrderedMode(ProcessingNodeHolderPtr holder);
     void setFileProcessedForUnorderedMode(ProcessingNodeHolderPtr holder);
+    std::string getZooKeeperPathForShard(size_t shard_id) const;
+
+    void setFileProcessedForOrderedModeImpl(
+        const std::string & path, ProcessingNodeHolderPtr holder, const std::string & processed_node_path);
 
     enum class SetFileProcessingResult
     {
@@ -117,8 +157,7 @@ private:
 
     struct NodeMetadata
     {
-        std::string file_path;
-        UInt64 last_processed_timestamp = 0;
+        std::string file_path; UInt64 last_processed_timestamp = 0;
         std::string last_exception;
         UInt64 retries = 0;
         std::string processing_id; /// For ephemeral processing node.
@@ -169,7 +208,7 @@ private:
     std::string zk_node_path;
     std::string processing_id;
     bool removed = false;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/S3Queue/S3QueueSettings.h b/src/Storages/S3Queue/S3QueueSettings.h
index 66fe9b4ce31..c26e973a1c0 100644
--- a/src/Storages/S3Queue/S3QueueSettings.h
+++ b/src/Storages/S3Queue/S3QueueSettings.h
@@ -22,6 +22,7 @@ class ASTStorage;
     M(UInt32, s3queue_loading_retries, 0, "Retry loading up to specified number of times", 0) \
     M(UInt32, s3queue_processing_threads_num, 1, "Number of processing threads", 0) \
     M(UInt32, s3queue_enable_logging_to_s3queue_log, 1, "Enable logging to system table system.s3queue_log", 0) \
+    M(String, s3queue_last_processed_path, "", "For Ordered mode. Files that have lexicographically smaller file name are considered already processed", 0) \
     M(UInt32, s3queue_tracked_file_ttl_sec, 0, "Maximum number of seconds to store processed files in ZooKeeper node (store forever by default)", 0) \
     M(UInt32, s3queue_polling_min_timeout_ms, 1000, "Minimal timeout before next polling", 0) \
     M(UInt32, s3queue_polling_max_timeout_ms, 10000, "Maximum timeout before next polling", 0) \
@@ -29,6 +30,8 @@ class ASTStorage;
     M(UInt32, s3queue_tracked_files_limit, 1000, "For unordered mode. Max set size for tracking processed files in ZooKeeper", 0) \
     M(UInt32, s3queue_cleanup_interval_min_ms, 60000, "For unordered mode. Polling backoff min for cleanup", 0) \
     M(UInt32, s3queue_cleanup_interval_max_ms, 60000, "For unordered mode. Polling backoff max for cleanup", 0) \
+    M(UInt32, s3queue_total_shards_num, 1, "Value 0 means disabled", 0) \
+    M(UInt32, s3queue_current_shard_num, 0, "", 0) \
 
 #define LIST_OF_S3QUEUE_SETTINGS(M, ALIAS) \
     S3QUEUE_RELATED_SETTINGS(M, ALIAS) \
diff --git a/src/Storages/S3Queue/S3QueueSource.cpp b/src/Storages/S3Queue/S3QueueSource.cpp
index 27bec039f96..19c69d5c589 100644
--- a/src/Storages/S3Queue/S3QueueSource.cpp
+++ b/src/Storages/S3Queue/S3QueueSource.cpp
@@ -28,6 +28,7 @@ namespace ErrorCodes
 {
     extern const int S3_ERROR;
     extern const int NOT_IMPLEMENTED;
+    extern const int LOGICAL_ERROR;
 }
 
 StorageS3QueueSource::S3QueueKeyWithInfo::S3QueueKeyWithInfo(
@@ -42,33 +43,113 @@ StorageS3QueueSource::S3QueueKeyWithInfo::S3QueueKeyWithInfo(
 StorageS3QueueSource::FileIterator::FileIterator(
     std::shared_ptr<S3QueueFilesMetadata> metadata_,
     std::unique_ptr<GlobIterator> glob_iterator_,
+    size_t current_shard_,
     std::atomic<bool> & shutdown_called_)
     : metadata(metadata_)
     , glob_iterator(std::move(glob_iterator_))
     , shutdown_called(shutdown_called_)
+    , log(&Poco::Logger::get("StorageS3QueueSource"))
+    , sharded_processing(metadata->isShardedProcessing())
+    , current_shard(current_shard_)
 {
+    if (sharded_processing)
+    {
+        for (const auto & id : metadata->getProcessingIdsForShard(current_shard))
+            sharded_keys.emplace(id, std::deque<KeyWithInfoPtr>{});
+    }
 }
 
-StorageS3QueueSource::KeyWithInfoPtr StorageS3QueueSource::FileIterator::next()
+StorageS3QueueSource::KeyWithInfoPtr StorageS3QueueSource::FileIterator::next(size_t idx)
 {
     while (!shutdown_called)
     {
-        KeyWithInfoPtr val = glob_iterator->next();
+        KeyWithInfoPtr val{nullptr};
+
+        {
+            std::unique_lock lk(sharded_keys_mutex, std::defer_lock);
+            if (sharded_processing)
+            {
+                /// To make sure order on keys in each shard in sharded_keys
+                /// we need to check sharded_keys and to next() under lock.
+                lk.lock();
+
+                if (auto it = sharded_keys.find(idx); it != sharded_keys.end())
+                {
+                    auto & keys = it->second;
+                    if (!keys.empty())
+                    {
+                        val = keys.front();
+                        keys.pop_front();
+                        chassert(idx == metadata->getProcessingIdForPath(val->key));
+                    }
+                }
+                else
+                {
+                    throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                    "Processing id {} does not exist (Expected ids: {})",
+                                    idx, fmt::join(metadata->getProcessingIdsForShard(current_shard), ", "));
+                }
+            }
+
+            if (!val)
+            {
+                val = glob_iterator->next();
+                if (val && sharded_processing)
+                {
+                    const auto processing_id_for_key = metadata->getProcessingIdForPath(val->key);
+                    if (idx != processing_id_for_key)
+                    {
+                        if (metadata->isProcessingIdBelongsToShard(processing_id_for_key, current_shard))
+                        {
+                            LOG_TEST(log, "Putting key {} into queue of processor {} (total: {})",
+                                     val->key, processing_id_for_key, sharded_keys.size());
+
+                            if (auto it = sharded_keys.find(processing_id_for_key); it != sharded_keys.end())
+                            {
+                                it->second.push_back(val);
+                            }
+                            else
+                            {
+                                throw Exception(ErrorCodes::LOGICAL_ERROR,
+                                                "Processing id {} does not exist (Expected ids: {})",
+                                                processing_id_for_key, fmt::join(metadata->getProcessingIdsForShard(current_shard), ", "));
+                            }
+                        }
+                        continue;
+                    }
+                }
+            }
+        }
 
         if (!val)
             return {};
 
         if (shutdown_called)
         {
-            LOG_TEST(&Poco::Logger::get("StorageS3QueueSource"), "Shutdown was called, stopping file iterator");
+            LOG_TEST(log, "Shutdown was called, stopping file iterator");
             return {};
         }
 
-        if (auto processing_holder = metadata->trySetFileAsProcessing(val->key);
-            processing_holder && !shutdown_called)
+        auto processing_holder = metadata->trySetFileAsProcessing(val->key);
+        if (shutdown_called)
+        {
+            LOG_TEST(log, "Shutdown was called, stopping file iterator");
+            return {};
+        }
+
+        LOG_TEST(log, "Checking if can process key {} for processing_id {}", val->key, idx);
+
+        if (processing_holder)
         {
             return std::make_shared<S3QueueKeyWithInfo>(val->key, val->info, processing_holder);
         }
+        else if (sharded_processing
+                 && metadata->getFileStatus(val->key)->state == S3QueueFilesMetadata::FileStatus::State::Processing)
+        {
+            throw Exception(ErrorCodes::LOGICAL_ERROR,
+                            "File {} is processing by someone else in sharded processing. "
+                            "It is a bug", val->key);
+        }
     }
     return {};
 }
@@ -83,6 +164,7 @@ StorageS3QueueSource::StorageS3QueueSource(
     const Block & header_,
     std::unique_ptr<StorageS3Source> internal_source_,
     std::shared_ptr<S3QueueFilesMetadata> files_metadata_,
+    size_t processing_id_,
     const S3QueueAction & action_,
     RemoveFileFunc remove_file_func_,
     const NamesAndTypesList & requested_virtual_columns_,
@@ -91,11 +173,12 @@ StorageS3QueueSource::StorageS3QueueSource(
     const std::atomic<bool> & table_is_being_dropped_,
     std::shared_ptr<S3QueueLog> s3_queue_log_,
     const StorageID & storage_id_,
-    Poco::Logger * log_)
+    LoggerPtr log_)
     : ISource(header_)
     , WithContext(context_)
     , name(std::move(name_))
     , action(action_)
+    , processing_id(processing_id_)
     , files_metadata(files_metadata_)
     , internal_source(std::move(internal_source_))
     , requested_virtual_columns(requested_virtual_columns_)
@@ -123,7 +206,7 @@ void StorageS3QueueSource::lazyInitialize()
     if (initialized)
         return;
 
-    internal_source->lazyInitialize();
+    internal_source->lazyInitialize(processing_id);
     reader = std::move(internal_source->reader);
     if (reader)
         reader_future = std::move(internal_source->reader_future);
@@ -249,7 +332,7 @@ Chunk StorageS3QueueSource::generate()
         /// Even if task is finished the thread may be not freed in pool.
         /// So wait until it will be freed before scheduling a new task.
         internal_source->create_reader_pool.wait();
-        reader_future = internal_source->createReaderAsync();
+        reader_future = internal_source->createReaderAsync(processing_id);
     }
 
     return {};
@@ -270,7 +353,11 @@ void StorageS3QueueSource::applyActionAfterProcessing(const String & path)
     }
 }
 
-void StorageS3QueueSource::appendLogElement(const std::string & filename, S3QueueFilesMetadata::FileStatus & file_status_, size_t processed_rows, bool processed)
+void StorageS3QueueSource::appendLogElement(
+    const std::string & filename,
+    S3QueueFilesMetadata::FileStatus & file_status_,
+    size_t processed_rows,
+    bool processed)
 {
     if (!s3_queue_log)
         return;
@@ -281,6 +368,9 @@ void StorageS3QueueSource::appendLogElement(const std::string & filename, S3Queu
         elem = S3QueueLogElement
         {
             .event_time = std::chrono::system_clock::to_time_t(std::chrono::system_clock::now()),
+            .database = storage_id.database_name,
+            .table = storage_id.table_name,
+            .uuid = toString(storage_id.uuid),
             .file_name = filename,
             .rows_processed = processed_rows,
             .status = processed ? S3QueueLogElement::S3QueueStatus::Processed : S3QueueLogElement::S3QueueStatus::Failed,
diff --git a/src/Storages/S3Queue/S3QueueSource.h b/src/Storages/S3Queue/S3QueueSource.h
index 542f8e8fd8c..8fc7305ea08 100644
--- a/src/Storages/S3Queue/S3QueueSource.h
+++ b/src/Storages/S3Queue/S3QueueSource.h
@@ -38,12 +38,16 @@ public:
     class FileIterator : public IIterator
     {
     public:
-        FileIterator(std::shared_ptr<S3QueueFilesMetadata> metadata_, std::unique_ptr<GlobIterator> glob_iterator_, std::atomic<bool> & shutdown_called_);
+        FileIterator(
+            std::shared_ptr<S3QueueFilesMetadata> metadata_,
+            std::unique_ptr<GlobIterator> glob_iterator_,
+            size_t current_shard_,
+            std::atomic<bool> & shutdown_called_);
 
         /// Note:
         /// List results in s3 are always returned in UTF-8 binary order.
         /// (https://docs.aws.amazon.com/AmazonS3/latest/userguide/ListingKeysUsingAPIs.html)
-        KeyWithInfoPtr next() override;
+        KeyWithInfoPtr next(size_t idx) override;
 
         size_t estimatedKeysCount() override;
 
@@ -52,6 +56,12 @@ public:
         const std::unique_ptr<GlobIterator> glob_iterator;
         std::atomic<bool> & shutdown_called;
         std::mutex mutex;
+        Poco::Logger * log;
+
+        const bool sharded_processing;
+        const size_t current_shard;
+        std::unordered_map<size_t, std::deque<KeyWithInfoPtr>> sharded_keys;
+        std::mutex sharded_keys_mutex;
     };
 
     StorageS3QueueSource(
@@ -59,6 +69,7 @@ public:
         const Block & header_,
         std::unique_ptr<StorageS3Source> internal_source_,
         std::shared_ptr<S3QueueFilesMetadata> files_metadata_,
+        size_t processing_id_,
         const S3QueueAction & action_,
         RemoveFileFunc remove_file_func_,
         const NamesAndTypesList & requested_virtual_columns_,
@@ -67,7 +78,7 @@ public:
         const std::atomic<bool> & table_is_being_dropped_,
         std::shared_ptr<S3QueueLog> s3_queue_log_,
         const StorageID & storage_id_,
-        Poco::Logger * log_);
+        LoggerPtr log_);
 
     ~StorageS3QueueSource() override;
 
@@ -80,6 +91,7 @@ public:
 private:
     const String name;
     const S3QueueAction action;
+    const size_t processing_id;
     const std::shared_ptr<S3QueueFilesMetadata> files_metadata;
     const std::shared_ptr<StorageS3Source> internal_source;
     const NamesAndTypesList requested_virtual_columns;
@@ -89,7 +101,7 @@ private:
     const StorageID storage_id;
 
     RemoveFileFunc remove_file_func;
-    Poco::Logger * log;
+    LoggerPtr log;
 
     using ReaderHolder = StorageS3Source::ReaderHolder;
     ReaderHolder reader;
diff --git a/src/Storages/S3Queue/S3QueueTableMetadata.cpp b/src/Storages/S3Queue/S3QueueTableMetadata.cpp
index 104f70224b6..1830bac4743 100644
--- a/src/Storages/S3Queue/S3QueueTableMetadata.cpp
+++ b/src/Storages/S3Queue/S3QueueTableMetadata.cpp
@@ -16,8 +16,22 @@ namespace DB
 namespace ErrorCodes
 {
     extern const int METADATA_MISMATCH;
+    extern const int BAD_ARGUMENTS;
 }
 
+namespace
+{
+    S3QueueMode modeFromString(const std::string & mode)
+    {
+        if (mode == "ordered")
+            return S3QueueMode::ORDERED;
+        if (mode == "unordered")
+            return S3QueueMode::UNORDERED;
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Unexpected S3Queue mode: {}", mode);
+    }
+}
+
+
 S3QueueTableMetadata::S3QueueTableMetadata(
     const StorageS3::Configuration & configuration,
     const S3QueueSettings & engine_settings,
@@ -28,10 +42,11 @@ S3QueueTableMetadata::S3QueueTableMetadata(
     mode = engine_settings.mode.toString();
     s3queue_tracked_files_limit = engine_settings.s3queue_tracked_files_limit;
     s3queue_tracked_file_ttl_sec = engine_settings.s3queue_tracked_file_ttl_sec;
+    s3queue_total_shards_num = engine_settings.s3queue_total_shards_num;
+    s3queue_processing_threads_num = engine_settings.s3queue_processing_threads_num;
     columns = storage_metadata.getColumns().toString();
 }
 
-
 String S3QueueTableMetadata::toString() const
 {
     Poco::JSON::Object json;
@@ -39,6 +54,8 @@ String S3QueueTableMetadata::toString() const
     json.set("mode", mode);
     json.set("s3queue_tracked_files_limit", s3queue_tracked_files_limit);
     json.set("s3queue_tracked_file_ttl_sec", s3queue_tracked_file_ttl_sec);
+    json.set("s3queue_total_shards_num", s3queue_total_shards_num);
+    json.set("s3queue_processing_threads_num", s3queue_processing_threads_num);
     json.set("format_name", format_name);
     json.set("columns", columns);
 
@@ -52,12 +69,23 @@ void S3QueueTableMetadata::read(const String & metadata_str)
 {
     Poco::JSON::Parser parser;
     auto json = parser.parse(metadata_str).extract<Poco::JSON::Object::Ptr>();
+
     after_processing = json->getValue<String>("after_processing");
     mode = json->getValue<String>("mode");
     s3queue_tracked_files_limit = json->getValue<UInt64>("s3queue_tracked_files_limit");
     s3queue_tracked_file_ttl_sec = json->getValue<UInt64>("s3queue_tracked_file_ttl_sec");
     format_name = json->getValue<String>("format_name");
     columns = json->getValue<String>("columns");
+
+    if (json->has("s3queue_total_shards_num"))
+        s3queue_total_shards_num = json->getValue<UInt64>("s3queue_total_shards_num");
+    else
+        s3queue_total_shards_num = 1;
+
+    if (json->has("s3queue_processing_threads_num"))
+        s3queue_processing_threads_num = json->getValue<UInt64>("s3queue_processing_threads_num");
+    else
+        s3queue_processing_threads_num = 1;
 }
 
 S3QueueTableMetadata S3QueueTableMetadata::parse(const String & metadata_str)
@@ -67,7 +95,6 @@ S3QueueTableMetadata S3QueueTableMetadata::parse(const String & metadata_str)
     return metadata;
 }
 
-
 void S3QueueTableMetadata::checkImmutableFieldsEquals(const S3QueueTableMetadata & from_zk) const
 {
     if (after_processing != from_zk.after_processing)
@@ -83,8 +110,8 @@ void S3QueueTableMetadata::checkImmutableFieldsEquals(const S3QueueTableMetadata
             ErrorCodes::METADATA_MISMATCH,
             "Existing table metadata in ZooKeeper differs in engine mode. "
             "Stored in ZooKeeper: {}, local: {}",
-            DB::toString(from_zk.mode),
-            DB::toString(mode));
+            from_zk.mode,
+            mode);
 
     if (s3queue_tracked_files_limit != from_zk.s3queue_tracked_files_limit)
         throw Exception(
@@ -109,6 +136,28 @@ void S3QueueTableMetadata::checkImmutableFieldsEquals(const S3QueueTableMetadata
             "Stored in ZooKeeper: {}, local: {}",
             from_zk.format_name,
             format_name);
+
+    if (modeFromString(mode) == S3QueueMode::ORDERED)
+    {
+        if (s3queue_processing_threads_num != from_zk.s3queue_processing_threads_num)
+        {
+            throw Exception(
+                ErrorCodes::METADATA_MISMATCH,
+                "Existing table metadata in ZooKeeper differs in s3queue_processing_threads_num setting. "
+                "Stored in ZooKeeper: {}, local: {}",
+                from_zk.s3queue_processing_threads_num,
+                s3queue_processing_threads_num);
+        }
+        if (s3queue_total_shards_num != from_zk.s3queue_total_shards_num)
+        {
+            throw Exception(
+                ErrorCodes::METADATA_MISMATCH,
+                "Existing table metadata in ZooKeeper differs in s3queue_total_shards_num setting. "
+                "Stored in ZooKeeper: {}, local: {}",
+                from_zk.s3queue_total_shards_num,
+                s3queue_total_shards_num);
+        }
+    }
 }
 
 void S3QueueTableMetadata::checkEquals(const S3QueueTableMetadata & from_zk) const
diff --git a/src/Storages/S3Queue/S3QueueTableMetadata.h b/src/Storages/S3Queue/S3QueueTableMetadata.h
index f15665692c4..84087f72a6a 100644
--- a/src/Storages/S3Queue/S3QueueTableMetadata.h
+++ b/src/Storages/S3Queue/S3QueueTableMetadata.h
@@ -21,8 +21,10 @@ struct S3QueueTableMetadata
     String columns;
     String after_processing;
     String mode;
-    UInt64 s3queue_tracked_files_limit;
-    UInt64 s3queue_tracked_file_ttl_sec;
+    UInt64 s3queue_tracked_files_limit = 0;
+    UInt64 s3queue_tracked_file_ttl_sec = 0;
+    UInt64 s3queue_total_shards_num = 1;
+    UInt64 s3queue_processing_threads_num = 1;
 
     S3QueueTableMetadata() = default;
     S3QueueTableMetadata(const StorageS3::Configuration & configuration, const S3QueueSettings & engine_settings, const StorageInMemoryMetadata & storage_metadata);
diff --git a/src/Storages/S3Queue/StorageS3Queue.cpp b/src/Storages/S3Queue/StorageS3Queue.cpp
index bc33e8cf2a9..b6daadf8bc4 100644
--- a/src/Storages/S3Queue/StorageS3Queue.cpp
+++ b/src/Storages/S3Queue/StorageS3Queue.cpp
@@ -5,6 +5,7 @@
 #include <IO/S3Common.h>
 #include <IO/CompressionMethod.h>
 #include <Formats/FormatFactory.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterInsertQuery.h>
 #include <Parsers/ASTFunction.h>
 #include <Parsers/ASTInsertQuery.h>
@@ -24,8 +25,8 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Storages/prepareReadingFromFormat.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
-#include <filesystem>
 
+#include <filesystem>
 
 namespace fs = std::filesystem;
 
@@ -75,14 +76,8 @@ namespace
         return zkutil::extractZooKeeperPath(result_zk_path, true);
     }
 
-    void checkAndAdjustSettings(S3QueueSettings & s3queue_settings, const Settings & settings, Poco::Logger * log)
+    void checkAndAdjustSettings(S3QueueSettings & s3queue_settings, const Settings & settings)
     {
-        if (s3queue_settings.mode == S3QueueMode::ORDERED && s3queue_settings.s3queue_processing_threads_num > 1)
-        {
-            LOG_WARNING(log, "Parallel processing is not yet supported for Ordered mode");
-            s3queue_settings.s3queue_processing_threads_num = 1;
-        }
-
         if (!s3queue_settings.s3queue_processing_threads_num)
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Setting `s3queue_processing_threads_num` cannot be set to zero");
@@ -110,7 +105,9 @@ StorageS3Queue::StorageS3Queue(
     const ConstraintsDescription & constraints_,
     const String & comment,
     ContextPtr context_,
-    std::optional<FormatSettings> format_settings_)
+    std::optional<FormatSettings> format_settings_,
+    ASTStorage * engine_args,
+    LoadingStrictnessLevel mode)
     : IStorage(table_id_)
     , WithContext(context_)
     , s3queue_settings(std::move(s3queue_settings_))
@@ -119,7 +116,7 @@ StorageS3Queue::StorageS3Queue(
     , configuration{configuration_}
     , format_settings(format_settings_)
     , reschedule_processing_interval_ms(s3queue_settings->s3queue_polling_min_timeout_ms)
-    , log(&Poco::Logger::get("StorageS3Queue (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageS3Queue (" + table_id_.table_name + ")"))
 {
     if (configuration.url.key.empty())
     {
@@ -134,7 +131,15 @@ StorageS3Queue::StorageS3Queue(
         throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "S3Queue url must either end with '/' or contain globs");
     }
 
-    checkAndAdjustSettings(*s3queue_settings, context_->getSettingsRef(), log);
+    if (mode == LoadingStrictnessLevel::CREATE
+        && !context_->getSettingsRef().s3queue_allow_experimental_sharded_mode
+        && s3queue_settings->mode == S3QueueMode::ORDERED
+        && (s3queue_settings->s3queue_total_shards_num > 1 || s3queue_settings->s3queue_processing_threads_num > 1))
+    {
+        throw Exception(ErrorCodes::QUERY_NOT_ALLOWED, "S3Queue sharded mode is not allowed. To enable use `s3queue_allow_experimental_sharded_mode`");
+    }
+
+    checkAndAdjustSettings(*s3queue_settings, context_->getSettingsRef());
 
     configuration.update(context_);
     FormatFactory::instance().checkFormatName(configuration.format);
@@ -143,36 +148,58 @@ StorageS3Queue::StorageS3Queue(
     StorageInMemoryMetadata storage_metadata;
     if (columns_.empty())
     {
-        auto columns = StorageS3::getTableStructureFromDataImpl(configuration, format_settings, context_);
+        ColumnsDescription columns;
+        if (configuration.format == "auto")
+            std::tie(columns, configuration.format) = StorageS3::getTableStructureAndFormatFromData(configuration, format_settings, context_);
+        else
+            columns = StorageS3::getTableStructureFromData(configuration, format_settings, context_);
         storage_metadata.setColumns(columns);
     }
     else
     {
+        if (configuration.format == "auto")
+            configuration.format = StorageS3::getTableStructureAndFormatFromData(configuration, format_settings, context_).second;
         storage_metadata.setColumns(columns_);
     }
 
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 
     LOG_INFO(log, "Using zookeeper path: {}", zk_path.string());
     task = getContext()->getSchedulePool().createTask("S3QueueStreamingTask", [this] { threadFunc(); });
 
-    /// Get metadata manager from S3QueueMetadataFactory,
-    /// it will increase the ref count for the metadata object.
-    /// The ref count is decreased when StorageS3Queue::drop() method is called.
-    files_metadata = S3QueueMetadataFactory::instance().getOrCreate(zk_path, *s3queue_settings);
     try
     {
         createOrCheckMetadata(storage_metadata);
     }
     catch (...)
     {
-        S3QueueMetadataFactory::instance().remove(zk_path);
         throw;
     }
+
+    /// Get metadata manager from S3QueueMetadataFactory,
+    /// it will increase the ref count for the metadata object.
+    /// The ref count is decreased when StorageS3Queue::drop() method is called.
+    files_metadata = S3QueueMetadataFactory::instance().getOrCreate(zk_path, *s3queue_settings);
+
+    if (files_metadata->isShardedProcessing())
+    {
+        if (!s3queue_settings->s3queue_current_shard_num.changed)
+        {
+            s3queue_settings->s3queue_current_shard_num = static_cast<UInt32>(files_metadata->registerNewShard());
+            engine_args->settings->changes.setSetting("s3queue_current_shard_num", s3queue_settings->s3queue_current_shard_num.value);
+        }
+        else if (!files_metadata->isShardRegistered(s3queue_settings->s3queue_current_shard_num))
+        {
+            files_metadata->registerNewShard(s3queue_settings->s3queue_current_shard_num);
+        }
+    }
+    if (s3queue_settings->mode == S3QueueMode::ORDERED && !s3queue_settings->s3queue_last_processed_path.value.empty())
+    {
+        files_metadata->setFileProcessed(s3queue_settings->s3queue_last_processed_path.value, s3queue_settings->s3queue_current_shard_num);
+    }
 }
 
 void StorageS3Queue::startup()
@@ -186,6 +213,7 @@ void StorageS3Queue::shutdown(bool is_drop)
     table_is_being_dropped = is_drop;
     shutdown_called = true;
 
+    LOG_TRACE(log, "Shutting down storage...");
     if (task)
     {
         task->deactivate();
@@ -194,8 +222,16 @@ void StorageS3Queue::shutdown(bool is_drop)
     if (files_metadata)
     {
         files_metadata->deactivateCleanupTask();
+
+        if (is_drop && files_metadata->isShardedProcessing())
+        {
+            files_metadata->unregisterShard(s3queue_settings->s3queue_current_shard_num);
+            LOG_TRACE(log, "Unregistered shard {} from zookeeper", s3queue_settings->s3queue_current_shard_num);
+        }
+
         files_metadata.reset();
     }
+    LOG_TRACE(log, "Shut down storage");
 }
 
 void StorageS3Queue::drop()
@@ -213,30 +249,33 @@ class ReadFromS3Queue : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromS3Queue"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromS3Queue(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         ReadFromFormatInfo info_,
         std::shared_ptr<StorageS3Queue> storage_,
-        ContextPtr context_,
-        size_t max_block_size_,
-        size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        size_t max_block_size_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
         , info(std::move(info_))
         , storage(std::move(storage_))
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
-        , num_streams(num_streams_)
     {
     }
 
 private:
     ReadFromFormatInfo info;
     std::shared_ptr<StorageS3Queue> storage;
-    ContextPtr context;
     size_t max_block_size;
-    size_t num_streams;
 
     std::shared_ptr<StorageS3Queue::FileIterator> iterator;
 
@@ -252,9 +291,9 @@ void ReadFromS3Queue::createIterator(const ActionsDAG::Node * predicate)
 }
 
 
-void ReadFromS3Queue::applyFilters()
+void ReadFromS3Queue::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -266,11 +305,11 @@ void StorageS3Queue::read(
     QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /*query_info*/,
+    SelectQueryInfo & query_info,
     ContextPtr local_context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t max_block_size,
-    size_t num_streams)
+    size_t)
 {
     if (!local_context->getSettingsRef().stream_like_engine_allow_direct_select)
     {
@@ -285,15 +324,17 @@ void StorageS3Queue::read(
     }
 
     auto this_ptr = std::static_pointer_cast<StorageS3Queue>(shared_from_this());
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context));
 
     auto reading = std::make_unique<ReadFromS3Queue>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        local_context,
         read_from_format_info.source_header,
         read_from_format_info,
         std::move(this_ptr),
-        local_context,
-        max_block_size,
-        num_streams);
+        max_block_size);
 
     query_plan.addStep(std::move(reading));
 }
@@ -301,11 +342,15 @@ void StorageS3Queue::read(
 void ReadFromS3Queue::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     Pipes pipes;
-    const size_t adjusted_num_streams = std::min<size_t>(num_streams, storage->s3queue_settings->s3queue_processing_threads_num);
+    const size_t adjusted_num_streams = storage->s3queue_settings->s3queue_processing_threads_num;
 
     createIterator(nullptr);
     for (size_t i = 0; i < adjusted_num_streams; ++i)
-        pipes.emplace_back(storage->createSource(info, iterator, max_block_size, context));
+        pipes.emplace_back(storage->createSource(
+                               info,
+                               iterator,
+                               storage->files_metadata->getIdForProcessingThread(i, storage->s3queue_settings->s3queue_current_shard_num),
+                               max_block_size, context));
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
     if (pipe.empty())
@@ -320,6 +365,7 @@ void ReadFromS3Queue::initializePipeline(QueryPipelineBuilder & pipeline, const
 std::shared_ptr<StorageS3QueueSource> StorageS3Queue::createSource(
     const ReadFromFormatInfo & info,
     std::shared_ptr<StorageS3Queue::FileIterator> file_iterator,
+    size_t processing_id,
     size_t max_block_size,
     ContextPtr local_context)
 {
@@ -359,7 +405,7 @@ std::shared_ptr<StorageS3QueueSource> StorageS3Queue::createSource(
     auto s3_queue_log = s3queue_settings->s3queue_enable_logging_to_s3queue_log ? local_context->getS3QueueLog() : nullptr;
     return std::make_shared<StorageS3QueueSource>(
         getName(), info.source_header, std::move(internal_source),
-        files_metadata, after_processing, file_deleter, info.requested_virtual_columns,
+        files_metadata, processing_id, after_processing, file_deleter, info.requested_virtual_columns,
         local_context, shutdown_called, table_is_being_dropped, s3_queue_log, getStorageID(), log);
 }
 
@@ -456,14 +502,15 @@ bool StorageS3Queue::streamToViews()
     auto block_io = interpreter.execute();
     auto file_iterator = createFileIterator(s3queue_context, nullptr);
 
-    auto read_from_format_info = prepareReadingFromFormat(block_io.pipeline.getHeader().getNames(), storage_snapshot, supportsSubsetOfColumns(s3queue_context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(block_io.pipeline.getHeader().getNames(), storage_snapshot, supportsSubsetOfColumns(s3queue_context));
 
     Pipes pipes;
     pipes.reserve(s3queue_settings->s3queue_processing_threads_num);
     for (size_t i = 0; i < s3queue_settings->s3queue_processing_threads_num; ++i)
     {
         auto source = createSource(
-            read_from_format_info, file_iterator, DBMS_DEFAULT_BUFFER_SIZE, s3queue_context);
+            read_from_format_info, file_iterator, files_metadata->getIdForProcessingThread(i, s3queue_settings->s3queue_current_shard_num),
+            DBMS_DEFAULT_BUFFER_SIZE, s3queue_context);
 
         pipes.emplace_back(std::move(source));
     }
@@ -564,9 +611,10 @@ void StorageS3Queue::checkTableStructure(const String & zookeeper_prefix, const
 std::shared_ptr<StorageS3Queue::FileIterator> StorageS3Queue::createFileIterator(ContextPtr local_context, const ActionsDAG::Node * predicate)
 {
     auto glob_iterator = std::make_unique<StorageS3QueueSource::GlobIterator>(
-        *configuration.client, configuration.url, predicate, virtual_columns, local_context,
+        *configuration.client, configuration.url, predicate, getVirtualsList(), local_context,
         /* read_keys */nullptr, configuration.request_settings);
-    return std::make_shared<FileIterator>(files_metadata, std::move(glob_iterator), shutdown_called);
+
+    return std::make_shared<FileIterator>(files_metadata, std::move(glob_iterator), s3queue_settings->s3queue_current_shard_num, shutdown_called);
 }
 
 void registerStorageS3QueueImpl(const String & name, StorageFactory & factory)
@@ -600,7 +648,7 @@ void registerStorageS3QueueImpl(const String & name, StorageFactory & factory)
                     if (user_format_settings.has(change.name))
                         user_format_settings.set(change.name, change.value);
                     else
-                        LOG_TRACE(&Poco::Logger::get("StorageS3"), "Remove: {}", change.name);
+                        LOG_TRACE(getLogger("StorageS3"), "Remove: {}", change.name);
                     args.storage_def->settings->changes.removeSetting(change.name);
                 }
 
@@ -624,7 +672,9 @@ void registerStorageS3QueueImpl(const String & name, StorageFactory & factory)
                 args.constraints,
                 args.comment,
                 args.getContext(),
-                format_settings);
+                format_settings,
+                args.storage_def,
+                args.mode);
         },
         {
             .supports_settings = true,
diff --git a/src/Storages/S3Queue/StorageS3Queue.h b/src/Storages/S3Queue/StorageS3Queue.h
index 3d3594dc2ab..1f735b47819 100644
--- a/src/Storages/S3Queue/StorageS3Queue.h
+++ b/src/Storages/S3Queue/StorageS3Queue.h
@@ -11,13 +11,9 @@
 #include <Storages/StorageS3.h>
 #include <Interpreters/Context.h>
 #include <IO/S3/BlobStorageLogWriter.h>
+#include <Storages/StorageFactory.h>
 
 
-namespace Aws::S3
-{
-class Client;
-}
-
 namespace DB
 {
 class S3QueueFilesMetadata;
@@ -35,7 +31,9 @@ public:
         const ConstraintsDescription & constraints_,
         const String & comment,
         ContextPtr context_,
-        std::optional<FormatSettings> format_settings_);
+        std::optional<FormatSettings> format_settings_,
+        ASTStorage * engine_args,
+        LoadingStrictnessLevel mode);
 
     String getName() const override { return "S3Queue"; }
 
@@ -49,8 +47,6 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
-    NamesAndTypesList getVirtuals() const override { return virtual_columns; }
-
     const auto & getFormatName() const { return configuration.format; }
 
     const fs::path & getZooKeeperPath() const { return zk_path; }
@@ -69,7 +65,6 @@ private:
     Configuration configuration;
 
     const std::optional<FormatSettings> format_settings;
-    NamesAndTypesList virtual_columns;
 
     BackgroundSchedulePool::TaskHolder task;
     std::atomic<bool> stream_cancelled{false};
@@ -79,7 +74,7 @@ private:
     std::atomic<bool> shutdown_called = false;
     std::atomic<bool> table_is_being_dropped = false;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     void startup() override;
     void shutdown(bool is_drop) override;
@@ -91,6 +86,7 @@ private:
     std::shared_ptr<StorageS3QueueSource> createSource(
         const ReadFromFormatInfo & info,
         std::shared_ptr<StorageS3Queue::FileIterator> file_iterator,
+        size_t processing_id,
         size_t max_block_size,
         ContextPtr local_context);
 
diff --git a/src/Storages/SelectQueryInfo.h b/src/Storages/SelectQueryInfo.h
index b1a6f8f43c7..22d30674b97 100644
--- a/src/Storages/SelectQueryInfo.h
+++ b/src/Storages/SelectQueryInfo.h
@@ -53,6 +53,7 @@ struct PrewhereInfo
     String prewhere_column_name;
     bool remove_prewhere_column = false;
     bool need_filter = false;
+    bool generated_by_optimizer = false;
 
     PrewhereInfo() = default;
     explicit PrewhereInfo(ActionsDAGPtr prewhere_actions_, String prewhere_column_name_)
@@ -74,6 +75,7 @@ struct PrewhereInfo
         prewhere_info->prewhere_column_name = prewhere_column_name;
         prewhere_info->remove_prewhere_column = remove_prewhere_column;
         prewhere_info->need_filter = need_filter;
+        prewhere_info->generated_by_optimizer = generated_by_optimizer;
 
         return prewhere_info;
     }
@@ -161,6 +163,8 @@ struct SelectQueryInfo
     /// It's guaranteed to be present in JOIN TREE of `query_tree`
     QueryTreeNodePtr table_expression;
 
+    bool analyzer_can_use_parallel_replicas_on_follower = false;
+
     /// Table expression modifiers for storage
     std::optional<TableExpressionModifiers> table_expression_modifiers;
 
@@ -204,9 +208,19 @@ struct SelectQueryInfo
     bool need_aggregate = false;
     PrewhereInfoPtr prewhere_info;
 
+    /// Generated by pre-run optimization with StorageDummy.
+    /// Currently it's used to support StorageMerge PREWHERE optimization.
+    PrewhereInfoPtr optimized_prewhere_info;
+
     /// If query has aggregate functions
     bool has_aggregates = false;
 
+    /// If query has any filter and no arrayJoin before filter. Used by skipping FINAL
+    /// Skipping FINAL algorithm will output the original chunk and a column indices of
+    /// selected rows. If query has filter and doesn't have array join before any filter,
+    /// we can merge the indices with the first filter in FilterTransform later.
+    bool has_filters_and_no_array_join_before_filter = false;
+
     ClusterPtr getCluster() const { return !optimized_cluster ? cluster : optimized_cluster; }
 
     bool settings_limit_offset_done = false;
diff --git a/src/Storages/StorageAzureBlob.cpp b/src/Storages/StorageAzureBlob.cpp
index c7fbb633a82..306a5eac8e5 100644
--- a/src/Storages/StorageAzureBlob.cpp
+++ b/src/Storages/StorageAzureBlob.cpp
@@ -17,6 +17,7 @@
 #include <DataTypes/DataTypesNumber.h>
 
 #include <azure/storage/common/storage_credential.hpp>
+#include <azure/identity/managed_identity_credential.hpp>
 #include <Processors/Transforms/AddingDefaultsTransform.h>
 #include <Processors/Transforms/ExtractColumnsTransform.h>
 #include <Processors/Formats/IOutputFormat.h>
@@ -41,6 +42,10 @@
 #include <Disks/IO/ReadBufferFromAzureBlobStorage.h>
 #include <Disks/IO/WriteBufferFromAzureBlobStorage.h>
 
+#include <filesystem>
+
+namespace fs = std::filesystem;
+
 using namespace Azure::Storage::Blobs;
 
 namespace CurrentMetrics
@@ -65,9 +70,9 @@ namespace ErrorCodes
     extern const int DATABASE_ACCESS_DENIED;
     extern const int CANNOT_COMPILE_REGEXP;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int CANNOT_DETECT_FORMAT;
     extern const int LOGICAL_ERROR;
     extern const int NOT_IMPLEMENTED;
-
 }
 
 namespace
@@ -127,7 +132,7 @@ void StorageAzureBlob::processNamedCollectionResult(StorageAzureBlob::Configurat
 }
 
 
-StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine_args, ContextPtr local_context)
+StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine_args, const ContextPtr & local_context)
 {
     StorageAzureBlob::Configuration configuration;
 
@@ -143,7 +148,7 @@ StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine
         configuration.blobs_paths = {configuration.blob_path};
 
         if (configuration.format == "auto")
-            configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
+            configuration.format = FormatFactory::instance().tryGetFormatFromFileName(configuration.blob_path).value_or("auto");
 
         return configuration;
     }
@@ -166,7 +171,7 @@ StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine
 
     auto is_format_arg = [] (const std::string & s) -> bool
     {
-        return s == "auto" || FormatFactory::instance().getAllFormats().contains(s);
+        return s == "auto" || FormatFactory::instance().exists(s);
     };
 
     if (engine_args.size() == 4)
@@ -199,7 +204,7 @@ StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine
     else if (engine_args.size() == 6)
     {
         auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "format/account_name");
-        if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+        if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Format and compression must be last arguments");
         }
@@ -217,7 +222,7 @@ StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine
     else if (engine_args.size() == 7)
     {
         auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "format/account_name");
-        if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+        if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Format and compression must be last arguments");
         }
@@ -236,13 +241,13 @@ StorageAzureBlob::Configuration StorageAzureBlob::getConfiguration(ASTs & engine
     configuration.blobs_paths = {configuration.blob_path};
 
     if (configuration.format == "auto")
-        configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
+        configuration.format = FormatFactory::instance().tryGetFormatFromFileName(configuration.blob_path).value_or("auto");
 
     return configuration;
 }
 
 
-AzureObjectStorage::SettingsPtr StorageAzureBlob::createSettings(ContextPtr local_context)
+AzureObjectStorage::SettingsPtr StorageAzureBlob::createSettings(const ContextPtr & local_context)
 {
     const auto & context_settings = local_context->getSettingsRef();
     auto settings_ptr = std::make_unique<AzureObjectStorageSettings>();
@@ -297,7 +302,7 @@ void registerStorageAzureBlob(StorageFactory & factory)
 
         return std::make_shared<StorageAzureBlob>(
             std::move(configuration),
-            std::make_unique<AzureObjectStorage>("AzureBlobStorage", std::move(client), std::move(settings)),
+            std::make_unique<AzureObjectStorage>("AzureBlobStorage", std::move(client), std::move(settings),configuration.container),
             args.getContext(),
             args.table_id,
             args.columns,
@@ -332,33 +337,38 @@ static bool containerExists(std::unique_ptr<BlobServiceClient> &blob_service_cli
     return false;
 }
 
-AzureClientPtr StorageAzureBlob::createClient(StorageAzureBlob::Configuration configuration, bool is_read_only)
+AzureClientPtr StorageAzureBlob::createClient(StorageAzureBlob::Configuration configuration, bool is_read_only, bool attempt_to_create_container)
 {
     AzureClientPtr result;
 
     if (configuration.is_connection_string)
     {
+        std::shared_ptr<Azure::Identity::ManagedIdentityCredential> managed_identity_credential = std::make_shared<Azure::Identity::ManagedIdentityCredential>();
         std::unique_ptr<BlobServiceClient> blob_service_client = std::make_unique<BlobServiceClient>(BlobServiceClient::CreateFromConnectionString(configuration.connection_url));
         result = std::make_unique<BlobContainerClient>(BlobContainerClient::CreateFromConnectionString(configuration.connection_url, configuration.container));
-        bool container_exists = containerExists(blob_service_client,configuration.container);
 
-        if (!container_exists)
+        if (attempt_to_create_container)
         {
-            if (is_read_only)
-                throw Exception(
-                    ErrorCodes::DATABASE_ACCESS_DENIED,
-                    "AzureBlobStorage container does not exist '{}'",
-                    configuration.container);
+            bool container_exists = containerExists(blob_service_client,configuration.container);
+            if (!container_exists)
+            {
+                if (is_read_only)
+                    throw Exception(
+                        ErrorCodes::DATABASE_ACCESS_DENIED,
+                        "AzureBlobStorage container does not exist '{}'",
+                        configuration.container);
 
-            try
-            {
-                result->CreateIfNotExists();
-            } catch (const Azure::Storage::StorageException & e)
-            {
-                if (!(e.StatusCode == Azure::Core::Http::HttpStatusCode::Conflict
-                    && e.ReasonPhrase == "The specified container already exists."))
+                try
                 {
-                    throw;
+                    result->CreateIfNotExists();
+                }
+                catch (const Azure::Storage::StorageException & e)
+                {
+                    if (!(e.StatusCode == Azure::Core::Http::HttpStatusCode::Conflict
+                        && e.ReasonPhrase == "The specified container already exists."))
+                    {
+                        throw;
+                    }
                 }
             }
         }
@@ -373,17 +383,17 @@ AzureClientPtr StorageAzureBlob::createClient(StorageAzureBlob::Configuration co
         }
 
         std::unique_ptr<BlobServiceClient> blob_service_client;
+        std::shared_ptr<Azure::Identity::ManagedIdentityCredential> managed_identity_credential;
         if (storage_shared_key_credential)
         {
             blob_service_client = std::make_unique<BlobServiceClient>(configuration.connection_url, storage_shared_key_credential);
         }
         else
         {
-            blob_service_client = std::make_unique<BlobServiceClient>(configuration.connection_url);
+            managed_identity_credential = std::make_shared<Azure::Identity::ManagedIdentityCredential>();
+            blob_service_client = std::make_unique<BlobServiceClient>(configuration.connection_url, managed_identity_credential);
         }
 
-        bool container_exists = containerExists(blob_service_client,configuration.container);
-
         std::string final_url;
         size_t pos = configuration.connection_url.find('?');
         if (pos != std::string::npos)
@@ -396,12 +406,21 @@ AzureClientPtr StorageAzureBlob::createClient(StorageAzureBlob::Configuration co
             final_url
                 = configuration.connection_url + (configuration.connection_url.back() == '/' ? "" : "/") + configuration.container;
 
+        if (!attempt_to_create_container)
+        {
+            if (storage_shared_key_credential)
+                return std::make_unique<BlobContainerClient>(final_url, storage_shared_key_credential);
+            else
+                return std::make_unique<BlobContainerClient>(final_url, managed_identity_credential);
+        }
+
+        bool container_exists = containerExists(blob_service_client,configuration.container);
         if (container_exists)
         {
             if (storage_shared_key_credential)
                 result = std::make_unique<BlobContainerClient>(final_url, storage_shared_key_credential);
             else
-                result = std::make_unique<BlobContainerClient>(final_url);
+                result = std::make_unique<BlobContainerClient>(final_url, managed_identity_credential);
         }
         else
         {
@@ -421,7 +440,7 @@ AzureClientPtr StorageAzureBlob::createClient(StorageAzureBlob::Configuration co
                     if (storage_shared_key_credential)
                         result = std::make_unique<BlobContainerClient>(final_url, storage_shared_key_credential);
                     else
-                        result = std::make_unique<BlobContainerClient>(final_url);
+                        result = std::make_unique<BlobContainerClient>(final_url, managed_identity_credential);
                 }
                 else
                 {
@@ -447,7 +466,7 @@ Poco::URI StorageAzureBlob::Configuration::getConnectionURL() const
 StorageAzureBlob::StorageAzureBlob(
     const Configuration & configuration_,
     std::unique_ptr<AzureObjectStorage> && object_storage_,
-    ContextPtr context,
+    const ContextPtr & context,
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
@@ -463,17 +482,25 @@ StorageAzureBlob::StorageAzureBlob(
     , format_settings(format_settings_)
     , partition_by(partition_by_)
 {
-    FormatFactory::instance().checkFormatName(configuration.format);
+    if (configuration.format != "auto")
+        FormatFactory::instance().checkFormatName(configuration.format);
     context->getGlobalContext()->getRemoteHostFilter().checkURL(configuration.getConnectionURL());
 
     StorageInMemoryMetadata storage_metadata;
     if (columns_.empty())
     {
-        auto columns = getTableStructureFromData(object_storage.get(), configuration, format_settings, context, distributed_processing);
+        ColumnsDescription columns;
+        if (configuration.format == "auto")
+            std::tie(columns, configuration.format) = getTableStructureAndFormatFromData(object_storage.get(), configuration, format_settings, context);
+        else
+            columns = getTableStructureFromData(object_storage.get(), configuration, format_settings, context);
         storage_metadata.setColumns(columns);
     }
     else
     {
+        if (configuration.format == "auto")
+            configuration.format = getTableStructureAndFormatFromData(object_storage.get(), configuration, format_settings, context).second;
+
         /// We don't allow special columns in File storage.
         if (!columns_.hasOnlyOrdinary())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table engine AzureBlobStorage doesn't support special columns like MATERIALIZED, ALIAS or EPHEMERAL");
@@ -483,12 +510,11 @@ StorageAzureBlob::StorageAzureBlob(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 
     StoredObjects objects;
     for (const auto & key : configuration.blobs_paths)
         objects.emplace_back(key);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
 }
 
 void StorageAzureBlob::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, TableExclusiveLockHolder &)
@@ -517,7 +543,7 @@ public:
     StorageAzureBlobSink(
         const String & format,
         const Block & sample_block_,
-        ContextPtr context,
+        const ContextPtr & context,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method,
         AzureObjectStorage * object_storage,
@@ -607,22 +633,21 @@ private:
     std::mutex cancel_mutex;
 };
 
-class PartitionedStorageAzureBlobSink : public PartitionedSink
+class PartitionedStorageAzureBlobSink : public PartitionedSink, WithContext
 {
 public:
     PartitionedStorageAzureBlobSink(
         const ASTPtr & partition_by,
         const String & format_,
         const Block & sample_block_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method_,
         AzureObjectStorage * object_storage_,
         const String & blob_)
-        : PartitionedSink(partition_by, context_, sample_block_)
+        : PartitionedSink(partition_by, context_, sample_block_), WithContext(context_)
         , format(format_)
         , sample_block(sample_block_)
-        , context(context_)
         , compression_method(compression_method_)
         , object_storage(object_storage_)
         , blob(blob_)
@@ -638,7 +663,7 @@ public:
         return std::make_shared<StorageAzureBlobSink>(
             format,
             sample_block,
-            context,
+            getContext(),
             format_settings,
             compression_method,
             object_storage,
@@ -649,7 +674,6 @@ public:
 private:
     const String format;
     const Block sample_block;
-    const ContextPtr context;
     const CompressionMethod compression_method;
     AzureObjectStorage * object_storage;
     const String blob;
@@ -670,21 +694,23 @@ class ReadFromAzureBlob : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromAzureBlob"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromAzureBlob(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         std::shared_ptr<StorageAzureBlob> storage_,
         ReadFromFormatInfo info_,
         const bool need_only_count_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , storage(std::move(storage_))
         , info(std::move(info_))
         , need_only_count(need_only_count_)
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
     {
@@ -695,8 +721,6 @@ private:
     ReadFromFormatInfo info;
     const bool need_only_count;
 
-    ContextPtr context;
-
     size_t max_block_size;
     const size_t num_streams;
 
@@ -705,9 +729,9 @@ private:
     void createIterator(const ActionsDAG::Node * predicate);
 };
 
-void ReadFromAzureBlob::applyFilters()
+void ReadFromAzureBlob::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -730,16 +754,19 @@ void StorageAzureBlob::read(
 
     auto this_ptr = std::static_pointer_cast<StorageAzureBlob>(shared_from_this());
 
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context));
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && local_context->getSettingsRef().optimize_count_from_files;
 
     auto reading = std::make_unique<ReadFromAzureBlob>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        local_context,
         read_from_format_info.source_header,
         std::move(this_ptr),
         std::move(read_from_format_info),
         need_only_count,
-        local_context,
         max_block_size,
         num_streams);
 
@@ -763,13 +790,13 @@ void ReadFromAzureBlob::createIterator(const ActionsDAG::Node * predicate)
         /// Iterate through disclosed globs and make a source for each file
         iterator_wrapper = std::make_shared<StorageAzureBlobSource::GlobIterator>(
             storage->object_storage.get(), configuration.container, configuration.blob_path,
-            predicate, storage->virtual_columns, context, nullptr, context->getFileProgressCallback());
+            predicate, storage->getVirtualsList(), context, nullptr, context->getFileProgressCallback());
     }
     else
     {
         iterator_wrapper = std::make_shared<StorageAzureBlobSource::KeysIterator>(
             storage->object_storage.get(), configuration.container, configuration.blobs_paths,
-            predicate, storage->virtual_columns, context, nullptr, context->getFileProgressCallback());
+            predicate, storage->getVirtualsList(), context, nullptr, context->getFileProgressCallback());
     }
 }
 
@@ -877,16 +904,6 @@ SinkToStoragePtr StorageAzureBlob::write(const ASTPtr & query, const StorageMeta
     }
 }
 
-NamesAndTypesList StorageAzureBlob::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-Names StorageAzureBlob::getVirtualColumnNames()
-{
-    return VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage({}).getNames();
-}
-
 bool StorageAzureBlob::supportsPartitionBy() const
 {
     return true;
@@ -913,7 +930,7 @@ StorageAzureBlobSource::GlobIterator::GlobIterator(
     String blob_path_with_globs_,
     const ActionsDAG::Node * predicate,
     const NamesAndTypesList & virtual_columns_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     RelativePathsWithMetadata * outer_blobs_,
     std::function<void(FileProgress)> file_progress_callback_)
     : IIterator(context_)
@@ -1028,7 +1045,7 @@ StorageAzureBlobSource::KeysIterator::KeysIterator(
     const Strings & keys_,
     const ActionsDAG::Node * predicate,
     const NamesAndTypesList & virtual_columns_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     RelativePathsWithMetadata * outer_blobs,
     std::function<void(FileProgress)> file_progress_callback)
     : IIterator(context_)
@@ -1121,7 +1138,7 @@ Chunk StorageAzureBlobSource::generate()
     return {};
 }
 
-void StorageAzureBlobSource::addNumRowsToCache(const DB::String & path, size_t num_rows)
+void StorageAzureBlobSource::addNumRowsToCache(const String & path, size_t num_rows)
 {
     String source = fs::path(connection_url) / container / path;
     auto cache_key = getKeyForSchemaCache(source, format, format_settings, getContext());
@@ -1147,7 +1164,7 @@ StorageAzureBlobSource::StorageAzureBlobSource(
     const ReadFromFormatInfo & info,
     const String & format_,
     String name_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     std::optional<FormatSettings> format_settings_,
     UInt64 max_block_size_,
     String compression_hint_,
@@ -1290,6 +1307,7 @@ namespace
         ReadBufferIterator(
             const std::shared_ptr<StorageAzureBlobSource::IIterator> & file_iterator_,
             AzureObjectStorage * object_storage_,
+            std::optional<String> format_,
             const StorageAzureBlob::Configuration & configuration_,
             const std::optional<FormatSettings> & format_settings_,
             const RelativePathsWithMetadata & read_keys_,
@@ -1298,19 +1316,38 @@ namespace
             , file_iterator(file_iterator_)
             , object_storage(object_storage_)
             , configuration(configuration_)
+            , format(std::move(format_))
             , format_settings(format_settings_)
             , read_keys(read_keys_)
             , prev_read_keys_size(read_keys_.size())
         {
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
             /// For default mode check cached columns for currently read keys on first iteration.
-            if (first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+            if (first)
             {
-                if (auto cached_columns = tryGetColumnsFromCache(read_keys.begin(), read_keys.end()))
-                    return {nullptr, cached_columns};
+                /// If format is unknown we iterate through all currently read keys on first iteration and
+                /// try to determine format by file name.
+                if (!format)
+                {
+                    for (const auto & key : read_keys)
+                    {
+                        if (auto format_from_path = FormatFactory::instance().tryGetFormatFromFileName(key.relative_path))
+                        {
+                            format = format_from_path;
+                            break;
+                        }
+                    }
+                }
+
+                /// For default mode check cached columns for currently read keys on first iteration.
+                if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                {
+                    if (auto cached_columns = tryGetColumnsFromCache(read_keys.begin(), read_keys.end()))
+                        return {nullptr, cached_columns, format};
+                }
             }
 
             current_path_with_metadata = file_iterator->next();
@@ -1318,29 +1355,55 @@ namespace
             if (current_path_with_metadata.relative_path.empty())
             {
                 if (first)
-                    throw Exception(
-                        ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                        "Cannot extract table structure from {} format file, because there are no files with provided path "
-                        "in AzureBlobStorage. You must specify table structure manually", configuration.format);
+                {
+                    if (format)
+                        throw Exception(
+                            ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                            "The table structure cannot be extracted from a {} format file, because there are no files with provided path "
+                            "in AzureBlobStorage. You can specify table structure manually", *format);
 
-                return {nullptr, std::nullopt};
+                    throw Exception(
+                        ErrorCodes::CANNOT_DETECT_FORMAT,
+                        "The data format cannot be detected by the contents of the files, because there are no files with provided path "
+                        "in AzureBlobStorage. You can specify table structure manually");
+                }
+
+                return {nullptr, std::nullopt, format};
             }
 
             first = false;
 
-            /// AzureBlobStorage file iterator could get new keys after new iteration, check them in schema cache if schema inference mode is default.
-            if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT && read_keys.size() > prev_read_keys_size)
+            /// AzureBlobStorage file iterator could get new keys after new iteration.
+            if (read_keys.size() > prev_read_keys_size)
             {
-                auto columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end());
+                /// If format is unknown we can try to determine it by new file names.
+                if (!format)
+                {
+                    for (auto it = read_keys.begin() + prev_read_keys_size; it != read_keys.end(); ++it)
+                    {
+                        if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName((*it).relative_path))
+                        {
+                            format = format_from_file_name;
+                            break;
+                        }
+                    }
+                }
+                /// Check new files in schema cache if schema inference mode is default.
+                if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                {
+                    auto columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end());
+                    if (columns_from_cache)
+                        return {nullptr, columns_from_cache, format};
+                }
+
                 prev_read_keys_size = read_keys.size();
-                if (columns_from_cache)
-                    return {nullptr, columns_from_cache};
             }
-            else if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::UNION)
+
+            if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::UNION)
             {
                 RelativePathsWithMetadata paths = {current_path_with_metadata};
                 if (auto columns_from_cache = tryGetColumnsFromCache(paths.begin(), paths.end()))
-                    return {nullptr, columns_from_cache};
+                    return {nullptr, columns_from_cache, format};
             }
 
             first = false;
@@ -1348,7 +1411,7 @@ namespace
             return {wrapReadBufferWithCompressionMethod(
                 object_storage->readObject(StoredObject(current_path_with_metadata.relative_path), getContext()->getReadSettings(), {}, current_path_with_metadata.metadata.size_bytes),
                 chooseCompressionMethod(current_path_with_metadata.relative_path, configuration.compression_method),
-                zstd_window_log_max), std::nullopt};
+                zstd_window_log_max), std::nullopt, format};
         }
 
         void setNumRowsToLastFile(size_t num_rows) override
@@ -1357,7 +1420,7 @@ namespace
                 return;
 
             String source = fs::path(configuration.connection_url) / configuration.container / current_path_with_metadata.relative_path;
-            auto key = getKeyForSchemaCache(source, configuration.format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(source, *format, format_settings, getContext());
             StorageAzureBlob::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -1368,7 +1431,7 @@ namespace
                 return;
 
             String source = fs::path(configuration.connection_url) / configuration.container / current_path_with_metadata.relative_path;
-            auto key = getKeyForSchemaCache(source, configuration.format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(source, *format, format_settings, getContext());
             StorageAzureBlob::getSchemaCache(getContext()).addColumns(key, columns);
         }
 
@@ -1382,16 +1445,36 @@ namespace
             Strings sources;
             sources.reserve(read_keys.size());
             std::transform(read_keys.begin(), read_keys.end(), std::back_inserter(sources), [&](const auto & elem){ return host_and_bucket + '/' + elem.relative_path; });
-            auto cache_keys = getKeysForSchemaCache(sources, configuration.format, format_settings, getContext());
+            auto cache_keys = getKeysForSchemaCache(sources, *format, format_settings, getContext());
             StorageAzureBlob::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
         String getLastFileName() const override { return current_path_with_metadata.relative_path; }
 
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            int zstd_window_log_max = static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max);
+            return wrapReadBufferWithCompressionMethod(
+                        object_storage->readObject(StoredObject(current_path_with_metadata.relative_path), getContext()->getReadSettings(), {}, current_path_with_metadata.metadata.size_bytes),
+                        chooseCompressionMethod(current_path_with_metadata.relative_path, configuration.compression_method),
+                        zstd_window_log_max);
+        }
+
     private:
         std::optional<ColumnsDescription> tryGetColumnsFromCache(const RelativePathsWithMetadata::const_iterator & begin, const RelativePathsWithMetadata::const_iterator & end)
         {
-            auto & schema_cache = StorageAzureBlob::getSchemaCache(getContext());
+            auto context = getContext();
+            if (!context->getSettingsRef().schema_inference_use_cache_for_azure)
+                return std::nullopt;
+
+            auto & schema_cache = StorageAzureBlob::getSchemaCache(context);
             for (auto it = begin; it < end; ++it)
             {
                 auto get_last_mod_time = [&] -> std::optional<time_t>
@@ -1403,10 +1486,28 @@ namespace
 
                 auto host_and_bucket = configuration.connection_url + '/' + configuration.container;
                 String source = host_and_bucket + '/' + it->relative_path;
-                auto cache_key = getKeyForSchemaCache(source, configuration.format, format_settings, getContext());
-                auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-                if (columns)
-                    return columns;
+                if (format)
+                {
+                    auto cache_key = getKeyForSchemaCache(source, *format, format_settings, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        return columns;
+                }
+                else
+                {
+                    /// If format is unknown, we can iterate through all possible input formats
+                    /// and check if we have an entry with this format and this file in schema cache.
+                    /// If we have such entry for some format, we can use this format to read the file.
+                    for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                    {
+                        auto cache_key = getKeyForSchemaCache(source, format_name, format_settings, context);
+                        if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        {
+                            /// Now format is known. It should be the same for all files.
+                            format = format_name;
+                            return columns;
+                        }
+                    }
+                }
             }
 
             return std::nullopt;
@@ -1415,6 +1516,7 @@ namespace
         std::shared_ptr<StorageAzureBlobSource::IIterator> file_iterator;
         AzureObjectStorage * object_storage;
         const StorageAzureBlob::Configuration & configuration;
+        std::optional<String> format;
         const std::optional<FormatSettings> & format_settings;
         const RelativePathsWithMetadata & read_keys;
         size_t prev_read_keys_size;
@@ -1423,21 +1525,16 @@ namespace
     };
 }
 
-ColumnsDescription StorageAzureBlob::getTableStructureFromData(
+std::pair<ColumnsDescription, String> StorageAzureBlob::getTableStructureAndFormatFromDataImpl(
+    std::optional<String> format,
     AzureObjectStorage * object_storage,
     const Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx,
-    bool distributed_processing)
+    const ContextPtr & ctx)
 {
     RelativePathsWithMetadata read_keys;
     std::shared_ptr<StorageAzureBlobSource::IIterator> file_iterator;
-    if (distributed_processing)
-    {
-        file_iterator = std::make_shared<StorageAzureBlobSource::ReadIterator>(ctx,
-            ctx->getReadTaskCallback());
-    }
-    else if (configuration.withGlobs())
+    if (configuration.withGlobs())
     {
         file_iterator = std::make_shared<StorageAzureBlobSource::GlobIterator>(
             object_storage, configuration.container, configuration.blob_path, nullptr, NamesAndTypesList{}, ctx, &read_keys);
@@ -1448,8 +1545,28 @@ ColumnsDescription StorageAzureBlob::getTableStructureFromData(
             object_storage, configuration.container, configuration.blobs_paths, nullptr, NamesAndTypesList{}, ctx, &read_keys);
     }
 
-    ReadBufferIterator read_buffer_iterator(file_iterator, object_storage, configuration, format_settings, read_keys, ctx);
-    return readSchemaFromFormat(configuration.format, format_settings, read_buffer_iterator, configuration.withGlobs(), ctx);
+    ReadBufferIterator read_buffer_iterator(file_iterator, object_storage, format, configuration, format_settings, read_keys, ctx);
+    if (format)
+        return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, ctx), *format};
+    return detectFormatAndReadSchema(format_settings, read_buffer_iterator, ctx);
+}
+
+std::pair<ColumnsDescription, String> StorageAzureBlob::getTableStructureAndFormatFromData(
+    DB::AzureObjectStorage * object_storage,
+    const DB::StorageAzureBlob::Configuration & configuration,
+    const std::optional<FormatSettings> & format_settings,
+    const DB::ContextPtr & ctx)
+{
+    return getTableStructureAndFormatFromDataImpl(std::nullopt, object_storage, configuration, format_settings, ctx);
+}
+
+ColumnsDescription StorageAzureBlob::getTableStructureFromData(
+    DB::AzureObjectStorage * object_storage,
+    const DB::StorageAzureBlob::Configuration & configuration,
+    const std::optional<FormatSettings> & format_settings,
+    const DB::ContextPtr & ctx)
+{
+    return getTableStructureAndFormatFromDataImpl(configuration.format, object_storage, configuration, format_settings, ctx).first;
 }
 
 SchemaCache & StorageAzureBlob::getSchemaCache(const ContextPtr & ctx)
diff --git a/src/Storages/StorageAzureBlob.h b/src/Storages/StorageAzureBlob.h
index 16e5b9edfb6..3f1ba33f636 100644
--- a/src/Storages/StorageAzureBlob.h
+++ b/src/Storages/StorageAzureBlob.h
@@ -31,9 +31,9 @@ public:
 
         String getPath() const { return blob_path; }
 
-        bool update(ContextPtr context);
+        bool update(const ContextPtr & context);
 
-        void connect(ContextPtr context);
+        void connect(const ContextPtr & context);
 
         bool withGlobs() const { return blob_path.find_first_of("*?{") != std::string::npos; }
 
@@ -59,7 +59,7 @@ public:
     StorageAzureBlob(
         const Configuration & configuration_,
         std::unique_ptr<AzureObjectStorage> && object_storage_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
@@ -68,10 +68,10 @@ public:
         bool distributed_processing_,
         ASTPtr partition_by_);
 
-    static StorageAzureBlob::Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context);
-    static AzureClientPtr createClient(StorageAzureBlob::Configuration configuration, bool is_read_only);
+    static StorageAzureBlob::Configuration getConfiguration(ASTs & engine_args, const ContextPtr & local_context);
+    static AzureClientPtr createClient(StorageAzureBlob::Configuration configuration, bool is_read_only, bool attempt_to_create_container = true);
 
-    static AzureObjectStorage::SettingsPtr createSettings(ContextPtr local_context);
+    static AzureObjectStorage::SettingsPtr createSettings(const ContextPtr & local_context);
 
     static void processNamedCollectionResult(StorageAzureBlob::Configuration & configuration, const NamedCollection & collection);
 
@@ -94,16 +94,13 @@ public:
 
     void truncate(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, TableExclusiveLockHolder &) override;
 
-    NamesAndTypesList getVirtuals() const override;
-    static Names getVirtualColumnNames();
-
     bool supportsPartitionBy() const override;
 
     bool supportsSubcolumns() const override { return true; }
 
     bool supportsSubsetOfColumns(const ContextPtr & context) const;
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
     bool prefersLargeBlocks() const override;
 
@@ -115,16 +112,27 @@ public:
         AzureObjectStorage * object_storage,
         const Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx,
-        bool distributed_processing = false);
+        const ContextPtr & ctx);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromData(
+        AzureObjectStorage * object_storage,
+        const Configuration & configuration,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & ctx);
 
 private:
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromDataImpl(
+        std::optional<String> format,
+        AzureObjectStorage * object_storage,
+        const Configuration & configuration,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & ctx);
+
     friend class ReadFromAzureBlob;
 
     std::string name;
     Configuration configuration;
     std::unique_ptr<AzureObjectStorage> object_storage;
-    NamesAndTypesList virtual_columns;
 
     const bool distributed_processing;
     std::optional<FormatSettings> format_settings;
@@ -137,7 +145,7 @@ public:
     class IIterator : public WithContext
     {
     public:
-        IIterator(ContextPtr context_):WithContext(context_) {}
+        explicit IIterator(const ContextPtr & context_):WithContext(context_) {}
         virtual ~IIterator() = default;
         virtual RelativePathWithMetadata next() = 0;
 
@@ -153,7 +161,7 @@ public:
             String blob_path_with_globs_,
             const ActionsDAG::Node * predicate,
             const NamesAndTypesList & virtual_columns_,
-            ContextPtr context_,
+            const ContextPtr & context_,
             RelativePathsWithMetadata * outer_blobs_,
             std::function<void(FileProgress)> file_progress_callback_ = {});
 
@@ -186,7 +194,7 @@ public:
     class ReadIterator : public IIterator
     {
     public:
-        explicit ReadIterator(ContextPtr context_,
+        explicit ReadIterator(const ContextPtr & context_,
                               const ReadTaskCallback & callback_)
             : IIterator(context_), callback(callback_) { }
         RelativePathWithMetadata next() override
@@ -207,7 +215,7 @@ public:
             const Strings & keys_,
             const ActionsDAG::Node * predicate,
             const NamesAndTypesList & virtual_columns_,
-            ContextPtr context_,
+            const ContextPtr & context_,
             RelativePathsWithMetadata * outer_blobs,
             std::function<void(FileProgress)> file_progress_callback = {});
 
@@ -229,7 +237,7 @@ public:
         const ReadFromFormatInfo & info,
         const String & format_,
         String name_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         std::optional<FormatSettings> format_settings_,
         UInt64 max_block_size_,
         String compression_hint_,
@@ -319,7 +327,7 @@ private:
 
     ReaderHolder reader;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageAzureBlobSource");
+    LoggerPtr log = getLogger("StorageAzureBlobSource");
 
     ThreadPool create_reader_pool;
     ThreadPoolCallbackRunner<ReaderHolder> create_reader_scheduler;
diff --git a/src/Storages/StorageAzureBlobCluster.cpp b/src/Storages/StorageAzureBlobCluster.cpp
index a6372577fb0..a80d121567a 100644
--- a/src/Storages/StorageAzureBlobCluster.cpp
+++ b/src/Storages/StorageAzureBlobCluster.cpp
@@ -36,54 +36,56 @@ StorageAzureBlobCluster::StorageAzureBlobCluster(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    ContextPtr context_,
-    bool structure_argument_was_provided_)
-    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageAzureBlobCluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
+    const ContextPtr & context)
+    : IStorageCluster(cluster_name_, table_id_, getLogger("StorageAzureBlobCluster (" + table_id_.table_name + ")"))
     , configuration{configuration_}
     , object_storage(std::move(object_storage_))
 {
-    context_->getGlobalContext()->getRemoteHostFilter().checkURL(configuration_.getConnectionURL());
+    context->getGlobalContext()->getRemoteHostFilter().checkURL(configuration_.getConnectionURL());
     StorageInMemoryMetadata storage_metadata;
 
     if (columns_.empty())
     {
+        ColumnsDescription columns;
         /// `format_settings` is set to std::nullopt, because StorageAzureBlobCluster is used only as table function
-        auto columns = StorageAzureBlob::getTableStructureFromData(object_storage.get(), configuration, /*format_settings=*/std::nullopt, context_, false);
+        if (configuration.format == "auto")
+            std::tie(columns, configuration.format) = StorageAzureBlob::getTableStructureAndFormatFromData(object_storage.get(), configuration, /*format_settings=*/std::nullopt, context);
+        else
+            columns = StorageAzureBlob::getTableStructureFromData(object_storage.get(), configuration, /*format_settings=*/std::nullopt, context);
         storage_metadata.setColumns(columns);
     }
     else
+    {
+        if (configuration.format == "auto")
+            configuration.format = StorageAzureBlob::getTableStructureAndFormatFromData(object_storage.get(), configuration, /*format_settings=*/std::nullopt, context).second;
         storage_metadata.setColumns(columns_);
+    }
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
-void StorageAzureBlobCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+void StorageAzureBlobCluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const DB::StorageSnapshotPtr & storage_snapshot, const DB::ContextPtr & context)
 {
     ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
     if (!expression_list)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function s3Cluster, got '{}'", queryToString(query));
 
-    TableFunctionAzureBlobStorageCluster::addColumnsStructureToArguments(expression_list->children, structure, context);
+    TableFunctionAzureBlobStorageCluster::updateStructureAndFormatArgumentsIfNeeded(
+        expression_list->children, storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(), configuration.format, context);
 }
 
 RemoteQueryExecutor::Extension StorageAzureBlobCluster::getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const
 {
     auto iterator = std::make_shared<StorageAzureBlobSource::GlobIterator>(
         object_storage.get(), configuration.container, configuration.blob_path,
-        predicate, virtual_columns, context, nullptr);
+        predicate, getVirtualsList(), context, nullptr);
+
     auto callback = std::make_shared<std::function<String()>>([iterator]() mutable -> String{ return iterator->next().relative_path; });
     return RemoteQueryExecutor::Extension{ .task_iterator = std::move(callback) };
 }
 
-NamesAndTypesList StorageAzureBlobCluster::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-
 }
 
 #endif
diff --git a/src/Storages/StorageAzureBlobCluster.h b/src/Storages/StorageAzureBlobCluster.h
index 2831b94f825..eff4d70f1bd 100644
--- a/src/Storages/StorageAzureBlobCluster.h
+++ b/src/Storages/StorageAzureBlobCluster.h
@@ -27,26 +27,22 @@ public:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        ContextPtr context_,
-        bool structure_argument_was_provided_);
+        const ContextPtr & context);
 
     std::string getName() const override { return "AzureBlobStorageCluster"; }
 
-    NamesAndTypesList getVirtuals() const override;
-
     RemoteQueryExecutor::Extension getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
     bool supportsSubcolumns() const override { return true; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
     void updateBeforeRead(const ContextPtr & /*context*/) override {}
 
-    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+    void updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context) override;
 
     StorageAzureBlob::Configuration configuration;
-    NamesAndTypesList virtual_columns;
     std::unique_ptr<AzureObjectStorage> object_storage;
 };
 
diff --git a/src/Storages/StorageBuffer.cpp b/src/Storages/StorageBuffer.cpp
index 6f4b1563a46..dbcd47c5745 100644
--- a/src/Storages/StorageBuffer.cpp
+++ b/src/Storages/StorageBuffer.cpp
@@ -1,40 +1,43 @@
-#include <boost/range/algorithm_ext/erase.hpp>
-#include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/InterpreterInsertQuery.h>
+#include <Interpreters/InterpreterSelectQuery.h>
+#include <Interpreters/InterpreterSelectQueryAnalyzer.h>
+#include <Interpreters/addMissingDefaults.h>
 #include <Interpreters/castColumn.h>
 #include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/addMissingDefaults.h>
 #include <Interpreters/getColumnFromBlock.h>
-#include <Storages/StorageBuffer.h>
-#include <Storages/StorageFactory.h>
-#include <Storages/AlterCommands.h>
-#include <Storages/checkAndGetLiteralArgument.h>
-#include <Parsers/ASTInsertQuery.h>
-#include <Parsers/ASTIdentifier.h>
-#include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTExpressionList.h>
-#include <Common/CurrentMetrics.h>
-#include <Common/MemoryTrackerBlockerInThread.h>
-#include <Common/FieldVisitorConvertToNumber.h>
-#include <Common/quoteString.h>
-#include <Common/typeid_cast.h>
-#include <Common/ProfileEvents.h>
-#include <Common/logger_useful.h>
-#include <base/getThreadId.h>
-#include <base/range.h>
-#include <Processors/QueryPlan/ExpressionStep.h>
-#include <Processors/Transforms/FilterTransform.h>
-#include <Processors/Transforms/ExpressionTransform.h>
-#include <Processors/Transforms/ReverseTransform.h>
-#include <Processors/Transforms/PartialSortingTransform.h>
-#include <Processors/Sinks/SinkToStorage.h>
+#include <Parsers/ASTIdentifier.h>
+#include <Parsers/ASTInsertQuery.h>
+#include <Parsers/ASTLiteral.h>
+#include <Processors/Executors/PushingPipelineExecutor.h>
 #include <Processors/ISource.h>
+#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
+#include <Processors/QueryPlan/ExpressionStep.h>
+#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/QueryPlan/UnionStep.h>
-#include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
-#include <Processors/Executors/PushingPipelineExecutor.h>
+#include <Processors/Sinks/SinkToStorage.h>
+#include <Processors/Transforms/ExpressionTransform.h>
+#include <Processors/Transforms/FilterTransform.h>
+#include <Processors/Transforms/PartialSortingTransform.h>
+#include <Processors/Transforms/ReverseTransform.h>
+#include <Storages/AlterCommands.h>
+#include <Storages/StorageBuffer.h>
+#include <Storages/StorageFactory.h>
+#include <Storages/StorageValues.h>
+#include <Storages/checkAndGetLiteralArgument.h>
+#include <base/getThreadId.h>
+#include <base/range.h>
+#include <boost/range/algorithm_ext/erase.hpp>
+#include <Common/CurrentMetrics.h>
+#include <Common/FieldVisitorConvertToNumber.h>
+#include <Common/MemoryTrackerBlockerInThread.h>
+#include <Common/ProfileEvents.h>
+#include <Common/logger_useful.h>
+#include <Common/quoteString.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <Common/typeid_cast.h>
 
 
 namespace ProfileEvents
@@ -56,6 +59,9 @@ namespace CurrentMetrics
 {
     extern const Metric StorageBufferRows;
     extern const Metric StorageBufferBytes;
+    extern const Metric StorageBufferFlushThreads;
+    extern const Metric StorageBufferFlushThreadsActive;
+    extern const Metric StorageBufferFlushThreadsScheduled;
 }
 
 
@@ -137,7 +143,7 @@ StorageBuffer::StorageBuffer(
     , flush_thresholds(flush_thresholds_)
     , destination_id(destination_id_)
     , allow_materialized(allow_materialized_)
-    , log(&Poco::Logger::get("StorageBuffer (" + table_id_.getFullTableName() + ")"))
+    , log(getLogger("StorageBuffer (" + table_id_.getFullTableName() + ")"))
     , bg_pool(getContext()->getBufferFlushSchedulePool())
 {
     StorageInMemoryMetadata storage_metadata;
@@ -153,6 +159,12 @@ StorageBuffer::StorageBuffer(
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
 
+    if (num_shards > 1)
+    {
+        flush_pool = std::make_unique<ThreadPool>(
+            CurrentMetrics::StorageBufferFlushThreads, CurrentMetrics::StorageBufferFlushThreadsActive, CurrentMetrics::StorageBufferFlushThreadsScheduled,
+            num_shards, 0, num_shards);
+    }
     flush_handle = bg_pool.createTask(log->name() + "/Bg", [this]{ backgroundFlush(); });
 }
 
@@ -353,14 +365,31 @@ void StorageBuffer::read(
     /** If the sources from the table were processed before some non-initial stage of query execution,
       * then sources from the buffers must also be wrapped in the processing pipeline before the same stage.
       */
+    /// TODO: Find a way to support projections for StorageBuffer
     if (processed_stage > QueryProcessingStage::FetchColumns)
     {
-        /// TODO: Find a way to support projections for StorageBuffer
-        auto interpreter = InterpreterSelectQuery(
-                query_info.query, local_context, std::move(pipe_from_buffers),
-                SelectQueryOptions(processed_stage));
-        interpreter.addStorageLimits(*query_info.storage_limits);
-        interpreter.buildQueryPlan(buffers_plan);
+        if (local_context->getSettingsRef().allow_experimental_analyzer)
+        {
+            auto storage = std::make_shared<StorageValues>(
+                    getStorageID(),
+                    storage_snapshot->getAllColumnsDescription(),
+                    std::move(pipe_from_buffers),
+                    *getVirtualsPtr());
+
+            auto interpreter = InterpreterSelectQueryAnalyzer(
+                    query_info.query, local_context, storage,
+                    SelectQueryOptions(processed_stage));
+            interpreter.addStorageLimits(*query_info.storage_limits);
+            buffers_plan = std::move(interpreter).extractQueryPlan();
+        }
+        else
+        {
+            auto interpreter = InterpreterSelectQuery(
+                    query_info.query, local_context, std::move(pipe_from_buffers),
+                    SelectQueryOptions(processed_stage));
+            interpreter.addStorageLimits(*query_info.storage_limits);
+            interpreter.buildQueryPlan(buffers_plan);
+        }
     }
     else
     {
@@ -433,7 +462,7 @@ void StorageBuffer::read(
 }
 
 
-static void appendBlock(Poco::Logger * log, const Block & from, Block & to)
+static void appendBlock(LoggerPtr log, const Block & from, Block & to)
 {
     size_t rows = from.rows();
     size_t old_rows = to.rows();
@@ -802,7 +831,22 @@ bool StorageBuffer::checkThresholdsImpl(bool direct, size_t rows, size_t bytes,
 void StorageBuffer::flushAllBuffers(bool check_thresholds)
 {
     for (auto & buf : buffers)
-        flushBuffer(buf, check_thresholds, false);
+    {
+        if (flush_pool)
+        {
+            scheduleFromThreadPool<void>([&] ()
+            {
+                flushBuffer(buf, check_thresholds, false);
+            }, *flush_pool, "BufferFlush");
+        }
+        else
+        {
+            flushBuffer(buf, check_thresholds, false);
+        }
+    }
+
+    if (flush_pool)
+        flush_pool->wait();
 }
 
 
diff --git a/src/Storages/StorageBuffer.h b/src/Storages/StorageBuffer.h
index ef646a12548..6c15c7e0238 100644
--- a/src/Storages/StorageBuffer.h
+++ b/src/Storages/StorageBuffer.h
@@ -3,6 +3,7 @@
 #include <Core/BackgroundSchedulePool.h>
 #include <Core/NamesAndTypes.h>
 #include <Storages/IStorage.h>
+#include <Common/ThreadPool.h>
 
 #include <Poco/Event.h>
 
@@ -149,6 +150,7 @@ private:
 
     /// There are `num_shards` of independent buffers.
     const size_t num_shards;
+    std::unique_ptr<ThreadPool> flush_pool;
     std::vector<Buffer> buffers;
 
     const Thresholds min_thresholds;
@@ -166,7 +168,7 @@ private:
     Writes lifetime_writes;
     Writes total_writes;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     void flushAllBuffers(bool check_thresholds = true);
     bool flushBuffer(Buffer & buffer, bool check_thresholds, bool locked = false);
diff --git a/src/Storages/StorageDictionary.cpp b/src/Storages/StorageDictionary.cpp
index 4c354371574..447fd87cdc9 100644
--- a/src/Storages/StorageDictionary.cpp
+++ b/src/Storages/StorageDictionary.cpp
@@ -7,6 +7,7 @@
 #include <Interpreters/ExternalDictionariesLoader.h>
 #include <Interpreters/ExternalLoaderDictionaryStorageConfigRepository.h>
 #include <Parsers/ASTLiteral.h>
+#include <Common/Config/ConfigHelper.h>
 #include <Common/quoteString.h>
 #include <QueryPipeline/Pipe.h>
 #include <IO/Operators.h>
@@ -115,7 +116,7 @@ StorageDictionary::StorageDictionary(
     : StorageDictionary(
         table_id,
         table_id.getFullNameNotQuoted(),
-        context_->getExternalDictionariesLoader().getDictionaryStructure(*dictionary_configuration),
+        context_->getExternalDictionariesLoader().getDictionaryStructure(*dictionary_configuration), /// NOLINT(readability-static-accessed-through-instance)
         dictionary_configuration->getString("dictionary.comment", ""),
         Location::SameDatabaseAndNameAsDictionary,
         context_)
@@ -194,12 +195,6 @@ void StorageDictionary::removeDictionaryConfigurationFromRepository()
     remove_repository_callback.reset();
 }
 
-Poco::Timestamp StorageDictionary::getUpdateTime() const
-{
-    std::lock_guard lock(dictionary_config_mutex);
-    return update_time;
-}
-
 LoadablesConfigurationPtr StorageDictionary::getConfiguration() const
 {
     std::lock_guard lock(dictionary_config_mutex);
@@ -221,42 +216,47 @@ void StorageDictionary::renameInMemory(const StorageID & new_table_id)
     bool move_to_ordinary = old_table_id.uuid != UUIDHelpers::Nil && new_table_id.uuid == UUIDHelpers::Nil;
     assert(old_table_id.uuid == new_table_id.uuid || move_to_atomic || move_to_ordinary);
 
+    /// It's better not to update an associated `IDictionary` directly here because it can be not loaded yet or
+    /// it can be in the process of loading or reloading right now.
+    /// The correct way is to update the dictionary's configuration first and then ask ExternalDictionariesLoader to reload our dictionary.
+
     {
         std::lock_guard lock(dictionary_config_mutex);
+        auto new_configuration = ConfigHelper::clone(*configuration);
+
+        new_configuration->setString("dictionary.database", new_table_id.database_name);
+        new_configuration->setString("dictionary.name", new_table_id.table_name);
 
-        configuration->setString("dictionary.database", new_table_id.database_name);
-        configuration->setString("dictionary.name", new_table_id.table_name);
         if (move_to_atomic)
-            configuration->setString("dictionary.uuid", toString(new_table_id.uuid));
+            new_configuration->setString("dictionary.uuid", toString(new_table_id.uuid));
         else if (move_to_ordinary)
-            configuration->remove("dictionary.uuid");
+            new_configuration->remove("dictionary.uuid");
+
+        configuration = new_configuration;
     }
 
+    const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
+
     /// Dictionary is moving between databases of different engines or is renaming inside Ordinary database
     bool recreate_dictionary = old_table_id.uuid == UUIDHelpers::Nil || new_table_id.uuid == UUIDHelpers::Nil;
 
     if (recreate_dictionary)
     {
-        /// It's too hard to update both name and uuid, better to reload dictionary with new name
+        /// For an ordinary database the config repositories of dictionaries are identified by the full name (database name + dictionary name),
+        /// so we cannot change the dictionary name or the database name on the fly (without extra reloading) and have to recreate the config repository.
         removeDictionaryConfigurationFromRepository();
         auto repository = std::make_unique<ExternalLoaderDictionaryStorageConfigRepository>(*this);
-        remove_repository_callback = getContext()->getExternalDictionariesLoader().addConfigRepository(std::move(repository));
-        /// Dictionary will be reloaded lazily to avoid exceptions in the middle of renaming
+        remove_repository_callback = external_dictionaries_loader.addConfigRepository(std::move(repository));
+        /// Dictionary will be now reloaded lazily.
     }
     else
     {
-        const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
-        auto result = external_dictionaries_loader.getLoadResult(old_table_id.getInternalDictionaryName());
-
-        if (result.object)
-        {
-            const auto dictionary = std::static_pointer_cast<const IDictionary>(result.object);
-            dictionary->updateDictionaryName(new_table_id);
-        }
-
+        /// For an atomic database dictionaries are identified inside the ExternalLoader by UUID,
+        /// so we can change the dictionary name or the database name on the fly (without extra reloading) because UUID doesn't change.
         external_dictionaries_loader.reloadConfig(old_table_id.getInternalDictionaryName());
-        dictionary_name = new_table_id.getFullNameNotQuoted();
     }
+
+    dictionary_name = new_table_id.getFullNameNotQuoted();
 }
 
 void StorageDictionary::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /* context */) const
@@ -278,19 +278,19 @@ void StorageDictionary::alter(const AlterCommands & params, ContextPtr alter_con
 
     auto new_comment = getInMemoryMetadataPtr()->comment;
 
-    auto storage_id = getStorageID();
-    const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
-    auto result = external_dictionaries_loader.getLoadResult(storage_id.getInternalDictionaryName());
+    /// It's better not to update an associated `IDictionary` directly here because it can be not loaded yet or
+    /// it can be in the process of loading or reloading right now.
+    /// The correct way is to update the dictionary's configuration first and then ask ExternalDictionariesLoader to reload our dictionary.
 
-    if (result.object)
     {
-        auto dictionary = std::static_pointer_cast<const IDictionary>(result.object);
-        auto * dictionary_non_const = const_cast<IDictionary *>(dictionary.get());
-        dictionary_non_const->setDictionaryComment(new_comment);
+        std::lock_guard lock(dictionary_config_mutex);
+        auto new_configuration = ConfigHelper::clone(*configuration);
+        new_configuration->setString("dictionary.comment", new_comment);
+        configuration = new_configuration;
     }
 
-    std::lock_guard lock(dictionary_config_mutex);
-    configuration->setString("dictionary.comment", new_comment);
+    const auto & external_dictionaries_loader = getContext()->getExternalDictionariesLoader();
+    external_dictionaries_loader.reloadConfig(getStorageID().getInternalDictionaryName());
 }
 
 void registerStorageDictionary(StorageFactory & factory)
@@ -316,7 +316,7 @@ void registerStorageDictionary(StorageFactory & factory)
             auto result_storage = std::make_shared<StorageDictionary>(dictionary_id, abstract_dictionary_configuration, local_context);
 
             bool lazy_load = local_context->getConfigRef().getBool("dictionaries_lazy_load", true);
-            if (!args.attach && !lazy_load)
+            if (args.mode <= LoadingStrictnessLevel::CREATE && !lazy_load)
             {
                 /// load() is called here to force loading the dictionary, wait until the loading is finished,
                 /// and throw an exception if the loading is failed.
@@ -335,7 +335,7 @@ void registerStorageDictionary(StorageFactory & factory)
             args.engine_args[0] = evaluateConstantExpressionOrIdentifierAsLiteral(args.engine_args[0], local_context);
             String dictionary_name = checkAndGetLiteralArgument<String>(args.engine_args[0], "dictionary_name");
 
-            if (!args.attach)
+            if (args.mode <= LoadingStrictnessLevel::CREATE)
             {
                 const auto & dictionary = args.getContext()->getExternalDictionariesLoader().getDictionary(dictionary_name, args.getContext());
                 const DictionaryStructure & dictionary_structure = dictionary->getStructure();
diff --git a/src/Storages/StorageDictionary.h b/src/Storages/StorageDictionary.h
index 995a0192269..a414e4586d9 100644
--- a/src/Storages/StorageDictionary.h
+++ b/src/Storages/StorageDictionary.h
@@ -92,7 +92,6 @@ public:
 
     void alter(const AlterCommands & params, ContextPtr alter_context, AlterLockHolder &) override;
 
-    Poco::Timestamp getUpdateTime() const;
     LoadablesConfigurationPtr getConfiguration() const;
 
     String getDictionaryName() const { return dictionary_name; }
@@ -102,8 +101,7 @@ private:
     const Location location;
 
     mutable std::mutex dictionary_config_mutex;
-    Poco::Timestamp update_time;
-    LoadablesConfigurationPtr configuration;
+    LoadablesConfigurationPtr configuration TSA_GUARDED_BY(dictionary_config_mutex);
 
     scope_guard remove_repository_callback;
 
diff --git a/src/Storages/StorageDistributed.cpp b/src/Storages/StorageDistributed.cpp
index a829002187b..12c2ad331ad 100644
--- a/src/Storages/StorageDistributed.cpp
+++ b/src/Storages/StorageDistributed.cpp
@@ -19,9 +19,11 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Storages/StorageDummy.h>
 #include <Storages/removeGroupingFunctionSpecializations.h>
+#include <Storages/MergeTree/MergeTreeData.h>
 
 #include <Columns/ColumnConst.h>
 
+#include <Common/threadPoolCallbackRunner.h>
 #include <Common/Macros.h>
 #include <Common/ProfileEvents.h>
 #include <Common/escapeForFileName.h>
@@ -104,11 +106,8 @@
 #include <IO/Operators.h>
 #include <IO/ConnectionTimeouts.h>
 
-#include <Storages/BlockNumberColumn.h>
-
 #include <memory>
 #include <filesystem>
-#include <optional>
 #include <cassert>
 
 
@@ -284,28 +283,34 @@ size_t getClusterQueriedNodes(const Settings & settings, const ClusterPtr & clus
     return (num_remote_shards + num_local_shards) * settings.max_parallel_replicas;
 }
 
+template <class F>
+void waitFutures(F & futures)
+{
+    for (auto & future : futures)
+        future.wait();
+    /// Make sure there is no exception.
+    for (auto & future : futures)
+        future.get();
+    futures.clear();
+}
+
 }
 
 /// For destruction of std::unique_ptr of type that is incomplete in class definition.
 StorageDistributed::~StorageDistributed() = default;
 
 
-NamesAndTypesList StorageDistributed::getVirtuals() const
+VirtualColumnsDescription StorageDistributed::createVirtuals()
 {
-    /// NOTE This is weird. Most of these virtual columns are part of MergeTree
+    /// NOTE: This is weird.
+    /// Most of these virtual columns are part of MergeTree
     /// tables info. But Distributed is general-purpose engine.
-    return NamesAndTypesList{
-        NameAndTypePair("_table", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-        NameAndTypePair("_part", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-        NameAndTypePair("_part_index", std::make_shared<DataTypeUInt64>()),
-        NameAndTypePair("_part_uuid", std::make_shared<DataTypeUUID>()),
-        NameAndTypePair("_partition_id", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())),
-        NameAndTypePair("_sample_factor", std::make_shared<DataTypeFloat64>()),
-        NameAndTypePair("_part_offset", std::make_shared<DataTypeUInt64>()),
-        NameAndTypePair("_row_exists", std::make_shared<DataTypeUInt8>()),
-        NameAndTypePair(BlockNumberColumn::name, BlockNumberColumn::type),
-        NameAndTypePair("_shard_num", std::make_shared<DataTypeUInt32>()), /// deprecated
-    };
+    StorageInMemoryMetadata metadata;
+    auto desc = MergeTreeData::createVirtuals(metadata);
+
+    desc.addEphemeral("_shard_num", std::make_shared<DataTypeUInt32>(), "Deprecated. Use function shardNum instead");
+
+    return desc;
 }
 
 StorageDistributed::StorageDistributed(
@@ -321,7 +326,7 @@ StorageDistributed::StorageDistributed(
     const String & storage_policy_name_,
     const String & relative_data_path_,
     const DistributedSettings & distributed_settings_,
-    bool attach_,
+    LoadingStrictnessLevel mode,
     ClusterPtr owned_cluster_,
     ASTPtr remote_table_function_ptr_)
     : IStorage(id_)
@@ -329,7 +334,8 @@ StorageDistributed::StorageDistributed(
     , remote_database(remote_database_)
     , remote_table(remote_table_)
     , remote_table_function_ptr(remote_table_function_ptr_)
-    , log(&Poco::Logger::get("StorageDistributed (" + id_.table_name + ")"))
+    , remote_storage(remote_table_function_ptr ? StorageID::createEmpty() : StorageID{remote_database, remote_table})
+    , log(getLogger("StorageDistributed (" + id_.table_name + ")"))
     , owned_cluster(std::move(owned_cluster_))
     , cluster_name(getContext()->getMacros()->expand(cluster_name_))
     , has_sharding_key(sharding_key_)
@@ -354,6 +360,7 @@ StorageDistributed::StorageDistributed(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals());
 
     if (sharding_key_)
     {
@@ -372,7 +379,7 @@ StorageDistributed::StorageDistributed(
     }
 
     /// Sanity check. Skip check if the table is already created to allow the server to start.
-    if (!attach_)
+    if (mode <= LoadingStrictnessLevel::CREATE)
     {
         if (remote_database.empty() && !remote_table_function_ptr && !getCluster()->maybeCrossReplication())
             LOG_WARNING(log, "Name of remote database is empty. Default database will be used implicitly.");
@@ -397,7 +404,7 @@ StorageDistributed::StorageDistributed(
     const String & storage_policy_name_,
     const String & relative_data_path_,
     const DistributedSettings & distributed_settings_,
-    bool attach,
+    LoadingStrictnessLevel mode,
     ClusterPtr owned_cluster_)
     : StorageDistributed(
         id_,
@@ -412,7 +419,7 @@ StorageDistributed::StorageDistributed(
         storage_policy_name_,
         relative_data_path_,
         distributed_settings_,
-        attach,
+        mode,
         std::move(owned_cluster_),
         remote_table_function_ptr_)
 {
@@ -744,6 +751,32 @@ StorageSnapshotPtr StorageDistributed::getStorageSnapshotForQuery(
 namespace
 {
 
+class ReplaseAliasColumnsVisitor : public InDepthQueryTreeVisitor<ReplaseAliasColumnsVisitor>
+{
+    static QueryTreeNodePtr getColumnNodeAliasExpression(const QueryTreeNodePtr & node)
+    {
+        const auto * column_node = node->as<ColumnNode>();
+        if (!column_node || !column_node->hasExpression())
+            return nullptr;
+
+        const auto & column_source = column_node->getColumnSourceOrNull();
+        if (!column_source || column_source->getNodeType() == QueryTreeNodeType::JOIN
+                           || column_source->getNodeType() == QueryTreeNodeType::ARRAY_JOIN)
+            return nullptr;
+
+        auto column_expression = column_node->getExpression();
+        column_expression->setAlias(column_node->getColumnName());
+        return column_expression;
+    }
+
+public:
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        if (auto column_expression = getColumnNodeAliasExpression(node))
+            node = column_expression;
+    }
+};
+
 QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
     const StorageSnapshotPtr & distributed_storage_snapshot,
     const StorageID & remote_storage_id,
@@ -773,24 +806,18 @@ QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
             table_function_node->setTableExpressionModifiers(*table_expression_modifiers);
 
         QueryAnalysisPass query_analysis_pass;
-        query_analysis_pass.run(table_function_node, query_context);
+        QueryTreeNodePtr node = table_function_node;
+        query_analysis_pass.run(node, query_context);
 
         replacement_table_expression = std::move(table_function_node);
     }
     else
     {
-        auto resolved_remote_storage_id = remote_storage_id;
-        // In case of cross-replication we don't know what database is used for the table.
-        // `storage_id.hasDatabase()` can return false only on the initiator node.
-        // Each shard will use the default database (in the case of cross-replication shards may have different defaults).
-        if (remote_storage_id.hasDatabase())
-            resolved_remote_storage_id = query_context->resolveStorageID(remote_storage_id);
-
         auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
 
         auto column_names_and_types = distributed_storage_snapshot->getColumns(get_column_options);
 
-        auto storage = std::make_shared<StorageDummy>(resolved_remote_storage_id, ColumnsDescription{column_names_and_types});
+        auto storage = std::make_shared<StorageDummy>(remote_storage_id, ColumnsDescription{column_names_and_types});
         auto table_node = std::make_shared<TableNode>(std::move(storage), query_context);
 
         if (table_expression_modifiers)
@@ -802,8 +829,10 @@ QueryTreeNodePtr buildQueryTreeDistributed(SelectQueryInfo & query_info,
     replacement_table_expression->setAlias(query_info.table_expression->getAlias());
 
     auto query_tree_to_modify = query_info.query_tree->cloneAndReplace(query_info.table_expression, std::move(replacement_table_expression));
+    ReplaseAliasColumnsVisitor replase_alias_columns_visitor;
+    replase_alias_columns_visitor.visit(query_tree_to_modify);
 
-    return buildQueryTreeForShard(query_info, query_tree_to_modify);
+    return buildQueryTreeForShard(query_info.planner_context, query_tree_to_modify);
 }
 
 }
@@ -819,7 +848,8 @@ void StorageDistributed::read(
     const size_t /*num_streams*/)
 {
     Block header;
-    ASTPtr query_ast;
+
+    SelectQueryInfo modified_query_info = query_info;
 
     if (local_context->getSettingsRef().allow_experimental_analyzer)
     {
@@ -827,7 +857,7 @@ void StorageDistributed::read(
         if (!remote_table_function_ptr)
             remote_storage_id = StorageID{remote_database, remote_table};
 
-        auto query_tree_distributed = buildQueryTreeDistributed(query_info,
+        auto query_tree_distributed = buildQueryTreeDistributed(modified_query_info,
             storage_snapshot,
             remote_storage_id,
             remote_table_function_ptr);
@@ -837,20 +867,24 @@ void StorageDistributed::read(
           */
         for (auto & column : header)
             column.column = column.column->convertToFullColumnIfConst();
-        query_ast = queryNodeToSelectQuery(query_tree_distributed);
+        modified_query_info.query = queryNodeToDistributedSelectQuery(query_tree_distributed);
+
+        modified_query_info.query_tree = std::move(query_tree_distributed);
     }
     else
     {
-        header = InterpreterSelectQuery(query_info.query, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
-        query_ast = query_info.query;
+        header = InterpreterSelectQuery(modified_query_info.query, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
     }
 
-    const auto & modified_query_ast = ClusterProxy::rewriteSelectQuery(
-        local_context, query_ast,
-        remote_database, remote_table, remote_table_function_ptr);
+    if (!local_context->getSettingsRef().allow_experimental_analyzer)
+    {
+        modified_query_info.query = ClusterProxy::rewriteSelectQuery(
+            local_context, modified_query_info.query,
+            remote_database, remote_table, remote_table_function_ptr);
+    }
 
     /// Return directly (with correct header) if no shard to query.
-    if (query_info.getCluster()->getShardsInfo().empty())
+    if (modified_query_info.getCluster()->getShardsInfo().empty())
     {
         if (local_context->getSettingsRef().allow_experimental_analyzer)
             return;
@@ -863,10 +897,6 @@ void StorageDistributed::read(
         return;
     }
 
-    StorageID main_table = StorageID::createEmpty();
-    if (!remote_table_function_ptr)
-        main_table = StorageID{remote_database, remote_table};
-
     const auto & snapshot_data = assert_cast<const SnapshotData &>(*storage_snapshot->data);
     ClusterProxy::SelectStreamFactory select_stream_factory =
         ClusterProxy::SelectStreamFactory(
@@ -878,7 +908,7 @@ void StorageDistributed::read(
     const auto & settings = local_context->getSettingsRef();
 
     ClusterProxy::AdditionalShardFilterGenerator additional_shard_filter_generator;
-    if (local_context->canUseParallelReplicasCustomKey(*query_info.getCluster()))
+    if (local_context->canUseParallelReplicasCustomKey(*modified_query_info.getCluster()))
     {
         if (auto custom_key_ast = parseCustomKeyForTable(settings.parallel_replicas_custom_key, *local_context))
         {
@@ -887,7 +917,7 @@ void StorageDistributed::read(
                  column_description = this->getInMemoryMetadataPtr()->columns,
                  custom_key_type = settings.parallel_replicas_custom_key_filter_type.value,
                  context = local_context,
-                 replica_count = query_info.getCluster()->getShardsInfo().front().per_replica_pools.size()](uint64_t replica_num) -> ASTPtr
+                 replica_count = modified_query_info.getCluster()->getShardsInfo().front().per_replica_pools.size()](uint64_t replica_num) -> ASTPtr
             {
                 return getCustomKeyFilterForParallelReplica(
                     replica_count, replica_num - 1, my_custom_key_ast, custom_key_type, column_description, context);
@@ -899,16 +929,14 @@ void StorageDistributed::read(
         query_plan,
         header,
         processed_stage,
-        main_table,
+        remote_storage,
         remote_table_function_ptr,
         select_stream_factory,
         log,
-        modified_query_ast,
         local_context,
-        query_info,
+        modified_query_info,
         sharding_key_expr,
         sharding_key_column_name,
-        query_info.cluster,
         distributed_settings,
         additional_shard_filter_generator);
 
@@ -948,9 +976,7 @@ SinkToStoragePtr StorageDistributed::write(const ASTPtr &, const StorageMetadata
         columns_to_send = metadata_snapshot->getSampleBlockNonMaterialized().getNames();
 
     /// DistributedSink will not own cluster, but will own ConnectionPools of the cluster
-    return std::make_shared<DistributedSink>(
-        local_context, *this, metadata_snapshot, cluster, insert_sync, timeout,
-        StorageID{remote_database, remote_table}, columns_to_send);
+    return std::make_shared<DistributedSink>(local_context, *this, metadata_snapshot, cluster, insert_sync, timeout, columns_to_send);
 }
 
 
@@ -982,8 +1008,10 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistribu
         new_query->select = select_with_union_query;
     }
 
-    const Cluster::AddressesWithFailover & src_addresses = src_distributed.getCluster()->getShardsAddresses();
-    const Cluster::AddressesWithFailover & dst_addresses = getCluster()->getShardsAddresses();
+    const auto src_cluster = src_distributed.getCluster();
+    const auto dst_cluster = getCluster();
+    const Cluster::AddressesWithFailover & src_addresses = src_cluster->getShardsAddresses();
+    const Cluster::AddressesWithFailover & dst_addresses = dst_cluster->getShardsAddresses();
     /// Compare addresses instead of cluster name, to handle remote()/cluster().
     /// (since for remote()/cluster() the getClusterName() is empty string)
     if (src_addresses != dst_addresses)
@@ -1012,8 +1040,7 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteBetweenDistribu
         new_query->table_function.reset();
     }
 
-    const auto & cluster = getCluster();
-    const auto & shards_info = cluster->getShardsInfo();
+    const auto & shards_info = dst_cluster->getShardsInfo();
 
     String new_query_str;
     {
@@ -1102,7 +1129,7 @@ static ActionsDAGPtr getFilterFromQuery(const ASTPtr & ast, ContextPtr context)
     if (!source)
         return nullptr;
 
-    return ActionsDAG::buildFilterActionsDAG(source->getFilterNodes().nodes, {}, context);
+    return source->getFilterActionsDAG();
 }
 
 
@@ -1140,22 +1167,21 @@ std::optional<QueryPipeline> StorageDistributed::distributedWriteFromClusterStor
     ContextMutablePtr query_context = Context::createCopy(local_context);
     query_context->increaseDistributedDepth();
 
-    /// Here we take addresses from destination cluster and assume source table exists on these nodes
-    for (const auto & replicas : getCluster()->getShardsAddresses())
-    {
-        /// There will be only one replica, because we consider each replica as a shard
-        for (const auto & node : replicas)
-        {
-            auto connection = std::make_shared<Connection>(
-                node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, ssh::SSHKey(), node.quota_key, node.cluster, node.cluster_secret,
-                "ParallelInsertSelectInititiator",
-                node.compression,
-                node.secure
-            );
+    const auto & current_settings = query_context->getSettingsRef();
+    auto timeouts = ConnectionTimeouts::getTCPTimeoutsWithFailover(current_settings);
 
+    /// Here we take addresses from destination cluster and assume source table exists on these nodes
+    const auto cluster = getCluster();
+    for (const auto & replicas : cluster->getShardsInfo())
+    {
+        /// Skip unavailable hosts if necessary
+        auto try_results = replicas.pool->getMany(timeouts, current_settings, PoolMode::GET_MANY, /*async_callback*/ {}, /*skip_unavailable_endpoints*/ true);
+
+        /// There will be only one replica, because we consider each replica as a shard
+        for (const auto & try_result : try_results)
+        {
             auto remote_query_executor = std::make_shared<RemoteQueryExecutor>(
-                connection,
+                std::vector<IConnectionPool::Entry>{try_result},
                 new_query_str,
                 Block{},
                 query_context,
@@ -1270,25 +1296,30 @@ void StorageDistributed::initializeFromDisk()
 
     /// Make initialization for large number of disks parallel.
     ThreadPool pool(CurrentMetrics::StorageDistributedThreads, CurrentMetrics::StorageDistributedThreadsActive, CurrentMetrics::StorageDistributedThreadsScheduled, disks.size());
+    std::vector<std::future<void>> futures;
 
     for (const DiskPtr & disk : disks)
     {
-        pool.scheduleOrThrowOnError([&]()
+        auto future = scheduleFromThreadPool<void>([this, disk_to_init = disk]
         {
-            initializeDirectoryQueuesForDisk(disk);
-        });
+            initializeDirectoryQueuesForDisk(disk_to_init);
+        }, pool, "DistInit");
+        futures.push_back(std::move(future));
     }
+    waitFutures(futures);
     pool.wait();
 
     const auto & paths = getDataPaths();
     std::vector<UInt64> last_increment(paths.size());
     for (size_t i = 0; i < paths.size(); ++i)
     {
-        pool.scheduleOrThrowOnError([&, i]()
+        auto future = scheduleFromThreadPool<void>([&paths, &last_increment, i]
         {
             last_increment[i] = getMaximumFileNumber(paths[i]);
-        });
+        }, pool, "DistInit");
+        futures.push_back(std::move(future));
     }
+    waitFutures(futures);
     pool.wait();
 
     for (const auto inc : last_increment)
@@ -1542,10 +1573,7 @@ ClusterPtr StorageDistributed::getOptimizedCluster(
 IColumn::Selector StorageDistributed::createSelector(const ClusterPtr cluster, const ColumnWithTypeAndName & result)
 {
     const auto & slot_to_shard = cluster->getSlotToShard();
-
     const IColumn * column = result.column.get();
-    if (const auto * col_const = typeid_cast<const ColumnConst *>(column))
-        column = &col_const->getDataColumn();
 
 // If result.type is DataTypeLowCardinality, do shard according to its dictionaryType
 #define CREATE_FOR_TYPE(TYPE)                                                                                       \
@@ -1575,32 +1603,9 @@ ClusterPtr StorageDistributed::skipUnusedShardsWithAnalyzer(
     [[maybe_unused]] const StorageSnapshotPtr & storage_snapshot,
     ContextPtr local_context) const
 {
-
-    ActionsDAG::NodeRawConstPtrs nodes;
-
-    const auto & prewhere_info = query_info.prewhere_info;
-    if (prewhere_info)
-    {
-        {
-            const auto & node = prewhere_info->prewhere_actions->findInOutputs(prewhere_info->prewhere_column_name);
-            nodes.push_back(&node);
-        }
-
-        if (prewhere_info->row_level_filter)
-        {
-            const auto & node = prewhere_info->row_level_filter->findInOutputs(prewhere_info->row_level_column_name);
-            nodes.push_back(&node);
-        }
-    }
-
-    if (query_info.filter_actions_dag)
-        nodes.push_back(query_info.filter_actions_dag->getOutputs().at(0));
-
-    if (nodes.empty())
+    if (!query_info.filter_actions_dag)
         return nullptr;
 
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(nodes, {}, local_context);
-
     size_t limit = local_context->getSettingsRef().optimize_skip_unused_shards_limit;
     if (!limit || limit > SSIZE_MAX)
     {
@@ -1614,7 +1619,7 @@ ClusterPtr StorageDistributed::skipUnusedShardsWithAnalyzer(
             ErrorCodes::LOGICAL_ERROR, "Cannot find sharding key column {} in expression {}",
             sharding_key_column_name, sharding_key_dag.dumpDAG());
 
-    const auto * predicate = filter_actions_dag->getOutputs().at(0);
+    const auto * predicate = query_info.filter_actions_dag->getOutputs().at(0);
     const auto variants = evaluateExpressionOverConstantCondition(predicate, {expr_node}, local_context, limit);
 
     // Can't get a definite answer if we can skip any shards
@@ -1721,7 +1726,7 @@ void StorageDistributed::flushAndPrepareForShutdown()
 {
     try
     {
-        flushClusterNodesAllData(getContext());
+        flushClusterNodesAllDataImpl(getContext(), /* settings_changes= */ {}, getDistributedSettingsRef().flush_on_detach);
     }
     catch (...)
     {
@@ -1729,7 +1734,12 @@ void StorageDistributed::flushAndPrepareForShutdown()
     }
 }
 
-void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
+void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context, const SettingsChanges & settings_changes)
+{
+    flushClusterNodesAllDataImpl(local_context, settings_changes, /* flush= */ true);
+}
+
+void StorageDistributed::flushClusterNodesAllDataImpl(ContextPtr local_context, const SettingsChanges & settings_changes, bool flush)
 {
     /// Sync SYSTEM FLUSH DISTRIBUTED with TRUNCATE
     auto table_lock = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
@@ -1744,16 +1754,33 @@ void StorageDistributed::flushClusterNodesAllData(ContextPtr local_context)
             directory_queues.push_back(node.second.directory_queue);
     }
 
-    bool need_flush = getDistributedSettingsRef().flush_on_detach;
-    if (!need_flush)
+    if (flush)
+    {
+        LOG_INFO(log, "Flushing pending INSERT blocks");
+
+        Stopwatch watch;
+        ThreadPool pool(CurrentMetrics::StorageDistributedThreads, CurrentMetrics::StorageDistributedThreadsActive, CurrentMetrics::StorageDistributedThreadsScheduled, directory_queues.size());
+        std::vector<std::future<void>> futures;
+
+        for (const auto & node : directory_queues)
+        {
+            auto future = scheduleFromThreadPool<void>([node_to_flush = node, &settings_changes]
+            {
+                node_to_flush->flushAllData(settings_changes);
+            }, pool, "DistFlush");
+            futures.push_back(std::move(future));
+        }
+
+        waitFutures(futures);
+        pool.wait();
+
+        LOG_INFO(log, "Pending INSERT blocks flushed, took {} ms.", watch.elapsedMilliseconds());
+    }
+    else
+    {
         LOG_INFO(log, "Skip flushing data (due to flush_on_detach=0)");
 
-    /// TODO: Maybe it should be executed in parallel
-    for (auto & node : directory_queues)
-    {
-        if (need_flush)
-            node->flushAllData();
-        else
+        for (auto & node : directory_queues)
             node->shutdownWithoutFlush();
     }
 }
@@ -1924,7 +1951,7 @@ void registerStorageDistributed(StorageFactory & factory)
         }
 
         /// TODO: move some arguments from the arguments to the SETTINGS.
-        DistributedSettings distributed_settings;
+        DistributedSettings distributed_settings = context->getDistributedSettings();
         if (args.storage_def->settings)
         {
             distributed_settings.loadFromQuery(*args.storage_def);
@@ -1964,7 +1991,7 @@ void registerStorageDistributed(StorageFactory & factory)
             storage_policy,
             args.relative_data_path,
             distributed_settings,
-            args.attach);
+            args.mode);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageDistributed.h b/src/Storages/StorageDistributed.h
index b7ed85e87df..3a7e63aef50 100644
--- a/src/Storages/StorageDistributed.h
+++ b/src/Storages/StorageDistributed.h
@@ -5,6 +5,7 @@
 #include <Storages/Distributed/DistributedAsyncInsertDirectoryQueue.h>
 #include <Storages/Distributed/DistributedSettings.h>
 #include <Storages/getStructureOfRemoteTable.h>
+#include <Common/SettingsChanges.h>
 #include <Common/SimpleIncrement.h>
 #include <Client/ConnectionPool.h>
 #include <Client/ConnectionPoolWithFailover.h>
@@ -58,7 +59,7 @@ public:
         const String & storage_policy_name_,
         const String & relative_data_path_,
         const DistributedSettings & distributed_settings_,
-        bool attach_,
+        LoadingStrictnessLevel mode,
         ClusterPtr owned_cluster_ = {},
         ASTPtr remote_table_function_ptr_ = {});
 
@@ -73,7 +74,7 @@ public:
         const String & storage_policy_name_,
         const String & relative_data_path_,
         const DistributedSettings & distributed_settings_,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ClusterPtr owned_cluster_ = {});
 
     ~StorageDistributed() override;
@@ -146,17 +147,14 @@ public:
 
     ActionLock getActionLock(StorageActionBlockType type) override;
 
-    NamesAndTypesList getVirtuals() const override;
-
     /// Used by InterpreterInsertQuery
     std::string getRemoteDatabaseName() const { return remote_database; }
     std::string getRemoteTableName() const { return remote_table; }
     ClusterPtr getCluster() const;
 
     /// Used by InterpreterSystemQuery
-    void flushClusterNodesAllData(ContextPtr context);
+    void flushClusterNodesAllData(ContextPtr context, const SettingsChanges & settings_changes);
 
-    /// Used by ClusterCopier
     size_t getShardCount() const;
 
     bool initializeDiskOnConfigChange(const std::set<String> & new_added_disks) override;
@@ -168,6 +166,10 @@ private:
     const String & getShardingKeyColumnName() const { return sharding_key_column_name; }
     const String & getRelativeDataPath() const { return relative_data_path; }
 
+    /// @param flush - if true the do flush (DistributedAsyncInsertDirectoryQueue::flushAllData()),
+    /// otherwise only shutdown (DistributedAsyncInsertDirectoryQueue::shutdownWithoutFlush())
+    void flushClusterNodesAllDataImpl(ContextPtr context, const SettingsChanges & settings_changes, bool flush);
+
     /// create directory monitors for each existing subdirectory
     void initializeDirectoryQueuesForDisk(const DiskPtr & disk);
 
@@ -234,11 +236,14 @@ private:
     std::optional<QueryPipeline> distributedWriteFromClusterStorage(const IStorageCluster & src_storage_cluster, const ASTInsertQuery & query, ContextPtr context) const;
     std::optional<QueryPipeline> distributedWriteBetweenDistributedTables(const StorageDistributed & src_distributed, const ASTInsertQuery & query, ContextPtr context) const;
 
+    static VirtualColumnsDescription createVirtuals();
+
     String remote_database;
     String remote_table;
     ASTPtr remote_table_function_ptr;
+    StorageID remote_storage;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Used to implement TableFunctionRemote.
     std::shared_ptr<Cluster> owned_cluster;
@@ -271,7 +276,7 @@ private:
     struct ClusterNodeData
     {
         std::shared_ptr<DistributedAsyncInsertDirectoryQueue> directory_queue;
-        ConnectionPoolPtr connection_pool;
+        ConnectionPoolWithFailoverPtr connection_pool;
         Cluster::Addresses addresses;
         size_t clusters_version;
     };
diff --git a/src/Storages/StorageDummy.cpp b/src/Storages/StorageDummy.cpp
index e2396a54acb..0525a004099 100644
--- a/src/Storages/StorageDummy.cpp
+++ b/src/Storages/StorageDummy.cpp
@@ -10,9 +10,9 @@
 namespace DB
 {
 
-StorageDummy::StorageDummy(const StorageID & table_id_, const ColumnsDescription & columns_, ColumnsDescription object_columns_)
-    : IStorage(table_id_)
-    , object_columns(std::move(object_columns_))
+StorageDummy::StorageDummy(
+    const StorageID & table_id_, const ColumnsDescription & columns_, const StorageSnapshotPtr & original_storage_snapshot_)
+    : IStorage(table_id_), original_storage_snapshot(original_storage_snapshot_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -31,23 +31,38 @@ QueryProcessingStage::Enum StorageDummy::getQueryProcessingStage(
 void StorageDummy::read(QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo &,
-    ContextPtr,
+    SelectQueryInfo & query_info,
+    ContextPtr local_context,
     QueryProcessingStage::Enum,
     size_t,
     size_t)
 {
-    query_plan.addStep(std::make_unique<ReadFromDummy>(*this, storage_snapshot, column_names));
+    query_plan.addStep(std::make_unique<ReadFromDummy>(
+        column_names,
+        query_info,
+        original_storage_snapshot ? original_storage_snapshot : storage_snapshot,
+        local_context,
+        *this));
 }
 
-ReadFromDummy::ReadFromDummy(const StorageDummy & storage_,
-    StorageSnapshotPtr storage_snapshot_,
-    Names column_names_)
-    : SourceStepWithFilter(DataStream{.header = storage_snapshot_->getSampleBlockForColumns(column_names_)})
+ReadFromDummy::ReadFromDummy(
+    const Names & column_names_,
+    const SelectQueryInfo & query_info_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
+    const StorageDummy & storage_)
+    : SourceStepWithFilter(
+        DataStream{
+            .header = SourceStepWithFilter::applyPrewhereActions(
+                storage_snapshot_->getSampleBlockForColumns(column_names_), query_info_.prewhere_info)},
+        column_names_,
+        query_info_,
+        storage_snapshot_,
+        context_)
     , storage(storage_)
-    , storage_snapshot(std::move(storage_snapshot_))
-    , column_names(std::move(column_names_))
-{}
+    , column_names(column_names_)
+{
+}
 
 void ReadFromDummy::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
diff --git a/src/Storages/StorageDummy.h b/src/Storages/StorageDummy.h
index aa2201a196b..ae9bf2483e1 100644
--- a/src/Storages/StorageDummy.h
+++ b/src/Storages/StorageDummy.h
@@ -11,16 +11,31 @@ namespace DB
 class StorageDummy final : public IStorage
 {
 public:
-    StorageDummy(const StorageID & table_id_, const ColumnsDescription & columns_, ColumnsDescription object_columns_ = {});
+    StorageDummy(
+        const StorageID & table_id_, const ColumnsDescription & columns_, const StorageSnapshotPtr & original_storage_snapshot_ = nullptr);
 
     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; }
+
+    std::optional<NameSet> supportedPrewhereColumns() const override
+    {
+        return original_storage_snapshot ? original_storage_snapshot->storage.supportedPrewhereColumns() : std::nullopt;
+    }
+
     bool supportsSubcolumns() const override { return true; }
     bool supportsDynamicSubcolumns() const override { return true; }
-    bool canMoveConditionsToPrewhere() const override { return false; }
+    bool canMoveConditionsToPrewhere() const override
+    {
+        return original_storage_snapshot ? original_storage_snapshot->storage.canMoveConditionsToPrewhere() : false;
+    }
+
+    bool hasEvenlyDistributedRead() const override
+    {
+        return original_storage_snapshot ? original_storage_snapshot->storage.hasEvenlyDistributedRead() : false;
+    }
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr /*query_context*/) const override
     {
@@ -42,16 +57,23 @@ public:
         QueryProcessingStage::Enum processed_stage,
         size_t max_block_size,
         size_t num_streams) override;
+
 private:
     const ColumnsDescription object_columns;
+
+    /// The original storage snapshot which is replaced during planning. See collectFiltersForAnalysis for example.
+    StorageSnapshotPtr original_storage_snapshot;
 };
 
 class ReadFromDummy final : public SourceStepWithFilter
 {
 public:
-    explicit ReadFromDummy(const StorageDummy & storage_,
-        StorageSnapshotPtr storage_snapshot_,
-        Names column_names_);
+    explicit ReadFromDummy(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        const StorageDummy & storage_);
 
     const StorageDummy & getStorage() const
     {
@@ -74,7 +96,6 @@ public:
 
 private:
     const StorageDummy & storage;
-    StorageSnapshotPtr storage_snapshot;
     Names column_names;
 };
 
diff --git a/src/Storages/StorageExecutable.cpp b/src/Storages/StorageExecutable.cpp
index 2acbf3f4610..e475211deb3 100644
--- a/src/Storages/StorageExecutable.cpp
+++ b/src/Storages/StorageExecutable.cpp
@@ -80,7 +80,7 @@ StorageExecutable::StorageExecutable(
     : IStorage(table_id_)
     , settings(settings_)
     , input_queries(input_queries_)
-    , log(settings.is_executable_pool ? &Poco::Logger::get("StorageExecutablePool") : &Poco::Logger::get("StorageExecutable"))
+    , log(settings.is_executable_pool ? getLogger("StorageExecutablePool") : getLogger("StorageExecutable"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns);
diff --git a/src/Storages/StorageExecutable.h b/src/Storages/StorageExecutable.h
index 37455385675..2be2a84ab49 100644
--- a/src/Storages/StorageExecutable.h
+++ b/src/Storages/StorageExecutable.h
@@ -45,7 +45,7 @@ public:
 private:
     ExecutableSettings settings;
     std::vector<ASTPtr> input_queries;
-    Poco::Logger * log;
+    LoggerPtr log;
     std::unique_ptr<ShellCommandSourceCoordinator> coordinator;
 };
 
diff --git a/src/Storages/StorageFactory.cpp b/src/Storages/StorageFactory.cpp
index f9bc25ef72c..d1968daa1f1 100644
--- a/src/Storages/StorageFactory.cpp
+++ b/src/Storages/StorageFactory.cpp
@@ -62,7 +62,7 @@ StoragePtr StorageFactory::get(
     ContextMutablePtr context,
     const ColumnsDescription & columns,
     const ConstraintsDescription & constraints,
-    bool has_force_restore_data_flag) const
+    LoadingStrictnessLevel mode) const
 {
     String name, comment;
 
@@ -216,8 +216,7 @@ StoragePtr StorageFactory::get(
         .context = context,
         .columns = columns,
         .constraints = constraints,
-        .attach = query.attach,
-        .has_force_restore_data_flag = has_force_restore_data_flag,
+        .mode = mode,
         .comment = comment};
 
     assert(arguments.getContext() == arguments.getContext()->getGlobalContext());
diff --git a/src/Storages/StorageFactory.h b/src/Storages/StorageFactory.h
index 239f1bb63ef..50ace6aaad7 100644
--- a/src/Storages/StorageFactory.h
+++ b/src/Storages/StorageFactory.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <Common/NamePrompter.h>
+#include <Databases/LoadingStrictnessLevel.h>
 #include <Parsers/IAST_fwd.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Storages/ColumnsDescription.h>
@@ -31,6 +32,7 @@ public:
     struct Arguments
     {
         const String & engine_name;
+        /// Mutable to allow replacing constant expressions with literals, and other transformations.
         ASTs & engine_args;
         ASTStorage * storage_def;
         const ASTCreateQuery & query;
@@ -42,8 +44,7 @@ public:
         ContextWeakMutablePtr context;
         const ColumnsDescription & columns;
         const ConstraintsDescription & constraints;
-        bool attach;
-        bool has_force_restore_data_flag;
+        LoadingStrictnessLevel mode;
         const String & comment;
 
         ContextMutablePtr getContext() const;
@@ -86,7 +87,7 @@ public:
         ContextMutablePtr context,
         const ColumnsDescription & columns,
         const ConstraintsDescription & constraints,
-        bool has_force_restore_data_flag) const;
+        LoadingStrictnessLevel mode) const;
 
     /// Register a table engine by its name.
     /// No locking, you must register all engines before usage of get.
diff --git a/src/Storages/StorageFile.cpp b/src/Storages/StorageFile.cpp
index 9f864813de9..f747bbf6b28 100644
--- a/src/Storages/StorageFile.cpp
+++ b/src/Storages/StorageFile.cpp
@@ -25,6 +25,9 @@
 #include <IO/WriteHelpers.h>
 #include <IO/Archives/createArchiveReader.h>
 #include <IO/Archives/IArchiveReader.h>
+#include <IO/PeekableReadBuffer.h>
+#include <IO/AsynchronousReadBufferFromFile.h>
+#include <Disks/IO/IOUringReader.h>
 
 #include <Formats/FormatFactory.h>
 #include <Formats/ReadSchemaUtils.h>
@@ -89,7 +92,9 @@ namespace ErrorCodes
     extern const int LOGICAL_ERROR;
     extern const int CANNOT_APPEND_TO_FILE;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int CANNOT_DETECT_FORMAT;
     extern const int CANNOT_COMPILE_REGEXP;
+    extern const int UNSUPPORTED_METHOD;
 }
 
 namespace
@@ -274,6 +279,22 @@ std::unique_ptr<ReadBuffer> selectReadBuffer(
 
         ProfileEvents::increment(ProfileEvents::CreatedReadBufferOrdinary);
     }
+    else if (read_method == LocalFSReadMethod::io_uring && !use_table_fd)
+    {
+#if USE_LIBURING
+        auto & reader = context->getIOURingReader();
+        if (!reader.isSupported())
+            throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "io_uring is not supported by this system");
+
+        res = std::make_unique<AsynchronousReadBufferFromFileWithDescriptorsCache>(
+            reader,
+            Priority{},
+            current_path,
+            context->getSettingsRef().max_read_buffer_size);
+#else
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Read method io_uring is only supported in Linux");
+#endif
+    }
     else
     {
         if (use_table_fd)
@@ -327,7 +348,7 @@ std::unique_ptr<ReadBuffer> createReadBuffer(
 
 }
 
-Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, ContextPtr context, size_t & total_bytes_to_read)
+Strings StorageFile::getPathsList(const String & table_path, const String & user_files_path, const ContextPtr & context, size_t & total_bytes_to_read)
 {
     fs::path user_files_absolute_path = fs::weakly_canonical(user_files_path);
     fs::path fs_table_path(table_path);
@@ -374,27 +395,44 @@ namespace
     public:
         ReadBufferFromFileIterator(
             const std::vector<String> & paths_,
-            const String & format_,
+            std::optional<String> format_,
             const String & compression_method_,
             const std::optional<FormatSettings> & format_settings_,
-            ContextPtr context_)
+            const ContextPtr & context_)
             : WithContext(context_)
             , paths(paths_)
-            , format(format_)
+            , format(std::move(format_))
             , compression_method(compression_method_)
             , format_settings(format_settings_)
         {
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
             bool is_first = current_index == 0;
-            /// For default mode check cached columns for all paths on first iteration.
-            /// If we have cached columns, next() won't be called again.
-            if (is_first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+            if (is_first)
             {
-                if (auto cached_columns = tryGetColumnsFromCache(paths))
-                    return {nullptr, cached_columns};
+                /// If format is unknown we iterate through all paths on first iteration and
+                /// try to determine format by file name.
+                if (!format)
+                {
+                    for (const auto & path : paths)
+                    {
+                        if (auto format_from_path = FormatFactory::instance().tryGetFormatFromFileName(path))
+                        {
+                            format = format_from_path;
+                            break;
+                        }
+                    }
+                }
+
+                /// For default mode check cached columns for all paths on first iteration.
+                /// If we have cached columns, next() won't be called again.
+                if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                {
+                    if (auto cached_columns = tryGetColumnsFromCache(paths))
+                        return {nullptr, cached_columns, format};
+                }
             }
 
             String path;
@@ -405,11 +443,18 @@ namespace
                 if (current_index == paths.size())
                 {
                     if (is_first)
+                    {
+                        if (format)
+                            throw Exception(
+                                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                                "The table structure cannot be extracted from a {} format file, because all files are empty. You can specify the format manually",
+                                *format);
+
                         throw Exception(
-                            ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                            "Cannot extract table structure from {} format file, because all files are empty. You must specify table structure manually",
-                            format);
-                    return {nullptr, std::nullopt};
+                            ErrorCodes::CANNOT_DETECT_FORMAT,
+                            "The data format cannot be detected by the contents of the files, because all files are empty. You can specify table structure manually");
+                    }
+                    return {nullptr, std::nullopt, std::nullopt};
                 }
 
                 path = paths[current_index++];
@@ -420,10 +465,10 @@ namespace
             if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::UNION)
             {
                 if (auto cached_columns = tryGetColumnsFromCache({path}))
-                    return {nullptr, cached_columns};
+                    return {nullptr, cached_columns, format};
             }
 
-            return {createReadBuffer(path, file_stat, false, -1, compression_method, getContext()), std::nullopt};
+            return {createReadBuffer(path, file_stat, false, -1, compression_method, getContext()), std::nullopt, format};
         }
 
         void setNumRowsToLastFile(size_t num_rows) override
@@ -431,7 +476,7 @@ namespace
             if (!getContext()->getSettingsRef().use_cache_for_count_from_files)
                 return;
 
-            auto key = getKeyForSchemaCache(paths[current_index - 1], format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(paths[current_index - 1], *format, format_settings, getContext());
             StorageFile::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -443,7 +488,7 @@ namespace
 
             /// For union mode, schema can be different for different files, so we need to
             /// cache last inferred schema only for last processed file.
-            auto cache_key = getKeyForSchemaCache(paths[current_index - 1], format, format_settings, getContext());
+            auto cache_key = getKeyForSchemaCache(paths[current_index - 1], *format, format_settings, getContext());
             StorageFile::getSchemaCache(getContext()).addColumns(cache_key, columns);
         }
 
@@ -454,7 +499,7 @@ namespace
                 return;
 
             /// For default mode we cache resulting schema for all paths.
-            auto cache_keys = getKeysForSchemaCache(paths, format, format_settings, getContext());
+            auto cache_keys = getKeysForSchemaCache(paths, *format, format_settings, getContext());
             StorageFile::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
         }
 
@@ -465,14 +510,30 @@ namespace
             return "";
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            chassert(current_index > 0 && current_index <= paths.size());
+            auto path = paths[current_index - 1];
+            auto file_stat = getFileStat(path, false, -1, "File");
+            return createReadBuffer(path, file_stat, false, -1, compression_method, getContext());
+        }
+
     private:
         std::optional<ColumnsDescription> tryGetColumnsFromCache(const Strings & paths_)
         {
-            if (!getContext()->getSettingsRef().schema_inference_use_cache_for_file)
+            auto context = getContext();
+            if (!context->getSettingsRef().schema_inference_use_cache_for_file)
                 return std::nullopt;
 
             /// Check if the cache contains one of the paths.
-            auto & schema_cache = StorageFile::getSchemaCache(getContext());
+            auto & schema_cache = StorageFile::getSchemaCache(context);
             struct stat file_stat{};
             for (const auto & path : paths_)
             {
@@ -484,10 +545,28 @@ namespace
                     return file_stat.st_mtime;
                 };
 
-                auto cache_key = getKeyForSchemaCache(path, format, format_settings, getContext());
-                auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-                if (columns)
-                    return columns;
+                if (format)
+                {
+                    auto cache_key = getKeyForSchemaCache(path, *format, format_settings, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        return columns;
+                }
+                else
+                {
+                    /// If format is unknown, we can iterate through all possible input formats
+                    /// and check if we have an entry with this format and this file in schema cache.
+                    /// If we have such entry for some format, we can use this format to read the file.
+                    for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                    {
+                        auto cache_key = getKeyForSchemaCache(path, format_name, format_settings, context);
+                        if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        {
+                            /// Now format is known. It should be the same for all files.
+                            format = format_name;
+                            return columns;
+                        }
+                    }
+                }
             }
 
             return std::nullopt;
@@ -496,7 +575,7 @@ namespace
         const std::vector<String> & paths;
 
         size_t current_index = 0;
-        String format;
+        std::optional<String> format;
         String compression_method;
         const std::optional<FormatSettings> & format_settings;
     };
@@ -506,17 +585,17 @@ namespace
     public:
         ReadBufferFromArchiveIterator(
             const StorageFile::ArchiveInfo & archive_info_,
-            const String & format_,
+            std::optional<String> format_,
             const std::optional<FormatSettings> & format_settings_,
-            ContextPtr context_)
+            const ContextPtr & context_)
             : WithContext(context_)
             , archive_info(archive_info_)
-            , format(format_)
+            , format(std::move(format_))
             , format_settings(format_settings_)
         {
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
             /// For default mode check cached columns for all initial archive paths (maybe with globs) on first iteration.
             /// If we have cached columns, next() won't be called again.
@@ -524,8 +603,8 @@ namespace
             {
                 for (const auto & archive : archive_info.paths_to_archives)
                 {
-                    if (auto cached_columns = tryGetColumnsFromSchemaCache(archive, archive_info.path_in_archive))
-                        return {nullptr, cached_columns};
+                    if (auto cached_schema = tryGetSchemaFromCache(archive, fmt::format("{}::{}", archive, archive_info.path_in_archive)))
+                        return {nullptr, cached_schema, format};
                 }
             }
 
@@ -535,12 +614,19 @@ namespace
                 if (current_archive_index == archive_info.paths_to_archives.size())
                 {
                     if (is_first)
-                        throw Exception(
-                            ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                            "Cannot extract table structure from {} format file, because all files are empty. You must specify table structure manually",
-                            format);
+                    {
+                        if (format)
+                            throw Exception(
+                                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                                "The table structure cannot be extracted from a {} format file, because all files are empty. You can specify table structure manually",
+                                *format);
 
-                    return {nullptr, std::nullopt};
+                        throw Exception(
+                            ErrorCodes::CANNOT_DETECT_FORMAT,
+                            "The data format cannot be detected by the contents of the files, because all files are empty. You can specify the format manually");
+                    }
+
+                    return {nullptr, std::nullopt, format};
                 }
 
                 const auto & archive = archive_info.paths_to_archives[current_archive_index];
@@ -554,11 +640,18 @@ namespace
                         continue;
                     }
 
+                    if (format)
+                        throw Exception(
+                            ErrorCodes::CANNOT_DETECT_FORMAT,
+                            "The table structure cannot be extracted from a {} format file, because the archive {} is empty. "
+                            "You can specify table structure manually",
+                            *format,
+                            archive);
+
                     throw Exception(
-                        ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                        "Cannot extract table structure from {} format file, because the archive {} is empty. "
-                        "You must specify table structure manually",
-                        format,
+                        ErrorCodes::CANNOT_DETECT_FORMAT,
+                        "The data format cannot be detected by the contents of the files, because the archive {} is empty. "
+                        "You can specify the format manually",
                         archive);
                 }
 
@@ -574,8 +667,8 @@ namespace
                     last_read_file_path = paths_for_schema_cache.emplace_back(fmt::format("{}::{}", archive_reader->getPath(), archive_info.path_in_archive));
                     is_first = false;
 
-                    if (auto cached_columns = tryGetColumnsFromSchemaCache(archive, last_read_file_path))
-                        return {nullptr, cached_columns};
+                    if (auto cached_schema = tryGetSchemaFromCache(archive, last_read_file_path))
+                        return {nullptr, cached_schema, format};
                 }
                 else
                 {
@@ -611,13 +704,20 @@ namespace
                     last_read_file_path = paths_for_schema_cache.emplace_back(fmt::format("{}::{}", archive_reader->getPath(), *filename));
                     is_first = false;
 
-                    if (auto cached_columns = tryGetColumnsFromSchemaCache(archive, last_read_file_path))
+                    /// If format is unknown we can try to determine it by the file name.
+                    if (!format)
+                    {
+                        if (auto format_from_file = FormatFactory::instance().tryGetFormatFromFileName(*filename))
+                            format = format_from_file;
+                    }
+
+                    if (auto cached_schema = tryGetSchemaFromCache(archive, last_read_file_path))
                     {
                         /// For union mode next() will be called again even if we found cached columns,
                         /// so we need to remember last_read_buffer to continue iterating through files in archive.
                         if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::UNION)
                             last_read_buffer = archive_reader->readFile(std::move(file_enumerator));
-                        return {nullptr, cached_columns};
+                        return {nullptr, cached_schema, format};
                     }
 
                     read_buf = archive_reader->readFile(std::move(file_enumerator));
@@ -626,7 +726,7 @@ namespace
                 break;
             }
 
-            return {std::move(read_buf), std::nullopt};
+            return {std::move(read_buf), std::nullopt, format};
         }
 
         void setPreviousReadBuffer(std::unique_ptr<ReadBuffer> buffer) override
@@ -640,7 +740,7 @@ namespace
             if (!getContext()->getSettingsRef().use_cache_for_count_from_files)
                 return;
 
-            auto key = getKeyForSchemaCache(last_read_file_path, format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(last_read_file_path, *format, format_settings, getContext());
             StorageFile::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -653,7 +753,7 @@ namespace
             /// For union mode, schema can be different for different files in archive, so we need to
             /// cache last inferred schema only for last processed file.
             auto & schema_cache = StorageFile::getSchemaCache(getContext());
-            auto cache_key = getKeyForSchemaCache(last_read_file_path, format, format_settings, getContext());
+            auto cache_key = getKeyForSchemaCache(last_read_file_path, *format, format_settings, getContext());
             schema_cache.addColumns(cache_key, columns);
         }
 
@@ -669,17 +769,42 @@ namespace
             for (const auto & archive : archive_info.paths_to_archives)
                 paths_for_schema_cache.emplace_back(fmt::format("{}::{}", archive, archive_info.path_in_archive));
             auto & schema_cache = StorageFile::getSchemaCache(getContext());
-            auto cache_keys = getKeysForSchemaCache(paths_for_schema_cache, format, format_settings, getContext());
+            auto cache_keys = getKeysForSchemaCache(paths_for_schema_cache, *format, format_settings, getContext());
             schema_cache.addManyColumns(cache_keys, columns);
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
         String getLastFileName() const override
         {
             return last_read_file_path;
         }
 
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            if (archive_info.isSingleFileRead())
+            {
+                chassert(current_archive_index > 0 && current_archive_index <= archive_info.paths_to_archives.size());
+                const auto & archive = archive_info.paths_to_archives[current_archive_index - 1];
+                auto archive_reader = createArchiveReader(archive);
+                return archive_reader->readFile(archive_info.path_in_archive, false);
+            }
+
+            chassert(current_archive_index >= 0 && current_archive_index < archive_info.paths_to_archives.size());
+            const auto & archive = archive_info.paths_to_archives[current_archive_index];
+            auto archive_reader = createArchiveReader(archive);
+            chassert(last_read_buffer);
+            file_enumerator = archive_reader->currentFile(std::move(last_read_buffer));
+            return archive_reader->readFile(std::move(file_enumerator));
+        }
+
     private:
-        std::optional<ColumnsDescription> tryGetColumnsFromSchemaCache(const std::string & archive_path, const std::string & full_path)
+        std::optional<ColumnsDescription> tryGetSchemaFromCache(const std::string & archive_path, const std::string & full_path)
         {
             auto context = getContext();
             if (!context->getSettingsRef().schema_inference_use_cache_for_file)
@@ -695,11 +820,28 @@ namespace
                 return file_stat.st_mtime;
             };
 
-            auto cache_key = getKeyForSchemaCache(full_path, format, format_settings, context);
-            auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-
-            if (columns)
-                return columns;
+            if (format)
+            {
+                auto cache_key = getKeyForSchemaCache(full_path, *format, format_settings, context);
+                if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                    return columns;
+            }
+            else
+            {
+                /// If format is unknown, we can iterate through all possible input formats
+                /// and check if we have an entry with this format and this file in schema cache.
+                /// If we have such entry for some format, we can use this format to read the file.
+                for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                {
+                    auto cache_key = getKeyForSchemaCache(full_path, format_name, format_settings, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                    {
+                        /// Now format is known. It should be the same for all files.
+                        format = format_name;
+                        return columns;
+                    }
+                }
+            }
 
             return std::nullopt;
         }
@@ -715,13 +857,13 @@ namespace
         std::unique_ptr<IArchiveReader::FileEnumerator> file_enumerator;
         std::unique_ptr<ReadBuffer> last_read_buffer;
 
-        String format;
+        std::optional<String> format;
         const std::optional<FormatSettings> & format_settings;
         std::vector<std::string> paths_for_schema_cache;
     };
 }
 
-ColumnsDescription StorageFile::getTableStructureFromFileDescriptor(ContextPtr context)
+std::pair<ColumnsDescription, String> StorageFile::getTableStructureAndFormatFromFileDescriptor(std::optional<String> format, const ContextPtr & context)
 {
     /// If we want to read schema from file descriptor we should create
     /// a read buffer from fd, create a checkpoint, read some data required
@@ -738,22 +880,29 @@ ColumnsDescription StorageFile::getTableStructureFromFileDescriptor(ContextPtr c
     read_buf->setCheckpoint();
     auto read_buffer_iterator = SingleReadBufferIterator(std::move(read_buf));
 
-    auto columns = readSchemaFromFormat(format_name, format_settings, read_buffer_iterator, false, context, peekable_read_buffer_from_fd);
+    ColumnsDescription columns;
+    if (format)
+        columns = readSchemaFromFormat(*format, format_settings, read_buffer_iterator, context);
+    else
+        std::tie(columns, format) = detectFormatAndReadSchema(format_settings, read_buffer_iterator, context);
+
+    peekable_read_buffer_from_fd = read_buffer_iterator.releaseBuffer();
     if (peekable_read_buffer_from_fd)
     {
         /// If we have created read buffer in readSchemaFromFormat we should rollback to checkpoint.
         assert_cast<PeekableReadBuffer *>(peekable_read_buffer_from_fd.get())->rollbackToCheckpoint();
         has_peekable_read_buffer_from_fd = true;
     }
-    return columns;
+
+    return {columns, *format};
 }
 
-ColumnsDescription StorageFile::getTableStructureFromFile(
-    const String & format,
+std::pair<ColumnsDescription, String> StorageFile::getTableStructureAndFormatFromFileImpl(
+    std::optional<String> format,
     const std::vector<String> & paths,
     const String & compression_method,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr context,
+    const ContextPtr & context,
     const std::optional<ArchiveInfo> & archive_info)
 {
     if (format == "Distributed")
@@ -761,29 +910,60 @@ ColumnsDescription StorageFile::getTableStructureFromFile(
         if (paths.empty())
             throw Exception(ErrorCodes::INCORRECT_FILE_NAME, "Cannot get table structure from file, because no files match specified name");
 
-        return ColumnsDescription(DistributedAsyncInsertSource(paths[0]).getOutputs().front().getHeader().getNamesAndTypesList());
+        return {ColumnsDescription(DistributedAsyncInsertSource(paths[0]).getOutputs().front().getHeader().getNamesAndTypesList()), *format};
     }
 
     if (((archive_info && archive_info->paths_to_archives.empty()) || (!archive_info && paths.empty()))
-        && !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(format))
+        && (!format || !FormatFactory::instance().checkIfFormatHasExternalSchemaReader(*format)))
+    {
+        if (format)
+            throw Exception(
+                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                "The table structure cannot be extracted from a {} format file, because there are no files with provided path. "
+                "You can specify table structure manually", *format);
+
         throw Exception(
             ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-            "Cannot extract table structure from {} format file, because there are no files with provided path. "
-            "You must specify table structure manually", format);
+            "The data format cannot be detected by the contents of the files, because there are no files with provided path. "
+            "You can specify the format manually");
+
+    }
 
     if (archive_info)
     {
         ReadBufferFromArchiveIterator read_buffer_iterator(*archive_info, format, format_settings, context);
-        return readSchemaFromFormat(
-            format,
-            format_settings,
-            read_buffer_iterator,
-            /*retry=*/archive_info->paths_to_archives.size() > 1 || !archive_info->isSingleFileRead(),
-            context);
+        if (format)
+            return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, context), *format};
+
+        return detectFormatAndReadSchema(format_settings, read_buffer_iterator, context);
     }
 
     ReadBufferFromFileIterator read_buffer_iterator(paths, format, compression_method, format_settings, context);
-    return readSchemaFromFormat(format, format_settings, read_buffer_iterator, paths.size() > 1, context);
+    if (format)
+        return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, context), *format};
+
+    return detectFormatAndReadSchema(format_settings, read_buffer_iterator, context);
+}
+
+ColumnsDescription StorageFile::getTableStructureFromFile(
+    const DB::String & format,
+    const std::vector<String> & paths,
+    const DB::String & compression_method,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context,
+    const std::optional<ArchiveInfo> & archive_info)
+{
+    return getTableStructureAndFormatFromFileImpl(format, paths, compression_method, format_settings, context, archive_info).first;
+}
+
+std::pair<ColumnsDescription, String> StorageFile::getTableStructureAndFormatFromFile(
+    const std::vector<String> & paths,
+    const DB::String & compression_method,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context,
+    const std::optional<ArchiveInfo> & archive_info)
+{
+    return getTableStructureAndFormatFromFileImpl(std::nullopt, paths, compression_method, format_settings, context, archive_info);
 }
 
 bool StorageFile::supportsSubsetOfColumns(const ContextPtr & context) const
@@ -874,7 +1054,7 @@ StorageFile::StorageFile(CommonArguments args)
     , compression_method(args.compression_method)
     , base_path(args.getContext()->getPath())
 {
-    if (format_name != "Distributed")
+    if (format_name != "Distributed" && format_name != "auto")
         FormatFactory::instance().checkFormatName(format_name);
 }
 
@@ -886,16 +1066,19 @@ void StorageFile::setStorageMetadata(CommonArguments args)
     {
         ColumnsDescription columns;
         if (use_table_fd)
-            columns = getTableStructureFromFileDescriptor(args.getContext());
+        {
+            if (format_name == "auto")
+                std::tie(columns, format_name) = getTableStructureAndFormatFromFileDescriptor(std::nullopt, args.getContext());
+            else
+                columns = getTableStructureAndFormatFromFileDescriptor(format_name, args.getContext()).first;
+        }
         else
         {
-            columns = getTableStructureFromFile(
-                format_name,
-                paths,
-                compression_method,
-                format_settings,
-                args.getContext(),
-                archive_info);
+            if (format_name == "auto")
+                std::tie(columns, format_name) = getTableStructureAndFormatFromFile(paths, compression_method, format_settings, args.getContext(), archive_info);
+            else
+                columns = getTableStructureFromFile(format_name, paths, compression_method, format_settings, args.getContext(), archive_info);
+
             if (!args.columns.empty() && args.columns != columns)
                 throw Exception(ErrorCodes::INCOMPATIBLE_COLUMNS, "Table structure and file structure are different");
         }
@@ -903,6 +1086,8 @@ void StorageFile::setStorageMetadata(CommonArguments args)
     }
     else
     {
+        if (format_name == "auto")
+            format_name = getTableStructureAndFormatFromFile(paths, compression_method, format_settings, args.getContext(), archive_info).second;
         /// We don't allow special columns in File storage.
         if (!args.columns.hasOnlyOrdinary())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table engine File doesn't support special columns like MATERIALIZED, ALIAS or EPHEMERAL");
@@ -912,12 +1097,11 @@ void StorageFile::setStorageMetadata(CommonArguments args)
     storage_metadata.setConstraints(args.constraints);
     storage_metadata.setComment(args.comment);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 
-static std::chrono::seconds getLockTimeout(ContextPtr context)
+static std::chrono::seconds getLockTimeout(const ContextPtr & context)
 {
     const Settings & settings = context->getSettingsRef();
     Int64 lock_timeout = settings.lock_acquire_timeout.totalSeconds();
@@ -933,9 +1117,9 @@ StorageFileSource::FilesIterator::FilesIterator(
     std::optional<StorageFile::ArchiveInfo> archive_info_,
     const ActionsDAG::Node * predicate,
     const NamesAndTypesList & virtual_columns,
-    ContextPtr context_,
+    const ContextPtr & context_,
     bool distributed_processing_)
-    : files(files_), archive_info(std::move(archive_info_)), distributed_processing(distributed_processing_), context(context_)
+    : WithContext(context_), files(files_), archive_info(std::move(archive_info_)), distributed_processing(distributed_processing_)
 {
     ActionsDAGPtr filter_dag;
     if (!distributed_processing && !archive_info && !files.empty())
@@ -948,7 +1132,7 @@ StorageFileSource::FilesIterator::FilesIterator(
 String StorageFileSource::FilesIterator::next()
 {
     if (distributed_processing)
-        return context->getReadTaskCallback()();
+        return getContext()->getReadTaskCallback()();
     else
     {
         const auto & fs = isReadFromArchive() ? archive_info->paths_to_archives : files;
@@ -972,12 +1156,12 @@ const String & StorageFileSource::FilesIterator::getFileNameInArchive()
 StorageFileSource::StorageFileSource(
     const ReadFromFormatInfo & info,
     std::shared_ptr<StorageFile> storage_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     UInt64 max_block_size_,
     FilesIteratorPtr files_iterator_,
     std::unique_ptr<ReadBuffer> read_buf_,
     bool need_only_count_)
-    : SourceWithKeyCondition(info.source_header, false)
+    : SourceWithKeyCondition(info.source_header, false), WithContext(context_)
     , storage(std::move(storage_))
     , files_iterator(std::move(files_iterator_))
     , read_buf(std::move(read_buf_))
@@ -985,13 +1169,12 @@ StorageFileSource::StorageFileSource(
     , requested_columns(info.requested_columns)
     , requested_virtual_columns(info.requested_virtual_columns)
     , block_for_format(info.format_header)
-    , context(context_)
     , max_block_size(max_block_size_)
     , need_only_count(need_only_count_)
 {
     if (!storage->use_table_fd)
     {
-        shared_lock = std::shared_lock(storage->rwlock, getLockTimeout(context));
+        shared_lock = std::shared_lock(storage->rwlock, getLockTimeout(getContext()));
         if (!shared_lock)
             throw Exception(ErrorCodes::TIMEOUT_EXCEEDED, "Lock timeout exceeded");
         storage->readers_counter.fetch_add(1, std::memory_order_release);
@@ -1008,7 +1191,7 @@ void StorageFileSource::beforeDestroy()
     if (std::uncaught_exceptions() == 0 && cnt == 1 && !storage->was_renamed)
     {
         shared_lock.unlock();
-        auto exclusive_lock = std::unique_lock{storage->rwlock, getLockTimeout(context)};
+        auto exclusive_lock = std::unique_lock{storage->rwlock, getLockTimeout(getContext())};
 
         if (!exclusive_lock)
             return;
@@ -1027,7 +1210,7 @@ void StorageFileSource::beforeDestroy()
                 file_path = file_path.lexically_normal();
 
                 // Checking access rights
-                checkCreationIsAllowed(context, context->getUserFilesPath(), file_path, true);
+                checkCreationIsAllowed(getContext(), getContext()->getUserFilesPath(), file_path, true);
 
                 // Checking an existing of new file
                 if (fs::exists(file_path))
@@ -1040,7 +1223,7 @@ void StorageFileSource::beforeDestroy()
             catch (const std::exception & e)
             {
                 // Cannot throw exception from destructor, will write only error
-                LOG_ERROR(&Poco::Logger::get("~StorageFileSource"), "Failed to rename file {}: {}", file_path_ref, e.what());
+                LOG_ERROR(getLogger("~StorageFileSource"), "Failed to rename file {}: {}", file_path_ref, e.what());
                 continue;
             }
         }
@@ -1052,15 +1235,15 @@ StorageFileSource::~StorageFileSource()
     beforeDestroy();
 }
 
-void StorageFileSource::setKeyCondition(const ActionsDAG::NodeRawConstPtrs & nodes, ContextPtr context_)
+void StorageFileSource::setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_)
 {
-    setKeyConditionImpl(nodes, context_, block_for_format);
+    setKeyConditionImpl(filter_actions_dag, context_, block_for_format);
 }
 
 
 bool StorageFileSource::tryGetCountFromCache(const struct stat & file_stat)
 {
-    if (!context->getSettingsRef().use_cache_for_count_from_files)
+    if (!getContext()->getSettingsRef().use_cache_for_count_from_files)
         return false;
 
     auto num_rows_from_cache = tryGetNumRowsFromCache(current_path, file_stat.st_mtime);
@@ -1102,7 +1285,7 @@ Chunk StorageFileSource::generate()
                             return {};
 
                         auto file_stat = getFileStat(archive, storage->use_table_fd, storage->table_fd, storage->getName());
-                        if (context->getSettingsRef().engine_file_skip_empty_files && file_stat.st_size == 0)
+                        if (getContext()->getSettingsRef().engine_file_skip_empty_files && file_stat.st_size == 0)
                             continue;
 
                         archive_reader = createArchiveReader(archive);
@@ -1116,7 +1299,7 @@ Chunk StorageFileSource::generate()
                         if (!read_buf)
                             continue;
 
-                        if (auto progress_callback = context->getFileProgressCallback())
+                        if (auto progress_callback = getContext()->getFileProgressCallback())
                             progress_callback(FileProgress(0, tryGetFileSizeFromReadBuffer(*read_buf).value_or(0)));
                     }
                     else
@@ -1130,7 +1313,7 @@ Chunk StorageFileSource::generate()
                                     return {};
 
                                 current_archive_stat = getFileStat(archive, storage->use_table_fd, storage->table_fd, storage->getName());
-                                if (context->getSettingsRef().engine_file_skip_empty_files && current_archive_stat.st_size == 0)
+                                if (getContext()->getSettingsRef().engine_file_skip_empty_files && current_archive_stat.st_size == 0)
                                     continue;
 
                                 archive_reader = createArchiveReader(archive);
@@ -1164,7 +1347,7 @@ Chunk StorageFileSource::generate()
                             continue;
 
                         read_buf = archive_reader->readFile(std::move(file_enumerator));
-                        if (auto progress_callback = context->getFileProgressCallback())
+                        if (auto progress_callback = getContext()->getFileProgressCallback())
                             progress_callback(FileProgress(0, tryGetFileSizeFromReadBuffer(*read_buf).value_or(0)));
                     }
                 }
@@ -1190,16 +1373,16 @@ Chunk StorageFileSource::generate()
                 file_stat = getFileStat(current_path, storage->use_table_fd, storage->table_fd, storage->getName());
                 current_file_size = file_stat.st_size;
 
-                if (context->getSettingsRef().engine_file_skip_empty_files && file_stat.st_size == 0)
+                if (getContext()->getSettingsRef().engine_file_skip_empty_files && file_stat.st_size == 0)
                     continue;
 
                 if (need_only_count && tryGetCountFromCache(file_stat))
                     continue;
 
-                read_buf = createReadBuffer(current_path, file_stat, storage->use_table_fd, storage->table_fd, storage->compression_method, context);
+                read_buf = createReadBuffer(current_path, file_stat, storage->use_table_fd, storage->table_fd, storage->compression_method, getContext());
             }
 
-            const Settings & settings = context->getSettingsRef();
+            const Settings & settings = getContext()->getSettingsRef();
 
             size_t file_num = 0;
             if (storage->archive_info)
@@ -1211,7 +1394,7 @@ Chunk StorageFileSource::generate()
 
             const auto max_parsing_threads = std::max<size_t>(settings.max_threads / file_num, 1UL);
             input_format = FormatFactory::instance().getInput(
-                storage->format_name, *read_buf, block_for_format, context, max_block_size, storage->format_settings,
+                storage->format_name, *read_buf, block_for_format, getContext(), max_block_size, storage->format_settings,
                 max_parsing_threads, std::nullopt, /*is_remote_fs*/ false, CompressionMethod::None, need_only_count);
 
             if (key_condition)
@@ -1227,7 +1410,7 @@ Chunk StorageFileSource::generate()
             {
                 builder.addSimpleTransform([&](const Block & header)
                 {
-                    return std::make_shared<AddingDefaultsTransform>(header, columns_description, *input_format, context);
+                    return std::make_shared<AddingDefaultsTransform>(header, columns_description, *input_format, getContext());
                 });
             }
 
@@ -1264,7 +1447,7 @@ Chunk StorageFileSource::generate()
         if (storage->use_table_fd)
             finished_generate = true;
 
-        if (input_format && storage->format_name != "Distributed" && context->getSettingsRef().use_cache_for_count_from_files)
+        if (input_format && storage->format_name != "Distributed" && getContext()->getSettingsRef().use_cache_for_count_from_files)
             addNumRowsToCache(current_path, total_rows_in_file);
 
         total_rows_in_file = 0;
@@ -1295,14 +1478,14 @@ Chunk StorageFileSource::generate()
 
 void StorageFileSource::addNumRowsToCache(const String & path, size_t num_rows) const
 {
-    auto key = getKeyForSchemaCache(path, storage->format_name, storage->format_settings, context);
-    StorageFile::getSchemaCache(context).addNumRows(key, num_rows);
+    auto key = getKeyForSchemaCache(path, storage->format_name, storage->format_settings, getContext());
+    StorageFile::getSchemaCache(getContext()).addNumRows(key, num_rows);
 }
 
 std::optional<size_t> StorageFileSource::tryGetNumRowsFromCache(const String & path, time_t last_mod_time) const
 {
-    auto & schema_cache = StorageFile::getSchemaCache(context);
-    auto key = getKeyForSchemaCache(path, storage->format_name, storage->format_settings, context);
+    auto & schema_cache = StorageFile::getSchemaCache(getContext());
+    auto key = getKeyForSchemaCache(path, storage->format_name, storage->format_settings, getContext());
     auto get_last_mod_time = [&]() -> std::optional<time_t>
     {
         return last_mod_time;
@@ -1316,21 +1499,23 @@ class ReadFromFile : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromFile"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromFile(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         std::shared_ptr<StorageFile> storage_,
         ReadFromFormatInfo info_,
         const bool need_only_count_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , storage(std::move(storage_))
         , info(std::move(info_))
         , need_only_count(need_only_count_)
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , max_num_streams(num_streams_)
     {
@@ -1341,7 +1526,6 @@ private:
     ReadFromFormatInfo info;
     const bool need_only_count;
 
-    ContextPtr context;
     size_t max_block_size;
     const size_t max_num_streams;
 
@@ -1350,9 +1534,9 @@ private:
     void createIterator(const ActionsDAG::Node * predicate);
 };
 
-void ReadFromFile::applyFilters()
+void ReadFromFile::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -1396,16 +1580,19 @@ void StorageFile::read(
 
     auto this_ptr = std::static_pointer_cast<StorageFile>(shared_from_this());
 
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(context));
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && context->getSettingsRef().optimize_count_from_files;
 
     auto reading = std::make_unique<ReadFromFile>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        context,
         read_from_format_info.source_header,
         std::move(this_ptr),
         std::move(read_from_format_info),
         need_only_count,
-        context,
         max_block_size,
         num_streams);
 
@@ -1421,7 +1608,7 @@ void ReadFromFile::createIterator(const ActionsDAG::Node * predicate)
         storage->paths,
         storage->archive_info,
         predicate,
-        storage->virtual_columns,
+        storage->getVirtualsList(),
         context,
         storage->distributed_processing);
 }
@@ -1444,8 +1631,10 @@ void ReadFromFile::initializePipeline(QueryPipelineBuilder & pipeline, const Bui
     Pipes pipes;
     pipes.reserve(num_streams);
 
+    auto ctx = getContext();
+
     /// Set total number of bytes to process. For progress bar.
-    auto progress_callback = context->getFileProgressCallback();
+    auto progress_callback = ctx->getFileProgressCallback();
 
     if (progress_callback && !storage->archive_info)
         progress_callback(FileProgress(0, storage->total_bytes_to_read));
@@ -1463,20 +1652,20 @@ void ReadFromFile::initializePipeline(QueryPipelineBuilder & pipeline, const Bui
         auto source = std::make_shared<StorageFileSource>(
             info,
             storage,
-            context,
+            ctx,
             max_block_size,
             files_iterator,
             std::move(read_buffer),
             need_only_count);
 
-        source->setKeyCondition(filter_nodes.nodes, context);
+        source->setKeyCondition(filter_actions_dag, ctx);
         pipes.emplace_back(std::move(source));
     }
 
     auto pipe = Pipe::unitePipes(std::move(pipes));
     size_t output_ports = pipe.numOutputPorts();
-    const bool parallelize_output = context->getSettingsRef().parallelize_output_from_storages;
-    if (parallelize_output && storage->parallelizeOutputAfterReading(context) && output_ports > 0 && output_ports < max_num_streams)
+    const bool parallelize_output = ctx->getSettingsRef().parallelize_output_from_storages;
+    if (parallelize_output && storage->parallelizeOutputAfterReading(ctx) && output_ports > 0 && output_ports < max_num_streams)
         pipe.resize(max_num_streams);
 
     if (pipe.empty())
@@ -1489,7 +1678,7 @@ void ReadFromFile::initializePipeline(QueryPipelineBuilder & pipeline, const Bui
 }
 
 
-class StorageFileSink final : public SinkToStorage
+class StorageFileSink final : public SinkToStorage, WithContext
 {
 public:
     StorageFileSink(
@@ -1502,9 +1691,9 @@ public:
         const CompressionMethod compression_method_,
         const std::optional<FormatSettings> & format_settings_,
         const String format_name_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         int flags_)
-        : SinkToStorage(metadata_snapshot_->getSampleBlock())
+        : SinkToStorage(metadata_snapshot_->getSampleBlock()), WithContext(context_)
         , metadata_snapshot(metadata_snapshot_)
         , table_name_for_log(table_name_for_log_)
         , table_fd(table_fd_)
@@ -1514,7 +1703,6 @@ public:
         , compression_method(compression_method_)
         , format_name(format_name_)
         , format_settings(format_settings_)
-        , context(context_)
         , flags(flags_)
     {
         initialize();
@@ -1531,9 +1719,9 @@ public:
         const CompressionMethod compression_method_,
         const std::optional<FormatSettings> & format_settings_,
         const String format_name_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         int flags_)
-        : SinkToStorage(metadata_snapshot_->getSampleBlock())
+        : SinkToStorage(metadata_snapshot_->getSampleBlock()), WithContext(context_)
         , metadata_snapshot(metadata_snapshot_)
         , table_name_for_log(table_name_for_log_)
         , table_fd(table_fd_)
@@ -1543,7 +1731,6 @@ public:
         , compression_method(compression_method_)
         , format_name(format_name_)
         , format_settings(format_settings_)
-        , context(context_)
         , flags(flags_)
         , lock(std::move(lock_))
     {
@@ -1554,7 +1741,7 @@ public:
 
     void initialize()
     {
-        std::unique_ptr<WriteBufferFromFileDescriptor> naked_buffer = nullptr;
+        std::unique_ptr<WriteBufferFromFileDescriptor> naked_buffer;
         if (use_table_fd)
         {
             naked_buffer = std::make_unique<WriteBufferFromFileDescriptor>(table_fd, DBMS_DEFAULT_BUFFER_SIZE);
@@ -1567,7 +1754,7 @@ public:
 
         /// In case of formats with prefixes if file is not empty we have already written prefix.
         bool do_not_write_prefix = naked_buffer->size();
-        const auto & settings = context->getSettingsRef();
+        const auto & settings = getContext()->getSettingsRef();
         write_buf = wrapWriteBufferWithCompressionMethod(
             std::move(naked_buffer),
             compression_method,
@@ -1575,7 +1762,7 @@ public:
             static_cast<int>(settings.output_format_compression_zstd_window_log));
 
         writer = FormatFactory::instance().getOutputFormatParallelIfPossible(format_name,
-                                                                             *write_buf, metadata_snapshot->getSampleBlock(), context, format_settings);
+                                                                             *write_buf, metadata_snapshot->getSampleBlock(), getContext(), format_settings);
 
         if (do_not_write_prefix)
             writer->doNotWritePrefix();
@@ -1658,7 +1845,6 @@ private:
     std::string format_name;
     std::optional<FormatSettings> format_settings;
 
-    ContextPtr context;
     int flags;
     std::unique_lock<std::shared_timed_mutex> lock;
 
@@ -2043,7 +2229,7 @@ StorageFile::ArchiveInfo StorageFile::getArchiveInfo(
     const std::string & path_to_archive,
     const std::string & file_in_archive,
     const std::string & user_files_path,
-    ContextPtr context,
+    const ContextPtr & context,
     size_t & total_bytes_to_read
 )
 {
@@ -2069,9 +2255,4 @@ StorageFile::ArchiveInfo StorageFile::getArchiveInfo(
     return archive_info;
 }
 
-Names StorageFile::getVirtualColumnNames()
-{
-    return VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage({}).getNames();
-}
-
 }
diff --git a/src/Storages/StorageFile.h b/src/Storages/StorageFile.h
index b74868597a6..945ee4f369f 100644
--- a/src/Storages/StorageFile.h
+++ b/src/Storages/StorageFile.h
@@ -80,11 +80,7 @@ public:
     bool storesDataOnDisk() const override;
     Strings getDataPaths() const override;
 
-    NamesAndTypesList getVirtuals() const override { return virtual_columns; }
-
-    static Names getVirtualColumnNames();
-
-    static Strings getPathsList(const String & table_path, const String & user_files_path, ContextPtr context, size_t & total_bytes_to_read);
+    static Strings getPathsList(const String & table_path, const String & user_files_path, const ContextPtr & context, size_t & total_bytes_to_read);
 
     /// Check if the format supports reading only some subset of columns.
     /// Is is useful because such formats could effectively skip unknown columns
@@ -112,14 +108,19 @@ public:
         }
     };
 
-    ColumnsDescription getTableStructureFromFileDescriptor(ContextPtr context);
-
     static ColumnsDescription getTableStructureFromFile(
         const String & format,
         const std::vector<String> & paths,
         const String & compression_method,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr context,
+        const ContextPtr & context,
+        const std::optional<ArchiveInfo> & archive_info = std::nullopt);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromFile(
+        const std::vector<String> & paths,
+        const String & compression_method,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context,
         const std::optional<ArchiveInfo> & archive_info = std::nullopt);
 
     static SchemaCache & getSchemaCache(const ContextPtr & context);
@@ -130,10 +131,10 @@ public:
         const std::string & path_to_archive,
         const std::string & file_in_archive,
         const std::string & user_files_path,
-        ContextPtr context,
+        const ContextPtr & context,
         size_t & total_bytes_to_read);
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 protected:
     friend class StorageFileSource;
@@ -141,6 +142,16 @@ protected:
     friend class ReadFromFile;
 
 private:
+    std::pair<ColumnsDescription, String> getTableStructureAndFormatFromFileDescriptor(std::optional<String> format, const ContextPtr & context);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromFileImpl(
+        std::optional<String> format,
+        const std::vector<String> & paths,
+        const String & compression_method,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context,
+        const std::optional<ArchiveInfo> & archive_info = std::nullopt);
+
     void setStorageMetadata(CommonArguments args);
 
     std::string format_name;
@@ -163,7 +174,7 @@ private:
 
     mutable std::shared_timed_mutex rwlock;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageFile");
+    LoggerPtr log = getLogger("StorageFile");
 
     /// Total number of bytes to read (sums for multiple files in case of globs). Needed for progress bar.
     size_t total_bytes_to_read = 0;
@@ -182,15 +193,13 @@ private:
     std::atomic<int32_t> readers_counter = 0;
     FileRenamer file_renamer;
     bool was_renamed = false;
-
-    NamesAndTypesList virtual_columns;
     bool distributed_processing = false;
 };
 
-class StorageFileSource : public SourceWithKeyCondition
+class StorageFileSource : public SourceWithKeyCondition, WithContext
 {
 public:
-    class FilesIterator
+    class FilesIterator : WithContext
     {
     public:
         explicit FilesIterator(
@@ -198,7 +207,7 @@ public:
             std::optional<StorageFile::ArchiveInfo> archive_info_,
             const ActionsDAG::Node * predicate,
             const NamesAndTypesList & virtual_columns,
-            ContextPtr context_,
+            const ContextPtr & context_,
             bool distributed_processing_ = false);
 
         String next();
@@ -227,8 +236,6 @@ private:
         std::atomic<size_t> index = 0;
 
         bool distributed_processing;
-
-        ContextPtr context;
     };
 
     using FilesIteratorPtr = std::shared_ptr<FilesIterator>;
@@ -236,7 +243,7 @@ private:
     StorageFileSource(
         const ReadFromFormatInfo & info,
         std::shared_ptr<StorageFile> storage_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         UInt64 max_block_size_,
         FilesIteratorPtr files_iterator_,
         std::unique_ptr<ReadBuffer> read_buf_,
@@ -256,7 +263,7 @@ private:
         return storage->getName();
     }
 
-    void setKeyCondition(const ActionsDAG::NodeRawConstPtrs & nodes, ContextPtr context_) override;
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override;
 
     bool tryGetCountFromCache(const struct stat & file_stat);
 
@@ -279,14 +286,13 @@ private:
     std::unique_ptr<PullingPipelineExecutor> reader;
 
     std::shared_ptr<IArchiveReader> archive_reader;
-    std::unique_ptr<IArchiveReader::FileEnumerator> file_enumerator = nullptr;
+    std::unique_ptr<IArchiveReader::FileEnumerator> file_enumerator;
 
     ColumnsDescription columns_description;
     NamesAndTypesList requested_columns;
     NamesAndTypesList requested_virtual_columns;
     Block block_for_format;
 
-    ContextPtr context;    /// TODO Untangle potential issues with context lifetime.
     UInt64 max_block_size;
 
     bool finished_generate = false;
diff --git a/src/Storages/StorageFileCluster.cpp b/src/Storages/StorageFileCluster.cpp
index c12124f1e07..d43e242f70c 100644
--- a/src/Storages/StorageFileCluster.cpp
+++ b/src/Storages/StorageFileCluster.cpp
@@ -25,55 +25,58 @@ extern const int LOGICAL_ERROR;
 }
 
 StorageFileCluster::StorageFileCluster(
-    ContextPtr context_,
+    const ContextPtr & context,
     const String & cluster_name_,
     const String & filename_,
     const String & format_name_,
-    const String & compression_method_,
+    const String & compression_method,
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
-    const ConstraintsDescription & constraints_,
-    bool structure_argument_was_provided_)
-    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageFileCluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
+    const ConstraintsDescription & constraints_)
+    : IStorageCluster(cluster_name_, table_id_, getLogger("StorageFileCluster (" + table_id_.table_name + ")"))
     , filename(filename_)
     , format_name(format_name_)
-    , compression_method(compression_method_)
 {
     StorageInMemoryMetadata storage_metadata;
 
     size_t total_bytes_to_read; // its value isn't used as we are not reading files (just listing them). But it is required by getPathsList
-    paths = StorageFile::getPathsList(filename_, context_->getUserFilesPath(), context_, total_bytes_to_read);
+    paths = StorageFile::getPathsList(filename_, context->getUserFilesPath(), context, total_bytes_to_read);
 
     if (columns_.empty())
     {
-        auto columns = StorageFile::getTableStructureFromFile(format_name,
-                                                             paths,
-                                                             compression_method,
-                                                             std::nullopt,
-                                                             context_);
+        ColumnsDescription columns;
+        if (format_name == "auto")
+            std::tie(columns, format_name) = StorageFile::getTableStructureAndFormatFromFile(paths, compression_method, std::nullopt, context);
+        else
+            columns = StorageFile::getTableStructureFromFile(format_name, paths, compression_method, std::nullopt, context);
+
         storage_metadata.setColumns(columns);
     }
     else
+    {
+        if (format_name == "auto")
+            format_name = StorageFile::getTableStructureAndFormatFromFile(paths, compression_method, std::nullopt, context).second;
         storage_metadata.setColumns(columns_);
+    }
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
-void StorageFileCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+void StorageFileCluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const DB::ContextPtr & context)
 {
     ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
     if (!expression_list)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function fileCluster, got '{}'", queryToString(query));
 
-    TableFunctionFileCluster::addColumnsStructureToArguments(expression_list->children, structure, context);
+    TableFunctionFileCluster::updateStructureAndFormatArgumentsIfNeeded(
+        expression_list->children, storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(), format_name, context);
 }
 
 RemoteQueryExecutor::Extension StorageFileCluster::getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const
 {
-    auto iterator = std::make_shared<StorageFileSource::FilesIterator>(paths, std::nullopt, predicate, virtual_columns, context);
+    auto iterator = std::make_shared<StorageFileSource::FilesIterator>(paths, std::nullopt, predicate, getVirtualsList(), context);
     auto callback = std::make_shared<TaskIterator>([iter = std::move(iterator)]() mutable -> String { return iter->next(); });
     return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
 }
diff --git a/src/Storages/StorageFileCluster.h b/src/Storages/StorageFileCluster.h
index a6e57c3bb4f..973d595bbf0 100644
--- a/src/Storages/StorageFileCluster.h
+++ b/src/Storages/StorageFileCluster.h
@@ -17,34 +17,29 @@ class StorageFileCluster : public IStorageCluster
 {
 public:
     StorageFileCluster(
-        ContextPtr context_,
+        const ContextPtr & context_,
         const String & cluster_name_,
         const String & filename_,
         const String & format_name_,
         const String & compression_method_,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
-        const ConstraintsDescription & constraints_,
-        bool structure_argument_was_provided_);
+        const ConstraintsDescription & constraints_);
 
     std::string getName() const override { return "FileCluster"; }
 
-    NamesAndTypesList getVirtuals() const override { return virtual_columns; }
-
     RemoteQueryExecutor::Extension getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
     bool supportsSubcolumns() const override { return true; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
-    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+    void updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context) override;
 
     Strings paths;
     String filename;
     String format_name;
-    String compression_method;
-    NamesAndTypesList virtual_columns;
 };
 
 }
diff --git a/src/Storages/StorageFuzzJSON.cpp b/src/Storages/StorageFuzzJSON.cpp
index 87790dd2fdc..fbfc67f4c7c 100644
--- a/src/Storages/StorageFuzzJSON.cpp
+++ b/src/Storages/StorageFuzzJSON.cpp
@@ -364,7 +364,7 @@ JSONNode & fuzzSingleJSONNode(JSONNode & n, const StorageFuzzJSON::Configuration
 
     if (val.fixed)
         val.fixed = generateRandomFixedValue(config, rnd);
-    else if (val.array && val.array->size() < config.max_array_size && node_count + val.array->size() < config.value_number_limit)
+    else if (val.array && val.array->size() < config.max_array_size && node_count + val.array->size() < StorageFuzzJSON::Configuration::value_number_limit)
     {
         if (val.array->empty())
             val.array->push_back(generateRandomJSONNode(config, rnd, /*with_key*/ false, depth));
@@ -377,7 +377,7 @@ JSONNode & fuzzSingleJSONNode(JSONNode & n, const StorageFuzzJSON::Configuration
         }
         ++node_count;
     }
-    else if (val.object && val.object->size() < config.max_object_size && node_count + val.object->size() < config.value_number_limit)
+    else if (val.object && val.object->size() < config.max_object_size && node_count + val.object->size() < StorageFuzzJSON::Configuration::value_number_limit)
     {
         val.object->push_back(generateRandomJSONNode(config, rnd, /*with_key*/ true, depth));
         ++node_count;
@@ -437,7 +437,7 @@ void fuzzJSONObject(
         bool first = true;
         for (const auto & ptr : node_list)
         {
-            if (node_count >= config.value_number_limit)
+            if (node_count >= StorageFuzzJSON::Configuration::value_number_limit)
                 break;
 
             WriteBufferFromOwnString child_out;
@@ -619,11 +619,11 @@ void StorageFuzzJSON::processNamedCollectionResult(Configuration & configuration
     {
         configuration.max_output_length = collection.get<UInt64>("max_output_length");
 
-        if (configuration.max_output_length < 2 || configuration.max_output_length > configuration.output_length_limit)
+        if (configuration.max_output_length < 2 || configuration.max_output_length > StorageFuzzJSON::Configuration::output_length_limit)
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS,
                 "The value of the 'max_output_length' argument must be within the interval [2, {}.]",
-                configuration.output_length_limit);
+                StorageFuzzJSON::Configuration::output_length_limit);
     }
 
     if (collection.has("max_nesting_level"))
@@ -638,11 +638,11 @@ void StorageFuzzJSON::processNamedCollectionResult(Configuration & configuration
     if (collection.has("max_string_value_length"))
     {
         auto max_string_value_length = collection.get<UInt64>("max_string_value_length");
-        if (max_string_value_length > configuration.output_length_limit)
+        if (max_string_value_length > StorageFuzzJSON::Configuration::output_length_limit)
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS,
                 "The value of the 'max_string_value_length' argument must be at most {}.",
-                configuration.output_length_limit);
+                StorageFuzzJSON::Configuration::output_length_limit);
 
         configuration.max_string_value_length = std::min(max_string_value_length, configuration.max_output_length);
     }
@@ -650,11 +650,11 @@ void StorageFuzzJSON::processNamedCollectionResult(Configuration & configuration
     if (collection.has("max_key_length"))
     {
         auto max_key_length = collection.get<UInt64>("max_key_length");
-        if (max_key_length > configuration.output_length_limit)
+        if (max_key_length > StorageFuzzJSON::Configuration::output_length_limit)
             throw Exception(
                 ErrorCodes::BAD_ARGUMENTS,
                 "The value of the 'max_key_length' argument must be less or equal than {}.",
-                configuration.output_length_limit);
+                StorageFuzzJSON::Configuration::output_length_limit);
         configuration.max_key_length = std::min(max_key_length, configuration.max_output_length);
         configuration.min_key_length = std::min(configuration.min_key_length, configuration.max_key_length);
     }
diff --git a/src/Storages/StorageInMemoryMetadata.cpp b/src/Storages/StorageInMemoryMetadata.cpp
index cece70eddfa..1ac739f03fd 100644
--- a/src/Storages/StorageInMemoryMetadata.cpp
+++ b/src/Storages/StorageInMemoryMetadata.cpp
@@ -1,5 +1,8 @@
 #include <Storages/StorageInMemoryMetadata.h>
 
+#include <Access/AccessControl.h>
+#include <Access/User.h>
+
 #include <Common/HashTable/HashMap.h>
 #include <Common/HashTable/HashSet.h>
 #include <Common/quoteString.h>
@@ -7,6 +10,7 @@
 #include <Core/ColumnWithTypeAndName.h>
 #include <DataTypes/NestedUtils.h>
 #include <DataTypes/DataTypeEnum.h>
+#include <Interpreters/Context.h>
 #include <IO/ReadBufferFromString.h>
 #include <IO/ReadHelpers.h>
 #include <IO/Operators.h>
@@ -23,6 +27,7 @@ namespace ErrorCodes
     extern const int NOT_FOUND_COLUMN_IN_BLOCK;
     extern const int TYPE_MISMATCH;
     extern const int EMPTY_LIST_OF_COLUMNS_PASSED;
+    extern const int LOGICAL_ERROR;
 }
 
 StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata & other)
@@ -41,6 +46,8 @@ StorageInMemoryMetadata::StorageInMemoryMetadata(const StorageInMemoryMetadata &
     , settings_changes(other.settings_changes ? other.settings_changes->clone() : nullptr)
     , select(other.select)
     , refresh(other.refresh ? other.refresh->clone() : nullptr)
+    , definer(other.definer)
+    , sql_security_type(other.sql_security_type)
     , comment(other.comment)
     , metadata_version(other.metadata_version)
 {
@@ -71,6 +78,8 @@ StorageInMemoryMetadata & StorageInMemoryMetadata::operator=(const StorageInMemo
         settings_changes.reset();
     select = other.select;
     refresh = other.refresh ? other.refresh->clone() : nullptr;
+    definer = other.definer;
+    sql_security_type = other.sql_security_type;
     comment = other.comment;
     metadata_version = other.metadata_version;
     return *this;
@@ -81,6 +90,71 @@ void StorageInMemoryMetadata::setComment(const String & comment_)
     comment = comment_;
 }
 
+void StorageInMemoryMetadata::setSQLSecurity(const ASTSQLSecurity & sql_security)
+{
+    if (sql_security.definer)
+        definer = sql_security.definer->toString();
+    else
+        definer = std::nullopt;
+
+    sql_security_type = sql_security.type;
+}
+
+UUID StorageInMemoryMetadata::getDefinerID(DB::ContextPtr context) const
+{
+    if (!definer)
+    {
+        if (const auto definer_id = context->getUserID())
+            return *definer_id;
+
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No user in context for sub query execution.");
+    }
+
+    const auto & access_control = context->getAccessControl();
+    return access_control.getID<User>(*definer);
+}
+
+ContextMutablePtr StorageInMemoryMetadata::getSQLSecurityOverriddenContext(ContextPtr context) const
+{
+    if (!sql_security_type)
+        return Context::createCopy(context);
+
+    if (sql_security_type == SQLSecurityType::INVOKER)
+        return Context::createCopy(context);
+
+    auto new_context = Context::createCopy(context->getGlobalContext());
+    new_context->setClientInfo(context->getClientInfo());
+    new_context->makeQueryContext();
+
+    const auto & database = context->getCurrentDatabase();
+    if (!database.empty())
+        new_context->setCurrentDatabase(database);
+
+    new_context->setInsertionTable(context->getInsertionTable(), context->getInsertionTableColumnNames());
+    new_context->setProgressCallback(context->getProgressCallback());
+    new_context->setProcessListElement(context->getProcessListElement());
+
+    if (context->getCurrentTransaction())
+        new_context->setCurrentTransaction(context->getCurrentTransaction());
+
+    if (context->getZooKeeperMetadataTransaction())
+        new_context->initZooKeeperMetadataTransaction(context->getZooKeeperMetadataTransaction());
+
+    if (sql_security_type == SQLSecurityType::NONE)
+    {
+        new_context->applySettingsChanges(context->getSettingsRef().changes());
+        return new_context;
+    }
+
+    new_context->setUser(getDefinerID(context));
+
+    auto changed_settings = context->getSettingsRef().changes();
+    new_context->clampToSettingsConstraints(changed_settings, SettingSource::QUERY);
+    new_context->applySettingsChanges(changed_settings);
+
+    return new_context;
+}
+
 void StorageInMemoryMetadata::setColumns(ColumnsDescription columns_)
 {
     if (columns_.getAllPhysical().empty())
@@ -200,7 +274,7 @@ TTLDescription StorageInMemoryMetadata::getRowsTTL() const
 
 bool StorageInMemoryMetadata::hasRowsTTL() const
 {
-    return table_ttl.rows_ttl.expression != nullptr;
+    return table_ttl.rows_ttl.expression_ast != nullptr;
 }
 
 TTLDescriptions StorageInMemoryMetadata::getRowsWhereTTLs() const
@@ -258,9 +332,8 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(
     NameSet required_ttl_columns;
     NameSet updated_ttl_columns;
 
-    auto add_dependent_columns = [&updated_columns](const auto & expression, auto & to_set)
+    auto add_dependent_columns = [&updated_columns](const Names & required_columns, auto & to_set)
     {
-        auto required_columns = expression->getRequiredColumns();
         for (const auto & dependency : required_columns)
         {
             if (updated_columns.contains(dependency))
@@ -276,18 +349,18 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(
     for (const auto & index : getSecondaryIndices())
     {
         if (has_dependency(index.name, ColumnDependency::SKIP_INDEX))
-            add_dependent_columns(index.expression, indices_columns);
+            add_dependent_columns(index.expression->getRequiredColumns(), indices_columns);
     }
 
     for (const auto & projection : getProjections())
     {
         if (has_dependency(projection.name, ColumnDependency::PROJECTION))
-            add_dependent_columns(&projection, projections_columns);
+            add_dependent_columns(projection.getRequiredColumns(), projections_columns);
     }
 
     auto add_for_rows_ttl = [&](const auto & expression, auto & to_set)
     {
-        if (add_dependent_columns(expression, to_set) && include_ttl_target)
+        if (add_dependent_columns(expression.getNames(), to_set) && include_ttl_target)
         {
             /// Filter all columns, if rows TTL expression have to be recalculated.
             for (const auto & column : getColumns().getAllPhysical())
@@ -296,25 +369,25 @@ ColumnDependencies StorageInMemoryMetadata::getColumnDependencies(
     };
 
     if (hasRowsTTL())
-        add_for_rows_ttl(getRowsTTL().expression, required_ttl_columns);
+        add_for_rows_ttl(getRowsTTL().expression_columns, required_ttl_columns);
 
     for (const auto & entry : getRowsWhereTTLs())
-        add_for_rows_ttl(entry.expression, required_ttl_columns);
+        add_for_rows_ttl(entry.expression_columns, required_ttl_columns);
 
     for (const auto & entry : getGroupByTTLs())
-        add_for_rows_ttl(entry.expression, required_ttl_columns);
+        add_for_rows_ttl(entry.expression_columns, required_ttl_columns);
 
     for (const auto & entry : getRecompressionTTLs())
-        add_dependent_columns(entry.expression, required_ttl_columns);
+        add_dependent_columns(entry.expression_columns.getNames(), required_ttl_columns);
 
     for (const auto & [name, entry] : getColumnTTLs())
     {
-        if (add_dependent_columns(entry.expression, required_ttl_columns) && include_ttl_target)
+        if (add_dependent_columns(entry.expression_columns.getNames(), required_ttl_columns) && include_ttl_target)
             updated_ttl_columns.insert(name);
     }
 
     for (const auto & entry : getMoveTTLs())
-        add_dependent_columns(entry.expression, required_ttl_columns);
+        add_dependent_columns(entry.expression_columns.getNames(), required_ttl_columns);
 
     //TODO what about rows_where_ttl and group_by_ttl ??
 
diff --git a/src/Storages/StorageInMemoryMetadata.h b/src/Storages/StorageInMemoryMetadata.h
index ecc30f7b756..afc3bc81ef6 100644
--- a/src/Storages/StorageInMemoryMetadata.h
+++ b/src/Storages/StorageInMemoryMetadata.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <Parsers/Access/ASTUserNameWithHost.h>
+#include <Parsers/ASTCreateQuery.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/ColumnDependency.h>
 #include <Storages/ColumnsDescription.h>
@@ -51,6 +53,14 @@ struct StorageInMemoryMetadata
     /// Materialized view REFRESH parameters.
     ASTPtr refresh;
 
+    /// DEFINER <user_name>. Allows to specify a definer of the table.
+    /// Supported for MaterializedView and View.
+    std::optional<String> definer;
+
+    /// SQL SECURITY <DEFINER | INVOKER | NONE>
+    /// Supported for MaterializedView and View.
+    std::optional<SQLSecurityType> sql_security_type;
+
     String comment;
 
     /// Version of metadata. Managed properly by ReplicatedMergeTree only
@@ -62,8 +72,8 @@ struct StorageInMemoryMetadata
     StorageInMemoryMetadata(const StorageInMemoryMetadata & other);
     StorageInMemoryMetadata & operator=(const StorageInMemoryMetadata & other);
 
-    StorageInMemoryMetadata(StorageInMemoryMetadata && other) = default;
-    StorageInMemoryMetadata & operator=(StorageInMemoryMetadata && other) = default;
+    StorageInMemoryMetadata(StorageInMemoryMetadata && other) = default; /// NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
+    StorageInMemoryMetadata & operator=(StorageInMemoryMetadata && other) = default; /// NOLINT(hicpp-noexcept-move,performance-noexcept-move-constructor)
 
     /// NOTE: Thread unsafe part. You should not modify same StorageInMemoryMetadata
     /// structure from different threads. It should be used as MultiVersion
@@ -105,6 +115,15 @@ struct StorageInMemoryMetadata
     /// Get copy of current metadata with metadata_version_
     StorageInMemoryMetadata withMetadataVersion(int32_t metadata_version_) const;
 
+    /// Sets SQL security for the storage.
+    void setSQLSecurity(const ASTSQLSecurity & sql_security);
+    UUID getDefinerID(ContextPtr context) const;
+
+    /// Returns a copy of the context with the correct user from SQL security options.
+    /// If the SQL security wasn't set, this is equivalent to `Context::createCopy(context)`.
+    /// The context from this function must be used every time whenever views execute any read/write operations or subqueries.
+    ContextMutablePtr getSQLSecurityOverriddenContext(ContextPtr context) const;
+
     /// Returns combined set of columns
     const ColumnsDescription & getColumns() const;
 
diff --git a/src/Storages/StorageJoin.cpp b/src/Storages/StorageJoin.cpp
index efe446a8ccd..d12e5b1a20b 100644
--- a/src/Storages/StorageJoin.cpp
+++ b/src/Storages/StorageJoin.cpp
@@ -16,6 +16,7 @@
 #include <Common/Exception.h>
 #include <Core/ColumnsWithTypeAndName.h>
 #include <Interpreters/JoinUtils.h>
+#include <Formats/NativeWriter.h>
 
 #include <Compression/CompressedWriteBuffer.h>
 #include <Processors/ISource.h>
@@ -25,6 +26,7 @@
 #include <Poco/String.h>
 #include <filesystem>
 
+
 namespace fs = std::filesystem;
 
 namespace DB
@@ -104,7 +106,7 @@ void StorageJoin::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPt
     if (disk->exists(path))
         disk->removeRecursive(path);
     else
-        LOG_INFO(&Poco::Logger::get("StorageJoin"), "Path {} is already removed from disk {}", path, disk->getName());
+        LOG_INFO(getLogger("StorageJoin"), "Path {} is already removed from disk {}", path, disk->getName());
 
     disk->createDirectories(path);
     disk->createDirectories(fs::path(path) / "tmp/");
@@ -500,7 +502,7 @@ protected:
         Chunk chunk;
         if (!joinDispatch(join->kind, join->strictness, join->data->maps.front(),
                 [&](auto kind, auto strictness, auto & map) { chunk = createChunk<kind, strictness>(map); }))
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unknown JOIN strictness");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Unknown JOIN strictness");
         return chunk;
     }
 
diff --git a/src/Storages/StorageJoin.h b/src/Storages/StorageJoin.h
index dc68c68a21b..c76df0cb452 100644
--- a/src/Storages/StorageJoin.h
+++ b/src/Storages/StorageJoin.h
@@ -85,7 +85,7 @@ public:
 
     const Names & getKeyNames() const { return key_names; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
     Block sample_block;
diff --git a/src/Storages/StorageKeeperMap.cpp b/src/Storages/StorageKeeperMap.cpp
index e3c960529de..b0b7afdfe8d 100644
--- a/src/Storages/StorageKeeperMap.cpp
+++ b/src/Storages/StorageKeeperMap.cpp
@@ -233,7 +233,7 @@ public:
                     will_be);
         }
 
-        zookeeper->multi(requests);
+        zookeeper->multi(requests, /* check_session_valid */ true);
     }
 };
 
@@ -321,7 +321,7 @@ StorageKeeperMap::StorageKeeperMap(
     , primary_key(primary_key_)
     , zookeeper_name(zkutil::extractZooKeeperName(zk_root_path_))
     , keys_limit(keys_limit_)
-    , log(&Poco::Logger::get(fmt::format("StorageKeeperMap ({})", table_id.getNameForLogs())))
+    , log(getLogger(fmt::format("StorageKeeperMap ({})", table_id.getNameForLogs())))
 {
     std::string path_prefix = context_->getConfigRef().getString("keeper_map_path_prefix", "");
     if (path_prefix.empty())
@@ -331,6 +331,10 @@ StorageKeeperMap::StorageKeeperMap(
 
     setInMemoryMetadata(metadata);
 
+    VirtualColumnsDescription virtuals;
+    virtuals.addEphemeral(String(version_column_name), std::make_shared<DataTypeInt32>(), "");
+    setVirtuals(std::move(virtuals));
+
     WriteBufferFromOwnString out;
     out << "KeeperMap metadata format version: 1\n"
         << "columns: " << metadata.columns.toString()
@@ -367,7 +371,7 @@ StorageKeeperMap::StorageKeeperMap(
     zk_metadata_path = metadata_path_fs;
     zk_tables_path = metadata_path_fs / "tables";
 
-    auto table_unique_id = toString(table_id.uuid) + toString(ServerUUID::get());
+    table_unique_id = toString(table_id.uuid) + toString(ServerUUID::get());
     zk_table_path = fs::path(zk_tables_path) / table_unique_id;
 
     zk_dropped_path = metadata_path_fs / "dropped";
@@ -634,12 +638,6 @@ void StorageKeeperMap::drop()
     dropTable(client, metadata_drop_lock);
 }
 
-NamesAndTypesList StorageKeeperMap::getVirtuals() const
-{
-    return NamesAndTypesList{
-        {std::string{version_column_name}, std::make_shared<DataTypeInt32>()}};
-}
-
 namespace
 {
 
@@ -753,14 +751,12 @@ private:
 
 void StorageKeeperMap::backupData(BackupEntriesCollector & backup_entries_collector, const String & data_path_in_backup, const std::optional<ASTs> & /*partitions*/)
 {
-    auto table_id = toString(getStorageID().uuid);
-
     auto coordination = backup_entries_collector.getBackupCoordination();
-    coordination->addKeeperMapTable(zk_root_path, table_id, data_path_in_backup);
+    coordination->addKeeperMapTable(zk_root_path, table_unique_id, data_path_in_backup);
 
     /// This task will be executed after all tables have registered their root zk path and the coordination is ready to
     /// assign each path to a single table only.
-    auto post_collecting_task = [my_table_id = std::move(table_id), coordination, &backup_entries_collector, my_data_path_in_backup = data_path_in_backup, this]
+    auto post_collecting_task = [coordination, &backup_entries_collector, my_data_path_in_backup = data_path_in_backup, this]
     {
         auto path_with_data = coordination->getKeeperMapDataPath(zk_root_path);
         if (path_with_data != my_data_path_in_backup)
@@ -776,9 +772,10 @@ void StorageKeeperMap::backupData(BackupEntriesCollector & backup_entries_collec
 
         auto with_retries = std::make_shared<WithRetries>
         (
-            &Poco::Logger::get(fmt::format("StorageKeeperMapBackup ({})", getStorageID().getNameForLogs())),
+            getLogger(fmt::format("StorageKeeperMapBackup ({})", getStorageID().getNameForLogs())),
             [&] { return getClient(); },
             WithRetries::KeeperSettings::fromContext(backup_entries_collector.getContext()),
+            backup_entries_collector.getContext()->getProcessListElement(),
             [](WithRetries::FaultyKeeper &) {}
         );
 
@@ -797,8 +794,7 @@ void StorageKeeperMap::restoreDataFromBackup(RestorerFromBackup & restorer, cons
     if (!backup->hasFiles(data_path_in_backup))
         return;
 
-    auto table_id = toString(getStorageID().uuid);
-    if (!restorer.getRestoreCoordination()->acquireInsertingDataForKeeperMap(zk_root_path, table_id))
+    if (!restorer.getRestoreCoordination()->acquireInsertingDataForKeeperMap(zk_root_path, table_unique_id))
     {
         /// Other table is already restoring the data for this Keeper path.
         /// Tables defined on the same path share data
@@ -807,9 +803,10 @@ void StorageKeeperMap::restoreDataFromBackup(RestorerFromBackup & restorer, cons
 
     auto with_retries = std::make_shared<WithRetries>
     (
-        &Poco::Logger::get(fmt::format("StorageKeeperMapRestore ({})", getStorageID().getNameForLogs())),
+        getLogger(fmt::format("StorageKeeperMapRestore ({})", getStorageID().getNameForLogs())),
         [&] { return getClient(); },
         WithRetries::KeeperSettings::fromContext(restorer.getContext()),
+        restorer.getContext()->getProcessListElement(),
         [](WithRetries::FaultyKeeper &) {}
     );
 
@@ -1208,7 +1205,7 @@ void StorageKeeperMap::mutate(const MutationCommands & commands, ContextPtr loca
             }
 
             Coordination::Responses responses;
-            auto status = client->tryMulti(delete_requests, responses);
+            auto status = client->tryMulti(delete_requests, responses, /* check_session_valid */ true);
 
             if (status == Coordination::Error::ZOK)
                 return;
diff --git a/src/Storages/StorageKeeperMap.h b/src/Storages/StorageKeeperMap.h
index aa9687243d8..d4556792c48 100644
--- a/src/Storages/StorageKeeperMap.h
+++ b/src/Storages/StorageKeeperMap.h
@@ -50,8 +50,6 @@ 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}; }
 
@@ -125,10 +123,10 @@ private:
     std::string primary_key;
 
     std::string zk_data_path;
-
     std::string zk_metadata_path;
-
     std::string zk_tables_path;
+
+    std::string table_unique_id;
     std::string zk_table_path;
 
     std::string zk_dropped_path;
@@ -146,7 +144,7 @@ private:
     mutable std::mutex init_mutex;
     mutable std::optional<bool> table_is_valid;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/StorageLog.cpp b/src/Storages/StorageLog.cpp
index fda628079c0..b652750346f 100644
--- a/src/Storages/StorageLog.cpp
+++ b/src/Storages/StorageLog.cpp
@@ -35,11 +35,12 @@
 #include <Backups/IBackup.h>
 #include <Backups/RestorerFromBackup.h>
 #include <Disks/TemporaryFileOnDisk.h>
-#include <Storages/BlockNumberColumn.h>
 
 #include <cassert>
 #include <chrono>
 
+#include <boost/range/adaptor/map.hpp>
+
 
 #define DBMS_STORAGE_LOG_DATA_FILE_EXTENSION ".bin"
 #define DBMS_STORAGE_LOG_MARKS_FILE_NAME "__marks.mrk"
@@ -48,8 +49,6 @@
 namespace DB
 {
 
-    CompressionCodecPtr getCompressionCodecDelta(UInt8 delta_bytes_size);
-
 namespace ErrorCodes
 {
     extern const int TIMEOUT_EXCEEDED;
@@ -104,6 +103,8 @@ protected:
     Chunk generate() override;
 
 private:
+    NameAndTypePair getColumnOnDisk(const NameAndTypePair & column) const;
+
     const size_t block_size;
     const NamesAndTypesList columns;
     const StorageLog & storage;
@@ -149,6 +150,22 @@ private:
     bool isFinished();
 };
 
+NameAndTypePair LogSource::getColumnOnDisk(const NameAndTypePair & column) const
+{
+    const auto & storage_columns = storage.columns_with_collected_nested;
+
+    /// A special case when we read subcolumn of shared offsets of Nested.
+    /// E.g. instead of requested column "n.arr1.size0" we must read column "n.size0" from disk.
+    auto name_in_storage = column.getNameInStorage();
+    if (column.getSubcolumnName() == "size0" && Nested::isSubcolumnOfNested(name_in_storage, storage_columns))
+    {
+        auto nested_name_in_storage = Nested::splitName(name_in_storage).first;
+        auto new_name = Nested::concatenateName(nested_name_in_storage, column.getSubcolumnName());
+        return storage_columns.getColumnOrSubcolumn(GetColumnsOptions::All, new_name);
+    }
+
+    return column;
+}
 
 Chunk LogSource::generate()
 {
@@ -169,19 +186,21 @@ Chunk LogSource::generate()
     for (const auto & name_type : columns)
     {
         ColumnPtr column;
+        auto name_type_on_disk = getColumnOnDisk(name_type);
+
         try
         {
-            column = name_type.type->createColumn();
-            readData(name_type, column, max_rows_to_read, caches[name_type.getNameInStorage()]);
+            column = name_type_on_disk.type->createColumn();
+            readData(name_type_on_disk, column, max_rows_to_read, caches[name_type_on_disk.getNameInStorage()]);
         }
         catch (Exception & e)
         {
-            e.addMessage("while reading column " + name_type.name + " at " + fullPath(storage.disk, storage.table_path));
+            e.addMessage("while reading column " + name_type_on_disk.name + " at " + fullPath(storage.disk, storage.table_path));
             throw;
         }
 
         if (!column->empty())
-            res.insert(ColumnWithTypeAndName(column, name_type.type, name_type.name));
+            res.insert(ColumnWithTypeAndName(column, name_type_on_disk.type, name_type_on_disk.name));
     }
 
     if (res)
@@ -221,7 +240,7 @@ void LogSource::readData(const NameAndTypePair & name_and_type, ColumnPtr & colu
 
             const auto & data_file_it = storage.data_files_by_names.find(data_file_name);
             if (data_file_it == storage.data_files_by_names.end())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no information about file {} in StorageLog", data_file_name);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "No information about file {} in StorageLog", data_file_name);
             const auto & data_file = *data_file_it->second;
 
             size_t offset = stream_for_prefix ? 0 : offsets[data_file.index];
@@ -279,6 +298,7 @@ public:
         : SinkToStorage(metadata_snapshot_->getSampleBlock())
         , storage(storage_)
         , metadata_snapshot(metadata_snapshot_)
+        , storage_snapshot(std::make_shared<StorageSnapshot>(storage, metadata_snapshot))
         , lock(std::move(lock_))
     {
         if (!lock)
@@ -323,6 +343,7 @@ public:
 private:
     StorageLog & storage;
     StorageMetadataPtr metadata_snapshot;
+    StorageSnapshotPtr storage_snapshot;
     WriteLock lock;
     bool done = false;
 
@@ -428,7 +449,7 @@ ISerialization::OutputStreamGetter LogSink::createStreamGetter(const NameAndType
         String data_file_name = ISerialization::getFileNameForStream(name_and_type, path);
         auto it = streams.find(data_file_name);
         if (it == streams.end())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: stream was not created when writing data in LogSink");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Stream was not created when writing data in LogSink");
 
         Stream & stream = it->second;
         if (stream.written)
@@ -453,16 +474,10 @@ void LogSink::writeData(const NameAndTypePair & name_and_type, const IColumn & c
         {
             const auto & data_file_it = storage.data_files_by_names.find(data_file_name);
             if (data_file_it == storage.data_files_by_names.end())
-                throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no information about file {} in StorageLog", data_file_name);
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "No information about file {} in StorageLog", data_file_name);
 
             const auto & data_file = *data_file_it->second;
-            const auto & columns = metadata_snapshot->getColumns();
-
-            CompressionCodecPtr compression;
-            if (name_and_type.name == BlockNumberColumn::name)
-                compression = BlockNumberColumn::compression_codec;
-            else
-                compression = columns.getCodecOrDefault(name_and_type.name);
+            auto compression = storage_snapshot->getCodecOrDefault(name_and_type.name);
 
             it = streams.try_emplace(data_file.name, storage.disk, data_file.path,
                                      storage.file_checker.getFileSize(data_file.path),
@@ -549,7 +564,7 @@ StorageLog::StorageLog(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    bool attach,
+    LoadingStrictnessLevel mode,
     ContextMutablePtr context_)
     : IStorage(table_id_)
     , WithMutableContext(context_)
@@ -583,7 +598,7 @@ StorageLog::StorageLog(
             file_checker.setEmpty(marks_file_path);
     }
 
-    if (!attach)
+    if (mode < LoadingStrictnessLevel::ATTACH)
     {
         /// create directories if they do not exist
         disk->createDirectories(table_path);
@@ -600,6 +615,7 @@ StorageLog::StorageLog(
         }
     }
 
+    columns_with_collected_nested = ColumnsDescription{Nested::collect(columns_.getAll())};
     total_bytes = file_checker.getTotalSize();
 }
 
@@ -820,10 +836,6 @@ Pipe StorageLog::read(
     if (num_streams > max_streams)
         num_streams = max_streams;
 
-    auto options = GetColumnsOptions(GetColumnsOptions::All).withSubcolumns();
-    auto all_columns = storage_snapshot->getColumnsByNames(options, column_names);
-    all_columns = Nested::convertToSubcolumns(all_columns);
-
     std::vector<size_t> offsets;
     offsets.resize(num_data_files, 0);
 
@@ -840,6 +852,12 @@ Pipe StorageLog::read(
     ReadSettings read_settings = local_context->getReadSettings();
     Pipes pipes;
 
+    /// Converting to subcolumns of Nested is needed for
+    /// correct reading of parts of Nested with shared offsets.
+    auto options = GetColumnsOptions(GetColumnsOptions::All).withSubcolumns();
+    auto all_columns = storage_snapshot->getColumnsByNames(options, column_names);
+    all_columns = Nested::convertToSubcolumns(all_columns);
+
     for (size_t stream = 0; stream < num_streams; ++stream)
     {
         if (use_marks_file)
@@ -1140,7 +1158,7 @@ void registerStorageLog(StorageFactory & factory)
             args.columns,
             args.constraints,
             args.comment,
-            args.attach,
+            args.mode,
             args.getContext());
     };
 
diff --git a/src/Storages/StorageLog.h b/src/Storages/StorageLog.h
index 5c699b0bb45..882e9cfaa75 100644
--- a/src/Storages/StorageLog.h
+++ b/src/Storages/StorageLog.h
@@ -40,7 +40,7 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ContextMutablePtr context_);
 
     ~StorageLog() override;
@@ -133,6 +133,9 @@ private:
     size_t num_data_files = 0;
     std::map<String, DataFile *> data_files_by_names;
 
+    /// The same as metadata->columns but after call of Nested::collect().
+    ColumnsDescription columns_with_collected_nested;
+
     /// The Log engine uses the marks file, and the TinyLog engine doesn't.
     const bool use_marks_file;
 
diff --git a/src/Storages/StorageLogSettings.h b/src/Storages/StorageLogSettings.h
index fa8bb282360..e89ed90fc04 100644
--- a/src/Storages/StorageLogSettings.h
+++ b/src/Storages/StorageLogSettings.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <memory>
 #include <base/types.h>
 
 namespace DB
diff --git a/src/Storages/StorageMaterializedMySQL.cpp b/src/Storages/StorageMaterializedMySQL.cpp
index 0dc0b1bff0b..887c58ff816 100644
--- a/src/Storages/StorageMaterializedMySQL.cpp
+++ b/src/Storages/StorageMaterializedMySQL.cpp
@@ -22,9 +22,8 @@ namespace DB
 StorageMaterializedMySQL::StorageMaterializedMySQL(const StoragePtr & nested_storage_, const IDatabase * database_)
     : StorageProxy(nested_storage_->getStorageID()), nested_storage(nested_storage_), database(database_)
 {
-    StorageInMemoryMetadata in_memory_metadata;
-    in_memory_metadata = nested_storage->getInMemoryMetadata();
-    setInMemoryMetadata(in_memory_metadata);
+    setInMemoryMetadata(nested_storage->getInMemoryMetadata());
+    setVirtuals(*nested_storage->getVirtualsPtr());
 }
 
 bool StorageMaterializedMySQL::needRewriteQueryWithFinal(const Names & column_names) const
@@ -49,14 +48,6 @@ void StorageMaterializedMySQL::read(
             query_info, context, processed_stage, max_block_size, num_streams);
 }
 
-NamesAndTypesList StorageMaterializedMySQL::getVirtuals() const
-{
-    if (const auto * db = typeid_cast<const DatabaseMaterializedMySQL *>(database))
-        db->rethrowExceptionIfNeeded();
-
-    return nested_storage->getVirtuals();
-}
-
 IStorage::ColumnSizeByName StorageMaterializedMySQL::getColumnSizes() const
 {
     auto sizes = nested_storage->getColumnSizes();
diff --git a/src/Storages/StorageMaterializedMySQL.h b/src/Storages/StorageMaterializedMySQL.h
index 2cd589bfd75..3e0cf3e6925 100644
--- a/src/Storages/StorageMaterializedMySQL.h
+++ b/src/Storages/StorageMaterializedMySQL.h
@@ -34,14 +34,13 @@ public:
 
     SinkToStoragePtr write(const ASTPtr &, const StorageMetadataPtr &, ContextPtr, bool) override { throwNotAllowed(); }
 
-    NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
 
     StoragePtr getNested() const override { return nested_storage; }
 
     void drop() override { nested_storage->drop(); }
 
-    bool supportsTrivialCountOptimization() const override { return false; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return false; }
 
     IndexSizeByName getSecondaryIndexSizes() const override
     {
diff --git a/src/Storages/StorageMaterializedView.cpp b/src/Storages/StorageMaterializedView.cpp
index ae616b1df04..344b5dfce9b 100644
--- a/src/Storages/StorageMaterializedView.cpp
+++ b/src/Storages/StorageMaterializedView.cpp
@@ -5,14 +5,16 @@
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ASTCreateQuery.h>
 
+#include <Access/Common/AccessFlags.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterCreateQuery.h>
 #include <Interpreters/InterpreterDropQuery.h>
-#include <Interpreters/InterpreterRenameQuery.h>
 #include <Interpreters/InterpreterInsertQuery.h>
-#include <Interpreters/getTableExpressions.h>
+#include <Interpreters/InterpreterRenameQuery.h>
+#include <Interpreters/InterpreterSelectWithUnionQuery.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
-#include <Access/Common/AccessFlags.h>
+#include <Interpreters/getTableExpressions.h>
 
 #include <Storages/AlterCommands.h>
 #include <Storages/StorageFactory.h>
@@ -21,6 +23,7 @@
 
 #include <Common/typeid_cast.h>
 #include <Common/checkStackSize.h>
+#include <Core/ServerSettings.h>
 #include <QueryPipeline/Pipe.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
@@ -38,6 +41,9 @@ namespace ErrorCodes
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
     extern const int INCORRECT_QUERY;
+    extern const int QUERY_IS_NOT_SUPPORTED_IN_MATERIALIZED_VIEW;
+    extern const int TOO_MANY_MATERIALIZED_VIEWS;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
 }
 
 namespace ActionLocks
@@ -64,17 +70,32 @@ static void removeNonCommonColumns(const Block & src_header, Block & target_head
     target_header.erase(target_only_positions);
 }
 
+namespace
+{
+    void checkTargetTableHasQueryOutputColumns(const ColumnsDescription & target_table_columns, const ColumnsDescription & select_query_output_columns)
+    {
+        for (const auto & column : select_query_output_columns)
+            if (!target_table_columns.has(column.name))
+                throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "Column {} does not exist in the materialized view's inner table", column.name);
+    }
+}
+
 StorageMaterializedView::StorageMaterializedView(
     const StorageID & table_id_,
     ContextPtr local_context,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
-    bool attach_,
+    LoadingStrictnessLevel mode,
     const String & comment)
     : IStorage(table_id_), WithMutableContext(local_context->getGlobalContext())
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
+    if (query.sql_security)
+        storage_metadata.setSQLSecurity(query.sql_security->as<ASTSQLSecurity &>());
+
+    if (storage_metadata.sql_security_type == SQLSecurityType::INVOKER)
+        throw Exception(ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_MATERIALIZED_VIEW, "SQL SECURITY INVOKER can't be specified for MATERIALIZED VIEW");
 
     if (!query.select)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "SELECT query is not specified for {}", getName());
@@ -87,6 +108,16 @@ StorageMaterializedView::StorageMaterializedView(
                         "either ENGINE or an existing table in a TO clause");
 
     auto select = SelectQueryDescription::getSelectQueryFromASTForMatView(query.select->clone(), query.refresh_strategy != nullptr, local_context);
+    if (select.select_table_id)
+    {
+        auto select_table_dependent_views = DatabaseCatalog::instance().getDependentViews(select.select_table_id);
+
+        auto max_materialized_views_count_for_table = getContext()->getServerSettings().max_materialized_views_count_for_table;
+        if (max_materialized_views_count_for_table && select_table_dependent_views.size() >= max_materialized_views_count_for_table)
+            throw Exception(ErrorCodes::TOO_MANY_MATERIALIZED_VIEWS,
+                            "Too many materialized views, maximum: {}", max_materialized_views_count_for_table);
+    }
+
     storage_metadata.setSelectQuery(select);
     if (!comment.empty())
         storage_metadata.setComment(comment);
@@ -106,7 +137,7 @@ StorageMaterializedView::StorageMaterializedView(
     {
         target_table_id = query.to_table_id;
     }
-    else if (attach_)
+    else if (LoadingStrictnessLevel::ATTACH <= mode)
     {
         /// If there is an ATTACH request, then the internal table must already be created.
         target_table_id = StorageID(getStorageID().database_name, generateInnerTableName(getStorageID()), query.to_inner_uuid);
@@ -139,7 +170,7 @@ StorageMaterializedView::StorageMaterializedView(
             *this,
             getContext(),
             *query.refresh_strategy);
-        refresh_on_start = !attach_ && !query.is_create_empty;
+        refresh_on_start = mode < LoadingStrictnessLevel::ATTACH && !query.is_create_empty;
     }
 }
 
@@ -153,6 +184,12 @@ QueryProcessingStage::Enum StorageMaterializedView::getQueryProcessingStage(
     return getTargetTable()->getQueryProcessingStage(local_context, to_stage, getTargetTable()->getStorageSnapshot(target_metadata, local_context), query_info);
 }
 
+StorageSnapshotPtr StorageMaterializedView::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr) const
+{
+    /// We cannot set virtuals at table creation because target table may not exist at that time.
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, getTargetTable()->getVirtualsPtr());
+}
+
 void StorageMaterializedView::read(
     QueryPlan & query_plan,
     const Names & column_names,
@@ -163,19 +200,28 @@ void StorageMaterializedView::read(
     const size_t max_block_size,
     const size_t num_streams)
 {
+    auto context = getInMemoryMetadataPtr()->getSQLSecurityOverriddenContext(local_context);
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
+    auto lock = storage->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
     auto target_metadata_snapshot = storage->getInMemoryMetadataPtr();
-    auto target_storage_snapshot = storage->getStorageSnapshot(target_metadata_snapshot, local_context);
+    auto target_storage_snapshot = storage->getStorageSnapshot(target_metadata_snapshot, context);
 
     if (query_info.order_optimizer)
-        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, local_context);
+        query_info.input_order_info = query_info.order_optimizer->getInputOrder(target_metadata_snapshot, context);
 
-    storage->read(query_plan, column_names, target_storage_snapshot, query_info, local_context, processed_stage, max_block_size, num_streams);
+    if (!getInMemoryMetadataPtr()->select.select_table_id.empty())
+        context->checkAccess(AccessType::SELECT, getInMemoryMetadataPtr()->select.select_table_id, column_names);
+
+    auto storage_id = storage->getStorageID();
+    /// We don't need to check access if the inner table was created automatically.
+    if (!has_inner_table && !storage_id.empty())
+        context->checkAccess(AccessType::SELECT, storage_id, column_names);
+
+    storage->read(query_plan, column_names, target_storage_snapshot, query_info, context, processed_stage, max_block_size, num_streams);
 
     if (query_plan.isInitialized())
     {
-        auto mv_header = getHeaderForProcessingStage(column_names, storage_snapshot, query_info, local_context, processed_stage);
+        auto mv_header = getHeaderForProcessingStage(column_names, storage_snapshot, query_info, context, processed_stage);
         auto target_header = query_plan.getCurrentDataStream().header;
 
         /// No need to convert columns that does not exists in MV
@@ -210,11 +256,20 @@ void StorageMaterializedView::read(
 
 SinkToStoragePtr StorageMaterializedView::write(const ASTPtr & query, const StorageMetadataPtr & /*metadata_snapshot*/, ContextPtr local_context, bool async_insert)
 {
+    auto context = getInMemoryMetadataPtr()->getSQLSecurityOverriddenContext(local_context);
     auto storage = getTargetTable();
-    auto lock = storage->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
-
+    auto lock = storage->lockForShare(context->getCurrentQueryId(), context->getSettingsRef().lock_acquire_timeout);
     auto metadata_snapshot = storage->getInMemoryMetadataPtr();
-    auto sink = storage->write(query, metadata_snapshot, local_context, async_insert);
+
+    auto storage_id = storage->getStorageID();
+    /// We don't need to check access if the inner table was created automatically.
+    if (!has_inner_table && !storage_id.empty())
+    {
+        auto query_sample_block = InterpreterInsertQuery::getSampleBlock(query->as<ASTInsertQuery &>(), storage, metadata_snapshot, context);
+        context->checkAccess(AccessType::INSERT, storage_id, query_sample_block.getNames());
+    }
+
+    auto sink = storage->write(query, metadata_snapshot, context, async_insert);
 
     sink->addTableLock(lock);
     return sink;
@@ -285,7 +340,7 @@ bool StorageMaterializedView::optimize(
 
 std::tuple<ContextMutablePtr, std::shared_ptr<ASTInsertQuery>> StorageMaterializedView::prepareRefresh() const
 {
-    auto refresh_context = Context::createCopy(getContext());
+    auto refresh_context = getInMemoryMetadataPtr()->getSQLSecurityOverriddenContext(getContext());
     /// Generate a random query id.
     refresh_context->setCurrentQueryId("");
 
@@ -347,12 +402,24 @@ void StorageMaterializedView::alter(
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
     params.apply(new_metadata, local_context);
 
-    /// start modify query
     const auto & new_select = new_metadata.select;
     const auto & old_select = old_metadata.getSelectQuery();
 
     DatabaseCatalog::instance().updateViewDependency(old_select.select_table_id, table_id, new_select.select_table_id, table_id);
-    /// end modify query
+
+    new_metadata.setSelectQuery(new_select);
+
+    /// Check the materialized view's inner table structure.
+    if (has_inner_table)
+    {
+        /// If this materialized view has an inner table it should always have the same columns as this materialized view.
+        /// Try to find mistakes in the select query (it shouldn't have columns which are not in the inner table).
+        auto target_table_metadata = getTargetTable()->getInMemoryMetadataPtr();
+        const auto & select_query_output_columns = new_metadata.columns; /// AlterCommands::alter() analyzed the query and assigned `new_metadata.columns` before.
+        checkTargetTableHasQueryOutputColumns(target_table_metadata->columns, select_query_output_columns);
+        /// We need to copy the target table's columns (after checkTargetTableHasQueryOutputColumns() they can be still different - e.g. the data types of those columns can differ).
+        new_metadata.columns = target_table_metadata->columns;
+    }
 
     DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
@@ -366,15 +433,24 @@ void StorageMaterializedView::checkAlterIsPossible(const AlterCommands & command
 {
     for (const auto & command : commands)
     {
-        if (command.isCommentAlter())
+        if (command.type == AlterCommand::MODIFY_SQL_SECURITY)
+        {
+            if (command.sql_security->as<ASTSQLSecurity &>().type == SQLSecurityType::INVOKER)
+                throw Exception(ErrorCodes::QUERY_IS_NOT_SUPPORTED_IN_MATERIALIZED_VIEW, "SQL SECURITY INVOKER can't be specified for MATERIALIZED VIEW");
+
             continue;
-        if (command.type == AlterCommand::MODIFY_QUERY)
+        }
+        else if (command.isCommentAlter())
             continue;
-        if (command.type == AlterCommand::MODIFY_REFRESH && refresher)
+        else if (command.type == AlterCommand::MODIFY_QUERY)
             continue;
+        else if (command.type == AlterCommand::MODIFY_REFRESH && refresher)
+            continue;
+
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
-            command.type, getName());
+                        command.type, getName());
     }
+
 }
 
 void StorageMaterializedView::checkMutationIsPossible(const MutationCommands & commands, const Settings & settings) const
@@ -414,8 +490,8 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
     if (!from_atomic_to_atomic_database && has_inner_table && tryGetTargetTable())
     {
         auto new_target_table_name = generateInnerTableName(new_table_id);
-        auto rename = std::make_shared<ASTRenameQuery>();
 
+        ASTRenameQuery::Elements rename_elements;
         assert(inner_table_id.database_name == old_table_id.database_name);
 
         ASTRenameQuery::Element elem
@@ -431,8 +507,9 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
                 std::make_shared<ASTIdentifier>(new_target_table_name)
             }
         };
-        rename->elements.emplace_back(std::move(elem));
+        rename_elements.emplace_back(std::move(elem));
 
+        auto rename = std::make_shared<ASTRenameQuery>(std::move(rename_elements));
         InterpreterRenameQuery(rename, getContext()).execute();
         updateTargetTableId(new_table_id.database_name, new_target_table_name);
     }
@@ -444,7 +521,7 @@ void StorageMaterializedView::renameInMemory(const StorageID & new_table_id)
         updateTargetTableId(new_table_id.database_name, std::nullopt);
     }
     const auto & select_query = metadata_snapshot->getSelectQuery();
-    // TODO Actually we don't need to update dependency if MV has UUID, but then db and table name will be outdated
+    /// TODO: Actually, we don't need to update dependency if MV has UUID, but then db and table name will be outdated
     DatabaseCatalog::instance().updateViewDependency(select_query.select_table_id, old_table_id, select_query.select_table_id, getStorageID());
 
     if (refresher)
@@ -491,11 +568,6 @@ StoragePtr StorageMaterializedView::tryGetTargetTable() const
     return DatabaseCatalog::instance().tryGetTable(getTargetTableId(), getContext());
 }
 
-NamesAndTypesList StorageMaterializedView::getVirtuals() const
-{
-    return getTargetTable()->getVirtuals();
-}
-
 Strings StorageMaterializedView::getDataPaths() const
 {
     if (auto table = tryGetTargetTable())
@@ -511,7 +583,7 @@ void StorageMaterializedView::backupData(BackupEntriesCollector & backup_entries
         if (auto table = tryGetTargetTable())
             table->backupData(backup_entries_collector, data_path_in_backup, partitions);
         else
-            LOG_WARNING(&Poco::Logger::get("StorageMaterializedView"),
+            LOG_WARNING(getLogger("StorageMaterializedView"),
                         "Inner table does not exist, will not backup any data");
     }
 }
@@ -612,7 +684,7 @@ void registerStorageMaterializedView(StorageFactory & factory)
         /// Pass local_context here to convey setting for inner table
         return std::make_shared<StorageMaterializedView>(
             args.table_id, args.getLocalContext(), args.query,
-            args.columns, args.attach, args.comment);
+            args.columns, args.mode, args.comment);
     });
 }
 
diff --git a/src/Storages/StorageMaterializedView.h b/src/Storages/StorageMaterializedView.h
index 4678060d81f..198b7a642ee 100644
--- a/src/Storages/StorageMaterializedView.h
+++ b/src/Storages/StorageMaterializedView.h
@@ -18,7 +18,7 @@ public:
         ContextPtr local_context,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
-        bool attach_,
+        LoadingStrictnessLevel mode,
         const String & comment);
 
     std::string getName() const override { return "MaterializedView"; }
@@ -75,12 +75,11 @@ public:
     StoragePtr tryGetTargetTable() const;
     StorageID getTargetTableId() const;
 
-    /// Get the virtual column of the target table;
-    NamesAndTypesList getVirtuals() const override;
-
     ActionLock getActionLock(StorageActionBlockType type) override;
     void onActionLockRemove(StorageActionBlockType action_type) override;
 
+    StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr) const override;
+
     void read(
         QueryPlan & query_plan,
         const Names & column_names,
diff --git a/src/Storages/StorageMemory.cpp b/src/Storages/StorageMemory.cpp
index 0011e3c57a2..f69c4adb552 100644
--- a/src/Storages/StorageMemory.cpp
+++ b/src/Storages/StorageMemory.cpp
@@ -19,6 +19,8 @@
 #include <Processors/QueryPlan/ReadFromMemoryStorageStep.h>
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Parsers/ASTCreateQuery.h>
+#include <Formats/NativeReader.h>
+#include <Formats/NativeWriter.h>
 
 #include <Common/FileChecker.h>
 #include <Compression/CompressedReadBuffer.h>
@@ -73,17 +75,17 @@ public:
             convertDynamicColumnsToTuples(block, storage_snapshot);
         }
 
-        if (storage.compress)
+        if (storage.getMemorySettingsRef().compress)
         {
             Block compressed_block;
             for (const auto & elem : block)
                 compressed_block.insert({ elem.column->compress(), elem.type, elem.name });
 
-            new_blocks.emplace_back(compressed_block);
+            new_blocks.push_back(std::move(compressed_block));
         }
         else
         {
-            new_blocks.emplace_back(block);
+            new_blocks.push_back(std::move(block));
         }
     }
 
@@ -101,16 +103,38 @@ public:
         std::lock_guard lock(storage.mutex);
 
         auto new_data = std::make_unique<Blocks>(*(storage.data.get()));
+        UInt64 new_total_rows = storage.total_size_rows.load(std::memory_order_relaxed) + inserted_rows;
+        UInt64 new_total_bytes = storage.total_size_bytes.load(std::memory_order_relaxed) + inserted_bytes;
+        const auto & memory_settings = storage.getMemorySettingsRef();
+        while (!new_data->empty()
+               && ((memory_settings.max_bytes_to_keep && new_total_bytes > memory_settings.max_bytes_to_keep)
+                   || (memory_settings.max_rows_to_keep && new_total_rows > memory_settings.max_rows_to_keep)))
+        {
+            Block oldest_block = new_data->front();
+            UInt64 rows_to_remove = oldest_block.rows();
+            UInt64 bytes_to_remove = oldest_block.allocatedBytes();
+            if (new_total_bytes - bytes_to_remove < memory_settings.min_bytes_to_keep
+                || new_total_rows - rows_to_remove < memory_settings.min_rows_to_keep)
+            {
+                break; // stop - removing next block will put us under min_bytes / min_rows threshold
+            }
+
+            // delete old block from current storage table
+            new_total_rows -= rows_to_remove;
+            new_total_bytes -= bytes_to_remove;
+            new_data->erase(new_data->begin());
+        }
+
+        // append new data to modified storage table and commit
         new_data->insert(new_data->end(), new_blocks.begin(), new_blocks.end());
 
         storage.data.set(std::move(new_data));
-        storage.total_size_bytes.fetch_add(inserted_bytes, std::memory_order_relaxed);
-        storage.total_size_rows.fetch_add(inserted_rows, std::memory_order_relaxed);
+        storage.total_size_rows.store(new_total_rows, std::memory_order_relaxed);
+        storage.total_size_bytes.store(new_total_bytes, std::memory_order_relaxed);
     }
 
 private:
     Blocks new_blocks;
-
     StorageMemory & storage;
     StorageSnapshotPtr storage_snapshot;
 };
@@ -121,13 +145,16 @@ StorageMemory::StorageMemory(
     ColumnsDescription columns_description_,
     ConstraintsDescription constraints_,
     const String & comment,
-    bool compress_)
-    : IStorage(table_id_), data(std::make_unique<const Blocks>()), compress(compress_)
+    const MemorySettings & memory_settings_)
+    : IStorage(table_id_)
+    , data(std::make_unique<const Blocks>())
+    , memory_settings(memory_settings_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(std::move(columns_description_));
     storage_metadata.setConstraints(std::move(constraints_));
     storage_metadata.setComment(comment);
+    storage_metadata.setSettingsChanges(memory_settings.getSettingsChangesQuery());
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -152,13 +179,14 @@ void StorageMemory::read(
     QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /*query_info*/,
-    ContextPtr /*context*/,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     size_t /*max_block_size*/,
     size_t num_streams)
 {
-    query_plan.addStep(std::make_unique<ReadFromMemoryStorageStep>(column_names, shared_from_this(), storage_snapshot, num_streams, delay_read_for_global_subqueries));
+    query_plan.addStep(std::make_unique<ReadFromMemoryStorageStep>(
+        column_names, query_info, storage_snapshot, context, shared_from_this(), num_streams, delay_read_for_global_subqueries));
 }
 
 
@@ -212,7 +240,7 @@ void StorageMemory::mutate(const MutationCommands & commands, ContextPtr context
     Block block;
     while (executor.pull(block))
     {
-        if (compress)
+        if (memory_settings.compress)
             for (auto & elem : block)
                 elem.column = elem.column->compress();
 
@@ -267,6 +295,59 @@ void StorageMemory::truncate(
     total_size_rows.store(0, std::memory_order_relaxed);
 }
 
+void StorageMemory::alter(const DB::AlterCommands & params, DB::ContextPtr context, DB::IStorage::AlterLockHolder & /*alter_lock_holder*/)
+{
+    auto table_id = getStorageID();
+    StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
+    params.apply(new_metadata, context);
+
+    if (params.isSettingsAlter())
+    {
+        auto & settings_changes = new_metadata.settings_changes->as<ASTSetQuery &>();
+        auto changed_settings = memory_settings;
+        changed_settings.applyChanges(settings_changes.changes);
+        changed_settings.sanityCheck();
+
+        /// When modifying the values of max_bytes_to_keep and max_rows_to_keep to be smaller than the old values,
+        /// the old data needs to be removed.
+        if (!memory_settings.max_bytes_to_keep || memory_settings.max_bytes_to_keep > changed_settings.max_bytes_to_keep
+            || !memory_settings.max_rows_to_keep || memory_settings.max_rows_to_keep > changed_settings.max_rows_to_keep)
+        {
+            std::lock_guard lock(mutex);
+
+            auto new_data = std::make_unique<Blocks>(*(data.get()));
+            UInt64 new_total_rows = total_size_rows.load(std::memory_order_relaxed);
+            UInt64 new_total_bytes = total_size_bytes.load(std::memory_order_relaxed);
+            while (!new_data->empty()
+                   && ((changed_settings.max_bytes_to_keep && new_total_bytes > changed_settings.max_bytes_to_keep)
+                       || (changed_settings.max_rows_to_keep && new_total_rows > changed_settings.max_rows_to_keep)))
+            {
+                Block oldest_block = new_data->front();
+                UInt64 rows_to_remove = oldest_block.rows();
+                UInt64 bytes_to_remove = oldest_block.allocatedBytes();
+                if (new_total_bytes - bytes_to_remove < changed_settings.min_bytes_to_keep
+                    || new_total_rows - rows_to_remove < changed_settings.min_rows_to_keep)
+                {
+                    break; // stop - removing next block will put us under min_bytes / min_rows threshold
+                }
+
+                // delete old block from current storage table
+                new_total_rows -= rows_to_remove;
+                new_total_bytes -= bytes_to_remove;
+                new_data->erase(new_data->begin());
+            }
+
+            data.set(std::move(new_data));
+            total_size_rows.store(new_total_rows, std::memory_order_relaxed);
+            total_size_bytes.store(new_total_bytes, std::memory_order_relaxed);
+        }
+        memory_settings = std::move(changed_settings);
+    }
+
+    DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(context, table_id, new_metadata);
+    setInMemoryMetadata(new_metadata);
+}
+
 
 namespace
 {
@@ -472,9 +553,21 @@ void StorageMemory::restoreDataImpl(const BackupPtr & backup, const String & dat
 
         while (auto block = block_in.read())
         {
-            new_bytes += block.bytes();
-            new_rows += block.rows();
-            new_blocks.push_back(std::move(block));
+            if (memory_settings.compress)
+            {
+                Block compressed_block;
+                for (const auto & elem : block)
+                    compressed_block.insert({ elem.column->compress(), elem.type, elem.name });
+
+                new_blocks.push_back(std::move(compressed_block));
+            }
+            else
+            {
+                new_blocks.push_back(std::move(block));
+            }
+
+            new_bytes += new_blocks.back().bytes();
+            new_rows += new_blocks.back().rows();
         }
     }
 
@@ -495,7 +588,8 @@ void StorageMemory::checkAlterIsPossible(const AlterCommands & commands, Context
     {
         if (command.type != AlterCommand::Type::ADD_COLUMN && command.type != AlterCommand::Type::MODIFY_COLUMN
             && command.type != AlterCommand::Type::DROP_COLUMN && command.type != AlterCommand::Type::COMMENT_COLUMN
-            && command.type != AlterCommand::Type::COMMENT_TABLE && command.type != AlterCommand::Type::RENAME_COLUMN)
+            && command.type != AlterCommand::Type::COMMENT_TABLE && command.type != AlterCommand::Type::RENAME_COLUMN
+            && command.type != AlterCommand::Type::MODIFY_SETTING)
             throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}",
                 command.type, getName());
     }
@@ -527,7 +621,9 @@ void registerStorageMemory(StorageFactory & factory)
         if (has_settings)
             settings.loadFromQuery(*args.storage_def);
 
-        return std::make_shared<StorageMemory>(args.table_id, args.columns, args.constraints, args.comment, settings.compress);
+        settings.sanityCheck();
+
+        return std::make_shared<StorageMemory>(args.table_id, args.columns, args.constraints, args.comment, settings);
     },
     {
         .supports_settings = true,
diff --git a/src/Storages/StorageMemory.h b/src/Storages/StorageMemory.h
index 3293e5e4fe5..50581aa0d61 100644
--- a/src/Storages/StorageMemory.h
+++ b/src/Storages/StorageMemory.h
@@ -7,6 +7,7 @@
 #include <Core/NamesAndTypes.h>
 #include <Interpreters/DatabaseCatalog.h>
 #include <Storages/IStorage.h>
+#include <Storages/MemorySettings.h>
 
 #include <Common/MultiVersion.h>
 
@@ -30,7 +31,7 @@ public:
         ColumnsDescription columns_description_,
         ConstraintsDescription constraints_,
         const String & comment,
-        bool compress_ = false);
+        const MemorySettings & memory_settings_ = MemorySettings());
 
     String getName() const override { return "Memory"; }
 
@@ -45,6 +46,8 @@ public:
 
     StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr query_context) const override;
 
+    const MemorySettings & getMemorySettingsRef() const { return memory_settings; }
+
     void read(
         QueryPlan & query_plan,
         const Names & column_names,
@@ -77,6 +80,7 @@ public:
     void restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
 
     void checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const override;
+    void alter(const AlterCommands & params, ContextPtr context, AlterLockHolder & alter_lock_holder) override;
 
     std::optional<UInt64> totalRows(const Settings &) const override;
     std::optional<UInt64> totalBytes(const Settings &) const override;
@@ -133,7 +137,7 @@ private:
     std::atomic<size_t> total_size_bytes = 0;
     std::atomic<size_t> total_size_rows = 0;
 
-    bool compress;
+    MemorySettings memory_settings;
 
     friend class ReadFromMemoryStorageStep;
 };
diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index 0d67403fa2f..5eceddfe06d 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -1,6 +1,13 @@
 #include <algorithm>
 #include <functional>
+#include <iterator>
 #include <Analyzer/ConstantNode.h>
+#include <Analyzer/ColumnNode.h>
+#include <Analyzer/FunctionNode.h>
+#include <Analyzer/IdentifierNode.h>
+#include <Analyzer/InDepthQueryTreeVisitor.h>
+#include <Analyzer/Passes/QueryAnalysisPass.h>
+#include <Analyzer/QueryTreeBuilder.h>
 #include <Analyzer/TableNode.h>
 #include <Analyzer/Utils.h>
 #include <Columns/ColumnSet.h>
@@ -25,6 +32,7 @@
 #include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectQuery.h>
+#include <Planner/PlannerActionsVisitor.h>
 #include <Planner/Utils.h>
 #include <Processors/ConcatProcessor.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
@@ -40,6 +48,7 @@
 #include <QueryPipeline/narrowPipe.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/StorageDistributed.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/StorageMerge.h>
 #include <Storages/StorageView.h>
@@ -51,11 +60,15 @@
 #include <Common/assert_cast.h>
 #include <Common/checkStackSize.h>
 #include <Common/typeid_cast.h>
+#include <Core/NamesAndTypes.h>
+#include <Functions/FunctionFactory.h>
+
+namespace DB
+{
 
 namespace
 {
 
-using namespace DB;
 bool columnIsPhysical(ColumnDefaultKind kind)
 {
     return kind == ColumnDefaultKind::Default || kind == ColumnDefaultKind::Materialized;
@@ -71,20 +84,33 @@ bool columnDefaultKindHasSameType(ColumnDefaultKind lhs, ColumnDefaultKind rhs)
     return false;
 }
 
+/// Adds to the select query section `WITH value AS column_name`
+///
+/// For example:
+/// - `WITH 9000 as _port`.
+void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & value)
+{
+    auto & select = ast->as<ASTSelectQuery &>();
+    if (!select.with())
+        select.setExpression(ASTSelectQuery::Expression::WITH, std::make_shared<ASTExpressionList>());
+
+    auto literal = std::make_shared<ASTLiteral>(value);
+    literal->alias = column_name;
+    literal->prefer_alias_to_column_name = true;
+    select.with()->children.push_back(literal);
 }
 
-namespace DB
-{
+}
 
 namespace ErrorCodes
 {
+    extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
     extern const int NOT_IMPLEMENTED;
     extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
     extern const int SAMPLING_NOT_SUPPORTED;
     extern const int ALTER_OF_COLUMN_IS_FORBIDDEN;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
-    extern const int LOGICAL_ERROR;
 }
 
 StorageMerge::DatabaseNameOrRegexp::DatabaseNameOrRegexp(
@@ -121,6 +147,7 @@ StorageMerge::StorageMerge(
     storage_metadata.setColumns(columns_.empty() ? getColumnsDescriptionFromSourceTables() : columns_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals());
 }
 
 StorageMerge::StorageMerge(
@@ -143,6 +170,7 @@ StorageMerge::StorageMerge(
     storage_metadata.setColumns(columns_.empty() ? getColumnsDescriptionFromSourceTables() : columns_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals());
 }
 
 StorageMerge::DatabaseTablesIterators StorageMerge::getDatabaseIterators(ContextPtr context_) const
@@ -201,6 +229,7 @@ bool StorageMerge::tableSupportsPrewhere() const
     /// If new table that matches regexp for current storage and doesn't support PREWHERE
     /// will appear after this check and before calling "read" method, the optimized query may fail.
     /// Since it's quite rare case, we just ignore this possibility.
+    /// TODO: Store tables inside StorageSnapshot
     ///
     /// NOTE: Type can be different, and in this case, PREWHERE cannot be
     /// applied for those columns, but there a separate method to return
@@ -208,11 +237,6 @@ bool StorageMerge::tableSupportsPrewhere() const
     return getFirstTable([](const auto & table) { return !table->canMoveConditionsToPrewhere(); }) == nullptr;
 }
 
-bool StorageMerge::canMoveConditionsToPrewhere() const
-{
-    return tableSupportsPrewhere();
-}
-
 std::optional<NameSet> StorageMerge::supportedPrewhereColumns() const
 {
     bool supports_prewhere = true;
@@ -299,6 +323,37 @@ QueryProcessingStage::Enum StorageMerge::getQueryProcessingStage(
     return selected_table_size == 1 ? stage_in_source_tables : std::min(stage_in_source_tables, QueryProcessingStage::WithMergeableState);
 }
 
+VirtualColumnsDescription StorageMerge::createVirtuals()
+{
+    VirtualColumnsDescription desc;
+
+    desc.addEphemeral("_database", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "");
+    desc.addEphemeral("_table", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()), "");
+
+    return desc;
+}
+
+StorageSnapshotPtr StorageMerge::getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr) const
+{
+    static const auto common_virtuals = createVirtuals();
+
+    auto virtuals = common_virtuals;
+    if (auto first_table = getFirstTable([](auto && table) { return table; }))
+    {
+        auto table_virtuals = first_table->getVirtualsPtr();
+        for (const auto & column : *table_virtuals)
+        {
+            if (virtuals.has(column.name))
+                continue;
+
+            virtuals.add(column);
+        }
+    }
+
+    auto virtuals_ptr = std::make_shared<VirtualColumnsDescription>(std::move(virtuals));
+    return std::make_shared<StorageSnapshot>(*this, metadata_snapshot, std::move(virtuals_ptr));
+}
+
 void StorageMerge::read(
     QueryPlan & query_plan,
     const Names & column_names,
@@ -309,53 +364,50 @@ void StorageMerge::read(
     const size_t max_block_size,
     size_t num_streams)
 {
-    /** Just in case, turn off optimization "transfer to PREWHERE",
-      * since there is no certainty that it works when one of table is MergeTree and other is not.
-      */
-    auto modified_context = Context::createCopy(local_context);
-    modified_context->setSetting("optimize_move_to_prewhere", false);
-    query_plan.addInterpreterContext(modified_context);
-
     /// What will be result structure depending on query processed stage in source tables?
     Block common_header = getHeaderForProcessingStage(column_names, storage_snapshot, query_info, local_context, processed_stage);
 
     auto step = std::make_unique<ReadFromMerge>(
-        common_header,
         column_names,
+        query_info,
+        storage_snapshot,
+        local_context,
+        common_header,
         max_block_size,
         num_streams,
         shared_from_this(),
-        storage_snapshot,
-        query_info,
-        std::move(modified_context),
         processed_stage);
 
     query_plan.addStep(std::move(step));
 }
 
 ReadFromMerge::ReadFromMerge(
+    const Names & column_names_,
+    const SelectQueryInfo & query_info_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
     Block common_header_,
-    Names all_column_names_,
     size_t max_block_size,
     size_t num_streams,
     StoragePtr storage,
-    StorageSnapshotPtr storage_snapshot,
-    const SelectQueryInfo & query_info_,
-    ContextMutablePtr context_,
     QueryProcessingStage::Enum processed_stage)
-    : SourceStepWithFilter(DataStream{.header = common_header_})
+    : SourceStepWithFilter(DataStream{.header = common_header_}, column_names_, query_info_, storage_snapshot_, context_)
     , required_max_block_size(max_block_size)
     , requested_num_streams(num_streams)
     , common_header(std::move(common_header_))
-    , all_column_names(std::move(all_column_names_))
+    , all_column_names(column_names_)
     , storage_merge(std::move(storage))
-    , merge_storage_snapshot(std::move(storage_snapshot))
-    , query_info(query_info_)
-    , context(std::move(context_))
+    , merge_storage_snapshot(storage_snapshot)
     , common_processed_stage(processed_stage)
 {
 }
 
+void ReadFromMerge::updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value)
+{
+    SourceStepWithFilter::updatePrewhereInfo(prewhere_info_value);
+    common_header = applyPrewhereActions(common_header, prewhere_info);
+}
+
 void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
 {
     filterTablesAndCreateChildrenPlans();
@@ -370,6 +422,7 @@ void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const Bu
     std::vector<std::unique_ptr<QueryPipelineBuilder>> pipelines;
 
     auto table_it = selected_tables.begin();
+    auto modified_context = Context::createCopy(context);
     for (size_t i = 0; i < selected_tables.size(); ++i, ++table_it)
     {
         auto & child_plan = child_plans->at(i);
@@ -379,7 +432,14 @@ void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const Bu
         const auto storage_metadata_snapshot = storage->getInMemoryMetadataPtr();
         const auto nested_storage_snaphsot = storage->getStorageSnapshot(storage_metadata_snapshot, context);
 
-        auto modified_query_info = getModifiedQueryInfo(query_info, context, table, nested_storage_snaphsot);
+        Names column_names_as_aliases;
+        Aliases aliases;
+
+        Names real_column_names = column_names;
+        if (child_plan.row_policy_data_opt)
+            child_plan.row_policy_data_opt->extendNames(real_column_names);
+
+        auto modified_query_info = getModifiedQueryInfo(modified_context, table, nested_storage_snaphsot, real_column_names, column_names_as_aliases, aliases);
 
         auto source_pipeline = createSources(
             child_plan.plan,
@@ -389,8 +449,7 @@ void ReadFromMerge::initializePipeline(QueryPipelineBuilder & pipeline, const Bu
             common_header,
             child_plan.table_aliases,
             child_plan.row_policy_data_opt,
-            table,
-            context);
+            table);
 
         if (source_pipeline && source_pipeline->initialized())
         {
@@ -488,8 +547,11 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
         query_info_.input_order_info = input_sorting_info;
     }
 
+    /// Settings will be modified when planning children tables.
     for (const auto & table : selected_tables)
     {
+        auto modified_context = Context::createCopy(context);
+
         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;
@@ -510,24 +572,26 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
         auto & aliases = res.back().table_aliases;
         auto & row_policy_data_opt = res.back().row_policy_data_opt;
         auto storage_metadata_snapshot = storage->getInMemoryMetadataPtr();
-        auto nested_storage_snaphsot = storage->getStorageSnapshot(storage_metadata_snapshot, context);
+        auto nested_storage_snaphsot = storage->getStorageSnapshot(storage_metadata_snapshot, modified_context);
 
-        auto modified_query_info = getModifiedQueryInfo(query_info, context, table, nested_storage_snaphsot);
         Names column_names_as_aliases;
         Names real_column_names = column_names;
 
         const auto & database_name = std::get<0>(table);
         const auto & table_name = std::get<3>(table);
-        auto row_policy_filter_ptr = context->getRowPolicyFilter(
+        auto row_policy_filter_ptr = modified_context->getRowPolicyFilter(
             database_name,
             table_name,
             RowPolicyFilterType::SELECT_FILTER);
-        if (row_policy_filter_ptr)
+        if (row_policy_filter_ptr && !row_policy_filter_ptr->empty())
         {
-            row_policy_data_opt = RowPolicyData(row_policy_filter_ptr, storage, context);
+            row_policy_data_opt = RowPolicyData(row_policy_filter_ptr, storage, modified_context);
             row_policy_data_opt->extendNames(real_column_names);
         }
 
+        auto modified_query_info
+            = getModifiedQueryInfo(modified_context, table, nested_storage_snaphsot, real_column_names, column_names_as_aliases, aliases);
+
         if (!context->getSettingsRef().allow_experimental_analyzer)
         {
             auto storage_columns = storage_metadata_snapshot->getColumns();
@@ -580,6 +644,10 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
                     column_names_as_aliases.push_back(ExpressionActions::getSmallestColumn(storage_metadata_snapshot->getColumns().getAllPhysical()).name);
             }
         }
+        else
+        {
+
+        }
 
         res.back().plan = createPlanForTable(
             nested_storage_snaphsot,
@@ -589,45 +657,319 @@ std::vector<ReadFromMerge::ChildPlan> ReadFromMerge::createChildrenPlans(SelectQ
             table,
             column_names_as_aliases.empty() ? std::move(real_column_names) : std::move(column_names_as_aliases),
             row_policy_data_opt,
-            context,
+            modified_context,
             current_streams);
+        res.back().plan.addInterpreterContext(modified_context);
     }
 
+
     return res;
 }
 
-SelectQueryInfo ReadFromMerge::getModifiedQueryInfo(const SelectQueryInfo & query_info,
-    const ContextPtr & modified_context,
+namespace
+{
+
+class ApplyAliasColumnExpressionsVisitor : public InDepthQueryTreeVisitor<ApplyAliasColumnExpressionsVisitor>
+{
+public:
+    explicit ApplyAliasColumnExpressionsVisitor(QueryTreeNodePtr replacement_table_expression_)
+        : replacement_table_expression(replacement_table_expression_)
+    {}
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        if (auto * column = node->as<ColumnNode>())
+        {
+            if (column->hasExpression())
+            {
+                QueryTreeNodePtr column_expression = column->getExpressionOrThrow();
+                column_expression->setAlias(column->getColumnName());
+                node = std::move(column_expression);
+            }
+            else
+                column->setColumnSource(replacement_table_expression);
+        }
+    }
+private:
+    QueryTreeNodePtr replacement_table_expression;
+};
+
+bool hasUnknownColumn(const QueryTreeNodePtr & node, QueryTreeNodePtr replacement_table_expression)
+{
+    QueryTreeNodes stack = { node };
+    while (!stack.empty())
+    {
+        auto current = stack.back();
+        stack.pop_back();
+
+        switch (current->getNodeType())
+        {
+            case QueryTreeNodeType::CONSTANT:
+                break;
+            case QueryTreeNodeType::COLUMN:
+            {
+                auto * column_node = current->as<ColumnNode>();
+                auto source = column_node->getColumnSourceOrNull();
+                if (source != replacement_table_expression)
+                    return true;
+                break;
+            }
+            default:
+            {
+                for (const auto & child : current->getChildren())
+                {
+                    if (child)
+                        stack.push_back(child);
+                }
+            }
+        }
+    }
+    return false;
+}
+
+void replaceFilterExpression(
+    QueryTreeNodePtr & expression,
+    const QueryTreeNodePtr & replacement_table_expression,
+    const ContextPtr & context)
+{
+    auto * function = expression->as<FunctionNode>();
+    if (!function)
+        return;
+
+    if (function->getFunctionName() != "and")
+    {
+        if (hasUnknownColumn(expression, replacement_table_expression))
+            expression = nullptr;
+        return;
+    }
+
+    QueryTreeNodes conjunctions;
+    QueryTreeNodes processing{ expression };
+
+    while (!processing.empty())
+    {
+        auto node = std::move(processing.back());
+        processing.pop_back();
+
+        if (auto * function_node = node->as<FunctionNode>())
+        {
+            if (function_node->getFunctionName() == "and")
+                std::copy(
+                    function_node->getArguments().begin(),
+                    function_node->getArguments().end(),
+                    std::back_inserter(processing)
+                );
+            else
+                conjunctions.push_back(node);
+        }
+        else
+        {
+            conjunctions.push_back(node);
+        }
+    }
+
+    std::swap(processing, conjunctions);
+
+    for (const auto & node : processing)
+    {
+        if (!hasUnknownColumn(node, replacement_table_expression))
+            conjunctions.push_back(node);
+    }
+
+    if (conjunctions.empty())
+    {
+        expression = {};
+        return;
+    }
+    if (conjunctions.size() == 1)
+    {
+        expression = conjunctions[0];
+        return;
+    }
+
+    function->getArguments().getNodes() = std::move(conjunctions);
+
+    const auto function_impl = FunctionFactory::instance().get("and", context);
+    function->resolveAsFunction(function_impl->build(function->getArgumentColumns()));
+}
+
+QueryTreeNodePtr replaceTableExpressionAndRemoveJoin(
+    QueryTreeNodePtr query,
+    QueryTreeNodePtr original_table_expression,
+    QueryTreeNodePtr replacement_table_expression,
+    const ContextPtr & context,
+    const Names & required_column_names)
+{
+    auto * query_node = query->as<QueryNode>();
+    auto join_tree_type = query_node->getJoinTree()->getNodeType();
+    auto modified_query = query_node->cloneAndReplace(original_table_expression, replacement_table_expression);
+
+    // For the case when join tree is just a table or a table function we don't need to do anything more.
+    if (join_tree_type == QueryTreeNodeType::TABLE || join_tree_type == QueryTreeNodeType::TABLE_FUNCTION)
+        return modified_query;
+
+    // JOIN needs to be removed because StorageMerge should produce not joined data.
+    // GROUP BY should be removed as well.
+
+    auto * modified_query_node = modified_query->as<QueryNode>();
+
+    // Remove the JOIN statement. As a result query will have a form like: SELECT * FROM <table> ...
+    modified_query = modified_query->cloneAndReplace(modified_query_node->getJoinTree(), replacement_table_expression);
+    modified_query_node = modified_query->as<QueryNode>();
+
+    query_node = modified_query->as<QueryNode>();
+
+    // For backward compatibility we need to leave all filters related to this table.
+    // It may lead to some incorrect result.
+    if (query_node->hasPrewhere())
+        replaceFilterExpression(query_node->getPrewhere(), replacement_table_expression, context);
+    if (query_node->hasWhere())
+        replaceFilterExpression(query_node->getWhere(), replacement_table_expression, context);
+
+    query_node->getGroupBy().getNodes().clear();
+    query_node->getHaving() = {};
+    query_node->getOrderBy().getNodes().clear();
+
+    auto & projection = modified_query_node->getProjection().getNodes();
+    projection.clear();
+    NamesAndTypes projection_columns;
+
+    // Select only required columns from the table, because projection list may contain:
+    // 1. aggregate functions
+    // 2. expressions referencing other tables of JOIN
+    for (auto const & column_name : required_column_names)
+    {
+        QueryTreeNodePtr fake_node = std::make_shared<IdentifierNode>(Identifier{column_name});
+
+        QueryAnalysisPass query_analysis_pass(original_table_expression);
+        query_analysis_pass.run(fake_node, context);
+
+        auto * resolved_column = fake_node->as<ColumnNode>();
+        if (!resolved_column)
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Required column '{}' is not resolved", column_name);
+        auto fake_column = resolved_column->getColumn();
+
+        // Identifier is resolved to ColumnNode, but we need to get rid of ALIAS columns
+        // and also fix references to source expression (now column is referencing original table expression).
+        ApplyAliasColumnExpressionsVisitor visitor(replacement_table_expression);
+        visitor.visit(fake_node);
+
+        projection.push_back(fake_node);
+        projection_columns.push_back(fake_column);
+    }
+
+    query_node->resolveProjectionColumns(std::move(projection_columns));
+
+    return modified_query;
+}
+
+}
+
+SelectQueryInfo ReadFromMerge::getModifiedQueryInfo(const ContextMutablePtr & modified_context,
     const StorageWithLockAndName & storage_with_lock_and_name,
-    const StorageSnapshotPtr & storage_snapshot)
+    const StorageSnapshotPtr & storage_snapshot_,
+    Names required_column_names,
+    Names & column_names_as_aliases,
+    Aliases & aliases) const
 {
     const auto & [database_name, storage, storage_lock, table_name] = storage_with_lock_and_name;
     const StorageID current_storage_id = storage->getStorageID();
 
     SelectQueryInfo modified_query_info = query_info;
+    if (modified_query_info.optimized_prewhere_info && !modified_query_info.prewhere_info)
+        modified_query_info.prewhere_info = modified_query_info.optimized_prewhere_info;
+
+    if (modified_query_info.planner_context)
+        modified_query_info.planner_context = std::make_shared<PlannerContext>(modified_context, modified_query_info.planner_context);
 
     if (modified_query_info.table_expression)
     {
-        auto replacement_table_expression = std::make_shared<TableNode>(storage, storage_lock, storage_snapshot);
+        auto replacement_table_expression = std::make_shared<TableNode>(storage, storage_lock, storage_snapshot_);
+        replacement_table_expression->setAlias(modified_query_info.table_expression->getAlias());
         if (query_info.table_expression_modifiers)
             replacement_table_expression->setTableExpressionModifiers(*query_info.table_expression_modifiers);
 
-        modified_query_info.query_tree = modified_query_info.query_tree->cloneAndReplace(modified_query_info.table_expression,
-            replacement_table_expression);
+        modified_query_info.query_tree = replaceTableExpressionAndRemoveJoin(modified_query_info.query_tree, modified_query_info.table_expression, replacement_table_expression, modified_context, required_column_names);
         modified_query_info.table_expression = replacement_table_expression;
         modified_query_info.planner_context->getOrCreateTableExpressionData(replacement_table_expression);
 
         auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
-        if (storage_snapshot->storage.supportsSubcolumns())
+        if (storage_snapshot_->storage.supportsSubcolumns())
             get_column_options.withSubcolumns();
 
         std::unordered_map<std::string, QueryTreeNodePtr> column_name_to_node;
 
-        if (!storage_snapshot->tryGetColumn(get_column_options, "_table"))
-            column_name_to_node.emplace("_table", std::make_shared<ConstantNode>(current_storage_id.table_name));
+        if (!storage_snapshot_->tryGetColumn(get_column_options, "_table"))
+        {
+            auto table_name_node = std::make_shared<ConstantNode>(current_storage_id.table_name);
+            auto table_name_alias = std::make_shared<ConstantNode>("__table1._table");
 
-        if (!storage_snapshot->tryGetColumn(get_column_options, "_database"))
-            column_name_to_node.emplace("_database", std::make_shared<ConstantNode>(current_storage_id.database_name));
+            auto function_node = std::make_shared<FunctionNode>("__actionName");
+            function_node->getArguments().getNodes().push_back(std::move(table_name_node));
+            function_node->getArguments().getNodes().push_back(std::move(table_name_alias));
+            function_node->resolveAsFunction(FunctionFactory::instance().get("__actionName", context));
+
+            column_name_to_node.emplace("_table", function_node);
+        }
+
+        if (!storage_snapshot_->tryGetColumn(get_column_options, "_database"))
+        {
+            auto database_name_node = std::make_shared<ConstantNode>(current_storage_id.database_name);
+            auto database_name_alias = std::make_shared<ConstantNode>("__table1._database");
+
+            auto function_node = std::make_shared<FunctionNode>("__actionName");
+            function_node->getArguments().getNodes().push_back(std::move(database_name_node));
+            function_node->getArguments().getNodes().push_back(std::move(database_name_alias));
+            function_node->resolveAsFunction(FunctionFactory::instance().get("__actionName", context));
+
+            column_name_to_node.emplace("_database", function_node);
+        }
+
+        auto storage_columns = storage_snapshot_->metadata->getColumns();
+
+        bool with_aliases = /* common_processed_stage == QueryProcessingStage::FetchColumns && */ !storage_columns.getAliases().empty();
+        if (with_aliases)
+        {
+            auto filter_actions_dag = std::make_shared<ActionsDAG>();
+            for (const auto & column : required_column_names)
+            {
+                const auto column_default = storage_columns.getDefault(column);
+                bool is_alias = column_default && column_default->kind == ColumnDefaultKind::Alias;
+
+                QueryTreeNodePtr column_node;
+
+                // Replace all references to ALIAS columns in the query by expressions.
+                if (is_alias)
+                {
+                    QueryTreeNodePtr fake_node = std::make_shared<IdentifierNode>(Identifier{column});
+
+                    QueryAnalysisPass query_analysis_pass(modified_query_info.table_expression);
+                    query_analysis_pass.run(fake_node, modified_context);
+
+                    auto * resolved_column = fake_node->as<ColumnNode>();
+
+                    column_node = fake_node;
+                    ApplyAliasColumnExpressionsVisitor visitor(replacement_table_expression);
+                    visitor.visit(column_node);
+
+                    if (!resolved_column || !resolved_column->getExpression())
+                        throw Exception(ErrorCodes::LOGICAL_ERROR, "Alias column is not resolved");
+
+                    column_name_to_node.emplace(column, column_node);
+                    aliases.push_back({ .name = column, .type = resolved_column->getResultType(), .expression = column_node->toAST() });
+                }
+                else
+                {
+                    column_node = std::make_shared<ColumnNode>(NameAndTypePair{column, storage_columns.getColumn(get_column_options, column).type }, modified_query_info.table_expression);
+                }
+
+                PlannerActionsVisitor actions_visitor(modified_query_info.planner_context, false /*use_column_identifier_as_action_node_name*/);
+                actions_visitor.visit(filter_actions_dag, column_node);
+            }
+            column_names_as_aliases = filter_actions_dag->getRequiredColumnsNames();
+            if (column_names_as_aliases.empty())
+                column_names_as_aliases.push_back(ExpressionActions::getSmallestColumn(storage_snapshot_->metadata->getColumns().getAllPhysical()).name);
+        }
 
         if (!column_name_to_node.empty())
         {
@@ -651,8 +993,8 @@ SelectQueryInfo ReadFromMerge::getModifiedQueryInfo(const SelectQueryInfo & quer
 
         if (!is_storage_merge_engine)
         {
-            VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_table", current_storage_id.table_name);
-            VirtualColumnUtils::rewriteEntityInAst(modified_query_info.query, "_database", current_storage_id.database_name);
+            rewriteEntityInAst(modified_query_info.query, "_table", current_storage_id.table_name);
+            rewriteEntityInAst(modified_query_info.query, "_database", current_storage_id.database_name);
         }
     }
 
@@ -679,14 +1021,13 @@ bool recursivelyApplyToReadingSteps(QueryPlan::Node * node, const std::function<
 
 QueryPipelineBuilderPtr ReadFromMerge::createSources(
     QueryPlan & plan,
-    const StorageSnapshotPtr & storage_snapshot,
+    const StorageSnapshotPtr & storage_snapshot_,
     SelectQueryInfo & modified_query_info,
     QueryProcessingStage::Enum processed_stage,
     const Block & header,
     const Aliases & aliases,
     const RowPolicyDataOpt & row_policy_data_opt,
     const StorageWithLockAndName & storage_with_lock,
-    ContextMutablePtr modified_context,
     bool concat_streams) const
 {
     if (!plan.isInitialized())
@@ -695,12 +1036,12 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
     QueryPipelineBuilderPtr builder;
 
     const auto & [database_name, storage, _, table_name] = storage_with_lock;
-    bool allow_experimental_analyzer = modified_context->getSettingsRef().allow_experimental_analyzer;
+    bool allow_experimental_analyzer = context->getSettingsRef().allow_experimental_analyzer;
     auto storage_stage
-        = storage->getQueryProcessingStage(modified_context, QueryProcessingStage::Complete, storage_snapshot, modified_query_info);
+        = storage->getQueryProcessingStage(context, processed_stage, storage_snapshot_, modified_query_info);
 
     builder = plan.buildQueryPipeline(
-        QueryPlanOptimizationSettings::fromContext(modified_context), BuildQueryPipelineSettings::fromContext(modified_context));
+        QueryPlanOptimizationSettings::fromContext(context), BuildQueryPipelineSettings::fromContext(context));
 
     if (processed_stage > storage_stage || (allow_experimental_analyzer && processed_stage != QueryProcessingStage::FetchColumns))
     {
@@ -724,46 +1065,87 @@ QueryPipelineBuilderPtr ReadFromMerge::createSources(
 
         Block pipe_header = builder->getHeader();
 
-        if (has_database_virtual_column && !pipe_header.has("_database"))
+        if (allow_experimental_analyzer)
         {
-            ColumnWithTypeAndName column;
-            column.name = "_database";
-            column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
-            column.column = column.type->createColumnConst(0, Field(database_name));
+            String table_alias = modified_query_info.query_tree->as<QueryNode>()->getJoinTree()->as<TableNode>()->getAlias();
 
-            auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto adding_column_actions = std::make_shared<ExpressionActions>(
-                std::move(adding_column_dag), ExpressionActionsSettings::fromContext(modified_context, CompileExpressions::yes));
+            String database_column = table_alias.empty() || processed_stage == QueryProcessingStage::FetchColumns ? "_database" : table_alias + "._database";
+            String table_column = table_alias.empty() || processed_stage == QueryProcessingStage::FetchColumns ? "_table" : table_alias + "._table";
 
-            builder->addSimpleTransform([&](const Block & stream_header)
-                                        { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            if (has_database_virtual_column && common_header.has(database_column)
+                && storage_stage == QueryProcessingStage::FetchColumns && !pipe_header.has(database_column))
+            {
+                ColumnWithTypeAndName column;
+                column.name = database_column;
+                column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+                column.column = column.type->createColumnConst(0, Field(database_name));
+
+                auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
+                auto adding_column_actions = std::make_shared<ExpressionActions>(
+                    std::move(adding_column_dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
+
+                builder->addSimpleTransform([&](const Block & stream_header)
+                                            { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            }
+
+            if (has_table_virtual_column && common_header.has(table_column)
+                && storage_stage == QueryProcessingStage::FetchColumns && !pipe_header.has(table_column))
+            {
+                ColumnWithTypeAndName column;
+                column.name = table_column;
+                column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+                column.column = column.type->createColumnConst(0, Field(table_name));
+
+                auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
+                auto adding_column_actions = std::make_shared<ExpressionActions>(
+                    std::move(adding_column_dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
+
+                builder->addSimpleTransform([&](const Block & stream_header)
+                                            { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            }
         }
-
-        if (has_table_virtual_column && !pipe_header.has("_table"))
+        else
         {
-            ColumnWithTypeAndName column;
-            column.name = "_table";
-            column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
-            column.column = column.type->createColumnConst(0, Field(table_name));
+            if (has_database_virtual_column && common_header.has("_database") && !pipe_header.has("_database"))
+            {
+                ColumnWithTypeAndName column;
+                column.name = "_database";
+                column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+                column.column = column.type->createColumnConst(0, Field(database_name));
 
-            auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
-            auto adding_column_actions = std::make_shared<ExpressionActions>(
-                std::move(adding_column_dag), ExpressionActionsSettings::fromContext(modified_context, CompileExpressions::yes));
+                auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
+                auto adding_column_actions = std::make_shared<ExpressionActions>(
+                    std::move(adding_column_dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
+                builder->addSimpleTransform([&](const Block & stream_header)
+                                            { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            }
 
-            builder->addSimpleTransform([&](const Block & stream_header)
-                                        { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            if (has_table_virtual_column && common_header.has("_table") && !pipe_header.has("_table"))
+            {
+                ColumnWithTypeAndName column;
+                column.name = "_table";
+                column.type = std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>());
+                column.column = column.type->createColumnConst(0, Field(table_name));
+
+                auto adding_column_dag = ActionsDAG::makeAddingColumnActions(std::move(column));
+                auto adding_column_actions = std::make_shared<ExpressionActions>(
+                    std::move(adding_column_dag), ExpressionActionsSettings::fromContext(context, CompileExpressions::yes));
+                builder->addSimpleTransform([&](const Block & stream_header)
+                                            { return std::make_shared<ExpressionTransform>(stream_header, adding_column_actions); });
+            }
         }
 
         /// Subordinary tables could have different but convertible types, like numeric types of different width.
         /// We must return streams with structure equals to structure of Merge table.
-        convertAndFilterSourceStream(header, storage_snapshot->metadata, aliases, row_policy_data_opt, modified_context, *builder, processed_stage);
+        convertAndFilterSourceStream(
+            header, modified_query_info, storage_snapshot_, aliases, row_policy_data_opt, context, *builder, storage_stage);
     }
 
     return builder;
 }
 
 QueryPlan ReadFromMerge::createPlanForTable(
-    const StorageSnapshotPtr & storage_snapshot,
+    const StorageSnapshotPtr & storage_snapshot_,
     SelectQueryInfo & modified_query_info,
     QueryProcessingStage::Enum processed_stage,
     UInt64 max_block_size,
@@ -787,24 +1169,24 @@ QueryPlan ReadFromMerge::createPlanForTable(
     bool allow_experimental_analyzer = modified_context->getSettingsRef().allow_experimental_analyzer;
 
     auto storage_stage = storage->getQueryProcessingStage(modified_context,
-        QueryProcessingStage::Complete,
-        storage_snapshot,
+        processed_stage,
+        storage_snapshot_,
         modified_query_info);
 
     QueryPlan plan;
 
-    if (processed_stage <= storage_stage || (allow_experimental_analyzer && processed_stage == QueryProcessingStage::FetchColumns))
+    if (processed_stage <= storage_stage)
     {
         /// 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);
+            real_column_names.push_back(ExpressionActions::getSmallestColumn(storage_snapshot_->metadata->getColumns().getAllPhysical()).name);
 
         StorageView * view = dynamic_cast<StorageView *>(storage.get());
         if (!view || allow_experimental_analyzer)
         {
             storage->read(plan,
                 real_column_names,
-                storage_snapshot,
+                storage_snapshot_,
                 modified_query_info,
                 modified_context,
                 processed_stage,
@@ -834,15 +1216,11 @@ QueryPlan ReadFromMerge::createPlanForTable(
 
         if (row_policy_data_opt)
         {
-            if (auto * source_step_with_filter = dynamic_cast<SourceStepWithFilter*>((plan.getRootNode()->step.get())))
-            {
+            if (auto * source_step_with_filter = dynamic_cast<SourceStepWithFilter *>((plan.getRootNode()->step.get())))
                 row_policy_data_opt->addStorageFilter(source_step_with_filter);
-            }
         }
-
-        applyFilters(plan);
     }
-    else if (processed_stage > storage_stage || (allow_experimental_analyzer && processed_stage != QueryProcessingStage::FetchColumns))
+    else if (processed_stage > storage_stage || allow_experimental_analyzer)
     {
         /// Maximum permissible parallelism is streams_num
         modified_context->setSetting("max_threads", streams_num);
@@ -982,7 +1360,6 @@ StorageMerge::StorageListWithLocks ReadFromMerge::getSelectedTables(
     if (!filter_by_database_virtual_column && !filter_by_table_virtual_column)
         return res;
 
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
     if (!filter_actions_dag)
         return res;
 
@@ -1103,11 +1480,13 @@ void StorageMerge::alter(
     params.apply(storage_metadata, local_context);
     DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, storage_metadata);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(createVirtuals());
 }
 
 void ReadFromMerge::convertAndFilterSourceStream(
     const Block & header,
-    const StorageMetadataPtr & metadata_snapshot,
+    SelectQueryInfo & modified_query_info,
+    const StorageSnapshotPtr & snapshot,
     const Aliases & aliases,
     const RowPolicyDataOpt & row_policy_data_opt,
     ContextPtr local_context,
@@ -1116,29 +1495,63 @@ void ReadFromMerge::convertAndFilterSourceStream(
 {
     Block before_block_header = builder.getHeader();
 
-    auto storage_sample_block = metadata_snapshot->getSampleBlock();
+    auto storage_sample_block = snapshot->metadata->getSampleBlock();
     auto pipe_columns = builder.getHeader().getNamesAndTypesList();
 
-    for (const auto & alias : aliases)
+    if (local_context->getSettingsRef().allow_experimental_analyzer)
     {
-        pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type));
-        ASTPtr expr = alias.expression;
-        auto syntax_result = TreeRewriter(local_context).analyze(expr, pipe_columns);
-        auto expression_analyzer = ExpressionAnalyzer{alias.expression, syntax_result, local_context};
-
-        auto dag = std::make_shared<ActionsDAG>(pipe_columns);
-        auto actions_dag = expression_analyzer.getActionsDAG(true, false);
-        auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
-
-        builder.addSimpleTransform([&](const Block & stream_header)
+        for (const auto & alias : aliases)
         {
-            return std::make_shared<ExpressionTransform>(stream_header, actions);
-        });
+            pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type));
+
+            auto actions_dag = std::make_shared<ActionsDAG>(pipe_columns);
+
+            QueryTreeNodePtr query_tree = buildQueryTree(alias.expression, local_context);
+            query_tree->setAlias(alias.name);
+
+            QueryAnalysisPass query_analysis_pass(modified_query_info.table_expression);
+            query_analysis_pass.run(query_tree, local_context);
+
+            PlannerActionsVisitor actions_visitor(modified_query_info.planner_context, false /*use_column_identifier_as_action_node_name*/);
+            const auto & nodes = actions_visitor.visit(actions_dag, query_tree);
+
+            if (nodes.size() != 1)
+                throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected to have 1 output but got {}", nodes.size());
+
+            actions_dag->addOrReplaceInOutputs(actions_dag->addAlias(*nodes.front(), alias.name));
+
+            auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
+
+            builder.addSimpleTransform([&](const Block & stream_header)
+            {
+                return std::make_shared<ExpressionTransform>(stream_header, actions);
+            });
+        }
+    }
+    else
+    {
+        for (const auto & alias : aliases)
+        {
+            pipe_columns.emplace_back(NameAndTypePair(alias.name, alias.type));
+            ASTPtr expr = alias.expression;
+            auto syntax_result = TreeRewriter(local_context).analyze(expr, pipe_columns);
+            auto expression_analyzer = ExpressionAnalyzer{alias.expression, syntax_result, local_context};
+
+            auto dag = std::make_shared<ActionsDAG>(pipe_columns);
+            auto actions_dag = expression_analyzer.getActionsDAG(true, false);
+            auto actions = std::make_shared<ExpressionActions>(actions_dag, ExpressionActionsSettings::fromContext(local_context, CompileExpressions::yes));
+
+            builder.addSimpleTransform([&](const Block & stream_header)
+            {
+                return std::make_shared<ExpressionTransform>(stream_header, actions);
+            });
+        }
     }
 
     ActionsDAG::MatchColumnsMode convert_actions_match_columns_mode = ActionsDAG::MatchColumnsMode::Name;
 
-    if (local_context->getSettingsRef().allow_experimental_analyzer && processed_stage != QueryProcessingStage::FetchColumns)
+    if (local_context->getSettingsRef().allow_experimental_analyzer
+        && (processed_stage != QueryProcessingStage::FetchColumns || dynamic_cast<const StorageDistributed *>(&snapshot->storage) != nullptr))
         convert_actions_match_columns_mode = ActionsDAG::MatchColumnsMode::Position;
 
     if (row_policy_data_opt)
@@ -1193,28 +1606,41 @@ bool ReadFromMerge::requestReadingInOrder(InputOrderInfoPtr order_info_)
     return true;
 }
 
-void ReadFromMerge::applyFilters(const QueryPlan & plan) const
+void ReadFromMerge::applyFilters(const QueryPlan & plan, const ActionDAGNodes & added_filter_nodes) const
 {
-    auto apply_filters = [this](ReadFromMergeTree & read_from_merge_tree)
+    auto apply_filters = [&added_filter_nodes](ReadFromMergeTree & read_from_merge_tree)
     {
-        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]);
+        for (const auto & node : added_filter_nodes.nodes)
+            read_from_merge_tree.addFilterFromParentStep(node);
 
-        read_from_merge_tree.applyFilters();
+        read_from_merge_tree.SourceStepWithFilter::applyFilters();
         return true;
     };
 
     recursivelyApplyToReadingSteps(plan.getRootNode(), apply_filters);
 }
 
-void ReadFromMerge::applyFilters()
+void ReadFromMerge::applyFilters(ActionDAGNodes added_filter_nodes)
 {
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+
     filterTablesAndCreateChildrenPlans();
 
     for (const auto & child_plan : *child_plans)
         if (child_plan.plan.isInitialized())
-            applyFilters(child_plan.plan);
+            applyFilters(child_plan.plan, added_filter_nodes);
+}
+
+QueryPlanRawPtrs ReadFromMerge::getChildPlans()
+{
+    filterTablesAndCreateChildrenPlans();
+
+    QueryPlanRawPtrs plans;
+    for (auto & child_plan : *child_plans)
+        if (child_plan.plan.isInitialized())
+            plans.push_back(&child_plan.plan);
+
+    return plans;
 }
 
 IStorage::ColumnSizeByName StorageMerge::getColumnSizes() const
@@ -1249,9 +1675,9 @@ std::tuple<bool /* is_regexp */, ASTPtr> StorageMerge::evaluateDatabaseName(cons
     return {false, ast};
 }
 
-bool StorageMerge::supportsTrivialCountOptimization() const
+bool StorageMerge::supportsTrivialCountOptimization(const StorageSnapshotPtr & storage_snapshot, ContextPtr ctx) const
 {
-    return getFirstTable([&](const auto & table) { return !table->supportsTrivialCountOptimization(); }) == nullptr;
+    return getFirstTable([&](const auto & table) { return !table->supportsTrivialCountOptimization(storage_snapshot, ctx); }) == nullptr;
 }
 
 std::optional<UInt64> StorageMerge::totalRows(const Settings & settings) const
@@ -1314,20 +1740,4 @@ void registerStorageMerge(StorageFactory & factory)
     });
 }
 
-NamesAndTypesList StorageMerge::getVirtuals() const
-{
-    NamesAndTypesList virtuals{
-        {"_database", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_table", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())}};
-
-    auto first_table = getFirstTable([](auto && table) { return table; });
-    if (first_table)
-    {
-        auto table_virtuals = first_table->getVirtuals();
-        virtuals.insert(virtuals.end(), table_virtuals.begin(), table_virtuals.end());
-    }
-
-    return virtuals;
-}
-
 }
diff --git a/src/Storages/StorageMerge.h b/src/Storages/StorageMerge.h
index 703e5db9c50..a63ea1e32ef 100644
--- a/src/Storages/StorageMerge.h
+++ b/src/Storages/StorageMerge.h
@@ -49,14 +49,14 @@ public:
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
     bool supportsSubcolumns() const override { return true; }
-    bool supportsPrewhere() const override { return true; }
+    bool supportsPrewhere() const override { return tableSupportsPrewhere(); }
     std::optional<NameSet> supportedPrewhereColumns() const override;
 
-    bool canMoveConditionsToPrewhere() const override;
-
     QueryProcessingStage::Enum
     getQueryProcessingStage(ContextPtr, QueryProcessingStage::Enum, const StorageSnapshotPtr &, SelectQueryInfo &) const override;
 
+    StorageSnapshotPtr getStorageSnapshot(const StorageMetadataPtr & metadata_snapshot, ContextPtr) const override;
+
     void read(
         QueryPlan & query_plan,
         const Names & column_names,
@@ -76,7 +76,7 @@ public:
     /// Evaluate database name or regexp for StorageMerge and TableFunction merge
     static std::tuple<bool /* is_regexp */, ASTPtr> evaluateDatabaseName(const ASTPtr & node, ContextPtr context);
 
-    bool supportsTrivialCountOptimization() const override;
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override;
 
     std::optional<UInt64> totalRows(const Settings & settings) const override;
     std::optional<UInt64> totalBytes(const Settings & settings) const override;
@@ -118,11 +118,12 @@ private:
     template <typename F>
     void forEachTable(F && func) const;
 
-    NamesAndTypesList getVirtuals() const override;
     ColumnSizeByName getColumnSizes() const override;
 
     ColumnsDescription getColumnsDescriptionFromSourceTables() const;
 
+    static VirtualColumnsDescription createVirtuals();
+
     bool tableSupportsPrewhere() const;
 
     template <typename F>
@@ -142,14 +143,14 @@ public:
     using DatabaseTablesIterators = std::vector<DatabaseTablesIteratorPtr>;
 
     ReadFromMerge(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block common_header_,
-        Names all_column_names_,
         size_t max_block_size,
         size_t num_streams,
         StoragePtr storage,
-        StorageSnapshotPtr storage_snapshot,
-        const SelectQueryInfo & query_info_,
-        ContextMutablePtr context_,
         QueryProcessingStage::Enum processed_stage);
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
@@ -159,12 +160,16 @@ public:
     /// Returns `false` if requested reading cannot be performed.
     bool requestReadingInOrder(InputOrderInfoPtr order_info_);
 
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+    QueryPlanRawPtrs getChildPlans() override;
+
+    void updatePrewhereInfo(const PrewhereInfoPtr & prewhere_info_value) override;
 
 private:
     const size_t required_max_block_size;
     const size_t requested_num_streams;
-    const Block common_header;
+    Block common_header;
 
     StorageListWithLocks selected_tables;
     Names all_column_names;
@@ -174,8 +179,6 @@ private:
     StoragePtr storage_merge;
     StorageSnapshotPtr merge_storage_snapshot;
 
-    SelectQueryInfo query_info;
-    ContextMutablePtr context;
     QueryProcessingStage::Enum common_processed_stage;
 
     InputOrderInfoPtr order_info;
@@ -189,6 +192,13 @@ private:
 
     using Aliases = std::vector<AliasData>;
 
+    SelectQueryInfo getModifiedQueryInfo(const ContextMutablePtr & modified_context,
+        const StorageWithLockAndName & storage_with_lock_and_name,
+        const StorageSnapshotPtr & storage_snapshot,
+        Names required_column_names,
+        Names & column_names_as_aliases,
+        Aliases & aliases) const;
+
     /// An object of this helper class is created
     ///  when processing a Merge table data source (subordinary table)
     ///  that has row policies
@@ -236,7 +246,7 @@ private:
 
     void filterTablesAndCreateChildrenPlans();
 
-    void applyFilters(const QueryPlan & plan) const;
+    void applyFilters(const QueryPlan & plan, const ActionDAGNodes & added_filter_nodes) const;
 
     QueryPlan createPlanForTable(
         const StorageSnapshotPtr & storage_snapshot,
@@ -258,17 +268,12 @@ private:
         const Aliases & aliases,
         const RowPolicyDataOpt & row_policy_data_opt,
         const StorageWithLockAndName & storage_with_lock,
-        ContextMutablePtr modified_context,
         bool concat_streams = false) const;
 
-    static SelectQueryInfo getModifiedQueryInfo(const SelectQueryInfo & query_info,
-        const ContextPtr & modified_context,
-        const StorageWithLockAndName & storage_with_lock_and_name,
-        const StorageSnapshotPtr & storage_snapshot);
-
     static void convertAndFilterSourceStream(
         const Block & header,
-        const StorageMetadataPtr & metadata_snapshot,
+        SelectQueryInfo & modified_query_info,
+        const StorageSnapshotPtr & snapshot,
         const Aliases & aliases,
         const RowPolicyDataOpt & row_policy_data_opt,
         ContextPtr context,
@@ -279,6 +284,8 @@ private:
         ContextPtr query_context,
         bool filter_by_database_virtual_column,
         bool filter_by_table_virtual_column) const;
+
+    // static VirtualColumnsDescription createVirtuals(StoragePtr first_table);
 };
 
 }
diff --git a/src/Storages/StorageMergeTree.cpp b/src/Storages/StorageMergeTree.cpp
index 4761ccd8b58..c410ed1d468 100644
--- a/src/Storages/StorageMergeTree.cpp
+++ b/src/Storages/StorageMergeTree.cpp
@@ -5,6 +5,7 @@
 #include <optional>
 #include <ranges>
 
+#include <Poco/Timestamp.h>
 #include <base/sort.h>
 #include <Backups/BackupEntriesCollector.h>
 #include <Databases/IDatabase.h>
@@ -29,12 +30,13 @@
 #include <Parsers/ASTSetQuery.h>
 #include <Parsers/queryToString.h>
 #include <Parsers/formatAST.h>
+#include <Planner/Utils.h>
+#include <Storages/buildQueryTreeForShard.h>
 #include <Storages/MergeTree/MergeTreeData.h>
 #include <Storages/MergeTree/ActiveDataPartSet.h>
 #include <Storages/AlterCommands.h>
 #include <Storages/PartitionCommands.h>
 #include <Storages/MergeTree/MergeTreeSink.h>
-#include <Storages/MergeTree/MergeTreeDataPartInMemory.h>
 #include <Storages/MergeTree/MergePlainMergeTreeTask.h>
 #include <Storages/MergeTree/PartitionPruner.h>
 #include <Storages/MergeTree/MergeList.h>
@@ -63,6 +65,7 @@ namespace ErrorCodes
     extern const int NO_SUCH_DATA_PART;
     extern const int ABORTED;
     extern const int SUPPORT_IS_DISABLED;
+    extern const int TABLE_IS_READ_ONLY;
 }
 
 namespace ActionLocks
@@ -72,7 +75,7 @@ namespace ActionLocks
     extern const StorageActionBlockType PartsMove;
 }
 
-static MergeTreeTransactionPtr tryGetTransactionForMutation(const MergeTreeMutationEntry & mutation, Poco::Logger * log = nullptr)
+static MergeTreeTransactionPtr tryGetTransactionForMutation(const MergeTreeMutationEntry & mutation, LoggerPtr log = nullptr)
 {
     assert(!mutation.tid.isEmpty());
     if (mutation.tid.isPrehistoric())
@@ -93,12 +96,11 @@ StorageMergeTree::StorageMergeTree(
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
-    bool attach,
+    LoadingStrictnessLevel mode,
     ContextMutablePtr context_,
     const String & date_column_name,
     const MergingParams & merging_params_,
-    std::unique_ptr<MergeTreeSettings> storage_settings_,
-    bool has_force_restore_data_flag)
+    std::unique_ptr<MergeTreeSettings> storage_settings_)
     : MergeTreeData(
         table_id_,
         metadata_,
@@ -107,17 +109,17 @@ StorageMergeTree::StorageMergeTree(
         merging_params_,
         std::move(storage_settings_),
         false,      /// require_part_metadata
-        attach)
+        mode)
     , reader(*this)
     , writer(*this)
     , merger_mutator(*this)
 {
-    initializeDirectoriesAndFormatVersion(relative_data_path_, attach, date_column_name);
+    initializeDirectoriesAndFormatVersion(relative_data_path_, LoadingStrictnessLevel::ATTACH <= mode, date_column_name);
 
 
-    loadDataParts(has_force_restore_data_flag, std::nullopt);
+    loadDataParts(LoadingStrictnessLevel::FORCE_RESTORE <= mode, std::nullopt);
 
-    if (!attach && !getDataPartsForInternalUsage().empty() && !isStaticStorage())
+    if (mode < LoadingStrictnessLevel::ATTACH && !getDataPartsForInternalUsage().empty() && !isStaticStorage())
         throw Exception(ErrorCodes::INCORRECT_DATA,
                         "Data directory for table already containing data parts - probably "
                         "it was unclean DROP table or manual intervention. "
@@ -213,16 +215,25 @@ void StorageMergeTree::read(
 {
     if (local_context->canUseParallelReplicasOnInitiator() && local_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree)
     {
-        const auto table_id = getStorageID();
-        const auto & modified_query_ast =  ClusterProxy::rewriteSelectQuery(
-            local_context, query_info.query,
-            table_id.database_name, table_id.table_name, /*remote_table_function_ptr*/nullptr);
-
+        ASTPtr modified_query_ast;
         Block header;
         if (local_context->getSettingsRef().allow_experimental_analyzer)
-            header = InterpreterSelectQueryAnalyzer::getSampleBlock(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze());
+        {
+            QueryTreeNodePtr modified_query_tree = query_info.query_tree->clone();
+            rewriteJoinToGlobalJoin(modified_query_tree, local_context);
+            modified_query_tree = buildQueryTreeForShard(query_info.planner_context, modified_query_tree);
+            header = InterpreterSelectQueryAnalyzer::getSampleBlock(
+                modified_query_tree, local_context, SelectQueryOptions(processed_stage).analyze());
+            modified_query_ast = queryNodeToDistributedSelectQuery(modified_query_tree);
+        }
         else
-            header = InterpreterSelectQuery(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+        {
+            const auto table_id = getStorageID();
+            modified_query_ast = ClusterProxy::rewriteSelectQuery(local_context, query_info.query,
+                table_id.database_name, table_id.table_name, /*remote_table_function_ptr*/nullptr);
+            header
+                = InterpreterSelectQuery(modified_query_ast, local_context, SelectQueryOptions(processed_stage).analyze()).getSampleBlock();
+        }
 
         ClusterProxy::SelectStreamFactory select_stream_factory =
             ClusterProxy::SelectStreamFactory(
@@ -233,7 +244,6 @@ void StorageMergeTree::read(
 
         ClusterProxy::executeQueryWithParallelReplicas(
             query_plan,
-            getStorageID(),
             select_stream_factory,
             modified_query_ast,
             local_context,
@@ -241,7 +251,9 @@ void StorageMergeTree::read(
     }
     else
     {
-        const bool enable_parallel_reading = local_context->canUseParallelReplicasOnFollower() && local_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree;
+        const bool enable_parallel_reading = local_context->canUseParallelReplicasOnFollower()
+            && local_context->getSettingsRef().parallel_replicas_for_non_replicated_merge_tree
+            && (!local_context->getSettingsRef().allow_experimental_analyzer || query_info.analyzer_can_use_parallel_replicas_on_follower);
 
         if (auto plan = reader.read(
                 column_names,
@@ -284,6 +296,8 @@ std::optional<UInt64> StorageMergeTree::totalBytesUncompressed(const Settings &)
 SinkToStoragePtr
 StorageMergeTree::write(const ASTPtr & /*query*/, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, bool /*async_insert*/)
 {
+    assertNotReadonly();
+
     const auto & settings = local_context->getSettingsRef();
     return std::make_shared<MergeTreeSink>(
         *this, metadata_snapshot, settings.max_partitions_per_insert_block, local_context);
@@ -309,9 +323,6 @@ void StorageMergeTree::checkTableCanBeDropped(ContextPtr query_context) const
 void StorageMergeTree::drop()
 {
     shutdown(true);
-    /// In case there is read-only disk we cannot allow to call dropAllData(), but dropping tables is allowed.
-    if (isStaticStorage())
-        return;
     dropAllData();
 }
 
@@ -320,6 +331,8 @@ void StorageMergeTree::alter(
     ContextPtr local_context,
     AlterLockHolder & table_lock_holder)
 {
+    assertNotReadonly();
+
     if (local_context->getCurrentTransaction() && local_context->getSettingsRef().throw_on_unsupported_query_inside_transaction)
         throw Exception(ErrorCodes::NOT_IMPLEMENTED, "ALTER METADATA is not supported inside transactions");
 
@@ -423,7 +436,7 @@ CurrentlyMergingPartsTagger::CurrentlyMergingPartsTagger(
     /// if we mutate part, than we should reserve space on the same disk, because mutations possible can create hardlinks
     if (is_mutation)
     {
-        reserved_space = storage.tryReserveSpace(total_size, future_part->parts[0]->getDataPartStorage());
+        reserved_space = StorageMergeTree::tryReserveSpace(total_size, future_part->parts[0]->getDataPartStorage());
     }
     else
     {
@@ -525,6 +538,8 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr re
 
     Int64 sources_data_version = result_part->parts.at(0)->info.getDataVersion();
     Int64 result_data_version = result_part->part_info.getDataVersion();
+    auto & failed_part = result_part->parts.at(0);
+
     if (sources_data_version != result_data_version)
     {
         std::lock_guard lock(currently_processing_in_background_mutex);
@@ -542,14 +557,21 @@ void StorageMergeTree::updateMutationEntriesErrors(FutureMergedMutatedPartPtr re
                     entry.latest_failed_part_info = MergeTreePartInfo();
                     entry.latest_fail_time = 0;
                     entry.latest_fail_reason.clear();
+                    if (static_cast<UInt64>(result_part->part_info.mutation) == it->first)
+                        mutation_backoff_policy.removePartFromFailed(failed_part->name);
                 }
             }
             else
             {
-                entry.latest_failed_part = result_part->parts.at(0)->name;
-                entry.latest_failed_part_info = result_part->parts.at(0)->info;
+                entry.latest_failed_part = failed_part->name;
+                entry.latest_failed_part_info = failed_part->info;
                 entry.latest_fail_time = time(nullptr);
                 entry.latest_fail_reason = exception_message;
+
+                if (static_cast<UInt64>(result_part->part_info.mutation) == it->first)
+                {
+                    mutation_backoff_policy.addPartMutationFailure(failed_part->name, getSettings()->max_postpone_time_for_failed_mutations_ms);
+                }
             }
         }
     }
@@ -610,6 +632,8 @@ void StorageMergeTree::setMutationCSN(const String & mutation_id, CSN csn)
 
 void StorageMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
+    assertNotReadonly();
+
     delayMutationOrThrowIfNeeded(nullptr, query_context);
 
     /// Validate partition IDs (if any) before starting mutation
@@ -673,7 +697,7 @@ std::optional<MergeTreeMutationStatus> StorageMergeTree::getIncompleteMutationsS
 
     const auto & mutation_entry = current_mutation_it->second;
 
-    auto txn = tryGetTransactionForMutation(mutation_entry, log);
+    auto txn = tryGetTransactionForMutation(mutation_entry, log.load());
     /// 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);
@@ -800,6 +824,8 @@ std::vector<MergeTreeMutationStatus> StorageMergeTree::getMutationsStatus() cons
 
 CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
 {
+    assertNotReadonly();
+
     LOG_TRACE(log, "Killing mutation {}", mutation_id);
     UInt64 mutation_version = MergeTreeMutationEntry::tryParseFileName(mutation_id);
     if (!mutation_version)
@@ -816,10 +842,12 @@ CancellationCode StorageMergeTree::killMutation(const String & mutation_id)
         }
     }
 
+    mutation_backoff_policy.resetMutationFailures();
+
     if (!to_kill)
         return CancellationCode::NotFound;
 
-    if (auto txn = tryGetTransactionForMutation(*to_kill, log))
+    if (auto txn = tryGetTransactionForMutation(*to_kill, log.load()))
     {
         LOG_TRACE(log, "Cancelling transaction {} which had started mutation {}", to_kill->tid, mutation_id);
         TransactionLog::instance().rollbackTransaction(txn);
@@ -905,7 +933,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
     bool aggressive,
     const String & partition_id,
     bool final,
-    String & out_disable_reason,
+    PreformattedMessage & out_disable_reason,
     TableLockHolder & /* table_lock_holder */,
     std::unique_lock<std::mutex> & lock,
     const MergeTreeTransactionPtr & txn,
@@ -923,7 +951,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
     CurrentlyMergingPartsTaggerPtr merging_tagger;
     MergeList::EntryPtr merge_entry;
 
-    auto can_merge = [this, &lock](const DataPartPtr & left, const DataPartPtr & right, const MergeTreeTransaction * tx, String & disable_reason) -> bool
+    auto can_merge = [this, &lock](const DataPartPtr & left, const DataPartPtr & right, const MergeTreeTransaction * tx, PreformattedMessage & disable_reason) -> bool
     {
         if (tx)
         {
@@ -932,7 +960,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
             if ((left && !left->version.isVisible(tx->getSnapshot(), Tx::EmptyTID))
                     || (right && !right->version.isVisible(tx->getSnapshot(), Tx::EmptyTID)))
             {
-                disable_reason = "Some part is not visible in transaction";
+                disable_reason = PreformattedMessage::create("Some part is not visible in transaction");
                 return false;
             }
 
@@ -940,7 +968,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
             if ((left && left->version.isRemovalTIDLocked())
                     || (right && right->version.isRemovalTIDLocked()))
             {
-                disable_reason = "Some part is locked for removal in another cuncurrent transaction";
+                disable_reason = PreformattedMessage::create("Some part is locked for removal in another cuncurrent transaction");
                 return false;
             }
         }
@@ -951,7 +979,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
         {
             if (currently_merging_mutating_parts.contains(right))
             {
-                disable_reason = "Some part currently in a merging or mutating process";
+                disable_reason = PreformattedMessage::create("Some part currently in a merging or mutating process");
                 return false;
             }
             else
@@ -960,13 +988,13 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
 
         if (currently_merging_mutating_parts.contains(left) || currently_merging_mutating_parts.contains(right))
         {
-            disable_reason = "Some part currently in a merging or mutating process";
+            disable_reason = PreformattedMessage::create("Some part currently in a merging or mutating process");
             return false;
         }
 
         if (getCurrentMutationVersion(left, lock) != getCurrentMutationVersion(right, lock))
         {
-            disable_reason = "Some parts have different mutation version";
+            disable_reason = PreformattedMessage::create("Some parts have different mutation version");
             return false;
         }
 
@@ -976,7 +1004,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
         auto max_possible_level = getMaxLevelInBetween(left, right);
         if (max_possible_level > std::max(left->info.level, right->info.level))
         {
-            disable_reason = fmt::format("There is an outdated part in a gap between two active parts ({}, {}) with merge level {} higher than these active parts have", left->name, right->name, max_possible_level);
+            disable_reason = PreformattedMessage::create("There is an outdated part in a gap between two active parts ({}, {}) with merge level {} higher than these active parts have", left->name, right->name, max_possible_level);
             return false;
         }
 
@@ -985,11 +1013,11 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
 
     SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
 
-    auto is_background_memory_usage_ok = [](String & disable_reason) -> bool
+    auto is_background_memory_usage_ok = [](PreformattedMessage & disable_reason) -> bool
     {
         if (canEnqueueBackgroundTask())
             return true;
-        disable_reason = fmt::format("Current background tasks memory usage ({}) is more than the limit ({})",
+        disable_reason = PreformattedMessage::create("Current background tasks memory usage ({}) is more than the limit ({})",
             formatReadableSizeWithBinarySuffix(background_memory_tracker.get()),
             formatReadableSizeWithBinarySuffix(background_memory_tracker.getSoftLimit()));
         return false;
@@ -1017,7 +1045,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
                     out_disable_reason);
             }
             else
-                out_disable_reason = "Current value of max_source_parts_size is zero";
+                out_disable_reason = PreformattedMessage::create("Current value of max_source_parts_size is zero");
         }
     }
     else
@@ -1058,7 +1086,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
 
                 if (std::cv_status::timeout == currently_processing_in_background_condition.wait_for(lock, timeout))
                 {
-                    out_disable_reason = fmt::format("Timeout ({} ms) while waiting for already running merges before running OPTIMIZE with FINAL", timeout_ms);
+                    out_disable_reason = PreformattedMessage::create("Timeout ({} ms) while waiting for already running merges before running OPTIMIZE with FINAL", timeout_ms);
                     break;
                 }
             }
@@ -1074,9 +1102,9 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
 
     if (select_decision != SelectPartsDecision::SELECTED)
     {
-        if (!out_disable_reason.empty())
-            out_disable_reason += ". ";
-        out_disable_reason += "Cannot select parts for optimization";
+        if (!out_disable_reason.text.empty())
+            out_disable_reason.text += ". ";
+        out_disable_reason.text += "Cannot select parts for optimization";
 
         return {};
     }
@@ -1085,7 +1113,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMerge(
     if (isTTLMergeType(future_part->merge_type))
         getContext()->getMergeList().bookMergeWithTTL();
 
-    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part->parts), *this, metadata_snapshot, false);
+    merging_tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace(future_part->parts, true), *this, metadata_snapshot, false);
     return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(merging_tagger), std::make_shared<MutationCommands>());
 }
 
@@ -1097,7 +1125,7 @@ bool StorageMergeTree::merge(
     const Names & deduplicate_by_columns,
     bool cleanup,
     const MergeTreeTransactionPtr & txn,
-    String & out_disable_reason,
+    PreformattedMessage & out_disable_reason,
     bool optimize_skip_merged_partitions)
 {
     auto table_lock_holder = lockForShare(RWLockImpl::NO_QUERY, getSettings()->lock_acquire_timeout_for_background_operations);
@@ -1152,7 +1180,7 @@ bool StorageMergeTree::partIsAssignedToBackgroundOperation(const DataPartPtr & p
 }
 
 MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
-    const StorageMetadataPtr & metadata_snapshot, String & /* disable_reason */, TableLockHolder & /* table_lock_holder */,
+    const StorageMetadataPtr & metadata_snapshot, PreformattedMessage & /* disable_reason */, TableLockHolder & /* table_lock_holder */,
     std::unique_lock<std::mutex> & /*currently_processing_in_background_mutex_lock*/)
 {
     if (current_mutations_by_version.empty())
@@ -1200,6 +1228,12 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
         TransactionID first_mutation_tid = mutations_begin_it->second.tid;
         MergeTreeTransactionPtr txn;
 
+        if (!mutation_backoff_policy.partCanBeMutated(part->name))
+        {
+            LOG_DEBUG(log, "According to exponential backoff policy, do not perform mutations for the part {} yet. Put it aside.", part->name);
+            continue;
+        }
+
         if (!first_mutation_tid.isPrehistoric())
         {
 
@@ -1212,7 +1246,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
             if (!part->version.isVisible(first_mutation_tid.start_csn, first_mutation_tid))
                 continue;
 
-            txn = tryGetTransactionForMutation(mutations_begin_it->second, log);
+            txn = tryGetTransactionForMutation(mutations_begin_it->second, log.load());
             if (!txn)
                 throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot find transaction {} that has started mutation {} "
                                 "that is going to be applied to part {}",
@@ -1302,7 +1336,7 @@ MergeMutateSelectedEntryPtr StorageMergeTree::selectPartsToMutate(
             future_part->name = part->getNewName(new_part_info);
             future_part->part_format = part->getFormat();
 
-            tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}), *this, metadata_snapshot, true);
+            tagger = std::make_unique<CurrentlyMergingPartsTagger>(future_part, MergeTreeDataMergerMutator::estimateNeededDiskSpace({part}, false), *this, metadata_snapshot, true);
             return std::make_shared<MergeMutateSelectedEntry>(future_part, std::move(tagger), commands, txn);
         }
     }
@@ -1362,7 +1396,7 @@ bool StorageMergeTree::scheduleDataProcessingJob(BackgroundJobsAssignee & assign
         if (merger_mutator.merges_blocker.isCancelled())
             return false;
 
-        String out_reason;
+        PreformattedMessage out_reason;
         merge_entry = selectPartsToMerge(metadata_snapshot, false, {}, false, out_reason, shared_lock, lock, txn);
 
         if (!merge_entry && !current_mutations_by_version.empty())
@@ -1445,8 +1479,11 @@ UInt64 StorageMergeTree::getCurrentMutationVersion(
 
 size_t StorageMergeTree::clearOldMutations(bool truncate)
 {
-    size_t finished_mutations_to_keep = truncate ? 0 : getSettings()->finished_mutations_to_keep;
+    size_t finished_mutations_to_keep = getSettings()->finished_mutations_to_keep;
+    if (!truncate && !finished_mutations_to_keep)
+        return 0;
 
+    finished_mutations_to_keep = truncate ? 0 : finished_mutations_to_keep;
     std::vector<MergeTreeMutationEntry> mutations_to_delete;
     {
         std::lock_guard lock(currently_processing_in_background_mutex);
@@ -1510,6 +1547,8 @@ bool StorageMergeTree::optimize(
     bool cleanup,
     ContextPtr local_context)
 {
+    assertNotReadonly();
+
     if (deduplicate)
     {
         if (deduplicate_by_columns.empty())
@@ -1520,14 +1559,12 @@ bool StorageMergeTree::optimize(
 
     auto txn = local_context->getCurrentTransaction();
 
-    String disable_reason;
+    PreformattedMessage disable_reason;
     if (!partition && final)
     {
         if (cleanup && this->merging_params.mode != MergingParams::Mode::Replacing)
         {
-            constexpr const char * message = "Cannot OPTIMIZE with CLEANUP table: {}";
-            disable_reason = "only ReplacingMergeTree can be CLEANUP";
-            throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
+            throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, "Cannot OPTIMIZE with CLEANUP table: only ReplacingMergeTree can be CLEANUP");
         }
 
         if (cleanup && !getSettings()->allow_experimental_replacing_merge_with_cleanup)
@@ -1553,12 +1590,12 @@ bool StorageMergeTree::optimize(
                     local_context->getSettingsRef().optimize_skip_merged_partitions))
             {
                 constexpr auto message = "Cannot OPTIMIZE table: {}";
-                if (disable_reason.empty())
-                    disable_reason = "unknown reason";
-                LOG_INFO(log, message, disable_reason);
+                if (disable_reason.text.empty())
+                    disable_reason = PreformattedMessage::create("unknown reason");
+                LOG_INFO(log, message, disable_reason.text);
 
                 if (local_context->getSettingsRef().optimize_throw_if_noop)
-                    throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
+                    throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason.text);
                 return false;
             }
         }
@@ -1581,12 +1618,12 @@ bool StorageMergeTree::optimize(
                 local_context->getSettingsRef().optimize_skip_merged_partitions))
         {
             constexpr auto message = "Cannot OPTIMIZE table: {}";
-            if (disable_reason.empty())
-                disable_reason = "unknown reason";
-            LOG_INFO(log, message, disable_reason);
+            if (disable_reason.text.empty())
+                disable_reason = PreformattedMessage::create("unknown reason");
+            LOG_INFO(log, message, disable_reason.text);
 
             if (local_context->getSettingsRef().optimize_throw_if_noop)
-                throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason);
+                throw Exception(ErrorCodes::CANNOT_ASSIGN_OPTIMIZE, message, disable_reason.text);
             return false;
         }
     }
@@ -1755,6 +1792,8 @@ void StorageMergeTree::renameAndCommitEmptyParts(MutableDataPartsVector & new_pa
 
 void StorageMergeTree::truncate(const ASTPtr &, const StorageMetadataPtr &, ContextPtr query_context, TableExclusiveLockHolder &)
 {
+    assertNotReadonly();
+
     {
         /// Asks to complete merges and does not allow them to start.
         /// This protects against "revival" of data for a removed partition after completion of merge.
@@ -1861,8 +1900,6 @@ void StorageMergeTree::dropPart(const String & part_name, bool detach, ContextPt
         }
     }
 
-    /// Old part objects is needed to be destroyed before clearing them from filesystem.
-    clearOldMutations(true);
     clearOldPartsFromFilesystem();
     clearEmptyParts();
 }
@@ -1947,8 +1984,6 @@ void StorageMergeTree::dropPartition(const ASTPtr & partition, bool detach, Cont
         }
     }
 
-    /// Old parts are needed to be destroyed before clearing them from filesystem.
-    clearOldMutations(true);
     clearOldPartsFromFilesystem();
     clearEmptyParts();
 }
@@ -1987,7 +2022,7 @@ PartitionCommandsResultInfo StorageMergeTree::attachPartition(
     bool attach_part, ContextPtr local_context)
 {
     PartitionCommandsResultInfo results;
-    PartsTemporaryRename renamed_parts(*this, "detached/");
+    PartsTemporaryRename renamed_parts(*this, DETACHED_DIR_NAME);
     MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, local_context, renamed_parts);
 
     for (size_t i = 0; i < loaded_parts.size(); ++i)
@@ -2005,7 +2040,7 @@ PartitionCommandsResultInfo StorageMergeTree::attachPartition(
         MergeTreeData::Transaction transaction(*this, local_context->getCurrentTransaction().get());
         {
             auto lock = lockParts();
-            fillNewPartName(loaded_parts[i], lock);
+            fillNewPartNameAndResetLevel(loaded_parts[i], lock);
             renameTempPartAndAdd(loaded_parts[i], transaction, lock);
             transaction.commit(&lock);
         }
@@ -2029,6 +2064,8 @@ PartitionCommandsResultInfo StorageMergeTree::attachPartition(
 
 void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, const ASTPtr & partition, bool replace, ContextPtr local_context)
 {
+    assertNotReadonly();
+
     auto lock1 = lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto lock2 = source_table->lockForShare(local_context->getCurrentQueryId(), local_context->getSettingsRef().lock_acquire_timeout);
     auto merges_blocker = stopMergesAndWait();
@@ -2059,7 +2096,7 @@ void StorageMergeTree::replacePartitionFrom(const StoragePtr & source_table, con
         MergeTreePartInfo dst_part_info(partition_id, temp_index, temp_index, src_part->info.level);
 
         IDataPartStorage::ClonePartParams clone_params{.txn = local_context->getCurrentTransaction()};
-        auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(
+        auto [dst_part, part_lock] = cloneAndLoadDataPart(
             src_part,
             TMP_PREFIX,
             dst_part_info,
@@ -2170,7 +2207,7 @@ void StorageMergeTree::movePartitionToTable(const StoragePtr & dest_table, const
             .copy_instead_of_hardlink = getSettings()->always_use_copy_instead_of_hardlinks,
         };
 
-        auto [dst_part, part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(
+        auto [dst_part, part_lock] = dest_table_storage->cloneAndLoadDataPart(
             src_part,
             TMP_PREFIX,
             dst_part_info,
@@ -2274,11 +2311,12 @@ std::optional<CheckResult> StorageMergeTree::checkDataNext(DataValidationTasksPt
     {
         /// If the checksums file is not present, calculate the checksums and write them to disk.
         static constexpr auto checksums_path = "checksums.txt";
+        bool noop;
         if (part->isStoredOnDisk() && !part->getDataPartStorage().exists(checksums_path))
         {
             try
             {
-                auto calculated_checksums = checkDataPart(part, false);
+                auto calculated_checksums = checkDataPart(part, false, noop, /* is_cancelled */[]{ return false; }, /* throw_on_broken_projection */true);
                 calculated_checksums.checkEqual(part->checksums, true);
 
                 auto & part_mutable = const_cast<IMergeTreeDataPart &>(*part);
@@ -2299,7 +2337,7 @@ std::optional<CheckResult> StorageMergeTree::checkDataNext(DataValidationTasksPt
         {
             try
             {
-                checkDataPart(part, true);
+                checkDataPart(part, true, noop, /* is_cancelled */[]{ return false; }, /* throw_on_broken_projection */true);
                 return CheckResult(part->name, true, "");
             }
             catch (...)
@@ -2369,19 +2407,21 @@ void StorageMergeTree::attachRestoredParts(MutableDataPartsVector && parts)
 }
 
 
-std::map<int64_t, MutationCommands> StorageMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
+MutationCommands StorageMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
     std::lock_guard lock(currently_processing_in_background_mutex);
 
     UInt64 part_data_version = part->info.getDataVersion();
-    std::map<int64_t, MutationCommands> result;
+    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
+        if (mutation_version <= part_data_version)
             break;
+
+        for (const auto & command : entry.commands | std::views::reverse)
+            if (AlterConversions::supportsMutationCommandType(command.type))
+                result.emplace_back(command);
     }
 
     return result;
@@ -2427,6 +2467,12 @@ PreparedSetsCachePtr StorageMergeTree::getPreparedSetsCache(Int64 mutation_id)
     return cache;
 }
 
+void StorageMergeTree::assertNotReadonly() const
+{
+    if (isStaticStorage())
+        throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to static storage");
+}
+
 void StorageMergeTree::fillNewPartName(MutableDataPartPtr & part, DataPartsLock &)
 {
     part->info.min_block = part->info.max_block = increment.get();
@@ -2434,4 +2480,12 @@ void StorageMergeTree::fillNewPartName(MutableDataPartPtr & part, DataPartsLock
     part->setName(part->getNewName(part->info));
 }
 
+void StorageMergeTree::fillNewPartNameAndResetLevel(MutableDataPartPtr & part, DataPartsLock &)
+{
+    part->info.min_block = part->info.max_block = increment.get();
+    part->info.mutation = 0;
+    part->info.level = 0;
+    part->setName(part->getNewName(part->info));
+}
+
 }
diff --git a/src/Storages/StorageMergeTree.h b/src/Storages/StorageMergeTree.h
index 51bf6aa42e7..d6e97c55604 100644
--- a/src/Storages/StorageMergeTree.h
+++ b/src/Storages/StorageMergeTree.h
@@ -37,12 +37,11 @@ public:
         const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ContextMutablePtr context_,
         const String & date_column_name,
         const MergingParams & merging_params_,
-        std::unique_ptr<MergeTreeSettings> settings_,
-        bool has_force_restore_data_flag);
+        std::unique_ptr<MergeTreeSettings> settings_);
 
     void startup() override;
     void shutdown(bool is_drop) override;
@@ -176,7 +175,7 @@ private:
             const Names & deduplicate_by_columns,
             bool cleanup,
             const MergeTreeTransactionPtr & txn,
-            String & out_disable_reason,
+            PreformattedMessage & out_disable_reason,
             bool optimize_skip_merged_partitions = false);
 
     void renameAndCommitEmptyParts(MutableDataPartsVector & new_parts, Transaction & transaction);
@@ -203,7 +202,7 @@ private:
         bool aggressive,
         const String & partition_id,
         bool final,
-        String & disable_reason,
+        PreformattedMessage & disable_reason,
         TableLockHolder & table_lock_holder,
         std::unique_lock<std::mutex> & lock,
         const MergeTreeTransactionPtr & txn,
@@ -212,7 +211,7 @@ private:
 
 
     MergeMutateSelectedEntryPtr selectPartsToMutate(
-        const StorageMetadataPtr & metadata_snapshot, String & disable_reason,
+        const StorageMetadataPtr & metadata_snapshot, PreformattedMessage & disable_reason,
         TableLockHolder & table_lock_holder, std::unique_lock<std::mutex> & currently_processing_in_background_mutex_lock);
 
     /// For current mutations queue, returns maximum version of mutation for a part,
@@ -261,6 +260,7 @@ private:
                                                                         std::set<String> * mutation_ids = nullptr, bool from_another_mutation = false) const;
 
     void fillNewPartName(MutableDataPartPtr & part, DataPartsLock & lock);
+    void fillNewPartNameAndResetLevel(MutableDataPartPtr & part, DataPartsLock & lock);
 
     void startBackgroundMovesIfNeeded() override;
 
@@ -273,6 +273,8 @@ private:
 
     PreparedSetsCachePtr getPreparedSetsCache(Int64 mutation_id);
 
+    void assertNotReadonly() const;
+
     friend class MergeTreeSink;
     friend class MergeTreeData;
     friend class MergePlainMergeTreeTask;
@@ -306,7 +308,7 @@ private:
     };
 
 protected:
-    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
+    MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 };
 
 }
diff --git a/src/Storages/StorageMergeTreeIndex.cpp b/src/Storages/StorageMergeTreeIndex.cpp
new file mode 100644
index 00000000000..329275f4605
--- /dev/null
+++ b/src/Storages/StorageMergeTreeIndex.cpp
@@ -0,0 +1,365 @@
+
+#include <Storages/StorageMergeTreeIndex.h>
+#include <Columns/ColumnTuple.h>
+#include <Columns/ColumnsNumber.h>
+#include <Columns/ColumnNullable.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/NestedUtils.h>
+#include <Parsers/ASTSelectQuery.h>
+#include <Storages/ColumnsDescription.h>
+#include <Storages/MergeTree/LoadedMergeTreeDataPartInfoForReader.h>
+#include <Storages/MergeTree/MergeTreeDataPartCompact.h>
+#include <Storages/MergeTree/MergeTreeMarksLoader.h>
+#include <Storages/VirtualColumnUtils.h>
+#include <Access/Common/AccessFlags.h>
+#include <Common/HashTable/HashSet.h>
+#include <Common/escapeForFileName.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int BAD_ARGUMENTS;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+    extern const int NOT_IMPLEMENTED;
+}
+
+class MergeTreeIndexSource : public ISource, WithContext
+{
+public:
+    MergeTreeIndexSource(
+        Block header_,
+        Block index_header_,
+        MergeTreeData::DataPartsVector data_parts_,
+        ContextPtr context_,
+        bool with_marks_)
+        : ISource(header_)
+        , WithContext(context_)
+        , header(std::move(header_))
+        , index_header(std::move(index_header_))
+        , data_parts(std::move(data_parts_))
+        , with_marks(with_marks_)
+    {
+    }
+
+    String getName() const override { return "MergeTreeIndex"; }
+
+protected:
+    Chunk generate() override
+    {
+        if (part_index >= data_parts.size())
+            return {};
+
+        const auto & part = data_parts[part_index];
+        const auto & index_granularity = part->index_granularity;
+
+        std::shared_ptr<MergeTreeMarksLoader> marks_loader;
+        if (with_marks && isCompactPart(part))
+            marks_loader = createMarksLoader(part, MergeTreeDataPartCompact::DATA_FILE_NAME, part->getColumns().size());
+
+        size_t num_columns = header.columns();
+        size_t num_rows = index_granularity.getMarksCount();
+
+        const auto & part_name_column = StorageMergeTreeIndex::part_name_column;
+        const auto & mark_number_column = StorageMergeTreeIndex::mark_number_column;
+        const auto & rows_in_granule_column = StorageMergeTreeIndex::rows_in_granule_column;
+
+        const auto & index = part->getIndex();
+        Columns result_columns(num_columns);
+        for (size_t pos = 0; pos < num_columns; ++pos)
+        {
+            const auto & column_name = header.getByPosition(pos).name;
+            const auto & column_type = header.getByPosition(pos).type;
+
+            if (index_header.has(column_name))
+            {
+                size_t index_position = index_header.getPositionByName(column_name);
+                result_columns[pos] = index[index_position];
+            }
+            else if (column_name == part_name_column.name)
+            {
+                auto column = column_type->createColumnConst(num_rows, part->name);
+                result_columns[pos] = column->convertToFullColumnIfConst();
+            }
+            else if (column_name == mark_number_column.name)
+            {
+                auto column = column_type->createColumn();
+                auto & data = assert_cast<ColumnUInt64 &>(*column).getData();
+
+                data.resize(num_rows);
+                std::iota(data.begin(), data.end(), 0);
+
+                result_columns[pos] = std::move(column);
+            }
+            else if (column_name == rows_in_granule_column.name)
+            {
+                auto column = column_type->createColumn();
+                auto & data = assert_cast<ColumnUInt64 &>(*column).getData();
+
+                data.resize(num_rows);
+                for (size_t i = 0; i < num_rows; ++i)
+                    data[i] = index_granularity.getMarkRows(i);
+
+                result_columns[pos] = std::move(column);
+            }
+            else if (auto [first, second] = Nested::splitName(column_name, true); with_marks && second == "mark")
+            {
+                result_columns[pos] = fillMarks(part, marks_loader, *column_type, first);
+            }
+            else
+            {
+                throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "No such column {}", column_name);
+            }
+        }
+
+        ++part_index;
+        return Chunk(std::move(result_columns), num_rows);
+    }
+
+private:
+    std::shared_ptr<MergeTreeMarksLoader> createMarksLoader(const MergeTreeDataPartPtr & part, const String & prefix_name, size_t num_columns)
+    {
+        auto info_for_read = std::make_shared<LoadedMergeTreeDataPartInfoForReader>(part, std::make_shared<AlterConversions>());
+        auto local_context = getContext();
+
+        return std::make_shared<MergeTreeMarksLoader>(
+            info_for_read,
+            local_context->getMarkCache().get(),
+            info_for_read->getIndexGranularityInfo().getMarksFilePath(prefix_name),
+            info_for_read->getMarksCount(),
+            info_for_read->getIndexGranularityInfo(),
+            /*save_marks_in_cache=*/ false,
+            local_context->getReadSettings(),
+            /*load_marks_threadpool=*/ nullptr,
+            num_columns);
+    }
+
+    ColumnPtr fillMarks(
+        MergeTreeDataPartPtr part,
+        std::shared_ptr<MergeTreeMarksLoader> marks_loader,
+        const IDataType & data_type,
+        const String & column_name)
+    {
+        size_t col_idx = 0;
+        bool has_marks_in_part = false;
+        size_t num_rows = part->index_granularity.getMarksCount();
+
+        if (isWidePart(part))
+        {
+            if (auto stream_name = part->getStreamNameOrHash(column_name, part->checksums))
+            {
+                col_idx = 0;
+                has_marks_in_part = true;
+                marks_loader = createMarksLoader(part, *stream_name, /*num_columns=*/ 1);
+            }
+        }
+        else if (isCompactPart(part))
+        {
+            auto unescaped_name = unescapeForFileName(column_name);
+            if (auto col_idx_opt = part->getColumnPosition(unescaped_name))
+            {
+                col_idx = *col_idx_opt;
+                has_marks_in_part = true;
+            }
+        }
+        else
+        {
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Parts with type {} are not supported", part->getTypeName());
+        }
+
+        if (!has_marks_in_part)
+        {
+            auto column = data_type.createColumnConstWithDefaultValue(num_rows);
+            return column->convertToFullColumnIfConst();
+        }
+
+        auto compressed = ColumnUInt64::create(num_rows);
+        auto uncompressed = ColumnUInt64::create(num_rows);
+
+        auto & compressed_data = compressed->getData();
+        auto & uncompressed_data = uncompressed->getData();
+
+        auto marks_getter = marks_loader->loadMarks();
+
+        for (size_t i = 0; i < num_rows; ++i)
+        {
+            auto mark = marks_getter->getMark(i, col_idx);
+
+            compressed_data[i] = mark.offset_in_compressed_file;
+            uncompressed_data[i] = mark.offset_in_decompressed_block;
+        }
+
+        auto compressed_nullable = ColumnNullable::create(std::move(compressed), ColumnUInt8::create(num_rows, 0));
+        auto uncompressed_nullable = ColumnNullable::create(std::move(uncompressed), ColumnUInt8::create(num_rows, 0));
+
+        return ColumnTuple::create(Columns{std::move(compressed_nullable), std::move(uncompressed_nullable)});
+    }
+
+    Block header;
+    Block index_header;
+    MergeTreeData::DataPartsVector data_parts;
+    bool with_marks;
+
+    size_t part_index = 0;
+};
+
+const ColumnWithTypeAndName StorageMergeTreeIndex::part_name_column{std::make_shared<DataTypeString>(), "part_name"};
+const ColumnWithTypeAndName StorageMergeTreeIndex::mark_number_column{std::make_shared<DataTypeUInt64>(), "mark_number"};
+const ColumnWithTypeAndName StorageMergeTreeIndex::rows_in_granule_column{std::make_shared<DataTypeUInt64>(), "rows_in_granule"};
+const Block StorageMergeTreeIndex::virtuals_sample_block{part_name_column, mark_number_column, rows_in_granule_column};
+
+StorageMergeTreeIndex::StorageMergeTreeIndex(
+    const StorageID & table_id_,
+    const StoragePtr & source_table_,
+    const ColumnsDescription & columns,
+    bool with_marks_)
+    : IStorage(table_id_)
+    , source_table(source_table_)
+    , with_marks(with_marks_)
+{
+    const auto * merge_tree = dynamic_cast<const MergeTreeData *>(source_table.get());
+    if (!merge_tree)
+        throw Exception(ErrorCodes::BAD_ARGUMENTS, "Storage MergeTreeIndex expected MergeTree table, got: {}", source_table->getName());
+
+    data_parts = merge_tree->getDataPartsVectorForInternalUsage();
+    key_sample_block = merge_tree->getInMemoryMetadataPtr()->getPrimaryKey().sample_block;
+
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns);
+    setInMemoryMetadata(storage_metadata);
+}
+
+class ReadFromMergeTreeIndex : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromMergeTreeIndex"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+    ReadFromMergeTreeIndex(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<StorageMergeTreeIndex> storage_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , log(&Poco::Logger::get("StorageMergeTreeIndex"))
+    {
+    }
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+private:
+    std::shared_ptr<StorageMergeTreeIndex> storage;
+    Poco::Logger * log;
+    const ActionsDAG::Node * predicate = nullptr;
+};
+
+void ReadFromMergeTreeIndex::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+        predicate = filter_actions_dag->getOutputs().at(0);
+}
+
+void StorageMergeTreeIndex::read(
+    QueryPlan & query_plan,
+    const Names & column_names,
+    const StorageSnapshotPtr & storage_snapshot,
+    SelectQueryInfo & query_info,
+    ContextPtr context,
+    QueryProcessingStage::Enum,
+    size_t /*max_block_size*/,
+    size_t /*num_streams*/)
+{
+    const auto & storage_columns = source_table->getInMemoryMetadataPtr()->getColumns();
+    Names columns_from_storage;
+
+    for (const auto & column_name : column_names)
+    {
+        if (storage_columns.hasColumnOrSubcolumn(GetColumnsOptions::All, column_name))
+        {
+            columns_from_storage.push_back(column_name);
+            continue;
+        }
+
+        if (with_marks)
+        {
+            auto [first, second] = Nested::splitName(column_name, true);
+            auto unescaped_name = unescapeForFileName(first);
+
+            if (second == "mark" && storage_columns.hasColumnOrSubcolumn(GetColumnsOptions::All, unescapeForFileName(unescaped_name)))
+            {
+                columns_from_storage.push_back(unescaped_name);
+                continue;
+            }
+        }
+    }
+
+    context->checkAccess(AccessType::SELECT, source_table->getStorageID(), columns_from_storage);
+
+    auto sample_block = storage_snapshot->getSampleBlockForColumns(column_names);
+
+    auto this_ptr = std::static_pointer_cast<StorageMergeTreeIndex>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromMergeTreeIndex>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(sample_block), std::move(this_ptr));
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromMergeTreeIndex::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto filtered_parts = storage->getFilteredDataParts(predicate, context);
+
+    LOG_DEBUG(log, "Reading index{}from {} parts of table {}",
+        storage->with_marks ? " with marks " : " ",
+        filtered_parts.size(),
+        storage->source_table->getStorageID().getNameForLogs());
+
+    pipeline.init(Pipe(std::make_shared<MergeTreeIndexSource>(getOutputStream().header, storage->key_sample_block, std::move(filtered_parts), context, storage->with_marks)));
+}
+
+MergeTreeData::DataPartsVector StorageMergeTreeIndex::getFilteredDataParts(const ActionsDAG::Node * predicate, const ContextPtr & context) const
+{
+    if (!predicate)
+        return data_parts;
+
+    auto all_part_names = ColumnString::create();
+    for (const auto & part : data_parts)
+        all_part_names->insert(part->name);
+
+    Block filtered_block{{std::move(all_part_names), std::make_shared<DataTypeString>(), part_name_column.name}};
+    VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
+
+    if (!filtered_block.rows())
+        return {};
+
+    auto part_names = filtered_block.getByPosition(0).column;
+    const auto & part_names_str = assert_cast<const ColumnString &>(*part_names);
+
+    HashSet<StringRef> part_names_set;
+    for (size_t i = 0; i < part_names_str.size(); ++i)
+        part_names_set.insert(part_names_str.getDataAt(i));
+
+    MergeTreeData::DataPartsVector filtered_parts;
+    for (const auto & part : data_parts)
+        if (part_names_set.has(part->name))
+            filtered_parts.push_back(part);
+
+    return filtered_parts;
+}
+
+}
diff --git a/src/Storages/StorageMergeTreeIndex.h b/src/Storages/StorageMergeTreeIndex.h
new file mode 100644
index 00000000000..a1fb61d5a56
--- /dev/null
+++ b/src/Storages/StorageMergeTreeIndex.h
@@ -0,0 +1,48 @@
+#pragma once
+
+#include <QueryPipeline/Pipe.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+
+namespace DB
+{
+
+/// Internal temporary storage for table function mergeTreeIndex(...)
+class StorageMergeTreeIndex final : public IStorage
+{
+public:
+    static const ColumnWithTypeAndName part_name_column;
+    static const ColumnWithTypeAndName mark_number_column;
+    static const ColumnWithTypeAndName rows_in_granule_column;
+    static const Block virtuals_sample_block;
+
+    StorageMergeTreeIndex(
+        const StorageID & table_id_,
+        const StoragePtr & source_table_,
+        const ColumnsDescription & columns,
+        bool with_marks_);
+
+    void read(
+        QueryPlan & query_plan,
+        const Names & column_names,
+        const StorageSnapshotPtr & storage_snapshot,
+        SelectQueryInfo & query_info,
+        ContextPtr context,
+        QueryProcessingStage::Enum processing_stage,
+        size_t max_block_size,
+        size_t num_streams) override;
+
+    String getName() const override { return "MergeTreeIndex"; }
+
+private:
+    friend class ReadFromMergeTreeIndex;
+
+    MergeTreeData::DataPartsVector getFilteredDataParts(const ActionsDAG::Node * predicate, const ContextPtr & context) const;
+
+    StoragePtr source_table;
+    bool with_marks;
+
+    MergeTreeData::DataPartsVector data_parts;
+    Block key_sample_block;
+};
+
+}
diff --git a/src/Storages/StorageMongoDBSocketFactory.h b/src/Storages/StorageMongoDBSocketFactory.h
index 5fc423c63cb..2dc9cbddf8a 100644
--- a/src/Storages/StorageMongoDBSocketFactory.h
+++ b/src/Storages/StorageMongoDBSocketFactory.h
@@ -9,7 +9,7 @@ namespace DB
 class StorageMongoDBSocketFactory : public Poco::MongoDB::Connection::SocketFactory
 {
 public:
-    virtual Poco::Net::StreamSocket createSocket(const std::string & host, int port, Poco::Timespan connectTimeout, bool secure) override;
+    Poco::Net::StreamSocket createSocket(const std::string & host, int port, Poco::Timespan connectTimeout, bool secure) override;
 
 private:
     static Poco::Net::StreamSocket createPlainSocket(const std::string & host, int port, Poco::Timespan connectTimeout);
diff --git a/src/Storages/StorageMySQL.cpp b/src/Storages/StorageMySQL.cpp
index 76a439eabaf..da391909dff 100644
--- a/src/Storages/StorageMySQL.cpp
+++ b/src/Storages/StorageMySQL.cpp
@@ -55,7 +55,7 @@ StorageMySQL::StorageMySQL(
     , on_duplicate_clause{on_duplicate_clause_}
     , mysql_settings(mysql_settings_)
     , pool(std::make_shared<mysqlxx::PoolWithFailover>(pool_))
-    , log(&Poco::Logger::get("StorageMySQL (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageMySQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
 
diff --git a/src/Storages/StorageMySQL.h b/src/Storages/StorageMySQL.h
index 5303117cf5c..daabd66a530 100644
--- a/src/Storages/StorageMySQL.h
+++ b/src/Storages/StorageMySQL.h
@@ -92,7 +92,7 @@ private:
 
     mysqlxx::PoolWithFailoverPtr pool;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/StorageNull.cpp b/src/Storages/StorageNull.cpp
index 5e4fde99306..7a8852ca2d6 100644
--- a/src/Storages/StorageNull.cpp
+++ b/src/Storages/StorageNull.cpp
@@ -2,8 +2,9 @@
 #include <Storages/StorageFactory.h>
 #include <Storages/AlterCommands.h>
 
-#include <Interpreters/Context.h>
 #include <Databases/IDatabase.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 
 #include <IO/WriteHelpers.h>
 
diff --git a/src/Storages/StoragePostgreSQL.cpp b/src/Storages/StoragePostgreSQL.cpp
index 8fe2a161dba..9379cb5a1c6 100644
--- a/src/Storages/StoragePostgreSQL.cpp
+++ b/src/Storages/StoragePostgreSQL.cpp
@@ -72,7 +72,7 @@ StoragePostgreSQL::StoragePostgreSQL(
     , remote_table_schema(remote_table_schema_)
     , on_conflict(on_conflict_)
     , pool(std::move(pool_))
-    , log(&Poco::Logger::get("StoragePostgreSQL (" + table_id_.table_name + ")"))
+    , log(getLogger("StoragePostgreSQL (" + table_id_.table_name + ")"))
 {
     StorageInMemoryMetadata storage_metadata;
 
diff --git a/src/Storages/StoragePostgreSQL.h b/src/Storages/StoragePostgreSQL.h
index 725a935aa46..1ed4f7a7611 100644
--- a/src/Storages/StoragePostgreSQL.h
+++ b/src/Storages/StoragePostgreSQL.h
@@ -79,7 +79,7 @@ private:
     String on_conflict;
     postgres::PoolWithFailoverPtr pool;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/StorageProxy.h b/src/Storages/StorageProxy.h
index 18a1f9086ae..a8e7fd528dd 100644
--- a/src/Storages/StorageProxy.h
+++ b/src/Storages/StorageProxy.h
@@ -30,7 +30,6 @@ public:
     bool hasEvenlyDistributedRead() const override { return getNested()->hasEvenlyDistributedRead(); }
 
     ColumnSizeByName getColumnSizes() const override { return getNested()->getColumnSizes(); }
-    NamesAndTypesList getVirtuals() const override { return getNested()->getVirtuals(); }
 
     QueryProcessingStage::Enum getQueryProcessingStage(
         ContextPtr context,
diff --git a/src/Storages/StorageRedis.cpp b/src/Storages/StorageRedis.cpp
index ddb1b62c7b0..83bb3c606c9 100644
--- a/src/Storages/StorageRedis.cpp
+++ b/src/Storages/StorageRedis.cpp
@@ -206,7 +206,7 @@ StorageRedis::StorageRedis(
     , WithContext(context_->getGlobalContext())
     , table_id(table_id_)
     , configuration(configuration_)
-    , log(&Poco::Logger::get("StorageRedis"))
+    , log(getLogger("StorageRedis"))
     , primary_key(primary_key_)
 {
     pool = std::make_shared<RedisPool>(configuration.pool_size);
diff --git a/src/Storages/StorageRedis.h b/src/Storages/StorageRedis.h
index a525a4ed7de..a0eb2bfa580 100644
--- a/src/Storages/StorageRedis.h
+++ b/src/Storages/StorageRedis.h
@@ -74,7 +74,7 @@ private:
     StorageID table_id;
     RedisConfiguration configuration;
 
-    Poco::Logger * log;
+    LoggerPtr log;
     RedisPoolPtr pool;
 
     const String primary_key;
diff --git a/src/Storages/StorageReplicatedMergeTree.cpp b/src/Storages/StorageReplicatedMergeTree.cpp
index 1d9a50b18b7..ada5da4dad6 100644
--- a/src/Storages/StorageReplicatedMergeTree.cpp
+++ b/src/Storages/StorageReplicatedMergeTree.cpp
@@ -1,6 +1,5 @@
 #include <Core/Defines.h>
 
-#include <cstddef>
 #include <ranges>
 #include <chrono>
 
@@ -19,6 +18,7 @@
 #include <Common/typeid_cast.h>
 #include <Common/ThreadFuzzer.h>
 #include <Common/FailPoint.h>
+#include <Common/randomDelay.h>
 
 #include <Core/ServerUUID.h>
 
@@ -30,14 +30,12 @@
 #include <Storages/AlterCommands.h>
 #include <Storages/ColumnsDescription.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/MergeTreeDataFormatVersion.h>
 #include <Storages/MergeTree/MergeTreePartInfo.h>
@@ -63,21 +61,16 @@
 #include <Parsers/formatAST.h>
 #include <Parsers/parseQuery.h>
 #include <Parsers/ASTInsertQuery.h>
-#include <Parsers/ASTDropQuery.h>
 #include <Parsers/ASTFunction.h>
-#include <Parsers/ASTOptimizeQuery.h>
 #include <Parsers/ASTPartition.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/queryToString.h>
-#include <Parsers/ASTCheckQuery.h>
-#include <Parsers/ExpressionListParsers.h>
 
 #include <Processors/QueryPlan/QueryPlan.h>
 #include <Processors/Sources/RemoteSource.h>
 #include <Processors/QueryPlan/BuildQueryPipelineSettings.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
-#include <Processors/QueryPlan/ReadFromPreparedSource.h>
 #include <Processors/Sinks/EmptySink.h>
 
 #include <Planner/Utils.h>
@@ -105,9 +98,6 @@
 #include <Backups/IRestoreCoordination.h>
 #include <Backups/RestorerFromBackup.h>
 
-#include <Poco/DirectoryIterator.h>
-
-#include <base/scope_guard.h>
 #include <Common/scope_guard_safe.h>
 
 #include <boost/algorithm/string/join.hpp>
@@ -152,6 +142,7 @@ namespace FailPoints
 {
     extern const char replicated_queue_fail_next_entry[];
     extern const char replicated_queue_unfail_entries[];
+    extern const char finish_set_quorum_failed_parts[];
 }
 
 namespace ErrorCodes
@@ -199,6 +190,7 @@ namespace ErrorCodes
     extern const int CANNOT_BACKUP_TABLE;
     extern const int SUPPORT_IS_DISABLED;
     extern const int FAULT_INJECTED;
+    extern const int CANNOT_FORGET_PARTITION;
 }
 
 namespace ActionLocks
@@ -299,7 +291,7 @@ static MergeTreePartInfo makeDummyDropRangeForMovePartitionOrAttachPartitionFrom
 StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     const String & zookeeper_path_,
     const String & replica_name_,
-    bool attach,
+    LoadingStrictnessLevel mode,
     const StorageID & table_id_,
     const String & relative_data_path_,
     const StorageInMemoryMetadata & metadata_,
@@ -307,7 +299,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     const String & date_column_name,
     const MergingParams & merging_params_,
     std::unique_ptr<MergeTreeSettings> settings_,
-    bool has_force_restore_data_flag,
     RenamingRestrictions renaming_restrictions_,
     bool need_check_structure)
     : MergeTreeData(table_id_,
@@ -317,10 +308,10 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
                     merging_params_,
                     std::move(settings_),
                     true,                   /// require_part_metadata
-                    attach,
+                    mode,
                     [this] (const std::string & name) { enqueuePartForCheck(name); })
     , zookeeper_name(zkutil::extractZooKeeperName(zookeeper_path_))
-    , zookeeper_path(zkutil::extractZooKeeperPath(zookeeper_path_, /* check_starts_with_slash */ !attach, log))
+    , zookeeper_path(zkutil::extractZooKeeperPath(zookeeper_path_, /* check_starts_with_slash */ mode <= LoadingStrictnessLevel::CREATE, log.load()))
     , replica_name(replica_name_)
     , replica_path(fs::path(zookeeper_path) / "replicas" / replica_name_)
     , reader(*this)
@@ -338,7 +329,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     , replicated_fetches_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_fetches_network_bandwidth, getContext()->getReplicatedFetchesThrottler()))
     , replicated_sends_throttler(std::make_shared<Throttler>(getSettings()->max_replicated_sends_network_bandwidth, getContext()->getReplicatedSendsThrottler()))
 {
-    initializeDirectoriesAndFormatVersion(relative_data_path_, attach, date_column_name);
+    initializeDirectoriesAndFormatVersion(relative_data_path_, LoadingStrictnessLevel::ATTACH <= mode, date_column_name);
     /// We create and deactivate all tasks for consistency.
     /// They all will be scheduled and activated by the restarting thread.
     queue_updating_task = getContext()->getSchedulePool().createTask(
@@ -390,7 +381,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         }
         catch (...)
         {
-            if (!attach)
+            if (mode < LoadingStrictnessLevel::ATTACH)
             {
                 dropIfEmpty();
                 throw;
@@ -406,7 +397,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
     std::optional<std::unordered_set<std::string>> expected_parts_on_this_replica;
     bool skip_sanity_checks = false;
     /// It does not make sense for CREATE query
-    if (attach)
+    if (LoadingStrictnessLevel::ATTACH <= mode)
     {
         try
         {
@@ -427,7 +418,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
                     "Skipping the limits on severity of changes to data parts and columns (flag {}/flags/force_restore_data).",
                     replica_path);
             }
-            else if (has_force_restore_data_flag)
+            else if (LoadingStrictnessLevel::FORCE_RESTORE <= mode)
             {
                 skip_sanity_checks = true;
 
@@ -454,7 +445,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 
     loadDataParts(skip_sanity_checks, expected_parts_on_this_replica);
 
-    if (attach)
+    if (LoadingStrictnessLevel::ATTACH <= mode)
     {
         /// Provide better initial value of merge_selecting_sleep_ms on server startup
         auto settings = getSettings();
@@ -469,7 +460,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 
     if (!current_zookeeper)
     {
-        if (!attach)
+        if (mode < LoadingStrictnessLevel::ATTACH)
         {
             dropIfEmpty();
             throw Exception(ErrorCodes::NO_ZOOKEEPER, "Can't create replicated table without ZooKeeper");
@@ -485,7 +476,7 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
         }
     }
 
-    if (attach)
+    if (LoadingStrictnessLevel::ATTACH <= mode)
     {
         LOG_INFO(log, "Table will be in readonly mode until initialization is finished");
         attach_thread.emplace(*this);
@@ -524,8 +515,15 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
             if (same_structure)
             {
                 Coordination::Stat metadata_stat;
-                current_zookeeper->get(zookeeper_path + "/metadata", &metadata_stat);
+                current_zookeeper->get(fs::path(zookeeper_path) / "metadata", &metadata_stat);
+
+                /** We change metadata_snapshot so that `createReplica` method will create `metadata_version` node in ZooKeeper
+                  * with version of table '/metadata' node in Zookeeper.
+                  *
+                  * Otherwise `metadata_version` for not first replica will be initialized with 0 by default.
+                  */
                 setInMemoryMetadata(metadata_snapshot->withMetadataVersion(metadata_stat.version));
+                metadata_snapshot = getInMemoryMetadataPtr();
             }
         }
         catch (Coordination::Exception & e)
@@ -556,18 +554,6 @@ StorageReplicatedMergeTree::StorageReplicatedMergeTree(
 }
 
 
-String StorageReplicatedMergeTree::getDefaultZooKeeperPath(const Poco::Util::AbstractConfiguration & config)
-{
-    return config.getString("default_replica_path", "/clickhouse/tables/{uuid}/{shard}");
-}
-
-
-String StorageReplicatedMergeTree::getDefaultReplicaName(const Poco::Util::AbstractConfiguration & config)
-{
-    return config.getString("default_replica_name", "{replica}");
-}
-
-
 bool StorageReplicatedMergeTree::checkFixedGranularityInZookeeper()
 {
     auto zookeeper = getZooKeeper();
@@ -620,7 +606,12 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
                 break;
             }
 
+            /// Here we check mutation for errors on local replica. If they happen on this replica
+            /// they will happen on each replica, so we can check only in-memory info.
+            auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id);
+
             String mutation_pointer = fs::path(zookeeper_path) / "replicas" / replica / "mutation_pointer";
+
             std::string mutation_pointer_value;
             /// Replica could be removed
             if (!zookeeper->tryGet(mutation_pointer, mutation_pointer_value, nullptr, wait_event))
@@ -629,18 +620,31 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
                 break;
             }
             else if (mutation_pointer_value >= mutation_id) /// Maybe we already processed more fresh mutation
-                break;                                      /// (numbers like 0000000000 and 0000000001)
+            {
+                bool mutation_killed_or_done_locally = !mutation_status || mutation_status->is_done;
+                if (mutation_killed_or_done_locally)
+                {
+                    LOG_TRACE(log, "Mutation {} is done because mutation pointer is {}", mutation_id, mutation_pointer_value);
+                    break;                                      /// (numbers like 0000000000 and 0000000001)
+                }
+                else
+                {
+                    LOG_TRACE(log, "Mutation {} is done because mutation pointer is {}, but state is not updated in memory, will wait", mutation_id, mutation_pointer_value);
+                }
+            }
 
-            /// Replica can become inactive, so wait with timeout and recheck it
-            if (wait_event->tryWait(1000))
-                continue;
-
-            /// Here we check mutation for errors on local replica. If they happen on this replica
-            /// they will happen on each replica, so we can check only in-memory info.
-            auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id);
             /// If mutation status is empty, than local replica may just not loaded it into memory.
             if (mutation_status && !mutation_status->latest_fail_reason.empty())
+            {
+                LOG_DEBUG(log, "Mutation {} is done {} or failed {} (status: '{}')", mutation_id, mutation_status->is_done, !mutation_status->latest_fail_reason.empty(), mutation_status->latest_fail_reason);
                 break;
+            }
+
+            /// Replica can become inactive, so wait with timeout, if nothing happened -> recheck it
+            if (!wait_event->tryWait(1000))
+            {
+                LOG_TRACE(log, "Failed to wait for mutation '{}', will recheck", mutation_id);
+            }
         }
 
         /// This replica inactive, don't check anything
@@ -671,6 +675,8 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
         /// they will happen on each replica, so we can check only in-memory info.
         auto mutation_status = queue.getIncompleteMutationsStatus(mutation_id, &mutation_ids);
         checkMutationStatus(mutation_status, mutation_ids);
+        /// Mutation should be done or we should throw exception
+        chassert(mutation_status->is_done);
     }
 
     if (!inactive_replicas.empty())
@@ -681,6 +687,34 @@ void StorageReplicatedMergeTree::waitMutationToFinishOnReplicas(
     }
 }
 
+namespace
+{
+
+std::vector<String> getAncestors(const String & path)
+{
+    auto full_path = fs::path(path);
+    if (full_path.empty())
+        return {};
+
+    std::vector<String> result;
+    fs::path ancestor = *full_path.begin();
+    for (auto it = ++full_path.begin(); it != full_path.end(); it++)
+    {
+        /// If there is a directory separator after the last file-name in the path,
+        /// the last element before the end iterator is an empty element.
+        /// We do not what to create path with the / at the end
+        if (!it->empty())
+        {
+            ancestor = ancestor / *it;
+            result.push_back(ancestor);
+        }
+    }
+
+    return result;
+}
+
+}
+
 void StorageReplicatedMergeTree::createNewZooKeeperNodes()
 {
     auto zookeeper = getZooKeeper();
@@ -703,44 +737,14 @@ void StorageReplicatedMergeTree::createNewZooKeeperNodes()
     const auto settings = getSettings();
     if (settings->allow_remote_fs_zero_copy_replication)
     {
-        auto disks = getStoragePolicy()->getDisks();
-        std::set<DataSourceType> disk_types_for_zero_copy;
-        for (auto & disk : disks)
+        for (const auto & zero_copy_locks_root : getZookeeperZeroCopyLockPaths())
         {
-            if (!disk->supportZeroCopyReplication())
-                continue;
-
-            disk_types_for_zero_copy.insert(disk->getDataSourceDescription().type);
-        }
-
-        const auto table_shared_id_ = getTableSharedID();
-
-        if (!disk_types_for_zero_copy.empty())
-        {
-            /// create all ancestors of remote_fs_zero_copy_zookeeper_path
-            auto remote_fs_zero_copy_zookeeper_path = fs::path(settings->remote_fs_zero_copy_zookeeper_path.toString());
-            fs::path ancestor = *remote_fs_zero_copy_zookeeper_path.begin();
-            for (auto it = ++remote_fs_zero_copy_zookeeper_path.begin(); it != remote_fs_zero_copy_zookeeper_path.end(); it++)
+            for (const auto & ancestor : getAncestors(zero_copy_locks_root))
             {
-                /// If there is a directory separator after the last file-name in the path,
-                /// the last element before the end iterator is an empty element.
-                /// We do not what to create path with the / at the end
-                if (!it->empty())
-                {
-                    ancestor = ancestor / *it;
-                    futures.push_back(zookeeper->asyncTryCreateNoThrow(ancestor, String(), zkutil::CreateMode::Persistent));
-                }
+                futures.push_back(zookeeper->asyncTryCreateNoThrow(ancestor, String(), zkutil::CreateMode::Persistent));
             }
         }
 
-        for (const auto & disk_type: disk_types_for_zero_copy)
-        {
-            auto zero_copy = fmt::format("zero_copy_{}", toString(disk_type));
-            auto zero_copy_path = fs::path(settings->remote_fs_zero_copy_zookeeper_path.toString()) / zero_copy;
-            futures.push_back(zookeeper->asyncTryCreateNoThrow(zero_copy_path, String(), zkutil::CreateMode::Persistent));
-            futures.push_back(zookeeper->asyncTryCreateNoThrow(zero_copy_path / table_shared_id_, String(), zkutil::CreateMode::Persistent));
-        }
-
         futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/zero_copy_s3", String(), zkutil::CreateMode::Persistent));
         futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/zero_copy_s3/shared", String(), zkutil::CreateMode::Persistent));
         futures.push_back(zookeeper->asyncTryCreateNoThrow(zookeeper_path + "/zero_copy_hdfs", String(), zkutil::CreateMode::Persistent));
@@ -812,7 +816,7 @@ bool StorageReplicatedMergeTree::createTableIfNotExists(const StorageMetadataPtr
             else
             {
                 auto metadata_drop_lock = zkutil::EphemeralNodeHolder::existing(drop_lock_path, *zookeeper);
-                if (!removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, log))
+                if (!removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, log.load()))
                 {
                     /// Someone is recursively removing table right now, we cannot create new table until old one is removed
                     continue;
@@ -1083,6 +1087,63 @@ zkutil::ZooKeeperPtr StorageReplicatedMergeTree::getZooKeeperIfTableShutDown() c
     return maybe_new_zookeeper;
 }
 
+std::vector<String> StorageReplicatedMergeTree::getZookeeperZeroCopyLockPaths() const
+{
+    const auto settings = getSettings();
+    if (!settings->allow_remote_fs_zero_copy_replication)
+    {
+        return {};
+    }
+
+    const auto & disks = getStoragePolicy()->getDisks();
+    std::set<String> disk_types_with_zero_copy;
+    for (const auto & disk : disks)
+    {
+        if (!disk->supportZeroCopyReplication())
+            continue;
+
+        disk_types_with_zero_copy.insert(disk->getDataSourceDescription().toString());
+    }
+
+    const auto actual_table_shared_id = getTableSharedID();
+
+    std::vector<String> result;
+    result.reserve(disk_types_with_zero_copy.size());
+
+    for (const auto & disk_type: disk_types_with_zero_copy)
+    {
+        auto zero_copy = fmt::format("zero_copy_{}", disk_type);
+        auto zero_copy_path = fs::path(settings->remote_fs_zero_copy_zookeeper_path.toString()) / zero_copy;
+
+        result.push_back(zero_copy_path / actual_table_shared_id);
+    }
+
+    return result;
+}
+
+void StorageReplicatedMergeTree::dropZookeeperZeroCopyLockPaths(zkutil::ZooKeeperPtr zookeeper, std::vector<String> zero_copy_locks_paths,
+                                                                LoggerPtr logger)
+{
+    for (const auto & zero_copy_locks_root : zero_copy_locks_paths)
+    {
+        auto code = zookeeper->tryRemove(zero_copy_locks_root);
+        if (code == Coordination::Error::ZNOTEMPTY)
+        {
+            LOG_WARNING(logger, "Zero copy locks are not empty for {}. There are some lost locks inside."
+                              "Removing them all.", zero_copy_locks_root);
+            zookeeper->tryRemoveRecursive(zero_copy_locks_root);
+        }
+        else if (code == Coordination::Error::ZNONODE)
+        {
+            LOG_INFO(logger, "Zero copy locks directory {} is absent on ZooKeeper.", zero_copy_locks_root);
+        }
+        else
+        {
+            chassert(code == Coordination::Error::ZOK);
+        }
+    }
+}
+
 void StorageReplicatedMergeTree::drop()
 {
     /// There is also the case when user has configured ClickHouse to wrong ZooKeeper cluster
@@ -1096,6 +1157,8 @@ void StorageReplicatedMergeTree::drop()
         /// Table can be shut down, restarting thread is not active
         /// and calling StorageReplicatedMergeTree::getZooKeeper()/getAuxiliaryZooKeeper() won't suffice.
         zookeeper = getZooKeeperIfTableShutDown();
+        /// Update zookeeper client, since existing may be expired, while ZooKeeper is required inside dropAllData().
+        current_zookeeper = zookeeper;
 
         /// If probably there is metadata in ZooKeeper, we don't allow to drop the table.
         if (!zookeeper)
@@ -1112,6 +1175,11 @@ void StorageReplicatedMergeTree::drop()
         loadOutdatedDataParts(/*is_async=*/ false);
     }
 
+
+    /// getZookeeperZeroCopyLockPaths has to be called before dropAllData
+    /// otherwise table_shared_id is unknown
+    auto zero_copy_locks_paths = getZookeeperZeroCopyLockPaths();
+
     dropAllData();
 
     if (maybe_has_metadata_in_zookeeper)
@@ -1128,12 +1196,18 @@ void StorageReplicatedMergeTree::drop()
             if (lost_part_count > 0)
                 LOG_INFO(log, "Dropping table with non-zero lost_part_count equal to {}", lost_part_count);
         }
-        dropReplica(zookeeper, zookeeper_path, replica_name, log, getSettings(), &has_metadata_in_zookeeper);
+
+        bool last_replica_dropped = dropReplica(zookeeper, zookeeper_path, replica_name, log.load(), getSettings(), &has_metadata_in_zookeeper);
+        if (last_replica_dropped)
+        {
+            dropZookeeperZeroCopyLockPaths(zookeeper, zero_copy_locks_paths, log.load());
+        }
     }
 }
 
-void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica,
-                                             Poco::Logger * logger, MergeTreeSettingsPtr table_settings, std::optional<bool> * has_metadata_out)
+
+bool StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica,
+                                                 LoggerPtr logger, MergeTreeSettingsPtr table_settings, std::optional<bool> * has_metadata_out)
 {
     if (zookeeper->expired())
         throw Exception(ErrorCodes::TABLE_WAS_NOT_DROPPED, "Table was not dropped because ZooKeeper session has expired.");
@@ -1150,7 +1224,7 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     if (!zookeeper->exists(remote_replica_path))
     {
         LOG_INFO(logger, "Removing replica {} does not exist", remote_replica_path);
-        return;
+        return false;
     }
 
     {
@@ -1205,7 +1279,7 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     /// Check that `zookeeper_path` exists: it could have been deleted by another replica after execution of previous line.
     Strings replicas;
     if (Coordination::Error::ZOK != zookeeper->tryGetChildren(zookeeper_path + "/replicas", replicas) || !replicas.empty())
-        return;
+        return false;
 
     LOG_INFO(logger, "{} is the last replica, will remove table", remote_replica_path);
 
@@ -1234,10 +1308,12 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
     if (code == Coordination::Error::ZNONODE || code == Coordination::Error::ZNODEEXISTS)
     {
         LOG_WARNING(logger, "Table {} is already started to be removing by another replica right now", remote_replica_path);
+        return false;
     }
     else if (code == Coordination::Error::ZNOTEMPTY)
     {
         LOG_WARNING(logger, "Another replica was suddenly created, will keep the table {}", remote_replica_path);
+        return false;
     }
     else if (code != Coordination::Error::ZOK)
     {
@@ -1249,9 +1325,12 @@ void StorageReplicatedMergeTree::dropReplica(zkutil::ZooKeeperPtr zookeeper, con
         LOG_INFO(logger, "Removing table {} (this might take several minutes)", zookeeper_path);
         removeTableNodesFromZooKeeper(zookeeper, zookeeper_path, metadata_drop_lock, logger);
     }
+
+    return true;
 }
 
-void StorageReplicatedMergeTree::dropReplica(const String & drop_zookeeper_path, const String & drop_replica, Poco::Logger * logger)
+
+bool StorageReplicatedMergeTree::dropReplica(const String & drop_zookeeper_path, const String & drop_replica, LoggerPtr logger)
 {
     zkutil::ZooKeeperPtr zookeeper = getZooKeeperIfTableShutDown();
 
@@ -1261,12 +1340,12 @@ void StorageReplicatedMergeTree::dropReplica(const String & drop_zookeeper_path,
     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);
+    return 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)
+        const String & zookeeper_path, const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, LoggerPtr logger)
 {
     bool completely_removed = false;
 
@@ -1314,7 +1393,7 @@ bool StorageReplicatedMergeTree::removeTableNodesFromZooKeeper(zkutil::ZooKeeper
     ops.emplace_back(zkutil::makeRemoveRequest(metadata_drop_lock->getPath(), -1));
     ops.emplace_back(zkutil::makeRemoveRequest(fs::path(zookeeper_path) / "dropped", -1));
     ops.emplace_back(zkutil::makeRemoveRequest(zookeeper_path, -1));
-    code = zookeeper->tryMulti(ops, responses);
+    code = zookeeper->tryMulti(ops, responses, /* check_session_valid */ true);
 
     if (code == Coordination::Error::ZNONODE)
     {
@@ -1446,8 +1525,13 @@ void StorageReplicatedMergeTree::paranoidCheckForCoveredPartsInZooKeeperOnStart(
 
         if (!found)
         {
-            LOG_WARNING(log, "Part {} exists in ZooKeeper and covered by another part in ZooKeeper ({}), but doesn't exist on any disk. "
-                        "It may cause false-positive 'part is lost forever' messages", part_name, covering_part);
+            LOG_WARNING(
+                log,
+                "Part {} of table {} exists in ZooKeeper and covered by another part in ZooKeeper ({}), but doesn't exist on any disk. "
+                "It may cause false-positive 'part is lost forever' messages",
+                part_name,
+                getStorageID().getNameForLogs(),
+                covering_part);
             ProfileEvents::increment(ProfileEvents::ReplicatedCoveredPartsInZooKeeperOnStart);
             chassert(false);
         }
@@ -1861,7 +1945,7 @@ MergeTreeData::DataPartsVector StorageReplicatedMergeTree::checkPartChecksumsAnd
             Coordination::SimpleFaultInjection fault(getSettings()->fault_probability_before_part_commit,
                                                      getSettings()->fault_probability_after_part_commit, "part commit");
             ThreadFuzzer::maybeInjectSleep();
-            e = zookeeper->tryMulti(ops, responses);
+            e = zookeeper->tryMulti(ops, responses, /* check_session_valid */ true);
         }
         if (e == Coordination::Error::ZOK)
         {
@@ -1899,7 +1983,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
 
     for (const DiskPtr & disk : getStoragePolicy()->getDisks())
     {
-        for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / "detached/"); it->isValid(); it->next())
+        for (const auto it = disk->iterateDirectory(fs::path(relative_data_path) / DETACHED_DIR_NAME); it->isValid(); it->next())
         {
             const auto part_info = MergeTreePartInfo::tryParsePartName(it->name(), format_version);
 
@@ -1909,7 +1993,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::attachPartHelperFo
             const auto part_old_name = part_info->getPartNameV1();
             const auto volume = std::make_shared<SingleDiskVolume>("volume_" + part_old_name, disk);
 
-            auto part = getDataPartBuilder(entry.new_part_name, volume, fs::path("detached") / part_old_name)
+            auto part = getDataPartBuilder(entry.new_part_name, volume, fs::path(DETACHED_DIR_NAME) / part_old_name)
                 .withPartFormatFromDisk()
                 .build();
 
@@ -2064,7 +2148,7 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry, bool need_to_che
             if (entry.quorum)
             {
                 if (entry.type != LogEntry::GET_PART)
-                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: log entry with quorum but type is not GET_PART");
+                    throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with quorum but type is not GET_PART");
 
                 LOG_DEBUG(log, "No active replica has part {} which needs to be written with quorum. Will try to mark that quorum as failed.", entry.new_part_name);
 
@@ -2127,7 +2211,7 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry, bool need_to_che
                         auto part_info = MergeTreePartInfo::fromPartName(entry.new_part_name, format_version);
 
                         if (part_info.min_block != part_info.max_block)
-                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: log entry with quorum for part covering more than one block number");
+                            throw Exception(ErrorCodes::LOGICAL_ERROR, "Log entry with quorum for part covering more than one block number");
 
                         ops.emplace_back(zkutil::makeCreateRequest(
                             fs::path(zookeeper_path) / "quorum" / "failed_parts" / entry.new_part_name,
@@ -2144,6 +2228,7 @@ bool StorageReplicatedMergeTree::executeFetch(LogEntry & entry, bool need_to_che
                         if (code == Coordination::Error::ZOK)
                         {
                             LOG_DEBUG(log, "Marked quorum for part {} as failed.", entry.new_part_name);
+                            FailPointInjection::disableFailPoint(FailPoints::finish_set_quorum_failed_parts);
                             queue.removeFailedQuorumPart(part_info);
                             return true;
                         }
@@ -2272,8 +2357,12 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::executeFetchShared
     }
 }
 
-static void paranoidCheckForCoveredPartsInZooKeeper(const ZooKeeperPtr & zookeeper, const String & replica_path,
-                                                    MergeTreeDataFormatVersion format_version, const String & covering_part_name)
+static void paranoidCheckForCoveredPartsInZooKeeper(
+    const ZooKeeperPtr & zookeeper,
+    const String & replica_path,
+    MergeTreeDataFormatVersion format_version,
+    const String & covering_part_name,
+    const StorageReplicatedMergeTree & storage)
 {
 #ifdef ABORT_ON_LOGICAL_ERROR
     constexpr bool paranoid_check_for_covered_parts_default = true;
@@ -2292,8 +2381,12 @@ static void paranoidCheckForCoveredPartsInZooKeeper(const ZooKeeperPtr & zookeep
     {
         auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
         if (drop_range_info.contains(part_info))
-            throw Exception(ErrorCodes::LOGICAL_ERROR,
-                            "Part {} remains in ZooKeeper after DROP_RANGE {}", part_name, covering_part_name);
+            throw Exception(
+                ErrorCodes::LOGICAL_ERROR,
+                "Part {} from table {} remains in ZooKeeper after DROP_RANGE {}",
+                part_name,
+                storage.getStorageID().getNameForLogs(),
+                covering_part_name);
     }
 }
 
@@ -2347,7 +2440,7 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
             {
                 String part_dir = part_to_detach->getDataPartStorage().getPartDirectory();
                 LOG_INFO(log, "Detaching {}", part_dir);
-                auto holder = getTemporaryPartDirectoryHolder(String(DETACHED_DIR_NAME) + "/" + part_dir);
+                auto holder = getTemporaryPartDirectoryHolder(fs::path(DETACHED_DIR_NAME) / part_dir);
                 part_to_detach->makeCloneInDetached("", metadata_snapshot, /*disk_transaction*/ {});
             }
         }
@@ -2355,7 +2448,7 @@ void StorageReplicatedMergeTree::executeDropRange(const LogEntry & entry)
 
     /// Forcibly remove parts from ZooKeeper
     removePartsFromZooKeeperWithRetries(parts_to_remove);
-    paranoidCheckForCoveredPartsInZooKeeper(getZooKeeper(), replica_path, format_version, entry.new_part_name);
+    paranoidCheckForCoveredPartsInZooKeeper(getZooKeeper(), replica_path, format_version, entry.new_part_name, *this);
 
     if (entry.detach)
         LOG_DEBUG(log, "Detached {} parts inside {}.", parts_to_remove.size(), entry.new_part_name);
@@ -2493,7 +2586,8 @@ bool StorageReplicatedMergeTree::executeReplaceRange(LogEntry & entry)
         LOG_INFO(log, "All parts from REPLACE PARTITION command have been already attached");
         removePartsFromZooKeeperWithRetries(parts_to_remove);
         if (replace)
-            paranoidCheckForCoveredPartsInZooKeeper(getZooKeeper(), replica_path, format_version, entry_replace.drop_range_part_name);
+            paranoidCheckForCoveredPartsInZooKeeper(
+                getZooKeeper(), replica_path, format_version, entry_replace.drop_range_part_name, *this);
         return true;
     }
 
@@ -2694,7 +2788,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(LogEntry & entry)
 
     auto obtain_part = [&] (PartDescriptionPtr & part_desc)
     {
-        /// Fetches with zero-copy-replication are cheap, but cloneAndLoadDataPartOnSameDisk will do full copy.
+        /// Fetches with zero-copy-replication are cheap, but cloneAndLoadDataPart(OnSameDisk) will do full copy.
         /// It's okay to check the setting for current table and disk for the source table, because src and dst part are on the same disk.
         bool prefer_fetch_from_other_replica = !part_desc->replica.empty() && storage_settings_ptr->allow_remote_fs_zero_copy_replication
             && part_desc->src_table_part && part_desc->src_table_part->isStoredOnRemoteDiskWithZeroCopySupport();
@@ -2713,7 +2807,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(LogEntry & entry)
                 .copy_instead_of_hardlink = storage_settings_ptr->always_use_copy_instead_of_hardlinks || ((our_zero_copy_enabled || source_zero_copy_enabled) && part_desc->src_table_part->isStoredOnRemoteDiskWithZeroCopySupport()),
                 .metadata_version_to_write = metadata_snapshot->getMetadataVersion()
             };
-            auto [res_part, temporary_part_lock] = cloneAndLoadDataPartOnSameDisk(
+            auto [res_part, temporary_part_lock] = cloneAndLoadDataPart(
                 part_desc->src_table_part,
                 TMP_PREFIX + "clone_",
                 part_desc->new_part_info,
@@ -2814,7 +2908,7 @@ bool StorageReplicatedMergeTree::executeReplaceRange(LogEntry & entry)
 
     removePartsFromZooKeeperWithRetries(parts_to_remove);
     if (replace)
-        paranoidCheckForCoveredPartsInZooKeeper(getZooKeeper(), replica_path, format_version, entry_replace.drop_range_part_name);
+        paranoidCheckForCoveredPartsInZooKeeper(getZooKeeper(), replica_path, format_version, entry_replace.drop_range_part_name, *this);
     res_parts.clear();
     parts_to_remove.clear();
     cleanup_thread.wakeup();
@@ -2873,7 +2967,7 @@ void StorageReplicatedMergeTree::executeClonePartFromShard(const LogEntry & entr
         part = get_part();
         // The fetched part is valuable and should not be cleaned like a temp part.
         part->is_temp = false;
-        part->renameTo("detached/" + entry.new_part_name, true);
+        part->renameTo(fs::path(DETACHED_DIR_NAME) / entry.new_part_name, true);
 
         LOG_INFO(log, "Cloned part {} to detached directory", part->name);
     }
@@ -2918,7 +3012,7 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
         /// Check that log pointer of source replica didn't changed while we read queue entries
         ops.push_back(zkutil::makeCheckRequest(fs::path(source_path) / "log_pointer", log_pointer_stat.version));
 
-        auto rc = zookeeper->tryMulti(ops, responses);
+        auto rc = zookeeper->tryMulti(ops, responses, /* check_session_valid */ true);
 
         if (rc == Coordination::Error::ZOK)
         {
@@ -3036,6 +3130,10 @@ void StorageReplicatedMergeTree::cloneReplica(const String & source_replica, Coo
     Strings active_parts = get_part_set.getParts();
 
     /// Remove local parts if source replica does not have them, because such parts will never be fetched by other replicas.
+    static const auto test_delay = getContext()->getConfigRef().getUInt64("test.clone_replica.delay_before_removing_local_parts_ms", 0);
+    if (test_delay)
+        randomDelayForMaxMilliseconds(test_delay, log.load(), "cloneReplica: Before removing local parts");
+
     Strings local_parts_in_zk = zookeeper->getChildren(fs::path(replica_path) / "parts");
     Strings parts_to_remove_from_zk;
 
@@ -3273,7 +3371,7 @@ void StorageReplicatedMergeTree::cloneMetadataIfNeeded(const String & source_rep
         ops.emplace_back(zkutil::makeCheckRequest(source_path + "/metadata", metadata_stat.version));
         ops.emplace_back(zkutil::makeCheckRequest(source_path + "/columns", columns_stat.version));
 
-        Coordination::Error code = zookeeper->tryMulti(ops, responses);
+        Coordination::Error code = zookeeper->tryMulti(ops, responses, /* check_session_valid */ true);
         if (code == Coordination::Error::ZOK)
             break;
         else if (code == Coordination::Error::ZBADVERSION)
@@ -3734,7 +3832,7 @@ void StorageReplicatedMergeTree::mergeSelectingTask()
                 merge_pred.emplace(queue.getMergePredicate(zookeeper, partitions_to_merge_in));
         }
 
-        String out_reason;
+        PreformattedMessage out_reason;
         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, out_reason, &partitions_to_merge_in) == SelectPartsDecision::SELECTED)
@@ -4148,7 +4246,7 @@ void StorageReplicatedMergeTree::removePartAndEnqueueFetch(const String & part_n
             zkutil::CreateMode::PersistentSequential));
 
         Coordination::Responses results;
-        auto rc = zookeeper->tryMulti(ops, results);
+        auto rc = zookeeper->tryMulti(ops, results, /* check_session_valid */ true);
 
         if (rc == Coordination::Error::ZBADVERSION)
         {
@@ -4181,7 +4279,7 @@ void StorageReplicatedMergeTree::startBeingLeader()
         return;
     }
 
-    zkutil::checkNoOldLeaders(log, *zookeeper, fs::path(zookeeper_path) / "leader_election");
+    zkutil::checkNoOldLeaders(log.load(), *zookeeper, fs::path(zookeeper_path) / "leader_election");
 
     LOG_INFO(log, "Became leader");
     is_leader = true;
@@ -4275,7 +4373,7 @@ void StorageReplicatedMergeTree::waitForUniquePartsToBeFetchedByOtherReplicas(St
 
     auto zookeeper = getZooKeeperIfTableShutDown();
 
-    auto unique_parts_set = findReplicaUniqueParts(replica_name, zookeeper_path, format_version, zookeeper, log);
+    auto unique_parts_set = findReplicaUniqueParts(replica_name, zookeeper_path, format_version, zookeeper, log.load());
     if (unique_parts_set.empty())
     {
         LOG_INFO(log, "Will not wait for unique parts to be fetched because we don't have any unique parts");
@@ -4316,7 +4414,7 @@ void StorageReplicatedMergeTree::waitForUniquePartsToBeFetchedByOtherReplicas(St
         LOG_INFO(log, "Successfully waited all the parts");
 }
 
-std::set<MergeTreePartInfo> StorageReplicatedMergeTree::findReplicaUniqueParts(const String & replica_name_, const String & zookeeper_path_, MergeTreeDataFormatVersion format_version_, zkutil::ZooKeeper::Ptr zookeeper_, Poco::Logger * log_)
+std::set<MergeTreePartInfo> StorageReplicatedMergeTree::findReplicaUniqueParts(const String & replica_name_, const String & zookeeper_path_, MergeTreeDataFormatVersion format_version_, zkutil::ZooKeeper::Ptr zookeeper_, LoggerPtr log_)
 {
     if (!zookeeper_->exists(fs::path(zookeeper_path_) / "replicas" / replica_name_ / "is_active"))
     {
@@ -4659,6 +4757,9 @@ bool StorageReplicatedMergeTree::fetchPart(
     zkutil::ZooKeeper::Ptr zookeeper_,
     bool try_fetch_shared)
 {
+    if (isStaticStorage())
+        throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to static storage");
+
     auto zookeeper = zookeeper_ ? zookeeper_ : getZooKeeper();
     const auto part_info = MergeTreePartInfo::fromPartName(part_name, format_version);
 
@@ -4787,7 +4888,7 @@ bool StorageReplicatedMergeTree::fetchPart(
                 .keep_metadata_version = true,
             };
 
-            auto [cloned_part, lock] = cloneAndLoadDataPartOnSameDisk(
+            auto [cloned_part, lock] = cloneAndLoadDataPart(
                 part_to_clone,
                 "tmp_clone_",
                 part_info,
@@ -4886,7 +4987,7 @@ bool StorageReplicatedMergeTree::fetchPart(
         {
             // The fetched part is valuable and should not be cleaned like a temp part.
             part->is_temp = false;
-            part->renameTo(fs::path("detached") / part_name, true);
+            part->renameTo(fs::path(DETACHED_DIR_NAME) / part_name, true);
         }
     }
     catch (const Exception & e)
@@ -5385,11 +5486,13 @@ void StorageReplicatedMergeTree::readParallelReplicasImpl(
 
     if (local_context->getSettingsRef().allow_experimental_analyzer)
     {
-        auto modified_query_tree = buildQueryTreeForShard(query_info, query_info.query_tree);
+        QueryTreeNodePtr modified_query_tree = query_info.query_tree->clone();
+        rewriteJoinToGlobalJoin(modified_query_tree, local_context);
+        modified_query_tree = buildQueryTreeForShard(query_info.planner_context, modified_query_tree);
 
         header = InterpreterSelectQueryAnalyzer::getSampleBlock(
             modified_query_tree, local_context, SelectQueryOptions(processed_stage).analyze());
-        modified_query_ast = queryNodeToSelectQuery(modified_query_tree);
+        modified_query_ast = queryNodeToDistributedSelectQuery(modified_query_tree);
     }
     else
     {
@@ -5408,7 +5511,6 @@ void StorageReplicatedMergeTree::readParallelReplicasImpl(
 
     ClusterProxy::executeQueryWithParallelReplicas(
         query_plan,
-        getStorageID(),
         select_stream_factory,
         modified_query_ast,
         local_context,
@@ -5424,11 +5526,14 @@ void StorageReplicatedMergeTree::readLocalImpl(
     const size_t max_block_size,
     const size_t num_streams)
 {
+    const bool enable_parallel_reading = local_context->canUseParallelReplicasOnFollower()
+        && (!local_context->getSettingsRef().allow_experimental_analyzer || query_info.analyzer_can_use_parallel_replicas_on_follower);
+
     auto plan = reader.read(
         column_names, storage_snapshot, query_info,
         local_context, max_block_size, num_streams,
         /* max_block_numbers_to_read= */ nullptr,
-        /* enable_parallel_reading= */ local_context->canUseParallelReplicasOnFollower());
+        enable_parallel_reading);
 
     if (plan)
         query_plan = std::move(*plan);
@@ -5495,6 +5600,8 @@ void StorageReplicatedMergeTree::assertNotReadonly() const
 {
     if (is_readonly)
         throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode (replica path: {})", replica_path);
+    if (isStaticStorage())
+        throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to static storage");
 }
 
 
@@ -5503,6 +5610,8 @@ SinkToStoragePtr StorageReplicatedMergeTree::write(const ASTPtr & /*query*/, con
     if (!initialization_done)
         throw Exception(ErrorCodes::NOT_INITIALIZED, "Table is not initialized yet");
 
+    if (isStaticStorage())
+        throw Exception(ErrorCodes::TABLE_IS_READ_ONLY, "Table is in readonly mode due to static storage");
     /// If table is read-only because it doesn't have metadata in zk yet, then it's not possible to insert into it
     /// Without this check, we'll write data parts on disk, and afterwards will remove them since we'll fail to commit them into zk
     /// In case of remote storage like s3, it'll generate unnecessary PUT requests
@@ -5566,7 +5675,7 @@ std::optional<QueryPipeline> StorageReplicatedMergeTree::distributedWriteFromClu
         {
             auto connection = std::make_shared<Connection>(
                 node.host_name, node.port, query_context->getGlobalContext()->getCurrentDatabase(),
-                node.user, node.password, ssh::SSHKey(), node.quota_key, node.cluster, node.cluster_secret,
+                node.user, node.password, SSHKey(), node.quota_key, node.cluster, node.cluster_secret,
                 "ParallelInsertSelectInititiator",
                 node.compression,
                 node.secure
@@ -5705,7 +5814,7 @@ bool StorageReplicatedMergeTree::optimize(
                 future_merged_part->uuid = UUIDHelpers::generateV4();
 
             constexpr const char * unknown_disable_reason = "unknown reason";
-            String disable_reason = unknown_disable_reason;
+            PreformattedMessage disable_reason = PreformattedMessage::create(unknown_disable_reason);
             SelectPartsDecision select_decision = SelectPartsDecision::CANNOT_SELECT;
 
             if (partition_id.empty())
@@ -5728,10 +5837,10 @@ bool StorageReplicatedMergeTree::optimize(
             if (select_decision != SelectPartsDecision::SELECTED)
             {
                 constexpr const char * message_fmt = "Cannot select parts for optimization: {}";
-                assert(disable_reason != unknown_disable_reason);
+                assert(disable_reason.text != unknown_disable_reason);
                 if (!partition_id.empty())
-                    disable_reason += fmt::format(" (in partition {})", partition_id);
-                return handle_noop(message_fmt, disable_reason);
+                    disable_reason.text += fmt::format(" (in partition {})", partition_id);
+                return handle_noop(message_fmt, disable_reason.text);
             }
 
             ReplicatedMergeTreeLogEntryData merge_entry;
@@ -5827,6 +5936,7 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     Coordination::Requests requests;
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "columns", entry.columns_str, -1));
     requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "metadata", entry.metadata_str, -1));
+    requests.emplace_back(zkutil::makeSetRequest(fs::path(replica_path) / "metadata_version", std::to_string(entry.alter_version), -1));
 
     auto table_id = getStorageID();
     auto alter_context = getContext();
@@ -5851,7 +5961,7 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
     }
     else
     {
-        zookeeper->multi(requests);
+        zookeeper->multi(requests, /* check_session_valid */ true);
     }
 
     {
@@ -5873,10 +5983,6 @@ bool StorageReplicatedMergeTree::executeMetadataAlter(const StorageReplicatedMer
         resetObjectColumnsFromActiveParts(parts_lock);
     }
 
-    /// 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(current_metadata->getMetadataVersion()), zkutil::CreateMode::Persistent);
-
     return true;
 }
 
@@ -6441,13 +6547,13 @@ PartitionCommandsResultInfo StorageReplicatedMergeTree::attachPartition(
         assertNotReadonly();
 
     PartitionCommandsResultInfo results;
-    PartsTemporaryRename renamed_parts(*this, "detached/");
+    PartsTemporaryRename renamed_parts(*this, DETACHED_DIR_NAME);
     MutableDataPartsVector loaded_parts = tryLoadPartsToAttach(partition, attach_part, query_context, renamed_parts);
 
     /// TODO Allow to use quorum here.
     ReplicatedMergeTreeSink output(*this, metadata_snapshot, /* quorum */ 0, /* quorum_timeout_ms */ 0, /* max_parts_per_block */ 0,
                                    /* quorum_parallel */ false, query_context->getSettingsRef().insert_deduplicate,
-                                   /* majority_quorum */ false, query_context, /*is_attach*/true);
+                                   /* majority_quorum */ false, query_context, /* is_attach */ true, /* allow_attach_while_readonly */ true);
 
     for (size_t i = 0; i < loaded_parts.size(); ++i)
     {
@@ -6806,7 +6912,7 @@ bool StorageReplicatedMergeTree::tryWaitForReplicaToProcessLogEntry(
     }
     else
     {
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: unexpected name of log node: {}", entry.znode_name);
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Unexpected name of log node: {}", entry.znode_name);
     }
 
     /** Second - find the corresponding entry in the queue of the specified replica.
@@ -6916,7 +7022,7 @@ 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();
+            res.total_replicas = UInt32(all_replicas.size());
             if (get_result[1].error == Coordination::Error::ZNONODE)
                 res.lost_part_count = 0;
             else
@@ -7182,7 +7288,7 @@ void StorageReplicatedMergeTree::fetchPartition(
     }
 
     if (best_replica.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: cannot choose best replica.");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot choose best replica.");
 
     LOG_INFO(log, "Found {} replicas, {} of them are active. Selected {} to fetch from.", replicas.size(), active_replicas.size(), best_replica);
 
@@ -7269,6 +7375,24 @@ void StorageReplicatedMergeTree::fetchPartition(
 }
 
 
+void StorageReplicatedMergeTree::forgetPartition(const ASTPtr & partition, ContextPtr query_context)
+{
+    zkutil::ZooKeeperPtr zookeeper = getZooKeeperAndAssertNotReadonly();
+
+    String partition_id = getPartitionIDFromQuery(partition, query_context);
+    String block_numbers_path = fs::path(zookeeper_path) / "block_numbers";
+    String partition_path = fs::path(block_numbers_path) / partition_id;
+
+    auto error_code = zookeeper->tryRemove(partition_path);
+    if (error_code == Coordination::Error::ZOK)
+        LOG_INFO(log, "Forget partition {}", partition_id);
+    else if (error_code == Coordination::Error::ZNONODE)
+        throw Exception(ErrorCodes::CANNOT_FORGET_PARTITION, "Partition {} is unknown", partition_id);
+    else
+        throw zkutil::KeeperException::fromPath(error_code, partition_path);
+}
+
+
 void StorageReplicatedMergeTree::mutate(const MutationCommands & commands, ContextPtr query_context)
 {
     /// Overview of the mutation algorithm.
@@ -7448,6 +7572,7 @@ CancellationCode StorageReplicatedMergeTree::killMutation(const String & mutatio
         Int64 block_number = pair.second;
         getContext()->getMergeList().cancelPartMutations(getStorageID(), partition_id, block_number);
     }
+    mutation_backoff_policy.resetMutationFailures();
     return CancellationCode::CancelSent;
 }
 
@@ -7596,9 +7721,14 @@ void StorageReplicatedMergeTree::forcefullyRemoveBrokenOutdatedPartFromZooKeeper
     /// It could became Outdated because it was merged/mutated (so we have a covering part) or because it was dropped.
     /// But DROP [PART]ITION waits for all Outdated parts to be loaded, so it's not the case.
 
-    auto zookeeper = getZooKeeper();
+    bool exists = false;
     String part_path = replica_path + "/parts/" + part_name;
-    if (!zookeeper->exists(part_path))
+    const auto & settings = getContext()->getSettingsRef();
+    ZooKeeperRetriesInfo retries_info{settings.keeper_max_retries, settings.keeper_retry_initial_backoff_ms, settings.keeper_retry_max_backoff_ms};
+    ZooKeeperRetriesControl retries_ctl("outdatedPartExists", log.load(), retries_info, nullptr);
+
+    retries_ctl.retryLoop([&]() { exists = getZooKeeper()->exists(part_path); });
+    if (!exists)
         return;
 
     auto part = getActiveContainingPart(part_name);
@@ -7934,12 +8064,14 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
 
             bool zero_copy_enabled = storage_settings_ptr->allow_remote_fs_zero_copy_replication
                 || dynamic_cast<const MergeTreeData *>(source_table.get())->getSettings()->allow_remote_fs_zero_copy_replication;
+
             IDataPartStorage::ClonePartParams clone_params
             {
                 .copy_instead_of_hardlink = storage_settings_ptr->always_use_copy_instead_of_hardlinks || (zero_copy_enabled && src_part->isStoredOnRemoteDiskWithZeroCopySupport()),
                 .metadata_version_to_write = metadata_snapshot->getMetadataVersion()
             };
-            auto [dst_part, part_lock] = cloneAndLoadDataPartOnSameDisk(
+
+            auto [dst_part, part_lock] = cloneAndLoadDataPart(
                 src_part,
                 TMP_PREFIX,
                 dst_part_info,
@@ -7947,9 +8079,10 @@ void StorageReplicatedMergeTree::replacePartitionFrom(
                 clone_params,
                 query_context->getReadSettings(),
                 query_context->getWriteSettings());
-            src_parts.emplace_back(src_part);
-            dst_parts.emplace_back(dst_part);
+
+            dst_parts.emplace_back(std::move(dst_part));
             dst_parts_locks.emplace_back(std::move(part_lock));
+            src_parts.emplace_back(src_part);
             ephemeral_locks.emplace_back(std::move(*lock));
             block_id_paths.emplace_back(block_id_path);
             part_checksums.emplace_back(hash_hex);
@@ -8187,7 +8320,7 @@ void StorageReplicatedMergeTree::movePartitionToTable(const StoragePtr & dest_ta
                 .copy_instead_of_hardlink = storage_settings_ptr->always_use_copy_instead_of_hardlinks || (zero_copy_enabled && src_part->isStoredOnRemoteDiskWithZeroCopySupport()),
                 .metadata_version_to_write = dest_metadata_snapshot->getMetadataVersion()
             };
-            auto [dst_part, dst_part_lock] = dest_table_storage->cloneAndLoadDataPartOnSameDisk(
+            auto [dst_part, dst_part_lock] = dest_table_storage->cloneAndLoadDataPart(
                 src_part,
                 TMP_PREFIX,
                 dst_part_info,
@@ -8376,9 +8509,9 @@ void StorageReplicatedMergeTree::movePartitionToShard(
         }
 
         /// canMergeSinglePart is overlapping with dropPart, let's try to use the same code.
-        String out_reason;
+        PreformattedMessage out_reason;
         if (!merge_pred.canMergeSinglePart(part, out_reason))
-            throw Exception(ErrorCodes::PART_IS_TEMPORARILY_LOCKED, "Part is busy, reason: {}", out_reason);
+            throw Exception(ErrorCodes::PART_IS_TEMPORARILY_LOCKED, "Part is busy, reason: {}", out_reason.text);
     }
 
     {
@@ -8551,7 +8684,7 @@ void StorageReplicatedMergeTree::onActionLockRemove(StorageActionBlockType actio
         cleanup_thread.wakeup();
 }
 
-bool StorageReplicatedMergeTree::waitForProcessingQueue(UInt64 max_wait_milliseconds, SyncReplicaMode sync_mode)
+bool StorageReplicatedMergeTree::waitForProcessingQueue(UInt64 max_wait_milliseconds, SyncReplicaMode sync_mode, std::unordered_set<String> source_replicas)
 {
     /// Let's fetch new log entries firstly
     queue.pullLogsToQueue(getZooKeeperAndAssertNotReadonly(), {}, ReplicatedMergeTreeQueue::SYNC);
@@ -8591,7 +8724,8 @@ bool StorageReplicatedMergeTree::waitForProcessingQueue(UInt64 max_wait_millisec
         if (wait_for_ids.empty())
             target_entry_event.set();
     };
-    const auto handler = queue.addSubscriber(std::move(callback), wait_for_ids, sync_mode);
+
+    const auto handler = queue.addSubscriber(std::move(callback), wait_for_ids, sync_mode, source_replicas);
 
     if (!target_entry_event.tryWait(max_wait_milliseconds))
         return false;
@@ -8635,18 +8769,18 @@ bool StorageReplicatedMergeTree::dropPartImpl(
 
         /// There isn't a lot we can do otherwise. Can't cancel merges because it is possible that a replica already
         /// finished the merge.
-        String out_reason;
+        PreformattedMessage out_reason;
         if (!merge_pred.canMergeSinglePart(part, out_reason))
         {
             if (throw_if_noop)
-                throw Exception::createDeprecated(out_reason, ErrorCodes::PART_IS_TEMPORARILY_LOCKED);
+                throw Exception(out_reason, ErrorCodes::PART_IS_TEMPORARILY_LOCKED);
             return false;
         }
 
         if (merge_pred.partParticipatesInReplaceRange(part, out_reason))
         {
             if (throw_if_noop)
-                throw Exception::createDeprecated(out_reason, ErrorCodes::PART_IS_TEMPORARILY_LOCKED);
+                throw Exception(out_reason, ErrorCodes::PART_IS_TEMPORARILY_LOCKED);
             return false;
         }
 
@@ -8877,12 +9011,11 @@ IStorage::DataValidationTasksPtr StorageReplicatedMergeTree::getCheckTaskList(
 
 std::optional<CheckResult> StorageReplicatedMergeTree::checkDataNext(DataValidationTasksPtr & check_task_list)
 {
-
     if (auto part = assert_cast<DataValidationTasks *>(check_task_list.get())->next())
     {
         try
         {
-            return CheckResult(part_check_thread.checkPartAndFix(part->name));
+            return part_check_thread.checkPartAndFix(part->name, /* recheck_after */nullptr, /* throw_on_broken_projection */true);
         }
         catch (const Exception & ex)
         {
@@ -8963,7 +9096,7 @@ bool StorageReplicatedMergeTree::canUseAdaptiveGranularity() const
 }
 
 
-std::map<int64_t, MutationCommands> StorageReplicatedMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
+MutationCommands StorageReplicatedMergeTree::getAlterMutationCommandsForPart(const DataPartPtr & part) const
 {
     return queue.getAlterMutationCommandsForPart(part);
 }
@@ -9094,7 +9227,7 @@ zkutil::EphemeralNodeHolderPtr StorageReplicatedMergeTree::lockSharedDataTempora
     String id = part_id;
     boost::replace_all(id, "/", "_");
 
-    String zc_zookeeper_path = getZeroCopyPartPath(*getSettings(), toString(disk->getDataSourceDescription().type), getTableSharedID(),
+    String zc_zookeeper_path = getZeroCopyPartPath(*getSettings(), disk->getDataSourceDescription().toString(), getTableSharedID(),
         part_name, zookeeper_path)[0];
 
     String zookeeper_node = fs::path(zc_zookeeper_path) / id / replica_name;
@@ -9346,7 +9479,7 @@ StorageReplicatedMergeTree::unlockSharedData(const IMergeTreeDataPart & part, co
 
     return unlockSharedDataByID(
         part.getUniqueId(), shared_id, part.info, replica_name,
-        part.getDataPartStorage().getDiskType(), zookeeper, *getSettings(), log, zookeeper_path, format_version);
+        part.getDataPartStorage().getDiskType(), zookeeper, *getSettings(), log.load(), zookeeper_path, format_version);
 }
 
 namespace
@@ -9362,7 +9495,7 @@ 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 MergeTreePartInfo & part_info, MergeTreeDataFormatVersion format_version, Poco::Logger * log)
+std::pair<bool, NameSet> getParentLockedBlobs(const ZooKeeperWithFaultInjectionPtr & zookeeper_ptr, const std::string & zero_copy_part_path_prefix, const MergeTreePartInfo & part_info, MergeTreeDataFormatVersion format_version, LoggerPtr log)
 {
     NameSet files_not_to_remove;
 
@@ -9453,7 +9586,7 @@ std::pair<bool, NameSet> getParentLockedBlobs(const ZooKeeperWithFaultInjectionP
 std::pair<bool, NameSet> StorageReplicatedMergeTree::unlockSharedDataByID(
         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)
+        LoggerPtr logger, const String & zookeeper_path_old, MergeTreeDataFormatVersion data_format_version)
 {
     boost::replace_all(part_id, "/", "_");
 
@@ -9606,7 +9739,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::tryToFetchIfShared
     if (!(disk->supportZeroCopyReplication() && settings->allow_remote_fs_zero_copy_replication))
         return nullptr;
 
-    String replica = getSharedDataReplica(part, data_source_description.type);
+    String replica = getSharedDataReplica(part, data_source_description);
 
     /// We can't fetch part when none replicas have this part on a same type remote disk
     if (replica.empty())
@@ -9616,7 +9749,7 @@ MergeTreeData::MutableDataPartPtr StorageReplicatedMergeTree::tryToFetchIfShared
 }
 
 String StorageReplicatedMergeTree::getSharedDataReplica(
-    const IMergeTreeDataPart & part, DataSourceType data_source_type) const
+    const IMergeTreeDataPart & part, const DataSourceDescription & data_source_description) const
 {
     String best_replica;
 
@@ -9624,7 +9757,7 @@ String StorageReplicatedMergeTree::getSharedDataReplica(
     if (!zookeeper)
         return "";
 
-    Strings zc_zookeeper_paths = getZeroCopyPartPath(*getSettings(), toString(data_source_type), getTableSharedID(), part.name,
+    Strings zc_zookeeper_paths = getZeroCopyPartPath(*getSettings(), data_source_description.toString(), getTableSharedID(), part.name,
             zookeeper_path);
 
     std::set<String> replicas;
@@ -9781,7 +9914,7 @@ std::optional<String> StorageReplicatedMergeTree::getZeroCopyPartPath(const Stri
     if (!disk || !disk->supportZeroCopyReplication())
         return std::nullopt;
 
-    return getZeroCopyPartPath(*getSettings(), toString(disk->getDataSourceDescription().type), getTableSharedID(), part_name, zookeeper_path)[0];
+    return getZeroCopyPartPath(*getSettings(), disk->getDataSourceDescription().toString(), getTableSharedID(), part_name, zookeeper_path)[0];
 }
 
 bool StorageReplicatedMergeTree::waitZeroCopyLockToDisappear(const ZeroCopyLock & lock, size_t milliseconds_to_wait)
@@ -9853,7 +9986,7 @@ bool StorageReplicatedMergeTree::checkIfDetachedPartExists(const String & part_n
 {
     fs::directory_iterator dir_end;
     for (const std::string & path : getDataPaths())
-        for (fs::directory_iterator dir_it{fs::path(path) / "detached/"}; dir_it != dir_end; ++dir_it)
+        for (fs::directory_iterator dir_it{fs::path(path) / DETACHED_DIR_NAME}; dir_it != dir_end; ++dir_it)
             if (dir_it->path().filename().string() == part_name)
                 return true;
     return false;
@@ -9866,7 +9999,7 @@ bool StorageReplicatedMergeTree::checkIfDetachedPartitionExists(const String & p
 
     for (const std::string & path : getDataPaths())
     {
-        for (fs::directory_iterator dir_it{fs::path(path) / "detached/"}; dir_it != dir_end; ++dir_it)
+        for (fs::directory_iterator dir_it{fs::path(path) / DETACHED_DIR_NAME}; dir_it != dir_end; ++dir_it)
         {
             const String file_name = dir_it->path().filename().string();
             auto part_info = MergeTreePartInfo::tryParsePartName(file_name, format_version);
@@ -10016,7 +10149,7 @@ bool StorageReplicatedMergeTree::createEmptyPartInsteadOfLost(zkutil::ZooKeeperP
             ThreadFuzzer::maybeInjectSleep();
 
             Coordination::Responses responses;
-            auto code = zookeeper->tryMulti(ops, responses);
+            auto code = zookeeper->tryMulti(ops, responses, /* check_session_valid */ true);
             if (code == Coordination::Error::ZOK)
             {
                 transaction.commit();
@@ -10141,7 +10274,7 @@ void StorageReplicatedMergeTree::createZeroCopyLockNode(
                 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);
+                    LOG_WARNING(getLogger("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;
                 }
@@ -10197,9 +10330,9 @@ bool StorageReplicatedMergeTree::removeSharedDetachedPart(DiskPtr disk, const St
             std::tie(can_remove, files_not_to_remove) = StorageReplicatedMergeTree::unlockSharedDataByID(
                 id, table_uuid, part_info,
                 detached_replica_name,
-                toString(disk->getDataSourceDescription().type),
+                disk->getDataSourceDescription().toString(),
                 std::make_shared<ZooKeeperWithFaultInjection>(zookeeper), local_context->getReplicatedMergeTreeSettings(),
-                &Poco::Logger::get("StorageReplicatedMergeTree"),
+                getLogger("StorageReplicatedMergeTree"),
                 detached_zookeeper_path,
                 MERGE_TREE_DATA_MIN_FORMAT_VERSION_WITH_CUSTOM_PARTITIONING);
 
@@ -10299,7 +10432,7 @@ void StorageReplicatedMergeTree::backupData(
         bool exists = false;
         Strings mutation_ids;
         {
-            ZooKeeperRetriesControl retries_ctl("getMutations", log, zookeeper_retries_info, nullptr);
+            ZooKeeperRetriesControl retries_ctl("getMutations", log.load(), zookeeper_retries_info, nullptr);
             retries_ctl.retryLoop([&]()
             {
                 if (!zookeeper || zookeeper->expired())
@@ -10318,7 +10451,7 @@ void StorageReplicatedMergeTree::backupData(
                 bool mutation_id_exists = false;
                 String mutation;
 
-                ZooKeeperRetriesControl retries_ctl("getMutation", log, zookeeper_retries_info, nullptr);
+                ZooKeeperRetriesControl retries_ctl("getMutation", log.load(), zookeeper_retries_info, nullptr);
                 retries_ctl.retryLoop([&]()
                 {
                     if (!zookeeper || zookeeper->expired())
@@ -10398,7 +10531,7 @@ void StorageReplicatedMergeTree::restoreDataFromBackup(RestorerFromBackup & rest
         }
         auto backup = restorer.getBackup();
         if (!empty && backup->hasFiles(data_path_in_backup))
-            restorer.throwTableIsNotEmpty(getStorageID());
+            RestorerFromBackup::throwTableIsNotEmpty(getStorageID());
     }
 
     restorePartsFromBackup(restorer, data_path_in_backup, partitions);
@@ -10407,7 +10540,11 @@ void StorageReplicatedMergeTree::restoreDataFromBackup(RestorerFromBackup & rest
 void StorageReplicatedMergeTree::attachRestoredParts(MutableDataPartsVector && parts)
 {
     auto metadata_snapshot = getInMemoryMetadataPtr();
-    auto sink = std::make_shared<ReplicatedMergeTreeSink>(*this, metadata_snapshot, 0, 0, 0, false, false, false,  getContext(), /*is_attach*/true);
+
+    auto sink = std::make_shared<ReplicatedMergeTreeSink>(
+        *this, metadata_snapshot, /* quorum */ 0, /* quorum_timeout_ms */ 0, /* max_parts_per_block */ 0, /* quorum_parallel */ false,
+        /* deduplicate */ false, /* majority_quorum */ false, getContext(), /* is_attach */ true, /* allow_attach_while_readonly */ false);
+
     for (auto part : parts)
         sink->writeExistingPart(part);
 }
diff --git a/src/Storages/StorageReplicatedMergeTree.h b/src/Storages/StorageReplicatedMergeTree.h
index fb74097d768..c472c11e7f8 100644
--- a/src/Storages/StorageReplicatedMergeTree.h
+++ b/src/Storages/StorageReplicatedMergeTree.h
@@ -99,7 +99,7 @@ public:
     StorageReplicatedMergeTree(
         const String & zookeeper_path_,
         const String & replica_name_,
-        bool attach,
+        LoadingStrictnessLevel mode,
         const StorageID & table_id_,
         const String & relative_data_path_,
         const StorageInMemoryMetadata & metadata_,
@@ -107,7 +107,6 @@ public:
         const String & date_column_name,
         const MergingParams & merging_params_,
         std::unique_ptr<MergeTreeSettings> settings_,
-        bool has_force_restore_data_flag,
         RenamingRestrictions renaming_restrictions_,
         bool need_check_structure);
 
@@ -143,9 +142,6 @@ public:
 
     ~StorageReplicatedMergeTree() override;
 
-    static String getDefaultZooKeeperPath(const Poco::Util::AbstractConfiguration & config);
-    static String getDefaultReplicaName(const Poco::Util::AbstractConfiguration & config);
-
     std::string getName() const override { return "Replicated" + merging_params.getModeName() + "MergeTree"; }
 
     bool supportsParallelInsert() const override { return true; }
@@ -208,7 +204,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, SyncReplicaMode sync_mode);
+    bool waitForProcessingQueue(UInt64 max_wait_milliseconds, SyncReplicaMode sync_mode, std::unordered_set<String> source_replicas);
 
     /// 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);
@@ -235,14 +231,6 @@ public:
     /// Checks ability to use granularity
     bool canUseAdaptiveGranularity() const override;
 
-    /// Returns the default path to the table in ZooKeeper.
-    /// It's used if not set in engine's arguments while creating a replicated table.
-    static String getDefaultReplicaPath(const ContextPtr & context_);
-
-    /// Returns the default replica name in ZooKeeper.
-    /// It's used if not set in engine's arguments while creating a replicated table.
-    static String getDefaultReplicaName(const ContextPtr & context_);
-
     /// Modify a CREATE TABLE query to make a variant which must be written to a backup.
     void adjustCreateQueryForBackup(ASTPtr & create_query) const override;
 
@@ -253,15 +241,16 @@ public:
     void restoreDataFromBackup(RestorerFromBackup & restorer, const String & data_path_in_backup, const std::optional<ASTs> & partitions) override;
 
     /** Remove a specific replica from zookeeper.
+     * returns true if there are no replicas left
      */
-    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);
+    static bool dropReplica(zkutil::ZooKeeperPtr zookeeper, const String & zookeeper_path, const String & replica,
+                            LoggerPtr 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);
+    bool dropReplica(const String & drop_zookeeper_path, const String & drop_replica, LoggerPtr 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);
+                                              const zkutil::EphemeralNodeHolder::Ptr & metadata_drop_lock, LoggerPtr logger);
 
     /// Schedules job to execute in background pool (merge, mutate, drop range and so on)
     bool scheduleDataProcessingJob(BackgroundJobsAssignee & assignee) override;
@@ -308,7 +297,7 @@ public:
         const std::string & disk_type,
         const ZooKeeperWithFaultInjectionPtr & zookeeper_,
         const MergeTreeSettings & settings,
-        Poco::Logger * logger,
+        LoggerPtr logger,
         const String & zookeeper_path_old,
         MergeTreeDataFormatVersion data_format_version);
 
@@ -316,7 +305,7 @@ public:
     MutableDataPartPtr tryToFetchIfShared(const IMergeTreeDataPart & part, const DiskPtr & disk, const String & path) override;
 
     /// Get best replica having this partition on a same type remote disk
-    String getSharedDataReplica(const IMergeTreeDataPart & part, DataSourceType data_source_type) const;
+    String getSharedDataReplica(const IMergeTreeDataPart & part, const DataSourceDescription & data_source_description) const;
 
     inline const String & getReplicaName() const { return replica_name; }
 
@@ -362,7 +351,9 @@ public:
 
     bool canUseZeroCopyReplication() const;
 
-    bool isTableReadOnly () { return is_readonly; }
+    bool isTableReadOnly () { return is_readonly || isStaticStorage(); }
+
+    std::optional<bool> hasMetadataInZooKeeper () { return has_metadata_in_zookeeper; }
 
     /// Get a sequential consistent view of current parts.
     ReplicatedMergeTreeQuorumAddedParts::PartitionIdToMaxBlock getMaxAddedBlocks() const;
@@ -773,7 +764,7 @@ private:
     String findReplicaHavingCoveringPart(LogEntry & entry, bool active);
     bool findReplicaHavingCoveringPart(const String & part_name, bool active);
     String findReplicaHavingCoveringPartImplLowLevel(LogEntry * entry, const String & part_name, String & found_part_name, bool active);
-    static std::set<MergeTreePartInfo> findReplicaUniqueParts(const String & replica_name_, const String & zookeeper_path_, MergeTreeDataFormatVersion format_version_, zkutil::ZooKeeper::Ptr zookeeper_, Poco::Logger * log_);
+    static std::set<MergeTreePartInfo> findReplicaUniqueParts(const String & replica_name_, const String & zookeeper_path_, MergeTreeDataFormatVersion format_version_, zkutil::ZooKeeper::Ptr zookeeper_, LoggerPtr log_);
 
     /** Download the specified part from the specified replica.
       * If `to_detached`, the part is placed in the `detached` directory.
@@ -912,6 +903,8 @@ private:
         const String & from,
         bool fetch_part,
         ContextPtr query_context) override;
+    void forgetPartition(const ASTPtr & partition, ContextPtr query_context) override;
+
 
     /// NOTE: there are no guarantees for concurrent merges. Dropping part can
     /// be concurrently merged into some covering part and dropPart will do
@@ -941,7 +934,7 @@ private:
     void waitMutationToFinishOnReplicas(
         const Strings & replicas, const String & mutation_id) const;
 
-    std::map<int64_t, MutationCommands> getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
+    MutationCommands getAlterMutationCommandsForPart(const DataPartPtr & part) const override;
 
     void startBackgroundMovesIfNeeded() override;
 
@@ -991,6 +984,10 @@ private:
 
     void startupImpl(bool from_attach_thread);
 
+    std::vector<String> getZookeeperZeroCopyLockPaths() const;
+    static void dropZookeeperZeroCopyLockPaths(zkutil::ZooKeeperPtr zookeeper,
+                                               std::vector<String> zero_copy_locks_paths, LoggerPtr logger);
+
     struct DataValidationTasks : public IStorage::DataValidationTasksBase
     {
         explicit DataValidationTasks(DataPartsVector && parts_, std::unique_lock<std::mutex> && parts_check_lock_)
diff --git a/src/Storages/StorageS3.cpp b/src/Storages/StorageS3.cpp
index 3ddbfe8d894..6cda0fca60b 100644
--- a/src/Storages/StorageS3.cpp
+++ b/src/Storages/StorageS3.cpp
@@ -68,14 +68,10 @@
 
 #include <boost/algorithm/string.hpp>
 
-#ifdef __clang__
-#  pragma clang diagnostic push
-#  pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
-#endif
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
 #include <re2/re2.h>
-#ifdef __clang__
-#  pragma clang diagnostic pop
-#endif
+#pragma clang diagnostic pop
 
 namespace fs = std::filesystem;
 
@@ -129,9 +125,11 @@ namespace ErrorCodes
     extern const int UNEXPECTED_EXPRESSION;
     extern const int DATABASE_ACCESS_DENIED;
     extern const int CANNOT_EXTRACT_TABLE_STRUCTURE;
+    extern const int CANNOT_DETECT_FORMAT;
     extern const int NOT_IMPLEMENTED;
     extern const int CANNOT_COMPILE_REGEXP;
     extern const int FILE_DOESNT_EXIST;
+    extern const int NO_ELEMENTS_IN_CONFIG;
 }
 
 
@@ -142,43 +140,39 @@ public:
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromStorageS3Step(
-        Block sample_block,
         const Names & column_names_,
-        StorageSnapshotPtr storage_snapshot_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
         StorageS3 & storage_,
         ReadFromFormatInfo read_from_format_info_,
         bool need_only_count_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , column_names(column_names_)
-        , storage_snapshot(std::move(storage_snapshot_))
         , storage(storage_)
         , read_from_format_info(std::move(read_from_format_info_))
         , need_only_count(need_only_count_)
-        , local_context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
     {
-        query_configuration = storage.updateConfigurationAndGetCopy(local_context);
-        virtual_columns = storage.getVirtuals();
+        query_configuration = storage.updateConfigurationAndGetCopy(context);
+        virtual_columns = storage.getVirtualsList();
     }
 
 private:
     Names column_names;
-    StorageSnapshotPtr storage_snapshot;
     StorageS3 & storage;
     ReadFromFormatInfo read_from_format_info;
     bool need_only_count;
     StorageS3::Configuration query_configuration;
     NamesAndTypesList virtual_columns;
 
-    ContextPtr local_context;
-
     size_t max_block_size;
     size_t num_streams;
 
@@ -213,7 +207,7 @@ public:
         , list_objects_scheduler(threadPoolCallbackRunner<ListObjectsOutcome>(list_objects_pool, "ListObjects"))
         , file_progress_callback(file_progress_callback_)
     {
-        if (globbed_uri.bucket.find_first_of("*?{") != globbed_uri.bucket.npos)
+        if (globbed_uri.bucket.find_first_of("*?{") != std::string::npos)
             throw Exception(ErrorCodes::UNEXPECTED_EXPRESSION, "Expression can not have wildcards inside bucket name");
 
         const String key_prefix = globbed_uri.key.substr(0, globbed_uri.key.find_first_of("*?{"));
@@ -244,7 +238,7 @@ public:
         fillInternalBufferAssumeLocked();
     }
 
-    KeyWithInfoPtr next()
+    KeyWithInfoPtr next(size_t)
     {
         std::lock_guard lock(mutex);
         return nextAssumeLocked();
@@ -265,45 +259,46 @@ private:
 
     KeyWithInfoPtr nextAssumeLocked()
     {
-        if (buffer_iter != buffer.end())
+        do
         {
-            auto answer = *buffer_iter;
-            ++buffer_iter;
-
-            /// If url doesn't contain globs, we didn't list s3 bucket and didn't get object info for the key.
-            /// So we get object info lazily here on 'next()' request.
-            if (!answer->info)
+            if (buffer_iter != buffer.end())
             {
-                answer->info = S3::getObjectInfo(*client, globbed_uri.bucket, answer->key, globbed_uri.version_id, request_settings);
-                if (file_progress_callback)
-                    file_progress_callback(FileProgress(0, answer->info->size));
+                auto answer = *buffer_iter;
+                ++buffer_iter;
+
+                /// If url doesn't contain globs, we didn't list s3 bucket and didn't get object info for the key.
+                /// So we get object info lazily here on 'next()' request.
+                if (!answer->info)
+                {
+                    answer->info = S3::getObjectInfo(*client, globbed_uri.bucket, answer->key, globbed_uri.version_id, request_settings);
+                    if (file_progress_callback)
+                        file_progress_callback(FileProgress(0, answer->info->size));
+                }
+
+                return answer;
             }
 
-            return answer;
-        }
+            if (is_finished)
+                return {};
 
-        if (is_finished)
-            return {};
-
-        try
-        {
-            fillInternalBufferAssumeLocked();
-        }
-        catch (...)
-        {
-            /// In case of exception thrown while listing new batch of files
-            /// iterator may be partially initialized and its further using may lead to UB.
-            /// Iterator is used by several processors from several threads and
-            /// it may take some time for threads to stop processors and they
-            /// may still use this iterator after exception is thrown.
-            /// To avoid this UB, reset the buffer and return defaults for further calls.
-            is_finished = true;
-            buffer.clear();
-            buffer_iter = buffer.begin();
-            throw;
-        }
-
-        return nextAssumeLocked();
+            try
+            {
+                fillInternalBufferAssumeLocked();
+            }
+            catch (...)
+            {
+                /// In case of exception thrown while listing new batch of files
+                /// iterator may be partially initialized and its further using may lead to UB.
+                /// Iterator is used by several processors from several threads and
+                /// it may take some time for threads to stop processors and they
+                /// may still use this iterator after exception is thrown.
+                /// To avoid this UB, reset the buffer and return defaults for further calls.
+                is_finished = true;
+                buffer.clear();
+                buffer_iter = buffer.begin();
+                throw;
+            }
+        } while (true);
     }
 
     void fillInternalBufferAssumeLocked()
@@ -428,7 +423,7 @@ StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
     const S3::URI & globbed_uri_,
     const ActionsDAG::Node * predicate,
     const NamesAndTypesList & virtual_columns_,
-    ContextPtr context,
+    const ContextPtr & context,
     KeysWithInfo * read_keys_,
     const S3Settings::RequestSettings & request_settings_,
     std::function<void(FileProgress)> file_progress_callback_)
@@ -436,9 +431,9 @@ StorageS3Source::DisclosedGlobIterator::DisclosedGlobIterator(
 {
 }
 
-StorageS3Source::KeyWithInfoPtr StorageS3Source::DisclosedGlobIterator::next()
+StorageS3Source::KeyWithInfoPtr StorageS3Source::DisclosedGlobIterator::next(size_t idx) /// NOLINT
 {
-    return pimpl->next();
+    return pimpl->next(idx);
 }
 
 size_t StorageS3Source::DisclosedGlobIterator::estimatedKeysCount()
@@ -471,7 +466,7 @@ public:
         }
     }
 
-    KeyWithInfoPtr next()
+    KeyWithInfoPtr next(size_t)
     {
         size_t current_index = index.fetch_add(1, std::memory_order_relaxed);
         if (current_index >= keys.size())
@@ -516,9 +511,9 @@ StorageS3Source::KeysIterator::KeysIterator(
 {
 }
 
-StorageS3Source::KeyWithInfoPtr StorageS3Source::KeysIterator::next()
+StorageS3Source::KeyWithInfoPtr StorageS3Source::KeysIterator::next(size_t idx) /// NOLINT
 {
-    return pimpl->next();
+    return pimpl->next(idx);
 }
 
 size_t StorageS3Source::KeysIterator::estimatedKeysCount()
@@ -545,13 +540,21 @@ StorageS3Source::ReadTaskIterator::ReadTaskIterator(
         buffer.emplace_back(std::make_shared<KeyWithInfo>(key_future.get(), std::nullopt));
 }
 
-StorageS3Source::KeyWithInfoPtr StorageS3Source::ReadTaskIterator::next()
+StorageS3Source::KeyWithInfoPtr StorageS3Source::ReadTaskIterator::next(size_t) /// NOLINT
 {
     size_t current_index = index.fetch_add(1, std::memory_order_relaxed);
     if (current_index >= buffer.size())
         return std::make_shared<KeyWithInfo>(callback());
 
-    return buffer[current_index];
+    while (current_index < buffer.size())
+    {
+        if (const auto & key_info = buffer[current_index]; key_info && !key_info->key.empty())
+            return buffer[current_index];
+
+        current_index = index.fetch_add(1, std::memory_order_relaxed);
+    }
+
+    return nullptr;
 }
 
 size_t StorageS3Source::ReadTaskIterator::estimatedKeysCount()
@@ -563,7 +566,7 @@ StorageS3Source::StorageS3Source(
     const ReadFromFormatInfo & info,
     const String & format_,
     String name_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     std::optional<FormatSettings> format_settings_,
     UInt64 max_block_size_,
     const S3Settings::RequestSettings & request_settings_,
@@ -599,23 +602,23 @@ StorageS3Source::StorageS3Source(
 {
 }
 
-void StorageS3Source::lazyInitialize()
+void StorageS3Source::lazyInitialize(size_t idx)
 {
     if (initialized)
         return;
 
-    reader = createReader();
+    reader = createReader(idx);
     if (reader)
-        reader_future = createReaderAsync();
+        reader_future = createReaderAsync(idx);
     initialized = true;
 }
 
-StorageS3Source::ReaderHolder StorageS3Source::createReader()
+StorageS3Source::ReaderHolder StorageS3Source::createReader(size_t idx)
 {
     KeyWithInfoPtr key_with_info;
     do
     {
-        key_with_info = (*file_iterator)();
+        key_with_info = file_iterator->next(idx);
         if (!key_with_info || key_with_info->key.empty())
             return {};
 
@@ -689,9 +692,9 @@ StorageS3Source::ReaderHolder StorageS3Source::createReader()
     return ReaderHolder{key_with_info, bucket, std::move(read_buf), std::move(source), std::move(pipeline), std::move(current_reader)};
 }
 
-std::future<StorageS3Source::ReaderHolder> StorageS3Source::createReaderAsync()
+std::future<StorageS3Source::ReaderHolder> StorageS3Source::createReaderAsync(size_t idx)
 {
-    return create_reader_scheduler([this] { return createReader(); }, Priority{});
+    return create_reader_scheduler([=, this] { return createReader(idx); }, Priority{});
 }
 
 std::unique_ptr<ReadBuffer> StorageS3Source::createS3ReadBuffer(const String & key, size_t object_size)
@@ -722,32 +725,36 @@ std::unique_ptr<ReadBuffer> StorageS3Source::createAsyncS3ReadBuffer(
     auto context = getContext();
     auto read_buffer_creator =
         [this, read_settings, object_size]
-        (const std::string & path, size_t read_until_position) -> std::unique_ptr<ReadBufferFromFileBase>
+        (bool restricted_seek, const StoredObject & object) -> std::unique_ptr<ReadBufferFromFileBase>
     {
         return std::make_unique<ReadBufferFromS3>(
             client,
             bucket,
-            path,
+            object.remote_path,
             version_id,
             request_settings,
             read_settings,
             /* use_external_buffer */true,
             /* offset */0,
-            read_until_position,
-            /* restricted_seek */true,
+            /* read_until_position */0,
+            restricted_seek,
             object_size);
     };
 
+    auto modified_settings{read_settings};
+    /// User's S3 object may change, don't cache it.
+    modified_settings.use_page_cache_for_disks_without_file_cache = false;
+
+    /// 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 s3_impl = std::make_unique<ReadBufferFromRemoteFSGather>(
         std::move(read_buffer_creator),
         StoredObjects{StoredObject{key, /* local_path */ "", object_size}},
+        "",
         read_settings,
         /* cache_log */nullptr, /* use_external_buffer */true);
 
-    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,
@@ -841,7 +848,7 @@ public:
     StorageS3Sink(
         const String & format,
         const Block & sample_block_,
-        ContextPtr context,
+        const ContextPtr & context,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method,
         const StorageS3::Configuration & configuration_,
@@ -949,23 +956,22 @@ private:
 };
 
 
-class PartitionedStorageS3Sink : public PartitionedSink
+class PartitionedStorageS3Sink : public PartitionedSink, WithContext
 {
 public:
     PartitionedStorageS3Sink(
         const ASTPtr & partition_by,
         const String & format_,
         const Block & sample_block_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         std::optional<FormatSettings> format_settings_,
         const CompressionMethod compression_method_,
         const StorageS3::Configuration & configuration_,
         const String & bucket_,
         const String & key_)
-        : PartitionedSink(partition_by, context_, sample_block_)
+        : PartitionedSink(partition_by, context_, sample_block_), WithContext(context_)
         , format(format_)
         , sample_block(sample_block_)
-        , context(context_)
         , compression_method(compression_method_)
         , configuration(configuration_)
         , bucket(bucket_)
@@ -985,7 +991,7 @@ public:
         return std::make_shared<StorageS3Sink>(
             format,
             sample_block,
-            context,
+            getContext(),
             format_settings,
             compression_method,
             configuration,
@@ -997,7 +1003,6 @@ public:
 private:
     const String format;
     const Block sample_block;
-    const ContextPtr context;
     const CompressionMethod compression_method;
     const StorageS3::Configuration configuration;
     const String bucket;
@@ -1033,7 +1038,7 @@ private:
 
 StorageS3::StorageS3(
     const Configuration & configuration_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
@@ -1050,18 +1055,27 @@ StorageS3::StorageS3(
 {
     updateConfiguration(context_); // NOLINT(clang-analyzer-optin.cplusplus.VirtualCall)
 
-    FormatFactory::instance().checkFormatName(configuration.format);
+    if (configuration.format != "auto")
+        FormatFactory::instance().checkFormatName(configuration.format);
     context_->getGlobalContext()->getRemoteHostFilter().checkURL(configuration.url.uri);
     context_->getGlobalContext()->getHTTPHeaderFilter().checkHeaders(configuration.headers_from_ast);
 
     StorageInMemoryMetadata storage_metadata;
     if (columns_.empty())
     {
-        auto columns = getTableStructureFromDataImpl(configuration, format_settings, context_);
+        ColumnsDescription columns;
+        if (configuration.format == "auto")
+            std::tie(columns, configuration.format) = getTableStructureAndFormatFromData(configuration, format_settings, context_);
+        else
+            columns = getTableStructureFromData(configuration, format_settings, context_);
+
         storage_metadata.setColumns(columns);
     }
     else
     {
+        if (configuration.format == "auto")
+            configuration.format = getTableStructureAndFormatFromData(configuration, format_settings, context_).second;
+
         /// We don't allow special columns in S3 storage.
         if (!columns_.hasOnlyOrdinary())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table engine S3 doesn't support special columns like MATERIALIZED, ALIAS or EPHEMERAL");
@@ -1071,8 +1085,7 @@ StorageS3::StorageS3(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 static std::shared_ptr<StorageS3Source::IIterator> createFileIterator(
@@ -1139,28 +1152,29 @@ void StorageS3::read(
     size_t max_block_size,
     size_t num_streams)
 {
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context), virtual_columns);
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context));
 
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && local_context->getSettingsRef().optimize_count_from_files;
 
     auto reading = std::make_unique<ReadFromStorageS3Step>(
-        read_from_format_info.source_header,
         column_names,
+        query_info,
         storage_snapshot,
+        local_context,
+        read_from_format_info.source_header,
         *this,
         std::move(read_from_format_info),
         need_only_count,
-        local_context,
         max_block_size,
         num_streams);
 
     query_plan.addStep(std::move(reading));
 }
 
-void ReadFromStorageS3Step::applyFilters()
+void ReadFromStorageS3Step::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, local_context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -1174,8 +1188,8 @@ void ReadFromStorageS3Step::createIterator(const ActionsDAG::Node * predicate)
         return;
 
     iterator_wrapper = createFileIterator(
-        query_configuration, storage.distributed_processing, local_context, predicate,
-        virtual_columns, nullptr, local_context->getFileProgressCallback());
+        query_configuration, storage.distributed_processing, context, predicate,
+        virtual_columns, nullptr, context->getFileProgressCallback());
 }
 
 void ReadFromStorageS3Step::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
@@ -1192,9 +1206,9 @@ void ReadFromStorageS3Step::initializePipeline(QueryPipelineBuilder & pipeline,
         /// Disclosed glob iterator can underestimate the amount of keys in some cases. We will keep one stream for this particular case.
         num_streams = 1;
 
-    const size_t max_threads = local_context->getSettingsRef().max_threads;
+    const size_t max_threads = context->getSettingsRef().max_threads;
     const size_t max_parsing_threads = num_streams >= max_threads ? 1 : (max_threads / std::max(num_streams, 1ul));
-    LOG_DEBUG(&Poco::Logger::get("StorageS3"), "Reading in {} streams, {} threads per stream", num_streams, max_parsing_threads);
+    LOG_DEBUG(getLogger("StorageS3"), "Reading in {} streams, {} threads per stream", num_streams, max_parsing_threads);
 
     Pipes pipes;
     pipes.reserve(num_streams);
@@ -1204,7 +1218,7 @@ void ReadFromStorageS3Step::initializePipeline(QueryPipelineBuilder & pipeline,
             read_from_format_info,
             query_configuration.format,
             storage.getName(),
-            local_context,
+            context,
             storage.format_settings,
             max_block_size,
             query_configuration.request_settings,
@@ -1217,7 +1231,7 @@ void ReadFromStorageS3Step::initializePipeline(QueryPipelineBuilder & pipeline,
             max_parsing_threads,
             need_only_count);
 
-        source->setKeyCondition(filter_nodes.nodes, local_context);
+        source->setKeyCondition(filter_actions_dag, context);
         pipes.emplace_back(std::move(source));
     }
 
@@ -1347,17 +1361,17 @@ void StorageS3::truncate(const ASTPtr & /* query */, const StorageMetadataPtr &,
     }
 
     for (const auto & error : response.GetResult().GetErrors())
-        LOG_WARNING(&Poco::Logger::get("StorageS3"), "Failed to delete {}, error: {}", error.GetKey(), error.GetMessage());
+        LOG_WARNING(getLogger("StorageS3"), "Failed to delete {}, error: {}", error.GetKey(), error.GetMessage());
 }
 
-StorageS3::Configuration StorageS3::updateConfigurationAndGetCopy(ContextPtr local_context)
+StorageS3::Configuration StorageS3::updateConfigurationAndGetCopy(const ContextPtr & local_context)
 {
     std::lock_guard lock(configuration_update_mutex);
     configuration.update(local_context);
     return configuration;
 }
 
-void StorageS3::updateConfiguration(ContextPtr local_context)
+void StorageS3::updateConfiguration(const ContextPtr & local_context)
 {
     std::lock_guard lock(configuration_update_mutex);
     configuration.update(local_context);
@@ -1375,9 +1389,9 @@ const StorageS3::Configuration & StorageS3::getConfiguration()
     return configuration;
 }
 
-bool StorageS3::Configuration::update(ContextPtr context)
+bool StorageS3::Configuration::update(const ContextPtr & context)
 {
-    auto s3_settings = context->getStorageS3Settings().getSettings(url.uri.toString());
+    auto s3_settings = context->getStorageS3Settings().getSettings(url.uri.toString(), context->getUserName());
     request_settings = s3_settings.request_settings;
     request_settings.updateFromSettings(context->getSettings());
 
@@ -1390,11 +1404,14 @@ bool StorageS3::Configuration::update(ContextPtr context)
     return true;
 }
 
-void StorageS3::Configuration::connect(ContextPtr context)
+void StorageS3::Configuration::connect(const ContextPtr & context)
 {
     const Settings & global_settings = context->getGlobalContext()->getSettingsRef();
     const Settings & local_settings = context->getSettingsRef();
 
+    if (S3::isS3ExpressEndpoint(url.endpoint) && auth_settings.region.empty())
+        throw Exception(ErrorCodes::NO_ELEMENTS_IN_CONFIG, "Region should be explicitly specified for directory buckets");
+
     S3::PocoHTTPClientConfiguration client_configuration = S3::ClientFactory::instance().createClientConfiguration(
         auth_settings.region,
         context->getRemoteHostFilter(),
@@ -1407,8 +1424,10 @@ void StorageS3::Configuration::connect(ContextPtr context)
         url.uri.getScheme());
 
     client_configuration.endpointOverride = url.endpoint;
+    /// seems as we don't use it
     client_configuration.maxConnections = static_cast<unsigned>(request_settings.max_connections);
-    client_configuration.http_connection_pool_size = global_settings.s3_http_connection_pool_size;
+    client_configuration.connectTimeoutMs = local_settings.s3_connect_timeout_ms;
+
     auto headers = auth_settings.headers;
     if (!headers_from_ast.empty())
         headers.insert(headers.end(), headers_from_ast.begin(), headers_from_ast.end());
@@ -1419,6 +1438,7 @@ void StorageS3::Configuration::connect(ContextPtr context)
         .use_virtual_addressing = url.is_virtual_hosted_style,
         .disable_checksum = local_settings.s3_disable_checksum,
         .gcs_issue_compose_request = context->getConfigRef().getBool("s3.gcs_issue_compose_request", false),
+        .is_s3express_bucket = S3::isS3ExpressEndpoint(url.endpoint),
     };
 
     auto credentials = Aws::Auth::AWSCredentials(auth_settings.access_key_id, auth_settings.secret_access_key, auth_settings.session_token);
@@ -1436,7 +1456,8 @@ void StorageS3::Configuration::connect(ContextPtr context)
             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)),
-        });
+        },
+        credentials.GetSessionToken());
 }
 
 void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection)
@@ -1462,7 +1483,7 @@ void StorageS3::processNamedCollectionResult(StorageS3::Configuration & configur
     configuration.request_settings = S3Settings::RequestSettings(collection);
 }
 
-StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, ContextPtr local_context, bool get_format_from_file)
+StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, const ContextPtr & local_context, bool get_format_from_file)
 {
     StorageS3::Configuration configuration;
 
@@ -1488,25 +1509,13 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         /// S3('url', 'aws_access_key_id', 'aws_secret_access_key', 'session_token', 'format', 'compression')
         /// with optional headers() function
 
-        if (engine_args.empty() || engine_args.size() > 6)
+        size_t count = StorageURL::evalArgsAndCollectHeaders(engine_args, configuration.headers_from_ast, local_context);
+
+        if (count == 0 || count > 6)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
                             "Storage S3 requires 1 to 5 arguments: "
                             "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())
-            engine_args.erase(header_it);
-
-        for (auto & engine_arg : engine_args)
-            engine_arg = evaluateConstantExpressionOrIdentifierAsLiteral(engine_arg, local_context);
-
-        /// Size -> argument indexes
-        static std::unordered_map<size_t, std::unordered_map<std::string_view, size_t>> size_to_engine_args
-        {
-            {1, {{}}},
-            {6, {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}, {"compression_method", 5}}}
-        };
-
         std::unordered_map<std::string_view, size_t> engine_args_to_idx;
         bool no_sign_request = false;
 
@@ -1514,7 +1523,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         /// - 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)
+        if (count == 2)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "format/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -1524,10 +1533,10 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         }
         /// For 3 arguments we support 2 possible variants:
         /// - s3(source, format, compression_method)
-        /// - s3(source, access_key_id, access_key_id)
+        /// - s3(source, access_key_id, secret_access_key)
         /// - 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)
+        else if (count == 3)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "format/access_key_id/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -1535,7 +1544,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
                 no_sign_request = true;
                 engine_args_to_idx = {{"format", 2}};
             }
-            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            else if (second_arg == "auto" || FormatFactory::instance().exists(second_arg))
                 engine_args_to_idx = {{"format", 1}, {"compression_method", 2}};
             else
                 engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}};
@@ -1545,7 +1554,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         /// - 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)
+        else if (count == 4)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(engine_args[1], "access_key_id/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -1556,7 +1565,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
             else
             {
                 auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "session_token/format");
-                if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+                if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
                 {
                     engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}};
                 }
@@ -1569,10 +1578,10 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
         /// For 5 arguments we support 2 possible variants:
         /// - s3(source, access_key_id, secret_access_key, session_token, format)
         /// - s3(source, access_key_id, secret_access_key, format, compression)
-        else if (engine_args.size() == 5)
+        else if (count == 5)
         {
             auto fourth_arg = checkAndGetLiteralArgument<String>(engine_args[3], "session_token/format");
-            if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+            if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
             {
                 engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"compression", 4}};
             }
@@ -1581,9 +1590,9 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
                 engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}};
             }
         }
-        else
+        else if (count == 6)
         {
-            engine_args_to_idx = size_to_engine_args[engine_args.size()];
+            engine_args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}, {"compression_method", 5}};
         }
 
         /// This argument is always the first
@@ -1613,7 +1622,7 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
     configuration.keys = {configuration.url.key};
 
     if (configuration.format == "auto" && get_format_from_file)
-        configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.url.key, true);
+        configuration.format = FormatFactory::instance().tryGetFormatFromFileName(configuration.url.key).value_or("auto");
 
     return configuration;
 }
@@ -1621,9 +1630,17 @@ StorageS3::Configuration StorageS3::getConfiguration(ASTs & engine_args, Context
 ColumnsDescription StorageS3::getTableStructureFromData(
     const StorageS3::Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx)
+    const ContextPtr & ctx)
 {
-    return getTableStructureFromDataImpl(configuration, format_settings, ctx);
+    return getTableStructureAndFormatFromDataImpl(configuration.format, configuration, format_settings, ctx).first;
+}
+
+std::pair<ColumnsDescription, String> StorageS3::getTableStructureAndFormatFromData(
+    const StorageS3::Configuration & configuration,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & ctx)
+{
+    return getTableStructureAndFormatFromDataImpl(std::nullopt, configuration, format_settings, ctx);
 }
 
 namespace
@@ -1635,24 +1652,43 @@ namespace
             std::shared_ptr<StorageS3Source::IIterator> file_iterator_,
             const StorageS3Source::KeysWithInfo & read_keys_,
             const StorageS3::Configuration & configuration_,
+            std::optional<String> format_,
             const std::optional<FormatSettings> & format_settings_,
             const ContextPtr & context_)
             : WithContext(context_)
             , file_iterator(file_iterator_)
             , read_keys(read_keys_)
             , configuration(configuration_)
+            , format(std::move(format_))
             , format_settings(format_settings_)
             , prev_read_keys_size(read_keys_.size())
         {
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
-            /// For default mode check cached columns for currently read keys on first iteration.
-            if (first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+            if (first)
             {
-                if (auto cached_columns = tryGetColumnsFromCache(read_keys.begin(), read_keys.end()))
-                    return {nullptr, cached_columns};
+                /// If format is unknown we iterate through all currently read keys on first iteration and
+                /// try to determine format by file name.
+                if (!format)
+                {
+                    for (const auto & key_with_info : read_keys)
+                    {
+                        if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(key_with_info->key))
+                        {
+                            format = format_from_file_name;
+                            break;
+                        }
+                    }
+                }
+
+                /// For default mode check cached columns for currently read keys on first iteration.
+                if (first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                {
+                    if (auto cached_columns = tryGetColumnsFromCache(read_keys.begin(), read_keys.end()))
+                        return {nullptr, cached_columns, format};
+                }
             }
 
             while (true)
@@ -1662,22 +1698,48 @@ namespace
                 if (!current_key_with_info || current_key_with_info->key.empty())
                 {
                     if (first)
-                        throw Exception(
-                            ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                            "Cannot extract table structure from {} format file, because there are no files with provided path "
-                            "in S3 or all files are empty. You must specify table structure manually",
-                            configuration.format);
+                    {
+                        if (format)
+                            throw Exception(
+                                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                                "The table structure cannot be extracted from a {} format file, because there are no files with provided path "
+                                "in S3 or all files are empty. You can specify table structure manually",
+                                *format);
 
-                    return {nullptr, std::nullopt};
+                        throw Exception(
+                            ErrorCodes::CANNOT_DETECT_FORMAT,
+                            "The data format cannot be detected by the contents of the files, because there are no files with provided path "
+                            "in S3 or all files are empty. You can specify the format manually");
+                    }
+
+                    return {nullptr, std::nullopt, format};
                 }
 
-                /// S3 file iterator could get new keys after new iteration, check them in schema cache if schema inference mode is default.
-                if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT && read_keys.size() > prev_read_keys_size)
+                /// S3 file iterator could get new keys after new iteration
+                if (read_keys.size() > prev_read_keys_size)
                 {
-                    auto columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end());
+                    /// If format is unknown we can try to determine it by new file names.
+                    if (!format)
+                    {
+                        for (auto it = read_keys.begin() + prev_read_keys_size; it != read_keys.end(); ++it)
+                        {
+                            if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName((*it)->key))
+                            {
+                                format = format_from_file_name;
+                                break;
+                            }
+                        }
+                    }
+
+                    /// Check new files in schema cache if schema inference mode is default.
+                    if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                    {
+                        auto columns_from_cache = tryGetColumnsFromCache(read_keys.begin() + prev_read_keys_size, read_keys.end());
+                        if (columns_from_cache)
+                            return {nullptr, columns_from_cache, format};
+                    }
+
                     prev_read_keys_size = read_keys.size();
-                    if (columns_from_cache)
-                        return {nullptr, columns_from_cache};
                 }
 
                 if (getContext()->getSettingsRef().s3_skip_empty_files && current_key_with_info->info && current_key_with_info->info->size == 0)
@@ -1690,7 +1752,7 @@ namespace
                     if (auto columns_from_cache = tryGetColumnsFromCache(keys.begin(), keys.end()))
                     {
                         first = false;
-                        return {nullptr, columns_from_cache};
+                        return {nullptr, columns_from_cache, format};
                     }
                 }
 
@@ -1699,7 +1761,7 @@ namespace
                 if (!getContext()->getSettingsRef().s3_skip_empty_files || !impl->eof())
                 {
                     first = false;
-                    return {wrapReadBufferWithCompressionMethod(std::move(impl), chooseCompressionMethod(current_key_with_info->key, configuration.compression_method), zstd_window_log_max), std::nullopt};
+                    return {wrapReadBufferWithCompressionMethod(std::move(impl), chooseCompressionMethod(current_key_with_info->key, configuration.compression_method), zstd_window_log_max), std::nullopt, format};
                 }
             }
         }
@@ -1710,7 +1772,7 @@ namespace
                 return;
 
             String source = fs::path(configuration.url.uri.getHost() + std::to_string(configuration.url.uri.getPort())) / configuration.url.bucket / current_key_with_info->key;
-            auto key = getKeyForSchemaCache(source, configuration.format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(source, *format, format_settings, getContext());
             StorageS3::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -1721,7 +1783,7 @@ namespace
                 return;
 
             String source = fs::path(configuration.url.uri.getHost() + std::to_string(configuration.url.uri.getPort())) / configuration.url.bucket / current_key_with_info->key;
-            auto cache_key = getKeyForSchemaCache(source, configuration.format, format_settings, getContext());
+            auto cache_key = getKeyForSchemaCache(source, *format, format_settings, getContext());
             StorageS3::getSchemaCache(getContext()).addColumns(cache_key, columns);
         }
 
@@ -1735,10 +1797,15 @@ namespace
             Strings sources;
             sources.reserve(read_keys.size());
             std::transform(read_keys.begin(), read_keys.end(), std::back_inserter(sources), [&](const auto & elem){ return host_and_bucket / elem->key; });
-            auto cache_keys = getKeysForSchemaCache(sources, configuration.format, format_settings, getContext());
+            auto cache_keys = getKeysForSchemaCache(sources, *format, format_settings, getContext());
             StorageS3::getSchemaCache(getContext()).addManyColumns(cache_keys, columns);
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
         String getLastFileName() const override
         {
             if (current_key_with_info)
@@ -1746,15 +1813,26 @@ namespace
             return "";
         }
 
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            chassert(current_key_with_info);
+            int zstd_window_log_max = static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max);
+            auto impl = std::make_unique<ReadBufferFromS3>(configuration.client, configuration.url.bucket, current_key_with_info->key, configuration.url.version_id, configuration.request_settings, getContext()->getReadSettings());
+            return wrapReadBufferWithCompressionMethod(std::move(impl), chooseCompressionMethod(current_key_with_info->key, configuration.compression_method), zstd_window_log_max);
+        }
+
     private:
         std::optional<ColumnsDescription> tryGetColumnsFromCache(
             const StorageS3::KeysWithInfo::const_iterator & begin,
             const StorageS3::KeysWithInfo::const_iterator & end)
         {
-            if (!getContext()->getSettingsRef().schema_inference_use_cache_for_s3)
+            auto context = getContext();
+            if (!context->getSettingsRef().schema_inference_use_cache_for_s3)
                 return std::nullopt;
 
-            auto & schema_cache = StorageS3::getSchemaCache(getContext());
+            auto & schema_cache = StorageS3::getSchemaCache(context);
             for (auto it = begin; it < end; ++it)
             {
                 auto get_last_mod_time = [&]
@@ -1785,10 +1863,29 @@ namespace
 
                 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, getContext());
-                auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-                if (columns)
-                    return columns;
+
+                if (format)
+                {
+                    auto cache_key = getKeyForSchemaCache(source, *format, format_settings, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        return columns;
+                }
+                else
+                {
+                    /// If format is unknown, we can iterate through all possible input formats
+                    /// and check if we have an entry with this format and this file in schema cache.
+                    /// If we have such entry for some format, we can use this format to read the file.
+                    for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                    {
+                        auto cache_key = getKeyForSchemaCache(source, format_name, format_settings, context);
+                        if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        {
+                            /// Now format is known. It should be the same for all files.
+                            format = format_name;
+                            return columns;
+                        }
+                    }
+                }
             }
 
             return std::nullopt;
@@ -1797,6 +1894,7 @@ namespace
         std::shared_ptr<StorageS3Source::IIterator> file_iterator;
         const StorageS3Source::KeysWithInfo & read_keys;
         const StorageS3::Configuration & configuration;
+        std::optional<String> format;
         const std::optional<FormatSettings> & format_settings;
         StorageS3Source::KeyWithInfoPtr current_key_with_info;
         size_t prev_read_keys_size;
@@ -1805,17 +1903,20 @@ namespace
 
 }
 
-ColumnsDescription StorageS3::getTableStructureFromDataImpl(
+std::pair<ColumnsDescription, String> StorageS3::getTableStructureAndFormatFromDataImpl(
+    std::optional<String> format,
     const Configuration & configuration,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr ctx)
+    const ContextPtr & ctx)
 {
     KeysWithInfo read_keys;
 
     auto file_iterator = createFileIterator(configuration, false, ctx, {}, {}, &read_keys);
 
-    ReadBufferIterator read_buffer_iterator(file_iterator, read_keys, configuration, format_settings, ctx);
-    return readSchemaFromFormat(configuration.format, format_settings, read_buffer_iterator, configuration.withGlobs(), ctx);
+    ReadBufferIterator read_buffer_iterator(file_iterator, read_keys, configuration, format, format_settings, ctx);
+    if (format)
+        return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, ctx), *format};
+    return detectFormatAndReadSchema(format_settings, read_buffer_iterator, ctx);
 }
 
 void registerStorageS3Impl(const String & name, StorageFactory & factory)
@@ -1891,16 +1992,6 @@ void registerStorageOSS(StorageFactory & factory)
     return registerStorageS3Impl("OSS", factory);
 }
 
-NamesAndTypesList StorageS3::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-Names StorageS3::getVirtualColumnNames()
-{
-    return VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage({}).getNames();
-}
-
 bool StorageS3::supportsPartitionBy() const
 {
     return true;
diff --git a/src/Storages/StorageS3.h b/src/Storages/StorageS3.h
index b90a0d394cb..19cbfaa6f08 100644
--- a/src/Storages/StorageS3.h
+++ b/src/Storages/StorageS3.h
@@ -4,32 +4,28 @@
 
 #if USE_AWS_S3
 
-#include <Core/Types.h>
-
 #include <Compression/CompressionInfo.h>
-
-#include <Storages/IStorage.h>
-#include <Storages/StorageS3Settings.h>
-
-#include <Processors/SourceWithKeyCondition.h>
-#include <Processors/Executors/PullingPipelineExecutor.h>
-#include <Processors/Formats/IInputFormat.h>
-#include <Poco/URI.h>
-#include <IO/S3/getObjectInfo.h>
+#include <Core/Types.h>
 #include <IO/CompressionMethod.h>
+#include <IO/S3/BlobStorageLogWriter.h>
+#include <IO/S3/getObjectInfo.h>
 #include <IO/SeekableReadBuffer.h>
 #include <Interpreters/Context.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Processors/Executors/PullingPipelineExecutor.h>
+#include <Processors/Formats/IInputFormat.h>
+#include <Processors/SourceWithKeyCondition.h>
 #include <Storages/Cache/SchemaCache.h>
+#include <Storages/IStorage.h>
 #include <Storages/SelectQueryInfo.h>
 #include <Storages/StorageConfiguration.h>
+#include <Storages/StorageS3Settings.h>
 #include <Storages/prepareReadingFromFormat.h>
-#include <IO/S3/BlobStorageLogWriter.h>
+#include <Poco/URI.h>
+#include <Common/threadPoolCallbackRunner.h>
 
-namespace Aws::S3
-{
-    class Client;
-}
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -61,7 +57,7 @@ public:
     {
     public:
         virtual ~IIterator() = default;
-        virtual KeyWithInfoPtr next() = 0;
+        virtual KeyWithInfoPtr next(size_t idx = 0) = 0; /// NOLINT
 
         /// Estimates how many streams we need to process all files.
         /// If keys count >= max_threads_count, the returned number may not represent the actual number of the keys.
@@ -80,12 +76,12 @@ public:
             const S3::URI & globbed_uri_,
             const ActionsDAG::Node * predicate,
             const NamesAndTypesList & virtual_columns,
-            ContextPtr context,
+            const ContextPtr & context,
             KeysWithInfo * read_keys_ = nullptr,
             const S3Settings::RequestSettings & request_settings_ = {},
             std::function<void(FileProgress)> progress_callback_ = {});
 
-        KeyWithInfoPtr next() override;
+        KeyWithInfoPtr next(size_t idx = 0) override; /// NOLINT
         size_t estimatedKeysCount() override;
 
     private:
@@ -106,7 +102,7 @@ public:
             KeysWithInfo * read_keys = nullptr,
             std::function<void(FileProgress)> progress_callback_ = {});
 
-        KeyWithInfoPtr next() override;
+        KeyWithInfoPtr next(size_t idx = 0) override; /// NOLINT
         size_t estimatedKeysCount() override;
 
     private:
@@ -120,7 +116,7 @@ public:
     public:
         explicit ReadTaskIterator(const ReadTaskCallback & callback_, size_t max_threads_count);
 
-        KeyWithInfoPtr next() override;
+        KeyWithInfoPtr next(size_t idx = 0) override; /// NOLINT
         size_t estimatedKeysCount() override;
 
     private:
@@ -134,7 +130,7 @@ public:
         const ReadFromFormatInfo & info,
         const String & format,
         String name_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         std::optional<FormatSettings> format_settings_,
         UInt64 max_block_size_,
         const S3Settings::RequestSettings & request_settings_,
@@ -151,9 +147,9 @@ public:
 
     String getName() const override;
 
-    void setKeyCondition(const ActionsDAG::NodeRawConstPtrs & nodes, ContextPtr context_) override
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override
     {
-        setKeyConditionImpl(nodes, context_, sample_block);
+        setKeyConditionImpl(filter_actions_dag, context_, sample_block);
     }
 
     Chunk generate() override;
@@ -242,7 +238,7 @@ private:
     size_t max_parsing_threads = 1;
     bool need_only_count;
 
-    Poco::Logger * log = &Poco::Logger::get("StorageS3Source");
+    LoggerPtr log = getLogger("StorageS3Source");
 
     ThreadPool create_reader_pool;
     ThreadPoolCallbackRunner<ReaderHolder> create_reader_scheduler;
@@ -253,11 +249,11 @@ private:
 
     /// Notice: we should initialize reader and future_reader lazily in generate to make sure key_condition
     /// is set before createReader is invoked for key_condition is read in createReader.
-    void lazyInitialize();
+    void lazyInitialize(size_t idx = 0);
 
     /// Recreate ReadBuffer and Pipeline for each file.
-    ReaderHolder createReader();
-    std::future<ReaderHolder> createReaderAsync();
+    ReaderHolder createReader(size_t idx = 0);
+    std::future<ReaderHolder> createReaderAsync(size_t idx = 0);
 
     std::unique_ptr<ReadBuffer> createS3ReadBuffer(const String & key, size_t object_size);
     std::unique_ptr<ReadBuffer> createAsyncS3ReadBuffer(const String & key, const ReadSettings & read_settings, size_t object_size);
@@ -280,9 +276,9 @@ public:
 
         String getPath() const { return url.key; }
 
-        bool update(ContextPtr context);
+        bool update(const ContextPtr & context);
 
-        void connect(ContextPtr context);
+        void connect(const ContextPtr & context);
 
         bool withGlobs() const { return url.key.find_first_of("*?{") != std::string::npos; }
 
@@ -308,7 +304,7 @@ public:
 
     StorageS3(
         const Configuration & configuration_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
@@ -336,30 +332,32 @@ public:
 
     void truncate(const ASTPtr & query, const StorageMetadataPtr & metadata_snapshot, ContextPtr local_context, TableExclusiveLockHolder &) override;
 
-    NamesAndTypesList getVirtuals() const override;
-    static Names getVirtualColumnNames();
-
     bool supportsPartitionBy() const override;
 
     static void processNamedCollectionResult(StorageS3::Configuration & configuration, const NamedCollection & collection);
 
     static SchemaCache & getSchemaCache(const ContextPtr & ctx);
 
-    static StorageS3::Configuration getConfiguration(ASTs & engine_args, ContextPtr local_context, bool get_format_from_file = true);
+    static StorageS3::Configuration getConfiguration(ASTs & engine_args, const ContextPtr & local_context, bool get_format_from_file = true);
 
     static ColumnsDescription getTableStructureFromData(
         const StorageS3::Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx);
+        const ContextPtr & ctx);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromData(
+        const StorageS3::Configuration & configuration,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & ctx);
 
     using KeysWithInfo = StorageS3Source::KeysWithInfo;
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 protected:
-    virtual Configuration updateConfigurationAndGetCopy(ContextPtr local_context);
+    virtual Configuration updateConfigurationAndGetCopy(const ContextPtr & local_context);
 
-    virtual void updateConfiguration(ContextPtr local_context);
+    virtual void updateConfiguration(const ContextPtr & local_context);
 
     void useConfiguration(const Configuration & new_configuration);
 
@@ -373,17 +371,17 @@ private:
 
     Configuration configuration;
     std::mutex configuration_update_mutex;
-    NamesAndTypesList virtual_columns;
 
     String name;
     const bool distributed_processing;
     std::optional<FormatSettings> format_settings;
     ASTPtr partition_by;
 
-    static ColumnsDescription getTableStructureFromDataImpl(
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromDataImpl(
+        std::optional<String> format,
         const Configuration & configuration,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr ctx);
+        const ContextPtr & ctx);
 
     bool supportsSubcolumns() const override { return true; }
 
diff --git a/src/Storages/StorageS3Cluster.cpp b/src/Storages/StorageS3Cluster.cpp
index e1738056e9d..6b22771b38f 100644
--- a/src/Storages/StorageS3Cluster.cpp
+++ b/src/Storages/StorageS3Cluster.cpp
@@ -1,7 +1,5 @@
 #include "Storages/StorageS3Cluster.h"
 
-#include "config.h"
-
 #if USE_AWS_S3
 
 #include <DataTypes/DataTypeString.h>
@@ -38,39 +36,51 @@ StorageS3Cluster::StorageS3Cluster(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    ContextPtr context_,
-    bool structure_argument_was_provided_)
-    : IStorageCluster(cluster_name_, table_id_, &Poco::Logger::get("StorageS3Cluster (" + table_id_.table_name + ")"), structure_argument_was_provided_)
+    const ContextPtr & context)
+    : IStorageCluster(cluster_name_, table_id_, getLogger("StorageS3Cluster (" + table_id_.table_name + ")"))
     , s3_configuration{configuration_}
 {
-    context_->getGlobalContext()->getRemoteHostFilter().checkURL(configuration_.url.uri);
-    context_->getGlobalContext()->getHTTPHeaderFilter().checkHeaders(configuration_.headers_from_ast);
+    context->getGlobalContext()->getRemoteHostFilter().checkURL(configuration_.url.uri);
+    context->getGlobalContext()->getHTTPHeaderFilter().checkHeaders(configuration_.headers_from_ast);
 
     StorageInMemoryMetadata storage_metadata;
-    updateConfigurationIfChanged(context_);
+    updateConfigurationIfChanged(context);
 
     if (columns_.empty())
     {
+        ColumnsDescription columns;
         /// `format_settings` is set to std::nullopt, because StorageS3Cluster is used only as table function
-        auto columns = StorageS3::getTableStructureFromDataImpl(s3_configuration, /*format_settings=*/std::nullopt, context_);
+        if (s3_configuration.format == "auto")
+            std::tie(columns, s3_configuration.format) = StorageS3::getTableStructureAndFormatFromData(s3_configuration, /*format_settings=*/std::nullopt, context);
+        else
+            columns = StorageS3::getTableStructureFromData(s3_configuration, /*format_settings=*/std::nullopt, context);
+
         storage_metadata.setColumns(columns);
     }
     else
+    {
+        if (s3_configuration.format == "auto")
+            s3_configuration.format = StorageS3::getTableStructureAndFormatFromData(s3_configuration, /*format_settings=*/std::nullopt, context).second;
+
         storage_metadata.setColumns(columns_);
+    }
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
-void StorageS3Cluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+void StorageS3Cluster::updateQueryToSendIfNeeded(DB::ASTPtr & query, const DB::StorageSnapshotPtr & storage_snapshot, const DB::ContextPtr & context)
 {
     ASTExpressionList * expression_list = extractTableFunctionArgumentsFromSelectQuery(query);
     if (!expression_list)
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected SELECT query from table function s3Cluster, got '{}'", queryToString(query));
 
-    TableFunctionS3Cluster::addColumnsStructureToArguments(expression_list->children, structure, context);
+    TableFunctionS3Cluster::updateStructureAndFormatArgumentsIfNeeded(
+        expression_list->children,
+        storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(),
+        s3_configuration.format,
+        context);
 }
 
 void StorageS3Cluster::updateConfigurationIfChanged(ContextPtr local_context)
@@ -81,7 +91,7 @@ void StorageS3Cluster::updateConfigurationIfChanged(ContextPtr local_context)
 RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const
 {
     auto iterator = std::make_shared<StorageS3Source::DisclosedGlobIterator>(
-        *s3_configuration.client, s3_configuration.url, predicate, virtual_columns, context, nullptr, s3_configuration.request_settings, context->getFileProgressCallback());
+        *s3_configuration.client, s3_configuration.url, predicate, getVirtualsList(), context, nullptr, s3_configuration.request_settings, context->getFileProgressCallback());
 
     auto callback = std::make_shared<std::function<String()>>([iterator]() mutable -> String
     {
@@ -92,12 +102,6 @@ RemoteQueryExecutor::Extension StorageS3Cluster::getTaskIteratorExtension(const
     return RemoteQueryExecutor::Extension{ .task_iterator = std::move(callback) };
 }
 
-NamesAndTypesList StorageS3Cluster::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-
 }
 
 #endif
diff --git a/src/Storages/StorageS3Cluster.h b/src/Storages/StorageS3Cluster.h
index c526f14834a..802fd3f9139 100644
--- a/src/Storages/StorageS3Cluster.h
+++ b/src/Storages/StorageS3Cluster.h
@@ -4,10 +4,7 @@
 
 #if USE_AWS_S3
 
-#include <memory>
-#include <optional>
-
-#include "Client/Connection.h"
+#include <Client/Connection.h>
 #include <Interpreters/Cluster.h>
 #include <IO/S3Common.h>
 #include <Storages/IStorageCluster.h>
@@ -27,18 +24,15 @@ public:
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        ContextPtr context_,
-        bool structure_argument_was_provided_);
+        const ContextPtr & context_);
 
     std::string getName() const override { return "S3Cluster"; }
 
-    NamesAndTypesList getVirtuals() const override;
-
     RemoteQueryExecutor::Extension getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
     bool supportsSubcolumns() const override { return true; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 protected:
     void updateConfigurationIfChanged(ContextPtr local_context);
@@ -46,10 +40,9 @@ protected:
 private:
     void updateBeforeRead(const ContextPtr & context) override { updateConfigurationIfChanged(context); }
 
-    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+    void updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context) override;
 
     StorageS3::Configuration s3_configuration;
-    NamesAndTypesList virtual_columns;
 };
 
 
diff --git a/src/Storages/StorageS3Settings.cpp b/src/Storages/StorageS3Settings.cpp
index b0c1160429a..04634bcf1b3 100644
--- a/src/Storages/StorageS3Settings.cpp
+++ b/src/Storages/StorageS3Settings.cpp
@@ -8,7 +8,6 @@
 #include <Common/Throttler.h>
 #include <Common/formatReadable.h>
 #include <Interpreters/Context.h>
-#include <boost/algorithm/string/predicate.hpp>
 
 
 namespace DB
@@ -293,7 +292,7 @@ void StorageS3Settings::loadFromConfig(const String & config_elem, const Poco::U
     }
 }
 
-S3Settings StorageS3Settings::getSettings(const String & endpoint) const
+S3Settings StorageS3Settings::getSettings(const String & endpoint, const String & user, bool ignore_user) const
 {
     std::lock_guard lock(mutex);
     auto next_prefix_setting = s3_settings.upper_bound(endpoint);
@@ -302,7 +301,8 @@ S3Settings StorageS3Settings::getSettings(const String & endpoint) const
     for (auto possible_prefix_setting = next_prefix_setting; possible_prefix_setting != s3_settings.begin();)
     {
         std::advance(possible_prefix_setting, -1);
-        if (boost::algorithm::starts_with(endpoint, possible_prefix_setting->first))
+        const auto & [endpoint_prefix, settings] = *possible_prefix_setting;
+        if (endpoint.starts_with(endpoint_prefix) && (ignore_user || settings.auth_settings.canBeUsedByUser(user)))
             return possible_prefix_setting->second;
     }
 
diff --git a/src/Storages/StorageS3Settings.h b/src/Storages/StorageS3Settings.h
index 0e152bb2d31..0f972db02b1 100644
--- a/src/Storages/StorageS3Settings.h
+++ b/src/Storages/StorageS3Settings.h
@@ -112,7 +112,7 @@ class StorageS3Settings
 public:
     void loadFromConfig(const String & config_elem, const Poco::Util::AbstractConfiguration & config, const Settings & settings);
 
-    S3Settings getSettings(const String & endpoint) const;
+    S3Settings getSettings(const String & endpoint, const String & user, bool ignore_user = false) const;
 
 private:
     mutable std::mutex mutex;
diff --git a/src/Storages/StorageSQLite.cpp b/src/Storages/StorageSQLite.cpp
index d5db5763da9..179e4cee199 100644
--- a/src/Storages/StorageSQLite.cpp
+++ b/src/Storages/StorageSQLite.cpp
@@ -19,6 +19,20 @@
 #include <QueryPipeline/Pipe.h>
 #include <Common/filesystemHelpers.h>
 
+namespace
+{
+
+using namespace DB;
+
+ContextPtr makeSQLiteWriteContext(ContextPtr context)
+{
+    auto write_context = Context::createCopy(context);
+    write_context->setSetting("output_format_values_escape_quote_with_quote", Field(true));
+    return write_context;
+}
+
+}
+
 
 namespace DB
 {
@@ -42,7 +56,8 @@ StorageSQLite::StorageSQLite(
     , remote_table_name(remote_table_name_)
     , database_path(database_path_)
     , sqlite_db(sqlite_db_)
-    , log(&Poco::Logger::get("StorageSQLite (" + table_id_.table_name + ")"))
+    , log(getLogger("StorageSQLite (" + table_id_.table_name + ")"))
+    , write_context(makeSQLiteWriteContext(getContext()))
 {
     StorageInMemoryMetadata storage_metadata;
 
@@ -144,7 +159,7 @@ public:
 
         sqlbuf << ") VALUES ";
 
-        auto writer = FormatFactory::instance().getOutputFormat("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.getContext());
+        auto writer = FormatFactory::instance().getOutputFormat("Values", sqlbuf, metadata_snapshot->getSampleBlock(), storage.write_context);
         writer->write(block);
 
         sqlbuf << ";";
@@ -193,7 +208,7 @@ void registerStorageSQLite(StorageFactory & factory)
         const auto database_path = checkAndGetLiteralArgument<String>(engine_args[0], "database_path");
         const auto table_name = checkAndGetLiteralArgument<String>(engine_args[1], "table_name");
 
-        auto sqlite_db = openSQLiteDB(database_path, args.getContext(), /* throw_on_error */!args.attach);
+        auto sqlite_db = openSQLiteDB(database_path, args.getContext(), /* throw_on_error */ args.mode <= LoadingStrictnessLevel::CREATE);
 
         return std::make_shared<StorageSQLite>(args.table_id, sqlite_db, database_path,
                                      table_name, args.columns, args.constraints, args.getContext());
diff --git a/src/Storages/StorageSQLite.h b/src/Storages/StorageSQLite.h
index 9da040cbd5c..ed673123fe0 100644
--- a/src/Storages/StorageSQLite.h
+++ b/src/Storages/StorageSQLite.h
@@ -47,10 +47,13 @@ public:
         const String & table);
 
 private:
+    friend class SQLiteSink; /// for write_context
+
     String remote_table_name;
     String database_path;
     SQLitePtr sqlite_db;
-    Poco::Logger * log;
+    LoggerPtr log;
+    ContextPtr write_context;
 };
 
 }
diff --git a/src/Storages/StorageSet.cpp b/src/Storages/StorageSet.cpp
index 1b0db1da800..54218351cf1 100644
--- a/src/Storages/StorageSet.cpp
+++ b/src/Storages/StorageSet.cpp
@@ -218,7 +218,7 @@ void StorageSet::truncate(const ASTPtr &, const StorageMetadataPtr & metadata_sn
     if (disk->exists(path))
         disk->removeRecursive(path);
     else
-        LOG_INFO(&Poco::Logger::get("StorageSet"), "Path {} is already removed from disk {}", path, disk->getName());
+        LOG_INFO(getLogger("StorageSet"), "Path {} is already removed from disk {}", path, disk->getName());
 
     disk->createDirectories(path);
     disk->createDirectories(fs::path(path) / "tmp/");
@@ -247,6 +247,8 @@ void StorageSetOrJoinBase::restore()
     static const char * file_suffix = ".bin";
     static const auto file_suffix_size = strlen(".bin");
 
+    using FilePriority = std::pair<UInt64, String>;
+    std::priority_queue<FilePriority, std::vector<FilePriority>, std::greater<>> backup_files;
     for (auto dir_it{disk->iterateDirectory(path)}; dir_it->isValid(); dir_it->next())
     {
         const auto & name = dir_it->name();
@@ -261,9 +263,18 @@ void StorageSetOrJoinBase::restore()
             if (file_num > increment)
                 increment = file_num;
 
-            restoreFromFile(dir_it->path());
+            backup_files.push({file_num, file_path});
         }
     }
+
+    /// Restore in the same order as blocks were written
+    /// It may be important for storage Join, user expect to get the first row (unless `join_any_take_last_row` setting is set)
+    /// but after restart we may have different order of blocks in memory.
+    while (!backup_files.empty())
+    {
+        restoreFromFile(backup_files.top().second);
+        backup_files.pop();
+    }
 }
 
 
@@ -284,7 +295,7 @@ void StorageSetOrJoinBase::restoreFromFile(const String & file_path)
     finishInsert();
 
     /// TODO Add speed, compressed bytes, data volume in memory, compression ratio ... Generalize all statistics logging in project.
-    LOG_INFO(&Poco::Logger::get("StorageSetOrJoinBase"), "Loaded from backup file {}. {} rows, {}. State has {} unique rows.",
+    LOG_INFO(getLogger("StorageSetOrJoinBase"), "Loaded from backup file {}. {} rows, {}. State has {} unique rows.",
         file_path, info.rows, ReadableSize(info.bytes), getSize(ctx));
 }
 
diff --git a/src/Storages/StorageSnapshot.cpp b/src/Storages/StorageSnapshot.cpp
index 34c092c7208..8b087a4a2bc 100644
--- a/src/Storages/StorageSnapshot.cpp
+++ b/src/Storages/StorageSnapshot.cpp
@@ -1,6 +1,4 @@
 #include <Storages/StorageSnapshot.h>
-#include <Storages/LightweightDeleteDescription.h>
-#include <Storages/BlockNumberColumn.h>
 #include <Storages/IStorage.h>
 #include <DataTypes/ObjectUtils.h>
 #include <DataTypes/NestedUtils.h>
@@ -18,6 +16,49 @@ namespace ErrorCodes
     extern const int COLUMN_QUERIED_MORE_THAN_ONCE;
 }
 
+StorageSnapshot::StorageSnapshot(
+    const IStorage & storage_,
+    StorageMetadataPtr metadata_)
+    : storage(storage_)
+    , metadata(std::move(metadata_))
+    , virtual_columns(storage_.getVirtualsPtr())
+{
+}
+
+StorageSnapshot::StorageSnapshot(
+    const IStorage & storage_,
+    StorageMetadataPtr metadata_,
+    VirtualsDescriptionPtr virtual_columns_)
+    : storage(storage_)
+    , metadata(std::move(metadata_))
+    , virtual_columns(std::move(virtual_columns_))
+{
+}
+
+StorageSnapshot::StorageSnapshot(
+    const IStorage & storage_,
+    StorageMetadataPtr metadata_,
+    ColumnsDescription object_columns_)
+    : storage(storage_)
+    , metadata(std::move(metadata_))
+    , virtual_columns(storage_.getVirtualsPtr())
+    , object_columns(std::move(object_columns_))
+{
+}
+
+StorageSnapshot::StorageSnapshot(
+    const IStorage & storage_,
+    StorageMetadataPtr metadata_,
+    ColumnsDescription object_columns_,
+    DataPtr data_)
+    : storage(storage_)
+    , metadata(std::move(metadata_))
+    , virtual_columns(storage_.getVirtualsPtr())
+    , object_columns(std::move(object_columns_))
+    , data(std::move(data_))
+{
+}
+
 std::shared_ptr<StorageSnapshot> StorageSnapshot::clone(DataPtr data_) const
 {
     auto res = std::make_shared<StorageSnapshot>(storage, metadata, object_columns);
@@ -28,15 +69,12 @@ std::shared_ptr<StorageSnapshot> StorageSnapshot::clone(DataPtr data_) const
     return res;
 }
 
-void StorageSnapshot::init()
+ColumnsDescription StorageSnapshot::getAllColumnsDescription() const
 {
-    for (const auto & [name, type] : storage.getVirtuals())
-        virtual_columns[name] = type;
+    auto get_column_options = GetColumnsOptions(GetColumnsOptions::All).withExtendedObjects().withVirtuals();
+    auto column_names_and_types = getColumns(get_column_options);
 
-    if (storage.hasLightweightDeletedMask())
-        system_columns[LightweightDeleteDescription::FILTER_COLUMN.name] = LightweightDeleteDescription::FILTER_COLUMN.type;
-
-    system_columns[BlockNumberColumn::name] = BlockNumberColumn::type;
+    return ColumnsDescription{column_names_and_types};
 }
 
 NamesAndTypesList StorageSnapshot::getColumns(const GetColumnsOptions & options) const
@@ -46,35 +84,22 @@ NamesAndTypesList StorageSnapshot::getColumns(const GetColumnsOptions & options)
     if (options.with_extended_objects)
         extendObjectColumns(all_columns, object_columns, options.with_subcolumns);
 
-    NameSet column_names;
-    if (options.with_virtuals)
+    if (options.virtuals_kind != VirtualsKind::None && !virtual_columns->empty())
     {
-        /// Virtual columns must be appended after ordinary,
-        /// because user can override them.
-        if (!virtual_columns.empty())
+        NameSet column_names;
+        for (const auto & column : all_columns)
+            column_names.insert(column.name);
+
+        auto virtuals_list = virtual_columns->getNamesAndTypesList(options.virtuals_kind);
+        for (const auto & column : virtuals_list)
         {
-            for (const auto & column : all_columns)
-                column_names.insert(column.name);
+            if (column_names.contains(column.name))
+                continue;
 
-            for (const auto & [name, type] : virtual_columns)
-                if (!column_names.contains(name))
-                    all_columns.emplace_back(name, type);
+            all_columns.emplace_back(column.name, column.type);
         }
     }
 
-    if (options.with_system_columns)
-    {
-        if (!system_columns.empty() && column_names.empty())
-        {
-            for (const auto & column : all_columns)
-                column_names.insert(column.name);
-        }
-
-        for (const auto & [name, type] : system_columns)
-            if (!column_names.contains(name))
-                all_columns.emplace_back(name, type);
-    }
-
     return all_columns;
 }
 
@@ -100,18 +125,11 @@ std::optional<NameAndTypePair> StorageSnapshot::tryGetColumn(const GetColumnsOpt
             return object_column;
     }
 
-    if (options.with_virtuals)
+    if (options.virtuals_kind != VirtualsKind::None)
     {
-        auto it = virtual_columns.find(column_name);
-        if (it != virtual_columns.end())
-            return NameAndTypePair(column_name, it->second);
-    }
-
-    if (options.with_system_columns)
-    {
-        auto it = system_columns.find(column_name);
-        if (it != system_columns.end())
-            return NameAndTypePair(column_name, it->second);
+        auto virtual_column = virtual_columns->tryGet(column_name, options.virtuals_kind);
+        if (virtual_column)
+            return NameAndTypePair{virtual_column->name, virtual_column->type};
     }
 
     return {};
@@ -126,6 +144,47 @@ NameAndTypePair StorageSnapshot::getColumn(const GetColumnsOptions & options, co
     return *column;
 }
 
+CompressionCodecPtr StorageSnapshot::getCodecOrDefault(const String & column_name, CompressionCodecPtr default_codec) const
+{
+    auto get_codec_or_default = [&](const auto & column_desc)
+    {
+        return column_desc.codec
+            ? CompressionCodecFactory::instance().get(column_desc.codec, column_desc.type, default_codec)
+            : default_codec;
+    };
+
+    const auto & columns = metadata->getColumns();
+    if (const auto * column_desc = columns.tryGet(column_name))
+        return get_codec_or_default(*column_desc);
+
+    if (const auto * virtual_desc = virtual_columns->tryGetDescription(column_name))
+        return get_codec_or_default(*virtual_desc);
+
+    return default_codec;
+}
+
+CompressionCodecPtr StorageSnapshot::getCodecOrDefault(const String & column_name) const
+{
+    return getCodecOrDefault(column_name, CompressionCodecFactory::instance().getDefaultCodec());
+}
+
+ASTPtr StorageSnapshot::getCodecDescOrDefault(const String & column_name, CompressionCodecPtr default_codec) const
+{
+    auto get_codec_or_default = [&](const auto & column_desc)
+    {
+        return column_desc.codec ? column_desc.codec : default_codec->getFullCodecDesc();
+    };
+
+    const auto & columns = metadata->getColumns();
+    if (const auto * column_desc = columns.tryGet(column_name))
+        return get_codec_or_default(*column_desc);
+
+    if (const auto * virtual_desc = virtual_columns->tryGetDescription(column_name))
+        return get_codec_or_default(*virtual_desc);
+
+    return default_codec->getFullCodecDesc();
+}
+
 Block StorageSnapshot::getSampleBlockForColumns(const Names & column_names) const
 {
     Block res;
@@ -143,11 +202,11 @@ Block StorageSnapshot::getSampleBlockForColumns(const Names & column_names) cons
         {
             res.insert({object_column->type->createColumn(), object_column->type, column_name});
         }
-        else if (auto it = virtual_columns.find(column_name); it != virtual_columns.end())
+        else if (auto virtual_column = virtual_columns->tryGet(column_name))
         {
             /// Virtual columns must be appended after ordinary, because user can
             /// override them.
-            const auto & type = it->second;
+            const auto & type = virtual_column->type;
             res.insert({type->createColumn(), type, column_name});
         }
         else
@@ -175,12 +234,11 @@ ColumnsDescription StorageSnapshot::getDescriptionForColumns(const Names & colum
         {
             res.add(*object_column, "", false, false);
         }
-        else if (auto it = virtual_columns.find(name); it != virtual_columns.end())
+        else if (auto virtual_column = virtual_columns->tryGet(name))
         {
             /// Virtual columns must be appended after ordinary, because user can
             /// override them.
-            const auto & type = it->second;
-            res.add({name, type});
+            res.add({name, virtual_column->type});
         }
         else
         {
@@ -216,7 +274,7 @@ void StorageSnapshot::check(const Names & column_names) const
     {
         bool has_column = columns.hasColumnOrSubcolumn(GetColumnsOptions::AllPhysical, name)
             || object_columns.hasColumnOrSubcolumn(GetColumnsOptions::AllPhysical, name)
-            || virtual_columns.contains(name);
+            || virtual_columns->has(name);
 
         if (!has_column)
         {
diff --git a/src/Storages/StorageSnapshot.h b/src/Storages/StorageSnapshot.h
index d62e118e1f2..89e97f2abb8 100644
--- a/src/Storages/StorageSnapshot.h
+++ b/src/Storages/StorageSnapshot.h
@@ -1,10 +1,14 @@
 #pragma once
 #include <Storages/StorageInMemoryMetadata.h>
+#include <Storages/VirtualColumnsDescription.h>
 
 namespace DB
 {
 
 class IStorage;
+class ICompressionCodec;
+
+using CompressionCodecPtr = std::shared_ptr<ICompressionCodec>;
 
 /// Snapshot of storage that fixes set columns that can be read in query.
 /// There are 3 sources of columns: regular columns from metadata,
@@ -13,6 +17,7 @@ struct StorageSnapshot
 {
     const IStorage & storage;
     const StorageMetadataPtr metadata;
+    const VirtualsDescriptionPtr virtual_columns;
     const ColumnsDescription object_columns;
 
     /// Additional data, on which set of columns may depend.
@@ -30,38 +35,29 @@ struct StorageSnapshot
 
     StorageSnapshot(
         const IStorage & storage_,
-        StorageMetadataPtr metadata_)
-        : storage(storage_), metadata(std::move(metadata_))
-    {
-        init();
-    }
+        StorageMetadataPtr metadata_);
 
     StorageSnapshot(
         const IStorage & storage_,
         StorageMetadataPtr metadata_,
-        ColumnsDescription object_columns_)
-        : storage(storage_)
-        , metadata(std::move(metadata_))
-        , object_columns(std::move(object_columns_))
-    {
-        init();
-    }
+        VirtualsDescriptionPtr virtual_columns_);
+
+    StorageSnapshot(
+        const IStorage & storage_,
+        StorageMetadataPtr metadata_,
+        ColumnsDescription object_columns_);
 
     StorageSnapshot(
         const IStorage & storage_,
         StorageMetadataPtr metadata_,
         ColumnsDescription object_columns_,
-        DataPtr data_)
-        : storage(storage_)
-        , metadata(std::move(metadata_))
-        , object_columns(std::move(object_columns_))
-        , data(std::move(data_))
-    {
-        init();
-    }
+        DataPtr data_);
 
     std::shared_ptr<StorageSnapshot> clone(DataPtr data_) const;
 
+    /// Get columns description
+    ColumnsDescription getAllColumnsDescription() const;
+
     /// Get all available columns with types according to options.
     NamesAndTypesList getColumns(const GetColumnsOptions & options) const;
 
@@ -72,6 +68,10 @@ struct StorageSnapshot
     std::optional<NameAndTypePair> tryGetColumn(const GetColumnsOptions & options, const String & column_name) const;
     NameAndTypePair getColumn(const GetColumnsOptions & options, const String & column_name) const;
 
+    CompressionCodecPtr getCodecOrDefault(const String & column_name, CompressionCodecPtr default_codec) const;
+    CompressionCodecPtr getCodecOrDefault(const String & column_name) const;
+    ASTPtr getCodecDescOrDefault(const String & column_name, CompressionCodecPtr default_codec) const;
+
     /// Block with ordinary + materialized + aliases + virtuals + subcolumns.
     Block getSampleBlockForColumns(const Names & column_names) const;
 
@@ -87,15 +87,6 @@ struct StorageSnapshot
 
     /// If we have a projection then we should use its metadata.
     StorageMetadataPtr getMetadataForQuery() const { return projection ? projection->metadata : metadata; }
-
-private:
-    void init();
-
-    std::unordered_map<String, DataTypePtr> virtual_columns;
-
-    /// System columns are not visible in the schema but might be persisted in the data.
-    /// One example of such column is lightweight delete mask '_row_exists'.
-    std::unordered_map<String, DataTypePtr> system_columns;
 };
 
 using StorageSnapshotPtr = std::shared_ptr<StorageSnapshot>;
diff --git a/src/Storages/StorageStripeLog.cpp b/src/Storages/StorageStripeLog.cpp
index 91f6246d101..f47eeb60918 100644
--- a/src/Storages/StorageStripeLog.cpp
+++ b/src/Storages/StorageStripeLog.cpp
@@ -267,7 +267,7 @@ StorageStripeLog::StorageStripeLog(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    bool attach,
+    LoadingStrictnessLevel mode,
     ContextMutablePtr context_)
     : IStorage(table_id_)
     , WithMutableContext(context_)
@@ -277,7 +277,7 @@ StorageStripeLog::StorageStripeLog(
     , index_file_path(table_path + "index.mrk")
     , file_checker(disk, table_path + "sizes.json")
     , max_compress_block_size(context_->getSettings().max_compress_block_size)
-    , log(&Poco::Logger::get("StorageStripeLog"))
+    , log(getLogger("StorageStripeLog"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
@@ -295,7 +295,7 @@ StorageStripeLog::StorageStripeLog(
         file_checker.setEmpty(index_file_path);
     }
 
-    if (!attach)
+    if (mode < LoadingStrictnessLevel::ATTACH)
     {
         /// create directories if they do not exist
         disk->createDirectories(table_path);
@@ -698,7 +698,7 @@ void registerStorageStripeLog(StorageFactory & factory)
             args.columns,
             args.constraints,
             args.comment,
-            args.attach,
+            args.mode,
             args.getContext());
     }, features);
 }
diff --git a/src/Storages/StorageStripeLog.h b/src/Storages/StorageStripeLog.h
index a05117a9ad5..dc2f8d8be4a 100644
--- a/src/Storages/StorageStripeLog.h
+++ b/src/Storages/StorageStripeLog.h
@@ -33,7 +33,7 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        bool attach,
+        LoadingStrictnessLevel mode,
         ContextMutablePtr context_);
 
     ~StorageStripeLog() override;
@@ -123,7 +123,7 @@ private:
 
     mutable std::shared_timed_mutex rwlock;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/StorageURL.cpp b/src/Storages/StorageURL.cpp
index 5041b95ecc8..cc46cc8f8dc 100644
--- a/src/Storages/StorageURL.cpp
+++ b/src/Storages/StorageURL.cpp
@@ -5,7 +5,7 @@
 #include <Storages/VirtualColumnUtils.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTInsertQuery.h>
 #include <Parsers/ASTLiteral.h>
@@ -101,7 +101,7 @@ static ConnectionTimeouts getHTTPTimeouts(ContextPtr context)
 
 IStorageURLBase::IStorageURLBase(
     const String & uri_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     const StorageID & table_id_,
     const String & format_name_,
     const std::optional<FormatSettings> & format_settings_,
@@ -123,16 +123,26 @@ IStorageURLBase::IStorageURLBase(
     , partition_by(partition_by_)
     , distributed_processing(distributed_processing_)
 {
-    FormatFactory::instance().checkFormatName(format_name);
+    if (format_name != "auto")
+        FormatFactory::instance().checkFormatName(format_name);
+
     StorageInMemoryMetadata storage_metadata;
 
     if (columns_.empty())
     {
-        auto columns = getTableStructureFromData(format_name, uri, compression_method, headers, format_settings, context_);
+        ColumnsDescription columns;
+        if (format_name == "auto")
+            std::tie(columns, format_name) = getTableStructureAndFormatFromData(uri, compression_method, headers, format_settings, context_);
+        else
+            columns = getTableStructureFromData(format_name, uri, compression_method, headers, format_settings, context_);
+
         storage_metadata.setColumns(columns);
     }
     else
     {
+        if (format_name == "auto")
+            format_name = getTableStructureAndFormatFromData(uri, compression_method, headers, format_settings, context_).second;
+
         /// We don't allow special columns in URL storage.
         if (!columns_.hasOnlyOrdinary())
             throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table engine URL doesn't support special columns like MATERIALIZED, ALIAS or EPHEMERAL");
@@ -142,8 +152,7 @@ IStorageURLBase::IStorageURLBase(
     storage_metadata.setConstraints(constraints_);
     storage_metadata.setComment(comment);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
 
@@ -257,7 +266,7 @@ StorageURLSource::StorageURLSource(
     const String & format_,
     const std::optional<FormatSettings> & format_settings_,
     String name_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     UInt64 max_block_size,
     const ConnectionTimeouts & timeouts,
     CompressionMethod compression_method,
@@ -378,6 +387,8 @@ StorageURLSource::StorageURLSource(
     };
 }
 
+StorageURLSource::~StorageURLSource() = default;
+
 Chunk StorageURLSource::generate()
 {
     while (true)
@@ -451,22 +462,20 @@ std::pair<Poco::URI, std::unique_ptr<ReadWriteBufferFromHTTP>> StorageURLSource:
 
         try
         {
-            auto res = std::make_unique<ReadWriteBufferFromHTTP>(
-                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,
-                /* file_info */ std::nullopt,
-                proxy_config);
+            auto res = BuilderRWBufferFromHTTP(request_uri)
+                           .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                           .withMethod(http_method)
+                           .withProxy(proxy_config)
+                           .withSettings(read_settings)
+                           .withTimeouts(timeouts)
+                           .withHostFilter(&context_->getRemoteHostFilter())
+                           .withBufSize(settings.max_read_buffer_size)
+                           .withRedirects(settings.max_http_get_redirects)
+                           .withOutCallback(callback)
+                           .withSkipNotFound(skip_url_not_found_error)
+                           .withHeaders(headers)
+                           .withDelayInit(delay_initialization)
+                           .create(credentials);
 
             if (context_->getSettingsRef().engine_url_skip_empty_files && res->eof() && option != std::prev(end))
             {
@@ -498,13 +507,13 @@ std::pair<Poco::URI, std::unique_ptr<ReadWriteBufferFromHTTP>> StorageURLSource:
     throw Exception(ErrorCodes::NETWORK_ERROR, "All uri ({}) options are unreachable: {}", options, first_exception_message);
 }
 
-void StorageURLSource::addNumRowsToCache(const DB::String & uri, size_t num_rows)
+void StorageURLSource::addNumRowsToCache(const String & uri, size_t num_rows)
 {
     auto cache_key = getKeyForSchemaCache(uri, format, format_settings, getContext());
     StorageURL::getSchemaCache(getContext()).addNumRows(cache_key, num_rows);
 }
 
-std::optional<size_t> StorageURLSource::tryGetNumRowsFromCache(const DB::String & uri, std::optional<time_t> last_mod_time)
+std::optional<size_t> StorageURLSource::tryGetNumRowsFromCache(const String & uri, std::optional<time_t> last_mod_time)
 {
     auto cache_key = getKeyForSchemaCache(uri, format, format_settings, getContext());
     auto get_last_mod_time = [&]() -> std::optional<time_t>
@@ -525,7 +534,7 @@ StorageURLSink::StorageURLSink(
     const String & format,
     const std::optional<FormatSettings> & format_settings,
     const Block & sample_block,
-    ContextPtr context,
+    const ContextPtr & context,
     const ConnectionTimeouts & timeouts,
     const CompressionMethod compression_method,
     const HTTPHeaderEntries & headers,
@@ -538,7 +547,7 @@ StorageURLSink::StorageURLSink(
     auto proxy_config = getProxyConfiguration(http_method);
 
     auto write_buffer = std::make_unique<WriteBufferFromHTTP>(
-        Poco::URI(uri), http_method, content_type, content_encoding, headers, timeouts, DBMS_DEFAULT_BUFFER_SIZE, proxy_config
+        HTTPConnectionGroupType::STORAGE, Poco::URI(uri), http_method, content_type, content_encoding, headers, timeouts, DBMS_DEFAULT_BUFFER_SIZE, proxy_config
     );
 
     const auto & settings = context->getSettingsRef();
@@ -668,7 +677,7 @@ std::vector<std::pair<std::string, std::string>> IStorageURLBase::getReadURIPara
     const Names & /*column_names*/,
     const StorageSnapshotPtr & /*storage_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    ContextPtr /*context*/,
+    const ContextPtr & /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -679,7 +688,7 @@ std::function<void(std::ostream &)> IStorageURLBase::getReadPOSTDataCallback(
     const Names & /*column_names*/,
     const ColumnsDescription & /* columns_description */,
     const SelectQueryInfo & /*query_info*/,
-    ContextPtr /*context*/,
+    const ContextPtr & /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
@@ -693,28 +702,48 @@ namespace
     public:
         ReadBufferIterator(
             const std::vector<String> & urls_to_check_,
-            const String & format_,
+            std::optional<String> format_,
             const CompressionMethod & compression_method_,
             const HTTPHeaderEntries & headers_,
             const std::optional<FormatSettings> & format_settings_,
             const ContextPtr & context_)
-            : WithContext(context_), format(format_), compression_method(compression_method_), headers(headers_), format_settings(format_settings_)
+            : WithContext(context_), format(std::move(format_)), compression_method(compression_method_), headers(headers_), format_settings(format_settings_)
         {
             url_options_to_check.reserve(urls_to_check_.size());
             for (const auto & url : urls_to_check_)
                 url_options_to_check.push_back(getFailoverOptions(url, getContext()->getSettingsRef().glob_expansion_max_elements));
         }
 
-        std::pair<std::unique_ptr<ReadBuffer>, std::optional<ColumnsDescription>> next() override
+        Data next() override
         {
             bool is_first = (current_index == 0);
-            /// For default mode check cached columns for all urls on first iteration.
-            if (is_first && getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+            if (is_first)
             {
-                for (const auto & options : url_options_to_check)
+                /// If format is unknown we iterate through all url options on first iteration and
+                /// try to determine format by file name.
+                if (!format)
                 {
-                    if (auto cached_columns = tryGetColumnsFromCache(options))
-                        return {nullptr, cached_columns};
+                    for (const auto & options : url_options_to_check)
+                    {
+                        for (const auto & url : options)
+                        {
+                            if (auto format_from_file_name = FormatFactory::instance().tryGetFormatFromFileName(url))
+                            {
+                                format = format_from_file_name;
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                /// For default mode check cached columns for all urls on first iteration.
+                if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::DEFAULT)
+                {
+                    for (const auto & options : url_options_to_check)
+                    {
+                        if (auto cached_columns = tryGetColumnsFromCache(options))
+                            return {nullptr, cached_columns, format};
+                    }
                 }
             }
 
@@ -724,20 +753,30 @@ namespace
                 if (current_index == url_options_to_check.size())
                 {
                     if (is_first)
+                    {
+                        if (format)
+                            throw Exception(
+                                ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
+                                "The table structure cannot be extracted from a {} format file, because all files are empty. "
+                                "You can specify table structure manually",
+                                *format);
+
                         throw Exception(
                             ErrorCodes::CANNOT_EXTRACT_TABLE_STRUCTURE,
-                            "Cannot extract table structure from {} format file, because all files are empty. "
-                            "You must specify table structure manually",
-                            format);
-                    return {nullptr, std::nullopt};
+                            "The data format cannot be detected by the contents of the files, because there are no files with provided path "
+                            "You can specify the format manually");
+
+                    }
+
+                    return {nullptr, std::nullopt, format};
                 }
 
                 if (getContext()->getSettingsRef().schema_inference_mode == SchemaInferenceMode::UNION)
                 {
-                    if (auto cached_columns = tryGetColumnsFromCache(url_options_to_check[current_index]))
+                    if (auto cached_schema = tryGetColumnsFromCache(url_options_to_check[current_index]))
                     {
                         ++current_index;
-                        return {nullptr, cached_columns};
+                        return {nullptr, cached_schema, format};
                     }
                 }
 
@@ -762,7 +801,7 @@ namespace
             return {wrapReadBufferWithCompressionMethod(
                 std::move(uri_and_buf.second),
                 compression_method,
-                static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max)), std::nullopt};
+                static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max)), std::nullopt, format};
         }
 
         void setNumRowsToLastFile(size_t num_rows) override
@@ -770,7 +809,7 @@ namespace
             if (!getContext()->getSettingsRef().schema_inference_use_cache_for_url)
                 return;
 
-            auto key = getKeyForSchemaCache(current_url_option, format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(current_url_option, *format, format_settings, getContext());
             StorageURL::getSchemaCache(getContext()).addNumRows(key, num_rows);
         }
 
@@ -780,7 +819,7 @@ namespace
                 || getContext()->getSettingsRef().schema_inference_mode != SchemaInferenceMode::UNION)
                 return;
 
-            auto key = getKeyForSchemaCache(current_url_option, format, format_settings, getContext());
+            auto key = getKeyForSchemaCache(current_url_option, *format, format_settings, getContext());
             StorageURL::getSchemaCache(getContext()).addColumns(key, columns);
         }
 
@@ -792,17 +831,45 @@ namespace
 
             for (const auto & options : url_options_to_check)
             {
-                auto keys = getKeysForSchemaCache(options, format, format_settings, getContext());
+                auto keys = getKeysForSchemaCache(options, *format, format_settings, getContext());
                 StorageURL::getSchemaCache(getContext()).addManyColumns(keys, columns);
             }
         }
 
+        void setFormatName(const String & format_name) override
+        {
+            format = format_name;
+        }
+
         String getLastFileName() const override { return current_url_option; }
 
+        bool supportsLastReadBufferRecreation() const override { return true; }
+
+        std::unique_ptr<ReadBuffer> recreateLastReadBuffer() override
+        {
+            chassert(current_index > 0 && current_index <= url_options_to_check.size());
+            auto first_option = url_options_to_check[current_index - 1].cbegin();
+            auto uri_and_buf = StorageURLSource::getFirstAvailableURIAndReadBuffer(
+                first_option,
+                url_options_to_check[current_index - 1].cend(),
+                getContext(),
+                {},
+                Poco::Net::HTTPRequest::HTTP_GET,
+                {},
+                getHTTPTimeouts(getContext()),
+                credentials,
+                headers,
+                false,
+                false);
+
+            return wrapReadBufferWithCompressionMethod(std::move(uri_and_buf.second), compression_method, static_cast<int>(getContext()->getSettingsRef().zstd_window_log_max));
+        }
+
     private:
         std::optional<ColumnsDescription> tryGetColumnsFromCache(const Strings & urls)
         {
-            if (!getContext()->getSettingsRef().schema_inference_use_cache_for_url)
+            auto context = getContext();
+            if (!context->getSettingsRef().schema_inference_use_cache_for_url)
                 return std::nullopt;
 
             auto & schema_cache = StorageURL::getSchemaCache(getContext());
@@ -810,7 +877,7 @@ namespace
             {
                 auto get_last_mod_time = [&]() -> std::optional<time_t>
                 {
-                    auto last_mod_time = StorageURL::tryGetLastModificationTime(url, headers, credentials, getContext());
+                    auto last_mod_time = StorageURL::tryGetLastModificationTime(url, headers, credentials, context);
                     /// Some URLs could not have Last-Modified header, in this case we cannot be sure that
                     /// data wasn't changed after adding it's schema to cache. Use schema from cache only if
                     /// special setting for this case is enabled.
@@ -819,10 +886,27 @@ namespace
                     return last_mod_time;
                 };
 
-                auto cache_key = getKeyForSchemaCache(url, format, format_settings, getContext());
-                auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time);
-                if (columns)
-                    return columns;
+                if (format)
+                {
+                    auto cache_key = getKeyForSchemaCache(url, *format, format_settings, context);
+                    if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        return columns;
+                }
+                else
+                {
+                    /// If format is unknown, we can iterate through all possible input formats
+                    /// and check if we have an entry with this format and this file in schema cache.
+                    /// If we have such entry for some format, we can use this format to read the file.
+                    for (const auto & format_name : FormatFactory::instance().getAllInputFormats())
+                    {
+                        auto cache_key = getKeyForSchemaCache(url, format_name, format_settings, context);
+                        if (auto columns = schema_cache.tryGetColumns(cache_key, get_last_mod_time))
+                        {
+                            format = format_name;
+                            return columns;
+                        }
+                    }
+                }
             }
 
             return std::nullopt;
@@ -831,7 +915,7 @@ namespace
         std::vector<std::vector<String>> url_options_to_check;
         size_t current_index = 0;
         String current_url_option;
-        const String & format;
+        std::optional<String> format;
         const CompressionMethod & compression_method;
         const HTTPHeaderEntries & headers;
         Poco::Net::HTTPBasicCredentials credentials;
@@ -839,13 +923,13 @@ namespace
     };
 }
 
-ColumnsDescription IStorageURLBase::getTableStructureFromData(
-    const String & format,
+std::pair<ColumnsDescription, String> IStorageURLBase::getTableStructureAndFormatFromDataImpl(
+    std::optional<String> format,
     const String & uri,
     CompressionMethod compression_method,
     const HTTPHeaderEntries & headers,
     const std::optional<FormatSettings> & format_settings,
-    ContextPtr context)
+    const ContextPtr & context)
 {
     context->getRemoteHostFilter().checkURL(Poco::URI(uri));
 
@@ -858,7 +942,30 @@ ColumnsDescription IStorageURLBase::getTableStructureFromData(
         urls_to_check = {uri};
 
     ReadBufferIterator read_buffer_iterator(urls_to_check, format, compression_method, headers, format_settings, context);
-    return readSchemaFromFormat(format, format_settings, read_buffer_iterator, urls_to_check.size() > 1, context);
+    if (format)
+        return {readSchemaFromFormat(*format, format_settings, read_buffer_iterator, context), *format};
+    return detectFormatAndReadSchema(format_settings, read_buffer_iterator, context);
+}
+
+ColumnsDescription IStorageURLBase::getTableStructureFromData(
+    const String & format,
+    const String & uri,
+    CompressionMethod compression_method,
+    const HTTPHeaderEntries & headers,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context)
+{
+    return getTableStructureAndFormatFromDataImpl(format, uri, compression_method, headers, format_settings, context).first;
+}
+
+std::pair<ColumnsDescription, String> IStorageURLBase::getTableStructureAndFormatFromData(
+    const String & uri,
+    CompressionMethod compression_method,
+    const HTTPHeaderEntries & headers,
+    const std::optional<FormatSettings> & format_settings,
+    const ContextPtr & context)
+{
+    return getTableStructureAndFormatFromDataImpl(std::nullopt, uri, compression_method, headers, format_settings, context);
 }
 
 bool IStorageURLBase::supportsSubsetOfColumns(const ContextPtr & context) const
@@ -881,9 +988,13 @@ class ReadFromURL : public SourceStepWithFilter
 public:
     std::string getName() const override { return "ReadFromURL"; }
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
     ReadFromURL(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
         std::shared_ptr<IStorageURLBase> storage_,
         std::vector<String> * uri_options_,
@@ -891,19 +1002,18 @@ public:
         const bool need_only_count_,
         std::vector<std::pair<std::string, std::string>> read_uri_params_,
         std::function<void(std::ostream &)> read_post_data_callback_,
-        ContextPtr context_,
         size_t max_block_size_,
         size_t num_streams_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , storage(std::move(storage_))
         , uri_options(uri_options_)
         , info(std::move(info_))
         , need_only_count(need_only_count_)
         , read_uri_params(std::move(read_uri_params_))
         , read_post_data_callback(std::move(read_post_data_callback_))
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , num_streams(num_streams_)
+        , max_num_streams(num_streams_)
     {
     }
 
@@ -916,10 +1026,9 @@ private:
     std::vector<std::pair<std::string, std::string>> read_uri_params;
     std::function<void(std::ostream &)> read_post_data_callback;
 
-    ContextPtr context;
-
     size_t max_block_size;
     size_t num_streams;
+    const size_t max_num_streams;
 
     std::shared_ptr<StorageURLSource::IteratorWrapper> iterator_wrapper;
     bool is_url_with_globs = false;
@@ -928,9 +1037,9 @@ private:
     void createIterator(const ActionsDAG::Node * predicate);
 };
 
-void ReadFromURL::applyFilters()
+void ReadFromURL::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
@@ -949,7 +1058,7 @@ void IStorageURLBase::read(
     size_t num_streams)
 {
     auto params = getReadURIParams(column_names, storage_snapshot, query_info, local_context, processed_stage, max_block_size);
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context));
 
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && local_context->getSettingsRef().optimize_count_from_files;
@@ -965,6 +1074,10 @@ void IStorageURLBase::read(
     auto this_ptr = std::static_pointer_cast<IStorageURLBase>(shared_from_this());
 
     auto reading = std::make_unique<ReadFromURL>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        local_context,
         read_from_format_info.source_header,
         std::move(this_ptr),
         nullptr,
@@ -972,7 +1085,6 @@ void IStorageURLBase::read(
         need_only_count,
         std::move(params),
         std::move(read_post_data_callback),
-        local_context,
         max_block_size,
         num_streams);
 
@@ -1014,7 +1126,7 @@ void ReadFromURL::createIterator(const ActionsDAG::Node * predicate)
     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>(storage->uri, max_addresses, predicate, storage->virtual_columns, context);
+        auto glob_iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(storage->uri, max_addresses, predicate, storage->getVirtualsList(), context);
 
         /// check if we filtered out all the paths
         if (glob_iterator->size() == 0)
@@ -1083,7 +1195,7 @@ void ReadFromURL::initializePipeline(QueryPipelineBuilder & pipeline, const Buil
             is_url_with_globs,
             need_only_count);
 
-        source->setKeyCondition(filter_nodes.nodes, context);
+        source->setKeyCondition(filter_actions_dag, context);
         pipes.emplace_back(std::move(source));
     }
 
@@ -1093,8 +1205,8 @@ void ReadFromURL::initializePipeline(QueryPipelineBuilder & pipeline, const Buil
     auto pipe = Pipe::unitePipes(std::move(pipes));
     size_t output_ports = pipe.numOutputPorts();
     const bool parallelize_output = context->getSettingsRef().parallelize_output_from_storages;
-    if (parallelize_output && storage->parallelizeOutputAfterReading(context) && output_ports > 0 && output_ports < num_streams)
-        pipe.resize(num_streams);
+    if (parallelize_output && storage->parallelizeOutputAfterReading(context) && output_ports > 0 && output_ports < max_num_streams)
+        pipe.resize(max_num_streams);
 
     if (pipe.empty())
         pipe = Pipe(std::make_shared<NullSource>(info.source_header));
@@ -1117,7 +1229,7 @@ void StorageURLWithFailover::read(
     size_t num_streams)
 {
     auto params = getReadURIParams(column_names, storage_snapshot, query_info, local_context, processed_stage, max_block_size);
-    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context), getVirtuals());
+    auto read_from_format_info = prepareReadingFromFormat(column_names, storage_snapshot, supportsSubsetOfColumns(local_context));
 
     bool need_only_count = (query_info.optimize_trivial_count || read_from_format_info.requested_columns.empty())
         && local_context->getSettingsRef().optimize_count_from_files;
@@ -1133,6 +1245,10 @@ void StorageURLWithFailover::read(
     auto this_ptr = std::static_pointer_cast<StorageURL>(shared_from_this());
 
     auto reading = std::make_unique<ReadFromURL>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        local_context,
         read_from_format_info.source_header,
         std::move(this_ptr),
         &uri_options,
@@ -1140,7 +1256,6 @@ void StorageURLWithFailover::read(
         need_only_count,
         std::move(params),
         std::move(read_post_data_callback),
-        local_context,
         max_block_size,
         num_streams);
 
@@ -1187,16 +1302,6 @@ SinkToStoragePtr IStorageURLBase::write(const ASTPtr & query, const StorageMetad
     }
 }
 
-NamesAndTypesList IStorageURLBase::getVirtuals() const
-{
-    return virtual_columns;
-}
-
-Names IStorageURLBase::getVirtualColumnNames()
-{
-    return VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage({}).getNames();
-}
-
 SchemaCache & IStorageURLBase::getSchemaCache(const ContextPtr & context)
 {
     static SchemaCache schema_cache(context->getConfigRef().getUInt("schema_inference_cache_max_elements_for_url", DEFAULT_SCHEMA_CACHE_ELEMENTS));
@@ -1215,24 +1320,17 @@ std::optional<time_t> IStorageURLBase::tryGetLastModificationTime(
 
     auto proxy_config = getProxyConfiguration(uri.getScheme());
 
-    ReadWriteBufferFromHTTP buf(
-        uri,
-        Poco::Net::HTTPRequest::HTTP_GET,
-        {},
-        getHTTPTimeouts(context),
-        credentials,
-        settings.max_http_get_redirects,
-        settings.max_read_buffer_size,
-        context->getReadSettings(),
-        headers,
-        &context->getRemoteHostFilter(),
-        true,
-        false,
-        false,
-        std::nullopt,
-        proxy_config);
+    auto buf = BuilderRWBufferFromHTTP(uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withSettings(context->getReadSettings())
+                   .withTimeouts(getHTTPTimeouts(context))
+                   .withHostFilter(&context->getRemoteHostFilter())
+                   .withBufSize(settings.max_read_buffer_size)
+                   .withRedirects(settings.max_http_get_redirects)
+                   .withHeaders(headers)
+                   .create(credentials);
 
-    return buf.tryGetLastModificationTime();
+    return buf->tryGetLastModificationTime();
 }
 
 StorageURL::StorageURL(
@@ -1243,7 +1341,7 @@ StorageURL::StorageURL(
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
     const String & comment,
-    ContextPtr context_,
+    const ContextPtr & context_,
     const String & compression_method_,
     const HTTPHeaderEntries & headers_,
     const String & http_method_,
@@ -1276,7 +1374,7 @@ StorageURLWithFailover::StorageURLWithFailover(
     const std::optional<FormatSettings> & format_settings_,
     const ColumnsDescription & columns_,
     const ConstraintsDescription & constraints_,
-    ContextPtr context_,
+    const ContextPtr & context_,
     const String & compression_method_)
     : StorageURL("", table_id_, format_name_, format_settings_, columns_, constraints_, String{}, context_, compression_method_)
 {
@@ -1284,7 +1382,7 @@ StorageURLWithFailover::StorageURLWithFailover(
     {
         Poco::URI poco_uri(uri_option);
         context_->getRemoteHostFilter().checkURL(poco_uri);
-        LOG_DEBUG(&Poco::Logger::get("StorageURLDistributed"), "Adding URL option: {}", uri_option);
+        LOG_DEBUG(getLogger("StorageURLDistributed"), "Adding URL option: {}", uri_option);
         uri_options.emplace_back(uri_option);
     }
 }
@@ -1324,8 +1422,8 @@ FormatSettings StorageURL::getFormatSettingsFromArgs(const StorageFactory::Argum
     return format_settings;
 }
 
-ASTs::iterator StorageURL::collectHeaders(
-    ASTs & url_function_args, HTTPHeaderEntries & header_entries, ContextPtr context)
+size_t StorageURL::evalArgsAndCollectHeaders(
+    ASTs & url_function_args, HTTPHeaderEntries & header_entries, const ContextPtr & context)
 {
     ASTs::iterator headers_it = url_function_args.end();
 
@@ -1382,7 +1480,11 @@ ASTs::iterator StorageURL::collectHeaders(
         (*arg_it) = evaluateConstantExpressionOrIdentifierAsLiteral((*arg_it), context);
     }
 
-    return headers_it;
+    if (headers_it == url_function_args.end())
+        return url_function_args.size();
+
+    std::rotate(headers_it, std::next(headers_it), url_function_args.end());
+    return url_function_args.size() - 1;
 }
 
 void StorageURL::processNamedCollectionResult(Configuration & configuration, const NamedCollection & collection)
@@ -1397,7 +1499,7 @@ void StorageURL::processNamedCollectionResult(Configuration & configuration, con
         && configuration.http_method != Poco::Net::HTTPRequest::HTTP_PUT)
         throw Exception(
             ErrorCodes::BAD_ARGUMENTS,
-            "Http method can be POST or PUT (current: {}). For insert default is POST, for select GET",
+            "HTTP method can be POST or PUT (current: {}). For insert default is POST, for select GET",
             configuration.http_method);
 
     configuration.format = collection.getOrDefault<String>("format", "auto");
@@ -1405,33 +1507,31 @@ void StorageURL::processNamedCollectionResult(Configuration & configuration, con
     configuration.structure = collection.getOrDefault<String>("structure", "auto");
 }
 
-StorageURL::Configuration StorageURL::getConfiguration(ASTs & args, ContextPtr local_context)
+StorageURL::Configuration StorageURL::getConfiguration(ASTs & args, const ContextPtr & local_context)
 {
     StorageURL::Configuration configuration;
 
     if (auto named_collection = tryGetNamedCollectionWithOverrides(args, local_context))
     {
         StorageURL::processNamedCollectionResult(configuration, *named_collection);
-        collectHeaders(args, configuration.headers, local_context);
+        evalArgsAndCollectHeaders(args, configuration.headers, local_context);
     }
     else
     {
-        if (args.empty() || args.size() > 3)
+        size_t count = evalArgsAndCollectHeaders(args, configuration.headers, local_context);
+
+        if (count == 0 || count > 3)
             throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, bad_arguments_error_message);
 
-        auto * header_it = collectHeaders(args, configuration.headers, local_context);
-        if (header_it != args.end())
-            args.erase(header_it);
-
         configuration.url = checkAndGetLiteralArgument<String>(args[0], "url");
-        if (args.size() > 1)
+        if (count > 1)
             configuration.format = checkAndGetLiteralArgument<String>(args[1], "format");
-        if (args.size() == 3)
+        if (count == 3)
             configuration.compression_method = checkAndGetLiteralArgument<String>(args[2], "compression_method");
     }
 
     if (configuration.format == "auto")
-        configuration.format = FormatFactory::instance().getFormatFromFileName(Poco::URI(configuration.url).getPath(), true);
+        configuration.format = FormatFactory::instance().tryGetFormatFromFileName(Poco::URI(configuration.url).getPath()).value_or("auto");
 
     for (const auto & [header, value] : configuration.headers)
     {
diff --git a/src/Storages/StorageURL.h b/src/Storages/StorageURL.h
index 07d4d0cad38..5aca3df1513 100644
--- a/src/Storages/StorageURL.h
+++ b/src/Storages/StorageURL.h
@@ -48,16 +48,21 @@ public:
 
     bool supportsPartitionBy() const override { return true; }
 
-    NamesAndTypesList getVirtuals() const override;
-    static Names getVirtualColumnNames();
-
     static ColumnsDescription getTableStructureFromData(
         const String & format,
         const String & uri,
         CompressionMethod compression_method,
         const HTTPHeaderEntries & headers,
         const std::optional<FormatSettings> & format_settings,
-        ContextPtr context);
+        const ContextPtr & context);
+
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromData(
+        const String & uri,
+        CompressionMethod compression_method,
+        const HTTPHeaderEntries & headers,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context);
+
 
     static SchemaCache & getSchemaCache(const ContextPtr & context);
 
@@ -72,7 +77,7 @@ protected:
 
     IStorageURLBase(
         const String & uri_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const StorageID & id_,
         const String & format_name_,
         const std::optional<FormatSettings> & format_settings_,
@@ -98,15 +103,13 @@ protected:
     ASTPtr partition_by;
     bool distributed_processing;
 
-    NamesAndTypesList virtual_columns;
-
     virtual std::string getReadMethod() const;
 
     virtual std::vector<std::pair<std::string, std::string>> getReadURIParams(
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         const SelectQueryInfo & query_info,
-        ContextPtr context,
+        const ContextPtr & context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
@@ -114,7 +117,7 @@ protected:
         const Names & column_names,
         const ColumnsDescription & columns_description,
         const SelectQueryInfo & query_info,
-        ContextPtr context,
+        const ContextPtr & context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const;
 
@@ -124,9 +127,17 @@ protected:
 
     bool parallelizeOutputAfterReading(ContextPtr context) const override;
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
+    static std::pair<ColumnsDescription, String> getTableStructureAndFormatFromDataImpl(
+        std::optional<String> format,
+        const String & uri,
+        CompressionMethod compression_method,
+        const HTTPHeaderEntries & headers,
+        const std::optional<FormatSettings> & format_settings,
+        const ContextPtr & context);
+
     virtual Block getHeaderBlock(const Names & column_names, const StorageSnapshotPtr & storage_snapshot) const = 0;
 };
 
@@ -160,7 +171,7 @@ public:
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         String name_,
-        ContextPtr context,
+        const ContextPtr & context,
         UInt64 max_block_size,
         const ConnectionTimeouts & timeouts,
         CompressionMethod compression_method,
@@ -170,11 +181,13 @@ public:
         bool glob_url = false,
         bool need_only_count_ = false);
 
+    ~StorageURLSource() override;
+
     String getName() const override { return name; }
 
-    void setKeyCondition(const ActionsDAG::NodeRawConstPtrs & nodes, ContextPtr context_) override
+    void setKeyCondition(const ActionsDAGPtr & filter_actions_dag, ContextPtr context_) override
     {
-        setKeyConditionImpl(nodes, context_, block_for_format);
+        setKeyConditionImpl(filter_actions_dag, context_, block_for_format);
     }
 
     Chunk generate() override;
@@ -231,7 +244,7 @@ public:
         const String & format,
         const std::optional<FormatSettings> & format_settings,
         const Block & sample_block,
-        ContextPtr context,
+        const ContextPtr & context,
         const ConnectionTimeouts & timeouts,
         CompressionMethod compression_method,
         const HTTPHeaderEntries & headers = {},
@@ -263,7 +276,7 @@ public:
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
         const String & comment,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const String & compression_method_,
         const HTTPHeaderEntries & headers_ = {},
         const String & method_ = "",
@@ -292,9 +305,12 @@ public:
         std::string addresses_expr;
     };
 
-    static Configuration getConfiguration(ASTs & args, ContextPtr context);
+    static Configuration getConfiguration(ASTs & args, const ContextPtr & context);
 
-    static ASTs::iterator collectHeaders(ASTs & url_function_args, HTTPHeaderEntries & header_entries, ContextPtr context);
+    /// Does evaluateConstantExpressionOrIdentifierAsLiteral() on all arguments.
+    /// If `headers(...)` argument is present, parses it and moves it to the end of the array.
+    /// Returns number of arguments excluding `headers(...)`.
+    static size_t evalArgsAndCollectHeaders(ASTs & url_function_args, HTTPHeaderEntries & header_entries, const ContextPtr & context);
 
     static void processNamedCollectionResult(Configuration & configuration, const NamedCollection & collection);
 };
@@ -311,7 +327,7 @@ public:
         const std::optional<FormatSettings> & format_settings_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        ContextPtr context_,
+        const ContextPtr & context_,
         const String & compression_method_);
 
     void read(
diff --git a/src/Storages/StorageURLCluster.cpp b/src/Storages/StorageURLCluster.cpp
index a0b5fcd6f28..2e7c63d0097 100644
--- a/src/Storages/StorageURLCluster.cpp
+++ b/src/Storages/StorageURLCluster.cpp
@@ -35,55 +35,62 @@ namespace ErrorCodes
 }
 
 StorageURLCluster::StorageURLCluster(
-    ContextPtr context_,
+    const ContextPtr & context,
     const String & cluster_name_,
     const String & uri_,
     const String & format_,
-    const String & compression_method_,
+    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_)
+    const StorageURL::Configuration & configuration_)
+    : IStorageCluster(cluster_name_, table_id_, getLogger("StorageURLCluster (" + table_id_.table_name + ")"))
+    , uri(uri_), format_name(format_)
 {
-    context_->getRemoteHostFilter().checkURL(Poco::URI(uri));
-    context_->getHTTPHeaderFilter().checkHeaders(configuration_.headers);
+    context->getRemoteHostFilter().checkURL(Poco::URI(uri));
+    context->getHTTPHeaderFilter().checkHeaders(configuration_.headers);
 
     StorageInMemoryMetadata storage_metadata;
 
     if (columns_.empty())
     {
-        auto columns = StorageURL::getTableStructureFromData(format_,
-            uri,
-            chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method_),
-            configuration_.headers,
-            std::nullopt,
-            context_);
+        ColumnsDescription columns;
+        if (format_name == "auto")
+            std::tie(columns, format_name) = StorageURL::getTableStructureAndFormatFromData(
+                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context);
+        else
+            columns = StorageURL::getTableStructureFromData(
+                format_, uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context);
+
         storage_metadata.setColumns(columns);
     }
     else
+    {
+        if (format_name == "auto")
+            format_name = StorageURL::getTableStructureAndFormatFromData(
+                uri, chooseCompressionMethod(Poco::URI(uri).getPath(), compression_method), configuration_.headers, std::nullopt, context).second;
+
         storage_metadata.setColumns(columns_);
+    }
 
     storage_metadata.setConstraints(constraints_);
     setInMemoryMetadata(storage_metadata);
-
-    virtual_columns = VirtualColumnUtils::getPathFileAndSizeVirtualsForStorage(storage_metadata.getSampleBlock().getNamesAndTypesList());
+    setVirtuals(VirtualColumnUtils::getVirtualsForFileLikeStorage(storage_metadata.getColumns()));
 }
 
-void StorageURLCluster::addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context)
+void StorageURLCluster::updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, 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);
+    TableFunctionURLCluster::updateStructureAndFormatArgumentsIfNeeded(
+        expression_list->children, storage_snapshot->metadata->getColumns().getAll().toNamesAndTypesDescription(), format_name, context);
 }
 
 RemoteQueryExecutor::Extension StorageURLCluster::getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const
 {
-    auto iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(uri, context->getSettingsRef().glob_expansion_max_elements, predicate, virtual_columns, context);
+    auto iterator = std::make_shared<StorageURLSource::DisclosedGlobIterator>(uri, context->getSettingsRef().glob_expansion_max_elements, predicate, getVirtualsList(), context);
     auto callback = std::make_shared<TaskIterator>([iter = std::move(iterator)]() mutable -> String { return iter->next(); });
     return RemoteQueryExecutor::Extension{.task_iterator = std::move(callback)};
 }
diff --git a/src/Storages/StorageURLCluster.h b/src/Storages/StorageURLCluster.h
index 07978040029..c80cdec74a2 100644
--- a/src/Storages/StorageURLCluster.h
+++ b/src/Storages/StorageURLCluster.h
@@ -19,34 +19,29 @@ class StorageURLCluster : public IStorageCluster
 {
 public:
     StorageURLCluster(
-        ContextPtr context_,
+        const ContextPtr & context,
         const String & cluster_name_,
         const String & uri_,
         const String & format_,
-        const String & compression_method_,
+        const String & compression_method,
         const StorageID & table_id_,
         const ColumnsDescription & columns_,
         const ConstraintsDescription & constraints_,
-        const StorageURL::Configuration & configuration_,
-        bool structure_argument_was_provided_);
+        const StorageURL::Configuration & configuration_);
 
     std::string getName() const override { return "URLCluster"; }
 
-    NamesAndTypesList getVirtuals() const override { return virtual_columns; }
-
     RemoteQueryExecutor::Extension getTaskIteratorExtension(const ActionsDAG::Node * predicate, const ContextPtr & context) const override;
 
     bool supportsSubcolumns() const override { return true; }
 
-    bool supportsTrivialCountOptimization() const override { return true; }
+    bool supportsTrivialCountOptimization(const StorageSnapshotPtr &, ContextPtr) const override { return true; }
 
 private:
-    void addColumnsStructureToQuery(ASTPtr & query, const String & structure, const ContextPtr & context) override;
+    void updateQueryToSendIfNeeded(ASTPtr & query, const StorageSnapshotPtr & storage_snapshot, const ContextPtr & context) override;
 
     String uri;
     String format_name;
-    String compression_method;
-    NamesAndTypesList virtual_columns;
 };
 
 
diff --git a/src/Storages/StorageValues.cpp b/src/Storages/StorageValues.cpp
index 300b11b7346..894b1404a21 100644
--- a/src/Storages/StorageValues.cpp
+++ b/src/Storages/StorageValues.cpp
@@ -2,6 +2,7 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/StorageValues.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/Transforms/ExpressionTransform.h>
 #include <QueryPipeline/Pipe.h>
 
 
@@ -12,12 +13,26 @@ StorageValues::StorageValues(
     const StorageID & table_id_,
     const ColumnsDescription & columns_,
     const Block & res_block_,
-    const NamesAndTypesList & virtuals_)
-    : IStorage(table_id_), res_block(res_block_), virtuals(virtuals_)
+    VirtualColumnsDescription virtuals_)
+    : IStorage(table_id_), res_block(res_block_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns_);
     setInMemoryMetadata(storage_metadata);
+    setVirtuals(std::move(virtuals_));
+}
+
+StorageValues::StorageValues(
+    const StorageID & table_id_,
+    const ColumnsDescription & columns_,
+    Pipe prepared_pipe_,
+    VirtualColumnsDescription virtuals_)
+    : IStorage(table_id_), prepared_pipe(std::move(prepared_pipe_))
+{
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(columns_);
+    setInMemoryMetadata(storage_metadata);
+    setVirtuals(std::move(virtuals_));
 }
 
 Pipe StorageValues::read(
@@ -31,6 +46,25 @@ Pipe StorageValues::read(
 {
     storage_snapshot->check(column_names);
 
+    if (!prepared_pipe.empty())
+    {
+        auto dag = std::make_shared<ActionsDAG>(prepared_pipe.getHeader().getColumnsWithTypeAndName());
+        ActionsDAG::NodeRawConstPtrs outputs;
+        outputs.reserve(column_names.size());
+        for (const auto & name : column_names)
+            outputs.push_back(dag->getOutputs()[prepared_pipe.getHeader().getPositionByName(name)]);
+
+        dag->getOutputs().swap(outputs);
+        auto expression = std::make_shared<ExpressionActions>(dag);
+
+        prepared_pipe.addSimpleTransform([&](const Block & header)
+        {
+            return std::make_shared<ExpressionTransform>(header, expression);
+        });
+
+        return std::move(prepared_pipe);
+    }
+
     /// Get only required columns.
     Block block;
     for (const auto & name : column_names)
diff --git a/src/Storages/StorageValues.h b/src/Storages/StorageValues.h
index af1c134077b..37992928d55 100644
--- a/src/Storages/StorageValues.h
+++ b/src/Storages/StorageValues.h
@@ -11,8 +11,20 @@ namespace DB
 class StorageValues final : public IStorage
 {
 public:
+    /// Why we may have virtual columns in the storage from a single block?
+    /// Because it used as tmp storage for pushing blocks into views, and some
+    /// views may contain virtual columns from original storage.
     StorageValues(
-        const StorageID & table_id_, const ColumnsDescription & columns_, const Block & res_block_, const NamesAndTypesList & virtuals_ = {});
+        const StorageID & table_id_,
+        const ColumnsDescription & columns_,
+        const Block & res_block_,
+        VirtualColumnsDescription virtuals_ = {});
+
+    StorageValues(
+        const StorageID & table_id_,
+        const ColumnsDescription & columns_,
+        Pipe prepared_pipe_,
+        VirtualColumnsDescription virtuals_ = {});
 
     std::string getName() const override { return "Values"; }
 
@@ -25,13 +37,6 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
-    /// Why we may have virtual columns in the storage from a single block?
-    /// Because it used as tmp storage for pushing blocks into views, and some
-    /// views may contain virtual columns from original storage.
-    NamesAndTypesList getVirtuals() const override
-    {
-        return virtuals;
-    }
 
     /// FIXME probably it should return false, but StorageValues is used in ExecutingInnerQueryFromViewTransform (whatever it is)
     bool supportsTransactions() const override { return true; }
@@ -40,7 +45,7 @@ public:
 
 private:
     Block res_block;
-    NamesAndTypesList virtuals;
+    Pipe prepared_pipe;
 };
 
 }
diff --git a/src/Storages/StorageView.cpp b/src/Storages/StorageView.cpp
index f0f9b9540de..db568a1d5ab 100644
--- a/src/Storages/StorageView.cpp
+++ b/src/Storages/StorageView.cpp
@@ -12,6 +12,7 @@
 #include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTTablesInSelectQuery.h>
 
+#include <Storages/AlterCommands.h>
 #include <Storages/StorageView.h>
 #include <Storages/StorageFactory.h>
 #include <Storages/SelectQueryDescription.h>
@@ -35,6 +36,7 @@ namespace ErrorCodes
 {
     extern const int INCORRECT_QUERY;
     extern const int LOGICAL_ERROR;
+    extern const int NOT_IMPLEMENTED;
 }
 
 
@@ -90,10 +92,10 @@ bool hasJoin(const ASTSelectWithUnionQuery & ast)
 /** There are no limits on the maximum size of the result for the view.
   *  Since the result of the view is not the result of the entire query.
   */
-ContextPtr getViewContext(ContextPtr context)
+ContextPtr getViewContext(ContextPtr context, const StorageSnapshotPtr & storage_snapshot)
 {
-    auto view_context = Context::createCopy(context);
-    Settings view_settings = context->getSettings();
+    auto view_context = storage_snapshot->metadata->getSQLSecurityOverriddenContext(context);
+    Settings view_settings = view_context->getSettings();
     view_settings.max_result_rows = 0;
     view_settings.max_result_bytes = 0;
     view_settings.extremes = false;
@@ -108,12 +110,22 @@ StorageView::StorageView(
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
     const String & comment,
-    const bool is_parameterized_view_)
+    bool is_parameterized_view_)
     : IStorage(table_id_)
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(columns_);
+    if (!is_parameterized_view_)
+    {
+        /// If CREATE query is to create parameterized view, then we dont want to set columns
+        if (!query.isParameterizedView())
+            storage_metadata.setColumns(columns_);
+    }
+    else
+        storage_metadata.setColumns(columns_);
+
     storage_metadata.setComment(comment);
+    if (query.sql_security)
+        storage_metadata.setSQLSecurity(query.sql_security->as<ASTSQLSecurity &>());
 
     if (!query.select)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "SELECT query is not specified for {}", getName());
@@ -152,13 +164,13 @@ void StorageView::read(
 
     if (context->getSettingsRef().allow_experimental_analyzer)
     {
-        InterpreterSelectQueryAnalyzer interpreter(current_inner_query, getViewContext(context), options);
+        InterpreterSelectQueryAnalyzer interpreter(current_inner_query, getViewContext(context, storage_snapshot), options);
         interpreter.addStorageLimits(*query_info.storage_limits);
         query_plan = std::move(interpreter).extractQueryPlan();
     }
     else
     {
-        InterpreterSelectWithUnionQuery interpreter(current_inner_query, getViewContext(context), options, column_names);
+        InterpreterSelectWithUnionQuery interpreter(current_inner_query, getViewContext(context, storage_snapshot), options, column_names);
         interpreter.addStorageLimits(*query_info.storage_limits);
         interpreter.buildQueryPlan(query_plan);
     }
@@ -199,12 +211,12 @@ void StorageView::read(
 static ASTTableExpression * getFirstTableExpression(ASTSelectQuery & select_query)
 {
     if (!select_query.tables() || select_query.tables()->children.empty())
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: no table expression in view select AST");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "No table expression in view select AST");
 
     auto * select_element = select_query.tables()->children[0]->as<ASTTablesInSelectQueryElement>();
 
     if (!select_element->table_expression)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: incorrect table expression");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect table expression");
 
     return select_element->table_expression->as<ASTTableExpression>();
 }
@@ -235,7 +247,7 @@ void StorageView::replaceWithSubquery(ASTSelectQuery & outer_query, ASTPtr view_
 
         }
         if (!table_expression->database_and_table_name)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: incorrect table expression");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect table expression");
     }
 
     DatabaseAndTableWithAlias db_table(table_expression->database_and_table_name);
@@ -243,8 +255,7 @@ void StorageView::replaceWithSubquery(ASTSelectQuery & outer_query, ASTPtr view_
 
     view_name = table_expression->database_and_table_name;
     table_expression->database_and_table_name = {};
-    table_expression->subquery = std::make_shared<ASTSubquery>();
-    table_expression->subquery->children.push_back(view_query);
+    table_expression->subquery = std::make_shared<ASTSubquery>(view_query);
     table_expression->subquery->setAlias(alias);
 
     for (auto & child : table_expression->children)
@@ -263,7 +274,7 @@ ASTPtr StorageView::restoreViewName(ASTSelectQuery & select_query, const ASTPtr
     ASTTableExpression * table_expression = getFirstTableExpression(select_query);
 
     if (!table_expression->subquery)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: incorrect table expression");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Incorrect table expression");
 
     ASTPtr subquery = table_expression->subquery;
     table_expression->subquery = {};
@@ -275,6 +286,15 @@ ASTPtr StorageView::restoreViewName(ASTSelectQuery & select_query, const ASTPtr
     return subquery->children[0];
 }
 
+void StorageView::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /* local_context */) const
+{
+    for (const auto & command : commands)
+    {
+        if (!command.isCommentAlter() && command.type != AlterCommand::MODIFY_SQL_SECURITY)
+            throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Alter of type '{}' is not supported by storage {}", command.type, getName());
+    }
+}
+
 void registerStorageView(StorageFactory & factory)
 {
     factory.registerStorage("View", [](const StorageFactory::Arguments & args)
diff --git a/src/Storages/StorageView.h b/src/Storages/StorageView.h
index b8bf5585c0f..053fca807d5 100644
--- a/src/Storages/StorageView.h
+++ b/src/Storages/StorageView.h
@@ -16,7 +16,7 @@ public:
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
         const String & comment,
-        const bool is_parameterized_view_=false);
+        bool is_parameterized_view_ = false);
 
     std::string getName() const override { return "View"; }
     bool isView() const override { return true; }
@@ -26,6 +26,8 @@ public:
     bool supportsSampling() const override { return true; }
     bool supportsFinal() const override { return true; }
 
+    void checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const override;
+
     void read(
         QueryPlan & query_plan,
         const Names & column_names,
@@ -43,7 +45,7 @@ public:
         replaceWithSubquery(select_query, metadata_snapshot->getSelectQuery().inner_query->clone(), view_name, parameterized_view);
     }
 
-    static void replaceWithSubquery(ASTSelectQuery & outer_query, ASTPtr view_query, ASTPtr & view_name, const bool parameterized_view);
+    static void replaceWithSubquery(ASTSelectQuery & outer_query, ASTPtr view_query, ASTPtr & view_name, bool parameterized_view);
     static ASTPtr restoreViewName(ASTSelectQuery & select_query, const ASTPtr & view_name);
 
 protected:
diff --git a/src/Storages/StorageXDBC.cpp b/src/Storages/StorageXDBC.cpp
index a274b1ba4db..fb8fa2d6da4 100644
--- a/src/Storages/StorageXDBC.cpp
+++ b/src/Storages/StorageXDBC.cpp
@@ -45,7 +45,7 @@ StorageXDBC::StorageXDBC(
     , bridge_helper(bridge_helper_)
     , remote_database_name(remote_database_name_)
     , remote_table_name(remote_table_name_)
-    , log(&Poco::Logger::get("Storage" + bridge_helper->getName()))
+    , log(getLogger("Storage" + bridge_helper->getName()))
 {
     uri = bridge_helper->getMainURI().toString();
 }
@@ -59,7 +59,7 @@ std::vector<std::pair<std::string, std::string>> StorageXDBC::getReadURIParams(
     const Names & /* column_names */,
     const StorageSnapshotPtr & /*storage_snapshot*/,
     const SelectQueryInfo & /*query_info*/,
-    ContextPtr /*context*/,
+    const ContextPtr & /*context*/,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t max_block_size) const
 {
@@ -70,7 +70,7 @@ std::function<void(std::ostream &)> StorageXDBC::getReadPOSTDataCallback(
     const Names & column_names,
     const ColumnsDescription & columns_description,
     const SelectQueryInfo & query_info,
-    ContextPtr local_context,
+    const ContextPtr & local_context,
     QueryProcessingStage::Enum & /*processed_stage*/,
     size_t /*max_block_size*/) const
 {
diff --git a/src/Storages/StorageXDBC.h b/src/Storages/StorageXDBC.h
index fe678785dc2..7cec7266760 100644
--- a/src/Storages/StorageXDBC.h
+++ b/src/Storages/StorageXDBC.h
@@ -47,7 +47,7 @@ private:
     std::string remote_database_name;
     std::string remote_table_name;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::string getReadMethod() const override;
 
@@ -55,7 +55,7 @@ private:
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         const SelectQueryInfo & query_info,
-        ContextPtr context,
+        const ContextPtr & context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
@@ -63,7 +63,7 @@ private:
         const Names & column_names,
         const ColumnsDescription & columns_description,
         const SelectQueryInfo & query_info,
-        ContextPtr context,
+        const ContextPtr & context,
         QueryProcessingStage::Enum & processed_stage,
         size_t max_block_size) const override;
 
diff --git a/src/Storages/System/IStorageSystemOneBlock.cpp b/src/Storages/System/IStorageSystemOneBlock.cpp
new file mode 100644
index 00000000000..53399654c8d
--- /dev/null
+++ b/src/Storages/System/IStorageSystemOneBlock.cpp
@@ -0,0 +1,99 @@
+#include <Storages/System/IStorageSystemOneBlock.h>
+// #include <Core/NamesAndAliases.h>
+// #include <DataTypes/DataTypeString.h>
+// #include <Storages/ColumnsDescription.h>
+// #include <Storages/IStorage.h>
+#include <Storages/SelectQueryInfo.h>
+#include <Storages/System/getQueriedColumnsMaskAndHeader.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+
+namespace DB
+{
+
+class ReadFromSystemOneBlock : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromSystemOneBlock"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+    ReadFromSystemOneBlock(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<IStorageSystemOneBlock> storage_,
+        std::vector<UInt8> columns_mask_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , columns_mask(std::move(columns_mask_))
+    {
+    }
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+private:
+    std::shared_ptr<IStorageSystemOneBlock> storage;
+    std::vector<UInt8> columns_mask;
+    const ActionsDAG::Node * predicate = nullptr;
+};
+
+void IStorageSystemOneBlock::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*/)
+{
+    storage_snapshot->check(column_names);
+    Block sample_block = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtualsList());
+    std::vector<UInt8> columns_mask;
+
+    if (supportsColumnsMask())
+    {
+        auto [columns_mask_, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
+        columns_mask = std::move(columns_mask_);
+        sample_block = std::move(header);
+    }
+
+    auto this_ptr = std::static_pointer_cast<IStorageSystemOneBlock>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromSystemOneBlock>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(sample_block), std::move(this_ptr), std::move(columns_mask));
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromSystemOneBlock::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    const auto & sample_block = getOutputStream().header;
+    MutableColumns res_columns = sample_block.cloneEmptyColumns();
+    storage->fillData(res_columns, context, predicate, std::move(columns_mask));
+
+    UInt64 num_rows = res_columns.at(0)->size();
+    Chunk chunk(std::move(res_columns), num_rows);
+
+    pipeline.init(Pipe(std::make_shared<SourceFromSingleChunk>(sample_block, std::move(chunk))));
+}
+
+void ReadFromSystemOneBlock::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+        predicate = filter_actions_dag->getOutputs().at(0);
+}
+
+}
diff --git a/src/Storages/System/IStorageSystemOneBlock.h b/src/Storages/System/IStorageSystemOneBlock.h
index 3b2807965a4..a20434fd97e 100644
--- a/src/Storages/System/IStorageSystemOneBlock.h
+++ b/src/Storages/System/IStorageSystemOneBlock.h
@@ -1,13 +1,6 @@
 #pragma once
 
-#include <Core/NamesAndAliases.h>
-#include <DataTypes/DataTypeString.h>
-#include <Storages/ColumnsDescription.h>
 #include <Storages/IStorage.h>
-#include <Storages/SelectQueryInfo.h>
-#include <Storages/System/getQueriedColumnsMaskAndHeader.h>
-#include <Processors/Sources/SourceFromSingleChunk.h>
-#include <QueryPipeline/Pipe.h>
 
 namespace DB
 {
@@ -17,8 +10,8 @@ class Context;
 
 /** IStorageSystemOneBlock is base class for system tables whose all columns can be synchronously fetched.
   *
-  * Client class need to provide static method static NamesAndTypesList getNamesAndTypes() that will return list of column names and
-  * their types. IStorageSystemOneBlock during read will create result columns in same order as result of getNamesAndTypes
+  * Client class need to provide columns_description.
+  * IStorageSystemOneBlock during read will create result columns in same order as in columns_description
   * and pass it with fillData method.
   *
   * Client also must override fillData and fill result columns.
@@ -26,49 +19,32 @@ class Context;
   * If subclass want to support virtual columns, it should override getVirtuals method of IStorage interface.
   * IStorageSystemOneBlock will add virtuals columns at the end of result columns of fillData method.
   */
-template <typename Self>
 class IStorageSystemOneBlock : public IStorage
 {
 protected:
-    virtual void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const = 0;
+    virtual void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8> columns_mask) const = 0;
 
     virtual bool supportsColumnsMask() const { return false; }
 
+    friend class ReadFromSystemOneBlock;
+
 public:
-    explicit IStorageSystemOneBlock(const StorageID & table_id_) : IStorage(table_id_)
+    explicit IStorageSystemOneBlock(const StorageID & table_id_, ColumnsDescription columns_description) : IStorage(table_id_)
     {
         StorageInMemoryMetadata storage_metadata;
-        storage_metadata.setColumns(Self::getColumnsDescription());
+        storage_metadata.setColumns(std::move(columns_description));
         setInMemoryMetadata(storage_metadata);
     }
 
-    Pipe read(
+    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
-    {
-        storage_snapshot->check(column_names);
-        Block sample_block = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtuals());
-
-        if (supportsColumnsMask())
-        {
-            auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
-            query_info.columns_mask = std::move(columns_mask);
-            sample_block = std::move(header);
-        }
-
-        MutableColumns res_columns = sample_block.cloneEmptyColumns();
-        fillData(res_columns, context, query_info);
-
-        UInt64 num_rows = res_columns.at(0)->size();
-        Chunk chunk(std::move(res_columns), num_rows);
-
-        return Pipe(std::make_shared<SourceFromSingleChunk>(sample_block, std::move(chunk)));
-    }
+        size_t /*num_streams*/) override;
 
     bool isSystemStorage() const override { return true; }
 
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
index 8e32a137fcb..7f3994528a9 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.cpp
@@ -13,7 +13,7 @@ ColumnsDescription StorageSystemAggregateFunctionCombinators::getColumnsDescript
     };
 }
 
-void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemAggregateFunctionCombinators::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & combinators = AggregateFunctionCombinatorFactory::instance().getAllAggregateFunctionCombinators();
     for (const auto & pair : combinators)
diff --git a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
index 6f3f90b58af..45036043636 100644
--- a/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
+++ b/src/Storages/System/StorageSystemAggregateFunctionCombinators.h
@@ -6,10 +6,10 @@
 
 namespace DB
 {
-class StorageSystemAggregateFunctionCombinators final : public IStorageSystemOneBlock<StorageSystemAggregateFunctionCombinators>
+class StorageSystemAggregateFunctionCombinators final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 public:
diff --git a/src/Storages/System/StorageSystemAsyncLoader.cpp b/src/Storages/System/StorageSystemAsyncLoader.cpp
index c56a3c3ce78..a7ffa282429 100644
--- a/src/Storages/System/StorageSystemAsyncLoader.cpp
+++ b/src/Storages/System/StorageSystemAsyncLoader.cpp
@@ -74,7 +74,7 @@ ColumnsDescription StorageSystemAsyncLoader::getColumnsDescription()
     };
 }
 
-void StorageSystemAsyncLoader::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemAsyncLoader::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     TimePoint now = std::chrono::system_clock::now();
 
diff --git a/src/Storages/System/StorageSystemAsyncLoader.h b/src/Storages/System/StorageSystemAsyncLoader.h
index fa0ce11efe3..685db264a10 100644
--- a/src/Storages/System/StorageSystemAsyncLoader.h
+++ b/src/Storages/System/StorageSystemAsyncLoader.h
@@ -10,7 +10,7 @@ namespace DB
 class Context;
 
 /// system.asynchronous_loader table. Takes data from context.getAsyncLoader()
-class StorageSystemAsyncLoader final : public IStorageSystemOneBlock<StorageSystemAsyncLoader>
+class StorageSystemAsyncLoader final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemAsyncLoader"; }
@@ -20,7 +20,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.cpp b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
index 20ba4d1cdfb..27bdd8b0418 100644
--- a/src/Storages/System/StorageSystemAsynchronousInserts.cpp
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.cpp
@@ -30,11 +30,11 @@ ColumnsDescription StorageSystemAsynchronousInserts::getColumnsDescription()
     };
 }
 
-void StorageSystemAsynchronousInserts::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemAsynchronousInserts::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     using namespace std::chrono;
 
-    auto * insert_queue = context->getAsynchronousInsertQueue();
+    auto * insert_queue = context->tryGetAsynchronousInsertQueue();
     if (!insert_queue)
         return;
 
diff --git a/src/Storages/System/StorageSystemAsynchronousInserts.h b/src/Storages/System/StorageSystemAsynchronousInserts.h
index 891494ffbeb..748937cffb8 100644
--- a/src/Storages/System/StorageSystemAsynchronousInserts.h
+++ b/src/Storages/System/StorageSystemAsynchronousInserts.h
@@ -8,7 +8,7 @@ namespace DB
 /** Implements the system table `asynhronous_inserts`,
  *  which contains information about pending asynchronous inserts in queue.
 */
-class StorageSystemAsynchronousInserts final : public IStorageSystemOneBlock<StorageSystemAsynchronousInserts>
+class StorageSystemAsynchronousInserts final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemAsynchronousInserts"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
index 58940a7e52e..a54b577d72b 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.cpp
@@ -19,11 +19,11 @@ ColumnsDescription StorageSystemAsynchronousMetrics::getColumnsDescription()
 
 
 StorageSystemAsynchronousMetrics::StorageSystemAsynchronousMetrics(const StorageID & table_id_, const AsynchronousMetrics & async_metrics_)
-    : IStorageSystemOneBlock(table_id_), async_metrics(async_metrics_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription()), async_metrics(async_metrics_)
 {
 }
 
-void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemAsynchronousMetrics::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto async_metrics_values = async_metrics.getValues();
     for (const auto & name_value : async_metrics_values)
diff --git a/src/Storages/System/StorageSystemAsynchronousMetrics.h b/src/Storages/System/StorageSystemAsynchronousMetrics.h
index 026377c77a0..3543b7684d7 100644
--- a/src/Storages/System/StorageSystemAsynchronousMetrics.h
+++ b/src/Storages/System/StorageSystemAsynchronousMetrics.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements system table asynchronous_metrics, which allows to get values of periodically (asynchronously) updated metrics.
   */
-class StorageSystemAsynchronousMetrics final : public IStorageSystemOneBlock<StorageSystemAsynchronousMetrics>
+class StorageSystemAsynchronousMetrics final : public IStorageSystemOneBlock
 {
 public:
     StorageSystemAsynchronousMetrics(const StorageID & table_id_, const AsynchronousMetrics & async_metrics_);
@@ -24,7 +24,7 @@ private:
     const AsynchronousMetrics & async_metrics;
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemBackups.cpp b/src/Storages/System/StorageSystemBackups.cpp
index 17fb56e0a92..fec92229556 100644
--- a/src/Storages/System/StorageSystemBackups.cpp
+++ b/src/Storages/System/StorageSystemBackups.cpp
@@ -22,6 +22,7 @@ ColumnsDescription StorageSystemBackups::getColumnsDescription()
         {"id", std::make_shared<DataTypeString>(), "Operation ID, can be either passed via SETTINGS id=... or be randomly generated UUID."},
         {"name", std::make_shared<DataTypeString>(), "Operation name, a string like `Disk('backups', 'my_backup')`"},
         {"base_backup_name", std::make_shared<DataTypeString>(), "Base Backup Operation name, a string like `Disk('backups', 'my_base_backup')`"},
+        {"query_id", std::make_shared<DataTypeString>(), "Query ID of a query that started backup."},
         {"status", std::make_shared<DataTypeEnum8>(getBackupStatusEnumValues()), "Status of backup or restore operation."},
         {"error", std::make_shared<DataTypeString>(), "The error message if any."},
         {"start_time", std::make_shared<DataTypeDateTime>(), "The time when operation started."},
@@ -38,12 +39,13 @@ ColumnsDescription StorageSystemBackups::getColumnsDescription()
 }
 
 
-void StorageSystemBackups::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemBackups::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     size_t column_index = 0;
     auto & column_id = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_base_backup_name = assert_cast<ColumnString &>(*res_columns[column_index++]);
+    auto & column_query_id = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_status = assert_cast<ColumnInt8 &>(*res_columns[column_index++]);
     auto & column_error = assert_cast<ColumnString &>(*res_columns[column_index++]);
     auto & column_start_time = assert_cast<ColumnUInt32 &>(*res_columns[column_index++]);
@@ -62,6 +64,7 @@ void StorageSystemBackups::fillData(MutableColumns & res_columns, ContextPtr con
         column_id.insertData(info.id.data(), info.id.size());
         column_name.insertData(info.name.data(), info.name.size());
         column_base_backup_name.insertData(info.base_backup_name.data(), info.base_backup_name.size());
+        column_query_id.insertData(info.query_id.data(), info.query_id.size());
         column_status.insertValue(static_cast<Int8>(info.status));
         column_error.insertData(info.error_message.data(), info.error_message.size());
         column_start_time.insertValue(static_cast<UInt32>(std::chrono::system_clock::to_time_t(info.start_time)));
diff --git a/src/Storages/System/StorageSystemBackups.h b/src/Storages/System/StorageSystemBackups.h
index a081bd52b4c..48e03d12e18 100644
--- a/src/Storages/System/StorageSystemBackups.h
+++ b/src/Storages/System/StorageSystemBackups.h
@@ -7,7 +7,7 @@ namespace DB
 {
 
 /// Implements `grants` system table, which allows you to get information about grants.
-class StorageSystemBackups final : public IStorageSystemOneBlock<StorageSystemBackups>
+class StorageSystemBackups final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemBackups"; }
@@ -15,7 +15,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemBuildOptions.cpp b/src/Storages/System/StorageSystemBuildOptions.cpp
index c12935078af..a7144299eca 100644
--- a/src/Storages/System/StorageSystemBuildOptions.cpp
+++ b/src/Storages/System/StorageSystemBuildOptions.cpp
@@ -17,7 +17,7 @@ ColumnsDescription StorageSystemBuildOptions::getColumnsDescription()
     };
 }
 
-void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemBuildOptions::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (auto * it = auto_config_build; *it; it += 2)
     {
diff --git a/src/Storages/System/StorageSystemBuildOptions.h b/src/Storages/System/StorageSystemBuildOptions.h
index 7c0bbf6b5fd..dbe651d7513 100644
--- a/src/Storages/System/StorageSystemBuildOptions.h
+++ b/src/Storages/System/StorageSystemBuildOptions.h
@@ -11,10 +11,10 @@ class Context;
 
 /** System table "build_options" with many params used for clickhouse building
   */
-class StorageSystemBuildOptions final : public IStorageSystemOneBlock<StorageSystemBuildOptions>
+class StorageSystemBuildOptions final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemCertificates.cpp b/src/Storages/System/StorageSystemCertificates.cpp
index c372e4b32b0..5ec683e1784 100644
--- a/src/Storages/System/StorageSystemCertificates.cpp
+++ b/src/Storages/System/StorageSystemCertificates.cpp
@@ -19,19 +19,18 @@ namespace DB
 
 ColumnsDescription StorageSystemCertificates::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments.
     return ColumnsDescription
     {
-        {"version",         std::make_shared<DataTypeNumber<Int32>>()},
-        {"serial_number",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"signature_algo",  std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"issuer",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"not_before",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"not_after",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"subject",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"pkey_algo",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"path",            std::make_shared<DataTypeString>()},
-        {"default",         std::make_shared<DataTypeNumber<UInt8>>()}
+        {"version",         std::make_shared<DataTypeNumber<Int32>>(), "Version of the certificate. Values are 0 for v1, 1 for v2, 2 for v3."},
+        {"serial_number",   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Serial Number of the certificate assigned by the issuer."},
+        {"signature_algo",  std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Signature Algorithm - an algorithm used by the issuer to sign this certificate."},
+        {"issuer",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Issuer - an unique identifier for the Certificate Authority issuing this certificate."},
+        {"not_before",      std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The beginning of the time window when this certificate is valid."},
+        {"not_after",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The end of the time window when this certificate is valid."},
+        {"subject",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Subject - identifies the owner of the public key."},
+        {"pkey_algo",       std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Public Key Algorithm defines the algorithm the public key can be used with."},
+        {"path",            std::make_shared<DataTypeString>(), "Path to the file or directory containing this certificate."},
+        {"default",         std::make_shared<DataTypeNumber<UInt8>>(), "Certificate is in the default certificate location."}
     };
 }
 
@@ -169,7 +168,7 @@ static void enumCertificates(const std::string & dir, bool def, MutableColumns &
 
 #endif
 
-void StorageSystemCertificates::fillData([[maybe_unused]] MutableColumns & res_columns, ContextPtr/* context*/, const SelectQueryInfo &) const
+void StorageSystemCertificates::fillData([[maybe_unused]] MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
 #if USE_SSL
     const auto & ca_paths = Poco::Net::SSLManager::instance().defaultServerContext()->getCAPaths();
diff --git a/src/Storages/System/StorageSystemCertificates.h b/src/Storages/System/StorageSystemCertificates.h
index f8c8477c998..bc3fef83853 100644
--- a/src/Storages/System/StorageSystemCertificates.h
+++ b/src/Storages/System/StorageSystemCertificates.h
@@ -13,7 +13,7 @@ class Cluster;
   *  that allows to obtain information about available certificates
   *  and their sources.
   */
-class StorageSystemCertificates final : public IStorageSystemOneBlock<StorageSystemCertificates>
+class StorageSystemCertificates final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemCertificates"; }
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemClusters.cpp b/src/Storages/System/StorageSystemClusters.cpp
index 6172d4329cd..cb8d5caa50c 100644
--- a/src/Storages/System/StorageSystemClusters.cpp
+++ b/src/Storages/System/StorageSystemClusters.cpp
@@ -3,6 +3,7 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Storages/System/StorageSystemClusters.h>
 #include <Databases/DatabaseReplicated.h>
 
@@ -39,7 +40,7 @@ ColumnsDescription StorageSystemClusters::getColumnsDescription()
     return description;
 }
 
-void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemClusters::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & name_and_cluster : context->getClusters())
         writeCluster(res_columns, name_and_cluster, {});
diff --git a/src/Storages/System/StorageSystemClusters.h b/src/Storages/System/StorageSystemClusters.h
index 7b568641cb2..0f7c792261d 100644
--- a/src/Storages/System/StorageSystemClusters.h
+++ b/src/Storages/System/StorageSystemClusters.h
@@ -15,7 +15,7 @@ class Cluster;
   *  that allows to obtain information about available clusters
   *  (which may be specified in Distributed tables).
   */
-class StorageSystemClusters final : public IStorageSystemOneBlock<StorageSystemClusters>
+class StorageSystemClusters final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemClusters"; }
@@ -26,7 +26,7 @@ protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
     using NameAndCluster = std::pair<String, std::shared_ptr<Cluster>>;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
     static void writeCluster(MutableColumns & res_columns, const NameAndCluster & name_and_cluster, const std::vector<UInt8> & is_active);
 };
 
diff --git a/src/Storages/System/StorageSystemCollations.cpp b/src/Storages/System/StorageSystemCollations.cpp
index 2e5d11943af..5ef075e53be 100644
--- a/src/Storages/System/StorageSystemCollations.cpp
+++ b/src/Storages/System/StorageSystemCollations.cpp
@@ -1,6 +1,8 @@
 #include <Columns/Collator.h>
 #include <Storages/System/StorageSystemCollations.h>
+#include <Storages/ColumnsDescription.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeString.h>
 
 namespace DB
 {
@@ -14,7 +16,7 @@ ColumnsDescription StorageSystemCollations::getColumnsDescription()
     };
 }
 
-void StorageSystemCollations::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemCollations::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & [locale, lang]: AvailableCollationLocales::instance().getAvailableCollations())
     {
diff --git a/src/Storages/System/StorageSystemCollations.h b/src/Storages/System/StorageSystemCollations.h
index 1fc0ff0e024..449e0d8ac06 100644
--- a/src/Storages/System/StorageSystemCollations.h
+++ b/src/Storages/System/StorageSystemCollations.h
@@ -5,10 +5,10 @@
 namespace DB
 {
 
-class StorageSystemCollations final : public IStorageSystemOneBlock<StorageSystemCollations>
+class StorageSystemCollations final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemColumns.cpp b/src/Storages/System/StorageSystemColumns.cpp
index ad65f6f5476..8c6d29a3b70 100644
--- a/src/Storages/System/StorageSystemColumns.cpp
+++ b/src/Storages/System/StorageSystemColumns.cpp
@@ -16,6 +16,10 @@
 #include <Databases/IDatabase.h>
 #include <Processors/Sources/NullSource.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 
 namespace DB
@@ -28,27 +32,32 @@ StorageSystemColumns::StorageSystemColumns(const StorageID & table_id_)
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription(
     {
-        { "database",           std::make_shared<DataTypeString>() },
-        { "table",              std::make_shared<DataTypeString>() },
-        { "name",               std::make_shared<DataTypeString>() },
-        { "type",               std::make_shared<DataTypeString>() },
-        { "position",           std::make_shared<DataTypeUInt64>() },
-        { "default_kind",       std::make_shared<DataTypeString>() },
-        { "default_expression", std::make_shared<DataTypeString>() },
-        { "data_compressed_bytes",      std::make_shared<DataTypeUInt64>() },
-        { "data_uncompressed_bytes",    std::make_shared<DataTypeUInt64>() },
-        { "marks_bytes",                std::make_shared<DataTypeUInt64>() },
-        { "comment",                    std::make_shared<DataTypeString>() },
-        { "is_in_partition_key", std::make_shared<DataTypeUInt8>() },
-        { "is_in_sorting_key",   std::make_shared<DataTypeUInt8>() },
-        { "is_in_primary_key",   std::make_shared<DataTypeUInt8>() },
-        { "is_in_sampling_key",  std::make_shared<DataTypeUInt8>() },
-        { "compression_codec",   std::make_shared<DataTypeString>() },
-        { "character_octet_length",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
-        { "numeric_precision",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
-        { "numeric_precision_radix",    std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
-        { "numeric_scale",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
-        { "datetime_precision",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()) },
+        { "database",           std::make_shared<DataTypeString>(), "Database name."},
+        { "table",              std::make_shared<DataTypeString>(), "Table name."},
+        { "name",               std::make_shared<DataTypeString>(), "Column name."},
+        { "type",               std::make_shared<DataTypeString>(), "Column type."},
+        { "position",           std::make_shared<DataTypeUInt64>(), "Ordinal position of a column in a table starting with 1."},
+        { "default_kind",       std::make_shared<DataTypeString>(), "Expression type (DEFAULT, MATERIALIZED, ALIAS) for the default value, or an empty string if it is not defined."},
+        { "default_expression", std::make_shared<DataTypeString>(), "Expression for the default value, or an empty string if it is not defined."},
+        { "data_compressed_bytes",      std::make_shared<DataTypeUInt64>(), "The size of compressed data, in bytes."},
+        { "data_uncompressed_bytes",    std::make_shared<DataTypeUInt64>(), "The size of decompressed data, in bytes."},
+        { "marks_bytes",                std::make_shared<DataTypeUInt64>(), "The size of marks, in bytes."},
+        { "comment",                    std::make_shared<DataTypeString>(), "Comment on the column, or an empty string if it is not defined."},
+        { "is_in_partition_key", std::make_shared<DataTypeUInt8>(), "Flag that indicates whether the column is in the partition expression."},
+        { "is_in_sorting_key",   std::make_shared<DataTypeUInt8>(), "Flag that indicates whether the column is in the sorting key expression."},
+        { "is_in_primary_key",   std::make_shared<DataTypeUInt8>(), "Flag that indicates whether the column is in the primary key expression."},
+        { "is_in_sampling_key",  std::make_shared<DataTypeUInt8>(), "Flag that indicates whether the column is in the sampling key expression."},
+        { "compression_codec",   std::make_shared<DataTypeString>(), "Compression codec name."},
+        { "character_octet_length",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+            "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",          std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+            "Accuracy of approximate numeric data, exact numeric data, integer data, or monetary data. In ClickHouse it is bit width for integer types and decimal precision for Decimal types. Otherwise, the NULL value is returned."},
+        { "numeric_precision_radix",    std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+            "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",              std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+            "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",         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
+            "Decimal precision of DateTime64 data type. For other data types, the NULL value is returned."},
 
     }));
     setInMemoryMetadata(storage_metadata);
@@ -291,8 +300,51 @@ private:
     std::chrono::milliseconds lock_acquire_timeout;
 };
 
+class ReadFromSystemColumns : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromSystemColumns"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
-Pipe StorageSystemColumns::read(
+    ReadFromSystemColumns(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<StorageSystemColumns> storage_,
+        std::vector<UInt8> columns_mask_,
+        size_t max_block_size_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , columns_mask(std::move(columns_mask_))
+        , max_block_size(max_block_size_)
+    {
+    }
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+private:
+    std::shared_ptr<StorageSystemColumns> storage;
+    std::vector<UInt8> columns_mask;
+    const size_t max_block_size;
+    const ActionsDAG::Node * predicate = nullptr;
+};
+
+void ReadFromSystemColumns::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+        predicate = filter_actions_dag->getOutputs().at(0);
+}
+
+void StorageSystemColumns::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
@@ -306,9 +358,22 @@ Pipe StorageSystemColumns::read(
 
     auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
 
+
+    auto this_ptr = std::static_pointer_cast<StorageSystemColumns>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromSystemColumns>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(header), std::move(this_ptr), std::move(columns_mask), max_block_size);
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromSystemColumns::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
     Block block_to_filter;
     Storages storages;
     Pipes pipes;
+    auto header = getOutputStream().header;
 
     {
         /// Add `database` column.
@@ -338,12 +403,13 @@ Pipe StorageSystemColumns::read(
         block_to_filter.insert(ColumnWithTypeAndName(std::move(database_column_mut), std::make_shared<DataTypeString>(), "database"));
 
         /// Filter block with `database` column.
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, block_to_filter, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, block_to_filter, context);
 
         if (!block_to_filter.rows())
         {
-            pipes.emplace_back(std::make_shared<NullSource>(header));
-            return Pipe::unitePipes(std::move(pipes));
+            pipes.emplace_back(std::make_shared<NullSource>(std::move(header)));
+            pipeline.init(Pipe::unitePipes(std::move(pipes)));
+            return;
         }
 
         ColumnPtr & database_column = block_to_filter.getByName("database").column;
@@ -384,12 +450,13 @@ Pipe StorageSystemColumns::read(
     }
 
     /// Filter block with `database` and `table` columns.
-    VirtualColumnUtils::filterBlockWithQuery(query_info.query, block_to_filter, context);
+    VirtualColumnUtils::filterBlockWithPredicate(predicate, block_to_filter, context);
 
     if (!block_to_filter.rows())
     {
-        pipes.emplace_back(std::make_shared<NullSource>(header));
-        return Pipe::unitePipes(std::move(pipes));
+        pipes.emplace_back(std::make_shared<NullSource>(std::move(header)));
+        pipeline.init(Pipe::unitePipes(std::move(pipes)));
+        return;
     }
 
     ColumnPtr filtered_database_column = block_to_filter.getByName("database").column;
@@ -400,7 +467,7 @@ Pipe StorageSystemColumns::read(
             std::move(filtered_database_column), std::move(filtered_table_column),
             std::move(storages), context));
 
-    return Pipe::unitePipes(std::move(pipes));
+    pipeline.init(Pipe::unitePipes(std::move(pipes)));
 }
 
 }
diff --git a/src/Storages/System/StorageSystemColumns.h b/src/Storages/System/StorageSystemColumns.h
index 7b4b5dd8fb3..22b2541d93f 100644
--- a/src/Storages/System/StorageSystemColumns.h
+++ b/src/Storages/System/StorageSystemColumns.h
@@ -17,7 +17,8 @@ public:
 
     std::string getName() const override { return "SystemColumns"; }
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
diff --git a/src/Storages/System/StorageSystemContributors.cpp b/src/Storages/System/StorageSystemContributors.cpp
index 860a96c4388..f928337e1bd 100644
--- a/src/Storages/System/StorageSystemContributors.cpp
+++ b/src/Storages/System/StorageSystemContributors.cpp
@@ -17,7 +17,7 @@ ColumnsDescription StorageSystemContributors::getColumnsDescription()
     };
 }
 
-void StorageSystemContributors::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemContributors::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     std::vector<const char *> contributors;
     for (auto * it = auto_contributors; *it; ++it)
diff --git a/src/Storages/System/StorageSystemContributors.generated.cpp b/src/Storages/System/StorageSystemContributors.generated.cpp
index fbd5afd3274..6a66d8a7e19 100644
--- a/src/Storages/System/StorageSystemContributors.generated.cpp
+++ b/src/Storages/System/StorageSystemContributors.generated.cpp
@@ -12,6 +12,7 @@ const char * auto_contributors[] {
     "7vikpeculiar",
     "821008736@qq.com",
     "94rain",
+    "9611008+johnnymatthews@users.noreply.github.com",
     "AN",
     "ANDREI STAROVEROV",
     "AVMusorin",
@@ -102,6 +103,7 @@ const char * auto_contributors[] {
     "Alexey Tronov",
     "Alexey Vasiliev",
     "Alexey Zatelepin",
+    "AlexeyGrezz",
     "Alexsey Shestakov",
     "AlfVII",
     "Alfonso Martinez",
@@ -109,6 +111,7 @@ const char * auto_contributors[] {
     "Ali Demirci",
     "Aliaksandr Pliutau",
     "Aliaksandr Shylau",
+    "Aliaksei Khatskevich",
     "Alina Terekhova",
     "Amesaru",
     "Amila Welihinda",
@@ -176,9 +179,11 @@ const char * auto_contributors[] {
     "Antonio Bonuccelli",
     "Aram Peres",
     "Ariel Robaldo",
+    "Aris Tritas",
     "Arsen Hakobyan",
     "Arslan G",
     "ArtCorp",
+    "Artem Alperin",
     "Artem Andreenko",
     "Artem Gavrilov",
     "Artem Hnilov",
@@ -223,7 +228,9 @@ const char * auto_contributors[] {
     "Bill",
     "Bin Xie",
     "BiteTheDDDDt",
+    "Blacksmith",
     "BlahGeek",
+    "Blargian",
     "Bo Lu",
     "Bogdan",
     "Bogdan Voronin",
@@ -238,6 +245,7 @@ const char * auto_contributors[] {
     "Brendan Cox",
     "Brett Hoerner",
     "Brian Hunter",
+    "Brokenice0415",
     "Bulat Gaifullin",
     "Camden Cheek",
     "Camilo Sierra",
@@ -247,6 +255,7 @@ const char * auto_contributors[] {
     "Chang Chen",
     "Chao Ma",
     "Chao Wang",
+    "Charlie",
     "CheSema",
     "Chebarykov Pavel",
     "Chen Lixiang",
@@ -278,6 +287,7 @@ const char * auto_contributors[] {
     "Dale Mcdiarmid",
     "Dalitso Banda",
     "Dan Roscigno",
+    "Dan Wu",
     "DanRoscigno",
     "Dani Pozo",
     "Daniel Bershatsky",
@@ -286,6 +296,7 @@ const char * auto_contributors[] {
     "Daniel Kutenin",
     "Daniel Pozo Escalona",
     "Daniel Qin",
+    "Daniil Ivanik",
     "Daniil Rubin",
     "Danila Kutenin",
     "Daniël van Eeden",
@@ -373,6 +384,7 @@ const char * auto_contributors[] {
     "Evgeny Kruglov",
     "Evgeny Markov",
     "Ewout",
+    "Eyal Halpern Shalev",
     "FArthur-cmd",
     "FFFFFFFHHHHHHH",
     "FFish",
@@ -392,6 +404,7 @@ const char * auto_contributors[] {
     "Filipe Caixeta",
     "Filipp Ozinov",
     "Filippov Denis",
+    "Fille",
     "Flowyi",
     "Francisco Barón",
     "Frank Chen",
@@ -449,6 +462,7 @@ const char * auto_contributors[] {
     "Hongbin",
     "Hongbin Ma",
     "Hosun Lee",
+    "HowePa",
     "HuFuwang",
     "Hui Wang",
     "ILya Limarenko",
@@ -513,6 +527,7 @@ const char * auto_contributors[] {
     "Javi santana bot",
     "JaySon",
     "JaySon-Huang",
+    "Jayme Bird",
     "Jean Baptiste Favre",
     "Jeffrey Dang",
     "Jens Hoevenaars",
@@ -543,7 +558,9 @@ const char * auto_contributors[] {
     "Joris Giovannangeli",
     "Jose",
     "Josh Taylor",
+    "Joshua Hildred",
     "João Figueiredo",
+    "Juan Madurga",
     "Julia Kartseva",
     "Julian Gilyadov",
     "Julian Maicher",
@@ -571,6 +588,7 @@ const char * auto_contributors[] {
     "Kirill Danshin",
     "Kirill Ershov",
     "Kirill Malev",
+    "Kirill Nikiforov",
     "Kirill Shvakov",
     "KitKatKKK",
     "Koblikov Mihail",
@@ -613,11 +631,13 @@ const char * auto_contributors[] {
     "Lewinma",
     "Li Shuai",
     "Li Yin",
+    "Lino Uruñuela",
     "Lirikl",
     "Liu Cong",
     "LiuCong",
     "LiuNeng",
     "LiuYangkuan",
+    "LiuYuan",
     "Lloyd-Pottiger",
     "Lopatin Konstantin",
     "Lorenzo Mangani",
@@ -636,6 +656,7 @@ const char * auto_contributors[] {
     "MagiaGroz",
     "Maks Skorokhod",
     "Maksim",
+    "Maksim Alekseev",
     "Maksim Buren",
     "Maksim Fedotov",
     "Maksim Kita",
@@ -651,8 +672,10 @@ const char * auto_contributors[] {
     "Marek VavrusÌŒa",
     "Marek Vavruša",
     "Mariano Benítez Mulet",
+    "Marina Fathouat",
     "Mark Andreev",
     "Mark Frost",
+    "Mark Needham",
     "Mark Papadakis",
     "Mark Polokhov",
     "Maroun Maroun",
@@ -662,6 +685,7 @@ const char * auto_contributors[] {
     "Martijn Bakker",
     "Marvin Taschenberger",
     "Masha",
+    "Mathieu Rey",
     "Matthew Peveler",
     "Matwey V. Kornilov",
     "Max",
@@ -733,6 +757,7 @@ const char * auto_contributors[] {
     "Mingliang Pan",
     "Misko Lee",
     "Misz606",
+    "MochiXu",
     "Mohamad Fadhil",
     "Mohammad Arab Anvari",
     "Mohammad Hossein Sekhavat",
@@ -747,6 +772,7 @@ const char * auto_contributors[] {
     "N. Kolotov",
     "NIKITA MIKHAILOV",
     "Narek Galstyan",
+    "Nataly Merezhuk",
     "Natalya Chizhonkova",
     "Natasha Murashkina",
     "NeZeD [Mac Pro]",
@@ -756,6 +782,7 @@ const char * auto_contributors[] {
     "Nick-71",
     "Nickita",
     "Nickita Taranov",
+    "Nickolaj Jepsen",
     "Nickolay Yastrebov",
     "Nico Mandery",
     "Nico Piderman",
@@ -766,6 +793,7 @@ const char * auto_contributors[] {
     "Nikhil Raman",
     "Nikifor Seriakov",
     "Nikita",
+    "Nikita Fomichev",
     "Nikita Keba",
     "Nikita Lapkov",
     "Nikita Mikhailov",
@@ -776,15 +804,19 @@ const char * auto_contributors[] {
     "Nikita Tikhomirov",
     "Nikita Vasilev",
     "NikitaEvs",
+    "Nikolai Fedorovskikh",
     "Nikolai Kochetov",
     "Nikolai Sorokin",
     "Nikolay",
     "Nikolay Degterinsky",
+    "Nikolay Edigaryev",
     "Nikolay Kirsh",
+    "Nikolay Monkov",
     "Nikolay Semyachkin",
     "Nikolay Shcheglov",
     "Nikolay Vasiliev",
     "Nikolay Volosatov",
+    "Nikolay Yankin",
     "Nir Peled",
     "Nityananda Gohain",
     "Niu Zhaojie",
@@ -808,10 +840,13 @@ const char * auto_contributors[] {
     "Orkhan Zeynalli",
     "Oskar Wojciski",
     "OuO",
+    "Oxide Computer Company",
     "PHO",
     "Pablo Alegre",
     "Pablo Marcos",
+    "Pablo Musa",
     "Palash Goel",
+    "PapaToemmsn",
     "Paramtamtam",
     "Patrick Zippenfenig",
     "Paul Loyd",
@@ -835,7 +870,9 @@ const char * auto_contributors[] {
     "Persiyanov Dmitriy Andreevich",
     "Pervakov Grigorii",
     "Pervakov Grigory",
+    "Peter",
     "Petr Vasilev",
+    "Pham Anh Tuan",
     "Philip Hallstrom",
     "Philippe Ombredanne",
     "PigInCloud",
@@ -876,6 +913,7 @@ const char * auto_contributors[] {
     "Roman Bug",
     "Roman Chyrva",
     "Roman G",
+    "Roman Glinskikh",
     "Roman Heinrich",
     "Roman Lipovsky",
     "Roman Nikolaev",
@@ -886,6 +924,7 @@ const char * auto_contributors[] {
     "Roman Vasin",
     "Roman Vlasenko",
     "Roman Zhukov",
+    "Ronald Bradford",
     "Rory Crispin",
     "Roy Bellingan",
     "Ruslan",
@@ -947,10 +986,14 @@ const char * auto_contributors[] {
     "SevaCode",
     "Seyed Mehrshad Hosseini",
     "Shane Andrade",
+    "Shanfeng Pang",
     "Shani Elharrar",
+    "Shaun Struwig",
     "Sherry Wang",
     "Shoh Jahon",
     "Shri Bodas",
+    "Shuai li",
+    "Shubham Ranjan",
     "Sichen Zhao",
     "SiderZhang",
     "Sidorov Pavel",
@@ -1015,6 +1058,7 @@ const char * auto_contributors[] {
     "Tian Xinhui",
     "Tiaonmmn",
     "Tigran Khudaverdyan",
+    "Tim Liou",
     "Tim Windelschmidt",
     "Timur Magomedov",
     "Timur Solodovnikov",
@@ -1109,7 +1153,9 @@ const char * auto_contributors[] {
     "Wang Fenjin",
     "WangZengrui",
     "Wangyang Guo",
+    "Waterkin",
     "Weiqing Xu",
+    "William Schoeffel",
     "William Shallum",
     "Winter Zhang",
     "Xbitz29",
@@ -1130,6 +1176,7 @@ const char * auto_contributors[] {
     "Yağızcan Değirmenci",
     "Yegor Andreenko",
     "Yegor Levankov",
+    "YenchangChan",
     "Yingchun Lai",
     "Yingfan Chen",
     "Yinzheng-Sun",
@@ -1152,6 +1199,7 @@ const char * auto_contributors[] {
     "Yury Stankevich",
     "Yusuke Tanaka",
     "Zach Naimon",
+    "Zheng Miao",
     "ZhiYong Wang",
     "Zhichang Yu",
     "Zhichun Wu",
@@ -1213,6 +1261,7 @@ const char * auto_contributors[] {
     "attack204",
     "auxten",
     "avasiliev",
+    "avinzhang",
     "avogar",
     "avoiderboi",
     "avsharapov",
@@ -1220,6 +1269,7 @@ const char * auto_contributors[] {
     "awesomeleo",
     "bakam412",
     "bbkas",
+    "beetelbrox",
     "benamazing",
     "benbiti",
     "bgranvea",
@@ -1229,6 +1279,7 @@ const char * auto_contributors[] {
     "bkuschel",
     "blazerer",
     "bluebirddm",
+    "bluikko",
     "bo zeng",
     "bobrovskij artemij",
     "booknouse",
@@ -1253,6 +1304,7 @@ const char * auto_contributors[] {
     "chengy8934",
     "chenjian",
     "chenqi",
+    "chenwei",
     "chenxing-xc",
     "chenxing.xc",
     "chertus",
@@ -1269,12 +1321,14 @@ const char * auto_contributors[] {
     "cnmade",
     "comunodi",
     "congbaoyangrou",
+    "conicliu",
     "copperybean",
     "coraxster",
     "cwkyaoyao",
     "d.v.semenov",
     "dalei2019",
     "damozhaeva",
+    "danila-ermakov",
     "dankondr",
     "daoready",
     "darkkeks",
@@ -1290,6 +1344,7 @@ const char * auto_contributors[] {
     "dheerajathrey",
     "dimarub2000",
     "dinosaur",
+    "divanik",
     "divanorama",
     "dkxiaohei",
     "dmi-feo",
@@ -1301,6 +1356,7 @@ const char * auto_contributors[] {
     "ducle.canh",
     "eaxdev",
     "edef",
+    "edpyt",
     "eejoin",
     "egatov",
     "ekrasikov",
@@ -1414,10 +1470,12 @@ const char * auto_contributors[] {
     "jianmei zhang",
     "jinjunzh",
     "jiyoungyoooo",
+    "jktng",
     "jkuklis",
     "joelynch",
     "johanngan",
     "johnnymatthews",
+    "josh-hildred",
     "jsc0218",
     "jthmath",
     "jun won",
@@ -1535,11 +1593,13 @@ const char * auto_contributors[] {
     "miha-g",
     "mikael",
     "mikepop7",
+    "mikhnenko",
     "millb",
     "minhthucdao",
     "mlkui",
     "mnkonkova",
     "mo-avatar",
+    "mochi",
     "monchickey",
     "morty",
     "moscas",
@@ -1557,6 +1617,7 @@ const char * auto_contributors[] {
     "nautaa",
     "ndchikin",
     "nellicus",
+    "nemonlou",
     "neng.liu",
     "never lee",
     "ni1l",
@@ -1599,6 +1660,7 @@ const char * auto_contributors[] {
     "pufit",
     "pyos",
     "pzhdfy",
+    "qaziqarta",
     "qianlixiang",
     "qianmoQ",
     "qieqieplus",
@@ -1623,6 +1685,7 @@ const char * auto_contributors[] {
     "robot-clickhouse-ci-2",
     "robot-metrika-test",
     "rodrigargar",
+    "rogeryk",
     "roman",
     "romanzhukov",
     "rondo_1895",
@@ -1645,8 +1708,10 @@ const char * auto_contributors[] {
     "sev7e0",
     "sevirov",
     "sfod",
+    "shabroo",
     "shangshujie",
     "shedx",
+    "shuai-xu",
     "shuchaome",
     "shuyang",
     "sichenzhao",
@@ -1671,6 +1736,8 @@ const char * auto_contributors[] {
     "sundy-li",
     "sundyli",
     "sunlisheng",
+    "sunny",
+    "sunny19930321",
     "svladykin",
     "tai",
     "taichong",
@@ -1693,12 +1760,15 @@ const char * auto_contributors[] {
     "tiger.yan",
     "timfursov",
     "tison",
+    "tomershafir",
     "tomtana",
     "topvisor",
     "tpanetti",
     "turbo jason",
     "tyrionhuang",
     "ubuntu",
+    "una",
+    "unashi",
     "unbyte",
     "unegare",
     "unknown",
@@ -1812,6 +1882,7 @@ const char * auto_contributors[] {
     "Иванов Евгений",
     "Иль� И�аев",
     "Иль� Коргун",
+    "Кирилл Гарбар",
     "Коренберг Марк",
     "Коренберг ☢�  Марк",
     "Павел Литвиненко",
@@ -1840,6 +1911,7 @@ const char * auto_contributors[] {
     "董海镔",
     "�焊忠",
     "谢磊",
+    "豪肥肥",
     "贾顺�(Jarvis)",
     "郭�龙",
     "陈�玉",
diff --git a/src/Storages/System/StorageSystemContributors.h b/src/Storages/System/StorageSystemContributors.h
index ed983c5e61f..f8d082542d2 100644
--- a/src/Storages/System/StorageSystemContributors.h
+++ b/src/Storages/System/StorageSystemContributors.h
@@ -9,10 +9,10 @@ class Context;
 
 /** System table "contributors" with list of clickhouse contributors
   */
-class StorageSystemContributors final : public IStorageSystemOneBlock<StorageSystemContributors>
+class StorageSystemContributors final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemCurrentRoles.cpp b/src/Storages/System/StorageSystemCurrentRoles.cpp
index 88bdf088175..bfa3a7c2e18 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.cpp
+++ b/src/Storages/System/StorageSystemCurrentRoles.cpp
@@ -22,7 +22,7 @@ ColumnsDescription StorageSystemCurrentRoles::getColumnsDescription()
 }
 
 
-void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemCurrentRoles::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto roles_info = context->getRolesInfo();
     auto user = context->getUser();
diff --git a/src/Storages/System/StorageSystemCurrentRoles.h b/src/Storages/System/StorageSystemCurrentRoles.h
index 4cc9b11d3f4..db1245e0ea7 100644
--- a/src/Storages/System/StorageSystemCurrentRoles.h
+++ b/src/Storages/System/StorageSystemCurrentRoles.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `current_roles` system table, which allows you to get information about current roles.
-class StorageSystemCurrentRoles final : public IStorageSystemOneBlock<StorageSystemCurrentRoles>
+class StorageSystemCurrentRoles final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemCurrentRoles"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
index c133a1b597c..635686780a0 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.cpp
@@ -78,7 +78,8 @@ static String clusterNameFromDDLQuery(ContextPtr context, const DDLTask & task)
     ParserQuery parser_query(end, settings.allow_settings_after_format_in_insert);
     ASTPtr query = parseQuery(parser_query, begin, end, description,
                               settings.max_query_size,
-                              settings.max_parser_depth);
+                              settings.max_parser_depth,
+                              settings.max_parser_backtracks);
 
     String cluster_name;
     if (const auto * query_on_cluster = dynamic_cast<const ASTQueryWithOnCluster *>(query.get()))
@@ -204,7 +205,7 @@ static void fillStatusColumns(MutableColumns & res_columns, size_t & col,
 }
 
 
-void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemDDLWorkerQueue::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto& ddl_worker = context->getDDLWorker();
     fs::path ddl_zookeeper_path = ddl_worker.getQueueDir();
diff --git a/src/Storages/System/StorageSystemDDLWorkerQueue.h b/src/Storages/System/StorageSystemDDLWorkerQueue.h
index 871bb706f94..eaffb488322 100644
--- a/src/Storages/System/StorageSystemDDLWorkerQueue.h
+++ b/src/Storages/System/StorageSystemDDLWorkerQueue.h
@@ -11,10 +11,10 @@ class Context;
 
 /** System table "distributed_ddl_queue" with list of queries that are currently in the DDL worker queue.
   */
-class StorageSystemDDLWorkerQueue final : public IStorageSystemOneBlock<StorageSystemDDLWorkerQueue>
+class StorageSystemDDLWorkerQueue final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDNSCache.cpp b/src/Storages/System/StorageSystemDNSCache.cpp
new file mode 100644
index 00000000000..6fb83597908
--- /dev/null
+++ b/src/Storages/System/StorageSystemDNSCache.cpp
@@ -0,0 +1,61 @@
+#include <Access/ContextAccess.h>
+#include <Interpreters/Context.h>
+#include <Common/DNSResolver.h>
+#include <DataTypes/DataTypeDateTime.h>
+#include <DataTypes/DataTypeEnum.h>
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include "StorageSystemDNSCache.h"
+
+namespace DB
+{
+
+static DataTypePtr getIPFamilyEnumType()
+{
+    return std::make_shared<DataTypeEnum8>(
+    DataTypeEnum8::Values
+        {
+            {"IPv4",           static_cast<Int8>(Poco::Net::AddressFamily::IPv4)},
+            {"IPv6",           static_cast<Int8>(Poco::Net::AddressFamily::IPv6)},
+            {"UNIX_LOCAL",     static_cast<Int8>(Poco::Net::AddressFamily::UNIX_LOCAL)},
+        });
+}
+
+ColumnsDescription StorageSystemDNSCache::getColumnsDescription()
+{
+    return ColumnsDescription
+        {
+            {"hostname",           std::make_shared<DataTypeString>(), "Hostname."},
+            {"ip_address",         std::make_shared<DataTypeString>(), "IP address."},
+            {"ip_family",          getIPFamilyEnumType(), "IP address family."},
+            {"cached_at",          std::make_shared<DataTypeDateTime>(), "Record cached timestamp."},
+        };
+}
+
+void StorageSystemDNSCache::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
+{
+    using HostIPPair = std::pair<std::string, std::string>;
+    std::unordered_set<HostIPPair, boost::hash<std::pair<std::string, std::string>>> reported_elements;
+
+    for (const auto & [hostname, entry] : DNSResolver::instance().cacheEntries())
+    {
+        for (const auto &address : entry.addresses)
+        {
+            std::string ip = address.toString();
+
+            // Cache might report the same ip address multiple times. Report only one of them.
+            if (reported_elements.contains(HostIPPair(hostname, ip)))
+                continue;
+
+            reported_elements.insert(HostIPPair(hostname, ip));
+
+            size_t i = 0;
+            res_columns[i++]->insert(hostname);
+            res_columns[i++]->insert(ip);
+            res_columns[i++]->insert(address.family());
+            res_columns[i++]->insert(static_cast<UInt32>(std::chrono::system_clock::to_time_t(entry.cached_at)));
+        }
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemDNSCache.h b/src/Storages/System/StorageSystemDNSCache.h
new file mode 100644
index 00000000000..dd24d2f35f6
--- /dev/null
+++ b/src/Storages/System/StorageSystemDNSCache.h
@@ -0,0 +1,25 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class Context;
+
+/// system.dns_cache table.
+class StorageSystemDNSCache final : public IStorageSystemOneBlock
+{
+public:
+    std::string getName() const override { return "SystemDNSCache"; }
+
+    static ColumnsDescription getColumnsDescription();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemDashboards.cpp b/src/Storages/System/StorageSystemDashboards.cpp
index 7e545757129..23d8fcfc481 100644
--- a/src/Storages/System/StorageSystemDashboards.cpp
+++ b/src/Storages/System/StorageSystemDashboards.cpp
@@ -22,196 +22,333 @@ String trim(const char * text)
     return String(view);
 }
 
-void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemDashboards::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     static const std::vector<std::map<String, String>> dashboards
     {
+        /// Default dashboard for self-managed ClickHouse
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Queries/second" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_Query)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "CPU Usage (cores)" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_OSCPUVirtualTimeMicroseconds) / 1000000
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Queries Running" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(CurrentMetric_Query)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Merges Running" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(CurrentMetric_Merge)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Selected Bytes/second" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_SelectedBytes)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "IO Wait" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_OSIOWaitMicroseconds) / 1000000
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "CPU Wait" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_OSCPUWaitMicroseconds) / 1000000
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "OS CPU Usage (Userspace)" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)
-FROM system.asynchronous_metric_log
+FROM merge('system', '^asynchronous_metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} AND metric = 'OSUserTimeNormalized'
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "OS CPU Usage (Kernel)" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)
-FROM system.asynchronous_metric_log
+FROM merge('system', '^asynchronous_metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} AND metric = 'OSSystemTimeNormalized'
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Read From Disk" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_OSReadBytes)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Read From Filesystem" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_OSReadChars)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Memory (tracked)" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(CurrentMetric_MemoryTracking)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Load Average (15 minutes)" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)
-FROM system.asynchronous_metric_log
+FROM merge('system', '^asynchronous_metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} AND metric = 'LoadAverage15'
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Selected Rows/second" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_SelectedRows)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Inserted Rows/second" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(ProfileEvent_InsertedRows)
-FROM system.metric_log
+FROM merge('system', '^metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Total MergeTree Parts" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)
-FROM system.asynchronous_metric_log
+FROM merge('system', '^asynchronous_metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} AND metric = 'TotalPartsOfMergeTreeTables'
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
         },
         {
-            { "dashboard", "overview" },
+            { "dashboard", "Overview" },
             { "title", "Max Parts For Partition" },
             { "query", trim(R"EOQ(
 SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, max(value)
-FROM system.asynchronous_metric_log
+FROM merge('system', '^asynchronous_metric_log')
 WHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32} AND metric = 'MaxPartCountForPartition'
 GROUP BY t
 ORDER BY t WITH FILL STEP {rounding:UInt32}
 )EOQ") }
+        },
+        /// Default dashboard for ClickHouse Cloud
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Queries/second" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_Query) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "CPU Usage (cores)" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(metric) / 1000000\nFROM (\n  SELECT event_time, sum(ProfileEvent_OSCPUVirtualTimeMicroseconds) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32} GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Queries Running" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(CurrentMetric_Query) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Merges Running" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(CurrentMetric_Merge) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Selected Bytes/second" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_SelectedBytes) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "IO Wait (local fs)" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_OSIOWaitMicroseconds) / 1000000 AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "S3 read wait" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_ReadBufferFromS3Microseconds) / 1000000 AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "S3 read errors/sec" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_ReadBufferFromS3RequestsErrors) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "CPU Wait" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_OSCPUWaitMicroseconds) / 1000000 AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "OS CPU Usage (Userspace, normalized)" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)\nFROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\nWHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}\nAND metric = 'OSUserTimeNormalized'\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "OS CPU Usage (Kernel, normalized)" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)\nFROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\nWHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}\nAND metric = 'OSSystemTimeNormalized'\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Read From Disk (bytes/sec)" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_OSReadBytes) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Read From Filesystem (bytes/sec)" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_OSReadChars) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Memory (tracked, bytes)" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(CurrentMetric_MemoryTracking) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Load Average (15 minutes)" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)\nFROM (\n  SELECT event_time, sum(value) AS value\n  FROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n    AND metric = 'LoadAverage15'\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Selected Rows/sec" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_SelectedRows) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Inserted Rows/sec" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_InsertedRows) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Total MergeTree Parts" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, max(value)\nFROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\nWHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}\nAND metric = 'TotalPartsOfMergeTreeTables'\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Max Parts For Partition" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, max(value)\nFROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\nWHERE event_date >= toDate(now() - {seconds:UInt32}) AND event_time >= now() - {seconds:UInt32}\nAND metric = 'MaxPartCountForPartition'\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Read From S3 (bytes/sec)" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_ReadBufferFromS3Bytes) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Filesystem Cache Size" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(CurrentMetric_FilesystemCacheSize) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Disk S3 write req/sec" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_DiskS3PutObject + ProfileEvent_DiskS3UploadPart + ProfileEvent_DiskS3CreateMultipartUpload + ProfileEvent_DiskS3CompleteMultipartUpload) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Disk S3 read req/sec" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_DiskS3GetObject + ProfileEvent_DiskS3HeadObject + ProfileEvent_DiskS3ListObjects) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "FS cache hit rate" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, sum(ProfileEvent_CachedReadBufferReadFromCacheBytes) / (sum(ProfileEvent_CachedReadBufferReadFromCacheBytes) + sum(ProfileEvent_CachedReadBufferReadFromSourceBytes)) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Page cache hit rate" },
+            { "query", "SELECT \n  toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t,\n  avg(metric)\nFROM (\n  SELECT event_time, greatest(0, (sum(ProfileEvent_OSReadChars) - sum(ProfileEvent_OSReadBytes)) / (sum(ProfileEvent_OSReadChars) + sum(ProfileEvent_ReadBufferFromS3Bytes))) AS metric \n  FROM clusterAllReplicas(default, merge('system', '^metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Network receive bytes/sec" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)\nFROM (\n  SELECT event_time, sum(value) AS value\n  FROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n    AND metric LIKE 'NetworkReceiveBytes%'\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
+        },
+        {
+            { "dashboard", "Cloud overview" },
+            { "title", "Network send bytes/sec" },
+            { "query", "SELECT toStartOfInterval(event_time, INTERVAL {rounding:UInt32} SECOND)::INT AS t, avg(value)\nFROM (\n  SELECT event_time, sum(value) AS value\n  FROM clusterAllReplicas(default, merge('system', '^asynchronous_metric_log'))\n  WHERE event_date >= toDate(now() - {seconds:UInt32})\n    AND event_time >= now() - {seconds:UInt32}\n    AND metric LIKE 'NetworkSendBytes%'\n  GROUP BY event_time)\nGROUP BY t\nORDER BY t WITH FILL STEP {rounding:UInt32} SETTINGS skip_unavailable_shards = 1" }
         }
     };
 
diff --git a/src/Storages/System/StorageSystemDashboards.h b/src/Storages/System/StorageSystemDashboards.h
index 83a8664ad27..f3e957e06c5 100644
--- a/src/Storages/System/StorageSystemDashboards.h
+++ b/src/Storages/System/StorageSystemDashboards.h
@@ -12,7 +12,7 @@ namespace DB
 class Context;
 
 
-class StorageSystemDashboards final : public IStorageSystemOneBlock<StorageSystemDashboards>
+class StorageSystemDashboards final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemDashboards"; }
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.cpp b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
index 0c4eb197efd..2afc03d0e5e 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.cpp
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.cpp
@@ -12,7 +12,10 @@
 #include <Parsers/ASTFunction.h>
 #include <Parsers/queryToString.h>
 #include <Processors/ISource.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <QueryPipeline/Pipe.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 
 
 namespace DB
@@ -23,16 +26,16 @@ StorageSystemDataSkippingIndices::StorageSystemDataSkippingIndices(const Storage
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription(
         {
-            { "database", std::make_shared<DataTypeString>() },
-            { "table", std::make_shared<DataTypeString>() },
-            { "name", std::make_shared<DataTypeString>() },
-            { "type", std::make_shared<DataTypeString>() },
-            { "type_full", std::make_shared<DataTypeString>() },
-            { "expr", std::make_shared<DataTypeString>() },
-            { "granularity", std::make_shared<DataTypeUInt64>() },
-            { "data_compressed_bytes", std::make_shared<DataTypeUInt64>() },
-            { "data_uncompressed_bytes", std::make_shared<DataTypeUInt64>() },
-            { "marks", std::make_shared<DataTypeUInt64>()}
+            { "database", std::make_shared<DataTypeString>(), "Database name."},
+            { "table", std::make_shared<DataTypeString>(), "Table name."},
+            { "name", std::make_shared<DataTypeString>(), "Index name."},
+            { "type", std::make_shared<DataTypeString>(), "Index type."},
+            { "type_full", std::make_shared<DataTypeString>(), "Index type expression from create statement."},
+            { "expr", std::make_shared<DataTypeString>(), "Expression for the index calculation."},
+            { "granularity", std::make_shared<DataTypeUInt64>(), "The number of granules in the block."},
+            { "data_compressed_bytes", std::make_shared<DataTypeUInt64>(), "The size of compressed data, in bytes."},
+            { "data_uncompressed_bytes", std::make_shared<DataTypeUInt64>(), "The size of decompressed data, in bytes."},
+            { "marks", std::make_shared<DataTypeUInt64>(), "The size of marks, in bytes."}
         }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -128,8 +131,10 @@ protected:
                     // 'type_full' column
                     if (column_mask[src_index++])
                     {
-                        if (auto * expression = index.definition_ast->as<ASTIndexDeclaration>(); expression && expression->type)
-                            res_columns[res_index++]->insert(queryToString(*expression->type));
+                        auto * expression = index.definition_ast->as<ASTIndexDeclaration>();
+                        auto index_type = expression ? expression->getType() : nullptr;
+                        if (index_type)
+                            res_columns[res_index++]->insert(queryToString(*index_type));
                         else
                             res_columns[res_index++]->insertDefault();
                     }
@@ -176,7 +181,51 @@ private:
     DatabaseTablesIteratorPtr tables_it;
 };
 
-Pipe StorageSystemDataSkippingIndices::read(
+class ReadFromSystemDataSkippingIndices : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromSystemDataSkippingIndices"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+
+    ReadFromSystemDataSkippingIndices(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<StorageSystemDataSkippingIndices> storage_,
+        std::vector<UInt8> columns_mask_,
+        size_t max_block_size_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , columns_mask(std::move(columns_mask_))
+        , max_block_size(max_block_size_)
+    {
+    }
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+private:
+    std::shared_ptr<StorageSystemDataSkippingIndices> storage;
+    std::vector<UInt8> columns_mask;
+    const size_t max_block_size;
+    const ActionsDAG::Node * predicate = nullptr;
+};
+
+void ReadFromSystemDataSkippingIndices::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+        predicate = filter_actions_dag->getOutputs().at(0);
+}
+
+void StorageSystemDataSkippingIndices::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
@@ -190,6 +239,17 @@ Pipe StorageSystemDataSkippingIndices::read(
 
     auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
 
+    auto this_ptr = std::static_pointer_cast<StorageSystemDataSkippingIndices>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromSystemDataSkippingIndices>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(header), std::move(this_ptr), std::move(columns_mask), max_block_size);
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromSystemDataSkippingIndices::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
     MutableColumnPtr column = ColumnString::create();
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
@@ -207,11 +267,11 @@ Pipe StorageSystemDataSkippingIndices::read(
 
     /// Condition on "database" in a query acts like an index.
     Block block { ColumnWithTypeAndName(std::move(column), std::make_shared<DataTypeString>(), "database") };
-    VirtualColumnUtils::filterBlockWithQuery(query_info.query, block, context);
+    VirtualColumnUtils::filterBlockWithPredicate(predicate, block, context);
 
     ColumnPtr & filtered_databases = block.getByPosition(0).column;
-    return Pipe(std::make_shared<DataSkippingIndicesSource>(
-        std::move(columns_mask), std::move(header), max_block_size, std::move(filtered_databases), context));
+    pipeline.init(Pipe(std::make_shared<DataSkippingIndicesSource>(
+        std::move(columns_mask), getOutputStream().header, max_block_size, std::move(filtered_databases), context)));
 }
 
 }
diff --git a/src/Storages/System/StorageSystemDataSkippingIndices.h b/src/Storages/System/StorageSystemDataSkippingIndices.h
index 8a1e8c159b4..8bf1da98368 100644
--- a/src/Storages/System/StorageSystemDataSkippingIndices.h
+++ b/src/Storages/System/StorageSystemDataSkippingIndices.h
@@ -14,7 +14,8 @@ public:
 
     std::string getName() const override { return "SystemDataSkippingIndices"; }
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.cpp b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
index 821a43ed530..da607ade410 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.cpp
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.cpp
@@ -17,7 +17,7 @@ ColumnsDescription StorageSystemDataTypeFamilies::getColumnsDescription()
     };
 }
 
-void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemDataTypeFamilies::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & factory = DataTypeFactory::instance();
     auto names = factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemDataTypeFamilies.h b/src/Storages/System/StorageSystemDataTypeFamilies.h
index 2cb834f6931..6322c3bcfdd 100644
--- a/src/Storages/System/StorageSystemDataTypeFamilies.h
+++ b/src/Storages/System/StorageSystemDataTypeFamilies.h
@@ -5,10 +5,10 @@
 namespace DB
 {
 
-class StorageSystemDataTypeFamilies final : public IStorageSystemOneBlock<StorageSystemDataTypeFamilies>
+class StorageSystemDataTypeFamilies final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDatabaseEngines.cpp b/src/Storages/System/StorageSystemDatabaseEngines.cpp
index 514ca6d0ab3..59ba60fa871 100644
--- a/src/Storages/System/StorageSystemDatabaseEngines.cpp
+++ b/src/Storages/System/StorageSystemDatabaseEngines.cpp
@@ -14,7 +14,7 @@ ColumnsDescription StorageSystemDatabaseEngines::getColumnsDescription()
     };
 }
 
-void StorageSystemDatabaseEngines::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemDatabaseEngines::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & [engine, _] : DatabaseFactory::instance().getDatabaseEngines())
     {
diff --git a/src/Storages/System/StorageSystemDatabaseEngines.h b/src/Storages/System/StorageSystemDatabaseEngines.h
index 16b517c91e6..3af13598c17 100644
--- a/src/Storages/System/StorageSystemDatabaseEngines.h
+++ b/src/Storages/System/StorageSystemDatabaseEngines.h
@@ -6,10 +6,10 @@
 namespace DB
 {
 
-class StorageSystemDatabaseEngines final : public IStorageSystemOneBlock<StorageSystemDatabaseEngines>
+class StorageSystemDatabaseEngines final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemDatabases.cpp b/src/Storages/System/StorageSystemDatabases.cpp
index 0ffed6c9771..2351c3c6a2a 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/DatabaseCatalog.h>
 #include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Access/ContextAccess.h>
 #include <Storages/System/StorageSystemDatabases.h>
@@ -54,7 +55,7 @@ static String getEngineFull(const ContextPtr & ctx, const DatabasePtr & database
             return {};
 
         guard.reset();
-        LOG_TRACE(&Poco::Logger::get("StorageSystemDatabases"), "Failed to lock database {} ({}), will retry", name, database->getUUID());
+        LOG_TRACE(getLogger("StorageSystemDatabases"), "Failed to lock database {} ({}), will retry", name, database->getUUID());
     }
 
     ASTPtr ast = database->getCreateDatabaseQuery();
@@ -72,7 +73,7 @@ static String getEngineFull(const ContextPtr & ctx, const DatabasePtr & database
     return engine_full;
 }
 
-static ColumnPtr getFilteredDatabases(const Databases & databases, const SelectQueryInfo & query_info, ContextPtr context)
+static ColumnPtr getFilteredDatabases(const Databases & databases, const ActionsDAG::Node * predicate, ContextPtr context)
 {
     MutableColumnPtr name_column = ColumnString::create();
     MutableColumnPtr engine_column = ColumnString::create();
@@ -94,17 +95,17 @@ static ColumnPtr getFilteredDatabases(const Databases & databases, const SelectQ
         ColumnWithTypeAndName(std::move(engine_column), std::make_shared<DataTypeString>(), "engine"),
         ColumnWithTypeAndName(std::move(uuid_column), std::make_shared<DataTypeUUID>(), "uuid")
     };
-    VirtualColumnUtils::filterBlockWithQuery(query_info.query, block, context);
+    VirtualColumnUtils::filterBlockWithPredicate(predicate, block, context);
     return block.getByPosition(0).column;
 }
 
-void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8> columns_mask) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_DATABASES);
 
     const auto databases = DatabaseCatalog::instance().getDatabases();
-    ColumnPtr filtered_databases_column = getFilteredDatabases(databases, query_info, context);
+    ColumnPtr filtered_databases_column = getFilteredDatabases(databases, predicate, context);
 
     for (size_t i = 0; i < filtered_databases_column->size(); ++i)
     {
@@ -120,7 +121,6 @@ void StorageSystemDatabases::fillData(MutableColumns & res_columns, ContextPtr c
 
         size_t src_index = 0;
         size_t res_index = 0;
-        const auto & columns_mask = query_info.columns_mask;
         if (columns_mask[src_index++])
             res_columns[res_index++]->insert(database_name);
         if (columns_mask[src_index++])
diff --git a/src/Storages/System/StorageSystemDatabases.h b/src/Storages/System/StorageSystemDatabases.h
index 2fd9ccdc970..fa55f0aea32 100644
--- a/src/Storages/System/StorageSystemDatabases.h
+++ b/src/Storages/System/StorageSystemDatabases.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `databases` system table, which allows you to get information about all databases.
   */
-class StorageSystemDatabases final : public IStorageSystemOneBlock<StorageSystemDatabases>
+class StorageSystemDatabases final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override
@@ -26,7 +26,7 @@ protected:
 
     bool supportsColumnsMask() const override { return true; }
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8> columns_mask) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDetachedParts.cpp b/src/Storages/System/StorageSystemDetachedParts.cpp
index a9cd5f2610a..ebcd8d63a52 100644
--- a/src/Storages/System/StorageSystemDetachedParts.cpp
+++ b/src/Storages/System/StorageSystemDetachedParts.cpp
@@ -4,14 +4,18 @@
 #include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeDateTime.h>
 #include <DataTypes/DataTypeNullable.h>
+#include <DataTypes/DataTypeUUID.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/DataPartStorageOnDiskFull.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 #include <Storages/System/getQueriedColumnsMaskAndHeader.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/Pipe.h>
 #include <IO/SharedThreadPools.h>
-#include <Interpreters/threadPoolCallbackRunner.h>
+#include <Common/threadPoolCallbackRunner.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/QueryPlan/QueryPlan.h>
 
 #include <mutex>
 
@@ -269,23 +273,82 @@ StorageSystemDetachedParts::StorageSystemDetachedParts(const StorageID & table_i
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription{{
-        {"database",         std::make_shared<DataTypeString>()},
-        {"table",            std::make_shared<DataTypeString>()},
-        {"partition_id",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"name",             std::make_shared<DataTypeString>()},
-        {"bytes_on_disk",    std::make_shared<DataTypeUInt64>()},
-        {"modification_time",std::make_shared<DataTypeDateTime>()},
-        {"disk",             std::make_shared<DataTypeString>()},
-        {"path",             std::make_shared<DataTypeString>()},
-        {"reason",           std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())},
-        {"min_block_number", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt64>())},
-        {"max_block_number", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt64>())},
-        {"level",            std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt32>())},
+        {"database",         std::make_shared<DataTypeString>(), "The name of the database this part belongs to."},
+        {"table",            std::make_shared<DataTypeString>(), "The name of the table this part belongs to."},
+        {"partition_id",     std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The identifier of the partition this part belongs to."},
+        {"name",             std::make_shared<DataTypeString>(), "The name of the part."},
+        {"bytes_on_disk",    std::make_shared<DataTypeUInt64>(), "Total size of all the data part files in bytes."},
+        {"modification_time",std::make_shared<DataTypeDateTime>(), "The time the directory with the data part was modified. This usually corresponds to the time when detach happened."},
+        {"disk",             std::make_shared<DataTypeString>(), "The name of the disk that stores this data part."},
+        {"path",             std::make_shared<DataTypeString>(), "The path of the disk to the file of this data part."},
+        {"reason",           std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The explanation why this part was detached."},
+        {"min_block_number", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt64>()), "The minimum number of data parts that make up the current part after merging."},
+        {"max_block_number", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeInt64>()), "The maximum number of data parts that make up the current part after merging."},
+        {"level",            std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt32>()), "Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts."},
     }});
     setInMemoryMetadata(storage_metadata);
 }
 
-Pipe StorageSystemDetachedParts::read(
+class ReadFromSystemDetachedParts : public SourceStepWithFilter
+{
+public:
+    ReadFromSystemDetachedParts(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<StorageSystemDetachedParts> storage_,
+        std::vector<UInt8> columns_mask_,
+        size_t max_block_size_,
+        size_t num_streams_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , storage(std::move(storage_))
+        , columns_mask(std::move(columns_mask_))
+        , max_block_size(max_block_size_)
+        , num_streams(num_streams_)
+    {}
+
+    std::string getName() const override { return "ReadFromSystemDetachedParts"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+protected:
+    std::shared_ptr<StorageSystemDetachedParts> storage;
+    std::vector<UInt8> columns_mask;
+
+    ActionsDAGPtr filter;
+    const size_t max_block_size;
+    const size_t num_streams;
+};
+
+void ReadFromSystemDetachedParts::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+    {
+        const auto * predicate = filter_actions_dag->getOutputs().at(0);
+
+        Block block;
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), "database"));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), "table"));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), "engine"));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeUInt8>(), "active"));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeUUID>(), "uuid"));
+
+        filter = VirtualColumnUtils::splitFilterDagForAllowedInputs(predicate, &block);
+        if (filter)
+            VirtualColumnUtils::buildSetsForDAG(filter, context);
+    }
+}
+
+void StorageSystemDetachedParts::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
@@ -299,17 +362,28 @@ Pipe StorageSystemDetachedParts::read(
 
     auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
 
-    auto state = std::make_shared<SourceState>(StoragesInfoStream(query_info, context));
+    auto this_ptr = std::static_pointer_cast<StorageSystemDetachedParts>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromSystemDetachedParts>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(header), std::move(this_ptr), std::move(columns_mask), max_block_size, num_streams);
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromSystemDetachedParts::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto state = std::make_shared<SourceState>(StoragesInfoStream(nullptr, filter, context));
 
     Pipe pipe;
 
     for (size_t i = 0; i < num_streams; ++i)
     {
-        auto source = std::make_shared<DetachedPartsSource>(header.cloneEmpty(), state, columns_mask, max_block_size);
+        auto source = std::make_shared<DetachedPartsSource>(getOutputStream().header, state, columns_mask, max_block_size);
         pipe.addSource(std::move(source));
     }
 
-    return pipe;
+    pipeline.init(std::move(pipe));
 }
 
 }
diff --git a/src/Storages/System/StorageSystemDetachedParts.h b/src/Storages/System/StorageSystemDetachedParts.h
index 20ac69f0eea..52b964e3b3c 100644
--- a/src/Storages/System/StorageSystemDetachedParts.h
+++ b/src/Storages/System/StorageSystemDetachedParts.h
@@ -20,14 +20,15 @@ public:
     bool isSystemStorage() const override { return true; }
 
 protected:
-    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;
+    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;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDictionaries.cpp b/src/Storages/System/StorageSystemDictionaries.cpp
index c2ed35c5510..a62a4a3f425 100644
--- a/src/Storages/System/StorageSystemDictionaries.cpp
+++ b/src/Storages/System/StorageSystemDictionaries.cpp
@@ -16,7 +16,6 @@
 #include <Core/Names.h>
 
 #include <base/map.h>
-#include <mutex>
 
 namespace DB
 {
@@ -52,6 +51,14 @@ catch (const DB::Exception &)
 
 }
 
+StorageSystemDictionaries::StorageSystemDictionaries(const StorageID & storage_id_, ColumnsDescription columns_description_)
+    : IStorageSystemOneBlock(storage_id_, std::move(columns_description_))
+{
+    VirtualColumnsDescription virtuals;
+    virtuals.addEphemeral("key", std::make_shared<DataTypeString>(), "");
+    setVirtuals(std::move(virtuals));
+}
+
 ColumnsDescription StorageSystemDictionaries::getColumnsDescription()
 {
     return ColumnsDescription
@@ -59,7 +66,7 @@ ColumnsDescription StorageSystemDictionaries::getColumnsDescription()
         {"database", std::make_shared<DataTypeString>(), "Name of the database containing the dictionary created by DDL query. Empty string for other dictionaries."},
         {"name", std::make_shared<DataTypeString>(), "Dictionary name."},
         {"uuid", std::make_shared<DataTypeUUID>(), "Dictionary UUID."},
-        {"status", std::make_shared<DataTypeEnum8>(getStatusEnumAllPossibleValues()),
+        {"status", std::make_shared<DataTypeEnum8>(getExternalLoaderStatusEnumAllPossibleValues()),
             "Dictionary status. Possible values: "
             "NOT_LOADED — Dictionary was not loaded because it was not used, "
             "LOADED — Dictionary loaded successfully, "
@@ -75,7 +82,7 @@ ColumnsDescription StorageSystemDictionaries::getColumnsDescription()
         {"attribute.names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Array of attribute names provided by the dictionary."},
         {"attribute.types", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Corresponding array of attribute types provided by the dictionary."},
         {"bytes_allocated", std::make_shared<DataTypeUInt64>(), "Amount of RAM allocated for the dictionary."},
-        {"hierarchical_index_bytes_allocated", std::make_shared<DataTypeUInt64>(), ""},
+        {"hierarchical_index_bytes_allocated", std::make_shared<DataTypeUInt64>(), "Amount of RAM allocated for hierarchical index."},
         {"query_count", std::make_shared<DataTypeUInt64>(), "Number of queries since the dictionary was loaded or since the last successful reboot."},
         {"hit_rate", std::make_shared<DataTypeFloat64>(), "For cache dictionaries, the percentage of uses for which the value was in the cache."},
         {"found_rate", std::make_shared<DataTypeFloat64>(), "The percentage of uses for which the value was found."},
@@ -92,14 +99,7 @@ ColumnsDescription StorageSystemDictionaries::getColumnsDescription()
     };
 }
 
-NamesAndTypesList StorageSystemDictionaries::getVirtuals() const
-{
-    return {
-        {"key", std::make_shared<DataTypeString>()}
-    };
-}
-
-void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & /*query_info*/) const
+void StorageSystemDictionaries::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_dictionaries = access->isGranted(AccessType::SHOW_DICTIONARIES);
diff --git a/src/Storages/System/StorageSystemDictionaries.h b/src/Storages/System/StorageSystemDictionaries.h
index 792b3c0dd30..058b8b163d9 100644
--- a/src/Storages/System/StorageSystemDictionaries.h
+++ b/src/Storages/System/StorageSystemDictionaries.h
@@ -9,19 +9,17 @@ namespace DB
 class Context;
 
 
-class StorageSystemDictionaries final : public IStorageSystemOneBlock<StorageSystemDictionaries>
+class StorageSystemDictionaries final : public IStorageSystemOneBlock
 {
 public:
+    StorageSystemDictionaries(const StorageID & storage_id_, ColumnsDescription columns_description_);
+
     std::string getName() const override { return "SystemDictionaries"; }
 
     static ColumnsDescription getColumnsDescription();
 
-    NamesAndTypesList getVirtuals() const override;
-
 protected:
-    using IStorageSystemOneBlock::IStorageSystemOneBlock;
-
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDisks.cpp b/src/Storages/System/StorageSystemDisks.cpp
index 9abbab9ff91..eecc889f86b 100644
--- a/src/Storages/System/StorageSystemDisks.cpp
+++ b/src/Storages/System/StorageSystemDisks.cpp
@@ -18,19 +18,21 @@ StorageSystemDisks::StorageSystemDisks(const StorageID & table_id_)
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription(
     {
-        {"name", std::make_shared<DataTypeString>()},
-        {"path", std::make_shared<DataTypeString>()},
-        {"free_space", std::make_shared<DataTypeUInt64>()},
-        {"total_space", std::make_shared<DataTypeUInt64>()},
-        {"unreserved_space", std::make_shared<DataTypeUInt64>()},
-        {"keep_free_space", std::make_shared<DataTypeUInt64>()},
-        {"type", std::make_shared<DataTypeString>()},
-        {"is_encrypted", std::make_shared<DataTypeUInt8>()},
-        {"is_read_only", std::make_shared<DataTypeUInt8>()},
-        {"is_write_once", std::make_shared<DataTypeUInt8>()},
-        {"is_remote", std::make_shared<DataTypeUInt8>()},
-        {"is_broken", std::make_shared<DataTypeUInt8>()},
-        {"cache_path", std::make_shared<DataTypeString>()},
+        {"name", std::make_shared<DataTypeString>(), "Name of a disk in the server configuration."},
+        {"path", std::make_shared<DataTypeString>(), "Path to the mount point in the file system."},
+        {"free_space", std::make_shared<DataTypeUInt64>(), "Free space on disk in bytes."},
+        {"total_space", std::make_shared<DataTypeUInt64>(), "Disk volume in bytes."},
+        {"unreserved_space", std::make_shared<DataTypeUInt64>(), "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", std::make_shared<DataTypeUInt64>(), "Amount of disk space that should stay free on disk in bytes. Defined in the keep_free_space_bytes parameter of disk configuration."},
+        {"type", std::make_shared<DataTypeString>(), "The disk type which tells where this disk stores the data - RAM, local drive or remote storage."},
+        {"object_storage_type", std::make_shared<DataTypeString>(), "Type of object storage if disk type is object_storage"},
+        {"metadata_type", std::make_shared<DataTypeString>(), "Type of metadata storage if disk type is object_storage"},
+        {"is_encrypted", std::make_shared<DataTypeUInt8>(), "Flag which shows whether this disk ecrypts the underlying data. "},
+        {"is_read_only", std::make_shared<DataTypeUInt8>(), "Flag which indicates that you can only perform read operations with this disk."},
+        {"is_write_once", std::make_shared<DataTypeUInt8>(), "Flag which indicates if disk is write-once. Which means that it does support BACKUP to this disk, but does not support INSERT into MergeTree table on this disk."},
+        {"is_remote", std::make_shared<DataTypeUInt8>(), "Flag which indicated what operations with this disk involve network interaction."},
+        {"is_broken", std::make_shared<DataTypeUInt8>(), "Flag which indicates if disk is broken. Broken disks will have 0 space and cannot be used."},
+        {"cache_path", std::make_shared<DataTypeString>(), "The path to the cache directory on local drive in case when the disk supports caching."},
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -53,6 +55,8 @@ Pipe StorageSystemDisks::read(
     MutableColumnPtr col_unreserved = ColumnUInt64::create();
     MutableColumnPtr col_keep = ColumnUInt64::create();
     MutableColumnPtr col_type = ColumnString::create();
+    MutableColumnPtr col_object_storage_type = ColumnString::create();
+    MutableColumnPtr col_metadata_type = ColumnString::create();
     MutableColumnPtr col_is_encrypted = ColumnUInt8::create();
     MutableColumnPtr col_is_read_only = ColumnUInt8::create();
     MutableColumnPtr col_is_write_once = ColumnUInt8::create();
@@ -69,7 +73,9 @@ Pipe StorageSystemDisks::read(
         col_unreserved->insert(disk_ptr->getUnreservedSpace().value_or(std::numeric_limits<UInt64>::max()));
         col_keep->insert(disk_ptr->getKeepingFreeSpace());
         auto data_source_description = disk_ptr->getDataSourceDescription();
-        col_type->insert(toString(data_source_description.type));
+        col_type->insert(magic_enum::enum_name(data_source_description.type));
+        col_object_storage_type->insert(magic_enum::enum_name(data_source_description.object_storage_type));
+        col_metadata_type->insert(magic_enum::enum_name(data_source_description.metadata_type));
         col_is_encrypted->insert(data_source_description.is_encrypted);
         col_is_read_only->insert(disk_ptr->isReadOnly());
         col_is_write_once->insert(disk_ptr->isWriteOnce());
@@ -91,6 +97,8 @@ Pipe StorageSystemDisks::read(
     res_columns.emplace_back(std::move(col_unreserved));
     res_columns.emplace_back(std::move(col_keep));
     res_columns.emplace_back(std::move(col_type));
+    res_columns.emplace_back(std::move(col_object_storage_type));
+    res_columns.emplace_back(std::move(col_metadata_type));
     res_columns.emplace_back(std::move(col_is_encrypted));
     res_columns.emplace_back(std::move(col_is_read_only));
     res_columns.emplace_back(std::move(col_is_write_once));
diff --git a/src/Storages/System/StorageSystemDistributionQueue.cpp b/src/Storages/System/StorageSystemDistributionQueue.cpp
index f0247275a8b..e2058448904 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.cpp
+++ b/src/Storages/System/StorageSystemDistributionQueue.cpp
@@ -10,6 +10,7 @@
 #include <Access/ContextAccess.h>
 #include <Common/typeid_cast.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Databases/IDatabase.h>
 
 namespace DB
@@ -107,7 +108,7 @@ ColumnsDescription StorageSystemDistributionQueue::getColumnsDescription()
 }
 
 
-void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
@@ -159,7 +160,7 @@ void StorageSystemDistributionQueue::fillData(MutableColumns & res_columns, Cont
             { col_table_to_filter, std::make_shared<DataTypeString>(), "table" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
             return;
diff --git a/src/Storages/System/StorageSystemDistributionQueue.h b/src/Storages/System/StorageSystemDistributionQueue.h
index 477a9d6e245..159a86bf082 100644
--- a/src/Storages/System/StorageSystemDistributionQueue.h
+++ b/src/Storages/System/StorageSystemDistributionQueue.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements the `distribution_queue` system table, which allows you to view the INSERT queues for the Distributed tables.
   */
-class StorageSystemDistributionQueue final : public IStorageSystemOneBlock<StorageSystemDistributionQueue>
+class StorageSystemDistributionQueue final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemDistributionQueue"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDroppedTables.cpp b/src/Storages/System/StorageSystemDroppedTables.cpp
index a95127847f8..528f4d8995d 100644
--- a/src/Storages/System/StorageSystemDroppedTables.cpp
+++ b/src/Storages/System/StorageSystemDroppedTables.cpp
@@ -29,7 +29,7 @@ ColumnsDescription StorageSystemDroppedTables::getColumnsDescription()
 }
 
 
-void StorageSystemDroppedTables::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemDroppedTables::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto tables_mark_dropped = DatabaseCatalog::instance().getTablesMarkedDropped();
 
diff --git a/src/Storages/System/StorageSystemDroppedTables.h b/src/Storages/System/StorageSystemDroppedTables.h
index d7c3569eb62..4fc620ab962 100644
--- a/src/Storages/System/StorageSystemDroppedTables.h
+++ b/src/Storages/System/StorageSystemDroppedTables.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-class StorageSystemDroppedTables final : public IStorageSystemOneBlock<StorageSystemDroppedTables>
+class StorageSystemDroppedTables final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemMarkedDroppedTables"; }
@@ -14,7 +14,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemDroppedTablesParts.cpp b/src/Storages/System/StorageSystemDroppedTablesParts.cpp
index bbe99c688c9..c17d6402d88 100644
--- a/src/Storages/System/StorageSystemDroppedTablesParts.cpp
+++ b/src/Storages/System/StorageSystemDroppedTablesParts.cpp
@@ -4,13 +4,14 @@
 #include <Storages/System/StorageSystemDroppedTablesParts.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypeUUID.h>
+#include <Interpreters/DatabaseCatalog.h>
 
 
 namespace DB
 {
 
 
-StoragesDroppedInfoStream::StoragesDroppedInfoStream(const SelectQueryInfo & query_info, ContextPtr context)
+StoragesDroppedInfoStream::StoragesDroppedInfoStream(const ActionsDAGPtr & filter, ContextPtr context)
         : StoragesInfoStreamBase(context)
 {
     /// Will apply WHERE to subset of columns and then add more columns.
@@ -73,7 +74,8 @@ StoragesDroppedInfoStream::StoragesDroppedInfoStream(const SelectQueryInfo & que
     if (block_to_filter.rows())
     {
         /// Filter block_to_filter with columns 'database', 'table', 'engine', 'active'.
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, block_to_filter, context);
+        if (filter)
+            VirtualColumnUtils::filterBlockWithDAG(filter, block_to_filter, context);
         rows = block_to_filter.rows();
     }
 
diff --git a/src/Storages/System/StorageSystemDroppedTablesParts.h b/src/Storages/System/StorageSystemDroppedTablesParts.h
index f548697a6a9..dff9e41cce3 100644
--- a/src/Storages/System/StorageSystemDroppedTablesParts.h
+++ b/src/Storages/System/StorageSystemDroppedTablesParts.h
@@ -9,7 +9,7 @@ namespace DB
 class StoragesDroppedInfoStream : public StoragesInfoStreamBase
 {
 public:
-    StoragesDroppedInfoStream(const SelectQueryInfo & query_info, ContextPtr context);
+    StoragesDroppedInfoStream(const ActionsDAGPtr & filter, ContextPtr context);
 protected:
     bool tryLockTable(StoragesInfo &) override
     {
@@ -30,9 +30,9 @@ public:
 
     std::string getName() const override { return "SystemDroppedTablesParts"; }
 protected:
-    std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context) override
+    std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(const ActionsDAGPtr &, const ActionsDAGPtr & filter, ContextPtr context) override
     {
-        return std::make_unique<StoragesDroppedInfoStream>(query_info, context);
+        return std::make_unique<StoragesDroppedInfoStream>(filter, context);
     }
 };
 
diff --git a/src/Storages/System/StorageSystemEnabledRoles.cpp b/src/Storages/System/StorageSystemEnabledRoles.cpp
index 6dbb6f18488..42806a832cf 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.cpp
+++ b/src/Storages/System/StorageSystemEnabledRoles.cpp
@@ -23,7 +23,7 @@ ColumnsDescription StorageSystemEnabledRoles::getColumnsDescription()
 }
 
 
-void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemEnabledRoles::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto roles_info = context->getRolesInfo();
     auto user = context->getUser();
diff --git a/src/Storages/System/StorageSystemEnabledRoles.h b/src/Storages/System/StorageSystemEnabledRoles.h
index 5367b2ccbea..1b11d025367 100644
--- a/src/Storages/System/StorageSystemEnabledRoles.h
+++ b/src/Storages/System/StorageSystemEnabledRoles.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `enabled_roles` system table, which allows you to get information about enabled roles.
-class StorageSystemEnabledRoles final : public IStorageSystemOneBlock<StorageSystemEnabledRoles>
+class StorageSystemEnabledRoles final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemEnabledRoles"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemErrors.cpp b/src/Storages/System/StorageSystemErrors.cpp
index 730e4cf05da..2da268305f8 100644
--- a/src/Storages/System/StorageSystemErrors.cpp
+++ b/src/Storages/System/StorageSystemErrors.cpp
@@ -25,7 +25,7 @@ ColumnsDescription StorageSystemErrors::getColumnsDescription()
 }
 
 
-void StorageSystemErrors::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemErrors::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto add_row = [&](std::string_view name, size_t code, const auto & error, bool remote)
     {
diff --git a/src/Storages/System/StorageSystemErrors.h b/src/Storages/System/StorageSystemErrors.h
index 9e8ec628bac..bc86c085ff1 100644
--- a/src/Storages/System/StorageSystemErrors.h
+++ b/src/Storages/System/StorageSystemErrors.h
@@ -13,7 +13,7 @@ class Context;
  * Implements the `errors` system table, which shows the error code and the number of times it happens
  * (i.e. Exception with this code had been thrown).
  */
-class StorageSystemErrors final : public IStorageSystemOneBlock<StorageSystemErrors>
+class StorageSystemErrors final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemErrors"; }
@@ -23,7 +23,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemEvents.cpp b/src/Storages/System/StorageSystemEvents.cpp
index 5d9bc3a773a..822d5c77788 100644
--- a/src/Storages/System/StorageSystemEvents.cpp
+++ b/src/Storages/System/StorageSystemEvents.cpp
@@ -23,7 +23,7 @@ ColumnsDescription StorageSystemEvents::getColumnsDescription()
     return description;
 }
 
-void StorageSystemEvents::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemEvents::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (ProfileEvents::Event i = ProfileEvents::Event(0), end = ProfileEvents::end(); i < end; ++i)
     {
diff --git a/src/Storages/System/StorageSystemEvents.h b/src/Storages/System/StorageSystemEvents.h
index cbd92f90d7a..9217fdfb53e 100644
--- a/src/Storages/System/StorageSystemEvents.h
+++ b/src/Storages/System/StorageSystemEvents.h
@@ -10,7 +10,7 @@ class Context;
 
 /** Implements `events` system table, which allows you to obtain information for profiling.
   */
-class StorageSystemEvents final : public IStorageSystemOneBlock<StorageSystemEvents>
+class StorageSystemEvents final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemEvents"; }
@@ -20,7 +20,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemFilesystemCache.cpp b/src/Storages/System/StorageSystemFilesystemCache.cpp
index b625c6f75b0..cfb388bc232 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.cpp
+++ b/src/Storages/System/StorageSystemFilesystemCache.cpp
@@ -17,29 +17,30 @@ ColumnsDescription StorageSystemFilesystemCache::getColumnsDescription()
     /// TODO: Fill in all the comments.
     return ColumnsDescription
     {
-        {"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>()},
-        {"state", std::make_shared<DataTypeString>()},
-        {"cache_hits", std::make_shared<DataTypeUInt64>()},
-        {"references", std::make_shared<DataTypeUInt64>()},
-        {"downloaded_size", std::make_shared<DataTypeUInt64>()},
-        {"kind", std::make_shared<DataTypeString>()},
-        {"unbound", std::make_shared<DataTypeNumber<UInt8>>()},
-        {"file_size", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
+        {"cache_name", std::make_shared<DataTypeString>(), "Name of the cache object. Can be used in `SYSTEM DESCRIBE FILESYSTEM CACHE <name>`, `SYSTEM DROP FILESYSTEM CACHE <name>` commands"},
+        {"cache_base_path", std::make_shared<DataTypeString>(), "Path to the base directory where all caches files (of a cache identidied by `cache_name`) are stored."},
+        {"cache_path", std::make_shared<DataTypeString>(), "Path to a particular cache file, corresponding to a file segment in a source file"},
+        {"key", std::make_shared<DataTypeString>(), "Cache key of the file segment"},
+        {"file_segment_range_begin", std::make_shared<DataTypeUInt64>(), "Offset corresponding to the beginning of the file segment range"},
+        {"file_segment_range_end", std::make_shared<DataTypeUInt64>(), "Offset corresponding to the (including) end of the file segment range"},
+        {"size", std::make_shared<DataTypeUInt64>(), "Size of the file segment"},
+        {"state", std::make_shared<DataTypeString>(), "File segment state (DOWNLOADED, DOWNLOADING, PARTIALLY_DOWNLOADED, ...)"},
+        {"cache_hits", std::make_shared<DataTypeUInt64>(), "Number of cache hits of corresponding file segment"},
+        {"references", std::make_shared<DataTypeUInt64>(), "Number of references to corresponding file segment. Value 1 means that nobody uses it at the moment (the only existing reference is in cache storage itself)"},
+        {"downloaded_size", std::make_shared<DataTypeUInt64>(), "Downloaded size of the file segment"},
+        {"kind", std::make_shared<DataTypeString>(), "File segment kind (used to distringuish between file segments added as a part of 'Temporary data in cache')"},
+        {"unbound", std::make_shared<DataTypeNumber<UInt8>>(), "Internal implementation flag"},
+        {"user_id", std::make_shared<DataTypeString>(), "User id of the user which created the file segment"},
+        {"file_size", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()), "File size of the file to which current file segment belongs"},
     };
 }
 
 StorageSystemFilesystemCache::StorageSystemFilesystemCache(const StorageID & table_id_)
-    : IStorageSystemOneBlock(table_id_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription())
 {
 }
 
-void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto caches = FileCacheFactory::instance().getAll();
 
@@ -52,10 +53,12 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
             res_columns[i++]->insert(cache_name);
             res_columns[i++]->insert(cache->getBasePath());
 
-            /// Do not use `file_segment->getPathInLocalCache` here because it will lead to nullptr dereference
+            /// Do not use `file_segment->getPath` here because it will lead to nullptr dereference
             /// (because file_segments in getSnapshot doesn't have `cache` field set)
 
-            const auto path = cache->getPathInLocalCache(file_segment.key, file_segment.offset, file_segment.kind);
+            const auto path = cache->getFileSegmentPath(
+                file_segment.key, file_segment.offset, file_segment.kind,
+                FileCache::UserInfo(file_segment.user_id, file_segment.user_weight));
             res_columns[i++]->insert(path);
             res_columns[i++]->insert(file_segment.key.toString());
             res_columns[i++]->insert(file_segment.range_left);
@@ -67,6 +70,7 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
             res_columns[i++]->insert(file_segment.downloaded_size);
             res_columns[i++]->insert(toString(file_segment.kind));
             res_columns[i++]->insert(file_segment.is_unbound);
+            res_columns[i++]->insert(file_segment.user_id);
 
             std::error_code ec;
             auto size = fs::file_size(path, ec);
@@ -74,7 +78,7 @@ void StorageSystemFilesystemCache::fillData(MutableColumns & res_columns, Contex
                 res_columns[i++]->insert(size);
             else
                 res_columns[i++]->insertDefault();
-        });
+        }, FileCache::getCommonUser().user_id);
     }
 }
 
diff --git a/src/Storages/System/StorageSystemFilesystemCache.h b/src/Storages/System/StorageSystemFilesystemCache.h
index 4b13b375f95..ea49fd16ba2 100644
--- a/src/Storages/System/StorageSystemFilesystemCache.h
+++ b/src/Storages/System/StorageSystemFilesystemCache.h
@@ -29,7 +29,7 @@ namespace DB
  * FORMAT Vertical
  */
 
-class StorageSystemFilesystemCache final : public IStorageSystemOneBlock<StorageSystemFilesystemCache>
+class StorageSystemFilesystemCache final : public IStorageSystemOneBlock
 {
 public:
     explicit StorageSystemFilesystemCache(const StorageID & table_id_);
@@ -39,7 +39,7 @@ public:
     static ColumnsDescription getColumnsDescription();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp b/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp
new file mode 100644
index 00000000000..8915032baf7
--- /dev/null
+++ b/src/Storages/System/StorageSystemFilesystemCacheSettings.cpp
@@ -0,0 +1,72 @@
+#include "StorageSystemFilesystemCacheSettings.h"
+#include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Interpreters/Cache/FileCache.h>
+#include <Interpreters/Cache/FileSegment.h>
+#include <Interpreters/Cache/FileCacheFactory.h>
+#include <Access/Common/AccessFlags.h>
+#include <Interpreters/Context.h>
+#include <Disks/IDisk.h>
+
+
+namespace DB
+{
+
+ColumnsDescription StorageSystemFilesystemCacheSettings::getColumnsDescription()
+{
+    return ColumnsDescription
+    {
+        {"cache_name", std::make_shared<DataTypeString>(), "Name of the cache object"},
+        {"path", std::make_shared<DataTypeString>(), "Cache directory"},
+        {"max_size", std::make_shared<DataTypeUInt64>(), "Cache size limit by the number of bytes"},
+        {"max_elements", std::make_shared<DataTypeUInt64>(), "Cache size limit by the number of elements"},
+        {"current_size", std::make_shared<DataTypeUInt64>(), "Current cache size by the number of bytes"},
+        {"current_elements", std::make_shared<DataTypeUInt64>(), "Current cache size by the number of elements"},
+        {"max_file_segment_size", std::make_shared<DataTypeUInt64>(), "Maximum allowed file segment size"},
+        {"boundary_alignment", std::make_shared<DataTypeUInt64>(), "Boundary alignment of file segments"},
+        {"cache_on_write_operations", std::make_shared<DataTypeUInt8>(), "Write-through cache enablemenet setting"},
+        {"cache_hits_threshold", std::make_shared<DataTypeUInt8>(), "Cache hits threshold enablemenet setting"},
+        {"background_download_threads", std::make_shared<DataTypeUInt64>(), "Number of background download threads"},
+        {"background_download_queue_size_limit", std::make_shared<DataTypeUInt64>(), "Queue size limit for background download"},
+        {"load_metadata_threads", std::make_shared<DataTypeUInt64>(), "Number of load metadata threads"},
+        {"enable_bypass_cache_threshold", std::make_shared<DataTypeUInt64>(), "Bypass cache threshold limit enablement setting"},
+    };
+}
+
+StorageSystemFilesystemCacheSettings::StorageSystemFilesystemCacheSettings(const StorageID & table_id_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription())
+{
+}
+
+void StorageSystemFilesystemCacheSettings::fillData(
+    MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
+{
+    context->checkAccess(AccessType::SHOW_FILESYSTEM_CACHES);
+
+    auto caches = FileCacheFactory::instance().getAll();
+
+    for (const auto & [cache_name, cache_data] : caches)
+    {
+        const auto & settings = cache_data->getSettings();
+        const auto & cache = cache_data->cache;
+
+        size_t i = 0;
+        res_columns[i++]->insert(cache_name);
+        res_columns[i++]->insert(settings.base_path);
+        res_columns[i++]->insert(settings.max_size);
+        res_columns[i++]->insert(settings.max_elements);
+        res_columns[i++]->insert(cache->getUsedCacheSize());
+        res_columns[i++]->insert(cache->getFileSegmentsNum());
+        res_columns[i++]->insert(settings.max_file_segment_size);
+        res_columns[i++]->insert(settings.boundary_alignment);
+        res_columns[i++]->insert(settings.cache_on_write_operations);
+        res_columns[i++]->insert(settings.cache_hits_threshold);
+        res_columns[i++]->insert(settings.background_download_threads);
+        res_columns[i++]->insert(settings.background_download_queue_size_limit);
+        res_columns[i++]->insert(settings.load_metadata_threads);
+        res_columns[i++]->insert(settings.enable_bypass_cache_with_threshold);
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemFilesystemCacheSettings.h b/src/Storages/System/StorageSystemFilesystemCacheSettings.h
new file mode 100644
index 00000000000..59a123c32c1
--- /dev/null
+++ b/src/Storages/System/StorageSystemFilesystemCacheSettings.h
@@ -0,0 +1,22 @@
+#pragma once
+
+#include <Storages/System/IStorageSystemOneBlock.h>
+#include <Interpreters/Cache/FileCache_fwd_internal.h>
+
+namespace DB
+{
+
+class StorageSystemFilesystemCacheSettings final : public IStorageSystemOneBlock
+{
+public:
+    explicit StorageSystemFilesystemCacheSettings(const StorageID & table_id_);
+
+    std::string getName() const override { return "SystemFilesystemCacheSettings"; }
+
+    static ColumnsDescription getColumnsDescription();
+
+protected:
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemFormats.cpp b/src/Storages/System/StorageSystemFormats.cpp
index a360971e1f7..3c6a19c4f95 100644
--- a/src/Storages/System/StorageSystemFormats.cpp
+++ b/src/Storages/System/StorageSystemFormats.cpp
@@ -18,12 +18,13 @@ ColumnsDescription StorageSystemFormats::getColumnsDescription()
     };
 }
 
-void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemFormats::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & formats = FormatFactory::instance().getAllFormats();
     for (const auto & pair : formats)
     {
-        const auto & [format_name, creators] = pair;
+        const auto & [name, creators] = pair;
+        String format_name = creators.name;
         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_creator != nullptr || creators.random_access_input_creator != nullptr);
diff --git a/src/Storages/System/StorageSystemFormats.h b/src/Storages/System/StorageSystemFormats.h
index 9f9d1df1bde..f93641ee8a8 100644
--- a/src/Storages/System/StorageSystemFormats.h
+++ b/src/Storages/System/StorageSystemFormats.h
@@ -4,10 +4,10 @@
 
 namespace DB
 {
-class StorageSystemFormats final : public IStorageSystemOneBlock<StorageSystemFormats>
+class StorageSystemFormats final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemFunctions.cpp b/src/Storages/System/StorageSystemFunctions.cpp
index 45c00e6de27..c5c91294801 100644
--- a/src/Storages/System/StorageSystemFunctions.cpp
+++ b/src/Storages/System/StorageSystemFunctions.cpp
@@ -25,7 +25,7 @@ namespace ErrorCodes
     extern const int ACCESS_DENIED;
 };
 
-enum class FunctionOrigin : Int8
+enum class FunctionOrigin : int8_t
 {
     SYSTEM = 0,
     SQL_USER_DEFINED = 1,
@@ -133,7 +133,7 @@ ColumnsDescription StorageSystemFunctions::getColumnsDescription()
     };
 }
 
-void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & functions_factory = FunctionFactory::instance();
     const auto & function_names = functions_factory.getAllRegisteredNames();
@@ -179,7 +179,7 @@ void StorageSystemFunctions::fillData(MutableColumns & res_columns, ContextPtr c
     }
 
     const auto & user_defined_executable_functions_factory = UserDefinedExecutableFunctionFactory::instance();
-    const auto & user_defined_executable_functions_names = user_defined_executable_functions_factory.getRegisteredNames(context);
+    const auto & user_defined_executable_functions_names = user_defined_executable_functions_factory.getRegisteredNames(context); /// NOLINT(readability-static-accessed-through-instance)
     for (const auto & function_name : user_defined_executable_functions_names)
     {
         fillRow(res_columns, function_name, 0, {0}, "", FunctionOrigin::EXECUTABLE_USER_DEFINED, user_defined_executable_functions_factory);
diff --git a/src/Storages/System/StorageSystemFunctions.h b/src/Storages/System/StorageSystemFunctions.h
index ac1129e8127..c6f85d436fc 100644
--- a/src/Storages/System/StorageSystemFunctions.h
+++ b/src/Storages/System/StorageSystemFunctions.h
@@ -12,7 +12,7 @@ class Context;
 /** Implements `functions`system table, which allows you to get a list
   * all normal and aggregate functions.
   */
-class StorageSystemFunctions final : public IStorageSystemOneBlock<StorageSystemFunctions>
+class StorageSystemFunctions final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemFunctions"; }
@@ -25,7 +25,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGrants.cpp b/src/Storages/System/StorageSystemGrants.cpp
index f5f3fa07e53..afa49536983 100644
--- a/src/Storages/System/StorageSystemGrants.cpp
+++ b/src/Storages/System/StorageSystemGrants.cpp
@@ -38,7 +38,7 @@ ColumnsDescription StorageSystemGrants::getColumnsDescription()
 }
 
 
-void StorageSystemGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemGrants::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemGrants.h b/src/Storages/System/StorageSystemGrants.h
index 2202b52ad5f..6bf3793c3dc 100644
--- a/src/Storages/System/StorageSystemGrants.h
+++ b/src/Storages/System/StorageSystemGrants.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `grants` system table, which allows you to get information about grants.
-class StorageSystemGrants final : public IStorageSystemOneBlock<StorageSystemGrants>
+class StorageSystemGrants final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemGrants"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemGraphite.cpp b/src/Storages/System/StorageSystemGraphite.cpp
index ffeb1b6c890..ef13c3c24da 100644
--- a/src/Storages/System/StorageSystemGraphite.cpp
+++ b/src/Storages/System/StorageSystemGraphite.cpp
@@ -1,6 +1,8 @@
-#include <Storages/System/StorageSystemGraphite.h>
-#include <Storages/MergeTree/MergeTreeData.h>
+#include <AggregateFunctions/IAggregateFunction.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Storages/MergeTree/MergeTreeData.h>
+#include <Storages/System/StorageSystemGraphite.h>
 
 
 namespace DB
@@ -11,7 +13,11 @@ ColumnsDescription StorageSystemGraphite::getColumnsDescription()
     return ColumnsDescription
     {
         {"config_name",     std::make_shared<DataTypeString>(), "graphite_rollup parameter name."},
-        {"rule_type",       std::make_shared<DataTypeString>(), ""},
+        {"rule_type",       std::make_shared<DataTypeString>(),
+            "The rule type. Possible values: RuleTypeAll = 0 - default, with regex, compatible with old scheme; "
+            "RuleTypePlain = 1 - plain metrics, with regex, compatible with old scheme; "
+            "RuleTypeTagged = 2 - tagged metrics, with regex, compatible with old scheme; "
+            "RuleTypeTagList = 3 - tagged metrics, with regex (converted to  RuleTypeTagged from string like 'retention=10min ; env=(staging|prod)')"},
         {"regexp",          std::make_shared<DataTypeString>(), "A pattern for the metric name."},
         {"function",        std::make_shared<DataTypeString>(), "The name of the aggregating function."},
         {"age",             std::make_shared<DataTypeUInt64>(), "The minimum age of the data in seconds."},
@@ -75,7 +81,7 @@ static StorageSystemGraphite::Configs getConfigs(ContextPtr context)
     return graphite_configs;
 }
 
-void StorageSystemGraphite::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemGraphite::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     Configs graphite_configs = getConfigs(context);
 
diff --git a/src/Storages/System/StorageSystemGraphite.h b/src/Storages/System/StorageSystemGraphite.h
index be101181cf7..78379afac9d 100644
--- a/src/Storages/System/StorageSystemGraphite.h
+++ b/src/Storages/System/StorageSystemGraphite.h
@@ -10,7 +10,7 @@ namespace DB
 {
 
 /// Provides information about Graphite configuration.
-class StorageSystemGraphite final : public IStorageSystemOneBlock<StorageSystemGraphite>
+class StorageSystemGraphite final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemGraphite"; }
@@ -30,7 +30,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemJemalloc.cpp b/src/Storages/System/StorageSystemJemalloc.cpp
index 9c3a075b2c1..b55e32c479c 100644
--- a/src/Storages/System/StorageSystemJemalloc.cpp
+++ b/src/Storages/System/StorageSystemJemalloc.cpp
@@ -77,7 +77,7 @@ void fillJemallocBins(MutableColumns & res_columns)
 
 void fillJemallocBins(MutableColumns &)
 {
-    LOG_INFO(&Poco::Logger::get("StorageSystemJemallocBins"), "jemalloc is not enabled");
+    LOG_INFO(getLogger("StorageSystemJemallocBins"), "jemalloc is not enabled");
 }
 
 #endif // USE_JEMALLOC
@@ -115,7 +115,7 @@ Pipe StorageSystemJemallocBins::read(
 {
     storage_snapshot->check(column_names);
 
-    auto header = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtuals());
+    auto header = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtualsList());
     MutableColumns res_columns = header.cloneEmptyColumns();
 
     fillJemallocBins(res_columns);
diff --git a/src/Storages/System/StorageSystemKafkaConsumers.cpp b/src/Storages/System/StorageSystemKafkaConsumers.cpp
index 95962d8de8b..86713632339 100644
--- a/src/Storages/System/StorageSystemKafkaConsumers.cpp
+++ b/src/Storages/System/StorageSystemKafkaConsumers.cpp
@@ -41,13 +41,13 @@ ColumnsDescription StorageSystemKafkaConsumers::getColumnsDescription()
         {"last_rebalance_time", std::make_shared<DataTypeDateTime>(), "Timestamp of the most recent Kafka rebalance."},
         {"num_rebalance_revocations", std::make_shared<DataTypeUInt64>(), "Number of times the consumer was revoked its partitions."},
         {"num_rebalance_assignments", std::make_shared<DataTypeUInt64>(), "Number of times the consumer was assigned to Kafka cluster."},
-        {"is_currently_used", std::make_shared<DataTypeUInt8>(), "Consumer is in use."},
-        {"last_used", std::make_shared<DataTypeDateTime64>(6)},
+        {"is_currently_used", std::make_shared<DataTypeUInt8>(), "The flag which shows whether the consumer is in use."},
+        {"last_used", std::make_shared<DataTypeDateTime64>(6), "The last time this consumer was in use."},
         {"rdkafka_stat", std::make_shared<DataTypeString>(), "Library internal statistic. Set statistics_interval_ms to 0 disable, default is 3000 (once in three seconds)."},
     };
 }
 
-void StorageSystemKafkaConsumers::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemKafkaConsumers::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto tables_mark_dropped = DatabaseCatalog::instance().getTablesMarkedDropped();
 
diff --git a/src/Storages/System/StorageSystemKafkaConsumers.h b/src/Storages/System/StorageSystemKafkaConsumers.h
index ae2c726849d..8d1fd504810 100644
--- a/src/Storages/System/StorageSystemKafkaConsumers.h
+++ b/src/Storages/System/StorageSystemKafkaConsumers.h
@@ -11,7 +11,7 @@
 namespace DB
 {
 
-class StorageSystemKafkaConsumers final : public IStorageSystemOneBlock<StorageSystemKafkaConsumers>
+class StorageSystemKafkaConsumers final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemKafkaConsumers"; }
@@ -19,7 +19,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemKeywords.cpp b/src/Storages/System/StorageSystemKeywords.cpp
new file mode 100644
index 00000000000..b9d256bf4b2
--- /dev/null
+++ b/src/Storages/System/StorageSystemKeywords.cpp
@@ -0,0 +1,29 @@
+#include <Common/Macros.h>
+#include <Interpreters/Context.h>
+#include <Storages/System/StorageSystemKeywords.h>
+
+#include <Parsers/CommonParsers.h>
+
+
+namespace DB
+{
+
+ColumnsDescription StorageSystemKeywords::getColumnsDescription()
+{
+    return ColumnsDescription
+    {
+        {"keyword", std::make_shared<DataTypeString>(), "The keyword used in ClickHouse parser."},
+    };
+}
+
+void StorageSystemKeywords::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
+{
+    auto macros = context->getMacros();
+
+    for (const auto & keyword : getAllKeyWords())
+    {
+        res_columns[0]->insert(keyword);
+    }
+}
+
+}
diff --git a/src/Storages/System/StorageSystemKeywords.h b/src/Storages/System/StorageSystemKeywords.h
new file mode 100644
index 00000000000..5574c4a3abc
--- /dev/null
+++ b/src/Storages/System/StorageSystemKeywords.h
@@ -0,0 +1,28 @@
+#pragma once
+
+#include <DataTypes/DataTypeString.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
+
+
+namespace DB
+{
+
+class Context;
+
+
+/** Information about macros for introspection.
+  */
+class StorageSystemKeywords final : public IStorageSystemOneBlock
+{
+public:
+    std::string getName() const override { return "SystemKeywords"; }
+
+    static ColumnsDescription getColumnsDescription();
+
+protected:
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
+
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
+};
+
+}
diff --git a/src/Storages/System/StorageSystemLicenses.cpp b/src/Storages/System/StorageSystemLicenses.cpp
index c5c04b4eb94..2faf772aca4 100644
--- a/src/Storages/System/StorageSystemLicenses.cpp
+++ b/src/Storages/System/StorageSystemLicenses.cpp
@@ -19,7 +19,7 @@ ColumnsDescription StorageSystemLicenses::getColumnsDescription()
     };
 }
 
-void StorageSystemLicenses::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemLicenses::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto * it = library_licenses; *it; it += 4)
     {
diff --git a/src/Storages/System/StorageSystemLicenses.h b/src/Storages/System/StorageSystemLicenses.h
index 57a3ff201a2..ab74a590dea 100644
--- a/src/Storages/System/StorageSystemLicenses.h
+++ b/src/Storages/System/StorageSystemLicenses.h
@@ -10,10 +10,10 @@ class Context;
 
 /** System table "licenses" with list of licenses of 3rd party libraries
   */
-class StorageSystemLicenses final : public IStorageSystemOneBlock<StorageSystemLicenses>
+class StorageSystemLicenses final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemMacros.cpp b/src/Storages/System/StorageSystemMacros.cpp
index 6c1a24d152a..82408fd5a7e 100644
--- a/src/Storages/System/StorageSystemMacros.cpp
+++ b/src/Storages/System/StorageSystemMacros.cpp
@@ -15,7 +15,7 @@ ColumnsDescription StorageSystemMacros::getColumnsDescription()
     };
 }
 
-void StorageSystemMacros::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemMacros::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto macros = context->getMacros();
 
diff --git a/src/Storages/System/StorageSystemMacros.h b/src/Storages/System/StorageSystemMacros.h
index ffbeb70796e..c272985e978 100644
--- a/src/Storages/System/StorageSystemMacros.h
+++ b/src/Storages/System/StorageSystemMacros.h
@@ -12,7 +12,7 @@ class Context;
 
 /** Information about macros for introspection.
   */
-class StorageSystemMacros final : public IStorageSystemOneBlock<StorageSystemMacros>
+class StorageSystemMacros final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemMacros"; }
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.cpp b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
index 85caa572edd..7781e3789a4 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.cpp
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.cpp
@@ -31,7 +31,7 @@ ColumnsDescription SystemMergeTreeSettings<replicated>::getColumnsDescription()
 }
 
 template <bool replicated>
-void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void SystemMergeTreeSettings<replicated>::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & settings = replicated ? context->getReplicatedMergeTreeSettings() : context->getMergeTreeSettings();
     auto constraints_and_current_profiles = context->getSettingsConstraintsAndCurrentProfiles();
diff --git a/src/Storages/System/StorageSystemMergeTreeSettings.h b/src/Storages/System/StorageSystemMergeTreeSettings.h
index 48e83f0a880..e2913a7e55b 100644
--- a/src/Storages/System/StorageSystemMergeTreeSettings.h
+++ b/src/Storages/System/StorageSystemMergeTreeSettings.h
@@ -14,7 +14,7 @@ class Context;
   *  which allows to get information about the current MergeTree settings.
   */
 template <bool replicated>
-class SystemMergeTreeSettings final : public IStorageSystemOneBlock<SystemMergeTreeSettings<replicated>>
+class SystemMergeTreeSettings final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return replicated ? "SystemReplicatedMergeTreeSettings" : "SystemMergeTreeSettings"; }
@@ -22,9 +22,9 @@ public:
     static ColumnsDescription getColumnsDescription();
 
 protected:
-    using IStorageSystemOneBlock<SystemMergeTreeSettings<replicated>>::IStorageSystemOneBlock;
+    using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMerges.cpp b/src/Storages/System/StorageSystemMerges.cpp
index 4129e4c235b..0fca5dc84a2 100644
--- a/src/Storages/System/StorageSystemMerges.cpp
+++ b/src/Storages/System/StorageSystemMerges.cpp
@@ -16,12 +16,12 @@ ColumnsDescription StorageSystemMerges::getColumnsDescription()
         {"elapsed", std::make_shared<DataTypeFloat64>(), "The time elapsed (in seconds) since the merge started."},
         {"progress", std::make_shared<DataTypeFloat64>(), "The percentage of completed work from 0 to 1."},
         {"num_parts", std::make_shared<DataTypeUInt64>(), "The number of parts to be merged."},
-        {"source_part_names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), ""},
+        {"source_part_names", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of source parts names."},
         {"result_part_name", std::make_shared<DataTypeString>(), "The name of the part that will be formed as the result of merging."},
-        {"source_part_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), ""},
-        {"result_part_path", std::make_shared<DataTypeString>(), ""},
-        {"partition_id", std::make_shared<DataTypeString>()},
-        {"partition", std::make_shared<DataTypeString>()},
+        {"source_part_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of paths for each source part."},
+        {"result_part_path", std::make_shared<DataTypeString>(), "The path of the part that will be formed as the result of merging."},
+        {"partition_id", std::make_shared<DataTypeString>(), "The identifier of the partition where the merge is happening."},
+        {"partition", std::make_shared<DataTypeString>(), "The name of the partition"},
         {"is_mutation", std::make_shared<DataTypeUInt8>(), "1 if this process is a part mutation."},
         {"total_size_bytes_compressed", std::make_shared<DataTypeUInt64>(), "The total size of the compressed data in the merged chunks."},
         {"total_size_bytes_uncompressed", std::make_shared<DataTypeUInt64>(), "The total size of compressed data in the merged chunks."},
@@ -39,7 +39,7 @@ ColumnsDescription StorageSystemMerges::getColumnsDescription()
 }
 
 
-void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemMerges::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
diff --git a/src/Storages/System/StorageSystemMerges.h b/src/Storages/System/StorageSystemMerges.h
index 961d28daf9a..fd9077c56d5 100644
--- a/src/Storages/System/StorageSystemMerges.h
+++ b/src/Storages/System/StorageSystemMerges.h
@@ -12,7 +12,7 @@ namespace DB
 class Context;
 
 
-class StorageSystemMerges final : public IStorageSystemOneBlock<StorageSystemMerges>
+class StorageSystemMerges final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemMerges"; }
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMetrics.cpp b/src/Storages/System/StorageSystemMetrics.cpp
index 30544d66070..ae34a04cd87 100644
--- a/src/Storages/System/StorageSystemMetrics.cpp
+++ b/src/Storages/System/StorageSystemMetrics.cpp
@@ -25,7 +25,7 @@ ColumnsDescription StorageSystemMetrics::getColumnsDescription()
     return description;
 }
 
-void StorageSystemMetrics::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemMetrics::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (size_t i = 0, end = CurrentMetrics::end(); i < end; ++i)
     {
diff --git a/src/Storages/System/StorageSystemMetrics.h b/src/Storages/System/StorageSystemMetrics.h
index ec0c67cf6b7..829fc231a79 100644
--- a/src/Storages/System/StorageSystemMetrics.h
+++ b/src/Storages/System/StorageSystemMetrics.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `metrics` system table, which provides information about the operation of the server.
   */
-class StorageSystemMetrics final : public IStorageSystemOneBlock<StorageSystemMetrics>
+class StorageSystemMetrics final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemMetrics"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemModels.cpp b/src/Storages/System/StorageSystemModels.cpp
index 03b659d79bd..8960d0625ba 100644
--- a/src/Storages/System/StorageSystemModels.cpp
+++ b/src/Storages/System/StorageSystemModels.cpp
@@ -13,17 +13,16 @@ namespace DB
 
 ColumnsDescription StorageSystemModels::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments.
     return ColumnsDescription
     {
-        { "model_path", std::make_shared<DataTypeString>() },
-        { "type", std::make_shared<DataTypeString>() },
-        { "loading_start_time", std::make_shared<DataTypeDateTime>() },
-        { "loading_duration", std::make_shared<DataTypeFloat32>() },
+        { "model_path", std::make_shared<DataTypeString>(), "Path to trained model."},
+        { "type", std::make_shared<DataTypeString>(), "Model type. Now catboost only."},
+        { "loading_start_time", std::make_shared<DataTypeDateTime>(), "The time when the loading of the model started."},
+        { "loading_duration", std::make_shared<DataTypeFloat32>(), "How much time did it take to load the model."},
     };
 }
 
-void StorageSystemModels::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemModels::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto bridge_helper = std::make_unique<CatBoostLibraryBridgeHelper>(context);
     ExternalModelInfos infos = bridge_helper->listModels();
diff --git a/src/Storages/System/StorageSystemModels.h b/src/Storages/System/StorageSystemModels.h
index 91fa3761743..419b623dac0 100644
--- a/src/Storages/System/StorageSystemModels.h
+++ b/src/Storages/System/StorageSystemModels.h
@@ -9,7 +9,7 @@ namespace DB
 class Context;
 
 
-class StorageSystemModels final : public IStorageSystemOneBlock<StorageSystemModels>
+class StorageSystemModels final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemModels"; }
@@ -19,7 +19,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMoves.cpp b/src/Storages/System/StorageSystemMoves.cpp
index 9b749218283..2c43043d820 100644
--- a/src/Storages/System/StorageSystemMoves.cpp
+++ b/src/Storages/System/StorageSystemMoves.cpp
@@ -23,7 +23,7 @@ ColumnsDescription StorageSystemMoves::getColumnsDescription()
 }
 
 
-void StorageSystemMoves::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemMoves::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
diff --git a/src/Storages/System/StorageSystemMoves.h b/src/Storages/System/StorageSystemMoves.h
index acdd9642f8f..45b1e9c6121 100644
--- a/src/Storages/System/StorageSystemMoves.h
+++ b/src/Storages/System/StorageSystemMoves.h
@@ -12,7 +12,7 @@ namespace DB
 class Context;
 
 
-class StorageSystemMoves final : public IStorageSystemOneBlock<StorageSystemMoves>
+class StorageSystemMoves final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemMoves"; }
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMutations.cpp b/src/Storages/System/StorageSystemMutations.cpp
index 50545a55c7f..94656008029 100644
--- a/src/Storages/System/StorageSystemMutations.cpp
+++ b/src/Storages/System/StorageSystemMutations.cpp
@@ -9,6 +9,7 @@
 #include <Access/ContextAccess.h>
 #include <Databases/IDatabase.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 
 
 namespace DB
@@ -38,7 +39,7 @@ ColumnsDescription StorageSystemMutations::getColumnsDescription()
             "1 if the mutation is completed, "
             "0 if the mutation is still in process. "
         },
-        { "is_killed",                  std::make_shared<DataTypeUInt8>() },
+        { "is_killed",                  std::make_shared<DataTypeUInt8>(), "Only available in ClickHouse Cloud."},
         { "latest_failed_part",         std::make_shared<DataTypeString>(), "The name of the most recent part that could not be mutated."},
         { "latest_fail_time",           std::make_shared<DataTypeDateTime>(), "The date and time of the most recent part mutation failure."},
         { "latest_fail_reason",         std::make_shared<DataTypeString>(), "The exception message that caused the most recent part mutation failure."},
@@ -46,7 +47,7 @@ ColumnsDescription StorageSystemMutations::getColumnsDescription()
 }
 
 
-void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
@@ -100,7 +101,7 @@ void StorageSystemMutations::fillData(MutableColumns & res_columns, ContextPtr c
             { col_table, std::make_shared<DataTypeString>(), "table" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
             return;
diff --git a/src/Storages/System/StorageSystemMutations.h b/src/Storages/System/StorageSystemMutations.h
index 2db6e0c17f1..c60157cd853 100644
--- a/src/Storages/System/StorageSystemMutations.h
+++ b/src/Storages/System/StorageSystemMutations.h
@@ -11,7 +11,7 @@ class Context;
 
 /// Implements the `mutations` system table, which provides information about the status of mutations
 /// in the MergeTree tables.
-class StorageSystemMutations final : public IStorageSystemOneBlock<StorageSystemMutations>
+class StorageSystemMutations final : public IStorageSystemOneBlock
 {
 public:
     String getName() const override { return "SystemMutations"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemMySQLBinlogs.cpp b/src/Storages/System/StorageSystemMySQLBinlogs.cpp
index 32648d22ee8..846fe3547d0 100644
--- a/src/Storages/System/StorageSystemMySQLBinlogs.cpp
+++ b/src/Storages/System/StorageSystemMySQLBinlogs.cpp
@@ -1,11 +1,11 @@
-#include <Storages/System/StorageSystemMySQLBinlogs.h>
-
-#include <Databases/MySQL/MySQLBinlogClientFactory.h>
-#include <Processors/Sources/SourceFromSingleChunk.h>
 #include <Columns/ColumnString.h>
-#include <DataTypes/DataTypesNumber.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeString.h>
+#include <DataTypes/DataTypesNumber.h>
+#include <Databases/MySQL/MySQLBinlogClientFactory.h>
 #include <Processors/ISource.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Storages/System/StorageSystemMySQLBinlogs.h>
 
 
 namespace DB
diff --git a/src/Storages/System/StorageSystemNamedCollections.cpp b/src/Storages/System/StorageSystemNamedCollections.cpp
index 25401bb751b..156fa5e5a9b 100644
--- a/src/Storages/System/StorageSystemNamedCollections.cpp
+++ b/src/Storages/System/StorageSystemNamedCollections.cpp
@@ -25,11 +25,11 @@ ColumnsDescription StorageSystemNamedCollections::getColumnsDescription()
 }
 
 StorageSystemNamedCollections::StorageSystemNamedCollections(const StorageID & table_id_)
-    : IStorageSystemOneBlock(table_id_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription())
 {
 }
 
-void StorageSystemNamedCollections::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemNamedCollections::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & access = context->getAccess();
 
diff --git a/src/Storages/System/StorageSystemNamedCollections.h b/src/Storages/System/StorageSystemNamedCollections.h
index 596df99be83..ab302b400fc 100644
--- a/src/Storages/System/StorageSystemNamedCollections.h
+++ b/src/Storages/System/StorageSystemNamedCollections.h
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-class StorageSystemNamedCollections final : public IStorageSystemOneBlock<StorageSystemNamedCollections>
+class StorageSystemNamedCollections final : public IStorageSystemOneBlock
 {
 public:
     explicit StorageSystemNamedCollections(const StorageID & table_id_);
@@ -15,7 +15,7 @@ public:
     static ColumnsDescription getColumnsDescription();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemNumbers.cpp b/src/Storages/System/StorageSystemNumbers.cpp
index b100be7cdf4..629b11ee7f1 100644
--- a/src/Storages/System/StorageSystemNumbers.cpp
+++ b/src/Storages/System/StorageSystemNumbers.cpp
@@ -15,11 +15,19 @@
 namespace DB
 {
 
-StorageSystemNumbers::StorageSystemNumbers(const StorageID & table_id, bool multithreaded_, std::optional<UInt64> limit_, UInt64 offset_)
-    : IStorage(table_id), multithreaded(multithreaded_), limit(limit_), offset(offset_)
+StorageSystemNumbers::StorageSystemNumbers(
+    const StorageID & table_id,
+    bool multithreaded_,
+    const std::string & column_name_,
+    std::optional<UInt64> limit_,
+    UInt64 offset_,
+    UInt64 step_)
+    : IStorage(table_id), multithreaded(multithreaded_), limit(limit_), offset(offset_), column_name(column_name_), step(step_)
 {
     StorageInMemoryMetadata storage_metadata;
-    storage_metadata.setColumns(ColumnsDescription({{"number", std::make_shared<DataTypeUInt64>()}}));
+    /// This column doesn't have a comment, because otherwise it will be added to all the tables which were created via
+    /// CREATE TABLE test as numbers(5)
+    storage_metadata.setColumns(ColumnsDescription({{column_name_, std::make_shared<DataTypeUInt64>()}}));
     setInMemoryMetadata(storage_metadata);
 }
 
@@ -34,7 +42,6 @@ void StorageSystemNumbers::read(
     size_t num_streams)
 {
     query_plan.addStep(std::make_unique<ReadFromSystemNumbersStep>(
-        column_names, shared_from_this(), storage_snapshot, query_info, std::move(context), max_block_size, num_streams));
+        column_names, query_info, storage_snapshot, context, shared_from_this(), max_block_size, num_streams));
 }
-
 }
diff --git a/src/Storages/System/StorageSystemNumbers.h b/src/Storages/System/StorageSystemNumbers.h
index fe6227db406..c698bae4393 100644
--- a/src/Storages/System/StorageSystemNumbers.h
+++ b/src/Storages/System/StorageSystemNumbers.h
@@ -10,7 +10,6 @@ namespace DB
 
 class Context;
 
-
 /** Implements a table engine for the system table "numbers".
   * The table contains the only column number UInt64.
   * From this table, you can read all natural numbers, starting from 0 (to 2^64 - 1, and then again).
@@ -38,11 +37,18 @@ class Context;
   *  (and result could be out of order). If both multithreaded and limit are specified,
   *  the table could give you not exactly 1..limit range, but some arbitrary 'limit' numbers.
   */
+
 class StorageSystemNumbers final : public IStorage
 {
 public:
     /// Otherwise, streams concurrently increment atomic.
-    StorageSystemNumbers(const StorageID & table_id, bool multithreaded_, std::optional<UInt64> limit_ = std::nullopt, UInt64 offset_ = 0);
+    StorageSystemNumbers(
+        const StorageID & table_id,
+        bool multithreaded_,
+        const std::string & column_name,
+        std::optional<UInt64> limit_ = std::nullopt,
+        UInt64 offset_ = 0,
+        UInt64 step_ = 1);
 
     std::string getName() const override { return "SystemNumbers"; }
 
@@ -58,7 +64,6 @@ public:
 
     bool hasEvenlyDistributedRead() const override { return true; }
     bool isSystemStorage() const override { return true; }
-
     bool supportsTransactions() const override { return true; }
 
 private:
@@ -67,6 +72,8 @@ private:
     bool multithreaded;
     std::optional<UInt64> limit;
     UInt64 offset;
+    std::string column_name;
+    UInt64 step;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemOne.cpp b/src/Storages/System/StorageSystemOne.cpp
index 3091ffdb51a..936d55e61a0 100644
--- a/src/Storages/System/StorageSystemOne.cpp
+++ b/src/Storages/System/StorageSystemOne.cpp
@@ -15,6 +15,8 @@ StorageSystemOne::StorageSystemOne(const StorageID & table_id_)
     : IStorage(table_id_)
 {
     StorageInMemoryMetadata storage_metadata;
+    /// This column doesn't have a comment, because otherwise it will be added to all tables created via:
+    /// CREATE TABLE test (dummy UInt8) ENGINE = Distributed(`default`, `system.one`)
     storage_metadata.setColumns(ColumnsDescription({{"dummy", std::make_shared<DataTypeUInt8>()}}));
     setInMemoryMetadata(storage_metadata);
 }
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
index 1a2646d3295..9cba92bca12 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.cpp
@@ -18,33 +18,32 @@ namespace DB
 
 ColumnsDescription StorageSystemPartMovesBetweenShards::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments
     return ColumnsDescription
     {
         /// Table properties.
-        { "database",                std::make_shared<DataTypeString>() },
-        { "table",                   std::make_shared<DataTypeString>() },
+        { "database",                std::make_shared<DataTypeString>(), "The name of the database where move is performed."},
+        { "table",                   std::make_shared<DataTypeString>(), "The name of the table where move is performed."},
 
         /// Constant element properties.
-        { "task_name",               std::make_shared<DataTypeString>() },
-        { "task_uuid",               std::make_shared<DataTypeUUID>() },
-        { "create_time",             std::make_shared<DataTypeDateTime>() },
-        { "part_name",               std::make_shared<DataTypeString>() },
-        { "part_uuid",               std::make_shared<DataTypeUUID>() },
-        { "to_shard",                std::make_shared<DataTypeString>() },
-        { "dst_part_name",           std::make_shared<DataTypeString>() },
+        { "task_name",               std::make_shared<DataTypeString>(), "The name of the moving task."},
+        { "task_uuid",               std::make_shared<DataTypeUUID>(), "The identifier of the moving task."},
+        { "create_time",             std::make_shared<DataTypeDateTime>(), "The time when the task was created."},
+        { "part_name",               std::make_shared<DataTypeString>(), "The name of the part which is in a process of moving."},
+        { "part_uuid",               std::make_shared<DataTypeUUID>(), "The UUID of the part which is in a process of moving."},
+        { "to_shard",                std::make_shared<DataTypeString>(), "The name of the destination shard."},
+        { "dst_part_name",           std::make_shared<DataTypeString>(), "The result part name."},
 
         /// Processing status of item.
-        { "update_time",             std::make_shared<DataTypeDateTime>() },
-        { "state",                   std::make_shared<DataTypeString>() },
-        { "rollback",                std::make_shared<DataTypeUInt8>() },
-        { "num_tries",               std::make_shared<DataTypeUInt32>() },
-        { "last_exception",          std::make_shared<DataTypeString>() },
+        { "update_time",             std::make_shared<DataTypeDateTime>(), "The last time update was performed."},
+        { "state",                   std::make_shared<DataTypeString>(), "The current state of the move."},
+        { "rollback",                std::make_shared<DataTypeUInt8>(), "The flag which indicated whether the operation was rolled back."},
+        { "num_tries",               std::make_shared<DataTypeUInt32>(), "The number of tries to complete the operation."},
+        { "last_exception",          std::make_shared<DataTypeString>(), "The last exception name if any."},
     };
 }
 
 
-void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
@@ -95,7 +94,7 @@ void StorageSystemPartMovesBetweenShards::fillData(MutableColumns & res_columns,
             { col_table_to_filter, std::make_shared<DataTypeString>(), "table" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
             return;
diff --git a/src/Storages/System/StorageSystemPartMovesBetweenShards.h b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
index 93a26bcd1b7..6a859d4de80 100644
--- a/src/Storages/System/StorageSystemPartMovesBetweenShards.h
+++ b/src/Storages/System/StorageSystemPartMovesBetweenShards.h
@@ -9,7 +9,7 @@ namespace DB
 class Context;
 
 
-class StorageSystemPartMovesBetweenShards final : public IStorageSystemOneBlock<StorageSystemPartMovesBetweenShards>
+class StorageSystemPartMovesBetweenShards final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemShardMoves"; }
@@ -19,7 +19,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemParts.cpp b/src/Storages/System/StorageSystemParts.cpp
index b6e4ee4161e..1b800fd64a9 100644
--- a/src/Storages/System/StorageSystemParts.cpp
+++ b/src/Storages/System/StorageSystemParts.cpp
@@ -94,33 +94,33 @@ StorageSystemParts::StorageSystemParts(const StorageID & table_id_)
         {"move_ttl_info.min",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "Array of date and time values. Each element describes the minimum key value for a TTL MOVE rule."},
         {"move_ttl_info.max",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "Array of date and time values. Each element describes the maximum key value for a TTL MOVE rule."},
 
-        {"default_compression_codec",                   std::make_shared<DataTypeString>()},
+        {"default_compression_codec",                   std::make_shared<DataTypeString>(), "The name of the codec used to compress this data part (in case when there is no explicit codec for columns)."},
 
-        {"recompression_ttl_info.expression",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"recompression_ttl_info.min",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"recompression_ttl_info.max",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"recompression_ttl_info.expression",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"recompression_ttl_info.min",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"recompression_ttl_info.max",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
 
-        {"group_by_ttl_info.expression",                std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"group_by_ttl_info.min",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"group_by_ttl_info.max",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"group_by_ttl_info.expression",                std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"group_by_ttl_info.min",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"group_by_ttl_info.max",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
 
-        {"rows_where_ttl_info.expression",              std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"rows_where_ttl_info.min",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"rows_where_ttl_info.expression",              std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"rows_where_ttl_info.min",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
 
-        {"projections",                                 std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"projections",                                 std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of projection names calculated for this part."},
 
-        {"visible",                                     std::make_shared<DataTypeUInt8>()},
-        {"creation_tid",                                getTransactionIDDataType()},
-        {"removal_tid_lock",                            std::make_shared<DataTypeUInt64>()},
-        {"removal_tid",                                 getTransactionIDDataType()},
-        {"creation_csn",                                std::make_shared<DataTypeUInt64>()},
-        {"removal_csn",                                 std::make_shared<DataTypeUInt64>()},
+        {"visible",                                     std::make_shared<DataTypeUInt8>(), "Flag which indicated whether this part is visible for SELECT queries."},
+        {"creation_tid",                                getTransactionIDDataType(), "ID of transaction that has created/is trying to create this object."},
+        {"removal_tid_lock",                            std::make_shared<DataTypeUInt64>(), "Hash of removal_tid, used to lock an object for removal."},
+        {"removal_tid",                                 getTransactionIDDataType(), "ID of transaction that has removed/is trying to remove this object"},
+        {"creation_csn",                                std::make_shared<DataTypeUInt64>(), "CSN of transaction that has created this object"},
+        {"removal_csn",                                 std::make_shared<DataTypeUInt64>(), "CSN of transaction that has removed this object"},
 
-        {"has_lightweight_delete",                      std::make_shared<DataTypeUInt8>()},
+        {"has_lightweight_delete",                      std::make_shared<DataTypeUInt8>(), "The flag which indicated whether the part has lightweight delete mask."},
 
-        {"last_removal_attempt_time",                   std::make_shared<DataTypeDateTime>()},
-        {"removal_state",                               std::make_shared<DataTypeString>()},
+        {"last_removal_attempt_time",                   std::make_shared<DataTypeDateTime>(), "The last time the server tried to delete this part."},
+        {"removal_state",                               std::make_shared<DataTypeString>(), "The current state of part removal process."},
     }
     )
 {
diff --git a/src/Storages/System/StorageSystemPartsBase.cpp b/src/Storages/System/StorageSystemPartsBase.cpp
index 48dab8c4777..b1ea2dd3f2b 100644
--- a/src/Storages/System/StorageSystemPartsBase.cpp
+++ b/src/Storages/System/StorageSystemPartsBase.cpp
@@ -2,6 +2,9 @@
 #include <Storages/ColumnsDescription.h>
 #include <Storages/System/StorageSystemPartsBase.h>
 #include <Common/escapeForFileName.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 #include <Columns/ColumnString.h>
 #include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
@@ -19,7 +22,16 @@
 #include <Processors/Sources/SourceFromSingleChunk.h>
 #include <QueryPipeline/Pipe.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 
+namespace
+{
+constexpr auto * database_column_name = "database";
+constexpr auto * table_column_name = "table";
+constexpr auto * engine_column_name = "engine";
+constexpr auto * active_column_name = "active";
+constexpr auto * storage_uuid_column_name = "storage_uuid";
+}
 
 namespace DB
 {
@@ -79,7 +91,7 @@ StoragesInfo::getProjectionParts(MergeTreeData::DataPartStateVector & state, boo
     return data->getProjectionPartsVectorForInternalUsage({State::Active}, &state);
 }
 
-StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context)
+StoragesInfoStream::StoragesInfoStream(const ActionsDAGPtr & filter_by_database, const ActionsDAGPtr & filter_by_other_columns, ContextPtr context)
     : StoragesInfoStreamBase(context)
 {
     /// Will apply WHERE to subset of columns and then add more columns.
@@ -108,14 +120,15 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, Conte
                 database_column_mut->insert(database.first);
         }
         block_to_filter.insert(ColumnWithTypeAndName(
-            std::move(database_column_mut), std::make_shared<DataTypeString>(), "database"));
+            std::move(database_column_mut), std::make_shared<DataTypeString>(), database_column_name));
 
         /// Filter block_to_filter with column 'database'.
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, block_to_filter, context);
+        if (filter_by_database)
+            VirtualColumnUtils::filterBlockWithDAG(filter_by_database, block_to_filter, context);
         rows = block_to_filter.rows();
 
         /// Block contains new columns, update database_column.
-        ColumnPtr database_column_for_filter = block_to_filter.getByName("database").column;
+        ColumnPtr database_column_for_filter = block_to_filter.getByName(database_column_name).column;
 
         if (rows)
         {
@@ -138,7 +151,7 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, Conte
 
                     String engine_name = storage->getName();
                     UUID storage_uuid = storage->getStorageID().uuid;
-                    if (database->getEngineName() == "Ordinary")
+                    if (storage_uuid == UUIDHelpers::Nil)
                     {
                         SipHash hash;
                         hash.update(database_name);
@@ -182,26 +195,99 @@ StoragesInfoStream::StoragesInfoStream(const SelectQueryInfo & query_info, Conte
         }
     }
 
-    block_to_filter.insert(ColumnWithTypeAndName(std::move(table_column_mut), std::make_shared<DataTypeString>(), "table"));
-    block_to_filter.insert(ColumnWithTypeAndName(std::move(engine_column_mut), std::make_shared<DataTypeString>(), "engine"));
-    block_to_filter.insert(ColumnWithTypeAndName(std::move(active_column_mut), std::make_shared<DataTypeUInt8>(), "active"));
-    block_to_filter.insert(ColumnWithTypeAndName(std::move(storage_uuid_column_mut), std::make_shared<DataTypeUUID>(), "uuid"));
+    block_to_filter.insert(ColumnWithTypeAndName(std::move(table_column_mut), std::make_shared<DataTypeString>(), table_column_name));
+    block_to_filter.insert(ColumnWithTypeAndName(std::move(engine_column_mut), std::make_shared<DataTypeString>(), engine_column_name));
+    block_to_filter.insert(ColumnWithTypeAndName(std::move(active_column_mut), std::make_shared<DataTypeUInt8>(), active_column_name));
+    block_to_filter.insert(ColumnWithTypeAndName(std::move(storage_uuid_column_mut), std::make_shared<DataTypeUUID>(), storage_uuid_column_name));
 
     if (rows)
     {
         /// Filter block_to_filter with columns 'database', 'table', 'engine', 'active'.
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, block_to_filter, context);
+        if (filter_by_other_columns)
+            VirtualColumnUtils::filterBlockWithDAG(filter_by_other_columns, block_to_filter, context);
         rows = block_to_filter.rows();
     }
 
-    database_column = block_to_filter.getByName("database").column;
-    table_column = block_to_filter.getByName("table").column;
-    active_column = block_to_filter.getByName("active").column;
-    storage_uuid_column = block_to_filter.getByName("uuid").column;
+    database_column = block_to_filter.getByName(database_column_name).column;
+    table_column = block_to_filter.getByName(table_column_name).column;
+    active_column = block_to_filter.getByName(active_column_name).column;
+    storage_uuid_column = block_to_filter.getByName(storage_uuid_column_name).column;
 }
 
+class ReadFromSystemPartsBase : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromSystemPartsBase"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
-Pipe StorageSystemPartsBase::read(
+    ReadFromSystemPartsBase(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::shared_ptr<StorageSystemPartsBase> storage_,
+        std::vector<UInt8> columns_mask_,
+        bool has_state_column_);
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+protected:
+    std::shared_ptr<StorageSystemPartsBase> storage;
+    std::vector<UInt8> columns_mask;
+    const bool has_state_column;
+    ActionsDAGPtr filter_by_database;
+    ActionsDAGPtr filter_by_other_columns;
+};
+
+ReadFromSystemPartsBase::ReadFromSystemPartsBase(
+    const Names & column_names_,
+    const SelectQueryInfo & query_info_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
+    Block sample_block,
+    std::shared_ptr<StorageSystemPartsBase> storage_,
+    std::vector<UInt8> columns_mask_,
+    bool has_state_column_)
+    : SourceStepWithFilter(
+        DataStream{.header = std::move(sample_block)},
+        column_names_,
+        query_info_,
+        storage_snapshot_,
+        context_)
+    , storage(std::move(storage_))
+    , columns_mask(std::move(columns_mask_))
+    , has_state_column(has_state_column_)
+{
+}
+
+void ReadFromSystemPartsBase::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+    {
+        const auto * predicate = filter_actions_dag->getOutputs().at(0);
+
+        Block block;
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), database_column_name));
+
+        filter_by_database = VirtualColumnUtils::splitFilterDagForAllowedInputs(predicate, &block);
+        if (filter_by_database)
+            VirtualColumnUtils::buildSetsForDAG(filter_by_database, context);
+
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), table_column_name));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeString>(), engine_column_name));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeUInt8>(), active_column_name));
+        block.insert(ColumnWithTypeAndName({}, std::make_shared<DataTypeUUID>(), storage_uuid_column_name));
+
+        filter_by_other_columns = VirtualColumnUtils::splitFilterDagForAllowedInputs(predicate, &block);
+        if (filter_by_other_columns)
+            VirtualColumnUtils::buildSetsForDAG(filter_by_other_columns, context);
+    }
+}
+
+void StorageSystemPartsBase::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
@@ -212,29 +298,39 @@ Pipe StorageSystemPartsBase::read(
 {
     bool has_state_column = hasStateColumn(column_names, storage_snapshot);
 
-    auto stream = getStoragesInfoStream(query_info, context);
-
     /// Create the result.
     Block sample = storage_snapshot->metadata->getSampleBlock();
 
     auto [columns_mask, header] = getQueriedColumnsMaskAndHeader(sample, column_names);
 
-    MutableColumns res_columns = header.cloneEmptyColumns();
     if (has_state_column)
-        res_columns.push_back(ColumnString::create());
+        header.insert(ColumnWithTypeAndName(std::make_shared<DataTypeString>(), "_state"));
+
+    auto this_ptr = std::static_pointer_cast<StorageSystemPartsBase>(shared_from_this());
+
+    auto reading = std::make_unique<ReadFromSystemPartsBase>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(header), std::move(this_ptr), std::move(columns_mask), has_state_column);
+
+    query_plan.addStep(std::move(reading));
+}
+
+void ReadFromSystemPartsBase::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto stream = storage->getStoragesInfoStream(filter_by_database, filter_by_other_columns, context);
+    auto header = getOutputStream().header;
+
+    MutableColumns res_columns = header.cloneEmptyColumns();
 
     while (StoragesInfo info = stream->next())
     {
-        processNextStorage(context, res_columns, columns_mask, info, has_state_column);
+        storage->processNextStorage(context, res_columns, columns_mask, info, has_state_column);
     }
 
-    if (has_state_column)
-        header.insert(ColumnWithTypeAndName(std::make_shared<DataTypeString>(), "_state"));
-
     UInt64 num_rows = res_columns.at(0)->size();
     Chunk chunk(std::move(res_columns), num_rows);
 
-    return Pipe(std::make_shared<SourceFromSingleChunk>(std::move(header), std::move(chunk)));
+    pipeline.init(Pipe(std::make_shared<SourceFromSingleChunk>(std::move(header), std::move(chunk))));
 }
 
 
@@ -259,12 +355,10 @@ StorageSystemPartsBase::StorageSystemPartsBase(const StorageID & table_id_, Colu
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(columns);
     setInMemoryMetadata(storage_metadata);
+
+    VirtualColumnsDescription virtuals;
+    virtuals.addEphemeral("_state", std::make_shared<DataTypeString>(), "");
+    setVirtuals(std::move(virtuals));
 }
 
-NamesAndTypesList StorageSystemPartsBase::getVirtuals() const
-{
-    return NamesAndTypesList{
-        NameAndTypePair("_state", std::make_shared<DataTypeString>())
-    };
-}
 }
diff --git a/src/Storages/System/StorageSystemPartsBase.h b/src/Storages/System/StorageSystemPartsBase.h
index 0a45d0f9dfe..be945162b39 100644
--- a/src/Storages/System/StorageSystemPartsBase.h
+++ b/src/Storages/System/StorageSystemPartsBase.h
@@ -3,6 +3,7 @@
 #include <Formats/FormatSettings.h>
 #include <Storages/IStorage.h>
 #include <Storages/MergeTree/MergeTreeData.h>
+#include <Processors/QueryPlan/SourceStepWithFilter.h>
 
 
 namespace DB
@@ -37,7 +38,7 @@ struct StoragesInfo
 class StoragesInfoStreamBase
 {
 public:
-    StoragesInfoStreamBase(ContextPtr context)
+    explicit StoragesInfoStreamBase(ContextPtr context)
         : query_id(context->getCurrentQueryId()), settings(context->getSettingsRef()), next_row(0), rows(0)
     {}
 
@@ -93,7 +94,7 @@ protected:
         // nullptr means table was dropped while acquiring the lock
         return info.table_lock != nullptr;
     }
-protected:
+
     String query_id;
     Settings settings;
 
@@ -114,7 +115,7 @@ protected:
 class StoragesInfoStream : public StoragesInfoStreamBase
 {
 public:
-    StoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context);
+    StoragesInfoStream(const ActionsDAGPtr & filter_by_database, const ActionsDAGPtr & filter_by_other_columns, ContextPtr context);
 };
 
 /** Implements system table 'parts' which allows to get information about data parts for tables of MergeTree family.
@@ -122,7 +123,8 @@ public:
 class StorageSystemPartsBase : public IStorage
 {
 public:
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
@@ -131,21 +133,21 @@ public:
         size_t max_block_size,
         size_t num_streams) override;
 
-    NamesAndTypesList getVirtuals() const override;
-
     bool isSystemStorage() const override { return true; }
 
 private:
     static bool hasStateColumn(const Names & column_names, const StorageSnapshotPtr & storage_snapshot);
 
 protected:
+    friend class ReadFromSystemPartsBase;
+
     const FormatSettings format_settings = {};
 
     StorageSystemPartsBase(const StorageID & table_id_, ColumnsDescription && columns);
 
-    virtual std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(const SelectQueryInfo & query_info, ContextPtr context)
+    virtual std::unique_ptr<StoragesInfoStreamBase> getStoragesInfoStream(const ActionsDAGPtr & filter_by_database, const ActionsDAGPtr & filter_by_other_columns, ContextPtr context)
     {
-        return std::make_unique<StoragesInfoStream>(query_info, context);
+        return std::make_unique<StoragesInfoStream>(filter_by_database, filter_by_other_columns, context);
     }
 
     virtual void
diff --git a/src/Storages/System/StorageSystemPartsColumns.cpp b/src/Storages/System/StorageSystemPartsColumns.cpp
index 833a5e1ec16..f34b0e0cfda 100644
--- a/src/Storages/System/StorageSystemPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemPartsColumns.cpp
@@ -22,59 +22,60 @@ namespace DB
 StorageSystemPartsColumns::StorageSystemPartsColumns(const StorageID & table_id_)
     : StorageSystemPartsBase(table_id_,
     ColumnsDescription{
-        {"partition",                                  std::make_shared<DataTypeString>()},
-        {"name",                                       std::make_shared<DataTypeString>()},
-        {"uuid",                                       std::make_shared<DataTypeUUID>()},
-        {"part_type",                                  std::make_shared<DataTypeString>()},
-        {"active",                                     std::make_shared<DataTypeUInt8>()},
-        {"marks",                                      std::make_shared<DataTypeUInt64>()},
-        {"rows",                                       std::make_shared<DataTypeUInt64>()},
-        {"bytes_on_disk",                              std::make_shared<DataTypeUInt64>()},
-        {"data_compressed_bytes",                      std::make_shared<DataTypeUInt64>()},
-        {"data_uncompressed_bytes",                    std::make_shared<DataTypeUInt64>()},
-        {"marks_bytes",                                std::make_shared<DataTypeUInt64>()},
-        {"modification_time",                          std::make_shared<DataTypeDateTime>()},
-        {"remove_time",                                std::make_shared<DataTypeDateTime>()},
-        {"refcount",                                   std::make_shared<DataTypeUInt32>()},
-        {"min_date",                                   std::make_shared<DataTypeDate>()},
-        {"max_date",                                   std::make_shared<DataTypeDate>()},
-        {"min_time",                                   std::make_shared<DataTypeDateTime>()},
-        {"max_time",                                   std::make_shared<DataTypeDateTime>()},
-        {"partition_id",                               std::make_shared<DataTypeString>()},
-        {"min_block_number",                           std::make_shared<DataTypeInt64>()},
-        {"max_block_number",                           std::make_shared<DataTypeInt64>()},
-        {"level",                                      std::make_shared<DataTypeUInt32>()},
-        {"data_version",                               std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory",                std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory_allocated",      std::make_shared<DataTypeUInt64>()},
+        {"partition",                                  std::make_shared<DataTypeString>(), "The partition name."},
+        {"name",                                       std::make_shared<DataTypeString>(), "Name of the data part."},
+        {"uuid",                                       std::make_shared<DataTypeUUID>(), "The parts UUID."},
+        {"part_type",                                  std::make_shared<DataTypeString>(), "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."},
+        {"active",                                     std::make_shared<DataTypeUInt8>(), "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",                                      std::make_shared<DataTypeUInt64>(), "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",                                       std::make_shared<DataTypeUInt64>(), "The number of rows."},
+        {"bytes_on_disk",                              std::make_shared<DataTypeUInt64>(), "Total size of all the data part files in bytes."},
+        {"data_compressed_bytes",                      std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"data_uncompressed_bytes",                    std::make_shared<DataTypeUInt64>(), "Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"marks_bytes",                                std::make_shared<DataTypeUInt64>(),"The size of the file with marks."},
+        {"modification_time",                          std::make_shared<DataTypeDateTime>(), "The time the directory with the data part was modified. This usually corresponds to the time of data part creation."},
+        {"remove_time",                                std::make_shared<DataTypeDateTime>(), "The time when the data part became inactive."},
+        {"refcount",                                   std::make_shared<DataTypeUInt32>(), "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",                                   std::make_shared<DataTypeDate>(), "The minimum value for the Date column if that is included in the partition key."},
+        {"max_date",                                   std::make_shared<DataTypeDate>(), "The maximum value for the Date column if that is included in the partition key."},
+        {"min_time",                                   std::make_shared<DataTypeDateTime>(), "The minimum value for the DateTime column if that is included in the partition key."},
+        {"max_time",                                   std::make_shared<DataTypeDateTime>(), "The maximum value for the DateTime column if that is included in the partition key."},
+        {"partition_id",                               std::make_shared<DataTypeString>(), "ID of the partition."},
+        {"min_block_number",                           std::make_shared<DataTypeInt64>(),  "The minimum number of data parts that make up the current part after merging."},
+        {"max_block_number",                           std::make_shared<DataTypeInt64>(),  "The maximum number of data parts that make up the current part after merging."},
+        {"level",                                      std::make_shared<DataTypeUInt32>(), "Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts."},
+        {"data_version",                               std::make_shared<DataTypeUInt64>(), "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",                std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) used by primary key values."},
+        {"primary_key_bytes_in_memory_allocated",      std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) reserved for primary key values."},
 
-        {"database",                                   std::make_shared<DataTypeString>()},
-        {"table",                                      std::make_shared<DataTypeString>()},
-        {"engine",                                     std::make_shared<DataTypeString>()},
-        {"disk_name",                                  std::make_shared<DataTypeString>()},
-        {"path",                                       std::make_shared<DataTypeString>()},
+        {"database",                                   std::make_shared<DataTypeString>(), "Name of the database."},
+        {"table",                                      std::make_shared<DataTypeString>(), "Name of the table."},
+        {"engine",                                     std::make_shared<DataTypeString>(), "Name of the table engine without parameters."},
+        {"disk_name",                                  std::make_shared<DataTypeString>(), "Name of a disk that stores the data part."},
+        {"path",                                       std::make_shared<DataTypeString>(), "Absolute path to the folder with data part files."},
 
-        {"column",                                     std::make_shared<DataTypeString>()},
-        {"type",                                       std::make_shared<DataTypeString>()},
-        {"column_position",                            std::make_shared<DataTypeUInt64>()},
-        {"default_kind",                               std::make_shared<DataTypeString>()},
-        {"default_expression",                         std::make_shared<DataTypeString>()},
-        {"column_bytes_on_disk",                       std::make_shared<DataTypeUInt64>()},
-        {"column_data_compressed_bytes",               std::make_shared<DataTypeUInt64>()},
-        {"column_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>()},
-        {"column_marks_bytes",                         std::make_shared<DataTypeUInt64>()},
-        {"column_modification_time",                   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
+        {"column",                                     std::make_shared<DataTypeString>(), "Name of the column."},
+        {"type",                                       std::make_shared<DataTypeString>(), "Column type."},
+        {"column_position",                            std::make_shared<DataTypeUInt64>(), "Ordinal position of a column in a table starting with 1."},
+        {"default_kind",                               std::make_shared<DataTypeString>(), "Expression type (DEFAULT, MATERIALIZED, ALIAS) for the default value, or an empty string if it is not defined."},
+        {"default_expression",                         std::make_shared<DataTypeString>(), "Expression for the default value, or an empty string if it is not defined."},
+        {"column_bytes_on_disk",                       std::make_shared<DataTypeUInt64>(), "Total size of the column in bytes."},
+        {"column_data_compressed_bytes",               std::make_shared<DataTypeUInt64>(), "Total size of the compressed data in the column, in bytes."},
+        {"column_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>(), "Total size of the decompressed data in the column, in bytes."},
+        {"column_marks_bytes",                         std::make_shared<DataTypeUInt64>(), "The size of the marks for column, in bytes."},
+        {"column_modification_time",                   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "The last time the column was modified."},
 
-        {"serialization_kind",                         std::make_shared<DataTypeString>()},
-        {"substreams",                                 std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"filenames",                                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"subcolumns.names",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"subcolumns.types",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"subcolumns.serializations",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"subcolumns.bytes_on_disk",                   std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"subcolumns.data_compressed_bytes",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"subcolumns.data_uncompressed_bytes",         std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
-        {"subcolumns.marks_bytes",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>())},
+        {"serialization_kind",                         std::make_shared<DataTypeString>(), "Kind of serialization of a column"},
+        {"substreams",                                 std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Names of substreams to which column is serialized"},
+        {"filenames",                                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Names of files for each substream of a column respectively"},
+        {"subcolumns.names",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Names of subcolumns of a column"},
+        {"subcolumns.types",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Types of subcolumns of a column"},
+        {"subcolumns.serializations",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Kinds of serialization of subcolumns of a column"},
+        {"subcolumns.bytes_on_disk",                   std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Sizes in bytes for each subcolumn"},
+        {"subcolumns.data_compressed_bytes",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Sizes of the compressed data for each subcolumn, in bytes"},
+        {"subcolumns.data_uncompressed_bytes",         std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Sizes of the decompressed data for each subcolumn, in bytes"},
+        {"subcolumns.marks_bytes",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "Sizes of the marks for each subcolumn of a column, in bytes"},
     }
     )
 {
diff --git a/src/Storages/System/StorageSystemPrivileges.cpp b/src/Storages/System/StorageSystemPrivileges.cpp
index f45f3c6ed01..58dcf62115e 100644
--- a/src/Storages/System/StorageSystemPrivileges.cpp
+++ b/src/Storages/System/StorageSystemPrivileges.cpp
@@ -29,6 +29,7 @@ namespace
         VIEW,
         COLUMN,
         NAMED_COLLECTION,
+        USER_NAME,
     };
 
     DataTypeEnum8::Values getLevelEnumValues()
@@ -41,6 +42,7 @@ namespace
         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));
+        enum_values.emplace_back("USER_NAME", static_cast<Int8>(USER_NAME));
         return enum_values;
     }
 }
@@ -66,18 +68,26 @@ const std::vector<std::pair<String, Int16>> & StorageSystemPrivileges::getAccess
 
 ColumnsDescription StorageSystemPrivileges::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments.
-    return ColumnsDescription
-    {
-        {"privilege", std::make_shared<DataTypeEnum16>(getAccessTypeEnumValues())},
-        {"aliases", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"level", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getLevelEnumValues()))},
-        {"parent_group", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum16>(getAccessTypeEnumValues()))},
+    return ColumnsDescription{
+        {"privilege",
+         std::make_shared<DataTypeEnum16>(getAccessTypeEnumValues()),
+         "Name of a privilege which can be used in the GRANT command."},
+        {"aliases",
+         std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),
+         "List of aliases which can be used instead of the name of the privilege."},
+        {"level",
+         std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getLevelEnumValues())),
+         "Level of the privilege. GLOBAL privileges can be granted only globally (ON *.*), DATABASE privileges can be granted "
+         "on a specific database (ON <database>.*) or globally (ON *.*), TABLE privileges can be granted either on a specific table or "
+         "on a specific database or globally, and COLUMN privileges can be granted like TABLE privileges but also allow to specify columns."},
+        {"parent_group", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum16>(getAccessTypeEnumValues())),
+         "Parent privilege - if the parent privilege is granted then all its children privileges are considered as granted too."
+        },
     };
 }
 
 
-void StorageSystemPrivileges::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemPrivileges::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     size_t column_index = 0;
     auto & column_access_type = assert_cast<ColumnInt16 &>(*res_columns[column_index++]).getData();
diff --git a/src/Storages/System/StorageSystemPrivileges.h b/src/Storages/System/StorageSystemPrivileges.h
index 4441cf78d5c..eaef7f0db6d 100644
--- a/src/Storages/System/StorageSystemPrivileges.h
+++ b/src/Storages/System/StorageSystemPrivileges.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `privileges` system table, which allows you to get information about access types.
-class StorageSystemPrivileges final : public IStorageSystemOneBlock<StorageSystemPrivileges>
+class StorageSystemPrivileges final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemPrivileges"; }
@@ -17,7 +17,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemProcesses.cpp b/src/Storages/System/StorageSystemProcesses.cpp
index 6702e68b81e..bef98e59687 100644
--- a/src/Storages/System/StorageSystemProcesses.cpp
+++ b/src/Storages/System/StorageSystemProcesses.cpp
@@ -21,35 +21,35 @@ ColumnsDescription StorageSystemProcesses::getColumnsDescription()
 {
     auto description = ColumnsDescription
     {
-        {"is_initial_query", std::make_shared<DataTypeUInt8>()},
+        {"is_initial_query", std::make_shared<DataTypeUInt8>(), "Whether this query comes directly from user or was issues by ClickHouse server in a scope of distributed query execution."},
 
         {"user", std::make_shared<DataTypeString>(), "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."},
         {"query_id", std::make_shared<DataTypeString>(), "Query ID, if defined."},
-        {"address", DataTypeFactory::instance().get("IPv6"), "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."},
-        {"port", std::make_shared<DataTypeUInt16>()},
+        {"address", DataTypeFactory::instance().get("IPv6"), "The IP address the query 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."},
+        {"port", std::make_shared<DataTypeUInt16>(), "The client port the query was made from."},
 
-        {"initial_user", std::make_shared<DataTypeString>()},
-        {"initial_query_id", std::make_shared<DataTypeString>()},
-        {"initial_address", DataTypeFactory::instance().get("IPv6")},
-        {"initial_port", std::make_shared<DataTypeUInt16>()},
+        {"initial_user", std::make_shared<DataTypeString>(), "Name of the user who ran the initial query (for distributed query execution)."},
+        {"initial_query_id", std::make_shared<DataTypeString>(), "ID of the initial query (for distributed query execution)."},
+        {"initial_address", DataTypeFactory::instance().get("IPv6"), "IP address that the parent query was launched from."},
+        {"initial_port", std::make_shared<DataTypeUInt16>(), "The client port that was used to make the parent query."},
 
-        {"interface", std::make_shared<DataTypeUInt8>()},
+        {"interface", std::make_shared<DataTypeUInt8>(), "The interface which was used to send the query. TCP = 1, HTTP = 2, GRPC = 3, MYSQL = 4, POSTGRESQL = 5, LOCAL = 6, TCP_INTERSERVER = 7."},
 
-        {"os_user", std::make_shared<DataTypeString>()},
-        {"client_hostname", std::make_shared<DataTypeString>()},
-        {"client_name", std::make_shared<DataTypeString>()},
-        {"client_revision", std::make_shared<DataTypeUInt64>()},
-        {"client_version_major", std::make_shared<DataTypeUInt64>()},
-        {"client_version_minor", std::make_shared<DataTypeUInt64>()},
-        {"client_version_patch", std::make_shared<DataTypeUInt64>()},
+        {"os_user", std::make_shared<DataTypeString>(), "Operating system username who runs clickhouse-client."},
+        {"client_hostname", std::make_shared<DataTypeString>(), "Hostname of the client machine where the clickhouse-client or another TCP client is run."},
+        {"client_name", std::make_shared<DataTypeString>(), "The clickhouse-client or another TCP client name."},
+        {"client_revision", std::make_shared<DataTypeUInt64>(), "Revision of the clickhouse-client or another TCP client."},
+        {"client_version_major", std::make_shared<DataTypeUInt64>(), "Major version of the clickhouse-client or another TCP client."},
+        {"client_version_minor", std::make_shared<DataTypeUInt64>(), "Minor version of the clickhouse-client or another TCP client."},
+        {"client_version_patch", std::make_shared<DataTypeUInt64>(), "Patch component of the clickhouse-client or another TCP client version."},
 
-        {"http_method", std::make_shared<DataTypeUInt8>()},
-        {"http_user_agent", std::make_shared<DataTypeString>()},
-        {"http_referer", std::make_shared<DataTypeString>()},
-        {"forwarded_for", std::make_shared<DataTypeString>()},
+        {"http_method", std::make_shared<DataTypeUInt8>(), "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", std::make_shared<DataTypeString>(), "HTTP header UserAgent passed in the HTTP query."},
+        {"http_referer", std::make_shared<DataTypeString>(), "HTTP header Referer passed in the HTTP query (contains an absolute or partial address of the page making the query)."},
+        {"forwarded_for", std::make_shared<DataTypeString>(), "HTTP header X-Forwarded-For passed in the HTTP query."},
 
-        {"quota_key", std::make_shared<DataTypeString>()},
-        {"distributed_depth", std::make_shared<DataTypeUInt64>()},
+        {"quota_key", std::make_shared<DataTypeString>(), "The quota key specified in the quotas setting (see keyed)."},
+        {"distributed_depth", std::make_shared<DataTypeUInt64>(), "The number of times query was retransmitted between server nodes internally."},
 
         {"elapsed", std::make_shared<DataTypeFloat64>(), "The time in seconds since request execution started."},
         {"is_cancelled", std::make_shared<DataTypeUInt8>(), "Was query cancelled."},
@@ -57,18 +57,18 @@ ColumnsDescription StorageSystemProcesses::getColumnsDescription()
         {"read_rows", std::make_shared<DataTypeUInt64>(), "The number of rows read from the table. For distributed processing, on the requestor server, this is the total for all remote servers."},
         {"read_bytes", std::make_shared<DataTypeUInt64>(), "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", std::make_shared<DataTypeUInt64>(), "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."},
-        {"written_rows", std::make_shared<DataTypeUInt64>()},
-        {"written_bytes", std::make_shared<DataTypeUInt64>()},
+        {"written_rows", std::make_shared<DataTypeUInt64>(), "The amount of rows written to the storage."},
+        {"written_bytes", std::make_shared<DataTypeUInt64>(), "The amount of bytes written to the storage."},
         {"memory_usage", std::make_shared<DataTypeInt64>(), "Amount of RAM the query uses. It might not include some types of dedicated memory"},
-        {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
+        {"peak_memory_usage", std::make_shared<DataTypeInt64>(), "The current peak of memory usage."},
         {"query", std::make_shared<DataTypeString>(), "The query text. For INSERT, it does not include the data to insert."},
-        {"query_kind", std::make_shared<DataTypeString>()},
+        {"query_kind", std::make_shared<DataTypeString>(), "The type of the query - SELECT, INSERT, etc."},
 
-        {"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>())},
+        {"thread_ids", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "The list of identificators of all threads which executed this query."},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "ProfileEvents calculated for this query."},
+        {"Settings", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeString>()), "The list of modified user-level settings."},
 
-        {"current_database", std::make_shared<DataTypeString>()},
+        {"current_database", std::make_shared<DataTypeString>(), "The name of the current database."},
     };
 
     description.setAliases({
@@ -81,7 +81,7 @@ ColumnsDescription StorageSystemProcesses::getColumnsDescription()
     return description;
 }
 
-void StorageSystemProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     ProcessList::Info info = context->getProcessList().getInfo(true, true, true);
 
diff --git a/src/Storages/System/StorageSystemProcesses.h b/src/Storages/System/StorageSystemProcesses.h
index 3017f9fd367..eb241d4b1ae 100644
--- a/src/Storages/System/StorageSystemProcesses.h
+++ b/src/Storages/System/StorageSystemProcesses.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `processes` system table, which allows you to get information about the queries that are currently executing.
   */
-class StorageSystemProcesses final : public IStorageSystemOneBlock<StorageSystemProcesses>
+class StorageSystemProcesses final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemProcesses"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemProjectionParts.cpp b/src/Storages/System/StorageSystemProjectionParts.cpp
index 016705f4e66..c44c1fd1ea5 100644
--- a/src/Storages/System/StorageSystemProjectionParts.cpp
+++ b/src/Storages/System/StorageSystemProjectionParts.cpp
@@ -19,73 +19,76 @@ namespace DB
 StorageSystemProjectionParts::StorageSystemProjectionParts(const StorageID & table_id_)
     : StorageSystemPartsBase(table_id_,
     ColumnsDescription{
-        {"partition",                                   std::make_shared<DataTypeString>()},
-        {"name",                                        std::make_shared<DataTypeString>()},
-        {"part_type",                                   std::make_shared<DataTypeString>()},
-        {"parent_name",                                 std::make_shared<DataTypeString>()},
-        {"parent_uuid",                                 std::make_shared<DataTypeUUID>()},
-        {"parent_part_type",                            std::make_shared<DataTypeString>()},
-        {"active",                                      std::make_shared<DataTypeUInt8>()},
-        {"marks",                                       std::make_shared<DataTypeUInt64>()},
-        {"rows",                                        std::make_shared<DataTypeUInt64>()},
-        {"bytes_on_disk",                               std::make_shared<DataTypeUInt64>()},
-        {"data_compressed_bytes",                       std::make_shared<DataTypeUInt64>()},
-        {"data_uncompressed_bytes",                     std::make_shared<DataTypeUInt64>()},
-        {"marks_bytes",                                 std::make_shared<DataTypeUInt64>()},
-        {"parent_marks",                                std::make_shared<DataTypeUInt64>()},
-        {"parent_rows",                                 std::make_shared<DataTypeUInt64>()},
-        {"parent_bytes_on_disk",                        std::make_shared<DataTypeUInt64>()},
-        {"parent_data_compressed_bytes",                std::make_shared<DataTypeUInt64>()},
-        {"parent_data_uncompressed_bytes",              std::make_shared<DataTypeUInt64>()},
-        {"parent_marks_bytes",                          std::make_shared<DataTypeUInt64>()},
-        {"modification_time",                           std::make_shared<DataTypeDateTime>()},
-        {"remove_time",                                 std::make_shared<DataTypeDateTime>()},
-        {"refcount",                                    std::make_shared<DataTypeUInt32>()},
-        {"min_date",                                    std::make_shared<DataTypeDate>()},
-        {"max_date",                                    std::make_shared<DataTypeDate>()},
-        {"min_time",                                    std::make_shared<DataTypeDateTime>()},
-        {"max_time",                                    std::make_shared<DataTypeDateTime>()},
-        {"partition_id",                                std::make_shared<DataTypeString>()},
-        {"min_block_number",                            std::make_shared<DataTypeInt64>()},
-        {"max_block_number",                            std::make_shared<DataTypeInt64>()},
-        {"level",                                       std::make_shared<DataTypeUInt32>()},
-        {"data_version",                                std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory",                 std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory_allocated",       std::make_shared<DataTypeUInt64>()},
-        {"is_frozen",                                   std::make_shared<DataTypeUInt8>()},
+        {"partition",                                   std::make_shared<DataTypeString>(), "The partition name."},
+        {"name",                                        std::make_shared<DataTypeString>(), "Name of the data part."},
+        {"part_type",                                   std::make_shared<DataTypeString>(), "The data part storing format. Possible Values: Wide (a file per column) and Compact (a single file for all columns)."},
+        {"parent_name",                                 std::make_shared<DataTypeString>(), "The name of the source (parent) data part."},
+        {"parent_uuid",                                 std::make_shared<DataTypeUUID>(),   "The UUID of the source (parent) data part."},
+        {"parent_part_type",                            std::make_shared<DataTypeString>(), "The source (parent) data part storing format."},
+        {"active",                                      std::make_shared<DataTypeUInt8>(),  "Flag that indicates whether the data part is active. If a data part is active, it's used in a table. Otherwise, it's about to be deleted. Inactive data parts appear after merging and mutating operations."},
+        {"marks",                                       std::make_shared<DataTypeUInt64>(), "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",                                        std::make_shared<DataTypeUInt64>(), "The number of rows."},
+        {"bytes_on_disk",                               std::make_shared<DataTypeUInt64>(), "Total size of all the data part files in bytes."},
+        {"data_compressed_bytes",                       std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"data_uncompressed_bytes",                     std::make_shared<DataTypeUInt64>(), "Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"marks_bytes",                                 std::make_shared<DataTypeUInt64>(), "The size of the file with marks."},
+        {"parent_marks",                                std::make_shared<DataTypeUInt64>(), "The number of marks in the source (parent) part."},
+        {"parent_rows",                                 std::make_shared<DataTypeUInt64>(), "The number of rows in the source (parent) part."},
+        {"parent_bytes_on_disk",                        std::make_shared<DataTypeUInt64>(), "Total size of all the source (parent) data part files in bytes."},
+        {"parent_data_compressed_bytes",                std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the source (parent) data part."},
+        {"parent_data_uncompressed_bytes",              std::make_shared<DataTypeUInt64>(), "Total size of uncompressed data in the source (parent) data part."},
+        {"parent_marks_bytes",                          std::make_shared<DataTypeUInt64>(), "The size of the file with marks in the source (parent) data part."},
+        {"modification_time",                           std::make_shared<DataTypeDateTime>(), "The time the directory with the data part was modified. This usually corresponds to the time of data part creation."},
+        {"remove_time",                                 std::make_shared<DataTypeDateTime>(), "The time when the data part became inactive."},
+        {"refcount",                                    std::make_shared<DataTypeUInt32>(), "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",                                    std::make_shared<DataTypeDate>(), "The minimum value of the date key in the data part."},
+        {"max_date",                                    std::make_shared<DataTypeDate>(), "The maximum value of the date key in the data part."},
+        {"min_time",                                    std::make_shared<DataTypeDateTime>(), "The minimum value of the date and time key in the data part."},
+        {"max_time",                                    std::make_shared<DataTypeDateTime>(), "The maximum value of the date and time key in the data part."},
+        {"partition_id",                                std::make_shared<DataTypeString>(), "ID of the partition."},
+        {"min_block_number",                            std::make_shared<DataTypeInt64>(),  "The minimum number of data parts that make up the current part after merging."},
+        {"max_block_number",                            std::make_shared<DataTypeInt64>(),  "The maximum number of data parts that make up the current part after merging."},
+        {"level",                                       std::make_shared<DataTypeUInt32>(), "Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts."},
+        {"data_version",                                std::make_shared<DataTypeUInt64>(), "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",                 std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) used by primary key values."},
+        {"primary_key_bytes_in_memory_allocated",       std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) reserved for primary key values."},
+        {"is_frozen",                                   std::make_shared<DataTypeUInt8>(),  "Flag that shows that a partition data backup exists. 1, the backup exists. 0, the backup does not exist. "},
 
-        {"database",                                    std::make_shared<DataTypeString>()},
-        {"table",                                       std::make_shared<DataTypeString>()},
-        {"engine",                                      std::make_shared<DataTypeString>()},
-        {"disk_name",                                   std::make_shared<DataTypeString>()},
-        {"path",                                        std::make_shared<DataTypeString>()},
+        {"database",                                    std::make_shared<DataTypeString>(), "Name of the database."},
+        {"table",                                       std::make_shared<DataTypeString>(), "Name of the table."},
+        {"engine",                                      std::make_shared<DataTypeString>(), "Name of the table engine without parameters."},
+        {"disk_name",                                   std::make_shared<DataTypeString>(), "Name of a disk that stores the data part."},
+        {"path",                                        std::make_shared<DataTypeString>(), "Absolute path to the folder with data part files."},
 
-        {"hash_of_all_files",                           std::make_shared<DataTypeString>()},
-        {"hash_of_uncompressed_files",                  std::make_shared<DataTypeString>()},
-        {"uncompressed_hash_of_compressed_files",       std::make_shared<DataTypeString>()},
+        {"hash_of_all_files",                           std::make_shared<DataTypeString>(), "sipHash128 of compressed files."},
+        {"hash_of_uncompressed_files",                  std::make_shared<DataTypeString>(), "sipHash128 of uncompressed files (files with marks, index file etc.)."},
+        {"uncompressed_hash_of_compressed_files",       std::make_shared<DataTypeString>(), "sipHash128 of data in the compressed files as if they were uncompressed."},
 
-        {"delete_ttl_info_min",                         std::make_shared<DataTypeDateTime>()},
-        {"delete_ttl_info_max",                         std::make_shared<DataTypeDateTime>()},
+        {"delete_ttl_info_min",                         std::make_shared<DataTypeDateTime>(), "The minimum value of the date and time key for TTL DELETE rule."},
+        {"delete_ttl_info_max",                         std::make_shared<DataTypeDateTime>(), "The maximum value of the date and time key for TTL DELETE rule."},
 
-        {"move_ttl_info.expression",                    std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"move_ttl_info.min",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"move_ttl_info.max",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"move_ttl_info.expression",                    std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Array of expressions. Each expression defines a TTL MOVE rule."},
+        {"move_ttl_info.min",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "Array of date and time values. Each element describes the minimum key value for a TTL MOVE rule."},
+        {"move_ttl_info.max",                           std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "Array of date and time values. Each element describes the maximum key value for a TTL MOVE rule."},
 
-        {"default_compression_codec",                   std::make_shared<DataTypeString>()},
+        {"default_compression_codec",                   std::make_shared<DataTypeString>(), "The name of the codec used to compress this data part (in case when there is no explicit codec for columns)."},
 
-        {"recompression_ttl_info.expression",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"recompression_ttl_info.min",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"recompression_ttl_info.max",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"recompression_ttl_info.expression",           std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"recompression_ttl_info.min",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"recompression_ttl_info.max",                  std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
 
-        {"group_by_ttl_info.expression",                std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"group_by_ttl_info.min",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"group_by_ttl_info.max",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
+        {"group_by_ttl_info.expression",                std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"group_by_ttl_info.min",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"group_by_ttl_info.max",                       std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
 
-        {"rows_where_ttl_info.expression",              std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"rows_where_ttl_info.min",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())},
-        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>())}
-    }
-    )
+        {"rows_where_ttl_info.expression",              std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),   "The TTL expression."},
+        {"rows_where_ttl_info.min",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The minimum value of the calculated TTL expression within this part. Used to understand whether we have at least one row with expired TTL."},
+        {"rows_where_ttl_info.max",                     std::make_shared<DataTypeArray>(std::make_shared<DataTypeDateTime>()), "The maximum value of the calculated TTL expression within this part. Used to understand whether we have all rows with expired TTL."},
+
+        {"is_broken",                                   std::make_shared<DataTypeUInt8>(), "Whether projection part is broken"},
+        {"exception_code",                              std::make_shared<DataTypeInt32>(), "Exception message explaining broken state of the projection part"},
+        {"exception",                                   std::make_shared<DataTypeString>(), "Exception code explaining broken state of the projection part"},
+    })
 {
 }
 
@@ -272,12 +275,38 @@ void StorageSystemProjectionParts::processNextStorage(
         add_ttl_info_map(part->ttl_infos.moves_ttl);
 
         if (columns_mask[src_index++])
-            columns[res_index++]->insert(queryToString(part->default_codec->getCodecDesc()));
+        {
+            if (part->default_codec)
+                columns[res_index++]->insert(queryToString(part->default_codec->getCodecDesc()));
+            else
+                columns[res_index++]->insertDefault();
+        }
 
         add_ttl_info_map(part->ttl_infos.recompression_ttl);
         add_ttl_info_map(part->ttl_infos.group_by_ttl);
         add_ttl_info_map(part->ttl_infos.rows_where_ttl);
 
+        {
+            if (columns_mask[src_index++])
+                columns[res_index++]->insert(part->is_broken.load(std::memory_order_relaxed));
+
+            if (part->is_broken)
+            {
+                std::lock_guard lock(part->broken_reason_mutex);
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(part->exception_code);
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insert(part->exception);
+            }
+            else
+            {
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
+                if (columns_mask[src_index++])
+                    columns[res_index++]->insertDefault();
+            }
+        }
+
         /// _state column should be the latest.
         /// Do not use part->getState*, it can be changed from different thread
         if (has_state_column)
diff --git a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
index 2ff25f86366..9521605688d 100644
--- a/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
+++ b/src/Storages/System/StorageSystemProjectionPartsColumns.cpp
@@ -19,56 +19,56 @@ namespace DB
 StorageSystemProjectionPartsColumns::StorageSystemProjectionPartsColumns(const StorageID & table_id_)
     : StorageSystemPartsBase(table_id_,
     ColumnsDescription{
-        {"partition",                                  std::make_shared<DataTypeString>()},
-        {"name",                                       std::make_shared<DataTypeString>()},
-        {"part_type",                                  std::make_shared<DataTypeString>()},
-        {"parent_name",                                std::make_shared<DataTypeString>()},
-        {"parent_uuid",                                std::make_shared<DataTypeUUID>()},
-        {"parent_part_type",                           std::make_shared<DataTypeString>()},
-        {"active",                                     std::make_shared<DataTypeUInt8>()},
-        {"marks",                                      std::make_shared<DataTypeUInt64>()},
-        {"rows",                                       std::make_shared<DataTypeUInt64>()},
-        {"bytes_on_disk",                              std::make_shared<DataTypeUInt64>()},
-        {"data_compressed_bytes",                      std::make_shared<DataTypeUInt64>()},
-        {"data_uncompressed_bytes",                    std::make_shared<DataTypeUInt64>()},
-        {"marks_bytes",                                std::make_shared<DataTypeUInt64>()},
-        {"parent_marks",                               std::make_shared<DataTypeUInt64>()},
-        {"parent_rows",                                std::make_shared<DataTypeUInt64>()},
-        {"parent_bytes_on_disk",                       std::make_shared<DataTypeUInt64>()},
-        {"parent_data_compressed_bytes",               std::make_shared<DataTypeUInt64>()},
-        {"parent_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>()},
-        {"parent_marks_bytes",                         std::make_shared<DataTypeUInt64>()},
-        {"modification_time",                          std::make_shared<DataTypeDateTime>()},
-        {"remove_time",                                std::make_shared<DataTypeDateTime>()},
-        {"refcount",                                   std::make_shared<DataTypeUInt32>()},
-        {"min_date",                                   std::make_shared<DataTypeDate>()},
-        {"max_date",                                   std::make_shared<DataTypeDate>()},
-        {"min_time",                                   std::make_shared<DataTypeDateTime>()},
-        {"max_time",                                   std::make_shared<DataTypeDateTime>()},
-        {"partition_id",                               std::make_shared<DataTypeString>()},
-        {"min_block_number",                           std::make_shared<DataTypeInt64>()},
-        {"max_block_number",                           std::make_shared<DataTypeInt64>()},
-        {"level",                                      std::make_shared<DataTypeUInt32>()},
-        {"data_version",                               std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory",                std::make_shared<DataTypeUInt64>()},
-        {"primary_key_bytes_in_memory_allocated",      std::make_shared<DataTypeUInt64>()},
+        {"partition",                                  std::make_shared<DataTypeString>(), "The partition name. "},
+        {"name",                                       std::make_shared<DataTypeString>(), "Name of the data part."},
+        {"part_type",                                  std::make_shared<DataTypeString>(), "The data part storing format."},
+        {"parent_name",                                std::make_shared<DataTypeString>(), "The name of the source (parent) data part."},
+        {"parent_uuid",                                std::make_shared<DataTypeUUID>(),   "The UUID of the source (parent) data part."},
+        {"parent_part_type",                           std::make_shared<DataTypeString>(), "The source (parent) data part storing format."},
+        {"active",                                     std::make_shared<DataTypeUInt8>(),  "Flag that indicates whether the data part is active"},
+        {"marks",                                      std::make_shared<DataTypeUInt64>(), "The number of marks."},
+        {"rows",                                       std::make_shared<DataTypeUInt64>(), "The number of rows."},
+        {"bytes_on_disk",                              std::make_shared<DataTypeUInt64>(), "Total size of all the data part files in bytes."},
+        {"data_compressed_bytes",                      std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"data_uncompressed_bytes",                    std::make_shared<DataTypeUInt64>(), "Total size of uncompressed data in the data part. All the auxiliary files (for example, files with marks) are not included."},
+        {"marks_bytes",                                std::make_shared<DataTypeUInt64>(), "The size of the file with marks."},
+        {"parent_marks",                               std::make_shared<DataTypeUInt64>(), "The number of marks in the source (parent) part."},
+        {"parent_rows",                                std::make_shared<DataTypeUInt64>(), "The number of rows in the source (parent) part."},
+        {"parent_bytes_on_disk",                       std::make_shared<DataTypeUInt64>(), "Total size of all the source (parent) data part files in bytes."},
+        {"parent_data_compressed_bytes",               std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the source (parent) data part."},
+        {"parent_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>(), "Total size of uncompressed data in the source (parent) data part."},
+        {"parent_marks_bytes",                         std::make_shared<DataTypeUInt64>(), "The size of the file with marks in the source (parent) data part."},
+        {"modification_time",                          std::make_shared<DataTypeDateTime>(), "The time the directory with the data part was modified. This usually corresponds to the time of data part creation."},
+        {"remove_time",                                std::make_shared<DataTypeDateTime>(), "The time when the data part became inactive."},
+        {"refcount",                                   std::make_shared<DataTypeUInt32>(), "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",                                   std::make_shared<DataTypeDate>(), "The minimum value for the Date column if that is included in the partition key."},
+        {"max_date",                                   std::make_shared<DataTypeDate>(), "The maximum value for the Date column if that is included in the partition key."},
+        {"min_time",                                   std::make_shared<DataTypeDateTime>(), "The minimum value for the DateTime column if that is included in the partition key."},
+        {"max_time",                                   std::make_shared<DataTypeDateTime>(), "The maximum value for the DateTime column if that is included in the partition key."},
+        {"partition_id",                               std::make_shared<DataTypeString>(), "ID of the partition."},
+        {"min_block_number",                           std::make_shared<DataTypeInt64>(), "The minimum number of data parts that make up the current part after merging."},
+        {"max_block_number",                           std::make_shared<DataTypeInt64>(), "The maximum number of data parts that make up the current part after merging."},
+        {"level",                                      std::make_shared<DataTypeUInt32>(), "Depth of the merge tree. Zero means that the current part was created by insert rather than by merging other parts."},
+        {"data_version",                               std::make_shared<DataTypeUInt64>(), "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",                std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) used by primary key values."},
+        {"primary_key_bytes_in_memory_allocated",      std::make_shared<DataTypeUInt64>(), "The amount of memory (in bytes) reserved for primary key values."},
 
-        {"database",                                   std::make_shared<DataTypeString>()},
-        {"table",                                      std::make_shared<DataTypeString>()},
-        {"engine",                                     std::make_shared<DataTypeString>()},
-        {"disk_name",                                  std::make_shared<DataTypeString>()},
-        {"path",                                       std::make_shared<DataTypeString>()},
+        {"database",                                   std::make_shared<DataTypeString>(), "Name of the database."},
+        {"table",                                      std::make_shared<DataTypeString>(), "Name of the table."},
+        {"engine",                                     std::make_shared<DataTypeString>(), "Name of the table engine without parameters."},
+        {"disk_name",                                  std::make_shared<DataTypeString>(), "Name of a disk that stores the data part."},
+        {"path",                                       std::make_shared<DataTypeString>(), "Absolute path to the folder with data part files."},
 
-        {"column",                                     std::make_shared<DataTypeString>()},
-        {"type",                                       std::make_shared<DataTypeString>()},
-        {"column_position",                            std::make_shared<DataTypeUInt64>()},
-        {"default_kind",                               std::make_shared<DataTypeString>()},
-        {"default_expression",                         std::make_shared<DataTypeString>()},
-        {"column_bytes_on_disk",                       std::make_shared<DataTypeUInt64>()},
-        {"column_data_compressed_bytes",               std::make_shared<DataTypeUInt64>()},
-        {"column_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>()},
-        {"column_marks_bytes",                         std::make_shared<DataTypeUInt64>()},
-        {"column_modification_time",                   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
+        {"column",                                     std::make_shared<DataTypeString>(), "Name of the column."},
+        {"type",                                       std::make_shared<DataTypeString>(), "Column type."},
+        {"column_position",                            std::make_shared<DataTypeUInt64>(), "Ordinal position of a column in a table starting with 1."},
+        {"default_kind",                               std::make_shared<DataTypeString>(), "Expression type (DEFAULT, MATERIALIZED, ALIAS) for the default value, or an empty string if it is not defined."},
+        {"default_expression",                         std::make_shared<DataTypeString>(), "Expression for the default value, or an empty string if it is not defined."},
+        {"column_bytes_on_disk",                       std::make_shared<DataTypeUInt64>(), "Total size of the column in bytes."},
+        {"column_data_compressed_bytes",               std::make_shared<DataTypeUInt64>(), "Total size of compressed data in the column, in bytes."},
+        {"column_data_uncompressed_bytes",             std::make_shared<DataTypeUInt64>(), "Total size of the decompressed data in the column, in bytes."},
+        {"column_marks_bytes",                         std::make_shared<DataTypeUInt64>(), "The size of the column with marks, in bytes."},
+        {"column_modification_time",                   std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "The last time the column was modified."},
     }
     )
 {
diff --git a/src/Storages/System/StorageSystemQueryCache.cpp b/src/Storages/System/StorageSystemQueryCache.cpp
index 03111755904..e454012da3a 100644
--- a/src/Storages/System/StorageSystemQueryCache.cpp
+++ b/src/Storages/System/StorageSystemQueryCache.cpp
@@ -24,11 +24,11 @@ ColumnsDescription StorageSystemQueryCache::getColumnsDescription()
 }
 
 StorageSystemQueryCache::StorageSystemQueryCache(const StorageID & table_id_)
-    : IStorageSystemOneBlock(table_id_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription())
 {
 }
 
-void StorageSystemQueryCache::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemQueryCache::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     QueryCachePtr query_cache = context->getQueryCache();
 
diff --git a/src/Storages/System/StorageSystemQueryCache.h b/src/Storages/System/StorageSystemQueryCache.h
index 08ad30afb81..22856c2b1bb 100644
--- a/src/Storages/System/StorageSystemQueryCache.h
+++ b/src/Storages/System/StorageSystemQueryCache.h
@@ -5,7 +5,7 @@
 namespace DB
 {
 
-class StorageSystemQueryCache final : public IStorageSystemOneBlock<StorageSystemQueryCache>
+class StorageSystemQueryCache final : public IStorageSystemOneBlock
 {
 public:
     explicit StorageSystemQueryCache(const StorageID & table_id_);
@@ -15,7 +15,7 @@ public:
     static ColumnsDescription getColumnsDescription();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotaLimits.cpp b/src/Storages/System/StorageSystemQuotaLimits.cpp
index f125a990a88..65acfba0c1b 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.cpp
+++ b/src/Storages/System/StorageSystemQuotaLimits.cpp
@@ -68,14 +68,15 @@ ColumnsDescription StorageSystemQuotaLimits::getColumnsDescription()
             data_type = std::make_shared<DataTypeFloat64>();
         else
             data_type = std::make_shared<DataTypeUInt64>();
-        result.add({column_name, std::make_shared<DataTypeNullable>(data_type)});
+
+        result.add({column_name, std::make_shared<DataTypeNullable>(data_type), type_info.max_allowed_usage_description});
     }
 
     return result;
 }
 
 
-void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemQuotaLimits::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemQuotaLimits.h b/src/Storages/System/StorageSystemQuotaLimits.h
index acc977d0df7..a8385e878ca 100644
--- a/src/Storages/System/StorageSystemQuotaLimits.h
+++ b/src/Storages/System/StorageSystemQuotaLimits.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `quota_limits` system table, which allows you to get information about the limits set for quotas.
-class StorageSystemQuotaLimits final : public IStorageSystemOneBlock<StorageSystemQuotaLimits>
+class StorageSystemQuotaLimits final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemQuotaLimits"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotaUsage.cpp b/src/Storages/System/StorageSystemQuotaUsage.cpp
index a91e8b7b2c1..da9c174b0d3 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotaUsage.cpp
@@ -81,15 +81,15 @@ ColumnsDescription StorageSystemQuotaUsage::getColumnsDescriptionImpl(bool add_c
             data_type = std::make_shared<DataTypeFloat64>();
         else
             data_type = std::make_shared<DataTypeUInt64>();
-        description.add({column_name, std::make_shared<DataTypeNullable>(data_type)});
-        description.add({String("max_") + column_name, std::make_shared<DataTypeNullable>(data_type)});
+        description.add({column_name, std::make_shared<DataTypeNullable>(data_type), type_info.current_usage_description});
+        description.add({String("max_") + column_name, std::make_shared<DataTypeNullable>(data_type), type_info.max_allowed_usage_description});
     }
 
     return description;
 }
 
 
-void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemQuotaUsage::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemQuotaUsage.h b/src/Storages/System/StorageSystemQuotaUsage.h
index a3109e9ca31..3100098fe87 100644
--- a/src/Storages/System/StorageSystemQuotaUsage.h
+++ b/src/Storages/System/StorageSystemQuotaUsage.h
@@ -12,7 +12,7 @@ struct QuotaUsage;
 /** Implements the `quota_usage` system table, which allows you to get information about
   * how the current user uses the quota.
   */
-class StorageSystemQuotaUsage final : public IStorageSystemOneBlock<StorageSystemQuotaUsage>
+class StorageSystemQuotaUsage final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemQuotaUsage"; }
@@ -23,7 +23,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotas.cpp b/src/Storages/System/StorageSystemQuotas.cpp
index ee302f2f163..641bbb319d5 100644
--- a/src/Storages/System/StorageSystemQuotas.cpp
+++ b/src/Storages/System/StorageSystemQuotas.cpp
@@ -66,7 +66,7 @@ ColumnsDescription StorageSystemQuotas::getColumnsDescription()
 }
 
 
-void StorageSystemQuotas::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemQuotas::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemQuotas.h b/src/Storages/System/StorageSystemQuotas.h
index cafd8b921fa..76e6f1df536 100644
--- a/src/Storages/System/StorageSystemQuotas.h
+++ b/src/Storages/System/StorageSystemQuotas.h
@@ -9,7 +9,7 @@ class Context;
 
 /** Implements the `quotas` system tables, which allows you to get information about quotas.
   */
-class StorageSystemQuotas final : public IStorageSystemOneBlock<StorageSystemQuotas>
+class StorageSystemQuotas final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemQuotas"; }
@@ -20,7 +20,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemQuotasUsage.cpp b/src/Storages/System/StorageSystemQuotasUsage.cpp
index ed22f73dd50..1587048e7e7 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.cpp
+++ b/src/Storages/System/StorageSystemQuotasUsage.cpp
@@ -13,7 +13,7 @@ ColumnsDescription StorageSystemQuotasUsage::getColumnsDescription()
     return StorageSystemQuotaUsage::getColumnsDescriptionImpl(/* add_column_is_current = */ true);
 }
 
-void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemQuotasUsage::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemQuotasUsage.h b/src/Storages/System/StorageSystemQuotasUsage.h
index ecdc62865d1..516e722f7df 100644
--- a/src/Storages/System/StorageSystemQuotasUsage.h
+++ b/src/Storages/System/StorageSystemQuotasUsage.h
@@ -10,7 +10,7 @@ class Context;
 /** Implements the `quotas_usage` system table, which allows you to get information about
   * how all users use the quotas.
   */
-class StorageSystemQuotasUsage final : public IStorageSystemOneBlock<StorageSystemQuotasUsage>
+class StorageSystemQuotasUsage final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemQuotasUsage"; }
@@ -18,7 +18,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRemoteDataPaths.cpp b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
index 87b7a84e8ba..f54fa220e83 100644
--- a/src/Storages/System/StorageSystemRemoteDataPaths.cpp
+++ b/src/Storages/System/StorageSystemRemoteDataPaths.cpp
@@ -1,14 +1,17 @@
 #include "StorageSystemRemoteDataPaths.h"
-#include <DataTypes/DataTypeString.h>
+#include <Columns/ColumnArray.h>
+#include <Columns/ColumnString.h>
+#include <Columns/ColumnsNumber.h>
 #include <DataTypes/DataTypeArray.h>
+#include <DataTypes/DataTypeString.h>
 #include <DataTypes/DataTypesNumber.h>
+#include <Disks/IDisk.h>
 #include <Interpreters/Cache/FileCache.h>
 #include <Interpreters/Cache/FileCacheFactory.h>
-#include <Columns/ColumnString.h>
-#include <Columns/ColumnArray.h>
 #include <Interpreters/Context.h>
-#include <Disks/IDisk.h>
+#include <Processors/Sources/SourceFromSingleChunk.h>
 
+namespace fs = std::filesystem;
 
 namespace DB
 {
@@ -19,14 +22,14 @@ StorageSystemRemoteDataPaths::StorageSystemRemoteDataPaths(const StorageID & tab
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription(
     {
-        {"disk_name", std::make_shared<DataTypeString>()},
-        {"path", std::make_shared<DataTypeString>()},
-        {"cache_base_path", std::make_shared<DataTypeString>()},
-        {"local_path", std::make_shared<DataTypeString>()},
-        {"remote_path", std::make_shared<DataTypeString>()},
-        {"size", std::make_shared<DataTypeUInt64>()},
-        {"common_prefix_for_blobs", std::make_shared<DataTypeString>()},
-        {"cache_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
+        {"disk_name", std::make_shared<DataTypeString>(), "Disk name."},
+        {"path", std::make_shared<DataTypeString>(), "Disk path."},
+        {"cache_base_path", std::make_shared<DataTypeString>(), "Base directory of cache files."},
+        {"local_path", std::make_shared<DataTypeString>(), "Path of ClickHouse file, also used as metadata path."},
+        {"remote_path", std::make_shared<DataTypeString>(), "Blob path in object storage, with which ClickHouse file is associated with."},
+        {"size", std::make_shared<DataTypeUInt64>(), "Size of the file (compressed)."},
+        {"common_prefix_for_blobs", std::make_shared<DataTypeString>(), "Common prefix for blobs in object storage."},
+        {"cache_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Cache files for corresponding blob."},
     }));
     setInMemoryMetadata(storage_metadata);
 }
@@ -57,8 +60,20 @@ Pipe StorageSystemRemoteDataPaths::read(
         if (disk->isRemote())
         {
             std::vector<IDisk::LocalPathWithObjectStoragePaths> remote_paths_by_local_path;
-            disk->getRemotePathsRecursive("store", remote_paths_by_local_path);
-            disk->getRemotePathsRecursive("data", remote_paths_by_local_path);
+            disk->getRemotePathsRecursive("store", remote_paths_by_local_path, /* skip_predicate = */ {});
+            disk->getRemotePathsRecursive("data", remote_paths_by_local_path, /* skip_predicate = */ {});
+            if (context->getSettingsRef().traverse_shadow_remote_data_paths)
+                disk->getRemotePathsRecursive(
+                    "shadow",
+                    remote_paths_by_local_path,
+                    [](const String & local_path)
+                    {
+                        // `shadow/{backup_name}/revision.txt` is not an object metadata file
+                        const auto path = fs::path(local_path);
+                        return path.filename() == "revision.txt" &&
+                               path.parent_path().has_parent_path() &&
+                               path.parent_path().parent_path().filename() == "shadow";
+                    });
 
             FileCachePtr cache;
 
diff --git a/src/Storages/System/StorageSystemReplicas.cpp b/src/Storages/System/StorageSystemReplicas.cpp
index d9a12095443..5045dec3682 100644
--- a/src/Storages/System/StorageSystemReplicas.cpp
+++ b/src/Storages/System/StorageSystemReplicas.cpp
@@ -14,6 +14,9 @@
 #include <Access/ContextAccess.h>
 #include <Databases/IDatabase.h>
 #include <Processors/Sources/SourceFromSingleChunk.h>
+#include <Processors/QueryPlan/QueryPlan.h>
+#include <Processors/Sources/NullSource.h>
+#include <QueryPipeline/QueryPipelineBuilder.h>
 #include <Common/typeid_cast.h>
 #include <Common/CurrentMetrics.h>
 #include <Common/ThreadPool.h>
@@ -56,12 +59,12 @@ private:
     /// Used to assign unique incremental ids to requests.
     UInt64 request_id TSA_GUARDED_BY(mutex) = 0;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
 public:
     explicit StatusRequestsPool(size_t max_threads)
         : thread_pool(CurrentMetrics::SystemReplicasThreads, CurrentMetrics::SystemReplicasThreadsActive, CurrentMetrics::SystemReplicasThreadsScheduled, max_threads)
-        , log(&Poco::Logger::get("StatusRequestsPool"))
+        , log(getLogger("StatusRequestsPool"))
     {}
 
     ~StatusRequestsPool()
@@ -132,8 +135,12 @@ public:
 
             auto & [_, storage, promise, with_zk_fields] = req;
 
-            auto get_status_task = [this, storage, with_zk_fields, promise] () mutable
+            auto get_status_task = [this, storage, with_zk_fields, promise, thread_group = CurrentThread::getGroup()]() mutable
             {
+                SCOPE_EXIT_SAFE(if (thread_group) CurrentThread::detachFromGroupIfNotDetached(););
+                if (thread_group)
+                    CurrentThread::attachToGroupIfDetached(thread_group);
+
                 try
                 {
                     ReplicatedTableStatus status;
@@ -182,13 +189,6 @@ public:
         , requests_with_zk_fields(max_threads)
     {}
 
-    Pipe read(
-        const Names & column_names,
-        const StorageSnapshotPtr & storage_snapshot,
-        SelectQueryInfo & query_info,
-        ContextPtr context);
-
-private:
     StatusRequestsPool requests_without_zk_fields;
     StatusRequestsPool requests_with_zk_fields;
 };
@@ -200,65 +200,108 @@ StorageSystemReplicas::StorageSystemReplicas(const StorageID & table_id_)
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription({
-        { "database",                             std::make_shared<DataTypeString>()   },
-        { "table",                                std::make_shared<DataTypeString>()   },
-        { "engine",                               std::make_shared<DataTypeString>()   },
-        { "is_leader",                            std::make_shared<DataTypeUInt8>()    },
-        { "can_become_leader",                    std::make_shared<DataTypeUInt8>()    },
-        { "is_readonly",                          std::make_shared<DataTypeUInt8>()    },
-        { "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>()   },
-        { "columns_version",                      std::make_shared<DataTypeInt32>()    },
-        { "queue_size",                           std::make_shared<DataTypeUInt32>()   },
-        { "inserts_in_queue",                     std::make_shared<DataTypeUInt32>()   },
-        { "merges_in_queue",                      std::make_shared<DataTypeUInt32>()   },
-        { "part_mutations_in_queue",              std::make_shared<DataTypeUInt32>()   },
-        { "queue_oldest_time",                    std::make_shared<DataTypeDateTime>() },
-        { "inserts_oldest_time",                  std::make_shared<DataTypeDateTime>() },
-        { "merges_oldest_time",                   std::make_shared<DataTypeDateTime>() },
-        { "part_mutations_oldest_time",           std::make_shared<DataTypeDateTime>() },
-        { "oldest_part_to_get",                   std::make_shared<DataTypeString>()   },
-        { "oldest_part_to_merge_to",              std::make_shared<DataTypeString>()   },
-        { "oldest_part_to_mutate_to",             std::make_shared<DataTypeString>()   },
-        { "log_max_index",                        std::make_shared<DataTypeUInt64>()   },
-        { "log_pointer",                          std::make_shared<DataTypeUInt64>()   },
-        { "last_queue_update",                    std::make_shared<DataTypeDateTime>() },
-        { "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>()) }
+        { "database",                             std::make_shared<DataTypeString>(),   "Database name."},
+        { "table",                                std::make_shared<DataTypeString>(),   "Table name."},
+        { "engine",                               std::make_shared<DataTypeString>(),   "Table engine name."},
+        { "is_leader",                            std::make_shared<DataTypeUInt8>(),    "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",                    std::make_shared<DataTypeUInt8>(),    "Whether the replica can be a leader."},
+        { "is_readonly",                          std::make_shared<DataTypeUInt8>(),    "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",                   std::make_shared<DataTypeUInt8>(),    "Whether the session with ClickHouse Keeper has expired. Basically the same as `is_readonly`."},
+        { "future_parts",                         std::make_shared<DataTypeUInt32>(),   "The number of data parts that will appear as the result of INSERTs or merges that haven't been done yet."},
+        { "parts_to_check",                       std::make_shared<DataTypeUInt32>(),   "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_name",                       std::make_shared<DataTypeString>(),   "The name of the the [Zoo]Keeper cluster (possibly auxiliary one) where the table's metadata is stored"},
+        { "zookeeper_path",                       std::make_shared<DataTypeString>(),   "Path to table data in ClickHouse Keeper."},
+        { "replica_name",                         std::make_shared<DataTypeString>(),   "Replica name in ClickHouse Keeper. Different replicas of the same table have different names."},
+        { "replica_path",                         std::make_shared<DataTypeString>(),   "Path to replica data in ClickHouse Keeper. The same as concatenating 'zookeeper_path/replicas/replica_path'."},
+        { "columns_version",                      std::make_shared<DataTypeInt32>(),    "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",                           std::make_shared<DataTypeUInt32>(),   "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",                     std::make_shared<DataTypeUInt32>(),   "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",                      std::make_shared<DataTypeUInt32>(),   "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",              std::make_shared<DataTypeUInt32>(),   "The number of mutations waiting to be made."},
+        { "queue_oldest_time",                    std::make_shared<DataTypeDateTime>(), "If `queue_size` greater than 0, shows when the oldest operation was added to the queue."},
+        { "inserts_oldest_time",                  std::make_shared<DataTypeDateTime>(), "See `queue_oldest_time`."},
+        { "merges_oldest_time",                   std::make_shared<DataTypeDateTime>(), "See `queue_oldest_time`."},
+        { "part_mutations_oldest_time",           std::make_shared<DataTypeDateTime>(), "See `queue_oldest_time`."},
+        { "oldest_part_to_get",                   std::make_shared<DataTypeString>(),   "The name of the part to fetch from other replicas obtained from the oldest GET_PARTS entry in the replication queue."},
+        { "oldest_part_to_merge_to",              std::make_shared<DataTypeString>(),   "The result part name to merge to obtained from the oldest MERGE_PARTS entry in the replication queue."},
+        { "oldest_part_to_mutate_to",             std::make_shared<DataTypeString>(),   "The result part name to mutate to obtained from the oldest MUTATE_PARTS entry in the replication queue."},
+        { "log_max_index",                        std::make_shared<DataTypeUInt64>(),   "Maximum entry number in the log of general activity."},
+        { "log_pointer",                          std::make_shared<DataTypeUInt64>(),   "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",                    std::make_shared<DataTypeDateTime>(), "When the queue was updated last time."},
+        { "absolute_delay",                       std::make_shared<DataTypeUInt64>(),   "How big lag in seconds the current replica has."},
+        { "total_replicas",                       std::make_shared<DataTypeUInt32>(),    "The total number of known replicas of this table."},
+        { "active_replicas",                      std::make_shared<DataTypeUInt32>(),    "The number of replicas of this table that have a session in ClickHouse Keeper (i.e., the number of functioning replicas)."},
+        { "lost_part_count",                      std::make_shared<DataTypeUInt64>(),   "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",          std::make_shared<DataTypeString>(),   "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",                  std::make_shared<DataTypeString>(),   "The last exception message, got if the error happened when fetching the info from ClickHouse Keeper."},
+        { "replica_is_active",                    std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt8>()), "Map between replica name and is replica active."}
     }));
     setInMemoryMetadata(storage_metadata);
 }
 
 StorageSystemReplicas::~StorageSystemReplicas() = default;
 
+class ReadFromSystemReplicas : public SourceStepWithFilter
+{
+public:
+    std::string getName() const override { return "ReadFromSystemReplicas"; }
+    void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
-Pipe StorageSystemReplicas::read(
+    ReadFromSystemReplicas(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        Block sample_block,
+        std::map<String, std::map<String, StoragePtr>> replicated_tables_,
+        bool with_zk_fields_,
+        size_t max_block_size_,
+        std::shared_ptr<StorageSystemReplicasImpl> impl_)
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
+        , replicated_tables(std::move(replicated_tables_))
+        , with_zk_fields(with_zk_fields_)
+        , max_block_size(max_block_size_)
+        , impl(std::move(impl_))
+    {
+    }
+
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
+private:
+    std::map<String, std::map<String, StoragePtr>> replicated_tables;
+    const bool with_zk_fields;
+    const size_t max_block_size;
+    std::shared_ptr<StorageSystemReplicasImpl> impl;
+    const ActionsDAG::Node * predicate = nullptr;
+};
+
+void ReadFromSystemReplicas::applyFilters(ActionDAGNodes added_filter_nodes)
+{
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    if (filter_actions_dag)
+        predicate = filter_actions_dag->getOutputs().at(0);
+}
+
+void StorageSystemReplicas::read(
+    QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
-    const size_t /*max_block_size*/,
+    const size_t max_block_size,
     const size_t /*num_streams*/)
-{
-    return impl->read(column_names, storage_snapshot, query_info, context);
-}
-
-Pipe StorageSystemReplicasImpl::read(
-        const Names & column_names,
-        const StorageSnapshotPtr & storage_snapshot,
-        SelectQueryInfo & query_info,
-        ContextPtr context)
 {
     storage_snapshot->check(column_names);
 
@@ -305,6 +348,58 @@ Pipe StorageSystemReplicasImpl::read(
         }
     }
 
+    auto header = storage_snapshot->metadata->getSampleBlock();
+    auto reading = std::make_unique<ReadFromSystemReplicas>(
+        column_names, query_info, storage_snapshot,
+        std::move(context), std::move(header), std::move(replicated_tables), with_zk_fields, max_block_size, impl);
+
+    query_plan.addStep(std::move(reading));
+}
+
+class SystemReplicasSource : public ISource
+{
+public:
+    SystemReplicasSource(
+        Block header_,
+        size_t max_block_size_,
+        ColumnPtr col_database_,
+        ColumnPtr col_table_,
+        ColumnPtr col_engine_,
+        std::vector<std::shared_future<ReplicatedTableStatus>> futures_,
+        ContextPtr context_)
+        : ISource(header_)
+        , max_block_size(max_block_size_)
+        , col_database(std::move(col_database_))
+        , col_table(std::move(col_table_))
+        , col_engine(std::move(col_engine_))
+        , futures(std::move(futures_))
+        , context(std::move(context_))
+    {
+    }
+
+    String getName() const override { return "SystemReplicas"; }
+
+protected:
+    Chunk generate() override;
+
+private:
+    const size_t max_block_size;
+    /// Columns with table metadata.
+    ColumnPtr col_database;
+    ColumnPtr col_table;
+    ColumnPtr col_engine;
+    /// Futures for the status of each table.
+    std::vector<std::shared_future<ReplicatedTableStatus>> futures;
+    ContextPtr context;
+    /// Index (row number) of the next table to process.
+    size_t i = 0;
+};
+
+
+void ReadFromSystemReplicas::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
+    auto header = getOutputStream().header;
+
     MutableColumnPtr col_database_mut = ColumnString::create();
     MutableColumnPtr col_table_mut = ColumnString::create();
     MutableColumnPtr col_engine_mut = ColumnString::create();
@@ -332,22 +427,24 @@ Pipe StorageSystemReplicasImpl::read(
             { col_engine, std::make_shared<DataTypeString>(), "engine" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
-            return {};
+        {
+            auto source = std::make_shared<NullSource>(std::move(header));
+            pipeline.init(Pipe(std::move(source)));
+            return;
+        }
 
         col_database = filtered_block.getByName("database").column;
         col_table = filtered_block.getByName("table").column;
         col_engine = filtered_block.getByName("engine").column;
     }
 
-    MutableColumns res_columns = storage_snapshot->metadata->getSampleBlock().cloneEmptyColumns();
-
     size_t tables_size = col_database->size();
 
     /// Use separate queues for requests with and without ZooKeeper fields.
-    StatusRequestsPool & get_status_requests = with_zk_fields ? requests_with_zk_fields : requests_without_zk_fields;
+    StatusRequestsPool & get_status_requests = with_zk_fields ? impl->requests_with_zk_fields : impl->requests_without_zk_fields;
 
     QueryStatusPtr query_status = context ? context->getProcessListElement() : nullptr;
 
@@ -370,11 +467,46 @@ Pipe StorageSystemReplicasImpl::read(
     /// If there are more requests, they will be scheduled by the query that needs them.
     get_status_requests.scheduleRequests(max_request_id, query_status);
 
-    for (size_t i = 0; i < tables_size; ++i)
+    pipeline.init(Pipe(std::make_shared<SystemReplicasSource>(header, max_block_size, col_database, col_table, col_engine, std::move(futures), context)));
+}
+
+Chunk SystemReplicasSource::generate()
+{
+    if (i == futures.size())
+        return {};
+
+    QueryStatusPtr query_status = context ? context->getProcessListElement() : nullptr;
+
+    MutableColumns res_columns = getPort().getHeader().cloneEmptyColumns();
+
+    bool rows_added = false;
+
+    for (; i < futures.size(); ++i)
     {
         if (query_status)
             query_status->checkTimeLimit();
 
+        if (rows_added)
+        {
+            /// Return current chunk if the next future is not ready yet
+            if (futures[i].wait_for(std::chrono::seconds(0)) != std::future_status::ready)
+                break;
+
+            if (max_block_size != 0)
+            {
+                size_t total_size = 0;
+                for (const auto & column : res_columns)
+                    total_size += column->byteSize();
+                /// If the block size exceeds the maximum, return the current block
+                if (total_size >= max_block_size)
+                    break;
+            }
+        }
+
+        res_columns[0]->insert((*col_database)[i]);
+        res_columns[1]->insert((*col_table)[i]);
+        res_columns[2]->insert((*col_engine)[i]);
+
         const auto & status = futures[i].get();
         size_t col_num = 3;
         res_columns[col_num++]->insert(status.is_leader);
@@ -420,23 +552,12 @@ Pipe StorageSystemReplicasImpl::read(
         }
 
         res_columns[col_num++]->insert(std::move(replica_is_active_values));
+
+        rows_added = true;
     }
 
-    Columns fin_columns;
-    fin_columns.reserve(res_columns.size());
-
-    for (auto & col : res_columns)
-        fin_columns.emplace_back(std::move(col));
-
-    fin_columns[0] = std::move(col_database);
-    fin_columns[1] = std::move(col_table);
-    fin_columns[2] = std::move(col_engine);
-
-    UInt64 num_rows = fin_columns.at(0)->size();
-    Chunk chunk(std::move(fin_columns), num_rows);
-
-    return Pipe(std::make_shared<SourceFromSingleChunk>(storage_snapshot->metadata->getSampleBlock(), std::move(chunk)));
+    UInt64 num_rows = res_columns.at(0)->size();
+    return Chunk(std::move(res_columns), num_rows);
 }
 
-
 }
diff --git a/src/Storages/System/StorageSystemReplicas.h b/src/Storages/System/StorageSystemReplicas.h
index f6bdfc937ea..11c5371310f 100644
--- a/src/Storages/System/StorageSystemReplicas.h
+++ b/src/Storages/System/StorageSystemReplicas.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include <Storages/IStorage.h>
+#include <Storages/System/IStorageSystemOneBlock.h>
 
 
 namespace DB
@@ -20,7 +20,8 @@ public:
 
     std::string getName() const override { return "SystemReplicas"; }
 
-    Pipe read(
+    void read(
+        QueryPlan & query_plan,
         const Names & column_names,
         const StorageSnapshotPtr & storage_snapshot,
         SelectQueryInfo & query_info,
@@ -32,7 +33,7 @@ public:
     bool isSystemStorage() const override { return true; }
 
 private:
-    std::unique_ptr<StorageSystemReplicasImpl> impl;
+    std::shared_ptr<StorageSystemReplicasImpl> impl;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.cpp b/src/Storages/System/StorageSystemReplicatedFetches.cpp
index e643cb9f86a..6913665a8d2 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.cpp
+++ b/src/Storages/System/StorageSystemReplicatedFetches.cpp
@@ -34,7 +34,7 @@ ColumnsDescription StorageSystemReplicatedFetches::getColumnsDescription()
     };
 }
 
-void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemReplicatedFetches::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_tables = !access->isGranted(AccessType::SHOW_TABLES);
diff --git a/src/Storages/System/StorageSystemReplicatedFetches.h b/src/Storages/System/StorageSystemReplicatedFetches.h
index a176912cac0..dba9124b39d 100644
--- a/src/Storages/System/StorageSystemReplicatedFetches.h
+++ b/src/Storages/System/StorageSystemReplicatedFetches.h
@@ -10,7 +10,7 @@ namespace DB
 class Context;
 
 /// system.replicated_fetches table. Takes data from context.getReplicatedFetchList()
-class StorageSystemReplicatedFetches final : public IStorageSystemOneBlock<StorageSystemReplicatedFetches>
+class StorageSystemReplicatedFetches final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemReplicatedFetches"; }
@@ -20,7 +20,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemReplicationQueue.cpp b/src/Storages/System/StorageSystemReplicationQueue.cpp
index 194a2ae6fb8..14b641f46c7 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.cpp
+++ b/src/Storages/System/StorageSystemReplicationQueue.cpp
@@ -62,7 +62,7 @@ ColumnsDescription StorageSystemReplicationQueue::getColumnsDescription()
 }
 
 
-void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const
+void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const
 {
     const auto access = context->getAccess();
     const bool check_access_for_databases = !access->isGranted(AccessType::SHOW_TABLES);
@@ -113,7 +113,7 @@ void StorageSystemReplicationQueue::fillData(MutableColumns & res_columns, Conte
             { col_table_to_filter, std::make_shared<DataTypeString>(), "table" },
         };
 
-        VirtualColumnUtils::filterBlockWithQuery(query_info.query, filtered_block, context);
+        VirtualColumnUtils::filterBlockWithPredicate(predicate, filtered_block, context);
 
         if (!filtered_block.rows())
             return;
diff --git a/src/Storages/System/StorageSystemReplicationQueue.h b/src/Storages/System/StorageSystemReplicationQueue.h
index 003e4eeb927..a9e57851be1 100644
--- a/src/Storages/System/StorageSystemReplicationQueue.h
+++ b/src/Storages/System/StorageSystemReplicationQueue.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements the `replication_queue` system table, which allows you to view the replication queues for the replicated tables.
   */
-class StorageSystemReplicationQueue final : public IStorageSystemOneBlock<StorageSystemReplicationQueue>
+class StorageSystemReplicationQueue final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemReplicationQueue"; }
@@ -20,7 +20,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node * predicate, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoleGrants.cpp b/src/Storages/System/StorageSystemRoleGrants.cpp
index 241481275c4..e5baeed4873 100644
--- a/src/Storages/System/StorageSystemRoleGrants.cpp
+++ b/src/Storages/System/StorageSystemRoleGrants.cpp
@@ -40,7 +40,7 @@ ColumnsDescription StorageSystemRoleGrants::getColumnsDescription()
 }
 
 
-void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemRoleGrants::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemRoleGrants.h b/src/Storages/System/StorageSystemRoleGrants.h
index 969f82f85d5..f82aece3f24 100644
--- a/src/Storages/System/StorageSystemRoleGrants.h
+++ b/src/Storages/System/StorageSystemRoleGrants.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `role_grants` system table, which allows you to get information about granted roles.
-class StorageSystemRoleGrants final : public IStorageSystemOneBlock<StorageSystemRoleGrants>
+class StorageSystemRoleGrants final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemRoleGrants"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRoles.cpp b/src/Storages/System/StorageSystemRoles.cpp
index ec26a50db77..9bfddc25ebf 100644
--- a/src/Storages/System/StorageSystemRoles.cpp
+++ b/src/Storages/System/StorageSystemRoles.cpp
@@ -25,7 +25,7 @@ ColumnsDescription StorageSystemRoles::getColumnsDescription()
 }
 
 
-void StorageSystemRoles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemRoles::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemRoles.h b/src/Storages/System/StorageSystemRoles.h
index 2b4ae93a932..e96bb70d9cd 100644
--- a/src/Storages/System/StorageSystemRoles.h
+++ b/src/Storages/System/StorageSystemRoles.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `roles` system table, which allows you to get information about roles.
-class StorageSystemRoles final : public IStorageSystemOneBlock<StorageSystemRoles>
+class StorageSystemRoles final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemRoles"; }
@@ -19,7 +19,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemRowPolicies.cpp b/src/Storages/System/StorageSystemRowPolicies.cpp
index 5a959cdf9af..93c5ba60a7f 100644
--- a/src/Storages/System/StorageSystemRowPolicies.cpp
+++ b/src/Storages/System/StorageSystemRowPolicies.cpp
@@ -38,8 +38,8 @@ ColumnsDescription StorageSystemRowPolicies::getColumnsDescription()
 
     for (auto filter_type : collections::range(RowPolicyFilterType::MAX))
     {
-        const String & column_name = RowPolicyFilterTypeInfo::get(filter_type).name;
-        description.add({column_name, std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>())});
+        const auto & filter_type_info = RowPolicyFilterTypeInfo::get(filter_type);
+        description.add({filter_type_info.name, std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), filter_type_info.description});
     }
 
     description.add({"is_restrictive", std::make_shared<DataTypeUInt8>(),
@@ -61,7 +61,7 @@ ColumnsDescription StorageSystemRowPolicies::getColumnsDescription()
 }
 
 
-void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemRowPolicies::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemRowPolicies.h b/src/Storages/System/StorageSystemRowPolicies.h
index f8aa5618126..cdbc4731000 100644
--- a/src/Storages/System/StorageSystemRowPolicies.h
+++ b/src/Storages/System/StorageSystemRowPolicies.h
@@ -10,7 +10,7 @@ class Context;
 
 
 /// Implements `row_policies` system table, which allows you to get information about row policies.
-class StorageSystemRowPolicies final : public IStorageSystemOneBlock<StorageSystemRowPolicies>
+class StorageSystemRowPolicies final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemRowPolicies"; }
@@ -21,7 +21,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemS3Queue.cpp b/src/Storages/System/StorageSystemS3Queue.cpp
index 3637734b225..a6bb7da2b6e 100644
--- a/src/Storages/System/StorageSystemS3Queue.cpp
+++ b/src/Storages/System/StorageSystemS3Queue.cpp
@@ -25,23 +25,23 @@ ColumnsDescription StorageSystemS3Queue::getColumnsDescription()
     /// TODO: Fill in all the comments
     return ColumnsDescription
     {
-        {"zookeeper_path", std::make_shared<DataTypeString>()},
-        {"file_name", std::make_shared<DataTypeString>()},
-        {"rows_processed", std::make_shared<DataTypeUInt64>()},
-        {"status", std::make_shared<DataTypeString>()},
-        {"processing_start_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
-        {"processing_end_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>())},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
-        {"exception", std::make_shared<DataTypeString>()},
+        {"zookeeper_path", std::make_shared<DataTypeString>(), "Path in zookeeper to S3Queue metadata"},
+        {"file_name", std::make_shared<DataTypeString>(), "File name of a file which is being processed by S3Queue"},
+        {"rows_processed", std::make_shared<DataTypeUInt64>(), "Currently processed number of rows"},
+        {"status", std::make_shared<DataTypeString>(), "Status of processing: Processed, Processing, Failed"},
+        {"processing_start_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "Time at which processing of the file started"},
+        {"processing_end_time", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeDateTime>()), "Time at which processing of the file ended"},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "Profile events collected during processing of the file"},
+        {"exception", std::make_shared<DataTypeString>(), "Exception which happened during processing"},
     };
 }
 
 StorageSystemS3Queue::StorageSystemS3Queue(const StorageID & table_id_)
-    : IStorageSystemOneBlock(table_id_)
+    : IStorageSystemOneBlock(table_id_, getColumnsDescription())
 {
 }
 
-void StorageSystemS3Queue::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemS3Queue::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & [zookeeper_path, metadata] : S3QueueMetadataFactory::instance().getAll())
     {
diff --git a/src/Storages/System/StorageSystemS3Queue.h b/src/Storages/System/StorageSystemS3Queue.h
index 1dc5c521941..c89e18f458f 100644
--- a/src/Storages/System/StorageSystemS3Queue.h
+++ b/src/Storages/System/StorageSystemS3Queue.h
@@ -7,7 +7,7 @@
 namespace DB
 {
 
-class StorageSystemS3Queue final : public IStorageSystemOneBlock<StorageSystemS3Queue>
+class StorageSystemS3Queue final : public IStorageSystemOneBlock
 {
 public:
     explicit StorageSystemS3Queue(const StorageID & table_id_);
@@ -17,7 +17,7 @@ public:
     static ColumnsDescription getColumnsDescription();
 
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemScheduler.cpp b/src/Storages/System/StorageSystemScheduler.cpp
index 6a9502d0bd8..651ca815420 100644
--- a/src/Storages/System/StorageSystemScheduler.cpp
+++ b/src/Storages/System/StorageSystemScheduler.cpp
@@ -4,15 +4,15 @@
 #include <DataTypes/DataTypeNullable.h>
 #include <Columns/ColumnString.h>
 #include <Columns/ColumnsNumber.h>
-#include <IO/ISchedulerNode.h>
-#include <IO/IResourceManager.h>
-#include <IO/Resource/FairPolicy.h>
-#include <IO/Resource/PriorityPolicy.h>
-#include <IO/Resource/SemaphoreConstraint.h>
-#include <IO/Resource/ThrottlerConstraint.h>
-#include <IO/Resource/FifoQueue.h>
+#include <Common/Scheduler/ISchedulerNode.h>
+#include <Common/Scheduler/IResourceManager.h>
+#include <Common/Scheduler/Nodes/FairPolicy.h>
+#include <Common/Scheduler/Nodes/PriorityPolicy.h>
+#include <Common/Scheduler/Nodes/SemaphoreConstraint.h>
+#include <Common/Scheduler/Nodes/ThrottlerConstraint.h>
+#include <Common/Scheduler/Nodes/FifoQueue.h>
 #include <Interpreters/Context.h>
-#include "IO/ResourceRequest.h"
+#include "Common/Scheduler/ResourceRequest.h"
 
 
 namespace DB
@@ -30,7 +30,9 @@ ColumnsDescription StorageSystemScheduler::getColumnsDescription()
         {"is_active", std::make_shared<DataTypeUInt8>(), "Whether this node is currently active - has resource requests to be dequeued and constraints satisfied."},
         {"active_children", std::make_shared<DataTypeUInt64>(), "The number of children in active state."},
         {"dequeued_requests", std::make_shared<DataTypeUInt64>(), "The total number of resource requests dequeued from this node."},
+        {"canceled_requests", std::make_shared<DataTypeUInt64>(), "The total number of resource requests canceled from this node."},
         {"dequeued_cost", std::make_shared<DataTypeInt64>(), "The sum of costs (e.g. size in bytes) of all requests dequeued from this node."},
+        {"canceled_cost", std::make_shared<DataTypeInt64>(), "The sum of costs (e.g. size in bytes) of all requests canceled from this node."},
         {"busy_periods", std::make_shared<DataTypeUInt64>(), "The total number of deactivations of this node."},
         {"vruntime", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeFloat64>()),
             "For children of `fair` nodes only. Virtual runtime of a node used by SFQ algorithm to select the next child to process in a max-min fair manner."},
@@ -80,7 +82,7 @@ ColumnsDescription StorageSystemScheduler::getColumnsDescription()
 }
 
 
-void StorageSystemScheduler::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemScheduler::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     context->getResourceManager()->forEachNode([&] (const String & resource, const String & path, const String & type, const SchedulerNodePtr & node)
     {
@@ -93,7 +95,9 @@ void StorageSystemScheduler::fillData(MutableColumns & res_columns, ContextPtr c
         res_columns[i++]->insert(node->isActive());
         res_columns[i++]->insert(node->activeChildren());
         res_columns[i++]->insert(node->dequeued_requests.load());
+        res_columns[i++]->insert(node->canceled_requests.load());
         res_columns[i++]->insert(node->dequeued_cost.load());
+        res_columns[i++]->insert(node->canceled_cost.load());
         res_columns[i++]->insert(node->busy_periods.load());
 
         Field vruntime;
diff --git a/src/Storages/System/StorageSystemScheduler.h b/src/Storages/System/StorageSystemScheduler.h
index 1de72a85e9b..c6a259e5b51 100644
--- a/src/Storages/System/StorageSystemScheduler.h
+++ b/src/Storages/System/StorageSystemScheduler.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `system.scheduler` table, which allows you to get information about scheduling nodes.
-class StorageSystemScheduler final : public IStorageSystemOneBlock<StorageSystemScheduler>
+class StorageSystemScheduler final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemScheduler"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSchemaInferenceCache.cpp b/src/Storages/System/StorageSystemSchemaInferenceCache.cpp
index 1426ea83800..634089bd1cd 100644
--- a/src/Storages/System/StorageSystemSchemaInferenceCache.cpp
+++ b/src/Storages/System/StorageSystemSchemaInferenceCache.cpp
@@ -72,7 +72,7 @@ static void fillDataImpl(MutableColumns & res_columns, SchemaCache & schema_cach
     }
 }
 
-void StorageSystemSchemaInferenceCache::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemSchemaInferenceCache::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     fillDataImpl(res_columns, StorageFile::getSchemaCache(context), "File");
 #if USE_AWS_S3
diff --git a/src/Storages/System/StorageSystemSchemaInferenceCache.h b/src/Storages/System/StorageSystemSchemaInferenceCache.h
index e6d306f8252..3e12f4b850b 100644
--- a/src/Storages/System/StorageSystemSchemaInferenceCache.h
+++ b/src/Storages/System/StorageSystemSchemaInferenceCache.h
@@ -6,7 +6,7 @@
 namespace DB
 {
 
-class StorageSystemSchemaInferenceCache final : public IStorageSystemOneBlock<StorageSystemSchemaInferenceCache>
+class StorageSystemSchemaInferenceCache final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemSettingsChanges"; }
@@ -16,7 +16,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemServerSettings.cpp b/src/Storages/System/StorageSystemServerSettings.cpp
index f390985546b..2092f352779 100644
--- a/src/Storages/System/StorageSystemServerSettings.cpp
+++ b/src/Storages/System/StorageSystemServerSettings.cpp
@@ -55,7 +55,7 @@ ColumnsDescription StorageSystemServerSettings::getColumnsDescription()
     };
 }
 
-void StorageSystemServerSettings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemServerSettings::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// When the server configuration file is periodically re-loaded from disk, the server components (e.g. memory tracking) are updated
     /// with new the setting values but the settings themselves are not stored between re-loads. As a result, if one wants to know the
@@ -70,6 +70,7 @@ void StorageSystemServerSettings::fillData(MutableColumns & res_columns, Context
         {"max_concurrent_queries", {std::to_string(context->getProcessList().getMaxSize()), ChangeableWithoutRestart::Yes}},
         {"max_concurrent_insert_queries", {std::to_string(context->getProcessList().getMaxInsertQueriesAmount()), ChangeableWithoutRestart::Yes}},
         {"max_concurrent_select_queries", {std::to_string(context->getProcessList().getMaxSelectQueriesAmount()), ChangeableWithoutRestart::Yes}},
+        {"max_waiting_queries", {std::to_string(context->getProcessList().getMaxWaitingQueriesAmount()), ChangeableWithoutRestart::Yes}},
 
         {"background_buffer_flush_schedule_pool_size", {std::to_string(CurrentMetrics::get(CurrentMetrics::BackgroundBufferFlushSchedulePoolSize)), ChangeableWithoutRestart::IncreaseOnly}},
         {"background_schedule_pool_size", {std::to_string(CurrentMetrics::get(CurrentMetrics::BackgroundSchedulePoolSize)), ChangeableWithoutRestart::IncreaseOnly}},
diff --git a/src/Storages/System/StorageSystemServerSettings.h b/src/Storages/System/StorageSystemServerSettings.h
index 276f21d674b..03c363c9920 100644
--- a/src/Storages/System/StorageSystemServerSettings.h
+++ b/src/Storages/System/StorageSystemServerSettings.h
@@ -11,7 +11,7 @@ class Context;
 
 /** implements system table "settings", which allows to get information about the current settings.
   */
-class StorageSystemServerSettings final : public IStorageSystemOneBlock<StorageSystemServerSettings>
+class StorageSystemServerSettings final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemServerSettings"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettings.cpp b/src/Storages/System/StorageSystemSettings.cpp
index 43877582af6..b437108b00e 100644
--- a/src/Storages/System/StorageSystemSettings.cpp
+++ b/src/Storages/System/StorageSystemSettings.cpp
@@ -34,7 +34,7 @@ ColumnsDescription StorageSystemSettings::getColumnsDescription()
     };
 }
 
-void StorageSystemSettings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemSettings::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const Settings & settings = context->getSettingsRef();
     auto constraints_and_current_profiles = context->getSettingsConstraintsAndCurrentProfiles();
diff --git a/src/Storages/System/StorageSystemSettings.h b/src/Storages/System/StorageSystemSettings.h
index 6749f9b20a4..fae0d69ada8 100644
--- a/src/Storages/System/StorageSystemSettings.h
+++ b/src/Storages/System/StorageSystemSettings.h
@@ -11,7 +11,7 @@ class Context;
 
 /** implements system table "settings", which allows to get information about the current settings.
   */
-class StorageSystemSettings final : public IStorageSystemOneBlock<StorageSystemSettings>
+class StorageSystemSettings final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemSettings"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsChanges.cpp b/src/Storages/System/StorageSystemSettingsChanges.cpp
index b1942ea9ac6..de47ec52031 100644
--- a/src/Storages/System/StorageSystemSettingsChanges.cpp
+++ b/src/Storages/System/StorageSystemSettingsChanges.cpp
@@ -12,7 +12,7 @@ ColumnsDescription StorageSystemSettingsChanges::getColumnsDescription()
     /// TODO: Fill in all the comments
     return ColumnsDescription
     {
-        {"version", std::make_shared<DataTypeString>()},
+        {"version", std::make_shared<DataTypeString>(), "The ClickHouse server version."},
         {"changes",
          std::make_shared<DataTypeArray>(std::make_shared<DataTypeTuple>(
              DataTypes{
@@ -20,11 +20,11 @@ ColumnsDescription StorageSystemSettingsChanges::getColumnsDescription()
                  std::make_shared<DataTypeString>(),
                  std::make_shared<DataTypeString>(),
                  std::make_shared<DataTypeString>()},
-             Names{"name", "previous_value", "new_value", "reason"}))},
+             Names{"name", "previous_value", "new_value", "reason"})), "The list of changes in settings which changed the behaviour of ClickHouse."},
     };
 }
 
-void StorageSystemSettingsChanges::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemSettingsChanges::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (auto it = settings_changes_history.rbegin(); it != settings_changes_history.rend(); ++it)
     {
diff --git a/src/Storages/System/StorageSystemSettingsChanges.h b/src/Storages/System/StorageSystemSettingsChanges.h
index 3a1a8ce23d1..9d8899797fe 100644
--- a/src/Storages/System/StorageSystemSettingsChanges.h
+++ b/src/Storages/System/StorageSystemSettingsChanges.h
@@ -12,7 +12,7 @@ class Context;
 /** Implements system table "settings_changes", which allows to get information
   * about the settings changes through different ClickHouse versions.
   */
-class StorageSystemSettingsChanges final : public IStorageSystemOneBlock<StorageSystemSettingsChanges>
+class StorageSystemSettingsChanges final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemSettingsChanges"; }
@@ -22,7 +22,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.cpp b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
index a530bd2c1b3..2af3e6dfd05 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.cpp
@@ -42,7 +42,7 @@ ColumnsDescription StorageSystemSettingsProfileElements::getColumnsDescription()
         {"value", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "Setting value."},
         {"min", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The minimum value of the setting. NULL if not set."},
         {"max", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()), "The maximum value of the setting. NULL if not set."},
-        {"writability", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getSettingConstraintWritabilityEnumValues()))},
+        {"writability", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeEnum8>(getSettingConstraintWritabilityEnumValues())), "The property which shows whether a setting can be changed or not."},
         {"inherit_profile", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeString>()),
             "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."
@@ -51,7 +51,7 @@ ColumnsDescription StorageSystemSettingsProfileElements::getColumnsDescription()
 }
 
 
-void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfileElements::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemSettingsProfileElements.h b/src/Storages/System/StorageSystemSettingsProfileElements.h
index 1dedd616c82..8b08c463071 100644
--- a/src/Storages/System/StorageSystemSettingsProfileElements.h
+++ b/src/Storages/System/StorageSystemSettingsProfileElements.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `settings_profile_elements` system table, which allows you to get information about elements of settings profiles.
-class StorageSystemSettingsProfileElements final : public IStorageSystemOneBlock<StorageSystemSettingsProfileElements>
+class StorageSystemSettingsProfileElements final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemSettingsProfileElements"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.cpp b/src/Storages/System/StorageSystemSettingsProfiles.cpp
index 01041bee445..795152e31f3 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.cpp
+++ b/src/Storages/System/StorageSystemSettingsProfiles.cpp
@@ -36,7 +36,7 @@ ColumnsDescription StorageSystemSettingsProfiles::getColumnsDescription()
 }
 
 
-void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemSettingsProfiles::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemSettingsProfiles.h b/src/Storages/System/StorageSystemSettingsProfiles.h
index b0c8fc8658c..056666ae4c7 100644
--- a/src/Storages/System/StorageSystemSettingsProfiles.h
+++ b/src/Storages/System/StorageSystemSettingsProfiles.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `settings_profiles` system table, which allows you to get information about profiles.
-class StorageSystemSettingsProfiles final : public IStorageSystemOneBlock<StorageSystemSettingsProfiles>
+class StorageSystemSettingsProfiles final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemSettingsProfiles"; }
@@ -19,7 +19,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemStackTrace.cpp b/src/Storages/System/StorageSystemStackTrace.cpp
index e02d4bf1733..ba7433fb9ae 100644
--- a/src/Storages/System/StorageSystemStackTrace.cpp
+++ b/src/Storages/System/StorageSystemStackTrace.cpp
@@ -1,6 +1,5 @@
 #ifdef OS_LINUX /// Because of 'rt_tgsigqueueinfo' functions and RT signals.
 
-#include <csignal>
 #include <poll.h>
 
 #include <mutex>
@@ -168,12 +167,12 @@ bool wait(int timeout_ms)
                 continue;   /// Drain delayed notifications.
         }
 
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: read wrong number of bytes from pipe");
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Read wrong number of bytes from pipe");
     }
 }
 
 using ThreadIdToName = std::unordered_map<UInt64, String, DefaultHash<UInt64>>;
-ThreadIdToName getFilteredThreadNames(const ActionsDAG::Node * predicate, ContextPtr context, const PaddedPODArray<UInt64> & thread_ids, Poco::Logger * log)
+ThreadIdToName getFilteredThreadNames(const ActionsDAG::Node * predicate, ContextPtr context, const PaddedPODArray<UInt64> & thread_ids, LoggerPtr log)
 {
     ThreadIdToName tid_to_name;
     MutableColumnPtr all_thread_names = ColumnString::create();
@@ -274,15 +273,21 @@ bool isSignalBlocked(UInt64 tid, int signal)
 class StackTraceSource : public ISource
 {
 public:
-    StackTraceSource(const Names & column_names, Block header_, ASTPtr && query_, ActionsDAGPtr && filter_dag_, ContextPtr context_, UInt64 max_block_size_, Poco::Logger * log_)
+    StackTraceSource(
+        const Names & column_names,
+        Block header_,
+        ActionsDAGPtr && filter_dag_,
+        ContextPtr context_,
+        UInt64 max_block_size_,
+        LoggerPtr log_)
         : ISource(header_)
         , context(context_)
         , header(std::move(header_))
-        , query(std::move(query_))
         , filter_dag(std::move(filter_dag_))
         , predicate(filter_dag ? filter_dag->getOutputs().at(0) : nullptr)
         , max_block_size(max_block_size_)
-        , pipe_read_timeout_ms(static_cast<int>(context->getSettingsRef().storage_system_stack_trace_pipe_read_timeout_ms.totalMilliseconds()))
+        , pipe_read_timeout_ms(
+              static_cast<int>(context->getSettingsRef().storage_system_stack_trace_pipe_read_timeout_ms.totalMilliseconds()))
         , log(log_)
         , proc_it("/proc/self/task")
         /// It shouldn't be possible to do concurrent reads from this table.
@@ -417,7 +422,6 @@ protected:
 private:
     ContextPtr context;
     Block header;
-    const ASTPtr query;
     const ActionsDAGPtr filter_dag;
     const ActionsDAG::Node * predicate;
 
@@ -426,7 +430,7 @@ private:
     bool send_signal = false;
     bool read_thread_names = false;
 
-    Poco::Logger * log;
+    LoggerPtr log;
 
     std::filesystem::directory_iterator proc_it;
     std::filesystem::directory_iterator end;
@@ -463,11 +467,9 @@ public:
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override
     {
-        auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
         Pipe pipe(std::make_shared<StackTraceSource>(
             column_names,
             getOutputStream().header,
-            std::move(query),
             std::move(filter_actions_dag),
             context,
             max_block_size,
@@ -477,15 +479,14 @@ public:
 
     ReadFromSystemStackTrace(
         const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
-        ASTPtr && query_,
-        ContextPtr context_,
         size_t max_block_size_,
-        Poco::Logger * log_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
+        LoggerPtr log_)
+        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)}, column_names_, query_info_, storage_snapshot_, context_)
         , column_names(column_names_)
-        , query(query_)
-        , context(std::move(context_))
         , max_block_size(max_block_size_)
         , log(log_)
     {
@@ -493,10 +494,8 @@ public:
 
 private:
     Names column_names;
-    ASTPtr query;
-    ContextPtr context;
     size_t max_block_size;
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
@@ -504,15 +503,15 @@ private:
 
 StorageSystemStackTrace::StorageSystemStackTrace(const StorageID & table_id_)
     : IStorage(table_id_)
-    , log(&Poco::Logger::get("StorageSystemStackTrace"))
+    , log(getLogger("StorageSystemStackTrace"))
 {
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription({
-        { "thread_name", std::make_shared<DataTypeString>() },
-        { "thread_id", std::make_shared<DataTypeUInt64>() },
-        { "query_id", std::make_shared<DataTypeString>() },
-        { "trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()) },
-    }, { /* aliases */ }));
+        {"thread_name", std::make_shared<DataTypeString>(), "The name of the thread."},
+        {"thread_id", std::make_shared<DataTypeUInt64>(), "The thread identifier"},
+        {"query_id", std::make_shared<DataTypeString>(), "The ID of the query this thread belongs to."},
+        {"trace", std::make_shared<DataTypeArray>(std::make_shared<DataTypeUInt64>()), "The stacktrace of this thread. Basically just an array of addresses."},
+    }));
     setInMemoryMetadata(storage_metadata);
 
     notification_pipe.open();
@@ -548,12 +547,7 @@ void StorageSystemStackTrace::read(
     Block sample_block = storage_snapshot->metadata->getSampleBlock();
 
     auto reading = std::make_unique<ReadFromSystemStackTrace>(
-        column_names,
-        sample_block,
-        query_info.query->clone(),
-        context,
-        max_block_size,
-        log);
+        column_names, query_info, storage_snapshot, context, sample_block, max_block_size, log);
     query_plan.addStep(std::move(reading));
 }
 
diff --git a/src/Storages/System/StorageSystemStackTrace.h b/src/Storages/System/StorageSystemStackTrace.h
index 18216cea1bd..ce1b7f8ccd2 100644
--- a/src/Storages/System/StorageSystemStackTrace.h
+++ b/src/Storages/System/StorageSystemStackTrace.h
@@ -38,7 +38,7 @@ public:
     bool isSystemStorage() const override { return true; }
 
 protected:
-    Poco::Logger * log;
+    LoggerPtr log;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemStoragePolicies.cpp b/src/Storages/System/StorageSystemStoragePolicies.cpp
index 39e99884e1d..21251136f7d 100644
--- a/src/Storages/System/StorageSystemStoragePolicies.cpp
+++ b/src/Storages/System/StorageSystemStoragePolicies.cpp
@@ -37,16 +37,16 @@ StorageSystemStoragePolicies::StorageSystemStoragePolicies(const StorageID & tab
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(
         ColumnsDescription({
-             {"policy_name", std::make_shared<DataTypeString>()},
-             {"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<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>()},
-             {"perform_ttl_move_on_insert", std::make_shared<DataTypeUInt8>()},
-             {"load_balancing", std::make_shared<DataTypeEnum8>(getTypeEnumValues<VolumeLoadBalancing>())}
+            {"policy_name", std::make_shared<DataTypeString>(), "The name of the storage policy."},
+            {"volume_name", std::make_shared<DataTypeString>(), "The name of the volume."},
+            {"volume_priority", std::make_shared<DataTypeUInt64>(), "The priority of the volume."},
+            {"disks", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of all disks names which are a part of this storage policy."},
+            {"volume_type", std::make_shared<DataTypeEnum8>(getTypeEnumValues<VolumeType>()), "The type of the volume - JBOD or a single disk."},
+            {"max_data_part_size", std::make_shared<DataTypeUInt64>(), "the maximum size of a part that can be stored on any of the volumes disks."},
+            {"move_factor", std::make_shared<DataTypeFloat32>(), "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)."},
+            {"prefer_not_to_merge", std::make_shared<DataTypeUInt8>(), "You should not use this setting. Disables merging of data parts on this volume (this is harmful and leads to performance degradation)."},
+            {"perform_ttl_move_on_insert", std::make_shared<DataTypeUInt8>(), "Disables TTL move on data part INSERT. By default (if enabled) 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."},
+            {"load_balancing", std::make_shared<DataTypeEnum8>(getTypeEnumValues<VolumeLoadBalancing>()), "Policy for disk balancing, `round_robin` or `least_used`."}
     }));
     // TODO: Add string column with custom volume-type-specific options
     setInMemoryMetadata(storage_metadata);
diff --git a/src/Storages/System/StorageSystemSymbols.cpp b/src/Storages/System/StorageSystemSymbols.cpp
index 56195544448..6b313407e61 100644
--- a/src/Storages/System/StorageSystemSymbols.cpp
+++ b/src/Storages/System/StorageSystemSymbols.cpp
@@ -22,9 +22,9 @@ StorageSystemSymbols::StorageSystemSymbols(const StorageID & table_id_)
     StorageInMemoryMetadata storage_metadata;
     storage_metadata.setColumns(ColumnsDescription(
     {
-        {"symbol", std::make_shared<DataTypeString>()},
-        {"address_begin", std::make_shared<DataTypeUInt64>()},
-        {"address_end", std::make_shared<DataTypeUInt64>()},
+        {"symbol", std::make_shared<DataTypeString>(), "Symbol name in the binary. It is mangled. You can apply demangle(symbol) to obtain a readable name."},
+        {"address_begin", std::make_shared<DataTypeUInt64>(), "Start address of the symbol in the binary."},
+        {"address_end", std::make_shared<DataTypeUInt64>(), "End address of the symbol in the binary."},
     }));
     setInMemoryMetadata(storage_metadata);
 }
diff --git a/src/Storages/System/StorageSystemTableEngines.cpp b/src/Storages/System/StorageSystemTableEngines.cpp
index c0cf95423d9..e27546aa2a4 100644
--- a/src/Storages/System/StorageSystemTableEngines.cpp
+++ b/src/Storages/System/StorageSystemTableEngines.cpp
@@ -26,7 +26,7 @@ ColumnsDescription StorageSystemTableEngines::getColumnsDescription()
     };
 }
 
-void StorageSystemTableEngines::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemTableEngines::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & pair : StorageFactory::instance().getAllStorages())
     {
diff --git a/src/Storages/System/StorageSystemTableEngines.h b/src/Storages/System/StorageSystemTableEngines.h
index 258b9d210b1..d7af471bb2d 100644
--- a/src/Storages/System/StorageSystemTableEngines.h
+++ b/src/Storages/System/StorageSystemTableEngines.h
@@ -6,10 +6,10 @@
 namespace DB
 {
 
-class StorageSystemTableEngines final : public IStorageSystemOneBlock<StorageSystemTableEngines>
+class StorageSystemTableEngines final : public IStorageSystemOneBlock
 {
 protected:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
diff --git a/src/Storages/System/StorageSystemTableFunctions.cpp b/src/Storages/System/StorageSystemTableFunctions.cpp
index 9fb8e11e4d1..94b7d73a67e 100644
--- a/src/Storages/System/StorageSystemTableFunctions.cpp
+++ b/src/Storages/System/StorageSystemTableFunctions.cpp
@@ -20,7 +20,7 @@ ColumnsDescription StorageSystemTableFunctions::getColumnsDescription()
     };
 }
 
-void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemTableFunctions::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & factory = TableFunctionFactory::instance();
     const auto & functions_names = factory.getAllRegisteredNames();
diff --git a/src/Storages/System/StorageSystemTableFunctions.h b/src/Storages/System/StorageSystemTableFunctions.h
index 804c3b51940..07ef8857135 100644
--- a/src/Storages/System/StorageSystemTableFunctions.h
+++ b/src/Storages/System/StorageSystemTableFunctions.h
@@ -6,12 +6,12 @@
 namespace DB
 {
 
-class StorageSystemTableFunctions final : public IStorageSystemOneBlock<StorageSystemTableFunctions>
+class StorageSystemTableFunctions final : public IStorageSystemOneBlock
 {
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
 public:
     std::string getName() const override
diff --git a/src/Storages/System/StorageSystemTables.cpp b/src/Storages/System/StorageSystemTables.cpp
index 92ae643db55..9bd7ff945ad 100644
--- a/src/Storages/System/StorageSystemTables.cpp
+++ b/src/Storages/System/StorageSystemTables.cpp
@@ -9,6 +9,7 @@
 #include <Storages/VirtualColumnUtils.h>
 #include <Access/ContextAccess.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/formatWithPossiblyHidingSecrets.h>
 #include <Parsers/ASTCreateQuery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
@@ -24,6 +25,8 @@
 #include <QueryPipeline/QueryPipelineBuilder.h>
 #include <DataTypes/DataTypeUUID.h>
 
+#include <boost/range/adaptor/map.hpp>
+
 
 namespace DB
 {
@@ -43,6 +46,7 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
         {"data_paths", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Paths to the table data in the file systems."},
         {"metadata_path", std::make_shared<DataTypeString>(), "Path to the table metadata in the file system."},
         {"metadata_modification_time", std::make_shared<DataTypeDateTime>(), "Time of latest modification of the table metadata."},
+        {"metadata_version", std::make_shared<DataTypeInt32>(), "Metadata version for ReplicatedMergeTree table, 0 for non ReplicatedMergeTree table."},
         {"dependencies_database", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Database dependencies."},
         {"dependencies_table", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "Table dependencies (materialized views the current table)."},
         {"create_table_query", std::make_shared<DataTypeString>(), "The query that was used to create the table."},
@@ -66,9 +70,9 @@ StorageSystemTables::StorageSystemTables(const StorageID & table_id_)
             "Total number of uncompressed bytes, if it's possible to quickly determine the exact number "
             "of bytes from the part checksums for the table on storage, otherwise NULL (does not take underlying storage (if any) into account)."
         },
-        {"parts", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
-        {"active_parts", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
-        {"total_marks", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>())},
+        {"parts", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()), "The total number of parts in this table."},
+        {"active_parts", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()), "The number of active parts in this table."},
+        {"total_marks", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()), "The total number of marks in all parts in this table."},
         {"lifetime_rows", std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>()),
             "Total number of rows INSERTed since server start (only for Buffer tables)."
         },
@@ -287,6 +291,11 @@ protected:
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
 
+                        // metadata_version
+                        // Temporary tables does not support replication
+                        if (columns_mask[src_index++])
+                            res_columns[res_index++]->insertDefault();
+
                         // dependencies_database
                         if (columns_mask[src_index++])
                             res_columns[res_index++]->insertDefault();
@@ -311,7 +320,7 @@ protected:
                         while (src_index < columns_mask.size())
                         {
                             // total_rows
-                            if (src_index == 18 && columns_mask[src_index])
+                            if (src_index == 19 && columns_mask[src_index])
                             {
                                 if (auto total_rows = table.second->totalRows(settings))
                                     res_columns[res_index++]->insert(*total_rows);
@@ -319,7 +328,7 @@ protected:
                                     res_columns[res_index++]->insertDefault();
                             }
                             // total_bytes
-                            else if (src_index == 19 && columns_mask[src_index])
+                            else if (src_index == 20 && columns_mask[src_index])
                             {
                                 if (auto total_bytes = table.second->totalBytes(settings))
                                     res_columns[res_index++]->insert(*total_bytes);
@@ -418,6 +427,18 @@ protected:
                 if (columns_mask[src_index++])
                     res_columns[res_index++]->insert(static_cast<UInt64>(database->getObjectMetadataModificationTime(table_name)));
 
+                StorageMetadataPtr metadata_snapshot;
+                if (table)
+                    metadata_snapshot = table->getInMemoryMetadataPtr();
+
+                if (columns_mask[src_index++])
+                {
+                    if (metadata_snapshot && table->supportsReplication())
+                        res_columns[res_index++]->insert(metadata_snapshot->metadata_version);
+                    else
+                        res_columns[res_index++]->insertDefault();
+                }
+
                 {
                     Array views_table_name_array;
                     Array views_database_name_array;
@@ -482,10 +503,6 @@ protected:
                 else
                     src_index += 3;
 
-                StorageMetadataPtr metadata_snapshot;
-                if (table)
-                    metadata_snapshot = table->getInMemoryMetadataPtr();
-
                 ASTPtr expression_ptr;
                 if (columns_mask[src_index++])
                 {
@@ -682,28 +699,39 @@ public:
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &) override;
 
     ReadFromSystemTables(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
         Block sample_block,
-        ContextPtr context_,
         std::vector<UInt8> columns_mask_,
         size_t max_block_size_)
-        : SourceStepWithFilter(DataStream{.header = std::move(sample_block)})
-        , context(std::move(context_))
+        : SourceStepWithFilter(
+            DataStream{.header = std::move(sample_block)},
+            column_names_,
+            query_info_,
+            storage_snapshot_,
+            context_)
         , columns_mask(std::move(columns_mask_))
         , max_block_size(max_block_size_)
     {
     }
 
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
+
 private:
-    ContextPtr context;
     std::vector<UInt8> columns_mask;
     size_t max_block_size;
+
+    ColumnPtr filtered_databases_column;
+    ColumnPtr filtered_tables_column;
 };
 
 void StorageSystemTables::read(
     QueryPlan & query_plan,
     const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
-    SelectQueryInfo & /*query_info*/,
+    SelectQueryInfo & query_info,
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
     const size_t max_block_size,
@@ -715,24 +743,24 @@ void StorageSystemTables::read(
     auto [columns_mask, res_block] = getQueriedColumnsMaskAndHeader(sample_block, column_names);
 
     auto reading = std::make_unique<ReadFromSystemTables>(
-        std::move(res_block),
-        context,
-        std::move(columns_mask),
-        max_block_size);
+        column_names, query_info, storage_snapshot, context, std::move(res_block), std::move(columns_mask), max_block_size);
 
     query_plan.addStep(std::move(reading));
 }
 
-void ReadFromSystemTables::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+void ReadFromSystemTables::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    auto filter_actions_dag = ActionsDAG::buildFilterActionsDAG(filter_nodes.nodes, {}, context);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
     const ActionsDAG::Node * predicate = nullptr;
     if (filter_actions_dag)
         predicate = filter_actions_dag->getOutputs().at(0);
 
-    ColumnPtr filtered_databases_column = getFilteredDatabases(predicate, context);
-    ColumnPtr filtered_tables_column = getFilteredTables(predicate, filtered_databases_column, context);
+    filtered_databases_column = getFilteredDatabases(predicate, context);
+    filtered_tables_column = getFilteredTables(predicate, filtered_databases_column, context);
+}
 
+void ReadFromSystemTables::initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings &)
+{
     Pipe pipe(std::make_shared<TablesBlockSource>(
         std::move(columns_mask), getOutputStream().header, max_block_size, std::move(filtered_databases_column), std::move(filtered_tables_column), context));
     pipeline.init(std::move(pipe));
diff --git a/src/Storages/System/StorageSystemTimeZones.cpp b/src/Storages/System/StorageSystemTimeZones.cpp
index 14f4ce0f5de..af997c6423f 100644
--- a/src/Storages/System/StorageSystemTimeZones.cpp
+++ b/src/Storages/System/StorageSystemTimeZones.cpp
@@ -16,7 +16,7 @@ ColumnsDescription StorageSystemTimeZones::getColumnsDescription()
     };
 }
 
-void StorageSystemTimeZones::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemTimeZones::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (auto * it = auto_time_zones; *it; ++it)
         res_columns[0]->insert(String(*it));
diff --git a/src/Storages/System/StorageSystemTimeZones.h b/src/Storages/System/StorageSystemTimeZones.h
index f3743a1ef09..3f9db2f53e2 100644
--- a/src/Storages/System/StorageSystemTimeZones.h
+++ b/src/Storages/System/StorageSystemTimeZones.h
@@ -10,14 +10,13 @@ class Context;
 
 /** System table "time_zones" with list of timezones pulled from /contrib/cctz/testdata/zoneinfo
   */
-class StorageSystemTimeZones final : public IStorageSystemOneBlock<StorageSystemTimeZones>
+class StorageSystemTimeZones final : public IStorageSystemOneBlock
 {
 public:
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-public:
     std::string getName() const override { return "SystemTimeZones"; }
 
     static ColumnsDescription getColumnsDescription();
diff --git a/src/Storages/System/StorageSystemTransactions.cpp b/src/Storages/System/StorageSystemTransactions.cpp
index 47e44688c14..295d93edf7d 100644
--- a/src/Storages/System/StorageSystemTransactions.cpp
+++ b/src/Storages/System/StorageSystemTransactions.cpp
@@ -23,18 +23,17 @@ static DataTypePtr getStateEnumType()
 
 ColumnsDescription StorageSystemTransactions::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments.
     return ColumnsDescription
     {
-        {"tid", getTransactionIDDataType()},
-        {"tid_hash", std::make_shared<DataTypeUInt64>()},
-        {"elapsed", std::make_shared<DataTypeFloat64>()},
-        {"is_readonly", std::make_shared<DataTypeUInt8>()},
-        {"state", getStateEnumType()},
+        {"tid", getTransactionIDDataType(), "The identifier of the transaction."},
+        {"tid_hash", std::make_shared<DataTypeUInt64>(), "The hash of the identifier."},
+        {"elapsed", std::make_shared<DataTypeFloat64>(), "The amount of time the transaction being processed."},
+        {"is_readonly", std::make_shared<DataTypeUInt8>(), "The flag which shows whether the transaction has executed any write operation."},
+        {"state", getStateEnumType(), "The state of the transaction. Possible values: RUNNING, COMMITTING, COMMITTED, ROLLED_BACK."},
     };
 }
 
-void StorageSystemTransactions::fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const
+void StorageSystemTransactions::fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto list = TransactionLog::instance().getTransactionsList();
     for (const auto & elem : list)
diff --git a/src/Storages/System/StorageSystemTransactions.h b/src/Storages/System/StorageSystemTransactions.h
index b5a538b7b55..1c400619c1a 100644
--- a/src/Storages/System/StorageSystemTransactions.h
+++ b/src/Storages/System/StorageSystemTransactions.h
@@ -8,7 +8,7 @@ namespace DB
 
 class Context;
 
-class StorageSystemTransactions final : public IStorageSystemOneBlock<StorageSystemTransactions>
+class StorageSystemTransactions final : public IStorageSystemOneBlock
 {
 public:
     String getName() const override { return "SystemTransactions"; }
@@ -18,7 +18,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemUserDirectories.cpp b/src/Storages/System/StorageSystemUserDirectories.cpp
index 620c9746a4a..1b3469e7597 100644
--- a/src/Storages/System/StorageSystemUserDirectories.cpp
+++ b/src/Storages/System/StorageSystemUserDirectories.cpp
@@ -11,18 +11,17 @@ namespace DB
 {
 ColumnsDescription StorageSystemUserDirectories::getColumnsDescription()
 {
-    /// TODO: Fill in all the comments.
     return ColumnsDescription
     {
-        {"name", std::make_shared<DataTypeString>()},
-        {"type", std::make_shared<DataTypeString>()},
-        {"params", std::make_shared<DataTypeString>()},
-        {"precedence", std::make_shared<DataTypeUInt64>()},
+        {"name", std::make_shared<DataTypeString>(), "The name of the directory."},
+        {"type", std::make_shared<DataTypeString>(), "The type of the access storage e.g. users.xml or replicated or memory etc."},
+        {"params", std::make_shared<DataTypeString>(), "JSON with the parameters of the access storage."},
+        {"precedence", std::make_shared<DataTypeUInt64>(), "The order in which this directory is declared in the config. The same order is used when ClickHouse tries to find a user or role."},
     };
 }
 
 
-void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemUserDirectories::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto & access_control = context->getAccessControl();
     auto storages = access_control.getStorages();
diff --git a/src/Storages/System/StorageSystemUserDirectories.h b/src/Storages/System/StorageSystemUserDirectories.h
index bca6a9b5aa6..3cdaa877b81 100644
--- a/src/Storages/System/StorageSystemUserDirectories.h
+++ b/src/Storages/System/StorageSystemUserDirectories.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `users_directories` system table, which allows you to get information about user directories.
-class StorageSystemUserDirectories final : public IStorageSystemOneBlock<StorageSystemUserDirectories>
+class StorageSystemUserDirectories final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemUserDirectories"; }
@@ -16,7 +16,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemUserProcesses.cpp b/src/Storages/System/StorageSystemUserProcesses.cpp
index 4fbbd7ab54d..65fbeedf406 100644
--- a/src/Storages/System/StorageSystemUserProcesses.cpp
+++ b/src/Storages/System/StorageSystemUserProcesses.cpp
@@ -18,10 +18,10 @@ ColumnsDescription StorageSystemUserProcesses::getColumnsDescription()
 {
     auto description = ColumnsDescription
     {
-        {"user", std::make_shared<DataTypeString>()},
-        {"memory_usage", std::make_shared<DataTypeInt64>()},
-        {"peak_memory_usage", std::make_shared<DataTypeInt64>()},
-        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>())},
+        {"user", std::make_shared<DataTypeString>(), "User name."},
+        {"memory_usage", std::make_shared<DataTypeInt64>(), "Sum of RAM used by all processes of the user. It might not include some types of dedicated memory. See the max_memory_usage setting."},
+        {"peak_memory_usage", std::make_shared<DataTypeInt64>(), "The peak of memory usage of the user. It can be reset when no queries are run for the user."},
+        {"ProfileEvents", std::make_shared<DataTypeMap>(std::make_shared<DataTypeString>(), std::make_shared<DataTypeUInt64>()), "Summary of ProfileEvents that measure different metrics for the user. The description of them could be found in the table system.events"},
     };
 
     description.setAliases({
@@ -32,7 +32,7 @@ ColumnsDescription StorageSystemUserProcesses::getColumnsDescription()
     return description;
 }
 
-void StorageSystemUserProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemUserProcesses::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto user_info = context->getProcessList().getUserInfo(true);
 
diff --git a/src/Storages/System/StorageSystemUserProcesses.h b/src/Storages/System/StorageSystemUserProcesses.h
index 6eb12e30559..3141eae9662 100644
--- a/src/Storages/System/StorageSystemUserProcesses.h
+++ b/src/Storages/System/StorageSystemUserProcesses.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `processes` system table, which allows you to get information about the queries that are currently executing.
   */
-class StorageSystemUserProcesses final : public IStorageSystemOneBlock<StorageSystemUserProcesses>
+class StorageSystemUserProcesses final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemUserProcesses"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemUsers.cpp b/src/Storages/System/StorageSystemUsers.cpp
index cf114a85645..0c34f04844d 100644
--- a/src/Storages/System/StorageSystemUsers.cpp
+++ b/src/Storages/System/StorageSystemUsers.cpp
@@ -69,15 +69,15 @@ ColumnsDescription StorageSystemUsers::getColumnsDescription()
         {"default_roles_except", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()),
             "All the granted roles set as default excepting of the listed ones."
         },
-        {"grantees_any", std::make_shared<DataTypeUInt8>()},
-        {"grantees_list", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"grantees_except", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>())},
-        {"default_database", std::make_shared<DataTypeString>()},
+        {"grantees_any", std::make_shared<DataTypeUInt8>(), "The flag that indicates whether a user with any grant option can grant it to anyone."},
+        {"grantees_list", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of users or roles to which this user is allowed to grant options to."},
+        {"grantees_except", std::make_shared<DataTypeArray>(std::make_shared<DataTypeString>()), "The list of users or roles to which this user is forbidden from grant options to."},
+        {"default_database", std::make_shared<DataTypeString>(), "The name of the default database for this user."},
     };
 }
 
 
-void StorageSystemUsers::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemUsers::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     /// If "select_from_system_db_requires_grant" is enabled the access rights were already checked in InterpreterSelectQuery.
     const auto & access_control = context->getAccessControl();
diff --git a/src/Storages/System/StorageSystemUsers.h b/src/Storages/System/StorageSystemUsers.h
index cfa5947d370..a1a3d717b35 100644
--- a/src/Storages/System/StorageSystemUsers.h
+++ b/src/Storages/System/StorageSystemUsers.h
@@ -8,7 +8,7 @@ namespace DB
 class Context;
 
 /// Implements `users` system table, which allows you to get information about users.
-class StorageSystemUsers final : public IStorageSystemOneBlock<StorageSystemUsers>
+class StorageSystemUsers final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemUsers"; }
@@ -19,7 +19,7 @@ public:
 
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemViewRefreshes.cpp b/src/Storages/System/StorageSystemViewRefreshes.cpp
index d2b933e65a8..30539ed6b6a 100644
--- a/src/Storages/System/StorageSystemViewRefreshes.cpp
+++ b/src/Storages/System/StorageSystemViewRefreshes.cpp
@@ -36,20 +36,20 @@ ColumnsDescription StorageSystemViewRefreshes::getColumnsDescription()
         },
         {"refresh_count", std::make_shared<DataTypeUInt64>(), "Number of successful refreshes since last server restart or table creation."},
         {"progress", std::make_shared<DataTypeFloat64>(), "Progress of the current refresh, between 0 and 1."},
-        {"elapsed", std::make_shared<DataTypeFloat64>()},
-        {"read_rows", std::make_shared<DataTypeUInt64>(), "Number of rows read by the current refresh so far."},
-        {"read_bytes", std::make_shared<DataTypeUInt64>()},
+        {"elapsed", std::make_shared<DataTypeFloat64>(), "The amount of nanoseconds the current refresh took."},
+        {"read_rows", std::make_shared<DataTypeUInt64>(), "Number of rows read during the current refresh."},
+        {"read_bytes", std::make_shared<DataTypeUInt64>(), "Number of bytes read during the current refresh."},
         {"total_rows", std::make_shared<DataTypeUInt64>(), "Estimated total number of rows that need to be read by the current refresh."},
-        {"total_bytes", std::make_shared<DataTypeUInt64>()},
-        {"written_rows", std::make_shared<DataTypeUInt64>()},
-        {"written_bytes", std::make_shared<DataTypeUInt64>()},
-        {"result_rows", std::make_shared<DataTypeUInt64>()},
-        {"result_bytes", std::make_shared<DataTypeUInt64>()},
+        {"total_bytes", std::make_shared<DataTypeUInt64>(), "Estimated total number of bytes that need to be read by the current refresh."},
+        {"written_rows", std::make_shared<DataTypeUInt64>(), "Number of rows written during the current refresh."},
+        {"written_bytes", std::make_shared<DataTypeUInt64>(), "Number rof bytes written during the current refresh."},
+        {"result_rows", std::make_shared<DataTypeUInt64>(), "Estimated total number of rows in the result set of the SELECT query."},
+        {"result_bytes", std::make_shared<DataTypeUInt64>(), "Estimated total number of bytes in the result set of the SELECT query."},
     };
 }
 
 void StorageSystemViewRefreshes::fillData(
-    MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+    MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     auto access = context->getAccess();
     auto valid_access = AccessType::SHOW_TABLES;
diff --git a/src/Storages/System/StorageSystemViewRefreshes.h b/src/Storages/System/StorageSystemViewRefreshes.h
index 02d3a39dfff..5a29f3a3bc8 100644
--- a/src/Storages/System/StorageSystemViewRefreshes.h
+++ b/src/Storages/System/StorageSystemViewRefreshes.h
@@ -10,7 +10,7 @@ namespace DB
 {
 
 
-class StorageSystemViewRefreshes final : public IStorageSystemOneBlock<StorageSystemViewRefreshes>
+class StorageSystemViewRefreshes final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemViewRefreshes"; }
@@ -20,7 +20,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/StorageSystemWarnings.cpp b/src/Storages/System/StorageSystemWarnings.cpp
index e2579372b4d..01e96e980a8 100644
--- a/src/Storages/System/StorageSystemWarnings.cpp
+++ b/src/Storages/System/StorageSystemWarnings.cpp
@@ -1,5 +1,7 @@
 #include <Interpreters/Context.h>
+#include <DataTypes/DataTypeString.h>
 #include <Storages/System/StorageSystemWarnings.h>
+#include <Storages/ColumnsDescription.h>
 
 
 namespace DB
@@ -13,7 +15,7 @@ ColumnsDescription StorageSystemWarnings::getColumnsDescription()
     };
 }
 
-void StorageSystemWarnings::fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo &) const
+void StorageSystemWarnings::fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     for (const auto & warning : context->getWarnings())
         res_columns[0]->insert(warning);
diff --git a/src/Storages/System/StorageSystemWarnings.h b/src/Storages/System/StorageSystemWarnings.h
index 42948a765ea..685fb60b430 100644
--- a/src/Storages/System/StorageSystemWarnings.h
+++ b/src/Storages/System/StorageSystemWarnings.h
@@ -11,7 +11,7 @@ class Context;
 /** Implements system.warnings table that contains warnings about server configuration
   * to be displayed in clickhouse-client.
   */
-class StorageSystemWarnings final : public IStorageSystemOneBlock<StorageSystemWarnings>
+class StorageSystemWarnings final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemWarnings"; }
@@ -21,6 +21,6 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr, const SelectQueryInfo &) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 }
diff --git a/src/Storages/System/StorageSystemZooKeeper.cpp b/src/Storages/System/StorageSystemZooKeeper.cpp
index 37fe9074950..d1bf86ba8ef 100644
--- a/src/Storages/System/StorageSystemZooKeeper.cpp
+++ b/src/Storages/System/StorageSystemZooKeeper.cpp
@@ -12,6 +12,8 @@
 #include <Interpreters/ProcessList.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Common/ZooKeeper/ZooKeeper.h>
+#include <Common/ZooKeeper/ZooKeeperRetries.h>
+#include <Common/ZooKeeper/ZooKeeperWithFaultInjection.h>
 #include <Common/typeid_cast.h>
 #include <Columns/ColumnSet.h>
 #include <Columns/ColumnConst.h>
@@ -30,7 +32,6 @@
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
 #include <deque>
-#include <climits>
 
 
 namespace DB
@@ -167,53 +168,94 @@ public:
 /// Type of path to be fetched
 enum class ZkPathType
 {
-    Exact,   /// Fetch all nodes under this path
-    Prefix,  /// Fetch all nodes starting with this prefix, recursively (multiple paths may match prefix)
-    Recurse, /// Fatch all nodes under this path, recursively
+    Exact, /// Fetch all nodes under this path
+    Prefix, /// Fetch all nodes starting with this prefix, recursively (multiple paths may match prefix)
+    Recurse, /// Fetch all nodes under this path, recursively
 };
 
-/// List of paths to be feched from zookeeper
-using Paths = std::deque<std::pair<String, ZkPathType>>;
+/// List of paths to be fetched from zookeeper
+using Paths = std::unordered_map<String, ZkPathType>;
 
 class ReadFromSystemZooKeeper final : public SourceStepWithFilter
 {
 public:
-    ReadFromSystemZooKeeper(const Block & header, SelectQueryInfo & query_info_, ContextPtr context_);
+    ReadFromSystemZooKeeper(
+        const Names & column_names_,
+        const SelectQueryInfo & query_info_,
+        const StorageSnapshotPtr & storage_snapshot_,
+        const ContextPtr & context_,
+        const Block & header,
+        UInt64 max_block_size_);
 
     String getName() const override { return "ReadFromSystemZooKeeper"; }
 
     void initializePipeline(QueryPipelineBuilder & pipeline, const BuildQueryPipelineSettings & settings) override;
 
-    void applyFilters() override;
+    void applyFilters(ActionDAGNodes added_filter_nodes) override;
 
 private:
-    void fillData(MutableColumns & res_columns);
-
     std::shared_ptr<const StorageLimitsList> storage_limits;
-    ContextPtr context;
+    const UInt64 max_block_size;
     Paths paths;
 };
 
+
+class SystemZooKeeperSource : public ISource
+{
+public:
+    SystemZooKeeperSource(
+        Paths && paths_,
+        Block header_,
+        UInt64 max_block_size_,
+        ContextPtr context_)
+        : ISource(header_)
+        , max_block_size(max_block_size_)
+        , paths(std::move(paths_))
+        , context(std::move(context_))
+    {
+    }
+
+    String getName() const override { return "SystemZooKeeper"; }
+
+protected:
+    Chunk generate() override;
+
+private:
+    const UInt64 max_block_size;
+    Paths paths;
+    ContextPtr context;
+    ZooKeeperWithFaultInjection::Ptr zookeeper;
+    bool started = false;
+    std::unordered_set<String> visited;
+};
+
+
 StorageSystemZooKeeper::StorageSystemZooKeeper(const StorageID & table_id_)
         : IStorage(table_id_)
 {
-        StorageInMemoryMetadata storage_metadata;
-        storage_metadata.setColumns(getColumnsDescription());
-        setInMemoryMetadata(storage_metadata);
+    StorageInMemoryMetadata storage_metadata;
+    storage_metadata.setColumns(getColumnsDescription());
+    setInMemoryMetadata(storage_metadata);
 }
 
 void StorageSystemZooKeeper::read(
     QueryPlan & query_plan,
-    const Names & /*column_names*/,
+    const Names & column_names,
     const StorageSnapshotPtr & storage_snapshot,
     SelectQueryInfo & query_info,
     ContextPtr context,
     QueryProcessingStage::Enum /*processed_stage*/,
-    size_t /*max_block_size*/,
+    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);
+    auto header = storage_snapshot->metadata->getSampleBlockWithVirtuals(getVirtualsList());
+    auto read_step = std::make_unique<ReadFromSystemZooKeeper>(
+        column_names,
+        query_info,
+        storage_snapshot,
+        context,
+        header,
+        max_block_size);
     query_plan.addStep(std::move(read_step));
 }
 
@@ -334,7 +376,8 @@ static void extractPathImpl(const ActionsDAG::Node & node, Paths & res, ContextP
         size_t size = values->size();
 
         for (size_t row = 0; row < size; ++row)
-            res.emplace_back(values->getDataAt(row).toString(), ZkPathType::Exact);
+            /// Only inserted if the key doesn't exists already
+            res.insert({values->getDataAt(row).toString(), ZkPathType::Exact});
     }
     else if (function_name == "equals")
     {
@@ -354,7 +397,8 @@ static void extractPathImpl(const ActionsDAG::Node & node, Paths & res, ContextP
         if (value->column->size() != 1)
             return;
 
-        res.emplace_back(value->column->getDataAt(0).toString(), ZkPathType::Exact);
+        /// Only inserted if the key doesn't exists already
+        res.insert({value->column->getDataAt(0).toString(), ZkPathType::Exact});
     }
     else if (allow_unrestricted && function_name == "like")
     {
@@ -373,7 +417,7 @@ static void extractPathImpl(const ActionsDAG::Node & node, Paths & res, ContextP
 
         String pattern = value->column->getDataAt(0).toString();
         bool has_metasymbol = false;
-        String prefix; // pattern prefix before the first metasymbol occurrence
+        String prefix{}; // pattern prefix before the first metasymbol occurrence
         for (size_t i = 0; i < pattern.size(); i++)
         {
             char c = pattern[i];
@@ -399,7 +443,7 @@ static void extractPathImpl(const ActionsDAG::Node & node, Paths & res, ContextP
             prefix.append(1, c);
         }
 
-        res.emplace_back(prefix, has_metasymbol ? ZkPathType::Prefix : ZkPathType::Exact);
+        res.insert_or_assign(prefix, has_metasymbol ? ZkPathType::Prefix : ZkPathType::Exact);
     }
 }
 
@@ -412,28 +456,72 @@ static Paths extractPath(const ActionsDAG::NodeRawConstPtrs & filter_nodes, Cont
     for (const auto * node : filter_nodes)
         extractPathImpl(*node, res, context, allow_unrestricted);
 
-    if (filter_nodes.empty() && allow_unrestricted)
-        res.emplace_back("/", ZkPathType::Recurse);
+    auto node1 = res.find("/");
+    auto node2 = res.find("");
+    if ((node1 != res.end() && node1->second != ZkPathType::Exact) || (node2 != res.end() && node2->second != ZkPathType::Exact))
+    {
+        /// If we are already searching everything recursively, remove all other nodes
+        res.clear();
+        res.insert({"/", ZkPathType::Recurse});
+    }
+
+    if (res.empty() && allow_unrestricted)
+        res.insert({"/", ZkPathType::Recurse});
 
     return res;
 }
 
 
-void ReadFromSystemZooKeeper::applyFilters()
+void ReadFromSystemZooKeeper::applyFilters(ActionDAGNodes added_filter_nodes)
 {
-    paths = extractPath(getFilterNodes().nodes, context, context->getSettingsRef().allow_unrestricted_reads_from_keeper);
+    filter_actions_dag = ActionsDAG::buildFilterActionsDAG(added_filter_nodes.nodes);
+    paths = extractPath(added_filter_nodes.nodes, context, context->getSettingsRef().allow_unrestricted_reads_from_keeper);
 }
 
-void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
-{
-    zkutil::ZooKeeperPtr zookeeper = context->getZooKeeper();
 
+Chunk SystemZooKeeperSource::generate()
+{
     if (paths.empty())
-        throw Exception(ErrorCodes::BAD_ARGUMENTS,
+    {
+        if (!started)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
                         "SELECT from system.zookeeper table must contain condition like path = 'path' "
                         "or path IN ('path1','path2'...) or path IN (subquery) "
                         "in WHERE clause unless `set allow_unrestricted_reads_from_keeper = 'true'`.");
 
+        /// No more work
+        return {};
+    }
+
+    started = true;
+
+    MutableColumns res_columns = getPort().getHeader().cloneEmptyColumns();
+    size_t row_count = 0;
+
+    QueryStatusPtr query_status = context->getProcessListElement();
+
+    const auto & settings = context->getSettingsRef();
+    /// Use insert settings for now in order not to introduce new settings.
+    /// Hopefully insert settings will also be unified and replaced with some generic retry settings.
+    ZooKeeperRetriesInfo retries_seetings(
+        settings.insert_keeper_max_retries,
+        settings.insert_keeper_retry_initial_backoff_ms,
+        settings.insert_keeper_retry_max_backoff_ms);
+
+    /// Handles reconnects when needed
+    auto get_zookeeper = [&] ()
+    {
+        if (!zookeeper || zookeeper->expired())
+        {
+            zookeeper = ZooKeeperWithFaultInjection::createInstance(
+                settings.insert_keeper_fault_injection_probability,
+                settings.insert_keeper_fault_injection_seed,
+                context->getZooKeeper(),
+                "", nullptr);
+        }
+        return zookeeper;
+    };
+
     const Int64 max_inflight_requests = std::max<Int64>(1, context->getSettingsRef().max_download_threads.value);
 
     struct ListTask
@@ -445,15 +533,28 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
         String path_part;
     };
     std::vector<ListTask> list_tasks;
-    std::unordered_set<String> added;
     while (!paths.empty())
     {
+        if (query_status)
+            query_status->checkTimeLimit();
+
+        /// Check if the block is big enough already
+        if (max_block_size > 0 && row_count > 0)
+        {
+            size_t total_size = 0;
+            for (const auto & column : res_columns)
+                total_size += column->byteSize();
+            if (total_size > max_block_size)
+                break;
+        }
+
         list_tasks.clear();
         std::vector<String> paths_to_list;
         while (!paths.empty() && static_cast<Int64>(list_tasks.size()) < max_inflight_requests)
         {
-            auto [path, path_type] = std::move(paths.front());
-            paths.pop_front();
+            auto node = paths.extract(paths.begin());
+            auto & path = node.key();
+            auto & path_type = node.mapped();
 
             ListTask task;
             task.path = path;
@@ -470,7 +571,10 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
             paths_to_list.emplace_back(task.path_corrected);
             list_tasks.emplace_back(std::move(task));
         }
-        auto list_responses = zookeeper->tryGetChildren(paths_to_list);
+
+        zkutil::ZooKeeper::MultiTryGetChildrenResponse list_responses;
+        ZooKeeperRetriesControl("", nullptr, retries_seetings, query_status).retryLoop(
+            [&]() { list_responses = get_zookeeper()->tryGetChildren(paths_to_list); });
 
         struct GetTask
         {
@@ -488,8 +592,8 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
                 continue;
 
             auto & task = list_tasks[list_task_idx];
-            if (auto elem = context->getProcessListElement())
-                elem->checkTimeLimit();
+            if (query_status)
+                query_status->checkTimeLimit();
 
             Strings nodes = std::move(list_result.names);
 
@@ -514,7 +618,9 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
             }
         }
 
-        auto get_responses = zookeeper->tryGet(paths_to_get);
+        zkutil::ZooKeeper::MultiTryGetResponse get_responses;
+        ZooKeeperRetriesControl("", nullptr, retries_seetings, query_status).retryLoop(
+            [&]() { get_responses = get_zookeeper()->tryGet(paths_to_get); });
 
         for (size_t i = 0, size = get_tasks.size(); i < size; ++i)
         {
@@ -524,12 +630,12 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
 
             auto & get_task = get_tasks[i];
             auto & list_task = list_tasks[get_task.list_task_idx];
-            if (auto elem = context->getProcessListElement())
-                elem->checkTimeLimit();
+            if (query_status)
+                query_status->checkTimeLimit();
 
             // Deduplication
             String key = list_task.path_part + '/' + get_task.node;
-            if (auto [it, inserted] = added.emplace(key); !inserted)
+            if (auto [it, inserted] = visited.emplace(key); !inserted)
                 continue;
 
             const Coordination::Stat & stat = res.stat;
@@ -551,31 +657,40 @@ void ReadFromSystemZooKeeper::fillData(MutableColumns & res_columns)
             res_columns[col_num++]->insert(
                 list_task.path); /// This is the original path. In order to process the request, condition in WHERE should be triggered.
 
+            ++row_count;
+
             if (list_task.path_type != ZkPathType::Exact && res.stat.numChildren > 0)
             {
-                paths.emplace_back(key, ZkPathType::Recurse);
+                paths.insert_or_assign(key, ZkPathType::Recurse);
             }
         }
     }
+
+    return Chunk(std::move(res_columns), row_count);
 }
 
-ReadFromSystemZooKeeper::ReadFromSystemZooKeeper(const Block & header, SelectQueryInfo & query_info, ContextPtr context_)
-    : SourceStepWithFilter({.header = header})
+ReadFromSystemZooKeeper::ReadFromSystemZooKeeper(
+    const Names & column_names_,
+    const SelectQueryInfo & query_info_,
+    const StorageSnapshotPtr & storage_snapshot_,
+    const ContextPtr & context_,
+    const Block & header,
+    UInt64 max_block_size_)
+    : SourceStepWithFilter(
+        {.header = header},
+        column_names_,
+        query_info_,
+        storage_snapshot_,
+        context_)
     , storage_limits(query_info.storage_limits)
-    , context(std::move(context_))
+    , max_block_size(max_block_size_)
 {
 }
 
 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));
+    auto source = std::make_shared<SystemZooKeeperSource>(std::move(paths), header, max_block_size, context);
     source->setStorageLimits(storage_limits);
     processors.emplace_back(source);
     pipeline.init(Pipe(std::move(source)));
diff --git a/src/Storages/System/StorageSystemZooKeeperConnection.cpp b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
index c165bfa217d..950e20512c0 100644
--- a/src/Storages/System/StorageSystemZooKeeperConnection.cpp
+++ b/src/Storages/System/StorageSystemZooKeeperConnection.cpp
@@ -8,6 +8,8 @@
 #include <Coordination/KeeperFeatureFlags.h>
 #include <Storages/System/StorageSystemZooKeeperConnection.h>
 
+#include <Poco/NumberParser.h>
+
 namespace DB
 {
 
@@ -39,7 +41,7 @@ ColumnsDescription StorageSystemZooKeeperConnection::getColumnsDescription()
 }
 
 void StorageSystemZooKeeperConnection::fillData(MutableColumns & res_columns, ContextPtr context,
-    const SelectQueryInfo &) const
+    const ActionsDAG::Node *, std::vector<UInt8>) const
 {
     const auto add_enabled_feature_flags = [&](const auto & zookeeper)
     {
diff --git a/src/Storages/System/StorageSystemZooKeeperConnection.h b/src/Storages/System/StorageSystemZooKeeperConnection.h
index 2b6d3b2e516..f8263e1f1bc 100644
--- a/src/Storages/System/StorageSystemZooKeeperConnection.h
+++ b/src/Storages/System/StorageSystemZooKeeperConnection.h
@@ -11,7 +11,7 @@ class Context;
 
 /** Implements `zookeeper_connection` system table, which allows you to get information about the connected zookeeper info.
   */
-class StorageSystemZooKeeperConnection final : public IStorageSystemOneBlock<StorageSystemZooKeeperConnection>
+class StorageSystemZooKeeperConnection final : public IStorageSystemOneBlock
 {
 public:
     std::string getName() const override { return "SystemZooKeeperConnection"; }
@@ -21,7 +21,7 @@ public:
 protected:
     using IStorageSystemOneBlock::IStorageSystemOneBlock;
 
-    void fillData(MutableColumns & res_columns, ContextPtr context, const SelectQueryInfo & query_info) const override;
+    void fillData(MutableColumns & res_columns, ContextPtr context, const ActionsDAG::Node *, std::vector<UInt8>) const override;
 };
 
 }
diff --git a/src/Storages/System/attachInformationSchemaTables.cpp b/src/Storages/System/attachInformationSchemaTables.cpp
index bfe0f20fc92..5afdd7a02ac 100644
--- a/src/Storages/System/attachInformationSchemaTables.cpp
+++ b/src/Storages/System/attachInformationSchemaTables.cpp
@@ -35,8 +35,9 @@ static constexpr std::string_view schemata = R"(
         `DEFAULT_CHARACTER_SET_SCHEMA` Nullable(String),
         `DEFAULT_CHARACTER_SET_NAME` Nullable(String),
         `SQL_PATH` Nullable(String)
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         name                          AS catalog_name,
         name                          AS schema_name,
         'default'                     AS schema_owner,
@@ -73,8 +74,9 @@ static constexpr std::string_view tables = R"(
         `DATA_LENGTH` Nullable(UInt64),
         `TABLE_COLLATION` Nullable(String),
         `TABLE_COMMENT` Nullable(String)
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         database             AS table_catalog,
         database             AS table_schema,
         name                 AS table_name,
@@ -122,8 +124,9 @@ static constexpr std::string_view views = R"(
         `IS_TRIGGER_UPDATABLE` Enum8('NO' = 0, 'YES' = 1),
         `IS_TRIGGER_DELETABLE` Enum8('NO' = 0, 'YES' = 1),
         `IS_TRIGGER_INSERTABLE_INTO` Enum8('NO' = 0, 'YES' = 1)
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         database AS table_catalog,
         database AS table_schema,
         name AS table_name,
@@ -203,8 +206,9 @@ static constexpr std::string_view columns = R"(
         `EXTRA` Nullable(String),
         `COLUMN_COMMENT` String,
         `COLUMN_TYPE` String
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         database AS table_catalog,
         database AS table_schema,
         table AS table_name,
@@ -291,8 +295,9 @@ static constexpr std::string_view key_column_usage = R"(
          `REFERENCED_TABLE_SCHEMA` Nullable(String),
          `REFERENCED_TABLE_NAME` Nullable(String),
          `REFERENCED_COLUMN_NAME` Nullable(String)
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         'def'                         AS constraint_catalog,
         database                      AS constraint_schema,
         'PRIMARY'                     AS constraint_name,
@@ -346,8 +351,9 @@ static constexpr std::string_view referential_constraints = R"(
          `DELETE_RULE` String,
          `TABLE_NAME` String,
          `REFERENCED_TABLE_NAME` String
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         ''                        AS constraint_catalog,
         NULL                      AS constraint_name,
         ''                        AS constraint_schema,
@@ -412,8 +418,9 @@ static constexpr std::string_view statistics = R"(
         `INDEX_COMMENT` String,
         `IS_VISIBLE` String,
         `EXPRESSION` Nullable(String)
-    ) AS
-    SELECT
+    )
+    SQL SECURITY INVOKER
+    AS SELECT
         ''            AS table_catalog,
         ''            AS table_schema,
         ''            AS table_name,
@@ -471,7 +478,7 @@ static void createInformationSchemaView(ContextMutablePtr context, IDatabase & d
         ParserCreateQuery parser;
         ASTPtr ast = parseQuery(parser, query.data(), query.data() + query.size(),
                                 "Attach query from embedded resource " + metadata_resource_name,
-                                DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH);
+                                DBMS_DEFAULT_MAX_QUERY_SIZE, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
 
         auto & ast_create = ast->as<ASTCreateQuery &>();
         assert(view_name == ast_create.getTable());
@@ -479,13 +486,13 @@ static void createInformationSchemaView(ContextMutablePtr context, IDatabase & d
         ast_create.setDatabase(database.getDatabaseName());
 
         StoragePtr view = createTableFromAST(ast_create, database.getDatabaseName(),
-                                             database.getTableDataPath(ast_create), context, true).second;
+                                             database.getTableDataPath(ast_create), context, LoadingStrictnessLevel::FORCE_RESTORE).second;
         database.createTable(context, ast_create.getTable(), view, ast);
         ASTPtr ast_upper = ast_create.clone();
         auto & ast_create_upper = ast_upper->as<ASTCreateQuery &>();
         ast_create_upper.setTable(Poco::toUpper(view_name));
         StoragePtr view_upper = createTableFromAST(ast_create_upper, database.getDatabaseName(),
-                                             database.getTableDataPath(ast_create_upper), context, true).second;
+                                             database.getTableDataPath(ast_create_upper), context, LoadingStrictnessLevel::FORCE_RESTORE).second;
 
         database.createTable(context, ast_create_upper.getTable(), view_upper, ast_upper);
 
diff --git a/src/Storages/System/attachSystemTables.cpp b/src/Storages/System/attachSystemTables.cpp
index bf898f57833..6ff86b26ca9 100644
--- a/src/Storages/System/attachSystemTables.cpp
+++ b/src/Storages/System/attachSystemTables.cpp
@@ -1,3 +1,4 @@
+#include "Storages/System/StorageSystemKeywords.h"
 #include "config.h"
 
 #include <Databases/IDatabase.h>
@@ -77,6 +78,7 @@
 #include <Storages/System/StorageSystemAsynchronousInserts.h>
 #include <Storages/System/StorageSystemTransactions.h>
 #include <Storages/System/StorageSystemFilesystemCache.h>
+#include <Storages/System/StorageSystemFilesystemCacheSettings.h>
 #include <Storages/System/StorageSystemQueryCache.h>
 #include <Storages/System/StorageSystemNamedCollections.h>
 #include <Storages/System/StorageSystemRemoteDataPaths.h>
@@ -90,6 +92,7 @@
 #include <Storages/System/StorageSystemS3Queue.h>
 #include <Storages/System/StorageSystemDashboards.h>
 #include <Storages/System/StorageSystemViewRefreshes.h>
+#include <Storages/System/StorageSystemDNSCache.h>
 
 #if defined(__ELF__) && !defined(OS_FREEBSD)
 #include <Storages/System/StorageSystemSymbols.h>
@@ -117,14 +120,16 @@ namespace DB
 
 void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, bool has_zookeeper)
 {
-    attach<StorageSystemOne>(context, system_database, "one", "This table contains a single row with a single dummy UInt8 column containing the value 0. Used when the table is not specified explicitly, for example in queries like `SELECT 1`.");
-    attach<StorageSystemNumbers>(context, system_database, "numbers", "Generates all natural numbers, starting from 0 (to 2^64 - 1, and then again) in sorted order.", false);
-    attach<StorageSystemNumbers>(context, system_database, "numbers_mt", "Multithreaded version of `system.numbers`. Numbers order is not guaranteed.", true);
-    attach<StorageSystemZeros>(context, system_database, "zeros", "Produces unlimited number of non-materialized zeros.", false);
-    attach<StorageSystemZeros>(context, system_database, "zeros_mt", "Multithreaded version of system.zeros.", true);
+    attachNoDescription<StorageSystemOne>(context, system_database, "one", "This table contains a single row with a single dummy UInt8 column containing the value 0. Used when the table is not specified explicitly, for example in queries like `SELECT 1`.");
+    attachNoDescription<StorageSystemNumbers>(context, system_database, "numbers", "Generates all natural numbers, starting from 0 (to 2^64 - 1, and then again) in sorted order.", false, "number");
+    attachNoDescription<StorageSystemNumbers>(context, system_database, "numbers_mt", "Multithreaded version of `system.numbers`. Numbers order is not guaranteed.", true, "number");
+    attachNoDescription<StorageSystemNumbers>(context, system_database, "generate_series", "Generates arithmetic progression of natural numbers in sorted order in a given segment with a given step", false, "generate_series");
+    attachNoDescription<StorageSystemNumbers>(context, system_database, "generateSeries", "Generates arithmetic progression of natural numbers in sorted order in a given segment with a given step", false, "generate_series");
+    attachNoDescription<StorageSystemZeros>(context, system_database, "zeros", "Produces unlimited number of non-materialized zeros.", false);
+    attachNoDescription<StorageSystemZeros>(context, system_database, "zeros_mt", "Multithreaded version of system.zeros.", true);
     attach<StorageSystemDatabases>(context, system_database, "databases", "Lists all databases of the current server.");
-    attach<StorageSystemTables>(context, system_database, "tables", "Lists all tables of the current server.");
-    attach<StorageSystemColumns>(context, system_database, "columns", "Lists all columns from all tables of the current server.");
+    attachNoDescription<StorageSystemTables>(context, system_database, "tables", "Lists all tables of the current server.");
+    attachNoDescription<StorageSystemColumns>(context, system_database, "columns", "Lists all columns from all tables of the current server.");
     attach<StorageSystemFunctions>(context, system_database, "functions", "Contains a list of all available ordinary and aggregate functions with their descriptions.");
     attach<StorageSystemEvents>(context, system_database, "events", "Contains profiling events and their current value.");
     attach<StorageSystemSettings>(context, system_database, "settings", "Contains a list of all user-level settings (which can be modified in a scope of query or session), their current and default values along with descriptions.");
@@ -158,43 +163,45 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
     attach<StorageSystemPrivileges>(context, system_database, "privileges", "Contains a list of all available privileges that could be granted to a user or role.");
     attach<StorageSystemErrors>(context, system_database, "errors", "Contains a list of all errors which have ever happened including the error code, last time and message with unsymbolized stacktrace.");
     attach<StorageSystemWarnings>(context, system_database, "warnings", "Contains warnings about server configuration to be displayed by clickhouse-client right after it connects to the server.");
-    attach<StorageSystemDataSkippingIndices>(context, system_database, "data_skipping_indices", "Contains all the information about all the data skipping indices in tables, similar to system.columns.");
+    attachNoDescription<StorageSystemDataSkippingIndices>(context, system_database, "data_skipping_indices", "Contains all the information about all the data skipping indices in tables, similar to system.columns.");
     attach<StorageSystemLicenses>(context, system_database, "licenses", "Contains licenses of third-party libraries that are located in the contrib directory of ClickHouse sources.");
     attach<StorageSystemTimeZones>(context, system_database, "time_zones", "Contains a list of time zones that are supported by the ClickHouse server. This list of timezones might vary depending on the version of ClickHouse.");
     attach<StorageSystemBackups>(context, system_database, "backups", "Contains a list of all BACKUP or RESTORE operations with their current states and other propertis. Note, that table is not persistent and it shows only operations executed after the last server restart.");
     attach<StorageSystemSchemaInferenceCache>(context, system_database, "schema_inference_cache", "Contains information about all cached file schemas.");
     attach<StorageSystemDroppedTables>(context, system_database, "dropped_tables", "Contains a list of tables which were dropped from Atomic databases but not completely removed yet.");
-    attach<StorageSystemDroppedTablesParts>(context, system_database, "dropped_tables_parts", "Contains parts of system.dropped_tables tables ");
+    attachNoDescription<StorageSystemDroppedTablesParts>(context, system_database, "dropped_tables_parts", "Contains parts of system.dropped_tables tables ");
     attach<StorageSystemScheduler>(context, system_database, "scheduler", "Contains information and status for scheduling nodes residing on the local server.");
+    attach<StorageSystemDNSCache>(context, system_database, "dns_cache", "Contains information about cached DNS records.");
 #if defined(__ELF__) && !defined(OS_FREEBSD)
-    attach<StorageSystemSymbols>(context, system_database, "symbols", "Contains information for introspection of ClickHouse binary. This table is only useful for C++ experts and ClickHouse engineers.");
+    attachNoDescription<StorageSystemSymbols>(context, system_database, "symbols", "Contains information for introspection of ClickHouse binary. This table is only useful for C++ experts and ClickHouse engineers.");
 #endif
 #if USE_RDKAFKA
     attach<StorageSystemKafkaConsumers>(context, system_database, "kafka_consumers", "Contains information about Kafka consumers. Applicable for Kafka table engine (native ClickHouse integration).");
 #endif
 #ifdef OS_LINUX
-    attach<StorageSystemStackTrace>(context, system_database, "stack_trace", "Allows to obtain an unsymbolized stacktrace from all the threads of the server process.");
+    attachNoDescription<StorageSystemStackTrace>(context, system_database, "stack_trace", "Allows to obtain an unsymbolized stacktrace from all the threads of the server process.");
 #endif
 #if USE_ROCKSDB
     attach<StorageSystemRocksDB>(context, system_database, "rocksdb", "Contains a list of metrics exposed from embedded RocksDB.");
 #endif
 #if USE_MYSQL
-    attach<StorageSystemMySQLBinlogs>(context, system_database, "mysql_binlogs", "Shows a list of active binlogs for MaterializedMySQL.");
+    attachNoDescription<StorageSystemMySQLBinlogs>(context, system_database, "mysql_binlogs", "Shows a list of active binlogs for MaterializedMySQL.");
 #endif
 
-    attach<StorageSystemParts>(context, system_database, "parts", "Contains a list of currently existing (both active and inactive) parts of all *-MergeTree tables. Each part is represented by a single row.");
-    attach<StorageSystemProjectionParts>(context, system_database, "projection_parts", "Contains a list of currently existing projection parts (a copy of some part containing aggregated data or just sorted in different order) created for all the projections for all tables within a cluster.");
-    attach<StorageSystemDetachedParts>(context, system_database, "detached_parts", "Contains a list of all parts which are being found in /detached directory along with a reason why it was detached. ClickHouse server doesn't use such parts anyhow.");
-    attach<StorageSystemPartsColumns>(context, system_database, "parts_columns", "Contains a list of columns of all currently existing parts of all MergeTree tables. Each column is represented by a single row.");
-    attach<StorageSystemProjectionPartsColumns>(context, system_database, "projection_parts_columns", "Contains a list of columns of all currently existing projection parts of all MergeTree tables. Each column is represented by a single row.");
-    attach<StorageSystemDisks>(context, system_database, "disks", "Contains information about disks defined in the server configuration.");
-    attach<StorageSystemStoragePolicies>(context, system_database, "storage_policies", "Contains information about storage policies and volumes defined in the server configuration.");
+    attach<StorageSystemKeywords>(context, system_database, "keywords", "Contains a list of all keywords used in ClickHouse parser.");
+    attachNoDescription<StorageSystemParts>(context, system_database, "parts", "Contains a list of currently existing (both active and inactive) parts of all *-MergeTree tables. Each part is represented by a single row.");
+    attachNoDescription<StorageSystemProjectionParts>(context, system_database, "projection_parts", "Contains a list of currently existing projection parts (a copy of some part containing aggregated data or just sorted in different order) created for all the projections for all tables within a cluster.");
+    attachNoDescription<StorageSystemDetachedParts>(context, system_database, "detached_parts", "Contains a list of all parts which are being found in /detached directory along with a reason why it was detached. ClickHouse server doesn't use such parts anyhow.");
+    attachNoDescription<StorageSystemPartsColumns>(context, system_database, "parts_columns", "Contains a list of columns of all currently existing parts of all MergeTree tables. Each column is represented by a single row.");
+    attachNoDescription<StorageSystemProjectionPartsColumns>(context, system_database, "projection_parts_columns", "Contains a list of columns of all currently existing projection parts of all MergeTree tables. Each column is represented by a single row.");
+    attachNoDescription<StorageSystemDisks>(context, system_database, "disks", "Contains information about disks defined in the server configuration.");
+    attachNoDescription<StorageSystemStoragePolicies>(context, system_database, "storage_policies", "Contains information about storage policies and volumes defined in the server configuration.");
     attach<StorageSystemProcesses>(context, system_database, "processes", "Contains a list of currently executing processes (queries) with their progress.");
     attach<StorageSystemMetrics>(context, system_database, "metrics", "Contains metrics which can be calculated instantly, or have a current value. For example, the number of simultaneously processed queries or the current replica delay. This table is always up to date.");
     attach<StorageSystemMerges>(context, system_database, "merges", "Contains a list of merges currently executing merges of MergeTree tables and their progress. Each merge operation is represented by a single row.");
     attach<StorageSystemMoves>(context, system_database, "moves", "Contains information about in-progress data part moves of MergeTree tables. Each data part movement is represented by a single row.");
     attach<StorageSystemMutations>(context, system_database, "mutations", "Contains a list of mutations and their progress. Each mutation command is represented by a single row.");
-    attach<StorageSystemReplicas>(context, system_database, "replicas", "Contains information and status of all table replicas on current server. Each replica is represented by a single row.");
+    attachNoDescription<StorageSystemReplicas>(context, system_database, "replicas", "Contains information and status of all table replicas on current server. Each replica is represented by a single row.");
     attach<StorageSystemReplicationQueue>(context, system_database, "replication_queue", "Contains information about tasks from replication queues stored in ClickHouse Keeper, or ZooKeeper, for each table replica.");
     attach<StorageSystemDDLWorkerQueue>(context, system_database, "distributed_ddl_queue", "Contains information about distributed DDL queries (ON CLUSTER clause) that were executed on a cluster.");
     attach<StorageSystemDistributionQueue>(context, system_database, "distribution_queue", "Contains information about local files that are in the queue to be sent to the shards. These local files contain new parts that are created by inserting new data into the Distributed table in asynchronous mode.");
@@ -206,21 +213,22 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
     attach<StorageSystemReplicatedFetches>(context, system_database, "replicated_fetches", "Contains information about currently running background fetches.");
     attach<StorageSystemPartMovesBetweenShards>(context, system_database, "part_moves_between_shards", "Contains information about parts which are currently in a process of moving between shards and their progress.");
     attach<StorageSystemAsynchronousInserts>(context, system_database, "asynchronous_inserts", "Contains information about pending asynchronous inserts in queue in server's memory.");
-    attach<StorageSystemFilesystemCache>(context, system_database, "filesystem_cache", "Contains information about all entries inside filesystem cache for remote objects.");
-    attach<StorageSystemQueryCache>(context, system_database, "query_cache", "Contains information about all entries inside query cache in server's memory.");
-    attach<StorageSystemRemoteDataPaths>(context, system_database, "remote_data_paths", "Contains a mapping from a filename on local filesystem to a blob name inside object storage.");
+    attachNoDescription<StorageSystemFilesystemCache>(context, system_database, "filesystem_cache", "Contains information about all entries inside filesystem cache for remote objects.");
+    attachNoDescription<StorageSystemFilesystemCacheSettings>(context, system_database, "filesystem_cache_settings", "Contains information about all filesystem cache settings");
+    attachNoDescription<StorageSystemQueryCache>(context, system_database, "query_cache", "Contains information about all entries inside query cache in server's memory.");
+    attachNoDescription<StorageSystemRemoteDataPaths>(context, system_database, "remote_data_paths", "Contains a mapping from a filename on local filesystem to a blob name inside object storage.");
     attach<StorageSystemCertificates>(context, system_database, "certificates", "Contains information about available certificates and their sources.");
-    attach<StorageSystemNamedCollections>(context, system_database, "named_collections", "Contains a list of all named collections which were created via SQL query or parsed from configuration file.");
+    attachNoDescription<StorageSystemNamedCollections>(context, system_database, "named_collections", "Contains a list of all named collections which were created via SQL query or parsed from configuration file.");
     attach<StorageSystemAsyncLoader>(context, system_database, "asynchronous_loader", "Contains information and status for recent asynchronous jobs (e.g. for tables loading). The table contains a row for every job.");
     attach<StorageSystemUserProcesses>(context, system_database, "user_processes", "This system table can be used to get overview of memory usage and ProfileEvents of users.");
-    attach<StorageSystemJemallocBins>(context, system_database, "jemalloc_bins", "Contains information about memory allocations done via jemalloc allocator in different size classes (bins) aggregated from all arenas. These statistics might not be absolutely accurate because of thread local caching in jemalloc.");
-    attach<StorageSystemS3Queue>(context, system_database, "s3queue", "Contains in-memory state of S3Queue metadata and currently processed rows per file.");
+    attachNoDescription<StorageSystemJemallocBins>(context, system_database, "jemalloc_bins", "Contains information about memory allocations done via jemalloc allocator in different size classes (bins) aggregated from all arenas. These statistics might not be absolutely accurate because of thread local caching in jemalloc.");
+    attachNoDescription<StorageSystemS3Queue>(context, system_database, "s3queue", "Contains in-memory state of S3Queue metadata and currently processed rows per file.");
     attach<StorageSystemDashboards>(context, system_database, "dashboards", "Contains queries used by /dashboard page accessible though HTTP interface. This table can be useful for monitoring and troubleshooting. The table contains a row for every chart in a dashboard.");
     attach<StorageSystemViewRefreshes>(context, system_database, "view_refreshes", "Lists all Refreshable Materialized Views of current server.");
 
     if (has_zookeeper)
     {
-        attach<StorageSystemZooKeeper>(context, system_database, "zookeeper", "Exposes data from the [Zoo]Keeper cluster defined in the config. Allow to get the list of children for a particular node or read the value written inside it.");
+        attachNoDescription<StorageSystemZooKeeper>(context, system_database, "zookeeper", "Exposes data from the [Zoo]Keeper cluster defined in the config. Allow to get the list of children for a particular node or read the value written inside it.");
         attach<StorageSystemZooKeeperConnection>(context, system_database, "zookeeper_connection", "Shows the information about current connections to [Zoo]Keeper (including auxiliary [ZooKeepers)");
     }
 
@@ -230,7 +238,7 @@ void attachSystemTablesServer(ContextPtr context, IDatabase & system_database, b
 
 void attachSystemTablesAsync(ContextPtr context, IDatabase & system_database, AsynchronousMetrics & async_metrics)
 {
-    attach<StorageSystemAsynchronousMetrics>(context, system_database, "asynchronous_metrics", "Contains metrics that are calculated periodically in the background. For example, the amount of RAM in use.", async_metrics);
+    attachNoDescription<StorageSystemAsynchronousMetrics>(context, system_database, "asynchronous_metrics", "Contains metrics that are calculated periodically in the background. For example, the amount of RAM in use.", async_metrics);
 }
 
 }
diff --git a/src/Storages/System/attachSystemTablesImpl.h b/src/Storages/System/attachSystemTablesImpl.h
index 0b0a22baa13..d9ab164f2b3 100644
--- a/src/Storages/System/attachSystemTablesImpl.h
+++ b/src/Storages/System/attachSystemTablesImpl.h
@@ -7,33 +7,58 @@
 namespace DB
 {
 
-template<typename StorageT, typename... StorageArgs>
-void attach(ContextPtr context, IDatabase & system_database, const String & table_name, const String & comment, StorageArgs && ... args)
+template <int Length>
+using StringLiteral = const char(&)[Length];
+
+template<typename StorageT, int CommentSize, bool with_description, typename... StorageArgs>
+void attachImpl(ContextPtr context, IDatabase & system_database, const String & table_name, StringLiteral<CommentSize> comment, StorageArgs && ... args)
 {
+    static_assert(CommentSize > 15, "The comment for a system table is too short or empty");
     assert(system_database.getDatabaseName() == DatabaseCatalog::SYSTEM_DATABASE);
+
+    auto table_id = StorageID::createEmpty();
     if (system_database.getUUID() == UUIDHelpers::Nil)
     {
         /// Attach to Ordinary database.
-        auto table_id = StorageID(DatabaseCatalog::SYSTEM_DATABASE, table_name);
-        system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, std::forward<StorageArgs>(args)...));
+        table_id = StorageID(DatabaseCatalog::SYSTEM_DATABASE, table_name);
+        if constexpr (with_description)
+            system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, StorageT::getColumnsDescription(), std::forward<StorageArgs>(args)...));
+        else
+            system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, std::forward<StorageArgs>(args)...));
     }
     else
     {
         /// Attach to Atomic database.
         /// NOTE: UUIDs are not persistent, but it's ok since no data are stored on disk for these storages
         /// and path is actually not used
-        auto table_id = StorageID(DatabaseCatalog::SYSTEM_DATABASE, table_name, UUIDHelpers::generateV4());
+        table_id = StorageID(DatabaseCatalog::SYSTEM_DATABASE, table_name, UUIDHelpers::generateV4());
         DatabaseCatalog::instance().addUUIDMapping(table_id.uuid);
         String path = "store/" + DatabaseCatalog::getPathForUUID(table_id.uuid);
-        system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, std::forward<StorageArgs>(args)...), path);
-
-        /// Set the comment
-        auto table = DatabaseCatalog::instance().getTable(table_id, context);
-        assert(table);
-        auto metadata = table->getInMemoryMetadata();
-        metadata.comment = comment;
-        table->setInMemoryMetadata(metadata);
+        if constexpr (with_description)
+            system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, StorageT::getColumnsDescription(), std::forward<StorageArgs>(args)...), path);
+        else
+            system_database.attachTable(context, table_name, std::make_shared<StorageT>(table_id, std::forward<StorageArgs>(args)...), path);
     }
+
+    /// Set the comment
+    auto table = DatabaseCatalog::instance().getTable(table_id, context);
+    assert(table);
+    auto metadata = table->getInMemoryMetadata();
+    metadata.comment = comment;
+    table->setInMemoryMetadata(metadata);
+}
+
+
+template<typename StorageT, int CommentSize, typename... StorageArgs>
+void attach(ContextPtr context, IDatabase & system_database, const String & table_name, StringLiteral<CommentSize> comment, StorageArgs && ... args)
+{
+    attachImpl<StorageT, CommentSize, true>(context, system_database, table_name, comment, std::forward<StorageArgs>(args)...);
+}
+
+template<typename StorageT, int CommentSize, typename... StorageArgs>
+void attachNoDescription(ContextPtr context, IDatabase & system_database, const String & table_name, StringLiteral<CommentSize> comment, StorageArgs && ... args)
+{
+    attachImpl<StorageT, CommentSize, false>(context, system_database, table_name, comment, std::forward<StorageArgs>(args)...);
 }
 
 }
diff --git a/src/Storages/System/getQueriedColumnsMaskAndHeader.cpp b/src/Storages/System/getQueriedColumnsMaskAndHeader.cpp
index c29ccb590ed..b93fe7b8034 100644
--- a/src/Storages/System/getQueriedColumnsMaskAndHeader.cpp
+++ b/src/Storages/System/getQueriedColumnsMaskAndHeader.cpp
@@ -11,10 +11,11 @@ std::pair<std::vector<UInt8>, Block> getQueriedColumnsMaskAndHeader(const Block
     NameSet names_set(column_names.begin(), column_names.end());
     for (size_t i = 0; i < columns_mask.size(); ++i)
     {
-        if (names_set.contains(sample_block.getByPosition(i).name))
+        const auto & column_with_type_and_name = sample_block.getByPosition(i);
+        if (names_set.contains(column_with_type_and_name.name))
         {
             columns_mask[i] = 1;
-            header.insert(sample_block.getByPosition(i));
+            header.insert(column_with_type_and_name);
         }
     }
 
diff --git a/src/Storages/TTLDescription.cpp b/src/Storages/TTLDescription.cpp
index b3f5d181d5d..6e7ea32ee59 100644
--- a/src/Storages/TTLDescription.cpp
+++ b/src/Storages/TTLDescription.cpp
@@ -18,6 +18,7 @@
 #include <Interpreters/FunctionNameNormalizer.h>
 #include <Parsers/ExpressionListParsers.h>
 #include <Parsers/parseQuery.h>
+#include <Parsers/queryToString.h>
 
 
 namespace DB
@@ -110,7 +111,10 @@ using FindAggregateFunctionVisitor = InDepthNodeVisitor<FindAggregateFunctionFin
 TTLDescription::TTLDescription(const TTLDescription & other)
     : mode(other.mode)
     , expression_ast(other.expression_ast ? other.expression_ast->clone() : nullptr)
+    , expression_columns(other.expression_columns)
     , result_column(other.result_column)
+    , where_expression_ast(other.where_expression_ast ? other.where_expression_ast->clone() : nullptr)
+    , where_expression_columns(other.where_expression_columns)
     , where_result_column(other.where_result_column)
     , group_by_keys(other.group_by_keys)
     , set_parts(other.set_parts)
@@ -120,11 +124,6 @@ TTLDescription::TTLDescription(const TTLDescription & other)
     , if_exists(other.if_exists)
     , recompression_codec(other.recompression_codec)
 {
-    if (other.expression)
-        expression = other.expression->clone();
-
-    if (other.where_expression)
-        where_expression = other.where_expression->clone();
 }
 
 TTLDescription & TTLDescription::operator=(const TTLDescription & other)
@@ -138,17 +137,15 @@ TTLDescription & TTLDescription::operator=(const TTLDescription & other)
     else
         expression_ast.reset();
 
-    if (other.expression)
-        expression = other.expression->clone();
-    else
-        expression.reset();
-
+    expression_columns = other.expression_columns;
     result_column = other.result_column;
-    if (other.where_expression)
-        where_expression = other.where_expression->clone();
-    else
-        where_expression.reset();
 
+    if (other.where_expression_ast)
+        where_expression_ast = other.where_expression_ast->clone();
+    else
+        where_expression_ast.reset();
+
+    where_expression_columns = other.where_expression_columns;
     where_result_column = other.where_result_column;
     group_by_keys = other.group_by_keys;
     set_parts = other.set_parts;
@@ -165,6 +162,44 @@ TTLDescription & TTLDescription::operator=(const TTLDescription & other)
     return * this;
 }
 
+static ExpressionAndSets buildExpressionAndSets(ASTPtr & ast, const NamesAndTypesList & columns, const ContextPtr & context)
+{
+    ExpressionAndSets result;
+    auto ttl_string = queryToString(ast);
+    auto syntax_analyzer_result = TreeRewriter(context).analyze(ast, columns);
+    ExpressionAnalyzer analyzer(ast, syntax_analyzer_result, context);
+    auto dag = analyzer.getActionsDAG(false);
+
+    const auto * col = &dag->findInOutputs(ast->getColumnName());
+    if (col->result_name != ttl_string)
+        col = &dag->addAlias(*col, ttl_string);
+
+    dag->getOutputs() = {col};
+    dag->removeUnusedActions();
+
+    result.expression = std::make_shared<ExpressionActions>(dag, ExpressionActionsSettings::fromContext(context));
+    result.sets = analyzer.getPreparedSets();
+
+    return result;
+}
+
+ExpressionAndSets TTLDescription::buildExpression(const ContextPtr & context) const
+{
+    auto ast = expression_ast->clone();
+    return buildExpressionAndSets(ast, expression_columns, context);
+}
+
+ExpressionAndSets TTLDescription::buildWhereExpression(const ContextPtr & context) const
+{
+    if (where_expression_ast)
+    {
+        auto ast = where_expression_ast->clone();
+        return buildExpressionAndSets(ast, where_expression_columns, context);
+    }
+
+    return {};
+}
+
 TTLDescription TTLDescription::getTTLFromAST(
     const ASTPtr & definition_ast,
     const ColumnsDescription & columns,
@@ -182,9 +217,12 @@ TTLDescription TTLDescription::getTTLFromAST(
         result.expression_ast = definition_ast->clone();
 
     auto ttl_ast = result.expression_ast->clone();
-    auto syntax_analyzer_result = TreeRewriter(context).analyze(ttl_ast, columns.getAllPhysical());
-    result.expression = ExpressionAnalyzer(ttl_ast, syntax_analyzer_result, context).getActions(false);
-    result.result_column = ttl_ast->getColumnName();
+    auto expression = buildExpressionAndSets(ttl_ast, columns.getAllPhysical(), context).expression;
+    result.expression_columns = expression->getRequiredColumnsWithTypes();
+
+    result.result_column = expression->getSampleBlock().safeGetByPosition(0).name;
+
+    ExpressionActionsPtr where_expression;
 
     if (ttl_element == nullptr) /// columns TTL
     {
@@ -202,9 +240,10 @@ TTLDescription TTLDescription::getTTLFromAST(
         {
             if (ASTPtr where_expr_ast = ttl_element->where())
             {
-                auto where_syntax_result = TreeRewriter(context).analyze(where_expr_ast, columns.getAllPhysical());
-                result.where_expression = ExpressionAnalyzer(where_expr_ast, where_syntax_result, context).getActions(false);
-                result.where_result_column = where_expr_ast->getColumnName();
+                result.where_expression_ast = where_expr_ast->clone();
+                where_expression = buildExpressionAndSets(where_expr_ast, columns.getAllPhysical(), context).expression;
+                result.where_expression_columns = where_expression->getRequiredColumnsWithTypes();
+                result.where_result_column = where_expression->getSampleBlock().safeGetByPosition(0).name;
             }
         }
         else if (ttl_element->mode == TTLMode::GROUP_BY)
@@ -229,17 +268,17 @@ TTLDescription TTLDescription::getTTLFromAST(
             for (const auto & ast : ttl_element->group_by_assignments)
             {
                 const auto assignment = ast->as<const ASTAssignment &>();
-                auto expression = assignment.expression();
+                auto ass_expression = assignment.expression();
 
                 FindAggregateFunctionVisitor::Data data{false};
-                FindAggregateFunctionVisitor(data).visit(expression);
+                FindAggregateFunctionVisitor(data).visit(ass_expression);
 
                 if (!data.has_aggregate_function)
                     throw Exception(ErrorCodes::BAD_TTL_EXPRESSION,
                     "Invalid expression for assignment of column {}. Should contain an aggregate function", assignment.column_name);
 
-                expression = addTypeConversionToAST(std::move(expression), columns.getPhysical(assignment.column_name).type->getName());
-                aggregations.emplace_back(assignment.column_name, std::move(expression));
+                ass_expression = addTypeConversionToAST(std::move(ass_expression), columns.getPhysical(assignment.column_name).type->getName());
+                aggregations.emplace_back(assignment.column_name, std::move(ass_expression));
                 aggregation_columns_set.insert(assignment.column_name);
             }
 
@@ -297,7 +336,7 @@ TTLDescription TTLDescription::getTTLFromAST(
         }
     }
 
-    checkTTLExpression(result.expression, result.result_column, is_attach || context->getSettingsRef().allow_suspicious_ttl_expressions);
+    checkTTLExpression(expression, result.result_column, is_attach || context->getSettingsRef().allow_suspicious_ttl_expressions);
     return result;
 }
 
@@ -350,7 +389,7 @@ TTLTableDescription TTLTableDescription::getTTLForTableFromAST(
         auto ttl = TTLDescription::getTTLFromAST(ttl_element_ptr, columns, context, primary_key, is_attach);
         if (ttl.mode == TTLMode::DELETE)
         {
-            if (!ttl.where_expression)
+            if (!ttl.where_expression_ast)
             {
                 if (have_unconditional_delete_ttl)
                     throw Exception(ErrorCodes::BAD_TTL_EXPRESSION, "More than one DELETE TTL expression without WHERE expression is not allowed");
@@ -386,8 +425,8 @@ TTLTableDescription TTLTableDescription::parse(const String & str, const Columns
         return result;
 
     ParserTTLExpressionList parser;
-    ASTPtr ast = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH);
-    FunctionNameNormalizer().visit(ast.get());
+    ASTPtr ast = parseQuery(parser, str, 0, DBMS_DEFAULT_MAX_PARSER_DEPTH, DBMS_DEFAULT_MAX_PARSER_BACKTRACKS);
+    FunctionNameNormalizer::visit(ast.get());
 
     return getTTLForTableFromAST(ast, columns, context, primary_key, context->getSettingsRef().allow_suspicious_ttl_expressions);
 }
diff --git a/src/Storages/TTLDescription.h b/src/Storages/TTLDescription.h
index aab5b43e53e..4ea73ac291f 100644
--- a/src/Storages/TTLDescription.h
+++ b/src/Storages/TTLDescription.h
@@ -35,6 +35,15 @@ struct TTLAggregateDescription
 
 using TTLAggregateDescriptions = std::vector<TTLAggregateDescription>;
 
+class PreparedSets;
+using PreparedSetsPtr = std::shared_ptr<PreparedSets>;
+
+struct ExpressionAndSets
+{
+    ExpressionActionsPtr expression;
+    PreparedSetsPtr sets;
+};
+
 /// Common struct for TTL record in storage
 struct TTLDescription
 {
@@ -44,9 +53,10 @@ struct TTLDescription
     /// TTL d + INTERVAL 1 DAY
     ///    ^~~~~~~~~~~~~~~~~~~^
     ASTPtr expression_ast;
+    NamesAndTypesList expression_columns;
 
     /// Expression actions evaluated from AST
-    ExpressionActionsPtr expression;
+    ExpressionAndSets buildExpression(const ContextPtr & context) const;
 
     /// Result column of this TTL expression
     String result_column;
@@ -54,7 +64,9 @@ struct TTLDescription
     /// WHERE part in TTL expression
     /// TTL ... WHERE x % 10 == 0 and y > 5
     ///              ^~~~~~~~~~~~~~~~~~~~~~^
-    ExpressionActionsPtr where_expression;
+    ASTPtr where_expression_ast;
+    NamesAndTypesList where_expression_columns;
+    ExpressionAndSets buildWhereExpression(const ContextPtr & context) const;
 
     /// Name of result column from WHERE expression
     String where_result_column;
diff --git a/src/Storages/UVLoop.h b/src/Storages/UVLoop.h
index 4945e1b56fa..dd1d64973d1 100644
--- a/src/Storages/UVLoop.h
+++ b/src/Storages/UVLoop.h
@@ -63,7 +63,7 @@ public:
 
 private:
     std::unique_ptr<uv_loop_t> loop_ptr;
-    Poco::Logger * log = &Poco::Logger::get("UVLoop");
+    LoggerPtr log = getLogger("UVLoop");
 
     static void onUVWalkClosingCallback(uv_handle_t * handle, void *)
     {
diff --git a/src/Storages/VirtualColumnUtils.cpp b/src/Storages/VirtualColumnUtils.cpp
index e845e03d122..e3cbff5f01b 100644
--- a/src/Storages/VirtualColumnUtils.cpp
+++ b/src/Storages/VirtualColumnUtils.cpp
@@ -1,5 +1,6 @@
 #include <algorithm>
 #include <memory>
+#include <stack>
 #include <Core/NamesAndTypes.h>
 #include <Core/TypeId.h>
 
@@ -49,197 +50,12 @@
 namespace DB
 {
 
-namespace ErrorCodes
-{
-    extern const int LOGICAL_ERROR;
-}
-
-namespace
-{
-
-/// Verifying that the function depends only on the specified columns
-bool isValidFunction(const ASTPtr & expression, const std::function<bool(const ASTPtr &)> & is_constant)
-{
-    const auto * function = expression->as<ASTFunction>();
-    if (function && functionIsInOrGlobalInOperator(function->name))
-    {
-        // Second argument of IN can be a scalar subquery
-        return isValidFunction(function->arguments->children[0], is_constant);
-    }
-    else
-        return is_constant(expression);
-}
-
-/// Extract all subfunctions of the main conjunction, but depending only on the specified columns
-bool extractFunctions(const ASTPtr & expression, const std::function<bool(const ASTPtr &)> & is_constant, ASTs & result)
-{
-    const auto * function = expression->as<ASTFunction>();
-
-    if (function)
-    {
-        if (function->name == "and" || function->name == "indexHint")
-        {
-            bool ret = true;
-            for (const auto & child : function->arguments->children)
-                ret &= extractFunctions(child, is_constant, result);
-            return ret;
-        }
-        else if (function->name == "or")
-        {
-            bool ret = false;
-            ASTs or_args;
-            for (const auto & child : function->arguments->children)
-                ret |= extractFunctions(child, is_constant, or_args);
-
-            if (!or_args.empty())
-            {
-                /// In case of there are less number of arguments for which
-                /// is_constant() == true, we need to add always-true
-                /// implicitly to avoid breaking AND invariant.
-                ///
-                /// Consider the following:
-                ///
-                ///     ((value = 10) OR (_table = 'v2')) AND ((_table = 'v1') OR (value = 20))
-                ///
-                /// Without implicit always-true:
-                ///
-                ///     (_table = 'v2') AND (_table = 'v1')
-                ///
-                /// With:
-                ///
-                ///     (_table = 'v2' OR 1) AND (_table = 'v1' OR 1) -> (_table = 'v2') OR (_table = 'v1')
-                ///
-                if (or_args.size() != function->arguments->children.size())
-                    or_args.push_back(std::make_shared<ASTLiteral>(Field(1)));
-                result.push_back(makeASTForLogicalOr(std::move(or_args)));
-            }
-            return ret;
-        }
-    }
-
-    if (isValidFunction(expression, is_constant))
-    {
-        result.push_back(expression->clone());
-        return true;
-    }
-    else
-        return false;
-}
-
-/// Construct a conjunction from given functions
-ASTPtr buildWhereExpression(ASTs && functions)
-{
-    if (functions.empty())
-        return nullptr;
-    if (functions.size() == 1)
-        return functions[0];
-    return makeASTForLogicalAnd(std::move(functions));
-}
-
-}
-
 namespace VirtualColumnUtils
 {
 
-void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & value, const String & func)
+void buildSetsForDAG(const ActionsDAGPtr & dag, const ContextPtr & context)
 {
-    auto & select = ast->as<ASTSelectQuery &>();
-    if (!select.with())
-        select.setExpression(ASTSelectQuery::Expression::WITH, std::make_shared<ASTExpressionList>());
-
-    if (func.empty())
-    {
-        auto literal = std::make_shared<ASTLiteral>(value);
-        literal->alias = column_name;
-        literal->prefer_alias_to_column_name = true;
-        select.with()->children.push_back(literal);
-    }
-    else
-    {
-        auto literal = std::make_shared<ASTLiteral>(value);
-        literal->prefer_alias_to_column_name = true;
-
-        auto function = makeASTFunction(func, literal);
-        function->alias = column_name;
-        function->prefer_alias_to_column_name = true;
-        select.with()->children.push_back(function);
-    }
-}
-
-bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast)
-{
-    if (block.rows() == 0)
-        throw Exception(ErrorCodes::LOGICAL_ERROR, "Cannot prepare filter with empty block");
-
-    /// Take the first row of the input block to build a constant block
-    auto columns = block.getColumns();
-    Columns const_columns(columns.size());
-    for (size_t i = 0; i < columns.size(); ++i)
-    {
-        if (isColumnConst(*columns[i]))
-            const_columns[i] = columns[i]->cloneResized(1);
-        else
-            const_columns[i] = ColumnConst::create(columns[i]->cloneResized(1), 1);
-    }
-
-    block.setColumns(const_columns);
-
-    bool unmodified = true;
-    const auto & select = query->as<ASTSelectQuery &>();
-    if (!select.where() && !select.prewhere())
-        return unmodified;
-
-    // Provide input columns as constant columns to check if an expression is
-    // constant and depends on the columns from provided block (the last is
-    // required to allow skipping some conditions for handling OR).
-    std::function<bool(const ASTPtr &)> is_constant = [&block, &context](const ASTPtr & expr)
-    {
-        auto actions = std::make_shared<ActionsDAG>(block.getColumnsWithTypeAndName());
-        PreparedSetsPtr prepared_sets = std::make_shared<PreparedSets>();
-        const NamesAndTypesList source_columns;
-        const NamesAndTypesList aggregation_keys;
-        const ColumnNumbersList grouping_set_keys;
-
-        ActionsVisitor::Data visitor_data(
-            context, SizeLimits{}, 1, source_columns, std::move(actions), prepared_sets, true, true, true,
-            { aggregation_keys, grouping_set_keys, GroupByKind::NONE });
-
-        ActionsVisitor(visitor_data).visit(expr);
-        actions = visitor_data.getActions();
-        auto expr_column_name = expr->getColumnName();
-
-        const auto * expr_const_node = actions->tryFindInOutputs(expr_column_name);
-        if (!expr_const_node)
-            return false;
-        auto filter_actions = ActionsDAG::buildFilterActionsDAG({expr_const_node}, {}, context);
-        const auto & nodes = filter_actions->getNodes();
-        bool has_dependent_columns = std::any_of(nodes.begin(), nodes.end(), [&](const auto & node)
-        {
-            return block.has(node.result_name);
-        });
-        if (!has_dependent_columns)
-            return false;
-
-        auto expression_actions = std::make_shared<ExpressionActions>(actions);
-        auto block_with_constants = block;
-        expression_actions->execute(block_with_constants);
-        return block_with_constants.has(expr_column_name) && isColumnConst(*block_with_constants.getByName(expr_column_name).column);
-    };
-
-    /// Create an expression that evaluates the expressions in WHERE and PREWHERE, depending only on the existing columns.
-    ASTs functions;
-    if (select.where())
-        unmodified &= extractFunctions(select.where(), is_constant, functions);
-    if (select.prewhere())
-        unmodified &= extractFunctions(select.prewhere(), is_constant, functions);
-
-    expression_ast = buildWhereExpression(std::move(functions));
-    return unmodified;
-}
-
-static void makeSets(const ExpressionActionsPtr & actions, const ContextPtr & context)
-{
-    for (const auto & node : actions->getNodes())
+    for (const auto & node : dag->getNodes())
     {
         if (node.type == ActionsDAG::ActionType::COLUMN)
         {
@@ -262,10 +78,10 @@ static void makeSets(const ExpressionActionsPtr & actions, const ContextPtr & co
 
 void filterBlockWithDAG(ActionsDAGPtr dag, Block & block, ContextPtr context)
 {
+    buildSetsForDAG(dag, context);
     auto actions = std::make_shared<ExpressionActions>(dag);
-    makeSets(actions, context);
     Block block_with_filter = block;
-    actions->execute(block_with_filter);
+    actions->execute(block_with_filter, /*dry_run=*/ false, /*allow_duplicates_in_input=*/ true);
 
     /// Filter the block.
     String filter_column_name = dag->getOutputs().at(0)->result_name;
@@ -293,72 +109,28 @@ void filterBlockWithDAG(ActionsDAGPtr dag, Block & block, ContextPtr context)
     }
 }
 
-void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast)
+NameSet getVirtualNamesForFileLikeStorage()
 {
-    if (block.rows() == 0)
-        return;
-
-    if (!expression_ast)
-        prepareFilterBlockWithQuery(query, context, block, expression_ast);
-
-    if (!expression_ast)
-        return;
-
-    /// Let's analyze and calculate the prepared expression.
-    auto syntax_result = TreeRewriter(context).analyze(expression_ast, block.getNamesAndTypesList());
-    ExpressionAnalyzer analyzer(expression_ast, syntax_result, context);
-    ExpressionActionsPtr actions = analyzer.getActions(false /* add alises */, true /* project result */, CompileExpressions::yes);
-
-    makeSets(actions, context);
-
-    Block block_with_filter = block;
-    actions->execute(block_with_filter);
-
-    /// Filter the block.
-    String filter_column_name = expression_ast->getColumnName();
-    ColumnPtr filter_column = block_with_filter.getByName(filter_column_name).column->convertToFullIfNeeded();
-    if (filter_column->getDataType() != TypeIndex::UInt8)
-        return;
-
-    ConstantFilterDescription constant_filter(*filter_column);
-
-    if (constant_filter.always_true)
-    {
-        return;
-    }
-
-    if (constant_filter.always_false)
-    {
-        block = block.cloneEmpty();
-        return;
-    }
-
-    FilterDescription filter(*filter_column);
-
-    for (size_t i = 0; i < block.columns(); ++i)
-    {
-        ColumnPtr & column = block.safeGetByPosition(i).column;
-        column = column->filter(*filter.data, -1);
-    }
+    return {"_path", "_file", "_size"};
 }
 
-NamesAndTypesList getPathFileAndSizeVirtualsForStorage(NamesAndTypesList storage_columns)
+VirtualColumnsDescription getVirtualsForFileLikeStorage(const ColumnsDescription & storage_columns)
 {
-    auto default_virtuals = NamesAndTypesList{
-        {"_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>())},
-        {"_size", makeNullable(std::make_shared<DataTypeUInt64>())}};
+    VirtualColumnsDescription desc;
 
-    default_virtuals.sort();
-    storage_columns.sort();
+    auto add_virtual = [&](const auto & name, const auto & type)
+    {
+        if (storage_columns.has(name))
+            return;
 
-    NamesAndTypesList result_virtuals;
-    std::set_difference(
-        default_virtuals.begin(), default_virtuals.end(), storage_columns.begin(), storage_columns.end(),
-        std::back_inserter(result_virtuals),
-        [](const NameAndTypePair & lhs, const NameAndTypePair & rhs){ return lhs.name < rhs.name; });
+        desc.addEphemeral(name, type, "");
+    };
 
-    return result_virtuals;
+    add_virtual("_path", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()));
+    add_virtual("_file", std::make_shared<DataTypeLowCardinality>(std::make_shared<DataTypeString>()));
+    add_virtual("_size", makeNullable(std::make_shared<DataTypeUInt64>()));
+
+    return desc;
 }
 
 static void addPathAndFileToVirtualColumns(Block & block, const String & path, size_t idx)
@@ -466,6 +238,23 @@ static bool canEvaluateSubtree(const ActionsDAG::Node * node, const Block & allo
     return true;
 }
 
+bool isDeterministicInScopeOfQuery(const ActionsDAG::Node * node)
+{
+    for (const auto * child : node->children)
+    {
+        if (!isDeterministicInScopeOfQuery(child))
+            return false;
+    }
+
+    if (node->type != ActionsDAG::ActionType::FUNCTION)
+        return true;
+
+    if (!node->function_base->isDeterministicInScopeOfQuery())
+        return false;
+
+    return true;
+}
+
 static const ActionsDAG::Node * splitFilterNodeForAllowedInputs(
     const ActionsDAG::Node * node,
     const Block * allowed_inputs,
@@ -541,6 +330,10 @@ static const ActionsDAG::Node * splitFilterNodeForAllowedInputs(
                 }
             }
         }
+        else if (!isDeterministicInScopeOfQuery(node))
+        {
+            return nullptr;
+        }
     }
 
     if (allowed_inputs && !canEvaluateSubtree(node, *allowed_inputs))
diff --git a/src/Storages/VirtualColumnUtils.h b/src/Storages/VirtualColumnUtils.h
index 7a9b2605339..62f2e4855b5 100644
--- a/src/Storages/VirtualColumnUtils.h
+++ b/src/Storages/VirtualColumnUtils.h
@@ -4,6 +4,7 @@
 #include <Interpreters/Context_fwd.h>
 #include <Parsers/IAST_fwd.h>
 #include <Storages/SelectQueryInfo.h>
+#include <Storages/VirtualColumnsDescription.h>
 
 #include <unordered_set>
 
@@ -17,23 +18,6 @@ class NamesAndTypesList;
 namespace VirtualColumnUtils
 {
 
-/// Adds to the select query section `WITH value AS column_name`, and uses func
-/// to wrap the value (if any)
-///
-/// For example:
-/// - `WITH 9000 as _port`.
-/// - `WITH toUInt16(9000) as _port`.
-void rewriteEntityInAst(ASTPtr ast, const String & column_name, const Field & value, const String & func = "");
-
-/// Prepare `expression_ast` to filter block. Returns true if `expression_ast` is not trimmed, that is,
-/// `block` provides all needed columns for `expression_ast`, else return false.
-bool prepareFilterBlockWithQuery(const ASTPtr & query, ContextPtr context, Block block, ASTPtr & expression_ast);
-
-/// Leave in the block only the rows that fit under the WHERE clause and the PREWHERE clause of the query.
-/// Only elements of the outer conjunction are considered, depending only on the columns present in the block.
-/// If `expression_ast` is passed, use it to filter block.
-void filterBlockWithQuery(const ASTPtr & query, Block & block, ContextPtr context, ASTPtr expression_ast = {});
-
 /// Similar to filterBlockWithQuery, but uses ActionsDAG as a predicate.
 /// Basically it is filterBlockWithDAG(splitFilterDagForAllowedInputs).
 void filterBlockWithPredicate(const ActionsDAG::Node * predicate, Block & block, ContextPtr context);
@@ -41,6 +25,12 @@ void filterBlockWithPredicate(const ActionsDAG::Node * predicate, Block & block,
 /// Just filters block. Block should contain all the required columns.
 void filterBlockWithDAG(ActionsDAGPtr dag, Block & block, ContextPtr context);
 
+/// Builds sets used by ActionsDAG inplace.
+void buildSetsForDAG(const ActionsDAGPtr & dag, const ContextPtr & context);
+
+/// Recursively checks if all functions used in DAG are deterministic in scope of query.
+bool isDeterministicInScopeOfQuery(const ActionsDAG::Node * node);
+
 /// Extract a part of predicate that can be evaluated using only columns from input_names.
 ActionsDAGPtr splitFilterDagForAllowedInputs(const ActionsDAG::Node * predicate, const Block * allowed_inputs);
 
@@ -56,7 +46,8 @@ auto extractSingleValueFromBlock(const Block & block, const String & name)
     return res;
 }
 
-NamesAndTypesList getPathFileAndSizeVirtualsForStorage(NamesAndTypesList storage_columns);
+NameSet getVirtualNamesForFileLikeStorage();
+VirtualColumnsDescription getVirtualsForFileLikeStorage(const ColumnsDescription & storage_columns);
 
 ActionsDAGPtr createPathAndFileFilterDAG(const ActionsDAG::Node * predicate, const NamesAndTypesList & virtual_columns);
 
diff --git a/src/Storages/VirtualColumnsDescription.cpp b/src/Storages/VirtualColumnsDescription.cpp
new file mode 100644
index 00000000000..64097224ed9
--- /dev/null
+++ b/src/Storages/VirtualColumnsDescription.cpp
@@ -0,0 +1,94 @@
+#include <Storages/VirtualColumnsDescription.h>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int DUPLICATE_COLUMN;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
+}
+
+VirtualColumnDescription::VirtualColumnDescription(
+    String name_, DataTypePtr type_, ASTPtr codec_, String comment_, VirtualsKind kind_)
+    : ColumnDescription(std::move(name_), std::move(type_), std::move(codec_), std::move(comment_))
+    , kind(kind_)
+{
+}
+
+void VirtualColumnsDescription::add(VirtualColumnDescription desc)
+{
+    if (container.get<1>().contains(desc.name))
+        throw Exception(ErrorCodes::DUPLICATE_COLUMN, "Virtual column {} already exists", desc.name);
+
+    container.get<0>().push_back(std::move(desc));
+}
+
+void VirtualColumnsDescription::addEphemeral(String name, DataTypePtr type, String comment)
+{
+    add({std::move(name), std::move(type), nullptr, std::move(comment), VirtualsKind::Ephemeral});
+}
+
+void VirtualColumnsDescription::addPersistent(String name, DataTypePtr type, ASTPtr codec, String comment)
+{
+    add({std::move(name), std::move(type), std::move(codec), std::move(comment), VirtualsKind::Persistent});
+}
+
+std::optional<NameAndTypePair> VirtualColumnsDescription::tryGet(const String & name, VirtualsKind kind) const
+{
+    auto it = container.get<1>().find(name);
+    if (it != container.get<1>().end() && (static_cast<UInt8>(it->kind) & static_cast<UInt8>(kind)))
+        return NameAndTypePair{it->name, it->type};
+    return {};
+}
+
+NameAndTypePair VirtualColumnsDescription::get(const String & name, VirtualsKind kind) const
+{
+    auto column = tryGet(name, kind);
+    if (!column)
+        throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no virtual column {}", name);
+    return *column;
+}
+
+const VirtualColumnDescription * VirtualColumnsDescription::tryGetDescription(const String & name, VirtualsKind kind) const
+{
+    auto it = container.get<1>().find(name);
+    if (it != container.get<1>().end() && (static_cast<UInt8>(it->kind) & static_cast<UInt8>(kind)))
+        return &(*it);
+    return nullptr;
+}
+
+const VirtualColumnDescription & VirtualColumnsDescription::getDescription(const String & name, VirtualsKind kind) const
+{
+    const auto * column = tryGetDescription(name, kind);
+    if (!column)
+        throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "There is no virtual column {}", name);
+    return *column;
+}
+
+Block VirtualColumnsDescription::getSampleBlock() const
+{
+    Block result;
+    for (const auto & desc : container)
+        result.insert({desc.type->createColumn(), desc.type, desc.name});
+    return result;
+}
+
+NamesAndTypesList VirtualColumnsDescription::getNamesAndTypesList() const
+{
+    NamesAndTypesList result;
+    for (const auto & desc : container)
+        result.emplace_back(desc.name, desc.type);
+    return result;
+}
+
+NamesAndTypesList VirtualColumnsDescription::getNamesAndTypesList(VirtualsKind kind) const
+{
+    NamesAndTypesList result;
+    for (const auto & column : container)
+        if (static_cast<UInt8>(column.kind) & static_cast<UInt8>(kind))
+            result.emplace_back(column.name, column.type);
+    return result;
+}
+
+}
diff --git a/src/Storages/VirtualColumnsDescription.h b/src/Storages/VirtualColumnsDescription.h
new file mode 100644
index 00000000000..e11ba706718
--- /dev/null
+++ b/src/Storages/VirtualColumnsDescription.h
@@ -0,0 +1,71 @@
+#pragma once
+#include <Storages/ColumnsDescription.h>
+#include <Common/MultiVersion.h>
+
+namespace DB
+{
+
+struct VirtualColumnDescription : public ColumnDescription
+{
+    using Self = VirtualColumnDescription;
+    VirtualsKind kind;
+
+    VirtualColumnDescription() = default;
+    VirtualColumnDescription(String name_, DataTypePtr type_, ASTPtr codec_, String comment_, VirtualsKind kind_);
+
+    bool isEphemeral() const { return kind == VirtualsKind::Ephemeral; }
+    bool isPersistent() const { return kind == VirtualsKind::Persistent; }
+
+    /// This method is needed for boost::multi_index because field
+    /// of base class cannot be referenced in boost::multi_index::member.
+    const String & getName() const { return name; }
+};
+
+class VirtualColumnsDescription
+{
+public:
+    using Container = boost::multi_index_container<
+        VirtualColumnDescription,
+        boost::multi_index::indexed_by<
+            boost::multi_index::sequenced<>,
+            boost::multi_index::ordered_unique<boost::multi_index::const_mem_fun<VirtualColumnDescription, const String &, &VirtualColumnDescription::getName>>>>;
+
+    using const_iterator = Container::const_iterator;
+
+    const_iterator begin() const { return container.begin(); }
+    const_iterator end() const { return container.end(); }
+
+    VirtualColumnsDescription() = default;
+
+    void add(VirtualColumnDescription desc);
+    void addEphemeral(String name, DataTypePtr type, String comment);
+    void addPersistent(String name, DataTypePtr type, ASTPtr codec, String comment);
+
+    size_t size() const { return container.size(); }
+    bool empty() const { return container.empty(); }
+    bool has(const String & name) const { return container.get<1>().contains(name); }
+
+    NameAndTypePair get(const String & name, VirtualsKind kind) const;
+    std::optional<NameAndTypePair> tryGet(const String & name, VirtualsKind kind) const;
+
+    NameAndTypePair get(const String & name) const { return get(name, VirtualsKind::All); }
+    std::optional<NameAndTypePair> tryGet(const String & name) const { return tryGet(name, VirtualsKind::All); }
+
+    const VirtualColumnDescription * tryGetDescription(const String & name, VirtualsKind kind) const;
+    const VirtualColumnDescription & getDescription(const String & name, VirtualsKind kind) const;
+
+    const VirtualColumnDescription * tryGetDescription(const String & name) const { return tryGetDescription(name, VirtualsKind::All); }
+    const VirtualColumnDescription & getDescription(const String & name) const { return getDescription(name, VirtualsKind::All); }
+
+    Block getSampleBlock() const;
+    NamesAndTypesList getNamesAndTypesList() const;
+    NamesAndTypesList getNamesAndTypesList(VirtualsKind kind) const;
+
+private:
+    Container container;
+};
+
+using VirtualsDescriptionPtr = std::shared_ptr<const VirtualColumnsDescription>;
+using MultiVersionVirtualsDescriptionPtr = MultiVersion<VirtualColumnsDescription>;
+
+}
diff --git a/src/Storages/WindowView/StorageWindowView.cpp b/src/Storages/WindowView/StorageWindowView.cpp
index 12fd7580639..04c26053dba 100644
--- a/src/Storages/WindowView/StorageWindowView.cpp
+++ b/src/Storages/WindowView/StorageWindowView.cpp
@@ -1,9 +1,7 @@
 #include <numeric>
 
 #include <DataTypes/DataTypeDateTime.h>
-#include <DataTypes/DataTypesNumber.h>
 #include <DataTypes/DataTypeTuple.h>
-#include <Functions/FunctionFactory.h>
 #include <Functions/FunctionsTimeWindow.h>
 #include <Interpreters/addMissingDefaults.h>
 #include <Interpreters/AddDefaultDatabaseVisitor.h>
@@ -15,7 +13,6 @@
 #include <Interpreters/InterpreterDropQuery.h>
 #include <Interpreters/InterpreterSelectQuery.h>
 #include <Interpreters/ProcessList.h>
-#include <Interpreters/QueryAliasesVisitor.h>
 #include <Interpreters/QueryNormalizer.h>
 #include <Interpreters/getTableExpressions.h>
 #include <Interpreters/getHeaderForProcessingStage.h>
@@ -30,7 +27,6 @@
 #include <Parsers/ASTTablesInSelectQuery.h>
 #include <Parsers/ASTColumnDeclaration.h>
 #include <Parsers/ASTWatchQuery.h>
-#include <Parsers/parseQuery.h>
 #include <Parsers/formatAST.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/Sources/BlocksSource.h>
@@ -51,16 +47,13 @@
 #include <Storages/StorageFactory.h>
 #include <Common/typeid_cast.h>
 #include <Common/ProfileEvents.h>
-#include <base/sleep.h>
 #include <Common/logger_useful.h>
 #include <boost/algorithm/string/replace.hpp>
 
 #include <Storages/LiveView/StorageBlocks.h>
-
 #include <Storages/WindowView/StorageWindowView.h>
 #include <Storages/WindowView/WindowViewSource.h>
 
-#include <QueryPipeline/printPipeline.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
 
 
@@ -78,6 +71,7 @@ namespace ErrorCodes
     extern const int QUERY_IS_NOT_SUPPORTED_IN_WINDOW_VIEW;
     extern const int SUPPORT_IS_DISABLED;
     extern const int TABLE_WAS_NOT_DROPPED;
+    extern const int NO_SUCH_COLUMN_IN_TABLE;
     extern const int NOT_IMPLEMENTED;
     extern const int UNSUPPORTED_METHOD;
 }
@@ -285,13 +279,13 @@ namespace
     {
         switch (kind)
         {
-            case IntervalKind::Nanosecond:
-            case IntervalKind::Microsecond:
-            case IntervalKind::Millisecond:
+            case IntervalKind::Kind::Nanosecond:
+            case IntervalKind::Kind::Microsecond:
+            case IntervalKind::Kind::Millisecond:
                 throw Exception(ErrorCodes::SYNTAX_ERROR, "Fractional seconds are not supported by windows yet");
 #define CASE_WINDOW_KIND(KIND) \
-    case IntervalKind::KIND: { \
-        return AddTime<IntervalKind::KIND>::execute(time_sec, num_units, time_zone); \
+    case IntervalKind::Kind::KIND: { \
+        return AddTime<IntervalKind::Kind::KIND>::execute(time_sec, num_units, time_zone); \
     }
             CASE_WINDOW_KIND(Second)
             CASE_WINDOW_KIND(Minute)
@@ -346,6 +340,13 @@ namespace
         table_expr->children.push_back(table_expr->database_and_table_name);
         return fetch_query;
     }
+
+    void checkTargetTableHasQueryOutputColumns(const ColumnsDescription & target_table_columns, const ColumnsDescription & select_query_output_columns)
+    {
+        for (const auto & column : select_query_output_columns)
+            if (!target_table_columns.has(column.name))
+                throw Exception(ErrorCodes::NO_SUCH_COLUMN_IN_TABLE, "Column {} does not exist in the window view's inner table", column.name);
+    }
 }
 
 static void extractDependentTable(ContextPtr context, ASTPtr & query, String & select_database_name, String & select_table_name)
@@ -418,8 +419,7 @@ ASTPtr StorageWindowView::getCleanupQuery()
 
     auto alter_command = std::make_shared<ASTAlterCommand>();
     alter_command->type = ASTAlterCommand::DELETE;
-    alter_command->predicate = function_less;
-    alter_command->children.push_back(alter_command->predicate);
+    alter_command->predicate = alter_command->children.emplace_back(function_less).get();
     alter_query->command_list->children.push_back(alter_command);
     return alter_query;
 }
@@ -439,6 +439,7 @@ bool StorageWindowView::optimize(
     bool cleanup,
     ContextPtr local_context)
 {
+    throwIfWindowViewIsDisabled(local_context);
     auto storage_ptr = getInnerTable();
     auto metadata_snapshot = storage_ptr->getInMemoryMetadataPtr();
     return getInnerTable()->optimize(query, metadata_snapshot, partition, final, deduplicate, deduplicate_by_columns, cleanup, local_context);
@@ -449,6 +450,7 @@ void StorageWindowView::alter(
     ContextPtr local_context,
     AlterLockHolder &)
 {
+    throwIfWindowViewIsDisabled(local_context);
     auto table_id = getStorageID();
     StorageInMemoryMetadata new_metadata = getInMemoryMetadata();
     StorageInMemoryMetadata old_metadata = getInMemoryMetadata();
@@ -490,14 +492,27 @@ void StorageWindowView::alter(
 
     new_metadata.setSelectQuery(new_select);
 
+    /// Check the window view's inner target table structure.
+    if (has_inner_target_table)
+    {
+        /// If this window view has an inner target table it should always have the same columns as this window view.
+        /// Try to find mistakes in the select query (it shouldn't have columns which are not in the inner target table).
+        auto target_table_metadata = getTargetTable()->getInMemoryMetadataPtr();
+        const auto & select_query_output_columns = new_metadata.columns; /// AlterCommands::alter() analyzed the query and assigned `new_metadata.columns` before.
+        checkTargetTableHasQueryOutputColumns(target_table_metadata->columns, select_query_output_columns);
+        /// We need to copy the target table's columns (after checkTargetTableHasQueryOutputColumns() they can be still different - e.g. in data types).
+        new_metadata.columns = target_table_metadata->columns;
+    }
+
     DatabaseCatalog::instance().getDatabase(table_id.database_name)->alterTable(local_context, table_id, new_metadata);
     setInMemoryMetadata(new_metadata);
 
     startup();
 }
 
-void StorageWindowView::checkAlterIsPossible(const AlterCommands & commands, ContextPtr /*local_context*/) const
+void StorageWindowView::checkAlterIsPossible(const AlterCommands & commands, ContextPtr local_context) const
 {
+    throwIfWindowViewIsDisabled(local_context);
     for (const auto & command : commands)
     {
         if (!command.isCommentAlter() && command.type != AlterCommand::MODIFY_QUERY)
@@ -507,6 +522,7 @@ void StorageWindowView::checkAlterIsPossible(const AlterCommands & commands, Con
 
 std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 {
+    throwIfWindowViewIsDisabled();
     UInt32 w_start = addTime(watermark, window_kind, -window_num_units, *time_zone);
 
     auto inner_table = getInnerTable();
@@ -642,6 +658,7 @@ std::pair<BlocksPtr, Block> StorageWindowView::getNewBlocks(UInt32 watermark)
 
 inline void StorageWindowView::fire(UInt32 watermark)
 {
+    throwIfWindowViewIsDisabled();
     LOG_TRACE(log, "Watch streams number: {}, target table: {}",
               watch_streams.size(),
               target_table_id.empty() ? "None" : target_table_id.getNameForLogs());
@@ -710,6 +727,7 @@ inline void StorageWindowView::fire(UInt32 watermark)
 
 ASTPtr StorageWindowView::getSourceTableSelectQuery()
 {
+    throwIfWindowViewIsDisabled();
     auto query = select_query->clone();
     auto & modified_select = query->as<ASTSelectQuery &>();
 
@@ -876,20 +894,20 @@ UInt32 StorageWindowView::getWindowLowerBound(UInt32 time_sec)
 {
     switch (slide_kind)
     {
-        case IntervalKind::Nanosecond:
-        case IntervalKind::Microsecond:
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Nanosecond:
+        case IntervalKind::Kind::Microsecond:
+        case IntervalKind::Kind::Millisecond:
             throw Exception(ErrorCodes::SYNTAX_ERROR, "Fractional seconds are not supported by windows yet");
 #define CASE_WINDOW_KIND(KIND) \
-    case IntervalKind::KIND: \
+    case IntervalKind::Kind::KIND: \
     { \
         if (is_tumble) \
-            return ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, window_num_units, *time_zone); \
+            return ToStartOfTransform<IntervalKind::Kind::KIND>::execute(time_sec, window_num_units, *time_zone); \
         else \
         {\
-            UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, hop_num_units, *time_zone); \
-            UInt32 w_end = AddTime<IntervalKind::KIND>::execute(w_start, hop_num_units, *time_zone);\
-            return AddTime<IntervalKind::KIND>::execute(w_end, -window_num_units, *time_zone);\
+            UInt32 w_start = ToStartOfTransform<IntervalKind::Kind::KIND>::execute(time_sec, hop_num_units, *time_zone); \
+            UInt32 w_end = AddTime<IntervalKind::Kind::KIND>::execute(w_start, hop_num_units, *time_zone);\
+            return AddTime<IntervalKind::Kind::KIND>::execute(w_end, -window_num_units, *time_zone);\
         }\
     }
         CASE_WINDOW_KIND(Second)
@@ -909,16 +927,16 @@ UInt32 StorageWindowView::getWindowUpperBound(UInt32 time_sec)
 {
     switch (slide_kind)
     {
-        case IntervalKind::Nanosecond:
-        case IntervalKind::Microsecond:
-        case IntervalKind::Millisecond:
+        case IntervalKind::Kind::Nanosecond:
+        case IntervalKind::Kind::Microsecond:
+        case IntervalKind::Kind::Millisecond:
             throw Exception(ErrorCodes::SYNTAX_ERROR, "Fractional seconds are not supported by window view yet");
 
 #define CASE_WINDOW_KIND(KIND) \
-    case IntervalKind::KIND: \
+    case IntervalKind::Kind::KIND: \
     { \
-        UInt32 w_start = ToStartOfTransform<IntervalKind::KIND>::execute(time_sec, slide_num_units, *time_zone); \
-        return AddTime<IntervalKind::KIND>::execute(w_start, slide_num_units, *time_zone); \
+        UInt32 w_start = ToStartOfTransform<IntervalKind::Kind::KIND>::execute(time_sec, slide_num_units, *time_zone); \
+        return AddTime<IntervalKind::Kind::KIND>::execute(w_start, slide_num_units, *time_zone); \
     }
         CASE_WINDOW_KIND(Second)
         CASE_WINDOW_KIND(Minute)
@@ -935,6 +953,7 @@ UInt32 StorageWindowView::getWindowUpperBound(UInt32 time_sec)
 
 void StorageWindowView::addFireSignal(std::set<UInt32> & signals)
 {
+    throwIfWindowViewIsDisabled();
     std::lock_guard lock(fire_signal_mutex);
     for (const auto & signal : signals)
         fire_signal.push_back(signal);
@@ -950,6 +969,7 @@ void StorageWindowView::updateMaxTimestamp(UInt32 timestamp)
 
 void StorageWindowView::updateMaxWatermark(UInt32 watermark)
 {
+    throwIfWindowViewIsDisabled();
     if (is_proctime)
     {
         max_watermark = watermark;
@@ -1002,6 +1022,7 @@ void StorageWindowView::cleanup()
 
 void StorageWindowView::threadFuncCleanup()
 {
+    throwIfWindowViewIsDisabled();
     if (shutdown_called)
         return;
 
@@ -1021,6 +1042,7 @@ void StorageWindowView::threadFuncCleanup()
 
 void StorageWindowView::threadFuncFireProc()
 {
+    throwIfWindowViewIsDisabled();
     if (shutdown_called)
         return;
 
@@ -1042,7 +1064,7 @@ void StorageWindowView::threadFuncFireProc()
         max_fired_watermark = next_fire_signal;
         auto slide_interval = addTime(0, slide_kind, slide_num_units, *time_zone);
         /// Convert DayNum into seconds when the slide interval is larger than Day
-        if (slide_kind > IntervalKind::Day)
+        if (slide_kind > IntervalKind::Kind::Day)
             slide_interval *= 86400;
         next_fire_signal += slide_interval;
     }
@@ -1057,6 +1079,7 @@ void StorageWindowView::threadFuncFireProc()
 
 void StorageWindowView::threadFuncFireEvent()
 {
+    throwIfWindowViewIsDisabled();
     std::lock_guard lock(fire_signal_mutex);
 
     LOG_TRACE(log, "Fire events: {}", fire_signal.size());
@@ -1088,6 +1111,7 @@ void StorageWindowView::read(
     const size_t max_block_size,
     const size_t num_streams)
 {
+    throwIfWindowViewIsDisabled(local_context);
     if (target_table_id.empty())
         return;
 
@@ -1128,6 +1152,7 @@ Pipe StorageWindowView::watch(
     size_t /*max_block_size*/,
     const size_t /*num_streams*/)
 {
+    throwIfWindowViewIsDisabled(local_context);
     ASTWatchQuery & query = typeid_cast<ASTWatchQuery &>(*query_info.query);
 
     bool has_limit = false;
@@ -1158,16 +1183,18 @@ StorageWindowView::StorageWindowView(
     ContextPtr context_,
     const ASTCreateQuery & query,
     const ColumnsDescription & columns_,
-    bool attach_)
+    LoadingStrictnessLevel mode)
     : IStorage(table_id_)
     , WithContext(context_->getGlobalContext())
-    , log(&Poco::Logger::get(fmt::format("StorageWindowView({}.{})", table_id_.database_name, table_id_.table_name)))
+    , log(getLogger(fmt::format("StorageWindowView({}.{})", table_id_.database_name, table_id_.table_name)))
     , 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')");
+        disabled_due_to_analyzer = true;
+
+    if (mode <= LoadingStrictnessLevel::CREATE)
+        throwIfWindowViewIsDisabled();
 
     if (!query.select)
         throw Exception(ErrorCodes::INCORRECT_QUERY, "SELECT query is not specified for {}", getName());
@@ -1204,7 +1231,7 @@ StorageWindowView::StorageWindowView(
         next_fire_signal = getWindowUpperBound(now());
 
     std::exchange(has_inner_table, true);
-    if (!attach_)
+    if (mode < LoadingStrictnessLevel::ATTACH)
     {
         auto inner_create_query = getInnerTableCreateQuery(inner_query, inner_table_id);
         auto create_context = Context::createCopy(context_);
@@ -1231,6 +1258,9 @@ StorageWindowView::StorageWindowView(
         }
     }
 
+    if (disabled_due_to_analyzer)
+        return;
+
     clean_cache_task = getContext()->getSchedulePool().createTask(getStorageID().getFullTableName(), [this] { threadFuncCleanup(); });
     fire_task = getContext()->getSchedulePool().createTask(
         getStorageID().getFullTableName(), [this] { is_proctime ? threadFuncFireProc() : threadFuncFireEvent(); });
@@ -1361,7 +1391,7 @@ void StorageWindowView::eventTimeParser(const ASTCreateQuery & query)
         if (query.is_watermark_ascending)
         {
             is_watermark_bounded = true;
-            watermark_kind = IntervalKind::Second;
+            watermark_kind = IntervalKind::Kind::Second;
             watermark_num_units = 1;
         }
         else if (query.is_watermark_bounded)
@@ -1388,6 +1418,7 @@ void StorageWindowView::eventTimeParser(const ASTCreateQuery & query)
 void StorageWindowView::writeIntoWindowView(
     StorageWindowView & window_view, const Block & block, ContextPtr local_context)
 {
+    window_view.throwIfWindowViewIsDisabled(local_context);
     while (window_view.modifying_query)
         std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
@@ -1577,6 +1608,9 @@ void StorageWindowView::writeIntoWindowView(
 
 void StorageWindowView::startup()
 {
+    if (disabled_due_to_analyzer)
+        return;
+
     DatabaseCatalog::instance().addViewDependency(select_table_id, getStorageID());
 
     fire_task->activate();
@@ -1590,6 +1624,8 @@ void StorageWindowView::startup()
 void StorageWindowView::shutdown(bool)
 {
     shutdown_called = true;
+    if (disabled_due_to_analyzer)
+        return;
 
     fire_condition.notify_all();
 
@@ -1645,6 +1681,7 @@ Block StorageWindowView::getInputHeader() const
 
 const Block & StorageWindowView::getOutputHeader() const
 {
+    throwIfWindowViewIsDisabled();
     std::lock_guard lock(sample_block_lock);
     if (!output_header)
     {
@@ -1669,16 +1706,23 @@ StoragePtr StorageWindowView::getTargetTable() const
     return DatabaseCatalog::instance().getTable(target_table_id, getContext());
 }
 
+void StorageWindowView::throwIfWindowViewIsDisabled(ContextPtr local_context) const
+{
+    if (disabled_due_to_analyzer || (local_context && local_context->getSettingsRef().allow_experimental_analyzer))
+        throw Exception(ErrorCodes::UNSUPPORTED_METHOD, "Experimental WINDOW VIEW feature is not supported "
+                        "in the current infrastructure for query analysis (the setting 'allow_experimental_analyzer')");
+}
+
 void registerStorageWindowView(StorageFactory & factory)
 {
     factory.registerStorage("WindowView", [](const StorageFactory::Arguments & args)
     {
-        if (!args.attach && !args.getLocalContext()->getSettingsRef().allow_experimental_window_view)
+        if (args.mode <= LoadingStrictnessLevel::CREATE && !args.getLocalContext()->getSettingsRef().allow_experimental_window_view)
             throw Exception(ErrorCodes::SUPPORT_IS_DISABLED,
                             "Experimental WINDOW VIEW feature "
                             "is not enabled (the setting 'allow_experimental_window_view')");
 
-        return std::make_shared<StorageWindowView>(args.table_id, args.getLocalContext(), args.query, args.columns, args.attach);
+        return std::make_shared<StorageWindowView>(args.table_id, args.getLocalContext(), args.query, args.columns, args.mode);
     });
 }
 
diff --git a/src/Storages/WindowView/StorageWindowView.h b/src/Storages/WindowView/StorageWindowView.h
index de8f880c602..f79867df424 100644
--- a/src/Storages/WindowView/StorageWindowView.h
+++ b/src/Storages/WindowView/StorageWindowView.h
@@ -111,7 +111,7 @@ public:
         ContextPtr context_,
         const ASTCreateQuery & query,
         const ColumnsDescription & columns_,
-        bool attach_);
+        LoadingStrictnessLevel mode);
 
     String getName() const override { return "WindowView"; }
 
@@ -177,7 +177,7 @@ public:
     const Block & getOutputHeader() const;
 
 private:
-    Poco::Logger * log;
+    LoggerPtr log;
 
     /// Stored query, e.g. SELECT * FROM * GROUP BY tumble(now(), *)
     ASTPtr select_query;
@@ -271,5 +271,9 @@ private:
     StoragePtr getSourceTable() const;
     StoragePtr getInnerTable() const;
     StoragePtr getTargetTable() const;
+
+    bool disabled_due_to_analyzer = false;
+
+    void throwIfWindowViewIsDisabled(ContextPtr local_context = nullptr) const;
 };
 }
diff --git a/src/Storages/buildQueryTreeForShard.cpp b/src/Storages/buildQueryTreeForShard.cpp
index 00cc5e3ee58..5bbdbe487b0 100644
--- a/src/Storages/buildQueryTreeForShard.cpp
+++ b/src/Storages/buildQueryTreeForShard.cpp
@@ -1,24 +1,27 @@
 
 #include <Storages/buildQueryTreeForShard.h>
 
-#include <Analyzer/createUniqueTableAliases.h>
 #include <Analyzer/ColumnNode.h>
+#include <Analyzer/createUniqueTableAliases.h>
 #include <Analyzer/FunctionNode.h>
-#include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/InDepthQueryTreeVisitor.h>
-#include <Analyzer/TableNode.h>
+#include <Analyzer/IQueryTreeNode.h>
 #include <Analyzer/JoinNode.h>
+#include <Analyzer/QueryNode.h>
+#include <Analyzer/TableNode.h>
 #include <Analyzer/Utils.h>
 #include <Functions/FunctionFactory.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Interpreters/InterpreterSelectQueryAnalyzer.h>
-#include <Storages/removeGroupingFunctionSpecializations.h>
-#include <Storages/StorageDistributed.h>
-#include <Storages/StorageDummy.h>
 #include <Planner/Utils.h>
 #include <Processors/Executors/CompletedPipelineExecutor.h>
 #include <Processors/QueryPlan/ExpressionStep.h>
 #include <Processors/QueryPlan/Optimizations/QueryPlanOptimizationSettings.h>
+#include <Processors/Transforms/SquashingChunksTransform.h>
 #include <QueryPipeline/QueryPipelineBuilder.h>
+#include <Storages/removeGroupingFunctionSpecializations.h>
+#include <Storages/StorageDistributed.h>
+#include <Storages/StorageDummy.h>
 
 namespace DB
 {
@@ -283,7 +286,16 @@ TableNodePtr executeSubqueryNode(const QueryTreeNodePtr & subquery_node,
 
     auto optimization_settings = QueryPlanOptimizationSettings::fromContext(mutable_context);
     auto build_pipeline_settings = BuildQueryPipelineSettings::fromContext(mutable_context);
-    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(*query_plan.buildQueryPipeline(optimization_settings, build_pipeline_settings)));
+    auto builder = query_plan.buildQueryPipeline(optimization_settings, build_pipeline_settings);
+
+    size_t min_block_size_rows = mutable_context->getSettingsRef().min_external_table_block_size_rows;
+    size_t min_block_size_bytes = mutable_context->getSettingsRef().min_external_table_block_size_bytes;
+    auto squashing = std::make_shared<SimpleSquashingChunksTransform>(builder->getHeader(), min_block_size_rows, min_block_size_bytes);
+
+    builder->resize(1);
+    builder->addTransform(std::move(squashing));
+
+    auto pipeline = QueryPipelineBuilder::getPipeline(std::move(*builder));
 
     pipeline.complete(std::move(table_out));
     CompletedPipelineExecutor executor(pipeline);
@@ -295,10 +307,8 @@ TableNodePtr executeSubqueryNode(const QueryTreeNodePtr & subquery_node,
 
 }
 
-QueryTreeNodePtr buildQueryTreeForShard(SelectQueryInfo & query_info, QueryTreeNodePtr query_tree_to_modify)
+QueryTreeNodePtr buildQueryTreeForShard(const PlannerContextPtr & planner_context, QueryTreeNodePtr query_tree_to_modify)
 {
-    auto & planner_context = query_info.planner_context;
-
     CollectColumnSourceToColumnsVisitor collect_column_source_to_columns_visitor;
     collect_column_source_to_columns_visitor.visit(query_tree_to_modify);
 
@@ -351,10 +361,14 @@ QueryTreeNodePtr buildQueryTreeForShard(SelectQueryInfo & query_info, QueryTreeN
         {
             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)
+            if (in_function_node_type != QueryTreeNodeType::QUERY && in_function_node_type != QueryTreeNodeType::UNION && in_function_node_type != QueryTreeNodeType::TABLE)
                 continue;
 
-            auto temporary_table_expression_node = executeSubqueryNode(in_function_subquery_node,
+            auto subquery_to_execute = in_function_subquery_node;
+            if (subquery_to_execute->as<TableNode>())
+                subquery_to_execute = buildSubqueryToReadColumnsFromTableExpression(std::move(subquery_to_execute), planner_context->getQueryContext());
+
+            auto temporary_table_expression_node = executeSubqueryNode(subquery_to_execute,
                 planner_context->getMutableQueryContext(),
                 global_in_or_join_node.subquery_depth);
 
@@ -373,11 +387,74 @@ QueryTreeNodePtr buildQueryTreeForShard(SelectQueryInfo & query_info, QueryTreeN
 
     removeGroupingFunctionSpecializations(query_tree_to_modify);
 
-    // std::cerr << "====================== build 1 \n" << query_tree_to_modify->dumpTree() << std::endl;
     createUniqueTableAliases(query_tree_to_modify, nullptr, planner_context->getQueryContext());
-    // std::cerr << "====================== build 2 \n" << query_tree_to_modify->dumpTree() << std::endl;
+
+    // Get rid of the settings clause so we don't send them to remote. Thus newly non-important
+    // settings won't break any remote parser. It's also more reasonable since the query settings
+    // are written into the query context and will be sent by the query pipeline.
+    if (auto * query_node = query_tree_to_modify->as<QueryNode>())
+        query_node->clearSettingsChanges();
 
     return query_tree_to_modify;
 }
 
+class CollectStoragesVisitor : public InDepthQueryTreeVisitor<CollectStoragesVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitor<CollectStoragesVisitor>;
+    using Base::Base;
+
+    void visitImpl(QueryTreeNodePtr & node)
+    {
+        if (auto * table_node = node->as<TableNode>())
+            storages.push_back(table_node->getStorage());
+    }
+
+    std::vector<StoragePtr> storages;
+};
+
+class RewriteJoinToGlobalJoinVisitor : public InDepthQueryTreeVisitorWithContext<RewriteJoinToGlobalJoinVisitor>
+{
+public:
+    using Base = InDepthQueryTreeVisitorWithContext<RewriteJoinToGlobalJoinVisitor>;
+    using Base::Base;
+
+    static bool allStoragesAreMergeTree(QueryTreeNodePtr & node)
+    {
+        CollectStoragesVisitor collect_storages;
+        collect_storages.visit(node);
+        for (const auto & storage : collect_storages.storages)
+            if (!storage->isMergeTree())
+                return false;
+
+        return true;
+    }
+
+    void enterImpl(QueryTreeNodePtr & node)
+    {
+        if (auto * join_node = node->as<JoinNode>())
+        {
+            bool prefer_local_join = getContext()->getSettingsRef().parallel_replicas_prefer_local_join;
+            bool should_use_global_join = !prefer_local_join || !allStoragesAreMergeTree(join_node->getRightTableExpression());
+            if (should_use_global_join)
+                join_node->setLocality(JoinLocality::Global);
+        }
+    }
+
+    static bool needChildVisit(QueryTreeNodePtr & parent, QueryTreeNodePtr & child)
+    {
+        auto * join_node = parent->as<JoinNode>();
+        if (join_node && join_node->getRightTableExpression() == child)
+            return false;
+
+        return true;
+    }
+};
+
+void rewriteJoinToGlobalJoin(QueryTreeNodePtr query_tree_to_modify, ContextPtr context)
+{
+    RewriteJoinToGlobalJoinVisitor visitor(context);
+    visitor.visit(query_tree_to_modify);
+}
+
 }
diff --git a/src/Storages/buildQueryTreeForShard.h b/src/Storages/buildQueryTreeForShard.h
index 05d63faeb9f..5b00b89c729 100644
--- a/src/Storages/buildQueryTreeForShard.h
+++ b/src/Storages/buildQueryTreeForShard.h
@@ -10,6 +10,14 @@ struct SelectQueryInfo;
 class IQueryTreeNode;
 using QueryTreeNodePtr = std::shared_ptr<IQueryTreeNode>;
 
-QueryTreeNodePtr buildQueryTreeForShard(SelectQueryInfo & query_info, QueryTreeNodePtr query_tree_to_modify);
+class PlannerContext;
+using PlannerContextPtr = std::shared_ptr<PlannerContext>;
+
+class Context;
+using ContextPtr = std::shared_ptr<const Context>;
+
+QueryTreeNodePtr buildQueryTreeForShard(const PlannerContextPtr & planner_context, QueryTreeNodePtr query_tree_to_modify);
+
+void rewriteJoinToGlobalJoin(QueryTreeNodePtr query_tree_to_modify, ContextPtr context);
 
 }
diff --git a/src/Storages/checkAndGetLiteralArgument.cpp b/src/Storages/checkAndGetLiteralArgument.cpp
index 5baf47fe91a..39dc27cd5e8 100644
--- a/src/Storages/checkAndGetLiteralArgument.cpp
+++ b/src/Storages/checkAndGetLiteralArgument.cpp
@@ -1,5 +1,6 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <Core/Field.h>
+#include <Parsers/ASTFunction.h>
 
 namespace DB
 {
@@ -12,8 +13,14 @@ namespace ErrorCodes
 template <typename T>
 T checkAndGetLiteralArgument(const ASTPtr & arg, const String & arg_name)
 {
-    if (arg && arg->as<ASTLiteral>())
-        return checkAndGetLiteralArgument<T>(*arg->as<ASTLiteral>(), arg_name);
+    if (arg)
+    {
+        if (const auto * func = arg->as<const ASTFunction>(); func && func->name == "_CAST")
+            return checkAndGetLiteralArgument<T>(func->arguments->children.at(0), arg_name);
+
+        if (arg->as<ASTLiteral>())
+            return checkAndGetLiteralArgument<T>(*arg->as<ASTLiteral>(), arg_name);
+    }
 
     throw Exception(
         ErrorCodes::BAD_ARGUMENTS,
diff --git a/src/Storages/examples/CMakeLists.txt b/src/Storages/examples/CMakeLists.txt
index 225337d8ec8..cddfc9404d4 100644
--- a/src/Storages/examples/CMakeLists.txt
+++ b/src/Storages/examples/CMakeLists.txt
@@ -6,11 +6,3 @@ target_link_libraries (merge_selector2 PRIVATE dbms)
 
 clickhouse_add_executable (get_current_inserts_in_replicated get_current_inserts_in_replicated.cpp)
 target_link_libraries (get_current_inserts_in_replicated PRIVATE dbms clickhouse_common_config clickhouse_common_zookeeper string_utils)
-
-clickhouse_add_executable (get_abandonable_lock_in_all_partitions get_abandonable_lock_in_all_partitions.cpp)
-target_link_libraries (get_abandonable_lock_in_all_partitions PRIVATE dbms clickhouse_common_config clickhouse_common_zookeeper)
-
-if (TARGET ch_contrib::hdfs)
-    clickhouse_add_executable (async_read_buffer_from_hdfs async_read_buffer_from_hdfs.cpp)
-    target_link_libraries (async_read_buffer_from_hdfs PRIVATE dbms ch_contrib::hdfs)
-endif ()
diff --git a/src/Storages/examples/active_parts.py b/src/Storages/examples/active_parts.py
deleted file mode 100644
index d82c5ca96bf..00000000000
--- a/src/Storages/examples/active_parts.py
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/python
-# coding=UTF-8
-
-# Displays a list of active parts - parts that are not overlapped by any other part.
-# Usage: `ls /var/lib/clickhouse/data/merge/visits | active_parts.py`
-
-import sys
-import re
-
-parts = {}
-for s in sys.stdin.read().split():
-    m = re.match(
-        "^([0-9]{6})[0-9]{2}_([0-9]{6})[0-9]{2}_([0-9]+)_([0-9]+)_([0-9]+)$", s
-    )
-    if m == None:
-        continue
-    m1 = m.group(1)
-    m2 = m.group(2)
-    i1 = int(m.group(3))
-    i2 = int(m.group(4))
-    l = int(m.group(5))
-    if m1 != m2:
-        raise Exception("not in single month: " + s)
-    if m1 not in parts:
-        parts[m1] = []
-    parts[m1].append((i1, i2, l, s))
-
-for m, ps in sorted(parts.items()):
-    ps.sort(key=lambda i1_i2_l_s: (i1_i2_l_s[0], -i1_i2_l_s[1], -i1_i2_l_s[2]))
-    (x2, y2, l2, s2) = (-1, -1, -1, -1)
-    for x1, y1, l1, s1 in ps:
-        if x1 >= x2 and y1 <= y2 and l1 < l2 and (x1, y1) != (x2, y2):  # 2 contains 1
-            pass
-        elif x1 > y2:  # 1 is to the right of 2
-            if x1 != y2 + 1 and y2 != -1:
-                print()  # to see the missing numbers
-            (x2, y2, l2, s2) = (x1, y1, l1, s1)
-            print(s1)
-        else:
-            raise Exception("invalid parts intersection: " + s1 + " and " + s2)
-    print()
diff --git a/src/Storages/examples/async_read_buffer_from_hdfs.cpp b/src/Storages/examples/async_read_buffer_from_hdfs.cpp
deleted file mode 100644
index 4f6aed8ef65..00000000000
--- a/src/Storages/examples/async_read_buffer_from_hdfs.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include <memory>
-#include <string>
-#include <filesystem>
-
-#include <IO/WriteHelpers.h>
-#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>
-
-int main()
-{
-    using namespace DB;
-    namespace fs = std::filesystem;
-
-    String config_path = "/path/to/config/file";
-    ConfigProcessor config_processor(config_path, false, true);
-    config_processor.setConfigPath(fs::path(config_path).parent_path());
-    auto loaded_config = config_processor.loadConfig(false);
-    auto * config = loaded_config.configuration.duplicate();
-
-    String hdfs_namenode_url = "hdfs://namenode:port/";
-    String path = "/path/to/hdfs/file";
-    ReadSettings settings = {};
-    auto in = std::make_unique<ReadBufferFromHDFS>(hdfs_namenode_url, path, *config, settings);
-    auto & reader = getThreadPoolReader(FilesystemReaderType::ASYNCHRONOUS_REMOTE_FS_READER);
-    AsynchronousReadBufferFromHDFS buf(reader, {}, std::move(in));
-
-    String output;
-    WriteBufferFromString out(output);
-    copyData(buf, out);
-    std::cout << "output:" << output << std::endl;
-    return 0;
-}
diff --git a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp b/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
deleted file mode 100644
index 9e2b2a83b98..00000000000
--- a/src/Storages/examples/get_abandonable_lock_in_all_partitions.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-#include <Common/Config/ConfigProcessor.h>
-#include <Common/ZooKeeper/ZooKeeper.h>
-#include <Common/Exception.h>
-#include <Common/Stopwatch.h>
-#include <Storages/MergeTree/EphemeralLockInZooKeeper.h>
-
-#include <base/scope_guard.h>
-
-#include <iostream>
-
-
-using namespace DB;
-
-/// This test is useful for assessing the performance of acquiring block numbers in all partitions (and there
-/// can be ~1000 of them). This is needed when creating a mutation entry for a ReplicatedMergeTree table.
-int main(int argc, char ** argv)
-try
-{
-    if (argc != 3)
-    {
-        std::cerr << "usage: " << argv[0] << " <zookeeper_config> <path_to_table>" << std::endl;
-        return 3;
-    }
-
-    ConfigProcessor processor(argv[1], false, true);
-    auto config = processor.loadConfig().configuration;
-    String root_path = argv[2];
-
-    zkutil::ZooKeeper zk(*config, zkutil::getZooKeeperConfigName(*config), nullptr);
-
-    String temp_path = root_path + "/temp";
-    String blocks_path = root_path + "/block_numbers";
-
-    Stopwatch total_timer;
-    Stopwatch timer;
-
-    EphemeralLocksInAllPartitions locks(blocks_path, "test_lock-", temp_path, zk);
-
-    std::cerr << "Locked, elapsed: " << timer.elapsedSeconds() << std::endl;
-    for (const auto & lock : locks.getLocks())
-        std::cout << lock.partition_id << " " << lock.number << std::endl;
-    timer.restart();
-
-    locks.unlock();
-    std::cerr << "Abandoned, elapsed: " << timer.elapsedSeconds() << std::endl;
-
-    std::cerr << "Total elapsed: " << total_timer.elapsedSeconds() << std::endl;
-
-    return 0;
-}
-catch (const Exception & e)
-{
-    std::cerr << e.what() << ", " << e.displayText() << ": " << std::endl
-              << e.getStackTraceString() << std::endl;
-    throw;
-}
-catch (Poco::Exception & e)
-{
-    std::cerr << "Exception: " << e.displayText() << std::endl;
-    throw;
-}
-catch (std::exception & e)
-{
-    std::cerr << "std::exception: " << e.what() << std::endl;
-    throw;
-}
-catch (...)
-{
-    std::cerr << "Some exception" << std::endl;
-    throw;
-}
diff --git a/src/Storages/examples/get_current_inserts_in_replicated.cpp b/src/Storages/examples/get_current_inserts_in_replicated.cpp
index d77b0f5177d..6a4c6efbd23 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, zkutil::getZooKeeperConfigName(*config), nullptr);
+    auto zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(*config, zkutil::getZooKeeperConfigName(*config), nullptr);
 
     std::unordered_map<String, std::set<Int64>> current_inserts;
 
diff --git a/src/Storages/getStructureOfRemoteTable.cpp b/src/Storages/getStructureOfRemoteTable.cpp
index 32266f20923..26e953c0578 100644
--- a/src/Storages/getStructureOfRemoteTable.cpp
+++ b/src/Storages/getStructureOfRemoteTable.cpp
@@ -2,6 +2,7 @@
 #include <Interpreters/Cluster.h>
 #include <Interpreters/Context.h>
 #include <Interpreters/ClusterProxy/executeQuery.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <QueryPipeline/RemoteQueryExecutor.h>
 #include <DataTypes/DataTypeFactory.h>
 #include <DataTypes/DataTypeString.h>
@@ -32,6 +33,7 @@ ColumnsDescription getStructureOfRemoteTableInShard(
     const ASTPtr & table_func_ptr)
 {
     String query;
+    const Settings & settings = context->getSettingsRef();
 
     if (table_func_ptr)
     {
@@ -110,7 +112,8 @@ ColumnsDescription getStructureOfRemoteTableInShard(
                 column.default_desc.kind = columnDefaultKindFromString(kind_name);
                 String expr_str = (*default_expr)[i].get<const String &>();
                 column.default_desc.expression = parseQuery(
-                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression", 0, context->getSettingsRef().max_parser_depth);
+                    expr_parser, expr_str.data(), expr_str.data() + expr_str.size(), "default expression",
+                    0, settings.max_parser_depth, settings.max_parser_backtracks);
             }
 
             res.add(column);
diff --git a/src/Storages/prepareReadingFromFormat.cpp b/src/Storages/prepareReadingFromFormat.cpp
index 6be4213ec6b..406b7f379f9 100644
--- a/src/Storages/prepareReadingFromFormat.cpp
+++ b/src/Storages/prepareReadingFromFormat.cpp
@@ -4,7 +4,7 @@
 namespace DB
 {
 
-ReadFromFormatInfo prepareReadingFromFormat(const Strings & requested_columns, const StorageSnapshotPtr & storage_snapshot, bool supports_subset_of_columns, const NamesAndTypesList & virtuals)
+ReadFromFormatInfo prepareReadingFromFormat(const Strings & requested_columns, const StorageSnapshotPtr & storage_snapshot, bool supports_subset_of_columns)
 {
     ReadFromFormatInfo info;
     /// Collect requested virtual columns and remove them from requested columns.
@@ -12,11 +12,11 @@ ReadFromFormatInfo prepareReadingFromFormat(const Strings & requested_columns, c
     for (const auto & column_name : requested_columns)
     {
         bool is_virtual = false;
-        for (const auto & virtual_column : virtuals)
+        for (const auto & virtual_column : *storage_snapshot->virtual_columns)
         {
             if (column_name == virtual_column.name)
             {
-                info.requested_virtual_columns.push_back(virtual_column);
+                info.requested_virtual_columns.emplace_back(virtual_column.name, virtual_column.type);
                 is_virtual = true;
                 break;
             }
diff --git a/src/Storages/prepareReadingFromFormat.h b/src/Storages/prepareReadingFromFormat.h
index c5f3959a550..e4d62c29ec6 100644
--- a/src/Storages/prepareReadingFromFormat.h
+++ b/src/Storages/prepareReadingFromFormat.h
@@ -22,5 +22,5 @@ namespace DB
     };
 
     /// Get all needed information for reading from data in some input format.
-    ReadFromFormatInfo prepareReadingFromFormat(const Strings & requested_columns, const StorageSnapshotPtr & storage_snapshot, bool supports_subset_of_columns, const NamesAndTypesList & virtuals);
+    ReadFromFormatInfo prepareReadingFromFormat(const Strings & requested_columns, const StorageSnapshotPtr & storage_snapshot, bool supports_subset_of_columns);
 }
diff --git a/src/Storages/tests/gtest_storage_log.cpp b/src/Storages/tests/gtest_storage_log.cpp
index 352c44554bd..d75f3616f21 100644
--- a/src/Storages/tests/gtest_storage_log.cpp
+++ b/src/Storages/tests/gtest_storage_log.cpp
@@ -32,7 +32,7 @@ DB::StoragePtr createStorage(DB::DiskPtr & disk)
 
     StoragePtr table = std::make_shared<StorageLog>(
         "Log", disk, "table/", StorageID("test", "test"), ColumnsDescription{names_and_types},
-        ConstraintsDescription{}, String{}, false, getContext().context);
+        ConstraintsDescription{}, String{}, LoadingStrictnessLevel::CREATE, getContext().context);
 
     table->startup();
 
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 475cf5a4eae..7e2d393c3d1 100644
--- a/src/Storages/tests/gtest_transform_query_for_external_database.cpp
+++ b/src/Storages/tests/gtest_transform_query_for_external_database.cpp
@@ -118,7 +118,7 @@ static void checkOld(
     const std::string & expected)
 {
     ParserSelectQuery parser;
-    ASTPtr ast = parseQuery(parser, query, 1000, 1000);
+    ASTPtr ast = parseQuery(parser, query, 1000, 1000, 1000000);
     SelectQueryInfo query_info;
     SelectQueryOptions select_options;
     query_info.syntax_analyzer_result
@@ -161,7 +161,7 @@ static void checkNewAnalyzer(
     const std::string & expected)
 {
     ParserSelectQuery parser;
-    ASTPtr ast = parseQuery(parser, query, 1000, 1000);
+    ASTPtr ast = parseQuery(parser, query, 1000, 1000, 1000000);
 
     SelectQueryOptions select_query_options;
     auto query_tree = buildQueryTree(ast, state.context);
diff --git a/src/Storages/transformQueryForExternalDatabase.cpp b/src/Storages/transformQueryForExternalDatabase.cpp
index 4526a38a1c3..afc458ea612 100644
--- a/src/Storages/transformQueryForExternalDatabase.cpp
+++ b/src/Storages/transformQueryForExternalDatabase.cpp
@@ -145,7 +145,7 @@ bool isCompatible(ASTPtr & node)
             return false;
 
         if (!function->arguments)
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Logical error: function->arguments is not set");
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "function->arguments is not set");
 
         String name = function->name;
 
diff --git a/src/TableFunctions/Hive/TableFunctionHive.cpp b/src/TableFunctions/Hive/TableFunctionHive.cpp
index d8885087532..80494dbe5a8 100644
--- a/src/TableFunctions/Hive/TableFunctionHive.cpp
+++ b/src/TableFunctions/Hive/TableFunctionHive.cpp
@@ -17,6 +17,7 @@
 #include <TableFunctions/TableFunctionFactory.h>
 #include <Interpreters/parseColumnsListForTableFunction.h>
 
+
 namespace DB
 {
 
@@ -46,7 +47,7 @@ public:
     void parseArguments(const ASTPtr & ast_function_, ContextPtr context_) override;
 
 private:
-    Poco::Logger * logger = &Poco::Logger::get("TableFunctionHive");
+    LoggerPtr logger = getLogger("TableFunctionHive");
 
     String cluster_name;
     String hive_metastore_url;
@@ -99,7 +100,8 @@ StoragePtr TableFunctionHive::executeImpl(
         "(" + partition_by_def + ")",
         "partition by declaration list",
         settings.max_query_size,
-        settings.max_parser_depth);
+        settings.max_parser_depth,
+        settings.max_parser_backtracks);
     StoragePtr storage;
     storage = std::make_shared<StorageHive>(
         hive_metastore_url,
diff --git a/src/TableFunctions/ITableFunctionCluster.h b/src/TableFunctions/ITableFunctionCluster.h
index 7e81d6d21b7..9f56d781bc9 100644
--- a/src/TableFunctions/ITableFunctionCluster.h
+++ b/src/TableFunctions/ITableFunctionCluster.h
@@ -4,7 +4,6 @@
 
 #include <Interpreters/Context.h>
 #include <Interpreters/evaluateConstantExpression.h>
-#include <Storages/StorageS3Cluster.h>
 #include <Storages/checkAndGetLiteralArgument.h>
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionAzureBlobStorage.h>
@@ -29,14 +28,14 @@ public:
     String getName() const override = 0;
     String getSignature() const override = 0;
 
-    static void addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context)
+    static void updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure_, const String & format_, 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);
+        Base::updateStructureAndFormatArgumentsIfNeeded(args, structure_, format_, context);
         args.insert(args.begin(), cluster_name_arg);
     }
 
diff --git a/src/TableFunctions/ITableFunctionDataLake.h b/src/TableFunctions/ITableFunctionDataLake.h
index d8524963776..91165ba6705 100644
--- a/src/TableFunctions/ITableFunctionDataLake.h
+++ b/src/TableFunctions/ITableFunctionDataLake.h
@@ -34,7 +34,7 @@ protected:
             columns = parseColumnsListFromString(TableFunction::configuration.structure, context);
 
         StoragePtr storage = Storage::create(
-            TableFunction::configuration, context, StorageID(TableFunction::getDatabaseName(), table_name),
+            TableFunction::configuration, context, LoadingStrictnessLevel::CREATE, StorageID(TableFunction::getDatabaseName(), table_name),
             columns, ConstraintsDescription{}, String{}, std::nullopt);
 
         storage->startup();
diff --git a/src/TableFunctions/ITableFunctionFileLike.cpp b/src/TableFunctions/ITableFunctionFileLike.cpp
index b88af855309..1a58be4f75b 100644
--- a/src/TableFunctions/ITableFunctionFileLike.cpp
+++ b/src/TableFunctions/ITableFunctionFileLike.cpp
@@ -7,6 +7,7 @@
 
 #include <Storages/StorageFile.h>
 #include <Storages/checkAndGetLiteralArgument.h>
+#include <Storages/VirtualColumnUtils.h>
 
 #include <Interpreters/evaluateConstantExpression.h>
 
@@ -27,14 +28,19 @@ void ITableFunctionFileLike::parseFirstArguments(const ASTPtr & arg, const Conte
     filename = checkAndGetLiteralArgument<String>(arg, "source");
 }
 
-String ITableFunctionFileLike::getFormatFromFirstArgument()
+std::optional<String> ITableFunctionFileLike::tryGetFormatFromFirstArgument()
 {
-    return FormatFactory::instance().getFormatFromFileName(filename, true);
+    return FormatFactory::instance().tryGetFormatFromFileName(filename);
 }
 
 bool ITableFunctionFileLike::supportsReadingSubsetOfColumns(const ContextPtr & context)
 {
-    return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format, context);
+    return format != "auto" && FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(format, context);
+}
+
+NameSet ITableFunctionFileLike::getVirtualsToCheckBeforeUsingStructureHint() const
+{
+    return VirtualColumnUtils::getVirtualNamesForFileLikeStorage();
 }
 
 void ITableFunctionFileLike::parseArguments(const ASTPtr & ast_function, ContextPtr context)
@@ -63,7 +69,10 @@ void ITableFunctionFileLike::parseArgumentsImpl(ASTs & args, const ContextPtr &
         format = checkAndGetLiteralArgument<String>(args[1], "format");
 
     if (format == "auto")
-        format = getFormatFromFirstArgument();
+    {
+        if (auto format_from_first_argument = tryGetFormatFromFirstArgument())
+            format = *format_from_first_argument;
+    }
 
     if (args.size() > 2)
     {
@@ -79,34 +88,37 @@ void ITableFunctionFileLike::parseArgumentsImpl(ASTs & args, const ContextPtr &
         compression_method = checkAndGetLiteralArgument<String>(args[3], "compression_method");
 }
 
-void ITableFunctionFileLike::addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr &)
+void ITableFunctionFileLike::updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr & context)
 {
     if (args.empty() || args.size() > getMaxNumberOfArguments())
         throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 1 to {} arguments in table function, got {}", getMaxNumberOfArguments(), args.size());
 
+    auto format_literal = std::make_shared<ASTLiteral>(format);
     auto structure_literal = std::make_shared<ASTLiteral>(structure);
 
+    for (auto & arg : args)
+        arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
+
     /// f(filename)
     if (args.size() == 1)
     {
-        /// Add format=auto before structure argument.
-        args.push_back(std::make_shared<ASTLiteral>("auto"));
+        args.push_back(format_literal);
         args.push_back(structure_literal);
     }
     /// f(filename, format)
     else if (args.size() == 2)
     {
+        if (checkAndGetLiteralArgument<String>(args[1], "format") == "auto")
+            args.back() = format_literal;
         args.push_back(structure_literal);
     }
-    /// f(filename, format, 'auto')
-    else if (args.size() == 3)
+    /// f(filename, format, structure) or f(filename, format, structure, compression)
+    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;
+        if (checkAndGetLiteralArgument<String>(args[1], "format") == "auto")
+            args[1] = format_literal;
+        if (checkAndGetLiteralArgument<String>(args[2], "structure") == "auto")
+            args[2] = structure_literal;
     }
 }
 
diff --git a/src/TableFunctions/ITableFunctionFileLike.h b/src/TableFunctions/ITableFunctionFileLike.h
index 5fe86587797..ba1b7d2bb3f 100644
--- a/src/TableFunctions/ITableFunctionFileLike.h
+++ b/src/TableFunctions/ITableFunctionFileLike.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <TableFunctions/ITableFunction.h>
+#include "Core/Names.h"
 #include "Parsers/IAST_fwd.h"
 
 namespace DB
@@ -29,9 +30,11 @@ public:
 
     bool supportsReadingSubsetOfColumns(const ContextPtr & context) override;
 
+    NameSet getVirtualsToCheckBeforeUsingStructureHint() const override;
+
     static size_t getMaxNumberOfArguments() { return 4; }
 
-    static void addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr &);
+    static void updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr &);
 
 protected:
 
@@ -39,10 +42,9 @@ protected:
     virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context);
 
     virtual void parseFirstArguments(const ASTPtr & arg, const ContextPtr & context);
-    virtual String getFormatFromFirstArgument();
+    virtual std::optional<String> tryGetFormatFromFirstArgument();
 
     String filename;
-    String path_to_archive;
     String format = "auto";
     String structure = "auto";
     String compression_method = "auto";
diff --git a/src/TableFunctions/ITableFunctionXDBC.cpp b/src/TableFunctions/ITableFunctionXDBC.cpp
index ca6d40a05a3..a5c16b3a5aa 100644
--- a/src/TableFunctions/ITableFunctionXDBC.cpp
+++ b/src/TableFunctions/ITableFunctionXDBC.cpp
@@ -153,17 +153,16 @@ ColumnsDescription ITableFunctionXDBC::getActualTableStructure(ContextPtr contex
     columns_info_uri.addQueryParameter("external_table_functions_use_nulls", toString(use_nulls));
 
     Poco::Net::HTTPBasicCredentials credentials{};
-    ReadWriteBufferFromHTTP buf(
-        columns_info_uri,
-        Poco::Net::HTTPRequest::HTTP_POST,
-        {},
-        ConnectionTimeouts::getHTTPTimeouts(
-            context->getSettingsRef(),
-            context->getServerSettings().keep_alive_timeout),
-        credentials);
+    auto buf = BuilderRWBufferFromHTTP(columns_info_uri)
+                   .withConnectionGroup(HTTPConnectionGroupType::STORAGE)
+                   .withMethod(Poco::Net::HTTPRequest::HTTP_POST)
+                   .withTimeouts(ConnectionTimeouts::getHTTPTimeouts(
+                        context->getSettingsRef(),
+                        context->getServerSettings().keep_alive_timeout))
+                   .create(credentials);
 
     std::string columns_info;
-    readStringBinary(columns_info, buf);
+    readStringBinary(columns_info, *buf);
     NamesAndTypesList columns = NamesAndTypesList::parse(columns_info);
 
     return ColumnsDescription{columns};
diff --git a/src/TableFunctions/TableFunctionAzureBlobStorage.cpp b/src/TableFunctions/TableFunctionAzureBlobStorage.cpp
index d394c836369..275cd2a9cbb 100644
--- a/src/TableFunctions/TableFunctionAzureBlobStorage.cpp
+++ b/src/TableFunctions/TableFunctionAzureBlobStorage.cpp
@@ -16,6 +16,7 @@
 #include <Storages/StorageAzureBlob.h>
 #include <Storages/StorageURL.h>
 #include <Storages/NamedCollectionsHelpers.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Formats/FormatFactory.h>
 #include "registerTableFunctions.h"
 #include <Disks/ObjectStorages/AzureBlobStorage/AzureObjectStorage.h>
@@ -58,7 +59,7 @@ void TableFunctionAzureBlobStorage::parseArgumentsImpl(ASTs & engine_args, const
         configuration.blobs_paths = {configuration.blob_path};
 
         if (configuration.format == "auto")
-            configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
+            configuration.format = FormatFactory::instance().tryGetFormatFromFileName(configuration.blob_path).value_or("auto");
     }
     else
     {
@@ -80,7 +81,7 @@ void TableFunctionAzureBlobStorage::parseArgumentsImpl(ASTs & engine_args, const
         configuration.blob_path = checkAndGetLiteralArgument<String>(engine_args[2], "blobpath");
 
         auto is_format_arg
-            = [](const std::string & s) -> bool { return s == "auto" || FormatFactory::instance().getAllFormats().contains(s); };
+            = [](const std::string & s) -> bool { return s == "auto" || FormatFactory::instance().exists(s); };
 
         if (engine_args.size() == 4)
         {
@@ -155,7 +156,7 @@ void TableFunctionAzureBlobStorage::parseArgumentsImpl(ASTs & engine_args, const
         configuration.blobs_paths = {configuration.blob_path};
 
         if (configuration.format == "auto")
-            configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
+            configuration.format = FormatFactory::instance().tryGetFormatFromFileName(configuration.blob_path).value_or("auto");
     }
 }
 
@@ -174,15 +175,24 @@ void TableFunctionAzureBlobStorage::parseArguments(const ASTPtr & ast_function,
     parseArgumentsImpl(args, context);
 }
 
-void TableFunctionAzureBlobStorage::addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context)
+void TableFunctionAzureBlobStorage::updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr & context)
 {
-    if (tryGetNamedCollectionWithOverrides(args, context))
+    if (auto collection = 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);
+        /// In case of named collection, just add key-value pairs "format='...', structure='...'"
+        /// at the end of arguments to override existed format and structure with "auto" values.
+        if (collection->getOrDefault<String>("format", "auto") == "auto")
+        {
+            ASTs format_equal_func_args = {std::make_shared<ASTIdentifier>("format"), std::make_shared<ASTLiteral>(format)};
+            auto format_equal_func = makeASTFunction("equals", std::move(format_equal_func_args));
+            args.push_back(format_equal_func);
+        }
+        if (collection->getOrDefault<String>("structure", "auto") == "auto")
+        {
+            ASTs structure_equal_func_args = {std::make_shared<ASTIdentifier>("structure"), std::make_shared<ASTLiteral>(structure)};
+            auto structure_equal_func = makeASTFunction("equals", std::move(structure_equal_func_args));
+            args.push_back(structure_equal_func);
+        }
     }
     else
     {
@@ -191,65 +201,126 @@ void TableFunctionAzureBlobStorage::addColumnsStructureToArguments(ASTs & args,
                             "Storage Azure requires 3 to 7 arguments: "
                             "AzureBlobStorage(connection_string|storage_account_url, container_name, blobpath, [account_name, account_key, format, compression, structure])");
 
+        auto format_literal = std::make_shared<ASTLiteral>(format);
         auto structure_literal = std::make_shared<ASTLiteral>(structure);
 
+        for (auto & arg : args)
+            arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
+
         auto is_format_arg
-            = [](const std::string & s) -> bool { return s == "auto" || FormatFactory::instance().getAllFormats().contains(s); };
-
+            = [](const std::string & s) -> bool { return s == "auto" || FormatFactory::instance().exists(s); };
 
+        /// (connection_string, container_name, blobpath)
         if (args.size() == 3)
         {
-            /// Add format=auto & compression=auto before structure argument.
-            args.push_back(std::make_shared<ASTLiteral>("auto"));
+            args.push_back(format_literal);
+            /// Add compression = "auto" before structure argument.
             args.push_back(std::make_shared<ASTLiteral>("auto"));
             args.push_back(structure_literal);
         }
+        /// (connection_string, container_name, blobpath, structure) or
+        /// (connection_string, container_name, blobpath, format)
+        /// We can distinguish them by looking at the 4-th argument: check if it's format name or not.
         else if (args.size() == 4)
         {
             auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/account_name/structure");
+            /// (..., format) -> (..., format, compression, structure)
             if (is_format_arg(fourth_arg))
             {
+                if (fourth_arg == "auto")
+                    args[3] = format_literal;
                 /// Add compression=auto before structure argument.
                 args.push_back(std::make_shared<ASTLiteral>("auto"));
                 args.push_back(structure_literal);
             }
+            /// (..., structure) -> (..., format, compression, structure)
             else
             {
-                args.back() = structure_literal;
+                auto structure_arg = args.back();
+                args[3] = format_literal;
+                /// Add compression=auto before structure argument.
+                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                if (fourth_arg == "auto")
+                    args.push_back(structure_literal);
+                else
+                    args.push_back(structure_arg);
             }
         }
+        /// (connection_string, container_name, blobpath, format, compression) or
+        /// (storage_account_url, container_name, blobpath, account_name, account_key)
+        /// We can distinguish them by looking at the 4-th argument: check if it's format name or not.
         else if (args.size() == 5)
         {
             auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/account_name");
-            if (!is_format_arg(fourth_arg))
+            /// (..., format, compression) -> (..., format, compression, structure)
+            if (is_format_arg(fourth_arg))
             {
-                /// Add format=auto & compression=auto before structure argument.
-                args.push_back(std::make_shared<ASTLiteral>("auto"));
-                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                if (fourth_arg == "auto")
+                    args[3] = format_literal;
+                args.push_back(structure_literal);
             }
-            args.push_back(structure_literal);
-        }
-        else if (args.size() == 6)
-        {
-            auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/account_name");
-            if (!is_format_arg(fourth_arg))
+            /// (..., account_name, account_key) -> (..., account_name, account_key, format, compression, structure)
+            else
             {
+                args.push_back(format_literal);
                 /// Add compression=auto before structure argument.
                 args.push_back(std::make_shared<ASTLiteral>("auto"));
                 args.push_back(structure_literal);
             }
+        }
+        /// (connection_string, container_name, blobpath, format, compression, structure) or
+        /// (storage_account_url, container_name, blobpath, account_name, account_key, structure) or
+        /// (storage_account_url, container_name, blobpath, account_name, account_key, format)
+        else if (args.size() == 6)
+        {
+            auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/account_name");
+            auto sixth_arg = checkAndGetLiteralArgument<String>(args[5], "format/structure");
+
+            /// (..., format, compression, structure)
+            if (is_format_arg(fourth_arg))
+            {
+                if (fourth_arg == "auto")
+                    args[3] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[5], "structure") == "auto")
+                    args[5] = structure_literal;
+            }
+            /// (..., account_name, account_key, format) -> (..., account_name, account_key, format, compression, structure)
+            else if (is_format_arg(sixth_arg))
+            {
+                if (sixth_arg == "auto")
+                    args[5] = format_literal;
+                /// Add compression=auto before structure argument.
+                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                args.push_back(structure_literal);
+            }
+            /// (..., account_name, account_key, structure) -> (..., account_name, account_key, format, compression, structure)
             else
             {
-                args.back() = structure_literal;
+                auto structure_arg = args.back();
+                args[5] = format_literal;
+                /// Add compression=auto before structure argument.
+                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                if (sixth_arg == "auto")
+                    args.push_back(structure_literal);
+                else
+                    args.push_back(structure_arg);
             }
         }
+        /// (storage_account_url, container_name, blobpath, account_name, account_key, format, compression)
         else if (args.size() == 7)
         {
+            /// (..., format, compression) -> (..., format, compression, structure)
+            if (checkAndGetLiteralArgument<String>(args[5], "format") == "auto")
+                args[5] = format_literal;
             args.push_back(structure_literal);
         }
+        /// (storage_account_url, container_name, blobpath, account_name, account_key, format, compression, structure)
         else if (args.size() == 8)
         {
-            args.back() = structure_literal;
+            if (checkAndGetLiteralArgument<String>(args[5], "format") == "auto")
+                args[5] = format_literal;
+            if (checkAndGetLiteralArgument<String>(args[7], "structure") == "auto")
+                args[7] = structure_literal;
         }
     }
 }
@@ -262,8 +333,10 @@ ColumnsDescription TableFunctionAzureBlobStorage::getActualTableStructure(Contex
         auto client = StorageAzureBlob::createClient(configuration, !is_insert_query);
         auto settings = StorageAzureBlob::createSettings(context);
 
-        auto object_storage = std::make_unique<AzureObjectStorage>("AzureBlobStorageTableFunction", std::move(client), std::move(settings));
-        return StorageAzureBlob::getTableStructureFromData(object_storage.get(), configuration, std::nullopt, context, false);
+        auto object_storage = std::make_unique<AzureObjectStorage>("AzureBlobStorageTableFunction", std::move(client), std::move(settings), configuration.container);
+        if (configuration.format == "auto")
+            return StorageAzureBlob::getTableStructureAndFormatFromData(object_storage.get(), configuration, std::nullopt, context).first;
+        return StorageAzureBlob::getTableStructureFromData(object_storage.get(), configuration, std::nullopt, context);
     }
 
     return parseColumnsListFromString(configuration.structure, context);
@@ -276,8 +349,7 @@ bool TableFunctionAzureBlobStorage::supportsReadingSubsetOfColumns(const Context
 
 std::unordered_set<String> TableFunctionAzureBlobStorage::getVirtualsToCheckBeforeUsingStructureHint() const
 {
-    auto virtual_column_names = StorageAzureBlob::getVirtualColumnNames();
-    return {virtual_column_names.begin(), virtual_column_names.end()};
+    return VirtualColumnUtils::getVirtualNamesForFileLikeStorage();
 }
 
 StoragePtr TableFunctionAzureBlobStorage::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/, bool is_insert_query) const
@@ -293,7 +365,7 @@ StoragePtr TableFunctionAzureBlobStorage::executeImpl(const ASTPtr & /*ast_funct
 
     StoragePtr storage = std::make_shared<StorageAzureBlob>(
         configuration,
-        std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings)),
+        std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings), configuration.container),
         context,
         StorageID(getDatabaseName(), table_name),
         columns,
diff --git a/src/TableFunctions/TableFunctionAzureBlobStorage.h b/src/TableFunctions/TableFunctionAzureBlobStorage.h
index 1a221f60c55..9622881b417 100644
--- a/src/TableFunctions/TableFunctionAzureBlobStorage.h
+++ b/src/TableFunctions/TableFunctionAzureBlobStorage.h
@@ -55,7 +55,7 @@ public:
 
     virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context);
 
-    static void addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context);
+    static void updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr & context);
 
 protected:
 
diff --git a/src/TableFunctions/TableFunctionAzureBlobStorageCluster.cpp b/src/TableFunctions/TableFunctionAzureBlobStorageCluster.cpp
index eee585967c2..04dddca7672 100644
--- a/src/TableFunctions/TableFunctionAzureBlobStorageCluster.cpp
+++ b/src/TableFunctions/TableFunctionAzureBlobStorageCluster.cpp
@@ -21,9 +21,8 @@ StoragePtr TableFunctionAzureBlobStorageCluster::executeImpl(
 {
     StoragePtr storage;
     ColumnsDescription columns;
-    bool structure_argument_was_provided = configuration.structure != "auto";
 
-    if (structure_argument_was_provided)
+    if (configuration.structure != "auto")
     {
         columns = parseColumnsListFromString(configuration.structure, context);
     }
@@ -40,7 +39,7 @@ StoragePtr TableFunctionAzureBlobStorageCluster::executeImpl(
         /// On worker node this filename won't contains globs
         storage = std::make_shared<StorageAzureBlob>(
             configuration,
-            std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings)),
+            std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings), configuration.container),
             context,
             StorageID(getDatabaseName(), table_name),
             columns,
@@ -55,12 +54,11 @@ StoragePtr TableFunctionAzureBlobStorageCluster::executeImpl(
         storage = std::make_shared<StorageAzureBlobCluster>(
             cluster_name,
             configuration,
-            std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings)),
+            std::make_unique<AzureObjectStorage>(table_name, std::move(client), std::move(settings), configuration.container),
             StorageID(getDatabaseName(), table_name),
             columns,
             ConstraintsDescription{},
-            context,
-            structure_argument_was_provided);
+            context);
     }
 
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionExecutable.cpp b/src/TableFunctions/TableFunctionExecutable.cpp
index 209446dc9dd..2c3802e8667 100644
--- a/src/TableFunctions/TableFunctionExecutable.cpp
+++ b/src/TableFunctions/TableFunctionExecutable.cpp
@@ -71,12 +71,12 @@ std::vector<size_t> TableFunctionExecutable::skipAnalysisForArguments(const Quer
     const auto & table_function_node_arguments = table_function_node.getArguments().getNodes();
     size_t table_function_node_arguments_size = table_function_node_arguments.size();
 
-    if (table_function_node_arguments_size <= 3)
+    if (table_function_node_arguments_size <= 2)
         return {};
 
     std::vector<size_t> result_indexes;
-    result_indexes.reserve(table_function_node_arguments_size - 3);
-    for (size_t i = 3; i < table_function_node_arguments_size; ++i)
+    result_indexes.reserve(table_function_node_arguments_size - 2);
+    for (size_t i = 2; i < table_function_node_arguments_size; ++i)
         result_indexes.push_back(i);
 
     return result_indexes;
diff --git a/src/TableFunctions/TableFunctionExplain.cpp b/src/TableFunctions/TableFunctionExplain.cpp
index f993a9820cb..df2835dd630 100644
--- a/src/TableFunctions/TableFunctionExplain.cpp
+++ b/src/TableFunctions/TableFunctionExplain.cpp
@@ -1,4 +1,5 @@
 #include <Parsers/ASTFunction.h>
+#include <Parsers/ASTSubquery.h>
 #include <Parsers/ASTSelectWithUnionQuery.h>
 #include <Parsers/ParserSetQuery.h>
 #include <Parsers/parseQuery.h>
@@ -21,6 +22,7 @@ namespace ErrorCodes
 {
     extern const int LOGICAL_ERROR;
     extern const int BAD_ARGUMENTS;
+    extern const int UNEXPECTED_AST_STRUCTURE;
 }
 
 namespace
@@ -61,7 +63,7 @@ std::vector<size_t> TableFunctionExplain::skipAnalysisForArguments(const QueryTr
     return {};
 }
 
-void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPtr /*context*/)
+void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPtr context)
 {
     const auto * function = ast_function->as<ASTFunction>();
     if (!function || !function->arguments)
@@ -92,22 +94,36 @@ void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPt
     const auto & settings_str = settings_arg->value.get<String>();
     if (!settings_str.empty())
     {
-        constexpr UInt64 max_size = 4096;
-        constexpr UInt64 max_depth = 16;
+        const Settings & settings = context->getSettingsRef();
 
         /// parse_only_internals_ = true - we don't want to parse `SET` keyword
         ParserSetQuery settings_parser(/* parse_only_internals_ = */ true);
-        ASTPtr settings_ast = parseQuery(settings_parser, settings_str, max_size, max_depth);
+        ASTPtr settings_ast = parseQuery(settings_parser, settings_str,
+            settings.max_query_size, settings.max_parser_depth, settings.max_parser_backtracks);
         explain_query->setSettings(std::move(settings_ast));
     }
 
     if (function->arguments->children.size() > 2)
     {
-        const auto & query_arg = function->arguments->children[2];
+        const auto & subquery_arg = function->arguments->children[2];
+        const auto * subquery = subquery_arg->as<ASTSubquery>();
+
+        if (!subquery)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Table function '{}' requires a subquery argument, got '{}'",
+                getName(), queryToString(subquery_arg));
+
+        if (subquery->children.empty())
+            throw Exception(ErrorCodes::UNEXPECTED_AST_STRUCTURE,
+                "A subquery AST element must have a child");
+
+        const auto & query_arg = subquery->children[0];
+
         if (!query_arg->as<ASTSelectWithUnionQuery>())
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
-                "Table function '{}' requires a EXPLAIN SELECT query argument, got EXPLAIN '{}'",
+                "Table function '{}' requires a EXPLAIN's SELECT query argument, got '{}'",
                 getName(), queryToString(query_arg));
+
         explain_query->setExplainedQuery(query_arg);
     }
     else if (kind != ASTExplainQuery::ExplainKind::CurrentTransaction)
@@ -120,7 +136,7 @@ void TableFunctionExplain::parseArguments(const ASTPtr & ast_function, ContextPt
 
 ColumnsDescription TableFunctionExplain::getActualTableStructure(ContextPtr context, bool /*is_insert_query*/) const
 {
-    Block sample_block = getInterpreter(context).getSampleBlock(query->as<ASTExplainQuery>()->getKind());
+    Block sample_block = getInterpreter(context).getSampleBlock(query->as<ASTExplainQuery>()->getKind()); /// NOLINT(readability-static-accessed-through-instance)
     ColumnsDescription columns_description;
     for (const auto & column : sample_block.getColumnsWithTypeAndName())
         columns_description.add(ColumnDescription(column.name, column.type));
diff --git a/src/TableFunctions/TableFunctionFile.cpp b/src/TableFunctions/TableFunctionFile.cpp
index 8a9dde374ec..28bf72e07fb 100644
--- a/src/TableFunctions/TableFunctionFile.cpp
+++ b/src/TableFunctions/TableFunctionFile.cpp
@@ -54,12 +54,12 @@ void TableFunctionFile::parseFirstArguments(const ASTPtr & arg, const ContextPtr
         throw Exception(ErrorCodes::BAD_ARGUMENTS, "The first argument of table function '{}' mush be path or file descriptor", getName());
 }
 
-String TableFunctionFile::getFormatFromFirstArgument()
+std::optional<String> TableFunctionFile::tryGetFormatFromFirstArgument()
 {
     if (fd >= 0)
-        return FormatFactory::instance().getFormatFromFileDescriptor(fd);
+        return FormatFactory::instance().tryGetFormatFromFileDescriptor(fd);
     else
-        return FormatFactory::instance().getFormatFromFileName(filename, true);
+        return FormatFactory::instance().tryGetFormatFromFileName(filename);
 }
 
 StoragePtr TableFunctionFile::getStorage(const String & source,
@@ -104,19 +104,14 @@ ColumnsDescription TableFunctionFile::getActualTableStructure(ContextPtr context
             archive_info
                 = StorageFile::getArchiveInfo(path_to_archive, filename, context->getUserFilesPath(), context, total_bytes_to_read);
 
+        if (format == "auto")
+            return StorageFile::getTableStructureAndFormatFromFile(paths, compression_method, std::nullopt, context, archive_info).first;
         return StorageFile::getTableStructureFromFile(format, paths, compression_method, std::nullopt, context, archive_info);
     }
 
-
     return parseColumnsListFromString(structure, context);
 }
 
-std::unordered_set<String> TableFunctionFile::getVirtualsToCheckBeforeUsingStructureHint() const
-{
-    auto virtual_column_names = StorageFile::getVirtualColumnNames();
-    return {virtual_column_names.begin(), virtual_column_names.end()};
-}
-
 void registerTableFunctionFile(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionFile>();
diff --git a/src/TableFunctions/TableFunctionFile.h b/src/TableFunctions/TableFunctionFile.h
index 6eaab29db8a..aaf5ba8873a 100644
--- a/src/TableFunctions/TableFunctionFile.h
+++ b/src/TableFunctions/TableFunctionFile.h
@@ -22,12 +22,11 @@ public:
 
     ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
 
-    std::unordered_set<String> getVirtualsToCheckBeforeUsingStructureHint() const override;
-
 protected:
     int fd = -1;
+    String path_to_archive;
     void parseFirstArguments(const ASTPtr & arg, const ContextPtr & context) override;
-    String getFormatFromFirstArgument() override;
+    std::optional<String> tryGetFormatFromFirstArgument() override;
 
 private:
     StoragePtr getStorage(
diff --git a/src/TableFunctions/TableFunctionFileCluster.cpp b/src/TableFunctions/TableFunctionFileCluster.cpp
index 843909e2a58..3e53349b022 100644
--- a/src/TableFunctions/TableFunctionFileCluster.cpp
+++ b/src/TableFunctions/TableFunctionFileCluster.cpp
@@ -43,8 +43,7 @@ StoragePtr TableFunctionFileCluster::getStorage(
             compression_method,
             StorageID(getDatabaseName(), table_name),
             columns,
-            ConstraintsDescription{},
-            structure != "auto");
+            ConstraintsDescription{});
     }
 
     return storage;
diff --git a/src/TableFunctions/TableFunctionFormat.cpp b/src/TableFunctions/TableFunctionFormat.cpp
index 4b6d0f70c0a..ad2a142a140 100644
--- a/src/TableFunctions/TableFunctionFormat.cpp
+++ b/src/TableFunctions/TableFunctionFormat.cpp
@@ -33,7 +33,9 @@ namespace ErrorCodes
 namespace
 {
 
-/* format(format_name, data) - ...
+/* format(format_name, structure, data) - parses data according to the specified format and structure.
+ * format(format_name, data) - infers the schema from the data and parses it according to the specified format.
+ * format(data) - detects the format, infers the schema and parses data according to inferred format and structure.
  */
 class TableFunctionFormat : public ITableFunction
 {
@@ -49,11 +51,11 @@ private:
     ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
     void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
 
-    Block parseData(ColumnsDescription columns, ContextPtr context) const;
+    Block parseData(const ColumnsDescription & columns, const String & format_name, const ContextPtr & context) const;
 
-    String format;
-    String data;
+    String format = "auto";
     String structure = "auto";
+    String data;
 };
 
 void TableFunctionFormat::parseArguments(const ASTPtr & ast_function, ContextPtr context)
@@ -65,14 +67,15 @@ void TableFunctionFormat::parseArguments(const ASTPtr & ast_function, ContextPtr
 
     ASTs & args = args_func.at(0)->children;
 
-    if (args.size() != 2 && args.size() != 3)
-        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 2 or 3 arguments: format, [structure], data", getName());
+    if (args.empty() || args.size() > 3)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires from 1 to 3 arguments: [format, [structure]], data", getName());
 
     for (auto & arg : args)
         arg = evaluateConstantExpressionOrIdentifierAsLiteral(arg, context);
 
-    format = checkAndGetLiteralArgument<String>(args[0], "format");
     data = checkAndGetLiteralArgument<String>(args.back(), "data");
+    if (args.size() > 1)
+        format = checkAndGetLiteralArgument<String>(args[0], "format");
     if (args.size() == 3)
         structure = checkAndGetLiteralArgument<String>(args[1], "structure");
 }
@@ -82,19 +85,21 @@ ColumnsDescription TableFunctionFormat::getActualTableStructure(ContextPtr conte
     if (structure == "auto")
     {
         SingleReadBufferIterator read_buffer_iterator(std::make_unique<ReadBufferFromString>(data));
-        return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, false, context);
+        if (format == "auto")
+            return detectFormatAndReadSchema(std::nullopt, read_buffer_iterator, context).first;
+        return readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, context);
     }
     return parseColumnsListFromString(structure, context);
 }
 
-Block TableFunctionFormat::parseData(ColumnsDescription columns, ContextPtr context) const
+Block TableFunctionFormat::parseData(const ColumnsDescription & columns, const String & format_name, const ContextPtr & context) const
 {
     Block block;
     for (const auto & name_and_type : columns.getAllPhysical())
         block.insert({name_and_type.type->createColumn(), name_and_type.type, name_and_type.name});
 
     auto read_buf = std::make_unique<ReadBufferFromString>(data);
-    auto input_format = context->getInputFormat(format, *read_buf, block, context->getSettingsRef().max_block_size);
+    auto input_format = context->getInputFormat(format_name, *read_buf, block, context->getSettingsRef().max_block_size);
     QueryPipelineBuilder builder;
     builder.init(Pipe(input_format));
     if (columns.hasDefaults())
@@ -120,10 +125,24 @@ Block TableFunctionFormat::parseData(ColumnsDescription columns, ContextPtr cont
     return concatenateBlocks(blocks);
 }
 
-StoragePtr TableFunctionFormat::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/, bool is_insert_query) const
+StoragePtr TableFunctionFormat::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/, bool /*is_insert_query*/) const
 {
-    auto columns = getActualTableStructure(context, is_insert_query);
-    Block res_block = parseData(columns, context);
+    ColumnsDescription columns;
+    String format_name = format;
+    if (structure == "auto")
+    {
+        SingleReadBufferIterator read_buffer_iterator(std::make_unique<ReadBufferFromString>(data));
+        if (format_name == "auto")
+            std::tie(columns, format_name) = detectFormatAndReadSchema(std::nullopt, read_buffer_iterator, context);
+        else
+            columns = readSchemaFromFormat(format, std::nullopt, read_buffer_iterator, context);
+    }
+    else
+    {
+        columns = parseColumnsListFromString(structure, context);
+    }
+
+    Block res_block = parseData(columns, format_name, context);
     auto res = std::make_shared<StorageValues>(StorageID(getDatabaseName(), table_name), columns, res_block);
     res->startup();
     return res;
diff --git a/src/TableFunctions/TableFunctionGenerateRandom.cpp b/src/TableFunctions/TableFunctionGenerateRandom.cpp
index af284594987..15772562079 100644
--- a/src/TableFunctions/TableFunctionGenerateRandom.cpp
+++ b/src/TableFunctions/TableFunctionGenerateRandom.cpp
@@ -4,6 +4,7 @@
 #include <Storages/checkAndGetLiteralArgument.h>
 
 #include <Parsers/ASTExpressionList.h>
+#include <Parsers/ASTFunction.h>
 #include <Parsers/ASTLiteral.h>
 
 #include <TableFunctions/ITableFunction.h>
@@ -88,7 +89,11 @@ void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, Co
     // All the arguments must be literals.
     for (const auto & arg : args)
     {
-        if (!arg->as<const ASTLiteral>())
+        const IAST * arg_raw = arg.get();
+        if (const auto * func = arg_raw->as<const ASTFunction>(); func && func->name == "_CAST")
+            arg_raw = func->arguments->children.at(0).get();
+
+        if (!arg_raw->as<const ASTLiteral>())
         {
             throw Exception(ErrorCodes::BAD_ARGUMENTS,
                 "All arguments of table function '{}' except structure argument must be literals. "
@@ -107,7 +112,11 @@ void TableFunctionGenerateRandom::parseArguments(const ASTPtr & ast_function, Co
 
     if (args.size() >= arg_index + 1)
     {
-        const auto & literal = args[arg_index]->as<const ASTLiteral &>();
+        const IAST * arg_raw = args[arg_index].get();
+        if (const auto * func = arg_raw->as<const ASTFunction>(); func && func->name == "_CAST")
+            arg_raw = func->arguments->children.at(0).get();
+
+        const auto & literal = arg_raw->as<const ASTLiteral &>();
         ++arg_index;
         if (!literal.value.isNull())
             random_seed = checkAndGetLiteralArgument<UInt64>(literal, "random_seed");
diff --git a/src/TableFunctions/TableFunctionGenerateSeries.cpp b/src/TableFunctions/TableFunctionGenerateSeries.cpp
new file mode 100644
index 00000000000..ee833250d0b
--- /dev/null
+++ b/src/TableFunctions/TableFunctionGenerateSeries.cpp
@@ -0,0 +1,118 @@
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTFunction.h>
+#include <Storages/System/StorageSystemNumbers.h>
+#include <TableFunctions/ITableFunction.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <Common/FieldVisitorToString.h>
+#include <Common/typeid_cast.h>
+#include "registerTableFunctions.h"
+
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+    extern const int INVALID_SETTING_VALUE;
+}
+
+namespace
+{
+
+constexpr std::array<const char *, 2> names = {"generate_series", "generateSeries"};
+
+template <size_t alias_num>
+class TableFunctionGenerateSeries : public ITableFunction
+{
+public:
+    static_assert(alias_num < names.size());
+    static constexpr auto name = names[alias_num];
+    std::string getName() const override { return name; }
+    bool hasStaticStructure() const override { return true; }
+
+private:
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns,
+        bool is_insert_query) const override;
+    const char * getStorageTypeName() const override { return "SystemNumbers"; }
+
+    UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
+
+    ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
+};
+
+template <size_t alias_num>
+ColumnsDescription TableFunctionGenerateSeries<alias_num>::getActualTableStructure(ContextPtr /*context*/, bool /*is_insert_query*/) const
+{
+    /// NOTE: https://bugs.llvm.org/show_bug.cgi?id=47418
+    return ColumnsDescription{{{"generate_series", std::make_shared<DataTypeUInt64>()}}};
+}
+
+template <size_t alias_num>
+StoragePtr TableFunctionGenerateSeries<alias_num>::executeImpl(
+    const ASTPtr & ast_function,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription /*cached_columns*/,
+    bool /*is_insert_query*/) const
+{
+    if (const auto * function = ast_function->as<ASTFunction>())
+    {
+        auto arguments = function->arguments->children;
+
+        if (arguments.size() != 2 && arguments.size() != 3)
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 'length' or 'offset, length'.", getName());
+
+        UInt64 start = evaluateArgument(context, arguments[0]);
+        UInt64 stop = evaluateArgument(context, arguments[1]);
+        UInt64 step = (arguments.size() == 3) ? evaluateArgument(context, arguments[2]) : UInt64{1};
+        if (step == UInt64{0})
+            throw Exception(ErrorCodes::INVALID_SETTING_VALUE, "Table function '{}' requires step to be a positive number", getName());
+        auto res = (start > stop)
+            ? std::make_shared<StorageSystemNumbers>(
+                StorageID(getDatabaseName(), table_name), false, std::string{"generate_series"}, 0, 0, 1)
+            : std::make_shared<StorageSystemNumbers>(
+                StorageID(getDatabaseName(), table_name), false, std::string{"generate_series"}, (stop - start) + 1, start, step);
+        res->startup();
+        return res;
+    }
+    throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 'limit' or 'offset, limit'.", getName());
+}
+
+template <size_t alias_num>
+UInt64 TableFunctionGenerateSeries<alias_num>::evaluateArgument(ContextPtr context, ASTPtr & argument) const
+{
+    const auto & [field, type] = evaluateConstantExpression(argument, context);
+
+    if (!isNativeNumber(type))
+        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "Illegal type {} expression, must be numeric type", type->getName());
+
+    Field converted = convertFieldToType(field, DataTypeUInt64());
+    if (converted.isNull())
+        throw Exception(
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+            "The value {} is not representable as UInt64",
+            applyVisitor(FieldVisitorToString(), field));
+
+    return converted.safeGet<UInt64>();
+}
+
+
+}
+
+void registerTableFunctionGenerateSeries(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionGenerateSeries<0>>({.documentation = {}, .allow_readonly = true});
+    factory.registerFunction<TableFunctionGenerateSeries<1>>({.documentation = {}, .allow_readonly = true});
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionHDFS.cpp b/src/TableFunctions/TableFunctionHDFS.cpp
index 8d48a7ba30e..45829245551 100644
--- a/src/TableFunctions/TableFunctionHDFS.cpp
+++ b/src/TableFunctions/TableFunctionHDFS.cpp
@@ -33,18 +33,14 @@ ColumnsDescription TableFunctionHDFS::getActualTableStructure(ContextPtr context
     if (structure == "auto")
     {
         context->checkAccess(getSourceAccessType());
+        if (format == "auto")
+            return StorageHDFS::getTableStructureAndFormatFromData(filename, compression_method, context).first;
         return StorageHDFS::getTableStructureFromData(format, filename, compression_method, context);
     }
 
     return parseColumnsListFromString(structure, context);
 }
 
-std::unordered_set<String> TableFunctionHDFS::getVirtualsToCheckBeforeUsingStructureHint() const
-{
-    auto virtual_column_names = StorageHDFS::getVirtualColumnNames();
-    return {virtual_column_names.begin(), virtual_column_names.end()};
-}
-
 void registerTableFunctionHDFS(TableFunctionFactory & factory)
 {
     factory.registerFunction<TableFunctionHDFS>();
diff --git a/src/TableFunctions/TableFunctionHDFS.h b/src/TableFunctions/TableFunctionHDFS.h
index 3a719496b26..f1c0b8a7eae 100644
--- a/src/TableFunctions/TableFunctionHDFS.h
+++ b/src/TableFunctions/TableFunctionHDFS.h
@@ -36,8 +36,6 @@ public:
 
     ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
 
-    std::unordered_set<String> getVirtualsToCheckBeforeUsingStructureHint() const override;
-
 private:
     StoragePtr getStorage(
         const String & source, const String & format_, const ColumnsDescription & columns, ContextPtr global_context,
diff --git a/src/TableFunctions/TableFunctionHDFSCluster.cpp b/src/TableFunctions/TableFunctionHDFSCluster.cpp
index 6fb7ed0fce5..57ce6d2b9ff 100644
--- a/src/TableFunctions/TableFunctionHDFSCluster.cpp
+++ b/src/TableFunctions/TableFunctionHDFSCluster.cpp
@@ -45,8 +45,7 @@ StoragePtr TableFunctionHDFSCluster::getStorage(
             format,
             columns,
             ConstraintsDescription{},
-            compression_method,
-            structure != "auto");
+            compression_method);
     }
     return storage;
 }
diff --git a/src/TableFunctions/TableFunctionMerge.cpp b/src/TableFunctions/TableFunctionMerge.cpp
index e7b5a34958f..13b5c167e0e 100644
--- a/src/TableFunctions/TableFunctionMerge.cpp
+++ b/src/TableFunctions/TableFunctionMerge.cpp
@@ -8,6 +8,7 @@
 #include <Analyzer/TableFunctionNode.h>
 #include <Interpreters/evaluateConstantExpression.h>
 #include <Interpreters/Context.h>
+#include <Interpreters/DatabaseCatalog.h>
 #include <Access/ContextAccess.h>
 #include <TableFunctions/TableFunctionFactory.h>
 #include <TableFunctions/registerTableFunctions.h>
@@ -88,26 +89,38 @@ void TableFunctionMerge::parseArguments(const ASTPtr & ast_function, ContextPtr
 
     if (args_func.size() != 1)
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Table function 'merge' requires exactly 2 arguments - name "
-                        "of source database and regexp for table names.");
+                        "Table function 'merge' requires from 1 to 2 parameters: "
+                        "merge(['db_name',] 'tables_regexp')");
 
     ASTs & args = args_func.at(0)->children;
 
-    if (args.size() != 2)
+    if (args.size() == 1)
+    {
+        database_is_regexp = false;
+        source_database_name_or_regexp = context->getCurrentDatabase();
+
+        args[0] = evaluateConstantExpressionAsLiteral(args[0], context);
+        source_table_regexp = checkAndGetLiteralArgument<String>(args[0], "table_name_regexp");
+    }
+    else if (args.size() == 2)
+    {
+        auto [is_regexp, database_ast] = StorageMerge::evaluateDatabaseName(args[0], context);
+
+        database_is_regexp = is_regexp;
+
+        if (!is_regexp)
+            args[0] = database_ast;
+        source_database_name_or_regexp = checkAndGetLiteralArgument<String>(database_ast, "database_name");
+
+        args[1] = evaluateConstantExpressionAsLiteral(args[1], context);
+        source_table_regexp = checkAndGetLiteralArgument<String>(args[1], "table_name_regexp");
+    }
+    else
+    {
         throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
-                        "Table function 'merge' requires exactly 2 arguments - name "
-                        "of source database and regexp for table names.");
-
-    auto [is_regexp, database_ast] = StorageMerge::evaluateDatabaseName(args[0], context);
-
-    database_is_regexp = is_regexp;
-
-    if (!is_regexp)
-        args[0] = database_ast;
-    source_database_name_or_regexp = checkAndGetLiteralArgument<String>(database_ast, "database_name");
-
-    args[1] = evaluateConstantExpressionAsLiteral(args[1], context);
-    source_table_regexp = checkAndGetLiteralArgument<String>(args[1], "table_name_regexp");
+                        "Table function 'merge' requires from 1 to 2 parameters: "
+                        "merge(['db_name',] 'tables_regexp')");
+    }
 }
 
 
diff --git a/src/TableFunctions/TableFunctionMergeTreeIndex.cpp b/src/TableFunctions/TableFunctionMergeTreeIndex.cpp
new file mode 100644
index 00000000000..06a48f0e25f
--- /dev/null
+++ b/src/TableFunctions/TableFunctionMergeTreeIndex.cpp
@@ -0,0 +1,206 @@
+#include <Storages/StorageMergeTreeIndex.h>
+#include <TableFunctions/ITableFunction.h>
+#include <Interpreters/DatabaseCatalog.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Storages/checkAndGetLiteralArgument.h>
+#include <TableFunctions/TableFunctionFactory.h>
+#include <DataTypes/DataTypeTuple.h>
+#include <DataTypes/NestedUtils.h>
+#include <DataTypes/DataTypeNullable.h>
+#include <Storages/NamedCollectionsHelpers.h>
+#include <Common/escapeForFileName.h>
+
+#include <boost/range/adaptor/map.hpp>
+
+namespace DB
+{
+
+namespace ErrorCodes
+{
+    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+    extern const int BAD_ARGUMENTS;
+    extern const int LOGICAL_ERROR;
+}
+
+class TableFunctionMergeTreeIndex : public ITableFunction
+{
+public:
+    static constexpr auto name = "mergeTreeIndex";
+    std::string getName() const override { return name; }
+
+    void parseArguments(const ASTPtr & ast_function, ContextPtr context) override;
+    ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
+
+private:
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns,
+        bool is_insert_query) const override;
+
+    const char * getStorageTypeName() const override { return "MergeTreeIndex"; }
+
+    StorageID source_table_id{StorageID::createEmpty()};
+    bool with_marks = false;
+};
+
+void TableFunctionMergeTreeIndex::parseArguments(const ASTPtr & ast_function, ContextPtr context)
+{
+    ASTs & args_func = ast_function->children;
+    if (args_func.size() != 1)
+        throw Exception(ErrorCodes::LOGICAL_ERROR, "Table function ({}) must have arguments.", quoteString(getName()));
+
+    ASTs & args = args_func.at(0)->children;
+    if (args.size() < 2 || args.size() > 3)
+        throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH,
+            "Table function '{}' must have 2 or 3 arguments, got: {}", getName(), args.size());
+
+    args[0] = evaluateConstantExpressionForDatabaseName(args[0], context);
+    args[1] = evaluateConstantExpressionOrIdentifierAsLiteral(args[1], context);
+
+    auto database = checkAndGetLiteralArgument<String>(args[0], "database");
+    auto table = checkAndGetLiteralArgument<String>(args[1], "table");
+
+    ASTs rest_args(args.begin() + 2, args.end());
+    if (!rest_args.empty())
+    {
+        auto params = getParamsMapFromAST(rest_args, context);
+        auto param = params.extract("with_marks");
+
+        if (!param.empty())
+        {
+            auto & value = param.mapped();
+            if (value.getType() != Field::Types::Bool && value.getType() != Field::Types::UInt64)
+                throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                    "Table function '{}' expected bool flag for 'with_marks' argument", getName());
+
+            if (value.getType() == Field::Types::Bool)
+                with_marks = value.get<bool>();
+            else
+                with_marks = value.get<UInt64>();
+        }
+
+        if (!params.empty())
+        {
+            throw Exception(ErrorCodes::BAD_ARGUMENTS,
+                "Unexpected arguments '{}' for table function '{}'",
+                fmt::join(params | boost::adaptors::map_keys, ","), getName());
+        }
+    }
+
+    source_table_id = StorageID{database, table};
+}
+
+static NameSet getAllPossibleStreamNames(
+    const NameAndTypePair & column,
+    const MergeTreeDataPartsVector & data_parts)
+{
+    NameSet all_streams;
+
+    /// Add the stream with the name of column
+    /// because it may be abcent in serialization streams (e.g. for Tuple type)
+    /// but in compact parts we write only marks for whole columns, not subsubcolumns.
+    auto main_stream_name = escapeForFileName(column.name);
+    all_streams.insert(Nested::concatenateName(main_stream_name, "mark"));
+
+    auto callback = [&](const auto & substream_path)
+    {
+        auto stream_name = ISerialization::getFileNameForStream(column, substream_path);
+        all_streams.insert(Nested::concatenateName(stream_name, "mark"));
+    };
+
+    auto serialization = IDataType::getSerialization(column);
+    serialization->enumerateStreams(callback);
+
+    if (!column.type->supportsSparseSerialization())
+        return all_streams;
+
+    /// If there is at least one part with sparse serialization
+    /// add columns with marks of its substreams to the table.
+    for (const auto & part : data_parts)
+    {
+        serialization = part->tryGetSerialization(column.name);
+        if (serialization && serialization->getKind() == ISerialization::Kind::SPARSE)
+        {
+            serialization->enumerateStreams(callback);
+            break;
+        }
+    }
+
+    return all_streams;
+}
+
+ColumnsDescription TableFunctionMergeTreeIndex::getActualTableStructure(ContextPtr context, bool /*is_insert_query*/) const
+{
+    auto source_table = DatabaseCatalog::instance().getTable(source_table_id, context);
+    auto metadata_snapshot = source_table->getInMemoryMetadataPtr();
+
+    ColumnsDescription columns;
+    for (const auto & column : StorageMergeTreeIndex::virtuals_sample_block)
+        columns.add({column.name, column.type});
+
+    for (const auto & column : metadata_snapshot->getPrimaryKey().sample_block)
+        columns.add({column.name, column.type});
+
+    if (with_marks)
+    {
+        auto element_type = std::make_shared<DataTypeNullable>(std::make_shared<DataTypeUInt64>());
+        auto mark_type = std::make_shared<DataTypeTuple>(
+            DataTypes{element_type, element_type},
+            Names{"offset_in_compressed_file", "offset_in_decompressed_block"});
+
+        const auto * merge_tree = dynamic_cast<const MergeTreeData *>(source_table.get());
+        if (!merge_tree)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function mergeTreeIndex expected MergeTree table, got: {}", source_table->getName());
+
+        auto data_parts = merge_tree->getDataPartsVectorForInternalUsage();
+        auto columns_list = Nested::convertToSubcolumns(metadata_snapshot->getColumns().getAllPhysical());
+
+        for (const auto & column : columns_list)
+        {
+            auto all_streams = getAllPossibleStreamNames(column, data_parts);
+            for (const auto & stream_name : all_streams)
+            {
+                /// There may be shared substreams of columns (e.g. for Nested type)
+                if (!columns.has(stream_name))
+                    columns.add({stream_name, mark_type});
+            }
+        }
+    }
+
+    return columns;
+}
+
+StoragePtr TableFunctionMergeTreeIndex::executeImpl(
+    const ASTPtr & /*ast_function*/,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription /*cached_columns*/,
+    bool is_insert_query) const
+{
+    auto source_table = DatabaseCatalog::instance().getTable(source_table_id, context);
+    auto columns = getActualTableStructure(context, is_insert_query);
+
+    StorageID storage_id(getDatabaseName(), table_name);
+    auto res = std::make_shared<StorageMergeTreeIndex>(std::move(storage_id), std::move(source_table), std::move(columns), with_marks);
+
+    res->startup();
+    return res;
+}
+
+void registerTableFunctionMergeTreeIndex(TableFunctionFactory & factory)
+{
+    factory.registerFunction<TableFunctionMergeTreeIndex>(
+    {
+        .documentation =
+        {
+            .description = "Represents the contents of index and marks files of MergeTree tables. It can be used for introspection",
+            .examples = {{"mergeTreeIndex", "SELECT * FROM mergeTreeIndex(currentDatabase(), mt_table, with_marks = true)", ""}},
+            .categories = {"Other"},
+        },
+        .allow_readonly = true,
+    });
+}
+
+}
diff --git a/src/TableFunctions/TableFunctionNumbers.cpp b/src/TableFunctions/TableFunctionNumbers.cpp
index 262018f108c..16f56eab981 100644
--- a/src/TableFunctions/TableFunctionNumbers.cpp
+++ b/src/TableFunctions/TableFunctionNumbers.cpp
@@ -1,13 +1,15 @@
+#include <optional>
+#include <DataTypes/DataTypesNumber.h>
+#include <Interpreters/Context.h>
+#include <Interpreters/convertFieldToType.h>
+#include <Interpreters/evaluateConstantExpression.h>
+#include <Parsers/ASTFunction.h>
+#include <Storages/System/StorageSystemNumbers.h>
 #include <TableFunctions/ITableFunction.h>
 #include <TableFunctions/TableFunctionFactory.h>
-#include <Parsers/ASTFunction.h>
-#include <Common/typeid_cast.h>
 #include <Common/FieldVisitorToString.h>
-#include <Storages/System/StorageSystemNumbers.h>
-#include <Interpreters/evaluateConstantExpression.h>
-#include <Interpreters/convertFieldToType.h>
-#include <Interpreters/Context.h>
-#include <DataTypes/DataTypesNumber.h>
+#include <Common/typeid_cast.h>
+#include "base/types.h"
 #include "registerTableFunctions.h"
 
 
@@ -16,8 +18,9 @@ namespace DB
 
 namespace ErrorCodes
 {
-    extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
-    extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int NUMBER_OF_ARGUMENTS_DOESNT_MATCH;
+extern const int ILLEGAL_TYPE_OF_ARGUMENT;
+extern const int BAD_ARGUMENTS;
 }
 
 namespace
@@ -34,8 +37,14 @@ public:
     static constexpr auto name = multithreaded ? "numbers_mt" : "numbers";
     std::string getName() const override { return name; }
     bool hasStaticStructure() const override { return true; }
+
 private:
-    StoragePtr executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns, bool is_insert_query) const override;
+    StoragePtr executeImpl(
+        const ASTPtr & ast_function,
+        ContextPtr context,
+        const std::string & table_name,
+        ColumnsDescription cached_columns,
+        bool is_insert_query) const override;
     const char * getStorageTypeName() const override { return "SystemNumbers"; }
 
     UInt64 evaluateArgument(ContextPtr context, ASTPtr & argument) const;
@@ -51,19 +60,30 @@ ColumnsDescription TableFunctionNumbers<multithreaded>::getActualTableStructure(
 }
 
 template <bool multithreaded>
-StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(const ASTPtr & ast_function, ContextPtr context, const std::string & table_name, ColumnsDescription /*cached_columns*/, bool /*is_insert_query*/) const
+StoragePtr TableFunctionNumbers<multithreaded>::executeImpl(
+    const ASTPtr & ast_function,
+    ContextPtr context,
+    const std::string & table_name,
+    ColumnsDescription /*cached_columns*/,
+    bool /*is_insert_query*/) const
 {
     if (const auto * function = ast_function->as<ASTFunction>())
     {
         auto arguments = function->arguments->children;
 
-        if (arguments.size() != 1 && arguments.size() != 2)
-            throw Exception(ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 'length' or 'offset, length'.", getName());
+        if ((arguments.empty()) || (arguments.size() >= 4))
+            throw Exception(
+                ErrorCodes::NUMBER_OF_ARGUMENTS_DOESNT_MATCH, "Table function '{}' requires 'length' or 'offset, length'.", getName());
 
-        UInt64 offset = arguments.size() == 2 ? evaluateArgument(context, arguments[0]) : 0;
-        UInt64 length = arguments.size() == 2 ? evaluateArgument(context, arguments[1]) : evaluateArgument(context, arguments[0]);
+        UInt64 offset = arguments.size() >= 2 ? evaluateArgument(context, arguments[0]) : 0;
+        UInt64 length = arguments.size() >= 2 ? evaluateArgument(context, arguments[1]) : evaluateArgument(context, arguments[0]);
+        UInt64 step = arguments.size() == 3 ? evaluateArgument(context, arguments[2]) : 1;
 
-        auto res = std::make_shared<StorageSystemNumbers>(StorageID(getDatabaseName(), table_name), multithreaded, length, offset);
+        if (!step)
+            throw Exception(ErrorCodes::BAD_ARGUMENTS, "Table function {} requires step to be a positive number", getName());
+
+        auto res = std::make_shared<StorageSystemNumbers>(
+            StorageID(getDatabaseName(), table_name), multithreaded, std::string{"number"}, length, offset, step);
         res->startup();
         return res;
     }
@@ -80,8 +100,10 @@ UInt64 TableFunctionNumbers<multithreaded>::evaluateArgument(ContextPtr context,
 
     Field converted = convertFieldToType(field, DataTypeUInt64());
     if (converted.isNull())
-        throw Exception(ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT, "The value {} is not representable as UInt64",
-                        applyVisitor(FieldVisitorToString(), field));
+        throw Exception(
+            ErrorCodes::ILLEGAL_TYPE_OF_ARGUMENT,
+            "The value {} is not representable as UInt64",
+            applyVisitor(FieldVisitorToString(), field));
 
     return converted.safeGet<UInt64>();
 }
diff --git a/src/TableFunctions/TableFunctionRemote.cpp b/src/TableFunctions/TableFunctionRemote.cpp
index 1f42ce4ba30..d7774bb6478 100644
--- a/src/TableFunctions/TableFunctionRemote.cpp
+++ b/src/TableFunctions/TableFunctionRemote.cpp
@@ -317,7 +317,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, Con
             String{},
             String{},
             DistributedSettings{},
-            false,
+            LoadingStrictnessLevel::CREATE,
             cluster)
         : std::make_shared<StorageDistributed>(
             StorageID(getDatabaseName(), table_name),
@@ -332,7 +332,7 @@ StoragePtr TableFunctionRemote::executeImpl(const ASTPtr & /*ast_function*/, Con
             String{},
             String{},
             DistributedSettings{},
-            false,
+            LoadingStrictnessLevel::CREATE,
             cluster);
 
     res->startup();
diff --git a/src/TableFunctions/TableFunctionS3.cpp b/src/TableFunctions/TableFunctionS3.cpp
index c52256fb984..a8c100ebd44 100644
--- a/src/TableFunctions/TableFunctionS3.cpp
+++ b/src/TableFunctions/TableFunctionS3.cpp
@@ -16,6 +16,7 @@
 #include <Storages/StorageS3.h>
 #include <Storages/StorageURL.h>
 #include <Storages/NamedCollectionsHelpers.h>
+#include <Storages/VirtualColumnUtils.h>
 #include <Formats/FormatFactory.h>
 #include "registerTableFunctions.h"
 #include <Analyzer/FunctionNode.h>
@@ -61,29 +62,16 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
         if (configuration.format == "auto")
         {
             String file_path = named_collection->getOrDefault<String>("filename", Poco::URI(named_collection->get<String>("url")).getPath());
-            configuration.format = FormatFactory::instance().getFormatFromFileName(file_path, true);
+            configuration.format = FormatFactory::instance().tryGetFormatFromFileName(file_path).value_or("auto");
         }
     }
     else
     {
+        size_t count = StorageURL::evalArgsAndCollectHeaders(args, 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);
-
-        if (args.empty() || args.size() > 7)
+        if (count == 0 || count > 7)
             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);
-
-        /// Size -> argument indexes
-        static std::unordered_map<size_t, std::unordered_map<std::string_view, size_t>> size_to_args
-        {
-            {1, {{}}},
-            {7, {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}, {"structure", 5}, {"compression_method", 6}}}
-        };
-
         std::unordered_map<std::string_view, size_t> args_to_idx;
 
         bool no_sign_request = false;
@@ -92,7 +80,7 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
         /// - 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)
+        if (count == 2)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -102,10 +90,10 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
         }
         /// For 3 arguments we support 3 possible variants:
         /// - s3(source, format, structure)
-        /// - s3(source, access_key_id, access_key_id)
+        /// - s3(source, access_key_id, secret_access_key)
         /// - 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)
+        else if (count == 3)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -113,18 +101,18 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
                 no_sign_request = true;
                 args_to_idx = {{"format", 2}};
             }
-            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            else if (second_arg == "auto" || FormatFactory::instance().exists(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 4 possible variants:
         /// - s3(source, format, structure, compression_method),
-        /// - s3(source, access_key_id, access_key_id, format),
-        /// - s3(source, access_key_id, access_key_id, session_token)
+        /// - s3(source, access_key_id, secret_access_key, format),
+        /// - s3(source, access_key_id, secret_access_key, session_token)
         /// - s3(source, NOSIGN, format, structure)
         /// We can distinguish them by looking at the 2-nd and 4-th argument: check if it's a format name or not.
-        else if (args.size() == 4)
+        else if (count == 4)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/access_key_id/NOSIGN");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -132,14 +120,14 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
                 no_sign_request = true;
                 args_to_idx = {{"format", 2}, {"structure", 3}};
             }
-            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            else if (second_arg == "auto" || FormatFactory::instance().exists(second_arg))
             {
                 args_to_idx = {{"format", 1}, {"structure", 2}, {"compression_method", 3}};
             }
             else
             {
                 auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/session_token");
-                if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+                if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
                 {
                     args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}};
                 }
@@ -150,12 +138,12 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
             }
         }
         /// For 5 arguments we support 3 possible variants:
-        /// - s3(source, access_key_id, access_key_id, format, structure)
-        /// - s3(source, access_key_id, access_key_id, session_token, format)
+        /// - s3(source, access_key_id, secret_access_key, format, structure)
+        /// - s3(source, access_key_id, secret_access_key, session_token, format)
         /// - 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 no,
         /// and by the 4-th argument, check if it's a format name or not
-        else if (args.size() == 5)
+        else if (count == 5)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "NOSIGN/access_key_id");
             if (boost::iequals(second_arg, "NOSIGN"))
@@ -166,7 +154,7 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
             else
             {
                 auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/session_token");
-                if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+                if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
                 {
                     args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}};
                 }
@@ -177,13 +165,13 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
             }
         }
         // For 6 arguments we support 2 possible variants:
-        /// - s3(source, access_key_id, access_key_id, format, structure, compression_method)
-        /// - s3(source, access_key_id, access_key_id, session_token, format, structure)
+        /// - s3(source, access_key_id, secret_access_key, format, structure, compression_method)
+        /// - s3(source, access_key_id, secret_access_key, session_token, format, structure)
         /// We can distinguish them by looking at the 4-th argument: check if it's a format name or not
-        else if (args.size() == 6)
+        else if (count == 6)
         {
             auto fourth_arg = checkAndGetLiteralArgument<String>(args[3], "format/session_token");
-            if (fourth_arg == "auto" || FormatFactory::instance().getAllFormats().contains(fourth_arg))
+            if (fourth_arg == "auto" || FormatFactory::instance().exists(fourth_arg))
             {
                 args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"format", 3}, {"structure", 4}, {"compression_method", 5}};
             }
@@ -192,9 +180,9 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
                 args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}, {"structure", 5}};
             }
         }
-        else
+        else if (count == 7)
         {
-            args_to_idx = size_to_args[args.size()];
+            args_to_idx = {{"access_key_id", 1}, {"secret_access_key", 2}, {"session_token", 3}, {"format", 4}, {"structure", 5}, {"compression_method", 6}};
         }
 
         /// This argument is always the first
@@ -228,7 +216,7 @@ void TableFunctionS3::parseArgumentsImpl(ASTs & args, const ContextPtr & context
         configuration.auth_settings.no_sign_request = no_sign_request;
 
         if (configuration.format == "auto")
-            configuration.format = FormatFactory::instance().getFormatFromFileName(Poco::URI(url).getPath(), true);
+            configuration.format = FormatFactory::instance().tryGetFormatFromFileName(Poco::URI(url).getPath()).value_or("auto");
     }
 
     configuration.keys = {configuration.url.key};
@@ -250,116 +238,145 @@ void TableFunctionS3::parseArguments(const ASTPtr & ast_function, ContextPtr con
     parseArgumentsImpl(args, context);
 }
 
-void TableFunctionS3::addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context)
+void TableFunctionS3::updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr & context)
 {
-    if (tryGetNamedCollectionWithOverrides(args, context))
+    if (auto collection = 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);
+        /// In case of named collection, just add key-value pairs "format='...', structure='...'"
+        /// at the end of arguments to override existed format and structure with "auto" values.
+        if (collection->getOrDefault<String>("format", "auto") == "auto")
+        {
+            ASTs format_equal_func_args = {std::make_shared<ASTIdentifier>("format"), std::make_shared<ASTLiteral>(format)};
+            auto format_equal_func = makeASTFunction("equals", std::move(format_equal_func_args));
+            args.push_back(format_equal_func);
+        }
+        if (collection->getOrDefault<String>("structure", "auto") == "auto")
+        {
+            ASTs structure_equal_func_args = {std::make_shared<ASTIdentifier>("structure"), std::make_shared<ASTLiteral>(structure)};
+            auto structure_equal_func = makeASTFunction("equals", std::move(structure_equal_func_args));
+            args.push_back(structure_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);
-        }
+        size_t count = StorageURL::evalArgsAndCollectHeaders(args, tmp_headers, context);
 
-        if (args.empty() || args.size() > getMaxNumberOfArguments())
-            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 1 to {} arguments in table function, got {}", getMaxNumberOfArguments(), args.size());
+        if (count == 0 || count > getMaxNumberOfArguments())
+            throw Exception(ErrorCodes::LOGICAL_ERROR, "Expected 1 to {} arguments in table function, got {}", getMaxNumberOfArguments(), count);
 
+        auto format_literal = std::make_shared<ASTLiteral>(format);
         auto structure_literal = std::make_shared<ASTLiteral>(structure);
 
-        /// s3(s3_url)
-        if (args.size() == 1)
+        /// s3(s3_url) -> s3(s3_url, format, structure)
+        if (count == 1)
         {
-            /// Add format=auto before structure argument.
-            args.push_back(std::make_shared<ASTLiteral>("auto"));
+            args.push_back(format_literal);
             args.push_back(structure_literal);
         }
-        /// s3(s3_url, format) or s3(s3_url, NOSIGN)
+        /// s3(s3_url, format) -> s3(s3_url, format, structure) or
+        /// s3(s3_url, NOSIGN) -> s3(s3_url, NOSIGN, format, structure)
         /// We can distinguish them by looking at the 2-nd argument: check if it's NOSIGN or not.
-        else if (args.size() == 2)
+        else if (count == 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(format_literal);
+            else if (second_arg == "auto")
+                args.back() = format_literal;
             args.push_back(structure_literal);
         }
         /// s3(source, format, structure) or
-        /// s3(source, access_key_id, access_key_id) or
+        /// s3(source, access_key_id, secret_access_key) 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)
+        else if (count == 3)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            /// s3(source, NOSIGN, format) -> s3(source, NOSIGN, format, structure)
             if (boost::iequals(second_arg, "NOSIGN"))
             {
+                if (checkAndGetLiteralArgument<String>(args[2], "format") == "auto")
+                    args.back() = format_literal;
                 args.push_back(structure_literal);
             }
-            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            /// s3(source, format, structure)
+            else if (second_arg == "auto" || FormatFactory::instance().exists(second_arg))
             {
-                args.back() = structure_literal;
+                if (second_arg == "auto")
+                    args[1] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[2], "structure") == "auto")
+                    args[2] = structure_literal;
             }
+            /// s3(source, access_key_id, access_key_id) -> s3(source, access_key_id, access_key_id, format, structure)
             else
             {
-                /// Add format=auto before structure argument.
-                args.push_back(std::make_shared<ASTLiteral>("auto"));
+                args.push_back(format_literal);
                 args.push_back(structure_literal);
             }
         }
         /// s3(source, format, structure, compression_method) or
-        /// s3(source, access_key_id, access_key_id, format) or
+        /// s3(source, access_key_id, secret_access_key, 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)
+        else if (count == 4)
         {
             auto second_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            /// s3(source, NOSIGN, format, structure)
             if (boost::iequals(second_arg, "NOSIGN"))
             {
-                args.back() = structure_literal;
+                if (checkAndGetLiteralArgument<String>(args[2], "format") == "auto")
+                    args[2] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[3], "structure") == "auto")
+                    args[3] = structure_literal;
             }
-            else if (second_arg == "auto" || FormatFactory::instance().getAllFormats().contains(second_arg))
+            /// s3(source, format, structure, compression_method)
+            else if (second_arg == "auto" || FormatFactory::instance().exists(second_arg))
             {
-                args[args.size() - 2] = structure_literal;
+                if (second_arg == "auto")
+                    args[1] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[2], "structure") == "auto")
+                    args[2] = structure_literal;
             }
+            /// s3(source, access_key_id, access_key_id, format) -> s3(source, access_key_id, access_key_id, format, structure)
             else
             {
+                if (checkAndGetLiteralArgument<String>(args[3], "format") == "auto")
+                    args[3] = format_literal;
                 args.push_back(structure_literal);
             }
         }
-        /// s3(source, access_key_id, access_key_id, format, structure) or
+        /// s3(source, access_key_id, secret_access_key, 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)
+        else if (count == 5)
         {
             auto sedond_arg = checkAndGetLiteralArgument<String>(args[1], "format/NOSIGN");
+            /// s3(source, NOSIGN, format, structure, compression_method)
             if (boost::iequals(sedond_arg, "NOSIGN"))
             {
-                args[args.size() - 2] = structure_literal;
+                if (checkAndGetLiteralArgument<String>(args[2], "format") == "auto")
+                    args[2] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[3], "structure") == "auto")
+                    args[3] = structure_literal;
             }
+            /// s3(source, access_key_id, access_key_id, format, structure)
             else
             {
-                args.back() = structure_literal;
+                if (checkAndGetLiteralArgument<String>(args[3], "format") == "auto")
+                    args[3] = format_literal;
+                if (checkAndGetLiteralArgument<String>(args[4], "structure") == "auto")
+                    args[4] = structure_literal;
             }
         }
-        /// s3(source, access_key_id, access_key_id, format, structure, compression)
-        else if (args.size() == 6)
+        /// s3(source, access_key_id, secret_access_key, format, structure, compression)
+        else if (count == 6)
         {
-            args[args.size() - 2] = structure_literal;
+            if (checkAndGetLiteralArgument<String>(args[3], "format") == "auto")
+                args[3] = format_literal;
+            if (checkAndGetLiteralArgument<String>(args[4], "structure") == "auto")
+                args[4] = structure_literal;
         }
-
-        if (headers_ast)
-            args.push_back(headers_ast);
     }
 }
 
@@ -369,6 +386,9 @@ ColumnsDescription TableFunctionS3::getActualTableStructure(ContextPtr context,
     {
         context->checkAccess(getSourceAccessType());
         configuration.update(context);
+        if (configuration.format == "auto")
+            return StorageS3::getTableStructureAndFormatFromData(configuration, std::nullopt, context).first;
+
         return StorageS3::getTableStructureFromData(configuration, std::nullopt, context);
     }
 
@@ -382,8 +402,7 @@ bool TableFunctionS3::supportsReadingSubsetOfColumns(const ContextPtr & context)
 
 std::unordered_set<String> TableFunctionS3::getVirtualsToCheckBeforeUsingStructureHint() const
 {
-    auto virtual_column_names = StorageS3::getVirtualColumnNames();
-    return {virtual_column_names.begin(), virtual_column_names.end()};
+    return VirtualColumnUtils::getVirtualNamesForFileLikeStorage();
 }
 
 StoragePtr TableFunctionS3::executeImpl(const ASTPtr & /*ast_function*/, ContextPtr context, const std::string & table_name, ColumnsDescription cached_columns, bool /*is_insert_query*/) const
diff --git a/src/TableFunctions/TableFunctionS3.h b/src/TableFunctions/TableFunctionS3.h
index fa73c1d313e..00ca36c6653 100644
--- a/src/TableFunctions/TableFunctionS3.h
+++ b/src/TableFunctions/TableFunctionS3.h
@@ -57,7 +57,7 @@ public:
 
     virtual void parseArgumentsImpl(ASTs & args, const ContextPtr & context);
 
-    static void addColumnsStructureToArguments(ASTs & args, const String & structure, const ContextPtr & context);
+    static void updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure, const String & format, const ContextPtr & context);
 
 protected:
 
diff --git a/src/TableFunctions/TableFunctionS3Cluster.cpp b/src/TableFunctions/TableFunctionS3Cluster.cpp
index ce96f7f580b..e727c4e4c89 100644
--- a/src/TableFunctions/TableFunctionS3Cluster.cpp
+++ b/src/TableFunctions/TableFunctionS3Cluster.cpp
@@ -21,9 +21,8 @@ StoragePtr TableFunctionS3Cluster::executeImpl(
 {
     StoragePtr storage;
     ColumnsDescription columns;
-    bool structure_argument_was_provided = configuration.structure != "auto";
 
-    if (structure_argument_was_provided)
+    if (configuration.structure != "auto")
     {
         columns = parseColumnsListFromString(configuration.structure, context);
     }
@@ -53,8 +52,7 @@ StoragePtr TableFunctionS3Cluster::executeImpl(
             StorageID(getDatabaseName(), table_name),
             columns,
             ConstraintsDescription{},
-            context,
-            structure_argument_was_provided);
+            context);
     }
 
     storage->startup();
diff --git a/src/TableFunctions/TableFunctionURL.cpp b/src/TableFunctions/TableFunctionURL.cpp
index 254cdba64d5..2bdc0b449e0 100644
--- a/src/TableFunctions/TableFunctionURL.cpp
+++ b/src/TableFunctions/TableFunctionURL.cpp
@@ -55,45 +55,62 @@ void TableFunctionURL::parseArgumentsImpl(ASTs & args, const ContextPtr & contex
 
         format = configuration.format;
         if (format == "auto")
-            format = FormatFactory::instance().getFormatFromFileName(Poco::URI(filename).getPath(), true);
+            format = FormatFactory::instance().tryGetFormatFromFileName(Poco::URI(filename).getPath()).value_or("auto");
 
-        StorageURL::collectHeaders(args, configuration.headers, context);
+        StorageURL::evalArgsAndCollectHeaders(args, configuration.headers, context);
     }
     else
     {
-        auto * headers_it = StorageURL::collectHeaders(args, configuration.headers, context);
+        size_t count = StorageURL::evalArgsAndCollectHeaders(args, configuration.headers, context);
         /// ITableFunctionFileLike cannot parse headers argument, so remove it.
-        if (headers_it != args.end())
-            args.erase(headers_it);
+        ASTPtr headers_ast;
+        if (count != args.size())
+        {
+            chassert(count + 1 == args.size());
+            headers_ast = args.back();
+            args.pop_back();
+        }
 
         ITableFunctionFileLike::parseArgumentsImpl(args, context);
+
+        if (headers_ast)
+            args.push_back(headers_ast);
     }
 }
 
-void TableFunctionURL::addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context)
+void TableFunctionURL::updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure_, const String & format_, const ContextPtr & context)
 {
-    if (tryGetNamedCollectionWithOverrides(args, context))
+    if (auto collection = 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);
+        /// In case of named collection, just add key-value pairs "format='...', structure='...'"
+        /// at the end of arguments to override existed format and structure with "auto" values.
+        if (collection->getOrDefault<String>("format", "auto") == "auto")
+        {
+            ASTs format_equal_func_args = {std::make_shared<ASTIdentifier>("format"), std::make_shared<ASTLiteral>(format_)};
+            auto format_equal_func = makeASTFunction("equals", std::move(format_equal_func_args));
+            args.push_back(format_equal_func);
+        }
+        if (collection->getOrDefault<String>("structure", "auto") == "auto")
+        {
+            ASTs structure_equal_func_args = {std::make_shared<ASTIdentifier>("structure"), std::make_shared<ASTLiteral>(structure_)};
+            auto structure_equal_func = makeASTFunction("equals", std::move(structure_equal_func_args));
+            args.push_back(structure_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).
+        /// If arguments contain headers, just remove it and add to the end of arguments later.
         HTTPHeaderEntries tmp_headers;
-        auto * headers_it = StorageURL::collectHeaders(args, tmp_headers, context);
+        size_t count = StorageURL::evalArgsAndCollectHeaders(args, tmp_headers, context);
         ASTPtr headers_ast;
-        if (headers_it != args.end())
+        if (count != args.size())
         {
-            headers_ast = *headers_it;
-            args.erase(headers_it);
+            chassert(count + 1 == args.size());
+            headers_ast = args.back();
+            args.pop_back();
         }
 
-        ITableFunctionFileLike::addColumnsStructureToArguments(args, desired_structure, context);
+        ITableFunctionFileLike::updateStructureAndFormatArgumentsIfNeeded(args, structure_, format_, context);
 
         if (headers_ast)
             args.push_back(headers_ast);
@@ -123,6 +140,14 @@ ColumnsDescription TableFunctionURL::getActualTableStructure(ContextPtr context,
     if (structure == "auto")
     {
         context->checkAccess(getSourceAccessType());
+        if (format == "auto")
+            return StorageURL::getTableStructureAndFormatFromData(
+                       filename,
+                       chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
+                       configuration.headers,
+                       std::nullopt,
+                       context).first;
+
         return StorageURL::getTableStructureFromData(format,
             filename,
             chooseCompressionMethod(Poco::URI(filename).getPath(), compression_method),
@@ -134,15 +159,9 @@ ColumnsDescription TableFunctionURL::getActualTableStructure(ContextPtr context,
     return parseColumnsListFromString(structure, context);
 }
 
-std::unordered_set<String> TableFunctionURL::getVirtualsToCheckBeforeUsingStructureHint() const
+std::optional<String> TableFunctionURL::tryGetFormatFromFirstArgument()
 {
-    auto virtual_column_names = StorageURL::getVirtualColumnNames();
-    return {virtual_column_names.begin(), virtual_column_names.end()};
-}
-
-String TableFunctionURL::getFormatFromFirstArgument()
-{
-    return FormatFactory::instance().getFormatFromFileName(Poco::URI(filename).getPath(), true);
+    return FormatFactory::instance().tryGetFormatFromFileName(Poco::URI(filename).getPath());
 }
 
 void registerTableFunctionURL(TableFunctionFactory & factory)
diff --git a/src/TableFunctions/TableFunctionURL.h b/src/TableFunctions/TableFunctionURL.h
index bf417f950c0..a1efddb84c6 100644
--- a/src/TableFunctions/TableFunctionURL.h
+++ b/src/TableFunctions/TableFunctionURL.h
@@ -34,9 +34,7 @@ public:
 
     ColumnsDescription getActualTableStructure(ContextPtr context, bool is_insert_query) const override;
 
-    static void addColumnsStructureToArguments(ASTs & args, const String & desired_structure, const ContextPtr & context);
-
-    std::unordered_set<String> getVirtualsToCheckBeforeUsingStructureHint() const override;
+    static void updateStructureAndFormatArgumentsIfNeeded(ASTs & args, const String & structure_, const String & format_, const ContextPtr & context);
 
 protected:
     void parseArguments(const ASTPtr & ast, ContextPtr context) override;
@@ -53,8 +51,7 @@ private:
 
     const char * getStorageTypeName() const override { return "URL"; }
 
-    String getFormatFromFirstArgument() override;
-
+    std::optional<String> tryGetFormatFromFirstArgument() override;
 };
 
 }
diff --git a/src/TableFunctions/TableFunctionURLCluster.cpp b/src/TableFunctions/TableFunctionURLCluster.cpp
index a2949278155..5fd3c3342a5 100644
--- a/src/TableFunctions/TableFunctionURLCluster.cpp
+++ b/src/TableFunctions/TableFunctionURLCluster.cpp
@@ -40,8 +40,7 @@ StoragePtr TableFunctionURLCluster::getStorage(
             StorageID(getDatabaseName(), table_name),
             getActualTableStructure(context, /* is_insert_query */ true),
             ConstraintsDescription{},
-            configuration,
-            structure != "auto");
+            configuration);
     }
     return storage;
 }
diff --git a/src/TableFunctions/registerTableFunctions.cpp b/src/TableFunctions/registerTableFunctions.cpp
index 8c18c298f45..927457ff9f6 100644
--- a/src/TableFunctions/registerTableFunctions.cpp
+++ b/src/TableFunctions/registerTableFunctions.cpp
@@ -11,6 +11,7 @@ void registerTableFunctions()
     registerTableFunctionMerge(factory);
     registerTableFunctionRemote(factory);
     registerTableFunctionNumbers(factory);
+    registerTableFunctionGenerateSeries(factory);
     registerTableFunctionNull(factory);
     registerTableFunctionZeros(factory);
     registerTableFunctionExecutable(factory);
@@ -23,6 +24,7 @@ void registerTableFunctions()
     registerTableFunctionGenerate(factory);
     registerTableFunctionMongoDB(factory);
     registerTableFunctionRedis(factory);
+    registerTableFunctionMergeTreeIndex(factory);
 #if USE_RAPIDJSON || USE_SIMDJSON
     registerTableFunctionFuzzJSON(factory);
 #endif
diff --git a/src/TableFunctions/registerTableFunctions.h b/src/TableFunctions/registerTableFunctions.h
index fae763e7dc8..296af146faf 100644
--- a/src/TableFunctions/registerTableFunctions.h
+++ b/src/TableFunctions/registerTableFunctions.h
@@ -8,6 +8,7 @@ class TableFunctionFactory;
 void registerTableFunctionMerge(TableFunctionFactory & factory);
 void registerTableFunctionRemote(TableFunctionFactory & factory);
 void registerTableFunctionNumbers(TableFunctionFactory & factory);
+void registerTableFunctionGenerateSeries(TableFunctionFactory & factory);
 void registerTableFunctionNull(TableFunctionFactory & factory);
 void registerTableFunctionZeros(TableFunctionFactory & factory);
 void registerTableFunctionExecutable(TableFunctionFactory & factory);
@@ -20,6 +21,7 @@ void registerTableFunctionInput(TableFunctionFactory & factory);
 void registerTableFunctionGenerate(TableFunctionFactory & factory);
 void registerTableFunctionMongoDB(TableFunctionFactory & factory);
 void registerTableFunctionRedis(TableFunctionFactory & factory);
+void registerTableFunctionMergeTreeIndex(TableFunctionFactory & factory);
 #if USE_RAPIDJSON || USE_SIMDJSON
 void registerTableFunctionFuzzJSON(TableFunctionFactory & factory);
 #endif
diff --git a/src/configure_config.cmake b/src/configure_config.cmake
index 7de2d5a9fdd..141e51badbb 100644
--- a/src/configure_config.cmake
+++ b/src/configure_config.cmake
@@ -164,6 +164,9 @@ endif ()
 if (ENABLE_OPENSSL)
     set(USE_OPENSSL_INTREE 1)
 endif ()
+if (TARGET ch_contrib::ssh)
+    set(USE_SSH 1)
+endif()
 if (TARGET ch_contrib::fiu)
     set(FIU_ENABLE 1)
 endif()
diff --git a/tests/README.md b/tests/README.md
index a1fc0f530f2..7df5da8d078 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -1 +1 @@
-Find CI documents and instructions on running CI checks localy [here](https://clickhouse.com/docs/en/development/continuous-integration).
\ No newline at end of file
+Find CI documents and instructions on running CI checks locally [here](https://clickhouse.com/docs/en/development/continuous-integration).
diff --git a/tests/analyzer_integration_broken_tests.txt b/tests/analyzer_integration_broken_tests.txt
deleted file mode 100644
index 23f22209451..00000000000
--- a/tests/analyzer_integration_broken_tests.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-test_access_for_functions/test.py::test_access_rights_for_function
-test_build_sets_from_multiple_threads/test.py::test_set
-test_concurrent_backups_s3/test.py::test_concurrent_backups
-test_dictionaries_update_and_reload/test.py::test_reload_after_fail_in_cache_dictionary
-test_distributed_backward_compatability/test.py::test_distributed_in_tuple
-test_distributed_type_object/test.py::test_distributed_type_object
-test_executable_table_function/test.py::test_executable_function_input_python
-test_mask_sensitive_info/test.py::test_encryption_functions
-test_merge_table_over_distributed/test.py::test_global_in
-test_merge_table_over_distributed/test.py::test_select_table_name_from_merge_over_distributed
-test_mutations_with_merge_tree/test.py::test_mutations_with_merge_background_task
-test_mysql_database_engine/test.py::test_mysql_ddl_for_mysql_database
-test_passing_max_partitions_to_read_remotely/test.py::test_default_database_on_cluster
-test_profile_events_s3/test.py::test_profile_events
-test_replicating_constants/test.py::test_different_versions
-test_select_access_rights/test_main.py::test_alias_columns
-test_select_access_rights/test_main.py::test_select_count
-test_select_access_rights/test_main.py::test_select_join
-test_settings_profile/test.py::test_show_profiles
-test_shard_level_const_function/test.py::test_remote
-test_sql_user_defined_functions_on_cluster/test.py::test_sql_user_defined_functions_on_cluster
-test_storage_rabbitmq/test.py::test_rabbitmq_materialized_view
-test_user_defined_object_persistence/test.py::test_persistence
-test_wrong_db_or_table_name/test.py::test_wrong_table_name
-test_zookeeper_config/test.py::test_chroot_with_same_root
-test_zookeeper_config/test.py::test_chroot_with_different_root
diff --git a/tests/analyzer_tech_debt.txt b/tests/analyzer_tech_debt.txt
index 4643d109c3d..5f798158a41 100644
--- a/tests/analyzer_tech_debt.txt
+++ b/tests/analyzer_tech_debt.txt
@@ -1,36 +1,11 @@
-00223_shard_distributed_aggregation_memory_efficient
-00717_merge_and_distributed
 00725_memory_tracking
-01062_pm_all_join_with_block_continuation
-01083_expressions_in_engine_arguments
-01155_rename_move_materialized_view
-01214_test_storage_merge_aliases_with_where
-01244_optimize_distributed_group_by_sharding_key
-01268_shard_avgweighted
-01495_subqueries_in_with_statement
-01560_merge_distributed_join
-01584_distributed_buffer_cannot_find_column
 01624_soft_constraints
-01656_test_query_log_factories_info
-01739_index_hint
-02880_indexHint__partition_id
-01747_join_view_filter_dictionary
-01761_cast_to_enum_nullable
-01925_join_materialized_columns
-01925_test_storage_merge_aliases
-01952_optimize_distributed_group_by_sharding_key
-02174_cte_scalar_cache_mv
-02354_annoy
-02428_parameterized_view
-02493_inconsistent_hex_and_binary_number
-02575_merge_prewhere_different_default_kind
-00917_multiple_joins_denny_crane
-02725_agg_projection_resprect_PK
-02763_row_policy_storage_merge_alias
-02784_parallel_replicas_automatic_decision_join
-02818_parameterized_view_with_cte_multiple_usage
-# Flaky. Please don't delete them without fixing them:
+02354_vector_search_queries
+02901_parallel_replicas_rollup
+02999_scalar_subqueries_bug_2
+# Flaky list
+01825_type_json_in_array
+01414_mutations_and_errors_zookeeper
 01287_max_execution_speed
-02003_WithMergeableStateAfterAggregationAndLimit_LIMIT_BY_LIMIT_OFFSET
-02404_memory_bound_merging
-02479_race_condition_between_insert_and_droppin_mv
+# Check after ConstantNode refactoring
+02154_parser_backtracking
diff --git a/tests/ci/.mypy.ini b/tests/ci/.mypy.ini
index bcaac49f190..9bc44025826 100644
--- a/tests/ci/.mypy.ini
+++ b/tests/ci/.mypy.ini
@@ -14,4 +14,4 @@ warn_unused_ignores = False
 warn_return_any = True
 no_implicit_reexport = True
 strict_equality = True
-strict_concatenate = True
+extra_checks = True
diff --git a/tests/ci/artifacts_helper.py b/tests/ci/artifacts_helper.py
index a9f3385585b..5feca927a96 100644
--- a/tests/ci/artifacts_helper.py
+++ b/tests/ci/artifacts_helper.py
@@ -10,14 +10,17 @@ from pathlib import Path
 from shutil import copy2
 from typing import List, Optional, Union
 
+# isort: off
 from github.Commit import Commit
 
+# isort: on
+
 from build_download_helper import download_build_with_progress
 from commit_status_helper import post_commit_status
 from compress_files import SUFFIX, compress_fast, decompress_fast
 from env_helper import CI, RUNNER_TEMP, S3_BUILDS_BUCKET
 from git_helper import SHA_REGEXP
-from report import HEAD_HTML_TEMPLATE, FOOTER_HTML_TEMPLATE
+from report import FOOTER_HTML_TEMPLATE, HEAD_HTML_TEMPLATE, SUCCESS
 from s3_helper import S3Helper
 
 ARTIFACTS_PATH = Path(RUNNER_TEMP) / "artifacts"
@@ -128,9 +131,7 @@ class ArtifactsHelper:
 
     @staticmethod
     def post_commit_status(commit: Commit, url: str) -> None:
-        post_commit_status(
-            commit, "success", url, "Artifacts for workflow", "Artifacts"
-        )
+        post_commit_status(commit, SUCCESS, url, "Artifacts for workflow", "Artifacts")
 
     def _regenerate_index(self) -> None:
         if CI:
diff --git a/tests/ci/ast_fuzzer_check.py b/tests/ci/ast_fuzzer_check.py
index 68004eec2bb..b88a9476a6d 100644
--- a/tests/ci/ast_fuzzer_check.py
+++ b/tests/ci/ast_fuzzer_check.py
@@ -6,29 +6,14 @@ import subprocess
 import sys
 from pathlib import Path
 
-from github import Github
-
 from build_download_helper import get_build_name_for_check, read_build_urls
-from clickhouse_helper import (
-    CiLogsCredentials,
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    format_description,
-    get_commit,
-    post_commit_status,
-)
+from clickhouse_helper import CiLogsCredentials
 from docker_images_helper import DockerImage, get_docker_image, pull_image
 from env_helper import REPORT_PATH, TEMP_PATH
-from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
-from report import TestResult
-from s3_helper import S3Helper
+from report import FAIL, FAILURE, OK, SUCCESS, JobReport, TestResult
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
 
 IMAGE_NAME = "clickhouse/fuzzer"
 
@@ -77,27 +62,19 @@ def main():
 
     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)
-
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
     build_name = get_build_name_for_check(check_name)
     urls = read_build_urls(build_name, reports_path)
     if not urls:
-        raise Exception("No build URLs found")
+        raise ValueError("No build URLs found")
 
     for url in urls:
         if url.endswith("/clickhouse"):
             build_url = url
             break
     else:
-        raise Exception("Cannot find the clickhouse binary among build results")
+        raise ValueError("Cannot find the clickhouse binary among build results")
 
     logging.info("Got build url %s", build_url)
 
@@ -131,39 +108,33 @@ def main():
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
     ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
 
-    check_name_lower = (
-        check_name.lower().replace("(", "").replace(")", "").replace(" ", "")
-    )
-    s3_prefix = f"{pr_info.number}/{pr_info.sha}/fuzzer_{check_name_lower}/"
     paths = {
         "run.log": run_log_path,
         "main.log": main_log_path,
-        "fuzzer.log": workspace_path / "fuzzer.log",
         "report.html": workspace_path / "report.html",
         "core.zst": workspace_path / "core.zst",
         "dmesg.log": workspace_path / "dmesg.log",
+        "fatal.log": workspace_path / "fatal.log",
+        "stderr.log": workspace_path / "stderr.log",
     }
 
     compressed_server_log_path = workspace_path / "server.log.zst"
     if compressed_server_log_path.exists():
         paths["server.log.zst"] = compressed_server_log_path
+    else:
+        # The script can fail before the invocation of `zstd`, but we are still interested in its log:
+        not_compressed_server_log_path = workspace_path / "server.log"
+        if not_compressed_server_log_path.exists():
+            paths["server.log"] = not_compressed_server_log_path
 
-    # The script can fail before the invocation of `zstd`, but we are still interested in its log:
-
-    not_compressed_server_log_path = workspace_path / "server.log"
-    if not_compressed_server_log_path.exists():
-        paths["server.log"] = not_compressed_server_log_path
-
-    s3_helper = S3Helper()
-    urls = []
-    report_url = ""
-    for file, path in paths.items():
-        try:
-            url = s3_helper.upload_test_report_to_s3(path, s3_prefix + file)
-            report_url = url if file == "report.html" else report_url
-            urls.append(url)
-        except Exception as ex:
-            logging.info("Exception uploading file %s text %s", file, ex)
+    # Same idea but with the fuzzer log
+    compressed_fuzzer_log_path = workspace_path / "fuzzer.log.zst"
+    if compressed_fuzzer_log_path.exists():
+        paths["fuzzer.log.zst"] = compressed_fuzzer_log_path
+    else:
+        not_compressed_fuzzer_log_path = workspace_path / "fuzzer.log"
+        if not_compressed_fuzzer_log_path.exists():
+            paths["fuzzer.log"] = not_compressed_fuzzer_log_path
 
     # Try to get status message saved by the fuzzer
     try:
@@ -173,45 +144,26 @@ def main():
         with open(workspace_path / "description.txt", "r", encoding="utf-8") as desc_f:
             description = desc_f.readline().rstrip("\n")
     except:
-        status = "failure"
+        status = FAILURE
         description = "Task failed: $?=" + str(retcode)
 
-    description = format_description(description)
-
-    test_result = TestResult(description, "OK")
+    test_result = TestResult(description, OK)
     if "fail" in status:
-        test_result.status = "FAIL"
+        test_result.status = FAIL
 
-    if not report_url:
-        report_url = upload_results(
-            s3_helper,
-            pr_info.number,
-            pr_info.sha,
-            [test_result],
-            [],
-            check_name,
-            urls,
-        )
+    JobReport(
+        description=description,
+        test_results=[test_result],
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        # test generates its own report.html
+        additional_files=[v for _, v in paths.items()],
+    ).dump()
 
-    ch_helper = ClickHouseHelper()
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        [test_result],
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    logging.info("Result: '%s', '%s', '%s'", status, description, report_url)
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, status, report_url, description, check_name, pr_info, dump_to_file=True
-    )
+    logging.info("Result: '%s', '%s'", status, description)
+    if status != SUCCESS:
+        sys.exit(1)
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/autoscale_runners_lambda/app.py b/tests/ci/autoscale_runners_lambda/app.py
index 120126b404a..520abcb41bb 100644
--- a/tests/ci/autoscale_runners_lambda/app.py
+++ b/tests/ci/autoscale_runners_lambda/app.py
@@ -8,11 +8,10 @@ from pprint import pformat
 from typing import Any, List, Literal, Optional, Tuple
 
 import boto3  # type: ignore
-
 from lambda_shared import (
+    RUNNER_TYPE_LABELS,
     CHException,
     ClickHouseHelper,
-    RUNNER_TYPE_LABELS,
     get_parameter_from_ssm,
 )
 
@@ -64,8 +63,12 @@ def get_scales(runner_type: str) -> Tuple[int, int]:
     # 10. I am trying 7 now.
     # 7 still looks a bit slow, so I try 6
     # Let's have it the same as the other ASG
+    #
+    # All type of style-checkers should be added very quickly to not block the workflows
     # UPDATE THE COMMENT ON CHANGES
     scale_up = 3
+    if "style" in runner_type:
+        scale_up = 1
     return scale_down, scale_up
 
 
@@ -115,13 +118,15 @@ def set_capacity(
         # Are we already at the capacity limits
         stop = stop or asg["MaxSize"] <= asg["DesiredCapacity"]
         # Let's calculate a new desired capacity
-        desired_capacity = (
+        # (capacity_deficit + scale_up - 1) // scale_up : will increase min by 1
+        # if there is any capacity_deficit
+        new_capacity = (
             asg["DesiredCapacity"] + (capacity_deficit + scale_up - 1) // scale_up
         )
-        desired_capacity = max(desired_capacity, asg["MinSize"])
-        desired_capacity = min(desired_capacity, asg["MaxSize"])
+        new_capacity = max(new_capacity, asg["MinSize"])
+        new_capacity = min(new_capacity, asg["MaxSize"])
         # Finally, should the capacity be even changed
-        stop = stop or asg["DesiredCapacity"] == desired_capacity
+        stop = stop or asg["DesiredCapacity"] == new_capacity
         if stop:
             logging.info(
                 "Do not increase ASG %s capacity, current capacity=%s, effective "
@@ -137,11 +142,11 @@ def set_capacity(
 
         logging.info(
             "The ASG %s capacity will be increased to %s, current capacity=%s, "
-            "effective capacity=%sm maximum capacity=%s, running jobs=%s, queue size=%s",
+            "effective capacity=%s, maximum capacity=%s, running jobs=%s, queue size=%s",
             asg["AutoScalingGroupName"],
-            desired_capacity,
-            effective_capacity,
+            new_capacity,
             asg["DesiredCapacity"],
+            effective_capacity,
             asg["MaxSize"],
             running,
             queued,
@@ -149,16 +154,16 @@ def set_capacity(
         if not dry_run:
             client.set_desired_capacity(
                 AutoScalingGroupName=asg["AutoScalingGroupName"],
-                DesiredCapacity=desired_capacity,
+                DesiredCapacity=new_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
+    new_capacity = asg["DesiredCapacity"] - (capacity_reserve // scale_down)
+    new_capacity = max(new_capacity, asg["MinSize"])
+    new_capacity = min(new_capacity, asg["MaxSize"])
+    stop = stop or asg["DesiredCapacity"] == new_capacity
     if stop:
         logging.info(
             "Do not decrease ASG %s capacity, current capacity=%s, effective "
@@ -176,7 +181,7 @@ def set_capacity(
         "The ASG %s capacity will be decreased to %s, current capacity=%s, effective "
         "capacity=%s, minimum capacity=%s, running jobs=%s, queue size=%s",
         asg["AutoScalingGroupName"],
-        desired_capacity,
+        new_capacity,
         asg["DesiredCapacity"],
         effective_capacity,
         asg["MinSize"],
@@ -186,7 +191,7 @@ def set_capacity(
     if not dry_run:
         client.set_desired_capacity(
             AutoScalingGroupName=asg["AutoScalingGroupName"],
-            DesiredCapacity=desired_capacity,
+            DesiredCapacity=new_capacity,
         )
 
 
diff --git a/tests/ci/autoscale_runners_lambda/test_autoscale.py b/tests/ci/autoscale_runners_lambda/test_autoscale.py
index 464e5695556..3aeab49ffc7 100644
--- a/tests/ci/autoscale_runners_lambda/test_autoscale.py
+++ b/tests/ci/autoscale_runners_lambda/test_autoscale.py
@@ -4,7 +4,7 @@ import unittest
 from dataclasses import dataclass
 from typing import Any, List
 
-from app import set_capacity, Queue
+from app import Queue, set_capacity
 
 
 @dataclass
@@ -35,7 +35,7 @@ class TestSetCapacity(unittest.TestCase):
 
         @property
         def expected_capacity(self) -> int:
-            """one-time property"""
+            """a one-time property"""
             capacity, self._expected_capacity = self._expected_capacity, -1
             return capacity
 
@@ -68,13 +68,19 @@ class TestSetCapacity(unittest.TestCase):
         test_cases = (
             # Do not change capacity
             TestCase("noqueue", 1, 13, 20, [Queue("in_progress", 155, "noqueue")], -1),
-            TestCase(
-                "w/reserve-1", 1, 13, 20, [Queue("queued", 15, "w/reserve-1")], 14
-            ),
+            TestCase("reserve", 1, 13, 20, [Queue("queued", 13, "reserve")], -1),
             # Increase capacity
+            TestCase(
+                "increase-always",
+                1,
+                13,
+                20,
+                [Queue("queued", 14, "increase-always")],
+                14,
+            ),
             TestCase("increase-1", 1, 13, 20, [Queue("queued", 23, "increase-1")], 17),
             TestCase(
-                "style-checker", 1, 13, 20, [Queue("queued", 33, "style-checker")], 20
+                "style-checker", 1, 13, 20, [Queue("queued", 19, "style-checker")], 19
             ),
             TestCase("increase-2", 1, 13, 20, [Queue("queued", 18, "increase-2")], 15),
             TestCase("increase-3", 1, 13, 20, [Queue("queued", 183, "increase-3")], 20),
@@ -111,6 +117,33 @@ class TestSetCapacity(unittest.TestCase):
             set_capacity(t.name, t.queues, self.client, False)
             self.assertEqual(t.expected_capacity, self.client.expected_capacity, t.name)
 
+    def test_effective_capacity(self):
+        """Normal cases test increasing w/o considering
+        effective_capacity much lower than DesiredCapacity"""
+        test_cases = (
+            TestCase(
+                "desired-overwritten",
+                1,
+                20,  # DesiredCapacity, overwritten by effective_capacity
+                50,
+                [
+                    Queue("in_progress", 30, "desired-overwritten"),
+                    Queue("queued", 60, "desired-overwritten"),
+                ],
+                40,
+            ),
+        )
+        for t in test_cases:
+            self.client.data_helper(t.name, t.min_size, t.desired_capacity, t.max_size)
+            # we test that effective_capacity is 30 (a half of 60)
+            data_with_instances = self.client.expected_data
+            data_with_instances["AutoScalingGroups"][0]["Instances"] = [
+                {"HealthStatus": "Healthy" if i % 2 else "Unhealthy"} for i in range(60)
+            ]
+            self.client.expected_data = data_with_instances
+            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 = (
             (
diff --git a/tests/ci/bugfix_validate_check.py b/tests/ci/bugfix_validate_check.py
index adb798bd392..7aaf18e7765 100644
--- a/tests/ci/bugfix_validate_check.py
+++ b/tests/ci/bugfix_validate_check.py
@@ -1,115 +1,157 @@
 #!/usr/bin/env python3
 
-from pathlib import Path
-from typing import List, Tuple
-import argparse
 import csv
 import logging
+import subprocess
+import sys
+from pathlib import Path
+from typing import List, Sequence, Tuple
 
-from github import Github
-
-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
-from s3_helper import S3Helper
-from upload_result_helper import upload_results
-
-
-def parse_args() -> argparse.Namespace:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("files", nargs="+", type=Path, help="Path to status files")
-    return parser.parse_args()
+from ci_config import JobNames
+from ci_utils import normalize_string
+from env_helper import TEMP_PATH
+from functional_test_check import NO_CHANGES_MSG
+from report import (
+    ERROR,
+    FAIL,
+    FAILURE,
+    OK,
+    SKIPPED,
+    SUCCESS,
+    JobReport,
+    TestResult,
+    TestResults,
+)
+from stopwatch import Stopwatch
 
 
 def post_commit_status_from_file(file_path: Path) -> List[str]:
     with open(file_path, "r", encoding="utf-8") as f:
         res = list(csv.reader(f, delimiter="\t"))
     if len(res) < 1:
-        raise Exception(f'Can\'t read from "{file_path}"')
+        raise IndexError(f'Can\'t read from "{file_path}"')
     if len(res[0]) != 3:
-        raise Exception(f'Can\'t read from "{file_path}"')
+        raise IndexError(f'Can\'t read from "{file_path}"')
     return res[0]
 
 
-def process_result(file_path: Path) -> Tuple[bool, TestResults]:
-    test_results = []  # type: TestResults
-    state, report_url, description = post_commit_status_from_file(file_path)
-    prefix = file_path.parent.name
-    if description.strip() in [
-        "Invalid check_status.tsv",
-        "Not found test_results.tsv",
-        "Empty test_results.tsv",
-    ]:
-        status = (
-            f'Check failed (<a href="{report_url}">Report</a>)'
-            if report_url != "null"
-            else "Check failed"
-        )
-        return False, [TestResult(f"{prefix}: {description}", status)]
-
-    is_ok = state == "success"
-    if is_ok and report_url == "null":
-        return is_ok, test_results
-
-    status = (
-        f'OK: Bug reproduced (<a href="{report_url}">Report</a>)'
-        if is_ok
-        else f'Bug is not reproduced (<a href="{report_url}">Report</a>)'
-    )
-    test_results.append(TestResult(f"{prefix}: {description}", status))
-    return is_ok, test_results
+def get_failed_test_cases(file_path: Path) -> List[TestResult]:
+    job_report = JobReport.load(from_file=file_path)
+    test_results = []  # type: List[TestResult]
+    for tr in job_report.test_results:
+        if tr.status == FAIL:
+            if tr.name == NO_CHANGES_MSG:
+                tr.status = SKIPPED
+            else:
+                tr.name = "[with NOT_OK]   " + tr.name
+                tr.status = OK
+        elif tr.status == OK:
+            tr.name = "[with NOT_OK]   " + tr.name
+            tr.status = FAIL
+        else:
+            # do not invert error status
+            pass
+        test_results.append(tr)
+    return test_results
 
 
-def process_all_results(file_paths: List[Path]) -> Tuple[bool, TestResults]:
-    any_ok = False
-    all_results = []
-    for status_path in file_paths:
-        is_ok, test_results = process_result(status_path)
-        any_ok = any_ok or is_ok
-        if test_results is not None:
-            all_results.extend(test_results)
+def process_all_results(
+    file_paths: Sequence[Path],
+) -> Tuple[str, str, TestResults]:
+    all_results = []  # type: TestResults
+    has_fail = False
+    has_error = False
+    has_ok = False
+    for job_report_path in file_paths:
+        test_results = get_failed_test_cases(job_report_path)
+        for tr in test_results:
+            if tr.status == FAIL:
+                has_fail = True
+            elif tr.status == ERROR:
+                has_error = True
+            elif tr.status == OK:
+                has_ok = True
+        all_results.extend(test_results)
+    if has_error:
+        status = ERROR
+        description = "Some error(s) occured in tests"
+    elif has_ok:
+        status = SUCCESS
+        description = "New test(s) reproduced a bug"
+    elif has_fail:
+        status = FAILURE
+        description = "New test(s) failed to reproduce a bug"
+    else:
+        status = ERROR
+        description = "Invalid job results"
 
-    return any_ok, all_results
+    return status, description, all_results
 
 
 def main():
     logging.basicConfig(level=logging.INFO)
-    args = parse_args()
-    status_files = args.files  # type: List[Path]
+    # args = parse_args()
+    stopwatch = Stopwatch()
+    jobs_to_validate = [JobNames.STATELESS_TEST_RELEASE, JobNames.INTEGRATION_TEST]
+    functional_job_report_file = Path(TEMP_PATH) / "functional_test_job_report.json"
+    integration_job_report_file = Path(TEMP_PATH) / "integration_test_job_report.json"
+    jobs_report_files = {
+        JobNames.STATELESS_TEST_RELEASE: functional_job_report_file,
+        JobNames.INTEGRATION_TEST: integration_job_report_file,
+    }
+    jobs_scripts = {
+        JobNames.STATELESS_TEST_RELEASE: "functional_test_check.py",
+        JobNames.INTEGRATION_TEST: "integration_test_check.py",
+    }
 
-    check_name_with_group = "Bugfix validate check"
-
-    is_ok, test_results = process_all_results(status_files)
-
-    pr_info = PRInfo()
-    if not test_results:
-        description = "No results to upload"
-        report_url = ""
-        logging.info("No results to upload")
-    else:
-        description = "" if is_ok else "Changed tests don't reproduce the bug"
-        report_url = upload_results(
-            S3Helper(),
-            pr_info.number,
-            pr_info.sha,
-            test_results,
-            status_files,
-            check_name_with_group,
+    for test_job in jobs_to_validate:
+        report_file = jobs_report_files[test_job]
+        test_script = jobs_scripts[test_job]
+        if report_file.exists():
+            report_file.unlink()
+        extra_timeout_option = ""
+        if test_job == JobNames.STATELESS_TEST_RELEASE:
+            extra_timeout_option = str(3600)
+        # "bugfix" must be present in checkname, as integration test runner checks this
+        check_name = f"Validate bugfix: {test_job}"
+        command = f"python3 {test_script} '{check_name}' {extra_timeout_option} --validate-bugfix --report-to-file {report_file}"
+        print(f"Going to validate job [{test_job}], command [{command}]")
+        _ = subprocess.run(
+            command,
+            stdout=sys.stdout,
+            stderr=sys.stderr,
+            text=True,
+            check=False,
+            shell=True,
         )
+        assert (
+            report_file.is_file()
+        ), f"No job report [{report_file}] found after job execution"
 
-    gh = Github(get_best_robot_token(), per_page=100)
-    commit = get_commit(gh, pr_info.sha)
-    post_commit_status(
-        commit,
-        "success" if is_ok else "error",
-        report_url,
-        description,
-        check_name_with_group,
-        pr_info,
-        dump_to_file=True,
+    status, description, test_results = process_all_results(
+        list(jobs_report_files.values())
     )
 
+    additional_files = []
+    for job_id, report_file in jobs_report_files.items():
+        jr = JobReport.load(from_file=report_file)
+        additional_files.append(report_file)
+        for file in set(jr.additional_files):
+            file_ = Path(file)
+            file_name = file_.name
+            file_name = file_name.replace(".", "__" + normalize_string(job_id) + ".", 1)
+            file_ = file_.rename(file_.parent / file_name)
+            additional_files.append(file_)
+
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_files,
+    ).dump()
+
 
 if __name__ == "__main__":
     main()
diff --git a/tests/ci/build_check.py b/tests/ci/build_check.py
index 27243aac4f1..f2a2ffc667b 100644
--- a/tests/ci/build_check.py
+++ b/tests/ci/build_check.py
@@ -12,15 +12,13 @@ from ci_config import CI_CONFIG, BuildConfig
 from cache_utils import CargoCache
 
 from env_helper import (
-    GITHUB_JOB_API_URL,
     REPO_COPY,
     S3_BUILDS_BUCKET,
-    S3_DOWNLOAD,
     TEMP_PATH,
 )
-from git_helper import Git, git_runner
+from git_helper import Git
 from pr_info import PRInfo
-from report import BuildResult, FAILURE, StatusType, SUCCESS
+from report import FAILURE, JobReport, StatusType, SUCCESS
 from s3_helper import S3Helper
 from tee_popen import TeePopen
 import docker_images_helper
@@ -29,13 +27,6 @@ from version_helper import (
     get_version_from_repo,
     update_version_local,
 )
-from clickhouse_helper import (
-    ClickHouseHelper,
-    CiLogsCredentials,
-    prepare_tests_results_for_clickhouse,
-    get_instance_type,
-    get_instance_id,
-)
 from stopwatch import Stopwatch
 
 IMAGE_NAME = "clickhouse/binary-builder"
@@ -73,6 +64,8 @@ def get_packager_cmd(
         cmd += " --debug-build"
     if build_config.sanitizer:
         cmd += f" --sanitizer={build_config.sanitizer}"
+    if build_config.coverage:
+        cmd += " --coverage"
     if build_config.tidy:
         cmd += " --clang-tidy"
 
@@ -122,61 +115,6 @@ def build_clickhouse(
     return build_log_path, SUCCESS if success else FAILURE
 
 
-def check_for_success_run(
-    s3_helper: S3Helper,
-    s3_prefix: str,
-    build_name: str,
-    version: ClickHouseVersion,
-) -> None:
-    # TODO: Remove after S3 artifacts
-    logging.info("Checking for artifacts %s in bucket %s", s3_prefix, S3_BUILDS_BUCKET)
-    try:
-        # Performance artifacts are now part of regular build, so we're safe
-        build_results = s3_helper.list_prefix(s3_prefix)
-    except Exception as ex:
-        logging.info("Got exception while listing %s: %s\nRerun", s3_prefix, ex)
-        return
-
-    if build_results is None or len(build_results) == 0:
-        logging.info("Nothing found in %s, rerun", s3_prefix)
-        return
-
-    logging.info("Some build results found:\n%s", build_results)
-    build_urls = []
-    log_url = ""
-    for url in build_results:
-        url_escaped = url.replace("+", "%2B").replace(" ", "%20")
-        if BUILD_LOG_NAME in url:
-            log_url = f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}"
-        else:
-            build_urls.append(f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{url_escaped}")
-    if not log_url:
-        # log is uploaded the last, so if there's no log we need to rerun the build
-        return
-
-    success = len(build_urls) > 0
-    build_result = BuildResult(
-        build_name,
-        log_url,
-        build_urls,
-        version.describe,
-        SUCCESS if success else FAILURE,
-        0,
-        GITHUB_JOB_API_URL(),
-    )
-    result_json_path = build_result.write_json(Path(TEMP_PATH))
-    logging.info(
-        "Build result file %s is written, content:\n %s",
-        result_json_path,
-        result_json_path.read_text(encoding="utf-8"),
-    )
-    # Fail build job if not successeded
-    if not success:
-        sys.exit(1)
-    else:
-        sys.exit(0)
-
-
 def get_release_or_pr(pr_info: PRInfo, version: ClickHouseVersion) -> Tuple[str, str]:
     "Return prefixes for S3 artifacts paths"
     # FIXME performance
@@ -196,34 +134,6 @@ def get_release_or_pr(pr_info: PRInfo, version: ClickHouseVersion) -> Tuple[str,
     return pr_number, pr_number
 
 
-def upload_master_static_binaries(
-    pr_info: PRInfo,
-    build_config: BuildConfig,
-    s3_helper: S3Helper,
-    build_output_path: Path,
-) -> None:
-    """Upload binary artifacts to a static S3 links"""
-    static_binary_name = build_config.static_binary_name
-    if pr_info.number != 0:
-        return
-    elif not static_binary_name:
-        return
-    elif pr_info.base_ref != "master":
-        return
-
-    # Full binary with debug info:
-    s3_path_full = "/".join((pr_info.base_ref, static_binary_name, "clickhouse-full"))
-    binary_full = build_output_path / "clickhouse"
-    url_full = s3_helper.upload_build_file_to_s3(binary_full, s3_path_full)
-    print(f"::notice ::Binary static URL (with debug info): {url_full}")
-
-    # Stripped binary without debug info:
-    s3_path_compact = "/".join((pr_info.base_ref, static_binary_name, "clickhouse"))
-    binary_compact = build_output_path / "clickhouse-stripped"
-    url_compact = s3_helper.upload_build_file_to_s3(binary_compact, s3_path_compact)
-    print(f"::notice ::Binary static URL (compact): {url_compact}")
-
-
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser("Clickhouse builder script")
     parser.add_argument(
@@ -254,21 +164,6 @@ def main():
     s3_helper = S3Helper()
 
     version = get_version_from_repo(git=Git(True))
-    release_or_pr, performance_pr = get_release_or_pr(pr_info, version)
-
-    s3_path_prefix = "/".join((release_or_pr, pr_info.sha, build_name))
-    # FIXME performance
-    s3_performance_path = "/".join(
-        (performance_pr, pr_info.sha, build_name, "performance.tar.zst")
-    )
-
-    # FIXME: to be removed in favor of "skip by job digest"
-    # If this is rerun, then we try to find already created artifacts and just
-    # put them as github actions artifact (result)
-    # The s3_path_prefix has additional "/" in the end to prevent finding
-    # e.g. `binary_darwin_aarch64/clickhouse` for `binary_darwin`
-    check_for_success_run(s3_helper, f"{s3_path_prefix}/", build_name, version)
-
     logging.info("Got version from repo %s", version.string)
 
     official_flag = pr_info.number == 0
@@ -331,174 +226,16 @@ def main():
             )
             sys.exit(1)
 
-    # FIXME performance
-    performance_urls = []
-    performance_path = build_output_path / "performance.tar.zst"
-    if performance_path.exists():
-        performance_urls.append(
-            s3_helper.upload_build_file_to_s3(performance_path, s3_performance_path)
-        )
-        logging.info(
-            "Uploaded performance.tar.zst to %s, now delete to avoid duplication",
-            performance_urls[0],
-        )
-        performance_path.unlink()
-
-    build_urls = (
-        s3_helper.upload_build_directory_to_s3(
-            build_output_path,
-            s3_path_prefix,
-            keep_dirs_in_s3_path=False,
-            upload_symlinks=False,
-        )
-        + performance_urls
-    )
-    logging.info("Got build URLs %s", build_urls)
-
-    print("::notice ::Build URLs: {}".format("\n".join(build_urls)))
-
-    if log_path.exists():
-        log_url = s3_helper.upload_build_file_to_s3(
-            log_path, s3_path_prefix + "/" + log_path.name
-        )
-        logging.info("Log url %s", log_url)
-    else:
-        logging.info("Build log doesn't exist")
-
-    print(f"::notice ::Log URL: {log_url}")
-
-    build_result = BuildResult(
-        build_name,
-        log_url,
-        build_urls,
-        version.describe,
-        build_status,
-        elapsed,
-        GITHUB_JOB_API_URL(),
-    )
-    result_json_path = build_result.write_json(temp_path)
-    logging.info(
-        "Build result file %s is written, content:\n %s",
-        result_json_path,
-        result_json_path.read_text(encoding="utf-8"),
-    )
-
-    upload_master_static_binaries(pr_info, build_config, s3_helper, build_output_path)
-
-    # Upload profile data
-    ch_helper = ClickHouseHelper()
-
-    ci_logs_credentials = CiLogsCredentials(Path("/dev/null"))
-    if ci_logs_credentials.host:
-        instance_type = get_instance_type()
-        instance_id = get_instance_id()
-        query = f"""INSERT INTO build_time_trace
-(
-    pull_request_number,
-    commit_sha,
-    check_start_time,
-    check_name,
-    instance_type,
-    instance_id,
-    file,
-    library,
-    time,
-    pid,
-    tid,
-    ph,
-    ts,
-    dur,
-    cat,
-    name,
-    detail,
-    count,
-    avgMs,
-    args_name
-)
-SELECT {pr_info.number}, '{pr_info.sha}', '{stopwatch.start_time_str}', '{build_name}', '{instance_type}', '{instance_id}', *
-FROM input('
-    file String,
-    library String,
-    time DateTime64(6),
-    pid UInt32,
-    tid UInt32,
-    ph String,
-    ts UInt64,
-    dur UInt64,
-    cat String,
-    name String,
-    detail String,
-    count UInt64,
-    avgMs UInt64,
-    args_name String')
-FORMAT JSONCompactEachRow"""
-
-        auth = {
-            "X-ClickHouse-User": "ci",
-            "X-ClickHouse-Key": ci_logs_credentials.password,
-        }
-        url = f"https://{ci_logs_credentials.host}/"
-        profiles_dir = temp_path / "profiles_source"
-        profiles_dir.mkdir(parents=True, exist_ok=True)
-        logging.info(
-            "Processing profile JSON files from %s", repo_path / "build_docker"
-        )
-        git_runner(
-            "./utils/prepare-time-trace/prepare-time-trace.sh "
-            f"build_docker {profiles_dir.absolute()}"
-        )
-        profile_data_file = temp_path / "profile.json"
-        with open(profile_data_file, "wb") as profile_fd:
-            for profile_source in profiles_dir.iterdir():
-                if profile_source.name != "binary_sizes.txt":
-                    with open(profiles_dir / profile_source, "rb") as ps_fd:
-                        profile_fd.write(ps_fd.read())
-
-        logging.info(
-            "::notice ::Log Uploading profile data, path: %s, size: %s, query: %s",
-            profile_data_file,
-            profile_data_file.stat().st_size,
-            query,
-        )
-        ch_helper.insert_file(url, auth, query, profile_data_file)
-
-        query = f"""INSERT INTO binary_sizes
-(
-    pull_request_number,
-    commit_sha,
-    check_start_time,
-    check_name,
-    instance_type,
-    instance_id,
-    file,
-    size
-)
-SELECT {pr_info.number}, '{pr_info.sha}', '{stopwatch.start_time_str}', '{build_name}', '{instance_type}', '{instance_id}', file, size
-FROM input('size UInt64, file String')
-SETTINGS format_regexp = '^\\s*(\\d+) (.+)$'
-FORMAT Regexp"""
-
-        binary_sizes_file = profiles_dir / "binary_sizes.txt"
-
-        logging.info(
-            "::notice ::Log Uploading binary sizes data, path: %s, size: %s, query: %s",
-            binary_sizes_file,
-            binary_sizes_file.stat().st_size,
-            query,
-        )
-        ch_helper.insert_file(url, auth, query, binary_sizes_file)
-
-    # Upload statistics to CI database
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        [],
-        build_status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        log_url,
-        f"Build ({build_name})",
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=version.describe,
+        test_results=[],
+        status=build_status,
+        start_time=stopwatch.start_time_str,
+        duration=elapsed,
+        additional_files=[log_path],
+        build_dir_for_upload=build_output_path,
+        version=version.describe,
+    ).dump()
 
     # Fail the build job if it didn't succeed
     if build_status != SUCCESS:
diff --git a/tests/ci/build_download_helper.py b/tests/ci/build_download_helper.py
index 21012f6337d..0d89515d5d8 100644
--- a/tests/ci/build_download_helper.py
+++ b/tests/ci/build_download_helper.py
@@ -6,9 +6,12 @@ import os
 import sys
 import time
 from pathlib import Path
-from typing import Any, Callable, List, Union
+from typing import Any, Callable, List, Optional, Union
 
-import requests  # type: ignore
+# isort: off
+import requests
+
+# isort: on
 
 import get_robot_token as grt  # we need an updated ROBOT_TOKEN
 from ci_config import CI_CONFIG
@@ -30,9 +33,10 @@ def get_with_retries(
         "Getting URL with %i tries and sleep %i in between: %s", retries, sleep, url
     )
     exc = Exception("A placeholder to satisfy typing and avoid nesting")
+    timeout = kwargs.pop("timeout", 30)
     for i in range(retries):
         try:
-            response = requests.get(url, **kwargs)
+            response = requests.get(url, timeout=timeout, **kwargs)
             response.raise_for_status()
             return response
         except Exception as e:
@@ -74,10 +78,11 @@ def get_gh_api(
     token_is_set = "Authorization" in kwargs.get("headers", {})
     exc = Exception("A placeholder to satisfy typing and avoid nesting")
     try_cnt = 0
+    timeout = kwargs.pop("timeout", 30)
     while try_cnt < retries:
         try_cnt += 1
         try:
-            response = requests.get(url, **kwargs)
+            response = requests.get(url, timeout=timeout, **kwargs)
             response.raise_for_status()
             return response
         except requests.HTTPError as e:
@@ -85,7 +90,8 @@ def get_gh_api(
             ratelimit_exceeded = (
                 e.response.status_code == 403
                 and b"rate limit exceeded"
-                in e.response._content  # pylint:disable=protected-access
+                # pylint:disable-next=protected-access
+                in (e.response._content or b"")
             )
             try_auth = e.response.status_code == 404
             if (ratelimit_exceeded or try_auth) and not token_is_set:
@@ -112,12 +118,16 @@ def get_build_name_for_check(check_name: str) -> str:
 
 def read_build_urls(build_name: str, reports_path: Union[Path, str]) -> List[str]:
     for root, _, files in os.walk(reports_path):
-        for f in files:
-            if build_name in f:
-                logging.info("Found build report json %s", f)
-                with open(os.path.join(root, f), "r", encoding="utf-8") as file_handler:
+        for file in files:
+            if file.endswith(f"_{build_name}.json"):
+                logging.info("Found build report json %s for %s", file, build_name)
+                with open(
+                    os.path.join(root, file), "r", encoding="utf-8"
+                ) as file_handler:
                     build_report = json.load(file_handler)
                     return build_report["build_urls"]  # type: ignore
+
+    logging.info("A build report is not found for %s", build_name)
     return []
 
 
@@ -175,21 +185,24 @@ def download_build_with_progress(url: str, path: Path) -> None:
 
 
 def download_builds(
-    result_path: str, build_urls: List[str], filter_fn: Callable[[str], bool]
+    result_path: Path, build_urls: List[str], filter_fn: Callable[[str], bool]
 ) -> None:
     for url in build_urls:
         if filter_fn(url):
             fname = os.path.basename(url.replace("%2B", "+").replace("%20", " "))
             logging.info("Will download %s to %s", fname, result_path)
-            download_build_with_progress(url, Path(result_path) / fname)
+            download_build_with_progress(url, result_path / fname)
 
 
 def download_builds_filter(
-    check_name, reports_path, result_path, filter_fn=lambda _: True
-):
+    check_name: str,
+    reports_path: Union[Path, str],
+    result_path: Path,
+    filter_fn: Callable[[str], bool] = lambda _: True,
+) -> None:
     build_name = get_build_name_for_check(check_name)
     urls = read_build_urls(build_name, reports_path)
-    print(urls)
+    logging.info("The build report for %s contains the next URLs: %s", build_name, urls)
 
     if not urls:
         raise DownloadException("No build URLs found")
@@ -197,25 +210,50 @@ def download_builds_filter(
     download_builds(result_path, urls, filter_fn)
 
 
-def download_all_deb_packages(check_name, reports_path, result_path):
+def download_all_deb_packages(
+    check_name: str, reports_path: Union[Path, str], result_path: Path
+) -> None:
     download_builds_filter(
         check_name, reports_path, result_path, lambda x: x.endswith("deb")
     )
 
 
-def download_unit_tests(check_name, reports_path, result_path):
+def download_unit_tests(
+    check_name: str, reports_path: Union[Path, str], result_path: Path
+) -> None:
     download_builds_filter(
         check_name, reports_path, result_path, lambda x: x.endswith("unit_tests_dbms")
     )
 
 
-def download_clickhouse_binary(check_name, reports_path, result_path):
+def download_clickhouse_binary(
+    check_name: str, reports_path: Union[Path, str], result_path: Path
+) -> None:
     download_builds_filter(
         check_name, reports_path, result_path, lambda x: x.endswith("clickhouse")
     )
 
 
-def download_performance_build(check_name, reports_path, result_path):
+def get_clickhouse_binary_url(
+    check_name: str, reports_path: Union[Path, str]
+) -> Optional[str]:
+    build_name = get_build_name_for_check(check_name)
+    urls = read_build_urls(build_name, reports_path)
+    logging.info("The build report for %s contains the next URLs: %s", build_name, urls)
+    for url in urls:
+        check_url = url
+        if "?" in check_url:
+            check_url = check_url.split("?")[0]
+
+        if check_url.endswith("clickhouse"):
+            return url
+
+    return None
+
+
+def download_performance_build(
+    check_name: str, reports_path: Union[Path, str], result_path: Path
+) -> None:
     download_builds_filter(
         check_name,
         reports_path,
@@ -224,7 +262,9 @@ def download_performance_build(check_name, reports_path, result_path):
     )
 
 
-def download_fuzzers(check_name, reports_path, result_path):
+def download_fuzzers(
+    check_name: str, reports_path: Union[Path, str], result_path: Path
+) -> None:
     download_builds_filter(
         check_name,
         reports_path,
diff --git a/tests/ci/build_report_check.py b/tests/ci/build_report_check.py
index d9925725eec..48640f15ac0 100644
--- a/tests/ci/build_report_check.py
+++ b/tests/ci/build_report_check.py
@@ -1,42 +1,30 @@
 #!/usr/bin/env python3
 
-import json
 import logging
 import os
 import sys
-import atexit
 from pathlib import Path
 from typing import List
 
-from github import Github
-
+from ci_config import CI_CONFIG, Build
 from env_helper import (
     GITHUB_JOB_URL,
     GITHUB_REPOSITORY,
     GITHUB_SERVER_URL,
-    TEMP_PATH,
     REPORT_PATH,
+    TEMP_PATH,
 )
+from pr_info import PRInfo
 from report import (
-    BuildResult,
     ERROR,
     PENDING,
     SUCCESS,
+    BuildResult,
+    JobReport,
     create_build_html_report,
     get_worst_status,
 )
-from s3_helper import S3Helper
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from commit_status_helper import (
-    RerunHelper,
-    format_description,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-)
-from ci_config import CI_CONFIG
-
+from stopwatch import Stopwatch
 
 # Old way to read the neads_data
 NEEDS_DATA_PATH = os.getenv("NEEDS_DATA_PATH", "")
@@ -46,6 +34,7 @@ NEEDS_DATA = os.getenv("NEEDS_DATA", "")
 
 def main():
     logging.basicConfig(level=logging.INFO)
+    stopwatch = Stopwatch()
     temp_path = Path(TEMP_PATH)
     reports_path = Path(REPORT_PATH)
     temp_path.mkdir(parents=True, exist_ok=True)
@@ -56,64 +45,43 @@ def main():
     )
 
     build_check_name = sys.argv[1]
-    needs_data: List[str] = []
-    required_builds = 0
 
-    if NEEDS_DATA:
-        needs_data = json.loads(NEEDS_DATA)
-        # drop non build jobs if any
-        needs_data = [d for d in needs_data if "Build" in d]
-    elif os.path.exists(NEEDS_DATA_PATH):
-        with open(NEEDS_DATA_PATH, "rb") as file_handler:
-            needs_data = list(json.load(file_handler).keys())
-    else:
-        assert False, "NEEDS_DATA env var required"
-
-    required_builds = len(needs_data)
-
-    if needs_data:
-        logging.info("The next builds are required: %s", ", ".join(needs_data))
-
-    gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
-    commit = get_commit(gh, pr_info.sha)
 
-    atexit.register(update_mergeable_check, commit, 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)
-
-    builds_for_check = CI_CONFIG.get_builds_for_report(build_check_name)
-    required_builds = required_builds or len(builds_for_check)
+    builds_for_check = CI_CONFIG.get_builds_for_report(
+        build_check_name,
+        release=pr_info.is_release(),
+        backport=pr_info.head_ref.startswith("backport/"),
+    )
+    required_builds = len(builds_for_check)
+    missing_builds = 0
 
     # Collect reports from json artifacts
-    build_results = []
+    build_results = []  # type: List[BuildResult]
     for build_name in builds_for_check:
-        build_result = BuildResult.read_json(reports_path, build_name)
-        if build_result.is_missing:
-            logging.warning("Build results for %s are missing", build_name)
-            continue
-        build_results.append(build_result)
-
-    # The code to collect missing reports for failed jobs
-    missing_job_names = [
-        name
-        for name in needs_data
-        if not any(1 for br in build_results if br.job_name.startswith(name))
-    ]
-    missing_builds = len(missing_job_names)
-    for job_name in reversed(missing_job_names):
-        build_result = BuildResult.missing_result("missing")
-        build_result.job_name = job_name
-        build_result.status = PENDING
-        logging.info(
-            "There is missing report for %s, created a dummy result %s",
-            job_name,
-            build_result,
+        build_result = BuildResult.load_any(
+            build_name, pr_info.number, pr_info.head_ref
         )
-        build_results.insert(0, build_result)
+        if not build_result:
+            if build_name == Build.FUZZERS:
+                logging.info("Build [%s] is missing - skip", Build.FUZZERS)
+                continue
+            logging.warning("Build results for %s is missing", build_name)
+            build_result = BuildResult.missing_result("missing")
+            build_result.job_name = build_name
+            build_result.status = PENDING
+            logging.info(
+                "There is missing report for %s, created a dummy result %s",
+                build_name,
+                build_result,
+            )
+            missing_builds += 1
+            build_results.insert(0, build_result)
+        else:
+            assert (
+                pr_info.head_ref == build_result.head_ref or pr_info.number > 0
+            ), "BUG. if not a PR, report must be created on the same branch"
+            build_results.append(build_result)
 
     # Calculate artifact groups like packages and binaries
     total_groups = sum(len(br.grouped_urls) for br in build_results)
@@ -125,8 +93,6 @@ def main():
         logging.error("No success builds, failing check without creating a status")
         sys.exit(1)
 
-    s3_helper = S3Helper()
-
     branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commits/master"
     branch_name = "master"
     if pr_info.number != 0:
@@ -146,18 +112,6 @@ def main():
     report_path = temp_path / "report.html"
     report_path.write_text(report, encoding="utf-8")
 
-    logging.info("Going to upload prepared report")
-    context_name_for_path = build_check_name.lower().replace(" ", "_")
-    s3_path_prefix = (
-        str(pr_info.number) + "/" + pr_info.sha + "/" + context_name_for_path
-    )
-
-    url = s3_helper.upload_test_report_to_s3(
-        report_path, s3_path_prefix + "/report.html"
-    )
-    logging.info("Report url %s", url)
-    print(f"::notice ::Report url: {url}")
-
     # Prepare a commit status
     summary_status = get_worst_status(br.status for br in build_results)
 
@@ -174,19 +128,16 @@ def main():
             f" ({required_builds - missing_builds} of {required_builds} builds are OK)"
         )
 
-    description = format_description(
-        f"{ok_groups}/{total_groups} artifact groups are OK{addition}"
-    )
+    description = f"{ok_groups}/{total_groups} artifact groups are OK{addition}"
 
-    post_commit_status(
-        commit,
-        summary_status,
-        url,
-        description,
-        build_check_name,
-        pr_info,
-        dump_to_file=True,
-    )
+    JobReport(
+        description=description,
+        test_results=[],
+        status=summary_status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[report_path],
+    ).dump()
 
     if summary_status == ERROR:
         sys.exit(1)
diff --git a/tests/ci/cache_utils.py b/tests/ci/cache_utils.py
index 0906b1d14e5..a0692f4eff2 100644
--- a/tests/ci/cache_utils.py
+++ b/tests/ci/cache_utils.py
@@ -116,9 +116,22 @@ class Cache:
         self.s3_helper = s3_helper
 
     def _download(self, url: str, ignore_error: bool = False) -> None:
+        self.temp_path.mkdir(parents=True, exist_ok=True)
         compressed_cache = self.temp_path / self.archive_name
         try:
-            download_build_with_progress(url, compressed_cache)
+            if url.startswith("file://"):
+                local_s3_cache = Path(url[7:])
+                if local_s3_cache.is_file():
+                    shutil.copy2(local_s3_cache, compressed_cache)
+                else:
+                    logging.warning(
+                        "The local cache file %s does not exist, creating empty directory",
+                        local_s3_cache,
+                    )
+                    self.directory.mkdir(parents=True, exist_ok=True)
+                    return
+            else:
+                download_build_with_progress(url, compressed_cache)
         except DownloadException as e:
             if not ignore_error:
                 raise CacheError(f"Failed to download {url}") from e
@@ -149,7 +162,7 @@ class Cache:
                 logging.info("Remote cache %s already exist, won't reupload", s3_path)
                 return
 
-        logging.info("Compressing cargo cache")
+        logging.info("Compressing cache")
         archive_path = self.temp_path / self.archive_name
         compress_fast(self.directory, archive_path)
         logging.info("Uploading %s to S3 path %s", archive_path, s3_path)
diff --git a/tests/ci/cancel_and_rerun_workflow_lambda/app.py b/tests/ci/cancel_and_rerun_workflow_lambda/app.py
index 8282fb7768a..625936ec5c8 100644
--- a/tests/ci/cancel_and_rerun_workflow_lambda/app.py
+++ b/tests/ci/cancel_and_rerun_workflow_lambda/app.py
@@ -1,28 +1,23 @@
 #!/usr/bin/env python3
 
+import json
+import time
 from base64 import b64decode
 from collections import namedtuple
-from typing import Any, Dict, List, Optional, Tuple
-from threading import Thread
 from queue import Queue
-import json
-import re
-import time
+from threading import Thread
+from typing import Any, Dict, List, Optional
 
-import requests  # type: ignore
-
-from lambda_shared.pr import CATEGORY_TO_LABEL, check_pr_description
+import requests
+from lambda_shared.pr import check_pr_description
 from lambda_shared.token import get_cached_access_token
 
-
-NEED_RERUN_ON_EDITED = {
-    "PullRequestCI",
-    "DocsCheck",
-}
-
 NEED_RERUN_OR_CANCELL_WORKFLOWS = {
     "BackportPR",
-}.union(NEED_RERUN_ON_EDITED)
+    "DocsCheck",
+    "MasterCI",
+    "PullRequestCI",
+}
 
 MAX_RETRY = 5
 
@@ -52,16 +47,18 @@ class Worker(Thread):
 
 def _exec_get_with_retry(url: str, token: str) -> dict:
     headers = {"Authorization": f"token {token}"}
+    e = Exception()
     for i in range(MAX_RETRY):
         try:
-            response = requests.get(url, headers=headers)
+            response = requests.get(url, headers=headers, timeout=30)
             response.raise_for_status()
             return response.json()  # type: ignore
         except Exception as ex:
             print("Got exception executing request", ex)
+            e = ex
             time.sleep(i + 1)
 
-    raise Exception("Cannot execute GET request with retries")
+    raise requests.HTTPError("Cannot execute GET request with retries") from e
 
 
 WorkflowDescription = namedtuple(
@@ -219,16 +216,18 @@ def get_workflow_description(workflow_url: str, token: str) -> WorkflowDescripti
 
 def _exec_post_with_retry(url: str, token: str, json: Optional[Any] = None) -> Any:
     headers = {"Authorization": f"token {token}"}
+    e = Exception()
     for i in range(MAX_RETRY):
         try:
-            response = requests.post(url, headers=headers, json=json)
+            response = requests.post(url, headers=headers, json=json, timeout=30)
             response.raise_for_status()
             return response.json()
         except Exception as ex:
             print("Got exception executing request", ex)
+            e = ex
             time.sleep(i + 1)
 
-    raise Exception("Cannot execute POST request with retry")
+    raise requests.HTTPError("Cannot execute POST request with retry") from e
 
 
 def exec_workflow_url(urls_to_post, token):
diff --git a/tests/ci/cherry_pick.py b/tests/ci/cherry_pick.py
index 93677c2c07b..d92504e30bd 100644
--- a/tests/ci/cherry_pick.py
+++ b/tests/ci/cherry_pick.py
@@ -32,6 +32,7 @@ from pathlib import Path
 from subprocess import CalledProcessError
 from typing import List, Optional
 
+import __main__
 from env_helper import TEMP_PATH
 from get_robot_token import get_best_robot_token
 from git_helper import git_runner, is_shallow
@@ -455,11 +456,13 @@ class Backport:
         tomorrow = date.today() + timedelta(days=1)
         logging.info("Receive PRs suppose to be backported")
 
-        query_args = dict(
-            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],
-        )
+        query_args = {
+            "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("Query to find the backport PRs:\n %s", query_args)
         self.prs_for_backport = self.gh.get_pulls_from_search(**query_args)
         logging.info(
@@ -606,16 +609,18 @@ def parse_args():
 
 @contextmanager
 def clear_repo():
-    orig_ref = git_runner("git branch --show-current") or git_runner(
-        "git rev-parse HEAD"
-    )
+    def ref():
+        return git_runner("git branch --show-current") or git_runner(
+            "git rev-parse HEAD"
+        )
+
+    orig_ref = ref()
     try:
         yield
-    except (Exception, KeyboardInterrupt):
-        git_runner(f"git checkout -f {orig_ref}")
-        raise
-    else:
-        git_runner(f"git checkout -f {orig_ref}")
+    finally:
+        current_ref = ref()
+        if orig_ref != current_ref:
+            git_runner(f"git checkout -f {orig_ref}")
 
 
 @contextmanager
@@ -623,15 +628,14 @@ def stash():
     # diff.ignoreSubmodules=all don't show changed submodules
     need_stash = bool(git_runner("git -c diff.ignoreSubmodules=all diff HEAD"))
     if need_stash:
-        git_runner("git stash push --no-keep-index -m 'running cherry_pick.py'")
+        script = (
+            __main__.__file__ if hasattr(__main__, "__file__") else "unknown script"
+        )
+        git_runner(f"git stash push --no-keep-index -m 'running {script}'")
     try:
         with clear_repo():
             yield
-    except (Exception, KeyboardInterrupt):
-        if need_stash:
-            git_runner("git stash pop")
-        raise
-    else:
+    finally:
         if need_stash:
             git_runner("git stash pop")
 
diff --git a/tests/ci/ci.py b/tests/ci/ci.py
index 701f66b9a6a..8434355ce46 100644
--- a/tests/ci/ci.py
+++ b/tests/ci/ci.py
@@ -1,32 +1,965 @@
 import argparse
 import concurrent.futures
 import json
+import logging
 import os
+import random
 import re
 import subprocess
 import sys
+import time
+from copy import deepcopy
+from dataclasses import asdict, dataclass
+from enum import Enum
 from pathlib import Path
-from typing import Any, Dict, Iterable, List, Optional
+from typing import Any, Dict, List, Optional, Sequence, Set, Tuple, Union
 
 import docker_images_helper
-from ci_config import CI_CONFIG
+import upload_result_helper
+from build_check import get_release_or_pr
+from ci_config import CI_CONFIG, Build, CIStages, Labels, JobNames
+from ci_utils import GHActions, is_hex, normalize_string
+from clickhouse_helper import (
+    CiLogsCredentials,
+    ClickHouseHelper,
+    InsertException,
+    get_instance_id,
+    get_instance_type,
+    prepare_tests_results_for_clickhouse,
+)
 from commit_status_helper import (
     CommitStatusData,
+    RerunHelper,
     format_description,
     get_commit,
+    post_commit_status,
     set_status_comment,
+    update_mergeable_check,
 )
 from digest_helper import DockerDigester, JobDigester
-from env_helper import CI, REPORT_PATH, ROOT_DIR, S3_BUILDS_BUCKET, TEMP_PATH
+from env_helper import (
+    CI,
+    GITHUB_JOB_API_URL,
+    GITHUB_RUN_URL,
+    REPO_COPY,
+    REPORT_PATH,
+    S3_BUILDS_BUCKET,
+    TEMP_PATH,
+)
 from get_robot_token import get_best_robot_token
 from git_helper import GIT_PREFIX, Git
 from git_helper import Runner as GitRunner
 from github import Github
 from pr_info import PRInfo
-from report import BuildResult
+from report import ERROR, SUCCESS, BuildResult, JobReport
 from s3_helper import S3Helper
 from version_helper import get_version_from_repo
 
+# pylint: disable=too-many-lines
+
+
+@dataclass
+class PendingState:
+    updated_at: float
+    run_url: str
+
+
+class CiCache:
+    """
+    CI cache is a bunch of records. Record is a file stored under special location on s3.
+    The file name has following format
+
+        <RECORD_TYPE>_[<ATTRIBUTES>]--<JOB_NAME>_<JOB_DIGEST>_<BATCH>_<NUM_BATCHES>.ci
+
+    RECORD_TYPE:
+        SUCCESSFUL - for successfuly finished jobs
+        PENDING - for pending jobs
+
+    ATTRIBUTES:
+        release - for jobs being executed on the release branch including master branch (not a PR branch)
+    """
+
+    _S3_CACHE_PREFIX = "CI_cache_v1"
+    _CACHE_BUILD_REPORT_PREFIX = "build_report"
+    _RECORD_FILE_EXTENSION = ".ci"
+    _LOCAL_CACHE_PATH = Path(TEMP_PATH) / "ci_cache"
+    _ATTRIBUTE_RELEASE = "release"
+    # divider symbol 1
+    _DIV1 = "--"
+    # divider symbol 2
+    _DIV2 = "_"
+    assert _DIV1 != _DIV2
+
+    class RecordType(Enum):
+        SUCCESSFUL = "successful"
+        PENDING = "pending"
+        FAILED = "failed"
+
+    @dataclass
+    class Record:
+        record_type: "CiCache.RecordType"
+        job_name: str
+        job_digest: str
+        batch: int
+        num_batches: int
+        release_branch: bool
+        file: str = ""
+
+        def to_str_key(self):
+            """other fields must not be included in the hash str"""
+            return "_".join(
+                [self.job_name, self.job_digest, str(self.batch), str(self.num_batches)]
+            )
+
+    class JobType(Enum):
+        DOCS = "DOCS"
+        SRCS = "SRCS"
+
+        @classmethod
+        def is_docs_job(cls, job_name: str) -> bool:
+            return job_name == JobNames.DOCS_CHECK
+
+        @classmethod
+        def is_srcs_job(cls, job_name: str) -> bool:
+            return not cls.is_docs_job(job_name)
+
+        @classmethod
+        def get_type_by_name(cls, job_name: str) -> "CiCache.JobType":
+            res = cls.SRCS
+            if cls.is_docs_job(job_name):
+                res = cls.DOCS
+            elif cls.is_srcs_job(job_name):
+                res = cls.SRCS
+            else:
+                assert False
+            return res
+
+    def __init__(
+        self,
+        s3: S3Helper,
+        job_digests: Dict[str, str],
+    ):
+        self.s3 = s3
+        self.job_digests = job_digests
+        self.cache_s3_paths = {
+            job_type: f"{self._S3_CACHE_PREFIX}/{job_type.value}-{self._get_digest_for_job_type(self.job_digests, job_type)}/"
+            for job_type in self.JobType
+        }
+        self.s3_record_prefixes = {
+            record_type: record_type.value for record_type in self.RecordType
+        }
+        self.records: Dict["CiCache.RecordType", Dict[str, "CiCache.Record"]] = {
+            record_type: {} for record_type in self.RecordType
+        }
+
+        self.cache_updated = False
+        self.cache_data_fetched = True
+        if not self._LOCAL_CACHE_PATH.exists():
+            self._LOCAL_CACHE_PATH.mkdir(parents=True, exist_ok=True)
+
+    def _get_digest_for_job_type(
+        self, job_digests: Dict[str, str], job_type: JobType
+    ) -> str:
+        if job_type == self.JobType.DOCS:
+            res = job_digests[JobNames.DOCS_CHECK]
+        elif job_type == self.JobType.SRCS:
+            # any build type job has the same digest - pick up Build.PACKAGE_RELEASE or Build.PACKAGE_ASAN as a failover
+            # Build.PACKAGE_RELEASE may not exist in the list if we have reduced CI pipeline
+            if Build.PACKAGE_RELEASE in job_digests:
+                res = job_digests[Build.PACKAGE_RELEASE]
+            elif Build.PACKAGE_ASAN in job_digests:
+                # failover, if failover does not work - fix it!
+                res = job_digests[Build.PACKAGE_ASAN]
+            else:
+                assert False, "BUG, no build job in digest' list"
+        else:
+            assert False, "BUG, New JobType? - please update func"
+        return res
+
+    def _get_record_file_name(
+        self,
+        record_type: RecordType,
+        job_name: str,
+        batch: int,
+        num_batches: int,
+        release_branch: bool,
+    ) -> str:
+        prefix = self.s3_record_prefixes[record_type]
+        prefix_extended = (
+            self._DIV2.join([prefix, self._ATTRIBUTE_RELEASE])
+            if release_branch
+            else prefix
+        )
+        assert self._DIV1 not in job_name, f"Invalid job name {job_name}"
+        job_name = self._DIV2.join(
+            [job_name, self.job_digests[job_name], str(batch), str(num_batches)]
+        )
+        file_name = self._DIV1.join([prefix_extended, job_name])
+        file_name += self._RECORD_FILE_EXTENSION
+        return file_name
+
+    def _get_record_s3_path(self, job_name: str) -> str:
+        return self.cache_s3_paths[self.JobType.get_type_by_name(job_name)]
+
+    def _parse_record_file_name(
+        self, record_type: RecordType, file_name: str
+    ) -> Optional["CiCache.Record"]:
+        # validate filename
+        if (
+            not file_name.endswith(self._RECORD_FILE_EXTENSION)
+            or not len(file_name.split(self._DIV1)) == 2
+        ):
+            print("ERROR: wrong file name format")
+            return None
+
+        file_name = file_name.removesuffix(self._RECORD_FILE_EXTENSION)
+        release_branch = False
+
+        prefix_extended, job_suffix = file_name.split(self._DIV1)
+        record_type_and_attribute = prefix_extended.split(self._DIV2)
+
+        # validate filename prefix
+        failure = False
+        if not 0 < len(record_type_and_attribute) <= 2:
+            print("ERROR: wrong file name prefix")
+            failure = True
+        if (
+            len(record_type_and_attribute) > 1
+            and record_type_and_attribute[1] != self._ATTRIBUTE_RELEASE
+        ):
+            print("ERROR: wrong record attribute")
+            failure = True
+        if record_type_and_attribute[0] != self.s3_record_prefixes[record_type]:
+            print("ERROR: wrong record type")
+            failure = True
+        if failure:
+            return None
+
+        if (
+            len(record_type_and_attribute) > 1
+            and record_type_and_attribute[1] == self._ATTRIBUTE_RELEASE
+        ):
+            release_branch = True
+
+        job_properties = job_suffix.split(self._DIV2)
+        job_name, job_digest, batch, num_batches = (
+            self._DIV2.join(job_properties[:-3]),
+            job_properties[-3],
+            int(job_properties[-2]),
+            int(job_properties[-1]),
+        )
+
+        if not is_hex(job_digest):
+            print("ERROR: wrong record job digest")
+            return None
+
+        record = self.Record(
+            record_type,
+            job_name,
+            job_digest,
+            batch,
+            num_batches,
+            release_branch,
+            file="",
+        )
+        return record
+
+    def print_status(self):
+        for record_type in self.RecordType:
+            GHActions.print_in_group(
+                f"Cache records: [{record_type}]", list(self.records[record_type])
+            )
+        return self
+
+    def update(self):
+        """
+        Pulls cache records from s3. Only records name w/o content.
+        """
+        for record_type in self.RecordType:
+            prefix = self.s3_record_prefixes[record_type]
+            cache_list = self.records[record_type]
+            for job_type in self.JobType:
+                path = self.cache_s3_paths[job_type]
+                records = self.s3.list_prefix(f"{path}{prefix}", S3_BUILDS_BUCKET)
+                records = [record.split("/")[-1] for record in records]
+                for file in records:
+                    record = self._parse_record_file_name(
+                        record_type=record_type, file_name=file
+                    )
+                    if not record:
+                        print(f"ERROR: failed to parse cache record [{file}]")
+                        continue
+                    if (
+                        record.job_name not in self.job_digests
+                        or self.job_digests[record.job_name] != record.job_digest
+                    ):
+                        # skip records we are not interested in
+                        continue
+
+                    if record.to_str_key() not in cache_list:
+                        cache_list[record.to_str_key()] = record
+                        self.cache_data_fetched = False
+                    elif (
+                        not cache_list[record.to_str_key()].release_branch
+                        and record.release_branch
+                    ):
+                        # replace a non-release record with a release one
+                        cache_list[record.to_str_key()] = record
+                        self.cache_data_fetched = False
+
+        self.cache_updated = True
+        return self
+
+    def fetch_records_data(self):
+        """
+        Pulls CommitStatusData for all cached jobs from s3
+        """
+        if not self.cache_updated:
+            self.update()
+
+        if self.cache_data_fetched:
+            # there are no records without fetched data - no need to fetch
+            return self
+
+        # clean up
+        for file in self._LOCAL_CACHE_PATH.glob("*.ci"):
+            file.unlink()
+
+        # download all record files
+        for job_type in self.JobType:
+            path = self.cache_s3_paths[job_type]
+            for record_type in self.RecordType:
+                prefix = self.s3_record_prefixes[record_type]
+                _ = self.s3.download_files(
+                    bucket=S3_BUILDS_BUCKET,
+                    s3_path=f"{path}{prefix}",
+                    file_suffix=self._RECORD_FILE_EXTENSION,
+                    local_directory=self._LOCAL_CACHE_PATH,
+                )
+
+        # validate we have files for all records and save file names meanwhile
+        for record_type in self.RecordType:
+            record_list = self.records[record_type]
+            for _, record in record_list.items():
+                record_file_name = self._get_record_file_name(
+                    record_type,
+                    record.job_name,
+                    record.batch,
+                    record.num_batches,
+                    record.release_branch,
+                )
+                assert (
+                    self._LOCAL_CACHE_PATH / record_file_name
+                ).is_file(), f"BUG. Record file must be present: {self._LOCAL_CACHE_PATH / record_file_name}"
+                record.file = record_file_name
+
+        self.cache_data_fetched = True
+        return self
+
+    def exist(
+        self,
+        record_type: "CiCache.RecordType",
+        job: str,
+        batch: int,
+        num_batches: int,
+        release_branch: bool,
+    ) -> bool:
+        if not self.cache_updated:
+            self.update()
+        record_key = self.Record(
+            record_type,
+            job,
+            self.job_digests[job],
+            batch,
+            num_batches,
+            release_branch,
+        ).to_str_key()
+        res = record_key in self.records[record_type]
+        if release_branch:
+            return res and self.records[record_type][record_key].release_branch
+        else:
+            return res
+
+    def push(
+        self,
+        record_type: "CiCache.RecordType",
+        job: str,
+        batches: Union[int, Sequence[int]],
+        num_batches: int,
+        status: Union[CommitStatusData, PendingState],
+        release_branch: bool = False,
+    ) -> None:
+        """
+        Pushes a cache record (CommitStatusData)
+        @release_branch adds "release" attribute to a record
+        """
+        if isinstance(batches, int):
+            batches = [batches]
+        for batch in batches:
+            record_file = self._LOCAL_CACHE_PATH / self._get_record_file_name(
+                record_type, job, batch, num_batches, release_branch
+            )
+            record_s3_path = self._get_record_s3_path(job)
+            if record_type == self.RecordType.SUCCESSFUL:
+                assert isinstance(status, CommitStatusData)
+                status.dump_to_file(record_file)
+            elif record_type == self.RecordType.FAILED:
+                assert isinstance(status, CommitStatusData)
+                status.dump_to_file(record_file)
+            elif record_type == self.RecordType.PENDING:
+                assert isinstance(status, PendingState)
+                with open(record_file, "w", encoding="utf-8") as json_file:
+                    json.dump(asdict(status), json_file)
+            else:
+                assert False
+
+            _ = self.s3.upload_file(
+                bucket=S3_BUILDS_BUCKET,
+                file_path=record_file,
+                s3_path=record_s3_path + record_file.name,
+            )
+            record = self.Record(
+                record_type,
+                job,
+                self.job_digests[job],
+                batch,
+                num_batches,
+                release_branch,
+                file=record_file.name,
+            )
+            if (
+                record.release_branch
+                or record.to_str_key() not in self.records[record_type]
+            ):
+                self.records[record_type][record.to_str_key()] = record
+
+    def get(
+        self, record_type: "CiCache.RecordType", job: str, batch: int, num_batches: int
+    ) -> Optional[Union[CommitStatusData, PendingState]]:
+        """
+        Gets a cache record data for a job, or None if a cache miss
+        """
+
+        if not self.cache_data_fetched:
+            self.fetch_records_data()
+
+        record_key = self.Record(
+            record_type,
+            job,
+            self.job_digests[job],
+            batch,
+            num_batches,
+            release_branch=False,
+        ).to_str_key()
+
+        if record_key not in self.records[record_type]:
+            return None
+
+        record_file_name = self.records[record_type][record_key].file
+
+        res = CommitStatusData.load_from_file(
+            self._LOCAL_CACHE_PATH / record_file_name
+        )  # type: CommitStatusData
+
+        return res
+
+    def delete(
+        self,
+        record_type: "CiCache.RecordType",
+        job: str,
+        batch: int,
+        num_batches: int,
+        release_branch: bool,
+    ) -> None:
+        """
+        deletes record from the cache
+        """
+        raise NotImplementedError("Let's try make cache push-and-read-only")
+        # assert (
+        #     record_type == self.RecordType.PENDING
+        # ), "FIXME: delete is supported for pending records only"
+        # record_file_name = self._get_record_file_name(
+        #     self.RecordType.PENDING,
+        #     job,
+        #     batch,
+        #     num_batches,
+        #     release_branch=release_branch,
+        # )
+        # record_s3_path = self._get_record_s3_path(job)
+        # self.s3.delete_file_from_s3(S3_BUILDS_BUCKET, record_s3_path + record_file_name)
+
+        # record_key = self.Record(
+        #     record_type,
+        #     job,
+        #     self.job_digests[job],
+        #     batch,
+        #     num_batches,
+        #     release_branch=False,
+        # ).to_str_key()
+
+        # if record_key in self.records[record_type]:
+        #     del self.records[record_type][record_key]
+
+    def is_successful(
+        self, job: str, batch: int, num_batches: int, release_branch: bool
+    ) -> bool:
+        """
+        checks if a given job have already been done successfuly
+        """
+        return self.exist(
+            self.RecordType.SUCCESSFUL, job, batch, num_batches, release_branch
+        )
+
+    def is_failed(
+        self, job: str, batch: int, num_batches: int, release_branch: bool
+    ) -> bool:
+        """
+        checks if a given job have already been done with failure
+        """
+        return self.exist(
+            self.RecordType.FAILED, job, batch, num_batches, release_branch
+        )
+
+    def is_pending(
+        self, job: str, batch: int, num_batches: int, release_branch: bool
+    ) -> bool:
+        """
+        check pending record in the cache for a given job
+        @release_branch - checks that "release" attribute is set for a record
+        """
+        if self.is_successful(
+            job, batch, num_batches, release_branch
+        ) or self.is_failed(job, batch, num_batches, release_branch):
+            return False
+
+        return self.exist(
+            self.RecordType.PENDING, job, batch, num_batches, release_branch
+        )
+
+    def push_successful(
+        self,
+        job: str,
+        batch: int,
+        num_batches: int,
+        job_status: CommitStatusData,
+        release_branch: bool = False,
+    ) -> None:
+        """
+        Pushes a cache record (CommitStatusData)
+        @release_branch adds "release" attribute to a record
+        """
+        self.push(
+            self.RecordType.SUCCESSFUL,
+            job,
+            [batch],
+            num_batches,
+            job_status,
+            release_branch,
+        )
+
+    def push_failed(
+        self,
+        job: str,
+        batch: int,
+        num_batches: int,
+        job_status: CommitStatusData,
+        release_branch: bool = False,
+    ) -> None:
+        """
+        Pushes a cache record of type Failed (CommitStatusData)
+        @release_branch adds "release" attribute to a record
+        """
+        self.push(
+            self.RecordType.FAILED,
+            job,
+            [batch],
+            num_batches,
+            job_status,
+            release_branch,
+        )
+
+    def push_pending(
+        self, job: str, batches: List[int], num_batches: int, release_branch: bool
+    ) -> None:
+        """
+        pushes pending record for a job to the cache
+        """
+        pending_state = PendingState(time.time(), run_url=GITHUB_RUN_URL)
+        self.push(
+            self.RecordType.PENDING,
+            job,
+            batches,
+            num_batches,
+            pending_state,
+            release_branch,
+        )
+
+    def get_successful(
+        self, job: str, batch: int, num_batches: int
+    ) -> Optional[CommitStatusData]:
+        """
+        Gets a cache record (CommitStatusData) for a job, or None if a cache miss
+        """
+        res = self.get(self.RecordType.SUCCESSFUL, job, batch, num_batches)
+        assert res is None or isinstance(res, CommitStatusData)
+        return res
+
+    def delete_pending(
+        self, job: str, batch: int, num_batches: int, release_branch: bool
+    ) -> None:
+        """
+        deletes pending record from the cache
+        """
+        self.delete(self.RecordType.PENDING, job, batch, num_batches, release_branch)
+
+    def download_build_reports(self, file_prefix: str = "") -> List[str]:
+        """
+        not ideal class for this method,
+        but let it be as we store build reports in CI cache directory on s3
+        and CiCache knows where exactly
+
+        @file_prefix allows to filter out reports by git head_ref
+        """
+        report_path = Path(REPORT_PATH)
+        report_path.mkdir(exist_ok=True, parents=True)
+        path = (
+            self._get_record_s3_path(Build.PACKAGE_RELEASE)
+            + self._CACHE_BUILD_REPORT_PREFIX
+        )
+        if file_prefix:
+            path += "_" + file_prefix
+        reports_files = self.s3.download_files(
+            bucket=S3_BUILDS_BUCKET,
+            s3_path=path,
+            file_suffix=".json",
+            local_directory=report_path,
+        )
+        return reports_files
+
+    def upload_build_report(self, build_result: BuildResult) -> str:
+        result_json_path = build_result.write_json(Path(TEMP_PATH))
+        s3_path = (
+            self._get_record_s3_path(Build.PACKAGE_RELEASE) + result_json_path.name
+        )
+        return self.s3.upload_file(
+            bucket=S3_BUILDS_BUCKET, file_path=result_json_path, s3_path=s3_path
+        )
+
+    def await_jobs(
+        self, jobs_with_params: Dict[str, Dict[str, Any]], is_release_branch: bool
+    ) -> Dict[str, List[int]]:
+        """
+        await pending jobs to be finished
+        @jobs_with_params - jobs to await. {JOB_NAME: {"batches": [BATCHES...], "num_batches": NUM_BATCHES}}
+        returns successfully finished jobs: {JOB_NAME: [BATCHES...]}
+        """
+        if not jobs_with_params:
+            return {}
+        poll_interval_sec = 300
+        # TIMEOUT * MAX_ROUNDS_TO_WAIT must be less than 6h (GH job timeout) with a room for rest RunConfig work
+        TIMEOUT = 3000  # 50 min
+        MAX_ROUNDS_TO_WAIT = 6
+        MAX_JOB_NUM_TO_WAIT = 3
+        await_finished: Dict[str, List[int]] = {}
+        round_cnt = 0
+        while (
+            len(jobs_with_params) > MAX_JOB_NUM_TO_WAIT
+            and round_cnt < MAX_ROUNDS_TO_WAIT
+        ):
+            round_cnt += 1
+            GHActions.print_in_group(
+                f"Wait pending jobs, round [{round_cnt}/{MAX_ROUNDS_TO_WAIT}]:",
+                list(jobs_with_params),
+            )
+            # this is initial approach to wait pending jobs:
+            # start waiting for the next TIMEOUT seconds if there are more than X(=4) jobs to wait
+            # wait TIMEOUT seconds in rounds. Y(=5) is the max number of rounds
+            expired_sec = 0
+            start_at = int(time.time())
+            while expired_sec < TIMEOUT and jobs_with_params:
+                time.sleep(poll_interval_sec)
+                self.update()
+                jobs_with_params_copy = deepcopy(jobs_with_params)
+                for job_name in jobs_with_params:
+                    num_batches = jobs_with_params[job_name]["num_batches"]
+                    job_config = CI_CONFIG.get_job_config(job_name)
+                    for batch in jobs_with_params[job_name]["batches"]:
+                        if self.is_pending(
+                            job_name,
+                            batch,
+                            num_batches,
+                            release_branch=is_release_branch
+                            and job_config.required_on_release_branch,
+                        ):
+                            continue
+                        print(
+                            f"Job [{job_name}_[{batch}/{num_batches}]] is not pending anymore"
+                        )
+
+                        # some_job_ready = True
+                        jobs_with_params_copy[job_name]["batches"].remove(batch)
+                        if not jobs_with_params_copy[job_name]["batches"]:
+                            del jobs_with_params_copy[job_name]
+
+                        if not self.is_successful(
+                            job_name,
+                            batch,
+                            num_batches,
+                            release_branch=is_release_branch
+                            and job_config.required_on_release_branch,
+                        ):
+                            print(
+                                f"NOTE: Job [{job_name}:{batch}] finished but no success - remove from awaiting list, do not add to ready"
+                            )
+                            continue
+                        if job_name in await_finished:
+                            await_finished[job_name].append(batch)
+                        else:
+                            await_finished[job_name] = [batch]
+                jobs_with_params = jobs_with_params_copy
+                expired_sec = int(time.time()) - start_at
+                print(
+                    f"...awaiting continues... seconds left [{TIMEOUT - expired_sec}]"
+                )
+            if await_finished:
+                GHActions.print_in_group(
+                    f"Finished jobs, round [{round_cnt}]:",
+                    [f"{job}:{batches}" for job, batches in await_finished.items()],
+                )
+        GHActions.print_in_group(
+            "Remaining jobs:",
+            [f"{job}:{params['batches']}" for job, params in jobs_with_params.items()],
+        )
+        return await_finished
+
+
+@dataclass
+class CiOptions:
+    # job will be included in the run if any keyword from the list matches job name
+    include_keywords: Optional[List[str]] = None
+    # job will be excluded in the run if any keyword from the list matches job name
+    exclude_keywords: Optional[List[str]] = None
+
+    # list of specified preconfigured ci sets to run
+    ci_sets: Optional[List[str]] = None
+    # list of specified jobs to run
+    ci_jobs: Optional[List[str]] = None
+
+    # btaches to run for all multi-batch jobs
+    job_batches: Optional[List[int]] = None
+
+    do_not_test: bool = False
+    no_ci_cache: bool = False
+    no_merge_commit: bool = False
+
+    def as_dict(self) -> Dict[str, Any]:
+        return asdict(self)
+
+    @staticmethod
+    def create_from_run_config(run_config: Dict[str, Any]) -> "CiOptions":
+        return CiOptions(**run_config["ci_options"])
+
+    @staticmethod
+    def create_from_pr_message(
+        debug_message: Optional[str], update_from_api: bool
+    ) -> "CiOptions":
+        """
+        Creates CiOptions instance based on tags found in PR body and/or commit message
+        @commit_message - may be provided directly for debugging purposes, otherwise it will be retrieved from git.
+        """
+        res = CiOptions()
+        pr_info = PRInfo()
+        if (
+            not pr_info.is_pr() and not debug_message
+        ):  # if commit_message is provided it's test/debug scenario - do not return
+            # CI options can be configured in PRs only
+            # if debug_message is provided - it's a test
+            return res
+        message = debug_message or GitRunner(set_cwd_to_git_root=True).run(
+            f"{GIT_PREFIX} log {pr_info.sha} --format=%B -n 1"
+        )
+
+        pattern = r"(#|- \[x\] +<!---)(\w+)"
+        matches = [match[-1] for match in re.findall(pattern, message)]
+        print(f"CI tags from commit message: [{matches}]")
+
+        if not debug_message:  # to be skipped if debug/test
+            pr_info = PRInfo(
+                pr_event_from_api=update_from_api
+            )  # Fetch updated PR body from GH API
+            matches_pr = [match[-1] for match in re.findall(pattern, pr_info.body)]
+            print(f"CI tags from PR body: [{matches_pr}]")
+            matches = list(set(matches + matches_pr))
+
+            if "do not test" in pr_info.labels:
+                # do_not_test could be set in GH labels
+                res.do_not_test = True
+
+        for match in matches:
+            if match.startswith("job_"):
+                if not res.ci_jobs:
+                    res.ci_jobs = []
+                res.ci_jobs.append(match.removeprefix("job_"))
+            elif match.startswith("ci_set_") and match in Labels:
+                if not res.ci_sets:
+                    res.ci_sets = []
+                res.ci_sets.append(match)
+            elif match.startswith("ci_include_"):
+                if not res.include_keywords:
+                    res.include_keywords = []
+                res.include_keywords.append(
+                    normalize_check_name(match.removeprefix("ci_include_"))
+                )
+            elif match.startswith("ci_exclude_"):
+                if not res.exclude_keywords:
+                    res.exclude_keywords = []
+                res.exclude_keywords.append(
+                    normalize_check_name(match.removeprefix("ci_exclude_"))
+                )
+            elif match == Labels.NO_CI_CACHE:
+                res.no_ci_cache = True
+                print("NOTE: CI Cache will be disabled")
+            elif match == Labels.DO_NOT_TEST_LABEL:
+                res.do_not_test = True
+            elif match == Labels.NO_MERGE_COMMIT:
+                res.no_merge_commit = True
+                print("NOTE: Merge Commit will be disabled")
+            elif match.startswith("batch_"):
+                batches = []
+                try:
+                    batches = [
+                        int(batch) for batch in match.removeprefix("batch_").split("_")
+                    ]
+                except Exception:
+                    print(f"ERROR: failed to parse commit tag [{match}] - skip")
+                if batches:
+                    if not res.job_batches:
+                        res.job_batches = []
+                    res.job_batches += batches
+                    res.job_batches = list(set(res.job_batches))
+            else:
+                print(
+                    f"WARNING: Invalid tag in commit message or PR body [{match}] - skip"
+                )
+
+        return res
+
+    def apply(
+        self,
+        jobs_to_do: List[str],
+        jobs_to_skip: List[str],
+        jobs_params: Dict[str, Dict[str, Any]],
+    ) -> Tuple[List[str], List[str], Dict[str, Dict[str, Any]]]:
+        """
+        Applies specified options on CI Run Config
+        Returns updated jobs_to_do, jobs_to_skip, jobs_params
+        """
+        jobs_to_do_requested = []  # type: List[str]
+
+        # -1. Handle "ci_exclude_" tags if any
+        if self.exclude_keywords:
+            new_jobs_to_do = list(jobs_to_do)
+            for job in jobs_to_do:
+                found = False
+                for keyword in self.exclude_keywords:
+                    if keyword in normalize_check_name(job):
+                        print(
+                            f"Job [{job}] matches Exclude keyword [{keyword}] - remove"
+                        )
+                        found = True
+                        break
+                if found:
+                    new_jobs_to_do.remove(job)
+            jobs_to_do = new_jobs_to_do
+
+        # 0. Handle "ci_include_" tags if any
+        if self.include_keywords:
+            for job in jobs_to_do:
+                found = False
+                for keyword in self.include_keywords:
+                    if keyword in normalize_check_name(job):
+                        print(f"Job [{job}] matches Include keyword [{keyword}] - add")
+                        found = True
+                        break
+                if found:
+                    job_with_parents = CI_CONFIG.get_job_with_parents(job)
+                    for job in job_with_parents:
+                        if job in jobs_to_do and job not in jobs_to_do_requested:
+                            jobs_to_do_requested.append(job)
+            assert (
+                jobs_to_do_requested
+            ), "Include tags are set but now job configured - Invalid tags, probably [{self.include_keywords}]"
+            if JobNames.STYLE_CHECK not in jobs_to_do_requested:
+                # Style check must not be omitted
+                jobs_to_do_requested.append(JobNames.STYLE_CHECK)
+
+        # FIXME: to be removed in favor of include/exclude
+        # 1. Handle "ci_set_" tags if any
+        if self.ci_sets:
+            for tag in self.ci_sets:
+                label_config = CI_CONFIG.get_label_config(tag)
+                assert label_config, f"Unknonwn tag [{tag}]"
+                print(
+                    f"NOTE: CI Set's tag: [{tag}], add jobs: [{label_config.run_jobs}]"
+                )
+                jobs_to_do_requested += label_config.run_jobs
+
+        # FIXME: to be removed in favor of include/exclude
+        # 2. Handle "job_" tags if any
+        if self.ci_jobs:
+            for job in self.ci_jobs:
+                job_with_parents = CI_CONFIG.get_job_with_parents(job)
+                print(
+                    f"NOTE: CI Job's tag: [#job_{job}], add jobs: [{job_with_parents}]"
+                )
+                # always add requested job itself, even if it could be skipped
+                jobs_to_do_requested.append(job_with_parents[0])
+                for parent in job_with_parents[1:]:
+                    if parent in jobs_to_do and parent not in jobs_to_do_requested:
+                        jobs_to_do_requested.append(parent)
+
+        # 3. Handle "do not test"
+        if self.do_not_test:
+            label_config = CI_CONFIG.get_label_config(Labels.DO_NOT_TEST_LABEL)
+            assert label_config
+            print(
+                f"NOTE: CI 'do not test' setting applied, set jobs: [{label_config.run_jobs}]"
+            )
+            if jobs_to_do_requested:
+                print(
+                    "WARNING: 'do not test' is used alongside with other CI modifying tags - 'do not test' prevails"
+                )
+            jobs_to_do_requested = list(label_config.run_jobs)
+
+        if jobs_to_do_requested:
+            jobs_to_do_requested = list(set(jobs_to_do_requested))
+            print(
+                f"NOTE: Only specific job(s) were requested by user's input: [{jobs_to_do_requested}]"
+            )
+            jobs_to_do = list(
+                set(job for job in jobs_to_do_requested if job not in jobs_to_skip)
+            )
+            # if requested job does not have params in jobs_params (it happens for "run_by_label" job)
+            #   we need to add params - otherwise it won't run as "batches" list will be empty
+            for job in jobs_to_do:
+                if job not in jobs_params:
+                    num_batches = CI_CONFIG.get_job_config(job).num_batches
+                    jobs_params[job] = {
+                        "batches": list(range(num_batches)),
+                        "num_batches": num_batches,
+                    }
+
+        # 4. Handle "batch_" tags
+        if self.job_batches:
+            print(
+                f"NOTE: Only specific job batches were requested [{self.job_batches}]"
+            )
+            for job, params in jobs_params.items():
+                if params["num_batches"] > 1:
+                    params["batches"] = self.job_batches
+
+        return jobs_to_do, jobs_to_skip, jobs_params
+
 
 def get_check_name(check_name: str, batch: int, num_batches: int) -> str:
     res = check_name
@@ -42,20 +975,6 @@ def normalize_check_name(check_name: str) -> str:
     return res
 
 
-def is_build_job(job: str) -> bool:
-    if "package_" in job or "binary_" in job or job == "fuzzers":
-        return True
-    return False
-
-
-def is_test_job(job: str) -> bool:
-    return not is_build_job(job) and not "Style" in job and not "Docs check" in job
-
-
-def is_docs_job(job: str) -> bool:
-    return "Docs check" in job
-
-
 def parse_args(parser: argparse.ArgumentParser) -> argparse.Namespace:
     # FIXME: consider switching to sub_parser for configure, pre, run, post actions
     parser.add_argument(
@@ -94,6 +1013,12 @@ def parse_args(parser: argparse.ArgumentParser) -> argparse.Namespace:
         type=str,
         help="Job name as in config",
     )
+    parser.add_argument(
+        "--run-command",
+        default="",
+        type=str,
+        help="A run command to run in --run action. Will override run_command from a job config if any",
+    )
     parser.add_argument(
         "--batch",
         default=-1,
@@ -138,37 +1063,28 @@ def parse_args(parser: argparse.ArgumentParser) -> argparse.Namespace:
         help="skip fetching data about job runs, used in --configure action (for debugging and nigthly ci)",
     )
     parser.add_argument(
-        "--rebuild-all-docker",
+        "--force",
         action="store_true",
         default=False,
-        help="will create run config for rebuilding all dockers, used in --configure action (for nightly docker job)",
+        help="Used with --run, force the job to run, omitting the ci cache",
     )
+    # FIXME: remove, not used
     parser.add_argument(
         "--rebuild-all-binaries",
         action="store_true",
         default=False,
-        help="will create run config without skipping build jobs in any case, used in --configure action (for release branches)",
+        help="[DEPRECATED. to be removed, once no wf use it] will create run config without skipping build jobs in any case, used in --configure action (for release branches)",
+    )
+    parser.add_argument(
+        "--commit-message",
+        default="",
+        help="debug option to test commit message processing",
     )
     return parser.parse_args()
 
 
-def get_file_flag_name(
-    job_name: str, digest: str, batch: int = 0, num_batches: int = 1
-) -> str:
-    if num_batches < 2:
-        return f"job_{job_name}_{digest}.ci"
-    else:
-        return f"job_{job_name}_{digest}_{batch}_{num_batches}.ci"
-
-
-def get_s3_path(build_digest: str) -> str:
-    return f"CI_data/BUILD-{build_digest}/"
-
-
-def get_s3_path_docs(digest: str) -> str:
-    return f"CI_data/DOCS-{digest}/"
-
-
+# FIXME: rewrite the docker job as regular reusable_test job and move interaction with docker hub inside job script
+#   that way run config will be more clean, workflow more generic and less api calls to dockerhub
 def check_missing_images_on_dockerhub(
     image_name_tag: Dict[str, str], arch: Optional[str] = None
 ) -> Dict[str, str]:
@@ -243,34 +1159,122 @@ def check_missing_images_on_dockerhub(
     return result
 
 
-def _check_and_update_for_early_style_check(run_config: dict) -> None:
-    """
-    This is temporary hack to start style check before docker build if possible
-    FIXME: need better solution to do style check as soon as possible and as fast as possible w/o dependency on docker job
-    """
-    jobs_to_do = run_config.get("jobs_data", {}).get("jobs_to_do", [])
-    docker_to_build = run_config.get("docker_data", {}).get("missing_multi", [])
-    if (
-        "Style check" in jobs_to_do
-        and docker_to_build
-        and "clickhouse/style-test" not in docker_to_build
-    ):
-        index = jobs_to_do.index("Style check")
-        jobs_to_do[index] = "Style check early"
+def _pre_action(s3, indata, pr_info):
+    CommitStatusData.cleanup()
+    JobReport.cleanup()
+    BuildResult.cleanup()
+    ci_cache = CiCache(s3, indata["jobs_data"]["digests"])
+
+    # for release/master branches reports must be from the same branches
+    report_prefix = normalize_string(pr_info.head_ref) if pr_info.number == 0 else ""
+    print(
+        f"Use report prefix [{report_prefix}], pr_num [{pr_info.number}], head_ref [{pr_info.head_ref}]"
+    )
+    reports_files = ci_cache.download_build_reports(file_prefix=report_prefix)
+    print(f"Pre action done. Report files [{reports_files}] have been downloaded")
 
 
-def _update_config_for_docs_only(run_config: dict) -> None:
-    DOCS_CHECK_JOBS = ["Docs check", "Style check"]
+def _mark_success_action(
+    s3: S3Helper,
+    indata: Dict[str, Any],
+    pr_info: PRInfo,
+    job: str,
+    batch: int,
+) -> None:
+    ci_cache = CiCache(s3, indata["jobs_data"]["digests"])
+    job_config = CI_CONFIG.get_job_config(job)
+    num_batches = job_config.num_batches
+    # if batch is not provided - set to 0
+    batch = 0 if batch == -1 else batch
+    assert (
+        0 <= batch < num_batches
+    ), f"--batch must be provided and in range [0, {num_batches}) for {job}"
+
+    # FIXME: find generic design for propagating and handling job status (e.g. stop using statuses in GH api)
+    #   now job ca be build job w/o status data, any other job that exit with 0 with or w/o status data
+    if CI_CONFIG.is_build_job(job):
+        # there is no CommitStatus for build jobs
+        # create dummy status relying on JobReport
+        # FIXME: consider creating commit status for build jobs too, to treat everything the same way
+        job_report = JobReport.load() if JobReport.exist() else None
+        if job_report and job_report.status == SUCCESS:
+            CommitStatusData(
+                SUCCESS,
+                "dummy description",
+                "dummy_url",
+                pr_num=pr_info.number,
+                sha=pr_info.sha,
+            ).dump_status()
+
+    job_status = None
+    if CommitStatusData.exist():
+        # normal scenario
+        job_status = CommitStatusData.load_status()
+    else:
+        # apparently exit after rerun-helper check
+        # do nothing, exit without failure
+        print(f"ERROR: no status file for job [{job}]")
+
+    if job_config.run_always or job_config.run_by_label:
+        print(f"Job [{job}] runs always or by label in CI - do not cache")
+    else:
+        if pr_info.is_master():
+            pass
+            # delete method is disabled for ci_cache. need it?
+            # pending enabled for master branch jobs only
+            # ci_cache.delete_pending(job, batch, num_batches, release_branch=True)
+        if job_status and job_status.is_ok():
+            ci_cache.push_successful(
+                job, batch, num_batches, job_status, pr_info.is_release_branch()
+            )
+            print(f"Job [{job}] is ok")
+        elif job_status and not job_status.is_ok():
+            ci_cache.push_failed(
+                job, batch, num_batches, job_status, pr_info.is_release_branch()
+            )
+            print(f"Job [{job}] is failed with status [{job_status.status}]")
+        else:
+            job_status = CommitStatusData(
+                description="dummy description", status=ERROR, report_url="dummy url"
+            )
+            ci_cache.push_failed(
+                job, batch, num_batches, job_status, pr_info.is_release_branch()
+            )
+            print(f"No CommitStatusData for [{job}], push dummy failure to ci_cache")
+
+
+def _print_results(result: Any, outfile: Optional[str], pretty: bool = False) -> None:
+    if outfile:
+        with open(outfile, "w", encoding="utf-8") as f:
+            if isinstance(result, str):
+                print(result, file=f)
+            elif isinstance(result, dict):
+                print(json.dumps(result, indent=2 if pretty else None), file=f)
+            else:
+                raise AssertionError(f"Unexpected type for 'res': {type(result)}")
+    else:
+        if isinstance(result, str):
+            print(result)
+        elif isinstance(result, dict):
+            print(json.dumps(result, indent=2 if pretty else None))
+        else:
+            raise AssertionError(f"Unexpected type for 'res': {type(result)}")
+
+
+def _update_config_for_docs_only(jobs_data: dict) -> None:
+    DOCS_CHECK_JOBS = [JobNames.DOCS_CHECK, JobNames.STYLE_CHECK]
     print(f"NOTE: Will keep only docs related jobs: [{DOCS_CHECK_JOBS}]")
-    jobs_to_do = run_config.get("jobs_data", {}).get("jobs_to_do", [])
-    run_config["jobs_data"]["jobs_to_do"] = [
-        job for job in jobs_to_do if job in DOCS_CHECK_JOBS
-    ]
+    jobs_to_do = jobs_data.get("jobs_to_do", [])
+    jobs_data["jobs_to_do"] = [job for job in jobs_to_do if job in DOCS_CHECK_JOBS]
+    jobs_data["jobs_to_wait"] = {
+        job: params
+        for job, params in jobs_data["jobs_to_wait"].items()
+        if job in DOCS_CHECK_JOBS
+    }
 
 
-def _configure_docker_jobs(
-    rebuild_all_dockers: bool, docker_digest_or_latest: bool = False
-) -> Dict:
+def _configure_docker_jobs(docker_digest_or_latest: bool) -> Dict:
+    print("::group::Docker images check")
     # generate docker jobs data
     docker_digester = DockerDigester()
     imagename_digest_dict = (
@@ -278,52 +1282,34 @@ def _configure_docker_jobs(
     )  # 'image name - digest' mapping
     images_info = docker_images_helper.get_images_info()
 
-    # a. check missing images
-    if not rebuild_all_dockers:
-        # FIXME: we need login as docker manifest inspect goes directly to one of the *.docker.com hosts instead of "registry-mirrors" : ["http://dockerhub-proxy.dockerhub-proxy-zone:5000"]
-        #         find if it's possible to use the setting of /etc/docker/daemon.json
-        docker_images_helper.docker_login()
-        print("Start checking missing images in dockerhub")
-        missing_multi_dict = check_missing_images_on_dockerhub(imagename_digest_dict)
-        missing_multi = list(missing_multi_dict)
-        missing_amd64 = []
-        missing_aarch64 = []
-        if not docker_digest_or_latest:
-            # look for missing arm and amd images only among missing multiarch manifests @missing_multi_dict
-            # to avoid extra dockerhub api calls
-            missing_amd64 = list(
-                check_missing_images_on_dockerhub(missing_multi_dict, "amd64")
-            )
-            # FIXME: WA until full arm support: skip not supported arm images
-            missing_aarch64 = list(
-                check_missing_images_on_dockerhub(
-                    {
-                        im: digest
-                        for im, digest in missing_multi_dict.items()
-                        if not images_info[im]["only_amd64"]
-                    },
-                    "aarch64",
-                )
-            )
-        # FIXME: temporary hack, remove after transition to docker digest as tag
-        else:
-            if missing_multi:
-                print(
-                    f"WARNING: Missing images {list(missing_multi)} - fallback to latest tag"
-                )
-                for image in missing_multi:
-                    imagename_digest_dict[image] = "latest"
-        print("...checking missing images in dockerhub - done")
-    else:
-        # add all images to missing
-        missing_multi = list(imagename_digest_dict)
-        missing_amd64 = missing_multi
+    # FIXME: we need login as docker manifest inspect goes directly to one of the *.docker.com hosts instead of "registry-mirrors" : ["http://dockerhub-proxy.dockerhub-proxy-zone:5000"]
+    #   find if it's possible to use the setting of /etc/docker/daemon.json (https://github.com/docker/cli/issues/4484#issuecomment-1688095463)
+    docker_images_helper.docker_login()
+    missing_multi_dict = check_missing_images_on_dockerhub(imagename_digest_dict)
+    missing_multi = list(missing_multi_dict)
+    missing_amd64 = []
+    missing_aarch64 = []
+    if not docker_digest_or_latest:
+        # look for missing arm and amd images only among missing multiarch manifests @missing_multi_dict
+        # to avoid extra dockerhub api calls
+        missing_amd64 = list(
+            check_missing_images_on_dockerhub(missing_multi_dict, "amd64")
+        )
         # FIXME: WA until full arm support: skip not supported arm images
-        missing_aarch64 = [
-            name
-            for name in imagename_digest_dict
-            if not images_info[name]["only_amd64"]
-        ]
+        missing_aarch64 = list(
+            check_missing_images_on_dockerhub(
+                {
+                    im: digest
+                    for im, digest in missing_multi_dict.items()
+                    if not images_info[im]["only_amd64"]
+                },
+                "aarch64",
+            )
+        )
+    else:
+        if missing_multi:
+            assert False, f"Missing images [{missing_multi}], cannot proceed"
+    print("::endgroup::")
 
     return {
         "images": imagename_digest_dict,
@@ -334,59 +1320,88 @@ def _configure_docker_jobs(
 
 
 def _configure_jobs(
-    build_digest: str,
-    docs_digest: str,
     job_digester: JobDigester,
     s3: S3Helper,
-    rebuild_all_binaries: bool,
-    pr_labels: Iterable[str],
-    commit_tokens: List[str],
+    pr_info: PRInfo,
+    ci_options: CiOptions,
 ) -> Dict:
-    # a. digest each item from the config
+    ## a. digest each item from the config
     job_digester = JobDigester()
     jobs_params: Dict[str, Dict] = {}
     jobs_to_do: List[str] = []
     jobs_to_skip: List[str] = []
     digests: Dict[str, str] = {}
-    print("Calculating job digests - start")
-    for job in CI_CONFIG.job_generator():
+
+    print("::group::Job Digests")
+    for job in CI_CONFIG.job_generator(pr_info.head_ref if CI else "dummy_branch_name"):
         digest = job_digester.get_job_digest(CI_CONFIG.get_digest_config(job))
         digests[job] = digest
         print(f"    job [{job.rjust(50)}] has digest [{digest}]")
-    print("Calculating job digests - done")
+    print("::endgroup::")
 
-    # b. check if we have something done
-    path = get_s3_path(build_digest)
-    done_files = s3.list_prefix(path)
-    done_files = [file.split("/")[-1] for file in done_files]
-    print(f"S3 CI files for the build [{build_digest}]: {done_files}")
-    docs_path = get_s3_path_docs(docs_digest)
-    done_files_docs = s3.list_prefix(docs_path)
-    done_files_docs = [file.split("/")[-1] for file in done_files_docs]
-    print(f"S3 CI files for the docs [{docs_digest}]: {done_files_docs}")
-    done_files += done_files_docs
-    for job in digests:
-        digest = digests[job]
+    ## b. check what we need to run
+    ci_cache = None
+    if not ci_options.no_ci_cache and CI:
+        ci_cache = CiCache(s3, digests).update()
+        ci_cache.print_status()
+
+    jobs_to_wait: Dict[str, Dict[str, Any]] = {}
+    randomization_buckets = {}  # type: Dict[str, Set[str]]
+
+    for job, digest in digests.items():
         job_config = CI_CONFIG.get_job_config(job)
         num_batches: int = job_config.num_batches
         batches_to_do: List[int] = []
+        add_to_skip = False
 
-        if job_config.run_by_label:
-            # this job controlled by label, add to todo if it's labe is set in pr
-            if job_config.run_by_label in pr_labels:
-                for batch in range(num_batches):  # type: ignore
+        if job_config.pr_only and pr_info.is_release_branch():
+            continue
+        if job_config.release_only and not pr_info.is_release_branch():
+            continue
+
+        # fill job randomization buckets (for jobs with configured @random_bucket property))
+        if job_config.random_bucket:
+            if not job_config.random_bucket in randomization_buckets:
+                randomization_buckets[job_config.random_bucket] = set()
+            randomization_buckets[job_config.random_bucket].add(job)
+
+        for batch in range(num_batches):  # type: ignore
+            if job_config.run_by_label:
+                # this job controlled by label, add to todo if its label is set in pr
+                if job_config.run_by_label in pr_info.labels:
                     batches_to_do.append(batch)
-        elif job_config.run_always:
-            # always add to todo
-            batches_to_do.append(batch)
-        else:
-            # this job controlled by digest, add to todo if it's not successfully done before
-            for batch in range(num_batches):  # type: ignore
-                success_flag_name = get_file_flag_name(job, digest, batch, num_batches)
-                if success_flag_name not in done_files or (
-                    rebuild_all_binaries and is_build_job(job)
+            elif job_config.run_always:
+                # always add to todo
+                batches_to_do.append(batch)
+            elif not ci_cache:
+                batches_to_do.append(batch)
+            elif not ci_cache.is_successful(
+                job,
+                batch,
+                num_batches,
+                release_branch=pr_info.is_release_branch()
+                and job_config.required_on_release_branch,
+            ):
+                # ci cache is enabled and job is not in the cache - add
+                batches_to_do.append(batch)
+
+                # check if it's pending in the cache
+                if ci_cache.is_pending(
+                    job,
+                    batch,
+                    num_batches,
+                    release_branch=pr_info.is_release_branch()
+                    and job_config.required_on_release_branch,
                 ):
-                    batches_to_do.append(batch)
+                    if job in jobs_to_wait:
+                        jobs_to_wait[job]["batches"].append(batch)
+                    else:
+                        jobs_to_wait[job] = {
+                            "batches": [batch],
+                            "num_batches": num_batches,
+                        }
+            else:
+                add_to_skip = True
 
         if batches_to_do:
             jobs_to_do.append(job)
@@ -394,120 +1409,125 @@ def _configure_jobs(
                 "batches": batches_to_do,
                 "num_batches": num_batches,
             }
-        else:
-            jobs_to_skip += (job,)
+        elif add_to_skip:
+            # treat job as being skipped only if it's controlled by digest
+            jobs_to_skip.append(job)
 
-    if pr_labels:
-        jobs_requested_by_label = []  # type: List[str]
-        ci_controlling_labels = []  # type: List[str]
-        for label in pr_labels:
-            label_config = CI_CONFIG.get_label_config(label)
-            if label_config:
-                jobs_requested_by_label += label_config.run_jobs
-                ci_controlling_labels += [label]
-        if ci_controlling_labels:
-            print(f"NOTE: CI controlling labels are set: [{ci_controlling_labels}]")
-            print(
-                f"    :   following jobs will be executed: [{jobs_requested_by_label}]"
-            )
-            jobs_to_do = jobs_requested_by_label
+    if not pr_info.is_release_branch():
+        # randomization bucket filtering (pick one random job from each bucket, for jobs with configured random_bucket property)
+        for _, jobs in randomization_buckets.items():
+            jobs_to_remove_randomization = set()
+            bucket_ = list(jobs)
+            random.shuffle(bucket_)
+            while len(bucket_) > 1:
+                random_job = bucket_.pop()
+                if random_job in jobs_to_do:
+                    jobs_to_remove_randomization.add(random_job)
+            if jobs_to_remove_randomization:
+                print(
+                    f"Following jobs will be removed due to randomization bucket: [{jobs_to_remove_randomization}]"
+                )
+                jobs_to_do = [
+                    job for job in jobs_to_do if job not in jobs_to_remove_randomization
+                ]
 
-    if commit_tokens:
-        requested_jobs = [
-            token[len("#job_") :]
-            for token in commit_tokens
-            if token.startswith("#job_")
-        ]
-        if requested_jobs:
-            assert any(
-                len(x) > 1 for x in requested_jobs
-            ), f"Invalid job names requested [{requested_jobs}]"
-            jobs_to_do_requested = []
-            for job in requested_jobs:
-                job_with_parents = CI_CONFIG.get_job_with_parents(job)
-                # always add requested job itself, even if it could be skipped
-                jobs_to_do_requested.append(job_with_parents[0])
-                for parent in job_with_parents[1:]:
-                    if parent in jobs_to_do and parent not in jobs_to_do_requested:
-                        jobs_to_do_requested.append(parent)
-            print(
-                f"NOTE: Only specific job(s) were requested by commit message tokens: [{jobs_to_do_requested}]"
-            )
-            jobs_to_do = jobs_to_do_requested
+    jobs_to_do, jobs_to_skip, jobs_params = ci_options.apply(
+        jobs_to_do, jobs_to_skip, jobs_params
+    )
+
+    if pr_info.is_merge_queue():
+        # FIXME: Quick support for MQ workflow which is only StyleCheck for now
+        jobs_to_do = [JobNames.STYLE_CHECK]
+        jobs_to_skip = []
+        print(f"NOTE: This is Merge Queue CI: set jobs to do: [{jobs_to_do}]")
 
     return {
         "digests": digests,
         "jobs_to_do": jobs_to_do,
         "jobs_to_skip": jobs_to_skip,
-        "jobs_params": jobs_params,
+        "jobs_to_wait": {
+            job: params for job, params in jobs_to_wait.items() if job in jobs_to_do
+        },
+        "jobs_params": {
+            job: params for job, params in jobs_params.items() if job in jobs_to_do
+        },
     }
 
 
-def _update_gh_statuses(indata: Dict, s3: S3Helper) -> None:
-    # This action is required to re-create all GH statuses for skipped jobs, so that ci report can be generated afterwards
-    temp_path = Path(TEMP_PATH)
-    if not temp_path.exists():
-        temp_path.mkdir(parents=True, exist_ok=True)
+def _generate_ci_stage_config(jobs_data: Dict[str, Any]) -> Dict[str, Dict[str, Any]]:
+    """
+    populates GH Actions' workflow with real jobs
+    "Builds_1": [{"job_name": NAME, "runner_type": RUNER_TYPE}]
+    "Tests_1": [{"job_name": NAME, "runner_type": RUNER_TYPE}]
+    ...
+    """
+    result = {}  # type: Dict[str, Any]
+    stages_to_do = []
+    for job in jobs_data["jobs_to_do"]:
+        stage_type = CI_CONFIG.get_job_ci_stage(job)
+        if stage_type == CIStages.NA:
+            continue
+        if stage_type not in result:
+            result[stage_type] = []
+            stages_to_do.append(stage_type)
+        result[stage_type].append(
+            {"job_name": job, "runner_type": CI_CONFIG.get_runner_type(job)}
+        )
+    result["stages_to_do"] = stages_to_do
+    return result
 
-    # clean up before start
-    for file in temp_path.glob("*.ci"):
-        file.unlink()
 
-    # download all metadata files
-    path = get_s3_path(indata["build"])
-    files = s3.download_files(  # type: ignore
-        bucket=S3_BUILDS_BUCKET,
-        s3_path=path,
-        file_suffix=".ci",
-        local_directory=temp_path,
+def _create_gh_status(
+    commit: Any, job: str, batch: int, num_batches: int, job_status: CommitStatusData
+) -> None:
+    print(f"Going to re-create GH status for job [{job}]")
+    assert job_status.status == SUCCESS, "BUG!"
+    commit.create_status(
+        state=job_status.status,
+        target_url=job_status.report_url,
+        description=format_description(
+            f"Reused from [{job_status.pr_num}-{job_status.sha[0:8]}]: "
+            f"{job_status.description}"
+        ),
+        context=get_check_name(job, batch=batch, num_batches=num_batches),
     )
-    print(f"CI metadata files [{files}]")
-    path = get_s3_path_docs(indata["docs"])
-    files_docs = s3.download_files(  # type: ignore
-        bucket=S3_BUILDS_BUCKET,
-        s3_path=path,
-        file_suffix=".ci",
-        local_directory=temp_path,
-    )
-    print(f"CI docs metadata files [{files_docs}]")
-    files += files_docs
 
-    # parse CI metadata
+
+def _update_gh_statuses_action(indata: Dict, s3: S3Helper) -> None:
+    if CiOptions.create_from_run_config(indata).no_ci_cache:
+        print("CI cache is disabled - skip restoring commit statuses from CI cache")
+        return
     job_digests = indata["jobs_data"]["digests"]
+    jobs_to_skip = indata["jobs_data"]["jobs_to_skip"]
+    jobs_to_do = indata["jobs_data"]["jobs_to_do"]
+    ci_cache = CiCache(s3, job_digests).update().fetch_records_data().print_status()
+
     # create GH status
     pr_info = PRInfo()
     commit = get_commit(Github(get_best_robot_token(), per_page=100), pr_info.sha)
 
-    def run_create_status(job, digest, batch, num_batches):
-        success_flag_name = get_file_flag_name(job, digest, batch, num_batches)
-        if success_flag_name in files:
-            print(f"Going to re-create GH status for job [{job}] sha [{pr_info.sha}]")
-            job_status = CommitStatusData.load_from_file(
-                f"{TEMP_PATH}/{success_flag_name}"
-            )  # type: CommitStatusData
-            assert job_status.status == "success", "BUG!"
-            commit.create_status(
-                state=job_status.status,
-                target_url=job_status.report_url,
-                description=format_description(
-                    f"Reused from [{job_status.pr_num}-{job_status.sha[0:8]}]: "
-                    f"{job_status.description}"
-                ),
-                context=get_check_name(job, batch=batch, num_batches=num_batches),
-            )
-            print(f"GH status re-created from file [{success_flag_name}]")
+    def _concurrent_create_status(job: str, batch: int, num_batches: int) -> None:
+        job_status = ci_cache.get_successful(job, batch, num_batches)
+        if not job_status:
+            return
+        _create_gh_status(commit, job, batch, num_batches, job_status)
 
     with concurrent.futures.ThreadPoolExecutor() as executor:
         futures = []
         for job in job_digests:
-            if is_build_job(job):
+            if job not in jobs_to_skip and job not in jobs_to_do:
+                # no need to create status for job that are not supposed to be executed
+                continue
+            if CI_CONFIG.is_build_job(job):
                 # no GH status for build jobs
                 continue
-            digest = job_digests[job]
-            num_batches = CI_CONFIG.get_job_config(job).num_batches
-            for batch in range(num_batches):
+            job_config = CI_CONFIG.get_job_config(job)
+            if not job_config:
+                # there might be a new job that does not exist on this branch - skip it
+                continue
+            for batch in range(job_config.num_batches):
                 future = executor.submit(
-                    run_create_status, job, digest, batch, num_batches
+                    _concurrent_create_status, job, batch, job_config.num_batches
                 )
                 futures.append(future)
         done, _ = concurrent.futures.wait(futures)
@@ -520,76 +1540,346 @@ def _update_gh_statuses(indata: Dict, s3: S3Helper) -> None:
     set_status_comment(commit, pr_info)
     print("... CI report update - done")
 
-    # clean up
-    ci_files = list(temp_path.glob("*.ci"))
-    for file in ci_files:
-        file.unlink()
 
-
-def _fetch_commit_tokens(message: str) -> List[str]:
-    pattern = r"#[\w-]+"
-    matches = re.findall(pattern, message)
+def _fetch_commit_tokens(message: str, pr_info: PRInfo) -> List[str]:
+    pattern = r"(#|- \[x\] +<!---)(\w+)"
+    matches = [match[-1] for match in re.findall(pattern, message)]
     res = [
         match
         for match in matches
-        if match == "#no-merge-commit"
-        or match.startswith("#job_")
-        or match.startswith("#job-")
+        if match in Labels or match.startswith("job_") or match.startswith("batch_")
     ]
-    return res
+    print(f"CI modifyers from commit message: [{res}]")
+    res_2 = []
+    if pr_info.is_pr():
+        matches = [match[-1] for match in re.findall(pattern, pr_info.body)]
+        res_2 = [
+            match
+            for match in matches
+            if match in Labels or match.startswith("job_") or match.startswith("batch_")
+        ]
+        print(f"CI modifyers from PR body: [{res_2}]")
+    return list(set(res + res_2))
+
+
+def _upload_build_artifacts(
+    pr_info: PRInfo,
+    build_name: str,
+    ci_cache: CiCache,
+    job_report: JobReport,
+    s3: S3Helper,
+    s3_destination: str,
+) -> str:
+    # There are ugly artifacts for the performance test. FIXME:
+    s3_performance_path = "/".join(
+        (
+            get_release_or_pr(pr_info, get_version_from_repo())[1],
+            pr_info.sha,
+            normalize_string(build_name),
+            "performance.tar.zst",
+        )
+    )
+    performance_urls = []
+    assert job_report.build_dir_for_upload, "Must be set for build job"
+    performance_path = Path(job_report.build_dir_for_upload) / "performance.tar.zst"
+    if performance_path.exists():
+        performance_urls.append(
+            s3.upload_build_file_to_s3(performance_path, s3_performance_path)
+        )
+        print(
+            "Uploaded performance.tar.zst to %s, now delete to avoid duplication",
+            performance_urls[0],
+        )
+        performance_path.unlink()
+    build_urls = (
+        s3.upload_build_directory_to_s3(
+            Path(job_report.build_dir_for_upload),
+            s3_destination,
+            keep_dirs_in_s3_path=False,
+            upload_symlinks=False,
+        )
+        + performance_urls
+    )
+    print("::notice ::Build URLs: {}".format("\n".join(build_urls)))
+    log_path = Path(job_report.additional_files[0])
+    log_url = ""
+    if log_path.exists():
+        log_url = s3.upload_build_file_to_s3(
+            log_path, s3_destination + "/" + log_path.name
+        )
+    print(f"::notice ::Log URL: {log_url}")
+
+    # generate and upload build report
+    build_result = BuildResult(
+        build_name,
+        log_url,
+        build_urls,
+        job_report.version,
+        job_report.status,
+        int(job_report.duration),
+        GITHUB_JOB_API_URL(),
+        head_ref=pr_info.head_ref,
+        pr_number=pr_info.number,
+    )
+    report_url = ci_cache.upload_build_report(build_result)
+    print(f"Report file has been uploaded to [{report_url}]")
+
+    # Upload head master binaries
+    static_bin_name = CI_CONFIG.build_config[build_name].static_binary_name
+    if pr_info.is_master() and static_bin_name:
+        # Full binary with debug info:
+        s3_path_full = "/".join((pr_info.base_ref, static_bin_name, "clickhouse-full"))
+        binary_full = Path(job_report.build_dir_for_upload) / "clickhouse"
+        url_full = s3.upload_build_file_to_s3(binary_full, s3_path_full)
+        print(f"::notice ::Binary static URL (with debug info): {url_full}")
+
+        # Stripped binary without debug info:
+        s3_path_compact = "/".join((pr_info.base_ref, static_bin_name, "clickhouse"))
+        binary_compact = Path(job_report.build_dir_for_upload) / "clickhouse-stripped"
+        url_compact = s3.upload_build_file_to_s3(binary_compact, s3_path_compact)
+        print(f"::notice ::Binary static URL (compact): {url_compact}")
+
+    return log_url
+
+
+def _upload_build_profile_data(
+    pr_info: PRInfo,
+    build_name: str,
+    job_report: JobReport,
+    git_runner: GitRunner,
+    ch_helper: ClickHouseHelper,
+) -> None:
+    ci_logs_credentials = CiLogsCredentials(Path("/dev/null"))
+    if ci_logs_credentials.host:
+        instance_type = get_instance_type()
+        instance_id = get_instance_id()
+        query = f"""INSERT INTO build_time_trace
+            (
+                pull_request_number,
+                commit_sha,
+                check_start_time,
+                check_name,
+                instance_type,
+                instance_id,
+                file,
+                library,
+                time,
+                pid,
+                tid,
+                ph,
+                ts,
+                dur,
+                cat,
+                name,
+                detail,
+                count,
+                avgMs,
+                args_name
+            )
+            SELECT {pr_info.number}, '{pr_info.sha}', '{job_report.start_time}', '{build_name}', '{instance_type}', '{instance_id}', *
+            FROM input('
+                file String,
+                library String,
+                time DateTime64(6),
+                pid UInt32,
+                tid UInt32,
+                ph String,
+                ts UInt64,
+                dur UInt64,
+                cat String,
+                name String,
+                detail String,
+                count UInt64,
+                avgMs UInt64,
+                args_name String')
+            FORMAT JSONCompactEachRow"""
+
+        auth = {
+            "X-ClickHouse-User": "ci",
+            "X-ClickHouse-Key": ci_logs_credentials.password,
+        }
+        url = f"https://{ci_logs_credentials.host}/"
+        profiles_dir = Path(TEMP_PATH) / "profiles_source"
+        profiles_dir.mkdir(parents=True, exist_ok=True)
+        print(
+            "Processing profile JSON files from %s",
+            Path(REPO_COPY) / "build_docker",
+        )
+        git_runner(
+            "./utils/prepare-time-trace/prepare-time-trace.sh "
+            f"build_docker {profiles_dir.absolute()}"
+        )
+        profile_data_file = Path(TEMP_PATH) / "profile.json"
+        with open(profile_data_file, "wb") as profile_fd:
+            for profile_source in profiles_dir.iterdir():
+                if profile_source.name != "binary_sizes.txt":
+                    with open(profiles_dir / profile_source, "rb") as ps_fd:
+                        profile_fd.write(ps_fd.read())
+
+        print(
+            "::notice ::Log Uploading profile data, path: %s, size: %s, query: %s",
+            profile_data_file,
+            profile_data_file.stat().st_size,
+            query,
+        )
+        try:
+            ch_helper.insert_file(url, auth, query, profile_data_file)
+        except InsertException:
+            logging.error("Failed to insert profile data for the build, continue")
+
+        query = f"""INSERT INTO binary_sizes
+            (
+                pull_request_number,
+                commit_sha,
+                check_start_time,
+                check_name,
+                instance_type,
+                instance_id,
+                file,
+                size
+            )
+            SELECT {pr_info.number}, '{pr_info.sha}', '{job_report.start_time}', '{build_name}', '{instance_type}', '{instance_id}', file, size
+            FROM input('size UInt64, file String')
+            SETTINGS format_regexp = '^\\s*(\\d+) (.+)$'
+            FORMAT Regexp"""
+
+        binary_sizes_file = profiles_dir / "binary_sizes.txt"
+
+        print(
+            "::notice ::Log Uploading binary sizes data, path: %s, size: %s, query: %s",
+            binary_sizes_file,
+            binary_sizes_file.stat().st_size,
+            query,
+        )
+        try:
+            ch_helper.insert_file(url, auth, query, binary_sizes_file)
+        except InsertException:
+            logging.error("Failed to insert binary_size_file for the build, continue")
+
+
+def _add_build_to_version_history(
+    pr_info: PRInfo,
+    job_report: JobReport,
+    version: str,
+    docker_tag: str,
+    ch_helper: ClickHouseHelper,
+) -> None:
+    # with some probability we will not silently break this logic
+    assert pr_info.sha and pr_info.commit_html_url and pr_info.head_ref and version
+
+    data = {
+        "check_start_time": job_report.start_time,
+        "pull_request_number": pr_info.number,
+        "pull_request_url": pr_info.pr_html_url,
+        "commit_sha": pr_info.sha,
+        "commit_url": pr_info.commit_html_url,
+        "version": version,
+        "docker_tag": docker_tag,
+        "git_ref": pr_info.head_ref,
+    }
+
+    print(f"::notice ::Log Adding record to versions history: {data}")
+
+    ch_helper.insert_event_into(db="default", table="version_history", event=data)
+
+
+def _run_test(job_name: str, run_command: str) -> int:
+    assert (
+        run_command or CI_CONFIG.get_job_config(job_name).run_command
+    ), "Run command must be provided as input argument or be configured in job config"
+
+    if CI_CONFIG.get_job_config(job_name).timeout:
+        os.environ["KILL_TIMEOUT"] = str(CI_CONFIG.get_job_config(job_name).timeout)
+
+    if not run_command:
+        run_command = "/".join(
+            (os.path.dirname(__file__), CI_CONFIG.get_job_config(job_name).run_command)
+        )
+        if ".py" in run_command and not run_command.startswith("python"):
+            run_command = "python3 " + run_command
+        print("Use run command from a job config")
+    else:
+        print("Use run command from the workflow")
+    os.environ["CHECK_NAME"] = job_name
+    print(f"Going to start run command [{run_command}]")
+    process = subprocess.run(
+        run_command,
+        stdout=sys.stdout,
+        stderr=sys.stderr,
+        text=True,
+        check=False,
+        shell=True,
+    )
+
+    if process.returncode == 0:
+        print(f"Run action done for: [{job_name}]")
+        exit_code = 0
+    else:
+        print(
+            f"Run action failed for: [{job_name}] with exit code [{process.returncode}]"
+        )
+        exit_code = process.returncode
+    return exit_code
+
+
+def _get_ext_check_name(check_name: str) -> str:
+    run_by_hash_num = int(os.getenv("RUN_BY_HASH_NUM", "0"))
+    run_by_hash_total = int(os.getenv("RUN_BY_HASH_TOTAL", "0"))
+    if run_by_hash_total > 1:
+        check_name_with_group = (
+            check_name + f" [{run_by_hash_num + 1}/{run_by_hash_total}]"
+        )
+    else:
+        check_name_with_group = check_name
+    return check_name_with_group
 
 
 def main() -> int:
+    logging.basicConfig(level=logging.INFO)
     exit_code = 0
     parser = argparse.ArgumentParser(
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
     args = parse_args(parser)
 
-    if args.mark_success or args.pre or args.post or args.run:
+    if args.mark_success or args.pre or args.run:
         assert args.infile, "Run config must be provided via --infile"
         assert args.job_name, "Job name must be provided via --job-name"
 
     indata: Optional[Dict[str, Any]] = None
     if args.infile:
-        indata = (
-            json.loads(args.infile)
-            if not os.path.isfile(args.infile)
-            else json.load(open(args.infile))
-        )
+        if os.path.isfile(args.infile):
+            with open(args.infile, encoding="utf-8") as jfd:
+                indata = json.load(jfd)
+        else:
+            indata = json.loads(args.infile)
         assert indata and isinstance(indata, dict), "Invalid --infile json"
 
     result: Dict[str, Any] = {}
     s3 = S3Helper()
+    pr_info = PRInfo()
+    git_runner = GitRunner(set_cwd_to_git_root=True)
 
+    ### CONFIGURE action: start
     if args.configure:
-        GR = GitRunner()
-        pr_info = PRInfo()
+        ci_options = CiOptions.create_from_pr_message(
+            args.commit_message or None, update_from_api=True
+        )
+
+        # tokens = _fetch_commit_tokens(message, pr_info)
+        if ci_options.no_merge_commit and CI:
+            git_runner.run(f"{GIT_PREFIX} checkout {pr_info.sha}")
+            git_ref = git_runner.run(f"{GIT_PREFIX} rev-parse HEAD")
 
         docker_data = {}
-        git_ref = GR.run(f"{GIT_PREFIX} rev-parse HEAD")
-
-        # if '#no-merge-commit' is set in commit message - set git ref to PR branch head to avoid merge-commit
-        tokens = []
-        if pr_info.number != 0 and not args.skip_jobs:
-            message = GR.run(f"{GIT_PREFIX} log {pr_info.sha} --format=%B -n 1")
-            tokens = _fetch_commit_tokens(message)
-            print(f"Found commit message tokens: [{tokens}]")
-            if "#no-merge-commit" in tokens and CI:
-                GR.run(f"{GIT_PREFIX} checkout {pr_info.sha}")
-                git_ref = GR.run(f"{GIT_PREFIX} rev-parse HEAD")
-                print(
-                    "#no-merge-commit is set in commit message - Setting git ref to PR branch HEAD to not use merge commit"
-                )
+        git_ref = git_runner.run(f"{GIT_PREFIX} rev-parse HEAD")
 
         # let's get CH version
         version = get_version_from_repo(git=Git(True)).string
         print(f"Got CH version for this commit: [{version}]")
 
         docker_data = (
-            _configure_docker_jobs(
-                args.rebuild_all_docker, args.docker_digest_or_latest
-            )
+            _configure_docker_jobs(args.docker_digest_or_latest)
             if not args.skip_docker
             else {}
         )
@@ -599,184 +1889,286 @@ def main() -> int:
             CI_CONFIG.get_digest_config("package_release")
         )
         docs_digest = job_digester.get_job_digest(
-            CI_CONFIG.get_digest_config("Docs check")
+            CI_CONFIG.get_digest_config(JobNames.DOCS_CHECK)
         )
         jobs_data = (
             _configure_jobs(
-                build_digest,
-                docs_digest,
                 job_digester,
                 s3,
-                args.rebuild_all_binaries,
-                pr_info.labels,
-                tokens,
+                pr_info,
+                ci_options,
             )
             if not args.skip_jobs
             else {}
         )
 
+        if not args.skip_jobs and pr_info.has_changes_in_documentation_only():
+            _update_config_for_docs_only(jobs_data)
+
+        if not args.skip_jobs:
+            ci_cache = CiCache(s3, jobs_data["digests"])
+
+            if pr_info.is_master():
+                # wait for pending jobs to be finished, await_jobs is a long blocking call
+                # wait pending jobs (for now only on release/master branches)
+                ready_jobs_batches_dict = ci_cache.await_jobs(
+                    jobs_data.get("jobs_to_wait", {}), pr_info.is_release_branch()
+                )
+                jobs_to_do = jobs_data["jobs_to_do"]
+                jobs_to_skip = jobs_data["jobs_to_skip"]
+                jobs_params = jobs_data["jobs_params"]
+                for job, batches in ready_jobs_batches_dict.items():
+                    if job not in jobs_params:
+                        print(f"WARNING: Job [{job}] is not in the params list")
+                        continue
+                    for batch in batches:
+                        jobs_params[job]["batches"].remove(batch)
+                    if not jobs_params[job]["batches"]:
+                        jobs_to_do.remove(job)
+                        jobs_to_skip.append(job)
+                        del jobs_params[job]
+
+            # set planned jobs as pending in the CI cache if on the master
+            if pr_info.is_master():
+                for job in jobs_data["jobs_to_do"]:
+                    config = CI_CONFIG.get_job_config(job)
+                    if config.run_always or config.run_by_label:
+                        continue
+                    job_params = jobs_data["jobs_params"][job]
+                    ci_cache.push_pending(
+                        job,
+                        job_params["batches"],
+                        config.num_batches,
+                        release_branch=pr_info.is_release_branch(),
+                    )
+
+            if "jobs_to_wait" in jobs_data:
+                del jobs_data["jobs_to_wait"]
+
         # conclude results
         result["git_ref"] = git_ref
         result["version"] = version
         result["build"] = build_digest
         result["docs"] = docs_digest
+        result["ci_options"] = ci_options.as_dict()
+        if not args.skip_jobs:
+            result["stages_data"] = _generate_ci_stage_config(jobs_data)
         result["jobs_data"] = jobs_data
         result["docker_data"] = docker_data
-        if pr_info.number != 0 and not args.docker_digest_or_latest:
-            # FIXME: it runs style check before docker build if possible (style-check images is not changed)
-            #    find a way to do style check always before docker build and others
-            _check_and_update_for_early_style_check(result)
-        if pr_info.has_changes_in_documentation_only():
-            _update_config_for_docs_only(result)
-
-    elif args.update_gh_statuses:
-        assert indata, "Run config must be provided via --infile"
-        _update_gh_statuses(indata=indata, s3=s3)
+    ### CONFIGURE action: end
 
+    ### PRE action: start
     elif args.pre:
-        # remove job status file if any
-        CommitStatusData.cleanup()
-
-        if is_test_job(args.job_name):
-            assert indata, "Run config must be provided via --infile"
-            report_path = Path(REPORT_PATH)
-            report_path.mkdir(exist_ok=True, parents=True)
-            path = get_s3_path(indata["build"])
-            files = s3.download_files(  # type: ignore
-                bucket=S3_BUILDS_BUCKET,
-                s3_path=path,
-                file_suffix=".json",
-                local_directory=report_path,
-            )
-            print(
-                f"Pre action done. Report files [{files}] have been downloaded from [{path}] to [{report_path}]"
-            )
-        else:
-            print(f"Pre action done. Nothing to do for [{args.job_name}]")
+        assert indata, "Run config must be provided via --infile"
+        _pre_action(s3, indata, pr_info)
 
+    ### RUN action: start
     elif args.run:
-        assert CI_CONFIG.get_job_config(
-            args.job_name
-        ).run_command, f"Run command must be configured in CI_CONFIG for [{args.job_name}] or in GH workflow"
-        if CI_CONFIG.get_job_config(args.job_name).timeout:
-            os.environ["KILL_TIMEOUT"] = str(
-                CI_CONFIG.get_job_config(args.job_name).timeout
+        assert indata
+        ci_options = CiOptions.create_from_run_config(indata)
+        check_name = args.job_name
+        check_name_with_group = _get_ext_check_name(check_name)
+        print(
+            f"Check if rerun for name: [{check_name}], extended name [{check_name_with_group}]"
+        )
+        previous_status = None
+        if CI_CONFIG.is_build_job(check_name):
+            # this is a build job - check if build report is present
+            build_result = (
+                BuildResult.load_any(check_name, pr_info.number, pr_info.head_ref)
+                if not ci_options.no_ci_cache
+                else None
             )
-        os.environ["CHECK_NAME"] = args.job_name
-        run_command = (
-            "./tests/ci/" + CI_CONFIG.get_job_config(args.job_name).run_command
-        )
-        if ".py" in run_command:
-            run_command = "python3 " + run_command
-        print(f"Going to start run command [{run_command}]")
-        process = subprocess.run(
-            run_command,
-            stdout=sys.stdout,
-            stderr=sys.stderr,
-            text=True,
-            check=False,
-            shell=True,
-        )
-        if process.returncode == 0:
-            print(f"Run action done for: [{args.job_name}]")
+            if build_result:
+                if build_result.status == SUCCESS:
+                    previous_status = build_result.status
+                else:
+                    # FIXME: Consider reusing failures for build jobs.
+                    #   Just remove this if/else - that makes build job starting and failing immediately
+                    print(
+                        "Build report found but status is unsuccessful - will try to rerun"
+                    )
+                print("::group::Build Report")
+                print(build_result.as_json())
+                print("::endgroup::")
         else:
-            print(
-                f"Run action failed for: [{args.job_name}] with exit code [{process.returncode}]"
+            # this is a test job - check if GH commit status or cache record is present
+            commit = get_commit(
+                Github(get_best_robot_token(), per_page=100), pr_info.sha
             )
-            exit_code = process.returncode
 
+            # rerun helper check
+            # FIXME: remove rerun_helper check and rely on ci cache only
+            if check_name not in (
+                # we might want to rerun reports' jobs - disable rerun check for them
+                JobNames.BUILD_CHECK,
+                JobNames.BUILD_CHECK_SPECIAL,
+            ):
+                rerun_helper = RerunHelper(commit, check_name_with_group)
+                if rerun_helper.is_already_finished_by_status():
+                    status = rerun_helper.get_finished_status()
+                    assert status
+                    previous_status = status.state
+                    print("::group::Commit Status")
+                    print(status)
+                    print("::endgroup::")
+
+            # ci cache check
+            if not previous_status and not ci_options.no_ci_cache:
+                ci_cache = CiCache(s3, indata["jobs_data"]["digests"]).update()
+                job_config = CI_CONFIG.get_job_config(check_name)
+                if ci_cache.is_successful(
+                    check_name,
+                    args.batch,
+                    job_config.num_batches,
+                    job_config.required_on_release_branch,
+                ):
+                    job_status = ci_cache.get_successful(
+                        check_name, args.batch, job_config.num_batches
+                    )
+                    assert job_status, "BUG"
+                    _create_gh_status(
+                        commit,
+                        check_name,
+                        args.batch,
+                        job_config.num_batches,
+                        job_status,
+                    )
+                    previous_status = job_status.status
+                    GHActions.print_in_group("Commit Status Data", job_status)
+
+        if previous_status and not args.force:
+            print(
+                f"Commit status or Build Report is already present - job will be skipped with status: [{previous_status}]"
+            )
+            if previous_status == SUCCESS:
+                exit_code = 0
+            else:
+                exit_code = 1
+        else:
+            exit_code = _run_test(check_name, args.run_command)
+    ### RUN action: end
+
+    ### POST action: start
     elif args.post:
-        if is_build_job(args.job_name):
-            report_path = Path(TEMP_PATH)  # build-check.py stores report in TEMP_PATH
-            assert report_path.is_dir(), f"File [{report_path}] is not a dir"
-            files = list(report_path.glob(f"*{args.job_name}.json"))  # type: ignore[arg-type]
-            assert len(files) == 1, f"Which is the report file: {files}?"
-            local_report = f"{files[0]}"
-            report_name = BuildResult.get_report_name(args.job_name)
-            assert indata
-            s3_path = Path(get_s3_path(indata["build"])) / report_name
-            report_url = s3.upload_file(
-                bucket=S3_BUILDS_BUCKET, file_path=local_report, s3_path=s3_path
-            )
-            print(
-                f"Post action done. Report file [{local_report}] has been uploaded to [{report_url}]"
-            )
-        else:
-            print(f"Post action done. Nothing to do for [{args.job_name}]")
+        job_report = JobReport.load() if JobReport.exist() else None
+        if job_report:
+            ch_helper = ClickHouseHelper()
+            check_url = ""
 
+            if CI_CONFIG.is_build_job(args.job_name):
+                assert (
+                    indata
+                ), f"--infile with config must be provided for POST action of a build type job [{args.job_name}]"
+                build_name = args.job_name
+                s3_path_prefix = "/".join(
+                    (
+                        get_release_or_pr(pr_info, get_version_from_repo())[0],
+                        pr_info.sha,
+                        build_name,
+                    )
+                )
+                log_url = _upload_build_artifacts(
+                    pr_info,
+                    build_name,
+                    ci_cache=CiCache(s3, indata["jobs_data"]["digests"]),
+                    job_report=job_report,
+                    s3=s3,
+                    s3_destination=s3_path_prefix,
+                )
+                _upload_build_profile_data(
+                    pr_info, build_name, job_report, git_runner, ch_helper
+                )
+                check_url = log_url
+            else:
+                # test job
+                additional_urls = []
+                s3_path_prefix = "/".join(
+                    (
+                        get_release_or_pr(pr_info, get_version_from_repo())[0],
+                        pr_info.sha,
+                        normalize_string(
+                            job_report.check_name or _get_ext_check_name(args.job_name)
+                        ),
+                    )
+                )
+                if job_report.build_dir_for_upload:
+                    additional_urls = s3.upload_build_directory_to_s3(
+                        Path(job_report.build_dir_for_upload),
+                        s3_path_prefix,
+                        keep_dirs_in_s3_path=False,
+                        upload_symlinks=False,
+                    )
+                if job_report.test_results or job_report.additional_files:
+                    check_url = upload_result_helper.upload_results(
+                        s3,
+                        pr_info.number,
+                        pr_info.sha,
+                        job_report.test_results,
+                        job_report.additional_files,
+                        job_report.check_name or _get_ext_check_name(args.job_name),
+                        additional_urls=additional_urls or None,
+                    )
+                commit = get_commit(
+                    Github(get_best_robot_token(), per_page=100), pr_info.sha
+                )
+                post_commit_status(
+                    commit,
+                    job_report.status,
+                    check_url,
+                    format_description(job_report.description),
+                    job_report.check_name or _get_ext_check_name(args.job_name),
+                    pr_info,
+                    dump_to_file=True,
+                )
+                update_mergeable_check(
+                    commit,
+                    pr_info,
+                    job_report.check_name or _get_ext_check_name(args.job_name),
+                )
+
+            print(f"Job report url: [{check_url}]")
+            prepared_events = prepare_tests_results_for_clickhouse(
+                pr_info,
+                job_report.test_results,
+                job_report.status,
+                job_report.duration,
+                job_report.start_time,
+                check_url or "",
+                job_report.check_name or _get_ext_check_name(args.job_name),
+            )
+            ch_helper.insert_events_into(
+                db="default", table="checks", events=prepared_events
+            )
+
+            if "DockerServerImage" in args.job_name and indata is not None:
+                _add_build_to_version_history(
+                    pr_info,
+                    job_report,
+                    indata["version"],
+                    indata["build"],
+                    ch_helper,
+                )
+        else:
+            # no job report
+            print(f"No job report for {[args.job_name]} - do nothing")
+    ### POST action: end
+
+    ### MARK SUCCESS action: start
     elif args.mark_success:
         assert indata, "Run config must be provided via --infile"
-        job = args.job_name
-        job_config = CI_CONFIG.get_job_config(job)
-        num_batches = job_config.num_batches
-        assert (
-            num_batches <= 1 or 0 <= args.batch < num_batches
-        ), f"--batch must be provided and in range [0, {num_batches}) for {job}"
+        _mark_success_action(s3, indata, pr_info, args.job_name, args.batch)
 
-        # FIXME: find generic design for propagating and handling job status (e.g. stop using statuses in GH api)
-        #   now job ca be build job w/o status data, any other job that exit with 0 with or w/o status data
-        if is_build_job(job):
-            # there is no status for build jobs
-            # create dummy success to mark it as done
-            job_status = CommitStatusData(
-                status="success", description="dummy status", report_url="dummy_url"
-            )
-        else:
-            if not CommitStatusData.is_present():
-                # apparently exit after rerun-helper check
-                # do nothing, exit without failure
-                print(f"ERROR: no status file for job [{job}]")
-                job_status = CommitStatusData(
-                    status="dummy failure",
-                    description="dummy status",
-                    report_url="dummy_url",
-                )
-            else:
-                # normal case
-                job_status = CommitStatusData.load_status()
+    ### UPDATE GH STATUSES action: start
+    elif args.update_gh_statuses:
+        assert indata, "Run config must be provided via --infile"
+        _update_gh_statuses_action(indata=indata, s3=s3)
 
-        # Storing job data (report_url) to restore OK GH status on job results reuse
-        if job_config.run_always:
-            print(f"Job [{job}] runs always in CI - do not mark as done")
-        elif job_status.is_ok():
-            success_flag_name = get_file_flag_name(
-                job, indata["jobs_data"]["digests"][job], args.batch, num_batches
-            )
-            if not is_docs_job(job):
-                path = get_s3_path(indata["build"]) + success_flag_name
-            else:
-                path = get_s3_path_docs(indata["docs"]) + success_flag_name
-            job_status.dump_to_file(success_flag_name)
-            _ = s3.upload_file(
-                bucket=S3_BUILDS_BUCKET, file_path=success_flag_name, s3_path=path
-            )
-            os.remove(success_flag_name)
-            print(
-                f"Job [{job}] with digest [{indata['jobs_data']['digests'][job]}] {f'and batch {args.batch}/{num_batches}' if num_batches > 1 else ''} marked as successful. path: [{path}]"
-            )
-        else:
-            print(f"Job [{job}] is not ok, status [{job_status.status}]")
-
-    # print results
-    if args.outfile:
-        with open(args.outfile, "w") as f:
-            if isinstance(result, str):
-                print(result, file=f)
-            elif isinstance(result, dict):
-                print(json.dumps(result, indent=2 if args.pretty else None), file=f)
-            else:
-                raise AssertionError(f"Unexpected type for 'res': {type(result)}")
-    else:
-        if isinstance(result, str):
-            print(result)
-        elif isinstance(result, dict):
-            print(json.dumps(result, indent=2 if args.pretty else None))
-        else:
-            raise AssertionError(f"Unexpected type for 'res': {type(result)}")
+    ### print results
+    _print_results(result, args.outfile, args.pretty)
 
     return exit_code
 
 
 if __name__ == "__main__":
-    os.chdir(ROOT_DIR)
     sys.exit(main())
diff --git a/tests/ci/ci_config.py b/tests/ci/ci_config.py
index e3319fe4a72..8d1dcefcf1b 100644
--- a/tests/ci/ci_config.py
+++ b/tests/ci/ci_config.py
@@ -1,17 +1,190 @@
 #!/usr/bin/env python3
 
+from copy import deepcopy
 import logging
 from argparse import ArgumentDefaultsHelpFormatter, ArgumentParser
 from dataclasses import dataclass, field
-from enum import Enum
 from pathlib import Path
 from typing import Callable, Dict, Iterable, List, Literal, Optional, Union
 
+from ci_utils import WithIter
 from integration_test_images import IMAGES
 
 
-class Labels(Enum):
-    DO_NOT_TEST_LABEL = "do not test"
+class WorkFlows(metaclass=WithIter):
+    PULL_REQUEST = "PULL_REQUEST"
+    MASTER = "MASTER"
+    BACKPORT = "BACKPORT"
+    RELEASE = "RELEASE"
+    SYNC = "SYNC"
+
+
+class CIStages(metaclass=WithIter):
+    NA = "UNKNOWN"
+    BUILDS_1 = "Builds_1"
+    BUILDS_2 = "Builds_2"
+    TESTS_1 = "Tests_1"
+    TESTS_2 = "Tests_2"
+
+
+class Runners(metaclass=WithIter):
+    BUILDER = "builder"
+    STYLE_CHECKER = "style-checker"
+    STYLE_CHECKER_ARM = "style-checker-aarch64"
+    FUNC_TESTER = "func-tester"
+    FUNC_TESTER_ARM = "func-tester-aarch64"
+    STRESS_TESTER = "stress-tester"
+    FUZZER_UNIT_TESTER = "fuzzer-unit-tester"
+
+
+class Labels(metaclass=WithIter):
+    """
+    Label names or commit tokens in normalized form
+    """
+
+    DO_NOT_TEST_LABEL = "do_not_test"
+    NO_MERGE_COMMIT = "no_merge_commit"
+    NO_CI_CACHE = "no_ci_cache"
+    CI_SET_REDUCED = "ci_set_reduced"
+    CI_SET_FAST = "ci_set_fast"
+    CI_SET_ARM = "ci_set_arm"
+    CI_SET_INTEGRATION = "ci_set_integration"
+    CI_SET_ANALYZER = "ci_set_analyzer"
+    CI_SET_STATLESS = "ci_set_stateless"
+    CI_SET_STATEFUL = "ci_set_stateful"
+    CI_SET_STATLESS_ASAN = "ci_set_stateless_asan"
+    CI_SET_STATEFUL_ASAN = "ci_set_stateful_asan"
+
+    libFuzzer = "libFuzzer"
+
+
+class Build(metaclass=WithIter):
+    PACKAGE_RELEASE = "package_release"
+    PACKAGE_AARCH64 = "package_aarch64"
+    PACKAGE_ASAN = "package_asan"
+    PACKAGE_UBSAN = "package_ubsan"
+    PACKAGE_TSAN = "package_tsan"
+    PACKAGE_MSAN = "package_msan"
+    PACKAGE_DEBUG = "package_debug"
+    PACKAGE_RELEASE_COVERAGE = "package_release_coverage"
+    BINARY_RELEASE = "binary_release"
+    BINARY_TIDY = "binary_tidy"
+    BINARY_DARWIN = "binary_darwin"
+    BINARY_AARCH64 = "binary_aarch64"
+    BINARY_AARCH64_V80COMPAT = "binary_aarch64_v80compat"
+    BINARY_FREEBSD = "binary_freebsd"
+    BINARY_DARWIN_AARCH64 = "binary_darwin_aarch64"
+    BINARY_PPC64LE = "binary_ppc64le"
+    BINARY_AMD64_COMPAT = "binary_amd64_compat"
+    BINARY_AMD64_MUSL = "binary_amd64_musl"
+    BINARY_RISCV64 = "binary_riscv64"
+    BINARY_S390X = "binary_s390x"
+    FUZZERS = "fuzzers"
+
+
+class JobNames(metaclass=WithIter):
+    STYLE_CHECK = "Style check"
+    FAST_TEST = "Fast test"
+    DOCKER_SERVER = "Docker server image"
+    DOCKER_KEEPER = "Docker keeper image"
+    INSTALL_TEST_AMD = "Install packages (amd64)"
+    INSTALL_TEST_ARM = "Install packages (arm64)"
+
+    STATELESS_TEST_DEBUG = "Stateless tests (debug)"
+    STATELESS_TEST_RELEASE = "Stateless tests (release)"
+    STATELESS_TEST_RELEASE_COVERAGE = "Stateless tests (coverage)"
+    STATELESS_TEST_AARCH64 = "Stateless tests (aarch64)"
+    STATELESS_TEST_ASAN = "Stateless tests (asan)"
+    STATELESS_TEST_TSAN = "Stateless tests (tsan)"
+    STATELESS_TEST_MSAN = "Stateless tests (msan)"
+    STATELESS_TEST_UBSAN = "Stateless tests (ubsan)"
+    STATELESS_TEST_ANALYZER_S3_REPLICATED_RELEASE = (
+        "Stateless tests (release, old analyzer, s3, DatabaseReplicated)"
+    )
+    # merged into STATELESS_TEST_ANALYZER_S3_REPLICATED_RELEASE:
+    # STATELESS_TEST_ANALYZER_RELEASE = "Stateless tests (release, analyzer)"
+    # STATELESS_TEST_DB_REPL_RELEASE = "Stateless tests (release, DatabaseReplicated)"
+    # STATELESS_TEST_S3_RELEASE = "Stateless tests (release, s3 storage)"
+    STATELESS_TEST_S3_DEBUG = "Stateless tests (debug, s3 storage)"
+    STATELESS_TEST_S3_TSAN = "Stateless tests (tsan, s3 storage)"
+    STATELESS_TEST_FLAKY_ASAN = "Stateless tests flaky check (asan)"
+
+    STATEFUL_TEST_DEBUG = "Stateful tests (debug)"
+    STATEFUL_TEST_RELEASE = "Stateful tests (release)"
+    STATEFUL_TEST_RELEASE_COVERAGE = "Stateful tests (coverage)"
+    STATEFUL_TEST_AARCH64 = "Stateful tests (aarch64)"
+    STATEFUL_TEST_ASAN = "Stateful tests (asan)"
+    STATEFUL_TEST_TSAN = "Stateful tests (tsan)"
+    STATEFUL_TEST_MSAN = "Stateful tests (msan)"
+    STATEFUL_TEST_UBSAN = "Stateful tests (ubsan)"
+    STATEFUL_TEST_PARALLEL_REPL_RELEASE = "Stateful tests (release, ParallelReplicas)"
+    STATEFUL_TEST_PARALLEL_REPL_DEBUG = "Stateful tests (debug, ParallelReplicas)"
+    STATEFUL_TEST_PARALLEL_REPL_ASAN = "Stateful tests (asan, ParallelReplicas)"
+    STATEFUL_TEST_PARALLEL_REPL_MSAN = "Stateful tests (msan, ParallelReplicas)"
+    STATEFUL_TEST_PARALLEL_REPL_UBSAN = "Stateful tests (ubsan, ParallelReplicas)"
+    STATEFUL_TEST_PARALLEL_REPL_TSAN = "Stateful tests (tsan, ParallelReplicas)"
+
+    STRESS_TEST_ASAN = "Stress test (asan)"
+    STRESS_TEST_TSAN = "Stress test (tsan)"
+    STRESS_TEST_UBSAN = "Stress test (ubsan)"
+    STRESS_TEST_MSAN = "Stress test (msan)"
+    STRESS_TEST_DEBUG = "Stress test (debug)"
+
+    INTEGRATION_TEST = "Integration tests (release)"
+    INTEGRATION_TEST_ASAN = "Integration tests (asan)"
+    INTEGRATION_TEST_ASAN_ANALYZER = "Integration tests (asan, old analyzer)"
+    INTEGRATION_TEST_TSAN = "Integration tests (tsan)"
+    INTEGRATION_TEST_ARM = "Integration tests (aarch64)"
+    INTEGRATION_TEST_FLAKY = "Integration tests flaky check (asan)"
+
+    UPGRADE_TEST_DEBUG = "Upgrade check (debug)"
+    UPGRADE_TEST_ASAN = "Upgrade check (asan)"
+    UPGRADE_TEST_TSAN = "Upgrade check (tsan)"
+    UPGRADE_TEST_MSAN = "Upgrade check (msan)"
+
+    UNIT_TEST = "Unit tests (release)"
+    UNIT_TEST_ASAN = "Unit tests (asan)"
+    UNIT_TEST_MSAN = "Unit tests (msan)"
+    UNIT_TEST_TSAN = "Unit tests (tsan)"
+    UNIT_TEST_UBSAN = "Unit tests (ubsan)"
+
+    AST_FUZZER_TEST_DEBUG = "AST fuzzer (debug)"
+    AST_FUZZER_TEST_ASAN = "AST fuzzer (asan)"
+    AST_FUZZER_TEST_MSAN = "AST fuzzer (msan)"
+    AST_FUZZER_TEST_TSAN = "AST fuzzer (tsan)"
+    AST_FUZZER_TEST_UBSAN = "AST fuzzer (ubsan)"
+
+    JEPSEN_KEEPER = "ClickHouse Keeper Jepsen"
+    JEPSEN_SERVER = "ClickHouse Server Jepsen"
+
+    PERFORMANCE_TEST_AMD64 = "Performance Comparison"
+    PERFORMANCE_TEST_ARM64 = "Performance Comparison Aarch64"
+
+    SQL_LOGIC_TEST = "Sqllogic test (release)"
+
+    SQLANCER = "SQLancer (release)"
+    SQLANCER_DEBUG = "SQLancer (debug)"
+    SQLTEST = "SQLTest"
+
+    COMPATIBILITY_TEST = "Compatibility check (amd64)"
+    COMPATIBILITY_TEST_ARM = "Compatibility check (aarch64)"
+
+    CLCIKBENCH_TEST = "ClickBench (amd64)"
+    CLCIKBENCH_TEST_ARM = "ClickBench (aarch64)"
+
+    LIBFUZZER_TEST = "libFuzzer tests"
+
+    BUILD_CHECK = "ClickHouse build check"
+    BUILD_CHECK_SPECIAL = "ClickHouse special build check"
+
+    DOCS_CHECK = "Docs check"
+    BUGFIX_VALIDATE = "Bugfix validation"
+
+
+# dynamically update JobName with Build jobs
+for attr_name in dir(Build):
+    if not attr_name.startswith("__") and not callable(getattr(Build, attr_name)):
+        setattr(JobNames, attr_name, getattr(Build, attr_name))
 
 
 @dataclass
@@ -31,7 +204,7 @@ class DigestConfig:
 @dataclass
 class LabelConfig:
     """
-    class to configure different CI scenarious per GH label
+    configures different CI scenarious per GH label
     """
 
     run_jobs: Iterable[str] = frozenset()
@@ -40,19 +213,69 @@ class LabelConfig:
 @dataclass
 class JobConfig:
     """
-    contains config parameter relevant for job execution in CI workflow
-    @digest - configures digest calculation for the job
-    @run_command - will be triggered for the job if omited in CI workflow yml
-    @timeout
-    @num_batches - sets number of batches for multi-batch job
+    contains config parameters for job execution in CI workflow
     """
 
+    # configures digest calculation for the job
     digest: DigestConfig = field(default_factory=DigestConfig)
+    # will be triggered for the job if omited in CI workflow yml
     run_command: str = ""
+    # job timeout, seconds
     timeout: Optional[int] = None
+    # sets number of batches for multi-batch job
     num_batches: int = 1
+    # label that enables job in CI, if set digest won't be used
     run_by_label: str = ""
+    # to run always regardless of the job digest or/and label
     run_always: bool = False
+    # if the job needs to be run on the release branch, including master (e.g. building packages, docker server).
+    # NOTE: Subsequent runs on the same branch with the similar digest are still considered skippable.
+    required_on_release_branch: bool = False
+    # job is for pr workflow only
+    pr_only: bool = False
+    # job is for release/master branches only
+    release_only: bool = False
+    # to randomly pick and run one job among jobs in the same @random_bucket. Applied in PR branches only.
+    random_bucket: str = ""
+
+
+builds_job_config = JobConfig(
+    required_on_release_branch=True,
+    digest=DigestConfig(
+        include_paths=[
+            "./src",
+            "./contrib/*-cmake",
+            "./contrib/consistent-hashing",
+            "./contrib/murmurhash",
+            "./contrib/libfarmhash",
+            "./contrib/pdqsort",
+            "./contrib/cityhash102",
+            "./contrib/sparse-checkout",
+            "./contrib/libmetrohash",
+            "./contrib/update-submodules.sh",
+            "./contrib/CMakeLists.txt",
+            "./CMakeLists.txt",
+            "./PreLoad.cmake",
+            "./cmake",
+            "./base",
+            "./programs",
+            "./packages",
+            "./docker/packager/packager",
+            "./rust",
+            # FIXME: This is a WA to rebuild the CH and recreate the Performance.tar.zst artifact
+            # when there are changes in performance test scripts.
+            # Due to the current design of the perf test we need to rebuild CH when the performance test changes,
+            # otherwise the changes will not be visible in the PerformanceTest job in CI
+            "./tests/performance",
+        ],
+        exclude_files=[".md"],
+        docker=["clickhouse/binary-builder"],
+        git_submodules=True,
+    ),
+    run_command="build_check.py $BUILD_NAME",
+)
+fuzzer_build_job_config = deepcopy(builds_job_config)
+fuzzer_build_job_config.run_by_label = Labels.libFuzzer
 
 
 @dataclass
@@ -62,43 +285,22 @@ class BuildConfig:
     package_type: Literal["deb", "binary", "fuzzers"]
     additional_pkgs: bool = False
     debug_build: bool = False
+    coverage: bool = False
     sanitizer: str = ""
     tidy: bool = False
+    # sparse_checkout is needed only to test the option itself.
+    # No particular sense to use it in every build, since it slows down the job.
     sparse_checkout: bool = False
     comment: str = ""
     static_binary_name: str = ""
-    job_config: JobConfig = field(
-        default_factory=lambda: JobConfig(
-            digest=DigestConfig(
-                include_paths=[
-                    "./src",
-                    "./contrib/*-cmake",
-                    "./contrib/consistent-hashing",
-                    "./contrib/murmurhash",
-                    "./contrib/libfarmhash",
-                    "./contrib/pdqsort",
-                    "./contrib/cityhash102",
-                    "./contrib/sparse-checkout",
-                    "./contrib/libmetrohash",
-                    "./contrib/update-submodules.sh",
-                    "./contrib/CMakeLists.txt",
-                    "./cmake",
-                    "./base",
-                    "./programs",
-                    "./packages",
-                    "./docker/packager/packager",
-                ],
-                exclude_files=[".md"],
-                docker=["clickhouse/binary-builder"],
-                git_submodules=True,
-            ),
-        )
-    )
+    job_config: JobConfig = field(default_factory=lambda: deepcopy(builds_job_config))
 
     def export_env(self, export: bool = False) -> str:
         def process(field_name: str, field: Union[bool, str]) -> str:
             if isinstance(field, bool):
                 field = str(field).lower()
+            elif not isinstance(field, str):
+                field = ""
             if export:
                 return f"export BUILD_{field_name.upper()}={repr(field)}"
             return f"BUILD_{field_name.upper()}={field}"
@@ -109,13 +311,22 @@ class BuildConfig:
 @dataclass
 class BuildReportConfig:
     builds: List[str]
-    job_config: JobConfig = field(default_factory=JobConfig)
+    job_config: JobConfig = field(
+        default_factory=lambda: JobConfig(
+            run_command='build_report_check.py "$CHECK_NAME"',
+            digest=DigestConfig(
+                include_paths=[
+                    "./tests/ci/build_report_check.py",
+                    "./tests/ci/upload_result_helper.py",
+                ],
+            ),
+        )
+    )
 
 
 @dataclass
 class TestConfig:
     required_build: str
-    force_tests: bool = False
     job_config: JobConfig = field(default_factory=JobConfig)
 
 
@@ -133,19 +344,37 @@ install_check_digest = DigestConfig(
     include_paths=["./tests/ci/install_check.py"],
     docker=["clickhouse/install-deb-test", "clickhouse/install-rpm-test"],
 )
-statless_check_digest = DigestConfig(
-    include_paths=["./tests/queries/0_stateless/"],
+stateless_check_digest = DigestConfig(
+    include_paths=[
+        "./tests/ci/functional_test_check.py",
+        "./tests/queries/0_stateless/",
+        "./tests/clickhouse-test",
+        "./tests/config",
+        "./tests/*.txt",
+    ],
     exclude_files=[".md"],
     docker=["clickhouse/stateless-test"],
 )
 stateful_check_digest = DigestConfig(
-    include_paths=["./tests/queries/1_stateful/"],
+    include_paths=[
+        "./tests/ci/functional_test_check.py",
+        "./tests/queries/1_stateful/",
+        "./tests/clickhouse-test",
+        "./tests/config",
+        "./tests/*.txt",
+    ],
     exclude_files=[".md"],
     docker=["clickhouse/stateful-test"],
 )
-# FIXME: which tests are stresstest? stateless?
+
 stress_check_digest = DigestConfig(
-    include_paths=["./tests/queries/0_stateless/"],
+    include_paths=[
+        "./tests/queries/0_stateless/",
+        "./tests/queries/1_stateful/",
+        "./tests/clickhouse-test",
+        "./tests/config",
+        "./tests/*.txt",
+    ],
     exclude_files=[".md"],
     docker=["clickhouse/stress-test"],
 )
@@ -156,7 +385,11 @@ upgrade_check_digest = DigestConfig(
     docker=["clickhouse/upgrade-check"],
 )
 integration_check_digest = DigestConfig(
-    include_paths=["./tests/ci/integration_test_check.py", "./tests/integration"],
+    include_paths=[
+        "./tests/ci/integration_test_check.py",
+        "./tests/ci/integration_tests_runner.py",
+        "./tests/integration/",
+    ],
     exclude_files=[".md"],
     docker=IMAGES.copy(),
 )
@@ -208,8 +441,22 @@ bugfix_validate_check = DigestConfig(
     ],
 )
 # common test params
+docker_server_job_config = JobConfig(
+    required_on_release_branch=True,
+    run_command='docker_server.py --check-name "$CHECK_NAME" --release-type head --allow-build-reuse',
+    digest=DigestConfig(
+        include_paths=[
+            "tests/ci/docker_server.py",
+            "./docker/server",
+        ]
+    ),
+)
+compatibility_test_common_params = {
+    "digest": compatibility_check_digest,
+    "run_command": "compatibility_check.py",
+}
 statless_test_common_params = {
-    "digest": statless_check_digest,
+    "digest": stateless_check_digest,
     "run_command": 'functional_test_check.py "$CHECK_NAME" $KILL_TIMEOUT',
     "timeout": 10800,
 }
@@ -243,27 +490,44 @@ perf_test_common_params = {
     "digest": perf_check_digest,
     "run_command": "performance_comparison_check.py",
 }
-sqllancer_test_common_params = {
-    "digest": sqllancer_check_digest,
-    "run_command": "sqlancer_check.py",
-    "run_always": True,
-}
-sqllogic_test_params = {
-    "digest": sqllogic_check_digest,
-    "run_command": "sqllogic_test.py",
-    "timeout": 10800,
-}
-sql_test_params = {
-    "digest": sqltest_check_digest,
-    "run_command": "sqltest.py",
-    "timeout": 10800,
+sqllancer_test_common_params = JobConfig(
+    digest=sqllancer_check_digest,
+    run_command="sqlancer_check.py",
+    release_only=True,
+    run_always=True,
+)
+sqllogic_test_params = JobConfig(
+    digest=sqllogic_check_digest,
+    run_command="sqllogic_test.py",
+    timeout=10800,
+    release_only=True,
+)
+sql_test_params = JobConfig(
+    digest=sqltest_check_digest,
+    run_command="sqltest.py",
+    timeout=10800,
+    release_only=True,
+)
+clickbench_test_params = {
+    "digest": DigestConfig(
+        include_paths=[
+            "tests/ci/clickbench.py",
+        ],
+        docker=["clickhouse/clickbench"],
+    ),
+    "run_command": 'clickbench.py "$CHECK_NAME"',
 }
+install_test_params = JobConfig(
+    digest=install_check_digest,
+    run_command='install_check.py "$CHECK_NAME"',
+    timeout=900,
+)
 
 
 @dataclass
-class CiConfig:
+class CIConfig:
     """
-    Contains configs for ALL jobs in CI pipeline
+    Contains configs for all jobs in the CI pipeline
     each config item in the below dicts should be an instance of JobConfig class or inherited from it
     """
 
@@ -275,10 +539,49 @@ class CiConfig:
 
     def get_label_config(self, label_name: str) -> Optional[LabelConfig]:
         for label, config in self.label_configs.items():
-            if label_name == label:
+            if self.normalize_string(label_name) == self.normalize_string(label):
                 return config
         return None
 
+    def get_job_ci_stage(self, job_name: str) -> str:
+        if job_name in [
+            JobNames.STYLE_CHECK,
+            JobNames.FAST_TEST,
+            JobNames.JEPSEN_KEEPER,
+            JobNames.BUILD_CHECK,
+            JobNames.BUILD_CHECK_SPECIAL,
+        ]:
+            # FIXME: we can't currently handle Jepsen in the Stage as it's job has concurrency directive
+            # BUILD_CHECK and BUILD_CHECK_SPECIAL runs not in stage because we need them even if Builds stage failed
+            return CIStages.NA
+        stage_type = None
+        if self.is_build_job(job_name):
+            stage_type = CIStages.BUILDS_1
+            if job_name in CI_CONFIG.get_builds_for_report(
+                JobNames.BUILD_CHECK_SPECIAL
+            ):
+                # special builds go to Build_2 stage to not delay Builds_1/Test_1
+                stage_type = CIStages.BUILDS_2
+        elif self.is_docs_job(job_name):
+            stage_type = CIStages.TESTS_1
+        elif job_name == JobNames.BUILD_CHECK_SPECIAL:
+            stage_type = CIStages.TESTS_2
+        elif self.is_test_job(job_name):
+            stage_type = CIStages.TESTS_1
+            if job_name in CI_CONFIG.test_configs:
+                required_build = CI_CONFIG.test_configs[job_name].required_build
+                assert required_build
+                if required_build in CI_CONFIG.get_builds_for_report(
+                    JobNames.BUILD_CHECK
+                ):
+                    stage_type = CIStages.TESTS_1
+                else:
+                    stage_type = CIStages.TESTS_2
+            else:
+                stage_type = CIStages.TESTS_1
+        assert stage_type, f"BUG [{job_name}]"
+        return stage_type
+
     def get_job_config(self, check_name: str) -> JobConfig:
         res = None
         for config in (
@@ -290,25 +593,82 @@ class CiConfig:
             if check_name in config:  # type: ignore
                 res = config[check_name].job_config  # type: ignore
                 break
-        assert (
-            res is not None
-        ), f"Invalid check_name or CI_CONFIG outdated, config not found for [{check_name}]"
         return res  # type: ignore
 
-    def get_job_with_parents(self, check_name: str) -> List[str]:
-        def _normalize_string(input_string: str) -> str:
-            lowercase_string = input_string.lower()
-            normalized_string = (
-                lowercase_string.replace(" ", "_")
-                .replace("-", "_")
-                .replace("(", "")
-                .replace(")", "")
-                .replace(",", "")
-            )
-            return normalized_string
+    def get_runner_type(self, check_name: str) -> str:
+        result = None
+        if self.is_build_job(check_name) or check_name == JobNames.FAST_TEST:
+            result = Runners.BUILDER
+        elif any(
+            words in check_name.lower()
+            for words in [
+                "install packages",
+                "compatibility check",
+                "docker",
+                "build check",
+                "jepsen",
+                "style check",
+            ]
+        ):
+            result = Runners.STYLE_CHECKER
+        elif check_name == JobNames.DOCS_CHECK:
+            # docs job is demanding
+            result = Runners.FUNC_TESTER_ARM
+        elif any(
+            words in check_name.lower()
+            for words in [
+                "stateless",
+                "stateful",
+                "clickbench",
+                "sqllogic test",
+                "libfuzzer",
+                "bugfix validation",
+            ]
+        ):
+            result = Runners.FUNC_TESTER
+        elif any(
+            words in check_name.lower()
+            for words in ["stress", "upgrade", "integration", "performance comparison"]
+        ):
+            result = Runners.STRESS_TESTER
+        elif any(
+            words in check_name.lower()
+            for words in ["ast fuzzer", "unit tests", "sqlancer", "sqltest"]
+        ):
+            result = Runners.FUZZER_UNIT_TESTER
 
+        assert result, f"BUG, no runner for [{check_name}]"
+
+        if (
+            "aarch" in check_name.lower() or "arm64" in check_name.lower()
+        ) and "aarch" not in result:
+            if result == Runners.STRESS_TESTER:
+                # FIXME: no arm stress tester group atm
+                result = Runners.FUNC_TESTER_ARM
+            elif result == Runners.BUILDER:
+                # crosscompile - no arm required
+                pass
+            else:
+                # switch to aarch64 runnner
+                result += "-aarch64"
+
+        return result
+
+    @staticmethod
+    def normalize_string(input_string: str) -> str:
+        lowercase_string = input_string.lower()
+        normalized_string = (
+            lowercase_string.replace(" ", "_")
+            .replace("-", "_")
+            .replace("(", "")
+            .replace(")", "")
+            .replace(",", "")
+        )
+        return normalized_string
+
+    def get_job_with_parents(self, check_name: str) -> List[str]:
         res = []
-        check_name = _normalize_string(check_name)
+        check_name = self.normalize_string(check_name)
 
         for config in (
             self.build_config,
@@ -317,18 +677,18 @@ class CiConfig:
             self.other_jobs_configs,
         ):
             for job_name in config:  # type: ignore
-                if check_name == _normalize_string(job_name):
+                if check_name == self.normalize_string(job_name):
                     res.append(job_name)
                     if isinstance(config[job_name], TestConfig):  # type: ignore
-                        assert config[
-                            job_name
-                        ].required_build, f"Error: Experimantal feature... Not supported job [{job_name}]"  # type: ignore
-                        res.append(config[job_name].required_build)  # type: ignore
-                        res.append("Fast tests")
-                        res.append("Style check")
+                        if config[job_name].required_build:  # type: ignore
+                            res.append(config[job_name].required_build)  # type: ignore
                     elif isinstance(config[job_name], BuildConfig):  # type: ignore
-                        res.append("Fast tests")
-                        res.append("Style check")
+                        pass
+                    elif isinstance(config[job_name], BuildReportConfig):  # type: ignore
+                        # add all build jobs as parents for build report check
+                        res.extend(
+                            [job for job in JobNames if job in self.build_config]
+                        )
                     else:
                         assert (
                             False
@@ -354,22 +714,52 @@ class CiConfig:
         ), f"Invalid check_name or CI_CONFIG outdated, config not found for [{check_name}]"
         return res  # type: ignore
 
-    def job_generator(self) -> Iterable[str]:
+    def job_generator(self, branch: str) -> Iterable[str]:
         """
         traverses all check names in CI pipeline
         """
+        assert branch
         for config in (
             self.other_jobs_configs,
             self.build_config,
             self.builds_report_config,
             self.test_configs,
         ):
-            for check_name in config:  # type: ignore
-                yield check_name
+            yield from config  # type: ignore
+
+    def get_builds_for_report(
+        self, report_name: str, release: bool = False, backport: bool = False
+    ) -> List[str]:
+        # hack to modify build list for release and bp wf
+        assert not (release and backport), "Invalid input"
+        if backport and report_name == JobNames.BUILD_CHECK:
+            return [
+                Build.PACKAGE_RELEASE,
+                Build.PACKAGE_AARCH64,
+                Build.PACKAGE_ASAN,
+                Build.PACKAGE_TSAN,
+                Build.PACKAGE_DEBUG,
+            ]
+        if (release or backport) and report_name == JobNames.BUILD_CHECK_SPECIAL:
+            return [
+                Build.BINARY_DARWIN,
+                Build.BINARY_DARWIN_AARCH64,
+            ]
 
-    def get_builds_for_report(self, report_name: str) -> List[str]:
         return self.builds_report_config[report_name].builds
 
+    @classmethod
+    def is_build_job(cls, job: str) -> bool:
+        return job in Build
+
+    @classmethod
+    def is_test_job(cls, job: str) -> bool:
+        return not cls.is_build_job(job) and job != JobNames.STYLE_CHECK
+
+    @classmethod
+    def is_docs_job(cls, job: str) -> bool:
+        return job == JobNames.DOCS_CHECK
+
     def validate(self) -> None:
         errors = []
         for name, build_config in self.build_config.items():
@@ -426,63 +816,149 @@ class CiConfig:
             raise KeyError("config contains errors", errors)
 
 
-CI_CONFIG = CiConfig(
+CI_CONFIG = CIConfig(
     label_configs={
-        Labels.DO_NOT_TEST_LABEL.value: LabelConfig(run_jobs=["Style check"]),
+        Labels.DO_NOT_TEST_LABEL: LabelConfig(run_jobs=[JobNames.STYLE_CHECK]),
+        Labels.CI_SET_FAST: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+            ]
+        ),
+        Labels.CI_SET_ARM: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                Build.PACKAGE_AARCH64,
+                JobNames.INTEGRATION_TEST_ARM,
+            ]
+        ),
+        Labels.CI_SET_INTEGRATION: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                Build.PACKAGE_RELEASE,
+                JobNames.INTEGRATION_TEST,
+            ]
+        ),
+        Labels.CI_SET_ANALYZER: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                Build.PACKAGE_RELEASE,
+                Build.PACKAGE_ASAN,
+                JobNames.STATELESS_TEST_ANALYZER_S3_REPLICATED_RELEASE,
+                JobNames.INTEGRATION_TEST_ASAN_ANALYZER,
+            ]
+        ),
+        Labels.CI_SET_STATLESS: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                Build.PACKAGE_RELEASE,
+                JobNames.STATELESS_TEST_RELEASE,
+            ]
+        ),
+        Labels.CI_SET_STATLESS_ASAN: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                Build.PACKAGE_ASAN,
+                JobNames.STATELESS_TEST_ASAN,
+            ]
+        ),
+        Labels.CI_SET_STATEFUL: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                Build.PACKAGE_RELEASE,
+                JobNames.STATEFUL_TEST_RELEASE,
+            ]
+        ),
+        Labels.CI_SET_STATEFUL_ASAN: LabelConfig(
+            run_jobs=[
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                Build.PACKAGE_ASAN,
+                JobNames.STATEFUL_TEST_ASAN,
+            ]
+        ),
+        Labels.CI_SET_REDUCED: LabelConfig(
+            run_jobs=[
+                job
+                for job in JobNames
+                if not any(
+                    nogo in job
+                    for nogo in (
+                        "asan",
+                        "tsan",
+                        "msan",
+                        "ubsan",
+                        "coverage",
+                        # skip build report jobs as not all builds will be done
+                        "build check",
+                    )
+                )
+            ]
+        ),
     },
     build_config={
-        "package_release": BuildConfig(
-            name="package_release",
+        Build.PACKAGE_RELEASE: BuildConfig(
+            name=Build.PACKAGE_RELEASE,
             compiler="clang-17",
             package_type="deb",
             static_binary_name="amd64",
             additional_pkgs=True,
         ),
-        "package_aarch64": BuildConfig(
-            name="package_aarch64",
+        Build.PACKAGE_AARCH64: BuildConfig(
+            name=Build.PACKAGE_AARCH64,
             compiler="clang-17-aarch64",
             package_type="deb",
             static_binary_name="aarch64",
             additional_pkgs=True,
         ),
-        "package_asan": BuildConfig(
-            name="package_asan",
+        Build.PACKAGE_ASAN: BuildConfig(
+            name=Build.PACKAGE_ASAN,
             compiler="clang-17",
             sanitizer="address",
             package_type="deb",
         ),
-        "package_ubsan": BuildConfig(
-            name="package_ubsan",
+        Build.PACKAGE_UBSAN: BuildConfig(
+            name=Build.PACKAGE_UBSAN,
             compiler="clang-17",
             sanitizer="undefined",
             package_type="deb",
         ),
-        "package_tsan": BuildConfig(
-            name="package_tsan",
+        Build.PACKAGE_TSAN: BuildConfig(
+            name=Build.PACKAGE_TSAN,
             compiler="clang-17",
             sanitizer="thread",
             package_type="deb",
         ),
-        "package_msan": BuildConfig(
-            name="package_msan",
+        Build.PACKAGE_MSAN: BuildConfig(
+            name=Build.PACKAGE_MSAN,
             compiler="clang-17",
             sanitizer="memory",
             package_type="deb",
         ),
-        "package_debug": BuildConfig(
-            name="package_debug",
+        Build.PACKAGE_DEBUG: BuildConfig(
+            name=Build.PACKAGE_DEBUG,
             compiler="clang-17",
             debug_build=True,
             package_type="deb",
-            sparse_checkout=True,
+            sparse_checkout=True,  # Check that it works with at least one build, see also update-submodules.sh
         ),
-        "binary_release": BuildConfig(
-            name="binary_release",
+        Build.PACKAGE_RELEASE_COVERAGE: BuildConfig(
+            name=Build.PACKAGE_RELEASE_COVERAGE,
+            compiler="clang-17",
+            coverage=True,
+            package_type="deb",
+        ),
+        Build.BINARY_RELEASE: BuildConfig(
+            name=Build.BINARY_RELEASE,
             compiler="clang-17",
             package_type="binary",
         ),
-        "binary_tidy": BuildConfig(
-            name="binary_tidy",
+        Build.BINARY_TIDY: BuildConfig(
+            name=Build.BINARY_TIDY,
             compiler="clang-17",
             debug_build=True,
             package_type="binary",
@@ -490,369 +966,379 @@ CI_CONFIG = CiConfig(
             tidy=True,
             comment="clang-tidy is used for static analysis",
         ),
-        "binary_darwin": BuildConfig(
-            name="binary_darwin",
+        Build.BINARY_DARWIN: BuildConfig(
+            name=Build.BINARY_DARWIN,
             compiler="clang-17-darwin",
             package_type="binary",
             static_binary_name="macos",
-            sparse_checkout=True,
         ),
-        "binary_aarch64": BuildConfig(
-            name="binary_aarch64",
+        Build.BINARY_AARCH64: BuildConfig(
+            name=Build.BINARY_AARCH64,
             compiler="clang-17-aarch64",
             package_type="binary",
         ),
-        "binary_aarch64_v80compat": BuildConfig(
-            name="binary_aarch64_v80compat",
+        Build.BINARY_AARCH64_V80COMPAT: BuildConfig(
+            name=Build.BINARY_AARCH64_V80COMPAT,
             compiler="clang-17-aarch64-v80compat",
             package_type="binary",
             static_binary_name="aarch64v80compat",
             comment="For ARMv8.1 and older",
         ),
-        "binary_freebsd": BuildConfig(
-            name="binary_freebsd",
+        Build.BINARY_FREEBSD: BuildConfig(
+            name=Build.BINARY_FREEBSD,
             compiler="clang-17-freebsd",
             package_type="binary",
             static_binary_name="freebsd",
         ),
-        "binary_darwin_aarch64": BuildConfig(
-            name="binary_darwin_aarch64",
+        Build.BINARY_DARWIN_AARCH64: BuildConfig(
+            name=Build.BINARY_DARWIN_AARCH64,
             compiler="clang-17-darwin-aarch64",
             package_type="binary",
             static_binary_name="macos-aarch64",
         ),
-        "binary_ppc64le": BuildConfig(
-            name="binary_ppc64le",
+        Build.BINARY_PPC64LE: BuildConfig(
+            name=Build.BINARY_PPC64LE,
             compiler="clang-17-ppc64le",
             package_type="binary",
             static_binary_name="powerpc64le",
         ),
-        "binary_amd64_compat": BuildConfig(
-            name="binary_amd64_compat",
+        Build.BINARY_AMD64_COMPAT: BuildConfig(
+            name=Build.BINARY_AMD64_COMPAT,
             compiler="clang-17-amd64-compat",
             package_type="binary",
             static_binary_name="amd64compat",
             comment="SSE2-only build",
         ),
-        "binary_amd64_musl": BuildConfig(
-            name="binary_amd64_musl",
+        Build.BINARY_AMD64_MUSL: BuildConfig(
+            name=Build.BINARY_AMD64_MUSL,
             compiler="clang-17-amd64-musl",
             package_type="binary",
             static_binary_name="amd64musl",
             comment="Build with Musl",
         ),
-        "binary_riscv64": BuildConfig(
-            name="binary_riscv64",
+        Build.BINARY_RISCV64: BuildConfig(
+            name=Build.BINARY_RISCV64,
             compiler="clang-17-riscv64",
             package_type="binary",
             static_binary_name="riscv64",
         ),
-        "binary_s390x": BuildConfig(
-            name="binary_s390x",
+        Build.BINARY_S390X: BuildConfig(
+            name=Build.BINARY_S390X,
             compiler="clang-17-s390x",
             package_type="binary",
             static_binary_name="s390x",
         ),
-        "fuzzers": BuildConfig(
-            name="fuzzers",
+        Build.FUZZERS: BuildConfig(
+            name=Build.FUZZERS,
             compiler="clang-17",
             package_type="fuzzers",
+            job_config=fuzzer_build_job_config,
         ),
     },
     builds_report_config={
-        "ClickHouse build check": BuildReportConfig(
+        JobNames.BUILD_CHECK: BuildReportConfig(
             builds=[
-                "package_release",
-                "package_aarch64",
-                "package_asan",
-                "package_ubsan",
-                "package_tsan",
-                "package_msan",
-                "package_debug",
-                "binary_release",
-                "fuzzers",
+                Build.PACKAGE_RELEASE,
+                Build.PACKAGE_AARCH64,
+                Build.PACKAGE_ASAN,
+                Build.PACKAGE_UBSAN,
+                Build.PACKAGE_TSAN,
+                Build.PACKAGE_MSAN,
+                Build.PACKAGE_DEBUG,
             ]
         ),
-        "ClickHouse special build check": BuildReportConfig(
+        JobNames.BUILD_CHECK_SPECIAL: BuildReportConfig(
             builds=[
-                "binary_tidy",
-                "binary_darwin",
-                "binary_aarch64",
-                "binary_aarch64_v80compat",
-                "binary_freebsd",
-                "binary_darwin_aarch64",
-                "binary_ppc64le",
-                "binary_riscv64",
-                "binary_s390x",
-                "binary_amd64_compat",
-                "binary_amd64_musl",
+                Build.BINARY_TIDY,
+                Build.BINARY_DARWIN,
+                Build.BINARY_AARCH64,
+                Build.BINARY_AARCH64_V80COMPAT,
+                Build.BINARY_FREEBSD,
+                Build.BINARY_DARWIN_AARCH64,
+                Build.BINARY_PPC64LE,
+                Build.BINARY_RISCV64,
+                Build.BINARY_S390X,
+                Build.BINARY_AMD64_COMPAT,
+                Build.BINARY_AMD64_MUSL,
+                Build.PACKAGE_RELEASE_COVERAGE,
+                Build.BINARY_RELEASE,
+                Build.FUZZERS,
             ]
         ),
     },
     other_jobs_configs={
-        "Docker server and keeper images": TestConfig(
-            "",
-            job_config=JobConfig(
-                digest=DigestConfig(
-                    include_paths=[
-                        "tests/ci/docker_server.py",
-                        "./docker/server",
-                        "./docker/keeper",
-                    ]
-                )
-            ),
-        ),
-        "Docs check": TestConfig(
+        JobNames.DOCKER_SERVER: TestConfig("", job_config=docker_server_job_config),
+        JobNames.DOCKER_KEEPER: TestConfig("", job_config=docker_server_job_config),
+        JobNames.DOCS_CHECK: TestConfig(
             "",
             job_config=JobConfig(
                 digest=DigestConfig(
                     include_paths=["**/*.md", "./docs", "tests/ci/docs_check.py"],
                     docker=["clickhouse/docs-builder"],
                 ),
+                run_command="docs_check.py",
             ),
         ),
-        "Fast tests": TestConfig(
+        JobNames.FAST_TEST: TestConfig(
             "",
             job_config=JobConfig(
+                pr_only=True,
                 digest=DigestConfig(
                     include_paths=["./tests/queries/0_stateless/"],
                     exclude_files=[".md"],
                     docker=["clickhouse/fasttest"],
-                )
+                ),
             ),
         ),
-        "Style check": TestConfig(
+        JobNames.STYLE_CHECK: TestConfig(
             "",
             job_config=JobConfig(
                 run_always=True,
             ),
         ),
-        "tests bugfix validate check": TestConfig(
+        JobNames.BUGFIX_VALIDATE: TestConfig(
             "",
             # we run this check by label - no digest required
-            job_config=JobConfig(run_by_label="pr-bugfix"),
+            job_config=JobConfig(
+                run_by_label="pr-bugfix", run_command="bugfix_validate_check.py"
+            ),
         ),
     },
     test_configs={
-        "Install packages (amd64)": TestConfig(
-            "package_release", job_config=JobConfig(digest=install_check_digest)
+        JobNames.INSTALL_TEST_AMD: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=install_test_params
         ),
-        "Install packages (arm64)": TestConfig(
-            "package_aarch64", job_config=JobConfig(digest=install_check_digest)
+        JobNames.INSTALL_TEST_ARM: TestConfig(
+            Build.PACKAGE_AARCH64, job_config=install_test_params
         ),
-        "Stateful tests (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (tsan)": TestConfig(
-            "package_tsan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (msan)": TestConfig(
-            "package_msan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (ubsan)": TestConfig(
-            "package_ubsan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (debug)": TestConfig(
-            "package_debug", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (release)": TestConfig(
-            "package_release", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_RELEASE: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (aarch64)": TestConfig(
-            "package_aarch64", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_RELEASE_COVERAGE: TestConfig(
+            Build.PACKAGE_RELEASE_COVERAGE, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (release, DatabaseOrdinary)": TestConfig(
-            "package_release", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_AARCH64: TestConfig(
+            Build.PACKAGE_AARCH64, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        # "Stateful tests (release, DatabaseReplicated)": TestConfig(
-        #     "package_release", job_config=JobConfig(**stateful_test_common_params) # type: ignore
-        # ),
         # Stateful tests for parallel replicas
-        "Stateful tests (release, ParallelReplicas)": TestConfig(
-            "package_release", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_RELEASE: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (debug, ParallelReplicas)": TestConfig(
-            "package_debug", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=JobConfig(**stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (asan, ParallelReplicas)": TestConfig(
-            "package_asan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(random_bucket="parrepl_with_sanitizer", **stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (msan, ParallelReplicas)": TestConfig(
-            "package_msan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(random_bucket="parrepl_with_sanitizer", **stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (ubsan, ParallelReplicas)": TestConfig(
-            "package_ubsan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN, job_config=JobConfig(random_bucket="parrepl_with_sanitizer", **stateful_test_common_params)  # type: ignore
         ),
-        "Stateful tests (tsan, ParallelReplicas)": TestConfig(
-            "package_tsan", job_config=JobConfig(**stateful_test_common_params)  # type: ignore
+        JobNames.STATEFUL_TEST_PARALLEL_REPL_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(random_bucket="parrepl_with_sanitizer", **stateful_test_common_params)  # type: ignore
         ),
         # End stateful tests for parallel replicas
-        "Stateless tests (asan)": TestConfig(
-            "package_asan",
+        JobNames.STATELESS_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN,
             job_config=JobConfig(num_batches=4, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (tsan)": TestConfig(
-            "package_tsan",
+        JobNames.STATELESS_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN,
             job_config=JobConfig(num_batches=5, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (msan)": TestConfig(
-            "package_msan",
+        JobNames.STATELESS_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN,
             job_config=JobConfig(num_batches=6, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (ubsan)": TestConfig(
-            "package_ubsan",
+        JobNames.STATELESS_TEST_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN,
             job_config=JobConfig(num_batches=2, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (debug)": TestConfig(
-            "package_debug",
+        JobNames.STATELESS_TEST_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG,
             job_config=JobConfig(num_batches=5, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (release)": TestConfig(
-            "package_release", job_config=JobConfig(**statless_test_common_params)  # type: ignore
+        JobNames.STATELESS_TEST_RELEASE: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=JobConfig(**statless_test_common_params)  # type: ignore
         ),
-        "Stateless tests (aarch64)": TestConfig(
-            "package_aarch64", job_config=JobConfig(**statless_test_common_params)  # type: ignore
+        JobNames.STATELESS_TEST_RELEASE_COVERAGE: TestConfig(
+            Build.PACKAGE_RELEASE_COVERAGE,
+            job_config=JobConfig(num_batches=6, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (release, analyzer)": TestConfig(
-            "package_release", job_config=JobConfig(**statless_test_common_params)  # type: ignore
+        JobNames.STATELESS_TEST_AARCH64: TestConfig(
+            Build.PACKAGE_AARCH64, job_config=JobConfig(**statless_test_common_params)  # type: ignore
         ),
-        "Stateless tests (release, DatabaseOrdinary)": TestConfig(
-            "package_release", job_config=JobConfig(**statless_test_common_params)  # type: ignore
-        ),
-        "Stateless tests (release, DatabaseReplicated)": TestConfig(
-            "package_release",
+        JobNames.STATELESS_TEST_ANALYZER_S3_REPLICATED_RELEASE: TestConfig(
+            Build.PACKAGE_RELEASE,
             job_config=JobConfig(num_batches=4, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (release, s3 storage)": TestConfig(
-            "package_release",
-            job_config=JobConfig(num_batches=2, **statless_test_common_params),  # type: ignore
-        ),
-        "Stateless tests (debug, s3 storage)": TestConfig(
-            "package_debug",
+        JobNames.STATELESS_TEST_S3_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG,
             job_config=JobConfig(num_batches=6, **statless_test_common_params),  # type: ignore
         ),
-        "Stateless tests (tsan, s3 storage)": TestConfig(
-            "package_tsan",
+        JobNames.STATELESS_TEST_S3_TSAN: TestConfig(
+            Build.PACKAGE_TSAN,
             job_config=JobConfig(num_batches=5, **statless_test_common_params),  # type: ignore
         ),
-        "Stress test (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**stress_test_common_params)  # type: ignore
+        JobNames.STRESS_TEST_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=JobConfig(**stress_test_common_params)  # type: ignore
         ),
-        "Stress test (tsan)": TestConfig(
-            "package_tsan", job_config=JobConfig(**stress_test_common_params)  # type: ignore
+        JobNames.STRESS_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(**stress_test_common_params)  # type: ignore
         ),
-        "Stress test (ubsan)": TestConfig(
-            "package_ubsan", job_config=JobConfig(**stress_test_common_params)  # type: ignore
+        JobNames.STRESS_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(random_bucket="stress_with_sanitizer", **stress_test_common_params)  # type: ignore
         ),
-        "Stress test (msan)": TestConfig(
-            "package_msan", job_config=JobConfig(**stress_test_common_params)  # type: ignore
+        JobNames.STRESS_TEST_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN, job_config=JobConfig(random_bucket="stress_with_sanitizer", **stress_test_common_params)  # type: ignore
         ),
-        "Stress test (debug)": TestConfig(
-            "package_debug", job_config=JobConfig(**stress_test_common_params)  # type: ignore
+        JobNames.STRESS_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(random_bucket="stress_with_sanitizer", **stress_test_common_params)  # type: ignore
         ),
-        "Upgrade check (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**upgrade_test_common_params)  # type: ignore
+        JobNames.UPGRADE_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(pr_only=True, random_bucket="upgrade_with_sanitizer", **upgrade_test_common_params)  # type: ignore
         ),
-        "Upgrade check (tsan)": TestConfig(
-            "package_tsan", job_config=JobConfig(**upgrade_test_common_params)  # type: ignore
+        JobNames.UPGRADE_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(pr_only=True, random_bucket="upgrade_with_sanitizer", **upgrade_test_common_params)  # type: ignore
         ),
-        "Upgrade check (msan)": TestConfig(
-            "package_msan", job_config=JobConfig(**upgrade_test_common_params)  # type: ignore
+        JobNames.UPGRADE_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(pr_only=True, random_bucket="upgrade_with_sanitizer", **upgrade_test_common_params)  # type: ignore
         ),
-        "Upgrade check (debug)": TestConfig(
-            "package_debug", job_config=JobConfig(**upgrade_test_common_params)  # type: ignore
+        JobNames.UPGRADE_TEST_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=JobConfig(pr_only=True, **upgrade_test_common_params)  # type: ignore
         ),
-        "Integration tests (asan)": TestConfig(
-            "package_asan",
-            job_config=JobConfig(num_batches=4, **integration_test_common_params),  # type: ignore
+        JobNames.INTEGRATION_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN,
+            job_config=JobConfig(num_batches=4, **integration_test_common_params, release_only=True),  # type: ignore
         ),
-        "Integration tests (asan, analyzer)": TestConfig(
-            "package_asan",
+        JobNames.INTEGRATION_TEST_ASAN_ANALYZER: TestConfig(
+            Build.PACKAGE_ASAN,
             job_config=JobConfig(num_batches=6, **integration_test_common_params),  # type: ignore
         ),
-        "Integration tests (tsan)": TestConfig(
-            "package_tsan",
+        JobNames.INTEGRATION_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN,
             job_config=JobConfig(num_batches=6, **integration_test_common_params),  # type: ignore
         ),
-        # FIXME: currently no wf has this job. Try to enable
-        # "Integration tests (msan)": TestConfig("package_msan", job_config=JobConfig(num_batches=6, **integration_test_common_params) # type: ignore
-        # ),
-        "Integration tests (release)": TestConfig(
-            "package_release",
-            job_config=JobConfig(num_batches=4, **integration_test_common_params),  # type: ignore
+        JobNames.INTEGRATION_TEST_ARM: TestConfig(
+            Build.PACKAGE_AARCH64,
+            # add [run_by_label="test arm"] to not run in regular pr workflow by default
+            job_config=JobConfig(num_batches=6, **integration_test_common_params, run_by_label="test arm"),  # type: ignore
         ),
-        "Integration tests flaky check (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**integration_test_common_params)  # type: ignore
+        JobNames.INTEGRATION_TEST: TestConfig(
+            Build.PACKAGE_RELEASE,
+            job_config=JobConfig(num_batches=4, **integration_test_common_params, release_only=True),  # type: ignore
         ),
-        "Compatibility check (amd64)": TestConfig(
-            "package_release", job_config=JobConfig(digest=compatibility_check_digest)
+        JobNames.INTEGRATION_TEST_FLAKY: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(pr_only=True, **integration_test_common_params)  # type: ignore
         ),
-        "Compatibility check (aarch64)": TestConfig(
-            "package_aarch64", job_config=JobConfig(digest=compatibility_check_digest)
+        JobNames.COMPATIBILITY_TEST: TestConfig(
+            Build.PACKAGE_RELEASE,
+            job_config=JobConfig(
+                required_on_release_branch=True, **compatibility_test_common_params  # type: ignore
+            ),
         ),
-        "Unit tests (release)": TestConfig(
-            "binary_release", job_config=JobConfig(**unit_test_common_params)  # type: ignore
+        JobNames.COMPATIBILITY_TEST_ARM: TestConfig(
+            Build.PACKAGE_AARCH64,
+            job_config=JobConfig(
+                required_on_release_branch=True, **compatibility_test_common_params  # type: ignore
+            ),
         ),
-        "Unit tests (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**unit_test_common_params)  # type: ignore
+        JobNames.UNIT_TEST: TestConfig(
+            Build.BINARY_RELEASE, job_config=JobConfig(**unit_test_common_params)  # type: ignore
         ),
-        "Unit tests (msan)": TestConfig(
-            "package_msan", job_config=JobConfig(**unit_test_common_params)  # type: ignore
+        JobNames.UNIT_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(**unit_test_common_params)  # type: ignore
         ),
-        "Unit tests (tsan)": TestConfig(
-            "package_tsan", job_config=JobConfig(**unit_test_common_params)  # type: ignore
+        JobNames.UNIT_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(**unit_test_common_params)  # type: ignore
         ),
-        "Unit tests (ubsan)": TestConfig(
-            "package_ubsan", job_config=JobConfig(**unit_test_common_params)  # type: ignore
+        JobNames.UNIT_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(**unit_test_common_params)  # type: ignore
         ),
-        "AST fuzzer (debug)": TestConfig(
-            "package_debug", job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        JobNames.UNIT_TEST_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN, job_config=JobConfig(**unit_test_common_params)  # type: ignore
         ),
-        "AST fuzzer (asan)": TestConfig(
-            "package_asan", job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        JobNames.AST_FUZZER_TEST_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
         ),
-        "AST fuzzer (msan)": TestConfig(
-            "package_msan", job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        JobNames.AST_FUZZER_TEST_ASAN: TestConfig(
+            Build.PACKAGE_ASAN, job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
         ),
-        "AST fuzzer (tsan)": TestConfig(
-            "package_tsan", job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        JobNames.AST_FUZZER_TEST_MSAN: TestConfig(
+            Build.PACKAGE_MSAN, job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
         ),
-        "AST fuzzer (ubsan)": TestConfig(
-            "package_ubsan", job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        JobNames.AST_FUZZER_TEST_TSAN: TestConfig(
+            Build.PACKAGE_TSAN, job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
         ),
-        "Stateless tests flaky check (asan)": TestConfig(
+        JobNames.AST_FUZZER_TEST_UBSAN: TestConfig(
+            Build.PACKAGE_UBSAN, job_config=JobConfig(**astfuzzer_test_common_params)  # type: ignore
+        ),
+        JobNames.STATELESS_TEST_FLAKY_ASAN: TestConfig(
             # replace to non-default
-            "package_asan",
-            job_config=JobConfig(**{**statless_test_common_params, "timeout": 3600}),  # type: ignore
+            Build.PACKAGE_ASAN,
+            job_config=JobConfig(pr_only=True, **{**statless_test_common_params, "timeout": 3600}),  # type: ignore
         ),
-        # FIXME: add digest and params
-        "ClickHouse Keeper Jepsen": TestConfig("binary_release"),
-        # FIXME: add digest and params
-        "ClickHouse Server Jepsen": TestConfig("binary_release"),
-        "Performance Comparison": TestConfig(
-            "package_release",
+        JobNames.JEPSEN_KEEPER: TestConfig(
+            Build.BINARY_RELEASE,
+            job_config=JobConfig(
+                run_by_label="jepsen-test", run_command="jepsen_check.py keeper"
+            ),
+        ),
+        JobNames.JEPSEN_SERVER: TestConfig(
+            Build.BINARY_RELEASE,
+            job_config=JobConfig(
+                run_by_label="jepsen-test", run_command="jepsen_check.py server"
+            ),
+        ),
+        JobNames.PERFORMANCE_TEST_AMD64: TestConfig(
+            Build.PACKAGE_RELEASE,
             job_config=JobConfig(num_batches=4, **perf_test_common_params),  # type: ignore
         ),
-        "Performance Comparison Aarch64": TestConfig(
-            "package_aarch64",
+        JobNames.PERFORMANCE_TEST_ARM64: TestConfig(
+            Build.PACKAGE_AARCH64,
             job_config=JobConfig(num_batches=4, run_by_label="pr-performance", **perf_test_common_params),  # type: ignore
         ),
-        "SQLancer (release)": TestConfig(
-            "package_release", job_config=JobConfig(**sqllancer_test_common_params)  # type: ignore
+        JobNames.SQLANCER: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=sqllancer_test_common_params
         ),
-        "SQLancer (debug)": TestConfig(
-            "package_debug", job_config=JobConfig(**sqllancer_test_common_params)  # type: ignore
+        JobNames.SQLANCER_DEBUG: TestConfig(
+            Build.PACKAGE_DEBUG, job_config=sqllancer_test_common_params
         ),
-        "Sqllogic test (release)": TestConfig(
-            "package_release", job_config=JobConfig(**sqllogic_test_params)  # type: ignore
+        JobNames.SQL_LOGIC_TEST: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=sqllogic_test_params
         ),
-        "SQLTest": TestConfig(
-            "package_release", job_config=JobConfig(**sql_test_params)  # type: ignore
+        JobNames.SQLTEST: TestConfig(Build.PACKAGE_RELEASE, job_config=sql_test_params),
+        JobNames.CLCIKBENCH_TEST: TestConfig(
+            Build.PACKAGE_RELEASE, job_config=JobConfig(**clickbench_test_params)  # type: ignore
         ),
-        "ClickBench (amd64)": TestConfig("package_release"),
-        "ClickBench (aarch64)": TestConfig("package_aarch64"),
-        # FIXME: add digest and params
-        "libFuzzer tests": TestConfig("fuzzers"),  # type: ignore
+        JobNames.CLCIKBENCH_TEST_ARM: TestConfig(
+            Build.PACKAGE_AARCH64, job_config=JobConfig(**clickbench_test_params)  # type: ignore
+        ),
+        JobNames.LIBFUZZER_TEST: TestConfig(
+            Build.FUZZERS,
+            job_config=JobConfig(
+                run_by_label=Labels.libFuzzer,
+                timeout=10800,
+                run_command='libfuzzer_test_check.py "$CHECK_NAME" 10800',
+            ),
+        ),  # type: ignore
     },
 )
 CI_CONFIG.validate()
@@ -861,18 +1347,21 @@ CI_CONFIG.validate()
 # checks required by Mergeable Check
 REQUIRED_CHECKS = [
     "PR Check",
-    "ClickHouse build check",
-    "ClickHouse special build check",
-    "Docs Check",
-    "Fast test",
-    "Stateful tests (release)",
-    "Stateless tests (release)",
-    "Style Check",
-    "Unit tests (asan)",
-    "Unit tests (msan)",
-    "Unit tests (release)",
-    "Unit tests (tsan)",
-    "Unit tests (ubsan)",
+    "A Sync",  # Cloud sync
+    JobNames.BUILD_CHECK,
+    JobNames.BUILD_CHECK_SPECIAL,
+    JobNames.DOCS_CHECK,
+    JobNames.FAST_TEST,
+    JobNames.STATEFUL_TEST_RELEASE,
+    JobNames.STATELESS_TEST_RELEASE,
+    JobNames.STYLE_CHECK,
+    JobNames.UNIT_TEST_ASAN,
+    JobNames.UNIT_TEST_MSAN,
+    JobNames.UNIT_TEST,
+    JobNames.UNIT_TEST_TSAN,
+    JobNames.UNIT_TEST_UBSAN,
+    JobNames.INTEGRATION_TEST_ASAN_ANALYZER,
+    JobNames.STATELESS_TEST_ANALYZER_S3_REPLICATED_RELEASE,
 ]
 
 
@@ -895,10 +1384,10 @@ CHECK_DESCRIPTIONS = [
         lambda x: x.startswith("AST fuzzer"),
     ),
     CheckDescription(
-        "Bugfix validate check",
+        JobNames.BUGFIX_VALIDATE,
         "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",
+        lambda x: x == JobNames.BUGFIX_VALIDATE,
     ),
     CheckDescription(
         "CI running",
@@ -923,16 +1412,22 @@ CHECK_DESCRIPTIONS = [
         lambda x: x.startswith("Compatibility check"),
     ),
     CheckDescription(
-        "Docker image for servers",
+        JobNames.DOCKER_SERVER,
         "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")),
+        lambda x: x.startswith("Docker server"),
     ),
     CheckDescription(
-        "Docs Check", "Builds and tests the documentation", lambda x: x == "Docs Check"
+        JobNames.DOCKER_KEEPER,
+        "The check to build and optionally push the mentioned image to docker hub",
+        lambda x: x.startswith("Docker keeper"),
     ),
     CheckDescription(
-        "Fast test",
+        JobNames.DOCS_CHECK,
+        "Builds and tests the documentation",
+        lambda x: x == JobNames.DOCS_CHECK,
+    ),
+    CheckDescription(
+        JobNames.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>, '
@@ -940,7 +1435,7 @@ CHECK_DESCRIPTIONS = [
         "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",
+        lambda x: x == JobNames.FAST_TEST,
     ),
     CheckDescription(
         "Flaky tests",
@@ -1014,10 +1509,10 @@ CHECK_DESCRIPTIONS = [
         lambda x: x.startswith("Stress test ("),
     ),
     CheckDescription(
-        "Style Check",
+        JobNames.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",
+        lambda x: x == JobNames.STYLE_CHECK,
     ),
     CheckDescription(
         "Unit tests",
diff --git a/tests/ci/ci_runners_metrics_lambda/app.py b/tests/ci/ci_runners_metrics_lambda/app.py
index 5cb1e45dd14..47161215a97 100644
--- a/tests/ci/ci_runners_metrics_lambda/app.py
+++ b/tests/ci/ci_runners_metrics_lambda/app.py
@@ -8,23 +8,14 @@ Lambda function to:
 
 import argparse
 import sys
-from datetime import datetime
-from typing import Dict, List
+from typing import Dict
 
-import requests  # type: ignore
 import boto3  # type: ignore
-from botocore.exceptions import ClientError  # type: ignore
-
-from lambda_shared import (
-    RUNNER_TYPE_LABELS,
-    RunnerDescription,
-    RunnerDescriptions,
-    list_runners,
-)
+from lambda_shared import RUNNER_TYPE_LABELS, RunnerDescriptions, list_runners
 from lambda_shared.token import (
+    get_access_token_by_key_app,
     get_cached_access_token,
     get_key_and_app_from_aws,
-    get_access_token_by_key_app,
 )
 
 UNIVERSAL_LABEL = "universal"
@@ -162,7 +153,7 @@ if __name__ == "__main__":
     if args.private_key:
         private_key = args.private_key
     elif args.private_key_path:
-        with open(args.private_key_path, "r") as key_file:
+        with open(args.private_key_path, "r", encoding="utf-8") as key_file:
             private_key = key_file.read()
     else:
         print("Attempt to get key and id from AWS secret manager")
diff --git a/tests/ci/ci_utils.py b/tests/ci/ci_utils.py
new file mode 100644
index 00000000000..97d42f9845b
--- /dev/null
+++ b/tests/ci/ci_utils.py
@@ -0,0 +1,62 @@
+from contextlib import contextmanager
+import os
+import signal
+from typing import Any, List, Union, Iterator
+from pathlib import Path
+
+
+class WithIter(type):
+    def __iter__(cls):
+        return (v for k, v in cls.__dict__.items() if not k.startswith("_"))
+
+
+@contextmanager
+def cd(path: Union[Path, str]) -> Iterator[None]:
+    oldpwd = os.getcwd()
+    os.chdir(path)
+    try:
+        yield
+    finally:
+        os.chdir(oldpwd)
+
+
+def is_hex(s):
+    try:
+        int(s, 16)
+        return True
+    except ValueError:
+        return False
+
+
+def normalize_string(string: str) -> str:
+    lowercase_string = string.lower()
+    normalized_string = (
+        lowercase_string.replace(" ", "_")
+        .replace("-", "_")
+        .replace("/", "_")
+        .replace("(", "")
+        .replace(")", "")
+        .replace(",", "")
+    )
+    return normalized_string
+
+
+class GHActions:
+    @staticmethod
+    def print_in_group(group_name: str, lines: Union[Any, List[Any]]) -> None:
+        lines = list(lines)
+        print(f"::group::{group_name}")
+        for line in lines:
+            print(line)
+        print("::endgroup::")
+
+
+def set_job_timeout():
+    def timeout_handler(_signum, _frame):
+        print("Timeout expired")
+        raise TimeoutError("Job's KILL_TIMEOUT expired")
+
+    kill_timeout = int(os.getenv("KILL_TIMEOUT", "0"))
+    assert kill_timeout > 0, "kill timeout must be provided in KILL_TIMEOUT env"
+    signal.signal(signal.SIGALRM, timeout_handler)
+    signal.alarm(kill_timeout)
diff --git a/tests/ci/clean_lost_instances_lambda/app.py b/tests/ci/clean_lost_instances_lambda/app.py
index 65f6ff78d4a..4accc14f7ae 100644
--- a/tests/ci/clean_lost_instances_lambda/app.py
+++ b/tests/ci/clean_lost_instances_lambda/app.py
@@ -8,14 +8,13 @@ Lambda function to:
 
 import argparse
 import sys
-from datetime import datetime
 from dataclasses import dataclass
+from datetime import datetime
 from typing import Dict, List
 
-import requests  # type: ignore
 import boto3  # type: ignore
+import requests
 from botocore.exceptions import ClientError  # type: ignore
-
 from lambda_shared import (
     RUNNER_TYPE_LABELS,
     RunnerDescription,
@@ -23,9 +22,9 @@ from lambda_shared import (
     list_runners,
 )
 from lambda_shared.token import (
+    get_access_token_by_key_app,
     get_cached_access_token,
     get_key_and_app_from_aws,
-    get_access_token_by_key_app,
 )
 
 UNIVERSAL_LABEL = "universal"
@@ -140,6 +139,7 @@ def delete_runner(access_token: str, runner: RunnerDescription) -> bool:
     response = requests.delete(
         f"https://api.github.com/orgs/ClickHouse/actions/runners/{runner.id}",
         headers=headers,
+        timeout=30,
     )
     response.raise_for_status()
     print(f"Response code deleting {runner.name} is {response.status_code}")
@@ -325,7 +325,7 @@ if __name__ == "__main__":
     if args.private_key:
         private_key = args.private_key
     elif args.private_key_path:
-        with open(args.private_key_path, "r") as key_file:
+        with open(args.private_key_path, "r", encoding="utf-8") as key_file:
             private_key = key_file.read()
     else:
         print("Attempt to get key and id from AWS secret manager")
diff --git a/tests/ci/clickbench.py b/tests/ci/clickbench.py
index f9fadae4e03..a1988abb1f5 100644
--- a/tests/ci/clickbench.py
+++ b/tests/ci/clickbench.py
@@ -6,34 +6,19 @@ import logging
 import os
 import subprocess
 import sys
-import atexit
 from pathlib import Path
 from typing import List, Tuple
 
-from github import Github
-
 from build_download_helper import download_all_deb_packages
 from clickhouse_helper import (
     CiLogsCredentials,
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    override_status,
-    post_commit_status,
-    update_mergeable_check,
 )
 from docker_images_helper import get_docker_image, pull_image, DockerImage
 from env_helper import TEMP_PATH, REPORT_PATH
-from get_robot_token import get_best_robot_token
-from pr_info import FORCE_TESTS_LABEL, PRInfo
-from s3_helper import S3Helper
+from pr_info import PRInfo
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-from report import TestResults
+from report import ERROR, SUCCESS, JobReport, StatusType, TestResults
 
 
 def get_image_name() -> str:
@@ -57,6 +42,7 @@ def get_run_command(
         f"{ci_logs_args}"
         f"--volume={result_path}:/test_output "
         f"--volume={server_log_path}:/var/log/clickhouse-server "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         f"--cap-add=SYS_PTRACE {env_str} {image}"
     )
 
@@ -64,7 +50,7 @@ def get_run_command(
 def process_results(
     result_directory: Path,
     server_log_path: Path,
-) -> Tuple[str, str, TestResults, List[Path]]:
+) -> Tuple[StatusType, str, TestResults, List[Path]]:
     test_results = []  # type: TestResults
     additional_files = []  # type: List[Path]
     # Just upload all files from result_directory.
@@ -86,7 +72,7 @@ def process_results(
 
     if len(status) != 1 or len(status[0]) != 2:
         logging.info("Files in result folder %s", os.listdir(result_directory))
-        return "error", "Invalid check_status.tsv", test_results, additional_files
+        return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
 
     try:
@@ -96,17 +82,17 @@ def process_results(
             logging.info("Found %s", results_path.name)
         else:
             logging.info("Files in result folder %s", os.listdir(result_directory))
-            return "error", "Not found test_results.tsv", test_results, additional_files
+            return ERROR, "Not found test_results.tsv", test_results, additional_files
 
     except Exception as e:
         return (
-            "error",
+            ERROR,
             f"Cannot parse test_results.tsv ({e})",
             test_results,
             additional_files,
         )
 
-    return state, description, test_results, additional_files
+    return state, description, test_results, additional_files  # type: ignore
 
 
 def parse_args():
@@ -128,18 +114,8 @@ def main():
     args = parse_args()
     check_name = args.check_name
 
-    gh = Github(get_best_robot_token(), per_page=100)
-
     pr_info = PRInfo()
 
-    commit = get_commit(gh, pr_info.sha)
-    atexit.register(update_mergeable_check, commit, 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)
-
     image_name = get_image_name()
     docker_image = pull_image(get_docker_image(image_name))
 
@@ -186,45 +162,22 @@ def main():
         logging.warning("Failed to change files owner in %s, ignoring it", temp_path)
 
     ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
-    s3_helper = S3Helper()
 
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path
     )
-    state = override_status(state, check_name)
 
-    ch_helper = ClickHouseHelper()
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[run_log_path] + additional_logs,
+    ).dump()
 
-    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} Report url: {report_url}")
-    post_commit_status(
-        commit, state, report_url, description, check_name, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    if state != "success":
-        if FORCE_TESTS_LABEL in pr_info.labels:
-            print(f"'{FORCE_TESTS_LABEL}' enabled, will report success")
-        else:
-            sys.exit(1)
+    if state != SUCCESS:
+        sys.exit(1)
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/clickhouse_helper.py b/tests/ci/clickhouse_helper.py
index f338a1e14c3..637c4519d3d 100644
--- a/tests/ci/clickhouse_helper.py
+++ b/tests/ci/clickhouse_helper.py
@@ -1,13 +1,12 @@
 #!/usr/bin/env python3
-from pathlib import Path
-from typing import Dict, List, Optional
 import fileinput
 import json
 import logging
 import time
+from pathlib import Path
+from typing import Dict, List, Optional
 
-import requests  # type: ignore
-
+import requests
 from get_robot_token import get_parameter_from_ssm
 from pr_info import PRInfo
 from report import TestResults
@@ -72,11 +71,11 @@ class ClickHouseHelper:
         if args:
             url = args[0]
         url = kwargs.get("url", url)
-        kwargs["timeout"] = kwargs.get("timeout", 100)
+        timeout = kwargs.pop("timeout", 100)
 
         for i in range(5):
             try:
-                response = requests.post(*args, **kwargs)
+                response = requests.post(*args, timeout=timeout, **kwargs)
             except Exception as e:
                 error = f"Received exception while sending data to {url} on {i} attempt: {e}"
                 logging.warning(error)
@@ -148,7 +147,9 @@ class ClickHouseHelper:
         for i in range(5):
             response = None
             try:
-                response = requests.get(self.url, params=params, headers=self.auth)
+                response = requests.get(
+                    self.url, params=params, headers=self.auth, timeout=100
+                )
                 response.raise_for_status()
                 return response.text
             except Exception as ex:
@@ -215,24 +216,24 @@ def prepare_tests_results_for_clickhouse(
         head_ref = pr_info.head_ref
         head_repo = pr_info.head_name
 
-    common_properties = dict(
-        pull_request_number=pr_info.number,
-        commit_sha=pr_info.sha,
-        commit_url=pr_info.commit_html_url,
-        check_name=check_name,
-        check_status=check_status,
-        check_duration_ms=int(float(check_duration) * 1000),
-        check_start_time=check_start_time,
-        report_url=report_url,
-        pull_request_url=pull_request_url,
-        base_ref=base_ref,
-        base_repo=base_repo,
-        head_ref=head_ref,
-        head_repo=head_repo,
-        task_url=pr_info.task_url,
-        instance_type=get_instance_type(),
-        instance_id=get_instance_id(),
-    )
+    common_properties = {
+        "pull_request_number": pr_info.number,
+        "commit_sha": pr_info.sha,
+        "commit_url": pr_info.commit_html_url,
+        "check_name": check_name,
+        "check_status": check_status,
+        "check_duration_ms": int(float(check_duration) * 1000),
+        "check_start_time": check_start_time,
+        "report_url": report_url,
+        "pull_request_url": pull_request_url,
+        "base_ref": base_ref,
+        "base_repo": base_repo,
+        "head_ref": head_ref,
+        "head_repo": head_repo,
+        "task_url": pr_info.task_url,
+        "instance_type": get_instance_type(),
+        "instance_id": get_instance_id(),
+    }
 
     # Always publish a total record for all checks. For checks with individual
     # tests, also publish a record per test.
diff --git a/tests/ci/commit_status_helper.py b/tests/ci/commit_status_helper.py
index 598eef9922e..56728c3d3ba 100644
--- a/tests/ci/commit_status_helper.py
+++ b/tests/ci/commit_status_helper.py
@@ -1,14 +1,15 @@
 #!/usr/bin/env python3
 
-from collections import defaultdict
-import json
-from pathlib import Path
-from typing import Dict, List, Optional, Union
 import csv
+import json
 import logging
 import time
+from collections import defaultdict
 from dataclasses import asdict, dataclass
+from pathlib import Path
+from typing import Dict, List, Optional, Union
 
+# isort: off
 from github import Github
 from github.Commit import Commit
 from github.CommitStatus import CommitStatus
@@ -17,15 +18,17 @@ from github.GithubObject import NotSet
 from github.IssueComment import IssueComment
 from github.Repository import Repository
 
-from ci_config import CI_CONFIG, REQUIRED_CHECKS, CHECK_DESCRIPTIONS, CheckDescription
-from env_helper import GITHUB_JOB_URL, GITHUB_REPOSITORY, TEMP_PATH
-from pr_info import PRInfo, SKIP_MERGEABLE_CHECK_LABEL
+# isort: on
+
+from ci_config import CHECK_DESCRIPTIONS, REQUIRED_CHECKS, CheckDescription
+from env_helper import GITHUB_REPOSITORY, GITHUB_RUN_URL, TEMP_PATH
+from pr_info import SKIP_MERGEABLE_CHECK_LABEL, PRInfo
 from report import (
     ERROR,
     FAILURE,
     PENDING,
-    StatusType,
     SUCCESS,
+    StatusType,
     TestResult,
     TestResults,
     get_worst_status,
@@ -64,19 +67,6 @@ class RerunHelper:
         return None
 
 
-def override_status(status: str, check_name: str, invert: bool = False) -> str:
-    test_config = CI_CONFIG.test_configs.get(check_name)
-    if test_config and test_config.force_tests:
-        return SUCCESS
-
-    if invert:
-        if status == SUCCESS:
-            return ERROR
-        return SUCCESS
-
-    return status
-
-
 def get_commit(gh: Github, commit_sha: str, retry_count: int = RETRY) -> Commit:
     for i in range(retry_count):
         try:
@@ -93,7 +83,7 @@ def get_commit(gh: Github, commit_sha: str, retry_count: int = RETRY) -> Commit:
 
 def post_commit_status(
     commit: Commit,
-    state: str,
+    state: StatusType,
     report_url: Optional[str] = None,
     description: Optional[str] = None,
     check_name: Optional[str] = None,
@@ -158,6 +148,11 @@ 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"""
+
+    if pr_info.is_merge_queue():
+        # skip report creation for the MQ
+        return
+
     # to reduce number of parameters, the Github is constructed on the fly
     gh = Github()
     gh.__requester = commit._requester  # type:ignore #pylint:disable=protected-access
@@ -271,6 +266,12 @@ def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
 
     result = [comment_body]
 
+    if visible_table_rows:
+        visible_table_rows.sort()
+        result.append(table_header)
+        result.extend(visible_table_rows)
+        result.append(table_footer)
+
     if hidden_table_rows:
         hidden_table_rows.sort()
         result.append(details_header)
@@ -279,16 +280,10 @@ def generate_status_comment(pr_info: PRInfo, statuses: CommitStatuses) -> str:
         result.append(table_footer)
         result.append(details_footer)
 
-    if visible_table_rows:
-        visible_table_rows.sort()
-        result.append(table_header)
-        result.extend(visible_table_rows)
-        result.append(table_footer)
-
     return "".join(result)
 
 
-def get_worst_state(statuses: CommitStatuses) -> str:
+def get_worst_state(statuses: CommitStatuses) -> StatusType:
     return get_worst_status(status.state for status in statuses)
 
 
@@ -315,7 +310,7 @@ def post_commit_status_to_file(
     file_path: Path, description: str, state: str, report_url: str
 ) -> None:
     if file_path.exists():
-        raise Exception(f'File "{file_path}" already exists!')
+        raise FileExistsError(f'File "{file_path}" already exists!')
     with open(file_path, "w", encoding="utf-8") as f:
         out = csv.writer(f, delimiter="\t")
         out.writerow([state, report_url, description])
@@ -341,7 +336,7 @@ class CommitStatusData:
     @classmethod
     def load_from_file(cls, file_path: Union[Path, str]):  # type: ignore
         res = {}
-        with open(file_path, "r") as json_file:
+        with open(file_path, "r", encoding="utf-8") as json_file:
             res = json.load(json_file)
         return CommitStatusData(**cls._filter_dict(res))
 
@@ -350,7 +345,7 @@ class CommitStatusData:
         return cls.load_from_file(STATUS_FILE_PATH)
 
     @classmethod
-    def is_present(cls) -> bool:
+    def exist(cls) -> bool:
         return STATUS_FILE_PATH.is_file()
 
     def dump_status(self) -> None:
@@ -359,12 +354,15 @@ class CommitStatusData:
 
     def dump_to_file(self, file_path: Union[Path, str]) -> None:
         file_path = Path(file_path) or STATUS_FILE_PATH
-        with open(file_path, "w") as json_file:
+        with open(file_path, "w", encoding="utf-8") as json_file:
             json.dump(asdict(self), json_file)
 
     def is_ok(self):
         return self.status == SUCCESS
 
+    def is_failure(self):
+        return self.status == FAILURE
+
     @staticmethod
     def cleanup():
         STATUS_FILE_PATH.unlink(missing_ok=True)
@@ -373,12 +371,12 @@ class CommitStatusData:
 def get_commit_filtered_statuses(commit: Commit) -> CommitStatuses:
     """
     Squash statuses to latest state
-    1. context="first", state="success", update_time=1
-    2. context="second", state="success", update_time=2
-    3. context="first", stat="failure", update_time=3
+    1. context="first", state=SUCCESS, update_time=1
+    2. context="second", state=SUCCESS, update_time=2
+    3. context="first", stat=FAILURE, update_time=3
     =========>
-    1. context="second", state="success"
-    2. context="first", stat="failure"
+    1. context="second", state=SUCCESS
+    2. context="first", stat=FAILURE
     """
     filtered = {}
     for status in sorted(commit.get_statuses(), key=lambda x: x.updated_at):
@@ -430,31 +428,38 @@ def format_description(description: str) -> str:
 def set_mergeable_check(
     commit: Commit,
     description: str = "",
-    state: StatusType = "success",
+    state: StatusType = SUCCESS,
 ) -> None:
     commit.create_status(
         context=MERGEABLE_NAME,
-        description=description,
+        description=format_description(description),
         state=state,
-        target_url=GITHUB_JOB_URL(),
+        target_url=GITHUB_RUN_URL,
     )
 
 
 def update_mergeable_check(commit: Commit, pr_info: PRInfo, check_name: str) -> None:
+    "check if the check_name in REQUIRED_CHECKS and then trigger update"
     not_run = (
         pr_info.labels.intersection({SKIP_MERGEABLE_CHECK_LABEL, "release"})
         or check_name not in REQUIRED_CHECKS
         or pr_info.release_pr
         or pr_info.number == 0
     )
-    if not_run:
+
+    # FIXME: For now, always set mergeable check in the Merge Queue. It's required to pass MQ
+    if not_run and not pr_info.is_merge_queue():
         # Let's avoid unnecessary work
         return
 
     logging.info("Update Mergeable Check by %s", check_name)
 
     statuses = get_commit_filtered_statuses(commit)
+    trigger_mergeable_check(commit, statuses)
 
+
+def trigger_mergeable_check(commit: Commit, statuses: CommitStatuses) -> None:
+    """calculate and update MERGEABLE_NAME"""
     required_checks = [
         status for status in statuses if status.context in REQUIRED_CHECKS
     ]
diff --git a/tests/ci/compatibility_check.py b/tests/ci/compatibility_check.py
index e3da81a54ad..5e980660749 100644
--- a/tests/ci/compatibility_check.py
+++ b/tests/ci/compatibility_check.py
@@ -1,29 +1,23 @@
 #!/usr/bin/env python3
 
-from distutils.version import StrictVersion
-from pathlib import Path
-from typing import List, Tuple
 import argparse
 import logging
+import os
 import subprocess
 import sys
+from pathlib import Path
+from typing import List, Tuple
 
-from github import Github
+# isort: off
+from pip._vendor.packaging.version import Version
+
+# isort: on
 
 from build_download_helper import download_builds_filter
-from clickhouse_helper import (
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import RerunHelper, get_commit, post_commit_status
 from docker_images_helper import DockerImage, get_docker_image, pull_image
-from env_helper import TEMP_PATH, REPORT_PATH
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from report import TestResults, TestResult
-from s3_helper import S3Helper
+from env_helper import REPORT_PATH, TEMP_PATH
+from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
-from upload_result_helper import upload_results
 
 IMAGE_UBUNTU = "clickhouse/test-old-ubuntu"
 IMAGE_CENTOS = "clickhouse/test-old-centos"
@@ -32,7 +26,7 @@ DOWNLOAD_RETRIES_COUNT = 5
 
 def process_os_check(log_path: Path) -> TestResult:
     name = log_path.name
-    with open(log_path, "r") as log:
+    with open(log_path, "r", encoding="utf-8") as log:
         line = log.read().split("\n")[0].strip()
         if line != "OK":
             return TestResult(name, "FAIL")
@@ -41,7 +35,7 @@ def process_os_check(log_path: Path) -> TestResult:
 
 def process_glibc_check(log_path: Path, max_glibc_version: str) -> TestResults:
     test_results = []  # type: TestResults
-    with open(log_path, "r") as log:
+    with open(log_path, "r", encoding="utf-8") as log:
         for line in log:
             if line.strip():
                 columns = line.strip().split(" ")
@@ -49,7 +43,7 @@ def process_glibc_check(log_path: Path, max_glibc_version: 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 Version(version) > Version(max_glibc_version):
                     test_results.append(TestResult(symbol_with_glibc, "FAIL"))
     if not test_results:
         test_results.append(TestResult("glibc check", "OK"))
@@ -66,19 +60,19 @@ def process_result(
     glibc_log_path = result_directory / "glibc.log"
     test_results = process_glibc_check(glibc_log_path, max_glibc_version)
 
-    status = "success"
+    status = SUCCESS
     description = "Compatibility check passed"
 
     if check_glibc:
         if len(test_results) > 1 or test_results[0].status != "OK":
-            status = "failure"
+            status = FAILURE
             description = "glibc check failed"
 
-    if status == "success" and check_distributions:
+    if status == SUCCESS and check_distributions:
         for operating_system in ("ubuntu:12.04", "centos:5"):
             test_result = process_os_check(result_directory / operating_system)
             if test_result.status != "OK":
-                status = "failure"
+                status = FAILURE
                 description = f"Old {operating_system} failed"
                 test_results += [test_result]
                 break
@@ -129,11 +123,7 @@ def get_run_commands_distributions(
 
 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
+    parser.add_argument("--check-name", required=False)
     return parser.parse_args()
 
 
@@ -141,6 +131,13 @@ def main():
     logging.basicConfig(level=logging.INFO)
 
     args = parse_args()
+    check_name = args.check_name or os.getenv("CHECK_NAME")
+    assert check_name
+    check_glibc = True
+    # currently hardcoded to x86, don't enable for ARM
+    check_distributions = (
+        "aarch64" not in check_name.lower() and "arm64" not in check_name.lower()
+    )
 
     stopwatch = Stopwatch()
 
@@ -149,16 +146,6 @@ def main():
     temp_path.mkdir(parents=True, exist_ok=True)
     reports_path.mkdir(parents=True, exist_ok=True)
 
-    pr_info = PRInfo()
-
-    gh = Github(get_best_robot_token(), per_page=100)
-    commit = get_commit(gh, pr_info.sha)
-
-    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)
-
     packages_path = temp_path / "packages"
     packages_path.mkdir(parents=True, exist_ok=True)
 
@@ -167,7 +154,7 @@ def main():
             "clickhouse-common-static_" in url or "clickhouse-server_" in url
         )
 
-    download_builds_filter(args.check_name, reports_path, packages_path, url_filter)
+    download_builds_filter(check_name, reports_path, packages_path, url_filter)
 
     for package in packages_path.iterdir():
         if package.suffix == ".deb":
@@ -183,11 +170,11 @@ def main():
 
     run_commands = []
 
-    if args.check_glibc:
+    if check_glibc:
         check_glibc_commands = get_run_commands_glibc(packages_path, result_path)
         run_commands.extend(check_glibc_commands)
 
-    if args.check_distributions:
+    if check_distributions:
         centos_image = pull_image(get_docker_image(IMAGE_CENTOS))
         ubuntu_image = pull_image(get_docker_image(IMAGE_UBUNTU))
         check_distributions_commands = get_run_commands_distributions(
@@ -199,69 +186,44 @@ def main():
         )
         run_commands.extend(check_distributions_commands)
 
-    state = "success"
+    state = SUCCESS
     for run_command in run_commands:
         try:
             logging.info("Running command %s", run_command)
             subprocess.check_call(run_command, shell=True)
         except subprocess.CalledProcessError as ex:
             logging.info("Exception calling command %s", ex)
-            state = "failure"
+            state = FAILURE
 
     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:
+    if "amd64" in check_name:
         max_glibc_version = "2.4"
-    elif "aarch64" in args.check_name:
+    elif "aarch64" in check_name:
         max_glibc_version = "2.18"  # because of build with newer sysroot?
     else:
-        raise Exception("Can't determine max glibc version")
+        raise RuntimeError("Can't determine max glibc version")
 
-    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_result(
         result_path,
         server_log_path,
-        args.check_glibc,
-        args.check_distributions,
+        check_glibc,
+        check_distributions,
         max_glibc_version,
     )
 
-    ch_helper = ClickHouseHelper()
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+    ).dump()
 
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        additional_logs,
-        args.check_name,
-    )
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit,
-        state,
-        report_url,
-        description,
-        args.check_name,
-        pr_info,
-        dump_to_file=True,
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        args.check_name,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    if state == "failure":
+    if state == FAILURE:
         sys.exit(1)
 
 
diff --git a/tests/ci/digest_helper.py b/tests/ci/digest_helper.py
index c0cbae13a45..8d6ec127f6e 100644
--- a/tests/ci/digest_helper.py
+++ b/tests/ci/digest_helper.py
@@ -11,6 +11,8 @@ from sys import modules
 from docker_images_helper import get_images_info
 from ci_config import DigestConfig
 from git_helper import Runner
+from env_helper import ROOT_DIR
+from ci_utils import cd
 
 DOCKER_DIGEST_LEN = 12
 JOB_DIGEST_LEN = 10
@@ -67,17 +69,18 @@ def digest_paths(
     The order is processed as given"""
     hash_object = hash_object or md5()
     paths_all: List[Path] = []
-    for p in paths:
-        if isinstance(p, str) and "*" in p:
-            for path in Path(".").glob(p):
-                bisect.insort(paths_all, path.absolute())  # type: ignore[misc]
-        else:
-            bisect.insort(paths_all, Path(p).absolute())  # type: ignore[misc]
-    for path in paths_all:  # type: ignore
-        if path.exists():
-            digest_path(path, hash_object, exclude_files, exclude_dirs)
-        else:
-            raise AssertionError(f"Invalid path: {path}")
+    with cd(ROOT_DIR):
+        for p in paths:
+            if isinstance(p, str) and "*" in p:
+                for path in Path(".").glob(p):
+                    bisect.insort(paths_all, path.absolute())  # type: ignore[misc]
+            else:
+                bisect.insort(paths_all, Path(p).absolute())  # type: ignore[misc]
+        for path in paths_all:  # type: ignore
+            if path.exists():
+                digest_path(path, hash_object, exclude_files, exclude_dirs)
+            else:
+                raise AssertionError(f"Invalid path: {path}")
     return hash_object
 
 
@@ -86,15 +89,16 @@ def digest_script(path_str: str) -> HASH:
     path = Path(path_str)
     parent = path.parent
     md5_hash = md5()
-    try:
-        for script in modules.values():
-            script_path = getattr(script, "__file__", "")
-            if parent.absolute().as_posix() in script_path:
-                logger.debug("Updating the hash with %s", script_path)
-                _digest_file(Path(script_path), md5_hash)
-    except RuntimeError:
-        logger.warning("The modules size has changed, retry calculating digest")
-        return digest_script(path_str)
+    with cd(ROOT_DIR):
+        try:
+            for script in modules.values():
+                script_path = getattr(script, "__file__", "")
+                if parent.absolute().as_posix() in script_path:
+                    logger.debug("Updating the hash with %s", script_path)
+                    _digest_file(Path(script_path), md5_hash)
+        except RuntimeError:
+            logger.warning("The modules size has changed, retry calculating digest")
+            return digest_script(path_str)
     return md5_hash
 
 
@@ -113,17 +117,18 @@ class DockerDigester:
 
     def get_image_digest(self, name: str) -> str:
         assert isinstance(name, str)
-        deps = [name]
-        digest = None
-        while deps:
-            dep_name = deps.pop(0)
-            digest = digest_path(
-                self.images_info[dep_name]["path"],
-                digest,
-                exclude_files=self.EXCLUDE_FILES,
-            )
-            deps += self.images_info[dep_name]["deps"]
-        assert digest
+        with cd(ROOT_DIR):
+            deps = [name]
+            digest = None
+            while deps:
+                dep_name = deps.pop(0)
+                digest = digest_path(
+                    self.images_info[dep_name]["path"],
+                    digest,
+                    exclude_files=self.EXCLUDE_FILES,
+                )
+                deps += self.images_info[dep_name]["deps"]
+            assert digest
         return digest.hexdigest()[0:DOCKER_DIGEST_LEN]
 
     def get_all_digests(self) -> Dict:
diff --git a/tests/ci/docker_images_check.py b/tests/ci/docker_images_check.py
index ae6e81c4c9f..b04a3975545 100644
--- a/tests/ci/docker_images_check.py
+++ b/tests/ci/docker_images_check.py
@@ -3,26 +3,28 @@ import argparse
 import json
 import logging
 import os
-import time
 import sys
+import time
 from pathlib import Path
 from typing import List, Optional, Tuple
 
+# isort: off
 from github import Github
 
+# isort: on
+
 from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
 from commit_status_helper import format_description, get_commit, post_commit_status
-from env_helper import ROOT_DIR, RUNNER_TEMP, GITHUB_RUN_URL
+from docker_images_helper import DockerImageData, docker_login, get_images_oredered_list
+from env_helper import GITHUB_RUN_URL, RUNNER_TEMP
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
-from report import TestResults, TestResult
+from report import FAILURE, SUCCESS, StatusType, TestResult, TestResults
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
 from upload_result_helper import upload_results
-from docker_images_helper import DockerImageData, docker_login, get_images_oredered_list
 
-NAME = "Push to Dockerhub"
 TEMP_PATH = Path(RUNNER_TEMP) / "docker_images_check"
 TEMP_PATH.mkdir(parents=True, exist_ok=True)
 
@@ -170,12 +172,13 @@ def parse_args() -> argparse.Namespace:
 
 
 def main():
-    # to be always aligned with docker paths from image.json
-    os.chdir(ROOT_DIR)
     logging.basicConfig(level=logging.INFO)
     stopwatch = Stopwatch()
 
     args = parse_args()
+
+    NAME = f"Push to Dockerhub {args.suffix}"
+
     if args.push:
         logging.info("login to docker hub")
         docker_login()
@@ -191,19 +194,22 @@ def main():
     #     additional_cache.append(str(pr_info.merged_pr))
 
     ok_cnt = 0
-    status = "success"
-    image_tags = (
-        json.loads(args.image_tags)
-        if not os.path.isfile(args.image_tags)
-        else json.load(open(args.image_tags))
-    )
-    missing_images = (
-        image_tags
-        if args.missing_images == "all"
-        else json.loads(args.missing_images)
-        if not os.path.isfile(args.missing_images)
-        else json.load(open(args.missing_images))
-    )
+    status = SUCCESS  # type: StatusType
+
+    if os.path.isfile(args.image_tags):
+        with open(args.image_tags, "r", encoding="utf-8") as jfd:
+            image_tags = json.load(jfd)
+    else:
+        image_tags = json.loads(args.image_tags)
+
+    if args.missing_images == "all":
+        missing_images = image_tags
+    elif os.path.isfile(args.missing_images):
+        with open(args.missing_images, "r", encoding="utf-8") as jfd:
+            missing_images = json.load(jfd)
+    else:
+        missing_images = json.loads(args.missing_images)
+
     images_build_list = get_images_oredered_list()
 
     for image in images_build_list:
@@ -235,7 +241,7 @@ def main():
         if all(x.status == "OK" for x in res):
             ok_cnt += 1
         else:
-            status = "failure"
+            status = FAILURE
             break  # No need to continue with next images
 
     description = format_description(
@@ -270,7 +276,7 @@ def main():
     ch_helper = ClickHouseHelper()
     ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
 
-    if status == "failure":
+    if status == FAILURE:
         sys.exit(1)
 
 
diff --git a/tests/ci/docker_manifests_merge.py b/tests/ci/docker_manifests_merge.py
index 97e7ca3b5c0..3c122545735 100644
--- a/tests/ci/docker_manifests_merge.py
+++ b/tests/ci/docker_manifests_merge.py
@@ -5,25 +5,23 @@ import json
 import logging
 import os
 import subprocess
-
 import sys
 from typing import List, Tuple
 
+# isort: off
 from github import Github
 
-from clickhouse_helper import (
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
+# isort: on
+
+from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
 from commit_status_helper import format_description, get_commit, post_commit_status
+from docker_images_helper import docker_login, get_images_oredered_list
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
-from report import TestResult
+from report import FAILURE, SUCCESS, StatusType, TestResult
 from s3_helper import S3Helper
 from stopwatch import Stopwatch
-from env_helper import ROOT_DIR
 from upload_result_helper import upload_results
-from docker_images_helper import docker_login, get_images_oredered_list
 
 NAME = "Push multi-arch images to Dockerhub"
 
@@ -126,8 +124,6 @@ def create_manifest(
 
 
 def main():
-    # to be aligned with docker paths from image.json
-    os.chdir(ROOT_DIR)
     logging.basicConfig(level=logging.INFO)
     stopwatch = Stopwatch()
 
@@ -139,42 +135,50 @@ def main():
     archs = args.suffixes
     assert len(archs) > 1, "arch suffix input param is invalid"
 
-    image_tags = (
-        json.loads(args.image_tags)
-        if not os.path.isfile(args.image_tags)
-        else json.load(open(args.image_tags))
-    )
-    missing_images = (
-        list(image_tags)
-        if args.missing_images == "all"
-        else json.loads(args.missing_images)
-        if not os.path.isfile(args.missing_images)
-        else json.load(open(args.missing_images))
-    )
+    if os.path.isfile(args.image_tags):
+        with open(args.image_tags, "r", encoding="utf-8") as jfd:
+            image_tags = json.load(jfd)
+    else:
+        image_tags = json.loads(args.image_tags)
+
+    if args.missing_images == "all":
+        missing_images = image_tags
+    elif os.path.isfile(args.missing_images):
+        with open(args.missing_images, "r", encoding="utf-8") as jfd:
+            missing_images = json.load(jfd)
+    else:
+        missing_images = json.loads(args.missing_images)
+
     test_results = []
-    status = "success"
+    status = SUCCESS  # type: StatusType
 
     ok_cnt, fail_cnt = 0, 0
     images = get_images_oredered_list()
     for image_obj in images:
-        if image_obj.repo not in missing_images:
-            continue
         tag = image_tags[image_obj.repo]
         if image_obj.only_amd64:
             # FIXME: WA until full arm support
             tags = [f"{tag}-{arch}" for arch in archs if arch != "aarch64"]
         else:
             tags = [f"{tag}-{arch}" for arch in archs]
-        manifest, test_result = create_manifest(image_obj.repo, tag, tags, args.push)
-        test_results.append(TestResult(manifest, test_result))
+
+        # 1. update multiarch latest manifest for every image
         if args.set_latest:
             manifest, test_result = create_manifest(
                 image_obj.repo, "latest", tags, args.push
             )
             test_results.append(TestResult(manifest, test_result))
 
+        # 2. skip manifest create if not missing
+        if image_obj.repo not in missing_images:
+            continue
+
+        # 3. created image:digest multiarch manifest for changed images only
+        manifest, test_result = create_manifest(image_obj.repo, tag, tags, args.push)
+        test_results.append(TestResult(manifest, test_result))
+
         if test_result != "OK":
-            status = "failure"
+            status = FAILURE
             fail_cnt += 1
         else:
             ok_cnt += 1
@@ -210,7 +214,7 @@ def main():
     )
     ch_helper = ClickHouseHelper()
     ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-    if status == "failure":
+    if status == FAILURE:
         sys.exit(1)
 
 
diff --git a/tests/ci/docker_server.py b/tests/ci/docker_server.py
index b75808890bd..230f3e56110 100644
--- a/tests/ci/docker_server.py
+++ b/tests/ci/docker_server.py
@@ -6,32 +6,26 @@ import json
 import logging
 import sys
 import time
+from os import makedirs
+from os import path as p
 from pathlib import Path
-from os import path as p, makedirs
 from typing import Dict, List
 
-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, get_commit, post_commit_status
+from build_download_helper import read_build_urls
 from docker_images_helper import DockerImageData, docker_login
 from env_helper import (
     GITHUB_RUN_URL,
     REPORT_PATH,
-    TEMP_PATH,
     S3_BUILDS_BUCKET,
     S3_DOWNLOAD,
+    TEMP_PATH,
 )
-from get_robot_token import get_best_robot_token
 from git_helper import Git
 from pr_info import PRInfo
-from report import TestResults, TestResult
-from s3_helper import S3Helper
+from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from build_download_helper import read_build_urls
-from upload_result_helper import upload_results
 from version_helper import (
     ClickHouseVersion,
     get_tagged_versions,
@@ -57,7 +51,11 @@ def parse_args() -> argparse.Namespace:
         description="A program to build clickhouse-server image, both alpine and "
         "ubuntu versions",
     )
-
+    parser.add_argument(
+        "--check-name",
+        required=False,
+        default="",
+    )
     parser.add_argument(
         "--version",
         type=version_arg,
@@ -77,13 +75,13 @@ def parse_args() -> argparse.Namespace:
     parser.add_argument(
         "--image-path",
         type=str,
-        default="docker/server",
+        default="",
         help="a path to docker context directory",
     )
     parser.add_argument(
         "--image-repo",
         type=str,
-        default="clickhouse/clickhouse-server",
+        default="",
         help="image name on docker hub",
     )
     parser.add_argument(
@@ -98,14 +96,7 @@ def parse_args() -> argparse.Namespace:
         default=argparse.SUPPRESS,
         help="don't push reports to S3 and github",
     )
-    parser.add_argument("--push", default=True, help=argparse.SUPPRESS)
-    parser.add_argument(
-        "--no-push-images",
-        action="store_false",
-        dest="push",
-        default=argparse.SUPPRESS,
-        help="don't push images to docker hub",
-    )
+    parser.add_argument("--push", action="store_true", help=argparse.SUPPRESS)
     parser.add_argument("--os", default=["ubuntu", "alpine"], help=argparse.SUPPRESS)
     parser.add_argument(
         "--no-ubuntu",
@@ -225,11 +216,14 @@ def gen_tags(version: ClickHouseVersion, release_type: str) -> List[str]:
     return tags
 
 
-def buildx_args(urls: Dict[str, str], arch: str, direct_urls: List[str]) -> List[str]:
+def buildx_args(
+    urls: Dict[str, str], arch: str, direct_urls: List[str], version: str
+) -> List[str]:
     args = [
         f"--platform=linux/{arch}",
         f"--label=build-url={GITHUB_RUN_URL}",
         f"--label=com.clickhouse.build.githash={git.sha}",
+        f"--label=com.clickhouse.build.version={version}",
     ]
     if direct_urls:
         args.append(f"--build-arg=DIRECT_DOWNLOAD_URLS='{' '.join(direct_urls)}'")
@@ -276,7 +270,9 @@ def build_and_push_image(
                 urls = [url for url in direct_urls[arch] if ".deb" in url]
             else:
                 urls = [url for url in direct_urls[arch] if ".tgz" in url]
-        cmd_args.extend(buildx_args(repo_urls, arch, direct_urls=urls))
+        cmd_args.extend(
+            buildx_args(repo_urls, arch, direct_urls=urls, version=version.describe)
+        )
         if not push:
             cmd_args.append(f"--tag={image.repo}:{arch_tag}")
         cmd_args.extend(
@@ -343,14 +339,37 @@ def main():
     makedirs(TEMP_PATH, exist_ok=True)
 
     args = parse_args()
-    image = DockerImageData(args.image_path, args.image_repo, False)
+
+    pr_info = PRInfo()
+
+    if args.check_name:
+        assert not args.image_path and not args.image_repo
+        if "server image" in args.check_name:
+            image_path = "docker/server"
+            image_repo = "clickhouse/clickhouse-server"
+        elif "keeper image" in args.check_name:
+            image_path = "docker/keeper"
+            image_repo = "clickhouse/clickhouse-keeper"
+        else:
+            assert False, "Invalid --check-name"
+    else:
+        assert args.image_path and args.image_repo
+        image_path = args.image_path
+        image_repo = args.image_repo
+
+    push = args.push
+    del args.image_path
+    del args.image_repo
+    del args.push
+
+    if pr_info.is_master():
+        push = True
+
+    image = DockerImageData(image_path, image_repo, False)
     args.release_type = auto_release_type(args.version, args.release_type)
     tags = gen_tags(args.version, args.release_type)
-    NAME = f"Docker image {image.repo} building check"
-    pr_info = None
-    repo_urls = dict()
-    direct_urls: Dict[str, List[str]] = dict()
-    pr_info = PRInfo()
+    repo_urls = {}
+    direct_urls: Dict[str, List[str]] = {}
     release_or_pr, _ = get_release_or_pr(pr_info, args.version)
 
     for arch, build_name in zip(ARCH, ("package_release", "package_aarch64")):
@@ -362,13 +381,13 @@ def main():
             repo_urls[arch] = f"{args.bucket_prefix}/{build_name}"
         if args.allow_build_reuse:
             # read s3 urls from pre-downloaded build reports
-            if "clickhouse-server" in args.image_repo:
+            if "clickhouse-server" in image_repo:
                 PACKAGES = [
                     "clickhouse-client",
                     "clickhouse-server",
                     "clickhouse-common-static",
                 ]
-            elif "clickhouse-keeper" in args.image_repo:
+            elif "clickhouse-keeper" in image_repo:
                 PACKAGES = ["clickhouse-keeper"]
             else:
                 assert False, "BUG"
@@ -382,55 +401,34 @@ def main():
                 if any(package in url for package in PACKAGES) and "-dbg" not in url
             ]
 
-    if args.push:
+    if push:
         docker_login()
-        NAME = f"Docker image {image.repo} build and push"
 
     logging.info("Following tags will be created: %s", ", ".join(tags))
-    status = "success"
+    status = SUCCESS
     test_results = []  # type: TestResults
     for os in args.os:
         for tag in tags:
             test_results.extend(
                 build_and_push_image(
-                    image, args.push, repo_urls, os, tag, args.version, direct_urls
+                    image, push, repo_urls, os, tag, args.version, direct_urls
                 )
             )
             if test_results[-1].status != "OK":
-                status = "failure"
-
+                status = FAILURE
     pr_info = pr_info or PRInfo()
-    s3_helper = S3Helper()
-
-    url = upload_results(s3_helper, pr_info.number, pr_info.sha, test_results, [], NAME)
-
-    print(f"::notice ::Report url: {url}")
-
-    if not args.reports:
-        return
 
     description = f"Processed tags: {', '.join(tags)}"
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[],
+    ).dump()
 
-    description = format_description(description)
-
-    gh = Github(get_best_robot_token(), per_page=100)
-    commit = get_commit(gh, pr_info.sha)
-    post_commit_status(
-        commit, status, url, description, NAME, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        url,
-        NAME,
-    )
-    ch_helper = ClickHouseHelper()
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-    if status != "success":
+    if status != SUCCESS:
         sys.exit(1)
 
 
diff --git a/tests/ci/docs_check.py b/tests/ci/docs_check.py
index 1424ab8895d..6bd4ef49675 100644
--- a/tests/ci/docs_check.py
+++ b/tests/ci/docs_check.py
@@ -1,32 +1,16 @@
 #!/usr/bin/env python3
 import argparse
-import atexit
 import logging
 import subprocess
 import sys
 from pathlib import Path
 
-from github import Github
-
-from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-)
 from docker_images_helper import get_docker_image, pull_image
-from env_helper import TEMP_PATH, REPO_COPY
-from get_robot_token import get_best_robot_token
+from env_helper import REPO_COPY, TEMP_PATH
 from pr_info import PRInfo
-from report import TestResults, TestResult
-from s3_helper import S3Helper
+from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-
-
-NAME = "Docs Check"
 
 
 def parse_args() -> argparse.Namespace:
@@ -60,26 +44,16 @@ 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(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, commit, pr_info, NAME)
-
     if not pr_info.has_changes_in_documentation() and not args.force:
         logging.info("No changes in documentation")
-        post_commit_status(
-            commit,
-            "success",
-            "",
-            "No changes in docs",
-            NAME,
-            pr_info,
-            dump_to_file=True,
-        )
+        JobReport(
+            description="No changes in docs",
+            test_results=[],
+            status=SUCCESS,
+            start_time=stopwatch.start_time_str,
+            duration=stopwatch.duration_seconds,
+            additional_files=[],
+        ).dump()
         sys.exit(0)
 
     if pr_info.has_changes_in_documentation():
@@ -105,11 +79,11 @@ def main():
         retcode = process.wait()
         if retcode == 0:
             logging.info("Run successfully")
-            status = "success"
+            status = SUCCESS
             description = "Docs check passed"
         else:
             description = "Docs check failed (non zero exit code)"
-            status = "failure"
+            status = FAILURE
             logging.info("Run failed")
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
@@ -118,7 +92,7 @@ def main():
     if not any(test_output.iterdir()):
         logging.error("No output files after docs check")
         description = "No output files after docs check"
-        status = "failure"
+        status = FAILURE
     else:
         for p in test_output.iterdir():
             additional_files.append(p)
@@ -127,36 +101,23 @@ def main():
                     if "ERROR" in line:
                         test_results.append(TestResult(line.split(":")[-1], "FAIL"))
         if test_results:
-            status = "failure"
+            status = FAILURE
             description = "Found errors in docs"
-        elif status != "failure":
+        elif status != FAILURE:
             test_results.append(TestResult("No errors found", "OK"))
         else:
             test_results.append(TestResult("Non zero exit code", "FAIL"))
 
-    s3_helper = S3Helper()
-    ch_helper = ClickHouseHelper()
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_files,
+    ).dump()
 
-    report_url = upload_results(
-        s3_helper, pr_info.number, pr_info.sha, test_results, additional_files, NAME
-    )
-    print("::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, status, report_url, description, NAME, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        NAME,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-    if status == "failure":
+    if status == FAILURE:
         sys.exit(1)
 
 
diff --git a/tests/ci/download_release_packages.py b/tests/ci/download_release_packages.py
index 26223de2f8a..550301e8fa2 100755
--- a/tests/ci/download_release_packages.py
+++ b/tests/ci/download_release_packages.py
@@ -3,7 +3,7 @@
 import os
 import logging
 
-import requests  # type: ignore
+import requests
 
 from requests.adapters import HTTPAdapter  # type: ignore
 from urllib3.util.retry import Retry  # type: ignore
diff --git a/tests/ci/fast_test_check.py b/tests/ci/fast_test_check.py
index 093537fdeb0..383f5b340c7 100644
--- a/tests/ci/fast_test_check.py
+++ b/tests/ci/fast_test_check.py
@@ -1,40 +1,27 @@
 #!/usr/bin/env python3
 import argparse
-import logging
-import subprocess
-import os
 import csv
+import logging
+import os
+import subprocess
 import sys
-import atexit
 from pathlib import Path
 from typing import Tuple
-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 (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-    format_description,
-)
 
 from docker_images_helper import DockerImage, get_docker_image, pull_image
-from env_helper import S3_BUILDS_BUCKET, TEMP_PATH, REPO_COPY
-from get_robot_token import get_best_robot_token
-from pr_info import FORCE_TESTS_LABEL, PRInfo
-from report import TestResult, TestResults, read_test_results
-from s3_helper import S3Helper
+from env_helper import REPO_COPY, S3_BUILDS_BUCKET, TEMP_PATH
+from pr_info import PRInfo
+from report import (
+    ERROR,
+    FAILURE,
+    SUCCESS,
+    JobReport,
+    TestResult,
+    TestResults,
+    read_test_results,
+)
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-from version_helper import get_version_from_repo
-
-NAME = "Fast test"
 
 # Will help to avoid errors like _csv.Error: field larger than field limit (131072)
 csv.field_size_limit(sys.maxsize)
@@ -50,15 +37,17 @@ def get_fasttest_cmd(
 ) -> str:
     return (
         f"docker run --cap-add=SYS_PTRACE --user={os.geteuid()}:{os.getegid()} "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         "--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_SOURCE=/ClickHouse "
         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 "
         "-e stage=clone_submodules "
         f"--volume={workspace}:/fasttest-workspace --volume={repo_path}:/ClickHouse "
+        f"--volume={repo_path}/tests/analyzer_tech_debt.txt:/analyzer_tech_debt.txt "
         f"--volume={output_path}:/test_output {image}"
     )
 
@@ -77,16 +66,16 @@ def process_results(result_directory: Path) -> Tuple[str, str, TestResults]:
             status = list(csv.reader(status_file, delimiter="\t"))
     if len(status) != 1 or len(status[0]) != 2:
         logging.info("Files in result folder %s", os.listdir(result_directory))
-        return "error", "Invalid check_status.tsv", test_results
+        return ERROR, "Invalid check_status.tsv", test_results
     state, description = status[0][0], status[0][1]
 
     try:
         results_path = result_directory / "test_results.tsv"
         test_results = read_test_results(results_path)
         if len(test_results) == 0:
-            return "error", "Empty test_results.tsv", test_results
+            return ERROR, "Empty test_results.tsv", test_results
     except Exception as e:
-        return ("error", f"Cannot parse test_results.tsv ({e})", test_results)
+        return (ERROR, f"Cannot parse test_results.tsv ({e})", test_results)
 
     return state, description, test_results
 
@@ -121,23 +110,8 @@ 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, commit, 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 = pull_image(get_docker_image("clickhouse/fasttest"))
 
-    s3_helper = S3Helper()
-
     workspace = temp_path / "fasttest-workspace"
     workspace.mkdir(parents=True, exist_ok=True)
 
@@ -185,76 +159,40 @@ def main():
     test_results = []  # type: TestResults
     if "submodule_log.txt" not in test_output_files:
         description = "Cannot clone repository"
-        state = "failure"
+        state = FAILURE
     elif "cmake_log.txt" not in test_output_files:
         description = "Cannot fetch submodules"
-        state = "failure"
+        state = FAILURE
     elif "build_log.txt" not in test_output_files:
         description = "Cannot finish cmake"
-        state = "failure"
+        state = FAILURE
     elif "install_log.txt" not in test_output_files:
         description = "Cannot build ClickHouse"
-        state = "failure"
+        state = FAILURE
     elif not test_log_exists and not test_result_exists:
         description = "Cannot install or start ClickHouse"
-        state = "failure"
+        state = FAILURE
     else:
         state, description, test_results = process_results(output_path)
 
     if timeout_expired:
         test_results.append(TestResult.create_check_timeout_expired(args.timeout))
-        state = "failure"
-        description = format_description(test_results[-1].name)
+        state = FAILURE
+        description = test_results[-1].name
 
-    ch_helper = ClickHouseHelper()
-    s3_path_prefix = "/".join(
-        (
-            get_release_or_pr(pr_info, get_version_from_repo())[0],
-            pr_info.sha,
-            "fast_tests",
-        )
-    )
-    build_urls = s3_helper.upload_build_directory_to_s3(
-        output_path / "binaries",
-        s3_path_prefix,
-        keep_dirs_in_s3_path=False,
-        upload_symlinks=False,
-    )
-
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        additional_logs,
-        NAME,
-        build_urls,
-    )
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, state, report_url, description, NAME, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        NAME,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+        build_dir_for_upload=str(output_path / "binaries"),
+    ).dump()
 
     # Refuse other checks to run if fast test failed
-    if state != "success":
-        if state == "error":
-            print("The status is 'error', report failure disregard the labels")
-            sys.exit(1)
-        elif FORCE_TESTS_LABEL in pr_info.labels:
-            print(f"'{FORCE_TESTS_LABEL}' enabled, reporting success")
-        else:
-            sys.exit(1)
+    if state != SUCCESS:
+        sys.exit(1)
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/finish_check.py b/tests/ci/finish_check.py
index 6c615817164..eebc846f4b1 100644
--- a/tests/ci/finish_check.py
+++ b/tests/ci/finish_check.py
@@ -1,16 +1,21 @@
 #!/usr/bin/env python3
 import logging
+
+# isort: off
 from github import Github
 
+# isort: on
+
 from commit_status_helper import (
     CI_STATUS_NAME,
     get_commit,
     get_commit_filtered_statuses,
     post_commit_status,
-    update_mergeable_check,
+    trigger_mergeable_check,
 )
 from get_robot_token import get_best_robot_token
 from pr_info import PRInfo
+from report import PENDING, SUCCESS
 
 
 def main():
@@ -19,22 +24,19 @@ def main():
     pr_info = PRInfo(need_orgs=True)
     gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
-    # Update the Mergeable Check at the final step
-    update_mergeable_check(commit, pr_info, CI_STATUS_NAME)
+    # Unconditionally update the Mergeable Check at the final step
+    statuses = get_commit_filtered_statuses(commit)
+    trigger_mergeable_check(commit, statuses)
 
-    statuses = [
-        status
-        for status in get_commit_filtered_statuses(commit)
-        if status.context == CI_STATUS_NAME
-    ]
+    statuses = [s for s in statuses if s.context == CI_STATUS_NAME]
     if not statuses:
         return
     # Take the latest status
     status = statuses[-1]
-    if status.state == "pending":
+    if status.state == PENDING:
         post_commit_status(
             commit,
-            "success",
+            SUCCESS,
             status.target_url,
             "All checks finished",
             CI_STATUS_NAME,
diff --git a/tests/ci/functional_test_check.py b/tests/ci/functional_test_check.py
index 89fcb9ce350..a0c977ea25f 100644
--- a/tests/ci/functional_test_check.py
+++ b/tests/ci/functional_test_check.py
@@ -7,36 +7,18 @@ import os
 import re
 import subprocess
 import sys
-import atexit
 from pathlib import Path
 from typing import List, Tuple
 
-from github import Github
-
 from build_download_helper import download_all_deb_packages
-from clickhouse_helper import (
-    CiLogsCredentials,
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    override_status,
-    post_commit_status,
-    post_commit_status_to_file,
-    update_mergeable_check,
-)
-from docker_images_helper import DockerImage, pull_image, get_docker_image
+from clickhouse_helper import CiLogsCredentials
+from docker_images_helper import DockerImage, get_docker_image, pull_image
 from download_release_packages import download_last_release
-from env_helper import REPORT_PATH, TEMP_PATH, REPO_COPY
-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 s3_helper import S3Helper
+from env_helper import REPO_COPY, REPORT_PATH, TEMP_PATH
+from pr_info import PRInfo
+from report import ERROR, SUCCESS, JobReport, StatusType, TestResults, read_test_results
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
 
 NO_CHANGES_MSG = "Nothing to run"
 
@@ -57,7 +39,7 @@ def get_additional_envs(
         result.append("USE_S3_STORAGE_FOR_MERGE_TREE=1")
         result.append("RANDOMIZE_OBJECT_KEY_TYPE=1")
     if "analyzer" in check_name:
-        result.append("USE_NEW_ANALYZER=1")
+        result.append("USE_OLD_ANALYZER=1")
 
     if run_by_hash_total != 0:
         result.append(f"RUN_BY_HASH_NUM={run_by_hash_num}")
@@ -71,8 +53,7 @@ def get_image_name(check_name: str) -> str:
         return "clickhouse/stateless-test"
     if "stateful" in check_name.lower():
         return "clickhouse/stateful-test"
-    else:
-        raise Exception(f"Cannot deduce image name based on check name {check_name}")
+    raise ValueError(f"Cannot deduce image name based on check name {check_name}")
 
 
 def get_run_command(
@@ -113,7 +94,7 @@ def get_run_command(
     env_str = " ".join(envs)
     volume_with_broken_test = (
         f"--volume={repo_path}/tests/analyzer_tech_debt.txt:/analyzer_tech_debt.txt "
-        if "analyzer" in check_name
+        if "analyzer" not in check_name
         else ""
     )
 
@@ -124,11 +105,12 @@ def get_run_command(
         f"{volume_with_broken_test}"
         f"--volume={result_path}:/test_output "
         f"--volume={server_log_path}:/var/log/clickhouse-server "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"
     )
 
 
-def get_tests_to_run(pr_info: PRInfo) -> List[str]:
+def _get_statless_tests_to_run(pr_info: PRInfo) -> List[str]:
     result = set()
 
     if pr_info.changed_files is None:
@@ -153,7 +135,7 @@ def get_tests_to_run(pr_info: PRInfo) -> List[str]:
 def process_results(
     result_directory: Path,
     server_log_path: Path,
-) -> Tuple[str, str, TestResults, List[Path]]:
+) -> Tuple[StatusType, str, TestResults, List[Path]]:
     test_results = []  # type: TestResults
     additional_files = []
     # Just upload all files from result_directory.
@@ -175,7 +157,7 @@ def process_results(
 
     if len(status) != 1 or len(status[0]) != 2:
         logging.info("Files in result folder %s", os.listdir(result_directory))
-        return "error", "Invalid check_status.tsv", test_results, additional_files
+        return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
 
     try:
@@ -185,20 +167,20 @@ def process_results(
             logging.info("Found test_results.tsv")
         else:
             logging.info("Files in result folder %s", os.listdir(result_directory))
-            return "error", "Not found test_results.tsv", test_results, additional_files
+            return ERROR, "Not found test_results.tsv", test_results, additional_files
 
         test_results = read_test_results(results_path)
         if len(test_results) == 0:
-            return "error", "Empty test_results.tsv", test_results, additional_files
+            return ERROR, "Empty test_results.tsv", test_results, additional_files
     except Exception as e:
         return (
-            "error",
+            ERROR,
             f"Cannot parse test_results.tsv ({e})",
             test_results,
             additional_files,
         )
 
-    return state, description, test_results, additional_files
+    return state, description, test_results, additional_files  # type: ignore
 
 
 def parse_args():
@@ -211,10 +193,10 @@ def parse_args():
         help="Check that added tests failed on latest stable",
     )
     parser.add_argument(
-        "--post-commit-status",
-        default="commit_status",
-        choices=["commit_status", "file"],
-        help="Where to public post commit status",
+        "--report-to-file",
+        type=str,
+        default="",
+        help="Path to write script report to (for --validate-bugfix)",
     )
     return parser.parse_args()
 
@@ -230,7 +212,6 @@ def main():
     reports_path.mkdir(parents=True, exist_ok=True)
 
     repo_path = Path(REPO_COPY)
-    post_commit_path = temp_path / "functional_commit_status.tsv"
 
     args = parse_args()
     check_name = args.check_name or os.getenv("CHECK_NAME")
@@ -247,66 +228,20 @@ def main():
     flaky_check = "flaky" in check_name.lower()
 
     run_changed_tests = flaky_check or validate_bugfix_check
-    gh = Github(get_best_robot_token(), per_page=100)
-
-    # For validate_bugfix_check we need up to date information about labels, so pr_event_from_api is used
-    pr_info = PRInfo(
-        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, commit, pr_info, check_name)
-
-    if validate_bugfix_check and "pr-bugfix" not in pr_info.labels:
-        if args.post_commit_status == "file":
-            post_commit_status_to_file(
-                post_commit_path,
-                f"Skipped (no pr-bugfix in {pr_info.labels})",
-                "success",
-                "null",
-            )
-        logging.info("Skipping '%s' (no pr-bugfix in %s)", check_name, pr_info.labels)
-        sys.exit(0)
+    pr_info = PRInfo(need_changed_files=run_changed_tests)
+    tests_to_run = []
+    assert (
+        not validate_bugfix_check or args.report_to_file
+    ), "JobReport file path must be provided with --validate-bugfix"
+    if run_changed_tests:
+        tests_to_run = _get_statless_tests_to_run(pr_info)
 
     if "RUN_BY_HASH_NUM" in os.environ:
         run_by_hash_num = int(os.getenv("RUN_BY_HASH_NUM", "0"))
         run_by_hash_total = int(os.getenv("RUN_BY_HASH_TOTAL", "0"))
-        check_name_with_group = (
-            check_name + f" [{run_by_hash_num + 1}/{run_by_hash_total}]"
-        )
     else:
         run_by_hash_num = 0
         run_by_hash_total = 0
-        check_name_with_group = check_name
-
-    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)
-
-    tests_to_run = []
-    if run_changed_tests:
-        tests_to_run = get_tests_to_run(pr_info)
-        if not tests_to_run:
-            state = override_status("success", check_name, validate_bugfix_check)
-            if args.post_commit_status == "commit_status":
-                post_commit_status(
-                    commit,
-                    state,
-                    "",
-                    NO_CHANGES_MSG,
-                    check_name_with_group,
-                    pr_info,
-                    dump_to_file=True,
-                )
-            elif args.post_commit_status == "file":
-                post_commit_status_to_file(
-                    post_commit_path,
-                    description=NO_CHANGES_MSG,
-                    state=state,
-                    report_url="null",
-                )
-            sys.exit(0)
 
     image_name = get_image_name(check_name)
 
@@ -340,91 +275,65 @@ def main():
         pr_info, stopwatch.start_time_str, check_name
     )
 
-    run_command = get_run_command(
-        check_name,
-        packages_path,
-        repo_path,
-        result_path,
-        server_log_path,
-        kill_timeout,
-        additional_envs,
-        ci_logs_args,
-        docker_image,
-        flaky_check,
-        tests_to_run,
-    )
-    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")
-
-    try:
-        subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
-    except subprocess.CalledProcessError:
-        logging.warning("Failed to change files owner in %s, ignoring it", temp_path)
-
-    ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
-    s3_helper = S3Helper()
-
-    state, description, test_results, additional_logs = process_results(
-        result_path, server_log_path
-    )
-    state = override_status(state, check_name, invert=validate_bugfix_check)
-
-    ch_helper = ClickHouseHelper()
-
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        [run_log_path] + additional_logs,
-        check_name_with_group,
-    )
-
-    print(f"::notice:: {check_name} Report url: {report_url}")
-    if args.post_commit_status == "commit_status":
-        post_commit_status(
-            commit,
-            state,
-            report_url,
-            description,
-            check_name_with_group,
-            pr_info,
-            dump_to_file=True,
+    if (not validate_bugfix_check and not flaky_check) or tests_to_run:
+        run_command = get_run_command(
+            check_name,
+            packages_path,
+            repo_path,
+            result_path,
+            server_log_path,
+            kill_timeout,
+            additional_envs,
+            ci_logs_args,
+            docker_image,
+            flaky_check,
+            tests_to_run,
         )
-    elif args.post_commit_status == "file":
-        post_commit_status_to_file(
-            post_commit_path,
-            description,
-            state,
-            report_url,
+        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")
+
+        try:
+            subprocess.check_call(
+                f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True
+            )
+        except subprocess.CalledProcessError:
+            logging.warning(
+                "Failed to change files owner in %s, ignoring it", temp_path
+            )
+
+        ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
+
+        state, description, test_results, additional_logs = process_results(
+            result_path, server_log_path
         )
     else:
-        raise Exception(
-            f'Unknown post_commit_status option "{args.post_commit_status}"'
+        print(
+            "This is validate bugfix or flaky check run, but no changes test to run - skip with success"
+        )
+        state, description, test_results, additional_logs = (
+            SUCCESS,
+            "No tests to run",
+            [],
+            [],
         )
 
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name_with_group,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+    ).dump(to_file=args.report_to_file if args.report_to_file else None)
 
-    if state != "success":
-        if FORCE_TESTS_LABEL in pr_info.labels:
-            print(f"'{FORCE_TESTS_LABEL}' enabled, will report success")
-        else:
-            sys.exit(1)
+    if state != SUCCESS:
+        sys.exit(1)
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/get_previous_release_tag.py b/tests/ci/get_previous_release_tag.py
index c2d279f7fec..bc0cb975ef5 100755
--- a/tests/ci/get_previous_release_tag.py
+++ b/tests/ci/get_previous_release_tag.py
@@ -1,10 +1,10 @@
 #!/usr/bin/env python3
 
-import re
 import logging
+import re
 from typing import List, Optional, Tuple
 
-import requests  # type: ignore
+import requests
 
 CLICKHOUSE_TAGS_URL = "https://api.github.com/repos/ClickHouse/ClickHouse/tags"
 CLICKHOUSE_PACKAGE_URL = (
@@ -82,13 +82,14 @@ def get_previous_release(server_version: Optional[Version]) -> Optional[ReleaseI
             CLICKHOUSE_TAGS_URL, {"page": page, "per_page": 100}, timeout=10
         )
         if not response.ok:
-            raise Exception(
-                "Cannot load the list of tags from github: " + response.reason
+            logger.error(
+                "Cannot load the list of tags from github: %s", response.reason
             )
+            response.raise_for_status()
 
         releases_str = set(re.findall(VERSION_PATTERN, response.text))
         if len(releases_str) == 0:
-            raise Exception(
+            raise ValueError(
                 "Cannot find previous release for "
                 + str(server_version)
                 + " server version"
diff --git a/tests/ci/git_helper.py b/tests/ci/git_helper.py
index 598ffbafb51..f15f1273bb9 100644
--- a/tests/ci/git_helper.py
+++ b/tests/ci/git_helper.py
@@ -92,7 +92,7 @@ class Runner:
             return
         self._cwd = value
 
-    def __call__(self, *args, **kwargs):
+    def __call__(self, *args: Any, **kwargs: Any) -> str:
         return self.run(*args, **kwargs)
 
 
diff --git a/tests/ci/install_check.py b/tests/ci/install_check.py
index 5ef65f3f38b..71e2198f533 100644
--- a/tests/ci/install_check.py
+++ b/tests/ci/install_check.py
@@ -2,7 +2,6 @@
 
 import argparse
 
-import atexit
 import logging
 import sys
 import subprocess
@@ -10,30 +9,16 @@ from pathlib import Path
 from shutil import copy2
 from typing import Dict
 
-from github import Github
 
 from build_download_helper import download_builds_filter
-from clickhouse_helper import (
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    format_description,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-)
+
 from compress_files import compress_fast
 from docker_images_helper import DockerImage, pull_image, get_docker_image
 from env_helper import CI, REPORT_PATH, TEMP_PATH as TEMP
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from report import TestResults, TestResult, FAILURE, FAIL, OK, SUCCESS
-from s3_helper import S3Helper
+from report import JobReport, TestResults, TestResult, FAILURE, FAIL, OK, SUCCESS
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
+from ci_utils import set_job_timeout
 
 
 RPM_IMAGE = "clickhouse/install-rpm-test"
@@ -271,23 +256,12 @@ def main():
 
     args = parse_args()
 
+    if CI:
+        set_job_timeout()
+
     TEMP_PATH.mkdir(parents=True, exist_ok=True)
     LOGS_PATH.mkdir(parents=True, exist_ok=True)
 
-    pr_info = PRInfo()
-
-    if CI:
-        gh = Github(get_best_robot_token(), per_page=100)
-        commit = get_commit(gh, pr_info.sha)
-        atexit.register(update_mergeable_check, commit, 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"
-            )
-            sys.exit(0)
-
     deb_image = pull_image(get_docker_image(DEB_IMAGE))
     rpm_image = pull_image(get_docker_image(RPM_IMAGE))
 
@@ -331,54 +305,21 @@ def main():
         test_results.extend(test_install_tgz(rpm_image))
 
     state = SUCCESS
-    test_status = OK
     description = "Packages installed successfully"
     if FAIL in (result.status for result in test_results):
         state = FAILURE
-        test_status = FAIL
         description = "Failed to install packages: " + ", ".join(
             result.name for result in test_results
         )
 
-    s3_helper = S3Helper()
-
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        [],
-        args.check_name,
-    )
-    print(f"::notice ::Report url: {report_url}")
-    if not CI:
-        return
-
-    ch_helper = ClickHouseHelper()
-
-    description = format_description(description)
-
-    post_commit_status(
-        commit,
-        state,
-        report_url,
-        description,
-        args.check_name,
-        pr_info,
-        dump_to_file=True,
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        test_status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        args.check_name,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[],
+    ).dump()
 
     if state == FAILURE:
         sys.exit(1)
diff --git a/tests/ci/integration_test_check.py b/tests/ci/integration_test_check.py
index c65f162f770..7c74f52b610 100644
--- a/tests/ci/integration_test_check.py
+++ b/tests/ci/integration_test_check.py
@@ -5,32 +5,28 @@ import csv
 import json
 import logging
 import os
-import subprocess
 import sys
 from pathlib import Path
 from typing import Dict, List, Tuple
 
 from build_download_helper import download_all_deb_packages
-from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    override_status,
-    post_commit_status,
-    post_commit_status_to_file,
-)
-from docker_images_helper import DockerImage, get_docker_image, pull_image
+from docker_images_helper import DockerImage, get_docker_image
 from download_release_packages import download_last_release
 from env_helper import REPO_COPY, REPORT_PATH, TEMP_PATH
-from get_robot_token import get_best_robot_token
-from github_helper import GitHub
 from integration_test_images import IMAGES
 from pr_info import PRInfo
-from report import ERROR, TestResult, TestResults, read_test_results
-from s3_helper import S3Helper
+from report import (
+    ERROR,
+    SUCCESS,
+    StatusType,
+    JobReport,
+    TestResult,
+    TestResults,
+    read_test_results,
+)
 from stopwatch import Stopwatch
-from tee_popen import TeePopen
-from upload_result_helper import upload_results
+
+import integration_tests_runner as runner
 
 
 def get_json_params_dict(
@@ -78,14 +74,14 @@ def get_env_for_runner(
     my_env["CLICKHOUSE_TESTS_RUNNER_RESTART_DOCKER"] = "0"
 
     if "analyzer" in check_name.lower():
-        my_env["CLICKHOUSE_USE_NEW_ANALYZER"] = "1"
+        my_env["CLICKHOUSE_USE_OLD_ANALYZER"] = "1"
 
     return my_env
 
 
 def process_results(
     result_directory: Path,
-) -> Tuple[str, str, TestResults, List[Path]]:
+) -> Tuple[StatusType, str, TestResults, List[Path]]:
     test_results = []  # type: TestResults
     additional_files = []
     # Just upload all files from result_directory.
@@ -103,38 +99,41 @@ def process_results(
 
     if len(status) != 1 or len(status[0]) != 2:
         logging.info("Files in result folder %s", os.listdir(result_directory))
-        return "error", "Invalid check_status.tsv", test_results, additional_files
+        return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
 
     try:
         results_path = result_directory / "test_results.tsv"
         test_results = read_test_results(results_path, False)
         if len(test_results) == 0:
-            return "error", "Empty test_results.tsv", test_results, additional_files
+            return ERROR, "Empty test_results.tsv", test_results, additional_files
     except Exception as e:
         return (
-            "error",
+            ERROR,
             f"Cannot parse test_results.tsv ({e})",
             test_results,
             additional_files,
         )
 
-    return state, description, test_results, additional_files
+    return state, description, test_results, additional_files  # type: ignore
 
 
 def parse_args():
     parser = argparse.ArgumentParser()
     parser.add_argument("check_name")
+    parser.add_argument(
+        "--run-tests", nargs="*", help="List of tests to run", default=None
+    )
     parser.add_argument(
         "--validate-bugfix",
         action="store_true",
         help="Check that added tests failed on latest stable",
     )
     parser.add_argument(
-        "--post-commit-status",
-        default="commit_status",
-        choices=["commit_status", "file"],
-        help="Where to public post commit status",
+        "--report-to-file",
+        type=str,
+        default="",
+        help="Path to write script report to (for --validate-bugfix)",
     )
     return parser.parse_args()
 
@@ -148,7 +147,6 @@ def main():
     reports_path = Path(REPORT_PATH)
     temp_path.mkdir(parents=True, exist_ok=True)
 
-    post_commit_path = temp_path / "integration_commit_status.tsv"
     repo_path = Path(REPO_COPY)
 
     args = parse_args()
@@ -161,43 +159,22 @@ def main():
     if "RUN_BY_HASH_NUM" in os.environ:
         run_by_hash_num = int(os.getenv("RUN_BY_HASH_NUM", "0"))
         run_by_hash_total = int(os.getenv("RUN_BY_HASH_TOTAL", "0"))
-        check_name_with_group = (
-            check_name + f" [{run_by_hash_num + 1}/{run_by_hash_total}]"
-        )
     else:
         run_by_hash_num = 0
         run_by_hash_total = 0
-        check_name_with_group = check_name
 
     is_flaky_check = "flaky" in check_name
 
+    assert (
+        not validate_bugfix_check or args.report_to_file
+    ), "--report-to-file must be provided for --validate-bugfix"
+
     # For validate_bugfix_check we need up to date information about labels, so
     # pr_event_from_api is used
-    pr_info = PRInfo(
-        need_changed_files=is_flaky_check or validate_bugfix_check,
-        pr_event_from_api=validate_bugfix_check,
-    )
+    pr_info = PRInfo(need_changed_files=is_flaky_check or validate_bugfix_check)
 
-    if validate_bugfix_check and "pr-bugfix" not in pr_info.labels:
-        if args.post_commit_status == "file":
-            post_commit_status_to_file(
-                post_commit_path,
-                f"Skipped (no pr-bugfix in {pr_info.labels})",
-                "success",
-                "null",
-            )
-        logging.info("Skipping '%s' (no pr-bugfix in '%s')", check_name, pr_info.labels)
-        sys.exit(0)
+    images = [get_docker_image(image_) for image_ in IMAGES]
 
-    gh = GitHub(get_best_robot_token())
-    commit = get_commit(gh, pr_info.sha)
-
-    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)
-
-    images = [pull_image(get_docker_image(i)) for i in IMAGES]
     result_path = temp_path / "output_dir"
     result_path.mkdir(parents=True, exist_ok=True)
 
@@ -230,11 +207,8 @@ def main():
         json_params.write(params_text)
         logging.info("Parameters file %s is written: %s", json_path, params_text)
 
-    output_path_log = result_path / "main_script_log.txt"
-
-    runner_path = repo_path / "tests" / "integration" / "ci-runner.py"
-    run_command = f"sudo -E {runner_path}"
-    logging.info("Going to run command: `%s`", run_command)
+    for k, v in my_env.items():
+        os.environ[k] = v
     logging.info(
         "ENV parameters for runner:\n%s",
         "\n".join(
@@ -242,84 +216,24 @@ def main():
         ),
     )
 
-    ch_helper = ClickHouseHelper()
-    with TeePopen(run_command, output_path_log, my_env) as process:
-        retcode = process.wait()
-        if retcode == 0:
-            logging.info("Run tests successfully")
-        elif retcode == 13:
-            logging.warning(
-                "There were issues with infrastructure. Not writing status report to restart job."
-            )
-            prepared_events = prepare_tests_results_for_clickhouse(
-                pr_info,
-                [
-                    TestResult(
-                        "integration_infrastructure_fail",
-                        "ERROR",
-                        stopwatch.duration_seconds,
-                    )
-                ],
-                ERROR,
-                stopwatch.duration_seconds,
-                stopwatch.start_time_str,
-                "",
-                check_name_with_group,
-            )
-
-            ch_helper.insert_events_into(
-                db="default", table="checks", events=prepared_events
-            )
-            sys.exit(1)
-        else:
-            logging.info("Some tests failed")
-
-    subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
-
-    state, description, test_results, additional_logs = process_results(result_path)
-    state = override_status(state, check_name, invert=validate_bugfix_check)
-
-    s3_helper = S3Helper()
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        [output_path_log] + additional_logs,
-        check_name_with_group,
-    )
-
-    print(f"::notice:: {check_name} Report url: {report_url}")
-    if args.post_commit_status == "commit_status":
-        post_commit_status(
-            commit,
-            state,
-            report_url,
-            description,
-            check_name_with_group,
-            pr_info,
-            dump_to_file=True,
-        )
-    elif args.post_commit_status == "file":
-        post_commit_status_to_file(post_commit_path, description, state, report_url)
+    try:
+        runner.run()
+    except Exception as e:
+        logging.error("Exception: %s", e)
+        state, description, test_results, additional_logs = ERROR, "infrastructure error", [TestResult("infrastructure error", ERROR, stopwatch.duration_seconds)], []  # type: ignore
     else:
-        raise Exception(
-            f'Unknown post_commit_status option "{args.post_commit_status}"'
-        )
+        state, description, test_results, additional_logs = process_results(result_path)
 
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name_with_group,
-    )
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+    ).dump(to_file=args.report_to_file if args.report_to_file else None)
 
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    if state == "failure":
+    if state != SUCCESS:
         sys.exit(1)
 
 
diff --git a/tests/integration/ci-runner.py b/tests/ci/integration_tests_runner.py
similarity index 84%
rename from tests/integration/ci-runner.py
rename to tests/ci/integration_tests_runner.py
index 7c922e339fe..90e2b08386f 100755
--- a/tests/integration/ci-runner.py
+++ b/tests/ci/integration_tests_runner.py
@@ -11,11 +11,15 @@ import shlex
 import shutil
 import string
 import subprocess
+import sys
 import time
+from typing import Any, Dict
 import zlib  # for crc32
 from collections import defaultdict
+from itertools import chain
 
 from integration_test_images import IMAGES
+from env_helper import CI
 
 MAX_RETRY = 1
 NUM_WORKERS = 5
@@ -100,9 +104,9 @@ def get_counters(fname):
         "PASSED": set([]),
         "FAILED": set([]),
         "SKIPPED": set([]),
-    }
+    }  # type: Dict[str, Any]
 
-    with open(fname, "r") as out:
+    with open(fname, "r", encoding="utf-8") as out:
         for line in out:
             line = line.strip()
             # Example of log:
@@ -118,7 +122,7 @@ def get_counters(fname):
             # [gw0] [  7%] ERROR test_mysql_protocol/test.py::test_golang_client
             # ^^^^^^^^^^^^^
             if line.strip().startswith("["):
-                line = re.sub("^\[[^\[\]]*\] \[[^\[\]]*\] ", "", line)
+                line = re.sub(r"^\[[^\[\]]*\] \[[^\[\]]*\] ", "", line)
 
             line_arr = line.split(" ")
             if len(line_arr) < 2:
@@ -160,7 +164,7 @@ def get_counters(fname):
 def parse_test_times(fname):
     read = False
     description_output = []
-    with open(fname, "r") as out:
+    with open(fname, "r", encoding="utf-8") as out:
         for line in out:
             if read and "==" in line:
                 break
@@ -196,7 +200,7 @@ def clear_ip_tables_and_restart_daemons():
             shell=True,
         )
     except subprocess.CalledProcessError as err:
-        logging.info("docker kill excepted: " + str(err))
+        logging.info("docker kill excepted: %s", str(err))
 
     try:
         logging.info("Removing all docker containers")
@@ -205,7 +209,7 @@ def clear_ip_tables_and_restart_daemons():
             shell=True,
         )
     except subprocess.CalledProcessError as err:
-        logging.info("docker rm excepted: " + str(err))
+        logging.info("docker rm excepted: %s", str(err))
 
     # don't restart docker if it's disabled
     if os.environ.get("CLICKHOUSE_TESTS_RUNNER_RESTART_DOCKER", "1") == "1":
@@ -213,7 +217,7 @@ def clear_ip_tables_and_restart_daemons():
             logging.info("Stopping docker daemon")
             subprocess.check_output("service docker stop", shell=True)
         except subprocess.CalledProcessError as err:
-            logging.info("docker stop excepted: " + str(err))
+            logging.info("docker stop excepted: %s", str(err))
 
         try:
             for i in range(200):
@@ -226,9 +230,9 @@ def clear_ip_tables_and_restart_daemons():
                     time.sleep(0.5)
                     logging.info("Waiting docker to start, current %s", str(err))
             else:
-                raise Exception("Docker daemon doesn't responding")
+                raise RuntimeError("Docker daemon doesn't responding")
         except subprocess.CalledProcessError as err:
-            logging.info("Can't reload docker: " + str(err))
+            logging.info("Can't reload docker: %s", str(err))
 
     iptables_iter = 0
     try:
@@ -252,9 +256,7 @@ class ClickhouseIntegrationTestsRunner:
         self.image_versions = self.params["docker_images_with_versions"]
         self.shuffle_groups = self.params["shuffle_test_groups"]
         self.flaky_check = "flaky check" in self.params["context_name"]
-        self.bugfix_validate_check = (
-            "bugfix validate check" in self.params["context_name"]
-        )
+        self.bugfix_validate_check = "bugfix" in self.params["context_name"].lower()
         # if use_tmpfs is not set we assume it to be true, otherwise check
         self.use_tmpfs = "use_tmpfs" not in self.params or self.params["use_tmpfs"]
         self.disable_net_host = (
@@ -263,7 +265,7 @@ class ClickhouseIntegrationTestsRunner:
         self.start_time = time.time()
         self.soft_deadline_time = self.start_time + (TASK_TIMEOUT - MAX_TIME_IN_SANDBOX)
 
-        self.use_analyzer = os.environ.get("CLICKHOUSE_USE_NEW_ANALYZER") is not None
+        self.use_analyzer = os.environ.get("CLICKHOUSE_USE_OLD_ANALYZER") is not None
 
         if "run_by_hash_total" in self.params:
             self.run_by_hash_total = self.params["run_by_hash_total"]
@@ -278,23 +280,24 @@ class ClickhouseIntegrationTestsRunner:
     def base_path(self):
         return os.path.join(str(self.result_path), "../")
 
-    def should_skip_tests(self):
+    @staticmethod
+    def should_skip_tests():
         return []
 
     def get_image_with_version(self, name):
         if name in self.image_versions:
             return name + ":" + self.image_versions[name]
-        logging.warn(
+        logging.warning(
             "Cannot find image %s in params list %s", name, self.image_versions
         )
         if ":" not in name:
             return name + ":latest"
         return name
 
-    def get_image_version(self, name: str):
+    def get_image_version(self, name: str) -> Any:
         if name in self.image_versions:
             return self.image_versions[name]
-        logging.warn(
+        logging.warning(
             "Cannot find image %s in params list %s", name, self.image_versions
         )
         return "latest"
@@ -306,13 +309,9 @@ class ClickhouseIntegrationTestsRunner:
         image_cmd = self._get_runner_image_cmd(repo_path)
 
         cmd = (
-            "cd {repo_path}/tests/integration && "
-            "timeout --signal=KILL 1h ./runner {runner_opts} {image_cmd} --pre-pull --command '{command}' ".format(
-                repo_path=repo_path,
-                runner_opts=self._get_runner_opts(),
-                image_cmd=image_cmd,
-                command=r""" echo Pre Pull finished """,
-            )
+            f"cd {repo_path}/tests/integration && "
+            f"timeout --signal=KILL 1h ./runner {self._get_runner_opts()} {image_cmd} "
+            "--pre-pull --command ' echo Pre Pull finished ' "
         )
 
         for i in range(5):
@@ -324,14 +323,15 @@ class ClickhouseIntegrationTestsRunner:
                 )
                 return
             except subprocess.CalledProcessError as err:
-                logging.info("docker-compose pull failed: " + str(err))
+                logging.info("docker-compose pull failed: %s", str(err))
                 continue
         logging.error("Pulling images failed for 5 attempts. Will fail the worker.")
         # We pass specific retcode to to ci/integration_test_check.py to skip status reporting and restart job
-        exit(13)
+        sys.exit(13)
 
-    def _can_run_with(self, path, opt):
-        with open(path, "r") as script:
+    @staticmethod
+    def _can_run_with(path, opt):
+        with open(path, "r", encoding="utf-8") as script:
             for line in script:
                 if opt in line:
                     return True
@@ -342,6 +342,8 @@ class ClickhouseIntegrationTestsRunner:
             "clickhouse-common-static_",
             "clickhouse-server_",
             "clickhouse-client",
+            "clickhouse-odbc-bridge_",
+            "clickhouse-library-bridge_",
             "clickhouse-common-static-dbg_",
         ):  # order matters
             logging.info("Installing package %s", package)
@@ -351,19 +353,23 @@ class ClickhouseIntegrationTestsRunner:
                     logging.info("Package found in %s", full_path)
                     log_name = "install_" + f + ".log"
                     log_path = os.path.join(str(self.path()), log_name)
-                    with open(log_path, "w") as log:
-                        cmd = "dpkg -x {} .".format(full_path)
+                    with open(log_path, "w", encoding="utf-8") as log:
+                        cmd = f"dpkg -x {full_path} ."
                         logging.info("Executing installation cmd %s", cmd)
-                        retcode = subprocess.Popen(
+                        with subprocess.Popen(
                             cmd, shell=True, stderr=log, stdout=log
-                        ).wait()
-                        if retcode == 0:
-                            logging.info("Installation of %s successfull", full_path)
-                        else:
-                            raise Exception("Installation of %s failed", full_path)
+                        ) as proc:
+                            if proc.wait() == 0:
+                                logging.info(
+                                    "Installation of %s successfull", full_path
+                                )
+                            else:
+                                raise RuntimeError(
+                                    f"Installation of {full_path} failed"
+                                )
                     break
             else:
-                raise Exception("Package with {} not found".format(package))
+                raise FileNotFoundError(f"Package with {package} not found")
         # logging.info("Unstripping binary")
         # logging.info(
         #     "Unstring %s",
@@ -378,22 +384,22 @@ class ClickhouseIntegrationTestsRunner:
         os.chmod(CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH, 0o777)
         os.chmod(CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH, 0o777)
         shutil.copy(
-            CLICKHOUSE_BINARY_PATH, os.getenv("CLICKHOUSE_TESTS_SERVER_BIN_PATH")
+            CLICKHOUSE_BINARY_PATH, os.getenv("CLICKHOUSE_TESTS_SERVER_BIN_PATH")  # type: ignore
         )
         shutil.copy(
             CLICKHOUSE_ODBC_BRIDGE_BINARY_PATH,
-            os.getenv("CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH"),
+            os.getenv("CLICKHOUSE_TESTS_ODBC_BRIDGE_BIN_PATH"),  # type: ignore
         )
         shutil.copy(
             CLICKHOUSE_LIBRARY_BRIDGE_BINARY_PATH,
-            os.getenv("CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH"),
+            os.getenv("CLICKHOUSE_TESTS_LIBRARY_BRIDGE_BIN_PATH"),  # type: ignore
         )
 
-    def _compress_logs(self, dir, relpaths, result_path):
+    @staticmethod
+    def _compress_logs(directory, relpaths, result_path):
         retcode = subprocess.call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
-            "tar --use-compress-program='zstd --threads=0' -cf {} -C {} {}".format(
-                result_path, dir, " ".join(relpaths)
-            ),
+            f"tar --use-compress-program='zstd --threads=0' -cf {result_path} -C "
+            f"{directory} {' '.join(relpaths)}",
             shell=True,
         )
         # tar return 1 when the files are changed on compressing, we ignore it
@@ -445,27 +451,26 @@ class ClickhouseIntegrationTestsRunner:
 
         return list(sorted(all_tests))
 
-    def _get_parallel_tests_skip_list(self, repo_path):
-        skip_list_file_path = "{}/tests/integration/parallel_skip.json".format(
-            repo_path
-        )
+    @staticmethod
+    def _get_parallel_tests_skip_list(repo_path):
+        skip_list_file_path = f"{repo_path}/tests/integration/parallel_skip.json"
         if (
             not os.path.isfile(skip_list_file_path)
             or os.path.getsize(skip_list_file_path) == 0
         ):
-            raise Exception(
-                "There is something wrong with getting all tests list: file '{}' is empty or does not exist.".format(
-                    skip_list_file_path
-                )
+            raise ValueError(
+                "There is something wrong with getting all tests list: "
+                f"file '{skip_list_file_path}' is empty or does not exist."
             )
 
         skip_list_tests = []
-        with open(skip_list_file_path, "r") as skip_list_file:
+        with open(skip_list_file_path, "r", encoding="utf-8") as skip_list_file:
             skip_list_tests = json.load(skip_list_file)
         return list(sorted(skip_list_tests))
 
-    def group_test_by_file(self, tests):
-        result = {}
+    @staticmethod
+    def group_test_by_file(tests):
+        result = {}  # type: Dict
         for test in tests:
             test_file = test.split("::")[0]
             if test_file not in result:
@@ -473,7 +478,8 @@ class ClickhouseIntegrationTestsRunner:
             result[test_file].append(test)
         return result
 
-    def _update_counters(self, main_counters, current_counters, broken_tests):
+    @staticmethod
+    def _update_counters(main_counters, current_counters):
         for test in current_counters["PASSED"]:
             if test not in main_counters["PASSED"]:
                 if test in main_counters["FAILED"]:
@@ -481,21 +487,14 @@ class ClickhouseIntegrationTestsRunner:
                 if test in main_counters["BROKEN"]:
                     main_counters["BROKEN"].remove(test)
 
-                if test not in broken_tests:
-                    main_counters["PASSED"].append(test)
-                else:
-                    main_counters["NOT_FAILED"].append(test)
+                main_counters["PASSED"].append(test)
 
         for state in ("ERROR", "FAILED"):
             for test in current_counters[state]:
                 if test in main_counters["PASSED"]:
                     main_counters["PASSED"].remove(test)
-                if test not in broken_tests:
-                    if test not in main_counters[state]:
-                        main_counters[state].append(test)
-                else:
-                    if test not in main_counters["BROKEN"]:
-                        main_counters["BROKEN"].append(test)
+                if test not in main_counters[state]:
+                    main_counters[state].append(test)
 
         for state in ("SKIPPED",):
             for test in current_counters[state]:
@@ -513,21 +512,23 @@ class ClickhouseIntegrationTestsRunner:
                     logging.info(
                         "Can run with custom docker image version %s", runner_version
                     )
-                    image_cmd += " --docker-image-version={} ".format(runner_version)
+                    image_cmd += f" --docker-image-version={runner_version} "
                 else:
                     if self._can_run_with(
                         os.path.join(repo_path, "tests/integration", "runner"),
                         "--docker-compose-images-tags",
                     ):
-                        image_cmd += "--docker-compose-images-tags={} ".format(
-                            self.get_image_with_version(img)
+                        image_cmd += (
+                            "--docker-compose-images-tags="
+                            f"{self.get_image_with_version(img)} "
                         )
         else:
             image_cmd = ""
             logging.info("Cannot run with custom docker image version :(")
         return image_cmd
 
-    def _find_test_data_dirs(self, repo_path, test_names):
+    @staticmethod
+    def _find_test_data_dirs(repo_path, test_names):
         relpaths = {}
         for test_name in test_names:
             if "/" in test_name:
@@ -545,7 +546,8 @@ class ClickhouseIntegrationTestsRunner:
                     relpaths[relpath] = mtime
         return relpaths
 
-    def _get_test_data_dirs_difference(self, new_snapshot, old_snapshot):
+    @staticmethod
+    def _get_test_data_dirs_difference(new_snapshot, old_snapshot):
         res = set()
         for path in new_snapshot:
             if (path not in old_snapshot) or (old_snapshot[path] != new_snapshot[path]):
@@ -559,7 +561,6 @@ class ClickhouseIntegrationTestsRunner:
         tests_in_group,
         num_tries,
         num_workers,
-        broken_tests,
     ):
         try:
             return self.run_test_group(
@@ -568,17 +569,16 @@ class ClickhouseIntegrationTestsRunner:
                 tests_in_group,
                 num_tries,
                 num_workers,
-                broken_tests,
             )
         except Exception as e:
-            logging.info("Failed to run {}:\n{}".format(str(test_group), str(e)))
+            logging.info("Failed to run %s:\n%s", test_group, e)
             counters = {
                 "ERROR": [],
                 "PASSED": [],
                 "FAILED": [],
                 "SKIPPED": [],
-            }
-            tests_times = defaultdict(float)
+            }  # type: Dict
+            tests_times = defaultdict(float)  # type: Dict
             for test in tests_in_group:
                 counters["ERROR"].append(test)
                 tests_times[test] = 0
@@ -591,7 +591,6 @@ class ClickhouseIntegrationTestsRunner:
         tests_in_group,
         num_tries,
         num_workers,
-        broken_tests,
     ):
         counters = {
             "ERROR": [],
@@ -600,8 +599,8 @@ class ClickhouseIntegrationTestsRunner:
             "SKIPPED": [],
             "BROKEN": [],
             "NOT_FAILED": [],
-        }
-        tests_times = defaultdict(float)
+        }  # type: Dict
+        tests_times = defaultdict(float)  # type: Dict
 
         if self.soft_deadline_time < time.time():
             for test in tests_in_group:
@@ -632,31 +631,27 @@ class ClickhouseIntegrationTestsRunner:
             info_path = os.path.join(repo_path, "tests/integration", info_basename)
 
             test_cmd = " ".join([shlex.quote(test) for test in sorted(test_names)])
-            parallel_cmd = (
-                " --parallel {} ".format(num_workers) if num_workers > 0 else ""
-            )
+            parallel_cmd = f" --parallel {num_workers} " if num_workers > 0 else ""
             # -r -- show extra test summary:
             # -f -- (f)ailed
             # -E -- (E)rror
             # -p -- (p)assed
             # -s -- (s)kipped
-            cmd = "cd {}/tests/integration && timeout --signal=KILL 1h ./runner {} {} -t {} {} -- -rfEps --run-id={} --color=no --durations=0 {} | tee {}".format(
-                repo_path,
-                self._get_runner_opts(),
-                image_cmd,
-                test_cmd,
-                parallel_cmd,
-                i,
-                _get_deselect_option(self.should_skip_tests()),
-                info_path,
+            cmd = (
+                f"cd {repo_path}/tests/integration && "
+                f"timeout --signal=KILL 1h ./runner {self._get_runner_opts()} "
+                f"{image_cmd} -t {test_cmd} {parallel_cmd} -- -rfEps --run-id={i} "
+                f"--color=no --durations=0 {_get_deselect_option(self.should_skip_tests())} "
+                f"| tee {info_path}"
             )
 
             log_basename = test_group_str + "_" + str(i) + ".log"
             log_path = os.path.join(repo_path, "tests/integration", log_basename)
-            with open(log_path, "w") as log:
+            with open(log_path, "w", encoding="utf-8") as log:
                 logging.info("Executing cmd: %s", cmd)
                 # ignore retcode, since it meaningful due to pipe to tee
-                subprocess.Popen(cmd, shell=True, stderr=log, stdout=log).wait()
+                with subprocess.Popen(cmd, shell=True, stderr=log, stdout=log) as proc:
+                    proc.wait()
 
             extra_logs_names = [log_basename]
             log_result_path = os.path.join(
@@ -705,7 +700,7 @@ class ClickhouseIntegrationTestsRunner:
                     )
                 times_lines = parse_test_times(info_path)
                 new_tests_times = get_test_times(times_lines)
-                self._update_counters(counters, new_counters, broken_tests)
+                self._update_counters(counters, new_counters)
                 for test_name, test_time in new_tests_times.items():
                     tests_times[test_name] = test_time
 
@@ -747,11 +742,14 @@ class ClickhouseIntegrationTestsRunner:
             # want to mark them as error so we filter by '::'.
             for test in tests_in_group:
                 if (
-                    test not in counters["PASSED"]
-                    and test not in counters["ERROR"]
-                    and test not in counters["SKIPPED"]
-                    and test not in counters["FAILED"]
-                    and test not in counters["BROKEN"]
+                    test
+                    not in chain(
+                        counters["PASSED"],
+                        counters["ERROR"],
+                        counters["SKIPPED"],
+                        counters["FAILED"],
+                        counters["BROKEN"],
+                    )
                     and "::" in test
                 ):
                     counters["ERROR"].append(test)
@@ -779,7 +777,7 @@ class ClickhouseIntegrationTestsRunner:
             final_retry += 1
             logging.info("Running tests for the %s time", i)
             counters, tests_times, log_paths = self.try_run_test_group(
-                repo_path, "bugfix" if should_fail else "flaky", tests_to_run, 1, 1, []
+                repo_path, "bugfix" if should_fail else "flaky", tests_to_run, 1, 1
             )
             logs += log_paths
             if counters["FAILED"]:
@@ -816,7 +814,7 @@ class ClickhouseIntegrationTestsRunner:
                 (
                     c + " (✕" + str(final_retry) + ")",
                     text_state,
-                    "{:.2f}".format(tests_times[c]),
+                    f"{tests_times[c]:.2f}",
                 )
                 for c in counters[state]
             ]
@@ -838,7 +836,7 @@ class ClickhouseIntegrationTestsRunner:
         self._install_clickhouse(build_path)
 
         logging.info("Pulling images")
-        runner._pre_pull_images(repo_path)
+        self._pre_pull_images(repo_path)
 
         logging.info(
             "Dump iptables before run %s",
@@ -900,7 +898,7 @@ class ClickhouseIntegrationTestsRunner:
             "SKIPPED": [],
             "BROKEN": [],
             "NOT_FAILED": [],
-        }
+        }  # type: Dict
         tests_times = defaultdict(float)
         tests_log_paths = defaultdict(list)
 
@@ -911,16 +909,10 @@ class ClickhouseIntegrationTestsRunner:
             logging.info("Shuffling test groups")
             random.shuffle(items_to_run)
 
-        broken_tests = list()
-        if self.use_analyzer:
-            with open(f"{repo_path}/tests/analyzer_integration_broken_tests.txt") as f:
-                broken_tests = f.read().splitlines()
-            logging.info(f"Broken tests in the list: {len(broken_tests)}")
-
         for group, tests in items_to_run:
             logging.info("Running test group %s containing %s tests", group, len(tests))
             group_counters, group_test_times, log_paths = self.try_run_test_group(
-                repo_path, group, tests, MAX_RETRY, NUM_WORKERS, broken_tests
+                repo_path, group, tests, MAX_RETRY, NUM_WORKERS
             )
             total_tests = 0
             for counter, value in group_counters.items():
@@ -967,12 +959,12 @@ class ClickhouseIntegrationTestsRunner:
             else:
                 text_state = state
             test_result += [
-                (c, text_state, "{:.2f}".format(tests_times[c]), tests_log_paths[c])
+                (c, text_state, f"{tests_times[c]:.2f}", tests_log_paths[c])
                 for c in counters[state]
             ]
 
         failed_sum = len(counters["FAILED"]) + len(counters["ERROR"])
-        status_text = "fail: {}, passed: {}".format(failed_sum, len(counters["PASSED"]))
+        status_text = f"fail: {failed_sum}, passed: {len(counters['PASSED'])}"
 
         if self.soft_deadline_time < time.time():
             status_text = "Timeout, " + status_text
@@ -989,15 +981,15 @@ class ClickhouseIntegrationTestsRunner:
 
 
 def write_results(results_file, status_file, results, status):
-    with open(results_file, "w") as f:
+    with open(results_file, "w", encoding="utf-8") as f:
         out = csv.writer(f, delimiter="\t")
         out.writerows(results)
-    with open(status_file, "w") as f:
+    with open(status_file, "w", encoding="utf-8") as f:
         out = csv.writer(f, delimiter="\t")
         out.writerow(status)
 
 
-if __name__ == "__main__":
+def run():
     logging.basicConfig(level=logging.INFO, format="%(asctime)s %(message)s")
 
     repo_path = os.environ.get("CLICKHOUSE_TESTS_REPO_PATH")
@@ -1005,28 +997,36 @@ if __name__ == "__main__":
     result_path = os.environ.get("CLICKHOUSE_TESTS_RESULT_PATH")
     params_path = os.environ.get("CLICKHOUSE_TESTS_JSON_PARAMS_PATH")
 
-    params = json.loads(open(params_path, "r").read())
+    assert params_path
+    with open(params_path, "r", encoding="utf-8") as jfd:
+        params = json.loads(jfd.read())
     runner = ClickhouseIntegrationTestsRunner(result_path, params)
 
     logging.info("Running tests")
 
-    # Avoid overlaps with previous runs
-    logging.info("Clearing dmesg before run")
-    subprocess.check_call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
-        "dmesg --clear", shell=True
-    )
+    if CI:
+        # Avoid overlaps with previous runs
+        logging.info("Clearing dmesg before run")
+        subprocess.check_call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+            "sudo -E dmesg --clear", shell=True
+        )
 
     state, description, test_results, _ = runner.run_impl(repo_path, build_path)
     logging.info("Tests finished")
 
-    # Dump dmesg (to capture possible OOMs)
-    logging.info("Dumping dmesg")
-    subprocess.check_call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
-        "dmesg -T", shell=True
-    )
+    if CI:
+        # Dump dmesg (to capture possible OOMs)
+        logging.info("Dumping dmesg")
+        subprocess.check_call(  # STYLE_CHECK_ALLOW_SUBPROCESS_CHECK_CALL
+            "sudo -E dmesg -T", shell=True
+        )
 
     status = (state, description)
     out_results_file = os.path.join(str(runner.path()), "test_results.tsv")
     out_status_file = os.path.join(str(runner.path()), "check_status.tsv")
     write_results(out_results_file, out_status_file, test_results, status)
     logging.info("Result written")
+
+
+if __name__ == "__main__":
+    run()
diff --git a/tests/ci/jepsen_check.py b/tests/ci/jepsen_check.py
index 73ae231e7b7..011ecff635e 100644
--- a/tests/ci/jepsen_check.py
+++ b/tests/ci/jepsen_check.py
@@ -5,29 +5,25 @@ import logging
 import os
 import sys
 import time
-
 from pathlib import Path
 from typing import Any, List
 
 import boto3  # type: ignore
-import requests  # type: ignore
-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 RerunHelper, get_commit, post_commit_status
+import requests
+from build_download_helper import (
+    download_build_with_progress,
+    get_build_name_for_check,
+    read_build_urls,
+)
 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 env_helper import REPO_COPY, REPORT_PATH, S3_BUILDS_BUCKET, S3_URL, TEMP_PATH
+from get_robot_token import get_parameter_from_ssm
+from git_helper import git_runner
 from pr_info import PRInfo
-from report import TestResults, TestResult
-from s3_helper import S3Helper
+from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from ssh import SSHKey
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-from version_helper import get_version_from_repo
-from build_check import get_release_or_pr
 
 JEPSEN_GROUP_NAME = "jepsen_group"
 
@@ -50,7 +46,7 @@ FAILED_TESTS_ANCHOR = "# Failed tests"
 def _parse_jepsen_output(path: Path) -> TestResults:
     test_results = []  # type: TestResults
     current_type = ""
-    with open(path, "r") as f:
+    with open(path, "r", encoding="utf-8") as f:
         for line in f:
             if SUCCESSFUL_TESTS_ANCHOR in line:
                 current_type = "OK"
@@ -105,7 +101,7 @@ def prepare_autoscaling_group_and_get_hostnames(count):
         instances = get_autoscaling_group_instances_ids(asg_client, JEPSEN_GROUP_NAME)
         counter += 1
         if counter > 30:
-            raise Exception("Cannot wait autoscaling group")
+            raise RuntimeError("Cannot wait autoscaling group")
 
     ec2_client = boto3.client("ec2", region_name="us-east-1")
     return get_instances_addresses(ec2_client, instances)
@@ -123,12 +119,12 @@ def clear_autoscaling_group():
         instances = get_autoscaling_group_instances_ids(asg_client, JEPSEN_GROUP_NAME)
         counter += 1
         if counter > 30:
-            raise Exception("Cannot wait autoscaling group")
+            raise RuntimeError("Cannot wait autoscaling group")
 
 
 def save_nodes_to_file(instances: List[Any], temp_path: Path) -> Path:
     nodes_path = temp_path / "nodes.txt"
-    with open(nodes_path, "w") as f:
+    with open(nodes_path, "w", encoding="utf-8") as f:
         f.write("\n".join(instances))
         f.flush()
     return nodes_path
@@ -163,7 +159,7 @@ def main():
     )
     args = parser.parse_args()
 
-    if args.program != "server" and args.program != "keeper":
+    if args.program not in ("server", "keeper"):
         logging.warning("Invalid argument '%s'", args.program)
         sys.exit(0)
 
@@ -184,16 +180,8 @@ def main():
         logging.info("Not jepsen test label in labels list, skipping")
         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(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)
 
@@ -212,27 +200,36 @@ def main():
     # always use latest
     docker_image = KEEPER_IMAGE_NAME if args.program == "keeper" else SERVER_IMAGE_NAME
 
-    build_name = get_build_name_for_check(check_name)
-
-    release_or_pr, _ = get_release_or_pr(pr_info, get_version_from_repo())
-
-    # This check run separately from other checks because it requires exclusive
-    # run (see .github/workflows/jepsen.yml) So we cannot add explicit
-    # dependency on a build job and using busy loop on it's results. For the
-    # same reason we are using latest docker image.
-    build_url = (
-        f"{S3_DOWNLOAD}/{S3_BUILDS_BUCKET}/{release_or_pr}/{pr_info.sha}/"
-        f"{build_name}/clickhouse"
-    )
-    head = requests.head(build_url)
-    counter = 0
-    while head.status_code != 200:
-        time.sleep(10)
-        head = requests.head(build_url)
-        counter += 1
-        if counter >= 180:
-            logging.warning("Cannot fetch build in 30 minutes, exiting")
-            sys.exit(0)
+    if pr_info.is_scheduled() or pr_info.is_dispatched():
+        # get latest clcikhouse by the static link for latest master buit - get its version and provide permanent url for this version to the jepsen
+        build_url = f"{S3_URL}/{S3_BUILDS_BUCKET}/master/amd64/clickhouse"
+        download_build_with_progress(build_url, Path(TEMP_PATH) / "clickhouse")
+        git_runner.run(f"chmod +x {TEMP_PATH}/clickhouse")
+        sha = git_runner.run(
+            f"{TEMP_PATH}/clickhouse local -q \"select value from system.build_options where name='GIT_HASH'\""
+        )
+        version_full = git_runner.run(
+            f'{TEMP_PATH}/clickhouse local -q "select version()"'
+        )
+        version = ".".join(version_full.split(".")[0:2])
+        assert len(sha) == 40, f"failed to fetch sha from the binary. result: {sha}"
+        assert (
+            version
+        ), f"failed to fetch version from the binary. result: {version_full}"
+        build_url = (
+            f"{S3_URL}/{S3_BUILDS_BUCKET}/{version}/{sha}/binary_release/clickhouse"
+        )
+        print(f"Clickhouse version: [{version_full}], sha: [{sha}], url: [{build_url}]")
+        head = requests.head(build_url, timeout=60)
+        assert head.status_code == 200, f"Clickhouse binary not found: {build_url}"
+    else:
+        build_name = get_build_name_for_check(check_name)
+        urls = read_build_urls(build_name, REPORT_PATH)
+        build_url = None
+        for url in urls:
+            if url.endswith("clickhouse"):
+                build_url = url
+        assert build_url, "No build url found in the report"
 
     extra_args = ""
     if args.program == "server":
@@ -263,50 +260,34 @@ def main():
             else:
                 logging.info("Run failed")
 
-    status = "success"
+    status = SUCCESS
     description = "No invalid analysis found ヽ(‘ー`)ノ"
     jepsen_log_path = result_path / "jepsen_run_all_tests.log"
     additional_data = []
     try:
         test_result = _parse_jepsen_output(jepsen_log_path)
         if any(r.status == "FAIL" for r in test_result):
-            status = "failure"
+            status = FAILURE
             description = "Found invalid analysis (ﾉಥ益ಥ）ﾉ ┻�┻"
 
         compress_fast(result_path / "store", result_path / "jepsen_store.tar.zst")
         additional_data.append(result_path / "jepsen_store.tar.zst")
     except Exception as ex:
         print("Exception", ex)
-        status = "failure"
+        status = FAILURE
         description = "No Jepsen output log"
         test_result = [TestResult("No Jepsen output log", "FAIL")]
 
-    s3_helper = S3Helper()
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_result,
-        [run_log_path] + additional_data,
-        check_name,
-    )
+    JobReport(
+        description=description,
+        test_results=test_result,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[run_log_path] + additional_data,
+        check_name=check_name,
+    ).dump()
 
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, status, report_url, description, check_name, pr_info, dump_to_file=True
-    )
-
-    ch_helper = ClickHouseHelper()
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_result,
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
     clear_autoscaling_group()
 
 
diff --git a/tests/ci/lambda_shared_package/lambda_shared/__init__.py b/tests/ci/lambda_shared_package/lambda_shared/__init__.py
index 9e6c5dde298..8b53f9dcb23 100644
--- a/tests/ci/lambda_shared_package/lambda_shared/__init__.py
+++ b/tests/ci/lambda_shared_package/lambda_shared/__init__.py
@@ -8,7 +8,7 @@ from collections import namedtuple
 from typing import Any, Dict, Iterable, List, Optional
 
 import boto3  # type: ignore
-import requests  # type: ignore
+import requests
 
 RUNNER_TYPE_LABELS = [
     "builder",
@@ -20,11 +20,12 @@ RUNNER_TYPE_LABELS = [
     "style-checker",
     "style-checker-aarch64",
     # private runners
-    "private-style-checker",
     "private-builder",
+    "private-clickpipes",
     "private-func-tester",
     "private-fuzzer-unit-tester",
     "private-stress-tester",
+    "private-style-checker",
 ]
 
 
diff --git a/tests/ci/lambda_shared_package/lambda_shared/pr.py b/tests/ci/lambda_shared_package/lambda_shared/pr.py
index 4872ecb4d59..4ac787229c0 100644
--- a/tests/ci/lambda_shared_package/lambda_shared/pr.py
+++ b/tests/ci/lambda_shared_package/lambda_shared/pr.py
@@ -43,6 +43,8 @@ TRUSTED_CONTRIBUTORS = {
         "tsolodov",  # ClickHouse, Inc
         "kitaisreal",
         "k-morozov",  # Konstantin Morozov, Yandex Cloud
+        "justindeguzman",  # ClickHouse, Inc
+        "jrdi",  # ClickHouse contributor, TinyBird
     ]
 }
 
@@ -76,6 +78,7 @@ LABELS = {
         "Not for changelog",
     ],
     "pr-performance": ["Performance Improvement"],
+    "pr-ci": ["CI Fix or Improvement (changelog entry is not required)"],
 }
 
 CATEGORY_TO_LABEL = {c: lb for lb, categories in LABELS.items() for c in categories}
@@ -147,10 +150,7 @@ def check_pr_description(pr_body: str, repo_name: str) -> Tuple[str, str]:
     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,
-    ):
+    elif "(changelog entry is not required)" in 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", ""
diff --git a/tests/ci/lambda_shared_package/lambda_shared/token.py b/tests/ci/lambda_shared_package/lambda_shared/token.py
index 6d5653f6a58..f9860f6ad2a 100644
--- a/tests/ci/lambda_shared_package/lambda_shared/token.py
+++ b/tests/ci/lambda_shared_package/lambda_shared/token.py
@@ -6,7 +6,7 @@ from typing import Tuple
 
 import boto3  # type: ignore
 import jwt
-import requests  # type: ignore
+import requests
 
 from . import cached_value_is_valid
 
diff --git a/tests/ci/libfuzzer_test_check.py b/tests/ci/libfuzzer_test_check.py
index 49699b7d2fd..4bb39010978 100644
--- a/tests/ci/libfuzzer_test_check.py
+++ b/tests/ci/libfuzzer_test_check.py
@@ -4,34 +4,18 @@ import argparse
 import logging
 import os
 import sys
-import atexit
 import zipfile
 from pathlib import Path
 from typing import List
 
-from github import Github
-
 from build_download_helper import download_fuzzers
-from clickhouse_helper import (
-    CiLogsCredentials,
-)
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    update_mergeable_check,
-)
-from docker_images_helper import DockerImage, pull_image, get_docker_image
-
-from env_helper import REPORT_PATH, TEMP_PATH, REPO_COPY
-from get_robot_token import get_best_robot_token
+from clickhouse_helper import CiLogsCredentials
+from docker_images_helper import DockerImage, get_docker_image, pull_image
+from env_helper import REPO_COPY, REPORT_PATH, TEMP_PATH
 from pr_info import PRInfo
-from report import TestResults
-
 from stopwatch import Stopwatch
-
 from tee_popen import TeePopen
 
-
 NO_CHANGES_MSG = "Nothing to run"
 
 
@@ -49,7 +33,7 @@ def get_additional_envs(check_name, run_by_hash_num, run_by_hash_total):
         result.append("USE_S3_STORAGE_FOR_MERGE_TREE=1")
         result.append("RANDOMIZE_OBJECT_KEY_TYPE=1")
     if "analyzer" in check_name:
-        result.append("USE_NEW_ANALYZER=1")
+        result.append("USE_OLD_ANALYZER=1")
 
     if run_by_hash_total != 0:
         result.append(f"RUN_BY_HASH_NUM={run_by_hash_num}")
@@ -91,6 +75,7 @@ def get_run_command(
         f"--volume={fuzzers_path}:/fuzzers "
         f"--volume={repo_path}/tests:/usr/share/clickhouse-test "
         f"--volume={result_path}:/test_output "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         f"--cap-add=SYS_PTRACE {env_str} {additional_options_str} {image}"
     )
 
@@ -116,28 +101,16 @@ def main():
     check_name = args.check_name
     kill_timeout = args.kill_timeout
 
-    gh = Github(get_best_robot_token(), per_page=100)
     pr_info = PRInfo()
-    commit = get_commit(gh, pr_info.sha)
-    atexit.register(update_mergeable_check, commit, pr_info, check_name)
 
     temp_path.mkdir(parents=True, exist_ok=True)
 
     if "RUN_BY_HASH_NUM" in os.environ:
         run_by_hash_num = int(os.getenv("RUN_BY_HASH_NUM", "0"))
         run_by_hash_total = int(os.getenv("RUN_BY_HASH_TOTAL", "0"))
-        check_name_with_group = (
-            check_name + f" [{run_by_hash_num + 1}/{run_by_hash_total}]"
-        )
     else:
         run_by_hash_num = 0
         run_by_hash_total = 0
-        check_name_with_group = check_name
-
-    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)
 
     docker_image = pull_image(get_docker_image("clickhouse/libfuzzer"))
 
@@ -151,7 +124,8 @@ def main():
             os.chmod(fuzzers_path / file, 0o777)
         elif file.endswith("_seed_corpus.zip"):
             corpus_path = fuzzers_path / (file.removesuffix("_seed_corpus.zip") + ".in")
-            zipfile.ZipFile(fuzzers_path / file, "r").extractall(corpus_path)
+            with zipfile.ZipFile(fuzzers_path / file, "r") as zfd:
+                zfd.extractall(corpus_path)
 
     result_path = temp_path / "result_path"
     result_path.mkdir(parents=True, exist_ok=True)
diff --git a/tests/ci/mark_release_ready.py b/tests/ci/mark_release_ready.py
index 0ad4b2bd2ed..7ffb3c9a89b 100755
--- a/tests/ci/mark_release_ready.py
+++ b/tests/ci/mark_release_ready.py
@@ -5,12 +5,12 @@ import logging
 import os
 
 from commit_status_helper import get_commit, post_commit_status
-from env_helper import GITHUB_JOB_URL
 from get_robot_token import get_best_robot_token
+from git_helper import commit as commit_arg
 from github_helper import GitHub
 from pr_info import PRInfo
 from release import RELEASE_READY_STATUS
-from git_helper import commit as commit_arg
+from report import SUCCESS
 
 
 def main():
@@ -32,7 +32,6 @@ def main():
         help="if given, used instead of one from PRInfo",
     )
     args = parser.parse_args()
-    url = ""
     description = "the release can be created from the commit, manually set"
     pr_info = None
     if not args.commit:
@@ -40,7 +39,6 @@ def main():
         if pr_info.event == pr_info.default_event:
             raise ValueError("neither launched from the CI nor commit is given")
         args.commit = pr_info.sha
-        url = GITHUB_JOB_URL()
         description = "the release can be created from the commit"
         args.token = args.token or get_best_robot_token()
 
@@ -50,12 +48,11 @@ def main():
     gh.get_rate_limit()
     post_commit_status(
         commit,
-        "success",
-        url,
+        SUCCESS,
+        "",
         description,
         RELEASE_READY_STATUS,
         pr_info,
-        dump_to_file=True,
     )
 
 
diff --git a/tests/ci/merge_pr.py b/tests/ci/merge_pr.py
index 772821f4960..cc92fe4f42c 100644
--- a/tests/ci/merge_pr.py
+++ b/tests/ci/merge_pr.py
@@ -4,21 +4,23 @@
 
 import argparse
 import logging
-
 from datetime import datetime
 from os import getenv
 from pprint import pformat
 from typing import Dict, List
 
+# isort: off
 from github.PaginatedList import PaginatedList
 from github.PullRequestReview import PullRequestReview
 from github.WorkflowRun import WorkflowRun
 
+# isort: on
+
 from commit_status_helper import get_commit_filtered_statuses
 from get_robot_token import get_best_robot_token
 from github_helper import GitHub, NamedUser, PullRequest, Repository
 from pr_info import PRInfo
-
+from report import SUCCESS
 
 # The team name for accepted approvals
 TEAM_NAME = getenv("GITHUB_TEAM_NAME", "core")
@@ -269,7 +271,7 @@ def main():
         failed_statuses = [
             status.context
             for status in get_commit_filtered_statuses(commit)
-            if status.state != "success"
+            if status.state != SUCCESS
         ]
         if failed_statuses:
             logging.warning(
diff --git a/tests/ci/performance_comparison_check.py b/tests/ci/performance_comparison_check.py
index 75f40ae7feb..c238fbae603 100644
--- a/tests/ci/performance_comparison_check.py
+++ b/tests/ci/performance_comparison_check.py
@@ -1,36 +1,38 @@
 #!/usr/bin/env python3
 
-import os
-import logging
-import sys
 import json
-import subprocess
-import traceback
+import logging
+import os
 import re
+import subprocess
+import sys
+import traceback
 from pathlib import Path
-from typing import Dict
 
+# isort: off
 from github import Github
 
-from commit_status_helper import RerunHelper, get_commit, post_commit_status
+# isort: on
+
+from build_download_helper import download_builds_filter
 from ci_config import CI_CONFIG
-from docker_images_helper import pull_image, get_docker_image
+from clickhouse_helper import get_instance_id, get_instance_type
+from commit_status_helper import get_commit
+from docker_images_helper import get_docker_image, pull_image
 from env_helper import (
     GITHUB_EVENT_PATH,
     GITHUB_RUN_URL,
     REPO_COPY,
+    REPORT_PATH,
     S3_BUILDS_BUCKET,
     S3_DOWNLOAD,
     TEMP_PATH,
-    REPORT_PATH,
 )
 from get_robot_token import get_best_robot_token, get_parameter_from_ssm
 from pr_info import PRInfo
-from s3_helper import S3Helper
-from tee_popen import TeePopen
-from clickhouse_helper import get_instance_type, get_instance_id
+from report import FAILURE, SUCCESS, JobReport
 from stopwatch import Stopwatch
-from build_download_helper import download_builds_filter
+from tee_popen import TeePopen
 
 IMAGE_NAME = "clickhouse/performance-comparison"
 
@@ -123,23 +125,7 @@ def main():
 
     is_aarch64 = "aarch64" in os.getenv("CHECK_NAME", "Performance Comparison").lower()
     if pr_info.number != 0 and is_aarch64 and "pr-performance" not in pr_info.labels:
-        status = "success"
-        message = "Skipped, not labeled with 'pr-performance'"
-        report_url = GITHUB_RUN_URL
-        post_commit_status(
-            commit,
-            status,
-            report_url,
-            message,
-            check_name_with_group,
-            pr_info,
-            dump_to_file=True,
-        )
-        sys.exit(0)
-
-    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")
+        print("Skipped, not labeled with 'pr-performance'")
         sys.exit(0)
 
     check_name_prefix = (
@@ -169,7 +155,7 @@ def main():
     }
 
     download_builds_filter(
-        check_name, REPORT_PATH, TEMP_PATH, lambda url: "performance.tar.zst" in url
+        check_name, REPORT_PATH, temp_path, lambda url: "performance.tar.zst" in url
     )
     assert os.path.exists(f"{TEMP_PATH}/performance.tar.zst"), "Perf artifact not found"
 
@@ -202,6 +188,13 @@ def main():
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
+    def too_many_slow(msg):
+        match = re.search(r"(|.* )(\d+) slower.*", msg)
+        # This threshold should be synchronized with the value in
+        # https://github.com/ClickHouse/ClickHouse/blob/master/docker/test/performance-comparison/report.py#L629
+        threshold = 5
+        return int(match.group(2).strip()) > threshold if match else False
+
     paths = {
         "compare.log": compare_log_path,
         "output.7z": result_path / "output.7z",
@@ -212,32 +205,12 @@ def main():
         "run.log": run_log_path,
     }
 
-    s3_prefix = f"{pr_info.number}/{pr_info.sha}/{check_name_prefix}/"
-    s3_helper = S3Helper()
-    uploaded = {}  # type: Dict[str, str]
-    for name, path in paths.items():
-        try:
-            uploaded[name] = s3_helper.upload_test_report_to_s3(
-                Path(path), s3_prefix + name
-            )
-        except Exception:
-            uploaded[name] = ""
-            traceback.print_exc()
-
-    # Upload all images and flamegraphs to S3
-    try:
-        s3_helper.upload_test_directory_to_s3(
-            Path(result_path) / "images", s3_prefix + "images"
-        )
-    except Exception:
-        traceback.print_exc()
-
-    def too_many_slow(msg):
-        match = re.search(r"(|.* )(\d+) slower.*", msg)
-        # This threshold should be synchronized with the value in
-        # https://github.com/ClickHouse/ClickHouse/blob/master/docker/test/performance-comparison/report.py#L629
-        threshold = 5
-        return int(match.group(2).strip()) > threshold if match else False
+    # FIXME: where images come from? dir does not exist atm.
+    image_files = (
+        list((Path(result_path) / "images").iterdir())
+        if (Path(result_path) / "images").exists()
+        else []
+    )
 
     # Try to fetch status from the report.
     status = ""
@@ -253,42 +226,33 @@ def main():
             message = message_match.group(1).strip()
 
         # TODO: Remove me, always green mode for the first time, unless errors
-        status = "success"
+        status = SUCCESS
         if "errors" in message.lower() or too_many_slow(message.lower()):
-            status = "failure"
+            status = FAILURE
         # TODO: Remove until here
     except Exception:
         traceback.print_exc()
-        status = "failure"
+        status = FAILURE
         message = "Failed to parse the report."
 
     if not status:
-        status = "failure"
+        status = FAILURE
         message = "No status in report."
     elif not message:
-        status = "failure"
+        status = FAILURE
         message = "No message in report."
 
-    report_url = GITHUB_RUN_URL
+    JobReport(
+        description=message,
+        test_results=[],
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[v for _, v in paths.items()] + image_files,
+        check_name=check_name_with_group,
+    ).dump()
 
-    report_url = (
-        uploaded["report.html"]
-        or uploaded["output.7z"]
-        or uploaded["compare.log"]
-        or uploaded["run.log"]
-    )
-
-    post_commit_status(
-        commit,
-        status,
-        report_url,
-        message,
-        check_name_with_group,
-        pr_info,
-        dump_to_file=True,
-    )
-
-    if status == "error":
+    if status != SUCCESS:
         sys.exit(1)
 
 
diff --git a/tests/ci/pr_info.py b/tests/ci/pr_info.py
index 15558c81c7e..204284785c9 100644
--- a/tests/ci/pr_info.py
+++ b/tests/ci/pr_info.py
@@ -2,25 +2,31 @@
 import json
 import logging
 import os
+import re
 from typing import Dict, List, Set, Union
+from urllib.parse import quote
 
+# isort: off
+# for some reason this line moves to the end
 from unidiff import PatchSet  # type: ignore
 
+# isort: on
+
 from build_download_helper import get_gh_api
 from env_helper import (
-    GITHUB_REPOSITORY,
-    GITHUB_SERVER_URL,
-    GITHUB_RUN_URL,
     GITHUB_EVENT_PATH,
+    GITHUB_REPOSITORY,
+    GITHUB_RUN_URL,
+    GITHUB_SERVER_URL,
 )
 
-FORCE_TESTS_LABEL = "force tests"
 SKIP_MERGEABLE_CHECK_LABEL = "skip mergeable check"
 NeedsDataType = Dict[str, Dict[str, Union[str, Dict[str, str]]]]
 
 DIFF_IN_DOCUMENTATION_EXT = [
     ".html",
     ".md",
+    ".mdx",
     ".yml",
     ".txt",
     ".css",
@@ -38,6 +44,15 @@ DIFF_IN_DOCUMENTATION_EXT = [
 RETRY_SLEEP = 0
 
 
+class EventType:
+    UNKNOWN = "unknown"
+    PUSH = "commits"
+    PULL_REQUEST = "pull_request"
+    SCHEDULE = "schedule"
+    DISPATCH = "dispatch"
+    MERGE_QUEUE = "merge_group"
+
+
 def get_pr_for_commit(sha, ref):
     if not ref:
         return None
@@ -61,11 +76,13 @@ def get_pr_for_commit(sha, ref):
             if pr["head"]["ref"] in ref:
                 return pr
             our_prs.append(pr)
-        print("Cannot find PR with required ref", ref, "returning first one")
+        print(
+            f"Cannot find PR with required ref {ref}, sha {sha} - returning first one"
+        )
         first_pr = our_prs[0]
         return first_pr
     except Exception as ex:
-        print("Cannot fetch PR info from commit", ex)
+        print(f"Cannot fetch PR info from commit {ref}, {sha}", ex)
     return None
 
 
@@ -99,6 +116,13 @@ class PRInfo:
         # release_pr and merged_pr are used for docker images additional cache
         self.release_pr = 0
         self.merged_pr = 0
+        self.labels = set()
+
+        repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"
+        self.task_url = GITHUB_RUN_URL
+        self.repo_full_name = GITHUB_REPOSITORY
+
+        self.event_type = EventType.UNKNOWN
         ref = github_event.get("ref", "refs/heads/master")
         if ref and ref.startswith("refs/heads/"):
             ref = ref[11:]
@@ -115,6 +139,7 @@ class PRInfo:
                 github_event["pull_request"] = prs_for_sha[0]
 
         if "pull_request" in github_event:  # pull request and other similar events
+            self.event_type = EventType.PULL_REQUEST
             self.number = github_event["pull_request"]["number"]  # type: int
             if pr_event_from_api:
                 try:
@@ -137,10 +162,6 @@ class PRInfo:
             else:
                 self.sha = github_event["pull_request"]["head"]["sha"]
 
-            repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"
-            self.task_url = GITHUB_RUN_URL
-
-            self.repo_full_name = GITHUB_REPOSITORY
             self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
             self.pr_html_url = f"{repo_prefix}/pull/{self.number}"
 
@@ -159,7 +180,7 @@ class PRInfo:
             self.body = github_event["pull_request"]["body"]
             self.labels = {
                 label["name"] for label in github_event["pull_request"]["labels"]
-            }  # type: Set[str]
+            }
 
             self.user_login = github_event["pull_request"]["user"]["login"]  # type: str
             self.user_orgs = set()  # type: Set[str]
@@ -174,7 +195,31 @@ class PRInfo:
 
             self.diff_urls.append(self.compare_pr_url(github_event["pull_request"]))
 
+        elif (
+            EventType.MERGE_QUEUE in github_event
+        ):  # pull request and other similar events
+            self.event_type = EventType.MERGE_QUEUE
+            # FIXME: need pr? we can parse it from ["head_ref": "refs/heads/gh-readonly-queue/test-merge-queue/pr-6751-4690229995a155e771c52e95fbd446d219c069bf"]
+            self.number = 0
+            self.sha = github_event[EventType.MERGE_QUEUE]["head_sha"]
+            self.base_ref = github_event[EventType.MERGE_QUEUE]["base_ref"]
+            base_sha = github_event[EventType.MERGE_QUEUE]["base_sha"]  # type: str
+            # ClickHouse/ClickHouse
+            self.base_name = github_event["repository"]["full_name"]
+            # any_branch-name - the name of working branch name
+            self.head_ref = github_event[EventType.MERGE_QUEUE]["head_ref"]
+            # UserName/ClickHouse or ClickHouse/ClickHouse
+            self.head_name = self.base_name
+            self.user_login = github_event["sender"]["login"]
+            self.diff_urls.append(
+                github_event["repository"]["compare_url"]
+                .replace("{base}", base_sha)
+                .replace("{head}", self.sha)
+            )
+            self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
+
         elif "commits" in github_event:
+            self.event_type = EventType.PUSH
             # `head_commit` always comes with `commits`
             commit_message = github_event["head_commit"]["message"]  # type: str
             if commit_message.startswith("Merge pull request #"):
@@ -185,10 +230,8 @@ class PRInfo:
                     logging.error("Failed to convert %s to integer", merged_pr)
             self.sha = github_event["after"]
             pull_request = get_pr_for_commit(self.sha, github_event["ref"])
-            repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"
-            self.task_url = GITHUB_RUN_URL
             self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
-            self.repo_full_name = GITHUB_REPOSITORY
+
             if pull_request is None or pull_request["state"] == "closed":
                 # it's merged PR to master
                 self.number = 0
@@ -243,17 +286,18 @@ class PRInfo:
                         )
                     )
         else:
+            if "schedule" in github_event:
+                self.event_type = EventType.SCHEDULE
+            else:
+                # assume this is a dispatch
+                self.event_type = EventType.DISPATCH
             print("event.json does not match pull_request or push:")
             print(json.dumps(github_event, sort_keys=True, indent=4))
             self.sha = os.getenv(
                 "GITHUB_SHA", "0000000000000000000000000000000000000000"
             )
             self.number = 0
-            self.labels = set()
-            repo_prefix = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}"
-            self.task_url = GITHUB_RUN_URL
             self.commit_html_url = f"{repo_prefix}/commits/{self.sha}"
-            self.repo_full_name = GITHUB_REPOSITORY
             self.pr_html_url = f"{repo_prefix}/commits/{ref}"
             self.base_ref = ref
             self.base_name = self.repo_full_name
@@ -263,17 +307,44 @@ class PRInfo:
         if need_changed_files:
             self.fetch_changed_files()
 
+    def is_master(self) -> bool:
+        return self.number == 0 and self.head_ref == "master"
+
+    def is_release(self) -> bool:
+        return self.number == 0 and bool(
+            re.match(r"^2[1-9]\.[1-9][0-9]*$", self.head_ref)
+        )
+
+    def is_release_branch(self) -> bool:
+        return self.number == 0
+
+    def is_pr(self):
+        return self.event_type == EventType.PULL_REQUEST
+
+    def is_scheduled(self):
+        return self.event_type == EventType.SCHEDULE
+
+    def is_merge_queue(self):
+        return self.event_type == EventType.MERGE_QUEUE
+
+    def is_dispatched(self):
+        return self.event_type == EventType.DISPATCH
+
     def compare_pr_url(self, pr_object: dict) -> str:
         return self.compare_url(pr_object["base"]["label"], pr_object["head"]["label"])
 
     @staticmethod
     def compare_url(first: str, second: str) -> str:
+        """the first and second are URL encoded to not fail on '#' and other symbols"""
         return (
             "https://api.github.com/repos/"
-            f"{GITHUB_REPOSITORY}/compare/{first}...{second}"
+            f"{GITHUB_REPOSITORY}/compare/{quote(first)}...{quote(second)}"
         )
 
     def fetch_changed_files(self):
+        if self.changed_files_requested:
+            return
+
         if not getattr(self, "diff_urls", False):
             raise TypeError("The event does not have diff URLs")
 
@@ -333,6 +404,7 @@ class PRInfo:
                 (ext in DIFF_IN_DOCUMENTATION_EXT and path_in_docs)
                 or "docker/docs" in f
                 or "docs_check.py" in f
+                or "aspell-dict.txt" in f
                 or ext == ".md"
             ):
                 return False
diff --git a/tests/ci/release.py b/tests/ci/release.py
index f96845dad95..b7ccc59f7c1 100755
--- a/tests/ci/release.py
+++ b/tests/ci/release.py
@@ -7,6 +7,13 @@ The `gh` CLI preferred over the PyGithub to have an easy way to rollback bad
 release in command line by simple execution giving rollback commands
 
 On another hand, PyGithub is used for convenient getting commit's status from API
+
+To run this script on a freshly installed Ubuntu 22.04 system, it is enough to do the following commands:
+
+sudo apt install pip
+pip install requests boto3 github PyGithub
+sudo snap install gh
+gh auth login
 """
 
 
@@ -18,6 +25,7 @@ from contextlib import contextmanager
 from typing import Any, Final, Iterator, List, Optional, Tuple
 
 from git_helper import Git, commit, release_branch
+from report import SUCCESS
 from version_helper import (
     FILE_WITH_VERSION_PATH,
     GENERATED_CONTRIBUTORS,
@@ -53,7 +61,7 @@ class Repo:
         elif protocol == "origin":
             self._url = protocol
         else:
-            raise Exception(f"protocol must be in {self.VALID}")
+            raise ValueError(f"protocol must be in {self.VALID}")
 
     def __str__(self):
         return self._repo
@@ -142,8 +150,8 @@ class Release:
 
             for status in statuses:
                 if status["context"] == RELEASE_READY_STATUS:
-                    if not status["state"] == "success":
-                        raise Exception(
+                    if not status["state"] == SUCCESS:
+                        raise ValueError(
                             f"the status {RELEASE_READY_STATUS} is {status['state']}"
                             ", not success"
                         )
@@ -152,7 +160,7 @@ class Release:
 
             page += 1
 
-        raise Exception(
+        raise KeyError(
             f"the status {RELEASE_READY_STATUS} "
             f"is not found for commit {self.release_commit}"
         )
@@ -187,7 +195,7 @@ class Release:
                 raise
 
         if check_run_from_master and self._git.branch != "master":
-            raise Exception("the script must be launched only from master")
+            raise RuntimeError("the script must be launched only from master")
 
         self.set_release_info()
 
@@ -228,7 +236,7 @@ class Release:
     def check_no_tags_after(self):
         tags_after_commit = self.run(f"git tag --contains={self.release_commit}")
         if tags_after_commit:
-            raise Exception(
+            raise RuntimeError(
                 f"Commit {self.release_commit} belongs to following tags:\n"
                 f"{tags_after_commit}\nChoose another commit"
             )
@@ -252,7 +260,7 @@ class Release:
             )
         output = self.run(f"git branch --contains={self.release_commit} {branch}")
         if branch not in output:
-            raise Exception(
+            raise RuntimeError(
                 f"commit {self.release_commit} must belong to {branch} "
                 f"for {self.release_type} release"
             )
@@ -463,9 +471,9 @@ class Release:
             logging.warning("Rolling back checked out %s for %s", ref, orig_ref)
             self.run(f"git reset --hard; git checkout -f {orig_ref}")
             raise
-        else:
-            if with_checkout_back and need_rollback:
-                self.run(rollback_cmd)
+        # Normal flow when we need to checkout back
+        if with_checkout_back and need_rollback:
+            self.run(rollback_cmd)
 
     @contextmanager
     def _create_branch(self, name: str, start_point: str = "") -> Iterator[None]:
diff --git a/tests/ci/report.py b/tests/ci/report.py
index bf400aebd4b..a3c9b53637a 100644
--- a/tests/ci/report.py
+++ b/tests/ci/report.py
@@ -1,18 +1,29 @@
 # -*- coding: utf-8 -*-
-from ast import literal_eval
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Dict, Final, Iterable, List, Literal, Optional, Tuple
-from html import escape
 import csv
 import datetime
 import json
 import logging
 import os
+from ast import literal_eval
+from dataclasses import asdict, dataclass
+from html import escape
+from pathlib import Path
+from typing import (
+    Dict,
+    Final,
+    Iterable,
+    List,
+    Literal,
+    Optional,
+    Sequence,
+    Tuple,
+    Union,
+)
 
 from build_download_helper import get_gh_api
-from ci_config import BuildConfig, CI_CONFIG
-
+from ci_config import CI_CONFIG, BuildConfig
+from ci_utils import normalize_string
+from env_helper import REPORT_PATH, TEMP_PATH
 
 logger = logging.getLogger(__name__)
 
@@ -23,28 +34,31 @@ SUCCESS: Final = "success"
 
 OK: Final = "OK"
 FAIL: Final = "FAIL"
+SKIPPED: Final = "SKIPPED"
 
 StatusType = Literal["error", "failure", "pending", "success"]
+STATUSES = [ERROR, FAILURE, PENDING, SUCCESS]  # type: List[StatusType]
+
+
 # The order of statuses from the worst to the best
-_STATES = {ERROR: 0, FAILURE: 1, PENDING: 2, SUCCESS: 3}
+def _state_rank(status: str) -> int:
+    "return the index of status or index of SUCCESS in case of wrong status"
+    try:
+        return STATUSES.index(status)  # type: ignore
+    except ValueError:
+        return 3
 
 
-def get_worst_status(statuses: Iterable[str]) -> str:
-    worst_status = None
+def get_worst_status(statuses: Iterable[str]) -> StatusType:
+    worst_status = SUCCESS  # type: StatusType
     for status in statuses:
-        if _STATES.get(status) is None:
-            continue
-        if worst_status is None:
-            worst_status = status
-            continue
-        if _STATES.get(status) < _STATES.get(worst_status):
-            worst_status = status
+        ind = _state_rank(status)
+        if ind < _state_rank(worst_status):
+            worst_status = STATUSES[ind]
 
         if worst_status == ERROR:
             break
 
-    if worst_status is None:
-        return ""
     return worst_status
 
 
@@ -221,6 +235,7 @@ HTML_TEST_PART = """
 """
 
 BASE_HEADERS = ["Test name", "Test status"]
+JOB_REPORT_FILE = Path(TEMP_PATH) / "job_report.json"
 
 
 @dataclass
@@ -229,10 +244,10 @@ class TestResult:
     status: str
     # the following fields are optional
     time: Optional[float] = None
-    log_files: Optional[List[Path]] = None
+    log_files: Optional[Union[Sequence[str], Sequence[Path]]] = None
     raw_logs: Optional[str] = None
     # the field for uploaded logs URLs
-    log_urls: Optional[List[str]] = None
+    log_urls: Optional[Sequence[str]] = None
 
     def set_raw_logs(self, raw_logs: str) -> None:
         self.raw_logs = raw_logs
@@ -245,9 +260,8 @@ class TestResult:
                 f"Malformed input: must be a list literal: {log_files_literal}"
             )
         for log_path in log_paths:
-            file = Path(log_path)
-            assert file.exists(), file
-            self.log_files.append(file)
+            assert Path(log_path).exists(), log_path
+            self.log_files.append(log_path)
 
     @staticmethod
     def create_check_timeout_expired(timeout: float) -> "TestResult":
@@ -257,6 +271,58 @@ class TestResult:
 TestResults = List[TestResult]
 
 
+@dataclass
+class JobReport:
+    status: str
+    description: str
+    test_results: TestResults
+    start_time: str
+    duration: float
+    additional_files: Union[Sequence[str], Sequence[Path]]
+    # clcikhouse version, build job only
+    version: str = ""
+    # checkname to set in commit status, set if differs from jjob name
+    check_name: str = ""
+    # directory with artifacts to upload on s3
+    build_dir_for_upload: Union[Path, str] = ""
+    # if False no GH commit status will be created by CI
+    need_commit_status: bool = True
+
+    def __post_init__(self):
+        assert self.status in (SUCCESS, ERROR, FAILURE, PENDING)
+
+    @classmethod
+    def exist(cls) -> bool:
+        return JOB_REPORT_FILE.is_file()
+
+    @classmethod
+    def load(cls, from_file=None):  # type: ignore
+        res = {}
+        from_file = from_file or JOB_REPORT_FILE
+        with open(from_file, "r", encoding="utf-8") as json_file:
+            res = json.load(json_file)
+            # Deserialize the nested lists of TestResult
+            test_results_data = res.get("test_results", [])
+            test_results = [TestResult(**result) for result in test_results_data]
+            del res["test_results"]
+        return JobReport(test_results=test_results, **res)
+
+    @classmethod
+    def cleanup(cls):
+        if JOB_REPORT_FILE.exists():
+            JOB_REPORT_FILE.unlink()
+
+    def dump(self, to_file=None):
+        def path_converter(obj):
+            if isinstance(obj, Path):
+                return str(obj)
+            raise TypeError("Type not serializable")
+
+        to_file = to_file or JOB_REPORT_FILE
+        with open(to_file, "w", encoding="utf-8") as json_file:
+            json.dump(asdict(self), json_file, default=path_converter, indent=2)
+
+
 def read_test_results(results_path: Path, with_raw_logs: bool = True) -> TestResults:
     results = []  # type: TestResults
     with open(results_path, "r", encoding="utf-8") as descriptor:
@@ -296,14 +362,72 @@ class BuildResult:
     log_url: str
     build_urls: List[str]
     version: str
-    status: StatusType
+    status: str
     elapsed_seconds: int
     job_api_url: str
+    pr_number: int = 0
+    head_ref: str = "dummy_branch_name"
     _job_name: Optional[str] = None
     _job_html_url: Optional[str] = None
     _job_html_link: Optional[str] = None
     _grouped_urls: Optional[List[List[str]]] = None
 
+    @classmethod
+    def cleanup(cls):
+        if Path(REPORT_PATH).exists():
+            for file in Path(REPORT_PATH).iterdir():
+                if "build_report" in file.name and file.name.endswith(".json"):
+                    file.unlink()
+
+    @classmethod
+    def load(cls, build_name: str, pr_number: int, head_ref: str):  # type: ignore
+        """
+        loads report from a report file matched with given @pr_number and/or a @head_ref
+        """
+        report_path = Path(REPORT_PATH) / BuildResult.get_report_name(
+            build_name, pr_number or head_ref
+        )
+        return cls.load_from_file(report_path)
+
+    @classmethod
+    def load_any(cls, build_name: str, pr_number: int, head_ref: str):  # type: ignore
+        """
+        loads report from suitable report file with the following priority:
+            1. report from PR with the same @pr_number
+            2. report from branch with the same @head_ref
+            3. report from the master
+            4. any other report
+        """
+        reports = []
+        for file in Path(REPORT_PATH).iterdir():
+            if f"{build_name}.json" in file.name:
+                reports.append(file)
+        if not reports:
+            return None
+        file_path = None
+        for file in reports:
+            if pr_number and f"_{pr_number}_" in file.name:
+                file_path = file
+                break
+            if f"_{head_ref}_" in file.name:
+                file_path = file
+                break
+            if "_master_" in file.name:
+                file_path = file
+                break
+        return cls.load_from_file(file_path or reports[-1])
+
+    @classmethod
+    def load_from_file(cls, file: Union[Path, str]):  # type: ignore
+        if not Path(file).exists():
+            return None
+        with open(file, "r", encoding="utf-8") as json_file:
+            res = json.load(json_file)
+        return BuildResult(**res)
+
+    def as_json(self) -> str:
+        return json.dumps(asdict(self), indent=2)
+
     @property
     def build_config(self) -> Optional[BuildConfig]:
         return CI_CONFIG.build_config.get(self.build_name, None)
@@ -332,6 +456,12 @@ class BuildResult:
             return self._wrong_config_message
         return self.build_config.sanitizer
 
+    @property
+    def coverage(self) -> str:
+        if self.build_config is None:
+            return self._wrong_config_message
+        return str(self.build_config.coverage)
+
     @property
     def grouped_urls(self) -> List[List[str]]:
         "Combine and preserve build_urls by artifact types"
@@ -373,10 +503,6 @@ class BuildResult:
     def _wrong_config_message(self) -> str:
         return "missing"
 
-    @property
-    def file_name(self) -> Path:
-        return self.get_report_name(self.build_name)
-
     @property
     def is_missing(self) -> bool:
         "The report is created for missing json file"
@@ -427,37 +553,18 @@ class BuildResult:
         self._job_html_url = job_data.get("html_url", "")
 
     @staticmethod
-    def get_report_name(name: str) -> Path:
-        return Path(f"build_report_{name}.json")
-
-    @staticmethod
-    def read_json(directory: Path, build_name: str) -> "BuildResult":
-        path = directory / BuildResult.get_report_name(build_name)
-        try:
-            with open(path, "r", encoding="utf-8") as pf:
-                data = json.load(pf)  # type: dict
-        except FileNotFoundError:
-            logger.warning(
-                "File %s for build named '%s' is not found", path, build_name
-            )
-            return BuildResult.missing_result(build_name)
-
-        return BuildResult(
-            data.get("build_name", build_name),
-            data.get("log_url", ""),
-            data.get("build_urls", []),
-            data.get("version", ""),
-            data.get("status", ERROR),
-            data.get("elapsed_seconds", 0),
-            data.get("job_api_url", ""),
-        )
+    def get_report_name(name: str, suffix: Union[str, int]) -> Path:
+        assert "/" not in str(suffix)
+        return Path(f"build_report_{suffix}_{name}.json")
 
     @staticmethod
     def missing_result(build_name: str) -> "BuildResult":
         return BuildResult(build_name, "", [], "missing", ERROR, 0, "missing")
 
-    def write_json(self, directory: Path) -> Path:
-        path = directory / self.file_name
+    def write_json(self, directory: Union[Path, str] = REPORT_PATH) -> Path:
+        path = Path(directory) / self.get_report_name(
+            self.build_name, self.pr_number or normalize_string(self.head_ref)
+        )
         path.write_text(
             json.dumps(
                 {
@@ -468,6 +575,8 @@ class BuildResult:
                     "status": self.status,
                     "elapsed_seconds": self.elapsed_seconds,
                     "job_api_url": self.job_api_url,
+                    "pr_number": self.pr_number,
+                    "head_ref": self.head_ref,
                 }
             ),
             encoding="utf-8",
@@ -491,7 +600,6 @@ class ReportColorTheme:
         blue = "#00B4FF"
 
     default = (ReportColor.green, ReportColor.red, ReportColor.yellow)
-    bugfixcheck = (ReportColor.yellow, ReportColor.blue, ReportColor.blue)
 
 
 ColorTheme = Tuple[str, str, str]
@@ -532,10 +640,17 @@ def _get_status_style(status: str, colortheme: Optional[ColorTheme] = None) -> s
 
 
 def _get_html_url_name(url):
+    base_name = ""
     if isinstance(url, str):
-        return os.path.basename(url).replace("%2B", "+").replace("%20", " ")
+        base_name = os.path.basename(url)
     if isinstance(url, tuple):
-        return url[1].replace("%2B", "+").replace("%20", " ")
+        base_name = url[1]
+
+    if "?" in base_name:
+        base_name = base_name.split("?")[0]
+
+    if base_name is not None:
+        return base_name.replace("%2B", "+").replace("%20", " ")
     return None
 
 
@@ -672,6 +787,7 @@ HTML_BASE_BUILD_TEMPLATE = (
 <th>Build type</th>
 <th>Version</th>
 <th>Sanitizer</th>
+<th>Coverage</th>
 <th>Status</th>
 <th>Build log</th>
 <th>Build time</th>
@@ -713,6 +829,8 @@ def create_build_html_report(
             else:
                 row.append("<td>none</td>")
 
+            row.append(f"<td>{build_result.coverage}</td>")
+
             if build_result.status:
                 style = _get_status_style(build_result.status)
                 row.append(f'<td style="{style}">{build_result.status}</td>')
@@ -744,7 +862,7 @@ def create_build_html_report(
                 build_result.build_config is not None
                 and build_result.build_config.sparse_checkout
             ):
-                comment += " (note: sparse checkout is used)"
+                comment += " (note: sparse checkout is used, see update-submodules.sh)"
             row.append(f"<td>{comment}</td>")
 
             row.append("</tr>")
diff --git a/tests/ci/run_check.py b/tests/ci/run_check.py
index 108aa7d1946..435a5f726f2 100644
--- a/tests/ci/run_check.py
+++ b/tests/ci/run_check.py
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
-import atexit
-import sys
 import logging
+import sys
 from typing import Tuple
 
+# isort: off
 from github import Github
 
+# isort: on
+
 from commit_status_helper import (
     CI_STATUS_NAME,
     create_ci_report,
@@ -14,17 +16,17 @@ from commit_status_helper import (
     post_commit_status,
     post_labels,
     remove_labels,
-    update_mergeable_check,
 )
 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 lambda_shared_package.lambda_shared.pr import (
     CATEGORY_TO_LABEL,
     TRUSTED_CONTRIBUTORS,
     check_pr_description,
 )
-from report import FAILURE
+from pr_info import PRInfo
+from report import FAILURE, PENDING, SUCCESS
+from cherry_pick import Labels
 
 TRUSTED_ORG_IDS = {
     54801242,  # clickhouse
@@ -35,6 +37,8 @@ CAN_BE_TESTED_LABEL = "can be tested"
 FEATURE_LABEL = "pr-feature"
 SUBMODULE_CHANGED_LABEL = "submodule changed"
 PR_CHECK = "PR Check"
+# pr-bugfix autoport can lead to issues in releases, let's do ci fixes only
+AUTO_BACKPORT_LABELS = ["pr-ci"]
 
 
 def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
@@ -63,9 +67,6 @@ def pr_is_by_trusted_user(pr_user_login, pr_user_orgs):
 def should_run_ci_for_pr(pr_info: PRInfo) -> Tuple[bool, str]:
     # Consider the labels and whether the user is trusted.
     print("Got labels", pr_info.labels)
-    if FORCE_TESTS_LABEL in pr_info.labels:
-        print(f"Label '{FORCE_TESTS_LABEL}' set, forcing remaining checks")
-        return True, f"Labeled '{FORCE_TESTS_LABEL}'"
 
     if OK_SKIP_LABELS.intersection(pr_info.labels):
         return True, "Don't try new checks for release/backports/cherry-picks"
@@ -99,7 +100,6 @@ def main():
     description = format_description(description)
     gh = Github(get_best_robot_token(), per_page=100)
     commit = get_commit(gh, pr_info.sha)
-    atexit.register(update_mergeable_check, commit, pr_info, PR_CHECK)
 
     description_error, category = check_pr_description(pr_info.body, GITHUB_REPOSITORY)
     pr_labels_to_add = []
@@ -123,6 +123,15 @@ def main():
     elif SUBMODULE_CHANGED_LABEL in pr_info.labels:
         pr_labels_to_remove.append(SUBMODULE_CHANGED_LABEL)
 
+    if any(label in AUTO_BACKPORT_LABELS for label in pr_labels_to_add):
+        backport_labels = [Labels.MUST_BACKPORT, Labels.MUST_BACKPORT_CLOUD]
+        pr_labels_to_add += [
+            label for label in backport_labels if label not in pr_info.labels
+        ]
+        print(
+            f"::notice :: Add backport labels [{backport_labels}] for a given PR category"
+        )
+
     print(f"Change labels: add {pr_labels_to_add}, remove {pr_labels_to_remove}")
     if pr_labels_to_add:
         post_labels(gh, pr_info, pr_labels_to_add)
@@ -146,7 +155,7 @@ def main():
         )
         post_commit_status(
             commit,
-            "failure",
+            FAILURE,
             url,
             format_description(description_error),
             PR_CHECK,
@@ -170,20 +179,40 @@ def main():
         # allow the workflow to continue
 
     if not can_run:
+        post_commit_status(
+            commit,
+            FAILURE,
+            "",
+            description,
+            PR_CHECK,
+            pr_info,
+        )
         print("::notice ::Cannot run")
         sys.exit(1)
 
-    ci_report_url = create_ci_report(pr_info, [])
-    print("::notice ::Can run")
     post_commit_status(
         commit,
-        "pending",
-        ci_report_url,
-        description,
-        CI_STATUS_NAME,
+        SUCCESS,
+        "",
+        "ok",
+        PR_CHECK,
         pr_info,
     )
 
+    ci_report_url = create_ci_report(pr_info, [])
+    print("::notice ::Can run")
+
+    if not pr_info.is_merge_queue():
+        # we need clean CI status for MQ to merge (no pending statuses)
+        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/app.py b/tests/ci/runner_token_rotation_lambda/app.py
index 6544eee9581..445704648a9 100644
--- a/tests/ci/runner_token_rotation_lambda/app.py
+++ b/tests/ci/runner_token_rotation_lambda/app.py
@@ -4,9 +4,8 @@ import argparse
 import sys
 
 import boto3  # type: ignore
-import requests  # type: ignore
-
-from lambda_shared.token import get_cached_access_token, get_access_token_by_key_app
+import requests
+from lambda_shared.token import get_access_token_by_key_app, get_cached_access_token
 
 
 def get_runner_registration_token(access_token):
@@ -17,6 +16,7 @@ def get_runner_registration_token(access_token):
     response = requests.post(
         "https://api.github.com/orgs/ClickHouse/actions/runners/registration-token",
         headers=headers,
+        timeout=30,
     )
     response.raise_for_status()
     data = response.json()
@@ -43,6 +43,7 @@ def main(access_token, push_to_ssm, ssm_parameter_name):
 
 
 def handler(event, context):
+    _, _ = event, context
     main(get_cached_access_token(), True, "github_runner_registration_token")
 
 
@@ -85,7 +86,7 @@ if __name__ == "__main__":
     if args.private_key:
         private_key = args.private_key
     else:
-        with open(args.private_key_path, "r") as key_file:
+        with open(args.private_key_path, "r", encoding="utf-8") as key_file:
             private_key = key_file.read()
 
     token = get_access_token_by_key_app(private_key, args.app_id)
diff --git a/tests/ci/s3_helper.py b/tests/ci/s3_helper.py
index 616d645b5a6..bff53f00ad3 100644
--- a/tests/ci/s3_helper.py
+++ b/tests/ci/s3_helper.py
@@ -107,6 +107,9 @@ class S3Helper:
         logging.info("Upload %s to %s. Meta: %s", file_path, url, metadata)
         return url
 
+    def delete_file_from_s3(self, bucket_name: str, s3_path: str) -> None:
+        self.client.delete_object(Bucket=bucket_name, Key=s3_path)
+
     def upload_test_report_to_s3(self, file_path: Path, s3_path: str) -> str:
         if CI:
             return self._upload_file_to_s3(S3_TEST_REPORTS_BUCKET, file_path, s3_path)
diff --git a/tests/ci/slack_bot_ci_lambda/app.py b/tests/ci/slack_bot_ci_lambda/app.py
index 45e14138335..94b71724b1c 100755
--- a/tests/ci/slack_bot_ci_lambda/app.py
+++ b/tests/ci/slack_bot_ci_lambda/app.py
@@ -17,12 +17,12 @@ It's deployed to slack-bot-ci-lambda in CI/CD account
 See also: https://aretestsgreenyet.com/
 """
 
-import os
-import json
 import base64
+import json
+import os
 import random
 
-import requests  # type: ignore
+import requests
 
 DRY_RUN_MARK = "<no url, dry run>"
 
@@ -139,13 +139,11 @@ def get_play_url(query):
 
 
 def run_clickhouse_query(query):
-    url = "https://play.clickhouse.com/?user=play&query=" + requests.utils.quote(query)
-    res = requests.get(url)
+    url = "https://play.clickhouse.com/?user=play&query=" + requests.compat.quote(query)
+    res = requests.get(url, timeout=30)
     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)
-        )
+        res.raise_for_status()
 
     lines = res.text.strip().splitlines()
     return [x.split("\t") for x in lines]
@@ -159,9 +157,9 @@ def split_broken_and_flaky_tests(failed_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):
+        if (count_prev < 2 <= count) or (count_prev == 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
+            # 2 <= count 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
@@ -172,19 +170,18 @@ def split_broken_and_flaky_tests(failed_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)
+        res = f"There is a new {failure_type} test:\n"
     else:
-        res = "There are {} new {} tests:\n".format(len(failed_tests), failure_type)
+        res = f"There are {len(failed_tests)} new {failure_type} tests:\n"
 
     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
-        )
+        res += f"-   *{name}*  -  <{report}|Report>  -  <{cidb_url}|CI DB> \n"
 
     if MAX_TESTS_TO_REPORT < len(failed_tests):
-        res += "-   and {} other tests... :this-is-fine-fire:".format(
-            len(failed_tests) - MAX_TESTS_TO_REPORT
+        res += (
+            f"-   and {len(failed_tests) - MAX_TESTS_TO_REPORT} other "
+            "tests... :this-is-fine-fire:"
         )
 
     return res
@@ -223,19 +220,16 @@ def get_too_many_failures_message_impl(failures_count):
         if random.random() < REPORT_NO_FAILURES_PROBABILITY:
             return None
         return "Wow, there are *no failures* at all... 0_o"
-    if curr_failures < MAX_FAILURES:
+    return_none = (
+        curr_failures < MAX_FAILURES
+        or curr_failures < prev_failures
+        or (curr_failures - prev_failures) / prev_failures < 0.2
+    )
+    if return_none:
         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
-    )
+        return f":alert: *CI is broken: there are {curr_failures} failures during the last 24 hours*"
+    return "CI is broken and it's getting worse: there are {curr_failures} failures during the last 24 hours"
 
 
 def get_too_many_failures_message(failures_count):
@@ -254,7 +248,7 @@ def get_failed_checks_percentage_message(percentage):
         return None
 
     msg = ":alert: " if p > 1 else "Only " if p < 0.5 else ""
-    msg += "*{0:.2f}%* of all checks in master have failed yesterday".format(p)
+    msg += f"*{p:.2f}%* of all checks in master have failed yesterday"
     return msg
 
 
@@ -280,14 +274,10 @@ def send_to_slack_impl(message):
 
     payload = SLACK_MESSAGE_JSON.copy()
     payload["text"] = message
-    res = requests.post(SLACK_URL, json.dumps(payload))
+    res = requests.post(SLACK_URL, json.dumps(payload), timeout=30)
     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
-            )
-        )
+        res.raise_for_status()
 
 
 def send_to_slack(message):
@@ -303,7 +293,7 @@ def query_and_alert_if_needed(query, get_message_func):
     if msg is None:
         return
 
-    msg += "\nCI DB query: <{}|link>".format(get_play_url(query))
+    msg += f"\nCI DB query: <{get_play_url(query)}|link>"
     print("Sending message to slack:", msg)
     send_to_slack(msg)
 
@@ -317,6 +307,7 @@ def check_and_alert():
 
 
 def handler(event, context):
+    _, _ = event, context
     try:
         check_and_alert()
         return {"statusCode": 200, "body": "OK"}
diff --git a/tests/ci/sqlancer_check.py b/tests/ci/sqlancer_check.py
index 35641ba0455..9d33c480598 100644
--- a/tests/ci/sqlancer_check.py
+++ b/tests/ci/sqlancer_check.py
@@ -6,29 +6,12 @@ import subprocess
 import sys
 from pathlib import Path
 
-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 (
-    RerunHelper,
-    format_description,
-    get_commit,
-    post_commit_status,
-)
-from docker_images_helper import DockerImage, pull_image, get_docker_image
-from env_helper import (
-    GITHUB_RUN_URL,
-    REPORT_PATH,
-    TEMP_PATH,
-)
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from report import TestResults, TestResult
-from s3_helper import S3Helper
+from docker_images_helper import DockerImage, get_docker_image, pull_image
+from env_helper import REPORT_PATH, TEMP_PATH
+from report import FAILURE, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
 
 IMAGE_NAME = "clickhouse/sqlancer-test"
 
@@ -58,29 +41,19 @@ def main():
         check_name
     ), "Check name must be provided as an input arg or in CHECK_NAME env"
 
-    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)
-
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
     build_name = get_build_name_for_check(check_name)
     urls = read_build_urls(build_name, reports_path)
     if not urls:
-        raise Exception("No build URLs found")
+        raise ValueError("No build URLs found")
 
     for url in urls:
         if url.endswith("/clickhouse"):
             build_url = url
             break
     else:
-        raise Exception("Cannot find binary clickhouse among build results")
+        raise ValueError("Cannot find the clickhouse binary among build results")
 
     logging.info("Got build url %s", build_url)
 
@@ -118,10 +91,7 @@ def main():
     paths += [workspace_path / f"{t}.err" for t in tests]
     paths += [workspace_path / f"{t}.out" for t in tests]
 
-    s3_helper = S3Helper()
-    report_url = GITHUB_RUN_URL
-
-    status = "success"
+    status = SUCCESS
     test_results = []  # type: TestResults
     # Try to get status message saved by the SQLancer
     try:
@@ -136,36 +106,20 @@ def main():
         with open(workspace_path / "description.txt", "r", encoding="utf-8") as desc_f:
             description = desc_f.readline().rstrip("\n")
     except:
-        status = "failure"
+        status = FAILURE
         description = "Task failed: $?=" + str(retcode)
 
-    description = format_description(description)
+    if not test_results:
+        test_results = [TestResult(name=__file__, status=status)]
 
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        paths,
-        check_name,
-    )
-
-    post_commit_status(
-        commit, status, report_url, description, check_name, pr_info, dump_to_file=True
-    )
-    print(f"::notice:: {check_name} Report url: {report_url}")
-
-    ch_helper = ClickHouseHelper()
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=paths,
+    ).dump()
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/sqllogic_test.py b/tests/ci/sqllogic_test.py
index 96b4de4517f..6ea6fa19d91 100755
--- a/tests/ci/sqllogic_test.py
+++ b/tests/ci/sqllogic_test.py
@@ -5,29 +5,25 @@ import csv
 import logging
 import os
 import subprocess
-import sys
 from pathlib import Path
-from typing import List, Tuple
-
-from github import Github
+from typing import Tuple
 
 from build_download_helper import download_all_deb_packages
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    override_status,
-    post_commit_status,
-)
 from docker_images_helper import DockerImage, pull_image, get_docker_image
 from env_helper import REPORT_PATH, TEMP_PATH, REPO_COPY
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from report import OK, FAIL, ERROR, SUCCESS, TestResults, TestResult, read_test_results
-from s3_helper import S3Helper
+from report import (
+    ERROR,
+    FAIL,
+    OK,
+    SUCCESS,
+    JobReport,
+    StatusType,
+    TestResult,
+    TestResults,
+    read_test_results,
+)
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-
 
 NO_CHANGES_MSG = "Nothing to run"
 IMAGE_NAME = "clickhouse/sqllogic-test"
@@ -46,11 +42,12 @@ def get_run_command(
         f"--volume={repo_tests_path}:/clickhouse-tests "
         f"--volume={result_path}:/test_output "
         f"--volume={server_log_path}:/var/log/clickhouse-server "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         f"--cap-add=SYS_PTRACE {image}"
     )
 
 
-def read_check_status(result_folder: Path) -> Tuple[str, str]:
+def read_check_status(result_folder: Path) -> Tuple[StatusType, str]:
     status_path = result_folder / "check_status.tsv"
     if not status_path.exists():
         return ERROR, "Not found check_status.tsv"
@@ -63,9 +60,9 @@ def read_check_status(result_folder: Path) -> Tuple[str, str]:
         if len(row) != 2:
             return ERROR, "Invalid check_status.tsv"
         if row[0] != SUCCESS:
-            return row[0], row[1]
+            return row[0], row[1]  # type: ignore
 
-    return status_rows[-1][0], status_rows[-1][1]
+    return status_rows[-1][0], status_rows[-1][1]  # type: ignore
 
 
 def parse_args() -> argparse.Namespace:
@@ -104,15 +101,6 @@ def main():
         kill_timeout > 0
     ), "kill timeout must be provided as an input arg or in KILL_TIMEOUT env"
 
-    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)
-
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
     repo_tests_path = repo_path / "tests"
@@ -150,8 +138,6 @@ def main():
 
     logging.info("Files in result folder %s", os.listdir(result_path))
 
-    s3_helper = S3Helper()
-
     status = None
     description = None
 
@@ -177,7 +163,7 @@ def main():
         status, description = ERROR, "Empty test_results.tsv"
 
     assert status is not None
-    status = override_status(status, check_name)
+
     test_results.append(
         TestResult(
             "All tests",
@@ -186,29 +172,19 @@ def main():
         )
     )
 
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        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"
+    # Until it pass all tests, do not block CI, report SUCCESS
     assert description is not None
     # FIXME: force SUCCESS until all cases are fixed
     status = SUCCESS
-    post_commit_status(
-        commit, status, report_url, description, check_name, pr_info, dump_to_file=True
-    )
+
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+    ).dump()
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/sqltest.py b/tests/ci/sqltest.py
index edb64d9f106..c8c2adbbd56 100644
--- a/tests/ci/sqltest.py
+++ b/tests/ci/sqltest.py
@@ -1,31 +1,16 @@
 #!/usr/bin/env python3
 
 import logging
-import subprocess
 import os
+import subprocess
 import sys
 from pathlib import Path
-from typing import Dict
-
-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 (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-)
-from docker_images_helper import pull_image, get_docker_image
-from env_helper import (
-    GITHUB_RUN_URL,
-    REPORT_PATH,
-    TEMP_PATH,
-)
-from get_robot_token import get_best_robot_token
+from docker_images_helper import get_docker_image, pull_image
+from env_helper import REPORT_PATH, TEMP_PATH
 from pr_info import PRInfo
-from report import TestResult
-from s3_helper import S3Helper
+from report import SUCCESS, JobReport, TestResult
 from stopwatch import Stopwatch
 
 IMAGE_NAME = "clickhouse/sqltest"
@@ -62,28 +47,20 @@ def main():
 
     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)
-
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
     build_name = get_build_name_for_check(check_name)
     print(build_name)
     urls = read_build_urls(build_name, reports_path)
     if not urls:
-        raise Exception("No build URLs found")
+        raise ValueError("No build URLs found")
 
     for url in urls:
         if url.endswith("/clickhouse"):
             build_url = url
             break
     else:
-        raise Exception("Cannot find the clickhouse binary among build results")
+        raise ValueError("Cannot find the clickhouse binary among build results")
 
     logging.info("Got build url %s", build_url)
 
@@ -109,10 +86,6 @@ def main():
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
 
-    check_name_lower = (
-        check_name.lower().replace("(", "").replace(")", "").replace(" ", "")
-    )
-    s3_prefix = f"{pr_info.number}/{pr_info.sha}/sqltest_{check_name_lower}/"
     paths = {
         "run.log": run_log_path,
         "server.log.zst": workspace_path / "server.log.zst",
@@ -120,43 +93,18 @@ def main():
         "report.html": workspace_path / "report.html",
         "test.log": workspace_path / "test.log",
     }
-    path_urls = {}  # type: Dict[str, str]
-
-    s3_helper = S3Helper()
-    for f in paths:
-        try:
-            path_urls[f] = s3_helper.upload_test_report_to_s3(paths[f], s3_prefix + f)
-        except Exception as ex:
-            logging.info("Exception uploading file %s text %s", f, ex)
-            path_urls[f] = ""
-
-    report_url = GITHUB_RUN_URL
-    if path_urls["report.html"]:
-        report_url = path_urls["report.html"]
-
-    status = "success"
+    status = SUCCESS
     description = "See the report"
-    test_result = TestResult(description, "OK")
+    test_results = [TestResult(description, "OK")]
 
-    ch_helper = ClickHouseHelper()
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        [test_result],
-        status,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    logging.info("Result: '%s', '%s', '%s'", status, description, report_url)
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, status, report_url, description, check_name, pr_info, dump_to_file=True
-    )
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=status,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=[v for _, v in paths.items()],
+    ).dump()
 
 
 if __name__ == "__main__":
diff --git a/tests/ci/ssh.py b/tests/ci/ssh.py
index 275f26fd65f..321826fcf44 100644
--- a/tests/ci/ssh.py
+++ b/tests/ci/ssh.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 
-import shutil
+import logging
 import os
+import shutil
+import signal
 import subprocess
 import tempfile
-import logging
-import signal
 
 
 class SSHAgent:
@@ -21,7 +21,7 @@ class SSHAgent:
 
     def start(self):
         if shutil.which("ssh-agent") is None:
-            raise Exception("ssh-agent binary is not available")
+            raise RuntimeError("ssh-agent binary is not available")
 
         self._env_backup["SSH_AUTH_SOCK"] = os.environ.get("SSH_AUTH_SOCK")
         self._env_backup["SSH_OPTIONS"] = os.environ.get("SSH_OPTIONS")
@@ -54,7 +54,7 @@ class SSHAgent:
 
     def remove(self, key_pub):
         if key_pub not in self._keys:
-            raise Exception(f"Private key not found, public part: {key_pub}")
+            raise ValueError(f"Private key not found, public part: {key_pub}")
 
         if self._keys[key_pub] > 1:
             self._keys[key_pub] -= 1
@@ -107,7 +107,7 @@ class SSHAgent:
 
             if p.returncode:
                 message = stderr.strip() + b"\n" + stdout.strip()
-                raise Exception(message.strip().decode())
+                raise RuntimeError(message.strip().decode())
 
             return stdout
 
@@ -115,9 +115,9 @@ class SSHAgent:
 class SSHKey:
     def __init__(self, key_name=None, key_value=None):
         if key_name is None and key_value is None:
-            raise Exception("Either key_name or key_value must be specified")
+            raise ValueError("Either key_name or key_value must be specified")
         if key_name is not None and key_value is not None:
-            raise Exception("key_name or key_value must be specified")
+            raise ValueError("key_name or key_value must be specified")
         if key_name is not None:
             self.key = os.getenv(key_name)
         else:
diff --git a/tests/ci/stress.py b/tests/ci/stress.py
index 7d582e683e0..e0601b86f00 100755
--- a/tests/ci/stress.py
+++ b/tests/ci/stress.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 """This script is used in docker images for stress tests and upgrade tests"""
-from multiprocessing import cpu_count
-from pathlib import Path
-from subprocess import Popen, call, check_output, STDOUT, PIPE
-from typing import List
 import argparse
 import logging
 import random
 import time
+from multiprocessing import cpu_count
+from pathlib import Path
+from subprocess import PIPE, STDOUT, Popen, call, check_output
+from typing import List
 
 
 def get_options(i: int, upgrade_check: bool) -> str:
@@ -52,6 +52,11 @@ def get_options(i: int, upgrade_check: bool) -> str:
     if i % 5 == 1:
         client_options.append("memory_tracker_fault_probability=0.001")
 
+    if i % 5 == 1:
+        client_options.append(
+            "merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.05"
+        )
+
     if i % 2 == 1 and not upgrade_check:
         client_options.append("group_by_use_nulls=1")
 
@@ -90,12 +95,13 @@ def run_func_test(
     ]
     pipes = []
     for i, path in enumerate(output_paths):
-        with open(path, "w") as op:
+        with open(path, "w", encoding="utf-8") as op:
             full_command = (
                 f"{cmd} {get_options(i, upgrade_check)} {global_time_limit_option} "
                 f"{skip_tests_option} {upgrade_check_option}"
             )
             logging.info("Run func tests '%s'", full_command)
+            # pylint:disable-next=consider-using-with
             pipes.append(Popen(full_command, shell=True, stdout=op, stderr=op))
             time.sleep(0.5)
     return pipes
@@ -204,6 +210,7 @@ def prepare_for_hung_check(drop_databases: bool) -> bool:
                         continue
                     command = make_query_command(f"DETACH DATABASE {db}")
                     # we don't wait for drop
+                    # pylint:disable-next=consider-using-with
                     Popen(command, shell=True)
                 break
             except Exception as ex:
@@ -212,7 +219,7 @@ def prepare_for_hung_check(drop_databases: bool) -> bool:
                 )
                 time.sleep(i)
         else:
-            raise Exception(
+            raise RuntimeError(
                 "Cannot drop databases after stress tests. Probably server consumed "
                 "too much memory and cannot execute simple queries"
             )
@@ -293,7 +300,9 @@ def main():
     args = parse_args()
 
     if args.drop_databases and not args.hung_check:
-        raise Exception("--drop-databases only used in hung check (--hung-check)")
+        raise argparse.ArgumentTypeError(
+            "--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
@@ -359,15 +368,17 @@ def main():
             ]
         )
         hung_check_log = args.output_folder / "hung_check.log"  # type: Path
-        tee = Popen(["/usr/bin/tee", hung_check_log], stdin=PIPE)
-        res = call(cmd, shell=True, stdout=tee.stdin, stderr=STDOUT, timeout=600)
-        if tee.stdin is not None:
-            tee.stdin.close()
+        with Popen(["/usr/bin/tee", hung_check_log], stdin=PIPE) as tee:
+            res = call(cmd, shell=True, stdout=tee.stdin, stderr=STDOUT, timeout=600)
+            if tee.stdin is not None:
+                tee.stdin.close()
         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"
-            with open(args.output_folder / "test_results.tsv", "w+") as results:
+            with open(
+                args.output_folder / "test_results.tsv", "w+", encoding="utf-8"
+            ) as results:
                 results.write(hung_check_status)
                 hung_check_log.unlink()
 
diff --git a/tests/ci/stress_check.py b/tests/ci/stress_check.py
index 05250c14fd1..0f2c0cdd222 100644
--- a/tests/ci/stress_check.py
+++ b/tests/ci/stress_check.py
@@ -8,29 +8,14 @@ import sys
 from pathlib import Path
 from typing import List, Tuple
 
-from github import Github
-
 from build_download_helper import download_all_deb_packages
-from clickhouse_helper import (
-    CiLogsCredentials,
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-    format_description,
-)
-from docker_images_helper import DockerImage, pull_image, get_docker_image
-from env_helper import REPORT_PATH, TEMP_PATH, REPO_COPY
-from get_robot_token import get_best_robot_token
+from clickhouse_helper import CiLogsCredentials
+from docker_images_helper import DockerImage, get_docker_image, pull_image
+from env_helper import REPO_COPY, REPORT_PATH, TEMP_PATH
 from pr_info import PRInfo
-from report import TestResult, TestResults, read_test_results
-from s3_helper import S3Helper
+from report import ERROR, JobReport, TestResult, TestResults, read_test_results
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
 
 
 def get_additional_envs() -> List[str]:
@@ -103,17 +88,17 @@ def process_results(
         status = list(csv.reader(status_file, delimiter="\t"))
 
     if len(status) != 1 or len(status[0]) != 2:
-        return "error", "Invalid check_status.tsv", test_results, additional_files
+        return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
 
     try:
         results_path = result_directory / "test_results.tsv"
         test_results = read_test_results(results_path, True)
         if len(test_results) == 0:
-            raise Exception("Empty results")
+            raise ValueError("Empty results")
     except Exception as e:
         return (
-            "error",
+            ERROR,
             f"Cannot parse test_results.tsv ({e})",
             test_results,
             additional_files,
@@ -139,14 +124,6 @@ def run_stress_test(docker_image_name: str) -> None:
 
     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)
-
     docker_image = pull_image(get_docker_image(docker_image_name))
 
     packages_path = temp_path / "packages"
@@ -194,7 +171,6 @@ def run_stress_test(docker_image_name: str) -> None:
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {temp_path}", shell=True)
     ci_logs_credentials.clean_ci_logs_from_credentials(run_log_path)
 
-    s3_helper = S3Helper()
     state, description, test_results, additional_logs = process_results(
         result_path, server_log_path, run_log_path
     )
@@ -202,34 +178,16 @@ def run_stress_test(docker_image_name: str) -> None:
     if timeout_expired:
         test_results.append(TestResult.create_check_timeout_expired(timeout))
         state = "failure"
-        description = format_description(test_results[-1].name)
+        description = test_results[-1].name
 
-    ch_helper = ClickHouseHelper()
-
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        additional_logs,
-        check_name,
-    )
-    print(f"::notice ::Report url: {report_url}")
-
-    post_commit_status(
-        commit, state, report_url, description, check_name, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_logs,
+    ).dump()
 
     if state == "failure":
         sys.exit(1)
diff --git a/tests/ci/style_check.py b/tests/ci/style_check.py
index b37dcb59237..4580f007606 100644
--- a/tests/ci/style_check.py
+++ b/tests/ci/style_check.py
@@ -1,34 +1,23 @@
 #!/usr/bin/env python3
 import argparse
-import atexit
 import csv
 import logging
 import os
+import shutil
 import subprocess
 import sys
+from concurrent.futures import ProcessPoolExecutor
 from pathlib import Path
-from typing import List, Tuple
+from typing import List, Tuple, Union
 
-from clickhouse_helper import ClickHouseHelper, prepare_tests_results_for_clickhouse
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-)
+import magic
 from docker_images_helper import get_docker_image, pull_image
-from env_helper import REPO_COPY, TEMP_PATH
-from get_robot_token import get_best_robot_token
+from env_helper import CI, REPO_COPY, TEMP_PATH
 from git_helper import GIT_PREFIX, git_runner
-from github_helper import GitHub
 from pr_info import PRInfo
-from report import TestResults, read_test_results
-from s3_helper import S3Helper
+from report import ERROR, FAILURE, SUCCESS, JobReport, TestResults, read_test_results
 from ssh import SSHKey
 from stopwatch import Stopwatch
-from upload_result_helper import upload_results
-
-NAME = "Style Check"
 
 
 def process_result(
@@ -50,19 +39,19 @@ def process_result(
             status = list(csv.reader(status_file, delimiter="\t"))
     if len(status) != 1 or len(status[0]) != 2:
         logging.info("Files in result folder %s", os.listdir(result_directory))
-        return "error", "Invalid check_status.tsv", test_results, additional_files
+        return ERROR, "Invalid check_status.tsv", test_results, additional_files
     state, description = status[0][0], status[0][1]
 
     try:
         results_path = result_directory / "test_results.tsv"
         test_results = read_test_results(results_path)
         if len(test_results) == 0:
-            raise Exception("Empty results")
+            raise ValueError("Empty results")
 
         return state, description, test_results, additional_files
     except Exception:
-        if state == "success":
-            state, description = "error", "Failed to read test_results.tsv"
+        if state == SUCCESS:
+            state, description = ERROR, "Failed to read test_results.tsv"
         return state, description, test_results, additional_files
 
 
@@ -79,26 +68,6 @@ def parse_args():
     return parser.parse_args()
 
 
-def checkout_head(pr_info: PRInfo) -> None:
-    # It works ONLY for PRs, and only over ssh, so either
-    # ROBOT_CLICKHOUSE_SSH_KEY should be set or ssh-agent should work
-    assert pr_info.number
-    if not pr_info.head_name == pr_info.base_name:
-        # We can't push to forks, sorry folks
-        return
-    remote_url = pr_info.event["pull_request"]["base"]["repo"]["ssh_url"]
-    fetch_cmd = (
-        f"{GIT_PREFIX} fetch --depth=1 "
-        f"{remote_url} {pr_info.head_ref}:head-{pr_info.head_ref}"
-    )
-    if os.getenv("ROBOT_CLICKHOUSE_SSH_KEY", ""):
-        with SSHKey("ROBOT_CLICKHOUSE_SSH_KEY"):
-            git_runner(fetch_cmd)
-    else:
-        git_runner(fetch_cmd)
-    git_runner(f"git checkout -f head-{pr_info.head_ref}")
-
-
 def commit_push_staged(pr_info: PRInfo) -> None:
     # It works ONLY for PRs, and only over ssh, so either
     # ROBOT_CLICKHOUSE_SSH_KEY should be set or ssh-agent should work
@@ -110,24 +79,42 @@ def commit_push_staged(pr_info: PRInfo) -> None:
     if not git_staged:
         return
     remote_url = pr_info.event["pull_request"]["base"]["repo"]["ssh_url"]
+    head = git_runner("git rev-parse HEAD^{}")
     git_runner(f"{GIT_PREFIX} commit -m 'Automatic style fix'")
-    push_cmd = (
-        f"{GIT_PREFIX} push {remote_url} head-{pr_info.head_ref}:{pr_info.head_ref}"
+    # The fetch to avoid issue 'pushed branch tip is behind its remote'
+    fetch_cmd = (
+        f"{GIT_PREFIX} fetch {remote_url} --no-recurse-submodules --depth=2 {head}"
     )
+    push_cmd = f"{GIT_PREFIX} push {remote_url} HEAD:{pr_info.head_ref}"
     if os.getenv("ROBOT_CLICKHOUSE_SSH_KEY", ""):
         with SSHKey("ROBOT_CLICKHOUSE_SSH_KEY"):
+            git_runner(fetch_cmd)
             git_runner(push_cmd)
-    else:
-        git_runner(push_cmd)
+            return
+
+    git_runner(fetch_cmd)
+    git_runner(push_cmd)
 
 
-def checkout_last_ref(pr_info: PRInfo) -> None:
-    # Checkout the merge commit back to avoid special effects
-    assert pr_info.number
-    if not pr_info.head_name == pr_info.base_name:
-        # We can't push to forks, sorry folks
-        return
-    git_runner("git checkout -f -")
+def _check_mime(file: Union[Path, str], mime: str) -> bool:
+    # WARNING: python-magic v2:0.4.24-2 is used in ubuntu 22.04,
+    # and `Support os.PathLike values in magic.from_file` is only from 0.4.25
+    try:
+        return bool(magic.from_file(os.path.join(REPO_COPY, file), mime=True) == mime)
+    except (IsADirectoryError, FileNotFoundError) as e:
+        # Process submodules and removed files w/o errors
+        logging.warning("Captured error on file '%s': %s", file, e)
+        return False
+
+
+def is_python(file: Union[Path, str]) -> bool:
+    """returns if the changed file in the repository is python script"""
+    return _check_mime(file, "text/x-script.python")
+
+
+def is_shell(file: Union[Path, str]) -> bool:
+    """returns if the changed file in the repository is shell script"""
+    return _check_mime(file, "text/x-shellscript")
 
 
 def main():
@@ -139,69 +126,82 @@ def main():
 
     repo_path = Path(REPO_COPY)
     temp_path = Path(TEMP_PATH)
+    if temp_path.is_dir():
+        shutil.rmtree(temp_path)
     temp_path.mkdir(parents=True, exist_ok=True)
 
     pr_info = PRInfo()
-    gh = GitHub(get_best_robot_token(), create_cache_dir=False)
-    commit = get_commit(gh, pr_info.sha)
 
-    atexit.register(update_mergeable_check, commit, pr_info, NAME)
+    if pr_info.is_merge_queue() and args.push:
+        print("Auto style fix will be disabled for Merge Queue workflow")
+        args.push = False
 
-    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
-        state = rerun_helper.get_finished_status().state  # type: ignore
-        # state == "success" -> code = 0
-        code = int(state != "success")
-        sys.exit(code)
-
-    s3_helper = S3Helper()
+    run_cpp_check = True
+    run_shell_check = True
+    run_python_check = True
+    if CI and pr_info.number > 0:
+        pr_info.fetch_changed_files()
+        run_cpp_check = any(
+            not (is_python(file) or is_shell(file)) for file in pr_info.changed_files
+        )
+        run_shell_check = any(is_shell(file) for file in pr_info.changed_files)
+        run_python_check = any(is_python(file) for file in pr_info.changed_files)
 
     IMAGE_NAME = "clickhouse/style-test"
     image = pull_image(get_docker_image(IMAGE_NAME))
-    cmd = (
+    docker_command = (
         f"docker run -u $(id -u ${{USER}}):$(id -g ${{USER}}) --cap-add=SYS_PTRACE "
         f"--volume={repo_path}:/ClickHouse --volume={temp_path}:/test_output "
-        f"{image}"
+        f"--entrypoint= -w/ClickHouse/utils/check-style {image}"
     )
+    cmd_docs = f"{docker_command} ./check_docs.sh"
+    cmd_cpp = f"{docker_command} ./check_cpp.sh"
+    cmd_py = f"{docker_command} ./check_py.sh"
+    cmd_shell = f"{docker_command} ./check_shell.sh"
 
-    if args.push:
-        checkout_head(pr_info)
+    with ProcessPoolExecutor(max_workers=2) as executor:
+        logging.info("Run docs files check: %s", cmd_docs)
+        future = executor.submit(subprocess.run, cmd_docs, shell=True)
+        # Parallelization  does not make it faster - run subsequently
+        _ = future.result()
 
-    logging.info("Is going to run the command: %s", cmd)
-    subprocess.check_call(
-        cmd,
-        shell=True,
-    )
+        if run_cpp_check:
+            logging.info("Run source files check: %s", cmd_cpp)
+            future = executor.submit(subprocess.run, cmd_cpp, shell=True)
+            _ = future.result()
+
+        if run_python_check:
+            logging.info("Run py files check: %s", cmd_py)
+            future = executor.submit(subprocess.run, cmd_py, shell=True)
+            _ = future.result()
+        if run_shell_check:
+            logging.info("Run shellcheck check: %s", cmd_shell)
+            future = executor.submit(subprocess.run, cmd_shell, shell=True)
+            _ = future.result()
 
     if args.push:
         commit_push_staged(pr_info)
-        checkout_last_ref(pr_info)
+
+    subprocess.check_call(
+        f"python3 ../../utils/check-style/process_style_check_result.py --in-results-dir {temp_path} "
+        f"--out-results-file {temp_path}/test_results.tsv --out-status-file {temp_path}/check_status.tsv || "
+        f'echo -e "failure\tCannot parse results" > {temp_path}/check_status.tsv',
+        shell=True,
+    )
 
     state, description, test_results, additional_files = process_result(temp_path)
-    ch_helper = ClickHouseHelper()
 
-    report_url = upload_results(
-        s3_helper, pr_info.number, pr_info.sha, test_results, additional_files, NAME
-    )
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, state, report_url, description, NAME, pr_info, dump_to_file=True
-    )
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_files,
+    ).dump()
 
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        NAME,
-    )
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    if state in ["error", "failure"]:
+    if state in [ERROR, FAILURE]:
+        print(f"Style check failed: [{description}]")
         sys.exit(1)
 
 
diff --git a/tests/ci/team_keys_lambda/app.py b/tests/ci/team_keys_lambda/app.py
index f562fbe101d..c056808a9b4 100644
--- a/tests/ci/team_keys_lambda/app.py
+++ b/tests/ci/team_keys_lambda/app.py
@@ -2,13 +2,12 @@
 
 import argparse
 import json
-
 from datetime import datetime
 from queue import Queue
 from threading import Thread
 
-import requests  # type: ignore
 import boto3  # type: ignore
+import requests
 
 
 class Keys(set):
@@ -34,7 +33,7 @@ class Worker(Thread):
             m = self.queue.get()
             if m == "":
                 break
-            response = requests.get(f"https://github.com/{m}.keys")
+            response = requests.get(f"https://github.com/{m}.keys", timeout=30)
             self.results.add(f"# {m}\n{response.text}\n")
             self.queue.task_done()
 
@@ -45,7 +44,9 @@ def get_org_team_members(token: str, org: str, team_slug: str) -> set:
         "Accept": "application/vnd.github.v3+json",
     }
     response = requests.get(
-        f"https://api.github.com/orgs/{org}/teams/{team_slug}/members", headers=headers
+        f"https://api.github.com/orgs/{org}/teams/{team_slug}/members",
+        headers=headers,
+        timeout=30,
     )
     response.raise_for_status()
     data = response.json()
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 a55c1bb2b3b..b72bce4a677 100644
--- a/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
+++ b/tests/ci/team_keys_lambda/build_and_deploy_archive.sh
@@ -17,24 +17,60 @@ DOCKER_IMAGE="public.ecr.aws/lambda/python:${PY_VERSION}"
 LAMBDA_NAME=${DIR_NAME//_/-}
 # The name of directory with lambda code
 PACKAGE=lambda-package
+
+# Do not rebuild and deploy the archive if it's newer than sources
+if [ -e "$PACKAGE.zip" ] && [ -z "$FORCE" ]; then
+  REBUILD=""
+  for src in app.py build_and_deploy_archive.sh requirements.txt lambda_shared/*; do
+    if [ "$src" -nt "$PACKAGE.zip" ]; then
+      REBUILD=1
+    fi
+  done
+  [ -n "$REBUILD" ] || exit 0
+fi
+
+docker_cmd=(
+  docker run -i --net=host --rm --user="${UID}" -e HOME=/tmp --entrypoint=/bin/bash
+  --volume="${WORKDIR}/..:/ci" --workdir="/ci/${DIR_NAME}" "${DOCKER_IMAGE}"
+)
 rm -rf "$PACKAGE" "$PACKAGE".zip
 mkdir "$PACKAGE"
 cp app.py "$PACKAGE"
 if [ -f requirements.txt ]; then
   VENV=lambda-venv
-  rm -rf "$VENV" lambda-package.zip
-  docker run --net=host --rm --user="${UID}" -e HOME=/tmp --entrypoint=/bin/bash \
-    --volume="${WORKDIR}/..:/ci" --workdir="/ci/${DIR_NAME}" "${DOCKER_IMAGE}" \
-    -exc "
-      '$PY_EXEC' -m venv '$VENV' &&
-      source '$VENV/bin/activate' &&
-      pip install -r requirements.txt
-    "
-  cp -rT "$VENV/lib/$PY_EXEC/site-packages/" "$PACKAGE"
-  rm -r "$PACKAGE"/{pip,pip-*,setuptools,setuptools-*}
+  rm -rf "$VENV"
+  "${docker_cmd[@]}" -ex <<EOF
+    '$PY_EXEC' -m venv '$VENV' &&
+    source '$VENV/bin/activate' &&
+    pip install -r requirements.txt &&
+    # To have consistent pyc files
+    find '$VENV/lib' -name '*.pyc' -delete
+    cp -rT '$VENV/lib/$PY_EXEC/site-packages/' '$PACKAGE'
+    rm -r '$PACKAGE'/{pip,pip-*,setuptools,setuptools-*}
+    chmod 0777 -R '$PACKAGE'
+EOF
 fi
-( cd "$PACKAGE" && zip -9 -r ../"$PACKAGE".zip . )
+# Create zip archive via python zipfile to have it cross-platform
+"${docker_cmd[@]}" -ex <<EOF
+cd '$PACKAGE'
+find ! -type d -exec touch -t 201212121212 {} +
 
-if [ -z "$DRY_RUN" ]; then
-  aws lambda update-function-code --function-name "$LAMBDA_NAME" --zip-file fileb://"$WORKDIR/$PACKAGE".zip
+python <<'EOP'
+import zipfile
+import os
+files_path = []
+for root, _, files in os.walk('.'):
+    files_path.extend(os.path.join(root, file) for file in files)
+# persistent file order
+files_path.sort()
+with zipfile.ZipFile('../$PACKAGE.zip', 'w') as zf:
+    for file in files_path:
+        zf.write(file)
+EOP
+EOF
+
+ECHO=()
+if [ -n "$DRY_RUN" ]; then
+  ECHO=(echo Run the following command to push the changes:)
 fi
+"${ECHO[@]}" aws lambda update-function-code --function-name "$LAMBDA_NAME" --zip-file fileb://"$WORKDIR/$PACKAGE".zip
diff --git a/tests/ci/tee_popen.py b/tests/ci/tee_popen.py
index a50532aea20..13db50df53f 100644
--- a/tests/ci/tee_popen.py
+++ b/tests/ci/tee_popen.py
@@ -1,14 +1,14 @@
 #!/usr/bin/env python3
 
-from io import TextIOWrapper
-from pathlib import Path
-from subprocess import Popen, PIPE, STDOUT
-from threading import Thread
-from time import sleep
-from typing import Optional, Union
 import logging
 import os
 import sys
+from io import TextIOWrapper
+from pathlib import Path
+from subprocess import PIPE, STDOUT, Popen
+from threading import Thread
+from time import sleep
+from typing import Optional, Union
 
 
 # Very simple tee logic implementation. You can specify a shell command, output
@@ -98,5 +98,6 @@ class TeePopen:
     @property
     def log_file(self) -> TextIOWrapper:
         if self._log_file is None:
+            # pylint:disable-next=consider-using-with
             self._log_file = open(self._log_file_name, "w", encoding="utf-8")
         return self._log_file
diff --git a/tests/ci/terminate_runner_lambda/app.py b/tests/ci/terminate_runner_lambda/app.py
index 010f7dd6734..ab3e33d9e11 100644
--- a/tests/ci/terminate_runner_lambda/app.py
+++ b/tests/ci/terminate_runner_lambda/app.py
@@ -8,8 +8,7 @@ from dataclasses import dataclass
 from typing import Any, Dict, List
 
 import boto3  # type: ignore
-
-from lambda_shared import RunnerDescriptions, list_runners, cached_value_is_valid
+from lambda_shared import RunnerDescriptions, cached_value_is_valid, list_runners
 from lambda_shared.token import get_access_token_by_key_app, get_cached_access_token
 
 
@@ -134,7 +133,7 @@ def main(access_token: str, event: dict) -> Dict[str, List[str]]:
         candidates = instances_by_zone[zone]
         total_to_kill += num_to_kill
         if num_to_kill > len(candidates):
-            raise Exception(
+            raise RuntimeError(
                 f"Required to kill {num_to_kill}, but have only {len(candidates)}"
                 f" candidates in AV {zone}"
             )
@@ -196,6 +195,7 @@ def main(access_token: str, event: dict) -> Dict[str, List[str]]:
 
 
 def handler(event: dict, context: Any) -> Dict[str, List[str]]:
+    _ = context
     return main(get_cached_access_token(), event)
 
 
@@ -226,7 +226,7 @@ if __name__ == "__main__":
     if args.private_key:
         private_key = args.private_key
     else:
-        with open(args.private_key_path, "r") as key_file:
+        with open(args.private_key_path, "r", encoding="utf-8") as key_file:
             private_key = key_file.read()
 
     token = get_access_token_by_key_app(private_key, args.app_id)
diff --git a/tests/ci/test_ci_cache.py b/tests/ci/test_ci_cache.py
new file mode 100644
index 00000000000..3cdd6c78390
--- /dev/null
+++ b/tests/ci/test_ci_cache.py
@@ -0,0 +1,314 @@
+#!/usr/bin/env python
+
+from hashlib import md5
+from pathlib import Path
+import shutil
+from typing import Dict, Set
+import unittest
+from ci_config import Build, JobNames
+from s3_helper import S3Helper
+from ci import CiCache
+from digest_helper import JOB_DIGEST_LEN
+from commit_status_helper import CommitStatusData
+from env_helper import S3_BUILDS_BUCKET, TEMP_PATH
+
+
+def _create_mock_digest_1(string):
+    return md5((string).encode("utf-8")).hexdigest()[:JOB_DIGEST_LEN]
+
+
+def _create_mock_digest_2(string):
+    return md5((string + "+nonce").encode("utf-8")).hexdigest()[:JOB_DIGEST_LEN]
+
+
+DIGESTS = {job: _create_mock_digest_1(job) for job in JobNames}
+DIGESTS2 = {job: _create_mock_digest_2(job) for job in JobNames}
+
+
+# pylint:disable=protected-access
+class S3HelperTestMock(S3Helper):
+    def __init__(self) -> None:
+        super().__init__()
+        self.files_on_s3_paths = {}  # type: Dict[str, Set[str]]
+
+        # local path which is mocking remote s3 path with ci_cache
+        self.mock_remote_s3_path = Path(TEMP_PATH) / "mock_s3_path"
+        if not self.mock_remote_s3_path.exists():
+            self.mock_remote_s3_path.mkdir(parents=True, exist_ok=True)
+        for file in self.mock_remote_s3_path.iterdir():
+            file.unlink()
+
+    def list_prefix(self, s3_prefix_path, bucket=S3_BUILDS_BUCKET):
+        assert bucket == S3_BUILDS_BUCKET
+        file_prefix = Path(s3_prefix_path).name
+        path = str(Path(s3_prefix_path).parent)
+        return [
+            path + "/" + file
+            for file in self.files_on_s3_paths[path]
+            if file.startswith(file_prefix)
+        ]
+
+    def upload_file(self, bucket, file_path, s3_path):
+        assert bucket == S3_BUILDS_BUCKET
+        file_name = Path(file_path).name
+        assert (
+            file_name in s3_path
+        ), f"Record file name [{file_name}] must be part of a path on s3 [{s3_path}]"
+        s3_path = str(Path(s3_path).parent)
+        if s3_path in self.files_on_s3_paths:
+            self.files_on_s3_paths[s3_path].add(file_name)
+        else:
+            self.files_on_s3_paths[s3_path] = set([file_name])
+        shutil.copy(file_path, self.mock_remote_s3_path)
+
+    def download_files(self, bucket, s3_path, file_suffix, local_directory):
+        assert bucket == S3_BUILDS_BUCKET
+        assert file_suffix == CiCache._RECORD_FILE_EXTENSION
+        assert local_directory == CiCache._LOCAL_CACHE_PATH
+        assert CiCache._S3_CACHE_PREFIX in s3_path
+        assert [job_type.value in s3_path for job_type in CiCache.JobType]
+
+        # copying from mock remote path to local cache
+        for remote_record in self.mock_remote_s3_path.glob(f"*{file_suffix}"):
+            destination_file = CiCache._LOCAL_CACHE_PATH / remote_record.name
+            shutil.copy(remote_record, destination_file)
+
+
+# pylint:disable=protected-access
+class TestCiCache(unittest.TestCase):
+    def test_cache(self):
+        s3_mock = S3HelperTestMock()
+        ci_cache = CiCache(s3_mock, DIGESTS)
+        # immitate another CI run is using cache
+        ci_cache_2 = CiCache(s3_mock, DIGESTS2)
+        NUM_BATCHES = 10
+
+        DOCS_JOBS_NUM = 1
+        assert len(set(job for job in JobNames)) == len(list(job for job in JobNames))
+        NONDOCS_JOBS_NUM = len(set(job for job in JobNames)) - DOCS_JOBS_NUM
+
+        PR_NUM = 123456
+        status = CommitStatusData(
+            status="success",
+            report_url="dummy url",
+            description="OK OK OK",
+            sha="deadbeaf2",
+            pr_num=PR_NUM,
+        )
+
+        ### add some pending statuses for two batches, non-release branch
+        for job in JobNames:
+            ci_cache.push_pending(job, [0, 1, 2], NUM_BATCHES, release_branch=False)
+            ci_cache_2.push_pending(job, [0, 1, 2], NUM_BATCHES, release_branch=False)
+
+        ### add success status for 0 batch, non-release branch
+        batch = 0
+        for job in JobNames:
+            ci_cache.push_successful(
+                job, batch, NUM_BATCHES, status, release_branch=False
+            )
+            ci_cache_2.push_successful(
+                job, batch, NUM_BATCHES, status, release_branch=False
+            )
+
+        ### add failed status for 2 batch, non-release branch
+        batch = 2
+        for job in JobNames:
+            ci_cache.push_failed(job, batch, NUM_BATCHES, status, release_branch=False)
+            ci_cache_2.push_failed(
+                job, batch, NUM_BATCHES, status, release_branch=False
+            )
+
+        ### check all expected directories were created on s3 mock
+        expected_build_path_1 = f"{CiCache.JobType.SRCS.value}-{_create_mock_digest_1(Build.PACKAGE_RELEASE)}"
+        expected_docs_path_1 = (
+            f"{CiCache.JobType.DOCS.value}-{_create_mock_digest_1(JobNames.DOCS_CHECK)}"
+        )
+        expected_build_path_2 = f"{CiCache.JobType.SRCS.value}-{_create_mock_digest_2(Build.PACKAGE_RELEASE)}"
+        expected_docs_path_2 = (
+            f"{CiCache.JobType.DOCS.value}-{_create_mock_digest_2(JobNames.DOCS_CHECK)}"
+        )
+        self.assertCountEqual(
+            list(s3_mock.files_on_s3_paths.keys()),
+            [
+                f"{CiCache._S3_CACHE_PREFIX}/{expected_build_path_1}",
+                f"{CiCache._S3_CACHE_PREFIX}/{expected_docs_path_1}",
+                f"{CiCache._S3_CACHE_PREFIX}/{expected_build_path_2}",
+                f"{CiCache._S3_CACHE_PREFIX}/{expected_docs_path_2}",
+            ],
+        )
+
+        ### check number of cache files is as expected
+        FILES_PER_JOB = 5  # 1 successful + 1 failed + 3 pending batches = 5
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_build_path_1}"
+                ]
+            ),
+            NONDOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_docs_path_1}"
+                ]
+            ),
+            DOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_build_path_2}"
+                ]
+            ),
+            NONDOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_docs_path_2}"
+                ]
+            ),
+            DOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+
+        ### check statuses for all jobs in cache
+        for job in JobNames:
+            self.assertEqual(
+                ci_cache.is_successful(job, 0, NUM_BATCHES, release_branch=False), True
+            )
+            self.assertEqual(
+                ci_cache.is_successful(job, 0, NUM_BATCHES, release_branch=True), False
+            )
+            self.assertEqual(
+                ci_cache.is_successful(
+                    job, batch=1, num_batches=NUM_BATCHES, release_branch=False
+                ),
+                False,
+            )  # false - it's pending
+            self.assertEqual(
+                ci_cache.is_successful(
+                    job,
+                    batch=NUM_BATCHES,
+                    num_batches=NUM_BATCHES,
+                    release_branch=False,
+                ),
+                False,
+            )  # false - no such record
+            self.assertEqual(
+                ci_cache.is_pending(job, 0, NUM_BATCHES, release_branch=False), False
+            )  # false, it's successful, success has more priority than pending
+            self.assertEqual(
+                ci_cache.is_pending(job, 1, NUM_BATCHES, release_branch=False), True
+            )  # true
+            self.assertEqual(
+                ci_cache.is_pending(job, 1, NUM_BATCHES, release_branch=True), False
+            )  # false, not pending job on release_branch
+
+            status2 = ci_cache.get_successful(job, 0, NUM_BATCHES)
+            assert status2 and status2.pr_num == PR_NUM
+            status2 = ci_cache.get_successful(job, 1, NUM_BATCHES)
+            assert status2 is None
+
+        ### add some more pending statuses for two batches and for a release branch
+        for job in JobNames:
+            ci_cache.push_pending(
+                job, batches=[0, 1], num_batches=NUM_BATCHES, release_branch=True
+            )
+
+        ### add success statuses for 0 batch and release branch
+        PR_NUM = 234
+        status = CommitStatusData(
+            status="success",
+            report_url="dummy url",
+            description="OK OK OK",
+            sha="deadbeaf2",
+            pr_num=PR_NUM,
+        )
+        for job in JobNames:
+            ci_cache.push_successful(job, 0, NUM_BATCHES, status, release_branch=True)
+
+        ### check number of cache files is as expected
+        FILES_PER_JOB = 8  # 1 successful + 1 failed + 1 successful_release + 3 pending batches + 2 pending batches release = 8
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_build_path_1}"
+                ]
+            ),
+            NONDOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+        self.assertEqual(
+            len(
+                s3_mock.files_on_s3_paths[
+                    f"{CiCache._S3_CACHE_PREFIX}/{expected_docs_path_1}"
+                ]
+            ),
+            DOCS_JOBS_NUM * FILES_PER_JOB,
+        )
+
+        ### check statuses
+        for job in JobNames:
+            self.assertEqual(ci_cache.is_successful(job, 0, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_successful(job, 0, NUM_BATCHES, True), True)
+            self.assertEqual(ci_cache.is_successful(job, 1, NUM_BATCHES, False), False)
+            self.assertEqual(ci_cache.is_successful(job, 1, NUM_BATCHES, True), False)
+            self.assertEqual(
+                ci_cache.is_pending(job, 0, NUM_BATCHES, False), False
+            )  # it's success, not pending
+            self.assertEqual(
+                ci_cache.is_pending(job, 0, NUM_BATCHES, True), False
+            )  # it's success, not pending
+            self.assertEqual(ci_cache.is_pending(job, 1, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_pending(job, 1, NUM_BATCHES, True), True)
+
+            self.assertEqual(ci_cache.is_failed(job, 2, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_failed(job, 2, NUM_BATCHES, True), False)
+
+            status2 = ci_cache.get_successful(job, 0, NUM_BATCHES)
+            assert status2 and status2.pr_num == PR_NUM
+            status2 = ci_cache.get_successful(job, 1, NUM_BATCHES)
+            assert status2 is None
+
+        ### create new cache object and verify the same checks
+        ci_cache = CiCache(s3_mock, DIGESTS)
+        for job in JobNames:
+            self.assertEqual(ci_cache.is_successful(job, 0, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_successful(job, 0, NUM_BATCHES, True), True)
+            self.assertEqual(ci_cache.is_successful(job, 1, NUM_BATCHES, False), False)
+            self.assertEqual(ci_cache.is_successful(job, 1, NUM_BATCHES, True), False)
+            self.assertEqual(
+                ci_cache.is_pending(job, 0, NUM_BATCHES, False), False
+            )  # it's success, not pending
+            self.assertEqual(
+                ci_cache.is_pending(job, 0, NUM_BATCHES, True), False
+            )  # it's success, not pending
+            self.assertEqual(ci_cache.is_pending(job, 1, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_pending(job, 1, NUM_BATCHES, True), True)
+
+            self.assertEqual(ci_cache.is_failed(job, 2, NUM_BATCHES, False), True)
+            self.assertEqual(ci_cache.is_failed(job, 2, NUM_BATCHES, True), False)
+
+            # is_pending() is false for failed jobs batches
+            self.assertEqual(ci_cache.is_pending(job, 2, NUM_BATCHES, False), False)
+            self.assertEqual(ci_cache.is_pending(job, 2, NUM_BATCHES, True), False)
+
+            status2 = ci_cache.get_successful(job, 0, NUM_BATCHES)
+            assert status2 and status2.pr_num == PR_NUM
+            status2 = ci_cache.get_successful(job, 1, NUM_BATCHES)
+            assert status2 is None
+
+        ### check some job values which are not in the cache
+        self.assertEqual(ci_cache.is_successful(job, 0, NUM_BATCHES + 1, False), False)
+        self.assertEqual(
+            ci_cache.is_successful(job, NUM_BATCHES - 1, NUM_BATCHES, False), False
+        )
+        self.assertEqual(ci_cache.is_pending(job, 0, NUM_BATCHES + 1, False), False)
+        self.assertEqual(
+            ci_cache.is_pending(job, NUM_BATCHES - 1, NUM_BATCHES, False), False
+        )
+
+
+if __name__ == "__main__":
+    TestCiCache().test_cache()
diff --git a/tests/ci/test_ci_config.py b/tests/ci/test_ci_config.py
index d22ed16748e..badbc4c5dcf 100644
--- a/tests/ci/test_ci_config.py
+++ b/tests/ci/test_ci_config.py
@@ -1,15 +1,30 @@
 #!/usr/bin/env python3
 
 import unittest
+from ci_config import CIStages, JobNames, CI_CONFIG, Runners
 
 
-class TestCiConfig(unittest.TestCase):
-    def test_no_errors_in_ci_config(self):
-        raised = None
-        try:
-            from ci_config import (  # pylint: disable=import-outside-toplevel
-                CI_CONFIG as _,
-            )
-        except Exception as exc:
-            raised = exc
-        self.assertIsNone(raised, f"CI_CONFIG import raised error {raised}")
+class TestCIConfig(unittest.TestCase):
+    def test_runner_config(self):
+        """check runner is provided w/o exception"""
+        for job in JobNames:
+            runner = CI_CONFIG.get_runner_type(job)
+            self.assertIn(runner, Runners)
+
+    def test_job_stage_config(self):
+        """check runner is provided w/o exception"""
+        for job in JobNames:
+            stage = CI_CONFIG.get_job_ci_stage(job)
+            if job in [
+                JobNames.STYLE_CHECK,
+                JobNames.FAST_TEST,
+                JobNames.JEPSEN_KEEPER,
+                JobNames.BUILD_CHECK,
+                JobNames.BUILD_CHECK_SPECIAL,
+            ]:
+                assert (
+                    stage == CIStages.NA
+                ), "These jobs are not in CI stages, must be NA"
+            else:
+                assert stage != CIStages.NA, f"stage not found for [{job}]"
+            self.assertIn(stage, CIStages)
diff --git a/tests/ci/test_ci_options.py b/tests/ci/test_ci_options.py
new file mode 100644
index 00000000000..7c87144a84d
--- /dev/null
+++ b/tests/ci/test_ci_options.py
@@ -0,0 +1,121 @@
+#!/usr/bin/env python3
+
+# type: ignore
+
+import unittest
+from ci import CiOptions
+from ci_config import JobNames
+
+_TEST_BODY_1 = """
+#### Run only:
+- [x] <!---ci_set_integration--> Integration tests
+- [ ] <!---ci_set_arm--> Integration tests (arm64)
+- [x] <!---ci_include_foo--> Integration tests
+- [x] <!---ci_include_foo_Bar--> Integration tests
+- [ ] <!---ci_include_bar--> Integration tests
+- [x] <!---ci_exclude_foo--> some invalid mask - should be skipped
+- [x] <!---ci_exclude_Foo_bar--> Integration tests
+- [ ] <!---ci_exclude_bar--> Integration tests
+
+#### CI options:
+- [ ] <!---do_not_test--> do not test (only style check)
+- [x] <!---no_merge_commit--> disable merge-commit (no merge from master before tests)
+- [ ] <!---no_ci_cache--> disable CI cache (job reuse)
+
+#### Only specified batches in multi-batch jobs:
+- [x] <!---batch_0--> 1
+- [ ] <!---batch_1--> 2
+"""
+
+_TEST_BODY_2 = """
+- [x] <!---ci_include_integration--> MUST include integration tests
+- [x] <!---ci_include_stateless--> MUST include stateless tests
+- [x] <!---ci_include_foo_Bar--> no action must be applied
+- [ ] <!---ci_include_bar--> no action must be applied
+- [x] <!---ci_exclude_tsan--> MUST exclude tsan
+- [x] <!---ci_exclude_aarch64--> MUST exclude aarch64
+- [x] <!---ci_exclude_analyzer--> MUST exclude test with analazer
+- [ ] <!---ci_exclude_bar--> no action applied
+- [x] <!---ci_exclude_s3_storage--> Must exclude statless test with s3 storage
+- [x] <!---ci_exclude_coverage--> Must exclude tests on coverage build
+"""
+
+_TEST_BODY_3 = """
+- [x] <!---ci_include_analyzer--> Must include all tests for analyzer
+"""
+
+
+class TestCIOptions(unittest.TestCase):
+    def test_pr_body_parsing(self):
+        ci_options = CiOptions.create_from_pr_message(
+            _TEST_BODY_1, update_from_api=False
+        )
+        self.assertFalse(ci_options.do_not_test)
+        self.assertFalse(ci_options.no_ci_cache)
+        self.assertTrue(ci_options.no_merge_commit)
+        self.assertEqual(ci_options.ci_sets, ["ci_set_integration"])
+        self.assertCountEqual(ci_options.include_keywords, ["foo", "foo_bar"])
+        self.assertCountEqual(ci_options.exclude_keywords, ["foo", "foo_bar"])
+
+    def test_options_applied(self):
+        self.maxDiff = None
+        ci_options = CiOptions.create_from_pr_message(
+            _TEST_BODY_2, update_from_api=False
+        )
+        self.assertCountEqual(
+            ci_options.include_keywords, ["integration", "foo_bar", "stateless"]
+        )
+        self.assertCountEqual(
+            ci_options.exclude_keywords,
+            ["tsan", "aarch64", "analyzer", "s3_storage", "coverage"],
+        )
+        jobs_to_do = list(JobNames)
+        jobs_to_skip = []
+        job_params = {}
+        jobs_to_do, jobs_to_skip, job_params = ci_options.apply(
+            jobs_to_do, jobs_to_skip, job_params
+        )
+        self.assertCountEqual(
+            jobs_to_do,
+            [
+                "Style check",
+                "package_release",
+                "package_asan",
+                "package_ubsan",
+                "package_debug",
+                "package_msan",
+                "Stateless tests (asan)",
+                "Stateless tests flaky check (asan)",
+                "Stateless tests (msan)",
+                "Stateless tests (ubsan)",
+                "Stateless tests (debug)",
+                "Stateless tests (release)",
+                "Integration tests (release)",
+                "Integration tests (asan)",
+                "Integration tests flaky check (asan)",
+            ],
+        )
+
+    def test_options_applied_2(self):
+        self.maxDiff = None
+        ci_options = CiOptions.create_from_pr_message(
+            _TEST_BODY_3, update_from_api=False
+        )
+        self.assertCountEqual(ci_options.include_keywords, ["analyzer"])
+        self.assertIsNone(ci_options.exclude_keywords)
+        jobs_to_do = list(JobNames)
+        jobs_to_skip = []
+        job_params = {}
+        jobs_to_do, jobs_to_skip, job_params = ci_options.apply(
+            jobs_to_do, jobs_to_skip, job_params
+        )
+        self.assertCountEqual(
+            jobs_to_do,
+            [
+                "Style check",
+                "Integration tests (asan, old analyzer)",
+                "package_release",
+                "Stateless tests (release, old analyzer, s3, DatabaseReplicated)",
+                "package_asan",
+            ],
+        )
diff --git a/tests/ci/test_digest.py b/tests/ci/test_digest.py
index 86ba16ec525..44117bb604b 100644
--- a/tests/ci/test_digest.py
+++ b/tests/ci/test_digest.py
@@ -5,6 +5,7 @@ from hashlib import md5
 from pathlib import Path
 
 import digest_helper as dh
+from env_helper import ROOT_DIR
 
 _12 = b"12\n"
 _13 = b"13\n"
@@ -13,7 +14,7 @@ _14 = b"14\n"
 
 # pylint:disable=protected-access
 class TestDigests(unittest.TestCase):
-    tests_dir = Path("tests/digests")
+    tests_dir = Path(ROOT_DIR) / "tests/ci/tests/digests"
     broken_link = tests_dir / "broken-symlink"
     empty_digest = "d41d8cd98f00b204e9800998ecf8427e"
 
diff --git a/tests/ci/unit_tests_check.py b/tests/ci/unit_tests_check.py
index f1238a00bd4..b66a4312657 100644
--- a/tests/ci/unit_tests_check.py
+++ b/tests/ci/unit_tests_check.py
@@ -3,35 +3,17 @@
 import json
 import logging
 import os
-import sys
 import subprocess
-import atexit
+import sys
 from pathlib import Path
-from typing import List, Tuple
-
-from github import Github
+from typing import Tuple
 
 from build_download_helper import download_unit_tests
-from clickhouse_helper import (
-    ClickHouseHelper,
-    prepare_tests_results_for_clickhouse,
-)
-from commit_status_helper import (
-    RerunHelper,
-    get_commit,
-    post_commit_status,
-    update_mergeable_check,
-)
-from docker_images_helper import pull_image, get_docker_image
+from docker_images_helper import get_docker_image, pull_image
 from env_helper import REPORT_PATH, TEMP_PATH
-from get_robot_token import get_best_robot_token
-from pr_info import PRInfo
-from report import ERROR, FAILURE, FAIL, OK, SUCCESS, TestResults, TestResult
-from s3_helper import S3Helper
+from report import ERROR, FAIL, FAILURE, OK, SUCCESS, JobReport, TestResult, TestResults
 from stopwatch import Stopwatch
 from tee_popen import TeePopen
-from upload_result_helper import upload_results
-
 
 IMAGE_NAME = "clickhouse/unit-test"
 
@@ -41,7 +23,7 @@ def get_test_name(line):
     for element in elements:
         if "(" not in element and ")" not in element:
             return element
-    raise Exception(f"No test name in line '{line}'")
+    raise ValueError(f"No test name in line '{line}'")
 
 
 def process_results(
@@ -122,7 +104,7 @@ def process_results(
             if "failures" in test_case:
                 raw_logs = ""
                 for failure in test_case["failures"]:
-                    raw_logs += failure["failure"]
+                    raw_logs += failure[FAILURE]
                 if (
                     "Segmentation fault" in raw_logs  # type: ignore
                     and SEGFAULT not in description
@@ -182,21 +164,9 @@ def main():
     temp_path = Path(TEMP_PATH)
     temp_path.mkdir(parents=True, exist_ok=True)
 
-    pr_info = PRInfo()
-
-    gh = Github(get_best_robot_token(), per_page=100)
-    commit = get_commit(gh, pr_info.sha)
-
-    atexit.register(update_mergeable_check, commit, 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)
-
     docker_image = pull_image(get_docker_image(IMAGE_NAME))
 
-    download_unit_tests(check_name, REPORT_PATH, TEMP_PATH)
+    download_unit_tests(check_name, REPORT_PATH, temp_path)
 
     tests_binary = temp_path / "unit_tests_dbms"
     os.chmod(tests_binary, 0o777)
@@ -206,6 +176,7 @@ def main():
 
     run_command = (
         f"docker run --cap-add=SYS_PTRACE --volume={tests_binary}:/unit_tests_dbms "
+        "--security-opt seccomp=unconfined "  # required to issue io_uring sys-calls
         f"--volume={test_output}:/test_output {docker_image}"
     )
 
@@ -222,37 +193,20 @@ def main():
 
     subprocess.check_call(f"sudo chown -R ubuntu:ubuntu {TEMP_PATH}", shell=True)
 
-    s3_helper = S3Helper()
     state, description, test_results = process_results(test_output)
+    additional_files = [run_log_path] + [
+        p for p in test_output.iterdir() if not p.is_dir()
+    ]
+    JobReport(
+        description=description,
+        test_results=test_results,
+        status=state,
+        start_time=stopwatch.start_time_str,
+        duration=stopwatch.duration_seconds,
+        additional_files=additional_files,
+    ).dump()
 
-    ch_helper = ClickHouseHelper()
-
-    report_url = upload_results(
-        s3_helper,
-        pr_info.number,
-        pr_info.sha,
-        test_results,
-        [run_log_path] + [p for p in test_output.iterdir() if not p.is_dir()],
-        check_name,
-    )
-    print(f"::notice ::Report url: {report_url}")
-    post_commit_status(
-        commit, state, report_url, description, check_name, pr_info, dump_to_file=True
-    )
-
-    prepared_events = prepare_tests_results_for_clickhouse(
-        pr_info,
-        test_results,
-        state,
-        stopwatch.duration_seconds,
-        stopwatch.start_time_str,
-        report_url,
-        check_name,
-    )
-
-    ch_helper.insert_events_into(db="default", table="checks", events=prepared_events)
-
-    if state == "failure":
+    if state == FAILURE:
         sys.exit(1)
 
 
diff --git a/tests/ci/upload_result_helper.py b/tests/ci/upload_result_helper.py
index bf52e6069dd..cb745131e0d 100644
--- a/tests/ci/upload_result_helper.py
+++ b/tests/ci/upload_result_helper.py
@@ -1,5 +1,5 @@
 from pathlib import Path
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Sequence, Union
 import os
 import logging
 
@@ -9,19 +9,19 @@ from env_helper import (
     GITHUB_RUN_URL,
     GITHUB_SERVER_URL,
 )
-from report import ReportColorTheme, TestResults, create_test_html_report
+from report import TestResults, create_test_html_report
 from s3_helper import S3Helper
 
 
 def process_logs(
     s3_client: S3Helper,
-    additional_logs: List[Path],
+    additional_logs: Union[Sequence[str], Sequence[Path]],
     s3_path_prefix: str,
     test_results: TestResults,
 ) -> List[str]:
     logging.info("Upload files to s3 %s", additional_logs)
 
-    processed_logs = {}  # type: Dict[Path, str]
+    processed_logs = {}  # type: Dict[str, str]
     # Firstly convert paths of logs from test_results to urls to s3.
     for test_result in test_results:
         if test_result.log_files is None:
@@ -31,22 +31,24 @@ def process_logs(
         test_result.log_urls = []
         for path in test_result.log_files:
             if path in processed_logs:
-                test_result.log_urls.append(processed_logs[path])
+                test_result.log_urls.append(processed_logs[str(path)])
             elif path:
                 url = s3_client.upload_test_report_to_s3(
-                    path, s3_path_prefix + "/" + path.name
+                    Path(path), s3_path_prefix + "/" + str(path)
                 )
                 test_result.log_urls.append(url)
-                processed_logs[path] = url
+                processed_logs[str(path)] = url
 
     additional_urls = []
     for log_path in additional_logs:
-        if log_path.is_file():
+        if Path(log_path).is_file():
             additional_urls.append(
                 s3_client.upload_test_report_to_s3(
-                    log_path, s3_path_prefix + "/" + os.path.basename(log_path)
+                    Path(log_path), s3_path_prefix + "/" + os.path.basename(log_path)
                 )
             )
+        else:
+            logging.error("File %s is missing - skip", log_path)
 
     return additional_urls
 
@@ -56,7 +58,7 @@ def upload_results(
     pr_number: int,
     commit_sha: str,
     test_results: TestResults,
-    additional_files: List[Path],
+    additional_files: Union[Sequence[Path], Sequence[str]],
     check_name: str,
     additional_urls: Optional[List[str]] = None,
 ) -> str:
@@ -65,12 +67,11 @@ def upload_results(
         normalized_check_name = normalized_check_name.replace(*r)
 
     # Preserve additional_urls to not modify the original one
-    original_additional_urls = additional_urls or []
+    additional_urls = additional_urls or []
     s3_path_prefix = f"{pr_number}/{commit_sha}/{normalized_check_name}"
-    additional_urls = process_logs(
-        s3_client, additional_files, s3_path_prefix, test_results
+    additional_urls.extend(
+        process_logs(s3_client, additional_files, s3_path_prefix, test_results)
     )
-    additional_urls.extend(original_additional_urls)
 
     branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commits/master"
     branch_name = "master"
@@ -79,30 +80,44 @@ def upload_results(
         branch_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/pull/{pr_number}"
     commit_url = f"{GITHUB_SERVER_URL}/{GITHUB_REPOSITORY}/commit/{commit_sha}"
 
+    ready_report_url = None
+    for url in additional_urls:
+        if "report.html" in url:
+            ready_report_url = url
+            additional_urls.remove(ready_report_url)
+            break
+
     if additional_urls:
         raw_log_url = additional_urls.pop(0)
     else:
         raw_log_url = GITHUB_JOB_URL()
 
-    statuscolors = (
-        ReportColorTheme.bugfixcheck if "bugfix validate check" in check_name else None
-    )
+    try:
+        job_url = GITHUB_JOB_URL()
+    except Exception:
+        print(
+            "ERROR: Failed to get job URL from GH API, job report will use run URL instead."
+        )
+        job_url = GITHUB_RUN_URL
 
-    html_report = create_test_html_report(
-        check_name,
-        test_results,
-        raw_log_url,
-        GITHUB_RUN_URL,
-        GITHUB_JOB_URL(),
-        branch_url,
-        branch_name,
-        commit_url,
-        additional_urls,
-        statuscolors=statuscolors,
-    )
-    report_path = Path("report.html")
-    report_path.write_text(html_report, encoding="utf-8")
+    if test_results or not ready_report_url:
+        html_report = create_test_html_report(
+            check_name,
+            test_results,
+            raw_log_url,
+            GITHUB_RUN_URL,
+            job_url,
+            branch_url,
+            branch_name,
+            commit_url,
+            additional_urls,
+        )
+        report_path = Path("report.html")
+        report_path.write_text(html_report, encoding="utf-8")
+        url = s3_client.upload_test_report_to_s3(report_path, s3_path_prefix + ".html")
+    else:
+        logging.info("report.html was prepared by test job itself")
+        url = ready_report_url
 
-    url = s3_client.upload_test_report_to_s3(report_path, s3_path_prefix + ".html")
     logging.info("Search result in url %s", url)
     return url
diff --git a/tests/ci/version_helper.py b/tests/ci/version_helper.py
index 30b0c2d96be..f649732171f 100755
--- a/tests/ci/version_helper.py
+++ b/tests/ci/version_helper.py
@@ -357,8 +357,9 @@ def update_contributors(
 
     # format: "  1016  Alexey Arno"
     shortlog = git_runner.run("git shortlog HEAD --summary")
+    escaping = str.maketrans({"\\": "\\\\", '"': '\\"'})
     contributors = sorted(
-        [c.split(maxsplit=1)[-1].replace('"', r"\"") for c in shortlog.split("\n")],
+        [c.split(maxsplit=1)[-1].translate(escaping) for c in shortlog.split("\n")],
     )
     contributors = [f'    "{c}",' for c in contributors]
 
diff --git a/tests/ci/worker/dockerhub_proxy_template.sh b/tests/ci/worker/dockerhub_proxy_template.sh
index 7ca8d581df5..0e375dd5f04 100644
--- a/tests/ci/worker/dockerhub_proxy_template.sh
+++ b/tests/ci/worker/dockerhub_proxy_template.sh
@@ -1,19 +1,7 @@
 #!/usr/bin/env bash
 set -xeuo pipefail
 
-# Add cloudflare DNS as a fallback
-# Get default gateway interface
-IFACE=$(ip --json route list | jq '.[]|select(.dst == "default").dev' --raw-output)
-# `Link 2 (eth0): 172.31.0.2`
-ETH_DNS=$(resolvectl dns "$IFACE") || :
-CLOUDFLARE_NS=1.1.1.1
-if [[ "$ETH_DNS" ]] && [[ "${ETH_DNS#*: }" != *"$CLOUDFLARE_NS"* ]]; then
-  # Cut the leading legend
-  ETH_DNS=${ETH_DNS#*: }
-  # shellcheck disable=SC2206
-  new_dns=(${ETH_DNS} "$CLOUDFLARE_NS")
-  resolvectl dns "$IFACE" "${new_dns[@]}"
-fi
+bash /usr/local/share/scripts/init-network.sh
 
 # tune sysctl for network performance
 cat > /etc/sysctl.d/10-network-memory.conf << EOF
diff --git a/tests/ci/worker/init_runner.sh b/tests/ci/worker/init_runner.sh
index 017d847739f..de1d128dc87 100644
--- a/tests/ci/worker/init_runner.sh
+++ b/tests/ci/worker/init_runner.sh
@@ -60,19 +60,7 @@ export RUNNER_URL="https://github.com/${RUNNER_ORG}"
 INSTANCE_ID=$(ec2metadata --instance-id)
 export INSTANCE_ID
 
-# Add cloudflare DNS as a fallback
-# Get default gateway interface
-IFACE=$(ip --json route list | jq '.[]|select(.dst == "default").dev' --raw-output)
-# `Link 2 (eth0): 172.31.0.2`
-ETH_DNS=$(resolvectl dns "$IFACE") || :
-CLOUDFLARE_NS=1.1.1.1
-if [[ "$ETH_DNS" ]] && [[ "${ETH_DNS#*: }" != *"$CLOUDFLARE_NS"* ]]; then
-  # Cut the leading legend
-  ETH_DNS=${ETH_DNS#*: }
-  # shellcheck disable=SC2206
-  new_dns=(${ETH_DNS} "$CLOUDFLARE_NS")
-  resolvectl dns "$IFACE" "${new_dns[@]}"
-fi
+bash /usr/local/share/scripts/init-network.sh
 
 # combine labels
 RUNNER_TYPE=$(/usr/local/bin/aws ec2 describe-tags --filters "Name=resource-id,Values=$INSTANCE_ID" --query "Tags[?Key=='github:runner-type'].Value" --output text)
@@ -150,13 +138,15 @@ check_spot_instance_is_old() {
 check_proceed_spot_termination() {
     # The function checks and proceeds spot instance termination if exists
     # The event for spot instance termination
+    local FORCE
+    FORCE=${1:-}
     if TERMINATION_DATA=$(curl -s --fail http://169.254.169.254/latest/meta-data/spot/instance-action); then
         # https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-instance-termination-notices.html#instance-action-metadata
         _action=$(jq '.action' -r <<< "$TERMINATION_DATA")
         _time=$(jq '.time | fromdate' <<< "$TERMINATION_DATA")
         _until_action=$((_time - $(date +%s)))
         echo "Received the '$_action' event that will be effective in $_until_action seconds"
-        if (( _until_action <= 30 )); then
+        if (( _until_action <= 30 )) || [ "$FORCE" == "force" ]; then
             echo "The action $_action will be done in $_until_action, killing the runner and exit"
             local runner_pid
             runner_pid=$(pgrep Runner.Listener)
@@ -321,7 +311,7 @@ while true; do
         echo "Checking if the instance suppose to terminate"
         no_terminating_metadata || terminate_on_event
         check_spot_instance_is_old && terminate_and_exit
-        check_proceed_spot_termination
+        check_proceed_spot_termination force
 
         echo "Going to configure runner"
         sudo -u ubuntu ./config.sh --url $RUNNER_URL --token "$(get_runner_token)" \
@@ -331,7 +321,7 @@ while true; do
         echo "Another one check to avoid race between runner and infrastructure"
         no_terminating_metadata || terminate_on_event
         check_spot_instance_is_old && terminate_and_exit
-        check_proceed_spot_termination
+        check_proceed_spot_termination force
 
         echo "Run"
         sudo -u ubuntu \
diff --git a/tests/ci/worker/prepare-ci-ami.sh b/tests/ci/worker/prepare-ci-ami.sh
index c27d956c834..effc224c2d5 100644
--- a/tests/ci/worker/prepare-ci-ami.sh
+++ b/tests/ci/worker/prepare-ci-ami.sh
@@ -9,7 +9,7 @@ set -xeuo pipefail
 
 echo "Running prepare script"
 export DEBIAN_FRONTEND=noninteractive
-export RUNNER_VERSION=2.311.0
+export RUNNER_VERSION=2.315.0
 export RUNNER_HOME=/home/ubuntu/actions-runner
 
 deb_arch() {
@@ -138,6 +138,49 @@ dpkg -i /tmp/amazon-cloudwatch-agent.deb
 aws ssm get-parameter --region us-east-1 --name AmazonCloudWatch-github-runners --query 'Parameter.Value' --output text > /opt/aws/amazon-cloudwatch-agent/etc/amazon-cloudwatch-agent.json
 systemctl enable amazon-cloudwatch-agent.service
 
+
+echo "Install tailscale"
+# Build get-authkey for tailscale
+docker run --rm -v /usr/local/bin/:/host-local-bin -i golang:alpine sh -ex <<'EOF'
+  CGO_ENABLED=0 go install -tags tag:svc-core-ci-github tailscale.com/cmd/get-authkey@main
+  mv /go/bin/get-authkey /host-local-bin
+EOF
+
+# install tailscale
+curl -fsSL "https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release -cs).noarmor.gpg" > /usr/share/keyrings/tailscale-archive-keyring.gpg
+curl -fsSL "https://pkgs.tailscale.com/stable/ubuntu/$(lsb_release -cs).tailscale-keyring.list" > /etc/apt/sources.list.d/tailscale.list
+apt-get update
+apt-get install tailscale --yes --no-install-recommends
+
+
+# Create a common script for the instances
+mkdir /usr/local/share/scripts -p
+cat > /usr/local/share/scripts/init-network.sh << 'EOF'
+#!/usr/bin/env bash
+
+# Add cloudflare DNS as a fallback
+# Get default gateway interface
+IFACE=$(ip --json route list | jq '.[]|select(.dst == "default").dev' --raw-output)
+# `Link 2 (eth0): 172.31.0.2`
+ETH_DNS=$(resolvectl dns "$IFACE") || :
+CLOUDFLARE_NS=1.1.1.1
+if [[ "$ETH_DNS" ]] && [[ "${ETH_DNS#*: }" != *"$CLOUDFLARE_NS"* ]]; then
+  # Cut the leading legend
+  ETH_DNS=${ETH_DNS#*: }
+  # shellcheck disable=SC2206
+  new_dns=(${ETH_DNS} "$CLOUDFLARE_NS")
+  resolvectl dns "$IFACE" "${new_dns[@]}"
+fi
+
+# Setup tailscale, the very first action
+TS_API_CLIENT_ID=$(aws ssm get-parameter --region us-east-1 --name /tailscale/api-client-id --query 'Parameter.Value' --output text --with-decryption)
+TS_API_CLIENT_SECRET=$(aws ssm get-parameter --region us-east-1 --name /tailscale/api-client-secret --query 'Parameter.Value' --output text --with-decryption)
+export TS_API_CLIENT_ID TS_API_CLIENT_SECRET
+TS_AUTHKEY=$(get-authkey -tags tag:svc-core-ci-github -reusable -ephemeral)
+tailscale up --ssh --auth-key="$TS_AUTHKEY" --hostname="ci-runner-$INSTANCE_ID"
+EOF
+
+
 # The following line is used in aws TOE check.
 touch /var/tmp/clickhouse-ci-ami.success
 # END OF THE SCRIPT
diff --git a/tests/ci/workflow_approve_rerun_lambda/app.py b/tests/ci/workflow_approve_rerun_lambda/app.py
index e511d773577..8ed47a54ab1 100644
--- a/tests/ci/workflow_approve_rerun_lambda/app.py
+++ b/tests/ci/workflow_approve_rerun_lambda/app.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
-from collections import namedtuple
 import fnmatch
 import json
 import time
+from collections import namedtuple
+from urllib.parse import quote
 
-import requests  # type: ignore
-
+import requests
 from lambda_shared.pr import TRUSTED_CONTRIBUTORS
 from lambda_shared.token import get_cached_access_token
 
@@ -90,26 +90,29 @@ def is_trusted_contributor(pr_user_login, pr_user_orgs):
 
 def _exec_get_with_retry(url, token):
     headers = {"Authorization": f"token {token}"}
+    e = Exception()
     for i in range(MAX_RETRY):
         try:
-            response = requests.get(url, headers=headers)
+            response = requests.get(url, headers=headers, timeout=30)
             response.raise_for_status()
             return response.json()
         except Exception as ex:
             print("Got exception executing request", ex)
+            e = ex
             time.sleep(i + 1)
 
-    raise Exception("Cannot execute GET request with retries")
+    raise requests.HTTPError("Cannot execute GET request with retries") from e
 
 
 def _exec_post_with_retry(url, token, data=None):
     headers = {"Authorization": f"token {token}"}
+    e = Exception()
     for i in range(MAX_RETRY):
         try:
             if data:
-                response = requests.post(url, headers=headers, json=data)
+                response = requests.post(url, headers=headers, json=data, timeout=30)
             else:
-                response = requests.post(url, headers=headers)
+                response = requests.post(url, headers=headers, timeout=30)
             if response.status_code == 403:
                 data = response.json()
                 if (
@@ -123,13 +126,14 @@ def _exec_post_with_retry(url, token, data=None):
             return response.json()
         except Exception as ex:
             print("Got exception executing request", ex)
+            e = ex
             time.sleep(i + 1)
 
-    raise Exception("Cannot execute POST request with retry")
+    raise requests.HTTPError("Cannot execute POST request with retry") from e
 
 
 def _get_pull_requests_from(repo_url, owner, branch, token):
-    url = f"{repo_url}/pulls?head={owner}:{branch}"
+    url = f"{repo_url}/pulls?head={quote(owner)}:{quote(branch)}"
     return _exec_get_with_retry(url, token)
 
 
diff --git a/tests/clickhouse-test b/tests/clickhouse-test
index c7049b0e0c8..624512058bc 100755
--- a/tests/clickhouse-test
+++ b/tests/clickhouse-test
@@ -4,48 +4,49 @@
 # pylint: disable=global-variable-not-assigned
 # pylint: disable=too-many-lines
 # pylint: disable=anomalous-backslash-in-string
+# pylint: disable=protected-access
 
-import enum
-from queue import Full
-import shutil
-import itertools
-import sys
-import os
-import os.path
-import platform
-import signal
-import re
 import copy
-import traceback
-import math
+import enum
+import tempfile
+import glob
 
 # Not requests, to avoid requiring extra dependency.
 import http.client
-import urllib.parse
+import itertools
 import json
+import math
+import multiprocessing
+import os
+import os.path
+import platform
+import random
+import re
+import shutil
+import signal
+import socket
+import string
+import subprocess
+import sys
+import traceback
+import urllib.parse
 
 # for crc32
 import zlib
-
 from argparse import ArgumentParser
-from typing import Tuple, Union, Optional, Dict, Set, List
-import subprocess
-from subprocess import Popen
-from subprocess import PIPE
+from contextlib import closing
 from datetime import datetime, timedelta
-from time import time, sleep
 from errno import ESRCH
+from queue import Full
+from subprocess import PIPE, Popen
+from time import sleep, time
+from typing import Dict, List, Optional, Set, Tuple, Union
 
 try:
     import termcolor  # type: ignore
 except ImportError:
     termcolor = None
 
-import random
-import string
-import multiprocessing
-import socket
-from contextlib import closing
 
 USE_JINJA = True
 try:
@@ -68,13 +69,159 @@ TEST_FILE_EXTENSIONS = [".sql", ".sql.j2", ".sh", ".py", ".expect"]
 
 VERSION_PATTERN = r"^((\d+\.)?(\d+\.)?(\d+\.)?\d+)$"
 
+TEST_MAX_RUN_TIME_IN_SECONDS = 120
 
-def stringhash(s):
+
+class SharedEngineReplacer:
+    ENGINES_NON_REPLICATED_REGEXP = r"[ =]((Collapsing|VersionedCollapsing|Summing|Replacing|Aggregating|)MergeTree\(?\)?)"
+    ENGINES_MAPPING_REPLICATED = [
+        ("ReplicatedMergeTree", "SharedMergeTree"),
+        ("ReplicatedCollapsingMergeTree", "SharedCollapsingMergeTree"),
+        (
+            "ReplicatedVersionedCollapsingMergeTree",
+            "SharedVersionedCollapsingMergeTree",
+        ),
+        ("ReplicatedSummingMergeTree", "SharedSummingMergeTree"),
+        ("ReplicatedReplacingMergeTree", "SharedReplacingMergeTree"),
+        ("ReplicatedAggregatingMergeTree", "SharedAggregatingMergeTree"),
+    ]
+    NEW_SYNTAX_REPLICATED_MERGE_TREE_RE = (
+        r"Replicated[a-zA-Z]*MergeTree\((\\?'.*\\?')?,?(\\?'.*\\?')?[a-zA-Z, _}{]*\)"
+    )
+    OLD_SYNTAX_OR_ARGUMENTS_RE = r"Tree\(.*[0-9]+.*\)"
+
+    def _check_replicad_new_syntax(self, line):
+        return re.search(self.NEW_SYNTAX_REPLICATED_MERGE_TREE_RE, line) is not None
+
+    def _check_old_syntax_or_arguments(self, line):
+        return re.search(self.OLD_SYNTAX_OR_ARGUMENTS_RE, line) is not None
+
+    @staticmethod
+    def _is_comment_line(line):
+        return line.startswith("SELECT") or line.startswith("select")
+
+    @staticmethod
+    def _is_create_query(line):
+        return (
+            line.startswith("CREATE")
+            or line.startswith("create")
+            or line.startswith("ENGINE")
+            or line.startswith("engine")
+        )
+
+    def _replace_non_replicated(self, line, escape_quotes, use_random_path):
+        groups = re.search(self.ENGINES_NON_REPLICATED_REGEXP, line)
+        if groups is not None and not self._check_old_syntax_or_arguments(line):
+            non_replicated_engine = groups.groups()[0]
+            basename_no_ext = os.path.splitext(os.path.basename(self.file_name))[0]
+            if use_random_path:
+                shared_path = "/" + os.path.join(
+                    basename_no_ext.replace("_", "/"),
+                    str(os.getpid()),
+                    str(random.randint(1, 1000)),
+                )
+            else:
+                shared_path = "/" + os.path.join(
+                    basename_no_ext.replace("_", "/"), str(os.getpid())
+                )
+
+            if escape_quotes:
+                shared_engine = (
+                    "Shared"
+                    + non_replicated_engine.replace("()", "")
+                    + f"(\\'{shared_path}\\', \\'1\\')"
+                )
+            else:
+                shared_engine = (
+                    "Shared"
+                    + non_replicated_engine.replace("()", "")
+                    + f"('{shared_path}', '1')"
+                )
+            return line.replace(non_replicated_engine, shared_engine)
+
+        return line
+
+    def _need_to_replace_something(self):
+        return (
+            self.replace_replicated or self.replace_non_replicated
+        ) and "shared_merge_tree" not in self.file_name
+
+    def _has_show_create_table(self):
+        with open(self.file_name, "r", encoding="utf-8") as f:
+            return re.search("show create table", f.read(), re.IGNORECASE)
+
+    def __init__(
+        self, file_name, replace_replicated, replace_non_replicated, reference_file
+    ):
+        self.file_name = file_name
+        self.temp_file_path = get_temp_file_path()
+        self.replace_replicated = replace_replicated
+        self.replace_non_replicated = replace_non_replicated
+
+        use_random_path = not reference_file and not self._has_show_create_table()
+
+        if not self._need_to_replace_something():
+            return
+
+        shutil.copyfile(self.file_name, self.temp_file_path)
+        shutil.copymode(self.file_name, self.temp_file_path)
+
+        with open(self.file_name, "w", newline="", encoding="utf-8") as modified:
+            with open(self.temp_file_path, "r", newline="", encoding="utf-8") as source:
+                for line in source:
+                    if self._is_comment_line(line) or (
+                        reference_file and not self._is_create_query(line)
+                    ):
+                        modified.write(line)
+                        continue
+
+                    if self.replace_replicated:
+                        for (
+                            engine_from,
+                            engine_to,
+                        ) in SharedEngineReplacer.ENGINES_MAPPING_REPLICATED:
+                            if engine_from in line and (
+                                self._check_replicad_new_syntax(line)
+                                or engine_from + " " in line
+                                or engine_from + ";" in line
+                            ):
+                                line = line.replace(engine_from, engine_to)
+                                break
+
+                    if self.replace_non_replicated:
+                        line = self._replace_non_replicated(
+                            line, reference_file, use_random_path
+                        )
+
+                    modified.write(line)
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, exc_tb):
+        if not self._need_to_replace_something():
+            return
+        shutil.move(self.temp_file_path, self.file_name)
+
+
+def get_temp_file_path():
+    return os.path.join(
+        tempfile._get_default_tempdir(), next(tempfile._get_candidate_names())
+    )
+
+
+def stringhash(s: str) -> int:
     # default hash() function consistent
     # only during process invocation https://stackoverflow.com/a/42089311
     return zlib.crc32(s.encode("utf-8"))
 
 
+def read_file_as_binary_string(file_path):
+    with open(file_path, "rb") as file:
+        binary_data = file.read()
+    return binary_data
+
+
 # First and last lines of the log
 def trim_for_log(s):
     if not s:
@@ -87,6 +234,20 @@ def trim_for_log(s):
         return "\n".join(lines)
 
 
+def is_valid_utf_8(fname):
+    try:
+        with open(fname, "rb") as f:
+            contents = f.read()
+            contents.decode("utf-8")
+            return True
+    except UnicodeDecodeError:
+        return False
+
+
+class TestException(Exception):
+    pass
+
+
 class HTTPError(Exception):
     def __init__(self, message=None, code=None):
         self.message = message
@@ -101,6 +262,7 @@ class HTTPError(Exception):
 def clickhouse_execute_http(
     base_args,
     query,
+    body=None,
     timeout=30,
     settings=None,
     default_format=None,
@@ -140,6 +302,7 @@ def clickhouse_execute_http(
             client.request(
                 "POST",
                 f"/?{base_args.client_options_query_str}{urllib.parse.urlencode(params)}",
+                body=body,
             )
             res = client.getresponse()
             data = res.read()
@@ -160,6 +323,7 @@ def clickhouse_execute_http(
 def clickhouse_execute(
     base_args,
     query,
+    body=None,
     timeout=30,
     settings=None,
     max_http_retries=5,
@@ -168,6 +332,7 @@ def clickhouse_execute(
     return clickhouse_execute_http(
         base_args,
         query,
+        body,
         timeout,
         settings,
         max_http_retries=max_http_retries,
@@ -181,6 +346,7 @@ def clickhouse_execute_json(
     data = clickhouse_execute_http(
         base_args,
         query,
+        None,
         timeout,
         settings,
         "JSONEachRow",
@@ -238,7 +404,7 @@ def get_db_engine(args, database_name):
 
 
 def get_create_database_settings(args, testcase_args):
-    create_database_settings = dict()
+    create_database_settings = {}
     if testcase_args:
         create_database_settings["log_comment"] = testcase_args.testcase_basename
     if args.db_engine == "Ordinary":
@@ -287,8 +453,7 @@ def get_processlist_size(args):
                 """
                 SELECT
                     count()
-                FROM
-                    FROM system.processes
+                FROM clusterAllReplicas('test_cluster_database_replicated', system.processes)
                 WHERE query NOT LIKE '%system.processes%'
                 """,
             ).strip()
@@ -400,7 +565,6 @@ def get_stacktraces_from_gdb(server_pid):
 
 
 # collect server stacktraces from system.stack_trace table
-# it does not work in Sandbox
 def get_stacktraces_from_clickhouse(args):
     settings_str = " ".join(
         [
@@ -519,10 +683,14 @@ class FailureReason(enum.Enum):
     STDERR = "having stderror: "
     EXCEPTION = "having exception in stdout: "
     RESULT_DIFF = "result differs with reference: "
-    TOO_LONG = "Test runs too long (> 60s). Make it faster."
+    TOO_LONG = (
+        f"Test runs too long (> {TEST_MAX_RUN_TIME_IN_SECONDS}s). Make it faster."
+    )
     INTERNAL_QUERY_FAIL = "Internal query (CREATE/DROP DATABASE) failed:"
 
     # SKIPPED reasons
+    NOT_SUPPORTED_IN_CLOUD = "not supported in cloud environment"
+    NOT_SUPPORTED_IN_PRIVATE = "not supported in private build"
     DISABLED = "disabled"
     SKIP = "skip"
     NO_JINJA = "no jinja"
@@ -535,6 +703,7 @@ class FailureReason(enum.Enum):
     S3_STORAGE = "s3-storage"
     BUILD = "not running for current build"
     NO_PARALLEL_REPLICAS = "smth in not supported with parallel replicas"
+    SHARED_MERGE_TREE = "no-shared-merge-tree"
 
     # UNKNOWN reasons
     NO_REFERENCE = "no reference file"
@@ -593,8 +762,6 @@ class SettingsRandomizer:
         "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),
-        "min_compress_block_size": lambda: random.randint(1, 1048576 * 3),
-        "max_compress_block_size": lambda: random.randint(1, 1048576 * 3),
         "use_uncompressed_cache": lambda: random.randint(0, 1),
         "min_bytes_to_use_direct_io": threshold_generator(
             0.2, 0.5, 1, 10 * 1024 * 1024 * 1024
@@ -646,6 +813,11 @@ class SettingsRandomizer:
             0.3, 0.5, 1, 10 * 1024 * 1024 * 1024
         ),
         "max_bytes_before_remerge_sort": lambda: random.randint(1, 3000000000),
+        "min_compress_block_size": lambda: random.randint(1, 1048576 * 3),
+        "max_compress_block_size": lambda: random.randint(1, 1048576 * 3),
+        "merge_tree_compact_parts_min_granules_to_multibuffer_read": lambda: random.randint(
+            1, 128
+        ),
         "optimize_sorting_by_input_stream_properties": 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,
@@ -671,6 +843,12 @@ class SettingsRandomizer:
                 get_localzone(),
             ]
         ),
+        "prefer_warmed_unmerged_parts_seconds": lambda: random.randint(0, 10),
+        "use_page_cache_for_disks_without_file_cache": lambda: random.random() < 0.7,
+        "page_cache_inject_eviction": lambda: random.random() < 0.5,
+        "merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability": lambda: round(
+            random.random(), 2
+        ),
     }
 
     @staticmethod
@@ -718,6 +896,17 @@ class MergeTreeSettingsRandomizer:
         "primary_key_compress_block_size": lambda: random.randint(8000, 100000),
         "replace_long_file_name_to_hash": lambda: random.randint(0, 1),
         "max_file_name_length": threshold_generator(0.3, 0.3, 0, 128),
+        "min_bytes_for_full_part_storage": threshold_generator(
+            0.3, 0.3, 0, 512 * 1024 * 1024
+        ),
+        "compact_parts_max_bytes_to_buffer": lambda: random.randint(
+            1024, 512 * 1024 * 1024
+        ),
+        "compact_parts_max_granules_to_buffer": threshold_generator(0.15, 0.15, 1, 256),
+        "compact_parts_merge_max_bytes_to_prefetch_part": lambda: random.randint(
+            1, 32 * 1024 * 1024
+        ),
+        "cache_populated_by_fetch": lambda: random.randint(0, 1),
     }
 
     @staticmethod
@@ -729,6 +918,10 @@ class MergeTreeSettingsRandomizer:
         return random_settings
 
 
+def replace_in_file(filename, what, with_what):
+    os.system(f"LC_ALL=C sed -i -e 's|{what}|{with_what}|g' {filename}")
+
+
 class TestResult:
     def __init__(
         self,
@@ -948,6 +1141,8 @@ class TestCase:
             else ""
         )
 
+        self.show_whitespaces_in_diff = args.show_whitespaces_in_diff
+
     # should skip test, should increment skipped_total, skip reason
     def should_skip_test(self, suite) -> Optional[FailureReason]:
         tags = self.tags
@@ -955,6 +1150,15 @@ class TestCase:
         if tags and ("disabled" in tags) and not args.disabled:
             return FailureReason.DISABLED
 
+        elif args.private and self.name in suite.private_skip_list:
+            return FailureReason.NOT_SUPPORTED_IN_PRIVATE
+
+        elif args.cloud and ("no-replicated-database" in tags):
+            return FailureReason.REPLICATED_DB
+
+        elif args.cloud and self.name in suite.cloud_skip_list:
+            return FailureReason.NOT_SUPPORTED_IN_CLOUD
+
         elif (
             os.path.exists(os.path.join(suite.suite_path, self.name) + ".disabled")
             and not args.disabled
@@ -1005,6 +1209,13 @@ class TestCase:
         ):
             return FailureReason.NON_ATOMIC_DB
 
+        elif (
+            tags
+            and ("no-shared-merge-tree" in tags)
+            and args.replace_replicated_with_shared
+        ):
+            return FailureReason.SHARED_MERGE_TREE
+
         elif tags and ("no-s3-storage" in tags) and args.s3_storage:
             return FailureReason.S3_STORAGE
         elif (
@@ -1034,7 +1245,8 @@ class TestCase:
     ):
         description = ""
 
-        debug_log = trim_for_log(debug_log)
+        if debug_log:
+            debug_log = "\n".join(debug_log.splitlines()[:100])
 
         if proc:
             if proc.returncode is None:
@@ -1119,6 +1331,7 @@ class TestCase:
             description += "\nstdout:\n"
             description += trim_for_log(stdout)
             description += "\n"
+
             if debug_log:
                 description += "\n"
                 description += debug_log
@@ -1131,9 +1344,7 @@ class TestCase:
             )
 
         if "Exception" in stdout:
-            description += "\n"
-            description += trim_for_log(stdout)
-            description += "\n"
+            description += "\n{}\n".format("\n".join(stdout.splitlines()[:100]))
             if debug_log:
                 description += "\n"
                 description += debug_log
@@ -1171,7 +1382,7 @@ class TestCase:
         )
 
         if result_is_different:
-            diff = Popen(
+            with Popen(
                 [
                     "diff",
                     "-U",
@@ -1179,15 +1390,25 @@ class TestCase:
                     self.reference_file,
                     self.stdout_file,
                 ],
-                encoding="latin-1",
                 stdout=PIPE,
                 universal_newlines=True,
-            ).communicate()[0]
+            ) as diff_proc:
+                if self.show_whitespaces_in_diff:
+                    with Popen(
+                        ["sed", "-e", "s/[ \t]\\+$/&$/g"],
+                        stdin=diff_proc.stdout,
+                        stdout=PIPE,
+                    ) as sed_proc:
+                        diff = sed_proc.communicate()[0].decode(
+                            "utf-8", errors="ignore"
+                        )
+                else:
+                    diff = diff_proc.communicate()[0]
+
             if diff.startswith("Binary files "):
                 diff += "Content of stdout:\n===================\n"
-                file = open(self.stdout_file, "rb")
-                diff += str(file.read())
-                file.close()
+                with open(self.stdout_file, "rb") as file:
+                    diff += str(file.read())
                 diff += "==================="
             description += f"\n{diff}\n"
             if debug_log:
@@ -1203,7 +1424,7 @@ class TestCase:
 
         if (
             self.testcase_args.test_runs > 1
-            and total_time > 120
+            and total_time > TEST_MAX_RUN_TIME_IN_SECONDS
             and "long" not in self.tags
         ):
             if debug_log:
@@ -1249,17 +1470,34 @@ class TestCase:
         ):
             clickhouse_execute(
                 args,
-                f"INSERT INTO system.coverage SELECT now(), '{self.case}', coverage()",
+                f"INSERT INTO system.coverage_log SELECT now(), '{self.case}', coverageCurrent()",
                 retry_error_codes=True,
             )
 
+            # Check for dumped coverage files
+            file_pattern = "coverage.*"
+            matching_files = glob.glob(file_pattern)
+            for file_path in matching_files:
+                try:
+                    body = read_file_as_binary_string(file_path)
+                    clickhouse_execute(
+                        args,
+                        f"INSERT INTO system.coverage_log SELECT now(), '{self.case}', groupArray(data) FROM input('data UInt64') FORMAT RowBinary",
+                        body=body,
+                        retry_error_codes=True,
+                    )
+                except Exception as e:
+                    print("Cannot insert coverage data: ", str(e))
+                # Remove the file even in case of exception to avoid accumulation and quadratic complexity.
+                os.remove(file_path)
+
             coverage = clickhouse_execute(
                 args,
-                "SELECT length(coverage())",
+                "SELECT length(coverageCurrent())",
                 retry_error_codes=True,
             ).decode()
 
-            description_full += f" Coverage: {coverage}"
+            description_full += f" (coverage: {coverage})"
 
         description_full += "\n"
 
@@ -1313,7 +1551,13 @@ class TestCase:
         # because there are also output of per test database creation
         pattern = "{test} > {stdout} 2> {stderr}"
 
-        if self.ext == ".sql":
+        if self.ext == ".sql" and args.cloud:
+            # Get at least some logs, because we don't have access to system.text_log and pods...
+            pattern = (
+                "{client} --send_logs_level={logs_level} {secure} --multiquery {options}"
+                " --send_logs_level=trace < {test} > {stdout}  2>> /test_output/some_logs_from_server.log"
+            )
+        elif self.ext == ".sql" and not args.cloud:
             pattern = (
                 "{client} --send_logs_level={logs_level} {secure} --multiquery {options} < "
                 + pattern
@@ -1322,6 +1566,7 @@ class TestCase:
         # We want to calculate per-test code coverage. That's why we reset it before each test.
         if (
             args.collect_per_test_coverage
+            and args.reset_coverage_before_every_test
             and BuildFlags.SANITIZE_COVERAGE in args.build_flags
         ):
             clickhouse_execute(
@@ -1332,6 +1577,7 @@ class TestCase:
 
         command = pattern.format(**params)
 
+        # pylint:disable-next=consider-using-with; TODO: fix
         proc = Popen(command, shell=True, env=os.environ, start_new_session=True)
 
         while (
@@ -1349,17 +1595,15 @@ class TestCase:
         total_time = (datetime.now() - start_time).total_seconds()
 
         # Normalize randomized database names in stdout, stderr files.
-        os.system(f"LC_ALL=C sed -i -e 's/{database}/default/g' {self.stdout_file}")
+        replace_in_file(self.stdout_file, database, "default")
         if args.hide_db_name:
-            os.system(f"LC_ALL=C sed -i -e 's/{database}/default/g' {self.stderr_file}")
+            replace_in_file(self.stderr_file, database, "default")
         if args.replicated_database:
-            os.system(f"LC_ALL=C sed -i -e 's|/auto_{{shard}}||g' {self.stdout_file}")
-            os.system(f"LC_ALL=C sed -i -e 's|auto_{{replica}}||g' {self.stdout_file}")
+            replace_in_file(self.stdout_file, "/auto_{shard}", "")
+            replace_in_file(self.stdout_file, "auto_{replica}", "")
 
         # Normalize hostname in stdout file.
-        os.system(
-            f"LC_ALL=C sed -i -e 's/{socket.gethostname()}/localhost/g' {self.stdout_file}"
-        )
+        replace_in_file(self.stdout_file, socket.gethostname(), "localhost")
 
         stdout = ""
         if os.path.exists(self.stdout_file):
@@ -1397,18 +1641,51 @@ class TestCase:
             self.testcase_args = self.configure_testcase_args(
                 args, self.case_file, suite.suite_tmp_path
             )
+
             client_options = self.add_random_settings(client_options)
-            proc, stdout, stderr, debug_log, total_time = self.run_single_test(
-                server_logs_level, client_options
-            )
 
-            result = self.process_result_impl(
-                proc, stdout, stderr, debug_log, total_time
-            )
-            result.check_if_need_retry(args, stdout, stderr, self.runs_count)
-            # to avoid breaking CSV parser
-            result.description = result.description.replace("\0", "")
+            if not is_valid_utf_8(self.case_file) or not is_valid_utf_8(
+                self.reference_file
+            ):
+                proc, stdout, stderr, debug_log, total_time = self.run_single_test(
+                    server_logs_level, client_options
+                )
 
+                result = self.process_result_impl(
+                    proc, stdout, stderr, debug_log, total_time
+                )
+                result.check_if_need_retry(args, stdout, stderr, self.runs_count)
+                # to avoid breaking CSV parser
+                result.description = result.description.replace("\0", "")
+            else:
+                with SharedEngineReplacer(
+                    self.case_file,
+                    args.replace_replicated_with_shared,
+                    args.replace_non_replicated_with_shared,
+                    False,
+                ):
+                    with SharedEngineReplacer(
+                        self.reference_file,
+                        args.replace_replicated_with_shared,
+                        args.replace_non_replicated_with_shared,
+                        True,
+                    ):
+                        (
+                            proc,
+                            stdout,
+                            stderr,
+                            debug_log,
+                            total_time,
+                        ) = self.run_single_test(server_logs_level, client_options)
+
+                        result = self.process_result_impl(
+                            proc, stdout, stderr, debug_log, total_time
+                        )
+                        result.check_if_need_retry(
+                            args, stdout, stderr, self.runs_count
+                        )
+                        # to avoid breaking CSV parser
+                        result.description = result.description.replace("\0", "")
             if result.status == TestStatus.FAIL:
                 result.description = self.add_info_about_settings(result.description)
 
@@ -1498,7 +1775,7 @@ class TestCase:
             )
 
             if len(leftover_tables) != 0:
-                raise Exception(
+                raise TestException(
                     f"The test should cleanup its tables ({leftover_tables}), otherwise it is inconvenient for running it locally."
                 )
 
@@ -1581,7 +1858,7 @@ class TestSuite:
             ):
                 return "#"
             else:
-                raise Exception(f"Unknown file_extension: {filename}")
+                raise TestException(f"Unknown file_extension: {filename}")
 
         def parse_tags_from_line(line, comment_sign) -> Set[str]:
             if not line.startswith(comment_sign):
@@ -1641,18 +1918,25 @@ class TestSuite:
         self.suite_path: str = suite_path
         self.suite_tmp_path: str = suite_tmp_path
         self.suite: str = suite
-
-        filter_func = lambda x: True  # noqa: ignore E731
+        self.cloud_skip_list: List[str] = []
+        self.private_skip_list: List[str] = []
 
         if args.run_by_hash_num is not None and args.run_by_hash_total is not None:
             if args.run_by_hash_num > args.run_by_hash_total:
-                raise Exception(
+                raise TestException(
                     f"Incorrect run by hash, value {args.run_by_hash_num} bigger than total {args.run_by_hash_total}"
                 )
 
-            filter_func = (
-                lambda x: stringhash(x) % args.run_by_hash_total == args.run_by_hash_num
-            )
+            def filter_func(x: str) -> bool:
+                return bool(
+                    stringhash(x) % args.run_by_hash_total == args.run_by_hash_num
+                )
+
+        else:
+
+            def filter_func(x: str) -> bool:
+                _ = x
+                return True
 
         self.all_tests: List[str] = self.get_tests_list(
             self.tests_in_suite_key_func, filter_func
@@ -1935,10 +2219,16 @@ def check_server_started(args):
 
     sys.stdout.flush()
     retry_count = args.server_check_retries
+    query = "SELECT version(), arrayStringConcat(groupArray(value), ' ') FROM system.build_options WHERE name IN ('GIT_HASH', 'GIT_BRANCH')"
     while retry_count > 0:
         try:
-            clickhouse_execute(args, "SELECT 1", max_http_retries=1)
+            res = (
+                str(clickhouse_execute(args, query).decode())
+                .strip()
+                .replace("\t", " @ ")
+            )
             print(" OK")
+            print(f"Connected to server {res}")
             sys.stdout.flush()
             return True
         except (ConnectionError, http.client.ImproperConnectionState) as e:
@@ -2360,6 +2650,23 @@ def reportLogStats(args):
     print("\n")
 
 
+def try_get_skip_list(base_dir, name):
+    test_names_to_skip = []
+    skip_list_path = os.path.join(base_dir, name)
+    if not os.path.exists(skip_list_path):
+        return test_names_to_skip
+
+    with open(skip_list_path, "r", encoding="utf-8") as fd:
+        for line in fd.read().split("\n"):
+            if line == "" or line[0] == " ":
+                continue
+            test_name = line.split()[0].strip()
+            if test_name != "":
+                test_names_to_skip.append(test_name)
+
+    return test_names_to_skip
+
+
 def main(args):
     global server_died
     global stop_time
@@ -2374,22 +2681,22 @@ def main(args):
             pid = get_server_pid()
             print("Got server pid", pid)
             print_stacktraces()
-        raise Exception(msg)
+        raise TestException(msg)
 
     args.build_flags = collect_build_flags(args)
     args.changed_merge_tree_settings = collect_changed_merge_tree_settings(args)
-    args.suppport_system_processes_is_all_data_sent = check_table_column(
-        args, "system", "processes", "is_all_data_sent"
-    )
 
-    if args.s3_storage and (
-        BuildFlags.THREAD in args.build_flags or BuildFlags.DEBUG in args.build_flags
-    ):
+    if args.s3_storage and (BuildFlags.RELEASE not in args.build_flags):
         args.no_random_settings = True
 
     if args.skip:
         args.skip = set(args.skip)
 
+    if args.replace_replicated_with_shared:
+        if not args.skip:
+            args.skip = set([])
+        args.skip = set(args.skip)
+
     base_dir = os.path.abspath(args.queries)
 
     # Keep same default values as in queries/shell_config.sh
@@ -2447,22 +2754,25 @@ def main(args):
         clickhouse_execute(
             args,
             """
-                CREATE TABLE IF NOT EXISTS system.coverage
+                CREATE TABLE IF NOT EXISTS system.coverage_log
                 (
                     time DateTime,
                     test_name String,
                     coverage Array(UInt64)
-                ) ENGINE = MergeTree ORDER BY test_name;
+                ) ENGINE = MergeTree ORDER BY test_name
+                COMMENT 'Contains information about per-test coverage from the CI, but used only for exporting to the CI cluster';
             """,
         )
 
         # Coverage collected at the system startup before running any tests:
         clickhouse_execute(
             args,
-            "INSERT INTO system.coverage SELECT now(), '', coverage()",
+            "INSERT INTO system.coverage_log SELECT now(), '', coverageCurrent()",
         )
 
     total_tests_run = 0
+    cloud_skip_list = try_get_skip_list(base_dir, "../queries-no-cloud-tests.txt")
+    private_skip_list = try_get_skip_list(base_dir, "../queries-no-private-tests.txt")
 
     for suite in sorted(os.listdir(base_dir), key=suite_key_func):
         if server_died.is_set():
@@ -2472,6 +2782,8 @@ def main(args):
         if test_suite is None:
             continue
 
+        test_suite.cloud_skip_list = cloud_skip_list
+        test_suite.private_skip_list = private_skip_list
         total_tests_run += do_run_tests(args.jobs, test_suite, args.parallel)
 
     if server_died.is_set():
@@ -2577,7 +2889,7 @@ def find_binary(name):
     if os.access(bin_path, os.X_OK):
         return bin_path
 
-    raise Exception(f"{name} was not found in PATH")
+    raise TestException(f"{name} was not found in PATH")
 
 
 def find_clickhouse_command(binary, command):
@@ -2591,7 +2903,14 @@ def find_clickhouse_command(binary, command):
 
 def get_additional_client_options(args):
     if args.client_option:
-        return " ".join("--" + option for option in args.client_option)
+        client_options = " ".join("--" + option for option in args.client_option)
+        if "CLICKHOUSE_CLIENT_OPT" in os.environ:
+            return os.environ["CLICKHOUSE_CLIENT_OPT"] + " " + client_options
+        else:
+            return client_options
+    else:
+        if "CLICKHOUSE_CLIENT_OPT" in os.environ:
+            return os.environ["CLICKHOUSE_CLIENT_OPT"]
     return ""
 
 
@@ -2780,6 +3099,49 @@ def parse_args():
         help="Total test groups for crc32(test_name) % run_by_hash_total == run_by_hash_num",
     )
 
+    parser.add_argument(
+        "--show-whitespaces-in-diff",
+        action="store_true",
+        help="Display $ characters after line with trailing whitespaces in diff output",
+    )
+
+    group = parser.add_mutually_exclusive_group(required=False)
+    group.add_argument(
+        "--cloud",
+        action="store_true",
+        default=None,
+        dest="cloud",
+        help="Run only tests that are supported in ClickHouse Cloud environment",
+    )
+
+    group.add_argument(
+        "--no-cloud",
+        action="store_false",
+        default=None,
+        dest="cloud",
+        help="Run all the tests, including the ones not supported in ClickHouse Cloud environment",
+    )
+    parser.set_defaults(cloud=False)
+
+    group = parser.add_mutually_exclusive_group(required=False)
+    group.add_argument(
+        "--private",
+        action="store_true",
+        default=None,
+        dest="private",
+        help="Run only tests that are supported in the private build",
+    )
+
+    group.add_argument(
+        "--no-private",
+        action="store_false",
+        default=None,
+        dest="private",
+        help="Run all the tests, including the ones not supported in the private build",
+    )
+    # Only used to skip tests via "../queries-no-private-tests.txt", so it's fine to keep it enabled by default
+    parser.set_defaults(private=True)
+
     group = parser.add_mutually_exclusive_group(required=False)
     group.add_argument(
         "--zookeeper",
@@ -2840,8 +3202,14 @@ def parse_args():
     parser.add_argument(
         "--collect-per-test-coverage",
         action="store_true",
-        default=False,
-        help="Create `system.coverage` table on the server and collect information about low-level code coverage on a per test basis there",
+        default=True,
+        help="Create `system.coverage_log` table on the server and collect information about low-level code coverage on a per test basis there",
+    )
+    parser.add_argument(
+        "--reset-coverage-before-every-test",
+        action="store_true",
+        default=True,
+        help="Collect isolated test coverage for every test instead of a cumulative. Useful only when tests are run sequentially.",
     )
     parser.add_argument(
         "--report-logs-stats",
@@ -2855,6 +3223,18 @@ def parse_args():
         default=False,
         help="Do not include tests that are not supported with parallel replicas feature",
     )
+    parser.add_argument(
+        "--replace-replicated-with-shared",
+        action="store_true",
+        default=os.environ.get("USE_META_IN_KEEPER_FOR_MERGE_TREE", False),
+        help="Replace ReplicatedMergeTree engine with SharedMergeTree",
+    )
+    parser.add_argument(
+        "--replace-non-replicated-with-shared",
+        action="store_true",
+        default=False,
+        help="Replace ordinary MergeTree engine with SharedMergeTree",
+    )
 
     return parser.parse_args()
 
@@ -2985,7 +3365,6 @@ if __name__ == "__main__":
         else:
             os.environ["CLICKHOUSE_CLIENT_OPT"] = ""
 
-        os.environ["CLICKHOUSE_CLIENT_OPT"] += get_additional_client_options(args)
         if args.secure:
             os.environ["CLICKHOUSE_CLIENT_OPT"] += " --secure "
 
@@ -2997,6 +3376,7 @@ if __name__ == "__main__":
 
         client_options_query_str = get_additional_client_options_url(args)
         args.client_options_query_str = client_options_query_str + "&"
+        args.client_options_query_str += os.environ["CLICKHOUSE_URL_PARAMS"]
         os.environ["CLICKHOUSE_URL_PARAMS"] += client_options_query_str
     else:
         args.client_options_query_str = ""
@@ -3007,4 +3387,7 @@ if __name__ == "__main__":
     if args.db_engine and args.db_engine == "Ordinary":
         MESSAGES_TO_RETRY.append(" locking attempt on ")
 
+    if args.replace_replicated_with_shared:
+        args.s3_storage = True
+
     main(args)
diff --git a/tests/config/config.d/azure_storage_conf.xml b/tests/config/config.d/azure_storage_conf.xml
index f42bb8e3cf8..412d40111a7 100644
--- a/tests/config/config.d/azure_storage_conf.xml
+++ b/tests/config/config.d/azure_storage_conf.xml
@@ -2,7 +2,8 @@
     <storage_configuration>
         <disks>
             <azure>
-                <type>azure_blob_storage</type>
+                <type>object_storage</type>
+                <object_storage_type>azure</object_storage_type>
                 <storage_account_url>http://localhost:10000/devstoreaccount1</storage_account_url>
                 <container_name>cont</container_name>
                 <skip_access_check>false</skip_access_check>
diff --git a/tests/config/config.d/backoff_failed_mutation.xml b/tests/config/config.d/backoff_failed_mutation.xml
new file mode 100644
index 00000000000..c11fbff018b
--- /dev/null
+++ b/tests/config/config.d/backoff_failed_mutation.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <max_postpone_time_for_failed_mutations_ms>200</max_postpone_time_for_failed_mutations_ms>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/block_number.xml b/tests/config/config.d/block_number.xml
new file mode 100644
index 00000000000..b56f1f1afc2
--- /dev/null
+++ b/tests/config/config.d/block_number.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <merge_tree>
+        <!-- Setting randomized for stress test, it is disabled here and this line is used to randomize it in the script -->
+        <allow_experimental_block_number_column>0</allow_experimental_block_number_column>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/config/config.d/clusters.xml b/tests/config/config.d/clusters.xml
index 7ade716902c..af26565d7e6 100644
--- a/tests/config/config.d/clusters.xml
+++ b/tests/config/config.d/clusters.xml
@@ -1,5 +1,8 @@
 <clickhouse>
     <remote_servers>
+        <!-- Remove the default remote server to avoid people depending on its hardcoded config
+             Use test_shard_localhost instead -->
+        <default remove="remove"></default>
         <test_shard_localhost>
             <shard>
                 <replica>
@@ -64,6 +67,21 @@
                  </replica>
              </shard>
         </test_cluster_two_replicas_different_databases>
+        <test_cluster_two_replicas_different_databases_internal_replication>
+             <shard>
+                 <internal_replication>true</internal_replication>
+                 <replica>
+                     <default_database>shard_0</default_database>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+                 <replica>
+                     <default_database>shard_1</default_database>
+                     <host>localhost</host>
+                     <port>9000</port>
+                 </replica>
+             </shard>
+        </test_cluster_two_replicas_different_databases_internal_replication>
         <test_cluster_interserver_secret>
             <secret>123457</secret>
             <shard>
diff --git a/tests/config/config.d/database_replicated.xml b/tests/config/config.d/database_replicated.xml
index 2504a7ca526..d8bed2f08fe 100644
--- a/tests/config/config.d/database_replicated.xml
+++ b/tests/config/config.d/database_replicated.xml
@@ -97,4 +97,5 @@
     </remote_servers>
 
     <_functional_tests_helper_database_replicated_replace_args_macros>1</_functional_tests_helper_database_replicated_replace_args_macros>
+    <max_database_replicated_create_table_thread_pool_size>50</max_database_replicated_create_table_thread_pool_size>
 </clickhouse>
diff --git a/tests/config/config.d/filesystem_caches_path.xml b/tests/config/config.d/filesystem_caches_path.xml
index ca946db2e0a..dd6933e9524 100644
--- a/tests/config/config.d/filesystem_caches_path.xml
+++ b/tests/config/config.d/filesystem_caches_path.xml
@@ -1,3 +1,4 @@
 <clickhouse>
     <filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>
+    <custom_cached_disks_base_directory replace="replace">/var/lib/clickhouse/filesystem_caches/</custom_cached_disks_base_directory>
 </clickhouse>
diff --git a/tests/config/config.d/handlers.yaml b/tests/config/config.d/handlers.yaml
new file mode 100644
index 00000000000..c77dd6578c1
--- /dev/null
+++ b/tests/config/config.d/handlers.yaml
@@ -0,0 +1,8 @@
+http_handlers:
+    rule:
+        url: '/upyachka'
+        empty_query_string:
+        handler:
+            type: redirect
+            location: "/?query=SELECT+'Pepyaka'"
+    defaults:
diff --git a/tests/config/config.d/keeper_port.xml b/tests/config/config.d/keeper_port.xml
index b87014d2485..2b04d843a3b 100644
--- a/tests/config/config.d/keeper_port.xml
+++ b/tests/config/config.d/keeper_port.xml
@@ -3,7 +3,8 @@
         <tcp_port>9181</tcp_port>
         <server_id>1</server_id>
 
-        <create_snapshot_on_exit>1</create_snapshot_on_exit>
+        <create_snapshot_on_exit>0</create_snapshot_on_exit>
+        <digest_enabled>1</digest_enabled>
 
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
@@ -23,6 +24,9 @@
             <compress_logs>0</compress_logs>
 
             <async_replication>1</async_replication>
+
+            <latest_logs_cache_size_threshold>1073741824</latest_logs_cache_size_threshold>
+            <commit_logs_cache_size_threshold>524288000</commit_logs_cache_size_threshold>
         </coordination_settings>
 
         <raft_configuration>
diff --git a/tests/config/config.d/max_num_to_warn.xml b/tests/config/config.d/max_num_to_warn.xml
index 77d68998f8e..776c270823d 100644
--- a/tests/config/config.d/max_num_to_warn.xml
+++ b/tests/config/config.d/max_num_to_warn.xml
@@ -1,5 +1,5 @@
 <clickhouse>
-    <max_table_num_to_warn>10</max_table_num_to_warn>
-    <max_database_num_to_warn>10</max_database_num_to_warn>
+    <max_table_num_to_warn>5</max_table_num_to_warn>
+    <max_database_num_to_warn>2</max_database_num_to_warn>
     <max_part_num_to_warn>10</max_part_num_to_warn>
 </clickhouse>
diff --git a/tests/config/config.d/serverwide_trace_collector.xml b/tests/config/config.d/serverwide_trace_collector.xml
new file mode 100644
index 00000000000..602e07469f3
--- /dev/null
+++ b/tests/config/config.d/serverwide_trace_collector.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+  <global_profiler_real_time_period_ns>1000000000</global_profiler_real_time_period_ns>
+  <global_profiler_cpu_time_period_ns>1000000000</global_profiler_cpu_time_period_ns>
+</clickhouse>
diff --git a/tests/config/config.d/storage_conf.xml b/tests/config/config.d/storage_conf.xml
index 18652826d83..d40854247cd 100644
--- a/tests/config/config.d/storage_conf.xml
+++ b/tests/config/config.d/storage_conf.xml
@@ -4,16 +4,22 @@
             <s3_disk>
                 <type>s3</type>
                 <path>s3_disk/</path>
-                <endpoint>http://localhost:11111/test/common/</endpoint>
+                <endpoint>http://localhost:11111/test/s3/</endpoint>
                 <access_key_id>clickhouse</access_key_id>
                 <secret_access_key>clickhouse</secret_access_key>
                 <request_timeout_ms>20000</request_timeout_ms>
             </s3_disk>
+            <s3_plain_disk>
+                <type>s3_plain</type>
+                <endpoint>http://localhost:11111/test/s3_plain/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+            </s3_plain_disk>
             <s3_cache>
                 <type>cache</type>
                 <disk>s3_disk</disk>
                 <path>s3_cache/</path>
-                <max_size>64Mi</max_size>
+                <max_size>104857600</max_size>
                 <cache_on_write_operations>1</cache_on_write_operations>
                 <delayed_cleanup_interval_ms>100</delayed_cleanup_interval_ms>
                 <cache_policy>LRU</cache_policy>
@@ -31,11 +37,13 @@
             </s3_cache_02933>
             <!-- local disks -->
             <local_disk>
-                <type>local_blob_storage</type>
+                <type>object_storage</type>
+                <object_storage_type>local</object_storage_type>
                 <path>local_disk/</path>
             </local_disk>
             <local_disk_2>
-                <type>local_blob_storage</type>
+                <type>object_storage</type>
+                <object_storage_type>local_blob_storage</object_storage_type>
                 <path>local_disk_2/</path>
             </local_disk_2>
             <local_disk_3>
diff --git a/tests/config/config.d/storage_conf_02961.xml b/tests/config/config.d/storage_conf_02961.xml
new file mode 100644
index 00000000000..436a5628e51
--- /dev/null
+++ b/tests/config/config.d/storage_conf_02961.xml
@@ -0,0 +1,43 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <disk1_02961>
+                <type>local</type>
+                <path>disk1_02961/</path>
+            </disk1_02961>
+            <disk2_02961>
+                <type>local</type>
+                <path>disk2_02961/</path>
+            </disk2_02961>
+            <disk3_02961>
+                <type>local</type>
+                <path>disk3_02961/</path>
+            </disk3_02961>
+            <disk4_02961>
+                <type>local</type>
+                <path>disk4_02961/</path>
+            </disk4_02961>
+        </disks>
+        <policies>
+            <policy_02961>
+                <volumes>
+                    <vol1_02961>
+                        <disk>disk1_02961</disk>
+                        <volume_priority>2</volume_priority>
+                    </vol1_02961>
+                    <vol_untagged2_02961>
+                        <disk>disk2_02961</disk>
+                    </vol_untagged2_02961>
+                    <vol2_02961>
+                        <disk>disk3_02961</disk>
+                        <volume_priority>1</volume_priority>
+                    </vol2_02961>
+                    <vol_untagged1_02961>
+                        <disk>disk4_02961</disk>
+                    </vol_untagged1_02961>
+                </volumes>
+                <move_factor>0.2</move_factor>
+            </policy_02961>
+        </policies>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/config/config.d/storage_conf_02963.xml b/tests/config/config.d/storage_conf_02963.xml
new file mode 100644
index 00000000000..0672965e99d
--- /dev/null
+++ b/tests/config/config.d/storage_conf_02963.xml
@@ -0,0 +1,15 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <s3_disk_02963>
+                <type>object_storage</type>
+                <object_storage_type>s3</object_storage_type>
+                <path>s3_disk/</path>
+                <endpoint>http://localhost:11111/test/common/</endpoint>
+                <access_key_id>clickhouse</access_key_id>
+                <secret_access_key>clickhouse</secret_access_key>
+                <request_timeout_ms>20000</request_timeout_ms>
+            </s3_disk_02963>
+        </disks>
+    </storage_configuration>
+</clickhouse>
diff --git a/tests/config/install.sh b/tests/config/install.sh
index e2782f0a964..06f2f5fe902 100755
--- a/tests/config/install.sh
+++ b/tests/config/install.sh
@@ -30,6 +30,7 @@ ln -sf $SRC_PATH/config.d/graphite_alternative.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/database_atomic.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/max_concurrent_queries.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree_settings.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/backoff_failed_mutation.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/merge_tree_old_dirs_cleanup.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/test_cluster_with_incorrect_pw.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/keeper_port.xml $DEST_SERVER_PATH/config.d/
@@ -64,6 +65,9 @@ ln -sf $SRC_PATH/config.d/backups.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/filesystem_caches_path.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/validate_tcp_client_information.xml $DEST_SERVER_PATH/config.d/
 ln -sf $SRC_PATH/config.d/zero_copy_destructive_operations.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/block_number.xml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/handlers.yaml $DEST_SERVER_PATH/config.d/
+ln -sf $SRC_PATH/config.d/serverwide_trace_collector.xml $DEST_SERVER_PATH/config.d/
 
 # Not supported with fasttest.
 if [ "${DEST_SERVER_PATH}" = "/etc/clickhouse-server" ]
@@ -89,7 +93,7 @@ ln -sf $SRC_PATH/users.d/nonconst_timezone.xml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/allow_introspection_functions.yaml $DEST_SERVER_PATH/users.d/
 ln -sf $SRC_PATH/users.d/replicated_ddl_entry.xml $DEST_SERVER_PATH/users.d/
 
-if [[ -n "$USE_NEW_ANALYZER" ]] && [[ "$USE_NEW_ANALYZER" -eq 1 ]]; then
+if [[ -n "$USE_OLD_ANALYZER" ]] && [[ "$USE_OLD_ANALYZER" -eq 1 ]]; then
     ln -sf $SRC_PATH/users.d/analyzer.xml $DEST_SERVER_PATH/users.d/
 fi
 
@@ -133,6 +137,12 @@ fi
 value=$(($RANDOM % 2))
 sed --follow-symlinks -i "s|<create_snapshot_on_exit>[01]</create_snapshot_on_exit>|<create_snapshot_on_exit>$value</create_snapshot_on_exit>|" $DEST_SERVER_PATH/config.d/keeper_port.xml
 
+value=$((($RANDOM + 100) * 2048))
+sed --follow-symlinks -i "s|<latest_logs_cache_size_threshold>[[:digit:]]\+</latest_logs_cache_size_threshold>|<latest_logs_cache_size_threshold>$value</latest_logs_cache_size_threshold>|" $DEST_SERVER_PATH/config.d/keeper_port.xml
+
+value=$((($RANDOM + 100) * 2048))
+sed --follow-symlinks -i "s|<commit_logs_cache_size_threshold>[[:digit:]]\+</commit_logs_cache_size_threshold>|<commit_logs_cache_size_threshold>$value</commit_logs_cache_size_threshold>|" $DEST_SERVER_PATH/config.d/keeper_port.xml
+
 if [[ -n "$USE_POLYMORPHIC_PARTS" ]] && [[ "$USE_POLYMORPHIC_PARTS" -eq 1 ]]; then
     ln -sf $SRC_PATH/config.d/polymorphic_parts.xml $DEST_SERVER_PATH/config.d/
 fi
@@ -176,6 +186,8 @@ if [[ -n "$EXPORT_S3_STORAGE_POLICIES" ]]; then
 
     ln -sf $SRC_PATH/config.d/storage_conf.xml $DEST_SERVER_PATH/config.d/
     ln -sf $SRC_PATH/config.d/storage_conf_02944.xml $DEST_SERVER_PATH/config.d/
+    ln -sf $SRC_PATH/config.d/storage_conf_02963.xml $DEST_SERVER_PATH/config.d/
+    ln -sf $SRC_PATH/config.d/storage_conf_02961.xml $DEST_SERVER_PATH/config.d/
     ln -sf $SRC_PATH/users.d/s3_cache.xml $DEST_SERVER_PATH/users.d/
     ln -sf $SRC_PATH/users.d/s3_cache_new.xml $DEST_SERVER_PATH/users.d/
 fi
diff --git a/tests/config/users.d/analyzer.xml b/tests/config/users.d/analyzer.xml
index aa374364ef0..4b9764526fa 100644
--- a/tests/config/users.d/analyzer.xml
+++ b/tests/config/users.d/analyzer.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <profiles>
         <default>
-            <allow_experimental_analyzer>1</allow_experimental_analyzer>
+            <allow_experimental_analyzer>0</allow_experimental_analyzer>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/config/users.d/readonly.xml b/tests/config/users.d/readonly.xml
index 0fe1e3fe6d9..799de11decf 100644
--- a/tests/config/users.d/readonly.xml
+++ b/tests/config/users.d/readonly.xml
@@ -9,7 +9,8 @@
     <users>
         <readonly>
             <password></password>
-            <networks incl="networks" replace="replace">
+
+            <networks>
                 <ip>::1</ip>
                 <ip>127.0.0.1</ip>
             </networks>
diff --git a/tests/config/users.d/session_log_test.xml b/tests/config/users.d/session_log_test.xml
index cc2c2c5fcde..f93b0efd828 100644
--- a/tests/config/users.d/session_log_test.xml
+++ b/tests/config/users.d/session_log_test.xml
@@ -18,7 +18,8 @@
     <users>
         <session_log_test_xml_user>
             <no_password></no_password>
-            <networks incl="networks" replace="replace">
+
+            <networks>
                 <ip>::1</ip>
                 <ip>127.0.0.1</ip>
             </networks>
diff --git a/tests/fuzz/README.md b/tests/fuzz/README.md
index 5b864babde3..6b5b161b2d5 100644
--- a/tests/fuzz/README.md
+++ b/tests/fuzz/README.md
@@ -1,13 +1,23 @@
-The list of functions generated via following query
+The list of functions generated via the following query
 
 ```
-    clickhouse-client -q "select concat('\"', name, '\"') from system.functions union all select concat('\"', alias_to, '\"') from system.functions where alias_to != '' " > functions.dict
+    clickhouse client -q "SELECT * FROM (SELECT DISTINCT concat('\"', name, '\"') as res FROM system.functions ORDER BY name UNION ALL SELECT concat('\"', a.name, b.name, '\"') as res FROM system.functions as a CROSS JOIN system.aggregate_function_combinators as b WHERE a.is_aggregate = 1) ORDER BY res" > functions.dict
 ```
 
-The list of datatypes generated via following query:
+The list of datatypes generated via the following query:
 
 ```
-    clickhouse-client -q "select concat('\"', name, '\"') from system.data_type_families union all select concat('\"', alias_to, '\"') from system.data_type_families where alias_to != '' " > datatypes.dict
+    clickhouse client -q "SELECT DISTINCT concat('\"', name, '\"') as res FROM system.data_type_families ORDER BY name" > datatypes.dict
+```
+
+The list of keywords generated via the following query:
+
+```
+    clickhouse client -q "SELECT DISTINCT concat('\"', keyword, '\"') as res FROM system.keywords ORDER BY keyword" > key_words.dict
 ```
 
 Then merge all dictionaries into one (all.dict)
+
+```
+    cat ./dictionaries/* | sort | uniq > all.dict
+```
\ No newline at end of file
diff --git a/tests/fuzz/all.dict b/tests/fuzz/all.dict
index b38e2c11a1c..f08e319f0d4 100644
--- a/tests/fuzz/all.dict
+++ b/tests/fuzz/all.dict
@@ -1,59 +1,333 @@
-
 "abs"
-"accurate_Cast"
 "accurateCast"
-"accurate_CastOrNull"
+"accurateCastOrDefault"
 "accurateCastOrNull"
 "acos"
 "acosh"
 "ADD"
 "ADD COLUMN"
 "ADD CONSTRAINT"
+"addDate"
 "addDays"
 "addHours"
 "ADD INDEX"
+"addInterval"
+"addMicroseconds"
+"addMilliseconds"
 "addMinutes"
 "addMonths"
+"addNanoseconds"
+"ADD PROJECTION"
 "addQuarters"
 "addressToLine"
+"addressToLineWithInlines"
 "addressToSymbol"
 "addSeconds"
+"ADD STATISTIC"
+"addTupleOfIntervals"
 "addWeeks"
 "addYears"
+"ADMIN OPTION FOR"
 "aes_decrypt_mysql"
 "aes_encrypt_mysql"
 "AFTER"
+"age"
 "AggregateFunction"
 "aggThrow"
+"aggThrowArgMax"
+"aggThrowArgMin"
+"aggThrowArray"
+"aggThrowDistinct"
+"aggThrowForEach"
+"aggThrowIf"
+"aggThrowMap"
+"aggThrowMerge"
+"aggThrowNull"
+"aggThrowOrDefault"
+"aggThrowOrNull"
+"aggThrowResample"
+"aggThrowSimpleState"
+"aggThrowState"
+"ALGORITHM"
 "ALIAS"
 "ALL"
+"ALLOWED_LATENESS"
 "alphaTokens"
 "ALTER"
+"ALTER COLUMN"
+"ALTER DATABASE"
 "ALTER LIVE VIEW"
+"ALTER POLICY"
+"ALTER PROFILE"
+"ALTER QUOTA"
+"ALTER ROLE"
+"ALTER ROW POLICY"
+"ALTER SETTINGS PROFILE"
 "ALTER TABLE"
+"ALTER TEMPORARY TABLE"
+"ALTER USER"
+"analysisOfVariance"
+"analysisOfVarianceArgMax"
+"analysisOfVarianceArgMin"
+"analysisOfVarianceArray"
+"analysisOfVarianceDistinct"
+"analysisOfVarianceForEach"
+"analysisOfVarianceIf"
+"analysisOfVarianceMap"
+"analysisOfVarianceMerge"
+"analysisOfVarianceNull"
+"analysisOfVarianceOrDefault"
+"analysisOfVarianceOrNull"
+"analysisOfVarianceResample"
+"analysisOfVarianceSimpleState"
+"analysisOfVarianceState"
 "and"
 "AND"
+"AND STDOUT"
+"anova"
+"anovaArgMax"
+"anovaArgMin"
+"anovaArray"
+"anovaDistinct"
+"anovaForEach"
+"anovaIf"
+"anovaMap"
+"anovaMerge"
+"anovaNull"
+"anovaOrDefault"
+"anovaOrNull"
+"anovaResample"
+"anovaSimpleState"
+"anovaState"
 "ANTI"
 "any"
 "ANY"
+"anyArgMax"
+"anyArgMin"
+"anyArray"
+"anyDistinct"
+"anyForEach"
 "anyHeavy"
+"anyHeavyArgMax"
+"anyHeavyArgMin"
+"anyHeavyArray"
+"anyHeavyDistinct"
+"anyHeavyForEach"
+"anyHeavyIf"
+"anyHeavyMap"
+"anyHeavyMerge"
+"anyHeavyNull"
+"anyHeavyOrDefault"
+"anyHeavyOrNull"
+"anyHeavyResample"
+"anyHeavySimpleState"
+"anyHeavyState"
+"anyIf"
 "anyLast"
+"anyLastArgMax"
+"anyLastArgMin"
+"anyLastArray"
+"anyLastDistinct"
+"anyLastForEach"
+"anyLastIf"
+"anyLastMap"
+"anyLastMerge"
+"anyLastNull"
+"anyLastOrDefault"
+"anyLastOrNull"
+"anyLastResample"
+"anyLast_respect_nulls"
+"anyLast_respect_nullsArgMax"
+"anyLast_respect_nullsArgMin"
+"anyLast_respect_nullsArray"
+"anyLast_respect_nullsDistinct"
+"anyLast_respect_nullsForEach"
+"anyLast_respect_nullsIf"
+"anyLast_respect_nullsMap"
+"anyLast_respect_nullsMerge"
+"anyLast_respect_nullsNull"
+"anyLast_respect_nullsOrDefault"
+"anyLast_respect_nullsOrNull"
+"anyLast_respect_nullsResample"
+"anyLast_respect_nullsSimpleState"
+"anyLast_respect_nullsState"
+"anyLastSimpleState"
+"anyLastState"
+"anyMap"
+"anyMerge"
+"anyNull"
+"anyOrDefault"
+"anyOrNull"
+"anyResample"
+"any_respect_nulls"
+"any_respect_nullsArgMax"
+"any_respect_nullsArgMin"
+"any_respect_nullsArray"
+"any_respect_nullsDistinct"
+"any_respect_nullsForEach"
+"any_respect_nullsIf"
+"any_respect_nullsMap"
+"any_respect_nullsMerge"
+"any_respect_nullsNull"
+"any_respect_nullsOrDefault"
+"any_respect_nullsOrNull"
+"any_respect_nullsResample"
+"any_respect_nullsSimpleState"
+"any_respect_nullsState"
+"anySimpleState"
+"anyState"
+"any_value"
+"any_valueArgMax"
+"any_valueArgMin"
+"any_valueArray"
+"any_valueDistinct"
+"any_valueForEach"
+"any_valueIf"
+"any_valueMap"
+"any_valueMerge"
+"any_valueNull"
+"any_valueOrDefault"
+"any_valueOrNull"
+"any_valueResample"
+"any_value_respect_nulls"
+"any_value_respect_nullsArgMax"
+"any_value_respect_nullsArgMin"
+"any_value_respect_nullsArray"
+"any_value_respect_nullsDistinct"
+"any_value_respect_nullsForEach"
+"any_value_respect_nullsIf"
+"any_value_respect_nullsMap"
+"any_value_respect_nullsMerge"
+"any_value_respect_nullsNull"
+"any_value_respect_nullsOrDefault"
+"any_value_respect_nullsOrNull"
+"any_value_respect_nullsResample"
+"any_value_respect_nullsSimpleState"
+"any_value_respect_nullsState"
+"any_valueSimpleState"
+"any_valueState"
+"APPEND"
 "appendTrailingCharIfAbsent"
+"APPLY"
+"APPLY DELETED MASK"
+"approx_top_count"
+"approx_top_countArgMax"
+"approx_top_countArgMin"
+"approx_top_countArray"
+"approx_top_countDistinct"
+"approx_top_countForEach"
+"approx_top_countIf"
+"approx_top_countMap"
+"approx_top_countMerge"
+"approx_top_countNull"
+"approx_top_countOrDefault"
+"approx_top_countOrNull"
+"approx_top_countResample"
+"approx_top_countSimpleState"
+"approx_top_countState"
+"approx_top_k"
+"approx_top_kArgMax"
+"approx_top_kArgMin"
+"approx_top_kArray"
+"approx_top_kDistinct"
+"approx_top_kForEach"
+"approx_top_kIf"
+"approx_top_kMap"
+"approx_top_kMerge"
+"approx_top_kNull"
+"approx_top_kOrDefault"
+"approx_top_kOrNull"
+"approx_top_kResample"
+"approx_top_kSimpleState"
+"approx_top_kState"
+"approx_top_sum"
+"approx_top_sumArgMax"
+"approx_top_sumArgMin"
+"approx_top_sumArray"
+"approx_top_sumDistinct"
+"approx_top_sumForEach"
+"approx_top_sumIf"
+"approx_top_sumMap"
+"approx_top_sumMerge"
+"approx_top_sumNull"
+"approx_top_sumOrDefault"
+"approx_top_sumOrNull"
+"approx_top_sumResample"
+"approx_top_sumSimpleState"
+"approx_top_sumState"
 "argMax"
+"argMaxArgMax"
+"argMaxArgMin"
+"argMaxArray"
+"argMaxDistinct"
+"argMaxForEach"
+"argMaxIf"
+"argMaxMap"
+"argMaxMerge"
+"argMaxNull"
+"argMaxOrDefault"
+"argMaxOrNull"
+"argMaxResample"
+"argMaxSimpleState"
+"argMaxState"
 "argMin"
+"argMinArgMax"
+"argMinArgMin"
+"argMinArray"
+"argMinDistinct"
+"argMinForEach"
+"argMinIf"
+"argMinMap"
+"argMinMerge"
+"argMinNull"
+"argMinOrDefault"
+"argMinOrNull"
+"argMinResample"
+"argMinSimpleState"
+"argMinState"
 "array"
 "Array"
-"ARRAY"
+"array_agg"
+"array_aggArgMax"
+"array_aggArgMin"
+"array_aggArray"
+"array_aggDistinct"
+"array_aggForEach"
+"array_aggIf"
+"array_aggMap"
+"array_aggMerge"
+"array_aggNull"
+"array_aggOrDefault"
+"array_aggOrNull"
+"array_aggResample"
+"array_aggSimpleState"
+"array_aggState"
 "arrayAll"
 "arrayAUC"
 "arrayAvg"
 "arrayCompact"
 "arrayConcat"
+"array_concat_agg"
+"array_concat_aggArgMax"
+"array_concat_aggArgMin"
+"array_concat_aggArray"
+"array_concat_aggDistinct"
+"array_concat_aggForEach"
+"array_concat_aggIf"
+"array_concat_aggMap"
+"array_concat_aggMerge"
+"array_concat_aggNull"
+"array_concat_aggOrDefault"
+"array_concat_aggOrNull"
+"array_concat_aggResample"
+"array_concat_aggSimpleState"
+"array_concat_aggState"
 "arrayCount"
 "arrayCumSum"
 "arrayCumSumNonNegative"
 "arrayDifference"
 "arrayDistinct"
+"arrayDotProduct"
 "arrayElement"
 "arrayEnumerate"
 "arrayEnumerateDense"
@@ -65,10 +339,16 @@
 "arrayFilter"
 "arrayFirst"
 "arrayFirstIndex"
+"arrayFirstOrNull"
 "arrayFlatten"
+"arrayFold"
 "arrayIntersect"
+"arrayJaccardIndex"
 "arrayJoin"
 "ARRAY JOIN"
+"arrayLast"
+"arrayLastIndex"
+"arrayLastOrNull"
 "arrayMap"
 "arrayMax"
 "arrayMin"
@@ -80,6 +360,7 @@
 "arrayProduct"
 "arrayPushBack"
 "arrayPushFront"
+"arrayRandomSample"
 "arrayReduce"
 "arrayReduceInRanges"
 "arrayResize"
@@ -87,6 +368,11 @@
 "arrayReverseFill"
 "arrayReverseSort"
 "arrayReverseSplit"
+"arrayRotateLeft"
+"arrayRotateRight"
+"arrayShiftLeft"
+"arrayShiftRight"
+"arrayShingles"
 "arrayShuffle"
 "arraySlice"
 "arraySort"
@@ -99,9 +385,11 @@
 "AS"
 "ASC"
 "ASCENDING"
+"ascii"
 "asin"
 "asinh"
 "ASOF"
+"ASSUME"
 "assumeNotNull"
 "AST"
 "ASYNC"
@@ -111,14 +399,59 @@
 "ATTACH"
 "ATTACH PART"
 "ATTACH PARTITION"
+"ATTACH POLICY"
+"ATTACH PROFILE"
+"ATTACH QUOTA"
+"ATTACH ROLE"
+"ATTACH ROW POLICY"
+"ATTACH SETTINGS PROFILE"
+"ATTACH USER"
+"AUTO_INCREMENT"
 "avg"
+"avgArgMax"
+"avgArgMin"
+"avgArray"
+"avgDistinct"
+"avgForEach"
+"avgIf"
+"avgMap"
+"avgMerge"
+"avgNull"
+"avgOrDefault"
+"avgOrNull"
+"avgResample"
+"avgSimpleState"
+"avgState"
 "avgWeighted"
+"avgWeightedArgMax"
+"avgWeightedArgMin"
+"avgWeightedArray"
+"avgWeightedDistinct"
+"avgWeightedForEach"
+"avgWeightedIf"
+"avgWeightedMap"
+"avgWeightedMerge"
+"avgWeightedNull"
+"avgWeightedOrDefault"
+"avgWeightedOrNull"
+"avgWeightedResample"
+"avgWeightedSimpleState"
+"avgWeightedState"
+"AZURE"
+"BACKUP"
+"bagexpansion"
 "bar"
+"base58Decode"
+"base58Encode"
 "base64Decode"
 "base64Encode"
+"base_backup"
 "basename"
-"bayesAB"
+"BCRYPT_HASH"
+"BCRYPT_PASSWORD"
+"BEGIN TRANSACTION"
 "BETWEEN"
+"BIDIRECTIONAL"
 "BIGINT"
 "BIGINT SIGNED"
 "BIGINT UNSIGNED"
@@ -126,8 +459,23 @@
 "BINARY"
 "BINARY LARGE OBJECT"
 "BINARY VARYING"
+"BIT"
 "bitAnd"
 "BIT_AND"
+"BIT_ANDArgMax"
+"BIT_ANDArgMin"
+"BIT_ANDArray"
+"BIT_ANDDistinct"
+"BIT_ANDForEach"
+"BIT_ANDIf"
+"BIT_ANDMap"
+"BIT_ANDMerge"
+"BIT_ANDNull"
+"BIT_ANDOrDefault"
+"BIT_ANDOrNull"
+"BIT_ANDResample"
+"BIT_ANDSimpleState"
+"BIT_ANDState"
 "__bitBoolMaskAnd"
 "__bitBoolMaskOr"
 "bitCount"
@@ -156,11 +504,26 @@
 "bitNot"
 "bitOr"
 "BIT_OR"
+"BIT_ORArgMax"
+"BIT_ORArgMin"
+"BIT_ORArray"
+"BIT_ORDistinct"
+"BIT_ORForEach"
+"BIT_ORIf"
+"BIT_ORMap"
+"BIT_ORMerge"
+"BIT_ORNull"
+"BIT_OROrDefault"
+"BIT_OROrNull"
+"BIT_ORResample"
+"BIT_ORSimpleState"
+"BIT_ORState"
 "bitPositionsToArray"
 "bitRotateLeft"
 "bitRotateRight"
 "bitShiftLeft"
 "bitShiftRight"
+"bitSlice"
 "__bitSwapLastTwo"
 "bitTest"
 "bitTestAll"
@@ -168,19 +531,53 @@
 "__bitWrapperFunc"
 "bitXor"
 "BIT_XOR"
+"BIT_XORArgMax"
+"BIT_XORArgMin"
+"BIT_XORArray"
+"BIT_XORDistinct"
+"BIT_XORForEach"
+"BIT_XORIf"
+"BIT_XORMap"
+"BIT_XORMerge"
+"BIT_XORNull"
+"BIT_XOROrDefault"
+"BIT_XOROrNull"
+"BIT_XORResample"
+"BIT_XORSimpleState"
+"BIT_XORState"
+"BLAKE3"
 "BLOB"
 "blockNumber"
 "blockSerializedSize"
 "blockSize"
-"BOOL"
-"BOOLEAN"
+"bool"
+"Bool"
+"boolean"
 "BOTH"
 "boundingRatio"
+"boundingRatioArgMax"
+"boundingRatioArgMin"
+"boundingRatioArray"
+"boundingRatioDistinct"
+"boundingRatioForEach"
+"boundingRatioIf"
+"boundingRatioMap"
+"boundingRatioMerge"
+"boundingRatioNull"
+"boundingRatioOrDefault"
+"boundingRatioOrNull"
+"boundingRatioResample"
+"boundingRatioSimpleState"
+"boundingRatioState"
 "buildId"
 "BY"
 "BYTE"
 "BYTEA"
+"byteHammingDistance"
 "byteSize"
+"byteSlice"
+"byteSwap"
+"CASCADE"
 "CASE"
 "caseWithExpr"
 "caseWithExpression"
@@ -188,10 +585,28 @@
 "caseWithoutExpression"
 "_CAST"
 "CAST"
+"catboostEvaluate"
 "categoricalInformationValue"
+"categoricalInformationValueArgMax"
+"categoricalInformationValueArgMin"
+"categoricalInformationValueArray"
+"categoricalInformationValueDistinct"
+"categoricalInformationValueForEach"
+"categoricalInformationValueIf"
+"categoricalInformationValueMap"
+"categoricalInformationValueMerge"
+"categoricalInformationValueNull"
+"categoricalInformationValueOrDefault"
+"categoricalInformationValueOrNull"
+"categoricalInformationValueResample"
+"categoricalInformationValueSimpleState"
+"categoricalInformationValueState"
 "cbrt"
 "ceil"
 "ceiling"
+"CHANGE"
+"CHANGEABLE_IN_READONLY"
+"CHANGED"
 "char"
 "CHAR"
 "CHARACTER"
@@ -202,13 +617,19 @@
 "CHAR_LENGTH"
 "CHAR VARYING"
 "CHECK"
+"CHECK ALL TABLES"
 "CHECK TABLE"
 "cityHash64"
-"CLEAR"
+"CLEANUP"
 "CLEAR COLUMN"
 "CLEAR INDEX"
+"CLEAR PROJECTION"
+"CLEAR STATISTIC"
 "CLOB"
 "CLUSTER"
+"cluster_host_ids"
+"CLUSTERS"
+"CN"
 "coalesce"
 "CODEC"
 "COLLATE"
@@ -216,52 +637,301 @@
 "COLUMNS"
 "COMMENT"
 "COMMENT COLUMN"
+"COMMIT"
+"COMPRESSION"
 "concat"
 "concatAssumeInjective"
+"concatWithSeparator"
+"concatWithSeparatorAssumeInjective"
+"concat_ws"
 "connection_id"
-"connectionid"
 "connectionId"
+"CONST"
 "CONSTRAINT"
+"contingency"
+"contingencyArgMax"
+"contingencyArgMin"
+"contingencyArray"
+"contingencyDistinct"
+"contingencyForEach"
+"contingencyIf"
+"contingencyMap"
+"contingencyMerge"
+"contingencyNull"
+"contingencyOrDefault"
+"contingencyOrNull"
+"contingencyResample"
+"contingencySimpleState"
+"contingencyState"
 "convertCharset"
 "corr"
+"corrArgMax"
+"corrArgMin"
+"corrArray"
+"corrDistinct"
+"corrForEach"
+"corrIf"
+"corrMap"
+"corrMatrix"
+"corrMatrixArgMax"
+"corrMatrixArgMin"
+"corrMatrixArray"
+"corrMatrixDistinct"
+"corrMatrixForEach"
+"corrMatrixIf"
+"corrMatrixMap"
+"corrMatrixMerge"
+"corrMatrixNull"
+"corrMatrixOrDefault"
+"corrMatrixOrNull"
+"corrMatrixResample"
+"corrMatrixSimpleState"
+"corrMatrixState"
+"corrMerge"
+"corrNull"
+"corrOrDefault"
+"corrOrNull"
+"corrResample"
+"corrSimpleState"
 "corrStable"
+"corrStableArgMax"
+"corrStableArgMin"
+"corrStableArray"
+"corrStableDistinct"
+"corrStableForEach"
+"corrStableIf"
+"corrStableMap"
+"corrStableMerge"
+"corrStableNull"
+"corrStableOrDefault"
+"corrStableOrNull"
+"corrStableResample"
+"corrStableSimpleState"
+"corrStableState"
+"corrState"
 "cos"
 "cosh"
+"cosineDistance"
 "count"
+"countArgMax"
+"countArgMin"
+"countArray"
 "countDigits"
+"countDistinct"
 "countEqual"
+"countForEach"
+"countIf"
+"countMap"
 "countMatches"
 "countMatchesCaseInsensitive"
+"countMerge"
+"countNull"
+"countOrDefault"
+"countOrNull"
+"countResample"
+"countSimpleState"
+"countState"
 "countSubstrings"
 "countSubstringsCaseInsensitive"
 "countSubstringsCaseInsensitiveUTF8"
 "covarPop"
 "COVAR_POP"
+"covarPopArgMax"
+"COVAR_POPArgMax"
+"covarPopArgMin"
+"COVAR_POPArgMin"
+"covarPopArray"
+"COVAR_POPArray"
+"covarPopDistinct"
+"COVAR_POPDistinct"
+"covarPopForEach"
+"COVAR_POPForEach"
+"covarPopIf"
+"COVAR_POPIf"
+"covarPopMap"
+"COVAR_POPMap"
+"covarPopMatrix"
+"covarPopMatrixArgMax"
+"covarPopMatrixArgMin"
+"covarPopMatrixArray"
+"covarPopMatrixDistinct"
+"covarPopMatrixForEach"
+"covarPopMatrixIf"
+"covarPopMatrixMap"
+"covarPopMatrixMerge"
+"covarPopMatrixNull"
+"covarPopMatrixOrDefault"
+"covarPopMatrixOrNull"
+"covarPopMatrixResample"
+"covarPopMatrixSimpleState"
+"covarPopMatrixState"
+"covarPopMerge"
+"COVAR_POPMerge"
+"covarPopNull"
+"COVAR_POPNull"
+"covarPopOrDefault"
+"COVAR_POPOrDefault"
+"covarPopOrNull"
+"COVAR_POPOrNull"
+"covarPopResample"
+"COVAR_POPResample"
+"covarPopSimpleState"
+"COVAR_POPSimpleState"
 "covarPopStable"
+"covarPopStableArgMax"
+"covarPopStableArgMin"
+"covarPopStableArray"
+"covarPopStableDistinct"
+"covarPopStableForEach"
+"covarPopStableIf"
+"covarPopStableMap"
+"covarPopStableMerge"
+"covarPopStableNull"
+"covarPopStableOrDefault"
+"covarPopStableOrNull"
+"covarPopStableResample"
+"covarPopStableSimpleState"
+"covarPopStableState"
+"covarPopState"
+"COVAR_POPState"
 "covarSamp"
 "COVAR_SAMP"
+"covarSampArgMax"
+"COVAR_SAMPArgMax"
+"covarSampArgMin"
+"COVAR_SAMPArgMin"
+"covarSampArray"
+"COVAR_SAMPArray"
+"covarSampDistinct"
+"COVAR_SAMPDistinct"
+"covarSampForEach"
+"COVAR_SAMPForEach"
+"covarSampIf"
+"COVAR_SAMPIf"
+"covarSampMap"
+"COVAR_SAMPMap"
+"covarSampMatrix"
+"covarSampMatrixArgMax"
+"covarSampMatrixArgMin"
+"covarSampMatrixArray"
+"covarSampMatrixDistinct"
+"covarSampMatrixForEach"
+"covarSampMatrixIf"
+"covarSampMatrixMap"
+"covarSampMatrixMerge"
+"covarSampMatrixNull"
+"covarSampMatrixOrDefault"
+"covarSampMatrixOrNull"
+"covarSampMatrixResample"
+"covarSampMatrixSimpleState"
+"covarSampMatrixState"
+"covarSampMerge"
+"COVAR_SAMPMerge"
+"covarSampNull"
+"COVAR_SAMPNull"
+"covarSampOrDefault"
+"COVAR_SAMPOrDefault"
+"covarSampOrNull"
+"COVAR_SAMPOrNull"
+"covarSampResample"
+"COVAR_SAMPResample"
+"covarSampSimpleState"
+"COVAR_SAMPSimpleState"
 "covarSampStable"
+"covarSampStableArgMax"
+"covarSampStableArgMin"
+"covarSampStableArray"
+"covarSampStableDistinct"
+"covarSampStableForEach"
+"covarSampStableIf"
+"covarSampStableMap"
+"covarSampStableMerge"
+"covarSampStableNull"
+"covarSampStableOrDefault"
+"covarSampStableOrNull"
+"covarSampStableResample"
+"covarSampStableSimpleState"
+"covarSampStableState"
+"covarSampState"
+"COVAR_SAMPState"
+"cramersV"
+"cramersVArgMax"
+"cramersVArgMin"
+"cramersVArray"
+"cramersVBiasCorrected"
+"cramersVBiasCorrectedArgMax"
+"cramersVBiasCorrectedArgMin"
+"cramersVBiasCorrectedArray"
+"cramersVBiasCorrectedDistinct"
+"cramersVBiasCorrectedForEach"
+"cramersVBiasCorrectedIf"
+"cramersVBiasCorrectedMap"
+"cramersVBiasCorrectedMerge"
+"cramersVBiasCorrectedNull"
+"cramersVBiasCorrectedOrDefault"
+"cramersVBiasCorrectedOrNull"
+"cramersVBiasCorrectedResample"
+"cramersVBiasCorrectedSimpleState"
+"cramersVBiasCorrectedState"
+"cramersVDistinct"
+"cramersVForEach"
+"cramersVIf"
+"cramersVMap"
+"cramersVMerge"
+"cramersVNull"
+"cramersVOrDefault"
+"cramersVOrNull"
+"cramersVResample"
+"cramersVSimpleState"
+"cramersVState"
 "CRC32"
 "CRC32IEEE"
 "CRC64"
 "CREATE"
+"CREATE POLICY"
+"CREATE PROFILE"
+"CREATE QUOTA"
+"CREATE ROLE"
+"CREATE ROW POLICY"
+"CREATE SETTINGS PROFILE"
+"CREATE TABLE"
+"CREATE TEMPORARY TABLE"
+"CREATE USER"
 "CROSS"
 "CUBE"
+"curdate"
+"current_database"
 "currentDatabase"
+"current_date"
+"CURRENT GRANTS"
 "currentProfiles"
+"CURRENT QUOTA"
 "currentRoles"
+"CURRENT ROLES"
+"CURRENT ROW"
+"current_schemas"
+"currentSchemas"
+"current_timestamp"
+"CURRENT TRANSACTION"
 "currentUser"
+"CURRENT_USER"
+"CURRENTUSER"
 "cutFragment"
 "cutIPv6"
 "cutQueryString"
 "cutQueryStringAndFragment"
 "cutToFirstSignificantSubdomain"
 "cutToFirstSignificantSubdomainCustom"
+"cutToFirstSignificantSubdomainCustomRFC"
 "cutToFirstSignificantSubdomainCustomWithWWW"
+"cutToFirstSignificantSubdomainCustomWithWWWRFC"
+"cutToFirstSignificantSubdomainRFC"
 "cutToFirstSignificantSubdomainWithWWW"
+"cutToFirstSignificantSubdomainWithWWWRFC"
 "cutURLParameter"
 "cutWWW"
 "D"
+"damerauLevenshteinDistance"
 "DATABASE"
 "DATABASES"
 "Date"
@@ -269,9 +939,11 @@
 "Date32"
 "DATE_ADD"
 "DATEADD"
+"date_diff"
 "dateDiff"
 "DATE_DIFF"
 "DATEDIFF"
+"DATE_FORMAT"
 "dateName"
 "DATE_SUB"
 "DATESUB"
@@ -280,12 +952,13 @@
 "DateTime64"
 "dateTime64ToSnowflake"
 "dateTimeToSnowflake"
-"date_trunc"
 "dateTrunc"
+"DATE_TRUNC"
 "DAY"
 "DAYOFMONTH"
 "DAYOFWEEK"
 "DAYOFYEAR"
+"DAYS"
 "DD"
 "DEC"
 "Decimal"
@@ -293,28 +966,84 @@
 "Decimal256"
 "Decimal32"
 "Decimal64"
+"decodeHTMLComponent"
 "decodeURLComponent"
+"decodeURLFormComponent"
 "decodeXMLComponent"
 "decrypt"
 "DEDUPLICATE"
 "DEFAULT"
+"DEFAULT DATABASE"
 "defaultProfiles"
+"DEFAULT ROLE"
 "defaultRoles"
 "defaultValueOfArgumentType"
 "defaultValueOfTypeName"
-"DELAY"
+"DEFINER"
+"degrees"
 "DELETE"
 "DELETE WHERE"
 "deltaSum"
+"deltaSumArgMax"
+"deltaSumArgMin"
+"deltaSumArray"
+"deltaSumDistinct"
+"deltaSumForEach"
+"deltaSumIf"
+"deltaSumMap"
+"deltaSumMerge"
+"deltaSumNull"
+"deltaSumOrDefault"
+"deltaSumOrNull"
+"deltaSumResample"
+"deltaSumSimpleState"
+"deltaSumState"
 "deltaSumTimestamp"
+"deltaSumTimestampArgMax"
+"deltaSumTimestampArgMin"
+"deltaSumTimestampArray"
+"deltaSumTimestampDistinct"
+"deltaSumTimestampForEach"
+"deltaSumTimestampIf"
+"deltaSumTimestampMap"
+"deltaSumTimestampMerge"
+"deltaSumTimestampNull"
+"deltaSumTimestampOrDefault"
+"deltaSumTimestampOrNull"
+"deltaSumTimestampResample"
+"deltaSumTimestampSimpleState"
+"deltaSumTimestampState"
 "demangle"
 "dense_rank"
+"dense_rankArgMax"
+"dense_rankArgMin"
+"dense_rankArray"
+"dense_rankDistinct"
+"dense_rankForEach"
+"dense_rankIf"
+"dense_rankMap"
+"dense_rankMerge"
+"dense_rankNull"
+"dense_rankOrDefault"
+"dense_rankOrNull"
+"dense_rankResample"
+"dense_rankSimpleState"
+"dense_rankState"
+"DEPENDS ON"
 "DESC"
 "DESCENDING"
 "DESCRIBE"
 "DETACH"
+"DETACH PART"
 "DETACH PARTITION"
+"detectCharset"
+"detectLanguage"
+"detectLanguageMixed"
+"detectLanguageUnknown"
+"detectProgrammingLanguage"
+"detectTonality"
 "dictGet"
+"dictGetAll"
 "dictGetChildren"
 "dictGetDate"
 "dictGetDateOrDefault"
@@ -334,6 +1063,10 @@
 "dictGetInt64OrDefault"
 "dictGetInt8"
 "dictGetInt8OrDefault"
+"dictGetIPv4"
+"dictGetIPv4OrDefault"
+"dictGetIPv6"
+"dictGetIPv6OrDefault"
 "dictGetOrDefault"
 "dictGetOrNull"
 "dictGetString"
@@ -353,24 +1086,45 @@
 "DICTIONARY"
 "dictIsIn"
 "DISK"
+"displayName"
+"distanceL1"
+"distanceL2"
+"distanceL2Squared"
+"distanceLinf"
+"distanceLp"
 "DISTINCT"
-"DISTRIBUTED"
+"DISTINCT ON"
+"DIV"
 "divide"
+"divideDecimal"
 "domain"
+"domainRFC"
 "domainWithoutWWW"
+"domainWithoutWWWRFC"
+"dotProduct"
 "DOUBLE"
 "DOUBLE PRECISION"
+"DOUBLE_SHA1_HASH"
+"DOUBLE_SHA1_PASSWORD"
 "DROP"
 "DROP COLUMN"
 "DROP CONSTRAINT"
+"DROP DEFAULT"
 "DROP DETACHED PART"
 "DROP DETACHED PARTITION"
 "DROP INDEX"
+"DROP PART"
 "DROP PARTITION"
+"DROP PROJECTION"
+"DROP STATISTIC"
+"DROP TABLE"
+"DROP TEMPORARY TABLE"
 "dumpColumnStructure"
 "e"
+"editDistance"
 "ELSE"
 "empty"
+"EMPTY"
 "emptyArrayDate"
 "emptyArrayDateTime"
 "emptyArrayFloat32"
@@ -385,24 +1139,55 @@
 "emptyArrayUInt32"
 "emptyArrayUInt64"
 "emptyArrayUInt8"
+"EMPTY AS"
 "enabledProfiles"
 "enabledRoles"
+"ENABLED ROLES"
+"encodeURLComponent"
+"encodeURLFormComponent"
 "encodeXMLComponent"
 "encrypt"
 "END"
 "endsWith"
+"endsWithUTF8"
+"ENFORCED"
 "ENGINE"
 "entropy"
+"entropyArgMax"
+"entropyArgMin"
+"entropyArray"
+"entropyDistinct"
+"entropyForEach"
+"entropyIf"
+"entropyMap"
+"entropyMerge"
+"entropyNull"
+"entropyOrDefault"
+"entropyOrNull"
+"entropyResample"
+"entropySimpleState"
+"entropyState"
 "Enum"
 "ENUM"
 "Enum16"
 "Enum8"
+"EPHEMERAL"
+"EPHEMERAL SEQUENTIAL"
 "equals"
 "erf"
 "erfc"
 "errorCodeToName"
+"ESTIMATE"
 "evalMLMethod"
+"EVENT"
 "EVENTS"
+"EVERY"
+"EXCEPT"
+"EXCEPT DATABASE"
+"EXCEPT DATABASES"
+"EXCEPT TABLE"
+"EXCEPT TABLES"
+"EXCHANGE DICTIONARIES"
 "EXCHANGE TABLES"
 "EXISTS"
 "exp"
@@ -410,7 +1195,83 @@
 "exp2"
 "EXPLAIN"
 "exponentialMovingAverage"
+"exponentialMovingAverageArgMax"
+"exponentialMovingAverageArgMin"
+"exponentialMovingAverageArray"
+"exponentialMovingAverageDistinct"
+"exponentialMovingAverageForEach"
+"exponentialMovingAverageIf"
+"exponentialMovingAverageMap"
+"exponentialMovingAverageMerge"
+"exponentialMovingAverageNull"
+"exponentialMovingAverageOrDefault"
+"exponentialMovingAverageOrNull"
+"exponentialMovingAverageResample"
+"exponentialMovingAverageSimpleState"
+"exponentialMovingAverageState"
+"exponentialTimeDecayedAvg"
+"exponentialTimeDecayedAvgArgMax"
+"exponentialTimeDecayedAvgArgMin"
+"exponentialTimeDecayedAvgArray"
+"exponentialTimeDecayedAvgDistinct"
+"exponentialTimeDecayedAvgForEach"
+"exponentialTimeDecayedAvgIf"
+"exponentialTimeDecayedAvgMap"
+"exponentialTimeDecayedAvgMerge"
+"exponentialTimeDecayedAvgNull"
+"exponentialTimeDecayedAvgOrDefault"
+"exponentialTimeDecayedAvgOrNull"
+"exponentialTimeDecayedAvgResample"
+"exponentialTimeDecayedAvgSimpleState"
+"exponentialTimeDecayedAvgState"
+"exponentialTimeDecayedCount"
+"exponentialTimeDecayedCountArgMax"
+"exponentialTimeDecayedCountArgMin"
+"exponentialTimeDecayedCountArray"
+"exponentialTimeDecayedCountDistinct"
+"exponentialTimeDecayedCountForEach"
+"exponentialTimeDecayedCountIf"
+"exponentialTimeDecayedCountMap"
+"exponentialTimeDecayedCountMerge"
+"exponentialTimeDecayedCountNull"
+"exponentialTimeDecayedCountOrDefault"
+"exponentialTimeDecayedCountOrNull"
+"exponentialTimeDecayedCountResample"
+"exponentialTimeDecayedCountSimpleState"
+"exponentialTimeDecayedCountState"
+"exponentialTimeDecayedMax"
+"exponentialTimeDecayedMaxArgMax"
+"exponentialTimeDecayedMaxArgMin"
+"exponentialTimeDecayedMaxArray"
+"exponentialTimeDecayedMaxDistinct"
+"exponentialTimeDecayedMaxForEach"
+"exponentialTimeDecayedMaxIf"
+"exponentialTimeDecayedMaxMap"
+"exponentialTimeDecayedMaxMerge"
+"exponentialTimeDecayedMaxNull"
+"exponentialTimeDecayedMaxOrDefault"
+"exponentialTimeDecayedMaxOrNull"
+"exponentialTimeDecayedMaxResample"
+"exponentialTimeDecayedMaxSimpleState"
+"exponentialTimeDecayedMaxState"
+"exponentialTimeDecayedSum"
+"exponentialTimeDecayedSumArgMax"
+"exponentialTimeDecayedSumArgMin"
+"exponentialTimeDecayedSumArray"
+"exponentialTimeDecayedSumDistinct"
+"exponentialTimeDecayedSumForEach"
+"exponentialTimeDecayedSumIf"
+"exponentialTimeDecayedSumMap"
+"exponentialTimeDecayedSumMerge"
+"exponentialTimeDecayedSumNull"
+"exponentialTimeDecayedSumOrDefault"
+"exponentialTimeDecayedSumOrNull"
+"exponentialTimeDecayedSumResample"
+"exponentialTimeDecayedSumSimpleState"
+"exponentialTimeDecayedSumState"
 "EXPRESSION"
+"EXTENDED"
+"EXTERNAL DDL FROM"
 "extract"
 "EXTRACT"
 "extractAll"
@@ -418,40 +1279,106 @@
 "extractAllGroupsHorizontal"
 "extractAllGroupsVertical"
 "extractGroups"
+"extractKeyValuePairs"
+"extractKeyValuePairsWithEscaping"
 "extractTextFromHTML"
 "extractURLParameter"
 "extractURLParameterNames"
 "extractURLParameters"
+"factorial"
+"FALSE"
 "farmFingerprint64"
 "farmHash64"
-"FETCHES"
+"FETCH"
 "FETCH PART"
 "FETCH PARTITION"
+"FIELDS"
 "file"
+"FILE"
 "filesystemAvailable"
+"FILESYSTEM CACHE"
+"FILESYSTEM CACHES"
 "filesystemCapacity"
-"filesystemFree"
+"filesystemUnreserved"
+"FILTER"
 "FINAL"
 "finalizeAggregation"
 "FIRST"
+"firstLine"
 "firstSignificantSubdomain"
 "firstSignificantSubdomainCustom"
+"firstSignificantSubdomainCustomRFC"
+"firstSignificantSubdomainRFC"
 "first_value"
+"first_valueArgMax"
+"first_valueArgMin"
+"first_valueArray"
+"first_valueDistinct"
+"first_valueForEach"
+"first_valueIf"
+"first_valueMap"
+"first_valueMerge"
+"first_valueNull"
+"first_valueOrDefault"
+"first_valueOrNull"
+"first_valueResample"
+"first_value_respect_nulls"
+"first_value_respect_nullsArgMax"
+"first_value_respect_nullsArgMin"
+"first_value_respect_nullsArray"
+"first_value_respect_nullsDistinct"
+"first_value_respect_nullsForEach"
+"first_value_respect_nullsIf"
+"first_value_respect_nullsMap"
+"first_value_respect_nullsMerge"
+"first_value_respect_nullsNull"
+"first_value_respect_nullsOrDefault"
+"first_value_respect_nullsOrNull"
+"first_value_respect_nullsResample"
+"first_value_respect_nullsSimpleState"
+"first_value_respect_nullsState"
+"first_valueSimpleState"
+"first_valueState"
 "FIXED"
 "FixedString"
+"flameGraph"
+"flameGraphArgMax"
+"flameGraphArgMin"
+"flameGraphArray"
+"flameGraphDistinct"
+"flameGraphForEach"
+"flameGraphIf"
+"flameGraphMap"
+"flameGraphMerge"
+"flameGraphNull"
+"flameGraphOrDefault"
+"flameGraphOrNull"
+"flameGraphResample"
+"flameGraphSimpleState"
+"flameGraphState"
 "flatten"
+"flattenTuple"
 "FLOAT"
 "Float32"
 "Float64"
 "floor"
-"FLUSH"
+"FOLLOWING"
 "FOR"
 "ForEach"
+"FOREIGN"
+"FOREIGN KEY"
+"FORGET PARTITION"
 "format"
 "FORMAT"
+"FORMAT_BYTES"
 "formatDateTime"
-"formatReadableQuantity"
+"formatDateTimeInJodaSyntax"
+"formatQuery"
+"formatQueryOrNull"
+"formatQuerySingleLine"
+"formatQuerySingleLineOrNull"
 "formatReadableDecimalSize"
+"formatReadableQuantity"
 "formatReadableSize"
 "formatReadableTimeDelta"
 "formatRow"
@@ -461,132 +1388,437 @@
 "FREEZE"
 "FROM"
 "FROM_BASE64"
-"toDaysSinceYearZero"
+"FROM_DAYS"
 "fromDaysSinceYearZero"
 "fromDaysSinceYearZero32"
+"FROM INFILE"
 "fromModifiedJulianDay"
 "fromModifiedJulianDayOrNull"
+"FROM SHARD"
 "FROM_UNIXTIME"
 "fromUnixTimestamp"
 "fromUnixTimestamp64Micro"
 "fromUnixTimestamp64Milli"
 "fromUnixTimestamp64Nano"
+"fromUnixTimestampInJodaSyntax"
+"from_utc_timestamp"
+"fromUTCTimestamp"
 "FULL"
 "fullHostName"
+"FULLTEXT"
 "FUNCTION"
 "fuzzBits"
 "gccMurmurHash"
 "gcd"
+"generateRandomStructure"
+"generateULID"
 "generateUUIDv4"
 "geoDistance"
 "geohashDecode"
 "geohashEncode"
 "geohashesInBox"
+"GEOMETRY"
 "geoToH3"
 "geoToS2"
 "getMacro"
+"getOSKernelVersion"
 "__getScalar"
 "getServerPort"
 "getSetting"
 "getSizeOfEnumType"
+"getSubcolumn"
+"getTypeSerializationStreams"
 "GLOBAL"
 "globalIn"
+"GLOBAL IN"
 "globalInIgnoreSet"
 "globalNotIn"
+"GLOBAL NOT IN"
 "globalNotInIgnoreSet"
 "globalNotNullIn"
 "globalNotNullInIgnoreSet"
 "globalNullIn"
 "globalNullInIgnoreSet"
 "globalVariable"
+"GRANT"
+"GRANTEES"
+"GRANT OPTION FOR"
 "GRANULARITY"
 "greatCircleAngle"
 "greatCircleDistance"
 "greater"
 "greaterOrEquals"
 "greatest"
-"GROUP"
 "groupArray"
+"groupArrayArgMax"
+"groupArrayArgMin"
+"groupArrayArray"
+"groupArrayDistinct"
+"groupArrayForEach"
+"groupArrayIf"
 "groupArrayInsertAt"
+"groupArrayInsertAtArgMax"
+"groupArrayInsertAtArgMin"
+"groupArrayInsertAtArray"
+"groupArrayInsertAtDistinct"
+"groupArrayInsertAtForEach"
+"groupArrayInsertAtIf"
+"groupArrayInsertAtMap"
+"groupArrayInsertAtMerge"
+"groupArrayInsertAtNull"
+"groupArrayInsertAtOrDefault"
+"groupArrayInsertAtOrNull"
+"groupArrayInsertAtResample"
+"groupArrayInsertAtSimpleState"
+"groupArrayInsertAtState"
+"groupArrayIntersect"
+"groupArrayIntersectArgMax"
+"groupArrayIntersectArgMin"
+"groupArrayIntersectArray"
+"groupArrayIntersectDistinct"
+"groupArrayIntersectForEach"
+"groupArrayIntersectIf"
+"groupArrayIntersectMap"
+"groupArrayIntersectMerge"
+"groupArrayIntersectNull"
+"groupArrayIntersectOrDefault"
+"groupArrayIntersectOrNull"
+"groupArrayIntersectResample"
+"groupArrayIntersectSimpleState"
+"groupArrayIntersectState"
+"groupArrayLast"
+"groupArrayLastArgMax"
+"groupArrayLastArgMin"
+"groupArrayLastArray"
+"groupArrayLastDistinct"
+"groupArrayLastForEach"
+"groupArrayLastIf"
+"groupArrayLastMap"
+"groupArrayLastMerge"
+"groupArrayLastNull"
+"groupArrayLastOrDefault"
+"groupArrayLastOrNull"
+"groupArrayLastResample"
+"groupArrayLastSimpleState"
+"groupArrayLastState"
+"groupArrayMap"
+"groupArrayMerge"
 "groupArrayMovingAvg"
+"groupArrayMovingAvgArgMax"
+"groupArrayMovingAvgArgMin"
+"groupArrayMovingAvgArray"
+"groupArrayMovingAvgDistinct"
+"groupArrayMovingAvgForEach"
+"groupArrayMovingAvgIf"
+"groupArrayMovingAvgMap"
+"groupArrayMovingAvgMerge"
+"groupArrayMovingAvgNull"
+"groupArrayMovingAvgOrDefault"
+"groupArrayMovingAvgOrNull"
+"groupArrayMovingAvgResample"
+"groupArrayMovingAvgSimpleState"
+"groupArrayMovingAvgState"
 "groupArrayMovingSum"
+"groupArrayMovingSumArgMax"
+"groupArrayMovingSumArgMin"
+"groupArrayMovingSumArray"
+"groupArrayMovingSumDistinct"
+"groupArrayMovingSumForEach"
+"groupArrayMovingSumIf"
+"groupArrayMovingSumMap"
+"groupArrayMovingSumMerge"
+"groupArrayMovingSumNull"
+"groupArrayMovingSumOrDefault"
+"groupArrayMovingSumOrNull"
+"groupArrayMovingSumResample"
+"groupArrayMovingSumSimpleState"
+"groupArrayMovingSumState"
+"groupArrayNull"
+"groupArrayOrDefault"
+"groupArrayOrNull"
+"groupArrayResample"
 "groupArraySample"
+"groupArraySampleArgMax"
+"groupArraySampleArgMin"
+"groupArraySampleArray"
+"groupArraySampleDistinct"
+"groupArraySampleForEach"
+"groupArraySampleIf"
+"groupArraySampleMap"
+"groupArraySampleMerge"
+"groupArraySampleNull"
+"groupArraySampleOrDefault"
+"groupArraySampleOrNull"
+"groupArraySampleResample"
+"groupArraySampleSimpleState"
+"groupArraySampleState"
+"groupArraySimpleState"
+"groupArraySorted"
+"groupArraySortedArgMax"
+"groupArraySortedArgMin"
+"groupArraySortedArray"
+"groupArraySortedDistinct"
+"groupArraySortedForEach"
+"groupArraySortedIf"
+"groupArraySortedMap"
+"groupArraySortedMerge"
+"groupArraySortedNull"
+"groupArraySortedOrDefault"
+"groupArraySortedOrNull"
+"groupArraySortedResample"
+"groupArraySortedSimpleState"
+"groupArraySortedState"
+"groupArrayState"
 "groupBitAnd"
+"groupBitAndArgMax"
+"groupBitAndArgMin"
+"groupBitAndArray"
+"groupBitAndDistinct"
+"groupBitAndForEach"
+"groupBitAndIf"
+"groupBitAndMap"
+"groupBitAndMerge"
+"groupBitAndNull"
+"groupBitAndOrDefault"
+"groupBitAndOrNull"
+"groupBitAndResample"
+"groupBitAndSimpleState"
+"groupBitAndState"
 "groupBitmap"
 "groupBitmapAnd"
+"groupBitmapAndArgMax"
+"groupBitmapAndArgMin"
+"groupBitmapAndArray"
+"groupBitmapAndDistinct"
+"groupBitmapAndForEach"
+"groupBitmapAndIf"
+"groupBitmapAndMap"
+"groupBitmapAndMerge"
+"groupBitmapAndNull"
+"groupBitmapAndOrDefault"
+"groupBitmapAndOrNull"
+"groupBitmapAndResample"
+"groupBitmapAndSimpleState"
+"groupBitmapAndState"
+"groupBitmapArgMax"
+"groupBitmapArgMin"
+"groupBitmapArray"
+"groupBitmapDistinct"
+"groupBitmapForEach"
+"groupBitmapIf"
+"groupBitmapMap"
+"groupBitmapMerge"
+"groupBitmapNull"
 "groupBitmapOr"
+"groupBitmapOrArgMax"
+"groupBitmapOrArgMin"
+"groupBitmapOrArray"
+"groupBitmapOrDefault"
+"groupBitmapOrDistinct"
+"groupBitmapOrForEach"
+"groupBitmapOrIf"
+"groupBitmapOrMap"
+"groupBitmapOrMerge"
+"groupBitmapOrNull"
+"groupBitmapOrOrDefault"
+"groupBitmapOrOrNull"
+"groupBitmapOrResample"
+"groupBitmapOrSimpleState"
+"groupBitmapOrState"
+"groupBitmapResample"
+"groupBitmapSimpleState"
+"groupBitmapState"
 "groupBitmapXor"
+"groupBitmapXorArgMax"
+"groupBitmapXorArgMin"
+"groupBitmapXorArray"
+"groupBitmapXorDistinct"
+"groupBitmapXorForEach"
+"groupBitmapXorIf"
+"groupBitmapXorMap"
+"groupBitmapXorMerge"
+"groupBitmapXorNull"
+"groupBitmapXorOrDefault"
+"groupBitmapXorOrNull"
+"groupBitmapXorResample"
+"groupBitmapXorSimpleState"
+"groupBitmapXorState"
 "groupBitOr"
+"groupBitOrArgMax"
+"groupBitOrArgMin"
+"groupBitOrArray"
+"groupBitOrDistinct"
+"groupBitOrForEach"
+"groupBitOrIf"
+"groupBitOrMap"
+"groupBitOrMerge"
+"groupBitOrNull"
+"groupBitOrOrDefault"
+"groupBitOrOrNull"
+"groupBitOrResample"
+"groupBitOrSimpleState"
+"groupBitOrState"
 "groupBitXor"
+"groupBitXorArgMax"
+"groupBitXorArgMin"
+"groupBitXorArray"
+"groupBitXorDistinct"
+"groupBitXorForEach"
+"groupBitXorIf"
+"groupBitXorMap"
+"groupBitXorMerge"
+"groupBitXorNull"
+"groupBitXorOrDefault"
+"groupBitXorOrNull"
+"groupBitXorResample"
+"groupBitXorSimpleState"
+"groupBitXorState"
 "GROUP BY"
+"GROUPING SETS"
+"GROUPS"
 "groupUniqArray"
+"groupUniqArrayArgMax"
+"groupUniqArrayArgMin"
+"groupUniqArrayArray"
+"groupUniqArrayDistinct"
+"groupUniqArrayForEach"
+"groupUniqArrayIf"
+"groupUniqArrayMap"
+"groupUniqArrayMerge"
+"groupUniqArrayNull"
+"groupUniqArrayOrDefault"
+"groupUniqArrayOrNull"
+"groupUniqArrayResample"
+"groupUniqArraySimpleState"
+"groupUniqArrayState"
+"H"
+"h3CellAreaM2"
+"h3CellAreaRads2"
+"h3Distance"
 "h3EdgeAngle"
+"h3EdgeLengthKm"
 "h3EdgeLengthM"
+"h3ExactEdgeLengthKm"
+"h3ExactEdgeLengthM"
+"h3ExactEdgeLengthRads"
 "h3GetBaseCell"
+"h3GetDestinationIndexFromUnidirectionalEdge"
 "h3GetFaces"
+"h3GetIndexesFromUnidirectionalEdge"
+"h3GetOriginIndexFromUnidirectionalEdge"
+"h3GetPentagonIndexes"
+"h3GetRes0Indexes"
 "h3GetResolution"
+"h3GetUnidirectionalEdge"
+"h3GetUnidirectionalEdgeBoundary"
+"h3GetUnidirectionalEdgesFromHexagon"
+"h3HexAreaKm2"
 "h3HexAreaM2"
+"h3HexRing"
 "h3IndexesAreNeighbors"
 "h3IsPentagon"
 "h3IsResClassIII"
 "h3IsValid"
 "h3kRing"
+"h3Line"
+"h3NumHexagons"
+"h3PointDistKm"
+"h3PointDistM"
+"h3PointDistRads"
+"h3ToCenterChild"
 "h3ToChildren"
 "h3ToGeo"
 "h3ToGeoBoundary"
 "h3ToParent"
 "h3ToString"
+"h3UnidirectionalEdgeIsValid"
 "halfMD5"
 "has"
 "hasAll"
 "hasAny"
 "hasColumnInTable"
+"HASH"
+"hasSubsequence"
+"hasSubsequenceCaseInsensitive"
+"hasSubsequenceCaseInsensitiveUTF8"
+"hasSubsequenceUTF8"
 "hasSubstr"
 "hasThreadFuzzer"
 "hasToken"
 "hasTokenCaseInsensitive"
+"hasTokenCaseInsensitiveOrNull"
+"hasTokenOrNull"
 "HAVING"
+"HDFS"
 "hex"
 "HH"
 "HIERARCHICAL"
 "histogram"
+"histogramArgMax"
+"histogramArgMin"
+"histogramArray"
+"histogramDistinct"
+"histogramForEach"
+"histogramIf"
+"histogramMap"
+"histogramMerge"
+"histogramNull"
+"histogramOrDefault"
+"histogramOrNull"
+"histogramResample"
+"histogramSimpleState"
+"histogramState"
 "hiveHash"
+"hop"
+"hopEnd"
+"hopStart"
+"HOST"
 "hostname"
 "hostName"
 "HOUR"
+"HOURS"
+"HTTP"
 "hypot"
 "ID"
+"IDENTIFIED"
 "identity"
+"idnaDecode"
+"idnaEncode"
 "if"
-"IF"
+"IF EMPTY"
 "IF EXISTS"
 "IF NOT EXISTS"
 "ifNotFinite"
 "ifNull"
 "ignore"
+"IGNORE NULLS"
 "ilike"
 "ILIKE"
 "in"
 "IN"
 "INDEX"
+"INDEXES"
 "indexHint"
 "indexOf"
+"INDICES"
 "INET4"
 "INET6"
 "INET6_ATON"
 "INET6_NTOA"
 "INET_ATON"
 "INET_NTOA"
-"INF"
+"INHERIT"
 "inIgnoreSet"
+"initcap"
+"initcapUTF8"
 "initializeAggregation"
 "initial_query_id"
 "initialQueryID"
 "INJECTIVE"
 "INNER"
 "IN PARTITION"
-"INSERT"
 "INSERT INTO"
+"instr"
 "INT"
 "INT1"
 "Int128"
@@ -602,12 +1834,31 @@
 "INTEGER"
 "INTEGER SIGNED"
 "INTEGER UNSIGNED"
+"INTERPOLATE"
+"INTERSECT"
 "INTERVAL"
 "IntervalDay"
 "IntervalHour"
 "intervalLengthSum"
+"intervalLengthSumArgMax"
+"intervalLengthSumArgMin"
+"intervalLengthSumArray"
+"intervalLengthSumDistinct"
+"intervalLengthSumForEach"
+"intervalLengthSumIf"
+"intervalLengthSumMap"
+"intervalLengthSumMerge"
+"intervalLengthSumNull"
+"intervalLengthSumOrDefault"
+"intervalLengthSumOrNull"
+"intervalLengthSumResample"
+"intervalLengthSumSimpleState"
+"intervalLengthSumState"
+"IntervalMicrosecond"
+"IntervalMillisecond"
 "IntervalMinute"
 "IntervalMonth"
+"IntervalNanosecond"
 "IntervalQuarter"
 "IntervalSecond"
 "IntervalWeek"
@@ -616,21 +1867,26 @@
 "intExp2"
 "intHash32"
 "intHash64"
-"INTO"
 "INTO OUTFILE"
 "INT SIGNED"
 "INT UNSIGNED"
+"INVISIBLE"
+"INVOKER"
+"IP"
 "IPv4"
 "IPv4CIDRToRange"
 "IPv4NumToString"
 "IPv4NumToStringClassC"
 "IPv4StringToNum"
+"IPv4StringToNumOrDefault"
+"IPv4StringToNumOrNull"
 "IPv4ToIPv6"
 "IPv6"
 "IPv6CIDRToRange"
 "IPv6NumToString"
 "IPv6StringToNum"
-"IS"
+"IPv6StringToNumOrDefault"
+"IPv6StringToNumOrNull"
 "isConstant"
 "isDecimalOverflow"
 "isFinite"
@@ -639,64 +1895,220 @@
 "isIPv4String"
 "isIPv6String"
 "isNaN"
+"isNotDistinctFrom"
+"IS NOT DISTINCT FROM"
 "isNotNull"
+"IS NOT NULL"
 "isNull"
+"IS NULL"
+"isNullable"
 "IS_OBJECT_ID"
 "isValidJSON"
 "isValidUTF8"
 "isZeroOrNull"
+"jaroSimilarity"
+"jaroWinklerSimilarity"
 "javaHash"
 "javaHashUTF16LE"
 "JOIN"
 "joinGet"
 "joinGetOrNull"
+"JSON"
+"JSONArrayLength"
+"JSON_ARRAY_LENGTH"
 "JSON_EXISTS"
 "JSONExtract"
 "JSONExtractArrayRaw"
 "JSONExtractBool"
 "JSONExtractFloat"
 "JSONExtractInt"
+"JSONExtractKeys"
 "JSONExtractKeysAndValues"
 "JSONExtractKeysAndValuesRaw"
-"JSONExtractKeys"
 "JSONExtractRaw"
 "JSONExtractString"
 "JSONExtractUInt"
 "JSONHas"
 "JSONKey"
 "JSONLength"
+"jsonMergePatch"
 "JSON_QUERY"
 "JSONType"
 "JSON_VALUE"
 "jumpConsistentHash"
+"kafkaMurmurHash"
+"KERBEROS"
 "KEY"
-# Key words (based on keywords from antlr parser)
+"KEY BY"
+"KEYED BY"
+"KEYS"
 "KILL"
+"KIND"
+"kolmogorovSmirnovTest"
+"kolmogorovSmirnovTestArgMax"
+"kolmogorovSmirnovTestArgMin"
+"kolmogorovSmirnovTestArray"
+"kolmogorovSmirnovTestDistinct"
+"kolmogorovSmirnovTestForEach"
+"kolmogorovSmirnovTestIf"
+"kolmogorovSmirnovTestMap"
+"kolmogorovSmirnovTestMerge"
+"kolmogorovSmirnovTestNull"
+"kolmogorovSmirnovTestOrDefault"
+"kolmogorovSmirnovTestOrNull"
+"kolmogorovSmirnovTestResample"
+"kolmogorovSmirnovTestSimpleState"
+"kolmogorovSmirnovTestState"
+"kostikConsistentHash"
+"kql_array_sort_asc"
+"kql_array_sort_desc"
 "kurtPop"
+"kurtPopArgMax"
+"kurtPopArgMin"
+"kurtPopArray"
+"kurtPopDistinct"
+"kurtPopForEach"
+"kurtPopIf"
+"kurtPopMap"
+"kurtPopMerge"
+"kurtPopNull"
+"kurtPopOrDefault"
+"kurtPopOrNull"
+"kurtPopResample"
+"kurtPopSimpleState"
+"kurtPopState"
 "kurtSamp"
+"kurtSampArgMax"
+"kurtSampArgMin"
+"kurtSampArray"
+"kurtSampDistinct"
+"kurtSampForEach"
+"kurtSampIf"
+"kurtSampMap"
+"kurtSampMerge"
+"kurtSampNull"
+"kurtSampOrDefault"
+"kurtSampOrNull"
+"kurtSampResample"
+"kurtSampSimpleState"
+"kurtSampState"
+"L1Distance"
+"L1Norm"
+"L1Normalize"
+"L2Distance"
+"L2Norm"
+"L2Normalize"
+"L2SquaredDistance"
+"L2SquaredNorm"
 "lagInFrame"
+"lagInFrameArgMax"
+"lagInFrameArgMin"
+"lagInFrameArray"
+"lagInFrameDistinct"
+"lagInFrameForEach"
+"lagInFrameIf"
+"lagInFrameMap"
+"lagInFrameMerge"
+"lagInFrameNull"
+"lagInFrameOrDefault"
+"lagInFrameOrNull"
+"lagInFrameResample"
+"lagInFrameSimpleState"
+"lagInFrameState"
+"LARGE OBJECT"
+"largestTriangleThreeBuckets"
+"largestTriangleThreeBucketsArgMax"
+"largestTriangleThreeBucketsArgMin"
+"largestTriangleThreeBucketsArray"
+"largestTriangleThreeBucketsDistinct"
+"largestTriangleThreeBucketsForEach"
+"largestTriangleThreeBucketsIf"
+"largestTriangleThreeBucketsMap"
+"largestTriangleThreeBucketsMerge"
+"largestTriangleThreeBucketsNull"
+"largestTriangleThreeBucketsOrDefault"
+"largestTriangleThreeBucketsOrNull"
+"largestTriangleThreeBucketsResample"
+"largestTriangleThreeBucketsSimpleState"
+"largestTriangleThreeBucketsState"
 "LAST"
+"LAST_DAY"
 "last_value"
+"last_valueArgMax"
+"last_valueArgMin"
+"last_valueArray"
+"last_valueDistinct"
+"last_valueForEach"
+"last_valueIf"
+"last_valueMap"
+"last_valueMerge"
+"last_valueNull"
+"last_valueOrDefault"
+"last_valueOrNull"
+"last_valueResample"
+"last_value_respect_nulls"
+"last_value_respect_nullsArgMax"
+"last_value_respect_nullsArgMin"
+"last_value_respect_nullsArray"
+"last_value_respect_nullsDistinct"
+"last_value_respect_nullsForEach"
+"last_value_respect_nullsIf"
+"last_value_respect_nullsMap"
+"last_value_respect_nullsMerge"
+"last_value_respect_nullsNull"
+"last_value_respect_nullsOrDefault"
+"last_value_respect_nullsOrNull"
+"last_value_respect_nullsResample"
+"last_value_respect_nullsSimpleState"
+"last_value_respect_nullsState"
+"last_valueSimpleState"
+"last_valueState"
 "LAYOUT"
 "lcase"
 "lcm"
+"LDAP"
 "leadInFrame"
+"leadInFrameArgMax"
+"leadInFrameArgMin"
+"leadInFrameArray"
+"leadInFrameDistinct"
+"leadInFrameForEach"
+"leadInFrameIf"
+"leadInFrameMap"
+"leadInFrameMerge"
+"leadInFrameNull"
+"leadInFrameOrDefault"
+"leadInFrameOrNull"
+"leadInFrameResample"
+"leadInFrameSimpleState"
+"leadInFrameState"
 "LEADING"
 "least"
+"left"
 "LEFT"
 "LEFT ARRAY JOIN"
 "leftPad"
 "leftPadUTF8"
+"leftUTF8"
 "lemmatize"
 "length"
 "lengthUTF8"
 "less"
 "lessOrEquals"
+"LESS THAN"
+"LEVEL"
+"levenshteinDistance"
 "lgamma"
 "LIFETIME"
+"LIGHTWEIGHT"
 "like"
 "LIKE"
 "LIMIT"
+"LINEAR"
+"LinfDistance"
+"LinfNorm"
+"LinfNormalize"
+"LIST"
 "LIVE"
 "ln"
 "LOCAL"
@@ -705,7 +2117,6 @@
 "log10"
 "log1p"
 "log2"
-"LOGS"
 "logTrace"
 "LONGBLOB"
 "LONGTEXT"
@@ -715,76 +2126,467 @@
 "lower"
 "lowerUTF8"
 "lpad"
+"LpDistance"
+"LpNorm"
+"LpNormalize"
+"ltrim"
 "LTRIM"
+"lttb"
+"lttbArgMax"
+"lttbArgMin"
+"lttbArray"
+"lttbDistinct"
+"lttbForEach"
+"lttbIf"
+"lttbMap"
+"lttbMerge"
+"lttbNull"
+"lttbOrDefault"
+"lttbOrNull"
+"lttbResample"
+"lttbSimpleState"
+"lttbState"
 "M"
 "MACNumToString"
 "MACStringToNum"
 "MACStringToOUI"
+"makeDate"
+"makeDate32"
+"makeDateTime"
+"makeDateTime64"
 "mannWhitneyUTest"
+"mannWhitneyUTestArgMax"
+"mannWhitneyUTestArgMin"
+"mannWhitneyUTestArray"
+"mannWhitneyUTestDistinct"
+"mannWhitneyUTestForEach"
+"mannWhitneyUTestIf"
+"mannWhitneyUTestMap"
+"mannWhitneyUTestMerge"
+"mannWhitneyUTestNull"
+"mannWhitneyUTestOrDefault"
+"mannWhitneyUTestOrNull"
+"mannWhitneyUTestResample"
+"mannWhitneyUTestSimpleState"
+"mannWhitneyUTestState"
 "map"
 "Map"
 "mapAdd"
+"mapAll"
+"mapApply"
+"mapConcat"
 "mapContains"
+"mapContainsKeyLike"
+"mapExists"
+"mapExtractKeyLike"
+"mapFilter"
+"mapFromArrays"
+"MAP_FROM_ARRAYS"
+"mapFromString"
 "mapKeys"
+"mapPartialReverseSort"
+"mapPartialSort"
 "mapPopulateSeries"
+"mapReverseSort"
+"mapSort"
 "mapSubtract"
+"mapUpdate"
 "mapValues"
 "match"
+"MATCH"
 "materialize"
 "MATERIALIZE"
+"MATERIALIZE COLUMN"
 "MATERIALIZED"
 "MATERIALIZE INDEX"
+"MATERIALIZE PROJECTION"
+"MATERIALIZE STATISTIC"
 "MATERIALIZE TTL"
 "max"
 "MAX"
+"max2"
+"maxArgMax"
+"maxArgMin"
+"maxArray"
+"maxDistinct"
+"maxForEach"
+"maxIf"
 "maxIntersections"
+"maxIntersectionsArgMax"
+"maxIntersectionsArgMin"
+"maxIntersectionsArray"
+"maxIntersectionsDistinct"
+"maxIntersectionsForEach"
+"maxIntersectionsIf"
+"maxIntersectionsMap"
+"maxIntersectionsMerge"
+"maxIntersectionsNull"
+"maxIntersectionsOrDefault"
+"maxIntersectionsOrNull"
 "maxIntersectionsPosition"
+"maxIntersectionsPositionArgMax"
+"maxIntersectionsPositionArgMin"
+"maxIntersectionsPositionArray"
+"maxIntersectionsPositionDistinct"
+"maxIntersectionsPositionForEach"
+"maxIntersectionsPositionIf"
+"maxIntersectionsPositionMap"
+"maxIntersectionsPositionMerge"
+"maxIntersectionsPositionNull"
+"maxIntersectionsPositionOrDefault"
+"maxIntersectionsPositionOrNull"
+"maxIntersectionsPositionResample"
+"maxIntersectionsPositionSimpleState"
+"maxIntersectionsPositionState"
+"maxIntersectionsResample"
+"maxIntersectionsSimpleState"
+"maxIntersectionsState"
 "maxMap"
+"maxMappedArrays"
+"maxMappedArraysArgMax"
+"maxMappedArraysArgMin"
+"maxMappedArraysArray"
+"maxMappedArraysDistinct"
+"maxMappedArraysForEach"
+"maxMappedArraysIf"
+"maxMappedArraysMap"
+"maxMappedArraysMerge"
+"maxMappedArraysNull"
+"maxMappedArraysOrDefault"
+"maxMappedArraysOrNull"
+"maxMappedArraysResample"
+"maxMappedArraysSimpleState"
+"maxMappedArraysState"
+"maxMerge"
+"maxNull"
+"maxOrDefault"
+"maxOrNull"
+"maxResample"
+"maxSimpleState"
+"maxState"
+"MCS"
 "MD4"
 "MD5"
+"meanZTest"
+"meanZTestArgMax"
+"meanZTestArgMin"
+"meanZTestArray"
+"meanZTestDistinct"
+"meanZTestForEach"
+"meanZTestIf"
+"meanZTestMap"
+"meanZTestMerge"
+"meanZTestNull"
+"meanZTestOrDefault"
+"meanZTestOrNull"
+"meanZTestResample"
+"meanZTestSimpleState"
+"meanZTestState"
 "median"
+"medianArgMax"
+"medianArgMin"
+"medianArray"
 "medianBFloat16"
+"medianBFloat16ArgMax"
+"medianBFloat16ArgMin"
+"medianBFloat16Array"
+"medianBFloat16Distinct"
+"medianBFloat16ForEach"
+"medianBFloat16If"
+"medianBFloat16Map"
+"medianBFloat16Merge"
+"medianBFloat16Null"
+"medianBFloat16OrDefault"
+"medianBFloat16OrNull"
+"medianBFloat16Resample"
+"medianBFloat16SimpleState"
+"medianBFloat16State"
 "medianBFloat16Weighted"
+"medianBFloat16WeightedArgMax"
+"medianBFloat16WeightedArgMin"
+"medianBFloat16WeightedArray"
+"medianBFloat16WeightedDistinct"
+"medianBFloat16WeightedForEach"
+"medianBFloat16WeightedIf"
+"medianBFloat16WeightedMap"
+"medianBFloat16WeightedMerge"
+"medianBFloat16WeightedNull"
+"medianBFloat16WeightedOrDefault"
+"medianBFloat16WeightedOrNull"
+"medianBFloat16WeightedResample"
+"medianBFloat16WeightedSimpleState"
+"medianBFloat16WeightedState"
+"medianDD"
+"medianDDArgMax"
+"medianDDArgMin"
+"medianDDArray"
+"medianDDDistinct"
+"medianDDForEach"
+"medianDDIf"
+"medianDDMap"
+"medianDDMerge"
+"medianDDNull"
+"medianDDOrDefault"
+"medianDDOrNull"
+"medianDDResample"
+"medianDDSimpleState"
+"medianDDState"
 "medianDeterministic"
+"medianDeterministicArgMax"
+"medianDeterministicArgMin"
+"medianDeterministicArray"
+"medianDeterministicDistinct"
+"medianDeterministicForEach"
+"medianDeterministicIf"
+"medianDeterministicMap"
+"medianDeterministicMerge"
+"medianDeterministicNull"
+"medianDeterministicOrDefault"
+"medianDeterministicOrNull"
+"medianDeterministicResample"
+"medianDeterministicSimpleState"
+"medianDeterministicState"
+"medianDistinct"
 "medianExact"
+"medianExactArgMax"
+"medianExactArgMin"
+"medianExactArray"
+"medianExactDistinct"
+"medianExactForEach"
 "medianExactHigh"
+"medianExactHighArgMax"
+"medianExactHighArgMin"
+"medianExactHighArray"
+"medianExactHighDistinct"
+"medianExactHighForEach"
+"medianExactHighIf"
+"medianExactHighMap"
+"medianExactHighMerge"
+"medianExactHighNull"
+"medianExactHighOrDefault"
+"medianExactHighOrNull"
+"medianExactHighResample"
+"medianExactHighSimpleState"
+"medianExactHighState"
+"medianExactIf"
 "medianExactLow"
+"medianExactLowArgMax"
+"medianExactLowArgMin"
+"medianExactLowArray"
+"medianExactLowDistinct"
+"medianExactLowForEach"
+"medianExactLowIf"
+"medianExactLowMap"
+"medianExactLowMerge"
+"medianExactLowNull"
+"medianExactLowOrDefault"
+"medianExactLowOrNull"
+"medianExactLowResample"
+"medianExactLowSimpleState"
+"medianExactLowState"
+"medianExactMap"
+"medianExactMerge"
+"medianExactNull"
+"medianExactOrDefault"
+"medianExactOrNull"
+"medianExactResample"
+"medianExactSimpleState"
+"medianExactState"
 "medianExactWeighted"
+"medianExactWeightedArgMax"
+"medianExactWeightedArgMin"
+"medianExactWeightedArray"
+"medianExactWeightedDistinct"
+"medianExactWeightedForEach"
+"medianExactWeightedIf"
+"medianExactWeightedMap"
+"medianExactWeightedMerge"
+"medianExactWeightedNull"
+"medianExactWeightedOrDefault"
+"medianExactWeightedOrNull"
+"medianExactWeightedResample"
+"medianExactWeightedSimpleState"
+"medianExactWeightedState"
+"medianForEach"
+"medianGK"
+"medianGKArgMax"
+"medianGKArgMin"
+"medianGKArray"
+"medianGKDistinct"
+"medianGKForEach"
+"medianGKIf"
+"medianGKMap"
+"medianGKMerge"
+"medianGKNull"
+"medianGKOrDefault"
+"medianGKOrNull"
+"medianGKResample"
+"medianGKSimpleState"
+"medianGKState"
+"medianIf"
+"medianInterpolatedWeighted"
+"medianInterpolatedWeightedArgMax"
+"medianInterpolatedWeightedArgMin"
+"medianInterpolatedWeightedArray"
+"medianInterpolatedWeightedDistinct"
+"medianInterpolatedWeightedForEach"
+"medianInterpolatedWeightedIf"
+"medianInterpolatedWeightedMap"
+"medianInterpolatedWeightedMerge"
+"medianInterpolatedWeightedNull"
+"medianInterpolatedWeightedOrDefault"
+"medianInterpolatedWeightedOrNull"
+"medianInterpolatedWeightedResample"
+"medianInterpolatedWeightedSimpleState"
+"medianInterpolatedWeightedState"
+"medianMap"
+"medianMerge"
+"medianNull"
+"medianOrDefault"
+"medianOrNull"
+"medianResample"
+"medianSimpleState"
+"medianState"
 "medianTDigest"
+"medianTDigestArgMax"
+"medianTDigestArgMin"
+"medianTDigestArray"
+"medianTDigestDistinct"
+"medianTDigestForEach"
+"medianTDigestIf"
+"medianTDigestMap"
+"medianTDigestMerge"
+"medianTDigestNull"
+"medianTDigestOrDefault"
+"medianTDigestOrNull"
+"medianTDigestResample"
+"medianTDigestSimpleState"
+"medianTDigestState"
 "medianTDigestWeighted"
+"medianTDigestWeightedArgMax"
+"medianTDigestWeightedArgMin"
+"medianTDigestWeightedArray"
+"medianTDigestWeightedDistinct"
+"medianTDigestWeightedForEach"
+"medianTDigestWeightedIf"
+"medianTDigestWeightedMap"
+"medianTDigestWeightedMerge"
+"medianTDigestWeightedNull"
+"medianTDigestWeightedOrDefault"
+"medianTDigestWeightedOrNull"
+"medianTDigestWeightedResample"
+"medianTDigestWeightedSimpleState"
+"medianTDigestWeightedState"
 "medianTiming"
+"medianTimingArgMax"
+"medianTimingArgMin"
+"medianTimingArray"
+"medianTimingDistinct"
+"medianTimingForEach"
+"medianTimingIf"
+"medianTimingMap"
+"medianTimingMerge"
+"medianTimingNull"
+"medianTimingOrDefault"
+"medianTimingOrNull"
+"medianTimingResample"
+"medianTimingSimpleState"
+"medianTimingState"
 "medianTimingWeighted"
+"medianTimingWeightedArgMax"
+"medianTimingWeightedArgMin"
+"medianTimingWeightedArray"
+"medianTimingWeightedDistinct"
+"medianTimingWeightedForEach"
+"medianTimingWeightedIf"
+"medianTimingWeightedMap"
+"medianTimingWeightedMerge"
+"medianTimingWeightedNull"
+"medianTimingWeightedOrDefault"
+"medianTimingWeightedOrNull"
+"medianTimingWeightedResample"
+"medianTimingWeightedSimpleState"
+"medianTimingWeightedState"
 "MEDIUMBLOB"
 "MEDIUMINT"
 "MEDIUMINT SIGNED"
 "MEDIUMINT UNSIGNED"
 "MEDIUMTEXT"
+"MEMORY"
 "Merge"
 "MERGES"
 "metroHash64"
 "MI"
+"MICROSECOND"
+"MICROSECONDS"
 "mid"
+"MILLISECOND"
+"MILLISECONDS"
 "min"
 "MIN"
+"min2"
+"minArgMax"
+"minArgMin"
+"minArray"
+"minDistinct"
+"minForEach"
+"minIf"
 "minMap"
+"minMappedArrays"
+"minMappedArraysArgMax"
+"minMappedArraysArgMin"
+"minMappedArraysArray"
+"minMappedArraysDistinct"
+"minMappedArraysForEach"
+"minMappedArraysIf"
+"minMappedArraysMap"
+"minMappedArraysMerge"
+"minMappedArraysNull"
+"minMappedArraysOrDefault"
+"minMappedArraysOrNull"
+"minMappedArraysResample"
+"minMappedArraysSimpleState"
+"minMappedArraysState"
+"minMerge"
+"minNull"
+"minOrDefault"
+"minOrNull"
+"minResample"
+"minSampleSizeContinous"
+"minSampleSizeContinuous"
+"minSampleSizeConversion"
+"minSimpleState"
+"minState"
 "minus"
 "MINUTE"
+"MINUTES"
+"mismatches"
 "MM"
 "mod"
+"MOD"
 "MODIFY"
 "MODIFY COLUMN"
+"MODIFY COMMENT"
 "MODIFY ORDER BY"
 "MODIFY QUERY"
+"MODIFY REFRESH"
+"MODIFY SAMPLE BY"
 "MODIFY SETTING"
+"MODIFY SQL SECURITY"
 "MODIFY TTL"
 "modulo"
 "moduloLegacy"
 "moduloOrZero"
 "MONTH"
+"monthName"
+"MONTHS"
+"mortonDecode"
+"mortonEncode"
 "MOVE"
 "MOVE PART"
 "MOVE PARTITION"
 "movingXXX"
+"MS"
 "multiFuzzyMatchAllIndices"
 "multiFuzzyMatchAny"
 "multiFuzzyMatchAnyIndex"
@@ -793,6 +2595,7 @@
 "multiMatchAny"
 "multiMatchAnyIndex"
 "multiply"
+"multiplyDecimal"
 "MultiPolygon"
 "multiSearchAllPositions"
 "multiSearchAllPositionsCaseInsensitive"
@@ -818,7 +2621,9 @@
 "MUTATION"
 "N"
 "NAME"
-"NAN_SQL"
+"NAMED COLLECTION"
+"NANOSECOND"
+"NANOSECONDS"
 "NATIONAL CHAR"
 "NATIONAL CHARACTER"
 "NATIONAL CHARACTER LARGE OBJECT"
@@ -829,8 +2634,10 @@
 "NCHAR VARYING"
 "negate"
 "neighbor"
+"nested"
 "Nested"
 "netloc"
+"NEXT"
 "ngramDistance"
 "ngramDistanceCaseInsensitive"
 "ngramDistanceCaseInsensitiveUTF8"
@@ -843,6 +2650,7 @@
 "ngramMinHashCaseInsensitive"
 "ngramMinHashCaseInsensitiveUTF8"
 "ngramMinHashUTF8"
+"ngrams"
 "ngramSearch"
 "ngramSearchCaseInsensitive"
 "ngramSearchCaseInsensitiveUTF8"
@@ -851,68 +2659,207 @@
 "ngramSimHashCaseInsensitive"
 "ngramSimHashCaseInsensitiveUTF8"
 "ngramSimHashUTF8"
-"NO"
+"NO ACTION"
 "NO DELAY"
+"NO LIMITS"
 "NONE"
+"nonNegativeDerivative"
+"nonNegativeDerivativeArgMax"
+"nonNegativeDerivativeArgMin"
+"nonNegativeDerivativeArray"
+"nonNegativeDerivativeDistinct"
+"nonNegativeDerivativeForEach"
+"nonNegativeDerivativeIf"
+"nonNegativeDerivativeMap"
+"nonNegativeDerivativeMerge"
+"nonNegativeDerivativeNull"
+"nonNegativeDerivativeOrDefault"
+"nonNegativeDerivativeOrNull"
+"nonNegativeDerivativeResample"
+"nonNegativeDerivativeSimpleState"
+"nonNegativeDerivativeState"
+"NO_PASSWORD"
 "normalizedQueryHash"
 "normalizedQueryHashKeepNames"
+"normalizeL1"
+"normalizeL2"
+"normalizeLinf"
+"normalizeLp"
 "normalizeQuery"
 "normalizeQueryKeepNames"
+"normalizeUTF8NFC"
+"normalizeUTF8NFD"
+"normalizeUTF8NFKC"
+"normalizeUTF8NFKD"
+"normL1"
+"normL2"
+"normL2Squared"
+"normLinf"
+"normLp"
 "not"
 "NOT"
+"NOT BETWEEN"
 "notEmpty"
 "notEquals"
 "nothing"
 "Nothing"
+"nothingArgMax"
+"nothingArgMin"
+"nothingArray"
+"nothingDistinct"
+"nothingForEach"
+"nothingIf"
+"nothingMap"
+"nothingMerge"
+"nothingNull"
+"nothingNullArgMax"
+"nothingNullArgMin"
+"nothingNullArray"
+"nothingNullDistinct"
+"nothingNullForEach"
+"nothingNullIf"
+"nothingNullMap"
+"nothingNullMerge"
+"nothingNullNull"
+"nothingNullOrDefault"
+"nothingNullOrNull"
+"nothingNullResample"
+"nothingNullSimpleState"
+"nothingNullState"
+"nothingOrDefault"
+"nothingOrNull"
+"nothingResample"
+"nothingSimpleState"
+"nothingState"
+"nothingUInt64"
+"nothingUInt64ArgMax"
+"nothingUInt64ArgMin"
+"nothingUInt64Array"
+"nothingUInt64Distinct"
+"nothingUInt64ForEach"
+"nothingUInt64If"
+"nothingUInt64Map"
+"nothingUInt64Merge"
+"nothingUInt64Null"
+"nothingUInt64OrDefault"
+"nothingUInt64OrNull"
+"nothingUInt64Resample"
+"nothingUInt64SimpleState"
+"nothingUInt64State"
+"NOT IDENTIFIED"
 "notILike"
+"NOT ILIKE"
 "notIn"
+"NOT IN"
 "notInIgnoreSet"
+"NOT KEYED"
 "notLike"
+"NOT LIKE"
 "notNullIn"
 "notNullInIgnoreSet"
+"NOT OVERRIDABLE"
 "now"
 "now64"
+"nowInBlock"
+"NS"
+"nth_value"
+"nth_valueArgMax"
+"nth_valueArgMin"
+"nth_valueArray"
+"nth_valueDistinct"
+"nth_valueForEach"
+"nth_valueIf"
+"nth_valueMap"
+"nth_valueMerge"
+"nth_valueNull"
+"nth_valueOrDefault"
+"nth_valueOrNull"
+"nth_valueResample"
+"nth_valueSimpleState"
+"nth_valueState"
+"ntile"
+"ntileArgMax"
+"ntileArgMin"
+"ntileArray"
+"ntileDistinct"
+"ntileForEach"
+"ntileIf"
+"ntileMap"
+"ntileMerge"
+"ntileNull"
+"ntileOrDefault"
+"ntileOrNull"
+"ntileResample"
+"ntileSimpleState"
+"ntileState"
 "Null"
+"NULL"
 "Nullable"
 "nullIf"
 "nullIn"
 "nullInIgnoreSet"
 "NULLS"
-"NULL_SQL"
 "NUMERIC"
 "NVARCHAR"
+"Object"
+"OCTET_LENGTH"
 "OFFSET"
 "ON"
+"ON DELETE"
 "ONLY"
-"OPTIMIZE"
+"ON UPDATE"
+"ON VOLUME"
 "OPTIMIZE TABLE"
 "or"
 "OR"
-"ORDER"
 "ORDER BY"
 "OR REPLACE"
 "OUTER"
-"OUTFILE"
+"OVER"
+"OVERRIDABLE"
+"parseDateTime"
 "parseDateTime32BestEffort"
 "parseDateTime32BestEffortOrNull"
 "parseDateTime32BestEffortOrZero"
 "parseDateTime64BestEffort"
 "parseDateTime64BestEffortOrNull"
 "parseDateTime64BestEffortOrZero"
+"parseDateTime64BestEffortUS"
+"parseDateTime64BestEffortUSOrNull"
+"parseDateTime64BestEffortUSOrZero"
 "parseDateTimeBestEffort"
 "parseDateTimeBestEffortOrNull"
 "parseDateTimeBestEffortOrZero"
 "parseDateTimeBestEffortUS"
 "parseDateTimeBestEffortUSOrNull"
 "parseDateTimeBestEffortUSOrZero"
+"parseDateTimeInJodaSyntax"
+"parseDateTimeInJodaSyntaxOrNull"
+"parseDateTimeInJodaSyntaxOrZero"
+"parseDateTimeOrNull"
+"parseDateTimeOrZero"
 "parseTimeDelta"
+"PART"
+"PARTIAL"
 "PARTITION"
 "PARTITION BY"
 "partitionId"
+"PARTITIONS"
+"PART_MOVE_TO_SHARD"
+"PASTE"
 "path"
 "pathFull"
+"PERIODIC REFRESH"
+"PERMANENTLY"
+"PERMISSIVE"
+"PERSISTENT"
+"PERSISTENT SEQUENTIAL"
 "pi"
+"PIPELINE"
+"PLAINTEXT_PASSWORD"
+"PLAN"
 "plus"
+"pmod"
 "Point"
 "pointInEllipses"
 "pointInPolygon"
@@ -935,71 +2882,620 @@
 "polygonsWithinSpherical"
 "POPULATE"
 "port"
+"portRFC"
 "position"
 "positionCaseInsensitive"
 "positionCaseInsensitiveUTF8"
 "positionUTF8"
+"positive_modulo"
+"positiveModulo"
 "pow"
 "power"
+"PRECEDING"
+"PRECISION"
 "PREWHERE"
 "PRIMARY"
 "PRIMARY KEY"
+"PROFILE"
 "PROJECTION"
+"proportionsZTest"
+"Protobuf"
 "protocol"
+"PULL"
+"punycodeDecode"
+"punycodeEncode"
 "Q"
 "QQ"
 "quantile"
+"quantileArgMax"
+"quantileArgMin"
+"quantileArray"
 "quantileBFloat16"
+"quantileBFloat16ArgMax"
+"quantileBFloat16ArgMin"
+"quantileBFloat16Array"
+"quantileBFloat16Distinct"
+"quantileBFloat16ForEach"
+"quantileBFloat16If"
+"quantileBFloat16Map"
+"quantileBFloat16Merge"
+"quantileBFloat16Null"
+"quantileBFloat16OrDefault"
+"quantileBFloat16OrNull"
+"quantileBFloat16Resample"
+"quantileBFloat16SimpleState"
+"quantileBFloat16State"
 "quantileBFloat16Weighted"
+"quantileBFloat16WeightedArgMax"
+"quantileBFloat16WeightedArgMin"
+"quantileBFloat16WeightedArray"
+"quantileBFloat16WeightedDistinct"
+"quantileBFloat16WeightedForEach"
+"quantileBFloat16WeightedIf"
+"quantileBFloat16WeightedMap"
+"quantileBFloat16WeightedMerge"
+"quantileBFloat16WeightedNull"
+"quantileBFloat16WeightedOrDefault"
+"quantileBFloat16WeightedOrNull"
+"quantileBFloat16WeightedResample"
+"quantileBFloat16WeightedSimpleState"
+"quantileBFloat16WeightedState"
+"quantileDD"
+"quantileDDArgMax"
+"quantileDDArgMin"
+"quantileDDArray"
+"quantileDDDistinct"
+"quantileDDForEach"
+"quantileDDIf"
+"quantileDDMap"
+"quantileDDMerge"
+"quantileDDNull"
+"quantileDDOrDefault"
+"quantileDDOrNull"
+"quantileDDResample"
+"quantileDDSimpleState"
+"quantileDDState"
 "quantileDeterministic"
+"quantileDeterministicArgMax"
+"quantileDeterministicArgMin"
+"quantileDeterministicArray"
+"quantileDeterministicDistinct"
+"quantileDeterministicForEach"
+"quantileDeterministicIf"
+"quantileDeterministicMap"
+"quantileDeterministicMerge"
+"quantileDeterministicNull"
+"quantileDeterministicOrDefault"
+"quantileDeterministicOrNull"
+"quantileDeterministicResample"
+"quantileDeterministicSimpleState"
+"quantileDeterministicState"
+"quantileDistinct"
 "quantileExact"
+"quantileExactArgMax"
+"quantileExactArgMin"
+"quantileExactArray"
+"quantileExactDistinct"
 "quantileExactExclusive"
+"quantileExactExclusiveArgMax"
+"quantileExactExclusiveArgMin"
+"quantileExactExclusiveArray"
+"quantileExactExclusiveDistinct"
+"quantileExactExclusiveForEach"
+"quantileExactExclusiveIf"
+"quantileExactExclusiveMap"
+"quantileExactExclusiveMerge"
+"quantileExactExclusiveNull"
+"quantileExactExclusiveOrDefault"
+"quantileExactExclusiveOrNull"
+"quantileExactExclusiveResample"
+"quantileExactExclusiveSimpleState"
+"quantileExactExclusiveState"
+"quantileExactForEach"
 "quantileExactHigh"
+"quantileExactHighArgMax"
+"quantileExactHighArgMin"
+"quantileExactHighArray"
+"quantileExactHighDistinct"
+"quantileExactHighForEach"
+"quantileExactHighIf"
+"quantileExactHighMap"
+"quantileExactHighMerge"
+"quantileExactHighNull"
+"quantileExactHighOrDefault"
+"quantileExactHighOrNull"
+"quantileExactHighResample"
+"quantileExactHighSimpleState"
+"quantileExactHighState"
+"quantileExactIf"
 "quantileExactInclusive"
+"quantileExactInclusiveArgMax"
+"quantileExactInclusiveArgMin"
+"quantileExactInclusiveArray"
+"quantileExactInclusiveDistinct"
+"quantileExactInclusiveForEach"
+"quantileExactInclusiveIf"
+"quantileExactInclusiveMap"
+"quantileExactInclusiveMerge"
+"quantileExactInclusiveNull"
+"quantileExactInclusiveOrDefault"
+"quantileExactInclusiveOrNull"
+"quantileExactInclusiveResample"
+"quantileExactInclusiveSimpleState"
+"quantileExactInclusiveState"
 "quantileExactLow"
+"quantileExactLowArgMax"
+"quantileExactLowArgMin"
+"quantileExactLowArray"
+"quantileExactLowDistinct"
+"quantileExactLowForEach"
+"quantileExactLowIf"
+"quantileExactLowMap"
+"quantileExactLowMerge"
+"quantileExactLowNull"
+"quantileExactLowOrDefault"
+"quantileExactLowOrNull"
+"quantileExactLowResample"
+"quantileExactLowSimpleState"
+"quantileExactLowState"
+"quantileExactMap"
+"quantileExactMerge"
+"quantileExactNull"
+"quantileExactOrDefault"
+"quantileExactOrNull"
+"quantileExactResample"
+"quantileExactSimpleState"
+"quantileExactState"
 "quantileExactWeighted"
+"quantileExactWeightedArgMax"
+"quantileExactWeightedArgMin"
+"quantileExactWeightedArray"
+"quantileExactWeightedDistinct"
+"quantileExactWeightedForEach"
+"quantileExactWeightedIf"
+"quantileExactWeightedMap"
+"quantileExactWeightedMerge"
+"quantileExactWeightedNull"
+"quantileExactWeightedOrDefault"
+"quantileExactWeightedOrNull"
+"quantileExactWeightedResample"
+"quantileExactWeightedSimpleState"
+"quantileExactWeightedState"
+"quantileForEach"
+"quantileGK"
+"quantileGKArgMax"
+"quantileGKArgMin"
+"quantileGKArray"
+"quantileGKDistinct"
+"quantileGKForEach"
+"quantileGKIf"
+"quantileGKMap"
+"quantileGKMerge"
+"quantileGKNull"
+"quantileGKOrDefault"
+"quantileGKOrNull"
+"quantileGKResample"
+"quantileGKSimpleState"
+"quantileGKState"
+"quantileIf"
+"quantileInterpolatedWeighted"
+"quantileInterpolatedWeightedArgMax"
+"quantileInterpolatedWeightedArgMin"
+"quantileInterpolatedWeightedArray"
+"quantileInterpolatedWeightedDistinct"
+"quantileInterpolatedWeightedForEach"
+"quantileInterpolatedWeightedIf"
+"quantileInterpolatedWeightedMap"
+"quantileInterpolatedWeightedMerge"
+"quantileInterpolatedWeightedNull"
+"quantileInterpolatedWeightedOrDefault"
+"quantileInterpolatedWeightedOrNull"
+"quantileInterpolatedWeightedResample"
+"quantileInterpolatedWeightedSimpleState"
+"quantileInterpolatedWeightedState"
+"quantileMap"
+"quantileMerge"
+"quantileNull"
+"quantileOrDefault"
+"quantileOrNull"
+"quantileResample"
 "quantiles"
+"quantilesArgMax"
+"quantilesArgMin"
+"quantilesArray"
 "quantilesBFloat16"
+"quantilesBFloat16ArgMax"
+"quantilesBFloat16ArgMin"
+"quantilesBFloat16Array"
+"quantilesBFloat16Distinct"
+"quantilesBFloat16ForEach"
+"quantilesBFloat16If"
+"quantilesBFloat16Map"
+"quantilesBFloat16Merge"
+"quantilesBFloat16Null"
+"quantilesBFloat16OrDefault"
+"quantilesBFloat16OrNull"
+"quantilesBFloat16Resample"
+"quantilesBFloat16SimpleState"
+"quantilesBFloat16State"
 "quantilesBFloat16Weighted"
+"quantilesBFloat16WeightedArgMax"
+"quantilesBFloat16WeightedArgMin"
+"quantilesBFloat16WeightedArray"
+"quantilesBFloat16WeightedDistinct"
+"quantilesBFloat16WeightedForEach"
+"quantilesBFloat16WeightedIf"
+"quantilesBFloat16WeightedMap"
+"quantilesBFloat16WeightedMerge"
+"quantilesBFloat16WeightedNull"
+"quantilesBFloat16WeightedOrDefault"
+"quantilesBFloat16WeightedOrNull"
+"quantilesBFloat16WeightedResample"
+"quantilesBFloat16WeightedSimpleState"
+"quantilesBFloat16WeightedState"
+"quantilesDD"
+"quantilesDDArgMax"
+"quantilesDDArgMin"
+"quantilesDDArray"
+"quantilesDDDistinct"
+"quantilesDDForEach"
+"quantilesDDIf"
+"quantilesDDMap"
+"quantilesDDMerge"
+"quantilesDDNull"
+"quantilesDDOrDefault"
+"quantilesDDOrNull"
+"quantilesDDResample"
+"quantilesDDSimpleState"
+"quantilesDDState"
 "quantilesDeterministic"
+"quantilesDeterministicArgMax"
+"quantilesDeterministicArgMin"
+"quantilesDeterministicArray"
+"quantilesDeterministicDistinct"
+"quantilesDeterministicForEach"
+"quantilesDeterministicIf"
+"quantilesDeterministicMap"
+"quantilesDeterministicMerge"
+"quantilesDeterministicNull"
+"quantilesDeterministicOrDefault"
+"quantilesDeterministicOrNull"
+"quantilesDeterministicResample"
+"quantilesDeterministicSimpleState"
+"quantilesDeterministicState"
+"quantilesDistinct"
 "quantilesExact"
+"quantilesExactArgMax"
+"quantilesExactArgMin"
+"quantilesExactArray"
+"quantilesExactDistinct"
 "quantilesExactExclusive"
+"quantilesExactExclusiveArgMax"
+"quantilesExactExclusiveArgMin"
+"quantilesExactExclusiveArray"
+"quantilesExactExclusiveDistinct"
+"quantilesExactExclusiveForEach"
+"quantilesExactExclusiveIf"
+"quantilesExactExclusiveMap"
+"quantilesExactExclusiveMerge"
+"quantilesExactExclusiveNull"
+"quantilesExactExclusiveOrDefault"
+"quantilesExactExclusiveOrNull"
+"quantilesExactExclusiveResample"
+"quantilesExactExclusiveSimpleState"
+"quantilesExactExclusiveState"
+"quantilesExactForEach"
 "quantilesExactHigh"
+"quantilesExactHighArgMax"
+"quantilesExactHighArgMin"
+"quantilesExactHighArray"
+"quantilesExactHighDistinct"
+"quantilesExactHighForEach"
+"quantilesExactHighIf"
+"quantilesExactHighMap"
+"quantilesExactHighMerge"
+"quantilesExactHighNull"
+"quantilesExactHighOrDefault"
+"quantilesExactHighOrNull"
+"quantilesExactHighResample"
+"quantilesExactHighSimpleState"
+"quantilesExactHighState"
+"quantilesExactIf"
 "quantilesExactInclusive"
+"quantilesExactInclusiveArgMax"
+"quantilesExactInclusiveArgMin"
+"quantilesExactInclusiveArray"
+"quantilesExactInclusiveDistinct"
+"quantilesExactInclusiveForEach"
+"quantilesExactInclusiveIf"
+"quantilesExactInclusiveMap"
+"quantilesExactInclusiveMerge"
+"quantilesExactInclusiveNull"
+"quantilesExactInclusiveOrDefault"
+"quantilesExactInclusiveOrNull"
+"quantilesExactInclusiveResample"
+"quantilesExactInclusiveSimpleState"
+"quantilesExactInclusiveState"
 "quantilesExactLow"
+"quantilesExactLowArgMax"
+"quantilesExactLowArgMin"
+"quantilesExactLowArray"
+"quantilesExactLowDistinct"
+"quantilesExactLowForEach"
+"quantilesExactLowIf"
+"quantilesExactLowMap"
+"quantilesExactLowMerge"
+"quantilesExactLowNull"
+"quantilesExactLowOrDefault"
+"quantilesExactLowOrNull"
+"quantilesExactLowResample"
+"quantilesExactLowSimpleState"
+"quantilesExactLowState"
+"quantilesExactMap"
+"quantilesExactMerge"
+"quantilesExactNull"
+"quantilesExactOrDefault"
+"quantilesExactOrNull"
+"quantilesExactResample"
+"quantilesExactSimpleState"
+"quantilesExactState"
 "quantilesExactWeighted"
+"quantilesExactWeightedArgMax"
+"quantilesExactWeightedArgMin"
+"quantilesExactWeightedArray"
+"quantilesExactWeightedDistinct"
+"quantilesExactWeightedForEach"
+"quantilesExactWeightedIf"
+"quantilesExactWeightedMap"
+"quantilesExactWeightedMerge"
+"quantilesExactWeightedNull"
+"quantilesExactWeightedOrDefault"
+"quantilesExactWeightedOrNull"
+"quantilesExactWeightedResample"
+"quantilesExactWeightedSimpleState"
+"quantilesExactWeightedState"
+"quantilesForEach"
+"quantilesGK"
+"quantilesGKArgMax"
+"quantilesGKArgMin"
+"quantilesGKArray"
+"quantilesGKDistinct"
+"quantilesGKForEach"
+"quantilesGKIf"
+"quantilesGKMap"
+"quantilesGKMerge"
+"quantilesGKNull"
+"quantilesGKOrDefault"
+"quantilesGKOrNull"
+"quantilesGKResample"
+"quantilesGKSimpleState"
+"quantilesGKState"
+"quantilesIf"
+"quantileSimpleState"
+"quantilesInterpolatedWeighted"
+"quantilesInterpolatedWeightedArgMax"
+"quantilesInterpolatedWeightedArgMin"
+"quantilesInterpolatedWeightedArray"
+"quantilesInterpolatedWeightedDistinct"
+"quantilesInterpolatedWeightedForEach"
+"quantilesInterpolatedWeightedIf"
+"quantilesInterpolatedWeightedMap"
+"quantilesInterpolatedWeightedMerge"
+"quantilesInterpolatedWeightedNull"
+"quantilesInterpolatedWeightedOrDefault"
+"quantilesInterpolatedWeightedOrNull"
+"quantilesInterpolatedWeightedResample"
+"quantilesInterpolatedWeightedSimpleState"
+"quantilesInterpolatedWeightedState"
+"quantilesMap"
+"quantilesMerge"
+"quantilesNull"
+"quantilesOrDefault"
+"quantilesOrNull"
+"quantilesResample"
+"quantilesSimpleState"
+"quantilesState"
+"quantileState"
 "quantilesTDigest"
+"quantilesTDigestArgMax"
+"quantilesTDigestArgMin"
+"quantilesTDigestArray"
+"quantilesTDigestDistinct"
+"quantilesTDigestForEach"
+"quantilesTDigestIf"
+"quantilesTDigestMap"
+"quantilesTDigestMerge"
+"quantilesTDigestNull"
+"quantilesTDigestOrDefault"
+"quantilesTDigestOrNull"
+"quantilesTDigestResample"
+"quantilesTDigestSimpleState"
+"quantilesTDigestState"
 "quantilesTDigestWeighted"
+"quantilesTDigestWeightedArgMax"
+"quantilesTDigestWeightedArgMin"
+"quantilesTDigestWeightedArray"
+"quantilesTDigestWeightedDistinct"
+"quantilesTDigestWeightedForEach"
+"quantilesTDigestWeightedIf"
+"quantilesTDigestWeightedMap"
+"quantilesTDigestWeightedMerge"
+"quantilesTDigestWeightedNull"
+"quantilesTDigestWeightedOrDefault"
+"quantilesTDigestWeightedOrNull"
+"quantilesTDigestWeightedResample"
+"quantilesTDigestWeightedSimpleState"
+"quantilesTDigestWeightedState"
 "quantilesTiming"
+"quantilesTimingArgMax"
+"quantilesTimingArgMin"
+"quantilesTimingArray"
+"quantilesTimingDistinct"
+"quantilesTimingForEach"
+"quantilesTimingIf"
+"quantilesTimingMap"
+"quantilesTimingMerge"
+"quantilesTimingNull"
+"quantilesTimingOrDefault"
+"quantilesTimingOrNull"
+"quantilesTimingResample"
+"quantilesTimingSimpleState"
+"quantilesTimingState"
 "quantilesTimingWeighted"
+"quantilesTimingWeightedArgMax"
+"quantilesTimingWeightedArgMin"
+"quantilesTimingWeightedArray"
+"quantilesTimingWeightedDistinct"
+"quantilesTimingWeightedForEach"
+"quantilesTimingWeightedIf"
+"quantilesTimingWeightedMap"
+"quantilesTimingWeightedMerge"
+"quantilesTimingWeightedNull"
+"quantilesTimingWeightedOrDefault"
+"quantilesTimingWeightedOrNull"
+"quantilesTimingWeightedResample"
+"quantilesTimingWeightedSimpleState"
+"quantilesTimingWeightedState"
 "quantileTDigest"
+"quantileTDigestArgMax"
+"quantileTDigestArgMin"
+"quantileTDigestArray"
+"quantileTDigestDistinct"
+"quantileTDigestForEach"
+"quantileTDigestIf"
+"quantileTDigestMap"
+"quantileTDigestMerge"
+"quantileTDigestNull"
+"quantileTDigestOrDefault"
+"quantileTDigestOrNull"
+"quantileTDigestResample"
+"quantileTDigestSimpleState"
+"quantileTDigestState"
 "quantileTDigestWeighted"
+"quantileTDigestWeightedArgMax"
+"quantileTDigestWeightedArgMin"
+"quantileTDigestWeightedArray"
+"quantileTDigestWeightedDistinct"
+"quantileTDigestWeightedForEach"
+"quantileTDigestWeightedIf"
+"quantileTDigestWeightedMap"
+"quantileTDigestWeightedMerge"
+"quantileTDigestWeightedNull"
+"quantileTDigestWeightedOrDefault"
+"quantileTDigestWeightedOrNull"
+"quantileTDigestWeightedResample"
+"quantileTDigestWeightedSimpleState"
+"quantileTDigestWeightedState"
 "quantileTiming"
+"quantileTimingArgMax"
+"quantileTimingArgMin"
+"quantileTimingArray"
+"quantileTimingDistinct"
+"quantileTimingForEach"
+"quantileTimingIf"
+"quantileTimingMap"
+"quantileTimingMerge"
+"quantileTimingNull"
+"quantileTimingOrDefault"
+"quantileTimingOrNull"
+"quantileTimingResample"
+"quantileTimingSimpleState"
+"quantileTimingState"
 "quantileTimingWeighted"
+"quantileTimingWeightedArgMax"
+"quantileTimingWeightedArgMin"
+"quantileTimingWeightedArray"
+"quantileTimingWeightedDistinct"
+"quantileTimingWeightedForEach"
+"quantileTimingWeightedIf"
+"quantileTimingWeightedMap"
+"quantileTimingWeightedMerge"
+"quantileTimingWeightedNull"
+"quantileTimingWeightedOrDefault"
+"quantileTimingWeightedOrNull"
+"quantileTimingWeightedResample"
+"quantileTimingWeightedSimpleState"
+"quantileTimingWeightedState"
 "QUARTER"
+"QUARTERS"
+"QUERY"
 "query_id"
 "queryID"
 "queryString"
 "queryStringAndFragment"
+"QUERY TREE"
+"QUOTA"
+"radians"
 "rand"
 "rand32"
 "rand64"
+"randBernoulli"
+"randBinomial"
+"randCanonical"
+"randChiSquared"
 "randConstant"
+"randExponential"
+"randFisherF"
+"randLogNormal"
+"randNegativeBinomial"
+"randNormal"
 "randomFixedString"
+"RANDOMIZED"
+"RANDOMIZE FOR"
 "randomPrintableASCII"
 "randomString"
 "randomStringUTF8"
+"randPoisson"
+"randStudentT"
+"randUniform"
 "range"
 "RANGE"
 "rank"
+"rankArgMax"
+"rankArgMin"
+"rankArray"
 "rankCorr"
+"rankCorrArgMax"
+"rankCorrArgMin"
+"rankCorrArray"
+"rankCorrDistinct"
+"rankCorrForEach"
+"rankCorrIf"
+"rankCorrMap"
+"rankCorrMerge"
+"rankCorrNull"
+"rankCorrOrDefault"
+"rankCorrOrNull"
+"rankCorrResample"
+"rankCorrSimpleState"
+"rankCorrState"
+"rankDistinct"
+"rankForEach"
+"rankIf"
+"rankMap"
+"rankMerge"
+"rankNull"
+"rankOrDefault"
+"rankOrNull"
+"rankResample"
+"rankSimpleState"
+"rankState"
+"READONLY"
 "readWKTMultiPolygon"
 "readWKTPoint"
 "readWKTPolygon"
 "readWKTRing"
 "REAL"
+"REALM"
+"RECOMPRESS"
+"REFERENCES"
 "REFRESH"
+"REGEXP"
+"regexpExtract"
+"REGEXP_EXTRACT"
+"REGEXP_MATCHES"
 "regexpQuoteMeta"
+"REGEXP_REPLACE"
 "regionHierarchy"
 "regionIn"
 "regionToArea"
@@ -1030,11 +3526,15 @@
 "reinterpretAsUInt64"
 "reinterpretAsUInt8"
 "reinterpretAsUUID"
-"RELOAD"
 "REMOVE"
+"REMOVE SAMPLE BY"
+"REMOVE TTL"
 "RENAME"
 "RENAME COLUMN"
+"RENAME DATABASE"
+"RENAME DICTIONARY"
 "RENAME TABLE"
+"RENAME TO"
 "repeat"
 "replace"
 "REPLACE"
@@ -1043,18 +3543,40 @@
 "REPLACE PARTITION"
 "replaceRegexpAll"
 "replaceRegexpOne"
-"REPLICA"
 "replicate"
-"REPLICATED"
 "Resample"
+"RESET SETTING"
+"RESPECT NULLS"
+"RESTORE"
+"RESTRICT"
+"RESTRICTIVE"
 "RESUME"
 "retention"
+"retentionArgMax"
+"retentionArgMin"
+"retentionArray"
+"retentionDistinct"
+"retentionForEach"
+"retentionIf"
+"retentionMap"
+"retentionMerge"
+"retentionNull"
+"retentionOrDefault"
+"retentionOrNull"
+"retentionResample"
+"retentionSimpleState"
+"retentionState"
 "reverse"
 "reverseUTF8"
+"revision"
+"REVOKE"
+"right"
 "RIGHT"
 "rightPad"
 "rightPadUTF8"
+"rightUTF8"
 "Ring"
+"ROLLBACK"
 "ROLLUP"
 "round"
 "roundAge"
@@ -1062,10 +3584,27 @@
 "roundDown"
 "roundDuration"
 "roundToExp2"
+"ROW"
 "row_number"
+"row_numberArgMax"
+"row_numberArgMin"
+"row_numberArray"
+"row_numberDistinct"
+"row_numberForEach"
+"row_numberIf"
 "rowNumberInAllBlocks"
 "rowNumberInBlock"
+"row_numberMap"
+"row_numberMerge"
+"row_numberNull"
+"row_numberOrDefault"
+"row_numberOrNull"
+"row_numberResample"
+"row_numberSimpleState"
+"row_numberState"
+"ROWS"
 "rpad"
+"rtrim"
 "RTRIM"
 "runningAccumulate"
 "runningConcurrency"
@@ -1081,29 +3620,103 @@
 "s2RectIntersection"
 "s2RectUnion"
 "s2ToGeo"
+"S3"
+"SALT"
 "SAMPLE"
 "SAMPLE BY"
+"scalarProduct"
+"__scalarSubqueryResult"
+"SCHEMA"
+"SCHEME"
 "SECOND"
+"SECONDS"
 "SELECT"
 "SEMI"
-"SENDS"
 "sequenceCount"
+"sequenceCountArgMax"
+"sequenceCountArgMin"
+"sequenceCountArray"
+"sequenceCountDistinct"
+"sequenceCountForEach"
+"sequenceCountIf"
+"sequenceCountMap"
+"sequenceCountMerge"
+"sequenceCountNull"
+"sequenceCountOrDefault"
+"sequenceCountOrNull"
+"sequenceCountResample"
+"sequenceCountSimpleState"
+"sequenceCountState"
 "sequenceMatch"
+"sequenceMatchArgMax"
+"sequenceMatchArgMin"
+"sequenceMatchArray"
+"sequenceMatchDistinct"
+"sequenceMatchForEach"
+"sequenceMatchIf"
+"sequenceMatchMap"
+"sequenceMatchMerge"
+"sequenceMatchNull"
+"sequenceMatchOrDefault"
+"sequenceMatchOrNull"
+"sequenceMatchResample"
+"sequenceMatchSimpleState"
+"sequenceMatchState"
 "sequenceNextNode"
+"sequenceNextNodeArgMax"
+"sequenceNextNodeArgMin"
+"sequenceNextNodeArray"
+"sequenceNextNodeDistinct"
+"sequenceNextNodeForEach"
+"sequenceNextNodeIf"
+"sequenceNextNodeMap"
+"sequenceNextNodeMerge"
+"sequenceNextNodeNull"
+"sequenceNextNodeOrDefault"
+"sequenceNextNodeOrNull"
+"sequenceNextNodeResample"
+"sequenceNextNodeSimpleState"
+"sequenceNextNodeState"
+"seriesDecomposeSTL"
+"seriesOutliersDetectTukey"
+"seriesPeriodDetectFFT"
+"SERVER"
+"serverTimezone"
+"serverTimeZone"
 "serverUUID"
 "SET"
+"SET DEFAULT"
+"SET DEFAULT ROLE"
+"SET FAKE TIME"
+"SET NULL"
+"SET ROLE"
+"SET ROLE DEFAULT"
 "SETTINGS"
+"SET TRANSACTION SNAPSHOT"
 "SHA1"
 "SHA224"
 "SHA256"
+"SHA256_HASH"
+"SHA256_PASSWORD"
 "SHA384"
 "SHA512"
+"SHA512_256"
 "shardCount"
 "shardNum"
 "SHOW"
+"SHOW ACCESS"
+"showCertificate"
+"SHOW CREATE"
+"SHOW ENGINES"
+"SHOW FUNCTIONS"
+"SHOW GRANTS"
+"SHOW PRIVILEGES"
 "SHOW PROCESSLIST"
+"SHOW SETTING"
 "sigmoid"
 "sign"
+"SIGNED"
+"SIMPLE"
 "SimpleAggregateFunction"
 "simpleJSONExtractBool"
 "simpleJSONExtractFloat"
@@ -1113,14 +3726,74 @@
 "simpleJSONExtractUInt"
 "simpleJSONHas"
 "simpleLinearRegression"
+"simpleLinearRegressionArgMax"
+"simpleLinearRegressionArgMin"
+"simpleLinearRegressionArray"
+"simpleLinearRegressionDistinct"
+"simpleLinearRegressionForEach"
+"simpleLinearRegressionIf"
+"simpleLinearRegressionMap"
+"simpleLinearRegressionMerge"
+"simpleLinearRegressionNull"
+"simpleLinearRegressionOrDefault"
+"simpleLinearRegressionOrNull"
+"simpleLinearRegressionResample"
+"simpleLinearRegressionSimpleState"
+"simpleLinearRegressionState"
 "sin"
 "SINGLE"
 "singleValueOrNull"
+"singleValueOrNullArgMax"
+"singleValueOrNullArgMin"
+"singleValueOrNullArray"
+"singleValueOrNullDistinct"
+"singleValueOrNullForEach"
+"singleValueOrNullIf"
+"singleValueOrNullMap"
+"singleValueOrNullMerge"
+"singleValueOrNullNull"
+"singleValueOrNullOrDefault"
+"singleValueOrNullOrNull"
+"singleValueOrNullResample"
+"singleValueOrNullSimpleState"
+"singleValueOrNullState"
 "sinh"
 "sipHash128"
+"sipHash128Keyed"
+"sipHash128Reference"
+"sipHash128ReferenceKeyed"
 "sipHash64"
+"sipHash64Keyed"
 "skewPop"
+"skewPopArgMax"
+"skewPopArgMin"
+"skewPopArray"
+"skewPopDistinct"
+"skewPopForEach"
+"skewPopIf"
+"skewPopMap"
+"skewPopMerge"
+"skewPopNull"
+"skewPopOrDefault"
+"skewPopOrNull"
+"skewPopResample"
+"skewPopSimpleState"
+"skewPopState"
 "skewSamp"
+"skewSampArgMax"
+"skewSampArgMin"
+"skewSampArray"
+"skewSampDistinct"
+"skewSampForEach"
+"skewSampIf"
+"skewSampMap"
+"skewSampMerge"
+"skewSampNull"
+"skewSampOrDefault"
+"skewSampOrNull"
+"skewSampResample"
+"skewSampSimpleState"
+"skewSampState"
 "sleep"
 "sleepEachRow"
 "SMALLINT"
@@ -1128,61 +3801,377 @@
 "SMALLINT UNSIGNED"
 "snowflakeToDateTime"
 "snowflakeToDateTime64"
+"soundex"
 "SOURCE"
+"space"
 "sparkbar"
+"sparkBar"
+"sparkbarArgMax"
+"sparkBarArgMax"
+"sparkbarArgMin"
+"sparkBarArgMin"
+"sparkbarArray"
+"sparkBarArray"
+"sparkbarDistinct"
+"sparkBarDistinct"
+"sparkbarForEach"
+"sparkBarForEach"
+"sparkbarIf"
+"sparkBarIf"
+"sparkbarMap"
+"sparkBarMap"
+"sparkbarMerge"
+"sparkBarMerge"
+"sparkbarNull"
+"sparkBarNull"
+"sparkbarOrDefault"
+"sparkBarOrDefault"
+"sparkbarOrNull"
+"sparkBarOrNull"
+"sparkbarResample"
+"sparkBarResample"
+"sparkbarSimpleState"
+"sparkBarSimpleState"
+"sparkbarState"
+"sparkBarState"
+"SPATIAL"
+"splitByAlpha"
 "splitByChar"
 "splitByNonAlpha"
 "splitByRegexp"
 "splitByString"
 "splitByWhitespace"
+"sqid"
+"sqidDecode"
+"sqidEncode"
+"SQL SECURITY"
 "SQL_TSI_DAY"
 "SQL_TSI_HOUR"
+"SQL_TSI_MICROSECOND"
+"SQL_TSI_MILLISECOND"
 "SQL_TSI_MINUTE"
 "SQL_TSI_MONTH"
+"SQL_TSI_NANOSECOND"
 "SQL_TSI_QUARTER"
 "SQL_TSI_SECOND"
 "SQL_TSI_WEEK"
 "SQL_TSI_YEAR"
 "sqrt"
 "SS"
-"START"
+"SSH_KEY"
+"SSL_CERTIFICATE"
 "startsWith"
+"startsWithUTF8"
 "State"
+"STATISTIC"
+"STD"
+"STDArgMax"
+"STDArgMin"
+"STDArray"
 "stddevPop"
 "STDDEV_POP"
+"stddevPopArgMax"
+"STDDEV_POPArgMax"
+"stddevPopArgMin"
+"STDDEV_POPArgMin"
+"stddevPopArray"
+"STDDEV_POPArray"
+"stddevPopDistinct"
+"STDDEV_POPDistinct"
+"stddevPopForEach"
+"STDDEV_POPForEach"
+"stddevPopIf"
+"STDDEV_POPIf"
+"stddevPopMap"
+"STDDEV_POPMap"
+"stddevPopMerge"
+"STDDEV_POPMerge"
+"stddevPopNull"
+"STDDEV_POPNull"
+"stddevPopOrDefault"
+"STDDEV_POPOrDefault"
+"stddevPopOrNull"
+"STDDEV_POPOrNull"
+"stddevPopResample"
+"STDDEV_POPResample"
+"stddevPopSimpleState"
+"STDDEV_POPSimpleState"
 "stddevPopStable"
+"stddevPopStableArgMax"
+"stddevPopStableArgMin"
+"stddevPopStableArray"
+"stddevPopStableDistinct"
+"stddevPopStableForEach"
+"stddevPopStableIf"
+"stddevPopStableMap"
+"stddevPopStableMerge"
+"stddevPopStableNull"
+"stddevPopStableOrDefault"
+"stddevPopStableOrNull"
+"stddevPopStableResample"
+"stddevPopStableSimpleState"
+"stddevPopStableState"
+"stddevPopState"
+"STDDEV_POPState"
 "stddevSamp"
 "STDDEV_SAMP"
+"stddevSampArgMax"
+"STDDEV_SAMPArgMax"
+"stddevSampArgMin"
+"STDDEV_SAMPArgMin"
+"stddevSampArray"
+"STDDEV_SAMPArray"
+"stddevSampDistinct"
+"STDDEV_SAMPDistinct"
+"stddevSampForEach"
+"STDDEV_SAMPForEach"
+"stddevSampIf"
+"STDDEV_SAMPIf"
+"stddevSampMap"
+"STDDEV_SAMPMap"
+"stddevSampMerge"
+"STDDEV_SAMPMerge"
+"stddevSampNull"
+"STDDEV_SAMPNull"
+"stddevSampOrDefault"
+"STDDEV_SAMPOrDefault"
+"stddevSampOrNull"
+"STDDEV_SAMPOrNull"
+"stddevSampResample"
+"STDDEV_SAMPResample"
+"stddevSampSimpleState"
+"STDDEV_SAMPSimpleState"
 "stddevSampStable"
+"stddevSampStableArgMax"
+"stddevSampStableArgMin"
+"stddevSampStableArray"
+"stddevSampStableDistinct"
+"stddevSampStableForEach"
+"stddevSampStableIf"
+"stddevSampStableMap"
+"stddevSampStableMerge"
+"stddevSampStableNull"
+"stddevSampStableOrDefault"
+"stddevSampStableOrNull"
+"stddevSampStableResample"
+"stddevSampStableSimpleState"
+"stddevSampStableState"
+"stddevSampState"
+"STDDEV_SAMPState"
+"STDDistinct"
+"STDForEach"
+"STDIf"
+"STDMap"
+"STDMerge"
+"STDNull"
+"STDOrDefault"
+"STDOrNull"
+"STDResample"
+"STDSimpleState"
+"STDState"
 "stem"
 "STEP"
 "stochasticLinearRegression"
+"stochasticLinearRegressionArgMax"
+"stochasticLinearRegressionArgMin"
+"stochasticLinearRegressionArray"
+"stochasticLinearRegressionDistinct"
+"stochasticLinearRegressionForEach"
+"stochasticLinearRegressionIf"
+"stochasticLinearRegressionMap"
+"stochasticLinearRegressionMerge"
+"stochasticLinearRegressionNull"
+"stochasticLinearRegressionOrDefault"
+"stochasticLinearRegressionOrNull"
+"stochasticLinearRegressionResample"
+"stochasticLinearRegressionSimpleState"
+"stochasticLinearRegressionState"
 "stochasticLogisticRegression"
-"STOP"
+"stochasticLogisticRegressionArgMax"
+"stochasticLogisticRegressionArgMin"
+"stochasticLogisticRegressionArray"
+"stochasticLogisticRegressionDistinct"
+"stochasticLogisticRegressionForEach"
+"stochasticLogisticRegressionIf"
+"stochasticLogisticRegressionMap"
+"stochasticLogisticRegressionMerge"
+"stochasticLogisticRegressionNull"
+"stochasticLogisticRegressionOrDefault"
+"stochasticLogisticRegressionOrNull"
+"stochasticLogisticRegressionResample"
+"stochasticLogisticRegressionSimpleState"
+"stochasticLogisticRegressionState"
+"STORAGE"
+"STRICT"
+"STRICTLY_ASCENDING"
 "String"
+"stringJaccardIndex"
+"stringJaccardIndexUTF8"
 "stringToH3"
+"str_to_date"
+"str_to_map"
+"structureToCapnProtoSchema"
+"structureToProtobufSchema"
 "studentTTest"
+"studentTTestArgMax"
+"studentTTestArgMin"
+"studentTTestArray"
+"studentTTestDistinct"
+"studentTTestForEach"
+"studentTTestIf"
+"studentTTestMap"
+"studentTTestMerge"
+"studentTTestNull"
+"studentTTestOrDefault"
+"studentTTestOrNull"
+"studentTTestResample"
+"studentTTestSimpleState"
+"studentTTestState"
 "subBitmap"
+"subDate"
+"SUBPARTITION"
+"SUBPARTITION BY"
+"SUBPARTITIONS"
 "substr"
 "substring"
 "SUBSTRING"
+"substringIndex"
+"SUBSTRING_INDEX"
+"substringIndexUTF8"
 "substringUTF8"
 "subtractDays"
 "subtractHours"
+"subtractInterval"
+"subtractMicroseconds"
+"subtractMilliseconds"
 "subtractMinutes"
 "subtractMonths"
+"subtractNanoseconds"
 "subtractQuarters"
 "subtractSeconds"
+"subtractTupleOfIntervals"
 "subtractWeeks"
 "subtractYears"
 "sum"
+"sumArgMax"
+"sumArgMin"
+"sumArray"
 "sumCount"
+"sumCountArgMax"
+"sumCountArgMin"
+"sumCountArray"
+"sumCountDistinct"
+"sumCountForEach"
+"sumCountIf"
+"sumCountMap"
+"sumCountMerge"
+"sumCountNull"
+"sumCountOrDefault"
+"sumCountOrNull"
+"sumCountResample"
+"sumCountSimpleState"
+"sumCountState"
+"sumDistinct"
+"sumForEach"
+"sumIf"
 "sumKahan"
+"sumKahanArgMax"
+"sumKahanArgMin"
+"sumKahanArray"
+"sumKahanDistinct"
+"sumKahanForEach"
+"sumKahanIf"
+"sumKahanMap"
+"sumKahanMerge"
+"sumKahanNull"
+"sumKahanOrDefault"
+"sumKahanOrNull"
+"sumKahanResample"
+"sumKahanSimpleState"
+"sumKahanState"
 "sumMap"
 "sumMapFiltered"
+"sumMapFilteredArgMax"
+"sumMapFilteredArgMin"
+"sumMapFilteredArray"
+"sumMapFilteredDistinct"
+"sumMapFilteredForEach"
+"sumMapFilteredIf"
+"sumMapFilteredMap"
+"sumMapFilteredMerge"
+"sumMapFilteredNull"
+"sumMapFilteredOrDefault"
+"sumMapFilteredOrNull"
+"sumMapFilteredResample"
+"sumMapFilteredSimpleState"
+"sumMapFilteredState"
 "sumMapFilteredWithOverflow"
+"sumMapFilteredWithOverflowArgMax"
+"sumMapFilteredWithOverflowArgMin"
+"sumMapFilteredWithOverflowArray"
+"sumMapFilteredWithOverflowDistinct"
+"sumMapFilteredWithOverflowForEach"
+"sumMapFilteredWithOverflowIf"
+"sumMapFilteredWithOverflowMap"
+"sumMapFilteredWithOverflowMerge"
+"sumMapFilteredWithOverflowNull"
+"sumMapFilteredWithOverflowOrDefault"
+"sumMapFilteredWithOverflowOrNull"
+"sumMapFilteredWithOverflowResample"
+"sumMapFilteredWithOverflowSimpleState"
+"sumMapFilteredWithOverflowState"
+"sumMappedArrays"
+"sumMappedArraysArgMax"
+"sumMappedArraysArgMin"
+"sumMappedArraysArray"
+"sumMappedArraysDistinct"
+"sumMappedArraysForEach"
+"sumMappedArraysIf"
+"sumMappedArraysMap"
+"sumMappedArraysMerge"
+"sumMappedArraysNull"
+"sumMappedArraysOrDefault"
+"sumMappedArraysOrNull"
+"sumMappedArraysResample"
+"sumMappedArraysSimpleState"
+"sumMappedArraysState"
 "sumMapWithOverflow"
+"sumMapWithOverflowArgMax"
+"sumMapWithOverflowArgMin"
+"sumMapWithOverflowArray"
+"sumMapWithOverflowDistinct"
+"sumMapWithOverflowForEach"
+"sumMapWithOverflowIf"
+"sumMapWithOverflowMap"
+"sumMapWithOverflowMerge"
+"sumMapWithOverflowNull"
+"sumMapWithOverflowOrDefault"
+"sumMapWithOverflowOrNull"
+"sumMapWithOverflowResample"
+"sumMapWithOverflowSimpleState"
+"sumMapWithOverflowState"
+"sumMerge"
+"sumNull"
+"sumOrDefault"
+"sumOrNull"
+"sumResample"
+"sumSimpleState"
+"sumState"
 "sumWithOverflow"
+"sumWithOverflowArgMax"
+"sumWithOverflowArgMin"
+"sumWithOverflowArray"
+"sumWithOverflowDistinct"
+"sumWithOverflowForEach"
+"sumWithOverflowIf"
+"sumWithOverflowMap"
+"sumWithOverflowMerge"
+"sumWithOverflowNull"
+"sumWithOverflowOrDefault"
+"sumWithOverflowOrNull"
+"sumWithOverflowResample"
+"sumWithOverflowSimpleState"
+"sumWithOverflowState"
 "SUSPEND"
 "svg"
 "SVG"
@@ -1191,24 +4180,44 @@
 "SYNTAX"
 "SYSTEM"
 "TABLE"
+"TABLE OVERRIDE"
 "TABLES"
 "tan"
 "tanh"
 "tcpPort"
 "TEMPORARY"
+"TEMPORARY TABLE"
 "TEST"
 "TEXT"
 "tgamma"
+"theilsU"
+"theilsUArgMax"
+"theilsUArgMin"
+"theilsUArray"
+"theilsUDistinct"
+"theilsUForEach"
+"theilsUIf"
+"theilsUMap"
+"theilsUMerge"
+"theilsUNull"
+"theilsUOrDefault"
+"theilsUOrNull"
+"theilsUResample"
+"theilsUSimpleState"
+"theilsUState"
 "THEN"
 "throwIf"
 "tid"
-"TIES"
-"TIMEOUT"
+"TIME"
+"timeDiff"
 "timeSlot"
 "timeSlots"
+"timestamp"
 "TIMESTAMP"
 "TIMESTAMP_ADD"
 "TIMESTAMPADD"
+"timestamp_diff"
+"timestampDiff"
 "TIMESTAMP_DIFF"
 "TIMESTAMPDIFF"
 "TIMESTAMP_SUB"
@@ -1226,77 +4235,111 @@
 "TINYTEXT"
 "TO"
 "TO_BASE64"
+"toBool"
 "toColumnTypeName"
 "toDate"
 "toDate32"
+"toDate32OrDefault"
 "toDate32OrNull"
 "toDate32OrZero"
+"toDateOrDefault"
 "toDateOrNull"
 "toDateOrZero"
 "toDateTime"
 "toDateTime32"
 "toDateTime64"
+"toDateTime64OrDefault"
 "toDateTime64OrNull"
 "toDateTime64OrZero"
+"toDateTimeOrDefault"
 "toDateTimeOrNull"
 "toDateTimeOrZero"
 "today"
 "toDayOfMonth"
 "toDayOfWeek"
 "toDayOfYear"
+"TO_DAYS"
+"toDaysSinceYearZero"
 "toDecimal128"
+"toDecimal128OrDefault"
 "toDecimal128OrNull"
 "toDecimal128OrZero"
 "toDecimal256"
+"toDecimal256OrDefault"
 "toDecimal256OrNull"
 "toDecimal256OrZero"
 "toDecimal32"
+"toDecimal32OrDefault"
 "toDecimal32OrNull"
 "toDecimal32OrZero"
 "toDecimal64"
+"toDecimal64OrDefault"
 "toDecimal64OrNull"
 "toDecimal64OrZero"
+"toDecimalString"
 "TO DISK"
 "toFixedString"
 "toFloat32"
+"toFloat32OrDefault"
 "toFloat32OrNull"
 "toFloat32OrZero"
 "toFloat64"
+"toFloat64OrDefault"
 "toFloat64OrNull"
 "toFloat64OrZero"
 "toHour"
+"TO INNER UUID"
 "toInt128"
+"toInt128OrDefault"
 "toInt128OrNull"
 "toInt128OrZero"
 "toInt16"
+"toInt16OrDefault"
 "toInt16OrNull"
 "toInt16OrZero"
 "toInt256"
+"toInt256OrDefault"
 "toInt256OrNull"
 "toInt256OrZero"
 "toInt32"
+"toInt32OrDefault"
 "toInt32OrNull"
 "toInt32OrZero"
 "toInt64"
+"toInt64OrDefault"
 "toInt64OrNull"
 "toInt64OrZero"
 "toInt8"
+"toInt8OrDefault"
 "toInt8OrNull"
 "toInt8OrZero"
 "toIntervalDay"
 "toIntervalHour"
+"toIntervalMicrosecond"
+"toIntervalMillisecond"
 "toIntervalMinute"
 "toIntervalMonth"
+"toIntervalNanosecond"
 "toIntervalQuarter"
 "toIntervalSecond"
 "toIntervalWeek"
 "toIntervalYear"
 "toIPv4"
+"toIPv4OrDefault"
+"toIPv4OrNull"
+"toIPv4OrZero"
 "toIPv6"
+"toIPv6OrDefault"
+"toIPv6OrNull"
+"toIPv6OrZero"
 "toISOWeek"
 "toISOYear"
 "toJSONString"
+"tokens"
+"toLastDayOfMonth"
+"toLastDayOfWeek"
 "toLowCardinality"
+"toMillisecond"
 "toMinute"
 "toModifiedJulianDay"
 "toModifiedJulianDayOrNull"
@@ -1305,8 +4348,37 @@
 "toNullable"
 "TOP"
 "topK"
+"topKArgMax"
+"topKArgMin"
+"topKArray"
+"topKDistinct"
+"topKForEach"
+"topKIf"
+"topKMap"
+"topKMerge"
+"topKNull"
+"topKOrDefault"
+"topKOrNull"
+"topKResample"
+"topKSimpleState"
+"topKState"
 "topKWeighted"
+"topKWeightedArgMax"
+"topKWeightedArgMin"
+"topKWeightedArray"
+"topKWeightedDistinct"
+"topKWeightedForEach"
+"topKWeightedIf"
+"topKWeightedMap"
+"topKWeightedMerge"
+"topKWeightedNull"
+"topKWeightedOrDefault"
+"topKWeightedOrNull"
+"topKWeightedResample"
+"topKWeightedSimpleState"
+"topKWeightedState"
 "topLevelDomain"
+"topLevelDomainRFC"
 "toQuarter"
 "toRelativeDayNum"
 "toRelativeHourNum"
@@ -1317,14 +4389,19 @@
 "toRelativeWeekNum"
 "toRelativeYearNum"
 "toSecond"
+"TO SHARD"
 "toStartOfDay"
 "toStartOfFifteenMinutes"
+"toStartOfFiveMinute"
 "toStartOfFiveMinutes"
 "toStartOfHour"
 "toStartOfInterval"
 "toStartOfISOYear"
+"toStartOfMicrosecond"
+"toStartOfMillisecond"
 "toStartOfMinute"
 "toStartOfMonth"
+"toStartOfNanosecond"
 "toStartOfQuarter"
 "toStartOfSecond"
 "toStartOfTenMinutes"
@@ -1339,28 +4416,38 @@
 "toTimeZone"
 "toTypeName"
 "toUInt128"
+"toUInt128OrDefault"
 "toUInt128OrNull"
 "toUInt128OrZero"
 "toUInt16"
+"toUInt16OrDefault"
 "toUInt16OrNull"
 "toUInt16OrZero"
 "toUInt256"
+"toUInt256OrDefault"
 "toUInt256OrNull"
 "toUInt256OrZero"
 "toUInt32"
+"toUInt32OrDefault"
 "toUInt32OrNull"
 "toUInt32OrZero"
 "toUInt64"
+"toUInt64OrDefault"
 "toUInt64OrNull"
 "toUInt64OrZero"
 "toUInt8"
+"toUInt8OrDefault"
 "toUInt8OrNull"
 "toUInt8OrZero"
+"TO_UNIXTIME"
 "toUnixTimestamp"
 "toUnixTimestamp64Micro"
 "toUnixTimestamp64Milli"
 "toUnixTimestamp64Nano"
+"to_utc_timestamp"
+"toUTCTimestamp"
 "toUUID"
+"toUUIDOrDefault"
 "toUUIDOrNull"
 "toUUIDOrZero"
 "toValidUTF8"
@@ -1371,23 +4458,55 @@
 "toYYYYMM"
 "toYYYYMMDD"
 "toYYYYMMDDhhmmss"
+"TRACKING ONLY"
 "TRAILING"
+"TRANSACTION"
+"transactionID"
+"transactionLatestSnapshot"
+"transactionOldestSnapshot"
 "transform"
+"translate"
+"translateUTF8"
+"TRIGGER"
+"trim"
 "TRIM"
 "trimBoth"
 "trimLeft"
 "trimRight"
+"TRUE"
 "trunc"
 "truncate"
 "TRUNCATE"
+"tryBase58Decode"
 "tryBase64Decode"
+"tryDecrypt"
+"tryIdnaEncode"
+"tryPunycodeDecode"
 "TTL"
+"tumble"
+"tumbleEnd"
+"tumbleStart"
 "tuple"
 "Tuple"
+"tupleConcat"
+"tupleDivide"
+"tupleDivideByNumber"
 "tupleElement"
 "tupleHammingDistance"
+"tupleIntDiv"
+"tupleIntDivByNumber"
+"tupleIntDivOrZero"
+"tupleIntDivOrZeroByNumber"
+"tupleMinus"
+"tupleModulo"
+"tupleModuloByNumber"
+"tupleMultiply"
+"tupleMultiplyByNumber"
+"tupleNegate"
+"tuplePlus"
 "tupleToNameValuePairs"
 "TYPE"
+"TYPEOF"
 "ucase"
 "UInt128"
 "UInt16"
@@ -1395,41 +4514,245 @@
 "UInt32"
 "UInt64"
 "UInt8"
+"ULIDStringToDateTime"
 "unbin"
+"UNBOUNDED"
+"UNDROP"
+"UNFREEZE"
 "unhex"
 "UNION"
 "uniq"
+"uniqArgMax"
+"uniqArgMin"
+"uniqArray"
 "uniqCombined"
 "uniqCombined64"
+"uniqCombined64ArgMax"
+"uniqCombined64ArgMin"
+"uniqCombined64Array"
+"uniqCombined64Distinct"
+"uniqCombined64ForEach"
+"uniqCombined64If"
+"uniqCombined64Map"
+"uniqCombined64Merge"
+"uniqCombined64Null"
+"uniqCombined64OrDefault"
+"uniqCombined64OrNull"
+"uniqCombined64Resample"
+"uniqCombined64SimpleState"
+"uniqCombined64State"
+"uniqCombinedArgMax"
+"uniqCombinedArgMin"
+"uniqCombinedArray"
+"uniqCombinedDistinct"
+"uniqCombinedForEach"
+"uniqCombinedIf"
+"uniqCombinedMap"
+"uniqCombinedMerge"
+"uniqCombinedNull"
+"uniqCombinedOrDefault"
+"uniqCombinedOrNull"
+"uniqCombinedResample"
+"uniqCombinedSimpleState"
+"uniqCombinedState"
+"uniqDistinct"
 "uniqExact"
+"uniqExactArgMax"
+"uniqExactArgMin"
+"uniqExactArray"
+"uniqExactDistinct"
+"uniqExactForEach"
+"uniqExactIf"
+"uniqExactMap"
+"uniqExactMerge"
+"uniqExactNull"
+"uniqExactOrDefault"
+"uniqExactOrNull"
+"uniqExactResample"
+"uniqExactSimpleState"
+"uniqExactState"
+"uniqForEach"
 "uniqHLL12"
+"uniqHLL12ArgMax"
+"uniqHLL12ArgMin"
+"uniqHLL12Array"
+"uniqHLL12Distinct"
+"uniqHLL12ForEach"
+"uniqHLL12If"
+"uniqHLL12Map"
+"uniqHLL12Merge"
+"uniqHLL12Null"
+"uniqHLL12OrDefault"
+"uniqHLL12OrNull"
+"uniqHLL12Resample"
+"uniqHLL12SimpleState"
+"uniqHLL12State"
+"uniqIf"
+"uniqMap"
+"uniqMerge"
+"uniqNull"
+"uniqOrDefault"
+"uniqOrNull"
+"uniqResample"
+"uniqSimpleState"
+"uniqState"
 "uniqTheta"
+"uniqThetaArgMax"
+"uniqThetaArgMin"
+"uniqThetaArray"
+"uniqThetaDistinct"
+"uniqThetaForEach"
+"uniqThetaIf"
+"uniqThetaIntersect"
+"uniqThetaMap"
+"uniqThetaMerge"
+"uniqThetaNot"
+"uniqThetaNull"
+"uniqThetaOrDefault"
+"uniqThetaOrNull"
+"uniqThetaResample"
+"uniqThetaSimpleState"
+"uniqThetaState"
+"uniqThetaUnion"
+"UNIQUE"
 "uniqUpTo"
+"uniqUpToArgMax"
+"uniqUpToArgMin"
+"uniqUpToArray"
+"uniqUpToDistinct"
+"uniqUpToForEach"
+"uniqUpToIf"
+"uniqUpToMap"
+"uniqUpToMerge"
+"uniqUpToNull"
+"uniqUpToOrDefault"
+"uniqUpToOrNull"
+"uniqUpToResample"
+"uniqUpToSimpleState"
+"uniqUpToState"
+"UNSET FAKE TIME"
+"UNSIGNED"
 "UPDATE"
 "upper"
 "upperUTF8"
 "uptime"
+"URL"
 "URLHash"
 "URLHierarchy"
 "URLPathHierarchy"
 "USE"
 "user"
 "USING"
+"UTC_timestamp"
+"UTCTimestamp"
 "UUID"
 "UUIDNumToString"
 "UUIDStringToNum"
 "validateNestedArraySizes"
+"VALID UNTIL"
 "VALUES"
+"VARBINARY"
 "VARCHAR"
 "VARCHAR2"
+"Variant"
+"variantElement"
+"variantType"
 "varPop"
 "VAR_POP"
+"varPopArgMax"
+"VAR_POPArgMax"
+"varPopArgMin"
+"VAR_POPArgMin"
+"varPopArray"
+"VAR_POPArray"
+"varPopDistinct"
+"VAR_POPDistinct"
+"varPopForEach"
+"VAR_POPForEach"
+"varPopIf"
+"VAR_POPIf"
+"varPopMap"
+"VAR_POPMap"
+"varPopMerge"
+"VAR_POPMerge"
+"varPopNull"
+"VAR_POPNull"
+"varPopOrDefault"
+"VAR_POPOrDefault"
+"varPopOrNull"
+"VAR_POPOrNull"
+"varPopResample"
+"VAR_POPResample"
+"varPopSimpleState"
+"VAR_POPSimpleState"
 "varPopStable"
+"varPopStableArgMax"
+"varPopStableArgMin"
+"varPopStableArray"
+"varPopStableDistinct"
+"varPopStableForEach"
+"varPopStableIf"
+"varPopStableMap"
+"varPopStableMerge"
+"varPopStableNull"
+"varPopStableOrDefault"
+"varPopStableOrNull"
+"varPopStableResample"
+"varPopStableSimpleState"
+"varPopStableState"
+"varPopState"
+"VAR_POPState"
 "varSamp"
 "VAR_SAMP"
+"varSampArgMax"
+"VAR_SAMPArgMax"
+"varSampArgMin"
+"VAR_SAMPArgMin"
+"varSampArray"
+"VAR_SAMPArray"
+"varSampDistinct"
+"VAR_SAMPDistinct"
+"varSampForEach"
+"VAR_SAMPForEach"
+"varSampIf"
+"VAR_SAMPIf"
+"varSampMap"
+"VAR_SAMPMap"
+"varSampMerge"
+"VAR_SAMPMerge"
+"varSampNull"
+"VAR_SAMPNull"
+"varSampOrDefault"
+"VAR_SAMPOrDefault"
+"varSampOrNull"
+"VAR_SAMPOrNull"
+"varSampResample"
+"VAR_SAMPResample"
+"varSampSimpleState"
+"VAR_SAMPSimpleState"
 "varSampStable"
+"varSampStableArgMax"
+"varSampStableArgMin"
+"varSampStableArray"
+"varSampStableDistinct"
+"varSampStableForEach"
+"varSampStableIf"
+"varSampStableMap"
+"varSampStableMerge"
+"varSampStableNull"
+"varSampStableOrDefault"
+"varSampStableOrNull"
+"varSampStableResample"
+"varSampStableSimpleState"
+"varSampStableState"
+"varSampState"
+"VAR_SAMPState"
+"VARYING"
+"vectorDifference"
+"vectorSum"
 "version"
 "VIEW"
+"VISIBLE"
 "visibleWidth"
 "visitParamExtractBool"
 "visitParamExtractFloat"
@@ -1438,16 +4761,55 @@
 "visitParamExtractString"
 "visitParamExtractUInt"
 "visitParamHas"
-"VOLUME"
 "WATCH"
+"WATERMARK"
 "week"
 "WEEK"
+"WEEKS"
 "welchTTest"
+"welchTTestArgMax"
+"welchTTestArgMin"
+"welchTTestArray"
+"welchTTestDistinct"
+"welchTTestForEach"
+"welchTTestIf"
+"welchTTestMap"
+"welchTTestMerge"
+"welchTTestNull"
+"welchTTestOrDefault"
+"welchTTestOrNull"
+"welchTTestResample"
+"welchTTestSimpleState"
+"welchTTestState"
 "WHEN"
 "WHERE"
+"width_bucket"
+"widthBucket"
+"WINDOW"
 "windowFunnel"
+"windowFunnelArgMax"
+"windowFunnelArgMin"
+"windowFunnelArray"
+"windowFunnelDistinct"
+"windowFunnelForEach"
+"windowFunnelIf"
+"windowFunnelMap"
+"windowFunnelMerge"
+"windowFunnelNull"
+"windowFunnelOrDefault"
+"windowFunnelOrNull"
+"windowFunnelResample"
+"windowFunnelSimpleState"
+"windowFunnelState"
+"windowID"
 "WITH"
+"WITH ADMIN OPTION"
+"WITH CHECK"
 "WITH FILL"
+"WITH GRANT OPTION"
+"with_itemindex"
+"WITH NAME"
+"WITH REPLACE OPTION"
 "WITH TIES"
 "WK"
 "wkt"
@@ -1463,14 +4825,23 @@
 "wordShingleSimHashCaseInsensitive"
 "wordShingleSimHashCaseInsensitiveUTF8"
 "wordShingleSimHashUTF8"
+"WRITABLE"
 "WW"
+"wyHash64"
 "xor"
+"xxh3"
 "xxHash32"
 "xxHash64"
-"kostikConsistentHash"
+"yandexConsistentHash"
 "YEAR"
+"YEARS"
 "yearweek"
 "yesterday"
 "YY"
 "YYYY"
+"YYYYMMDDhhmmssToDateTime"
+"YYYYMMDDhhmmssToDateTime64"
+"YYYYMMDDToDate"
+"YYYYMMDDToDate32"
+"ZKPATH"
 "zookeeperSessionUptime"
diff --git a/tests/fuzz/dictionaries/datatypes.dict b/tests/fuzz/dictionaries/datatypes.dict
index e4983ae5f68..232e89db0c0 100644
--- a/tests/fuzz/dictionaries/datatypes.dict
+++ b/tests/fuzz/dictionaries/datatypes.dict
@@ -1,185 +1,134 @@
-"Polygon"
-"Ring"
-"Point"
-"SimpleAggregateFunction"
-"MultiPolygon"
-"IPv6"
-"IntervalSecond"
+"AggregateFunction"
+"Array"
+"BIGINT"
+"BIGINT SIGNED"
+"BIGINT UNSIGNED"
+"BINARY"
+"BINARY LARGE OBJECT"
+"BINARY VARYING"
+"BIT"
+"BLOB"
+"BYTE"
+"BYTEA"
+"Bool"
+"CHAR"
+"CHAR LARGE OBJECT"
+"CHAR VARYING"
+"CHARACTER"
+"CHARACTER LARGE OBJECT"
+"CHARACTER VARYING"
+"CLOB"
+"DEC"
+"DOUBLE"
+"DOUBLE PRECISION"
+"Date"
+"Date32"
+"DateTime"
+"DateTime32"
+"DateTime64"
+"Decimal"
+"Decimal128"
+"Decimal256"
+"Decimal32"
+"Decimal64"
+"ENUM"
+"Enum"
+"Enum16"
+"Enum8"
+"FIXED"
+"FLOAT"
+"FixedString"
+"Float32"
+"Float64"
+"GEOMETRY"
+"INET4"
+"INET6"
+"INT"
+"INT SIGNED"
+"INT UNSIGNED"
+"INT1"
+"INT1 SIGNED"
+"INT1 UNSIGNED"
+"INTEGER"
+"INTEGER SIGNED"
+"INTEGER UNSIGNED"
 "IPv4"
-"UInt32"
-"IntervalYear"
-"IntervalQuarter"
-"IntervalMonth"
+"IPv6"
+"Int128"
+"Int16"
+"Int256"
+"Int32"
 "Int64"
+"Int8"
 "IntervalDay"
 "IntervalHour"
-"Int16"
-"UInt256"
-"LowCardinality"
-"AggregateFunction"
-"Nothing"
-"Decimal256"
-"Tuple"
-"Array"
-"Enum16"
+"IntervalMicrosecond"
+"IntervalMillisecond"
 "IntervalMinute"
-"FixedString"
-"String"
-"DateTime"
-"Map"
-"UUID"
-"Decimal64"
-"Nullable"
-"Enum"
-"Int32"
-"UInt8"
-"Date"
-"Decimal32"
-"UInt128"
-"Float64"
-"Nested"
-"Int128"
-"Decimal128"
-"Int8"
-"Decimal"
-"Int256"
-"DateTime64"
-"Enum8"
-"DateTime32"
-"Date32"
+"IntervalMonth"
+"IntervalNanosecond"
+"IntervalQuarter"
+"IntervalSecond"
 "IntervalWeek"
-"UInt64"
-"UInt16"
-"Float32"
-"INET6"
-"INET4"
-"ENUM"
-"BINARY"
-"NATIONAL CHAR VARYING"
-"BINARY VARYING"
-"NCHAR LARGE OBJECT"
-"NATIONAL CHARACTER VARYING"
-"NATIONAL CHARACTER LARGE OBJECT"
-"NATIONAL CHARACTER"
-"NATIONAL CHAR"
-"CHARACTER VARYING"
+"IntervalYear"
+"JSON"
 "LONGBLOB"
-"MEDIUMTEXT"
-"TEXT"
-"TINYBLOB"
-"VARCHAR2"
-"CHARACTER LARGE OBJECT"
-"DOUBLE PRECISION"
 "LONGTEXT"
-"NVARCHAR"
-"INT1 UNSIGNED"
-"VARCHAR"
-"CHAR VARYING"
+"LowCardinality"
 "MEDIUMBLOB"
-"NCHAR"
-"CHAR"
-"SMALLINT UNSIGNED"
-"TIMESTAMP"
-"FIXED"
-"TINYTEXT"
-"NUMERIC"
-"DEC"
-"TINYINT UNSIGNED"
-"INTEGER UNSIGNED"
-"INT UNSIGNED"
-"CLOB"
-"MEDIUMINT UNSIGNED"
-"BOOL"
-"SMALLINT"
-"INTEGER SIGNED"
-"NCHAR VARYING"
-"INT SIGNED"
-"TINYINT SIGNED"
-"BIGINT SIGNED"
-"BINARY LARGE OBJECT"
-"SMALLINT SIGNED"
 "MEDIUMINT"
-"INTEGER"
-"INT1 SIGNED"
-"BIGINT UNSIGNED"
-"BYTEA"
-"INT"
-"SINGLE"
-"FLOAT"
 "MEDIUMINT SIGNED"
-"BOOLEAN"
-"DOUBLE"
-"INT1"
-"CHAR LARGE OBJECT"
-"TINYINT"
-"BIGINT"
-"CHARACTER"
-"BYTE"
-"BLOB"
+"MEDIUMINT UNSIGNED"
+"MEDIUMTEXT"
+"Map"
+"MultiPolygon"
+"NATIONAL CHAR"
+"NATIONAL CHAR VARYING"
+"NATIONAL CHARACTER"
+"NATIONAL CHARACTER LARGE OBJECT"
+"NATIONAL CHARACTER VARYING"
+"NCHAR"
+"NCHAR LARGE OBJECT"
+"NCHAR VARYING"
+"NUMERIC"
+"NVARCHAR"
+"Nested"
+"Nothing"
+"Nullable"
+"Object"
+"Point"
+"Polygon"
 "REAL"
-"IPv6"
-"IPv4"
-"Enum"
-"FixedString"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"String"
-"Float64"
-"String"
-"String"
-"UInt8"
-"String"
-"String"
-"String"
-"String"
+"Ring"
+"SET"
+"SIGNED"
+"SINGLE"
+"SMALLINT"
+"SMALLINT SIGNED"
+"SMALLINT UNSIGNED"
+"SimpleAggregateFunction"
 "String"
+"TEXT"
+"TIME"
+"TIMESTAMP"
+"TINYBLOB"
+"TINYINT"
+"TINYINT SIGNED"
+"TINYINT UNSIGNED"
+"TINYTEXT"
+"Tuple"
+"UInt128"
 "UInt16"
-"DateTime"
-"Decimal"
-"String"
-"Decimal"
-"Decimal"
-"UInt8"
+"UInt256"
 "UInt32"
-"UInt32"
-"String"
-"UInt32"
-"Int8"
-"Int16"
-"Int32"
-"String"
-"Int32"
-"Int8"
-"Int64"
-"String"
-"Int16"
-"Int32"
-"Int32"
-"Int8"
 "UInt64"
-"String"
-"Int32"
-"Float32"
-"Float32"
-"Int32"
-"Int8"
-"Float64"
-"Int8"
-"String"
-"Int8"
-"Int64"
-"String"
-"Int8"
-"String"
-"Float32"
+"UInt8"
+"UNSIGNED"
+"UUID"
+"VARBINARY"
+"VARCHAR"
+"VARCHAR2"
+"Variant"
+"YEAR"
+"bool"
+"boolean"
diff --git a/tests/fuzz/dictionaries/functions.dict b/tests/fuzz/dictionaries/functions.dict
index 3fe8dbfe501..ec7f8017fb2 100644
--- a/tests/fuzz/dictionaries/functions.dict
+++ b/tests/fuzz/dictionaries/functions.dict
@@ -1,1134 +1,4172 @@
-"logTrace"
-"aes_decrypt_mysql"
-"aes_encrypt_mysql"
-"decrypt"
-"encrypt"
-"bayesAB"
-"snowflakeToDateTime64"
-"snowflakeToDateTime"
-"validateNestedArraySizes"
-"wordShingleMinHashArgCaseInsensitiveUTF8"
-"wordShingleMinHashArgUTF8"
-"wordShingleMinHashArgCaseInsensitive"
-"wordShingleMinHashArg"
-"ngramMinHashArgCaseInsensitiveUTF8"
-"ngramMinHashArgUTF8"
-"ngramMinHashArgCaseInsensitive"
-"wordShingleMinHashCaseInsensitiveUTF8"
-"wordShingleMinHashUTF8"
-"ngramMinHashCaseInsensitiveUTF8"
-"ngramMinHashUTF8"
-"ngramMinHashCaseInsensitive"
-"wordShingleSimHashUTF8"
-"ngramSimHashUTF8"
-"ngramSimHashCaseInsensitive"
-"ngramSimHash"
-"toUnixTimestamp64Nano"
-"toUnixTimestamp64Micro"
-"jumpConsistentHash"
-"kostikConsistentHash"
-"addressToSymbol"
-"toJSONString"
-"JSON_VALUE"
-"JSONExtractKeysAndValuesRaw"
+"BIT_AND"
+"BIT_ANDArgMax"
+"BIT_ANDArgMin"
+"BIT_ANDArray"
+"BIT_ANDDistinct"
+"BIT_ANDForEach"
+"BIT_ANDIf"
+"BIT_ANDMap"
+"BIT_ANDMerge"
+"BIT_ANDNull"
+"BIT_ANDOrDefault"
+"BIT_ANDOrNull"
+"BIT_ANDResample"
+"BIT_ANDSimpleState"
+"BIT_ANDState"
+"BIT_OR"
+"BIT_ORArgMax"
+"BIT_ORArgMin"
+"BIT_ORArray"
+"BIT_ORDistinct"
+"BIT_ORForEach"
+"BIT_ORIf"
+"BIT_ORMap"
+"BIT_ORMerge"
+"BIT_ORNull"
+"BIT_OROrDefault"
+"BIT_OROrNull"
+"BIT_ORResample"
+"BIT_ORSimpleState"
+"BIT_ORState"
+"BIT_XOR"
+"BIT_XORArgMax"
+"BIT_XORArgMin"
+"BIT_XORArray"
+"BIT_XORDistinct"
+"BIT_XORForEach"
+"BIT_XORIf"
+"BIT_XORMap"
+"BIT_XORMerge"
+"BIT_XORNull"
+"BIT_XOROrDefault"
+"BIT_XOROrNull"
+"BIT_XORResample"
+"BIT_XORSimpleState"
+"BIT_XORState"
+"BLAKE3"
+"CAST"
+"CHARACTER_LENGTH"
+"CHAR_LENGTH"
+"COVAR_POP"
+"COVAR_POPArgMax"
+"COVAR_POPArgMin"
+"COVAR_POPArray"
+"COVAR_POPDistinct"
+"COVAR_POPForEach"
+"COVAR_POPIf"
+"COVAR_POPMap"
+"COVAR_POPMerge"
+"COVAR_POPNull"
+"COVAR_POPOrDefault"
+"COVAR_POPOrNull"
+"COVAR_POPResample"
+"COVAR_POPSimpleState"
+"COVAR_POPState"
+"COVAR_SAMP"
+"COVAR_SAMPArgMax"
+"COVAR_SAMPArgMin"
+"COVAR_SAMPArray"
+"COVAR_SAMPDistinct"
+"COVAR_SAMPForEach"
+"COVAR_SAMPIf"
+"COVAR_SAMPMap"
+"COVAR_SAMPMerge"
+"COVAR_SAMPNull"
+"COVAR_SAMPOrDefault"
+"COVAR_SAMPOrNull"
+"COVAR_SAMPResample"
+"COVAR_SAMPSimpleState"
+"COVAR_SAMPState"
+"CRC32"
+"CRC32IEEE"
+"CRC64"
+"DATABASE"
+"DATE"
+"DATE_DIFF"
+"DATE_FORMAT"
+"DATE_TRUNC"
+"DAY"
+"DAYOFMONTH"
+"DAYOFWEEK"
+"DAYOFYEAR"
+"FORMAT_BYTES"
+"FQDN"
+"FROM_BASE64"
+"FROM_DAYS"
+"FROM_UNIXTIME"
+"HOUR"
+"INET6_ATON"
+"INET6_NTOA"
+"INET_ATON"
+"INET_NTOA"
+"IPv4CIDRToRange"
+"IPv4NumToString"
+"IPv4NumToStringClassC"
+"IPv4StringToNum"
+"IPv4StringToNumOrDefault"
+"IPv4StringToNumOrNull"
+"IPv4ToIPv6"
+"IPv6CIDRToRange"
+"IPv6NumToString"
+"IPv6StringToNum"
+"IPv6StringToNumOrDefault"
+"IPv6StringToNumOrNull"
+"JSONArrayLength"
+"JSONExtract"
+"JSONExtractArrayRaw"
+"JSONExtractBool"
+"JSONExtractFloat"
+"JSONExtractInt"
 "JSONExtractKeys"
+"JSONExtractKeysAndValues"
+"JSONExtractKeysAndValuesRaw"
+"JSONExtractRaw"
 "JSONExtractString"
-"JSONType"
+"JSONExtractUInt"
+"JSONHas"
 "JSONKey"
 "JSONLength"
-"isValidJSON"
-"isZeroOrNull"
-"assumeNotNull"
-"s2CapUnion"
-"s2CapContains"
-"s2CellsIntersect"
-"s2GetNeighbors"
-"s2ToGeo"
-"h3GetFaces"
-"h3IsResClassIII"
-"h3ToString"
-"stringToH3"
-"h3ToParent"
-"h3GetResolution"
-"h3EdgeLengthM"
-"svg"
-"SVG"
-"equals"
-"geohashesInBox"
-"polygonsIntersectionCartesian"
-"polygonPerimeterSpherical"
-"bitHammingDistance"
-"polygonsDistanceSpherical"
-"polygonsSymDifferenceSpherical"
-"polygonAreaSpherical"
-"greatCircleDistance"
-"toInt256"
-"mapKeys"
-"sign"
-"reinterpretAsUInt8"
-"atanh"
-"formatReadableTimeDelta"
-"parseTimeDelta"
-"geohashEncode"
-"atan2"
-"acos"
+"JSONType"
+"JSON_ARRAY_LENGTH"
+"JSON_EXISTS"
+"JSON_QUERY"
+"JSON_VALUE"
+"L1Distance"
+"L1Norm"
+"L1Normalize"
+"L2Distance"
+"L2Norm"
+"L2Normalize"
+"L2SquaredDistance"
+"L2SquaredNorm"
+"LAST_DAY"
+"LinfDistance"
+"LinfNorm"
+"LinfNormalize"
+"LpDistance"
+"LpNorm"
+"LpNormalize"
+"MACNumToString"
+"MACStringToNum"
+"MACStringToOUI"
+"MAP_FROM_ARRAYS"
+"MD4"
+"MD5"
+"MILLISECOND"
+"MINUTE"
+"MONTH"
+"OCTET_LENGTH"
+"QUARTER"
+"REGEXP_EXTRACT"
+"REGEXP_MATCHES"
+"REGEXP_REPLACE"
+"SCHEMA"
+"SECOND"
+"SHA1"
 "SHA224"
-"visitParamExtractBool"
-"h3kRing"
-"asin"
-"sin"
-"reinterpretAsUInt128"
-"lgamma"
-"log2"
-"geoToH3"
-"toUnixTimestamp64Milli"
-"firstSignificantSubdomainCustom"
-"simpleJSONExtractBool"
-"visitParamExtractFloat"
-"visitParamExtractInt"
-"simpleJSONHas"
-"visitParamHas"
-"sigmoid"
-"cutQueryStringAndFragment"
-"dictGetInt16OrDefault"
-"cutToFirstSignificantSubdomainCustom"
+"SHA256"
+"SHA384"
+"SHA512"
+"SHA512_256"
+"STD"
+"STDArgMax"
+"STDArgMin"
+"STDArray"
+"STDDEV_POP"
+"STDDEV_POPArgMax"
+"STDDEV_POPArgMin"
+"STDDEV_POPArray"
+"STDDEV_POPDistinct"
+"STDDEV_POPForEach"
+"STDDEV_POPIf"
+"STDDEV_POPMap"
+"STDDEV_POPMerge"
+"STDDEV_POPNull"
+"STDDEV_POPOrDefault"
+"STDDEV_POPOrNull"
+"STDDEV_POPResample"
+"STDDEV_POPSimpleState"
+"STDDEV_POPState"
+"STDDEV_SAMP"
+"STDDEV_SAMPArgMax"
+"STDDEV_SAMPArgMin"
+"STDDEV_SAMPArray"
+"STDDEV_SAMPDistinct"
+"STDDEV_SAMPForEach"
+"STDDEV_SAMPIf"
+"STDDEV_SAMPMap"
+"STDDEV_SAMPMerge"
+"STDDEV_SAMPNull"
+"STDDEV_SAMPOrDefault"
+"STDDEV_SAMPOrNull"
+"STDDEV_SAMPResample"
+"STDDEV_SAMPSimpleState"
+"STDDEV_SAMPState"
+"STDDistinct"
+"STDForEach"
+"STDIf"
+"STDMap"
+"STDMerge"
+"STDNull"
+"STDOrDefault"
+"STDOrNull"
+"STDResample"
+"STDSimpleState"
+"STDState"
+"SUBSTRING_INDEX"
+"SVG"
+"TIMESTAMP_DIFF"
+"TO_BASE64"
+"TO_DAYS"
+"TO_UNIXTIME"
+"ULIDStringToDateTime"
+"URLHash"
 "URLHierarchy"
-"extractURLParameterNames"
-"toDecimal128OrZero"
-"extractURLParameters"
-"path"
-"pathFull"
-"port"
-"domain"
+"URLPathHierarchy"
+"UTCTimestamp"
+"UTC_timestamp"
+"UUIDNumToString"
+"UUIDStringToNum"
+"VAR_POP"
+"VAR_POPArgMax"
+"VAR_POPArgMin"
+"VAR_POPArray"
+"VAR_POPDistinct"
+"VAR_POPForEach"
+"VAR_POPIf"
+"VAR_POPMap"
+"VAR_POPMerge"
+"VAR_POPNull"
+"VAR_POPOrDefault"
+"VAR_POPOrNull"
+"VAR_POPResample"
+"VAR_POPSimpleState"
+"VAR_POPState"
+"VAR_SAMP"
+"VAR_SAMPArgMax"
+"VAR_SAMPArgMin"
+"VAR_SAMPArray"
+"VAR_SAMPDistinct"
+"VAR_SAMPForEach"
+"VAR_SAMPIf"
+"VAR_SAMPMap"
+"VAR_SAMPMerge"
+"VAR_SAMPNull"
+"VAR_SAMPOrDefault"
+"VAR_SAMPOrNull"
+"VAR_SAMPResample"
+"VAR_SAMPSimpleState"
+"VAR_SAMPState"
+"YEAR"
+"YYYYMMDDToDate"
+"YYYYMMDDToDate32"
+"YYYYMMDDhhmmssToDateTime"
+"YYYYMMDDhhmmssToDateTime64"
+"_CAST"
+"__bitBoolMaskAnd"
+"__bitBoolMaskOr"
+"__bitSwapLastTwo"
+"__bitWrapperFunc"
+"__getScalar"
+"__scalarSubqueryResult"
+"abs"
+"accurateCast"
+"accurateCastOrDefault"
+"accurateCastOrNull"
+"acos"
+"acosh"
+"addDate"
+"addDays"
+"addHours"
+"addInterval"
+"addMicroseconds"
+"addMilliseconds"
+"addMinutes"
+"addMonths"
+"addNanoseconds"
+"addQuarters"
+"addSeconds"
+"addTupleOfIntervals"
+"addWeeks"
+"addYears"
+"addressToLine"
+"addressToLineWithInlines"
+"addressToSymbol"
+"aes_decrypt_mysql"
+"aes_encrypt_mysql"
+"age"
+"aggThrow"
+"aggThrowArgMax"
+"aggThrowArgMin"
+"aggThrowArray"
+"aggThrowDistinct"
+"aggThrowForEach"
+"aggThrowIf"
+"aggThrowMap"
+"aggThrowMerge"
+"aggThrowNull"
+"aggThrowOrDefault"
+"aggThrowOrNull"
+"aggThrowResample"
+"aggThrowSimpleState"
+"aggThrowState"
+"alphaTokens"
+"analysisOfVariance"
+"analysisOfVarianceArgMax"
+"analysisOfVarianceArgMin"
+"analysisOfVarianceArray"
+"analysisOfVarianceDistinct"
+"analysisOfVarianceForEach"
+"analysisOfVarianceIf"
+"analysisOfVarianceMap"
+"analysisOfVarianceMerge"
+"analysisOfVarianceNull"
+"analysisOfVarianceOrDefault"
+"analysisOfVarianceOrNull"
+"analysisOfVarianceResample"
+"analysisOfVarianceSimpleState"
+"analysisOfVarianceState"
+"and"
+"anova"
+"anovaArgMax"
+"anovaArgMin"
+"anovaArray"
+"anovaDistinct"
+"anovaForEach"
+"anovaIf"
+"anovaMap"
+"anovaMerge"
+"anovaNull"
+"anovaOrDefault"
+"anovaOrNull"
+"anovaResample"
+"anovaSimpleState"
+"anovaState"
+"any"
+"anyArgMax"
+"anyArgMin"
+"anyArray"
+"anyDistinct"
+"anyForEach"
+"anyHeavy"
+"anyHeavyArgMax"
+"anyHeavyArgMin"
+"anyHeavyArray"
+"anyHeavyDistinct"
+"anyHeavyForEach"
+"anyHeavyIf"
+"anyHeavyMap"
+"anyHeavyMerge"
+"anyHeavyNull"
+"anyHeavyOrDefault"
+"anyHeavyOrNull"
+"anyHeavyResample"
+"anyHeavySimpleState"
+"anyHeavyState"
+"anyIf"
+"anyLast"
+"anyLastArgMax"
+"anyLastArgMin"
+"anyLastArray"
+"anyLastDistinct"
+"anyLastForEach"
+"anyLastIf"
+"anyLastMap"
+"anyLastMerge"
+"anyLastNull"
+"anyLastOrDefault"
+"anyLastOrNull"
+"anyLastResample"
+"anyLastSimpleState"
+"anyLastState"
+"anyLast_respect_nulls"
+"anyLast_respect_nullsArgMax"
+"anyLast_respect_nullsArgMin"
+"anyLast_respect_nullsArray"
+"anyLast_respect_nullsDistinct"
+"anyLast_respect_nullsForEach"
+"anyLast_respect_nullsIf"
+"anyLast_respect_nullsMap"
+"anyLast_respect_nullsMerge"
+"anyLast_respect_nullsNull"
+"anyLast_respect_nullsOrDefault"
+"anyLast_respect_nullsOrNull"
+"anyLast_respect_nullsResample"
+"anyLast_respect_nullsSimpleState"
+"anyLast_respect_nullsState"
+"anyMap"
+"anyMerge"
+"anyNull"
+"anyOrDefault"
+"anyOrNull"
+"anyResample"
+"anySimpleState"
+"anyState"
+"any_respect_nulls"
+"any_respect_nullsArgMax"
+"any_respect_nullsArgMin"
+"any_respect_nullsArray"
+"any_respect_nullsDistinct"
+"any_respect_nullsForEach"
+"any_respect_nullsIf"
+"any_respect_nullsMap"
+"any_respect_nullsMerge"
+"any_respect_nullsNull"
+"any_respect_nullsOrDefault"
+"any_respect_nullsOrNull"
+"any_respect_nullsResample"
+"any_respect_nullsSimpleState"
+"any_respect_nullsState"
+"any_value"
+"any_valueArgMax"
+"any_valueArgMin"
+"any_valueArray"
+"any_valueDistinct"
+"any_valueForEach"
+"any_valueIf"
+"any_valueMap"
+"any_valueMerge"
+"any_valueNull"
+"any_valueOrDefault"
+"any_valueOrNull"
+"any_valueResample"
+"any_valueSimpleState"
+"any_valueState"
+"any_value_respect_nulls"
+"any_value_respect_nullsArgMax"
+"any_value_respect_nullsArgMin"
+"any_value_respect_nullsArray"
+"any_value_respect_nullsDistinct"
+"any_value_respect_nullsForEach"
+"any_value_respect_nullsIf"
+"any_value_respect_nullsMap"
+"any_value_respect_nullsMerge"
+"any_value_respect_nullsNull"
+"any_value_respect_nullsOrDefault"
+"any_value_respect_nullsOrNull"
+"any_value_respect_nullsResample"
+"any_value_respect_nullsSimpleState"
+"any_value_respect_nullsState"
+"appendTrailingCharIfAbsent"
+"approx_top_count"
+"approx_top_countArgMax"
+"approx_top_countArgMin"
+"approx_top_countArray"
+"approx_top_countDistinct"
+"approx_top_countForEach"
+"approx_top_countIf"
+"approx_top_countMap"
+"approx_top_countMerge"
+"approx_top_countNull"
+"approx_top_countOrDefault"
+"approx_top_countOrNull"
+"approx_top_countResample"
+"approx_top_countSimpleState"
+"approx_top_countState"
+"approx_top_k"
+"approx_top_kArgMax"
+"approx_top_kArgMin"
+"approx_top_kArray"
+"approx_top_kDistinct"
+"approx_top_kForEach"
+"approx_top_kIf"
+"approx_top_kMap"
+"approx_top_kMerge"
+"approx_top_kNull"
+"approx_top_kOrDefault"
+"approx_top_kOrNull"
+"approx_top_kResample"
+"approx_top_kSimpleState"
+"approx_top_kState"
+"approx_top_sum"
+"approx_top_sumArgMax"
+"approx_top_sumArgMin"
+"approx_top_sumArray"
+"approx_top_sumDistinct"
+"approx_top_sumForEach"
+"approx_top_sumIf"
+"approx_top_sumMap"
+"approx_top_sumMerge"
+"approx_top_sumNull"
+"approx_top_sumOrDefault"
+"approx_top_sumOrNull"
+"approx_top_sumResample"
+"approx_top_sumSimpleState"
+"approx_top_sumState"
+"argMax"
+"argMaxArgMax"
+"argMaxArgMin"
+"argMaxArray"
+"argMaxDistinct"
+"argMaxForEach"
+"argMaxIf"
+"argMaxMap"
+"argMaxMerge"
+"argMaxNull"
+"argMaxOrDefault"
+"argMaxOrNull"
+"argMaxResample"
+"argMaxSimpleState"
+"argMaxState"
+"argMin"
+"argMinArgMax"
+"argMinArgMin"
+"argMinArray"
+"argMinDistinct"
+"argMinForEach"
+"argMinIf"
+"argMinMap"
+"argMinMerge"
+"argMinNull"
+"argMinOrDefault"
+"argMinOrNull"
+"argMinResample"
+"argMinSimpleState"
+"argMinState"
+"array"
+"arrayAUC"
+"arrayAll"
+"arrayAvg"
+"arrayCompact"
+"arrayConcat"
+"arrayCount"
+"arrayCumSum"
+"arrayCumSumNonNegative"
+"arrayDifference"
+"arrayDistinct"
+"arrayDotProduct"
+"arrayElement"
+"arrayEnumerate"
+"arrayEnumerateDense"
+"arrayEnumerateDenseRanked"
+"arrayEnumerateUniq"
+"arrayEnumerateUniqRanked"
+"arrayExists"
+"arrayFill"
+"arrayFilter"
+"arrayFirst"
+"arrayFirstIndex"
+"arrayFirstOrNull"
+"arrayFlatten"
+"arrayFold"
+"arrayIntersect"
+"arrayJaccardIndex"
+"arrayJoin"
+"arrayLast"
+"arrayLastIndex"
+"arrayLastOrNull"
+"arrayMap"
+"arrayMax"
+"arrayMin"
+"arrayPartialReverseSort"
+"arrayPartialShuffle"
+"arrayPartialSort"
+"arrayPopBack"
+"arrayPopFront"
+"arrayProduct"
+"arrayPushBack"
+"arrayPushFront"
+"arrayRandomSample"
+"arrayReduce"
+"arrayReduceInRanges"
+"arrayResize"
+"arrayReverse"
+"arrayReverseFill"
+"arrayReverseSort"
+"arrayReverseSplit"
+"arrayRotateLeft"
+"arrayRotateRight"
+"arrayShiftLeft"
+"arrayShiftRight"
+"arrayShingles"
+"arrayShuffle"
+"arraySlice"
+"arraySort"
+"arraySplit"
+"arrayStringConcat"
+"arraySum"
+"arrayUniq"
+"arrayWithConstant"
+"arrayZip"
+"array_agg"
+"array_aggArgMax"
+"array_aggArgMin"
+"array_aggArray"
+"array_aggDistinct"
+"array_aggForEach"
+"array_aggIf"
+"array_aggMap"
+"array_aggMerge"
+"array_aggNull"
+"array_aggOrDefault"
+"array_aggOrNull"
+"array_aggResample"
+"array_aggSimpleState"
+"array_aggState"
+"array_concat_agg"
+"array_concat_aggArgMax"
+"array_concat_aggArgMin"
+"array_concat_aggArray"
+"array_concat_aggDistinct"
+"array_concat_aggForEach"
+"array_concat_aggIf"
+"array_concat_aggMap"
+"array_concat_aggMerge"
+"array_concat_aggNull"
+"array_concat_aggOrDefault"
+"array_concat_aggOrNull"
+"array_concat_aggResample"
+"array_concat_aggSimpleState"
+"array_concat_aggState"
+"ascii"
+"asin"
+"asinh"
+"assumeNotNull"
+"atan"
+"atan2"
+"atanh"
+"avg"
+"avgArgMax"
+"avgArgMin"
+"avgArray"
+"avgDistinct"
+"avgForEach"
+"avgIf"
+"avgMap"
+"avgMerge"
+"avgNull"
+"avgOrDefault"
+"avgOrNull"
+"avgResample"
+"avgSimpleState"
+"avgState"
+"avgWeighted"
+"avgWeightedArgMax"
+"avgWeightedArgMin"
+"avgWeightedArray"
+"avgWeightedDistinct"
+"avgWeightedForEach"
+"avgWeightedIf"
+"avgWeightedMap"
+"avgWeightedMerge"
+"avgWeightedNull"
+"avgWeightedOrDefault"
+"avgWeightedOrNull"
+"avgWeightedResample"
+"avgWeightedSimpleState"
+"avgWeightedState"
+"bar"
+"base58Decode"
+"base58Encode"
+"base64Decode"
+"base64Encode"
+"basename"
+"bin"
+"bitAnd"
+"bitCount"
+"bitHammingDistance"
+"bitNot"
+"bitOr"
+"bitPositionsToArray"
+"bitRotateLeft"
+"bitRotateRight"
+"bitShiftLeft"
+"bitShiftRight"
+"bitSlice"
 "bitTest"
-"ngramSearchCaseInsensitiveUTF8"
+"bitTestAll"
+"bitTestAny"
+"bitXor"
+"bitmapAnd"
+"bitmapAndCardinality"
+"bitmapAndnot"
+"bitmapAndnotCardinality"
+"bitmapBuild"
+"bitmapCardinality"
+"bitmapContains"
+"bitmapHasAll"
+"bitmapHasAny"
 "bitmapMax"
-"ngramDistanceCaseInsensitiveUTF8"
-"ngramDistance"
+"bitmapMin"
+"bitmapOr"
+"bitmapOrCardinality"
+"bitmapSubsetInRange"
+"bitmapSubsetLimit"
+"bitmapToArray"
+"bitmapTransform"
+"bitmapXor"
+"bitmapXorCardinality"
+"bitmaskToArray"
+"bitmaskToList"
+"blockNumber"
+"blockSerializedSize"
+"blockSize"
+"boundingRatio"
+"boundingRatioArgMax"
+"boundingRatioArgMin"
+"boundingRatioArray"
+"boundingRatioDistinct"
+"boundingRatioForEach"
+"boundingRatioIf"
+"boundingRatioMap"
+"boundingRatioMerge"
+"boundingRatioNull"
+"boundingRatioOrDefault"
+"boundingRatioOrNull"
+"boundingRatioResample"
+"boundingRatioSimpleState"
+"boundingRatioState"
+"buildId"
+"byteHammingDistance"
+"byteSize"
+"byteSlice"
+"byteSwap"
+"caseWithExpr"
+"caseWithExpression"
+"caseWithoutExpr"
+"caseWithoutExpression"
+"catboostEvaluate"
+"categoricalInformationValue"
+"categoricalInformationValueArgMax"
+"categoricalInformationValueArgMin"
+"categoricalInformationValueArray"
+"categoricalInformationValueDistinct"
+"categoricalInformationValueForEach"
+"categoricalInformationValueIf"
+"categoricalInformationValueMap"
+"categoricalInformationValueMerge"
+"categoricalInformationValueNull"
+"categoricalInformationValueOrDefault"
+"categoricalInformationValueOrNull"
+"categoricalInformationValueResample"
+"categoricalInformationValueSimpleState"
+"categoricalInformationValueState"
+"cbrt"
+"ceil"
+"ceiling"
+"char"
+"cityHash64"
+"coalesce"
+"concat"
+"concatAssumeInjective"
+"concatWithSeparator"
+"concatWithSeparatorAssumeInjective"
+"concat_ws"
+"connectionId"
+"connection_id"
+"contingency"
+"contingencyArgMax"
+"contingencyArgMin"
+"contingencyArray"
+"contingencyDistinct"
+"contingencyForEach"
+"contingencyIf"
+"contingencyMap"
+"contingencyMerge"
+"contingencyNull"
+"contingencyOrDefault"
+"contingencyOrNull"
+"contingencyResample"
+"contingencySimpleState"
+"contingencyState"
+"convertCharset"
+"corr"
+"corrArgMax"
+"corrArgMin"
+"corrArray"
+"corrDistinct"
+"corrForEach"
+"corrIf"
+"corrMap"
+"corrMatrix"
+"corrMatrixArgMax"
+"corrMatrixArgMin"
+"corrMatrixArray"
+"corrMatrixDistinct"
+"corrMatrixForEach"
+"corrMatrixIf"
+"corrMatrixMap"
+"corrMatrixMerge"
+"corrMatrixNull"
+"corrMatrixOrDefault"
+"corrMatrixOrNull"
+"corrMatrixResample"
+"corrMatrixSimpleState"
+"corrMatrixState"
+"corrMerge"
+"corrNull"
+"corrOrDefault"
+"corrOrNull"
+"corrResample"
+"corrSimpleState"
+"corrStable"
+"corrStableArgMax"
+"corrStableArgMin"
+"corrStableArray"
+"corrStableDistinct"
+"corrStableForEach"
+"corrStableIf"
+"corrStableMap"
+"corrStableMerge"
+"corrStableNull"
+"corrStableOrDefault"
+"corrStableOrNull"
+"corrStableResample"
+"corrStableSimpleState"
+"corrStableState"
+"corrState"
+"cos"
+"cosh"
+"cosineDistance"
+"count"
+"countArgMax"
+"countArgMin"
+"countArray"
+"countDigits"
+"countDistinct"
+"countEqual"
+"countForEach"
+"countIf"
+"countMap"
+"countMatches"
+"countMatchesCaseInsensitive"
+"countMerge"
+"countNull"
+"countOrDefault"
+"countOrNull"
+"countResample"
+"countSimpleState"
+"countState"
+"countSubstrings"
+"countSubstringsCaseInsensitive"
+"countSubstringsCaseInsensitiveUTF8"
+"covarPop"
+"covarPopArgMax"
+"covarPopArgMin"
+"covarPopArray"
+"covarPopDistinct"
+"covarPopForEach"
+"covarPopIf"
+"covarPopMap"
+"covarPopMatrix"
+"covarPopMatrixArgMax"
+"covarPopMatrixArgMin"
+"covarPopMatrixArray"
+"covarPopMatrixDistinct"
+"covarPopMatrixForEach"
+"covarPopMatrixIf"
+"covarPopMatrixMap"
+"covarPopMatrixMerge"
+"covarPopMatrixNull"
+"covarPopMatrixOrDefault"
+"covarPopMatrixOrNull"
+"covarPopMatrixResample"
+"covarPopMatrixSimpleState"
+"covarPopMatrixState"
+"covarPopMerge"
+"covarPopNull"
+"covarPopOrDefault"
+"covarPopOrNull"
+"covarPopResample"
+"covarPopSimpleState"
+"covarPopStable"
+"covarPopStableArgMax"
+"covarPopStableArgMin"
+"covarPopStableArray"
+"covarPopStableDistinct"
+"covarPopStableForEach"
+"covarPopStableIf"
+"covarPopStableMap"
+"covarPopStableMerge"
+"covarPopStableNull"
+"covarPopStableOrDefault"
+"covarPopStableOrNull"
+"covarPopStableResample"
+"covarPopStableSimpleState"
+"covarPopStableState"
+"covarPopState"
+"covarSamp"
+"covarSampArgMax"
+"covarSampArgMin"
+"covarSampArray"
+"covarSampDistinct"
+"covarSampForEach"
+"covarSampIf"
+"covarSampMap"
+"covarSampMatrix"
+"covarSampMatrixArgMax"
+"covarSampMatrixArgMin"
+"covarSampMatrixArray"
+"covarSampMatrixDistinct"
+"covarSampMatrixForEach"
+"covarSampMatrixIf"
+"covarSampMatrixMap"
+"covarSampMatrixMerge"
+"covarSampMatrixNull"
+"covarSampMatrixOrDefault"
+"covarSampMatrixOrNull"
+"covarSampMatrixResample"
+"covarSampMatrixSimpleState"
+"covarSampMatrixState"
+"covarSampMerge"
+"covarSampNull"
+"covarSampOrDefault"
+"covarSampOrNull"
+"covarSampResample"
+"covarSampSimpleState"
+"covarSampStable"
+"covarSampStableArgMax"
+"covarSampStableArgMin"
+"covarSampStableArray"
+"covarSampStableDistinct"
+"covarSampStableForEach"
+"covarSampStableIf"
+"covarSampStableMap"
+"covarSampStableMerge"
+"covarSampStableNull"
+"covarSampStableOrDefault"
+"covarSampStableOrNull"
+"covarSampStableResample"
+"covarSampStableSimpleState"
+"covarSampStableState"
+"covarSampState"
+"cramersV"
+"cramersVArgMax"
+"cramersVArgMin"
+"cramersVArray"
+"cramersVBiasCorrected"
+"cramersVBiasCorrectedArgMax"
+"cramersVBiasCorrectedArgMin"
+"cramersVBiasCorrectedArray"
+"cramersVBiasCorrectedDistinct"
+"cramersVBiasCorrectedForEach"
+"cramersVBiasCorrectedIf"
+"cramersVBiasCorrectedMap"
+"cramersVBiasCorrectedMerge"
+"cramersVBiasCorrectedNull"
+"cramersVBiasCorrectedOrDefault"
+"cramersVBiasCorrectedOrNull"
+"cramersVBiasCorrectedResample"
+"cramersVBiasCorrectedSimpleState"
+"cramersVBiasCorrectedState"
+"cramersVDistinct"
+"cramersVForEach"
+"cramersVIf"
+"cramersVMap"
+"cramersVMerge"
+"cramersVNull"
+"cramersVOrDefault"
+"cramersVOrNull"
+"cramersVResample"
+"cramersVSimpleState"
+"cramersVState"
+"curdate"
+"currentDatabase"
+"currentProfiles"
+"currentRoles"
+"currentSchemas"
+"currentUser"
+"current_database"
+"current_date"
+"current_schemas"
+"current_timestamp"
+"cutFragment"
+"cutIPv6"
+"cutQueryString"
+"cutQueryStringAndFragment"
+"cutToFirstSignificantSubdomain"
+"cutToFirstSignificantSubdomainCustom"
+"cutToFirstSignificantSubdomainCustomRFC"
+"cutToFirstSignificantSubdomainCustomWithWWW"
+"cutToFirstSignificantSubdomainCustomWithWWWRFC"
+"cutToFirstSignificantSubdomainRFC"
+"cutToFirstSignificantSubdomainWithWWW"
+"cutToFirstSignificantSubdomainWithWWWRFC"
+"cutURLParameter"
+"cutWWW"
+"damerauLevenshteinDistance"
+"dateDiff"
+"dateName"
+"dateTime64ToSnowflake"
+"dateTimeToSnowflake"
+"dateTrunc"
+"date_diff"
+"decodeHTMLComponent"
+"decodeURLComponent"
+"decodeURLFormComponent"
+"decodeXMLComponent"
+"decrypt"
+"defaultProfiles"
+"defaultRoles"
+"defaultValueOfArgumentType"
+"defaultValueOfTypeName"
+"degrees"
+"deltaSum"
+"deltaSumArgMax"
+"deltaSumArgMin"
+"deltaSumArray"
+"deltaSumDistinct"
+"deltaSumForEach"
+"deltaSumIf"
+"deltaSumMap"
+"deltaSumMerge"
+"deltaSumNull"
+"deltaSumOrDefault"
+"deltaSumOrNull"
+"deltaSumResample"
+"deltaSumSimpleState"
+"deltaSumState"
+"deltaSumTimestamp"
+"deltaSumTimestampArgMax"
+"deltaSumTimestampArgMin"
+"deltaSumTimestampArray"
+"deltaSumTimestampDistinct"
+"deltaSumTimestampForEach"
+"deltaSumTimestampIf"
+"deltaSumTimestampMap"
+"deltaSumTimestampMerge"
+"deltaSumTimestampNull"
+"deltaSumTimestampOrDefault"
+"deltaSumTimestampOrNull"
+"deltaSumTimestampResample"
+"deltaSumTimestampSimpleState"
+"deltaSumTimestampState"
+"demangle"
+"dense_rank"
+"dense_rankArgMax"
+"dense_rankArgMin"
+"dense_rankArray"
+"dense_rankDistinct"
+"dense_rankForEach"
+"dense_rankIf"
+"dense_rankMap"
+"dense_rankMerge"
+"dense_rankNull"
+"dense_rankOrDefault"
+"dense_rankOrNull"
+"dense_rankResample"
+"dense_rankSimpleState"
+"dense_rankState"
+"detectCharset"
+"detectLanguage"
+"detectLanguageMixed"
+"detectLanguageUnknown"
+"detectProgrammingLanguage"
+"detectTonality"
+"dictGet"
+"dictGetAll"
+"dictGetChildren"
+"dictGetDate"
+"dictGetDateOrDefault"
+"dictGetDateTime"
+"dictGetDateTimeOrDefault"
+"dictGetDescendants"
+"dictGetFloat32"
+"dictGetFloat32OrDefault"
+"dictGetFloat64"
+"dictGetFloat64OrDefault"
+"dictGetHierarchy"
+"dictGetIPv4"
+"dictGetIPv4OrDefault"
+"dictGetIPv6"
+"dictGetIPv6OrDefault"
+"dictGetInt16"
+"dictGetInt16OrDefault"
+"dictGetInt32"
+"dictGetInt32OrDefault"
+"dictGetInt64"
+"dictGetInt64OrDefault"
+"dictGetInt8"
+"dictGetInt8OrDefault"
+"dictGetOrDefault"
+"dictGetOrNull"
+"dictGetString"
+"dictGetStringOrDefault"
+"dictGetUInt16"
+"dictGetUInt16OrDefault"
+"dictGetUInt32"
+"dictGetUInt32OrDefault"
+"dictGetUInt64"
+"dictGetUInt64OrDefault"
+"dictGetUInt8"
+"dictGetUInt8OrDefault"
+"dictGetUUID"
+"dictGetUUIDOrDefault"
+"dictHas"
+"dictIsIn"
+"displayName"
+"distanceL1"
+"distanceL2"
+"distanceL2Squared"
+"distanceLinf"
+"distanceLp"
+"divide"
+"divideDecimal"
+"domain"
+"domainRFC"
+"domainWithoutWWW"
+"domainWithoutWWWRFC"
+"dotProduct"
+"dumpColumnStructure"
+"e"
+"editDistance"
+"empty"
+"emptyArrayDate"
+"emptyArrayDateTime"
+"emptyArrayFloat32"
+"emptyArrayFloat64"
+"emptyArrayInt16"
+"emptyArrayInt32"
+"emptyArrayInt64"
+"emptyArrayInt8"
+"emptyArrayString"
+"emptyArrayToSingle"
+"emptyArrayUInt16"
+"emptyArrayUInt32"
+"emptyArrayUInt64"
+"emptyArrayUInt8"
+"enabledProfiles"
+"enabledRoles"
+"encodeURLComponent"
+"encodeURLFormComponent"
+"encodeXMLComponent"
+"encrypt"
+"endsWith"
+"endsWithUTF8"
+"entropy"
+"entropyArgMax"
+"entropyArgMin"
+"entropyArray"
+"entropyDistinct"
+"entropyForEach"
+"entropyIf"
+"entropyMap"
+"entropyMerge"
+"entropyNull"
+"entropyOrDefault"
+"entropyOrNull"
+"entropyResample"
+"entropySimpleState"
+"entropyState"
+"equals"
+"erf"
+"erfc"
+"errorCodeToName"
+"evalMLMethod"
+"exp"
+"exp10"
+"exp2"
+"exponentialMovingAverage"
+"exponentialMovingAverageArgMax"
+"exponentialMovingAverageArgMin"
+"exponentialMovingAverageArray"
+"exponentialMovingAverageDistinct"
+"exponentialMovingAverageForEach"
+"exponentialMovingAverageIf"
+"exponentialMovingAverageMap"
+"exponentialMovingAverageMerge"
+"exponentialMovingAverageNull"
+"exponentialMovingAverageOrDefault"
+"exponentialMovingAverageOrNull"
+"exponentialMovingAverageResample"
+"exponentialMovingAverageSimpleState"
+"exponentialMovingAverageState"
+"exponentialTimeDecayedAvg"
+"exponentialTimeDecayedAvgArgMax"
+"exponentialTimeDecayedAvgArgMin"
+"exponentialTimeDecayedAvgArray"
+"exponentialTimeDecayedAvgDistinct"
+"exponentialTimeDecayedAvgForEach"
+"exponentialTimeDecayedAvgIf"
+"exponentialTimeDecayedAvgMap"
+"exponentialTimeDecayedAvgMerge"
+"exponentialTimeDecayedAvgNull"
+"exponentialTimeDecayedAvgOrDefault"
+"exponentialTimeDecayedAvgOrNull"
+"exponentialTimeDecayedAvgResample"
+"exponentialTimeDecayedAvgSimpleState"
+"exponentialTimeDecayedAvgState"
+"exponentialTimeDecayedCount"
+"exponentialTimeDecayedCountArgMax"
+"exponentialTimeDecayedCountArgMin"
+"exponentialTimeDecayedCountArray"
+"exponentialTimeDecayedCountDistinct"
+"exponentialTimeDecayedCountForEach"
+"exponentialTimeDecayedCountIf"
+"exponentialTimeDecayedCountMap"
+"exponentialTimeDecayedCountMerge"
+"exponentialTimeDecayedCountNull"
+"exponentialTimeDecayedCountOrDefault"
+"exponentialTimeDecayedCountOrNull"
+"exponentialTimeDecayedCountResample"
+"exponentialTimeDecayedCountSimpleState"
+"exponentialTimeDecayedCountState"
+"exponentialTimeDecayedMax"
+"exponentialTimeDecayedMaxArgMax"
+"exponentialTimeDecayedMaxArgMin"
+"exponentialTimeDecayedMaxArray"
+"exponentialTimeDecayedMaxDistinct"
+"exponentialTimeDecayedMaxForEach"
+"exponentialTimeDecayedMaxIf"
+"exponentialTimeDecayedMaxMap"
+"exponentialTimeDecayedMaxMerge"
+"exponentialTimeDecayedMaxNull"
+"exponentialTimeDecayedMaxOrDefault"
+"exponentialTimeDecayedMaxOrNull"
+"exponentialTimeDecayedMaxResample"
+"exponentialTimeDecayedMaxSimpleState"
+"exponentialTimeDecayedMaxState"
+"exponentialTimeDecayedSum"
+"exponentialTimeDecayedSumArgMax"
+"exponentialTimeDecayedSumArgMin"
+"exponentialTimeDecayedSumArray"
+"exponentialTimeDecayedSumDistinct"
+"exponentialTimeDecayedSumForEach"
+"exponentialTimeDecayedSumIf"
+"exponentialTimeDecayedSumMap"
+"exponentialTimeDecayedSumMerge"
+"exponentialTimeDecayedSumNull"
+"exponentialTimeDecayedSumOrDefault"
+"exponentialTimeDecayedSumOrNull"
+"exponentialTimeDecayedSumResample"
+"exponentialTimeDecayedSumSimpleState"
+"exponentialTimeDecayedSumState"
+"extract"
+"extractAll"
+"extractAllGroups"
 "extractAllGroupsHorizontal"
 "extractAllGroupsVertical"
-"multiFuzzyMatchAllIndices"
-"multiFuzzyMatchAnyIndex"
-"multiMatchAnyIndex"
-"replaceRegexpAll"
-"emptyArrayInt16"
-"dictGetOrDefault"
-"replaceOne"
-"emptyArrayInt32"
-"extract"
-"readWKTPolygon"
-"notILike"
-"geohashDecode"
-"toModifiedJulianDay"
-"notLike"
-"countSubstringsCaseInsensitive"
-"IPv4StringToNum"
-"positionUTF8"
-"hasToken"
-"dictGetDate"
-"multiSearchFirstPosition"
-"multiSearchFirstIndexCaseInsensitiveUTF8"
-"atan"
-"rowNumberInAllBlocks"
-"multiSearchFirstIndexCaseInsensitive"
-"multiSearchAnyUTF8"
-"parseDateTime32BestEffortOrZero"
-"blockNumber"
-"cutURLParameter"
-"multiSearchFirstPositionCaseInsensitive"
-"positionCaseInsensitiveUTF8"
-"positionCaseInsensitive"
-"splitByRegexp"
-"toInt256OrZero"
-"pointInPolygon"
-"splitByWhitespace"
-"lemmatize"
-"synonyms"
-"tryBase64Decode"
-"multiSearchAllPositions"
-"FROM_BASE64"
-"replaceRegexpOne"
-"subBitmap"
-"defaultValueOfArgumentType"
-"base64Decode"
-"regionToContinent"
-"ilike"
-"fromModifiedJulianDay"
-"TO_BASE64"
-"dictIsIn"
-"base64Encode"
-"decodeXMLComponent"
-"countMatchesCaseInsensitive"
-"normalizeQuery"
-"erf"
-"trimBoth"
-"fromUnixTimestamp64Nano"
-"lessOrEquals"
-"subtractQuarters"
-"ngramSearch"
-"readWKTRing"
-"trimRight"
-"endsWith"
-"ngramDistanceCaseInsensitive"
-"connectionId"
-"initialQueryID"
-"startsWith"
-"tan"
-"substring"
+"extractGroups"
+"extractKeyValuePairs"
+"extractKeyValuePairsWithEscaping"
+"extractTextFromHTML"
+"extractURLParameter"
+"extractURLParameterNames"
+"extractURLParameters"
+"factorial"
+"farmFingerprint64"
+"farmHash64"
+"file"
+"filesystemAvailable"
+"filesystemCapacity"
+"filesystemUnreserved"
+"finalizeAggregation"
+"firstLine"
+"firstSignificantSubdomain"
+"firstSignificantSubdomainCustom"
+"firstSignificantSubdomainCustomRFC"
+"firstSignificantSubdomainRFC"
+"first_value"
+"first_valueArgMax"
+"first_valueArgMin"
+"first_valueArray"
+"first_valueDistinct"
+"first_valueForEach"
+"first_valueIf"
+"first_valueMap"
+"first_valueMerge"
+"first_valueNull"
+"first_valueOrDefault"
+"first_valueOrNull"
+"first_valueResample"
+"first_valueSimpleState"
+"first_valueState"
+"first_value_respect_nulls"
+"first_value_respect_nullsArgMax"
+"first_value_respect_nullsArgMin"
+"first_value_respect_nullsArray"
+"first_value_respect_nullsDistinct"
+"first_value_respect_nullsForEach"
+"first_value_respect_nullsIf"
+"first_value_respect_nullsMap"
+"first_value_respect_nullsMerge"
+"first_value_respect_nullsNull"
+"first_value_respect_nullsOrDefault"
+"first_value_respect_nullsOrNull"
+"first_value_respect_nullsResample"
+"first_value_respect_nullsSimpleState"
+"first_value_respect_nullsState"
+"flameGraph"
+"flameGraphArgMax"
+"flameGraphArgMin"
+"flameGraphArray"
+"flameGraphDistinct"
+"flameGraphForEach"
+"flameGraphIf"
+"flameGraphMap"
+"flameGraphMerge"
+"flameGraphNull"
+"flameGraphOrDefault"
+"flameGraphOrNull"
+"flameGraphResample"
+"flameGraphSimpleState"
+"flameGraphState"
+"flatten"
+"flattenTuple"
+"floor"
+"format"
+"formatDateTime"
+"formatDateTimeInJodaSyntax"
+"formatQuery"
+"formatQueryOrNull"
+"formatQuerySingleLine"
+"formatQuerySingleLineOrNull"
+"formatReadableDecimalSize"
+"formatReadableQuantity"
+"formatReadableSize"
+"formatReadableTimeDelta"
 "formatRow"
 "formatRowNoNewline"
-"dictGetHierarchy"
-"notEmpty"
-"format"
-"murmurHash3_64"
-"reverseUTF8"
-"arrayEnumerateUniqRanked"
-"CRC64"
-"pow"
-"toInt16"
-"reverse"
-"lower"
-"toStartOfDay"
-"caseWithoutExpr"
-"CHAR_LENGTH"
-"lengthUTF8"
-"length"
-"bitTestAny"
-"floor"
-"round"
-"reinterpretAsFixedString"
-"reinterpretAsString"
-"h3ToChildren"
-"emptyArrayToSingle"
-"tgamma"
-"reinterpretAsInt128"
-"visitParamExtractRaw"
-"reinterpretAsInt64"
-"reinterpretAsUInt32"
-"reinterpretAsUInt16"
-"fuzzBits"
-"randomFixedString"
-"tupleHammingDistance"
-"JSONExtractBool"
-"ngramSearchUTF8"
-"generateUUIDv4"
-"multiSearchAllPositionsCaseInsensitive"
-"randConstant"
-"leftPad"
-"convertCharset"
-"extractURLParameter"
-"zookeeperSessionUptime"
-"serverUUID"
-"firstSignificantSubdomain"
-"rand64"
-"JSON_EXISTS"
-"isIPAddressInRange"
-"wordShingleSimHashCaseInsensitive"
-"parseDateTime32BestEffortOrNull"
-"cutToFirstSignificantSubdomainWithWWW"
-"roundToExp2"
-"mapSubtract"
-"partitionId"
-"intExp2"
-"byteSize"
-"errorCodeToName"
-"toDateTime64"
-"yesterday"
-"initializeAggregation"
-"globalVariable"
-"countDigits"
-"toStartOfHour"
-"toWeek"
-"isDecimalOverflow"
-"visitParamExtractString"
-"isConstant"
-"getSetting"
-"shardNum"
-"__getScalar"
-"position"
-"__bitBoolMaskOr"
-"cosh"
-"basename"
-"evalMLMethod"
-"filesystemUnreserved"
-"filesystemCapacity"
-"reinterpretAsDate"
-"filesystemAvailable"
-"joinGet"
-"globalNullInIgnoreSet"
-"globalNotInIgnoreSet"
-"toRelativeDayNum"
-"splitByChar"
-"notInIgnoreSet"
-"globalInIgnoreSet"
-"notNullIn"
-"ngramSearchCaseInsensitive"
-"notIn"
-"trunc"
-"JSONExtractArrayRaw"
-"version"
-"joinGetOrNull"
-"globalIn"
-"toDate32"
-"lowCardinalityIndices"
-"toLowCardinality"
-"runningConcurrency"
-"runningDifferenceStartingWithFirstValue"
-"bitCount"
-"timezoneOf"
-"timezone"
-"uptime"
-"pi"
-"extractTextFromHTML"
-"UUIDStringToNum"
-"roundDown"
-"IPv6NumToString"
-"throwIf"
-"ifNotFinite"
-"FROM_UNIXTIME"
-"isInfinite"
-"arrayProduct"
-"polygonsIntersectionSpherical"
-"toRelativeHourNum"
-"hasColumnInTable"
-"bar"
-"JSONExtractKeysAndValues"
-"replicate"
-"arrayJoin"
-"s2RectUnion"
-"ngramDistanceUTF8"
-"identity"
-"indexHint"
-"ignore"
-"regionHierarchy"
-"toDateTime64OrNull"
-"polygonsWithinCartesian"
-"materialize"
-"sleepEachRow"
-"parseDateTimeBestEffortUSOrNull"
-"neighbor"
-"splitByString"
-"rowNumberInBlock"
-"blockSize"
-"defaultValueOfTypeName"
-"hiveHash"
-"randomStringUTF8"
-"blockSerializedSize"
-"visibleWidth"
-"fullHostName"
-"hostName"
-"arrayFilter"
-"defaultRoles"
-"currentRoles"
-"toUInt64OrZero"
-"dictGetUInt16"
-"DATABASE"
-"toUInt8OrZero"
-"reinterpretAsInt8"
-"not"
-"log1p"
-"and"
-"wordShingleMinHash"
-"arrayDifference"
-"arrayCumSumNonNegative"
-"wordShingleSimHash"
-"arrayCumSum"
-"arraySort"
-"arrayPartialSort"
-"arrayPartialReverseSort"
-"toDaysSinceYearZero"
+"fragment"
 "fromDaysSinceYearZero"
 "fromDaysSinceYearZero32"
-"dumpColumnStructure"
-"multiSearchFirstIndex"
-"arrayReverseSplit"
-"ifNull"
-"normalizeQueryKeepNames"
-"xxHash64"
-"in"
-"arrayReverseFill"
-"erfc"
-"cutToFirstSignificantSubdomainCustomWithWWW"
-"arrayFill"
-"substringUTF8"
-"arrayFirst"
-"arrayAvg"
-"cos"
-"arrayMax"
-"toColumnTypeName"
-"arrayMin"
-"toIntervalDay"
-"reinterpretAsFloat32"
-"arrayAll"
-"or"
-"arrayExists"
-"trimLeft"
-"arrayMap"
-"polygonsSymDifferenceCartesian"
-"gccMurmurHash"
-"exp2"
-"polygonPerimeterCartesian"
-"SHA384"
-"murmurHash3_128"
-"polygonConvexHullCartesian"
-"murmurHash3_32"
-"h3GetBaseCell"
-"murmurHash2_64"
-"globalNullIn"
-"javaHashUTF16LE"
-"URLHash"
-"reinterpretAsInt16"
-"regionToCountry"
-"toUUID"
-"intHash32"
-"metroHash64"
-"arrayPushFront"
-"bitmapAndnotCardinality"
-"toFloat32"
-"sipHash64"
-"JSONExtractFloat"
-"SHA512"
-"JSONExtractUInt"
-"arrayReduce"
-"SHA256"
-"array"
-"parseDateTimeBestEffortUSOrZero"
-"toInt32OrNull"
-"MD5"
-"randomString"
-"__bitBoolMaskAnd"
-"hasSubstr"
-"formatReadableQuantity"
-"replaceAll"
-"toIntervalWeek"
-"toRelativeSecondNum"
-"demangle"
-"toNullable"
-"concat"
-"formatReadableDecimalSize"
-"formatReadableSize"
-"shardCount"
+"fromModifiedJulianDay"
 "fromModifiedJulianDayOrNull"
-"toInt128OrZero"
-"bitmaskToList"
-"xor"
-"bitPositionsToArray"
-"empty"
-"ngramMinHashArg"
-"_CAST"
-"dictGetStringOrDefault"
-"arrayZip"
-"dictGetUUIDOrDefault"
-"dictGetFloat64OrDefault"
-"dictGetInt64OrDefault"
-"today"
-"dictGetUInt32OrDefault"
-"countSubstringsCaseInsensitiveUTF8"
-"h3IsPentagon"
-"dictGetUInt16OrDefault"
-"dictGetDescendants"
-"dictGetString"
-"inIgnoreSet"
-"dictGetUUID"
-"arraySlice"
-"reinterpretAsInt32"
-"dictGetFloat64"
-"globalNotNullInIgnoreSet"
-"arrayUniq"
-"polygonAreaCartesian"
-"intDiv"
-"cityHash64"
-"regionToTopContinent"
-"toInt32"
-"e"
-"wordShingleSimHashCaseInsensitiveUTF8"
-"JSON_QUERY"
-"isIPv4String"
-"UUIDNumToString"
-"modulo"
-"reinterpret"
-"unbin"
-"regionToDistrict"
-"sinh"
-"date_trunc"
-"__bitSwapLastTwo"
-"formatDateTime"
-"dateDiff"
-"tanh"
-"multiSearchAnyCaseInsensitiveUTF8"
-"upperUTF8"
-"bitmaskToArray"
-"arrayAUC"
-"multiMatchAllIndices"
-"hasThreadFuzzer"
-"toDayOfWeek"
-"isFinite"
-"transform"
-"timezoneOffset"
-"toTimezone"
-"cutQueryString"
-"subtractYears"
-"tcpPort"
-"subtractHours"
-"tid"
-"toDateTime64OrZero"
-"subtractSeconds"
-"alphaTokens"
-"negate"
-"file"
-"roundAge"
-"MACStringToOUI"
-"addQuarters"
-"arrayResize"
-"addWeeks"
-"HOUR"
-"addHours"
-"visitParamExtractUInt"
-"caseWithExpression"
-"rand"
-"addSeconds"
-"splitByNonAlpha"
-"arrayStringConcat"
-"randomPrintableASCII"
-"h3HexAreaM2"
-"toYYYYMMDDhhmmss"
-"toInt16OrNull"
-"timeSlots"
-"timeSlot"
-"dictGetInt16"
-"queryString"
-"javaHash"
-"acosh"
-"toRelativeMinuteNum"
-"toRelativeYearNum"
-"unhex"
-"toInt8OrNull"
-"regionToPopulation"
-"toStartOfISOYear"
-"getSizeOfEnumType"
-"toStartOfInterval"
-"toYYYYMMDD"
-"multiSearchFirstPositionUTF8"
-"CRC32"
-"toStartOfFifteenMinutes"
-"emptyArrayUInt8"
-"dictGetUInt8"
-"toStartOfFiveMinutes"
-"cbrt"
-"toStartOfMinute"
-"dictGet"
-"toStartOfSecond"
-"hasTokenCaseInsensitive"
-"toStartOfYear"
-"farmHash64"
-"toStartOfMonth"
-"queryID"
-"wordShingleMinHashCaseInsensitive"
-"dictGetDateOrDefault"
-"dictGetUInt64OrDefault"
-"arrayElement"
-"sleep"
-"dictHas"
-"enabledProfiles"
-"toDecimal32OrNull"
-"multiFuzzyMatchAny"
-"toStartOfWeek"
-"isValidUTF8"
-"dictGetInt8"
-"dictGetInt32OrDefault"
-"toMonday"
-"multiSearchFirstIndexUTF8"
-"lowCardinalityKeys"
-"halfMD5"
-"domainWithoutWWW"
-"MINUTE"
-"addDays"
-"toMinute"
-"JSONExtractRaw"
-"toUInt16OrNull"
-"bin"
-"toDayOfYear"
-"log"
-"DAYOFMONTH"
-"toUInt32"
-"toDecimal32"
-"s2RectAdd"
-"dictGetFloat32OrDefault"
-"xxHash32"
-"DAY"
-"toISOWeek"
-"ngramMinHash"
-"toMonth"
-"countMatches"
-"toQuarter"
-"toISOYear"
-"YEAR"
-"toIntervalYear"
-"hypot"
-"multiSearchAny"
-"toIntervalQuarter"
-"toSecond"
-"accurate_CastOrNull"
-"reinterpretAsUInt64"
-"defaultProfiles"
-"toIntervalMonth"
-"bitRotateRight"
-"arrayReverseSort"
-"toInt8OrZero"
-"SHA1"
-"multiSearchFirstPositionCaseInsensitiveUTF8"
-"cutFragment"
-"toDecimal256"
-"toIntervalSecond"
-"toUInt256OrZero"
-"toStringCutToZero"
-"normalizedQueryHashKeepNames"
-"coalesce"
-"parseDateTime64BestEffortOrNull"
-"toIntervalHour"
-"bitmapSubsetLimit"
-"parseDateTimeBestEffortOrNull"
-"match"
-"fragment"
-"repeat"
-"parseDateTimeBestEffortOrZero"
-"toDecimal128OrNull"
-"parseDateTimeBestEffort"
-"simpleJSONExtractUInt"
-"multiMatchAny"
-"toDecimal256OrNull"
-"roundDuration"
-"addMinutes"
-"toStartOfQuarter"
-"exp10"
-"regionIn"
-"toDecimal64OrNull"
-"toDateTimeOrNull"
-"simpleJSONExtractFloat"
-"reinterpretAsUUID"
-"dictGetDateTimeOrDefault"
-"greater"
-"toRelativeMonthNum"
-"toDate32OrNull"
-"h3IndexesAreNeighbors"
-"toFloat32OrNull"
-"toInt256OrNull"
-"leftPadUTF8"
-"regionToArea"
-"toInt64OrNull"
-"toModifiedJulianDayOrNull"
-"toUInt64OrNull"
-"polygonsEqualsCartesian"
-"accurateCast"
-"toUInt32OrNull"
-"encodeXMLComponent"
-"toUInt8OrNull"
-"toUUIDOrZero"
-"arrayEnumerateDenseRanked"
-"toYYYYMM"
-"toDecimal256OrZero"
-"fromUnixTimestamp64Milli"
-"CHARACTER_LENGTH"
-"isNull"
-"isNaN"
-"multiSearchAllPositionsCaseInsensitiveUTF8"
-"FQDN"
-"currentProfiles"
-"toDateTime32"
-"arraySplit"
-"toIPv6"
-"toDecimal32OrZero"
-"bitmapCardinality"
-"arrayFlatten"
-"dateName"
-"s2RectIntersection"
-"CAST"
-"caseWithExpr"
-"nullIf"
-"toDateTimeOrZero"
-"bitOr"
-"CRC32IEEE"
-"emptyArrayDate"
-"toUInt128OrZero"
-"toUInt128OrNull"
-"toFloat32OrZero"
-"SECOND"
-"arrayCompact"
-"bitmapMin"
-"toInt16OrZero"
-"reinterpretAsUInt256"
-"dictGetOrNull"
-"map"
-"bitmapHasAny"
-"emptyArrayUInt16"
-"cutIPv6"
-"toUInt32OrZero"
-"toTypeName"
-"polygonsUnionCartesian"
-"char"
-"mapContains"
-"emptyArrayDateTime"
-"toUInt16OrZero"
-"toInt64"
-"wkt"
-"dictGetUInt64"
-"JSONHas"
-"runningDifference"
-"getServerPort"
-"IPv4ToIPv6"
-"__bitWrapperFunc"
-"multiply"
-"accurate_Cast"
-"toDecimal64"
-"toString"
-"arrayIntersect"
-"dictGetUInt8OrDefault"
-"toTime"
-"hasAll"
-"now"
-"parseDateTime64BestEffortOrZero"
-"rightPadUTF8"
-"emptyArrayInt64"
-"simpleJSONExtractInt"
-"toDecimal128"
-"toRelativeWeekNum"
-"toDateOrNull"
-"topLevelDomain"
-"greatest"
-"isIPv6String"
-"toHour"
-"toFixedString"
-"bitmapOrCardinality"
-"toInt128"
-"toDateOrZero"
-"emptyArrayUInt64"
-"toUInt128"
-"isNotNull"
-"toUInt16"
-"MACNumToString"
-"multiSearchAllPositionsUTF8"
-"toUInt8"
-"regionToCity"
-"DAYOFYEAR"
-"simpleJSONExtractRaw"
-"appendTrailingCharIfAbsent"
-"toUInt64"
-"regionToName"
-"IPv4NumToStringClassC"
-"upper"
-"greaterOrEquals"
-"s2RectContains"
-"toDate"
-"regexpQuoteMeta"
-"readWKTMultiPolygon"
-"emptyArrayString"
-"bitmapOr"
-"cutWWW"
-"emptyArrayInt8"
-"less"
-"readWKTPoint"
-"reinterpretAsDateTime"
-"notEquals"
-"geoToS2"
-"nullInIgnoreSet"
-"globalNotNullIn"
-"arrayConcat"
-"mapPopulateSeries"
-"parseDateTimeBestEffortUS"
-"toDayOfMonth"
-"gcd"
-"protocol"
-"currentUser"
-"if"
-"caseWithoutExpression"
-"currentDatabase"
-"log10"
-"moduloOrZero"
-"MD4"
-"toInt64OrZero"
-"arrayWithConstant"
-"IPv4NumToString"
-"dictGetUInt32"
-"multiSearchAnyCaseInsensitive"
-"countSubstrings"
-"reinterpretAsFloat64"
-"plus"
-"dictGetChildren"
-"IPv6CIDRToRange"
-"toIntervalMinute"
-"bitRotateLeft"
-"geoDistance"
-"mapValues"
-"toIPv4"
-"extractGroups"
-"toYearWeek"
-"polygonsDistanceCartesian"
-"lowerUTF8"
-"toUInt256OrNull"
-"IPv4CIDRToRange"
-"MACStringToNum"
-"toFloat64OrNull"
-"sipHash128"
-"toFloat64"
-"arrayPopFront"
-"bitmapAnd"
-"bitmapHasAll"
-"subtractWeeks"
-"arrayFirstIndex"
-"bitmapXorCardinality"
-"bitmapAndnot"
-"asinh"
-"dictGetInt32"
-"toFloat64OrZero"
-"toInt8"
-"polygonsWithinSpherical"
-"bitmapXor"
-"intExp10"
-"dictGetDateTime"
-"h3ToGeoBoundary"
-"decodeURLComponent"
-"bitAnd"
-"toUUIDOrNull"
-"notNullInIgnoreSet"
-"tupleElement"
-"tupleToNameValuePairs"
-"tuple"
-"ceil"
-"DAYOFWEEK"
-"toDateTime"
-"bitNot"
-"rightPad"
-"has"
-"bitmapToArray"
-"arrayCount"
-"arrayDistinct"
-"greatCircleAngle"
-"IPv6StringToNum"
-"dictGetInt64"
-"toUnixTimestamp"
-"getMacro"
-"runningAccumulate"
-"multiIf"
-"abs"
-"toValidUTF8"
-"arrayEnumerateUniq"
-"moduloLegacy"
-"JSONExtractInt"
-"subtractMonths"
-"dateTimeToSnowflake"
-"cutToFirstSignificantSubdomain"
-"roundBankers"
-"toUInt256"
-"arrayEnumerateDense"
-"stem"
-"bitmapAndCardinality"
-"bitTestAll"
-"normalizedQueryHash"
-"toYear"
-"emptyArrayFloat64"
-"bitmapTransform"
-"JSONExtract"
-"bitShiftRight"
-"bitmapContains"
-"sqrt"
-"minus"
-"QUARTER"
-"parseDateTime64BestEffort"
-"h3IsValid"
-"h3EdgeAngle"
-"concatAssumeInjective"
-"emptyArrayUInt32"
-"intHash64"
-"enabledRoles"
-"fromUnixTimestamp64Micro"
-"range"
-"subtractMinutes"
-"farmFingerprint64"
-"arrayReduceInRanges"
-"bitmapBuild"
-"bitmapSubsetInRange"
-"arrayPopBack"
-"h3ToGeo"
-"hex"
-"arrayPushBack"
-"subtractDays"
-"buildId"
-"URLPathHierarchy"
-"addMonths"
-"parseDateTime32BestEffort"
-"indexOf"
-"polygonsUnionSpherical"
-"arraySum"
-"dictGetFloat32"
-"ngramSimHashCaseInsensitiveUTF8"
-"finalizeAggregation"
-"divide"
-"netloc"
-"bitShiftLeft"
-"toInt32OrZero"
-"extractAll"
-"toInt128OrNull"
-"bitXor"
-"lcm"
-"accurateCastOrNull"
-"toDate32OrZero"
-"simpleJSONExtractString"
-"least"
-"nullIn"
-"MONTH"
-"arrayReverse"
-"arrayShuffle"
-"arrayPartialShuffle"
-"now64"
-"DATE"
-"addressToLine"
-"globalNotIn"
-"dateTime64ToSnowflake"
-"dictGetInt8OrDefault"
-"exp"
-"toRelativeQuarterNum"
-"arrayEnumerate"
-"mapAdd"
-"murmurHash2_32"
-"toStartOfTenMinutes"
-"intDivOrZero"
-"addYears"
-"queryStringAndFragment"
-"emptyArrayFloat32"
-"countEqual"
-"pointInEllipses"
-"like"
-"toDecimal64OrZero"
-"reinterpretAsInt256"
-"hasAny"
-"ln"
-"replace"
-"rpad"
-"mid"
-"lcase"
+"fromUTCTimestamp"
 "fromUnixTimestamp"
-"truncate"
-"ceiling"
-"ucase"
-"rand32"
-"power"
-"initial_query_id"
-"timeZone"
-"hostname"
-"yearweek"
-"timeZoneOffset"
-"extractAllGroups"
-"lpad"
-"substr"
-"INET6_NTOA"
-"INET6_ATON"
-"INET_ATON"
-"timeZoneOf"
-"locate"
-"INET_NTOA"
-"connection_id"
-"user"
-"toTimeZone"
-"week"
-"flatten"
-"query_id"
-"dateTrunc"
-"mod"
-"lagInFrame"
-"dense_rank"
-"rank"
-"exponentialMovingAverage"
-"sparkbar"
-"singleValueOrNull"
-"studentTTest"
-"aggThrow"
-"categoricalInformationValue"
-"groupArrayMovingAvg"
-"groupArrayMovingSum"
-"simpleLinearRegression"
-"entropy"
-"quantilesBFloat16"
-"maxIntersectionsPosition"
-"groupBitmapXor"
-"groupBitmap"
-"skewPop"
-"groupBitXor"
-"groupBitOr"
-"groupBitmapAnd"
-"topKWeighted"
-"stochasticLinearRegression"
-"corr"
-"corrMatrix"
-"uniqCombined64"
-"intervalLengthSum"
-"uniqCombined"
-"rankCorr"
-"maxMap"
-"minMap"
-"sumMapFiltered"
-"quantileExactWeighted"
-"sumMapFilteredWithOverflow"
-"sumMap"
-"histogram"
-"quantiles"
-"sum"
-"covarPop"
-"covarPopMatrix"
-"row_number"
-"kurtPop"
-"kurtSamp"
-"skewSamp"
-"uniqExact"
-"sumMapWithOverflow"
-"stddevSamp"
-"varPop"
-"corrStable"
-"quantileTimingWeighted"
-"covarPopStable"
-"stddevSampStable"
-"varSamp"
-"topK"
-"last_value"
-"mannWhitneyUTest"
-"maxIntersections"
-"quantilesExact"
-"uniqHLL12"
-"quantileBFloat16"
-"uniq"
-"min"
-"sequenceNextNode"
-"quantilesTimingWeighted"
-"boundingRatio"
-"any"
-"anyLast"
-"deltaSum"
-"retention"
-"sequenceMatch"
-"uniqUpTo"
-"windowFunnel"
-"deltaSumTimestamp"
-"varSampStable"
-"uniqTheta"
-"quantilesExactWeighted"
-"max"
-"quantilesBFloat16Weighted"
-"quantileBFloat16Weighted"
-"sumKahan"
-"quantilesTDigestWeighted"
-"groupBitAnd"
-"quantileTDigest"
-"quantileTDigestWeighted"
-"argMax"
-"quantileDeterministic"
-"quantilesTDigest"
-"stochasticLogisticRegression"
-"argMin"
-"avg"
-"covarSampStable"
-"quantilesTiming"
-"welchTTest"
-"covarSamp"
-"covarSampMatrix"
-"varPopStable"
-"quantileTiming"
-"quantileExactInclusive"
-"quantileExactHigh"
-"groupArraySample"
-"quantilesExactLow"
-"groupBitmapOr"
-"first_value"
-"quantileExactExclusive"
-"quantileExact"
-"sumCount"
-"groupArrayInsertAt"
-"quantilesExactHigh"
-"sumWithOverflow"
-"sequenceCount"
-"quantilesDeterministic"
-"groupUniqArray"
+"fromUnixTimestamp64Micro"
+"fromUnixTimestamp64Milli"
+"fromUnixTimestamp64Nano"
+"fromUnixTimestampInJodaSyntax"
+"from_utc_timestamp"
+"fullHostName"
+"fuzzBits"
+"gccMurmurHash"
+"gcd"
+"generateRandomStructure"
+"generateULID"
+"generateUUIDv4"
+"geoDistance"
+"geoToH3"
+"geoToS2"
+"geohashDecode"
+"geohashEncode"
+"geohashesInBox"
+"getMacro"
+"getOSKernelVersion"
+"getServerPort"
+"getSetting"
+"getSizeOfEnumType"
+"getSubcolumn"
+"getTypeSerializationStreams"
+"globalIn"
+"globalInIgnoreSet"
+"globalNotIn"
+"globalNotInIgnoreSet"
+"globalNotNullIn"
+"globalNotNullInIgnoreSet"
+"globalNullIn"
+"globalNullInIgnoreSet"
+"globalVariable"
+"greatCircleAngle"
+"greatCircleDistance"
+"greater"
+"greaterOrEquals"
+"greatest"
 "groupArray"
-"anyHeavy"
-"stddevPop"
-"quantile"
-"leadInFrame"
-"quantilesExactExclusive"
-"count"
-"quantilesExactInclusive"
-"stddevPopStable"
-"quantileExactLow"
-"avgWeighted"
-"BIT_AND"
-"VAR_SAMP"
-"COVAR_SAMP"
-"VAR_POP"
-"medianTDigest"
-"medianBFloat16"
-"medianTimingWeighted"
-"medianTiming"
-"medianExactHigh"
-"BIT_OR"
-"medianDeterministic"
-"STDDEV_POP"
-"STDDEV_SAMP"
-"medianExactLow"
-"medianTDigestWeighted"
-"medianExact"
-"COVAR_POP"
-"medianBFloat16Weighted"
-"medianExactWeighted"
-"BIT_XOR"
-"median"
-"log"
-"replaceAll"
-"rightPad"
-"substring"
-"lower"
-"FROM_UNIXTIME"
-"trunc"
-"ceil"
-"upper"
-"rand"
-"pow"
-"initialQueryID"
-"timezone"
-"hostName"
-"toYearWeek"
-"timezoneOffset"
-"extractAllGroupsVertical"
-"leftPad"
-"substring"
-"IPv6NumToString"
-"IPv6StringToNum"
-"IPv4StringToNum"
-"timezoneOf"
-"position"
-"IPv4NumToString"
-"connectionid"
-"currentUser"
-"toTimezone"
-"toWeek"
-"arrayFlatten"
-"queryID"
-"date_trunc"
-"modulo"
+"groupArrayArgMax"
+"groupArrayArgMin"
+"groupArrayArray"
+"groupArrayDistinct"
+"groupArrayForEach"
+"groupArrayIf"
+"groupArrayInsertAt"
+"groupArrayInsertAtArgMax"
+"groupArrayInsertAtArgMin"
+"groupArrayInsertAtArray"
+"groupArrayInsertAtDistinct"
+"groupArrayInsertAtForEach"
+"groupArrayInsertAtIf"
+"groupArrayInsertAtMap"
+"groupArrayInsertAtMerge"
+"groupArrayInsertAtNull"
+"groupArrayInsertAtOrDefault"
+"groupArrayInsertAtOrNull"
+"groupArrayInsertAtResample"
+"groupArrayInsertAtSimpleState"
+"groupArrayInsertAtState"
+"groupArrayIntersect"
+"groupArrayIntersectArgMax"
+"groupArrayIntersectArgMin"
+"groupArrayIntersectArray"
+"groupArrayIntersectDistinct"
+"groupArrayIntersectForEach"
+"groupArrayIntersectIf"
+"groupArrayIntersectMap"
+"groupArrayIntersectMerge"
+"groupArrayIntersectNull"
+"groupArrayIntersectOrDefault"
+"groupArrayIntersectOrNull"
+"groupArrayIntersectResample"
+"groupArrayIntersectSimpleState"
+"groupArrayIntersectState"
+"groupArrayLast"
+"groupArrayLastArgMax"
+"groupArrayLastArgMin"
+"groupArrayLastArray"
+"groupArrayLastDistinct"
+"groupArrayLastForEach"
+"groupArrayLastIf"
+"groupArrayLastMap"
+"groupArrayLastMerge"
+"groupArrayLastNull"
+"groupArrayLastOrDefault"
+"groupArrayLastOrNull"
+"groupArrayLastResample"
+"groupArrayLastSimpleState"
+"groupArrayLastState"
+"groupArrayMap"
+"groupArrayMerge"
+"groupArrayMovingAvg"
+"groupArrayMovingAvgArgMax"
+"groupArrayMovingAvgArgMin"
+"groupArrayMovingAvgArray"
+"groupArrayMovingAvgDistinct"
+"groupArrayMovingAvgForEach"
+"groupArrayMovingAvgIf"
+"groupArrayMovingAvgMap"
+"groupArrayMovingAvgMerge"
+"groupArrayMovingAvgNull"
+"groupArrayMovingAvgOrDefault"
+"groupArrayMovingAvgOrNull"
+"groupArrayMovingAvgResample"
+"groupArrayMovingAvgSimpleState"
+"groupArrayMovingAvgState"
+"groupArrayMovingSum"
+"groupArrayMovingSumArgMax"
+"groupArrayMovingSumArgMin"
+"groupArrayMovingSumArray"
+"groupArrayMovingSumDistinct"
+"groupArrayMovingSumForEach"
+"groupArrayMovingSumIf"
+"groupArrayMovingSumMap"
+"groupArrayMovingSumMerge"
+"groupArrayMovingSumNull"
+"groupArrayMovingSumOrDefault"
+"groupArrayMovingSumOrNull"
+"groupArrayMovingSumResample"
+"groupArrayMovingSumSimpleState"
+"groupArrayMovingSumState"
+"groupArrayNull"
+"groupArrayOrDefault"
+"groupArrayOrNull"
+"groupArrayResample"
+"groupArraySample"
+"groupArraySampleArgMax"
+"groupArraySampleArgMin"
+"groupArraySampleArray"
+"groupArraySampleDistinct"
+"groupArraySampleForEach"
+"groupArraySampleIf"
+"groupArraySampleMap"
+"groupArraySampleMerge"
+"groupArraySampleNull"
+"groupArraySampleOrDefault"
+"groupArraySampleOrNull"
+"groupArraySampleResample"
+"groupArraySampleSimpleState"
+"groupArraySampleState"
+"groupArraySimpleState"
+"groupArraySorted"
+"groupArraySortedArgMax"
+"groupArraySortedArgMin"
+"groupArraySortedArray"
+"groupArraySortedDistinct"
+"groupArraySortedForEach"
+"groupArraySortedIf"
+"groupArraySortedMap"
+"groupArraySortedMerge"
+"groupArraySortedNull"
+"groupArraySortedOrDefault"
+"groupArraySortedOrNull"
+"groupArraySortedResample"
+"groupArraySortedSimpleState"
+"groupArraySortedState"
+"groupArrayState"
 "groupBitAnd"
-"varSamp"
-"covarSamp"
-"varPop"
-"quantileTDigest"
-"quantileBFloat16"
-"quantileTimingWeighted"
-"quantileTiming"
-"quantileExactHigh"
+"groupBitAndArgMax"
+"groupBitAndArgMin"
+"groupBitAndArray"
+"groupBitAndDistinct"
+"groupBitAndForEach"
+"groupBitAndIf"
+"groupBitAndMap"
+"groupBitAndMerge"
+"groupBitAndNull"
+"groupBitAndOrDefault"
+"groupBitAndOrNull"
+"groupBitAndResample"
+"groupBitAndSimpleState"
+"groupBitAndState"
 "groupBitOr"
-"quantileDeterministic"
-"stddevPop"
-"stddevSamp"
-"quantileExactLow"
-"quantileTDigestWeighted"
-"quantileExact"
-"covarPop"
-"quantileBFloat16Weighted"
-"quantileExactWeighted"
+"groupBitOrArgMax"
+"groupBitOrArgMin"
+"groupBitOrArray"
+"groupBitOrDistinct"
+"groupBitOrForEach"
+"groupBitOrIf"
+"groupBitOrMap"
+"groupBitOrMerge"
+"groupBitOrNull"
+"groupBitOrOrDefault"
+"groupBitOrOrNull"
+"groupBitOrResample"
+"groupBitOrSimpleState"
+"groupBitOrState"
 "groupBitXor"
+"groupBitXorArgMax"
+"groupBitXorArgMin"
+"groupBitXorArray"
+"groupBitXorDistinct"
+"groupBitXorForEach"
+"groupBitXorIf"
+"groupBitXorMap"
+"groupBitXorMerge"
+"groupBitXorNull"
+"groupBitXorOrDefault"
+"groupBitXorOrNull"
+"groupBitXorResample"
+"groupBitXorSimpleState"
+"groupBitXorState"
+"groupBitmap"
+"groupBitmapAnd"
+"groupBitmapAndArgMax"
+"groupBitmapAndArgMin"
+"groupBitmapAndArray"
+"groupBitmapAndDistinct"
+"groupBitmapAndForEach"
+"groupBitmapAndIf"
+"groupBitmapAndMap"
+"groupBitmapAndMerge"
+"groupBitmapAndNull"
+"groupBitmapAndOrDefault"
+"groupBitmapAndOrNull"
+"groupBitmapAndResample"
+"groupBitmapAndSimpleState"
+"groupBitmapAndState"
+"groupBitmapArgMax"
+"groupBitmapArgMin"
+"groupBitmapArray"
+"groupBitmapDistinct"
+"groupBitmapForEach"
+"groupBitmapIf"
+"groupBitmapMap"
+"groupBitmapMerge"
+"groupBitmapNull"
+"groupBitmapOr"
+"groupBitmapOrArgMax"
+"groupBitmapOrArgMin"
+"groupBitmapOrArray"
+"groupBitmapOrDefault"
+"groupBitmapOrDistinct"
+"groupBitmapOrForEach"
+"groupBitmapOrIf"
+"groupBitmapOrMap"
+"groupBitmapOrMerge"
+"groupBitmapOrNull"
+"groupBitmapOrNull"
+"groupBitmapOrOrDefault"
+"groupBitmapOrOrNull"
+"groupBitmapOrResample"
+"groupBitmapOrSimpleState"
+"groupBitmapOrState"
+"groupBitmapResample"
+"groupBitmapSimpleState"
+"groupBitmapState"
+"groupBitmapXor"
+"groupBitmapXorArgMax"
+"groupBitmapXorArgMin"
+"groupBitmapXorArray"
+"groupBitmapXorDistinct"
+"groupBitmapXorForEach"
+"groupBitmapXorIf"
+"groupBitmapXorMap"
+"groupBitmapXorMerge"
+"groupBitmapXorNull"
+"groupBitmapXorOrDefault"
+"groupBitmapXorOrNull"
+"groupBitmapXorResample"
+"groupBitmapXorSimpleState"
+"groupBitmapXorState"
+"groupUniqArray"
+"groupUniqArrayArgMax"
+"groupUniqArrayArgMin"
+"groupUniqArrayArray"
+"groupUniqArrayDistinct"
+"groupUniqArrayForEach"
+"groupUniqArrayIf"
+"groupUniqArrayMap"
+"groupUniqArrayMerge"
+"groupUniqArrayNull"
+"groupUniqArrayOrDefault"
+"groupUniqArrayOrNull"
+"groupUniqArrayResample"
+"groupUniqArraySimpleState"
+"groupUniqArrayState"
+"h3CellAreaM2"
+"h3CellAreaRads2"
+"h3Distance"
+"h3EdgeAngle"
+"h3EdgeLengthKm"
+"h3EdgeLengthM"
+"h3ExactEdgeLengthKm"
+"h3ExactEdgeLengthM"
+"h3ExactEdgeLengthRads"
+"h3GetBaseCell"
+"h3GetDestinationIndexFromUnidirectionalEdge"
+"h3GetFaces"
+"h3GetIndexesFromUnidirectionalEdge"
+"h3GetOriginIndexFromUnidirectionalEdge"
+"h3GetPentagonIndexes"
+"h3GetRes0Indexes"
+"h3GetResolution"
+"h3GetUnidirectionalEdge"
+"h3GetUnidirectionalEdgeBoundary"
+"h3GetUnidirectionalEdgesFromHexagon"
+"h3HexAreaKm2"
+"h3HexAreaM2"
+"h3HexRing"
+"h3IndexesAreNeighbors"
+"h3IsPentagon"
+"h3IsResClassIII"
+"h3IsValid"
+"h3Line"
+"h3NumHexagons"
+"h3PointDistKm"
+"h3PointDistM"
+"h3PointDistRads"
+"h3ToCenterChild"
+"h3ToChildren"
+"h3ToGeo"
+"h3ToGeoBoundary"
+"h3ToParent"
+"h3ToString"
+"h3UnidirectionalEdgeIsValid"
+"h3kRing"
+"halfMD5"
+"has"
+"hasAll"
+"hasAny"
+"hasColumnInTable"
+"hasSubsequence"
+"hasSubsequenceCaseInsensitive"
+"hasSubsequenceCaseInsensitiveUTF8"
+"hasSubsequenceUTF8"
+"hasSubstr"
+"hasThreadFuzzer"
+"hasToken"
+"hasTokenCaseInsensitive"
+"hasTokenCaseInsensitiveOrNull"
+"hasTokenOrNull"
+"hex"
+"histogram"
+"histogramArgMax"
+"histogramArgMin"
+"histogramArray"
+"histogramDistinct"
+"histogramForEach"
+"histogramIf"
+"histogramMap"
+"histogramMerge"
+"histogramNull"
+"histogramOrDefault"
+"histogramOrNull"
+"histogramResample"
+"histogramSimpleState"
+"histogramState"
+"hiveHash"
+"hop"
+"hopEnd"
+"hopStart"
+"hostName"
+"hostname"
+"hypot"
+"identity"
+"idnaDecode"
+"idnaEncode"
+"if"
+"ifNotFinite"
+"ifNull"
+"ignore"
+"ilike"
+"in"
+"inIgnoreSet"
+"indexHint"
+"indexOf"
+"initcap"
+"initcapUTF8"
+"initialQueryID"
+"initial_query_id"
+"initializeAggregation"
+"instr"
+"intDiv"
+"intDivOrZero"
+"intExp10"
+"intExp2"
+"intHash32"
+"intHash64"
+"intervalLengthSum"
+"intervalLengthSumArgMax"
+"intervalLengthSumArgMin"
+"intervalLengthSumArray"
+"intervalLengthSumDistinct"
+"intervalLengthSumForEach"
+"intervalLengthSumIf"
+"intervalLengthSumMap"
+"intervalLengthSumMerge"
+"intervalLengthSumNull"
+"intervalLengthSumOrDefault"
+"intervalLengthSumOrNull"
+"intervalLengthSumResample"
+"intervalLengthSumSimpleState"
+"intervalLengthSumState"
+"isConstant"
+"isDecimalOverflow"
+"isFinite"
+"isIPAddressInRange"
+"isIPv4String"
+"isIPv6String"
+"isInfinite"
+"isNaN"
+"isNotDistinctFrom"
+"isNotNull"
+"isNull"
+"isNullable"
+"isValidJSON"
+"isValidUTF8"
+"isZeroOrNull"
+"jaroSimilarity"
+"jaroWinklerSimilarity"
+"javaHash"
+"javaHashUTF16LE"
+"joinGet"
+"joinGetOrNull"
+"jsonMergePatch"
+"jumpConsistentHash"
+"kafkaMurmurHash"
+"kolmogorovSmirnovTest"
+"kolmogorovSmirnovTestArgMax"
+"kolmogorovSmirnovTestArgMin"
+"kolmogorovSmirnovTestArray"
+"kolmogorovSmirnovTestDistinct"
+"kolmogorovSmirnovTestForEach"
+"kolmogorovSmirnovTestIf"
+"kolmogorovSmirnovTestMap"
+"kolmogorovSmirnovTestMerge"
+"kolmogorovSmirnovTestNull"
+"kolmogorovSmirnovTestOrDefault"
+"kolmogorovSmirnovTestOrNull"
+"kolmogorovSmirnovTestResample"
+"kolmogorovSmirnovTestSimpleState"
+"kolmogorovSmirnovTestState"
+"kostikConsistentHash"
+"kql_array_sort_asc"
+"kql_array_sort_desc"
+"kurtPop"
+"kurtPopArgMax"
+"kurtPopArgMin"
+"kurtPopArray"
+"kurtPopDistinct"
+"kurtPopForEach"
+"kurtPopIf"
+"kurtPopMap"
+"kurtPopMerge"
+"kurtPopNull"
+"kurtPopOrDefault"
+"kurtPopOrNull"
+"kurtPopResample"
+"kurtPopSimpleState"
+"kurtPopState"
+"kurtSamp"
+"kurtSampArgMax"
+"kurtSampArgMin"
+"kurtSampArray"
+"kurtSampDistinct"
+"kurtSampForEach"
+"kurtSampIf"
+"kurtSampMap"
+"kurtSampMerge"
+"kurtSampNull"
+"kurtSampOrDefault"
+"kurtSampOrNull"
+"kurtSampResample"
+"kurtSampSimpleState"
+"kurtSampState"
+"lagInFrame"
+"lagInFrameArgMax"
+"lagInFrameArgMin"
+"lagInFrameArray"
+"lagInFrameDistinct"
+"lagInFrameForEach"
+"lagInFrameIf"
+"lagInFrameMap"
+"lagInFrameMerge"
+"lagInFrameNull"
+"lagInFrameOrDefault"
+"lagInFrameOrNull"
+"lagInFrameResample"
+"lagInFrameSimpleState"
+"lagInFrameState"
+"largestTriangleThreeBuckets"
+"largestTriangleThreeBucketsArgMax"
+"largestTriangleThreeBucketsArgMin"
+"largestTriangleThreeBucketsArray"
+"largestTriangleThreeBucketsDistinct"
+"largestTriangleThreeBucketsForEach"
+"largestTriangleThreeBucketsIf"
+"largestTriangleThreeBucketsMap"
+"largestTriangleThreeBucketsMerge"
+"largestTriangleThreeBucketsNull"
+"largestTriangleThreeBucketsOrDefault"
+"largestTriangleThreeBucketsOrNull"
+"largestTriangleThreeBucketsResample"
+"largestTriangleThreeBucketsSimpleState"
+"largestTriangleThreeBucketsState"
+"last_value"
+"last_valueArgMax"
+"last_valueArgMin"
+"last_valueArray"
+"last_valueDistinct"
+"last_valueForEach"
+"last_valueIf"
+"last_valueMap"
+"last_valueMerge"
+"last_valueNull"
+"last_valueOrDefault"
+"last_valueOrNull"
+"last_valueResample"
+"last_valueSimpleState"
+"last_valueState"
+"last_value_respect_nulls"
+"last_value_respect_nullsArgMax"
+"last_value_respect_nullsArgMin"
+"last_value_respect_nullsArray"
+"last_value_respect_nullsDistinct"
+"last_value_respect_nullsForEach"
+"last_value_respect_nullsIf"
+"last_value_respect_nullsMap"
+"last_value_respect_nullsMerge"
+"last_value_respect_nullsNull"
+"last_value_respect_nullsOrDefault"
+"last_value_respect_nullsOrNull"
+"last_value_respect_nullsResample"
+"last_value_respect_nullsSimpleState"
+"last_value_respect_nullsState"
+"lcase"
+"lcm"
+"leadInFrame"
+"leadInFrameArgMax"
+"leadInFrameArgMin"
+"leadInFrameArray"
+"leadInFrameDistinct"
+"leadInFrameForEach"
+"leadInFrameIf"
+"leadInFrameMap"
+"leadInFrameMerge"
+"leadInFrameNull"
+"leadInFrameOrDefault"
+"leadInFrameOrNull"
+"leadInFrameResample"
+"leadInFrameSimpleState"
+"leadInFrameState"
+"least"
+"left"
+"leftPad"
+"leftPadUTF8"
+"leftUTF8"
+"lemmatize"
+"length"
+"lengthUTF8"
+"less"
+"lessOrEquals"
+"levenshteinDistance"
+"lgamma"
+"like"
+"ln"
+"locate"
+"log"
+"log10"
+"log1p"
+"log2"
+"logTrace"
+"lowCardinalityIndices"
+"lowCardinalityKeys"
+"lower"
+"lowerUTF8"
+"lpad"
+"ltrim"
+"lttb"
+"lttbArgMax"
+"lttbArgMin"
+"lttbArray"
+"lttbDistinct"
+"lttbForEach"
+"lttbIf"
+"lttbMap"
+"lttbMerge"
+"lttbNull"
+"lttbOrDefault"
+"lttbOrNull"
+"lttbResample"
+"lttbSimpleState"
+"lttbState"
+"makeDate"
+"makeDate32"
+"makeDateTime"
+"makeDateTime64"
+"mannWhitneyUTest"
+"mannWhitneyUTestArgMax"
+"mannWhitneyUTestArgMin"
+"mannWhitneyUTestArray"
+"mannWhitneyUTestDistinct"
+"mannWhitneyUTestForEach"
+"mannWhitneyUTestIf"
+"mannWhitneyUTestMap"
+"mannWhitneyUTestMerge"
+"mannWhitneyUTestNull"
+"mannWhitneyUTestOrDefault"
+"mannWhitneyUTestOrNull"
+"mannWhitneyUTestResample"
+"mannWhitneyUTestSimpleState"
+"mannWhitneyUTestState"
+"map"
+"mapAdd"
+"mapAll"
+"mapApply"
+"mapConcat"
+"mapContains"
+"mapContainsKeyLike"
+"mapExists"
+"mapExtractKeyLike"
+"mapFilter"
+"mapFromArrays"
+"mapFromString"
+"mapKeys"
+"mapPartialReverseSort"
+"mapPartialSort"
+"mapPopulateSeries"
+"mapReverseSort"
+"mapSort"
+"mapSubtract"
+"mapUpdate"
+"mapValues"
+"match"
+"materialize"
+"max"
+"max2"
+"maxArgMax"
+"maxArgMin"
+"maxArray"
+"maxDistinct"
+"maxForEach"
+"maxIf"
+"maxIntersections"
+"maxIntersectionsArgMax"
+"maxIntersectionsArgMin"
+"maxIntersectionsArray"
+"maxIntersectionsDistinct"
+"maxIntersectionsForEach"
+"maxIntersectionsIf"
+"maxIntersectionsMap"
+"maxIntersectionsMerge"
+"maxIntersectionsNull"
+"maxIntersectionsOrDefault"
+"maxIntersectionsOrNull"
+"maxIntersectionsPosition"
+"maxIntersectionsPositionArgMax"
+"maxIntersectionsPositionArgMin"
+"maxIntersectionsPositionArray"
+"maxIntersectionsPositionDistinct"
+"maxIntersectionsPositionForEach"
+"maxIntersectionsPositionIf"
+"maxIntersectionsPositionMap"
+"maxIntersectionsPositionMerge"
+"maxIntersectionsPositionNull"
+"maxIntersectionsPositionOrDefault"
+"maxIntersectionsPositionOrNull"
+"maxIntersectionsPositionResample"
+"maxIntersectionsPositionSimpleState"
+"maxIntersectionsPositionState"
+"maxIntersectionsResample"
+"maxIntersectionsSimpleState"
+"maxIntersectionsState"
+"maxMap"
+"maxMappedArrays"
+"maxMappedArraysArgMax"
+"maxMappedArraysArgMin"
+"maxMappedArraysArray"
+"maxMappedArraysDistinct"
+"maxMappedArraysForEach"
+"maxMappedArraysIf"
+"maxMappedArraysMap"
+"maxMappedArraysMerge"
+"maxMappedArraysNull"
+"maxMappedArraysOrDefault"
+"maxMappedArraysOrNull"
+"maxMappedArraysResample"
+"maxMappedArraysSimpleState"
+"maxMappedArraysState"
+"maxMerge"
+"maxNull"
+"maxOrDefault"
+"maxOrNull"
+"maxResample"
+"maxSimpleState"
+"maxState"
+"meanZTest"
+"meanZTestArgMax"
+"meanZTestArgMin"
+"meanZTestArray"
+"meanZTestDistinct"
+"meanZTestForEach"
+"meanZTestIf"
+"meanZTestMap"
+"meanZTestMerge"
+"meanZTestNull"
+"meanZTestOrDefault"
+"meanZTestOrNull"
+"meanZTestResample"
+"meanZTestSimpleState"
+"meanZTestState"
+"median"
+"medianArgMax"
+"medianArgMin"
+"medianArray"
+"medianBFloat16"
+"medianBFloat16ArgMax"
+"medianBFloat16ArgMin"
+"medianBFloat16Array"
+"medianBFloat16Distinct"
+"medianBFloat16ForEach"
+"medianBFloat16If"
+"medianBFloat16Map"
+"medianBFloat16Merge"
+"medianBFloat16Null"
+"medianBFloat16OrDefault"
+"medianBFloat16OrNull"
+"medianBFloat16Resample"
+"medianBFloat16SimpleState"
+"medianBFloat16State"
+"medianBFloat16Weighted"
+"medianBFloat16WeightedArgMax"
+"medianBFloat16WeightedArgMin"
+"medianBFloat16WeightedArray"
+"medianBFloat16WeightedDistinct"
+"medianBFloat16WeightedForEach"
+"medianBFloat16WeightedIf"
+"medianBFloat16WeightedMap"
+"medianBFloat16WeightedMerge"
+"medianBFloat16WeightedNull"
+"medianBFloat16WeightedOrDefault"
+"medianBFloat16WeightedOrNull"
+"medianBFloat16WeightedResample"
+"medianBFloat16WeightedSimpleState"
+"medianBFloat16WeightedState"
+"medianDD"
+"medianDDArgMax"
+"medianDDArgMin"
+"medianDDArray"
+"medianDDDistinct"
+"medianDDForEach"
+"medianDDIf"
+"medianDDMap"
+"medianDDMerge"
+"medianDDNull"
+"medianDDOrDefault"
+"medianDDOrNull"
+"medianDDResample"
+"medianDDSimpleState"
+"medianDDState"
+"medianDeterministic"
+"medianDeterministicArgMax"
+"medianDeterministicArgMin"
+"medianDeterministicArray"
+"medianDeterministicDistinct"
+"medianDeterministicForEach"
+"medianDeterministicIf"
+"medianDeterministicMap"
+"medianDeterministicMerge"
+"medianDeterministicNull"
+"medianDeterministicOrDefault"
+"medianDeterministicOrNull"
+"medianDeterministicResample"
+"medianDeterministicSimpleState"
+"medianDeterministicState"
+"medianDistinct"
+"medianExact"
+"medianExactArgMax"
+"medianExactArgMin"
+"medianExactArray"
+"medianExactDistinct"
+"medianExactForEach"
+"medianExactHigh"
+"medianExactHighArgMax"
+"medianExactHighArgMin"
+"medianExactHighArray"
+"medianExactHighDistinct"
+"medianExactHighForEach"
+"medianExactHighIf"
+"medianExactHighMap"
+"medianExactHighMerge"
+"medianExactHighNull"
+"medianExactHighOrDefault"
+"medianExactHighOrNull"
+"medianExactHighResample"
+"medianExactHighSimpleState"
+"medianExactHighState"
+"medianExactIf"
+"medianExactLow"
+"medianExactLowArgMax"
+"medianExactLowArgMin"
+"medianExactLowArray"
+"medianExactLowDistinct"
+"medianExactLowForEach"
+"medianExactLowIf"
+"medianExactLowMap"
+"medianExactLowMerge"
+"medianExactLowNull"
+"medianExactLowOrDefault"
+"medianExactLowOrNull"
+"medianExactLowResample"
+"medianExactLowSimpleState"
+"medianExactLowState"
+"medianExactMap"
+"medianExactMerge"
+"medianExactNull"
+"medianExactOrDefault"
+"medianExactOrNull"
+"medianExactResample"
+"medianExactSimpleState"
+"medianExactState"
+"medianExactWeighted"
+"medianExactWeightedArgMax"
+"medianExactWeightedArgMin"
+"medianExactWeightedArray"
+"medianExactWeightedDistinct"
+"medianExactWeightedForEach"
+"medianExactWeightedIf"
+"medianExactWeightedMap"
+"medianExactWeightedMerge"
+"medianExactWeightedNull"
+"medianExactWeightedOrDefault"
+"medianExactWeightedOrNull"
+"medianExactWeightedResample"
+"medianExactWeightedSimpleState"
+"medianExactWeightedState"
+"medianForEach"
+"medianGK"
+"medianGKArgMax"
+"medianGKArgMin"
+"medianGKArray"
+"medianGKDistinct"
+"medianGKForEach"
+"medianGKIf"
+"medianGKMap"
+"medianGKMerge"
+"medianGKNull"
+"medianGKOrDefault"
+"medianGKOrNull"
+"medianGKResample"
+"medianGKSimpleState"
+"medianGKState"
+"medianIf"
+"medianInterpolatedWeighted"
+"medianInterpolatedWeightedArgMax"
+"medianInterpolatedWeightedArgMin"
+"medianInterpolatedWeightedArray"
+"medianInterpolatedWeightedDistinct"
+"medianInterpolatedWeightedForEach"
+"medianInterpolatedWeightedIf"
+"medianInterpolatedWeightedMap"
+"medianInterpolatedWeightedMerge"
+"medianInterpolatedWeightedNull"
+"medianInterpolatedWeightedOrDefault"
+"medianInterpolatedWeightedOrNull"
+"medianInterpolatedWeightedResample"
+"medianInterpolatedWeightedSimpleState"
+"medianInterpolatedWeightedState"
+"medianMap"
+"medianMerge"
+"medianNull"
+"medianOrDefault"
+"medianOrNull"
+"medianResample"
+"medianSimpleState"
+"medianState"
+"medianTDigest"
+"medianTDigestArgMax"
+"medianTDigestArgMin"
+"medianTDigestArray"
+"medianTDigestDistinct"
+"medianTDigestForEach"
+"medianTDigestIf"
+"medianTDigestMap"
+"medianTDigestMerge"
+"medianTDigestNull"
+"medianTDigestOrDefault"
+"medianTDigestOrNull"
+"medianTDigestResample"
+"medianTDigestSimpleState"
+"medianTDigestState"
+"medianTDigestWeighted"
+"medianTDigestWeightedArgMax"
+"medianTDigestWeightedArgMin"
+"medianTDigestWeightedArray"
+"medianTDigestWeightedDistinct"
+"medianTDigestWeightedForEach"
+"medianTDigestWeightedIf"
+"medianTDigestWeightedMap"
+"medianTDigestWeightedMerge"
+"medianTDigestWeightedNull"
+"medianTDigestWeightedOrDefault"
+"medianTDigestWeightedOrNull"
+"medianTDigestWeightedResample"
+"medianTDigestWeightedSimpleState"
+"medianTDigestWeightedState"
+"medianTiming"
+"medianTimingArgMax"
+"medianTimingArgMin"
+"medianTimingArray"
+"medianTimingDistinct"
+"medianTimingForEach"
+"medianTimingIf"
+"medianTimingMap"
+"medianTimingMerge"
+"medianTimingNull"
+"medianTimingOrDefault"
+"medianTimingOrNull"
+"medianTimingResample"
+"medianTimingSimpleState"
+"medianTimingState"
+"medianTimingWeighted"
+"medianTimingWeightedArgMax"
+"medianTimingWeightedArgMin"
+"medianTimingWeightedArray"
+"medianTimingWeightedDistinct"
+"medianTimingWeightedForEach"
+"medianTimingWeightedIf"
+"medianTimingWeightedMap"
+"medianTimingWeightedMerge"
+"medianTimingWeightedNull"
+"medianTimingWeightedOrDefault"
+"medianTimingWeightedOrNull"
+"medianTimingWeightedResample"
+"medianTimingWeightedSimpleState"
+"medianTimingWeightedState"
+"metroHash64"
+"mid"
+"min"
+"min2"
+"minArgMax"
+"minArgMin"
+"minArray"
+"minDistinct"
+"minForEach"
+"minIf"
+"minMap"
+"minMappedArrays"
+"minMappedArraysArgMax"
+"minMappedArraysArgMin"
+"minMappedArraysArray"
+"minMappedArraysDistinct"
+"minMappedArraysForEach"
+"minMappedArraysIf"
+"minMappedArraysMap"
+"minMappedArraysMerge"
+"minMappedArraysNull"
+"minMappedArraysOrDefault"
+"minMappedArraysOrNull"
+"minMappedArraysResample"
+"minMappedArraysSimpleState"
+"minMappedArraysState"
+"minMerge"
+"minNull"
+"minOrDefault"
+"minOrNull"
+"minResample"
+"minSampleSizeContinous"
+"minSampleSizeContinuous"
+"minSampleSizeConversion"
+"minSimpleState"
+"minState"
+"minus"
+"mismatches"
+"mod"
+"modulo"
+"moduloLegacy"
+"moduloOrZero"
+"monthName"
+"mortonDecode"
+"mortonEncode"
+"multiFuzzyMatchAllIndices"
+"multiFuzzyMatchAny"
+"multiFuzzyMatchAnyIndex"
+"multiIf"
+"multiMatchAllIndices"
+"multiMatchAny"
+"multiMatchAnyIndex"
+"multiSearchAllPositions"
+"multiSearchAllPositionsCaseInsensitive"
+"multiSearchAllPositionsCaseInsensitiveUTF8"
+"multiSearchAllPositionsUTF8"
+"multiSearchAny"
+"multiSearchAnyCaseInsensitive"
+"multiSearchAnyCaseInsensitiveUTF8"
+"multiSearchAnyUTF8"
+"multiSearchFirstIndex"
+"multiSearchFirstIndexCaseInsensitive"
+"multiSearchFirstIndexCaseInsensitiveUTF8"
+"multiSearchFirstIndexUTF8"
+"multiSearchFirstPosition"
+"multiSearchFirstPositionCaseInsensitive"
+"multiSearchFirstPositionCaseInsensitiveUTF8"
+"multiSearchFirstPositionUTF8"
+"multiply"
+"multiplyDecimal"
+"murmurHash2_32"
+"murmurHash2_64"
+"murmurHash3_128"
+"murmurHash3_32"
+"murmurHash3_64"
+"negate"
+"neighbor"
+"nested"
+"netloc"
+"ngramDistance"
+"ngramDistanceCaseInsensitive"
+"ngramDistanceCaseInsensitiveUTF8"
+"ngramDistanceUTF8"
+"ngramMinHash"
+"ngramMinHashArg"
+"ngramMinHashArgCaseInsensitive"
+"ngramMinHashArgCaseInsensitiveUTF8"
+"ngramMinHashArgUTF8"
+"ngramMinHashCaseInsensitive"
+"ngramMinHashCaseInsensitiveUTF8"
+"ngramMinHashUTF8"
+"ngramSearch"
+"ngramSearchCaseInsensitive"
+"ngramSearchCaseInsensitiveUTF8"
+"ngramSearchUTF8"
+"ngramSimHash"
+"ngramSimHashCaseInsensitive"
+"ngramSimHashCaseInsensitiveUTF8"
+"ngramSimHashUTF8"
+"ngrams"
+"nonNegativeDerivative"
+"nonNegativeDerivativeArgMax"
+"nonNegativeDerivativeArgMin"
+"nonNegativeDerivativeArray"
+"nonNegativeDerivativeDistinct"
+"nonNegativeDerivativeForEach"
+"nonNegativeDerivativeIf"
+"nonNegativeDerivativeMap"
+"nonNegativeDerivativeMerge"
+"nonNegativeDerivativeNull"
+"nonNegativeDerivativeOrDefault"
+"nonNegativeDerivativeOrNull"
+"nonNegativeDerivativeResample"
+"nonNegativeDerivativeSimpleState"
+"nonNegativeDerivativeState"
+"normL1"
+"normL2"
+"normL2Squared"
+"normLinf"
+"normLp"
+"normalizeL1"
+"normalizeL2"
+"normalizeLinf"
+"normalizeLp"
+"normalizeQuery"
+"normalizeQueryKeepNames"
+"normalizeUTF8NFC"
+"normalizeUTF8NFD"
+"normalizeUTF8NFKC"
+"normalizeUTF8NFKD"
+"normalizedQueryHash"
+"normalizedQueryHashKeepNames"
+"not"
+"notEmpty"
+"notEquals"
+"notILike"
+"notIn"
+"notInIgnoreSet"
+"notLike"
+"notNullIn"
+"notNullInIgnoreSet"
+"nothing"
+"nothingArgMax"
+"nothingArgMin"
+"nothingArray"
+"nothingDistinct"
+"nothingForEach"
+"nothingIf"
+"nothingMap"
+"nothingMerge"
+"nothingNull"
+"nothingNull"
+"nothingNullArgMax"
+"nothingNullArgMin"
+"nothingNullArray"
+"nothingNullDistinct"
+"nothingNullForEach"
+"nothingNullIf"
+"nothingNullMap"
+"nothingNullMerge"
+"nothingNullNull"
+"nothingNullOrDefault"
+"nothingNullOrNull"
+"nothingNullResample"
+"nothingNullSimpleState"
+"nothingNullState"
+"nothingOrDefault"
+"nothingOrNull"
+"nothingResample"
+"nothingSimpleState"
+"nothingState"
+"nothingUInt64"
+"nothingUInt64ArgMax"
+"nothingUInt64ArgMin"
+"nothingUInt64Array"
+"nothingUInt64Distinct"
+"nothingUInt64ForEach"
+"nothingUInt64If"
+"nothingUInt64Map"
+"nothingUInt64Merge"
+"nothingUInt64Null"
+"nothingUInt64OrDefault"
+"nothingUInt64OrNull"
+"nothingUInt64Resample"
+"nothingUInt64SimpleState"
+"nothingUInt64State"
+"now"
+"now64"
+"nowInBlock"
+"nth_value"
+"nth_valueArgMax"
+"nth_valueArgMin"
+"nth_valueArray"
+"nth_valueDistinct"
+"nth_valueForEach"
+"nth_valueIf"
+"nth_valueMap"
+"nth_valueMerge"
+"nth_valueNull"
+"nth_valueOrDefault"
+"nth_valueOrNull"
+"nth_valueResample"
+"nth_valueSimpleState"
+"nth_valueState"
+"ntile"
+"ntileArgMax"
+"ntileArgMin"
+"ntileArray"
+"ntileDistinct"
+"ntileForEach"
+"ntileIf"
+"ntileMap"
+"ntileMerge"
+"ntileNull"
+"ntileOrDefault"
+"ntileOrNull"
+"ntileResample"
+"ntileSimpleState"
+"ntileState"
+"nullIf"
+"nullIn"
+"nullInIgnoreSet"
+"or"
+"parseDateTime"
+"parseDateTime32BestEffort"
+"parseDateTime32BestEffortOrNull"
+"parseDateTime32BestEffortOrZero"
+"parseDateTime64BestEffort"
+"parseDateTime64BestEffortOrNull"
+"parseDateTime64BestEffortOrZero"
+"parseDateTime64BestEffortUS"
+"parseDateTime64BestEffortUSOrNull"
+"parseDateTime64BestEffortUSOrZero"
+"parseDateTimeBestEffort"
+"parseDateTimeBestEffortOrNull"
+"parseDateTimeBestEffortOrZero"
+"parseDateTimeBestEffortUS"
+"parseDateTimeBestEffortUSOrNull"
+"parseDateTimeBestEffortUSOrZero"
+"parseDateTimeInJodaSyntax"
+"parseDateTimeInJodaSyntaxOrNull"
+"parseDateTimeInJodaSyntaxOrZero"
+"parseDateTimeOrNull"
+"parseDateTimeOrZero"
+"parseTimeDelta"
+"partitionId"
+"path"
+"pathFull"
+"pi"
+"plus"
+"pmod"
+"pointInEllipses"
+"pointInPolygon"
+"polygonAreaCartesian"
+"polygonAreaSpherical"
+"polygonConvexHullCartesian"
+"polygonPerimeterCartesian"
+"polygonPerimeterSpherical"
+"polygonsDistanceCartesian"
+"polygonsDistanceSpherical"
+"polygonsEqualsCartesian"
+"polygonsIntersectionCartesian"
+"polygonsIntersectionSpherical"
+"polygonsSymDifferenceCartesian"
+"polygonsSymDifferenceSpherical"
+"polygonsUnionCartesian"
+"polygonsUnionSpherical"
+"polygonsWithinCartesian"
+"polygonsWithinSpherical"
+"port"
+"portRFC"
+"position"
+"positionCaseInsensitive"
+"positionCaseInsensitiveUTF8"
+"positionUTF8"
+"positiveModulo"
+"positive_modulo"
+"pow"
+"power"
+"proportionsZTest"
+"protocol"
+"punycodeDecode"
+"punycodeEncode"
 "quantile"
+"quantileArgMax"
+"quantileArgMin"
+"quantileArray"
+"quantileBFloat16"
+"quantileBFloat16ArgMax"
+"quantileBFloat16ArgMin"
+"quantileBFloat16Array"
+"quantileBFloat16Distinct"
+"quantileBFloat16ForEach"
+"quantileBFloat16If"
+"quantileBFloat16Map"
+"quantileBFloat16Merge"
+"quantileBFloat16Null"
+"quantileBFloat16OrDefault"
+"quantileBFloat16OrNull"
+"quantileBFloat16Resample"
+"quantileBFloat16SimpleState"
+"quantileBFloat16State"
+"quantileBFloat16Weighted"
+"quantileBFloat16WeightedArgMax"
+"quantileBFloat16WeightedArgMin"
+"quantileBFloat16WeightedArray"
+"quantileBFloat16WeightedDistinct"
+"quantileBFloat16WeightedForEach"
+"quantileBFloat16WeightedIf"
+"quantileBFloat16WeightedMap"
+"quantileBFloat16WeightedMerge"
+"quantileBFloat16WeightedNull"
+"quantileBFloat16WeightedOrDefault"
+"quantileBFloat16WeightedOrNull"
+"quantileBFloat16WeightedResample"
+"quantileBFloat16WeightedSimpleState"
+"quantileBFloat16WeightedState"
+"quantileDD"
+"quantileDDArgMax"
+"quantileDDArgMin"
+"quantileDDArray"
+"quantileDDDistinct"
+"quantileDDForEach"
+"quantileDDIf"
+"quantileDDMap"
+"quantileDDMerge"
+"quantileDDNull"
+"quantileDDOrDefault"
+"quantileDDOrNull"
+"quantileDDResample"
+"quantileDDSimpleState"
+"quantileDDState"
+"quantileDeterministic"
+"quantileDeterministicArgMax"
+"quantileDeterministicArgMin"
+"quantileDeterministicArray"
+"quantileDeterministicDistinct"
+"quantileDeterministicForEach"
+"quantileDeterministicIf"
+"quantileDeterministicMap"
+"quantileDeterministicMerge"
+"quantileDeterministicNull"
+"quantileDeterministicOrDefault"
+"quantileDeterministicOrNull"
+"quantileDeterministicResample"
+"quantileDeterministicSimpleState"
+"quantileDeterministicState"
+"quantileDistinct"
+"quantileExact"
+"quantileExactArgMax"
+"quantileExactArgMin"
+"quantileExactArray"
+"quantileExactDistinct"
+"quantileExactExclusive"
+"quantileExactExclusiveArgMax"
+"quantileExactExclusiveArgMin"
+"quantileExactExclusiveArray"
+"quantileExactExclusiveDistinct"
+"quantileExactExclusiveForEach"
+"quantileExactExclusiveIf"
+"quantileExactExclusiveMap"
+"quantileExactExclusiveMerge"
+"quantileExactExclusiveNull"
+"quantileExactExclusiveOrDefault"
+"quantileExactExclusiveOrNull"
+"quantileExactExclusiveResample"
+"quantileExactExclusiveSimpleState"
+"quantileExactExclusiveState"
+"quantileExactForEach"
+"quantileExactHigh"
+"quantileExactHighArgMax"
+"quantileExactHighArgMin"
+"quantileExactHighArray"
+"quantileExactHighDistinct"
+"quantileExactHighForEach"
+"quantileExactHighIf"
+"quantileExactHighMap"
+"quantileExactHighMerge"
+"quantileExactHighNull"
+"quantileExactHighOrDefault"
+"quantileExactHighOrNull"
+"quantileExactHighResample"
+"quantileExactHighSimpleState"
+"quantileExactHighState"
+"quantileExactIf"
+"quantileExactInclusive"
+"quantileExactInclusiveArgMax"
+"quantileExactInclusiveArgMin"
+"quantileExactInclusiveArray"
+"quantileExactInclusiveDistinct"
+"quantileExactInclusiveForEach"
+"quantileExactInclusiveIf"
+"quantileExactInclusiveMap"
+"quantileExactInclusiveMerge"
+"quantileExactInclusiveNull"
+"quantileExactInclusiveOrDefault"
+"quantileExactInclusiveOrNull"
+"quantileExactInclusiveResample"
+"quantileExactInclusiveSimpleState"
+"quantileExactInclusiveState"
+"quantileExactLow"
+"quantileExactLowArgMax"
+"quantileExactLowArgMin"
+"quantileExactLowArray"
+"quantileExactLowDistinct"
+"quantileExactLowForEach"
+"quantileExactLowIf"
+"quantileExactLowMap"
+"quantileExactLowMerge"
+"quantileExactLowNull"
+"quantileExactLowOrDefault"
+"quantileExactLowOrNull"
+"quantileExactLowResample"
+"quantileExactLowSimpleState"
+"quantileExactLowState"
+"quantileExactMap"
+"quantileExactMerge"
+"quantileExactNull"
+"quantileExactOrDefault"
+"quantileExactOrNull"
+"quantileExactResample"
+"quantileExactSimpleState"
+"quantileExactState"
+"quantileExactWeighted"
+"quantileExactWeightedArgMax"
+"quantileExactWeightedArgMin"
+"quantileExactWeightedArray"
+"quantileExactWeightedDistinct"
+"quantileExactWeightedForEach"
+"quantileExactWeightedIf"
+"quantileExactWeightedMap"
+"quantileExactWeightedMerge"
+"quantileExactWeightedNull"
+"quantileExactWeightedOrDefault"
+"quantileExactWeightedOrNull"
+"quantileExactWeightedResample"
+"quantileExactWeightedSimpleState"
+"quantileExactWeightedState"
+"quantileForEach"
+"quantileGK"
+"quantileGKArgMax"
+"quantileGKArgMin"
+"quantileGKArray"
+"quantileGKDistinct"
+"quantileGKForEach"
+"quantileGKIf"
+"quantileGKMap"
+"quantileGKMerge"
+"quantileGKNull"
+"quantileGKOrDefault"
+"quantileGKOrNull"
+"quantileGKResample"
+"quantileGKSimpleState"
+"quantileGKState"
+"quantileIf"
+"quantileInterpolatedWeighted"
+"quantileInterpolatedWeightedArgMax"
+"quantileInterpolatedWeightedArgMin"
+"quantileInterpolatedWeightedArray"
+"quantileInterpolatedWeightedDistinct"
+"quantileInterpolatedWeightedForEach"
+"quantileInterpolatedWeightedIf"
+"quantileInterpolatedWeightedMap"
+"quantileInterpolatedWeightedMerge"
+"quantileInterpolatedWeightedNull"
+"quantileInterpolatedWeightedOrDefault"
+"quantileInterpolatedWeightedOrNull"
+"quantileInterpolatedWeightedResample"
+"quantileInterpolatedWeightedSimpleState"
+"quantileInterpolatedWeightedState"
+"quantileMap"
+"quantileMerge"
+"quantileNull"
+"quantileOrDefault"
+"quantileOrNull"
+"quantileResample"
+"quantileSimpleState"
+"quantileState"
+"quantileTDigest"
+"quantileTDigestArgMax"
+"quantileTDigestArgMin"
+"quantileTDigestArray"
+"quantileTDigestDistinct"
+"quantileTDigestForEach"
+"quantileTDigestIf"
+"quantileTDigestMap"
+"quantileTDigestMerge"
+"quantileTDigestNull"
+"quantileTDigestOrDefault"
+"quantileTDigestOrNull"
+"quantileTDigestResample"
+"quantileTDigestSimpleState"
+"quantileTDigestState"
+"quantileTDigestWeighted"
+"quantileTDigestWeightedArgMax"
+"quantileTDigestWeightedArgMin"
+"quantileTDigestWeightedArray"
+"quantileTDigestWeightedDistinct"
+"quantileTDigestWeightedForEach"
+"quantileTDigestWeightedIf"
+"quantileTDigestWeightedMap"
+"quantileTDigestWeightedMerge"
+"quantileTDigestWeightedNull"
+"quantileTDigestWeightedOrDefault"
+"quantileTDigestWeightedOrNull"
+"quantileTDigestWeightedResample"
+"quantileTDigestWeightedSimpleState"
+"quantileTDigestWeightedState"
+"quantileTiming"
+"quantileTimingArgMax"
+"quantileTimingArgMin"
+"quantileTimingArray"
+"quantileTimingDistinct"
+"quantileTimingForEach"
+"quantileTimingIf"
+"quantileTimingMap"
+"quantileTimingMerge"
+"quantileTimingNull"
+"quantileTimingOrDefault"
+"quantileTimingOrNull"
+"quantileTimingResample"
+"quantileTimingSimpleState"
+"quantileTimingState"
+"quantileTimingWeighted"
+"quantileTimingWeightedArgMax"
+"quantileTimingWeightedArgMin"
+"quantileTimingWeightedArray"
+"quantileTimingWeightedDistinct"
+"quantileTimingWeightedForEach"
+"quantileTimingWeightedIf"
+"quantileTimingWeightedMap"
+"quantileTimingWeightedMerge"
+"quantileTimingWeightedNull"
+"quantileTimingWeightedOrDefault"
+"quantileTimingWeightedOrNull"
+"quantileTimingWeightedResample"
+"quantileTimingWeightedSimpleState"
+"quantileTimingWeightedState"
+"quantiles"
+"quantilesArgMax"
+"quantilesArgMin"
+"quantilesArray"
+"quantilesBFloat16"
+"quantilesBFloat16ArgMax"
+"quantilesBFloat16ArgMin"
+"quantilesBFloat16Array"
+"quantilesBFloat16Distinct"
+"quantilesBFloat16ForEach"
+"quantilesBFloat16If"
+"quantilesBFloat16Map"
+"quantilesBFloat16Merge"
+"quantilesBFloat16Null"
+"quantilesBFloat16OrDefault"
+"quantilesBFloat16OrNull"
+"quantilesBFloat16Resample"
+"quantilesBFloat16SimpleState"
+"quantilesBFloat16State"
+"quantilesBFloat16Weighted"
+"quantilesBFloat16WeightedArgMax"
+"quantilesBFloat16WeightedArgMin"
+"quantilesBFloat16WeightedArray"
+"quantilesBFloat16WeightedDistinct"
+"quantilesBFloat16WeightedForEach"
+"quantilesBFloat16WeightedIf"
+"quantilesBFloat16WeightedMap"
+"quantilesBFloat16WeightedMerge"
+"quantilesBFloat16WeightedNull"
+"quantilesBFloat16WeightedOrDefault"
+"quantilesBFloat16WeightedOrNull"
+"quantilesBFloat16WeightedResample"
+"quantilesBFloat16WeightedSimpleState"
+"quantilesBFloat16WeightedState"
+"quantilesDD"
+"quantilesDDArgMax"
+"quantilesDDArgMin"
+"quantilesDDArray"
+"quantilesDDDistinct"
+"quantilesDDForEach"
+"quantilesDDIf"
+"quantilesDDMap"
+"quantilesDDMerge"
+"quantilesDDNull"
+"quantilesDDOrDefault"
+"quantilesDDOrNull"
+"quantilesDDResample"
+"quantilesDDSimpleState"
+"quantilesDDState"
+"quantilesDeterministic"
+"quantilesDeterministicArgMax"
+"quantilesDeterministicArgMin"
+"quantilesDeterministicArray"
+"quantilesDeterministicDistinct"
+"quantilesDeterministicForEach"
+"quantilesDeterministicIf"
+"quantilesDeterministicMap"
+"quantilesDeterministicMerge"
+"quantilesDeterministicNull"
+"quantilesDeterministicOrDefault"
+"quantilesDeterministicOrNull"
+"quantilesDeterministicResample"
+"quantilesDeterministicSimpleState"
+"quantilesDeterministicState"
+"quantilesDistinct"
+"quantilesExact"
+"quantilesExactArgMax"
+"quantilesExactArgMin"
+"quantilesExactArray"
+"quantilesExactDistinct"
+"quantilesExactExclusive"
+"quantilesExactExclusiveArgMax"
+"quantilesExactExclusiveArgMin"
+"quantilesExactExclusiveArray"
+"quantilesExactExclusiveDistinct"
+"quantilesExactExclusiveForEach"
+"quantilesExactExclusiveIf"
+"quantilesExactExclusiveMap"
+"quantilesExactExclusiveMerge"
+"quantilesExactExclusiveNull"
+"quantilesExactExclusiveOrDefault"
+"quantilesExactExclusiveOrNull"
+"quantilesExactExclusiveResample"
+"quantilesExactExclusiveSimpleState"
+"quantilesExactExclusiveState"
+"quantilesExactForEach"
+"quantilesExactHigh"
+"quantilesExactHighArgMax"
+"quantilesExactHighArgMin"
+"quantilesExactHighArray"
+"quantilesExactHighDistinct"
+"quantilesExactHighForEach"
+"quantilesExactHighIf"
+"quantilesExactHighMap"
+"quantilesExactHighMerge"
+"quantilesExactHighNull"
+"quantilesExactHighOrDefault"
+"quantilesExactHighOrNull"
+"quantilesExactHighResample"
+"quantilesExactHighSimpleState"
+"quantilesExactHighState"
+"quantilesExactIf"
+"quantilesExactInclusive"
+"quantilesExactInclusiveArgMax"
+"quantilesExactInclusiveArgMin"
+"quantilesExactInclusiveArray"
+"quantilesExactInclusiveDistinct"
+"quantilesExactInclusiveForEach"
+"quantilesExactInclusiveIf"
+"quantilesExactInclusiveMap"
+"quantilesExactInclusiveMerge"
+"quantilesExactInclusiveNull"
+"quantilesExactInclusiveOrDefault"
+"quantilesExactInclusiveOrNull"
+"quantilesExactInclusiveResample"
+"quantilesExactInclusiveSimpleState"
+"quantilesExactInclusiveState"
+"quantilesExactLow"
+"quantilesExactLowArgMax"
+"quantilesExactLowArgMin"
+"quantilesExactLowArray"
+"quantilesExactLowDistinct"
+"quantilesExactLowForEach"
+"quantilesExactLowIf"
+"quantilesExactLowMap"
+"quantilesExactLowMerge"
+"quantilesExactLowNull"
+"quantilesExactLowOrDefault"
+"quantilesExactLowOrNull"
+"quantilesExactLowResample"
+"quantilesExactLowSimpleState"
+"quantilesExactLowState"
+"quantilesExactMap"
+"quantilesExactMerge"
+"quantilesExactNull"
+"quantilesExactOrDefault"
+"quantilesExactOrNull"
+"quantilesExactResample"
+"quantilesExactSimpleState"
+"quantilesExactState"
+"quantilesExactWeighted"
+"quantilesExactWeightedArgMax"
+"quantilesExactWeightedArgMin"
+"quantilesExactWeightedArray"
+"quantilesExactWeightedDistinct"
+"quantilesExactWeightedForEach"
+"quantilesExactWeightedIf"
+"quantilesExactWeightedMap"
+"quantilesExactWeightedMerge"
+"quantilesExactWeightedNull"
+"quantilesExactWeightedOrDefault"
+"quantilesExactWeightedOrNull"
+"quantilesExactWeightedResample"
+"quantilesExactWeightedSimpleState"
+"quantilesExactWeightedState"
+"quantilesForEach"
+"quantilesGK"
+"quantilesGKArgMax"
+"quantilesGKArgMin"
+"quantilesGKArray"
+"quantilesGKDistinct"
+"quantilesGKForEach"
+"quantilesGKIf"
+"quantilesGKMap"
+"quantilesGKMerge"
+"quantilesGKNull"
+"quantilesGKOrDefault"
+"quantilesGKOrNull"
+"quantilesGKResample"
+"quantilesGKSimpleState"
+"quantilesGKState"
+"quantilesIf"
+"quantilesInterpolatedWeighted"
+"quantilesInterpolatedWeightedArgMax"
+"quantilesInterpolatedWeightedArgMin"
+"quantilesInterpolatedWeightedArray"
+"quantilesInterpolatedWeightedDistinct"
+"quantilesInterpolatedWeightedForEach"
+"quantilesInterpolatedWeightedIf"
+"quantilesInterpolatedWeightedMap"
+"quantilesInterpolatedWeightedMerge"
+"quantilesInterpolatedWeightedNull"
+"quantilesInterpolatedWeightedOrDefault"
+"quantilesInterpolatedWeightedOrNull"
+"quantilesInterpolatedWeightedResample"
+"quantilesInterpolatedWeightedSimpleState"
+"quantilesInterpolatedWeightedState"
+"quantilesMap"
+"quantilesMerge"
+"quantilesNull"
+"quantilesOrDefault"
+"quantilesOrNull"
+"quantilesResample"
+"quantilesSimpleState"
+"quantilesState"
+"quantilesTDigest"
+"quantilesTDigestArgMax"
+"quantilesTDigestArgMin"
+"quantilesTDigestArray"
+"quantilesTDigestDistinct"
+"quantilesTDigestForEach"
+"quantilesTDigestIf"
+"quantilesTDigestMap"
+"quantilesTDigestMerge"
+"quantilesTDigestNull"
+"quantilesTDigestOrDefault"
+"quantilesTDigestOrNull"
+"quantilesTDigestResample"
+"quantilesTDigestSimpleState"
+"quantilesTDigestState"
+"quantilesTDigestWeighted"
+"quantilesTDigestWeightedArgMax"
+"quantilesTDigestWeightedArgMin"
+"quantilesTDigestWeightedArray"
+"quantilesTDigestWeightedDistinct"
+"quantilesTDigestWeightedForEach"
+"quantilesTDigestWeightedIf"
+"quantilesTDigestWeightedMap"
+"quantilesTDigestWeightedMerge"
+"quantilesTDigestWeightedNull"
+"quantilesTDigestWeightedOrDefault"
+"quantilesTDigestWeightedOrNull"
+"quantilesTDigestWeightedResample"
+"quantilesTDigestWeightedSimpleState"
+"quantilesTDigestWeightedState"
+"quantilesTiming"
+"quantilesTimingArgMax"
+"quantilesTimingArgMin"
+"quantilesTimingArray"
+"quantilesTimingDistinct"
+"quantilesTimingForEach"
+"quantilesTimingIf"
+"quantilesTimingMap"
+"quantilesTimingMerge"
+"quantilesTimingNull"
+"quantilesTimingOrDefault"
+"quantilesTimingOrNull"
+"quantilesTimingResample"
+"quantilesTimingSimpleState"
+"quantilesTimingState"
+"quantilesTimingWeighted"
+"quantilesTimingWeightedArgMax"
+"quantilesTimingWeightedArgMin"
+"quantilesTimingWeightedArray"
+"quantilesTimingWeightedDistinct"
+"quantilesTimingWeightedForEach"
+"quantilesTimingWeightedIf"
+"quantilesTimingWeightedMap"
+"quantilesTimingWeightedMerge"
+"quantilesTimingWeightedNull"
+"quantilesTimingWeightedOrDefault"
+"quantilesTimingWeightedOrNull"
+"quantilesTimingWeightedResample"
+"quantilesTimingWeightedSimpleState"
+"quantilesTimingWeightedState"
+"queryID"
+"queryString"
+"queryStringAndFragment"
+"query_id"
+"radians"
+"rand"
+"rand32"
+"rand64"
+"randBernoulli"
+"randBinomial"
+"randCanonical"
+"randChiSquared"
+"randConstant"
+"randExponential"
+"randFisherF"
+"randLogNormal"
+"randNegativeBinomial"
+"randNormal"
+"randPoisson"
+"randStudentT"
+"randUniform"
+"randomFixedString"
+"randomPrintableASCII"
+"randomString"
+"randomStringUTF8"
+"range"
+"rank"
+"rankArgMax"
+"rankArgMin"
+"rankArray"
+"rankCorr"
+"rankCorrArgMax"
+"rankCorrArgMin"
+"rankCorrArray"
+"rankCorrDistinct"
+"rankCorrForEach"
+"rankCorrIf"
+"rankCorrMap"
+"rankCorrMerge"
+"rankCorrNull"
+"rankCorrOrDefault"
+"rankCorrOrNull"
+"rankCorrResample"
+"rankCorrSimpleState"
+"rankCorrState"
+"rankDistinct"
+"rankForEach"
+"rankIf"
+"rankMap"
+"rankMerge"
+"rankNull"
+"rankOrDefault"
+"rankOrNull"
+"rankResample"
+"rankSimpleState"
+"rankState"
+"readWKTMultiPolygon"
+"readWKTPoint"
+"readWKTPolygon"
+"readWKTRing"
+"regexpExtract"
+"regexpQuoteMeta"
+"regionHierarchy"
+"regionIn"
+"regionToArea"
+"regionToCity"
+"regionToContinent"
+"regionToCountry"
+"regionToDistrict"
+"regionToName"
+"regionToPopulation"
+"regionToTopContinent"
+"reinterpret"
+"reinterpretAsDate"
+"reinterpretAsDateTime"
+"reinterpretAsFixedString"
+"reinterpretAsFloat32"
+"reinterpretAsFloat64"
+"reinterpretAsInt128"
+"reinterpretAsInt16"
+"reinterpretAsInt256"
+"reinterpretAsInt32"
+"reinterpretAsInt64"
+"reinterpretAsInt8"
+"reinterpretAsString"
+"reinterpretAsUInt128"
+"reinterpretAsUInt16"
+"reinterpretAsUInt256"
+"reinterpretAsUInt32"
+"reinterpretAsUInt64"
+"reinterpretAsUInt8"
+"reinterpretAsUUID"
+"repeat"
+"replace"
+"replaceAll"
+"replaceOne"
+"replaceRegexpAll"
+"replaceRegexpOne"
+"replicate"
+"retention"
+"retentionArgMax"
+"retentionArgMin"
+"retentionArray"
+"retentionDistinct"
+"retentionForEach"
+"retentionIf"
+"retentionMap"
+"retentionMerge"
+"retentionNull"
+"retentionOrDefault"
+"retentionOrNull"
+"retentionResample"
+"retentionSimpleState"
+"retentionState"
+"reverse"
+"reverseUTF8"
+"revision"
+"right"
+"rightPad"
+"rightPadUTF8"
+"rightUTF8"
+"round"
+"roundAge"
+"roundBankers"
+"roundDown"
+"roundDuration"
+"roundToExp2"
+"rowNumberInAllBlocks"
+"rowNumberInBlock"
+"row_number"
+"row_numberArgMax"
+"row_numberArgMin"
+"row_numberArray"
+"row_numberDistinct"
+"row_numberForEach"
+"row_numberIf"
+"row_numberMap"
+"row_numberMerge"
+"row_numberNull"
+"row_numberOrDefault"
+"row_numberOrNull"
+"row_numberResample"
+"row_numberSimpleState"
+"row_numberState"
+"rpad"
+"rtrim"
+"runningAccumulate"
+"runningConcurrency"
+"runningDifference"
+"runningDifferenceStartingWithFirstValue"
+"s2CapContains"
+"s2CapUnion"
+"s2CellsIntersect"
+"s2GetNeighbors"
+"s2RectAdd"
+"s2RectContains"
+"s2RectIntersection"
+"s2RectUnion"
+"s2ToGeo"
+"scalarProduct"
+"sequenceCount"
+"sequenceCountArgMax"
+"sequenceCountArgMin"
+"sequenceCountArray"
+"sequenceCountDistinct"
+"sequenceCountForEach"
+"sequenceCountIf"
+"sequenceCountMap"
+"sequenceCountMerge"
+"sequenceCountNull"
+"sequenceCountOrDefault"
+"sequenceCountOrNull"
+"sequenceCountResample"
+"sequenceCountSimpleState"
+"sequenceCountState"
+"sequenceMatch"
+"sequenceMatchArgMax"
+"sequenceMatchArgMin"
+"sequenceMatchArray"
+"sequenceMatchDistinct"
+"sequenceMatchForEach"
+"sequenceMatchIf"
+"sequenceMatchMap"
+"sequenceMatchMerge"
+"sequenceMatchNull"
+"sequenceMatchOrDefault"
+"sequenceMatchOrNull"
+"sequenceMatchResample"
+"sequenceMatchSimpleState"
+"sequenceMatchState"
+"sequenceNextNode"
+"sequenceNextNodeArgMax"
+"sequenceNextNodeArgMin"
+"sequenceNextNodeArray"
+"sequenceNextNodeDistinct"
+"sequenceNextNodeForEach"
+"sequenceNextNodeIf"
+"sequenceNextNodeMap"
+"sequenceNextNodeMerge"
+"sequenceNextNodeNull"
+"sequenceNextNodeOrDefault"
+"sequenceNextNodeOrNull"
+"sequenceNextNodeResample"
+"sequenceNextNodeSimpleState"
+"sequenceNextNodeState"
+"seriesDecomposeSTL"
+"seriesOutliersDetectTukey"
+"seriesPeriodDetectFFT"
+"serverTimeZone"
+"serverTimezone"
+"serverUUID"
+"shardCount"
+"shardNum"
+"showCertificate"
+"sigmoid"
+"sign"
+"simpleJSONExtractBool"
+"simpleJSONExtractFloat"
+"simpleJSONExtractInt"
+"simpleJSONExtractRaw"
+"simpleJSONExtractString"
+"simpleJSONExtractUInt"
+"simpleJSONHas"
+"simpleLinearRegression"
+"simpleLinearRegressionArgMax"
+"simpleLinearRegressionArgMin"
+"simpleLinearRegressionArray"
+"simpleLinearRegressionDistinct"
+"simpleLinearRegressionForEach"
+"simpleLinearRegressionIf"
+"simpleLinearRegressionMap"
+"simpleLinearRegressionMerge"
+"simpleLinearRegressionNull"
+"simpleLinearRegressionOrDefault"
+"simpleLinearRegressionOrNull"
+"simpleLinearRegressionResample"
+"simpleLinearRegressionSimpleState"
+"simpleLinearRegressionState"
+"sin"
+"singleValueOrNull"
+"singleValueOrNullArgMax"
+"singleValueOrNullArgMin"
+"singleValueOrNullArray"
+"singleValueOrNullDistinct"
+"singleValueOrNullForEach"
+"singleValueOrNullIf"
+"singleValueOrNullMap"
+"singleValueOrNullMerge"
+"singleValueOrNullNull"
+"singleValueOrNullOrDefault"
+"singleValueOrNullOrNull"
+"singleValueOrNullResample"
+"singleValueOrNullSimpleState"
+"singleValueOrNullState"
+"sinh"
+"sipHash128"
+"sipHash128Keyed"
+"sipHash128Reference"
+"sipHash128ReferenceKeyed"
+"sipHash64"
+"sipHash64Keyed"
+"skewPop"
+"skewPopArgMax"
+"skewPopArgMin"
+"skewPopArray"
+"skewPopDistinct"
+"skewPopForEach"
+"skewPopIf"
+"skewPopMap"
+"skewPopMerge"
+"skewPopNull"
+"skewPopOrDefault"
+"skewPopOrNull"
+"skewPopResample"
+"skewPopSimpleState"
+"skewPopState"
+"skewSamp"
+"skewSampArgMax"
+"skewSampArgMin"
+"skewSampArray"
+"skewSampDistinct"
+"skewSampForEach"
+"skewSampIf"
+"skewSampMap"
+"skewSampMerge"
+"skewSampNull"
+"skewSampOrDefault"
+"skewSampOrNull"
+"skewSampResample"
+"skewSampSimpleState"
+"skewSampState"
+"sleep"
+"sleepEachRow"
+"snowflakeToDateTime"
+"snowflakeToDateTime64"
+"soundex"
+"space"
+"sparkBar"
+"sparkBarArgMax"
+"sparkBarArgMin"
+"sparkBarArray"
+"sparkBarDistinct"
+"sparkBarForEach"
+"sparkBarIf"
+"sparkBarMap"
+"sparkBarMerge"
+"sparkBarNull"
+"sparkBarOrDefault"
+"sparkBarOrNull"
+"sparkBarResample"
+"sparkBarSimpleState"
+"sparkBarState"
+"sparkbar"
+"sparkbarArgMax"
+"sparkbarArgMin"
+"sparkbarArray"
+"sparkbarDistinct"
+"sparkbarForEach"
+"sparkbarIf"
+"sparkbarMap"
+"sparkbarMerge"
+"sparkbarNull"
+"sparkbarOrDefault"
+"sparkbarOrNull"
+"sparkbarResample"
+"sparkbarSimpleState"
+"sparkbarState"
+"splitByAlpha"
+"splitByChar"
+"splitByNonAlpha"
+"splitByRegexp"
+"splitByString"
+"splitByWhitespace"
+"sqid"
+"sqidDecode"
+"sqidEncode"
+"sqrt"
+"startsWith"
+"startsWithUTF8"
+"stddevPop"
+"stddevPopArgMax"
+"stddevPopArgMin"
+"stddevPopArray"
+"stddevPopDistinct"
+"stddevPopForEach"
+"stddevPopIf"
+"stddevPopMap"
+"stddevPopMerge"
+"stddevPopNull"
+"stddevPopOrDefault"
+"stddevPopOrNull"
+"stddevPopResample"
+"stddevPopSimpleState"
+"stddevPopStable"
+"stddevPopStableArgMax"
+"stddevPopStableArgMin"
+"stddevPopStableArray"
+"stddevPopStableDistinct"
+"stddevPopStableForEach"
+"stddevPopStableIf"
+"stddevPopStableMap"
+"stddevPopStableMerge"
+"stddevPopStableNull"
+"stddevPopStableOrDefault"
+"stddevPopStableOrNull"
+"stddevPopStableResample"
+"stddevPopStableSimpleState"
+"stddevPopStableState"
+"stddevPopState"
+"stddevSamp"
+"stddevSampArgMax"
+"stddevSampArgMin"
+"stddevSampArray"
+"stddevSampDistinct"
+"stddevSampForEach"
+"stddevSampIf"
+"stddevSampMap"
+"stddevSampMerge"
+"stddevSampNull"
+"stddevSampOrDefault"
+"stddevSampOrNull"
+"stddevSampResample"
+"stddevSampSimpleState"
+"stddevSampStable"
+"stddevSampStableArgMax"
+"stddevSampStableArgMin"
+"stddevSampStableArray"
+"stddevSampStableDistinct"
+"stddevSampStableForEach"
+"stddevSampStableIf"
+"stddevSampStableMap"
+"stddevSampStableMerge"
+"stddevSampStableNull"
+"stddevSampStableOrDefault"
+"stddevSampStableOrNull"
+"stddevSampStableResample"
+"stddevSampStableSimpleState"
+"stddevSampStableState"
+"stddevSampState"
+"stem"
+"stochasticLinearRegression"
+"stochasticLinearRegressionArgMax"
+"stochasticLinearRegressionArgMin"
+"stochasticLinearRegressionArray"
+"stochasticLinearRegressionDistinct"
+"stochasticLinearRegressionForEach"
+"stochasticLinearRegressionIf"
+"stochasticLinearRegressionMap"
+"stochasticLinearRegressionMerge"
+"stochasticLinearRegressionNull"
+"stochasticLinearRegressionOrDefault"
+"stochasticLinearRegressionOrNull"
+"stochasticLinearRegressionResample"
+"stochasticLinearRegressionSimpleState"
+"stochasticLinearRegressionState"
+"stochasticLogisticRegression"
+"stochasticLogisticRegressionArgMax"
+"stochasticLogisticRegressionArgMin"
+"stochasticLogisticRegressionArray"
+"stochasticLogisticRegressionDistinct"
+"stochasticLogisticRegressionForEach"
+"stochasticLogisticRegressionIf"
+"stochasticLogisticRegressionMap"
+"stochasticLogisticRegressionMerge"
+"stochasticLogisticRegressionNull"
+"stochasticLogisticRegressionOrDefault"
+"stochasticLogisticRegressionOrNull"
+"stochasticLogisticRegressionResample"
+"stochasticLogisticRegressionSimpleState"
+"stochasticLogisticRegressionState"
+"str_to_date"
+"str_to_map"
+"stringJaccardIndex"
+"stringJaccardIndexUTF8"
+"stringToH3"
+"structureToCapnProtoSchema"
+"structureToProtobufSchema"
+"studentTTest"
+"studentTTestArgMax"
+"studentTTestArgMin"
+"studentTTestArray"
+"studentTTestDistinct"
+"studentTTestForEach"
+"studentTTestIf"
+"studentTTestMap"
+"studentTTestMerge"
+"studentTTestNull"
+"studentTTestOrDefault"
+"studentTTestOrNull"
+"studentTTestResample"
+"studentTTestSimpleState"
+"studentTTestState"
+"subBitmap"
+"subDate"
+"substr"
+"substring"
+"substringIndex"
+"substringIndexUTF8"
+"substringUTF8"
+"subtractDays"
+"subtractHours"
+"subtractInterval"
+"subtractMicroseconds"
+"subtractMilliseconds"
+"subtractMinutes"
+"subtractMonths"
+"subtractNanoseconds"
+"subtractQuarters"
+"subtractSeconds"
+"subtractTupleOfIntervals"
+"subtractWeeks"
+"subtractYears"
+"sum"
+"sumArgMax"
+"sumArgMin"
+"sumArray"
+"sumCount"
+"sumCountArgMax"
+"sumCountArgMin"
+"sumCountArray"
+"sumCountDistinct"
+"sumCountForEach"
+"sumCountIf"
+"sumCountMap"
+"sumCountMerge"
+"sumCountNull"
+"sumCountOrDefault"
+"sumCountOrNull"
+"sumCountResample"
+"sumCountSimpleState"
+"sumCountState"
+"sumDistinct"
+"sumForEach"
+"sumIf"
+"sumKahan"
+"sumKahanArgMax"
+"sumKahanArgMin"
+"sumKahanArray"
+"sumKahanDistinct"
+"sumKahanForEach"
+"sumKahanIf"
+"sumKahanMap"
+"sumKahanMerge"
+"sumKahanNull"
+"sumKahanOrDefault"
+"sumKahanOrNull"
+"sumKahanResample"
+"sumKahanSimpleState"
+"sumKahanState"
+"sumMap"
+"sumMapFiltered"
+"sumMapFilteredArgMax"
+"sumMapFilteredArgMin"
+"sumMapFilteredArray"
+"sumMapFilteredDistinct"
+"sumMapFilteredForEach"
+"sumMapFilteredIf"
+"sumMapFilteredMap"
+"sumMapFilteredMerge"
+"sumMapFilteredNull"
+"sumMapFilteredOrDefault"
+"sumMapFilteredOrNull"
+"sumMapFilteredResample"
+"sumMapFilteredSimpleState"
+"sumMapFilteredState"
+"sumMapFilteredWithOverflow"
+"sumMapFilteredWithOverflowArgMax"
+"sumMapFilteredWithOverflowArgMin"
+"sumMapFilteredWithOverflowArray"
+"sumMapFilteredWithOverflowDistinct"
+"sumMapFilteredWithOverflowForEach"
+"sumMapFilteredWithOverflowIf"
+"sumMapFilteredWithOverflowMap"
+"sumMapFilteredWithOverflowMerge"
+"sumMapFilteredWithOverflowNull"
+"sumMapFilteredWithOverflowOrDefault"
+"sumMapFilteredWithOverflowOrNull"
+"sumMapFilteredWithOverflowResample"
+"sumMapFilteredWithOverflowSimpleState"
+"sumMapFilteredWithOverflowState"
+"sumMapWithOverflow"
+"sumMapWithOverflowArgMax"
+"sumMapWithOverflowArgMin"
+"sumMapWithOverflowArray"
+"sumMapWithOverflowDistinct"
+"sumMapWithOverflowForEach"
+"sumMapWithOverflowIf"
+"sumMapWithOverflowMap"
+"sumMapWithOverflowMerge"
+"sumMapWithOverflowNull"
+"sumMapWithOverflowOrDefault"
+"sumMapWithOverflowOrNull"
+"sumMapWithOverflowResample"
+"sumMapWithOverflowSimpleState"
+"sumMapWithOverflowState"
+"sumMappedArrays"
+"sumMappedArraysArgMax"
+"sumMappedArraysArgMin"
+"sumMappedArraysArray"
+"sumMappedArraysDistinct"
+"sumMappedArraysForEach"
+"sumMappedArraysIf"
+"sumMappedArraysMap"
+"sumMappedArraysMerge"
+"sumMappedArraysNull"
+"sumMappedArraysOrDefault"
+"sumMappedArraysOrNull"
+"sumMappedArraysResample"
+"sumMappedArraysSimpleState"
+"sumMappedArraysState"
+"sumMerge"
+"sumNull"
+"sumOrDefault"
+"sumOrNull"
+"sumResample"
+"sumSimpleState"
+"sumState"
+"sumWithOverflow"
+"sumWithOverflowArgMax"
+"sumWithOverflowArgMin"
+"sumWithOverflowArray"
+"sumWithOverflowDistinct"
+"sumWithOverflowForEach"
+"sumWithOverflowIf"
+"sumWithOverflowMap"
+"sumWithOverflowMerge"
+"sumWithOverflowNull"
+"sumWithOverflowOrDefault"
+"sumWithOverflowOrNull"
+"sumWithOverflowResample"
+"sumWithOverflowSimpleState"
+"sumWithOverflowState"
+"svg"
+"synonyms"
+"tan"
+"tanh"
+"tcpPort"
+"tgamma"
+"theilsU"
+"theilsUArgMax"
+"theilsUArgMin"
+"theilsUArray"
+"theilsUDistinct"
+"theilsUForEach"
+"theilsUIf"
+"theilsUMap"
+"theilsUMerge"
+"theilsUNull"
+"theilsUOrDefault"
+"theilsUOrNull"
+"theilsUResample"
+"theilsUSimpleState"
+"theilsUState"
+"throwIf"
+"tid"
+"timeDiff"
+"timeSlot"
+"timeSlots"
+"timeZone"
+"timeZoneOf"
+"timeZoneOffset"
+"timestamp"
+"timestampDiff"
+"timestamp_diff"
+"timezone"
+"timezoneOf"
+"timezoneOffset"
+"toBool"
+"toColumnTypeName"
+"toDate"
+"toDate32"
+"toDate32OrDefault"
+"toDate32OrNull"
+"toDate32OrZero"
+"toDateOrDefault"
+"toDateOrNull"
+"toDateOrZero"
+"toDateTime"
+"toDateTime32"
+"toDateTime64"
+"toDateTime64OrDefault"
+"toDateTime64OrNull"
+"toDateTime64OrZero"
+"toDateTimeOrDefault"
+"toDateTimeOrNull"
+"toDateTimeOrZero"
+"toDayOfMonth"
+"toDayOfWeek"
+"toDayOfYear"
+"toDaysSinceYearZero"
+"toDecimal128"
+"toDecimal128OrDefault"
+"toDecimal128OrNull"
+"toDecimal128OrZero"
+"toDecimal256"
+"toDecimal256OrDefault"
+"toDecimal256OrNull"
+"toDecimal256OrZero"
+"toDecimal32"
+"toDecimal32OrDefault"
+"toDecimal32OrNull"
+"toDecimal32OrZero"
+"toDecimal64"
+"toDecimal64OrDefault"
+"toDecimal64OrNull"
+"toDecimal64OrZero"
+"toDecimalString"
+"toFixedString"
+"toFloat32"
+"toFloat32OrDefault"
+"toFloat32OrNull"
+"toFloat32OrZero"
+"toFloat64"
+"toFloat64OrDefault"
+"toFloat64OrNull"
+"toFloat64OrZero"
+"toHour"
+"toIPv4"
+"toIPv4OrDefault"
+"toIPv4OrNull"
+"toIPv4OrZero"
+"toIPv6"
+"toIPv6OrDefault"
+"toIPv6OrNull"
+"toIPv6OrZero"
+"toISOWeek"
+"toISOYear"
+"toInt128"
+"toInt128OrDefault"
+"toInt128OrNull"
+"toInt128OrZero"
+"toInt16"
+"toInt16OrDefault"
+"toInt16OrNull"
+"toInt16OrZero"
+"toInt256"
+"toInt256OrDefault"
+"toInt256OrNull"
+"toInt256OrZero"
+"toInt32"
+"toInt32OrDefault"
+"toInt32OrNull"
+"toInt32OrZero"
+"toInt64"
+"toInt64OrDefault"
+"toInt64OrNull"
+"toInt64OrZero"
+"toInt8"
+"toInt8OrDefault"
+"toInt8OrNull"
+"toInt8OrZero"
+"toIntervalDay"
+"toIntervalHour"
+"toIntervalMicrosecond"
+"toIntervalMillisecond"
+"toIntervalMinute"
+"toIntervalMonth"
+"toIntervalNanosecond"
+"toIntervalQuarter"
+"toIntervalSecond"
+"toIntervalWeek"
+"toIntervalYear"
+"toJSONString"
+"toLastDayOfMonth"
+"toLastDayOfWeek"
+"toLowCardinality"
+"toMillisecond"
+"toMinute"
+"toModifiedJulianDay"
+"toModifiedJulianDayOrNull"
+"toMonday"
+"toMonth"
+"toNullable"
+"toQuarter"
+"toRelativeDayNum"
+"toRelativeHourNum"
+"toRelativeMinuteNum"
+"toRelativeMonthNum"
+"toRelativeQuarterNum"
+"toRelativeSecondNum"
+"toRelativeWeekNum"
+"toRelativeYearNum"
+"toSecond"
+"toStartOfDay"
+"toStartOfFifteenMinutes"
+"toStartOfFiveMinute"
+"toStartOfFiveMinutes"
+"toStartOfHour"
+"toStartOfISOYear"
+"toStartOfInterval"
+"toStartOfMicrosecond"
+"toStartOfMillisecond"
+"toStartOfMinute"
+"toStartOfMonth"
+"toStartOfNanosecond"
+"toStartOfQuarter"
+"toStartOfSecond"
+"toStartOfTenMinutes"
+"toStartOfWeek"
+"toStartOfYear"
+"toString"
+"toStringCutToZero"
+"toTime"
+"toTimeZone"
+"toTimezone"
+"toTypeName"
+"toUInt128"
+"toUInt128OrDefault"
+"toUInt128OrNull"
+"toUInt128OrZero"
+"toUInt16"
+"toUInt16OrDefault"
+"toUInt16OrNull"
+"toUInt16OrZero"
+"toUInt256"
+"toUInt256OrDefault"
+"toUInt256OrNull"
+"toUInt256OrZero"
+"toUInt32"
+"toUInt32OrDefault"
+"toUInt32OrNull"
+"toUInt32OrZero"
+"toUInt64"
+"toUInt64OrDefault"
+"toUInt64OrNull"
+"toUInt64OrZero"
+"toUInt8"
+"toUInt8OrDefault"
+"toUInt8OrNull"
+"toUInt8OrZero"
+"toUTCTimestamp"
+"toUUID"
+"toUUIDOrDefault"
+"toUUIDOrNull"
+"toUUIDOrZero"
+"toUnixTimestamp"
+"toUnixTimestamp64Micro"
+"toUnixTimestamp64Milli"
+"toUnixTimestamp64Nano"
+"toValidUTF8"
+"toWeek"
+"toYYYYMM"
+"toYYYYMMDD"
+"toYYYYMMDDhhmmss"
+"toYear"
+"toYearWeek"
+"to_utc_timestamp"
+"today"
+"tokens"
+"topK"
+"topKArgMax"
+"topKArgMin"
+"topKArray"
+"topKDistinct"
+"topKForEach"
+"topKIf"
+"topKMap"
+"topKMerge"
+"topKNull"
+"topKOrDefault"
+"topKOrNull"
+"topKResample"
+"topKSimpleState"
+"topKState"
+"topKWeighted"
+"topKWeightedArgMax"
+"topKWeightedArgMin"
+"topKWeightedArray"
+"topKWeightedDistinct"
+"topKWeightedForEach"
+"topKWeightedIf"
+"topKWeightedMap"
+"topKWeightedMerge"
+"topKWeightedNull"
+"topKWeightedOrDefault"
+"topKWeightedOrNull"
+"topKWeightedResample"
+"topKWeightedSimpleState"
+"topKWeightedState"
+"topLevelDomain"
+"topLevelDomainRFC"
+"transactionID"
+"transactionLatestSnapshot"
+"transactionOldestSnapshot"
+"transform"
+"translate"
+"translateUTF8"
+"trim"
+"trimBoth"
+"trimLeft"
+"trimRight"
+"trunc"
+"truncate"
+"tryBase58Decode"
+"tryBase64Decode"
+"tryDecrypt"
+"tryIdnaEncode"
+"tryPunycodeDecode"
+"tumble"
+"tumbleEnd"
+"tumbleStart"
+"tuple"
+"tupleConcat"
+"tupleDivide"
+"tupleDivideByNumber"
+"tupleElement"
+"tupleHammingDistance"
+"tupleIntDiv"
+"tupleIntDivByNumber"
+"tupleIntDivOrZero"
+"tupleIntDivOrZeroByNumber"
+"tupleMinus"
+"tupleModulo"
+"tupleModuloByNumber"
+"tupleMultiply"
+"tupleMultiplyByNumber"
+"tupleNegate"
+"tuplePlus"
+"tupleToNameValuePairs"
+"ucase"
+"unbin"
+"unhex"
+"uniq"
+"uniqArgMax"
+"uniqArgMin"
+"uniqArray"
+"uniqCombined"
+"uniqCombined64"
+"uniqCombined64ArgMax"
+"uniqCombined64ArgMin"
+"uniqCombined64Array"
+"uniqCombined64Distinct"
+"uniqCombined64ForEach"
+"uniqCombined64If"
+"uniqCombined64Map"
+"uniqCombined64Merge"
+"uniqCombined64Null"
+"uniqCombined64OrDefault"
+"uniqCombined64OrNull"
+"uniqCombined64Resample"
+"uniqCombined64SimpleState"
+"uniqCombined64State"
+"uniqCombinedArgMax"
+"uniqCombinedArgMin"
+"uniqCombinedArray"
+"uniqCombinedDistinct"
+"uniqCombinedForEach"
+"uniqCombinedIf"
+"uniqCombinedMap"
+"uniqCombinedMerge"
+"uniqCombinedNull"
+"uniqCombinedOrDefault"
+"uniqCombinedOrNull"
+"uniqCombinedResample"
+"uniqCombinedSimpleState"
+"uniqCombinedState"
+"uniqDistinct"
+"uniqExact"
+"uniqExactArgMax"
+"uniqExactArgMin"
+"uniqExactArray"
+"uniqExactDistinct"
+"uniqExactForEach"
+"uniqExactIf"
+"uniqExactMap"
+"uniqExactMerge"
+"uniqExactNull"
+"uniqExactOrDefault"
+"uniqExactOrNull"
+"uniqExactResample"
+"uniqExactSimpleState"
+"uniqExactState"
+"uniqForEach"
+"uniqHLL12"
+"uniqHLL12ArgMax"
+"uniqHLL12ArgMin"
+"uniqHLL12Array"
+"uniqHLL12Distinct"
+"uniqHLL12ForEach"
+"uniqHLL12If"
+"uniqHLL12Map"
+"uniqHLL12Merge"
+"uniqHLL12Null"
+"uniqHLL12OrDefault"
+"uniqHLL12OrNull"
+"uniqHLL12Resample"
+"uniqHLL12SimpleState"
+"uniqHLL12State"
+"uniqIf"
+"uniqMap"
+"uniqMerge"
+"uniqNull"
+"uniqOrDefault"
+"uniqOrNull"
+"uniqResample"
+"uniqSimpleState"
+"uniqState"
+"uniqTheta"
+"uniqThetaArgMax"
+"uniqThetaArgMin"
+"uniqThetaArray"
+"uniqThetaDistinct"
+"uniqThetaForEach"
+"uniqThetaIf"
+"uniqThetaIntersect"
+"uniqThetaMap"
+"uniqThetaMerge"
+"uniqThetaNot"
+"uniqThetaNull"
+"uniqThetaOrDefault"
+"uniqThetaOrNull"
+"uniqThetaResample"
+"uniqThetaSimpleState"
+"uniqThetaState"
+"uniqThetaUnion"
+"uniqUpTo"
+"uniqUpToArgMax"
+"uniqUpToArgMin"
+"uniqUpToArray"
+"uniqUpToDistinct"
+"uniqUpToForEach"
+"uniqUpToIf"
+"uniqUpToMap"
+"uniqUpToMerge"
+"uniqUpToNull"
+"uniqUpToOrDefault"
+"uniqUpToOrNull"
+"uniqUpToResample"
+"uniqUpToSimpleState"
+"uniqUpToState"
+"upper"
+"upperUTF8"
+"uptime"
+"user"
+"validateNestedArraySizes"
+"varPop"
+"varPopArgMax"
+"varPopArgMin"
+"varPopArray"
+"varPopDistinct"
+"varPopForEach"
+"varPopIf"
+"varPopMap"
+"varPopMerge"
+"varPopNull"
+"varPopOrDefault"
+"varPopOrNull"
+"varPopResample"
+"varPopSimpleState"
+"varPopStable"
+"varPopStableArgMax"
+"varPopStableArgMin"
+"varPopStableArray"
+"varPopStableDistinct"
+"varPopStableForEach"
+"varPopStableIf"
+"varPopStableMap"
+"varPopStableMerge"
+"varPopStableNull"
+"varPopStableOrDefault"
+"varPopStableOrNull"
+"varPopStableResample"
+"varPopStableSimpleState"
+"varPopStableState"
+"varPopState"
+"varSamp"
+"varSampArgMax"
+"varSampArgMin"
+"varSampArray"
+"varSampDistinct"
+"varSampForEach"
+"varSampIf"
+"varSampMap"
+"varSampMerge"
+"varSampNull"
+"varSampOrDefault"
+"varSampOrNull"
+"varSampResample"
+"varSampSimpleState"
+"varSampStable"
+"varSampStableArgMax"
+"varSampStableArgMin"
+"varSampStableArray"
+"varSampStableDistinct"
+"varSampStableForEach"
+"varSampStableIf"
+"varSampStableMap"
+"varSampStableMerge"
+"varSampStableNull"
+"varSampStableOrDefault"
+"varSampStableOrNull"
+"varSampStableResample"
+"varSampStableSimpleState"
+"varSampStableState"
+"varSampState"
+"variantElement"
+"variantType"
+"vectorDifference"
+"vectorSum"
+"version"
+"visibleWidth"
+"visitParamExtractBool"
+"visitParamExtractFloat"
+"visitParamExtractInt"
+"visitParamExtractRaw"
+"visitParamExtractString"
+"visitParamExtractUInt"
+"visitParamHas"
+"week"
+"welchTTest"
+"welchTTestArgMax"
+"welchTTestArgMin"
+"welchTTestArray"
+"welchTTestDistinct"
+"welchTTestForEach"
+"welchTTestIf"
+"welchTTestMap"
+"welchTTestMerge"
+"welchTTestNull"
+"welchTTestOrDefault"
+"welchTTestOrNull"
+"welchTTestResample"
+"welchTTestSimpleState"
+"welchTTestState"
+"widthBucket"
+"width_bucket"
+"windowFunnel"
+"windowFunnelArgMax"
+"windowFunnelArgMin"
+"windowFunnelArray"
+"windowFunnelDistinct"
+"windowFunnelForEach"
+"windowFunnelIf"
+"windowFunnelMap"
+"windowFunnelMerge"
+"windowFunnelNull"
+"windowFunnelOrDefault"
+"windowFunnelOrNull"
+"windowFunnelResample"
+"windowFunnelSimpleState"
+"windowFunnelState"
+"windowID"
+"wkt"
+"wordShingleMinHash"
+"wordShingleMinHashArg"
+"wordShingleMinHashArgCaseInsensitive"
+"wordShingleMinHashArgCaseInsensitiveUTF8"
+"wordShingleMinHashArgUTF8"
+"wordShingleMinHashCaseInsensitive"
+"wordShingleMinHashCaseInsensitiveUTF8"
+"wordShingleMinHashUTF8"
+"wordShingleSimHash"
+"wordShingleSimHashCaseInsensitive"
+"wordShingleSimHashCaseInsensitiveUTF8"
+"wordShingleSimHashUTF8"
+"wyHash64"
+"xor"
+"xxHash32"
+"xxHash64"
+"xxh3"
+"yandexConsistentHash"
+"yearweek"
+"yesterday"
+"zookeeperSessionUptime"
diff --git a/tests/fuzz/dictionaries/key_words.dict b/tests/fuzz/dictionaries/key_words.dict
index 0db2d159759..db517a2382c 100644
--- a/tests/fuzz/dictionaries/key_words.dict
+++ b/tests/fuzz/dictionaries/key_words.dict
@@ -1,183 +1,543 @@
-# Key words (based on keywords from antlr parser)
-
 "ADD"
+"ADD COLUMN"
+"ADD CONSTRAINT"
+"ADD INDEX"
+"ADD PROJECTION"
+"ADD STATISTIC"
+"ADMIN OPTION FOR"
 "AFTER"
+"ALGORITHM"
 "ALIAS"
 "ALL"
+"ALLOWED_LATENESS"
 "ALTER"
+"ALTER COLUMN"
+"ALTER DATABASE"
+"ALTER LIVE VIEW"
+"ALTER POLICY"
+"ALTER PROFILE"
+"ALTER QUOTA"
+"ALTER ROLE"
+"ALTER ROW POLICY"
+"ALTER SETTINGS PROFILE"
+"ALTER TABLE"
+"ALTER TEMPORARY TABLE"
+"ALTER USER"
 "AND"
+"AND STDOUT"
 "ANTI"
 "ANY"
-"ARRAY"
+"APPEND"
+"APPLY"
+"APPLY DELETED MASK"
+"ARRAY JOIN"
 "AS"
+"ASC"
 "ASCENDING"
 "ASOF"
+"ASSUME"
 "AST"
 "ASYNC"
 "ATTACH"
+"ATTACH PART"
+"ATTACH PARTITION"
+"ATTACH POLICY"
+"ATTACH PROFILE"
+"ATTACH QUOTA"
+"ATTACH ROLE"
+"ATTACH ROW POLICY"
+"ATTACH SETTINGS PROFILE"
+"ATTACH USER"
+"AUTO_INCREMENT"
+"AZURE"
+"BACKUP"
+"BCRYPT_HASH"
+"BCRYPT_PASSWORD"
+"BEGIN TRANSACTION"
 "BETWEEN"
+"BIDIRECTIONAL"
 "BOTH"
 "BY"
+"CASCADE"
 "CASE"
 "CAST"
+"CHANGE"
+"CHANGEABLE_IN_READONLY"
+"CHANGED"
+"CHAR"
+"CHAR VARYING"
+"CHARACTER"
+"CHARACTER LARGE OBJECT"
+"CHARACTER VARYING"
 "CHECK"
-"CLEAR"
+"CHECK ALL TABLES"
+"CHECK TABLE"
+"CLEANUP"
+"CLEAR COLUMN"
+"CLEAR INDEX"
+"CLEAR PROJECTION"
+"CLEAR STATISTIC"
 "CLUSTER"
+"CLUSTERS"
+"CN"
 "CODEC"
 "COLLATE"
 "COLUMN"
+"COLUMNS"
 "COMMENT"
+"COMMENT COLUMN"
+"COMMIT"
+"COMPRESSION"
+"CONST"
 "CONSTRAINT"
 "CREATE"
+"CREATE POLICY"
+"CREATE PROFILE"
+"CREATE QUOTA"
+"CREATE ROLE"
+"CREATE ROW POLICY"
+"CREATE SETTINGS PROFILE"
+"CREATE TABLE"
+"CREATE TEMPORARY TABLE"
+"CREATE USER"
 "CROSS"
 "CUBE"
+"CURRENT GRANTS"
+"CURRENT QUOTA"
+"CURRENT ROLES"
+"CURRENT ROW"
+"CURRENT TRANSACTION"
+"CURRENTUSER"
+"CURRENT_USER"
+"D"
 "DATABASE"
 "DATABASES"
 "DATE"
 "DAY"
+"DAYS"
+"DD"
 "DEDUPLICATE"
 "DEFAULT"
-"DELAY"
+"DEFAULT DATABASE"
+"DEFAULT ROLE"
+"DEFINER"
 "DELETE"
+"DEPENDS ON"
 "DESC"
 "DESCENDING"
 "DESCRIBE"
 "DETACH"
+"DETACH PART"
+"DETACH PARTITION"
 "DICTIONARIES"
 "DICTIONARY"
 "DISK"
 "DISTINCT"
-"DISTRIBUTED"
+"DISTINCT ON"
+"DIV"
+"DOUBLE_SHA1_HASH"
+"DOUBLE_SHA1_PASSWORD"
 "DROP"
+"DROP COLUMN"
+"DROP CONSTRAINT"
+"DROP DEFAULT"
+"DROP DETACHED PART"
+"DROP DETACHED PARTITION"
+"DROP INDEX"
+"DROP PART"
+"DROP PARTITION"
+"DROP PROJECTION"
+"DROP STATISTIC"
+"DROP TABLE"
+"DROP TEMPORARY TABLE"
 "ELSE"
+"EMPTY"
+"EMPTY AS"
+"ENABLED ROLES"
 "END"
+"ENFORCED"
 "ENGINE"
+"EPHEMERAL"
+"EPHEMERAL SEQUENTIAL"
+"ESTIMATE"
+"EVENT"
 "EVENTS"
+"EVERY"
+"EXCEPT"
+"EXCEPT DATABASE"
+"EXCEPT DATABASES"
+"EXCEPT TABLE"
+"EXCEPT TABLES"
+"EXCHANGE DICTIONARIES"
+"EXCHANGE TABLES"
 "EXISTS"
 "EXPLAIN"
 "EXPRESSION"
-"EXTRACT"
-"FETCHES"
+"EXTENDED"
+"EXTERNAL DDL FROM"
+"FALSE"
+"FETCH"
+"FETCH PART"
+"FETCH PARTITION"
+"FIELDS"
+"FILE"
+"FILESYSTEM CACHE"
+"FILESYSTEM CACHES"
+"FILTER"
 "FINAL"
 "FIRST"
-"FLUSH"
+"FOLLOWING"
 "FOR"
+"FOREIGN"
+"FOREIGN KEY"
+"FORGET PARTITION"
 "FORMAT"
 "FREEZE"
 "FROM"
+"FROM INFILE"
+"FROM SHARD"
 "FULL"
+"FULLTEXT"
 "FUNCTION"
 "GLOBAL"
+"GLOBAL IN"
+"GLOBAL NOT IN"
+"GRANT"
+"GRANT OPTION FOR"
+"GRANTEES"
 "GRANULARITY"
-"GROUP"
+"GROUP BY"
+"GROUPING SETS"
+"GROUPS"
+"H"
+"HASH"
 "HAVING"
+"HDFS"
+"HH"
 "HIERARCHICAL"
+"HOST"
 "HOUR"
+"HOURS"
+"HTTP"
 "ID"
-"IF"
+"IDENTIFIED"
+"IF EMPTY"
+"IF EXISTS"
+"IF NOT EXISTS"
+"IGNORE NULLS"
 "ILIKE"
 "IN"
+"IN PARTITION"
 "INDEX"
-"INF"
+"INDEXES"
+"INDICES"
+"INHERIT"
 "INJECTIVE"
 "INNER"
-"INSERT"
+"INSERT INTO"
+"INTERPOLATE"
+"INTERSECT"
 "INTERVAL"
-"INTO"
-"IS"
+"INTO OUTFILE"
+"INVISIBLE"
+"INVOKER"
+"IP"
+"IS NOT DISTINCT FROM"
+"IS NOT NULL"
+"IS NULL"
 "IS_OBJECT_ID"
 "JOIN"
+"KERBEROS"
 "KEY"
+"KEY BY"
+"KEYED BY"
+"KEYS"
 "KILL"
+"KIND"
+"LARGE OBJECT"
 "LAST"
 "LAYOUT"
+"LDAP"
 "LEADING"
 "LEFT"
+"LEFT ARRAY JOIN"
+"LESS THAN"
+"LEVEL"
 "LIFETIME"
+"LIGHTWEIGHT"
 "LIKE"
 "LIMIT"
+"LINEAR"
+"LIST"
 "LIVE"
 "LOCAL"
-"LOGS"
+"M"
+"MATCH"
 "MATERIALIZE"
+"MATERIALIZE COLUMN"
+"MATERIALIZE INDEX"
+"MATERIALIZE PROJECTION"
+"MATERIALIZE STATISTIC"
+"MATERIALIZE TTL"
 "MATERIALIZED"
 "MAX"
+"MCS"
+"MEMORY"
 "MERGES"
+"MI"
+"MICROSECOND"
+"MICROSECONDS"
+"MILLISECOND"
+"MILLISECONDS"
 "MIN"
 "MINUTE"
+"MINUTES"
+"MM"
+"MOD"
 "MODIFY"
+"MODIFY COLUMN"
+"MODIFY COMMENT"
+"MODIFY ORDER BY"
+"MODIFY QUERY"
+"MODIFY REFRESH"
+"MODIFY SAMPLE BY"
+"MODIFY SETTING"
+"MODIFY SQL SECURITY"
+"MODIFY TTL"
 "MONTH"
+"MONTHS"
 "MOVE"
+"MOVE PART"
+"MOVE PARTITION"
+"MS"
 "MUTATION"
-"NAN_SQL"
-"NO"
+"N"
+"NAME"
+"NAMED COLLECTION"
+"NANOSECOND"
+"NANOSECONDS"
+"NEXT"
+"NO ACTION"
+"NO DELAY"
+"NO LIMITS"
+"NONE"
 "NOT"
-"NULL_SQL"
+"NOT BETWEEN"
+"NOT IDENTIFIED"
+"NOT ILIKE"
+"NOT IN"
+"NOT KEYED"
+"NOT LIKE"
+"NOT OVERRIDABLE"
+"NO_PASSWORD"
+"NS"
+"NULL"
 "NULLS"
 "OFFSET"
 "ON"
-"OPTIMIZE"
+"ON DELETE"
+"ON UPDATE"
+"ON VOLUME"
+"ONLY"
+"OPTIMIZE TABLE"
 "OR"
-"ORDER"
+"OR REPLACE"
+"ORDER BY"
 "OUTER"
-"OUTFILE"
+"OVER"
+"OVERRIDABLE"
+"PART"
+"PARTIAL"
 "PARTITION"
+"PARTITION BY"
+"PARTITIONS"
+"PART_MOVE_TO_SHARD"
+"PASTE"
+"PERIODIC REFRESH"
+"PERMANENTLY"
+"PERMISSIVE"
+"PERSISTENT"
+"PERSISTENT SEQUENTIAL"
+"PIPELINE"
+"PLAINTEXT_PASSWORD"
+"PLAN"
 "POPULATE"
+"PRECEDING"
+"PRECISION"
 "PREWHERE"
 "PRIMARY"
+"PRIMARY KEY"
+"PROFILE"
 "PROJECTION"
+"PULL"
+"Protobuf"
+"Q"
+"QQ"
 "QUARTER"
+"QUARTERS"
+"QUERY"
+"QUERY TREE"
+"QUOTA"
+"RANDOMIZE FOR"
+"RANDOMIZED"
 "RANGE"
-"RELOAD"
+"READONLY"
+"REALM"
+"RECOMPRESS"
+"REFERENCES"
+"REFRESH"
+"REGEXP"
 "REMOVE"
+"REMOVE SAMPLE BY"
+"REMOVE TTL"
 "RENAME"
+"RENAME COLUMN"
+"RENAME DATABASE"
+"RENAME DICTIONARY"
+"RENAME TABLE"
+"RENAME TO"
 "REPLACE"
-"REPLICA"
-"REPLICATED"
+"REPLACE PARTITION"
+"RESET SETTING"
+"RESPECT NULLS"
+"RESTORE"
+"RESTRICT"
+"RESTRICTIVE"
+"RESUME"
+"REVOKE"
 "RIGHT"
+"ROLLBACK"
 "ROLLUP"
+"ROW"
+"ROWS"
+"S"
+"S3"
+"SALT"
 "SAMPLE"
+"SAMPLE BY"
+"SCHEME"
 "SECOND"
+"SECONDS"
 "SELECT"
 "SEMI"
-"SENDS"
+"SERVER"
 "SET"
+"SET DEFAULT"
+"SET DEFAULT ROLE"
+"SET FAKE TIME"
+"SET NULL"
+"SET ROLE"
+"SET ROLE DEFAULT"
+"SET TRANSACTION SNAPSHOT"
 "SETTINGS"
+"SHA256_HASH"
+"SHA256_PASSWORD"
 "SHOW"
+"SHOW ACCESS"
+"SHOW CREATE"
+"SHOW ENGINES"
+"SHOW FUNCTIONS"
+"SHOW GRANTS"
+"SHOW PRIVILEGES"
+"SHOW PROCESSLIST"
+"SHOW SETTING"
+"SIGNED"
+"SIMPLE"
 "SOURCE"
-"START"
-"STOP"
-"SUBSTRING"
+"SPATIAL"
+"SQL SECURITY"
+"SQL_TSI_DAY"
+"SQL_TSI_HOUR"
+"SQL_TSI_MICROSECOND"
+"SQL_TSI_MILLISECOND"
+"SQL_TSI_MINUTE"
+"SQL_TSI_MONTH"
+"SQL_TSI_NANOSECOND"
+"SQL_TSI_QUARTER"
+"SQL_TSI_SECOND"
+"SQL_TSI_WEEK"
+"SQL_TSI_YEAR"
+"SS"
+"SSH_KEY"
+"SSL_CERTIFICATE"
+"STATISTIC"
+"STEP"
+"STORAGE"
+"STRICT"
+"STRICTLY_ASCENDING"
+"SUBPARTITION"
+"SUBPARTITION BY"
+"SUBPARTITIONS"
+"SUSPEND"
 "SYNC"
 "SYNTAX"
 "SYSTEM"
 "TABLE"
+"TABLE OVERRIDE"
 "TABLES"
 "TEMPORARY"
+"TEMPORARY TABLE"
 "TEST"
 "THEN"
-"TIES"
-"TIMEOUT"
 "TIMESTAMP"
 "TO"
+"TO DISK"
+"TO INNER UUID"
+"TO SHARD"
+"TO TABLE"
+"TO VOLUME"
 "TOP"
 "TOTALS"
+"TRACKING ONLY"
 "TRAILING"
-"TRIM"
+"TRANSACTION"
+"TRIGGER"
+"TRUE"
 "TRUNCATE"
 "TTL"
 "TYPE"
+"TYPEOF"
+"UNBOUNDED"
+"UNDROP"
+"UNFREEZE"
 "UNION"
+"UNIQUE"
+"UNSET FAKE TIME"
+"UNSIGNED"
 "UPDATE"
+"URL"
 "USE"
 "USING"
 "UUID"
+"VALID UNTIL"
 "VALUES"
+"VARYING"
 "VIEW"
-"VOLUME"
+"VISIBLE"
 "WATCH"
+"WATERMARK"
 "WEEK"
+"WEEKS"
 "WHEN"
 "WHERE"
+"WINDOW"
 "WITH"
+"WITH ADMIN OPTION"
+"WITH CHECK"
+"WITH FILL"
+"WITH GRANT OPTION"
+"WITH NAME"
+"WITH REPLACE OPTION"
+"WITH TIES"
+"WK"
+"WRITABLE"
+"WW"
 "YEAR"
+"YEARS"
+"YY"
+"YYYY"
+"ZKPATH"
+"bagexpansion"
+"base_backup"
+"cluster_host_ids"
+"with_itemindex"
diff --git a/tests/integration/README.md b/tests/integration/README.md
index e7ba37bfb56..cde4cb05aec 100644
--- a/tests/integration/README.md
+++ b/tests/integration/README.md
@@ -19,7 +19,6 @@ Don't use Docker from your system repository.
 ```
 sudo -H pip install \
     PyMySQL \
-    aerospike \
     avro \
     cassandra-driver \
     confluent-kafka \
@@ -67,7 +66,6 @@ set the following environment variables:
 
 Please note that if you use separate build (`ENABLE_CLICKHOUSE_ALL=OFF`), you need to build different components, including but not limited to `ENABLE_CLICKHOUSE_LIBRARY_BRIDGE=ON ENABLE_CLICKHOUSE_ODBC_BRIDGE=ON ENABLE_CLICKHOUSE_KEEPER=ON`. So it is easier to use `ENABLE_CLICKHOUSE_ALL=ON`
 
-For tests that use common docker compose files you may need to set up their path with environment variable: `DOCKER_COMPOSE_DIR=$HOME/ClickHouse/docker/test/integration/runner/compose`
 
 ### Running with runner script
 
@@ -77,7 +75,7 @@ docker pull clickhouse/integration-tests-runner
 Notes:
 * If you want to run integration tests without `sudo` you have to add your user to docker group `sudo usermod -aG docker $USER`. [More information](https://docs.docker.com/install/linux/linux-postinstall/) about docker configuration.
 * If you already had run these tests without `./runner` script you may have problems with pytest cache. It can be removed with `rm -r __pycache__ .pytest_cache/`.
-* Some tests maybe require a lot of resources (CPU, RAM, etc.). Better not try large tests like `test_cluster_copier` or `test_distributed_ddl*` on your laptop.
+* Some tests maybe require a lot of resources (CPU, RAM, etc.). Better not try large tests like `test_distributed_ddl*` on your laptop.
 
 You can run tests via `./runner` script and pass pytest arguments as last arg:
 ```
diff --git a/docker/test/integration/runner/compose/docker_compose_azurite.yml b/tests/integration/compose/docker_compose_azurite.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_azurite.yml
rename to tests/integration/compose/docker_compose_azurite.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_cassandra.yml b/tests/integration/compose/docker_compose_cassandra.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_cassandra.yml
rename to tests/integration/compose/docker_compose_cassandra.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_clickhouse.yml b/tests/integration/compose/docker_compose_clickhouse.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_clickhouse.yml
rename to tests/integration/compose/docker_compose_clickhouse.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_coredns.yml b/tests/integration/compose/docker_compose_coredns.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_coredns.yml
rename to tests/integration/compose/docker_compose_coredns.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_dotnet_client.yml b/tests/integration/compose/docker_compose_dotnet_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_dotnet_client.yml
rename to tests/integration/compose/docker_compose_dotnet_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_hdfs.yml b/tests/integration/compose/docker_compose_hdfs.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_hdfs.yml
rename to tests/integration/compose/docker_compose_hdfs.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_hive.yml b/tests/integration/compose/docker_compose_hive.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_hive.yml
rename to tests/integration/compose/docker_compose_hive.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml b/tests/integration/compose/docker_compose_jdbc_bridge.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_jdbc_bridge.yml
rename to tests/integration/compose/docker_compose_jdbc_bridge.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_kafka.yml b/tests/integration/compose/docker_compose_kafka.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_kafka.yml
rename to tests/integration/compose/docker_compose_kafka.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_keeper.yml b/tests/integration/compose/docker_compose_keeper.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_keeper.yml
rename to tests/integration/compose/docker_compose_keeper.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml b/tests/integration/compose/docker_compose_kerberized_hdfs.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_kerberized_hdfs.yml
rename to tests/integration/compose/docker_compose_kerberized_hdfs.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml b/tests/integration/compose/docker_compose_kerberized_kafka.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_kerberized_kafka.yml
rename to tests/integration/compose/docker_compose_kerberized_kafka.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_kerberos_kdc.yml b/tests/integration/compose/docker_compose_kerberos_kdc.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_kerberos_kdc.yml
rename to tests/integration/compose/docker_compose_kerberos_kdc.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_ldap.yml b/tests/integration/compose/docker_compose_ldap.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_ldap.yml
rename to tests/integration/compose/docker_compose_ldap.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_minio.yml b/tests/integration/compose/docker_compose_minio.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_minio.yml
rename to tests/integration/compose/docker_compose_minio.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mongo.yml b/tests/integration/compose/docker_compose_mongo.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mongo.yml
rename to tests/integration/compose/docker_compose_mongo.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mongo_secure.yml b/tests/integration/compose/docker_compose_mongo_secure.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mongo_secure.yml
rename to tests/integration/compose/docker_compose_mongo_secure.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql.yml b/tests/integration/compose/docker_compose_mysql.yml
similarity index 95%
rename from docker/test/integration/runner/compose/docker_compose_mysql.yml
rename to tests/integration/compose/docker_compose_mysql.yml
index 103fe2769e9..69f7f02fb4d 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql.yml
+++ b/tests/integration/compose/docker_compose_mysql.yml
@@ -22,3 +22,4 @@ services:
             - type: ${MYSQL_LOGS_FS:-tmpfs}
               source: ${MYSQL_LOGS:-}
               target: /mysql/
+        user: ${MYSQL_DOCKER_USER}
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_8_0.yml b/tests/integration/compose/docker_compose_mysql_8_0.yml
similarity index 95%
rename from docker/test/integration/runner/compose/docker_compose_mysql_8_0.yml
rename to tests/integration/compose/docker_compose_mysql_8_0.yml
index 9c9c7430cec..1e0ded6c6bd 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_8_0.yml
+++ b/tests/integration/compose/docker_compose_mysql_8_0.yml
@@ -21,3 +21,4 @@ services:
             - type: ${MYSQL8_LOGS_FS:-tmpfs}
               source: ${MYSQL8_LOGS:-}
               target: /mysql/
+        user: ${MYSQL8_DOCKER_USER}
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_client.yml b/tests/integration/compose/docker_compose_mysql_client.yml
similarity index 93%
rename from docker/test/integration/runner/compose/docker_compose_mysql_client.yml
rename to tests/integration/compose/docker_compose_mysql_client.yml
index 5b37b6e6c09..ee590118d4f 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_client.yml
+++ b/tests/integration/compose/docker_compose_mysql_client.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
   mysql_client:
-    image: mysql:5.7
+    image: mysql:8.0
     restart: always
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: 1
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml b/tests/integration/compose/docker_compose_mysql_cluster.yml
similarity index 91%
rename from docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
rename to tests/integration/compose/docker_compose_mysql_cluster.yml
index 73f9e39f0d6..3f7d21b733f 100644
--- a/docker/test/integration/runner/compose/docker_compose_mysql_cluster.yml
+++ b/tests/integration/compose/docker_compose_mysql_cluster.yml
@@ -1,7 +1,7 @@
 version: '2.3'
 services:
     mysql2:
-        image: mysql:5.7
+        image: mysql:8.0
         restart: always
         environment:
             MYSQL_ROOT_PASSWORD: clickhouse
@@ -22,8 +22,9 @@ services:
             - type: ${MYSQL_CLUSTER_LOGS_FS:-tmpfs}
               source: ${MYSQL_CLUSTER_LOGS:-}
               target: /mysql/
+        user: ${MYSQL_CLUSTER_DOCKER_USER}
     mysql3:
-        image: mysql:5.7
+        image: mysql:8.0
         restart: always
         environment:
             MYSQL_ROOT_PASSWORD: clickhouse
@@ -44,8 +45,9 @@ services:
             - type: ${MYSQL_CLUSTER_LOGS_FS:-tmpfs}
               source: ${MYSQL_CLUSTER_LOGS:-}
               target: /mysql/
+        user: ${MYSQL_CLUSTER_DOCKER_USER}
     mysql4:
-        image: mysql:5.7
+        image: mysql:8.0
         restart: always
         environment:
             MYSQL_ROOT_PASSWORD: clickhouse
@@ -66,3 +68,4 @@ services:
             - type: ${MYSQL_CLUSTER_LOGS_FS:-tmpfs}
               source: ${MYSQL_CLUSTER_LOGS:-}
               target: /mysql/
+        user: ${MYSQL_CLUSTER_DOCKER_USER}
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml b/tests/integration/compose/docker_compose_mysql_golang_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mysql_golang_client.yml
rename to tests/integration/compose/docker_compose_mysql_golang_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml b/tests/integration/compose/docker_compose_mysql_java_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mysql_java_client.yml
rename to tests/integration/compose/docker_compose_mysql_java_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml b/tests/integration/compose/docker_compose_mysql_js_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mysql_js_client.yml
rename to tests/integration/compose/docker_compose_mysql_js_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml b/tests/integration/compose/docker_compose_mysql_php_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_mysql_php_client.yml
rename to tests/integration/compose/docker_compose_mysql_php_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_nats.yml b/tests/integration/compose/docker_compose_nats.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_nats.yml
rename to tests/integration/compose/docker_compose_nats.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_net.yml b/tests/integration/compose/docker_compose_net.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_net.yml
rename to tests/integration/compose/docker_compose_net.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_nginx.yml b/tests/integration/compose/docker_compose_nginx.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_nginx.yml
rename to tests/integration/compose/docker_compose_nginx.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_postgres.yml b/tests/integration/compose/docker_compose_postgres.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_postgres.yml
rename to tests/integration/compose/docker_compose_postgres.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml b/tests/integration/compose/docker_compose_postgres_cluster.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_postgres_cluster.yml
rename to tests/integration/compose/docker_compose_postgres_cluster.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_postgresql.yml b/tests/integration/compose/docker_compose_postgresql.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_postgresql.yml
rename to tests/integration/compose/docker_compose_postgresql.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml b/tests/integration/compose/docker_compose_postgresql_java_client.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_postgresql_java_client.yml
rename to tests/integration/compose/docker_compose_postgresql_java_client.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_rabbitmq.yml b/tests/integration/compose/docker_compose_rabbitmq.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_rabbitmq.yml
rename to tests/integration/compose/docker_compose_rabbitmq.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_redis.yml b/tests/integration/compose/docker_compose_redis.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_redis.yml
rename to tests/integration/compose/docker_compose_redis.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_zookeeper.yml b/tests/integration/compose/docker_compose_zookeeper.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_zookeeper.yml
rename to tests/integration/compose/docker_compose_zookeeper.yml
diff --git a/docker/test/integration/runner/compose/docker_compose_zookeeper_secure.yml b/tests/integration/compose/docker_compose_zookeeper_secure.yml
similarity index 100%
rename from docker/test/integration/runner/compose/docker_compose_zookeeper_secure.yml
rename to tests/integration/compose/docker_compose_zookeeper_secure.yml
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
index 6e76270c607..f4be31cc532 100644
--- a/tests/integration/conftest.py
+++ b/tests/integration/conftest.py
@@ -1,10 +1,11 @@
-from helpers.cluster import run_and_check
-import pytest
+#!/usr/bin/env python3
+
 import logging
 import os
-from helpers.test_tools import TSV
-from helpers.network import _NetworkManager
 
+import pytest  # pylint:disable=import-error; for style check
+from helpers.cluster import run_and_check
+from helpers.network import _NetworkManager
 
 # This is a workaround for a problem with logging in pytest [1].
 #
@@ -12,6 +13,34 @@ from helpers.network import _NetworkManager
 logging.raiseExceptions = False
 
 
+@pytest.fixture(scope="session", autouse=True)
+def pdb_history(request):
+    """
+    Fixture loads and saves pdb history to file, so it can be preserved between runs
+    """
+    if request.config.getoption("--pdb"):
+        import readline  # pylint:disable=import-outside-toplevel
+        import pdb  # pylint:disable=import-outside-toplevel
+
+        def save_history():
+            readline.write_history_file(".pdb_history")
+
+        def load_history():
+            try:
+                readline.read_history_file(".pdb_history")
+            except FileNotFoundError:
+                pass
+
+        load_history()
+        pdb.Pdb.use_rawinput = True
+
+        yield
+
+        save_history()
+    else:
+        yield
+
+
 @pytest.fixture(autouse=True, scope="session")
 def tune_local_port_range():
     # Lots of services uses non privileged ports:
@@ -32,32 +61,35 @@ def tune_local_port_range():
 def cleanup_environment():
     try:
         if int(os.environ.get("PYTEST_CLEANUP_CONTAINERS", 0)) == 1:
-            logging.debug(f"Cleaning all iptables rules")
+            logging.debug("Cleaning all iptables rules")
             _NetworkManager.clean_all_user_iptables_rules()
         result = run_and_check(["docker ps | wc -l"], shell=True)
         if int(result) > 1:
             if int(os.environ.get("PYTEST_CLEANUP_CONTAINERS", 0)) != 1:
                 logging.warning(
-                    f"Docker containters({int(result)}) are running before tests run. They can be left from previous pytest run and cause test failures.\n"
-                    "You can set env PYTEST_CLEANUP_CONTAINERS=1 or use runner with --cleanup-containers argument to enable automatic containers cleanup."
+                    "Docker containters(%s) are running before tests run. "
+                    "They can be left from previous pytest run and cause test failures.\n"
+                    "You can set env PYTEST_CLEANUP_CONTAINERS=1 or use runner with "
+                    "--cleanup-containers argument to enable automatic containers cleanup.",
+                    int(result),
                 )
             else:
                 logging.debug("Trying to kill unstopped containers...")
                 run_and_check(
-                    [f"docker kill $(docker container list  --all  --quiet)"],
+                    ["docker kill $(docker container list  --all  --quiet)"],
                     shell=True,
                     nothrow=True,
                 )
                 run_and_check(
-                    [f"docker rm $docker container list  --all  --quiet)"],
+                    ["docker rm $docker container list  --all  --quiet)"],
                     shell=True,
                     nothrow=True,
                 )
                 logging.debug("Unstopped containers killed")
                 r = run_and_check(["docker-compose", "ps", "--services", "--all"])
-                logging.debug(f"Docker ps before start:{r.stdout}")
+                logging.debug("Docker ps before start:%s", r.stdout)
         else:
-            logging.debug(f"No running containers")
+            logging.debug("No running containers")
 
         logging.debug("Pruning Docker networks")
         run_and_check(
@@ -66,8 +98,7 @@ def cleanup_environment():
             nothrow=True,
         )
     except Exception as e:
-        logging.exception(f"cleanup_environment:{str(e)}")
-        pass
+        logging.exception("cleanup_environment:%s", e)
 
     yield
 
diff --git a/tests/integration/helpers/0_common_enable_analyzer.xml b/tests/integration/helpers/0_common_enable_analyzer.xml
index aa374364ef0..4b9764526fa 100644
--- a/tests/integration/helpers/0_common_enable_analyzer.xml
+++ b/tests/integration/helpers/0_common_enable_analyzer.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <profiles>
         <default>
-            <allow_experimental_analyzer>1</allow_experimental_analyzer>
+            <allow_experimental_analyzer>0</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 535cf252274..1d97bcb7bcf 100644
--- a/tests/integration/helpers/0_common_instance_config.xml
+++ b/tests/integration/helpers/0_common_instance_config.xml
@@ -27,4 +27,9 @@
         <settings_constraints_replace_previous>true</settings_constraints_replace_previous>
         <role_cache_expiration_time_seconds>2</role_cache_expiration_time_seconds>
     </access_control_improvements>
+
+    <custom_cached_disks_base_directory replace="replace">/</custom_cached_disks_base_directory>
+
+    <!-- Remove the default remote server to avoid people depending on its hardcoded config -->
+    <remote_servers remove="remove"></remote_servers>
 </clickhouse>
diff --git a/tests/integration/helpers/cluster.py b/tests/integration/helpers/cluster.py
index c0b145b047a..1f29dfe8eee 100644
--- a/tests/integration/helpers/cluster.py
+++ b/tests/integration/helpers/cluster.py
@@ -1,8 +1,10 @@
 import base64
 import errno
+from functools import cache
 import http.client
 import logging
 import os
+import platform
 import stat
 import os.path as p
 import pprint
@@ -55,9 +57,7 @@ from .config_cluster import *
 
 HELPERS_DIR = p.dirname(__file__)
 CLICKHOUSE_ROOT_DIR = p.join(p.dirname(__file__), "../../..")
-LOCAL_DOCKER_COMPOSE_DIR = p.join(
-    CLICKHOUSE_ROOT_DIR, "docker/test/integration/runner/compose/"
-)
+LOCAL_DOCKER_COMPOSE_DIR = p.join(CLICKHOUSE_ROOT_DIR, "tests/integration/compose/")
 DEFAULT_ENV_NAME = ".env"
 
 SANITIZER_SIGN = "=================="
@@ -70,6 +70,11 @@ CLICKHOUSE_LOG_FILE = "/var/log/clickhouse-server/clickhouse-server.log"
 
 CLICKHOUSE_ERROR_LOG_FILE = "/var/log/clickhouse-server/clickhouse-server.err.log"
 
+# Minimum version we use in integration tests to check compatibility with old releases
+# Keep in mind that we only support upgrading between releases that are at most 1 year different.
+# This means that this minimum need to be, at least, 1 year older than the current release
+CLICKHOUSE_CI_MIN_TESTED_VERSION = "22.8"
+
 
 # to create docker-compose env file
 def _create_env_file(path, variables):
@@ -104,8 +109,8 @@ def run_and_check(
     res = subprocess.run(
         args, stdout=stdout, stderr=stderr, env=env, shell=shell, timeout=timeout
     )
-    out = res.stdout.decode("utf-8")
-    err = res.stderr.decode("utf-8")
+    out = res.stdout.decode("utf-8", "ignore")
+    err = res.stderr.decode("utf-8", "ignore")
     # check_call(...) from subprocess does not print stderr, so we do it manually
     for outline in out.splitlines():
         logging.debug(f"Stdout:{outline}")
@@ -181,17 +186,7 @@ def get_library_bridge_path():
 
 
 def get_docker_compose_path():
-    compose_path = os.environ.get("DOCKER_COMPOSE_DIR")
-    if compose_path is not None:
-        return os.path.dirname(compose_path)
-    else:
-        if os.path.exists(os.path.dirname("/compose/")):
-            return os.path.dirname("/compose/")  # default in docker runner container
-        else:
-            logging.debug(
-                f"Fallback docker_compose_path to LOCAL_DOCKER_COMPOSE_DIR: {LOCAL_DOCKER_COMPOSE_DIR}"
-            )
-            return LOCAL_DOCKER_COMPOSE_DIR
+    return LOCAL_DOCKER_COMPOSE_DIR
 
 
 def check_kafka_is_available(kafka_id, kafka_port):
@@ -465,7 +460,7 @@ class ClickHouseCluster:
         self.base_cmd += ["--project-name", self.project_name]
 
         self.base_zookeeper_cmd = None
-        self.base_mysql_cmd = []
+        self.base_mysql57_cmd = []
         self.base_kafka_cmd = []
         self.base_kerberized_kafka_cmd = []
         self.base_kerberos_kdc_cmd = []
@@ -479,7 +474,7 @@ class ClickHouseCluster:
         self.with_zookeeper = False
         self.with_zookeeper_secure = False
         self.with_mysql_client = False
-        self.with_mysql = False
+        self.with_mysql57 = False
         self.with_mysql8 = False
         self.with_mysql_cluster = False
         self.with_postgres = False
@@ -644,12 +639,19 @@ class ClickHouseCluster:
         self.mysql_client_host = "mysql_client"
         self.mysql_client_container = None
 
-        # available when with_mysql == True
-        self.mysql_host = "mysql57"
-        self.mysql_port = 3306
-        self.mysql_ip = None
-        self.mysql_dir = p.abspath(p.join(self.instances_dir, "mysql"))
-        self.mysql_logs_dir = os.path.join(self.mysql_dir, "logs")
+        # available when with_mysql57 == True
+        self.mysql57_host = "mysql57"
+        self.mysql57_port = 3306
+        self.mysql57_ip = None
+        self.mysql57_dir = p.abspath(p.join(self.instances_dir, "mysql"))
+        self.mysql57_logs_dir = os.path.join(self.mysql57_dir, "logs")
+
+        # available when with_mysql8 == True
+        self.mysql8_host = "mysql80"
+        self.mysql8_port = 3306
+        self.mysql8_ip = None
+        self.mysql8_dir = p.abspath(p.join(self.instances_dir, "mysql8"))
+        self.mysql8_logs_dir = os.path.join(self.mysql8_dir, "logs")
 
         # available when with_mysql_cluster == True
         self.mysql2_host = "mysql2"
@@ -659,14 +661,7 @@ class ClickHouseCluster:
         self.mysql3_ip = None
         self.mysql4_ip = None
         self.mysql_cluster_dir = p.abspath(p.join(self.instances_dir, "mysql"))
-        self.mysql_cluster_logs_dir = os.path.join(self.mysql_dir, "logs")
-
-        # available when with_mysql8 == True
-        self.mysql8_host = "mysql80"
-        self.mysql8_port = 3306
-        self.mysql8_ip = None
-        self.mysql8_dir = p.abspath(p.join(self.instances_dir, "mysql8"))
-        self.mysql8_logs_dir = os.path.join(self.mysql8_dir, "logs")
+        self.mysql_cluster_logs_dir = os.path.join(self.mysql8_dir, "logs")
 
         # available when with_zookeper_secure == True
         self.zookeeper_secure_port = 2281
@@ -867,12 +862,12 @@ class ClickHouseCluster:
 
     def get_docker_handle(self, docker_id):
         exception = None
-        for i in range(5):
+        for i in range(20):
             try:
                 return self.docker_client.containers.get(docker_id)
             except Exception as ex:
                 print("Got exception getting docker handle", str(ex))
-                time.sleep(i * 2)
+                time.sleep(0.5)
                 exception = ex
         raise exception
 
@@ -1045,17 +1040,19 @@ class ClickHouseCluster:
 
         return self.base_mysql_client_cmd
 
-    def setup_mysql_cmd(self, instance, env_variables, docker_compose_yml_dir):
-        self.with_mysql = True
-        env_variables["MYSQL_HOST"] = self.mysql_host
-        env_variables["MYSQL_PORT"] = str(self.mysql_port)
+    def setup_mysql57_cmd(self, instance, env_variables, docker_compose_yml_dir):
+        self.with_mysql57 = True
+        env_variables["MYSQL_HOST"] = self.mysql57_host
+        env_variables["MYSQL_PORT"] = str(self.mysql57_port)
         env_variables["MYSQL_ROOT_HOST"] = "%"
-        env_variables["MYSQL_LOGS"] = self.mysql_logs_dir
+        env_variables["MYSQL_LOGS"] = self.mysql57_logs_dir
         env_variables["MYSQL_LOGS_FS"] = "bind"
+        env_variables["MYSQL_DOCKER_USER"] = str(os.getuid())
+
         self.base_cmd.extend(
             ["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql.yml")]
         )
-        self.base_mysql_cmd = [
+        self.base_mysql57_cmd = [
             "docker-compose",
             "--env-file",
             instance.env_file,
@@ -1065,7 +1062,7 @@ class ClickHouseCluster:
             p.join(docker_compose_yml_dir, "docker_compose_mysql.yml"),
         ]
 
-        return self.base_mysql_cmd
+        return self.base_mysql57_cmd
 
     def setup_mysql8_cmd(self, instance, env_variables, docker_compose_yml_dir):
         self.with_mysql8 = True
@@ -1074,6 +1071,8 @@ class ClickHouseCluster:
         env_variables["MYSQL8_ROOT_HOST"] = "%"
         env_variables["MYSQL8_LOGS"] = self.mysql8_logs_dir
         env_variables["MYSQL8_LOGS_FS"] = "bind"
+        env_variables["MYSQL8_DOCKER_USER"] = str(os.getuid())
+
         self.base_cmd.extend(
             ["--file", p.join(docker_compose_yml_dir, "docker_compose_mysql_8_0.yml")]
         )
@@ -1091,10 +1090,11 @@ class ClickHouseCluster:
 
     def setup_mysql_cluster_cmd(self, instance, env_variables, docker_compose_yml_dir):
         self.with_mysql_cluster = True
-        env_variables["MYSQL_CLUSTER_PORT"] = str(self.mysql_port)
+        env_variables["MYSQL_CLUSTER_PORT"] = str(self.mysql8_port)
         env_variables["MYSQL_CLUSTER_ROOT_HOST"] = "%"
         env_variables["MYSQL_CLUSTER_LOGS"] = self.mysql_cluster_logs_dir
         env_variables["MYSQL_CLUSTER_LOGS_FS"] = "bind"
+        env_variables["MYSQL_CLUSTER_DOCKER_USER"] = str(os.getuid())
 
         self.base_cmd.extend(
             [
@@ -1572,7 +1572,7 @@ class ClickHouseCluster:
         with_zookeeper=False,
         with_zookeeper_secure=False,
         with_mysql_client=False,
-        with_mysql=False,
+        with_mysql57=False,
         with_mysql8=False,
         with_mysql_cluster=False,
         with_kafka=False,
@@ -1601,7 +1601,7 @@ class ClickHouseCluster:
         with_jdbc_bridge=False,
         with_hive=False,
         with_coredns=False,
-        allow_analyzer=True,
+        use_old_analyzer=False,
         hostname=None,
         env_variables=None,
         instance_env_variables=False,
@@ -1613,6 +1613,7 @@ class ClickHouseCluster:
         with_installed_binary=False,
         external_dirs=None,
         tmpfs=None,
+        mem_limit=None,
         zookeeper_docker_compose_path=None,
         minio_certs_dir=None,
         minio_data_dir=None,
@@ -1676,7 +1677,7 @@ class ClickHouseCluster:
             with_zookeeper=with_zookeeper,
             zookeeper_config_path=self.zookeeper_config_path,
             with_mysql_client=with_mysql_client,
-            with_mysql=with_mysql,
+            with_mysql57=with_mysql57,
             with_mysql8=with_mysql8,
             with_mysql_cluster=with_mysql_cluster,
             with_kafka=with_kafka,
@@ -1699,7 +1700,7 @@ class ClickHouseCluster:
             with_coredns=with_coredns,
             with_cassandra=with_cassandra,
             with_ldap=with_ldap,
-            allow_analyzer=allow_analyzer,
+            use_old_analyzer=use_old_analyzer,
             server_bin_path=self.server_bin_path,
             odbc_bridge_bin_path=self.odbc_bridge_bin_path,
             library_bridge_bin_path=self.library_bridge_bin_path,
@@ -1723,6 +1724,7 @@ class ClickHouseCluster:
             with_installed_binary=with_installed_binary,
             external_dirs=external_dirs,
             tmpfs=tmpfs or [],
+            mem_limit=mem_limit,
             config_root_name=config_root_name,
             extra_configs=extra_configs,
         )
@@ -1767,9 +1769,9 @@ class ClickHouseCluster:
                 )
             )
 
-        if with_mysql and not self.with_mysql:
+        if with_mysql57 and not self.with_mysql57:
             cmds.append(
-                self.setup_mysql_cmd(instance, env_variables, docker_compose_yml_dir)
+                self.setup_mysql57_cmd(instance, env_variables, docker_compose_yml_dir)
             )
 
         if with_mysql8 and not self.with_mysql8:
@@ -1805,9 +1807,9 @@ class ClickHouseCluster:
 
         if with_odbc_drivers and not self.with_odbc_drivers:
             self.with_odbc_drivers = True
-            if not self.with_mysql:
+            if not self.with_mysql8:
                 cmds.append(
-                    self.setup_mysql_cmd(
+                    self.setup_mysql8_cmd(
                         instance, env_variables, docker_compose_yml_dir
                     )
                 )
@@ -2148,8 +2150,8 @@ class ClickHouseCluster:
         logging.error("Can't connect to MySQL Client:{}".format(errors))
         raise Exception("Cannot wait MySQL Client container")
 
-    def wait_mysql_to_start(self, timeout=180):
-        self.mysql_ip = self.get_instance_ip("mysql57")
+    def wait_mysql57_to_start(self, timeout=180):
+        self.mysql57_ip = self.get_instance_ip("mysql57")
         start = time.time()
         errors = []
         while time.time() - start < timeout:
@@ -2157,8 +2159,8 @@ class ClickHouseCluster:
                 conn = pymysql.connect(
                     user=mysql_user,
                     password=mysql_pass,
-                    host=self.mysql_ip,
-                    port=self.mysql_port,
+                    host=self.mysql57_ip,
+                    port=self.mysql57_port,
                 )
                 conn.close()
                 logging.debug("Mysql Started")
@@ -2205,7 +2207,7 @@ class ClickHouseCluster:
                         user=mysql_user,
                         password=mysql_pass,
                         host=ip,
-                        port=self.mysql_port,
+                        port=self.mysql8_port,
                     )
                     conn.close()
                     logging.debug(f"Mysql Started {ip}")
@@ -2752,15 +2754,15 @@ class ClickHouseCluster:
                 subprocess_check_call(self.base_mysql_client_cmd + common_opts)
                 self.wait_mysql_client_to_start()
 
-            if self.with_mysql and self.base_mysql_cmd:
+            if self.with_mysql57 and self.base_mysql57_cmd:
                 logging.debug("Setup MySQL")
-                if os.path.exists(self.mysql_dir):
-                    shutil.rmtree(self.mysql_dir)
-                os.makedirs(self.mysql_logs_dir)
-                os.chmod(self.mysql_logs_dir, stat.S_IRWXU | stat.S_IRWXO)
-                subprocess_check_call(self.base_mysql_cmd + common_opts)
+                if os.path.exists(self.mysql57_dir):
+                    shutil.rmtree(self.mysql57_dir)
+                os.makedirs(self.mysql57_logs_dir)
+                os.chmod(self.mysql57_logs_dir, stat.S_IRWXU | stat.S_IRWXO)
+                subprocess_check_call(self.base_mysql57_cmd + common_opts)
                 self.up_called = True
-                self.wait_mysql_to_start()
+                self.wait_mysql57_to_start()
 
             if self.with_mysql8 and self.base_mysql8_cmd:
                 logging.debug("Setup MySQL 8")
@@ -2775,7 +2777,7 @@ class ClickHouseCluster:
                 print("Setup MySQL")
                 if os.path.exists(self.mysql_cluster_dir):
                     shutil.rmtree(self.mysql_cluster_dir)
-                os.makedirs(self.mysql_cluster_logs_dir)
+                os.makedirs(self.mysql_cluster_logs_dir, exist_ok=True)
                 os.chmod(self.mysql_cluster_logs_dir, stat.S_IRWXU | stat.S_IRWXO)
 
                 subprocess_check_call(self.base_mysql_cluster_cmd + common_opts)
@@ -3198,6 +3200,7 @@ services:
             {krb5_conf}
         entrypoint: {entrypoint_cmd}
         tmpfs: {tmpfs}
+        {mem_limit}
         cap_add:
             - SYS_PTRACE
             - NET_ADMIN
@@ -3239,7 +3242,7 @@ class ClickHouseInstance:
         with_zookeeper,
         zookeeper_config_path,
         with_mysql_client,
-        with_mysql,
+        with_mysql57,
         with_mysql8,
         with_mysql_cluster,
         with_kafka,
@@ -3259,7 +3262,7 @@ class ClickHouseInstance:
         with_coredns,
         with_cassandra,
         with_ldap,
-        allow_analyzer,
+        use_old_analyzer,
         server_bin_path,
         odbc_bridge_bin_path,
         library_bridge_bin_path,
@@ -3283,6 +3286,7 @@ class ClickHouseInstance:
         with_installed_binary=False,
         external_dirs=None,
         tmpfs=None,
+        mem_limit=None,
         config_root_name="clickhouse",
         extra_configs=[],
     ):
@@ -3294,6 +3298,10 @@ class ClickHouseInstance:
 
         self.external_dirs = external_dirs
         self.tmpfs = tmpfs or []
+        if mem_limit is not None:
+            self.mem_limit = "mem_limit : " + mem_limit
+        else:
+            self.mem_limit = ""
         self.base_config_dir = (
             p.abspath(p.join(base_path, base_config_dir)) if base_config_dir else None
         )
@@ -3324,7 +3332,7 @@ class ClickHouseInstance:
         self.library_bridge_bin_path = library_bridge_bin_path
 
         self.with_mysql_client = with_mysql_client
-        self.with_mysql = with_mysql
+        self.with_mysql57 = with_mysql57
         self.with_mysql8 = with_mysql8
         self.with_mysql_cluster = with_mysql_cluster
         self.with_postgres = with_postgres
@@ -3348,7 +3356,7 @@ class ClickHouseInstance:
         self.with_hive = with_hive
         self.with_coredns = with_coredns
         self.coredns_config_dir = p.abspath(p.join(base_path, "coredns_config"))
-        self.allow_analyzer = allow_analyzer
+        self.use_old_analyzer = use_old_analyzer
 
         self.main_config_name = main_config_name
         self.users_config_name = users_config_name
@@ -3368,7 +3376,7 @@ class ClickHouseInstance:
         self.env_file = self.cluster.env_file
         if with_odbc_drivers:
             self.odbc_ini_path = self.path + "/odbc.ini:/etc/odbc.ini"
-            self.with_mysql = True
+            self.with_mysql8 = True
         else:
             self.odbc_ini_path = ""
 
@@ -3468,6 +3476,7 @@ class ClickHouseInstance:
     ):
         # logging.debug(f"Executing query {sql} on {self.name}")
         result = None
+        exception_msg = ""
         for i in range(retry_count):
             try:
                 result = self.query(
@@ -3484,13 +3493,20 @@ class ClickHouseInstance:
                 if check_callback(result):
                     return result
                 time.sleep(sleep_time)
+            except QueryRuntimeException as ex:
+                exception_msg = f"{type(ex).__name__}: {str(ex)}"
+                # Container is down, this is likely due to server crash.
+                if "No route to host" in str(ex):
+                    raise
+                time.sleep(sleep_time)
             except Exception as ex:
                 # logging.debug("Retry {} got exception {}".format(i + 1, ex))
+                exception_msg = f"{type(ex).__name__}: {str(ex)}"
                 time.sleep(sleep_time)
 
         if result is not None:
             return result
-        raise Exception("Can't execute query {}".format(sql))
+        raise Exception(f"Can't execute query {sql}\n{exception_msg}")
 
     # As query() but doesn't wait response and returns response handler
     def get_query_request(self, sql, *args, **kwargs):
@@ -3776,7 +3792,9 @@ class ClickHouseInstance:
         except Exception as e:
             logging.warning(f"Stop ClickHouse raised an error {e}")
 
-    def start_clickhouse(self, start_wait_sec=60, retry_start=True):
+    def start_clickhouse(
+        self, start_wait_sec=60, retry_start=True, expected_to_fail=False
+    ):
         if not self.stay_alive:
             raise Exception(
                 "ClickHouse can be started again only with stay_alive=True instance"
@@ -3794,10 +3812,15 @@ class ClickHouseInstance:
                     ["bash", "-c", "{} --daemon".format(self.clickhouse_start_command)],
                     user=str(os.getuid()),
                 )
+                if expected_to_fail:
+                    self.wait_start_failed(start_wait_sec + start_time - time.time())
+                    return
                 time.sleep(1)
                 continue
             else:
                 logging.debug("Clickhouse process running.")
+                if expected_to_fail:
+                    raise Exception("ClickHouse was expected not to be running.")
                 try:
                     self.wait_start(start_wait_sec + start_time - time.time())
                     return
@@ -3849,6 +3872,30 @@ class ClickHouseInstance:
         if last_err is not None:
             raise last_err
 
+    def wait_start_failed(self, start_wait_sec):
+        start_time = time.time()
+        while time.time() <= start_time + start_wait_sec:
+            pid = self.get_process_pid("clickhouse")
+            if pid is None:
+                return
+            time.sleep(1)
+        logging.error(
+            f"No time left to shutdown. Process is still running. Will dump threads."
+        )
+        ps_clickhouse = self.exec_in_container(
+            ["bash", "-c", "ps -C clickhouse"], nothrow=True, user="root"
+        )
+        logging.info(f"PS RESULT:\n{ps_clickhouse}")
+        pid = self.get_process_pid("clickhouse")
+        if pid is not None:
+            self.exec_in_container(
+                ["bash", "-c", f"gdb -batch -ex 'thread apply all bt full' -p {pid}"],
+                user="root",
+            )
+        raise Exception(
+            "ClickHouse server is still running, but was expected to shutdown. Check logs."
+        )
+
     def restart_clickhouse(self, stop_start_wait_sec=60, kill=False):
         self.stop_clickhouse(stop_start_wait_sec, kill)
         self.start_clickhouse(stop_start_wait_sec)
@@ -4263,7 +4310,7 @@ class ClickHouseInstance:
                     "Database": odbc_mysql_db,
                     "Uid": odbc_mysql_uid,
                     "Pwd": odbc_mysql_pass,
-                    "Server": self.cluster.mysql_host,
+                    "Server": self.cluster.mysql8_host,
                 },
                 "PostgreSQL": {
                     "DSN": "postgresql_odbc",
@@ -4358,10 +4405,7 @@ class ClickHouseInstance:
             )
 
         write_embedded_config("0_common_instance_users.xml", users_d_dir)
-        if (
-            os.environ.get("CLICKHOUSE_USE_NEW_ANALYZER") is not None
-            and self.allow_analyzer
-        ):
+        if self.use_old_analyzer:
             write_embedded_config("0_common_enable_analyzer.xml", users_d_dir)
 
         if len(self.custom_dictionaries_paths):
@@ -4451,14 +4495,14 @@ class ClickHouseInstance:
         if self.with_mysql_client:
             depends_on.append(self.cluster.mysql_client_host)
 
-        if self.with_mysql:
+        if self.with_mysql57:
             depends_on.append("mysql57")
 
         if self.with_mysql8:
             depends_on.append("mysql80")
 
         if self.with_mysql_cluster:
-            depends_on.append("mysql57")
+            depends_on.append("mysql80")
             depends_on.append("mysql2")
             depends_on.append("mysql3")
             depends_on.append("mysql4")
@@ -4603,6 +4647,7 @@ class ClickHouseInstance:
                     db_dir=db_dir,
                     external_dirs_volumes=external_dirs_volumes,
                     tmpfs=str(self.tmpfs),
+                    mem_limit=self.mem_limit,
                     logs_dir=logs_dir,
                     depends_on=str(depends_on),
                     user=os.getuid(),
@@ -4705,3 +4750,8 @@ class ClickHouseKiller(object):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         self.clickhouse_node.start_clickhouse()
+
+
+@cache
+def is_arm():
+    return any(arch in platform.processor().lower() for arch in ("arm, aarch"))
diff --git a/tests/integration/helpers/external_sources.py b/tests/integration/helpers/external_sources.py
index afb91083d57..033a2f84fa2 100644
--- a/tests/integration/helpers/external_sources.py
+++ b/tests/integration/helpers/external_sources.py
@@ -4,7 +4,6 @@ import os
 import uuid
 import warnings
 
-import aerospike
 import cassandra.cluster
 import pymongo
 import pymysql.cursors
@@ -120,7 +119,7 @@ class SourceMySQL(ExternalSource):
 
     def prepare(self, structure, table_name, cluster):
         if self.internal_hostname is None:
-            self.internal_hostname = cluster.mysql_ip
+            self.internal_hostname = cluster.mysql8_ip
         self.create_mysql_conn()
         self.execute_mysql_query(
             "create database if not exists test default character set 'utf8'"
@@ -696,91 +695,3 @@ class SourceRedis(ExternalSource):
             or layout.is_complex
             and self.storage_type == "hash_map"
         )
-
-
-class SourceAerospike(ExternalSource):
-    def __init__(
-        self,
-        name,
-        internal_hostname,
-        internal_port,
-        docker_hostname,
-        docker_port,
-        user,
-        password,
-    ):
-        ExternalSource.__init__(
-            self,
-            name,
-            internal_hostname,
-            internal_port,
-            docker_hostname,
-            docker_port,
-            user,
-            password,
-        )
-        self.namespace = "test"
-        self.set = "test_set"
-
-    def get_source_str(self, table_name):
-        print("AEROSPIKE get source str")
-        return """
-            <aerospike>
-                <host>{host}</host>
-                <port>{port}</port>
-            </aerospike>
-        """.format(
-            host=self.docker_hostname,
-            port=self.docker_port,
-        )
-
-    def prepare(self, structure, table_name, cluster):
-        config = {"hosts": [(self.internal_hostname, self.internal_port)]}
-        self.client = aerospike.client(config).connect()
-        self.prepared = True
-        print("PREPARED AEROSPIKE")
-        print(config)
-
-    def compatible_with_layout(self, layout):
-        print("compatible AEROSPIKE")
-        return layout.is_simple
-
-    def _flush_aerospike_db(self):
-        keys = []
-
-        def handle_record(xxx_todo_changeme):
-            (key, metadata, record) = xxx_todo_changeme
-            print(("Handle record {} {}".format(key, record)))
-            keys.append(key)
-
-        def print_record(xxx_todo_changeme1):
-            (key, metadata, record) = xxx_todo_changeme1
-            print(("Print record {} {}".format(key, record)))
-
-        scan = self.client.scan(self.namespace, self.set)
-        scan.foreach(handle_record)
-
-        [self.client.remove(key) for key in keys]
-
-    def load_kv_data(self, values):
-        self._flush_aerospike_db()
-
-        print("Load KV Data Aerospike")
-        if len(values[0]) == 2:
-            for value in values:
-                key = (self.namespace, self.set, value[0])
-                print(key)
-                self.client.put(
-                    key,
-                    {"bin_value": value[1]},
-                    policy={"key": aerospike.POLICY_KEY_SEND},
-                )
-                assert self.client.exists(key)
-        else:
-            assert "VALUES SIZE != 2"
-
-        # print(values)
-
-    def load_data(self, data, table_name):
-        print("Load Data Aerospike")
-        # print(data)
diff --git a/tests/integration/helpers/keeper_config1.xml b/tests/integration/helpers/keeper_config1.xml
index 12c6c0b78b6..a4a1059ffe9 100644
--- a/tests/integration/helpers/keeper_config1.xml
+++ b/tests/integration/helpers/keeper_config1.xml
@@ -9,11 +9,13 @@
         <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
     </logger>
 
+    <placement>
+        <use_imds>0</use_imds>
+        <availability_zone>az-zoo1</availability_zone>
+    </placement>
+
     <keeper_server>
         <tcp_port>2181</tcp_port>
-        <availability_zone>
-            <value>az-zoo1</value>
-        </availability_zone>
         <server_id>1</server_id>
 
         <coordination_settings>
diff --git a/tests/integration/helpers/keeper_config2.xml b/tests/integration/helpers/keeper_config2.xml
index 2afff2f5e59..88a0d1f0b4b 100644
--- a/tests/integration/helpers/keeper_config2.xml
+++ b/tests/integration/helpers/keeper_config2.xml
@@ -9,13 +9,14 @@
         <errorlog>/var/log/clickhouse-keeper/clickhouse-keeper.err.log</errorlog>
     </logger>
 
+    <placement>
+        <use_imds>0</use_imds>
+        <availability_zone>az-zoo2</availability_zone>
+    </placement>
+
     <keeper_server>
         <tcp_port>2181</tcp_port>
         <server_id>2</server_id>
-        <availability_zone>
-            <value>az-zoo2</value>
-            <enable_auto_detection_on_cloud>1</enable_auto_detection_on_cloud>
-        </availability_zone>
 
         <coordination_settings>
             <operation_timeout_ms>10000</operation_timeout_ms>
diff --git a/tests/integration/helpers/mock_servers.py b/tests/integration/helpers/mock_servers.py
index e4655ffeeaf..f2181d85e12 100644
--- a/tests/integration/helpers/mock_servers.py
+++ b/tests/integration/helpers/mock_servers.py
@@ -33,7 +33,7 @@ def start_mock_servers(cluster, script_dir, mocks, timeout=100):
 
         cluster.exec_in_container(
             container_id,
-            ["python", server_name, str(port)],
+            ["python3", server_name, str(port)],
             detach=True,
         )
 
diff --git a/tests/integration/helpers/s3_tools.py b/tests/integration/helpers/s3_tools.py
index 777b3394dc1..0c3538c3c39 100644
--- a/tests/integration/helpers/s3_tools.py
+++ b/tests/integration/helpers/s3_tools.py
@@ -36,6 +36,14 @@ def get_file_contents(minio_client, bucket, s3_path):
     return data_str.decode()
 
 
+def list_s3_objects(minio_client, bucket, prefix=""):
+    prefix_len = len(prefix)
+    return [
+        obj.object_name[prefix_len:]
+        for obj in minio_client.list_objects(bucket, prefix=prefix, recursive=True)
+    ]
+
+
 # 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.
diff --git a/tests/integration/runner b/tests/integration/runner
index b1193b5b471..97d06c2b78c 100755
--- a/tests/integration/runner
+++ b/tests/integration/runner
@@ -39,9 +39,7 @@ def check_args_and_update_paths(args):
         else:
             CLICKHOUSE_ROOT = args.clickhouse_root
     else:
-        logging.info(
-            "ClickHouse root is not set. Will use %s" % (DEFAULT_CLICKHOUSE_ROOT)
-        )
+        logging.info("ClickHouse root is not set. Will use %s", DEFAULT_CLICKHOUSE_ROOT)
         CLICKHOUSE_ROOT = DEFAULT_CLICKHOUSE_ROOT
 
     if not os.path.isabs(args.binary):
@@ -74,9 +72,7 @@ def check_args_and_update_paths(args):
         args.base_configs_dir = os.path.abspath(
             os.path.join(CLICKHOUSE_ROOT, CONFIG_DIR_IN_REPO)
         )
-        logging.info(
-            "Base configs dir is not set. Will use %s" % (args.base_configs_dir)
-        )
+        logging.info("Base configs dir is not set. Will use %s", args.base_configs_dir)
 
     if args.cases_dir:
         if not os.path.isabs(args.cases_dir):
@@ -87,7 +83,7 @@ def check_args_and_update_paths(args):
         args.cases_dir = os.path.abspath(
             os.path.join(CLICKHOUSE_ROOT, INTEGRATION_DIR_IN_REPO)
         )
-        logging.info("Cases dir is not set. Will use %s" % (args.cases_dir))
+        logging.info("Cases dir is not set. Will use %s", args.cases_dir)
 
     if args.utils_dir:
         if not os.path.isabs(args.utils_dir):
@@ -98,12 +94,13 @@ def check_args_and_update_paths(args):
         args.utils_dir = os.path.abspath(
             os.path.join(CLICKHOUSE_ROOT, UTILS_DIR_IN_REPO)
         )
-        logging.info("utils dir is not set. Will use %s" % (args.utils_dir))
+        logging.info("utils dir is not set. Will use %s", args.utils_dir)
 
     logging.info(
-        "base_configs_dir: {}, binary: {}, cases_dir: {} ".format(
-            args.base_configs_dir, args.binary, args.cases_dir
-        )
+        "base_configs_dir: %s, binary: %s, cases_dir: %s ",
+        args.base_configs_dir,
+        args.binary,
+        args.cases_dir,
     )
 
     for path in [
@@ -115,7 +112,7 @@ def check_args_and_update_paths(args):
         CLICKHOUSE_ROOT,
     ]:
         if not os.path.exists(path):
-            raise Exception("Path {} doesn't exist".format(path))
+            raise FileNotFoundError(f"Path {path} doesn't exist")
 
     if args.dockerd_volume:
         if not os.path.isabs(args.dockerd_volume):
@@ -126,21 +123,22 @@ def check_args_and_update_paths(args):
     if (not os.path.exists(os.path.join(args.base_configs_dir, "config.xml"))) and (
         not os.path.exists(os.path.join(args.base_configs_dir, "config.yaml"))
     ):
-        raise Exception(
-            "No config.xml or config.yaml in {}".format(args.base_configs_dir)
+        raise FileNotFoundError(
+            f"No config.xml or config.yaml in {args.base_configs_dir}"
         )
 
     if (not os.path.exists(os.path.join(args.base_configs_dir, "users.xml"))) and (
         not os.path.exists(os.path.join(args.base_configs_dir, "users.yaml"))
     ):
-        raise Exception(
-            "No users.xml or users.yaml in {}".format(args.base_configs_dir)
+        raise FileNotFoundError(
+            f"No users.xml or users.yaml in {args.base_configs_dir}"
         )
 
 
 def docker_kill_handler_handler(signum, frame):
+    _, _ = signum, frame
     subprocess.check_call(
-        "docker ps --all --quiet --filter name={name}".format(name=CONTAINER_NAME),
+        f"docker ps --all --quiet --filter name={CONTAINER_NAME}",
         shell=True,
     )
     raise KeyboardInterrupt("Killed by Ctrl+C")
@@ -318,7 +316,7 @@ if __name__ == "__main__":
     parallel_args = ""
     if args.parallel:
         parallel_args += "--dist=loadfile"
-        parallel_args += " -n {}".format(args.parallel)
+        parallel_args += f" -n {args.parallel}".format()
 
     rand_args = ""
     # if not args.no_random:
@@ -326,7 +324,7 @@ if __name__ == "__main__":
 
     net = ""
     if args.network:
-        net = "--net={}".format(args.network)
+        net = f"--net={args.network}"
     elif not args.disable_net_host:
         net = "--net=host"
 
@@ -350,9 +348,7 @@ if __name__ == "__main__":
         dockerd_internal_volume = "--tmpfs /var/lib/docker -e DOCKER_RAMDISK=true"
     elif args.dockerd_volume:
         dockerd_internal_volume = (
-            "--mount type=bind,source={},target=/var/lib/docker".format(
-                args.dockerd_volume
-            )
+            f"--mount type=bind,source={args.dockerd_volume},target=/var/lib/docker"
         )
     else:
         try:
@@ -391,7 +387,7 @@ if __name__ == "__main__":
 
     use_analyzer = ""
     if args.analyzer:
-        use_analyzer = "-e CLICKHOUSE_USE_NEW_ANALYZER=1"
+        use_analyzer = "-e CLICKHOUSE_USE_OLD_ANALYZER=1"
 
     # NOTE: since pytest options is in the argument value already we need to additionally escape '"'
     pytest_opts = " ".join(
@@ -419,7 +415,7 @@ if __name__ == "__main__":
 
     cmd = cmd_base + " " + args.command
     cmd_pre_pull = (
-        f"{cmd_base} find /compose -name docker_compose_*.yml "
+        f"{cmd_base} find /ClickHouse/tests/integration/compose -name docker_compose_*.yml "
         r"-exec docker-compose -f '{}' pull \;"
     )
 
diff --git a/tests/integration/test_access_for_functions/test.py b/tests/integration/test_access_for_functions/test.py
index 5069468110c..3e58c961421 100644
--- a/tests/integration/test_access_for_functions/test.py
+++ b/tests/integration/test_access_for_functions/test.py
@@ -38,8 +38,11 @@ def test_access_rights_for_function():
 
     instance.query("GRANT DROP FUNCTION ON *.* TO B")
     instance.query("DROP FUNCTION MySum", user="B")
-    assert "Unknown function MySum" in instance.query_and_get_error(
-        "SELECT MySum(1, 2)"
+
+    function_resolution_error = instance.query_and_get_error("SELECT MySum(1, 2)")
+    assert (
+        "Unknown function MySum" in function_resolution_error
+        or "Function with name 'MySum' does not exists." in function_resolution_error
     )
 
     instance.query("REVOKE CREATE FUNCTION ON *.* FROM A")
diff --git a/tests/integration/test_allowed_url_from_config/test.py b/tests/integration/test_allowed_url_from_config/test.py
index 3106cf12702..df8934aa69b 100644
--- a/tests/integration/test_allowed_url_from_config/test.py
+++ b/tests/integration/test_allowed_url_from_config/test.py
@@ -1,5 +1,5 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance("node1", main_configs=["configs/config_with_hosts.xml"])
@@ -16,9 +16,11 @@ node5 = cluster.add_instance(
     "node5", main_configs=["configs/config_without_allowed_hosts.xml"]
 )
 node6 = cluster.add_instance("node6", main_configs=["configs/config_for_remote.xml"])
-node7 = cluster.add_instance(
-    "node7", main_configs=["configs/config_for_redirect.xml"], with_hdfs=True
-)
+
+if not is_arm():
+    node7 = cluster.add_instance(
+        "node7", main_configs=["configs/config_for_redirect.xml"], with_hdfs=True
+    )
 
 
 @pytest.fixture(scope="module")
@@ -270,6 +272,7 @@ def test_table_function_remote(start_cluster):
     )
 
 
+@pytest.mark.skipif(is_arm(), reason="skip for ARM")
 def test_redirect(start_cluster):
     hdfs_api = start_cluster.hdfs_api
 
@@ -284,6 +287,7 @@ def test_redirect(start_cluster):
     node7.query("DROP TABLE table_test_7_1")
 
 
+@pytest.mark.skipif(is_arm(), reason="skip for ARM")
 def test_HDFS(start_cluster):
     assert "not allowed" in node7.query_and_get_error(
         "CREATE TABLE table_test_7_2 (word String) ENGINE=HDFS('http://hdfs1:50075/webhdfs/v1/simple_storage?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'CSV')"
@@ -293,6 +297,7 @@ def test_HDFS(start_cluster):
     )
 
 
+@pytest.mark.skipif(is_arm(), reason="skip for ARM")
 def test_schema_inference(start_cluster):
     error = node7.query_and_get_error("desc url('http://test.com`, 'TSVRaw'')")
     assert error.find("ReadWriteBufferFromHTTPBase") == -1
diff --git a/tests/integration/test_cluster_copier/__init__.py b/tests/integration/test_async_insert_adaptive_busy_timeout/__init__.py
similarity index 100%
rename from tests/integration/test_cluster_copier/__init__.py
rename to tests/integration/test_async_insert_adaptive_busy_timeout/__init__.py
diff --git a/tests/integration/test_async_insert_adaptive_busy_timeout/configs/users.xml b/tests/integration/test_async_insert_adaptive_busy_timeout/configs/users.xml
new file mode 100644
index 00000000000..755dc4ac269
--- /dev/null
+++ b/tests/integration/test_async_insert_adaptive_busy_timeout/configs/users.xml
@@ -0,0 +1,14 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <async_insert_use_adaptive_busy_timeout>1</async_insert_use_adaptive_busy_timeout>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_async_insert_adaptive_busy_timeout/configs/zookeeper_config.xml b/tests/integration/test_async_insert_adaptive_busy_timeout/configs/zookeeper_config.xml
new file mode 100644
index 00000000000..18412349228
--- /dev/null
+++ b/tests/integration/test_async_insert_adaptive_busy_timeout/configs/zookeeper_config.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <zookeeper>
+        <node index="1">
+            <host>zoo1</host>
+            <port>2181</port>
+        </node>
+    </zookeeper>
+</clickhouse>
diff --git a/tests/integration/test_async_insert_adaptive_busy_timeout/test.py b/tests/integration/test_async_insert_adaptive_busy_timeout/test.py
new file mode 100644
index 00000000000..93319a56d0f
--- /dev/null
+++ b/tests/integration/test_async_insert_adaptive_busy_timeout/test.py
@@ -0,0 +1,372 @@
+import copy
+import logging
+import pytest
+import random
+import timeit
+
+from math import floor
+from multiprocessing import Pool
+from itertools import repeat
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/zookeeper_config.xml"],
+    user_configs=[
+        "configs/users.xml",
+    ],
+    with_zookeeper=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+_query_settings = {"async_insert": 1, "wait_for_async_insert": 1}
+
+
+def _generate_values(size, min_int, max_int, array_size_range):
+    gen_tuple = lambda _min_int, _max_int, _array_size_range: (
+        random.randint(_min_int, _max_int),
+        [
+            random.randint(_min_int, _max_int)
+            for _ in range(random.randint(*_array_size_range))
+        ],
+    )
+
+    return map(lambda _: gen_tuple(min_int, max_int, array_size_range), range(size))
+
+
+def _insert_query(table_name, settings, *args, **kwargs):
+    settings_s = ", ".join("{}={}".format(k, settings[k]) for k in settings)
+    INSERT_QUERY = "INSERT INTO {} SETTINGS {} VALUES {}"
+    node.query(
+        INSERT_QUERY.format(
+            table_name,
+            settings_s,
+            ", ".join(map(str, _generate_values(*args, **kwargs))),
+        )
+    )
+
+
+def _insert_queries_sequentially(
+    table_name, settings, iterations, max_values_size, array_size_range
+):
+    for iter in range(iterations):
+        _insert_query(
+            table_name,
+            settings,
+            random.randint(1, max_values_size),
+            iter * max_values_size,
+            (iter + 1) * max_values_size - 1,
+            array_size_range,
+        )
+
+
+def _insert_queries_in_parallel(
+    table_name, settings, thread_num, tasks, max_values_size, array_size_range
+):
+    sizes = [random.randint(1, max_values_size) for _ in range(tasks)]
+    min_ints = [iter * max_values_size for iter in range(tasks)]
+    max_ints = [(iter + 1) * max_values_size - 1 for iter in range(tasks)]
+    with Pool(thread_num) as p:
+        p.starmap(
+            _insert_query,
+            zip(
+                repeat(table_name),
+                repeat(settings),
+                sizes,
+                min_ints,
+                max_ints,
+                repeat(array_size_range),
+            ),
+        )
+
+
+def test_with_merge_tree():
+    table_name = "async_insert_mt_table"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            table_name
+        )
+    )
+
+    _insert_queries_sequentially(
+        table_name,
+        _query_settings,
+        iterations=100,
+        max_values_size=1000,
+        array_size_range=[10, 50],
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
+
+
+def test_with_merge_tree_multithread():
+    thread_num = 15
+    table_name = "async_insert_mt_multithread_table"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            table_name
+        )
+    )
+
+    _insert_queries_in_parallel(
+        table_name,
+        _query_settings,
+        thread_num=15,
+        tasks=1000,
+        max_values_size=1000,
+        array_size_range=[10, 15],
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
+
+
+def test_with_replicated_merge_tree():
+    table_name = "async_insert_replicated_mt_table"
+
+    create_query = " ".join(
+        (
+            "CREATE TABLE {} (a UInt64, b Array(UInt64))".format(table_name),
+            "ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/{}', 'node')".format(
+                table_name
+            ),
+            "ORDER BY a",
+        )
+    )
+
+    node.query(create_query)
+
+    settings = _query_settings
+    _insert_queries_sequentially(
+        table_name,
+        settings,
+        iterations=100,
+        max_values_size=1000,
+        array_size_range=[10, 50],
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
+
+
+def test_with_replicated_merge_tree_multithread():
+    thread_num = 15
+    table_name = "async_insert_replicated_mt_multithread_table"
+
+    create_query = " ".join(
+        (
+            "CREATE TABLE {} (a UInt64, b Array(UInt64))".format(table_name),
+            "ENGINE=ReplicatedMergeTree('/clickhouse/tables/test/{}', 'node')".format(
+                table_name
+            ),
+            "ORDER BY a",
+        )
+    )
+
+    node.query(create_query)
+
+    _insert_queries_in_parallel(
+        table_name,
+        _query_settings,
+        thread_num=15,
+        tasks=1000,
+        max_values_size=1000,
+        array_size_range=[10, 15],
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
+
+
+# Ensure that the combined duration of inserts with adaptive timeouts is less than
+# the combined duration for fixed timeouts.
+def test_compare_sequential_inserts_durations_for_adaptive_and_fixed_async_timeouts():
+    fixed_tm_table_name = "async_insert_mt_fixed_async_timeout"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            fixed_tm_table_name
+        )
+    )
+
+    fixed_tm_settings = copy.copy(_query_settings)
+    fixed_tm_settings["async_insert_use_adaptive_busy_timeout"] = 0
+    fixed_tm_settings["async_insert_busy_timeout_ms"] = 200
+
+    fixed_tm_run_duration = timeit.timeit(
+        lambda: _insert_queries_sequentially(
+            fixed_tm_table_name,
+            fixed_tm_settings,
+            iterations=100,
+            max_values_size=1000,
+            array_size_range=[10, 50],
+        ),
+        setup="pass",
+        number=3,
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(fixed_tm_table_name))
+
+    logging.debug(
+        "Run duration with fixed asynchronous timeout is {} seconds".format(
+            fixed_tm_run_duration
+        )
+    )
+
+    adaptive_tm_table_name = "async_insert_mt_adaptive_async_timeout"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            adaptive_tm_table_name
+        )
+    )
+
+    adaptive_tm_settings = copy.copy(_query_settings)
+    adaptive_tm_settings["async_insert_busy_timeout_min_ms"] = 10
+    adaptive_tm_settings["async_insert_busy_timeout_max_ms"] = 1000
+
+    adaptive_tm_run_duration = timeit.timeit(
+        lambda: _insert_queries_sequentially(
+            adaptive_tm_table_name,
+            adaptive_tm_settings,
+            iterations=100,
+            max_values_size=1000,
+            array_size_range=[10, 50],
+        ),
+        setup="pass",
+        number=3,
+    )
+
+    logging.debug(
+        "Run duration with adaptive asynchronous timeout is {} seconds.".format(
+            adaptive_tm_run_duration
+        )
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(adaptive_tm_table_name))
+
+    assert adaptive_tm_run_duration <= fixed_tm_run_duration
+
+
+# Ensure that the combined duration of inserts with adaptive timeouts is less than
+# the combined duration for fixed timeouts.
+def test_compare_parallel_inserts_durations_for_adaptive_and_fixed_async_timeouts():
+    fixed_tm_table_name = "async_insert_mt_fixed_async_timeout"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            fixed_tm_table_name
+        )
+    )
+
+    fixed_tm_settings = copy.copy(_query_settings)
+    fixed_tm_settings["async_insert_use_adaptive_busy_timeout"] = 0
+    fixed_tm_settings["async_insert_busy_timeout_ms"] = 200
+
+    fixed_tm_run_duration = timeit.timeit(
+        lambda: _insert_queries_in_parallel(
+            fixed_tm_table_name,
+            fixed_tm_settings,
+            thread_num=15,
+            tasks=1000,
+            max_values_size=1000,
+            array_size_range=[10, 50],
+        ),
+        setup="pass",
+        number=3,
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(fixed_tm_table_name))
+
+    logging.debug(
+        "Run duration with fixed asynchronous timeout is {} seconds".format(
+            fixed_tm_run_duration
+        )
+    )
+
+    adaptive_tm_table_name = "async_insert_mt_adaptive_async_timeout"
+    node.query(
+        "CREATE TABLE {} (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a".format(
+            adaptive_tm_table_name
+        )
+    )
+
+    adaptive_tm_settings = copy.copy(_query_settings)
+    adaptive_tm_settings["async_insert_busy_timeout_min_ms"] = 10
+    adaptive_tm_settings["async_insert_busy_timeout_max_ms"] = 200
+
+    adaptive_tm_run_duration = timeit.timeit(
+        lambda: _insert_queries_in_parallel(
+            adaptive_tm_table_name,
+            adaptive_tm_settings,
+            thread_num=15,
+            tasks=100,
+            max_values_size=1000,
+            array_size_range=[10, 50],
+        ),
+        setup="pass",
+        number=3,
+    )
+
+    logging.debug(
+        "Run duration with adaptive asynchronous timeout is {} seconds.".format(
+            adaptive_tm_run_duration
+        )
+    )
+
+    node.query("DROP TABLE IF EXISTS {}".format(adaptive_tm_table_name))
+
+    assert adaptive_tm_run_duration <= fixed_tm_run_duration
+
+
+# Ensure that the delay converges to a minimum for sequential inserts and wait_for_async_insert=1.
+def test_change_queries_frequency():
+    table_name = "async_insert_mt_change_queries_frequencies"
+
+    create_query = " ".join(
+        (
+            "CREATE TABLE {} (a UInt64, b Array(UInt64))".format(table_name),
+            "ENGINE=ReplicatedMergeTree('/clickhouse/tables/test_frequencies/{}', 'node')".format(
+                table_name
+            ),
+            "ORDER BY a",
+        )
+    )
+
+    node.query(create_query)
+
+    settings = copy.copy(_query_settings)
+    min_ms = 50
+    settings["async_insert_busy_timeout_min_ms"] = min_ms
+    settings["async_insert_busy_timeout_max_ms"] = 2000
+
+    _insert_queries_in_parallel(
+        table_name,
+        settings,
+        thread_num=15,
+        tasks=2000,
+        max_values_size=1000,
+        array_size_range=[10, 15],
+    )
+
+    _insert_queries_sequentially(
+        table_name,
+        settings,
+        iterations=200,
+        max_values_size=1000,
+        array_size_range=[10, 50],
+    )
+
+    select_log_query = "SELECT timeout_milliseconds FROM system.asynchronous_insert_log ORDER BY event_time DESC LIMIT 50"
+    res = node.query(select_log_query)
+    for line in res.splitlines():
+        assert int(line) == min_ms
+
+    node.query("DROP TABLE IF EXISTS {}".format(table_name))
diff --git a/tests/integration/test_async_load_databases/test.py b/tests/integration/test_async_load_databases/test.py
index 050b529a227..d06897b1045 100644
--- a/tests/integration/test_async_load_databases/test.py
+++ b/tests/integration/test_async_load_databases/test.py
@@ -122,6 +122,9 @@ def test_dependent_tables(started_cluster):
     )
     query("create table system.join (n int, m int) engine=Join(any, left, n)")
     query("insert into system.join values (1, 1)")
+    for i in range(2, 100):
+        query(f"insert into system.join values (1, {i})")
+
     query(
         "create table src (n int, m default joinGet('system.join', 'm', 1::int),"
         "t default dictGetOrNull('a.d', 'm', toUInt64(3)),"
diff --git a/tests/integration/test_attach_backup_from_s3_plain/configs/disk_s3.xml b/tests/integration/test_attach_backup_from_s3_plain/configs/disk_s3.xml
index 779e4b6ae21..2edabc76c8b 100644
--- a/tests/integration/test_attach_backup_from_s3_plain/configs/disk_s3.xml
+++ b/tests/integration/test_attach_backup_from_s3_plain/configs/disk_s3.xml
@@ -8,9 +8,16 @@
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
             </backup_disk_s3_plain>
+            <backup_disk_local_plain>
+                <type>object_storage</type>
+                <object_storage_type>local_blob_storage</object_storage_type>
+                <metadata_type>plain</metadata_type>
+                <path>/local_plain/</path>
+            </backup_disk_local_plain>
         </disks>
     </storage_configuration>
     <backups>
         <allowed_disk>backup_disk_s3_plain</allowed_disk>
+        <allowed_disk>backup_disk_local_plain</allowed_disk>
     </backups>
 </clickhouse>
diff --git a/tests/integration/test_attach_backup_from_s3_plain/test.py b/tests/integration/test_attach_backup_from_s3_plain/test.py
index e575c487b7a..c2f8936b82c 100644
--- a/tests/integration/test_attach_backup_from_s3_plain/test.py
+++ b/tests/integration/test_attach_backup_from_s3_plain/test.py
@@ -21,16 +21,55 @@ def start_cluster():
         cluster.shutdown()
 
 
+s3_disk_def = """disk(type=s3_plain,
+    endpoint='http://minio1:9001/root/data/disks/disk_s3_plain/{}/',
+    access_key_id='minio',
+    secret_access_key='minio123');"""
+
+local_disk_def = "disk(type=object_storage, object_storage_type = 'local_blob_storage', metadata_type = 'plain', path = '/local_plain/{}/');"
+
+
 @pytest.mark.parametrize(
-    "table_name,backup_name,storage_policy,min_bytes_for_wide_part",
+    "table_name,backup_name,storage_policy,disk_def,min_bytes_for_wide_part",
     [
         pytest.param(
-            "compact", "backup_compact", "s3_backup_compact", int(1e9), id="compact"
+            "compact",
+            "backup_compact_s3",
+            "backup_disk_s3_plain",
+            s3_disk_def,
+            int(1e9),
+            id="compact",
+        ),
+        pytest.param(
+            "wide",
+            "backup_wide_s3",
+            "backup_disk_s3_plain",
+            s3_disk_def,
+            int(0),
+            id="wide",
+        ),
+        pytest.param(
+            "compact",
+            "backup_compact_local",
+            "backup_disk_local_plain",
+            local_disk_def,
+            int(1e9),
+            id="compact",
+        ),
+        pytest.param(
+            "wide",
+            "backup_wide_local",
+            "backup_disk_local_plain",
+            local_disk_def,
+            int(0),
+            id="wide",
         ),
-        pytest.param("wide", "backup_wide", "s3_backup_wide", int(0), id="wide"),
     ],
 )
-def test_attach_part(table_name, backup_name, storage_policy, min_bytes_for_wide_part):
+def test_attach_part(
+    table_name, backup_name, storage_policy, disk_def, min_bytes_for_wide_part
+):
+    disk_definition = disk_def.format(backup_name)
     node.query(
         f"""
     -- Catch any errors (NOTE: warnings are ok)
@@ -45,7 +84,7 @@ def test_attach_part(table_name, backup_name, storage_policy, min_bytes_for_wide
     settings min_bytes_for_wide_part={min_bytes_for_wide_part}
     as select number%5 part, number key from numbers(100);
 
-    backup table ordinary_db.{table_name} TO Disk('backup_disk_s3_plain', '{backup_name}') settings deduplicate_files=0;
+    backup table ordinary_db.{table_name} TO Disk('{storage_policy}', '{backup_name}') settings deduplicate_files=0;
 
     drop table ordinary_db.{table_name};
     attach table ordinary_db.{table_name} (part UInt8, key UInt64)
@@ -53,10 +92,7 @@ def test_attach_part(table_name, backup_name, storage_policy, min_bytes_for_wide
     order by key partition by part
     settings
         max_suspicious_broken_parts=0,
-        disk=disk(type=s3_plain,
-            endpoint='http://minio1:9001/root/data/disks/disk_s3_plain/{backup_name}/',
-            access_key_id='minio',
-            secret_access_key='minio123');
+        disk={disk_definition}
     """
     )
 
diff --git a/tests/integration/test_distributed_backward_compatability/__init__.py b/tests/integration/test_attach_partition_using_copy/__init__.py
similarity index 100%
rename from tests/integration/test_distributed_backward_compatability/__init__.py
rename to tests/integration/test_attach_partition_using_copy/__init__.py
diff --git a/tests/integration/test_distributed_backward_compatability/configs/remote_servers.xml b/tests/integration/test_attach_partition_using_copy/configs/remote_servers.xml
similarity index 69%
rename from tests/integration/test_distributed_backward_compatability/configs/remote_servers.xml
rename to tests/integration/test_attach_partition_using_copy/configs/remote_servers.xml
index 68b420f36b4..b40730e9f7d 100644
--- a/tests/integration/test_distributed_backward_compatability/configs/remote_servers.xml
+++ b/tests/integration/test_attach_partition_using_copy/configs/remote_servers.xml
@@ -2,14 +2,13 @@
     <remote_servers>
         <test_cluster>
             <shard>
+                <internal_replication>true</internal_replication>
                 <replica>
-                    <host>node1</host>
+                    <host>replica1</host>
                     <port>9000</port>
                 </replica>
-            </shard>
-            <shard>
                 <replica>
-                    <host>node2</host>
+                    <host>replica2</host>
                     <port>9000</port>
                 </replica>
             </shard>
diff --git a/tests/integration/test_attach_partition_using_copy/test.py b/tests/integration/test_attach_partition_using_copy/test.py
new file mode 100644
index 00000000000..df5378742ae
--- /dev/null
+++ b/tests/integration/test_attach_partition_using_copy/test.py
@@ -0,0 +1,187 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+
+replica1 = cluster.add_instance(
+    "replica1", with_zookeeper=True, main_configs=["configs/remote_servers.xml"]
+)
+replica2 = cluster.add_instance(
+    "replica2", with_zookeeper=True, main_configs=["configs/remote_servers.xml"]
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    except Exception as ex:
+        print(ex)
+    finally:
+        cluster.shutdown()
+
+
+def cleanup(nodes):
+    for node in nodes:
+        node.query("DROP TABLE IF EXISTS source SYNC")
+        node.query("DROP TABLE IF EXISTS destination SYNC")
+
+
+def create_source_table(node, table_name, replicated):
+    replica = node.name
+    engine = (
+        f"ReplicatedMergeTree('/clickhouse/tables/1/{table_name}', '{replica}')"
+        if replicated
+        else "MergeTree()"
+    )
+    node.query_with_retry(
+        """
+        ATTACH TABLE {table_name} 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 = {engine}
+        ORDER BY (postcode1, postcode2, addr1, addr2)
+        SETTINGS disk = disk(type = web, endpoint = 'https://raw.githubusercontent.com/ClickHouse/web-tables-demo/main/web/')
+        """.format(
+            table_name=table_name, engine=engine
+        )
+    )
+
+
+def create_destination_table(node, table_name, replicated):
+    replica = node.name
+    engine = (
+        f"ReplicatedMergeTree('/clickhouse/tables/1/{table_name}', '{replica}')"
+        if replicated
+        else "MergeTree()"
+    )
+    node.query_with_retry(
+        """
+        CREATE TABLE {table_name}
+        (
+        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 = {engine} 
+        ORDER BY (postcode1, postcode2, addr1, addr2)
+        """.format(
+            table_name=table_name, engine=engine
+        )
+    )
+
+
+def test_both_mergtree(start_cluster):
+    create_source_table(replica1, "source", False)
+    create_destination_table(replica1, "destination", False)
+
+    replica1.query(f"ALTER TABLE destination ATTACH PARTITION tuple() FROM source")
+
+    assert_eq_with_retry(
+        replica1,
+        f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM destination GROUP BY year ORDER BY year ASC",
+        replica1.query(
+            f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM source GROUP BY year ORDER BY year ASC"
+        ),
+    )
+
+    assert_eq_with_retry(
+        replica1, f"SELECT town from destination LIMIT 1", "SCARBOROUGH"
+    )
+
+    cleanup([replica1])
+
+
+def test_all_replicated(start_cluster):
+    create_source_table(replica1, "source", True)
+    create_destination_table(replica1, "destination", True)
+    create_destination_table(replica2, "destination", True)
+
+    replica1.query("SYSTEM SYNC REPLICA destination")
+    replica1.query(f"ALTER TABLE destination ATTACH PARTITION tuple() FROM source")
+
+    assert_eq_with_retry(
+        replica1,
+        f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM destination GROUP BY year ORDER BY year ASC",
+        replica1.query(
+            f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM source GROUP BY year ORDER BY year ASC"
+        ),
+    )
+    assert_eq_with_retry(
+        replica1,
+        f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM source GROUP BY year ORDER BY year ASC",
+        replica2.query(
+            f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM destination GROUP BY year ORDER BY year ASC"
+        ),
+    )
+
+    assert_eq_with_retry(
+        replica1, f"SELECT town from destination LIMIT 1", "SCARBOROUGH"
+    )
+
+    assert_eq_with_retry(
+        replica2, f"SELECT town from destination LIMIT 1", "SCARBOROUGH"
+    )
+
+    cleanup([replica1, replica2])
+
+
+def test_only_destination_replicated(start_cluster):
+    create_source_table(replica1, "source", False)
+    create_destination_table(replica1, "destination", True)
+    create_destination_table(replica2, "destination", True)
+
+    replica1.query("SYSTEM SYNC REPLICA destination")
+    replica1.query(f"ALTER TABLE destination ATTACH PARTITION tuple() FROM source")
+
+    assert_eq_with_retry(
+        replica1,
+        f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM destination GROUP BY year ORDER BY year ASC",
+        replica1.query(
+            f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM source GROUP BY year ORDER BY year ASC"
+        ),
+    )
+    assert_eq_with_retry(
+        replica1,
+        f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM source GROUP BY year ORDER BY year ASC",
+        replica2.query(
+            f"SELECT toYear(date) AS year,round(avg(price)) AS price,bar(price, 0, 1000000, 80) FROM destination GROUP BY year ORDER BY year ASC"
+        ),
+    )
+
+    assert_eq_with_retry(
+        replica1, f"SELECT town from destination LIMIT 1", "SCARBOROUGH"
+    )
+
+    assert_eq_with_retry(
+        replica2, f"SELECT town from destination LIMIT 1", "SCARBOROUGH"
+    )
+
+    cleanup([replica1, replica2])
diff --git a/tests/integration/test_attach_without_fetching/test.py b/tests/integration/test_attach_without_fetching/test.py
index b430387e0f1..67352e2dcbe 100644
--- a/tests/integration/test_attach_without_fetching/test.py
+++ b/tests/integration/test_attach_without_fetching/test.py
@@ -56,6 +56,7 @@ def check_data(nodes, detached_parts):
 
         node.query_with_retry("SYSTEM SYNC REPLICA test")
 
+    for node in nodes:
         print("> Checking data integrity for", node.name)
 
         for i in range(10):
diff --git a/tests/integration/test_backup_restore_azure_blob_storage/__init__.py b/tests/integration/test_backup_restore_azure_blob_storage/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_backup_restore_azure_blob_storage/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_backup_restore_azure_blob_storage/test.py b/tests/integration/test_backup_restore_azure_blob_storage/test.py
new file mode 100644
index 00000000000..a7c7b439560
--- /dev/null
+++ b/tests/integration/test_backup_restore_azure_blob_storage/test.py
@@ -0,0 +1,270 @@
+#!/usr/bin/env python3
+
+import gzip
+import json
+import logging
+import os
+import io
+import random
+import threading
+import time
+
+from azure.storage.blob import BlobServiceClient
+import helpers.client
+import pytest
+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
+
+
+def generate_cluster_def(port):
+    path = os.path.join(
+        os.path.dirname(os.path.realpath(__file__)),
+        "./_gen/named_collections.xml",
+    )
+    os.makedirs(os.path.dirname(path), exist_ok=True)
+    with open(path, "w") as f:
+        f.write(
+            f"""<clickhouse>
+    <named_collections>
+        <azure_conf1>
+            <connection_string>DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://azurite1:{port}/devstoreaccount1;</connection_string>
+            <container>cont</container>
+            <format>CSV</format>
+        </azure_conf1>
+        <azure_conf2>
+            <storage_account_url>http://azurite1:{port}/devstoreaccount1</storage_account_url>
+            <container>cont</container>
+            <format>CSV</format>
+            <account_name>devstoreaccount1</account_name>
+            <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
+        </azure_conf2>
+    </named_collections>
+</clickhouse>
+"""
+        )
+    return path
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        port = cluster.azurite_port
+        path = generate_cluster_def(port)
+        cluster.add_instance(
+            "node",
+            main_configs=[path],
+            with_azurite=True,
+        )
+        cluster.start()
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def azure_query(
+    node, query, expect_error="false", try_num=10, settings={}, query_on_retry=None
+):
+    for i in range(try_num):
+        try:
+            if expect_error == "true":
+                return node.query_and_get_error(query, settings=settings)
+            else:
+                return node.query(query, settings=settings)
+        except Exception as ex:
+            retriable_errors = [
+                "DB::Exception: Azure::Core::Http::TransportException: Connection was closed by the server while trying to read a response",
+                "DB::Exception: Azure::Core::Http::TransportException: Connection closed before getting full response or response is less than expected",
+                "DB::Exception: Azure::Core::Http::TransportException: Connection was closed by the server while trying to read a response",
+                "DB::Exception: Azure::Core::Http::TransportException: Error while polling for socket ready read",
+                "Azure::Core::Http::TransportException, e.what() = Connection was closed by the server while trying to read a response",
+                "Azure::Core::Http::TransportException, e.what() = Connection closed before getting full response or response is less than expected",
+                "Azure::Core::Http::TransportException, e.what() = Connection was closed by the server while trying to read a response",
+                "Azure::Core::Http::TransportException, e.what() = Error while polling for socket ready read",
+            ]
+            retry = False
+            for error in retriable_errors:
+                if error in str(ex):
+                    retry = True
+                    print(f"Try num: {i}. Having retriable error: {ex}")
+                    time.sleep(i)
+                    break
+            if not retry or i == try_num - 1:
+                raise Exception(ex)
+            if query_on_retry is not None:
+                node.query(query_on_retry)
+            continue
+
+
+def get_azure_file_content(filename, port):
+    container_name = "cont"
+    connection_string = (
+        f"DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;"
+        f"AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;"
+        f"BlobEndpoint=http://127.0.0.1:{port}/devstoreaccount1;"
+    )
+    blob_service_client = BlobServiceClient.from_connection_string(
+        str(connection_string)
+    )
+    container_client = blob_service_client.get_container_client(container_name)
+    blob_client = container_client.get_blob_client(filename)
+    download_stream = blob_client.download_blob()
+    return download_stream.readall().decode("utf-8")
+
+
+def put_azure_file_content(filename, port, data):
+    container_name = "cont"
+    connection_string = (
+        f"DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;"
+        f"AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;"
+        f"BlobEndpoint=http://127.0.0.1:{port}/devstoreaccount1;"
+    )
+    blob_service_client = BlobServiceClient.from_connection_string(connection_string)
+    try:
+        container_client = blob_service_client.create_container(container_name)
+    except:
+        container_client = blob_service_client.get_container_client(container_name)
+
+    blob_client = container_client.get_blob_client(filename)
+    buf = io.BytesIO(data)
+    blob_client.upload_blob(buf)
+
+
+@pytest.fixture(autouse=True, scope="function")
+def delete_all_files(cluster):
+    port = cluster.env_variables["AZURITE_PORT"]
+    connection_string = (
+        f"DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;"
+        f"AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;"
+        f"BlobEndpoint=http://127.0.0.1:{port}/devstoreaccount1;"
+    )
+    blob_service_client = BlobServiceClient.from_connection_string(connection_string)
+    containers = blob_service_client.list_containers()
+    for container in containers:
+        container_client = blob_service_client.get_container_client(container)
+        blob_list = container_client.list_blobs()
+        for blob in blob_list:
+            print(blob)
+            blob_client = container_client.get_blob_client(blob)
+            blob_client.delete_blob()
+
+        assert len(list(container_client.list_blobs())) == 0
+
+    yield
+
+
+def test_backup_restore(cluster):
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+    azure_query(
+        node,
+        f"CREATE TABLE test_simple_write_connection_string (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_c.csv', 'CSV')",
+    )
+    azure_query(
+        node, f"INSERT INTO test_simple_write_connection_string VALUES (1, 'a')"
+    )
+    print(get_azure_file_content("test_simple_write_c.csv", port))
+    assert get_azure_file_content("test_simple_write_c.csv", port) == '1,"a"\n'
+
+    backup_destination = f"AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_c_backup.csv')"
+    azure_query(
+        node,
+        f"BACKUP TABLE test_simple_write_connection_string TO {backup_destination}",
+    )
+    print(get_azure_file_content("test_simple_write_c_backup.csv.backup", port))
+    azure_query(
+        node,
+        f"RESTORE TABLE test_simple_write_connection_string AS test_simple_write_connection_string_restored FROM {backup_destination};",
+    )
+    assert (
+        azure_query(node, f"SELECT * from test_simple_write_connection_string_restored")
+        == "1\ta\n"
+    )
+
+
+def test_backup_restore_diff_container(cluster):
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+    azure_query(
+        node,
+        f"CREATE TABLE test_simple_write_connection_string_cont1 (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_c_cont1.csv', 'CSV')",
+    )
+    azure_query(
+        node, f"INSERT INTO test_simple_write_connection_string_cont1 VALUES (1, 'a')"
+    )
+    backup_destination = f"AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont1', 'test_simple_write_c_backup_cont1.csv')"
+    azure_query(
+        node,
+        f"BACKUP TABLE test_simple_write_connection_string_cont1 TO {backup_destination}",
+    )
+    azure_query(
+        node,
+        f"RESTORE TABLE test_simple_write_connection_string_cont1 AS test_simple_write_connection_string_restored_cont1 FROM {backup_destination};",
+    )
+    assert (
+        azure_query(
+            node, f"SELECT * from test_simple_write_connection_string_restored_cont1"
+        )
+        == "1\ta\n"
+    )
+
+
+def test_backup_restore_with_named_collection_azure_conf1(cluster):
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+    azure_query(
+        node,
+        f"CREATE TABLE test_write_connection_string (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write.csv', 'CSV')",
+    )
+    azure_query(node, f"INSERT INTO test_write_connection_string VALUES (1, 'a')")
+    print(get_azure_file_content("test_simple_write.csv", port))
+    assert get_azure_file_content("test_simple_write.csv", port) == '1,"a"\n'
+
+    backup_destination = (
+        f"AzureBlobStorage(azure_conf1, 'test_simple_write_nc_backup.csv')"
+    )
+    azure_query(
+        node,
+        f"BACKUP TABLE test_write_connection_string TO {backup_destination}",
+    )
+    print(get_azure_file_content("test_simple_write_nc_backup.csv.backup", port))
+    azure_query(
+        node,
+        f"RESTORE TABLE test_write_connection_string AS test_write_connection_string_restored FROM {backup_destination};",
+    )
+    assert (
+        azure_query(node, f"SELECT * from test_write_connection_string_restored")
+        == "1\ta\n"
+    )
+
+
+def test_backup_restore_with_named_collection_azure_conf2(cluster):
+    node = cluster.instances["node"]
+    port = cluster.env_variables["AZURITE_PORT"]
+    azure_query(
+        node,
+        f"CREATE TABLE test_write_connection_string_2 (key UInt64, data String) Engine = AzureBlobStorage('{cluster.env_variables['AZURITE_CONNECTION_STRING']}', 'cont', 'test_simple_write_2.csv', 'CSV')",
+    )
+    azure_query(node, f"INSERT INTO test_write_connection_string_2 VALUES (1, 'a')")
+    print(get_azure_file_content("test_simple_write_2.csv", port))
+    assert get_azure_file_content("test_simple_write_2.csv", port) == '1,"a"\n'
+
+    backup_destination = (
+        f"AzureBlobStorage(azure_conf2, 'test_simple_write_nc_backup_2.csv')"
+    )
+    azure_query(
+        node,
+        f"BACKUP TABLE test_write_connection_string_2 TO {backup_destination}",
+    )
+    print(get_azure_file_content("test_simple_write_nc_backup_2.csv.backup", port))
+    azure_query(
+        node,
+        f"RESTORE TABLE test_write_connection_string_2 AS test_write_connection_string_restored_2 FROM {backup_destination};",
+    )
+    assert (
+        azure_query(node, f"SELECT * from test_write_connection_string_restored_2")
+        == "1\ta\n"
+    )
diff --git a/tests/integration/test_backup_restore_new/configs/shutdown_cancel_backups.xml b/tests/integration/test_backup_restore_new/configs/shutdown_cancel_backups.xml
new file mode 100644
index 00000000000..e0c0e0b32cd
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/configs/shutdown_cancel_backups.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <shutdown_wait_backups_and_restores>false</shutdown_wait_backups_and_restores>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_new/configs/slow_backups.xml b/tests/integration/test_backup_restore_new/configs/slow_backups.xml
new file mode 100644
index 00000000000..96860e65fdc
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/configs/slow_backups.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <backups>
+        <test_inject_sleep>true</test_inject_sleep>
+    </backups>
+    <backup_threads>2</backup_threads>
+    <restore_threads>2</restore_threads>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_new/test.py b/tests/integration/test_backup_restore_new/test.py
index cac458f616d..34ffdf7a8df 100644
--- a/tests/integration/test_backup_restore_new/test.py
+++ b/tests/integration/test_backup_restore_new/test.py
@@ -591,6 +591,138 @@ def test_zip_archive_with_bad_compression_method():
     )
 
 
+def test_tar_archive():
+    backup_name = f"Disk('backups', 'archive.tar')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_bz2_archive():
+    backup_name = f"Disk('backups', 'archive.tar.bz2')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_gz_archive():
+    backup_name = f"Disk('backups', 'archive.tar.gz')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_lzma_archive():
+    backup_name = f"Disk('backups', 'archive.tar.lzma')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_zst_archive():
+    backup_name = f"Disk('backups', 'archive.tar.zst')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_xz_archive():
+    backup_name = f"Disk('backups', 'archive.tar.xz')"
+    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}")
+
+    assert os.path.isfile(get_path_to_backup(backup_name))
+
+    instance.query("DROP TABLE test.table")
+    assert instance.query("EXISTS test.table") == "0\n"
+
+    instance.query(f"RESTORE TABLE test.table FROM {backup_name}")
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+
+def test_tar_archive_with_password():
+    backup_name = f"Disk('backups', 'archive_with_password.tar')"
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+    expected_error = "Setting a password is not currently supported for libarchive"
+    assert expected_error in instance.query_and_get_error(
+        f"BACKUP TABLE test.table TO {backup_name} SETTINGS id='tar_archive_with_password', password='password123'"
+    )
+    assert (
+        instance.query(
+            "SELECT status FROM system.backups WHERE id='tar_archive_with_password'"
+        )
+        == "BACKUP_FAILED\n"
+    )
+
+
+def test_tar_archive_with_bad_compression_method():
+    backup_name = f"Disk('backups', 'archive_with_bad_compression_method.tar')"
+    create_and_fill_table()
+
+    assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
+
+    expected_error = "Using compression_method and compression_level options are not supported for tar archives"
+    assert expected_error in instance.query_and_get_error(
+        f"BACKUP TABLE test.table TO {backup_name} SETTINGS id='tar_archive_with_bad_compression_method', compression_method='foobar'"
+    )
+    assert (
+        instance.query(
+            "SELECT status FROM system.backups WHERE id='tar_archive_with_bad_compression_method'"
+        )
+        == "BACKUP_FAILED\n"
+    )
+
+
 def test_async():
     create_and_fill_table()
     assert instance.query("SELECT count(), sum(x) FROM test.table") == "100\t4950\n"
@@ -885,7 +1017,7 @@ def test_required_privileges():
     instance.query("CREATE USER u1")
 
     backup_name = new_backup_name()
-    expected_error = "necessary to have the grant BACKUP ON test.table"
+    expected_error = "necessary to have the grant BACKUP ON test.`table`"
     assert expected_error in instance.query_and_get_error(
         f"BACKUP TABLE test.table TO {backup_name}", user="u1"
     )
@@ -893,7 +1025,7 @@ def test_required_privileges():
     instance.query("GRANT BACKUP ON test.table TO u1")
     instance.query(f"BACKUP TABLE test.table TO {backup_name}", user="u1")
 
-    expected_error = "necessary to have the grant INSERT, CREATE TABLE ON test.table"
+    expected_error = "necessary to have the grant INSERT, CREATE TABLE ON test.`table`"
     assert expected_error in instance.query_and_get_error(
         f"RESTORE TABLE test.table FROM {backup_name}", user="u1"
     )
@@ -910,7 +1042,7 @@ def test_required_privileges():
 
     instance.query("DROP TABLE test.table")
 
-    expected_error = "necessary to have the grant INSERT, CREATE TABLE ON test.table"
+    expected_error = "necessary to have the grant INSERT, CREATE TABLE ON test.`table`"
     assert expected_error in instance.query_and_get_error(
         f"RESTORE ALL FROM {backup_name}", user="u1"
     )
@@ -963,7 +1095,7 @@ def test_system_users():
     instance.query("GRANT r1 TO r2 WITH ADMIN OPTION")
     instance.query("GRANT r2 TO u1")
 
-    instance.query("CREATE SETTINGS PROFILE prof1 SETTINGS custom_b=2 TO u1")
+    instance.query("CREATE SETTINGS PROFILE `prof1` SETTINGS custom_b=2 TO u1")
     instance.query("CREATE ROW POLICY rowpol1 ON test.table USING x<50 TO u1")
     instance.query("CREATE QUOTA q1 TO r1")
 
@@ -984,7 +1116,7 @@ def test_system_users():
 
     assert (
         instance.query("SHOW CREATE USER u1")
-        == "CREATE USER u1 IDENTIFIED WITH sha256_password SETTINGS PROFILE default, custom_a = 1\n"
+        == "CREATE USER u1 IDENTIFIED WITH sha256_password SETTINGS PROFILE `default`, custom_a = 1\n"
     )
     assert instance.query("SHOW GRANTS FOR u1") == TSV(
         ["GRANT SELECT ON test.* TO u1", "GRANT r2 TO u1"]
@@ -998,11 +1130,11 @@ def test_system_users():
 
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE prof1")
-        == "CREATE SETTINGS PROFILE prof1 SETTINGS custom_b = 2 TO u1\n"
+        == "CREATE SETTINGS PROFILE `prof1` SETTINGS custom_b = 2 TO u1\n"
     )
     assert (
         instance.query("SHOW CREATE ROW POLICY rowpol1")
-        == "CREATE ROW POLICY rowpol1 ON test.table FOR SELECT USING x < 50 TO u1\n"
+        == "CREATE ROW POLICY rowpol1 ON test.`table` FOR SELECT USING x < 50 TO u1\n"
     )
     assert instance.query("SHOW CREATE QUOTA q1") == "CREATE QUOTA q1 TO r1\n"
 
diff --git a/tests/integration/test_backup_restore_new/test_cancel_backup.py b/tests/integration/test_backup_restore_new/test_cancel_backup.py
new file mode 100644
index 00000000000..cce23a7e932
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/test_cancel_backup.py
@@ -0,0 +1,233 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV, assert_eq_with_retry
+import uuid
+import re
+
+
+cluster = ClickHouseCluster(__file__)
+
+main_configs = [
+    "configs/backups_disk.xml",
+    "configs/slow_backups.xml",
+    "configs/shutdown_cancel_backups.xml",
+]
+
+node = cluster.add_instance(
+    "node",
+    main_configs=main_configs,
+    external_dirs=["/backups/"],
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def drop_after_test():
+    try:
+        yield
+    finally:
+        node.query("DROP TABLE IF EXISTS tbl SYNC")
+
+
+# Generate the backup name.
+def get_backup_name(backup_id):
+    return f"Disk('backups', '{backup_id}')"
+
+
+# Start making a backup asynchronously.
+def start_backup(backup_id):
+    node.query(
+        f"BACKUP TABLE tbl TO {get_backup_name(backup_id)} SETTINGS id='{backup_id}' ASYNC"
+    )
+
+    assert (
+        node.query(f"SELECT status FROM system.backups WHERE id='{backup_id}'")
+        == "CREATING_BACKUP\n"
+    )
+    assert (
+        node.query(
+            f"SELECT count() FROM system.processes WHERE query_kind='Backup' AND query LIKE '%{backup_id}%'"
+        )
+        == "1\n"
+    )
+
+
+# Wait for the backup to be completed.
+def wait_backup(backup_id):
+    assert_eq_with_retry(
+        node,
+        f"SELECT status FROM system.backups WHERE id='{backup_id}'",
+        "BACKUP_CREATED",
+        retry_count=60,
+        sleep_time=5,
+    )
+
+    backup_duration = int(
+        node.query(
+            f"SELECT end_time - start_time FROM system.backups WHERE id='{backup_id}'"
+        )
+    )
+    assert backup_duration >= 3  # Backup is not expected to be too quick in this test.
+
+
+# Cancel the specified backup.
+def cancel_backup(backup_id):
+    node.query(
+        f"KILL QUERY WHERE query_kind='Backup' AND query LIKE '%{backup_id}%' SYNC"
+    )
+    assert (
+        node.query(f"SELECT status FROM system.backups WHERE id='{backup_id}'")
+        == "BACKUP_CANCELLED\n"
+    )
+    expected_error = "QUERY_WAS_CANCELLED"
+    assert expected_error in node.query(
+        f"SELECT error FROM system.backups WHERE id='{backup_id}'"
+    )
+    assert (
+        node.query(
+            f"SELECT count() FROM system.processes WHERE query_kind='Backup' AND query LIKE '%{backup_id}%'"
+        )
+        == "0\n"
+    )
+    node.query("SYSTEM FLUSH LOGS")
+    kill_duration_ms = int(
+        node.query(
+            f"SELECT query_duration_ms FROM system.query_log WHERE query_kind='KillQuery' AND query LIKE '%{backup_id}%' AND type='QueryFinish'"
+        )
+    )
+    assert kill_duration_ms < 2000  # Query must be cancelled quickly
+
+
+# Start restoring from a backup.
+def start_restore(restore_id, backup_id):
+    node.query(
+        f"RESTORE TABLE tbl FROM {get_backup_name(backup_id)} SETTINGS id='{restore_id}' ASYNC"
+    )
+
+    assert (
+        node.query(f"SELECT status FROM system.backups WHERE id='{restore_id}'")
+        == "RESTORING\n"
+    )
+    assert (
+        node.query(
+            f"SELECT count() FROM system.processes WHERE query_kind='Restore' AND query LIKE '%{restore_id}%'"
+        )
+        == "1\n"
+    )
+
+
+# Wait for the restore operation to be completed.
+def wait_restore(restore_id):
+    assert_eq_with_retry(
+        node,
+        f"SELECT status FROM system.backups WHERE id='{restore_id}'",
+        "RESTORED",
+        retry_count=60,
+        sleep_time=5,
+    )
+
+    restore_duration = int(
+        node.query(
+            f"SELECT end_time - start_time FROM system.backups WHERE id='{restore_id}'"
+        )
+    )
+    assert (
+        restore_duration >= 3
+    )  # Restore is not expected to be too quick in this test.
+
+
+# Cancel the specified restore operation.
+def cancel_restore(restore_id):
+    node.query(
+        f"KILL QUERY WHERE query_kind='Restore' AND query LIKE '%{restore_id}%' SYNC"
+    )
+    assert (
+        node.query(f"SELECT status FROM system.backups WHERE id='{restore_id}'")
+        == "RESTORE_CANCELLED\n"
+    )
+    expected_error = "QUERY_WAS_CANCELLED"
+    assert expected_error in node.query(
+        f"SELECT error FROM system.backups WHERE id='{restore_id}'"
+    )
+    assert (
+        node.query(
+            f"SELECT count() FROM system.processes WHERE query_kind='Restore' AND query LIKE '%{restore_id}%'"
+        )
+        == "0\n"
+    )
+    node.query("SYSTEM FLUSH LOGS")
+    kill_duration_ms = int(
+        node.query(
+            f"SELECT query_duration_ms FROM system.query_log WHERE query_kind='KillQuery' AND query LIKE '%{restore_id}%' AND type='QueryFinish'"
+        )
+    )
+    assert kill_duration_ms < 2000  # Query must be cancelled quickly
+
+
+# Test that BACKUP and RESTORE operations can be cancelled with KILL QUERY.
+def test_cancel_backup():
+    # We use partitioning so backups would contain more files.
+    node.query(
+        "CREATE TABLE tbl (x UInt64) ENGINE=MergeTree() ORDER BY tuple() PARTITION BY x%20"
+    )
+
+    node.query(f"INSERT INTO tbl SELECT number FROM numbers(500)")
+
+    try_backup_id_1 = uuid.uuid4().hex
+    start_backup(try_backup_id_1)
+    cancel_backup(try_backup_id_1)
+
+    backup_id = uuid.uuid4().hex
+    start_backup(backup_id)
+    wait_backup(backup_id)
+
+    node.query(f"DROP TABLE tbl SYNC")
+
+    try_restore_id_1 = uuid.uuid4().hex
+    start_restore(try_restore_id_1, backup_id)
+    cancel_restore(try_restore_id_1)
+
+    # IF EXISTS because it's unknown whether RESTORE had managed to create a table before it got cancelled.
+    node.query(f"DROP TABLE IF EXISTS tbl SYNC")
+
+    restore_id = uuid.uuid4().hex
+    start_restore(restore_id, backup_id)
+    wait_restore(restore_id)
+
+
+# Test that shutdown cancels a running backup and doesn't wait until it finishes.
+def test_shutdown_cancel_backup():
+    node.query(
+        "CREATE TABLE tbl (x UInt64) ENGINE=MergeTree() ORDER BY tuple() PARTITION BY x%5"
+    )
+
+    node.query(f"INSERT INTO tbl SELECT number FROM numbers(500)")
+
+    backup_id = uuid.uuid4().hex
+    start_backup(backup_id)
+
+    node.restart_clickhouse()  # Must cancel the backup.
+
+    # The information about this cancelled backup must be stored in system.backup_log
+    assert node.query(
+        f"SELECT status FROM system.backup_log WHERE id='{backup_id}' ORDER BY status"
+    ) == TSV(["CREATING_BACKUP", "BACKUP_CANCELLED"])
+
+    # The table can't be restored from this backup.
+    expected_error = "Backup .* not found"
+    node.query("DROP TABLE tbl SYNC")
+    assert re.search(
+        expected_error,
+        node.query_and_get_error(
+            f"RESTORE TABLE tbl FROM {get_backup_name(backup_id)}"
+        ),
+    )
diff --git a/tests/integration/test_backup_restore_new/test_shutdown_wait_backup.py b/tests/integration/test_backup_restore_new/test_shutdown_wait_backup.py
new file mode 100644
index 00000000000..326e0c5da6c
--- /dev/null
+++ b/tests/integration/test_backup_restore_new/test_shutdown_wait_backup.py
@@ -0,0 +1,82 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV, assert_eq_with_retry
+import uuid
+
+
+cluster = ClickHouseCluster(__file__)
+
+main_configs = [
+    "configs/backups_disk.xml",
+    "configs/slow_backups.xml",
+]
+
+node = cluster.add_instance(
+    "node",
+    main_configs=main_configs,
+    external_dirs=["/backups/"],
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def drop_after_test():
+    try:
+        yield
+    finally:
+        node.query("DROP TABLE IF EXISTS tbl SYNC")
+
+
+# Generate the backup name.
+def get_backup_name(backup_id):
+    return f"Disk('backups', '{backup_id}')"
+
+
+# Start making a backup asynchronously.
+def start_backup(backup_id):
+    node.query(
+        f"BACKUP TABLE tbl TO {get_backup_name(backup_id)} SETTINGS id='{backup_id}' ASYNC"
+    )
+
+    assert (
+        node.query(f"SELECT status FROM system.backups WHERE id='{backup_id}'")
+        == "CREATING_BACKUP\n"
+    )
+    assert (
+        node.query(
+            f"SELECT count() FROM system.processes WHERE query_kind='Backup' AND query LIKE '%{backup_id}%'"
+        )
+        == "1\n"
+    )
+
+
+# Test that shutdown doesn't cancel a running backup and waits until it finishes.
+def test_shutdown_wait_backup():
+    node.query(
+        "CREATE TABLE tbl (x UInt64) ENGINE=MergeTree() ORDER BY tuple() PARTITION BY x%5"
+    )
+
+    node.query(f"INSERT INTO tbl SELECT number FROM numbers(500)")
+
+    backup_id = uuid.uuid4().hex
+    start_backup(backup_id)
+
+    node.restart_clickhouse()  # Must wait for the backup.
+
+    # The information about this backup must be stored in system.backup_log
+    assert node.query(
+        f"SELECT status FROM system.backup_log WHERE id='{backup_id}' ORDER BY status"
+    ) == TSV(["CREATING_BACKUP", "BACKUP_CREATED"])
+
+    # The table can be restored from this backup.
+    node.query("DROP TABLE tbl SYNC")
+    node.query(f"RESTORE TABLE tbl FROM {get_backup_name(backup_id)}")
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml b/tests/integration/test_backup_restore_on_cluster/configs/cluster.xml
similarity index 54%
rename from tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml
rename to tests/integration/test_backup_restore_on_cluster/configs/cluster.xml
index c91ec627580..1f7cb8155eb 100644
--- a/tests/integration/test_cluster_copier/configs/conf.d/clusters_trivial.xml
+++ b/tests/integration/test_backup_restore_on_cluster/configs/cluster.xml
@@ -1,20 +1,24 @@
 <clickhouse>
     <remote_servers>
-        <source_trivial_cluster>
+        <cluster>
             <shard>
                 <replica>
-                    <host>first_trivial</host>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
                     <port>9000</port>
                 </replica>
             </shard>
-        </source_trivial_cluster>
-        <destination_trivial_cluster>
+        </cluster>
+        <cluster1>
             <shard>
                 <replica>
-                    <host>second_trivial</host>
+                    <host>node1</host>
                     <port>9000</port>
                 </replica>
             </shard>
-        </destination_trivial_cluster>
+        </cluster1>
     </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_backup_restore_on_cluster/configs/cluster3.xml b/tests/integration/test_backup_restore_on_cluster/configs/cluster3.xml
new file mode 100644
index 00000000000..a591f22447e
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/configs/cluster3.xml
@@ -0,0 +1,20 @@
+<clickhouse>
+    <remote_servers>
+        <cluster3>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node2</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node3</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster3>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_on_cluster/configs/slow_replicated_merge_tree.xml b/tests/integration/test_backup_restore_on_cluster/configs/slow_replicated_merge_tree.xml
new file mode 100644
index 00000000000..c6bc1e31802
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/configs/slow_replicated_merge_tree.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <test>
+        <data_parts_exchange>
+            <delay_before_sending_part_ms>250</delay_before_sending_part_ms>
+        </data_parts_exchange>
+        <clone_replica>
+            <delay_before_removing_local_parts_ms>250</delay_before_removing_local_parts_ms>
+        </clone_replica>
+    </test>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_on_cluster/test.py b/tests/integration/test_backup_restore_on_cluster/test.py
index 20f538cca58..0f0821d229c 100644
--- a/tests/integration/test_backup_restore_on_cluster/test.py
+++ b/tests/integration/test_backup_restore_on_cluster/test.py
@@ -1,4 +1,3 @@
-from time import sleep
 import pytest
 import re
 import os.path
@@ -10,7 +9,8 @@ from helpers.test_tools import TSV, assert_eq_with_retry
 cluster = ClickHouseCluster(__file__)
 
 main_configs = [
-    "configs/remote_servers.xml",
+    "configs/cluster.xml",
+    "configs/cluster3.xml",
     "configs/replicated_access_storage.xml",
     "configs/replicated_user_defined_sql_objects.xml",
     "configs/backups_disk.xml",
@@ -164,8 +164,15 @@ def test_replicated_database():
     node2.query("INSERT INTO mydb.tbl VALUES (2, 'count')")
     node1.query("INSERT INTO mydb.tbl VALUES (3, 'your')")
     node2.query("INSERT INTO mydb.tbl VALUES (4, 'chickens')")
+    node1.query("OPTIMIZE TABLE mydb.tbl ON CLUSTER 'cluster' FINAL")
+
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
 
+    # check data in sync
+    expect = TSV([[1, "Don\\'t"], [2, "count"], [3, "your"], [4, "chickens"]])
+    assert node1.query("SELECT * FROM mydb.tbl ORDER BY x") == expect
+    assert node2.query("SELECT * FROM mydb.tbl ORDER BY x") == expect
+
     # Make backup.
     backup_name = new_backup_name()
     node1.query(
@@ -179,14 +186,63 @@ def test_replicated_database():
     node1.query(f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name}")
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
 
-    assert node1.query("SELECT * FROM mydb.tbl ORDER BY x") == TSV(
-        [[1, "Don\\'t"], [2, "count"], [3, "your"], [4, "chickens"]]
+    assert node1.query("SELECT * FROM mydb.tbl ORDER BY x") == expect
+    assert node2.query("SELECT * FROM mydb.tbl ORDER BY x") == expect
+
+
+def test_replicated_database_compare_parts():
+    """
+    stop merges and fetches then write data to two nodes and
+    compare that parts are restored from single node (second) after backup
+    replica is selected by settings replica_num=2, replica_num_in_backup=2
+    """
+    node1.query(
+        "CREATE DATABASE mydb ON CLUSTER 'cluster' ENGINE=Replicated('/clickhouse/path/','{shard}','{replica}')"
     )
 
-    assert node2.query("SELECT * FROM mydb.tbl ORDER BY x") == TSV(
-        [[1, "Don\\'t"], [2, "count"], [3, "your"], [4, "chickens"]]
+    node1.query(
+        "CREATE TABLE mydb.tbl(x UInt8, y String) ENGINE=ReplicatedMergeTree ORDER BY x"
     )
 
+    node2.query("SYSTEM SYNC DATABASE REPLICA mydb")
+
+    node1.query("SYSTEM STOP MERGES mydb.tbl")
+    node2.query("SYSTEM STOP MERGES mydb.tbl")
+
+    node1.query("SYSTEM STOP FETCHES mydb.tbl")
+    node2.query("SYSTEM STOP FETCHES mydb.tbl")
+
+    node1.query("INSERT INTO mydb.tbl VALUES (1, 'a')")
+    node1.query("INSERT INTO mydb.tbl VALUES (2, 'b')")
+
+    node2.query("INSERT INTO mydb.tbl VALUES (3, 'x')")
+    node2.query("INSERT INTO mydb.tbl VALUES (4, 'y')")
+
+    p2 = node2.query("SELECT * FROM mydb.tbl ORDER BY x")
+
+    # Make backup.
+    backup_name = new_backup_name()
+    node1.query(
+        f"BACKUP DATABASE mydb ON CLUSTER 'cluster' TO {backup_name} SETTINGS replica_num=2"
+    )
+
+    # Drop table on both nodes.
+    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} SETTINGS replica_num_in_backup=2"
+    )
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
+
+    # compare parts
+    p1_ = node1.query("SELECT _part, * FROM mydb.tbl ORDER BY x")
+    p2_ = node2.query("SELECT _part, * FROM mydb.tbl ORDER BY x")
+    assert p1_ == p2_
+
+    # compare data
+    assert p2 == node2.query("SELECT * FROM mydb.tbl ORDER BY x")
+
 
 def test_different_tables_on_nodes():
     node1.query(
@@ -427,7 +483,12 @@ def test_replicated_database_async():
     node1.query("INSERT INTO mydb.tbl VALUES (22)")
     node2.query("INSERT INTO mydb.tbl2 VALUES ('a')")
     node2.query("INSERT INTO mydb.tbl2 VALUES ('bb')")
+
+    node1.query("OPTIMIZE TABLE mydb.tbl ON CLUSTER 'cluster' FINAL")
+    node1.query("OPTIMIZE TABLE mydb.tbl2 ON CLUSTER 'cluster' FINAL")
+
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl2")
 
     backup_name = new_backup_name()
     [id, status] = node1.query(
@@ -457,6 +518,7 @@ def test_replicated_database_async():
     )
 
     node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl2")
 
     assert node1.query("SELECT * FROM mydb.tbl ORDER BY x") == TSV([1, 22])
     assert node2.query("SELECT * FROM mydb.tbl2 ORDER BY y") == TSV(["a", "bb"])
@@ -1087,9 +1149,11 @@ def test_stop_other_host_during_backup(kill):
     status = node1.query(f"SELECT status FROM system.backups WHERE id='{id}'").strip()
 
     if kill:
-        assert status in ["BACKUP_CREATED", "BACKUP_FAILED"]
+        expected_statuses = ["BACKUP_CREATED", "BACKUP_FAILED"]
     else:
-        assert status == "BACKUP_CREATED"
+        expected_statuses = ["BACKUP_CREATED", "BACKUP_CANCELLED"]
+
+    assert status in expected_statuses
 
     node2.start_clickhouse()
 
diff --git a/tests/integration/test_backup_restore_on_cluster/test_slow_rmt.py b/tests/integration/test_backup_restore_on_cluster/test_slow_rmt.py
new file mode 100644
index 00000000000..15c344eadf8
--- /dev/null
+++ b/tests/integration/test_backup_restore_on_cluster/test_slow_rmt.py
@@ -0,0 +1,119 @@
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV, assert_eq_with_retry, exec_query_with_retry
+
+
+cluster = ClickHouseCluster(__file__)
+
+main_configs = [
+    "configs/backups_disk.xml",
+    "configs/cluster.xml",
+    "configs/slow_replicated_merge_tree.xml",
+]
+
+user_configs = [
+    "configs/allow_database_types.xml",
+    "configs/zookeeper_retries.xml",
+]
+
+node1 = cluster.add_instance(
+    "node1",
+    main_configs=main_configs,
+    user_configs=user_configs,
+    external_dirs=["/backups/"],
+    macros={"replica": "node1", "shard": "shard1"},
+    with_zookeeper=True,
+)
+
+node2 = cluster.add_instance(
+    "node2",
+    main_configs=main_configs,
+    user_configs=user_configs,
+    external_dirs=["/backups/"],
+    macros={"replica": "node2", "shard": "shard1"},
+    with_zookeeper=True,
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def drop_after_test():
+    try:
+        yield
+    finally:
+        node1.query("DROP DATABASE IF EXISTS mydb ON CLUSTER 'cluster' SYNC")
+
+
+backup_id_counter = 0
+
+
+def new_backup_name():
+    global backup_id_counter
+    backup_id_counter += 1
+    return f"Disk('backups', '{backup_id_counter}')"
+
+
+def test_replicated_database_async():
+    node1.query(
+        "CREATE DATABASE mydb ON CLUSTER 'cluster' ENGINE=Replicated('/clickhouse/path/','{shard}','{replica}')"
+    )
+
+    node1.query("CREATE TABLE mydb.tbl(x UInt8) ENGINE=ReplicatedMergeTree ORDER BY x")
+
+    node1.query(
+        "CREATE TABLE mydb.tbl2(y String) ENGINE=ReplicatedMergeTree ORDER BY y"
+    )
+
+    node2.query("SYSTEM SYNC DATABASE REPLICA mydb")
+
+    node1.query("INSERT INTO mydb.tbl VALUES (1)")
+    node1.query("INSERT INTO mydb.tbl VALUES (22)")
+    node2.query("INSERT INTO mydb.tbl2 VALUES ('a')")
+    node2.query("INSERT INTO mydb.tbl2 VALUES ('bb')")
+    node1.query("SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
+
+    backup_name = new_backup_name()
+    id, status = node1.query(
+        f"BACKUP DATABASE mydb ON CLUSTER 'cluster' TO {backup_name} ASYNC"
+    ).split("\t")
+
+    assert status == "CREATING_BACKUP\n" or status == "BACKUP_CREATED\n"
+
+    assert_eq_with_retry(
+        node1,
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
+        TSV([["BACKUP_CREATED", ""]]),
+    )
+
+    node1.query("DROP DATABASE mydb ON CLUSTER 'cluster' SYNC")
+
+    id, status = node1.query(
+        f"RESTORE DATABASE mydb ON CLUSTER 'cluster' FROM {backup_name} ASYNC"
+    ).split("\t")
+
+    assert status == "RESTORING\n" or status == "RESTORED\n"
+
+    assert_eq_with_retry(
+        node1,
+        f"SELECT status, error FROM system.backups WHERE id='{id}'",
+        TSV([["RESTORED", ""]]),
+    )
+
+    # exec_query_with_retry() is here because `SYSTEM SYNC REPLICA` can throw `TABLE_IS_READ_ONLY`
+    # if any of these tables didn't start completely yet.
+    exec_query_with_retry(node1, "SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl")
+    exec_query_with_retry(node1, "SYSTEM SYNC REPLICA ON CLUSTER 'cluster' mydb.tbl2")
+
+    assert node1.query("SELECT * FROM mydb.tbl ORDER BY x") == TSV([1, 22])
+    assert node2.query("SELECT * FROM mydb.tbl2 ORDER BY y") == TSV(["a", "bb"])
+    assert node2.query("SELECT * FROM mydb.tbl ORDER BY x") == TSV([1, 22])
+    assert node1.query("SELECT * FROM mydb.tbl2 ORDER BY y") == TSV(["a", "bb"])
diff --git a/tests/integration/test_backup_restore_s3/configs/remote_servers.xml b/tests/integration/test_backup_restore_s3/configs/remote_servers.xml
new file mode 100644
index 00000000000..9607aac2003
--- /dev/null
+++ b/tests/integration/test_backup_restore_s3/configs/remote_servers.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_backup_restore_s3/configs/s3_settings.xml b/tests/integration/test_backup_restore_s3/configs/s3_settings.xml
index 981cf67bbe9..61ef7759b57 100644
--- a/tests/integration/test_backup_restore_s3/configs/s3_settings.xml
+++ b/tests/integration/test_backup_restore_s3/configs/s3_settings.xml
@@ -1,5 +1,6 @@
 <clickhouse>
     <s3>
+        <use_environment_credentials>0</use_environment_credentials>
         <multipart>
             <endpoint>http://minio1:9001/root/data/backups/multipart/</endpoint>
             <!-- We set max_single_part_upload_size and max_single_operation_copy_size to 1 here so
@@ -10,6 +11,13 @@
             <upload_part_size_multiply_parts_count_threshold>3</upload_part_size_multiply_parts_count_threshold>
             <upload_part_size_multiply_factor>2</upload_part_size_multiply_factor>
         </multipart>
+        <limited>
+            <endpoint>http://minio1:9001/root/data/backups/limited/</endpoint>
+            <access_key_id>minio</access_key_id>
+            <secret_access_key>minio123</secret_access_key>
+            <user>superuser1</user>
+            <user>superuser2</user>
+        </limited>
     </s3>
     <backup_threads>1</backup_threads>
     <restore_threads>1</restore_threads>
diff --git a/tests/integration/test_backup_restore_s3/test.py b/tests/integration/test_backup_restore_s3/test.py
index cd8f70b3239..05424887736 100644
--- a/tests/integration/test_backup_restore_s3/test.py
+++ b/tests/integration/test_backup_restore_s3/test.py
@@ -1,4 +1,4 @@
-from typing import Dict, Iterable
+from typing import Dict
 import pytest
 from helpers.cluster import ClickHouseCluster
 from helpers.test_tools import TSV
@@ -13,11 +13,13 @@ node = cluster.add_instance(
         "configs/named_collection_s3_backups.xml",
         "configs/s3_settings.xml",
         "configs/blob_log.xml",
+        "configs/remote_servers.xml",
     ],
     user_configs=[
         "configs/zookeeper_retries.xml",
     ],
     with_minio=True,
+    with_zookeeper=True,
 )
 
 
@@ -124,15 +126,17 @@ def check_backup_and_restore(
 def check_system_tables(backup_query_id=None):
     disks = [
         tuple(disk.split("\t"))
-        for disk in node.query("SELECT name, type FROM system.disks").split("\n")
+        for disk in node.query(
+            "SELECT name, type, object_storage_type, metadata_type FROM system.disks"
+        ).split("\n")
         if disk
     ]
     expected_disks = (
-        ("default", "local"),
-        ("disk_s3", "s3"),
-        ("disk_s3_cache", "s3"),
-        ("disk_s3_other_bucket", "s3"),
-        ("disk_s3_plain", "s3_plain"),
+        ("default", "Local", "None", "None"),
+        ("disk_s3", "ObjectStorage", "S3", "Local"),
+        ("disk_s3_cache", "ObjectStorage", "S3", "Local"),
+        ("disk_s3_other_bucket", "ObjectStorage", "S3", "Local"),
+        ("disk_s3_plain", "ObjectStorage", "S3", "Plain"),
     )
     assert len(expected_disks) == len(disks)
     for expected_disk in expected_disks:
@@ -452,3 +456,135 @@ def test_backup_to_zip():
     backup_name = new_backup_name()
     backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.zip', 'minio', 'minio123')"
     check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar_gz():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar.gz', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar_bz2():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar.bz2', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar_lzma():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar.lzma', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar_zst():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar.zst', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_backup_to_tar_xz():
+    storage_policy = "default"
+    backup_name = new_backup_name()
+    backup_destination = f"S3('http://minio1:9001/root/data/backups/{backup_name}.tar.xz', 'minio', 'minio123')"
+    check_backup_and_restore(storage_policy, backup_destination)
+
+
+def test_user_specific_auth(start_cluster):
+    def create_user(user):
+        node.query(f"CREATE USER {user}")
+        node.query(f"GRANT CURRENT GRANTS ON *.* TO {user}")
+
+    create_user("superuser1")
+    create_user("superuser2")
+    create_user("regularuser")
+
+    node.query("CREATE TABLE specific_auth (col UInt64) ENGINE=Memory")
+
+    assert "Access" in node.query_and_get_error(
+        "BACKUP TABLE specific_auth TO S3('http://minio1:9001/root/data/backups/limited/backup1.zip')"
+    )
+    assert "Access" in node.query_and_get_error(
+        "BACKUP TABLE specific_auth TO S3('http://minio1:9001/root/data/backups/limited/backup1.zip')",
+        user="regularuser",
+    )
+
+    node.query(
+        "BACKUP TABLE specific_auth TO S3('http://minio1:9001/root/data/backups/limited/backup1.zip')",
+        user="superuser1",
+    )
+    node.query(
+        "RESTORE TABLE specific_auth FROM S3('http://minio1:9001/root/data/backups/limited/backup1.zip')",
+        user="superuser1",
+    )
+
+    node.query(
+        "BACKUP TABLE specific_auth TO S3('http://minio1:9001/root/data/backups/limited/backup2.zip')",
+        user="superuser2",
+    )
+    node.query(
+        "RESTORE TABLE specific_auth FROM S3('http://minio1:9001/root/data/backups/limited/backup2.zip')",
+        user="superuser2",
+    )
+
+    assert "Access" in node.query_and_get_error(
+        "RESTORE TABLE specific_auth FROM S3('http://minio1:9001/root/data/backups/limited/backup1.zip')",
+        user="regularuser",
+    )
+
+    assert "HTTP response code: 403" in node.query_and_get_error(
+        "SELECT * FROM s3('http://minio1:9001/root/data/backups/limited/backup1.zip', 'RawBLOB')",
+        user="regularuser",
+    )
+
+    node.query(
+        "SELECT * FROM s3('http://minio1:9001/root/data/backups/limited/backup1.zip', 'RawBLOB')",
+        user="superuser1",
+    )
+
+    assert "Access Denied" in node.query_and_get_error(
+        "BACKUP TABLE specific_auth ON CLUSTER 'cluster' TO S3('http://minio1:9001/root/data/backups/limited/backup3/')",
+        user="regularuser",
+    )
+
+    node.query(
+        "BACKUP TABLE specific_auth ON CLUSTER 'cluster' TO S3('http://minio1:9001/root/data/backups/limited/backup3/')",
+        user="superuser1",
+    )
+
+    assert "Access Denied" in node.query_and_get_error(
+        "RESTORE TABLE specific_auth ON CLUSTER 'cluster' FROM S3('http://minio1:9001/root/data/backups/limited/backup3/')",
+        user="regularuser",
+    )
+
+    node.query(
+        "RESTORE TABLE specific_auth ON CLUSTER 'cluster' FROM S3('http://minio1:9001/root/data/backups/limited/backup3/')",
+        user="superuser1",
+    )
+
+    assert "Access Denied" in node.query_and_get_error(
+        "SELECT * FROM s3('http://minio1:9001/root/data/backups/limited/backup3/*', 'RawBLOB')",
+        user="regularuser",
+    )
+
+    node.query(
+        "SELECT * FROM s3('http://minio1:9001/root/data/backups/limited/backup3/*', 'RawBLOB')",
+        user="superuser1",
+    )
+
+    assert "Access Denied" in node.query_and_get_error(
+        "SELECT * FROM s3Cluster(cluster, 'http://minio1:9001/root/data/backups/limited/backup3/*', 'RawBLOB')",
+        user="regularuser",
+    )
+
+    node.query("DROP TABLE IF EXISTS test.specific_auth")
diff --git a/tests/integration/test_backward_compatibility/test.py b/tests/integration/test_backward_compatibility/test.py
index 847483f2b9b..7de5f51921b 100644
--- a/tests/integration/test_backward_compatibility/test.py
+++ b/tests/integration/test_backward_compatibility/test.py
@@ -1,22 +1,21 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/wide_parts_only.xml", "configs/no_compress_marks.xml"],
     with_zookeeper=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
index 94bc1d3bfc9..6b385bf8402 100644
--- a/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
+++ b/tests/integration/test_backward_compatibility/test_aggregate_fixed_key.py
@@ -1,18 +1,17 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
-node2 = cluster.add_instance("node2", with_zookeeper=True, allow_analyzer=False)
-node3 = cluster.add_instance("node3", with_zookeeper=True, allow_analyzer=False)
+node2 = cluster.add_instance("node2", with_zookeeper=True, use_old_analyzer=True)
+node3 = cluster.add_instance("node3", with_zookeeper=True, use_old_analyzer=True)
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_backward_compatibility/test_aggregate_function_state.py b/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
index 7789d13be0b..9878c1ed70e 100644
--- a/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
+++ b/tests/integration/test_backward_compatibility/test_aggregate_function_state.py
@@ -1,28 +1,26 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
-node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False)
-node4 = cluster.add_instance("node4", with_zookeeper=False, allow_analyzer=False)
+node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
+node4 = cluster.add_instance("node4", with_zookeeper=False, use_old_analyzer=True)
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_backward_compatibility/test_convert_ordinary.py b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
index 034a68e0f30..b8db4e005a4 100644
--- a/tests/integration/test_backward_compatibility/test_convert_ordinary.py
+++ b/tests/integration/test_backward_compatibility/test_convert_ordinary.py
@@ -1,15 +1,14 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_zookeeper=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
@@ -28,16 +27,22 @@ def q(query):
 
 
 def check_convert_system_db_to_atomic():
-    q(
-        "CREATE TABLE t(date Date, id UInt32) ENGINE = MergeTree PARTITION BY toYYYYMM(date) ORDER BY id"
+    node.query(
+        "CREATE DATABASE default2 ENGINE=Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+    q(
+        "CREATE TABLE default2.t(date Date, id UInt32) ENGINE = MergeTree PARTITION BY toYYYYMM(date) ORDER BY id"
+    )
+    q("INSERT INTO default2.t VALUES (today(), 1)")
+    q(
+        "INSERT INTO default2.t SELECT number % 1000, number FROM system.numbers LIMIT 1000000"
     )
-    q("INSERT INTO t VALUES (today(), 1)")
-    q("INSERT INTO t SELECT number % 1000, number FROM system.numbers LIMIT 1000000")
 
-    assert "1000001\n" == q("SELECT count() FROM t")
-    assert "499999500001\n" == q("SELECT sum(id) FROM t")
+    assert "1000001\n" == q("SELECT count() FROM default2.t")
+    assert "499999500001\n" == q("SELECT sum(id) FROM default2.t")
     assert "1970-01-01\t1000\t499500000\n1970-01-02\t1000\t499501000\n" == q(
-        "SELECT date, count(), sum(id) FROM t GROUP BY date ORDER BY date LIMIT 2"
+        "SELECT date, count(), sum(id) FROM default2.t GROUP BY date ORDER BY date LIMIT 2"
     )
     q("SYSTEM FLUSH LOGS")
 
@@ -49,7 +54,7 @@ def check_convert_system_db_to_atomic():
 
     node.restart_with_latest_version(fix_metadata=True)
 
-    assert "Ordinary" in node.query("SHOW CREATE DATABASE default")
+    assert "Ordinary" in node.query("SHOW CREATE DATABASE default2")
     assert "Atomic" in node.query("SHOW CREATE DATABASE system")
     assert "query_log" in node.query("SHOW TABLES FROM system")
     assert "part_log" in node.query("SHOW TABLES FROM system")
@@ -60,10 +65,11 @@ def check_convert_system_db_to_atomic():
     assert "1\n" == node.query("SELECT count() != 0 FROM system.query_log_0")
     assert "1\n" == node.query("SELECT count() != 0 FROM system.part_log_0")
     assert "1970-01-01\t1000\t499500000\n1970-01-02\t1000\t499501000\n" == node.query(
-        "SELECT date, count(), sum(id) FROM t GROUP BY date ORDER BY date LIMIT 2"
+        "SELECT date, count(), sum(id) FROM default2.t GROUP BY date ORDER BY date LIMIT 2"
     )
-    assert "INFORMATION_SCHEMA\ndefault\ninformation_schema\nsystem\n" == node.query(
-        "SELECT name FROM system.databases ORDER BY name"
+    assert (
+        "INFORMATION_SCHEMA\ndefault\ndefault2\ninformation_schema\nsystem\n"
+        == node.query("SELECT name FROM system.databases ORDER BY name")
     )
 
     errors_count = node.count_in_log("<Error>")
@@ -213,7 +219,7 @@ def check_convert_all_dbs_to_atomic():
     node.restart_clickhouse()
 
     assert (
-        ".o r d i n a r y.\natomic\ndefault\nordinary\nother\nsystem\n"
+        ".o r d i n a r y.\natomic\ndefault\ndefault2\nordinary\nother\nsystem\n"
         == node.query(
             "SELECT name FROM system.databases WHERE engine='Atomic' ORDER BY name"
         )
diff --git a/tests/integration/test_backward_compatibility/test_cte_distributed.py b/tests/integration/test_backward_compatibility/test_cte_distributed.py
index d47ae3aa255..e0be009e874 100644
--- a/tests/integration/test_backward_compatibility/test_cte_distributed.py
+++ b/tests/integration/test_backward_compatibility/test_cte_distributed.py
@@ -1,17 +1,16 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1", with_zookeeper=False, allow_analyzer=False)
+node1 = cluster.add_instance("node1", with_zookeeper=False, use_old_analyzer=True)
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="21.6",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_data_skipping_indices.py b/tests/integration/test_backward_compatibility/test_data_skipping_indices.py
deleted file mode 100644
index 46ab27d2ab0..00000000000
--- a/tests/integration/test_backward_compatibility/test_data_skipping_indices.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# pylint: disable=line-too-long
-# pylint: disable=unused-argument
-# pylint: disable=redefined-outer-name
-
-import pytest
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-node = cluster.add_instance(
-    "node",
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    stay_alive=True,
-    with_installed_binary=True,
-    allow_analyzer=False,
-)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-# TODO: cover other types too, but for this we need to add something like
-# restart_with_tagged_version(), since right now it is not possible to
-# switch to old tagged clickhouse version.
-def test_index(start_cluster):
-    node.query(
-        """
-    CREATE TABLE data
-    (
-        key Int,
-        value Nullable(Int),
-        INDEX value_index value TYPE minmax GRANULARITY 1
-    )
-    ENGINE = MergeTree
-    ORDER BY key;
-
-    INSERT INTO data SELECT number, number FROM numbers(10000);
-
-    SELECT * FROM data WHERE value = 20000 SETTINGS force_data_skipping_indices = 'value_index' SETTINGS force_data_skipping_indices = 'value_index', max_rows_to_read=1;
-    """
-    )
-    node.restart_with_latest_version()
-    node.query(
-        """
-    SELECT * FROM data WHERE value = 20000 SETTINGS force_data_skipping_indices = 'value_index' SETTINGS force_data_skipping_indices = 'value_index', max_rows_to_read=1;
-    DROP TABLE data;
-    """
-    )
diff --git a/tests/integration/test_backward_compatibility/test_functions.py b/tests/integration/test_backward_compatibility/test_functions.py
index b6b6ef28de5..1cf5c3deb81 100644
--- a/tests/integration/test_backward_compatibility/test_functions.py
+++ b/tests/integration/test_backward_compatibility/test_functions.py
@@ -5,21 +5,16 @@
 
 import logging
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.client import QueryRuntimeException
 
 cluster = ClickHouseCluster(__file__)
-upstream = cluster.add_instance("upstream", allow_analyzer=False)
+upstream = cluster.add_instance("upstream", use_old_analyzer=True)
 backward = cluster.add_instance(
     "backward",
     image="clickhouse/clickhouse-server",
-    # Note that a bug changed the string representation of several aggregations in 22.9 and 22.10 and some minor
-    # releases of 22.8, 22.7 and 22.3
-    # See https://github.com/ClickHouse/ClickHouse/issues/42916
-    # Affected at least: singleValueOrNull, last_value, min, max, any, anyLast, anyHeavy, first_value, argMin, argMax
-    tag="22.6",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_insert_profile_events.py b/tests/integration/test_backward_compatibility/test_insert_profile_events.py
index d38bece7855..a90453d045b 100644
--- a/tests/integration/test_backward_compatibility/test_insert_profile_events.py
+++ b/tests/integration/test_backward_compatibility/test_insert_profile_events.py
@@ -4,16 +4,15 @@
 
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
-upstream_node = cluster.add_instance("upstream_node", allow_analyzer=False)
+upstream_node = cluster.add_instance("upstream_node", use_old_analyzer=True)
 old_node = cluster.add_instance(
     "old_node",
     image="clickhouse/clickhouse-server",
-    tag="22.6",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py b/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
index 04016755a24..4752a589a44 100644
--- a/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
+++ b/tests/integration/test_backward_compatibility/test_ip_types_binary_compatibility.py
@@ -1,16 +1,15 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 # Version 21.6.3.14 has incompatible partition id for tables with UUID in partition key.
-node_22_6 = cluster.add_instance(
-    "node_22_6",
+node = cluster.add_instance(
+    "node",
     image="clickhouse/clickhouse-server",
-    tag="22.6",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
@@ -25,18 +24,18 @@ def start_cluster():
 
 
 def test_ip_types_binary_compatibility(start_cluster):
-    node_22_6.query(
+    node.query(
         "create table tab (ipv4 IPv4, ipv6 IPv6) engine = MergeTree order by tuple()"
     )
-    node_22_6.query(
+    node.query(
         "insert into tab values ('123.231.213.132', '0123:4567:89ab:cdef:fedc:ba98:7654:3210')"
     )
-    res_22_6 = node_22_6.query("select * from tab")
+    res_old = node.query("select * from tab")
 
-    node_22_6.restart_with_latest_version()
+    node.restart_with_latest_version()
 
-    res_latest = node_22_6.query("select * from tab")
+    res_latest = node.query("select * from tab")
 
-    assert res_22_6 == res_latest
+    assert res_old == res_latest
 
-    node_22_6.query("drop table tab")
+    node.query("drop table tab")
diff --git a/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py b/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
index 5261a279a4f..b13e6c975e8 100644
--- a/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
+++ b/tests/integration/test_backward_compatibility/test_memory_bound_aggregation.py
@@ -1,27 +1,25 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
-node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False)
+node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
 
 
 @pytest.fixture(scope="module")
diff --git a/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
index cf7a25e8dc1..83be0e4c5a3 100644
--- a/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
+++ b/tests/integration/test_backward_compatibility/test_normalized_count_comparison.py
@@ -1,17 +1,16 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1", with_zookeeper=False, allow_analyzer=False)
+node1 = cluster.add_instance("node1", with_zookeeper=False, use_old_analyzer=True)
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="21.6",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
index ec1d7fedac5..cbe147dc07b 100644
--- a/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
+++ b/tests/integration/test_backward_compatibility/test_select_aggregate_alias_column.py
@@ -1,17 +1,16 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance("node1", with_zookeeper=False, allow_analyzer=False)
+node1 = cluster.add_instance("node1", with_zookeeper=False, use_old_analyzer=True)
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="21.6",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
index e4fda618031..60375196366 100644
--- a/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
+++ b/tests/integration/test_backward_compatibility/test_short_strings_aggregation.py
@@ -1,27 +1,25 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=False,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
-node3 = cluster.add_instance("node3", with_zookeeper=False, allow_analyzer=False)
+node3 = cluster.add_instance("node3", with_zookeeper=False, use_old_analyzer=True)
 
 
 @pytest.fixture(scope="module")
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 9c9d1a4d312..e36c3310e4a 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
@@ -1,17 +1,16 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 
 node_old = cluster.add_instance(
     "node1",
     image="clickhouse/clickhouse-server",
-    tag="22.8",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
     with_zookeeper=True,
-    allow_analyzer=False,
 )
 node_new = cluster.add_instance(
     "node2",
@@ -21,7 +20,7 @@ node_new = cluster.add_instance(
     ],
     with_zookeeper=True,
     stay_alive=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 
 
diff --git a/tests/queries/0_stateless/02696_inverted_idx_checksums.reference b/tests/integration/test_broken_projections/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/02696_inverted_idx_checksums.reference
rename to tests/integration/test_broken_projections/__init__.py
diff --git a/tests/integration/test_broken_projections/config.d/backups.xml b/tests/integration/test_broken_projections/config.d/backups.xml
new file mode 100644
index 00000000000..4da8edffd67
--- /dev/null
+++ b/tests/integration/test_broken_projections/config.d/backups.xml
@@ -0,0 +1,13 @@
+<clickhouse>
+    <storage_configuration>
+        <disks>
+            <backups>
+                <type>local</type>
+                <path>/var/lib/clickhouse/disks/backups/</path>
+            </backups>
+        </disks>
+    </storage_configuration>
+    <backups>
+        <allowed_disk>backups</allowed_disk>
+    </backups>
+</clickhouse>
diff --git a/tests/integration/test_broken_projections/test.py b/tests/integration/test_broken_projections/test.py
new file mode 100644
index 00000000000..e198f98e4c5
--- /dev/null
+++ b/tests/integration/test_broken_projections/test.py
@@ -0,0 +1,763 @@
+import time
+import pytest
+import logging
+import string
+import random
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+
+@pytest.fixture(scope="module")
+def cluster():
+    try:
+        cluster = ClickHouseCluster(__file__)
+        cluster.add_instance(
+            "node",
+            main_configs=["config.d/backups.xml"],
+            stay_alive=True,
+            with_zookeeper=True,
+        )
+
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def create_table(node, table, replica, data_prefix="", aggressive_merge=True):
+    if data_prefix == "":
+        data_prefix = table
+
+    if aggressive_merge:
+        vertical_merge_algorithm_min_rows_to_activate = 1
+        vertical_merge_algorithm_min_columns_to_activate = 1
+        max_parts_to_merge_at_once = 3
+    else:
+        vertical_merge_algorithm_min_rows_to_activate = 100000
+        vertical_merge_algorithm_min_columns_to_activate = 100
+        max_parts_to_merge_at_once = 3
+
+    node.query(
+        f"""
+    DROP TABLE IF EXISTS {table} SYNC;
+    CREATE TABLE {table}
+    (
+        a String,
+        b String,
+        c Int64,
+        d Int64,
+        e Int64,
+        PROJECTION proj1
+        (
+            SELECT c ORDER BY d
+        ),
+        PROJECTION proj2
+        (
+            SELECT d ORDER BY c
+        )
+    )
+    ENGINE = ReplicatedMergeTree('/test_broken_projection_{data_prefix}/data/', '{replica}') ORDER BY a
+    SETTINGS min_bytes_for_wide_part = 0,
+        max_parts_to_merge_at_once={max_parts_to_merge_at_once},
+        enable_vertical_merge_algorithm=0,
+        vertical_merge_algorithm_min_rows_to_activate = {vertical_merge_algorithm_min_rows_to_activate},
+        vertical_merge_algorithm_min_columns_to_activate = {vertical_merge_algorithm_min_columns_to_activate},
+        compress_primary_key=0;
+    """
+    )
+
+
+def insert(node, table, offset, size):
+    node.query(
+        f"""
+        INSERT INTO {table}
+        SELECT number, number, number, number, number%2 FROM numbers({offset}, {size})
+        SETTINGS insert_keeper_fault_injection_probability=0.0;
+        """
+    )
+
+
+def get_parts(node, table):
+    return (
+        node.query(
+            f"""
+    SELECT name
+    FROM system.parts
+    WHERE table='{table}' AND database=currentDatabase() AND active = 1
+    ORDER BY name;"
+    """
+        )
+        .strip()
+        .split("\n")
+    )
+
+
+def bash(node, command):
+    node.exec_in_container(["bash", "-c", command], privileged=True, user="root")
+
+
+def break_projection(node, table, part, parent_part, break_type):
+    part_path = node.query(
+        f"""
+    SELECT path
+    FROM system.projection_parts
+    WHERE table='{table}'
+    AND database=currentDatabase()
+    AND active=1
+    AND part_name='{part}'
+    AND parent_name='{parent_part}'
+    ORDER BY modification_time DESC
+    LIMIT 1;
+    """
+    ).strip()
+
+    node.query(
+        f"select throwIf(substring('{part_path}', 1, 1) != '/', 'Path is relative: {part_path}')"
+    )
+
+    if break_type == "data":
+        bash(node, f"rm '{part_path}/d.bin'")
+        bash(node, f"rm '{part_path}/c.bin'")
+    elif break_type == "metadata":
+        bash(node, f"rm '{part_path}/columns.txt'")
+    elif break_type == "part":
+        bash(node, f"rm -r '{part_path}'")
+
+
+def break_part(node, table, part):
+    part_path = node.query(
+        f"""
+    SELECT path
+    FROM system.parts
+    WHERE table='{table}'
+    AND database=currentDatabase()
+    AND active=1
+    AND part_name='{part}'
+    ORDER BY modification_time DESC
+    LIMIT 1;
+    """
+    ).strip()
+
+    node.query(
+        f"select throwIf(substring('{part_path}', 1, 1) != '/', 'Path is relative: {part_path}')"
+    )
+    bash(node, f"rm '{part_path}/columns.txt'")
+
+
+def get_broken_projections_info(node, table, active=True):
+    return node.query(
+        f"""
+    SELECT parent_name, name, errors.name FROM
+    (
+        SELECT parent_name, name, exception_code
+        FROM system.projection_parts
+        WHERE table='{table}'
+        AND database=currentDatabase()
+        AND is_broken = 1
+        AND active = {active}
+    ) AS parts_info
+    INNER JOIN system.errors AS errors
+    ON parts_info.exception_code = errors.code
+    ORDER BY parent_name, name
+    """
+    ).strip()
+
+
+def get_projections_info(node, table):
+    return node.query(
+        f"""
+    SELECT parent_name, name, is_broken
+    FROM system.projection_parts
+    WHERE table='{table}'
+    AND active = 1
+    AND database=currentDatabase()
+    ORDER BY parent_name, name
+    """
+    ).strip()
+
+
+def optimize(node, table, final, no_wait):
+    query = f"OPTIMIZE TABLE {table}"
+    if final:
+        query += " FINAL"
+    if no_wait:
+        query += " SETTINGS alter_sync=0"
+    node.query(query)
+
+
+def reattach(node, table):
+    node.query(
+        f"""
+    DETACH TABLE {table};
+    ATTACH TABLE {table};
+    """
+    )
+
+
+def materialize_projection(node, table, proj):
+    node.query(
+        f"ALTER TABLE {table} MATERIALIZE PROJECTION {proj} SETTINGS mutations_sync=2"
+    )
+
+
+def check_table_full(node, table):
+    return node.query(
+        f"CHECK TABLE {table} SETTINGS check_query_single_value_result = 0;"
+    ).strip()
+
+
+def random_str(length=6):
+    alphabet = string.ascii_lowercase + string.digits
+    return "".join(random.SystemRandom().choice(alphabet) for _ in range(length))
+
+
+def check(
+    node,
+    table,
+    check_result,
+    expect_broken_part="",
+    expected_error="",
+    do_check_command=True,
+):
+    if expect_broken_part == "proj1":
+        assert expected_error in node.query_and_get_error(
+            f"SELECT c FROM '{table}' WHERE d == 12 ORDER BY c SETTINGS force_optimize_projection_name = 'proj1'"
+        )
+    else:
+        query_id = node.query(
+            f"SELECT queryID() FROM (SELECT c FROM '{table}' WHERE d == 12 ORDER BY c SETTINGS force_optimize_projection_name = 'proj1')"
+        ).strip()
+        for _ in range(10):
+            node.query("SYSTEM FLUSH LOGS")
+            res = node.query(
+                f"""
+            SELECT query, splitByChar('.', arrayJoin(projections))[-1]
+            FROM system.query_log
+            WHERE query_id='{query_id}' AND type='QueryFinish'
+            """
+            )
+            if res != "":
+                break
+        if res == "":
+            res = node.query(
+                """
+                SELECT query_id, query, splitByChar('.', arrayJoin(projections))[-1]
+                FROM system.query_log ORDER BY query_start_time_microseconds DESC
+            """
+            )
+            print(f"Looked for query id {query_id}, but to no avail: {res}")
+            assert False
+        assert "proj1" in res
+
+    if expect_broken_part == "proj2":
+        assert expected_error in node.query_and_get_error(
+            f"SELECT d FROM '{table}' WHERE c == 12 ORDER BY d SETTINGS force_optimize_projection_name = 'proj2'"
+        )
+    else:
+        query_id = node.query(
+            f"SELECT queryID() FROM (SELECT d FROM '{table}' WHERE c == 12 ORDER BY d SETTINGS force_optimize_projection_name = 'proj2')"
+        ).strip()
+        for _ in range(10):
+            node.query("SYSTEM FLUSH LOGS")
+            res = node.query(
+                f"""
+            SELECT query, splitByChar('.', arrayJoin(projections))[-1]
+            FROM system.query_log
+            WHERE query_id='{query_id}' AND type='QueryFinish'
+            """
+            )
+            if res != "":
+                break
+        if res == "":
+            res = node.query(
+                """
+                SELECT query_id, query, splitByChar('.', arrayJoin(projections))[-1]
+                FROM system.query_log ORDER BY query_start_time_microseconds DESC
+            """
+            )
+            print(f"Looked for query id {query_id}, but to no avail: {res}")
+            assert False
+        assert "proj2" in res
+
+    if do_check_command:
+        assert check_result == int(node.query(f"CHECK TABLE {table}"))
+
+
+def test_broken_ignored(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test1"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    # Break metadata (columns.txt) file of projection 'proj1'
+    break_projection(node, table_name, "proj1", "all_2_2_0", "metadata")
+
+    # Do select and after "check table" query.
+    # Select works because it does not read columns.txt.
+    # But expect check table result as 0.
+    check(node, table_name, 0)
+
+    # Projection 'proj1' from part all_2_2_0 will now appear in broken parts info
+    # because it was marked broken during "check table" query.
+    assert "all_2_2_0\tproj1\tFILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name
+    )
+
+    # Check table query will also show a list of parts which have broken projections.
+    assert "all_2_2_0" in check_table_full(node, table_name)
+
+    # Break data file of projection 'proj2' for part all_2_2_0
+    break_projection(node, table_name, "proj2", "all_2_2_0", "data")
+
+    # It will not yet appear in broken projections info.
+    assert "proj2" not in get_broken_projections_info(node, table_name)
+
+    # Select now fails with error "File doesn't exist"
+    check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
+
+    # Projection 'proj2' from part all_2_2_0 will now appear in broken parts info.
+    assert "all_2_2_0\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name
+    )
+
+    # Second select works, because projection is now marked as broken.
+    check(node, table_name, 0)
+
+    # Break data file of projection 'proj2' for part all_3_3_0
+    break_projection(node, table_name, "proj2", "all_3_3_0", "data")
+
+    # It will not yet appear in broken projections info.
+    assert "all_3_3_0" not in get_broken_projections_info(node, table_name)
+
+    insert(node, table_name, 20, 5)
+    insert(node, table_name, 25, 5)
+
+    # Part all_3_3_0 has 'proj' and 'proj2' projections, but 'proj2' is broken and server does NOT know it yet.
+    # Parts all_4_4_0 and all_5_5_0 have both non-broken projections.
+    # So a merge will be create for future part all_3_5_1.
+    # During merge it will fail to read from 'proj2' of part all_3_3_0 and proj2 will be marked broken.
+    # Merge will be retried and on second attempt it will succeed.
+    # The result part all_3_5_1 will have only 1 projection - 'proj', because
+    # it will skip 'proj2' as it will see that one part does not have it anymore in the set of valid projections.
+    optimize(node, table_name, 0, 1)
+    time.sleep(5)
+
+    # table_uuid=node.query(f"SELECT uuid FROM system.tables WHERE table='{table_name}' and database=currentDatabase()").strip()
+    # assert 0 < int(
+    #    node.query(
+    #        f"""
+    # SYSTEM FLUSH LOGS;
+    # SELECT count() FROM system.text_log
+    # WHERE level='Error'
+    # AND logger_name='MergeTreeBackgroundExecutor'
+    # AND message like 'Exception while executing background task %{table_uuid}:all_3_5_1%%Cannot open file%proj2.proj/c.bin%'
+    # """)
+    # )
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_5_1"] == get_parts(
+        node, table_name
+    )
+
+    assert "all_3_3_0" in get_broken_projections_info(node, table_name, active=False)
+    assert "all_2_2_0" in get_broken_projections_info(node, table_name, active=True)
+
+    # 0 because of all_2_2_0
+    check(node, table_name, 0)
+
+
+def test_materialize_broken_projection(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test2"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    break_projection(node, table_name, "proj1", "all_1_1_0", "metadata")
+    reattach(node, table_name)
+
+    assert "all_1_1_0\tproj1\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name
+    )
+    assert "Part all_1_1_0 has a broken projection proj1" in check_table_full(
+        node, table_name
+    )
+
+    break_projection(node, table_name, "proj2", "all_1_1_0", "data")
+    reattach(node, table_name)
+
+    assert "all_1_1_0\tproj2\tFILE_DOESNT_EXIST" in get_broken_projections_info(
+        node, table_name
+    )
+    assert "Part all_1_1_0 has a broken projection proj2" in check_table_full(
+        node, table_name
+    )
+
+    materialize_projection(node, table_name, "proj1")
+
+    assert "has a broken projection" not in check_table_full(node, table_name)
+
+
+def test_broken_ignored_replicated(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test3"
+    table_name2 = "test3_replica"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    check(node, table_name, 1)
+
+    create_table(node, table_name2, 2, table_name)
+    check(node, table_name2, 1)
+
+    break_projection(node, table_name, "proj1", "all_0_0_0", "data")
+    assert "Part all_0_0_0 has a broken projection proj1" in check_table_full(
+        node, table_name
+    )
+
+    break_part(node, table_name, "all_0_0_0")
+    node.query(f"SYSTEM SYNC REPLICA {table_name}")
+    assert "has a broken projection" not in check_table_full(node, table_name)
+
+
+def get_random_string(string_length=8):
+    alphabet = string.ascii_letters + string.digits
+    return "".join((random.choice(alphabet) for _ in range(string_length)))
+
+
+def test_broken_projections_in_backups_1(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test4"
+    create_table(node, table_name, 1, aggressive_merge=False, data_prefix=table_name)
+
+    node.query("SYSTEM STOP MERGES")
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    check(node, table_name, 1)
+
+    break_projection(node, table_name, "proj1", "all_2_2_0", "data")
+    check(node, table_name, 0, "proj1", "FILE_DOESNT_EXIST")
+
+    assert "all_2_2_0\tproj1\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name
+    )
+
+    backup_name = f"b1-{get_random_string()}"
+    assert "BACKUP_CREATED" in node.query(
+        f"""
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    backup table {table_name} to Disk('backups', '{backup_name}') settings check_projection_parts=false;
+    """
+    )
+
+    assert "RESTORED" in node.query(
+        f"""
+    drop table {table_name} sync;
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    restore table {table_name} from Disk('backups', '{backup_name}');
+    """
+    )
+
+    node.query("SYSTEM STOP MERGES")
+
+    check(node, table_name, 1)
+    assert "" == get_broken_projections_info(node, table_name)
+
+
+def test_broken_projections_in_backups_2(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test5"
+    create_table(node, table_name, 1, aggressive_merge=False, data_prefix=table_name)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    check(node, table_name, 1)
+    break_projection(node, table_name, "proj2", "all_2_2_0", "part")
+    check(node, table_name, 0, "proj2", "ErrnoException")
+
+    assert "all_2_2_0\tproj2\tFILE_DOESNT_EXIST" == get_broken_projections_info(
+        node, table_name
+    )
+
+    assert "FILE_DOESNT_EXIST" in node.query_and_get_error(
+        f"""
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    backup table {table_name} to Disk('backups', 'b2')
+    """
+    )
+
+    materialize_projection(node, table_name, "proj2")
+    check(node, table_name, 1)
+
+    backup_name = f"b3-{get_random_string()}"
+    assert "BACKUP_CREATED" in node.query(
+        f"""
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    backup table {table_name} to Disk('backups', '{backup_name}') settings check_projection_parts=false;
+    """
+    )
+
+    assert "RESTORED" in node.query(
+        f"""
+    drop table {table_name} sync;
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    restore table {table_name} from Disk('backups', '{backup_name}');
+    """
+    )
+    check(node, table_name, 1)
+
+
+def test_broken_projections_in_backups_3(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test6"
+    create_table(node, table_name, 1, aggressive_merge=False, data_prefix=table_name)
+
+    node.query("SYSTEM STOP MERGES")
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    check(node, table_name, 1)
+
+    break_projection(node, table_name, "proj1", "all_1_1_0", "part")
+    assert "Part all_1_1_0 has a broken projection proj1" in check_table_full(
+        node, table_name
+    )
+    assert "all_1_1_0\tproj1\tFILE_DOESNT_EXIST" == get_broken_projections_info(
+        node, table_name
+    )
+
+    backup_name = f"b4-{get_random_string()}"
+    assert "BACKUP_CREATED" in node.query(
+        f"""
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    backup table {table_name} to Disk('backups', '{backup_name}') settings check_projection_parts=false, allow_backup_broken_projections=true;
+    """
+    )
+
+    assert "RESTORED" in node.query(
+        f"""
+    drop table {table_name} sync;
+    set backup_restore_keeper_fault_injection_probability=0.0;
+    restore table {table_name} from Disk('backups', '{backup_name}');
+    """
+    )
+
+    check(node, table_name, 0)
+    assert "all_1_1_0\tproj1\tNO_FILE_IN_DATA_PART" == get_broken_projections_info(
+        node, table_name
+    )
+
+
+def test_check_part_thread(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "check_part_thread_test1"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    # Break data file of projection 'proj2' for part all_2_2_0
+    break_projection(node, table_name, "proj2", "all_2_2_0", "data")
+
+    # It will not yet appear in broken projections info.
+    assert "proj2" not in get_broken_projections_info(node, table_name)
+
+    # Select now fails with error "File doesn't exist"
+    check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST", do_check_command=False)
+
+    good = False
+    for _ in range(10):
+        # We marked projection as broken, checkPartThread must not complain about the part.
+        good = node.contains_in_log(
+            f"{table_name} (ReplicatedMergeTreePartCheckThread): Part all_2_2_0 looks good"
+        )
+        if good:
+            break
+        time.sleep(1)
+
+    assert good
+
+
+def test_broken_on_start(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test1"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    # Break data file of projection 'proj2' for part all_2_2_0
+    break_projection(node, table_name, "proj2", "all_2_2_0", "data")
+
+    # It will not yet appear in broken projections info.
+    assert "proj2" not in get_broken_projections_info(node, table_name)
+
+    # Select now fails with error "File doesn't exist"
+    # We will mark projection as broken.
+    check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
+
+    # Projection 'proj2' from part all_2_2_0 will now appear in broken parts info.
+    assert "all_2_2_0\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name
+    )
+
+    # Second select works, because projection is now marked as broken.
+    check(node, table_name, 0)
+
+    node.restart_clickhouse()
+
+    # It will not yet appear in broken projections info.
+    assert "proj2" in get_broken_projections_info(node, table_name)
+
+    # Select works
+    check(node, table_name, 0)
+
+
+def test_mutation_with_broken_projection(cluster):
+    node = cluster.instances["node"]
+
+    table_name = "test1"
+    create_table(node, table_name, 1)
+
+    insert(node, table_name, 0, 5)
+    insert(node, table_name, 5, 5)
+    insert(node, table_name, 10, 5)
+    insert(node, table_name, 15, 5)
+
+    assert ["all_0_0_0", "all_1_1_0", "all_2_2_0", "all_3_3_0"] == get_parts(
+        node, table_name
+    )
+
+    check(node, table_name, 1)
+
+    node.query(
+        f"ALTER TABLE {table_name} DELETE WHERE c == 11 SETTINGS mutations_sync = 1"
+    )
+
+    assert ["all_0_0_0_4", "all_1_1_0_4", "all_2_2_0_4", "all_3_3_0_4"] == get_parts(
+        node, table_name
+    )
+
+    assert "" == get_broken_projections_info(node, table_name)
+
+    check(node, table_name, 1)
+
+    # Break data file of projection 'proj2' for part all_2_2_0_4
+    break_projection(node, table_name, "proj2", "all_2_2_0_4", "data")
+
+    # It will not yet appear in broken projections info.
+    assert "proj2" not in get_broken_projections_info(node, table_name)
+
+    # Select now fails with error "File doesn't exist"
+    # We will mark projection as broken.
+    check(node, table_name, 0, "proj2", "FILE_DOESNT_EXIST")
+
+    # Projection 'proj2' from part all_2_2_0_4 will now appear in broken parts info.
+    assert "all_2_2_0_4\tproj2\tNO_FILE_IN_DATA_PART" in get_broken_projections_info(
+        node, table_name
+    )
+
+    # Second select works, because projection is now marked as broken.
+    check(node, table_name, 0)
+
+    assert "all_2_2_0_4" in get_broken_projections_info(node, table_name)
+
+    node.query(
+        f"ALTER TABLE {table_name} DELETE WHERE _part == 'all_0_0_0_4' SETTINGS mutations_sync = 1"
+    )
+
+    # All parts changes because this is how alter delete works,
+    # but all parts apart from the first have only hardlinks to files in previous part.
+    assert ["all_0_0_0_5", "all_1_1_0_5", "all_2_2_0_5", "all_3_3_0_5"] == get_parts(
+        node, table_name
+    ) or ["all_1_1_0_5", "all_2_2_0_5", "all_3_3_0_5"] == get_parts(node, table_name)
+
+    # Still broken because it was hardlinked.
+    broken = get_broken_projections_info(node, table_name)
+    assert (
+        "all_2_2_0_5" in broken or "" == broken
+    )  # second could be because of a merge.
+
+    if "" == broken:
+        check(node, table_name, 1)
+    else:
+        check(node, table_name, 0)
+
+    node.query(
+        f"ALTER TABLE {table_name} DELETE WHERE c == 13 SETTINGS mutations_sync = 1"
+    )
+
+    assert ["all_1_1_0_6", "all_2_2_0_6", "all_3_3_0_6"] == get_parts(
+        node, table_name
+    ) or ["all_0_0_0_6", "all_1_1_0_6", "all_2_2_0_6", "all_3_3_0_6"] == get_parts(
+        node, table_name
+    )
+
+    # Not broken anymore.
+    assert "" == get_broken_projections_info(node, table_name)
+
+    check(node, table_name, 1)
diff --git a/tests/integration/test_checking_s3_blobs_paranoid/configs/setting.xml b/tests/integration/test_checking_s3_blobs_paranoid/configs/setting.xml
index 23ab57f9330..d94ef68d9c4 100644
--- a/tests/integration/test_checking_s3_blobs_paranoid/configs/setting.xml
+++ b/tests/integration/test_checking_s3_blobs_paranoid/configs/setting.xml
@@ -5,6 +5,7 @@
         <default>
             <s3_check_objects_after_upload>1</s3_check_objects_after_upload>
             <enable_s3_requests_logging>1</enable_s3_requests_logging>
+            <s3_connect_timeout_ms>10000</s3_connect_timeout_ms>
         </default>
     </profiles>
     <users>
diff --git a/tests/integration/test_checking_s3_blobs_paranoid/configs/storage_conf.xml b/tests/integration/test_checking_s3_blobs_paranoid/configs/storage_conf.xml
index 7b1f503ed55..84f7f9f1b6d 100644
--- a/tests/integration/test_checking_s3_blobs_paranoid/configs/storage_conf.xml
+++ b/tests/integration/test_checking_s3_blobs_paranoid/configs/storage_conf.xml
@@ -19,6 +19,7 @@
                 <access_key_id>minio</access_key_id>
                 <secret_access_key>minio123</secret_access_key>
                 <skip_access_check>1</skip_access_check>
+                <s3_connect_timeout_ms>10000</s3_connect_timeout_ms>
             </broken_s3>
         </disks>
 
diff --git a/tests/integration/test_cluster_all_replicas/test.py b/tests/integration/test_cluster_all_replicas/test.py
index eb406de6a8d..d8bad180e1b 100644
--- a/tests/integration/test_cluster_all_replicas/test.py
+++ b/tests/integration/test_cluster_all_replicas/test.py
@@ -42,6 +42,17 @@ def test_cluster(start_cluster):
     )
 
 
+def test_global_in(start_cluster):
+    node1.query("DROP TABLE IF EXISTS u;")
+    node1.query("CREATE TABLE u(uid Int16) ENGINE=Memory as select 0")
+
+    assert set(
+        node1.query(
+            """SELECT hostName(), * FROM clusterAllReplicas("one_shard_two_nodes", system.one) where dummy GLOBAL IN u"""
+        ).splitlines()
+    ) == {"node1\t0", "node2\t0"}
+
+
 @pytest.mark.parametrize(
     "cluster",
     [
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml
deleted file mode 100644
index 07363e6e43a..00000000000
--- a/tests/integration/test_cluster_copier/configs/conf.d/clusters.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <cluster0>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>s0_0_0</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>s0_0_1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>s0_1_0</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster0>
-        <cluster1>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>s1_0_0</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>s1_0_1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>s1_1_0</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster1>
-        <shard_0_0>
-            <shard>
-                <internal_replication>true</internal_replication>
-                <replica>
-                    <host>s0_0_0</host>
-                    <port>9000</port>
-                </replica>
-                <replica>
-                    <host>s0_0_1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </shard_0_0>
-        <source_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>s0_0_0</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </source_trivial_cluster>
-        <destination_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>s1_0_0</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </destination_trivial_cluster>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml
deleted file mode 100644
index 64fa32335ab..00000000000
--- a/tests/integration/test_cluster_copier/configs/conf.d/ddl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml b/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml
deleted file mode 100644
index 1efc65bdb28..00000000000
--- a/tests/integration/test_cluster_copier/configs/conf.d/query_log.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<clickhouse>
-    <!-- Query log. Used only for queries with setting log_queries = 1. -->
-    <query_log>
-        <!-- What table to insert data. If table is not exist, it will be created.
-             When query log structure is changed after system update,
-              then old table will be renamed and new table will be created automatically.
-        -->
-        <database>system</database>
-        <table>query_log</table>
-
-        <!-- Interval of flushing data. -->
-        <flush_interval_milliseconds>1000</flush_interval_milliseconds>
-    </query_log>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs/config-copier.xml b/tests/integration/test_cluster_copier/configs/config-copier.xml
deleted file mode 100644
index 590b1892f8d..00000000000
--- a/tests/integration/test_cluster_copier/configs/config-copier.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<clickhouse>
-    <logger>
-        <level>information</level>
-        <log>/var/log/clickhouse-server/copier/log.log</log>
-        <errorlog>/var/log/clickhouse-server/copier/log.err.log</errorlog>
-        <size>1000M</size>
-        <count>10</count>
-        <stderr>/var/log/clickhouse-server/copier/stderr.log</stderr>
-        <stdout>/var/log/clickhouse-server/copier/stdout.log</stdout>
-    </logger>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs/users.xml b/tests/integration/test_cluster_copier/configs/users.xml
deleted file mode 100644
index b463dfc81e7..00000000000
--- a/tests/integration/test_cluster_copier/configs/users.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-            <!-- Just to test settings_pull -->
-            <max_rows_in_distinct>5</max_rows_in_distinct>
-            <allow_deprecated_syntax_for_merge_tree>1</allow_deprecated_syntax_for_merge_tree>
-        </default>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </default>
-        <dbuser>
-            <password>12345678</password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </dbuser>
-    </users>
-
-    <quotas>
-        <default>
-        </default>
-    </quotas>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml
deleted file mode 100644
index 9de7b57de27..00000000000
--- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/clusters.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <events>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>third</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-         </events>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml
deleted file mode 100644
index 64fa32335ab..00000000000
--- a/tests/integration/test_cluster_copier/configs_three_nodes/conf.d/ddl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml
deleted file mode 100644
index d0cab0fafb7..00000000000
--- a/tests/integration/test_cluster_copier/configs_three_nodes/config-copier.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<clickhouse>
-    <logger>
-        <level>information</level>
-        <log>/var/log/clickhouse-server/copier/log.log</log>
-        <errorlog>/var/log/clickhouse-server/copier/log.err.log</errorlog>
-        <size>1000M</size>
-        <count>10</count>
-        <stderr>/var/log/clickhouse-server/copier/stderr.log</stderr>
-        <stdout>/var/log/clickhouse-server/copier/stdout.log</stdout>
-    </logger>
-
-    <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>2000</session_timeout_ms>
-    </zookeeper>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml b/tests/integration/test_cluster_copier/configs_three_nodes/users.xml
deleted file mode 100644
index badaf46a5ca..00000000000
--- a/tests/integration/test_cluster_copier/configs_three_nodes/users.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-            <allow_deprecated_syntax_for_merge_tree>1</allow_deprecated_syntax_for_merge_tree>
-        </default>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </default>
-        <dbuser>
-            <password>12345678</password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </dbuser>
-    </users>
-
-    <quotas>
-        <default>
-        </default>
-    </quotas>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml
deleted file mode 100644
index 38d88308631..00000000000
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/clusters.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml
deleted file mode 100644
index 64fa32335ab..00000000000
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/ddl.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<clickhouse>
-    <distributed_ddl>
-        <path>/clickhouse/task_queue/ddl</path>
-    </distributed_ddl>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml b/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml
deleted file mode 100644
index 8306f40ad6a..00000000000
--- a/tests/integration/test_cluster_copier/configs_two_nodes/conf.d/storage_configuration.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<clickhouse>
-
-<storage_configuration>
-    <disks>
-        <default>
-        </default>
-        <jbod1>
-            <path>/jbod1/</path>
-        </jbod1>
-        <jbod2>
-            <path>/jbod2/</path>
-        </jbod2>
-        <external>
-            <path>/external/</path>
-        </external>
-    </disks>
-
-    <policies>
-        <external_with_jbods>
-            <volumes>
-                <external>
-                    <disk>external</disk>
-                </external>
-                <main>
-                    <disk>jbod1</disk>
-                    <disk>jbod2</disk>
-                </main>
-            </volumes>
-        </external_with_jbods>
-    </policies>
-
-</storage_configuration>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml b/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml
deleted file mode 100644
index 55bd24816ae..00000000000
--- a/tests/integration/test_cluster_copier/configs_two_nodes/config-copier.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<clickhouse>
-    <logger>
-        <level>information</level>
-        <log>/var/log/clickhouse-server/copier/log.log</log>
-        <errorlog>/var/log/clickhouse-server/copier/log.err.log</errorlog>
-        <size>1000M</size>
-        <count>10</count>
-        <stderr>/var/log/clickhouse-server/copier/stderr.log</stderr>
-        <stdout>/var/log/clickhouse-server/copier/stdout.log</stdout>
-    </logger>
-
-    <zookeeper>
-        <node index="1">
-            <host>zoo1</host>
-            <port>2181</port>
-        </node>
-        <session_timeout_ms>2000</session_timeout_ms>
-    </zookeeper>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml b/tests/integration/test_cluster_copier/configs_two_nodes/users.xml
deleted file mode 100644
index badaf46a5ca..00000000000
--- a/tests/integration/test_cluster_copier/configs_two_nodes/users.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<clickhouse>
-    <profiles>
-        <default>
-            <log_queries>1</log_queries>
-            <allow_deprecated_syntax_for_merge_tree>1</allow_deprecated_syntax_for_merge_tree>
-        </default>
-    </profiles>
-
-    <users>
-        <default>
-            <password></password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </default>
-        <dbuser>
-            <password>12345678</password>
-            <networks incl="networks" replace="replace">
-                <ip>::/0</ip>
-            </networks>
-            <profile>default</profile>
-            <quota>default</quota>
-        </dbuser>
-    </users>
-
-    <quotas>
-        <default>
-        </default>
-    </quotas>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task0_description.xml b/tests/integration/test_cluster_copier/task0_description.xml
deleted file mode 100644
index 8d74d0bdde0..00000000000
--- a/tests/integration/test_cluster_copier/task0_description.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<clickhouse>
-    <!-- How many simualteneous workers are posssible -->
-    <max_workers>3</max_workers>
-
-    <!-- Common setting for pull and push operations -->
-    <settings>
-        <connect_timeout>1</connect_timeout>
-    </settings>
-
-    <!-- Setting used to fetch data -->
-    <settings_pull>
-        <max_rows_in_distinct>0</max_rows_in_distinct>
-    </settings_pull>
-
-    <!-- Setting used to insert data -->
-    <settings_push>
-    </settings_push>
-
-    <!-- Tasks -->
-    <tables>
-        <hits>
-            <cluster_pull>cluster0</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>hits</table_pull>
-
-            <cluster_push>cluster1</cluster_push>
-            <database_push>default</database_push>
-            <table_push>hits</table_push>
-
-            <number_of_splits>2</number_of_splits>
-
-            <enabled_partitions>3 4 5 6 1 2 0   </enabled_partitions>
-
-            <!-- Engine of destination tables -->
-            <engine>ENGINE=ReplicatedMergeTree PARTITION BY d % 3 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16</engine>
-
-            <!-- Which sarding key to use while copying -->
-            <sharding_key>d + 1</sharding_key>
-
-            <!-- Optional expression that filter copying data -->
-            <where_condition>d - d = 0</where_condition>
-        </hits>
-    </tables>
-
-    <!-- Configuration of clusters -->
-    <remote_servers>
-    <cluster0>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s0_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_1_0</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster0>
-
-    <cluster1>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s1_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_1_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <!-- Died replica -->
-                <host>255.255.255.255</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster1>
-    </remote_servers>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_drop_target_partition.xml b/tests/integration/test_cluster_copier/task_drop_target_partition.xml
deleted file mode 100644
index dc8e6452243..00000000000
--- a/tests/integration/test_cluster_copier/task_drop_target_partition.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<clickhouse>
-<remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>source</cluster_pull>
-         <database_pull>db_drop_target_partition</database_pull>
-         <table_pull>source</table_pull>
-
-         <cluster_push>destination</cluster_push>
-         <database_push>db_drop_target_partition</database_push>
-         <table_push>destination</table_push>
-
-         <allow_to_drop_target_partitions>true</allow_to_drop_target_partitions>
-
-         <engine>ENGINE = MergeTree() PARTITION BY toYYYYMMDD(Column3) ORDER BY (Column3, Column2, Column1)</engine>
-         <sharding_key>rand()</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_month_to_week_description.xml b/tests/integration/test_cluster_copier/task_month_to_week_description.xml
deleted file mode 100644
index bc290ca397f..00000000000
--- a/tests/integration/test_cluster_copier/task_month_to_week_description.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<clickhouse>
-    <!-- How many simualteneous workers are posssible -->
-    <max_workers>4</max_workers>
-
-    <!-- Common setting for pull and push operations -->
-    <settings>
-        <connect_timeout>1</connect_timeout>
-        <max_block_size>2</max_block_size>
-    </settings>
-
-    <settings_pull>
-        <max_rows_in_distinct>0</max_rows_in_distinct>
-    </settings_pull>
-
-    <!-- Tasks -->
-    <tables>
-        <AB>
-            <cluster_pull>cluster0</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>a</table_pull>
-
-            <cluster_push>cluster1</cluster_push>
-            <database_push>default</database_push>
-            <table_push>b</table_push>
-
-            <!--
-            <enabled_partitions>
-                <partition></partition>
-            </enabled_partitions>
-            -->
-
-            <number_of_splits>2</number_of_splits>
-
-            <!-- Engine of destination tables -->
-            <engine>ENGINE=
-                ReplicatedMergeTree
-                PARTITION BY toMonday(date)
-                ORDER BY d
-            </engine>
-
-            <!-- Which sarding key to use while copying -->
-            <sharding_key>jumpConsistentHash(intHash64(d), 2)</sharding_key>
-
-            <!-- Optional expression that filter copying data -->
-            <!-- <where_condition></where_condition> -->
-        </AB>
-    </tables>
-
-    <!-- Configuration of clusters -->
-    <remote_servers>
-    <cluster0>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s0_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_1_0</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster0>
-
-    <cluster1>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s1_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_1_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <!-- Died replica -->
-                <host>255.255.255.255</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster1>
-    </remote_servers>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_no_arg.xml b/tests/integration/test_cluster_copier/task_no_arg.xml
deleted file mode 100644
index 262ff073537..00000000000
--- a/tests/integration/test_cluster_copier/task_no_arg.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-    <remote_servers>   
-       <source_cluster>
-          <shard>
-              <weight>1</weight>
-              <replica>
-                  <host>s0_0_0</host>
-                  <port>9000</port>
-              </replica>
-          </shard>
-      </source_cluster>     
-      <default_cluster>
-      
-        <shard>
-          <weight>1</weight>
-          <replica>
-              <host>s1_1_0</host>
-              <port>9000</port>
-          </replica>
-        </shard>
-            
-      </default_cluster>     
-    </remote_servers>
-    <max_workers>1</max_workers>
-
-    <tables>
-      <table_crm_fin_account>
-        <cluster_pull>source_cluster</cluster_pull>
-        <database_pull>default</database_pull>
-        <table_pull>copier_test1</table_pull>
-
-        <cluster_push>default_cluster</cluster_push>
-        <database_push>default</database_push>
-        <table_push>copier_test1_1</table_push>
-        <engine>ENGINE = MergeTree PARTITION BY date ORDER BY (date, sipHash64(date)) SAMPLE BY sipHash64(date)</engine>
-        <sharding_key>rand()</sharding_key>
-      </table_crm_fin_account>
-    </tables>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_no_index.xml b/tests/integration/test_cluster_copier/task_no_index.xml
deleted file mode 100644
index 265f99e21a6..00000000000
--- a/tests/integration/test_cluster_copier/task_no_index.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<clickhouse>
-    <remote_servers>
-        <source_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>s0_0_0</host>
-                        <port>9000</port>
-                    </replica>
-            </shard>
-        </source_cluster>
-
-        <destination_cluster>
-               <shard>
-                <internal_replication>false</internal_replication>
-                    <replica>
-                        <host>s1_1_0</host>
-                        <port>9000</port>
-                    </replica>
-               </shard>
-        </destination_cluster>
-    </remote_servers>
-
-    <!-- How many simultaneously active workers are possible. If you run more workers superfluous workers will sleep. -->
-    <max_workers>2</max_workers>
-
-    <!-- Setting used to fetch (pull) data from source cluster tables -->
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <!-- Setting used to insert (push) data to destination cluster tables -->
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <!-- Common setting for fetch (pull) and insert (push) operations. Also, copier process context uses it.
-         They are overlaid by <settings_pull/> and <settings_push/> respectively. -->
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <!-- Sync insert is set forcibly, leave it here just in case. -->
-        <distributed_foreground_insert>1</distributed_foreground_insert>
-    </settings>
-
-    <!-- Copying tasks description.
-         You could specify several table task in the same task description (in the same ZooKeeper node), they will be performed
-         sequentially.
-    -->
-    <tables>
-        <!-- A table task, copies one table. -->
-        <table_hits>
-            <!-- Source cluster name (from <remote_servers/> section) and tables in it that should be copied -->
-            <cluster_pull>source_cluster</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>ontime</table_pull>
-        <!-- <table_pull>onetime</table_pull> -->
-
-            <!-- Destination cluster name and tables in which the data should be inserted -->
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>default</database_push>
-            <table_push>ontime22</table_push>
-        <!-- <table_pull>onetime</table_pull> -->
-
-            <!-- Engine of destination tables.
-                 If destination tables have not be created, workers create them using columns definition from source tables and engine
-                 definition from here.
-
-                 NOTE: If the first worker starts insert data and detects that destination partition is not empty then the partition will
-                 be dropped and refilled, take it into account if you already have some data in destination tables. You could directly
-                 specify partitions that should be copied in <enabled_partitions/>, they should be in quoted format like partition column of
-                 system.parts table.
-        -->
-
-
-            <engine>
-    ENGINE = MergeTree() PARTITION BY Year ORDER BY (Year, FlightDate) SETTINGS index_granularity=8192
-        </engine>
-
-            <!-- Sharding key used to insert data to destination cluster -->
-
-        <sharding_key>jumpConsistentHash(intHash64(Year), 2)</sharding_key>
-
-            <!-- Optional expression that filter data while pull them from source servers -->
-        <!--  <where_condition>CounterID != 0</where_condition> -->
-
-            <!-- This section specifies partitions that should be copied, other partition will be ignored.
-                 Partition names should have the same format as
-                 partition column of system.parts table (i.e. a quoted text).
-                 Since partition key of source and destination cluster could be different,
-                 these partition names specify destination partitions.
-
-                 NOTE: In spite of this section is optional (if it is not specified, all partitions will be copied),
-                 it is strictly recommended to specify them explicitly.
-                 If you already have some ready partitions on destination cluster they
-                 will be removed at the start of the copying since they will be interpeted
-                 as unfinished data from the previous copying!!!
-        -->
-            <enabled_partitions>
-                <partition>2017</partition>
-            </enabled_partitions>
-        </table_hits>
-
-        <!-- Next table to copy. It is not copied until previous table is copying. -->
-    <!-- </table_visits>
-
-        </table_visits>
-    -->
-    </tables>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_non_partitioned_table.xml b/tests/integration/test_cluster_copier/task_non_partitioned_table.xml
deleted file mode 100644
index d5424b95f45..00000000000
--- a/tests/integration/test_cluster_copier/task_non_partitioned_table.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-    <remote_servers>   
-       <source_cluster>
-          <shard>
-              <weight>1</weight>
-              <replica>
-                  <host>s0_0_0</host>
-                  <port>9000</port>
-              </replica>
-          </shard>
-      </source_cluster>     
-      <default_cluster>
-      
-        <shard>
-          <weight>1</weight>
-          <replica>
-              <host>s1_1_0</host>
-              <port>9000</port>
-          </replica>
-        </shard>
-            
-      </default_cluster>     
-    </remote_servers>
-    <max_workers>1</max_workers>
-
-    <tables>
-      <table_copier_test1>
-        <cluster_pull>source_cluster</cluster_pull>
-        <database_pull>default</database_pull>
-        <table_pull>copier_test1</table_pull>
-
-        <cluster_push>default_cluster</cluster_push>
-        <database_push>default</database_push>
-        <table_push>copier_test1_1</table_push>
-        <engine>ENGINE = MergeTree ORDER BY date SETTINGS index_granularity = 8192</engine>
-        <sharding_key>rand()</sharding_key>
-      </table_copier_test1>
-    </tables>
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_self_copy.xml b/tests/integration/test_cluster_copier/task_self_copy.xml
deleted file mode 100644
index 21d577bc397..00000000000
--- a/tests/integration/test_cluster_copier/task_self_copy.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<clickhouse>
-    <tcp_port_secure>9440</tcp_port_secure>
-    <remote_servers>
-        <source_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                <replica>
-                    <host>s0_0_0</host>
-                    <port>9000</port>
-                    <user>dbuser</user>
-                    <password>12345678</password>
-                    <secure>0</secure>
-                </replica>
-            </shard>
-        </source_cluster>
-
-        <destination_cluster>
-            <shard>
-                <internal_replication>false</internal_replication>
-                <replica>
-                    <host>s0_0_0</host>
-                    <port>9000</port>
-                    <user>dbuser</user>
-                    <password>12345678</password>
-                    <secure>0</secure>
-                </replica>
-            </shard>
-        </destination_cluster>
-    </remote_servers>
-
-    <max_workers>2</max_workers>
-
-    <settings_pull>
-        <readonly>1</readonly>
-    </settings_pull>
-
-    <settings_push>
-        <readonly>0</readonly>
-    </settings_push>
-
-    <settings>
-        <connect_timeout>3</connect_timeout>
-        <distributed_foreground_insert>1</distributed_foreground_insert>
-    </settings>
-
-    <tables>
-        <table1>
-            <cluster_pull>source_cluster</cluster_pull>
-    	    <database_pull>db1</database_pull>
-            <table_pull>source_table</table_pull>
-
-            <cluster_push>destination_cluster</cluster_push>
-            <database_push>db2</database_push>
-            <table_push>destination_table</table_push>
-
-            <engine>
-	            ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192
-	        </engine>
-
-    	    <sharding_key>rand()</sharding_key>
-        </table1>
-    </tables>
-</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/task_skip_index.xml b/tests/integration/test_cluster_copier/task_skip_index.xml
deleted file mode 100644
index b04cec963d4..00000000000
--- a/tests/integration/test_cluster_copier/task_skip_index.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-<remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>source</cluster_pull>
-         <database_pull>db_skip_index</database_pull>
-         <table_pull>source</table_pull>
-
-         <cluster_push>destination</cluster_push>
-         <database_push>db_skip_index</database_push>
-         <table_push>destination</table_push>
-
-         <engine>ENGINE = MergeTree() PARTITION BY toYYYYMMDD(Column3) ORDER BY (Column3, Column2, Column1)</engine>
-         <sharding_key>rand()</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_taxi_data.xml b/tests/integration/test_cluster_copier/task_taxi_data.xml
deleted file mode 100644
index 94fa5087338..00000000000
--- a/tests/integration/test_cluster_copier/task_taxi_data.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<clickhouse>
-   <remote_servers>
-         <events>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>third</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-         </events>
-   </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>events</cluster_pull>
-         <database_pull>dailyhistory</database_pull>
-         <table_pull>yellow_tripdata_staging</table_pull>
-         <cluster_push>events</cluster_push>
-         <database_push>monthlyhistory</database_push>
-         <table_push>yellow_tripdata_staging</table_push>
-         <engine>Engine=ReplacingMergeTree() PRIMARY KEY (tpep_pickup_datetime, id) ORDER BY (tpep_pickup_datetime, id) PARTITION BY (pickup_location_id, toYYYYMM(tpep_pickup_datetime))</engine>
-         <sharding_key>sipHash64(id) % 3</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_cluster_copier/task_test_block_size.xml b/tests/integration/test_cluster_copier/task_test_block_size.xml
deleted file mode 100644
index bf29c7e1832..00000000000
--- a/tests/integration/test_cluster_copier/task_test_block_size.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<clickhouse>
-    <!-- How many simualteneous workers are posssible -->
-    <max_workers>1</max_workers>
-
-    <!-- Common setting for pull and push operations -->
-    <settings>
-        <connect_timeout>1</connect_timeout>
-    </settings>
-
-    <settings_pull>
-    </settings_pull>
-
-    <!-- Tasks -->
-    <tables>
-        <test_block_size>
-            <cluster_pull>shard_0_0</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>test_block_size</table_pull>
-
-            <cluster_push>cluster1</cluster_push>
-            <database_push>default</database_push>
-            <table_push>test_block_size</table_push>
-
-            <enabled_partitions>
-                <partition>'1970-01-01'</partition>
-            </enabled_partitions>
-
-            <!-- Engine of destination tables -->
-            <engine>ENGINE=
-                ReplicatedMergeTree
-                ORDER BY d PARTITION BY partition
-            </engine>
-
-            <!-- Which sarding key to use while copying -->
-            <sharding_key>jumpConsistentHash(intHash64(d), 2)</sharding_key>
-
-            <!-- Optional expression that filter copying data -->
-            <!-- <where_condition></where_condition> -->
-        </test_block_size>
-    </tables>
-
-    <!-- Configuration of clusters -->
-    <remote_servers>
-    <cluster0>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s0_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_1_0</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster0>
-
-    <cluster1>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s1_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s1_1_0</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </cluster1>
-
-    <shard_0_0>
-        <shard>
-            <internal_replication>true</internal_replication>
-            <replica>
-                <host>s0_0_0</host>
-                <port>9000</port>
-            </replica>
-            <replica>
-                <host>s0_0_1</host>
-                <port>9000</port>
-            </replica>
-        </shard>
-    </shard_0_0>
-    </remote_servers>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_trivial.xml b/tests/integration/test_cluster_copier/task_trivial.xml
deleted file mode 100644
index a3b8bc03888..00000000000
--- a/tests/integration/test_cluster_copier/task_trivial.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<clickhouse>
-    <!-- How many simualteneous workers are posssible -->
-    <max_workers>3</max_workers>
-
-    <!-- Common setting for pull and push operations -->
-    <settings>
-        <connect_timeout>1</connect_timeout>
-    </settings>
-
-    <!-- Setting used to fetch data -->
-    <settings_pull>
-        <max_rows_in_distinct>0</max_rows_in_distinct>
-    </settings_pull>
-
-    <!-- Setting used to insert data -->
-    <settings_push>
-    </settings_push>
-
-    <!-- Tasks -->
-    <tables>
-        <hits>
-            <cluster_pull>source_trivial_cluster</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>trivial</table_pull>
-
-            <cluster_push>destination_trivial_cluster</cluster_push>
-            <database_push>default</database_push>
-            <table_push>trivial</table_push>
-
-            <!-- Engine of destination tables -->
-            <engine>ENGINE=ReplicatedMergeTree('/clickhouse/tables/cluster{cluster}/{shard}/hits', '{replica}') PARTITION BY d % 5 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16</engine>
-
-            <!-- Which sarding key to use while copying -->
-            <sharding_key>d + 1</sharding_key>
-
-            <!-- Optional expression that filter copying data -->
-            <where_condition>d - d = 0</where_condition>
-        </hits>
-    </tables>
-
-    <!-- Configuration of clusters -->
-    <remote_servers>
-        <source_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>first_trivial</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </source_trivial_cluster>
-
-
-        <destination_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>second_trivial</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </destination_trivial_cluster>
-    </remote_servers>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml b/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml
deleted file mode 100644
index 0197dee0181..00000000000
--- a/tests/integration/test_cluster_copier/task_trivial_without_arguments.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<clickhouse>
-    <!-- How many simualteneous workers are posssible -->
-    <max_workers>3</max_workers>
-
-    <!-- Common setting for pull and push operations -->
-    <settings>
-        <connect_timeout>1</connect_timeout>
-    </settings>
-
-    <!-- Setting used to fetch data -->
-    <settings_pull>
-        <max_rows_in_distinct>0</max_rows_in_distinct>
-    </settings_pull>
-
-    <!-- Setting used to insert data -->
-    <settings_push>
-    </settings_push>
-
-    <!-- Tasks -->
-    <tables>
-        <hits>
-            <cluster_pull>source_trivial_cluster</cluster_pull>
-            <database_pull>default</database_pull>
-            <table_pull>trivial_without_arguments</table_pull>
-
-            <cluster_push>destination_trivial_cluster</cluster_push>
-            <database_push>default</database_push>
-            <table_push>trivial_without_arguments</table_push>
-
-            <!-- Engine of destination tables -->
-            <engine>ENGINE=ReplicatedMergeTree() PARTITION BY d % 5 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16</engine>
-
-            <!-- Which sarding key to use while copying -->
-            <sharding_key>d + 1</sharding_key>
-
-            <!-- Optional expression that filter copying data -->
-            <where_condition>d - d = 0</where_condition>
-        </hits>
-    </tables>
-
-    <!-- Configuration of clusters -->
-    <remote_servers>
-        <source_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>first_trivial</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </source_trivial_cluster>
-
-
-        <destination_trivial_cluster>
-            <shard>
-                <replica>
-                    <host>second_trivial</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </destination_trivial_cluster>
-    </remote_servers>
-
-</clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_ttl_columns.xml b/tests/integration/test_cluster_copier/task_ttl_columns.xml
deleted file mode 100644
index 2069c509c87..00000000000
--- a/tests/integration/test_cluster_copier/task_ttl_columns.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-<remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>source</cluster_pull>
-         <database_pull>db_ttl_columns</database_pull>
-         <table_pull>source</table_pull>
-
-         <cluster_push>destination</cluster_push>
-         <database_push>db_ttl_columns</database_push>
-         <table_push>destination</table_push>
-
-         <engine>ENGINE = MergeTree() PARTITION BY toYYYYMMDD(Column3) ORDER BY (Column3, Column2, Column1)</engine>
-         <sharding_key>rand()</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml b/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml
deleted file mode 100644
index 2a51fa7a66d..00000000000
--- a/tests/integration/test_cluster_copier/task_ttl_move_to_volume.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-<remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>source</cluster_pull>
-         <database_pull>db_move_to_volume</database_pull>
-         <table_pull>source</table_pull>
-
-         <cluster_push>destination</cluster_push>
-         <database_push>db_move_to_volume</database_push>
-         <table_push>destination</table_push>
-
-         <engine>ENGINE = MergeTree() PARTITION BY toYYYYMMDD(Column3) ORDER BY (Column3, Column2, Column1) TTL Column3 + INTERVAL 1 MONTH TO VOLUME 'external' SETTINGS storage_policy = 'external_with_jbods'</engine>
-         <sharding_key>rand()</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
diff --git a/tests/integration/test_cluster_copier/task_with_different_schema.xml b/tests/integration/test_cluster_copier/task_with_different_schema.xml
deleted file mode 100644
index e1e6ee4dc42..00000000000
--- a/tests/integration/test_cluster_copier/task_with_different_schema.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<clickhouse>
-<remote_servers>
-        <source>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>first_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </source>
-        <destination>
-             <shard>
-                 <internal_replication>false</internal_replication>
-                 <replica>
-                     <host>second_of_two</host>
-                     <port>9000</port>
-                 </replica>
-             </shard>
-        </destination>
-    </remote_servers>
-
-   <max_workers>2</max_workers>
-
-   <tables>
-     <table_events>
-         <cluster_pull>source</cluster_pull>
-         <database_pull>db_different_schema</database_pull>
-         <table_pull>source</table_pull>
-
-         <cluster_push>destination</cluster_push>
-         <database_push>db_different_schema</database_push>
-         <table_push>destination</table_push>
-
-         <engine>ENGINE = MergeTree() PARTITION BY toYYYYMMDD(Column3) ORDER BY (Column9, Column1, Column2, Column3, Column4)</engine>
-         <sharding_key>rand()</sharding_key>
-     </table_events>
-   </tables>
- </clickhouse>
diff --git a/tests/integration/test_cluster_copier/test.py b/tests/integration/test_cluster_copier/test.py
deleted file mode 100644
index be71fc21e33..00000000000
--- a/tests/integration/test_cluster_copier/test.py
+++ /dev/null
@@ -1,653 +0,0 @@
-import os
-import random
-import sys
-import time
-import kazoo
-import pytest
-import string
-import random
-from contextlib import contextmanager
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-import docker
-
-CURRENT_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.dirname(CURRENT_TEST_DIR))
-
-COPYING_FAIL_PROBABILITY = 0.2
-MOVING_FAIL_PROBABILITY = 0.2
-
-cluster = ClickHouseCluster(__file__)
-
-
-def generateRandomString(count):
-    return "".join(
-        random.choice(string.ascii_uppercase + string.digits) for _ in range(count)
-    )
-
-
-def check_all_hosts_sucesfully_executed(tsv_content, num_hosts):
-    M = TSV.toMat(tsv_content)
-    hosts = [(l[0], l[1]) for l in M]  # (host, port)
-    codes = [l[2] for l in M]
-
-    assert len(hosts) == num_hosts and len(set(hosts)) == num_hosts, "\n" + tsv_content
-    assert len(set(codes)) == 1, "\n" + tsv_content
-    assert codes[0] == "0", "\n" + tsv_content
-
-
-def ddl_check_query(instance, query, num_hosts=3):
-    contents = instance.query(query)
-    check_all_hosts_sucesfully_executed(contents, num_hosts)
-    return contents
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    global cluster
-    try:
-        clusters_schema = {
-            "0": {"0": ["0", "1"], "1": ["0"]},
-            "1": {"0": ["0", "1"], "1": ["0"]},
-        }
-
-        for cluster_name, shards in clusters_schema.items():
-            for shard_name, replicas in shards.items():
-                for replica_name in replicas:
-                    name = "s{}_{}_{}".format(cluster_name, shard_name, replica_name)
-                    cluster.add_instance(
-                        name,
-                        main_configs=[
-                            "configs/conf.d/query_log.xml",
-                            "configs/conf.d/ddl.xml",
-                            "configs/conf.d/clusters.xml",
-                        ],
-                        user_configs=["configs/users.xml"],
-                        macros={
-                            "cluster": cluster_name,
-                            "shard": shard_name,
-                            "replica": replica_name,
-                        },
-                        with_zookeeper=True,
-                    )
-
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-class Task1:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_simple_" + generateRandomString(10)
-        self.container_task_file = "/task0_description.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task0_description.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-
-        for cluster_num in ["0", "1"]:
-            ddl_check_query(
-                instance,
-                "DROP DATABASE IF EXISTS default ON CLUSTER cluster{} SYNC".format(
-                    cluster_num
-                ),
-            )
-            ddl_check_query(
-                instance,
-                "CREATE DATABASE default ON CLUSTER cluster{} ".format(cluster_num),
-            )
-
-        ddl_check_query(
-            instance,
-            "CREATE TABLE hits ON CLUSTER cluster0 (d UInt64, d1 UInt64 MATERIALIZED d+1) "
-            + "ENGINE=ReplicatedMergeTree "
-            + "PARTITION BY d % 3 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16",
-        )
-        ddl_check_query(
-            instance,
-            "CREATE TABLE hits_all ON CLUSTER cluster0 (d UInt64) ENGINE=Distributed(cluster0, default, hits, d)",
-        )
-        ddl_check_query(
-            instance,
-            "CREATE TABLE hits_all ON CLUSTER cluster1 (d UInt64) ENGINE=Distributed(cluster1, default, hits, d + 1)",
-        )
-        instance.query(
-            "INSERT INTO hits_all SELECT * FROM system.numbers LIMIT 1002",
-            settings={"distributed_foreground_insert": 1},
-        )
-
-    def check(self):
-        assert (
-            self.cluster.instances["s0_0_0"]
-            .query("SELECT count() FROM hits_all")
-            .strip()
-            == "1002"
-        )
-        assert (
-            self.cluster.instances["s1_0_0"]
-            .query("SELECT count() FROM hits_all")
-            .strip()
-            == "1002"
-        )
-
-        assert (
-            self.cluster.instances["s1_0_0"]
-            .query("SELECT DISTINCT d % 2 FROM hits")
-            .strip()
-            == "1"
-        )
-        assert (
-            self.cluster.instances["s1_1_0"]
-            .query("SELECT DISTINCT d % 2 FROM hits")
-            .strip()
-            == "0"
-        )
-
-        instance = self.cluster.instances["s0_0_0"]
-        ddl_check_query(instance, "DROP TABLE hits_all ON CLUSTER cluster0")
-        ddl_check_query(instance, "DROP TABLE hits_all ON CLUSTER cluster1")
-        ddl_check_query(instance, "DROP TABLE hits ON CLUSTER cluster0")
-        ddl_check_query(instance, "DROP TABLE hits ON CLUSTER cluster1")
-
-
-class Task2:
-    def __init__(self, cluster, unique_zk_path):
-        self.cluster = cluster
-        self.zk_task_path = (
-            "/clickhouse-copier/task_month_to_week_partition_" + generateRandomString(5)
-        )
-        self.unique_zk_path = generateRandomString(10)
-        self.container_task_file = "/task_month_to_week_description.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_month_to_week_description.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-
-        for cluster_num in ["0", "1"]:
-            ddl_check_query(
-                instance,
-                "DROP DATABASE IF EXISTS default ON CLUSTER cluster{}".format(
-                    cluster_num
-                ),
-            )
-            ddl_check_query(
-                instance,
-                "CREATE DATABASE IF NOT EXISTS default ON CLUSTER cluster{}".format(
-                    cluster_num
-                ),
-            )
-
-        ddl_check_query(
-            instance,
-            "CREATE TABLE a ON CLUSTER cluster0 (date Date, d UInt64, d1 UInt64 ALIAS d+1) "
-            "ENGINE=ReplicatedMergeTree('/clickhouse/tables/cluster_{cluster}/{shard}/"
-            + self.unique_zk_path
-            + "', "
-            "'{replica}', date, intHash64(d), (date, intHash64(d)), 8192)",
-        )
-        ddl_check_query(
-            instance,
-            "CREATE TABLE a_all ON CLUSTER cluster0 (date Date, d UInt64) ENGINE=Distributed(cluster0, default, a, d)",
-        )
-
-        instance.query(
-            "INSERT INTO a_all SELECT toDate(17581 + number) AS date, number AS d FROM system.numbers LIMIT 85",
-            settings={"distributed_foreground_insert": 1},
-        )
-
-    def check(self):
-        assert TSV(
-            self.cluster.instances["s0_0_0"].query(
-                "SELECT count() FROM cluster(cluster0, default, a)"
-            )
-        ) == TSV("85\n")
-        assert TSV(
-            self.cluster.instances["s1_0_0"].query(
-                "SELECT count(), uniqExact(date) FROM cluster(cluster1, default, b)"
-            )
-        ) == TSV("85\t85\n")
-
-        assert TSV(
-            self.cluster.instances["s1_0_0"].query(
-                "SELECT DISTINCT jumpConsistentHash(intHash64(d), 2) FROM b"
-            )
-        ) == TSV("0\n")
-        assert TSV(
-            self.cluster.instances["s1_1_0"].query(
-                "SELECT DISTINCT jumpConsistentHash(intHash64(d), 2) FROM b"
-            )
-        ) == TSV("1\n")
-
-        assert TSV(
-            self.cluster.instances["s1_0_0"].query(
-                "SELECT uniqExact(partition) IN (12, 13) FROM system.parts WHERE active AND database='default' AND table='b'"
-            )
-        ) == TSV("1\n")
-        assert TSV(
-            self.cluster.instances["s1_1_0"].query(
-                "SELECT uniqExact(partition) IN (12, 13) FROM system.parts WHERE active AND database='default' AND table='b'"
-            )
-        ) == TSV("1\n")
-
-        instance = cluster.instances["s0_0_0"]
-        ddl_check_query(instance, "DROP TABLE a ON CLUSTER cluster0")
-        ddl_check_query(instance, "DROP TABLE b ON CLUSTER cluster1")
-
-
-class Task_test_block_size:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = (
-            "/clickhouse-copier/task_test_block_size_" + generateRandomString(5)
-        )
-        self.rows = 1000000
-        self.container_task_file = "/task_test_block_size.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_test_block_size.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-
-        ddl_check_query(
-            instance,
-            """
-            CREATE TABLE test_block_size ON CLUSTER shard_0_0 (partition Date, d UInt64)
-            ENGINE=ReplicatedMergeTree
-            ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d)""",
-            2,
-        )
-
-        instance.query(
-            "INSERT INTO test_block_size SELECT toDate(0) AS partition, number as d FROM system.numbers LIMIT {}".format(
-                self.rows
-            )
-        )
-
-    def check(self):
-        assert TSV(
-            self.cluster.instances["s1_0_0"].query(
-                "SELECT count() FROM cluster(cluster1, default, test_block_size)"
-            )
-        ) == TSV("{}\n".format(self.rows))
-
-        instance = cluster.instances["s0_0_0"]
-        ddl_check_query(instance, "DROP TABLE test_block_size ON CLUSTER shard_0_0", 2)
-        ddl_check_query(instance, "DROP TABLE test_block_size ON CLUSTER cluster1")
-
-
-class Task_no_index:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_no_index_" + generateRandomString(
-            5
-        )
-        self.rows = 1000000
-        self.container_task_file = "/task_no_index.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_no_index.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE IF EXISTS ontime SYNC")
-        instance.query(
-            "create table IF NOT EXISTS ontime (Year UInt16, FlightDate String) ENGINE = Memory"
-        )
-        instance.query(
-            "insert into ontime values (2016, 'test6'), (2017, 'test7'), (2018, 'test8')"
-        )
-
-    def check(self):
-        assert TSV(
-            self.cluster.instances["s1_1_0"].query("SELECT Year FROM ontime22")
-        ) == TSV("2017\n")
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE ontime")
-        instance = cluster.instances["s1_1_0"]
-        instance.query("DROP TABLE ontime22")
-
-
-class Task_no_arg:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_no_arg"
-        self.rows = 1000000
-        self.container_task_file = "/task_no_arg.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_no_arg.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE IF EXISTS copier_test1 SYNC")
-        instance.query(
-            "create table if not exists copier_test1 (date Date, id UInt32) engine = MergeTree PARTITION BY date ORDER BY date SETTINGS index_granularity = 8192"
-        )
-        instance.query("insert into copier_test1 values ('2016-01-01', 10);")
-
-    def check(self):
-        assert TSV(
-            self.cluster.instances["s1_1_0"].query("SELECT date FROM copier_test1_1")
-        ) == TSV("2016-01-01\n")
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE copier_test1 SYNC")
-        instance = cluster.instances["s1_1_0"]
-        instance.query("DROP TABLE copier_test1_1 SYNC")
-
-
-class Task_non_partitioned_table:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_non_partitoned_table"
-        self.rows = 1000000
-        self.container_task_file = "/task_non_partitioned_table.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_non_partitioned_table.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE IF EXISTS copier_test1 SYNC")
-        instance.query(
-            "create table copier_test1 (date Date, id UInt32) engine = MergeTree ORDER BY date SETTINGS index_granularity = 8192"
-        )
-        instance.query("insert into copier_test1 values ('2016-01-01', 10);")
-
-    def check(self):
-        assert TSV(
-            self.cluster.instances["s1_1_0"].query("SELECT date FROM copier_test1_1")
-        ) == TSV("2016-01-01\n")
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP TABLE copier_test1")
-        instance = cluster.instances["s1_1_0"]
-        instance.query("DROP TABLE copier_test1_1")
-
-
-class Task_self_copy:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_self_copy"
-        self.container_task_file = "/task_self_copy.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_self_copy.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP DATABASE IF EXISTS db1 SYNC")
-        instance.query("DROP DATABASE IF EXISTS db2 SYNC")
-        instance.query("CREATE DATABASE IF NOT EXISTS db1;")
-        instance.query(
-            "CREATE TABLE IF NOT EXISTS db1.source_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192"
-        )
-        instance.query("CREATE DATABASE IF NOT EXISTS db2;")
-        instance.query(
-            "CREATE TABLE IF NOT EXISTS db2.destination_table (`a` Int8, `b` String, `c` Int8) ENGINE = MergeTree PARTITION BY a ORDER BY a SETTINGS index_granularity = 8192"
-        )
-        instance.query("INSERT INTO db1.source_table VALUES (1, 'ClickHouse', 1);")
-        instance.query("INSERT INTO db1.source_table VALUES (2, 'Copier', 2);")
-
-    def check(self):
-        instance = cluster.instances["s0_0_0"]
-        assert TSV(
-            instance.query("SELECT * FROM db2.destination_table ORDER BY a")
-        ) == TSV(instance.query("SELECT * FROM db1.source_table ORDER BY a"))
-        instance = cluster.instances["s0_0_0"]
-        instance.query("DROP DATABASE IF EXISTS db1 SYNC")
-        instance.query("DROP DATABASE IF EXISTS db2 SYNC")
-
-
-def execute_task(started_cluster, task, cmd_options):
-    task.start()
-
-    zk = started_cluster.get_kazoo_client("zoo1")
-    print("Use ZooKeeper server: {}:{}".format(zk.hosts[0][0], zk.hosts[0][1]))
-
-    try:
-        zk.delete("/clickhouse-copier", recursive=True)
-    except kazoo.exceptions.NoNodeError:
-        print("No node /clickhouse-copier. It is Ok in first test.")
-
-    # Run cluster-copier processes on each node
-    docker_api = started_cluster.docker_client.api
-    copiers_exec_ids = []
-
-    cmd = [
-        "/usr/bin/clickhouse",
-        "copier",
-        "--config",
-        "/etc/clickhouse-server/config-copier.xml",
-        "--task-path",
-        task.zk_task_path,
-        "--task-file",
-        task.container_task_file,
-        "--task-upload-force",
-        "true",
-        "--base-dir",
-        "/var/log/clickhouse-server/copier",
-    ]
-    cmd += cmd_options
-
-    print(cmd)
-
-    copiers = random.sample(list(started_cluster.instances.keys()), 3)
-
-    for instance_name in copiers:
-        instance = started_cluster.instances[instance_name]
-        container = instance.get_docker_handle()
-        instance.copy_file_to_container(
-            os.path.join(CURRENT_TEST_DIR, "configs/config-copier.xml"),
-            "/etc/clickhouse-server/config-copier.xml",
-        )
-        print("Copied copier config to {}".format(instance.name))
-        exec_id = docker_api.exec_create(container.id, cmd, stderr=True)
-        output = docker_api.exec_start(exec_id).decode("utf8")
-        print(output)
-        copiers_exec_ids.append(exec_id)
-        print(
-            "Copier for {} ({}) has started".format(instance.name, instance.ip_address)
-        )
-
-    # Wait for copiers stopping and check their return codes
-    for exec_id, instance_name in zip(copiers_exec_ids, copiers):
-        instance = started_cluster.instances[instance_name]
-        while True:
-            res = docker_api.exec_inspect(exec_id)
-            if not res["Running"]:
-                break
-            time.sleep(0.5)
-
-        assert res["ExitCode"] == 0, "Instance: {} ({}). Info: {}".format(
-            instance.name, instance.ip_address, repr(res)
-        )
-
-    try:
-        task.check()
-    finally:
-        zk.delete(task.zk_task_path, recursive=True)
-
-
-# Tests
-
-
-@pytest.mark.parametrize(("use_sample_offset"), [False, True])
-def test_copy_simple(started_cluster, use_sample_offset):
-    if use_sample_offset:
-        execute_task(
-            started_cluster,
-            Task1(started_cluster),
-            ["--experimental-use-sample-offset", "1"],
-        )
-    else:
-        execute_task(started_cluster, Task1(started_cluster), [])
-
-
-@pytest.mark.parametrize(("use_sample_offset"), [False, True])
-def test_copy_with_recovering(started_cluster, use_sample_offset):
-    if use_sample_offset:
-        execute_task(
-            started_cluster,
-            Task1(started_cluster),
-            [
-                "--copy-fault-probability",
-                str(COPYING_FAIL_PROBABILITY),
-                "--experimental-use-sample-offset",
-                "1",
-                "--max-table-tries",
-                "10",
-            ],
-        )
-    else:
-        execute_task(
-            started_cluster,
-            Task1(started_cluster),
-            [
-                "--copy-fault-probability",
-                str(COPYING_FAIL_PROBABILITY),
-                "--max-table-tries",
-                "10",
-            ],
-        )
-
-
-@pytest.mark.parametrize(("use_sample_offset"), [False, True])
-def test_copy_with_recovering_after_move_faults(started_cluster, use_sample_offset):
-    if use_sample_offset:
-        execute_task(
-            started_cluster,
-            Task1(started_cluster),
-            [
-                "--move-fault-probability",
-                str(MOVING_FAIL_PROBABILITY),
-                "--experimental-use-sample-offset",
-                "1",
-            ],
-        )
-    else:
-        execute_task(
-            started_cluster,
-            Task1(started_cluster),
-            ["--move-fault-probability", str(MOVING_FAIL_PROBABILITY)],
-        )
-
-
-@pytest.mark.timeout(600)
-def test_copy_month_to_week_partition(started_cluster):
-    execute_task(started_cluster, Task2(started_cluster, "test1"), [])
-
-
-@pytest.mark.timeout(600)
-def test_copy_month_to_week_partition_with_recovering(started_cluster):
-    execute_task(
-        started_cluster,
-        Task2(started_cluster, "test2"),
-        [
-            "--copy-fault-probability",
-            str(COPYING_FAIL_PROBABILITY),
-            "--max-table-tries",
-            "10",
-        ],
-    )
-
-
-@pytest.mark.timeout(600)
-def test_copy_month_to_week_partition_with_recovering_after_move_faults(
-    started_cluster,
-):
-    execute_task(
-        started_cluster,
-        Task2(started_cluster, "test3"),
-        ["--move-fault-probability", str(MOVING_FAIL_PROBABILITY)],
-    )
-
-
-def test_block_size(started_cluster):
-    execute_task(started_cluster, Task_test_block_size(started_cluster), [])
-
-
-def test_no_index(started_cluster):
-    execute_task(started_cluster, Task_no_index(started_cluster), [])
-
-
-def test_no_arg(started_cluster):
-    execute_task(started_cluster, Task_no_arg(started_cluster), [])
-
-
-def test_non_partitioned_table(started_cluster):
-    execute_task(started_cluster, Task_non_partitioned_table(started_cluster), [])
-
-
-def test_self_copy(started_cluster):
-    execute_task(started_cluster, Task_self_copy(started_cluster), [])
diff --git a/tests/integration/test_cluster_copier/test_three_nodes.py b/tests/integration/test_cluster_copier/test_three_nodes.py
deleted file mode 100644
index e7d07757adb..00000000000
--- a/tests/integration/test_cluster_copier/test_three_nodes.py
+++ /dev/null
@@ -1,286 +0,0 @@
-import os
-import sys
-import time
-import logging
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-import docker
-
-CURRENT_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.dirname(CURRENT_TEST_DIR))
-
-cluster = ClickHouseCluster(__file__)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    global cluster
-    try:
-        for name in ["first", "second", "third"]:
-            cluster.add_instance(
-                name,
-                main_configs=[
-                    "configs_three_nodes/conf.d/clusters.xml",
-                    "configs_three_nodes/conf.d/ddl.xml",
-                ],
-                user_configs=["configs_three_nodes/users.xml"],
-                with_zookeeper=True,
-            )
-
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-class Task:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task"
-        self.container_task_file = "/task_taxi_data.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_taxi_data.xml"),
-                self.container_task_file,
-            )
-            logging.debug(
-                f"Copied task file to container of '{instance_name}' instance. Path {self.container_task_file}"
-            )
-
-    def start(self):
-        for name in ["first", "second", "third"]:
-            node = cluster.instances[name]
-            node.query("DROP DATABASE IF EXISTS dailyhistory SYNC;")
-            node.query("DROP DATABASE IF EXISTS monthlyhistory SYNC;")
-
-        first = cluster.instances["first"]
-
-        # daily partition database
-        first.query("CREATE DATABASE IF NOT EXISTS dailyhistory on cluster events;")
-        first.query(
-            """CREATE TABLE dailyhistory.yellow_tripdata_staging ON CLUSTER events
-        (
-            id UUID DEFAULT generateUUIDv4(),
-            vendor_id String,
-            tpep_pickup_datetime DateTime('UTC'),
-            tpep_dropoff_datetime DateTime('UTC'),
-            passenger_count Nullable(Float64),
-            trip_distance String,
-            pickup_longitude Float64,
-            pickup_latitude Float64,
-            rate_code_id String,
-            store_and_fwd_flag String,
-            dropoff_longitude Float64,
-            dropoff_latitude Float64,
-            payment_type String,
-            fare_amount String,
-            extra String,
-            mta_tax String,
-            tip_amount String,
-            tolls_amount String,
-            improvement_surcharge String,
-            total_amount String,
-            pickup_location_id String,
-            dropoff_location_id String,
-            congestion_surcharge String,
-            junk1 String,  junk2 String
-        )
-        Engine = ReplacingMergeTree()
-        PRIMARY KEY (tpep_pickup_datetime, id)
-        ORDER BY (tpep_pickup_datetime, id)
-        PARTITION BY (toYYYYMMDD(tpep_pickup_datetime))"""
-        )
-
-        first.query(
-            """CREATE TABLE dailyhistory.yellow_tripdata
-            ON CLUSTER events
-            AS dailyhistory.yellow_tripdata_staging
-            ENGINE = Distributed('events', 'dailyhistory', yellow_tripdata_staging, sipHash64(id) % 3);"""
-        )
-
-        first.query(
-            """INSERT INTO dailyhistory.yellow_tripdata
-            SELECT * FROM generateRandom(
-                'id UUID DEFAULT generateUUIDv4(),
-                vendor_id String,
-                tpep_pickup_datetime DateTime(\\'UTC\\'),
-                tpep_dropoff_datetime DateTime(\\'UTC\\'),
-                passenger_count Nullable(Float64),
-                trip_distance String,
-                pickup_longitude Float64,
-                pickup_latitude Float64,
-                rate_code_id String,
-                store_and_fwd_flag String,
-                dropoff_longitude Float64,
-                dropoff_latitude Float64,
-                payment_type String,
-                fare_amount String,
-                extra String,
-                mta_tax String,
-                tip_amount String,
-                tolls_amount String,
-                improvement_surcharge String,
-                total_amount String,
-                pickup_location_id String,
-                dropoff_location_id String,
-                congestion_surcharge String,
-                junk1 String,
-                junk2 String',
-            1, 10, 2) LIMIT 50;"""
-        )
-
-        # monthly partition database
-        first.query("create database IF NOT EXISTS monthlyhistory on cluster events;")
-        first.query(
-            """CREATE TABLE monthlyhistory.yellow_tripdata_staging ON CLUSTER events
-        (
-            id UUID DEFAULT generateUUIDv4(),
-            vendor_id String,
-            tpep_pickup_datetime DateTime('UTC'),
-            tpep_dropoff_datetime DateTime('UTC'),
-            passenger_count Nullable(Float64),
-            trip_distance String,
-            pickup_longitude Float64,
-            pickup_latitude Float64,
-            rate_code_id String,
-            store_and_fwd_flag String,
-            dropoff_longitude Float64,
-            dropoff_latitude Float64,
-            payment_type String,
-            fare_amount String,
-            extra String,
-            mta_tax String,
-            tip_amount String,
-            tolls_amount String,
-            improvement_surcharge String,
-            total_amount String,
-            pickup_location_id String,
-            dropoff_location_id String,
-            congestion_surcharge String,
-            junk1 String,
-            junk2 String
-        )
-        Engine = ReplacingMergeTree()
-        PRIMARY KEY (tpep_pickup_datetime, id)
-        ORDER BY (tpep_pickup_datetime, id)
-        PARTITION BY (pickup_location_id, toYYYYMM(tpep_pickup_datetime))"""
-        )
-
-        first.query(
-            """CREATE TABLE monthlyhistory.yellow_tripdata
-            ON CLUSTER events
-            AS monthlyhistory.yellow_tripdata_staging
-            ENGINE = Distributed('events', 'monthlyhistory', yellow_tripdata_staging, sipHash64(id) % 3);"""
-        )
-
-    def check(self):
-        first = cluster.instances["first"]
-        a = TSV(first.query("SELECT count() from dailyhistory.yellow_tripdata"))
-        b = TSV(first.query("SELECT count() from monthlyhistory.yellow_tripdata"))
-        assert a == b, "Distributed tables"
-
-        for instance_name, instance in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            a = instance.query(
-                "SELECT count() from dailyhistory.yellow_tripdata_staging"
-            )
-            b = instance.query(
-                "SELECT count() from monthlyhistory.yellow_tripdata_staging"
-            )
-            assert a == b, "MergeTree tables on each shard"
-
-            a = TSV(
-                instance.query(
-                    "SELECT sipHash64(*) from dailyhistory.yellow_tripdata_staging ORDER BY id"
-                )
-            )
-            b = TSV(
-                instance.query(
-                    "SELECT sipHash64(*) from monthlyhistory.yellow_tripdata_staging ORDER BY id"
-                )
-            )
-
-            assert a == b, "Data on each shard"
-
-        for name in ["first", "second", "third"]:
-            node = cluster.instances[name]
-            node.query("DROP DATABASE IF EXISTS dailyhistory SYNC;")
-            node.query("DROP DATABASE IF EXISTS monthlyhistory SYNC;")
-
-
-def execute_task(started_cluster, task, cmd_options):
-    task.start()
-
-    zk = started_cluster.get_kazoo_client("zoo1")
-    logging.debug("Use ZooKeeper server: {}:{}".format(zk.hosts[0][0], zk.hosts[0][1]))
-
-    # Run cluster-copier processes on each node
-    docker_api = started_cluster.docker_client.api
-    copiers_exec_ids = []
-
-    cmd = [
-        "/usr/bin/clickhouse",
-        "copier",
-        "--config",
-        "/etc/clickhouse-server/config-copier.xml",
-        "--task-path",
-        task.zk_task_path,
-        "--task-file",
-        task.container_task_file,
-        "--task-upload-force",
-        "true",
-        "--base-dir",
-        "/var/log/clickhouse-server/copier",
-    ]
-    cmd += cmd_options
-
-    logging.debug(f"execute_task cmd: {cmd}")
-
-    for instance_name in started_cluster.instances.keys():
-        instance = started_cluster.instances[instance_name]
-        container = instance.get_docker_handle()
-        instance.copy_file_to_container(
-            os.path.join(CURRENT_TEST_DIR, "configs_three_nodes/config-copier.xml"),
-            "/etc/clickhouse-server/config-copier.xml",
-        )
-        logging.info("Copied copier config to {}".format(instance.name))
-        exec_id = docker_api.exec_create(container.id, cmd, stderr=True)
-        output = docker_api.exec_start(exec_id).decode("utf8")
-        logging.info(output)
-        copiers_exec_ids.append(exec_id)
-        logging.info(
-            "Copier for {} ({}) has started".format(instance.name, instance.ip_address)
-        )
-
-    # time.sleep(1000)
-
-    # Wait for copiers stopping and check their return codes
-    for exec_id, instance in zip(
-        copiers_exec_ids, iter(started_cluster.instances.values())
-    ):
-        while True:
-            res = docker_api.exec_inspect(exec_id)
-            if not res["Running"]:
-                break
-            time.sleep(1)
-
-        assert res["ExitCode"] == 0, "Instance: {} ({}). Info: {}".format(
-            instance.name, instance.ip_address, repr(res)
-        )
-
-    try:
-        task.check()
-    finally:
-        zk.delete(task.zk_task_path, recursive=True)
-
-
-# Tests
-@pytest.mark.timeout(600)
-def test(started_cluster):
-    execute_task(started_cluster, Task(started_cluster), [])
diff --git a/tests/integration/test_cluster_copier/test_trivial.py b/tests/integration/test_cluster_copier/test_trivial.py
deleted file mode 100644
index b8060583ef8..00000000000
--- a/tests/integration/test_cluster_copier/test_trivial.py
+++ /dev/null
@@ -1,227 +0,0 @@
-import os
-import sys
-import time
-import random
-import string
-
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-import kazoo
-import pytest
-import docker
-
-
-CURRENT_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.dirname(CURRENT_TEST_DIR))
-
-
-COPYING_FAIL_PROBABILITY = 0.1
-MOVING_FAIL_PROBABILITY = 0.1
-
-cluster = ClickHouseCluster(__file__)
-
-
-def generateRandomString(count):
-    return "".join(
-        random.choice(string.ascii_uppercase + string.digits) for _ in range(count)
-    )
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    global cluster
-    try:
-        for name in ["first_trivial", "second_trivial"]:
-            instance = cluster.add_instance(
-                name,
-                main_configs=["configs/conf.d/clusters_trivial.xml"],
-                user_configs=["configs_two_nodes/users.xml"],
-                macros={
-                    "cluster": name,
-                    "shard": "the_only_shard",
-                    "replica": "the_only_replica",
-                },
-                with_zookeeper=True,
-            )
-
-        cluster.start()
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-class TaskTrivial:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_trivial"
-        self.copier_task_config = open(
-            os.path.join(CURRENT_TEST_DIR, "task_trivial.xml"), "r"
-        ).read()
-
-    def start(self):
-        source = cluster.instances["first_trivial"]
-        destination = cluster.instances["second_trivial"]
-
-        for node in [source, destination]:
-            node.query("DROP DATABASE IF EXISTS default")
-            node.query("CREATE DATABASE IF NOT EXISTS default")
-
-        source.query(
-            "CREATE TABLE trivial (d UInt64, d1 UInt64 MATERIALIZED d+1)"
-            "ENGINE=ReplicatedMergeTree('/clickhouse/tables/source_trivial_cluster/1/trivial/{}', '1') "
-            "PARTITION BY d % 5 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16".format(
-                generateRandomString(10)
-            )
-        )
-
-        source.query(
-            "INSERT INTO trivial SELECT * FROM system.numbers LIMIT 1002",
-            settings={"distributed_foreground_insert": 1},
-        )
-
-    def check(self):
-        zk = cluster.get_kazoo_client("zoo1")
-        status_data, _ = zk.get(self.zk_task_path + "/status")
-        assert (
-            status_data
-            == b'{"hits":{"all_partitions_count":5,"processed_partitions_count":5}}'
-        )
-
-        source = cluster.instances["first_trivial"]
-        destination = cluster.instances["second_trivial"]
-
-        assert TSV(source.query("SELECT count() FROM trivial")) == TSV("1002\n")
-        assert TSV(destination.query("SELECT count() FROM trivial")) == TSV("1002\n")
-
-        for node in [source, destination]:
-            node.query("DROP TABLE trivial")
-
-
-class TaskReplicatedWithoutArguments:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_trivial_without_arguments"
-        self.copier_task_config = open(
-            os.path.join(CURRENT_TEST_DIR, "task_trivial_without_arguments.xml"), "r"
-        ).read()
-
-    def start(self):
-        source = cluster.instances["first_trivial"]
-        destination = cluster.instances["second_trivial"]
-
-        for node in [source, destination]:
-            node.query("DROP DATABASE IF EXISTS default")
-            node.query("CREATE DATABASE IF NOT EXISTS default")
-
-        source.query(
-            "CREATE TABLE trivial_without_arguments ON CLUSTER source_trivial_cluster (d UInt64, d1 UInt64 MATERIALIZED d+1) "
-            "ENGINE=ReplicatedMergeTree() "
-            "PARTITION BY d % 5 ORDER BY (d, sipHash64(d)) SAMPLE BY sipHash64(d) SETTINGS index_granularity = 16"
-        )
-
-        source.query(
-            "INSERT INTO trivial_without_arguments SELECT * FROM system.numbers LIMIT 1002",
-            settings={"distributed_foreground_insert": 1},
-        )
-
-    def check(self):
-        zk = cluster.get_kazoo_client("zoo1")
-        status_data, _ = zk.get(self.zk_task_path + "/status")
-        assert (
-            status_data
-            == b'{"hits":{"all_partitions_count":5,"processed_partitions_count":5}}'
-        )
-
-        source = cluster.instances["first_trivial"]
-        destination = cluster.instances["second_trivial"]
-
-        assert TSV(
-            source.query("SELECT count() FROM trivial_without_arguments")
-        ) == TSV("1002\n")
-        assert TSV(
-            destination.query("SELECT count() FROM trivial_without_arguments")
-        ) == TSV("1002\n")
-
-        for node in [source, destination]:
-            node.query("DROP TABLE trivial_without_arguments")
-
-
-def execute_task(started_cluster, task, cmd_options):
-    task.start()
-
-    zk = started_cluster.get_kazoo_client("zoo1")
-    print("Use ZooKeeper server: {}:{}".format(zk.hosts[0][0], zk.hosts[0][1]))
-
-    try:
-        zk.delete("/clickhouse-copier", recursive=True)
-    except kazoo.exceptions.NoNodeError:
-        print("No node /clickhouse-copier. It is Ok in first test.")
-
-    zk_task_path = task.zk_task_path
-    zk.ensure_path(zk_task_path)
-    zk.create(zk_task_path + "/description", task.copier_task_config.encode())
-
-    # Run cluster-copier processes on each node
-    docker_api = started_cluster.docker_client.api
-    copiers_exec_ids = []
-
-    cmd = [
-        "/usr/bin/clickhouse",
-        "copier",
-        "--config",
-        "/etc/clickhouse-server/config-copier.xml",
-        "--task-path",
-        zk_task_path,
-        "--base-dir",
-        "/var/log/clickhouse-server/copier",
-    ]
-    cmd += cmd_options
-
-    copiers = list(started_cluster.instances.keys())
-
-    for instance_name in copiers:
-        instance = started_cluster.instances[instance_name]
-        container = instance.get_docker_handle()
-        instance.copy_file_to_container(
-            os.path.join(CURRENT_TEST_DIR, "configs/config-copier.xml"),
-            "/etc/clickhouse-server/config-copier.xml",
-        )
-        print("Copied copier config to {}".format(instance.name))
-        exec_id = docker_api.exec_create(container.id, cmd, stderr=True)
-        output = docker_api.exec_start(exec_id).decode("utf8")
-        print(output)
-        copiers_exec_ids.append(exec_id)
-        print(
-            "Copier for {} ({}) has started".format(instance.name, instance.ip_address)
-        )
-
-    # Wait for copiers stopping and check their return codes
-    for exec_id, instance_name in zip(copiers_exec_ids, copiers):
-        instance = started_cluster.instances[instance_name]
-        while True:
-            res = docker_api.exec_inspect(exec_id)
-            if not res["Running"]:
-                break
-            time.sleep(0.5)
-
-        assert res["ExitCode"] == 0, "Instance: {} ({}). Info: {}".format(
-            instance.name, instance.ip_address, repr(res)
-        )
-
-    try:
-        task.check()
-    finally:
-        zk.delete(zk_task_path, recursive=True)
-
-
-# Tests
-
-
-def test_trivial_copy(started_cluster):
-    execute_task(started_cluster, TaskTrivial(started_cluster), [])
-
-
-def test_trivial_without_arguments(started_cluster):
-    execute_task(started_cluster, TaskReplicatedWithoutArguments(started_cluster), [])
diff --git a/tests/integration/test_cluster_copier/test_two_nodes.py b/tests/integration/test_cluster_copier/test_two_nodes.py
deleted file mode 100644
index 1bd3561f24f..00000000000
--- a/tests/integration/test_cluster_copier/test_two_nodes.py
+++ /dev/null
@@ -1,597 +0,0 @@
-import os
-import sys
-import time
-import logging
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
-
-import docker
-
-CURRENT_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, os.path.dirname(CURRENT_TEST_DIR))
-
-cluster = ClickHouseCluster(__file__)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    global cluster
-    try:
-        for name in ["first_of_two", "second_of_two"]:
-            instance = cluster.add_instance(
-                name,
-                main_configs=[
-                    "configs_two_nodes/conf.d/clusters.xml",
-                    "configs_two_nodes/conf.d/ddl.xml",
-                    "configs_two_nodes/conf.d/storage_configuration.xml",
-                ],
-                user_configs=["configs_two_nodes/users.xml"],
-                with_zookeeper=True,
-            )
-
-        cluster.start()
-
-        for name in ["first_of_two", "second_of_two"]:
-            instance = cluster.instances[name]
-            instance.exec_in_container(["bash", "-c", "mkdir /jbod1"])
-            instance.exec_in_container(["bash", "-c", "mkdir /jbod2"])
-            instance.exec_in_container(["bash", "-c", "mkdir /external"])
-
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-# Will copy table from `first` node to `second`
-class TaskWithDifferentSchema:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_with_different_schema"
-        self.container_task_file = "/task_with_different_schema.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_with_different_schema.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        first.query("DROP DATABASE IF EXISTS db_different_schema SYNC")
-        second.query("DROP DATABASE IF EXISTS db_different_schema SYNC")
-
-        first.query("CREATE DATABASE IF NOT EXISTS db_different_schema;")
-        first.query(
-            """CREATE TABLE db_different_schema.source
-        (
-            Column1 String,
-            Column2 UInt32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 UInt16,
-            Column6 String,
-            Column7 String,
-            Column8 String,
-            Column9 String,
-            Column10 String,
-            Column11 String,
-            Column12 Decimal(3, 1),
-            Column13 DateTime,
-            Column14 UInt16
-        )
-        ENGINE = MergeTree()
-        PARTITION BY (toYYYYMMDD(Column3), Column3)
-        PRIMARY KEY (Column1, Column2, Column3, Column4, Column6, Column7, Column8, Column9)
-        ORDER BY (Column1, Column2, Column3, Column4, Column6, Column7, Column8, Column9)
-        SETTINGS index_granularity = 8192"""
-        )
-
-        first.query(
-            """INSERT INTO db_different_schema.source SELECT * FROM generateRandom(
-            'Column1 String, Column2 UInt32, Column3 Date, Column4 DateTime, Column5 UInt16,
-            Column6 String, Column7 String, Column8 String, Column9 String, Column10 String,
-            Column11 String, Column12 Decimal(3, 1), Column13 DateTime, Column14 UInt16', 1, 10, 2) LIMIT 50;"""
-        )
-
-        second.query("CREATE DATABASE IF NOT EXISTS db_different_schema;")
-        second.query(
-            """CREATE TABLE db_different_schema.destination
-        (
-            Column1 LowCardinality(String) CODEC(LZ4),
-            Column2 UInt32 CODEC(LZ4),
-            Column3 Date CODEC(DoubleDelta, LZ4),
-            Column4 DateTime CODEC(DoubleDelta, LZ4),
-            Column5 UInt16 CODEC(LZ4),
-            Column6 LowCardinality(String) CODEC(ZSTD),
-            Column7 LowCardinality(String) CODEC(ZSTD),
-            Column8 LowCardinality(String) CODEC(ZSTD),
-            Column9 LowCardinality(String) CODEC(ZSTD),
-            Column10 String CODEC(ZSTD(6)),
-            Column11 LowCardinality(String) CODEC(LZ4),
-            Column12 Decimal(3,1) CODEC(LZ4),
-            Column13 DateTime CODEC(DoubleDelta, LZ4),
-            Column14 UInt16 CODEC(LZ4)
-        ) ENGINE = MergeTree()
-        PARTITION BY toYYYYMMDD(Column3)
-        ORDER BY (Column9, Column1, Column2, Column3, Column4);"""
-        )
-
-        print("Preparation completed")
-
-    def check(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        a = first.query("SELECT count() from db_different_schema.source")
-        b = second.query("SELECT count() from db_different_schema.destination")
-        assert a == b, "Count"
-
-        a = TSV(
-            first.query(
-                """SELECT sipHash64(*) from db_different_schema.source
-            ORDER BY (Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8, Column9, Column10, Column11, Column12, Column13, Column14)"""
-            )
-        )
-        b = TSV(
-            second.query(
-                """SELECT sipHash64(*) from db_different_schema.destination
-            ORDER BY (Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8, Column9, Column10, Column11, Column12, Column13, Column14)"""
-            )
-        )
-        assert a == b, "Data"
-
-        first.query("DROP DATABASE IF EXISTS db_different_schema SYNC")
-        second.query("DROP DATABASE IF EXISTS db_different_schema SYNC")
-
-
-# Just simple copying, but table schema has TTL on columns
-# Also table will have slightly different schema
-class TaskTTL:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_ttl_columns"
-        self.container_task_file = "/task_ttl_columns.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_ttl_columns.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        first.query("DROP DATABASE IF EXISTS db_ttl_columns SYNC")
-        second.query("DROP DATABASE IF EXISTS db_ttl_columns SYNC")
-
-        first.query("CREATE DATABASE IF NOT EXISTS db_ttl_columns;")
-        first.query(
-            """CREATE TABLE db_ttl_columns.source
-        (
-            Column1 String,
-            Column2 UInt32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 UInt16,
-            Column6 String TTL now() + INTERVAL 1 MONTH,
-            Column7 Decimal(3, 1) TTL now() + INTERVAL 1 MONTH,
-            Column8 Tuple(Float64, Float64) TTL now() + INTERVAL 1 MONTH
-        )
-        ENGINE = MergeTree()
-        PARTITION BY (toYYYYMMDD(Column3), Column3)
-        PRIMARY KEY (Column1, Column2, Column3)
-        ORDER BY (Column1, Column2, Column3)
-        SETTINGS index_granularity = 8192"""
-        )
-
-        first.query(
-            """INSERT INTO db_ttl_columns.source SELECT * FROM generateRandom(
-            'Column1 String, Column2 UInt32, Column3 Date, Column4 DateTime, Column5 UInt16,
-            Column6 String, Column7 Decimal(3, 1), Column8 Tuple(Float64, Float64)', 1, 10, 2) LIMIT 50;"""
-        )
-
-        second.query("CREATE DATABASE IF NOT EXISTS db_ttl_columns;")
-        second.query(
-            """CREATE TABLE db_ttl_columns.destination
-        (
-            Column1 String,
-            Column2 UInt32,
-            Column3 Date,
-            Column4 DateTime TTL now() + INTERVAL 1 MONTH,
-            Column5 UInt16 TTL now() + INTERVAL 1 MONTH,
-            Column6 String TTL now() + INTERVAL 1 MONTH,
-            Column7 Decimal(3, 1) TTL now() + INTERVAL 1 MONTH,
-            Column8 Tuple(Float64, Float64)
-        ) ENGINE = MergeTree()
-        PARTITION BY toYYYYMMDD(Column3)
-        ORDER BY (Column3, Column2, Column1);"""
-        )
-
-        print("Preparation completed")
-
-    def check(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        a = first.query("SELECT count() from db_ttl_columns.source")
-        b = second.query("SELECT count() from db_ttl_columns.destination")
-        assert a == b, "Count"
-
-        a = TSV(
-            first.query(
-                """SELECT sipHash64(*) from db_ttl_columns.source
-            ORDER BY (Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8)"""
-            )
-        )
-        b = TSV(
-            second.query(
-                """SELECT sipHash64(*) from db_ttl_columns.destination
-            ORDER BY (Column1, Column2, Column3, Column4, Column5, Column6, Column7, Column8)"""
-            )
-        )
-        assert a == b, "Data"
-
-        first.query("DROP DATABASE IF EXISTS db_ttl_columns SYNC")
-        second.query("DROP DATABASE IF EXISTS db_ttl_columns SYNC")
-
-
-class TaskSkipIndex:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_skip_index"
-        self.container_task_file = "/task_skip_index.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_skip_index.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        first.query("DROP DATABASE IF EXISTS db_skip_index SYNC")
-        second.query("DROP DATABASE IF EXISTS db_skip_index SYNC")
-
-        first.query("CREATE DATABASE IF NOT EXISTS db_skip_index;")
-        first.query(
-            """CREATE TABLE db_skip_index.source
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String,
-            INDEX a (Column1 * Column2, Column5) TYPE minmax GRANULARITY 3,
-            INDEX b (Column1 * length(Column5)) TYPE set(1000) GRANULARITY 4
-        )
-        ENGINE = MergeTree()
-        PARTITION BY (toYYYYMMDD(Column3), Column3)
-        PRIMARY KEY (Column1, Column2, Column3)
-        ORDER BY (Column1, Column2, Column3)
-        SETTINGS index_granularity = 8192"""
-        )
-
-        first.query(
-            """INSERT INTO db_skip_index.source SELECT * FROM generateRandom(
-            'Column1 UInt64, Column2 Int32, Column3 Date, Column4 DateTime, Column5 String', 1, 10, 2) LIMIT 100;"""
-        )
-
-        second.query("CREATE DATABASE IF NOT EXISTS db_skip_index;")
-        second.query(
-            """CREATE TABLE db_skip_index.destination
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String,
-            INDEX a (Column1 * Column2, Column5) TYPE minmax GRANULARITY 3,
-            INDEX b (Column1 * length(Column5)) TYPE set(1000) GRANULARITY 4
-        ) ENGINE = MergeTree()
-        PARTITION BY toYYYYMMDD(Column3)
-        ORDER BY (Column3, Column2, Column1);"""
-        )
-
-        print("Preparation completed")
-
-    def check(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        a = first.query("SELECT count() from db_skip_index.source")
-        b = second.query("SELECT count() from db_skip_index.destination")
-        assert a == b, "Count"
-
-        a = TSV(
-            first.query(
-                """SELECT sipHash64(*) from db_skip_index.source
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        b = TSV(
-            second.query(
-                """SELECT sipHash64(*) from db_skip_index.destination
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        assert a == b, "Data"
-
-        first.query("DROP DATABASE IF EXISTS db_skip_index SYNC")
-        second.query("DROP DATABASE IF EXISTS db_skip_index SYNC")
-
-
-class TaskTTLMoveToVolume:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_ttl_move_to_volume"
-        self.container_task_file = "/task_ttl_move_to_volume.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_ttl_move_to_volume.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["first_of_two"]
-
-        first.query("DROP DATABASE IF EXISTS db_move_to_volume SYNC")
-        second.query("DROP DATABASE IF EXISTS db_move_to_volume SYNC")
-
-        first.query("CREATE DATABASE IF NOT EXISTS db_move_to_volume;")
-        first.query(
-            """CREATE TABLE db_move_to_volume.source
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String
-        )
-        ENGINE = MergeTree()
-        PARTITION BY (toYYYYMMDD(Column3), Column3)
-        PRIMARY KEY (Column1, Column2, Column3)
-        ORDER BY (Column1, Column2, Column3)
-        TTL Column3 + INTERVAL 1 MONTH TO VOLUME 'external'
-        SETTINGS storage_policy = 'external_with_jbods';"""
-        )
-
-        first.query(
-            """INSERT INTO db_move_to_volume.source SELECT * FROM generateRandom(
-            'Column1 UInt64, Column2 Int32, Column3 Date, Column4 DateTime, Column5 String', 1, 10, 2) LIMIT 100;"""
-        )
-
-        second.query("CREATE DATABASE IF NOT EXISTS db_move_to_volume;")
-        second.query(
-            """CREATE TABLE db_move_to_volume.destination
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String
-        ) ENGINE = MergeTree()
-        PARTITION BY toYYYYMMDD(Column3)
-        ORDER BY (Column3, Column2, Column1)
-        TTL Column3 + INTERVAL 1 MONTH TO VOLUME 'external'
-        SETTINGS storage_policy = 'external_with_jbods';"""
-        )
-
-        print("Preparation completed")
-
-    def check(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        a = first.query("SELECT count() from db_move_to_volume.source")
-        b = second.query("SELECT count() from db_move_to_volume.destination")
-        assert a == b, "Count"
-
-        a = TSV(
-            first.query(
-                """SELECT sipHash64(*) from db_move_to_volume.source
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        b = TSV(
-            second.query(
-                """SELECT sipHash64(*) from db_move_to_volume.destination
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        assert a == b, "Data"
-
-        first.query("DROP DATABASE IF EXISTS db_move_to_volume SYNC")
-        second.query("DROP DATABASE IF EXISTS db_move_to_volume SYNC")
-
-
-class TaskDropTargetPartition:
-    def __init__(self, cluster):
-        self.cluster = cluster
-        self.zk_task_path = "/clickhouse-copier/task_drop_target_partition"
-        self.container_task_file = "/task_drop_target_partition.xml"
-
-        for instance_name, _ in cluster.instances.items():
-            instance = cluster.instances[instance_name]
-            instance.copy_file_to_container(
-                os.path.join(CURRENT_TEST_DIR, "./task_drop_target_partition.xml"),
-                self.container_task_file,
-            )
-            print(
-                "Copied task file to container of '{}' instance. Path {}".format(
-                    instance_name, self.container_task_file
-                )
-            )
-
-    def start(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        first.query("DROP DATABASE IF EXISTS db_drop_target_partition SYNC")
-        second.query("DROP DATABASE IF EXISTS db_drop_target_partition SYNC")
-
-        first.query("CREATE DATABASE IF NOT EXISTS db_drop_target_partition;")
-        first.query(
-            """CREATE TABLE db_drop_target_partition.source
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String
-        )
-        ENGINE = MergeTree()
-        PARTITION BY (toYYYYMMDD(Column3), Column3)
-        PRIMARY KEY (Column1, Column2, Column3)
-        ORDER BY (Column1, Column2, Column3);"""
-        )
-
-        first.query(
-            """INSERT INTO db_drop_target_partition.source SELECT * FROM generateRandom(
-            'Column1 UInt64, Column2 Int32, Column3 Date, Column4 DateTime, Column5 String', 1, 10, 2) LIMIT 100;"""
-        )
-
-        second.query("CREATE DATABASE IF NOT EXISTS db_drop_target_partition;")
-        second.query(
-            """CREATE TABLE db_drop_target_partition.destination
-        (
-            Column1 UInt64,
-            Column2 Int32,
-            Column3 Date,
-            Column4 DateTime,
-            Column5 String
-        ) ENGINE = MergeTree()
-        PARTITION BY toYYYYMMDD(Column3)
-        ORDER BY (Column3, Column2, Column1);"""
-        )
-
-        # Insert data in target too. It has to be dropped.
-        first.query(
-            """INSERT INTO db_drop_target_partition.destination SELECT * FROM db_drop_target_partition.source;"""
-        )
-
-        print("Preparation completed")
-
-    def check(self):
-        first = cluster.instances["first_of_two"]
-        second = cluster.instances["second_of_two"]
-
-        a = first.query("SELECT count() from db_drop_target_partition.source")
-        b = second.query("SELECT count() from db_drop_target_partition.destination")
-        assert a == b, "Count"
-
-        a = TSV(
-            first.query(
-                """SELECT sipHash64(*) from db_drop_target_partition.source
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        b = TSV(
-            second.query(
-                """SELECT sipHash64(*) from db_drop_target_partition.destination
-            ORDER BY (Column1, Column2, Column3, Column4, Column5)"""
-            )
-        )
-        assert a == b, "Data"
-
-        first.query("DROP DATABASE IF EXISTS db_drop_target_partition SYNC")
-        second.query("DROP DATABASE IF EXISTS db_drop_target_partition SYNC")
-
-
-def execute_task(started_cluster, task, cmd_options):
-    task.start()
-
-    zk = started_cluster.get_kazoo_client("zoo1")
-    print("Use ZooKeeper server: {}:{}".format(zk.hosts[0][0], zk.hosts[0][1]))
-
-    # Run cluster-copier processes on each node
-    docker_api = started_cluster.docker_client.api
-    copiers_exec_ids = []
-
-    cmd = [
-        "/usr/bin/clickhouse",
-        "copier",
-        "--config",
-        "/etc/clickhouse-server/config-copier.xml",
-        "--task-path",
-        task.zk_task_path,
-        "--task-file",
-        task.container_task_file,
-        "--task-upload-force",
-        "true",
-        "--base-dir",
-        "/var/log/clickhouse-server/copier",
-    ]
-    cmd += cmd_options
-
-    print(cmd)
-
-    for instance_name in started_cluster.instances.keys():
-        instance = started_cluster.instances[instance_name]
-        container = instance.get_docker_handle()
-        instance.copy_file_to_container(
-            os.path.join(CURRENT_TEST_DIR, "configs_two_nodes/config-copier.xml"),
-            "/etc/clickhouse-server/config-copier.xml",
-        )
-        logging.info("Copied copier config to {}".format(instance.name))
-        exec_id = docker_api.exec_create(container.id, cmd, stderr=True)
-        output = docker_api.exec_start(exec_id).decode("utf8")
-        logging.info(output)
-        copiers_exec_ids.append(exec_id)
-        logging.info(
-            "Copier for {} ({}) has started".format(instance.name, instance.ip_address)
-        )
-
-    # time.sleep(1000)
-
-    # Wait for copiers stopping and check their return codes
-    for exec_id, instance in zip(
-        copiers_exec_ids, iter(started_cluster.instances.values())
-    ):
-        while True:
-            res = docker_api.exec_inspect(exec_id)
-            if not res["Running"]:
-                break
-            time.sleep(1)
-
-        assert res["ExitCode"] == 0, "Instance: {} ({}). Info: {}".format(
-            instance.name, instance.ip_address, repr(res)
-        )
-
-    try:
-        task.check()
-    finally:
-        zk.delete(task.zk_task_path, recursive=True)
diff --git a/tests/integration/test_cluster_discovery/common.py b/tests/integration/test_cluster_discovery/common.py
new file mode 100644
index 00000000000..c66e9361973
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/common.py
@@ -0,0 +1,41 @@
+import time
+
+
+def check_on_cluster(
+    nodes,
+    expected,
+    *,
+    what,
+    cluster_name="test_auto_cluster",
+    msg=None,
+    retries=5,
+    query_params={},
+):
+    """
+    Select data from `system.clusters` on specified nodes and check the result
+    """
+    assert 1 <= retries <= 6
+
+    node_results = {}
+    for retry in range(1, retries + 1):
+        for node in nodes:
+            if node_results.get(node.name) == expected:
+                # do not retry node after success
+                continue
+            query_text = (
+                f"SELECT {what} FROM system.clusters WHERE cluster = '{cluster_name}'"
+            )
+            node_results[node.name] = int(node.query(query_text, **query_params))
+
+        if all(actual == expected for actual in node_results.values()):
+            break
+
+        print(f"Retry {retry}/{retries} unsuccessful, result: {node_results}")
+
+        if retry != retries:
+            time.sleep(2**retry)
+    else:
+        msg = msg or f"Wrong '{what}' result"
+        raise Exception(
+            f"{msg}: {node_results}, expected: {expected} (after {retries} retries)"
+        )
diff --git a/tests/integration/test_cluster_discovery/config/config_with_pwd.xml b/tests/integration/test_cluster_discovery/config/config_with_pwd.xml
new file mode 100644
index 00000000000..8a2f138bccb
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/config/config_with_pwd.xml
@@ -0,0 +1,21 @@
+<clickhouse>
+    <allow_experimental_cluster_discovery>1</allow_experimental_cluster_discovery>
+
+    <remote_servers>
+        <test_auto_cluster_with_pwd>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_pwd</path>
+                <user>user1</user>
+                <password>password123</password>
+            </discovery>
+        </test_auto_cluster_with_pwd>
+        <test_auto_cluster_with_wrong_pwd>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_wrong_pwd</path>
+                <user>user1</user>
+                <password>wrongpass1234</password>
+            </discovery>
+        </test_auto_cluster_with_wrong_pwd>
+    </remote_servers>
+
+</clickhouse>
diff --git a/tests/integration/test_cluster_discovery/config/config_with_secret1.xml b/tests/integration/test_cluster_discovery/config/config_with_secret1.xml
new file mode 100644
index 00000000000..d91c7d448eb
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/config/config_with_secret1.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <allow_experimental_cluster_discovery>1</allow_experimental_cluster_discovery>
+
+    <remote_servers>
+
+        <test_auto_cluster_with_secret>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_secret</path>
+                <secret>secret123</secret>
+            </discovery>
+        </test_auto_cluster_with_secret>
+
+        <test_auto_cluster_with_wrong_secret>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_wrong_secret</path>
+                <secret>correctsecret321</secret>
+            </discovery>
+        </test_auto_cluster_with_wrong_secret>
+
+    </remote_servers>
+
+</clickhouse>
diff --git a/tests/integration/test_cluster_discovery/config/config_with_secret2.xml b/tests/integration/test_cluster_discovery/config/config_with_secret2.xml
new file mode 100644
index 00000000000..6dfca01c940
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/config/config_with_secret2.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+    <allow_experimental_cluster_discovery>1</allow_experimental_cluster_discovery>
+
+    <remote_servers>
+
+        <test_auto_cluster_with_secret>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_secret</path>
+                <secret>secret123</secret>
+            </discovery>
+        </test_auto_cluster_with_secret>
+
+        <test_auto_cluster_with_wrong_secret>
+            <discovery>
+                <path>/clickhouse/discovery/test_auto_cluster_with_wrong_secret</path>
+                <secret>wrongsecret333</secret>
+            </discovery>
+        </test_auto_cluster_with_wrong_secret>
+
+    </remote_servers>
+
+</clickhouse>
diff --git a/tests/integration/test_cluster_discovery/config/users.d/users_with_pwd.xml b/tests/integration/test_cluster_discovery/config/users.d/users_with_pwd.xml
new file mode 100644
index 00000000000..eaf33c8f70a
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/config/users.d/users_with_pwd.xml
@@ -0,0 +1,17 @@
+<clickhouse>
+    <profiles>
+        <default>
+        </default>
+    </profiles>
+
+    <users>
+        <default>
+            <password>passwordAbc</password>
+            <profile>default</profile>
+        </default>
+        <user1>
+            <password>password123</password>
+            <profile>default</profile>
+        </user1>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_cluster_discovery/test.py b/tests/integration/test_cluster_discovery/test.py
index ad3deb5b142..ab21c72cec4 100644
--- a/tests/integration/test_cluster_discovery/test.py
+++ b/tests/integration/test_cluster_discovery/test.py
@@ -1,7 +1,8 @@
 import pytest
 
 import functools
-import time
+from .common import check_on_cluster
+
 
 from helpers.cluster import ClickHouseCluster
 
@@ -36,39 +37,6 @@ def start_cluster():
         cluster.shutdown()
 
 
-def check_on_cluster(
-    nodes, expected, *, what, cluster_name="test_auto_cluster", msg=None, retries=5
-):
-    """
-    Select data from `system.clusters` on specified nodes and check the result
-    """
-    assert 1 <= retries <= 6
-
-    node_results = {}
-    for retry in range(1, retries + 1):
-        for node in nodes:
-            if node_results.get(node.name) == expected:
-                # do not retry node after success
-                continue
-            query_text = (
-                f"SELECT {what} FROM system.clusters WHERE cluster = '{cluster_name}'"
-            )
-            node_results[node.name] = int(node.query(query_text))
-
-        if all(actual == expected for actual in node_results.values()):
-            break
-
-        print(f"Retry {retry}/{retries} unsuccessful, result: {node_results}")
-
-        if retry != retries:
-            time.sleep(2**retry)
-    else:
-        msg = msg or f"Wrong '{what}' result"
-        raise Exception(
-            f"{msg}: {node_results}, expected: {expected} (after {retries} retries)"
-        )
-
-
 def test_cluster_discovery_startup_and_stop(start_cluster):
     """
     Start cluster, check nodes count in system.clusters,
diff --git a/tests/integration/test_cluster_discovery/test_password.py b/tests/integration/test_cluster_discovery/test_password.py
new file mode 100644
index 00000000000..bf593260d6f
--- /dev/null
+++ b/tests/integration/test_cluster_discovery/test_password.py
@@ -0,0 +1,72 @@
+import pytest
+
+from .common import check_on_cluster
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+nodes = {
+    "node0": cluster.add_instance(
+        "node0",
+        main_configs=["config/config_with_pwd.xml", "config/config_with_secret1.xml"],
+        user_configs=["config/users.d/users_with_pwd.xml"],
+        stay_alive=True,
+        with_zookeeper=True,
+    ),
+    "node1": cluster.add_instance(
+        "node1",
+        main_configs=["config/config_with_pwd.xml", "config/config_with_secret2.xml"],
+        user_configs=["config/users.d/users_with_pwd.xml"],
+        stay_alive=True,
+        with_zookeeper=True,
+    ),
+}
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_connect_with_password(start_cluster):
+    check_on_cluster(
+        [nodes["node0"], nodes["node1"]],
+        len(nodes),
+        cluster_name="test_auto_cluster_with_pwd",
+        what="count()",
+        msg="Wrong nodes count in cluster",
+        query_params={"password": "passwordAbc"},
+    )
+
+    result = nodes["node0"].query(
+        "SELECT sum(number) FROM clusterAllReplicas('test_auto_cluster_with_pwd', numbers(3)) GROUP BY hostname()",
+        password="passwordAbc",
+    )
+    assert result == "3\n3\n", result
+
+    result = nodes["node0"].query_and_get_error(
+        "SELECT sum(number) FROM clusterAllReplicas('test_auto_cluster_with_wrong_pwd', numbers(3)) GROUP BY hostname()",
+        password="passwordAbc",
+    )
+    assert "Authentication failed" in result, result
+
+    result = nodes["node0"].query(
+        "SELECT sum(number) FROM clusterAllReplicas('test_auto_cluster_with_secret', numbers(3)) GROUP BY hostname()",
+        password="passwordAbc",
+    )
+    assert result == "3\n3\n", result
+
+    result = nodes["node0"].query_and_get_error(
+        "SELECT sum(number) FROM clusterAllReplicas('test_auto_cluster_with_wrong_secret', numbers(3)) GROUP BY hostname()",
+        password="passwordAbc",
+    )
+
+    # With an incorrect secret, we don't get "Authentication failed", but the connection is simply dropped.
+    # So, we get messages like "Connection reset by peer" or "Attempt to read after eof".
+    # We only check that an error occurred and the message is not empty.
+    assert result
diff --git a/tests/integration/test_compression_codec_read/test.py b/tests/integration/test_compression_codec_read/test.py
deleted file mode 100644
index b39e5147d38..00000000000
--- a/tests/integration/test_compression_codec_read/test.py
+++ /dev/null
@@ -1,60 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry
-
-cluster = ClickHouseCluster(__file__)
-
-node1 = cluster.add_instance(
-    "node1",
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
-    with_installed_binary=True,
-    stay_alive=True,
-    allow_analyzer=False,
-)
-
-
-@pytest.fixture(scope="module")
-def start_cluster():
-    try:
-        cluster.start()
-
-        yield cluster
-    finally:
-        cluster.shutdown()
-
-
-def test_default_codec_read(start_cluster):
-    node1.query("DROP TABLE IF EXISTS test_18340")
-
-    node1.query(
-        """
-        CREATE TABLE test_18340
-        (
-            `lns` LowCardinality(Nullable(String)),
-            `ns` Nullable(String),
-            `s` String,
-            `ni64` Nullable(Int64),
-            `ui64` UInt64,
-            `alns` Array(LowCardinality(Nullable(String))),
-            `ans` Array(Nullable(String)),
-            `dt` DateTime,
-            `i32` Int32
-        )
-        ENGINE = MergeTree()
-        PARTITION BY i32
-        ORDER BY (s, farmHash64(s))
-        SAMPLE BY farmHash64(s)
-    """
-    )
-
-    node1.query(
-        "insert into test_18340 values ('test', 'test', 'test', 0, 0, ['a'], ['a'], now(), 0)"
-    )
-
-    assert node1.query("SELECT COUNT() FROM test_18340") == "1\n"
-
-    node1.restart_with_latest_version()
-
-    assert node1.query("SELECT COUNT() FROM test_18340") == "1\n"
diff --git a/tests/integration/test_config_substitutions/configs/config_zk_include_test.xml b/tests/integration/test_config_substitutions/configs/config_zk_include_test.xml
new file mode 100644
index 00000000000..743770c3024
--- /dev/null
+++ b/tests/integration/test_config_substitutions/configs/config_zk_include_test.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<clickhouse>
+  <background_pool_size>44</background_pool_size>
+  <merge_tree>
+    <include from_zk="/merge_max_block_size" merge="true"/>
+    <merge_max_block_size>99</merge_max_block_size>
+    <min_bytes_for_wide_part>1</min_bytes_for_wide_part>
+    <min_rows_for_wide_part>1111</min_rows_for_wide_part>
+  </merge_tree>
+
+  <include from_zk="/min_bytes_for_wide_part" merge="true"/>
+ </clickhouse>
diff --git a/tests/integration/test_config_substitutions/test.py b/tests/integration/test_config_substitutions/test.py
index 564985b2f50..ac75771cb9c 100644
--- a/tests/integration/test_config_substitutions/test.py
+++ b/tests/integration/test_config_substitutions/test.py
@@ -13,7 +13,12 @@ node2 = cluster.add_instance(
     env_variables={"MAX_QUERY_SIZE": "55555"},
 )
 node3 = cluster.add_instance(
-    "node3", user_configs=["configs/config_zk.xml"], with_zookeeper=True
+    "node3",
+    user_configs=[
+        "configs/config_zk.xml",
+    ],
+    main_configs=["configs/config_zk_include_test.xml"],
+    with_zookeeper=True,
 )
 node4 = cluster.add_instance(
     "node4",
@@ -62,6 +67,16 @@ def start_cluster():
                 value=b"<user_2><password></password><profile>default</profile></user_2>",
                 makepath=True,
             )
+            zk.create(
+                path="/min_bytes_for_wide_part",
+                value=b"<merge_tree><min_bytes_for_wide_part>33</min_bytes_for_wide_part></merge_tree>",
+                makepath=True,
+            )
+            zk.create(
+                path="/merge_max_block_size",
+                value=b"<merge_max_block_size>8888</merge_max_block_size>",
+                makepath=True,
+            )
 
         cluster.add_zookeeper_startup_command(create_zk_roots)
 
@@ -237,3 +252,63 @@ def test_allow_databases(start_cluster):
         ).strip()
         == ""
     )
+
+
+def test_config_multiple_zk_substitutions(start_cluster):
+    assert (
+        node3.query(
+            "SELECT value FROM system.merge_tree_settings WHERE name='min_bytes_for_wide_part'"
+        )
+        == "33\n"
+    )
+    assert (
+        node3.query(
+            "SELECT value FROM system.merge_tree_settings WHERE name='min_rows_for_wide_part'"
+        )
+        == "1111\n"
+    )
+    assert (
+        node3.query(
+            "SELECT value FROM system.merge_tree_settings WHERE name='merge_max_block_size'"
+        )
+        == "8888\n"
+    )
+    assert (
+        node3.query(
+            "SELECT value FROM system.server_settings WHERE name='background_pool_size'"
+        )
+        == "44\n"
+    )
+
+    zk = cluster.get_kazoo_client("zoo1")
+    zk.create(
+        path="/background_pool_size",
+        value=b"<background_pool_size>72</background_pool_size>",
+        makepath=True,
+    )
+
+    node3.replace_config(
+        "/etc/clickhouse-server/config.d/config_zk_include_test.xml",
+        """
+<clickhouse>
+  <include from_zk="/background_pool_size" merge="true"/>
+  <background_pool_size>44</background_pool_size>
+  <merge_tree>
+    <include from_zk="/merge_max_block_size" merge="true"/>
+    <min_bytes_for_wide_part>1</min_bytes_for_wide_part>
+    <min_rows_for_wide_part>1111</min_rows_for_wide_part>
+  </merge_tree>
+
+  <include from_zk="/min_bytes_for_wide_part" merge="true"/>
+ </clickhouse>
+""",
+    )
+
+    node3.query("SYSTEM RELOAD CONFIG")
+
+    assert (
+        node3.query(
+            "SELECT value FROM system.server_settings WHERE name='background_pool_size'"
+        )
+        == "72\n"
+    )
diff --git a/tests/integration/test_config_xml_full/configs/config.xml b/tests/integration/test_config_xml_full/configs/config.xml
index ac59b3428e8..628e1432350 100644
--- a/tests/integration/test_config_xml_full/configs/config.xml
+++ b/tests/integration/test_config_xml_full/configs/config.xml
@@ -72,7 +72,7 @@
     <http_port>8123</http_port>
 
     <!-- Port for interaction by native protocol with:
-         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark, clickhouse-copier);
+         - clickhouse-client and other native ClickHouse tools (clickhouse-benchmark);
          - clickhouse-server with other clickhouse-servers for distributed query processing;
          - ClickHouse drivers and applications supporting native protocol
          (this protocol is also informally called as "the TCP protocol");
diff --git a/tests/integration/test_default_compression_codec/test.py b/tests/integration/test_default_compression_codec/test.py
index ffe22c62325..4fe899f15e2 100644
--- a/tests/integration/test_default_compression_codec/test.py
+++ b/tests/integration/test_default_compression_codec/test.py
@@ -25,15 +25,6 @@ node2 = cluster.add_instance(
     ],
     with_zookeeper=True,
 )
-node3 = cluster.add_instance(
-    "node3",
-    main_configs=["configs/default_compression.xml"],
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
-    stay_alive=True,
-    with_installed_binary=True,
-    allow_analyzer=False,
-)
 node4 = cluster.add_instance("node4")
 
 
@@ -413,88 +404,6 @@ def test_default_codec_multiple(start_cluster):
     node2.query("DROP TABLE compression_table_multiple SYNC")
 
 
-def test_default_codec_version_update(start_cluster):
-    node3.query(
-        """
-    CREATE TABLE compression_table (
-        key UInt64 CODEC(LZ4HC(7)),
-        data1 String
-    ) ENGINE = MergeTree ORDER BY tuple() PARTITION BY key;
-    """
-    )
-
-    node3.query("INSERT INTO compression_table VALUES (1, 'x')")
-    node3.query(
-        "INSERT INTO compression_table VALUES (2, '{}')".format(get_random_string(2048))
-    )
-    node3.query(
-        "INSERT INTO compression_table VALUES (3, '{}')".format(
-            get_random_string(22048)
-        )
-    )
-
-    old_version = node3.query("SELECT version()")
-    node3.restart_with_latest_version(fix_metadata=True)
-    new_version = node3.query("SELECT version()")
-    logging.debug(f"Updated from {old_version} to {new_version}")
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '1_1_1_0'"
-        )
-        == "ZSTD(1)\n"
-    )
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '2_2_2_0'"
-        )
-        == "ZSTD(1)\n"
-    )
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '3_3_3_0'"
-        )
-        == "ZSTD(1)\n"
-    )
-
-    node3.query("OPTIMIZE TABLE compression_table FINAL")
-
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '1_1_1_1'"
-        )
-        == "ZSTD(10)\n"
-    )
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '2_2_2_1'"
-        )
-        == "LZ4HC(5)\n"
-    )
-    assert (
-        node3.query(
-            "SELECT default_compression_codec FROM system.parts WHERE table = 'compression_table' and name = '3_3_3_1'"
-        )
-        == "LZ4\n"
-    )
-
-    node3.query("DROP TABLE compression_table SYNC")
-
-    def callback(n):
-        n.exec_in_container(
-            [
-                "bash",
-                "-c",
-                "rm -rf /var/lib/clickhouse/metadata/system /var/lib/clickhouse/data/system ",
-            ],
-            user="root",
-        )
-
-    node3.restart_with_original_version(callback_onstop=callback)
-
-    cur_version = node3.query("SELECT version()")
-    logging.debug(f"End with {cur_version}")
-
-
 def test_default_codec_for_compact_parts(start_cluster):
     node4.query(
         """
diff --git a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mysql.py b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mysql.py
index 77b2c0741b5..afae8d616b0 100644
--- a/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mysql.py
+++ b/tests/integration/test_dictionaries_all_layouts_separate_sources/test_mysql.py
@@ -29,9 +29,9 @@ def setup_module(module):
     SOURCE = SourceMySQL(
         "MySQL",
         None,
-        cluster.mysql_port,
-        cluster.mysql_host,
-        cluster.mysql_port,
+        cluster.mysql8_port,
+        cluster.mysql8_host,
+        cluster.mysql8_port,
         "root",
         "clickhouse",
     )
@@ -53,7 +53,7 @@ def setup_module(module):
     dictionaries = simple_tester.list_dictionaries()
 
     node = cluster.add_instance(
-        "node", main_configs=main_configs, dictionaries=dictionaries, with_mysql=True
+        "node", main_configs=main_configs, dictionaries=dictionaries, with_mysql8=True
     )
 
 
diff --git a/tests/integration/test_dictionaries_ddl/test.py b/tests/integration/test_dictionaries_ddl/test.py
index 7dda6fc245a..2f31e406735 100644
--- a/tests/integration/test_dictionaries_ddl/test.py
+++ b/tests/integration/test_dictionaries_ddl/test.py
@@ -13,7 +13,7 @@ SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
-    with_mysql=True,
+    with_mysql8=True,
     dictionaries=["configs/dictionaries/simple_dictionary.xml"],
     main_configs=[
         "configs/ssl_conf.xml",
@@ -26,7 +26,7 @@ node1 = cluster.add_instance(
 )
 node2 = cluster.add_instance(
     "node2",
-    with_mysql=True,
+    with_mysql8=True,
     dictionaries=["configs/dictionaries/simple_dictionary.xml"],
     main_configs=[
         "configs/dictionaries/lazy_load.xml",
@@ -117,7 +117,7 @@ def started_cluster():
 )
 def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
     mysql_conn = create_mysql_conn(
-        "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+        "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
     )
     execute_mysql_query(mysql_conn, "DROP DATABASE IF EXISTS create_and_select")
     execute_mysql_query(mysql_conn, "CREATE DATABASE create_and_select")
@@ -152,7 +152,7 @@ def test_create_and_select_mysql(started_cluster, clickhouse, name, layout):
         DB 'create_and_select'
         TABLE '{}'
         REPLICA(PRIORITY 1 HOST '127.0.0.1' PORT 3333)
-        REPLICA(PRIORITY 2 HOST 'mysql57' PORT 3306)
+        REPLICA(PRIORITY 2 HOST 'mysql80' PORT 3306)
     ))
     {}
     LIFETIME(MIN 1 MAX 3)
@@ -367,7 +367,7 @@ def test_file_dictionary_restrictions(started_cluster):
 
 def test_dictionary_with_where(started_cluster):
     mysql_conn = create_mysql_conn(
-        "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+        "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
     )
     execute_mysql_query(
         mysql_conn, "CREATE DATABASE IF NOT EXISTS dictionary_with_where"
@@ -393,7 +393,7 @@ def test_dictionary_with_where(started_cluster):
         PASSWORD 'clickhouse'
         DB 'dictionary_with_where'
         TABLE 'special_table'
-        REPLICA(PRIORITY 1 HOST 'mysql57' PORT 3306)
+        REPLICA(PRIORITY 1 HOST 'mysql80' PORT 3306)
         WHERE 'value1 = \\'qweqwe\\' OR value1 = \\'\\\\u3232\\''
     ))
     LAYOUT(FLAT())
diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
index d4d2466b7bf..737c4e0e54f 100644
--- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict1.xml
@@ -4,7 +4,7 @@
       <source>
          <mysql >
             <db>test</db>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <user>root</user>
             <password>clickhouse</password>
@@ -40,7 +40,7 @@
       <source>
          <mysql >
             <db>test</db>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <user>root</user>
             <password>clickhouse</password>
diff --git a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
index 031afbba636..ca65dba44e6 100644
--- a/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/dictionaries/mysql_dict2.xml
@@ -4,7 +4,7 @@
       <source>
          <mysql >
             <db>test</db>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <user>root</user>
             <password>clickhouse</password>
@@ -41,7 +41,7 @@
       <source>
          <mysql >
             <db>test</db>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <user>root</user>
             <password>clickhouse</password>
@@ -77,7 +77,7 @@
       <source>
          <mysql >
             <db>test</db>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <user>root</user>
             <password>clickhouse</password>
diff --git a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
index 6e4098c4e4a..0f1a06d7812 100644
--- a/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
+++ b/tests/integration/test_dictionaries_mysql/configs/named_collections.xml
@@ -3,7 +3,7 @@
         <mysql1>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>test</database>
             <table>test_table</table>
@@ -16,7 +16,7 @@
         <mysql3>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>1111</port>
             <database>test</database>
             <table>test_table</table>
@@ -24,7 +24,7 @@
         <mysql4>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>test</database>
             <table>test_table</table>
diff --git a/tests/integration/test_dictionaries_mysql/test.py b/tests/integration/test_dictionaries_mysql/test.py
index ee0d957b8a9..360456b2046 100644
--- a/tests/integration/test_dictionaries_mysql/test.py
+++ b/tests/integration/test_dictionaries_mysql/test.py
@@ -14,7 +14,7 @@ instance = cluster.add_instance(
     "instance",
     main_configs=CONFIG_FILES,
     user_configs=USER_CONFIGS,
-    with_mysql=True,
+    with_mysql8=True,
     dictionaries=DICTS,
 )
 
@@ -47,7 +47,7 @@ def started_cluster():
 
         # Create database in ClickChouse using MySQL protocol (will be used for data insertion)
         instance.query(
-            "CREATE DATABASE clickhouse_mysql ENGINE = MySQL('mysql57:3306', 'test', 'root', 'clickhouse')"
+            "CREATE DATABASE clickhouse_mysql ENGINE = MySQL('mysql80:3306', 'test', 'root', 'clickhouse')"
         )
 
         yield cluster
@@ -86,7 +86,7 @@ def test_mysql_dictionaries_custom_query_full_load(started_cluster):
     PRIMARY KEY id
     LAYOUT(FLAT())
     SOURCE(MYSQL(
-        HOST 'mysql57'
+        HOST 'mysql80'
         PORT 3306
         USER 'root'
         PASSWORD 'clickhouse'
@@ -135,7 +135,7 @@ def test_mysql_dictionaries_custom_query_partial_load_simple_key(started_cluster
     PRIMARY KEY id
     LAYOUT(DIRECT())
     SOURCE(MYSQL(
-        HOST 'mysql57'
+        HOST 'mysql80'
         PORT 3306
         USER 'root'
         PASSWORD 'clickhouse'
@@ -186,7 +186,7 @@ def test_mysql_dictionaries_custom_query_partial_load_complex_key(started_cluste
     PRIMARY KEY id, id_key
     LAYOUT(COMPLEX_KEY_DIRECT())
     SOURCE(MYSQL(
-        HOST 'mysql57'
+        HOST 'mysql80'
         PORT 3306
         USER 'root'
         PASSWORD 'clickhouse'
@@ -372,13 +372,13 @@ def get_mysql_conn(started_cluster):
                 conn = pymysql.connect(
                     user="root",
                     password="clickhouse",
-                    host=started_cluster.mysql_ip,
-                    port=started_cluster.mysql_port,
+                    host=started_cluster.mysql8_ip,
+                    port=started_cluster.mysql8_port,
                 )
             else:
                 conn.ping(reconnect=True)
             logging.debug(
-                f"MySQL Connection establised: {started_cluster.mysql_ip}:{started_cluster.mysql_port}"
+                f"MySQL Connection establised: {started_cluster.mysql8_ip}:{started_cluster.mysql8_port}"
             )
             return conn
         except Exception as e:
diff --git a/tests/queries/0_stateless/02862_index_inverted_incorrect_args.reference b/tests/integration/test_dictionaries_replace/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/02862_index_inverted_incorrect_args.reference
rename to tests/integration/test_dictionaries_replace/__init__.py
diff --git a/tests/integration/test_distributed_backward_compatability/configs/legacy.xml b/tests/integration/test_dictionaries_replace/configs/allow_database_types.xml
similarity index 50%
rename from tests/integration/test_distributed_backward_compatability/configs/legacy.xml
rename to tests/integration/test_dictionaries_replace/configs/allow_database_types.xml
index 5c1985a17a4..0434df06457 100644
--- a/tests/integration/test_distributed_backward_compatability/configs/legacy.xml
+++ b/tests/integration/test_dictionaries_replace/configs/allow_database_types.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <profiles>
         <default>
-            <legacy_column_name_of_tuple_literal>1</legacy_column_name_of_tuple_literal>
+            <allow_experimental_database_replicated>1</allow_experimental_database_replicated>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/integration/test_dictionaries_replace/configs/no_lazy_load.xml b/tests/integration/test_dictionaries_replace/configs/no_lazy_load.xml
new file mode 100644
index 00000000000..aaae3e0c4c1
--- /dev/null
+++ b/tests/integration/test_dictionaries_replace/configs/no_lazy_load.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <dictionaries_lazy_load>0</dictionaries_lazy_load>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_replace/configs/remote_servers.xml b/tests/integration/test_dictionaries_replace/configs/remote_servers.xml
new file mode 100644
index 00000000000..6362032973f
--- /dev/null
+++ b/tests/integration/test_dictionaries_replace/configs/remote_servers.xml
@@ -0,0 +1,16 @@
+<clickhouse>
+    <remote_servers>
+        <cluster>
+            <shard>
+                <replica>
+                    <host>node_ll</host>
+                    <port>9000</port>
+                </replica>
+                <replica>
+                    <host>node_no_ll</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_dictionaries_replace/test.py b/tests/integration/test_dictionaries_replace/test.py
new file mode 100644
index 00000000000..bf406f46cb1
--- /dev/null
+++ b/tests/integration/test_dictionaries_replace/test.py
@@ -0,0 +1,136 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import TSV
+
+
+cluster = ClickHouseCluster(__file__)
+
+node_ll = cluster.add_instance(
+    "node_ll",
+    main_configs=[
+        "configs/remote_servers.xml",
+    ],
+    user_configs=[
+        "configs/allow_database_types.xml",
+    ],
+    macros={"replica": "node_ll", "shard": "shard"},
+    with_zookeeper=True,
+)
+
+node_no_ll = cluster.add_instance(
+    "node_no_ll",
+    main_configs=[
+        "configs/no_lazy_load.xml",
+        "configs/remote_servers.xml",
+    ],
+    user_configs=[
+        "configs/allow_database_types.xml",
+    ],
+    macros={"replica": "node_no_ll", "shard": "shard"},
+    with_zookeeper=True,
+)
+
+instances = [node_ll, node_no_ll]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+
+        # "sleep(1)" is here to make loading of dictionaries a bit slower for this test.
+        instances[0].query(
+            "CREATE VIEW src ON CLUSTER 'cluster' AS SELECT number AS key, number * number + 1 + sleep(1) AS value FROM numbers(10)"
+        )
+
+        # "dict_get_user" can only call dictGet(), nothing more.
+        instances[0].query("CREATE USER dictget_user ON CLUSTER 'cluster'")
+        instances[0].query(
+            "GRANT dictGet ON atomicdb.dict TO dictget_user ON CLUSTER 'cluster'"
+        )
+        instances[0].query(
+            "GRANT dictGet ON repldb.dict TO dictget_user ON CLUSTER 'cluster'"
+        )
+
+        instances[0].query("CREATE DATABASE atomicdb ON CLUSTER 'cluster'")
+        instances[0].query(
+            "CREATE DATABASE repldb ON CLUSTER 'cluster' ENGINE=Replicated('/clickhouse/path/','{shard}','{replica}')"
+        )
+
+        yield cluster
+
+    finally:
+        instances[0].query("DROP TABLE IF EXISTS src ON CLUSTER 'cluster'")
+        instances[0].query("DROP USER IF EXISTS dictget_user ON CLUSTER 'cluster'")
+        instances[0].query("DROP DATABASE IF EXISTS atomicdb ON CLUSTER 'cluster'")
+        instances[0].query("DROP DATABASE IF EXISTS repldb ON CLUSTER 'cluster'")
+
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def cleanup_after_test():
+    try:
+        yield
+    finally:
+        instances[0].query("DROP DICTIONARY IF EXISTS dict ON CLUSTER 'cluster'")
+
+
+def get_status(instance, dictionary_name):
+    return instance.query(
+        "SELECT status FROM system.dictionaries WHERE name='" + dictionary_name + "'"
+    ).rstrip("\n")
+
+
+@pytest.mark.parametrize(
+    "database, instance_to_create_dictionary, instances_to_check",
+    [
+        ("atomicdb", node_ll, [node_ll]),
+        ("atomicdb", node_no_ll, [node_no_ll]),
+        ("repldb", node_ll, [node_ll, node_no_ll]),
+        ("repldb", node_no_ll, [node_ll, node_no_ll]),
+    ],
+)
+def test_create_or_replace(database, instance_to_create_dictionary, instances_to_check):
+    num_steps = 2
+    dict_uuids = {}
+    for step in range(0, num_steps):
+        create_dictionary_query = f"CREATE OR REPLACE DICTIONARY {database}.dict (key Int64, value Int64) PRIMARY KEY key SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'src' PASSWORD '' DB 'default')) LIFETIME(0) LAYOUT(FLAT())"
+        instance_to_create_dictionary.query(create_dictionary_query)
+
+        for instance in instances_to_check:
+            if instance != instance_to_create_dictionary:
+                instance.query(f"SYSTEM SYNC DATABASE REPLICA {database}")
+
+            dict_uuid = instance.query(
+                f"SELECT uuid FROM system.tables WHERE database='{database}' AND table='dict'"
+            ).strip("\n")
+
+            dict_db, dict_name, dict_status = (
+                instance.query(
+                    f"SELECT database, name, status FROM system.dictionaries WHERE uuid='{dict_uuid}'"
+                )
+                .strip("\n")
+                .split("\t")
+            )
+            assert dict_db == database
+            assert dict_name == "dict"
+
+            # "uuid" must be the same for all the dictionaries created at the same "step" and different for the dictionaries created at different steps.
+            if step in dict_uuids:
+                assert dict_uuids[step] == dict_uuid
+            dict_uuids[step] = dict_uuid
+            assert dict_uuid not in [
+                dict_uuids[prev_step] for prev_step in range(0, step)
+            ]
+
+            expected_dict_status = (
+                ["NOT_LOADED"] if instance == node_ll else ["LOADING", "LOADED"]
+            )
+            assert dict_status in expected_dict_status
+
+    for instance in instances_to_check:
+        select_query = f"SELECT arrayJoin([0, 5, 7, 11]) as key, dictGet({database}.dict, 'value', key)"
+        expected_result = TSV([[0, 1], [5, 26], [7, 50], [11, 0]])
+        assert instance.query(select_query) == expected_result
+        assert instance.query(select_query, user="dictget_user") == expected_result
diff --git a/tests/integration/test_dictionaries_update_and_reload/test.py b/tests/integration/test_dictionaries_update_and_reload/test.py
index 3d96d0b8dd4..db1c8e47467 100644
--- a/tests/integration/test_dictionaries_update_and_reload/test.py
+++ b/tests/integration/test_dictionaries_update_and_reload/test.py
@@ -37,6 +37,16 @@ def get_status(dictionary_name):
     ).rstrip("\n")
 
 
+def get_status_retry(dictionary_name, expect, retry_count=10, sleep_time=0.5):
+    for _ in range(retry_count):
+        res = get_status(dictionary_name)
+        if res == expect:
+            return res
+        time.sleep(sleep_time)
+
+    raise Exception(f'Expected result "{expect}" did not occur')
+
+
 def get_last_exception(dictionary_name):
     return (
         instance.query(
@@ -250,6 +260,15 @@ def test_reload_after_fail_by_timer(started_cluster):
     assert expected_error in instance.query_and_get_error(
         "SELECT dictGetInt32('no_file_2', 'a', toUInt64(9))"
     )
+
+    # on sanitizers builds it can return 'FAILED_AND_RELOADING' which is not quite right
+    # add retry for these builds
+    if (
+        instance.is_built_with_sanitizer()
+        and get_status("no_file_2") == "FAILED_AND_RELOADING"
+    ):
+        get_status_retry("no_file_2", expect="FAILED")
+
     assert get_status("no_file_2") == "FAILED"
 
     # Creating the file source makes the dictionary able to load.
@@ -281,7 +300,7 @@ def test_reload_after_fail_in_cache_dictionary(started_cluster):
     query_and_get_error = instance.query_and_get_error
 
     # Can't get a value from the cache dictionary because the source (table `test.xypairs`) doesn't respond.
-    expected_error = "Table test.xypairs does not exist"
+    expected_error = "UNKNOWN_TABLE"
     update_error = "Could not update cache dictionary cache_xypairs now"
     assert expected_error in query_and_get_error(
         "SELECT dictGetUInt64('cache_xypairs', 'y', toUInt64(1))"
diff --git a/tests/integration/test_disabled_access_control_improvements/configs/remote_servers.xml b/tests/integration/test_disabled_access_control_improvements/configs/remote_servers.xml
new file mode 100644
index 00000000000..b9aee7f5ca6
--- /dev/null
+++ b/tests/integration/test_disabled_access_control_improvements/configs/remote_servers.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <default>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </default>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_disabled_access_control_improvements/test_row_policy.py b/tests/integration/test_disabled_access_control_improvements/test_row_policy.py
index b620e88e7eb..c09a80cea06 100644
--- a/tests/integration/test_disabled_access_control_improvements/test_row_policy.py
+++ b/tests/integration/test_disabled_access_control_improvements/test_row_policy.py
@@ -41,7 +41,7 @@ def started_cluster():
             CREATE TABLE mydb.filtered_table2 (a UInt8, b UInt8, c UInt8, d UInt8) ENGINE MergeTree ORDER BY a;
             INSERT INTO mydb.filtered_table2 values (0, 0, 0, 0), (1, 2, 3, 4), (4, 3, 2, 1), (0, 0, 6, 0);
 
-            CREATE TABLE mydb.filtered_table3 (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
+            CREATE TABLE mydb.filtered_table3 (a UInt8, b UInt8, bb ALIAS b + 1, c UInt16 ALIAS a + bb - 1) ENGINE MergeTree ORDER BY a;
             INSERT INTO mydb.filtered_table3 values (0, 0), (0, 1), (1, 0), (1, 1);
 
             CREATE TABLE mydb.`.filtered_table4` (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
diff --git a/tests/integration/test_disabled_access_control_improvements/test_select_from_system_tables.py b/tests/integration/test_disabled_access_control_improvements/test_select_from_system_tables.py
index 894464fd813..4ea5a524fed 100644
--- a/tests/integration/test_disabled_access_control_improvements/test_select_from_system_tables.py
+++ b/tests/integration/test_disabled_access_control_improvements/test_select_from_system_tables.py
@@ -6,7 +6,10 @@ from helpers.test_tools import TSV
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
-    main_configs=["configs/config.d/disable_access_control_improvements.xml"],
+    main_configs=[
+        "configs/config.d/disable_access_control_improvements.xml",
+        "configs/remote_servers.xml",
+    ],
     user_configs=[
         "configs/users.d/another_user.xml",
     ],
diff --git a/tests/integration/test_disabled_mysql_server/test.py b/tests/integration/test_disabled_mysql_server/test.py
index 6a4df3fc0b4..814aebb0d8e 100644
--- a/tests/integration/test_disabled_mysql_server/test.py
+++ b/tests/integration/test_disabled_mysql_server/test.py
@@ -11,7 +11,7 @@ from helpers.network import PartitionManager
 
 cluster = ClickHouseCluster(__file__)
 clickhouse_node = cluster.add_instance(
-    "node1", main_configs=["configs/remote_servers.xml"], with_mysql=True
+    "node1", main_configs=["configs/remote_servers.xml"], with_mysql8=True
 )
 
 
@@ -27,8 +27,8 @@ def started_cluster():
 class MySQLNodeInstance:
     def __init__(self, started_cluster, user="root", password="clickhouse"):
         self.user = user
-        self.port = cluster.mysql_port
-        self.hostname = cluster.mysql_ip
+        self.port = cluster.mysql8_port
+        self.hostname = cluster.mysql8_ip
         self.password = password
         self.mysql_connection = None  # lazy init
 
@@ -62,7 +62,7 @@ def test_disabled_mysql_server(started_cluster):
 
     with PartitionManager() as pm:
         clickhouse_node.query(
-            "CREATE DATABASE test_db_disabled ENGINE = MySQL('mysql57:3306', 'test_db_disabled', 'root', 'clickhouse')"
+            "CREATE DATABASE test_db_disabled ENGINE = MySQL('mysql80:3306', 'test_db_disabled', 'root', 'clickhouse')"
         )
 
         pm._add_rule(
diff --git a/tests/integration/test_disk_access_storage/test.py b/tests/integration/test_disk_access_storage/test.py
index bcfc9d718a7..a710295505e 100644
--- a/tests/integration/test_disk_access_storage/test.py
+++ b/tests/integration/test_disk_access_storage/test.py
@@ -46,7 +46,7 @@ def test_create():
     def check():
         assert (
             instance.query("SHOW CREATE USER u1")
-            == "CREATE USER u1 SETTINGS PROFILE s1\n"
+            == "CREATE USER u1 SETTINGS PROFILE `s1`\n"
         )
         assert (
             instance.query("SHOW CREATE USER u2")
@@ -64,16 +64,16 @@ def test_create():
         assert instance.query("SHOW GRANTS FOR u2") == "GRANT rx TO u2\n"
         assert (
             instance.query("SHOW CREATE ROLE rx")
-            == "CREATE ROLE rx SETTINGS PROFILE s1\n"
+            == "CREATE ROLE rx SETTINGS PROFILE `s1`\n"
         )
         assert instance.query("SHOW GRANTS FOR rx") == ""
         assert (
             instance.query("SHOW CREATE SETTINGS PROFILE s1")
-            == "CREATE SETTINGS PROFILE s1 SETTINGS max_memory_usage = 123456789 MIN 100000000 MAX 200000000\n"
+            == "CREATE SETTINGS PROFILE `s1` SETTINGS max_memory_usage = 123456789 MIN 100000000 MAX 200000000\n"
         )
         assert (
             instance.query("SHOW CREATE SETTINGS PROFILE s2")
-            == "CREATE SETTINGS PROFILE s2 SETTINGS INHERIT s1 TO u2\n"
+            == "CREATE SETTINGS PROFILE `s2` SETTINGS INHERIT `s1` TO u2\n"
         )
 
     check()
@@ -99,7 +99,7 @@ def test_alter():
     def check():
         assert (
             instance.query("SHOW CREATE USER u1")
-            == "CREATE USER u1 SETTINGS PROFILE s1\n"
+            == "CREATE USER u1 SETTINGS PROFILE `s1`\n"
         )
         assert (
             instance.query("SHOW CREATE USER u2")
@@ -112,7 +112,7 @@ def test_alter():
         assert instance.query("SHOW GRANTS FOR u2") == "GRANT rx, ry TO u2\n"
         assert (
             instance.query("SHOW CREATE ROLE rx")
-            == "CREATE ROLE rx SETTINGS PROFILE s2\n"
+            == "CREATE ROLE rx SETTINGS PROFILE `s2`\n"
         )
         assert instance.query("SHOW CREATE ROLE ry") == "CREATE ROLE ry\n"
         assert (
@@ -124,11 +124,11 @@ def test_alter():
         )
         assert (
             instance.query("SHOW CREATE SETTINGS PROFILE s1")
-            == "CREATE SETTINGS PROFILE s1 SETTINGS max_memory_usage = 987654321 CONST\n"
+            == "CREATE SETTINGS PROFILE `s1` SETTINGS max_memory_usage = 987654321 CONST\n"
         )
         assert (
             instance.query("SHOW CREATE SETTINGS PROFILE s2")
-            == "CREATE SETTINGS PROFILE s2 SETTINGS INHERIT s1 TO u2\n"
+            == "CREATE SETTINGS PROFILE `s2` SETTINGS INHERIT `s1` TO u2\n"
         )
 
     check()
@@ -150,7 +150,7 @@ def test_drop():
         assert instance.query("SHOW CREATE USER u1") == "CREATE USER u1\n"
         assert (
             instance.query("SHOW CREATE SETTINGS PROFILE s2")
-            == "CREATE SETTINGS PROFILE s2\n"
+            == "CREATE SETTINGS PROFILE `s2`\n"
         )
         assert "There is no user `u2`" in instance.query_and_get_error(
             "SHOW CREATE USER u2"
diff --git a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
index 56ee3e532c4..482aa78e611 100644
--- a/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
+++ b/tests/integration/test_disk_over_web_server/configs/storage_conf_web.xml
@@ -29,4 +29,6 @@
             </cached_web>
         </policies>
     </storage_configuration>
+
+    <query_log></query_log>
 </clickhouse>
diff --git a/tests/integration/test_disk_over_web_server/test.py b/tests/integration/test_disk_over_web_server/test.py
index a71fdeff302..fba51949ef0 100644
--- a/tests/integration/test_disk_over_web_server/test.py
+++ b/tests/integration/test_disk_over_web_server/test.py
@@ -1,6 +1,6 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 uuids = []
 
@@ -13,7 +13,7 @@ def cluster():
             "node1",
             main_configs=["configs/storage_conf.xml"],
             with_nginx=True,
-            allow_analyzer=False,
+            use_old_analyzer=True,
         )
         cluster.add_instance(
             "node2",
@@ -21,14 +21,14 @@ def cluster():
             with_nginx=True,
             stay_alive=True,
             with_zookeeper=True,
-            allow_analyzer=False,
+            use_old_analyzer=True,
         )
         cluster.add_instance(
             "node3",
             main_configs=["configs/storage_conf_web.xml"],
             with_nginx=True,
             with_zookeeper=True,
-            allow_analyzer=False,
+            use_old_analyzer=True,
         )
 
         cluster.add_instance(
@@ -38,8 +38,7 @@ def cluster():
             stay_alive=True,
             with_installed_binary=True,
             image="clickhouse/clickhouse-server",
-            tag="22.6",
-            allow_analyzer=False,
+            tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
         )
 
         cluster.start()
@@ -172,7 +171,7 @@ def test_incorrect_usage(cluster):
     assert "Table is read-only" in result
 
     result = node2.query_and_get_error("OPTIMIZE TABLE test0 FINAL")
-    assert "Only read-only operations are supported" in result
+    assert "Table is in readonly mode due to static storage" in result
 
     node2.query("DROP TABLE test0 SYNC")
 
@@ -278,7 +277,7 @@ def test_unavailable_server(cluster):
             "Caught exception while loading metadata.*Connection refused"
         )
         assert node2.contains_in_log(
-            "HTTP request to \`http://nginx:8080/test1/.*\` failed at try 1/10 with bytes read: 0/unknown. Error: Connection refused."
+            "Failed to make request to 'http://nginx:8080/test1/.*'. Error: 'Connection refused'. Failed at try 10/10."
         )
     finally:
         node2.exec_in_container(
@@ -322,3 +321,74 @@ def test_replicated_database(cluster):
 
     node1.query("DROP DATABASE rdb SYNC")
     node2.query("DROP DATABASE rdb SYNC")
+
+
+def test_page_cache(cluster):
+    node = cluster.instances["node2"]
+    global uuids
+    assert len(uuids) == 3
+    for i in range(3):
+        node.query(
+            """
+            CREATE TABLE test{} UUID '{}'
+            (id Int32) ENGINE = MergeTree() ORDER BY id
+            SETTINGS storage_policy = 'web';
+        """.format(
+                i, uuids[i], i, i
+            )
+        )
+
+        result1 = node.query(
+            f"SELECT sum(cityHash64(*)) FROM test{i} SETTINGS use_page_cache_for_disks_without_file_cache=1 -- test cold cache"
+        )
+        result2 = node.query(
+            f"SELECT sum(cityHash64(*)) FROM test{i} SETTINGS use_page_cache_for_disks_without_file_cache=1 -- test warm cache"
+        )
+        result3 = node.query(
+            f"SELECT sum(cityHash64(*)) FROM test{i} SETTINGS use_page_cache_for_disks_without_file_cache=0 -- test no cache"
+        )
+
+        assert result1 == result3
+        assert result2 == result3
+
+        node.query("SYSTEM FLUSH LOGS")
+
+        def get_profile_events(query_name):
+            print(f"asdqwe {query_name}")
+            text = node.query(
+                f"SELECT ProfileEvents.Names, ProfileEvents.Values FROM system.query_log ARRAY JOIN ProfileEvents WHERE query LIKE '% -- {query_name}' AND type = 'QueryFinish'"
+            )
+            res = {}
+            for line in text.split("\n"):
+                if line == "":
+                    continue
+                name, value = line.split("\t")
+                print(f"asdqwe {name} = {int(value)}")
+                res[name] = int(value)
+            return res
+
+        ev1 = get_profile_events("test cold cache")
+        assert ev1.get("PageCacheChunkMisses", 0) > 0
+        assert (
+            ev1.get("DiskConnectionsCreated", 0) + ev1.get("DiskConnectionsReused", 0)
+            > 0
+        )
+
+        ev2 = get_profile_events("test warm cache")
+        assert ev2.get("PageCacheChunkDataHits", 0) > 0
+        assert ev2.get("PageCacheChunkMisses", 0) == 0
+        assert (
+            ev2.get("DiskConnectionsCreated", 0) + ev2.get("DiskConnectionsReused", 0)
+            == 0
+        )
+
+        ev3 = get_profile_events("test no cache")
+        assert ev3.get("PageCacheChunkDataHits", 0) == 0
+        assert ev3.get("PageCacheChunkMisses", 0) == 0
+        assert (
+            ev3.get("DiskConnectionsCreated", 0) + ev3.get("DiskConnectionsReused", 0)
+            > 0
+        )
+
+        node.query("DROP TABLE test{} SYNC".format(i))
+        print(f"Ok {i}")
diff --git a/tests/integration/test_disk_types/test.py b/tests/integration/test_disk_types/test.py
index af482b97be3..3c4169be4de 100644
--- a/tests/integration/test_disk_types/test.py
+++ b/tests/integration/test_disk_types/test.py
@@ -1,14 +1,17 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.test_tools import TSV
 
 disk_types = {
-    "default": "local",
-    "disk_s3": "s3",
-    "disk_hdfs": "hdfs",
-    "disk_encrypted": "s3",
+    "default": "Local",
+    "disk_s3": "S3",
+    "disk_encrypted": "S3",
 }
 
+# do not test HDFS on ARM
+if not is_arm():
+    disk_types["disk_hdfs"] = "HDFS"
+
 
 @pytest.fixture(scope="module")
 def cluster():
@@ -18,7 +21,7 @@ def cluster():
             "node",
             main_configs=["configs/storage.xml"],
             with_minio=True,
-            with_hdfs=True,
+            with_hdfs=not is_arm(),
         )
         cluster.start()
 
@@ -52,22 +55,63 @@ def test_different_types(cluster):
             ), f"{fields[name_col_ix]} expected to be non-encrypted!"
 
 
+def test_different_types(cluster):
+    node = cluster.instances["node"]
+    response = TSV.toMat(node.query("SELECT * FROM system.disks FORMAT TSVWithNames"))
+
+    assert len(response) > len(disk_types)  # at least one extra line for header
+
+    name_col_ix = response[0].index("name")
+    type_col_ix = response[0].index("type")
+    encrypted_col_ix = response[0].index("is_encrypted")
+
+    for fields in response[1:]:  # skip header
+        assert len(fields) >= 7
+        expected_disk_type = disk_types.get(fields[name_col_ix], "UNKNOWN")
+
+        if expected_disk_type != "Local":
+            disk_type = fields[response[0].index("object_storage_type")]
+        else:
+            disk_type = fields[type_col_ix]
+
+        assert (
+            expected_disk_type == disk_type
+        ), f"Wrong type ({fields[type_col_ix]}) for disk {fields[name_col_ix]}!"
+        if "encrypted" in fields[name_col_ix]:
+            assert (
+                fields[encrypted_col_ix] == "1"
+            ), f"{fields[name_col_ix]} expected to be encrypted!"
+        else:
+            assert (
+                fields[encrypted_col_ix] == "0"
+            ), f"{fields[name_col_ix]} expected to be non-encrypted!"
+
+
 def test_select_by_type(cluster):
     node = cluster.instances["node"]
     for name, disk_type in list(disk_types.items()):
-        if disk_type != "s3":
+        if disk_type == "Local":
             assert (
                 node.query(
                     "SELECT name FROM system.disks WHERE type='" + disk_type + "'"
                 )
                 == name + "\n"
             )
-        else:
+        elif disk_type == "S3":
             assert (
                 node.query(
-                    "SELECT name FROM system.disks WHERE type='"
+                    "SELECT name FROM system.disks WHERE object_storage_type='"
                     + disk_type
                     + "' ORDER BY name"
                 )
                 == "disk_encrypted\ndisk_s3\n"
             )
+        else:
+            assert (
+                node.query(
+                    "SELECT name FROM system.disks WHERE object_storage_type='"
+                    + disk_type
+                    + "'"
+                )
+                == name + "\n"
+            )
diff --git a/tests/integration/test_distributed_backward_compatability/test.py b/tests/integration/test_distributed_backward_compatability/test.py
deleted file mode 100644
index 319a4c08e60..00000000000
--- a/tests/integration/test_distributed_backward_compatability/test.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import pytest
-
-from helpers.cluster import ClickHouseCluster
-
-cluster = ClickHouseCluster(__file__)
-
-node_old = cluster.add_instance(
-    "node1",
-    main_configs=["configs/remote_servers.xml"],
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
-    stay_alive=True,
-    with_installed_binary=True,
-    allow_analyzer=False,
-)
-node_new = cluster.add_instance(
-    "node2",
-    main_configs=["configs/remote_servers.xml"],
-    user_configs=["configs/legacy.xml"],
-)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-
-        for node in (node_old, node_new):
-            node.query(
-                "CREATE TABLE local_table(id UInt32, val String) ENGINE = MergeTree ORDER BY id"
-            )
-
-        node_old.query("INSERT INTO local_table VALUES (1, 'node1')")
-        node_new.query("INSERT INTO local_table VALUES (2, 'node2')")
-
-        node_old.query(
-            "CREATE TABLE distributed(id UInt32, val String) ENGINE = Distributed(test_cluster, default, local_table)"
-        )
-        node_new.query(
-            "CREATE TABLE distributed(id UInt32, val String) ENGINE = Distributed(test_cluster, default, local_table)"
-        )
-
-        yield cluster
-
-    finally:
-        cluster.shutdown()
-
-
-def test_distributed_in_tuple(started_cluster):
-    query1 = "SELECT count() FROM distributed WHERE (id, val) IN ((1, 'node1'), (2, 'a'), (3, 'b'))"
-    query2 = (
-        "SELECT sum((id, val) IN ((1, 'node1'), (2, 'a'), (3, 'b'))) FROM distributed"
-    )
-    assert node_old.query(query1) == "1\n"
-    assert node_old.query(query2) == "1\n"
-    assert node_new.query(query1) == "1\n"
-    assert node_new.query(query2) == "1\n"
-
-    large_set = "(" + ",".join([str(i) for i in range(1000)]) + ")"
-    query3 = "SELECT count() FROM distributed WHERE id IN " + large_set
-    query4 = "SELECT sum(id IN {}) FROM distributed".format(large_set)
-    assert node_old.query(query3) == "2\n"
-    assert node_old.query(query4) == "2\n"
-    assert node_new.query(query3) == "2\n"
-    assert node_new.query(query4) == "2\n"
diff --git a/tests/queries/0_stateless/02895_forbid_create_inverted_index.reference b/tests/integration/test_distributed_config/__init__.py
similarity index 100%
rename from tests/queries/0_stateless/02895_forbid_create_inverted_index.reference
rename to tests/integration/test_distributed_config/__init__.py
diff --git a/tests/integration/test_distributed_config/configs/clusters.xml b/tests/integration/test_distributed_config/configs/clusters.xml
new file mode 100644
index 00000000000..754d765f23f
--- /dev/null
+++ b/tests/integration/test_distributed_config/configs/clusters.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <localhost_cluster>
+            <shard>
+                <replica>
+                    <host>localhost</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </localhost_cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_distributed_config/configs/overrides.xml b/tests/integration/test_distributed_config/configs/overrides.xml
new file mode 100644
index 00000000000..fb4e5c69329
--- /dev/null
+++ b/tests/integration/test_distributed_config/configs/overrides.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <distributed>
+        <flush_on_detach>0</flush_on_detach>
+    </distributed>
+</clickhouse>
diff --git a/tests/integration/test_distributed_config/test.py b/tests/integration/test_distributed_config/test.py
new file mode 100644
index 00000000000..bf4bb5a4335
--- /dev/null
+++ b/tests/integration/test_distributed_config/test.py
@@ -0,0 +1,51 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+import logging
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node", main_configs=["configs/overrides.xml", "configs/clusters.xml"]
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        logging.info("Starting cluster...")
+        cluster.start()
+        logging.info("Cluster started")
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_distibuted_settings(start_cluster):
+    node.query("")
+    node.query(
+        """
+        CREATE TABLE data_1 (key Int) ENGINE Memory();
+        CREATE TABLE dist_1 as data_1 ENGINE Distributed(localhost_cluster, default, data_1) SETTINGS flush_on_detach = true;
+        SYSTEM STOP DISTRIBUTED SENDS dist_1;
+        INSERT INTO dist_1 SETTINGS prefer_localhost_replica=0 VALUES (1);
+        DETACH TABLE dist_1;
+    """
+    )
+    assert "flush_on_detach = 1" in node.query("SHOW CREATE dist_1")
+    # flush_on_detach=true, so data_1 should have 1 row
+    assert int(node.query("SELECT count() FROM data_1")) == 1
+
+    node.query(
+        """
+        CREATE TABLE data_2 (key Int) ENGINE Memory();
+        CREATE TABLE dist_2 as data_2 ENGINE Distributed(localhost_cluster, default, data_2);
+        SYSTEM STOP DISTRIBUTED SENDS dist_2;
+        INSERT INTO dist_2 SETTINGS prefer_localhost_replica=0 VALUES (2);
+        DETACH TABLE dist_2;
+    """
+    )
+    ## Settings are not added to CREATE (only specific one, like index_granularity for MergeTree)
+    # assert "flush_on_detach = 0" in node.query("SHOW CREATE dist_2")
+
+    # But settins are applied (flush_on_detach=false in config, so data_2 should not have any rows)
+    assert int(node.query("SELECT count() FROM data_2")) == 0
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 0ad00c39a3b..43728ff600f 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
@@ -67,7 +67,7 @@ def test_distributed_background_insert_split_batch_on_failure_OFF(started_cluste
                 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)
+                    # (local query should not be affected since 20MB is enough for 100K rows)
                     "max_memory_usage": "20Mi",
                     "max_untracked_memory": "0",
                 },
@@ -76,7 +76,8 @@ def test_distributed_background_insert_split_batch_on_failure_OFF(started_cluste
         if setting == "background_insert_batch" 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",
+                # no DOTALL in pytest.raises, use '(.|\n)'
+                match=r"DB::Exception: Received from.*Memory limit \(for query\) exceeded: (.|\n)*While sending a batch",
             ):
                 node2.query("system flush distributed dist")
             assert int(node2.query("select count() from dist_data")) == 0
@@ -94,8 +95,8 @@ def test_distributed_background_insert_split_batch_on_failure_ON(started_cluster
                 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",
+                    # (local query should not be affected since 20MB is enough for 100K rows)
+                    "max_memory_usage": "20Mi",
                     "max_untracked_memory": "0",
                 },
             )
diff --git a/tests/integration/test_distributed_insert_backward_compatibility/test.py b/tests/integration/test_distributed_insert_backward_compatibility/test.py
index 7cfea61ffff..9e794555d49 100644
--- a/tests/integration/test_distributed_insert_backward_compatibility/test.py
+++ b/tests/integration/test_distributed_insert_backward_compatibility/test.py
@@ -1,6 +1,6 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.client import QueryRuntimeException
 
 cluster = ClickHouseCluster(__file__)
@@ -10,11 +10,10 @@ node_shard = cluster.add_instance("node1", main_configs=["configs/remote_servers
 node_dist = cluster.add_instance(
     "node2",
     main_configs=["configs/remote_servers.xml"],
-    image="yandex/clickhouse-server",
-    tag="21.6",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_distributed_inter_server_secret/test.py b/tests/integration/test_distributed_inter_server_secret/test.py
index a5b353cc030..88f051b022b 100644
--- a/tests/integration/test_distributed_inter_server_secret/test.py
+++ b/tests/integration/test_distributed_inter_server_secret/test.py
@@ -26,15 +26,6 @@ def make_instance(name, cfg, *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="22.6",
-    with_installed_binary=True,
-    allow_analyzer=False,
-)
 
 users = pytest.mark.parametrize(
     "user,password",
@@ -408,25 +399,3 @@ 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
-    n1.query(
-        f"SELECT *, '{id_}' 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
-    backward.query(f"SELECT *, '{id_}' FROM dist_secure", 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_type_object/test.py b/tests/integration/test_distributed_type_object/test.py
index b2179af8a3f..360087c9dda 100644
--- a/tests/integration/test_distributed_type_object/test.py
+++ b/tests/integration/test_distributed_type_object/test.py
@@ -59,7 +59,14 @@ def test_distributed_type_object(started_cluster):
     )
 
     expected = TSV("120\n")
-    assert TSV(node1.query("SELECT sum(data.k2 * id) FROM dist_table")) == expected
+    assert (
+        TSV(
+            node1.query(
+                "SELECT sum(data.k2 * id) FROM dist_table SETTINGS optimize_arithmetic_operations_in_aggregate_functions = 0"
+            )
+        )
+        == expected
+    )
 
     node1.query("TRUNCATE TABLE local_table")
     node2.query("TRUNCATE TABLE local_table")
@@ -78,10 +85,11 @@ def test_distributed_type_object(started_cluster):
 3\t\t\t\tfoo"""
     )
 
+    # The following query is not supported by analyzer now
     assert (
         TSV(
             node1.query(
-                "SELECT id, data.k1, data.k2.k3, data.k2.k4, data.k5 FROM dist_table ORDER BY id"
+                "SELECT id, data.k1, data.k2.k3, data.k2.k4, data.k5 FROM dist_table ORDER BY id SETTINGS allow_experimental_analyzer = 0"
             )
         )
         == expected
diff --git a/tests/integration/test_dns_cache/test.py b/tests/integration/test_dns_cache/test.py
index 9c1c9797383..a6db26c8575 100644
--- a/tests/integration/test_dns_cache/test.py
+++ b/tests/integration/test_dns_cache/test.py
@@ -46,6 +46,7 @@ def cluster_without_dns_cache_update():
 
     except Exception as ex:
         print(ex)
+        raise
 
     finally:
         cluster.shutdown()
@@ -61,6 +62,7 @@ def test_ip_change_drop_dns_cache(cluster_without_dns_cache_update):
     node2.set_hosts([("2001:3984:3989::1:1111", "node1")])
     # drop DNS cache
     node2.query("SYSTEM DROP DNS CACHE")
+    node2.query("SYSTEM DROP CONNECTIONS CACHE")
 
     # First we check, that normal replication works
     node1.query(
@@ -86,6 +88,7 @@ def test_ip_change_drop_dns_cache(cluster_without_dns_cache_update):
 
     # drop DNS cache
     node2.query("SYSTEM DROP DNS CACHE")
+    node2.query("SYSTEM DROP CONNECTIONS CACHE")
     # Data is downloaded
     assert_eq_with_retry(node2, "SELECT count(*) from test_table_drop", "6")
 
@@ -124,6 +127,7 @@ def cluster_with_dns_cache_update():
 
     except Exception as ex:
         print(ex)
+        raise
 
     finally:
         cluster.shutdown()
@@ -267,6 +271,11 @@ def test_user_access_ip_change(cluster_with_dns_cache_update, node):
             privileged=True,
             user="root",
         )
+        node.exec_in_container(
+            ["bash", "-c", 'clickhouse client -q "SYSTEM DROP CONNECTIONS CACHE"'],
+            privileged=True,
+            user="root",
+        )
         retry_count = 1
 
     assert_eq_with_retry(
@@ -296,7 +305,8 @@ def test_host_is_drop_from_cache_after_consecutive_failures(
     # Note that the list of hosts in variable since lost_host will be there too (and it's dropped and added back)
     # dns_update_short -> dns_max_consecutive_failures set to 6
     assert node4.wait_for_log_line(
-        "Code: 198. DB::Exception: Not found address of host: InvalidHostThatDoesNotExist."
+        regexp="Code: 198. DB::NetException: Not found address of host: InvalidHostThatDoesNotExist.",
+        look_behind_lines=300,
     )
     assert node4.wait_for_log_line(
         "Cached hosts not found:.*InvalidHostThatDoesNotExist**",
diff --git a/tests/integration/test_endpoint_macro_substitution/test.py b/tests/integration/test_endpoint_macro_substitution/test.py
index 42a8ddbda84..7dc282a980f 100644
--- a/tests/integration/test_endpoint_macro_substitution/test.py
+++ b/tests/integration/test_endpoint_macro_substitution/test.py
@@ -1,15 +1,18 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.test_tools import TSV
 from pyhdfs import HdfsClient
 
 disk_types = {
-    "default": "local",
-    "disk_s3": "s3",
-    "disk_hdfs": "hdfs",
-    "disk_encrypted": "s3",
+    "default": "Local",
+    "disk_s3": "S3",
+    "disk_hdfs": "HDFS",
+    "disk_encrypted": "S3",
 }
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 @pytest.fixture(scope="module")
 def cluster():
@@ -45,8 +48,15 @@ def test_different_types(cluster):
 
     for fields in response[1:]:  # skip header
         assert len(fields) >= 7
+        expected_disk_type = disk_types.get(fields[name_col_ix], "UNKNOWN")
+
+        if expected_disk_type != "Local":
+            disk_type = fields[response[0].index("object_storage_type")]
+        else:
+            disk_type = fields[type_col_ix]
+
         assert (
-            disk_types.get(fields[name_col_ix], "UNKNOWN") == fields[type_col_ix]
+            expected_disk_type == disk_type
         ), f"Wrong type ({fields[type_col_ix]}) for disk {fields[name_col_ix]}!"
         if "encrypted" in fields[name_col_ix]:
             assert (
@@ -60,22 +70,29 @@ def test_different_types(cluster):
 
 def test_select_by_type(cluster):
     node = cluster.instances["node"]
-    fs = HdfsClient(hosts=cluster.hdfs_ip)
-
     for name, disk_type in list(disk_types.items()):
-        if disk_type != "s3":
+        if disk_type == "Local":
             assert (
                 node.query(
                     "SELECT name FROM system.disks WHERE type='" + disk_type + "'"
                 )
                 == name + "\n"
             )
-        else:
+        elif disk_type == "S3":
             assert (
                 node.query(
-                    "SELECT name FROM system.disks WHERE type='"
+                    "SELECT name FROM system.disks WHERE object_storage_type='"
                     + disk_type
                     + "' ORDER BY name"
                 )
                 == "disk_encrypted\ndisk_s3\n"
             )
+        else:
+            assert (
+                node.query(
+                    "SELECT name FROM system.disks WHERE object_storage_type='"
+                    + disk_type
+                    + "'"
+                )
+                == name + "\n"
+            )
diff --git a/tests/integration/test_external_cluster/test.py b/tests/integration/test_external_cluster/test.py
index 2ed8ada3df4..6fa9cd16dbc 100644
--- a/tests/integration/test_external_cluster/test.py
+++ b/tests/integration/test_external_cluster/test.py
@@ -46,6 +46,12 @@ def test_ddl(started_cluster):
     control_node.query(
         "ALTER TABLE test_db.test_table ON CLUSTER 'external' add column data String"
     )
+    control_node.query("DETACH TABLE test_db.test_table ON CLUSTER 'external'")
+
+    expected = ""
+    assert_create_query(data_node, "test_db", "test_table", expected)
+
+    control_node.query("ATTACH TABLE test_db.test_table ON CLUSTER 'external'")
 
     expected = "CREATE TABLE test_db.test_table (`id` Int64, `data` String) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 8192"
     assert_create_query(data_node, "test_db", "test_table", expected)
diff --git a/tests/integration/test_external_http_authenticator/test.py b/tests/integration/test_external_http_authenticator/test.py
index ca5225142f8..286d3a334c1 100644
--- a/tests/integration/test_external_http_authenticator/test.py
+++ b/tests/integration/test_external_http_authenticator/test.py
@@ -59,7 +59,7 @@ def started_cluster():
 def test_user_from_config_basic_auth_pass(started_cluster):
     assert (
         instance.query("SHOW CREATE USER good_user")
-        == "CREATE USER good_user IDENTIFIED WITH http SERVER \\'basic_server\\' SCHEME \\'BASIC\\' SETTINGS PROFILE default\n"
+        == "CREATE USER good_user IDENTIFIED WITH http SERVER \\'basic_server\\' SCHEME \\'BASIC\\' SETTINGS PROFILE `default`\n"
     )
     assert (
         instance.query(
diff --git a/tests/integration/test_failed_async_inserts/configs/config.xml b/tests/integration/test_failed_async_inserts/configs/config.xml
index 038c0792b44..7daf4bd31a1 100644
--- a/tests/integration/test_failed_async_inserts/configs/config.xml
+++ b/tests/integration/test_failed_async_inserts/configs/config.xml
@@ -1,3 +1,4 @@
 <clickhouse>
     <max_server_memory_usage>1000</max_server_memory_usage>
+    <page_cache_size>0</page_cache_size>
 </clickhouse>
diff --git a/tests/integration/test_failed_mutations/__init__.py b/tests/integration/test_failed_mutations/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_failed_mutations/configs/config.d/backoff_mutation_policy.xml b/tests/integration/test_failed_mutations/configs/config.d/backoff_mutation_policy.xml
new file mode 100644
index 00000000000..0abb5150da8
--- /dev/null
+++ b/tests/integration/test_failed_mutations/configs/config.d/backoff_mutation_policy.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <max_postpone_time_for_failed_mutations_ms>60000</max_postpone_time_for_failed_mutations_ms>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_failed_mutations/configs/config.d/no_backoff_mutation_policy.xml b/tests/integration/test_failed_mutations/configs/config.d/no_backoff_mutation_policy.xml
new file mode 100644
index 00000000000..5d37cae3eed
--- /dev/null
+++ b/tests/integration/test_failed_mutations/configs/config.d/no_backoff_mutation_policy.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <max_postpone_time_for_failed_mutations_ms>0</max_postpone_time_for_failed_mutations_ms>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_failed_mutations/test.py b/tests/integration/test_failed_mutations/test.py
new file mode 100644
index 00000000000..c72f5264f03
--- /dev/null
+++ b/tests/integration/test_failed_mutations/test.py
@@ -0,0 +1,210 @@
+import time
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node_with_backoff = cluster.add_instance(
+    "node_with_backoff",
+    macros={"cluster": "test_cluster"},
+    main_configs=["configs/config.d/backoff_mutation_policy.xml"],
+    with_zookeeper=True,
+    stay_alive=True,
+)
+
+node_no_backoff = cluster.add_instance(
+    "node_no_backoff",
+    macros={"cluster": "test_cluster"},
+    main_configs=["configs/config.d/no_backoff_mutation_policy.xml"],
+    with_zookeeper=True,
+)
+
+REPLICATED_POSTPONE_MUTATION_LOG = (
+    "According to exponential backoff policy, put aside this log entry"
+)
+POSTPONE_MUTATION_LOG = (
+    "According to exponential backoff policy, do not perform mutations for the part"
+)
+
+all_nodes = [node_with_backoff, node_no_backoff]
+
+
+def prepare_cluster(use_replicated_table):
+    for node in all_nodes:
+        node.query("DROP TABLE IF EXISTS test_mutations SYNC")
+
+    engine = (
+        "ReplicatedMergeTree('/clickhouse/{cluster}/tables/test/test_mutations', '{instance}')"
+        if use_replicated_table
+        else "MergeTree()"
+    )
+
+    for node in all_nodes:
+        node.rotate_logs()
+        node.query(f"CREATE TABLE test_mutations(x UInt32) ENGINE {engine} ORDER BY x")
+        node.query("INSERT INTO test_mutations SELECT * FROM system.numbers LIMIT 10")
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.mark.parametrize(
+    ("node, found_in_log"),
+    [
+        (
+            node_with_backoff,
+            True,
+        ),
+        (
+            node_no_backoff,
+            False,
+        ),
+    ],
+)
+def test_exponential_backoff_with_merge_tree(started_cluster, node, found_in_log):
+    prepare_cluster(False)
+
+    def check_logs():
+        if found_in_log:
+            assert node.wait_for_log_line(POSTPONE_MUTATION_LOG)
+            # Do not rotate the logs when we are checking the absence of a log message
+            node.rotate_logs()
+        else:
+            # Best effort, but when it fails, then the logs for sure contain the problematic message
+            assert not node.contains_in_log(POSTPONE_MUTATION_LOG)
+
+    # Executing incorrect mutation.
+    node.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x FROM notexist_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+
+    check_logs()
+
+    node.query("KILL MUTATION WHERE table='test_mutations'")
+    # Check that after kill new parts mutations are postponing.
+    node.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x FROM notexist_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+
+    check_logs()
+
+
+def test_exponential_backoff_with_replicated_tree(started_cluster):
+    prepare_cluster(True)
+
+    node_with_backoff.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x FROM notexist_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+
+    assert node_with_backoff.wait_for_log_line(REPLICATED_POSTPONE_MUTATION_LOG)
+    assert not node_no_backoff.contains_in_log(REPLICATED_POSTPONE_MUTATION_LOG)
+
+
+def test_exponential_backoff_create_dependent_table(started_cluster):
+    prepare_cluster(False)
+
+    # Executing incorrect mutation.
+    node_with_backoff.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x  FROM dep_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+
+    # Creating dependent table for mutation.
+    node_with_backoff.query(
+        "CREATE TABLE dep_table(x UInt32) ENGINE MergeTree() ORDER BY x"
+    )
+
+    retry_count = 100
+    no_unfinished_mutation = False
+    for _ in range(0, retry_count):
+        if (
+            node_with_backoff.query(
+                "SELECT count() FROM system.mutations WHERE is_done=0"
+            )
+            == "0\n"
+        ):
+            no_unfinished_mutation = True
+            break
+
+    assert no_unfinished_mutation
+    node_with_backoff.query("DROP TABLE IF EXISTS dep_table SYNC")
+
+
+def test_exponential_backoff_setting_override(started_cluster):
+    node = node_with_backoff
+    node.rotate_logs()
+    node.query("DROP TABLE IF EXISTS test_mutations SYNC")
+    node.query(
+        "CREATE TABLE test_mutations(x UInt32) ENGINE=MergeTree() ORDER BY x SETTINGS max_postpone_time_for_failed_mutations_ms=0"
+    )
+    node.query("INSERT INTO test_mutations SELECT * FROM system.numbers LIMIT 10")
+
+    # Executing incorrect mutation.
+    node.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x  FROM dep_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+    assert not node.contains_in_log(POSTPONE_MUTATION_LOG)
+
+
+@pytest.mark.parametrize(
+    ("replicated_table"),
+    [
+        (False),
+        (True),
+    ],
+)
+def test_backoff_clickhouse_restart(started_cluster, replicated_table):
+    prepare_cluster(replicated_table)
+    node = node_with_backoff
+
+    # Executing incorrect mutation.
+    node.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x  FROM dep_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+    assert node.wait_for_log_line(
+        REPLICATED_POSTPONE_MUTATION_LOG if replicated_table else POSTPONE_MUTATION_LOG
+    )
+
+    node.restart_clickhouse()
+    node.rotate_logs()
+
+    assert node.wait_for_log_line(
+        REPLICATED_POSTPONE_MUTATION_LOG if replicated_table else POSTPONE_MUTATION_LOG
+    )
+
+
+@pytest.mark.parametrize(
+    ("replicated_table"),
+    [
+        (False),
+        (True),
+    ],
+)
+def test_no_backoff_after_killing_mutation(started_cluster, replicated_table):
+    prepare_cluster(replicated_table)
+    node = node_with_backoff
+
+    # Executing incorrect mutation.
+    node.query(
+        "ALTER TABLE test_mutations DELETE WHERE x IN (SELECT x  FROM dep_table) SETTINGS allow_nondeterministic_mutations=1"
+    )
+    # Executing correct mutation.
+    node.query("ALTER TABLE test_mutations DELETE  WHERE x=1")
+    assert node.wait_for_log_line(
+        REPLICATED_POSTPONE_MUTATION_LOG if replicated_table else POSTPONE_MUTATION_LOG
+    )
+    mutation_ids = node.query("select mutation_id from system.mutations").split()
+
+    node.query(
+        f"KILL MUTATION WHERE table = 'test_mutations' AND mutation_id = '{mutation_ids[0]}'"
+    )
+    node.rotate_logs()
+    assert not node.contains_in_log(
+        REPLICATED_POSTPONE_MUTATION_LOG if replicated_table else POSTPONE_MUTATION_LOG
+    )
diff --git a/tests/integration/test_file_cluster/test.py b/tests/integration/test_file_cluster/test.py
index d75cd6c7d23..5d12407e3f2 100644
--- a/tests/integration/test_file_cluster/test.py
+++ b/tests/integration/test_file_cluster/test.py
@@ -123,3 +123,91 @@ def test_no_such_files(started_cluster):
     distributed = node.query(get_query("*", True, "3,4"))
 
     assert TSV(local) == TSV(distributed)
+
+
+def test_schema_inference(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    expected_result = node.query(
+        "select * from file('file*.csv', 'CSV', 's String, i UInt32') ORDER BY (i, s)"
+    )
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv') ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', CSV) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', auto, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', CSV, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', auto, auto, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file*.csv', CSV, auto, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+
+def test_format_detection(started_cluster):
+    for node_name in ("s0_0_0", "s0_0_1", "s0_1_0"):
+        for i in range(1, 3):
+            started_cluster.instances[node_name].query(
+                f"""
+                INSERT INTO TABLE FUNCTION file(
+                    'file_for_format_detection_{i}', 'CSV', 's String, i UInt32') VALUES ('file{i}',{i})
+                    """
+            )
+
+    node = started_cluster.instances["s0_0_0"]
+    expected_result = node.query(
+        "select * from file('file_for_format_detection*', 'CSV', 's String, i UInt32') ORDER BY (i, s)"
+    )
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*') ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*', auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*', auto, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*', auto, 's String, i UInt32') ORDER BY (i, s)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*', auto, auto, auto) ORDER BY (c1, c2)"
+    )
+    assert result == expected_result
+
+    result = node.query(
+        "select * from fileCluster('my_cluster', 'file_for_format_detection*', auto, 's String, i UInt32', auto) ORDER BY (i, s)"
+    )
+    assert result == expected_result
diff --git a/tests/integration/test_filesystem_cache/config.d/force_read_through_cache_for_merges.xml b/tests/integration/test_filesystem_cache/config.d/force_read_through_cache_for_merges.xml
new file mode 100644
index 00000000000..23d3fdea800
--- /dev/null
+++ b/tests/integration/test_filesystem_cache/config.d/force_read_through_cache_for_merges.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <force_read_through_cache_for_merges>1</force_read_through_cache_for_merges>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_filesystem_cache/config.d/remove_filesystem_caches_path.xml b/tests/integration/test_filesystem_cache/config.d/remove_filesystem_caches_path.xml
new file mode 100644
index 00000000000..57417af1a39
--- /dev/null
+++ b/tests/integration/test_filesystem_cache/config.d/remove_filesystem_caches_path.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <custom_cached_disks_base_directory remove="remove"/>
+</clickhouse>
diff --git a/tests/integration/test_filesystem_cache/config.d/storage_conf.xml b/tests/integration/test_filesystem_cache/config.d/storage_conf.xml
index b614815b34f..a8e4f9f8a99 100644
--- a/tests/integration/test_filesystem_cache/config.d/storage_conf.xml
+++ b/tests/integration/test_filesystem_cache/config.d/storage_conf.xml
@@ -7,4 +7,8 @@
             </hdd_blob>
         </disks>
     </storage_configuration>
+    <filesystem_cache_log>
+            <database>system</database>
+            <table>filesystem_cache_log</table>
+    </filesystem_cache_log>
 </clickhouse>
diff --git a/tests/integration/test_filesystem_cache/test.py b/tests/integration/test_filesystem_cache/test.py
index ab1bc4e4344..dfab462732a 100644
--- a/tests/integration/test_filesystem_cache/test.py
+++ b/tests/integration/test_filesystem_cache/test.py
@@ -19,6 +19,9 @@ def cluster():
             main_configs=[
                 "config.d/storage_conf.xml",
             ],
+            user_configs=[
+                "users.d/cache_on_write_operations.xml",
+            ],
             stay_alive=True,
         )
         cluster.add_instance(
@@ -27,6 +30,25 @@ def cluster():
                 "config.d/storage_conf_2.xml",
             ],
         )
+        cluster.add_instance(
+            "node_no_filesystem_caches_path",
+            main_configs=[
+                "config.d/storage_conf.xml",
+                "config.d/remove_filesystem_caches_path.xml",
+            ],
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "node_force_read_through_cache_on_merge",
+            main_configs=[
+                "config.d/storage_conf.xml",
+                "config.d/force_read_through_cache_for_merges.xml",
+            ],
+            user_configs=[
+                "users.d/cache_on_write_operations.xml",
+            ],
+            stay_alive=True,
+        )
 
         logging.info("Starting cluster...")
         cluster.start()
@@ -72,12 +94,21 @@ def test_parallel_cache_loading_on_startup(cluster, node_name):
     cache_state = node.query(
         "SELECT key, file_segment_range_begin, size FROM system.filesystem_cache WHERE size > 0 ORDER BY key, file_segment_range_begin, size"
     )
+    keys = (
+        node.query(
+            "SELECT distinct(key) FROM system.filesystem_cache WHERE size > 0 ORDER BY key, file_segment_range_begin, size"
+        )
+        .strip()
+        .splitlines()
+    )
 
     node.restart_clickhouse()
 
-    assert cache_count == int(node.query("SELECT count() FROM system.filesystem_cache"))
+    # < because of additional files loaded into cache on server startup.
+    assert cache_count <= int(node.query("SELECT count() FROM system.filesystem_cache"))
+    keys_set = ",".join(["'" + x + "'" for x in keys])
     assert cache_state == node.query(
-        "SELECT key, file_segment_range_begin, size FROM system.filesystem_cache ORDER BY key, file_segment_range_begin, size"
+        f"SELECT key, file_segment_range_begin, size FROM system.filesystem_cache WHERE key in ({keys_set}) ORDER BY key, file_segment_range_begin, size"
     )
 
     assert node.contains_in_log("Loading filesystem cache with 30 threads")
@@ -194,3 +225,279 @@ def test_caches_with_the_same_configuration_2(cluster, node_name):
         ).strip()
         == f"cache1\t{size}\ncache2\t{size}"
     )
+
+
+def test_custom_cached_disk(cluster):
+    node = cluster.instances["node_no_filesystem_caches_path"]
+
+    assert "Cannot create cached custom disk without" in node.query_and_get_error(
+        f"""
+        DROP TABLE IF EXISTS test SYNC;
+        CREATE TABLE test (a Int32)
+        ENGINE = MergeTree() ORDER BY tuple()
+        SETTINGS disk = disk(type = cache, path = 'kek', max_size = 1, disk = 'hdd_blob');
+        """
+    )
+
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"""echo "
+        <clickhouse>
+            <filesystem_caches_path>/var/lib/clickhouse/filesystem_caches/</filesystem_caches_path>
+        </clickhouse>
+        " > /etc/clickhouse-server/config.d/filesystem_caches_path.xml
+        """,
+        ]
+    )
+    node.restart_clickhouse()
+
+    node.query(
+        f"""
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(type = cache, name = 'custom_cached', path = 'kek', max_size = 1, disk = 'hdd_blob');
+    """
+    )
+
+    assert (
+        "/var/lib/clickhouse/filesystem_caches/kek"
+        == node.query(
+            "SELECT cache_path FROM system.disks WHERE name = 'custom_cached'"
+        ).strip()
+    )
+
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"""echo "
+        <clickhouse>
+            <custom_cached_disks_base_directory>/var/lib/clickhouse/custom_caches/</custom_cached_disks_base_directory>
+        </clickhouse>
+        " > /etc/clickhouse-server/config.d/custom_filesystem_caches_path.xml
+        """,
+        ]
+    )
+    node.exec_in_container(
+        [
+            "bash",
+            "-c",
+            "rm /etc/clickhouse-server/config.d/remove_filesystem_caches_path.xml",
+        ]
+    )
+    node.restart_clickhouse()
+
+    node.query(
+        f"""
+    CREATE TABLE test2 (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(type = cache, name = 'custom_cached2', path = 'kek2', max_size = 1, disk = 'hdd_blob');
+    """
+    )
+
+    assert (
+        "/var/lib/clickhouse/custom_caches/kek2"
+        == node.query(
+            "SELECT cache_path FROM system.disks WHERE name = 'custom_cached2'"
+        ).strip()
+    )
+
+    node.exec_in_container(
+        ["bash", "-c", "rm /etc/clickhouse-server/config.d/filesystem_caches_path.xml"]
+    )
+    node.restart_clickhouse()
+
+    node.query(
+        f"""
+    CREATE TABLE test3 (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(type = cache, name = 'custom_cached3', path = 'kek3', max_size = 1, disk = 'hdd_blob');
+    """
+    )
+
+    assert (
+        "/var/lib/clickhouse/custom_caches/kek3"
+        == node.query(
+            "SELECT cache_path FROM system.disks WHERE name = 'custom_cached3'"
+        ).strip()
+    )
+
+    assert "Filesystem cache path must lie inside" in node.query_and_get_error(
+        f"""
+    CREATE TABLE test4 (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(type = cache, name = 'custom_cached4', path = '/kek4', max_size = 1, disk = 'hdd_blob');
+    """
+    )
+
+    node.query(
+        f"""
+    CREATE TABLE test4 (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(type = cache, name = 'custom_cached4', path = '/var/lib/clickhouse/custom_caches/kek4', max_size = 1, disk = 'hdd_blob');
+    """
+    )
+
+    assert (
+        "/var/lib/clickhouse/custom_caches/kek4"
+        == node.query(
+            "SELECT cache_path FROM system.disks WHERE name = 'custom_cached4'"
+        ).strip()
+    )
+
+
+def test_force_filesystem_cache_on_merges(cluster):
+    def test(node, forced_read_through_cache_on_merge):
+        def to_int(value):
+            if value == "":
+                return 0
+            else:
+                return int(value)
+
+        r_cache_count = to_int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'CachedReadBufferCacheWriteBytes'"
+            )
+        )
+
+        w_cache_count = to_int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'CachedWriteBufferCacheWriteBytes'"
+            )
+        )
+
+        node.query(
+            """
+            DROP TABLE IF EXISTS test SYNC;
+
+            CREATE TABLE test (key UInt32, value String)
+            Engine=MergeTree()
+            ORDER BY value
+            SETTINGS disk = disk(
+                type = cache,
+                path = 'force_cache_on_merges',
+                disk = 'hdd_blob',
+                max_file_segment_size = '1Ki',
+                cache_on_write_operations = 1,
+                boundary_alignment = '1Ki',
+                max_size = '10Gi',
+                max_elements = 10000000,
+                load_metadata_threads = 30);
+
+            SYSTEM DROP FILESYSTEM CACHE;
+            INSERT INTO test SELECT * FROM generateRandom('a Int32, b String') LIMIT 1000000;
+            INSERT INTO test SELECT * FROM generateRandom('a Int32, b String') LIMIT 1000000;
+            """
+        )
+        assert int(node.query("SELECT count() FROM system.filesystem_cache")) > 0
+        assert int(node.query("SELECT max(size) FROM system.filesystem_cache")) == 1024
+
+        w_cache_count_2 = int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'CachedWriteBufferCacheWriteBytes'"
+            )
+        )
+        assert w_cache_count_2 > w_cache_count
+
+        r_cache_count_2 = to_int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'CachedReadBufferCacheWriteBytes'"
+            )
+        )
+        assert r_cache_count_2 == r_cache_count
+
+        node.query("SYSTEM DROP FILESYSTEM CACHE")
+        node.query("OPTIMIZE TABLE test FINAL")
+
+        r_cache_count_3 = to_int(
+            node.query(
+                "SELECT value FROM system.events WHERE name = 'CachedReadBufferCacheWriteBytes'"
+            )
+        )
+
+        if forced_read_through_cache_on_merge:
+            assert r_cache_count_3 > r_cache_count
+        else:
+            assert r_cache_count_3 == r_cache_count
+
+    node = cluster.instances["node_force_read_through_cache_on_merge"]
+    test(node, True)
+    node = cluster.instances["node"]
+    test(node, False)
+
+
+def test_system_sync_filesystem_cache(cluster):
+    node = cluster.instances["node"]
+    node.query(
+        """
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (a Int32, b String)
+ENGINE = MergeTree() ORDER BY tuple()
+SETTINGS disk = disk(type = cache,
+            max_size = '100Ki',
+            path = "test_system_sync_filesystem_cache",
+            delayed_cleanup_interval_ms = 10000000, disk = hdd_blob),
+        min_bytes_for_wide_part = 10485760;
+
+INSERT INTO test SELECT 1, 'test';
+    """
+    )
+
+    query_id = "system_sync_filesystem_cache_1"
+    node.query(
+        "SELECT * FROM test FORMAT Null SETTINGS enable_filesystem_cache_log = 1",
+        query_id=query_id,
+    )
+
+    key, offset = (
+        node.query(
+            f"""
+    SYSTEM FLUSH LOGS;
+    SELECT key, offset FROM system.filesystem_cache_log WHERE query_id = '{query_id}' ORDER BY size DESC LIMIT 1;
+    """
+        )
+        .strip()
+        .split("\t")
+    )
+
+    cache_path = node.query(
+        f"SELECT cache_path FROM system.filesystem_cache WHERE key = '{key}' and file_segment_range_begin = {offset}"
+    )
+
+    node.exec_in_container(["bash", "-c", f"rm {cache_path}"])
+
+    assert key in node.query("SYSTEM SYNC FILESYSTEM CACHE")
+
+    node.query("SELECT * FROM test FORMAT Null")
+    assert key not in node.query("SYSTEM SYNC FILESYSTEM CACHE")
+
+    query_id = "system_sync_filesystem_cache_2"
+    node.query(
+        "SELECT * FROM test FORMAT Null SETTINGS enable_filesystem_cache_log = 1",
+        query_id=query_id,
+    )
+
+    key, offset = (
+        node.query(
+            f"""
+    SYSTEM FLUSH LOGS;
+    SELECT key, offset FROM system.filesystem_cache_log WHERE query_id = '{query_id}' ORDER BY size DESC LIMIT 1;
+    """
+        )
+        .strip()
+        .split("\t")
+    )
+    cache_path = node.query(
+        f"SELECT cache_path FROM system.filesystem_cache WHERE key = '{key}' and file_segment_range_begin = {offset}"
+    )
+
+    node.exec_in_container(["bash", "-c", f"echo -n 'fff' > {cache_path}"])
+
+    assert key in node.query("SYSTEM SYNC FILESYSTEM CACHE")
+
+    node.query("SELECT * FROM test FORMAT Null")
+
+    assert key not in node.query("SYSTEM SYNC FILESYSTEM CACHE")
diff --git a/tests/integration/test_filesystem_cache/users.d/cache_on_write_operations.xml b/tests/integration/test_filesystem_cache/users.d/cache_on_write_operations.xml
new file mode 100644
index 00000000000..5de169edc1e
--- /dev/null
+++ b/tests/integration/test_filesystem_cache/users.d/cache_on_write_operations.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <profiles>
+        <default>
+            <enable_filesystem_cache_on_write_operations>1</enable_filesystem_cache_on_write_operations>
+        </default>
+    </profiles>
+</clickhouse>
diff --git a/tests/integration/test_format_avro_confluent/test.py b/tests/integration/test_format_avro_confluent/test.py
index 540f90ae05e..ccaaee83514 100644
--- a/tests/integration/test_format_avro_confluent/test.py
+++ b/tests/integration/test_format_avro_confluent/test.py
@@ -8,9 +8,13 @@ from confluent_kafka.avro.cached_schema_registry_client import (
     CachedSchemaRegistryClient,
 )
 from confluent_kafka.avro.serializer.message_serializer import MessageSerializer
-from helpers.cluster import ClickHouseCluster, ClickHouseInstance
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance, is_arm
 from urllib import parse
 
+# Skip on ARM due to Confluent/Kafka
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
diff --git a/tests/integration/test_global_overcommit_tracker/configs/global_overcommit_tracker.xml b/tests/integration/test_global_overcommit_tracker/configs/global_overcommit_tracker.xml
index a51009542a3..db0926a19ad 100644
--- a/tests/integration/test_global_overcommit_tracker/configs/global_overcommit_tracker.xml
+++ b/tests/integration/test_global_overcommit_tracker/configs/global_overcommit_tracker.xml
@@ -1,4 +1,4 @@
 <clickhouse>
-    <max_server_memory_usage>2000000000</max_server_memory_usage>
+    <max_server_memory_usage>1500000000</max_server_memory_usage>
     <allow_use_jemalloc_memory>false</allow_use_jemalloc_memory>
-</clickhouse>
\ No newline at end of file
+</clickhouse>
diff --git a/tests/integration/test_global_overcommit_tracker/test.py b/tests/integration/test_global_overcommit_tracker/test.py
index 4c60ee8783c..bab95f4706c 100644
--- a/tests/integration/test_global_overcommit_tracker/test.py
+++ b/tests/integration/test_global_overcommit_tracker/test.py
@@ -22,7 +22,7 @@ def start_cluster():
         cluster.shutdown()
 
 
-GLOBAL_TEST_QUERY_A = "SELECT groupArray(number) FROM numbers(2500000) SETTINGS memory_overcommit_ratio_denominator_for_user=1"
+GLOBAL_TEST_QUERY_A = "SELECT groupArray(number) FROM numbers(5000000) SETTINGS memory_overcommit_ratio_denominator_for_user=1"
 GLOBAL_TEST_QUERY_B = "SELECT groupArray(number) FROM numbers(2500000) SETTINGS memory_overcommit_ratio_denominator_for_user=80000000"
 
 
@@ -42,11 +42,9 @@ def test_global_overcommit():
 
     responses_A = list()
     responses_B = list()
-    for i in range(100):
-        if i % 2 == 0:
-            responses_A.append(node.get_query_request(GLOBAL_TEST_QUERY_A, user="A"))
-        else:
-            responses_B.append(node.get_query_request(GLOBAL_TEST_QUERY_B, user="B"))
+    for i in range(50):
+        responses_A.append(node.get_query_request(GLOBAL_TEST_QUERY_A, user="A"))
+        responses_B.append(node.get_query_request(GLOBAL_TEST_QUERY_B, user="B"))
 
     overcommited_killed = False
     for response in responses_A:
diff --git a/tests/integration/test_grant_and_revoke/test.py b/tests/integration/test_grant_and_revoke/test.py
index a86a1208f49..46d8d254a0a 100644
--- a/tests/integration/test_grant_and_revoke/test.py
+++ b/tests/integration/test_grant_and_revoke/test.py
@@ -77,53 +77,53 @@ def test_revoke_requires_grant_option():
     instance.query("CREATE USER B")
 
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
 
     expected_error = "Not enough privileges"
     assert expected_error in instance.query_and_get_error(
         "REVOKE SELECT ON test.table FROM B", user="A"
     )
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
 
     instance.query("GRANT SELECT ON test.table TO A")
     expected_error = "privileges have been granted, but without grant option"
     assert expected_error in instance.query_and_get_error(
         "REVOKE SELECT ON test.table FROM B", user="A"
     )
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
 
     instance.query("GRANT SELECT ON test.table TO A WITH GRANT OPTION")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     instance.query("REVOKE SELECT ON test.table FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
 
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     instance.query("REVOKE SELECT ON test.* FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
 
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     instance.query("REVOKE ALL ON test.* FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
 
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     instance.query("REVOKE ALL ON *.* FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
 
     instance.query("REVOKE GRANT OPTION FOR ALL ON *.* FROM A")
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     expected_error = "privileges have been granted, but without grant option"
     assert expected_error in instance.query_and_get_error(
         "REVOKE SELECT ON test.table FROM B", user="A"
     )
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
 
     instance.query("GRANT SELECT ON test.* TO A WITH GRANT OPTION")
     instance.query("GRANT SELECT ON test.table TO B")
-    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.table TO B\n"
+    assert instance.query("SHOW GRANTS FOR B") == "GRANT SELECT ON test.`table` TO B\n"
     instance.query("REVOKE SELECT ON test.table FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
 
@@ -186,10 +186,7 @@ def test_grant_all_on_table():
     instance.query("GRANT ALL ON test.table TO B", user="A")
     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, 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 PULLING REPLICATION LOG, SYSTEM CLEANUP, SYSTEM VIEWS, 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"
+        == "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, 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 PULLING REPLICATION LOG, SYSTEM CLEANUP, SYSTEM VIEWS, SYSTEM SENDS, SYSTEM REPLICATION QUEUES, SYSTEM VIRTUAL PARTS UPDATE, 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"
     )
     instance.query("REVOKE ALL ON test.table FROM B", user="A")
     assert instance.query("SHOW GRANTS FOR B") == ""
@@ -219,7 +216,9 @@ def test_implicit_show_grants():
     )
 
     instance.query("GRANT SELECT(x) ON test.table TO A")
-    assert instance.query("SHOW GRANTS FOR A") == "GRANT SELECT(x) ON test.table TO A\n"
+    assert (
+        instance.query("SHOW GRANTS FOR A") == "GRANT SELECT(x) ON test.`table` TO A\n"
+    )
     assert (
         instance.query(
             "select count() FROM system.databases WHERE name='test'", user="A"
@@ -242,7 +241,7 @@ def test_implicit_show_grants():
     )
 
     instance.query("GRANT SELECT ON test.table TO A")
-    assert instance.query("SHOW GRANTS FOR A") == "GRANT SELECT ON test.table TO A\n"
+    assert instance.query("SHOW GRANTS FOR A") == "GRANT SELECT ON test.`table` TO A\n"
     assert (
         instance.query(
             "select count() FROM system.databases WHERE name='test'", user="A"
@@ -395,12 +394,12 @@ def test_introspection():
         [
             "CREATE USER A",
             "CREATE USER B",
-            "CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE default",
+            "CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE `default`",
         ]
     )
 
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
     assert instance.query("SHOW GRANTS FOR B") == TSV(
         ["GRANT CREATE ON *.* TO B WITH GRANT OPTION"]
@@ -410,40 +409,40 @@ def test_introspection():
     )
     assert instance.query("SHOW GRANTS FOR A,B") == TSV(
         [
-            "GRANT SELECT ON test.table TO A",
+            "GRANT SELECT ON test.`table` TO A",
             "GRANT CREATE ON *.* TO B WITH GRANT OPTION",
         ]
     )
     assert instance.query("SHOW GRANTS FOR B,A") == TSV(
         [
-            "GRANT SELECT ON test.table TO A",
+            "GRANT SELECT ON test.`table` TO A",
             "GRANT CREATE ON *.* TO B WITH GRANT OPTION",
         ]
     )
     assert instance.query("SHOW GRANTS FOR ALL") == TSV(
         [
-            "GRANT SELECT ON test.table TO A",
+            "GRANT SELECT ON test.`table` TO A",
             "GRANT CREATE ON *.* TO B WITH GRANT OPTION",
             "GRANT ALL ON *.* TO default WITH GRANT OPTION",
         ]
     )
 
     assert instance.query("SHOW GRANTS", user="A") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
     assert instance.query("SHOW GRANTS", user="B") == TSV(
         ["GRANT CREATE ON *.* TO B WITH GRANT OPTION"]
     )
 
     assert instance.query("SHOW GRANTS FOR ALL", user="A") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
     assert instance.query("SHOW GRANTS FOR ALL", user="B") == TSV(
         ["GRANT CREATE ON *.* TO B WITH GRANT OPTION"]
     )
     assert instance.query("SHOW GRANTS FOR ALL") == TSV(
         [
-            "GRANT SELECT ON test.table TO A",
+            "GRANT SELECT ON test.`table` TO A",
             "GRANT CREATE ON *.* TO B WITH GRANT OPTION",
             "GRANT ALL ON *.* TO default WITH GRANT OPTION",
         ]
@@ -455,10 +454,10 @@ def test_introspection():
     expected_access1 = (
         "CREATE USER A\n"
         "CREATE USER B\n"
-        "CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE default"
+        "CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE `default`"
     )
     expected_access2 = (
-        "GRANT SELECT ON test.table TO A\n"
+        "GRANT SELECT ON test.`table` TO A\n"
         "GRANT CREATE ON *.* TO B WITH GRANT OPTION\n"
         "GRANT ALL ON *.* TO default WITH GRANT OPTION\n"
     )
@@ -513,10 +512,10 @@ def test_current_database():
     instance.query("GRANT SELECT ON table TO A", database="test")
 
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
     assert instance.query("SHOW GRANTS FOR A", database="test") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
 
     assert instance.query("SELECT * FROM test.table", user="A") == "1\t5\n2\t10\n"
@@ -537,12 +536,12 @@ def test_grant_with_replace_option():
     instance.query("CREATE USER A")
     instance.query("GRANT SELECT ON test.table TO A")
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT SELECT ON test.table TO A"]
+        ["GRANT SELECT ON test.`table` TO A"]
     )
 
     instance.query("GRANT INSERT ON test.table TO A WITH REPLACE OPTION")
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT INSERT ON test.table TO A"]
+        ["GRANT INSERT ON test.`table` TO A"]
     )
 
     instance.query("GRANT NONE ON *.* TO A WITH REPLACE OPTION")
@@ -552,41 +551,41 @@ def test_grant_with_replace_option():
     instance.query("GRANT SELECT ON test.table TO B")
     assert instance.query("SHOW GRANTS FOR A") == TSV([])
     assert instance.query("SHOW GRANTS FOR B") == TSV(
-        ["GRANT SELECT ON test.table TO B"]
+        ["GRANT SELECT ON test.`table` TO B"]
     )
 
     expected_error = (
-        "it's necessary to have the grant INSERT ON test.table WITH GRANT OPTION"
+        "it's necessary to have the grant INSERT ON test.`table` WITH GRANT OPTION"
     )
     assert expected_error in instance.query_and_get_error(
-        "GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user="A"
+        "GRANT INSERT ON test.`table` TO B WITH REPLACE OPTION", user="A"
     )
     assert instance.query("SHOW GRANTS FOR A") == TSV([])
     assert instance.query("SHOW GRANTS FOR B") == TSV(
-        ["GRANT SELECT ON test.table TO B"]
+        ["GRANT SELECT ON test.`table` TO B"]
     )
 
     instance.query("GRANT INSERT ON test.table TO A WITH GRANT OPTION")
     expected_error = (
-        "it's necessary to have the grant SELECT ON test.table WITH GRANT OPTION"
+        "it's necessary to have the grant SELECT ON test.`table` WITH GRANT OPTION"
     )
     assert expected_error in instance.query_and_get_error(
-        "GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user="A"
+        "GRANT INSERT ON test.`table` TO B WITH REPLACE OPTION", user="A"
     )
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT INSERT ON test.table TO A WITH GRANT OPTION"]
+        ["GRANT INSERT ON test.`table` TO A WITH GRANT OPTION"]
     )
     assert instance.query("SHOW GRANTS FOR B") == TSV(
-        ["GRANT SELECT ON test.table TO B"]
+        ["GRANT SELECT ON test.`table` TO B"]
     )
 
-    instance.query("GRANT SELECT ON test.table TO A WITH GRANT OPTION")
-    instance.query("GRANT INSERT ON test.table TO B WITH REPLACE OPTION", user="A")
+    instance.query("GRANT SELECT ON test.`table` TO A WITH GRANT OPTION")
+    instance.query("GRANT INSERT ON test.`table` TO B WITH REPLACE OPTION", user="A")
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT SELECT, INSERT ON test.table TO A WITH GRANT OPTION"]
+        ["GRANT SELECT, INSERT ON test.`table` TO A WITH GRANT OPTION"]
     )
     assert instance.query("SHOW GRANTS FOR B") == TSV(
-        ["GRANT INSERT ON test.table TO B"]
+        ["GRANT INSERT ON test.`table` TO B"]
     )
 
 
@@ -632,7 +631,7 @@ def test_grant_current_grants_with_partial_revoke():
             "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, CREATE TABLE ON test.`table` TO A WITH GRANT OPTION",
             "GRANT SELECT ON test.table2 TO A",
         ]
     )
@@ -643,7 +642,7 @@ def test_grant_current_grants_with_partial_revoke():
         [
             "GRANT SELECT ON *.* TO B",
             "REVOKE SELECT ON test.* FROM B",
-            "GRANT SELECT, CREATE TABLE ON test.table TO B",
+            "GRANT SELECT, CREATE TABLE ON test.`table` TO B",
         ]
     )
 
@@ -654,7 +653,7 @@ def test_grant_current_grants_with_partial_revoke():
         [
             "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",
+            "GRANT SELECT, CREATE TABLE ON test.`table` TO B WITH GRANT OPTION",
         ]
     )
 
@@ -665,7 +664,7 @@ def test_grant_current_grants_with_partial_revoke():
     assert instance.query("SHOW GRANTS FOR C") == TSV(
         [
             "GRANT SELECT ON *.* TO C",
-            "GRANT CREATE TABLE ON test.table TO C",
+            "GRANT CREATE TABLE ON test.`table` TO C",
         ]
     )
 
@@ -674,7 +673,7 @@ def test_grant_current_grants_with_partial_revoke():
     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",
+            "GRANT SELECT, CREATE TABLE ON test.`table` TO B WITH GRANT OPTION",
         ]
     )
 
@@ -693,7 +692,7 @@ def test_current_grants_override():
     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"]
+        ["GRANT SELECT ON test.`table` TO B"]
     )
 
     instance.query("GRANT CURRENT GRANTS ON *.* TO B", user="A")
@@ -701,7 +700,7 @@ def test_current_grants_override():
         [
             "GRANT SELECT ON *.* TO B",
             "REVOKE SELECT ON test.* FROM B",
-            "GRANT SELECT ON test.table TO B",
+            "GRANT SELECT ON test.`table` TO B",
         ]
     )
 
@@ -709,7 +708,7 @@ def test_current_grants_override():
     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"]
+        ["GRANT SELECT ON test.`table` TO B"]
     )
 
     instance.query("GRANT CURRENT GRANTS ON *.* TO B WITH REPLACE OPTION", user="A")
diff --git a/tests/integration/test_groupBitmapAnd_on_distributed/test.py b/tests/integration/test_groupBitmapAnd_on_distributed/test.py
index 5d3dda8ecf2..118cd78105e 100644
--- a/tests/integration/test_groupBitmapAnd_on_distributed/test.py
+++ b/tests/integration/test_groupBitmapAnd_on_distributed/test.py
@@ -8,27 +8,13 @@ node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/clusters.xml"],
     with_zookeeper=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/clusters.xml"],
     with_zookeeper=True,
-    allow_analyzer=False,
-)
-node3 = cluster.add_instance(
-    "node3",
-    main_configs=["configs/clusters.xml"],
-    with_zookeeper=True,
-    allow_analyzer=False,
-)
-node4 = cluster.add_instance(
-    "node4",
-    main_configs=["configs/clusters.xml"],
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_zookeeper=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 
 
@@ -85,62 +71,3 @@ def test_groupBitmapAnd_on_distributed_table(start_cluster):
             "select groupBitmapAnd(z) FROM {};".format(distributed_table_name)
         ).strip()
         assert result == expected
-
-
-def test_groupBitmapAnd_function_versioning(start_cluster):
-    local_table_name = "bitmap_column_expr_versioning_test"
-    distributed_table_name = "bitmap_column_expr_versioning_test_dst"
-    cluster_name = "test_version_cluster"
-
-    for node in (node3, node4):
-        node.query(
-            """CREATE TABLE {}
-        (
-            z AggregateFunction(groupBitmap, UInt32)
-        )
-        ENGINE = MergeTree()
-        ORDER BY tuple()""".format(
-                local_table_name
-            )
-        )
-
-        node.query(
-            """CREATE TABLE {}
-        (
-            z AggregateFunction(groupBitmap, UInt32)
-        )
-        ENGINE = Distributed('{}', 'default', '{}')""".format(
-                distributed_table_name, cluster_name, local_table_name
-            )
-        )
-
-        node.query(
-            """INSERT INTO {} VALUES
-                (bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));""".format(
-                local_table_name
-            )
-        )
-
-    expected = "10"
-    new_version_distributed_result = node3.query(
-        "select groupBitmapAnd(z) FROM {};".format(distributed_table_name)
-    ).strip()
-    old_version_distributed_result = node4.query(
-        "select groupBitmapAnd(z) FROM {};".format(distributed_table_name)
-    ).strip()
-    assert new_version_distributed_result == expected
-    assert old_version_distributed_result == expected
-
-    result_from_old_to_new_version = node3.query(
-        "select groupBitmapAnd(z) FROM remote('node4', default.{})".format(
-            local_table_name
-        )
-    ).strip()
-    assert result_from_old_to_new_version == expected
-
-    result_from_new_to_old_version = node4.query(
-        "select groupBitmapAnd(z) FROM remote('node3', default.{})".format(
-            local_table_name
-        )
-    ).strip()
-    assert result_from_new_to_old_version == expected
diff --git a/tests/integration/test_groupBitmapAnd_on_distributed/test_groupBitmapAndState_on_distributed_table.py b/tests/integration/test_groupBitmapAnd_on_distributed/test_groupBitmapAndState_on_distributed_table.py
index 115e6009801..20ba02e7a80 100644
--- a/tests/integration/test_groupBitmapAnd_on_distributed/test_groupBitmapAndState_on_distributed_table.py
+++ b/tests/integration/test_groupBitmapAnd_on_distributed/test_groupBitmapAndState_on_distributed_table.py
@@ -8,28 +8,13 @@ node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/clusters.xml"],
     with_zookeeper=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 node2 = cluster.add_instance(
     "node2",
     main_configs=["configs/clusters.xml"],
     with_zookeeper=True,
-    allow_analyzer=False,
-)
-node3 = cluster.add_instance(
-    "node3",
-    main_configs=["configs/clusters.xml"],
-    with_zookeeper=True,
-    allow_analyzer=False,
-)
-node4 = cluster.add_instance(
-    "node4",
-    main_configs=["configs/clusters.xml"],
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_installed_binary=True,
-    with_zookeeper=True,
-    allow_analyzer=False,
+    use_old_analyzer=True,
 )
 
 
@@ -91,60 +76,3 @@ def test_groupBitmapAndState_on_distributed_table(start_cluster):
             )
         ).strip()
         assert result == expected
-
-
-def test_groupBitmapAndState_on_different_version_nodes(start_cluster):
-    local_table_name = "test_group_bitmap_state_versioned"
-    distributed_table_name = "test_group_bitmap_state_versioned_dst"
-    cluster_name = "test_version_cluster"
-
-    for node in (node3, node4):
-        node.query(
-            """CREATE TABLE {}
-        (
-            z AggregateFunction(groupBitmap, UInt32)
-        )
-        ENGINE = MergeTree()
-        ORDER BY tuple()""".format(
-                local_table_name
-            )
-        )
-
-        node.query(
-            """CREATE TABLE {}
-        (
-            z AggregateFunction(groupBitmap, UInt32)
-        )
-        ENGINE = Distributed('{}', 'default', '{}')""".format(
-                distributed_table_name, cluster_name, local_table_name
-            )
-        )
-
-    node3.query(
-        """INSERT INTO {} VALUES
-                (bitmapBuild(cast([1,2,3,4,5,6,7,8,9,10] as Array(UInt32))));""".format(
-            local_table_name
-        )
-    )
-
-    node4.query(
-        """INSERT INTO {} VALUES
-                (bitmapBuild(cast([0] as Array(UInt32))));""".format(
-            local_table_name
-        )
-    )
-
-    # We will get wrong result when query distribute table if the cluster contains old version server
-    result = node3.query(
-        "select bitmapCardinality(groupBitmapAndState(z)) FROM {};".format(
-            distributed_table_name
-        )
-    ).strip()
-    assert result == "10"
-
-    result = node4.query(
-        "select bitmapCardinality(groupBitmapAndState(z)) FROM {};".format(
-            distributed_table_name
-        )
-    ).strip()
-    assert result == "1"
diff --git a/tests/integration/test_grpc_protocol/test.py b/tests/integration/test_grpc_protocol/test.py
index 0332e5bb90f..fc115e5a21f 100644
--- a/tests/integration/test_grpc_protocol/test.py
+++ b/tests/integration/test_grpc_protocol/test.py
@@ -5,7 +5,7 @@ import time
 import pytz
 import uuid
 import grpc
-from helpers.cluster import ClickHouseCluster, run_and_check
+from helpers.cluster import ClickHouseCluster, is_arm, run_and_check
 from threading import Thread
 import gzip
 import lz4.frame
@@ -20,6 +20,10 @@ import clickhouse_grpc_pb2, clickhouse_grpc_pb2_grpc  # Execute pb2/generate.py
 GRPC_PORT = 9100
 DEFAULT_ENCODING = "utf-8"
 
+# GRPC is disabled on ARM build - skip tests
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 # Utilities
 
@@ -392,6 +396,9 @@ def test_progress():
         ),
     ]
 
+    # Stats data can be returned, which broke the test
+    results = [i for i in results if not isinstance(i, clickhouse_grpc_pb2.Stats)]
+
     assert results == expected_results
 
 
diff --git a/tests/integration/test_http_failover/test.py b/tests/integration/test_http_failover/test.py
index 41b55ef635c..5920fd980ce 100644
--- a/tests/integration/test_http_failover/test.py
+++ b/tests/integration/test_http_failover/test.py
@@ -56,9 +56,10 @@ def dst_node_addrs(started_cluster, request):
 
     yield
 
-    # Clear static DNS entries
+    # Clear static DNS entries and all keep alive connections
     src_node.set_hosts([])
     src_node.query("SYSTEM DROP DNS CACHE")
+    src_node.query("SYSTEM DROP CONNECTIONS CACHE")
 
 
 @pytest.mark.parametrize(
@@ -77,7 +78,8 @@ def dst_node_addrs(started_cluster, request):
 def test_url_destination_host_with_multiple_addrs(dst_node_addrs, expectation):
     with expectation:
         result = src_node.query(
-            "SELECT * FROM url('http://dst_node:8123/?query=SELECT+42', TSV, 'column1 UInt32')"
+            "SELECT * FROM url('http://dst_node:8123/?query=SELECT+42', TSV, 'column1 UInt32')",
+            settings={"http_max_tries": "3"},
         )
         assert result == "42\n"
 
diff --git a/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py b/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
index c95bbfda708..a89cb619350 100644
--- a/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
+++ b/tests/integration/test_input_format_parallel_parsing_memory_tracking/test.py
@@ -41,7 +41,7 @@ def test_memory_tracking_total():
         [
             "bash",
             "-c",
-            "clickhouse local -q \"SELECT arrayStringConcat(arrayMap(x->toString(cityHash64(x)), range(1000)), ' ') from numbers(10000)\" > data.json",
+            "clickhouse local -q \"SELECT arrayStringConcat(arrayMap(x->toString(cityHash64(x)), range(1000)), ' ') from numbers(10000)\" > data.jsonl",
         ]
     )
 
@@ -56,7 +56,7 @@ def test_memory_tracking_total():
                     "--show-error",
                     "--data-binary",
                     "@data.json",
-                    "http://127.1:8123/?query=INSERT%20INTO%20null%20FORMAT%20TSV",
+                    "http://127.1:8123/?query=INSERT%20INTO%20null%20FORMAT%20JSONEachRow",
                 ]
             )
             == ""
diff --git a/tests/integration/test_insert_over_http_query_log/__init__.py b/tests/integration/test_insert_over_http_query_log/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_insert_over_http_query_log/test.py b/tests/integration/test_insert_over_http_query_log/test.py
new file mode 100644
index 00000000000..6e862e5ddde
--- /dev/null
+++ b/tests/integration/test_insert_over_http_query_log/test.py
@@ -0,0 +1,109 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+instance = cluster.add_instance("instance", with_zookeeper=True)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+@pytest.mark.parametrize("inject_failpoint", [1, 0])
+def test_insert_over_http_exception(start_cluster, inject_failpoint):
+    instance.query("DROP TABLE IF EXISTS tt SYNC")
+    instance.query(
+        "CREATE TABLE tt (KeyID UInt32) Engine = ReplicatedMergeTree('/test_insert_exception_over_http/tt', 'r1') ORDER BY (KeyID)"
+    )
+    if inject_failpoint > 0:
+        instance.query(
+            "SYSTEM ENABLE FAILPOINT execute_query_calling_empty_set_result_func_on_exception"
+        )
+
+    log_comment = f"{inject_failpoint}_02988_66a57d6f-d1cc-4693-8bf4-206848edab87"
+    assert True == instance.http_query_and_get_error(
+        f"insert into tt settings insert_keeper_max_retries=0, insert_keeper_fault_injection_probability=1.0, log_comment='{log_comment}' values (1), (2), (3), (4), (5)",
+        method="POST",
+    ).startswith("500 Internal Server Error")
+
+    assert "0\n" == instance.query("select count() from tt")
+
+    instance.query("SYSTEM FLUSH LOGS")
+
+    assert "1\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday() and type = 'QueryStart'"
+    )
+    assert "1\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday() and type = 'ExceptionWhileProcessing'"
+    )
+    assert "0\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday() and type != 'QueryStart' and type != 'ExceptionWhileProcessing'"
+    )
+
+    instance.query("DROP TABLE tt SYNC")
+
+
+def test_insert_over_http_invalid_statement(start_cluster):
+    http_status = 400
+    log_comment = f"{http_status}_02988_66a57d6f-d1cc-4693-8bf4-206848edab87"
+    assert True == instance.http_query_and_get_error(
+        f"insert into settings log_comment='{log_comment}' values (1), (2), (3), (4), (5)",
+        method="POST",
+    ).startswith(f"{http_status}")
+
+    instance.query("SYSTEM FLUSH LOGS")
+
+    assert f"0\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday()"
+    )
+
+
+def test_insert_over_http_unknown_table(start_cluster):
+    http_status = 404
+    log_comment = f"{http_status}_02988_66a57d6f-d1cc-4693-8bf4-206848edab87"
+    assert True == instance.http_query_and_get_error(
+        f"insert into unknown_table settings log_comment='{log_comment}' values (1), (2), (3), (4), (5)",
+        method="POST",
+    ).startswith(f"{http_status}")
+
+    instance.query("SYSTEM FLUSH LOGS")
+
+    assert f"1\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday() and type = 'ExceptionBeforeStart'"
+    )
+    assert f"0\n" == instance.query(
+        f"select count() from system.query_log where log_comment ='{log_comment}' and current_database = currentDatabase() and event_date >= yesterday() and type != 'ExceptionBeforeStart'"
+    )
+
+
+def test_insert_over_http_ok(start_cluster):
+    instance.query("DROP TABLE IF EXISTS tt SYNC")
+    instance.query(
+        "CREATE TABLE tt (KeyID UInt32) Engine = ReplicatedMergeTree('/test_insert_exception_over_http/tt', 'r1') ORDER BY (KeyID)"
+    )
+
+    _, error = instance.http_query_and_get_answer_with_error(
+        "insert into tt settings log_comment='02988_66a57d6f-d1cc-4693-8bf4-206848edab87' values (1), (2), (3), (4), (5)",
+        method="POST",
+    )
+    assert error == None
+
+    assert "5\n" == instance.query("select count() from tt")
+
+    instance.query("SYSTEM FLUSH LOGS")
+
+    assert "1\n" == instance.query(
+        "select count() from system.query_log where log_comment ='02988_66a57d6f-d1cc-4693-8bf4-206848edab87' and current_database = currentDatabase() and event_date >= yesterday() and type = 'QueryStart'"
+    )
+
+    assert "1\n" == instance.query(
+        "select count() from system.query_log where log_comment ='02988_66a57d6f-d1cc-4693-8bf4-206848edab87' and current_database = currentDatabase() and event_date >= yesterday() and type = 'QueryFinish'"
+    )
+
+    instance.query("DROP TABLE tt SYNC")
diff --git a/tests/integration/test_jdbc_bridge/test.py b/tests/integration/test_jdbc_bridge/test.py
index 0e41cc8c8b7..c4a0a525df3 100644
--- a/tests/integration/test_jdbc_bridge/test.py
+++ b/tests/integration/test_jdbc_bridge/test.py
@@ -3,7 +3,7 @@ import os.path as p
 import pytest
 import uuid
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.test_tools import TSV
 from string import Template
 
@@ -14,6 +14,9 @@ instance = cluster.add_instance(
 datasource = "self"
 records = 1000
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
diff --git a/tests/integration/test_join_set_family_s3/test.py b/tests/integration/test_join_set_family_s3/test.py
index 38b56b7b15b..f0e1480d867 100644
--- a/tests/integration/test_join_set_family_s3/test.py
+++ b/tests/integration/test_join_set_family_s3/test.py
@@ -93,10 +93,18 @@ def test_join_s3(cluster):
         "CREATE TABLE testLocalJoin(`id` UInt64, `val` String) ENGINE = Join(ANY, LEFT, id)"
     )
     node.query(
-        "CREATE TABLE testS3Join(`id` UInt64, `val` String) ENGINE = Join(ANY, LEFT, id) SETTINGS disk='s3'"
+        "CREATE TABLE testS3Join(`id` UInt64, `val` String) ENGINE = Join(ANY, LEFT, id) SETTINGS disk='s3', join_any_take_last_row = 1"
     )
 
     node.query("INSERT INTO testLocalJoin VALUES (1, 'a')")
+    for i in range(1, 10):
+        c = chr(ord("a") + i)
+        node.query(f"INSERT INTO testLocalJoin VALUES (1, '{c}')")
+
+    # because of `join_any_take_last_row = 1` we expect the last row with 'a' value
+    for i in range(1, 10):
+        c = chr(ord("a") + i)
+        node.query(f"INSERT INTO testS3Join VALUES (1, '{c}')")
     node.query("INSERT INTO testS3Join VALUES (1, 'a')")
 
     assert (
@@ -105,7 +113,7 @@ def test_join_s3(cluster):
         )
         == "\t\na\ta\n\t\n"
     )
-    assert_objects_count(cluster, 1)
+    assert_objects_count(cluster, 10)
 
     node.query("INSERT INTO testLocalJoin VALUES (2, 'b')")
     node.query("INSERT INTO testS3Join VALUES (2, 'b')")
@@ -116,7 +124,7 @@ def test_join_s3(cluster):
         )
         == "\t\na\ta\nb\tb\n"
     )
-    assert_objects_count(cluster, 2)
+    assert_objects_count(cluster, 11)
 
     node.restart_clickhouse()
     assert (
diff --git a/tests/integration/test_kafka_bad_messages/test.py b/tests/integration/test_kafka_bad_messages/test.py
index 954b6042305..0446ca5cb47 100644
--- a/tests/integration/test_kafka_bad_messages/test.py
+++ b/tests/integration/test_kafka_bad_messages/test.py
@@ -2,10 +2,14 @@ import time
 import logging
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from kafka import KafkaAdminClient, KafkaProducer, KafkaConsumer, BrokerConnection
 from kafka.admin import NewTopic
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "instance",
diff --git a/tests/integration/test_keeper_disks/test.py b/tests/integration/test_keeper_disks/test.py
index e41837b89b4..0c91aa03419 100644
--- a/tests/integration/test_keeper_disks/test.py
+++ b/tests/integration/test_keeper_disks/test.py
@@ -1,11 +1,15 @@
 #!/usr/bin/env python3
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 import helpers.keeper_utils as keeper_utils
 from minio.deleteobjects import DeleteObject
 
 import os
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+
 CURRENT_TEST_DIR = os.path.dirname(os.path.abspath(__file__))
 cluster = ClickHouseCluster(__file__)
 node_logs = cluster.add_instance(
diff --git a/tests/integration/test_keeper_four_word_command/test.py b/tests/integration/test_keeper_four_word_command/test.py
index 84dd2a2fd93..44b2b50673a 100644
--- a/tests/integration/test_keeper_four_word_command/test.py
+++ b/tests/integration/test_keeper_four_word_command/test.py
@@ -266,6 +266,7 @@ def test_cmd_conf(started_cluster):
         assert result["heart_beat_interval_ms"] == "500"
         assert result["election_timeout_lower_bound_ms"] == "1000"
         assert result["election_timeout_upper_bound_ms"] == "2000"
+        assert result["leadership_expiry_ms"] == "0"
         assert result["reserved_log_items"] == "100000"
 
         assert result["snapshot_distance"] == "75"
diff --git a/tests/integration/test_keeper_snapshots/test.py b/tests/integration/test_keeper_snapshots/test.py
index 2e126ed1152..f6f746c892e 100644
--- a/tests/integration/test_keeper_snapshots/test.py
+++ b/tests/integration/test_keeper_snapshots/test.py
@@ -7,8 +7,7 @@ import helpers.keeper_utils as keeper_utils
 import random
 import string
 import os
-import time
-from kazoo.client import KazooClient, KazooState
+from kazoo.client import KazooClient
 
 
 cluster = ClickHouseCluster(__file__)
@@ -161,3 +160,54 @@ def test_ephemeral_after_restart(started_cluster):
                 node_zk2.close()
         except:
             pass
+
+
+def test_invalid_snapshot(started_cluster):
+    keeper_utils.wait_until_connected(started_cluster, node)
+    node_zk = None
+    try:
+        node_zk = get_connection_zk("node")
+        node_zk.create("/test_invalid_snapshot", b"somevalue")
+        keeper_utils.send_4lw_cmd(started_cluster, node, "csnp")
+        node.stop_clickhouse()
+        snapshots = (
+            node.exec_in_container(["ls", "/var/lib/clickhouse/coordination/snapshots"])
+            .strip()
+            .split("\n")
+        )
+
+        def snapshot_sort_key(snapshot_name):
+            snapshot_prefix_size = len("snapshot_")
+            last_log_idx = snapshot_name.split(".")[0][snapshot_prefix_size:]
+            return int(last_log_idx)
+
+        snapshots.sort(key=snapshot_sort_key)
+        last_snapshot = snapshots[-1]
+        node.exec_in_container(
+            [
+                "truncate",
+                "-s",
+                "0",
+                f"/var/lib/clickhouse/coordination/snapshots/{last_snapshot}",
+            ]
+        )
+        node.start_clickhouse(expected_to_fail=True)
+        assert node.contains_in_log(
+            "Aborting because of failure to load from latest snapshot with index"
+        )
+
+        node.stop_clickhouse()
+        node.exec_in_container(
+            [
+                "rm",
+                f"/var/lib/clickhouse/coordination/snapshots/{last_snapshot}",
+            ]
+        )
+        node.start_clickhouse()
+    finally:
+        try:
+            if node_zk is not None:
+                node_zk.stop()
+                node_zk.close()
+        except:
+            pass
diff --git a/tests/integration/test_kerberos_auth/test.py b/tests/integration/test_kerberos_auth/test.py
index a41255cff3e..2d0dce33c14 100644
--- a/tests/integration/test_kerberos_auth/test.py
+++ b/tests/integration/test_kerberos_auth/test.py
@@ -1,5 +1,9 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
+
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 cluster = ClickHouseCluster(__file__)
 instance1 = cluster.add_instance(
diff --git a/tests/integration/test_limit_materialized_view_count/__init__.py b/tests/integration/test_limit_materialized_view_count/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_limit_materialized_view_count/configs/max_num_limit.xml b/tests/integration/test_limit_materialized_view_count/configs/max_num_limit.xml
new file mode 100644
index 00000000000..7fcf9005a08
--- /dev/null
+++ b/tests/integration/test_limit_materialized_view_count/configs/max_num_limit.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <max_materialized_views_count_for_table>1</max_materialized_views_count_for_table>
+</clickhouse>
diff --git a/tests/integration/test_limit_materialized_view_count/test.py b/tests/integration/test_limit_materialized_view_count/test.py
new file mode 100644
index 00000000000..c14c5b2055e
--- /dev/null
+++ b/tests/integration/test_limit_materialized_view_count/test.py
@@ -0,0 +1,49 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/max_num_limit.xml"],
+    stay_alive=True,
+)
+
+config = """<clickhouse>
+    <max_materialized_views_count_for_table>2</max_materialized_views_count_for_table>
+</clickhouse>
+"""
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        for _, node in cluster.instances.items():
+            node.query(
+                f"""
+                CREATE TABLE test_tb (a String) ENGINE = MergeTree ORDER BY a;
+                """
+            )
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_limit_materialized_view_count(started_cluster):
+    node.query(
+        "CREATE MATERIALIZED VIEW test_view1 ENGINE = MergeTree ORDER BY a AS SELECT * FROM test_tb;"
+    )
+    assert "Too many materialized views" in node.query_and_get_error(
+        "CREATE MATERIALIZED VIEW test_view2 ENGINE = MergeTree ORDER BY a AS SELECT * FROM test_tb;"
+    )
+
+    node.replace_config("/etc/clickhouse-server/config.d/max_num_limit.xml", config)
+    node.restart_clickhouse()
+
+    node.query(
+        "CREATE MATERIALIZED VIEW test_view2 ENGINE = MergeTree ORDER BY a AS SELECT * FROM test_tb;"
+    )
+    assert "Too many materialized views" in node.query_and_get_error(
+        "CREATE MATERIALIZED VIEW test_view3 ENGINE = MergeTree ORDER BY a AS SELECT * FROM test_tb;"
+    )
diff --git a/tests/integration/test_log_family_hdfs/test.py b/tests/integration/test_log_family_hdfs/test.py
index e8afe364ec4..6c3d28d2e3c 100644
--- a/tests/integration/test_log_family_hdfs/test.py
+++ b/tests/integration/test_log_family_hdfs/test.py
@@ -2,10 +2,13 @@ import logging
 import sys
 
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 
 from pyhdfs import HdfsClient
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 
 @pytest.fixture(scope="module")
 def started_cluster():
diff --git a/tests/integration/test_manipulate_statistic/test.py b/tests/integration/test_manipulate_statistic/test.py
index f1c00a61b07..7b96b392da8 100644
--- a/tests/integration/test_manipulate_statistic/test.py
+++ b/tests/integration/test_manipulate_statistic/test.py
@@ -6,7 +6,7 @@ from helpers.cluster import ClickHouseCluster
 cluster = ClickHouseCluster(__file__)
 
 node1 = cluster.add_instance(
-    "node1", user_configs=["config/config.xml"], with_zookeeper=True
+    "node1", user_configs=["config/config.xml"], with_zookeeper=False
 )
 
 
diff --git a/tests/integration/test_mask_sensitive_info/test.py b/tests/integration/test_mask_sensitive_info/test.py
index ec34c181371..251da7e4e09 100644
--- a/tests/integration/test_mask_sensitive_info/test.py
+++ b/tests/integration/test_mask_sensitive_info/test.py
@@ -175,7 +175,7 @@ def test_create_table():
     password = new_password()
 
     table_engines = [
-        f"MySQL('mysql57:3306', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')",
+        f"MySQL('mysql80:3306', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')",
         f"PostgreSQL('postgres1:5432', 'postgres_db', 'postgres_table', 'postgres_user', '{password}')",
         f"MongoDB('mongo1:27017', 'mongo_db', 'mongo_col', 'mongo_user', '{password}')",
         f"S3('http://minio1:9001/root/data/test1.csv')",
@@ -183,9 +183,9 @@ def test_create_table():
         f"S3('http://minio1:9001/root/data/test3.csv.gz', 'CSV', 'gzip')",
         f"S3('http://minio1:9001/root/data/test4.csv', 'minio', '{password}', 'CSV')",
         f"S3('http://minio1:9001/root/data/test5.csv.gz', 'minio', '{password}', 'CSV', 'gzip')",
-        f"MySQL(named_collection_1, host = 'mysql57', port = 3306, database = 'mysql_db', table = 'mysql_table', user = 'mysql_user', password = '{password}')",
-        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"MySQL(named_collection_1, host = 'mysql80', port = 3306, database = 'mysql_db', table = 'mysql_table', user = 'mysql_user', password = '{password}')",
+        f"MySQL(named_collection_2, database = 'mysql_db', host = 'mysql80', port = 3306, password = '{password}', table = 'mysql_table', user = 'mysql_user')",
+        f"MySQL(named_collection_3, database = 'mysql_db', host = 'mysql80', 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, 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')",
@@ -195,6 +195,10 @@ def test_create_table():
             f"DeltaLake('http://minio1:9001/root/data/test11.csv.gz', 'minio', '{password}')",
             "DNS_ERROR",
         ),
+        f"S3Queue('http://minio1:9001/root/data/', 'CSV')",
+        f"S3Queue('http://minio1:9001/root/data/', 'CSV', 'gzip')",
+        f"S3Queue('http://minio1:9001/root/data/', 'minio', '{password}', 'CSV')",
+        f"S3Queue('http://minio1:9001/root/data/', 'minio', '{password}', 'CSV', 'gzip')",
     ]
 
     def make_test_case(i):
@@ -219,7 +223,7 @@ def test_create_table():
         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\\', "
+            "ENGINE = MySQL(\\'mysql80:3306\\', \\'mysql_db\\', "
             f"\\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')\n"
         )
 
@@ -228,16 +232,16 @@ def test_create_table():
         ) == TSV(
             [
                 [
-                    "CREATE TABLE default.table0 (`x` Int32) ENGINE = MySQL(\\'mysql57:3306\\', \\'mysql_db\\', "
+                    "CREATE TABLE default.table0 (`x` Int32) ENGINE = MySQL(\\'mysql80:3306\\', \\'mysql_db\\', "
                     f"\\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
-                    f"MySQL(\\'mysql57:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
+                    f"MySQL(\\'mysql80:3306\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
                 ],
             ]
         )
 
     check_logs(
         must_contain=[
-            "CREATE TABLE table0 (`x` int) ENGINE = MySQL('mysql57:3306', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
+            "CREATE TABLE table0 (`x` int) ENGINE = MySQL('mysql80:3306', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
             "CREATE TABLE table1 (`x` int) ENGINE = PostgreSQL('postgres1:5432', 'postgres_db', 'postgres_table', 'postgres_user', '[HIDDEN]')",
             "CREATE TABLE table2 (`x` int) ENGINE = MongoDB('mongo1:27017', 'mongo_db', 'mongo_col', 'mongo_user', '[HIDDEN]')",
             "CREATE TABLE table3 (x int) ENGINE = S3('http://minio1:9001/root/data/test1.csv')",
@@ -245,15 +249,19 @@ def test_create_table():
             "CREATE TABLE table5 (x int) ENGINE = S3('http://minio1:9001/root/data/test3.csv.gz', 'CSV', 'gzip')",
             "CREATE TABLE table6 (`x` int) ENGINE = S3('http://minio1:9001/root/data/test4.csv', 'minio', '[HIDDEN]', 'CSV')",
             "CREATE TABLE table7 (`x` int) ENGINE = S3('http://minio1:9001/root/data/test5.csv.gz', 'minio', '[HIDDEN]', 'CSV', 'gzip')",
-            "CREATE TABLE table8 (`x` int) ENGINE = MySQL(named_collection_1, host = 'mysql57', port = 3306, database = 'mysql_db', table = 'mysql_table', user = 'mysql_user', password = '[HIDDEN]')",
-            "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 table8 (`x` int) ENGINE = MySQL(named_collection_1, host = 'mysql80', port = 3306, database = 'mysql_db', `table` = 'mysql_table', user = 'mysql_user', password = '[HIDDEN]')",
+            "CREATE TABLE table9 (`x` int) ENGINE = MySQL(named_collection_2, database = 'mysql_db', host = 'mysql80', port = 3306, password = '[HIDDEN]', `table` = 'mysql_table', user = 'mysql_user')",
+            "CREATE TABLE table10 (x int) ENGINE = MySQL(named_collection_3, database = 'mysql_db', host = 'mysql80', 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, 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')",
             "CREATE TABLE table14 (x int) ENGINE = S3('http://minio1:9001/root/data/test9.csv.gz', 'NOSIGN', 'CSV', 'gzip')",
             "CREATE TABLE table15 (`x` int) ENGINE = S3('http://minio1:9001/root/data/test10.csv.gz', 'minio', '[HIDDEN]')",
             "CREATE TABLE table16 (`x` int) ENGINE = DeltaLake('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
+            "CREATE TABLE table17 (x int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'CSV')",
+            "CREATE TABLE table18 (x int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'CSV', 'gzip')",
+            "CREATE TABLE table19 (`x` int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'minio', '[HIDDEN]', 'CSV')",
+            "CREATE TABLE table20 (`x` int) ENGINE = S3Queue('http://minio1:9001/root/data/', 'minio', '[HIDDEN]', 'CSV', 'gzip')",
         ],
         must_not_contain=[password],
     )
@@ -320,7 +328,7 @@ def test_table_functions():
     password = new_password()
 
     table_functions = [
-        f"mysql('mysql57:3306', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')",
+        f"mysql('mysql80:3306', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')",
         f"postgresql('postgres1:5432', 'postgres_db', 'postgres_table', 'postgres_user', '{password}')",
         f"mongodb('mongo1:27017', 'mongo_db', 'mongo_col', 'mongo_user', '{password}', 'x int')",
         f"s3('http://minio1:9001/root/data/test1.csv')",
@@ -345,7 +353,7 @@ def test_table_functions():
         f"remote('127.{{2..11}}', numbers(10), 'remote_user', '{password}', rand())",
         f"remoteSecure('127.{{2..11}}', 'default', 'remote_table', 'remote_user', '{password}')",
         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"mysql(named_collection_1, host = 'mysql80', 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_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())",
@@ -377,7 +385,7 @@ def test_table_functions():
         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\\', "
+            "mysql(\\'mysql80:3306\\', \\'mysql_db\\', \\'mysql_table\\', "
             f"\\'mysql_user\\', \\'{secret}\\')\n"
         )
 
@@ -387,7 +395,7 @@ def test_table_functions():
         ) == TSV(
             [
                 [
-                    "CREATE TABLE default.tablefunc0 (`x` Int32) AS mysql(\\'mysql57:3306\\', "
+                    "CREATE TABLE default.tablefunc0 (`x` Int32) AS mysql(\\'mysql80:3306\\', "
                     f"\\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'{secret}\\')",
                     "",
                 ],
@@ -396,7 +404,7 @@ def test_table_functions():
 
     check_logs(
         must_contain=[
-            "CREATE TABLE tablefunc0 (`x` int) AS mysql('mysql57:3306', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
+            "CREATE TABLE tablefunc0 (`x` int) AS mysql('mysql80:3306', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
             "CREATE TABLE tablefunc1 (`x` int) AS postgresql('postgres1:5432', 'postgres_db', 'postgres_table', 'postgres_user', '[HIDDEN]')",
             "CREATE TABLE tablefunc2 (`x` int) AS mongodb('mongo1:27017', 'mongo_db', 'mongo_col', 'mongo_user', '[HIDDEN]', 'x int')",
             "CREATE TABLE tablefunc3 (x int) AS s3('http://minio1:9001/root/data/test1.csv')",
@@ -421,11 +429,11 @@ def test_table_functions():
             "CREATE TABLE tablefunc22 (`x` int) AS remote('127.{2..11}', numbers(10), 'remote_user', '[HIDDEN]', rand())",
             "CREATE TABLE tablefunc23 (`x` int) AS remoteSecure('127.{2..11}', 'default', 'remote_table', 'remote_user', '[HIDDEN]')",
             "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 tablefunc25 (`x` int) AS mysql(named_collection_1, host = 'mysql80', 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_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]')",
+            "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]')",
             "CREATE TABLE tablefunc30 (x int) AS s3('http://minio1:9001/root/data/test9.csv.gz', 'NOSIGN', 'CSV')",
             "CREATE TABLE tablefunc31 (`x` int) AS s3('http://minio1:9001/root/data/test10.csv.gz', 'minio', '[HIDDEN]')",
             "CREATE TABLE tablefunc32 (`x` int) AS deltaLake('http://minio1:9001/root/data/test11.csv.gz', 'minio', '[HIDDEN]')",
@@ -567,31 +575,31 @@ def test_on_cluster():
     password = new_password()
 
     node.query(
-        f"CREATE TABLE table_oncl ON CLUSTER 'test_shard_localhost' (x int) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')"
+        f"CREATE TABLE table_oncl ON CLUSTER 'test_shard_localhost' (x int) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '{password}')"
     )
 
     check_logs(
         must_contain=[
-            "CREATE TABLE table_oncl ON CLUSTER test_shard_localhost (`x` int) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
+            "CREATE TABLE table_oncl ON CLUSTER test_shard_localhost (`x` int) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '[HIDDEN]')",
         ],
         must_not_contain=[password],
     )
 
     # Check logs of DDLWorker during executing of this query.
     assert node.contains_in_log(
-        "DDLWorker: Processing task .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
+        "DDLWorker: Processing task .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
     )
     assert node.contains_in_log(
-        "DDLWorker: Executing query: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
+        "DDLWorker: Executing query: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
     )
     assert node.contains_in_log(
-        "executeQuery: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
+        "executeQuery: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
     )
     assert node.contains_in_log(
-        "DDLWorker: Executed query: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql57:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
+        "DDLWorker: Executed query: .*CREATE TABLE default\\.table_oncl UUID '[0-9a-fA-F-]*' (\\`x\\` Int32) ENGINE = MySQL('mysql80:3307', 'mysql_db', 'mysql_table', 'mysql_user', '\\[HIDDEN\\]')"
     )
     assert system_query_log_contains_search_pattern(
-        "%CREATE TABLE default.table_oncl UUID \\'%\\' (`x` Int32) ENGINE = MySQL(\\'mysql57:3307\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')"
+        "%CREATE TABLE default.table_oncl UUID \\'%\\' (`x` Int32) ENGINE = MySQL(\\'mysql80:3307\\', \\'mysql_db\\', \\'mysql_table\\', \\'mysql_user\\', \\'[HIDDEN]\\')"
     )
 
     node.query("DROP TABLE table_oncl")
diff --git a/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py b/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py
index 97c8b65f15d..57f2ccd720d 100644
--- a/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py
+++ b/tests/integration/test_materialized_mysql_database/materialized_with_ddl.py
@@ -3379,7 +3379,7 @@ def gtid_after_attach_test(clickhouse_node, mysql_node, replication):
         f"CREATE TABLE {db}.t(id INT PRIMARY KEY AUTO_INCREMENT, score int, create_time DATETIME DEFAULT NOW())"
     )
 
-    db_count = 6
+    db_count = 4
     for i in range(db_count):
         replication.create_db_ch(
             f"{db}{i}",
@@ -3392,7 +3392,11 @@ def gtid_after_attach_test(clickhouse_node, mysql_node, replication):
         "t\n",
     )
     for i in range(int(db_count / 2)):
-        clickhouse_node.query(f"DETACH DATABASE {db}{i}")
+        check_query(
+            clickhouse_node,
+            f"DETACH DATABASE {db}{i}",
+            "",
+        )
 
     mysql_node.query(f"USE {db}")
     rows = 10000
diff --git a/tests/integration/test_materialized_mysql_database/test.py b/tests/integration/test_materialized_mysql_database/test.py
index 727188a4b86..57e496fe737 100644
--- a/tests/integration/test_materialized_mysql_database/test.py
+++ b/tests/integration/test_materialized_mysql_database/test.py
@@ -6,6 +6,7 @@ from helpers.cluster import (
     ClickHouseCluster,
     ClickHouseInstance,
     get_docker_compose_path,
+    is_arm,
 )
 import logging
 
@@ -13,6 +14,10 @@ from . import materialized_with_ddl
 
 DOCKER_COMPOSE_PATH = get_docker_compose_path()
 
+# skip all test on arm due to no arm support in mysql57
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 cluster = ClickHouseCluster(__file__)
 mysql_node = None
 mysql8_node = None
@@ -21,7 +26,7 @@ node_db = cluster.add_instance(
     "node1",
     main_configs=["configs/timezone_config.xml"],
     user_configs=["configs/users.xml"],
-    with_mysql=True,
+    with_mysql57=True,
     with_mysql8=True,
     stay_alive=True,
 )
@@ -29,14 +34,16 @@ node_disable_bytes_settings = cluster.add_instance(
     "node2",
     main_configs=["configs/timezone_config.xml"],
     user_configs=["configs/users_disable_bytes_settings.xml"],
-    with_mysql=False,
+    with_mysql57=False,
+    with_mysql8=False,
     stay_alive=True,
 )
 node_disable_rows_settings = cluster.add_instance(
     "node3",
     main_configs=["configs/timezone_config.xml"],
     user_configs=["configs/users_disable_rows_settings.xml"],
-    with_mysql=False,
+    with_mysql57=False,
+    with_mysql8=False,
     stay_alive=True,
 )
 
@@ -125,7 +132,7 @@ class MySQLConnection:
 @pytest.fixture(scope="module")
 def started_mysql_5_7():
     mysql_node = MySQLConnection(
-        cluster.mysql_port, "root", "clickhouse", cluster.mysql_ip
+        cluster.mysql57_port, "root", "clickhouse", cluster.mysql57_ip
     )
     yield mysql_node
 
diff --git a/tests/integration/test_memory_limit_observer/__init__.py b/tests/integration/test_memory_limit_observer/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_memory_limit_observer/config/text_log.xml b/tests/integration/test_memory_limit_observer/config/text_log.xml
new file mode 100644
index 00000000000..5c1cc663d0f
--- /dev/null
+++ b/tests/integration/test_memory_limit_observer/config/text_log.xml
@@ -0,0 +1,7 @@
+<clickhouse>
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>500</flush_interval_milliseconds>
+    </text_log>
+</clickhouse>
diff --git a/tests/integration/test_memory_limit_observer/test.py b/tests/integration/test_memory_limit_observer/test.py
new file mode 100644
index 00000000000..fe3acd9a0cf
--- /dev/null
+++ b/tests/integration/test_memory_limit_observer/test.py
@@ -0,0 +1,53 @@
+import pytest
+import logging
+import time
+
+from helpers.cluster import ClickHouseCluster, run_and_check
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "node1", main_configs=["config/text_log.xml"], mem_limit="5g"
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def get_latest_mem_limit():
+    for _ in range(10):
+        try:
+            mem_limit = float(
+                node1.query(
+                    """
+                        select extract(message, '\\d+\\.\\d+') from system.text_log
+                        where message like '%Setting max_server_memory_usage was set to%' and
+                        message not like '%like%' order by event_time desc limit 1
+                    """
+                ).strip()
+            )
+            return mem_limit
+        except Exception as e:
+            time.sleep(1)
+    raise Exception("Cannot get memory limit")
+
+
+def test_observe_memory_limit(started_cluster):
+    original_max_mem = get_latest_mem_limit()
+    logging.debug(f"get original memory limit {original_max_mem}")
+    run_and_check(["docker", "update", "--memory=10g", node1.docker_id])
+    for _ in range(30):
+        time.sleep(10)
+        new_max_mem = get_latest_mem_limit()
+        logging.debug(f"get new memory limit {new_max_mem}")
+        if new_max_mem > original_max_mem:
+            return
+    raise Exception("the memory limit does not increase as expected")
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 1ae3face5b1..cffab672bd1 100644
--- a/tests/integration/test_merge_tree_azure_blob_storage/test.py
+++ b/tests/integration/test_merge_tree_azure_blob_storage/test.py
@@ -37,6 +37,7 @@ def generate_cluster_def(port):
                 <account_name>devstoreaccount1</account_name>
                 <account_key>Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==</account_key>
                 <max_single_part_upload_size>100000</max_single_part_upload_size>
+                <min_upload_part_size>100000</min_upload_part_size>
                 <max_single_download_retries>10</max_single_download_retries>
                 <max_single_read_retries>10</max_single_read_retries>
             </blob_storage_disk>
@@ -601,3 +602,150 @@ def test_big_insert(cluster):
                 assert max_single_part_upload_size == block.size
             id += 1
     assert checked
+
+
+def test_endpoint(cluster):
+    node = cluster.instances[NODE_NAME]
+    account_name = "devstoreaccount1"
+    container_name = "cont2"
+    data_prefix = "data_prefix"
+    port = cluster.azurite_port
+
+    container_client = cluster.blob_service_client.get_container_client(container_name)
+    container_client.create_container()
+
+    azure_query(
+        node,
+        f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}/{account_name}/{container_name}/{data_prefix}',
+    endpoint_contains_account_name = 'true',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    container_already_exists = 1,
+    skip_access_check = 0);
+
+    INSERT INTO test SELECT number FROM numbers(10);
+    """,
+    )
+
+    assert 10 == int(node.query("SELECT count() FROM test"))
+
+
+def test_endpoint_new_container(cluster):
+    node = cluster.instances[NODE_NAME]
+    account_name = "devstoreaccount1"
+    container_name = "cont3"
+    data_prefix = "data_prefix"
+    port = cluster.azurite_port
+
+    azure_query(
+        node,
+        f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}/{account_name}/{container_name}/{data_prefix}',
+    endpoint_contains_account_name = 'true',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    skip_access_check = 0);
+
+    INSERT INTO test SELECT number FROM numbers(10);
+    """,
+    )
+
+    assert 10 == int(node.query("SELECT count() FROM test"))
+
+
+def test_endpoint_without_prefix(cluster):
+    node = cluster.instances[NODE_NAME]
+    account_name = "devstoreaccount1"
+    container_name = "cont4"
+    port = cluster.azurite_port
+
+    azure_query(
+        node,
+        f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}/{account_name}/{container_name}',
+    endpoint_contains_account_name = 'true',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    skip_access_check = 0);
+
+    INSERT INTO test SELECT number FROM numbers(10);
+    """,
+    )
+
+    assert 10 == int(node.query("SELECT count() FROM test"))
+
+
+def test_endpoint_error_check(cluster):
+    node = cluster.instances[NODE_NAME]
+    account_name = "devstoreaccount1"
+    port = cluster.azurite_port
+
+    query = f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}/{account_name}',
+    endpoint_contains_account_name = 'true',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    skip_access_check = 0);
+    """
+
+    expected_err_msg = "Expected container_name in endpoint"
+    assert expected_err_msg in azure_query(node, query, expect_error="true")
+
+    query = f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}',
+    endpoint_contains_account_name = 'true',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    skip_access_check = 0);
+    """
+
+    expected_err_msg = "Expected account_name in endpoint"
+    assert expected_err_msg in azure_query(node, query, expect_error="true")
+
+    query = f"""
+    DROP TABLE IF EXISTS test SYNC;
+
+    CREATE TABLE test (a Int32)
+    ENGINE = MergeTree() ORDER BY tuple()
+    SETTINGS disk = disk(
+    type = azure_blob_storage,
+    endpoint = 'http://azurite1:{port}',
+    endpoint_contains_account_name = 'false',
+    account_name = 'devstoreaccount1',
+    account_key = 'Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==',
+    skip_access_check = 0);
+    """
+
+    expected_err_msg = "Expected container_name in endpoint"
+    assert expected_err_msg in azure_query(node, query, expect_error="true")
diff --git a/tests/integration/test_merge_tree_hdfs/test.py b/tests/integration/test_merge_tree_hdfs/test.py
index 95b63a5c8a3..5ca7dc5feb0 100644
--- a/tests/integration/test_merge_tree_hdfs/test.py
+++ b/tests/integration/test_merge_tree_hdfs/test.py
@@ -3,7 +3,7 @@ import time
 import os
 
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.utility import generate_values
 from helpers.wait_for_helpers import wait_for_delete_inactive_parts
 from helpers.wait_for_helpers import wait_for_delete_empty_parts
@@ -16,6 +16,10 @@ CONFIG_PATH = os.path.join(
 )
 
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+
 def create_table(cluster, table_name, additional_settings=None):
     node = cluster.instances["node"]
 
diff --git a/tests/integration/test_merge_tree_load_marks/__init__.py b/tests/integration/test_merge_tree_load_marks/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_merge_tree_load_marks/configs/config.xml b/tests/integration/test_merge_tree_load_marks/configs/config.xml
new file mode 100644
index 00000000000..1c9ee8d698f
--- /dev/null
+++ b/tests/integration/test_merge_tree_load_marks/configs/config.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <text_log>
+        <database>system</database>
+        <table>text_log</table>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+        <level>test</level>
+    </text_log>
+</clickhouse>
diff --git a/tests/integration/test_merge_tree_load_marks/test.py b/tests/integration/test_merge_tree_load_marks/test.py
new file mode 100644
index 00000000000..b066b2a6ec0
--- /dev/null
+++ b/tests/integration/test_merge_tree_load_marks/test.py
@@ -0,0 +1,62 @@
+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()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+# This test is bad and it should be a functional test but S3 metrics
+# are accounted  incorrectly for merges in part_log and query_log.
+# Also we have text_log with level 'trace' in functional tests
+# but this test requeires text_log with level 'test'.
+
+
+@pytest.mark.parametrize("min_bytes_for_wide_part", [0, 1000000000])
+def test_merge_load_marks(started_cluster, min_bytes_for_wide_part):
+    node.query(
+        f"""
+        DROP TABLE IF EXISTS t_load_marks;
+
+        CREATE TABLE t_load_marks (a UInt64, b UInt64)
+        ENGINE = MergeTree ORDER BY a
+        SETTINGS min_bytes_for_wide_part = {min_bytes_for_wide_part};
+
+        INSERT INTO t_load_marks SELECT number, number FROM numbers(1000);
+        INSERT INTO t_load_marks SELECT number, number FROM numbers(1000);
+
+        OPTIMIZE TABLE t_load_marks FINAL;
+        SYSTEM FLUSH LOGS;
+    """
+    )
+
+    uuid = node.query(
+        "SELECT uuid FROM system.tables WHERE table = 't_prewarm_merge'"
+    ).strip()
+
+    result = node.query(
+        f"""
+        SELECT count()
+        FROM system.text_log
+        WHERE (query_id LIKE '%{uuid}::all_1_2_1%') AND (message LIKE '%Loading marks%')
+    """
+    ).strip()
+
+    result = int(result)
+
+    is_wide = min_bytes_for_wide_part == 0
+    not_loaded = result == 0
+
+    assert is_wide == not_loaded
diff --git a/tests/integration/test_merge_tree_load_parts/test.py b/tests/integration/test_merge_tree_load_parts/test.py
index 968225887ad..5d575fa95f5 100644
--- a/tests/integration/test_merge_tree_load_parts/test.py
+++ b/tests/integration/test_merge_tree_load_parts/test.py
@@ -156,15 +156,33 @@ 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):
+        # The whole test produces around 6-700 lines, so 2k is plenty enough.
+        # wait_for_log_line uses tail + grep, so the overhead is negligible
+        look_behind_lines = 2000
         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}")
+            assert node.wait_for_log_line(
+                f"Loading Active part {part_name}", look_behind_lines=look_behind_lines
+            )
+            assert node.wait_for_log_line(
+                f"Finished loading Active part {part_name}",
+                look_behind_lines=look_behind_lines,
+            )
 
+        failed_part_names = []
+        # Let's wait until there is some information about all expected parts, and only
+        # check the absence of not expected log messages after all expected logs are present
         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}")
+            failed_part_names.append(part_name)
+            assert node.wait_for_log_line(
+                f"Loading Active part {part_name}", look_behind_lines=look_behind_lines
+            )
+
+        for failed_part_name in failed_part_names:
+            assert not node.contains_in_log(
+                f"Finished loading Active part {failed_part_name}"
+            )
 
         for min_block, max_block in skipped:
             part_name = f"{partition}_{min_block}_{max_block}"
diff --git a/tests/integration/test_merges_memory_limit/test.py b/tests/integration/test_merges_memory_limit/test.py
index e663f3280cc..fb592dd8a06 100644
--- a/tests/integration/test_merges_memory_limit/test.py
+++ b/tests/integration/test_merges_memory_limit/test.py
@@ -17,22 +17,32 @@ def start_cluster():
 
 
 def test_memory_limit_success():
+    if node.is_built_with_thread_sanitizer():
+        pytest.skip(
+            "tsan build is skipped because it slowly merges the parts, "
+            "rather than failing over the memory limit"
+        )
+
     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)"
+        "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)"
+        "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)"
+        "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)"
+        "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"
+        """
+        SET optimize_throw_if_noop=1;
+        SYSTEM START MERGES test_merge_oom;
+        OPTIMIZE TABLE test_merge_oom FINAL;
+        """
     )
 
     assert not error
diff --git a/tests/integration/test_modify_engine_on_restart/__init__.py b/tests/integration/test_modify_engine_on_restart/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_modify_engine_on_restart/common.py b/tests/integration/test_modify_engine_on_restart/common.py
new file mode 100644
index 00000000000..18b6c2dc1d7
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/common.py
@@ -0,0 +1,29 @@
+from helpers.cluster import ClickHouseCluster
+
+
+def get_table_path(node, table, database):
+    return node.query(
+        sql=f"SELECT data_paths FROM system.tables WHERE table = '{table}' and database = '{database}'"
+    ).strip("'[]\n")
+
+
+def check_flags_deleted(node, database_name, tables):
+    for table in tables:
+        assert "convert_to_replicated" not in node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"ls {get_table_path(node, table, database_name)}",
+            ]
+        )
+
+
+def set_convert_flags(node, database_name, tables):
+    for table in tables:
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                f"touch {get_table_path(node, table, database_name)}convert_to_replicated",
+            ]
+        )
diff --git a/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters.xml b/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters.xml
new file mode 100644
index 00000000000..d3a9d4fb8f0
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters.xml
@@ -0,0 +1,22 @@
+<clickhouse>
+<remote_servers>
+    <cluster>
+        <shard>
+            <internal_replication>true</internal_replication>
+            <replica>
+                <host>ch1</host>
+                <port>9000</port>
+            </replica>
+            <replica>
+                <host>ch2</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster>
+</remote_servers>
+
+<macros>
+        <shard>01</shard>
+</macros>
+
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters_unusual.xml b/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters_unusual.xml
new file mode 100644
index 00000000000..812291335b8
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/configs/config.d/clusters_unusual.xml
@@ -0,0 +1,20 @@
+<clickhouse>
+<remote_servers>
+    <cluster>
+        <shard>
+            <internal_replication>true</internal_replication>
+            <replica>
+                <host>ch1</host>
+                <port>9000</port>
+            </replica>
+        </shard>
+    </cluster>
+</remote_servers>
+
+<macros>
+        <shard>01</shard>
+</macros>
+
+<default_replica_path>/lol/kek/'/{uuid}</default_replica_path>
+
+</clickhouse>
diff --git a/tests/integration/test_modify_engine_on_restart/configs/config.d/distributed_ddl.xml b/tests/integration/test_modify_engine_on_restart/configs/config.d/distributed_ddl.xml
new file mode 100644
index 00000000000..45555338de5
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/configs/config.d/distributed_ddl.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+<distributed_ddl>
+    <path>/clickhouse/task_queue/ddl</path>
+</distributed_ddl>
+</clickhouse>
\ No newline at end of file
diff --git a/tests/integration/test_modify_engine_on_restart/test.py b/tests/integration/test_modify_engine_on_restart/test.py
new file mode 100644
index 00000000000..289b25dd89e
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/test.py
@@ -0,0 +1,161 @@
+import pytest
+from test_modify_engine_on_restart.common import check_flags_deleted, set_convert_flags
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance(
+    "ch1",
+    main_configs=[
+        "configs/config.d/clusters.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node1"},
+    stay_alive=True,
+)
+ch2 = cluster.add_instance(
+    "ch2",
+    main_configs=[
+        "configs/config.d/clusters.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node2"},
+)
+
+database_name = "modify_engine"
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def q(node, query):
+    return node.query(database=database_name, sql=query)
+
+
+def create_tables():
+    # MergeTree table that will be converted
+    q(
+        ch1,
+        "CREATE TABLE rmt ( A Int64, D Date, S String ) ENGINE MergeTree() PARTITION BY toYYYYMM(D) ORDER BY A;",
+    )
+
+    q(ch1, "INSERT INTO rmt SELECT number, today(), '' FROM numbers(1e6);")
+    q(ch1, "INSERT INTO rmt SELECT number, today()-60, '' FROM numbers(1e5);")
+
+    # ReplacingMergeTree table that will be converted to check unusual engine kinds
+    q(
+        ch1,
+        "CREATE TABLE replacing ( A Int64, D Date, S String ) ENGINE ReplacingMergeTree() PARTITION BY toYYYYMM(D) ORDER BY A;",
+    )
+
+    q(ch1, "INSERT INTO replacing SELECT number, today(), '' FROM numbers(1e6);")
+    q(ch1, "INSERT INTO replacing SELECT number, today()-60, '' FROM numbers(1e5);")
+
+    # MergeTree table that will not be converted
+    q(
+        ch1,
+        "CREATE TABLE mt ( A Int64, D Date, S String ) ENGINE MergeTree() PARTITION BY toYYYYMM(D) ORDER BY A;",
+    )
+
+    # Not MergeTree table
+    q(ch1, "CREATE TABLE log ( A Int64, D Date, S String ) ENGINE Log;")
+
+
+def check_tables(converted):
+    engine_prefix = ""
+    if converted:
+        engine_prefix = "Replicated"
+
+    # Check tables exists
+    assert (
+        q(
+            ch1,
+            "SHOW TABLES",
+        ).strip()
+        == "log\nmt\nreplacing\nrmt"
+    )
+
+    # Check engines
+    assert (
+        q(
+            ch1,
+            f"SELECT name, engine FROM system.tables WHERE database = '{database_name}' AND (name != 'log' AND name != 'mt')",
+        ).strip()
+        == f"replacing\t{engine_prefix}ReplacingMergeTree\nrmt\t{engine_prefix}MergeTree"
+    )
+    assert (
+        q(
+            ch1,
+            f"SELECT name, engine FROM system.tables WHERE database = '{database_name}' AND (name = 'log' OR name = 'mt')",
+        ).strip()
+        == "log\tLog\nmt\tMergeTree"
+    )
+
+    # Check values
+    for table in ["rmt", "replacing"]:
+        assert (
+            q(
+                ch1,
+                f"SELECT count() FROM {table}",
+            ).strip()
+            == "1100000"
+        )
+
+
+def check_replica_added():
+    # Add replica to check if zookeeper path is correct and consistent with table uuid
+
+    uuid = q(
+        ch1,
+        f"SELECT uuid FROM system.tables WHERE table = 'rmt' AND database = '{database_name}'",
+    ).strip()
+
+    q(
+        ch2,
+        f"CREATE TABLE rmt ( A Int64, D Date, S String ) ENGINE ReplicatedMergeTree('/clickhouse/tables/{uuid}/{{shard}}', '{{replica}}') PARTITION BY toYYYYMM(D) ORDER BY A",
+    )
+
+    ch2.query(database=database_name, sql="SYSTEM SYNC REPLICA rmt", timeout=20)
+
+    # Check values
+    assert (
+        q(
+            ch2,
+            f"SELECT count() FROM rmt",
+        ).strip()
+        == "1100000"
+    )
+
+
+def test_modify_engine_on_restart(started_cluster):
+    ch1.query("CREATE DATABASE " + database_name + " ON CLUSTER cluster")
+
+    create_tables()
+
+    check_tables(False)
+
+    ch1.restart_clickhouse()
+
+    check_tables(False)
+
+    set_convert_flags(ch1, database_name, ["rmt", "replacing", "log"])
+
+    ch1.restart_clickhouse()
+
+    check_flags_deleted(ch1, database_name, ["rmt", "replacing"])
+
+    check_tables(True)
+
+    check_replica_added()
+
+    ch1.restart_clickhouse()
+
+    check_tables(True)
diff --git a/tests/integration/test_modify_engine_on_restart/test_args.py b/tests/integration/test_modify_engine_on_restart/test_args.py
new file mode 100644
index 00000000000..f83d540bfb9
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/test_args.py
@@ -0,0 +1,92 @@
+import pytest
+from test_modify_engine_on_restart.common import check_flags_deleted, set_convert_flags
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance(
+    "ch1",
+    main_configs=[
+        "configs/config.d/clusters.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node1"},
+    stay_alive=True,
+)
+
+database_name = "modify_engine_args"
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def q(node, query):
+    return node.query(database=database_name, sql=query)
+
+
+def create_tables():
+    # Check one argument
+    q(
+        ch1,
+        "CREATE TABLE replacing_ver ( A Int64, D Date, S String ) ENGINE = ReplacingMergeTree(D) PARTITION BY toYYYYMM(D) ORDER BY A",
+    )
+
+    # Check more than one argument
+    q(
+        ch1,
+        "CREATE TABLE collapsing_ver ( ID UInt64, Sign Int8, Version UInt8 ) ENGINE = VersionedCollapsingMergeTree(Sign, Version) ORDER BY ID",
+    )
+
+
+def check_tables():
+    # Check tables exists
+    assert (
+        q(
+            ch1,
+            "SHOW TABLES",
+        ).strip()
+        == "collapsing_ver\nreplacing_ver"
+    )
+
+    # Check engines
+    assert (
+        q(
+            ch1,
+            f"SELECT engine_full FROM system.tables WHERE database = '{database_name}' and name = 'replacing_ver'",
+        )
+        .strip()
+        .startswith(
+            "ReplicatedReplacingMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\', D)"
+        )
+    )
+    assert (
+        q(
+            ch1,
+            f"SELECT engine_full FROM system.tables WHERE database = '{database_name}' and name = 'collapsing_ver'",
+        )
+        .strip()
+        .startswith(
+            "ReplicatedVersionedCollapsingMergeTree(\\'/clickhouse/tables/{uuid}/{shard}\\', \\'{replica}\\', Sign, Version)"
+        )
+    )
+
+
+def test_modify_engine_on_restart_with_arguments(started_cluster):
+    ch1.query("CREATE DATABASE " + database_name)
+
+    create_tables()
+
+    set_convert_flags(ch1, database_name, ["replacing_ver", "collapsing_ver"])
+
+    ch1.restart_clickhouse()
+
+    check_flags_deleted(ch1, database_name, ["replacing_ver", "collapsing_ver"])
+
+    check_tables()
diff --git a/tests/integration/test_modify_engine_on_restart/test_mv.py b/tests/integration/test_modify_engine_on_restart/test_mv.py
new file mode 100644
index 00000000000..30cb2ddc5e5
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/test_mv.py
@@ -0,0 +1,132 @@
+import pytest
+from test_modify_engine_on_restart.common import check_flags_deleted, set_convert_flags
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance(
+    "ch1",
+    main_configs=[
+        "configs/config.d/clusters.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node1"},
+    stay_alive=True,
+)
+
+database_name = "modify_engine_with_mv"
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def q(node, query):
+    return node.query(database=database_name, sql=query)
+
+
+def create_tables():
+    q(
+        ch1,
+        "CREATE TABLE hourly_data(`domain_name` String, `event_time` DateTime, `count_views` UInt64) ENGINE = MergeTree ORDER BY (domain_name, event_time)",
+    )
+
+    q(
+        ch1,
+        "CREATE TABLE monthly_aggregated_data\
+            (`domain_name` String, `month` Date, `sumCountViews` AggregateFunction(sum, UInt64))\
+            ENGINE = AggregatingMergeTree ORDER BY (domain_name, month)",
+    )
+
+    q(
+        ch1,
+        "CREATE MATERIALIZED VIEW monthly_aggregated_data_mv\
+            TO monthly_aggregated_data\
+            AS\
+            SELECT\
+                toDate(toStartOfMonth(event_time)) AS month,\
+                domain_name,\
+                sumState(count_views) AS sumCountViews\
+            FROM hourly_data\
+            GROUP BY\
+                domain_name,\
+                month",
+    )
+
+    q(
+        ch1,
+        "INSERT INTO hourly_data (domain_name, event_time, count_views)\
+            VALUES ('clickhouse.com', '2019-01-01 10:00:00', 1),\
+                ('clickhouse.com', '2019-02-02 00:00:00', 2),\
+                ('clickhouse.com', '2019-02-01 00:00:00', 3),\
+                ('clickhouse.com', '2020-01-01 00:00:00', 6)",
+    )
+
+
+def check_tables(converted):
+    engine_prefix = ""
+    if converted:
+        engine_prefix = "Replicated"
+
+    # Check engines
+    assert (
+        q(
+            ch1,
+            f"SELECT name, engine FROM system.tables WHERE database = '{database_name}'",
+        ).strip()
+        == f"hourly_data\t{engine_prefix}MergeTree\nmonthly_aggregated_data\t{engine_prefix}AggregatingMergeTree\nmonthly_aggregated_data_mv\tMaterializedView"
+    )
+
+    # Check values
+    assert (
+        q(
+            ch1,
+            "SELECT sumMerge(sumCountViews) as sumCountViews\
+            FROM monthly_aggregated_data_mv",
+        ).strip()
+        == "12"
+    )
+    assert q(ch1, "SELECT count() FROM hourly_data").strip() == "4"
+
+    if converted:
+        # Insert new values to check if new dependencies are set correctly
+        q(
+            ch1,
+            "INSERT INTO hourly_data (domain_name, event_time, count_views)\
+                VALUES ('clickhouse.com', '2019-01-01 10:00:00', 1),\
+                    ('clickhouse.com', '2019-02-02 00:00:00', 2),\
+                    ('clickhouse.com', '2019-02-01 00:00:00', 3),\
+                    ('clickhouse.com', '2020-01-01 00:00:00', 6)",
+        )
+
+        assert (
+            q(
+                ch1,
+                "SELECT sumMerge(sumCountViews) as sumCountViews\
+                FROM monthly_aggregated_data_mv",
+            ).strip()
+            == "24"
+        )
+        assert q(ch1, "SELECT count() FROM hourly_data").strip() == "8"
+
+
+def test_modify_engine_on_restart_with_materialized_view(started_cluster):
+    ch1.query(f"CREATE DATABASE {database_name}")
+
+    create_tables()
+
+    check_tables(False)
+
+    set_convert_flags(ch1, database_name, ["hourly_data", "monthly_aggregated_data"])
+
+    ch1.restart_clickhouse()
+
+    check_flags_deleted(ch1, database_name, ["hourly_data", "monthly_aggregated_data"])
+
+    check_tables(True)
diff --git a/tests/integration/test_modify_engine_on_restart/test_ordinary.py b/tests/integration/test_modify_engine_on_restart/test_ordinary.py
new file mode 100644
index 00000000000..fd86417a216
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/test_ordinary.py
@@ -0,0 +1,94 @@
+import pytest
+from test_modify_engine_on_restart.common import check_flags_deleted, set_convert_flags
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance(
+    "ch1",
+    main_configs=[
+        "configs/config.d/clusters.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node1"},
+    stay_alive=True,
+)
+
+database_name = "modify_engine_on_ordinary"
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def q(node, query):
+    return node.query(database=database_name, sql=query)
+
+
+def create_tables():
+    q(
+        ch1,
+        "CREATE TABLE mt ( A Int64, D Date, S String ) ENGINE MergeTree() PARTITION BY toYYYYMM(D) ORDER BY A;",
+    )
+
+
+def check_tables():
+    # Check tables exists
+    assert (
+        q(
+            ch1,
+            "SHOW TABLES",
+        ).strip()
+        == "mt"
+    )
+
+    # Check engines
+    assert (
+        q(
+            ch1,
+            f"SELECT name, engine FROM system.tables WHERE database = '{database_name}'",
+        ).strip()
+        == f"mt\tMergeTree"
+    )
+
+
+def remove_convert_flags():
+    ch1.exec_in_container(
+        [
+            "bash",
+            "-c",
+            f"rm /var/lib/clickhouse/data/{database_name}/mt/convert_to_replicated",
+        ]
+    )
+
+
+def test_modify_engine_on_restart_ordinary_database(started_cluster):
+    ch1.query(
+        sql=f"CREATE DATABASE {database_name} ENGINE = Ordinary",
+        settings={"allow_deprecated_database_ordinary": 1},
+    )
+
+    create_tables()
+
+    check_tables()
+
+    set_convert_flags(ch1, database_name, ["mt"])
+
+    cannot_start = False
+    try:
+        ch1.restart_clickhouse()
+    except:
+        cannot_start = True
+    assert cannot_start
+
+    remove_convert_flags()
+
+    ch1.restart_clickhouse()
+
+    check_tables()
diff --git a/tests/integration/test_modify_engine_on_restart/test_unusual_path.py b/tests/integration/test_modify_engine_on_restart/test_unusual_path.py
new file mode 100644
index 00000000000..e82f48e8b34
--- /dev/null
+++ b/tests/integration/test_modify_engine_on_restart/test_unusual_path.py
@@ -0,0 +1,92 @@
+import pytest
+from test_modify_engine_on_restart.common import check_flags_deleted, set_convert_flags
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+ch1 = cluster.add_instance(
+    "ch1",
+    main_configs=[
+        "configs/config.d/clusters_unusual.xml",
+        "configs/config.d/distributed_ddl.xml",
+    ],
+    with_zookeeper=True,
+    macros={"replica": "node1"},
+    stay_alive=True,
+)
+
+database_name = "modify_engine_unusual_path"
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def q(node, query):
+    return node.query(database=database_name, sql=query)
+
+
+def create_tables():
+    # Check one argument
+    q(
+        ch1,
+        "CREATE TABLE replacing_ver ( A Int64, D Date, S String ) ENGINE = ReplacingMergeTree(D) PARTITION BY toYYYYMM(D) ORDER BY A",
+    )
+
+    # Check more than one argument
+    q(
+        ch1,
+        "CREATE TABLE collapsing_ver ( ID UInt64, Sign Int8, Version UInt8 ) ENGINE = VersionedCollapsingMergeTree(Sign, Version) ORDER BY ID",
+    )
+
+
+def check_tables():
+    # Check tables exists
+    assert (
+        q(
+            ch1,
+            "SHOW TABLES",
+        ).strip()
+        == "collapsing_ver\nreplacing_ver"
+    )
+
+    # Check engines
+    assert (
+        q(
+            ch1,
+            f"SELECT engine_full FROM system.tables WHERE database = '{database_name}' and name = 'replacing_ver'",
+        )
+        .strip()
+        .startswith(
+            "ReplicatedReplacingMergeTree(\\'/lol/kek/\\\\\\'/{uuid}\\', \\'{replica}\\', D)"
+        )
+    )
+    assert (
+        q(
+            ch1,
+            f"SELECT engine_full FROM system.tables WHERE database = '{database_name}' and name = 'collapsing_ver'",
+        )
+        .strip()
+        .startswith(
+            "ReplicatedVersionedCollapsingMergeTree(\\'/lol/kek/\\\\\\'/{uuid}\\', \\'{replica}\\', Sign, Version)"
+        )
+    )
+
+
+def test_modify_engine_on_restart_with_unusual_path(started_cluster):
+    ch1.query("CREATE DATABASE " + database_name)
+
+    create_tables()
+
+    set_convert_flags(ch1, database_name, ["replacing_ver", "collapsing_ver"])
+
+    ch1.restart_clickhouse()
+
+    check_flags_deleted(ch1, database_name, ["replacing_ver", "collapsing_ver"])
+
+    check_tables()
diff --git a/tests/integration/test_multiple_disks/test.py b/tests/integration/test_multiple_disks/test.py
index fdd81284b2a..9584ace7f45 100644
--- a/tests/integration/test_multiple_disks/test.py
+++ b/tests/integration/test_multiple_disks/test.py
@@ -5,6 +5,7 @@ import string
 import threading
 import time
 from multiprocessing.dummy import Pool
+from helpers.test_tools import assert_eq_with_retry
 
 import pytest
 from helpers.client import QueryRuntimeException
@@ -1745,9 +1746,9 @@ def test_move_while_merge(start_cluster):
         node1.query(f"DROP TABLE IF EXISTS {name} SYNC")
 
 
-def test_move_across_policies_does_not_work(start_cluster):
+def test_move_across_policies_work_for_attach_not_work_for_move(start_cluster):
     try:
-        name = "test_move_across_policies_does_not_work"
+        name = "test_move_across_policies_work_for_attach_not_work_for_move"
 
         node1.query(
             """
@@ -1783,25 +1784,18 @@ def test_move_across_policies_does_not_work(start_cluster):
         except QueryRuntimeException:
             """All parts of partition 'all' are already on disk 'jbod2'."""
 
-        with pytest.raises(
-            QueryRuntimeException,
-            match=".*because disk does not belong to storage policy.*",
-        ):
-            node1.query(
-                """ALTER TABLE {name}2 ATTACH PARTITION tuple() FROM {name}""".format(
-                    name=name
-                )
+        node1.query(
+            """ALTER TABLE {name}2 ATTACH PARTITION tuple() FROM {name}""".format(
+                name=name
             )
-
-        with pytest.raises(
-            QueryRuntimeException,
-            match=".*because disk does not belong to storage policy.*",
-        ):
+        )
+        assert_eq_with_retry(
+            node1,
+            """SELECT * FROM {name}2""".format(name=name),
             node1.query(
-                """ALTER TABLE {name}2 REPLACE PARTITION tuple() FROM {name}""".format(
-                    name=name
-                )
-            )
+                """SELECT * FROM {name}""".format(name=name),
+            ),
+        )
 
         with pytest.raises(
             QueryRuntimeException,
@@ -1813,10 +1807,6 @@ def test_move_across_policies_does_not_work(start_cluster):
                 )
             )
 
-        assert node1.query(
-            """SELECT * FROM {name}""".format(name=name)
-        ).splitlines() == ["1"]
-
     finally:
         node1.query(f"DROP TABLE IF EXISTS {name} SYNC")
         node1.query(f"DROP TABLE IF EXISTS {name}2 SYNC")
diff --git a/tests/integration/test_mutations_with_merge_tree/configs/users.xml b/tests/integration/test_mutations_with_merge_tree/configs/users.xml
index d1a3ae1e859..c767d6361fd 100644
--- a/tests/integration/test_mutations_with_merge_tree/configs/users.xml
+++ b/tests/integration/test_mutations_with_merge_tree/configs/users.xml
@@ -1,7 +1,7 @@
 <clickhouse>
     <profiles>
         <default>
-            <max_expanded_ast_elements>500</max_expanded_ast_elements>
+            <max_expanded_ast_elements>1800</max_expanded_ast_elements>
             <force_index_by_date>1</force_index_by_date>
             <force_primary_key>1</force_primary_key>
         </default>
diff --git a/tests/integration/test_mysql57_database_engine/__init__.py b/tests/integration/test_mysql57_database_engine/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_mysql57_database_engine/configs/named_collections.xml b/tests/integration/test_mysql57_database_engine/configs/named_collections.xml
new file mode 100644
index 00000000000..3b65536f20f
--- /dev/null
+++ b/tests/integration/test_mysql57_database_engine/configs/named_collections.xml
@@ -0,0 +1,23 @@
+<clickhouse>
+    <named_collections>
+        <mysql1>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>3306</port>
+            <database>test_database</database>
+        </mysql1>
+        <mysql2>
+            <user>postgres</user>
+            <password>mysecretpassword</password>
+            <host>postgres1</host>
+        </mysql2>
+        <mysql3>
+            <user>root</user>
+            <password>clickhouse</password>
+            <host>mysql57</host>
+            <port>1111</port>
+            <database>clickhouse</database>
+        </mysql3>
+    </named_collections>
+</clickhouse>
diff --git a/tests/integration/test_mysql57_database_engine/configs/remote_servers.xml b/tests/integration/test_mysql57_database_engine/configs/remote_servers.xml
new file mode 100644
index 00000000000..9c7f02c190f
--- /dev/null
+++ b/tests/integration/test_mysql57_database_engine/configs/remote_servers.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <test_cluster>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </test_cluster>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_mysql57_database_engine/configs/user.xml b/tests/integration/test_mysql57_database_engine/configs/user.xml
new file mode 100644
index 00000000000..775c63350b0
--- /dev/null
+++ b/tests/integration/test_mysql57_database_engine/configs/user.xml
@@ -0,0 +1,10 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <quota>default</quota>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_mysql57_database_engine/configs/users.xml b/tests/integration/test_mysql57_database_engine/configs/users.xml
new file mode 100644
index 00000000000..4b6ba057ecb
--- /dev/null
+++ b/tests/integration/test_mysql57_database_engine/configs/users.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <users>
+        <default>
+            <password></password>
+            <profile>default</profile>
+            <named_collection_control>1</named_collection_control>
+        </default>
+    </users>
+</clickhouse>
diff --git a/tests/integration/test_mysql57_database_engine/test.py b/tests/integration/test_mysql57_database_engine/test.py
new file mode 100644
index 00000000000..410d277d667
--- /dev/null
+++ b/tests/integration/test_mysql57_database_engine/test.py
@@ -0,0 +1,1080 @@
+import contextlib
+import time
+from string import Template
+
+import pymysql.cursors
+import pytest
+from helpers.client import QueryRuntimeException
+from helpers.cluster import ClickHouseCluster, is_arm
+from helpers.network import PartitionManager
+
+
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+cluster = ClickHouseCluster(__file__)
+clickhouse_node = cluster.add_instance(
+    "node1",
+    main_configs=["configs/remote_servers.xml", "configs/named_collections.xml"],
+    user_configs=["configs/users.xml"],
+    with_mysql57=True,
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+class MySQLNodeInstance:
+    def __init__(self, user, password, hostname, port):
+        self.user = user
+        self.port = port
+        self.hostname = hostname
+        self.password = password
+        self.mysql_connection = None  # lazy init
+        self.ip_address = hostname
+
+    def query(self, execution_query):
+        if self.mysql_connection is None:
+            self.mysql_connection = pymysql.connect(
+                user=self.user,
+                password=self.password,
+                host=self.hostname,
+                port=self.port,
+            )
+        with self.mysql_connection.cursor() as cursor:
+
+            def execute(query):
+                res = cursor.execute(query)
+                if query.lstrip().lower().startswith(("select", "show")):
+                    # Mimic output of the ClickHouseInstance, which is:
+                    # tab-sparated values and newline (\n)-separated rows.
+                    rows = []
+                    for row in cursor.fetchall():
+                        rows.append("\t".join(str(item) for item in row))
+                    res = "\n".join(rows)
+                return res
+
+            if isinstance(execution_query, (str, bytes)):
+                return execute(execution_query)
+            else:
+                return [execute(q) for q in execution_query]
+
+    def close(self):
+        if self.mysql_connection is not None:
+            self.mysql_connection.close()
+
+
+def test_mysql_ddl_for_mysql_database(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_database")
+        mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query(
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse')"
+        )
+        assert "test_database" in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query(
+            "CREATE TABLE `test_database`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;"
+        )
+        assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_database")
+
+        time.sleep(
+            3
+        )  # Because the unit of MySQL modification time is seconds, modifications made in the same second cannot be obtained
+        mysql_node.query(
+            "ALTER TABLE `test_database`.`test_table` ADD COLUMN `add_column` int(11)"
+        )
+        assert "add_column" in clickhouse_node.query(
+            "SELECT name FROM system.columns WHERE table = 'test_table' AND database = 'test_database'"
+        )
+
+        time.sleep(
+            3
+        )  # Because the unit of MySQL modification time is seconds, modifications made in the same second cannot be obtained
+        mysql_node.query(
+            "ALTER TABLE `test_database`.`test_table` DROP COLUMN `add_column`"
+        )
+        assert "add_column" not in clickhouse_node.query(
+            "SELECT name FROM system.columns WHERE table = 'test_table' AND database = 'test_database'"
+        )
+
+        mysql_node.query("DROP TABLE `test_database`.`test_table`;")
+        assert "test_table" not in clickhouse_node.query(
+            "SHOW TABLES FROM test_database"
+        )
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        assert "test_database" not in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query("DROP DATABASE test_database")
+
+
+def test_clickhouse_ddl_for_mysql_database(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_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')"
+        )
+
+        assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_database")
+        clickhouse_node.query("DROP TABLE test_database.test_table")
+        assert "test_table" not in clickhouse_node.query(
+            "SHOW TABLES FROM test_database"
+        )
+        clickhouse_node.query("ATTACH TABLE test_database.test_table")
+        assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_database")
+        clickhouse_node.query("DETACH TABLE test_database.test_table")
+        assert "test_table" not in clickhouse_node.query(
+            "SHOW TABLES FROM test_database"
+        )
+        clickhouse_node.query("ATTACH TABLE test_database.test_table")
+        assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_database")
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        assert "test_database" not in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query("DROP DATABASE test_database")
+
+
+def test_clickhouse_dml_for_mysql_database(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_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` ( `i``d` int(11) NOT NULL, PRIMARY KEY (`i``d`)) 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')"
+        )
+
+        assert (
+            clickhouse_node.query(
+                "SELECT count() FROM `test_database`.`test_table`"
+            ).rstrip()
+            == "0"
+        )
+        clickhouse_node.query(
+            "INSERT INTO `test_database`.`test_table`(`i``d`) select number from numbers(10000)"
+        )
+        assert (
+            clickhouse_node.query(
+                "SELECT count() FROM `test_database`.`test_table`"
+            ).rstrip()
+            == "10000"
+        )
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        assert "test_database" not in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query("DROP DATABASE test_database")
+
+
+def test_clickhouse_join_for_mysql_database(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test")
+        mysql_node.query("CREATE DATABASE test DEFAULT CHARACTER SET 'utf8'")
+        mysql_node.query(
+            "CREATE TABLE test.t1_mysql_local ("
+            "pays    VARCHAR(55) DEFAULT 'FRA' NOT NULL,"
+            "service VARCHAR(5)  DEFAULT ''    NOT NULL,"
+            "opco    CHAR(3)     DEFAULT ''    NOT NULL"
+            ")"
+        )
+        mysql_node.query(
+            "CREATE TABLE test.t2_mysql_local ("
+            "service VARCHAR(5) DEFAULT '' NOT NULL,"
+            "opco    VARCHAR(5) DEFAULT ''"
+            ")"
+        )
+        clickhouse_node.query("DROP TABLE IF EXISTS default.t1_remote_mysql SYNC")
+        clickhouse_node.query("DROP TABLE IF EXISTS default.t2_remote_mysql SYNC")
+        clickhouse_node.query(
+            "CREATE TABLE default.t1_remote_mysql AS mysql('mysql57:3306','test','t1_mysql_local','root','clickhouse')"
+        )
+        clickhouse_node.query(
+            "CREATE TABLE default.t2_remote_mysql AS mysql('mysql57:3306','test','t2_mysql_local','root','clickhouse')"
+        )
+        clickhouse_node.query(
+            "INSERT INTO `default`.`t1_remote_mysql` VALUES ('EN','A',''),('RU','B','AAA')"
+        )
+        clickhouse_node.query(
+            "INSERT INTO `default`.`t2_remote_mysql` VALUES ('A','AAA'),('Z','')"
+        )
+
+        assert (
+            clickhouse_node.query(
+                "SELECT s.pays "
+                "FROM default.t1_remote_mysql AS s "
+                "LEFT JOIN default.t1_remote_mysql AS s_ref "
+                "ON (s_ref.opco = s.opco AND s_ref.service = s.service) "
+                "WHERE s_ref.opco != '' AND s.opco != '' "
+            ).rstrip()
+            == "RU"
+        )
+        mysql_node.query("DROP DATABASE test")
+
+
+def test_bad_arguments_for_mysql_database_engine(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            port=started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        with pytest.raises(QueryRuntimeException) as exception:
+            mysql_node.query(
+                "CREATE DATABASE IF NOT EXISTS test_bad_arguments DEFAULT CHARACTER SET 'utf8'"
+            )
+            clickhouse_node.query(
+                "CREATE DATABASE test_database_bad_arguments ENGINE = MySQL('mysql57:3306', test_bad_arguments, root, 'clickhouse')"
+            )
+        assert "Database engine MySQL requested literal argument." in str(
+            exception.value
+        )
+        mysql_node.query("DROP DATABASE test_bad_arguments")
+
+
+def test_column_comments_for_mysql_database_engine(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_database")
+        mysql_node.query("CREATE DATABASE test_database DEFAULT CHARACTER SET 'utf8'")
+
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query(
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse')"
+        )
+        assert "test_database" in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query(
+            "CREATE TABLE `test_database`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`), `test` int COMMENT 'test comment') ENGINE=InnoDB;"
+        )
+        assert "test comment" in clickhouse_node.query(
+            "DESCRIBE TABLE `test_database`.`test_table`"
+        )
+
+        time.sleep(
+            3
+        )  # Because the unit of MySQL modification time is seconds, modifications made in the same second cannot be obtained
+        mysql_node.query(
+            "ALTER TABLE `test_database`.`test_table` ADD COLUMN `add_column` int(11) COMMENT 'add_column comment'"
+        )
+        assert "add_column comment" in clickhouse_node.query(
+            "SELECT comment FROM system.columns WHERE table = 'test_table' AND database = 'test_database'"
+        )
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        mysql_node.query("DROP DATABASE test_database")
+
+
+def test_data_types_support_level_for_mysql_database_engine(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test")
+        mysql_node.query(
+            "CREATE DATABASE IF NOT EXISTS test DEFAULT CHARACTER SET 'utf8'"
+        )
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
+        clickhouse_node.query(
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', test, 'root', 'clickhouse')",
+            settings={"mysql_datatypes_support_level": "decimal,datetime64"},
+        )
+
+        assert (
+            "SETTINGS mysql_datatypes_support_level = \\'decimal,datetime64\\'"
+            in clickhouse_node.query("SHOW CREATE DATABASE test_database FORMAT TSV")
+        )
+        clickhouse_node.query("DETACH DATABASE test_database")
+
+        # without context settings
+        clickhouse_node.query("ATTACH DATABASE test_database")
+        assert (
+            "SETTINGS mysql_datatypes_support_level = \\'decimal,datetime64\\'"
+            in clickhouse_node.query("SHOW CREATE DATABASE test_database FORMAT TSV")
+        )
+
+        clickhouse_node.query(
+            "CREATE DATABASE test_database_1 ENGINE = MySQL('mysql57:3306', test, 'root', 'clickhouse') SETTINGS mysql_datatypes_support_level = 'decimal,datetime64'",
+            settings={"mysql_datatypes_support_level": "decimal"},
+        )
+
+        assert (
+            "SETTINGS mysql_datatypes_support_level = \\'decimal,datetime64\\'"
+            in clickhouse_node.query("SHOW CREATE DATABASE test_database_1 FORMAT TSV")
+        )
+        clickhouse_node.query("DETACH DATABASE test_database_1")
+
+        # without context settings
+        clickhouse_node.query("ATTACH DATABASE test_database_1")
+        assert (
+            "SETTINGS mysql_datatypes_support_level = \\'decimal,datetime64\\'"
+            in clickhouse_node.query("SHOW CREATE DATABASE test_database_1 FORMAT TSV")
+        )
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        clickhouse_node.query("DROP DATABASE test_database_1")
+        assert "test_database" not in clickhouse_node.query("SHOW DATABASES")
+        mysql_node.query("DROP DATABASE test")
+
+
+float_values = [0, "NULL"]
+clickhouse_float_values = [0, "\\N"]
+int32_values = [0, 1, -1, 2147483647, -2147483648]
+uint32_values = [
+    0,
+    1,
+]  # [FIXME] seems client have issue with value 4294967295, it returns -1 for it
+mint_values = [0, 1, -1, 8388607, -8388608]
+umint_values = [0, 1, 16777215]
+int16_values = [0, 1, -1, 32767, -32768]
+uint16_values = [0, 1, 65535]
+int8_values = [0, 1, -1, 127, -128]
+uint8_values = [0, 1, 255]
+string_values = ["'ClickHouse'", "NULL"]
+clickhouse_string_values = ["ClickHouse", "\\N"]
+date_values = ["'1970-01-01'"]
+date2Date32_values = ["'1925-01-01'", "'2283-11-11'"]
+date2String_values = ["'1000-01-01'", "'9999-12-31'"]
+
+
+decimal_values = [
+    0,
+    0.123,
+    0.4,
+    5.67,
+    8.91011,
+    123456789.123,
+    -0.123,
+    -0.4,
+    -5.67,
+    -8.91011,
+    -123456789.123,
+]
+timestamp_values = ["'2015-05-18 07:40:01.123'", "'2019-09-16 19:20:11.123'"]
+timestamp_values_no_subsecond = ["'2015-05-18 07:40:01'", "'2019-09-16 19:20:11'"]
+
+
+def arryToString(expected_clickhouse_values):
+    return "\n".join(str(value) for value in 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",
+    [
+        pytest.param(
+            "common_types",
+            "FLOAT",
+            "Nullable(Float32)",
+            float_values,
+            clickhouse_float_values,
+            "",
+            id="float_1",
+        ),
+        pytest.param(
+            "common_types",
+            "FLOAT UNSIGNED",
+            "Nullable(Float32)",
+            float_values,
+            clickhouse_float_values,
+            "",
+            id="float_2",
+        ),
+        pytest.param(
+            "common_types",
+            "INT",
+            "Nullable(Int32)",
+            int32_values,
+            int32_values,
+            "",
+            id="common_types_1",
+        ),
+        pytest.param(
+            "common_types",
+            "INT NOT NULL",
+            "Int32",
+            int32_values,
+            int32_values,
+            "",
+            id="common_types_2",
+        ),
+        pytest.param(
+            "common_types",
+            "INT UNSIGNED NOT NULL",
+            "UInt32",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_3",
+        ),
+        pytest.param(
+            "common_types",
+            "INT UNSIGNED",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_4",
+        ),
+        pytest.param(
+            "common_types",
+            "INT UNSIGNED DEFAULT NULL",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_5",
+        ),
+        pytest.param(
+            "common_types",
+            "INT UNSIGNED DEFAULT '1'",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_6",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10)",
+            "Nullable(Int32)",
+            int32_values,
+            int32_values,
+            "",
+            id="common_types_7",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10) NOT NULL",
+            "Int32",
+            int32_values,
+            int32_values,
+            "",
+            id="common_types_8",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10) UNSIGNED NOT NULL",
+            "UInt32",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_8",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10) UNSIGNED",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_9",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10) UNSIGNED DEFAULT NULL",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_10",
+        ),
+        pytest.param(
+            "common_types",
+            "INT(10) UNSIGNED DEFAULT '1'",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_11",
+        ),
+        pytest.param(
+            "common_types",
+            "INTEGER",
+            "Nullable(Int32)",
+            int32_values,
+            int32_values,
+            "",
+            id="common_types_12",
+        ),
+        pytest.param(
+            "common_types",
+            "INTEGER UNSIGNED",
+            "Nullable(UInt32)",
+            uint32_values,
+            uint32_values,
+            "",
+            id="common_types_13",
+        ),
+        pytest.param(
+            "common_types",
+            "MEDIUMINT",
+            "Nullable(Int32)",
+            mint_values,
+            mint_values,
+            "",
+            id="common_types_14",
+        ),
+        pytest.param(
+            "common_types",
+            "MEDIUMINT UNSIGNED",
+            "Nullable(UInt32)",
+            umint_values,
+            umint_values,
+            "",
+            id="common_types_15",
+        ),
+        pytest.param(
+            "common_types",
+            "SMALLINT",
+            "Nullable(Int16)",
+            int16_values,
+            int16_values,
+            "",
+            id="common_types_16",
+        ),
+        pytest.param(
+            "common_types",
+            "SMALLINT UNSIGNED",
+            "Nullable(UInt16)",
+            uint16_values,
+            uint16_values,
+            "",
+            id="common_types_17",
+        ),
+        pytest.param(
+            "common_types",
+            "TINYINT",
+            "Nullable(Int8)",
+            int8_values,
+            int8_values,
+            "",
+            id="common_types_18",
+        ),
+        pytest.param(
+            "common_types",
+            "TINYINT UNSIGNED",
+            "Nullable(UInt8)",
+            uint8_values,
+            uint8_values,
+            "",
+            id="common_types_19",
+        ),
+        pytest.param(
+            "common_types",
+            "VARCHAR(10)",
+            "Nullable(String)",
+            string_values,
+            clickhouse_string_values,
+            "",
+            id="common_types_20",
+        ),
+        pytest.param(
+            "common_types",
+            "DATE",
+            "Nullable(Date)",
+            date_values,
+            "",
+            "",
+            id="common_types_21",
+        ),
+        pytest.param(
+            "common_types",
+            "DATE",
+            "Nullable(Date32)",
+            date2Date32_values,
+            "",
+            "date2Date32",
+            id="common_types_22",
+        ),
+        pytest.param(
+            "common_types",
+            "DATE",
+            "Nullable(String)",
+            date2String_values,
+            "",
+            "date2String",
+            id="common_types_23",
+        ),
+        pytest.param(
+            "common_types",
+            "binary(1)",
+            "Nullable(FixedString(1))",
+            [1],
+            [1],
+            "",
+            id="common_types_24",
+        ),
+        pytest.param(
+            "common_types",
+            "binary(0)",
+            "Nullable(FixedString(1))",
+            ["NULL"],
+            ["\\N"],
+            "",
+            id="common_types_25",
+        ),
+        pytest.param(
+            "decimal_default",
+            "decimal NOT NULL",
+            "Decimal(10, 0)",
+            decimal_values,
+            "",
+            "decimal,datetime64",
+            id="decimal_1",
+        ),
+        pytest.param(
+            "decimal_default_nullable",
+            "decimal",
+            "Nullable(Decimal(10, 0))",
+            decimal_values,
+            "",
+            "decimal,datetime64",
+            id="decimal_2",
+        ),
+        pytest.param(
+            "decimal_18_6",
+            "decimal(18, 6) NOT NULL",
+            "Decimal(18, 6)",
+            decimal_values,
+            "",
+            "decimal,datetime64",
+            id="decimal_3",
+        ),
+        pytest.param(
+            "decimal_38_6",
+            "decimal(38, 6) NOT NULL",
+            "Decimal(38, 6)",
+            decimal_values,
+            "",
+            "decimal,datetime64",
+            id="decimal_4",
+        ),
+        # Due to python DB driver roundtrip MySQL timestamp and datetime values
+        # are printed with 6 digits after decimal point, so to simplify tests a bit,
+        # we only validate precision of 0 and 6.
+        pytest.param(
+            "timestamp_default",
+            "timestamp",
+            "DateTime",
+            timestamp_values,
+            "",
+            "decimal,datetime64",
+            id="timestamp_default",
+        ),
+        pytest.param(
+            "timestamp_6",
+            "timestamp(6)",
+            "DateTime64(6)",
+            timestamp_values,
+            "",
+            "decimal,datetime64",
+            id="timestamp_6",
+        ),
+        pytest.param(
+            "datetime_default",
+            "DATETIME NOT NULL",
+            "DateTime64(0)",
+            timestamp_values,
+            "",
+            "decimal,datetime64",
+            id="datetime_default",
+        ),
+        pytest.param(
+            "datetime_6",
+            "DATETIME(6) NOT NULL",
+            "DateTime64(6)",
+            timestamp_values,
+            "",
+            "decimal,datetime64",
+            id="datetime_6_1",
+        ),
+        pytest.param(
+            "decimal_40_6",
+            "decimal(40, 6) NOT NULL",
+            "Decimal(40, 6)",
+            decimal_values,
+            "",
+            "decimal,datetime64",
+            id="decimal_40_6",
+        ),
+        pytest.param(
+            "decimal_18_6",
+            "decimal(18, 6) NOT NULL",
+            "String",
+            decimal_values,
+            "",
+            "datetime64",
+            id="decimal_18_6_1",
+        ),
+        pytest.param(
+            "decimal_18_6",
+            "decimal(18, 6) NOT NULL",
+            "String",
+            decimal_values,
+            "",
+            "",
+            id="decimal_18_6_2",
+        ),
+        pytest.param(
+            "datetime_6",
+            "DATETIME(6) NOT NULL",
+            "DateTime",
+            timestamp_values_no_subsecond,
+            "",
+            "decimal",
+            id="datetime_6_2",
+        ),
+        pytest.param(
+            "datetime_6",
+            "DATETIME(6) NOT NULL",
+            "DateTime",
+            timestamp_values_no_subsecond,
+            "",
+            "",
+            id="datetime_6_3",
+        ),
+    ],
+)
+def test_mysql_types(
+    started_cluster,
+    case_name,
+    mysql_type,
+    expected_ch_type,
+    mysql_values,
+    expected_clickhouse_values,
+    setting_mysql_datatypes_support_level,
+):
+    """Verify that values written to MySQL can be read on ClickHouse side via DB engine MySQL,
+    or Table engine MySQL, or mysql() table function.
+    Make sure that type is converted properly and values match exactly.
+    """
+
+    substitutes = dict(
+        mysql_db="decimal_support",
+        table_name=case_name,
+        mysql_type=mysql_type,
+        mysql_values=", ".join("({})".format(x) for x in mysql_values),
+        ch_mysql_db="mysql_db",
+        ch_mysql_table="mysql_table_engine_" + case_name,
+        expected_ch_type=expected_ch_type,
+    )
+
+    clickhouse_query_settings = dict(
+        mysql_datatypes_support_level=setting_mysql_datatypes_support_level,
+        output_format_decimal_trailing_zeros=1,
+    )
+
+    def execute_query(node, query, **kwargs):
+        def do_execute(query):
+            query = Template(query).safe_substitute(substitutes)
+            res = node.query(query, **kwargs)
+            return res if isinstance(res, int) else res.rstrip("\n\r")
+
+        if isinstance(query, (str, bytes)):
+            return do_execute(query)
+        else:
+            return [do_execute(q) for q in query]
+
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            port=started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        execute_query(
+            mysql_node,
+            [
+                "DROP DATABASE IF EXISTS ${mysql_db}",
+                "CREATE DATABASE ${mysql_db}  DEFAULT CHARACTER SET 'utf8'",
+                "CREATE TABLE `${mysql_db}`.`${table_name}` (value ${mysql_type})",
+                "INSERT INTO `${mysql_db}`.`${table_name}` (value) VALUES ${mysql_values}",
+                "SELECT * FROM `${mysql_db}`.`${table_name}`",
+                "FLUSH TABLES",
+            ],
+        )
+
+        assert execute_query(
+            mysql_node, "SELECT COUNT(*) FROM ${mysql_db}.${table_name}"
+        ) == "{}".format(len(mysql_values))
+
+        # MySQL TABLE ENGINE
+        execute_query(
+            clickhouse_node,
+            [
+                "DROP TABLE IF EXISTS ${ch_mysql_table};",
+                "CREATE TABLE ${ch_mysql_table} (value ${expected_ch_type}) ENGINE = MySQL('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
+            ],
+            settings=clickhouse_query_settings,
+        )
+
+        # Validate type
+        assert (
+            execute_query(
+                clickhouse_node,
+                "SELECT toTypeName(value) FROM ${ch_mysql_table} LIMIT 1",
+                settings=clickhouse_query_settings,
+            )
+            == expected_ch_type
+        )
+
+        expected_format_clickhouse_values = arryToString(expected_clickhouse_values)
+        if expected_format_clickhouse_values == "":
+            expected_format_clickhouse_values = execute_query(
+                mysql_node, "SELECT value FROM ${mysql_db}.${table_name}"
+            )
+
+        # Validate values
+        assert expected_format_clickhouse_values == execute_query(
+            clickhouse_node,
+            "SELECT value FROM ${ch_mysql_table}",
+            settings=clickhouse_query_settings,
+        )
+
+        # MySQL DATABASE ENGINE
+        execute_query(
+            clickhouse_node,
+            [
+                "DROP DATABASE IF EXISTS ${ch_mysql_db}",
+                "CREATE DATABASE ${ch_mysql_db} ENGINE = MySQL('mysql57:3306', '${mysql_db}', 'root', 'clickhouse')",
+            ],
+            settings=clickhouse_query_settings,
+        )
+
+        # Validate type
+        assert (
+            execute_query(
+                clickhouse_node,
+                "SELECT toTypeName(value) FROM ${ch_mysql_db}.${table_name} LIMIT 1",
+                settings=clickhouse_query_settings,
+            )
+            == expected_ch_type
+        )
+
+        # Validate values
+        assert expected_format_clickhouse_values == execute_query(
+            clickhouse_node,
+            "SELECT value FROM ${ch_mysql_db}.${table_name}",
+            settings=clickhouse_query_settings,
+        )
+
+        # MySQL TABLE FUNCTION
+        # Validate type
+        assert (
+            execute_query(
+                clickhouse_node,
+                "SELECT toTypeName(value) FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse') LIMIT 1",
+                settings=clickhouse_query_settings,
+            )
+            == expected_ch_type
+        )
+
+        # Validate values
+        assert expected_format_clickhouse_values == execute_query(
+            clickhouse_node,
+            "SELECT value FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
+            settings=clickhouse_query_settings,
+        )
+
+
+def test_predefined_connection_configuration(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_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(mysql1)")
+        clickhouse_node.query(
+            "INSERT INTO `test_database`.`test_table` select number from numbers(100)"
+        )
+        assert (
+            clickhouse_node.query(
+                "SELECT count() FROM `test_database`.`test_table`"
+            ).rstrip()
+            == "100"
+        )
+
+        result = clickhouse_node.query("show create table test_database.test_table")
+        assert (
+            result.strip()
+            == "CREATE TABLE test_database.test_table\\n(\\n    `id` Int32\\n)\\nENGINE = MySQL(mysql1, `table` = \\'test_table\\')"
+        )
+
+        clickhouse_node.query("DROP DATABASE test_database")
+        clickhouse_node.query_and_get_error(
+            "CREATE DATABASE test_database ENGINE = MySQL(mysql2)"
+        )
+        clickhouse_node.query_and_get_error(
+            "CREATE DATABASE test_database ENGINE = MySQL(unknown_collection)"
+        )
+        clickhouse_node.query_and_get_error(
+            "CREATE DATABASE test_database ENGINE = MySQL(mysql1, 1)"
+        )
+
+        clickhouse_node.query(
+            "CREATE DATABASE test_database ENGINE = MySQL(mysql1, port=3306)"
+        )
+        assert (
+            clickhouse_node.query(
+                "SELECT count() FROM `test_database`.`test_table`"
+            ).rstrip()
+            == "100"
+        )
+
+
+def test_restart_server(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_port,
+        )
+    ) as mysql_node:
+        mysql_node.query("DROP DATABASE IF EXISTS test_restart")
+        clickhouse_node.query("DROP DATABASE IF EXISTS test_restart")
+        clickhouse_node.query_and_get_error(
+            "CREATE DATABASE test_restart ENGINE = MySQL('mysql57:3306', 'test_restart', 'root', 'clickhouse')"
+        )
+        assert "test_restart" not in clickhouse_node.query("SHOW DATABASES")
+
+        mysql_node.query("CREATE DATABASE test_restart DEFAULT CHARACTER SET 'utf8'")
+        mysql_node.query(
+            "CREATE TABLE `test_restart`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;"
+        )
+        clickhouse_node.query(
+            "CREATE DATABASE test_restart ENGINE = MySQL('mysql57:3306', 'test_restart', 'root', 'clickhouse')"
+        )
+
+        assert "test_restart" in clickhouse_node.query("SHOW DATABASES")
+        assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_restart")
+
+        with PartitionManager() as pm:
+            pm.partition_instances(
+                clickhouse_node, mysql_node, action="REJECT --reject-with tcp-reset"
+            )
+            clickhouse_node.restart_clickhouse()
+            clickhouse_node.query_and_get_error_with_retry(
+                "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.mysql57_ip,
+            started_cluster.mysql57_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()
+
+
+def test_password_leak(started_cluster):
+    with contextlib.closing(
+        MySQLNodeInstance(
+            "root",
+            "clickhouse",
+            started_cluster.mysql57_ip,
+            started_cluster.mysql57_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"
+        )
+        assert "clickhouse" not in clickhouse_node.query(
+            "SHOW CREATE test_database.test_table"
+        )
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 3b65536f20f..22be308b5a8 100644
--- a/tests/integration/test_mysql_database_engine/configs/named_collections.xml
+++ b/tests/integration/test_mysql_database_engine/configs/named_collections.xml
@@ -3,7 +3,7 @@
         <mysql1>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>test_database</database>
         </mysql1>
@@ -15,7 +15,7 @@
         <mysql3>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>1111</port>
             <database>clickhouse</database>
         </mysql3>
diff --git a/tests/integration/test_mysql_database_engine/test.py b/tests/integration/test_mysql_database_engine/test.py
index 00b5eb9e8aa..44c23374b3a 100644
--- a/tests/integration/test_mysql_database_engine/test.py
+++ b/tests/integration/test_mysql_database_engine/test.py
@@ -13,7 +13,7 @@ clickhouse_node = cluster.add_instance(
     "node1",
     main_configs=["configs/remote_servers.xml", "configs/named_collections.xml"],
     user_configs=["configs/users.xml"],
-    with_mysql=True,
+    with_mysql8=True,
     stay_alive=True,
 )
 
@@ -70,7 +70,7 @@ class MySQLNodeInstance:
 def test_mysql_ddl_for_mysql_database(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -78,7 +78,7 @@ def test_mysql_ddl_for_mysql_database(started_cluster):
 
         clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
         clickhouse_node.query(
-            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse')"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', 'test_database', 'root', 'clickhouse')"
         )
         assert "test_database" in clickhouse_node.query("SHOW DATABASES")
 
@@ -121,7 +121,7 @@ def test_mysql_ddl_for_mysql_database(started_cluster):
 def test_clickhouse_ddl_for_mysql_database(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -132,7 +132,7 @@ def test_clickhouse_ddl_for_mysql_database(started_cluster):
 
         clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
         clickhouse_node.query(
-            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse')"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', 'test_database', 'root', 'clickhouse')"
         )
 
         assert "test_table" in clickhouse_node.query("SHOW TABLES FROM test_database")
@@ -158,7 +158,7 @@ def test_clickhouse_ddl_for_mysql_database(started_cluster):
 def test_clickhouse_dml_for_mysql_database(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -169,7 +169,7 @@ def test_clickhouse_dml_for_mysql_database(started_cluster):
 
         clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
         clickhouse_node.query(
-            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', test_database, 'root', 'clickhouse')"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', test_database, 'root', 'clickhouse')"
         )
 
         assert (
@@ -197,7 +197,7 @@ def test_clickhouse_dml_for_mysql_database(started_cluster):
 def test_clickhouse_join_for_mysql_database(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test")
@@ -218,10 +218,10 @@ def test_clickhouse_join_for_mysql_database(started_cluster):
         clickhouse_node.query("DROP TABLE IF EXISTS default.t1_remote_mysql SYNC")
         clickhouse_node.query("DROP TABLE IF EXISTS default.t2_remote_mysql SYNC")
         clickhouse_node.query(
-            "CREATE TABLE default.t1_remote_mysql AS mysql('mysql57:3306','test','t1_mysql_local','root','clickhouse')"
+            "CREATE TABLE default.t1_remote_mysql AS mysql('mysql80:3306','test','t1_mysql_local','root','clickhouse')"
         )
         clickhouse_node.query(
-            "CREATE TABLE default.t2_remote_mysql AS mysql('mysql57:3306','test','t2_mysql_local','root','clickhouse')"
+            "CREATE TABLE default.t2_remote_mysql AS mysql('mysql80:3306','test','t2_mysql_local','root','clickhouse')"
         )
         clickhouse_node.query(
             "INSERT INTO `default`.`t1_remote_mysql` VALUES ('EN','A',''),('RU','B','AAA')"
@@ -248,8 +248,8 @@ def test_bad_arguments_for_mysql_database_engine(started_cluster):
         MySQLNodeInstance(
             "root",
             "clickhouse",
-            started_cluster.mysql_ip,
-            port=started_cluster.mysql_port,
+            started_cluster.mysql8_ip,
+            port=started_cluster.mysql8_port,
         )
     ) as mysql_node:
         with pytest.raises(QueryRuntimeException) as exception:
@@ -257,7 +257,7 @@ def test_bad_arguments_for_mysql_database_engine(started_cluster):
                 "CREATE DATABASE IF NOT EXISTS test_bad_arguments DEFAULT CHARACTER SET 'utf8'"
             )
             clickhouse_node.query(
-                "CREATE DATABASE test_database_bad_arguments ENGINE = MySQL('mysql57:3306', test_bad_arguments, root, 'clickhouse')"
+                "CREATE DATABASE test_database_bad_arguments ENGINE = MySQL('mysql80:3306', test_bad_arguments, root, 'clickhouse')"
             )
         assert "Database engine MySQL requested literal argument." in str(
             exception.value
@@ -268,7 +268,7 @@ def test_bad_arguments_for_mysql_database_engine(started_cluster):
 def test_column_comments_for_mysql_database_engine(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -276,7 +276,7 @@ def test_column_comments_for_mysql_database_engine(started_cluster):
 
         clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
         clickhouse_node.query(
-            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', 'test_database', 'root', 'clickhouse')"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', 'test_database', 'root', 'clickhouse')"
         )
         assert "test_database" in clickhouse_node.query("SHOW DATABASES")
 
@@ -304,7 +304,7 @@ def test_column_comments_for_mysql_database_engine(started_cluster):
 def test_data_types_support_level_for_mysql_database_engine(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test")
@@ -313,7 +313,7 @@ def test_data_types_support_level_for_mysql_database_engine(started_cluster):
         )
         clickhouse_node.query("DROP DATABASE IF EXISTS test_database")
         clickhouse_node.query(
-            "CREATE DATABASE test_database ENGINE = MySQL('mysql57:3306', test, 'root', 'clickhouse')",
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', test, 'root', 'clickhouse')",
             settings={"mysql_datatypes_support_level": "decimal,datetime64"},
         )
 
@@ -331,7 +331,7 @@ def test_data_types_support_level_for_mysql_database_engine(started_cluster):
         )
 
         clickhouse_node.query(
-            "CREATE DATABASE test_database_1 ENGINE = MySQL('mysql57:3306', test, 'root', 'clickhouse') SETTINGS mysql_datatypes_support_level = 'decimal,datetime64'",
+            "CREATE DATABASE test_database_1 ENGINE = MySQL('mysql80:3306', test, 'root', 'clickhouse') SETTINGS mysql_datatypes_support_level = 'decimal,datetime64'",
             settings={"mysql_datatypes_support_level": "decimal"},
         )
 
@@ -693,7 +693,7 @@ def arryToString(expected_clickhouse_values):
         pytest.param(
             "timestamp_default",
             "timestamp",
-            "DateTime",
+            "Nullable(DateTime)",
             timestamp_values,
             "",
             "decimal,datetime64",
@@ -702,7 +702,7 @@ def arryToString(expected_clickhouse_values):
         pytest.param(
             "timestamp_6",
             "timestamp(6)",
-            "DateTime64(6)",
+            "Nullable(DateTime64(6))",
             timestamp_values,
             "",
             "decimal,datetime64",
@@ -817,8 +817,8 @@ def test_mysql_types(
         MySQLNodeInstance(
             "root",
             "clickhouse",
-            started_cluster.mysql_ip,
-            port=started_cluster.mysql_port,
+            started_cluster.mysql8_ip,
+            port=started_cluster.mysql8_port,
         )
     ) as mysql_node:
         execute_query(
@@ -842,7 +842,7 @@ def test_mysql_types(
             clickhouse_node,
             [
                 "DROP TABLE IF EXISTS ${ch_mysql_table};",
-                "CREATE TABLE ${ch_mysql_table} (value ${expected_ch_type}) ENGINE = MySQL('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
+                "CREATE TABLE ${ch_mysql_table} (value ${expected_ch_type}) ENGINE = MySQL('mysql80:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
             ],
             settings=clickhouse_query_settings,
         )
@@ -875,7 +875,7 @@ def test_mysql_types(
             clickhouse_node,
             [
                 "DROP DATABASE IF EXISTS ${ch_mysql_db}",
-                "CREATE DATABASE ${ch_mysql_db} ENGINE = MySQL('mysql57:3306', '${mysql_db}', 'root', 'clickhouse')",
+                "CREATE DATABASE ${ch_mysql_db} ENGINE = MySQL('mysql80:3306', '${mysql_db}', 'root', 'clickhouse')",
             ],
             settings=clickhouse_query_settings,
         )
@@ -902,7 +902,7 @@ def test_mysql_types(
         assert (
             execute_query(
                 clickhouse_node,
-                "SELECT toTypeName(value) FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse') LIMIT 1",
+                "SELECT toTypeName(value) FROM mysql('mysql80:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse') LIMIT 1",
                 settings=clickhouse_query_settings,
             )
             == expected_ch_type
@@ -911,7 +911,7 @@ def test_mysql_types(
         # Validate values
         assert expected_format_clickhouse_values == execute_query(
             clickhouse_node,
-            "SELECT value FROM mysql('mysql57:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
+            "SELECT value FROM mysql('mysql80:3306', '${mysql_db}', '${table_name}', 'root', 'clickhouse')",
             settings=clickhouse_query_settings,
         )
 
@@ -919,7 +919,7 @@ def test_mysql_types(
 def test_predefined_connection_configuration(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -943,7 +943,7 @@ def test_predefined_connection_configuration(started_cluster):
         result = clickhouse_node.query("show create table test_database.test_table")
         assert (
             result.strip()
-            == "CREATE TABLE test_database.test_table\\n(\\n    `id` Int32\\n)\\nENGINE = MySQL(mysql1, table = \\'test_table\\')"
+            == "CREATE TABLE test_database.test_table\\n(\\n    `id` Int32\\n)\\nENGINE = MySQL(mysql1, `table` = \\'test_table\\')"
         )
 
         clickhouse_node.query("DROP DATABASE test_database")
@@ -971,13 +971,13 @@ def test_predefined_connection_configuration(started_cluster):
 def test_restart_server(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_restart")
         clickhouse_node.query("DROP DATABASE IF EXISTS test_restart")
         clickhouse_node.query_and_get_error(
-            "CREATE DATABASE test_restart ENGINE = MySQL('mysql57:3306', 'test_restart', 'root', 'clickhouse')"
+            "CREATE DATABASE test_restart ENGINE = MySQL('mysql80:3306', 'test_restart', 'root', 'clickhouse')"
         )
         assert "test_restart" not in clickhouse_node.query("SHOW DATABASES")
 
@@ -986,7 +986,7 @@ def test_restart_server(started_cluster):
             "CREATE TABLE `test_restart`.`test_table` ( `id` int(11) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB;"
         )
         clickhouse_node.query(
-            "CREATE DATABASE test_restart ENGINE = MySQL('mysql57:3306', 'test_restart', 'root', 'clickhouse')"
+            "CREATE DATABASE test_restart ENGINE = MySQL('mysql80:3306', 'test_restart', 'root', 'clickhouse')"
         )
 
         assert "test_restart" in clickhouse_node.query("SHOW DATABASES")
@@ -1004,7 +1004,7 @@ def test_restart_server(started_cluster):
 def test_memory_leak(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -1015,7 +1015,7 @@ def test_memory_leak(started_cluster):
 
         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"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', 'test_database', 'root', 'clickhouse') SETTINGS connection_auto_close = 1"
         )
         clickhouse_node.query("SELECT count() FROM `test_database`.`test_table`")
 
@@ -1026,7 +1026,7 @@ def test_memory_leak(started_cluster):
 def test_password_leak(started_cluster):
     with contextlib.closing(
         MySQLNodeInstance(
-            "root", "clickhouse", started_cluster.mysql_ip, started_cluster.mysql_port
+            "root", "clickhouse", started_cluster.mysql8_ip, started_cluster.mysql8_port
         )
     ) as mysql_node:
         mysql_node.query("DROP DATABASE IF EXISTS test_database")
@@ -1037,7 +1037,7 @@ def test_password_leak(started_cluster):
 
         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"
+            "CREATE DATABASE test_database ENGINE = MySQL('mysql80:3306', 'test_database', 'root', 'clickhouse') SETTINGS connection_auto_close = 1"
         )
         assert "clickhouse" not in clickhouse_node.query(
             "SHOW CREATE test_database.test_table"
diff --git a/tests/integration/test_mysql_protocol/test.py b/tests/integration/test_mysql_protocol/test.py
index 7a69d07633c..094ae7b9fd0 100644
--- a/tests/integration/test_mysql_protocol/test.py
+++ b/tests/integration/test_mysql_protocol/test.py
@@ -12,11 +12,16 @@ from typing import Literal
 import docker
 import pymysql.connections
 import pytest
-from helpers.cluster import ClickHouseCluster, get_docker_compose_path, run_and_check
+from helpers.cluster import (
+    ClickHouseCluster,
+    get_docker_compose_path,
+    run_and_check,
+)
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 DOCKER_COMPOSE_PATH = get_docker_compose_path()
 
+
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
diff --git a/tests/integration/test_odbc_interaction/test.py b/tests/integration/test_odbc_interaction/test.py
index e8b3ba3fcf3..06cbe70f7c6 100644
--- a/tests/integration/test_odbc_interaction/test.py
+++ b/tests/integration/test_odbc_interaction/test.py
@@ -14,7 +14,7 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_odbc_drivers=True,
-    with_mysql=True,
+    with_mysql8=True,
     with_postgres=True,
     main_configs=["configs/openssl.xml", "configs/odbc_logging.xml"],
     dictionaries=[
@@ -55,13 +55,13 @@ def get_mysql_conn():
                 conn = pymysql.connect(
                     user="root",
                     password="clickhouse",
-                    host=cluster.mysql_ip,
-                    port=cluster.mysql_port,
+                    host=cluster.mysql8_ip,
+                    port=cluster.mysql8_port,
                 )
             else:
                 conn.ping(reconnect=True)
             logging.debug(
-                f"MySQL Connection establised: {cluster.mysql_ip}:{cluster.mysql_port}"
+                f"MySQL Connection establised: {cluster.mysql8_ip}:{cluster.mysql8_port}"
             )
             return conn
         except Exception as e:
@@ -230,7 +230,7 @@ def test_mysql_simple_select_works(started_cluster):
 
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, column_x Nullable(UInt32)) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, column_x Nullable(UInt32)) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse');
 """.format(
             table_name, table_name
         )
diff --git a/tests/integration/test_odbc_interaction/test_exiled.py b/tests/integration/test_odbc_interaction/test_exiled.py
deleted file mode 100644
index bdc819b8221..00000000000
--- a/tests/integration/test_odbc_interaction/test_exiled.py
+++ /dev/null
@@ -1,111 +0,0 @@
-import time
-import logging
-import pytest
-
-from helpers.cluster import ClickHouseCluster, assert_eq_with_retry
-from test_odbc_interaction.test import (
-    create_mysql_db,
-    create_mysql_table,
-    get_mysql_conn,
-    skip_test_msan,
-)
-
-
-cluster = ClickHouseCluster(__file__)
-node1 = cluster.add_instance(
-    "node1",
-    with_odbc_drivers=True,
-    main_configs=["configs/openssl.xml", "configs/odbc_logging.xml"],
-    stay_alive=True,
-    dictionaries=["configs/dictionaries/sqlite3_odbc_hashed_dictionary.xml"],
-)
-
-
-@pytest.fixture(scope="module")
-def started_cluster():
-    try:
-        cluster.start()
-
-        sqlite_db = node1.odbc_drivers["SQLite3"]["Database"]
-        logging.debug(f"sqlite data received: {sqlite_db}")
-        node1.exec_in_container(
-            [
-                "sqlite3",
-                sqlite_db,
-                "CREATE TABLE t2(id INTEGER PRIMARY KEY ASC, X INTEGER, Y, Z);",
-            ],
-            privileged=True,
-            user="root",
-        )
-
-        node1.exec_in_container(
-            ["sqlite3", sqlite_db, "INSERT INTO t2 values(1, 1, 2, 3);"],
-            privileged=True,
-            user="root",
-        )
-
-        node1.query("SYSTEM RELOAD DICTIONARY sqlite3_odbc_hashed")
-
-        yield cluster
-    except Exception as ex:
-        logging.exception(ex)
-        raise ex
-    finally:
-        cluster.shutdown()
-
-
-# This test kills ClickHouse server and ODBC bridge and in worst scenario
-# may cause group test crashes. Thus, this test is executed in a separate "module"
-# with separate environment.
-def test_bridge_dies_with_parent(started_cluster):
-    skip_test_msan(node1)
-
-    if node1.is_built_with_address_sanitizer():
-        # TODO: Leak sanitizer falsely reports about a leak of 16 bytes in clickhouse-odbc-bridge in this test and
-        # that's linked somehow with that we have replaced getauxval() in glibc-compatibility.
-        # The leak sanitizer calls getauxval() for its own purposes, and our replaced version doesn't seem to be equivalent in that case.
-        pytest.skip(
-            "Leak sanitizer falsely reports about a leak of 16 bytes in clickhouse-odbc-bridge"
-        )
-
-    assert_eq_with_retry(
-        node1, "select dictGetUInt8('sqlite3_odbc_hashed', 'Z', toUInt64(1))", "3"
-    )
-
-    clickhouse_pid = node1.get_process_pid("clickhouse server")
-    bridge_pid = node1.get_process_pid("odbc-bridge")
-    assert clickhouse_pid is not None
-    assert bridge_pid is not None
-
-    try:
-        node1.exec_in_container(
-            ["kill", str(clickhouse_pid)], privileged=True, user="root"
-        )
-    except:
-        pass
-
-    for _ in range(30):
-        time.sleep(1)
-        clickhouse_pid = node1.get_process_pid("clickhouse server")
-        if clickhouse_pid is None:
-            break
-
-    for _ in range(30):
-        time.sleep(1)  # just for sure, that odbc-bridge caught signal
-        bridge_pid = node1.get_process_pid("odbc-bridge")
-        if bridge_pid is None:
-            break
-
-    if bridge_pid:
-        out = node1.exec_in_container(
-            ["gdb", "-p", str(bridge_pid), "--ex", "thread apply all bt", "--ex", "q"],
-            privileged=True,
-            user="root",
-        )
-        logging.debug(f"Bridge is running, gdb output:\n{out}")
-
-    try:
-        assert clickhouse_pid is None
-        assert bridge_pid is None
-    finally:
-        node1.start_clickhouse(20)
diff --git a/tests/integration/test_old_versions/test.py b/tests/integration/test_old_versions/test.py
index b59bfcc4f6b..a5e62a380bf 100644
--- a/tests/integration/test_old_versions/test.py
+++ b/tests/integration/test_old_versions/test.py
@@ -1,66 +1,17 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.test_tools import assert_eq_with_retry
 
 cluster = ClickHouseCluster(__file__)
-node18_14 = cluster.add_instance(
-    "node18_14",
-    image="yandex/clickhouse-server",
-    tag="18.14.19",
+node_oldest = cluster.add_instance(
+    "node_oldest",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
 )
-node19_1 = cluster.add_instance(
-    "node19_1",
-    image="yandex/clickhouse-server",
-    tag="19.1.16",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-node19_4 = cluster.add_instance(
-    "node19_4",
-    image="yandex/clickhouse-server",
-    tag="19.4.5.35",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-node19_8 = cluster.add_instance(
-    "node19_8",
-    image="yandex/clickhouse-server",
-    tag="19.8.3.8",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-node19_11 = cluster.add_instance(
-    "node19_11",
-    image="yandex/clickhouse-server",
-    tag="19.11.13.74",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-node19_13 = cluster.add_instance(
-    "node19_13",
-    image="yandex/clickhouse-server",
-    tag="19.13.7.57",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-node19_16 = cluster.add_instance(
-    "node19_16",
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
-    with_installed_binary=True,
-    main_configs=["configs/config.d/test_cluster.xml"],
-    allow_analyzer=False,
-)
-old_nodes = [node18_14, node19_1, node19_4, node19_8, node19_11, node19_13, node19_16]
+old_nodes = [node_oldest]
 new_node = cluster.add_instance("node_new")
 
 
@@ -127,18 +78,17 @@ def test_server_is_older_than_client(setup_nodes):
 
 
 def test_distributed_query_initiator_is_older_than_shard(setup_nodes):
-    distributed_query_initiator_old_nodes = [node18_14, node19_13, node19_16]
     shard = new_node
-    for i, initiator in enumerate(distributed_query_initiator_old_nodes):
+    for i, initiator in enumerate(old_nodes):
         initiator.query("INSERT INTO dist_table VALUES (3, {})".format(i))
 
     assert_eq_with_retry(
         shard,
         "SELECT COUNT() FROM test_table WHERE id=3",
-        str(len(distributed_query_initiator_old_nodes)),
+        str(len(old_nodes)),
     )
     assert_eq_with_retry(
         initiator,
         "SELECT COUNT() FROM dist_table WHERE id=3",
-        str(len(distributed_query_initiator_old_nodes)),
+        str(len(old_nodes)),
     )
diff --git a/tests/integration/test_parallel_replicas_custom_key_failover/test.py b/tests/integration/test_parallel_replicas_custom_key_failover/test.py
index 2b5aa2682d5..bbb8fd5abb0 100644
--- a/tests/integration/test_parallel_replicas_custom_key_failover/test.py
+++ b/tests/integration/test_parallel_replicas_custom_key_failover/test.py
@@ -34,20 +34,6 @@ def create_tables(cluster, table_name):
         f"CREATE TABLE IF NOT EXISTS {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r3') ORDER BY (key)"
     )
 
-    # create distributed table
-    node1.query(f"DROP TABLE IF EXISTS {table_name}_d SYNC")
-    node1.query(
-        f"""
-            CREATE TABLE {table_name}_d AS {table_name}
-            Engine=Distributed(
-                {cluster},
-                currentDatabase(),
-                {table_name},
-                key
-            )
-            """
-    )
-
     # populate data
     node1.query(
         f"INSERT INTO {table_name} SELECT number % 4, number FROM numbers(1000)"
@@ -75,10 +61,10 @@ def test_parallel_replicas_custom_key_failover(
     filter_type,
     prefer_localhost_replica,
 ):
-    cluster = "test_single_shard_multiple_replicas"
+    cluster_name = "test_single_shard_multiple_replicas"
     table = "test_table"
 
-    create_tables(cluster, table)
+    create_tables(cluster_name, table)
 
     expected_result = ""
     for i in range(4):
@@ -87,7 +73,7 @@ def test_parallel_replicas_custom_key_failover(
     log_comment = uuid.uuid4()
     assert (
         node1.query(
-            f"SELECT key, count() FROM {table}_d GROUP BY key ORDER BY key",
+            f"SELECT key, count() FROM cluster('{cluster_name}', currentDatabase(), test_table) GROUP BY key ORDER BY key",
             settings={
                 "log_comment": log_comment,
                 "prefer_localhost_replica": prefer_localhost_replica,
@@ -95,8 +81,10 @@ def test_parallel_replicas_custom_key_failover(
                 "parallel_replicas_custom_key": custom_key,
                 "parallel_replicas_custom_key_filter_type": filter_type,
                 "use_hedged_requests": use_hedged_requests,
-                # "async_socket_for_remote": 0,
-                # "async_query_sending_for_remote": 0,
+                # avoid considering replica delay on connection choice
+                # otherwise connection can be not distributed evenly among available nodes
+                # and so custom key secondary queries (we check it bellow)
+                "max_replica_delay_for_distributed_queries": 0,
             },
         )
         == expected_result
@@ -115,14 +103,17 @@ def test_parallel_replicas_custom_key_failover(
     if prefer_localhost_replica == 0:
         assert (
             node1.query(
-                f"SELECT 'subqueries', count() FROM clusterAllReplicas({cluster}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' AND query_id != initial_query_id SETTINGS skip_unavailable_shards=1"
+                f"SELECT 'subqueries', count() FROM clusterAllReplicas({cluster_name}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' AND query_id != initial_query_id SETTINGS skip_unavailable_shards=1"
             )
             == "subqueries\t4\n"
         )
 
-        assert (
-            node1.query(
-                f"SELECT h, count() FROM clusterAllReplicas({cluster}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' GROUP BY hostname() as h SETTINGS skip_unavailable_shards=1"
+        # With enabled hedged requests, we can't guarantee exact query distribution among nodes
+        # In case of a replica being slow in terms of responsiveness, hedged connection can change initial replicas choice
+        if use_hedged_requests == 0:
+            assert (
+                node1.query(
+                    f"SELECT h, count() FROM clusterAllReplicas({cluster_name}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' GROUP BY hostname() as h ORDER BY h SETTINGS skip_unavailable_shards=1"
+                )
+                == "n1\t3\nn3\t2\n"
             )
-            == "n1\t3\nn3\t2\n"
-        )
diff --git a/tests/integration/test_parallel_replicas_custom_key_load_balancing/__init__.py b/tests/integration/test_parallel_replicas_custom_key_load_balancing/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_parallel_replicas_custom_key_load_balancing/configs/remote_servers.xml b/tests/integration/test_parallel_replicas_custom_key_load_balancing/configs/remote_servers.xml
new file mode 100644
index 00000000000..8b050571c3f
--- /dev/null
+++ b/tests/integration/test_parallel_replicas_custom_key_load_balancing/configs/remote_servers.xml
@@ -0,0 +1,26 @@
+<clickhouse>
+    <remote_servers>
+        <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_load_balancing/test.py b/tests/integration/test_parallel_replicas_custom_key_load_balancing/test.py
new file mode 100644
index 00000000000..d5e17103296
--- /dev/null
+++ b/tests/integration/test_parallel_replicas_custom_key_load_balancing/test.py
@@ -0,0 +1,121 @@
+import pytest
+import uuid
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance(
+    "n1", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
+)
+node2 = cluster.add_instance(
+    "n2", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
+)
+node3 = cluster.add_instance(
+    "n3", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
+)
+node4 = cluster.add_instance(
+    "n4", main_configs=["configs/remote_servers.xml"], with_zookeeper=True
+)
+
+nodes = [node1, node2, node3, node4]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def create_tables(table_name):
+    for i in range(0, 4):
+        nodes[i].query(f"DROP TABLE IF EXISTS {table_name} SYNC")
+        nodes[i].query(
+            f"CREATE TABLE IF NOT EXISTS {table_name} (key Int64, value String) Engine=ReplicatedMergeTree('/test_parallel_replicas/shard1/{table_name}', 'r{i+1}') ORDER BY (key)"
+        )
+
+    # populate data
+    node1.query(
+        f"INSERT INTO {table_name} SELECT number % 4, number FROM numbers(1000)"
+    )
+    node1.query(
+        f"INSERT INTO {table_name} SELECT number % 4, number FROM numbers(1000, 1000)"
+    )
+    node1.query(
+        f"INSERT INTO {table_name} SELECT number % 4, number FROM numbers(2000, 1000)"
+    )
+    node1.query(
+        f"INSERT INTO {table_name} SELECT number % 4, number FROM numbers(3000, 1000)"
+    )
+    node2.query(f"SYSTEM SYNC REPLICA {table_name}")
+    node3.query(f"SYSTEM SYNC REPLICA {table_name}")
+    node4.query(f"SYSTEM SYNC REPLICA {table_name}")
+
+
+@pytest.mark.parametrize("use_hedged_requests", [1, 0])
+@pytest.mark.parametrize("custom_key", ["sipHash64(key)", "key"])
+@pytest.mark.parametrize("filter_type", ["default", "range"])
+def test_parallel_replicas_custom_key_load_balancing(
+    start_cluster,
+    use_hedged_requests,
+    custom_key,
+    filter_type,
+):
+    cluster_name = "test_single_shard_multiple_replicas"
+    table = "test_table"
+
+    create_tables(table)
+
+    expected_result = ""
+    for i in range(4):
+        expected_result += f"{i}\t1000\n"
+
+    log_comment = uuid.uuid4()
+    assert (
+        node1.query(
+            f"SELECT key, count() FROM cluster('{cluster_name}', currentDatabase(), test_table) GROUP BY key ORDER BY key",
+            settings={
+                "log_comment": log_comment,
+                "prefer_localhost_replica": 0,
+                "max_parallel_replicas": 4,
+                "parallel_replicas_custom_key": custom_key,
+                "parallel_replicas_custom_key_filter_type": filter_type,
+                "use_hedged_requests": use_hedged_requests,
+                # avoid considering replica delay on connection choice
+                # otherwise connection can be not distributed evenly among available nodes
+                # and so custom key secondary queries (we check it bellow)
+                "max_replica_delay_for_distributed_queries": 0,
+            },
+        )
+        == expected_result
+    )
+
+    for node in nodes:
+        node.query("system flush logs")
+
+    # the subqueries should be spread over available nodes
+    query_id = node1.query(
+        f"SELECT query_id FROM system.query_log WHERE current_database = currentDatabase() AND log_comment = '{log_comment}' AND type = 'QueryFinish' AND initial_query_id = query_id"
+    )
+    assert query_id != ""
+    query_id = query_id[:-1]
+
+    assert (
+        node1.query(
+            f"SELECT 'subqueries', count() FROM clusterAllReplicas({cluster_name}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' AND query_id != initial_query_id SETTINGS skip_unavailable_shards=1"
+        )
+        == "subqueries\t4\n"
+    )
+
+    # With enabled hedged requests, we can't guarantee exact query distribution among nodes
+    # In case of a replica being slow in terms of responsiveness, hedged connection can change initial replicas choice
+    if use_hedged_requests == 0:
+        # check queries per node
+        assert (
+            node1.query(
+                f"SELECT h, count() FROM clusterAllReplicas({cluster_name}, system.query_log) WHERE initial_query_id = '{query_id}' AND type ='QueryFinish' GROUP BY hostname() as h ORDER BY h SETTINGS skip_unavailable_shards=1"
+            )
+            == "n1\t2\nn2\t1\nn3\t1\nn4\t1\n"
+        )
diff --git a/tests/integration/test_parallel_replicas_invisible_parts/__init__.py b/tests/integration/test_parallel_replicas_invisible_parts/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_backup_restore_on_cluster/configs/remote_servers.xml b/tests/integration/test_parallel_replicas_invisible_parts/configs/remote_servers.xml
similarity index 62%
rename from tests/integration/test_backup_restore_on_cluster/configs/remote_servers.xml
rename to tests/integration/test_parallel_replicas_invisible_parts/configs/remote_servers.xml
index c3bb226c1f4..4f1217df38b 100644
--- a/tests/integration/test_backup_restore_on_cluster/configs/remote_servers.xml
+++ b/tests/integration/test_parallel_replicas_invisible_parts/configs/remote_servers.xml
@@ -1,27 +1,11 @@
 <clickhouse>
     <remote_servers>
-        <cluster>
+        <parallel_replicas>
             <shard>
                 <replica>
-                    <host>node1</host>
+                    <host>node0</host>
                     <port>9000</port>
                 </replica>
-                <replica>
-                    <host>node2</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster>
-        <cluster1>
-            <shard>
-                <replica>
-                    <host>node1</host>
-                    <port>9000</port>
-                </replica>
-            </shard>
-        </cluster1>
-        <cluster3>
-            <shard>
                 <replica>
                     <host>node1</host>
                     <port>9000</port>
@@ -34,7 +18,11 @@
                     <host>node3</host>
                     <port>9000</port>
                 </replica>
+                <replica>
+                    <host>node4</host>
+                    <port>9000</port>
+                </replica>
             </shard>
-        </cluster3>
+        </parallel_replicas>
     </remote_servers>
 </clickhouse>
diff --git a/tests/integration/test_parallel_replicas_invisible_parts/test.py b/tests/integration/test_parallel_replicas_invisible_parts/test.py
new file mode 100644
index 00000000000..cab3fb46fe9
--- /dev/null
+++ b/tests/integration/test_parallel_replicas_invisible_parts/test.py
@@ -0,0 +1,130 @@
+# We had a couple of bugs where difference in snapshots on replicas (totally normal situation) lead to wrong query result:
+# #58722 - some marks were assigned more than once to different replicas because mark segments were not properly cleaned up after moving between queues
+# #58844 - replica was assigned reading from a part it didn't see
+# In this test we emulate a situation when each replica has unique snapshot of data parts.
+# Specifically each of 5 nodes sees 10 parts, half of these parts is common for all nodes, the other half is unique for the specific node.
+# This way we will trigger the logic that caused problems in the first issue, because none of the nodes will have all the parts from main node's snapshot in its own snapshot,
+# also there is a good chance to schedule reading from one of unique parts to a replica that doesn't see them if something is off with visibility checks.
+
+import pytest
+
+from helpers.cluster import ClickHouseCluster
+
+cluster = ClickHouseCluster(__file__)
+cluster_name = "parallel_replicas"
+total_parts = 10
+
+nodes = [
+    cluster.add_instance(
+        f"node{num}",
+        main_configs=["configs/remote_servers.xml"],
+        with_zookeeper=True,
+        macros={"replica": f"node{num}", "shard": "shard"},
+    )
+    for num in range(5)
+]
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def _create_tables(table_name, table_size, index_granularity):
+    nodes[0].query(f"DROP TABLE IF EXISTS {table_name} ON CLUSTER {cluster_name}")
+
+    nodes[0].query(
+        f"""
+        CREATE TABLE IF NOT EXISTS {table_name} ON CLUSTER '{cluster_name}' (key Int64, value String)
+        Engine=ReplicatedMergeTree('/test_parallel_replicas/shard/{table_name}/', '{{replica}}')
+        ORDER BY (key)
+        SETTINGS index_granularity = {index_granularity}, max_bytes_to_merge_at_max_space_in_pool = 0, max_bytes_to_merge_at_max_space_in_pool = 1
+        """
+    )
+
+    assert table_size % total_parts == 0 and total_parts % 2 == 0
+    for i in range(total_parts // 2):
+        nodes[0].query(
+            f"""
+            INSERT INTO {table_name}
+            SELECT number, toString(number) FROM numbers_mt({table_size / total_parts})
+            SETTINGS insert_deduplicate = 0
+            """
+        )
+
+    nodes[0].query(f"SYSTEM SYNC REPLICA ON CLUSTER {cluster_name} {table_name}")
+
+    nodes[0].query(f"SYSTEM STOP FETCHES ON CLUSTER {cluster_name} {table_name}")
+
+    for node in nodes:
+        for _ in range(total_parts // 2):
+            node.query(
+                f"""
+                INSERT INTO {table_name}
+                SELECT number, toString(number) FROM numbers_mt({table_size / total_parts})
+                SETTINGS insert_deduplicate = 0
+                """
+            )
+
+
+def _create_query(query_tmpl, table_name):
+    return query_tmpl.format(table_name=table_name)
+
+
+def _get_result_with_parallel_replicas(
+    query, cluster_name, parallel_replicas_mark_segment_size
+):
+    return nodes[0].query(
+        query,
+        settings={
+            "allow_experimental_parallel_reading_from_replicas": 2,
+            "max_parallel_replicas": len(nodes),
+            "cluster_for_parallel_replicas": f"{cluster_name}",
+            "parallel_replicas_mark_segment_size": parallel_replicas_mark_segment_size,
+        },
+    )
+
+
+@pytest.mark.parametrize(
+    "query_tmpl",
+    [
+        "SELECT sum(key) FROM {table_name}",
+    ],
+)
+@pytest.mark.parametrize(
+    "table_size",
+    [1000, 10000, 100000],
+)
+@pytest.mark.parametrize(
+    "index_granularity",
+    [11, 101],
+)
+@pytest.mark.parametrize(
+    "parallel_replicas_mark_segment_size",
+    [1, 11],
+)
+def test_reading_with_invisible_parts(
+    start_cluster,
+    query_tmpl,
+    table_size,
+    index_granularity,
+    parallel_replicas_mark_segment_size,
+):
+    table_name = f"tbl_{len(query_tmpl)}_{cluster_name}_{table_size}_{index_granularity}_{parallel_replicas_mark_segment_size}"
+    _create_tables(table_name, table_size, index_granularity)
+
+    query = _create_query(query_tmpl, table_name)
+
+    assert table_size % total_parts == 0
+    rows_per_part = table_size // total_parts
+    expected = total_parts * ((rows_per_part * (rows_per_part - 1)) // 2)
+    assert (
+        _get_result_with_parallel_replicas(
+            query, cluster_name, parallel_replicas_mark_segment_size
+        )
+        == f"{expected}\n"
+    )
diff --git a/tests/integration/test_placement_info/__init__.py b/tests/integration/test_placement_info/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_placement_info/configs/config_value.xml b/tests/integration/test_placement_info/configs/config_value.xml
new file mode 100644
index 00000000000..d3f1a241962
--- /dev/null
+++ b/tests/integration/test_placement_info/configs/config_value.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <placement>
+        <use_imds>0</use_imds>
+        <availability_zone>ci-test-1b</availability_zone>
+    </placement>
+</clickhouse>
diff --git a/tests/integration/test_placement_info/configs/file_value.xml b/tests/integration/test_placement_info/configs/file_value.xml
new file mode 100644
index 00000000000..636ccacb467
--- /dev/null
+++ b/tests/integration/test_placement_info/configs/file_value.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+    <placement>
+        <use_imds>0</use_imds>
+        <availability_zone_from_file>/tmp/node-zone</availability_zone_from_file>
+    </placement>
+</clickhouse>
diff --git a/tests/integration/test_placement_info/configs/imds.xml b/tests/integration/test_placement_info/configs/imds.xml
new file mode 100644
index 00000000000..5fc8c1ab3dc
--- /dev/null
+++ b/tests/integration/test_placement_info/configs/imds.xml
@@ -0,0 +1,8 @@
+<clickhouse>
+    <s3>
+        <use_environment_credentials>1</use_environment_credentials>
+    </s3>
+    <placement>
+        <use_imds>1</use_imds>
+    </placement>
+</clickhouse>
diff --git a/tests/integration/test_placement_info/configs/imds_bootstrap.xml b/tests/integration/test_placement_info/configs/imds_bootstrap.xml
new file mode 100644
index 00000000000..5b2a77e0663
--- /dev/null
+++ b/tests/integration/test_placement_info/configs/imds_bootstrap.xml
@@ -0,0 +1,9 @@
+<clickhouse>
+    <s3>
+        <use_environment_credentials>1</use_environment_credentials>
+    </s3>
+    <placement>
+        <use_imds>0</use_imds>
+        <availability_zone>ci-placeholder</availability_zone>
+    </placement>
+</clickhouse>
diff --git a/tests/integration/test_placement_info/configs/missing_value.xml b/tests/integration/test_placement_info/configs/missing_value.xml
new file mode 100644
index 00000000000..d37218428b3
--- /dev/null
+++ b/tests/integration/test_placement_info/configs/missing_value.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <placement>
+        <use_imds>0</use_imds>
+    </placement>
+</clickhouse>
diff --git a/tests/integration/test_placement_info/metadata_servers/simple_server.py b/tests/integration/test_placement_info/metadata_servers/simple_server.py
new file mode 100644
index 00000000000..73140a7d776
--- /dev/null
+++ b/tests/integration/test_placement_info/metadata_servers/simple_server.py
@@ -0,0 +1,30 @@
+import http.server
+import sys
+
+
+class RequestHandler(http.server.BaseHTTPRequestHandler):
+    def get_response(self):
+        if self.path == "/":
+            return "OK", 200
+
+        if self.path == "/latest/meta-data/placement/availability-zone":
+            return "ci-test-1a", 200
+
+        # Resource not found.
+        return 404
+
+    def do_HEAD(self):
+        response, code = self.get_response()
+        self.send_response(code)
+        self.send_header("Content-Type", "text/plain")
+        self.send_header("Content-Length", len(response.encode()))
+        self.end_headers()
+        return response, code
+
+    def do_GET(self):
+        response, _ = self.do_HEAD()
+        self.wfile.write(response.encode())
+
+
+httpd = http.server.HTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd.serve_forever()
diff --git a/tests/integration/test_placement_info/test.py b/tests/integration/test_placement_info/test.py
new file mode 100644
index 00000000000..32fd2fa57d7
--- /dev/null
+++ b/tests/integration/test_placement_info/test.py
@@ -0,0 +1,97 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+from helpers.mock_servers import start_mock_servers
+import os
+
+METADATA_SERVER_HOSTNAME = "node_imds"
+METADATA_SERVER_PORT = 8080
+
+cluster = ClickHouseCluster(__file__)
+node_imds = cluster.add_instance(
+    "node_imds",
+    main_configs=["configs/imds_bootstrap.xml"],
+    env_variables={
+        "AWS_EC2_METADATA_SERVICE_ENDPOINT": f"http://{METADATA_SERVER_HOSTNAME}:{METADATA_SERVER_PORT}",
+    },
+    stay_alive=True,
+)
+node_config_value = cluster.add_instance(
+    "node_config_value",
+    main_configs=["configs/config_value.xml"],
+)
+node_file_value = cluster.add_instance(
+    "node_file_value",
+    main_configs=["configs/file_value.xml"],
+    stay_alive=True,
+)
+node_missing_value = cluster.add_instance(
+    "node_missing_value",
+    main_configs=["configs/missing_value.xml"],
+)
+
+
+def start_metadata_server(started_cluster):
+    script_dir = os.path.join(os.path.dirname(__file__), "metadata_servers")
+    start_mock_servers(
+        started_cluster,
+        script_dir,
+        [
+            (
+                "simple_server.py",
+                METADATA_SERVER_HOSTNAME,
+                METADATA_SERVER_PORT,
+            )
+        ],
+    )
+
+
+@pytest.fixture(scope="module", autouse=True)
+def start_cluster():
+    try:
+        cluster.start()
+        start_metadata_server(cluster)
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_placement_info_from_imds():
+    with open(os.path.join(os.path.dirname(__file__), "configs/imds.xml"), "r") as f:
+        node_imds.replace_config(
+            "/etc/clickhouse-server/config.d/imds_bootstrap.xml", f.read()
+        )
+    node_imds.stop_clickhouse(kill=True)
+    node_imds.start_clickhouse()
+
+    node_imds.query("SYSTEM FLUSH LOGS")
+    assert node_imds.contains_in_log(
+        "CloudPlacementInfo: Loaded info: availability_zone: ci-test-1a"
+    )
+
+
+def test_placement_info_from_config():
+    node_config_value.query("SYSTEM FLUSH LOGS")
+    assert node_config_value.contains_in_log(
+        "CloudPlacementInfo: Loaded info: availability_zone: ci-test-1b"
+    )
+
+
+def test_placement_info_from_file():
+    node_file_value.exec_in_container(
+        ["bash", "-c", "echo ci-test-1c > /tmp/node-zone"]
+    )
+
+    node_file_value.stop_clickhouse(kill=True)
+    node_file_value.start_clickhouse()
+
+    node_file_value.query("SYSTEM FLUSH LOGS")
+    assert node_file_value.contains_in_log(
+        "CloudPlacementInfo: Loaded info: availability_zone: ci-test-1c"
+    )
+
+
+def test_placement_info_missing_data():
+    node_missing_value.query("SYSTEM FLUSH LOGS")
+    assert node_missing_value.contains_in_log(
+        "CloudPlacementInfo: Availability zone info not found"
+    )
diff --git a/tests/integration/test_polymorphic_parts/test.py b/tests/integration/test_polymorphic_parts/test.py
index ba9b5ec6cac..2b30170b203 100644
--- a/tests/integration/test_polymorphic_parts/test.py
+++ b/tests/integration/test_polymorphic_parts/test.py
@@ -4,7 +4,7 @@ import string
 import struct
 
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.test_tools import TSV
 from helpers.test_tools import assert_eq_with_retry, exec_query_with_retry
 
@@ -332,7 +332,13 @@ def test_different_part_types_on_replicas(start_cluster, table, part_type):
     for _ in range(3):
         insert_random_data(table, leader, 100)
 
-    leader.query("OPTIMIZE TABLE {} FINAL".format(table))
+    exec_query_with_retry(
+        leader,
+        "OPTIMIZE TABLE {} FINAL".format(table),
+        settings={"optimize_throw_if_noop": 1},
+        silent=True,
+    )
+
     follower.query("SYSTEM SYNC REPLICA {}".format(table), timeout=20)
 
     expected = "{}\t1\n".format(part_type)
@@ -359,11 +365,10 @@ node7 = cluster.add_instance(
     "node7",
     user_configs=["configs_old/users.d/not_optimize_count.xml"],
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node8 = cluster.add_instance(
     "node8",
diff --git a/tests/integration/test_postgresql_database_engine/test.py b/tests/integration/test_postgresql_database_engine/test.py
index ee6c19707f3..c44fa176599 100644
--- a/tests/integration/test_postgresql_database_engine/test.py
+++ b/tests/integration/test_postgresql_database_engine/test.py
@@ -287,7 +287,7 @@ def test_predefined_connection_configuration(started_cluster):
     )
     print(f"kssenii: {result}")
     assert result.strip().endswith(
-        "ENGINE = PostgreSQL(postgres1, table = \\'test_table\\')"
+        "ENGINE = PostgreSQL(postgres1, `table` = \\'test_table\\')"
     )
 
     node1.query(
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 5553f400c0d..5e04c9e4d12 100644
--- a/tests/integration/test_postgresql_replica_database_engine_2/test.py
+++ b/tests/integration/test_postgresql_replica_database_engine_2/test.py
@@ -723,6 +723,7 @@ def test_materialized_view(started_cluster):
     pg_manager.execute(f"INSERT INTO test_table SELECT 3, 4")
     check_tables_are_synchronized(instance, "test_table")
     assert "1\t2\n3\t4" == instance.query("SELECT * FROM mv ORDER BY 1, 2").strip()
+    instance.query("DROP VIEW mv")
     pg_manager.drop_materialized_db()
 
 
@@ -1093,6 +1094,8 @@ def test_dependent_loading(started_cluster):
         f"SELECT toDateTime64('{nested_time}', 6) < toDateTime64('{time}', 6)"
     )
 
+    instance.query(f"DROP TABLE {table} SYNC")
+
 
 if __name__ == "__main__":
     cluster.start()
diff --git a/tests/integration/test_prometheus_endpoint/test.py b/tests/integration/test_prometheus_endpoint/test.py
index 4eedc84b6c4..f140ebdfbe7 100644
--- a/tests/integration/test_prometheus_endpoint/test.py
+++ b/tests/integration/test_prometheus_endpoint/test.py
@@ -40,6 +40,8 @@ def get_and_check_metrics(retries):
             response = requests.get(
                 "http://{host}:{port}/metrics".format(host=node.ip_address, port=8001),
                 allow_redirects=False,
+                # less then default keep-alive timeout (10 seconds)
+                timeout=5,
             )
 
             if response.status_code != 200:
diff --git a/tests/integration/test_quorum_inserts/test.py b/tests/integration/test_quorum_inserts/test.py
index 1276a6079f0..b842a54741e 100644
--- a/tests/integration/test_quorum_inserts/test.py
+++ b/tests/integration/test_quorum_inserts/test.py
@@ -1,7 +1,9 @@
+import concurrent
 import time
 
 import pytest
 from helpers.cluster import ClickHouseCluster
+from helpers.network import PartitionManager
 from helpers.test_tools import TSV
 
 cluster = ClickHouseCluster(__file__)
@@ -361,3 +363,81 @@ def test_insert_quorum_with_ttl(started_cluster):
     )
 
     zero.query("DROP TABLE IF EXISTS test_insert_quorum_with_ttl ON CLUSTER cluster")
+
+
+def test_insert_quorum_with_keeper_loss_connection():
+    zero.query(
+        "DROP TABLE IF EXISTS test_insert_quorum_with_keeper_fail ON CLUSTER cluster"
+    )
+    create_query = (
+        "CREATE TABLE test_insert_quorum_with_keeper_loss"
+        "(a Int8, d Date) "
+        "Engine = ReplicatedMergeTree('/clickhouse/tables/{table}', '{replica}') "
+        "ORDER BY a "
+    )
+
+    zero.query(create_query)
+    first.query(create_query)
+
+    first.query("SYSTEM STOP FETCHES test_insert_quorum_with_keeper_loss")
+
+    zero.query("SYSTEM ENABLE FAILPOINT replicated_merge_tree_commit_zk_fail_after_op")
+    zero.query("SYSTEM ENABLE FAILPOINT replicated_merge_tree_insert_retry_pause")
+
+    with concurrent.futures.ThreadPoolExecutor(max_workers=5) as executor:
+        insert_future = executor.submit(
+            lambda: zero.query(
+                "INSERT INTO test_insert_quorum_with_keeper_loss(a,d) VALUES(1, '2011-01-01')",
+                settings={"insert_quorum_timeout": 150000},
+            )
+        )
+
+        pm = PartitionManager()
+        pm.drop_instance_zk_connections(zero)
+
+        retries = 0
+        zk = cluster.get_kazoo_client("zoo1")
+        while True:
+            if (
+                zk.exists(
+                    "/clickhouse/tables/test_insert_quorum_with_keeper_loss/replicas/zero/is_active"
+                )
+                is None
+            ):
+                break
+            print("replica is still active")
+            time.sleep(1)
+            retries += 1
+            if retries == 120:
+                raise Exception("Can not wait cluster replica inactive")
+
+        first.query("SYSTEM ENABLE FAILPOINT finish_set_quorum_failed_parts")
+        quorum_fail_future = executor.submit(
+            lambda: first.query(
+                "SYSTEM WAIT FAILPOINT finish_set_quorum_failed_parts", timeout=300
+            )
+        )
+        first.query("SYSTEM START FETCHES test_insert_quorum_with_keeper_loss")
+
+        concurrent.futures.wait([quorum_fail_future])
+
+        assert quorum_fail_future.exception() is None
+
+        zero.query("SYSTEM ENABLE FAILPOINT finish_clean_quorum_failed_parts")
+        clean_quorum_fail_parts_future = executor.submit(
+            lambda: first.query(
+                "SYSTEM WAIT FAILPOINT finish_clean_quorum_failed_parts", timeout=300
+            )
+        )
+        pm.restore_instance_zk_connections(zero)
+        concurrent.futures.wait([clean_quorum_fail_parts_future])
+
+        assert clean_quorum_fail_parts_future.exception() is None
+
+        zero.query("SYSTEM DISABLE FAILPOINT replicated_merge_tree_insert_retry_pause")
+        concurrent.futures.wait([insert_future])
+        assert insert_future.exception() is not None
+        assert not zero.contains_in_log("LOGICAL_ERROR")
+        assert zero.contains_in_log(
+            "fails to commit and will not retry or clean garbage"
+        )
diff --git a/tests/integration/test_quota/configs/remote_servers.xml b/tests/integration/test_quota/configs/remote_servers.xml
new file mode 100644
index 00000000000..b9aee7f5ca6
--- /dev/null
+++ b/tests/integration/test_quota/configs/remote_servers.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <default>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </default>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_quota/test.py b/tests/integration/test_quota/test.py
index cec14b0af73..bb50c84b340 100644
--- a/tests/integration/test_quota/test.py
+++ b/tests/integration/test_quota/test.py
@@ -9,6 +9,7 @@ from helpers.test_tools import assert_eq_with_retry, TSV
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance(
     "instance",
+    main_configs=["configs/remote_servers.xml"],
     user_configs=[
         "configs/users.d/assign_myquota_to_default_user.xml",
         "configs/users.d/drop_default_quota.xml",
@@ -40,7 +41,7 @@ def system_quota_usage(canonical):
     canonical_tsv = TSV(canonical)
     query = (
         "SELECT quota_name, quota_key, duration, queries, max_queries, query_selects, max_query_selects, query_inserts, max_query_inserts, errors, max_errors, result_rows, max_result_rows,"
-        "result_bytes, max_result_bytes, read_rows, max_read_rows, read_bytes, max_read_bytes, max_execution_time "
+        "result_bytes, max_result_bytes, read_rows, max_read_rows, read_bytes, max_read_bytes, max_execution_time, max_failed_sequential_authentications "
         "FROM system.quota_usage ORDER BY duration"
     )
     r = TSV(instance.query(query))
@@ -52,7 +53,7 @@ def system_quotas_usage(canonical):
     canonical_tsv = TSV(canonical)
     query = (
         "SELECT quota_name, quota_key, is_current, duration, queries, max_queries, query_selects, max_query_selects, query_inserts, max_query_inserts, errors, max_errors, result_rows, max_result_rows, "
-        "result_bytes, max_result_bytes, read_rows, max_read_rows, read_bytes, max_read_bytes, max_execution_time "
+        "result_bytes, max_result_bytes, read_rows, max_read_rows, read_bytes, max_read_bytes, max_execution_time, max_failed_sequential_authentications "
         "FROM system.quotas_usage ORDER BY quota_name, quota_key, duration"
     )
     r = TSV(instance.query(query))
@@ -130,6 +131,7 @@ def test_quota_from_users_xml():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -156,6 +158,7 @@ def test_quota_from_users_xml():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -183,6 +186,7 @@ def test_quota_from_users_xml():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -211,6 +215,7 @@ def test_quota_from_users_xml():
                 200,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -239,6 +244,7 @@ def test_quota_from_users_xml():
                 400,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -285,6 +291,7 @@ def test_simpliest_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -313,6 +320,7 @@ def test_simpliest_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -351,6 +359,7 @@ def test_tracking_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -377,6 +386,7 @@ def test_tracking_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -405,6 +415,7 @@ def test_tracking_quota():
                 200,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -433,6 +444,7 @@ def test_tracking_quota():
                 400,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -456,7 +468,7 @@ def test_exceed_quota():
         ]
     )
     system_quota_limits(
-        [["myQuota", 31556952, 0, 1, 1, 1, 1, 1, "\\N", 1, "\\N", "\\N", "\\N"]]
+        [["myQuota", 31556952, 0, 1, 1, 1, 1, 1, "\\N", 1, "\\N", "\\N", "\\N", "1"]]
     )
     system_quota_usage(
         [
@@ -481,6 +493,7 @@ def test_exceed_quota():
                 0,
                 "\\N",
                 "\\N",
+                "1",
             ]
         ]
     )
@@ -512,6 +525,7 @@ def test_exceed_quota():
                 0,
                 "\\N",
                 "\\N",
+                "1",
             ]
         ]
     )
@@ -548,6 +562,7 @@ def test_exceed_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -574,6 +589,7 @@ def test_exceed_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -602,6 +618,7 @@ def test_exceed_quota():
                 200,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -638,6 +655,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -664,6 +682,7 @@ def test_add_remove_interval():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -700,6 +719,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ],
             [
                 "myQuota",
@@ -715,6 +735,7 @@ def test_add_remove_interval():
                 20000,
                 120,
                 "\\N",
+                "\\N",
             ],
         ]
     )
@@ -741,6 +762,7 @@ def test_add_remove_interval():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ],
             [
                 "myQuota",
@@ -763,6 +785,7 @@ def test_add_remove_interval():
                 0,
                 20000,
                 120,
+                "\\N",
             ],
         ]
     )
@@ -791,6 +814,7 @@ def test_add_remove_interval():
                 200,
                 "\\N",
                 "\\N",
+                "\\N",
             ],
             [
                 "myQuota",
@@ -813,6 +837,7 @@ def test_add_remove_interval():
                 200,
                 20000,
                 120,
+                "\\N",
             ],
         ]
     )
@@ -849,6 +874,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -875,6 +901,7 @@ def test_add_remove_interval():
                 200,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -903,6 +930,7 @@ def test_add_remove_interval():
                 400,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -947,6 +975,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -975,6 +1004,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1011,6 +1041,7 @@ def test_add_remove_interval():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1037,6 +1068,7 @@ def test_add_remove_interval():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1073,6 +1105,7 @@ def test_add_remove_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1100,6 +1133,7 @@ def test_add_remove_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1146,6 +1180,7 @@ def test_add_remove_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ],
             [
                 "myQuota2",
@@ -1161,6 +1196,7 @@ def test_add_remove_quota():
                 400000,
                 60,
                 "\\N",
+                "3",
             ],
             [
                 "myQuota2",
@@ -1176,6 +1212,7 @@ def test_add_remove_quota():
                 "\\N",
                 1800,
                 "\\N",
+                "\\N",
             ],
         ]
     )
@@ -1203,6 +1240,7 @@ def test_add_remove_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1239,6 +1277,7 @@ def test_add_remove_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1266,6 +1305,7 @@ def test_add_remove_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1308,6 +1348,7 @@ def test_add_remove_quota():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1335,6 +1376,7 @@ def test_add_remove_quota():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1371,6 +1413,7 @@ def test_reload_users_xml_by_timer():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1397,7 +1440,7 @@ def test_reload_users_xml_by_timer():
     assert_eq_with_retry(
         instance,
         "SELECT * FROM system.quota_limits",
-        [["myQuota", 31556952, 0, 1, 1, 1, 1, 1, "\\N", 1, "\\N", "\\N", "\\N"]],
+        [["myQuota", 31556952, 0, 1, 1, 1, 1, 1, "\\N", 1, "\\N", "\\N", "\\N", "1"]],
     )
 
 
@@ -1447,15 +1490,15 @@ def test_dcl_introspection():
     )
     assert (
         instance.query("SHOW CREATE QUOTA myQuota2")
-        == "CREATE QUOTA myQuota2 KEYED BY client_key, user_name FOR RANDOMIZED INTERVAL 1 hour MAX result_rows = 4000, result_bytes = 400000, read_rows = 4000, read_bytes = 400000, execution_time = 60, FOR INTERVAL 1 month MAX execution_time = 1800\n"
+        == "CREATE QUOTA myQuota2 KEYED BY client_key, user_name FOR RANDOMIZED INTERVAL 1 hour MAX result_rows = 4000, result_bytes = 400000, read_rows = 4000, read_bytes = 400000, execution_time = 60, failed_sequential_authentications = 3, FOR INTERVAL 1 month MAX execution_time = 1800\n"
     )
     assert (
         instance.query("SHOW CREATE QUOTAS")
         == "CREATE QUOTA myQuota KEYED BY user_name FOR INTERVAL 1 year MAX queries = 1000, read_rows = 1000 TO default\n"
-        "CREATE QUOTA myQuota2 KEYED BY client_key, user_name FOR RANDOMIZED INTERVAL 1 hour MAX result_rows = 4000, result_bytes = 400000, read_rows = 4000, read_bytes = 400000, execution_time = 60, FOR INTERVAL 1 month MAX execution_time = 1800\n"
+        "CREATE QUOTA myQuota2 KEYED BY client_key, user_name FOR RANDOMIZED INTERVAL 1 hour MAX result_rows = 4000, result_bytes = 400000, read_rows = 4000, read_bytes = 400000, execution_time = 60, failed_sequential_authentications = 3, FOR INTERVAL 1 month MAX execution_time = 1800\n"
     )
     assert re.match(
-        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t1000\\t200\\t\\\\N\\t.*\\t\\\\N\n",
+        "myQuota\\tdefault\\t.*\\t31556952\\t1\\t1000\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t1000\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
@@ -1478,13 +1521,13 @@ def test_dcl_management():
         == "CREATE QUOTA qA FOR INTERVAL 5 quarter MAX queries = 123 TO default\n"
     )
     assert re.match(
-        "qA\\t\\t.*\\t39446190\\t0\\t123\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t.*\\t\\\\N\n",
+        "qA\\t\\t.*\\t39446190\\t0\\t123\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
     instance.query("SELECT * from test_table")
     assert re.match(
-        "qA\\t\\t.*\\t39446190\\t1\\t123\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\n",
+        "qA\\t\\t.*\\t39446190\\t1\\t123\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
@@ -1496,15 +1539,15 @@ def test_dcl_management():
         == "CREATE QUOTA qA FOR INTERVAL 30 minute MAX execution_time = 0.5, FOR INTERVAL 5 quarter MAX queries = 321, errors = 10 TO default\n"
     )
     assert re.match(
-        "qA\\t\\t.*\\t1800\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t.*\\t0.5\\t0\\t\\\\N\n"
-        "qA\\t\\t.*\\t39446190\\t1\\t321\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t10\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
+        "qA\\t\\t.*\\t1800\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t.*\\t0.5\\t0\\t\\\\N\\t0\\t\\\\N\n"
+        "qA\\t\\t.*\\t39446190\\t1\\t321\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t10\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\n",
         instance.query("SHOW QUOTA"),
     )
 
     instance.query("SELECT * from test_table")
     assert re.match(
-        "qA\\t\\t.*\\t1800\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t0.5\\t0\\t\\\\N\n"
-        "qA\\t\\t.*\\t39446190\\t2\\t321\\t2\\t\\\\N\\t0\\t\\\\N\\t0\\t10\\t100\\t\\\\N\\t400\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
+        "qA\\t\\t.*\\t1800\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t0.5\\t0\\t\\\\N\\t0\\t\\\\N\n"
+        "qA\\t\\t.*\\t39446190\\t2\\t321\\t2\\t\\\\N\\t0\\t\\\\N\\t0\\t10\\t100\\t\\\\N\\t400\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
@@ -1518,7 +1561,7 @@ def test_dcl_management():
 
     instance.query("SELECT * from test_table")
     assert re.match(
-        "qA\\t\\t.*\\t42075936\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
+        "qA\\t\\t.*\\t42075936\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
@@ -1528,13 +1571,13 @@ def test_dcl_management():
         == "CREATE QUOTA qB FOR RANDOMIZED INTERVAL 16 month TRACKING ONLY TO default\n"
     )
     assert re.match(
-        "qB\\t\\t.*\\t42075936\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\n",
+        "qB\\t\\t.*\\t42075936\\t1\\t\\\\N\\t1\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t50\\t\\\\N\\t200\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
     instance.query("SELECT * from test_table")
     assert re.match(
-        "qB\\t\\t.*\\t42075936\\t2\\t\\\\N\\t2\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\n",
+        "qB\\t\\t.*\\t42075936\\t2\\t\\\\N\\t2\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t100\\t\\\\N\\t400\\t\\\\N\\t.*\\t\\\\N\\t0\\t\\\\N\\t0\\t\\\\N\n",
         instance.query("SHOW QUOTA"),
     )
 
@@ -1579,6 +1622,7 @@ def test_query_inserts():
                 "\\N",
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1605,6 +1649,7 @@ def test_query_inserts():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1632,6 +1677,7 @@ def test_query_inserts():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1663,6 +1709,7 @@ def test_query_inserts():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
@@ -1691,6 +1738,7 @@ def test_query_inserts():
                 0,
                 "\\N",
                 "\\N",
+                "\\N",
             ]
         ]
     )
diff --git a/tests/integration/test_quota/tiny_limits.xml b/tests/integration/test_quota/tiny_limits.xml
index 5821935bb6d..b5014674f98 100644
--- a/tests/integration/test_quota/tiny_limits.xml
+++ b/tests/integration/test_quota/tiny_limits.xml
@@ -12,6 +12,7 @@
                 <errors>1</errors>
                 <read_rows>1</read_rows>
                 <result_rows>1</result_rows>
+                <failed_sequential_authentications>1</failed_sequential_authentications>
             </interval>
         </myQuota>
     </quotas>
diff --git a/tests/integration/test_quota/two_quotas.xml b/tests/integration/test_quota/two_quotas.xml
index 13872286dc6..e3b91b1bf43 100644
--- a/tests/integration/test_quota/two_quotas.xml
+++ b/tests/integration/test_quota/two_quotas.xml
@@ -18,6 +18,7 @@
                 <read_bytes>400000</read_bytes>
                 <result_bytes>400000</result_bytes>
                 <execution_time>60</execution_time>
+                <failed_sequential_authentications>3</failed_sequential_authentications>
             </interval>
             <interval2>
                 <duration>2629746</duration>
diff --git a/tests/integration/test_recompression_ttl/test.py b/tests/integration/test_recompression_ttl/test.py
index 851e3bb4eb8..9d7b09eacdf 100644
--- a/tests/integration/test_recompression_ttl/test.py
+++ b/tests/integration/test_recompression_ttl/test.py
@@ -155,7 +155,7 @@ def test_recompression_multiple_ttls(started_cluster):
         node2.query(
             "SELECT recompression_ttl_info.expression FROM system.parts where name = 'all_1_1_4'"
         )
-        == "['plus(d, toIntervalSecond(10))','plus(d, toIntervalSecond(15))','plus(d, toIntervalSecond(5))']\n"
+        == "['d + toIntervalSecond(10)','d + toIntervalSecond(15)','d + toIntervalSecond(5)']\n"
     )
 
 
diff --git a/tests/integration/test_redirect_url_storage/test.py b/tests/integration/test_redirect_url_storage/test.py
index 17a9a03008e..ba3fb3e14ab 100644
--- a/tests/integration/test_redirect_url_storage/test.py
+++ b/tests/integration/test_redirect_url_storage/test.py
@@ -1,10 +1,15 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 
 from helpers.network import PartitionManager
 import threading
 import time
 
+# skip all tests in the module on ARM due to HDFS
+if is_arm():
+    pytestmark = pytest.mark.skip
+
+
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
@@ -150,7 +155,7 @@ def test_url_reconnect(started_cluster):
         def select():
             global result
             result = node1.query(
-                "select sum(cityHash64(id)) from url('http://hdfs1:50075/webhdfs/v1/storage_big?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV', 'id Int32') settings http_max_tries = 10, http_retry_max_backoff_ms=1000"
+                "select sum(cityHash64(id)) from url('http://hdfs1:50075/webhdfs/v1/storage_big?op=OPEN&namenoderpcaddress=hdfs1:9000&offset=0', 'TSV', 'id Int32') settings http_max_tries=10, http_retry_max_backoff_ms=1000, http_make_head_request=false"
             )
             assert int(result) == 6581218782194912115
 
diff --git a/tests/integration/test_reload_certificate/configs/WithChain.crt b/tests/integration/test_reload_certificate/configs/WithChain.crt
new file mode 100644
index 00000000000..c75ee533f26
--- /dev/null
+++ b/tests/integration/test_reload_certificate/configs/WithChain.crt
@@ -0,0 +1,43 @@
+-----BEGIN CERTIFICATE-----
+MIIDkzCCAnugAwIBAgIUSChEeHqJus9jzKmD/L3Tw0x4OwcwDQYJKoZIhvcNAQEL
+BQAwQTEaMBgGA1UEAwwRZGVtby5tbG9wc2h1Yi5jb20xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQHDA1TYW4gRnJhbnNpc2NvMCAXDTI0MDMyMDE5MTE1OVoYDzIxMjQwMjI1
+MTkxMTU5WjBxMQswCQYDVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQG
+A1UEBwwNU2FuIEZyYW5zaXNjbzEPMA0GA1UECgwGRm9vQmFyMRAwDgYDVQQLDAdG
+b28gQmFyMRIwEAYDVQQDDAlsb2NhbGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDM//0s6AX988J86HzxX95irGa9cJIfY24UDBXVkO3gREiwj1Uf
+bpvpxCcwADMuFdggsJlppWa3q+PNJ/eoVwdl3gG0WXaZp1rcuv6ltxdQAUtgfMAb
+5p7HwsO7rCTGJBwa62Jg+E79j+V8rZWfaJRfNtY0p7eauWIrqLA0Gyse+lRayPHI
+hsR9+0qedF+qziFpbNxpW8DHrpIrLb8LEao1BCYQ44koBXjkrXeR6OidXw/gek8+
+9M2GLxy6ubQ7hrcYwVWpFOKLLZLmyYDgescM6AIU904o1bN0yJ5rM7a1+f150qp6
+ttZlya0sJH0lm3gzEsqb6Fbh+Dw/9Lsp66sDAgMBAAGjUTBPMB8GA1UdIwQYMBaA
+FMjyDUyXujACeQa2G+4I8ic5HVBiMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBQG
+A1UdEQQNMAuCCWxvY2FsaG9zdDANBgkqhkiG9w0BAQsFAAOCAQEABEWEaVDqv9Za
+bFpD/JEMIFVqe5ANKAnbbff0/vFJQ7yFmsL8/G4bbdd8uidRgE4WgoeNUscCnfk+
+kjb1vFjvY4/cBYITn41Pz5I7lQMH+BaR5gHb1oJVlJavQ2vsaeMuyDJaNmumejmU
+YnoKZRwwb6SCXujS2MKgKl+jL5OkZk60i+nJhIXfxwMNmlvtqADSU5Z3VMagq8hj
+DnEsxTz8PptuVaLVT4kcZm9gZpDEW2KPMZhNCv/g7EzQv8r3WnFGqumMGBO82ZE0
+mUh/Chrhss/meVK0FqTTBjOlex7R0GiJBCDfZGYTWIVdND4ICdZ1OpGWid5CXbfQ
+sWBrbBaEyw==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIIDYzCCAkugAwIBAgIUR0PldYYSk3DAifgb600kvqjaCAIwDQYJKoZIhvcNAQEL
+BQAwQTEaMBgGA1UEAwwRZGVtby5tbG9wc2h1Yi5jb20xCzAJBgNVBAYTAlVTMRYw
+FAYDVQQHDA1TYW4gRnJhbnNpc2NvMB4XDTI0MDMyMDE5MTEzMVoXDTI1MDMxMTE5
+MTEzMVowQTEaMBgGA1UEAwwRZGVtby5tbG9wc2h1Yi5jb20xCzAJBgNVBAYTAlVT
+MRYwFAYDVQQHDA1TYW4gRnJhbnNpc2NvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
+MIIBCgKCAQEAqL3k6Pexu1KR8fc84fRmu0hYon7+xOPmtFSzspeN+DJNe5oDO6x0
+RzTQkgtDoxTcq32O290r3uURnDmnvNubz5yTpM1Zcz/kuSNpHLJh4yyZsXRsB21v
+lb3bhjqyn6rkfoQzIMekt7clPQS0dWdU2T+lwn6XBVShOyB/W7ysP309ofQGXV+T
+VFyU+lgZc2WjK6611QDCpTXgRc/UKUfU5460BnTCylP6jzBOWBZb8FX6dYBzS4U2
+yISvOXagxJVruoWjscc35ln6HBQ8bu/fI8Q0n1/ROlm785Bsd/LpVw465kklwQwS
+FY3FQkiedD1fyszXO4Yq5PARw54AGKbAyQIDAQABo1MwUTAdBgNVHQ4EFgQUyPIN
+TJe6MAJ5BrYb7gjyJzkdUGIwHwYDVR0jBBgwFoAUyPINTJe6MAJ5BrYb7gjyJzkd
+UGIwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAYyl27sxwrjz5
+qcqwbLYv2eFIR6VZzvHfknSK1ht1jzMkXxvAOjETbYwqwWquWwMHOD2X4q5d57nu
+qYAE9YE27HFzknPQkDdzwJ0u4dKi28PK8tM6dqDK46LSal/MEUxXGuzW3TRyJXrl
+lPi+Wh6gZRRiANJ+giEwvQ+8k6eURHrhtL7yZqT+swi+jP4h6S4mmHmsaOj4VoP/
+NCFoRZud5SCd7RZV+fzNfxhLHI9I2c2gFycBDZOEdlrIZHM6EoaDb3i9kDVbnZqG
+Zj/+k/NwCKg5UiDap6Z7Xj7w0chSppg3DMcsxGeQ9vQcMtydNu5fSK4CozNqxObb
+hGBJrQylAw==
+-----END CERTIFICATE-----
diff --git a/tests/integration/test_reload_certificate/configs/WithChain.key b/tests/integration/test_reload_certificate/configs/WithChain.key
new file mode 100644
index 00000000000..eb55458b143
--- /dev/null
+++ b/tests/integration/test_reload_certificate/configs/WithChain.key
@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAzP/9LOgF/fPCfOh88V/eYqxmvXCSH2NuFAwV1ZDt4ERIsI9V
+H26b6cQnMAAzLhXYILCZaaVmt6vjzSf3qFcHZd4BtFl2mada3Lr+pbcXUAFLYHzA
+G+aex8LDu6wkxiQcGutiYPhO/Y/lfK2Vn2iUXzbWNKe3mrliK6iwNBsrHvpUWsjx
+yIbEfftKnnRfqs4haWzcaVvAx66SKy2/CxGqNQQmEOOJKAV45K13kejonV8P4HpP
+PvTNhi8curm0O4a3GMFVqRTiiy2S5smA4HrHDOgCFPdOKNWzdMieazO2tfn9edKq
+erbWZcmtLCR9JZt4MxLKm+hW4fg8P/S7KeurAwIDAQABAoIBAQDIT6LtzFJ+kT+L
+mgjsOocs19UUavj9XsTjJeP36UPnDhIRJB1DN2t2Astf5fIcqA+l8aoWRx6Vfop7
+nwAqJ8/8w+/acEipX5Qzdyz4dG19Kaajw4JcQP8JptBng4/zZLlpvHNG2ZslvQO6
+zksTlrbUStsIXJHVyCubCZwTbjC2dJlc97705DZAk/8L7FkljmyJws2xwQZlxdQG
+FZ+8IrAqpWJC55EPfKo6+QsKEc9hh4N/MQW483V5yCuw9dLShcEMDGuxcHGFHif8
+BrwImih0rIwj9tTDY9pw6aJ5+80tVStNLDk+1eQRME6Fy/c7RG/sm/lj+P0YOI7F
+jH4wyXVRAoGBAOc+rFNpM/CgRZD4VXQ+gV1+PLdaqUUU3UXAPfNWkrMIr0u4+tmg
+OMMkXaM7B/ps7o5+Rcj+tO1VAvl6m7uM376szC3Ex8JA0XBDmJrJKfEQCHkzvkdf
+wywVBeAR4f3D2+9Meh1XSNRqGU+Anb48neTyVYzPNIoK8ZmtZID49GfVAoGBAOLy
+EX1TT1xwE/VwDy5BeJQzyZ+xwevie/960RIYooLeb31NLhOcX142b8U7XRMtiqdd
+wfsT5SbjnrATBponKZELO7LwE+Z4djo2+O6JZjYB5/t/Z6r7qfOaTTlJEl8VJKo4
+F+qAsqKo0Q9EpkRUeNdcOjDzkuEikw9IlhS0VEt3AoGAWLHoRQH4AxZmOGmX1UNY
+OTT/MtCaVj3fdS58VIZjNDpjiibESI601txu8fnlYH9BrPPv7l0LpnBR+MC3VON+
+ulLq6a8tc2uLKYUz1kLMTIL6zQo0tImdgZ36p+wUA1KJXCq4N+LPs3GSjbTmTB5R
+7Yuplp2vKDd0XZ5tCy7yB5UCgYEA3ppoE1DTSC1bNmSLT2jCuEOv4ic+unw1+lti
+lWh6hvldzD8XEf9RAB1PNtvKqNQD67SoX/mczK956OVQlYYSXIXzMcoRCwBfnyxq
+sbct/Y2TGXpXmjwt8JcKZkVJcuBPTXOl6cwA7FHAdkR0/hMJUNzS608PZCtAqj4d
+kANtp3MCgYEA3plv6RYYDZsUdJmIcdIvr/LxWTSqYf37LQM//k+OXo+zWMxgnUNv
+AEqDlNWP+bw3yJlU1bQS2o1Z+hKzDgqDZtaVVVDgdVsUaDSW0EsJpedWXoGqJdrw
+yxhB7RYi1tQsXHbR1iyT5hH0ZlV7s0XIKRU4U8MP05av099+++YKhks=
+-----END RSA PRIVATE KEY-----
diff --git a/tests/integration/test_reload_certificate/test.py b/tests/integration/test_reload_certificate/test.py
index 1718e440629..f0efc4e0bbd 100644
--- a/tests/integration/test_reload_certificate/test.py
+++ b/tests/integration/test_reload_certificate/test.py
@@ -13,6 +13,8 @@ node = cluster.add_instance(
         "configs/second.key",
         "configs/ECcert.crt",
         "configs/ECcert.key",
+        "configs/WithChain.crt",
+        "configs/WithChain.key",
         "configs/WithPassPhrase.crt",
         "configs/WithPassPhrase.key",
         "configs/cert.xml",
@@ -158,3 +160,18 @@ def test_cert_with_pass_phrase():
     check_certificate_switch(
         "first", "WithPassPhrase", pass_phrase_second=pass_phrase_for_cert
     )
+
+
+def test_chain_reload():
+    """Check cert chain reload"""
+    check_certificate_switch("first", "WithChain")
+    assert (
+        node.exec_in_container(
+            [
+                "bash",
+                "-c",
+                "openssl s_client -showcerts -servername localhost -connect localhost:8443 </dev/null 2>/dev/null | grep 'BEGIN CERTIFICATE' | wc -l",
+            ]
+        )
+        == "2\n"
+    )
diff --git a/tests/integration/test_reload_clusters_config/test.py b/tests/integration/test_reload_clusters_config/test.py
index cb003bbe04e..f5baae77297 100644
--- a/tests/integration/test_reload_clusters_config/test.py
+++ b/tests/integration/test_reload_clusters_config/test.py
@@ -13,8 +13,6 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node", with_zookeeper=True, main_configs=["configs/remote_servers.xml"]
 )
-node_1 = cluster.add_instance("node_1", with_zookeeper=True)
-node_2 = cluster.add_instance("node_2", with_zookeeper=True)
 
 
 @pytest.fixture(scope="module")
@@ -32,9 +30,6 @@ def started_cluster():
             Distributed('test_cluster2', 'default', 'replicated')"""
         )
 
-        cluster.pause_container("node_1")
-        cluster.pause_container("node_2")
-
         yield cluster
 
     finally:
diff --git a/tests/integration/test_reload_query_masking_rules/__init__.py b/tests/integration/test_reload_query_masking_rules/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_reload_query_masking_rules/configs/changed_settings.xml b/tests/integration/test_reload_query_masking_rules/configs/changed_settings.xml
new file mode 100644
index 00000000000..d681496d843
--- /dev/null
+++ b/tests/integration/test_reload_query_masking_rules/configs/changed_settings.xml
@@ -0,0 +1,19 @@
+<clickhouse>
+    <query_log>
+        <database>system</database>
+        <table>query_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </query_log>
+
+    <query_masking_rules>
+        <rule>
+            <regexp>TOPSECRET.TOPSECRET</regexp>
+            <replace>[hidden]</replace>
+        </rule>
+    </query_masking_rules>
+</clickhouse>
diff --git a/tests/integration/test_reload_query_masking_rules/configs/empty_settings.xml b/tests/integration/test_reload_query_masking_rules/configs/empty_settings.xml
new file mode 100644
index 00000000000..82647ff82b5
--- /dev/null
+++ b/tests/integration/test_reload_query_masking_rules/configs/empty_settings.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <query_log>
+        <database>system</database>
+        <table>query_log</table>
+        <partition_by>toYYYYMM(event_date)</partition_by>
+        <flush_interval_milliseconds>7500</flush_interval_milliseconds>
+        <max_size_rows>1048576</max_size_rows>
+        <reserved_size_rows>8192</reserved_size_rows>
+        <buffer_size_rows_flush_threshold>524288</buffer_size_rows_flush_threshold>
+        <flush_on_crash>false</flush_on_crash>
+    </query_log>
+</clickhouse>
diff --git a/tests/integration/test_reload_query_masking_rules/test.py b/tests/integration/test_reload_query_masking_rules/test.py
new file mode 100644
index 00000000000..f269aefbacb
--- /dev/null
+++ b/tests/integration/test_reload_query_masking_rules/test.py
@@ -0,0 +1,57 @@
+import pytest
+import os
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry, assert_logs_contain_with_retry
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance("node", user_configs=["configs/empty_settings.xml"])
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+@pytest.fixture(autouse=True)
+def reset_to_normal_settings_after_test():
+    try:
+        node.copy_file_to_container(
+            os.path.join(SCRIPT_DIR, "configs/empty_settings.xml"),
+            "/etc/clickhouse-server/config.d/z.xml",
+        )
+        node.query("SYSTEM RELOAD CONFIG")
+        yield
+    finally:
+        pass
+
+
+# @pytest.mark.parametrize("reload_strategy", ["force", "timeout"])
+def test_reload_query_masking_rules():
+    # At first, empty configuration is fed to ClickHouse. The query
+    # "SELECT 'TOPSECRET.TOPSECRET'" will not be redacted, and the new masking
+    # event will not be registered
+    node.query("SELECT 'TOPSECRET.TOPSECRET'")
+    assert_logs_contain_with_retry(node, "SELECT 'TOPSECRET.TOPSECRET'")
+    assert not node.contains_in_log(r"SELECT '\[hidden\]'")
+    node.rotate_logs()
+
+    node.copy_file_to_container(
+        os.path.join(SCRIPT_DIR, "configs/changed_settings.xml"),
+        "/etc/clickhouse-server/config.d/z.xml",
+    )
+
+    node.query("SYSTEM RELOAD CONFIG")
+
+    # Now the same query will be redacted in the logs and the counter of events
+    # will be incremented
+    node.query("SELECT 'TOPSECRET.TOPSECRET'")
+
+    assert_logs_contain_with_retry(node, r"SELECT '\[hidden\]'")
+    assert not node.contains_in_log("SELECT 'TOPSECRET.TOPSECRET'")
+
+    node.rotate_logs()
diff --git a/tests/integration/test_replicated_database/configs/config.xml b/tests/integration/test_replicated_database/configs/config.xml
index e598cc28d5d..7d779cb0d2e 100644
--- a/tests/integration/test_replicated_database/configs/config.xml
+++ b/tests/integration/test_replicated_database/configs/config.xml
@@ -4,4 +4,5 @@
     <merge_tree>
         <initialization_retry_period>10</initialization_retry_period>
     </merge_tree>
+    <max_database_replicated_create_table_thread_pool_size>50</max_database_replicated_create_table_thread_pool_size>
 </clickhouse>
diff --git a/tests/integration/test_replicated_database/test.py b/tests/integration/test_replicated_database/test.py
index 1fc3fe37044..706620cfaef 100644
--- a/tests/integration/test_replicated_database/test.py
+++ b/tests/integration/test_replicated_database/test.py
@@ -338,6 +338,8 @@ def test_alter_drop_part(started_cluster, engine):
     main_node.query(f"INSERT INTO {database}.alter_drop_part VALUES (123)")
     if engine == "MergeTree":
         dummy_node.query(f"INSERT INTO {database}.alter_drop_part VALUES (456)")
+    else:
+        main_node.query(f"SYSTEM SYNC REPLICA {database}.alter_drop_part PULL")
     main_node.query(f"ALTER TABLE {database}.alter_drop_part DROP PART '{part_name}'")
     assert main_node.query(f"SELECT CounterID FROM {database}.alter_drop_part") == ""
     if engine == "ReplicatedMergeTree":
@@ -506,12 +508,9 @@ def test_alters_from_different_replicas(started_cluster):
     dummy_node.stop_clickhouse(kill=True)
 
     settings = {"distributed_ddl_task_timeout": 5}
-    assert (
-        "There are 1 unfinished hosts (0 of them are currently executing the task"
-        in competing_node.query_and_get_error(
-            "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN Added0 UInt32;",
-            settings=settings,
-        )
+    assert "is not finished on 1 of 3 hosts" in competing_node.query_and_get_error(
+        "ALTER TABLE alters_from_different_replicas.concurrent_test ADD COLUMN Added0 UInt32;",
+        settings=settings,
     )
     settings = {
         "distributed_ddl_task_timeout": 5,
@@ -1077,7 +1076,7 @@ def test_startup_without_zk(started_cluster):
         err = main_node.query_and_get_error(
             "CREATE DATABASE startup ENGINE = Replicated('/clickhouse/databases/startup', 'shard1', 'replica1');"
         )
-        assert "ZooKeeper" in err
+        assert "ZooKeeper" in err or "Coordination::Exception" in err
     main_node.query(
         "CREATE DATABASE startup ENGINE = Replicated('/clickhouse/databases/startup', 'shard1', 'replica1');"
     )
@@ -1139,6 +1138,10 @@ def test_sync_replica(started_cluster):
 
     dummy_node.query("SYSTEM SYNC DATABASE REPLICA test_sync_database")
 
+    assert "2\n" == main_node.query(
+        "SELECT sum(is_active) FROM system.clusters WHERE cluster='test_sync_database'"
+    )
+
     assert dummy_node.query(
         "SELECT count() FROM system.tables where database='test_sync_database'"
     ).strip() == str(number_of_tables)
@@ -1396,3 +1399,47 @@ def test_modify_comment(started_cluster):
 
     main_node.query("DROP DATABASE modify_comment_db SYNC")
     dummy_node.query("DROP DATABASE modify_comment_db SYNC")
+
+
+def test_table_metadata_corruption(started_cluster):
+    main_node.query("DROP DATABASE IF EXISTS table_metadata_corruption")
+    dummy_node.query("DROP DATABASE IF EXISTS table_metadata_corruption")
+
+    main_node.query(
+        "CREATE DATABASE table_metadata_corruption ENGINE = Replicated('/clickhouse/databases/table_metadata_corruption', 'shard1', 'replica1');"
+    )
+    dummy_node.query(
+        "CREATE DATABASE table_metadata_corruption ENGINE = Replicated('/clickhouse/databases/table_metadata_corruption', 'shard1', 'replica2');"
+    )
+
+    create_some_tables("table_metadata_corruption")
+
+    main_node.query("SYSTEM SYNC DATABASE REPLICA table_metadata_corruption")
+    dummy_node.query("SYSTEM SYNC DATABASE REPLICA table_metadata_corruption")
+
+    # Server should handle this by throwing an exception during table loading, which should lead to server shutdown
+    corrupt = "sed --follow-symlinks -i 's/ReplicatedMergeTree/CorruptedMergeTree/' /var/lib/clickhouse/metadata/table_metadata_corruption/rmt1.sql"
+
+    print(f"Corrupting metadata using `{corrupt}`")
+    dummy_node.stop_clickhouse(kill=True)
+    dummy_node.exec_in_container(["bash", "-c", corrupt])
+
+    query = (
+        "SELECT name, uuid, create_table_query FROM system.tables WHERE database='table_metadata_corruption' AND name NOT LIKE '.inner_id.%' "
+        "ORDER BY name SETTINGS show_table_uuid_in_table_create_query_if_not_nil=1"
+    )
+    expected = main_node.query(query)
+
+    # We expect clickhouse server to shutdown without LOGICAL_ERRORs or deadlocks
+    dummy_node.start_clickhouse(expected_to_fail=True)
+    assert not dummy_node.contains_in_log("LOGICAL_ERROR")
+
+    fix_corrupt = "sed --follow-symlinks -i 's/CorruptedMergeTree/ReplicatedMergeTree/' /var/lib/clickhouse/metadata/table_metadata_corruption/rmt1.sql"
+    print(f"Fix corrupted metadata using `{fix_corrupt}`")
+    dummy_node.exec_in_container(["bash", "-c", fix_corrupt])
+
+    dummy_node.start_clickhouse()
+    assert_eq_with_retry(dummy_node, query, expected)
+
+    main_node.query("DROP DATABASE IF EXISTS table_metadata_corruption")
+    dummy_node.query("DROP DATABASE IF EXISTS table_metadata_corruption")
diff --git a/tests/integration/test_replicated_database_cluster_groups/test.py b/tests/integration/test_replicated_database_cluster_groups/test.py
index 647626d8014..91361c1850b 100644
--- a/tests/integration/test_replicated_database_cluster_groups/test.py
+++ b/tests/integration/test_replicated_database_cluster_groups/test.py
@@ -95,12 +95,9 @@ def test_cluster_groups(started_cluster):
     # Exception
     main_node_2.stop_clickhouse()
     settings = {"distributed_ddl_task_timeout": 5}
-    assert (
-        "There are 1 unfinished hosts (0 of them are currently executing the task)"
-        in main_node_1.query_and_get_error(
-            "CREATE TABLE cluster_groups.table_2 (d Date, k UInt64) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);",
-            settings=settings,
-        )
+    assert "is not finished on 1 of 2 hosts" in main_node_1.query_and_get_error(
+        "CREATE TABLE cluster_groups.table_2 (d Date, k UInt64) ENGINE=ReplicatedMergeTree ORDER BY k PARTITION BY toYYYYMM(d);",
+        settings=settings,
     )
 
     # 3. After start both groups are synced
diff --git a/tests/integration/test_replicated_fetches_bandwidth/test.py b/tests/integration/test_replicated_fetches_bandwidth/test.py
index cd969746c31..1e84c09a523 100644
--- a/tests/integration/test_replicated_fetches_bandwidth/test.py
+++ b/tests/integration/test_replicated_fetches_bandwidth/test.py
@@ -129,7 +129,7 @@ def test_limited_fetches_for_server(start_cluster):
             node3.query(f"SYSTEM STOP FETCHES limited_fetches{j}")
             for i in range(5):
                 node1.query(
-                    "INSERT INTO limited_fetches{} SELECT {}, (select randomPrintableASCII(104857)) FROM numbers(50)".format(
+                    "INSERT INTO limited_fetches{} SELECT {}, (select randomPrintableASCII(104857)) FROM numbers(150)".format(
                         j, i
                     )
                 )
@@ -175,7 +175,7 @@ def test_limited_sends_for_server(start_cluster):
             node1.query(f"SYSTEM STOP FETCHES limited_sends{j}")
             for i in range(5):
                 node3.query(
-                    "INSERT INTO limited_sends{} SELECT {}, (select randomPrintableASCII(104857)) FROM numbers(50)".format(
+                    "INSERT INTO limited_sends{} SELECT {}, (select randomPrintableASCII(104857)) FROM numbers(150)".format(
                         j, i
                     )
                 )
diff --git a/tests/integration/test_replicated_merge_tree_compatibility/test.py b/tests/integration/test_replicated_merge_tree_compatibility/test.py
index 32a44aa65b9..a70f3234c1e 100644
--- a/tests/integration/test_replicated_merge_tree_compatibility/test.py
+++ b/tests/integration/test_replicated_merge_tree_compatibility/test.py
@@ -1,24 +1,22 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
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 72a01d278d8..7d165d526ed 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
@@ -213,9 +213,9 @@ def test_drop_table(cluster):
 
     node.query_with_retry(
         "system sync replica test_drop_table",
-        settings={"receive_timeout": 5},
-        sleep_time=5,
-        retry_count=10,
+        settings={"receive_timeout": 10},
+        sleep_time=3,
+        retry_count=20,
     )
     node2.query("drop table test_drop_table sync")
     assert "1000\t499500\n" == node.query(
diff --git a/tests/integration/test_replicated_merge_tree_wait_on_shutdown/test.py b/tests/integration/test_replicated_merge_tree_wait_on_shutdown/test.py
index 67dd03098e9..995afedf415 100644
--- a/tests/integration/test_replicated_merge_tree_wait_on_shutdown/test.py
+++ b/tests/integration/test_replicated_merge_tree_wait_on_shutdown/test.py
@@ -40,6 +40,10 @@ def test_shutdown_and_wait(start_cluster):
             f"CREATE TABLE test_table (value UInt64) ENGINE=ReplicatedMergeTree('/test/table', 'r{i}') ORDER BY tuple()"
         )
 
+    # we stop merges on node1 to make node2 fetch all 51 origin parts from node1
+    # and not to fetch a smaller set of merged covering parts
+    node1.query("SYSTEM STOP MERGES test_table")
+
     node1.query("INSERT INTO test_table VALUES (0)")
     node2.query("SYSTEM SYNC REPLICA test_table")
 
diff --git a/tests/integration/test_replicated_zero_copy_projection_mutation/test.py b/tests/integration/test_replicated_zero_copy_projection_mutation/test.py
index 4839919e23d..e0af85c3887 100644
--- a/tests/integration/test_replicated_zero_copy_projection_mutation/test.py
+++ b/tests/integration/test_replicated_zero_copy_projection_mutation/test.py
@@ -131,14 +131,13 @@ def test_all_projection_files_are_dropped_when_part_is_dropped(
             """
         )
 
-        objects_empty_table = list_objects(cluster)
-
         node.query(
             "ALTER TABLE test_all_projection_files_are_dropped ADD projection b_order (SELECT a, b ORDER BY b)"
         )
         node.query(
             "ALTER TABLE test_all_projection_files_are_dropped MATERIALIZE projection b_order"
         )
+        objects_empty_table = list_objects(cluster)
 
         node.query(
             """
diff --git a/tests/integration/test_replicating_constants/test.py b/tests/integration/test_replicating_constants/test.py
index 9669e890cd3..af8916dd625 100644
--- a/tests/integration/test_replicating_constants/test.py
+++ b/tests/integration/test_replicating_constants/test.py
@@ -8,10 +8,9 @@ node1 = cluster.add_instance("node1", with_zookeeper=True)
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="19.16.9.37",
+    image="clickhouse/clickhouse-server",
+    tag="23.3",
     with_installed_binary=True,
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_role/test.py b/tests/integration/test_role/test.py
index 0e1bbea9cea..b3b18dc8271 100644
--- a/tests/integration/test_role/test.py
+++ b/tests/integration/test_role/test.py
@@ -246,7 +246,7 @@ def test_introspection():
     )
 
     assert instance.query("SHOW GRANTS FOR A") == TSV(
-        ["GRANT SELECT ON test.table TO A", "GRANT R1 TO A"]
+        ["GRANT SELECT ON test.`table` TO A", "GRANT R1 TO A"]
     )
     assert instance.query("SHOW GRANTS FOR B") == TSV(
         [
@@ -256,11 +256,14 @@ def test_introspection():
     )
     assert instance.query("SHOW GRANTS FOR R1") == ""
     assert instance.query("SHOW GRANTS FOR R2") == TSV(
-        ["GRANT SELECT ON test.table TO R2", "REVOKE SELECT(x) ON test.table FROM R2"]
+        [
+            "GRANT SELECT ON test.`table` TO R2",
+            "REVOKE SELECT(x) ON test.`table` FROM R2",
+        ]
     )
 
     assert instance.query("SHOW GRANTS", user="A") == TSV(
-        ["GRANT SELECT ON test.table TO A", "GRANT R1 TO A"]
+        ["GRANT SELECT ON test.`table` TO A", "GRANT R1 TO A"]
     )
 
     assert instance.query("SHOW GRANTS FOR R1", user="A") == TSV([])
diff --git a/tests/integration/test_row_policy/test.py b/tests/integration/test_row_policy/test.py
index d88a8f2a243..8260be78e82 100644
--- a/tests/integration/test_row_policy/test.py
+++ b/tests/integration/test_row_policy/test.py
@@ -60,7 +60,7 @@ def started_cluster():
                 CREATE TABLE mydb.filtered_table2 (a UInt8, b UInt8, c UInt8, d UInt8) ENGINE MergeTree ORDER BY a;
                 INSERT INTO mydb.filtered_table2 values (0, 0, 0, 0), (1, 2, 3, 4), (4, 3, 2, 1), (0, 0, 6, 0);
 
-                CREATE TABLE mydb.filtered_table3 (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
+                CREATE TABLE mydb.filtered_table3 (a UInt8, b UInt8, bb ALIAS b + 1, c UInt16 ALIAS a + bb - 1) ENGINE MergeTree ORDER BY a;
                 INSERT INTO mydb.filtered_table3 values (0, 0), (0, 1), (1, 0), (1, 1);
 
                 CREATE TABLE mydb.`.filtered_table4` (a UInt8, b UInt8, c UInt16 ALIAS a + b) ENGINE MergeTree ORDER BY a;
@@ -113,6 +113,7 @@ def test_smoke():
 
     assert node.query("SELECT a FROM mydb.filtered_table3") == TSV([[0], [1]])
     assert node.query("SELECT b FROM mydb.filtered_table3") == TSV([[1], [0]])
+    assert node.query("SELECT bb FROM mydb.filtered_table3") == TSV([[2], [1]])
     assert node.query("SELECT c FROM mydb.filtered_table3") == TSV([[1], [1]])
     assert node.query("SELECT a + b FROM mydb.filtered_table3") == TSV([[1], [1]])
     assert node.query("SELECT a FROM mydb.filtered_table3 WHERE c = 1") == TSV(
@@ -803,9 +804,9 @@ def test_tags_with_db_and_table_names():
     assert node.query("SHOW CREATE POLICIES default") == TSV(
         [
             "CREATE ROW POLICY default ON mydb.`.filtered_table4` FOR SELECT USING c = 2 TO default",
+            "CREATE ROW POLICY default ON mydb.`table` FOR SELECT USING a = 0 TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table2 FOR SELECT USING c > (d + 5) TO default",
             "CREATE ROW POLICY default ON mydb.filtered_table3 FOR SELECT USING c = 0 TO default",
-            "CREATE ROW POLICY default ON mydb.table FOR SELECT USING a = 0 TO default",
         ]
     )
 
diff --git a/tests/integration/test_runtime_configurable_cache_size/test.py b/tests/integration/test_runtime_configurable_cache_size/test.py
index 6119ff1ebea..f761005f297 100644
--- a/tests/integration/test_runtime_configurable_cache_size/test.py
+++ b/tests/integration/test_runtime_configurable_cache_size/test.py
@@ -1,7 +1,6 @@
 import os
-import pytest
-import shutil
 import time
+import pytest
 from helpers.cluster import ClickHouseCluster
 
 # Tests that sizes of in-memory caches (mark / uncompressed / index mark / index uncompressed / mmapped file / query cache) can be changed
@@ -95,15 +94,16 @@ CONFIG_DIR = os.path.join(SCRIPT_DIR, "configs")
 
 
 def test_query_cache_size_is_runtime_configurable(start_cluster):
-    # the inital config specifies the maximum query cache size as 2, run 3 queries, expect 2 cache entries
+    # the initial config specifies the maximum query cache size as 2, run 3 queries, expect 2 cache entries
     node.query("SYSTEM DROP QUERY CACHE")
     node.query("SELECT 1 SETTINGS use_query_cache = 1, query_cache_ttl = 1")
     node.query("SELECT 2 SETTINGS use_query_cache = 1, query_cache_ttl = 1")
     node.query("SELECT 3 SETTINGS use_query_cache = 1, query_cache_ttl = 1")
 
-    time.sleep(2.0)
+    time.sleep(2)
+    node.query("SYSTEM RELOAD ASYNCHRONOUS METRICS")
     res = node.query(
-        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'"
+        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'",
     )
     assert res == "2\n"
 
@@ -116,9 +116,10 @@ def test_query_cache_size_is_runtime_configurable(start_cluster):
     node.query("SYSTEM RELOAD CONFIG")
 
     # check that eviction worked as expected
-    time.sleep(2.0)
+    time.sleep(2)
+    node.query("SYSTEM RELOAD ASYNCHRONOUS METRICS")
     res = node.query(
-        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'"
+        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'",
     )
     assert (
         res == "2\n"
@@ -131,9 +132,11 @@ def test_query_cache_size_is_runtime_configurable(start_cluster):
     # check that the new query cache maximum size is respected when more queries run
     node.query("SELECT 4 SETTINGS use_query_cache = 1, query_cache_ttl = 1")
     node.query("SELECT 5 SETTINGS use_query_cache = 1, query_cache_ttl = 1")
-    time.sleep(2.0)
+
+    time.sleep(2)
+    node.query("SYSTEM RELOAD ASYNCHRONOUS METRICS")
     res = node.query(
-        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'"
+        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'QueryCacheEntries'",
     )
     assert res == "1\n"
 
diff --git a/tests/integration/test_s3_cluster/test.py b/tests/integration/test_s3_cluster/test.py
index 673ca318c92..03919ee6a4d 100644
--- a/tests/integration/test_s3_cluster/test.py
+++ b/tests/integration/test_s3_cluster/test.py
@@ -35,7 +35,9 @@ def create_buckets_s3(cluster):
 
             # Make all files a bit different
             for number in range(100 + file_number):
-                data.append([str(number + file_number) * 10, number + file_number])
+                data.append(
+                    ["str_" + str(number + file_number) * 10, number + file_number]
+                )
 
             writer = csv.writer(f)
             writer.writerows(data)
@@ -427,3 +429,33 @@ def test_cluster_with_named_collection(started_cluster):
     )
 
     assert TSV(pure_s3) == TSV(s3_cluster)
+
+
+def test_cluster_format_detection(started_cluster):
+    node = started_cluster.instances["s0_0_0"]
+
+    expected_desc_result = node.query(
+        "desc s3('http://minio1:9001/root/data/generated/*', 'minio', 'minio123', 'CSV')"
+    )
+
+    desc_result = node.query(
+        "desc s3('http://minio1:9001/root/data/generated/*', 'minio', 'minio123')"
+    )
+
+    assert expected_desc_result == desc_result
+
+    expected_result = node.query(
+        "SELECT * FROM s3('http://minio1:9001/root/data/generated/*', 'minio', 'minio123', 'CSV', 'a String, b UInt64') order by a, b"
+    )
+
+    result = node.query(
+        "SELECT * FROM s3Cluster(cluster_simple, 'http://minio1:9001/root/data/generated/*', 'minio', 'minio123') order by c1, c2"
+    )
+
+    assert result == expected_result
+
+    result = node.query(
+        "SELECT * FROM s3Cluster(cluster_simple, 'http://minio1:9001/root/data/generated/*', 'minio', 'minio123', auto, 'a String, b UInt64') order by a, b"
+    )
+
+    assert result == expected_result
diff --git a/tests/integration/test_s3_table_functions/test.py b/tests/integration/test_s3_table_functions/test.py
index a6def175136..ff62d1a9eac 100644
--- a/tests/integration/test_s3_table_functions/test.py
+++ b/tests/integration/test_s3_table_functions/test.py
@@ -80,6 +80,7 @@ def test_s3_table_functions_timeouts(started_cluster):
     Test with timeout limit of 1200ms.
     This should raise an Exception and pass.
     """
+
     with PartitionManager() as pm:
         pm.add_network_delay(node, 1200)
 
diff --git a/tests/integration/test_select_access_rights/configs/remote_servers.xml b/tests/integration/test_select_access_rights/configs/remote_servers.xml
new file mode 100644
index 00000000000..b9aee7f5ca6
--- /dev/null
+++ b/tests/integration/test_select_access_rights/configs/remote_servers.xml
@@ -0,0 +1,12 @@
+<clickhouse>
+    <remote_servers>
+        <default>
+            <shard>
+                <replica>
+                    <host>node1</host>
+                    <port>9000</port>
+                </replica>
+            </shard>
+        </default>
+    </remote_servers>
+</clickhouse>
diff --git a/tests/integration/test_select_access_rights/test_from_system_tables.py b/tests/integration/test_select_access_rights/test_from_system_tables.py
index 3cd6b90109c..7076e5c8ce7 100644
--- a/tests/integration/test_select_access_rights/test_from_system_tables.py
+++ b/tests/integration/test_select_access_rights/test_from_system_tables.py
@@ -6,6 +6,7 @@ from helpers.test_tools import TSV
 cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node",
+    main_configs=["configs/remote_servers.xml"],
     user_configs=[
         "configs/another_user.xml",
     ],
diff --git a/tests/integration/test_select_access_rights/test_main.py b/tests/integration/test_select_access_rights/test_main.py
index eedecc2d30c..bca3c698911 100644
--- a/tests/integration/test_select_access_rights/test_main.py
+++ b/tests/integration/test_select_access_rights/test_main.py
@@ -1,6 +1,7 @@
 import pytest
+
+import re
 from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import TSV
 
 cluster = ClickHouseCluster(__file__)
 instance = cluster.add_instance("instance")
@@ -185,25 +186,39 @@ def test_select_join():
     )
 
     select_query = "SELECT * FROM table1 JOIN table2 USING(d)"
-    assert (
-        "it's necessary to have the grant SELECT(d, x, y) ON default.table2"
-        in instance.query_and_get_error(select_query, user="A")
-    )
+
+    def match_error(err, columns, table):
+        """Check if the error message contains the expected table and columns"""
+
+        match = re.search(
+            r"it's necessary to have the grant SELECT\((.*)\) ON default\.(\w+)", err
+        )
+        if not match:
+            return False
+        if match.group(2) != table:
+            return False
+        assert set(match.group(1).split(", ")) == set(
+            columns.split(", ")
+        ), f"expected {columns} in {err}"
+        return True
+
+    response = instance.query_and_get_error(select_query, user="A")
+    table1_match = match_error(response, "d, a, b", "table1")
+    table2_match = match_error(response, "d, x, y", "table2")
+    assert table1_match or table2_match, response
 
     instance.query("GRANT SELECT(d, x, y) ON default.table2 TO A")
-    assert (
-        "it's necessary to have the grant SELECT(d, a, b) ON default.table1"
-        in instance.query_and_get_error(select_query, user="A")
-    )
+    response = instance.query_and_get_error(select_query, user="A")
+    assert match_error(response, "d, a, b", "table1")
 
+    response = instance.query_and_get_error(select_query, user="A")
     instance.query("GRANT SELECT(d, a, b) ON default.table1 TO A")
+
     assert instance.query(select_query, user="A") == ""
 
     instance.query("REVOKE SELECT ON default.table2 FROM A")
-    assert (
-        "it's necessary to have the grant SELECT(d, x, y) ON default.table2"
-        in instance.query_and_get_error(select_query, user="A")
-    )
+    response = instance.query_and_get_error(select_query, user="A")
+    assert match_error(response, "d, x, y", "table2")
 
 
 def test_select_union():
diff --git a/tests/integration/test_settings_profile/test.py b/tests/integration/test_settings_profile/test.py
index 5e40b534cee..61237af08c5 100644
--- a/tests/integration/test_settings_profile/test.py
+++ b/tests/integration/test_settings_profile/test.py
@@ -68,7 +68,7 @@ def test_smoke():
     )
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000 TO robin\n"
     )
     assert (
         instance.query(
@@ -108,7 +108,7 @@ def test_smoke():
     instance.query("ALTER SETTINGS PROFILE xyz TO NONE")
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000001 MIN 90000000 MAX 110000000\n"
     )
     assert (
         instance.query(
@@ -128,7 +128,7 @@ def test_smoke():
     instance.query("ALTER USER robin SETTINGS PROFILE xyz")
     assert (
         instance.query("SHOW CREATE USER robin")
-        == "CREATE USER robin SETTINGS PROFILE xyz\n"
+        == "CREATE USER robin SETTINGS PROFILE `xyz`\n"
     )
     assert (
         instance.query(
@@ -174,11 +174,11 @@ def test_settings_from_granted_role():
     instance.query("GRANT worker TO robin")
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000\n"
     )
     assert (
         instance.query("SHOW CREATE ROLE worker")
-        == "CREATE ROLE worker SETTINGS PROFILE xyz\n"
+        == "CREATE ROLE worker SETTINGS PROFILE `xyz`\n"
     )
     assert (
         instance.query(
@@ -260,7 +260,7 @@ def test_settings_from_granted_role():
     instance.query("ALTER SETTINGS PROFILE xyz TO worker")
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000 TO worker\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000 TO worker\n"
     )
     assert (
         instance.query(
@@ -282,7 +282,7 @@ def test_settings_from_granted_role():
     instance.query("ALTER SETTINGS PROFILE xyz TO NONE")
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000001 MAX 110000000, max_ast_depth = 2000\n"
     )
     assert (
         instance.query(
@@ -304,11 +304,11 @@ def test_inheritance():
     instance.query("CREATE SETTINGS PROFILE alpha SETTINGS PROFILE xyz TO robin")
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE xyz")
-        == "CREATE SETTINGS PROFILE xyz SETTINGS max_memory_usage = 100000002 CONST\n"
+        == "CREATE SETTINGS PROFILE `xyz` SETTINGS max_memory_usage = 100000002 CONST\n"
     )
     assert (
         instance.query("SHOW CREATE SETTINGS PROFILE alpha")
-        == "CREATE SETTINGS PROFILE alpha SETTINGS INHERIT xyz TO robin\n"
+        == "CREATE SETTINGS PROFILE `alpha` SETTINGS INHERIT `xyz` TO robin\n"
     )
     assert (
         instance.query(
@@ -453,23 +453,44 @@ def test_show_profiles():
     assert instance.query("SHOW SETTINGS PROFILES") == "default\nreadonly\nxyz\n"
     assert instance.query("SHOW PROFILES") == "default\nreadonly\nxyz\n"
 
-    assert instance.query("SHOW CREATE PROFILE xyz") == "CREATE SETTINGS PROFILE xyz\n"
     assert (
-        instance.query("SHOW CREATE SETTINGS PROFILE default")
-        == "CREATE SETTINGS PROFILE default\n"
-    )
-    assert (
-        instance.query("SHOW CREATE PROFILES") == "CREATE SETTINGS PROFILE default\n"
-        "CREATE SETTINGS PROFILE readonly SETTINGS readonly = 1\n"
-        "CREATE SETTINGS PROFILE xyz\n"
+        instance.query("SHOW CREATE PROFILE xyz") == "CREATE SETTINGS PROFILE `xyz`\n"
     )
 
-    expected_access = (
-        "CREATE SETTINGS PROFILE default\n"
-        "CREATE SETTINGS PROFILE readonly SETTINGS readonly = 1\n"
-        "CREATE SETTINGS PROFILE xyz\n"
+    query_possible_response = [
+        "CREATE SETTINGS PROFILE `default`\n",
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n",
+    ]
+    assert (
+        instance.query("SHOW CREATE SETTINGS PROFILE default")
+        in query_possible_response
+    )
+
+    query_possible_response = [
+        "CREATE SETTINGS PROFILE `default`\n"
+        "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
+        "CREATE SETTINGS PROFILE `xyz`\n",
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n"
+        "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
+        "CREATE SETTINGS PROFILE `xyz`\n",
+    ]
+    assert instance.query("SHOW CREATE PROFILES") in query_possible_response
+
+    expected_access = (
+        "CREATE SETTINGS PROFILE `default`\n"
+        "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
+        "CREATE SETTINGS PROFILE `xyz`\n"
+    )
+    expected_access_analyzer = (
+        "CREATE SETTINGS PROFILE `default` SETTINGS allow_experimental_analyzer = true\n"
+        "CREATE SETTINGS PROFILE `readonly` SETTINGS readonly = 1\n"
+        "CREATE SETTINGS PROFILE `xyz`\n"
+    )
+
+    query_response = instance.query("SHOW ACCESS")
+    assert (
+        expected_access in query_response or expected_access_analyzer in query_response
     )
-    assert expected_access in instance.query("SHOW ACCESS")
 
 
 def test_set_profile():
diff --git a/tests/integration/test_sql_user_defined_functions_on_cluster/test.py b/tests/integration/test_sql_user_defined_functions_on_cluster/test.py
index c940998ec42..0bf03f545be 100644
--- a/tests/integration/test_sql_user_defined_functions_on_cluster/test.py
+++ b/tests/integration/test_sql_user_defined_functions_on_cluster/test.py
@@ -1,5 +1,5 @@
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, ClickHouseInstance
 
 cluster = ClickHouseCluster(__file__)
 ch1 = cluster.add_instance(
@@ -24,15 +24,17 @@ def started_cluster():
 
 
 def test_sql_user_defined_functions_on_cluster():
-    assert "Unknown function test_function" in ch1.query_and_get_error(
-        "SELECT test_function(1);"
-    )
-    assert "Unknown function test_function" in ch2.query_and_get_error(
-        "SELECT test_function(1);"
-    )
-    assert "Unknown function test_function" in ch3.query_and_get_error(
-        "SELECT test_function(1);"
-    )
+    def check_function_does_not_exist(node: ClickHouseInstance):
+        error_message = node.query_and_get_error("SELECT test_function(1);")
+        assert (
+            "Unknown function test_function" in error_message
+            or "Function with name 'test_function' does not exists. In scope SELECT test_function(1)"
+            in error_message
+        )
+
+    check_function_does_not_exist(ch1)
+    check_function_does_not_exist(ch2)
+    check_function_does_not_exist(ch3)
 
     ch1.query_with_retry(
         "CREATE FUNCTION test_function ON CLUSTER 'cluster' AS x -> x + 1;"
@@ -43,12 +45,7 @@ def test_sql_user_defined_functions_on_cluster():
     assert ch3.query("SELECT test_function(1);") == "2\n"
 
     ch2.query_with_retry("DROP FUNCTION test_function ON CLUSTER 'cluster'")
-    assert "Unknown function test_function" in ch1.query_and_get_error(
-        "SELECT test_function(1);"
-    )
-    assert "Unknown function test_function" in ch2.query_and_get_error(
-        "SELECT test_function(1);"
-    )
-    assert "Unknown function test_function" in ch3.query_and_get_error(
-        "SELECT test_function(1);"
-    )
+
+    check_function_does_not_exist(ch1)
+    check_function_does_not_exist(ch2)
+    check_function_does_not_exist(ch3)
diff --git a/tests/integration/test_storage_azure_blob_storage/test.py b/tests/integration/test_storage_azure_blob_storage/test.py
index 3cccd07c134..7d30265e4f8 100644
--- a/tests/integration/test_storage_azure_blob_storage/test.py
+++ b/tests/integration/test_storage_azure_blob_storage/test.py
@@ -16,6 +16,7 @@ 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.test_tools import assert_logs_contain_with_retry
 
 
 @pytest.fixture(scope="module")
@@ -967,7 +968,7 @@ def test_union_schema_inference_mode(cluster):
         f"desc azureBlobStorage('{storage_account_url}', 'cont', 'test_union_schema_inference*.jsonl', '{account_name}', '{account_key}', 'auto', 'auto', 'auto') settings schema_inference_mode='union', describe_compact_output=1 format TSV",
         expect_error="true",
     )
-    assert "Cannot extract table structure" in error
+    assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in error
 
 
 def test_schema_inference_cache(cluster):
@@ -1250,3 +1251,95 @@ def test_size_virtual_column(cluster):
         result
         == "test_size_virtual_column1.tsv\t2\ntest_size_virtual_column2.tsv\t3\ntest_size_virtual_column3.tsv\t4\n"
     )
+
+
+def test_format_detection(cluster):
+    node = cluster.instances["node"]
+    storage_account_url = cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]
+    account_name = "devstoreaccount1"
+    account_key = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
+    azure_query(
+        node,
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection0', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt64, y String') select number as x, 'str_' || toString(number) from numbers(0)",
+    )
+
+    azure_query(
+        node,
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt64, y String') select number as x, 'str_' || toString(number) from numbers(10)",
+    )
+
+    expected_desc_result = azure_query(
+        node,
+        f"desc azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'auto')",
+    )
+
+    desc_result = azure_query(
+        node,
+        f"desc azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}')",
+    )
+
+    assert expected_desc_result == desc_result
+
+    expected_result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt64, y String')",
+    )
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}')",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}', auto, auto, 'x UInt64, y String')",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection{{0,1}}', '{account_name}', '{account_key}')",
+    )
+
+    assert result == expected_result
+
+    node.query(f"system drop schema cache for hdfs")
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection{{0,1}}', '{account_name}', '{account_key}')",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection{{0,1}}', '{account_name}', '{account_key}')",
+    )
+
+    assert result == expected_result
+
+
+def test_parallel_read(cluster):
+    node = cluster.instances["node"]
+    connection_string = cluster.env_variables["AZURITE_CONNECTION_STRING"]
+    storage_account_url = cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]
+    account_name = "devstoreaccount1"
+    account_key = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
+
+    azure_query(
+        node,
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_parallel_read.parquet', '{account_name}', '{account_key}') "
+        f"select * from numbers(10000) settings azure_truncate_on_insert=1",
+    )
+    time.sleep(1)
+
+    res = azure_query(
+        node,
+        f"select count() from azureBlobStorage('{connection_string}', 'cont', 'test_parallel_read.parquet')",
+    )
+    assert int(res) == 10000
+    assert_logs_contain_with_retry(node, "AzureBlobStorage readBigAt read bytes")
diff --git a/tests/integration/test_storage_azure_blob_storage/test_cluster.py b/tests/integration/test_storage_azure_blob_storage/test_cluster.py
index 2bd3f24d25f..6c5e2d20ca5 100644
--- a/tests/integration/test_storage_azure_blob_storage/test_cluster.py
+++ b/tests/integration/test_storage_azure_blob_storage/test_cluster.py
@@ -262,3 +262,72 @@ def test_partition_parallel_reading_with_cluster(cluster):
     )
 
     assert azure_cluster == "3\n"
+
+
+def test_format_detection(cluster):
+    node = cluster.instances["node_0"]
+    storage_account_url = cluster.env_variables["AZURITE_STORAGE_ACCOUNT_URL"]
+    account_name = "devstoreaccount1"
+    account_key = "Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw=="
+
+    azure_query(
+        node,
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection0', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt32, y String') select number as x, 'str_' || toString(number) from numbers(10)",
+    )
+
+    azure_query(
+        node,
+        f"INSERT INTO TABLE FUNCTION azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection1', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt32, y String') select number as x, 'str_' || toString(number) from numbers(10, 10)",
+    )
+
+    expected_desc_result = azure_query(
+        node,
+        f"desc azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'auto')",
+    )
+
+    desc_result = azure_query(
+        node,
+        f"desc azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}')",
+    )
+
+    assert expected_desc_result == desc_result
+
+    expected_result = azure_query(
+        node,
+        f"select * from azureBlobStorage('{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', 'JSONEachRow', 'auto', 'x UInt32, y String') order by x",
+    )
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}') order by x",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', auto) order by x",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', auto, auto) order by x",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', 'x UInt32, y String') order by x",
+    )
+
+    assert result == expected_result
+
+    result = azure_query(
+        node,
+        f"select * from azureBlobStorageCluster('simple_cluster', '{storage_account_url}', 'cont', 'test_format_detection*', '{account_name}', '{account_key}', auto, auto, 'x UInt32, y String') order by x",
+    )
+
+    assert result == expected_result
diff --git a/tests/integration/test_storage_delta/test.py b/tests/integration/test_storage_delta/test.py
index 621d2b89fc5..25f0b58e0f5 100644
--- a/tests/integration/test_storage_delta/test.py
+++ b/tests/integration/test_storage_delta/test.py
@@ -26,8 +26,14 @@ 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 minio.deleteobjects import DeleteObject
 
-from helpers.s3_tools import prepare_s3_bucket, upload_directory, get_file_contents
+from helpers.s3_tools import (
+    prepare_s3_bucket,
+    upload_directory,
+    get_file_contents,
+    list_s3_objects,
+)
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -55,6 +61,7 @@ def started_cluster():
             main_configs=["configs/config.d/named_collections.xml"],
             user_configs=["configs/users.d/users.xml"],
             with_minio=True,
+            stay_alive=True,
         )
 
         logging.info("Starting cluster...")
@@ -111,12 +118,12 @@ def get_delta_metadata(delta_metadata_file):
     return combined_json
 
 
-def create_delta_table(node, table_name):
+def create_delta_table(node, table_name, bucket="root"):
     node.query(
         f"""
         DROP TABLE IF EXISTS {table_name};
         CREATE TABLE {table_name}
-        ENGINE=DeltaLake(s3, filename = '{table_name}/')"""
+        ENGINE=DeltaLake(s3, filename = '{table_name}/', url = 'http://minio1:9001/{bucket}/')"""
     )
 
 
@@ -401,3 +408,106 @@ def test_types(started_cluster):
             ["e", "Nullable(Bool)"],
         ]
     )
+
+
+def test_restart_broken(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = "broken"
+    TABLE_NAME = "test_restart_broken"
+
+    if not minio_client.bucket_exists(bucket):
+        minio_client.make_bucket(bucket)
+
+    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}", "")
+    create_delta_table(instance, TABLE_NAME, bucket=bucket)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    s3_objects = list_s3_objects(minio_client, bucket, prefix="")
+    assert (
+        len(
+            list(
+                minio_client.remove_objects(
+                    bucket,
+                    [DeleteObject(obj) for obj in s3_objects],
+                )
+            )
+        )
+        == 0
+    )
+    minio_client.remove_bucket(bucket)
+
+    instance.restart_clickhouse()
+
+    assert "NoSuchBucket" in instance.query_and_get_error(
+        f"SELECT count() FROM {TABLE_NAME}"
+    )
+
+    minio_client.make_bucket(bucket)
+
+    upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+
+def test_restart_broken_table_function(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = "broken2"
+    TABLE_NAME = "test_restart_broken_table_function"
+
+    if not minio_client.bucket_exists(bucket):
+        minio_client.make_bucket(bucket)
+
+    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}", "")
+    instance.query(
+        f"""
+        DROP TABLE IF EXISTS {TABLE_NAME};
+        CREATE TABLE {TABLE_NAME}
+        AS deltaLake(s3, filename = '{TABLE_NAME}/', url = 'http://minio1:9001/{bucket}/')"""
+    )
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    s3_objects = list_s3_objects(minio_client, bucket, prefix="")
+    assert (
+        len(
+            list(
+                minio_client.remove_objects(
+                    bucket,
+                    [DeleteObject(obj) for obj in s3_objects],
+                )
+            )
+        )
+        == 0
+    )
+    minio_client.remove_bucket(bucket)
+
+    instance.restart_clickhouse()
+
+    assert "NoSuchBucket" in instance.query_and_get_error(
+        f"SELECT count() FROM {TABLE_NAME}"
+    )
+
+    minio_client.make_bucket(bucket)
+
+    upload_directory(minio_client, bucket, f"/{TABLE_NAME}", "")
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
diff --git a/tests/integration/test_storage_hdfs/test.py b/tests/integration/test_storage_hdfs/test.py
index 8ed1e4b6c0e..9dec1954406 100644
--- a/tests/integration/test_storage_hdfs/test.py
+++ b/tests/integration/test_storage_hdfs/test.py
@@ -2,10 +2,13 @@ import os
 
 import pytest
 import time
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.test_tools import TSV
 from pyhdfs import HdfsClient
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
@@ -599,9 +602,7 @@ def test_schema_inference_with_globs(started_cluster):
         f"desc hdfs('hdfs://hdfs1:9000/data*.jsoncompacteachrow') settings schema_inference_use_cache_for_hdfs=0, input_format_json_infer_incomplete_types_as_strings=0"
     )
 
-    assert (
-        "Cannot extract table structure from JSONCompactEachRow format file" in result
-    )
+    assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in result
 
 
 def test_insert_select_schema_inference(started_cluster):
@@ -1044,7 +1045,75 @@ def test_union_schema_inference_mode(started_cluster):
     error = node.query_and_get_error(
         "desc hdfs('hdfs://hdfs1:9000/test_union_schema_inference*.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
     )
-    assert "Cannot extract table structure" in error
+    assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in error
+
+
+def test_format_detection(started_cluster):
+    node = started_cluster.instances["node1"]
+
+    node.query(
+        "insert into function hdfs('hdfs://hdfs1:9000/test_format_detection0', JSONEachRow) select number as x, 'str_' || toString(number) as y from numbers(0)"
+    )
+
+    node.query(
+        "insert into function hdfs('hdfs://hdfs1:9000/test_format_detection1', JSONEachRow) select number as x, 'str_' || toString(number) as y from numbers(10)"
+    )
+
+    expected_desc_result = node.query(
+        "desc hdfs('hdfs://hdfs1:9000/test_format_detection1', JSONEachRow)"
+    )
+
+    desc_result = node.query("desc hdfs('hdfs://hdfs1:9000/test_format_detection1')")
+
+    assert expected_desc_result == desc_result
+
+    expected_result = node.query(
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection1', JSONEachRow, 'x UInt64, y String') order by x, y"
+    )
+
+    result = node.query(
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection1') order by x, y"
+    )
+
+    assert expected_result == result
+
+    result = node.query(
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection1', auto, 'x UInt64, y String') order by x, y"
+    )
+
+    assert expected_result == result
+
+    result = node.query(
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection{0,1}') order by x, y"
+    )
+
+    assert expected_result == result
+
+    node.query("system drop schema cache for hdfs")
+
+    result = node.query(
+        "select * from hdfs('hdfs://hdfs1:9000/test_format_detection{0,1}') order by x, y"
+    )
+
+    assert expected_result == result
+
+    result = node.query(
+        "select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/test_format_detection{0,1}') order by x, y"
+    )
+
+    assert expected_result == result
+
+    result = node.query(
+        "select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/test_format_detection{0,1}', auto, auto) order by x, y"
+    )
+
+    assert expected_result == result
+
+    result = node.query(
+        "select * from hdfsCluster(test_cluster_two_shards, 'hdfs://hdfs1:9000/test_format_detection{0,1}', auto, 'x UInt64, y String') order by x, y"
+    )
+
+    assert expected_result == result
 
 
 if __name__ == "__main__":
diff --git a/tests/integration/test_storage_iceberg/test.py b/tests/integration/test_storage_iceberg/test.py
index 9a75dc50d61..d9dee0541b0 100644
--- a/tests/integration/test_storage_iceberg/test.py
+++ b/tests/integration/test_storage_iceberg/test.py
@@ -27,8 +27,14 @@ 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 minio.deleteobjects import DeleteObject
 
-from helpers.s3_tools import prepare_s3_bucket, upload_directory, get_file_contents
+from helpers.s3_tools import (
+    prepare_s3_bucket,
+    upload_directory,
+    get_file_contents,
+    list_s3_objects,
+)
 
 SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -61,6 +67,7 @@ def started_cluster():
             main_configs=["configs/config.d/named_collections.xml"],
             user_configs=["configs/users.d/users.xml"],
             with_minio=True,
+            stay_alive=True,
         )
 
         logging.info("Starting cluster...")
@@ -135,12 +142,12 @@ def generate_data(spark, start, end):
     return df
 
 
-def create_iceberg_table(node, table_name, format="Parquet"):
+def create_iceberg_table(node, table_name, format="Parquet", bucket="root"):
     node.query(
         f"""
         DROP TABLE IF EXISTS {table_name};
         CREATE TABLE {table_name}
-        ENGINE=Iceberg(s3, filename = 'iceberg_data/default/{table_name}/', format={format})"""
+        ENGINE=Iceberg(s3, filename = 'iceberg_data/default/{table_name}/', format={format}, url = 'http://minio1:9001/{bucket}/')"""
     )
 
 
@@ -399,6 +406,8 @@ def test_evolved_schema(started_cluster, format_version):
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
 
+    expected_data = instance.query(f"SELECT * FROM {TABLE_NAME} order by a, b")
+
     spark.sql(f"ALTER TABLE {TABLE_NAME} ADD COLUMNS (x bigint)")
     files = upload_directory(
         minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
@@ -407,6 +416,11 @@ def test_evolved_schema(started_cluster, format_version):
     error = instance.query_and_get_error(f"SELECT * FROM {TABLE_NAME}")
     assert "UNSUPPORTED_METHOD" in error
 
+    data = instance.query(
+        f"SELECT * FROM {TABLE_NAME} SETTINGS iceberg_engine_ignore_schema_evolution=1"
+    )
+    assert data == expected_data
+
 
 def test_row_based_deletes(started_cluster):
     instance = started_cluster.instances["node1"]
@@ -551,3 +565,56 @@ def test_metadata_file_format_with_uuid(started_cluster, format_version):
     create_iceberg_table(instance, TABLE_NAME)
 
     assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 500
+
+
+def test_restart_broken(started_cluster):
+    instance = started_cluster.instances["node1"]
+    spark = started_cluster.spark_session
+    minio_client = started_cluster.minio_client
+    bucket = "broken2"
+    TABLE_NAME = "test_restart_broken_table_function"
+
+    if not minio_client.bucket_exists(bucket):
+        minio_client.make_bucket(bucket)
+
+    parquet_data_path = create_initial_data_file(
+        started_cluster,
+        instance,
+        "SELECT number, toString(number) FROM numbers(100)",
+        TABLE_NAME,
+    )
+
+    write_iceberg_from_file(spark, parquet_data_path, TABLE_NAME, format_version="1")
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
+    )
+    create_iceberg_table(instance, TABLE_NAME, bucket=bucket)
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
+
+    s3_objects = list_s3_objects(minio_client, bucket, prefix="")
+    assert (
+        len(
+            list(
+                minio_client.remove_objects(
+                    bucket,
+                    [DeleteObject(obj) for obj in s3_objects],
+                )
+            )
+        )
+        == 0
+    )
+    minio_client.remove_bucket(bucket)
+
+    instance.restart_clickhouse()
+
+    assert "NoSuchBucket" in instance.query_and_get_error(
+        f"SELECT count() FROM {TABLE_NAME}"
+    )
+
+    minio_client.make_bucket(bucket)
+
+    files = upload_directory(
+        minio_client, bucket, f"/iceberg_data/default/{TABLE_NAME}/", ""
+    )
+
+    assert int(instance.query(f"SELECT count() FROM {TABLE_NAME}")) == 100
diff --git a/tests/integration/test_storage_kafka/configs/kafka.xml b/tests/integration/test_storage_kafka/configs/kafka.xml
index c6075aff715..3bd1b681c9c 100644
--- a/tests/integration/test_storage_kafka/configs/kafka.xml
+++ b/tests/integration/test_storage_kafka/configs/kafka.xml
@@ -11,8 +11,8 @@
         <debug>cgrp,consumer,topic,protocol</debug>
 
         <!-- librdkafka stat in system.kafka_consumers -->
-				<!-- default 3000 (every three second) seems too long for test -->
-				<statistics_interval_ms>600</statistics_interval_ms>
+        <!-- default 3000 (every three second) seems too long for test -->
+        <statistics_interval_ms>600</statistics_interval_ms>
 
         <kafka_topic>
             <name>consumer_hang</name>
diff --git a/tests/integration/test_storage_kafka/test.py b/tests/integration/test_storage_kafka/test.py
index 2176b0151ff..081b15520a1 100644
--- a/tests/integration/test_storage_kafka/test.py
+++ b/tests/integration/test_storage_kafka/test.py
@@ -22,7 +22,7 @@ import kafka.errors
 import pytest
 from google.protobuf.internal.encoder import _VarintBytes
 from helpers.client import QueryRuntimeException
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 from helpers.network import PartitionManager
 from helpers.test_tools import TSV
 from kafka import KafkaAdminClient, KafkaProducer, KafkaConsumer, BrokerConnection
@@ -40,6 +40,8 @@ from . import kafka_pb2
 from . import social_pb2
 from . import message_with_repeated_pb2
 
+if is_arm():
+    pytestmark = pytest.mark.skip
 
 # TODO: add test for run-time offset update in CH, if we manually update it on Kafka side.
 # TODO: add test for SELECT LIMIT is working.
@@ -892,12 +894,14 @@ def test_kafka_formats(kafka_cluster):
 """
 
     expected_rows_count = raw_expected.count("\n")
-    instance.query_with_retry(
+    result_checker = lambda res: res.count("\n") == expected_rows_count
+    res = instance.query_with_retry(
         f"SELECT * FROM test.kafka_{list(all_formats.keys())[-1]}_mv;",
         retry_count=30,
         sleep_time=1,
-        check_callback=lambda res: res.count("\n") == expected_rows_count,
+        check_callback=result_checker,
     )
+    assert result_checker(res)
 
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(("Checking {}".format(format_name)))
@@ -3808,12 +3812,14 @@ def test_kafka_formats_with_broken_message(kafka_cluster):
 """
 
     expected_rows_count = raw_expected.count("\n")
-    instance.query_with_retry(
+    result_checker = lambda res: res.count("\n") == expected_rows_count
+    res = instance.query_with_retry(
         f"SELECT * FROM test.kafka_data_{list(all_formats.keys())[-1]}_mv;",
         retry_count=30,
         sleep_time=1,
-        check_callback=lambda res: res.count("\n") == expected_rows_count,
+        check_callback=result_checker,
     )
+    assert result_checker(res)
 
     for format_name, format_opts in list(all_formats.items()):
         logging.debug(f"Checking {format_name}")
@@ -4446,7 +4452,7 @@ def test_block_based_formats_1(kafka_cluster):
                      kafka_group_name = '{topic}',
                      kafka_format = 'PrettySpace';
 
-        INSERT INTO test.kafka SELECT number * 10 as key, number * 100 as value FROM numbers(5) settings max_block_size=2, optimize_trivial_insert_select=0;
+        INSERT INTO test.kafka SELECT number * 10 as key, number * 100 as value FROM numbers(5) settings max_block_size=2, optimize_trivial_insert_select=0, output_format_pretty_color=1, output_format_pretty_row_numbers=0;
     """
     )
 
@@ -4931,6 +4937,89 @@ def test_formats_errors(kafka_cluster):
         instance.query("DROP TABLE test.view")
 
 
+def test_multiple_read_in_materialized_views(kafka_cluster, max_retries=15):
+    admin_client = KafkaAdminClient(
+        bootstrap_servers="localhost:{}".format(kafka_cluster.kafka_port)
+    )
+
+    topic = "multiple_read_from_mv"
+    kafka_create_topic(admin_client, topic)
+
+    instance.query(
+        f"""
+        DROP TABLE IF EXISTS test.kafka_multiple_read_input;
+        DROP TABLE IF EXISTS test.kafka_multiple_read_table;
+        DROP TABLE IF EXISTS test.kafka_multiple_read_mv;
+
+        CREATE TABLE test.kafka_multiple_read_input (id Int64)
+        ENGINE = Kafka
+        SETTINGS
+            kafka_broker_list = 'kafka1:19092',
+            kafka_topic_list = '{topic}',
+            kafka_group_name = '{topic}',
+            kafka_format = 'JSONEachRow';
+
+        CREATE TABLE test.kafka_multiple_read_table (id Int64)
+        ENGINE = MergeTree
+        ORDER BY id;
+
+
+        CREATE MATERIALIZED VIEW IF NOT EXISTS test.kafka_multiple_read_mv TO test.kafka_multiple_read_table AS
+        SELECT id
+        FROM test.kafka_multiple_read_input
+        WHERE id NOT IN (
+            SELECT id
+            FROM test.kafka_multiple_read_table
+            WHERE id IN (
+                SELECT id
+                FROM test.kafka_multiple_read_input
+            )
+        );
+        """
+    )
+
+    kafka_produce(
+        kafka_cluster, topic, [json.dumps({"id": 42}), json.dumps({"id": 43})]
+    )
+
+    expected_result = "42\n43\n"
+    res = instance.query_with_retry(
+        f"SELECT id FROM test.kafka_multiple_read_table ORDER BY id",
+        retry_count=30,
+        sleep_time=0.5,
+        check_callback=lambda res: res == expected_result,
+    )
+    assert res == expected_result
+
+    # Verify that the query deduplicates the records as it meant to be
+    messages = []
+    for i in range(0, 10):
+        messages.append(json.dumps({"id": 42}))
+        messages.append(json.dumps({"id": 43}))
+
+    messages.append(json.dumps({"id": 44}))
+
+    kafka_produce(kafka_cluster, topic, messages)
+
+    expected_result = "42\n43\n44\n"
+    res = instance.query_with_retry(
+        f"SELECT id FROM test.kafka_multiple_read_table ORDER BY id",
+        retry_count=30,
+        sleep_time=0.5,
+        check_callback=lambda res: res == expected_result,
+    )
+    assert res == expected_result
+
+    kafka_delete_topic(admin_client, topic)
+    instance.query(
+        f"""
+        DROP TABLE test.kafka_multiple_read_input;
+        DROP TABLE test.kafka_multiple_read_table;
+        DROP TABLE test.kafka_multiple_read_mv;
+        """
+    )
+
+
 if __name__ == "__main__":
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_kerberized_hdfs/test.py b/tests/integration/test_storage_kerberized_hdfs/test.py
index 5ac8b4670f9..c72152fa376 100644
--- a/tests/integration/test_storage_kerberized_hdfs/test.py
+++ b/tests/integration/test_storage_kerberized_hdfs/test.py
@@ -3,9 +3,12 @@ import pytest
 
 import os
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, is_arm
 import subprocess
 
+if is_arm():
+    pytestmark = pytest.mark.skip
+
 cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
diff --git a/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh b/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
index 07437c42359..1c7419a05e7 100644
--- a/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
+++ b/tests/integration/test_storage_kerberized_kafka/kerberos_image_config.sh
@@ -105,6 +105,9 @@ create_keytabs() {
   kadmin.local -q "addprinc -randkey kafkauser/instance@${REALM}"
   kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab kafkauser/instance@${REALM}"
 
+  kadmin.local -q "addprinc -randkey anotherkafkauser/instance@${REALM}"
+  kadmin.local -q "ktadd -norandkey -k /tmp/keytab/clickhouse.keytab anotherkafkauser/instance@${REALM}"
+
   chmod g+r /tmp/keytab/clickhouse.keytab
 
 }
diff --git a/tests/integration/test_storage_kerberized_kafka/test.py b/tests/integration/test_storage_kerberized_kafka/test.py
index 7856361deda..451e1ab2ccf 100644
--- a/tests/integration/test_storage_kerberized_kafka/test.py
+++ b/tests/integration/test_storage_kerberized_kafka/test.py
@@ -227,6 +227,58 @@ def test_kafka_json_as_string_no_kdc(kafka_cluster):
     assert instance.contains_in_log("KerberosInit failure:")
 
 
+def test_kafka_config_from_sql_named_collection(kafka_cluster):
+    kafka_produce(
+        kafka_cluster,
+        "kafka_json_as_string",
+        [
+            '{"t": 123, "e": {"x": "woof"} }',
+            "",
+            '{"t": 124, "e": {"x": "test"} }',
+            '{"F1":"V1","F2":{"F21":"V21","F22":{},"F23":"V23","F24":"2019-12-24T16:28:04"},"F3":"V3"}',
+        ],
+    )
+
+    instance.query(
+        """
+        CREATE NAMED COLLECTION kafka_config AS
+            kafka.security_protocol = 'SASL_PLAINTEXT',
+            kafka.sasl_mechanism = 'GSSAPI',
+            kafka.sasl_kerberos_service_name = 'kafka',
+            kafka.sasl_kerberos_keytab = '/tmp/keytab/clickhouse.keytab',
+            kafka.sasl_kerberos_principal = 'anotherkafkauser/instance@TEST.CLICKHOUSE.TECH',
+            kafka.debug = 'security',
+            kafka.api_version_request = 'false',
+
+            kafka_broker_list = 'kerberized_kafka1:19092',
+            kafka_topic_list = 'kafka_json_as_string',
+            kafka_commit_on_select = 1,
+            kafka_group_name = 'kafka_json_as_string',
+            kafka_format = 'JSONAsString',
+            kafka_flush_interval_ms=1000;
+        """
+    )
+    instance.query(
+        """
+        CREATE TABLE test.kafka (field String)
+            ENGINE = Kafka(kafka_config);
+        """
+    )
+
+    time.sleep(3)
+
+    result = instance.query("SELECT * FROM test.kafka;")
+    expected = """\
+{"t": 123, "e": {"x": "woof"} }
+{"t": 124, "e": {"x": "test"} }
+{"F1":"V1","F2":{"F21":"V21","F22":{},"F23":"V23","F24":"2019-12-24T16:28:04"},"F3":"V3"}
+"""
+    assert TSV(result) == TSV(expected)
+    assert instance.contains_in_log(
+        "Parsing of message (topic: kafka_json_as_string, partition: 0, offset: 1) return no rows"
+    )
+
+
 if __name__ == "__main__":
     cluster.start()
     input("Cluster created, press any key to destroy...")
diff --git a/tests/integration/test_storage_mysql/configs/named_collections.xml b/tests/integration/test_storage_mysql/configs/named_collections.xml
index 04117f32d4b..d20630eaeb3 100644
--- a/tests/integration/test_storage_mysql/configs/named_collections.xml
+++ b/tests/integration/test_storage_mysql/configs/named_collections.xml
@@ -3,7 +3,7 @@
         <mysql1>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>clickhouse</database>
             <table>test_table</table>
@@ -16,7 +16,7 @@
         <mysql3>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>1111</port>
             <database>clickhouse</database>
             <table>test_table</table>
@@ -24,7 +24,7 @@
         <mysql4>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>clickhouse</database>
             <table>test_table</table>
@@ -33,7 +33,7 @@
         <mysql_with_settings>
             <user>root</user>
             <password>clickhouse</password>
-            <host>mysql57</host>
+            <host>mysql80</host>
             <port>3306</port>
             <database>clickhouse</database>
             <connection_pool_size>1</connection_pool_size>
diff --git a/tests/integration/test_storage_mysql/test.py b/tests/integration/test_storage_mysql/test.py
index e2257026dc7..b131d8fe51c 100644
--- a/tests/integration/test_storage_mysql/test.py
+++ b/tests/integration/test_storage_mysql/test.py
@@ -14,7 +14,7 @@ node1 = cluster.add_instance(
     "node1",
     main_configs=["configs/remote_servers.xml", "configs/named_collections.xml"],
     user_configs=["configs/users.xml"],
-    with_mysql=True,
+    with_mysql8=True,
 )
 node2 = cluster.add_instance(
     "node2", main_configs=["configs/remote_servers.xml"], with_mysql_cluster=True
@@ -23,7 +23,7 @@ node3 = cluster.add_instance(
     "node3",
     main_configs=["configs/remote_servers.xml"],
     user_configs=["configs/users.xml"],
-    with_mysql=True,
+    with_mysql8=True,
 )
 
 create_table_sql_template = """
@@ -43,7 +43,7 @@ drop_table_sql_template = """
 
 def get_mysql_conn(started_cluster, host):
     conn = pymysql.connect(
-        user="root", password="clickhouse", host=host, port=started_cluster.mysql_port
+        user="root", password="clickhouse", host=host, port=started_cluster.mysql8_port
     )
     return conn
 
@@ -69,7 +69,7 @@ def started_cluster():
     try:
         cluster.start()
 
-        conn = get_mysql_conn(cluster, cluster.mysql_ip)
+        conn = get_mysql_conn(cluster, cluster.mysql8_ip)
         create_mysql_db(conn, "clickhouse")
 
         ## create mysql db and table
@@ -85,13 +85,13 @@ def test_many_connections(started_cluster):
     table_name = "test_many_connections"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse');
 """.format(
             table_name, table_name
         )
@@ -116,13 +116,13 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
 def test_insert_select(started_cluster):
     table_name = "test_insert_select"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse');
 """.format(
             table_name, table_name
         )
@@ -142,13 +142,13 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
 def test_replace_select(started_cluster):
     table_name = "test_replace_select"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse', 1);
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse', 1);
 """.format(
             table_name, table_name
         )
@@ -173,13 +173,13 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
 def test_insert_on_duplicate_select(started_cluster):
     table_name = "test_insert_on_duplicate_select"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse', 0, 'update money = money + values(money)');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse', 0, 'update money = money + values(money)');
 """.format(
             table_name, table_name
         )
@@ -205,12 +205,12 @@ def test_where(started_cluster):
     table_name = "test_where"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse');
 """.format(
             table_name, table_name
         )
@@ -264,11 +264,11 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL
 
 
 def test_table_function(started_cluster):
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, "table_function")
     create_mysql_table(conn, "table_function")
     table_function = (
-        "mysql('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')".format(
+        "mysql('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse')".format(
             "table_function"
         )
     )
@@ -309,7 +309,7 @@ def test_table_function(started_cluster):
 
 
 def test_schema_inference(started_cluster):
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, "inference_table")
 
     with conn.cursor() as cursor:
@@ -317,7 +317,7 @@ def test_schema_inference(started_cluster):
             "CREATE TABLE clickhouse.inference_table (id INT PRIMARY KEY, data BINARY(16) NOT NULL)"
         )
 
-    parameters = "'mysql57:3306', 'clickhouse', 'inference_table', 'root', 'clickhouse'"
+    parameters = "'mysql80:3306', 'clickhouse', 'inference_table', 'root', 'clickhouse'"
 
     node1.query(
         f"CREATE TABLE mysql_schema_inference_engine ENGINE=MySQL({parameters})"
@@ -335,7 +335,7 @@ def test_schema_inference(started_cluster):
 
 
 def test_binary_type(started_cluster):
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, "binary_type")
 
     with conn.cursor() as cursor:
@@ -343,7 +343,7 @@ def test_binary_type(started_cluster):
             "CREATE TABLE clickhouse.binary_type (id INT PRIMARY KEY, data BINARY(16) NOT NULL)"
         )
     table_function = (
-        "mysql('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')".format(
+        "mysql('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse')".format(
             "binary_type"
         )
     )
@@ -363,12 +363,12 @@ def test_enum_type(started_cluster):
     table_name = "test_enum_type"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
     node1.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, source Enum8('IP' = 1, 'URL' = 2)) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse', 1);
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, source Enum8('IP' = 1, 'URL' = 2)) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse', 1);
 """.format(
             table_name, table_name
         )
@@ -388,7 +388,7 @@ CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32, source Enum8('
 def test_mysql_distributed(started_cluster):
     table_name = "test_replicas"
 
-    conn1 = get_mysql_conn(started_cluster, started_cluster.mysql_ip)
+    conn1 = get_mysql_conn(started_cluster, started_cluster.mysql8_ip)
     conn2 = get_mysql_conn(started_cluster, started_cluster.mysql2_ip)
     conn3 = get_mysql_conn(started_cluster, started_cluster.mysql3_ip)
     conn4 = get_mysql_conn(started_cluster, started_cluster.mysql4_ip)
@@ -422,7 +422,7 @@ def test_mysql_distributed(started_cluster):
             CREATE TABLE test_replica{}
             (id UInt32, name String, age UInt32, money UInt32)
             ENGINE = MySQL('mysql{}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse');""".format(
-                i, 57 if i == 1 else i
+                i, 80 if i == 1 else i
             )
         )
         nodes[i - 1].query(
@@ -433,11 +433,11 @@ def test_mysql_distributed(started_cluster):
 
     # test multiple ports parsing
     result = node2.query(
-        """SELECT DISTINCT(name) FROM mysql('mysql{57|2|3}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
+        """SELECT DISTINCT(name) FROM mysql('mysql{80|2|3}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
     )
     assert result == "host1\n" or result == "host2\n" or result == "host3\n"
     result = node2.query(
-        """SELECT DISTINCT(name) FROM mysql('mysql57:3306|mysql2:3306|mysql3:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
+        """SELECT DISTINCT(name) FROM mysql('mysql80:3306|mysql2:3306|mysql3:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
     )
     assert result == "host1\n" or result == "host2\n" or result == "host3\n"
 
@@ -457,7 +457,7 @@ def test_mysql_distributed(started_cluster):
         """
         CREATE TABLE test_shards
         (id UInt32, name String, age UInt32, money UInt32)
-        ENGINE = ExternalDistributed('MySQL', 'mysql{57|2}:3306,mysql{3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
+        ENGINE = ExternalDistributed('MySQL', 'mysql{80|2}:3306,mysql{3|4}:3306', 'clickhouse', 'test_replicas', 'root', 'clickhouse'); """
     )
 
     # Check only one replica in each shard is used
@@ -472,24 +472,24 @@ def test_mysql_distributed(started_cluster):
     result = node2.query(query)
     assert result == "host1\nhost2\nhost3\nhost4\n"
 
-    # disconnect mysql57
-    started_cluster.pause_container("mysql57")
+    # disconnect mysql
+    started_cluster.pause_container("mysql80")
     result = node2.query("SELECT DISTINCT(name) FROM test_shards ORDER BY name")
-    started_cluster.unpause_container("mysql57")
+    started_cluster.unpause_container("mysql80")
     assert result == "host2\nhost4\n" or result == "host3\nhost4\n"
 
 
 def test_external_settings(started_cluster):
     table_name = "test_external_settings"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
-    conn = get_mysql_conn(started_cluster, started_cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, started_cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
     node3.query(f"DROP TABLE IF EXISTS {table_name}")
     node3.query(
         """
-CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse');
+CREATE TABLE {}(id UInt32, name String, age UInt32, money UInt32) ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse');
 """.format(
             table_name, table_name
         )
@@ -521,7 +521,7 @@ def test_settings_connection_wait_timeout(started_cluster):
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
     wait_timeout = 2
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
@@ -534,7 +534,7 @@ def test_settings_connection_wait_timeout(started_cluster):
             age UInt32,
             money UInt32
         )
-        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse')
         SETTINGS connection_wait_timeout={}, connection_pool_size=1
         """.format(
             table_name, table_name, wait_timeout
@@ -584,7 +584,7 @@ def test_settings_connection_wait_timeout(started_cluster):
 
 
 def test_predefined_connection_configuration(started_cluster):
-    conn = get_mysql_conn(started_cluster, started_cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, started_cluster.mysql8_ip)
     table_name = "test_table"
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
@@ -655,7 +655,7 @@ def test_predefined_connection_configuration(started_cluster):
     assert node1.query(f"SELECT count() FROM test_table").rstrip() == "100"
 
     assert "Connection pool cannot have zero size" in node1.query_and_get_error(
-        "SELECT count() FROM mysql(mysql1, table='test_table', connection_pool_size=0)"
+        "SELECT count() FROM mysql(mysql1, `table`='test_table', connection_pool_size=0)"
     )
     assert "Connection pool cannot have zero size" in node1.query_and_get_error(
         "SELECT count() FROM mysql(mysql4)"
@@ -671,7 +671,7 @@ def test_mysql_in(started_cluster):
     table_name = "test_mysql_in"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
@@ -684,7 +684,7 @@ def test_mysql_in(started_cluster):
             age UInt32,
             money UInt32
         )
-        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse')
         """.format(
             table_name, table_name
         )
@@ -714,7 +714,7 @@ def test_mysql_null(started_cluster):
     table_name = "test_mysql_in"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     with conn.cursor() as cursor:
         cursor.execute(
@@ -735,7 +735,7 @@ def test_mysql_null(started_cluster):
             id UInt32,
             money Nullable(UInt32)
         )
-        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{}', 'root', 'clickhouse')
+        ENGINE = MySQL('mysql80:3306', 'clickhouse', '{}', 'root', 'clickhouse')
         """.format(
             table_name, table_name
         )
@@ -780,7 +780,7 @@ def test_settings(started_cluster):
     connect_timeout = 10123002
     connection_pool_size = 1
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     create_mysql_table(conn, table_name)
 
@@ -793,7 +793,7 @@ def test_settings(started_cluster):
             age UInt32,
             money UInt32
         )
-        ENGINE = MySQL('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')
+        ENGINE = MySQL('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')
         SETTINGS connection_wait_timeout={wait_timeout}, connect_timeout={connect_timeout}, read_write_timeout={rw_timeout}, connection_pool_size={connection_pool_size}
         """
     )
@@ -815,7 +815,7 @@ def test_settings(started_cluster):
     node1.query(
         f"""
         SELECT *
-            FROM mysql('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse',
+            FROM mysql('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse',
                        SETTINGS
                            connection_wait_timeout={wait_timeout},
                            connect_timeout={connect_timeout},
@@ -843,7 +843,7 @@ def test_settings(started_cluster):
     connect_timeout = 50123002
     node1.query(
         f"""
-        CREATE DATABASE mm ENGINE = MySQL('mysql57:3306', 'clickhouse', 'root', 'clickhouse')
+        CREATE DATABASE mm ENGINE = MySQL('mysql80:3306', 'clickhouse', 'root', 'clickhouse')
             SETTINGS
                 connection_wait_timeout={wait_timeout},
                 connect_timeout={connect_timeout},
@@ -863,7 +863,7 @@ def test_mysql_point(started_cluster):
     table_name = "test_mysql_point"
     node1.query(f"DROP TABLE IF EXISTS {table_name}")
 
-    conn = get_mysql_conn(started_cluster, cluster.mysql_ip)
+    conn = get_mysql_conn(started_cluster, cluster.mysql8_ip)
     drop_mysql_table(conn, table_name)
     with conn.cursor() as cursor:
         cursor.execute(
@@ -882,25 +882,25 @@ def test_mysql_point(started_cluster):
     conn.commit()
 
     result = node1.query(
-        f"DESCRIBE mysql('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
+        f"DESCRIBE mysql('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
     )
     assert result.strip() == "id\tInt32\t\t\t\t\t\npoint\tPoint"
 
     assert 1 == int(
         node1.query(
-            f"SELECT count() FROM mysql('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
+            f"SELECT count() FROM mysql('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
         )
     )
     assert (
         "(15,20)"
         == node1.query(
-            f"SELECT point FROM mysql('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
+            f"SELECT point FROM mysql('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
         ).strip()
     )
 
     node1.query("DROP TABLE IF EXISTS test")
     node1.query(
-        f"CREATE TABLE test (id Int32, point Point) Engine=MySQL('mysql57:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
+        f"CREATE TABLE test (id Int32, point Point) Engine=MySQL('mysql80:3306', 'clickhouse', '{table_name}', 'root', 'clickhouse')"
     )
     assert "(15,20)" == node1.query(f"SELECT point FROM test").strip()
 
diff --git a/tests/integration/test_storage_numbers/test.py b/tests/integration/test_storage_numbers/test.py
index 61fe8719ea2..cbd7793fd8c 100644
--- a/tests/integration/test_storage_numbers/test.py
+++ b/tests/integration/test_storage_numbers/test.py
@@ -242,3 +242,19 @@ def test_overflow(started_cluster):
     )
     assert response == "(18446744073709551614),(18446744073709551615),(0),(1),(2)"
     check_read_rows("test_overflow", 5)
+
+
+def test_non_number_filter(started_cluster):
+    response = node.query(
+        "SELECT toString(number) as a FROM numbers(3) WHERE a = '1' FORMAT Values",
+        query_id="test_non_number_filter",
+    )
+    assert response == "('1')"
+    check_read_rows("test_non_number_filter", 3)
+
+    response = node.query(
+        "SELECT toString(number) as a FROM numbers(1, 4) WHERE a = '1' FORMAT Values SETTINGS max_block_size = 3",
+        query_id="test_non_number_filter2",
+    )
+    assert response == "('1')"
+    check_read_rows("test_non_number_filter2", 4)
diff --git a/tests/integration/test_storage_rabbitmq/configs/mergetree.xml b/tests/integration/test_storage_rabbitmq/configs/mergetree.xml
new file mode 100644
index 00000000000..61eba8face7
--- /dev/null
+++ b/tests/integration/test_storage_rabbitmq/configs/mergetree.xml
@@ -0,0 +1,5 @@
+<clickhouse>
+    <merge_tree>
+        <parts_to_throw_insert>0</parts_to_throw_insert>
+    </merge_tree>
+</clickhouse>
diff --git a/tests/integration/test_storage_rabbitmq/test.py b/tests/integration/test_storage_rabbitmq/test.py
index f26a273fe5e..1017e58e50c 100644
--- a/tests/integration/test_storage_rabbitmq/test.py
+++ b/tests/integration/test_storage_rabbitmq/test.py
@@ -37,16 +37,29 @@ instance2 = cluster.add_instance(
     with_rabbitmq=True,
 )
 
+instance3 = cluster.add_instance(
+    "instance3",
+    user_configs=["configs/users.xml"],
+    main_configs=[
+        "configs/rabbitmq.xml",
+        "configs/macros.xml",
+        "configs/named_collection.xml",
+        "configs/mergetree.xml",
+    ],
+    with_rabbitmq=True,
+    stay_alive=True,
+)
+
 # Helpers
 
 
-def rabbitmq_check_result(result, check=False, ref_file="test_rabbitmq_json.reference"):
-    fpath = p.join(p.dirname(__file__), ref_file)
-    with open(fpath) as reference:
-        if check:
-            assert TSV(result) == TSV(reference)
-        else:
-            return TSV(result) == TSV(reference)
+def rabbitmq_check_result(result, check=False, reference=None):
+    if reference is None:
+        reference = "\n".join([f"{i}\t{i}" for i in range(50)])
+    if check:
+        assert TSV(result) == TSV(reference)
+    else:
+        return TSV(result) == TSV(reference)
 
 
 def wait_rabbitmq_to_start(rabbitmq_docker_id, cookie, timeout=180):
@@ -84,6 +97,7 @@ def rabbitmq_cluster():
         cluster.start()
         logging.debug("rabbitmq_id is {}".format(instance.cluster.rabbitmq_docker_id))
         instance.query("CREATE DATABASE test")
+        instance3.query("CREATE DATABASE test")
 
         yield cluster
 
@@ -119,9 +133,10 @@ def test_rabbitmq_select(rabbitmq_cluster, secure):
     if secure:
         port = cluster.rabbitmq_secure_port
 
+    # MATERIALIZED and ALIAS columns are not supported in RabbitMQ engine, but we can test that it does not fail
     instance.query(
         """
-        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
+        CREATE TABLE test.rabbitmq (key UInt64, value UInt64, value2 ALIAS value + 1, value3 MATERIALIZED value + 1)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = '{}:{}',
                      rabbitmq_exchange_name = 'select',
@@ -134,6 +149,11 @@ def test_rabbitmq_select(rabbitmq_cluster, secure):
         )
     )
 
+    assert (
+        "RabbitMQ table engine doesn\\'t support ALIAS, DEFAULT or MATERIALIZED columns"
+        in instance.query("SELECT * FROM system.warnings")
+    )
+
     credentials = pika.PlainCredentials("root", "clickhouse")
     parameters = pika.ConnectionParameters(
         rabbitmq_cluster.rabbitmq_ip, rabbitmq_cluster.rabbitmq_port, "/", credentials
@@ -365,7 +385,7 @@ def test_rabbitmq_macros(rabbitmq_cluster):
 def test_rabbitmq_materialized_view(rabbitmq_cluster):
     instance.query(
         """
-        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
+        CREATE TABLE test.rabbitmq (key UInt64, value UInt64, dt1 DateTime MATERIALIZED now(), value2 ALIAS value + 1)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
                      rabbitmq_exchange_name = 'mv',
@@ -470,9 +490,11 @@ def test_rabbitmq_many_materialized_views(rabbitmq_cluster):
         """
         DROP TABLE IF EXISTS test.view1;
         DROP TABLE IF EXISTS test.view2;
+        DROP TABLE IF EXISTS test.view3;
         DROP TABLE IF EXISTS test.consumer1;
         DROP TABLE IF EXISTS test.consumer2;
-        CREATE TABLE test.rabbitmq (key UInt64, value UInt64)
+        DROP TABLE IF EXISTS test.consumer3;
+        CREATE TABLE test.rabbitmq (key UInt64, value UInt64, value2 ALIAS value + 1, value3 MATERIALIZED value + 1, value4 DEFAULT 1)
             ENGINE = RabbitMQ
             SETTINGS rabbitmq_host_port = 'rabbitmq1:5672',
                      rabbitmq_exchange_name = 'mmv',
@@ -483,13 +505,18 @@ def test_rabbitmq_many_materialized_views(rabbitmq_cluster):
         CREATE TABLE test.view1 (key UInt64, value UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
-        CREATE TABLE test.view2 (key UInt64, value UInt64)
+        CREATE TABLE test.view2 (key UInt64, value UInt64, value2 UInt64, value3 UInt64, value4 UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+        CREATE TABLE test.view3 (key UInt64)
             ENGINE = MergeTree()
             ORDER BY key;
         CREATE MATERIALIZED VIEW test.consumer1 TO test.view1 AS
             SELECT * FROM test.rabbitmq;
         CREATE MATERIALIZED VIEW test.consumer2 TO test.view2 AS
             SELECT * FROM test.rabbitmq;
+        CREATE MATERIALIZED VIEW test.consumer3 TO test.view3 AS
+            SELECT * FROM test.rabbitmq;
     """
     )
 
@@ -500,7 +527,7 @@ def test_rabbitmq_many_materialized_views(rabbitmq_cluster):
     connection = pika.BlockingConnection(parameters)
     channel = connection.channel()
 
-    instance.wait_for_log_line("Started streaming to 2 attached views")
+    instance.wait_for_log_line("Started streaming to 3 attached views")
 
     messages = []
     for i in range(50):
@@ -508,24 +535,43 @@ def test_rabbitmq_many_materialized_views(rabbitmq_cluster):
     for message in messages:
         channel.basic_publish(exchange="mmv", routing_key="", body=message)
 
-    while True:
+    is_check_passed = False
+    deadline = time.monotonic() + 60
+    while time.monotonic() < deadline:
         result1 = instance.query("SELECT * FROM test.view1 ORDER BY key")
         result2 = instance.query("SELECT * FROM test.view2 ORDER BY key")
-        if rabbitmq_check_result(result1) and rabbitmq_check_result(result2):
+        result3 = instance.query("SELECT * FROM test.view3 ORDER BY key")
+        # Note that for view2 result is `i i 0 0 0`, but not `i i i+1 i+1 1` as expected, ALIAS/MATERIALIZED/DEFAULT columns are not supported in RabbitMQ engine
+        # We onlt check that at least it do not fail
+        if (
+            rabbitmq_check_result(result1)
+            and rabbitmq_check_result(
+                result2, reference="\n".join([f"{i}\t{i}\t0\t0\t0" for i in range(50)])
+            )
+            and rabbitmq_check_result(
+                result3, reference="\n".join([str(i) for i in range(50)])
+            )
+        ):
+            is_check_passed = True
             break
+        time.sleep(0.1)
+
+    assert (
+        is_check_passed
+    ), f"References are not equal to results, result1: {result1}, result2: {result2}, result3: {result3}"
 
     instance.query(
         """
         DROP TABLE test.consumer1;
         DROP TABLE test.consumer2;
+        DROP TABLE test.consumer3;
         DROP TABLE test.view1;
         DROP TABLE test.view2;
+        DROP TABLE test.view3;
     """
     )
 
     connection.close()
-    rabbitmq_check_result(result1, True)
-    rabbitmq_check_result(result2, True)
 
 
 def test_rabbitmq_big_message(rabbitmq_cluster):
@@ -3156,7 +3202,7 @@ def test_block_based_formats_1(rabbitmq_cluster):
     )
 
     instance.query(
-        "INSERT INTO test.rabbitmq SELECT number * 10 as key, number * 100 as value FROM numbers(5) settings max_block_size=2, optimize_trivial_insert_select=0;"
+        "INSERT INTO test.rabbitmq SELECT number * 10 as key, number * 100 as value FROM numbers(5) settings max_block_size=2, optimize_trivial_insert_select=0, output_format_pretty_color=1, output_format_pretty_row_numbers=0;"
     )
     insert_messages = []
 
@@ -3538,3 +3584,99 @@ def test_rabbitmq_handle_error_mode_stream(rabbitmq_cluster):
 
     expected = "".join(sorted(expected))
     assert broken_messages == expected
+
+
+def test_attach_broken_table(rabbitmq_cluster):
+    instance.query(
+        "ATTACH TABLE rabbit_queue UUID '2d1cdf1a-f060-4a61-a7c9-5b59e59992c6' (`payload` String) ENGINE = RabbitMQ SETTINGS rabbitmq_host_port = 'nonexisting:5671', rabbitmq_format = 'JSONEachRow', rabbitmq_username = 'test', rabbitmq_password = 'test'"
+    )
+
+    error = instance.query_and_get_error("SELECT * FROM rabbit_queue")
+    assert "CANNOT_CONNECT_RABBITMQ" in error
+    error = instance.query_and_get_error("INSERT INTO rabbit_queue VALUES ('test')")
+    assert "CANNOT_CONNECT_RABBITMQ" in error
+
+
+def test_rabbitmq_nack_failed_insert(rabbitmq_cluster):
+    table_name = "nack_failed_insert"
+    exchange = f"{table_name}_exchange"
+
+    credentials = pika.PlainCredentials("root", "clickhouse")
+    parameters = pika.ConnectionParameters(
+        rabbitmq_cluster.rabbitmq_ip, rabbitmq_cluster.rabbitmq_port, "/", credentials
+    )
+    connection = pika.BlockingConnection(parameters)
+    channel = connection.channel()
+
+    channel.exchange_declare(exchange="deadl")
+
+    result = channel.queue_declare(queue="deadq")
+    queue_name = result.method.queue
+    channel.queue_bind(exchange="deadl", routing_key="", queue=queue_name)
+
+    instance3.query(
+        f"""
+        CREATE TABLE test.{table_name} (key UInt64, value UInt64)
+            ENGINE = RabbitMQ
+            SETTINGS rabbitmq_host_port = '{rabbitmq_cluster.rabbitmq_host}:5672',
+                     rabbitmq_flush_interval_ms=1000,
+                     rabbitmq_exchange_name = '{exchange}',
+                     rabbitmq_format = 'JSONEachRow',
+                    rabbitmq_queue_settings_list='x-dead-letter-exchange=deadl';
+
+        DROP TABLE IF EXISTS test.view;
+        CREATE TABLE test.view (key UInt64, value UInt64)
+            ENGINE = MergeTree()
+            ORDER BY key;
+
+        DROP TABLE IF EXISTS test.consumer;
+        CREATE MATERIALIZED VIEW test.consumer TO test.view AS
+            SELECT * FROM test.{table_name};
+        """
+    )
+
+    num_rows = 25
+    for i in range(num_rows):
+        message = json.dumps({"key": i, "value": i}) + "\n"
+        channel.basic_publish(exchange=exchange, routing_key="", body=message)
+
+    instance3.wait_for_log_line(
+        "Failed to push to views. Error: Code: 252. DB::Exception: Too many parts"
+    )
+
+    instance3.replace_in_config(
+        "/etc/clickhouse-server/config.d/mergetree.xml",
+        "parts_to_throw_insert>0",
+        "parts_to_throw_insert>10",
+    )
+    instance3.restart_clickhouse()
+
+    count = [0]
+
+    def on_consume(channel, method, properties, body):
+        channel.basic_publish(exchange=exchange, routing_key="", body=body)
+        count[0] += 1
+        if count[0] == num_rows:
+            channel.stop_consuming()
+
+    channel.basic_consume(queue_name, on_consume)
+    channel.start_consuming()
+
+    attempt = 0
+    count = 0
+    while attempt < 100:
+        count = int(instance3.query("SELECT count() FROM test.view"))
+        if count == num_rows:
+            break
+        attempt += 1
+
+    assert count == num_rows
+
+    instance3.query(
+        f"""
+        DROP TABLE test.consumer;
+        DROP TABLE test.view;
+        DROP TABLE test.{table_name};
+    """
+    )
+    connection.close()
diff --git a/tests/integration/test_storage_rabbitmq/test_rabbitmq_json.reference b/tests/integration/test_storage_rabbitmq/test_rabbitmq_json.reference
deleted file mode 100644
index 959bb2aad74..00000000000
--- a/tests/integration/test_storage_rabbitmq/test_rabbitmq_json.reference
+++ /dev/null
@@ -1,50 +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
-14	14
-15	15
-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
-30	30
-31	31
-32	32
-33	33
-34	34
-35	35
-36	36
-37	37
-38	38
-39	39
-40	40
-41	41
-42	42
-43	43
-44	44
-45	45
-46	46
-47	47
-48	48
-49	49
diff --git a/tests/integration/test_storage_s3/s3_mocks/unstable_server.py b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
index 5ef781bdc9e..70d49b7c1b0 100644
--- a/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
+++ b/tests/integration/test_storage_s3/s3_mocks/unstable_server.py
@@ -118,5 +118,5 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
             self.wfile.write(b"OK")
 
 
-httpd = http.server.HTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
+httpd = http.server.ThreadingHTTPServer(("0.0.0.0", int(sys.argv[1])), RequestHandler)
 httpd.serve_forever()
diff --git a/tests/integration/test_storage_s3/test.py b/tests/integration/test_storage_s3/test.py
index 2549cb0d473..6d5b84a8143 100644
--- a/tests/integration/test_storage_s3/test.py
+++ b/tests/integration/test_storage_s3/test.py
@@ -1379,9 +1379,7 @@ def test_schema_inference_from_globs(started_cluster):
         f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test*.jsoncompacteachrow') settings schema_inference_use_cache_for_s3=0, input_format_json_infer_incomplete_types_as_strings=0"
     )
 
-    assert (
-        "Cannot extract table structure from JSONCompactEachRow format file" in result
-    )
+    assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in result
 
     url_filename = "test{0,1,2,3}.jsoncompacteachrow"
 
@@ -1389,9 +1387,7 @@ def test_schema_inference_from_globs(started_cluster):
         f"desc url('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/{url_filename}') settings schema_inference_use_cache_for_url=0, input_format_json_infer_incomplete_types_as_strings=0"
     )
 
-    assert (
-        "Cannot extract table structure from JSONCompactEachRow format file" in result
-    )
+    assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in result
 
 
 def test_signatures(started_cluster):
@@ -1418,10 +1414,10 @@ def test_signatures(started_cluster):
     )
     assert int(result) == 1
 
-    result = instance.query(
+    error = instance.query_and_get_error(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.arrow', 'minio', 'minio123', '{session_token}')"
     )
-    assert int(result) == 1
+    assert "S3_ERROR" in error
 
     result = instance.query(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.arrow', 'Arrow', 'x UInt64', 'auto')"
@@ -1433,20 +1429,20 @@ def test_signatures(started_cluster):
     )
     assert int(result) == 1
 
-    result = instance.query(
+    error = instance.query_and_get_error(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.arrow', 'minio', 'minio123', '{session_token}', 'Arrow')"
     )
-    assert int(result) == 1
+    assert "S3_ERROR" in error
 
-    lt = instance.query(
+    error = instance.query_and_get_error(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.arrow', 'minio', 'minio123', '{session_token}', 'Arrow', 'x UInt64')"
     )
-    assert int(result) == 1
+    assert "S3_ERROR" in error
 
-    lt = instance.query(
+    error = instance.query_and_get_error(
         f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test.arrow', 'minio', 'minio123', '{session_token}', 'Arrow', 'x UInt64', 'auto')"
     )
-    assert int(result) == 1
+    assert "S3_ERROR" in error
 
 
 def test_select_columns(started_cluster):
@@ -2193,4 +2189,58 @@ def test_union_schema_inference_mode(started_cluster):
         error = instance.query_and_get_error(
             f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_union_schema_inference{{1,2,3,4}}.jsonl') settings schema_inference_mode='union', describe_compact_output=1 format TSV"
         )
-        assert "Cannot extract table structure" in error
+        assert "CANNOT_EXTRACT_TABLE_STRUCTURE" in error
+
+
+def test_s3_format_detection(started_cluster):
+    bucket = started_cluster.minio_bucket
+    instance = started_cluster.instances["dummy"]
+
+    instance.query(
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection0', 'JSONEachRow', 'x UInt64, y String') select number, 'str_' || toString(number) from numbers(0) settings s3_truncate_on_insert=1"
+    )
+
+    instance.query(
+        f"insert into table function s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1', 'JSONEachRow', 'x UInt64, y String') select number, 'str_' || toString(number) from numbers(5) settings s3_truncate_on_insert=1"
+    )
+
+    expected_result = instance.query(
+        f"select * from s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1', 'JSONEachRow', 'x UInt64, y String')"
+    )
+
+    expected_desc_result = instance.query(
+        f"desc s3('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1', 'JSONEachRow')"
+    )
+
+    for engine in ["s3", "url"]:
+        desc_result = instance.query(
+            f"desc {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1')"
+        )
+
+        assert desc_result == expected_desc_result
+
+        result = instance.query(
+            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1')"
+        )
+
+        assert result == expected_result
+
+        result = instance.query(
+            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection1', auto, 'x UInt64, y String')"
+        )
+
+        assert result == expected_result
+
+        result = instance.query(
+            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection{{0,1}}', auto, 'x UInt64, y String')"
+        )
+
+        assert result == expected_result
+
+        instance.query(f"system drop schema cache for {engine}")
+
+        result = instance.query(
+            f"select * from {engine}('http://{started_cluster.minio_host}:{started_cluster.minio_port}/{bucket}/test_format_detection{{0,1}}', auto, 'x UInt64, y String')"
+        )
+
+        assert result == expected_result
diff --git a/tests/integration/test_storage_s3_queue/configs/users.xml b/tests/integration/test_storage_s3_queue/configs/users.xml
index 1c096c7da8f..e47df8e4b94 100644
--- a/tests/integration/test_storage_s3_queue/configs/users.xml
+++ b/tests/integration/test_storage_s3_queue/configs/users.xml
@@ -3,6 +3,7 @@
         <default>
             <stream_like_engine_allow_direct_select>1</stream_like_engine_allow_direct_select>
             <s3queue_enable_logging_to_s3queue_log>1</s3queue_enable_logging_to_s3queue_log>
+            <s3queue_allow_experimental_sharded_mode>1</s3queue_allow_experimental_sharded_mode>
         </default>
     </profiles>
 </clickhouse>
diff --git a/tests/integration/test_storage_s3_queue/test.py b/tests/integration/test_storage_s3_queue/test.py
index 7d40060fec6..c7893c3e643 100644
--- a/tests/integration/test_storage_s3_queue/test.py
+++ b/tests/integration/test_storage_s3_queue/test.py
@@ -89,6 +89,7 @@ def started_cluster():
                 "configs/zookeeper.xml",
                 "configs/s3queue_log.xml",
             ],
+            stay_alive=True,
         )
         cluster.add_instance(
             "instance2",
@@ -98,6 +99,16 @@ def started_cluster():
             main_configs=[
                 "configs/s3queue_log.xml",
             ],
+            stay_alive=True,
+        )
+        cluster.add_instance(
+            "old_instance",
+            with_zookeeper=True,
+            image="clickhouse/clickhouse-server",
+            tag="23.12",
+            stay_alive=True,
+            with_installed_binary=True,
+            use_old_analyzer=True,
         )
 
         logging.info("Starting cluster...")
@@ -165,6 +176,7 @@ def create_table(
     file_format="CSV",
     auth=DEFAULT_AUTH,
     bucket=None,
+    expect_error=False,
 ):
     auth_params = ",".join(auth)
     bucket = started_cluster.minio_bucket if bucket is None else bucket
@@ -184,6 +196,10 @@ def create_table(
         ENGINE = S3Queue('{url}', {auth_params}, {file_format})
         SETTINGS {",".join((k+"="+repr(v) for k, v in settings.items()))}
         """
+
+    if expect_error:
+        return node.query_and_get_error(create_query)
+
     node.query(create_query)
 
 
@@ -533,10 +549,7 @@ def test_multiple_tables_meta_mismatch(started_cluster):
             },
         )
     except QueryRuntimeException as e:
-        assert (
-            "Metadata with the same `s3queue_zookeeper_path` was already created but with different settings"
-            in str(e)
-        )
+        assert "Existing table metadata in ZooKeeper differs in engine mode" in str(e)
         failed = True
 
     assert failed is True
@@ -960,3 +973,466 @@ def test_s3_client_reused(started_cluster):
         s3_clients_after = get_created_s3_clients_count()
 
         assert s3_clients_before == s3_clients_after
+
+
+@pytest.mark.parametrize("mode", ["unordered", "ordered"])
+def test_processing_threads(started_cluster, mode):
+    node = started_cluster.instances["instance"]
+    table_name = f"processing_threads_{mode}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 300
+    processing_threads = 32
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        mode,
+        files_path,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "s3queue_processing_threads_num": processing_threads,
+        },
+    )
+    create_mv(node, table_name, dst_table_name)
+
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, row_num=1
+    )
+
+    def get_count(table_name):
+        return int(run_query(node, f"SELECT count() FROM {table_name}"))
+
+    for _ in range(100):
+        if (get_count(f"{dst_table_name}")) == files_to_generate:
+            break
+        time.sleep(1)
+
+    assert get_count(dst_table_name) == files_to_generate
+
+    res = [
+        list(map(int, l.split()))
+        for l in node.query(
+            f"SELECT column1, column2, column3 FROM {dst_table_name}"
+        ).splitlines()
+    ]
+    assert {tuple(v) for v in res} == set([tuple(i) for i in total_values])
+
+    if mode == "ordered":
+        zk = started_cluster.get_kazoo_client("zoo1")
+        processed_nodes = zk.get_children(f"{keeper_path}/processed/")
+        assert len(processed_nodes) == processing_threads
+
+
+@pytest.mark.parametrize(
+    "mode, processing_threads",
+    [
+        pytest.param("unordered", 1),
+        pytest.param("unordered", 8),
+        pytest.param("ordered", 1),
+        pytest.param("ordered", 8),
+    ],
+)
+def test_shards(started_cluster, mode, processing_threads):
+    node = started_cluster.instances["instance"]
+    table_name = f"test_shards_{mode}_{processing_threads}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 300
+    shards_num = 3
+
+    for i in range(shards_num):
+        table = f"{table_name}_{i + 1}"
+        dst_table = f"{dst_table_name}_{i + 1}"
+        create_table(
+            started_cluster,
+            node,
+            table,
+            mode,
+            files_path,
+            additional_settings={
+                "keeper_path": keeper_path,
+                "s3queue_processing_threads_num": processing_threads,
+                "s3queue_total_shards_num": shards_num,
+            },
+        )
+        create_mv(node, table, dst_table)
+
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, row_num=1
+    )
+
+    def get_count(table_name):
+        return int(run_query(node, f"SELECT count() FROM {table_name}"))
+
+    for _ in range(100):
+        if (
+            get_count(f"{dst_table_name}_1")
+            + get_count(f"{dst_table_name}_2")
+            + get_count(f"{dst_table_name}_3")
+        ) == files_to_generate:
+            break
+        time.sleep(1)
+
+    if (
+        get_count(f"{dst_table_name}_1")
+        + get_count(f"{dst_table_name}_2")
+        + get_count(f"{dst_table_name}_3")
+    ) != files_to_generate:
+        info = node.query(
+            f"SELECT * FROM system.s3queue WHERE zookeeper_path like '%{table_name}' ORDER BY file_name FORMAT Vertical"
+        )
+        logging.debug(info)
+        assert False
+
+    res1 = [
+        list(map(int, l.split()))
+        for l in node.query(
+            f"SELECT column1, column2, column3 FROM {dst_table_name}_1"
+        ).splitlines()
+    ]
+    res2 = [
+        list(map(int, l.split()))
+        for l in node.query(
+            f"SELECT column1, column2, column3 FROM {dst_table_name}_2"
+        ).splitlines()
+    ]
+    res3 = [
+        list(map(int, l.split()))
+        for l in node.query(
+            f"SELECT column1, column2, column3 FROM {dst_table_name}_3"
+        ).splitlines()
+    ]
+    assert {tuple(v) for v in res1 + res2 + res3} == set(
+        [tuple(i) for i in total_values]
+    )
+
+    # Checking that all files were processed only once
+    time.sleep(10)
+    assert (
+        get_count(f"{dst_table_name}_1")
+        + get_count(f"{dst_table_name}_2")
+        + get_count(f"{dst_table_name}_3")
+    ) == files_to_generate
+
+    if mode == "ordered":
+        zk = started_cluster.get_kazoo_client("zoo1")
+        processed_nodes = zk.get_children(f"{keeper_path}/processed/")
+        assert len(processed_nodes) == shards_num * processing_threads
+        shard_nodes = zk.get_children(f"{keeper_path}/shards/")
+        assert len(shard_nodes) == shards_num
+
+
+@pytest.mark.parametrize(
+    "mode, processing_threads",
+    [
+        pytest.param("unordered", 1),
+        pytest.param("unordered", 8),
+        pytest.param("ordered", 1),
+        pytest.param("ordered", 8),
+    ],
+)
+def test_shards_distributed(started_cluster, mode, processing_threads):
+    node = started_cluster.instances["instance"]
+    node_2 = started_cluster.instances["instance2"]
+    table_name = f"test_shards_distributed_{mode}_{processing_threads}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 300
+    row_num = 50
+    total_rows = row_num * files_to_generate
+    shards_num = 2
+
+    i = 0
+    for instance in [node, node_2]:
+        create_table(
+            started_cluster,
+            instance,
+            table_name,
+            mode,
+            files_path,
+            additional_settings={
+                "keeper_path": keeper_path,
+                "s3queue_processing_threads_num": processing_threads,
+                "s3queue_total_shards_num": shards_num,
+            },
+        )
+        i += 1
+
+    for instance in [node, node_2]:
+        create_mv(instance, table_name, dst_table_name)
+
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, row_num=row_num
+    )
+
+    def get_count(node, table_name):
+        return int(run_query(node, f"SELECT count() FROM {table_name}"))
+
+    for _ in range(150):
+        if (
+            get_count(node, dst_table_name) + get_count(node_2, dst_table_name)
+        ) == total_rows:
+            break
+        time.sleep(1)
+
+    if (
+        get_count(node, dst_table_name) + get_count(node_2, dst_table_name)
+    ) != total_rows:
+        info = node.query(
+            f"SELECT * FROM system.s3queue WHERE zookeeper_path like '%{table_name}' ORDER BY file_name FORMAT Vertical"
+        )
+        logging.debug(info)
+        assert False
+
+    get_query = f"SELECT column1, column2, column3 FROM {dst_table_name}"
+    res1 = [list(map(int, l.split())) for l in run_query(node, get_query).splitlines()]
+    res2 = [
+        list(map(int, l.split())) for l in run_query(node_2, get_query).splitlines()
+    ]
+
+    assert len(res1) + len(res2) == total_rows
+
+    # Checking that all engines have made progress
+    assert len(res1) > 0
+    assert len(res2) > 0
+
+    assert {tuple(v) for v in res1 + res2} == set([tuple(i) for i in total_values])
+
+    # Checking that all files were processed only once
+    time.sleep(10)
+    assert (
+        get_count(node, dst_table_name) + get_count(node_2, dst_table_name)
+    ) == total_rows
+
+    if mode == "ordered":
+        zk = started_cluster.get_kazoo_client("zoo1")
+        processed_nodes = zk.get_children(f"{keeper_path}/processed/")
+        assert len(processed_nodes) == shards_num * processing_threads
+        shard_nodes = zk.get_children(f"{keeper_path}/shards/")
+        assert len(shard_nodes) == shards_num
+
+    node.restart_clickhouse()
+    time.sleep(10)
+    assert (
+        get_count(node, dst_table_name) + get_count(node_2, dst_table_name)
+    ) == total_rows
+
+
+def test_settings_check(started_cluster):
+    node = started_cluster.instances["instance"]
+    node_2 = started_cluster.instances["instance2"]
+    table_name = f"test_settings_check"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    mode = "ordered"
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        mode,
+        files_path,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "s3queue_processing_threads_num": 5,
+            "s3queue_total_shards_num": 2,
+        },
+    )
+
+    assert (
+        "Existing table metadata in ZooKeeper differs in s3queue_total_shards_num setting. Stored in ZooKeeper: 2, local: 3"
+        in create_table(
+            started_cluster,
+            node_2,
+            table_name,
+            mode,
+            files_path,
+            additional_settings={
+                "keeper_path": keeper_path,
+                "s3queue_processing_threads_num": 5,
+                "s3queue_total_shards_num": 3,
+            },
+            expect_error=True,
+        )
+    )
+
+    assert (
+        "Existing table metadata in ZooKeeper differs in s3queue_processing_threads_num setting. Stored in ZooKeeper: 5, local: 2"
+        in create_table(
+            started_cluster,
+            node_2,
+            table_name,
+            mode,
+            files_path,
+            additional_settings={
+                "keeper_path": keeper_path,
+                "s3queue_processing_threads_num": 2,
+                "s3queue_total_shards_num": 2,
+            },
+            expect_error=True,
+        )
+    )
+
+    assert "s3queue_current_shard_num = 0" in node.query(
+        f"SHOW CREATE TABLE {table_name}"
+    )
+
+    node.restart_clickhouse()
+
+    assert "s3queue_current_shard_num = 0" in node.query(
+        f"SHOW CREATE TABLE {table_name}"
+    )
+
+    node.query(f"DROP TABLE {table_name} SYNC")
+
+
+@pytest.mark.parametrize("processing_threads", [1, 5])
+def test_processed_file_setting(started_cluster, processing_threads):
+    node = started_cluster.instances["instance"]
+    table_name = f"test_processed_file_setting_{processing_threads}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 10
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        "ordered",
+        files_path,
+        additional_settings={
+            "keeper_path": keeper_path,
+            "s3queue_processing_threads_num": processing_threads,
+            "s3queue_last_processed_path": f"{files_path}/test_5.csv",
+        },
+    )
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, start_ind=0, row_num=1
+    )
+
+    create_mv(node, table_name, dst_table_name)
+
+    def get_count():
+        return int(node.query(f"SELECT count() FROM {dst_table_name}"))
+
+    expected_rows = 4
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+
+    assert expected_rows == get_count()
+
+    node.restart_clickhouse()
+    time.sleep(10)
+
+    expected_rows = 4
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+
+    assert expected_rows == get_count()
+
+
+@pytest.mark.parametrize("processing_threads", [1, 5])
+def test_processed_file_setting_distributed(started_cluster, processing_threads):
+    node = started_cluster.instances["instance"]
+    node_2 = started_cluster.instances["instance2"]
+    table_name = f"test_processed_file_setting_distributed_{processing_threads}"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 10
+
+    for instance in [node, node_2]:
+        create_table(
+            started_cluster,
+            instance,
+            table_name,
+            "ordered",
+            files_path,
+            additional_settings={
+                "keeper_path": keeper_path,
+                "s3queue_processing_threads_num": processing_threads,
+                "s3queue_last_processed_path": f"{files_path}/test_5.csv",
+                "s3queue_total_shards_num": 2,
+            },
+        )
+
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, start_ind=0, row_num=1
+    )
+
+    for instance in [node, node_2]:
+        create_mv(instance, table_name, dst_table_name)
+
+    def get_count():
+        query = f"SELECT count() FROM {dst_table_name}"
+        return int(node.query(query)) + int(node_2.query(query))
+
+    expected_rows = 4
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+    assert expected_rows == get_count()
+
+    for instance in [node, node_2]:
+        instance.restart_clickhouse()
+
+    time.sleep(10)
+    expected_rows = 4
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+    assert expected_rows == get_count()
+
+
+def test_upgrade(started_cluster):
+    node = started_cluster.instances["old_instance"]
+
+    table_name = f"test_upgrade"
+    dst_table_name = f"{table_name}_dst"
+    keeper_path = f"/clickhouse/test_{table_name}"
+    files_path = f"{table_name}_data"
+    files_to_generate = 10
+
+    create_table(
+        started_cluster,
+        node,
+        table_name,
+        "ordered",
+        files_path,
+        additional_settings={
+            "keeper_path": keeper_path,
+        },
+    )
+    total_values = generate_random_files(
+        started_cluster, files_path, files_to_generate, start_ind=0, row_num=1
+    )
+
+    create_mv(node, table_name, dst_table_name)
+
+    def get_count():
+        return int(node.query(f"SELECT count() FROM {dst_table_name}"))
+
+    expected_rows = 10
+    for _ in range(20):
+        if expected_rows == get_count():
+            break
+        time.sleep(1)
+
+    assert expected_rows == get_count()
+
+    node.restart_with_latest_version()
+
+    assert expected_rows == get_count()
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
index b1a3f6777b1..3c62112a7d3 100644
--- 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
@@ -1,6 +1,8 @@
 import http.server
+import sys
+import json
 
-RESULT_PATH = "/headers.txt"
+RESULT_PATH = "/echo_server_headers.txt"
 
 
 class RequestHandler(http.server.BaseHTTPRequestHandler):
@@ -8,6 +10,28 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
         with open(RESULT_PATH, "w") as f:
             f.write(self.headers.as_string())
 
+    def do_GET(self):
+        if self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+            self.wfile.write(b'{"status":"ok"}')
+        if self.path == "/sample-data":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+            sample_data = [
+                {
+                    "title": "ClickHouse Newsletter June 2022: Materialized, but still real-time",
+                    "theme": "Newsletter",
+                },
+                {
+                    "title": "ClickHouse Over the Years with Benchmarks",
+                    "theme": "ClickHouse Journey",
+                },
+            ]
+            self.wfile.write(bytes(json.dumps(sample_data), "UTF-8"))
+
     def do_POST(self):
         self.rfile.read1()
         self.send_response(200)
@@ -16,15 +40,16 @@ class RequestHandler(http.server.BaseHTTPRequestHandler):
 
 
 if __name__ == "__main__":
-    with open(RESULT_PATH, "w") as f:
-        f.write("")
-    httpd = http.server.HTTPServer(
+    host = sys.argv[1]
+    port = int(sys.argv[2])
+    httpd = http.server.ThreadingHTTPServer(
         (
-            "localhost",
-            8000,
+            host,
+            port,
         ),
         RequestHandler,
     )
+
     try:
         httpd.serve_forever()
     finally:
diff --git a/tests/integration/test_storage_url_http_headers/redirect_server.py b/tests/integration/test_storage_url_http_headers/redirect_server.py
new file mode 100644
index 00000000000..b1d92d0cd4e
--- /dev/null
+++ b/tests/integration/test_storage_url_http_headers/redirect_server.py
@@ -0,0 +1,46 @@
+import http.server
+import sys
+
+REDIRECT_HOST = ""
+REDIRECT_PORT = 0
+
+RESULT_PATH = "/redirect_server_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_GET(self):
+        if self.path == "/":
+            self.send_response(200)
+            self.send_header("Content-Type", "text/plain")
+            self.end_headers()
+            self.wfile.write(b'{"status":"ok"}')
+        else:
+            global REDIRECT_HOST, REDIRECT_PORT
+            self.send_response(302)
+            target_location = f"http://{REDIRECT_HOST}:{REDIRECT_PORT}{self.path}"
+            self.send_header("Location", target_location)
+            self.end_headers()
+            self.wfile.write(b'{"status":"redirected"}')
+
+
+if __name__ == "__main__":
+    host = sys.argv[1]
+    port = int(sys.argv[2])
+    REDIRECT_HOST = sys.argv[3]
+    REDIRECT_PORT = int(sys.argv[4])
+    httpd = http.server.ThreadingHTTPServer(
+        (
+            host,
+            port,
+        ),
+        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
index 3bbf5ec81c9..8fc08ec5c9d 100644
--- a/tests/integration/test_storage_url_http_headers/test.py
+++ b/tests/integration/test_storage_url_http_headers/test.py
@@ -1,8 +1,7 @@
 import pytest
 import os
-import time
-
 from . import http_headers_echo_server
+from . import redirect_server
 
 from helpers.cluster import ClickHouseCluster
 
@@ -10,31 +9,37 @@ cluster = ClickHouseCluster(__file__)
 server = cluster.add_instance("node")
 
 
-def run_echo_server():
+def run_server(container_id, file_name, hostname, port, *args):
     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",
+    cluster.copy_file_to_container(
+        container_id,
+        os.path.join(script_dir, file_name),
+        f"/{file_name}",
     )
 
-    server.exec_in_container(
+    cmd_args = [hostname, port] + list(args)
+    cmd_args_val = " ".join([str(x) for x in cmd_args])
+
+    cluster.exec_in_container(
+        container_id,
         [
             "bash",
             "-c",
-            "python3 /http_headers_echo_server.py > /http_headers_echo.server.log 2>&1",
+            f"python3 /{file_name} {cmd_args_val} > {file_name}.log 2>&1",
         ],
         detach=True,
         user="root",
     )
 
     for _ in range(0, 10):
-        ping_response = server.exec_in_container(
-            ["curl", "-s", f"http://localhost:8000/"],
+        ping_response = cluster.exec_in_container(
+            container_id,
+            ["curl", "-s", f"http://{hostname}:{port}/"],
             nothrow=True,
         )
 
-        if "html" in ping_response:
+        if '{"status":"ok"}' in ping_response:
             return
 
         print(ping_response)
@@ -42,11 +47,23 @@ def run_echo_server():
     raise Exception("Echo server is not responding")
 
 
+def run_echo_server():
+    container_id = cluster.get_container_id("node")
+    run_server(container_id, "http_headers_echo_server.py", "localhost", 8000)
+
+
+def run_redirect_server():
+    container_id = cluster.get_container_id("node")
+    run_server(container_id, "redirect_server.py", "localhost", 8080, "localhost", 8000)
+
+
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
+        run_redirect_server()
         run_echo_server()
+
         yield cluster
     finally:
         cluster.shutdown()
@@ -64,3 +81,35 @@ def test_storage_url_http_headers(started_cluster):
     print(result)
 
     assert "X-My-Custom-Header: test-header" in result
+
+
+def test_storage_url_redirected_headers(started_cluster):
+    query = """
+        SELECT
+            title::String as title,
+            theme::String as theme
+        FROM
+            url('http://127.0.0.1:8080/sample-data', 'JSONEachRow', 'title String, theme String')
+        SETTINGS http_max_tries=2, max_http_get_redirects=2
+        """
+
+    result = server.query(query)
+    assert 2 == len(result.strip().split("\n"))
+
+    result_redirect = server.exec_in_container(
+        ["cat", redirect_server.RESULT_PATH], user="root"
+    )
+
+    print(result_redirect)
+
+    assert "Host: 127.0.0.1" in result_redirect
+    assert "Host: localhost" not in result_redirect
+
+    result = server.exec_in_container(
+        ["cat", http_headers_echo_server.RESULT_PATH], user="root"
+    )
+
+    print(result)
+
+    assert "Host: 127.0.0.1" not in result
+    assert "Host: localhost" in result
diff --git a/tests/integration/test_structured_logging_json/test.py b/tests/integration/test_structured_logging_json/test.py
index cbd066abc91..6d1455f6e0e 100644
--- a/tests/integration/test_structured_logging_json/test.py
+++ b/tests/integration/test_structured_logging_json/test.py
@@ -32,6 +32,30 @@ def is_json(log_json):
     return True
 
 
+def validate_log_level(config, logs):
+    root = ET.fromstring(config)
+    key = root.findtext(".//names/level") or "level"
+
+    valid_level_values = {
+        "Fatal",
+        "Critical",
+        "Error",
+        "Warning",
+        "Notice",
+        "Information",
+        "Debug",
+        "Trace",
+        "Test",
+    }
+
+    length = min(10, len(logs))
+    for i in range(0, length):
+        json_log = json.loads(logs[i])
+        if json_log[key] not in valid_level_values:
+            return False
+    return True
+
+
 def validate_log_config_relation(config, logs, config_type):
     root = ET.fromstring(config)
     keys_in_config = set()
@@ -78,8 +102,10 @@ def validate_logs(logs):
 def valiade_everything(config, node, config_type):
     node.query("SELECT 1")
     logs = node.grep_in_log("").split("\n")
-    return validate_logs(logs) and validate_log_config_relation(
-        config, logs, config_type
+    return (
+        validate_logs(logs)
+        and validate_log_config_relation(config, logs, config_type)
+        and validate_log_level(config, logs)
     )
 
 
diff --git a/tests/integration/test_system_clusters_actual_information/test.py b/tests/integration/test_system_clusters_actual_information/test.py
index e90a6cdeb3f..8b6436aeb5c 100644
--- a/tests/integration/test_system_clusters_actual_information/test.py
+++ b/tests/integration/test_system_clusters_actual_information/test.py
@@ -12,20 +12,12 @@ cluster = ClickHouseCluster(__file__)
 node = cluster.add_instance(
     "node", with_zookeeper=True, main_configs=["configs/remote_servers.xml"]
 )
-node_1 = cluster.add_instance("node_1", with_zookeeper=True)
 
 
 @pytest.fixture(scope="module")
 def started_cluster():
     try:
         cluster.start()
-        node_1.query_with_retry("DROP TABLE IF EXISTS replicated")
-
-        node_1.query_with_retry(
-            """CREATE TABLE replicated (id UInt32, date Date) ENGINE =
-            ReplicatedMergeTree('/clickhouse/tables/replicated', 'node_1')  ORDER BY id PARTITION BY toYYYYMM(date)"""
-        )
-
         node.query_with_retry(
             "CREATE TABLE distributed (id UInt32, date Date) ENGINE = Distributed('test_cluster', 'default', 'replicated')"
         )
@@ -37,8 +29,6 @@ def started_cluster():
 
 
 def test(started_cluster):
-    cluster.pause_container("node_1")
-
     node.query("SYSTEM RELOAD CONFIG")
     error = node.query_and_get_error(
         "SELECT count() FROM distributed SETTINGS receive_timeout=1, handshake_timeout_ms=1"
@@ -67,5 +57,3 @@ def test(started_cluster):
 
     assert recovery_time == 0
     assert errors_count == 0
-
-    cluster.unpause_container("node_1")
diff --git a/tests/integration/test_system_reload_async_metrics/__init__.py b/tests/integration/test_system_reload_async_metrics/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_system_reload_async_metrics/configs/default.xml b/tests/integration/test_system_reload_async_metrics/configs/default.xml
new file mode 100644
index 00000000000..eb168c1967d
--- /dev/null
+++ b/tests/integration/test_system_reload_async_metrics/configs/default.xml
@@ -0,0 +1,6 @@
+<clickhouse>
+
+    <asynchronous_metrics_update_period_s>60000</asynchronous_metrics_update_period_s>
+    <asynchronous_heavy_metrics_update_period_s>60000</asynchronous_heavy_metrics_update_period_s>
+
+</clickhouse>
diff --git a/tests/integration/test_system_reload_async_metrics/test.py b/tests/integration/test_system_reload_async_metrics/test.py
new file mode 100644
index 00000000000..f0572cd2db6
--- /dev/null
+++ b/tests/integration/test_system_reload_async_metrics/test.py
@@ -0,0 +1,47 @@
+import os
+import pytest
+import shutil
+import time
+from helpers.cluster import ClickHouseCluster
+
+# Tests that SYSTEM RELOAD ASYNCHRONOUS METRICS works.
+
+# Config default.xml sets a large refresh interval of asynchronous metrics, so that the periodic updates don't interfere with the manual
+# update below.
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=["configs/default.xml"],
+    stay_alive=True,
+)
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
+CONFIG_DIR = os.path.join(SCRIPT_DIR, "configs")
+
+
+def test_system_reload_async_metrics(start_cluster):
+    node.query("SYSTEM DROP QUERY CACHE")
+
+    res1 = node.query(
+        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'NumberOfTables'"
+    )
+
+    # create table and test that the table creation is reflected in the asynchronous metrics
+    node.query("CREATE TABLE tab (col UInt64) ENGINE MergeTree ORDER BY tuple()")
+
+    node.query("SYSTEM RELOAD ASYNCHRONOUS METRICS")
+
+    res2 = node.query(
+        "SELECT value FROM system.asynchronous_metrics WHERE metric = 'NumberOfTables'"
+    )
+    assert int(res1.rstrip()) + 1 == int(res2.rstrip())
diff --git a/tests/integration/test_temporary_data_in_cache/test.py b/tests/integration/test_temporary_data_in_cache/test.py
index ed06a70cf5a..cab134dcce2 100644
--- a/tests/integration/test_temporary_data_in_cache/test.py
+++ b/tests/integration/test_temporary_data_in_cache/test.py
@@ -67,6 +67,7 @@ def test_cache_evicted_by_temporary_data(start_cluster):
             settings={
                 "max_bytes_before_external_group_by": "4M",
                 "max_bytes_before_external_sort": "4M",
+                "temporary_files_codec": "ZSTD",
             },
         )
     assert fnmatch.fnmatch(
diff --git a/tests/integration/test_trace_collector_serverwide/__init__.py b/tests/integration/test_trace_collector_serverwide/__init__.py
new file mode 100644
index 00000000000..e5a0d9b4834
--- /dev/null
+++ b/tests/integration/test_trace_collector_serverwide/__init__.py
@@ -0,0 +1 @@
+#!/usr/bin/env python3
diff --git a/tests/integration/test_trace_collector_serverwide/configs/global_profiler.xml b/tests/integration/test_trace_collector_serverwide/configs/global_profiler.xml
new file mode 100644
index 00000000000..5112d267182
--- /dev/null
+++ b/tests/integration/test_trace_collector_serverwide/configs/global_profiler.xml
@@ -0,0 +1,4 @@
+<clickhouse>
+  <global_profiler_real_time_period_ns>10000000</global_profiler_real_time_period_ns>
+  <global_profiler_cpu_time_period_ns>10000000</global_profiler_cpu_time_period_ns>
+</clickhouse>
diff --git a/tests/integration/test_trace_collector_serverwide/test.py b/tests/integration/test_trace_collector_serverwide/test.py
new file mode 100644
index 00000000000..9bd107ac365
--- /dev/null
+++ b/tests/integration/test_trace_collector_serverwide/test.py
@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+
+import pytest
+import time
+
+from helpers.cluster import ClickHouseCluster
+from helpers.test_tools import assert_eq_with_retry
+
+cluster = ClickHouseCluster(__file__)
+
+node1 = cluster.add_instance("node1", main_configs=["configs/global_profiler.xml"])
+
+
+@pytest.fixture(scope="module")
+def start_cluster():
+    try:
+        cluster.start()
+
+        yield cluster
+    finally:
+        cluster.shutdown()
+
+
+def test_global_thread_profiler(start_cluster):
+    if node1.is_built_with_sanitizer():
+        return
+
+    node1.query(
+        "CREATE TABLE t (key UInt32, value String) Engine = MergeTree() ORDER BY key"
+    )
+
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+    node1.query("INSERT INTO t SELECT number, toString(number) from numbers(100)")
+
+    time.sleep(5)
+
+    node1.query("SYSTEM FLUSH LOGS")
+
+    assert (
+        int(
+            node1.query(
+                "SELECT count() FROM system.trace_log where trace_type='Real' and query_id = ''"
+            ).strip()
+        )
+        > 0
+    )
diff --git a/tests/integration/test_transactions/test.py b/tests/integration/test_transactions/test.py
index 46660581223..d63b7b6f545 100644
--- a/tests/integration/test_transactions/test.py
+++ b/tests/integration/test_transactions/test.py
@@ -67,8 +67,8 @@ def test_rollback_unfinished_on_restart1(start_cluster):
     tx(1, "insert into mt values (5, 50)")
     tx(1, "alter table mt update m = m+n in partition id '1' where 1")
 
-    # check that uncommitted insert will be rolled back on restart
-    tx(3, "begin transaction")
+    # check that uncommitted insert will be rolled back on restart (using `START TRANSACTION` syntax)
+    tx(3, "start transaction")
     tid5 = tx(3, "select transactionID()").strip()
     tx(3, "insert into mt values (6, 70)")
 
diff --git a/tests/integration/test_ttl_move/test.py b/tests/integration/test_ttl_move/test.py
index 1df9bc6d3c9..94432b89ab6 100644
--- a/tests/integration/test_ttl_move/test.py
+++ b/tests/integration/test_ttl_move/test.py
@@ -1635,7 +1635,7 @@ def test_alter_with_merge_work(started_cluster, name, engine, positive):
         optimize_table(20)
 
         if positive:
-            assert check_used_disks_with_retry(node1, name, set(["external"]), 50)
+            assert check_used_disks_with_retry(node1, name, set(["external"]), 100)
         else:
             assert check_used_disks_with_retry(node1, name, set(["jbod1", "jbod2"]), 50)
 
diff --git a/tests/integration/test_ttl_replicated/test.py b/tests/integration/test_ttl_replicated/test.py
index 119a211ae45..f944adbea41 100644
--- a/tests/integration/test_ttl_replicated/test.py
+++ b/tests/integration/test_ttl_replicated/test.py
@@ -2,7 +2,7 @@ import time
 
 import helpers.client as client
 import pytest
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.test_tools import TSV, exec_query_with_retry
 from helpers.wait_for_helpers import wait_for_delete_inactive_parts
 from helpers.wait_for_helpers import wait_for_delete_empty_parts
@@ -16,39 +16,36 @@ node3 = cluster.add_instance("node3", with_zookeeper=True)
 node4 = cluster.add_instance(
     "node4",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 
 node5 = cluster.add_instance(
     "node5",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 node6 = cluster.add_instance(
     "node6",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     stay_alive=True,
     with_installed_binary=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_unambiguous_alter_commands/__init__.py b/tests/integration/test_unambiguous_alter_commands/__init__.py
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/integration/test_unambiguous_alter_commands/configs/format_alter_operations_with_parentheses.xml b/tests/integration/test_unambiguous_alter_commands/configs/format_alter_operations_with_parentheses.xml
new file mode 100644
index 00000000000..cec7d30749f
--- /dev/null
+++ b/tests/integration/test_unambiguous_alter_commands/configs/format_alter_operations_with_parentheses.xml
@@ -0,0 +1,3 @@
+<clickhouse>
+    <format_alter_operations_with_parentheses>1</format_alter_operations_with_parentheses>
+</clickhouse>
diff --git a/tests/integration/test_unambiguous_alter_commands/test.py b/tests/integration/test_unambiguous_alter_commands/test.py
new file mode 100644
index 00000000000..768ab78fbd8
--- /dev/null
+++ b/tests/integration/test_unambiguous_alter_commands/test.py
@@ -0,0 +1,45 @@
+import pytest
+from helpers.cluster import ClickHouseCluster
+
+
+cluster = ClickHouseCluster(__file__)
+node = cluster.add_instance(
+    "node",
+    main_configs=[
+        "configs/format_alter_operations_with_parentheses.xml",
+    ],
+)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def started_cluster():
+    try:
+        cluster.start()
+        yield cluster
+
+    finally:
+        cluster.shutdown()
+
+
+def test_alter():
+    INPUT = """
+SELECT '--- Alter commands in parens';
+SELECT formatQuery('ALTER TABLE a (MODIFY TTL expr GROUP BY some_key), (ADD COLUMN a Int64)');
+SELECT formatQuery('ALTER TABLE a (MODIFY TTL expr TO VOLUME \\'vol1\\', expr2 + INTERVAL 2 YEAR TO VOLUME \\'vol2\\'), (DROP COLUMN c)');
+
+SELECT '--- Check only consistent parens around alter commands are accepted';
+SELECT formatQuery('ALTER TABLE a (DROP COLUMN b), DROP COLUMN c'); -- { serverError SYNTAX_ERROR }
+SELECT formatQuery('ALTER TABLE a DROP COLUMN b, (DROP COLUMN c)'); -- { serverError SYNTAX_ERROR }
+SELECT formatQuery('ALTER TABLE a (DROP COLUMN b), (DROP COLUMN c)');
+SELECT formatQuery('ALTER TABLE a DROP COLUMN b, DROP COLUMN c'); -- Make sure it is backward compatible
+"""
+
+    EXPECTED_OUTPUT = """--- Alter commands in parens
+ALTER TABLE a\\n    (MODIFY TTL expr GROUP BY some_key),\\n    (ADD COLUMN `a` Int64)
+ALTER TABLE a\\n    (MODIFY TTL expr TO VOLUME \\'vol1\\', expr2 + toIntervalYear(2) TO VOLUME \\'vol2\\'),\\n    (DROP COLUMN c)
+--- Check only consistent parens around alter commands are accepted
+ALTER TABLE a\\n    (DROP COLUMN b),\\n    (DROP COLUMN c)
+ALTER TABLE a\\n    (DROP COLUMN b),\\n    (DROP COLUMN c)
+"""
+    result = node.query(INPUT)
+    assert result == EXPECTED_OUTPUT
diff --git a/tests/integration/test_undrop_query/configs/with_delay_config.xml b/tests/integration/test_undrop_query/configs/with_delay_config.xml
index c672b187b01..5e6de6b7567 100644
--- a/tests/integration/test_undrop_query/configs/with_delay_config.xml
+++ b/tests/integration/test_undrop_query/configs/with_delay_config.xml
@@ -1,3 +1,3 @@
 <clickhouse>
-    <database_atomic_delay_before_drop_table_sec>5</database_atomic_delay_before_drop_table_sec>
+    <database_atomic_delay_before_drop_table_sec>20</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
index 590a5690e55..1e77fc8db04 100644
--- a/tests/integration/test_undrop_query/test.py
+++ b/tests/integration/test_undrop_query/test.py
@@ -1,6 +1,5 @@
 import pytest
 import uuid
-import random
 import logging
 import time
 
@@ -22,37 +21,28 @@ def started_cluster():
 
 
 def test_undrop_drop_and_undrop_loop(started_cluster):
-    count = 0
-    while count < 10:
-        random_sec = random.randint(0, 10)
+    uuid_list = []
+
+    for i in range(4):
         table_uuid = uuid.uuid1().__str__()
-        logging.info(
-            "random_sec: " + random_sec.__str__() + ", table_uuid: " + table_uuid
-        )
+        uuid_list.append(table_uuid)
+        logging.info(f"table_uuid: {table_uuid}")
+
         node.query(
-            "create table test_undrop_loop"
-            + count.__str__()
-            + " UUID '"
-            + table_uuid
-            + "' (id Int32) Engine=MergeTree() order by id;"
+            f"CREATE TABLE test_undrop_{i} 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:
+
+        node.query(f"DROP TABLE test_undrop_{i};")
+
+    for i in range(4):
+        if (
+            i >= 3
+        ):  # First 3 tables are undropped after 0, 5 and 10 seconds. Fourth is undropped after 21 seconds
+            time.sleep(6)
             error = node.query_and_get_error(
-                "undrop table test_undrop_loop"
-                + count.__str__()
-                + " uuid '"
-                + table_uuid
-                + "';"
+                f"UNDROP TABLE test_undrop_loop_{i} UUID '{uuid_list[i]}';"
             )
             assert "UNKNOWN_TABLE" in error
         else:
-            node.query(
-                "undrop table test_undrop_loop"
-                + count.__str__()
-                + " uuid '"
-                + table_uuid
-                + "';"
-            )
-            count = count + 1
+            node.query(f"UNDROP TABLE test_undrop_loop_{i} UUID '{uuid_list[i]}';")
+            time.sleep(5)
diff --git a/tests/integration/test_user_defined_object_persistence/test.py b/tests/integration/test_user_defined_object_persistence/test.py
index 8d775411b61..1919da0726e 100644
--- a/tests/integration/test_user_defined_object_persistence/test.py
+++ b/tests/integration/test_user_defined_object_persistence/test.py
@@ -35,9 +35,16 @@ def test_persistence():
 
     instance.restart_clickhouse()
 
-    assert "Unknown function MySum1" in instance.query_and_get_error(
-        "SELECT MySum1(1, 2)"
+    error_message = instance.query_and_get_error("SELECT MySum1(1, 2)")
+    assert (
+        "Unknown function MySum1" in error_message
+        or "Function with name 'MySum1' does not exists. In scope SELECT MySum1(1, 2)"
+        in error_message
     )
-    assert "Unknown function MySum2" in instance.query_and_get_error(
-        "SELECT MySum2(1, 2)"
+
+    error_message = instance.query_and_get_error("SELECT MySum2(1, 2)")
+    assert (
+        "Unknown function MySum2" in error_message
+        or "Function with name 'MySum2' does not exists. In scope SELECT MySum2(1, 2)"
+        in error_message
     )
diff --git a/tests/integration/test_version_update/test.py b/tests/integration/test_version_update/test.py
index a752960bc76..b386a79c932 100644
--- a/tests/integration/test_version_update/test.py
+++ b/tests/integration/test_version_update/test.py
@@ -1,7 +1,6 @@
 import pytest
 
-from helpers.cluster import ClickHouseCluster
-from helpers.test_tools import assert_eq_with_retry, exec_query_with_retry
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 
 cluster = ClickHouseCluster(__file__)
 
@@ -11,46 +10,10 @@ node1 = cluster.add_instance("node1", stay_alive=True)
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
-    allow_analyzer=False,
-)
-
-# Use different nodes because if there is node.restart_from_latest_version(), then in later tests
-# it will be with latest version, but shouldn't, order of tests in CI is shuffled.
-node3 = cluster.add_instance(
-    "node3",
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_installed_binary=True,
-    stay_alive=True,
-    allow_analyzer=False,
-)
-node4 = cluster.add_instance(
-    "node4",
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_installed_binary=True,
-    stay_alive=True,
-    allow_analyzer=False,
-)
-node5 = cluster.add_instance(
-    "node5",
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_installed_binary=True,
-    stay_alive=True,
-    allow_analyzer=False,
-)
-node6 = cluster.add_instance(
-    "node6",
-    image="yandex/clickhouse-server",
-    tag="21.6",
-    with_installed_binary=True,
-    stay_alive=True,
-    allow_analyzer=False,
 )
 
 
@@ -124,211 +87,3 @@ def test_modulo_partition_key_issue_23508(start_cluster):
     assert partition_data == node2.query(
         "SELECT partition, name FROM system.parts WHERE table='test' ORDER BY partition"
     )
-
-
-# Test from issue 16587
-def test_aggregate_function_versioning_issue_16587(start_cluster):
-    for node in [node1, node3]:
-        node.query("DROP TABLE IF EXISTS test_table;")
-        node.query(
-            """
-        CREATE TABLE test_table (`col1` DateTime, `col2` Int64)
-        ENGINE = MergeTree() ORDER BY col1"""
-        )
-        node.query(
-            "insert into test_table select '2020-10-26 00:00:00', 1929292 from numbers(300)"
-        )
-
-    expected = "([1],[600])"
-
-    result_on_old_version = node3.query(
-        "select sumMap(sm) from (select sumMap([1],[1]) as sm from remote('127.0.0.{1,2}', default.test_table) group by col1, col2);"
-    ).strip()
-    assert result_on_old_version != expected
-
-    result_on_new_version = node1.query(
-        "select sumMap(sm) from (select sumMap([1],[1]) as sm from remote('127.0.0.{1,2}', default.test_table) group by col1, col2);"
-    ).strip()
-    assert result_on_new_version == expected
-
-
-def test_aggregate_function_versioning_fetch_data_from_old_to_new_server(start_cluster):
-    for node in [node1, node4]:
-        create_table(node)
-        insert_data(node)
-
-    expected = "([1],[300])"
-
-    new_server_data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert new_server_data == expected
-
-    old_server_data = node4.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert old_server_data != expected
-
-    data_from_old_to_new_server = node1.query(
-        "select finalizeAggregation(col3) from remote('node4', default.test_table);"
-    ).strip()
-    assert data_from_old_to_new_server == old_server_data
-
-
-def test_aggregate_function_versioning_server_upgrade(start_cluster):
-    for node in [node1, node5]:
-        create_table(node)
-    insert_data(node1, col2=5)
-    insert_data(node5, col2=1)
-
-    # Serialization with version 0, server does not support versioning of aggregate function states.
-    old_server_data = node5.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert old_server_data == "([1],[44])"
-    create = node5.query("describe table default.test_table;").strip()
-    assert create.strip().endswith(
-        "col3\tAggregateFunction(sumMap, Array(UInt8), Array(UInt8))"
-    )
-    print("Ok 1")
-
-    # Upgrade server.
-    node5.restart_with_latest_version()
-
-    # Deserialized with version 0, server supports versioning.
-    upgraded_server_data = node5.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])"
-    create = node5.query("describe table default.test_table;").strip()
-    assert create.strip().endswith(
-        "col3\tAggregateFunction(sumMap, Array(UInt8), Array(UInt8))"
-    )
-    print("Ok 2")
-
-    create = node1.query("describe table default.test_table;").strip()
-    print(create)
-    assert create.strip().endswith(
-        "col3\tAggregateFunction(1, sumMap, Array(UInt8), Array(UInt8))"
-    )
-
-    # Data from upgraded server to new server. Deserialize with version 0.
-    data_from_upgraded_to_new_server = node1.query(
-        "select finalizeAggregation(col3) from remote('node5', default.test_table);"
-    ).strip()
-    assert data_from_upgraded_to_new_server == upgraded_server_data == "([1],[44])"
-    print("Ok 3")
-
-    # Data is serialized according to version 0 (though one of the states is version 1, but result is version 0).
-    upgraded_server_data = node5.query(
-        "select finalizeAggregation(col3) from remote('127.0.0.{1,2}', default.test_table);"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])\n([1],[44])"
-    print("Ok 4")
-
-    # Check insertion after server upgarde.
-    insert_data(node5, col2=2)
-
-    # Check newly inserted data is still serialized with 0 version.
-    upgraded_server_data = node5.query(
-        "select finalizeAggregation(col3) from default.test_table order by col2;"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])\n([1],[44])"
-    print("Ok 5")
-
-    # New table has latest version.
-    new_server_data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert new_server_data == "([1],[300])"
-    print("Ok 6")
-
-    # Insert from new server (with version 1) to upgraded server (where version will be 0), result version 0.
-    node1.query(
-        "insert into table function remote('node5', default.test_table) select * from default.test_table;"
-    ).strip()
-    upgraded_server_data = node5.query(
-        "select finalizeAggregation(col3) from default.test_table order by col2;"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])\n([1],[44])\n([1],[44])"
-    print("Ok 7")
-
-    # But new table gets data with latest version.
-    insert_data(node1)
-    new_server_data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert new_server_data == "([1],[300])\n([1],[300])"
-    print("Ok 8")
-
-    # Create table with column implicitly with older version (version 0).
-    create_table(node1, name="test_table_0", version=0)
-    insert_data(node1, table_name="test_table_0", col2=3)
-    data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table_0;"
-    ).strip()
-    assert data == "([1],[44])"
-    print("Ok")
-
-    # Insert from new server to upgraded server to a new table but the version was set implicitly to 0, so data version 0.
-    node1.query(
-        "insert into table function remote('node5', default.test_table) select * from default.test_table_0;"
-    ).strip()
-    upgraded_server_data = node5.query(
-        "select finalizeAggregation(col3) from default.test_table order by col2;"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])\n([1],[44])\n([1],[44])\n([1],[44])"
-    print("Ok")
-
-
-def test_aggregate_function_versioning_persisting_metadata(start_cluster):
-    for node in [node1, node6]:
-        create_table(node)
-        insert_data(node)
-    data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert data == "([1],[300])"
-    data = node6.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert data == "([1],[44])"
-
-    node6.restart_with_latest_version()
-
-    for node in [node1, node6]:
-        node.query("DETACH TABLE test_table")
-        node.query("ATTACH TABLE test_table")
-
-    for node in [node1, node6]:
-        insert_data(node)
-
-    new_server_data = node1.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert new_server_data == "([1],[300])\n([1],[300])"
-
-    upgraded_server_data = node6.query(
-        "select finalizeAggregation(col3) from default.test_table;"
-    ).strip()
-    assert upgraded_server_data == "([1],[44])\n([1],[44])"
-
-    for node in [node1, node6]:
-        node.restart_clickhouse()
-        insert_data(node)
-
-    result = node1.query(
-        "select finalizeAggregation(col3) from remote('127.0.0.{1,2}', default.test_table);"
-    ).strip()
-    assert (
-        result
-        == "([1],[300])\n([1],[300])\n([1],[300])\n([1],[300])\n([1],[300])\n([1],[300])"
-    )
-
-    result = node6.query(
-        "select finalizeAggregation(col3) from remote('127.0.0.{1,2}', default.test_table);"
-    ).strip()
-    assert (
-        result
-        == "([1],[44])\n([1],[44])\n([1],[44])\n([1],[44])\n([1],[44])\n([1],[44])"
-    )
diff --git a/tests/integration/test_version_update_after_mutation/test.py b/tests/integration/test_version_update_after_mutation/test.py
index 4e84b4c10ca..9365498f89d 100644
--- a/tests/integration/test_version_update_after_mutation/test.py
+++ b/tests/integration/test_version_update_after_mutation/test.py
@@ -1,7 +1,7 @@
 import pytest
 import time
 
-from helpers.cluster import ClickHouseCluster
+from helpers.cluster import ClickHouseCluster, CLICKHOUSE_CI_MIN_TESTED_VERSION
 from helpers.test_tools import assert_eq_with_retry, exec_query_with_retry
 
 cluster = ClickHouseCluster(__file__)
@@ -9,38 +9,35 @@ cluster = ClickHouseCluster(__file__)
 node1 = cluster.add_instance(
     "node1",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 node2 = cluster.add_instance(
     "node2",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 node3 = cluster.add_instance(
     "node3",
     with_zookeeper=True,
-    image="yandex/clickhouse-server",
-    tag="20.8.11.17",
+    image="clickhouse/clickhouse-server",
+    tag=CLICKHOUSE_CI_MIN_TESTED_VERSION,
     with_installed_binary=True,
     stay_alive=True,
     main_configs=[
         "configs/compat.xml",
     ],
-    allow_analyzer=False,
 )
 
 
diff --git a/tests/integration/test_wrong_db_or_table_name/test.py b/tests/integration/test_wrong_db_or_table_name/test.py
index a5096d80ca9..4a6dcf5aa41 100644
--- a/tests/integration/test_wrong_db_or_table_name/test.py
+++ b/tests/integration/test_wrong_db_or_table_name/test.py
@@ -92,26 +92,31 @@ def test_wrong_table_name(start):
         INSERT INTO test.table_test SELECT 1;
         """
     )
-    with pytest.raises(
-        QueryRuntimeException,
-        match="DB::Exception: Table test.table_test1 does not exist. Maybe you meant test.table_test?.",
-    ):
-        node.query(
-            """
+
+    error_message = node.query_and_get_error(
+        """
             SELECT * FROM test.table_test1 LIMIT 1;
             """
-        )
+    )
+    assert (
+        "DB::Exception: Table test.table_test1 does not exist. Maybe you meant test.table_test?"
+        in error_message
+        or "DB::Exception: Unknown table expression identifier 'test.table_test1' in scope SELECT * FROM test.table_test1 LIMIT 1."
+        in error_message
+    )
     assert int(node.query("SELECT count() FROM test.table_test;")) == 1
 
-    with pytest.raises(
-        QueryRuntimeException,
-        match="DB::Exception: Table test2.table_test1 does not exist. Maybe you meant test.table_test?.",
-    ):
-        node.query(
-            """
+    error_message = node.query_and_get_error(
+        """
             SELECT * FROM test2.table_test1 LIMIT 1;
             """
-        )
+    )
+    assert (
+        "DB::Exception: Table test2.table_test1 does not exist. Maybe you meant test.table_test?."
+        in error_message
+        or "DB::Exception: Unknown table expression identifier 'test2.table_test1' in scope SELECT * FROM test2.table_test1 LIMIT 1."
+        in error_message
+    )
 
     node.query(
         """
diff --git a/tests/jepsen.clickhouse/project.clj b/tests/jepsen.clickhouse/project.clj
index 6c714604b56..bb41be1ba10 100644
--- a/tests/jepsen.clickhouse/project.clj
+++ b/tests/jepsen.clickhouse/project.clj
@@ -13,4 +13,7 @@
                  [com.hierynomus/sshj "0.34.0"]
                  [com.clickhouse/clickhouse-jdbc "0.3.2-patch11"]
                  [org.apache.zookeeper/zookeeper "3.6.1" :exclusions [org.slf4j/slf4j-log4j12]]]
-  :repl-options {:init-ns jepsen.clickhouse-keeper.main})
+  :repl-options {:init-ns jepsen.clickhouse-keeper.main}
+  ;; otherwise, target artifacts will be created under the repo root, so that checkout with clear might fail in ci
+  :target-path "/tmp/jepsen_clickhouse"
+)
diff --git a/tests/jepsen.clickhouse/src/jepsen/clickhouse/utils.clj b/tests/jepsen.clickhouse/src/jepsen/clickhouse/utils.clj
index 9a77f070ca3..42b6b457b34 100644
--- a/tests/jepsen.clickhouse/src/jepsen/clickhouse/utils.clj
+++ b/tests/jepsen.clickhouse/src/jepsen/clickhouse/utils.clj
@@ -45,11 +45,14 @@
         dest-file (str dest-folder "/clickhouse")
         dest-symlink (str root-folder "/" expected-file-name)
         wget-opts (concat cu/std-wget-opts [:-O dest-file])]
-    (when-not (cu/exists? dest-file)
-      (info "Downloading" url)
-      (do (c/exec :mkdir :-p dest-folder)
-          (c/cd dest-folder
+    (if-not (cu/exists? dest-file)
+      (do
+        (info "Downloading" url)
+        (do (c/exec :mkdir :-p dest-folder)
+            (c/cd dest-folder
                 (cu/wget-helper! wget-opts url))))
+      (info "Binary is already downloaded"))
+
     (c/exec :rm :-rf dest-symlink)
     (c/exec :ln :-s dest-file dest-symlink)
     dest-symlink))
diff --git a/tests/performance/agg_functions_argmin_argmax.xml b/tests/performance/agg_functions_argmin_argmax.xml
new file mode 100644
index 00000000000..e8eed2a82de
--- /dev/null
+++ b/tests/performance/agg_functions_argmin_argmax.xml
@@ -0,0 +1,24 @@
+<test>
+    <substitutions>
+        <substitution>
+            <name>group_scale</name>
+            <values>
+                <value>1000000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+<query>select argMin(Title, EventTime) from hits_100m_single where Title != '' group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+<query>select argMinIf(Title, EventTime, Title != '') from hits_100m_single group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+<query>select argMinIf(Title::Nullable(String), EventTime::Nullable(DateTime), Title::Nullable(String) != '') from hits_100m_single group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+
+<query>select argMin(RegionID, EventTime) from hits_100m_single where Title != '' group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+<query>select argMin((Title, RegionID), EventTime) from hits_100m_single where Title != '' group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+<query>select argMinIf(Title, EventTime, Title != '') from hits_100m_single group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+
+<query>select argMax(WatchID, Age) from hits_100m_single FORMAT Null</query>
+<query>select argMax(WatchID, Age::Nullable(UInt8)) from hits_100m_single FORMAT Null</query>
+<query>select argMax(WatchID, (EventDate, EventTime)) from hits_100m_single where Title != '' group by intHash32(UserID) % {group_scale} FORMAT Null</query>
+<query>select argMax(MobilePhone, MobilePhoneModel) from hits_100m_single</query>
+
+</test>
diff --git a/tests/performance/aggregate_with_serialized_method.xml b/tests/performance/aggregate_with_serialized_method.xml
index 91763c69bb9..5964e7e2227 100644
--- a/tests/performance/aggregate_with_serialized_method.xml
+++ b/tests/performance/aggregate_with_serialized_method.xml
@@ -1,8 +1,7 @@
 <test>
     <settings>
         <max_insert_threads>8</max_insert_threads>
-        <allow_experimental_projection_optimization>0</allow_experimental_projection_optimization>
-        <max_threads>4</max_threads>
+        <max_threads>1</max_threads>
     </settings>
 
     <create_query>
@@ -29,4 +28,4 @@
     <query>select toDecimal64(key_int64_1, 3),toDecimal64(key_int64_2, 3),toDecimal64(key_int64_3, 3),toDecimal64(key_int64_4, 3),toDecimal64(key_int64_5, 3), min(m1) from t_nullable group by toDecimal64(key_int64_1, 3),toDecimal64(key_int64_2, 3),toDecimal64(key_int64_3, 3),toDecimal64(key_int64_4, 3),toDecimal64(key_int64_5, 3) limit 10</query>
 
     <drop_query>drop table if exists t_nullable</drop_query>
-</test>
\ No newline at end of file
+</test>
diff --git a/tests/performance/aggregating_merge_tree_simple_aggregate_function_string.xml b/tests/performance/aggregating_merge_tree_simple_aggregate_function_string.xml
index 0c93b4745cf..5845d1dd0d2 100644
--- a/tests/performance/aggregating_merge_tree_simple_aggregate_function_string.xml
+++ b/tests/performance/aggregating_merge_tree_simple_aggregate_function_string.xml
@@ -1,4 +1,7 @@
 <test>
+    <settings>
+        <allow_suspicious_primary_key>1</allow_suspicious_primary_key>
+    </settings>
     <create_query>
         CREATE TABLE bench
         ENGINE = AggregatingMergeTree()
diff --git a/tests/performance/alter_select.xml b/tests/performance/alter_select.xml
new file mode 100644
index 00000000000..fbbf603dcba
--- /dev/null
+++ b/tests/performance/alter_select.xml
@@ -0,0 +1,35 @@
+<test>
+  <substitutions>
+    <substitution>
+      <name>engine</name>
+      <values>
+        <value>mt</value>
+        <value>rmt</value>
+      </values>
+    </substitution>
+  </substitutions>
+
+  <create_query>create table alter_select_mt  (part_id String, col_0 String) engine=MergeTree()                                              partition by part_id order by tuple() settings max_parts_to_merge_at_once=1</create_query>
+  <create_query>create table alter_select_rmt (part_id String, col_0 String) engine=ReplicatedMergeTree('/tables/{{database}}', '{{table}}') partition by part_id order by tuple() settings max_parts_to_merge_at_once=1</create_query>
+
+  <create_query>system stop merges alter_select_{engine}</create_query>
+
+  <fill_query>
+      insert into alter_select_{engine} (part_id, col_0)
+      select toString(number % 5000), 0 from numbers(10000)
+      settings
+      max_block_size=1,
+      max_insert_threads=32,
+      min_insert_block_size_rows=1,
+      insert_deduplicate=false,
+      parts_to_delay_insert=100000,
+      parts_to_throw_insert=100000
+  </fill_query>
+  <fill_query>alter table alter_select_{engine} drop column col_0 settings alter_sync = 0</fill_query>
+
+  <query>select count() from alter_select_{engine} format Null settings max_threads=1</query>
+  <query>select * from alter_select_{engine} format Null settings max_threads=1</query>
+
+  <drop_query>drop table alter_select_{engine}</drop_query>
+</test>
+
diff --git a/tests/performance/array_index_low_cardinality_numbers.xml b/tests/performance/array_index_low_cardinality_numbers.xml
index f8fa27df05f..a68a37ebfff 100644
--- a/tests/performance/array_index_low_cardinality_numbers.xml
+++ b/tests/performance/array_index_low_cardinality_numbers.xml
@@ -1,4 +1,8 @@
 <test>
+    <settings>
+        <allow_suspicious_low_cardinality_types>1</allow_suspicious_low_cardinality_types>
+    </settings>
+
     <create_query>DROP TABLE IF EXISTS perf_lc_num</create_query>
     <create_query>CREATE TABLE perf_lc_num(
         num UInt8,
diff --git a/tests/performance/array_join.xml b/tests/performance/array_join.xml
index ca280ce28ad..b3fc24d3166 100644
--- a/tests/performance/array_join.xml
+++ b/tests/performance/array_join.xml
@@ -8,4 +8,6 @@
     <query>SELECT count() FROM (SELECT [number] a, [number * 2] b FROM numbers(10000000)) AS t LEFT ARRAY JOIN a, b WHERE NOT ignore(a + b) SETTINGS enable_unaligned_array_join = 1</query>
     <query>SELECT count() FROM (SELECT [number] a, [number * 2, number] b FROM numbers(10000000)) AS t ARRAY JOIN a, b WHERE NOT ignore(a + b) SETTINGS enable_unaligned_array_join = 1</query>
     <query>SELECT count() FROM (SELECT [number] a, [number * 2, number] b FROM numbers(10000000)) AS t LEFT ARRAY JOIN a, b WHERE NOT ignore(a + b) SETTINGS enable_unaligned_array_join = 1</query>
+
+    <query>with 'clickhouse' as str select arrayJoin(range(number % 10)),  materialize(str) from numbers(10000000)</query>
 </test>
diff --git a/tests/performance/asof.xml b/tests/performance/asof.xml
index d00afaa26b5..61e61be13bb 100644
--- a/tests/performance/asof.xml
+++ b/tests/performance/asof.xml
@@ -43,6 +43,13 @@
     </query>
 
     <substitutions>
+        <substitution>
+            <name>num_unique_sessions</name>
+            <values>
+                <value>1000</value>
+                <value>1000000</value>
+            </values>
+        </substitution>
         <substitution>
             <name>num_rows</name>
             <values>
@@ -56,15 +63,15 @@
         FROM
         (
             SELECT
-                number AS id,
-                number AS visitor_id
+                (number % {num_unique_sessions}) AS visitor_id,
+                number AS id
             FROM system.numbers
             LIMIT {num_rows}
         ) AS sessions
         ASOF LEFT JOIN
         (
             SELECT
-                number AS visitor_id,
+                (number % {num_unique_sessions}) AS visitor_id,
                 number AS starting_session_id
             FROM system.numbers
             LIMIT {num_rows}
diff --git a/tests/performance/bigint_formatting.xml b/tests/performance/bigint_formatting.xml
new file mode 100644
index 00000000000..c3454f91d1d
--- /dev/null
+++ b/tests/performance/bigint_formatting.xml
@@ -0,0 +1,13 @@
+<test>
+    <create_query>
+        CREATE TABLE bigint ( u128 UInt128, i128 Int128, u256 UInt256, i256 Int256) ENGINE = Memory
+        AS
+        SELECT * FROM generateRandom('u128 UInt128, i128 Int128, u256 UInt256, i256 Int256', 42) LIMIT 50000;
+    </create_query>
+    <drop_query>DROP TABLE IF EXISTS bigint</drop_query>
+
+    <query>SELECT * FROM bigint WHERE NOT ignore(toString(u128)) SETTINGS max_threads = 1</query>
+    <query>SELECT * FROM bigint WHERE NOT ignore(toString(i128)) SETTINGS max_threads = 1</query>
+    <query>SELECT * FROM bigint WHERE NOT ignore(toString(u256)) SETTINGS max_threads = 1</query>
+    <query>SELECT * FROM bigint WHERE NOT ignore(toString(i256)) SETTINGS max_threads = 1</query>
+</test>
diff --git a/tests/performance/coalesce.xml b/tests/performance/coalesce.xml
new file mode 100644
index 00000000000..08b9a6aab1e
--- /dev/null
+++ b/tests/performance/coalesce.xml
@@ -0,0 +1,3 @@
+<test>
+    <query>select coalesce(materialize(null), -1) from numbers(1000000000) format Null settings max_block_size = 8192</query>
+</test>
diff --git a/tests/performance/dotProduct.xml b/tests/performance/dotProduct.xml
new file mode 100644
index 00000000000..a0ab7beea9c
--- /dev/null
+++ b/tests/performance/dotProduct.xml
@@ -0,0 +1,63 @@
+<test>
+
+    <substitutions>
+        <substitution>
+            <name>element_type</name>
+            <values>
+                <!-- integer cases are not relevant in practice for vector search, disable to reduce test runtime -->
+                <!-- <value>UInt8</value> -->
+                <!-- <value>Int16</value> -->
+                <!-- <value>Int32</value> -->
+                <!-- <value>Int64</value> -->
+                <value>Float32</value>
+                <value>Float64</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>
+        CREATE TABLE vecs_{element_type} (
+            v Array({element_type})
+        ) ENGINE=Memory;
+    </create_query>
+
+    <!-- Gererate arrays with random data -->
+    <!-- Dimension = 150 is realistic for vector search use cases -->
+
+    <fill_query>
+        INSERT INTO vecs_{element_type}
+        SELECT v FROM (
+            SELECT
+                number AS n,
+                [
+                    rand(n*10), rand(n*10+1), rand(n*10+2), rand(n*10+3), rand(n*10+4), rand(n*10+5), rand(n*10+6), rand(n*10+7), rand(n*10+8), rand(n*10+9),
+                    rand(n*10+10), rand(n*10+11), rand(n*10+12), rand(n*10+13), rand(n*10+14), rand(n*10+15), rand(n*10+16), rand(n*10+17), rand(n*10+18), rand(n*10+19),
+                    rand(n*10+20), rand(n*10+21), rand(n*10+22), rand(n*10+23), rand(n*10+24), rand(n*10+25), rand(n*10+26), rand(n*10+27), rand(n*10+28), rand(n*10+29),
+                    rand(n*10+30), rand(n*10+31), rand(n*10+32), rand(n*10+33), rand(n*10+34), rand(n*10+35), rand(n*10+36), rand(n*10+37), rand(n*10+38), rand(n*10+39),
+                    rand(n*10+40), rand(n*10+41), rand(n*10+42), rand(n*10+43), rand(n*10+44), rand(n*10+45), rand(n*10+46), rand(n*10+47), rand(n*10+48), rand(n*10+49),
+                    rand(n*10+50), rand(n*10+51), rand(n*10+52), rand(n*10+53), rand(n*10+54), rand(n*10+55), rand(n*10+56), rand(n*10+57), rand(n*10+58), rand(n*10+59),
+                    rand(n*10+60), rand(n*10+61), rand(n*10+62), rand(n*10+63), rand(n*10+64), rand(n*10+65), rand(n*10+66), rand(n*10+67), rand(n*10+68), rand(n*10+69),
+                    rand(n*10+70), rand(n*10+71), rand(n*10+72), rand(n*10+73), rand(n*10+74), rand(n*10+75), rand(n*10+76), rand(n*10+77), rand(n*10+78), rand(n*10+79),
+                    rand(n*10+80), rand(n*10+81), rand(n*10+82), rand(n*10+83), rand(n*10+84), rand(n*10+85), rand(n*10+86), rand(n*10+87), rand(n*10+88), rand(n*10+89),
+                    rand(n*10+90), rand(n*10+91), rand(n*10+92), rand(n*10+93), rand(n*10+94), rand(n*10+95), rand(n*10+96), rand(n*10+97), rand(n*10+98), rand(n*10+99),
+                    rand(n*10+100), rand(n*10+101), rand(n*10+102), rand(n*10+103), rand(n*10+104), rand(n*10+105), rand(n*10+106), rand(n*10+107), rand(n*10+108), rand(n*10+109),
+                    rand(n*10+110), rand(n*10+111), rand(n*10+112), rand(n*10+113), rand(n*10+114), rand(n*10+115), rand(n*10+116), rand(n*10+117), rand(n*10+118), rand(n*10+119),
+                    rand(n*10+120), rand(n*10+121), rand(n*10+122), rand(n*10+123), rand(n*10+124), rand(n*10+125), rand(n*10+126), rand(n*10+127), rand(n*10+128), rand(n*10+129),
+                    rand(n*10+130), rand(n*10+131), rand(n*10+132), rand(n*10+133), rand(n*10+134), rand(n*10+135), rand(n*10+136), rand(n*10+137), rand(n*10+138), rand(n*10+139),
+                    rand(n*10+140), rand(n*10+141), rand(n*10+142), rand(n*10+143), rand(n*10+144), rand(n*10+145), rand(n*10+146), rand(n*10+147), rand(n*10+148), rand(n*10+149)
+                ] AS v
+            FROM system.numbers
+            LIMIT 5000000
+        );
+    </fill_query>
+
+    <settings>
+        <max_threads>1</max_threads>
+    </settings>
+
+    <query>SELECT sum(dp) FROM (SELECT dotProduct(v, v) AS dp FROM vecs_{element_type})</query>
+    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dp) FROM (SELECT dotProduct(a, v) AS dp FROM vecs_{element_type})</query>
+
+    <drop_query>DROP TABLE vecs_{element_type}</drop_query>
+
+</test>
diff --git a/tests/performance/final_big_column.xml b/tests/performance/final_big_column.xml
new file mode 100644
index 00000000000..1fd586d2d90
--- /dev/null
+++ b/tests/performance/final_big_column.xml
@@ -0,0 +1,21 @@
+<test>
+    <settings>
+        <max_insert_threads>1</max_insert_threads>
+        <max_memory_usage>20G</max_memory_usage>
+    </settings>
+
+    <create_query>
+        CREATE TABLE optimized_select_final (d Date, key UInt64, value String)
+        ENGINE = ReplacingMergeTree()
+        PARTITION BY toYYYYMM(d) ORDER BY key
+    </create_query>
+
+    <fill_query>INSERT INTO optimized_select_final SELECT toDate('2000-01-01'), 2*number, randomPrintableASCII(1000) FROM numbers(5000000)</fill_query>
+    <fill_query>INSERT INTO optimized_select_final SELECT toDate('2020-01-01'), 2*number+1, randomPrintableASCII(1000) FROM numbers(5000000)</fill_query>
+
+    <query>SELECT * FROM optimized_select_final FINAL FORMAT Null SETTINGS max_threads = 8</query>
+    <query>SELECT * FROM optimized_select_final FINAL WHERE key % 10 = 0 FORMAT Null</query>
+
+    <drop_query>DROP TABLE IF EXISTS optimized_select_final</drop_query>
+
+</test>
diff --git a/tests/performance/function_tokens.xml b/tests/performance/function_tokens.xml
new file mode 100644
index 00000000000..63b72f83df3
--- /dev/null
+++ b/tests/performance/function_tokens.xml
@@ -0,0 +1,3 @@
+<test>
+    <query>with 'Many years later as he faced the firing squad, Colonel Aureliano Buendia was to remember that distant afternoon when his father took him to discover ice.' as s select splitByChar(' ', materialize(s)) as w from numbers(1000000)</query>
+</test>
diff --git a/tests/performance/group_array_sorted.xml b/tests/performance/group_array_sorted.xml
new file mode 100644
index 00000000000..d5887998341
--- /dev/null
+++ b/tests/performance/group_array_sorted.xml
@@ -0,0 +1,31 @@
+<test>
+    <settings>
+        <max_memory_usage>30000000000</max_memory_usage>
+    </settings>
+
+    <substitutions>
+        <substitution>
+            <name>millions</name>
+            <values>
+                <value>50</value>
+                <value>100</value>
+            </values>
+        </substitution>
+        <substitution>
+            <name>window</name>
+            <values>
+                <value>10</value>
+                <value>1000</value>
+                <value>10000</value>
+            </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>create table sorted_{millions}m engine MergeTree order by k as select number % 100 k, rand() v from numbers_mt(1000000 * {millions})</create_query>
+    <create_query>optimize table sorted_{millions}m final</create_query>
+
+    <query>select k, groupArraySorted({window})(v) from sorted_{millions}m group by k format Null</query>
+    <query>select k % 10 kk, groupArraySorted({window})(v) from sorted_{millions}m group by kk format Null</query>
+
+    <drop_query>drop table if exists sorted_{millions}m</drop_query>
+</test>
diff --git a/tests/performance/if.xml b/tests/performance/if.xml
index f4d0e8f9773..f7b4f3336a7 100644
--- a/tests/performance/if.xml
+++ b/tests/performance/if.xml
@@ -1,12 +1,28 @@
 <test>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() > 42949673, zero + 1, zero + 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 3865470566, zero + 1, zero + 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 2147483647, zero + 1, zero + 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, zero + 1, zero + 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, zero + 1, 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, 1, zero + 2)) ]]></query>
+    <query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, 1, 2)) ]]></query>
+    
+    <!-- Tests when branches are both not constant -->
+    <query>with rand32() % 2 as x select if(x, materialize(1.234), materialize(2.456)) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1.234::Decimal64(3) as a, 2.456::Decimal64(3) as b select if(x, materialize(a), materialize(b)) from numbers(100000000) format Null</query>
 
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() > 42949673, zero + 1, zero + 2)) ]]></query>
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 3865470566, zero + 1, zero + 2)) ]]></query>
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 2147483647, zero + 1, zero + 2)) ]]></query>
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, zero + 1, zero + 2)) ]]></query>
-
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, zero + 1, 2)) ]]></query>
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, 1, zero + 2)) ]]></query>
-<query><![CDATA[ SELECT count() FROM zeros(1000000000) WHERE NOT ignore(if(rand32() < 42949673, 1, 2)) ]]></query>
+    <!-- Tests when branches are both constant -->
+    <query>with rand32() % 2 as x, 1::Int8 as a, -1::Int8 as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Int64 as a, -1::Int64 as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Int32 as a, -1::Int32 as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Decimal32(3) as a, -1::Decimal32(3) as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Decimal64(3) as a, -1::Decimal64(3) as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Decimal128(3) as a, -1::Decimal128(3) as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Decimal256(3) as a, -1::Decimal256(3) as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Int128 as a, -1::Int128 as b select if(x, a, b) from numbers(100000000) format Null</query>
+    <query>with rand32() % 2 as x, 1::Int256 as a, -1::Int256 as b select if(x, a, b) from numbers(100000000) format Null</query>
 
+    <!-- Tests when branches are maps -->
+    <query>with rand32() % 2 as x select if(x, map(1,2,3,4), map(3,4,5,6)) from numbers(1000000) format Null</query>
+    <query>with rand32() % 2 as x select if(x, materialize(map(1,2,3,4)), materialize(map(3,4,5,6))) from numbers(1000000) format Null</query>
 </test>
diff --git a/tests/performance/jit_aggregate_functions.xml b/tests/performance/jit_aggregate_functions.xml
index 8abb901439a..a16b81f610c 100644
--- a/tests/performance/jit_aggregate_functions.xml
+++ b/tests/performance/jit_aggregate_functions.xml
@@ -30,7 +30,7 @@
     </create_query>
 
     <create_query>
-        CREATE TABLE jit_test_merge_tree_nullable (
+        CREATE TABLE jit_test_memory_nullable (
             key UInt64,
             value_1 Nullable(UInt64),
             value_2 Nullable(UInt64),
@@ -42,7 +42,7 @@
     </create_query>
 
     <create_query>
-        CREATE TABLE jit_test_memory_nullable (
+        CREATE TABLE jit_test_merge_tree_nullable (
             key UInt64,
             value_1 Nullable(UInt64),
             value_2 Nullable(UInt64),
diff --git a/tests/performance/multiif.xml b/tests/performance/multiif.xml
index ad56ab3f5f2..0c2d95cc553 100644
--- a/tests/performance/multiif.xml
+++ b/tests/performance/multiif.xml
@@ -5,4 +5,12 @@
     <query>select count(1) from test_multiif_t where multiIf(d > 2, d-2, d > 1, d-1, d >0, d, 0) > 1 SETTINGS max_threads=1</query>
 
     <drop_query>DROP TABLE IF EXISTS test_multiif_t</drop_query>
+
+
+    <!-- Test multiIf with decimal inputs -->
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf( rand(1) % 2 = 0, materialize(1::Nullable(Decimal256(3))), rand(2) % 2 = 0, materialize(2::Nullable(Decimal256(3))), rand(3) % 2 = 0, materialize(3::Nullable(Decimal256(3))), rand(4) % 2 = 0, materialize(4::Nullable(Decimal256(3))), rand(5) % 2 = 0, materialize(5::Nullable(Decimal256(3))), materialize(6::Nullable(Decimal256(3)))))</query>
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf( rand(1) % 2 = 0, materialize(1::Decimal256(3)), rand(2) % 2 = 0, materialize(2::Decimal256(3)), rand(3) % 2 = 0, materialize(3::Decimal256(3)), rand(4) % 2 = 0, materialize(4::Decimal256(3)), rand(5) % 2 = 0, materialize(5::Decimal256(3)), materialize(6::Decimal256(3))))</query>
+
+    <!-- Test multiIf with integer inputs -->
+    <query>SELECT count() FROM zeros(10000000) WHERE NOT ignore(multiIf(rand() % 2 = 0, rand()+2, rand() % 3 = 0, rand()+3, rand() % 4 = 0, rand()+4, rand() % 5 = 0, rand() + 5, rand() % 6 = 0, rand() + 6, rand()))</query>
 </test>
diff --git a/tests/performance/norm_distance.xml b/tests/performance/norm_distance.xml
index 3dc8cbd70e6..69ed71d026f 100644
--- a/tests/performance/norm_distance.xml
+++ b/tests/performance/norm_distance.xml
@@ -4,10 +4,11 @@
         <substitution>
             <name>element_type</name>
             <values>
-                <value>UInt8</value>
-                <value>Int16</value>
-                <value>Int32</value>
-                <value>Int64</value>
+                <!-- integer cases are not relevant in practice for vector search, disable to reduce test runtime -->
+                <!-- <value>UInt8</value> -->
+                <!-- <value>Int16</value> -->
+                <!-- <value>Int32</value> -->
+                <!-- <value>Int64</value> -->
                 <value>Float32</value>
                 <value>Float64</value>
             </values>
@@ -21,6 +22,7 @@
     </create_query>
 
     <!-- Gererate arrays with random data -->
+    <!-- Dimension = 150 is realistic for vector search use cases -->
 
     <fill_query>
         INSERT INTO vecs_{element_type}
@@ -28,46 +30,27 @@
             SELECT
                 number AS n,
                 [
-                    rand(n*10),
-                    rand(n*10+1),
-                    rand(n*10+2),
-                    rand(n*10+3),
-                    rand(n*10+4),
-                    rand(n*10+5),
-                    rand(n*10+6),
-                    rand(n*10+7),
-                    rand(n*10+8),
-                    rand(n*10+9)
+                    rand(n*10), rand(n*10+1), rand(n*10+2), rand(n*10+3), rand(n*10+4), rand(n*10+5), rand(n*10+6), rand(n*10+7), rand(n*10+8), rand(n*10+9),
+                    rand(n*10+10), rand(n*10+11), rand(n*10+12), rand(n*10+13), rand(n*10+14), rand(n*10+15), rand(n*10+16), rand(n*10+17), rand(n*10+18), rand(n*10+19),
+                    rand(n*10+20), rand(n*10+21), rand(n*10+22), rand(n*10+23), rand(n*10+24), rand(n*10+25), rand(n*10+26), rand(n*10+27), rand(n*10+28), rand(n*10+29),
+                    rand(n*10+30), rand(n*10+31), rand(n*10+32), rand(n*10+33), rand(n*10+34), rand(n*10+35), rand(n*10+36), rand(n*10+37), rand(n*10+38), rand(n*10+39),
+                    rand(n*10+40), rand(n*10+41), rand(n*10+42), rand(n*10+43), rand(n*10+44), rand(n*10+45), rand(n*10+46), rand(n*10+47), rand(n*10+48), rand(n*10+49),
+                    rand(n*10+50), rand(n*10+51), rand(n*10+52), rand(n*10+53), rand(n*10+54), rand(n*10+55), rand(n*10+56), rand(n*10+57), rand(n*10+58), rand(n*10+59),
+                    rand(n*10+60), rand(n*10+61), rand(n*10+62), rand(n*10+63), rand(n*10+64), rand(n*10+65), rand(n*10+66), rand(n*10+67), rand(n*10+68), rand(n*10+69),
+                    rand(n*10+70), rand(n*10+71), rand(n*10+72), rand(n*10+73), rand(n*10+74), rand(n*10+75), rand(n*10+76), rand(n*10+77), rand(n*10+78), rand(n*10+79),
+                    rand(n*10+80), rand(n*10+81), rand(n*10+82), rand(n*10+83), rand(n*10+84), rand(n*10+85), rand(n*10+86), rand(n*10+87), rand(n*10+88), rand(n*10+89),
+                    rand(n*10+90), rand(n*10+91), rand(n*10+92), rand(n*10+93), rand(n*10+94), rand(n*10+95), rand(n*10+96), rand(n*10+97), rand(n*10+98), rand(n*10+99),
+                    rand(n*10+100), rand(n*10+101), rand(n*10+102), rand(n*10+103), rand(n*10+104), rand(n*10+105), rand(n*10+106), rand(n*10+107), rand(n*10+108), rand(n*10+109),
+                    rand(n*10+110), rand(n*10+111), rand(n*10+112), rand(n*10+113), rand(n*10+114), rand(n*10+115), rand(n*10+116), rand(n*10+117), rand(n*10+118), rand(n*10+119),
+                    rand(n*10+120), rand(n*10+121), rand(n*10+122), rand(n*10+123), rand(n*10+124), rand(n*10+125), rand(n*10+126), rand(n*10+127), rand(n*10+128), rand(n*10+129),
+                    rand(n*10+130), rand(n*10+131), rand(n*10+132), rand(n*10+133), rand(n*10+134), rand(n*10+135), rand(n*10+136), rand(n*10+137), rand(n*10+138), rand(n*10+139),
+                    rand(n*10+140), rand(n*10+141), rand(n*10+142), rand(n*10+143), rand(n*10+144), rand(n*10+145), rand(n*10+146), rand(n*10+147), rand(n*10+148), rand(n*10+149)
                 ] AS v
             FROM system.numbers
-            LIMIT 10000000
+            LIMIT 5000000
         );
     </fill_query>
 
-    <!-- The same data in the form of tuples -->
-
-    <create_query>
-        CREATE TABLE tuples_{element_type} (
-            t Tuple(
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type},
-                {element_type}
-            )
-        ) ENGINE=Memory;
-    </create_query>
-
-    <fill_query>
-        INSERT INTO tuples_{element_type}
-        SELECT (v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10]) FROM vecs_{element_type};
-    </fill_query>
-
     <settings>
         <max_threads>1</max_threads>
     </settings>
@@ -84,17 +67,11 @@
         </substitution>
     </substitutions>
 
-    <!-- Tuples -->
-    <query>SELECT sum(dist) FROM (SELECT {norm}Norm(t) AS dist FROM tuples_{element_type})</query>
-    <query>WITH (SELECT t FROM tuples_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT {norm}Distance(a, t) AS dist FROM tuples_{element_type})</query>
-    <query>WITH (SELECT t FROM tuples_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT cosineDistance(a, t) AS dist FROM tuples_{element_type})</query>
-
     <!-- Arrays -->
     <query>SELECT sum(dist) FROM (SELECT {norm}Norm(v) AS dist FROM vecs_{element_type})</query>
     <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT {norm}Distance(a, v) AS dist FROM vecs_{element_type})</query>
     <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT cosineDistance(a, v) AS dist FROM vecs_{element_type})</query>
 
     <drop_query>DROP TABLE vecs_{element_type}</drop_query>
-    <drop_query>DROP TABLE tuples_{element_type}</drop_query>
 
 </test>
diff --git a/tests/performance/norm_distance_float.xml b/tests/performance/norm_distance_float.xml
deleted file mode 100644
index e71d8eb6281..00000000000
--- a/tests/performance/norm_distance_float.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<test>
-
-    <substitutions>
-        <substitution>
-            <name>element_type</name>
-            <values>
-                <value>Float32</value>
-                <value>Float64</value>
-            </values>
-        </substitution>
-    </substitutions>
-
-    <create_query>
-        CREATE TABLE vecs_{element_type} (
-            v Array({element_type})
-        ) ENGINE=Memory;
-    </create_query>
-
-    <!-- Gererate arrays with random data -->
-
-    <fill_query>
-        INSERT INTO vecs_{element_type}
-        SELECT v FROM (
-            SELECT
-                number AS n,
-                [
-                    rand(n*10),
-                    rand(n*10+1),
-                    rand(n*10+2),
-                    rand(n*10+3),
-                    rand(n*10+4),
-                    rand(n*10+5),
-                    rand(n*10+6),
-                    rand(n*10+7),
-                    rand(n*10+8),
-                    rand(n*10+9),
-                    rand(n*10),
-                    rand(n*10+1),
-                    rand(n*10+2),
-                    rand(n*10+3),
-                    rand(n*10+4),
-                    rand(n*10+5),
-                    rand(n*10+6),
-                    rand(n*10+7),
-                    rand(n*10+8),
-                    rand(n*10+9),
-                    rand(n*10),
-                    rand(n*10+1),
-                    rand(n*10+2),
-                    rand(n*10+3),
-                    rand(n*10+4),
-                    rand(n*10+5),
-                    rand(n*10+6),
-                    rand(n*10+7),
-                    rand(n*10+8),
-                    rand(n*10+9),
-                    rand(n*10),
-                    rand(n*10+1),
-                    rand(n*10+2),
-                    rand(n*10+3),
-                    rand(n*10+4),
-                    rand(n*10+5),
-                    rand(n*10+6),
-                    rand(n*10+7)
-                ] AS v
-            FROM system.numbers
-            LIMIT 10000000
-        );
-    </fill_query>
-
-    <settings>
-        <max_threads>1</max_threads>
-    </settings>
-
-    <!-- Norm kinds-->
-    <substitutions>
-        <substitution>
-            <name>norm</name>
-            <values>
-                <value>L1</value>
-                <value>L2</value>
-                <value>L2Squared</value>
-                <value>Linf</value>
-            </values>
-        </substitution>
-    </substitutions>
-
-    <!-- Arrays -->
-    <query>SELECT sum(dist) FROM (SELECT {norm}Norm(v) AS dist FROM vecs_{element_type})</query>
-    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT {norm}Distance(a, v) AS dist FROM vecs_{element_type})</query>
-    <query>WITH (SELECT v FROM vecs_{element_type} limit 1) AS a SELECT sum(dist) FROM (SELECT cosineDistance(a, v) AS dist FROM vecs_{element_type})</query>
-
-    <drop_query>DROP TABLE vecs_{element_type}</drop_query>
-
-</test>
diff --git a/tests/performance/order_with_limit.xml b/tests/performance/order_with_limit.xml
index 1e1cb52267c..d1ad2afade8 100644
--- a/tests/performance/order_with_limit.xml
+++ b/tests/performance/order_with_limit.xml
@@ -1,4 +1,5 @@
 <test>
+    <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 1 FORMAT Null</query>
     <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 10 FORMAT Null</query>
     <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 100 FORMAT Null</query>
     <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 1500 FORMAT Null</query>
@@ -7,6 +8,7 @@
     <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 10000 FORMAT Null</query>
     <query>SELECT number AS n FROM numbers_mt(200000000) ORDER BY n DESC LIMIT 65535 FORMAT Null</query>
 
+    <query>SELECT intHash64(number) AS n FROM numbers_mt(500000000) ORDER BY n LIMIT 1 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(500000000) ORDER BY n LIMIT 10 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n LIMIT 100 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n LIMIT 1500 FORMAT Null</query>
@@ -15,6 +17,7 @@
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n LIMIT 10000 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(100000000) ORDER BY n LIMIT 65535 FORMAT Null</query>
 
+    <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n, n + 1, n + 2 LIMIT 1 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n, n + 1, n + 2 LIMIT 10 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n, n + 1, n + 2 LIMIT 100 FORMAT Null</query>
     <query>SELECT intHash64(number) AS n FROM numbers_mt(200000000) ORDER BY n, n + 1, n + 2 LIMIT 1500 FORMAT Null</query>
diff --git a/tests/performance/parallel_final.xml b/tests/performance/parallel_final.xml
index d7ea0240105..97261f93983 100644
--- a/tests/performance/parallel_final.xml
+++ b/tests/performance/parallel_final.xml
@@ -9,51 +9,53 @@
 
     <substitutions>
         <substitution>
-            <name>collapsing</name>
+            <name>replacing</name>
             <values>
-                <value>collapsing_final_16p_ord</value>
-                <value>collapsing_final_16p_rnd</value>
-                <value>collapsing_final_16p_int_keys_ord</value>
-                <value>collapsing_final_16p_int_keys_rnd</value>
-                <value>collapsing_final_16p_str_keys_ord</value>
-                <value>collapsing_final_16p_str_keys_rnd</value>
-                <value>collapsing_final_1024p_ord</value>
-                <value>collapsing_final_1024p_rnd</value>
-                <value>collapsing_final_1p_ord</value>
+                <value>replacing_final_16p_ord</value>
+                <value>replacing_final_16p_rnd</value>
+                <value>replacing_final_16p_int_keys_ord</value>
+                <value>replacing_final_16p_int_keys_rnd</value>
+                <value>replacing_final_16p_str_keys_ord</value>
+                <value>replacing_final_16p_str_keys_rnd</value>
+                <value>replacing_final_1024p_ord</value>
+                <value>replacing_final_1024p_rnd</value>
+                <value>replacing_final_1p_ord</value>
             </values>
         </substitution>
     </substitutions>
 
-    <create_query>create table collapsing_final_16p_ord (key1 UInt32, key2 String, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2) partition by intDiv(key1, 8192 * 64) </create_query>
-    <create_query>create table collapsing_final_16p_rnd (key1 UInt32, key2 String, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2) partition by key1 % 16 </create_query>
-    <create_query>create table collapsing_final_16p_int_keys_ord (key1 UInt32, key2 UInt32, key3 UInt32, key4 UInt32, key5 UInt32, key6 UInt32, key7 UInt32, key8 UInt32, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by intDiv(key1, 8192 * 64) </create_query>
-    <create_query>create table collapsing_final_16p_int_keys_rnd (key1 UInt32, key2 UInt32, key3 UInt32, key4 UInt32, key5 UInt32, key6 UInt32, key7 UInt32, key8 UInt32, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by key1 % 16 </create_query>
-    <create_query>create table collapsing_final_16p_str_keys_ord (key1 UInt32, key2 String, key3 String, key4 String, key5 String, key6 String, key7 String, key8 String, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by intDiv(key1, 8192 * 64) </create_query>
-    <create_query>create table collapsing_final_16p_str_keys_rnd (key1 UInt32, key2 String, key3 String, key4 String, key5 String, key6 String, key7 String, key8 String, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by key1 % 16 </create_query>
-    <create_query>create table collapsing_final_1024p_ord (key1 UInt32, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1) partition by intDiv(key1, 8192 * 2) </create_query>
-    <create_query>create table collapsing_final_1024p_rnd (key1 UInt32, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1) partition by key1 % 1024 </create_query>
-    <create_query>create table collapsing_final_1p_ord (key1 UInt64, key2 UInt64, sign Int8, s UInt64) engine = CollapsingMergeTree(sign) order by (key1, key2)</create_query>
+    <create_query>create table replacing_final_16p_ord (key1 UInt32, key2 String, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2) partition by intDiv(key1, 8192 * 64) </create_query>
+    <create_query>create table replacing_final_16p_rnd (key1 UInt32, key2 String, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2) partition by key1 % 16 </create_query>
+    <create_query>create table replacing_final_16p_int_keys_ord (key1 UInt32, key2 UInt32, key3 UInt32, key4 UInt32, key5 UInt32, key6 UInt32, key7 UInt32, key8 UInt32, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by intDiv(key1, 8192 * 64) </create_query>
+    <create_query>create table replacing_final_16p_int_keys_rnd (key1 UInt32, key2 UInt32, key3 UInt32, key4 UInt32, key5 UInt32, key6 UInt32, key7 UInt32, key8 UInt32, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by key1 % 16 </create_query>
+    <create_query>create table replacing_final_16p_str_keys_ord (key1 UInt32, key2 String, key3 String, key4 String, key5 String, key6 String, key7 String, key8 String, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by intDiv(key1, 8192 * 64) </create_query>
+    <create_query>create table replacing_final_16p_str_keys_rnd (key1 UInt32, key2 String, key3 String, key4 String, key5 String, key6 String, key7 String, key8 String, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2, key3, key4, key5, key6, key7, key8) partition by key1 % 16 </create_query>
+    <create_query>create table replacing_final_1024p_ord (key1 UInt32, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1) partition by intDiv(key1, 8192 * 2) </create_query>
+    <create_query>create table replacing_final_1024p_rnd (key1 UInt32, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1) partition by key1 % 1024 </create_query>
+    <create_query>create table replacing_final_1p_ord (key1 UInt64, key2 UInt64, ver Int8, s UInt64) engine = ReplacingMergeTree(ver) order by (key1, key2)</create_query>
 
     <!-- 16 parts, 8192 * 1024 rows each -->
-    <fill_query>insert into collapsing_final_16p_ord select number, number, 1, number from numbers_mt(8388608) </fill_query>
-    <fill_query>insert into collapsing_final_16p_rnd select sipHash64(number), number, 1, number from numbers_mt(8388608) </fill_query>
-    <fill_query>insert into collapsing_final_16p_int_keys_ord select number, number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
-    <fill_query>insert into collapsing_final_16p_int_keys_rnd select sipHash64(number), number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
-    <fill_query>insert into collapsing_final_16p_str_keys_ord select number, number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
-    <fill_query>insert into collapsing_final_16p_str_keys_rnd select sipHash64(number), number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_ord select number, number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_rnd select sipHash64(number), number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_int_keys_ord select number, number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_int_keys_rnd select sipHash64(number), number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_str_keys_ord select number, number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
+    <fill_query>insert into replacing_final_16p_str_keys_rnd select sipHash64(number), number, number, number, number, number, number, number, 1, number from numbers_mt(8388608) </fill_query>
 
     <!-- 1024 parts, 8192 * 2 rows each -->
-    <fill_query>insert into collapsing_final_1024p_ord select number, 1, number from numbers_mt(16777216) </fill_query>
-    <fill_query>insert into collapsing_final_1024p_rnd select number, 1, number from numbers_mt(16777216) </fill_query>
+    <fill_query>insert into replacing_final_1024p_ord select number, 1, number from numbers_mt(16777216) </fill_query>
+    <fill_query>insert into replacing_final_1024p_rnd select number, 1, number from numbers_mt(16777216) </fill_query>
 
     <!-- 1 big part of 5e7 rows -->
-    <fill_query>insert into collapsing_final_1p_ord select number, number + 1, 1, number from numbers_mt(5e7)</fill_query>
+    <fill_query>insert into replacing_final_1p_ord select number, number + 1, 1, number from numbers_mt(5e7)</fill_query>
 
-    <fill_query>optimize table {collapsing} final</fill_query>
+    <fill_query>optimize table {replacing} final</fill_query>
 
-    <query>SELECT count() FROM {collapsing} final</query>
-    <query>SELECT sum(s) FROM {collapsing} final group by key1 limit 10</query>
-    <query>SELECT sum(s) FROM {collapsing} final group by key1 % 8192 limit 10</query>
+    <query>SELECT count() FROM {replacing} final</query>
+    <query>SELECT sum(s) FROM {replacing} final group by key1 limit 10</query>
+    <query>SELECT sum(s) FROM {replacing} final group by key1 % 8192 limit 10</query>
 
-    <drop_query>DROP TABLE IF EXISTS {collapsing}</drop_query>
+    <drop_query>DROP TABLE IF EXISTS {replacing}</drop_query>
+
+    <drop_query>DROP TABLE IF EXISTS {replacing}</drop_query>
 </test>
diff --git a/tests/performance/scripts/README.md b/tests/performance/scripts/README.md
index 0a0580c62a0..1a15189fe86 100644
--- a/tests/performance/scripts/README.md
+++ b/tests/performance/scripts/README.md
@@ -130,7 +130,7 @@ More stages are available, e.g. restart servers or run the tests. See the code.
 
 #### Run a single test on the already configured servers
 ```
-docker/test/performance-comparison/perf.py --host=localhost --port=9000 --runs=1 tests/performance/logical_functions_small.xml
+tests/performance/scripts/perf.py --host=localhost --port=9000 --runs=1 tests/performance/logical_functions_small.xml
 ```
 
 #### Run all tests on some custom configuration
diff --git a/tests/performance/scripts/compare.sh b/tests/performance/scripts/compare.sh
index 7dc522dca7a..9a0fb5b335c 100755
--- a/tests/performance/scripts/compare.sh
+++ b/tests/performance/scripts/compare.sh
@@ -11,8 +11,14 @@ script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
 # upstream/master
 LEFT_SERVER_PORT=9001
+LEFT_SERVER_KEEPER_PORT=9181
+LEFT_SERVER_KEEPER_RAFT_PORT=9234
+LEFT_SERVER_INTERSERVER_PORT=9009
 # patched version
-RIGHT_SERVER_PORT=9002
+RIGHT_SERVER_PORT=19001
+RIGHT_SERVER_KEEPER_PORT=19181
+RIGHT_SERVER_KEEPER_RAFT_PORT=19234
+RIGHT_SERVER_INTERSERVER_PORT=19009
 
 # abort_conf   -- abort if some options is not recognized
 # abort        -- abort if something is not right in the env (i.e. per-cpu arenas does not work)
@@ -127,6 +133,10 @@ function restart
         --user_files_path left/db/user_files
         --top_level_domains_path "$(left_or_right left top_level_domains)"
         --tcp_port $LEFT_SERVER_PORT
+        --keeper_server.tcp_port $LEFT_SERVER_KEEPER_PORT
+        --keeper_server.raft_configuration.server.port $LEFT_SERVER_KEEPER_RAFT_PORT
+        --zookeeper.node.port $LEFT_SERVER_KEEPER_PORT
+        --interserver_http_port $LEFT_SERVER_INTERSERVER_PORT
     )
     left/clickhouse-server "${left_server_opts[@]}" &>> left-server-log.log &
     left_pid=$!
@@ -142,6 +152,10 @@ function restart
         --user_files_path right/db/user_files
         --top_level_domains_path "$(left_or_right right top_level_domains)"
         --tcp_port $RIGHT_SERVER_PORT
+        --keeper_server.tcp_port $RIGHT_SERVER_KEEPER_PORT
+        --keeper_server.raft_configuration.server.port $RIGHT_SERVER_KEEPER_RAFT_PORT
+        --zookeeper.node.port $RIGHT_SERVER_KEEPER_PORT
+        --interserver_http_port $RIGHT_SERVER_INTERSERVER_PORT
     )
     right/clickhouse-server "${right_server_opts[@]}" &>> right-server-log.log &
     right_pid=$!
@@ -444,10 +458,10 @@ create view query_logs as
 create table query_run_metric_arrays engine File(TSV, 'analyze/query-run-metric-arrays.tsv')
     as
     with (
-        -- sumMapState with the list of all keys with '-0.' values. Negative zero is because
-        -- sumMap removes keys with positive zeros.
+        -- sumMapState with the list of all keys with nullable '0' values because sumMap removes keys with default values
+        -- and 0::Nullable != NULL
         with (select groupUniqArrayArray(mapKeys(ProfileEvents)) from query_logs) as all_names
-            select arrayReduce('sumMapState', [(all_names, arrayMap(x->-0., all_names))])
+            select arrayReduce('sumMapState', [(all_names, arrayMap(x->0::Nullable(Float64), all_names))])
         ) as all_metrics
     select test, query_index, version, query_id,
         (finalizeAggregation(
@@ -456,17 +470,15 @@ create table query_run_metric_arrays engine File(TSV, 'analyze/query-run-metric-
                     all_metrics,
                     arrayReduce('sumMapState',
                         [(mapKeys(ProfileEvents),
-                            arrayMap(x->toFloat64(x), mapValues(ProfileEvents)))]
+                            arrayMap(x->toNullable(toFloat64(x)), mapValues(ProfileEvents)))]
                     ),
                     arrayReduce('sumMapState', [(
                         ['client_time', 'server_time', 'memory_usage'],
-                        arrayMap(x->if(x != 0., x, -0.), [
-                            toFloat64(query_runs.time),
-                            toFloat64(query_duration_ms / 1000.),
-                            toFloat64(memory_usage)]))])
+                        [toNullable(toFloat64(query_runs.time)), toNullable(toFloat64(query_duration_ms / 1000.)), toNullable(toFloat64(memory_usage))]
+                      )])
                 ]
             )) as metrics_tuple).1 metric_names,
-        metrics_tuple.2 metric_values
+        arrayMap(x->if(isNaN(x),0,x), metrics_tuple.2) metric_values
     from query_logs
     right join query_runs
         on query_logs.query_id = query_runs.query_id
diff --git a/tests/performance/scripts/config/config.d/zzz-perf-comparison-tweaks-config.xml b/tests/performance/scripts/config/config.d/zzz-perf-comparison-tweaks-config.xml
index 292665c4f68..c2bef2b479a 100644
--- a/tests/performance/scripts/config/config.d/zzz-perf-comparison-tweaks-config.xml
+++ b/tests/performance/scripts/config/config.d/zzz-perf-comparison-tweaks-config.xml
@@ -2,10 +2,7 @@
     <http_port remove="remove"/>
     <mysql_port remove="remove"/>
     <postgresql_port remove="remove"/>
-    <interserver_http_port remove="remove"/>
     <tcp_with_proxy_port remove="remove"/>
-    <keeper_server remove="remove"/>
-    <zookeeper remove="remove"/>
     <listen_host>::</listen_host>
 
     <logger>
diff --git a/tests/performance/scripts/download.sh b/tests/performance/scripts/download.sh
index cb243b655c6..7a740a38fd2 100755
--- a/tests/performance/scripts/download.sh
+++ b/tests/performance/scripts/download.sh
@@ -67,8 +67,8 @@ function download
     mkdir ~/fg ||:
     (
         cd ~/fg
-        wget -nv -nd -c "https://raw.githubusercontent.com/brendangregg/FlameGraph/master/flamegraph.pl"
-        wget -nv -nd -c "https://raw.githubusercontent.com/brendangregg/FlameGraph/master/difffolded.pl"
+        wget -nv -nd -c "https://raw.githubusercontent.com/brendangregg/FlameGraph/cd9ee4c4449775a2f867acf31c84b7fe4b132ad5/flamegraph.pl"
+        wget -nv -nd -c "https://raw.githubusercontent.com/brendangregg/FlameGraph/cd9ee4c4449775a2f867acf31c84b7fe4b132ad5/difffolded.pl"
         chmod +x ~/fg/difffolded.pl
         chmod +x ~/fg/flamegraph.pl
     ) &
diff --git a/tests/performance/scripts/entrypoint.sh b/tests/performance/scripts/entrypoint.sh
index 95ffe44b654..0c3bfa550f4 100755
--- a/tests/performance/scripts/entrypoint.sh
+++ b/tests/performance/scripts/entrypoint.sh
@@ -14,7 +14,8 @@ SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 function curl_with_retry
 {
     for _ in 1 2 3 4 5 6 7 8 9 10; do
-        if curl --fail --head "$1";then
+        if curl --fail --head "$1"
+        then
             return 0
         else
             sleep 1
@@ -117,8 +118,8 @@ then
     # far in the future and have unrelated test changes.
     base=$(git -C right/ch merge-base pr origin/master)
     git -C right/ch diff --name-only "$base" pr -- . | tee all-changed-files.txt
-    git -C right/ch diff --name-only "$base" pr -- tests/performance | tee changed-test-definitions.txt
-    git -C right/ch diff --name-only "$base" pr -- :!tests/performance :!docker/test/performance-comparison | tee other-changed-files.txt
+    git -C right/ch diff --name-only "$base" pr -- tests/performance/*.xml | tee changed-test-definitions.txt
+    git -C right/ch diff --name-only "$base" pr -- :!tests/performance/*.xml :!docker/test/performance-comparison | tee other-changed-files.txt
 fi
 
 # Set python output encoding so that we can print queries with non-ASCII letters.
diff --git a/tests/performance/scripts/eqmed.sql b/tests/performance/scripts/eqmed.sql
index 94e6733a3d7..372534f6f48 100644
--- a/tests/performance/scripts/eqmed.sql
+++ b/tests/performance/scripts/eqmed.sql
@@ -67,4 +67,5 @@ from
        select throwIf(uniq((test, query)) != 1) from table
    ) check_single_query -- this subselect checks that there is only one query in the input table;
                         -- written this way so that it is not optimized away (#10523)
+SETTINGS allow_experimental_analyzer = 0
 ;
diff --git a/tests/performance/small_block_contention.xml b/tests/performance/small_block_contention.xml
new file mode 100644
index 00000000000..ce1995a0a29
--- /dev/null
+++ b/tests/performance/small_block_contention.xml
@@ -0,0 +1,3 @@
+<test>
+    <query>select sum(number) from numbers_mt(200000) settings max_threads=100, max_block_size = 1 format Null</query>
+</test>
diff --git a/tests/performance/sum.xml b/tests/performance/sum.xml
index 57b879a360d..36b898436bf 100644
--- a/tests/performance/sum.xml
+++ b/tests/performance/sum.xml
@@ -17,6 +17,13 @@
     <query>SELECT sumKahan(toNullable(toFloat32(number))) FROM numbers(100000000)</query>
     <query>SELECT sumKahan(toNullable(toFloat64(number))) FROM numbers(100000000)</query>
 
+    <query>select sumIf(number::Decimal128(3), rand32() % 2 = 0) from numbers(100000000)</query>
+    <query>select sumIf(number::Decimal256(3), rand32() % 2 = 0) from numbers(100000000)</query>
+    <query>select sumIf(number::Int128, rand32() % 2 = 0) from numbers(100000000)</query>
+    <query>select sumIf(number::UInt128, rand32() % 2 = 0) from numbers(100000000)</query>
+    <query>select sumIf(number::Int256, rand32() % 2 = 0) from numbers(100000000)</query>
+    <query>select sumIf(number::UInt256, rand32() % 2 = 0) from numbers(100000000)</query>
+
     <!-- Create a table with ~20% null values. Make it random so the branch predictor doesn't do all the work -->
     <create_query>CREATE TABLE nullfloat32 (x Nullable(Float32)) ENGINE = Memory</create_query>
     <fill_query>INSERT INTO nullfloat32
diff --git a/tests/performance/uniq_without_key_dist.xml b/tests/performance/uniq_without_key_dist.xml
new file mode 100644
index 00000000000..600b378a7f7
--- /dev/null
+++ b/tests/performance/uniq_without_key_dist.xml
@@ -0,0 +1,22 @@
+<test>
+    <substitutions>
+        <substitution>
+           <name>uniq_keys</name>
+           <values>
+               <value>100000</value>
+               <value>250000</value>
+               <value>500000</value>
+               <value>1000000</value>
+               <value>5000000</value>
+           </values>
+        </substitution>
+    </substitutions>
+
+    <create_query>create table t_{uniq_keys}(a UInt64) engine=MergeTree order by tuple()</create_query>
+
+    <fill_query>insert into t_{uniq_keys} select number % {uniq_keys} from numbers_mt(5e7)</fill_query>
+
+    <query>SELECT uniqExact(a) FROM remote('127.0.0.{{1,2}}', default, t_{uniq_keys}) SETTINGS max_threads=5</query>
+
+    <drop_query>drop table t_{uniq_keys}</drop_query>
+</test>
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 3a83126ea11..74608360b9c 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
@@ -56,13 +56,13 @@ SELECT
             WHERE
                 length(message_format_string) = 0
               AND (message like '%DB::Exception%' or message like '%Coordination::Exception%')
-              AND message not like '% Received from %' and message not like '%(SYNTAX_ERROR)%'
+              AND message not like '% Received from %' and message not like '%(SYNTAX_ERROR)%' and message not like '%Fault injection%'
             GROUP BY message ORDER BY c LIMIT 10
         ))
 FROM logs
 WHERE
   (message like '%DB::Exception%' or message like '%Coordination::Exception%')
-  AND message not like '% Received from %' and message not like '%(SYNTAX_ERROR)%';
+  AND message not like '% Received from %' and message not like '%(SYNTAX_ERROR)%' and message not like '%Fault injection%';
 
 
 -- FIXME some of the following messages are not informative and it has to be fixed
@@ -203,7 +203,7 @@ select
 with 0.16 as threshold
 select
     'noisy Trace messages',
-    greatest(coalesce(((select message_format_string, count() from logs where level = 'Trace' and message_format_string not in ('Access granted: {}{}', '{} -> {}')
+    greatest(coalesce(((select message_format_string, count() from logs where level = 'Trace' and message_format_string not in ('Access granted: {}{}', '{} -> {}', 'Query {} to stage {}{}', 'Query {} from stage {} to stage {}{}')
                         group by message_format_string order by count() desc limit 1) as top_message).2, 0) / (select count() from logs), threshold) as r,
     r <= threshold ? '' : top_message.1;
 
diff --git a/tests/queries/0_stateless/00027_argMinMax.sql b/tests/queries/0_stateless/00027_argMinMax.sql
index 2b67b99ec77..dbf7c9176d2 100644
--- a/tests/queries/0_stateless/00027_argMinMax.sql
+++ b/tests/queries/0_stateless/00027_argMinMax.sql
@@ -5,4 +5,12 @@ select argMin(x.1, x.2), argMax(x.1, x.2) from (select (toDate(number, 'UTC'), t
 select argMin(x.1, x.2), argMax(x.1, x.2) from (select (toDecimal32(number, 2), toDecimal64(number, 2) + 1) as x from numbers(10));
 
 -- array
-SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id);
+SELECT
+    argMinArray(id, num),
+    argMaxArray(id, num)
+FROM
+(
+    SELECT
+        arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num,
+        arrayJoin([[1, 2, 4]]) AS id
+)
diff --git a/tests/queries/0_stateless/00027_simple_argMinArray.sql b/tests/queries/0_stateless/00027_simple_argMinArray.sql
index b681a2c53cf..bdee2b058b8 100644
--- a/tests/queries/0_stateless/00027_simple_argMinArray.sql
+++ b/tests/queries/0_stateless/00027_simple_argMinArray.sql
@@ -1 +1 @@
-SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4], [2, 3, 3]]) AS id)
+SELECT argMinArray(id, num), argMaxArray(id, num)  FROM (SELECT arrayJoin([[10, 4, 3], [7, 5, 6], [8, 8, 2]]) AS num, arrayJoin([[1, 2, 4]]) AS id)
diff --git a/tests/queries/0_stateless/00047_stored_aggregates_complex.sql b/tests/queries/0_stateless/00047_stored_aggregates_complex.sql
index 2e416f91d5d..df5305c97db 100644
--- a/tests/queries/0_stateless/00047_stored_aggregates_complex.sql
+++ b/tests/queries/0_stateless/00047_stored_aggregates_complex.sql
@@ -1,5 +1,7 @@
 DROP TABLE IF EXISTS stored_aggregates;
 
+set max_insert_threads = 1;
+
 set allow_deprecated_syntax_for_merge_tree=1;
 CREATE TABLE stored_aggregates
 (
diff --git a/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference b/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference
index 39074512621..e0714f93e6b 100644
--- a/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference
+++ b/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.reference
@@ -1,3 +1,3 @@
-┌─x───────────────────────────�
-│ ('2000-01-01','2000-01-01') │
-└─────────────────────────────┘
+   ┌─x───────────────────────────�
+1. │ ('2000-01-01','2000-01-01') │
+   └─────────────────────────────┘
diff --git a/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql b/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql
index 56e93d24087..09208b9151b 100644
--- a/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql
+++ b/tests/queries/0_stateless/00085_visible_width_of_tuple_of_dates.sql
@@ -1 +1,2 @@
+SET output_format_pretty_color=1;
 SELECT (toDate('2000-01-01'), toDate('2000-01-01')) AS x FORMAT PrettyCompact;
diff --git a/tests/queries/0_stateless/00089_group_by_arrays_of_fixed.sql b/tests/queries/0_stateless/00089_group_by_arrays_of_fixed.sql
index 60ec1cb3396..a068671b999 100644
--- a/tests/queries/0_stateless/00089_group_by_arrays_of_fixed.sql
+++ b/tests/queries/0_stateless/00089_group_by_arrays_of_fixed.sql
@@ -1 +1 @@
-SELECT arr, count() AS c FROM (SELECT arrayMap(x -> x % 2, groupArray(number)) AS arr FROM (SELECT number FROM system.numbers LIMIT 10000) GROUP BY number % ((number * 0xABCDEF0123456789 % 1234) + 1)) GROUP BY arr ORDER BY c DESC, arr ASC;
+SELECT arr, count() AS c FROM (SELECT arrayMap(x -> x % 2, arraySort(groupArray(number))) AS arr FROM (SELECT number FROM system.numbers LIMIT 10000) GROUP BY number % ((number * 0xABCDEF0123456789 % 1234) + 1)) GROUP BY arr ORDER BY c DESC, arr ASC;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/00098_k_union_all.reference b/tests/queries/0_stateless/00098_k_union_all.reference
index a6921e228af..6a12c30ac8e 100644
--- a/tests/queries/0_stateless/00098_k_union_all.reference
+++ b/tests/queries/0_stateless/00098_k_union_all.reference
@@ -1,18 +1,18 @@
- 1
+    1
 
- 1 
- 1
+1.  1 
+    1
 
- 1 
- 1
+1.  1 
+    1
 
- 1 
- 1
+2.  1 
+    1
 
- 1 
- 1
+1.  1 
+    1
 
- 1 
- 1
+2.  1 
+    1
 
- 1 
+3.  1 
diff --git a/tests/queries/0_stateless/00098_k_union_all.sql b/tests/queries/0_stateless/00098_k_union_all.sql
index 311e5bb19c4..059d27075d7 100644
--- a/tests/queries/0_stateless/00098_k_union_all.sql
+++ b/tests/queries/0_stateless/00098_k_union_all.sql
@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SELECT 1 FORMAT PrettySpace;
 SELECT 1 UNION ALL SELECT 1 FORMAT PrettySpace;
 SELECT 1 UNION ALL SELECT 1 UNION ALL SELECT 1 FORMAT PrettySpace;
diff --git a/tests/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql b/tests/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql
index 8160d4dee9e..4f73a9e9a54 100644
--- a/tests/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql
+++ b/tests/queries/0_stateless/00191_aggregating_merge_tree_and_final.sql
@@ -7,9 +7,9 @@ INSERT INTO aggregating_00191 (k, u) SELECT intDiv(number, 100) AS k, uniqState(
 
 SELECT k, finalizeAggregation(u) FROM aggregating_00191 FINAL order by k;
 
-OPTIMIZE TABLE aggregating_00191;
+OPTIMIZE TABLE aggregating_00191 FINAL;
 
-SELECT k, finalizeAggregation(u) FROM aggregating_00191;
+SELECT k, finalizeAggregation(u) FROM aggregating_00191 order by k;
 SELECT k, finalizeAggregation(u) FROM aggregating_00191 FINAL order by k;
 
 DROP TABLE aggregating_00191;
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 866dc4f1894..63b8a9d14fc 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,7 +5,7 @@
 11
 40
 
-0
+40
 41
 
 0
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 5cc06a41132..e3634141613 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
@@ -10,6 +10,14 @@ select 43 AS z from remote('127.0.0.{2,3}', system.one) group by 42, 43, 44;
 select 11 AS z from (SELECT 2 UNION ALL SELECT 3) group by 42, 43, 44;
 
 select 40 as z from (select * from system.numbers limit 3) group by z WITH TOTALS;
+-- NOTE: non-analyzer preserves the original header (i.e. 41) for TOTALS in
+-- case of remote queries with GROUP BY some_requested_const and there were no
+-- aggregate functions, the query above. But everything else works in the same
+-- way, i.e.:
+--
+--     select 41 as z, count() from remote('127.0.0.{2,3}', system.one) group by z WITH TOTALS;
+--     select 41 as z from remote('127.0.0.{2,3}', system.one) group by 1 WITH TOTALS;
+--
 select 41 as z from remote('127.0.0.{2,3}', system.one) group by z WITH TOTALS;
 select count(), 42 AS z from remote('127.0.0.{2,3}', system.one) group by z WITH TOTALS;
 select 43 AS z from remote('127.0.0.{2,3}', system.one) group by 42, 43, 44 WITH TOTALS;
diff --git a/tests/queries/0_stateless/00273_quantiles.reference b/tests/queries/0_stateless/00273_quantiles.reference
index 55f7d871fe6..2abeaa39dc5 100644
--- a/tests/queries/0_stateless/00273_quantiles.reference
+++ b/tests/queries/0_stateless/00273_quantiles.reference
@@ -2,10 +2,12 @@
 [500]
 [500]
 [500]
+[497.78]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
 [0,1,10,50,99.6,199.7,299.8,399.9,500,600.1,700.2,800.3,900.4,950,990,999,1000]
 [0,1,10,50,100,200,300,400,500,600,700,800,900,950,990,999,1000]
+[0,1.01,10.07,49.9,100.49,198.37,301.91,399.47,497.78,595.95,699.36,804.46,907.03,944.05,982.58,1002.43,1002.43]
 1	333334	[699140.3,835642,967430.8]	[699999,833333,966666]
 2	266667	[426546,536239,638933.4]	[426665,533332,639999]
 3	114285	[296938,342324,388778]	[297142,342856,388570]
diff --git a/tests/queries/0_stateless/00273_quantiles.sql b/tests/queries/0_stateless/00273_quantiles.sql
index f5b739b8be1..791ced6bc5d 100644
--- a/tests/queries/0_stateless/00273_quantiles.sql
+++ b/tests/queries/0_stateless/00273_quantiles.sql
@@ -2,11 +2,13 @@ SELECT quantiles(0.5)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001
 SELECT quantilesExact(0.5)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 SELECT quantilesTDigest(0.5)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 SELECT quantilesDeterministic(0.5)(x, x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
+SELECT arrayMap(a -> round(a, 2), quantilesDD(0.01, 0.5)(x)) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 
 SELECT quantiles(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 SELECT quantilesExact(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 SELECT quantilesTDigest(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 SELECT quantilesDeterministic(0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(x, x) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
+SELECT arrayMap(a -> round(a, 2), quantilesDD(0.01, 0, 0.001, 0.01, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 0.95, 0.99, 0.999, 1)(x)) FROM (SELECT number AS x FROM system.numbers LIMIT 1001);
 
 -- The result slightly differs but it's ok since `quantilesDeterministic` is an approximate function.
 SET max_bytes_before_external_group_by = 0;
diff --git a/tests/queries/0_stateless/00278_insert_already_sorted.sql b/tests/queries/0_stateless/00278_insert_already_sorted.sql
index b3de48dc155..dbd129d85cd 100644
--- a/tests/queries/0_stateless/00278_insert_already_sorted.sql
+++ b/tests/queries/0_stateless/00278_insert_already_sorted.sql
@@ -7,11 +7,11 @@ INSERT INTO sorted (x) SELECT intDiv(number, 100000) AS x FROM system.numbers LI
 SET max_threads = 1;
 
 SELECT count() FROM sorted;
-SELECT DISTINCT x FROM sorted;
+SELECT x FROM (SELECT DISTINCT x FROM sorted) ORDER BY x;
 
 INSERT INTO sorted (x) SELECT (intHash64(number) % 1000 = 0 ? 999 : intDiv(number, 100000)) AS x FROM system.numbers LIMIT 1000000;
 
 SELECT count() FROM sorted;
-SELECT DISTINCT x FROM sorted;
+SELECT x FROM (SELECT DISTINCT x FROM sorted) ORDER BY x;
 
 DROP TABLE sorted;
diff --git a/tests/queries/0_stateless/00298_enum_width_and_cast.reference b/tests/queries/0_stateless/00298_enum_width_and_cast.reference
index 617494b3101..706e3f2ae98 100644
--- a/tests/queries/0_stateless/00298_enum_width_and_cast.reference
+++ b/tests/queries/0_stateless/00298_enum_width_and_cast.reference
@@ -1,17 +1,17 @@
-┌─x─────┬─y─�
-│ Hello │ 0 │
-└───────┴───┘
-┌─x─────┬─y─�
-│ Hello │ 0 │
-│ \     │ 0 │
-└───────┴───┘
-┌─x────────┬─y─�
-│ Hello    │ 0 │
-│ \        │ 0 │
-│ 	\t │ 0 │
-└──────────┴───┘
-┌─x────────┬─y─┬─toInt8(x)─┬─s─────┬─casted─�
-│ Hello    │ 0 │      -100 │ Hello │ Hello  │
-│ \        │ 0 │         0 │ \     │ \      │
-│ 	\t │ 0 │       111 │ 	\t │ 	\t  │
-└──────────┴───┴───────────┴───────┴────────┘
+   ┌─x─────┬─y─�
+1. │ Hello │ 0 │
+   └───────┴───┘
+   ┌─x─────┬─y─�
+1. │ Hello │ 0 │
+2. │ \     │ 0 │
+   └───────┴───┘
+   ┌─x────────┬─y─�
+1. │ Hello    │ 0 │
+2. │ \        │ 0 │
+3. │ 	\t │ 0 │
+   └──────────┴───┘
+   ┌─x────────┬─y─┬─toInt8(x)─┬─s─────┬─casted─�
+1. │ Hello    │ 0 │      -100 │ Hello │ Hello  │
+2. │ \        │ 0 │         0 │ \     │ \      │
+3. │ 	\t │ 0 │       111 │ 	\t │ 	\t  │
+   └──────────┴───┴───────────┴───────┴────────┘
diff --git a/tests/queries/0_stateless/00298_enum_width_and_cast.sql b/tests/queries/0_stateless/00298_enum_width_and_cast.sql
index 3dda3e41270..35241f5124d 100644
--- a/tests/queries/0_stateless/00298_enum_width_and_cast.sql
+++ b/tests/queries/0_stateless/00298_enum_width_and_cast.sql
@@ -1,5 +1,6 @@
 DROP TABLE IF EXISTS enum;
 
+SET output_format_pretty_color=1;
 CREATE TABLE enum (x Enum8('Hello' = -100, '\\' = 0, '\t\\t' = 111), y UInt8) ENGINE = TinyLog;
 INSERT INTO enum (y) VALUES (0);
 SELECT * FROM enum ORDER BY x, y FORMAT PrettyCompact;
diff --git a/tests/queries/0_stateless/00300_csv.reference b/tests/queries/0_stateless/00300_csv.reference
index 42cd22078c4..e7966a9e8d9 100644
--- a/tests/queries/0_stateless/00300_csv.reference
+++ b/tests/queries/0_stateless/00300_csv.reference
@@ -1,11 +1,11 @@
-"Hello, ""World""",123,"[1,2,3]",456,"['abc','def']","Newline
+"Hello, ""World""",123,"[1,2,3]","(456,['abc','def'])","Newline
 here"
 "x","y","z","a","b"
-"Hello, ""World""",123,"[1,2,3]",456,"['abc','def']","Newline
+"Hello, ""World""",123,"[1,2,3]","(456,['abc','def'])","Newline
 here"
 "x","y","z","a","b"
 "String","UInt8","Array(UInt8)","Tuple(UInt16, Array(String))","String"
-"Hello, ""World""",123,"[1,2,3]",456,"['abc','def']","Newline
+"Hello, ""World""",123,"[1,2,3]","(456,['abc','def'])","Newline
 here"
 0,"0","[]","2000-01-01","2000-01-01 00:00:00"
 1,"1","[0]","2000-01-02","2000-01-01 00:00:01"
diff --git a/tests/queries/0_stateless/00305_http_and_readonly.reference b/tests/queries/0_stateless/00305_http_and_readonly.reference
index 4d0cb6bd6bc..baddaa07bca 100644
--- a/tests/queries/0_stateless/00305_http_and_readonly.reference
+++ b/tests/queries/0_stateless/00305_http_and_readonly.reference
@@ -1,19 +1,19 @@
- name               value   changed
+    name               value   changed
 
- max_rows_to_read   10000         1 
- readonly           0             0 
- name               value   changed
+1.  max_rows_to_read   10000         1 
+2.  readonly           0             0 
+    name               value   changed
 
- max_rows_to_read   10000         1 
- readonly           2             1 
- name               value   changed
+1.  max_rows_to_read   10000         1 
+2.  readonly           2             1 
+    name               value   changed
 
- max_rows_to_read   10000         1 
- readonly           1             1 
- name               value   changed
+1.  max_rows_to_read   10000         1 
+2.  readonly           1             1 
+    name               value   changed
 
- max_rows_to_read   10000         1 
- readonly           2             1 
+1.  max_rows_to_read   10000         1 
+2.  readonly           2             1 
 Ok
 Ok
 0
diff --git a/tests/queries/0_stateless/00309_formats.reference b/tests/queries/0_stateless/00309_formats.reference
index e637ee0363a..5c0ae4d2c3b 100644
Binary files a/tests/queries/0_stateless/00309_formats.reference and b/tests/queries/0_stateless/00309_formats.reference differ
diff --git a/tests/queries/0_stateless/00309_formats_case_insensitive.reference b/tests/queries/0_stateless/00309_formats_case_insensitive.reference
new file mode 100644
index 00000000000..b74d7002833
--- /dev/null
+++ b/tests/queries/0_stateless/00309_formats_case_insensitive.reference
@@ -0,0 +1,95 @@
+-- test FORMAT clause --
+0	Hello & world
+1	Hello & world
+2	Hello & world
+0,"Hello & world"
+1,"Hello & world"
+2,"Hello & world"
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>number</name>
+				<type>UInt64</type>
+			</column>
+			<column>
+				<name>'Hello &amp; world'</name>
+				<type>String</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+		<row>
+			<number>0</number>
+			<field>Hello &amp; world</field>
+		</row>
+		<row>
+			<number>1</number>
+			<field>Hello &amp; world</field>
+		</row>
+		<row>
+			<number>2</number>
+			<field>Hello &amp; world</field>
+		</row>
+	</data>
+	<rows>3</rows>
+</result>
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "'Hello & world'",
+			"type": "String"
+		}
+	],
+
+	"data":
+	[
+		{
+			"number": "0",
+			"'Hello & world'": "Hello & world"
+		},
+		{
+			"number": "1",
+			"'Hello & world'": "Hello & world"
+		},
+		{
+			"number": "2",
+			"'Hello & world'": "Hello & world"
+		}
+	],
+
+	"rows": 3
+}
+Row 1:
+──────
+number:          0
+'Hello & world': Hello & world
+
+Row 2:
+──────
+number:          1
+'Hello & world': Hello & world
+
+Row 3:
+──────
+number:          2
+'Hello & world': Hello & world
+-- test table function --
+0	Hello & world
+1	Hello & world
+2	Hello & world
+0	Hello & world
+1	Hello & world
+2	Hello & world
+-- test other function --
+0	Hello & world
+-- test table engine --
+0	Hello & world
+1	Hello & world
+2	Hello & world
diff --git a/tests/queries/0_stateless/00309_formats_case_insensitive.sql b/tests/queries/0_stateless/00309_formats_case_insensitive.sql
new file mode 100644
index 00000000000..0b45e9c22a9
--- /dev/null
+++ b/tests/queries/0_stateless/00309_formats_case_insensitive.sql
@@ -0,0 +1,25 @@
+-- Tags: no-parallel
+
+SELECT '-- test FORMAT clause --';
+SET output_format_write_statistics = 0;
+SELECT number, 'Hello & world' FROM numbers(3) FORMAT Tsv;
+SELECT number, 'Hello & world' FROM numbers(3) FORMAT csv;
+SELECT number, 'Hello & world' FROM numbers(3) FORMAT xMl;
+SELECT number, 'Hello & world' FROM numbers(3) FORMAT JsonStrINGs;
+SELECT number, 'Hello & world' FROM numbers(3) FORMAT VERTICAL;
+
+SELECT '-- test table function --';
+INSERT INTO FUNCTION file('data_00309_formats_case_insensitive', 'Csv') SELECT number, 'Hello & world' FROM numbers(3) SETTINGS engine_file_truncate_on_insert=1;
+SELECT * FROM file('data_00309_formats_case_insensitive', 'Csv');
+
+INSERT INTO FUNCTION file('data_00309_formats_case_insensitive.cSv') SELECT number, 'Hello & world' FROM numbers(3) SETTINGS engine_file_truncate_on_insert=1;
+SELECT * FROM file('data_00309_formats_case_insensitive.cSv');
+
+SELECT '-- test other function --';
+SELECT * FROM format(cSv, '0,Hello & world');
+
+SELECT '-- test table engine --';
+DROP TABLE IF EXISTS test_00309_formats_case_insensitive;
+CREATE TABLE test_00309_formats_case_insensitive(a Int64, b String) ENGINE=File(Csv);
+INSERT INTO test_00309_formats_case_insensitive SELECT number, 'Hello & world' FROM numbers(3);
+SELECT * FROM test_00309_formats_case_insensitive;
diff --git a/tests/queries/0_stateless/00319_index_for_like.sql b/tests/queries/0_stateless/00319_index_for_like.sql
index e490e595142..6abd1edc3ed 100644
--- a/tests/queries/0_stateless/00319_index_for_like.sql
+++ b/tests/queries/0_stateless/00319_index_for_like.sql
@@ -1,8 +1,10 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS index_for_like;
 set allow_deprecated_syntax_for_merge_tree=1;
 CREATE TABLE index_for_like (s String, d Date DEFAULT today()) ENGINE = MergeTree(d, (s, d), 1);
 
-INSERT INTO index_for_like (s) VALUES ('Hello'), ('Hello, World'), ('Hello, World 1'), ('Hello 1'), ('Goodbye'), ('Goodbye, World'), ('Goodbye 1'), ('Goodbye, World 1'); 
+INSERT INTO index_for_like (s) VALUES ('Hello'), ('Hello, World'), ('Hello, World 1'), ('Hello 1'), ('Goodbye'), ('Goodbye, World'), ('Goodbye 1'), ('Goodbye, World 1');
 
 SET max_rows_to_read = 3;
 SELECT s FROM index_for_like WHERE s LIKE 'Hello, World%';
diff --git a/tests/queries/0_stateless/00340_squashing_insert_select.sql b/tests/queries/0_stateless/00340_squashing_insert_select.sql
index 102eb061bad..6b7133c155e 100644
--- a/tests/queries/0_stateless/00340_squashing_insert_select.sql
+++ b/tests/queries/0_stateless/00340_squashing_insert_select.sql
@@ -7,6 +7,8 @@ SET max_block_size = 10000;
 SET min_insert_block_size_rows = 1000000;
 SET min_insert_block_size_bytes = 0;
 
+set max_insert_threads = 1;
+
 INSERT INTO numbers_squashed SELECT * FROM system.numbers LIMIT 10000000;
 SELECT blockSize() AS b, count() / b AS c FROM numbers_squashed GROUP BY blockSize() ORDER BY c DESC;
 
diff --git a/tests/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference b/tests/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference
index f31beaf2dc4..069db227ff4 100644
--- a/tests/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference
+++ b/tests/queries/0_stateless/00367_visible_width_of_array_tuple_enum.reference
@@ -1,3 +1,3 @@
-┌─x─────────┬─y───────────�
-│ ['hello'] │ (1,'hello') │
-└───────────┴─────────────┘
+   ┌─x─────────┬─y───────────�
+1. │ ['hello'] │ (1,'hello') │
+   └───────────┴─────────────┘
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 b8d51e5d078..5174c13a9e0 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": "0",
-		"in": "0",
-		"up": "0",
-		"arr": [],
+		"ip": "9223372036854775807",
+		"in": "-9223372036854775808",
+		"up": "18446744073709551615",
+		"arr": ["0"],
 		"tuple": ["0","0"]
 	},
 
@@ -119,7 +119,7 @@
 		["0", "0", "9223372036854775807", "-9223372036854775808", "18446744073709551615", ["0"], ["0","0"]]
 	],
 
-	"totals": ["0", "0", "0", "0", "0", [], ["0","0"]],
+	"totals": ["0", "0", "9223372036854775807", "-9223372036854775808", "18446744073709551615", ["0"], ["0","0"]],
 
 	"extremes":
 	{
@@ -180,10 +180,10 @@
 	{
 		"i0": 0,
 		"u0": 0,
-		"ip": 0,
-		"in": 0,
-		"up": 0,
-		"arr": [],
+		"ip": 9223372036854775807,
+		"in": -9223372036854775808,
+		"up": 18446744073709551615,
+		"arr": [0],
 		"tuple": [0,0]
 	},
 
@@ -251,7 +251,7 @@
 		[0, 0, 9223372036854775807, -9223372036854775808, 18446744073709551615, [0], [0,0]]
 	],
 
-	"totals": [0, 0, 0, 0, 0, [], [0,0]],
+	"totals": [0, 0, 9223372036854775807, -9223372036854775808, 18446744073709551615, [0], [0,0]],
 
 	"extremes":
 	{
diff --git a/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.reference b/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.reference
index 94d3efa6e0a..54c87785fab 100644
--- a/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.reference
+++ b/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.reference
@@ -1,32 +1,32 @@
 one block
-┌─number─�
-│      0 │
-│      1 │
-└────────┘
+   ┌─number─�
+1. │      0 │
+2. │      1 │
+   └────────┘
 two blocks
-┌─number─�
-│      0 │
-│      0 │
-└────────┘
+   ┌─number─�
+1. │      0 │
+2. │      0 │
+   └────────┘
 extremes
-┌─number─�
-│      0 │
-│      1 │
-│      2 │
-└────────┘
+   ┌─number─�
+1. │      0 │
+2. │      1 │
+3. │      2 │
+   └────────┘
 
 Extremes:
-┌─number─�
-│      0 │
-│      2 │
-└────────┘
+   ┌─number─�
+1. │      0 │
+2. │      2 │
+   └────────┘
 totals
-┌─sum(number)─�
-│           2 │
-│           1 │
-└─────────────┘
+   ┌─sum(number)─�
+1. │           2 │
+2. │           1 │
+   └─────────────┘
 
 Totals:
-┌─sum(number)─�
-│           3 │
-└─────────────┘
+   ┌─sum(number)─�
+1. │           3 │
+   └─────────────┘
diff --git a/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.sh b/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.sh
index a5eca3d987e..710774700e9 100755
--- a/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.sh
+++ b/tests/queries/0_stateless/00405_PrettyCompactMonoBlock.sh
@@ -5,10 +5,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 echo 'one block'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(2)" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(2) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock
 echo 'two blocks'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(1) UNION ALL SELECT * FROM numbers(1)" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(1) UNION ALL SELECT * FROM numbers(1) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock
 echo 'extremes'
-${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(3)" --format PrettyCompactMonoBlock --extremes=1
+${CLICKHOUSE_LOCAL} --query="SELECT * FROM numbers(3) SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock --extremes=1
 echo 'totals'
-${CLICKHOUSE_LOCAL} --query="SELECT sum(number) FROM numbers(3) GROUP BY number%2 WITH TOTALS ORDER BY number%2" --format PrettyCompactMonoBlock
+${CLICKHOUSE_LOCAL} --query="SELECT sum(number) FROM numbers(3) GROUP BY number%2 WITH TOTALS ORDER BY number%2 SETTINGS output_format_pretty_color=1" --format PrettyCompactMonoBlock
diff --git a/tests/queries/0_stateless/00405_output_format_pretty_color.reference b/tests/queries/0_stateless/00405_output_format_pretty_color.reference
new file mode 100644
index 00000000000..c48b81411be
--- /dev/null
+++ b/tests/queries/0_stateless/00405_output_format_pretty_color.reference
@@ -0,0 +1,363 @@
+0
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+ 2. │     1 │ 1     │ (1,'1') │               1 │
+ 3. │     2 │ 2     │ (2,'2') │               2 │
+ 4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+ 5. │     4 │ 4     │ (4,'4') │               1 │
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+1
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+ 2. │     1 │ 1     │ (1,'1') │               1 │
+ 3. │     2 │ 2     │ (2,'2') │               2 │
+ 4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+ 5. │     4 │ 4     │ (4,'4') │               1 │
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+auto
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+ 2. │     1 │ 1     │ (1,'1') │               1 │
+ 3. │     2 │ 2     │ (2,'2') │               2 │
+ 4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+ 5. │     4 │ 4     │ (4,'4') │               1 │
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
+
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
+
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
diff --git a/tests/queries/0_stateless/00405_output_format_pretty_color.sql b/tests/queries/0_stateless/00405_output_format_pretty_color.sql
new file mode 100644
index 00000000000..bc2d0c3adbf
--- /dev/null
+++ b/tests/queries/0_stateless/00405_output_format_pretty_color.sql
@@ -0,0 +1,32 @@
+SET output_format_pretty_color = 0;
+SHOW SETTING output_format_pretty_color;
+
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT Pretty;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompact;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpace;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactMonoBlock;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpaceNoEscapes;
+
+SET output_format_pretty_color = 1;
+SHOW SETTING output_format_pretty_color;
+
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT Pretty;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompact;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpace;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactMonoBlock;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpaceNoEscapes;
+
+SET output_format_pretty_color = 'auto';
+SHOW SETTING output_format_pretty_color;
+
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT Pretty;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompact;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpace;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactMonoBlock;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompactNoEscapes;
+SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpaceNoEscapes;
diff --git a/tests/queries/0_stateless/00405_pretty_formats.reference b/tests/queries/0_stateless/00405_pretty_formats.reference
index bdfff4a8738..bad93c19bb6 100644
--- a/tests/queries/0_stateless/00405_pretty_formats.reference
+++ b/tests/queries/0_stateless/00405_pretty_formats.reference
@@ -1,306 +1,306 @@
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     1 │ 1     │ (1,'1') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     2 │ 2     │ (2,'2') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     5 │ 5     │ (5,'5') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     7 │ 7     │ (7,'7') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     8 │ 8     │ (8,'8') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     5 │ 5     │ (5,'5') │               2 │
-│     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
-│     7 │ 7     │ (7,'7') │               1 │
-│     8 │ 8     │ (8,'8') │               2 │
-│     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
-└───────┴───────┴─────────┴─────────────────┘
- hello   world   tuple     sometimes_nulls
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              ᴺ�ᴸᴸ 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              ᴺ�ᴸᴸ 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
-     6   6       (6,'6')              ᴺ�ᴸᴸ 
-     7   7       (7,'7')                 1 
-     8   8       (8,'8')                 2 
-     9   9       (9,'9')              ᴺ�ᴸᴸ 
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-│     5 │ 5     │ (5,'5') │               2 │
-│     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
-│     7 │ 7     │ (7,'7') │               1 │
-│     8 │ 8     │ (8,'8') │               2 │
-│     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
-└───────┴───────┴─────────┴─────────────────┘
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     1 │ 1     │ (1,'1') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     2 │ 2     │ (2,'2') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     5 │ 5     │ (5,'5') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     7 │ 7     │ (7,'7') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     8 │ 8     │ (8,'8') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     5 │ 5     │ (5,'5') │               2 │
-│     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
-│     7 │ 7     │ (7,'7') │               1 │
-│     8 │ 8     │ (8,'8') │               2 │
-│     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
-└───────┴───────┴─────────┴─────────────────┘
- hello   world   tuple     sometimes_nulls
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+ 2. │     1 │ 1     │ (1,'1') │               1 │
+ 3. │     2 │ 2     │ (2,'2') │               2 │
+ 4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+ 5. │     4 │ 4     │ (4,'4') │               1 │
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+    ├───────┼───────┼─────────┼─────────────────┤
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+    ├───────┼───────┼─────────┼─────────────────┤
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+ 7. │     6 │ 6     │ (6,'6') │            ᴺ�ᴸᴸ │
+ 8. │     7 │ 7     │ (7,'7') │               1 │
+ 9. │     8 │ 8     │ (8,'8') │               2 │
+10. │     9 │ 9     │ (9,'9') │            ᴺ�ᴸᴸ │
+    └───────┴───────┴─────────┴─────────────────┘
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              ᴺ�ᴸᴸ 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              ᴺ�ᴸᴸ 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
-     6   6       (6,'6')              ᴺ�ᴸᴸ 
-     7   7       (7,'7')                 1 
-     8   8       (8,'8')                 2 
-     9   9       (9,'9')              ᴺ�ᴸᴸ 
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     1 │ 1     │ (1,'1') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     2 │ 2     │ (2,'2') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     5 │ 5     │ (5,'5') │               2 │
-└───────┴───────┴─────────┴─────────────────┘
+ 6.      5   5       (5,'5')                 2 
+ 7.      6   6       (6,'6')              ᴺ�ᴸᴸ 
+ 8.      7   7       (7,'7')                 1 
+ 9.      8   8       (8,'8')                 2 
+10.      9   9       (9,'9')              ᴺ�ᴸᴸ 
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    └───────┴───────┴─────────┴─────────────────┘
   Showed first 6.
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     5 │ 5     │ (5,'5') │               2 │
-└───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    └───────┴───────┴─────────┴─────────────────┘
   Showed first 6.
- hello   world   tuple     sometimes_nulls
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              ᴺ�ᴸᴸ 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              ᴺ�ᴸᴸ 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
+ 6.      5   5       (5,'5')                 2 
 
 Showed first 6.
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-│     5 │ 5     │ (5,'5') │               2 │
-└───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+6. │     5 │ 5     │ (5,'5') │               2 │
+   └───────┴───────┴─────────┴─────────────────┘
   Showed first 6.
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     1 │ 1     │ (1,'1') │               1 │
-├───────┼───────┼─────────┼─────────────────┤
-│     2 │ 2     │ (2,'2') │               2 │
-├───────┼───────┼─────────┼─────────────────┤
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-├───────┼───────┼─────────┼─────────────────┤
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-��������┳�������┳���������┳�����������������┓
-┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
-┡�������╇�������╇���������╇�����������������┩
-│     5 │ 5     │ (5,'5') │               2 │
-└───────┴───────┴─────────┴─────────────────┘
+   ��������┳�������┳���������┳�����������������┓
+   ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+   ┡�������╇�������╇���������╇�����������������┩
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+2. │     1 │ 1     │ (1,'1') │               1 │
+   ├───────┼───────┼─────────┼─────────────────┤
+3. │     2 │ 2     │ (2,'2') │               2 │
+   ├───────┼───────┼─────────┼─────────────────┤
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+   ├───────┼───────┼─────────┼─────────────────┤
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ��������┳�������┳���������┳�����������������┓
+    ┃ hello ┃ world ┃ tuple   ┃ sometimes_nulls ┃
+    ┡�������╇�������╇���������╇�����������������┩
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    └───────┴───────┴─────────┴─────────────────┘
   Showed first 6.
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
-│     1 │ 1     │ (1,'1') │               1 │
-│     2 │ 2     │ (2,'2') │               2 │
-│     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
-│     4 │ 4     │ (4,'4') │               1 │
-└───────┴───────┴─────────┴─────────────────┘
-┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
-│     5 │ 5     │ (5,'5') │               2 │
-└───────┴───────┴─────────┴─────────────────┘
+   ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+1. │     0 │ 0     │ (0,'0') │            ᴺ�ᴸᴸ │
+2. │     1 │ 1     │ (1,'1') │               1 │
+3. │     2 │ 2     │ (2,'2') │               2 │
+4. │     3 │ 3     │ (3,'3') │            ᴺ�ᴸᴸ │
+5. │     4 │ 4     │ (4,'4') │               1 │
+   └───────┴───────┴─────────┴─────────────────┘
+    ┌─hello─┬─world─┬─tuple───┬─sometimes_nulls─�
+ 6. │     5 │ 5     │ (5,'5') │               2 │
+    └───────┴───────┴─────────┴─────────────────┘
   Showed first 6.
- hello   world   tuple     sometimes_nulls
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              ᴺ�ᴸᴸ 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              ᴺ�ᴸᴸ 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              ᴺ�ᴸᴸ 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              ᴺ�ᴸᴸ 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
+ 6.      5   5       (5,'5')                 2 
 
 Showed first 6.
-+-------+-------+---------+-----------------+
-| hello | world | tuple   | sometimes_nulls |
-+-------+-------+---------+-----------------+
-|     0 | 0     | (0,'0') |            NULL |
-+-------+-------+---------+-----------------+
-|     1 | 1     | (1,'1') |               1 |
-+-------+-------+---------+-----------------+
-|     2 | 2     | (2,'2') |               2 |
-+-------+-------+---------+-----------------+
-|     3 | 3     | (3,'3') |            NULL |
-+-------+-------+---------+-----------------+
-|     4 | 4     | (4,'4') |               1 |
-+-------+-------+---------+-----------------+
-+-------+-------+---------+-----------------+
-| hello | world | tuple   | sometimes_nulls |
-+-------+-------+---------+-----------------+
-|     5 | 5     | (5,'5') |               2 |
-+-------+-------+---------+-----------------+
+   +-------+-------+---------+-----------------+
+   | hello | world | tuple   | sometimes_nulls |
+   +-------+-------+---------+-----------------+
+1. |     0 | 0     | (0,'0') |            NULL |
+   +-------+-------+---------+-----------------+
+2. |     1 | 1     | (1,'1') |               1 |
+   +-------+-------+---------+-----------------+
+3. |     2 | 2     | (2,'2') |               2 |
+   +-------+-------+---------+-----------------+
+4. |     3 | 3     | (3,'3') |            NULL |
+   +-------+-------+---------+-----------------+
+5. |     4 | 4     | (4,'4') |               1 |
+   +-------+-------+---------+-----------------+
+    +-------+-------+---------+-----------------+
+    | hello | world | tuple   | sometimes_nulls |
+    +-------+-------+---------+-----------------+
+ 6. |     5 | 5     | (5,'5') |               2 |
+    +-------+-------+---------+-----------------+
   Showed first 6.
-+-hello-+-world-+-tuple---+-sometimes_nulls-+
-|     0 | 0     | (0,'0') |            NULL |
-|     1 | 1     | (1,'1') |               1 |
-|     2 | 2     | (2,'2') |               2 |
-|     3 | 3     | (3,'3') |            NULL |
-|     4 | 4     | (4,'4') |               1 |
-+-------+-------+---------+-----------------+
-+-hello-+-world-+-tuple---+-sometimes_nulls-+
-|     5 | 5     | (5,'5') |               2 |
-+-------+-------+---------+-----------------+
+   +-hello-+-world-+-tuple---+-sometimes_nulls-+
+1. |     0 | 0     | (0,'0') |            NULL |
+2. |     1 | 1     | (1,'1') |               1 |
+3. |     2 | 2     | (2,'2') |               2 |
+4. |     3 | 3     | (3,'3') |            NULL |
+5. |     4 | 4     | (4,'4') |               1 |
+   +-------+-------+---------+-----------------+
+    +-hello-+-world-+-tuple---+-sometimes_nulls-+
+ 6. |     5 | 5     | (5,'5') |               2 |
+    +-------+-------+---------+-----------------+
   Showed first 6.
- hello   world   tuple     sometimes_nulls
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              NULL 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              NULL 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              NULL 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              NULL 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
+ 6.      5   5       (5,'5')                 2 
 
 Showed first 6.
-+-hello-+-world-+-tuple---+-sometimes_nulls-+
-|     0 | 0     | (0,'0') |            NULL |
-|     1 | 1     | (1,'1') |               1 |
-|     2 | 2     | (2,'2') |               2 |
-|     3 | 3     | (3,'3') |            NULL |
-|     4 | 4     | (4,'4') |               1 |
-|     5 | 5     | (5,'5') |               2 |
-+-------+-------+---------+-----------------+
+   +-hello-+-world-+-tuple---+-sometimes_nulls-+
+1. |     0 | 0     | (0,'0') |            NULL |
+2. |     1 | 1     | (1,'1') |               1 |
+3. |     2 | 2     | (2,'2') |               2 |
+4. |     3 | 3     | (3,'3') |            NULL |
+5. |     4 | 4     | (4,'4') |               1 |
+6. |     5 | 5     | (5,'5') |               2 |
+   +-------+-------+---------+-----------------+
   Showed first 6.
-+-------+-------+---------+-----------------+
-| hello | world | tuple   | sometimes_nulls |
-+-------+-------+---------+-----------------+
-|     0 | 0     | (0,'0') |            NULL |
-+-------+-------+---------+-----------------+
-|     1 | 1     | (1,'1') |               1 |
-+-------+-------+---------+-----------------+
-|     2 | 2     | (2,'2') |               2 |
-+-------+-------+---------+-----------------+
-|     3 | 3     | (3,'3') |            NULL |
-+-------+-------+---------+-----------------+
-|     4 | 4     | (4,'4') |               1 |
-+-------+-------+---------+-----------------+
-+-------+-------+---------+-----------------+
-| hello | world | tuple   | sometimes_nulls |
-+-------+-------+---------+-----------------+
-|     5 | 5     | (5,'5') |               2 |
-+-------+-------+---------+-----------------+
+   +-------+-------+---------+-----------------+
+   | hello | world | tuple   | sometimes_nulls |
+   +-------+-------+---------+-----------------+
+1. |     0 | 0     | (0,'0') |            NULL |
+   +-------+-------+---------+-----------------+
+2. |     1 | 1     | (1,'1') |               1 |
+   +-------+-------+---------+-----------------+
+3. |     2 | 2     | (2,'2') |               2 |
+   +-------+-------+---------+-----------------+
+4. |     3 | 3     | (3,'3') |            NULL |
+   +-------+-------+---------+-----------------+
+5. |     4 | 4     | (4,'4') |               1 |
+   +-------+-------+---------+-----------------+
+    +-------+-------+---------+-----------------+
+    | hello | world | tuple   | sometimes_nulls |
+    +-------+-------+---------+-----------------+
+ 6. |     5 | 5     | (5,'5') |               2 |
+    +-------+-------+---------+-----------------+
   Showed first 6.
-+-hello-+-world-+-tuple---+-sometimes_nulls-+
-|     0 | 0     | (0,'0') |            NULL |
-|     1 | 1     | (1,'1') |               1 |
-|     2 | 2     | (2,'2') |               2 |
-|     3 | 3     | (3,'3') |            NULL |
-|     4 | 4     | (4,'4') |               1 |
-+-------+-------+---------+-----------------+
-+-hello-+-world-+-tuple---+-sometimes_nulls-+
-|     5 | 5     | (5,'5') |               2 |
-+-------+-------+---------+-----------------+
+   +-hello-+-world-+-tuple---+-sometimes_nulls-+
+1. |     0 | 0     | (0,'0') |            NULL |
+2. |     1 | 1     | (1,'1') |               1 |
+3. |     2 | 2     | (2,'2') |               2 |
+4. |     3 | 3     | (3,'3') |            NULL |
+5. |     4 | 4     | (4,'4') |               1 |
+   +-------+-------+---------+-----------------+
+    +-hello-+-world-+-tuple---+-sometimes_nulls-+
+ 6. |     5 | 5     | (5,'5') |               2 |
+    +-------+-------+---------+-----------------+
   Showed first 6.
- hello   world   tuple     sometimes_nulls
+    hello   world   tuple     sometimes_nulls
 
-     0   0       (0,'0')              NULL 
-     1   1       (1,'1')                 1 
-     2   2       (2,'2')                 2 
-     3   3       (3,'3')              NULL 
-     4   4       (4,'4')                 1 
- hello   world   tuple     sometimes_nulls
+1.      0   0       (0,'0')              NULL 
+2.      1   1       (1,'1')                 1 
+3.      2   2       (2,'2')                 2 
+4.      3   3       (3,'3')              NULL 
+5.      4   4       (4,'4')                 1 
+     hello   world   tuple     sometimes_nulls
 
-     5   5       (5,'5')                 2 
+ 6.      5   5       (5,'5')                 2 
 
 Showed first 6.
diff --git a/tests/queries/0_stateless/00405_pretty_formats.sql b/tests/queries/0_stateless/00405_pretty_formats.sql
index 3c8af776278..00bb09a1c30 100644
--- a/tests/queries/0_stateless/00405_pretty_formats.sql
+++ b/tests/queries/0_stateless/00405_pretty_formats.sql
@@ -1,3 +1,5 @@
+SET output_format_pretty_color = 1;
+
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT Pretty;
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettyCompact;
 SELECT number AS hello, toString(number) AS world, (hello, world) AS tuple, nullIf(hello % 3, 0) AS sometimes_nulls FROM system.numbers LIMIT 10 SETTINGS max_block_size = 5 FORMAT PrettySpace;
diff --git a/tests/queries/0_stateless/00406_tuples_with_nulls.reference b/tests/queries/0_stateless/00406_tuples_with_nulls.reference
index c383c208b64..614cb1ace7f 100644
--- a/tests/queries/0_stateless/00406_tuples_with_nulls.reference
+++ b/tests/queries/0_stateless/00406_tuples_with_nulls.reference
@@ -1,15 +1,15 @@
-┌─tuple─────────�
-│ (0,NULL,NULL) │
-│ (1,1,'1')     │
-│ (2,2,NULL)    │
-│ (3,NULL,'1')  │
-│ (4,1,NULL)    │
-│ (5,2,'1')     │
-│ (6,NULL,NULL) │
-│ (7,1,'1')     │
-│ (8,2,NULL)    │
-│ (9,NULL,'1')  │
-└───────────────┘
-┌─x────┬─y──────�
-│ ᴺ�ᴸᴸ │ (NULL) │
-└──────┴────────┘
+    ┌─tuple─────────�
+ 1. │ (0,NULL,NULL) │
+ 2. │ (1,1,'1')     │
+ 3. │ (2,2,NULL)    │
+ 4. │ (3,NULL,'1')  │
+ 5. │ (4,1,NULL)    │
+ 6. │ (5,2,'1')     │
+ 7. │ (6,NULL,NULL) │
+ 8. │ (7,1,'1')     │
+ 9. │ (8,2,NULL)    │
+10. │ (9,NULL,'1')  │
+    └───────────────┘
+   ┌─x────┬─y──────�
+1. │ ᴺ�ᴸᴸ │ (NULL) │
+   └──────┴────────┘
diff --git a/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference b/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference
index eedaa4b5d8b..599d8b6d5e3 100644
--- a/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference
+++ b/tests/queries/0_stateless/00476_pretty_formats_and_widths.reference
@@ -1,67 +1,67 @@
-�������������┳������������┓
-┃          x ┃ s          ┃
-┡������������╇������������┩
-│          1 │ 1          │
-├────────────┼────────────┤
-│         10 │ 10         │
-├────────────┼────────────┤
-│        100 │ 100        │
-├────────────┼────────────┤
-│       1000 │ 1000       │
-├────────────┼────────────┤
-│      10000 │ 10000      │
-├────────────┼────────────┤
-│     100000 │ 100000     │
-├────────────┼────────────┤
-│    1000000 │ 1000000    │
-├────────────┼────────────┤
-│   10000000 │ 10000000   │
-├────────────┼────────────┤
-│  100000000 │ 100000000  │
-├────────────┼────────────┤
-│ 1000000000 │ 1000000000 │
-└────────────┴────────────┘
-┌──────────x─┬─s──────────�
-│          1 │ 1          │
-│         10 │ 10         │
-│        100 │ 100        │
-│       1000 │ 1000       │
-│      10000 │ 10000      │
-│     100000 │ 100000     │
-│    1000000 │ 1000000    │
-│   10000000 │ 10000000   │
-│  100000000 │ 100000000  │
-│ 1000000000 │ 1000000000 │
-└────────────┴────────────┘
-          x   s         
+    �������������┳������������┓
+    ┃          x ┃ s          ┃
+    ┡������������╇������������┩
+ 1. │          1 │ 1          │
+    ├────────────┼────────────┤
+ 2. │         10 │ 10         │
+    ├────────────┼────────────┤
+ 3. │        100 │ 100        │
+    ├────────────┼────────────┤
+ 4. │       1000 │ 1000       │
+    ├────────────┼────────────┤
+ 5. │      10000 │ 10000      │
+    ├────────────┼────────────┤
+ 6. │     100000 │ 100000     │
+    ├────────────┼────────────┤
+ 7. │    1000000 │ 1000000    │
+    ├────────────┼────────────┤
+ 8. │   10000000 │ 10000000   │
+    ├────────────┼────────────┤
+ 9. │  100000000 │ 100000000  │
+    ├────────────┼────────────┤
+10. │ 1000000000 │ 1000000000 │
+    └────────────┴────────────┘
+    ┌──────────x─┬─s──────────�
+ 1. │          1 │ 1          │
+ 2. │         10 │ 10         │
+ 3. │        100 │ 100        │
+ 4. │       1000 │ 1000       │
+ 5. │      10000 │ 10000      │
+ 6. │     100000 │ 100000     │
+ 7. │    1000000 │ 1000000    │
+ 8. │   10000000 │ 10000000   │
+ 9. │  100000000 │ 100000000  │
+10. │ 1000000000 │ 1000000000 │
+    └────────────┴────────────┘
+              x   s         
 
-          1   1          
-         10   10         
-        100   100        
-       1000   1000       
-      10000   10000      
-     100000   100000     
-    1000000   1000000    
-   10000000   10000000   
-  100000000   100000000  
- 1000000000   1000000000 
-┌──────────x─┬─s──────────�
-│          1 │ 1          │
-│         10 │ 10         │
-│        100 │ 100        │
-│       1000 │ 1000       │
-│      10000 │ 10000      │
-│     100000 │ 100000     │
-│    1000000 │ 1000000    │
-│   10000000 │ 10000000   │
-│  100000000 │ 100000000  │
-│ 1000000000 │ 1000000000 │
-└────────────┴────────────┘
-�����������┓
-┃ '\\\'\'' ┃
-┡����������┩
-│ \''      │
-└──────────┘
+ 1.           1   1          
+ 2.          10   10         
+ 3.         100   100        
+ 4.        1000   1000       
+ 5.       10000   10000      
+ 6.      100000   100000     
+ 7.     1000000   1000000    
+ 8.    10000000   10000000   
+ 9.   100000000   100000000  
+10.  1000000000   1000000000 
+    ┌──────────x─┬─s──────────�
+ 1. │          1 │ 1          │
+ 2. │         10 │ 10         │
+ 3. │        100 │ 100        │
+ 4. │       1000 │ 1000       │
+ 5. │      10000 │ 10000      │
+ 6. │     100000 │ 100000     │
+ 7. │    1000000 │ 1000000    │
+ 8. │   10000000 │ 10000000   │
+ 9. │  100000000 │ 100000000  │
+10. │ 1000000000 │ 1000000000 │
+    └────────────┴────────────┘
+   �����������┓
+   ┃ '\\\'\'' ┃
+   ┡����������┩
+1. │ \''      │
+   └──────────┘
 Row 1:
 ──────
 '\\\'\'': \''
diff --git a/tests/queries/0_stateless/00476_pretty_formats_and_widths.sql b/tests/queries/0_stateless/00476_pretty_formats_and_widths.sql
index be98d9ab5cc..4bace207fb5 100644
--- a/tests/queries/0_stateless/00476_pretty_formats_and_widths.sql
+++ b/tests/queries/0_stateless/00476_pretty_formats_and_widths.sql
@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1, output_format_pretty_highlight_digit_groups=0;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT Pretty;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT PrettyCompact;
 SELECT toUInt64(round(exp10(number))) AS x, toString(x) AS s FROM system.numbers LIMIT 10 FORMAT PrettySpace;
diff --git a/tests/queries/0_stateless/00505_secure.reference b/tests/queries/0_stateless/00505_secure.reference
index 9a8656bf491..24319e2c136 100644
--- a/tests/queries/0_stateless/00505_secure.reference
+++ b/tests/queries/0_stateless/00505_secure.reference
@@ -1,3 +1,5 @@
+0
+1
 2
 3
 4
diff --git a/tests/queries/0_stateless/00505_secure.sh b/tests/queries/0_stateless/00505_secure.sh
index b7c12911b90..eaa50bce6b1 100755
--- a/tests/queries/0_stateless/00505_secure.sh
+++ b/tests/queries/0_stateless/00505_secure.sh
@@ -7,6 +7,12 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+$CLICKHOUSE_CLIENT --no-secure -q "SELECT 0;"
+
+# Use $CLICKHOUSE_CLIENT_SECURE, but replace `--secure` by `-s` to test it
+CLICKHOUSE_CLIENT_S=${CLICKHOUSE_CLIENT_SECURE/ --secure / -s }
+$CLICKHOUSE_CLIENT_S -q "SELECT 1;"
+
 $CLICKHOUSE_CLIENT_SECURE -q "SELECT 2;"
 
 #disable test
diff --git a/tests/queries/0_stateless/00538_datediff_plural_units.reference b/tests/queries/0_stateless/00538_datediff_plural_units.reference
index ebe63974df8..885f8a1cfe2 100644
--- a/tests/queries/0_stateless/00538_datediff_plural_units.reference
+++ b/tests/queries/0_stateless/00538_datediff_plural_units.reference
@@ -8,3 +8,4 @@
 -63072000
 -63072000000
 -63072000000000
+-63072000000000000
diff --git a/tests/queries/0_stateless/00538_datediff_plural_units.sql b/tests/queries/0_stateless/00538_datediff_plural_units.sql
index d1234155a56..dd8395fc60f 100644
--- a/tests/queries/0_stateless/00538_datediff_plural_units.sql
+++ b/tests/queries/0_stateless/00538_datediff_plural_units.sql
@@ -8,3 +8,4 @@ SELECT dateDiff('minutes', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-
 SELECT dateDiff('seconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
 SELECT dateDiff('milliseconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
 SELECT dateDiff('microseconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
+SELECT dateDiff('nanoseconds', toDateTime('2017-12-31', 'UTC'), toDateTime('2016-01-01', 'UTC'));
diff --git a/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference b/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference
index 0729a7628f2..89f7d1cbf7c 100644
--- a/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference
+++ b/tests/queries/0_stateless/00569_parse_date_time_best_effort.reference
@@ -1,106 +1,106 @@
- s                                                   a                     b
+      s                                                   a                     b
 
- 0                                                ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 0000                                             ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2000-01-01 00:00:00               2000-01-01 00:00:00   2000-01-01 00:00:00 
- 2000-01-01 01:00:00               2000-01-01 01:00:00   2000-01-01 01:00:00 
- 02/01/17 010203 MSK               2017-01-01 22:02:03   2017-01-01 22:02:03 
- 02/01/17 010203 MSK+0100          2017-01-01 21:02:03   2017-01-01 21:02:03 
- 02/01/17 010203 UTC+0300          2017-01-01 22:02:03   2017-01-01 22:02:03 
- 02/01/17 010203Z                  2017-01-02 01:02:03   2017-01-02 01:02:03 
- 02/01/1970 010203Z                1970-01-02 01:02:03   1970-01-02 01:02:03 
- 02/01/70 010203Z                  1970-01-02 01:02:03   1970-01-02 01:02:03 
- 11 Feb 2018 06:40:50 +0300        2018-02-11 03:40:50   2018-02-11 03:40:50 
- 17 Apr 2000 2 1:2:3               2000-04-17 01:02:03   2000-04-17 01:02:03 
- 19700102 01:00:00                 1970-01-02 01:00:00   1970-01-02 01:00:00 
- 1970010201:00:00                                 ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 19700102010203                    1970-01-02 01:02:03   1970-01-02 01:02:03 
- 19700102010203Z                   1970-01-02 01:02:03   1970-01-02 01:02:03 
- 1970/01/02 010203Z                1970-01-02 01:02:03   1970-01-02 01:02:03 
- 20 2000                           2000-01-20 00:00:00   2000-01-20 00:00:00 
- 201                                              ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 20160101                          2016-01-01 00:00:00   2016-01-01 00:00:00 
- 2016-01-01                        2016-01-01 00:00:00   2016-01-01 00:00:00 
- 201601-01                         2016-01-01 01:00:00   2016-01-01 01:00:00 
- 2016-01-01MSD                     2015-12-31 20:00:00   2015-12-31 20:00:00 
- 2016-01-01 MSD                    2015-12-31 20:00:00   2015-12-31 20:00:00 
- 201601-01 MSD                     2016-01-01 04:00:00   2016-01-01 04:00:00 
- 2016-01-01UTC                     2016-01-01 00:00:00   2016-01-01 00:00:00 
- 2016-01-01Z                       2016-01-01 00:00:00   2016-01-01 00:00:00 
- 2017                              2017-01-01 00:00:00   2017-01-01 00:00:00 
- 2017/01/00                        2017-01-01 00:00:00   2017-01-01 00:00:00 
- 2017/01/00 MSD                    2016-12-31 20:00:00   2016-12-31 20:00:00 
- 2017/01/00 MSD Jun                2017-05-31 20:00:00   2017-05-31 20:00:00 
- 2017/01/01                        2017-01-01 00:00:00   2017-01-01 00:00:00 
- 201701 02 010203 UTC+0300         2017-01-01 22:02:03   2017-01-01 22:02:03 
- 2017-01-02 03:04:05               2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-0203:04:05                               ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017-01-02 03:04:05+0             2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02 03:04:05+00            2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02 03:04:05+0000          2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02 03:04:05 -0100         2017-01-02 04:04:05   2017-01-02 04:04:05 
- 2017-01-02 03:04:05+030           2017-01-02 02:34:05   2017-01-02 02:34:05 
- 2017-01-02 03:04:05+0300          2017-01-02 00:04:05   2017-01-02 00:04:05 
- 2017-01-02 03:04:05+1             2017-01-02 02:04:05   2017-01-02 02:04:05 
- 2017-01-02 03:04:05+300           2017-01-02 00:04:05   2017-01-02 00:04:05 
- 2017-01-02 03:04:05+900           2017-01-01 18:04:05   2017-01-01 18:04:05 
- 2017-01-02 03:04:05GMT            2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02 03:04:05 MSD           2017-01-01 23:04:05   2017-01-01 23:04:05 
- 2017-01-02 03:04:05 MSD Feb       2017-02-01 23:04:05   2017-02-01 23:04:05 
- 2017-01-02 03:04:05 MSD Jun       2017-06-01 23:04:05   2017-06-01 23:04:05 
- 2017-01-02 03:04:05 MSK           2017-01-02 00:04:05   2017-01-02 00:04:05 
- 2017-01-02T03:04:05               2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02T03:04:05+00            2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01-02T03:04:05 -0100         2017-01-02 04:04:05   2017-01-02 04:04:05 
- 2017-01-02T03:04:05-0100          2017-01-02 04:04:05   2017-01-02 04:04:05 
- 2017-01-02T03:04:05+0100          2017-01-02 02:04:05   2017-01-02 02:04:05 
- 2017-01-02T03:04:05Z              2017-01-02 03:04:05   2017-01-02 03:04:05 
- 2017-01 03:04:05 MSD Jun          2017-05-31 23:04:05   2017-05-31 23:04:05 
- 2017-01 03:04 MSD Jun             2017-05-31 23:04:00   2017-05-31 23:04:00 
- 2017/01/31                        2017-01-31 00:00:00   2017-01-31 00:00:00 
- 2017/01/32                                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017-01 MSD Jun                   2017-05-31 20:00:00   2017-05-31 20:00:00 
- 201701 MSD Jun                    2017-05-31 20:00:00   2017-05-31 20:00:00 
- 2017 25 1:2:3                                    ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017 25 Apr 1:2:3                 2017-04-01 01:02:03   2017-04-01 01:02:03 
- 2017 Apr 01 11:22:33              2017-04-01 11:22:33   2017-04-01 11:22:33 
- 2017 Apr 02 01/02/03 UTC+0300                    ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017 Apr 02 010203 UTC+0300       2017-04-01 22:02:03   2017-04-01 22:02:03 
- 2017 Apr 02 01:2:3 UTC+0300       2017-04-01 22:02:03   2017-04-01 22:02:03 
- 2017 Apr 02 1:02:3                2017-04-02 01:02:03   2017-04-02 01:02:03 
- 2017 Apr 02 11:22:33              2017-04-02 11:22:33   2017-04-02 11:22:33 
- 2017 Apr 02 1:2:03                2017-04-02 01:02:03   2017-04-02 01:02:03 
- 2017 Apr 02 1:22:33               2017-04-02 01:22:33   2017-04-02 01:22:33 
- 2017 Apr 02 1:2:3                 2017-04-02 01:02:03   2017-04-02 01:02:03 
- 2017 Apr 02 1:2:33                2017-04-02 01:02:33   2017-04-02 01:02:33 
- 2017 Apr 02 1:2:3 MSK             2017-04-01 22:02:03   2017-04-01 22:02:03 
- 2017 Apr 02 1:2:3 MSK 2017                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017 Apr 02 1:2:3 MSK 2018                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 2017 Apr 02 1:2:3 UTC+0000        2017-04-02 01:02:03   2017-04-02 01:02:03 
- 2017 Apr 02 1:2:3 UTC+0300        2017-04-01 22:02:03   2017-04-01 22:02:03 
- 2017 Apr 02 1:2:3 UTC+0400        2017-04-01 21:02:03   2017-04-01 21:02:03 
- 2017 Apr 2 1:2:3                  2017-04-02 01:02:03   2017-04-02 01:02:03 
- 2017 Jan 02 010203 UTC+0300       2017-01-01 22:02:03   2017-01-01 22:02:03 
- 25 Apr 2017 01:02:03              2017-04-25 01:02:03   2017-04-25 01:02:03 
- 25 Apr 2017 1:2:3                 2017-04-25 01:02:03   2017-04-25 01:02:03 
- 25 Jan 2017 1:2:3                 2017-01-25 01:02:03   2017-01-25 01:02:03 
- 25 Jan 2017 1:2:3 MSK             2017-01-24 22:02:03   2017-01-24 22:02:03 
- 25 Jan 2017 1:2:3 PM              2017-01-25 13:02:03   2017-01-25 13:02:03 
- 25 Jan 2017 1:2:3Z                2017-01-25 01:02:03   2017-01-25 01:02:03 
- 25 Jan 2017 1:2:3 Z               2017-01-25 01:02:03   2017-01-25 01:02:03 
- 25 Jan 2017 1:2:3 Z +0300         2017-01-24 22:02:03   2017-01-24 22:02:03 
- 25 Jan 2017 1:2:3 Z+03:00         2017-01-24 22:02:03   2017-01-24 22:02:03 
- 25 Jan 2017 1:2:3 Z +0300 OM                     ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 25 Jan 2017 1:2:3 Z +03:00 PM     2017-01-25 10:02:03   2017-01-25 10:02:03 
- 25 Jan 2017 1:2:3 Z +0300 PM      2017-01-25 10:02:03   2017-01-25 10:02:03 
- 25 Jan 2017 1:2:3 Z+03:00 PM      2017-01-25 10:02:03   2017-01-25 10:02:03 
- 25 Jan 2017 1:2:3 Z +03:30 PM     2017-01-25 09:32:03   2017-01-25 09:32:03 
- 25 Jan 2017 1:2:3Z Mo                            ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 25 Jan 2017 1:2:3Z Mon            2017-01-25 01:02:03   2017-01-25 01:02:03 
- 25 Jan 2017 1:2:3Z Moo                           ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- 25 Jan 2017 1:2:3 Z PM            2017-01-25 13:02:03   2017-01-25 13:02:03 
- 25 Jan 2017 1:2:3Z PM             2017-01-25 13:02:03   2017-01-25 13:02:03 
- 25 Jan 2017 1:2:3 Z PM +03:00     2017-01-25 10:02:03   2017-01-25 10:02:03 
- Jun, 11 Feb 2018 06:40:50 +0300                  ᴺ�ᴸᴸ   1970-01-01 00:00:00 
- Sun 11 Feb 2018 06:40:50 +0300    2018-02-11 03:40:50   2018-02-11 03:40:50 
- Sun, 11 Feb 2018 06:40:50 +0300   2018-02-11 03:40:50   2018-02-11 03:40:50 
+  1.  0                                                ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+  2.  0000                                             ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+  3.  2000-01-01 00:00:00               2000-01-01 00:00:00   2000-01-01 00:00:00 
+  4.  2000-01-01 01:00:00               2000-01-01 01:00:00   2000-01-01 01:00:00 
+  5.  02/01/17 010203 MSK               2017-01-01 22:02:03   2017-01-01 22:02:03 
+  6.  02/01/17 010203 MSK+0100          2017-01-01 21:02:03   2017-01-01 21:02:03 
+  7.  02/01/17 010203 UTC+0300          2017-01-01 22:02:03   2017-01-01 22:02:03 
+  8.  02/01/17 010203Z                  2017-01-02 01:02:03   2017-01-02 01:02:03 
+  9.  02/01/1970 010203Z                1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 10.  02/01/70 010203Z                  1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 11.  11 Feb 2018 06:40:50 +0300        2018-02-11 03:40:50   2018-02-11 03:40:50 
+ 12.  17 Apr 2000 2 1:2:3               2000-04-17 01:02:03   2000-04-17 01:02:03 
+ 13.  19700102 01:00:00                 1970-01-02 01:00:00   1970-01-02 01:00:00 
+ 14.  1970010201:00:00                                 ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 15.  19700102010203                    1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 16.  19700102010203Z                   1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 17.  1970/01/02 010203Z                1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 18.  20 2000                           2000-01-20 00:00:00   2000-01-20 00:00:00 
+ 19.  201                                              ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 20.  20160101                          2016-01-01 00:00:00   2016-01-01 00:00:00 
+ 21.  2016-01-01                        2016-01-01 00:00:00   2016-01-01 00:00:00 
+ 22.  201601-01                         2016-01-01 01:00:00   2016-01-01 01:00:00 
+ 23.  2016-01-01MSD                     2015-12-31 20:00:00   2015-12-31 20:00:00 
+ 24.  2016-01-01 MSD                    2015-12-31 20:00:00   2015-12-31 20:00:00 
+ 25.  201601-01 MSD                     2016-01-01 04:00:00   2016-01-01 04:00:00 
+ 26.  2016-01-01UTC                     2016-01-01 00:00:00   2016-01-01 00:00:00 
+ 27.  2016-01-01Z                       2016-01-01 00:00:00   2016-01-01 00:00:00 
+ 28.  2017                              2017-01-01 00:00:00   2017-01-01 00:00:00 
+ 29.  2017/01/00                        2017-01-01 00:00:00   2017-01-01 00:00:00 
+ 30.  2017/01/00 MSD                    2016-12-31 20:00:00   2016-12-31 20:00:00 
+ 31.  2017/01/00 MSD Jun                2017-05-31 20:00:00   2017-05-31 20:00:00 
+ 32.  2017/01/01                        2017-01-01 00:00:00   2017-01-01 00:00:00 
+ 33.  201701 02 010203 UTC+0300         2017-01-01 22:02:03   2017-01-01 22:02:03 
+ 34.  2017-01-02 03:04:05               2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 35.  2017-01-0203:04:05                               ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 36.  2017-01-02 03:04:05+0             2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 37.  2017-01-02 03:04:05+00            2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 38.  2017-01-02 03:04:05+0000          2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 39.  2017-01-02 03:04:05 -0100         2017-01-02 04:04:05   2017-01-02 04:04:05 
+ 40.  2017-01-02 03:04:05+030           2017-01-02 02:34:05   2017-01-02 02:34:05 
+ 41.  2017-01-02 03:04:05+0300          2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 42.  2017-01-02 03:04:05+1             2017-01-02 02:04:05   2017-01-02 02:04:05 
+ 43.  2017-01-02 03:04:05+300           2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 44.  2017-01-02 03:04:05+900           2017-01-01 18:04:05   2017-01-01 18:04:05 
+ 45.  2017-01-02 03:04:05GMT            2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 46.  2017-01-02 03:04:05 MSD           2017-01-01 23:04:05   2017-01-01 23:04:05 
+ 47.  2017-01-02 03:04:05 MSD Feb       2017-02-01 23:04:05   2017-02-01 23:04:05 
+ 48.  2017-01-02 03:04:05 MSD Jun       2017-06-01 23:04:05   2017-06-01 23:04:05 
+ 49.  2017-01-02 03:04:05 MSK           2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 50.  2017-01-02T03:04:05               2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 51.  2017-01-02T03:04:05+00            2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 52.  2017-01-02T03:04:05 -0100         2017-01-02 04:04:05   2017-01-02 04:04:05 
+ 53.  2017-01-02T03:04:05-0100          2017-01-02 04:04:05   2017-01-02 04:04:05 
+ 54.  2017-01-02T03:04:05+0100          2017-01-02 02:04:05   2017-01-02 02:04:05 
+ 55.  2017-01-02T03:04:05Z              2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 56.  2017-01 03:04:05 MSD Jun          2017-05-31 23:04:05   2017-05-31 23:04:05 
+ 57.  2017-01 03:04 MSD Jun             2017-05-31 23:04:00   2017-05-31 23:04:00 
+ 58.  2017/01/31                        2017-01-31 00:00:00   2017-01-31 00:00:00 
+ 59.  2017/01/32                                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 60.  2017-01 MSD Jun                   2017-05-31 20:00:00   2017-05-31 20:00:00 
+ 61.  201701 MSD Jun                    2017-05-31 20:00:00   2017-05-31 20:00:00 
+ 62.  2017 25 1:2:3                                    ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 63.  2017 25 Apr 1:2:3                 2017-04-01 01:02:03   2017-04-01 01:02:03 
+ 64.  2017 Apr 01 11:22:33              2017-04-01 11:22:33   2017-04-01 11:22:33 
+ 65.  2017 Apr 02 01/02/03 UTC+0300                    ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 66.  2017 Apr 02 010203 UTC+0300       2017-04-01 22:02:03   2017-04-01 22:02:03 
+ 67.  2017 Apr 02 01:2:3 UTC+0300       2017-04-01 22:02:03   2017-04-01 22:02:03 
+ 68.  2017 Apr 02 1:02:3                2017-04-02 01:02:03   2017-04-02 01:02:03 
+ 69.  2017 Apr 02 11:22:33              2017-04-02 11:22:33   2017-04-02 11:22:33 
+ 70.  2017 Apr 02 1:2:03                2017-04-02 01:02:03   2017-04-02 01:02:03 
+ 71.  2017 Apr 02 1:22:33               2017-04-02 01:22:33   2017-04-02 01:22:33 
+ 72.  2017 Apr 02 1:2:3                 2017-04-02 01:02:03   2017-04-02 01:02:03 
+ 73.  2017 Apr 02 1:2:33                2017-04-02 01:02:33   2017-04-02 01:02:33 
+ 74.  2017 Apr 02 1:2:3 MSK             2017-04-01 22:02:03   2017-04-01 22:02:03 
+ 75.  2017 Apr 02 1:2:3 MSK 2017                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 76.  2017 Apr 02 1:2:3 MSK 2018                       ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 77.  2017 Apr 02 1:2:3 UTC+0000        2017-04-02 01:02:03   2017-04-02 01:02:03 
+ 78.  2017 Apr 02 1:2:3 UTC+0300        2017-04-01 22:02:03   2017-04-01 22:02:03 
+ 79.  2017 Apr 02 1:2:3 UTC+0400        2017-04-01 21:02:03   2017-04-01 21:02:03 
+ 80.  2017 Apr 2 1:2:3                  2017-04-02 01:02:03   2017-04-02 01:02:03 
+ 81.  2017 Jan 02 010203 UTC+0300       2017-01-01 22:02:03   2017-01-01 22:02:03 
+ 82.  25 Apr 2017 01:02:03              2017-04-25 01:02:03   2017-04-25 01:02:03 
+ 83.  25 Apr 2017 1:2:3                 2017-04-25 01:02:03   2017-04-25 01:02:03 
+ 84.  25 Jan 2017 1:2:3                 2017-01-25 01:02:03   2017-01-25 01:02:03 
+ 85.  25 Jan 2017 1:2:3 MSK             2017-01-24 22:02:03   2017-01-24 22:02:03 
+ 86.  25 Jan 2017 1:2:3 PM              2017-01-25 13:02:03   2017-01-25 13:02:03 
+ 87.  25 Jan 2017 1:2:3Z                2017-01-25 01:02:03   2017-01-25 01:02:03 
+ 88.  25 Jan 2017 1:2:3 Z               2017-01-25 01:02:03   2017-01-25 01:02:03 
+ 89.  25 Jan 2017 1:2:3 Z +0300         2017-01-24 22:02:03   2017-01-24 22:02:03 
+ 90.  25 Jan 2017 1:2:3 Z+03:00         2017-01-24 22:02:03   2017-01-24 22:02:03 
+ 91.  25 Jan 2017 1:2:3 Z +0300 OM                     ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 92.  25 Jan 2017 1:2:3 Z +03:00 PM     2017-01-25 10:02:03   2017-01-25 10:02:03 
+ 93.  25 Jan 2017 1:2:3 Z +0300 PM      2017-01-25 10:02:03   2017-01-25 10:02:03 
+ 94.  25 Jan 2017 1:2:3 Z+03:00 PM      2017-01-25 10:02:03   2017-01-25 10:02:03 
+ 95.  25 Jan 2017 1:2:3 Z +03:30 PM     2017-01-25 09:32:03   2017-01-25 09:32:03 
+ 96.  25 Jan 2017 1:2:3Z Mo                            ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 97.  25 Jan 2017 1:2:3Z Mon            2017-01-25 01:02:03   2017-01-25 01:02:03 
+ 98.  25 Jan 2017 1:2:3Z Moo                           ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+ 99.  25 Jan 2017 1:2:3 Z PM            2017-01-25 13:02:03   2017-01-25 13:02:03 
+100.  25 Jan 2017 1:2:3Z PM             2017-01-25 13:02:03   2017-01-25 13:02:03 
+101.  25 Jan 2017 1:2:3 Z PM +03:00     2017-01-25 10:02:03   2017-01-25 10:02:03 
+102.  Jun, 11 Feb 2018 06:40:50 +0300                  ᴺ�ᴸᴸ   1970-01-01 00:00:00 
+103.  Sun 11 Feb 2018 06:40:50 +0300    2018-02-11 03:40:50   2018-02-11 03:40:50 
+104.  Sun, 11 Feb 2018 06:40:50 +0300   2018-02-11 03:40:50   2018-02-11 03:40:50 
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 4ac88edd40e..2c46edc98bf 100644
--- a/tests/queries/0_stateless/00597_push_down_predicate_long.reference
+++ b/tests/queries/0_stateless/00597_push_down_predicate_long.reference
@@ -114,7 +114,7 @@ FROM
 (
     SELECT
         1 AS id,
-        identity(_CAST(1, \'Nullable(UInt8)\')) AS subquery
+        __scalarSubqueryResult(_CAST(1, \'Nullable(UInt8)\')) AS subquery
     WHERE subquery = 1
 )
 WHERE subquery = 1
@@ -179,7 +179,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
 )
 WHERE id = 1
 2000-01-01	1	test string 1	1
@@ -203,7 +203,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     )
     WHERE id = 1
 )
@@ -229,7 +229,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     ) AS b
     WHERE id = 1
 )
@@ -248,7 +248,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
 )
 WHERE id = 1
 2000-01-01	1	test string 1	1
@@ -272,7 +272,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     )
     WHERE id = 1
 )
@@ -291,7 +291,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
 ) AS b
 WHERE id = 1
 2000-01-01	1	test string 1	1
@@ -315,7 +315,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     ) AS a
     WHERE id = 1
 ) AS b
@@ -332,7 +332,7 @@ FROM
         date,
         min(value) AS value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
     GROUP BY
         id,
         date
@@ -352,7 +352,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
     UNION ALL
     SELECT
         date,
@@ -360,7 +360,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
 )
 WHERE id = 1
 2000-01-01	1	test string 1	1
@@ -381,7 +381,7 @@ FROM
         name,
         value
     FROM test_00597
-    PREWHERE id = 1
+    WHERE id = 1
 )
 ANY LEFT JOIN
 (
@@ -443,7 +443,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     )
     ANY LEFT JOIN
     (
@@ -540,7 +540,7 @@ FROM
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     ) AS a
     ANY LEFT JOIN
     (
@@ -587,7 +587,7 @@ SEMI LEFT JOIN
             name,
             value
         FROM test_00597
-        PREWHERE id = 1
+        WHERE id = 1
     )
     WHERE id = 1
 ) AS r USING (id)
diff --git a/tests/queries/0_stateless/00599_create_view_with_subquery.reference b/tests/queries/0_stateless/00599_create_view_with_subquery.reference
index 0458f650fd0..39a5f99df03 100644
--- a/tests/queries/0_stateless/00599_create_view_with_subquery.reference
+++ b/tests/queries/0_stateless/00599_create_view_with_subquery.reference
@@ -1 +1 @@
-CREATE VIEW default.test_view_00599\n(\n    `id` UInt64\n) AS\nSELECT *\nFROM default.test_00599\nWHERE id = (\n    SELECT 1\n)
+CREATE VIEW default.test_view_00599\n(\n    `id` UInt64\n)\nAS SELECT *\nFROM default.test_00599\nWHERE id = (\n    SELECT 1\n)
diff --git a/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh b/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
index 99813d894ae..c8297635c43 100755
--- a/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
+++ b/tests/queries/0_stateless/00612_pk_in_tuple_perf.sh
@@ -20,7 +20,7 @@ SETTINGS index_granularity = 1;
 INSERT INTO pk_in_tuple_perf SELECT number, number * 10 FROM numbers(100);
 EOF
 
-query="SELECT count() FROM pk_in_tuple_perf WHERE (v, u) IN ((2, 10), (2, 20))"
+query="SELECT count() FROM pk_in_tuple_perf WHERE (v, u) IN ((2, 10), (2, 20)) SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0"
 
 $CLICKHOUSE_CLIENT --query "$query"
 $CLICKHOUSE_CLIENT --query "$query FORMAT JSON" | grep "rows_read"
@@ -40,7 +40,7 @@ SETTINGS index_granularity = 1;
 INSERT INTO pk_in_tuple_perf_non_const SELECT today() - number, number FROM numbers(100);
 EOF
 
-query="SELECT count() FROM pk_in_tuple_perf_non_const WHERE (u, d) IN ((0, today()), (1, today()))"
+query="SELECT count() FROM pk_in_tuple_perf_non_const WHERE (u, d) IN ((0, today()), (1, today())) SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0"
 
 $CLICKHOUSE_CLIENT --query "$query"
 $CLICKHOUSE_CLIENT --query "$query FORMAT JSON" | grep "rows_read"
diff --git a/tests/queries/0_stateless/00623_truncate_all_tables.reference b/tests/queries/0_stateless/00623_truncate_all_tables.reference
new file mode 100644
index 00000000000..b1df4c9107d
--- /dev/null
+++ b/tests/queries/0_stateless/00623_truncate_all_tables.reference
@@ -0,0 +1,16 @@
+======Before Truncate======
+1
+1
+1
+1
+1
+2000-01-01	1
+======After Truncate And Empty======
+0
+======After Truncate And Insert Data======
+1
+1
+1
+1
+1
+2000-01-01	1
diff --git a/tests/queries/0_stateless/00623_truncate_all_tables.sql b/tests/queries/0_stateless/00623_truncate_all_tables.sql
new file mode 100644
index 00000000000..3a6f94d2907
--- /dev/null
+++ b/tests/queries/0_stateless/00623_truncate_all_tables.sql
@@ -0,0 +1,50 @@
+-- Tags: no-parallel
+
+DROP DATABASE IF EXISTS truncate_test;
+
+CREATE DATABASE IF NOT EXISTS truncate_test;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_set(id UInt64) ENGINE = Set;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_log(id UInt64) ENGINE = Log;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_memory(id UInt64) ENGINE = Memory;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_tiny_log(id UInt64) ENGINE = TinyLog;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_stripe_log(id UInt64) ENGINE = StripeLog;
+CREATE TABLE IF NOT EXISTS truncate_test.truncate_test_merge_tree(p Date, k UInt64) ENGINE = MergeTree ORDER BY p;
+
+SELECT '======Before Truncate======';
+INSERT INTO truncate_test.truncate_test_set VALUES(0);
+INSERT INTO truncate_test.truncate_test_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_memory VALUES(1);
+INSERT INTO truncate_test.truncate_test_tiny_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_stripe_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_merge_tree VALUES('2000-01-01', 1);
+SELECT * FROM system.numbers WHERE number NOT IN truncate_test.truncate_test_set LIMIT 1;
+SELECT * FROM truncate_test.truncate_test_log;
+SELECT * FROM truncate_test.truncate_test_memory;
+SELECT * FROM truncate_test.truncate_test_tiny_log;
+SELECT * FROM truncate_test.truncate_test_stripe_log;
+SELECT * FROM truncate_test.truncate_test_merge_tree;
+
+SELECT '======After Truncate And Empty======';
+TRUNCATE ALL TABLES IF EXISTS truncate_test;
+SELECT * FROM system.numbers WHERE number NOT IN truncate_test.truncate_test_set LIMIT 1;
+SELECT * FROM truncate_test.truncate_test_log;
+SELECT * FROM truncate_test.truncate_test_memory;
+SELECT * FROM truncate_test.truncate_test_tiny_log;
+SELECT * FROM truncate_test.truncate_test_stripe_log;
+SELECT * FROM truncate_test.truncate_test_merge_tree;
+
+SELECT '======After Truncate And Insert Data======';
+INSERT INTO truncate_test.truncate_test_set VALUES(0);
+INSERT INTO truncate_test.truncate_test_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_memory VALUES(1);
+INSERT INTO truncate_test.truncate_test_tiny_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_stripe_log VALUES(1);
+INSERT INTO truncate_test.truncate_test_merge_tree VALUES('2000-01-01', 1);
+SELECT * FROM system.numbers WHERE number NOT IN truncate_test.truncate_test_set LIMIT 1;
+SELECT * FROM truncate_test.truncate_test_log;
+SELECT * FROM truncate_test.truncate_test_memory;
+SELECT * FROM truncate_test.truncate_test_tiny_log;
+SELECT * FROM truncate_test.truncate_test_stripe_log;
+SELECT * FROM truncate_test.truncate_test_merge_tree;
+
+DROP DATABASE IF EXISTS truncate_test;
diff --git a/tests/queries/0_stateless/00646_url_engine.python b/tests/queries/0_stateless/00646_url_engine.python
index dc0fdd1a71d..931d18a3f80 100644
--- a/tests/queries/0_stateless/00646_url_engine.python
+++ b/tests/queries/0_stateless/00646_url_engine.python
@@ -12,6 +12,7 @@ import urllib.request
 import subprocess
 from io import StringIO
 from http.server import BaseHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
 
 
 def is_ipv6(host):
@@ -145,11 +146,19 @@ class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
 
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    pass
+
+
+class ThreadedHTTPServerV6(ThreadingMixIn, HTTPServerV6):
+    pass
+
+
 def start_server():
     if IS_IPV6:
-        httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, CSVHTTPServer)
+        httpd = ThreadedHTTPServerV6(HTTP_SERVER_ADDRESS, CSVHTTPServer)
     else:
-        httpd = HTTPServer(HTTP_SERVER_ADDRESS, CSVHTTPServer)
+        httpd = ThreadedHTTPServer(HTTP_SERVER_ADDRESS, CSVHTTPServer)
 
     t = threading.Thread(target=httpd.serve_forever)
     return t, httpd
diff --git a/tests/queries/0_stateless/00662_has_nullable.reference b/tests/queries/0_stateless/00662_has_nullable.reference
new file mode 100644
index 00000000000..1ac93f25a39
--- /dev/null
+++ b/tests/queries/0_stateless/00662_has_nullable.reference
@@ -0,0 +1,14 @@
+Nullable(UInt64), non-null array
+1	1
+\N	0
+Non-nullable UInt64, nullable array
+0	0
+1	1
+2	1
+Nullable(UInt64), nullable array
+0	0
+\N	1
+1	1
+All NULLs
+0	0
+\N	1
diff --git a/tests/queries/0_stateless/00662_has_nullable.sql b/tests/queries/0_stateless/00662_has_nullable.sql
new file mode 100644
index 00000000000..3fd3bd46baa
--- /dev/null
+++ b/tests/queries/0_stateless/00662_has_nullable.sql
@@ -0,0 +1,39 @@
+DROP TABLE IF EXISTS 00662_has_nullable;
+
+SELECT 'Nullable(UInt64), non-null array';
+CREATE TABLE 00662_has_nullable(a Nullable(UInt64)) ENGINE = Memory;
+
+INSERT INTO 00662_has_nullable VALUES (1), (Null);
+SELECT a, has([0, 1], a) FROM 00662_has_nullable;
+
+DROP TABLE 00662_has_nullable;
+
+--------------------------------------------------------------------------------
+
+SELECT 'Non-nullable UInt64, nullable array';
+CREATE TABLE 00662_has_nullable(a UInt64) ENGINE = Memory;
+
+INSERT INTO 00662_has_nullable VALUES (0), (1), (2);
+SELECT a, has([NULL, 1, 2], a) FROM 00662_has_nullable;
+
+DROP TABLE 00662_has_nullable;
+
+--------------------------------------------------------------------------------
+
+SELECT 'Nullable(UInt64), nullable array';
+CREATE TABLE 00662_has_nullable(a Nullable(UInt64)) ENGINE = Memory;
+
+INSERT INTO 00662_has_nullable VALUES (0), (Null), (1);
+SELECT a, has([NULL, 1, 2], a) FROM 00662_has_nullable;
+
+DROP TABLE 00662_has_nullable;
+
+--------------------------------------------------------------------------------
+
+SELECT 'All NULLs';
+CREATE TABLE 00662_has_nullable(a Nullable(UInt64)) ENGINE = Memory;
+
+INSERT INTO 00662_has_nullable VALUES (0), (Null);
+SELECT a, has([NULL, NULL], a) FROM 00662_has_nullable;
+
+DROP TABLE 00662_has_nullable;
diff --git a/tests/queries/0_stateless/00695_pretty_max_column_pad_width.reference b/tests/queries/0_stateless/00695_pretty_max_column_pad_width.reference
index f464bff67b8..cd11af5d8f7 100644
--- a/tests/queries/0_stateless/00695_pretty_max_column_pad_width.reference
+++ b/tests/queries/0_stateless/00695_pretty_max_column_pad_width.reference
@@ -1,102 +1,102 @@
-┌─range(number)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────�
-│ []                                                                                                                                                                                                                                                         │
-│ [0]                                                                                                                                                                                                                                                        │
-│ [0,1]                                                                                                                                                                                                                                                      │
-│ [0,1,2]                                                                                                                                                                                                                                                    │
-│ [0,1,2,3]                                                                                                                                                                                                                                                  │
-│ [0,1,2,3,4]                                                                                                                                                                                                                                                │
-│ [0,1,2,3,4,5]                                                                                                                                                                                                                                              │
-│ [0,1,2,3,4,5,6]                                                                                                                                                                                                                                            │
-│ [0,1,2,3,4,5,6,7]                                                                                                                                                                                                                                          │
-│ [0,1,2,3,4,5,6,7,8]                                                                                                                                                                                                                                        │
-│ [0,1,2,3,4,5,6,7,8,9]                                                                                                                                                                                                                                      │
-│ [0,1,2,3,4,5,6,7,8,9,10]                                                                                                                                                                                                                                   │
-│ [0,1,2,3,4,5,6,7,8,9,10,11]                                                                                                                                                                                                                                │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12]                                                                                                                                                                                                                             │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13]                                                                                                                                                                                                                          │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14]                                                                                                                                                                                                                       │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]                                                                                                                                                                                                                    │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]                                                                                                                                                                                                                 │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]                                                                                                                                                                                                              │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]                                                                                                                                                                                                           │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]                                                                                                                                                                                                        │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]                                                                                                                                                                                                     │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]                                                                                                                                                                                                  │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22]                                                                                                                                                                                               │
-│ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]                                                                                                                                                                                            │
-│ [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]                                                                                                                                                                                         │
-│ [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]                                                                                                                                                                                      │
-│ [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]                                                                                                                                                                                   │
-│ [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]                                                                                                                                                                                │
-│ [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]                                                                                                                                                                             │
-│ [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]                                                                                                                                                                          │
-│ [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]                                                                                                                                                                       │
-│ [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]                                                                                                                                                                    │
-│ [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]                                                                                                                                                                 │
-│ [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]                                                                                                                                                              │
-│ [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,34]                                                                                                                                                           │
-│ [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,34,35]                                                                                                                                                        │
-│ [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,34,35,36]                                                                                                                                                     │
-│ [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,34,35,36,37]                                                                                                                                                  │
-│ [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,34,35,36,37,38]                                                                                                                                               │
-│ [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,34,35,36,37,38,39]                                                                                                                                            │
-│ [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,34,35,36,37,38,39,40]                                                                                                                                         │
-│ [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,34,35,36,37,38,39,40,41]                                                                                                                                      │
-│ [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,34,35,36,37,38,39,40,41,42]                                                                                                                                   │
-│ [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,34,35,36,37,38,39,40,41,42,43]                                                                                                                                │
-│ [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,34,35,36,37,38,39,40,41,42,43,44]                                                                                                                             │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45]                                                                                                                          │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46]                                                                                                                       │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47]                                                                                                                    │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48]                                                                                                                 │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49]                                                                                                              │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50]                                                                                                           │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51]                                                                                                        │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52]                                                                                                     │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53]                                                                                                  │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54]                                                                                               │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55]                                                                                            │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56]                                                                                         │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57]                                                                                      │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58]                                                                                   │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59]                                                                                │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60]                                                                             │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61]                                                                          │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62]                                                                       │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63]                                                                    │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64]                                                                 │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65]                                                              │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66]                                                           │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67]                                                        │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68]                                                     │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69]                                                  │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70]                                               │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71]                                            │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72]                                         │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73]                                      │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74]                                   │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75]                                │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76]                             │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77]                          │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78]                       │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79]                    │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]                 │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81]              │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82]           │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83]        │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84]     │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85]  │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97] │
-│ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98] │
-└────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+     ┌─range(number)──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────�
+  1. │ []                                                                                                                                                                                                                                                         │
+  2. │ [0]                                                                                                                                                                                                                                                        │
+  3. │ [0,1]                                                                                                                                                                                                                                                      │
+  4. │ [0,1,2]                                                                                                                                                                                                                                                    │
+  5. │ [0,1,2,3]                                                                                                                                                                                                                                                  │
+  6. │ [0,1,2,3,4]                                                                                                                                                                                                                                                │
+  7. │ [0,1,2,3,4,5]                                                                                                                                                                                                                                              │
+  8. │ [0,1,2,3,4,5,6]                                                                                                                                                                                                                                            │
+  9. │ [0,1,2,3,4,5,6,7]                                                                                                                                                                                                                                          │
+ 10. │ [0,1,2,3,4,5,6,7,8]                                                                                                                                                                                                                                        │
+ 11. │ [0,1,2,3,4,5,6,7,8,9]                                                                                                                                                                                                                                      │
+ 12. │ [0,1,2,3,4,5,6,7,8,9,10]                                                                                                                                                                                                                                   │
+ 13. │ [0,1,2,3,4,5,6,7,8,9,10,11]                                                                                                                                                                                                                                │
+ 14. │ [0,1,2,3,4,5,6,7,8,9,10,11,12]                                                                                                                                                                                                                             │
+ 15. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13]                                                                                                                                                                                                                          │
+ 16. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14]                                                                                                                                                                                                                       │
+ 17. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15]                                                                                                                                                                                                                    │
+ 18. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16]                                                                                                                                                                                                                 │
+ 19. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]                                                                                                                                                                                                              │
+ 20. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]                                                                                                                                                                                                           │
+ 21. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19]                                                                                                                                                                                                        │
+ 22. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20]                                                                                                                                                                                                     │
+ 23. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21]                                                                                                                                                                                                  │
+ 24. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22]                                                                                                                                                                                               │
+ 25. │ [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23]                                                                                                                                                                                            │
+ 26. │ [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]                                                                                                                                                                                         │
+ 27. │ [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]                                                                                                                                                                                      │
+ 28. │ [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]                                                                                                                                                                                   │
+ 29. │ [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]                                                                                                                                                                                │
+ 30. │ [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]                                                                                                                                                                             │
+ 31. │ [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]                                                                                                                                                                          │
+ 32. │ [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]                                                                                                                                                                       │
+ 33. │ [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]                                                                                                                                                                    │
+ 34. │ [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]                                                                                                                                                                 │
+ 35. │ [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]                                                                                                                                                              │
+ 36. │ [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,34]                                                                                                                                                           │
+ 37. │ [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,34,35]                                                                                                                                                        │
+ 38. │ [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,34,35,36]                                                                                                                                                     │
+ 39. │ [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,34,35,36,37]                                                                                                                                                  │
+ 40. │ [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,34,35,36,37,38]                                                                                                                                               │
+ 41. │ [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,34,35,36,37,38,39]                                                                                                                                            │
+ 42. │ [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,34,35,36,37,38,39,40]                                                                                                                                         │
+ 43. │ [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,34,35,36,37,38,39,40,41]                                                                                                                                      │
+ 44. │ [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,34,35,36,37,38,39,40,41,42]                                                                                                                                   │
+ 45. │ [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,34,35,36,37,38,39,40,41,42,43]                                                                                                                                │
+ 46. │ [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,34,35,36,37,38,39,40,41,42,43,44]                                                                                                                             │
+ 47. │ [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,34,35,36,37,38,39,40,41,42,43,44,45]                                                                                                                          │
+ 48. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46]                                                                                                                       │
+ 49. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47]                                                                                                                    │
+ 50. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48]                                                                                                                 │
+ 51. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49]                                                                                                              │
+ 52. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50]                                                                                                           │
+ 53. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51]                                                                                                        │
+ 54. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52]                                                                                                     │
+ 55. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53]                                                                                                  │
+ 56. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54]                                                                                               │
+ 57. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55]                                                                                            │
+ 58. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56]                                                                                         │
+ 59. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57]                                                                                      │
+ 60. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58]                                                                                   │
+ 61. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59]                                                                                │
+ 62. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60]                                                                             │
+ 63. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61]                                                                          │
+ 64. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62]                                                                       │
+ 65. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63]                                                                    │
+ 66. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64]                                                                 │
+ 67. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65]                                                              │
+ 68. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66]                                                           │
+ 69. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67]                                                        │
+ 70. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68]                                                     │
+ 71. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69]                                                  │
+ 72. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70]                                               │
+ 73. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71]                                            │
+ 74. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72]                                         │
+ 75. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73]                                      │
+ 76. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74]                                   │
+ 77. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75]                                │
+ 78. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76]                             │
+ 79. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77]                          │
+ 80. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78]                       │
+ 81. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79]                    │
+ 82. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80]                 │
+ 83. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81]              │
+ 84. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82]           │
+ 85. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83]        │
+ 86. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84]     │
+ 87. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85]  │
+ 88. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86] │
+ 89. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87] │
+ 90. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88] │
+ 91. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89] │
+ 92. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90] │
+ 93. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91] │
+ 94. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92] │
+ 95. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93] │
+ 96. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94] │
+ 97. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95] │
+ 98. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96] │
+ 99. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97] │
+100. │ [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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98] │
+     └────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
diff --git a/tests/queries/0_stateless/00700_decimal_arithm.reference b/tests/queries/0_stateless/00700_decimal_arithm.reference
index 811946c87e0..109c0632fb1 100644
--- a/tests/queries/0_stateless/00700_decimal_arithm.reference
+++ b/tests/queries/0_stateless/00700_decimal_arithm.reference
@@ -10,18 +10,18 @@
 63	21	-42	882	-882	2	0	2	0
 63	21	-42	882	-882	2	0	2	0
 1.00305798474369219219752355409390731264	-0.16305798474369219219752355409390731264	1.490591730234615865843651857942052864	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	0.02	0.005
-63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
-63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
-63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2.02	0.505
-63.42	21.42	-41.58	890.82	-890.82	2.02	0.5	2.02	0.5
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2	0
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2	0
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.505	2	0
+63.42	21.42	-41.58	890.82	-890.82	2.02	0.5	2	0
 63	-21	42	882	-882	0	2	0	2
 63	-21	42	882	-882	0	2	0	2
 63	-21	42	882	-882	0	2	0	2
 1.00305798474369219219752355409390731264	0.16305798474369219219752355409390731264	-1.490591730234615865843651857942052864	-1.38847100762815390390123822295304634368	1.38847100762815390390123822295304634368	-0.00000000000000000000000000000000000001	0.00000000000000000000000000000000000001
-63.42	-21.42	41.58	890.82	-890.82	0.495	1.98	0.495	1.98
+63.42	-21.42	41.58	890.82	-890.82	0.495	1.98	0	1
 63.42	-21.42	41.58	890.82	-890.82
-63.42	-21.42	41.58	890.82	-890.82	0.495049504950495049	1.980198019801980198	0.495049504950495049	1.980198019801980198
-63.42	-21.42	41.58	890.82	-890.82	0.49	1.98	0.49	1.98
+63.42	-21.42	41.58	890.82	-890.82	0.495049504950495049	1.980198019801980198	0	1
+63.42	-21.42	41.58	890.82	-890.82	0.49	1.98	0	1
 -42	42	42	42	0.42	0.42	0.42	42.42	42.42	42.42
 0	0	0	0	0	0	0	0	0	0
 42	-42	-42	-42	-0.42	-0.42	-0.42	-42.42	-42.42	-42.42
diff --git a/tests/queries/0_stateless/00722_inner_join.reference b/tests/queries/0_stateless/00722_inner_join.reference
index b5e8a77a20d..22e099829ae 100644
--- a/tests/queries/0_stateless/00722_inner_join.reference
+++ b/tests/queries/0_stateless/00722_inner_join.reference
@@ -1,39 +1,39 @@
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─x──────┬─name─�
-│ system │ one  │
-└────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─x──────┬─name─�
-│ system │ one  │
-└────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─db.x───┬─name─�
-│ system │ one  │
-└────────┴──────┘
-┌─db.name─┬─name─�
-│ system  │ one  │
-└─────────┴──────┘
-┌─db.name─┬─name─�
-│ system  │ one  │
-└─────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
-┌─database─┬─name─�
-│ system   │ one  │
-└──────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─x──────┬─name─�
+1. │ system │ one  │
+   └────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─x──────┬─name─�
+1. │ system │ one  │
+   └────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─db.x───┬─name─�
+1. │ system │ one  │
+   └────────┴──────┘
+   ┌─db.name─┬─name─�
+1. │ system  │ one  │
+   └─────────┴──────┘
+   ┌─db.name─┬─name─�
+1. │ system  │ one  │
+   └─────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
+   ┌─database─┬─name─�
+1. │ system   │ one  │
+   └──────────┴──────┘
 2
 2
 2
diff --git a/tests/queries/0_stateless/00725_comment_columns_long.sql b/tests/queries/0_stateless/00725_comment_columns_long.sql
index 139f8ba006f..068f35b2e40 100644
--- a/tests/queries/0_stateless/00725_comment_columns_long.sql
+++ b/tests/queries/0_stateless/00725_comment_columns_long.sql
@@ -1,5 +1,6 @@
 -- Tags: long, no-replicated-database
 -- Tag no-replicated-database: Unsupported type of ALTER query
+SET output_format_pretty_row_numbers = 0;
 
 DROP TABLE IF EXISTS check_query_comment_column;
 
diff --git a/tests/queries/0_stateless/00730_unicode_terminal_format.reference b/tests/queries/0_stateless/00730_unicode_terminal_format.reference
index fdfcfd5ed1d..0bf728b0743 100644
--- a/tests/queries/0_stateless/00730_unicode_terminal_format.reference
+++ b/tests/queries/0_stateless/00730_unicode_terminal_format.reference
@@ -1,88 +1,88 @@
-���������������┳���������������������������������������������┓
-┃ c1           ┃ c2                                          ┃
-┡��������������╇���������������������������������������������┩
-│ Здрав�твуйте │ Этот код можно отредактировать и запу�тить! │
-└──────────────┴─────────────────────────────────────────────┘
-�������┳������������������������������������┓
-┃ c1   ┃ c2                                 ┃
-┡������╇������������������������������������┩
-│ 你好 │ 这段代�是�以编辑并且能够�行的� │
-└──────┴────────────────────────────────────┘
-�������┳����������������������������������������┓
-┃ c1   ┃ c2                                     ┃
-┡������╇����������������������������������������┩
-│ Hola │ ¡Este código es editable y ejecutable! │
-└──────┴────────────────────────────────────────┘
-����������┳����������������������������������������┓
-┃ c1      ┃ c2                                     ┃
-┡���������╇����������������������������������������┩
-│ Bonjour │ Ce code est modifiable et exécutable ! │
-└─────────┴────────────────────────────────────────┘
-�������┳���������������������������������������������┓
-┃ c1   ┃ c2                                          ┃
-┡������╇���������������������������������������������┩
-│ Ciao │ Questo codice è modificabile ed eseguibile! │
-└──────┴─────────────────────────────────────────────┘
-�������������┳������������������������������������┓
-┃ c1         ┃ c2                                 ┃
-┡������������╇������������������������������������┩
-│ �ん��� │ ��コード�編集��実行出���� │
-└────────────┴────────────────────────────────────┘
-�������������┳����������������������������������������������┓
-┃ c1         ┃ c2                                           ┃
-┡������������╇����������������������������������������������┩
-│ 안녕하세요 │ 여기�서 코드를 수정하고 실행할 수 있습니다! │
-└────────────┴──────────────────────────────────────────────┘
-��������┳����������������������������������������┓
-┃ c1    ┃ c2                                     ┃
-┡�������╇����������������������������������������┩
-│ Cześć │ Ten kod można edytować oraz uruchomić! │
-└───────┴────────────────────────────────────────┘
-������┳��������������������������������������┓
-┃ c1  ┃ c2                                   ┃
-┡�����╇��������������������������������������┩
-│ Olá │ Este código é editável e executável! │
-└─────┴──────────────────────────────────────┘
-�����������┳����������������������������������������┓
-┃ c1       ┃ c2                                     ┃
-┡����������╇����������������������������������������┩
-│ Chào bạn │ Bạn có thể edit và run code trực tiếp! │
-└──────────┴────────────────────────────────────────┘
-��������┳����������������������������������������������������┓
-┃ c1    ┃ c2                                                 ┃
-┡�������╇����������������������������������������������������┩
-│ Hallo │ Dieser Code kann bearbeitet und ausgeführt werden! │
-└───────┴────────────────────────────────────────────────────┘
-������┳����������������������������������������┓
-┃ c1  ┃ c2                                     ┃
-┡�����╇����������������������������������������┩
-│ Hej │ Den här koden kan redigeras och köras! │
-└─────┴────────────────────────────────────────┘
-�������┳������������������������������������┓
-┃ c1   ┃ c2                                 ┃
-┡������╇������������������������������������┩
-│ Ahoj │ Tento kód můžete upravit a spustit │
-└──────┴────────────────────────────────────┘
-��������������┳�����������������������┓
-┃ c1          ┃ c2                    ┃
-┡�������������╇�����������������������┩
-│ Tabs 	 Tabs │ Non-first 	 Tabs │
-└─────────────┴───────────────────────┘
-��������������������������������������┳�������������������������������������������������������������������������������������┓
-┃ c1                                  ┃ c2                                                                                  ┃
-┡�������������������������������������╇�������������������������������������������������������������������������������������┩
-│ Control characters  with zero width │ Invalid UTF-8 which eats pending characters ð, or invalid by itself € with zero width │
-└─────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────┘
-�������������������┳������������������������┓
-┃ c1               ┃ c2                     ┃
-┡������������������╇������������������������┩
-│ Russian ё and ё  │ Zero bytes   in middle │
-└──────────────────┴────────────────────────┘
-�����������������┳���������������┓
-┃ 'Tabs \t Tabs' ┃ 'Long\tTitle' ┃
-┡����������������╇���������������┩
-│ Tabs 	 Tabs    │ Long	Title    │
-└────────────────┴───────────────┘
+   ���������������┳���������������������������������������������┓
+   ┃ c1           ┃ c2                                          ┃
+   ┡��������������╇���������������������������������������������┩
+1. │ Здрав�твуйте │ Этот код можно отредактировать и запу�тить! │
+   └──────────────┴─────────────────────────────────────────────┘
+   �������┳������������������������������������┓
+   ┃ c1   ┃ c2                                 ┃
+   ┡������╇������������������������������������┩
+2. │ 你好 │ 这段代�是�以编辑并且能够�行的� │
+   └──────┴────────────────────────────────────┘
+   �������┳����������������������������������������┓
+   ┃ c1   ┃ c2                                     ┃
+   ┡������╇����������������������������������������┩
+3. │ Hola │ ¡Este código es editable y ejecutable! │
+   └──────┴────────────────────────────────────────┘
+   ����������┳����������������������������������������┓
+   ┃ c1      ┃ c2                                     ┃
+   ┡���������╇����������������������������������������┩
+4. │ Bonjour │ Ce code est modifiable et exécutable ! │
+   └─────────┴────────────────────────────────────────┘
+   �������┳���������������������������������������������┓
+   ┃ c1   ┃ c2                                          ┃
+   ┡������╇���������������������������������������������┩
+5. │ Ciao │ Questo codice è modificabile ed eseguibile! │
+   └──────┴─────────────────────────────────────────────┘
+   �������������┳������������������������������������┓
+   ┃ c1         ┃ c2                                 ┃
+   ┡������������╇������������������������������������┩
+6. │ �ん��� │ ��コード�編集��実行出���� │
+   └────────────┴────────────────────────────────────┘
+   �������������┳����������������������������������������������┓
+   ┃ c1         ┃ c2                                           ┃
+   ┡������������╇����������������������������������������������┩
+7. │ 안녕하세요 │ 여기�서 코드를 수정하고 실행할 수 있습니다! │
+   └────────────┴──────────────────────────────────────────────┘
+   ��������┳����������������������������������������┓
+   ┃ c1    ┃ c2                                     ┃
+   ┡�������╇����������������������������������������┩
+8. │ Cześć │ Ten kod można edytować oraz uruchomić! │
+   └───────┴────────────────────────────────────────┘
+   ������┳��������������������������������������┓
+   ┃ c1  ┃ c2                                   ┃
+   ┡�����╇��������������������������������������┩
+9. │ Olá │ Este código é editável e executável! │
+   └─────┴──────────────────────────────────────┘
+    �����������┳����������������������������������������┓
+    ┃ c1       ┃ c2                                     ┃
+    ┡����������╇����������������������������������������┩
+10. │ Chào bạn │ Bạn có thể edit và run code trực tiếp! │
+    └──────────┴────────────────────────────────────────┘
+    ��������┳����������������������������������������������������┓
+    ┃ c1    ┃ c2                                                 ┃
+    ┡�������╇����������������������������������������������������┩
+11. │ Hallo │ Dieser Code kann bearbeitet und ausgeführt werden! │
+    └───────┴────────────────────────────────────────────────────┘
+    ������┳����������������������������������������┓
+    ┃ c1  ┃ c2                                     ┃
+    ┡�����╇����������������������������������������┩
+12. │ Hej │ Den här koden kan redigeras och köras! │
+    └─────┴────────────────────────────────────────┘
+    �������┳������������������������������������┓
+    ┃ c1   ┃ c2                                 ┃
+    ┡������╇������������������������������������┩
+13. │ Ahoj │ Tento kód můžete upravit a spustit │
+    └──────┴────────────────────────────────────┘
+    ��������������┳�����������������������┓
+    ┃ c1          ┃ c2                    ┃
+    ┡�������������╇�����������������������┩
+14. │ Tabs 	 Tabs │ Non-first 	 Tabs │
+    └─────────────┴───────────────────────┘
+    ��������������������������������������┳�������������������������������������������������������������������������������������┓
+    ┃ c1                                  ┃ c2                                                                                  ┃
+    ┡�������������������������������������╇�������������������������������������������������������������������������������������┩
+15. │ Control characters  with zero width │ Invalid UTF-8 which eats pending characters ð, or invalid by itself € with zero width │
+    └─────────────────────────────────────┴─────────────────────────────────────────────────────────────────────────────────────┘
+    �������������������┳������������������������┓
+    ┃ c1               ┃ c2                     ┃
+    ┡������������������╇������������������������┩
+16. │ Russian ё and ё  │ Zero bytes   in middle │
+    └──────────────────┴────────────────────────┘
+   �����������������┳���������������┓
+   ┃ 'Tabs \t Tabs' ┃ 'Long\tTitle' ┃
+   ┡����������������╇���������������┩
+1. │ Tabs 	 Tabs    │ Long	Title    │
+   └────────────────┴───────────────┘
 Row 1:
 ──────
 '你好': 你好
diff --git a/tests/queries/0_stateless/00751_default_databasename_for_view.reference b/tests/queries/0_stateless/00751_default_databasename_for_view.reference
index 4899e230924..2cd5019defa 100644
--- a/tests/queries/0_stateless/00751_default_databasename_for_view.reference
+++ b/tests/queries/0_stateless/00751_default_databasename_for_view.reference
@@ -6,8 +6,8 @@ CREATE MATERIALIZED VIEW default.t_mv_00751
 )
 ENGINE = MergeTree
 ORDER BY date
-SETTINGS index_granularity = 8192 AS
-SELECT
+SETTINGS index_granularity = 8192
+AS SELECT
     date,
     platform,
     app
diff --git a/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.sql b/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.sql
index a4bdbd5653c..998ff2f54d3 100644
--- a/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.sql
+++ b/tests/queries/0_stateless/00752_low_cardinality_lambda_argument.sql
@@ -1,3 +1,4 @@
+set allow_suspicious_low_cardinality_types=1;
 drop table if exists lc_lambda;
 create table lc_lambda (arr Array(LowCardinality(UInt64))) engine = Memory;
 insert into lc_lambda select range(number) from system.numbers limit 10;
diff --git a/tests/queries/0_stateless/00752_low_cardinality_left_array_join.sql b/tests/queries/0_stateless/00752_low_cardinality_left_array_join.sql
index 1c19700e34d..2d65f01a1b9 100644
--- a/tests/queries/0_stateless/00752_low_cardinality_left_array_join.sql
+++ b/tests/queries/0_stateless/00752_low_cardinality_left_array_join.sql
@@ -1,3 +1,4 @@
+set allow_suspicious_low_cardinality_types=1;
 drop table if exists lc_left_aj;
 CREATE TABLE lc_left_aj
 (
diff --git a/tests/queries/0_stateless/00753_alter_attach.reference b/tests/queries/0_stateless/00753_alter_attach.reference
index b0d2a3d031c..301d5ebf451 100644
--- a/tests/queries/0_stateless/00753_alter_attach.reference
+++ b/tests/queries/0_stateless/00753_alter_attach.reference
@@ -22,3 +22,19 @@
 2	2
 1	1
 1	1
+1	1
+2	2
+3	3
+2	2
+3	3
+1	1
+2	2
+3	3
+1	1
+2	2
+3	3
+2	2
+3	3
+1	1
+2	2
+3	3
diff --git a/tests/queries/0_stateless/00753_alter_attach.sql b/tests/queries/0_stateless/00753_alter_attach.sql
index 299d0dd995f..7f2b1214613 100644
--- a/tests/queries/0_stateless/00753_alter_attach.sql
+++ b/tests/queries/0_stateless/00753_alter_attach.sql
@@ -90,3 +90,46 @@ OPTIMIZE TABLE partition_all2 PARTITION ALL; -- { serverError 344 }
 
 DROP TABLE partition_all;
 DROP TABLE partition_all2;
+
+-- test ATTACH ALL
+CREATE TABLE partition_attach_all (x UInt64, p UInt8) ENGINE = MergeTree ORDER BY x PARTITION BY p;
+INSERT INTO partition_attach_all VALUES (1, 1), (2, 2), (3, 3);
+
+ALTER TABLE partition_attach_all DETACH PARTITION ALL;
+SELECT * FROM partition_attach_all ORDER BY x;
+ALTER TABLE partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM partition_attach_all ORDER BY x;
+
+ALTER TABLE partition_attach_all DETACH PARTITION 1;
+SELECT * FROM partition_attach_all ORDER BY x;
+ALTER TABLE partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM partition_attach_all ORDER BY x;
+
+ALTER TABLE partition_attach_all DROP PARTITION ALL;
+SELECT * FROM partition_attach_all ORDER BY x;
+ALTER TABLE partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM partition_attach_all ORDER BY x;
+
+CREATE TABLE replicated_partition_attach_all (x UInt64, p UInt8)
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/test_00753_{database}/replicated_partition_attach_all', '1')
+        ORDER BY x
+        PARTITION BY p;
+INSERT INTO replicated_partition_attach_all VALUES (1, 1), (2, 2), (3, 3);
+
+ALTER TABLE replicated_partition_attach_all DETACH PARTITION ALL;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+ALTER TABLE replicated_partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+
+ALTER TABLE replicated_partition_attach_all DETACH PARTITION 1;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+ALTER TABLE replicated_partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+
+ALTER TABLE replicated_partition_attach_all DROP PARTITION ALL;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+ALTER TABLE replicated_partition_attach_all ATTACH PARTITION ALL;
+SELECT * FROM replicated_partition_attach_all ORDER BY x;
+
+DROP TABLE partition_attach_all;
+DROP TABLE replicated_partition_attach_all;
diff --git a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
index 51818228913..4613576cf4e 100644
--- a/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
+++ b/tests/queries/0_stateless/00753_system_columns_and_system_tables_long.sql
@@ -1,4 +1,5 @@
 -- Tags: long, no-s3-storage, no-random-merge-tree-settings
+SET output_format_pretty_row_numbers = 0;
 
 DROP TABLE IF EXISTS check_system_tables;
 
diff --git a/tests/queries/0_stateless/00757_enum_defaults.reference b/tests/queries/0_stateless/00757_enum_defaults.reference
index 6bf5cc85e87..4b15bd17e44 100644
--- a/tests/queries/0_stateless/00757_enum_defaults.reference
+++ b/tests/queries/0_stateless/00757_enum_defaults.reference
@@ -1,9 +1,3 @@
-iphone	1
-
-iphone	1
-iphone	1
-
-\N	1
 a
 b
 1
diff --git a/tests/queries/0_stateless/00757_enum_defaults.sql b/tests/queries/0_stateless/00757_enum_defaults.sql
index 71edc83abe2..45dc9b80cb7 100644
--- a/tests/queries/0_stateless/00757_enum_defaults.sql
+++ b/tests/queries/0_stateless/00757_enum_defaults.sql
@@ -1,6 +1,3 @@
-select os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
-select toNullable(os_name) AS os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
-
 DROP TABLE IF EXISTS auto_assign_enum;
 DROP TABLE IF EXISTS auto_assign_enum1;
 DROP TABLE IF EXISTS auto_assign_enum2;
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const.reference b/tests/queries/0_stateless/00757_enum_defaults_const.reference
new file mode 100644
index 00000000000..56ead34ad3b
--- /dev/null
+++ b/tests/queries/0_stateless/00757_enum_defaults_const.reference
@@ -0,0 +1,6 @@
+iphone	1
+
+iphone	1
+iphone	1
+
+\N	1
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const.sql b/tests/queries/0_stateless/00757_enum_defaults_const.sql
new file mode 100644
index 00000000000..64271a37473
--- /dev/null
+++ b/tests/queries/0_stateless/00757_enum_defaults_const.sql
@@ -0,0 +1,3 @@
+SET allow_experimental_analyzer=0;
+select os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
+select toNullable(os_name) AS os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.reference b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.reference
new file mode 100644
index 00000000000..6895acffed1
--- /dev/null
+++ b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.reference
@@ -0,0 +1,6 @@
+iphone	1
+
+iphone	1
+iphone	1
+
+iphone	1
diff --git a/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql
new file mode 100644
index 00000000000..bf079539019
--- /dev/null
+++ b/tests/queries/0_stateless/00757_enum_defaults_const_analyzer.sql
@@ -0,0 +1,3 @@
+SET allow_experimental_analyzer=1;
+select os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
+select toNullable(os_name) AS os_name, count() from (SELECT CAST('iphone' AS Enum8('iphone' = 1, 'android' = 2)) AS os_name) group by os_name WITH TOTALS;
diff --git a/tests/queries/0_stateless/00765_locate.reference b/tests/queries/0_stateless/00765_locate.reference
new file mode 100644
index 00000000000..3b066c0d68b
--- /dev/null
+++ b/tests/queries/0_stateless/00765_locate.reference
@@ -0,0 +1,7 @@
+-- negative tests
+-- test mysql compatibility setting
+0
+0
+3
+-- the function name needs to be case-insensitive for historical reasons
+0
diff --git a/tests/queries/0_stateless/00765_locate.sql b/tests/queries/0_stateless/00765_locate.sql
new file mode 100644
index 00000000000..3467ebd4249
--- /dev/null
+++ b/tests/queries/0_stateless/00765_locate.sql
@@ -0,0 +1,15 @@
+SET send_logs_level = 'fatal';
+
+SELECT '-- negative tests';
+SELECT locate(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT locate(1, 'abc'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT locate('abc', 1); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT locate('abc', 'abc', 'abc'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT '-- test mysql compatibility setting';
+SELECT locate('abcabc', 'ca');
+SELECT locate('abcabc', 'ca') SETTINGS function_locate_has_mysql_compatible_argument_order = true;
+SELECT locate('abcabc', 'ca') SETTINGS function_locate_has_mysql_compatible_argument_order = false;
+
+SELECT '-- the function name needs to be case-insensitive for historical reasons';
+SELECT LoCaTe('abcabc', 'ca');
diff --git a/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference b/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
index 285b9a62d20..6d31168c2b7 100644
--- a/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
+++ b/tests/queries/0_stateless/00765_sql_compatibility_aliases.reference
@@ -4,7 +4,6 @@ foo
 FOO
 baz
 zzz
-2
 fo
 oo
 o
diff --git a/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql b/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
index da0eb9bea6d..995aaef9ea5 100644
--- a/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
+++ b/tests/queries/0_stateless/00765_sql_compatibility_aliases.sql
@@ -6,7 +6,6 @@ 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);
 select mid('foo', 3);
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 01a2f53bf93..0b289ad7c1d 100644
--- a/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
+++ b/tests/queries/0_stateless/00804_test_delta_codec_compression.sql
@@ -16,6 +16,8 @@ CREATE TABLE default_codec_synthetic
     id UInt64 Codec(ZSTD(3))
 ) ENGINE MergeTree() ORDER BY tuple() SETTINGS min_bytes_for_wide_part = 0, compress_marks = false, compress_primary_key = false, ratio_of_defaults_for_sparse_serialization = 1;
 
+set max_insert_threads = 1;
+
 INSERT INTO delta_codec_synthetic SELECT number FROM system.numbers LIMIT 5000000;
 INSERT INTO default_codec_synthetic SELECT number FROM system.numbers LIMIT 5000000;
 
diff --git a/tests/queries/0_stateless/00808_not_optimize_predicate.reference b/tests/queries/0_stateless/00808_not_optimize_predicate.reference
index 3110b82db89..647c6d91890 100644
--- a/tests/queries/0_stateless/00808_not_optimize_predicate.reference
+++ b/tests/queries/0_stateless/00808_not_optimize_predicate.reference
@@ -24,6 +24,6 @@ FROM
         n,
         finalizeAggregation(s)
     FROM test_00808_push_down_with_finalizeAggregation
-    PREWHERE (n <= 5) AND (n >= 2)
+    WHERE (n <= 5) AND (n >= 2)
 )
 WHERE (n >= 2) AND (n <= 5)
diff --git a/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference b/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference
index 3acae55e846..e9bdbc4f0bf 100644
--- a/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference
+++ b/tests/queries/0_stateless/00813_parse_date_time_best_effort_more.reference
@@ -1,22 +1,22 @@
- s                                               a                     b
+     s                                               a                     b
 
- 24.12.2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-12-2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24.12.18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-12-18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-Dec-18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24/DEC/18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24/DEC/2018                   2018-12-24 00:00:00   2018-12-24 00:00:00 
- 01-OCT-2015                   2015-10-01 00:00:00   2015-10-01 00:00:00 
- 24.12.2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-12-2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24.12.18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-12-18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24-Dec-18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24/DEC/18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
- 24/DEC/2018                   2018-12-24 00:00:00   2018-12-24 00:00:00 
- 01-OCT-2015                   2015-10-01 00:00:00   2015-10-01 00:00:00 
- 24.12.18 010203               2018-12-24 01:02:03   2018-12-24 01:02:03 
- 24.12.18 01:02:03             2018-12-24 01:02:03   2018-12-24 01:02:03 
- 24.DEC.18T01:02:03.000+0300   2018-12-23 22:02:03   2018-12-23 22:02:03 
- 01-September-2018 11:22       2018-09-01 11:22:00   2018-09-01 11:22:00 
+ 1.  24.12.2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 2.  24-12-2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 3.  24.12.18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 4.  24-12-18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 5.  24-Dec-18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 6.  24/DEC/18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 7.  24/DEC/2018                   2018-12-24 00:00:00   2018-12-24 00:00:00 
+ 8.  01-OCT-2015                   2015-10-01 00:00:00   2015-10-01 00:00:00 
+ 9.  24.12.2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
+10.  24-12-2018                    2018-12-24 00:00:00   2018-12-24 00:00:00 
+11.  24.12.18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
+12.  24-12-18                      2018-12-24 00:00:00   2018-12-24 00:00:00 
+13.  24-Dec-18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
+14.  24/DEC/18                     2018-12-24 00:00:00   2018-12-24 00:00:00 
+15.  24/DEC/2018                   2018-12-24 00:00:00   2018-12-24 00:00:00 
+16.  01-OCT-2015                   2015-10-01 00:00:00   2015-10-01 00:00:00 
+17.  24.12.18 010203               2018-12-24 01:02:03   2018-12-24 01:02:03 
+18.  24.12.18 01:02:03             2018-12-24 01:02:03   2018-12-24 01:02:03 
+19.  24.DEC.18T01:02:03.000+0300   2018-12-23 22:02:03   2018-12-23 22:02:03 
+20.  01-September-2018 11:22       2018-09-01 11:22:00   2018-09-01 11:22:00 
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 41e0d8ea43a..0194a3c7f09 100644
--- a/tests/queries/0_stateless/00818_inner_join_bug_3567.reference
+++ b/tests/queries/0_stateless/00818_inner_join_bug_3567.reference
@@ -1,19 +1,19 @@
-┌─a─┬──────────b─�
-│ a │ 2018-01-01 │
-│ b │ 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 │
-└───┴────────────┴───┴────────────┴───┘
+   ┌─a─┬──────────b─�
+1. │ a │ 2018-01-01 │
+2. │ b │ 2018-01-01 │
+3. │ c │ 2018-01-01 │
+   └───┴────────────┘
+   ┌─c─┬─table2.a─┬──────────d─┬─a─┬──────────b─�
+1. │ B │ b        │ 2018-01-01 │ B │ 2018-01-01 │
+2. │ C │ c        │ 2018-01-01 │ C │ 2018-01-01 │
+3. │ D │ d        │ 2018-01-01 │ D │ 2018-01-01 │
+   └───┴──────────┴────────────┴───┴────────────┘
+   ┌─a─┬──────────b─┬─c─┬──────────d─┬─c─�
+1. │ a │ 2018-01-01 │   │ 1970-01-01 │   │
+2. │ b │ 2018-01-01 │ B │ 2018-01-01 │ B │
+3. │ c │ 2018-01-01 │ C │ 2018-01-01 │ C │
+   └───┴────────────┴───┴────────────┴───┘
+   ┌─a─┬──────────b─┬─c─┬──────────d─┬─c─�
+1. │ b │ 2018-01-01 │ B │ 2018-01-01 │ B │
+2. │ 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 cc0b63f9def..2dec5ce3221 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,4 @@
+SET output_format_pretty_color = 1;
 SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
diff --git a/tests/queries/0_stateless/00820_multiple_joins.reference b/tests/queries/0_stateless/00820_multiple_joins.reference
index 3d7054bacfc..64f5e75a667 100644
--- a/tests/queries/0_stateless/00820_multiple_joins.reference
+++ b/tests/queries/0_stateless/00820_multiple_joins.reference
@@ -5,9 +5,9 @@
 0	0	0
 10	100	1000
 20	200	2000
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┬─t5.a─┬─t5.b─┬─t5.c─�
-│    0 │    0 │    0 │    0 │    0 │    0 │    0 │    0 │
-└──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
+   ┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┬─t5.a─┬─t5.b─┬─t5.c─�
+1. │    0 │    0 │    0 │    0 │    0 │    0 │    0 │    0 │
+   └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
 0	0	0	0
 6	6	60	60
 12	12	120	120
@@ -32,18 +32,18 @@
 6	6	60	60
 12	12	120	120
 18	18	180	180
-┌─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─┬────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─┬────c─�
+1. │    0 │    0 │    0 │    0 │    0 │
+2. │    6 │    6 │   60 │   60 │  600 │
+3. │   12 │   12 │  120 │  120 │ 1200 │
+4. │   18 │   18 │  180 │  180 │ 1800 │
+   └──────┴──────┴──────┴──────┴──────┘
+   ┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─�
+1. │    0 │    0 │    0 │    0 │    0 │
+2. │    6 │    6 │   60 │   60 │  600 │
+3. │   12 │   12 │  120 │  120 │ 1200 │
+4. │   18 │   18 │  180 │  180 │ 1800 │
+   └──────┴──────┴──────┴──────┴──────┘
 0	0	0	0	0	0	0
 6	6	60	60	66	66	120
 12	12	120	120	132	132	240
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 11755d6bc8b..8104f6e4490 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
@@ -5,9 +5,9 @@
 0	0	0
 10	100	1000
 20	200	2000
-┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┬─t5.a─┬─t5.b─┬─t5.c─�
-│    0 │    0 │    0 │    0 │    0 │    0 │    0 │    0 │
-└──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
+   ┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬─t3.c─┬─t5.a─┬─t5.b─┬─t5.c─�
+1. │    0 │    0 │    0 │    0 │    0 │    0 │    0 │    0 │
+   └──────┴──────┴──────┴──────┴──────┴──────┴──────┴──────┘
 0	0	0	0
 6	6	60	60
 12	12	120	120
@@ -32,18 +32,18 @@
 6	6	60	60
 12	12	120	120
 18	18	180	180
-┌─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─┬────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─┬────c─�
+1. │    0 │    0 │    0 │    0 │    0 │
+2. │    6 │    6 │   60 │   60 │  600 │
+3. │   12 │   12 │  120 │  120 │ 1200 │
+4. │   18 │   18 │  180 │  180 │ 1800 │
+   └──────┴──────┴──────┴──────┴──────┘
+   ┌─t1.a─┬─t2.a─┬─t2.b─┬─t3.b─┬────c─�
+1. │    0 │    0 │    0 │    0 │    0 │
+2. │    6 │    6 │   60 │   60 │  600 │
+3. │   12 │   12 │  120 │  120 │ 1200 │
+4. │   18 │   18 │  180 │  180 │ 1800 │
+   └──────┴──────┴──────┴──────┴──────┘
 0	0	0	0	0	0	0
 6	6	60	60	66	66	120
 12	12	120	120	132	132	240
diff --git a/tests/queries/0_stateless/00847_multiple_join_same_column.reference b/tests/queries/0_stateless/00847_multiple_join_same_column.reference
index 91bd62ca5a3..112289e1613 100644
--- a/tests/queries/0_stateless/00847_multiple_join_same_column.reference
+++ b/tests/queries/0_stateless/00847_multiple_join_same_column.reference
@@ -15,31 +15,31 @@ s.a: 0
 s.b: 0
 y.a: 0
 y.b: 0
-┌─t.a─┬─s.b─┬─s.a─┬─s.b─┬─y.a─┬─y.b─�
-│   1 │   1 │   1 │   1 │   1 │   1 │
-│   2 │   0 │   0 │   0 │   0 │   0 │
-└─────┴─────┴─────┴─────┴─────┴─────┘
-┌─t_a─�
-│   1 │
-│   2 │
-└─────┘
-┌─t.a─┬─s_a─�
-│   1 │   1 │
-│   2 │   0 │
-└─────┴─────┘
-┌─t.a─┬─t.a─┬─t_b─�
-│   1 │   1 │   1 │
-│   2 │   2 │   2 │
-└─────┴─────┴─────┘
-┌─s.a─┬─s.a─┬─s_b─┬─s.b─�
-│   1 │   1 │   1 │   1 │
-│   0 │   0 │   0 │   0 │
-└─────┴─────┴─────┴─────┘
-┌─y.a─┬─y.a─┬─y_b─┬─y.b─�
-│   1 │   1 │   1 │   1 │
-│   0 │   0 │   0 │   0 │
-└─────┴─────┴─────┴─────┘
-┌─t.a─┬─t_a─┬─s.a─┬─s_a─┬─y.a─┬─y_a─�
-│   1 │   1 │   1 │   1 │   1 │   1 │
-│   2 │   2 │   0 │   0 │   0 │   0 │
-└─────┴─────┴─────┴─────┴─────┴─────┘
+   ┌─t.a─┬─s.b─┬─s.a─┬─s.b─┬─y.a─┬─y.b─�
+1. │   1 │   1 │   1 │   1 │   1 │   1 │
+2. │   2 │   0 │   0 │   0 │   0 │   0 │
+   └─────┴─────┴─────┴─────┴─────┴─────┘
+   ┌─t_a─�
+1. │   1 │
+2. │   2 │
+   └─────┘
+   ┌─t.a─┬─s_a─�
+1. │   1 │   1 │
+2. │   2 │   0 │
+   └─────┴─────┘
+   ┌─t.a─┬─t.a─┬─t_b─�
+1. │   1 │   1 │   1 │
+2. │   2 │   2 │   2 │
+   └─────┴─────┴─────┘
+   ┌─s.a─┬─s.a─┬─s_b─┬─s.b─�
+1. │   1 │   1 │   1 │   1 │
+2. │   0 │   0 │   0 │   0 │
+   └─────┴─────┴─────┴─────┘
+   ┌─y.a─┬─y.a─┬─y_b─┬─y.b─�
+1. │   1 │   1 │   1 │   1 │
+2. │   0 │   0 │   0 │   0 │
+   └─────┴─────┴─────┴─────┘
+   ┌─t.a─┬─t_a─┬─s.a─┬─s_a─┬─y.a─┬─y_a─�
+1. │   1 │   1 │   1 │   1 │   1 │   1 │
+2. │   2 │   2 │   0 │   0 │   0 │   0 │
+   └─────┴─────┴─────┴─────┴─────┴─────┘
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 51bf5a2ede1..6530f691087 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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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 SETTINGS allow_experimental_analyzer = 1);
+    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/00873_t64_codec_date.reference b/tests/queries/0_stateless/00873_t64_codec_date.reference
new file mode 100644
index 00000000000..9353696610c
--- /dev/null
+++ b/tests/queries/0_stateless/00873_t64_codec_date.reference
@@ -0,0 +1,4 @@
+1970-01-01	1970-01-01	1950-01-01	1950-01-01
+1970-01-01	1970-01-01	1970-01-01	1970-01-01
+2149-06-06	2149-06-06	2149-06-06	2149-06-06
+2149-06-06	2149-06-06	2149-06-08	2149-06-08
diff --git a/tests/queries/0_stateless/00873_t64_codec_date.sql b/tests/queries/0_stateless/00873_t64_codec_date.sql
new file mode 100644
index 00000000000..c6e21baba12
--- /dev/null
+++ b/tests/queries/0_stateless/00873_t64_codec_date.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS t64;
+
+CREATE TABLE t64
+(
+    date16 Date,
+    t_date16 Date Codec(T64, ZSTD),
+    date_32 Date32,
+    t_date32 Date32 Codec(T64, ZSTD)
+) ENGINE MergeTree() ORDER BY tuple();
+
+INSERT INTO t64 values ('1970-01-01', '1970-01-01', '1970-01-01', '1970-01-01');
+INSERT INTO t64 values ('2149-06-06', '2149-06-06', '2149-06-06', '2149-06-06');
+INSERT INTO t64 values ('2149-06-08', '2149-06-08', '2149-06-08', '2149-06-08');
+INSERT INTO t64 values ('1950-01-01', '1950-01-01', '1950-01-01', '1950-01-01');
+
+SELECT * FROM t64 ORDER BY date_32;
+
+SELECT * FROM t64 WHERE date16 != t_date16;
+SELECT * FROM t64 WHERE date_32 != t_date32;
+
+OPTIMIZE TABLE t64 FINAL;
+
+SELECT * FROM t64 WHERE date16 != t_date16;
+SELECT * FROM t64 WHERE date_32 != t_date32;
+
+DROP TABLE t64;
diff --git a/tests/queries/0_stateless/00909_arrayEnumerateUniq.sql b/tests/queries/0_stateless/00909_arrayEnumerateUniq.sql
index 33097c99272..0bdb338e9d2 100644
--- a/tests/queries/0_stateless/00909_arrayEnumerateUniq.sql
+++ b/tests/queries/0_stateless/00909_arrayEnumerateUniq.sql
@@ -181,15 +181,15 @@ SELECT arrayEnumerateUniqRanked([1,2], 1, 2); -- { serverError 36 }
 SELECT arrayEnumerateUniqRanked([1,2], 1, 3, 4, 5); -- { serverError 36 }
 SELECT arrayEnumerateUniqRanked([1,2], 1, 3, [4], 5); -- { serverError 36 }
 SELECT arrayEnumerateDenseRanked([[[[[[[[[[42]]]]]]]]]]);
-SELECT arrayEnumerateUniqRanked('wat', [1,2]); -- { serverError 170 }
-SELECT arrayEnumerateUniqRanked(1, [1,2], 'boom'); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked(['\0'], -8363126); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked(-10, ['\0'], -8363126); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked(1, ['\0'], -8363126); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked(-101, ['\0']); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked(1.1, [10,20,10,30]); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked([10,20,10,30], 0.4); -- { serverError 170 }
-SELECT arrayEnumerateDenseRanked([10,20,10,30], 1.8); -- { serverError 170 }
+SELECT arrayEnumerateUniqRanked('wat', [1,2]); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateUniqRanked(1, [1,2], 'boom'); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked(['\0'], -8363126); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked(-10, ['\0'], -8363126); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked(1, ['\0'], -8363126); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked(-101, ['\0']); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked(1.1, [10,20,10,30]); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked([10,20,10,30], 0.4); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateDenseRanked([10,20,10,30], 1.8); -- { serverError BAD_ARGUMENTS }
 SELECT arrayEnumerateUniqRanked(1, [], 1000000000); -- { serverError 36 }
 
 
diff --git a/tests/queries/0_stateless/00916_create_or_replace_view.reference b/tests/queries/0_stateless/00916_create_or_replace_view.reference
index 50323e47556..66aefd5cf46 100644
--- a/tests/queries/0_stateless/00916_create_or_replace_view.reference
+++ b/tests/queries/0_stateless/00916_create_or_replace_view.reference
@@ -1,2 +1,2 @@
-CREATE VIEW default.t\n(\n    `number` UInt64\n) AS\nSELECT number\nFROM system.numbers
-CREATE VIEW default.t\n(\n    `next_number` UInt64\n) AS\nSELECT number + 1 AS next_number\nFROM system.numbers
+CREATE VIEW default.t\n(\n    `number` UInt64\n)\nAS SELECT number\nFROM system.numbers
+CREATE VIEW default.t\n(\n    `next_number` UInt64\n)\nAS SELECT number + 1 AS next_number\nFROM system.numbers
diff --git a/tests/queries/0_stateless/00918_json_functions.reference b/tests/queries/0_stateless/00918_json_functions.reference
index 5264d51fa73..078348cd20f 100644
--- a/tests/queries/0_stateless/00918_json_functions.reference
+++ b/tests/queries/0_stateless/00918_json_functions.reference
@@ -44,11 +44,14 @@ hello
 (-100,200,300)
 [-100,0,0]
 [-100,NULL,NULL]
+[-100,NULL,NULL]
 [0,200,0]
 [NULL,200,NULL]
+[NULL,200,NULL]
 -100
 200
 \N
+\N
 1
 Thursday
 Friday
@@ -209,11 +212,14 @@ hello
 (-100,200,300)
 [-100,0,0]
 [-100,NULL,NULL]
+[-100,NULL,NULL]
 [0,200,0]
 [NULL,200,NULL]
+[NULL,200,NULL]
 -100
 200
 \N
+\N
 1
 Thursday
 Friday
@@ -280,3 +286,9 @@ v
 --show error: type should be const string
 --show error: index type should be integer
 --show error: key of map type should be String
+\N
+\N
+Hello
+Hello
+Hello
+Hello
diff --git a/tests/queries/0_stateless/00918_json_functions.sql b/tests/queries/0_stateless/00918_json_functions.sql
index 16cc72f7fdc..3d30ce841ba 100644
--- a/tests/queries/0_stateless/00918_json_functions.sql
+++ b/tests/queries/0_stateless/00918_json_functions.sql
@@ -56,11 +56,14 @@ SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Float3
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Tuple(Int8, Float32, UInt16)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Int8)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(Int8))');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(LowCardinality(Nullable(Int8)))');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(UInt8)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(UInt8))');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(LowCardinality(Nullable(UInt8)))');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1, 'Int8');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 2, 'Int32');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'Nullable(Int64)');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'LowCardinality(Nullable(Int64))');
 SELECT JSONExtract('{"passed": true}', 'passed', 'UInt8');
 SELECT JSONExtract('{"day": "Thursday"}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)');
 SELECT JSONExtract('{"day": 5}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)');
@@ -241,11 +244,14 @@ SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Float3
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Tuple(Int8, Float32, UInt16)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Int8)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(Int8))');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(LowCardinality(Nullable(Int8)))');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(UInt8)');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(Nullable(UInt8))');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 'Array(LowCardinality(Nullable(UInt8)))');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 1, 'Int8');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 2, 'Int32');
 SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'Nullable(Int64)');
+SELECT JSONExtract('{"a": "hello", "b": [-100, 200.0, 300]}', 'b', 4, 'LowCardinality(Nullable(Int64))');
 SELECT JSONExtract('{"passed": true}', 'passed', 'UInt8');
 SELECT JSONExtract('{"day": "Thursday"}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)');
 SELECT JSONExtract('{"day": 5}', 'day', 'Enum8(\'Sunday\' = 0, \'Monday\' = 1, \'Tuesday\' = 2, \'Wednesday\' = 3, \'Thursday\' = 4, \'Friday\' = 5, \'Saturday\' = 6)');
@@ -320,3 +326,9 @@ SELECT JSONExtract('[]', JSONExtract('0', 'UInt256'), 'UInt256'); -- { serverErr
 
 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 JSONExtract(materialize(toLowCardinality('{"string_value":null}')), materialize('string_value'), 'LowCardinality(Nullable(String))');
+SELECT JSONExtract(materialize('{"string_value":null}'), materialize('string_value'), 'LowCardinality(Nullable(String))');
+SELECT JSONExtract(materialize('{"string_value":"Hello"}'), materialize('string_value'), 'LowCardinality(Nullable(String))') AS x;
+SELECT JSONExtract(materialize(toLowCardinality('{"string_value":"Hello"}')), materialize('string_value'), 'LowCardinality(Nullable(String))') AS x;
+SELECT JSONExtract(materialize('{"string_value":"Hello"}'), materialize(toLowCardinality('string_value')), 'LowCardinality(Nullable(String))') AS x;
+SELECT JSONExtract(materialize(toLowCardinality('{"string_value":"Hello"}')), materialize(toLowCardinality('string_value')), 'LowCardinality(Nullable(String))') AS x;
diff --git a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
index a946a114bf4..74b7b207661 100644
--- a/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
+++ b/tests/queries/0_stateless/00921_datetime64_compatibility_long.reference
@@ -241,82 +241,82 @@ SELECT toYYYYMMDDhhmmss(N, \'Asia/Istanbul\')
 SELECT addYears(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2020-09-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2020-09-16 19:20:11.234"
 ------------------------------------------
 SELECT addMonths(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-10-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-10-16 19:20:11.234"
 ------------------------------------------
 SELECT addWeeks(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-23 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-23 19:20:11.234"
 ------------------------------------------
 SELECT addDays(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-17 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-17 19:20:11.234"
 ------------------------------------------
 SELECT addHours(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 20:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 20:20:11.234"
 ------------------------------------------
 SELECT addMinutes(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 19:21:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 19:21:11.234"
 ------------------------------------------
 SELECT addSeconds(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 19:20:12"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 19:20:12.234"
 ------------------------------------------
 SELECT addQuarters(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-12-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-12-16 19:20:11.234"
 ------------------------------------------
 SELECT subtractYears(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2018-09-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2018-09-16 19:20:11.234"
 ------------------------------------------
 SELECT subtractMonths(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-08-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-08-16 19:20:11.234"
 ------------------------------------------
 SELECT subtractWeeks(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-09 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-09 19:20:11.234"
 ------------------------------------------
 SELECT subtractDays(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-15 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-15 19:20:11.234"
 ------------------------------------------
 SELECT subtractHours(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 18:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 18:20:11.234"
 ------------------------------------------
 SELECT subtractMinutes(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 19:19:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 19:19:11.234"
 ------------------------------------------
 SELECT subtractSeconds(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-09-16 19:20:10"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-09-16 19:20:10.234"
 ------------------------------------------
 SELECT subtractQuarters(N, 1, \'Asia/Istanbul\')
 Code: 43
 "DateTime('Asia/Istanbul')","2019-06-16 19:20:11"
-Code: 43
+"DateTime64(3, 'Asia/Istanbul')","2019-06-16 19:20:11.234"
 ------------------------------------------
 SELECT CAST(N as DateTime(\'Europe/Minsk\'))
 "DateTime('Europe/Minsk')","2019-09-16 00:00:00"
diff --git a/tests/queries/0_stateless/00937_format_schema_rows_template.reference b/tests/queries/0_stateless/00937_format_schema_rows_template.reference
new file mode 100644
index 00000000000..85bab456512
--- /dev/null
+++ b/tests/queries/0_stateless/00937_format_schema_rows_template.reference
@@ -0,0 +1,9 @@
+Question: 'How awesome is clickhouse?', Answer: 'unbelievably awesome!', Number of Likes: 456, Date: 2016-01-02;
+Question: 'How fast is clickhouse?', Answer: 'Lightning fast!', Number of Likes: 9876543210, Date: 2016-01-03;
+Question: 'Is it opensource?', Answer: 'of course it is!', Number of Likes: 789, Date: 2016-01-04
+
+===== Results ===== 
+Question: 'How awesome is clickhouse?', Answer: 'unbelievably awesome!', Number of Likes: 456, Date: 2016-01-02;
+Question: 'How fast is clickhouse?', Answer: 'Lightning fast!', Number of Likes: 9876543210, Date: 2016-01-03;
+Question: 'Is it opensource?', Answer: 'of course it is!', Number of Likes: 789, Date: 2016-01-04
+===================
diff --git a/tests/queries/0_stateless/00937_format_schema_rows_template.sh b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
new file mode 100755
index 00000000000..0221527f9c9
--- /dev/null
+++ b/tests/queries/0_stateless/00937_format_schema_rows_template.sh
@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2016
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Test format_template_row_format setting 
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS template";
+$CLICKHOUSE_CLIENT --query="CREATE TABLE template (question String, answer String, likes UInt64, date Date) ENGINE = Memory";
+$CLICKHOUSE_CLIENT --query="INSERT INTO template VALUES
+('How awesome is clickhouse?', 'unbelievably awesome!', 456, '2016-01-02'),\
+('How fast is clickhouse?', 'Lightning fast!', 9876543210, '2016-01-03'),\
+('Is it opensource?', 'of course it is!', 789, '2016-01-04')";
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
+format_template_rows_between_delimiter = ';\n'";
+
+echo -e "\n"
+
+# Test that if both format_template_row_format setting and format_template_row are provided, error is thrown
+row_format_file="$CURDIR"/"${CLICKHOUSE_TEST_UNIQUE_NAME}"_template_output_format_row.tmp
+echo -ne 'Question: ${question:Quoted}, Answer: ${answer:Quoted}, Number of Likes: ${likes:Raw}, Date: ${date:Raw}' > $row_format_file
+$CLICKHOUSE_CLIENT --multiline --multiquery --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+format_template_row = '$row_format_file', \
+format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
+format_template_rows_between_delimiter = ';\n'; --{clientError 474}"
+
+# Test format_template_resultset_format setting 
+
+$CLICKHOUSE_CLIENT --query="SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
+format_template_resultset_format = '===== Results ===== \n\${data}\n===================\n', \
+format_template_rows_between_delimiter = ';\n'";
+
+# Test that if both format_template_result_format setting and format_template_resultset are provided, error is thrown
+resultset_output_file="$CURDIR"/"$CLICKHOUSE_TEST_UNIQUE_NAME"_template_output_format_resultset.tmp
+echo -ne '===== Resultset ===== \n \${data} \n ===============' > $resultset_output_file
+$CLICKHOUSE_CLIENT --multiline --multiquery --query "SELECT * FROM template GROUP BY question, answer, likes, date WITH TOTALS ORDER BY date LIMIT 3 FORMAT Template SETTINGS \
+format_template_resultset = '$resultset_output_file', \
+format_template_resultset_format = '===== Resultset ===== \n \${data} \n ===============', \
+format_template_row_format = 'Question: \${question:Quoted}, Answer: \${answer:Quoted}, Number of Likes: \${likes:Raw}, Date: \${date:Raw}', \
+format_template_rows_between_delimiter = ';\n'; --{clientError 474}"
+
+$CLICKHOUSE_CLIENT --query="DROP TABLE template";
+rm $row_format_file
+rm $resultset_output_file
diff --git a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
index 795f41528b2..088c266b017 100755
--- a/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
+++ b/tests/queries/0_stateless/00938_fix_rwlock_segfault_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long
+# Tags: long, no-debug
 
 # Test fix for issue #5066
 
diff --git a/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.reference b/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.reference
index c827d208387..4c1a3fd5c15 100644
--- a/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.reference
+++ b/tests/queries/0_stateless/00940_order_by_read_in_order_query_plan.reference
@@ -293,8 +293,8 @@ select * from (select * from tab where (a + b) * c = 8 union all select * from t
 select * from (explain plan actions = 1 select * from (select * from tab where (a + b) * c = 8 union all select * from tab3 where (a + b) * c = 18) order by sin(a / b)) where explain like '%sort description%' or explain like '%ReadType%';
   Prefix sort description: sin(divide(a, b)) ASC
   Result sort description: sin(divide(a, b)) ASC
-        ReadType: InOrder
-        ReadType: InOrder
+          ReadType: InOrder
+          ReadType: InOrder
 select * from (select * from tab where (a + b) * c = 8 union all select * from tab4) order by sin(a / b);
 2	2	2	2
 2	2	2	2
@@ -311,7 +311,7 @@ select * from (select * from tab where (a + b) * c = 8 union all select * from t
 select * from (explain plan actions = 1 select * from (select * from tab where (a + b) * c = 8 union all select * from tab4) order by sin(a / b)) where explain like '%sort description%' or explain like '%ReadType%';
   Prefix sort description: sin(divide(a, b)) ASC
   Result sort description: sin(divide(a, b)) ASC
-        ReadType: InOrder
+          ReadType: InOrder
         ReadType: InOrder
 select * from (select * from tab union all select * from tab5) order by (a + b) * c;
 0	0	0	0
diff --git a/tests/queries/0_stateless/00943_materialize_index.sh b/tests/queries/0_stateless/00943_materialize_index.sh
index 30ef46e5cb0..6ff7d34a9d7 100755
--- a/tests/queries/0_stateless/00943_materialize_index.sh
+++ b/tests/queries/0_stateless/00943_materialize_index.sh
@@ -31,31 +31,31 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO minmax_idx VALUES
 (8, 1, 2),
 (9, 1, 2)"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT -n --query="
 ALTER TABLE minmax_idx ADD INDEX idx (i64, u64 * i64) TYPE minmax GRANULARITY 1 SETTINGS mutations_sync = 2;"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx MATERIALIZE INDEX idx IN PARTITION 1 SETTINGS mutations_sync = 2;"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx MATERIALIZE INDEX idx IN PARTITION 2 SETTINGS mutations_sync = 2"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx CLEAR INDEX idx IN PARTITION 1 SETTINGS mutations_sync = 2"
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx CLEAR INDEX idx IN PARTITION 2 SETTINGS mutations_sync = 2"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx MATERIALIZE INDEX idx SETTINGS mutations_sync = 2"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE minmax_idx"
diff --git a/tests/queries/0_stateless/00944_clear_index_in_partition.sh b/tests/queries/0_stateless/00944_clear_index_in_partition.sh
index 8b74bd94f2c..4655077960f 100755
--- a/tests/queries/0_stateless/00944_clear_index_in_partition.sh
+++ b/tests/queries/0_stateless/00944_clear_index_in_partition.sh
@@ -32,17 +32,17 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO minmax_idx VALUES
 (8, 1, 2),
 (9, 1, 2)"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read" # Returns 4
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read" # Returns 4
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx CLEAR INDEX idx IN PARTITION 1;" --mutations_sync=1
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read" # Returns 6
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read" # Returns 6
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE minmax_idx MATERIALIZE INDEX idx IN PARTITION 1;" --mutations_sync=1
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 FORMAT JSON" | grep "rows_read" # Returns 4
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM minmax_idx WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read" # Returns 4
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE minmax_idx"
diff --git a/tests/queries/0_stateless/00945_bloom_filter_index.sql b/tests/queries/0_stateless/00945_bloom_filter_index.sql
index dc47e858c4d..4c26988574a 100644
--- a/tests/queries/0_stateless/00945_bloom_filter_index.sql
+++ b/tests/queries/0_stateless/00945_bloom_filter_index.sql
@@ -1,3 +1,5 @@
+SET allow_suspicious_low_cardinality_types=1;
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
 
 DROP TABLE IF EXISTS single_column_bloom_filter;
 
diff --git a/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh b/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
index f8527cd491e..389d433c7e2 100755
--- a/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
+++ b/tests/queries/0_stateless/00974_primary_key_for_lowCardinality.sh
@@ -32,9 +32,9 @@ $CLICKHOUSE_CLIENT --query="insert into lowString (a, b) select top 100000 toStr
 
 $CLICKHOUSE_CLIENT --query="insert into string (a, b) select top 100000 toString(number), today() from system.numbers"
 
-$CLICKHOUSE_CLIENT --query="select count() from lowString where a in ('1', '2') FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="select count() from lowString where a in ('1', '2') SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
-$CLICKHOUSE_CLIENT --query="select count() from string where a in ('1', '2') FORMAT JSON" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="select count() from string where a in ('1', '2') SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE lowString;"
 $CLICKHOUSE_CLIENT --query="DROP TABLE string;"
diff --git a/tests/queries/0_stateless/00974_query_profiler.sql b/tests/queries/0_stateless/00974_query_profiler.sql
index b697bd56800..24e4241b813 100644
--- a/tests/queries/0_stateless/00974_query_profiler.sql
+++ b/tests/queries/0_stateless/00974_query_profiler.sql
@@ -1,4 +1,4 @@
--- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-fasttest, no-cpu-aarch64
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-fasttest
 -- Tag no-fasttest: Not sure why fail even in sequential mode. Disabled for now to make some progress.
 
 SET allow_introspection_functions = 1;
diff --git a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
index 89b17ffe2bf..686dd7f6df0 100755
--- a/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
+++ b/tests/queries/0_stateless/00975_indices_mutation_replicated_zookeeper_long.sh
@@ -49,18 +49,18 @@ $CLICKHOUSE_CLIENT --query="INSERT INTO indices_mutaions1 VALUES
 
 $CLICKHOUSE_CLIENT --query="SYSTEM SYNC REPLICA indices_mutaions2"
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 FORMAT JSON;" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON;" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE indices_mutaions1 CLEAR INDEX idx IN PARTITION 1;" --replication_alter_partitions_sync=2 --mutations_sync=2
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 FORMAT JSON;" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON;" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="ALTER TABLE indices_mutaions1 MATERIALIZE INDEX idx IN PARTITION 1;" --replication_alter_partitions_sync=2 --mutations_sync=2
 
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2;"
-$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 FORMAT JSON;" | grep "rows_read"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
+$CLICKHOUSE_CLIENT --query="SELECT count() FROM indices_mutaions2 WHERE i64 = 2 SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0 FORMAT JSON;" | grep "rows_read"
 
 $CLICKHOUSE_CLIENT --query="DROP TABLE indices_mutaions1"
 $CLICKHOUSE_CLIENT --query="DROP TABLE indices_mutaions2"
diff --git a/tests/queries/0_stateless/00979_toFloat_monotonicity.sql b/tests/queries/0_stateless/00979_toFloat_monotonicity.sql
index 9b3bdf91573..fa1f5b17a1c 100644
--- a/tests/queries/0_stateless/00979_toFloat_monotonicity.sql
+++ b/tests/queries/0_stateless/00979_toFloat_monotonicity.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
 DROP TABLE IF EXISTS test3;
diff --git a/tests/queries/0_stateless/00984_parser_stack_overflow.reference b/tests/queries/0_stateless/00984_parser_stack_overflow.reference
index 0cf6a1f96df..e28ada842c0 100644
--- a/tests/queries/0_stateless/00984_parser_stack_overflow.reference
+++ b/tests/queries/0_stateless/00984_parser_stack_overflow.reference
@@ -1,4 +1,6 @@
-exceeded
-exceeded
+1
+1
+0
+0
 20002
 1
diff --git a/tests/queries/0_stateless/00984_parser_stack_overflow.sh b/tests/queries/0_stateless/00984_parser_stack_overflow.sh
index a7854b91ee2..dc836388cf6 100755
--- a/tests/queries/0_stateless/00984_parser_stack_overflow.sh
+++ b/tests/queries/0_stateless/00984_parser_stack_overflow.sh
@@ -9,10 +9,10 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 # Too deep recursion
-perl -e 'print "(" x 10000' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -oF 'exceeded'
-perl -e 'print "SELECT " . ("[" x 10000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -oF 'exceeded'
-perl -e 'print "SELECT " . ("([" x 5000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -oF 'exceeded'
-perl -e 'print "SELECT 1" . ("+1" x 10000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -oF 'exceeded'
+perl -e 'print "(" x 10000' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -cP 'exceeded|too large'
+perl -e 'print "SELECT " . ("[" x 10000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -cP 'exceeded|too large'
+perl -e 'print "SELECT " . ("([" x 5000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -cP 'exceeded|too large'
+perl -e 'print "SELECT 1" . ("+1" x 10000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | grep -cP 'exceeded|too large'
 
 # But this is Ok
 perl -e 'print "SELECT 1" . (",1" x 10000)' | $CLICKHOUSE_CURL -sS "$CLICKHOUSE_URL" --data-binary @- | wc -c
diff --git a/tests/queries/0_stateless/00990_function_current_user.reference b/tests/queries/0_stateless/00990_function_current_user.reference
index f1f321b1ecd..95d2ef117ea 100644
--- a/tests/queries/0_stateless/00990_function_current_user.reference
+++ b/tests/queries/0_stateless/00990_function_current_user.reference
@@ -1,4 +1,4 @@
 1
 1
-1	1
+1	1	1
 1
diff --git a/tests/queries/0_stateless/00990_function_current_user.sql b/tests/queries/0_stateless/00990_function_current_user.sql
index 38bd815ecef..729e8b3de8c 100644
--- a/tests/queries/0_stateless/00990_function_current_user.sql
+++ b/tests/queries/0_stateless/00990_function_current_user.sql
@@ -1,5 +1,5 @@
--- since actual user name is unknown, have to perform just smoke tests
+-- Since the actual user name is unknown, have to perform just smoke tests
 select currentUser() IS NOT NULL;
 select length(currentUser()) > 0;
-select currentUser() = user(), currentUser() = USER();
-select currentUser() = initial_user from system.processes where query like '%$!@#%';
+select currentUser() = user(), currentUser() = USER(), current_user() = currentUser();
+select currentUser() = initial_user from system.processes where query like '%$!@#%' AND current_database = currentDatabase();
diff --git a/tests/queries/0_stateless/01013_totals_without_aggregation.reference b/tests/queries/0_stateless/01013_totals_without_aggregation.reference
index a1f5c1aa914..6dddf22a467 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
 
-0
+11
+12
 12
-0
 13
-0
+13
diff --git a/tests/queries/0_stateless/01016_input_null_as_default.sh b/tests/queries/0_stateless/01016_input_null_as_default.sh
index 24d93b2703c..8d6a9a07435 100755
--- a/tests/queries/0_stateless/01016_input_null_as_default.sh
+++ b/tests/queries/0_stateless/01016_input_null_as_default.sh
@@ -11,8 +11,8 @@ $CLICKHOUSE_CLIENT --query="CREATE TABLE default_by_other_column (a Float32 DEFA
 
 echo 'CSV'
 echo '\N, 1, \N, "2019-07-22", "[10, 20, 30]", \N
-1, world, 3, "2019-07-23", \N, tuple, 3.14
-2, \N, 123, \N, "[]", test, 2.71828
+1, world, 3, "2019-07-23", \N, "('\''tuple'\'', 3.14)"
+2, \N, 123, \N, "[]", "('\''test'\'', 2.71828)"
 3, \N, \N, \N, \N, \N' | $CLICKHOUSE_CLIENT --input_format_null_as_default=1 --query="INSERT INTO null_as_default FORMAT CSV";
 $CLICKHOUSE_CLIENT --query="SELECT * FROM null_as_default ORDER BY i";
 $CLICKHOUSE_CLIENT --query="TRUNCATE TABLE null_as_default";
diff --git a/tests/queries/0_stateless/01018_ambiguous_column.reference b/tests/queries/0_stateless/01018_ambiguous_column.reference
index 308726fa184..ddc2ae1c572 100644
--- a/tests/queries/0_stateless/01018_ambiguous_column.reference
+++ b/tests/queries/0_stateless/01018_ambiguous_column.reference
@@ -7,10 +7,10 @@
 0
 0
 0
-┌─system.one.dummy─┬─A.dummy─┬─B.dummy─�
-│                0 │       0 │       0 │
-└──────────────────┴─────────┴─────────┘
-┌─A.dummy─┬─one.dummy─┬─two.dummy─�
-│       0 │         0 │         0 │
-└─────────┴───────────┴───────────┘
+   ┌─system.one.dummy─┬─A.dummy─┬─B.dummy─�
+1. │                0 │       0 │       0 │
+   └──────────────────┴─────────┴─────────┘
+   ┌─A.dummy─┬─one.dummy─┬─two.dummy─�
+1. │       0 │         0 │         0 │
+   └─────────┴───────────┴───────────┘
 0
diff --git a/tests/queries/0_stateless/01018_ambiguous_column.sql b/tests/queries/0_stateless/01018_ambiguous_column.sql
index 620bdb6ba3f..a94e1cd4601 100644
--- a/tests/queries/0_stateless/01018_ambiguous_column.sql
+++ b/tests/queries/0_stateless/01018_ambiguous_column.sql
@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SET allow_experimental_analyzer = 1;
 
 select * from system.one cross join system.one;
diff --git a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
index 9fbc3f951fe..777effe9e81 100644
--- a/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
+++ b/tests/queries/0_stateless/01019_Buffer_and_max_memory_usage.sql
@@ -25,6 +25,7 @@ CREATE TABLE buffer_ (key UInt64) Engine=Buffer(currentDatabase(), null_,
 
 SET max_memory_usage=10e6;
 SET max_block_size=100e3;
+SET max_insert_threads=1;
 
 -- Check that max_memory_usage is ignored only on flush and not on squash
 SET min_insert_block_size_bytes=9e6;
diff --git a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
index e50b974a48e..4bd21fcee02 100755
--- a/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
+++ b/tests/queries/0_stateless/01019_alter_materialized_view_atomic.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-fasttest
+# Tags: no-fasttest, no-debug
 
 set -e
 
diff --git a/tests/queries/0_stateless/01023_materialized_view_query_context.sql b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
index 21569f375df..f8c282fedd5 100644
--- a/tests/queries/0_stateless/01023_materialized_view_query_context.sql
+++ b/tests/queries/0_stateless/01023_materialized_view_query_context.sql
@@ -1,4 +1,16 @@
--- Tags: no-parallel
+-- Tags: no-parallel, no-replicated-database
+
+-- FIXME: old analyzer does not check db exist, new one checks it and test fails. test is suppressed for replicated.
+--    without analyzer:
+--    2024.02.22 18:55:00.320120 [ 116105 ] {61f04f21-6d66-4064-926f-20657de2e66c} <Debug> executeQuery: (from 0.0.0.0:0, user: ) (comment: 01023_materialized_view_query_context.sql) /* ddl_entry=query-0000000009 */ CREATE MATERIALIZED VIEW test_143n70zj.mv UUID '0572ef25-139a-4705-a213-601675435648' TO test_143n70zj.output (`key` UInt64, `val` UInt64) AS SELECT key, dictGetUInt64('dict_in_01023.dict', 'val', key) AS val FROM test_143n70zj.dist_out (stage: Complete)
+--    2024.02.22 18:55:00.321303 [ 116105 ] {61f04f21-6d66-4064-926f-20657de2e66c} <Debug> DDLWorker(test_143n70zj): Executed query: /* ddl_entry=query-0000000009 */ CREATE MATERIALIZED VIEW test_143n70zj.mv UUID '0572ef25-139a-4705-a213-601675435648' TO test_143n70zj.output (`key` UInt64, `val` UInt64) AS SELECT key, dictGetUInt64('dict_in_01023.dict', 'val', key) AS val FROM test_143n70zj.dist_out
+--
+--    with analyzer:
+--    2024.02.22 19:33:36.266538 [ 108818 ] {0e1586f5-8ae0-4065-81b7-1e7d43b85d82} <Debug> executeQuery: (from 0.0.0.0:0, user: ) (comment: 01023_materialized_view_query_context.sql) /* ddl_entry=query-0000000009 */ CREATE MATERIALIZED VIEW test_devov0ke.mv UUID 'bf3a2bfe-1446-4a02-b760-bae514488c5a' TO test_devov0ke.output (`key` UInt64, `val` UInt64) AS SELECT key, dictGetUInt64('dict_in_01023.dict', 'val', key) AS val FROM test_devov0ke.dist_out (stage: Complete)
+--    2024.02.22 19:33:36.266796 [ 108818 ] {0e1586f5-8ae0-4065-81b7-1e7d43b85d82} <Trace> Planner: Query SELECT __table1.key AS key, dictGetUInt64('dict_in_01023.dict', 'val', __table1.key) AS val FROM test_devov0ke.dist_out AS __table1 to stage Complete only analyze
+--    2024.02.22 19:33:36.266855 [ 108818 ] {0e1586f5-8ae0-4065-81b7-1e7d43b85d82} <Trace> Planner: Query SELECT __table1.key AS key, dictGetUInt64('dict_in_01023.dict', 'val', __table1.key) AS val FROM test_devov0ke.dist_out AS __table1 from stage FetchColumns to stage Complete only analyze
+--    2024.02.22 19:33:36.280740 [ 108818 ] {0e1586f5-8ae0-4065-81b7-1e7d43b85d82} <Error> executeQuery: Code: 36. DB::Exception: Dictionary (`dict_in_01023.dict`) not found. (BAD_ARGUMENTS) (version 24.2.1.1429 (official build)) (from 0.0.0.0:0) (comment: 01023_materialized_view_query_context.sql) (in query: /* ddl_entry=query-0000000009 */ CREATE MATERIALIZED VIEW test_devov0ke.mv UUID 'bf3a2bfe-1446-4a02-b760-bae514488c5a' TO test_devov0ke.output (`key` UInt64, `val` UInt64) AS SELECT key, dictGetUInt64('dict_in_01023.dict', 'val', key) AS val FROM test_devov0ke.dist_out), Stack trace (when copying this message, always include the lines below):
+--    2024.02.22 19:33:36.280936 [ 108818 ] {0e1586f5-8ae0-4065-81b7-1e7d43b85d82} <Error> DDLWorker(test_devov0ke): Query /* ddl_entry=query-0000000009 */ CREATE MATERIALIZED VIEW test_devov0ke.mv UUID 'bf3a2bfe-1446-4a02-b760-bae514488c5a' TO test_devov0ke.output (`key` UInt64, `val` UInt64) AS SELECT key, dictGetUInt64('dict_in_01023.dict', 'val', key) AS val FROM test_devov0ke.dist_out wasn't finished successfully: Code: 36. DB::Exception: Dictionary (`dict_in_01023.dict`) not found. (BAD_ARGUMENTS), Stack trace (when copying this message, always include the lines below):
 
 -- Create dictionary, since dictGet*() uses DB::Context in executeImpl()
 -- (To cover scope of the Context in PushingToViews chain)
diff --git a/tests/queries/0_stateless/01029_early_constant_folding.reference b/tests/queries/0_stateless/01029_early_constant_folding.reference
index abcb2ddc6a7..4df5414ba4a 100644
--- a/tests/queries/0_stateless/01029_early_constant_folding.reference
+++ b/tests/queries/0_stateless/01029_early_constant_folding.reference
@@ -2,7 +2,7 @@ SELECT 1
 WHERE 0
 SELECT 1
 SELECT 1
-WHERE (1 IN (0, 2)) AND (2 = (identity(_CAST(2, \'Nullable(UInt8)\')) AS subquery))
+WHERE (1 IN (0, 2)) AND (2 = (__scalarSubqueryResult(_CAST(2, \'Nullable(UInt8)\')) AS subquery))
 SELECT 1
 WHERE 1 IN ((
     SELECT arrayJoin([1, 2, 3])
diff --git a/tests/queries/0_stateless/01030_storage_url_syntax.sql b/tests/queries/0_stateless/01030_storage_url_syntax.sql
index 9b31558eece..eda108aca2f 100644
--- a/tests/queries/0_stateless/01030_storage_url_syntax.sql
+++ b/tests/queries/0_stateless/01030_storage_url_syntax.sql
@@ -1,7 +1,7 @@
 drop table if exists test_table_url_syntax
 ;
 create table test_table_url_syntax (id UInt32) ENGINE = URL('')
-; -- { serverError 36 }
+; -- { serverError UNSUPPORTED_URI_SCHEME }
 create table test_table_url_syntax (id UInt32) ENGINE = URL('','','','')
 ; -- { serverError 42 }
 drop table if exists test_table_url_syntax
@@ -11,7 +11,7 @@ drop table if exists test_table_url
 ;
 
 create table test_table_url(id UInt32) ENGINE = URL('http://localhost/endpoint')
-; -- { serverError 36 }
+; -- { serverError CANNOT_DETECT_FORMAT }
 
 create table test_table_url(id UInt32) ENGINE = URL('http://localhost/endpoint.json');
 drop table test_table_url;
diff --git a/tests/queries/0_stateless/01033_function_substring.reference b/tests/queries/0_stateless/01033_function_substring.reference
index b0fac36e24a..362a14f80f3 100644
--- a/tests/queries/0_stateless/01033_function_substring.reference
+++ b/tests/queries/0_stateless/01033_function_substring.reference
@@ -170,4 +170,6 @@ g
 
 
 
-UBSAN bug
+-- UBSAN bug
+-- Alias
+el
diff --git a/tests/queries/0_stateless/01033_function_substring.sql b/tests/queries/0_stateless/01033_function_substring.sql
index 82c6b5859e2..9955700f302 100644
--- a/tests/queries/0_stateless/01033_function_substring.sql
+++ b/tests/queries/0_stateless/01033_function_substring.sql
@@ -132,7 +132,7 @@ SELECT substring(s, l, r) FROM t;
 
 DROP table if exists t;
 
-SELECT 'UBSAN bug';
+SELECT '-- UBSAN bug';
 
 /** NOTE: The behaviour of substring and substringUTF8 is inconsistent when negative offset is greater than string size:
   * substring:
@@ -144,3 +144,6 @@ SELECT 'UBSAN bug';
   * This may be subject for change.
   */
 SELECT substringUTF8('hello, �¿Ñ��¸�²�µÑ�', -9223372036854775808, number) FROM numbers(16) FORMAT Null;
+
+SELECT '-- Alias';
+SELECT byteSlice('hello', 2, 2);
diff --git a/tests/queries/0_stateless/01043_geo_distance.reference b/tests/queries/0_stateless/01043_geo_distance.reference
index cd8a8a6dfe9..33e1285872e 100644
--- a/tests/queries/0_stateless/01043_geo_distance.reference
+++ b/tests/queries/0_stateless/01043_geo_distance.reference
@@ -6,3 +6,11 @@
 10007555
 10007554
 10001780
+111195.05197522942
+111195.05197522942
+110567.32686882635
+111699.2516454354
+10007554.677770648
+10007554.677770648
+10007554.677770648
+10001780.1
diff --git a/tests/queries/0_stateless/01043_geo_distance.sql b/tests/queries/0_stateless/01043_geo_distance.sql
index c1fb29b9eb7..cf877d05b9f 100644
--- a/tests/queries/0_stateless/01043_geo_distance.sql
+++ b/tests/queries/0_stateless/01043_geo_distance.sql
@@ -1,3 +1,19 @@
+SET geo_distance_returns_float64_on_float64_arguments = 0;
+
+SELECT greatCircleDistance(0., 0., 0., 1.);
+SELECT greatCircleDistance(0., 89., 0, 90.);
+
+SELECT geoDistance(0., 0., 0., 1.);
+SELECT geoDistance(0., 89., 0., 90.);
+
+SELECT greatCircleDistance(0., 0., 90., 0.);
+SELECT greatCircleDistance(0., 0., 0., 90.);
+
+SELECT geoDistance(0., 0., 90., 0.);
+SELECT geoDistance(0., 0., 0., 90.);
+
+SET geo_distance_returns_float64_on_float64_arguments = 1;
+
 SELECT greatCircleDistance(0., 0., 0., 1.);
 SELECT greatCircleDistance(0., 89., 0, 90.);
 
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 e292447512c..f17f3ac63b0 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,8 +1,9 @@
-
+SET send_logs_level = 'fatal';
 SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary;
 
 DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.mt;
diff --git a/tests/queries/0_stateless/01048_window_view_parser.sql b/tests/queries/0_stateless/01048_window_view_parser.sql
index f87d9aa023e..adcb4a6364d 100644
--- a/tests/queries/0_stateless/01048_window_view_parser.sql
+++ b/tests/queries/0_stateless/01048_window_view_parser.sql
@@ -1,9 +1,11 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
 SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 DROP DATABASE IF EXISTS test_01048;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01048 ENGINE=Ordinary;
 
 DROP TABLE IF EXISTS test_01048.mt;
diff --git a/tests/queries/0_stateless/01053_drop_database_mat_view.sql b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
index 2642430eb05..6ab31fce644 100644
--- a/tests/queries/0_stateless/01053_drop_database_mat_view.sql
+++ b/tests/queries/0_stateless/01053_drop_database_mat_view.sql
@@ -1,6 +1,8 @@
+SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary; -- Different inner table name with Atomic
 
 set allow_deprecated_syntax_for_merge_tree=1;
diff --git a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
index dd52fd1c1b2..e8a9b79bf7c 100644
--- a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
+++ b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.reference
@@ -36,9 +36,9 @@ FROM
     FROM
     (
         SELECT
-            1 AS co,
-            2 AS co2,
-            3 AS co3
+            dummy + 1 AS co,
+            dummy + 2 AS co2,
+            dummy + 3 AS co3
     )
     GROUP BY
         co,
diff --git a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
index f237768bc4c..13d90b9f43e 100644
--- a/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
+++ b/tests/queries/0_stateless/01056_predicate_optimizer_bugs.sql
@@ -8,8 +8,8 @@ EXPLAIN SYNTAX SELECT k, v, d, i FROM (SELECT t.1 AS k, t.2 AS v, runningDiffere
 SELECT k, v, d, i FROM (SELECT t.1 AS k, t.2 AS v, runningDifference(v) AS d, runningDifference(cityHash64(t.1)) AS i FROM (   SELECT arrayJoin([('a', 1), ('a', 2), ('a', 3), ('b', 11), ('b', 13), ('b', 15)]) AS t)) WHERE i = 0;
 
 -- https://github.com/ClickHouse/ClickHouse/issues/5682
-EXPLAIN SYNTAX 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;
-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;
+EXPLAIN SYNTAX SELECT co,co2,co3,num FROM ( SELECT co,co2,co3,count() AS num FROM (SELECT dummy+1 AS co,dummy+2 AS co2 ,dummy+3 AS co3) GROUP BY cube (co,co2,co3) ) WHERE co!=0 AND co2 !=2;
+SELECT co,co2,co3,num FROM ( SELECT co,co2,co3,count() AS num FROM (SELECT dummy+1 AS co,dummy+2 AS co2 ,dummy+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 name FROM ( SELECT name FROM system.settings ) ANY INNER JOIN ( SELECT name FROM system.settings ) USING (name) WHERE name = 'enable_optimize_predicate_expression';
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 4c3e3ead455..2db14fcdddf 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
@@ -28,6 +28,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01056_window_view_proc_hop_watch")
     client1.expect(prompt)
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 9adff06442e..2323ee5c838 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
@@ -26,6 +26,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client1.send("SET window_view_heartbeat_interval = 1")
     client1.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS db_01059_event_hop_watch_strict_asc")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql b/tests/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql
index 15a28e92386..6a42c725e4a 100644
--- a/tests/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql
+++ b/tests/queries/0_stateless/01062_pm_all_join_with_block_continuation.sql
@@ -1,8 +1,8 @@
 SET max_memory_usage = 50000000;
 SET join_algorithm = 'partial_merge';
-
+SET analyzer_compatibility_join_using_top_level_identifier = 1;
 SELECT 'defaults';
-    
+
 SELECT count(1) FROM (
     SELECT materialize(1) as k, n FROM numbers(10) nums
     JOIN (SELECT materialize(1) AS k, number n FROM numbers(1000000)) j
@@ -20,7 +20,7 @@ SELECT count(1), uniqExact(n) FROM (
 
 -- errors
 SET max_joined_block_size_rows = 0;
-    
+
 SELECT count(1) FROM (
     SELECT materialize(1) as k, n FROM numbers(10) nums
     JOIN (SELECT materialize(1) AS k, number n FROM numbers(1000000)) j
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 bb40b1df2f0..db9e8cef6c5 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
@@ -28,6 +28,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01062_window_view_event_hop_watch_asc")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql b/tests/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql
index ae90dc3cc72..f5ac347cfff 100644
--- a/tests/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql
+++ b/tests/queries/0_stateless/01064_incremental_streaming_from_2_src_with_feedback.sql
@@ -25,7 +25,8 @@ AS
      minState( toUInt64(-1) ) as fastest_session,
      maxState( toUInt64(0) ) as biggest_inactivity_period
 FROM numbers(50000)
-GROUP BY id;
+GROUP BY id
+SETTINGS max_insert_threads=1;
 
 -- source table #1
 
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 7f00130b184..b8d5ff02d37 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
@@ -27,6 +27,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send(
         "CREATE DATABASE IF NOT EXISTS 01065_window_view_event_hop_watch_bounded"
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 eb31b2ccbcf..21c2e831afc 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
@@ -28,6 +28,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE 01069_window_view_proc_tumble_watch")
     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 8aeff041cc1..1cf7678a014 100755
--- a/tests/queries/0_stateless/01070_window_view_watch_events.py
+++ b/tests/queries/0_stateless/01070_window_view_watch_events.py
@@ -28,6 +28,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01070_window_view_watch_events")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01073_grant_and_revoke.reference b/tests/queries/0_stateless/01073_grant_and_revoke.reference
index 449f21e896a..b91820914e6 100644
--- a/tests/queries/0_stateless/01073_grant_and_revoke.reference
+++ b/tests/queries/0_stateless/01073_grant_and_revoke.reference
@@ -4,12 +4,12 @@ B
 C
 GRANT INSERT, ALTER DELETE ON *.* TO test_user_01073
 GRANT SELECT ON db1.* TO test_user_01073
-GRANT SELECT ON db2.table TO test_user_01073
-GRANT SELECT(col1) ON db3.table TO test_user_01073
-GRANT SELECT(col1, col2) ON db4.table TO test_user_01073
+GRANT SELECT ON db2.`table` TO test_user_01073
+GRANT SELECT(col1) ON db3.`table` TO test_user_01073
+GRANT SELECT(col1, col2) ON db4.`table` TO test_user_01073
 D
 GRANT ALTER DELETE ON *.* TO test_user_01073
-GRANT SELECT(col1) ON db4.table TO test_user_01073
+GRANT SELECT(col1) ON db4.`table` TO test_user_01073
 E
 GRANT SELECT ON db1.* TO test_role_01073
 REVOKE SELECT(c1, c2, c3, c4, c5) ON db1.table1 FROM test_role_01073
diff --git a/tests/queries/0_stateless/01074_partial_revokes.reference b/tests/queries/0_stateless/01074_partial_revokes.reference
index 43e44f3c941..b5baa93efb7 100644
--- a/tests/queries/0_stateless/01074_partial_revokes.reference
+++ b/tests/queries/0_stateless/01074_partial_revokes.reference
@@ -4,32 +4,32 @@ REVOKE SELECT ON db.* FROM test_user_01074
 --cleanup
 --simple 2
 GRANT SELECT ON db.* TO test_user_01074
-REVOKE SELECT ON db.table FROM test_user_01074
+REVOKE SELECT ON db.`table` FROM test_user_01074
 --cleanup
 --simple 3
-GRANT SELECT ON db.table TO test_user_01074
-REVOKE SELECT(col1) ON db.table FROM test_user_01074
+GRANT SELECT ON db.`table` TO test_user_01074
+REVOKE SELECT(col1) ON db.`table` FROM test_user_01074
 --cleanup
 --complex 1
 GRANT SELECT ON *.* TO test_user_01074
-REVOKE SELECT(col1, col2) ON db.table FROM test_user_01074
+REVOKE SELECT(col1, col2) ON db.`table` FROM test_user_01074
 --cleanup
 --complex 2
 GRANT SELECT ON *.* TO test_user_01074
 REVOKE SELECT ON db.* FROM test_user_01074
-GRANT SELECT ON db.table TO test_user_01074
-REVOKE SELECT(col1) ON db.table FROM test_user_01074
-������������������┳�����������┳�������������┳����������┳�������┳��������┳�������������������┳��������������┓
-┃ user_name       ┃ role_name ┃ access_type ┃ database ┃ table ┃ column ┃ is_partial_revoke ┃ grant_option ┃
-┡�����������������╇�����������╇�������������╇����������╇�������╇��������╇�������������������╇��������������┩
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ ᴺ�ᴸᴸ     │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 0 │            0 │
-├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 1 │            0 │
-├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ ᴺ�ᴸᴸ   │                 0 │            0 │
-├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ col1   │                 1 │            0 │
-└─────────────────┴───────────┴─────────────┴──────────┴───────┴────────┴───────────────────┴──────────────┘
+GRANT SELECT ON db.`table` TO test_user_01074
+REVOKE SELECT(col1) ON db.`table` FROM test_user_01074
+   ������������������┳�����������┳�������������┳����������┳�������┳��������┳�������������������┳��������������┓
+   ┃ user_name       ┃ role_name ┃ access_type ┃ database ┃ table ┃ column ┃ is_partial_revoke ┃ grant_option ┃
+   ┡�����������������╇�����������╇�������������╇����������╇�������╇��������╇�������������������╇��������������┩
+1. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ ᴺ�ᴸᴸ     │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 0 │            0 │
+   ├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
+2. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 1 │            0 │
+   ├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
+3. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ ᴺ�ᴸᴸ   │                 0 │            0 │
+   ├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
+4. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ col1   │                 1 │            0 │
+   └─────────────────┴───────────┴─────────────┴──────────┴───────┴────────┴───────────────────┴──────────────┘
 --cleanup
 --revoke 1
 GRANT SELECT ON *.* TO test_user_01074
@@ -40,18 +40,18 @@ GRANT SELECT ON *.* TO test_user_01074
 --cleanup
 --grant option 1
 GRANT SELECT ON *.* TO test_user_01074 WITH GRANT OPTION
-REVOKE GRANT OPTION FOR SELECT(col1) ON db.table FROM test_user_01074
-������������������┳�����������┳�������������┳����������┳�������┳��������┳�������������������┳��������������┓
-┃ user_name       ┃ role_name ┃ access_type ┃ database ┃ table ┃ column ┃ is_partial_revoke ┃ grant_option ┃
-┡�����������������╇�����������╇�������������╇����������╇�������╇��������╇�������������������╇��������������┩
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ ᴺ�ᴸᴸ     │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 0 │            1 │
-├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
-│ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ col1   │                 1 │            1 │
-└─────────────────┴───────────┴─────────────┴──────────┴───────┴────────┴───────────────────┴──────────────┘
+REVOKE GRANT OPTION FOR SELECT(col1) ON db.`table` FROM test_user_01074
+   ������������������┳�����������┳�������������┳����������┳�������┳��������┳�������������������┳��������������┓
+   ┃ user_name       ┃ role_name ┃ access_type ┃ database ┃ table ┃ column ┃ is_partial_revoke ┃ grant_option ┃
+   ┡�����������������╇�����������╇�������������╇����������╇�������╇��������╇�������������������╇��������������┩
+1. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ ᴺ�ᴸᴸ     │ ᴺ�ᴸᴸ  │ ᴺ�ᴸᴸ   │                 0 │            1 │
+   ├─────────────────┼───────────┼─────────────┼──────────┼───────┼────────┼───────────────────┼──────────────┤
+2. │ test_user_01074 │ ᴺ�ᴸᴸ      │ SELECT      │ db       │ table │ col1   │                 1 │            1 │
+   └─────────────────┴───────────┴─────────────┴──────────┴───────┴────────┴───────────────────┴──────────────┘
 --cleanup
 --grant option 2
 GRANT SELECT ON *.* TO test_user_01074 WITH GRANT OPTION
-REVOKE SELECT(col1) ON db.table FROM test_user_01074
+REVOKE SELECT(col1) ON db.`table` FROM test_user_01074
 --cleanup
 --grant option 3
 GRANT SELECT ON *.* TO test_user_01074
diff --git a/tests/queries/0_stateless/01074_partial_revokes.sql b/tests/queries/0_stateless/01074_partial_revokes.sql
index 8c92b9511c7..973d77b3f63 100644
--- a/tests/queries/0_stateless/01074_partial_revokes.sql
+++ b/tests/queries/0_stateless/01074_partial_revokes.sql
@@ -43,7 +43,7 @@ REVOKE SELECT ON db.* FROM test_user_01074;
 GRANT SELECT ON db.table TO test_user_01074;
 REVOKE SELECT(col1) ON db.table FROM test_user_01074;
 SHOW GRANTS FOR test_user_01074;
-SELECT * FROM system.grants WHERE user_name = 'test_user_01074' format Pretty;
+SELECT * FROM system.grants WHERE user_name = 'test_user_01074' SETTINGS output_format_pretty_color=1 FORMAT Pretty;
 
 SELECT '--cleanup';
 REVOKE SELECT ON *.* FROM test_user_01074;
@@ -73,7 +73,7 @@ SELECT '--grant option 1';
 GRANT SELECT ON *.* TO test_user_01074 WITH GRANT OPTION;
 REVOKE GRANT OPTION FOR SELECT(col1) ON db.table FROM test_user_01074;
 SHOW GRANTS FOR test_user_01074;
-SELECT * FROM system.grants WHERE user_name = 'test_user_01074' format Pretty;
+SELECT * FROM system.grants WHERE user_name = 'test_user_01074' SETTINGS output_format_pretty_color=1 FORMAT Pretty;
 
 SELECT '--cleanup';
 REVOKE SELECT ON *.* FROM test_user_01074;
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 c32e508c5a5..3f3dfe0cda8 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
@@ -28,10 +28,14 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
     client3.send("SET allow_experimental_window_view = 1")
     client3.expect(prompt)
     client3.send("SET window_view_heartbeat_interval = 1")
     client3.expect(prompt)
+    client3.send("SET allow_experimental_analyzer = 0")
+    client3.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01078_window_view_alter_query_watch")
     client1.expect(prompt)
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 12c8d295591..9938ebcab98 100755
--- a/tests/queries/0_stateless/01082_window_view_watch_limit.py
+++ b/tests/queries/0_stateless/01082_window_view_watch_limit.py
@@ -27,6 +27,8 @@ with client(name="client1>", log=log) as client1, client(
     client1.expect(prompt)
     client2.send("SET allow_experimental_window_view = 1")
     client2.expect(prompt)
+    client2.send("SET allow_experimental_analyzer = 0")
+    client2.expect(prompt)
 
     client1.send("CREATE DATABASE IF NOT EXISTS 01082_window_view_watch_limit")
     client1.expect(prompt)
diff --git a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
index b25cfadd0ec..19db37f852a 100644
--- a/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
+++ b/tests/queries/0_stateless/01083_expressions_in_engine_arguments.reference
@@ -6,6 +6,6 @@ CREATE TABLE default.distributed\n(\n    `n` Int8\n)\nENGINE = Distributed(\'tes
 CREATE TABLE default.distributed_tf\n(\n    `n` Int8\n) AS cluster(\'test_shard_localhost\', \'default\', \'buffer\')
 CREATE TABLE default.url\n(\n    `n` UInt64,\n    `col` String\n)\nENGINE = URL(\'https://localhost:8443/?query=select+n,+_table+from+default.merge+format+CSV\', \'CSV\')
 CREATE TABLE default.rich_syntax\n(\n    `n` Int64\n) AS remote(\'localhos{x|y|t}\', cluster(\'test_shard_localhost\', remote(\'127.0.0.{1..4}\', \'default\', \'view\')))
-CREATE VIEW default.view\n(\n    `n` Int64\n) AS\nSELECT toInt64(n) AS n\nFROM\n(\n    SELECT toString(n) AS n\n    FROM default.merge\n    WHERE _table != \'qwerty\'\n    ORDER BY _table ASC\n)\nUNION ALL\nSELECT *\nFROM default.file
+CREATE VIEW default.view\n(\n    `n` Int64\n)\nAS SELECT toInt64(n) AS n\nFROM\n(\n    SELECT toString(n) AS n\n    FROM default.merge\n    WHERE _table != \'qwerty\'\n    ORDER BY _table ASC\n)\nUNION ALL\nSELECT *\nFROM default.file
 CREATE DICTIONARY default.dict\n(\n    `n` UInt64,\n    `col` String DEFAULT \'42\'\n)\nPRIMARY KEY n\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9440 SECURE 1 USER \'default\' TABLE \'url\'))\nLIFETIME(MIN 0 MAX 1)\nLAYOUT(CACHE(SIZE_IN_CELLS 1))
 16
diff --git a/tests/queries/0_stateless/01085_window_view_attach.sql b/tests/queries/0_stateless/01085_window_view_attach.sql
index 51a88a04f95..a40c6f20a1a 100644
--- a/tests/queries/0_stateless/01085_window_view_attach.sql
+++ b/tests/queries/0_stateless/01085_window_view_attach.sql
@@ -1,9 +1,11 @@
 
+SET send_logs_level = 'fatal';
 SET allow_experimental_analyzer = 0;
 SET allow_experimental_window_view = 1;
 
 DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier} ENGINE=Ordinary;
 
 DROP TABLE IF EXISTS {CLICKHOUSE_DATABASE:Identifier}.mt;
diff --git a/tests/queries/0_stateless/01086_window_view_cleanup.sh b/tests/queries/0_stateless/01086_window_view_cleanup.sh
index b078b4718c0..01bf50bc14d 100755
--- a/tests/queries/0_stateless/01086_window_view_cleanup.sh
+++ b/tests/queries/0_stateless/01086_window_view_cleanup.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Tags: no-parallel
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01087_table_function_generate.sql b/tests/queries/0_stateless/01087_table_function_generate.sql
index 10657dbd63a..ff7c3f3477d 100644
--- a/tests/queries/0_stateless/01087_table_function_generate.sql
+++ b/tests/queries/0_stateless/01087_table_function_generate.sql
@@ -195,3 +195,5 @@ SELECT a, b, c, d, e, f, g, hex(h) FROM test_table_2 ORDER BY a, b, c, d, e, f,
 SELECT '-';
 
 DROP TABLE IF EXISTS test_table_2;
+
+select * from generateRandom('x UInt64', Null, 10, 2) limit 2 format Null;
diff --git a/tests/queries/0_stateless/01092_memory_profiler.sql b/tests/queries/0_stateless/01092_memory_profiler.sql
index b69d3faf94e..3a04de650ce 100644
--- a/tests/queries/0_stateless/01092_memory_profiler.sql
+++ b/tests/queries/0_stateless/01092_memory_profiler.sql
@@ -1,4 +1,4 @@
--- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-parallel, no-fasttest, no-cpu-aarch64
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-parallel, no-fasttest
 
 SET allow_introspection_functions = 1;
 
diff --git a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference
index ba26f12fddf..c175bb6b6f8 100644
--- a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference
+++ b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.reference
@@ -17,6 +17,12 @@ distributed
 0	4
 1	4
 2	4
+test_cluster_1_shard_3_replicas_1_unavailable
+distributed
+local
+test_cluster_1_shard_3_replicas_1_unavailable with storageCluster
+distributed
+local
 parallel_distributed_insert_select=2
 test_shard_localhost
 0
@@ -35,3 +41,21 @@ local
 0	2
 1	2
 2	2
+test_cluster_1_shard_3_replicas_1_unavailable
+distributed
+0	1
+1	1
+2	1
+local
+0	1
+1	1
+2	1
+test_cluster_1_shard_3_replicas_1_unavailable with storageCluster
+distributed
+1	1
+2	1
+3	1
+local
+1	1
+2	1
+3	1
diff --git a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
index 8118d067325..ec650551baf 100644
--- a/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
+++ b/tests/queries/0_stateless/01099_parallel_distributed_insert_select.sql
@@ -87,6 +87,60 @@ DROP TABLE local_01099_b;
 DROP TABLE distributed_01099_a;
 DROP TABLE distributed_01099_b;
 
+--- test_cluster_1_shard_3_replicas_1_unavailable
+
+SELECT 'test_cluster_1_shard_3_replicas_1_unavailable';
+
+CREATE TABLE local_01099_a (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE local_01099_b (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE distributed_01099_a AS local_01099_a ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_a, rand());
+CREATE TABLE distributed_01099_b AS local_01099_b ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_b, rand());
+
+SYSTEM STOP DISTRIBUTED SENDS distributed_01099_b;
+SET prefer_localhost_replica=0; -- to require distributed send for local replica too
+INSERT INTO local_01099_a SELECT number from system.numbers limit 3;
+INSERT INTO distributed_01099_b SELECT * from distributed_01099_a;
+SET prefer_localhost_replica=1;
+
+-- distributed sends disabled, but they are not required, since insert is done into local table.
+-- (since parallel_distributed_insert_select=2)
+SELECT 'distributed';
+SELECT number, count(number) FROM distributed_01099_b group by number order by number;
+SELECT 'local';
+SELECT number, count(number) FROM local_01099_b group by number order by number;
+
+DROP TABLE local_01099_a;
+DROP TABLE local_01099_b;
+SET send_logs_level='fatal';
+DROP TABLE distributed_01099_a;
+DROP TABLE distributed_01099_b;
+SET send_logs_level='warning';
+
+--- test_cluster_1_shard_3_replicas_1_unavailable with storageCluster
+
+SELECT 'test_cluster_1_shard_3_replicas_1_unavailable with storageCluster';
+
+CREATE TABLE local_01099_b (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE distributed_01099_b AS local_01099_b ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_b, rand());
+
+SYSTEM STOP DISTRIBUTED SENDS distributed_01099_b;
+SET prefer_localhost_replica=0; -- to require distributed send for local replica too
+SET send_logs_level='error';
+INSERT INTO distributed_01099_b SELECT * FROM urlCluster('test_cluster_two_shards', 'http://localhost:8123/?query=select+{1,2,3}+format+TSV', 'TSV', 's String');
+SET send_logs_level='warning';
+SET prefer_localhost_replica=1;
+
+-- distributed sends disabled, but they are not required, since insert is done into local table.
+-- (since parallel_distributed_insert_select=2)
+SELECT 'distributed';
+SELECT number, count(number) FROM distributed_01099_b group by number order by number;
+SELECT 'local';
+SELECT number, count(number) FROM local_01099_b group by number order by number;
+
+DROP TABLE local_01099_b;
+SET send_logs_level='fatal';
+DROP TABLE distributed_01099_b;
+SET send_logs_level='warning';
 
 SET parallel_distributed_insert_select=2;
 SELECT 'parallel_distributed_insert_select=2';
@@ -164,3 +218,56 @@ DROP TABLE local_01099_a;
 DROP TABLE local_01099_b;
 DROP TABLE distributed_01099_a;
 DROP TABLE distributed_01099_b;
+
+--- test_cluster_1_shard_3_replicas_1_unavailable
+
+SELECT 'test_cluster_1_shard_3_replicas_1_unavailable';
+
+CREATE TABLE local_01099_a (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE local_01099_b (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE distributed_01099_a AS local_01099_a ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_a, rand());
+CREATE TABLE distributed_01099_b AS local_01099_b ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_b, rand());
+
+SYSTEM STOP DISTRIBUTED SENDS distributed_01099_b;
+SET prefer_localhost_replica=0; -- to require distributed send for local replica too
+INSERT INTO local_01099_a SELECT number from system.numbers limit 3;
+INSERT INTO distributed_01099_b SELECT * from distributed_01099_a;
+SET prefer_localhost_replica=1;
+
+-- distributed sends disabled, but they are not required, since insert is done into local table.
+-- (since parallel_distributed_insert_select=2)
+SELECT 'distributed';
+SELECT number, count(number) FROM distributed_01099_b group by number order by number;
+SELECT 'local';
+SELECT number, count(number) FROM local_01099_b group by number order by number;
+
+DROP TABLE local_01099_a;
+DROP TABLE local_01099_b;
+DROP TABLE distributed_01099_a;
+DROP TABLE distributed_01099_b;
+
+--- test_cluster_1_shard_3_replicas_1_unavailable with storageCluster
+
+SELECT 'test_cluster_1_shard_3_replicas_1_unavailable with storageCluster';
+
+CREATE TABLE local_01099_b (number UInt64) ENGINE = MergeTree() ORDER BY number;
+CREATE TABLE distributed_01099_b AS local_01099_b ENGINE = Distributed('test_cluster_1_shard_3_replicas_1_unavailable', currentDatabase(), local_01099_b, rand());
+
+SYSTEM STOP DISTRIBUTED SENDS distributed_01099_b;
+SET prefer_localhost_replica=0; -- to require distributed send for local replica too
+SET send_logs_level='error';
+INSERT INTO distributed_01099_b SELECT * FROM urlCluster('test_cluster_two_shards', 'http://localhost:8123/?query=select+{1,2,3}+format+TSV', 'TSV', 's String');
+SET send_logs_level='warning';
+SET prefer_localhost_replica=1;
+
+-- distributed sends disabled, but they are not required, since insert is done into local table.
+-- (since parallel_distributed_insert_select=2)
+SELECT 'distributed';
+SELECT number, count(number) FROM distributed_01099_b group by number order by number;
+SELECT 'local';
+SELECT number, count(number) FROM local_01099_b group by number order by number;
+
+DROP TABLE local_01099_b;
+SET send_logs_level='fatal';
+DROP TABLE distributed_01099_b;
+SET send_logs_level='warning';
diff --git a/tests/queries/0_stateless/01109_exchange_tables.sql b/tests/queries/0_stateless/01109_exchange_tables.sql
index c118945887b..b10377436f9 100644
--- a/tests/queries/0_stateless/01109_exchange_tables.sql
+++ b/tests/queries/0_stateless/01109_exchange_tables.sql
@@ -1,4 +1,5 @@
 -- Tags: no-parallel
+SET send_logs_level = 'fatal';
 
 DROP DATABASE IF EXISTS test_01109;
 CREATE DATABASE test_01109 ENGINE=Atomic;
@@ -31,6 +32,7 @@ DROP DATABASE IF EXISTS test_01109_other_atomic;
 DROP DATABASE IF EXISTS test_01109_ordinary;
 CREATE DATABASE test_01109_other_atomic;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01109_ordinary ENGINE=Ordinary;
 
 CREATE TABLE test_01109_other_atomic.t3 ENGINE=MergeTree() ORDER BY tuple()
@@ -63,6 +65,3 @@ DROP DATABASE test_01109;
 DROP DATABASE test_01109_other_atomic;
 DROP DATABASE test_01109_ordinary;
 DROP DATABASE test_01109_rename_exists;
-
-
-
diff --git a/tests/queries/0_stateless/01114_database_atomic.reference b/tests/queries/0_stateless/01114_database_atomic.reference
index 93e89e3a2ec..f42cd099d4e 100644
--- a/tests/queries/0_stateless/01114_database_atomic.reference
+++ b/tests/queries/0_stateless/01114_database_atomic.reference
@@ -1,4 +1,4 @@
-2
+1
 CREATE DATABASE test_01114_1\nENGINE = Atomic
 CREATE DATABASE test_01114_2\nENGINE = Atomic
 CREATE DATABASE test_01114_3\nENGINE = Ordinary
diff --git a/tests/queries/0_stateless/01114_database_atomic.sh b/tests/queries/0_stateless/01114_database_atomic.sh
index 3e1f9eb1f43..1b1f064ae0b 100755
--- a/tests/queries/0_stateless/01114_database_atomic.sh
+++ b/tests/queries/0_stateless/01114_database_atomic.sh
@@ -2,6 +2,9 @@
 # Tags: no-parallel, no-fasttest
 # Tag no-fasttest: 45 seconds running
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql b/tests/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql
index 767ca0e4073..b2ebe7e2cc2 100644
--- a/tests/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql
+++ b/tests/queries/0_stateless/01114_materialize_clear_index_compact_parts.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS minmax_compact;
 
 CREATE TABLE minmax_compact
diff --git a/tests/queries/0_stateless/01119_wierd_user_names.reference b/tests/queries/0_stateless/01119_weird_user_names.reference
similarity index 100%
rename from tests/queries/0_stateless/01119_wierd_user_names.reference
rename to tests/queries/0_stateless/01119_weird_user_names.reference
diff --git a/tests/queries/0_stateless/01119_wierd_user_names.sql b/tests/queries/0_stateless/01119_weird_user_names.sql
similarity index 89%
rename from tests/queries/0_stateless/01119_wierd_user_names.sql
rename to tests/queries/0_stateless/01119_weird_user_names.sql
index 7a28016f4f3..0d6f02786b0 100644
--- a/tests/queries/0_stateless/01119_wierd_user_names.sql
+++ b/tests/queries/0_stateless/01119_weird_user_names.sql
@@ -13,10 +13,10 @@ create user "       ";
 create user '   spaces';
 create user 'spaces    ';
 create user ` INTERSERVER SECRET `;  -- { serverError BAD_ARGUMENTS }
-create user '';  -- { serverError BAD_ARGUMENTS }
+create user '';  -- { clientError SYNTAX_ERROR }
 create user 'test 01119';
 alter user `test 01119` rename to " spaces ";
-alter user " spaces " rename to '';  -- { serverError BAD_ARGUMENTS }
+alter user " spaces " rename to '';  -- { clientError SYNTAX_ERROR }
 alter user " spaces " rename to " INTERSERVER SECRET ";  -- { serverError BAD_ARGUMENTS }
 create user "Ва�� Пупкин";
 create user "无�� ";
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 505c406c2cc..fc3fcb34fc0 100644
--- a/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
+++ b/tests/queries/0_stateless/01148_zookeeper_path_macros_unfolding.sql
@@ -1,5 +1,7 @@
 -- Tags: zookeeper, no-replicated-database, no-parallel, no-ordinary-database
 
+SET send_logs_level = 'fatal';
+
 DROP TABLE IF EXISTS rmt;
 DROP TABLE IF EXISTS rmt1;
 DROP TABLE IF EXISTS rmt2;
@@ -32,6 +34,7 @@ SHOW CREATE TABLE test_01148_atomic.rmt3;
 
 DROP DATABASE IF EXISTS test_01148_ordinary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01148_ordinary ENGINE=Ordinary;
 RENAME TABLE test_01148_atomic.rmt3 to test_01148_ordinary.rmt3; -- { serverError 48 }
 DROP DATABASE test_01148_ordinary;
diff --git a/tests/queries/0_stateless/01153_attach_mv_uuid.reference b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
index e37fe28e303..ca0a4b6ddbe 100644
--- a/tests/queries/0_stateless/01153_attach_mv_uuid.reference
+++ b/tests/queries/0_stateless/01153_attach_mv_uuid.reference
@@ -4,18 +4,18 @@
 2	4
 3	9
 4	16
-CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n\nAS SELECT\n    n,\n    n * n AS n2\nFROM default.src
 1	1
 2	4
-CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n\nAS SELECT\n    n,\n    n * n AS n2\nFROM default.src
 1	1
 2	4
 3	9
 4	16
-CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n\nAS SELECT\n    n,\n    n * n AS n2\nFROM default.src
 1	1
 2	4
-CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n AS\nSELECT\n    n,\n    n * n AS n2\nFROM default.src
+CREATE MATERIALIZED VIEW default.mv UUID \'e15f3ab5-6cae-4df3-b879-f40deafd82c2\' TO INNER UUID \'3bd68e3c-2693-4352-ad66-a66eba9e345e\'\n(\n    `n` Int32,\n    `n2` Int64\n)\nENGINE = MergeTree\nPARTITION BY n % 10\nORDER BY n\nAS SELECT\n    n,\n    n * n AS n2\nFROM default.src
 1	1
 2	4
 3	9
diff --git a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
index 1eff1c0779a..80ed707b695 100644
--- a/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
+++ b/tests/queries/0_stateless/01155_rename_move_materialized_view.sql
@@ -1,11 +1,13 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
 SET prefer_localhost_replica = 1;
 
 DROP DATABASE IF EXISTS test_01155_ordinary;
 DROP DATABASE IF EXISTS test_01155_atomic;
 
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01155_ordinary ENGINE=Ordinary;
 CREATE DATABASE test_01155_atomic ENGINE=Atomic;
 
@@ -70,7 +72,10 @@ RENAME DATABASE test_01155_ordinary TO test_01155_atomic;
 SET check_table_dependencies=1;
 
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
+SET send_logs_level='fatal';
 CREATE DATABASE test_01155_ordinary ENGINE=Ordinary;
+SET send_logs_level='warning';
 SHOW CREATE DATABASE test_01155_atomic;
 
 RENAME TABLE test_01155_atomic.mv1 TO test_01155_ordinary.mv1;
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.reference b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
index 547acb5b377..3a56c1a3d7b 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.reference
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.reference
@@ -5,16 +5,18 @@ log
 ::ffff:127.0.0.1	Request	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	\N	\N	\N		0	0	0	0
 ::ffff:127.0.0.1	Response	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	ZOK	\N	\N	/test/01158/default/rmt/log/log-0000000000	0	0	0	0
 parts
-Request	0	Multi		0	0	\N	4	0	\N	\N	\N		0	0	0	0
+Request	0	Multi		0	0	\N	5	0	\N	\N	\N		0	0	0	0
 Request	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	\N	\N	\N		0	0	0	0
 Request	0	Remove	/test/01158/default/rmt/block_numbers/all/block-0000000000	0	0	-1	0	2	\N	\N	\N		0	0	0	0
 Request	0	Create	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	3	\N	\N	\N		0	0	0	0
 Request	0	Create	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	\N	0	4	\N	\N	\N		0	0	0	0
-Response	0	Multi		0	0	\N	4	0	ZOK	\N	\N		0	0	0	0
+Request	0	Check	/clickhouse/sessions/zookeeper/<uuid>	0	0	1	0	5	\N	\N	\N		0	0	0	0
+Response	0	Multi		0	0	\N	5	0	ZOK	\N	\N		0	0	0	0
 Response	0	Create	/test/01158/default/rmt/log/log-	0	1	\N	0	1	ZOK	\N	\N	/test/01158/default/rmt/log/log-0000000000	0	0	0	0
 Response	0	Remove	/test/01158/default/rmt/block_numbers/all/block-0000000000	0	0	-1	0	2	ZOK	\N	\N		0	0	0	0
 Response	0	Create	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	\N	0	3	ZOK	\N	\N	/test/01158/default/rmt/blocks/all_6308706741995381342_2495791770474910886	0	0	0	0
 Response	0	Create	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	\N	0	4	ZOK	\N	\N	/test/01158/default/rmt/replicas/1/parts/all_0_0_0	0	0	0	0
+Response	0	Check	/clickhouse/sessions/zookeeper/<uuid>	0	0	1	0	5	ZOK	\N	\N		0	0	0	0
 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
@@ -32,5 +34,5 @@ Response	0	Error	/test/01158/default/rmt/blocks/all_6308706741995381342_24957917
 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
+duration_microseconds
 1
diff --git a/tests/queries/0_stateless/01158_zookeeper_log_long.sql b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
index 24fd8060548..55d4162fc48 100644
--- a/tests/queries/0_stateless/01158_zookeeper_log_long.sql
+++ b/tests/queries/0_stateless/01158_zookeeper_log_long.sql
@@ -26,7 +26,7 @@ from system.zookeeper_log where path like '/test/01158/' || currentDatabase() ||
 order by xid, type, request_idx;
 
 select 'parts';
-select type, has_watch, op_num, path, is_ephemeral, is_sequential, version, requests_size, request_idx, error, watch_type,
+select type, has_watch, op_num, replace(path, toString(serverUUID()), '<uuid>'), is_ephemeral, is_sequential, if(startsWith(path, '/clickhouse/sessions'), 1, version), requests_size, request_idx, error, watch_type,
        watch_state, path_created, stat_version, stat_cversion, stat_dataLength, stat_numChildren
 from system.zookeeper_log
 where (session_id, xid) in (select session_id, xid from system.zookeeper_log where path='/test/01158/' || currentDatabase() || '/rmt/replicas/1/parts/all_0_0_0')
@@ -42,5 +42,5 @@ order by xid, type, request_idx;
 drop table rmt sync;
 
 system flush logs;
-select 'duration_ms';
-select count()>0 from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt%' and duration_ms > 0;
+select 'duration_microseconds';
+select count()>0 from system.zookeeper_log where path like '/test/01158/' || currentDatabase() || '/rmt%' and duration_microseconds > 0;
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 619e212c3ae..8344bb6f426 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,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-parallel, no-ordinary-database
+# Tags: long, no-parallel, no-ordinary-database, no-debug
 # Test is too heavy, avoid parallel run in Flaky Check
 # shellcheck disable=SC2119
 
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
index b9a66a1e1a9..2151328d8b7 100644
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.reference
@@ -3,7 +3,7 @@ Received exception from server:
 Code: 57. Error: Received from localhost:9000. Error: There was an error on [localhost:9000]: Code: 57. Error: Table default.none already exists. (TABLE_ALREADY_EXISTS)
 (query: create table none on cluster test_shard_localhost (n int) engine=Memory;)
 Received exception from server:
-Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently executing the task), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+Code: 159. Error: Received from localhost:9000. Error: Distributed DDL task <task> is not finished on 1 of 2 hosts (0 of them are currently executing the task, 0 are inactive). They are going to execute the query in background. Was waiting for <sec> seconds, which is longer than distributed_ddl_task_timeout. (TIMEOUT_EXCEEDED)
 (query: drop table if exists none on cluster test_unavailable_shard;)
 throw
 localhost	9000	0		0	0
@@ -12,7 +12,7 @@ Code: 57. Error: Received from localhost:9000. Error: There was an error on [loc
 (query: create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;)
 localhost	9000	0		1	0
 Received exception from server:
-Code: 159. Error: Received from localhost:9000. Error: Watching task <task> is executing longer than distributed_ddl_task_timeout (=1) seconds. There are 1 unfinished hosts (0 of them are currently executing the task), they are going to execute the query in background. (TIMEOUT_EXCEEDED)
+Code: 159. Error: Received from localhost:9000. Error: Distributed DDL task <task> is not finished on 1 of 2 hosts (0 of them are currently executing the task, 0 are inactive). They are going to execute the query in background. Was waiting for <sec> seconds, which is longer than distributed_ddl_task_timeout. (TIMEOUT_EXCEEDED)
 (query: drop table if exists throw on cluster test_unavailable_shard;)
 null_status_on_timeout
 localhost	9000	0		0	0
diff --git a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
index 12e142adda9..f17e85da60a 100755
--- a/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
+++ b/tests/queries/0_stateless/01175_distributed_ddl_output_mode_long.sh
@@ -54,14 +54,14 @@ $CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test
 $CLIENT --distributed_ddl_output_mode=none -q "create table none on cluster test_shard_localhost (n int) engine=Memory;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 # Timeout
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'not finished on 1 ' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=none -q "drop table if exists none on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Distributed DDL task .* is not finished/Distributed DDL task <task> is not finished/" | sed "s/for .* seconds/for <sec> seconds/"
 
 
 $CLIENT --distributed_ddl_output_mode=throw -q "select value from system.settings where name='distributed_ddl_output_mode';"
 $CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory;"
 $CLIENT --distributed_ddl_output_mode=throw -q "create table throw on cluster test_shard_localhost (n int) engine=Memory format Null;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//"
 
-run_until_out_contains 'There are 1 unfinished hosts' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Watching task .* is executing longer/Watching task <task> is executing longer/"
+run_until_out_contains 'not finished on 1 ' $CLICKHOUSE_CLIENT_WITH_SETTINGS --distributed_ddl_output_mode=throw -q "drop table if exists throw on cluster test_unavailable_shard;" 2>&1 | sed "s/DB::Exception/Error/g" | sed "s/ (version.*)//" | sed "s/Distributed DDL task .* is not finished/Distributed DDL task <task> is not finished/" | sed "s/for .* seconds/for <sec> seconds/"
 
 
 $CLIENT --distributed_ddl_output_mode=null_status_on_timeout -q "select value from system.settings where name='distributed_ddl_output_mode';"
diff --git a/tests/queries/0_stateless/01176_mysql_client_interactive.expect b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
index 2bb6ba8726b..6bfff6dfab3 100755
--- a/tests/queries/0_stateless/01176_mysql_client_interactive.expect
+++ b/tests/queries/0_stateless/01176_mysql_client_interactive.expect
@@ -4,7 +4,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01179_insert_values_semicolon.expect b/tests/queries/0_stateless/01179_insert_values_semicolon.expect
index 072be483e4f..534b18a9500 100755
--- a/tests/queries/0_stateless/01179_insert_values_semicolon.expect
+++ b/tests/queries/0_stateless/01179_insert_values_semicolon.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01180_client_syntax_errors.expect b/tests/queries/0_stateless/01180_client_syntax_errors.expect
index 508ebc3433b..042b16c3296 100755
--- a/tests/queries/0_stateless/01180_client_syntax_errors.expect
+++ b/tests/queries/0_stateless/01180_client_syntax_errors.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
index d1a7144e886..1ac01fe6abc 100755
--- a/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
+++ b/tests/queries/0_stateless/01192_rename_database_zookeeper.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Tags: zookeeper, no-parallel, no-fasttest
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01193_metadata_loading.reference b/tests/queries/0_stateless/01193_metadata_loading.reference
deleted file mode 100644
index 9789cbf33ba..00000000000
--- a/tests/queries/0_stateless/01193_metadata_loading.reference
+++ /dev/null
@@ -1,5 +0,0 @@
-1000	0	2020-06-25	hello	[1,2]	[3,4]
-1000	1	2020-06-26	word	[10,20]	[30,40]
-ok
-8000	0	2020-06-25	hello	[1,2]	[3,4]
-8000	1	2020-06-26	word	[10,20]	[30,40]
diff --git a/tests/queries/0_stateless/01193_metadata_loading.sh b/tests/queries/0_stateless/01193_metadata_loading.sh
deleted file mode 100755
index c25cdf4e970..00000000000
--- a/tests/queries/0_stateless/01193_metadata_loading.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-parallel, no-fasttest, no-s3-storage
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-# Check that attaching a database with a large number of tables is not too slow.
-# it is the worst way of making performance test, nevertheless it can detect significant slowdown and some other issues, that usually found by stress test
-
-db="test_01193_$RANDOM"
-tables=1000
-threads=10
-count_multiplier=1
-max_time_ms=1500
-
-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
-
-create_tables() {
-  $CLICKHOUSE_CLIENT -q "WITH
-          'CREATE TABLE $db.table_$1_' AS create1,
-          ' (i UInt64, d Date, s String, n Nested(i UInt8, f Float32)) ENGINE=' AS create2,
-          ['Memory', 'File(CSV)', 'Log', 'StripeLog', 'MergeTree ORDER BY i'] AS engines,
-          'INSERT INTO $db.table_$1_' AS insert1,
-          ' VALUES (0, ''2020-06-25'', ''hello'', [1, 2], [3, 4]), (1, ''2020-06-26'', ''word'', [10, 20], [30, 40])' AS insert2
-      SELECT arrayStringConcat(
-          groupArray(
-              create1 || toString(number) || create2 || engines[1 + number % length(engines)] || ';\n' ||
-              insert1 ||  toString(number) || insert2
-          ), ';\n') FROM numbers($tables) SETTINGS max_bytes_before_external_group_by = 0 FORMAT TSVRaw;" | $CLICKHOUSE_CLIENT -nm
-}
-
-$CLICKHOUSE_CLIENT -q "CREATE DATABASE $db"
-
-for i in $(seq 1 $threads); do
-  create_tables "$i" &
-done
-wait
-
-$CLICKHOUSE_CLIENT -q "CREATE TABLE $db.table_merge (i UInt64, d Date, s String, n Nested(i UInt8, f Float32)) ENGINE=Merge('$db', '^table_')"
-$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM merge('$db', '^table_9') GROUP BY i, d, s, n.i, n.f ORDER BY i"
-
-for i in {1..50}; do
-  $CLICKHOUSE_CLIENT -q "DETACH DATABASE $db"
-  $CLICKHOUSE_CLIENT --query_profiler_real_time_period_ns=100000000 --query_profiler_cpu_time_period_ns=100000000 -q "ATTACH DATABASE $db" --query_id="$db-$i";
-done
-
-$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
-durations=$($CLICKHOUSE_CLIENT -q "SELECT groupArray(query_duration_ms) FROM system.query_log WHERE current_database = currentDatabase() AND query_id LIKE '$db-%' AND type=2")
-$CLICKHOUSE_CLIENT -q "SELECT 'durations', '$db', $durations FORMAT Null"
-$CLICKHOUSE_CLIENT -q "SELECT if(quantile(0.5)(arrayJoin($durations)) < $max_time_ms, 'ok', toString($durations))"
-
-$CLICKHOUSE_CLIENT -q "SELECT count() * $count_multiplier, i, d, s, n.i, n.f FROM $db.table_merge GROUP BY i, d, s, n.i, n.f ORDER BY i"
-
-$CLICKHOUSE_CLIENT -q "DROP DATABASE IF EXISTS $db"
diff --git a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
index bca2286aa22..2266da5fc8f 100644
--- a/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
+++ b/tests/queries/0_stateless/01200_mutations_memory_consumption.sql
@@ -1,4 +1,4 @@
--- Tags: no-debug, no-parallel, long, no-s3-storage, no-random-merge-tree-settings
+-- Tags: no-debug, no-parallel, long, no-s3-storage, no-random-settings, no-random-merge-tree-settings
 
 DROP TABLE IF EXISTS table_with_single_pk;
 
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 24ed935a125..1c2b3eb3dbf 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
@@ -1,3 +1,5 @@
+-- Tags: long
+
 DROP TABLE IF EXISTS t;
 
 CREATE TABLE t
@@ -8,7 +10,7 @@ ENGINE = MergeTree
 ORDER BY number
 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;
+SET min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0, max_insert_threads = 1;
 INSERT INTO t SELECT number FROM numbers(10000000);
 
 SET max_threads = 1, max_block_size = 12345;
diff --git a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
index 5db92e70650..2a1b202c6dd 100644
--- a/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
+++ b/tests/queries/0_stateless/01224_no_superfluous_dict_reload.sql
@@ -1,8 +1,11 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 DROP DATABASE IF EXISTS dict_db_01224;
 DROP DATABASE IF EXISTS dict_db_01224_dictionary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE dict_db_01224 ENGINE=Ordinary;  -- Different internal dictionary name with Atomic
 CREATE DATABASE dict_db_01224_dictionary Engine=Dictionary;
 
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 bc733a0c546..28a5a0d9d55 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
@@ -1,8 +1,11 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 DROP DATABASE IF EXISTS dict_db_01225;
 DROP DATABASE IF EXISTS dict_db_01225_dictionary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE dict_db_01225 ENGINE=Ordinary;    -- Different internal dictionary name with Atomic
 CREATE DATABASE dict_db_01225_dictionary Engine=Dictionary;
 
diff --git a/tests/queries/0_stateless/01232_json_as_string_format.sh b/tests/queries/0_stateless/01232_json_as_string_format.sh
index 667aea7ba78..8d2fe193b55 100755
--- a/tests/queries/0_stateless/01232_json_as_string_format.sh
+++ b/tests/queries/0_stateless/01232_json_as_string_format.sh
@@ -9,7 +9,7 @@ $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS json_as_string";
 
 $CLICKHOUSE_CLIENT --query="CREATE TABLE json_as_string (field String) ENGINE = Memory";
 
-echo '
+cat << 'EOF' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
 {
     "id" : 1,
     "date" : "01.01.2020",
@@ -42,9 +42,10 @@ echo '
         "{" : 1,
         "}}" : 2
     }
-}' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
+}
+EOF
 
-echo '
+cat << 'EOF' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
 [
     {
         "id" : 1,
@@ -79,7 +80,8 @@ echo '
             "}}" : 2
         }
     }
-]' | $CLICKHOUSE_CLIENT --query="INSERT INTO json_as_string FORMAT JSONAsString";
+]
+EOF
 
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM json_as_string ORDER BY field";
diff --git a/tests/queries/0_stateless/01234_to_string_monotonic.sql b/tests/queries/0_stateless/01234_to_string_monotonic.sql
index 87324fdda27..65b7ab21073 100644
--- a/tests/queries/0_stateless/01234_to_string_monotonic.sql
+++ b/tests/queries/0_stateless/01234_to_string_monotonic.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
 
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
index a4a6b87de25..9921a1eaac9 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.reference
@@ -60,9 +60,9 @@ LIMIT OFFSET
 OFFSET distributed_push_down_limit=0
 1	1
 OFFSET distributed_push_down_limit=1
-1	1
 1	0
 1	1
+1	1
 WHERE LIMIT OFFSET
 1	1
 LIMIT BY 1
diff --git a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
index 0d24b238d64..63dbd9c2cc9 100644
--- a/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01244_optimize_distributed_group_by_sharding_key.sql
@@ -42,7 +42,7 @@ select 'GROUP BY number ORDER BY number DESC';
 select count(), * from dist_01247 group by number order by number desc;
 
 select 'GROUP BY toString(number)';
-select count(), * from dist_01247 group by toString(number);
+select count(), any(number) from dist_01247 group by toString(number);
 
 select 'GROUP BY number%2';
 select count(), any(number) from dist_01247 group by number%2;
@@ -69,7 +69,7 @@ select count(), * from dist_01247 group by number limit 1 offset 1;
 select 'OFFSET distributed_push_down_limit=0';
 select count(), * from dist_01247 group by number offset 1 settings distributed_push_down_limit=0;
 select 'OFFSET distributed_push_down_limit=1';
-select count(), * from dist_01247 group by number offset 1 settings distributed_push_down_limit=1;
+select count(), * from dist_01247 group by number order by count(), number offset 1 settings distributed_push_down_limit=1;
 -- this will emulate different data on for different shards
 select 'WHERE LIMIT OFFSET';
 select count(), * from dist_01247 where number = _shard_num-1 group by number order by number limit 1 offset 1;
diff --git a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
index d187a2e4d4e..0c9cfafa496 100644
--- a/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
+++ b/tests/queries/0_stateless/01249_bad_arguments_for_bloom_filter.sql
@@ -1,7 +1,10 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 DROP DATABASE IF EXISTS test_01249;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01249 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01249;
 
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
index ea04f155f24..1f7d5d44df4 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_long.reference
@@ -1,8 +1,8 @@
 SELECT
-    sum(n + 1),
-    sum(1 + n),
-    sum(n - 1),
-    sum(1 - n)
+    sum(n) + (1 * count(n)),
+    (1 * count(n)) + sum(n),
+    sum(n) - (1 * count(n)),
+    (1 * count(n)) - sum(n)
 FROM
 (
     SELECT number AS n
@@ -59,10 +59,10 @@ FROM
     FROM numbers(10)
 )
 SELECT
-    sum(n + -1),
-    sum(-1 + n),
-    sum(n - -1),
-    sum(-1 - n)
+    sum(n) + (-1 * count(n)),
+    (-1 * count(n)) + sum(n),
+    sum(n) - (-1 * count(n)),
+    (-1 * count(n)) - sum(n)
 FROM
 (
     SELECT number AS n
@@ -418,7 +418,7 @@ FROM
     SELECT number AS n
     FROM numbers(10)
 )
-SELECT ((sum(n + 1) + sum(1 + n)) + sum(n - 1)) + sum(1 - n)
+SELECT (((sum(n) + (1 * count(n))) + ((1 * count(n)) + sum(n))) + (sum(n) - (1 * count(n)))) + ((1 * count(n)) - sum(n))
 FROM
 (
     SELECT number AS n
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
index 9e0d871041b..54448ba3b68 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.reference
@@ -8,3 +8,21 @@ FROM
 WHERE (a > 0) AND (b > 0)
 HAVING c > 0
 2
+SELECT min(n) + 1 AS c
+FROM
+(
+    SELECT number AS n
+    FROM numbers(10)
+    WHERE (n + 1) > 0
+)
+WHERE ((n + 1) AS a) > 0
+HAVING c > 0
+1
+SELECT min(n) + 1 AS c
+FROM
+(
+    SELECT number AS n
+    FROM numbers(10)
+)
+HAVING c > 0
+1
diff --git a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
index 242a253e67c..7c27994aca8 100644
--- a/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
+++ b/tests/queries/0_stateless/01271_optimize_arithmetic_operations_in_aggr_func_with_alias.sql
@@ -3,3 +3,9 @@ SET convert_query_to_cnf = 0;
 
 explain syntax select min((n as a) + (1 as b)) c from (select number n from numbers(10)) where a > 0 and b > 0 having c > 0;
 select min((n as a) + (1 as b)) c from (select number n from numbers(10)) where a > 0 and b > 0 having c > 0;
+
+explain syntax select min((n + 1) as a) c from (select number n from numbers(10)) where a > 0 having c > 0;
+select min((n + 1) as a) c from (select number n from numbers(10)) where a > 0 having c > 0;
+
+explain syntax select min(n + 1) as c from (select number n from numbers(10)) having c > 0;
+select min(n + 1) c from (select number n from numbers(10)) having c > 0;
diff --git a/tests/queries/0_stateless/01271_show_privileges.reference b/tests/queries/0_stateless/01271_show_privileges.reference
index f9f5c2bd3df..b1237189cb3 100644
--- a/tests/queries/0_stateless/01271_show_privileges.reference
+++ b/tests/queries/0_stateless/01271_show_privileges.reference
@@ -46,9 +46,9 @@ ALTER DATABASE SETTINGS	['ALTER DATABASE SETTING','ALTER MODIFY DATABASE SETTING
 ALTER NAMED COLLECTION	[]	NAMED_COLLECTION	NAMED COLLECTION ADMIN
 ALTER TABLE	[]	\N	ALTER
 ALTER DATABASE	[]	\N	ALTER
-ALTER VIEW REFRESH	['ALTER LIVE VIEW REFRESH','REFRESH VIEW']	VIEW	ALTER VIEW
 ALTER VIEW MODIFY QUERY	['ALTER TABLE MODIFY QUERY']	VIEW	ALTER VIEW
 ALTER VIEW MODIFY REFRESH	['ALTER TABLE MODIFY QUERY']	VIEW	ALTER VIEW
+ALTER VIEW MODIFY SQL SECURITY	['ALTER TABLE MODIFY SQL SECURITY']	VIEW	ALTER VIEW
 ALTER VIEW	[]	\N	ALTER
 ALTER	[]	\N	ALL
 CREATE DATABASE	[]	DATABASE	CREATE
@@ -90,6 +90,7 @@ DROP QUOTA	[]	GLOBAL	ACCESS MANAGEMENT
 CREATE SETTINGS PROFILE	['CREATE PROFILE']	GLOBAL	ACCESS MANAGEMENT
 ALTER SETTINGS PROFILE	['ALTER PROFILE']	GLOBAL	ACCESS MANAGEMENT
 DROP SETTINGS PROFILE	['DROP PROFILE']	GLOBAL	ACCESS MANAGEMENT
+ALLOW SQL SECURITY NONE	['CREATE SQL SECURITY NONE','ALLOW SQL SECURITY NONE','SQL SECURITY NONE','SECURITY NONE']	GLOBAL	ACCESS MANAGEMENT
 SHOW USERS	['SHOW CREATE USER']	GLOBAL	SHOW ACCESS
 SHOW ROLES	['SHOW CREATE ROLE']	GLOBAL	SHOW ACCESS
 SHOW ROW POLICIES	['SHOW POLICIES','SHOW CREATE ROW POLICY','SHOW CREATE POLICY']	TABLE	SHOW ACCESS
@@ -101,15 +102,19 @@ SHOW NAMED COLLECTIONS	['SHOW NAMED COLLECTIONS']	NAMED_COLLECTION	NAMED COLLECT
 SHOW NAMED COLLECTIONS SECRETS	['SHOW NAMED COLLECTIONS SECRETS']	NAMED_COLLECTION	NAMED COLLECTION ADMIN
 NAMED COLLECTION	['NAMED COLLECTION USAGE','USE NAMED COLLECTION']	NAMED_COLLECTION	NAMED COLLECTION ADMIN
 NAMED COLLECTION ADMIN	['NAMED COLLECTION CONTROL']	NAMED_COLLECTION	ALL
+SET DEFINER	[]	USER_NAME	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 CONNECTIONS CACHE	['SYSTEM DROP CONNECTIONS CACHE','DROP CONNECTIONS CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP MARK CACHE	['SYSTEM DROP MARK','DROP MARK CACHE','DROP MARKS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP UNCOMPRESSED CACHE	['SYSTEM DROP UNCOMPRESSED','DROP UNCOMPRESSED CACHE','DROP UNCOMPRESSED']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP MMAP CACHE	['SYSTEM DROP MMAP','DROP MMAP CACHE','DROP MMAP']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP QUERY CACHE	['SYSTEM DROP QUERY','DROP QUERY CACHE','DROP QUERY']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP COMPILED EXPRESSION CACHE	['SYSTEM DROP COMPILED EXPRESSION','DROP COMPILED EXPRESSION CACHE','DROP COMPILED EXPRESSIONS']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP FILESYSTEM CACHE	['SYSTEM DROP FILESYSTEM CACHE','DROP FILESYSTEM CACHE']	GLOBAL	SYSTEM DROP CACHE
+SYSTEM DROP DISTRIBUTED CACHE	['SYSTEM DROP DISTRIBUTED CACHE','DROP DISTRIBUTED CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM SYNC FILESYSTEM CACHE	['SYSTEM REPAIR FILESYSTEM CACHE','REPAIR FILESYSTEM CACHE','SYNC FILESYSTEM CACHE']	GLOBAL	SYSTEM
+SYSTEM DROP PAGE CACHE	['SYSTEM DROP PAGE CACHE','DROP PAGE CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP SCHEMA CACHE	['SYSTEM DROP SCHEMA CACHE','DROP SCHEMA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP FORMAT SCHEMA CACHE	['SYSTEM DROP FORMAT SCHEMA CACHE','DROP FORMAT SCHEMA CACHE']	GLOBAL	SYSTEM DROP CACHE
 SYSTEM DROP S3 CLIENT CACHE	['SYSTEM DROP S3 CLIENT','DROP S3 CLIENT CACHE']	GLOBAL	SYSTEM DROP CACHE
@@ -120,6 +125,7 @@ SYSTEM RELOAD DICTIONARY	['SYSTEM RELOAD DICTIONARIES','RELOAD DICTIONARY','RELO
 SYSTEM RELOAD MODEL	['SYSTEM RELOAD MODELS','RELOAD MODEL','RELOAD MODELS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD FUNCTION	['SYSTEM RELOAD FUNCTIONS','RELOAD FUNCTION','RELOAD FUNCTIONS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD EMBEDDED DICTIONARIES	['RELOAD EMBEDDED DICTIONARIES']	GLOBAL	SYSTEM RELOAD
+SYSTEM RELOAD ASYNCHRONOUS METRICS	['RELOAD ASYNCHRONOUS METRICS']	GLOBAL	SYSTEM RELOAD
 SYSTEM RELOAD	[]	\N	SYSTEM
 SYSTEM RESTART DISK	['SYSTEM RESTART DISK']	GLOBAL	SYSTEM
 SYSTEM MERGES	['SYSTEM STOP MERGES','SYSTEM START MERGES','STOP MERGES','START MERGES']	TABLE	SYSTEM
@@ -133,6 +139,7 @@ SYSTEM DISTRIBUTED SENDS	['SYSTEM STOP DISTRIBUTED SENDS','SYSTEM START DISTRIBU
 SYSTEM REPLICATED SENDS	['SYSTEM STOP REPLICATED SENDS','SYSTEM START REPLICATED SENDS','STOP REPLICATED SENDS','START REPLICATED SENDS']	TABLE	SYSTEM SENDS
 SYSTEM SENDS	['SYSTEM STOP SENDS','SYSTEM START SENDS','STOP SENDS','START SENDS']	\N	SYSTEM
 SYSTEM REPLICATION QUEUES	['SYSTEM STOP REPLICATION QUEUES','SYSTEM START REPLICATION QUEUES','STOP REPLICATION QUEUES','START REPLICATION QUEUES']	TABLE	SYSTEM
+SYSTEM VIRTUAL PARTS UPDATE	['SYSTEM STOP VIRTUAL PARTS UPDATE','SYSTEM START VIRTUAL PARTS UPDATE','STOP VIRTUAL PARTS UPDATE','START VIRTUAL PARTS UPDATE']	TABLE	SYSTEM
 SYSTEM DROP REPLICA	['DROP REPLICA']	TABLE	SYSTEM
 SYSTEM SYNC REPLICA	['SYNC REPLICA']	TABLE	SYSTEM
 SYSTEM REPLICA READINESS	['SYSTEM REPLICA READY','SYSTEM REPLICA UNREADY']	GLOBAL	SYSTEM
@@ -148,7 +155,7 @@ SYSTEM FLUSH ASYNC INSERT QUEUE	['FLUSH ASYNC INSERT QUEUE']	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 FAILPOINT	['SYSTEM ENABLE FAILPOINT','SYSTEM DISABLE FAILPOINT','SYSTEM WAIT FAILPOINT']	GLOBAL	SYSTEM
 SYSTEM LISTEN	['SYSTEM START LISTEN','SYSTEM STOP LISTEN']	GLOBAL	SYSTEM
 SYSTEM JEMALLOC	['SYSTEM JEMALLOC PURGE','SYSTEM JEMALLOC ENABLE PROFILE','SYSTEM JEMALLOC DISABLE PROFILE','SYSTEM JEMALLOC FLUSH PROFILE']	GLOBAL	SYSTEM
 SYSTEM	[]	\N	ALL
diff --git a/tests/queries/0_stateless/01278_format_multiple_queries.reference b/tests/queries/0_stateless/01278_format_multiple_queries.reference
index 001b10b0990..9e3ae2250b3 100644
--- a/tests/queries/0_stateless/01278_format_multiple_queries.reference
+++ b/tests/queries/0_stateless/01278_format_multiple_queries.reference
@@ -1,7 +1,7 @@
 SELECT
     a,
     b AS x
-FROM table AS t
+FROM `table` AS t
 INNER JOIN table2 AS t2 ON t.id = t2.t_id
 WHERE 1 = 1
 ;
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 08cc97c84bf..713d187cd88 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(200000); -- { serverError 241 }" > /dev/null 2>&1
     local ret_code=$?
     if [[ $ret_code -eq 0 ]];
     then
diff --git a/tests/queries/0_stateless/01281_parseDateTime64BestEffort.sql b/tests/queries/0_stateless/01281_parseDateTime64BestEffort.sql
index c1cec6ea212..808eaf291d5 100644
--- a/tests/queries/0_stateless/01281_parseDateTime64BestEffort.sql
+++ b/tests/queries/0_stateless/01281_parseDateTime64BestEffort.sql
@@ -7,7 +7,7 @@ SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', 'bar');  -- {ser
 SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', 3, 4);  -- {serverError 43} -- invalid timezone parameter
 SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', 3, 'baz');  -- {serverError BAD_ARGUMENTS} -- unknown timezone
 
-SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', materialize(3), 4);  -- {serverError 44} -- non-const precision
+SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', materialize(3), 4);  -- {serverError 43, 44} -- non-const precision
 SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184Z', 3, materialize('UTC'));  -- {serverError 44} -- non-const timezone
 
 SELECT parseDateTime64BestEffort('2020-05-14T03:37:03.253184012345678910111213141516171819Z', 3, 'UTC'); -- {serverError 6}
diff --git a/tests/queries/0_stateless/01287_max_execution_speed.sql b/tests/queries/0_stateless/01287_max_execution_speed.sql
index 104c10a323d..6c749294975 100644
--- a/tests/queries/0_stateless/01287_max_execution_speed.sql
+++ b/tests/queries/0_stateless/01287_max_execution_speed.sql
@@ -2,13 +2,13 @@
 
 SET min_execution_speed = 100000000000, timeout_before_checking_execution_speed = 0;
 SELECT count() FROM system.numbers; -- { serverError 160 }
-SELECT 'Ok (1)';
 SET min_execution_speed = 0;
+SELECT 'Ok (1)';
 
 SET min_execution_speed_bytes = 800000000000, timeout_before_checking_execution_speed = 0;
 SELECT count() FROM system.numbers; -- { serverError 160 }
-SELECT 'Ok (2)';
 SET min_execution_speed_bytes = 0;
+SELECT 'Ok (2)';
 
 SET max_execution_speed = 1000000;
 SET max_block_size = 100;
diff --git a/tests/queries/0_stateless/01292_create_user.reference b/tests/queries/0_stateless/01292_create_user.reference
index b7c30b304bf..d5841a74a2c 100644
--- a/tests/queries/0_stateless/01292_create_user.reference
+++ b/tests/queries/0_stateless/01292_create_user.reference
@@ -56,14 +56,14 @@ CREATE USER u1_01292 HOST LOCAL
 CREATE USER `u2_01292@%.myhost.com`
 -- settings
 CREATE USER u1_01292
-CREATE USER u2_01292 SETTINGS PROFILE default
+CREATE USER u2_01292 SETTINGS PROFILE `default`
 CREATE USER u3_01292 SETTINGS max_memory_usage = 5000000
 CREATE USER u4_01292 SETTINGS max_memory_usage MIN 5000000
 CREATE USER u5_01292 SETTINGS max_memory_usage MAX 5000000
 CREATE USER u6_01292 SETTINGS max_memory_usage CONST
 CREATE USER u7_01292 SETTINGS max_memory_usage WRITABLE
 CREATE USER u8_01292 SETTINGS max_memory_usage = 5000000 MIN 4000000 MAX 6000000 CONST
-CREATE USER u9_01292 SETTINGS PROFILE default, max_memory_usage = 5000000 WRITABLE
+CREATE USER u9_01292 SETTINGS PROFILE `default`, max_memory_usage = 5000000 WRITABLE
 CREATE USER u1_01292 SETTINGS readonly = 1
 CREATE USER u2_01292 SETTINGS readonly = 1
 CREATE USER u3_01292
@@ -82,7 +82,7 @@ CREATE USER u5_01292 DEFAULT ROLE ALL EXCEPT r1_01292
 CREATE USER u6_01292 DEFAULT ROLE NONE
 -- complex
 CREATE USER u1_01292 IDENTIFIED WITH plaintext_password HOST LOCAL SETTINGS readonly = 1
-CREATE USER u1_01292 HOST LIKE \'%.%.myhost.com\' DEFAULT ROLE NONE SETTINGS PROFILE default
+CREATE USER u1_01292 HOST LIKE \'%.%.myhost.com\' DEFAULT ROLE NONE SETTINGS PROFILE `default`
 -- if not exists
 CREATE USER u1_01292
 GRANT r1_01292 TO u1_01292
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
index 25933777f9f..3de7df04ec0 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_multiline.expect
@@ -2,8 +2,14 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
index 1ded43d3fed..68d2d1f0a13 100755
--- a/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
+++ b/tests/queries/0_stateless/01293_client_interactive_vertical_singleline.expect
@@ -2,8 +2,14 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01293_create_role.reference b/tests/queries/0_stateless/01293_create_role.reference
index 42f091bddd5..f1bd76322d4 100644
--- a/tests/queries/0_stateless/01293_create_role.reference
+++ b/tests/queries/0_stateless/01293_create_role.reference
@@ -11,14 +11,14 @@ CREATE ROLE `r2_01293@%.myhost.com`
 CREATE ROLE `r2_01293@%.myhost.com`
 -- settings
 CREATE ROLE r1_01293
-CREATE ROLE r2_01293 SETTINGS PROFILE default
+CREATE ROLE r2_01293 SETTINGS PROFILE `default`
 CREATE ROLE r3_01293 SETTINGS max_memory_usage = 5000000
 CREATE ROLE r4_01293 SETTINGS max_memory_usage MIN 5000000
 CREATE ROLE r5_01293 SETTINGS max_memory_usage MAX 5000000
 CREATE ROLE r6_01293 SETTINGS max_memory_usage CONST
 CREATE ROLE r7_01293 SETTINGS max_memory_usage WRITABLE
 CREATE ROLE r8_01293 SETTINGS max_memory_usage = 5000000 MIN 4000000 MAX 6000000 CONST
-CREATE ROLE r9_01293 SETTINGS PROFILE default, max_memory_usage = 5000000 WRITABLE
+CREATE ROLE r9_01293 SETTINGS PROFILE `default`, max_memory_usage = 5000000 WRITABLE
 CREATE ROLE r1_01293 SETTINGS readonly = 1
 CREATE ROLE r2_01293 SETTINGS readonly = 1
 CREATE ROLE r3_01293
diff --git a/tests/queries/0_stateless/01293_pretty_max_value_width.reference b/tests/queries/0_stateless/01293_pretty_max_value_width.reference
index 9887169f7af..3c82bd8d7ed 100644
--- a/tests/queries/0_stateless/01293_pretty_max_value_width.reference
+++ b/tests/queries/0_stateless/01293_pretty_max_value_width.reference
@@ -84,31 +84,31 @@
 ����┳���┓
 ┃ x ┃ y ┃
 ┡���╇���┩
-│ ⋯ │ ⋯ │
+│ привет │ мир │
 └───┴───┘
 ┌─x─┬─y─�
-│ ⋯ │ ⋯ │
+│ привет │ мир │
 └───┴───┘
  x   y
 
- ⋯   ⋯ 
+ привет   мир 
 ����┳���┓
 ┃ x ┃ y ┃
 ┡���╇���┩
-│ ⋯ │ ⋯ │
+│ привет │ мир │
 ├───┼───┤
-│ ⋯ │ ⋯ │
+│ мир │ привет │
 └───┴───┘
 ┌─x─┬─y─�
-│ ⋯ │ ⋯ │
-│ ⋯ │ ⋯ │
+│ привет │ мир │
+│ мир │ привет │
 └───┴───┘
  x   y
 
- ⋯   ⋯ 
- ⋯   ⋯ 
+ привет   мир 
+ мир   привет 
 ����┳���┓
 ┃ x ┃ y ┃
 ┡���╇���┩
-│ ⋯ │ ⋯ │
+│ привет │ мир │
 └───┴───┘
diff --git a/tests/queries/0_stateless/01293_pretty_max_value_width.sql b/tests/queries/0_stateless/01293_pretty_max_value_width.sql
index 992aec06f0a..a8e0f19f58e 100644
--- a/tests/queries/0_stateless/01293_pretty_max_value_width.sql
+++ b/tests/queries/0_stateless/01293_pretty_max_value_width.sql
@@ -1,3 +1,4 @@
+SET output_format_pretty_color = 1, output_format_pretty_max_value_width_apply_for_single_value = 1, output_format_pretty_row_numbers = 0;
 SELECT 'привет' AS x, 'мир' AS y FORMAT Pretty;
 
 SET output_format_pretty_max_value_width = 5;
diff --git a/tests/queries/0_stateless/01293_show_settings.reference b/tests/queries/0_stateless/01293_show_settings.reference
index f053387d1c5..187f55697e4 100644
--- a/tests/queries/0_stateless/01293_show_settings.reference
+++ b/tests/queries/0_stateless/01293_show_settings.reference
@@ -3,6 +3,7 @@ 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
+s3_connect_timeout_ms	UInt64	1000
 filesystem_prefetch_max_memory_usage	UInt64	1073741824
 max_untracked_memory	UInt64	1048576
 memory_profiler_step	UInt64	1048576
diff --git a/tests/queries/0_stateless/01294_create_settings_profile.reference b/tests/queries/0_stateless/01294_create_settings_profile.reference
index a10d5758752..7e1838c8dae 100644
--- a/tests/queries/0_stateless/01294_create_settings_profile.reference
+++ b/tests/queries/0_stateless/01294_create_settings_profile.reference
@@ -1,57 +1,57 @@
 -- default
-CREATE SETTINGS PROFILE s1_01294
+CREATE SETTINGS PROFILE `s1_01294`
 -- same as default
-CREATE SETTINGS PROFILE s2_01294
-CREATE SETTINGS PROFILE s3_01294
+CREATE SETTINGS PROFILE `s2_01294`
+CREATE SETTINGS PROFILE `s3_01294`
 -- rename
-CREATE SETTINGS PROFILE s2_01294_renamed
+CREATE SETTINGS PROFILE `s2_01294_renamed`
 -- settings
-CREATE SETTINGS PROFILE s1_01294
-CREATE SETTINGS PROFILE s2_01294 SETTINGS INHERIT default
-CREATE SETTINGS PROFILE s3_01294 SETTINGS max_memory_usage = 5000000
-CREATE SETTINGS PROFILE s4_01294 SETTINGS max_memory_usage MIN 5000000
-CREATE SETTINGS PROFILE s5_01294 SETTINGS max_memory_usage MAX 5000000
-CREATE SETTINGS PROFILE s6_01294 SETTINGS max_memory_usage CONST
-CREATE SETTINGS PROFILE s7_01294 SETTINGS max_memory_usage WRITABLE
-CREATE SETTINGS PROFILE s8_01294 SETTINGS max_memory_usage = 5000000 MIN 4000000 MAX 6000000 CONST
-CREATE SETTINGS PROFILE s9_01294 SETTINGS INHERIT default, max_memory_usage = 5000000 WRITABLE
-CREATE SETTINGS PROFILE s10_01294 SETTINGS INHERIT s1_01294, INHERIT s3_01294, INHERIT default, readonly = 0, max_memory_usage MAX 6000000
-CREATE SETTINGS PROFILE s1_01294 SETTINGS readonly = 0
-CREATE SETTINGS PROFILE s2_01294 SETTINGS readonly = 1
-CREATE SETTINGS PROFILE s3_01294
+CREATE SETTINGS PROFILE `s1_01294`
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS INHERIT `default`
+CREATE SETTINGS PROFILE `s3_01294` SETTINGS max_memory_usage = 5000000
+CREATE SETTINGS PROFILE `s4_01294` SETTINGS max_memory_usage MIN 5000000
+CREATE SETTINGS PROFILE `s5_01294` SETTINGS max_memory_usage MAX 5000000
+CREATE SETTINGS PROFILE `s6_01294` SETTINGS max_memory_usage CONST
+CREATE SETTINGS PROFILE `s7_01294` SETTINGS max_memory_usage WRITABLE
+CREATE SETTINGS PROFILE `s8_01294` SETTINGS max_memory_usage = 5000000 MIN 4000000 MAX 6000000 CONST
+CREATE SETTINGS PROFILE `s9_01294` SETTINGS INHERIT `default`, max_memory_usage = 5000000 WRITABLE
+CREATE SETTINGS PROFILE `s10_01294` SETTINGS INHERIT `s1_01294`, INHERIT `s3_01294`, INHERIT `default`, readonly = 0, max_memory_usage MAX 6000000
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS readonly = 0
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS readonly = 1
+CREATE SETTINGS PROFILE `s3_01294`
 -- to roles
-CREATE SETTINGS PROFILE s1_01294
-CREATE SETTINGS PROFILE s2_01294 TO ALL
-CREATE SETTINGS PROFILE s3_01294 TO r1_01294
-CREATE SETTINGS PROFILE s4_01294 TO u1_01294
-CREATE SETTINGS PROFILE s5_01294 TO r1_01294, u1_01294
-CREATE SETTINGS PROFILE s6_01294 TO ALL EXCEPT r1_01294
-CREATE SETTINGS PROFILE s7_01294 TO ALL EXCEPT r1_01294, u1_01294
-CREATE SETTINGS PROFILE s1_01294 TO u1_01294
-CREATE SETTINGS PROFILE s2_01294
+CREATE SETTINGS PROFILE `s1_01294`
+CREATE SETTINGS PROFILE `s2_01294` TO ALL
+CREATE SETTINGS PROFILE `s3_01294` TO r1_01294
+CREATE SETTINGS PROFILE `s4_01294` TO u1_01294
+CREATE SETTINGS PROFILE `s5_01294` TO r1_01294, u1_01294
+CREATE SETTINGS PROFILE `s6_01294` TO ALL EXCEPT r1_01294
+CREATE SETTINGS PROFILE `s7_01294` TO ALL EXCEPT r1_01294, u1_01294
+CREATE SETTINGS PROFILE `s1_01294` TO u1_01294
+CREATE SETTINGS PROFILE `s2_01294`
 -- complex
-CREATE SETTINGS PROFILE s1_01294 SETTINGS readonly = 0 TO r1_01294
-CREATE SETTINGS PROFILE s1_01294 SETTINGS INHERIT default
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS readonly = 0 TO r1_01294
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS INHERIT `default`
 -- multiple profiles in one command
-CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 5000000
-CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 5000000
-CREATE SETTINGS PROFILE s3_01294 TO ALL
-CREATE SETTINGS PROFILE s4_01294 TO ALL
-CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
-CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000
-CREATE SETTINGS PROFILE s3_01294 TO ALL
-CREATE SETTINGS PROFILE s4_01294 TO ALL
-CREATE SETTINGS PROFILE s1_01294 SETTINGS max_memory_usage = 6000000
-CREATE SETTINGS PROFILE s2_01294 SETTINGS max_memory_usage = 6000000 TO r1_01294
-CREATE SETTINGS PROFILE s3_01294 TO r1_01294
-CREATE SETTINGS PROFILE s4_01294 TO r1_01294
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS max_memory_usage = 5000000
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS max_memory_usage = 5000000
+CREATE SETTINGS PROFILE `s3_01294` TO ALL
+CREATE SETTINGS PROFILE `s4_01294` TO ALL
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE `s3_01294` TO ALL
+CREATE SETTINGS PROFILE `s4_01294` TO ALL
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS max_memory_usage = 6000000
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS max_memory_usage = 6000000 TO r1_01294
+CREATE SETTINGS PROFILE `s3_01294` TO r1_01294
+CREATE SETTINGS PROFILE `s4_01294` TO r1_01294
 -- readonly ambiguity
-CREATE SETTINGS PROFILE s1_01294 SETTINGS readonly = 1
-CREATE SETTINGS PROFILE s2_01294 SETTINGS readonly CONST
-CREATE SETTINGS PROFILE s3_01294 SETTINGS INHERIT readonly
-CREATE SETTINGS PROFILE s4_01294 SETTINGS INHERIT readonly, INHERIT readonly
-CREATE SETTINGS PROFILE s5_01294 SETTINGS INHERIT readonly, readonly = 1
-CREATE SETTINGS PROFILE s6_01294 SETTINGS INHERIT readonly, readonly CONST
+CREATE SETTINGS PROFILE `s1_01294` SETTINGS readonly = 1
+CREATE SETTINGS PROFILE `s2_01294` SETTINGS readonly CONST
+CREATE SETTINGS PROFILE `s3_01294` SETTINGS INHERIT `readonly`
+CREATE SETTINGS PROFILE `s4_01294` SETTINGS INHERIT `readonly`, INHERIT `readonly`
+CREATE SETTINGS PROFILE `s5_01294` SETTINGS INHERIT `readonly`, readonly = 1
+CREATE SETTINGS PROFILE `s6_01294` SETTINGS INHERIT `readonly`, readonly CONST
 -- system.settings_profiles
 s1_01294	local_directory	0	0	[]	[]
 s2_01294	local_directory	1	0	['r1_01294']	[]
diff --git a/tests/queries/0_stateless/01295_create_row_policy.reference b/tests/queries/0_stateless/01295_create_row_policy.reference
index d73d9752bc1..2c300332a89 100644
--- a/tests/queries/0_stateless/01295_create_row_policy.reference
+++ b/tests/queries/0_stateless/01295_create_row_policy.reference
@@ -1,35 +1,35 @@
 -- default
-CREATE ROW POLICY p1_01295 ON db.table
+CREATE ROW POLICY p1_01295 ON db.`table`
 -- same as default
-CREATE ROW POLICY p2_01295 ON db.table
-CREATE ROW POLICY p3_01295 ON db.table
+CREATE ROW POLICY p2_01295 ON db.`table`
+CREATE ROW POLICY p3_01295 ON db.`table`
 -- rename
-CREATE ROW POLICY p2_01295_renamed ON db.table
+CREATE ROW POLICY p2_01295_renamed ON db.`table`
 -- filter
-CREATE ROW POLICY p1_01295 ON db.table FOR SELECT USING (a < b) AND (c > d)
-CREATE ROW POLICY p2_01295 ON db.table AS restrictive FOR SELECT USING id = currentUser()
-CREATE ROW POLICY p3_01295 ON db.table FOR SELECT USING 1
-CREATE ROW POLICY p1_01295 ON db.table AS restrictive FOR SELECT USING 0
+CREATE ROW POLICY p1_01295 ON db.`table` FOR SELECT USING (a < b) AND (c > d)
+CREATE ROW POLICY p2_01295 ON db.`table` AS restrictive FOR SELECT USING id = currentUser()
+CREATE ROW POLICY p3_01295 ON db.`table` FOR SELECT USING 1
+CREATE ROW POLICY p1_01295 ON db.`table` AS restrictive FOR SELECT USING 0
 -- to roles
-CREATE ROW POLICY p1_01295 ON db.table
-CREATE ROW POLICY p2_01295 ON db.table TO ALL
-CREATE ROW POLICY p3_01295 ON db.table TO r1_01295
-CREATE ROW POLICY p4_01295 ON db.table TO u1_01295
-CREATE ROW POLICY p5_01295 ON db.table TO r1_01295, u1_01295
-CREATE ROW POLICY p6_01295 ON db.table TO ALL EXCEPT r1_01295
-CREATE ROW POLICY p7_01295 ON db.table TO ALL EXCEPT r1_01295, u1_01295
-CREATE ROW POLICY p1_01295 ON db.table TO u1_01295
-CREATE ROW POLICY p2_01295 ON db.table
+CREATE ROW POLICY p1_01295 ON db.`table`
+CREATE ROW POLICY p2_01295 ON db.`table` TO ALL
+CREATE ROW POLICY p3_01295 ON db.`table` TO r1_01295
+CREATE ROW POLICY p4_01295 ON db.`table` TO u1_01295
+CREATE ROW POLICY p5_01295 ON db.`table` TO r1_01295, u1_01295
+CREATE ROW POLICY p6_01295 ON db.`table` TO ALL EXCEPT r1_01295
+CREATE ROW POLICY p7_01295 ON db.`table` TO ALL EXCEPT r1_01295, u1_01295
+CREATE ROW POLICY p1_01295 ON db.`table` TO u1_01295
+CREATE ROW POLICY p2_01295 ON db.`table`
 -- multiple policies in one command
-CREATE ROW POLICY p1_01295 ON db.table FOR SELECT USING 1
-CREATE ROW POLICY p2_01295 ON db.table FOR SELECT USING 1
-CREATE ROW POLICY p3_01295 ON db.table TO u1_01295
+CREATE ROW POLICY p1_01295 ON db.`table` FOR SELECT USING 1
+CREATE ROW POLICY p2_01295 ON db.`table` FOR SELECT USING 1
+CREATE ROW POLICY p3_01295 ON db.`table` TO u1_01295
 CREATE ROW POLICY p3_01295 ON db2.table2 TO u1_01295
-CREATE ROW POLICY p4_01295 ON db.table FOR SELECT USING a = b
+CREATE ROW POLICY p4_01295 ON db.`table` FOR SELECT USING a = b
 CREATE ROW POLICY p5_01295 ON db2.table2 FOR SELECT USING a = b
-CREATE ROW POLICY p1_01295 ON db.table FOR SELECT USING 1 TO ALL
-CREATE ROW POLICY p2_01295 ON db.table FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY p1_01295 ON db.`table` FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY p2_01295 ON db.`table` FOR SELECT USING 1 TO ALL
 -- system.row_policies
-p1_01295 ON db.table	p1_01295	db	table	local_directory	(a < b) AND (c > d)	0	0	[]	[]
-p2_01295 ON db.table	p2_01295	db	table	local_directory	id = currentUser()	1	0	['u1_01295']	[]
-p3_01295 ON db.table	p3_01295	db	table	local_directory	1	0	1	[]	['r1_01295']
+p1_01295 ON db.`table`	p1_01295	db	table	local_directory	(a < b) AND (c > d)	0	0	[]	[]
+p2_01295 ON db.`table`	p2_01295	db	table	local_directory	id = currentUser()	1	0	['u1_01295']	[]
+p3_01295 ON db.`table`	p3_01295	db	table	local_directory	1	0	1	[]	['r1_01295']
diff --git a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.reference b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.reference
index fa9c2f73021..bfca341bd7b 100644
--- a/tests/queries/0_stateless/01296_create_row_policy_in_current_database.reference
+++ b/tests/queries/0_stateless/01296_create_row_policy_in_current_database.reference
@@ -1,20 +1,20 @@
 -- one policy
-CREATE ROW POLICY p1_01296 ON db_01296.table
-CREATE ROW POLICY p1_01296 ON db_01296.table
-CREATE ROW POLICY p1_01296 ON db_01296.table FOR SELECT USING 1
-CREATE ROW POLICY p1_01296 ON db_01296.table FOR SELECT USING 1
+CREATE ROW POLICY p1_01296 ON db_01296.`table`
+CREATE ROW POLICY p1_01296 ON db_01296.`table`
+CREATE ROW POLICY p1_01296 ON db_01296.`table` FOR SELECT USING 1
+CREATE ROW POLICY p1_01296 ON db_01296.`table` FOR SELECT USING 1
 -- multiple policies
-CREATE ROW POLICY p1_01296 ON db_01296.table FOR SELECT USING 1
-CREATE ROW POLICY p2_01296 ON db_01296.table FOR SELECT USING 1
-CREATE ROW POLICY p3_01296 ON db_01296.table TO u1_01296
+CREATE ROW POLICY p1_01296 ON db_01296.`table` FOR SELECT USING 1
+CREATE ROW POLICY p2_01296 ON db_01296.`table` FOR SELECT USING 1
+CREATE ROW POLICY p3_01296 ON db_01296.`table` TO u1_01296
 CREATE ROW POLICY p3_01296 ON db_01296.table2 TO u1_01296
-CREATE ROW POLICY p4_01296 ON db_01296.table FOR SELECT USING a = b
+CREATE ROW POLICY p4_01296 ON db_01296.`table` FOR SELECT USING a = b
 CREATE ROW POLICY p5_01296 ON db_01296.table2 FOR SELECT USING a = b
-CREATE ROW POLICY p1_01296 ON db_01296.table FOR SELECT USING 1
-CREATE ROW POLICY p2_01296 ON db_01296.table FOR SELECT USING 1
-CREATE ROW POLICY p3_01296 ON db_01296.table TO u1_01296
+CREATE ROW POLICY p1_01296 ON db_01296.`table` FOR SELECT USING 1
+CREATE ROW POLICY p2_01296 ON db_01296.`table` FOR SELECT USING 1
+CREATE ROW POLICY p3_01296 ON db_01296.`table` TO u1_01296
 CREATE ROW POLICY p3_01296 ON db_01296.table2 TO u1_01296
-CREATE ROW POLICY p4_01296 ON db_01296.table FOR SELECT USING a = b
+CREATE ROW POLICY p4_01296 ON db_01296.`table` FOR SELECT USING a = b
 CREATE ROW POLICY p5_01296 ON db_01296.table2 FOR SELECT USING a = b
-CREATE ROW POLICY p1_01296 ON db_01296.table FOR SELECT USING 1 TO ALL
-CREATE ROW POLICY p2_01296 ON db_01296.table FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY p1_01296 ON db_01296.`table` FOR SELECT USING 1 TO ALL
+CREATE ROW POLICY p2_01296 ON db_01296.`table` FOR SELECT USING 1 TO ALL
diff --git a/tests/queries/0_stateless/01297_create_quota.reference b/tests/queries/0_stateless/01297_create_quota.reference
index 308bbf79024..456c9fc56bb 100644
--- a/tests/queries/0_stateless/01297_create_quota.reference
+++ b/tests/queries/0_stateless/01297_create_quota.reference
@@ -57,10 +57,10 @@ q2_01297	local_directory	[]	[5259492]	0	['r1_01297','u1_01297']	[]
 q3_01297	local_directory	['client_key','user_name']	[5259492,15778476]	0	[]	[]
 q4_01297	local_directory	[]	[604800]	1	[]	['u1_01297']
 -- system.quota_limits
-q2_01297	5259492	0	100	\N	\N	11	1000	10000	1001	10001	2.5	\N
-q3_01297	5259492	0	\N	\N	\N	\N	1002	\N	\N	\N	\N	\N
-q3_01297	15778476	0	100	\N	\N	11	\N	\N	\N	\N	\N	\N
-q4_01297	604800	0	\N	\N	\N	\N	\N	\N	\N	\N	\N	\N
+q2_01297	5259492	0	100	\N	\N	11	1000	10000	1001	10001	2.5	\N	\N
+q3_01297	5259492	0	\N	\N	\N	\N	1002	\N	\N	\N	\N	\N	\N
+q3_01297	15778476	0	100	\N	\N	11	\N	\N	\N	\N	\N	\N	\N
+q4_01297	604800	0	\N	\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
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 c897d7e9772..9f471bc694b 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
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql b/tests/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql
index 50aa434a28c..b7778dfd780 100644
--- a/tests/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql
+++ b/tests/queries/0_stateless/01312_comparison_with_constant_string_in_index_analysis.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS test;
 CREATE TABLE test (x UInt64) ENGINE = MergeTree ORDER BY x SETTINGS index_granularity = 1000, index_granularity_bytes = '10Mi';
 INSERT INTO test SELECT * FROM numbers(1000000);
diff --git a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
index 57409d782ae..1d5f5d54853 100755
--- a/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
+++ b/tests/queries/0_stateless/01320_create_sync_race_condition_zookeeper.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Tags: race, zookeeper, no-parallel
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
index 23bcb901557..62b3a40944a 100644
--- a/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
+++ b/tests/queries/0_stateless/01351_parse_date_time_best_effort_us.reference
@@ -1,40 +1,40 @@
 parseDateTimeBestEffortUS
- s                                             a
+     s                                             a
 
- 1970/01/02 010203Z          1970-01-02 01:02:03 
- 01-02-2001 UTC              2001-01-02 00:00:00 
- 10.23.1990                  1990-10-23 00:00:00 
- 01-02-2017 03:04:05+1       2017-01-02 02:04:05 
- 01/02/2017 03:04:05+300     2017-01-02 00:04:05 
- 01.02.2017 03:04:05GMT      2017-01-02 03:04:05 
- 01-02-2017 03:04:05 MSD     2017-01-01 23:04:05 
- 01-02-2017 11:04:05 AM      2017-01-02 11:04:05 
- 01-02-2017 11:04:05 PM      2017-01-02 23:04:05 
- 01-02-2017 12:04:05 AM      2017-01-02 00:04:05 
- 01-02-2017 12:04:05 PM      2017-01-02 12:04:05 
- 01.02.17 03:04:05 MSD Feb   2017-02-01 23:04:05 
- 01/02/2017 03:04:05 MSK     2017-01-02 00:04:05 
- 12/13/2019                  2019-12-13 00:00:00 
- 13/12/2019                  2019-12-13 00:00:00 
- 03/04/2019                  2019-03-04 00:00:00 
+ 1.  1970/01/02 010203Z          1970-01-02 01:02:03 
+ 2.  01-02-2001 UTC              2001-01-02 00:00:00 
+ 3.  10.23.1990                  1990-10-23 00:00:00 
+ 4.  01-02-2017 03:04:05+1       2017-01-02 02:04:05 
+ 5.  01/02/2017 03:04:05+300     2017-01-02 00:04:05 
+ 6.  01.02.2017 03:04:05GMT      2017-01-02 03:04:05 
+ 7.  01-02-2017 03:04:05 MSD     2017-01-01 23:04:05 
+ 8.  01-02-2017 11:04:05 AM      2017-01-02 11:04:05 
+ 9.  01-02-2017 11:04:05 PM      2017-01-02 23:04:05 
+10.  01-02-2017 12:04:05 AM      2017-01-02 00:04:05 
+11.  01-02-2017 12:04:05 PM      2017-01-02 12:04:05 
+12.  01.02.17 03:04:05 MSD Feb   2017-02-01 23:04:05 
+13.  01/02/2017 03:04:05 MSK     2017-01-02 00:04:05 
+14.  12/13/2019                  2019-12-13 00:00:00 
+15.  13/12/2019                  2019-12-13 00:00:00 
+16.  03/04/2019                  2019-03-04 00:00:00 
 parseDateTimeBestEffortUSOrZero	parseDateTimeBestEffortUSOrNull
- s                                             a                     b
+     s                                             a                     b
 
- 1970/01/02 010203Z          1970-01-02 01:02:03   1970-01-02 01:02:03 
- 01-02-2001 UTC              2001-01-02 00:00:00   2001-01-02 00:00:00 
- 10.23.1990                  1990-10-23 00:00:00   1990-10-23 00:00:00 
- 01-02-2017 03:04:05+1       2017-01-02 02:04:05   2017-01-02 02:04:05 
- 01/02/2017 03:04:05+300     2017-01-02 00:04:05   2017-01-02 00:04:05 
- 01.02.2017 03:04:05GMT      2017-01-02 03:04:05   2017-01-02 03:04:05 
- 01-02-2017 03:04:05 MSD     2017-01-01 23:04:05   2017-01-01 23:04:05 
- 01-02-2017 11:04:05 AM      2017-01-02 11:04:05   2017-01-02 11:04:05 
- 01-02-2017 11:04:05 PM      2017-01-02 23:04:05   2017-01-02 23:04:05 
- 01-02-2017 12:04:05 AM      2017-01-02 00:04:05   2017-01-02 00:04:05 
- 01-02-2017 12:04:05 PM      2017-01-02 12:04:05   2017-01-02 12:04:05 
- 01.02.17 03:04:05 MSD Feb   2017-02-01 23:04:05   2017-02-01 23:04:05 
- 01/02/2017 03:04:05 MSK     2017-01-02 00:04:05   2017-01-02 00:04:05 
- 12/13/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
- 13/12/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
- 03/04/2019                  2019-03-04 00:00:00   2019-03-04 00:00:00 
-                             1970-01-01 00:00:00                  ᴺ�ᴸᴸ 
- xyz                         1970-01-01 00:00:00                  ᴺ�ᴸᴸ 
+ 1.  1970/01/02 010203Z          1970-01-02 01:02:03   1970-01-02 01:02:03 
+ 2.  01-02-2001 UTC              2001-01-02 00:00:00   2001-01-02 00:00:00 
+ 3.  10.23.1990                  1990-10-23 00:00:00   1990-10-23 00:00:00 
+ 4.  01-02-2017 03:04:05+1       2017-01-02 02:04:05   2017-01-02 02:04:05 
+ 5.  01/02/2017 03:04:05+300     2017-01-02 00:04:05   2017-01-02 00:04:05 
+ 6.  01.02.2017 03:04:05GMT      2017-01-02 03:04:05   2017-01-02 03:04:05 
+ 7.  01-02-2017 03:04:05 MSD     2017-01-01 23:04:05   2017-01-01 23:04:05 
+ 8.  01-02-2017 11:04:05 AM      2017-01-02 11:04:05   2017-01-02 11:04:05 
+ 9.  01-02-2017 11:04:05 PM      2017-01-02 23:04:05   2017-01-02 23:04:05 
+10.  01-02-2017 12:04:05 AM      2017-01-02 00:04:05   2017-01-02 00:04:05 
+11.  01-02-2017 12:04:05 PM      2017-01-02 12:04:05   2017-01-02 12:04:05 
+12.  01.02.17 03:04:05 MSD Feb   2017-02-01 23:04:05   2017-02-01 23:04:05 
+13.  01/02/2017 03:04:05 MSK     2017-01-02 00:04:05   2017-01-02 00:04:05 
+14.  12/13/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
+15.  13/12/2019                  2019-12-13 00:00:00   2019-12-13 00:00:00 
+16.  03/04/2019                  2019-03-04 00:00:00   2019-03-04 00:00:00 
+17.                              1970-01-01 00:00:00                  ᴺ�ᴸᴸ 
+18.  xyz                         1970-01-01 00:00:00                  ᴺ�ᴸᴸ 
diff --git a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
index 90e19e077ec..44f3ba9681a 100755
--- a/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
+++ b/tests/queries/0_stateless/01370_client_autocomplete_word_break_characters.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.reference b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.reference
index 9459d4ba2a0..6de0a5be0a5 100644
--- a/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.reference
+++ b/tests/queries/0_stateless/01376_GROUP_BY_injective_elimination_dictGet.reference
@@ -1 +1,24 @@
 1.1
+SELECT dictGet(\'dictdb_01376.dict_exists\', \'value\', toUInt64(1)) AS val
+FROM numbers(2)
+GROUP BY toUInt64(1)
+QUERY id: 0
+  PROJECTION COLUMNS
+    val Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: dictGet, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 3
+            CONSTANT id: 4, constant_value: \'dictdb_01376.dict_exists\', constant_value_type: String
+            CONSTANT id: 5, constant_value: \'value\', constant_value_type: String
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 8, nodes: 1
+          CONSTANT id: 9, constant_value: UInt64_2, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 10, nodes: 1
+      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+  SETTINGS allow_experimental_analyzer=1
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 29ffcb46fbf..5a070b443aa 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
@@ -23,7 +23,7 @@ INSERT INTO dictdb_01376.table_for_dict VALUES (1, 1.1);
 CREATE DICTIONARY IF NOT EXISTS dictdb_01376.dict_exists
 (
   key_column UInt64,
-  value Float64 DEFAULT 77.77
+  value Float64 DEFAULT 77.77 INJECTIVE
 )
 PRIMARY KEY key_column
 SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'table_for_dict' DB 'dictdb_01376'))
@@ -32,6 +32,14 @@ LAYOUT(FLAT());
 
 SELECT dictGet('dictdb_01376.dict_exists', 'value', toUInt64(1)) as val FROM numbers(2) GROUP BY val;
 
+EXPLAIN SYNTAX SELECT dictGet('dictdb_01376.dict_exists', 'value', toUInt64(1)) as val FROM numbers(2) GROUP BY val;
+
+EXPLAIN QUERY TREE
+SELECT dictGet('dictdb_01376.dict_exists', 'value', number) as val
+FROM numbers(2)
+GROUP BY val
+SETTINGS allow_experimental_analyzer = 1;
+
 DROP DICTIONARY dictdb_01376.dict_exists;
 DROP TABLE dictdb_01376.table_for_dict;
 DROP DATABASE dictdb_01376;
diff --git a/tests/queries/0_stateless/01383_log_broken_table.sh b/tests/queries/0_stateless/01383_log_broken_table.sh
index 5cc0f24a87f..4d82fa8547d 100755
--- a/tests/queries/0_stateless/01383_log_broken_table.sh
+++ b/tests/queries/0_stateless/01383_log_broken_table.sh
@@ -20,6 +20,7 @@ function test_func()
         MAX_MEM=$((2 * $MAX_MEM))
 
         $CLICKHOUSE_CLIENT --query "INSERT INTO log SELECT number, number, number FROM numbers(1000000)" --max_memory_usage $MAX_MEM > "${CLICKHOUSE_TMP}"/insert_result 2>&1
+        RES=$?
 
         grep -o -F 'Memory limit' "${CLICKHOUSE_TMP}"/insert_result || cat "${CLICKHOUSE_TMP}"/insert_result
 
@@ -27,7 +28,7 @@ function test_func()
 
         cat "${CLICKHOUSE_TMP}"/select_result
 
-        [[ $MAX_MEM -gt 200000000 ]] && break;
+        { [[ $RES -eq 0 ]] || [[ $MAX_MEM -gt 200000000 ]]; } && break;
     done
 
     $CLICKHOUSE_CLIENT --query "DROP TABLE log";
diff --git a/tests/queries/0_stateless/01388_multi_if_optimization.reference b/tests/queries/0_stateless/01388_multi_if_optimization.reference
index 6dbe0f0d96f..9c2990274fe 100644
--- a/tests/queries/0_stateless/01388_multi_if_optimization.reference
+++ b/tests/queries/0_stateless/01388_multi_if_optimization.reference
@@ -2,3 +2,5 @@ SELECT if(number = 1, \'hello\', if(number = 2, \'world\', \'xyz\'))
 FROM numbers(10)
 SELECT multiIf(number = 1, \'hello\', number = 2, \'world\', \'xyz\')
 FROM numbers(10)
+\N
+\N
diff --git a/tests/queries/0_stateless/01388_multi_if_optimization.sql b/tests/queries/0_stateless/01388_multi_if_optimization.sql
index 345fcfb6fcc..0ad6df9fdfa 100644
--- a/tests/queries/0_stateless/01388_multi_if_optimization.sql
+++ b/tests/queries/0_stateless/01388_multi_if_optimization.sql
@@ -3,3 +3,6 @@ SET optimize_if_chain_to_multiif = 0;
 EXPLAIN SYNTAX SELECT number = 1 ? 'hello' : (number = 2 ? 'world' : 'xyz') FROM numbers(10);
 SET optimize_if_chain_to_multiif = 1;
 EXPLAIN SYNTAX SELECT number = 1 ? 'hello' : (number = 2 ? 'world' : 'xyz') FROM numbers(10);
+
+-- fuzzed
+SELECT now64(if(Null, NULL, if(Null, nan, toFloat64(number))), Null) FROM numbers(2);
diff --git a/tests/queries/0_stateless/01410_nullable_key_and_index.sql b/tests/queries/0_stateless/01410_nullable_key_and_index.sql
index 905d997d95c..7c28a7a6e70 100644
--- a/tests/queries/0_stateless/01410_nullable_key_and_index.sql
+++ b/tests/queries/0_stateless/01410_nullable_key_and_index.sql
@@ -73,5 +73,5 @@ CREATE TABLE invalid_lc_null (id LowCardinality(Nullable(String))) ENGINE = Merg
 CREATE TABLE invalid_array_null (id Array(Nullable(String))) ENGINE = MergeTree ORDER BY id; -- { serverError 44 }
 CREATE TABLE invalid_tuple_null (id Tuple(Nullable(String), UInt8)) ENGINE = MergeTree ORDER BY id; -- { serverError 44 }
 CREATE TABLE invalid_map_null (id Map(UInt8, Nullable(String))) ENGINE = MergeTree ORDER BY id; -- { serverError 44 }
-CREATE TABLE invalid_simple_agg_state_null (id SimpleAggregateFunction(sum, Nullable(UInt64))) ENGINE = MergeTree ORDER BY id; -- { serverError 44 }
+CREATE TABLE invalid_simple_agg_state_null (id SimpleAggregateFunction(sum, Nullable(UInt64))) ENGINE = MergeTree ORDER BY id; -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
 -- AggregateFunctions are not comparable and cannot be used in key expressions. No need to test it.
diff --git a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
index 2d3d31e9b5c..cd5111faf45 100644
--- a/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
+++ b/tests/queries/0_stateless/01414_low_cardinality_nullable.sql
@@ -1,3 +1,5 @@
+SET allow_suspicious_low_cardinality_types=1;
+
 DROP TABLE IF EXISTS lc_nullable;
 
 CREATE TABLE lc_nullable (
diff --git a/tests/queries/0_stateless/01418_custom_settings.reference b/tests/queries/0_stateless/01418_custom_settings.reference
index 8484a5d0e6f..923d43077d8 100644
--- a/tests/queries/0_stateless/01418_custom_settings.reference
+++ b/tests/queries/0_stateless/01418_custom_settings.reference
@@ -30,10 +30,10 @@ custom_f	\'word\'
 --- compound identifier ---
 test	String
 custom_compound.identifier.v1	\'test\'
-CREATE SETTINGS PROFILE s1_01418 SETTINGS custom_compound.identifier.v2 = 100
+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
+CREATE SETTINGS PROFILE `s2_01418` SETTINGS custom_null = NULL
diff --git a/tests/queries/0_stateless/01441_low_cardinality_array_index.sql b/tests/queries/0_stateless/01441_low_cardinality_array_index.sql
index 4b31a86edfb..b5e14c957c6 100644
--- a/tests/queries/0_stateless/01441_low_cardinality_array_index.sql
+++ b/tests/queries/0_stateless/01441_low_cardinality_array_index.sql
@@ -1,3 +1,5 @@
+SET allow_suspicious_low_cardinality_types=1;
+
 DROP TABLE IF EXISTS t_01411;
 
 CREATE TABLE t_01411(
diff --git a/tests/queries/0_stateless/01451_normalize_query.reference b/tests/queries/0_stateless/01451_normalize_query.reference
index 339ad34ea77..b331e139dc4 100644
--- a/tests/queries/0_stateless/01451_normalize_query.reference
+++ b/tests/queries/0_stateless/01451_normalize_query.reference
@@ -23,3 +23,23 @@ SELECT ?..
 SELECT ? xyz11
 SELECT ?, xyz11
 SELECT ?..
+? - ?
+?..
+-?..
+? - ?..
+f(-?..)
+[-?..]
+? + ?
+?..
+-?..
+? + ?..
+f(+?..)
+[+?..]
+?.. + ?
+?.. - ?..
+f(+?..), ?
+[+?..] - ?
+-?.. - [+?..] - ?
+(+?..) - ?
+-?.. - (+?..) - ?
+(+?..)
diff --git a/tests/queries/0_stateless/01451_normalize_query.sql b/tests/queries/0_stateless/01451_normalize_query.sql
index 3c01a975712..14c74d95019 100644
--- a/tests/queries/0_stateless/01451_normalize_query.sql
+++ b/tests/queries/0_stateless/01451_normalize_query.sql
@@ -23,4 +23,23 @@ SELECT normalizeQuery('SELECT 1, ''xyz11''');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$ xyz11');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$, xyz11');
 SELECT normalizeQuery('SELECT $doc$VALUE$doc$, ''xyz11''');
-
+SELECT normalizeQuery('1 - 2');
+SELECT normalizeQuery('1, -2, 3');
+SELECT normalizeQuery('-1, -2, 3');
+SELECT normalizeQuery('1 - 2, 3, 4');
+SELECT normalizeQuery('f(-2, 3)');
+SELECT normalizeQuery('[-1, 2, 3]');
+SELECT normalizeQuery('1 + 2');
+SELECT normalizeQuery('1, +2, 3');
+SELECT normalizeQuery('-1, +2, 3');
+SELECT normalizeQuery('1 + 2, 3, 4');
+SELECT normalizeQuery('f(+2, 3)');
+SELECT normalizeQuery('[+1, 2, 3]');
+SELECT normalizeQuery('1, 2, 3 + 4');
+SELECT normalizeQuery('1, 2 - 3, 4');
+SELECT normalizeQuery('f(+2, 3), 1');
+SELECT normalizeQuery('[+1, 2, 3] - 1');
+SELECT normalizeQuery('-1, 1 - [+1, 2, 3] - 1');
+SELECT normalizeQuery('(+1, 2, 3) - 1');
+SELECT normalizeQuery('-1, 1 - (+1, 2, 3) - 1');
+SELECT normalizeQuery('(+1, 2, -3)');
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
index a9a6d27c145..56620d848a3 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: replica, no-parallel
+# Tags: replica, no-parallel, no-debug
 
 set -e
 
diff --git a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
index 209e18e3329..91a73471557 100755
--- a/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
+++ b/tests/queries/0_stateless/01459_manual_write_to_replicas_quorum.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: replica, no-replicated-database, no-parallel
+# Tags: replica, no-replicated-database, no-parallel, no-debug, no-random-settings
 # Tag no-replicated-database: Fails due to additional replicas or shards
 
 set -e
@@ -8,6 +8,11 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# This test does many invocations of clickhouse-client in a loop,
+# leading to "Too many parts" in the system.coverage_log,
+# but we are not interested in client-side coverage here.
+unset CLICKHOUSE_WRITE_COVERAGE
+
 NUM_REPLICAS=10
 
 for i in $(seq 1 $NUM_REPLICAS); do
diff --git a/tests/queries/0_stateless/01460_line_as_string_format.sh b/tests/queries/0_stateless/01460_line_as_string_format.sh
index 4ab9cb59858..a8782dd2d32 100755
--- a/tests/queries/0_stateless/01460_line_as_string_format.sh
+++ b/tests/queries/0_stateless/01460_line_as_string_format.sh
@@ -7,12 +7,14 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS line_as_string1";
 $CLICKHOUSE_CLIENT --query="CREATE TABLE line_as_string1(field String) ENGINE = Memory";
 
-echo '"id" : 1,
+cat <<'EOF' | $CLICKHOUSE_CLIENT --query="INSERT INTO line_as_string1 FORMAT LineAsString";
+"id" : 1,
 "date" : "01.01.2020",
 "string" : "123{{{\"\\",
 "array" : [1, 2, 3],
 
-Finally implement this new feature.' | $CLICKHOUSE_CLIENT --query="INSERT INTO line_as_string1 FORMAT LineAsString";
+Finally implement this new feature.
+EOF
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM line_as_string1";
 $CLICKHOUSE_CLIENT --query="DROP TABLE line_as_string1"
@@ -26,7 +28,9 @@ $CLICKHOUSE_CLIENT --query="create table line_as_string2(
 
 $CLICKHOUSE_CLIENT --query="INSERT INTO line_as_string2(c) values ('ClickHouse')";
 
-echo 'ClickHouse is a `fast` #open-source# (OLAP) database "management" :system:' | $CLICKHOUSE_CLIENT --query="INSERT INTO line_as_string2(c) FORMAT LineAsString";
+# Shellcheck thinks `fast` is a shell expansion
+# shellcheck disable=SC2016
+echo -e 'ClickHouse is a `fast` #open-source# (OLAP) database "management" :system:' | $CLICKHOUSE_CLIENT --query="INSERT INTO line_as_string2(c) FORMAT LineAsString";
 
 $CLICKHOUSE_CLIENT --query="SELECT * FROM line_as_string2 order by c";
 $CLICKHOUSE_CLIENT --query="DROP TABLE line_as_string2"
diff --git a/tests/queries/0_stateless/01465_ttl_recompression.reference b/tests/queries/0_stateless/01465_ttl_recompression.reference
index 108df565669..90661a5dc78 100644
--- a/tests/queries/0_stateless/01465_ttl_recompression.reference
+++ b/tests/queries/0_stateless/01465_ttl_recompression.reference
@@ -13,9 +13,9 @@ CREATE TABLE default.recompression_table\n(\n    `dt` DateTime,\n    `key` UInt6
 1_1_1	LZ4
 2_2_2	ZSTD(12)
 3_3_3	ZSTD(12)
-1_1_1	['plus(dt, toIntervalDay(1))']
-2_2_2	['plus(dt, toIntervalDay(1))']
-3_3_3	['plus(dt, toIntervalDay(1))']
+1_1_1	['dt + toIntervalDay(1)']
+2_2_2	['dt + toIntervalDay(1)']
+3_3_3	['dt + toIntervalDay(1)']
 1_1_1	LZ4
 2_2_2	LZ4
 3_3_3	LZ4
diff --git a/tests/queries/0_stateless/01470_columns_transformers.reference b/tests/queries/0_stateless/01470_columns_transformers.reference
index 8fa86582018..8eab5a16b8b 100644
--- a/tests/queries/0_stateless/01470_columns_transformers.reference
+++ b/tests/queries/0_stateless/01470_columns_transformers.reference
@@ -49,10 +49,43 @@ SELECT
     any(toDate(k))
 FROM columns_transformers AS a
 SELECT
-    sum(i + 1 AS i),
+    sum(i) + (1 * count(i)),
     sum(j),
     sum(k)
 FROM columns_transformers
+SelectWithUnionQuery (children 1)
+ ExpressionList (children 1)
+  SelectQuery (children 2)
+   ExpressionList (children 1)
+    Asterisk (children 1)
+     ColumnsTransformerList (children 2)
+      ColumnsReplaceTransformer (children 1)
+       ColumnsReplaceTransformer::Replacement (children 1)
+        Function plus (children 1)
+         ExpressionList (children 2)
+          Identifier i
+          Literal UInt64_1
+      ColumnsApplyTransformer
+   TablesInSelectQuery (children 1)
+    TablesInSelectQueryElement (children 1)
+     TableExpression (children 1)
+      TableIdentifier columns_transformers
+SELECT sum(i) + (1 * count(i))
+FROM columns_transformers
+SelectWithUnionQuery (children 1)
+ ExpressionList (children 1)
+  SelectQuery (children 2)
+   ExpressionList (children 1)
+    Function sum (children 1)
+     ExpressionList (children 1)
+      Function plus (alias m) (children 1)
+       ExpressionList (children 2)
+        Identifier i
+        Literal UInt64_1
+   TablesInSelectQuery (children 1)
+    TablesInSelectQueryElement (children 1)
+     TableExpression (children 1)
+      TableIdentifier columns_transformers
 SELECT
     avg(i) + 1,
     avg(j) + 2,
diff --git a/tests/queries/0_stateless/01470_columns_transformers.sql b/tests/queries/0_stateless/01470_columns_transformers.sql
index 8840ce3f3b5..1490dabdcec 100644
--- a/tests/queries/0_stateless/01470_columns_transformers.sql
+++ b/tests/queries/0_stateless/01470_columns_transformers.sql
@@ -35,6 +35,9 @@ EXPLAIN SYNTAX SELECT * EXCEPT(i) APPLY(sum) from columns_transformers;
 EXPLAIN SYNTAX SELECT columns_transformers.* EXCEPT(j) APPLY(avg) from columns_transformers;
 EXPLAIN SYNTAX SELECT a.* APPLY(toDate) EXCEPT(i, j) APPLY(any) from columns_transformers a;
 EXPLAIN SYNTAX SELECT * REPLACE(i + 1 AS i) APPLY(sum) from columns_transformers;
+EXPLAIN AST SELECT * REPLACE(i + 1 AS i) APPLY(sum) from columns_transformers;
+EXPLAIN SYNTAX SELECT sum(i + 1 AS m) from columns_transformers;
+EXPLAIN AST SELECT sum(i + 1 AS m) from columns_transformers;
 EXPLAIN SYNTAX SELECT columns_transformers.* REPLACE(j + 2 AS j, i + 1 AS i) APPLY(avg) from columns_transformers;
 EXPLAIN SYNTAX SELECT a.* APPLY(toDate) REPLACE(i + 1 AS i) APPLY(any) from columns_transformers a;
 
diff --git a/tests/queries/0_stateless/01472_many_rows_in_totals.reference b/tests/queries/0_stateless/01472_many_rows_in_totals.reference
index 92a9e4bbb53..6b0eaf3a6aa 100644
--- a/tests/queries/0_stateless/01472_many_rows_in_totals.reference
+++ b/tests/queries/0_stateless/01472_many_rows_in_totals.reference
@@ -1,21 +1,21 @@
-����┳���┓
-┃ g ┃ s ┃
-┡���╇���┩
-│ 0 │ 2 │
-├───┼───┤
-│ 0 │ 2 │
-├───┼───┤
-│ 1 │ 4 │
-├───┼───┤
-│ 1 │ 4 │
-└───┴───┘
+   ����┳���┓
+   ┃ g ┃ s ┃
+   ┡���╇���┩
+1. │ 0 │ 2 │
+   ├───┼───┤
+2. │ 0 │ 2 │
+   ├───┼───┤
+3. │ 1 │ 4 │
+   ├───┼───┤
+4. │ 1 │ 4 │
+   └───┴───┘
 
 Totals:
-����┳���┓
-┃ g ┃ s ┃
-┡���╇���┩
-│ 0 │ 6 │
-└───┴───┘
+   ����┳���┓
+   ┃ g ┃ s ┃
+   ┡���╇���┩
+1. │ 0 │ 6 │
+   └───┴───┘
 --
 0	2
 0	2
diff --git a/tests/queries/0_stateless/01472_many_rows_in_totals.sql b/tests/queries/0_stateless/01472_many_rows_in_totals.sql
index bea8c255f21..f3d3a1fcca2 100644
--- a/tests/queries/0_stateless/01472_many_rows_in_totals.sql
+++ b/tests/queries/0_stateless/01472_many_rows_in_totals.sql
@@ -1,3 +1,5 @@
+set output_format_pretty_color=1;
+
 -- Disable external aggregation because it may produce several blocks instead of one.
 set max_bytes_before_external_group_by = 0;
 set output_format_write_statistics = 0;
diff --git a/tests/queries/0_stateless/01492_format_readable_quantity.reference b/tests/queries/0_stateless/01492_format_readable_quantity.reference
index 247063b70a2..5fa537fcf80 100644
--- a/tests/queries/0_stateless/01492_format_readable_quantity.reference
+++ b/tests/queries/0_stateless/01492_format_readable_quantity.reference
@@ -40,6 +40,6 @@
 86.59 quadrillion	86.59 quadrillion	2.15 billion
 235.39 quadrillion	235.39 quadrillion	2.15 billion
 639.84 quadrillion	639.84 quadrillion	2.15 billion
-1739.27 quadrillion	1739.27 quadrillion	2.15 billion
-4727.84 quadrillion	4727.84 quadrillion	2.15 billion
-12851.60 quadrillion	12851.60 quadrillion	2.15 billion
+1.74 quintillion	1.74 quintillion	2.15 billion
+4.73 quintillion	4.73 quintillion	2.15 billion
+12.85 quintillion	12.85 quintillion	2.15 billion
diff --git a/tests/queries/0_stateless/01508_partition_pruning_long.sh b/tests/queries/0_stateless/01508_partition_pruning_long.sh
index c1f2d6562ab..7b56d8bbf03 100755
--- a/tests/queries/0_stateless/01508_partition_pruning_long.sh
+++ b/tests/queries/0_stateless/01508_partition_pruning_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-polymorphic-parts, no-random-merge-tree-settings
+# Tags: long, no-polymorphic-parts, no-random-settings, no-random-merge-tree-settings, no-debug
 
 # Description of test result:
 # Test the correctness of the partition pruning
diff --git a/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.reference b/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.reference
index a270447ffc9..1dc350f0227 100644
--- a/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.reference
+++ b/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.reference
@@ -107,49 +107,49 @@
     ���������┓
     ┃ number ┃
     ┡��������┩
- 1. │      0 │
+ 1. │      0 │
     ├────────┤
- 2. │      1 │
+ 2. │      1 │
     ├────────┤
- 3. │      2 │
+ 3. │      2 │
     ├────────┤
- 4. │      3 │
+ 4. │      3 │
     ├────────┤
- 5. │      4 │
+ 5. │      4 │
     ├────────┤
- 6. │      5 │
+ 6. │      5 │
     ├────────┤
- 7. │      6 │
+ 7. │      6 │
     ├────────┤
- 8. │      7 │
+ 8. │      7 │
     ├────────┤
- 9. │      8 │
+ 9. │      8 │
     ├────────┤
-10. │      9 │
+10. │      9 │
     └────────┘
     ┌─number─�
- 1. │      0 │
- 2. │      1 │
- 3. │      2 │
- 4. │      3 │
- 5. │      4 │
- 6. │      5 │
- 7. │      6 │
- 8. │      7 │
- 9. │      8 │
-10. │      9 │
+ 1. │      0 │
+ 2. │      1 │
+ 3. │      2 │
+ 4. │      3 │
+ 5. │      4 │
+ 6. │      5 │
+ 7. │      6 │
+ 8. │      7 │
+ 9. │      8 │
+10. │      9 │
     └────────┘
     ┌─number─�
- 1. │      0 │
- 2. │      1 │
- 3. │      2 │
- 4. │      3 │
- 5. │      4 │
- 6. │      5 │
- 7. │      6 │
- 8. │      7 │
- 9. │      8 │
-10. │      9 │
+ 1. │      0 │
+ 2. │      1 │
+ 3. │      2 │
+ 4. │      3 │
+ 5. │      4 │
+ 6. │      5 │
+ 7. │      6 │
+ 8. │      7 │
+ 9. │      8 │
+10. │      9 │
     └────────┘
     ���������┓
     ┃ number ┃
@@ -200,35 +200,35 @@
 10.       9 
      number
 
- 1.       0 
- 2.       1 
- 3.       2 
- 4.       3 
- 5.       4 
- 6.       5 
- 7.       6 
- 8.       7 
- 9.       8 
-10.       9 
+ 1.       0 
+ 2.       1 
+ 3.       2 
+ 4.       3 
+ 5.       4 
+ 6.       5 
+ 7.       6 
+ 8.       7 
+ 9.       8 
+10.       9 
    ����┓
    ┃ a ┃
    ┡���┩
-1. │ 1 │
+1. │ 1 │
    └───┘
    ����┓
    ┃ a ┃
    ┡���┩
-2. │ 2 │
+2. │ 2 │
    └───┘
    ┌─a─�
-1. │ 1 │
+1. │ 1 │
    └───┘
    ┌─a─�
-2. │ 2 │
+2. │ 2 │
    └───┘
    ┌─a─�
-1. │ 1 │
-2. │ 2 │
+1. │ 1 │
+2. │ 2 │
    └───┘
    ����┓
    ┃ a ┃
@@ -248,10 +248,10 @@
    └───┘
     a
 
-1.  1 
+1.  1 
     a
 
-2.  2 
+2.  2 
     a
 
 1.  1 
@@ -261,94 +261,94 @@
    ���������┓
    ┃ number ┃
    ┡��������┩
-1. │      0 │
+1. │      0 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-2. │      1 │
+2. │      1 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-3. │      2 │
+3. │      2 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-4. │      3 │
+4. │      3 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-5. │      4 │
+5. │      4 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-6. │      5 │
+6. │      5 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-7. │      6 │
+7. │      6 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-8. │      7 │
+8. │      7 │
    └────────┘
    ���������┓
    ┃ number ┃
    ┡��������┩
-9. │      8 │
+9. │      8 │
    └────────┘
     ���������┓
     ┃ number ┃
     ┡��������┩
-10. │      9 │
+10. │      9 │
     └────────┘
    ┌─number─�
-1. │      0 │
+1. │      0 │
    └────────┘
    ┌─number─�
-2. │      1 │
+2. │      1 │
    └────────┘
    ┌─number─�
-3. │      2 │
+3. │      2 │
    └────────┘
    ┌─number─�
-4. │      3 │
+4. │      3 │
    └────────┘
    ┌─number─�
-5. │      4 │
+5. │      4 │
    └────────┘
    ┌─number─�
-6. │      5 │
+6. │      5 │
    └────────┘
    ┌─number─�
-7. │      6 │
+7. │      6 │
    └────────┘
    ┌─number─�
-8. │      7 │
+8. │      7 │
    └────────┘
    ┌─number─�
-9. │      8 │
+9. │      8 │
    └────────┘
     ┌─number─�
-10. │      9 │
+10. │      9 │
     └────────┘
     ┌─number─�
- 1. │      0 │
- 2. │      1 │
- 3. │      2 │
- 4. │      3 │
- 5. │      4 │
- 6. │      5 │
- 7. │      6 │
- 8. │      7 │
- 9. │      8 │
-10. │      9 │
+ 1. │      0 │
+ 2. │      1 │
+ 3. │      2 │
+ 4. │      3 │
+ 5. │      4 │
+ 6. │      5 │
+ 7. │      6 │
+ 8. │      7 │
+ 9. │      8 │
+10. │      9 │
     └────────┘
    ���������┓
    ┃ number ┃
@@ -432,34 +432,34 @@
     └────────┘
     number
 
-1.       0 
+1.       0 
     number
 
-2.       1 
+2.       1 
     number
 
-3.       2 
+3.       2 
     number
 
-4.       3 
+4.       3 
     number
 
-5.       4 
+5.       4 
     number
 
-6.       5 
+6.       5 
     number
 
-7.       6 
+7.       6 
     number
 
-8.       7 
+8.       7 
     number
 
-9.       8 
+9.       8 
      number
 
-10.       9 
+10.       9 
     number
 
 1.       0 
diff --git a/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.sql b/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.sql
index f8ec0be74d7..0a09aef7fb2 100644
--- a/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.sql
+++ b/tests/queries/0_stateless/01509_output_format_pretty_row_numbers.sql
@@ -1,3 +1,5 @@
+SET output_format_pretty_color=1;
+SET output_format_pretty_row_numbers=0;
 SELECT * FROM numbers(10) FORMAT Pretty;
 SELECT * FROM numbers(10) FORMAT PrettyCompact;
 SELECT * FROM numbers(10) FORMAT PrettyCompactMonoBlock;
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 630c573c2cc..1e5a0b9cddf 100644
--- a/tests/queries/0_stateless/01516_create_table_primary_key.sql
+++ b/tests/queries/0_stateless/01516_create_table_primary_key.sql
@@ -1,7 +1,10 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 DROP DATABASE IF EXISTS test_01516;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test_01516 ENGINE=Ordinary;     -- Full ATTACH requires UUID with Atomic
 USE test_01516;
 
diff --git a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
index 67a2009b913..167625629a5 100644
--- a/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
+++ b/tests/queries/0_stateless/01517_drop_mv_with_inner_table.sql
@@ -1,5 +1,7 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 --
 -- Atomic no SYNC
 -- (should go first to check that thread for DROP TABLE does not hang)
@@ -33,6 +35,7 @@ show tables from db_01517_atomic_sync;
 ---
 drop database if exists db_01517_ordinary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 create database db_01517_ordinary Engine=Ordinary;
 
 create table db_01517_ordinary.source (key Int) engine=Null;
diff --git a/tests/queries/0_stateless/01520_client_print_query_id.expect b/tests/queries/0_stateless/01520_client_print_query_id.expect
index 2034483a73d..70f446e1584 100755
--- a/tests/queries/0_stateless/01520_client_print_query_id.expect
+++ b/tests/queries/0_stateless/01520_client_print_query_id.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01526_max_untracked_memory.sh b/tests/queries/0_stateless/01526_max_untracked_memory.sh
index 45fdb314fb2..b2bad637422 100755
--- a/tests/queries/0_stateless/01526_max_untracked_memory.sh
+++ b/tests/queries/0_stateless/01526_max_untracked_memory.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-cpu-aarch64
-# requires TraceCollector, does not available under sanitizers and aarch64
+# Tags: no-tsan, no-asan, no-ubsan, no-msan
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh b/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
index 538d712ad9c..d3fe6d16559 100755
--- a/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
+++ b/tests/queries/0_stateless/01528_clickhouse_local_prepare_parts.sh
@@ -1,5 +1,8 @@
 #!/usr/bin/env bash
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
index e2d0306fee0..9f0699929f8 100755
--- a/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
+++ b/tests/queries/0_stateless/01541_max_memory_usage_for_user_long.sh
@@ -45,11 +45,13 @@ query_id=$$-$RANDOM-$SECONDS
 ${CLICKHOUSE_CLIENT} --user=test_01541 --max_block_size=1 --format Null --query_id $query_id -q 'SELECT sleepEachRow(1) FROM numbers(600)' &
 # trap
 sleep_query_pid=$!
+# Shellcheck wrongly process "trap" https://www.shellcheck.net/wiki/SC2317
+# shellcheck disable=SC2317
 function cleanup()
 {
     echo 'KILL sleep'
     # if the timeout will not be enough, it will trigger "No such process" error/message
-    kill $sleep_query_pid
+    kill "$sleep_query_pid"
     # waiting for a query to finish
     while ${CLICKHOUSE_CLIENT} -q "SELECT query_id FROM system.processes WHERE query_id = '$query_id'" | grep -xq "$query_id"; do
         sleep 0.1
diff --git a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh
index 0d13a1d4eff..48cbd57c1c0 100755
--- a/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh
+++ b/tests/queries/0_stateless/01548_query_log_query_execution_ms.sh
@@ -47,7 +47,7 @@ function main()
 {
     # retries, since there is no guarantee that every time query will take ~0.4 second.
     local retries=20 i=0
-    while [ "$(test_query_duration_ms | xargs)" != '1 1' ] && [[ $i < $retries ]]; do
+    while [ "$(test_query_duration_ms | xargs)" != '1 1' ] && (( i < retries )); do
         ((++i))
     done
 }
diff --git a/tests/queries/0_stateless/01553_settings_early_apply.reference b/tests/queries/0_stateless/01553_settings_early_apply.reference
index 860d8d48c85..3306aaa734a 100644
--- a/tests/queries/0_stateless/01553_settings_early_apply.reference
+++ b/tests/queries/0_stateless/01553_settings_early_apply.reference
@@ -34,9 +34,9 @@ UInt64
 	</data>
 	<rows>0</rows>
 </result>
- number
+    number
 
-      0 
+1.       0 
 0
 1
 2
diff --git a/tests/queries/0_stateless/01557_field_infinite_convert_to_number.sql b/tests/queries/0_stateless/01557_field_infinite_convert_to_number.sql
index edc4d5cbc91..cc71c8e6f6c 100644
--- a/tests/queries/0_stateless/01557_field_infinite_convert_to_number.sql
+++ b/tests/queries/0_stateless/01557_field_infinite_convert_to_number.sql
@@ -1 +1 @@
-SET max_threads = nan; -- { serverError 70 }
+SET max_threads = nan; -- { serverError CANNOT_CONVERT_TYPE }
diff --git a/tests/queries/0_stateless/01565_query_loop_after_client_error.expect b/tests/queries/0_stateless/01565_query_loop_after_client_error.expect
index e718fd99b7f..ac69c18ce39 100755
--- a/tests/queries/0_stateless/01565_query_loop_after_client_error.expect
+++ b/tests/queries/0_stateless/01565_query_loop_after_client_error.expect
@@ -5,8 +5,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
index e54783e9655..941ab216d0b 100755
--- a/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
+++ b/tests/queries/0_stateless/01569_query_profiler_big_query_id.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-cpu-aarch64
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -9,4 +9,3 @@ query_id="aggregating_merge_tree_simple_aggregate_function_string_query100_profi
 ${CLICKHOUSE_CLIENT} --query="select sleep(1)" --query_id="$query_id" --query_profiler_real_time_period_ns=10000000
 ${CLICKHOUSE_CLIENT} --query="system flush logs"
 ${CLICKHOUSE_CLIENT} --query="select count(*) > 1 from system.trace_log where query_id = '$query_id'"
-
diff --git a/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference b/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference
index 30b5ae9c648..25d8f62f5dd 100644
--- a/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference
+++ b/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.reference
@@ -1,12 +1,8 @@
-SELECT
-    x,
-    y
-FROM prewhere_move
-PREWHERE x > 100
-SELECT
-    x1,
-    x2,
-    x3,
-    x4
-FROM prewhere_move
-PREWHERE (x1 > 100) AND (x2 > 100) AND (x3 > 100) AND (x4 > 100)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(x, 100) (removed)
+  Filter
+  Filter column: and(greater(x1, 100), greater(x2, 100), greater(x3, 100), greater(x4, \'100\')) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(x1, 100)
diff --git a/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql b/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql
index bd3e651e0dc..9a4f8d1f734 100644
--- a/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql
+++ b/tests/queries/0_stateless/01582_move_to_prewhere_compact_parts.sql
@@ -1,3 +1,5 @@
+-- Tags: no-random-merge-tree-settings
+
 SET optimize_move_to_prewhere = 1;
 SET convert_query_to_cnf = 0;
 
@@ -5,14 +7,15 @@ DROP TABLE IF EXISTS prewhere_move;
 CREATE TABLE prewhere_move (x Int, y String) ENGINE = MergeTree ORDER BY tuple();
 INSERT INTO prewhere_move SELECT number, toString(number) FROM numbers(1000);
 
-EXPLAIN SYNTAX SELECT * FROM prewhere_move WHERE x > 100;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move WHERE x > 100) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
 
 DROP TABLE prewhere_move;
 
-CREATE TABLE prewhere_move (x1 Int, x2 Int, x3 Int, x4 Int) ENGINE = MergeTree ORDER BY tuple();
-INSERT INTO prewhere_move SELECT number, number, number, number FROM numbers(1000);
+CREATE TABLE prewhere_move (x1 Int, x2 Int, x3 Int, x4 String CODEC(NONE)) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO prewhere_move SELECT number, number, number, repeat('a', 1024) FROM numbers(1000);
 
 -- Not all conditions moved
-EXPLAIN SYNTAX SELECT * FROM prewhere_move WHERE x1 > 100 AND x2 > 100 AND x3 > 100 AND x4 > 100;
+SET move_all_conditions_to_prewhere = 0;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_String', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move WHERE x1 > 100 AND x2 > 100 AND x3 > 100 AND x4 > '100') WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
 
 DROP TABLE prewhere_move;
diff --git a/tests/queries/0_stateless/01585_use_index_for_global_in.sql b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
index 1dd7609350f..3b0ca726dfa 100644
--- a/tests/queries/0_stateless/01585_use_index_for_global_in.sql
+++ b/tests/queries/0_stateless/01585_use_index_for_global_in.sql
@@ -1,5 +1,7 @@
 -- Tags: global
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists xp;
 drop table if exists xp_d;
 
diff --git a/tests/queries/0_stateless/01595_countMatches.reference b/tests/queries/0_stateless/01595_countMatches.reference
index c65279c0b8e..394c8508430 100644
--- a/tests/queries/0_stateless/01595_countMatches.reference
+++ b/tests/queries/0_stateless/01595_countMatches.reference
@@ -12,6 +12,7 @@ case sensitive
 2
 4
 4
+2
 case insensitive
 2
 1
@@ -21,4 +22,8 @@ case insensitive
 2
 4
 4
+2
 errors
+FixedString
+2
+2
diff --git a/tests/queries/0_stateless/01595_countMatches.sql b/tests/queries/0_stateless/01595_countMatches.sql
index 0b170945d44..0c2982572cd 100644
--- a/tests/queries/0_stateless/01595_countMatches.sql
+++ b/tests/queries/0_stateless/01595_countMatches.sql
@@ -14,6 +14,7 @@ select countMatches(concat(toString(number), 'foofoo'), 'foo') from numbers(2);
 select countMatches('foobarbazfoobarbaz', 'foo(bar)(?:baz|)');
 select countMatches('foo.com bar.com baz.com bam.com', '([^. ]+)\.([^. ]+)');
 select countMatches('foo.com@foo.com bar.com@foo.com baz.com@foo.com bam.com@foo.com', '([^. ]+)\.([^. ]+)@([^. ]+)\.([^. ]+)');
+select countMatches(materialize('foobarfoo'), 'foo');
 
 select 'case insensitive';
 select countMatchesCaseInsensitive('foobarfoo', 'FOo');
@@ -23,7 +24,13 @@ select countMatchesCaseInsensitive(concat(toString(number), 'Foofoo'), 'foo') fr
 select countMatchesCaseInsensitive('foOBarBAZfoobarbaz', 'foo(bar)(?:baz|)');
 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 countMatchesCaseInsensitive(materialize('foobarfoo'), 'FOo');
 
 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 ILLEGAL_TYPE_OF_ARGUMENT }
+select countMatches('foobarfoo', toString(number)) from numbers(1); -- { serverError ILLEGAL_COLUMN }
+select countMatches('foo', materialize('foo')); -- { serverError ILLEGAL_COLUMN }
+
+select 'FixedString';
+select countMatches(toFixedString('foobarfoo', 9), 'foo');
+select countMatches(materialize(toFixedString('foobarfoo', 9)), 'foo');
diff --git a/tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh b/tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh
index 7f77f8bb403..07c2e345009 100755
--- a/tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh
+++ b/tests/queries/0_stateless/01599_multiline_input_and_singleline_comments.sh
@@ -1,9 +1,9 @@
 #!/usr/bin/expect -f
-# Tags: no-fasttest
-# Tag no-fasttest: 180 seconds running
 
 log_user 0
+
 set timeout 60
+
 match_max 100000
 
 if ![info exists env(CLICKHOUSE_PORT_TCP)] {set env(CLICKHOUSE_PORT_TCP) 9000}
@@ -13,15 +13,23 @@ expect ":) "
 
 # Make a query
 send -- "SELECT 1\r"
-expect ":-] "
 send -- "-- xxx\r"
-expect ":-] "
 send -- ", 2\r"
-expect ":-] "
-send -- ";\r"
+send -- ";"
+
+# For some reason this sleep is required for this test to work properly
+sleep 1
+send -- "\r"
+
+expect {
+    "│ 1 │ 2 │" { }
+    timeout { exit 1 }
+}
 
-expect "│ 1 │ 2 │"
 expect ":) "
 
-send -- "\4"
-expect eof
+send -- ""
+expect {
+    eof { exit 0 }
+    timeout { exit 1 }
+}
diff --git a/tests/queries/0_stateless/01600_detach_permanently.reference b/tests/queries/0_stateless/01600_detach_permanently.reference
index 98ed3b6762d..4fda43df162 100644
--- a/tests/queries/0_stateless/01600_detach_permanently.reference
+++ b/tests/queries/0_stateless/01600_detach_permanently.reference
@@ -96,6 +96,7 @@ View can be reattached
 test for MV with inner table
 MV is working
 1
+1
 View can be reattached
 ##################
 DETACH DATABASE is not implemented (proper error)
diff --git a/tests/queries/0_stateless/01600_detach_permanently.sh b/tests/queries/0_stateless/01600_detach_permanently.sh
index 0d1815a75e8..6721dbf3015 100755
--- a/tests/queries/0_stateless/01600_detach_permanently.sh
+++ b/tests/queries/0_stateless/01600_detach_permanently.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 # Tags: no-parallel
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
@@ -108,7 +111,9 @@ clickhouse_local "INSERT INTO db_ordinary.src SELECT * FROM numbers(10)"
 clickhouse_local "SELECT if(count() = 10, 'MV is working', 'MV failed') FROM db_ordinary.src_mv_with_inner"
 
 clickhouse_local "DETACH VIEW db_ordinary.src_mv_with_inner PERMANENTLY; INSERT INTO db_ordinary.src SELECT * FROM numbers(10)" --stacktrace
-clickhouse_local "SELECT if(count() = 10, 'MV can be detached permanently', 'MV detach failed') FROM db_ordinary.src_mv_with_inner" 2>&1 | grep -c "db_ordinary.src_mv_with_inner does not exist"
+clickhouse_local "SELECT if(count() = 10, 'MV can be detached permanently', 'MV detach failed') FROM db_ordinary.src_mv_with_inner SETTINGS allow_experimental_analyzer = 0" 2>&1 | grep -c "db_ordinary.src_mv_with_inner does not exist"
+clickhouse_local "SELECT if(count() = 10, 'MV can be detached permanently', 'MV detach failed') FROM db_ordinary.src_mv_with_inner SETTINGS allow_experimental_analyzer = 1" 2>&1 | grep -c "Unknown table expression identifier 'db_ordinary.src_mv_with_inner'"
+
 ## Quite silly: ATTACH MATERIALIZED VIEW don't work with short syntax (w/o select), but i can attach it using ATTACH TABLE ...
 clickhouse_local "ATTACH TABLE db_ordinary.src_mv_with_inner"
 clickhouse_local "INSERT INTO db_ordinary.src SELECT * FROM numbers(10)"
diff --git a/tests/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql b/tests/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql
index c25f308eda8..b3739af93f8 100644
--- a/tests/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql
+++ b/tests/queries/0_stateless/01600_remerge_sort_lowered_memory_bytes_ratio.sql
@@ -2,7 +2,7 @@
 
 -- Check remerge_sort_lowered_memory_bytes_ratio setting
 
-set max_memory_usage='300Mi';
+set max_memory_usage='200Mi';
 -- enter remerge once limit*2 is reached
 set max_bytes_before_remerge_sort='10Mi';
 -- more blocks
diff --git a/tests/queries/0_stateless/01601_accurate_cast.reference b/tests/queries/0_stateless/01601_accurate_cast.reference
index dbf9666f4cd..82138e6354a 100644
--- a/tests/queries/0_stateless/01601_accurate_cast.reference
+++ b/tests/queries/0_stateless/01601_accurate_cast.reference
@@ -10,7 +10,6 @@
 1970-01-01 00:00:19
 2023-05-30
 1970-01-20
-\N
 true
 false
 true
diff --git a/tests/queries/0_stateless/01601_accurate_cast.sql b/tests/queries/0_stateless/01601_accurate_cast.sql
index d2ecede2402..471e4e34a4a 100644
--- a/tests/queries/0_stateless/01601_accurate_cast.sql
+++ b/tests/queries/0_stateless/01601_accurate_cast.sql
@@ -35,7 +35,7 @@ SELECT accurateCast('1xxx', 'Date');   -- { serverError CANNOT_PARSE_DATE }
 SELECT accurateCast('2023-05-30', 'Date');
 SELECT accurateCast(19, 'Date');
 
-select accurateCast('test', 'Nullable(Bool)');
+select accurateCast('test', 'Nullable(Bool)');   -- { serverError CANNOT_PARSE_BOOL }
 select accurateCast('test', 'Bool');   -- { serverError CANNOT_PARSE_BOOL }
 select accurateCast('truex', 'Bool');   -- { serverError CANNOT_PARSE_BOOL }
 select accurateCast('xfalse', 'Bool');   -- { serverError CANNOT_PARSE_BOOL }
diff --git a/tests/queries/0_stateless/01601_detach_permanently.sql b/tests/queries/0_stateless/01601_detach_permanently.sql
index 95c80e77213..6ab3a7f9b21 100644
--- a/tests/queries/0_stateless/01601_detach_permanently.sql
+++ b/tests/queries/0_stateless/01601_detach_permanently.sql
@@ -1,5 +1,7 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 SELECT 'database atomic tests';
 
 DROP DATABASE IF EXISTS test1601_detach_permanently_atomic;
@@ -73,6 +75,7 @@ SELECT 'database ordinary tests';
 
 DROP DATABASE IF EXISTS test1601_detach_permanently_ordinary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 CREATE DATABASE test1601_detach_permanently_ordinary Engine=Ordinary;
 
 create table test1601_detach_permanently_ordinary.test_name_reuse (number UInt64) engine=MergeTree order by tuple();
diff --git a/tests/queries/0_stateless/01602_show_create_view.reference b/tests/queries/0_stateless/01602_show_create_view.reference
index 5fe11a38db3..b3a345f2742 100644
--- a/tests/queries/0_stateless/01602_show_create_view.reference
+++ b/tests/queries/0_stateless/01602_show_create_view.reference
@@ -1,6 +1,6 @@
-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 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
-CREATE VIEW test_1602.TABLE\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n) AS\nSELECT *\nFROM test_1602.tbl
+CREATE VIEW test_1602.v\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nAS SELECT *\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\nAS SELECT *\nFROM test_1602.tbl
+CREATE VIEW test_1602.VIEW\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nAS SELECT *\nFROM test_1602.tbl
+CREATE VIEW test_1602.DATABASE\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nAS SELECT *\nFROM test_1602.tbl
+CREATE VIEW test_1602.DICTIONARY\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nAS SELECT *\nFROM test_1602.tbl
+CREATE VIEW test_1602.`TABLE`\n(\n    `EventDate` DateTime,\n    `CounterID` UInt32,\n    `UserID` UInt32\n)\nAS SELECT *\nFROM test_1602.tbl
diff --git a/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql b/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
index a56b680e212..d0832cdcc8e 100644
--- a/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
+++ b/tests/queries/0_stateless/01603_insert_select_too_many_parts.sql
@@ -3,9 +3,12 @@ CREATE TABLE too_many_parts (x UInt64) ENGINE = MergeTree ORDER BY tuple() SETTI
 
 SYSTEM STOP MERGES too_many_parts;
 SET max_block_size = 1, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0;
+-- Avoid concurrent parts check to avoid flakiness
+SET max_threads=1, max_insert_threads=1;
 
 -- exception is not thrown if threshold is exceeded when multi-block INSERT is already started.
-INSERT INTO too_many_parts SELECT * FROM numbers(10);
+-- Single thread is used as different threads check it separately https://github.com/ClickHouse/ClickHouse/issues/61158
+INSERT INTO too_many_parts SELECT * FROM numbers(10) SETTINGS max_insert_threads=1;
 SELECT count() FROM too_many_parts;
 
 -- exception is thrown if threshold is exceeded on new INSERT.
diff --git a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
index acf9f520709..cc283ab4292 100644
--- a/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
+++ b/tests/queries/0_stateless/01603_rename_overwrite_bug.sql
@@ -1,7 +1,10 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 DROP database IF EXISTS test_1603_rename_bug_ordinary;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 create database test_1603_rename_bug_ordinary engine=Ordinary;
 create table test_1603_rename_bug_ordinary.foo engine=Memory as select * from numbers(100);
 create table test_1603_rename_bug_ordinary.bar engine=Log as select * from numbers(200);
diff --git a/tests/queries/0_stateless/01611_constant_folding_subqueries.reference b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
index c3df2314112..327a4694aa8 100644
--- a/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
+++ b/tests/queries/0_stateless/01611_constant_folding_subqueries.reference
@@ -5,7 +5,13 @@ SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FO
 1,10
 EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
 SELECT
-    identity(_CAST(0, \'Nullable(UInt64)\')) AS n,
+    __scalarSubqueryResult(_CAST(0, \'Nullable(UInt64)\')) AS n,
     toUInt64(10 / n)
 SELECT * FROM (WITH (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) as q SELECT * FROM system.one WHERE q > 0);
 0
+SELECT * FROM (SELECT (SELECT '\d[a-z]') AS n, extractAll('5abc', assumeNotNull(n))) FORMAT CSV;
+"\d[a-z]","['5a']"
+EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
+SELECT
+    __scalarSubqueryResult(_CAST(0, \'Nullable(UInt64)\')) AS n,
+    toUInt64(10 / n)
diff --git a/tests/queries/0_stateless/01611_constant_folding_subqueries.sql b/tests/queries/0_stateless/01611_constant_folding_subqueries.sql
index 59f057d1ec5..b30fb43f621 100644
--- a/tests/queries/0_stateless/01611_constant_folding_subqueries.sql
+++ b/tests/queries/0_stateless/01611_constant_folding_subqueries.sql
@@ -3,3 +3,6 @@ SELECT * FROM (SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUI
 SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) FORMAT CSV;
 EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
 SELECT * FROM (WITH (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n) as q SELECT * FROM system.one WHERE q > 0);
+
+SELECT * FROM (SELECT (SELECT '\d[a-z]') AS n, extractAll('5abc', assumeNotNull(n))) FORMAT CSV;
+EXPLAIN SYNTAX SELECT (SELECT * FROM system.numbers LIMIT 1 OFFSET 1) AS n, toUInt64(10 / n);
diff --git a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
index a4d0035c590..acde02e2c67 100644
--- a/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
+++ b/tests/queries/0_stateless/01622_constraints_simple_optimization.sql
@@ -1,6 +1,9 @@
 DROP TABLE IF EXISTS constraint_test_assumption;
 DROP TABLE IF EXISTS constraint_test_transitivity;
 DROP TABLE IF EXISTS constraint_test_transitivity2;
+DROP TABLE IF EXISTS constraint_test_transitivity3;
+DROP TABLE IF EXISTS constraint_test_constants_repl;
+DROP TABLE IF EXISTS constraint_test_constants;
 
 SET convert_query_to_cnf = 1;
 SET optimize_using_constraints = 1;
@@ -37,7 +40,6 @@ SELECT count() FROM constraint_test_transitivity WHERE a = d; ---> assumption ->
 
 DROP TABLE constraint_test_transitivity;
 
-
 CREATE TABLE constraint_test_strong_connectivity (a String, b String, c String, d String, CONSTRAINT c1 ASSUME a <= b AND b <= c AND c <= d AND d <= a) ENGINE = TinyLog;
 
 INSERT INTO constraint_test_strong_connectivity (a, b, c, d) VALUES ('1', '2', '3', '4');
@@ -71,7 +73,6 @@ SELECT count() FROM constraint_test_transitivity3 WHERE b >= a; ---> assumption
 
 DROP TABLE constraint_test_transitivity3;
 
-
 CREATE TABLE constraint_test_constants_repl (a Int64, b Int64, c Int64, d Int64, CONSTRAINT c1 ASSUME a - b = 10 AND c + d = 20) ENGINE = TinyLog;
 
 INSERT INTO constraint_test_constants_repl (a, b, c, d) VALUES (1, 2, 3, 4);
diff --git a/tests/queries/0_stateless/01624_soft_constraints.sh b/tests/queries/0_stateless/01624_soft_constraints.sh
index 944a4e4234f..aae193f6a5d 100755
--- a/tests/queries/0_stateless/01624_soft_constraints.sh
+++ b/tests/queries/0_stateless/01624_soft_constraints.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-SETTINGS="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"
+SETTINGS="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; SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;"
 
 $CLICKHOUSE_CLIENT -n --query="
 $SETTINGS;
diff --git a/tests/queries/0_stateless/01625_constraints_index_append.reference b/tests/queries/0_stateless/01625_constraints_index_append.reference
index 591d8a85897..1b1a48c0e29 100644
--- a/tests/queries/0_stateless/01625_constraints_index_append.reference
+++ b/tests/queries/0_stateless/01625_constraints_index_append.reference
@@ -1,23 +1,15 @@
-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
+  Filter column: and(equals(a, 0), indexHint(greater(plus(i, 40), 0))) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: equals(a, 0)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: less(a, 0) (removed)
+  Filter column: and(greaterOrEquals(a, 0), indexHint(greater(plus(i, 40), 0))) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greaterOrEquals(a, 0)
+  Filter column: and(less(multiply(2, b), 100), indexHint(less(i, 100))) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: less(multiply(2, b), 100)
diff --git a/tests/queries/0_stateless/01625_constraints_index_append.sh b/tests/queries/0_stateless/01625_constraints_index_append.sh
deleted file mode 100755
index acceedbb1d1..00000000000
--- a/tests/queries/0_stateless/01625_constraints_index_append.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/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
new file mode 100644
index 00000000000..482cd325bb7
--- /dev/null
+++ b/tests/queries/0_stateless/01625_constraints_index_append.sql
@@ -0,0 +1,26 @@
+-- Tags: no-parallel
+
+-- CNF optimization uses QueryNodeHash to order conditions. We need fixed database.table.column identifier name to stabilize result
+DROP DATABASE IF EXISTS db_memory_01625;
+CREATE DATABASE db_memory_01625 ENGINE = Memory;
+USE db_memory_01625;
+
+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);
+
+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;
+
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT i FROM index_append_test_test WHERE a = 0) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT i FROM index_append_test_test WHERE a < 0) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT i FROM index_append_test_test WHERE a >= 0) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT i FROM index_append_test_test WHERE 2 * b < 100) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
+
+DROP TABLE index_append_test_test;
+DROP DATABASE db_memory_01625;
diff --git a/tests/queries/0_stateless/01645_system_table_engines.reference b/tests/queries/0_stateless/01645_system_table_engines.reference
index e19e6e035a6..e136700da74 100644
--- a/tests/queries/0_stateless/01645_system_table_engines.reference
+++ b/tests/queries/0_stateless/01645_system_table_engines.reference
@@ -1,4 +1,4 @@
-┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_projections─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┬─supports_parallel_insert─�
-│ MergeTree                     │                 1 │                         1 │                    1 │                   1 │            1 │                    0 │                      0 │                        1 │
-│ ReplicatedCollapsingMergeTree │                 1 │                         1 │                    1 │                   1 │            1 │                    1 │                      1 │                        1 │
-└───────────────────────────────┴───────────────────┴───────────────────────────┴──────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┴──────────────────────────┘
+   ┌─name──────────────────────────┬─supports_settings─┬─supports_skipping_indices─┬─supports_projections─┬─supports_sort_order─┬─supports_ttl─┬─supports_replication─┬─supports_deduplication─┬─supports_parallel_insert─�
+1. │ MergeTree                     │                 1 │                         1 │                    1 │                   1 │            1 │                    0 │                      0 │                        1 │
+2. │ ReplicatedCollapsingMergeTree │                 1 │                         1 │                    1 │                   1 │            1 │                    1 │                      1 │                        1 │
+   └───────────────────────────────┴───────────────────┴───────────────────────────┴──────────────────────┴─────────────────────┴──────────────┴──────────────────────┴────────────────────────┴──────────────────────────┘
diff --git a/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql b/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql
index 22532529812..d405bb01fd9 100644
--- a/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql
+++ b/tests/queries/0_stateless/01651_lc_insert_tiny_log.sql
@@ -1,3 +1,4 @@
+set allow_suspicious_low_cardinality_types=1;
 drop table if exists perf_lc_num;
 
 CREATE TABLE perf_lc_num(　        num UInt8,　        arr Array(LowCardinality(Int64)) default [num]　        ) ENGINE = TinyLog;
diff --git a/tests/queries/0_stateless/01655_window_functions_null.reference b/tests/queries/0_stateless/01655_window_functions_null.reference
new file mode 100644
index 00000000000..1cb15a4e849
--- /dev/null
+++ b/tests/queries/0_stateless/01655_window_functions_null.reference
@@ -0,0 +1,5 @@
+1	4
+1	4
+2	5
+3	3
+\N	\N
diff --git a/tests/queries/0_stateless/01655_window_functions_null.sql b/tests/queries/0_stateless/01655_window_functions_null.sql
new file mode 100644
index 00000000000..a3971898adb
--- /dev/null
+++ b/tests/queries/0_stateless/01655_window_functions_null.sql
@@ -0,0 +1,4 @@
+SELECT
+    number,
+    sum(number) OVER (ORDER BY number ASC RANGE BETWEEN CURRENT ROW AND 1 FOLLOWING) AS sum
+FROM values('number Nullable(Int8)', 1, 1, 2, 3, NULL)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference b/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
index a7b5c448f13..4cd84ff99fc 100644
--- a/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
+++ b/tests/queries/0_stateless/01656_ipv4_bad_formatting.reference
@@ -1,4 +1,4 @@
-┌─x───────────────┬─y───────────────┬──────────z─�
-│ 1.1.1.1         │ 1.1.1.1         │   16843009 │
-│ 255.255.255.255 │ 255.255.255.255 │ 4294967295 │
-└─────────────────┴─────────────────┴────────────┘
+   ┌─x───────────────┬─y───────────────┬──────────z─�
+1. │ 1.1.1.1         │ 1.1.1.1         │   16843009 │
+2. │ 255.255.255.255 │ 255.255.255.255 │ 4294967295 │
+   └─────────────────┴─────────────────┴────────────┘
diff --git a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
index 020d7cc5e72..8a6b604b053 100644
--- a/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
+++ b/tests/queries/0_stateless/01656_test_query_log_factories_info.sql
@@ -41,7 +41,9 @@ FROM system.query_log WHERE current_database = currentDatabase() AND type = 'Que
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
 
-SELECT arraySort(used_functions)
+-- 1. analyzer includes arrayJoin into functions list
+-- 2. for crc32 (CaseInsensitive function) we use lower case now
+SELECT arraySort(arrayMap(x -> x == 'crc32' ? 'CRC32' : x, arrayFilter(x-> x != 'arrayJoin', used_functions))) as `arraySort(used_functions)`
 FROM system.query_log WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND (query LIKE '%toDate(\'2000-12-05\')%')
 ORDER BY query_start_time DESC LIMIT 1 FORMAT TabSeparatedWithNames;
 SELECT '';
diff --git a/tests/queries/0_stateless/01666_blns_long.sql b/tests/queries/0_stateless/01666_blns_long.sql
index 01295b11138..d039c01c580 100644
--- a/tests/queries/0_stateless/01666_blns_long.sql
+++ b/tests/queries/0_stateless/01666_blns_long.sql
@@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 
-SET max_insert_threads = 0;
+SET max_insert_threads = 0, output_format_pretty_row_numbers = 0;
 
 DROP TABLE IF EXISTS test;
 
diff --git a/tests/queries/0_stateless/01670_neighbor_lc_bug.sql b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
index f216befbb06..2c95e16e916 100644
--- a/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
+++ b/tests/queries/0_stateless/01670_neighbor_lc_bug.sql
@@ -1,3 +1,5 @@
+SET output_format_pretty_row_numbers = 0;
+
 SELECT
     neighbor(n, -2) AS int,
     neighbor(s, -2) AS str,
@@ -40,6 +42,7 @@ FROM
     ORDER BY val_string, rowNr
 )
 ORDER BY rowNr, val_string, str_m1, str_p1, val_low, low_m1, low_p1
+SETTINGS output_format_pretty_color=1
 format PrettyCompact;
 
 drop table if exists neighbor_test;
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 f82033ab3c7..1f904df6ae7 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─┬─'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 │
-└───┴────────────┴───┴────────────┴────────┴───┘
+   ┌─a─┬──────────b─┬─c─┬──────────d─┬─'0.10'─┬─c─�
+1. │ a │ 2018-01-01 │   │ 1970-01-01 │        │   │
+2. │ b │ 2018-01-01 │ B │ 2018-01-01 │ 0.10   │ B │
+3. │ 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 5cabd6f7f06..7a84bd4e97a 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,4 @@
+SET output_format_pretty_color=1;
 SET allow_experimental_analyzer = 1;
 
 DROP TABLE IF EXISTS table1;
diff --git a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
index db62dedb5b4..ebd6490077e 100755
--- a/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
+++ b/tests/queries/0_stateless/01676_clickhouse_client_autocomplete.sh
@@ -21,6 +21,10 @@ function test_completion_word()
     # - here and below you should escape variables of the expect.
     # - you should not use "expect <<..." since in this case timeout/eof will
     #   not work (I guess due to attached stdin)
+
+    # TODO: get build sanitizer and debug/release info to dynamically change test
+    # like here timeout 120 seconds is too big for release build
+    # but ok for sanitizer builds
     cat > "$SCRIPT_PATH" << EOF
 # NOTE: log will be appended
 exp_internal -f $CLICKHOUSE_TMP/$(basename "${BASH_SOURCE[0]}").debuglog 0
@@ -30,7 +34,7 @@ exp_internal -f $CLICKHOUSE_TMP/$(basename "${BASH_SOURCE[0]}").debuglog 0
 set stdout_channel [open "/dev/stdout" w]
 
 log_user 0
-set timeout 60
+set timeout 120
 match_max 100000
 expect_after {
     # Do not ignore eof from expect
diff --git a/tests/queries/0_stateless/01678_great_circle_angle.reference b/tests/queries/0_stateless/01678_great_circle_angle.reference
index f3382476d4a..a409e1d84b8 100644
--- a/tests/queries/0_stateless/01678_great_circle_angle.reference
+++ b/tests/queries/0_stateless/01678_great_circle_angle.reference
@@ -3,3 +3,8 @@
 0.7135
 10007555
 10007554
+0.1224
+0.7071
+0.7135
+10007555
+10007554
diff --git a/tests/queries/0_stateless/01678_great_circle_angle.sql b/tests/queries/0_stateless/01678_great_circle_angle.sql
index 124c7bfadf2..595622822f1 100644
--- a/tests/queries/0_stateless/01678_great_circle_angle.sql
+++ b/tests/queries/0_stateless/01678_great_circle_angle.sql
@@ -1,3 +1,14 @@
+SET geo_distance_returns_float64_on_float64_arguments = 0;
+
+SELECT round(greatCircleAngle(0, 45, 0.1, 45.1), 4);
+SELECT round(greatCircleAngle(0, 45, 1, 45), 4);
+SELECT round(greatCircleAngle(0, 45, 1, 45.1), 4);
+
+SELECT round(greatCircleDistance(0, 0, 0, 90), 4);
+SELECT round(greatCircleDistance(0, 0, 90, 0), 4);
+
+SET geo_distance_returns_float64_on_float64_arguments = 1;
+
 SELECT round(greatCircleAngle(0, 45, 0.1, 45.1), 4);
 SELECT round(greatCircleAngle(0, 45, 1, 45), 4);
 SELECT round(greatCircleAngle(0, 45, 1, 45.1), 4);
diff --git a/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference b/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference
index de5a62159ef..76dd04b0e42 100644
--- a/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference
+++ b/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.reference
@@ -26,7 +26,6 @@ SELECT
     least(1),
     length('1'),
     log(1),
-    position('1', '1'),
     log(1),
     log10(1),
     log2(1),
diff --git a/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql b/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql
index dda2e045e76..d8054b9757c 100644
--- a/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql
+++ b/tests/queries/0_stateless/01705_normalize_case_insensitive_function_names.sql
@@ -1 +1 @@
-EXPLAIN SYNTAX SELECT CAST(1 AS INT), CEIL(1), CEILING(1), CHAR(49), CHAR_LENGTH('1'), CHARACTER_LENGTH('1'), COALESCE(1), CONCAT('1', '1'), CORR(1, 1), COS(1), COUNT(1), COVAR_POP(1, 1), COVAR_SAMP(1, 1), DATABASE(), SCHEMA(), DATEDIFF('DAY', toDate('2020-10-24'), toDate('2019-10-24')), EXP(1), FLATTEN([[1]]), FLOOR(1), FQDN(), GREATEST(1), IF(1, 1, 1), IFNULL(1, 1), LCASE('A'), LEAST(1), LENGTH('1'), LN(1), LOCATE('1', '1'), LOG(1), LOG10(1), LOG2(1), LOWER('A'), MAX(1), MID('123', 1, 1), MIN(1), MOD(1, 1), NOT(1), NOW(), NOW64(), NULLIF(1, 1), PI(), POSITION('123', '2'), POW(1, 1), POWER(1, 1), RAND(), REPLACE('1', '1', '2'), REVERSE('123'), ROUND(1), SIN(1), SQRT(1), STDDEV_POP(1), STDDEV_SAMP(1), SUBSTR('123', 2), SUBSTRING('123', 2), SUM(1), TAN(1), TANH(1), TRUNC(1), TRUNCATE(1), UCASE('A'), UPPER('A'), USER(), VAR_POP(1), VAR_SAMP(1), WEEK(toDate('2020-10-24')), YEARWEEK(toDate('2020-10-24')) format TSVRaw;
+EXPLAIN SYNTAX SELECT CAST(1 AS INT), CEIL(1), CEILING(1), CHAR(49), CHAR_LENGTH('1'), CHARACTER_LENGTH('1'), COALESCE(1), CONCAT('1', '1'), CORR(1, 1), COS(1), COUNT(1), COVAR_POP(1, 1), COVAR_SAMP(1, 1), DATABASE(), SCHEMA(), DATEDIFF('DAY', toDate('2020-10-24'), toDate('2019-10-24')), EXP(1), FLATTEN([[1]]), FLOOR(1), FQDN(), GREATEST(1), IF(1, 1, 1), IFNULL(1, 1), LCASE('A'), LEAST(1), LENGTH('1'), LN(1), LOG(1), LOG10(1), LOG2(1), LOWER('A'), MAX(1), MID('123', 1, 1), MIN(1), MOD(1, 1), NOT(1), NOW(), NOW64(), NULLIF(1, 1), PI(), POSITION('123', '2'), POW(1, 1), POWER(1, 1), RAND(), REPLACE('1', '1', '2'), REVERSE('123'), ROUND(1), SIN(1), SQRT(1), STDDEV_POP(1), STDDEV_SAMP(1), SUBSTR('123', 2), SUBSTRING('123', 2), SUM(1), TAN(1), TANH(1), TRUNC(1), TRUNCATE(1), UCASE('A'), UPPER('A'), USER(), VAR_POP(1), VAR_SAMP(1), WEEK(toDate('2020-10-24')), YEARWEEK(toDate('2020-10-24')) format TSVRaw;
diff --git a/tests/queries/0_stateless/01710_aggregate_projections.sh b/tests/queries/0_stateless/01710_aggregate_projections.sh
index 7ea40365937..b02d961bf97 100755
--- a/tests/queries/0_stateless/01710_aggregate_projections.sh
+++ b/tests/queries/0_stateless/01710_aggregate_projections.sh
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 # Number of read rows depends on max_bytes_before_external_group_by.
-CLICKHOUSE_CLIENT="$CLICKHOUSE_CLIENT --max_bytes_before_external_group_by 0"
+CLICKHOUSE_CLIENT="$CLICKHOUSE_CLIENT --max_bytes_before_external_group_by 0 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability 0.0"
 
 $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)"
diff --git a/tests/queries/0_stateless/01710_projection_in_index.sql b/tests/queries/0_stateless/01710_projection_in_index.sql
index b858418584c..425653ec501 100644
--- a/tests/queries/0_stateless/01710_projection_in_index.sql
+++ b/tests/queries/0_stateless/01710_projection_in_index.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists t;
 
 create table t (i int, j int, k int, projection p (select * order by j)) engine MergeTree order by i settings index_granularity = 1;
diff --git a/tests/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql b/tests/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql
index c4f26a079f0..dc1e5b37050 100644
--- a/tests/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql
+++ b/tests/queries/0_stateless/01717_int_div_float_too_large_ubsan.sql
@@ -1,2 +1,2 @@
-SELECT intDiv(9223372036854775807, 0.9998999834060669); -- { serverError 153 }
-SELECT intDiv(9223372036854775807, 1.);  -- { serverError 153 }
+SELECT intDiv(18446744073709551615, 0.9998999834060669); -- { serverError 153 }
+SELECT intDiv(18446744073709551615, 1.);  -- { serverError 153 }
diff --git a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
index 3d6a25fe799..74bafe6e4cd 100644
--- a/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
+++ b/tests/queries/0_stateless/01730_distributed_group_by_no_merge_order_by_long.sql
@@ -12,7 +12,7 @@ select * from remote('127.{2..11}', view(select * from numbers(1e6))) group by n
 -- and the query with GROUP BY on remote servers will first do GROUP BY and then send the block,
 -- so the initiator will first receive all blocks from remotes and only after start merging,
 -- and will hit the memory limit.
-select * from remote('127.{2..11}', view(select * from numbers(1e6))) group by number order by number limit 1e6 settings distributed_group_by_no_merge=2, max_memory_usage='100Mi', max_block_size=1e12; -- { serverError 241 }
+select * from remote('127.{2..11}', view(select * from numbers(1e6))) group by number order by number limit 1e6 settings distributed_group_by_no_merge=2, max_memory_usage='20Mi', max_block_size=4294967296; -- { serverError 241 }
 
 -- with optimize_aggregation_in_order=1 remote servers will produce blocks more frequently,
 -- since they don't need to wait until the aggregation will be finished,
diff --git a/tests/queries/0_stateless/01732_explain_syntax_union_query.reference b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
index ccafa916b9f..5246cfec7aa 100644
--- a/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
+++ b/tests/queries/0_stateless/01732_explain_syntax_union_query.reference
@@ -54,7 +54,6 @@ SELECT 1
 -
 SELECT 1
 -
-
 (
     SELECT 1
     UNION DISTINCT
diff --git a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
index adab3906e5b..cd8abb57a80 100755
--- a/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
+++ b/tests/queries/0_stateless/01737_clickhouse_server_wait_server_pool_long.sh
@@ -18,10 +18,12 @@ CLICKHOUSE_WATCHDOG_ENABLE=0 $CLICKHOUSE_SERVER_BINARY "${server_opts[@]}" >& cl
 server_pid=$!
 
 trap cleanup EXIT
+# Shellcheck wrongly process "trap" https://www.shellcheck.net/wiki/SC2317
+# shellcheck disable=SC2317
 function cleanup()
 {
-    kill -9 $server_pid
-    kill -9 $client_pid
+    kill -9 "$server_pid"
+    kill -9 "$client_pid"
 
     echo "Test failed. Server log:"
     cat clickhouse-server.log
diff --git a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
index 98c76cc2a50..26a0e97729c 100644
--- a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
+++ b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.reference
@@ -1,114 +1,38 @@
 optimize_move_to_prewhere_if_final = 1
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-PREWHERE x > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE x > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-PREWHERE y > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE y > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-PREWHERE (x + y) > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE (x + y) > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-WHERE z > 400
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE y > 100
-WHERE (y > 100) AND (z > 400)
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE x > 50
-WHERE (x > 50) AND (z > 400)
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-PREWHERE (x + y) > 50
-WHERE ((x + y) > 50) AND (z > 400)
-
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(x, 100) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(x, 100) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(y, 100) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(y, 100) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(plus(x, y), 100) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(plus(x, y), 100) (removed)
+  Filter
+  Filter column: and(greater(y, 100), greater(z, 400)) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(y, 100)
+  Filter
+  Filter column: and(greater(x, 50), greater(z, 400)) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(x, 50)
+  Filter
+  Filter column: and(greater(plus(x, y), 50), greater(z, 400)) (removed)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(plus(x, y), 50)
 optimize_move_to_prewhere_if_final = 0
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-PREWHERE y > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-WHERE y > 100
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-WHERE z > 400
-
-SELECT
-    x,
-    y,
-    z
-FROM prewhere_move_select_final
-FINAL
-WHERE (y > 100) AND (z > 400)
+    Prewhere info
+      Prewhere filter
+      Prewhere filter column: greater(y, 100) (removed)
diff --git a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
index ede15738c5b..d4830e9e357 100644
--- a/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
+++ b/tests/queries/0_stateless/01737_move_order_key_to_prewhere_select_final.sql
@@ -10,42 +10,27 @@ select 'optimize_move_to_prewhere_if_final = 1';
 SET optimize_move_to_prewhere_if_final = 1;
 
 -- order key can be pushed down with final
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final WHERE x > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE x > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final WHERE y > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final WHERE x + y > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE x + y > 100;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final WHERE x > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE x > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final WHERE y > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final WHERE x + y > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE x + y > 100) WHERE explain LIKE '%Prewhere%';
 
 -- can not be pushed down
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE z > 400;
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE z > 400) WHERE explain LIKE '%Prewhere filter';
 
 -- only condition with x/y can be pushed down
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100 and z > 400;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE x > 50 and z > 400;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE x + y > 50 and z > 400;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100 and z > 400) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE x > 50 and z > 400) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE x + y > 50 and z > 400) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
 
-select '';
 select 'optimize_move_to_prewhere_if_final = 0';
 SET optimize_move_to_prewhere_if_final = 0;
 
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final WHERE y > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE z > 400;
-select '';
-EXPLAIN SYNTAX SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100 and z > 400;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final WHERE y > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE z > 400) WHERE explain LIKE '%Prewhere%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_UInt16', '') FROM (EXPLAIN actions=1 SELECT * FROM prewhere_move_select_final FINAL WHERE y > 100 and z > 400) WHERE explain LIKE '%Prewhere%';
 
 DROP TABLE prewhere_move_select_final;
diff --git a/tests/queries/0_stateless/01739_index_hint.reference b/tests/queries/0_stateless/01739_index_hint.reference
index 21673bf698b..21f4edc0049 100644
--- a/tests/queries/0_stateless/01739_index_hint.reference
+++ b/tests/queries/0_stateless/01739_index_hint.reference
@@ -35,6 +35,9 @@ SELECT count() FROM XXXX WHERE indexHint(t = toDateTime(0)) SETTINGS optimize_us
 drop table XXXX;
 CREATE TABLE XXXX (p Nullable(Int64), k Decimal(76, 39)) ENGINE = MergeTree PARTITION BY toDate(p) ORDER BY k SETTINGS index_granularity = 1, allow_nullable_key = 1;
 INSERT INTO XXXX FORMAT Values ('2020-09-01 00:01:02', 1), ('2020-09-01 20:01:03', 2), ('2020-09-02 00:01:03', 3);
-SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1;
+SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1, allow_experimental_analyzer=0;
 0
+-- TODO: optimize_use_implicit_projections ignores indexHint (with analyzer) because source columns might be aliased.
+SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1, allow_experimental_analyzer=1;
+3
 drop table XXXX;
diff --git a/tests/queries/0_stateless/01739_index_hint.sql b/tests/queries/0_stateless/01739_index_hint.sql
index cde46a5a2bf..1eca65f0892 100644
--- a/tests/queries/0_stateless/01739_index_hint.sql
+++ b/tests/queries/0_stateless/01739_index_hint.sql
@@ -38,6 +38,8 @@ CREATE TABLE XXXX (p Nullable(Int64), k Decimal(76, 39)) ENGINE = MergeTree PART
 
 INSERT INTO XXXX FORMAT Values ('2020-09-01 00:01:02', 1), ('2020-09-01 20:01:03', 2), ('2020-09-02 00:01:03', 3);
 
-SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1;
+SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1, allow_experimental_analyzer=0;
+-- TODO: optimize_use_implicit_projections ignores indexHint (with analyzer) because source columns might be aliased.
+SELECT count() FROM XXXX WHERE indexHint(p = 1.) SETTINGS optimize_use_implicit_projections = 1, allow_experimental_analyzer=1;
 
 drop table XXXX;
diff --git a/tests/queries/0_stateless/01747_system_session_log_long.sh b/tests/queries/0_stateless/01747_system_session_log_long.sh
index 3ad33c28ee1..ecddcb627b8 100755
--- a/tests/queries/0_stateless/01747_system_session_log_long.sh
+++ b/tests/queries/0_stateless/01747_system_session_log_long.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-parallel, no-fasttest
+# Tags: long, no-parallel, no-fasttest, no-debug
 
 ##################################################################################################
 # Verify that login, logout, and login failure events are properly stored in system.session_log
diff --git a/tests/queries/0_stateless/01748_partition_id_pruning.sql b/tests/queries/0_stateless/01748_partition_id_pruning.sql
index 9a26dd8daba..b637528bc6c 100644
--- a/tests/queries/0_stateless/01748_partition_id_pruning.sql
+++ b/tests/queries/0_stateless/01748_partition_id_pruning.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists x;
 
 create table x (i int, j int) engine MergeTree partition by i order by j settings index_granularity = 1;
diff --git a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
index a7e4b45eb44..3efbe478ce5 100755
--- a/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
+++ b/tests/queries/0_stateless/01755_client_highlight_multi_line_comment_regression.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01763_filter_push_down_bugs.reference b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
index c8045dd26f5..19018a610b7 100644
--- a/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
+++ b/tests/queries/0_stateless/01763_filter_push_down_bugs.reference
@@ -9,7 +9,7 @@ String1_0	String2_0	String3_0	String4_0	1
 Expression ((Projection + Before ORDER BY))
   Filter (WHERE)
     Join (JOIN FillRightFirst)
-      Filter (( + Before JOIN))
+      Expression
         ReadFromMergeTree (default.t1)
         Indexes:
           PrimaryKey
@@ -28,7 +28,7 @@ Expression ((Projection + Before ORDER BY))
 Expression ((Project names + Projection))
   Filter ((WHERE + DROP unused columns after JOIN))
     Join (JOIN FillRightFirst)
-      Expression (Change column names to column identifiers)
+      Expression
         ReadFromMergeTree (default.t1)
         Indexes:
           PrimaryKey
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.reference b/tests/queries/0_stateless/01786_explain_merge_tree.reference
index 096090f8fa1..3a015d32539 100644
--- a/tests/queries/0_stateless/01786_explain_merge_tree.reference
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.reference
@@ -1,83 +1,79 @@
-  ReadFromMergeTree (default.test_index)
-  Indexes:
-    MinMax
-      Keys: 
-        y
-      Condition: (y in [1, +Inf))
-      Parts: 4/5
-      Granules: 11/12
-    Partition
-      Keys: 
-        y
-        bitAnd(z, 3)
-      Condition: and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1]))
-      Parts: 3/4
-      Granules: 10/11
-    PrimaryKey
-      Keys: 
-        x
-        y
-      Condition: and((x in [11, +Inf)), (y in [1, +Inf)))
-      Parts: 2/3
-      Granules: 6/10
-    Skip
-      Name: t_minmax
-      Description: minmax GRANULARITY 2
-      Parts: 1/2
-      Granules: 3/6
-    Skip
-      Name: t_set
-      Description: set GRANULARITY 2
-      Parts: 1/1
-      Granules: 2/3
+    ReadFromMergeTree (default.test_index)
+    Indexes:
+      MinMax
+        Keys: 
+          y
+        Parts: 4/5
+        Granules: 11/12
+      Partition
+        Keys: 
+          y
+          bitAnd(z, 3)
+        Parts: 3/4
+        Granules: 10/11
+      PrimaryKey
+        Keys: 
+          x
+          y
+        Parts: 2/3
+        Granules: 6/10
+      Skip
+        Name: t_minmax
+        Description: minmax GRANULARITY 2
+        Parts: 1/2
+        Granules: 3/6
+      Skip
+        Name: t_set
+        Description: set GRANULARITY 2
+        Parts: 1/1
+        Granules: 2/3
 -----------------
-          "Node Type": "ReadFromMergeTree",
-          "Description": "default.test_index",
-          "Indexes": [
-            {
-              "Type": "MinMax",
-              "Keys": ["y"],
-              "Condition": "(y in [1, +Inf))",
-              "Initial Parts": 5,
-              "Selected Parts": 4,
-              "Initial Granules": 12,
-              "Selected Granules": 11
-            },
-            {
-              "Type": "Partition",
-              "Keys": ["y", "bitAnd(z, 3)"],
-              "Condition": "and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1]))",
-              "Initial Parts": 4,
-              "Selected Parts": 3,
-              "Initial Granules": 11,
-              "Selected Granules": 10
-            },
-            {
-              "Type": "PrimaryKey",
-              "Keys": ["x", "y"],
-              "Condition": "and((x in [11, +Inf)), (y in [1, +Inf)))",
-              "Initial Parts": 3,
-              "Selected Parts": 2,
-              "Initial Granules": 10,
-              "Selected Granules": 6
-            },
-            {
-              "Type": "Skip",
-              "Name": "t_minmax",
-              "Description": "minmax GRANULARITY 2",
-              "Initial Parts": 2,
-              "Selected Parts": 1,
-              "Initial Granules": 6,
-              "Selected Granules": 3
-            },
-            {
-              "Type": "Skip",
-              "Name": "t_set",
-              "Description": "set GRANULARITY 2",
-              "Initial Parts": 1,
-              "Selected Parts": 1,
-              "Initial Granules": 3,
-              "Selected Granules": 2
+              "Node Type": "ReadFromMergeTree",
+              "Description": "default.test_index",
+              "Indexes": [
+                {
+                  "Type": "MinMax",
+                  "Keys": ["y"],
+                  "Initial Parts": 5,
+                  "Selected Parts": 4,
+                  "Initial Granules": 12,
+                  "Selected Granules": 11
+                },
+                {
+                  "Type": "Partition",
+                  "Keys": ["y", "bitAnd(z, 3)"],
+                  "Initial Parts": 4,
+                  "Selected Parts": 3,
+                  "Initial Granules": 11,
+                  "Selected Granules": 10
+                },
+                {
+                  "Type": "PrimaryKey",
+                  "Keys": ["x", "y"],
+                  "Initial Parts": 3,
+                  "Selected Parts": 2,
+                  "Initial Granules": 10,
+                  "Selected Granules": 6
+                },
+                {
+                  "Type": "Skip",
+                  "Name": "t_minmax",
+                  "Description": "minmax GRANULARITY 2",
+                  "Initial Parts": 2,
+                  "Selected Parts": 1,
+                  "Initial Granules": 6,
+                  "Selected Granules": 3
+                },
+                {
+                  "Type": "Skip",
+                  "Name": "t_set",
+                  "Description": "set GRANULARITY 2",
+                  "Initial Parts": 1,
+                  "Selected Parts": 1,
+                  "Initial Granules": 3,
+                  "Selected Granules": 2
+                }
+              ]
             }
           ]
         }
@@ -95,35 +91,32 @@
         ReadType: InReverseOrder
         Parts: 1
         Granules: 3
-  ReadFromMergeTree (default.idx)
-  Indexes:
-    PrimaryKey
-      Keys: 
-        x
-        plus(x, y)
-      Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-Inf, 2]))
-      Parts: 1/1
-      Granules: 1/1
+    ReadFromMergeTree (default.idx)
+    Indexes:
+      PrimaryKey
+        Keys: 
+          x
+          plus(x, y)
+        Condition: or((x in 2-element set), (plus(plus(x, y), 1) in (-Inf, 2]))
+        Parts: 1/1
+        Granules: 1/1
     ReadFromMergeTree (default.test_index)
     Indexes:
       MinMax
         Keys: 
           y
-        Condition: (y in [1, +Inf))
         Parts: 4/5
         Granules: 11/12
       Partition
         Keys: 
           y
           bitAnd(z, 3)
-        Condition: and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1]))
         Parts: 3/4
         Granules: 10/11
       PrimaryKey
         Keys: 
           x
           y
-        Condition: and((x in [11, +Inf)), (y in [1, +Inf)))
         Parts: 2/3
         Granules: 6/10
       Skip
@@ -138,7 +131,6 @@
                 {
                   "Type": "MinMax",
                   "Keys": ["y"],
-                  "Condition": "(y in [1, +Inf))",
                   "Initial Parts": 5,
                   "Selected Parts": 4,
                   "Initial Granules": 12,
@@ -147,7 +139,6 @@
                 {
                   "Type": "Partition",
                   "Keys": ["y", "bitAnd(z, 3)"],
-                  "Condition": "and((y in [1, +Inf)), (bitAnd(z, 3) not in [1, 1]))",
                   "Initial Parts": 4,
                   "Selected Parts": 3,
                   "Initial Granules": 11,
@@ -156,7 +147,6 @@
                 {
                   "Type": "PrimaryKey",
                   "Keys": ["x", "y"],
-                  "Condition": "and((x in [11, +Inf)), (y in [1, +Inf)))",
                   "Initial Parts": 3,
                   "Selected Parts": 2,
                   "Initial Granules": 10,
diff --git a/tests/queries/0_stateless/01786_explain_merge_tree.sh b/tests/queries/0_stateless/01786_explain_merge_tree.sh
index 23537013204..e3b28acdc41 100755
--- a/tests/queries/0_stateless/01786_explain_merge_tree.sh
+++ b/tests/queries/0_stateless/01786_explain_merge_tree.sh
@@ -17,13 +17,13 @@ do
 
     $CH_CLIENT -q "
         explain indexes = 1 select *, _part from test_index where t % 19 = 16 and y > 0 and bitAnd(z, 3) != 1 and x > 10 and t % 20 > 14;
-        " | grep -A 100 "ReadFromMergeTree" # | grep -v "Description"
+        " | grep -A 100 "ReadFromMergeTree" | grep -v "Condition"
 
     echo "-----------------"
 
     $CH_CLIENT -q "
         explain indexes = 1, json = 1 select *, _part from test_index where t % 19 = 16 and y > 0 and bitAnd(z, 3) != 1 and x > 10 and t % 20 > 14 format TSVRaw;
-        " | grep -A 100 "ReadFromMergeTree" # | grep -v "Description"
+        " | grep -A 100 "ReadFromMergeTree" | grep -v "Condition"
 
     echo "-----------------"
 
diff --git a/tests/queries/0_stateless/01798_having_push_down.sql b/tests/queries/0_stateless/01798_having_push_down.sql
index b3a77c8f5b5..c0c3447f5ab 100644
--- a/tests/queries/0_stateless/01798_having_push_down.sql
+++ b/tests/queries/0_stateless/01798_having_push_down.sql
@@ -8,11 +8,12 @@ SELECT sum(c0 = 0), min(c0 + 1), sum(c0 + 2) FROM t_having
 GROUP BY c0 HAVING c0 = 0
 SETTINGS enable_optimize_predicate_expression=0;
 
+SET enable_positional_arguments=0;
+
 SELECT c0 + -1, sum(intDivOrZero(intDivOrZero(NULL, NULL), '2'), intDivOrZero(10000000000., intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), 10), NULL))) FROM t_having GROUP BY c0 = 2, c0 = 10, intDivOrZero(intDivOrZero(intDivOrZero(NULL, NULL), NULL), NULL), c0 HAVING c0 = 2 SETTINGS enable_optimize_predicate_expression = 0;
 
 SELECT sum(c0 + 257) FROM t_having GROUP BY c0 = -9223372036854775808, NULL, -2147483649, c0 HAVING c0 = -9223372036854775808 SETTINGS enable_optimize_predicate_expression = 0;
 
-SET enable_positional_arguments=0;
 SELECT c0 + -2, c0 + -9223372036854775807, c0 = NULL FROM t_having GROUP BY c0 = 0.9998999834060669, 1023, c0 HAVING c0 = 0.9998999834060669 SETTINGS enable_optimize_predicate_expression = 0;
 
 DROP TABLE t_having;
diff --git a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
index 87153a4bd58..3782a7d3ad6 100755
--- a/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
+++ b/tests/queries/0_stateless/01810_max_part_removal_threads_long.sh
@@ -7,6 +7,9 @@
 # and we can do it compatible with parallel run only in .sh
 # (via $CLICKHOUSE_DATABASE)
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
index 686a864f222..ccd51cba776 100644
--- a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
+++ b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.reference
@@ -1,12 +1,19 @@
 1	Wide
 2	Compact
 35
-SELECT count()
-FROM t_move_to_prewhere
-PREWHERE a AND b AND c AND (NOT ignore(fat_string))
+      Filter
+      Filter column: and(a, b, c, not(ignore(fat_string))) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(a, b, c) (removed)
 1	Compact
 2	Compact
 35
 SELECT count()
 FROM t_move_to_prewhere
-PREWHERE a AND b AND c AND (NOT ignore(fat_string))
+WHERE a AND b AND c AND (NOT ignore(fat_string))
+      Filter
+      Filter column: and(a, b, c, not(ignore(fat_string))) (removed)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: a
diff --git a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
index 2987c541aef..6ad804ac1b3 100644
--- a/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
+++ b/tests/queries/0_stateless/01824_move_to_prewhere_many_columns.sql
@@ -2,6 +2,7 @@
 
 SET optimize_move_to_prewhere = 1;
 SET convert_query_to_cnf = 0;
+SET move_all_conditions_to_prewhere = 0;
 
 DROP TABLE IF EXISTS t_move_to_prewhere;
 
@@ -17,7 +18,7 @@ WHERE table = 't_move_to_prewhere' AND database = currentDatabase()
 ORDER BY partition;
 
 SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
-EXPLAIN SYNTAX SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
 
 DROP TABLE IF EXISTS t_move_to_prewhere;
 
@@ -38,5 +39,6 @@ ORDER BY partition;
 
 SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
 EXPLAIN SYNTAX SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string);
+SELECT replaceRegexpAll(explain, '__table1\.', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_move_to_prewhere WHERE a AND b AND c AND NOT ignore(fat_string)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter%';
 
 DROP TABLE IF EXISTS t_move_to_prewhere;
diff --git a/tests/queries/0_stateless/01848_partition_value_column.sql b/tests/queries/0_stateless/01848_partition_value_column.sql
index 28d842af3e9..de5e766c92c 100644
--- a/tests/queries/0_stateless/01848_partition_value_column.sql
+++ b/tests/queries/0_stateless/01848_partition_value_column.sql
@@ -14,8 +14,8 @@ select count() from tbl where _partition_value.3 = 4 settings max_rows_to_read =
 
 create table tbl2(i int) engine MergeTree order by i;
 insert into tbl2 values (1);
-select _partition_value from tbl2; -- { serverError 16 }
-select _partition_value from tbl2 group by 1; -- { serverError 16 }
+select _partition_value from tbl2; -- { serverError UNKNOWN_IDENTIFIER }
+select _partition_value from tbl2 group by 1; -- { serverError UNKNOWN_IDENTIFIER }
 
 drop table tbl;
 drop table tbl2;
diff --git a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
index 09ca0e2063d..d5108e98510 100644
--- a/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
+++ b/tests/queries/0_stateless/01852_dictionary_found_rate_long.sql
@@ -22,7 +22,7 @@ CREATE DICTIONARY simple_key_flat_dictionary_01862
     value String
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'simple_key_source_table_01862'))
 LAYOUT(FLAT())
 LIFETIME(MIN 0 MAX 1000);
 
@@ -43,7 +43,7 @@ CREATE DICTIONARY simple_key_direct_dictionary_01862
     value String
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'simple_key_source_table_01862'))
 LAYOUT(DIRECT());
 
 -- check that found_rate is 0, not nan
@@ -65,7 +65,7 @@ CREATE DICTIONARY simple_key_hashed_dictionary_01862
     value String
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'simple_key_source_table_01862'))
 LAYOUT(HASHED())
 LIFETIME(MIN 0 MAX 1000);
 
@@ -85,7 +85,7 @@ CREATE DICTIONARY simple_key_sparse_hashed_dictionary_01862
     value String
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'simple_key_source_table_01862'))
 LAYOUT(SPARSE_HASHED())
 LIFETIME(MIN 0 MAX 1000);
 
@@ -105,7 +105,7 @@ CREATE DICTIONARY simple_key_cache_dictionary_01862
     value String
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'simple_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'simple_key_source_table_01862'))
 LAYOUT(CACHE(SIZE_IN_CELLS 100000))
 LIFETIME(MIN 0 MAX 1000);
 
@@ -143,7 +143,7 @@ CREATE DICTIONARY complex_key_hashed_dictionary_01862
     value String
 )
 PRIMARY KEY id, id_key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'complex_key_source_table_01862'))
 LAYOUT(COMPLEX_KEY_HASHED())
 LIFETIME(MIN 0 MAX 1000);
 
@@ -164,7 +164,7 @@ CREATE DICTIONARY complex_key_direct_dictionary_01862
     value String
 )
 PRIMARY KEY id, id_key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'complex_key_source_table_01862'))
 LAYOUT(COMPLEX_KEY_DIRECT());
 
 SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'complex_key_direct_dictionary_01862';
@@ -184,7 +184,7 @@ CREATE DICTIONARY complex_key_cache_dictionary_01862
     value String
 )
 PRIMARY KEY id, id_key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'complex_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'complex_key_source_table_01862'))
 LAYOUT(COMPLEX_KEY_CACHE(SIZE_IN_CELLS 100000))
 LIFETIME(MIN 0 MAX 1000);
 
@@ -223,7 +223,7 @@ CREATE DICTIONARY simple_key_range_hashed_dictionary_01862
     last Date
 )
 PRIMARY KEY id
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_key_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'range_key_source_table_01862'))
 LAYOUT(RANGE_HASHED())
 RANGE(MIN first MAX last)
 LIFETIME(MIN 0 MAX 1000);
@@ -259,13 +259,16 @@ CREATE DICTIONARY ip_trie_dictionary_01862
     value String
 )
 PRIMARY KEY prefix
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'ip_trie_source_table_01862'))
+SOURCE(CLICKHOUSE(TABLE 'ip_trie_source_table_01862'))
 LAYOUT(IP_TRIE())
 LIFETIME(MIN 0 MAX 1000);
 
+-- found_rate = 0, because we didn't make any searches.
 SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
+-- found_rate = 1, because the dictionary covers the 127.0.0.1 address.
 SELECT dictGet('ip_trie_dictionary_01862', 'value', tuple(toIPv4('127.0.0.1'))) FORMAT Null;
 SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
+-- found_rate = 0.5, because the dictionary does not cover 1.1.1.1 and we have two lookups in total as of now.
 SELECT dictGet('ip_trie_dictionary_01862', 'value', tuple(toIPv4('1.1.1.1'))) FORMAT Null;
 SELECT name, found_rate FROM system.dictionaries WHERE database = currentDatabase() AND name = 'ip_trie_dictionary_01862';
 
@@ -299,7 +302,7 @@ CREATE DICTIONARY polygon_dictionary_01862
     name String
 )
 PRIMARY KEY key
-SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'polygons_01862'))
+SOURCE(CLICKHOUSE(USER 'default' TABLE 'polygons_01862'))
 LIFETIME(0)
 LAYOUT(POLYGON());
 
diff --git a/tests/queries/0_stateless/01861_explain_pipeline.sql b/tests/queries/0_stateless/01861_explain_pipeline.sql
index 93c82b6e265..99ea52ebfa4 100644
--- a/tests/queries/0_stateless/01861_explain_pipeline.sql
+++ b/tests/queries/0_stateless/01861_explain_pipeline.sql
@@ -3,8 +3,8 @@ CREATE TABLE test(a Int, b Int) Engine=ReplacingMergeTree order by a SETTINGS in
 INSERT INTO test select number, number from numbers(5);
 INSERT INTO test select number, number from numbers(5,2);
 set max_threads =1;
-explain pipeline select * from test final;
+explain pipeline select * from test final SETTINGS enable_vertical_final = 0;
 select * from test final;
 set max_threads =2;
-explain pipeline select * from test final;
+explain pipeline select * from test final SETTINGS enable_vertical_final = 0;
 DROP TABLE test;
diff --git a/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
index a52505659d1..4dc5ccac840 100644
--- a/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
+++ b/tests/queries/0_stateless/01874_select_from_trailing_whitespaces.reference
@@ -46,10 +46,12 @@ SELECT * FROM system.one UNION ALL SELECT * FROM system.one
 SELECT *
 FROM system.one
 UNION ALL
-SELECT *
-FROM system.one
+(
+    SELECT *
+    FROM system.one
+)
 # /* oneline */ select * from system.one union all (select * from system.one)
-SELECT * FROM system.one UNION ALL SELECT * FROM system.one
+SELECT * FROM system.one UNION ALL (SELECT * FROM system.one)
 # select 1 union all (select 1 union distinct select 1)
 SELECT 1
 UNION ALL
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.reference b/tests/queries/0_stateless/01889_sqlite_read_write.reference
index 9f2b382e41e..e605693d95d 100644
--- a/tests/queries/0_stateless/01889_sqlite_read_write.reference
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.reference
@@ -29,7 +29,7 @@ CREATE TABLE default.sqlite_table3\n(\n    `col1` String,\n    `col2` Int32\n)\n
 not a null	2
 	3
 	4
-line6	6
+line\'6	6
 	7
 test table function
 line1	1
diff --git a/tests/queries/0_stateless/01889_sqlite_read_write.sh b/tests/queries/0_stateless/01889_sqlite_read_write.sh
index 02b9a649e94..fd0a1df20ac 100755
--- a/tests/queries/0_stateless/01889_sqlite_read_write.sh
+++ b/tests/queries/0_stateless/01889_sqlite_read_write.sh
@@ -76,7 +76,7 @@ ${CLICKHOUSE_CLIENT} --query='DROP TABLE IF EXISTS sqlite_table3'
 ${CLICKHOUSE_CLIENT} --query="CREATE TABLE sqlite_table3 (col1 String, col2 Int32) ENGINE = SQLite('${DB_PATH}', 'table3')"
 
 ${CLICKHOUSE_CLIENT} --query='SHOW CREATE TABLE sqlite_table3;' | sed -r 's/(.*SQLite)(.*)/\1/'
-${CLICKHOUSE_CLIENT} --query="INSERT INTO sqlite_table3 VALUES ('line6', 6);"
+${CLICKHOUSE_CLIENT} --query="INSERT INTO sqlite_table3 VALUES ('line\'6', 6);"
 ${CLICKHOUSE_CLIENT} --query="INSERT INTO sqlite_table3 VALUES (NULL, 7);"
 
 ${CLICKHOUSE_CLIENT} --query='SELECT * FROM sqlite_table3 ORDER BY col2'
diff --git a/tests/queries/0_stateless/01890_materialized_distributed_join.sh b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
index 0d761f2defa..88f7dcf9a69 100755
--- a/tests/queries/0_stateless/01890_materialized_distributed_join.sh
+++ b/tests/queries/0_stateless/01890_materialized_distributed_join.sh
@@ -20,7 +20,7 @@ $CLICKHOUSE_CLIENT -nm -q "
     insert into test_shard  values (1, 1);
     insert into test_local  values (1, 2);
 
-    create materialized view test_distributed engine Distributed('test_cluster_two_shards', $CLICKHOUSE_DATABASE, 'test_shard', k) as select k, v from test_source;
+    create materialized view $CLICKHOUSE_DATABASE.test_distributed engine Distributed('test_cluster_two_shards', $CLICKHOUSE_DATABASE, 'test_shard', k) as select k, v from test_source;
 
     select * from test_distributed td asof join $CLICKHOUSE_DATABASE.test_local tl on td.k = tl.k and td.v < tl.v;
     select td.v, td.k, td.v, tl.v, tl.k, td.v from test_distributed td asof join $CLICKHOUSE_DATABASE.test_local tl on td.k = tl.k and td.v < tl.v FORMAT TSVWithNamesAndTypes;
diff --git a/tests/queries/0_stateless/01902_table_function_merge_db_params.reference b/tests/queries/0_stateless/01902_table_function_merge_db_params.reference
new file mode 100644
index 00000000000..28edbbdfd38
--- /dev/null
+++ b/tests/queries/0_stateless/01902_table_function_merge_db_params.reference
@@ -0,0 +1,6 @@
+01902_db_params	t	0
+01902_db_params	t	1
+01902_db_params	t	2
+01902_db_params	t	0
+01902_db_params	t	1
+01902_db_params	t	2
diff --git a/tests/queries/0_stateless/01902_table_function_merge_db_params.sql b/tests/queries/0_stateless/01902_table_function_merge_db_params.sql
new file mode 100644
index 00000000000..3d97cf2b0c6
--- /dev/null
+++ b/tests/queries/0_stateless/01902_table_function_merge_db_params.sql
@@ -0,0 +1,13 @@
+DROP DATABASE IF EXISTS 01902_db_params;
+CREATE DATABASE 01902_db_params;
+CREATE TABLE 01902_db_params.t(n Int8) ENGINE=MergeTree ORDER BY n;
+INSERT INTO 01902_db_params.t SELECT * FROM numbers(3);
+SELECT _database, _table, n FROM merge(REGEXP('^01902_db_params'), '^t') ORDER BY _database, _table, n;
+
+SELECT _database, _table, n FROM merge() ORDER BY _database, _table, n; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+SELECT _database, _table, n FROM merge('^t') ORDER BY _database, _table, n; -- {serverError BAD_ARGUMENTS}
+
+USE 01902_db_params;
+SELECT _database, _table, n FROM merge('^t') ORDER BY _database, _table, n;
+
+DROP DATABASE 01902_db_params;
diff --git a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
index 9105cf30f79..4cd64b68d54 100755
--- a/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
+++ b/tests/queries/0_stateless/01910_client_replxx_container_overflow_long.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01913_fix_column_transformer_replace_format.reference b/tests/queries/0_stateless/01913_fix_column_transformer_replace_format.reference
index c2ebb7fa4f4..33be11c07d5 100644
--- a/tests/queries/0_stateless/01913_fix_column_transformer_replace_format.reference
+++ b/tests/queries/0_stateless/01913_fix_column_transformer_replace_format.reference
@@ -1 +1 @@
-CREATE VIEW default.my_view\n(\n    `Id` UInt32,\n    `Object.Key` Array(UInt16),\n    `Object.Value` Array(String)\n) AS\nSELECT * REPLACE arrayMap(x -> (x + 1), `Object.Key`) AS `Object.Key`\nFROM default.my_table
+CREATE VIEW default.my_view\n(\n    `Id` UInt32,\n    `Object.Key` Array(UInt16),\n    `Object.Value` Array(String)\n)\nAS SELECT * REPLACE arrayMap(x -> (x + 1), `Object.Key`) AS `Object.Key`\nFROM default.my_table
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.reference b/tests/queries/0_stateless/01915_json_extract_raw_string.reference
index e88c7e018d2..99ebfdcf5bd 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.reference
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.reference
@@ -1,5 +1,6 @@
 ('123','456','[7,8,9]')
 \N
+\N
 123
 123
 
diff --git a/tests/queries/0_stateless/01915_json_extract_raw_string.sql b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
index e81d527a3da..4b46db31559 100644
--- a/tests/queries/0_stateless/01915_json_extract_raw_string.sql
+++ b/tests/queries/0_stateless/01915_json_extract_raw_string.sql
@@ -2,6 +2,7 @@
 select JSONExtract('{"a": "123", "b": 456, "c": [7, 8, 9]}', 'Tuple(a String, b String, c String)');
 
 with '{"string_value":null}' as json select JSONExtract(json, 'string_value', 'Nullable(String)');
+with '{"string_value":null}' as json select JSONExtract(json, 'string_value', 'LowCardinality(Nullable(String))');
 
 select JSONExtractString('{"a": 123}', 'a');
 select JSONExtractString('{"a": "123"}', 'a');
diff --git a/tests/queries/0_stateless/01920_not_chain_format.reference b/tests/queries/0_stateless/01920_not_chain_format.reference
index 22abfd17dc7..bb58a0ff146 100644
--- a/tests/queries/0_stateless/01920_not_chain_format.reference
+++ b/tests/queries/0_stateless/01920_not_chain_format.reference
@@ -1,5 +1,5 @@
 -- { echo }
 EXPLAIN SYNTAX SELECT NOT NOT (NOT (NOT (NULL)));
-SELECT NOT (NOT (NOT NOT NULL))
+SELECT NOT (NOT (NOT (NOT NULL)))
 EXPLAIN SYNTAX SELECT NOT (NOT (NOT NOT NULL));
-SELECT NOT (NOT (NOT NOT NULL))
+SELECT NOT (NOT (NOT (NOT NULL)))
diff --git a/tests/queries/0_stateless/01921_not_chain.reference b/tests/queries/0_stateless/01921_not_chain.reference
index c29c66f1274..ebd18f4b342 100644
--- a/tests/queries/0_stateless/01921_not_chain.reference
+++ b/tests/queries/0_stateless/01921_not_chain.reference
@@ -4,6 +4,6 @@ SELECT 1 != (NOT 1);
 SELECT 1 != NOT 1;
 1
 EXPLAIN SYNTAX SELECT 1 != (NOT 1);
-SELECT 1 != NOT 1
+SELECT 1 != (NOT 1)
 EXPLAIN SYNTAX SELECT 1 != NOT 1;
-SELECT 1 != NOT 1
+SELECT 1 != (NOT 1)
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.reference b/tests/queries/0_stateless/01925_join_materialized_columns.reference
index 5125b322aed..1d2ab582038 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.reference
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.reference
@@ -10,6 +10,8 @@
 -
 2020-01-01 12:00:00	fact1	t1_val1	2020-01-01 12:00:00	fact1	t2_val2
 2020-01-01 13:00:00	fact3	t1_val3	2020-01-01 12:00:00	fact1	t2_val2
+2020-01-01	2020-01-01 12:00:00	fact1	t1_val1	2020-01-01 12:00:00	fact1	t2_val2
+2020-01-01	2020-01-01 13:00:00	fact3	t1_val3	2020-01-01 12:00:00	fact1	t2_val2
 -
 2020-01-01 12:00:00	fact1	t1_val1	2019-01-01 12:00:00	fact4	t2_val2
 2020-01-01 12:00:00	fact1	t1_val1	2020-01-01 12:00:00	fact1	t2_val2
@@ -32,3 +34,4 @@ fact2t1_val2	fact2t1_val2
 2020-01-01 12:00:00
 2020-01-01 12:00:00
 2020-01-01 12:00:00
+2020-01-01 12:00:00
diff --git a/tests/queries/0_stateless/01925_join_materialized_columns.sql b/tests/queries/0_stateless/01925_join_materialized_columns.sql
index 271c230c35b..abb6fda3bfb 100644
--- a/tests/queries/0_stateless/01925_join_materialized_columns.sql
+++ b/tests/queries/0_stateless/01925_join_materialized_columns.sql
@@ -32,7 +32,8 @@ SELECT t1.dt, t2.dt FROM t1 JOIN t2 ON t1.foo = t2.bar ORDER BY t1.dt;
 SELECT '-';
 SELECT * FROM t1 ALL JOIN t2 ON t1.dt = t2.dt ORDER BY t1.time, t2.time;
 SELECT '-';
-SELECT * FROM t1 ALL JOIN t2 USING (dt) ORDER BY t1.time, t2.time;
+SELECT * FROM t1 ALL JOIN t2 USING (dt) ORDER BY t1.time, t2.time settings allow_experimental_analyzer=0;
+SELECT * FROM t1 ALL JOIN t2 USING (dt) ORDER BY t1.time, t2.time settings allow_experimental_analyzer=1;
 SELECT '-';
 SELECT * FROM t1 JOIN t2 ON t1.dt1 = t2.dt2 ORDER BY t1.time, t1.dimension_1, t2.time, t2.dimension_2;
 SELECT '-';
@@ -51,5 +52,6 @@ SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time;
 SELECT t1.time as talias FROM t1 JOIN t2 ON talias = t2.time_alias;
 SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time = talias;
 SELECT t2.time as talias FROM t1 JOIN t2 ON t1.time_alias = talias;
-SELECT time as talias FROM t1 JOIN t2 ON t1.time = talias; -- { serverError AMBIGUOUS_COLUMN_NAME }
-SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT time as talias FROM t1 JOIN t2 ON t1.time = talias; -- { serverError AMBIGUOUS_COLUMN_NAME, INVALID_JOIN_ON_EXPRESSION }
+SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time settings allow_experimental_analyzer=0; -- { serverError AMBIGUOUS_COLUMN_NAME }
+SELECT time as talias FROM t1 JOIN t2 ON talias = t2.time settings allow_experimental_analyzer=1;
diff --git a/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.reference b/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.reference
new file mode 100644
index 00000000000..b0fea25ed4b
--- /dev/null
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.reference
@@ -0,0 +1,10 @@
+alias1
+1	4	16	23
+23	16	4	1
+2020-02-02	1	4	2	16	3	23
+alias2
+1	3	4	4
+4	4	3	1
+23	16	4	1
+2020-02-01	1	3	2	4	3	4
+2020-02-02	1	4	2	16	3	23
diff --git a/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.sql b/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.sql
new file mode 100644
index 00000000000..31035aa80cd
--- /dev/null
+++ b/tests/queries/0_stateless/01925_test_storage_merge_aliases_analyzer.sql
@@ -0,0 +1,60 @@
+-- Tags: no-parallel
+
+drop table if exists merge;
+set allow_experimental_analyzer = 1;
+create table merge
+(
+    dt Date,
+    colAlias0 Int32,
+    colAlias1 Int32,
+    col2 Int32,
+    colAlias2 UInt32,
+    col3 Int32,
+    colAlias3 UInt32
+)
+engine = Merge(currentDatabase(), '^alias_');
+
+drop table if exists alias_1;
+drop table if exists alias_2;
+
+create table alias_1
+(
+    dt Date,
+    col Int32,
+    colAlias0 UInt32 alias col,
+    colAlias1 UInt32 alias col3 + colAlias0,
+    col2 Int32,
+    colAlias2 Int32 alias colAlias1 + col2 + 10,
+    col3 Int32,
+    colAlias3 Int32 alias colAlias2 + colAlias1 + col3
+)
+engine = MergeTree()
+order by (dt);
+
+insert into alias_1 (dt, col, col2, col3) values ('2020-02-02', 1, 2, 3);
+
+select 'alias1';
+select colAlias0, colAlias1, colAlias2, colAlias3 from alias_1;
+select colAlias3, colAlias2, colAlias1, colAlias0 from merge;
+select * from merge;
+
+create table alias_2
+(
+    dt Date,
+    col Int32,
+    col2 Int32,
+    colAlias0 UInt32 alias col,
+    colAlias3 Int32 alias col3 + colAlias0,
+    colAlias1 UInt32 alias colAlias0 + col2,
+    colAlias2 Int32 alias colAlias0 + colAlias1,
+    col3 Int32
+)
+engine = MergeTree()
+order by (dt);
+
+insert into alias_2 (dt, col, col2, col3) values ('2020-02-01', 1, 2, 3);
+
+select 'alias2';
+select colAlias0, colAlias1, colAlias2, colAlias3 from alias_2;
+select colAlias3, colAlias2, colAlias1, colAlias0 from merge order by dt;
+select * from merge order by dt;
diff --git a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
index 69c5ff0118e..005ccbb5ff4 100755
--- a/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
+++ b/tests/queries/0_stateless/01933_client_replxx_convert_history.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
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 83dd708c575..f344b7007d0 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,9 +1,9 @@
 SET allow_experimental_analyzer = 1;
 
-SELECT dictGet(t.nest.a, concat(currentDatabase(), '.dict.dict'), 's', number) FROM numbers(5); -- { serverError 36 }
+SELECT dictGet(t.nest.a, concat(currentDatabase(), '.dict.dict'), 's', number) FROM numbers(5); -- { serverError INVALID_IDENTIFIER }
 
-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 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 INVALID_IDENTIFIER }
 
-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 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 INVALID_IDENTIFIER }
 
 SELECT 'still alive';
diff --git a/tests/queries/0_stateless/01945_show_debug_warning.expect b/tests/queries/0_stateless/01945_show_debug_warning.expect
index 28b114b5af4..a6950b5ab82 100755
--- a/tests/queries/0_stateless/01945_show_debug_warning.expect
+++ b/tests/queries/0_stateless/01945_show_debug_warning.expect
@@ -5,8 +5,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
index ddfa6929d69..212dd348edb 100644
--- a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
@@ -71,3 +71,81 @@ Expression (Projection)
             Expression ((Before ORDER BY + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY)))))
               ReadFromSystemNumbers
       ReadFromRemote (Read from remote replica)
+set allow_experimental_analyzer = 1;
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+Expression (Project names)
+  Distinct (DISTINCT)
+    Union
+      Distinct (Preliminary DISTINCT)
+        Expression ((Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers)))))))
+          ReadFromSystemNumbers
+      ReadFromRemote (Read from remote replica)
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+Union
+  Expression (Project names)
+    Distinct (DISTINCT)
+      Distinct (Preliminary DISTINCT)
+        Expression ((Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers)))))))
+          ReadFromSystemNumbers
+  ReadFromRemote (Read from remote replica)
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+Expression (Project names)
+  LimitBy
+    Union
+      Expression (Before LIMIT BY)
+        LimitBy
+          Expression ((Before LIMIT BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))))
+            ReadFromSystemNumbers
+      Expression
+        ReadFromRemote (Read from remote replica)
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+Union
+  Expression (Project names)
+    LimitBy
+      Expression ((Before LIMIT BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))))
+        ReadFromSystemNumbers
+  ReadFromRemote (Read from remote replica)
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+Expression (Project names)
+  Distinct (DISTINCT)
+    Sorting (Merge sorted streams for ORDER BY, without aggregation)
+      Union
+        Sorting (Sorting for ORDER BY)
+          Expression (Before ORDER BY)
+            Distinct (Preliminary DISTINCT)
+              Expression ((Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers)))))))
+                ReadFromSystemNumbers
+        ReadFromRemote (Read from remote replica)
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+Expression (Project names)
+  Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+    Union
+      Distinct (DISTINCT)
+        Sorting (Sorting for ORDER BY)
+          Expression (Before ORDER BY)
+            Distinct (Preliminary DISTINCT)
+              Expression ((Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers)))))))
+                ReadFromSystemNumbers
+      ReadFromRemote (Read from remote replica)
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+Expression (Project names)
+  LimitBy
+    Expression (Before LIMIT BY)
+      Sorting (Merge sorted streams for ORDER BY, without aggregation)
+        Union
+          LimitBy
+            Expression ((Before LIMIT BY + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))) [lifted up part]))
+              Sorting (Sorting for ORDER BY)
+                Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))))
+                  ReadFromSystemNumbers
+          ReadFromRemote (Read from remote replica)
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+Expression (Project names)
+  Sorting (Merge sorted streams after aggregation stage for ORDER BY)
+    Union
+      LimitBy
+        Expression ((Before LIMIT BY + (Before ORDER BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))) [lifted up part]))
+          Sorting (Sorting for ORDER BY)
+            Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + Change column names to column identifiers))))))))
+              ReadFromSystemNumbers
+      ReadFromRemote (Read from remote replica)
diff --git a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
index 74b55b95315..adf55a9dd7f 100644
--- a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.sql
@@ -4,6 +4,8 @@ set optimize_skip_unused_shards=1;
 set optimize_distributed_group_by_sharding_key=1;
 set prefer_localhost_replica=1;
 
+set allow_experimental_analyzer = 0;
+
 -- { echo }
 explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
 explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
@@ -14,3 +16,15 @@ explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v
 explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
 explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
 explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+
+set allow_experimental_analyzer = 1;
+
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- not optimized
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
+
+explain select distinct k1 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+explain select distinct k1, k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
+explain select distinct on (k1) k2 from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- not optimized
+explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)) order by v; -- optimized
diff --git a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
index 695f233ed13..043febbcf55 100644
--- a/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
+++ b/tests/queries/0_stateless/01961_roaring_memory_tracking.sql
@@ -1,4 +1,6 @@
 -- Tags: no-replicated-database, no-asan, no-tsan, no-msan, no-ubsan
 
+SET max_bytes_before_external_group_by = 0;
+
 SET max_memory_usage = '100M';
 SELECT cityHash64(rand() % 1000) as n, groupBitmapState(number) FROM numbers_mt(200000000) GROUP BY n FORMAT Null; -- { serverError 241 }
diff --git a/tests/queries/0_stateless/01999_grant_with_replace.reference b/tests/queries/0_stateless/01999_grant_with_replace.reference
index 740c55d5325..dc2047ab73c 100644
--- a/tests/queries/0_stateless/01999_grant_with_replace.reference
+++ b/tests/queries/0_stateless/01999_grant_with_replace.reference
@@ -4,12 +4,12 @@ B
 GRANT SELECT ON db1.* TO test_user_01999
 GRANT SHOW TABLES, SHOW COLUMNS, SHOW DICTIONARIES ON db2.tb2 TO test_user_01999
 C
-GRANT SELECT(col1) ON db3.table TO test_user_01999
+GRANT SELECT(col1) ON db3.`table` TO test_user_01999
 D
 GRANT SELECT(col3) ON db3.table3 TO test_user_01999
 GRANT SELECT(col1, col2) ON db4.table4 TO test_user_01999
 E
-GRANT SELECT(cola) ON db5.table TO test_user_01999
+GRANT SELECT(cola) ON db5.`table` TO test_user_01999
 GRANT INSERT(colb) ON db6.tb61 TO test_user_01999
 GRANT SHOW ON db7.* TO test_user_01999
 F
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.reference b/tests/queries/0_stateless/02006_test_positional_arguments.reference
index 40100e8d5be..079bd071103 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.reference
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.reference
@@ -3,18 +3,50 @@ select x3, x2, x1 from test order by 1;
 1	100	100
 10	1	10
 100	10	1
+select x3, x2, x1 from test order by -3;
+1	100	100
+10	1	10
+100	10	1
 select x3, x2, x1 from test order by x3;
 1	100	100
 10	1	10
 100	10	1
+select x3, x2, x1 from test order by 3;
+100	10	1
+10	1	10
+1	100	100
+select x3, x2, x1 from test order by -1;
+100	10	1
+10	1	10
+1	100	100
+select x3, x2, x1 from test order by x1;
+100	10	1
+10	1	10
+1	100	100
 select x3, x2, x1 from test order by 1 desc;
 100	10	1
 10	1	10
 1	100	100
+select x3, x2, x1 from test order by -3 desc;
+100	10	1
+10	1	10
+1	100	100
 select x3, x2, x1 from test order by x3 desc;
 100	10	1
 10	1	10
 1	100	100
+select x3, x2, x1 from test order by 3 desc;
+1	100	100
+10	1	10
+100	10	1
+select x3, x2, x1 from test order by -1 desc;
+1	100	100
+10	1	10
+100	10	1
+select x3, x2, x1 from test order by x1 desc;
+1	100	100
+10	1	10
+100	10	1
 insert into test values (1, 10, 100), (10, 1, 10), (100, 100, 1);
 select x3, x2 from test group by x3, x2 order by x3;
 1	100
@@ -54,6 +86,20 @@ SELECT
     x1
 FROM test
 ORDER BY x3 + 1 ASC
+explain syntax select x3, x2, x1 from test order by -1;
+SELECT
+    x3,
+    x2,
+    x1
+FROM test
+ORDER BY x1 ASC
+explain syntax select x3 + 1, x2, x1 from test order by -1;
+SELECT
+    x3 + 1,
+    x2,
+    x1
+FROM test
+ORDER BY x1 ASC
 explain syntax select x3, x3 - x2, x2, x1 from test order by 2;
 SELECT
     x3,
@@ -62,6 +108,14 @@ SELECT
     x1
 FROM test
 ORDER BY x3 - x2 ASC
+explain syntax select x3, x3 - x2, x2, x1 from test order by -2;
+SELECT
+    x3,
+    x3 - x2,
+    x2,
+    x1
+FROM test
+ORDER BY x2 ASC
 explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by 2;
 SELECT
     x3,
@@ -69,12 +123,28 @@ SELECT
     x1 + x2
 FROM test
 ORDER BY if(x3 > 10, x3, x1 + x2) ASC
+explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by -2;
+SELECT
+    x3,
+    if(x3 > 10, x3, x1 + x2),
+    x1 + x2
+FROM test
+ORDER BY if(x3 > 10, x3, x1 + x2) ASC
 explain syntax select max(x1), x2 from test group by 2 order by 1, 2;
 SELECT
     max(x1),
     x2
 FROM test
 GROUP BY x2
+ORDER BY
+    max(x1) ASC,
+    x2 ASC
+explain syntax select max(x1), x2 from test group by -1 order by -2, -1;
+SELECT
+    max(x1),
+    x2
+FROM test
+GROUP BY x2
 ORDER BY
     max(x1) ASC,
     x2 ASC
@@ -83,16 +153,34 @@ SELECT
     1 + greatest(x1, 1),
     x2
 FROM test
+GROUP BY
+    1 + greatest(x1, 1),
+    x2
+explain syntax select 1 + greatest(x1, 1), x2 from test group by -2, -1;
+SELECT
+    1 + greatest(x1, 1),
+    x2
+FROM test
 GROUP BY
     1 + greatest(x1, 1),
     x2
 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 }
+select max(x1), x2 from test group by -2, -1; -- { serverError 43, 184 }
+select 1 + max(x1), x2 from test group by -2, -1; -- { serverError 43, 184 }
 explain syntax select x1 + x3, x3 from test group by 1, 2;
 SELECT
     x1 + x3,
     x3
 FROM test
+GROUP BY
+    x1 + x3,
+    x3
+explain syntax select x1 + x3, x3 from test group by -2, -1;
+SELECT
+    x1 + x3,
+    x3
+FROM test
 GROUP BY
     x1 + x3,
     x3
@@ -102,8 +190,14 @@ select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2,
 1	2	10	100
 10	20	1	10
 100	200	100	1
+select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2, -1 desc, -2 asc;
+1	2	10	100
+10	20	1	10
+100	200	100	1
 select a, b, c, d, e, f  from (select 44 a, 88 b, 13 c, 14 d, 15 e, 16 f) t group by 1,2,3,4,5,6 order by a;
 44	88	13	14	15	16
+select a, b, c, d, e, f  from (select 44 a, 88 b, 13 c, 14 d, 15 e, 16 f) t group by 1,2,3,-3,-2,-1 order by a;
+44	88	13	14	15	16
 explain syntax select plus(1, 1) as a group by a;
 SELECT 1 + 1 AS a
 GROUP BY a
diff --git a/tests/queries/0_stateless/02006_test_positional_arguments.sql b/tests/queries/0_stateless/02006_test_positional_arguments.sql
index 159ad6bd427..6f427e0298d 100644
--- a/tests/queries/0_stateless/02006_test_positional_arguments.sql
+++ b/tests/queries/0_stateless/02006_test_positional_arguments.sql
@@ -9,11 +9,21 @@ insert into test values (1, 10, 100), (10, 1, 10), (100, 100, 1);
 
 -- { echo }
 select x3, x2, x1 from test order by 1;
+select x3, x2, x1 from test order by -3;
 select x3, x2, x1 from test order by x3;
 
+select x3, x2, x1 from test order by 3;
+select x3, x2, x1 from test order by -1;
+select x3, x2, x1 from test order by x1;
+
 select x3, x2, x1 from test order by 1 desc;
+select x3, x2, x1 from test order by -3 desc;
 select x3, x2, x1 from test order by x3 desc;
 
+select x3, x2, x1 from test order by 3 desc;
+select x3, x2, x1 from test order by -1 desc;
+select x3, x2, x1 from test order by x1 desc;
+
 insert into test values (1, 10, 100), (10, 1, 10), (100, 100, 1);
 select x3, x2 from test group by x3, x2 order by x3;
 select x3, x2 from test group by 1, 2 order by x3;
@@ -25,21 +35,32 @@ select x1, x2, x3 from test order by 3 limit 1 by 1;
 
 explain syntax select x3, x2, x1 from test order by 1;
 explain syntax select x3 + 1, x2, x1 from test order by 1;
+explain syntax select x3, x2, x1 from test order by -1;
+explain syntax select x3 + 1, x2, x1 from test order by -1;
 explain syntax select x3, x3 - x2, x2, x1 from test order by 2;
+explain syntax select x3, x3 - x2, x2, x1 from test order by -2;
 explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by 2;
+explain syntax select x3, if(x3 > 10, x3, plus(x1, x2)), x1 + x2 from test order by -2;
 explain syntax select max(x1), x2 from test group by 2 order by 1, 2;
+explain syntax select max(x1), x2 from test group by -1 order by -2, -1;
 explain syntax select 1 + greatest(x1, 1), x2 from test group by 1, 2;
+explain syntax select 1 + greatest(x1, 1), x2 from test group by -2, -1;
 
 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 }
+select max(x1), x2 from test group by -2, -1; -- { serverError 43, 184 }
+select 1 + max(x1), x2 from test group by -2, -1; -- { serverError 43, 184 }
 
 explain syntax select x1 + x3, x3 from test group by 1, 2;
+explain syntax select x1 + x3, x3 from test group by -2, -1;
 
 create table test2(x1 Int, x2 Int, x3 Int) engine=Memory;
 insert into test2 values (1, 10, 100), (10, 1, 10), (100, 100, 1);
 select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2, 4 desc, 3 asc;
+select x1, x1 * 2, max(x2), max(x3) from test2 group by 2, 1, x1 order by 1, 2, -1 desc, -2 asc;
 
 select a, b, c, d, e, f  from (select 44 a, 88 b, 13 c, 14 d, 15 e, 16 f) t group by 1,2,3,4,5,6 order by a;
+select a, b, c, d, e, f  from (select 44 a, 88 b, 13 c, 14 d, 15 e, 16 f) t group by 1,2,3,-3,-2,-1 order by a;
 
 explain syntax select plus(1, 1) as a group by a;
 select substr('aaaaaaaaaaaaaa', 8) as a  group by a order by a;
diff --git a/tests/queries/0_stateless/02008_materialize_column.sql b/tests/queries/0_stateless/02008_materialize_column.sql
index a78920d2525..cc7d3096402 100644
--- a/tests/queries/0_stateless/02008_materialize_column.sql
+++ b/tests/queries/0_stateless/02008_materialize_column.sql
@@ -17,6 +17,7 @@ ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+2);
 SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
 
+ALTER TABLE tmp CLEAR COLUMN s; -- Need to clear because MATERIALIZE COLUMN won't override past values;
 ALTER TABLE tmp MATERIALIZE COLUMN s;
 ALTER TABLE tmp MODIFY COLUMN s String DEFAULT toString(x+3);
 SELECT arraySort(groupArray(x)), groupArray(s) FROM tmp;
diff --git a/tests/queries/0_stateless/02010_array_index_bad_cast.sql b/tests/queries/0_stateless/02010_array_index_bad_cast.sql
index 19c58bb28a7..42a6556fc77 100644
--- a/tests/queries/0_stateless/02010_array_index_bad_cast.sql
+++ b/tests/queries/0_stateless/02010_array_index_bad_cast.sql
@@ -1,2 +1,3 @@
 -- This query throws exception about uncomparable data types (but at least it does not introduce bad cast in code).
+SET allow_suspicious_low_cardinality_types=1;
 SELECT has(materialize(CAST(['2021-07-14'] AS Array(LowCardinality(Nullable(DateTime))))), materialize('2021-07-14'::DateTime64(7))); -- { serverError 44 }
diff --git a/tests/queries/0_stateless/02013_json_function_null_column.reference b/tests/queries/0_stateless/02013_json_function_null_column.reference
index ab702ab52cb..a8ffccc46bf 100644
--- a/tests/queries/0_stateless/02013_json_function_null_column.reference
+++ b/tests/queries/0_stateless/02013_json_function_null_column.reference
@@ -1,9 +1,11 @@
 \N	Nullable(String)
+\N	LowCardinality(Nullable(String))
 	String
 \N	Nullable(String)
 	Nullable(String)
 \N	Nullable(Nothing)
 \N	Nullable(Nothing)
+\N	Nullable(Nothing)
 b
 \N
 
@@ -21,3 +23,6 @@ true
 a
 \N
 \N
+('value')
+(NULL)
+(NULL)
diff --git a/tests/queries/0_stateless/02013_json_function_null_column.sql b/tests/queries/0_stateless/02013_json_function_null_column.sql
index 94a2320cefb..963d0ee55cc 100644
--- a/tests/queries/0_stateless/02013_json_function_null_column.sql
+++ b/tests/queries/0_stateless/02013_json_function_null_column.sql
@@ -1,9 +1,12 @@
 
 SELECT JSONExtract('{"string_value":null}', 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract('{"string_value":null}', 'string_value', 'LowCardinality(Nullable(String))') as x, toTypeName(x);
 SELECT JSONExtract('{"string_value":null}', 'string_value', 'String') as x, toTypeName(x);
 SELECT JSONExtract(toNullable('{"string_value":null}'), 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract(toNullable('{"string_value":null}'), 'string_value', 'LowCardinality(Nullable(String))') as x, toTypeName(x);  -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT JSONExtract(toNullable('{"string_value":null}'), 'string_value', 'String') as x, toTypeName(x);
 SELECT JSONExtract(NULL, 'string_value', 'Nullable(String)') as x, toTypeName(x);
+SELECT JSONExtract(NULL, 'string_value', 'LowCardinality(Nullable(String))') as x, toTypeName(x);
 SELECT JSONExtract(NULL, 'string_value', 'String') as x, toTypeName(x);
 SELECT JSONExtractString('["a", "b", "c", "d", "e"]', idx) FROM (SELECT arrayJoin([2, NULL, 2147483646, 65535, 65535, 3]) AS idx);
 
@@ -11,6 +14,7 @@ SELECT JSONExtractInt('[1]', toNullable(1));
 SELECT JSONExtractBool('[1]', toNullable(1));
 SELECT JSONExtractFloat('[1]', toNullable(1));
 SELECT JSONExtractString('["a"]', toNullable(1));
+SELECT JSONExtractInt('[1]', toLowCardinality(toNullable(1))); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 SELECT JSONExtractArrayRaw('["1"]', toNullable(1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT JSONExtractKeysAndValuesRaw('["1"]', toNullable(1)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
@@ -23,3 +27,7 @@ SELECT JSONExtract('[1]', toNullable(1), 'Nullable(Float)');
 SELECT JSONExtract('["a"]', toNullable(1), 'Nullable(String)');
 SELECT JSONExtract('["a"]', toNullable(1), 'Nullable(Int)');
 SELECT JSONExtract('["-a"]', toNullable(1), 'Nullable(Int)');
+
+SELECT JSONExtract(materialize('{"key":"value"}'), 'Tuple(key LowCardinality(Nullable(String)))');
+SELECT JSONExtract(materialize('{"key":null}'), 'Tuple(key LowCardinality(Nullable(String)))');
+SELECT JSONExtract(materialize('{"not_a_key":"value"}'), 'Tuple(key LowCardinality(Nullable(String)))');
diff --git a/tests/queries/0_stateless/02015_async_inserts_2.sh b/tests/queries/0_stateless/02015_async_inserts_2.sh
index 48523ccd9a9..606d4cc37b6 100755
--- a/tests/queries/0_stateless/02015_async_inserts_2.sh
+++ b/tests/queries/0_stateless/02015_async_inserts_2.sh
@@ -5,7 +5,9 @@ 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&async_insert_busy_timeout_ms=600000&async_insert_max_query_number=3&async_insert_deduplicate=1"
+# With adaptive timeout enabled, the asynchronous queue can be flushed synchronously, depending on the elapsed since the last insert.
+# This may result in test flakiness.
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1&async_insert_busy_timeout_ms=600000&async_insert_max_query_number=3&async_insert_deduplicate=1&async_insert_use_adaptive_busy_timeout=0"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
diff --git a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
index 437df01d445..2f7e15f201a 100755
--- a/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
+++ b/tests/queries/0_stateless/02015_async_inserts_stress_long.sh
@@ -11,7 +11,8 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 function insert1()
 {
     url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT CSV
 1,"a"
 2,"b"
@@ -22,7 +23,8 @@ function insert1()
 function insert2()
 {
     url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         ${CLICKHOUSE_CURL} -sS "$url" -d 'INSERT INTO async_inserts FORMAT JSONEachRow {"id": 5, "s": "e"} {"id": 6, "s": "f"}'
     done
 }
@@ -30,28 +32,32 @@ function insert2()
 function insert3()
 {
     url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=0"
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         ${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO FUNCTION remote('127.0.0.1', $CLICKHOUSE_DATABASE, async_inserts) VALUES (7, 'g') (8, 'h')"
     done
 }
 
 function select1()
 {
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         ${CLICKHOUSE_CLIENT} -q "SELECT * FROM async_inserts FORMAT Null"
     done
 }
 
 function select2()
 {
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         ${CLICKHOUSE_CLIENT} -q "SELECT * FROM system.asynchronous_inserts FORMAT Null"
     done
 }
 
 function truncate1()
 {
-    while true; do
+    local TIMELIMIT=$((SECONDS+$1))
+    while [ $SECONDS -lt "$TIMELIMIT" ]; do
         sleep 0.1
         ${CLICKHOUSE_CLIENT} -q "TRUNCATE TABLE async_inserts"
     done
@@ -70,14 +76,14 @@ export -f select2
 export -f truncate1
 
 for _ in {1..5}; do
-    timeout $TIMEOUT bash -c insert1 &
-    timeout $TIMEOUT bash -c insert2 &
-    timeout $TIMEOUT bash -c insert3 &
+    insert1 $TIMEOUT &
+    insert2 $TIMEOUT &
+    insert3 $TIMEOUT &
 done
 
-timeout $TIMEOUT bash -c select1 &
-timeout $TIMEOUT bash -c select2 &
-timeout $TIMEOUT bash -c truncate1 &
+select1 $TIMEOUT &
+select2 $TIMEOUT &
+truncate1 $TIMEOUT &
 
 wait
 echo "OK"
diff --git a/tests/queries/0_stateless/02021_create_database_with_comment.sh b/tests/queries/0_stateless/02021_create_database_with_comment.sh
index 11e62e790b7..8432963e059 100755
--- a/tests/queries/0_stateless/02021_create_database_with_comment.sh
+++ b/tests/queries/0_stateless/02021_create_database_with_comment.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/02026_describe_include_subcolumns.reference b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
index ac114a03837..dec65f62748 100644
--- a/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
+++ b/tests/queries/0_stateless/02026_describe_include_subcolumns.reference
@@ -1,33 +1,33 @@
-┌─name─┬─type──────────────────────────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────�
-│ d    │ Date                                                                      │              │                    │                         │                  │                      │
-│ n    │ Nullable(String)                                                          │              │                    │ It is a nullable column │                  │                      │
-│ arr1 │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │
-│ arr2 │ Array(Array(String))                                                      │              │                    │                         │                  │ d + toIntervalDay(1) │
-│ t    │ Tuple(
+   ┌─name─┬─type──────────────────────────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────�
+1. │ d    │ Date                                                                      │              │                    │                         │                  │                      │
+2. │ n    │ Nullable(String)                                                          │              │                    │ It is a nullable column │                  │                      │
+3. │ arr1 │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │
+4. │ arr2 │ Array(Array(String))                                                      │              │                    │                         │                  │ d + toIntervalDay(1) │
+5. │ t    │ Tuple(
     s String,
     a Array(Tuple(
         a UInt32,
         b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │
-└──────┴───────────────────────────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┘
-┌─name───────┬─type──────────────────────────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┬─is_subcolumn─�
-│ d          │ Date                                                                      │              │                    │                         │                  │                      │            0 │
-│ n          │ Nullable(String)                                                          │              │                    │ It is a nullable column │                  │                      │            0 │
-│ arr1       │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            0 │
-│ arr2       │ Array(Array(String))                                                      │              │                    │                         │                  │ d + toIntervalDay(1) │            0 │
-│ t          │ Tuple(
+   └──────┴───────────────────────────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┘
+    ┌─name───────┬─type──────────────────────────────────────────────────────────────────────┬─default_type─┬─default_expression─┬─comment─────────────────┬─codec_expression─┬─ttl_expression───────┬─is_subcolumn─�
+ 1. │ d          │ Date                                                                      │              │                    │                         │                  │                      │            0 │
+ 2. │ n          │ Nullable(String)                                                          │              │                    │ It is a nullable column │                  │                      │            0 │
+ 3. │ arr1       │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            0 │
+ 4. │ arr2       │ Array(Array(String))                                                      │              │                    │                         │                  │ d + toIntervalDay(1) │            0 │
+ 5. │ t          │ Tuple(
     s String,
     a Array(Tuple(
         a UInt32,
         b UInt32))) │              │                    │                         │ ZSTD(1)          │                      │            0 │
-│ n.null     │ UInt8                                                                     │              │                    │ It is a nullable column │                  │                      │            1 │
-│ arr1.size0 │ UInt64                                                                    │              │                    │                         │                  │                      │            1 │
-│ arr2.size0 │ UInt64                                                                    │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
-│ arr2.size1 │ Array(UInt64)                                                             │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
-│ t.s        │ String                                                                    │              │                    │                         │ ZSTD(1)          │                      │            1 │
-│ t.a        │ Array(Tuple(
+ 6. │ n.null     │ UInt8                                                                     │              │                    │ It is a nullable column │                  │                      │            1 │
+ 7. │ arr1.size0 │ UInt64                                                                    │              │                    │                         │                  │                      │            1 │
+ 8. │ arr2.size0 │ UInt64                                                                    │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+ 9. │ arr2.size1 │ Array(UInt64)                                                             │              │                    │                         │                  │ d + toIntervalDay(1) │            1 │
+10. │ t.s        │ String                                                                    │              │                    │                         │ ZSTD(1)          │                      │            1 │
+11. │ t.a        │ Array(Tuple(
     a UInt32,
     b UInt32))                                   │              │                    │                         │                  │                      │            1 │
-│ t.a.size0  │ UInt64                                                                    │              │                    │                         │                  │                      │            1 │
-│ t.a.a      │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            1 │
-│ t.a.b      │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            1 │
-└────────────┴───────────────────────────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┴──────────────┘
+12. │ t.a.size0  │ UInt64                                                                    │              │                    │                         │                  │                      │            1 │
+13. │ t.a.a      │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            1 │
+14. │ t.a.b      │ Array(UInt32)                                                             │              │                    │                         │ ZSTD(1)          │                      │            1 │
+    └────────────┴───────────────────────────────────────────────────────────────────────────┴──────────────┴────────────────────┴─────────────────────────┴──────────────────┴──────────────────────┴──────────────┘
diff --git a/tests/queries/0_stateless/02047_client_exception.expect b/tests/queries/0_stateless/02047_client_exception.expect
index 4dfdf211ba2..d7dcb97867a 100755
--- a/tests/queries/0_stateless/02047_client_exception.expect
+++ b/tests/queries/0_stateless/02047_client_exception.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect b/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
index a1454696253..ddfd6e9d158 100755
--- a/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
+++ b/tests/queries/0_stateless/02049_clickhouse_local_merge_tree.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02096_rename_atomic_hang.sql b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
index dec5f3f9506..32d7efec6c2 100644
--- a/tests/queries/0_stateless/02096_rename_atomic_hang.sql
+++ b/tests/queries/0_stateless/02096_rename_atomic_hang.sql
@@ -1,8 +1,9 @@
 -- Tags: no-parallel
-
+SET send_logs_level = 'fatal';
 drop database if exists db_hang;
 drop database if exists db_hang_temp;
 set allow_deprecated_database_ordinary=1;
+-- Creation of a database with Ordinary engine emits a warning.
 create database db_hang engine=Ordinary;
 use db_hang;
 create table db_hang.test(A Int64) Engine=MergeTree order by A;
diff --git a/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql.j2 b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql.j2
index e5d8ad36c6d..c023f3ba6ad 100644
--- a/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql.j2
+++ b/tests/queries/0_stateless/02098_hashed_array_dictionary_simple_key.sql.j2
@@ -10,8 +10,9 @@ ENGINE = TinyLog;
 INSERT INTO simple_key_simple_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
 INSERT INTO simple_key_simple_attributes_source_table VALUES(1, 'value_1', 'value_second_1');
 INSERT INTO simple_key_simple_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+INSERT INTO simple_key_simple_attributes_source_table SELECT number + 10 as id, concat('value_', toString(id)), concat('value_second_', toString(id)) FROM numbers_mt(1_000_000);
 
-{% for dictionary_config in ['', 'SHARDS 16'] -%}
+{% for dictionary_config in ['', 'SHARDS 16 SHARD_LOAD_QUEUE_BACKLOG 2'] -%}
 
 DROP DICTIONARY IF EXISTS hashed_array_dictionary_simple_key_simple_attributes;
 CREATE DICTIONARY hashed_array_dictionary_simple_key_simple_attributes
@@ -42,7 +43,7 @@ SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_simple_attributes',
 SELECT 'dictHas';
 SELECT dictHas('hashed_array_dictionary_simple_key_simple_attributes', number) FROM system.numbers LIMIT 4;
 SELECT 'select all values as input stream';
-SELECT * FROM hashed_array_dictionary_simple_key_simple_attributes ORDER BY id;
+SELECT * FROM hashed_array_dictionary_simple_key_simple_attributes ORDER BY id LIMIT 3;
 
 DROP DICTIONARY hashed_array_dictionary_simple_key_simple_attributes;
 {% endfor %}
@@ -61,8 +62,9 @@ ENGINE = TinyLog;
 INSERT INTO simple_key_complex_attributes_source_table VALUES(0, 'value_0', 'value_second_0');
 INSERT INTO simple_key_complex_attributes_source_table VALUES(1, 'value_1', NULL);
 INSERT INTO simple_key_complex_attributes_source_table VALUES(2, 'value_2', 'value_second_2');
+INSERT INTO simple_key_complex_attributes_source_table SELECT number + 10 as id, concat('value_', toString(id)), concat('value_second_', toString(id)) FROM numbers_mt(1_000_000);
 
-{% for dictionary_config in ['', 'SHARDS 16'] -%}
+{% for dictionary_config in ['', 'SHARDS 16 SHARD_LOAD_QUEUE_BACKLOG 2'] -%}
 
 DROP DICTIONARY IF EXISTS hashed_array_dictionary_simple_key_complex_attributes;
 CREATE DICTIONARY hashed_array_dictionary_simple_key_complex_attributes
@@ -92,7 +94,7 @@ SELECT dictGetOrDefault('hashed_array_dictionary_simple_key_complex_attributes',
 SELECT 'dictHas';
 SELECT dictHas('hashed_array_dictionary_simple_key_complex_attributes', number) FROM system.numbers LIMIT 4;
 SELECT 'select all values as input stream';
-SELECT * FROM hashed_array_dictionary_simple_key_complex_attributes ORDER BY id;
+SELECT * FROM hashed_array_dictionary_simple_key_complex_attributes ORDER BY id LIMIT 3;
 
 DROP DICTIONARY hashed_array_dictionary_simple_key_complex_attributes;
 
diff --git a/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql.j2 b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql.j2
index 56f9b264a62..3a92b035666 100644
--- a/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql.j2
+++ b/tests/queries/0_stateless/02099_hashed_array_dictionary_complex_key.sql.j2
@@ -12,7 +12,9 @@ INSERT INTO complex_key_simple_attributes_source_table VALUES(0, 'id_key_0', 'va
 INSERT INTO complex_key_simple_attributes_source_table VALUES(1, 'id_key_1', 'value_1', 'value_second_1');
 INSERT INTO complex_key_simple_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
 
-{% for dictionary_config in ['', 'SHARDS 16'] -%}
+INSERT INTO complex_key_simple_attributes_source_table SELECT number + 10 as id, concat('id_key_', toString(id)), toString(id), toString(id) FROM numbers_mt(1_000_000);
+
+{% for dictionary_config in ['', 'SHARDS 16 SHARD_LOAD_QUEUE_BACKLOG 2'] -%}
 
 DROP DICTIONARY IF EXISTS hashed_array_dictionary_complex_key_simple_attributes;
 CREATE DICTIONARY hashed_array_dictionary_complex_key_simple_attributes
@@ -43,7 +45,7 @@ SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_simple_attributes',
 SELECT 'dictHas';
 SELECT dictHas('hashed_array_dictionary_complex_key_simple_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
 SELECT 'select all values as input stream';
-SELECT * FROM hashed_array_dictionary_complex_key_simple_attributes ORDER BY (id, id_key);
+SELECT * FROM hashed_array_dictionary_complex_key_simple_attributes ORDER BY (id, id_key) LIMIT 3;
 
 DROP DICTIONARY hashed_array_dictionary_complex_key_simple_attributes;
 
@@ -64,8 +66,9 @@ ENGINE = TinyLog;
 INSERT INTO complex_key_complex_attributes_source_table VALUES(0, 'id_key_0', 'value_0', 'value_second_0');
 INSERT INTO complex_key_complex_attributes_source_table VALUES(1, 'id_key_1', 'value_1', NULL);
 INSERT INTO complex_key_complex_attributes_source_table VALUES(2, 'id_key_2', 'value_2', 'value_second_2');
+INSERT INTO complex_key_complex_attributes_source_table SELECT number + 10 as id, concat('id_key_', toString(id)), toString(id), toString(id) FROM numbers_mt(1_000_000);
 
-{% for dictionary_config in ['', 'SHARDS 16'] -%}
+{% for dictionary_config in ['', 'SHARDS 16 SHARD_LOAD_QUEUE_BACKLOG 2'] -%}
 
 DROP DICTIONARY IF EXISTS hashed_array_dictionary_complex_key_complex_attributes;
 CREATE DICTIONARY hashed_array_dictionary_complex_key_complex_attributes
@@ -97,7 +100,7 @@ SELECT dictGetOrDefault('hashed_array_dictionary_complex_key_complex_attributes'
 SELECT 'dictHas';
 SELECT dictHas('hashed_array_dictionary_complex_key_complex_attributes', (number, concat('id_key_', toString(number)))) FROM system.numbers LIMIT 4;
 SELECT 'select all values as input stream';
-SELECT * FROM hashed_array_dictionary_complex_key_complex_attributes ORDER BY (id, id_key);
+SELECT * FROM hashed_array_dictionary_complex_key_complex_attributes ORDER BY (id, id_key) LIMIT 3;
 
 {% endfor %}
 
diff --git a/tests/queries/0_stateless/02105_backslash_letter_commands.expect b/tests/queries/0_stateless/02105_backslash_letter_commands.expect
index 984e6f6d2eb..7e78b7e7280 100755
--- a/tests/queries/0_stateless/02105_backslash_letter_commands.expect
+++ b/tests/queries/0_stateless/02105_backslash_letter_commands.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect b/tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
index 5f882ae9824..4b8524add80 100755
--- a/tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
+++ b/tests/queries/0_stateless/02112_delayed_clickhouse_client_with_queries_file.expect
@@ -2,7 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 20
@@ -15,8 +21,8 @@ expect_after {
     -i $any_spawn_id timeout { exit 1 }
 }
 
-system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $env(CLICKHOUSE_TMP)/file_02112"
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112"
+system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $CLICKHOUSE_TMP/file_02112"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --disable_suggestion --interactive --queries-file $CLICKHOUSE_TMP/file_02112"
 expect ":) "
 
 send -- "select i from t format TSV\r"
diff --git a/tests/queries/0_stateless/02112_delayed_clickhouse_local.expect b/tests/queries/0_stateless/02112_delayed_clickhouse_local.expect
index 3413651fe68..9df889e7c90 100755
--- a/tests/queries/0_stateless/02112_delayed_clickhouse_local.expect
+++ b/tests/queries/0_stateless/02112_delayed_clickhouse_local.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 20
diff --git a/tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect b/tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
index 0a136ff2e74..0c07adf231d 100755
--- a/tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
+++ b/tests/queries/0_stateless/02112_delayed_clickhouse_local_with_queries_file.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 20
@@ -15,8 +20,8 @@ expect_after {
     -i $any_spawn_id timeout { exit 1 }
 }
 
-system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $env(CLICKHOUSE_TMP)/file_02112"
-spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $env(CLICKHOUSE_TMP)/file_02112"
+system "echo \"drop table if exists t; create table t(i String) engine=Memory; insert into t select 'test string'\" > $CLICKHOUSE_TMP/file_02112"
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_LOCAL --disable_suggestion --interactive --queries-file $CLICKHOUSE_TMP/file_02112"
 expect ":) "
 
 send -- "select \* from t format TSV\r"
diff --git a/tests/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.sql b/tests/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.sql
index d5ab82ba064..2ab324df787 100644
--- a/tests/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.sql
+++ b/tests/queries/0_stateless/02115_rewrite_local_join_right_distribute_table.sql
@@ -23,6 +23,10 @@ select t1.* from t1_all t1 join t2_all t2 on t1.a = t2.a ORDER BY t1.a;
 
 SELECT '-';
 
+-- make sure data is fully written when reading from distributed
+optimize table t1_local final;
+optimize table t2_local final;
+
 set distributed_product_mode = 'global';
 select * from t1_all t1 where t1.a in (select t2.a from t2_all t2);
 explain syntax select t1.* from t1_all t1 join t2_all t2 on t1.a = t2.a;
diff --git a/tests/queries/0_stateless/02116_interactive_hello.expect b/tests/queries/0_stateless/02116_interactive_hello.expect
index 391cef75163..41cd515ea34 100755
--- a/tests/queries/0_stateless/02116_interactive_hello.expect
+++ b/tests/queries/0_stateless/02116_interactive_hello.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02116_tuple_element.sql b/tests/queries/0_stateless/02116_tuple_element.sql
index 97f6c049705..64d9b9db331 100644
--- a/tests/queries/0_stateless/02116_tuple_element.sql
+++ b/tests/queries/0_stateless/02116_tuple_element.sql
@@ -19,7 +19,7 @@ SELECT tupleElement(t1) FROM t_tuple_element; -- { serverError NUMBER_OF_ARGUMEN
 SELECT tupleElement(t1, 'b') FROM t_tuple_element; -- { serverError NOT_FOUND_COLUMN_IN_BLOCK, UNKNOWN_IDENTIFIER }
 SELECT tupleElement(t1, 0) FROM t_tuple_element; -- { serverError ILLEGAL_INDEX, NOT_FOUND_COLUMN_IN_BLOCK }
 SELECT tupleElement(t1, 3) FROM t_tuple_element; -- { serverError ILLEGAL_INDEX, NOT_FOUND_COLUMN_IN_BLOCK }
-SELECT tupleElement(t1, materialize('a')) FROM t_tuple_element; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT tupleElement(t1, materialize('a')) FROM t_tuple_element; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT, NOT_FOUND_COLUMN_IN_BLOCK }
 
 SELECT t2.1 FROM t_tuple_element;
 EXPLAIN SYNTAX SELECT t2.1 FROM t_tuple_element;
@@ -31,7 +31,7 @@ SELECT tupleElement(t2) FROM t_tuple_element; -- { serverError NUMBER_OF_ARGUMEN
 SELECT tupleElement(t2, 'a') FROM t_tuple_element; -- { serverError NOT_FOUND_COLUMN_IN_BLOCK, UNKNOWN_IDENTIFIER }
 SELECT tupleElement(t2, 0) FROM t_tuple_element; -- { serverError ILLEGAL_INDEX, NOT_FOUND_COLUMN_IN_BLOCK }
 SELECT tupleElement(t2, 3) FROM t_tuple_element; -- { serverError ILLEGAL_INDEX, NOT_FOUND_COLUMN_IN_BLOCK }
-SELECT tupleElement(t2, materialize(1)) FROM t_tuple_element; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT tupleElement(t2, materialize(1)) FROM t_tuple_element; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT, NOT_FOUND_COLUMN_IN_BLOCK }
 
 DROP TABLE t_tuple_element;
 
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 e89d589857e..bdd0da7d166 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.reference
+++ b/tests/queries/0_stateless/02117_show_create_table_system.reference
@@ -195,6 +195,8 @@ CREATE TABLE system.disks
     `unreserved_space` UInt64,
     `keep_free_space` UInt64,
     `type` String,
+    `object_storage_type` String,
+    `metadata_type` String,
     `is_encrypted` UInt8,
     `is_read_only` UInt8,
     `is_write_once` UInt8,
@@ -686,6 +688,9 @@ CREATE TABLE system.projection_parts
     `rows_where_ttl_info.expression` Array(String),
     `rows_where_ttl_info.min` Array(DateTime),
     `rows_where_ttl_info.max` Array(DateTime),
+    `is_broken` UInt8,
+    `exception_code` Int32,
+    `exception` String,
     `bytes` UInt64 ALIAS bytes_on_disk,
     `marks_size` UInt64 ALIAS marks_bytes,
     `part_name` String ALIAS name
@@ -762,7 +767,8 @@ CREATE TABLE system.quota_limits
     `max_read_rows` Nullable(UInt64),
     `max_read_bytes` Nullable(UInt64),
     `max_execution_time` Nullable(Float64),
-    `max_written_bytes` Nullable(UInt64)
+    `max_written_bytes` Nullable(UInt64),
+    `max_failed_sequential_authentications` Nullable(UInt64)
 )
 ENGINE = SystemQuotaLimits
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -792,7 +798,9 @@ CREATE TABLE system.quota_usage
     `execution_time` Nullable(Float64),
     `max_execution_time` Nullable(Float64),
     `written_bytes` Nullable(UInt64),
-    `max_written_bytes` Nullable(UInt64)
+    `max_written_bytes` Nullable(UInt64),
+    `failed_sequential_authentications` Nullable(UInt64),
+    `max_failed_sequential_authentications` Nullable(UInt64)
 )
 ENGINE = SystemQuotaUsage
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -836,7 +844,9 @@ CREATE TABLE system.quotas_usage
     `execution_time` Nullable(Float64),
     `max_execution_time` Nullable(Float64),
     `written_bytes` Nullable(UInt64),
-    `max_written_bytes` Nullable(UInt64)
+    `max_written_bytes` Nullable(UInt64),
+    `failed_sequential_authentications` Nullable(UInt64),
+    `max_failed_sequential_authentications` Nullable(UInt64)
 )
 ENGINE = SystemQuotasUsage
 COMMENT 'SYSTEM TABLE is built on the fly.'
@@ -871,8 +881,8 @@ CREATE TABLE system.replicas
     `log_pointer` UInt64,
     `last_queue_update` DateTime,
     `absolute_delay` UInt64,
-    `total_replicas` UInt8,
-    `active_replicas` UInt8,
+    `total_replicas` UInt32,
+    `active_replicas` UInt32,
     `lost_part_count` UInt64,
     `last_queue_update_exception` String,
     `zookeeper_exception` String,
@@ -1075,6 +1085,7 @@ CREATE TABLE system.tables
     `data_paths` Array(String),
     `metadata_path` String,
     `metadata_modification_time` DateTime,
+    `metadata_version` Int32,
     `dependencies_database` Array(String),
     `dependencies_table` Array(String),
     `create_table_query` String,
diff --git a/tests/queries/0_stateless/02117_show_create_table_system.sql b/tests/queries/0_stateless/02117_show_create_table_system.sql
index 32465abbed7..438f26dcca7 100644
--- a/tests/queries/0_stateless/02117_show_create_table_system.sql
+++ b/tests/queries/0_stateless/02117_show_create_table_system.sql
@@ -1,6 +1,6 @@
 /* we will `use system` to bypass style check,
 because `show create table` statement
-cannot fit the requirement in check-sytle, which is as
+cannot fit the requirement in check-style, which is as
 
 "# Queries to:
 tables_with_database_column=(
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug.lib b/tests/queries/0_stateless/02125_lz4_compression_bug.lib
new file mode 100755
index 00000000000..d13932aa166
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug.lib
@@ -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
+
+format=$1
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS file"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE file (x UInt64) ENGINE = File($format, '${CLICKHOUSE_DATABASE}/data.$format.lz4')"
+for size in 10000 100000 1000000 2500000
+do
+    ${CLICKHOUSE_CLIENT} --query "TRUNCATE TABLE file"
+    ${CLICKHOUSE_CLIENT} --query "INSERT INTO file SELECT * FROM numbers($size)"
+    ${CLICKHOUSE_CLIENT} --query "SELECT max(x) FROM file"
+done
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE file"
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug.reference b/tests/queries/0_stateless/02125_lz4_compression_bug.reference
deleted file mode 100644
index 713767e1d44..00000000000
--- a/tests/queries/0_stateless/02125_lz4_compression_bug.reference
+++ /dev/null
@@ -1,45 +0,0 @@
-Native
-9999
-99999
-999999
-2499999
-Values
-9999
-99999
-999999
-2499999
-JSONCompactEachRow
-9999
-99999
-999999
-2499999
-TSKV
-9999
-99999
-999999
-2499999
-TSV
-9999
-99999
-999999
-2499999
-CSV
-9999
-99999
-999999
-2499999
-JSONEachRow
-9999
-99999
-999999
-2499999
-JSONCompactEachRow
-9999
-99999
-999999
-2499999
-JSONStringsEachRow
-9999
-99999
-999999
-2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug.sh b/tests/queries/0_stateless/02125_lz4_compression_bug.sh
deleted file mode 100755
index 77646b01298..00000000000
--- a/tests/queries/0_stateless/02125_lz4_compression_bug.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-parallel, no-fasttest
-
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CURDIR"/../shell_config.sh
-
-for format in Native Values JSONCompactEachRow TSKV TSV CSV JSONEachRow JSONCompactEachRow JSONStringsEachRow
-do
-    echo $format
-    ${CLICKHOUSE_CLIENT} --query "DROP TABLE IF EXISTS file"
-    ${CLICKHOUSE_CLIENT} --query "CREATE TABLE file (x UInt64) ENGINE = File($format, '${CLICKHOUSE_DATABASE}/data.$format.lz4')"
-    for size in 10000 100000 1000000 2500000
-    do
-        ${CLICKHOUSE_CLIENT} --query "TRUNCATE TABLE file"
-        ${CLICKHOUSE_CLIENT} --query "INSERT INTO file SELECT * FROM numbers($size)"
-        ${CLICKHOUSE_CLIENT} --query "SELECT max(x) FROM file"
-    done
-done
-
-${CLICKHOUSE_CLIENT} --query "DROP TABLE file"
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.sh
new file mode 100755
index 00000000000..ef38226a3fe
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_CSV.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib CSV
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.sh
new file mode 100755
index 00000000000..41510edd7df
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONCompactEachRow.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib JSONCompactEachRow
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.sh
new file mode 100755
index 00000000000..c4bfc4274de
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONEachRow.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib JSONEachRow
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.sh
new file mode 100755
index 00000000000..87f30a56da5
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_JSONStringsEachRow.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib JSONStringsEachRow
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_Native.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_Native.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_Native.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_Native.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_Native.sh
new file mode 100755
index 00000000000..523d40e0522
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_Native.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib Native
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.sh
new file mode 100755
index 00000000000..b4f4045d6f6
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_TSKV.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib TSKV
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.sh
new file mode 100755
index 00000000000..ca50929c958
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_TSV.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib TSV
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_Values.reference b/tests/queries/0_stateless/02125_lz4_compression_bug_Values.reference
new file mode 100644
index 00000000000..b4ace07c0ac
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_Values.reference
@@ -0,0 +1,4 @@
+9999
+99999
+999999
+2499999
diff --git a/tests/queries/0_stateless/02125_lz4_compression_bug_Values.sh b/tests/queries/0_stateless/02125_lz4_compression_bug_Values.sh
new file mode 100755
index 00000000000..68f3d90dbb4
--- /dev/null
+++ b/tests/queries/0_stateless/02125_lz4_compression_bug_Values.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+${CUR_DIR}/02125_lz4_compression_bug.lib Values
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02131_row_policies_combination.reference b/tests/queries/0_stateless/02131_row_policies_combination.reference
index b76028d5077..5015cb14456 100644
--- a/tests/queries/0_stateless/02131_row_policies_combination.reference
+++ b/tests/queries/0_stateless/02131_row_policies_combination.reference
@@ -12,6 +12,15 @@ R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)
 1
 2
 3
+R1, R2, R3 + additional_table_filters and PREWHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)
+2
+3
+R1, R2, R3 + additional_result_filter and PREWHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)
+2
+3
+R1, R2, R3 + additional_table_filters and WHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)
+2
+3
 R1, R2, R3, R4: ((x == 1) OR (x == 2) OR (x == 3)) AND (x <= 2)
 1
 2
diff --git a/tests/queries/0_stateless/02131_row_policies_combination.sql b/tests/queries/0_stateless/02131_row_policies_combination.sql
index b5be672bb1b..02f2365eed8 100644
--- a/tests/queries/0_stateless/02131_row_policies_combination.sql
+++ b/tests/queries/0_stateless/02131_row_policies_combination.sql
@@ -23,6 +23,24 @@ CREATE ROW POLICY 02131_filter_3 ON 02131_rptable USING x=3 AS permissive TO ALL
 SELECT 'R1, R2, R3: (x == 1) OR (x == 2) OR (x == 3)';
 SELECT * FROM 02131_rptable;
 
+SELECT 'R1, R2, R3 + additional_table_filters and PREWHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)';
+SELECT * FROM 02131_rptable
+PREWHERE x >= 2
+SETTINGS additional_table_filters = {'02131_rptable': 'x > 1'}
+;
+
+SELECT 'R1, R2, R3 + additional_result_filter and PREWHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)';
+SELECT * FROM 02131_rptable
+PREWHERE x >= 2
+SETTINGS additional_result_filter = 'x > 1'
+;
+
+SELECT 'R1, R2, R3 + additional_table_filters and WHERE: (x == 1) OR (x == 2) OR (x == 3) AND (x < 3) AND (x > 1)';
+SELECT * FROM 02131_rptable
+WHERE x >= 2
+SETTINGS additional_table_filters = {'02131_rptable': 'x > 1'}
+;
+
 CREATE ROW POLICY 02131_filter_4 ON 02131_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 02131_rptable;
diff --git a/tests/queries/0_stateless/02132_client_history_navigation.expect b/tests/queries/0_stateless/02132_client_history_navigation.expect
index dc7e44b41ee..3fba7ab1692 100755
--- a/tests/queries/0_stateless/02132_client_history_navigation.expect
+++ b/tests/queries/0_stateless/02132_client_history_navigation.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02134_async_inserts_formats.sh b/tests/queries/0_stateless/02134_async_inserts_formats.sh
index 631809e5dc2..89705bf6415 100755
--- a/tests/queries/0_stateless/02134_async_inserts_formats.sh
+++ b/tests/queries/0_stateless/02134_async_inserts_formats.sh
@@ -4,7 +4,9 @@ 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"
+# With adaptive timeout enabled, the asynchronous queue can be flushed synchronously, depending on the elapsed since the last insert.
+# This may result in test flakiness.
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1&async_insert_use_adaptive_busy_timeout=0"
 
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS async_inserts"
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE async_inserts (id UInt32, s String) ENGINE = MergeTree ORDER BY id"
diff --git a/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference b/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference
index beda9e36223..0bb8966cbe4 100644
--- a/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference
+++ b/tests/queries/0_stateless/02141_clickhouse_local_interactive_table.reference
@@ -1,2 +1,2 @@
-CREATE TABLE default.table\n(\n    `key` String\n)\nENGINE = File(\'TSVWithNamesAndTypes\', \'/dev/null\')
-CREATE TABLE foo.table\n(\n    `key` String\n)\nENGINE = File(\'TSVWithNamesAndTypes\', \'/dev/null\')
+CREATE TABLE default.`table`\n(\n    `key` String\n)\nENGINE = File(\'TSVWithNamesAndTypes\', \'/dev/null\')
+CREATE TABLE foo.`table`\n(\n    `key` String\n)\nENGINE = File(\'TSVWithNamesAndTypes\', \'/dev/null\')
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 f2a4ef1f634..d608364e01b 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
@@ -64,8 +64,10 @@ ExpressionTransform
     (Sorting)
       (Expression)
       ExpressionTransform
-        (ReadFromMergeTree)
-        MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
+        (Expression)
+        ExpressionTransform
+          (ReadFromMergeTree)
+          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 (Expression)
 ExpressionTransform
   (Limit)
@@ -76,8 +78,7 @@ ExpressionTransform
         (Expression)
         ExpressionTransform
           (ReadFromMergeTree)
-          ExpressionTransform
-            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
+          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 2020-10-11	0	0
 2020-10-11	0	10
 2020-10-11	0	20
@@ -92,8 +93,10 @@ ExpressionTransform
       PartialSortingTransform
         (Expression)
         ExpressionTransform
-          (ReadFromMergeTree)
-          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
+          (Expression)
+          ExpressionTransform
+            (ReadFromMergeTree)
+            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 (Expression)
 ExpressionTransform
   (Limit)
@@ -106,8 +109,7 @@ ExpressionTransform
           (Expression)
           ExpressionTransform
             (ReadFromMergeTree)
-            ExpressionTransform
-              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
+            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 2020-10-12	0
 2020-10-12	1
 2020-10-12	2
@@ -117,20 +119,10 @@ SELECT
     date,
     i
 FROM t_read_in_order
-PREWHERE date = \'2020-10-12\'
+WHERE date = \'2020-10-12\'
 ORDER BY i DESC
 LIMIT 5
 (Expression)
-ExpressionTransform
-  (Limit)
-  Limit
-    (Sorting)
-      (Expression)
-      ExpressionTransform
-        (ReadFromMergeTree)
-        ReverseTransform
-          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InReverseOrder) 0 → 1
-(Expression)
 ExpressionTransform
   (Limit)
   Limit
@@ -140,9 +132,20 @@ ExpressionTransform
         (Expression)
         ExpressionTransform
           (ReadFromMergeTree)
-          ExpressionTransform
-            ReverseTransform
-              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InReverseOrder) 0 → 1
+          ReverseTransform
+            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InReverseOrder) 0 → 1
+(Expression)
+ExpressionTransform
+  (Limit)
+  Limit
+    (Sorting)
+      (Expression)
+      ExpressionTransform
+        (Expression)
+        ExpressionTransform
+          (ReadFromMergeTree)
+          ReverseTransform
+            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InReverseOrder) 0 → 1
 2020-10-12	99999
 2020-10-12	99998
 2020-10-12	99997
diff --git a/tests/queries/0_stateless/02151_invalid_setting_with_hints_in_query.sh b/tests/queries/0_stateless/02151_invalid_setting_with_hints_in_query.sh
index 2faaa3bb1b6..367d0163497 100755
--- a/tests/queries/0_stateless/02151_invalid_setting_with_hints_in_query.sh
+++ b/tests/queries/0_stateless/02151_invalid_setting_with_hints_in_query.sh
@@ -4,4 +4,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --query="SET input_format_with_names_use_headers = 1" 2>&1 | grep -qF "Code: 115. DB::Exception: Unknown setting input_format_with_names_use_headers: Maybe you meant ['input_format_with_names_use_header','input_format_with_types_use_header']. (UNKNOWN_SETTING)" && echo 'OK' || echo 'FAIL' ||:
+$CLICKHOUSE_LOCAL --query="SET input_format_with_names_use_headers = 1" 2>&1 | grep -qF "Code: 115. DB::Exception: Unknown setting 'input_format_with_names_use_headers': Maybe you meant ['input_format_with_names_use_header','input_format_with_types_use_header']. (UNKNOWN_SETTING)" && echo 'OK' || echo 'FAIL' ||:
diff --git a/tests/queries/0_stateless/02152_bool_type.reference b/tests/queries/0_stateless/02152_bool_type.reference
index a8c04f651e9..3d48302f941 100644
--- a/tests/queries/0_stateless/02152_bool_type.reference
+++ b/tests/queries/0_stateless/02152_bool_type.reference
@@ -32,11 +32,11 @@ Custom true
 Row 1:
 ──────
 CAST('true', 'Bool'): Custom true
-�����������������������┓
-┃ CAST('true', 'Bool') ┃
-┡����������������������┩
-│ Custom true          │
-└──────────────────────┘
+   �����������������������┓
+   ┃ CAST('true', 'Bool') ┃
+   ┡����������������������┩
+1. │ Custom true          │
+   └──────────────────────┘
 {"CAST('true', 'Bool')":true}
 1
 1
diff --git a/tests/queries/0_stateless/02152_bool_type.sql b/tests/queries/0_stateless/02152_bool_type.sql
index e9efde0795f..1ed3620c149 100644
--- a/tests/queries/0_stateless/02152_bool_type.sql
+++ b/tests/queries/0_stateless/02152_bool_type.sql
@@ -1,3 +1,5 @@
+SET output_format_pretty_color=1;
+
 SELECT CAST('True', 'Bool');
 SELECT CAST('TrUe', 'Bool');
 SELECT CAST('true', 'Bool');
diff --git a/tests/queries/0_stateless/02152_http_external_tables_memory_tracking.sh b/tests/queries/0_stateless/02152_http_external_tables_memory_tracking.sh
index 5f9eb460e44..5494f7d59cb 100755
--- a/tests/queries/0_stateless/02152_http_external_tables_memory_tracking.sh
+++ b/tests/queries/0_stateless/02152_http_external_tables_memory_tracking.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-cpu-aarch64, no-parallel
+# Tags: no-tsan, no-cpu-aarch64, no-parallel, no-debug
 # TSan does not supports tracing.
 # trace_log doesn't work on aarch64
 
@@ -30,10 +30,16 @@ function run_and_check()
     # Check that temporary table had been destroyed.
     ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&allow_introspection_functions=1" --data-binary @- <<<"
     WITH arrayStringConcat(arrayMap(x -> demangle(addressToSymbol(x)), trace), '\n') AS sym
-    SELECT count()>0 FROM system.trace_log
+    SELECT 1 FROM system.trace_log
+    PREWHERE
+        query_id = '$query_id' AND
+        trace_type = 'MemorySample' AND
+        /* only deallocations */
+        size < 0 AND
+        event_date >= yesterday()
     WHERE
-        sym LIKE '%DB::StorageMemory::drop%\n%TemporaryTableHolder::~TemporaryTableHolder%' AND
-        query_id = '$query_id'
+        sym LIKE '%DB::StorageMemory::drop%\n%TemporaryTableHolder::~TemporaryTableHolder%'
+    LIMIT 1
     "
 }
 
diff --git a/tests/queries/0_stateless/02155_read_in_order_max_rows_to_read.sql b/tests/queries/0_stateless/02155_read_in_order_max_rows_to_read.sql
index b387582296d..4b47a860071 100644
--- a/tests/queries/0_stateless/02155_read_in_order_max_rows_to_read.sql
+++ b/tests/queries/0_stateless/02155_read_in_order_max_rows_to_read.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS t_max_rows_to_read;
 
 CREATE TABLE t_max_rows_to_read (a UInt64)
diff --git a/tests/queries/0_stateless/02156_storage_merge_prewhere.reference b/tests/queries/0_stateless/02156_storage_merge_prewhere.reference
index 74ba452d783..86a36a9392c 100644
--- a/tests/queries/0_stateless/02156_storage_merge_prewhere.reference
+++ b/tests/queries/0_stateless/02156_storage_merge_prewhere.reference
@@ -1,12 +1,15 @@
-SELECT count()
-FROM t_02156_merge1
-PREWHERE notEmpty(v) AND (k = 3)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(notEmpty(v), equals(k, 3)) (removed)
+          Prewhere info
+            Prewhere filter
+            Prewhere filter column: and(notEmpty(v), equals(k, 3)) (removed)
+          Prewhere info
+            Prewhere filter
+            Prewhere filter column: and(notEmpty(v), equals(k, 3)) (removed)
 2
-SELECT count()
-FROM t_02156_merge2
-WHERE (k = 3) AND notEmpty(v)
+      Filter column: and(equals(k, 3), notEmpty(v)) (removed)
 2
-SELECT count()
-FROM t_02156_merge3
-WHERE (k = 3) AND notEmpty(v)
+          Filter column: and(equals(k, 3), notEmpty(v)) (removed)
+          Filter column: and(equals(k, 3), notEmpty(v)) (removed)
 2
diff --git a/tests/queries/0_stateless/02156_storage_merge_prewhere.sql b/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
index 83d88a68d9b..ca61a8f2d57 100644
--- a/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
+++ b/tests/queries/0_stateless/02156_storage_merge_prewhere.sql
@@ -1,5 +1,6 @@
 SET optimize_move_to_prewhere = 1;
 SET enable_multiple_prewhere_read_steps = 1;
+SET prefer_localhost_replica = 1; -- Make sure plan is reliable
 
 DROP TABLE IF EXISTS t_02156_mt1;
 DROP TABLE IF EXISTS t_02156_mt2;
@@ -23,13 +24,13 @@ INSERT INTO t_02156_mt1 SELECT number, toString(number) FROM numbers(10000);
 INSERT INTO t_02156_mt2 SELECT number, toString(number) FROM numbers(10000);
 INSERT INTO t_02156_log SELECT number, toString(number) FROM numbers(10000);
 
-EXPLAIN SYNTAX SELECT count() FROM t_02156_merge1 WHERE k = 3 AND notEmpty(v);
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02156_merge1 WHERE k = 3 AND notEmpty(v)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count() FROM t_02156_merge1 WHERE k = 3 AND notEmpty(v);
 
-EXPLAIN SYNTAX SELECT count() FROM t_02156_merge2 WHERE k = 3 AND notEmpty(v);
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02156_merge2 WHERE k = 3 AND notEmpty(v)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count() FROM t_02156_merge2 WHERE k = 3 AND notEmpty(v);
 
-EXPLAIN SYNTAX SELECT count() FROM t_02156_merge3 WHERE k = 3 AND notEmpty(v);
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02156_merge3 WHERE k = 3 AND notEmpty(v)) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count() FROM t_02156_merge3 WHERE k = 3 AND notEmpty(v);
 
 DROP TABLE IF EXISTS t_02156_mt1;
diff --git a/tests/queries/0_stateless/02158_explain_ast_alter_commands.reference b/tests/queries/0_stateless/02158_explain_ast_alter_commands.reference
index 030d5a8f5af..518ecfdb141 100644
--- a/tests/queries/0_stateless/02158_explain_ast_alter_commands.reference
+++ b/tests/queries/0_stateless/02158_explain_ast_alter_commands.reference
@@ -9,7 +9,7 @@
   AlterCommand MODIFY_TTL (children 1)
   AlterCommand MATERIALIZE_TTL (children 1)
   AlterCommand MODIFY_SETTING (children 1)
-  AlterCommand RESET_SETTING
+  AlterCommand RESET_SETTING (children 1)
   AlterCommand MODIFY_QUERY (children 1)
   AlterCommand REMOVE_TTL
   AlterCommand REMOVE_SAMPLE_BY
diff --git a/tests/queries/0_stateless/02160_client_autocomplete_parse_query.expect b/tests/queries/0_stateless/02160_client_autocomplete_parse_query.expect
index 01d61a6ad0f..2d404b005c7 100755
--- a/tests/queries/0_stateless/02160_client_autocomplete_parse_query.expect
+++ b/tests/queries/0_stateless/02160_client_autocomplete_parse_query.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
index b6b497b4b55..78b414378f1 100644
--- a/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
+++ b/tests/queries/0_stateless/02161_addressToLineWithInlines.sql
@@ -1,4 +1,4 @@
--- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug, no-cpu-aarch64
+-- Tags: no-tsan, no-asan, no-ubsan, no-msan, no-debug
 
 SET allow_introspection_functions = 0;
 SELECT addressToLineWithInlines(1); -- { serverError 446 }
diff --git a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
index 57a2d1c432b..add977c4fce 100755
--- a/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
+++ b/tests/queries/0_stateless/02164_clickhouse_local_interactive_exception.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 20
diff --git a/tests/queries/0_stateless/02174_cte_scalar_cache_mv.reference b/tests/queries/0_stateless/02174_cte_scalar_cache_mv.reference
index 8ec3608317f..dcfab092b5c 100644
--- a/tests/queries/0_stateless/02174_cte_scalar_cache_mv.reference
+++ b/tests/queries/0_stateless/02174_cte_scalar_cache_mv.reference
@@ -19,6 +19,48 @@
 94	94	94	94	5
 99	99	99	99	5
 02177_MV	7	80	22
+4	4	4	4	5
+9	9	9	9	5
+14	14	14	14	5
+19	19	19	19	5
+24	24	24	24	5
+29	29	29	29	5
+34	34	34	34	5
+39	39	39	39	5
+44	44	44	44	5
+49	49	49	49	5
+54	54	54	54	5
+59	59	59	59	5
+64	64	64	64	5
+69	69	69	69	5
+74	74	74	74	5
+79	79	79	79	5
+84	84	84	84	5
+89	89	89	89	5
+94	94	94	94	5
+99	99	99	99	5
+02177_MV	0	0	22
+10
+40
+70
+100
+130
+160
+190
+220
+250
+280
+310
+340
+370
+400
+430
+460
+490
+520
+550
+580
+02177_MV_2	0	0	21
 10
 40
 70
@@ -61,3 +103,24 @@
 188
 198
 02177_MV_3	20	0	1
+8
+18
+28
+38
+48
+58
+68
+78
+88
+98
+108
+118
+128
+138
+148
+158
+168
+178
+188
+198
+02177_MV_3	19	0	2
diff --git a/tests/queries/0_stateless/02174_cte_scalar_cache_mv.sql b/tests/queries/0_stateless/02174_cte_scalar_cache_mv.sql
index 742d72fe2b2..ca54b9e1400 100644
--- a/tests/queries/0_stateless/02174_cte_scalar_cache_mv.sql
+++ b/tests/queries/0_stateless/02174_cte_scalar_cache_mv.sql
@@ -14,6 +14,8 @@ CREATE MATERIALIZED VIEW mv1 TO t2 AS
     FROM t1
     LIMIT 5;
 
+set allow_experimental_analyzer = 0;
+
 -- FIRST INSERT
 INSERT INTO t1
 WITH
@@ -58,8 +60,48 @@ WHERE
   AND query LIKE '-- FIRST INSERT\nINSERT INTO t1\n%'
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
+truncate table t2;
+set allow_experimental_analyzer = 1;
+
+-- FIRST INSERT ANALYZER
+INSERT INTO t1
+WITH
+    (SELECT max(i) FROM t1) AS t1
+SELECT
+       number as i,
+       t1 + t1 + t1 AS j -- Using global cache
+FROM system.numbers
+LIMIT 100
+SETTINGS
+    min_insert_block_size_rows=5,
+    max_insert_block_size=5,
+    min_insert_block_size_rows_for_materialized_views=5,
+    max_block_size=5,
+    max_threads=1;
+
+SELECT k, l, m, n, count()
+FROM t2
+GROUP BY k, l, m, n
+ORDER BY k, l, m, n;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    '02177_MV',
+    ProfileEvents['ScalarSubqueriesGlobalCacheHit'] as scalar_cache_global_hit,
+    ProfileEvents['ScalarSubqueriesLocalCacheHit'] as scalar_cache_local_hit,
+    ProfileEvents['ScalarSubqueriesCacheMiss'] as scalar_cache_miss
+FROM system.query_log
+WHERE
+      current_database = currentDatabase()
+  AND type = 'QueryFinish'
+  AND query LIKE '-- FIRST INSERT ANALYZER\nINSERT INTO t1\n%'
+  AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
+
 DROP TABLE mv1;
 
+set allow_experimental_analyzer = 0;
+
 CREATE TABLE t3 (z Int64) ENGINE = Memory;
 CREATE MATERIALIZED VIEW mv2 TO t3 AS
 SELECT
@@ -91,8 +133,36 @@ WHERE
   AND query LIKE '-- SECOND INSERT\nINSERT INTO t1%'
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
+truncate table t3;
+set allow_experimental_analyzer = 1;
+
+-- SECOND INSERT ANALYZER
+INSERT INTO t1
+SELECT 0 as i, number as j from numbers(100)
+SETTINGS
+    min_insert_block_size_rows=5,
+    max_insert_block_size=5,
+    min_insert_block_size_rows_for_materialized_views=5,
+    max_block_size=5,
+    max_threads=1;
+
+SELECT * FROM t3 ORDER BY z ASC;
+SYSTEM FLUSH LOGS;
+SELECT
+    '02177_MV_2',
+    ProfileEvents['ScalarSubqueriesGlobalCacheHit'] as scalar_cache_global_hit,
+    ProfileEvents['ScalarSubqueriesLocalCacheHit'] as scalar_cache_local_hit,
+    ProfileEvents['ScalarSubqueriesCacheMiss'] as scalar_cache_miss
+FROM system.query_log
+WHERE
+        current_database = currentDatabase()
+  AND type = 'QueryFinish'
+  AND query LIKE '-- SECOND INSERT ANALYZER\nINSERT INTO t1%'
+  AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
+
 DROP TABLE mv2;
 
+set allow_experimental_analyzer = 0;
 
 CREATE TABLE t4 (z Int64) ENGINE = Memory;
 CREATE MATERIALIZED VIEW mv3 TO t4 AS
@@ -126,6 +196,35 @@ WHERE
   AND query LIKE '-- THIRD INSERT\nINSERT INTO t1%'
   AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
 
+truncate table t4;
+set allow_experimental_analyzer = 1;
+
+-- THIRD INSERT ANALYZER
+INSERT INTO t1
+SELECT number as i, number as j from numbers(100)
+    SETTINGS
+    min_insert_block_size_rows=5,
+    max_insert_block_size=5,
+    min_insert_block_size_rows_for_materialized_views=5,
+    max_block_size=5,
+    max_threads=1;
+SYSTEM FLUSH LOGS;
+
+SELECT * FROM t4 ORDER BY z ASC;
+
+SELECT
+    '02177_MV_3',
+    ProfileEvents['ScalarSubqueriesGlobalCacheHit'] as scalar_cache_global_hit,
+    ProfileEvents['ScalarSubqueriesLocalCacheHit'] as scalar_cache_local_hit,
+    ProfileEvents['ScalarSubqueriesCacheMiss'] as scalar_cache_miss
+FROM system.query_log
+WHERE
+        current_database = currentDatabase()
+  AND type = 'QueryFinish'
+  AND query LIKE '-- THIRD INSERT ANALYZER\nINSERT INTO t1%'
+  AND event_date >= yesterday() AND event_time > now() - interval 10 minute;
+
+
 DROP TABLE mv3;
 DROP TABLE t1;
 DROP TABLE t2;
diff --git a/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.reference b/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.reference
new file mode 100644
index 00000000000..7b36cc96f5e
--- /dev/null
+++ b/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.reference
@@ -0,0 +1,20 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.sh b/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.sh
new file mode 100755
index 00000000000..ec1edd710a1
--- /dev/null
+++ b/tests/queries/0_stateless/02181_detect_output_format_by_file_extension.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Tags: no-parallel, 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)" > $CLICKHOUSE_TMP/data.parquet
+$CLICKHOUSE_LOCAL -q "select * from table" < $CLICKHOUSE_TMP/data.parquet 
+
+$CLICKHOUSE_CLIENT -q "select * from numbers(10)" > $CLICKHOUSE_TMP/data.parquet
+$CLICKHOUSE_LOCAL -q "select * from table" < $CLICKHOUSE_TMP/data.parquet 
diff --git a/tests/queries/0_stateless/02181_format_describe_query.reference b/tests/queries/0_stateless/02181_format_describe_query.reference
index 328ea19bd37..238a83df50a 100644
--- a/tests/queries/0_stateless/02181_format_describe_query.reference
+++ b/tests/queries/0_stateless/02181_format_describe_query.reference
@@ -1,3 +1,3 @@
 DESCRIBE TABLE file('data.csv')
-DESCRIBE TABLE table
+DESCRIBE TABLE `table`
 DESCRIBE TABLE file('data.csv')
diff --git a/tests/queries/0_stateless/02184_default_table_engine.reference b/tests/queries/0_stateless/02184_default_table_engine.reference
index 495b9627acb..83760a178bd 100644
--- a/tests/queries/0_stateless/02184_default_table_engine.reference
+++ b/tests/queries/0_stateless/02184_default_table_engine.reference
@@ -9,7 +9,7 @@ CREATE TABLE default.numbers1\n(\n    `number` UInt64\n)\nENGINE = Memory
 CREATE TABLE default.numbers2\n(\n    `number` UInt64\n)\nENGINE = MergeTree\nORDER BY intHash32(number)\nSAMPLE BY intHash32(number)\nSETTINGS index_granularity = 8192
 45
 CREATE TABLE default.numbers3\n(\n    `number` UInt64\n)\nENGINE = Log
-CREATE MATERIALIZED VIEW default.test_view_filtered\n(\n    `EventDate` Date,\n    `CounterID` UInt32\n)\nENGINE = Memory AS\nSELECT\n    CounterID,\n    EventDate\nFROM default.test_table\nWHERE EventDate < \'2013-01-01\'
+CREATE MATERIALIZED VIEW default.test_view_filtered\n(\n    `EventDate` Date,\n    `CounterID` UInt32\n)\nENGINE = Memory\nAS SELECT\n    CounterID,\n    EventDate\nFROM default.test_table\nWHERE EventDate < \'2013-01-01\'
 2014-01-02	0	0	1969-12-31 16:00:00	2014-01-02 03:04:06
 1	2014-01-01 19:04:06
 CREATE TABLE default.t1\n(\n    `Rows` UInt64,\n    `MaxHitTime` DateTime(\'UTC\')\n)\nENGINE = MergeTree\nORDER BY Rows\nSETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/02184_default_table_engine.sql b/tests/queries/0_stateless/02184_default_table_engine.sql
index a984ec1b6c9..aff30eeea98 100644
--- a/tests/queries/0_stateless/02184_default_table_engine.sql
+++ b/tests/queries/0_stateless/02184_default_table_engine.sql
@@ -1,3 +1,5 @@
+SET default_table_engine = 'None';
+
 CREATE TABLE table_02184 (x UInt8); --{serverError 119}
 SET default_table_engine = 'Log';
 CREATE TABLE table_02184 (x UInt8);
diff --git a/tests/queries/0_stateless/02184_nested_tuple.sql b/tests/queries/0_stateless/02184_nested_tuple.sql
index 67a20e3dce1..09ed8eb7200 100644
--- a/tests/queries/0_stateless/02184_nested_tuple.sql
+++ b/tests/queries/0_stateless/02184_nested_tuple.sql
@@ -1,3 +1,4 @@
+SET allow_suspicious_low_cardinality_types=1;
 DROP TABLE IF EXISTS t_nested_tuple;
 
 CREATE TABLE t_nested_tuple
diff --git a/tests/queries/0_stateless/02185_orc_corrupted_file.sh b/tests/queries/0_stateless/02185_orc_corrupted_file.sh
index 1987f094faa..12510ae3836 100755
--- a/tests/queries/0_stateless/02185_orc_corrupted_file.sh
+++ b/tests/queries/0_stateless/02185_orc_corrupted_file.sh
@@ -8,4 +8,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 USER_FILES_PATH=$($CLICKHOUSE_CLIENT_BINARY --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
 cp $CUR_DIR/data_orc/corrupted.orc $USER_FILES_PATH/
 
-${CLICKHOUSE_CLIENT} --query="select * from file('corrupted.orc')" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL'
+${CLICKHOUSE_CLIENT} --query="select * from file('corrupted.orc')" 2>&1 | grep -F -q 'CANNOT_EXTRACT_TABLE_STRUCTURE' && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/02205_HTTP_user_agent.python b/tests/queries/0_stateless/02205_HTTP_user_agent.python
index d8f8a32b6db..83089741bf2 100644
--- a/tests/queries/0_stateless/02205_HTTP_user_agent.python
+++ b/tests/queries/0_stateless/02205_HTTP_user_agent.python
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 from http.server import SimpleHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
 import socket
 import sys
 import threading
@@ -116,11 +117,19 @@ class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
 
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    pass
+
+
+class ThreadedHTTPServerV6(ThreadingMixIn, HTTPServerV6):
+    pass
+
+
 def start_server(requests_amount):
     if IS_IPV6:
-        httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
+        httpd = ThreadedHTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
     else:
-        httpd = HTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
+        httpd = ThreadedHTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
 
     def real_func():
         for i in range(requests_amount):
diff --git a/tests/queries/0_stateless/02206_information_schema_show_database.reference b/tests/queries/0_stateless/02206_information_schema_show_database.reference
index fcc41e771b3..2cc93c56e82 100644
--- a/tests/queries/0_stateless/02206_information_schema_show_database.reference
+++ b/tests/queries/0_stateless/02206_information_schema_show_database.reference
@@ -1,6 +1,6 @@
 CREATE DATABASE INFORMATION_SCHEMA\nENGINE = Memory
-CREATE VIEW INFORMATION_SCHEMA.COLUMNS\n(\n    `table_catalog` String,\n    `table_schema` String,\n    `table_name` String,\n    `column_name` String,\n    `ordinal_position` UInt64,\n    `column_default` String,\n    `is_nullable` String,\n    `data_type` String,\n    `character_maximum_length` Nullable(UInt64),\n    `character_octet_length` Nullable(UInt64),\n    `numeric_precision` Nullable(UInt64),\n    `numeric_precision_radix` Nullable(UInt64),\n    `numeric_scale` Nullable(UInt64),\n    `datetime_precision` Nullable(UInt64),\n    `character_set_catalog` Nullable(String),\n    `character_set_schema` Nullable(String),\n    `character_set_name` Nullable(String),\n    `collation_catalog` Nullable(String),\n    `collation_schema` Nullable(String),\n    `collation_name` Nullable(String),\n    `domain_catalog` Nullable(String),\n    `domain_schema` Nullable(String),\n    `domain_name` Nullable(String),\n    `extra` Nullable(String),\n    `column_comment` String,\n    `column_type` String,\n    `TABLE_CATALOG` String,\n    `TABLE_SCHEMA` String,\n    `TABLE_NAME` String,\n    `COLUMN_NAME` String,\n    `ORDINAL_POSITION` UInt64,\n    `COLUMN_DEFAULT` String,\n    `IS_NULLABLE` String,\n    `DATA_TYPE` String,\n    `CHARACTER_MAXIMUM_LENGTH` Nullable(UInt64),\n    `CHARACTER_OCTET_LENGTH` Nullable(UInt64),\n    `NUMERIC_PRECISION` Nullable(UInt64),\n    `NUMERIC_PRECISION_RADIX` Nullable(UInt64),\n    `NUMERIC_SCALE` Nullable(UInt64),\n    `DATETIME_PRECISION` Nullable(UInt64),\n    `CHARACTER_SET_CATALOG` Nullable(String),\n    `CHARACTER_SET_SCHEMA` Nullable(String),\n    `CHARACTER_SET_NAME` Nullable(String),\n    `COLLATION_CATALOG` Nullable(String),\n    `COLLATION_SCHEMA` Nullable(String),\n    `COLLATION_NAME` Nullable(String),\n    `DOMAIN_CATALOG` Nullable(String),\n    `DOMAIN_SCHEMA` Nullable(String),\n    `DOMAIN_NAME` Nullable(String),\n    `EXTRA` Nullable(String),\n    `COLUMN_COMMENT` String,\n    `COLUMN_TYPE` String\n) AS\nSELECT\n    database AS table_catalog,\n    database AS table_schema,\n    table AS table_name,\n    name AS column_name,\n    position AS ordinal_position,\n    default_expression AS column_default,\n    type LIKE \'Nullable(%)\' AS is_nullable,\n    type AS data_type,\n    character_octet_length AS character_maximum_length,\n    character_octet_length,\n    numeric_precision,\n    numeric_precision_radix,\n    numeric_scale,\n    datetime_precision,\n    NULL AS character_set_catalog,\n    NULL AS character_set_schema,\n    NULL AS character_set_name,\n    NULL AS collation_catalog,\n    NULL AS collation_schema,\n    NULL AS collation_name,\n    NULL AS domain_catalog,\n    NULL AS domain_schema,\n    NULL AS domain_name,\n    multiIf(default_kind = \'DEFAULT\', \'DEFAULT_GENERATED\', default_kind = \'MATERIALIZED\', \'STORED GENERATED\', default_kind = \'ALIAS\', \'VIRTUAL GENERATED\', \'\') AS extra,\n    comment AS column_comment,\n    type AS column_type,\n    table_catalog AS TABLE_CATALOG,\n    table_schema AS TABLE_SCHEMA,\n    table_name AS TABLE_NAME,\n    column_name AS COLUMN_NAME,\n    ordinal_position AS ORDINAL_POSITION,\n    column_default AS COLUMN_DEFAULT,\n    is_nullable AS IS_NULLABLE,\n    data_type AS DATA_TYPE,\n    character_maximum_length AS CHARACTER_MAXIMUM_LENGTH,\n    character_octet_length AS CHARACTER_OCTET_LENGTH,\n    numeric_precision AS NUMERIC_PRECISION,\n    numeric_precision_radix AS NUMERIC_PRECISION_RADIX,\n    numeric_scale AS NUMERIC_SCALE,\n    datetime_precision AS DATETIME_PRECISION,\n    character_set_catalog AS CHARACTER_SET_CATALOG,\n    character_set_schema AS CHARACTER_SET_SCHEMA,\n    character_set_name AS CHARACTER_SET_NAME,\n    collation_catalog AS COLLATION_CATALOG,\n    collation_schema AS COLLATION_SCHEMA,\n    collation_name AS COLLATION_NAME,\n    domain_catalog AS DOMAIN_CATALOG,\n    domain_schema AS DOMAIN_SCHEMA,\n    domain_name AS DOMAIN_NAME,\n    extra AS EXTRA,\n    column_comment AS COLUMN_COMMENT,\n    column_type AS COLUMN_TYPE\nFROM system.columns
-CREATE VIEW INFORMATION_SCHEMA.TABLES (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
-CREATE VIEW INFORMATION_SCHEMA.tables (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
-CREATE VIEW information_schema.TABLES (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
-CREATE VIEW information_schema.tables (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
+CREATE VIEW INFORMATION_SCHEMA.COLUMNS\n(\n    `table_catalog` String,\n    `table_schema` String,\n    `table_name` String,\n    `column_name` String,\n    `ordinal_position` UInt64,\n    `column_default` String,\n    `is_nullable` String,\n    `data_type` String,\n    `character_maximum_length` Nullable(UInt64),\n    `character_octet_length` Nullable(UInt64),\n    `numeric_precision` Nullable(UInt64),\n    `numeric_precision_radix` Nullable(UInt64),\n    `numeric_scale` Nullable(UInt64),\n    `datetime_precision` Nullable(UInt64),\n    `character_set_catalog` Nullable(String),\n    `character_set_schema` Nullable(String),\n    `character_set_name` Nullable(String),\n    `collation_catalog` Nullable(String),\n    `collation_schema` Nullable(String),\n    `collation_name` Nullable(String),\n    `domain_catalog` Nullable(String),\n    `domain_schema` Nullable(String),\n    `domain_name` Nullable(String),\n    `extra` Nullable(String),\n    `column_comment` String,\n    `column_type` String,\n    `TABLE_CATALOG` String,\n    `TABLE_SCHEMA` String,\n    `TABLE_NAME` String,\n    `COLUMN_NAME` String,\n    `ORDINAL_POSITION` UInt64,\n    `COLUMN_DEFAULT` String,\n    `IS_NULLABLE` String,\n    `DATA_TYPE` String,\n    `CHARACTER_MAXIMUM_LENGTH` Nullable(UInt64),\n    `CHARACTER_OCTET_LENGTH` Nullable(UInt64),\n    `NUMERIC_PRECISION` Nullable(UInt64),\n    `NUMERIC_PRECISION_RADIX` Nullable(UInt64),\n    `NUMERIC_SCALE` Nullable(UInt64),\n    `DATETIME_PRECISION` Nullable(UInt64),\n    `CHARACTER_SET_CATALOG` Nullable(String),\n    `CHARACTER_SET_SCHEMA` Nullable(String),\n    `CHARACTER_SET_NAME` Nullable(String),\n    `COLLATION_CATALOG` Nullable(String),\n    `COLLATION_SCHEMA` Nullable(String),\n    `COLLATION_NAME` Nullable(String),\n    `DOMAIN_CATALOG` Nullable(String),\n    `DOMAIN_SCHEMA` Nullable(String),\n    `DOMAIN_NAME` Nullable(String),\n    `EXTRA` Nullable(String),\n    `COLUMN_COMMENT` String,\n    `COLUMN_TYPE` String\n)\nSQL SECURITY INVOKER\nAS SELECT\n    database AS table_catalog,\n    database AS table_schema,\n    `table` AS table_name,\n    name AS column_name,\n    position AS ordinal_position,\n    default_expression AS column_default,\n    type LIKE \'Nullable(%)\' AS is_nullable,\n    type AS data_type,\n    character_octet_length AS character_maximum_length,\n    character_octet_length,\n    numeric_precision,\n    numeric_precision_radix,\n    numeric_scale,\n    datetime_precision,\n    NULL AS character_set_catalog,\n    NULL AS character_set_schema,\n    NULL AS character_set_name,\n    NULL AS collation_catalog,\n    NULL AS collation_schema,\n    NULL AS collation_name,\n    NULL AS domain_catalog,\n    NULL AS domain_schema,\n    NULL AS domain_name,\n    multiIf(default_kind = \'DEFAULT\', \'DEFAULT_GENERATED\', default_kind = \'MATERIALIZED\', \'STORED GENERATED\', default_kind = \'ALIAS\', \'VIRTUAL GENERATED\', \'\') AS extra,\n    comment AS column_comment,\n    type AS column_type,\n    table_catalog AS TABLE_CATALOG,\n    table_schema AS TABLE_SCHEMA,\n    table_name AS TABLE_NAME,\n    column_name AS COLUMN_NAME,\n    ordinal_position AS ORDINAL_POSITION,\n    column_default AS COLUMN_DEFAULT,\n    is_nullable AS IS_NULLABLE,\n    data_type AS DATA_TYPE,\n    character_maximum_length AS CHARACTER_MAXIMUM_LENGTH,\n    character_octet_length AS CHARACTER_OCTET_LENGTH,\n    numeric_precision AS NUMERIC_PRECISION,\n    numeric_precision_radix AS NUMERIC_PRECISION_RADIX,\n    numeric_scale AS NUMERIC_SCALE,\n    datetime_precision AS DATETIME_PRECISION,\n    character_set_catalog AS CHARACTER_SET_CATALOG,\n    character_set_schema AS CHARACTER_SET_SCHEMA,\n    character_set_name AS CHARACTER_SET_NAME,\n    collation_catalog AS COLLATION_CATALOG,\n    collation_schema AS COLLATION_SCHEMA,\n    collation_name AS COLLATION_NAME,\n    domain_catalog AS DOMAIN_CATALOG,\n    domain_schema AS DOMAIN_SCHEMA,\n    domain_name AS DOMAIN_NAME,\n    extra AS EXTRA,\n    column_comment AS COLUMN_COMMENT,\n    column_type AS COLUMN_TYPE\nFROM system.columns
+CREATE VIEW INFORMATION_SCHEMA.TABLES (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) SQL SECURITY INVOKER AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
+CREATE VIEW INFORMATION_SCHEMA.tables (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) SQL SECURITY INVOKER AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
+CREATE VIEW information_schema.TABLES (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) SQL SECURITY INVOKER AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
+CREATE VIEW information_schema.tables (`table_catalog` String, `table_schema` String, `table_name` String, `table_type` String, `table_rows` Nullable(UInt64), `data_length` Nullable(UInt64), `table_collation` Nullable(String), `table_comment` Nullable(String), `TABLE_CATALOG` String, `TABLE_SCHEMA` String, `TABLE_NAME` String, `TABLE_TYPE` String, `TABLE_ROWS` Nullable(UInt64), `DATA_LENGTH` Nullable(UInt64), `TABLE_COLLATION` Nullable(String), `TABLE_COMMENT` Nullable(String)) SQL SECURITY INVOKER AS SELECT database AS table_catalog, database AS table_schema, name AS table_name, multiIf(is_temporary, \'LOCAL TEMPORARY\', engine LIKE \'%View\', \'VIEW\', engine LIKE \'System%\', \'SYSTEM VIEW\', has_own_data = 0, \'FOREIGN TABLE\', \'BASE TABLE\') AS table_type, total_rows AS table_rows, total_bytes AS data_length, \'utf8mb4_0900_ai_ci\' AS table_collation, comment AS table_comment, table_catalog AS TABLE_CATALOG, table_schema AS TABLE_SCHEMA, table_name AS TABLE_NAME, table_type AS TABLE_TYPE, table_rows AS TABLE_ROWS, data_length AS DATA_LENGTH, table_collation AS TABLE_COLLATION, table_comment AS TABLE_COMMENT FROM system.tables
diff --git a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh
index 152d8344764..c62ec14b340 100755
--- a/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh
+++ b/tests/queries/0_stateless/02221_system_zookeeper_unrestricted_like.sh
@@ -13,7 +13,7 @@ ${CLICKHOUSE_CLIENT} -n --query="CREATE TABLE sample_table (
 )
 ENGINE ReplicatedMergeTree('/clickhouse/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/02221_system_zookeeper_unrestricted_like', '1')
 ORDER BY tuple();
-DROP TABLE IF EXISTS sample_table;"
+DROP TABLE IF EXISTS sample_table SYNC;"
 
 
 ${CLICKHOUSE_CLIENT} -n --query "CREATE TABLE sample_table_2 (
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 c28035fab49..d726ae86de7 100644
--- a/tests/queries/0_stateless/02227_union_match_by_name.reference
+++ b/tests/queries/0_stateless/02227_union_match_by_name.reference
@@ -36,7 +36,7 @@ Header: avgWeighted(x, y) Nullable(Float64)
               Header: x Nullable(Nothing)
                       y UInt8
                 Expression (Projection)
-                Header: NULL_Nullable(Nothing) Nullable(Nothing)
+                Header: _CAST(NULL_Nullable(Nothing), \'Nullable(Nothing)\'_String) Nullable(Nothing)
                         1_UInt8 UInt8
                   Expression (Change column names to column identifiers)
                   Header: __table5.dummy UInt8
diff --git a/tests/queries/0_stateless/02233_HTTP_ranged.python b/tests/queries/0_stateless/02233_HTTP_ranged.python
index 66ef3304098..5d06e4824b1 100644
--- a/tests/queries/0_stateless/02233_HTTP_ranged.python
+++ b/tests/queries/0_stateless/02233_HTTP_ranged.python
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 from http.server import BaseHTTPRequestHandler, HTTPServer
+from socketserver import ThreadingMixIn
 import socket
 import sys
 import re
@@ -206,13 +207,22 @@ class HTTPServerV6(HTTPServer):
     address_family = socket.AF_INET6
 
 
+class ThreadedHTTPServer(ThreadingMixIn, HTTPServer):
+    pass
+
+
+class ThreadedHTTPServerV6(ThreadingMixIn, HTTPServerV6):
+    pass
+
+
 def start_server():
     if IS_IPV6:
-        httpd = HTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
+        httpd = ThreadedHTTPServerV6(HTTP_SERVER_ADDRESS, HttpProcessor)
     else:
-        httpd = HTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
+        httpd = ThreadedHTTPServer(HTTP_SERVER_ADDRESS, HttpProcessor)
 
     t = threading.Thread(target=httpd.serve_forever)
+    t.start()
     return t, httpd
 
 
@@ -235,8 +245,6 @@ def run_test(allow_range, settings, check_retries=False):
         HttpProcessor.responses_to_get = ["500", "200", "206"]
     retries_num = len(HttpProcessor.responses_to_get)
 
-    t, httpd = start_server()
-    t.start()
     test_select(settings)
 
     download_buffer_size = settings["max_download_buffer_size"]
@@ -261,12 +269,12 @@ def run_test(allow_range, settings, check_retries=False):
         if HttpProcessor.range_used:
             raise Exception("HTTP Range used while not supported")
 
-    httpd.shutdown()
-    t.join()
     print("PASSED")
 
 
 def main():
+    t, httpd = start_server()
+
     settings = {"max_download_buffer_size": 20}
 
     # Test Accept-Ranges=False
@@ -285,10 +293,15 @@ def main():
     settings["max_download_threads"] = 2
     run_test(allow_range=True, settings=settings, check_retries=True)
 
+    httpd.shutdown()
+    t.join()
+
 
 if __name__ == "__main__":
     try:
         main()
+        sys.stdout.flush()
+        os._exit(0)
     except Exception as ex:
         exc_type, exc_value, exc_traceback = sys.exc_info()
         traceback.print_tb(exc_traceback, file=sys.stderr)
diff --git a/tests/queries/0_stateless/02233_optimize_aggregation_in_order_prefix.sql b/tests/queries/0_stateless/02233_optimize_aggregation_in_order_prefix.sql
index 5065bd96bc1..8bc75040e5a 100644
--- a/tests/queries/0_stateless/02233_optimize_aggregation_in_order_prefix.sql
+++ b/tests/queries/0_stateless/02233_optimize_aggregation_in_order_prefix.sql
@@ -1,5 +1,7 @@
 -- Tags: no-s3-storage
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists data_02233;
 create table data_02233 (parent_key Int, child_key Int, value Int) engine=MergeTree() order by parent_key;
 
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 acf0608acc5..eb4a91bd850 100755
--- a/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
+++ b/tests/queries/0_stateless/02234_clickhouse_local_test_mode.sh
@@ -6,4 +6,4 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 
 $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 }" 2>&1 | grep -o 'Missing columns'
+$CLICKHOUSE_LOCAL --query="SELECT n SETTINGS allow_experimental_analyzer = 0 -- { serverError 47 }" 2>&1 | grep -o 'Missing columns'
diff --git a/tests/queries/0_stateless/02235_add_part_offset_virtual_column.reference b/tests/queries/0_stateless/02235_add_part_offset_virtual_column.reference
index 2455f50b7f2..e88abb35ab4 100644
--- a/tests/queries/0_stateless/02235_add_part_offset_virtual_column.reference
+++ b/tests/queries/0_stateless/02235_add_part_offset_virtual_column.reference
@@ -50,6 +50,8 @@ SOME GRANULES FILTERED OUT
 100002	foo
 PREWHERE
 301408	164953047376	164953047376
+335872	166463369216	166463369216
+301407	164952947376	164952947376
 42
 10042
 20042
diff --git a/tests/queries/0_stateless/02235_add_part_offset_virtual_column.sql b/tests/queries/0_stateless/02235_add_part_offset_virtual_column.sql
index dc8fceddc52..5af6565c03d 100644
--- a/tests/queries/0_stateless/02235_add_part_offset_virtual_column.sql
+++ b/tests/queries/0_stateless/02235_add_part_offset_virtual_column.sql
@@ -52,7 +52,7 @@ SELECT _part_offset, foo FROM t_1 where granule == 0 AND _part_offset >= 100000
 
 SELECT 'PREWHERE';
 SELECT count(*), sum(_part_offset), sum(order_0) from t_1 prewhere granule == 0 where _part_offset >= 100000;
-SELECT count(*), sum(_part_offset), sum(order_0) from t_1 prewhere _part != '' where granule == 0; -- { serverError 10 }
-SELECT count(*), sum(_part_offset), sum(order_0) from t_1 prewhere _part_offset > 100000 where granule == 0; -- { serverError 10 }
+SELECT count(*), sum(_part_offset), sum(order_0) from t_1 prewhere _part != '' where granule == 0;
+SELECT count(*), sum(_part_offset), sum(order_0) from t_1 prewhere _part_offset > 100000 where granule == 0;
 SELECT _part_offset FROM t_1 PREWHERE order_0 % 10000 == 42 ORDER BY order_0 LIMIT 3;
 SELECT _part_offset, foo FROM t_1 PREWHERE order_0 % 10000 == 42 ORDER BY order_0 LIMIT 3;
diff --git a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
index bc1a4cbfdd1..0b6b9f461b0 100755
--- a/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
+++ b/tests/queries/0_stateless/02235_remote_fs_cache_stress.sh
@@ -6,7 +6,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CUR_DIR"/../shell_config.sh
 
 
-${CLICKHOUSE_CLIENT} --multiquery --multiline --query="""
+${CLICKHOUSE_CLIENT} --allow_suspicious_low_cardinality_types=1 --multiquery --multiline --query="""
 
 DROP TABLE IF EXISTS t_01411;
 DROP TABLE IF EXISTS t_01411_num;
diff --git a/tests/queries/0_stateless/02240_get_type_serialization_streams.reference b/tests/queries/0_stateless/02240_get_type_serialization_streams.reference
index 3537720214f..15e9bf87562 100644
--- a/tests/queries/0_stateless/02240_get_type_serialization_streams.reference
+++ b/tests/queries/0_stateless/02240_get_type_serialization_streams.reference
@@ -1,8 +1,8 @@
 ['{ArraySizes}','{ArrayElements, Regular}']
-['{ArraySizes}','{ArrayElements, TupleElement(keys, escape_tuple_delimiter = true), Regular}','{ArrayElements, TupleElement(values, escape_tuple_delimiter = true), Regular}']
-['{TupleElement(1, escape_tuple_delimiter = true), Regular}','{TupleElement(2, escape_tuple_delimiter = true), Regular}','{TupleElement(3, escape_tuple_delimiter = true), Regular}']
+['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}']
+['{TupleElement(1), Regular}','{TupleElement(2), Regular}','{TupleElement(3), Regular}']
 ['{DictionaryKeys, Regular}','{DictionaryIndexes}']
 ['{NullMap}','{NullableElements, Regular}']
 ['{ArraySizes}','{ArrayElements, Regular}']
-['{ArraySizes}','{ArrayElements, TupleElement(keys, escape_tuple_delimiter = true), Regular}','{ArrayElements, TupleElement(values, escape_tuple_delimiter = true), Regular}']
-['{TupleElement(1, escape_tuple_delimiter = true), Regular}','{TupleElement(2, escape_tuple_delimiter = true), Regular}','{TupleElement(3, escape_tuple_delimiter = true), Regular}','{TupleElement(4, escape_tuple_delimiter = true), Regular}']
+['{ArraySizes}','{ArrayElements, TupleElement(keys), Regular}','{ArrayElements, TupleElement(values), Regular}']
+['{TupleElement(1), Regular}','{TupleElement(2), Regular}','{TupleElement(3), Regular}','{TupleElement(4), Regular}']
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 157837983f7..186dcc1eeb2 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,62 +1,220 @@
 Using storage policy: s3_cache
+DROP TABLE IF EXISTS test_02241
+CREATE TABLE test_02241 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='s3_cache', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false, ratio_of_defaults_for_sparse_serialization = 1
+SYSTEM STOP MERGES test_02241
+SYSTEM DROP FILESYSTEM CACHE
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical
+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
 0
+SELECT count(), sum(size) FROM system.filesystem_cache
 0	0
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   745
 size:                     746
 state:                    DOWNLOADED
+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
 8
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	1100
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 0
+SELECT * FROM test_02241 FORMAT Null
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 2
+SELECT * FROM test_02241 FORMAT Null
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 2
+SELECT count(), sum(size) size FROM system.filesystem_cache
 8	1100
+SYSTEM DROP FILESYSTEM CACHE
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100, 200)
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical;
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   1659
 size:                     1660
 state:                    DOWNLOADED
+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
 8
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(300, 10000)
+SELECT count(), sum(size) FROM system.filesystem_cache
 24	84045
+SYSTEM START MERGES test_02241
+OPTIMIZE TABLE test_02241 FINAL
+SELECT count(), sum(size) FROM system.filesystem_cache
 32	167243
+ALTER TABLE test_02241 UPDATE value = 'kek' WHERE key = 100
+SELECT count(), sum(size) FROM system.filesystem_cache
 41	250541
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)
+SYSTEM FLUSH LOGS
 INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)	0
+SELECT count() FROM test_02241
 5010500
+SELECT count() FROM test_02241 WHERE value LIKE '%010%'
 18816
 Using storage policy: local_cache
+DROP TABLE IF EXISTS test_02241
+CREATE TABLE test_02241 (key UInt32, value String) Engine=MergeTree() ORDER BY key SETTINGS storage_policy='local_cache', min_bytes_for_wide_part = 10485760, compress_marks=false, compress_primary_key=false, ratio_of_defaults_for_sparse_serialization = 1
+SYSTEM STOP MERGES test_02241
+SYSTEM DROP FILESYSTEM CACHE
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical
+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
 0
+SELECT count(), sum(size) FROM system.filesystem_cache
 0	0
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   745
 size:                     746
 state:                    DOWNLOADED
+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
 8
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	1100
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 0
+SELECT * FROM test_02241 FORMAT Null
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 2
+SELECT * FROM test_02241 FORMAT Null
+SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0
 2
+SELECT count(), sum(size) size FROM system.filesystem_cache
 8	1100
+SYSTEM DROP FILESYSTEM CACHE
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100, 200)
+SELECT file_segment_range_begin, file_segment_range_end, size, state
+    FROM
+    (
+        SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
+        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
+    )
+    WHERE endsWith(local_path, 'data.bin')
+    FORMAT Vertical;
 Row 1:
 ──────
 file_segment_range_begin: 0
 file_segment_range_end:   1659
 size:                     1660
 state:                    DOWNLOADED
+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
 8
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100) SETTINGS enable_filesystem_cache_on_write_operations=0
+SELECT count(), sum(size) FROM system.filesystem_cache
 8	2014
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(300, 10000)
+SELECT count(), sum(size) FROM system.filesystem_cache
 24	84045
+SYSTEM START MERGES test_02241
+OPTIMIZE TABLE test_02241 FINAL
+SELECT count(), sum(size) FROM system.filesystem_cache
 32	167243
+ALTER TABLE test_02241 UPDATE value = 'kek' WHERE key = 100
+SELECT count(), sum(size) FROM system.filesystem_cache
 41	250541
+INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)
+SYSTEM FLUSH LOGS
 INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)	0
+SELECT count() FROM test_02241
 5010500
+SELECT count() FROM test_02241 WHERE value LIKE '%010%'
 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 96f61cf61e8..ee1d942a421 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
@@ -10,13 +10,13 @@ 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 "DROP TABLE IF EXISTS test_02241"
-    $CLICKHOUSE_CLIENT --query "CREATE TABLE test_02241 (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, ratio_of_defaults_for_sparse_serialization = 1"
-    $CLICKHOUSE_CLIENT --query "SYSTEM STOP MERGES test_02241"
+    $CLICKHOUSE_CLIENT --echo --query "DROP TABLE IF EXISTS test_02241"
+    $CLICKHOUSE_CLIENT --echo --query "CREATE TABLE test_02241 (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, ratio_of_defaults_for_sparse_serialization = 1"
+    $CLICKHOUSE_CLIENT --echo --query "SYSTEM STOP MERGES test_02241"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE"
+    $CLICKHOUSE_CLIENT --echo --query "SYSTEM DROP FILESYSTEM CACHE"
 
-    $CLICKHOUSE_CLIENT -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
+    $CLICKHOUSE_CLIENT --echo -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
     FROM
     (
         SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
@@ -32,12 +32,12 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     WHERE endsWith(local_path, 'data.bin')
     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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --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 --echo --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 --echo --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)"
 
-    $CLICKHOUSE_CLIENT -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
+    $CLICKHOUSE_CLIENT --echo -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
     FROM
     (
         SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
@@ -53,24 +53,24 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     WHERE endsWith(local_path, 'data.bin')
     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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --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 --echo --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
 
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02241 FORMAT Null"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT * FROM test_02241 FORMAT Null"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
 
-    $CLICKHOUSE_CLIENT --query "SELECT * FROM test_02241 FORMAT Null"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT * FROM test_02241 FORMAT Null"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count() FROM system.filesystem_cache WHERE cache_hits > 0"
 
-    $CLICKHOUSE_CLIENT --query "SELECT count(), sum(size) size FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count(), sum(size) size FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM DROP FILESYSTEM CACHE"
+    $CLICKHOUSE_CLIENT --echo --query "SYSTEM DROP FILESYSTEM CACHE"
 
-    $CLICKHOUSE_CLIENT --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100, 200)"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100, 200)"
 
-    $CLICKHOUSE_CLIENT -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
+    $CLICKHOUSE_CLIENT --echo -n --query "SELECT file_segment_range_begin, file_segment_range_end, size, state
     FROM
     (
         SELECT file_segment_range_begin, file_segment_range_end, size, state, local_path
@@ -86,27 +86,28 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
     WHERE endsWith(local_path, 'data.bin')
     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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --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 --echo --query "SELECT count(), sum(size) 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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --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 --echo --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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(100)"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(300, 10000)"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM START MERGES test_02241"
+    $CLICKHOUSE_CLIENT --echo --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(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --query "OPTIMIZE TABLE test_02241 FINAL"
 
-    $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(), 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 --echo --query "SELECT count(), sum(size) FROM system.filesystem_cache"
 
-    $CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --mutations_sync=2 --query "ALTER TABLE test_02241 UPDATE value = 'kek' WHERE key = 100"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count(), sum(size) FROM system.filesystem_cache"
+    $CLICKHOUSE_CLIENT --echo --enable_filesystem_cache_on_write_operations=1 --query "INSERT INTO test_02241 SELECT number, toString(number) FROM numbers(5000000)"
+
+    $CLICKHOUSE_CLIENT --echo --query "SYSTEM FLUSH LOGS"
 
     $CLICKHOUSE_CLIENT -n --query "SELECT
         query, ProfileEvents['RemoteFSReadBytes'] > 0 as remote_fs_read
@@ -121,6 +122,6 @@ for STORAGE_POLICY in 's3_cache' 'local_cache'; do
         DESC
     LIMIT 1"
 
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM test_02241"
-    $CLICKHOUSE_CLIENT --query "SELECT count() FROM test_02241 WHERE value LIKE '%010%'"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count() FROM test_02241"
+    $CLICKHOUSE_CLIENT --echo --query "SELECT count() FROM test_02241 WHERE value LIKE '%010%'"
 done
diff --git a/tests/queries/0_stateless/02245_parquet_skip_unknown_type.sh b/tests/queries/0_stateless/02245_parquet_skip_unknown_type.sh
index 954e2e83f27..8ff6e28b123 100755
--- a/tests/queries/0_stateless/02245_parquet_skip_unknown_type.sh
+++ b/tests/queries/0_stateless/02245_parquet_skip_unknown_type.sh
@@ -12,6 +12,6 @@ DATA_FILE=$USER_FILES_PATH/$FILE_NAME
 cp $CUR_DIR/data_parquet_bad_column/metadata_0.parquet $DATA_FILE
 
 
-$CLICKHOUSE_CLIENT -q "desc file(test_02245.parquet)" 2>&1 | grep -qF "Cannot extract table structure" && echo "OK" || echo "FAIL"
+$CLICKHOUSE_CLIENT -q "desc file(test_02245.parquet)" 2>&1 | grep -qF "CANNOT_EXTRACT_TABLE_STRUCTURE" && echo "OK" || echo "FAIL"
 $CLICKHOUSE_CLIENT -q "desc file(test_02245.parquet) settings input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference=1"
 $CLICKHOUSE_CLIENT -q "select count(*) from file(test_02245.parquet) settings input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference=1"
diff --git a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
index 1c60e40942c..8ad0a566c62 100644
--- a/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
+++ b/tests/queries/0_stateless/02246_tsv_csv_best_effort_schema_inference.reference
@@ -97,8 +97,8 @@ c1	Array(Nullable(Bool))
 []
 [NULL]
 [false]
-c1	Nullable(String)					
-(1, 2, 3)
+c1	Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64))					
+(1,2,3)
 c1	Nullable(String)					
 123.123
 c1	Array(Tuple(Nullable(Int64), Nullable(Int64), Nullable(Int64)))					
diff --git a/tests/queries/0_stateless/02252_jit_profile_events.sql b/tests/queries/0_stateless/02252_jit_profile_events.sql
index eca3c06f9f1..487f43737e8 100644
--- a/tests/queries/0_stateless/02252_jit_profile_events.sql
+++ b/tests/queries/0_stateless/02252_jit_profile_events.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest, no-ubsan, no-asan, no-msan, no-cpu-aarch64
+-- Tags: no-fasttest, no-parallel, no-msan
 
 SET compile_expressions = 1;
 SET min_count_to_compile_expression = 0;
@@ -19,13 +19,13 @@ SELECT ProfileEvents['CompileFunction'] FROM system.query_log WHERE
 SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
 
-SELECT sum(number), sum(number + 1), sum(number + 2) FROM numbers(1) GROUP BY number;
+SELECT avg(number), avg(number + 1), avg(number + 2) FROM numbers(1) GROUP BY number;
 
 SYSTEM FLUSH LOGS;
 
 SELECT ProfileEvents['CompileFunction'] FROM system.query_log WHERE
     current_database = currentDatabase()
     AND type = 'QueryFinish'
-    AND query == 'SELECT sum(number), sum(number + 1), sum(number + 2) FROM numbers(1) GROUP BY number;'
+    AND query == 'SELECT avg(number), avg(number + 1), avg(number + 2) FROM numbers(1) GROUP BY number;'
     AND event_date >= yesterday() AND event_time > now() - interval 10 minute
     LIMIT 1;
diff --git a/tests/queries/0_stateless/02263_format_insert_settings.reference b/tests/queries/0_stateless/02263_format_insert_settings.reference
index 2bba75f6788..ea8b78faf8c 100644
--- a/tests/queries/0_stateless/02263_format_insert_settings.reference
+++ b/tests/queries/0_stateless/02263_format_insert_settings.reference
@@ -21,10 +21,6 @@ INSERT INTO foo FORMAT Values
 INSERT INTO foo SELECT 1
 [oneline] insert into foo select 1
 INSERT INTO foo SELECT 1
-[multi] insert into foo watch bar
-INSERT INTO foo WATCH bar
-[oneline] insert into foo watch bar
-INSERT INTO foo WATCH bar
 [multi] insert into foo format tsv
 INSERT INTO foo FORMAT tsv
 [oneline] insert into foo format tsv
@@ -41,12 +37,6 @@ SETTINGS max_threads = 1
 SELECT 1
 [oneline] insert into foo settings max_threads=1 select 1
 INSERT INTO foo SETTINGS max_threads = 1 SELECT 1
-[multi] insert into foo settings max_threads=1 watch bar
-INSERT INTO foo
-SETTINGS max_threads = 1
-WATCH bar
-[oneline] insert into foo settings max_threads=1 watch bar
-INSERT INTO foo SETTINGS max_threads = 1 WATCH bar
 [multi] insert into foo settings max_threads=1 format tsv
 INSERT INTO foo
 SETTINGS max_threads = 1
diff --git a/tests/queries/0_stateless/02263_format_insert_settings.sh b/tests/queries/0_stateless/02263_format_insert_settings.sh
index 49aa56d6c0a..808ab23ee59 100755
--- a/tests/queries/0_stateless/02263_format_insert_settings.sh
+++ b/tests/queries/0_stateless/02263_format_insert_settings.sh
@@ -40,12 +40,10 @@ $CLICKHOUSE_CLIENT -q 'drop table data_02263'
 
 run_format_both 'insert into foo values'
 run_format_both 'insert into foo select 1'
-run_format_both 'insert into foo watch bar'
 run_format_both 'insert into foo format tsv'
 
 run_format_both 'insert into foo settings max_threads=1 values'
 run_format_both 'insert into foo settings max_threads=1 select 1'
-run_format_both 'insert into foo settings max_threads=1 watch bar'
 run_format_both 'insert into foo settings max_threads=1 format tsv'
 run_format_both 'insert into foo select 1 settings max_threads=1'
 run_format_both 'insert into foo settings max_threads=1 select 1 settings max_threads=1'
diff --git a/tests/queries/0_stateless/02265_column_ttl.sql b/tests/queries/0_stateless/02265_column_ttl.sql
index 3ab175329bc..16ae2da2a2b 100644
--- a/tests/queries/0_stateless/02265_column_ttl.sql
+++ b/tests/queries/0_stateless/02265_column_ttl.sql
@@ -37,4 +37,4 @@ attach table ttl_02265;
 --
 optimize table ttl_02265 final;
 system flush logs;
-select * from system.part_log where database = currentDatabase() and table like 'ttl_02265%' and error != 0;
+select * from system.part_log where database = currentDatabase() and table like 'ttl_02265%' and error != 0 and errorCodeToName(error) != 'NO_REPLICA_HAS_PART';
diff --git a/tests/queries/0_stateless/02265_rename_join_ordinary_to_atomic.sql b/tests/queries/0_stateless/02265_rename_join_ordinary_to_atomic.sql
index 041cb887647..235fc86f828 100644
--- a/tests/queries/0_stateless/02265_rename_join_ordinary_to_atomic.sql
+++ b/tests/queries/0_stateless/02265_rename_join_ordinary_to_atomic.sql
@@ -1,5 +1,7 @@
 -- Tags: no-parallel
 
+SET send_logs_level = 'fatal';
+
 set allow_deprecated_database_ordinary=1;
 DROP DATABASE IF EXISTS 02265_atomic_db;
 DROP DATABASE IF EXISTS 02265_ordinary_db;
diff --git a/tests/queries/0_stateless/02265_test_dns_profile_events.sh b/tests/queries/0_stateless/02265_test_dns_profile_events.sh
index 756a761a0ae..50fa6ba2cda 100755
--- a/tests/queries/0_stateless/02265_test_dns_profile_events.sh
+++ b/tests/queries/0_stateless/02265_test_dns_profile_events.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
+# Tags: no-parallel, no-fasttest
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02268_json_wrong_root_type_in_schema_inference.sql b/tests/queries/0_stateless/02268_json_wrong_root_type_in_schema_inference.sql
index 5462d38f1a3..98bf29c32f5 100644
--- a/tests/queries/0_stateless/02268_json_wrong_root_type_in_schema_inference.sql
+++ b/tests/queries/0_stateless/02268_json_wrong_root_type_in_schema_inference.sql
@@ -1,7 +1,7 @@
 -- Tags: no-fasttest
 
 insert into function file('02268_data.jsonl', 'TSV') select 1;
-select * from file('02268_data.jsonl'); --{serverError CANNOT_PARSE_INPUT_ASSERTION_FAILED}
+select * from file('02268_data.jsonl'); --{serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 
 insert into function file('02268_data.jsonCompactEachRow', 'TSV') select 1;
-select * from file('02268_data.jsonCompactEachRow'); --{serverError CANNOT_PARSE_INPUT_ASSERTION_FAILED}
+select * from file('02268_data.jsonCompactEachRow'); --{serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
diff --git a/tests/queries/0_stateless/02282_array_distance.reference b/tests/queries/0_stateless/02282_array_distance.reference
index 9758da9a833..c21e294cb62 100644
--- a/tests/queries/0_stateless/02282_array_distance.reference
+++ b/tests/queries/0_stateless/02282_array_distance.reference
@@ -80,3 +80,7 @@ nan
 5	6	268	2	10.234459893824097	23.15167380558045	536	0.00007815428961455151
 6	5	268	2	10.234459893824097	23.15167380558045	536	0.00007815428961455151
 6	6	0	0	0	0	0	0
+5.8309517
+0.0003244877
+5.830951894845301
+0.0003245172890904424
diff --git a/tests/queries/0_stateless/02282_array_distance.sql b/tests/queries/0_stateless/02282_array_distance.sql
index 9c16071dc1f..2cca853fd67 100644
--- a/tests/queries/0_stateless/02282_array_distance.sql
+++ b/tests/queries/0_stateless/02282_array_distance.sql
@@ -12,10 +12,10 @@ SELECT cosineDistance([1, 2, 3], [0, 0, 0]);
 -- Overflows
 WITH CAST([-547274980, 1790553898, 1981517754, 1908431500, 1352428565, -573412550, -552499284, 2096941042], 'Array(Int32)') AS a
 SELECT
-    L1Distance(a,a),
-    L2Distance(a,a),
-    L2SquaredDistance(a,a),
-    LinfDistance(a,a),
+    L1Distance(a, a),
+    L2Distance(a, a),
+    L2SquaredDistance(a, a),
+    LinfDistance(a, a),
     cosineDistance(a, a);
 
 DROP TABLE IF EXISTS vec1;
@@ -88,15 +88,33 @@ SELECT
 FROM vec2f v1, vec2d v2
 WHERE length(v1.v) == length(v2.v);
 
-SELECT L1Distance([0, 0], [1]); -- { serverError 190 }
-SELECT L2Distance([1, 2], (3,4)); -- { serverError 43 }
-SELECT L2SquaredDistance([1, 2], (3,4)); -- { serverError 43 }
-SELECT LpDistance([1, 2], [3,4]); -- { serverError 42 }
-SELECT LpDistance([1, 2], [3,4], -1.); -- { serverError 69 }
-SELECT LpDistance([1, 2], [3,4], 'aaa'); -- { serverError 43 }
-SELECT LpDistance([1, 2], [3,4], materialize(2.7)); -- { serverError 44 }
+SELECT L1Distance([0, 0], [1]); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
+SELECT L2Distance([1, 2], (3,4)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT L2SquaredDistance([1, 2], (3,4)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT LpDistance([1, 2], [3,4]); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT LpDistance([1, 2], [3,4], -1.); -- { serverError ARGUMENT_OUT_OF_BOUND }
+SELECT LpDistance([1, 2], [3,4], 'aaa'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT LpDistance([1, 2], [3,4], materialize(2.7)); -- { serverError ILLEGAL_COLUMN }
 
 DROP TABLE vec1;
 DROP TABLE vec2;
 DROP TABLE vec2f;
 DROP TABLE vec2d;
+
+-- Queries which trigger manually vectorized implementation
+
+SELECT L2Distance(
+    [toFloat32(0.0), toFloat32(1.0), toFloat32(2.0), toFloat32(3.0), toFloat32(4.0), toFloat32(5.0), toFloat32(6.0), toFloat32(7.0), toFloat32(8.0), toFloat32(9.0), toFloat32(10.0), toFloat32(11.0), toFloat32(12.0), toFloat32(13.0), toFloat32(14.0), toFloat32(15.0), toFloat32(16.0), toFloat32(17.0), toFloat32(18.0), toFloat32(19.0), toFloat32(20.0), toFloat32(21.0), toFloat32(22.0), toFloat32(23.0), toFloat32(24.0), toFloat32(25.0), toFloat32(26.0), toFloat32(27.0), toFloat32(28.0), toFloat32(29.0), toFloat32(30.0), toFloat32(31.0), toFloat32(32.0), toFloat32(33.0)],
+    materialize([toFloat32(1.0), toFloat32(2.0), toFloat32(3.0), toFloat32(4.0), toFloat32(5.0), toFloat32(6.0), toFloat32(7.0), toFloat32(8.0), toFloat32(9.0), toFloat32(10.0), toFloat32(11.0), toFloat32(12.0), toFloat32(13.0), toFloat32(14.0), toFloat32(15.0), toFloat32(16.0), toFloat32(17.0), toFloat32(18.0), toFloat32(19.0), toFloat32(20.0), toFloat32(21.0), toFloat32(22.0), toFloat32(23.0), toFloat32(24.0), toFloat32(25.0), toFloat32(26.0), toFloat32(27.0), toFloat32(28.0), toFloat32(29.0), toFloat32(30.0), toFloat32(31.0), toFloat32(32.0), toFloat32(33.0), toFloat32(34.0)]));
+
+SELECT cosineDistance(
+    [toFloat32(0.0), toFloat32(1.0), toFloat32(2.0), toFloat32(3.0), toFloat32(4.0), toFloat32(5.0), toFloat32(6.0), toFloat32(7.0), toFloat32(8.0), toFloat32(9.0), toFloat32(10.0), toFloat32(11.0), toFloat32(12.0), toFloat32(13.0), toFloat32(14.0), toFloat32(15.0), toFloat32(16.0), toFloat32(17.0), toFloat32(18.0), toFloat32(19.0), toFloat32(20.0), toFloat32(21.0), toFloat32(22.0), toFloat32(23.0), toFloat32(24.0), toFloat32(25.0), toFloat32(26.0), toFloat32(27.0), toFloat32(28.0), toFloat32(29.0), toFloat32(30.0), toFloat32(31.0), toFloat32(32.0), toFloat32(33.0)],
+    materialize([toFloat32(1.0), toFloat32(2.0), toFloat32(3.0), toFloat32(4.0), toFloat32(5.0), toFloat32(6.0), toFloat32(7.0), toFloat32(8.0), toFloat32(9.0), toFloat32(10.0), toFloat32(11.0), toFloat32(12.0), toFloat32(13.0), toFloat32(14.0), toFloat32(15.0), toFloat32(16.0), toFloat32(17.0), toFloat32(18.0), toFloat32(19.0), toFloat32(20.0), toFloat32(21.0), toFloat32(22.0), toFloat32(23.0), toFloat32(24.0), toFloat32(25.0), toFloat32(26.0), toFloat32(27.0), toFloat32(28.0), toFloat32(29.0), toFloat32(30.0), toFloat32(31.0), toFloat32(32.0), toFloat32(33.0), toFloat32(34.0)]));
+
+SELECT L2Distance(
+    [toFloat64(0.0), toFloat64(1.0), toFloat64(2.0), toFloat64(3.0), toFloat64(4.0), toFloat64(5.0), toFloat64(6.0), toFloat64(7.0), toFloat64(8.0), toFloat64(9.0), toFloat64(10.0), toFloat64(11.0), toFloat64(12.0), toFloat64(13.0), toFloat64(14.0), toFloat64(15.0), toFloat64(16.0), toFloat64(17.0), toFloat64(18.0), toFloat64(19.0), toFloat64(20.0), toFloat64(21.0), toFloat64(22.0), toFloat64(23.0), toFloat64(24.0), toFloat64(25.0), toFloat64(26.0), toFloat64(27.0), toFloat64(28.0), toFloat64(29.0), toFloat64(30.0), toFloat64(31.0), toFloat64(32.0), toFloat64(33.0)],
+    materialize([toFloat64(1.0), toFloat64(2.0), toFloat64(3.0), toFloat64(4.0), toFloat64(5.0), toFloat64(6.0), toFloat64(7.0), toFloat64(8.0), toFloat64(9.0), toFloat64(10.0), toFloat64(11.0), toFloat64(12.0), toFloat64(13.0), toFloat64(14.0), toFloat64(15.0), toFloat64(16.0), toFloat64(17.0), toFloat64(18.0), toFloat64(19.0), toFloat64(20.0), toFloat64(21.0), toFloat64(22.0), toFloat64(23.0), toFloat64(24.0), toFloat64(25.0), toFloat64(26.0), toFloat64(27.0), toFloat64(28.0), toFloat64(29.0), toFloat64(30.0), toFloat64(31.0), toFloat64(32.0), toFloat64(33.0), toFloat64(34.0)]));
+
+SELECT cosineDistance(
+    [toFloat64(0.0), toFloat64(1.0), toFloat64(2.0), toFloat64(3.0), toFloat64(4.0), toFloat64(5.0), toFloat64(6.0), toFloat64(7.0), toFloat64(8.0), toFloat64(9.0), toFloat64(10.0), toFloat64(11.0), toFloat64(12.0), toFloat64(13.0), toFloat64(14.0), toFloat64(15.0), toFloat64(16.0), toFloat64(17.0), toFloat64(18.0), toFloat64(19.0), toFloat64(20.0), toFloat64(21.0), toFloat64(22.0), toFloat64(23.0), toFloat64(24.0), toFloat64(25.0), toFloat64(26.0), toFloat64(27.0), toFloat64(28.0), toFloat64(29.0), toFloat64(30.0), toFloat64(31.0), toFloat64(32.0), toFloat64(33.0)],
+    materialize([toFloat64(1.0), toFloat64(2.0), toFloat64(3.0), toFloat64(4.0), toFloat64(5.0), toFloat64(6.0), toFloat64(7.0), toFloat64(8.0), toFloat64(9.0), toFloat64(10.0), toFloat64(11.0), toFloat64(12.0), toFloat64(13.0), toFloat64(14.0), toFloat64(15.0), toFloat64(16.0), toFloat64(17.0), toFloat64(18.0), toFloat64(19.0), toFloat64(20.0), toFloat64(21.0), toFloat64(22.0), toFloat64(23.0), toFloat64(24.0), toFloat64(25.0), toFloat64(26.0), toFloat64(27.0), toFloat64(28.0), toFloat64(29.0), toFloat64(30.0), toFloat64(31.0), toFloat64(32.0), toFloat64(33.0), toFloat64(34.0)]));
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 a3711497ae8..2f6167c3ddf 100755
--- a/tests/queries/0_stateless/02286_mysql_dump_input_format.sh
+++ b/tests/queries/0_stateless/02286_mysql_dump_input_format.sh
@@ -23,7 +23,7 @@ $CLICKHOUSE_CLIENT -q "desc file(dump1.sql, MySQLDump) settings input_format_mys
 $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', 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 "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"
diff --git a/tests/queries/0_stateless/02287_type_object_convert.reference b/tests/queries/0_stateless/02287_type_object_convert.reference
index 501536f1f3e..af4407ee052 100644
--- a/tests/queries/0_stateless/02287_type_object_convert.reference
+++ b/tests/queries/0_stateless/02287_type_object_convert.reference
@@ -16,3 +16,4 @@
 {"x":[[],[1,2]]}
 {"x":[[],[[1],[2]]]}
 {"x":[[],[[],[2]]]}
+{"a.a":[[1],[]]}
diff --git a/tests/queries/0_stateless/02287_type_object_convert.sql b/tests/queries/0_stateless/02287_type_object_convert.sql
index 2bc08cf7fe1..21c1aba63d3 100644
--- a/tests/queries/0_stateless/02287_type_object_convert.sql
+++ b/tests/queries/0_stateless/02287_type_object_convert.sql
@@ -32,3 +32,4 @@ SELECT CAST('{"x" : [ 1 , [ 1 , 2] ]}', 'Object(\'json\')');
 SELECT CAST('{"x" : [ {} , [ 1 , 2] ]}', 'Object(\'json\')');
 SELECT CAST('{"x" : [ {} , [ 1 , [2]] ]}', 'Object(\'json\')');
 SELECT CAST('{"x" : [ {} , [ {} , [2]] ]}', 'Object(\'json\')');
+SELECT CAST(' {"a": { "a": [ [1],  null ] } }', 'Object(Nullable(\'json\'))');
diff --git a/tests/queries/0_stateless/02293_formats_json_columns.sh b/tests/queries/0_stateless/02293_formats_json_columns.sh
index ce35c4bd878..4eae5a1abb4 100755
--- a/tests/queries/0_stateless/02293_formats_json_columns.sh
+++ b/tests/queries/0_stateless/02293_formats_json_columns.sh
@@ -88,4 +88,4 @@ echo '
 }
 ' > $DATA_FILE
 
-$CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONColumns) settings input_format_max_rows_to_read_for_schema_inference=3, input_format_json_infer_incomplete_types_as_strings=0" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL'
+$CLICKHOUSE_CLIENT -q "desc file(data_02293, JSONColumns) settings input_format_max_rows_to_read_for_schema_inference=3, input_format_json_infer_incomplete_types_as_strings=0" 2>&1 | grep -F -q 'CANNOT_EXTRACT_TABLE_STRUCTURE' && echo 'OK' || echo 'FAIL'
diff --git a/tests/queries/0_stateless/02294_decimal_second_errors.sql b/tests/queries/0_stateless/02294_decimal_second_errors.sql
index b6059dc3d48..52d2279be41 100644
--- a/tests/queries/0_stateless/02294_decimal_second_errors.sql
+++ b/tests/queries/0_stateless/02294_decimal_second_errors.sql
@@ -4,7 +4,7 @@ SELECT 1 SETTINGS max_execution_time=-Infinity; -- { clientError 72 };
 
 -- Ok values
 SELECT 1 SETTINGS max_execution_time=-0.5;
-SELECT 1 SETTINGS max_execution_time=0.5;
+SELECT 1 SETTINGS max_execution_time=5.5;
 SELECT 1 SETTINGS max_execution_time=-1;
 SELECT 1 SETTINGS max_execution_time=0.0;
 SELECT 1 SETTINGS max_execution_time=-0.0;
diff --git a/tests/queries/0_stateless/02294_system_certificates.reference b/tests/queries/0_stateless/02294_system_certificates.reference
index 4655f996c40..432df9110a2 100644
--- a/tests/queries/0_stateless/02294_system_certificates.reference
+++ b/tests/queries/0_stateless/02294_system_certificates.reference
@@ -1,10 +1,10 @@
-version	Int32					
-serial_number	Nullable(String)					
-signature_algo	Nullable(String)					
-issuer	Nullable(String)					
-not_before	Nullable(String)					
-not_after	Nullable(String)					
-subject	Nullable(String)					
-pkey_algo	Nullable(String)					
-path	String					
-default	UInt8					
+version	Int32			Version of the certificate. Values are 0 for v1, 1 for v2, 2 for v3.		
+serial_number	Nullable(String)			Serial Number of the certificate assigned by the issuer.		
+signature_algo	Nullable(String)			Signature Algorithm - an algorithm used by the issuer to sign this certificate.		
+issuer	Nullable(String)			Issuer - an unique identifier for the Certificate Authority issuing this certificate.		
+not_before	Nullable(String)			The beginning of the time window when this certificate is valid.		
+not_after	Nullable(String)			The end of the time window when this certificate is valid.		
+subject	Nullable(String)			Subject - identifies the owner of the public key.		
+pkey_algo	Nullable(String)			Public Key Algorithm defines the algorithm the public key can be used with.		
+path	String			Path to the file or directory containing this certificate.		
+default	UInt8			Certificate is in the default certificate location.		
diff --git a/tests/queries/0_stateless/02302_s3_file_pruning.sql b/tests/queries/0_stateless/02302_s3_file_pruning.sql
index 93fc8a1bc25..647dfd5e5eb 100644
--- a/tests/queries/0_stateless/02302_s3_file_pruning.sql
+++ b/tests/queries/0_stateless/02302_s3_file_pruning.sql
@@ -1,6 +1,8 @@
 -- Tags: no-parallel, no-fasttest
 -- Tag no-fasttest: Depends on S3
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 -- { echo }
 drop table if exists test_02302;
 create table test_02302 (a UInt64) engine = S3(s3_conn, filename='test_02302_{_partition_id}', format=Parquet) partition by a;
diff --git a/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.reference b/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.reference
index 717484d4670..a257755481e 100644
--- a/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.reference
+++ b/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.reference
@@ -39,7 +39,3 @@ fuzzer issue
 \N
 \N
 \N
-\N
-\N
-\N
-\N
diff --git a/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.sql b/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.sql
index b56ebc2b09d..570fbcde01f 100644
--- a/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.sql
+++ b/tests/queries/0_stateless/02303_cast_nullable_to_custom_types.sql
@@ -24,7 +24,7 @@ select toIPv6OrNull(number % 2 ? '' : NULL) from numbers(2);
 select IPv6StringToNum(number % 2 ? '0000:0000:0000:0000:0000:0000:0000:0000' : NULL) from numbers(2);
 
 select 'fuzzer issue';
-SELECT CAST(if(number % 2, 'truetrue', NULL), 'Nullable(Bool)') FROM numbers(2);
-SELECT CAST(if(number % 2, 'falsefalse', NULL), 'Nullable(Bool)') FROM numbers(2);
+SELECT CAST(if(number % 2, 'truetrue', NULL), 'Nullable(Bool)') FROM numbers(2); -- {serverError CANNOT_PARSE_BOOL}
+SELECT CAST(if(number % 2, 'falsefalse', NULL), 'Nullable(Bool)') FROM numbers(2); -- {serverError CANNOT_PARSE_BOOL}
 SELECT accurateCastOrNull(if(number % 2, NULL, 'truex'), 'Bool') FROM numbers(4);
 SELECT accurateCastOrNull(if(number % 2, 'truex', NULL), 'Bool') FROM numbers(4);
diff --git a/tests/queries/0_stateless/02303_query_kind.reference b/tests/queries/0_stateless/02303_query_kind.reference
index 53a0df682b2..9f1c026f889 100644
--- a/tests/queries/0_stateless/02303_query_kind.reference
+++ b/tests/queries/0_stateless/02303_query_kind.reference
@@ -20,17 +20,17 @@ clickhouse-client --allow_experimental_analyzer=1 --query_kind initial_query -q
 Expression ((Project names + Projection))
 Header: dummy String
   Aggregating
-  Header: toString(__table1.dummy) String
+  Header: __table1.dummy UInt8
     Expression ((Before GROUP BY + Change column names to column identifiers))
-    Header: toString(__table1.dummy) String
+    Header: __table1.dummy UInt8
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
 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(__table1.dummy) String
+  Header: __table1.dummy UInt8
     Expression ((Before GROUP BY + Change column names to column identifiers))
-    Header: toString(__table1.dummy) String
+    Header: __table1.dummy UInt8
       ReadFromStorage (SystemOne)
       Header: dummy UInt8
diff --git a/tests/queries/0_stateless/02310_clickhouse_client_INSERT_progress_profile_events.expect b/tests/queries/0_stateless/02310_clickhouse_client_INSERT_progress_profile_events.expect
index 9f6937cf80d..e9b83d6c65a 100755
--- a/tests/queries/0_stateless/02310_clickhouse_client_INSERT_progress_profile_events.expect
+++ b/tests/queries/0_stateless/02310_clickhouse_client_INSERT_progress_profile_events.expect
@@ -8,7 +8,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02310_clickhouse_local_INSERT_progress_profile_events.expect b/tests/queries/0_stateless/02310_clickhouse_local_INSERT_progress_profile_events.expect
index 5e514cd7c12..bde00b306cf 100755
--- a/tests/queries/0_stateless/02310_clickhouse_local_INSERT_progress_profile_events.expect
+++ b/tests/queries/0_stateless/02310_clickhouse_local_INSERT_progress_profile_events.expect
@@ -8,7 +8,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
index 69571551c2b..85e8a802bdc 100644
--- a/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
+++ b/tests/queries/0_stateless/02317_distinct_in_order_optimization_explain.reference
@@ -56,6 +56,7 @@ algorithm: Thread
 Sorting (Stream): a ASC, b ASC
 Sorting (Stream): a ASC, b ASC
 Sorting (Stream): a ASC, b ASC
+Sorting (Stream): a ASC, b ASC
 -- check that reading in order optimization for ORDER BY and DISTINCT applied correctly in the same query
 -- disabled, check that sorting description for ReadFromMergeTree match ORDER BY columns
 Sorting (Stream): a ASC
diff --git a/tests/queries/0_stateless/02322_sql_insert_format.sql b/tests/queries/0_stateless/02322_sql_insert_format.sql
index 34cde1e56b6..ccceaee31d9 100644
--- a/tests/queries/0_stateless/02322_sql_insert_format.sql
+++ b/tests/queries/0_stateless/02322_sql_insert_format.sql
@@ -1,5 +1,7 @@
 -- Tags: no-parallel
 
+set schema_inference_use_cache_for_file=0;
+
 select number as x, number % 3 as y, 'Hello' as z from numbers(5) format SQLInsert;
 select number as x, number % 3 as y, 'Hello' as z from numbers(5) format SQLInsert settings output_format_sql_insert_max_batch_size=1;
 select number as x, number % 3 as y, 'Hello' as z from numbers(5) format SQLInsert settings output_format_sql_insert_max_batch_size=2;
diff --git a/tests/queries/0_stateless/02326_settings_changes_system_table.reference b/tests/queries/0_stateless/02326_settings_changes_system_table.reference
index 1c8c4fa1880..946b2727d30 100644
--- a/tests/queries/0_stateless/02326_settings_changes_system_table.reference
+++ b/tests/queries/0_stateless/02326_settings_changes_system_table.reference
@@ -1,3 +1,3 @@
-version	String					
-changes	Array(Tuple(\n    name String,\n    previous_value String,\n    new_value String,\n    reason String))					
+version	String			The ClickHouse server version.		
+changes	Array(Tuple(\n    name String,\n    previous_value String,\n    new_value String,\n    reason String))			The list of changes in settings which changed the behaviour of ClickHouse.		
 22.5	[('memory_overcommit_ratio_denominator','0','1073741824','Enable memory overcommit feature by default'),('memory_overcommit_ratio_denominator_for_user','0','1073741824','Enable memory overcommit feature by default')]
diff --git a/tests/queries/0_stateless/02327_capnproto_protobuf_empty_messages.sh b/tests/queries/0_stateless/02327_capnproto_protobuf_empty_messages.sh
index dfc0dedeaf1..650faf6985e 100755
--- a/tests/queries/0_stateless/02327_capnproto_protobuf_empty_messages.sh
+++ b/tests/queries/0_stateless/02327_capnproto_protobuf_empty_messages.sh
@@ -15,11 +15,11 @@ mkdir -p $SCHEMADIR/$SERVER_SCHEMADIR
 cp -r $CLIENT_SCHEMADIR/02327_* $SCHEMADIR/$SERVER_SCHEMADIR/
 
 
-$CLICKHOUSE_CLIENT --query="desc file(data.pb) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL';
-$CLICKHOUSE_CLIENT --query="desc file(data.capnp) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="desc file(data.pb) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'The table structure cannot be extracted' && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="desc file(data.capnp) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'The table structure cannot be extracted' && echo 'OK' || echo 'FAIL';
 
-$CLICKHOUSE_CLIENT --query="create table test_protobuf engine=File(Protobuf) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL';
-$CLICKHOUSE_CLIENT --query="create table test_capnp engine=File(CapnProto) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'Cannot extract table structure' && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="create table test_protobuf engine=File(Protobuf) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'The table structure cannot be extracted' && echo 'OK' || echo 'FAIL';
+$CLICKHOUSE_CLIENT --query="create table test_capnp engine=File(CapnProto) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty'" 2>&1 | grep -F -q 'The table structure cannot be extracted' && echo 'OK' || echo 'FAIL';
 
 $CLICKHOUSE_CLIENT --query="desc file(data.pb) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty', input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference=1";
 $CLICKHOUSE_CLIENT --query="desc file(data.capnp) settings format_schema='$SERVER_SCHEMADIR/02327_schema:MessageWithEmpty', input_format_capn_proto_skip_fields_with_unsupported_types_in_schema_inference=1";
diff --git a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
index 0ceed178865..a4a69f4fa40 100644
--- a/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
+++ b/tests/queries/0_stateless/02327_try_infer_integers_schema_inference.sql
@@ -1,6 +1,7 @@
 -- Tags: no-fasttest
 
 set input_format_try_infer_integers=1;
+set input_format_try_infer_exponent_floats=1;
 
 select 'JSONEachRow';
 desc format(JSONEachRow, '{"x" : 123}');
diff --git a/tests/queries/0_stateless/02340_parts_refcnt_mergetree.sh b/tests/queries/0_stateless/02340_parts_refcnt_mergetree.sh
index 9ea924377b2..208a9038681 100755
--- a/tests/queries/0_stateless/02340_parts_refcnt_mergetree.sh
+++ b/tests/queries/0_stateless/02340_parts_refcnt_mergetree.sh
@@ -15,11 +15,13 @@ function check_refcnt_for_table()
     local query_id
     query_id="$table-$(random_str 10)"
 
+    SETTINGS="--format Null --max_threads 1 --max_block_size 1  --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability 0.0"
+
     # Notes:
     # - query may sleep 1*(200/4)=50 seconds maximum, it is enough to check system.parts
     # - "part = 1" condition should prune all parts except first
     # - max_block_size=1 with index_granularity=1 will allow to cancel the query earlier
-    $CLICKHOUSE_CLIENT --format Null --max_threads 1 --max_block_size 1 --query_id "$query_id" -q "select sleepEachRow(1) from $table where part = 1" &
+    $CLICKHOUSE_CLIENT $SETTINGS --query_id "$query_id" -q "select sleepEachRow(1) from $table where part = 1" &
     PID=$!
 
     # wait for query to be started
diff --git a/tests/queries/0_stateless/02343_aggregation_pipeline.sql b/tests/queries/0_stateless/02343_aggregation_pipeline.sql
index 496379f5c48..d73ac66763e 100644
--- a/tests/queries/0_stateless/02343_aggregation_pipeline.sql
+++ b/tests/queries/0_stateless/02343_aggregation_pipeline.sql
@@ -2,6 +2,7 @@
 
 -- produces different pipeline if enabled
 set enable_memory_bound_merging_of_aggregation_results = 0;
+set merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
 
 set max_threads = 16;
 set prefer_localhost_replica = 1;
diff --git a/tests/queries/0_stateless/02343_analyzer_lambdas.reference b/tests/queries/0_stateless/02343_analyzer_lambdas.reference
index 8d29481c255..62d9e9f4726 100644
--- a/tests/queries/0_stateless/02343_analyzer_lambdas.reference
+++ b/tests/queries/0_stateless/02343_analyzer_lambdas.reference
@@ -27,3 +27,11 @@ Lambda untuple
 Lambda carrying
 2	1
 1	0
+Lambda legacy syntax
+[2,3,4]
+[2,3,4]
+[2,3,4]
+['hello','world']
+[2,3,4]
+[2,3,4]	2
+[2,3,4]	2	1
diff --git a/tests/queries/0_stateless/02343_analyzer_lambdas.sql b/tests/queries/0_stateless/02343_analyzer_lambdas.sql
index b90f7b32b57..0c257cf6f18 100644
--- a/tests/queries/0_stateless/02343_analyzer_lambdas.sql
+++ b/tests/queries/0_stateless/02343_analyzer_lambdas.sql
@@ -65,5 +65,31 @@ SELECT 'Lambda carrying';
 WITH (functor, x) -> functor(x) AS lambda, x -> x + 1 AS functor_1, x -> toString(x) AS functor_2 SELECT lambda(functor_1, 1), lambda(functor_2, 1);
 WITH (functor, x) -> functor(x) AS lambda, x -> x + 1 AS functor_1, x -> toString(x) AS functor_2 SELECT lambda(functor_1, id), lambda(functor_2, id) FROM test_table;
 
+
+SELECT 'Lambda legacy syntax';
+
+SELECT arrayMap(lambda(tuple(x), x + 1), [1, 2, 3]);
+
+WITH 222 AS lambda
+SELECT arrayMap(lambda(tuple(x), x + 1), [1, 2, 3]);
+
+SELECT arrayMap(lambda((x,), x + 1), [1, 2, 3]);
+
+SELECT arraySort(lambda((x, y), y), ['world', 'hello'], [2, 1]);
+
+WITH 222 AS lambda
+SELECT arrayMap(lambda((x, ), x + 1), [1, 2, 3]);
+
+WITH x -> x + 1 AS lambda
+SELECT arrayMap(lambda(tuple(x), x + 1), [1, 2, 3]), lambda(1);
+
+-- lambda(tuple(x), x + 1) parsed as lambda definion but not as call of lambda defined in WITH
+WITH (x, y) -> y AS lambda
+SELECT arrayMap(lambda(tuple(x), x + 1), [1, 2, 3]), lambda(tuple(x), x + 1), 1 AS x; -- { serverError BAD_ARGUMENTS }
+
+WITH (x, y) -> y AS lambda2
+SELECT arrayMap(lambda(tuple(x), x + 1), [1, 2, 3]), lambda2(tuple(x), x + 1), 1 AS x;
+
+
 DROP TABLE test_table_tuple;
 DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02343_create_empty_as_select.reference b/tests/queries/0_stateless/02343_create_empty_as_select.reference
index 3b0d34c5863..8a21a716bd1 100644
--- a/tests/queries/0_stateless/02343_create_empty_as_select.reference
+++ b/tests/queries/0_stateless/02343_create_empty_as_select.reference
@@ -1,4 +1,4 @@
 CREATE TABLE default.t\n(\n    `1` UInt8\n)\nENGINE = Memory
 0
-CREATE MATERIALIZED VIEW default.mv\n(\n    `1` UInt8\n)\nENGINE = Memory AS\nSELECT 1
+CREATE MATERIALIZED VIEW default.mv\n(\n    `1` UInt8\n)\nENGINE = Memory\nAS SELECT 1
 0
diff --git a/tests/queries/0_stateless/02346_inverted_index_mutation.reference b/tests/queries/0_stateless/02346_inverted_index_bug47393.reference
similarity index 100%
rename from tests/queries/0_stateless/02346_inverted_index_mutation.reference
rename to tests/queries/0_stateless/02346_inverted_index_bug47393.reference
diff --git a/tests/queries/0_stateless/02346_inverted_index_bug47393.sql b/tests/queries/0_stateless/02346_inverted_index_bug47393.sql
new file mode 100644
index 00000000000..166e051b120
--- /dev/null
+++ b/tests/queries/0_stateless/02346_inverted_index_bug47393.sql
@@ -0,0 +1,25 @@
+SET allow_experimental_inverted_index = 1;
+
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab
+(
+    id UInt64,
+    str String,
+    INDEX idx str TYPE inverted(3) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY tuple()
+SETTINGS min_rows_for_wide_part = 1, min_bytes_for_wide_part = 1;
+
+INSERT INTO tab (str) VALUES ('I am inverted');
+
+SELECT data_version FROM system.parts WHERE database = currentDatabase() AND table = 'tab' AND active = 1;
+
+-- update column synchronously
+ALTER TABLE tab UPDATE str = 'I am not inverted' WHERE 1 SETTINGS mutations_sync=1;
+
+SELECT data_version FROM system.parts WHERE database = currentDatabase() AND table = 'tab' AND active = 1;
+
+SELECT str FROM tab WHERE str LIKE '%inverted%' SETTINGS force_data_skipping_indices = 'idx';
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02346_inverted_index_bug52019.reference b/tests/queries/0_stateless/02346_inverted_index_bug52019.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02862_index_inverted_incorrect_args.sql b/tests/queries/0_stateless/02346_inverted_index_bug52019.sql
similarity index 62%
rename from tests/queries/0_stateless/02862_index_inverted_incorrect_args.sql
rename to tests/queries/0_stateless/02346_inverted_index_bug52019.sql
index 7ba122a7155..c61e17d9cea 100644
--- a/tests/queries/0_stateless/02862_index_inverted_incorrect_args.sql
+++ b/tests/queries/0_stateless/02346_inverted_index_bug52019.sql
@@ -1,9 +1,20 @@
--- https://github.com/ClickHouse/ClickHouse/issues/52019
-DROP TABLE IF EXISTS tab;
+-- Test for Bug 52019: Undefined behavior
+
 SET allow_experimental_inverted_index=1;
-CREATE TABLE tab (`k` UInt64, `s` Map(String, String), INDEX af mapKeys(s) TYPE inverted(2) GRANULARITY 1) ENGINE = MergeTree ORDER BY k SETTINGS index_granularity = 2, index_granularity_bytes = '10Mi';
+
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab (
+    k UInt64,
+    s Map(String, String),
+    INDEX idx mapKeys(s) TYPE inverted(2) GRANULARITY 1)
+ENGINE = MergeTree
+ORDER BY k
+SETTINGS index_granularity = 2, index_granularity_bytes = '10Mi';
+
 INSERT INTO tab (k) VALUES (0);
 SELECT * FROM tab PREWHERE (s[NULL]) = 'Click a03' SETTINGS allow_experimental_analyzer=1;
 SELECT * FROM tab PREWHERE (s[1]) = 'Click a03' SETTINGS allow_experimental_analyzer=1; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 SELECT * FROM tab PREWHERE (s['foo']) = 'Click a03' SETTINGS allow_experimental_analyzer=1;
+
 DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02346_inverted_index_bug59039.reference b/tests/queries/0_stateless/02346_inverted_index_bug59039.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02346_inverted_index_bug59039.sql b/tests/queries/0_stateless/02346_inverted_index_bug59039.sql
new file mode 100644
index 00000000000..0ef0cb0c733
--- /dev/null
+++ b/tests/queries/0_stateless/02346_inverted_index_bug59039.sql
@@ -0,0 +1,20 @@
+-- This is supposed to test that DROP INDEX removes all index related files. Can't test this directly but at least run the statement and
+-- check that no bad things happen.
+
+SET allow_experimental_inverted_index = 1;
+
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab
+(
+    id UInt64,
+    doc String,
+    INDEX text_idx doc TYPE inverted
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity = 2, index_granularity_bytes = '10Mi', min_bytes_for_wide_part = 0, min_rows_for_wide_part = 0;
+
+ALTER TABLE tab DROP INDEX text_idx;
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02346_inverted_index_detach_attach.reference b/tests/queries/0_stateless/02346_inverted_index_detach_attach.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/02346_inverted_index_detach_attach.sql
similarity index 75%
rename from tests/queries/0_stateless/02696_inverted_idx_checksums.sql
rename to tests/queries/0_stateless/02346_inverted_index_detach_attach.sql
index 92ffa7a6196..762d78922fe 100644
--- a/tests/queries/0_stateless/02696_inverted_idx_checksums.sql
+++ b/tests/queries/0_stateless/02346_inverted_index_detach_attach.sql
@@ -2,8 +2,8 @@ SET allow_experimental_inverted_index = 1;
 
 CREATE TABLE t
 (
-    `key` UInt64,
-    `str` String,
+    key UInt64,
+    str String,
     INDEX inv_idx str TYPE inverted(0) GRANULARITY 1
 )
 ENGINE = MergeTree
@@ -13,4 +13,4 @@ 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
+ALTER TABLE t ATTACH PART 'all_1_1_0';
diff --git a/tests/queries/0_stateless/02346_inverted_index_experimental_flag.reference b/tests/queries/0_stateless/02346_inverted_index_experimental_flag.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02895_forbid_create_inverted_index.sql b/tests/queries/0_stateless/02346_inverted_index_experimental_flag.sql
similarity index 72%
rename from tests/queries/0_stateless/02895_forbid_create_inverted_index.sql
rename to tests/queries/0_stateless/02346_inverted_index_experimental_flag.sql
index dc92d9198fb..bf89265372e 100644
--- a/tests/queries/0_stateless/02895_forbid_create_inverted_index.sql
+++ b/tests/queries/0_stateless/02346_inverted_index_experimental_flag.sql
@@ -1,4 +1,7 @@
+-- Tests that the inverted index can only be supported when allow_experimental_inverted_index = 1.
+
 SET allow_experimental_inverted_index = 0;
+
 DROP TABLE IF EXISTS tab;
 CREATE TABLE tab
 (
diff --git a/tests/queries/0_stateless/02346_inverted_index_match_predicate.reference b/tests/queries/0_stateless/02346_inverted_index_match_predicate.reference
new file mode 100644
index 00000000000..84fc422379c
--- /dev/null
+++ b/tests/queries/0_stateless/02346_inverted_index_match_predicate.reference
@@ -0,0 +1,20 @@
+1	Hello ClickHouse
+2	Hello World
+            Granules: 6/6
+            Granules: 2/6
+            Granules: 6/6
+            Granules: 2/6
+---
+1	Hello ClickHouse
+2	Hello World
+6	World Champion
+            Granules: 6/6
+            Granules: 3/6
+            Granules: 6/6
+            Granules: 3/6
+---
+5	OLAP Database
+            Granules: 6/6
+            Granules: 1/6
+            Granules: 6/6
+            Granules: 1/6
diff --git a/tests/queries/0_stateless/02346_inverted_index_match_predicate.sql b/tests/queries/0_stateless/02346_inverted_index_match_predicate.sql
new file mode 100644
index 00000000000..99405c0acf2
--- /dev/null
+++ b/tests/queries/0_stateless/02346_inverted_index_match_predicate.sql
@@ -0,0 +1,107 @@
+-- Tests that match() utilizes the inverted index
+
+SET allow_experimental_inverted_index = true;
+
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab
+(
+    id UInt32,
+    str String,
+    INDEX inv_idx(str) TYPE inverted(0) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS index_granularity = 1;
+
+INSERT INTO tab VALUES (1, 'Hello ClickHouse'), (2, 'Hello World'), (3, 'Good Weather'), (4, 'Say Hello'), (5, 'OLAP Database'), (6, 'World Champion');
+
+SELECT * FROM tab WHERE match(str, 'Hello (ClickHouse|World)') ORDER BY id;
+
+-- Read 2/6 granules
+-- Required string: 'Hello '
+-- Alternatives: 'Hello ClickHouse', 'Hello World'
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes=1
+    SELECT * FROM tab WHERE match(str, 'Hello (ClickHouse|World)') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 0;
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes=1
+    SELECT * FROM tab WHERE match(str, 'Hello (ClickHouse|World)') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 1;
+
+SELECT '---';
+
+SELECT * FROM tab WHERE match(str, '.*(ClickHouse|World)') ORDER BY id;
+
+-- Read 3/6 granules
+-- Required string: -
+-- Alternatives: 'ClickHouse', 'World'
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes = 1
+    SELECT * FROM tab WHERE match(str, '.*(ClickHouse|World)') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 0;
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes = 1
+    SELECT * FROM tab WHERE match(str, '.*(ClickHouse|World)') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 1;
+
+SELECT '---';
+
+SELECT * FROM tab WHERE match(str, 'OLAP.*') ORDER BY id;
+
+-- Read 1/6 granules
+-- Required string: 'OLAP'
+-- Alternatives: -
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes = 1
+    SELECT * FROM tab WHERE match(str, 'OLAP (.*?)*') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 0;
+
+SELECT *
+FROM
+(
+    EXPLAIN PLAN indexes = 1
+    SELECT * FROM tab WHERE match(str, 'OLAP (.*?)*') ORDER BY id
+)
+WHERE
+    explain LIKE '%Granules: %'
+SETTINGS
+    allow_experimental_analyzer = 1;
+
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02346_inverted_index_mutation.sql b/tests/queries/0_stateless/02346_inverted_index_mutation.sql
deleted file mode 100644
index 83b73807cd7..00000000000
--- a/tests/queries/0_stateless/02346_inverted_index_mutation.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-SET allow_experimental_inverted_index=1;
-
-DROP TABLE IF EXISTS t;
-CREATE TABLE t
-(
-    `timestamp` UInt64,
-    `s` String,
-    INDEX idx s TYPE inverted(3) GRANULARITY 1
-)
-ENGINE = MergeTree
-ORDER BY tuple()
-SETTINGS min_rows_for_wide_part = 1, min_bytes_for_wide_part = 1;
-
-INSERT INTO t (s) VALUES ('I am inverted');
-
-SELECT data_version FROM system.parts WHERE database=currentDatabase() AND table='t' AND active=1;
-
--- do update column synchronously
-ALTER TABLE t UPDATE s='I am not inverted' WHERE 1 SETTINGS mutations_sync=1;
-
-SELECT data_version FROM system.parts WHERE database=currentDatabase() AND table='t' AND active=1;
-
-SELECT s FROM t WHERE s LIKE '%inverted%' SETTINGS force_data_skipping_indices='idx';
-
-DROP TABLE t;
diff --git a/tests/queries/0_stateless/02346_full_text_search.reference b/tests/queries/0_stateless/02346_inverted_index_search.reference
similarity index 100%
rename from tests/queries/0_stateless/02346_full_text_search.reference
rename to tests/queries/0_stateless/02346_inverted_index_search.reference
diff --git a/tests/queries/0_stateless/02346_full_text_search.sql b/tests/queries/0_stateless/02346_inverted_index_search.sql
similarity index 80%
rename from tests/queries/0_stateless/02346_full_text_search.sql
rename to tests/queries/0_stateless/02346_inverted_index_search.sql
index be56f24d5da..052703dceaf 100644
--- a/tests/queries/0_stateless/02346_full_text_search.sql
+++ b/tests/queries/0_stateless/02346_inverted_index_search.sql
@@ -1,5 +1,6 @@
 SET allow_experimental_inverted_index = 1;
 SET log_queries = 1;
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
 
 ----------------------------------------------------
 SELECT 'Test inverted(2)';
@@ -23,7 +24,7 @@ SELECT * FROM tab WHERE s == 'Alick a01';
 
 -- check the query only read 1 granules (2 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==2 from system.query_log 
+SELECT read_rows==2 from system.query_log
         WHERE query_kind ='Select'
             AND current_database = currentDatabase()
             AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s == \'Alick a01\';')
@@ -36,7 +37,7 @@ SELECT * FROM tab WHERE s LIKE '%01%' ORDER BY k;
 
 -- check the query only read 2 granules (4 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==4 from system.query_log 
+SELECT read_rows==4 from system.query_log
         WHERE query_kind ='Select'
             AND current_database = currentDatabase()
             AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s LIKE \'%01%\' ORDER BY k;')
@@ -49,11 +50,11 @@ SELECT * FROM tab WHERE hasToken(s, 'Click') ORDER BY k;
 
 -- check the query only read 4 granules (8 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==8 from system.query_log 
+SELECT read_rows==8 from system.query_log
         WHERE query_kind ='Select'
             AND current_database = currentDatabase()
             AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE hasToken(s, \'Click\') ORDER BY k;')
-            AND type='QueryFinish' 
+            AND type='QueryFinish'
             AND result_rows==4
         LIMIT 1;
 
@@ -76,11 +77,11 @@ SELECT * FROM tab_x WHERE hasToken(s, 'Alick') ORDER BY k;
 
 -- check the query only read 4 granules (8 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==8 from system.query_log 
+SELECT read_rows==8 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE hasToken(s, \'Alick\');') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE hasToken(s, \'Alick\');')
+        AND type='QueryFinish'
         AND result_rows==4
     LIMIT 1;
 
@@ -89,24 +90,24 @@ SELECT * FROM tab_x WHERE s IN ('Alick a01', 'Alick a06') ORDER BY k;
 
 -- check the query only read 2 granules (4 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==4 from system.query_log 
+SELECT read_rows==4 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE s IN (\'Alick a01\', \'Alick a06\') ORDER BY k;') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE s IN (\'Alick a01\', \'Alick a06\') ORDER BY k;')
+        AND type='QueryFinish'
         AND result_rows==2
     LIMIT 1;
 
--- search inverted index with multiSearch        
+-- search inverted index with multiSearch
 SELECT * FROM tab_x WHERE multiSearchAny(s, ['a01', 'b01']) ORDER BY k;
 
 -- check the query only read 2 granules (4 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==4 from system.query_log 
+SELECT read_rows==4 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE multiSearchAny(s, [\'a01\', \'b01\']) ORDER BY k;') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab_x WHERE multiSearchAny(s, [\'a01\', \'b01\']) ORDER BY k;')
+        AND type='QueryFinish'
         AND result_rows==2
     LIMIT 1;
 
@@ -129,11 +130,11 @@ SELECT * FROM tab WHERE has(s, 'Click a03') ORDER BY k;
 
 -- check the query must read all 10 granules (20 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==2 from system.query_log 
+SELECT read_rows==2 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE has(s, \'Click a03\') ORDER BY k;') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE has(s, \'Click a03\') ORDER BY k;')
+        AND type='QueryFinish'
         AND result_rows==1
     LIMIT 1;
 
@@ -156,11 +157,11 @@ SELECT * FROM tab WHERE mapContains(s, 'Click') ORDER BY k;
 
 -- check the query must read all 4 granules (8 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==8 from system.query_log 
+SELECT read_rows==8 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE mapContains(s, \'Click\') ORDER BY k;') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE mapContains(s, \'Click\') ORDER BY k;')
+        AND type='QueryFinish'
         AND result_rows==4
     LIMIT 1;
 
@@ -169,11 +170,11 @@ SELECT * FROM tab WHERE s['Click'] = 'Click a03';
 
 -- check the query must read all 4 granules (8 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==8 from system.query_log 
+SELECT read_rows==8 from system.query_log
     WHERE query_kind ='Select'
         AND current_database = currentDatabase()
-        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s[\'Click\'] = \'Click a03\';') 
-        AND type='QueryFinish' 
+        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s[\'Click\'] = \'Click a03\';')
+        AND type='QueryFinish'
         AND result_rows==1
     LIMIT 1;
 
@@ -199,10 +200,10 @@ SELECT * FROM tab WHERE s LIKE '%01%' ORDER BY k;
 -- check the query only read 3 granules (6 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
 SELECT read_rows==6 from system.query_log
-    WHERE query_kind ='Select' 
+    WHERE query_kind ='Select'
         AND current_database = currentDatabase()
         AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s LIKE \'%01%\' ORDER BY k;')
-        AND type='QueryFinish' 
+        AND type='QueryFinish'
         AND result_rows==3
     LIMIT 1;
 
@@ -226,11 +227,11 @@ SELECT * FROM tab WHERE s LIKE '%你好%' ORDER BY k;
 
 -- check the query only read 1 granule (2 rows total; each granule has 2 rows)
 SYSTEM FLUSH LOGS;
-SELECT read_rows==2 from system.query_log 
-    WHERE query_kind ='Select' 
-        AND current_database = currentDatabase()    
-        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s LIKE \'%你好%\' ORDER BY k;') 
-        AND type='QueryFinish' 
+SELECT read_rows==2 from system.query_log
+    WHERE query_kind ='Select'
+        AND current_database = currentDatabase()
+        AND endsWith(trimRight(query), 'SELECT * FROM tab WHERE s LIKE \'%你好%\' ORDER BY k;')
+        AND type='QueryFinish'
         AND result_rows==1
     LIMIT 1;
 
@@ -243,40 +244,6 @@ CREATE TABLE tab (row_id UInt32, str String, INDEX idx str TYPE inverted) ENGINE
 INSERT INTO tab VALUES (0, 'a');
 SELECT * FROM tab WHERE str == 'b' AND 1.0;
 
-
--- Tests with parameter max_digestion_size_per_segment are flaky in CI, not clear why --> comment out for the time being:
-
--- ----------------------------------------------------
--- 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 max_rows_per_postings_list';
 DROP TABLE IF EXISTS tab;
 -- create table 'tab' with inverted index parameter (ngrams, max_rows_per_most_list) which is (0, 10240)
diff --git a/tests/queries/0_stateless/02346_non_negative_derivative.reference b/tests/queries/0_stateless/02346_non_negative_derivative.reference
index b81af45962e..22e5f609ad7 100644
--- a/tests/queries/0_stateless/02346_non_negative_derivative.reference
+++ b/tests/queries/0_stateless/02346_non_negative_derivative.reference
@@ -1,63 +1,63 @@
 1
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	340.00000000000006
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.20550000000000002
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	0.0000010200000000000004
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	6.165000000000001e-10
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	0.00136
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	8.22e-7
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	1.7000000000000004
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	0.0010275000000000002
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	2040.0000000000005
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1.233
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	142800.00000000003
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	86.31
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	9792000.000000002
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	5918.400000000001
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	264384000.00000003
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	159796.80000000002
 1979-12-12 21:21:23.000	1.54	0
-1979-12-12 21:21:21.127	3.7	0
-2299-12-31 23:37:36.788	1.1	0
-2299-12-31 23:37:36.789	2.34	0
+1979-12-12 21:21:21.123	1.1	0
+1979-12-12 21:21:21.123	2.34	0
+1979-12-12 21:21:21.127	3.7	2056320000.0000002
 1979-12-12 21:21:21.129	2.1	0
 1979-12-12 21:21:22.000	1.3345	0
 1979-12-12 21:21:23.000	1.54	1242864
diff --git a/tests/queries/0_stateless/02346_non_negative_derivative.sql b/tests/queries/0_stateless/02346_non_negative_derivative.sql
index 265a8afb2cb..704241da16c 100644
--- a/tests/queries/0_stateless/02346_non_negative_derivative.sql
+++ b/tests/queries/0_stateless/02346_non_negative_derivative.sql
@@ -18,7 +18,7 @@ SELECT (
            SELECT
                ts,
                metric,
-               nonNegativeDerivative(metric, ts) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv
+               nonNegativeDerivative(metric, ts) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv
            FROM nnd
            LIMIT 5, 1
        ) = (
@@ -29,37 +29,37 @@ SELECT (
            FROM nnd
            LIMIT 5, 1
        );
-SELECT ts, metric, nonNegativeDerivative(metric, ts) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
 -- Nanosecond
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 3 NANOSECOND) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 2 PRECEDING AND 2 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 3 NANOSECOND) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 2 PRECEDING AND 2 FOLLOWING) AS deriv FROM nnd;
 -- Microsecond
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 4 MICROSECOND) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 4 MICROSECOND) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
 -- Millisecond
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 5 MILLISECOND) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 5 MILLISECOND) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS deriv FROM nnd;
 -- Second
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 6 SECOND) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 6 SECOND) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
 -- Minute
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 7 MINUTE) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND 2 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 7 MINUTE) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND 2 FOLLOWING) AS deriv FROM nnd;
 -- Hour
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 8 HOUR) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 8 HOUR) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
 -- Day
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 9 DAY) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 3 PRECEDING AND 3 FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 9 DAY) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 3 PRECEDING AND 3 FOLLOWING) AS deriv FROM nnd;
 -- Week
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 10 WEEK) OVER (PARTITION BY id>3 ORDER BY ts ASC Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 10 WEEK) OVER (PARTITION BY id>3 ORDER BY ts, metric ASC Rows BETWEEN 1 PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd;
 
 -- shall not work for month, quarter, year (intervals with floating number of seconds)
 -- Month
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 11 MONTH) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 11 MONTH) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 -- Quarter
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 12 QUARTER) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 12 QUARTER) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 -- Year
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 13 YEAR) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 13 YEAR) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
 
 -- test against wrong arguments/types
-SELECT ts, metric, nonNegativeDerivative(metric, 1, INTERVAL 3 NANOSECOND) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
-SELECT ts, metric, nonNegativeDerivative('string not datetime', ts, INTERVAL 3 NANOSECOND) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
-SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 3 NANOSECOND, id) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
-SELECT ts, metric, nonNegativeDerivative(metric) OVER (PARTITION BY metric ORDER BY ts ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
+SELECT ts, metric, nonNegativeDerivative(metric, 1, INTERVAL 3 NANOSECOND) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
+SELECT ts, metric, nonNegativeDerivative('string not datetime', ts, INTERVAL 3 NANOSECOND) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
+SELECT ts, metric, nonNegativeDerivative(metric, ts, INTERVAL 3 NANOSECOND, id) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
+SELECT ts, metric, nonNegativeDerivative(metric) OVER (PARTITION BY metric ORDER BY ts, metric ASC Rows BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING) AS deriv FROM nnd; -- { serverError BAD_ARGUMENTS }
 
 -- cleanup
 DROP TABLE IF EXISTS nnd;
diff --git a/tests/queries/0_stateless/02352_interactive_queries_from_file.expect b/tests/queries/0_stateless/02352_interactive_queries_from_file.expect
index e28fb38862c..d11d55ba941 100755
--- a/tests/queries/0_stateless/02352_interactive_queries_from_file.expect
+++ b/tests/queries/0_stateless/02352_interactive_queries_from_file.expect
@@ -3,7 +3,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 20
diff --git a/tests/queries/0_stateless/02352_rwlock.sh b/tests/queries/0_stateless/02352_rwlock.sh
index 08551794c2e..b4a77e0b08a 100755
--- a/tests/queries/0_stateless/02352_rwlock.sh
+++ b/tests/queries/0_stateless/02352_rwlock.sh
@@ -6,6 +6,9 @@
 # In other words to ensure that after WRITE lock failure (DROP),
 # READ lock (SELECT) available instantly.
 
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
diff --git a/tests/queries/0_stateless/02354_vector_search_queries.reference b/tests/queries/0_stateless/02354_vector_search_queries.reference
index befa6af5a08..41c1915ecc3 100644
--- a/tests/queries/0_stateless/02354_vector_search_queries.reference
+++ b/tests/queries/0_stateless/02354_vector_search_queries.reference
@@ -18,17 +18,18 @@ ARRAY, 10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule,
 - Annoy: WHERE-type, EXPLAIN
 Expression ((Projection + Before ORDER BY))
   Limit (preliminary LIMIT (without OFFSET))
-    ReadFromMergeTree (default.tab_annoy)
-    Indexes:
-      PrimaryKey
-        Condition: true
-        Parts: 1/1
-        Granules: 1/1
-      Skip
-        Name: idx
-        Description: annoy GRANULARITY 100000000
-        Parts: 1/1
-        Granules: 1/1
+    Expression
+      ReadFromMergeTree (default.tab_annoy)
+      Indexes:
+        PrimaryKey
+          Condition: true
+          Parts: 1/1
+          Granules: 1/1
+        Skip
+          Name: idx
+          Description: annoy GRANULARITY 100000000
+          Parts: 1/1
+          Granules: 1/1
 - Annoy: ORDER-BY-type, EXPLAIN
 Expression (Projection)
   Limit (preliminary LIMIT (without OFFSET))
@@ -48,17 +49,18 @@ Expression (Projection)
 - Usearch: WHERE-type, EXPLAIN
 Expression ((Projection + Before ORDER BY))
   Limit (preliminary LIMIT (without OFFSET))
-    ReadFromMergeTree (default.tab_usearch)
-    Indexes:
-      PrimaryKey
-        Condition: true
-        Parts: 1/1
-        Granules: 1/1
-      Skip
-        Name: idx
-        Description: usearch GRANULARITY 100000000
-        Parts: 1/1
-        Granules: 1/1
+    Expression
+      ReadFromMergeTree (default.tab_usearch)
+      Indexes:
+        PrimaryKey
+          Condition: true
+          Parts: 1/1
+          Granules: 1/1
+        Skip
+          Name: idx
+          Description: usearch GRANULARITY 100000000
+          Parts: 1/1
+          Granules: 1/1
 - Usearch: ORDER-BY-type, EXPLAIN
 Expression (Projection)
   Limit (preliminary LIMIT (without OFFSET))
@@ -95,17 +97,18 @@ ARRAY vectors, 12 rows, index_granularity = 3, GRANULARITY = 2 --> 4 granules, 2
 - Annoy: WHERE-type, EXPLAIN
 Expression ((Projection + Before ORDER BY))
   Limit (preliminary LIMIT (without OFFSET))
-    ReadFromMergeTree (default.tab_annoy)
-    Indexes:
-      PrimaryKey
-        Condition: true
-        Parts: 1/1
-        Granules: 4/4
-      Skip
-        Name: idx
-        Description: annoy GRANULARITY 2
-        Parts: 1/1
-        Granules: 1/4
+    Expression
+      ReadFromMergeTree (default.tab_annoy)
+      Indexes:
+        PrimaryKey
+          Condition: true
+          Parts: 1/1
+          Granules: 4/4
+        Skip
+          Name: idx
+          Description: annoy GRANULARITY 2
+          Parts: 1/1
+          Granules: 1/4
 - Annoy: ORDER-BY-type, EXPLAIN
 Expression (Projection)
   Limit (preliminary LIMIT (without OFFSET))
@@ -125,17 +128,18 @@ Expression (Projection)
 - Usearch: WHERE-type, EXPLAIN
 Expression ((Projection + Before ORDER BY))
   Limit (preliminary LIMIT (without OFFSET))
-    ReadFromMergeTree (default.tab_usearch)
-    Indexes:
-      PrimaryKey
-        Condition: true
-        Parts: 1/1
-        Granules: 4/4
-      Skip
-        Name: idx
-        Description: usearch GRANULARITY 2
-        Parts: 1/1
-        Granules: 1/4
+    Expression
+      ReadFromMergeTree (default.tab_usearch)
+      Indexes:
+        PrimaryKey
+          Condition: true
+          Parts: 1/1
+          Granules: 4/4
+        Skip
+          Name: idx
+          Description: usearch GRANULARITY 2
+          Parts: 1/1
+          Granules: 1/4
 - Usearch: ORDER-BY-type, EXPLAIN
 Expression (Projection)
   Limit (preliminary LIMIT (without OFFSET))
diff --git a/tests/queries/0_stateless/02354_vector_search_queries.sql b/tests/queries/0_stateless/02354_vector_search_queries.sql
index 2ccf869fdba..64051aa8544 100644
--- a/tests/queries/0_stateless/02354_vector_search_queries.sql
+++ b/tests/queries/0_stateless/02354_vector_search_queries.sql
@@ -8,8 +8,6 @@
 SET allow_experimental_annoy_index = 1;
 SET allow_experimental_usearch_index = 1;
 
-SET allow_experimental_analyzer = 0;
-
 SELECT 'ARRAY, 10 rows, index_granularity = 8192, GRANULARITY = 1 million --> 1 granule, 1 indexed block';
 
 DROP TABLE IF EXISTS tab_annoy;
diff --git a/tests/queries/0_stateless/02364_multiSearch_function_family.reference b/tests/queries/0_stateless/02364_multiSearch_function_family.reference
index eb93a2509b6..3f57c163410 100644
--- a/tests/queries/0_stateless/02364_multiSearch_function_family.reference
+++ b/tests/queries/0_stateless/02364_multiSearch_function_family.reference
@@ -12872,3 +12872,4 @@
 1
 1
 1
+1
diff --git a/tests/queries/0_stateless/02364_multiSearch_function_family.sql b/tests/queries/0_stateless/02364_multiSearch_function_family.sql
index 4ad1a68eeb7..99690e1545e 100644
--- a/tests/queries/0_stateless/02364_multiSearch_function_family.sql
+++ b/tests/queries/0_stateless/02364_multiSearch_function_family.sql
@@ -223,6 +223,8 @@ select [2] = multiSearchAllPositions(materialize('abab'), materialize(['ba']));
 select [1] = multiSearchAllPositionsCaseInsensitive(materialize('aBaB'), materialize(['abab']));
 select [3] = multiSearchAllPositionsUTF8(materialize('ab€ab'), materialize(['€']));
 select [3] = multiSearchAllPositionsCaseInsensitiveUTF8(materialize('ab€AB'), materialize(['€ab']));
+-- checks the correct handling of broken utf-8 sequence
+select [0] = multiSearchAllPositionsCaseInsensitiveUTF8(materialize(''), materialize(['a\x90\x90\x90\x90\x90\x90']));
 
 select 1 = multiSearchAny(materialize('abcdefgh'), ['b']);
 select 1 = multiSearchAny(materialize('abcdefgh'), ['bc']);
diff --git a/tests/queries/0_stateless/02366_kql_extend.sql b/tests/queries/0_stateless/02366_kql_extend.sql
index 0a3c1f3dcd4..51fb16c1ad8 100644
--- a/tests/queries/0_stateless/02366_kql_extend.sql
+++ b/tests/queries/0_stateless/02366_kql_extend.sql
@@ -12,19 +12,16 @@
 --     'Costco','Snargaluff',200,'2016-09-10',
 -- ]
 
-
 DROP TABLE IF EXISTS Ledger;
 CREATE TABLE Ledger
-(
+(    
    Supplier Nullable(String),
    Fruit String ,
    Price Float64,
-   Purchase Date
+   Purchase Date 
 ) ENGINE = Memory;
 INSERT INTO Ledger VALUES  ('Aldi','Apple',4,'2016-09-10'), ('Costco','Apple',2,'2016-09-11'), ('Aldi','Apple',6,'2016-09-10'), ('Costco','Snargaluff',100,'2016-09-12'), ('Aldi','Apple',7,'2016-09-12'), ('Aldi','Snargaluff',400,'2016-09-11'),('Costco','Snargaluff',104,'2016-09-12'),('Aldi','Apple',5,'2016-09-12'),('Aldi','Snargaluff',600,'2016-09-11'),('Costco','Snargaluff',200,'2016-09-10');
 
--- This test requies sorting after some of aggregations but I don't know KQL, sorry
-set max_bytes_before_external_group_by = 0;
 set dialect = 'kusto';
 
 print '-- extend #1 --';
@@ -34,7 +31,7 @@ print '-- extend #2 --';
 Ledger | extend PriceInCents = 100 * Price | sort by PriceInCents asc | project Fruit, PriceInCents | take 2;
 
 print '-- extend #3 --';
-Ledger | extend PriceInCents = 100 * Price | sort by PriceInCents asc | project Fruit, PriceInCents | summarize AveragePrice = avg(PriceInCents), Purchases = count() by Fruit | extend Sentence = strcat(Fruit, ' cost ', tostring(AveragePrice), ' on average based on ', tostring(Purchases), ' samples.') | project Sentence;
+Ledger | extend PriceInCents = 100 * Price | sort by PriceInCents asc | project Fruit, PriceInCents | summarize AveragePrice = avg(PriceInCents), Purchases = count() by Fruit | extend Sentence = strcat(Fruit, ' cost ', tostring(AveragePrice), ' on average based on ', tostring(Purchases), ' samples.') | project Sentence | sort by Sentence asc;
 
 print '-- extend #4 --';
 Ledger | extend a = Price | extend b = a | extend c = a, d = b + 500 | extend Pass = bool(b == a and c == a and d == b + 500) | summarize binary_all_and(Pass);
diff --git a/tests/queries/0_stateless/02366_kql_makeseries.reference b/tests/queries/0_stateless/02366_kql_makeseries.reference
deleted file mode 100644
index 8e7fde997bf..00000000000
--- a/tests/queries/0_stateless/02366_kql_makeseries.reference
+++ /dev/null
@@ -1,60 +0,0 @@
--- from to
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Costco	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[0,2,0]
-Aldi	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[0,500,0]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
--- from
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Costco	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000']	[0,2]
-Aldi	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000']	[0,500]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
--- to
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Costco	Apple	['2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[2,0]
-Aldi	Snargaluff	['2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[500,0]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
--- without from/to
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Costco	Apple	['2016-09-11 00:00:00.000000000']	[2]
-Aldi	Snargaluff	['2016-09-11 00:00:00.000000000']	[500]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
--- without by
-['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[70,334,54]
--- without aggregation alias
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Aldi	Snargaluff	['2016-09-11 00:00:00.000000000']	[500]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
-Costco	Apple	['2016-09-11 00:00:00.000000000']	[2]
--- assign group alias
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[200,0,102]
-Aldi	Snargaluff	['2016-09-11 00:00:00.000000000']	[500]
-Aldi	Apple	['2016-09-10 00:00:00.000000000','2016-09-11 00:00:00.000000000','2016-09-12 00:00:00.000000000']	[5,0,6]
-Costco	Apple	['2016-09-11 00:00:00.000000000']	[2]
--- 3d step
-Costco	Snargaluff	['2016-09-10 00:00:00.000000000']	[134.66666666666666]
-Costco	Apple	['2016-09-10 00:00:00.000000000']	[2]
-Aldi	Snargaluff	['2016-09-10 00:00:00.000000000']	[500]
-Aldi	Apple	['2016-09-10 00:00:00.000000000']	[5.5]
--- numeric column
-Costco	Snargaluff	[10,11,12,13,14]	[200,0,102,0,0]
-Aldi	Snargaluff	[10,11,12,13,14]	[0,500,0,0,0]
-Aldi	Apple	[10,11,12,13,14]	[5,0,6,0,0]
-Costco	Apple	[10,11,12,13,14]	[0,2,0,0,0]
--- from
-Costco	Snargaluff	[10,11,12]	[200,0,102]
-Aldi	Snargaluff	[10,11]	[0,500]
-Aldi	Apple	[10,11,12]	[5,0,6]
-Costco	Apple	[10,11]	[0,2]
--- to
-Costco	Snargaluff	[8,12,16]	[200,102,0]
-Aldi	Snargaluff	[8,12,16]	[500,0,0]
-Aldi	Apple	[8,12,16]	[5,6,0]
-Costco	Apple	[8,12,16]	[2,0,0]
--- without from/to
-Costco	Snargaluff	[10,12]	[200,102]
-Aldi	Snargaluff	[10]	[500]
-Aldi	Apple	[10,12]	[5,6]
-Costco	Apple	[10]	[2]
--- without by
-[10,12]	[202,54]
-['2017-01-01 00:00:00.000000000','2017-01-02 00:00:00.000000000','2017-01-03 00:00:00.000000000','2017-01-04 00:00:00.000000000','2017-01-05 00:00:00.000000000','2017-01-06 00:00:00.000000000','2017-01-07 00:00:00.000000000','2017-01-08 00:00:00.000000000','2017-01-09 00:00:00.000000000']	[4,3,5,0,10.5,4,3,8,6.5]
diff --git a/tests/queries/0_stateless/02366_kql_makeseries.sql b/tests/queries/0_stateless/02366_kql_makeseries.sql
deleted file mode 100644
index c9ca91c0be0..00000000000
--- a/tests/queries/0_stateless/02366_kql_makeseries.sql
+++ /dev/null
@@ -1,77 +0,0 @@
--- Azure Data Explore Test Data
--- let make_series_test_table = datatable (Supplier:string, Fruit:string, Price: real, Purchase:datetime)
--- [
--- 'Aldi','Apple',4,'2016-09-10',
--- 'Costco','Apple',2,'2016-09-11',
--- 'Aldi','Apple',6,'2016-09-10',
--- 'Costco','Snargaluff',100,'2016-09-12',
--- 'Aldi','Apple',7,'2016-09-12',
--- 'Aldi','Snargaluff',400,'2016-09-11',
--- 'Costco','Snargaluff',104,'2016-09-12',
--- 'Aldi','Apple',5,'2016-09-12',
--- 'Aldi','Snargaluff',600,'2016-09-11',
--- 'Costco','Snargaluff',200,'2016-09-10',
--- ];
-DROP TABLE IF EXISTS make_series_test_table;
-CREATE TABLE make_series_test_table
-(
-   Supplier Nullable(String),
-   Fruit String ,
-   Price Float64,
-   Purchase Date
-) ENGINE = Memory;
-INSERT INTO make_series_test_table VALUES  ('Aldi','Apple',4,'2016-09-10'), ('Costco','Apple',2,'2016-09-11'), ('Aldi','Apple',6,'2016-09-10'), ('Costco','Snargaluff',100,'2016-09-12'), ('Aldi','Apple',7,'2016-09-12'), ('Aldi','Snargaluff',400,'2016-09-11'),('Costco','Snargaluff',104,'2016-09-12'),('Aldi','Apple',5,'2016-09-12'),('Aldi','Snargaluff',600,'2016-09-11'),('Costco','Snargaluff',200,'2016-09-10');
-DROP TABLE IF EXISTS make_series_test_table2;
-CREATE TABLE make_series_test_table2
-(
-   Supplier Nullable(String),
-   Fruit String ,
-   Price Int32,
-   Purchase Int32
-) ENGINE = Memory;
-INSERT INTO make_series_test_table2 VALUES  ('Aldi','Apple',4,10),('Costco','Apple',2,11),('Aldi','Apple',6,10),('Costco','Snargaluff',100,12),('Aldi','Apple',7,12),('Aldi','Snargaluff',400,11),('Costco','Snargaluff',104,12),('Aldi','Apple',5,12),('Aldi','Snargaluff',600,11),('Costco','Snargaluff',200,10);
-DROP TABLE IF EXISTS make_series_test_table3;
-CREATE TABLE make_series_test_table3
-(
-    timestamp datetime,
-    metric Float64,
-) ENGINE = Memory;
-INSERT INTO make_series_test_table3 VALUES (parseDateTimeBestEffort('2016-12-31T06:00', 'UTC'), 50), (parseDateTimeBestEffort('2017-01-01', 'UTC'), 4), (parseDateTimeBestEffort('2017-01-02', 'UTC'), 3), (parseDateTimeBestEffort('2017-01-03', 'UTC'), 4), (parseDateTimeBestEffort('2017-01-03T03:00', 'UTC'), 6), (parseDateTimeBestEffort('2017-01-05', 'UTC'), 8), (parseDateTimeBestEffort('2017-01-05T13:40', 'UTC'), 13), (parseDateTimeBestEffort('2017-01-06', 'UTC'), 4), (parseDateTimeBestEffort('2017-01-07', 'UTC'), 3), (parseDateTimeBestEffort('2017-01-08', 'UTC'), 8), (parseDateTimeBestEffort('2017-01-08T21:00', 'UTC'), 8), (parseDateTimeBestEffort('2017-01-09', 'UTC'), 2), (parseDateTimeBestEffort('2017-01-09T12:00', 'UTC'), 11), (parseDateTimeBestEffort('2017-01-10T05:00', 'UTC'), 5);
-
--- This test requies sorting after some of aggregations but I don't know KQL, sorry
-set max_bytes_before_external_group_by = 0;
-set dialect = 'kusto';
-
-print '-- from to';
-make_series_test_table |  make-series PriceAvg = avg(Price) default=0 on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit;
-print '-- from';
-make_series_test_table |  make-series PriceAvg = avg(Price) default=0 on Purchase from datetime(2016-09-10)  step 1d by Supplier, Fruit | order by Supplier, Fruit;
-print '-- to';
-make_series_test_table |  make-series PriceAvg = avg(Price) default=0 on Purchase to datetime(2016-09-13) step 1d by Supplier, Fruit | order by Supplier, Fruit;
-print '-- without from/to';
-make_series_test_table | make-series PriceAvg = avg(Price) default=0 on Purchase step 1d by Supplier, Fruit | order by Supplier, Fruit;
-print '-- without by';
-make_series_test_table | make-series PriceAvg = avg(Price) default=0 on Purchase step 1d;
-print '-- without aggregation alias';
-make_series_test_table | make-series avg(Price) default=0 on Purchase step 1d by Supplier, Fruit;
-print '-- assign group alias';
-make_series_test_table | make-series avg(Price) default=0 on Purchase step 1d by Supplier_Name = Supplier, Fruit;
-print '-- 3d step';
-make_series_test_table | make-series PriceAvg = avg(Price) default=0 on Purchase from datetime(2016-09-10)  to datetime(2016-09-13) step 3d by Supplier, Fruit | order by Supplier, Fruit;
-
-print '-- numeric column'
-print '-- from to';
-make_series_test_table2 | make-series PriceAvg=avg(Price) default=0 on Purchase from 10 to  15 step  1.0  by Supplier, Fruit;
-print '-- from';
-make_series_test_table2 | make-series PriceAvg=avg(Price) default=0 on Purchase from 10 step  1.0  by Supplier, Fruit;
-print '-- to';
-make_series_test_table2 | make-series PriceAvg=avg(Price) default=0 on Purchase to 18 step  4.0  by Supplier, Fruit;
-print '-- without from/to';
-make_series_test_table2 | make-series PriceAvg=avg(Price) default=0 on Purchase step  2.0  by Supplier, Fruit;
-print '-- without by';
-make_series_test_table2 | make-series PriceAvg=avg(Price) default=0 on Purchase step  2.0;
-
-make_series_test_table3 | make-series avg(metric) default=0  on timestamp from datetime(2017-01-01) to datetime(2017-01-10) step 1d
-
--- print '-- summarize --'
--- make_series_test_table | summarize count() by format_datetime(bin(Purchase, 1d), 'yy-MM-dd');
diff --git a/tests/queries/0_stateless/02366_kql_mvexpand.sql b/tests/queries/0_stateless/02366_kql_mvexpand.sql
index e7798609646..af336a19638 100644
--- a/tests/queries/0_stateless/02366_kql_mvexpand.sql
+++ b/tests/queries/0_stateless/02366_kql_mvexpand.sql
@@ -33,3 +33,7 @@ print '-- mv_expand_test_table | mv-expand with_itemindex=index c,d to typeof(bo
 mv_expand_test_table | mv-expand with_itemindex=index c,d to typeof(bool);
 print '-- mv_expand_test_table | mv-expand c to typeof(bool) --';
 mv_expand_test_table | mv-expand c to typeof(bool);
+SET max_query_size = 28;
+SET dialect='kusto';
+mv_expand_test_table | mv-expand c, d; -- { serverError SYNTAX_ERROR }
+SET max_query_size=262144;
diff --git a/tests/queries/0_stateless/02366_kql_summarize.sql b/tests/queries/0_stateless/02366_kql_summarize.sql
index bb12d1f251f..21a1b643d98 100644
--- a/tests/queries/0_stateless/02366_kql_summarize.sql
+++ b/tests/queries/0_stateless/02366_kql_summarize.sql
@@ -1,23 +1,23 @@
 -- datatable(FirstName:string, LastName:string, Occupation:string, Education:string, Age:int) [
---     'Theodore', 'Diaz', 'Skilled Manual', 'Bachelors', 28,
---     'Stephanie', 'Cox', 'Management abcd defg', 'Bachelors', 33,
---     'Peter', 'Nara', 'Skilled Manual', 'Graduate Degree', 26,
---     'Latoya', 'Shen', 'Professional', 'Graduate Degree', 25,
---     'Joshua', 'Lee', 'Professional', 'Partial College', 26,
---     'Edward', 'Hernandez', 'Skilled Manual', 'High School', 36,
---     'Dalton', 'Wood', 'Professional', 'Partial College', 42,
---     'Christine', 'Nara', 'Skilled Manual', 'Partial College', 33,
---     'Cameron', 'Rodriguez', 'Professional', 'Partial College', 28,
---     'Angel', 'Stewart', 'Professional', 'Partial College', 46,
---     'Apple', '', 'Skilled Manual', 'Bachelors', 28,
+--     'Theodore', 'Diaz', 'Skilled Manual', 'Bachelors', 28, 
+--     'Stephanie', 'Cox', 'Management abcd defg', 'Bachelors', 33, 
+--     'Peter', 'Nara', 'Skilled Manual', 'Graduate Degree', 26, 
+--     'Latoya', 'Shen', 'Professional', 'Graduate Degree', 25, 
+--     'Joshua', 'Lee', 'Professional', 'Partial College', 26, 
+--     'Edward', 'Hernandez', 'Skilled Manual', 'High School', 36, 
+--     'Dalton', 'Wood', 'Professional', 'Partial College', 42, 
+--     'Christine', 'Nara', 'Skilled Manual', 'Partial College', 33, 
+--     'Cameron', 'Rodriguez', 'Professional', 'Partial College', 28, 
+--     'Angel', 'Stewart', 'Professional', 'Partial College', 46, 
+--     'Apple', '', 'Skilled Manual', 'Bachelors', 28, 
 --     dynamic(null), 'why', 'Professional', 'Partial College', 38
 -- ]
 
 DROP TABLE IF EXISTS Customers;
 CREATE TABLE Customers
-(
+(    
     FirstName Nullable(String),
-    LastName String,
+    LastName String, 
     Occupation String,
     Education String,
     Age Nullable(UInt8)
@@ -89,9 +89,9 @@ print '-- Summarize following sort --';
 Customers | sort by FirstName | summarize count() by Occupation | sort by Occupation;
 
 print '-- summarize with bin --';
-EventLog | summarize count=count() by bin(Created, 1000) | sort by count asc;
-EventLog | summarize count=count() by bin(unixtime_seconds_todatetime(Created/1000), 1s) | sort by count asc;
-EventLog | summarize count=count() by time_label=bin(Created/1000, 1s) | sort by count asc;
+EventLog | summarize count=count() by bin(Created, 1000);
+EventLog | summarize count=count() by bin(unixtime_seconds_todatetime(Created/1000), 1s);
+EventLog | summarize count=count() by time_label=bin(Created/1000, 1s);
 Dates | project bin(datetime(EventTime), 1m);
 print '-- make_list_with_nulls --';
 Customers | summarize t = make_list_with_nulls(FirstName);
diff --git a/tests/queries/0_stateless/02366_kql_tabular.sql b/tests/queries/0_stateless/02366_kql_tabular.sql
index f73c4c09cca..1a3d1ed92eb 100644
--- a/tests/queries/0_stateless/02366_kql_tabular.sql
+++ b/tests/queries/0_stateless/02366_kql_tabular.sql
@@ -86,3 +86,8 @@ hits | where CounterID == 62 and EventDate >= '2013-07-14' and EventDate <= '201
 
 print '-- Missing column in front of startsWith --';
 StormEvents | where startswith "W" | summarize Count=count() by State; -- { clientError SYNTAX_ERROR }
+
+SET max_query_size = 55;
+SET dialect='kusto';
+Customers | where Education contains 'degree' | order by LastName; -- { serverError 62 }
+SET max_query_size=262144;
diff --git a/tests/queries/0_stateless/02375_pretty_formats.reference b/tests/queries/0_stateless/02375_pretty_formats.reference
index 51b18f7eb09..e48646ff4bd 100644
--- a/tests/queries/0_stateless/02375_pretty_formats.reference
+++ b/tests/queries/0_stateless/02375_pretty_formats.reference
@@ -1,118 +1,118 @@
 Pretty
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 0 │ 1 │
-├───┼───┤
-│ 1 │ 2 │
-└───┴───┘
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 2 │ 3 │
-├───┼───┤
-│ 3 │ 4 │
-└───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+1. │ 0 │ 1 │
+   ├───┼───┤
+2. │ 1 │ 2 │
+   └───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+3. │ 2 │ 3 │
+   ├───┼───┤
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyNoEscapes
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 0 │ 1 │
-├───┼───┤
-│ 1 │ 2 │
-└───┴───┘
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 2 │ 3 │
-├───┼───┤
-│ 3 │ 4 │
-└───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+1. │ 0 │ 1 │
+   ├───┼───┤
+2. │ 1 │ 2 │
+   └───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+3. │ 2 │ 3 │
+   ├───┼───┤
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyMonoBlock
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 0 │ 1 │
-├───┼───┤
-│ 1 │ 2 │
-├───┼───┤
-│ 2 │ 3 │
-├───┼───┤
-│ 3 │ 4 │
-└───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+1. │ 0 │ 1 │
+   ├───┼───┤
+2. │ 1 │ 2 │
+   ├───┼───┤
+3. │ 2 │ 3 │
+   ├───┼───┤
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyNoEscapesMonoBlock
-����┳���┓
-┃ x ┃ y ┃
-┡���╇���┩
-│ 0 │ 1 │
-├───┼───┤
-│ 1 │ 2 │
-├───┼───┤
-│ 2 │ 3 │
-├───┼───┤
-│ 3 │ 4 │
-└───┴───┘
+   ����┳���┓
+   ┃ x ┃ y ┃
+   ┡���╇���┩
+1. │ 0 │ 1 │
+   ├───┼───┤
+2. │ 1 │ 2 │
+   ├───┼───┤
+3. │ 2 │ 3 │
+   ├───┼───┤
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyCompact
-┌─x─┬─y─�
-│ 0 │ 1 │
-│ 1 │ 2 │
-└───┴───┘
-┌─x─┬─y─�
-│ 2 │ 3 │
-│ 3 │ 4 │
-└───┴───┘
+   ┌─x─┬─y─�
+1. │ 0 │ 1 │
+2. │ 1 │ 2 │
+   └───┴───┘
+   ┌─x─┬─y─�
+3. │ 2 │ 3 │
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyCompactNoEscapes
-┌─x─┬─y─�
-│ 0 │ 1 │
-│ 1 │ 2 │
-└───┴───┘
-┌─x─┬─y─�
-│ 2 │ 3 │
-│ 3 │ 4 │
-└───┴───┘
+   ┌─x─┬─y─�
+1. │ 0 │ 1 │
+2. │ 1 │ 2 │
+   └───┴───┘
+   ┌─x─┬─y─�
+3. │ 2 │ 3 │
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyCompactMonoBlock
-┌─x─┬─y─�
-│ 0 │ 1 │
-│ 1 │ 2 │
-│ 2 │ 3 │
-│ 3 │ 4 │
-└───┴───┘
+   ┌─x─┬─y─�
+1. │ 0 │ 1 │
+2. │ 1 │ 2 │
+3. │ 2 │ 3 │
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettyCompactNoEscapesMonoBlock
-┌─x─┬─y─�
-│ 0 │ 1 │
-│ 1 │ 2 │
-│ 2 │ 3 │
-│ 3 │ 4 │
-└───┴───┘
+   ┌─x─┬─y─�
+1. │ 0 │ 1 │
+2. │ 1 │ 2 │
+3. │ 2 │ 3 │
+4. │ 3 │ 4 │
+   └───┴───┘
 PrettySpace
- x   y
+    x   y
 
- 0   1 
- 1   2 
- x   y
+1.  0   1 
+2.  1   2 
+    x   y
 
- 2   3 
- 3   4 
+3.  2   3 
+4.  3   4 
 PrettySpaceNoEscapes
- x   y
+    x   y
 
- 0   1 
- 1   2 
- x   y
+1.  0   1 
+2.  1   2 
+    x   y
 
- 2   3 
- 3   4 
+3.  2   3 
+4.  3   4 
 PrettySpaceMonoBlock
- x   y
+    x   y
 
- 0   1 
- 1   2 
- 2   3 
- 3   4 
+1.  0   1 
+2.  1   2 
+3.  2   3 
+4.  3   4 
 PrettySpaceNoEscapesMonoBlock
- x   y
+    x   y
 
- 0   1 
- 1   2 
- 2   3 
- 3   4 
+1.  0   1 
+2.  1   2 
+3.  2   3 
+4.  3   4 
diff --git a/tests/queries/0_stateless/02375_pretty_formats.sql.j2 b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
index cc61346d267..55462ea6b61 100644
--- a/tests/queries/0_stateless/02375_pretty_formats.sql.j2
+++ b/tests/queries/0_stateless/02375_pretty_formats.sql.j2
@@ -3,6 +3,6 @@
                   'PrettySpaceNoEscapesMonoBlock'] -%}
 
 select '{{ format }}';
-select number as x, number + 1 as y from numbers(4) settings max_block_size=2 format {{ format }};
+select number as x, number + 1 as y from numbers(4) settings max_block_size=2, output_format_pretty_color=1 format {{ format }};
 
 {% endfor -%}
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 7e937ac42b6..c223fcc86bc 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
@@ -15,14 +15,14 @@ FIND_SORTMODE="$GREP_SORTMODE | $TRIM_LEADING_SPACES"
 
 function explain_sorting {
     echo "-- QUERY: "$1
-    $CLICKHOUSE_CLIENT -nq "$1" | eval $FIND_SORTING
+    $CLICKHOUSE_CLIENT --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -nq "$1" | eval $FIND_SORTING
 }
 
 function explain_sortmode {
     echo "-- QUERY: "$1
-    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 -nq "$1" | eval $FIND_SORTMODE
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=0 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -nq "$1" | eval $FIND_SORTMODE
     echo "-- QUERY (analyzer): "$1
-    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 -nq "$1" | eval $FIND_SORTMODE
+    $CLICKHOUSE_CLIENT --allow_experimental_analyzer=1 --merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0 -nq "$1" | eval $FIND_SORTMODE
 }
 
 $CLICKHOUSE_CLIENT -q "drop table if exists optimize_sorting 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 5dd39c39852..365725f8ffe 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
@@ -1,3 +1,10 @@
+-- { echoOn }
+
+SET join_algorithm = 'hash';
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
 Expression
 Header: key String
         value String
@@ -21,6 +28,121 @@ Header: key String
               __table3.value String
         ReadFromStorage
         Header: dummy UInt8
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 ON t1.k = t2.k ORDER BY 1;
+1	1	1
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 ON t1.n = t2.n ORDER BY 1;
+1	1	1	1	1
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+0	0	0	0	0	0	0	0
+0	0	0	0	0	5	5	5
+0	0	0	0	0	6	6	6
+0	0	0	0	0	7	7	7
+0	0	0	0	0	8	8	8
+0	0	0	0	0	9	9	9
+0	0	0	0	0	10	10	10
+1	1	1	1	1	0	0	0
+2	2	2	2	2	0	0	0
+3	3	3	3	3	3	3	3
+4	4	4	4	4	4	4	4
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+0	0	0	0	0	1	1	1	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	5	5	5	6	6	6	6	6
+0	0	0	0	0	0	0	0	6	6	6	7	7	7	7	7
+0	0	0	0	0	0	0	0	7	7	7	8	8	8	8	8
+0	0	0	0	0	0	0	0	8	8	8	9	9	9	9	9
+0	0	0	0	0	0	0	0	9	9	9	10	10	10	10	10
+0	0	0	0	0	0	0	0	10	10	10	11	11	11	11	11
+1	1	1	1	1	2	2	2	0	0	0	0	0	0	0	0
+2	2	2	2	2	3	3	3	0	0	0	0	0	0	0	0
+3	3	3	3	3	4	4	4	3	3	3	4	4	4	4	4
+4	4	4	4	4	5	5	5	4	4	4	5	5	5	5	5
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.k = t2.k
+ORDER BY t1.k, t2.k
+;
+0	0	0	0	0	0	0	0	5	5	5	6	6	6	6	6
+0	0	0	0	0	0	0	0	6	6	6	7	7	7	7	7
+0	0	0	0	0	0	0	0	7	7	7	8	8	8	8	8
+0	0	0	0	0	0	0	0	8	8	8	9	9	9	9	9
+0	0	0	0	0	0	0	0	9	9	9	10	10	10	10	10
+0	0	0	0	0	0	0	0	10	10	10	11	11	11	11	11
+0	0	0	0	0	1	1	1	0	0	0	0	0	0	0	0
+1	1	1	1	1	2	2	2	0	0	0	0	0	0	0	0
+2	2	2	2	2	3	3	3	0	0	0	0	0	0	0	0
+3	3	3	3	3	4	4	4	3	3	3	4	4	4	4	4
+4	4	4	4	4	5	5	5	4	4	4	5	5	5	5	5
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 USING (k) ORDER BY 1;
+1
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 USING (n) ORDER BY 1;
+1	1	1	1
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+0	1	1	1	0	0	0	0	0
+1	2	2	2	0	0	0	0	0
+2	3	3	3	0	0	0	0	0
+3	4	4	4	4	4	4	4	4
+4	5	5	5	5	5	5	5	5
+5	0	0	0	6	6	6	6	6
+6	0	0	0	7	7	7	7	7
+7	0	0	0	8	8	8	8	8
+8	0	0	0	9	9	9	9	9
+9	0	0	0	10	10	10	10	10
+10	0	0	0	11	11	11	11	11
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (k)
+ORDER BY k
+;
+1	0	0	0	0	0	0	0	0
+2	1	1	1	1	1	0	0	0
+3	2	2	2	2	2	0	0	0
+4	3	3	3	3	3	3	3	3
+5	4	4	4	4	4	4	4	4
+6	0	0	0	0	0	5	5	5
+7	0	0	0	0	0	6	6	6
+8	0	0	0	0	0	7	7	7
+9	0	0	0	0	0	8	8	8
+10	0	0	0	0	0	9	9	9
+11	0	0	0	0	0	10	10	10
+SET join_algorithm = 'full_sorting_merge', max_rows_in_set_to_optimize_join = 0;
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
 Expression
 Header: key String
         value String
@@ -50,3 +172,113 @@ Header: key String
                 __table3.value String
           ReadFromStorage
           Header: dummy UInt8
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 ON t1.k = t2.k ORDER BY 1;
+1	1	1
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 ON t1.n = t2.n ORDER BY 1;
+1	1	1	1	1
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+0	0	0	0	0	0	0	0
+0	0	0	0	0	5	5	5
+0	0	0	0	0	6	6	6
+0	0	0	0	0	7	7	7
+0	0	0	0	0	8	8	8
+0	0	0	0	0	9	9	9
+0	0	0	0	0	10	10	10
+1	1	1	1	1	0	0	0
+2	2	2	2	2	0	0	0
+3	3	3	3	3	3	3	3
+4	4	4	4	4	4	4	4
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+0	0	0	0	0	1	1	1	0	0	0	0	0	0	0	0
+0	0	0	0	0	0	0	0	5	5	5	6	6	6	6	6
+0	0	0	0	0	0	0	0	6	6	6	7	7	7	7	7
+0	0	0	0	0	0	0	0	7	7	7	8	8	8	8	8
+0	0	0	0	0	0	0	0	8	8	8	9	9	9	9	9
+0	0	0	0	0	0	0	0	9	9	9	10	10	10	10	10
+0	0	0	0	0	0	0	0	10	10	10	11	11	11	11	11
+1	1	1	1	1	2	2	2	0	0	0	0	0	0	0	0
+2	2	2	2	2	3	3	3	0	0	0	0	0	0	0	0
+3	3	3	3	3	4	4	4	3	3	3	4	4	4	4	4
+4	4	4	4	4	5	5	5	4	4	4	5	5	5	5	5
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.k = t2.k
+ORDER BY t1.k, t2.k
+;
+0	0	0	0	0	0	0	0	5	5	5	6	6	6	6	6
+0	0	0	0	0	0	0	0	6	6	6	7	7	7	7	7
+0	0	0	0	0	0	0	0	7	7	7	8	8	8	8	8
+0	0	0	0	0	0	0	0	8	8	8	9	9	9	9	9
+0	0	0	0	0	0	0	0	9	9	9	10	10	10	10	10
+0	0	0	0	0	0	0	0	10	10	10	11	11	11	11	11
+0	0	0	0	0	1	1	1	0	0	0	0	0	0	0	0
+1	1	1	1	1	2	2	2	0	0	0	0	0	0	0	0
+2	2	2	2	2	3	3	3	0	0	0	0	0	0	0	0
+3	3	3	3	3	4	4	4	3	3	3	4	4	4	4	4
+4	4	4	4	4	5	5	5	4	4	4	5	5	5	5	5
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 USING (k) ORDER BY 1;
+1
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 USING (n) ORDER BY 1;
+1	1	1	1
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+0	1	1	1	0	0	0	0	0
+1	2	2	2	0	0	0	0	0
+2	3	3	3	0	0	0	0	0
+3	4	4	4	4	4	4	4	4
+4	5	5	5	5	5	5	5	5
+5	0	0	0	6	6	6	6	6
+6	0	0	0	7	7	7	7	7
+7	0	0	0	8	8	8	8	8
+8	0	0	0	9	9	9	9	9
+9	0	0	0	10	10	10	10	10
+10	0	0	0	11	11	11	11	11
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (k)
+ORDER BY k
+;
+1	0	0	0	0	0	0	0	0
+2	1	1	1	1	1	0	0	0
+3	2	2	2	2	2	0	0	0
+4	3	3	3	3	3	3	3	3
+5	4	4	4	4	4	4	4	4
+6	0	0	0	0	0	5	5	5
+7	0	0	0	0	0	6	6	6
+8	0	0	0	0	0	7	7	7
+9	0	0	0	0	0	8	8	8
+10	0	0	0	0	0	9	9	9
+11	0	0	0	0	0	10	10	10
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
deleted file mode 100644
index dfcd8c12e11..00000000000
--- a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql
+++ /dev/null
@@ -1,16 +0,0 @@
-SET allow_experimental_analyzer = 1;
-SET join_algorithm = 'hash';
-
-EXPLAIN actions=0, description=0, header=1
-SELECT * FROM ( SELECT 'key2' AS key ) AS s1
-JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
-USING (key);
-
-SET join_algorithm = 'full_sorting_merge';
-
-SET max_rows_in_set_to_optimize_join = 0;
-
-EXPLAIN actions=0, description=0, header=1
-SELECT * FROM ( SELECT 'key2' AS key ) AS s1
-JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
-USING (key);
diff --git a/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql.j2 b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql.j2
new file mode 100644
index 00000000000..ca4af4df6b6
--- /dev/null
+++ b/tests/queries/0_stateless/02381_join_dup_columns_in_plan.sql.j2
@@ -0,0 +1,62 @@
+SET allow_experimental_analyzer = 1;
+
+-- { echoOn }
+
+{% for query_settings in ['join_algorithm = \'hash\'', 'join_algorithm = \'full_sorting_merge\', max_rows_in_set_to_optimize_join = 0'] -%}
+
+SET {{ query_settings }};
+
+EXPLAIN actions=0, description=0, header=1
+SELECT * FROM ( SELECT 'key2' AS key ) AS s1
+JOIN ( SELECT 'key1' AS key, '1' AS value UNION ALL SELECT 'key2' AS key, '1' AS value ) AS s2
+USING (key);
+
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 ON t1.k = t2.k ORDER BY 1;
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 ON t1.n = t2.n ORDER BY 1;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.number = t2.number
+ORDER BY t1.number, t2.number
+;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+ON t1.k = t2.k
+ORDER BY t1.k, t2.k
+;
+
+SELECT * FROM ( SELECT 1 AS k ) as t1 FULL JOIN ( SELECT 1 AS k, k ) as t2 USING (k) ORDER BY 1;
+SELECT * FROM ( SELECT 1 AS k, 1 as n ) as t1 FULL JOIN ( SELECT 1 AS k, k, 1 as n ) as t2 USING (n) ORDER BY 1;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (number)
+ORDER BY number
+;
+
+SELECT *
+FROM ( SELECT number, number, number, number, number, number + 1 as k, k, k FROM numbers(5) ) as t1
+FULL JOIN ( SELECT number, number, number, number + 1 as k, k, k, k, k FROM numbers(3, 8) ) as t2
+USING (k)
+ORDER BY k
+;
+
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
index c9a13c97baf..469c523c578 100644
--- a/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
+++ b/tests/queries/0_stateless/02381_parseDateTime64BestEffortUS.reference
@@ -1,10 +1,10 @@
 parseDateTime64BestEffortUS
- s                                           a
+    s                                           a
 
- 01-02-1930 12:00:00   1930-01-02 12:00:00.000 
- 12.02.1930 12:00:00   1930-12-02 12:00:00.000 
- 13/02/1930 12:00:00   1930-02-13 12:00:00.000 
- 02/25/1930 12:00:00   1930-02-25 12:00:00.000 
+1.  01-02-1930 12:00:00   1930-01-02 12:00:00.000 
+2.  12.02.1930 12:00:00   1930-12-02 12:00:00.000 
+3.  13/02/1930 12:00:00   1930-02-13 12:00:00.000 
+4.  02/25/1930 12:00:00   1930-02-25 12:00:00.000 
 
 parseDateTime64BestEffortUSOrNull
 \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 ae9de1426e7..3998f410a63 100644
--- a/tests/queries/0_stateless/02402_merge_engine_with_view.sql
+++ b/tests/queries/0_stateless/02402_merge_engine_with_view.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 -- #40014
 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);
@@ -11,4 +13,4 @@ SELECT * FROM m2 WHERE id > 1 AND id < 5 ORDER BY id SETTINGS force_primary_key=
 
 -- #40706
 CREATE VIEW v AS SELECT 1;
-SELECT 1 FROM merge(currentDatabase(), '^v$');
\ No newline at end of file
+SELECT 1 FROM merge(currentDatabase(), '^v$');
diff --git a/tests/queries/0_stateless/02406_minmax_behaviour.reference b/tests/queries/0_stateless/02406_minmax_behaviour.reference
index d52ba640a0e..5a715e1c7f7 100644
--- a/tests/queries/0_stateless/02406_minmax_behaviour.reference
+++ b/tests/queries/0_stateless/02406_minmax_behaviour.reference
@@ -56,6 +56,10 @@ SELECT min(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1,
 22
 SELECT max(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
 26
+SELECT max(number) from (Select if(number % 2 == 1, NULL, -number::Int8) as number FROM numbers(128));
+0
+SELECT min(number) from (Select if(number % 2 == 1, NULL, -number::Int8) as number FROM numbers(128));
+-126
 SELECT argMax(number, now()) FROM (Select number as number from numbers(10, 10000)) settings max_threads=1, max_block_size=100;
 10
 SELECT argMax(number, now()) FROM (Select number as number from numbers(10, 10000)) settings max_threads=1, max_block_size=20000;
@@ -190,3 +194,7 @@ SELECT min(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1,
 22
 SELECT max(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
 26
+SELECT max(number::Nullable(Decimal64(3))) from numbers(11) settings max_block_size=10;
+10
+SELECT min(-number::Nullable(Decimal64(3))) from numbers(11) settings max_block_size=10;
+-10
diff --git a/tests/queries/0_stateless/02406_minmax_behaviour.sql b/tests/queries/0_stateless/02406_minmax_behaviour.sql
index a3afe7d40b0..314374a260d 100644
--- a/tests/queries/0_stateless/02406_minmax_behaviour.sql
+++ b/tests/queries/0_stateless/02406_minmax_behaviour.sql
@@ -48,6 +48,9 @@ SELECT maxIf(number::Nullable(String), number < 10) as number from numbers(10, 1
 SELECT min(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
 SELECT max(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
 
+SELECT max(number) from (Select if(number % 2 == 1, NULL, -number::Int8) as number FROM numbers(128));
+SELECT min(number) from (Select if(number % 2 == 1, NULL, -number::Int8) as number FROM numbers(128));
+
 SELECT argMax(number, now()) FROM (Select number as number from numbers(10, 10000)) settings max_threads=1, max_block_size=100;
 SELECT argMax(number, now()) FROM (Select number as number from numbers(10, 10000)) settings max_threads=1, max_block_size=20000;
 SELECT argMax(number, 1) FROM (Select number as number from numbers(10, 10000)) settings max_threads=1, max_block_size=100;
@@ -138,3 +141,6 @@ SELECT maxIf(number::Nullable(String), number < 10) as number from numbers(10, 1
 
 SELECT min(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
 SELECT max(n::Nullable(String)) from (Select if(number < 15 and number % 2 == 1, number * 2, NULL) as n from numbers(10, 20));
+
+SELECT max(number::Nullable(Decimal64(3))) from numbers(11) settings max_block_size=10;
+SELECT min(-number::Nullable(Decimal64(3))) from numbers(11) settings max_block_size=10;
diff --git a/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.reference b/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.reference
index e4040a2d371..57ffeca9d43 100644
--- a/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.reference
+++ b/tests/queries/0_stateless/02414_all_new_table_functions_must_be_documented.reference
@@ -4,6 +4,8 @@ dictionary
 executable
 file
 generateRandom
+generateSeries
+generate_series
 input
 jdbc
 merge
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 379eea4dbbb..3ddf165dec0 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
@@ -57,11 +57,13 @@ URLPathHierarchy
 UUIDNumToString
 UUIDStringToNum
 _CAST
+__actionName
 __bitBoolMaskAnd
 __bitBoolMaskOr
 __bitSwapLastTwo
 __bitWrapperFunc
 __getScalar
+__scalarSubqueryResult
 abs
 accurateCast
 accurateCastOrDefault
@@ -193,10 +195,7 @@ blockSerializedSize
 blockSize
 buildId
 byteSize
-caseWithExpr
 caseWithExpression
-caseWithoutExpr
-caseWithoutExpression
 catboostEvaluate
 cbrt
 ceil
@@ -311,7 +310,6 @@ fromUnixTimestamp64Micro
 fromUnixTimestamp64Milli
 fromUnixTimestamp64Nano
 fromUnixTimestampInJodaSyntax
-fullHostName
 fuzzBits
 gccMurmurHash
 gcd
@@ -643,14 +641,6 @@ shardNum
 showCertificate
 sigmoid
 sign
-simpleJSONExtractBool
-simpleJSONExtractFloat
-simpleJSONExtractInt
-simpleJSONExtractRaw
-simpleJSONExtractString
-simpleJSONExtractUInt
-simpleJSONHas
-sin
 sinh
 sipHash128
 sipHash128Keyed
diff --git a/tests/queries/0_stateless/02416_json_object_inference.sql b/tests/queries/0_stateless/02416_json_object_inference.sql
index 91137c0243c..3022ee026d0 100644
--- a/tests/queries/0_stateless/02416_json_object_inference.sql
+++ b/tests/queries/0_stateless/02416_json_object_inference.sql
@@ -2,5 +2,5 @@
 set allow_experimental_object_type=1;
 desc format(JSONEachRow, '{"a" : {"b" : {"c" : 1, "d" : "str"}}}');
 set allow_experimental_object_type=0, input_format_json_read_objects_as_strings=0, input_format_json_try_infer_named_tuples_from_objects=0, input_format_json_read_numbers_as_strings=0;
-desc format(JSONEachRow, '{"a" : {"b" : {"c" : 1, "d" : "str"}}}'); -- {serverError 652}
+desc format(JSONEachRow, '{"a" : {"b" : {"c" : 1, "d" : "str"}}}'); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 
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 a0689a0a090..f2b5b95e45c 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
@@ -3,8 +3,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(std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
-{"operation_name":"void DB::DistributedAsyncInsertDirectoryQueue::processFile(std::string &)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
+{"operation_name":"void DB::DistributedAsyncInsertDirectoryQueue::processFile(std::string &, const SettingsChanges &)","cluster":"test_cluster_two_shards_localhost","shard":"1","rows":"1","bytes":"8"}
+{"operation_name":"void DB::DistributedAsyncInsertDirectoryQueue::processFile(std::string &, const SettingsChanges &)","cluster":"test_cluster_two_shards_localhost","shard":"2","rows":"1","bytes":"8"}
 3
 2
 ===3===
diff --git a/tests/queries/0_stateless/02417_repeat_input_commands.expect b/tests/queries/0_stateless/02417_repeat_input_commands.expect
index 8070200c55c..5a4b2840854 100755
--- a/tests/queries/0_stateless/02417_repeat_input_commands.expect
+++ b/tests/queries/0_stateless/02417_repeat_input_commands.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.reference b/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.reference
index f2586c9c42a..9a54cd0ebaa 100644
--- a/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.reference
+++ b/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.reference
@@ -1,6 +1,6 @@
-┌─number─�
-│     42 │
-└────────┘
-┌─number─�
-│     42 │
-└────────┘
+   ┌─number─�
+1. │     42 │
+   └────────┘
+   ┌─number─�
+1. │     42 │
+   └────────┘
diff --git a/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.sh b/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.sh
index 32693adff24..847e9682bf5 100755
--- a/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.sh
+++ b/tests/queries/0_stateless/02418_do_not_return_empty_blocks_from_ConvertingAggregatedToChunksTransform.sh
@@ -13,7 +13,7 @@ ${CLICKHOUSE_CURL} \
      from numbers_mt(1e6)
      where number = 42
      group by number
-     settings max_threads = 10, max_bytes_before_external_group_by = 1, group_by_two_level_threshold = 1
+     settings max_threads = 10, max_bytes_before_external_group_by = 1, group_by_two_level_threshold = 1, output_format_pretty_color=1
      format PrettyCompact"
 
 ${CLICKHOUSE_CURL} \
@@ -24,5 +24,5 @@ ${CLICKHOUSE_CURL} \
     from numbers_mt(1e6)
     where number = 42
     group by number
-    settings max_threads = 10, max_bytes_before_external_group_by = 0, group_by_two_level_threshold = 1
+    settings max_threads = 10, max_bytes_before_external_group_by = 0, group_by_two_level_threshold = 1, output_format_pretty_color=1
     format PrettyCompact"
diff --git a/tests/queries/0_stateless/02418_tautological_if_index.sql b/tests/queries/0_stateless/02418_tautological_if_index.sql
index c37f24b29f6..1368347e88f 100644
--- a/tests/queries/0_stateless/02418_tautological_if_index.sql
+++ b/tests/queries/0_stateless/02418_tautological_if_index.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS constCondOptimization;
 
 CREATE TABLE constCondOptimization
diff --git a/tests/queries/0_stateless/02421_formats_with_totals_and_extremes.sql.j2 b/tests/queries/0_stateless/02421_formats_with_totals_and_extremes.sql.j2
index 32738766199..319d88f8d7c 100644
--- a/tests/queries/0_stateless/02421_formats_with_totals_and_extremes.sql.j2
+++ b/tests/queries/0_stateless/02421_formats_with_totals_and_extremes.sql.j2
@@ -1,5 +1,6 @@
 -- Tags: no-fasttest
 
+set output_format_pretty_color = 1, output_format_pretty_row_numbers = 0;
 set output_format_write_statistics=0;
 
 {% for format in ['CSV', 'TSV', 'XML', 'Vertical', 'Pretty', 'JSON', 'JSONCompact'] -%}
@@ -19,4 +20,3 @@ select sum(number) from numbers(10) group by number % 2 with totals format {{ fo
 select '';
 
 {% endfor -%}
-
diff --git a/tests/queries/0_stateless/02424_pod_array_overflow.sql b/tests/queries/0_stateless/02424_pod_array_overflow.sql
index 4b85d5be029..50c46cf19f1 100644
--- a/tests/queries/0_stateless/02424_pod_array_overflow.sql
+++ b/tests/queries/0_stateless/02424_pod_array_overflow.sql
@@ -1 +1 @@
-SELECT * FROM format(Native, '\x02\x02\x02\x6b\x30\x1a\x4d\x61\x70\x28\x46\x69\x78\x65\x64\x53\x74\x72\x69\x6e\x67\x28\x31\x29\x2c\x20\x49\x6e\x74\x36\x34\x29\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7f\x00\x7f\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x64\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x31\x3f\x56\x69\x11\x89\x25'); -- { serverError 128 }
+SELECT * FROM format(Native, '\x02\x02\x02\x6b\x30\x1a\x4d\x61\x70\x28\x46\x69\x78\x65\x64\x53\x74\x72\x69\x6e\x67\x28\x31\x29\x2c\x20\x49\x6e\x74\x36\x34\x29\x01\x00\x00\x00\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\x7f\x00\x7f\xff\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x64\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\xcf\x31\x3f\x56\x69\x11\x89\x25'); -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
diff --git a/tests/queries/0_stateless/02426_pod_array_overflow_2.sql b/tests/queries/0_stateless/02426_pod_array_overflow_2.sql
index 52a00730227..6a0d97acee3 100644
--- a/tests/queries/0_stateless/02426_pod_array_overflow_2.sql
+++ b/tests/queries/0_stateless/02426_pod_array_overflow_2.sql
@@ -1 +1 @@
-SELECT * FROM format(Native, 'k0\x23Array(Tuple(FixedString(1), Int64))
\0\0\0\0\0\0\0�����\0����������������\0�\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0d\0\0\0\0\0\0\0\0\0\0\0\0\0�1?Vi�%'); -- { serverError 128 }
+SELECT * FROM format(Native, 'k0\x23Array(Tuple(FixedString(1), Int64))
\0\0\0\0\0\0\0�����\0����������������\0�\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0d\0\0\0\0\0\0\0\0\0\0\0\0\0�1?Vi�%'); -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
diff --git a/tests/queries/0_stateless/02426_pod_array_overflow_3.sql b/tests/queries/0_stateless/02426_pod_array_overflow_3.sql
index 857ba2ca28e..caabf7d1679 100644
--- a/tests/queries/0_stateless/02426_pod_array_overflow_3.sql
+++ b/tests/queries/0_stateless/02426_pod_array_overflow_3.sql
@@ -1 +1 @@
-SELECT * FROM format(Native, '\x01\x01\x01x\x0CArray(UInt8)\x01\x00\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF'); -- { serverError 128 }
+SELECT * FROM format(Native, '\x01\x01\x01x\x0CArray(UInt8)\x01\x00\xBD\xEF\xBF\xBD\xEF\xBF\xBD\xEF'); -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
diff --git a/tests/queries/0_stateless/02428_combinators_with_over_statement.sql b/tests/queries/0_stateless/02428_combinators_with_over_statement.sql
index 7946b997b00..2b82839d6eb 100644
--- a/tests/queries/0_stateless/02428_combinators_with_over_statement.sql
+++ b/tests/queries/0_stateless/02428_combinators_with_over_statement.sql
@@ -1,5 +1,6 @@
 drop table if exists test;
 create table test (x AggregateFunction(uniq, UInt64), y Int64) engine=Memory;
+set max_insert_threads = 1;
 insert into test select uniqState(number) as x, number as y from numbers(10) group by number order by x, y;
 select uniqStateMap(map(1, x)) OVER (PARTITION BY y) from test;
 select uniqStateForEach([x]) OVER (PARTITION BY y) from test;
diff --git a/tests/queries/0_stateless/02428_parameterized_view.reference b/tests/queries/0_stateless/02428_parameterized_view.reference
index 422fdaa4983..fd77e6ed8df 100644
--- a/tests/queries/0_stateless/02428_parameterized_view.reference
+++ b/tests/queries/0_stateless/02428_parameterized_view.reference
@@ -23,6 +23,7 @@ ERROR
 20
 20
 ERROR
+20
 30
 20
 30
diff --git a/tests/queries/0_stateless/02428_parameterized_view.sh b/tests/queries/0_stateless/02428_parameterized_view.sh
index ad9c672f4c5..c6f0927db36 100755
--- a/tests/queries/0_stateless/02428_parameterized_view.sh
+++ b/tests/queries/0_stateless/02428_parameterized_view.sh
@@ -37,7 +37,7 @@ $CLICKHOUSE_CLIENT -q "CREATE VIEW test_02428_pv1 AS SELECT * FROM test_02428_Ca
 $CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv1(price=20)"
 $CLICKHOUSE_CLIENT -q "SELECT Price FROM \`test_02428_pv1\`(price=20)"
 
-$CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv1" 2>&1 |  grep -Fq "UNKNOWN_QUERY_PARAMETER" && echo 'ERROR' || echo 'OK'
+$CLICKHOUSE_CLIENT -q "SELECT Price FROM test_02428_pv1" 2>&1 |  grep -q "UNKNOWN_QUERY_PARAMETER\|UNKNOWN_IDENTIFIER" && echo 'ERROR' || echo 'OK'
 $CLICKHOUSE_CLIENT --param_p 10 -q "SELECT Price FROM test_02428_pv1(price={p:UInt64})"
 
 $CLICKHOUSE_CLIENT --param_l 1 -q "SELECT Price FROM test_02428_pv1(price=50) LIMIT ({l:UInt64})"
@@ -72,7 +72,8 @@ $CLICKHOUSE_CLIENT -q "INSERT INTO ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog VALUES
 $CLICKHOUSE_CLIENT -q "INSERT INTO ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog VALUES ('Paper', 20, 1)"
 $CLICKHOUSE_CLIENT -q "CREATE VIEW ${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1 AS SELECT * FROM ${CLICKHOUSE_TEST_UNIQUE_NAME}.Catalog WHERE Price={price:UInt64}"
 $CLICKHOUSE_CLIENT -q "SELECT Price FROM ${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1(price=20)"
-$CLICKHOUSE_CLIENT -q "SELECT Price FROM \`${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1\`(price=20)"  2>&1 |  grep -Fq "UNKNOWN_FUNCTION" &&  echo 'ERROR' || echo 'OK'
+$CLICKHOUSE_CLIENT -q "SELECT Price FROM \`${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1\`(price=20) SETTINGS allow_experimental_analyzer = 0"  2>&1 |  grep -Fq "UNKNOWN_FUNCTION" &&  echo 'ERROR' || echo 'OK'
+$CLICKHOUSE_CLIENT -q "SELECT Price FROM \`${CLICKHOUSE_TEST_UNIQUE_NAME}.pv1\`(price=20) SETTINGS allow_experimental_analyzer = 1"
 
 
 $CLICKHOUSE_CLIENT -q "INSERT INTO test_02428_Catalog VALUES ('Book2', 30, 8)"
diff --git a/tests/queries/0_stateless/02447_drop_database_replica.reference b/tests/queries/0_stateless/02447_drop_database_replica.reference
index 1af3ee244f1..bd3b689ca3c 100644
--- a/tests/queries/0_stateless/02447_drop_database_replica.reference
+++ b/tests/queries/0_stateless/02447_drop_database_replica.reference
@@ -13,6 +13,7 @@ t
 rdb_default	1	1	s1	r1	1
 2
 2
+2
 s1	r1	OK	2	0
 s1	r2	QUEUED	2	0
 s2	r1	QUEUED	2	0
@@ -24,4 +25,5 @@ rdb_default	1	2	s1	r2	0
 t
 t2
 t3
+t4
 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 fb89db5045b..5c4604bc8cd 100755
--- a/tests/queries/0_stateless/02447_drop_database_replica.sh
+++ b/tests/queries/0_stateless/02447_drop_database_replica.sh
@@ -33,8 +33,9 @@ $CLICKHOUSE_CLIENT -q "select cluster, shard_num, replica_num, database_shard_na
 $CLICKHOUSE_CLIENT -q "system drop database replica 's1|r1' from database $db2" 2>&1| grep -Fac "is active, cannot drop it"
 
 # Also check that it doesn't exceed distributed_ddl_task_timeout waiting for inactive replicas
-timeout 60s $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=1000 --distributed_ddl_output_mode=throw_only_active -q "create table $db.t2 (n int) engine=Log" 2>&1| grep -Fac "TIMEOUT_EXCEEDED"
-timeout 60s $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=1000 --distributed_ddl_output_mode=null_status_on_timeout_only_active -q "create table $db.t3 (n int) engine=Log" | sort
+timeout 60s $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=1000 --distributed_ddl_output_mode=none_only_active -q "create table $db.t2 (n int) engine=Log" 2>&1| grep -Fac "TIMEOUT_EXCEEDED"
+timeout 60s $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=1000 --distributed_ddl_output_mode=throw_only_active -q "create table $db.t3 (n int) engine=Log" 2>&1| grep -Fac "TIMEOUT_EXCEEDED"
+timeout 60s $CLICKHOUSE_CLIENT --distributed_ddl_task_timeout=1000 --distributed_ddl_output_mode=null_status_on_timeout_only_active -q "create table $db.t4 (n int) engine=Log" | sort
 
 $CLICKHOUSE_CLIENT -q "detach database $db3"
 $CLICKHOUSE_CLIENT -q "system drop database replica 'r1' from shard 's2' from database $db"
diff --git a/tests/queries/0_stateless/02449_check_dependencies_and_table_shutdown.reference b/tests/queries/0_stateless/02449_check_dependencies_and_table_shutdown.reference
index 37cd3d93e39..317dbe1c61c 100644
--- a/tests/queries/0_stateless/02449_check_dependencies_and_table_shutdown.reference
+++ b/tests/queries/0_stateless/02449_check_dependencies_and_table_shutdown.reference
@@ -1,5 +1,5 @@
 CREATE DICTIONARY default.dict\n(\n    `id` UInt32,\n    `value` String\n)\nPRIMARY KEY id\nSOURCE(CLICKHOUSE(HOST \'localhost\' PORT 9000 USER \'default\' DB \'default\' TABLE \'view\'))\nLIFETIME(MIN 600 MAX 600)\nLAYOUT(HASHED())
-CREATE TABLE default.table\n(\n    `col` String MATERIALIZED dictGet(\'default.dict\', \'value\', toUInt32(1))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
+CREATE TABLE default.`table`\n(\n    `col` String MATERIALIZED dictGet(\'default.dict\', \'value\', toUInt32(1))\n)\nENGINE = MergeTree\nORDER BY tuple()\nSETTINGS index_granularity = 8192
 1	v
 1	v
 1	v
diff --git a/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh b/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh
index 03c43843d3a..0cd520d8d5d 100755
--- a/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh
+++ b/tests/queries/0_stateless/02450_kill_distributed_query_deadlock.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long
+# Tags: long, no-random-settings, no-debug
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02454_set_parameters_formatting.reference b/tests/queries/0_stateless/02454_set_parameters_formatting.reference
index 1098a8159f3..c438c068635 100644
--- a/tests/queries/0_stateless/02454_set_parameters_formatting.reference
+++ b/tests/queries/0_stateless/02454_set_parameters_formatting.reference
@@ -1,3 +1,3 @@
-SET param_a = 1
-SET max_threads = 1, param_a = 1
-SET max_threads = 1, param_a = 1
+SET param_a = '1'
+SET max_threads = 1, param_a = '1'
+SET max_threads = 1, param_a = '1'
diff --git a/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql b/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql
index 626a4d7034e..f67e5496a98 100644
--- a/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql
+++ b/tests/queries/0_stateless/02455_duplicate_column_names_in_schema_inference.sql
@@ -1,7 +1,7 @@
 -- Tags: no-fasttest
 
-desc format(JSONEachRow, '{"x" : 1, "x" : 2}'); -- {serverError INCORRECT_DATA}
-desc format(JSONEachRow, '{"x" : 1, "y" : 2}\n{"x" : 2, "x" : 3}'); -- {serverError INCORRECT_DATA}
-desc format(CSVWithNames, 'a,b,a\n1,2,3'); -- {serverError INCORRECT_DATA}
-desc format(CSV, '1,2,3') settings column_names_for_schema_inference='a, b, a'; -- {serverError INCORRECT_DATA}
+desc format(JSONEachRow, '{"x" : 1, "x" : 2}'); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+desc format(JSONEachRow, '{"x" : 1, "y" : 2}\n{"x" : 2, "x" : 3}'); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+desc format(CSVWithNames, 'a,b,a\n1,2,3'); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+desc format(CSV, '1,2,3') settings column_names_for_schema_inference='a, b, a'; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 
diff --git a/tests/queries/0_stateless/02456_progress_tty.expect b/tests/queries/0_stateless/02456_progress_tty.expect
index 3d1d92e5400..dd11ad3d90c 100755
--- a/tests/queries/0_stateless/02456_progress_tty.expect
+++ b/tests/queries/0_stateless/02456_progress_tty.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
@@ -18,34 +23,34 @@ spawn bash
 send "source $basedir/../shell_config.sh\r"
 
 # Progress is not displayed by default
-send "\$CLICKHOUSE_LOCAL --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
 expect -exact "0\tHello\r\n"
 send "\3"
 
 # The option --progress has implicit value of true
-send "\$CLICKHOUSE_LOCAL --progress --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --progress --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null\r"
 expect "Progress: "
 expect "â–ˆ"
 send "\3"
 
 # It works even if we redirect both stdout and stderr to /dev/null
-send "\$CLICKHOUSE_LOCAL --progress --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null 2>&1\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --progress --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null 2>&1\r"
 expect "Progress: "
 expect "â–ˆ"
 send "\3"
 
 # But we can set it to false
-send "\$CLICKHOUSE_LOCAL --progress false --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --progress false --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
 expect -exact "0\tHello\r\n"
 send "\3"
 
 # As well as to 0 for the same effect
-send "\$CLICKHOUSE_LOCAL --progress 0 --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --progress 0 --query 'SELECT sleep(1), \$\$Hello\$\$ FROM numbers(3) SETTINGS max_block_size = 1' 2>/dev/null\r"
 expect -exact "0\tHello\r\n"
 send "\3"
 
 # If we set it to 1, the progress will be displayed as well
-send "\$CLICKHOUSE_LOCAL --progress 1 --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null 2>&1\r"
+send "\$CLICKHOUSE_LOCAL --format TSV --progress 1 --query 'SELECT sum(sleep(1) = 0) FROM numbers(3) SETTINGS max_block_size = 1' >/dev/null 2>&1\r"
 expect "Progress: "
 expect "â–ˆ"
 send "\3"
diff --git a/tests/queries/0_stateless/02457_insert_select_progress_http.sh b/tests/queries/0_stateless/02457_insert_select_progress_http.sh
index ae62ee4b77e..ccf37dfb327 100755
--- a/tests/queries/0_stateless/02457_insert_select_progress_http.sh
+++ b/tests/queries/0_stateless/02457_insert_select_progress_http.sh
@@ -4,6 +4,6 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0" -d @- <<< "insert into function null('_ Int') select * from numbers(5) settings max_block_size=1" -v |& {
+${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&send_progress_in_http_headers=1&http_headers_progress_interval_ms=0" -d @- <<< "insert into function null('_ Int') select * from numbers(5) settings max_block_size=1, max_insert_threads=1" -v |& {
     grep -F -e X-ClickHouse-Progress: -e X-ClickHouse-Summary:  | sed 's/,\"elapsed_ns[^}]*//'
 }
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 ac549a7faf1..71a2381d7b6 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,14 +10,14 @@ set input_format_json_infer_incomplete_types_as_strings=0;
 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 + 1, y from file(02458_data.jsonl); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 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}
-insert into test select x, y from file(02458_data.jsoncompacteachrow); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
-insert into test select x + 1, y from file(02458_data.jsoncompacteachrow); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
-insert into test select x, z from file(02458_data.jsoncompacteachrow); -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
+insert into test select x, 1 from file(02458_data.jsoncompacteachrow); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+insert into test select x, y from file(02458_data.jsoncompacteachrow); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+insert into test select x + 1, y from file(02458_data.jsoncompacteachrow); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
+insert into test select x, z from file(02458_data.jsoncompacteachrow); -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 
 insert into test select * from input() format CSV 1,2
 insert into test select x, y from input() format CSV 1,2 -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
diff --git a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
index 783d12fcf1a..21ddf5d3512 100644
--- a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
+++ b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.reference
@@ -8,3 +8,10 @@
 \0\0\0\0\0
 131231
 131231
+1234
+1234
+{"b":131231}
+\0\0\0\0
+1234567890
+18446744073709551615
+-9223372036854775807
diff --git a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql
index cfc47e00cba..bbb9f55062b 100644
--- a/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql
+++ b/tests/queries/0_stateless/02474_extract_fixedstring_from_json.sql
@@ -6,3 +6,10 @@ SELECT JSONExtract('{"a": 123456}', 'a', 'FixedString(5)');
 SELECT JSONExtract('{"a": 123456}', 'a', 'FixedString(6)');
 SELECT JSONExtract(materialize('{"a": 131231}'), 'a', 'LowCardinality(FixedString(5))') FROM numbers(2);
 SELECT JSONExtract(materialize('{"a": 131231}'), 'a', 'LowCardinality(FixedString(6))') FROM numbers(2);
+SELECT JSONExtract(materialize('{"a": 131231, "b": 1234}'), 'b', 'LowCardinality(FixedString(4))');
+SELECT JSONExtract(materialize('{"a": 131231, "b": "1234"}'), 'b', 'LowCardinality(FixedString(4))');
+SELECT JSONExtract(materialize('{"a": {"b": 131231} }'), 'a', 'LowCardinality(FixedString(12))');
+SELECT JSONExtract(materialize('{"a": 131231, "b": 1234567890}'), 'b', 'LowCardinality(FixedString(4))');
+SELECT JSONExtract(materialize('{"a": 131231, "b": 1234567890}'), 'b', 'LowCardinality(FixedString(10))');
+SELECT JSONExtract(materialize('{"a": 18446744073709551615}'), 'a', 'LowCardinality(FixedString(20))');
+SELECT JSONExtract(materialize('{"a": -9223372036854775807}'), 'a', 'LowCardinality(FixedString(20))');
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 aa58d27fa50..474a6cd0e47 100755
--- a/tests/queries/0_stateless/02475_bson_each_row_format.sh
+++ b/tests/queries/0_stateless/02475_bson_each_row_format.sh
@@ -1,10 +1,16 @@
 #!/usr/bin/env bash
-# Tags: no-parallel
+# Tags: no-parallel, no-debug
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
+# In case of parallel parsing and small block
+# (--min_chunk_bytes_for_parallel_parsing) we may have multiple blocks, and
+# this will break sorting order, so let's limit number of threads to avoid
+# reordering.
+CLICKHOUSE_CLIENT+="--allow_repeated_settings --max_threads 1"
+
 echo "Integers"
 $CLICKHOUSE_CLIENT -q "insert into function file(02475_data.bsonEachRow) select number::Bool as bool, number::Int8 as int8, number::UInt8 as uint8, number::Int16 as int16, number::UInt16 as uint16, number::Int32 as int32, number::UInt32 as uint32, number::Int64 as int64, number::UInt64 as uint64 from numbers(5) settings engine_file_truncate_on_insert=1"
 $CLICKHOUSE_CLIENT -q "select * from file(02475_data.bsonEachRow, auto, 'bool Bool, int8 Int8, uint8 UInt8, int16 Int16, uint16 UInt16, int32 Int32, uint32 UInt32, int64 Int64, uint64 UInt64')"
diff --git a/tests/queries/0_stateless/02476_fix_lambda_parsing.reference b/tests/queries/0_stateless/02476_fix_lambda_parsing.reference
index de508c7a0d3..04e64792b23 100644
--- a/tests/queries/0_stateless/02476_fix_lambda_parsing.reference
+++ b/tests/queries/0_stateless/02476_fix_lambda_parsing.reference
@@ -1,4 +1,4 @@
-SELECT f(x, y -> z)
+SELECT f(x, (y -> z))
 SELECT f((x, y) -> z)
 SELECT f((x, y) -> z)
-SELECT f(x, (x, y) -> z)
+SELECT f(x, ((x, y) -> z))
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 6838dacc3b3..8057b945c5a 100644
--- a/tests/queries/0_stateless/02479_mysql_connect_to_self.reference
+++ b/tests/queries/0_stateless/02479_mysql_connect_to_self.reference
@@ -67,6 +67,6 @@ SELECT
     __table1.a AS a,
     __table1.b AS b,
     __table1.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) AS __table1
+FROM mysql(\'127.0.0.1:9004\', _CAST(\'default\', \'String\'), foo, \'default\', \'\', SETTINGS connection_wait_timeout = 123, connect_timeout = 40123002, read_write_timeout = 40123001, connection_pool_size = 3) AS __table1
 ---
 5
diff --git a/tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect b/tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect
index dd3c9309b2d..673a9a17c95 100755
--- a/tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect
+++ b/tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
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 969ec320790..ec3d1c15690 100644
--- a/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference
+++ b/tests/queries/0_stateless/02481_aggregation_in_order_plan.reference
@@ -4,7 +4,7 @@
 0	1	2	200
   Aggregating
   Order: a ASC, c ASC
-      ReadFromMergeTree (default.tab)
+        ReadFromMergeTree (default.tab)
   Aggregating
   Order: __table1.a ASC, __table1.c ASC
         ReadFromMergeTree (default.tab)
diff --git a/tests/queries/0_stateless/02481_async_insert_dedup.python b/tests/queries/0_stateless/02481_async_insert_dedup.python
index 0e80a21bf46..24512836290 100644
--- a/tests/queries/0_stateless/02481_async_insert_dedup.python
+++ b/tests/queries/0_stateless/02481_async_insert_dedup.python
@@ -119,7 +119,7 @@ q = queue.Queue(100)
 total_number = 10000
 
 use_token = False
-if len(sys.argv) > 3 and sys.argv[2] == "token":
+if len(sys.argv) >= 3 and sys.argv[2] == "token":
     use_token = True
 
 gen = Thread(target=generate_data, args=[q, total_number, use_token])
diff --git a/tests/queries/0_stateless/02486_truncate_and_unexpected_parts.sql b/tests/queries/0_stateless/02486_truncate_and_unexpected_parts.sql
index 5c90313b6b8..507ac7289f5 100644
--- a/tests/queries/0_stateless/02486_truncate_and_unexpected_parts.sql
+++ b/tests/queries/0_stateless/02486_truncate_and_unexpected_parts.sql
@@ -5,7 +5,7 @@ create table rmt1 (n int) engine=ReplicatedMergeTree('/test/02468/{database}', '
 system stop cleanup rmt;
 system stop merges rmt1;
 
-insert into rmt select * from numbers(10) settings max_block_size=1;
+insert into rmt select * from numbers(10) settings max_block_size=1, max_insert_threads=1;
 
 alter table rmt drop partition id '0';
 truncate table rmt1;
@@ -31,7 +31,7 @@ create table rmt2 (n int) engine=ReplicatedMergeTree('/test/02468/{database}2',
 
 system stop cleanup rmt;
 system stop merges rmt1;
-insert into rmt select * from numbers(10) settings max_block_size=1;
+insert into rmt select * from numbers(10) settings max_block_size=1, max_insert_threads=1;
 system sync replica rmt1 lightweight;
 
 alter table rmt replace partition id '0' from rmt2;
diff --git a/tests/queries/0_stateless/02493_inconsistent_hex_and_binary_number.expect b/tests/queries/0_stateless/02493_inconsistent_hex_and_binary_number.expect
index 2d595b0f492..a111a0cfd23 100755
--- a/tests/queries/0_stateless/02493_inconsistent_hex_and_binary_number.expect
+++ b/tests/queries/0_stateless/02493_inconsistent_hex_and_binary_number.expect
@@ -2,7 +2,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 
 log_user 0
 set timeout 60
@@ -18,23 +23,23 @@ spawn bash
 send "source $basedir/../shell_config.sh\r"
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0b'\r"
-expect "DB::Exception: Missing columns: '0b' while processing query: 'SELECT `0b`', required columns: '0b'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0b;'\r"
-expect "DB::Exception: Missing columns: '0b' while processing query: 'SELECT `0b`', required columns: '0b'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0b ;'\r"
-expect "DB::Exception: Missing columns: '0b' while processing query: 'SELECT `0b`', required columns: '0b'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0x'\r"
-expect "DB::Exception: Missing columns: '0x' while processing query: 'SELECT `0x`', required columns: '0x'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0x;'\r"
-expect "DB::Exception: Missing columns: '0x' while processing query: 'SELECT `0x`', required columns: '0x'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 send "\$CLICKHOUSE_CLIENT --query 'select 0x ;'\r"
-expect "DB::Exception: Missing columns: '0x' while processing query: 'SELECT `0x`', required columns: '0x'. (UNKNOWN_IDENTIFIER)"
+expect "(UNKNOWN_IDENTIFIER)"
 
 send "exit\r"
 expect eof
diff --git a/tests/queries/0_stateless/02493_max_streams_for_merge_tree_reading.sql b/tests/queries/0_stateless/02493_max_streams_for_merge_tree_reading.sql
index f2e81273f12..cbf645ddec5 100644
--- a/tests/queries/0_stateless/02493_max_streams_for_merge_tree_reading.sql
+++ b/tests/queries/0_stateless/02493_max_streams_for_merge_tree_reading.sql
@@ -1,5 +1,7 @@
 -- Tags: no-random-merge-tree-settings
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists t;
 create table t (x UInt64) engine = MergeTree order by x;
 insert into t select number from numbers_mt(10000000) settings max_insert_threads=8;
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 5c45ee8aedd..f7ddb8f8bda 100644
--- a/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql
+++ b/tests/queries/0_stateless/02494_query_cache_eligible_queries.sql
@@ -7,6 +7,7 @@ DROP TABLE IF EXISTS eligible_test2;
 
 -- enable query cache session-wide but also force it individually in each of below statements
 SET use_query_cache = true;
+SET query_cache_system_table_handling = 'save';
 
 -- check that SELECT statements create entries in the query cache ...
 SELECT 1 SETTINGS use_query_cache = true;
diff --git a/tests/queries/0_stateless/02494_query_cache_explain.sql b/tests/queries/0_stateless/02494_query_cache_explain.sql
index d12938181c2..bf376b47fdb 100644
--- a/tests/queries/0_stateless/02494_query_cache_explain.sql
+++ b/tests/queries/0_stateless/02494_query_cache_explain.sql
@@ -2,6 +2,7 @@
 -- Tag no-parallel: Messes with internal cache
 
 SET allow_experimental_analyzer = 1;
+SET query_cache_system_table_handling = 'save';
 
 SYSTEM DROP QUERY CACHE;
 
diff --git a/tests/queries/0_stateless/02494_query_cache_nested_query_bug.sh b/tests/queries/0_stateless/02494_query_cache_nested_query_bug.sh
index 394367919e9..8712c7c84c6 100755
--- a/tests/queries/0_stateless/02494_query_cache_nested_query_bug.sh
+++ b/tests/queries/0_stateless/02494_query_cache_nested_query_bug.sh
@@ -15,9 +15,11 @@ ${CLICKHOUSE_CLIENT} --query "CREATE TABLE tab (a UInt64) ENGINE=MergeTree() ORD
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO tab VALUES (1) (2) (3)"
 ${CLICKHOUSE_CLIENT} --query "INSERT INTO tab VALUES (3) (4) (5)"
 
+SETTINGS="SETTINGS use_query_cache=1, max_threads=1, allow_experimental_analyzer=0, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=0.0"
+
 # Verify that the first query does two aggregations and the second query zero aggregations. Since query cache is currently not integrated
-# with EXPLAIN PLAN, we need need to check the logs.
-${CLICKHOUSE_CLIENT} --send_logs_level=trace --query "SELECT count(a) / (SELECT sum(a) FROM tab) FROM tab SETTINGS use_query_cache=1, max_threads=1, allow_experimental_analyzer=0" 2>&1 | grep "Aggregated. " | wc -l
-${CLICKHOUSE_CLIENT} --send_logs_level=trace --query "SELECT count(a) / (SELECT sum(a) FROM tab) FROM tab SETTINGS use_query_cache=1, max_threads=1, allow_experimental_analyzer=0" 2>&1 | grep "Aggregated. " | wc -l
+# with EXPLAIN PLAN, we need to check the logs.
+${CLICKHOUSE_CLIENT} --send_logs_level=trace --query "SELECT count(a) / (SELECT sum(a) FROM tab) FROM tab $SETTINGS" 2>&1 | grep "Aggregated. " | wc -l
+${CLICKHOUSE_CLIENT} --send_logs_level=trace --query "SELECT count(a) / (SELECT sum(a) FROM tab) FROM tab $SETTINGS" 2>&1 | grep "Aggregated. " | wc -l
 
 ${CLICKHOUSE_CLIENT} --query "SYSTEM DROP QUERY CACHE"
diff --git a/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql b/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql
index 4344d139d60..6266996ac2e 100644
--- a/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql
+++ b/tests/queries/0_stateless/02494_query_cache_sparse_columns.sql
@@ -12,11 +12,10 @@ 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 v FROM t_cache_sparse SETTINGS use_query_cache = 1, max_threads = 1 FORMAT Null;
+SELECT v FROM t_cache_sparse SETTINGS use_query_cache = 1, max_threads = 1 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_system_tables.reference b/tests/queries/0_stateless/02494_query_cache_system_tables.reference
new file mode 100644
index 00000000000..e41e365766e
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_system_tables.reference
@@ -0,0 +1,13 @@
+The Default for query_cache_system_table_handling is = throw
+0
+Check behavior of query_cache_system_table_handling = throw
+0
+Check behavior of query_cache_system_table_handling = save
+0
+1
+Check behavior of query_cache_system_table_handling = ignore
+0
+0
+Other tests
+0
+0
diff --git a/tests/queries/0_stateless/02494_query_cache_system_tables.sql b/tests/queries/0_stateless/02494_query_cache_system_tables.sql
new file mode 100644
index 00000000000..7c9f01c4e91
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_system_tables.sql
@@ -0,0 +1,64 @@
+-- Tags: no-parallel
+-- Tag no-parallel: Messes with internal cache
+
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'The Default for query_cache_system_table_handling is = throw';
+-- Test that the query cache rejects queries that involve system tables.
+SELECT * FROM system.one SETTINGS use_query_cache = 1; -- { serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+SELECT count(*) FROM system.query_cache;
+
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'Check behavior of query_cache_system_table_handling = throw';
+-- Test that the query cache rejects queries that involve system tables.
+SELECT * FROM system.one SETTINGS use_query_cache = 1, query_cache_system_table_handling = 'throw'; -- { serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+SELECT count(*) FROM system.query_cache;
+
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'Check behavior of query_cache_system_table_handling = save';
+-- Test that the query cache saves the result of queries that involve system tables.
+SELECT * FROM system.one SETTINGS use_query_cache = 1, query_cache_system_table_handling = 'save';
+SELECT count(*) FROM system.query_cache;
+
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'Check behavior of query_cache_system_table_handling = ignore';
+-- Test that the query cache ignores the result of queries that involve system tables.
+SELECT * FROM system.one SETTINGS use_query_cache = 1, query_cache_system_table_handling = 'ignore';
+SELECT count(*) FROM system.query_cache;
+
+SYSTEM DROP QUERY CACHE;
+
+SELECT 'Other tests';
+
+-- Edge case which doesn't work well due to conceptual reasons (QueryCache is AST-based), test it anyways to have it documented.
+USE system;
+SELECT * FROM one SETTINGS use_query_cache = 1; -- doesn't throw but should
+
+-- This query uses system.zero internally. Since the query cache works at AST level it does not "see' system.zero and must not complain.
+SELECT * SETTINGS use_query_cache = 1;
+
+-- information_schema is also treated as a system table
+SELECT * FROM information_schema.tables SETTINGS use_query_cache = 1; -- { serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+SELECT * FROM INFORMATION_SCHEMA.TABLES SETTINGS use_query_cache = 1; -- { serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+
+-- System tables can be "hidden" inside e.g. table functions
+SELECT * FROM clusterAllReplicas('test_shard_localhost', system.one) SETTINGS use_query_cache = 1; -- {serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+SELECT * FROM clusterAllReplicas('test_shard_localhost', 'system.one') SETTINGS use_query_cache = 1; -- {serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+
+-- Criminal edge case that a user creates a table named "system". The query cache must not reject queries against it.
+DROP TABLE IF EXISTS system;
+CREATE TABLE system (c UInt64) ENGINE = Memory;
+SElECT * FROM system SETTINGS use_query_cache = 1;
+DROP TABLE system;
+
+-- But queries against system.system are rejected.
+DROP TABLE IF EXISTS system.system;
+CREATE TABLE system.system (c UInt64) ENGINE = Memory;
+SElECT * FROM system.system SETTINGS use_query_cache = 1; -- { serverError QUERY_CACHE_USED_WITH_SYSTEM_TABLE }
+DROP TABLE system.system;
+
+-- Cleanup
+SYSTEM DROP QUERY CACHE;
diff --git a/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.reference b/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.reference
new file mode 100644
index 00000000000..5bfc400b254
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.reference
@@ -0,0 +1,13 @@
+a
+b
+1
+c
+d
+3
+--
+a
+b
+1
+c
+d
+3
diff --git a/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.sql b/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.sql
new file mode 100644
index 00000000000..f09e43ee052
--- /dev/null
+++ b/tests/queries/0_stateless/02494_query_cache_user_quotas_after_drop.sql
@@ -0,0 +1,41 @@
+-- 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;
+
+-- Run SELECT with quota that current user may write only 1 entry in the query cache
+SET query_cache_max_entries = 1;
+SELECT 'a' SETTINGS use_query_cache = true;
+SELECT 'b' SETTINGS use_query_cache = true;
+SELECT count(*) FROM system.query_cache; -- expect 1 entry
+
+-- Run SELECTs again but w/o quota
+SET query_cache_max_entries = DEFAULT;
+SELECT 'c' SETTINGS use_query_cache = true;
+SELECT 'd' SETTINGS use_query_cache = true;
+SELECT count(*) FROM system.query_cache; -- expect 3 entries
+
+SYSTEM DROP QUERY CACHE;
+
+-- Run the same as above after a DROP QUERY CACHE.
+SELECT '--';
+
+SET query_cache_max_entries = 1;
+SELECT 'a' SETTINGS use_query_cache = true;
+SELECT 'b' SETTINGS use_query_cache = true;
+SELECT count(*) FROM system.query_cache; -- expect 1 entry
+
+-- Run SELECTs again but w/o quota
+SET query_cache_max_entries = DEFAULT;
+SELECT 'c' SETTINGS use_query_cache = true;
+SELECT 'd' SETTINGS use_query_cache = true;
+SELECT count(*) FROM system.query_cache; -- expect 3 entries
+
+SYSTEM DROP QUERY CACHE;
+
+-- SELECT '---';
+
diff --git a/tests/queries/0_stateless/02495_concat_with_separator.reference b/tests/queries/0_stateless/02495_concat_with_separator.reference
index 8f0ea917f4b..ebff5deb6aa 100644
--- a/tests/queries/0_stateless/02495_concat_with_separator.reference
+++ b/tests/queries/0_stateless/02495_concat_with_separator.reference
@@ -14,6 +14,45 @@
 1
 1
 1
+1
+1
 \N
 \N
 \N
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+1
+0
diff --git a/tests/queries/0_stateless/02495_concat_with_separator.sql b/tests/queries/0_stateless/02495_concat_with_separator.sql
index 916c4cda1b7..7167d48a1da 100644
--- a/tests/queries/0_stateless/02495_concat_with_separator.sql
+++ b/tests/queries/0_stateless/02495_concat_with_separator.sql
@@ -1,27 +1,72 @@
-select concatWithSeparator('|', 'a', 'b') == 'a|b';
-select concatWithSeparator('|', 'a', materialize('b')) == 'a|b';
-select concatWithSeparator('|', materialize('a'), 'b') == 'a|b';
-select concatWithSeparator('|', materialize('a'), materialize('b')) == 'a|b';
+SET allow_suspicious_low_cardinality_types=1;
 
-select concatWithSeparator('|', 'a', toFixedString('b', 1)) == 'a|b';
-select concatWithSeparator('|', 'a', materialize(toFixedString('b', 1))) == 'a|b';
-select concatWithSeparator('|', materialize('a'), toFixedString('b', 1)) == 'a|b';
-select concatWithSeparator('|', materialize('a'), materialize(toFixedString('b', 1))) == 'a|b';
+-- negative tests
+SELECT concatWithSeparator(materialize('|'), 'a', 'b'); -- { serverError ILLEGAL_COLUMN }
+SELECT concatWithSeparator();                           -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
 
-select concatWithSeparator('|', toFixedString('a', 1), 'b') == 'a|b';
-select concatWithSeparator('|', toFixedString('a', 1), materialize('b')) == 'a|b';
-select concatWithSeparator('|', materialize(toFixedString('a', 1)), 'b') == 'a|b';
-select concatWithSeparator('|', materialize(toFixedString('a', 1)), materialize('b')) == 'a|b';
+-- special cases
+SELECT concatWithSeparator('|') = '';
+SELECT concatWithSeparator('|', 'a') == 'a';
 
-select concatWithSeparator('|', toFixedString('a', 1), toFixedString('b', 1)) == 'a|b';
-select concatWithSeparator('|', toFixedString('a', 1), materialize(toFixedString('b', 1))) == 'a|b';
-select concatWithSeparator('|', materialize(toFixedString('a', 1)), toFixedString('b', 1)) == 'a|b';
-select concatWithSeparator('|', materialize(toFixedString('a', 1)), materialize(toFixedString('b', 1))) == 'a|b';
+SELECT concatWithSeparator('|', 'a', 'b') == 'a|b';
+SELECT concatWithSeparator('|', 'a', materialize('b')) == 'a|b';
+SELECT concatWithSeparator('|', materialize('a'), 'b') == 'a|b';
+SELECT concatWithSeparator('|', materialize('a'), materialize('b')) == 'a|b';
 
-select concatWithSeparator(null, 'a', 'b') == null;
-select concatWithSeparator('1', null, 'b') == null;
-select concatWithSeparator('1', 'a', null) == null;
+SELECT concatWithSeparator('|', 'a', toFixedString('b', 1)) == 'a|b';
+SELECT concatWithSeparator('|', 'a', materialize(toFixedString('b', 1))) == 'a|b';
+SELECT concatWithSeparator('|', materialize('a'), toFixedString('b', 1)) == 'a|b';
+SELECT concatWithSeparator('|', materialize('a'), materialize(toFixedString('b', 1))) == 'a|b';
 
-select concatWithSeparator(materialize('|'), 'a', 'b'); -- { serverError 44 }
-select concatWithSeparator();                           -- { serverError 42 }
-select concatWithSeparator('|', 'a', 100);              -- { serverError 43 }
+SELECT concatWithSeparator('|', toFixedString('a', 1), 'b') == 'a|b';
+SELECT concatWithSeparator('|', toFixedString('a', 1), materialize('b')) == 'a|b';
+SELECT concatWithSeparator('|', materialize(toFixedString('a', 1)), 'b') == 'a|b';
+SELECT concatWithSeparator('|', materialize(toFixedString('a', 1)), materialize('b')) == 'a|b';
+
+SELECT concatWithSeparator('|', toFixedString('a', 1), toFixedString('b', 1)) == 'a|b';
+SELECT concatWithSeparator('|', toFixedString('a', 1), materialize(toFixedString('b', 1))) == 'a|b';
+SELECT concatWithSeparator('|', materialize(toFixedString('a', 1)), toFixedString('b', 1)) == 'a|b';
+SELECT concatWithSeparator('|', materialize(toFixedString('a', 1)), materialize(toFixedString('b', 1))) == 'a|b';
+
+SELECT concatWithSeparator(null, 'a', 'b') == null;
+SELECT concatWithSeparator('1', null, 'b') == null;
+SELECT concatWithSeparator('1', 'a', null) == null;
+
+-- Const String + non-const non-String/non-FixedString type'
+SELECT concatWithSeparator('|', 'a', materialize(42 :: Int8)) == 'a|42';
+SELECT concatWithSeparator('|', 'a', materialize(43 :: Int16)) == 'a|43';
+SELECT concatWithSeparator('|', 'a', materialize(44 :: Int32)) == 'a|44';
+SELECT concatWithSeparator('|', 'a', materialize(45 :: Int64)) == 'a|45';
+SELECT concatWithSeparator('|', 'a', materialize(46 :: Int128)) == 'a|46';
+SELECT concatWithSeparator('|', 'a', materialize(47 :: Int256)) == 'a|47';
+SELECT concatWithSeparator('|', 'a', materialize(48 :: UInt8)) == 'a|48';
+SELECT concatWithSeparator('|', 'a', materialize(49 :: UInt16)) == 'a|49';
+SELECT concatWithSeparator('|', 'a', materialize(50 :: UInt32)) == 'a|50';
+SELECT concatWithSeparator('|', 'a', materialize(51 :: UInt64)) == 'a|51';
+SELECT concatWithSeparator('|', 'a', materialize(52 :: UInt128)) == 'a|52';
+SELECT concatWithSeparator('|', 'a', materialize(53 :: UInt256)) == 'a|53';
+SELECT concatWithSeparator('|', 'a', materialize(42.42 :: Float32)) == 'a|42.42';
+SELECT concatWithSeparator('|', 'a', materialize(43.43 :: Float64)) == 'a|43.43';
+SELECT concatWithSeparator('|', 'a', materialize(44.44 :: Decimal(2))) == 'a|44';
+SELECT concatWithSeparator('|', 'a', materialize(true :: Bool)) == 'a|true';
+SELECT concatWithSeparator('|', 'a', materialize(false :: Bool)) == 'a|false';
+SELECT concatWithSeparator('|', 'a', materialize('foo' :: String)) == 'a|foo';
+SELECT concatWithSeparator('|', 'a', materialize('bar' :: FixedString(3))) == 'a|bar';
+SELECT concatWithSeparator('|', 'a', materialize('foo' :: Nullable(String))) == 'a|foo';
+SELECT concatWithSeparator('|', 'a', materialize('bar' :: Nullable(FixedString(3)))) == 'a|bar';
+SELECT concatWithSeparator('|', 'a', materialize('foo' :: LowCardinality(String))) == 'a|foo';
+SELECT concatWithSeparator('|', 'a', materialize('bar' :: LowCardinality(FixedString(3)))) == 'a|bar';
+SELECT concatWithSeparator('|', 'a', materialize('foo' :: LowCardinality(Nullable(String)))) == 'a|foo';
+SELECT concatWithSeparator('|', 'a', materialize('bar' :: LowCardinality(Nullable(FixedString(3))))) == 'a|bar';
+SELECT concatWithSeparator('|', 'a', materialize(42 :: LowCardinality(Nullable(UInt32)))) == 'a|42';
+SELECT concatWithSeparator('|', 'a', materialize(42 :: LowCardinality(UInt32))) == 'a|42';
+SELECT concatWithSeparator('|', 'a', materialize('fae310ca-d52a-4923-9e9b-02bf67f4b009' :: UUID)) == 'a|fae310ca-d52a-4923-9e9b-02bf67f4b009';
+SELECT concatWithSeparator('|', 'a', materialize('2023-11-14' :: Date)) == 'a|2023-11-14';
+SELECT concatWithSeparator('|', 'a', materialize('2123-11-14' :: Date32)) == 'a|2123-11-14';
+SELECT concatWithSeparator('|', 'a', materialize('2023-11-14 05:50:12' :: DateTime('Europe/Amsterdam'))) == 'a|2023-11-14 05:50:12';
+SELECT concatWithSeparator('|', 'a', materialize('hallo' :: Enum('hallo' = 1))) == 'a|hallo';
+SELECT concatWithSeparator('|', 'a', materialize(['foo', 'bar'] :: Array(String))) == 'a|[\'foo\',\'bar\']';
+SELECT concatWithSeparator('|', 'a', materialize((42, 'foo') :: Tuple(Int32, String))) == 'a|(42,\'foo\')';
+SELECT concatWithSeparator('|', 'a', materialize(map(42, 'foo') :: Map(Int32, String))) == 'a|{42:\'foo\'}';
+SELECT concatWithSeparator('|', 'a', materialize('122.233.64.201' :: IPv4)) == 'a|122.233.64.201';
+SELECT concatWithSeparator('|', 'a', materialize('2001:0001:130F:0002:0003:09C0:876A:130B' :: IPv6)) == 'a|2001:0001:130F:0002:0003:09C0:876A:130B';
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
index e7c169cf45e..bc22ae23ee1 100644
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
@@ -220,13 +220,16 @@ FROM
 )
 GROUP BY number
 ORDER BY number
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Projection)
   Sorting (Sorting for ORDER BY)
     Expression (Before ORDER BY)
       Aggregating
-        Expression ((Before GROUP BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY)))))
-          ReadFromSystemNumbers
+        Expression ((Before GROUP BY + Projection))
+          Sorting (Sorting for ORDER BY)
+            Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
+              ReadFromSystemNumbers
 -- execute
 0
 1
@@ -289,13 +292,16 @@ FROM
     GROUP BY number
 )
 ORDER BY a ASC
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Projection)
   Sorting (Sorting for ORDER BY)
     Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
       Aggregating
-        Expression ((Before GROUP BY + (Projection + Before ORDER BY)))
-          ReadFromSystemNumbers
+        Expression ((Before GROUP BY + Projection))
+          Sorting (Sorting for ORDER BY)
+            Expression (Before ORDER BY)
+              ReadFromSystemNumbers
 -- execute
 0
 1
@@ -321,14 +327,18 @@ FROM
 )
 WHERE a > 0
 ORDER BY a
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Projection)
   Sorting (Sorting for ORDER BY)
-    Expression ((Before ORDER BY + ))
-      Aggregating
-        Filter
-          Filter (( + (Before GROUP BY + (Projection + (Before ORDER BY + (Projection + Before ORDER BY))))))
-            ReadFromSystemNumbers
+    Expression (Before ORDER BY)
+      Filter ((WHERE + (Projection + Before ORDER BY)))
+        Filter (HAVING)
+          Aggregating
+            Expression ((Before GROUP BY + Projection))
+              Sorting (Sorting for ORDER BY)
+                Expression ((Before ORDER BY + (Projection + Before ORDER BY)))
+                  ReadFromSystemNumbers
 -- execute
 1
 2
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
index c676e0340b1..23eccb4e782 100755
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.sh
@@ -157,7 +157,8 @@ FROM
     ORDER BY number DESC
 )
 GROUP BY number
-ORDER BY number"
+ORDER BY number
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test"
 run_query "$query"
 
 echo "-- query with aggregation function but w/o GROUP BY -> remove sorting"
@@ -200,7 +201,8 @@ FROM
     )
     GROUP BY number
 )
-ORDER BY a ASC"
+ORDER BY a ASC
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test"
 run_query "$query"
 
 echo "-- Check that optimization works for subqueries as well, - main query have neither ORDER BY nor GROUP BY"
@@ -222,7 +224,8 @@ FROM
     GROUP BY number
 )
 WHERE a > 0
-ORDER BY a"
+ORDER BY a
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test"
 run_query "$query"
 
 echo "-- 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"
diff --git a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
index 16d3327b9c2..47348651025 100644
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
@@ -220,6 +220,7 @@ FROM
 )
 GROUP BY number
 ORDER BY number
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Project names)
   Sorting (Sorting for ORDER BY)
@@ -291,6 +292,7 @@ FROM
     GROUP BY number
 )
 ORDER BY a ASC
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Project names)
   Sorting (Sorting for ORDER BY)
@@ -325,6 +327,7 @@ FROM
 )
 WHERE a > 0
 ORDER BY a
+SETTINGS optimize_aggregators_of_group_by_keys=0 -- avoid removing any() as it depends on order and we need it for the test
 -- explain
 Expression (Project names)
   Sorting (Sorting for ORDER BY)
diff --git a/tests/queries/0_stateless/02497_schema_inference_nulls.sql b/tests/queries/0_stateless/02497_schema_inference_nulls.sql
index a25060e8182..b78b5709dbb 100644
--- a/tests/queries/0_stateless/02497_schema_inference_nulls.sql
+++ b/tests/queries/0_stateless/02497_schema_inference_nulls.sql
@@ -4,7 +4,7 @@ set input_format_json_try_infer_named_tuples_from_objects=0;
 set input_format_json_read_objects_as_strings=0;
 set input_format_json_infer_incomplete_types_as_strings=0;
 set input_format_json_read_numbers_as_strings=0;
-desc format(JSONEachRow, '{"x" : 1234}, {"x" : "String"}') settings input_format_json_try_infer_numbers_from_strings=1; -- { serverError TYPE_MISMATCH }
+desc format(JSONEachRow, '{"x" : 1234}, {"x" : "String"}') settings input_format_json_try_infer_numbers_from_strings=1; -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
 desc format(JSONEachRow, '{"x" : [null, 1]}');
 desc format(JSONEachRow, '{"x" : [null, 1]}, {"x" : []}');
 desc format(JSONEachRow, '{"x" : [null, 1]}, {"x" : [null]}');
@@ -26,7 +26,7 @@ desc format(JSONEachRow, '{"x" : [1, 2]}, {"x" : [null]}');
 
 select 'JSONCompactEachRow';
 set schema_inference_make_columns_nullable=1;
-desc format(JSONCompactEachRow, '[1234], ["String"]') settings input_format_json_try_infer_numbers_from_strings=1; -- { serverError TYPE_MISMATCH }
+desc format(JSONCompactEachRow, '[1234], ["String"]') settings input_format_json_try_infer_numbers_from_strings=1; -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
 desc format(JSONCompactEachRow, '[[null, 1]]');
 desc format(JSONCompactEachRow, '[[null, 1]], [[]]');
 desc format(JSONCompactEachRow, '[[null, 1]], [[null]]');
diff --git a/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.reference b/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.reference
index 43282d09bab..5028adae32e 100644
--- a/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.reference
+++ b/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.reference
@@ -1,2 +1,3 @@
 4	2
 100	99
+(3.22,1)
diff --git a/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.sql b/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.sql
index 5eba14ea528..8491018eb72 100644
--- a/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.sql
+++ b/tests/queries/0_stateless/02498_analyzer_aggregate_functions_arithmetic_operations_pass_fix.sql
@@ -14,3 +14,5 @@ INSERT INTO test_table VALUES (1, 1);
 SELECT sum((2 * id) as func), func FROM test_table GROUP BY id;
 
 SELECT max(100-number), min(100-number) FROM numbers(2);
+
+select (sum(toDecimal64(2.11, 15) - number), 1) FROM numbers(2);
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
index f646583bbd3..9a0cfdffcb5 100644
--- 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
@@ -293,7 +293,7 @@ SELECT
 {'age':'31','last_key':'last_value','name':'neymar','nationality':'brazil','team':'psg'}
 -- { echoOn }
 
-SET extract_kvp_max_pairs_per_row = 2;
+SET extract_key_value_pairs_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
@@ -307,7 +307,7 @@ WITH
 SELECT
     x;
 {'key1':'value1','key2':'value2'}
-SET extract_kvp_max_pairs_per_row = 0;
+SET extract_key_value_pairs_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
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
index 9277ba6d7ec..4f3db3f166b 100644
--- 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
@@ -415,7 +415,7 @@ 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;
+SET extract_key_value_pairs_max_pairs_per_row = 1;
 WITH
     extractKeyValuePairs('key1:value1,key2:value2') AS s_map,
     CAST(
@@ -429,7 +429,7 @@ SELECT
 
 -- { echoOn }
 
-SET extract_kvp_max_pairs_per_row = 2;
+SET extract_key_value_pairs_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
@@ -443,7 +443,7 @@ WITH
 SELECT
     x;
 
-SET extract_kvp_max_pairs_per_row = 0;
+SET extract_key_value_pairs_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
diff --git a/tests/queries/0_stateless/02500_numbers_inference.sh b/tests/queries/0_stateless/02500_numbers_inference.sh
index ce9cd5bdc9f..5d863bd616f 100755
--- a/tests/queries/0_stateless/02500_numbers_inference.sh
+++ b/tests/queries/0_stateless/02500_numbers_inference.sh
@@ -8,10 +8,10 @@ $CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : 1.2}')";
 echo '{"x" : 1.2}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test";
 $CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : 1}')";
 echo '{"x" : 1}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test";
-$CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : 1e10}')";
-echo '{"x" : 1e10}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test";
-$CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : [1, 42.42, 1, 1e10]}')";
-echo '{"x" : [1, 42.42, 1, 1e10]}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test";
+$CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : 1e10}')" --input_format_try_infer_exponent_floats=1;
+echo '{"x" : 1e10}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test" --input_format_try_infer_exponent_floats=1;
+$CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : [1, 42.42, 1, 1e10]}')" --input_format_try_infer_exponent_floats=1;
+echo '{"x" : [1, 42.42, 1, 1e10]}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test" --input_format_try_infer_exponent_floats=1;
 $CLICKHOUSE_LOCAL -q "desc format(JSONEachRow, '{\"x\" : [1, 42.42, false]}')";
 echo '{"x" : [1, 42.42, false]}' | $CLICKHOUSE_LOCAL --input-format='JSONEachRow' --table='test' -q "desc test";
 
@@ -19,10 +19,10 @@ $CLICKHOUSE_LOCAL -q "desc format(TSV, '1.2')";
 echo '1.2' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test";
 $CLICKHOUSE_LOCAL -q "desc format(TSV, '1')";
 echo '1' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test";
-$CLICKHOUSE_LOCAL -q "desc format(TSV, '1e10')";
-echo '1e10' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test";
-$CLICKHOUSE_LOCAL -q "desc format(TSV, '[1, 42.42, 1, 1e10]')";
-echo '[1, 42.42, 1, 1e10]' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test";
+$CLICKHOUSE_LOCAL -q "desc format(TSV, '1e10')" --input_format_try_infer_exponent_floats=1;
+echo '1e10' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test" --input_format_try_infer_exponent_floats=1;
+$CLICKHOUSE_LOCAL -q "desc format(TSV, '[1, 42.42, 1, 1e10]')" --input_format_try_infer_exponent_floats=1;
+echo '[1, 42.42, 1, 1e10]' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test" --input_format_try_infer_exponent_floats=1;
 $CLICKHOUSE_LOCAL -q "desc format(TSV, '[1, 42.42, false]')";
 echo '[1, 42.42, false]' | $CLICKHOUSE_LOCAL --input-format='TSV' --table='test' -q "desc test";
 
diff --git a/tests/queries/0_stateless/02502_bad_values_schema_inference.sql b/tests/queries/0_stateless/02502_bad_values_schema_inference.sql
index 4c796842c0d..67ac09832de 100644
--- a/tests/queries/0_stateless/02502_bad_values_schema_inference.sql
+++ b/tests/queries/0_stateless/02502_bad_values_schema_inference.sql
@@ -1,2 +1,2 @@
-desc format(Values, '(\'abc)'); -- { serverError CANNOT_PARSE_INPUT_ASSERTION_FAILED }
+desc format(Values, '(\'abc)'); -- { serverError CANNOT_EXTRACT_TABLE_STRUCTURE }
 
diff --git a/tests/queries/0_stateless/02503_insert_storage_snapshot.sh b/tests/queries/0_stateless/02503_insert_storage_snapshot.sh
index b494adeb785..13561947e08 100755
--- a/tests/queries/0_stateless/02503_insert_storage_snapshot.sh
+++ b/tests/queries/0_stateless/02503_insert_storage_snapshot.sh
@@ -20,6 +20,13 @@ counter=0 retries=60
 # for a short period of time. To avoid flakyness we check that refcount became 1 at least once during long INSERT query.
 # It proves that the INSERT query doesn't hold redundant references to parts.
 while [[ $counter -lt $retries ]]; do
+    query_result=$($CLICKHOUSE_CLIENT -q "select count() from system.processes where query_id = '$query_id' FORMAT CSV")
+    if [ "$query_result" -lt 1 ]; then
+        sleep 0.1
+        ((++counter))
+        continue;
+    fi
+
     query_result=$($CLICKHOUSE_CLIENT -q "SELECT name, active, refcount FROM system.parts WHERE database = '$CLICKHOUSE_DATABASE' AND table = 't_insert_storage_snapshot' FORMAT CSV")
     if [ "$query_result" == '"all_1_1_0",1,1' ]; then
         echo "$query_result"
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 a5a71560d00..2c62e278050 100644
--- a/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference
+++ b/tests/queries/0_stateless/02514_analyzer_drop_join_on.reference
@@ -55,33 +55,33 @@ Header: a2 String
   Header: __table1.a2 String
           __table1.k UInt64
           __table4.d2 String
-    Expression ((Actions for left table alias column keys + DROP unused columns after JOIN))
+    Expression (DROP unused columns after JOIN)
     Header: __table1.a2 String
             __table1.k UInt64
       Join (JOIN FillRightFirst)
       Header: __table1.a2 String
               __table1.k UInt64
-        Expression ((Actions for left table alias column keys + DROP unused columns after JOIN))
+        Expression (DROP unused columns after JOIN)
         Header: __table1.a2 String
                 __table1.k UInt64
           Join (JOIN FillRightFirst)
           Header: __table1.a2 String
                   __table1.k UInt64
-            Expression ((Actions for left table alias column keys + Change column names to column identifiers))
+            Expression (Change column names to column identifiers)
             Header: __table1.a2 String
                     __table1.k UInt64
               ReadFromMemoryStorage
               Header: a2 String
                       k UInt64
-            Expression ((Actions for right table alias column keys + Change column names to column identifiers))
+            Expression (Change column names to column identifiers)
             Header: __table2.k UInt64
               ReadFromMemoryStorage
               Header: k UInt64
-        Expression ((Actions for right table alias column keys + Change column names to column identifiers))
+        Expression (Change column names to column identifiers)
         Header: __table3.k UInt64
           ReadFromMemoryStorage
           Header: k UInt64
-    Expression ((Actions for right table alias column keys + Change column names to column identifiers))
+    Expression (Change column names to column identifiers)
     Header: __table4.d2 String
             __table4.k UInt64
       ReadFromMemoryStorage
diff --git a/tests/queries/0_stateless/02516_projections_and_context.reference b/tests/queries/0_stateless/02516_projections_and_context.reference
index 6ed281c757a..e69de29bb2d 100644
--- a/tests/queries/0_stateless/02516_projections_and_context.reference
+++ b/tests/queries/0_stateless/02516_projections_and_context.reference
@@ -1,2 +0,0 @@
-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 2b659eafabc..334544eb4fa 100644
--- a/tests/queries/0_stateless/02516_projections_and_context.sql
+++ b/tests/queries/0_stateless/02516_projections_and_context.sql
@@ -5,6 +5,6 @@ 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'));
+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 }
 DROP TABLE test1__fuzz_37;
diff --git a/tests/queries/0_stateless/02521_aggregation_by_partitions.reference b/tests/queries/0_stateless/02521_aggregation_by_partitions.reference
index 67a131ff853..87b2d5c3430 100644
--- a/tests/queries/0_stateless/02521_aggregation_by_partitions.reference
+++ b/tests/queries/0_stateless/02521_aggregation_by_partitions.reference
@@ -1,3 +1,5 @@
+-- { echoOn }
+explain pipeline select a from t1 group by a;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -15,6 +17,8 @@ ExpressionTransform × 16
                     Resize 3 → 1
                       MergeTreeSelect(pool: ReadPool, algorithm: Thread) × 3 0 → 1
 1000000
+-- { echoOn }
+explain pipeline select a from t2 group by a;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -40,6 +44,8 @@ ExpressionTransform × 16
                                     Resize 2 → 1
                                       MergeTreeSelect(pool: ReadPool, algorithm: Thread) × 2 0 → 1
 1000000
+-- { echoOn }
+explain pipeline select a from t3 group by a;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -82,6 +88,8 @@ ExpressionTransform × 16
                                                                       MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
 1000000
 1000000
+-- { echoOn }
+explain pipeline select a from t4 group by a settings read_in_order_two_level_merge_threshold = 1e12;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -91,20 +99,21 @@ ExpressionTransform × 16
         (Expression)
         ExpressionTransform × 4
           (ReadFromMergeTree)
-          ExpressionTransform × 4
-            MergingSortedTransform 2 → 1
-              ExpressionTransform × 2
-                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                  MergingSortedTransform 2 → 1
-                    ExpressionTransform × 2
-                      MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                        MergingSortedTransform 2 → 1
-                          ExpressionTransform × 2
-                            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                              MergingSortedTransform 2 → 1
-                                ExpressionTransform × 2
-                                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+          MergingSortedTransform 2 → 1
+            ExpressionTransform × 2
+              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                MergingSortedTransform 2 → 1
+                  ExpressionTransform × 2
+                    MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                      MergingSortedTransform 2 → 1
+                        ExpressionTransform × 2
+                          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                            MergingSortedTransform 2 → 1
+                              ExpressionTransform × 2
+                                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
 1000000
+-- { echoOn }
+explain pipeline select a from t5 group by a settings read_in_order_two_level_merge_threshold = 1e12;
 (Expression)
 ExpressionTransform × 16
   (Aggregating)
@@ -114,41 +123,6 @@ ExpressionTransform × 16
         (Expression)
         ExpressionTransform × 8
           (ReadFromMergeTree)
-          ExpressionTransform × 8
-            MergingSortedTransform 2 → 1
-              ExpressionTransform × 2
-                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                  MergingSortedTransform 2 → 1
-                    ExpressionTransform × 2
-                      MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                        MergingSortedTransform 2 → 1
-                          ExpressionTransform × 2
-                            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                              MergingSortedTransform 2 → 1
-                                ExpressionTransform × 2
-                                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                    MergingSortedTransform 2 → 1
-                                      ExpressionTransform × 2
-                                        MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                          MergingSortedTransform 2 → 1
-                                            ExpressionTransform × 2
-                                              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                MergingSortedTransform 2 → 1
-                                                  ExpressionTransform × 2
-                                                    MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                      MergingSortedTransform 2 → 1
-                                                        ExpressionTransform × 2
-                                                          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-1000000
-(Expression)
-ExpressionTransform × 16
-  (Aggregating)
-  FinalizeAggregatedTransform × 16
-    AggregatingInOrderTransform × 16
-      (Expression)
-      ExpressionTransform × 16
-        (ReadFromMergeTree)
-        ExpressionTransform × 16
           MergingSortedTransform 2 → 1
             ExpressionTransform × 2
               MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
@@ -173,30 +147,65 @@ ExpressionTransform × 16
                                                     MergingSortedTransform 2 → 1
                                                       ExpressionTransform × 2
                                                         MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                          MergingSortedTransform 2 → 1
-                                                            ExpressionTransform × 2
-                                                              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                MergingSortedTransform 2 → 1
-                                                                  ExpressionTransform × 2
-                                                                    MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                      MergingSortedTransform 2 → 1
-                                                                        ExpressionTransform × 2
-                                                                          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                            MergingSortedTransform 2 → 1
-                                                                              ExpressionTransform × 2
-                                                                                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                                  MergingSortedTransform 2 → 1
-                                                                                    ExpressionTransform × 2
-                                                                                      MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                                        MergingSortedTransform 2 → 1
-                                                                                          ExpressionTransform × 2
-                                                                                            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                                              MergingSortedTransform 2 → 1
-                                                                                                ExpressionTransform × 2
-                                                                                                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
-                                                                                                    MergingSortedTransform 2 → 1
-                                                                                                      ExpressionTransform × 2
-                                                                                                        MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+1000000
+-- { echoOn }
+explain pipeline select a from t6 group by a settings read_in_order_two_level_merge_threshold = 1e12;
+(Expression)
+ExpressionTransform × 16
+  (Aggregating)
+  FinalizeAggregatedTransform × 16
+    AggregatingInOrderTransform × 16
+      (Expression)
+      ExpressionTransform × 16
+        (ReadFromMergeTree)
+        MergingSortedTransform 2 → 1
+          ExpressionTransform × 2
+            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+              MergingSortedTransform 2 → 1
+                ExpressionTransform × 2
+                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                    MergingSortedTransform 2 → 1
+                      ExpressionTransform × 2
+                        MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                          MergingSortedTransform 2 → 1
+                            ExpressionTransform × 2
+                              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                MergingSortedTransform 2 → 1
+                                  ExpressionTransform × 2
+                                    MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                      MergingSortedTransform 2 → 1
+                                        ExpressionTransform × 2
+                                          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                            MergingSortedTransform 2 → 1
+                                              ExpressionTransform × 2
+                                                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                  MergingSortedTransform 2 → 1
+                                                    ExpressionTransform × 2
+                                                      MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                        MergingSortedTransform 2 → 1
+                                                          ExpressionTransform × 2
+                                                            MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                              MergingSortedTransform 2 → 1
+                                                                ExpressionTransform × 2
+                                                                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                    MergingSortedTransform 2 → 1
+                                                                      ExpressionTransform × 2
+                                                                        MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                          MergingSortedTransform 2 → 1
+                                                                            ExpressionTransform × 2
+                                                                              MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                                MergingSortedTransform 2 → 1
+                                                                                  ExpressionTransform × 2
+                                                                                    MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                                      MergingSortedTransform 2 → 1
+                                                                                        ExpressionTransform × 2
+                                                                                          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                                            MergingSortedTransform 2 → 1
+                                                                                              ExpressionTransform × 2
+                                                                                                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
+                                                                                                  MergingSortedTransform 2 → 1
+                                                                                                    ExpressionTransform × 2
+                                                                                                      MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) × 2 0 → 1
 1000000
 Skip merging: 1
 Skip merging: 1
diff --git a/tests/queries/0_stateless/02521_aggregation_by_partitions.sql b/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
index 87317e5fba4..a90e56a9822 100644
--- a/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
+++ b/tests/queries/0_stateless/02521_aggregation_by_partitions.sql
@@ -1,5 +1,7 @@
 -- Tags: long, no-s3-storage
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 set max_threads = 16;
 set allow_aggregate_partitions_independently = 1;
 set force_aggregate_partitions_independently = 1;
@@ -15,7 +17,9 @@ system stop merges t1;
 insert into t1 select number from numbers_mt(1e6);
 insert into t1 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t1 group by a;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t1 group by a);
 
@@ -28,7 +32,9 @@ system stop merges t2;
 insert into t2 select number from numbers_mt(1e6);
 insert into t2 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t2 group by a;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t2 group by a);
 
@@ -41,7 +47,9 @@ system stop merges t3;
 insert into t3 select number from numbers_mt(1e6);
 insert into t3 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t3 group by a;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t3 group by a);
 
@@ -63,7 +71,9 @@ system stop merges t4;
 insert into t4 select number from numbers_mt(1e6);
 insert into t4 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t4 group by a settings read_in_order_two_level_merge_threshold = 1e12;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t4 group by a);
 
@@ -76,7 +86,9 @@ system stop merges t5;
 insert into t5 select number from numbers_mt(1e6);
 insert into t5 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t5 group by a settings read_in_order_two_level_merge_threshold = 1e12;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t5 group by a);
 
@@ -89,7 +101,9 @@ system stop merges t6;
 insert into t6 select number from numbers_mt(1e6);
 insert into t6 select number from numbers_mt(1e6);
 
+-- { echoOn }
 explain pipeline select a from t6 group by a settings read_in_order_two_level_merge_threshold = 1e12;
+-- { echoOff }
 
 select count() from (select throwIf(count() != 2) from t6 group by a);
 
diff --git a/tests/queries/0_stateless/02521_incorrect_dealy_for_insert_bug_44902.sh b/tests/queries/0_stateless/02521_incorrect_dealy_for_insert_bug_44902.sh
index 0ae44ec0c01..b58db7c87ad 100755
--- a/tests/queries/0_stateless/02521_incorrect_dealy_for_insert_bug_44902.sh
+++ b/tests/queries/0_stateless/02521_incorrect_dealy_for_insert_bug_44902.sh
@@ -14,7 +14,7 @@ $CLICKHOUSE_CLIENT -q "SYSTEM STOP MERGES test_02521_insert_delay"
 for i in {0..4}
 do
     query_id="${CLICKHOUSE_DATABASE}_02521_${i}_$RANDOM$RANDOM"
-    $CLICKHOUSE_CLIENT --query_id="$query_id" -q "INSERT INTO test_02521_insert_delay SELECT number, toString(number) FROM numbers(${i}, 1)"
+    $CLICKHOUSE_CLIENT --query_id="$query_id" --max_insert_threads 1 -q "INSERT INTO test_02521_insert_delay SELECT number, toString(number) FROM numbers(${i}, 1)"
     $CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
     $CLICKHOUSE_CLIENT --param_query_id="$query_id" -q "select ProfileEvents['DelayedInsertsMilliseconds'] as delay from system.query_log where event_date >= yesterday() and current_database = '$CLICKHOUSE_DATABASE' and query_id = {query_id:String} order by delay desc limit 1"
 done
diff --git a/tests/queries/0_stateless/02532_send_logs_level_test.reference b/tests/queries/0_stateless/02532_send_logs_level_test.reference
index dbd49cfc0a4..7e51b888d9c 100644
--- a/tests/queries/0_stateless/02532_send_logs_level_test.reference
+++ b/tests/queries/0_stateless/02532_send_logs_level_test.reference
@@ -1,2 +1,3 @@
+<Test> MergeTreeMarksLoader: Loading marks from path data.cmrk3
 <Test> MergeTreeRangeReader: First reader returned: num_rows: 1, columns: 1, total_rows_per_granule: 1, no filter, column[0]:  Int32(size = 1), requested columns: key
 <Test> MergeTreeRangeReader: read() returned num_rows: 1, columns: 1, total_rows_per_granule: 1, no filter, column[0]:  Int32(size = 1), sample block key
diff --git a/tests/queries/0_stateless/02532_send_logs_level_test.sh b/tests/queries/0_stateless/02532_send_logs_level_test.sh
index 7dd9a152385..4afc6d4496b 100755
--- a/tests/queries/0_stateless/02532_send_logs_level_test.sh
+++ b/tests/queries/0_stateless/02532_send_logs_level_test.sh
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 $CLICKHOUSE_CLIENT -nm -q "
     drop table if exists data;
-    create table data (key Int) engine=MergeTree order by tuple();
+    create table data (key Int) engine=MergeTree order by tuple() settings min_bytes_for_wide_part = '1G', compress_marks = 1;
     insert into data values (1);
 "
 
@@ -17,6 +17,6 @@ $CLICKHOUSE_CLIENT -nm -q "
 # instead of "last" value, hence you cannot simply append another
 # --send_logs_level here.
 CLICKHOUSE_CLIENT_CLEAN=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=test/g')
-$CLICKHOUSE_CLIENT_CLEAN -q "select * from data" |& grep -o -e '<Unknown>.*' -e '<Test>.*'
+$CLICKHOUSE_CLIENT_CLEAN -q "select * from data SETTINGS merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;" |& grep -o -e '<Unknown>.*' -e '<Test>.*'
 
 $CLICKHOUSE_CLIENT -q "drop table data"
diff --git a/tests/queries/0_stateless/02534_join_prewhere_bug_44062.reference b/tests/queries/0_stateless/02534_join_prewhere_bug.reference
similarity index 88%
rename from tests/queries/0_stateless/02534_join_prewhere_bug_44062.reference
rename to tests/queries/0_stateless/02534_join_prewhere_bug.reference
index aaef17371d8..115ea994de1 100644
--- a/tests/queries/0_stateless/02534_join_prewhere_bug_44062.reference
+++ b/tests/queries/0_stateless/02534_join_prewhere_bug.reference
@@ -34,5 +34,12 @@ ORDER BY test2.col1
 ;
 5600	123	123
 5601	321	-32
+SELECT col2, col2 + 1 FROM test1
+FULL OUTER JOIN test2 USING (col1)
+PREWHERE (col2 * 2) :: UInt8
+;
+123	124
+-32	-31
+-30	-29
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
diff --git a/tests/queries/0_stateless/02534_join_prewhere_bug_44062.sql b/tests/queries/0_stateless/02534_join_prewhere_bug.sql
similarity index 92%
rename from tests/queries/0_stateless/02534_join_prewhere_bug_44062.sql
rename to tests/queries/0_stateless/02534_join_prewhere_bug.sql
index 073f81e4ff3..016c92597ec 100644
--- a/tests/queries/0_stateless/02534_join_prewhere_bug_44062.sql
+++ b/tests/queries/0_stateless/02534_join_prewhere_bug.sql
@@ -42,5 +42,10 @@ WHERE test2.col1 IS NOT NULL
 ORDER BY test2.col1
 ;
 
+SELECT col2, col2 + 1 FROM test1
+FULL OUTER JOIN test2 USING (col1)
+PREWHERE (col2 * 2) :: UInt8
+;
+
 DROP TABLE IF EXISTS test1;
 DROP TABLE IF EXISTS test2;
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
index e7f7126d6bf..3eabbfb82e7 100644
--- 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
@@ -12,9 +12,9 @@ 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 }
+SYSTEM FLUSH DISTRIBUTED dist; -- { serverError ALL_CONNECTION_TRIES_FAILED }
 -- check the second since after using queue it may got lost from it
-SYSTEM FLUSH DISTRIBUTED dist; -- { serverError UNKNOWN_TABLE }
+SYSTEM FLUSH DISTRIBUTED dist; -- { serverError ALL_CONNECTION_TRIES_FAILED }
 
 SELECT is_blocked, data_files FROM system.distribution_queue WHERE database = currentDatabase() AND table = 'dist';
 
diff --git a/tests/queries/0_stateless/02539_settings_alias.reference b/tests/queries/0_stateless/02539_settings_alias.reference
index db17cf631de..a4b3d996674 100644
--- a/tests/queries/0_stateless/02539_settings_alias.reference
+++ b/tests/queries/0_stateless/02539_settings_alias.reference
@@ -18,7 +18,7 @@ Using HTTP with query params
 Using client options
 0
 2
-CREATE VIEW default.`02539_settings_alias_view`\n(\n    `1` UInt8\n) AS\nSELECT 1\nSETTINGS replication_alter_partitions_sync = 2
+CREATE VIEW default.`02539_settings_alias_view`\n(\n    `1` UInt8\n)\nAS SELECT 1\nSETTINGS replication_alter_partitions_sync = 2
 replication_alter_partitions_sync	0	1	alter_sync
 replication_alter_partitions_sync	2	1	alter_sync
 alter_sync	0	1	
diff --git a/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.reference b/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.reference
index 7e43f249a74..9bb0c022752 100644
--- a/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.reference
+++ b/tests/queries/0_stateless/02554_fix_grouping_sets_predicate_push_down.reference
@@ -13,7 +13,7 @@ FROM
             day_,
             type_1
         FROM test_grouping_sets_predicate
-        PREWHERE day_ = \'2023-01-05\'
+        WHERE day_ = \'2023-01-05\'
         GROUP BY
             GROUPING SETS (
                 (day_, type_1),
@@ -39,8 +39,10 @@ ExpressionTransform × 2
             Copy 1 → 2
               (Expression)
               ExpressionTransform
-                (ReadFromMergeTree)
-                MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
+                (Expression)
+                ExpressionTransform
+                  (ReadFromMergeTree)
+                  MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 (Expression)
 ExpressionTransform × 2
   (Filter)
@@ -70,8 +72,8 @@ ExpressionTransform × 2
         FilterTransform
           (Filter)
           FilterTransform
-            (Filter)
-            FilterTransform
+            (Expression)
+            ExpressionTransform
               (ReadFromMergeTree)
               MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1
 (Expression)
diff --git a/tests/queries/0_stateless/02559_multiple_read_steps_in_prewhere.sql b/tests/queries/0_stateless/02559_multiple_read_steps_in_prewhere.sql
index 1e969afac33..805186edcbd 100644
--- a/tests/queries/0_stateless/02559_multiple_read_steps_in_prewhere.sql
+++ b/tests/queries/0_stateless/02559_multiple_read_steps_in_prewhere.sql
@@ -1,6 +1,6 @@
 DROP TABLE IF EXISTS test_02559;
 
-CREATE TABLE test_02559 (id1 UInt64, id2 UInt64) ENGINE=MergeTree ORDER BY id1;
+CREATE TABLE test_02559 (id1 UInt64, id2 UInt64) ENGINE=MergeTree ORDER BY id1 SETTINGS min_bytes_for_wide_part = 0;
 
 INSERT INTO test_02559 SELECT number, number FROM numbers(10);
 
diff --git a/tests/queries/0_stateless/02564_read_in_order_final_desc.sql b/tests/queries/0_stateless/02564_read_in_order_final_desc.sql
index 627fd834101..c1a8ba90722 100644
--- a/tests/queries/0_stateless/02564_read_in_order_final_desc.sql
+++ b/tests/queries/0_stateless/02564_read_in_order_final_desc.sql
@@ -18,13 +18,12 @@ FROM mytable FINAL
 WHERE key = 5
 ORDER BY timestamp DESC;
 
-
 SELECT if(explain like '%ReadType: InOrder%', 'Ok', 'Error: ' || explain) FROM (
     EXPLAIN PLAN actions = 1
     SELECT timestamp, value
     FROM mytable FINAL
     WHERE key = 5
-    ORDER BY timestamp
+    ORDER BY timestamp SETTINGS enable_vertical_final = 0
 ) WHERE explain like '%ReadType%';
 
 
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
index 029f80b46b0..596a047c104 100644
--- 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
@@ -1,2 +1,24 @@
-11	queryfinish	OK
-11	querystart	OK
+"-- Attach MV to system.query_log and check that writing query_log will not fail\n\nset log_queries=1;","querystart","OK"
+"-- Attach MV to system.query_log and check that writing query_log will not fail\n\nset log_queries=1;","queryfinish","OK"
+"drop table if exists log_proxy_02572;","querystart","OK"
+"drop table if exists log_proxy_02572;","queryfinish","OK"
+"drop table if exists push_to_logs_proxy_mv_02572;","querystart","OK"
+"drop table if exists push_to_logs_proxy_mv_02572;","queryfinish","OK"
+"-- create log tables\nsystem flush logs;","querystart","OK"
+"-- create log tables\nsystem flush logs;","queryfinish","OK"
+"create table log_proxy_02572 as system.query_log engine=Distributed('test_shard_localhost', currentDatabase(), 'receiver_02572');","querystart","OK"
+"create table log_proxy_02572 as system.query_log engine=Distributed('test_shard_localhost', currentDatabase(), 'receiver_02572');","queryfinish","OK"
+"create materialized view push_to_logs_proxy_mv_02572 to log_proxy_02572 as select * from system.query_log;","querystart","OK"
+"create materialized view push_to_logs_proxy_mv_02572 to log_proxy_02572 as select * from system.query_log;","queryfinish","OK"
+"select 1 format Null;","querystart","OK"
+"select 1 format Null;","queryfinish","OK"
+"system flush logs;","querystart","OK"
+"system flush logs;","queryfinish","OK"
+"system flush logs;","querystart","OK"
+"system flush logs;","queryfinish","OK"
+"drop table log_proxy_02572;","querystart","OK"
+"drop table log_proxy_02572;","queryfinish","OK"
+"drop table push_to_logs_proxy_mv_02572;","querystart","OK"
+"drop table push_to_logs_proxy_mv_02572;","queryfinish","OK"
+"set log_queries=0;","querystart","OK"
+"set log_queries=0;","queryfinish","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
index a7a74190821..2381639fba0 100644
--- 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
@@ -21,10 +21,12 @@ system flush logs;
 drop table log_proxy_02572;
 drop table push_to_logs_proxy_mv_02572;
 
+set log_queries=0;
+
 system flush logs;
 -- lower() to pass through clickhouse-test "exception" check
-select count(), lower(type::String), errorCodeToName(exception_code)
+select replaceAll(query, '\n', '\\n'), lower(type::String), errorCodeToName(exception_code)
     from system.query_log
     where current_database = currentDatabase()
-    group by 2, 3
-    order by 2;
+    order by event_time_microseconds
+    format CSV;
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk.sql b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
index cbdbd7a9f84..30942b154c9 100644
--- a/tests/queries/0_stateless/02579_fill_empty_chunk.sql
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk.sql
@@ -1,6 +1,7 @@
 -- this SELECT produces empty chunk in FillingTransform
 
 SET enable_positional_arguments = 0;
+SET allow_experimental_analyzer = 0;
 
 SELECT
     2 AS x,
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.reference b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.reference
new file mode 100644
index 00000000000..b03cfa03815
--- /dev/null
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.reference
@@ -0,0 +1,14 @@
+1	\N
+2	\N
+2	\N
+2	\N
+2	\N
+2	\N
+2	\N
+3	\N
+4	\N
+5	\N
+6	\N
+7	\N
+8	\N
+9	\N
diff --git a/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql
new file mode 100644
index 00000000000..8350173f443
--- /dev/null
+++ b/tests/queries/0_stateless/02579_fill_empty_chunk_analyzer.sql
@@ -0,0 +1,14 @@
+-- this SELECT produces empty chunk in FillingTransform
+
+SET enable_positional_arguments = 0;
+SET allow_experimental_analyzer = 1;
+
+-- With analyzer this special query has correct output
+SELECT
+    2 AS x,
+    arrayJoin([NULL, NULL, NULL])
+GROUP BY
+    GROUPING SETS (
+        (0),
+        ([NULL, NULL, NULL]))
+ORDER BY x ASC WITH FILL FROM 1 TO 10;
diff --git a/tests/queries/0_stateless/02582_async_reading_with_small_limit.sql b/tests/queries/0_stateless/02582_async_reading_with_small_limit.sql
index e51666673b1..cb6b1b6083e 100644
--- a/tests/queries/0_stateless/02582_async_reading_with_small_limit.sql
+++ b/tests/queries/0_stateless/02582_async_reading_with_small_limit.sql
@@ -1,5 +1,7 @@
 -- Tags: no-s3-storage
 
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists t;
 
 create table t(a UInt64) engine=MergeTree order by tuple();
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
index fbce8ae2026..eafcfc23fb8 100644
--- 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
@@ -1,8 +1,8 @@
 SELECT
-3	0	0
-3	0	0
+3	1
+3	1
 INSERT
 CHECK
 1
 2
-6	0	2
+6	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
index 5da643bd17b..3b0d2309784 100755
--- 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
@@ -33,10 +33,10 @@ query_id="$(get_query_id)"
 $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};
+    select count(), count(distinct initial_query_start_time_microseconds) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
 "
 
-sleep 6
+sleep 1
 
 query_id="$(get_query_id)"
 # this query (and all subsequent) should reuse the previous connection (at least most of the time)
@@ -44,7 +44,7 @@ $CLICKHOUSE_CLIENT --prefer_localhost_replica=0 --query_id "$query_id" -q "selec
 
 $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};
+    select count(), count(distinct initial_query_start_time_microseconds) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
 "
 
 echo "INSERT"
@@ -54,7 +54,7 @@ $CLICKHOUSE_CLIENT --prefer_localhost_replica=0 --query_id "$query_id" -nm -q "
     select * from data;
 "
 
-sleep 3
+sleep 1
 $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"
@@ -63,5 +63,5 @@ 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};
+    select count(), count(distinct initial_query_start_time_microseconds) from system.query_log where type = 'QueryFinish' and initial_query_id = {query_id:String};
 "
diff --git a/tests/queries/0_stateless/02661_quantile_approx.reference b/tests/queries/0_stateless/02661_quantile_approx.reference
index 8369363aa9b..0ee846a268b 100644
--- a/tests/queries/0_stateless/02661_quantile_approx.reference
+++ b/tests/queries/0_stateless/02661_quantile_approx.reference
@@ -19,6 +19,20 @@ select quantilesGK(1000, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(numbe
 [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 quantileGKMerge(100, 0.5)(x)
+FROM
+(
+    SELECT quantileGKState(100, 0.5)(number + 1) AS x
+    FROM numbers(49999)
+);
+24902
+SELECT quantilesGKMerge(100, 0.5, 0.9, 0.99)(x)
+FROM
+(
+    SELECT quantilesGKState(100, 0.5, 0.9, 0.99)(number + 1) AS x
+    FROM numbers(49999)
+);
+[24902,44518,49999]
 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 }
diff --git a/tests/queries/0_stateless/02661_quantile_approx.sql b/tests/queries/0_stateless/02661_quantile_approx.sql
index 52c2979ad44..c0004260fa1 100644
--- a/tests/queries/0_stateless/02661_quantile_approx.sql
+++ b/tests/queries/0_stateless/02661_quantile_approx.sql
@@ -15,6 +15,19 @@ select quantilesGK(100, 100/1000, 200/1000, 250/1000, 314/1000, 777/1000)(number
 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 quantileGKMerge(100, 0.5)(x)
+FROM
+(
+    SELECT quantileGKState(100, 0.5)(number + 1) AS x
+    FROM numbers(49999)
+);
+
+SELECT quantilesGKMerge(100, 0.5, 0.9, 0.99)(x)
+FROM
+(
+    SELECT quantilesGKState(100, 0.5, 0.9, 0.99)(number + 1) AS x
+    FROM numbers(49999)
+);
 
 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 }
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
index 288f1129b53..e346d9893a7 100755
--- 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
@@ -9,7 +9,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 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
+" 2>&1 | grep -o -e '\ \[\ .*\ \]\ S3.*:\ .*\ ' | grep -v 'Microseconds' | grep -v 'S3DiskConnections' | grep -v 'S3DiskAddresses' | sort
 
 echo "CHECK WITH query_log"
 $CLICKHOUSE_CLIENT -nq "
diff --git a/tests/queries/0_stateless/02676_trailing_commas.reference b/tests/queries/0_stateless/02676_trailing_commas.reference
index 76d173ca23e..cfb2ccd6a0f 100644
--- a/tests/queries/0_stateless/02676_trailing_commas.reference
+++ b/tests/queries/0_stateless/02676_trailing_commas.reference
@@ -3,3 +3,6 @@
 1
 1	2	0
 1
+(1,'foo')
+(1,'foo')
+(1,(2,'foo'))
diff --git a/tests/queries/0_stateless/02676_trailing_commas.sql b/tests/queries/0_stateless/02676_trailing_commas.sql
index 048405c4d20..7fb64bb57a3 100644
--- a/tests/queries/0_stateless/02676_trailing_commas.sql
+++ b/tests/queries/0_stateless/02676_trailing_commas.sql
@@ -3,3 +3,7 @@ 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);
+SELECT (1, 'foo')::Tuple(a Int, b String,);
+SELECT (1, 'foo')::Tuple(a Int, b String,,); -- { clientError SYNTAX_ERROR }
+SELECT (1, 'foo')::Tuple(Int, String,);
+SELECT (1, (2,'foo'))::Tuple(Int, Tuple(Int, String,),);
diff --git a/tests/queries/0_stateless/02681_undrop_query.sql b/tests/queries/0_stateless/02681_undrop_query.sql
index 66447fc6c44..c33b74d49e5 100644
--- a/tests/queries/0_stateless/02681_undrop_query.sql
+++ b/tests/queries/0_stateless/02681_undrop_query.sql
@@ -17,7 +17,7 @@ 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 sync;
-undrop table 02681_undrop_detach; -- { serverError 57 }
+undrop table 02681_undrop_detach; -- { serverError TABLE_ALREADY_EXISTS }
 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' and database=currentDatabase() limit 1;
@@ -85,5 +85,5 @@ 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 }
+undrop table 02681_undrop_multiple; -- { serverError TABLE_ALREADY_EXISTS }
 drop table 02681_undrop_multiple sync;
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference
index 35c94347ac9..52af58fb67a 100644
--- a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.reference
@@ -6,6 +6,3 @@
 [[(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
index 85307bec6e5..502cca20ab2 100644
--- a/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_rollup.sql
@@ -2,4 +2,3 @@ SELECT polygonsSymDifferenceCartesian([[[(1., 1.)]] AS x], [x]) GROUP BY x WITH
 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/02699_polygons_sym_difference_total.reference b/tests/queries/0_stateless/02699_polygons_sym_difference_total.reference
new file mode 100644
index 00000000000..2b98454dc22
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total.reference
@@ -0,0 +1,3 @@
+[(9223372036854775807,1.1754943508222875e-38)]	[[(1,1.0001)]]	\N	[]
+
+[(9223372036854775807,1.1754943508222875e-38)]	[]	\N	[]
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql b/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql
new file mode 100644
index 00000000000..0fac4b11320
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total.sql
@@ -0,0 +1,2 @@
+SET allow_experimental_analyzer=0;
+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/02699_polygons_sym_difference_total_analyzer.reference b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.reference
new file mode 100644
index 00000000000..134420874b6
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.reference
@@ -0,0 +1,3 @@
+[(9223372036854775807,1.1754943508222875e-38)]	[[(1,1.0001)]]	\N	[]
+
+[(9223372036854775807,1.1754943508222875e-38)]	[[(1,1.0001)]]	\N	[]
diff --git a/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql
new file mode 100644
index 00000000000..879e0e5297f
--- /dev/null
+++ b/tests/queries/0_stateless/02699_polygons_sym_difference_total_analyzer.sql
@@ -0,0 +1,2 @@
+SET allow_experimental_analyzer=1;
+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/02703_row_policy_for_database.reference b/tests/queries/0_stateless/02703_row_policy_for_database.reference
index ec03e538d95..b67ea69ae72 100644
--- a/tests/queries/0_stateless/02703_row_policy_for_database.reference
+++ b/tests/queries/0_stateless/02703_row_policy_for_database.reference
@@ -3,7 +3,7 @@
 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
+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
diff --git a/tests/queries/0_stateless/02708_dotProduct.reference b/tests/queries/0_stateless/02708_dotProduct.reference
new file mode 100644
index 00000000000..93a67e4c0be
--- /dev/null
+++ b/tests/queries/0_stateless/02708_dotProduct.reference
@@ -0,0 +1,53 @@
+-- Negative tests
+-- Tests
+   -- Array
+[1,2,3]	[4,5,6]	32	UInt16
+[1,2,3]	[4,5,6]	32	UInt32
+[1,2,3]	[4,5,6]	32	UInt64
+[1,2,3]	[4,5,6]	32	UInt64
+[-1,-2,-3]	[4,5,6]	-32	Int16
+[-1,-2,-3]	[4,5,6]	-32	Int32
+[-1,-2,-3]	[4,5,6]	-32	Int64
+[-1,-2,-3]	[4,5,6]	-32	Int64
+[1,2,3]	[4,5,6]	32	Float32
+[1,2,3]	[4,5,6]	32	Float64
+[]	[]	0	Float32
+[]	[]	0	UInt16
+   -- Tuple
+(1,2,3)	(4,5,6)	32	UInt64
+(1,2,3)	(4,5,6)	32	UInt64
+(1,2,3)	(4,5,6)	32	UInt64
+(1,2,3)	(4,5,6)	32	UInt64
+(-1,-2,-3)	(4,5,6)	-32	Int64
+(-1,-2,-3)	(4,5,6)	-32	Int64
+(-1,-2,-3)	(4,5,6)	-32	Int64
+(-1,-2,-3)	(4,5,6)	-32	Int64
+(1,2,3)	(4,5,6)	32	Float64
+(1,2,3)	(4,5,6)	32	Float64
+-- Non-const argument
+[1,2,3]	[4,5,6]	32	UInt16
+[]	[]	0	Float32
+[]	[]	0	UInt16
+ -- Array with mixed element arguments types (result type is the supertype)
+[1,2,3]	[4,5,6]	32	Float32
+ -- Tuple with mixed element arguments types
+(1,2,3)	(4,5,6)	32	Float64
+-- Aliases
+32
+32
+32
+-- Tests that trigger special paths
+   -- non-const / non-const
+0	61
+1	186
+0	61
+1	186
+0	61
+1	186
+   -- const / non-const
+0	62
+1	187
+0	62
+1	187
+0	62
+1	187
diff --git a/tests/queries/0_stateless/02708_dotProduct.sql b/tests/queries/0_stateless/02708_dotProduct.sql
new file mode 100644
index 00000000000..05c66777dff
--- /dev/null
+++ b/tests/queries/0_stateless/02708_dotProduct.sql
@@ -0,0 +1,66 @@
+SELECT '-- Negative tests';
+
+SELECT arrayDotProduct([1, 2]); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT arrayDotProduct([1, 2], 'abc'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayDotProduct('abc', [1, 2]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayDotProduct([1, 2], ['abc', 'def']); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayDotProduct([1, 2], [3, 4, 5]); -- { serverError SIZES_OF_ARRAYS_DONT_MATCH }
+SELECT dotProduct([1, 2], (3, 4, 5)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT '-- Tests';
+SELECT '   -- Array';
+SELECT [1, 2, 3]::Array(UInt8) AS x, [4, 5, 6]::Array(UInt8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [1, 2, 3]::Array(UInt16) AS x, [4, 5, 6]::Array(UInt16) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [1, 2, 3]::Array(UInt32) AS x, [4, 5, 6]::Array(UInt32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [1, 2, 3]::Array(UInt64) AS x, [4, 5, 6]::Array(UInt64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [-1, -2, -3]::Array(Int8) AS x, [4, 5, 6]::Array(Int8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [-1, -2, -3]::Array(Int16) AS x, [4, 5, 6]::Array(Int16) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [-1, -2, -3]::Array(Int32) AS x, [4, 5, 6]::Array(Int32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [-1, -2, -3]::Array(Int64) AS x, [4, 5, 6]::Array(Int64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [1, 2, 3]::Array(Float32) AS x, [4, 5, 6]::Array(Float32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT [1, 2, 3]::Array(Float64) AS x, [4, 5, 6]::Array(Float64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+-- empty arrays
+SELECT []::Array(Float32) AS x, []::Array(Float32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT []::Array(UInt8) AS x, []::Array(UInt8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+
+SELECT '   -- Tuple';
+SELECT (1::UInt8, 2::UInt8, 3::UInt8) AS x, (4::UInt8, 5::UInt8, 6::UInt8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (1::UInt16, 2::UInt16, 3::UInt16) AS x, (4::UInt16, 5::UInt16, 6::UInt16) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (1::UInt32, 2::UInt32, 3::UInt32) AS x, (4::UInt32, 5::UInt32, 6::UInt32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (1::UInt64, 2::UInt64, 3::UInt64) AS x, (4::UInt64, 5::UInt64, 6::UInt64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (-1::Int8, -2::Int8, -3::Int8) AS x, (4::Int8, 5::Int8, 6::Int8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (-1::Int16, -2::Int16, -3::Int16) AS x, (4::Int16, 5::Int16, 6::Int16) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (-1::Int32, -2::Int32, -3::Int32) AS x, (4::Int32, 5::Int32, 6::Int32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (-1::Int64, -2::Int64, -3::Int64) AS x, (4::Int64, 5::Int64, 6::Int64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (1::Float32, 2::Float32, 3::Float32) AS x, (4::Float32, 5::Float32, 6::Float32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT (1::Float64, 2::Float64, 3::Float64) AS x, (4::Float64, 5::Float64, 6::Float64) AS y, dotProduct(x, y) AS res, toTypeName(res);
+
+SELECT '-- Non-const argument';
+SELECT materialize([1::UInt8, 2::UInt8, 3::UInt8]) AS x, [4::UInt8, 5::UInt8, 6::UInt8] AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT materialize([]::Array(Float32)) AS x, []::Array(Float32) AS y, dotProduct(x, y) AS res, toTypeName(res);
+SELECT materialize([]::Array(UInt8)) AS x, []::Array(UInt8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+
+SELECT ' -- Array with mixed element arguments types (result type is the supertype)';
+SELECT [1::UInt16, 2::UInt8, 3::Float32] AS x, [4::Int16, 5::Float32, 6::UInt8] AS y, dotProduct(x, y) AS res, toTypeName(res);
+
+SELECT ' -- Tuple with mixed element arguments types';
+SELECT (1::UInt16, 2::UInt8, 3::Float32) AS x, (4::Int16, 5::Float32, 6::UInt8) AS y, dotProduct(x, y) AS res, toTypeName(res);
+
+SELECT '-- Aliases';
+SELECT scalarProduct([1, 2, 3], [4, 5, 6]);
+SELECT scalarProduct((1, 2, 3), (4, 5, 6));
+SELECT arrayDotProduct([1, 2, 3], [4, 5, 6]); -- actually no alias but the internal function for arrays
+
+SELECT '-- Tests that trigger special paths';
+DROP TABLE IF EXISTS tab;
+CREATE TABLE tab(id UInt64, vec Array(Float32)) ENGINE = MergeTree ORDER BY id;
+INSERT INTO tab VALUES (0, [0.0, 1.0, 2.0, 3.0, 0.0, 1.0, 2.0, 3.0, 0.0, 1.0, 2.0, 3.0, 0.0, 1.0, 2.0, 3.0, 0.0, 1.0, 2.0]) (1, [5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0]);
+SELECT '   -- non-const / non-const';
+SELECT id, arrayDotProduct(vec, vec) FROM tab ORDER BY id;
+SELECT id, arrayDotProduct(vec::Array(Float64), vec::Array(Float64)) FROM tab ORDER BY id;
+SELECT id, arrayDotProduct(vec::Array(UInt32), vec::Array(UInt32)) FROM tab ORDER BY id;
+SELECT '   -- const / non-const';
+SELECT id, arrayDotProduct([5.0, 2.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0]::Array(Float32), vec) FROM tab ORDER BY id;
+SELECT id, arrayDotProduct([5.0, 2.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0, 3.0, 5.0, 1.0, 2.0]::Array(Float64), vec) FROM tab ORDER BY id;
+SELECT id, arrayDotProduct([5, 2, 2, 3, 5, 1, 2, 3, 5, 1, 2, 3, 5, 1, 2, 3, 5, 1, 2]::Array(UInt32), vec) FROM tab ORDER BY id;
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02708_dot_product.reference b/tests/queries/0_stateless/02708_dot_product.reference
deleted file mode 100644
index 45e53871aa2..00000000000
--- a/tests/queries/0_stateless/02708_dot_product.reference
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index e94cb577bf4..00000000000
--- a/tests/queries/0_stateless/02708_dot_product.sql
+++ /dev/null
@@ -1,55 +0,0 @@
-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/02714_read_bytes_aggregateFunction.sql b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql
index 26bc9ebe62b..eb0a37045ef 100644
--- a/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql
+++ b/tests/queries/0_stateless/02714_read_bytes_aggregateFunction.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 CREATE TABLE test (id UInt64, `amax` AggregateFunction(argMax, String, DateTime))
 ENGINE=MergeTree()
 ORDER BY id
@@ -42,12 +44,12 @@ ORDER BY event_time_microseconds;
 -- 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
+-- 1 Base class + 1 specific/value class:
+-- Base class: MAX(sizeOf(SingleValueDataFixed<T>), sizeOf(SingleValueDataString), sizeOf(SingleValueDataGeneric)) = 64
+-- Specific class: SingleValueDataFixed(DateTime) = 4 + 1. With padding = 8
+-- Total: 8 + 64 + 8 = 80
 --
--- ColumnAggregateFunction total: 8 + 72 = 80
+-- ColumnAggregateFunction total: 8 + 2 * 64 = 136
 SELECT 'AggregateFunction(argMax, String, DateTime)',
        read_rows,
        read_bytes
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
index dd2c30cc9f8..d00491fd7e5 100644
--- a/tests/queries/0_stateless/02720_row_policy_column_with_dots.reference
+++ b/tests/queries/0_stateless/02720_row_policy_column_with_dots.reference
@@ -1 +1 @@
-2024-01-01	Hello	World
+1
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
index 361bd0e0ec7..fcb0bf62859 100644
--- a/tests/queries/0_stateless/02720_row_policy_column_with_dots.sql
+++ b/tests/queries/0_stateless/02720_row_policy_column_with_dots.sql
@@ -1,6 +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 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 toDate(now() + 48*3600), '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;
+SELECT count(*) FROM table_with_dot_column;
 DROP TABLE table_with_dot_column;
diff --git a/tests/queries/0_stateless/02722_database_filesystem.reference b/tests/queries/0_stateless/02722_database_filesystem.reference
index 17f84cfc49c..2aa7e74befb 100644
--- a/tests/queries/0_stateless/02722_database_filesystem.reference
+++ b/tests/queries/0_stateless/02722_database_filesystem.reference
@@ -23,4 +23,3 @@ OK
 OK
 OK
 OK
-OK
diff --git a/tests/queries/0_stateless/02722_database_filesystem.sh b/tests/queries/0_stateless/02722_database_filesystem.sh
index f3af7abcbb3..0c75c15fc69 100755
--- a/tests/queries/0_stateless/02722_database_filesystem.sh
+++ b/tests/queries/0_stateless/02722_database_filesystem.sh
@@ -81,8 +81,6 @@ CREATE DATABASE test2 ENGINE = Filesystem('relative_unknown_dir');
 # FILE_DOESNT_EXIST: unknown file
 ${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`tmp2.csv\`;" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "FILE_DOESNT_EXIST" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
-# BAD_ARGUMENTS: Cannot determine the file format by it's extension
-${CLICKHOUSE_CLIENT} --query "SELECT COUNT(*) FROM test1.\`${unique_name}/tmp.myext\`;" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
 # Clean
 ${CLICKHOUSE_CLIENT} --query "DROP DATABASE test1;"
 rm -rd $tmp_dir
diff --git a/tests/queries/0_stateless/02722_matcher_join_use_nulls.reference b/tests/queries/0_stateless/02722_matcher_join_use_nulls.reference
index 746d02dc381..5617854bfd1 100644
--- a/tests/queries/0_stateless/02722_matcher_join_use_nulls.reference
+++ b/tests/queries/0_stateless/02722_matcher_join_use_nulls.reference
@@ -72,7 +72,7 @@ FROM (
     LEFT JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-1	Int32
+1	Int64
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT t2.*
@@ -80,7 +80,7 @@ FROM (
     LEFT JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-\N	Nullable(UInt32)
+\N	Nullable(Int64)
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT *
@@ -209,7 +209,7 @@ FROM (
     RIGHT JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-2	Nullable(Int32)
+2	Nullable(Int64)
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT t2.*
@@ -217,7 +217,7 @@ FROM (
     RIGHT JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-2	UInt32
+2	Int64
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT *
@@ -354,8 +354,8 @@ FROM (
     FULL JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-1	Nullable(Int32)
-2	Nullable(Int32)
+1	Nullable(Int64)
+2	Nullable(Int64)
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT t2.*
@@ -363,8 +363,8 @@ FROM (
     FULL JOIN (SELECT 2 :: UInt32 as a) t2
     USING (a)
 ) ORDER BY 1;
-2	Nullable(UInt32)
-\N	Nullable(UInt32)
+2	Nullable(Int64)
+\N	Nullable(Int64)
 SELECT *, * APPLY toTypeName
 FROM (
     SELECT *
diff --git a/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql
index a9a6d3058b2..88561f9d895 100644
--- a/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql
+++ b/tests/queries/0_stateless/02723_jit_aggregation_bug_48120.sql
@@ -1,4 +1,4 @@
--- Tags: no-fasttest, no-ubsan, no-msan, no-cpu-aarch64
+-- Tags: no-fasttest, no-cpu-aarch64, no-msan
 
 drop table if exists dummy;
 CREATE TABLE dummy ( num1 Int32, num2 Enum8('foo' = 0, 'bar' = 1, 'tar' = 2) )
diff --git a/tests/queries/0_stateless/02723_parallelize_output_setting.reference b/tests/queries/0_stateless/02723_parallelize_output_setting.reference
index 0f2a396f471..36e4e68ecd5 100644
--- a/tests/queries/0_stateless/02723_parallelize_output_setting.reference
+++ b/tests/queries/0_stateless/02723_parallelize_output_setting.reference
@@ -5,3 +5,7 @@ select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline s
 -- 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;
+-- Data from URL source is immediately resized to max_treads streams, before any ExpressionTransform.
+set parallelize_output_from_storages=1;
+select match(arrayStringConcat(groupArray(explain), ''), '.*Resize 1 → 2 *URL 0 → 1 *$') from (explain pipeline select x, count() from url('https://example.com', Parquet, 'x Int64') group by x order by count() limit 10);
+1
diff --git a/tests/queries/0_stateless/02723_parallelize_output_setting.sql b/tests/queries/0_stateless/02723_parallelize_output_setting.sql
index 7db28ca4dec..86e6d4b4e3d 100644
--- a/tests/queries/0_stateless/02723_parallelize_output_setting.sql
+++ b/tests/queries/0_stateless/02723_parallelize_output_setting.sql
@@ -1,4 +1,4 @@
--- Tags: no-parallel
+-- Tags: no-parallel, no-fasttest
 
 insert into function file(data_02723.csv) select number from numbers(5) settings engine_file_truncate_on_insert=1;
 
@@ -10,3 +10,6 @@ select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline s
 set parallelize_output_from_storages=0;
 select startsWith(trimLeft(explain),'Resize') as resize from (explain pipeline select * from file(data_02723.csv)) where resize;
 
+-- Data from URL source is immediately resized to max_treads streams, before any ExpressionTransform.
+set parallelize_output_from_storages=1;
+select match(arrayStringConcat(groupArray(explain), ''), '.*Resize 1 → 2 *URL 0 → 1 *$') from (explain pipeline select x, count() from url('https://example.com', Parquet, 'x Int64') group by x order by count() limit 10);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02724_database_s3.sh b/tests/queries/0_stateless/02724_database_s3.sh
index 13b627c0342..80b47282146 100755
--- a/tests/queries/0_stateless/02724_database_s3.sh
+++ b/tests/queries/0_stateless/02724_database_s3.sh
@@ -46,7 +46,7 @@ DROP DATABASE IF EXISTS test3;
 CREATE DATABASE test3 ENGINE = S3;
 USE test3;
 SELECT * FROM \"http://localhost:11111/test/a.myext\"
-""" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
+""" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "S3_ERROR" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 ${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
 USE test3;
diff --git a/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference
index e6b95502e1e..80bff2c12b3 100644
--- a/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference
+++ b/tests/queries/0_stateless/02725_agg_projection_resprect_PK.reference
@@ -1,2 +1,2 @@
       ReadFromMergeTree (p1)
-          Granules: 1/12
+            Granules: 1/12
diff --git a/tests/queries/0_stateless/02725_database_hdfs.sh b/tests/queries/0_stateless/02725_database_hdfs.sh
index b4e081f6de0..d62f928e947 100755
--- a/tests/queries/0_stateless/02725_database_hdfs.sh
+++ b/tests/queries/0_stateless/02725_database_hdfs.sh
@@ -58,7 +58,7 @@ SELECT * FROM \"abacaba/file.tsv\"
 """ 2>&1 | tr '\n' ' ' | grep -oF "CANNOT_EXTRACT_TABLE_STRUCTURE"
 
 ${CLICKHOUSE_CLIENT} -q "SELECT * FROM test_hdfs_4.\`http://localhost:11111/test/a.tsv\`" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
-${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222/file.myext\`" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222/file.myext\`" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "CANNOT_EXTRACT_TABLE_STRUCTURE" > /dev/null && echo "OK" || echo 'FAIL' ||:
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222/test_02725_3.tsv\`" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "CANNOT_EXTRACT_TABLE_STRUCTURE" > /dev/null && echo "OK" || echo 'FAIL' ||:
 
 ${CLICKHOUSE_CLIENT} --query "SELECT * FROM test_hdfs_4.\`hdfs://localhost:12222\`" 2>&1 | tr '\n' ' ' | grep -oF -e "UNKNOWN_TABLE" -e "BAD_ARGUMENTS" > /dev/null && echo "OK" || echo 'FAIL' ||:
diff --git a/tests/queries/0_stateless/02726_async_insert_flush_queue.sql b/tests/queries/0_stateless/02726_async_insert_flush_queue.sql
index 98e78045b85..1ae24e4f3da 100644
--- a/tests/queries/0_stateless/02726_async_insert_flush_queue.sql
+++ b/tests/queries/0_stateless/02726_async_insert_flush_queue.sql
@@ -6,7 +6,8 @@ CREATE TABLE t_async_inserts_flush (a UInt64) ENGINE = Memory;
 
 SET async_insert = 1;
 SET wait_for_async_insert = 0;
-SET async_insert_busy_timeout_ms = 1000000;
+SET async_insert_busy_timeout_min_ms = 1000000;
+SET async_insert_busy_timeout_max_ms = 10000000;
 
 INSERT INTO t_async_inserts_flush VALUES (1) (2);
 INSERT INTO t_async_inserts_flush FORMAT JSONEachRow {"a": 10} {"a": 20};
diff --git a/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.reference b/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.reference
new file mode 100644
index 00000000000..5f1b7e8b1fe
--- /dev/null
+++ b/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.reference
@@ -0,0 +1,314 @@
+[(1,'a')]
+[1]
+[(1,'a')]	[(1,'a')]
+[(1,'a')]
+[1]
+[(1,'a')]	1
+[(1,'a')]	[1]
+[1]
+[1]
+[1]
+[1]	1	['a']	1	['a']
+[(1,'a')]
+[1]
+[1]
+[(1,'a')]
+[1]
+[('a',1)]
+1	[1]	['a']	['a']	[1]
+[(1,'a')]
+[1]
+[1]
+[(1,'a')]
+[1]
+[('a',1)]
+1	[1]	['a']	1	['a']	[1]
+(1,'s')
+(1,'s')	1
+1
+((((1,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((2,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	1	(1,'a')	1	('a',1)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	(1,'a')	('a',1)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	(1,'a')	1	('a',1)
+((((1,'s'),'s'),'s'),'s')
+((((1,'s'),'s'),'s'),'s')
+((((2,'s'),'s'),'s'),'s')
+((((2,'s'),'s'),'s'),'s')
+((1,'s'),'s')
+((1,'s'),'s')
+((2,'s'),'s')
+((2,'s'),'s')
+1
+1
+2
+2
+((((1,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((2,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((3,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	UInt32
+2	UInt32
+0	UInt32
+(((1,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+(((2,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+(((3,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+((1,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((2,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((0,''),'')		Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	UInt32
+2	UInt32
+0	UInt32
+(((1,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((2,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((0,''),''),'')		Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+((1,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+((2,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+((3,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(Tuple(Int64, String), String)
+((2,'s'),'s')	Tuple(Tuple(Int64, String), String)
+((3,'s'),'s')	Tuple(Tuple(Int64, String), String)
+1	UInt32
+2	UInt32
+0	UInt32
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	Int64
+2	Int64
+3	Int64
+(((1,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((2,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((0,''),''),'')		Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+((1,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((2,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((0,''),'')		Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+[([([([(1,'d')],'d')],'s')],'s')]
+[[[([(1,'d')],'d')]]]
+[[[[1]]]]
+[[([([(1,'d')],'d')],'s')]]	Array(Array(Tuple(Array(Tuple(Array(Tuple(Int64, String)), String)), String)))
+[[[([(1,'d')],'d')]]]	Array(Array(Nested(t Nested(t Int32, s String), s String)))
+[[[[1]]]]	Array(Array(Array(Array(Int32))))
+[[[([(1,'d')],'d')]]]	[['s']]	Array(Array(Array(Tuple(Array(Tuple(Int64, String)), String))))	Array(Array(String))
+[[[[(1,'d')]]]]	[[['d']]]	Array(Array(Array(Array(Tuple(\n    t Int32,\n    s String)))))	Array(Array(Array(String)))
+[[[[1]]]]	[[[['d']]]]	Array(Array(Array(Array(Int32))))	Array(Array(Array(Array(String))))
+[([([([(1,'d')],'d')],'s')],'s')]	Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Array(Tuple(\n                t Int32,\n                s String)),\n            s String)),\n        s String)),\n    s String))
+[[([([(1,'d')],'d')],'s')]]	Array(Nested(t Nested(t Nested(t Int32, s String), s String), s String))
+[[[([(1,'d')],'d')]]]	Array(Array(Array(Tuple(Array(Tuple(Int64, String)), String))))
+[[[[1]]]]	Array(Array(Array(Array(Int32))))
+[[([([(1,'d')],'d')],'s')]]	['s']	Array(Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Int32,\n            s String)),\n        s String)),\n    s String)))	Array(String)
+[[[([(1,'d')],'d')]]]	[['s']]	Array(Array(Array(Tuple(\n    t Array(Tuple(\n        t Int32,\n        s String)),\n    s String))))	Array(Array(String))
+[[[[(1,'d')]]]]	[[['d']]]	Array(Array(Array(Array(Tuple(Int64, String)))))	Array(Array(Array(String)))
+[[[[1]]]]	[[[['d']]]]	Array(Array(Array(Array(Int32))))	Array(Array(Array(Array(String))))
+[([([([(1,'d')],'d')],'s')],'s')]	Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Array(Tuple(\n                t Int32,\n                s String)),\n            s String)),\n        s String)),\n    s String))
+[[([([(1,'d')],'d')],'s')]]	Array(Nested(t Nested(t Nested(t Int32, s String), s String), s String))
+[[[([(1,'d')],'d')]]]	Array(Array(Nested(t Nested(t Int32, s String), s String)))
+[[[[1]]]]	Array(Array(Array(Array(Int64))))
+[[[[1]]]]	[[[['d']]]]
+[(1,'a')]
+[1]
+[(1,'a')]	[(1,'a')]
+[(1,'a')]
+[1]
+[(1,'a')]	1
+[(1,'a')]	[1]
+[1]
+[1]
+[1]
+[1]	1	['a']	1	['a']
+[(1,'a')]
+[1]
+[1]
+[(1,'a')]
+[1]
+[('a',1)]
+1	[1]	['a']	['a']	[1]
+[(1,'a')]
+[1]
+[1]
+[(1,'a')]
+[1]
+[('a',1)]
+1	[1]	['a']	1	['a']	[1]
+(1,'s')
+(1,'s')	1
+1
+((((1,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((2,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	1	(1,'a')	1	('a',1)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	(1,'a')	('a',1)
+(1,'a')
+1
+1
+(1,'a')
+1
+('a',1)
+1	(1,'a')	1	('a',1)
+((((1,'s'),'s'),'s'),'s')
+((((1,'s'),'s'),'s'),'s')
+((((2,'s'),'s'),'s'),'s')
+((((2,'s'),'s'),'s'),'s')
+((1,'s'),'s')
+((1,'s'),'s')
+((2,'s'),'s')
+((2,'s'),'s')
+1
+1
+2
+2
+((((1,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((2,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((((3,'s'),'s'),'s'),'s')	Tuple(Tuple(Tuple(Tuple(Int64, String), String), String), String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	Nullable(UInt32)
+2	Nullable(UInt32)
+\N	Nullable(UInt32)
+(((1,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+(((2,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+(((3,'s'),'s'),'s')	s	Tuple(Tuple(Tuple(Int64, String), String), String)	String
+((1,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((2,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((0,''),'')		Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	Nullable(UInt32)
+2	Nullable(UInt32)
+\N	Nullable(UInt32)
+(((1,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((2,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((0,''),''),'')		Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+((1,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+((2,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+((3,'s'),'s')	s	Tuple(Tuple(Int64, String), String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(Tuple(Int64, String), String)
+((2,'s'),'s')	Tuple(Tuple(Int64, String), String)
+((3,'s'),'s')	Tuple(Tuple(Int64, String), String)
+1	Nullable(UInt32)
+2	Nullable(UInt32)
+\N	Nullable(UInt32)
+((((1,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((2,'s'),'s'),'s'),'s')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((((0,''),''),''),'')	Tuple(\n    t Tuple(\n        t Tuple(\n            t Tuple(\n                t UInt32,\n                s String),\n            s String),\n        s String),\n    s String)
+((1,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((2,'s'),'s')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+((0,''),'')	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)
+1	Nullable(Int64)
+2	Nullable(Int64)
+3	Nullable(Int64)
+(((1,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((2,'s'),'s'),'s')	s	Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+(((0,''),''),'')		Tuple(\n    t Tuple(\n        t Tuple(\n            t UInt32,\n            s String),\n        s String),\n    s String)	String
+((1,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((2,'s'),'s')	s	Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+((0,''),'')		Tuple(\n    t Tuple(\n        t UInt32,\n        s String),\n    s String)	String
+(1,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(2,'s')	s	Tuple(\n    t UInt32,\n    s String)	String
+(0,'')		Tuple(\n    t UInt32,\n    s String)	String
+1	s	UInt32	String
+2	s	UInt32	String
+0		UInt32	String
+[([([([(1,'d')],'d')],'s')],'s')]
+[[[([(1,'d')],'d')]]]
+[[[[1]]]]
+[[([([(1,'d')],'d')],'s')]]	Array(Array(Tuple(Array(Tuple(Array(Tuple(Int64, String)), String)), String)))
+[[[([(1,'d')],'d')]]]	Array(Array(Nested(t Nested(t Int32, s String), s String)))
+[[[[1]]]]	Array(Array(Array(Array(Int32))))
+[[[([(1,'d')],'d')]]]	[['s']]	Array(Array(Array(Tuple(Array(Tuple(Int64, String)), String))))	Array(Array(String))
+[[[[(1,'d')]]]]	[[['d']]]	Array(Array(Array(Array(Tuple(\n    t Int32,\n    s String)))))	Array(Array(Array(String)))
+[[[[1]]]]	[[[['d']]]]	Array(Array(Array(Array(Int32))))	Array(Array(Array(Array(String))))
+[([([([(1,'d')],'d')],'s')],'s')]	Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Array(Tuple(\n                t Int32,\n                s String)),\n            s String)),\n        s String)),\n    s String))
+[[([([(1,'d')],'d')],'s')]]	Array(Nested(t Nested(t Nested(t Int32, s String), s String), s String))
+[[[([(1,'d')],'d')]]]	Array(Array(Array(Tuple(Array(Tuple(Int64, String)), String))))
+[[[[1]]]]	Array(Array(Array(Array(Int32))))
+[[([([(1,'d')],'d')],'s')]]	['s']	Array(Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Int32,\n            s String)),\n        s String)),\n    s String)))	Array(String)
+[[[([(1,'d')],'d')]]]	[['s']]	Array(Array(Array(Tuple(\n    t Array(Tuple(\n        t Int32,\n        s String)),\n    s String))))	Array(Array(String))
+[[[[(1,'d')]]]]	[[['d']]]	Array(Array(Array(Array(Tuple(Int64, String)))))	Array(Array(Array(String)))
+[[[[1]]]]	[[[['d']]]]	Array(Array(Array(Array(Int32))))	Array(Array(Array(Array(String))))
+[([([([(1,'d')],'d')],'s')],'s')]	Array(Tuple(\n    t Array(Tuple(\n        t Array(Tuple(\n            t Array(Tuple(\n                t Int32,\n                s String)),\n            s String)),\n        s String)),\n    s String))
+[[([([(1,'d')],'d')],'s')]]	Array(Nested(t Nested(t Nested(t Int32, s String), s String), s String))
+[[[([(1,'d')],'d')]]]	Array(Array(Nested(t Nested(t Int32, s String), s String)))
+[[[[1]]]]	Array(Array(Array(Array(Int64))))
+[[[[1]]]]	[[[['d']]]]
diff --git a/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.sql.j2 b/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.sql.j2
new file mode 100644
index 00000000000..c2f3c51b17a
--- /dev/null
+++ b/tests/queries/0_stateless/02731_analyzer_join_resolve_nested.sql.j2
@@ -0,0 +1,219 @@
+DROP TABLE IF EXISTS ta;
+DROP TABLE IF EXISTS tb;
+DROP TABLE IF EXISTS ttta;
+DROP TABLE IF EXISTS tttb;
+DROP TABLE IF EXISTS na;
+DROP TABLE IF EXISTS nb;
+DROP TABLE IF EXISTS nnna;
+DROP TABLE IF EXISTS nnnb;
+
+CREATE table ta (x Int32, t Tuple(t UInt32, s String)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO ta VALUES (1, (1, 'a'));
+
+CREATE table tb (x Int32, t Tuple(s String, t Int32)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO tb VALUES (1, ('a', 1));
+
+CREATE table ttta (x Int32, t Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO ttta VALUES (1, ((((1, 's'), 's'), 's'), 's')), (2, ((((2, 's'), 's'), 's'), 's'));
+
+CREATE table tttb (x Int32, t Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO tttb VALUES (2, ((((2, 's'), 's'), 's'), 's')), (3, ((((3, 's'), 's'), 's'), 's'));
+
+CREATE table na (x Int32, t Nested(t UInt32, s String)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO na VALUES (1, [1], ['a']);
+
+CREATE table nb (x Int32, t Nested(s String, t Int32)) ENGINE = MergeTree ORDER BY x;
+INSERT INTO nb VALUES (1, ['a'], [1]);
+
+CREATE TABLE nnna ( x UInt64, t Nested(t Nested(t Nested(t Nested(t Int32, s String), s String), s String), s String) ) ENGINE = MergeTree ORDER BY x;
+INSERT INTO nnna VALUES (1, [[([([(1,'d')],'d')], 's')]], ['s']);
+
+CREATE TABLE nnnb ( x UInt64, t Nested(t Nested(t Nested(t Nested(t UInt32, s String), s String), s String), s String) ) ENGINE = MergeTree ORDER BY x;
+INSERT INTO nnnb VALUES (1, [[([([(1,'d')],'d')], 's')]], ['s']);
+
+SET allow_experimental_analyzer = 1;
+
+{% for join_use_nulls in [0, 1] -%}
+
+SET join_use_nulls = {{ join_use_nulls }};
+
+SELECT t FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT [(1, 'a')] :: Nested(t Int32, s String) AS t) AS t;
+SELECT na.t.t FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT [(1, 'a')] :: Nested(t Int32, s String) AS t) AS t;
+SELECT * FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT [(1, 'a')] :: Nested(t Int32, s String) AS t) AS t;
+
+SELECT t FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT 1 AS t) AS t;
+SELECT na.t.t FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT 1 AS t) AS t;
+SELECT * FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na, (SELECT 1 AS t) AS t;
+
+SELECT * FROM (SELECT [(1, 'a')] :: Nested(t UInt32, s String) AS t) AS na FULL JOIN (SELECT [1] :: Array(Int32) AS t) AS nb ON nb.t = na.t.t;
+
+SELECT t FROM na FULL JOIN nb USING (t.t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT t.t FROM na FULL JOIN nb USING (t.t);
+SELECT na.t.t FROM na FULL JOIN nb USING (t.t);
+SELECT na.t FROM na FULL JOIN nb USING (t.t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT nb.t.t FROM na FULL JOIN nb USING (t.t);
+SELECT nb.t FROM na FULL JOIN nb USING (t.t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT * FROM na FULL JOIN nb USING (t.t);
+
+SELECT t FROM na FULL JOIN nb USING (x);
+SELECT t.t FROM na FULL JOIN nb USING (x);
+SELECT na.t.t FROM na FULL JOIN nb USING (x);
+SELECT na.t FROM na FULL JOIN nb USING (x);
+SELECT nb.t.t FROM na FULL JOIN nb USING (x);
+SELECT nb.t FROM na FULL JOIN nb USING (x);
+SELECT * FROM na FULL JOIN nb USING (x);
+
+SELECT t FROM na, nb;
+SELECT t.t FROM na, nb;
+SELECT na.t.t FROM na, nb;
+SELECT na.t FROM na, nb;
+SELECT nb.t.t FROM na, nb;
+SELECT nb.t FROM na, nb;
+SELECT * FROM na, nb;
+
+---
+
+SELECT * FROM (SELECT (1, 's') :: Tuple(t Int32, s String) as t ) as na FULL JOIN (SELECT (1, 's') :: Tuple(t UInt32, s String) as t ) as nb USING (t);
+SELECT * FROM (SELECT (1, 's') :: Tuple(t Int32, s String) as t ) as na, (SELECT 1 as t ) as t;
+
+SELECT t.t FROM (SELECT (1, 's') :: Tuple(t Int32, s String) as t ) as na, (SELECT 1 as t ) as t;
+
+SELECT t.t FROM (SELECT (1, 's') :: Tuple(t Int32, s String) as t ) as na FULL JOIN (SELECT (1, 's') :: Tuple(t UInt32, s String) as t ) as nb USING (t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT * FROM (SELECT (1, 's') :: Tuple(t Int32, s String) as t ) as na FULL JOIN (SELECT (1, 's') :: Tuple(t UInt32, s String) as t ) as nb USING (t.t); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT t as e, toTypeName(e) FROM (
+    SELECT ((((1, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String) as t
+) ttta FULL JOIN (
+    SELECT ((((2, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String) as t
+) tttb USING (t.t); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT t.t as e, toTypeName(e) FROM (
+    SELECT ((((1, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String) as t
+) ttta FULL JOIN (
+    SELECT ((((2, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String) as t
+) tttb USING (t.t);  -- { serverError UNSUPPORTED_METHOD }
+
+SELECT t.t.t as e, toTypeName(e) FROM (
+    SELECT ((((1, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String) as t
+) ttta FULL JOIN (
+    SELECT ((((2, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String) as t
+) tttb USING (t.t); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT t as e, toTypeName(e) FROM (
+    SELECT ((((1, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String) as t
+) ttta FULL JOIN (
+    SELECT ((((2, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String) as t
+) tttb USING (t);
+
+SELECT t.t as e, toTypeName(e) FROM (
+    SELECT ((((1, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t UInt32, s String), s String), s String), s String) as t
+) ttta FULL JOIN (
+    SELECT ((((2, 's'), 's'), 's'), 's') :: Tuple(t Tuple(t Tuple(t Tuple(t Int32, s String), s String), s String), s String) as t
+) tttb USING (t); -- { serverError AMBIGUOUS_IDENTIFIER }
+
+SELECT t FROM ta FULL JOIN tb USING (t.t);
+SELECT t.t FROM ta FULL JOIN tb USING (t.t);
+SELECT ta.t.t FROM ta FULL JOIN tb USING (t.t);
+SELECT ta.t FROM ta FULL JOIN tb USING (t.t);
+SELECT tb.t.t FROM ta FULL JOIN tb USING (t.t);
+SELECT tb.t FROM ta FULL JOIN tb USING (t.t);
+SELECT * FROM ta FULL JOIN tb USING (t.t);
+
+SELECT t FROM ta FULL JOIN tb USING (x);
+SELECT t.t FROM ta FULL JOIN tb USING (x);
+SELECT ta.t.t FROM ta FULL JOIN tb USING (x);
+SELECT ta.t FROM ta FULL JOIN tb USING (x);
+SELECT tb.t.t FROM ta FULL JOIN tb USING (x);
+SELECT tb.t FROM ta FULL JOIN tb USING (x);
+SELECT * FROM ta FULL JOIN tb USING (x);
+
+SELECT t FROM ta, tb;
+SELECT t.t FROM ta, tb;
+SELECT ta.t.t FROM ta, tb;
+SELECT ta.t FROM ta, tb;
+SELECT tb.t.t FROM ta, tb;
+SELECT tb.t FROM ta, tb;
+SELECT * FROM ta, tb;
+
+SELECT t FROM ttta, tttb;
+SELECT t.t.t FROM ttta, tttb;
+SELECT t.t.t.t.t FROM ttta, tttb;
+
+SELECT t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t);
+SELECT t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t);
+
+SELECT t.*, t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t);
+SELECT t.t.*, t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t);
+SELECT t.t.t.*, t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t);
+SELECT t.t.t.t.*, t.t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t);
+
+SELECT t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t);
+SELECT t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t);
+
+SELECT t.*, t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t);
+SELECT t.t.*, t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t);
+SELECT t.t.t.*, t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t);
+SELECT t.t.t.t.*, t.t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t);
+
+SELECT t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t);
+SELECT t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t);
+
+SELECT t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+SELECT t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+
+SELECT t.*, t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+SELECT t.t.*, t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+SELECT t.t.t.*, t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+SELECT t.t.t.t.*, t.t.t.t.* APPLY toTypeName FROM ttta FULL JOIN tttb USING (t.t.t.t.t);
+
+SELECT t FROM nnna, nnnb;
+SELECT t.t.t FROM nnna, nnnb;
+SELECT t.t.t.t.t FROM nnna, nnnb;
+
+SELECT t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t); -- { serverError UNSUPPORTED_METHOD }
+SELECT t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t); -- { serverError UNSUPPORTED_METHOD }
+SELECT t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t); -- { serverError UNSUPPORTED_METHOD }
+SELECT t.t.t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t); -- { serverError UNSUPPORTED_METHOD }
+
+SELECT t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t);
+SELECT t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t);
+
+SELECT t.*, t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t); -- { serverError AMBIGUOUS_IDENTIFIER }
+SELECT t.t.*, t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t);
+SELECT t.t.t.*, t.t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t);
+SELECT t.t.t.t.*, t.t.t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t);
+
+SELECT t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t);
+
+SELECT t.*, t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t.*, t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t.t.*, t.t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t.t);
+SELECT t.t.t.t.*, t.t.t.t.* APPLY toTypeName FROM nnna FULL JOIN nnnb USING (t.t.t);
+
+SELECT t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t.t.t);
+SELECT t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t.t.t);
+SELECT t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t.t.t);
+SELECT t.t.t.t.t as e, toTypeName(e) FROM nnna FULL JOIN nnnb USING (t.t.t.t.t);
+SELECT t.t.t.t.*  FROM nnna FULL JOIN nnnb USING (t.t.t.t.t);
+
+SELECT 1 FROM na FULL JOIN nb USING (t); -- { serverError UNSUPPORTED_METHOD }
+
+{% endfor -%}
+
+DROP TABLE IF EXISTS ta;
+DROP TABLE IF EXISTS tb;
+DROP TABLE IF EXISTS ttta;
+DROP TABLE IF EXISTS tttb;
+DROP TABLE IF EXISTS na;
+DROP TABLE IF EXISTS nb;
+DROP TABLE IF EXISTS nnna;
+DROP TABLE IF EXISTS nnnb;
diff --git a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
index 608fac626fa..451f0d6d485 100644
--- a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.reference
@@ -20,9 +20,21 @@
 23	Sx>b:^UG	XpedE)Q:	7433019734386307503
 29	2j&S)ba?XG	QuQj	17163829389637435056
 3	UlI+1		14144472852965836438
+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 `__table1`.`key` AS `key`, `__table1`.`value1` AS `value1`, `__table1`.`value2` AS `value2`, toUInt64(min(`__table1`.`time`)) AS `start_ts` FROM `default`.`join_inner_table` AS `__table1` PREWHERE (`__table1`.`id` = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (`__table1`.`number` > _CAST(1610517366120, \'UInt64\')) GROUP BY `__table1`.`key`, `__table1`.`value1`, `__table1`.`value2` ORDER BY `__table1`.`key` ASC, `__table1`.`value1` ASC, `__table1`.`value2` ASC LIMIT _CAST(10, \'UInt64\')
 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;
+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, allow_experimental_analyzer=0;
+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, allow_experimental_analyzer=1;
 =============== OUTER QUERY (NO PARALLEL) ===============
 >T%O	,z<	10
 NQTpY#	W\\Xx4	10
@@ -39,6 +51,15 @@ U	c	10
 UlI+1		10
 bX?}ix [	Ny]2 G	10
 t<iT	X48q:Z]t0	10
+>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 `__table2`.`value1` AS `value1`, `__table2`.`value2` AS `value2`, count() AS `count` FROM `default`.`join_outer_table` AS `__table1` ALL INNER JOIN (SELECT `__table3`.`key` AS `key`, `__table3`.`value1` AS `value1`, `__table3`.`value2` AS `value2` FROM `default`.`join_inner_table` AS `__table3` PREWHERE (`__table3`.`id` = \'833c9e22-c245-4eb5-8745-117a9a1f26b1\') AND (`__table3`.`number` > _CAST(1610517366120, \'UInt64\')) GROUP BY `__table3`.`key`, `__table3`.`value1`, `__table3`.`value2`) AS `__table2` USING (`key`) GROUP BY `__table1`.`key`, `__table2`.`value1`, `__table2`.`value2`
 0	3	SELECT `key`, `value1`, `value2` 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_7105554115296635472_12427301373021079614` 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;
+0	3	SELECT `value1`, `value2`, count() AS `count` FROM `default`.`join_outer_table` ALL INNER JOIN `_data_` 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, allow_experimental_analyzer=0;
+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, allow_experimental_analyzer=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
index a117378b0bf..7693d0da295 100644
--- a/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
+++ b/tests/queries/0_stateless/02731_parallel_replicas_join_subquery.sql
@@ -21,7 +21,6 @@ SELECT
     * 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';
@@ -39,6 +38,18 @@ FROM join_inner_table
 GROUP BY key, value1, value2
 ORDER BY key, value1, value2
 LIMIT 10;
+-- settings allow_experimental_analyzer=0;
+
+-- 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_analyzer=1;
 
 SELECT '=============== INNER QUERY (PARALLEL) ===============';
 
@@ -53,18 +64,31 @@ PREWHERE (id = '833c9e22-c245-4eb5-8745-117a9a1f26b1') AND (number > toUInt64('1
 GROUP BY key, value1, value2
 ORDER BY key, value1, value2
 LIMIT 10
-SETTINGS allow_experimental_parallel_reading_from_replicas = 1;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=0;
+
+-- 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, allow_experimental_analyzer=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,
+SELECT is_initial_query, count() as c, replaceRegexpAll(query, '_data_(\d+)_(\d+)', '_data_') as query
 FROM system.query_log
 WHERE
       event_date >= yesterday()
   AND type = 'QueryFinish'
-  AND initial_query_id =
+  AND initial_query_id IN
       (
           SELECT query_id
           FROM system.query_log
@@ -160,18 +184,48 @@ FROM
         )
 GROUP BY value1, value2
 ORDER BY value1, value2
-SETTINGS allow_experimental_parallel_reading_from_replicas = 1;
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, allow_experimental_analyzer=0;
+
+-- 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, allow_experimental_analyzer=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,
+SELECT is_initial_query, count() as c, replaceRegexpAll(query, '_data_(\d+)_(\d+)', '_data_') as query
 FROM system.query_log
 WHERE
       event_date >= yesterday()
   AND type = 'QueryFinish'
-  AND initial_query_id =
+  AND initial_query_id IN
       (
           SELECT query_id
           FROM system.query_log
diff --git a/tests/queries/0_stateless/02732_transform_fuzz.sql b/tests/queries/0_stateless/02732_transform_fuzz.sql
index c2918d4da81..872cf3a6599 100644
--- a/tests/queries/0_stateless/02732_transform_fuzz.sql
+++ b/tests/queries/0_stateless/02732_transform_fuzz.sql
@@ -1 +1 @@
-SELECT caseWithExpr(arrayReduce(NULL, []), []); -- { serverError BAD_ARGUMENTS }
+SELECT caseWithExpr(arrayReduce(NULL, []), []); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/02734_optimize_group_by.reference b/tests/queries/0_stateless/02734_optimize_group_by.reference
index 3f5ef03cb61..f97f780a659 100644
--- a/tests/queries/0_stateless/02734_optimize_group_by.reference
+++ b/tests/queries/0_stateless/02734_optimize_group_by.reference
@@ -1,8 +1,8 @@
 a	b
 a	b
-a	b
-	b
-a	b
-a	b
+a	b
+a	b
+a	b
+a	b
 a	b
 a	b
diff --git a/tests/queries/0_stateless/02735_parquet_encoder.sql b/tests/queries/0_stateless/02735_parquet_encoder.sql
index 19125abf8da..fe45a2a317d 100644
--- a/tests/queries/0_stateless/02735_parquet_encoder.sql
+++ b/tests/queries/0_stateless/02735_parquet_encoder.sql
@@ -6,6 +6,7 @@ set output_format_parquet_data_page_size = 800;
 set output_format_parquet_batch_size = 100;
 set output_format_parquet_row_group_size_bytes = 1000000000;
 set engine_file_truncate_on_insert=1;
+set allow_suspicious_low_cardinality_types=1;
 
 -- Write random data to parquet file, then read from it and check that it matches what we wrote.
 -- Do this for all kinds of data types: primitive, Nullable(primitive), Array(primitive),
diff --git a/tests/queries/0_stateless/02763_row_policy_storage_merge.reference b/tests/queries/0_stateless/02763_row_policy_storage_merge.reference
index 9fa5612e7cd..6510a3c933e 100644
--- a/tests/queries/0_stateless/02763_row_policy_storage_merge.reference
+++ b/tests/queries/0_stateless/02763_row_policy_storage_merge.reference
@@ -166,6 +166,10 @@ SELECT x, y from merge(currentDatabase(), 02763_merge
 4	14
 4	14
 4	14
+USING 0
+USING 1
+zzz
+====
 SETTINGS optimize_move_to_prewhere= 1
 SELECT * FROM 02763_merge_log_1
 3	13
@@ -312,3 +316,7 @@ SELECT x, y from merge(currentDatabase(), 02763_merge
 4	14
 4	14
 4	14
+USING 0
+USING 1
+zzz
+====
diff --git a/tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2 b/tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2
index 0263e1a974f..eabbde9e9dd 100644
--- a/tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2
+++ b/tests/queries/0_stateless/02763_row_policy_storage_merge.sql.j2
@@ -129,6 +129,27 @@ SELECT x, lc, cnst from merge(currentDatabase(), '02763_merge_fancycols') ORDER
 SELECT 'SELECT x, y from merge(currentDatabase(), 02763_merge';
 SELECT x, y from merge(currentDatabase(), '02763_merge') ORDER BY x SETTINGS optimize_move_to_prewhere= {{prew}};
 
+
+
+CREATE TABLE 02763_t1 ( b String ) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO 02763_t1 VALUES('zzz');
+CREATE TABLE 02763_t2 AS 02763_t1 ENGINE = Merge(currentDatabase(), '02763_t1');
+
+SELECT 'USING 0';
+CREATE ROW POLICY OR REPLACE 02763_filter_t1 ON 02763_t1 USING 0 TO ALL;
+SELECT * FROM 02763_t2 SETTINGS optimize_move_to_prewhere= {{prew}};
+
+SELECT 'USING 1';
+CREATE ROW POLICY OR REPLACE 02763_filter_t1 ON 02763_t1 USING 1 TO ALL;
+SELECT * FROM 02763_t2 SETTINGS optimize_move_to_prewhere= {{prew}};
+
+
+DROP TABLE 02763_t1;
+DROP TABLE 02763_t2;
+SELECT '====';
+
+
+
 DROP TABLE 02763_merge_fancycols;
 
 DROP ROW POLICY 02763_filter_1 ON 02763_merge_log_1;
@@ -140,4 +161,6 @@ DROP ROW POLICY 02763_filter_4 ON 02763_merge_merge_1;
 DROP ROW POLICY 02763_filter_5 ON 02763_merge_fancycols;
 DROP ROW POLICY 02763_filter_6 ON 02763_merge_fancycols;
 
+DROP ROW POLICY 02763_filter_t1 ON 02763_t1;
+
 {% endfor %}
diff --git a/tests/queries/0_stateless/02763_row_policy_storage_merge_alias.sql.j2 b/tests/queries/0_stateless/02763_row_policy_storage_merge_alias.sql.j2
index bdd456951dd..99ac89c4eb4 100644
--- a/tests/queries/0_stateless/02763_row_policy_storage_merge_alias.sql.j2
+++ b/tests/queries/0_stateless/02763_row_policy_storage_merge_alias.sql.j2
@@ -12,8 +12,6 @@ CREATE TABLE 02763_a_merge (x UInt8, y UInt64, z UInt64) ENGINE = Merge(currentD
 
 {% for prew in [0 , 1] -%}
 
-
-
 SELECT 'x, y, z FROM 02763_a_merge';
 SELECT x, y, z FROM 02763_a_merge ORDER BY x SETTINGS optimize_move_to_prewhere= {{prew}};
 SELECT '* FROM 02763_a_merge';
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
index cded0b28409..84031ad9081 100755
--- a/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh
+++ b/tests/queries/0_stateless/02765_queries_with_subqueries_profile_events.sh
@@ -11,7 +11,7 @@ $CLICKHOUSE_CLIENT -n -q "
 
     CREATE TABLE input (key Int) Engine=Null;
     CREATE TABLE output AS input Engine=Null;
-    CREATE MATERIALIZED VIEW mv TO output AS SELECT * FROM input;
+    CREATE MATERIALIZED VIEW mv TO output SQL SECURITY NONE AS SELECT * FROM input;
 "
 
 for allow_experimental_analyzer in 0 1; do
diff --git a/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql b/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
index 38d592201e3..1a75e000349 100644
--- a/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
+++ b/tests/queries/0_stateless/02769_parallel_replicas_unavailable_shards.sql
@@ -2,14 +2,13 @@ DROP TABLE IF EXISTS test_parallel_replicas_unavailable_shards;
 CREATE TABLE test_parallel_replicas_unavailable_shards (n UInt64) ENGINE=MergeTree() ORDER BY tuple();
 INSERT INTO test_parallel_replicas_unavailable_shards SELECT * FROM numbers(10);
 
-SYSTEM FLUSH LOGS;
-
 SET allow_experimental_parallel_reading_from_replicas=2, max_parallel_replicas=11, cluster_for_parallel_replicas='parallel_replicas', parallel_replicas_for_non_replicated_merge_tree=1;
 SET send_logs_level='error';
-SELECT count() FROM test_parallel_replicas_unavailable_shards WHERE NOT ignore(*);
+SELECT count() FROM test_parallel_replicas_unavailable_shards WHERE NOT ignore(*) SETTINGS log_comment = '02769_7b513191-5082-4073-8568-53b86a49da79';
 
 SYSTEM FLUSH LOGS;
 
-SELECT count() > 0 FROM system.text_log WHERE yesterday() <= event_date AND message LIKE '%Replica number 10 is unavailable%';
+SET allow_experimental_parallel_reading_from_replicas=0;
+SELECT ProfileEvents['ParallelReplicasUnavailableCount'] FROM system.query_log WHERE yesterday() <= event_date AND query_id in (select query_id from system.query_log where log_comment = '02769_7b513191-5082-4073-8568-53b86a49da79' and current_database = currentDatabase()) and type = 'QueryFinish' and query_id == initial_query_id;
 
 DROP TABLE test_parallel_replicas_unavailable_shards;
diff --git a/tests/queries/0_stateless/02771_ignore_data_skipping_indices.reference b/tests/queries/0_stateless/02771_ignore_data_skipping_indices.reference
index fcede2caf2a..e23e3094ca3 100644
--- a/tests/queries/0_stateless/02771_ignore_data_skipping_indices.reference
+++ b/tests/queries/0_stateless/02771_ignore_data_skipping_indices.reference
@@ -1,40 +1,77 @@
 1	2	3
 1	2	3
 1	2	3
-  ReadFromMergeTree (default.data_02771)
-  Indexes:
-    PrimaryKey
-      Condition: true
-      Parts: 1/1
-      Granules: 1/1
-    Skip
-      Name: x_idx
-      Description: minmax GRANULARITY 1
-      Parts: 0/1
-      Granules: 0/1
-    Skip
-      Name: y_idx
-      Description: minmax GRANULARITY 1
-      Parts: 0/0
-      Granules: 0/0
-    Skip
-      Name: xy_idx
-      Description: minmax GRANULARITY 1
-      Parts: 0/0
-      Granules: 0/0
-  ReadFromMergeTree (default.data_02771)
-  Indexes:
-    PrimaryKey
-      Condition: true
-      Parts: 1/1
-      Granules: 1/1
-    Skip
-      Name: x_idx
-      Description: minmax GRANULARITY 1
-      Parts: 0/1
-      Granules: 0/1
-    Skip
-      Name: y_idx
-      Description: minmax GRANULARITY 1
-      Parts: 0/0
-      Granules: 0/0
+    ReadFromMergeTree (default.data_02771)
+    Indexes:
+      PrimaryKey
+        Condition: true
+        Parts: 1/1
+        Granules: 1/1
+      Skip
+        Name: x_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/1
+        Granules: 0/1
+      Skip
+        Name: y_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
+      Skip
+        Name: xy_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
+    ReadFromMergeTree (default.data_02771)
+    Indexes:
+      PrimaryKey
+        Condition: true
+        Parts: 1/1
+        Granules: 1/1
+      Skip
+        Name: x_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/1
+        Granules: 0/1
+      Skip
+        Name: y_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
+    ReadFromMergeTree (default.data_02771)
+    Indexes:
+      PrimaryKey
+        Condition: true
+        Parts: 1/1
+        Granules: 1/1
+      Skip
+        Name: x_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/1
+        Granules: 0/1
+      Skip
+        Name: y_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
+      Skip
+        Name: xy_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
+    ReadFromMergeTree (default.data_02771)
+    Indexes:
+      PrimaryKey
+        Condition: true
+        Parts: 1/1
+        Granules: 1/1
+      Skip
+        Name: x_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/1
+        Granules: 0/1
+      Skip
+        Name: y_idx
+        Description: minmax GRANULARITY 1
+        Parts: 0/0
+        Granules: 0/0
diff --git a/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql b/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql
index a49239e9de2..951d87fd2c0 100644
--- a/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql
+++ b/tests/queries/0_stateless/02771_ignore_data_skipping_indices.sql
@@ -1,5 +1,3 @@
-SET allow_experimental_analyzer = 0;
-
 DROP TABLE IF EXISTS data_02771;
 
 
@@ -24,6 +22,14 @@ SELECT * FROM data_02771 SETTINGS ignore_data_skipping_indices='na_idx';
 
 SELECT * FROM data_02771 WHERE x = 1 AND y = 1 SETTINGS ignore_data_skipping_indices='xy_idx',force_data_skipping_indices='xy_idx' ; -- { serverError 277 }
 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 SETTINGS ignore_data_skipping_indices='xy_idx';
+
+SET allow_experimental_analyzer = 0;
+
+SELECT * from ( EXPLAIN indexes = 1 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 ) WHERE explain NOT LIKE '%Expression%' AND explain NOT LIKE '%Filter%';
+SELECT * from ( EXPLAIN indexes = 1 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 SETTINGS ignore_data_skipping_indices='xy_idx' ) WHERE explain NOT LIKE '%Expression%' AND explain NOT LIKE '%Filter%';
+
+SET allow_experimental_analyzer = 1;
+
 SELECT * from ( EXPLAIN indexes = 1 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 ) WHERE explain NOT LIKE '%Expression%' AND explain NOT LIKE '%Filter%';
 SELECT * from ( EXPLAIN indexes = 1 SELECT * FROM data_02771 WHERE x = 1 AND y = 2 SETTINGS ignore_data_skipping_indices='xy_idx' ) WHERE explain NOT LIKE '%Expression%' AND explain NOT LIKE '%Filter%';
 
diff --git a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
index 3b8a394a522..5bf3520ccdb 100644
--- a/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
+++ b/tests/queries/0_stateless/02771_parallel_replicas_analyzer.reference
@@ -9,4 +9,4 @@
 7885388429666205427
 8124171311239967992
 1	1	-- Simple query with analyzer and pure parallel replicas\nSELECT number\nFROM join_inner_table__fuzz_146_replicated\n    SETTINGS\n    allow_experimental_analyzer = 1,\n    max_parallel_replicas = 2,\n    cluster_for_parallel_replicas = \'test_cluster_one_shard_three_replicas_localhost\',\n    allow_experimental_parallel_reading_from_replicas = 1;
-0	2	SELECT `__table1`.`number` AS `number` FROM `default`.`join_inner_table__fuzz_146_replicated` AS `__table1` SETTINGS allow_experimental_analyzer = 1, max_parallel_replicas = 2, cluster_for_parallel_replicas = \'test_cluster_one_shard_three_replicas_localhost\', allow_experimental_parallel_reading_from_replicas = 1
+0	2	SELECT `__table1`.`number` AS `number` FROM `default`.`join_inner_table__fuzz_146_replicated` AS `__table1`
diff --git a/tests/queries/0_stateless/02775_show_columns_called_from_mysql.expect b/tests/queries/0_stateless/02775_show_columns_called_from_mysql.expect
index 8ba5774820e..4798a6958c6 100755
--- a/tests/queries/0_stateless/02775_show_columns_called_from_mysql.expect
+++ b/tests/queries/0_stateless/02775_show_columns_called_from_mysql.expect
@@ -11,7 +11,12 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
 log_user 0
 set timeout 60
 match_max 100000
@@ -123,7 +128,7 @@ expect -- "| dt_tz2        | DATETIME          | NO   |      | NULL    |       |
 expect -- "| enm           | TEXT              | NO   |      | NULL    |       |"
 expect -- "| f32           | FLOAT             | NO   |      | NULL    |       |"
 expect -- "| f64           | DOUBLE            | NO   |      | NULL    |       |"
-expect -- "| fs            | BLOB              | NO   |      | NULL    |       |"
+expect -- "| fs            | TEXT              | NO   |      | NULL    |       |"
 expect -- "| i128          | TEXT              | NO   |      | NULL    |       |"
 expect -- "| i16           | SMALLINT          | NO   |      | NULL    |       |"
 expect -- "| i256          | TEXT              | NO   |      | NULL    |       |"
@@ -132,74 +137,8 @@ expect -- "| i64           | BIGINT            | NO   |      | NULL    |       |
 expect -- "| i8            | TINYINT           | NO   |      | NULL    |       |"
 expect -- "| ip4           | TEXT              | NO   |      | NULL    |       |"
 expect -- "| ip6           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| lfs           | BLOB              | NO   |      | NULL    |       |"
-expect -- "| lnfs          | BLOB              | YES  |      | NULL    |       |"
-expect -- "| lns           | BLOB              | YES  |      | NULL    |       |"
-expect -- "| ls            | BLOB              | NO   |      | NULL    |       |"
-expect -- "| m             | JSON              | NO   |      | NULL    |       |"
-expect -- "| m_complex     | JSON              | NO   |      | NULL    |       |"
-expect -- "| mpg           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| ndt64         | DATETIME          | YES  |      | NULL    |       |"
-expect -- "| ndt64_tz      | DATETIME          | YES  |      | NULL    |       |"
-expect -- "| nested.col1   | TEXT              | NO   |      | NULL    |       |"
-expect -- "| nested.col2   | TEXT              | NO   |      | NULL    |       |"
-expect -- "| nfs           | BLOB              | YES  |      | NULL    |       |"
-expect -- "| ns            | BLOB              | YES  |      | NULL    |       |"
-expect -- "| o             | JSON              | NO   |      | NULL    |       |"
-expect -- "| p             | TEXT              | NO   |      | NULL    |       |"
-expect -- "| pg            | TEXT              | NO   |      | NULL    |       |"
-expect -- "| r             | TEXT              | NO   |      | NULL    |       |"
-expect -- "| s             | BLOB              | NO   |      | NULL    |       |"
-expect -- "| sagg          | TEXT              | NO   |      | NULL    |       |"
-expect -- "| t             | JSON              | NO   |      | NULL    |       |"
-expect -- "| ui128         | TEXT              | NO   |      | NULL    |       |"
-expect -- "| ui16          | SMALLINT UNSIGNED | NO   |      | NULL    |       |"
-expect -- "| ui256         | TEXT              | NO   |      | NULL    |       |"
-expect -- "| ui32          | INTEGER UNSIGNED  | NO   |      | NULL    |       |"
-expect -- "| ui64          | BIGINT UNSIGNED   | NO   |      | NULL    |       |"
-expect -- "| ui8           | TINYINT UNSIGNED  | NO   |      | NULL    |       |"
-expect -- "| uuid          | CHAR              | NO   |      | NULL    |       |"
-expect -- "+---------------+-------------------+------+------+---------+-------+"
-
-send -- "SHOW COLUMNS FROM tab SETTINGS mysql_map_string_to_text_in_show_columns=1;\r"
-expect -- "+---------------+-------------------+------+------+---------+-------+"
-expect -- "| field         | type              | null | key  | default | extra |"
-expect -- "+---------------+-------------------+------+------+---------+-------+"
-expect -- "| a             | TEXT              | NO   |      | NULL    |       |"
-expect -- "| agg           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| b             | TINYINT           | NO   |      | NULL    |       |"
-expect -- "| d             | DATE              | NO   |      | NULL    |       |"
-expect -- "| d32           | DATE              | NO   |      | NULL    |       |"
-expect -- "| dec128        | DECIMAL(38, 2)    | NO   |      | NULL    |       |"
-expect -- "| dec128_native | DECIMAL(35, 30)   | NO   |      | NULL    |       |"
-expect -- "| dec128_text   | TEXT              | NO   |      | NULL    |       |"
-expect -- "| dec256        | TEXT              | NO   |      | NULL    |       |"
-expect -- "| dec256_native | DECIMAL(65, 2)    | NO   |      | NULL    |       |"
-expect -- "| dec256_text   | TEXT              | NO   |      | NULL    |       |"
-expect -- "| dec32         | DECIMAL(9, 2)     | NO   |      | NULL    |       |"
-expect -- "| dec64         | DECIMAL(18, 2)    | NO   |      | NULL    |       |"
-expect -- "| dt            | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt64          | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt64_3_tz1    | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt64_3_tz2    | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt64_6        | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt64_9        | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt_tz1        | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| dt_tz2        | DATETIME          | NO   |      | NULL    |       |"
-expect -- "| enm           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| f32           | FLOAT             | NO   |      | NULL    |       |"
-expect -- "| f64           | DOUBLE            | NO   |      | NULL    |       |"
-expect -- "| fs            | BLOB              | NO   |      | NULL    |       |"
-expect -- "| i128          | TEXT              | NO   |      | NULL    |       |"
-expect -- "| i16           | SMALLINT          | NO   |      | NULL    |       |"
-expect -- "| i256          | TEXT              | NO   |      | NULL    |       |"
-expect -- "| i32           | INTEGER           | NO   |      | NULL    |       |"
-expect -- "| i64           | BIGINT            | NO   |      | NULL    |       |"
-expect -- "| i8            | TINYINT           | NO   |      | NULL    |       |"
-expect -- "| ip4           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| ip6           | TEXT              | NO   |      | NULL    |       |"
-expect -- "| lfs           | BLOB              | NO   |      | NULL    |       |"
-expect -- "| lnfs          | BLOB              | YES  |      | NULL    |       |"
+expect -- "| lfs           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| lnfs          | TEXT              | YES  |      | NULL    |       |"
 expect -- "| lns           | TEXT              | YES  |      | NULL    |       |"
 expect -- "| ls            | TEXT              | NO   |      | NULL    |       |"
 expect -- "| m             | JSON              | NO   |      | NULL    |       |"
@@ -209,7 +148,7 @@ expect -- "| ndt64         | DATETIME          | YES  |      | NULL    |       |
 expect -- "| ndt64_tz      | DATETIME          | YES  |      | NULL    |       |"
 expect -- "| nested.col1   | TEXT              | NO   |      | NULL    |       |"
 expect -- "| nested.col2   | TEXT              | NO   |      | NULL    |       |"
-expect -- "| nfs           | BLOB              | YES  |      | NULL    |       |"
+expect -- "| nfs           | TEXT              | YES  |      | NULL    |       |"
 expect -- "| ns            | TEXT              | YES  |      | NULL    |       |"
 expect -- "| o             | JSON              | NO   |      | NULL    |       |"
 expect -- "| p             | TEXT              | NO   |      | NULL    |       |"
@@ -227,7 +166,7 @@ expect -- "| ui8           | TINYINT UNSIGNED  | NO   |      | NULL    |       |
 expect -- "| uuid          | CHAR              | NO   |      | NULL    |       |"
 expect -- "+---------------+-------------------+------+------+---------+-------+"
 
-send -- "SHOW COLUMNS FROM tab SETTINGS mysql_map_fixed_string_to_text_in_show_columns=1;\r"
+send -- "SHOW COLUMNS FROM tab SETTINGS mysql_map_string_to_text_in_show_columns=0;\r"
 expect -- "+---------------+-------------------+------+------+---------+-------+"
 expect -- "| field         | type              | null | key  | default | extra |"
 expect -- "+---------------+-------------------+------+------+---------+-------+"
@@ -293,6 +232,73 @@ expect -- "| ui8           | TINYINT UNSIGNED  | NO   |      | NULL    |       |
 expect -- "| uuid          | CHAR              | NO   |      | NULL    |       |"
 expect -- "+---------------+-------------------+------+------+---------+-------+"
 
+send -- "SHOW COLUMNS FROM tab SETTINGS mysql_map_fixed_string_to_text_in_show_columns=0;\r"
+expect -- "+---------------+-------------------+------+------+---------+-------+"
+expect -- "| field         | type              | null | key  | default | extra |"
+expect -- "+---------------+-------------------+------+------+---------+-------+"
+expect -- "| a             | TEXT              | NO   |      | NULL    |       |"
+expect -- "| agg           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| b             | TINYINT           | NO   |      | NULL    |       |"
+expect -- "| d             | DATE              | NO   |      | NULL    |       |"
+expect -- "| d32           | DATE              | NO   |      | NULL    |       |"
+expect -- "| dec128        | DECIMAL(38, 2)    | NO   |      | NULL    |       |"
+expect -- "| dec128_native | DECIMAL(35, 30)   | NO   |      | NULL    |       |"
+expect -- "| dec128_text   | TEXT              | NO   |      | NULL    |       |"
+expect -- "| dec256        | TEXT              | NO   |      | NULL    |       |"
+expect -- "| dec256_native | DECIMAL(65, 2)    | NO   |      | NULL    |       |"
+expect -- "| dec256_text   | TEXT              | NO   |      | NULL    |       |"
+expect -- "| dec32         | DECIMAL(9, 2)     | NO   |      | NULL    |       |"
+expect -- "| dec64         | DECIMAL(18, 2)    | NO   |      | NULL    |       |"
+expect -- "| dt            | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt64          | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt64_3_tz1    | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt64_3_tz2    | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt64_6        | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt64_9        | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt_tz1        | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| dt_tz2        | DATETIME          | NO   |      | NULL    |       |"
+expect -- "| enm           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| f32           | FLOAT             | NO   |      | NULL    |       |"
+expect -- "| f64           | DOUBLE            | NO   |      | NULL    |       |"
+expect -- "| fs            | BLOB              | NO   |      | NULL    |       |"
+expect -- "| i128          | TEXT              | NO   |      | NULL    |       |"
+expect -- "| i16           | SMALLINT          | NO   |      | NULL    |       |"
+expect -- "| i256          | TEXT              | NO   |      | NULL    |       |"
+expect -- "| i32           | INTEGER           | NO   |      | NULL    |       |"
+expect -- "| i64           | BIGINT            | NO   |      | NULL    |       |"
+expect -- "| i8            | TINYINT           | NO   |      | NULL    |       |"
+expect -- "| ip4           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| ip6           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| lfs           | BLOB              | NO   |      | NULL    |       |"
+expect -- "| lnfs          | BLOB              | YES  |      | NULL    |       |"
+expect -- "| lns           | TEXT              | YES  |      | NULL    |       |"
+expect -- "| ls            | TEXT              | NO   |      | NULL    |       |"
+expect -- "| m             | JSON              | NO   |      | NULL    |       |"
+expect -- "| m_complex     | JSON              | NO   |      | NULL    |       |"
+expect -- "| mpg           | TEXT              | NO   |      | NULL    |       |"
+expect -- "| ndt64         | DATETIME          | YES  |      | NULL    |       |"
+expect -- "| ndt64_tz      | DATETIME          | YES  |      | NULL    |       |"
+expect -- "| nested.col1   | TEXT              | NO   |      | NULL    |       |"
+expect -- "| nested.col2   | TEXT              | NO   |      | NULL    |       |"
+expect -- "| nfs           | BLOB              | YES  |      | NULL    |       |"
+expect -- "| ns            | TEXT              | YES  |      | NULL    |       |"
+expect -- "| o             | JSON              | NO   |      | NULL    |       |"
+expect -- "| p             | TEXT              | NO   |      | NULL    |       |"
+expect -- "| pg            | TEXT              | NO   |      | NULL    |       |"
+expect -- "| r             | TEXT              | NO   |      | NULL    |       |"
+expect -- "| s             | TEXT              | NO   |      | NULL    |       |"
+expect -- "| sagg          | TEXT              | NO   |      | NULL    |       |"
+expect -- "| t             | JSON              | NO   |      | NULL    |       |"
+expect -- "| ui128         | TEXT              | NO   |      | NULL    |       |"
+expect -- "| ui16          | SMALLINT UNSIGNED | NO   |      | NULL    |       |"
+expect -- "| ui256         | TEXT              | NO   |      | NULL    |       |"
+expect -- "| ui32          | INTEGER UNSIGNED  | NO   |      | NULL    |       |"
+expect -- "| ui64          | BIGINT UNSIGNED   | NO   |      | NULL    |       |"
+expect -- "| ui8           | TINYINT UNSIGNED  | NO   |      | NULL    |       |"
+expect -- "| uuid          | CHAR              | NO   |      | NULL    |       |"
+expect -- "+---------------+-------------------+------+------+---------+-------+"
+
+
 send -- "DROP TABLE tab;"
 
 send -- "quit;\r"
diff --git a/tests/queries/0_stateless/02782_uniq_exact_parallel_merging_bug.sh b/tests/queries/0_stateless/02782_uniq_exact_parallel_merging_bug.sh
index 060efe86602..6e787523540 100755
--- a/tests/queries/0_stateless/02782_uniq_exact_parallel_merging_bug.sh
+++ b/tests/queries/0_stateless/02782_uniq_exact_parallel_merging_bug.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Tags: long, no-random-settings, no-tsan, no-asan, no-ubsan, no-msan, no-parallel
+# Tags: long, no-random-settings, no-tsan, no-asan, no-ubsan, no-msan, no-parallel, no-debug
 
 # shellcheck disable=SC2154
 
diff --git a/tests/queries/0_stateless/02783_max_bytes_to_read_in_schema_inference.sql b/tests/queries/0_stateless/02783_max_bytes_to_read_in_schema_inference.sql
index b4165e8e80a..ef0381df1a6 100644
--- a/tests/queries/0_stateless/02783_max_bytes_to_read_in_schema_inference.sql
+++ b/tests/queries/0_stateless/02783_max_bytes_to_read_in_schema_inference.sql
@@ -1,5 +1,5 @@
 set input_format_max_rows_to_read_for_schema_inference=2;
 set input_format_json_infer_incomplete_types_as_strings=0;
-desc format('JSONEachRow', '{"a" : null}, {"a" : 42}') settings input_format_max_bytes_to_read_for_schema_inference=10; -- {serverError ONLY_NULLS_WHILE_READING_SCHEMA}
+desc format('JSONEachRow', '{"a" : null}, {"a" : 42}') settings input_format_max_bytes_to_read_for_schema_inference=10; -- {serverError CANNOT_EXTRACT_TABLE_STRUCTURE}
 desc format('JSONEachRow', '{"a" : null}, {"a" : 42}') settings input_format_max_bytes_to_read_for_schema_inference=20;
 
diff --git a/tests/queries/0_stateless/02783_parallel_replicas_trivial_count_optimization.sh b/tests/queries/0_stateless/02783_parallel_replicas_trivial_count_optimization.sh
index bafab249b47..20b3efedd49 100755
--- a/tests/queries/0_stateless/02783_parallel_replicas_trivial_count_optimization.sh
+++ b/tests/queries/0_stateless/02783_parallel_replicas_trivial_count_optimization.sh
@@ -25,7 +25,7 @@ function run_query_with_pure_parallel_replicas () {
     $CLICKHOUSE_CLIENT \
         --query "$2" \
         --query_id "${1}_disabled" \
-        --max_parallel_replicas 0
+        --max_parallel_replicas 1
 
     $CLICKHOUSE_CLIENT \
         --query "$2" \
@@ -50,7 +50,7 @@ function run_query_with_custom_key_parallel_replicas () {
     $CLICKHOUSE_CLIENT \
         --query "$2" \
         --query_id "${1}_disabled" \
-        --max_parallel_replicas 0
+        --max_parallel_replicas 1
 
     $CLICKHOUSE_CLIENT \
         --query "$2" \
diff --git a/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.reference b/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.reference
index 1340b3affe3..ef9d076449a 100644
--- a/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.reference
+++ b/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.reference
@@ -4,34 +4,34 @@ The argument is before the reference time point
 ───────────────────────────────────────────────
 Row 1:
 ──────
-syslog_arg:    Jun 30 23:58:30
-res:           2023-06-30 23:58:30
-res_null:      2023-06-30 23:58:30
-res_zero:      2023-06-30 23:58:30
-res_us:        2023-06-30 23:58:30
-res_us_null:   2023-06-30 23:58:30
-res_us_zero:   2023-06-30 23:58:30
-res64:         2023-06-30 23:58:30.000
-res64_null:    2023-06-30 23:58:30.000
-res64_zero:    2023-06-30 23:58:30.000
-res64_us:      2023-06-30 23:58:30.000
-res64_us_null: 2023-06-30 23:58:30.000
-res64_us_zero: 2023-06-30 23:58:30.000
+syslog_arg:    Jun 29 23:59:30
+res:           2023-06-29 23:59:30
+res_null:      2023-06-29 23:59:30
+res_zero:      2023-06-29 23:59:30
+res_us:        2023-06-29 23:59:30
+res_us_null:   2023-06-29 23:59:30
+res_us_zero:   2023-06-29 23:59:30
+res64:         2023-06-29 23:59:30.000
+res64_null:    2023-06-29 23:59:30.000
+res64_zero:    2023-06-29 23:59:30.000
+res64_us:      2023-06-29 23:59:30.000
+res64_us_null: 2023-06-29 23:59:30.000
+res64_us_zero: 2023-06-29 23:59:30.000
 ──────────────────────────────────────────────
 The argument is after the reference time point
 ──────────────────────────────────────────────
 Row 1:
 ──────
-syslog_arg:    Jul  1 00:00:30
-res:           2022-07-01 00:00:30
-res_null:      2022-07-01 00:00:30
-res_zero:      2022-07-01 00:00:30
-res_us:        2022-07-01 00:00:30
-res_us_null:   2022-07-01 00:00:30
-res_us_zero:   2022-07-01 00:00:30
-res64:         2022-07-01 00:00:30.000
-res64_null:    2022-07-01 00:00:30.000
-res64_zero:    2022-07-01 00:00:30.000
-res64_us:      2022-07-01 00:00:30.000
-res64_us_null: 2022-07-01 00:00:30.000
-res64_us_zero: 2022-07-01 00:00:30.000
+syslog_arg:    Jul  1 23:59:30
+res:           2022-06-30 23:59:30
+res_null:      2022-06-30 23:59:30
+res_zero:      2022-06-30 23:59:30
+res_us:        2022-06-30 23:59:30
+res_us_null:   2022-06-30 23:59:30
+res_us_zero:   2022-06-30 23:59:30
+res64:         2022-06-30 23:59:30.000
+res64_null:    2022-06-30 23:59:30.000
+res64_zero:    2022-06-30 23:59:30.000
+res64_us:      2022-06-30 23:59:30.000
+res64_us_null: 2022-06-30 23:59:30.000
+res64_us_zero: 2022-06-30 23:59:30.000
diff --git a/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.sql b/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.sql
index c67722393ab..ecaec9f99bf 100644
--- a/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.sql
+++ b/tests/queries/0_stateless/02783_parsedatetimebesteffort_syslog.sql
@@ -8,7 +8,7 @@ SELECT '────────────────────────
 WITH
     toDateTime('2023-06-30 23:59:30') AS dt_ref,
     now() AS dt_now, 
-    date_sub(MINUTE, 1, dt_now) as dt_before,
+    date_sub(DAY, 1, dt_now) as dt_before,
     dateDiff(SECOND, dt_ref, dt_now) AS time_shift,
     formatDateTime(dt_before, '%b %e %T') AS syslog_before
 SELECT
@@ -34,7 +34,7 @@ SELECT '────────────────────────
 WITH
     toDateTime('2023-06-30 23:59:30') AS dt_ref,
     now() AS dt_now, 
-    date_add(MINUTE, 1, dt_now) as dt_after,
+    date_add(DAY, 1, dt_now) as dt_after,
     dateDiff(SECOND, dt_ref, dt_now) AS time_shift,
     formatDateTime(dt_after, '%b %e %T') AS syslog_after
 SELECT
diff --git a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.reference b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.reference
index 802d55f8ae3..521e3e2edbc 100644
--- a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.reference
+++ b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.reference
@@ -1,6 +1,4 @@
-02784_automatic_parallel_replicas_join-default_simple_join_10M_pure	0 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_10M_pure	1 estimated parallel replicas
-02784_automatic_parallel_replicas_join-default_simple_join_5M_pure	0 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_5M_pure	2 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_1M_pure	1 estimated parallel replicas
 02784_automatic_parallel_replicas_join-default_simple_join_1M_pure	10 estimated parallel replicas
diff --git a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.sh b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.sh
index baeeb820da5..801cd22b79f 100755
--- a/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.sh
+++ b/tests/queries/0_stateless/02784_parallel_replicas_automatic_decision_join.sh
@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-## Note: The analyzer doesn't support JOIN with parallel replicas yet
+# Tags: no-tsan, no-asan, no-msan
+# It's not clear why distributed aggregation is much slower with sanitizers (https://github.com/ClickHouse/ClickHouse/issues/60625)
 
 CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
@@ -64,11 +65,12 @@ function run_query_with_pure_parallel_replicas () {
         --query_id "${1}_pure" \
         --max_parallel_replicas 3 \
         --prefer_localhost_replica 1 \
+        --parallel_replicas_prefer_local_join 0 \
         --cluster_for_parallel_replicas "parallel_replicas" \
         --allow_experimental_parallel_reading_from_replicas 1 \
         --parallel_replicas_for_non_replicated_merge_tree 1 \
         --parallel_replicas_min_number_of_rows_per_replica "$2" \
-    |& grep "It is enough work for" | awk '{ print substr($7, 2, length($7) - 2) "\t" $20 " estimated parallel replicas" }'
+    |& grep "It is enough work for" | awk '{ print substr($7, 2, length($7) - 2) "\t" $20 " estimated parallel replicas" }' | sort -n -k2 -b | grep -Pv "\t0 estimated parallel replicas"
 }
 
 query_id_base="02784_automatic_parallel_replicas_join-$CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.reference b/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.reference
index 63658890119..fca48238778 100644
--- a/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.reference
+++ b/tests/queries/0_stateless/02785_date_predicate_optimizations_ast_query_tree_rewrite.reference
@@ -24,21 +24,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -66,21 +66,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -244,21 +244,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1998-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1998-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -289,34 +289,34 @@ QUERY id: 0
                       FUNCTION id: 14, function_name: less, function_type: ordinary, result_type: UInt8
                         ARGUMENTS
                           LIST id: 15, nodes: 2
-                            COLUMN id: 16, column_name: date1, result_type: Date, source_id: 3
-                            CONSTANT id: 17, constant_value: \'1994-01-01\', constant_value_type: String
-                FUNCTION id: 18, function_name: and, function_type: ordinary, result_type: UInt8
+                            COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                            CONSTANT id: 16, constant_value: \'1994-01-01\', constant_value_type: String
+                FUNCTION id: 17, function_name: and, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      FUNCTION id: 20, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      FUNCTION id: 19, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                         ARGUMENTS
-                          LIST id: 21, nodes: 2
-                            COLUMN id: 22, column_name: date1, result_type: Date, source_id: 3
-                            CONSTANT id: 23, constant_value: \'1994-01-01\', constant_value_type: String
-                      FUNCTION id: 24, function_name: less, function_type: ordinary, result_type: UInt8
+                          LIST id: 20, nodes: 2
+                            COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                            CONSTANT id: 21, constant_value: \'1994-01-01\', constant_value_type: String
+                      FUNCTION id: 22, function_name: less, function_type: ordinary, result_type: UInt8
                         ARGUMENTS
-                          LIST id: 25, nodes: 2
-                            COLUMN id: 26, column_name: date1, result_type: Date, source_id: 3
-                            CONSTANT id: 27, constant_value: \'1995-01-01\', constant_value_type: String
-          FUNCTION id: 28, function_name: and, function_type: ordinary, result_type: UInt8
+                          LIST id: 23, nodes: 2
+                            COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                            CONSTANT id: 24, constant_value: \'1995-01-01\', constant_value_type: String
+          FUNCTION id: 25, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 29, nodes: 2
-                FUNCTION id: 30, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 26, nodes: 2
+                FUNCTION id: 27, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 31, nodes: 2
-                      COLUMN id: 32, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 33, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 34, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 28, nodes: 2
+                      COLUMN id: 29, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 30, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 31, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 35, nodes: 2
-                      COLUMN id: 32, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 36, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 32, nodes: 2
+                      COLUMN id: 29, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 33, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT
     value1,
@@ -346,26 +346,26 @@ QUERY id: 0
                 FUNCTION id: 11, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 12, nodes: 2
-                      COLUMN id: 13, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 14, constant_value: \'1993-01-01\', constant_value_type: String
-                FUNCTION id: 15, function_name: less, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 6, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 13, constant_value: \'1993-01-01\', constant_value_type: String
+                FUNCTION id: 14, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 16, nodes: 2
-                      COLUMN id: 17, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 18, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 19, function_name: and, function_type: ordinary, result_type: UInt8
+                    LIST id: 15, nodes: 2
+                      COLUMN id: 6, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 16, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 17, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 20, nodes: 2
-                FUNCTION id: 21, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 18, nodes: 2
+                FUNCTION id: 19, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 22, nodes: 2
-                      COLUMN id: 23, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 25, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 20, nodes: 2
+                      COLUMN id: 21, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 22, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 23, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 26, nodes: 2
-                      COLUMN id: 23, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 27, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 24, nodes: 2
+                      COLUMN id: 21, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 25, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -425,22 +425,22 @@ QUERY id: 0
           FUNCTION id: 10, function_name: less, function_type: ordinary, result_type: UInt8
             ARGUMENTS
               LIST id: 11, nodes: 2
-                COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
-                CONSTANT id: 13, constant_value: \'1994-01-01\', constant_value_type: String
+                COLUMN id: 8, column_name: date1, result_type: Date, source_id: 3
+                CONSTANT id: 12, constant_value: \'1994-01-01\', constant_value_type: String
   WHERE
-    FUNCTION id: 14, function_name: and, function_type: ordinary, result_type: UInt8
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
       ARGUMENTS
-        LIST id: 15, nodes: 2
-          FUNCTION id: 16, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                COLUMN id: 18, column_name: id, result_type: UInt32, source_id: 3
-                CONSTANT id: 19, constant_value: UInt64_1, constant_value_type: UInt8
-          FUNCTION id: 20, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                COLUMN id: 17, column_name: id, result_type: UInt32, source_id: 3
+                CONSTANT id: 18, constant_value: UInt64_1, constant_value_type: UInt8
+          FUNCTION id: 19, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 21, nodes: 2
-                COLUMN id: 18, column_name: id, result_type: UInt32, source_id: 3
-                CONSTANT id: 22, constant_value: UInt64_3, constant_value_type: UInt8
+              LIST id: 20, nodes: 2
+                COLUMN id: 17, column_name: id, result_type: UInt32, source_id: 3
+                CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -479,8 +479,8 @@ QUERY id: 0
           FUNCTION id: 19, function_name: less, function_type: ordinary, result_type: UInt8
             ARGUMENTS
               LIST id: 20, nodes: 2
-                COLUMN id: 21, column_name: date1, result_type: Date, source_id: 3
-                CONSTANT id: 22, constant_value: \'1994-01-01\', constant_value_type: String
+                COLUMN id: 17, column_name: date1, result_type: Date, source_id: 3
+                CONSTANT id: 21, constant_value: \'1994-01-01\', constant_value_type: String
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -582,21 +582,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -624,21 +624,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1992-04-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1992-04-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -666,21 +666,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1992-04-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1992-04-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date_t
@@ -847,26 +847,26 @@ QUERY id: 0
                       FUNCTION id: 14, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                         ARGUMENTS
                           LIST id: 15, nodes: 2
-                            COLUMN id: 16, column_name: date1, result_type: Date, source_id: 3
-                            CONSTANT id: 17, constant_value: \'1993-01-01\', constant_value_type: String
-                      FUNCTION id: 18, function_name: less, function_type: ordinary, result_type: UInt8
+                            COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                            CONSTANT id: 16, constant_value: \'1993-01-01\', constant_value_type: String
+                      FUNCTION id: 17, function_name: less, function_type: ordinary, result_type: UInt8
                         ARGUMENTS
-                          LIST id: 19, nodes: 2
-                            COLUMN id: 20, column_name: date1, result_type: Date, source_id: 3
-                            CONSTANT id: 21, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 22, function_name: and, function_type: ordinary, result_type: UInt8
+                          LIST id: 18, nodes: 2
+                            COLUMN id: 10, column_name: date1, result_type: Date, source_id: 3
+                            CONSTANT id: 19, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 20, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 23, nodes: 2
-                FUNCTION id: 24, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 21, nodes: 2
+                FUNCTION id: 22, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 25, nodes: 2
-                      COLUMN id: 26, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 27, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 28, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 23, nodes: 2
+                      COLUMN id: 24, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 25, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 26, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 29, nodes: 2
-                      COLUMN id: 26, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 30, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 27, nodes: 2
+                      COLUMN id: 24, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 28, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime_t
@@ -894,21 +894,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: DateTime, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: DateTime, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime_t
@@ -936,21 +936,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: DateTime, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: DateTime, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date32_t
@@ -978,21 +978,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date32, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date32, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM date32_t
@@ -1020,21 +1020,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: Date32, source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: Date32, source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime64_t
@@ -1062,21 +1062,21 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: DateTime64(3), source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: DateTime64(3), source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
 SELECT value1
 FROM datetime64_t
@@ -1104,19 +1104,19 @@ QUERY id: 0
                 FUNCTION id: 12, function_name: less, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
                     LIST id: 13, nodes: 2
-                      COLUMN id: 14, column_name: date1, result_type: DateTime64(3), source_id: 3
-                      CONSTANT id: 15, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
-          FUNCTION id: 16, function_name: and, function_type: ordinary, result_type: UInt8
+                      COLUMN id: 10, column_name: date1, result_type: DateTime64(3), source_id: 3
+                      CONSTANT id: 14, constant_value: \'1994-01-01 00:00:00\', constant_value_type: String
+          FUNCTION id: 15, function_name: and, function_type: ordinary, result_type: UInt8
             ARGUMENTS
-              LIST id: 17, nodes: 2
-                FUNCTION id: 18, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 19, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 21, constant_value: UInt64_1, constant_value_type: UInt8
-                FUNCTION id: 22, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+                    LIST id: 18, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 20, constant_value: UInt64_1, constant_value_type: UInt8
+                FUNCTION id: 21, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
                   ARGUMENTS
-                    LIST id: 23, nodes: 2
-                      COLUMN id: 20, column_name: id, result_type: UInt32, source_id: 3
-                      CONSTANT id: 24, constant_value: UInt64_3, constant_value_type: UInt8
+                    LIST id: 22, nodes: 2
+                      COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                      CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
   SETTINGS allow_experimental_analyzer=1
diff --git a/tests/queries/0_stateless/02789_reading_from_s3_with_connection_pool.sh b/tests/queries/0_stateless/02789_reading_from_s3_with_connection_pool.sh
index ce90157d004..e4a1de9a2ec 100755
--- a/tests/queries/0_stateless/02789_reading_from_s3_with_connection_pool.sh
+++ b/tests/queries/0_stateless/02789_reading_from_s3_with_connection_pool.sh
@@ -19,8 +19,8 @@ query_id=$(${CLICKHOUSE_CLIENT} --query "select queryID() from ($query) limit 1"
 ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
 ${CLICKHOUSE_CLIENT} -nm --query "
 WITH
-    ProfileEvents['ReadBufferFromS3ResetSessions'] AS reset,
-    ProfileEvents['ReadBufferFromS3PreservedSessions'] AS preserved
+    ProfileEvents['DiskConnectionsReset'] AS reset,
+    ProfileEvents['DiskConnectionsPreserved'] AS preserved
 SELECT preserved > reset
 FROM system.query_log
 WHERE type = 'QueryFinish'
@@ -51,7 +51,7 @@ select queryID() from(
 " 2>&1)
 ${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
 ${CLICKHOUSE_CLIENT} -nm --query "
-SELECT ProfileEvents['ReadWriteBufferFromHTTPPreservedSessions'] > 0
+SELECT ProfileEvents['StorageConnectionsPreserved'] > 0
 FROM system.query_log
 WHERE type = 'QueryFinish'
     AND current_database = currentDatabase()
diff --git a/tests/queries/0_stateless/02790_sql_standard_fetch.reference b/tests/queries/0_stateless/02790_sql_standard_fetch.reference
index ef578b526da..6ae56306797 100644
--- a/tests/queries/0_stateless/02790_sql_standard_fetch.reference
+++ b/tests/queries/0_stateless/02790_sql_standard_fetch.reference
@@ -1,36 +1,36 @@
-┌─name───────────┬─department─┬─salary─�
-│ Frank          │ it         │    120 │
-│ Henry or Irene │ it         │    104 │
-│ Henry or Irene │ it         │    104 │
-│ Alice          │ sales      │    100 │
-│ Dave or Cindy  │ sales      │     96 │
-└────────────────┴────────────┴────────┘
-┌─name───────────┬─department─┬─salary─�
-│ Frank          │ it         │    120 │
-│ Henry or Irene │ it         │    104 │
-│ Henry or Irene │ it         │    104 │
-│ Alice          │ sales      │    100 │
-│ Dave or Cindy  │ sales      │     96 │
-└────────────────┴────────────┴────────┘
-┌─name───────────┬─department─┬─salary─�
-│ Frank          │ it         │    120 │
-│ Henry or Irene │ it         │    104 │
-│ Henry or Irene │ it         │    104 │
-│ Alice          │ sales      │    100 │
-│ Dave or Cindy  │ sales      │     96 │
-│ Dave or Cindy  │ sales      │     96 │
-└────────────────┴────────────┴────────┘
-┌─name──────────┬─department─┬─salary─�
-│ Alice         │ sales      │    100 │
-│ Dave or Cindy │ sales      │     96 │
-│ Dave or Cindy │ sales      │     96 │
-│ Grace         │ it         │     90 │
-│ Emma          │ it         │     84 │
-└───────────────┴────────────┴────────┘
-┌─name──────────┬─department─┬─salary─�
-│ Alice         │ sales      │    100 │
-│ Dave or Cindy │ sales      │     96 │
-│ Dave or Cindy │ sales      │     96 │
-│ Grace         │ it         │     90 │
-│ Emma          │ it         │     84 │
-└───────────────┴────────────┴────────┘
+   ┌─name───────────┬─department─┬─salary─�
+1. │ Frank          │ it         │    120 │
+2. │ Henry or Irene │ it         │    104 │
+3. │ Henry or Irene │ it         │    104 │
+4. │ Alice          │ sales      │    100 │
+5. │ Dave or Cindy  │ sales      │     96 │
+   └────────────────┴────────────┴────────┘
+   ┌─name───────────┬─department─┬─salary─�
+1. │ Frank          │ it         │    120 │
+2. │ Henry or Irene │ it         │    104 │
+3. │ Henry or Irene │ it         │    104 │
+4. │ Alice          │ sales      │    100 │
+5. │ Dave or Cindy  │ sales      │     96 │
+   └────────────────┴────────────┴────────┘
+   ┌─name───────────┬─department─┬─salary─�
+1. │ Frank          │ it         │    120 │
+2. │ Henry or Irene │ it         │    104 │
+3. │ Henry or Irene │ it         │    104 │
+4. │ Alice          │ sales      │    100 │
+5. │ Dave or Cindy  │ sales      │     96 │
+6. │ Dave or Cindy  │ sales      │     96 │
+   └────────────────┴────────────┴────────┘
+   ┌─name──────────┬─department─┬─salary─�
+1. │ Alice         │ sales      │    100 │
+2. │ Dave or Cindy │ sales      │     96 │
+3. │ Dave or Cindy │ sales      │     96 │
+4. │ Grace         │ it         │     90 │
+5. │ Emma          │ it         │     84 │
+   └───────────────┴────────────┴────────┘
+   ┌─name──────────┬─department─┬─salary─�
+1. │ Alice         │ sales      │    100 │
+2. │ Dave or Cindy │ sales      │     96 │
+3. │ Dave or Cindy │ sales      │     96 │
+4. │ Grace         │ it         │     90 │
+5. │ Emma          │ it         │     84 │
+   └───────────────┴────────────┴────────┘
diff --git a/tests/queries/0_stateless/02793_implicit_pretty_format_settings.expect b/tests/queries/0_stateless/02793_implicit_pretty_format_settings.expect
index 569cbc7330e..ab70bdeca1f 100755
--- a/tests/queries/0_stateless/02793_implicit_pretty_format_settings.expect
+++ b/tests/queries/0_stateless/02793_implicit_pretty_format_settings.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
@@ -19,7 +24,7 @@ spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \
 expect ":) "
 
 # Send a command
-send -- "SELECT 1 SETTINGS output_format_pretty_row_numbers = 1\r"
+send -- "SELECT 1 SETTINGS output_format_pretty_row_numbers = 1, output_format_pretty_color = 0\r"
 expect "1. │ 1 │"
 expect ":) "
 
diff --git a/tests/queries/0_stateless/02797_aggregator_huge_mem_usage_bug.sql b/tests/queries/0_stateless/02797_aggregator_huge_mem_usage_bug.sql
index e204d968382..3532f617e89 100644
--- a/tests/queries/0_stateless/02797_aggregator_huge_mem_usage_bug.sql
+++ b/tests/queries/0_stateless/02797_aggregator_huge_mem_usage_bug.sql
@@ -3,9 +3,9 @@ DROP TABLE IF EXISTS v;
 create view v (s LowCardinality(String), n UInt8) as select 'test' as s, toUInt8(number) as n from numbers(10000000);
 
 -- this is what allows mem usage to go really high
-set max_block_size=10000000000;
+set max_block_size=4294967296;
 
-set max_memory_usage = '1Gi';
+set max_memory_usage = '420Mi';
 
 select s, sum(n) from v group by s format Null;
 
diff --git a/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.reference b/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.reference
new file mode 100644
index 00000000000..23ee1a7ce30
--- /dev/null
+++ b/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.reference
@@ -0,0 +1,4 @@
+[0]	[0]
+[0]	[0]
+[0]	[0]
+[0]	[0]
diff --git a/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.sql.j2 b/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.sql.j2
new file mode 100644
index 00000000000..95bac76c591
--- /dev/null
+++ b/tests/queries/0_stateless/02797_join_nested_lowcardinality_convert.sql.j2
@@ -0,0 +1,37 @@
+SET allow_suspicious_low_cardinality_types=1;
+
+DROP TABLE IF EXISTS test1__fuzz_36;
+DROP TABLE IF EXISTS test1__fuzz_38;
+DROP TABLE IF EXISTS test1__fuzz_41;
+
+CREATE TABLE test1__fuzz_36 (`pt` Array(Array(LowCardinality(Int256))), `exposure_uv` UInt32) ENGINE = Memory;
+CREATE TABLE test1__fuzz_38 (`pt` Array(Array(Int256)), `exposure_uv` UInt32) ENGINE = Memory;
+CREATE TABLE test1__fuzz_41 (`pt` Array(Array(Int8)), `exposure_uv` Decimal(76, 39)) ENGINE = Memory;
+
+insert into test1__fuzz_36 select * from generateRandom() limit 10;
+insert into test1__fuzz_38 select * from generateRandom() limit 10;
+insert into test1__fuzz_41 select * from generateRandom() limit 10;
+
+{% for join_algorithm in ['default','grace_hash','partial_merge','full_sorting_merge'] -%}
+
+SET join_algorithm = '{{ join_algorithm }}';
+
+SELECT *
+FROM (SELECT materialize([0] :: Array(LowCardinality(Int64))) as pt) AS m0
+LEFT JOIN (SELECT materialize([0] :: Array(Int64)) as pt) AS m2
+ON m0.pt = m2.pt
+;
+
+SELECT * FROM (
+    SELECT m0.pt, m0.exposure_uv AS exposure_uv, round(m2.exposure_uv, 10) FROM (SELECT pt, exposure_uv FROM test1__fuzz_36) AS m0
+    LEFT JOIN (SELECT pt, exposure_uv FROM test1__fuzz_38) AS m1 ON m0.pt = m1.pt LEFT JOIN (SELECT pt, exposure_uv FROM test1__fuzz_41) AS m2
+    ON m0.pt = m2.pt
+) AS c0
+ORDER BY exposure_uv ASC NULLS LAST
+FORMAT Null SETTINGS join_use_nulls = 1;
+
+{% endfor -%}
+
+DROP TABLE IF EXISTS test1__fuzz_36;
+DROP TABLE IF EXISTS test1__fuzz_38;
+DROP TABLE IF EXISTS test1__fuzz_41;
diff --git a/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.reference b/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.reference
index ffb61b54f9a..3ad865b7a74 100644
--- a/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.reference
+++ b/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.reference
@@ -1,11 +1,11 @@
- explain                                                                 
+    explain                                                                 
 
- (Expression)                                                             
- ExpressionTransform                                                      
-   (Aggregating)                                                          
-   FinalizeAggregatedTransform                                            
-     AggregatingInOrderTransform                                          
-       (Expression)                                                       
-       ExpressionTransform                                                
-         (ReadFromMergeTree)                                              
-         MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1 
+1.  (Expression)                                                             
+2.  ExpressionTransform                                                      
+3.    (Aggregating)                                                          
+4.    FinalizeAggregatedTransform                                            
+5.      AggregatingInOrderTransform                                          
+6.        (Expression)                                                       
+7.        ExpressionTransform                                                
+8.          (ReadFromMergeTree)                                              
+9.          MergeTreeSelect(pool: ReadPoolInOrder, algorithm: InOrder) 0 → 1 
diff --git a/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.sql b/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.sql
index 76f2129abfa..5b9976714ea 100644
--- a/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.sql
+++ b/tests/queries/0_stateless/02798_explain_settings_not_applied_bug.sql
@@ -1,3 +1,4 @@
+SET output_format_pretty_color=1;
 SET read_in_order_two_level_merge_threshold=1000000;
 
 DROP TABLE IF EXISTS t;
diff --git a/tests/queries/0_stateless/02802_with_cube_with_totals.reference b/tests/queries/0_stateless/02802_with_cube_with_totals.reference
index c7b7b570456..206c32e562b 100644
--- a/tests/queries/0_stateless/02802_with_cube_with_totals.reference
+++ b/tests/queries/0_stateless/02802_with_cube_with_totals.reference
@@ -1,5 +1,35 @@
 ((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
 ((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
+((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
 
 ((2147483648,(-0,1.1754943508222875e-38,2147483646,'-9223372036854775808',NULL)))	0
 \N
diff --git a/tests/queries/0_stateless/02802_with_cube_with_totals.sql b/tests/queries/0_stateless/02802_with_cube_with_totals.sql
index 77adb68eb4b..168e4d61b68 100644
--- a/tests/queries/0_stateless/02802_with_cube_with_totals.sql
+++ b/tests/queries/0_stateless/02802_with_cube_with_totals.sql
@@ -1,2 +1,3 @@
+set allow_experimental_analyzer=1;
 SELECT tuple((2147483648, (-0., 1.1754943508222875e-38, 2147483646, '-9223372036854775808', NULL))), toInt128(0.0001) GROUP BY ((256, toInt64(1.1754943508222875e-38), NULL), NULL, -0., ((65535, '-92233720368547758.07'), 0.9999), tuple(((1., 3.4028234663852886e38, '1', 0.5), NULL, tuple('0.1')))) WITH CUBE WITH TOTALS;
 SELECT NULL GROUP BY toUUID(NULL, '0', NULL, '0.0000065535'), 1 WITH CUBE WITH TOTALS;
diff --git a/tests/queries/0_stateless/02809_prewhere_and_in.reference b/tests/queries/0_stateless/02809_prewhere_and_in.reference
index 3080ae862bb..54ea18b3eab 100644
--- a/tests/queries/0_stateless/02809_prewhere_and_in.reference
+++ b/tests/queries/0_stateless/02809_prewhere_and_in.reference
@@ -1,8 +1,8 @@
-PREWHERE a IN
-PREWHERE a IN
-PREWHERE a IN
-PREWHERE a IN
-PREWHERE b NOT IN
-PREWHERE b NOT IN
-PREWHERE b NOT IN
-PREWHERE b NOT IN
+        Prewhere filter
+      Prewhere filter
+      Prewhere filter
+        Prewhere filter
+        Prewhere filter
+      Prewhere filter
+      Prewhere filter
+        Prewhere filter
diff --git a/tests/queries/0_stateless/02809_prewhere_and_in.sql b/tests/queries/0_stateless/02809_prewhere_and_in.sql
index 345577d6c7c..448f9512cf6 100644
--- a/tests/queries/0_stateless/02809_prewhere_and_in.sql
+++ b/tests/queries/0_stateless/02809_prewhere_and_in.sql
@@ -16,40 +16,16 @@ AS SELECT * FROM numbers(10);
 SET optimize_move_to_prewhere=1;
 
 -- Queries with 'IN'
-SELECT substring(explain, 1, 13) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE a IN (SELECT * FROM system.one)
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 13) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE a IN (1,2,3)
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 13) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE a IN t_02809_set
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 13) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE a IN t_02809_aux
-) WHERE explain LIKE '%WHERE%';
-
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a IN (SELECT * FROM system.one)) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a IN (1,2,3)) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a IN t_02809_set) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a IN t_02809_aux) WHERE explain LIKE '%Prewhere filter';
 
 -- Queries with 'NOT IN'
-SELECT substring(explain, 1, 17) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE b NOT IN (SELECT * FROM system.one)
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 17) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE b NOT IN (1,2,3)
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 17) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE b NOT IN t_02809_set
-) WHERE explain LIKE '%WHERE%';
-
-SELECT substring(explain, 1, 17) FROM (EXPLAIN SYNTAX
-     SELECT * FROM t_02809 WHERE b NOT IN t_02809_aux
-) WHERE explain LIKE '%WHERE%';
-
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a NOT IN (SELECT * FROM system.one)) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a NOT IN (1,2,3)) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a NOT IN t_02809_set) WHERE explain LIKE '%Prewhere filter';
+SELECT * FROM (EXPLAIN actions=1 SELECT * FROM t_02809 WHERE a NOT IN t_02809_aux) WHERE explain LIKE '%Prewhere filter';
 
 DROP TABLE t_02809;
 DROP TABLE t_02809_set;
diff --git a/tests/queries/0_stateless/02810_async_insert_dedup_replicated_collapsing.sh b/tests/queries/0_stateless/02810_async_insert_dedup_replicated_collapsing.sh
index 804cd894ebc..57950af8975 100755
--- a/tests/queries/0_stateless/02810_async_insert_dedup_replicated_collapsing.sh
+++ b/tests/queries/0_stateless/02810_async_insert_dedup_replicated_collapsing.sh
@@ -7,7 +7,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 ${CLICKHOUSE_CLIENT} -q "DROP TABLE IF EXISTS 02810_async_insert_dedup_collapsing"
 ${CLICKHOUSE_CLIENT} -q "CREATE TABLE 02810_async_insert_dedup_collapsing (stringvalue String, sign Int8) ENGINE = ReplicatedCollapsingMergeTree('/clickhouse/{database}/02810_async_insert_dedup', 'r1', sign) ORDER BY stringvalue"
 
-url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1&async_insert_busy_timeout_ms=3000&async_insert_deduplicate=1"
+url="${CLICKHOUSE_URL}&async_insert=1&wait_for_async_insert=1&async_insert_busy_timeout_ms=3000&async_insert_use_adaptive_busy_timeout=0&async_insert_deduplicate=1"
 
 # insert value with same key and sign so it's collapsed on insert
 ${CLICKHOUSE_CURL} -sS "$url" -d "INSERT INTO 02810_async_insert_dedup_collapsing VALUES ('string1', 1)" &
@@ -36,4 +36,4 @@ wait
 ${CLICKHOUSE_CLIENT} -q "SELECT stringvalue FROM 02810_async_insert_dedup_collapsing ORDER BY stringvalue"
 ${CLICKHOUSE_CLIENT} -q "SELECT '------------'"
 
-${CLICKHOUSE_CLIENT} -q "DROP TABLE 02810_async_insert_dedup_collapsing"
\ No newline at end of file
+${CLICKHOUSE_CLIENT} -q "DROP TABLE 02810_async_insert_dedup_collapsing"
diff --git a/tests/queries/0_stateless/02810_system_sync_filesystem_cache.reference b/tests/queries/0_stateless/02810_system_sync_filesystem_cache.reference
deleted file mode 100644
index 7614df8ec46..00000000000
--- a/tests/queries/0_stateless/02810_system_sync_filesystem_cache.reference
+++ /dev/null
@@ -1,3 +0,0 @@
-ok
-ok
-ok
diff --git a/tests/queries/0_stateless/02810_system_sync_filesystem_cache.sh b/tests/queries/0_stateless/02810_system_sync_filesystem_cache.sh
deleted file mode 100755
index c88ba4d5a74..00000000000
--- a/tests/queries/0_stateless/02810_system_sync_filesystem_cache.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/usr/bin/env bash
-# Tags: no-fasttest, no-parallel, no-s3-storage, no-random-settings
-
-# set -x
-
-CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
-# shellcheck source=../shell_config.sh
-. "$CUR_DIR"/../shell_config.sh
-
-
-$CLICKHOUSE_CLIENT -nm --query """
-DROP TABLE IF EXISTS test;
-
-CREATE TABLE test (a Int32, b String)
-ENGINE = MergeTree() ORDER BY tuple()
-SETTINGS disk = disk(type = cache, max_size = '100Ki', path = ${CLICKHOUSE_TEST_UNIQUE_NAME}, delayed_cleanup_interval_ms = 10000000, disk = s3_disk), min_bytes_for_wide_part = 10485760;
-
-INSERT INTO test SELECT 1, 'test';
-"""
-
-query_id=$RANDOM
-
-$CLICKHOUSE_CLIENT --query_id "$query_id" --query "SELECT * FROM test FORMAT Null SETTINGS enable_filesystem_cache_log = 1"
-
-${CLICKHOUSE_CLIENT} -q "system flush logs"
-
-key=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT key FROM system.filesystem_cache_log WHERE query_id = '$query_id' ORDER BY size DESC LIMIT 1;
-""")
-
-offset=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT offset FROM system.filesystem_cache_log WHERE query_id = '$query_id' ORDER BY size DESC LIMIT 1;
-""")
-
-path=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT cache_path FROM system.filesystem_cache WHERE key = '$key' AND file_segment_range_begin = $offset;
-""")
-
-rm $path
-
-$CLICKHOUSE_CLIENT  --query "SELECT * FROM test FORMAT Null SETTINGS enable_filesystem_cache_log = 1" 2>&1 | grep -F -e "No such file or directory" > /dev/null && echo "ok" || echo "fail"
-
-CLICKHOUSE_CLIENT=$(echo ${CLICKHOUSE_CLIENT} | sed 's/'"--send_logs_level=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL}"'/--send_logs_level=fatal/g')
-
-$CLICKHOUSE_CLIENT --query "SYSTEM SYNC FILESYSTEM CACHE" 2>&1 | grep -q "$key" && echo 'ok' || echo 'fail'
-
-$CLICKHOUSE_CLIENT --query "SELECT * FROM test FORMAT Null"
-
-key=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT key FROM system.filesystem_cache_log WHERE query_id = '$query_id' ORDER BY size DESC LIMIT 1;
-""")
-
-offset=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT offset FROM system.filesystem_cache_log WHERE query_id = '$query_id' ORDER BY size DESC LIMIT 1;
-""")
-
-path=$($CLICKHOUSE_CLIENT -nm --query """
-SELECT cache_path FROM system.filesystem_cache WHERE key = '$key' AND file_segment_range_begin = $offset;
-""")
-
-echo -n 'fff' > $path
-
-#cat $path
-
-$CLICKHOUSE_CLIENT --query "SYSTEM SYNC FILESYSTEM CACHE" 2>&1 | grep -q "$key" && echo 'ok' || echo 'fail'
-
-$CLICKHOUSE_CLIENT --query "SELECT * FROM test FORMAT Null"
-
-$CLICKHOUSE_CLIENT --query "SYSTEM SYNC FILESYSTEM CACHE"
diff --git a/tests/queries/0_stateless/02813_create_index_noop.sql b/tests/queries/0_stateless/02813_create_index_noop.sql
index 3d65f81af9d..0f32dc6bdf3 100644
--- a/tests/queries/0_stateless/02813_create_index_noop.sql
+++ b/tests/queries/0_stateless/02813_create_index_noop.sql
@@ -997,4 +997,4 @@ CREATE INDEX idx_tab4_5 ON tab4 (col4,col0 DESC);
 CREATE INDEX idx_tab4_5 ON tab4 (col4,col1 DESC);
 CREATE INDEX idx_tab4_5 ON tab4 (col4,col1 DESC,col3);
 CREATE INDEX idx_tab4_5 ON tab4 (col4,col3 DESC,col1 DESC);
-CREATE INDEX idx_tab4_5 ON tab4 (col4,col3);
\ No newline at end of file
+CREATE INDEX idx_tab4_5 ON tab4 (col4,col3);
diff --git a/tests/queries/0_stateless/02813_seriesDecomposeSTL.reference b/tests/queries/0_stateless/02813_seriesDecomposeSTL.reference
index dc30e7f8371..28dae705335 100644
--- a/tests/queries/0_stateless/02813_seriesDecomposeSTL.reference
+++ b/tests/queries/0_stateless/02813_seriesDecomposeSTL.reference
@@ -1,4 +1,4 @@
-[[-13.529999,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.530001,-3.18,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1799994,16.71,-13.529999,-3.1799994,16.709997],[23.63,23.63,23.630003,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.630001,23.630001,23.630001,23.630003],[0,0.0000019073486,-0.0000019073486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.0000019073486,0,0]]
-[[4.04452e-8,-1.7846537e-8,-5.9488454e-9,0,0,0,0,0,0,-1.9868216e-8,-9.5297715e-8,2.2540547e-9,3.4229203e-8,8.573613e-8],[1.9999999,2,2,2,2,2,2,2,2,2,2,2,1.9999996,1.9999996],[1.1920929e-7,0,0,0,0,0,0,0,0,0,0,0,3.5762787e-7,2.3841858e-7]]
-[[-13.529999,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.530001,-3.18,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1799994,16.71,-13.529999,-3.1799994,16.709997],[23.63,23.63,23.630003,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.630001,23.630001,23.630001,23.630003],[0,0.0000019073486,-0.0000019073486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.0000019073486,0,0]]
-[[53.946846,-4.8119445,43.525013,-23.71359,-42.472305,-51.636955,-50.458298,-51.982674,37.62072,-15.9006605,56.65076,-5.809669,57.143845,-2.0370207,54.050922,-4.897961,43.954018,-23.808758,-42.651337,-51.86827,-50.709732,-52.18156,37.734905,-15.853402,56.91643,-5.8815174,57.253094,-2.012879,54.157806,-4.9817176,44.384747,-23.902956,-42.830154,-52.10025,-50.96271,-52.3829,37.84573,-15.81032,57.177113,-5.958963,57.356136,-1.9952412,54.27533,-5.066312,44.878296,-23.956438,-42.993656,-52.337124,-51.208073,-52.615646,37.91102,-15.8062525,57.49891,-6.056076,57.45604,-1.9797823,54.39525,-5.1483474,45.374573],[88.028534,88.95315,89.87776,90.802376,91.64913,92.49588,93.342636,94.19737,95.0521,95.90684,96.712975,97.51912,98.32526,98.36342,98.40158,98.43974,98.36777,98.29579,98.223816,98.536446,98.849075,99.161705,99.7552,100.348694,100.94219,101.53184,102.12149,102.711136,103.79921,104.88729,105.975365,107.50462,109.033875,110.56313,111.79767,113.032196,114.26673,115.02128,115.775826,116.53037,117.15541,117.78044,118.40548,118.86489,119.3243,119.783714,120.04031,120.29691,120.55351,120.78621,121.01891,121.25161,121.533585,121.81555,122.09753,122.41821,122.7389,123.059586,123.39267],[-2.97538,2.8587952,-23.402771,0.91121674,4.8231735,9.141075,8.115662,10.785301,0.32717896,5.99382,-12.363731,5.29055,0.53089905,-2.3264008,-3.4524994,1.4582214,-2.321785,2.51297,5.4275208,3.3318253,5.8606567,0.019859314,-4.4901123,-12.495293,-5.8586197,-1.650322,-11.374588,4.3017426,4.042984,1.094429,9.639885,3.3983307,-3.20372,-5.462883,-5.834961,-6.649292,-1.1124649,3.7890396,16.047066,-2.5714111,8.488449,-2.785202,2.319191,-0.79857635,13.797401,-5.827278,-6.0466614,-5.9597855,-7.3454437,-3.1705627,6.0700684,3.5546417,1.9675064,-0.7594757,2.446434,0.5615692,0.86585236,-3.9112396,1.2327576]]
+[[-13.529999,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.530001,-3.18,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1799994,16.71,-13.529999,-3.1799994,16.709997],[23.63,23.63,23.630003,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.630001,23.630001,23.630001,23.630003],[0,0.0000019073486,-0.0000019073486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.0000019073486,0,0],[10.1,20.449999,40.340004,10.100001,20.45,40.34,10.100001,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.100002,20.45,40.34]]
+[[4.04452e-8,-1.7846537e-8,-5.9488454e-9,0,0,0,0,0,0,-1.9868216e-8,-9.5297715e-8,2.2540547e-9,3.4229203e-8,8.573613e-8],[1.9999999,2,2,2,2,2,2,2,2,2,2,2,1.9999996,1.9999996],[1.1920929e-7,0,0,0,0,0,0,0,0,0,0,0,3.5762787e-7,2.3841858e-7],[1.9999999,2,2,2,2,2,2,2,2,2,1.9999999,2,1.9999996,1.9999998]]
+[[-13.529999,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.53,-3.1799996,16.71,-13.530001,-3.18,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1800003,16.710001,-13.530001,-3.1799994,16.71,-13.529999,-3.1799994,16.709997],[23.63,23.63,23.630003,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.63,23.630001,23.630001,23.630001,23.630001,23.630001,23.630003],[0,0.0000019073486,-0.0000019073486,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,-0.0000019073486,0,0],[10.1,20.449999,40.340004,10.100001,20.45,40.34,10.100001,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.1,20.45,40.34,10.100002,20.45,40.34]]
+[[53.946846,-4.8119445,43.525013,-23.71359,-42.472305,-51.636955,-50.458298,-51.982674,37.62072,-15.9006605,56.65076,-5.809669,57.143845,-2.0370207,54.050922,-4.897961,43.954018,-23.808758,-42.651337,-51.86827,-50.709732,-52.18156,37.734905,-15.853402,56.91643,-5.8815174,57.253094,-2.012879,54.157806,-4.9817176,44.384747,-23.902956,-42.830154,-52.10025,-50.96271,-52.3829,37.84573,-15.81032,57.177113,-5.958963,57.356136,-1.9952412,54.27533,-5.066312,44.878296,-23.956438,-42.993656,-52.337124,-51.208073,-52.615646,37.91102,-15.8062525,57.49891,-6.056076,57.45604,-1.9797823,54.39525,-5.1483474,45.374573],[88.028534,88.95315,89.87776,90.802376,91.64913,92.49588,93.342636,94.19737,95.0521,95.90684,96.712975,97.51912,98.32526,98.36342,98.40158,98.43974,98.36777,98.29579,98.223816,98.536446,98.849075,99.161705,99.7552,100.348694,100.94219,101.53184,102.12149,102.711136,103.79921,104.88729,105.975365,107.50462,109.033875,110.56313,111.79767,113.032196,114.26673,115.02128,115.775826,116.53037,117.15541,117.78044,118.40548,118.86489,119.3243,119.783714,120.04031,120.29691,120.55351,120.78621,121.01891,121.25161,121.533585,121.81555,122.09753,122.41821,122.7389,123.059586,123.39267],[-2.97538,2.8587952,-23.402771,0.91121674,4.8231735,9.141075,8.115662,10.785301,0.32717896,5.99382,-12.363731,5.29055,0.53089905,-2.3264008,-3.4524994,1.4582214,-2.321785,2.51297,5.4275208,3.3318253,5.8606567,0.019859314,-4.4901123,-12.495293,-5.8586197,-1.650322,-11.374588,4.3017426,4.042984,1.094429,9.639885,3.3983307,-3.20372,-5.462883,-5.834961,-6.649292,-1.1124649,3.7890396,16.047066,-2.5714111,8.488449,-2.785202,2.319191,-0.79857635,13.797401,-5.827278,-6.0466614,-5.9597855,-7.3454437,-3.1705627,6.0700684,3.5546417,1.9675064,-0.7594757,2.446434,0.5615692,0.86585236,-3.9112396,1.2327576],[141.97537,84.141205,133.40277,67.08878,49.176826,40.858925,42.88434,42.2147,132.67282,80.00618,153.36374,91.70945,155.4691,96.3264,152.4525,93.54178,142.32178,74.48703,55.57248,46.668175,48.139343,46.980145,137.49011,84.49529,157.85863,95.65032,159.37459,100.69826,157.95702,99.90557,150.3601,83.60167,66.20372,58.462883,60.834957,60.649296,152.11246,99.21096,172.95294,110.57141,174.51155,115.7852,172.68082,113.79858,164.2026,95.82728,77.04666,67.95979,69.34544,68.17056,158.92993,105.44536,179.0325,115.759476,179.55356,120.43843,177.13416,117.91124,168.76724]]
diff --git a/tests/queries/0_stateless/02813_seriesDecomposeSTL.sql b/tests/queries/0_stateless/02813_seriesDecomposeSTL.sql
index 929d0474e09..496267f2476 100644
--- a/tests/queries/0_stateless/02813_seriesDecomposeSTL.sql
+++ b/tests/queries/0_stateless/02813_seriesDecomposeSTL.sql
@@ -1,6 +1,3 @@
--- Tags: no-cpu-aarch64
--- Tag no-cpu-aarch64: values generated are slighly different on aarch64
-
 DROP TABLE IF EXISTS tb2;
 
 CREATE TABLE tb2 (`period` UInt32, `ts` Array(Float64)) ENGINE = Memory;
diff --git a/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.reference b/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.reference
new file mode 100644
index 00000000000..85c65ab10ba
--- /dev/null
+++ b/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.reference
@@ -0,0 +1,12 @@
+[-4.475000000000001,0,6.925000000000001,0,0,0,0,0,0,0,0,7.925000000000001,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,27.975,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,11.100000000000001,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,27.3,0,0,0,0,0,0]
+[-2.4999999999999996,0,5.1,0,0,0,0,0,2.0999999999999996,50.1,2.0999999999999996,0,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,27.3,0,0,0,0,0,0]
+[0,0,0,0,0,0,0,0,0,10.5,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,18,0,0,0,0,0,0]
diff --git a/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.sql b/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.sql
new file mode 100644
index 00000000000..0030929e6a3
--- /dev/null
+++ b/tests/queries/0_stateless/02813_seriesOutliersDetectTukey.sql
@@ -0,0 +1,32 @@
+-- Tags: no-cpu-aarch64
+-- Tag no-cpu-aarch64: values generated are slighly different on aarch64
+
+DROP TABLE IF EXISTS tb1;
+
+CREATE TABLE tb1 (n UInt32, a Array(Float64)) engine=Memory;
+INSERT INTO tb1 VALUES (1, [-3, 2.40, 15, 3.90, 5, 6, 4.50, 5.20, 3, 4, 5, 16, 7, 5, 5, 4]), (2, [-3, 2.40, 15, 3.90, 5, 6, 4.50, 5.20, 12, 45, 12, 3.40, 3, 4, 5, 6]);
+
+-- non-const inputs
+SELECT seriesOutliersDetectTukey(a) FROM tb1 ORDER BY n;
+SELECT seriesOutliersDetectTukey(a,.10,.90,1.5) FROM tb1 ORDER BY n;
+DROP TABLE IF EXISTS tb1;
+
+-- const inputs
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6]);
+SELECT seriesOutliersDetectTukey([-3, 2.40, 15, 3.90, 5, 6, 4.50, 5.20, 12, 60, 12, 3.40, 3, 4, 5, 6, 3.40, 2.7]);
+
+-- const inputs with optional arguments
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6], .25, .75, 1.5);
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6], .10, .90, 1.5);
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4.50, 5, 12, 45, 12, 3.40, 3, 4, 5, 6], .02, .98, 1.5);
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3], 0.02, 0.98, 1.5);
+SELECT seriesOutliersDetectTukey(arrayMap(x -> sin(x / 10), range(30)));
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4, 5, 12, 45, 12, 3, 3, 4, 5, 6], .25, .75, 3);
+
+-- negative tests
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3, 5, 6, 4, 5, 12, 45, 12, 3, 3, 4, 5, 6], .25, .75, -1); -- { serverError BAD_ARGUMENTS}
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3], .33, .53); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+SELECT seriesOutliersDetectTukey([-3, 2, 15, 3], .33); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+SELECT seriesOutliersDetectTukey([-3, 2.4, 15, NULL]); -- { serverError ILLEGAL_COLUMN}
+SELECT seriesOutliersDetectTukey([]); -- { serverError ILLEGAL_COLUMN}
+SELECT seriesOutliersDetectTukey([-3, 2.4, 15]); -- { serverError BAD_ARGUMENTS}
diff --git a/tests/queries/0_stateless/02814_age_datediff.reference b/tests/queries/0_stateless/02814_age_datediff.reference
index cbcb8c8a7b6..85dc205a499 100644
--- a/tests/queries/0_stateless/02814_age_datediff.reference
+++ b/tests/queries/0_stateless/02814_age_datediff.reference
@@ -1,10 +1,14 @@
 -- { echo }
 
 -- DateTime64 vs DateTime64 with fractional part
+SELECT age('nanosecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400005', 9, 'UTC'));
+5100200000
+SELECT age('nanosecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400004', 9, 'UTC'));
+5100199999
 SELECT age('microsecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400005', 9, 'UTC'));
 5100200
 SELECT age('microsecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400004', 9, 'UTC'));
-5100200
+5100199
 SELECT age('millisecond', toDateTime64('2015-08-18 20:30:36.450299', 6, 'UTC'), toDateTime64('2015-08-18 20:30:41.550299', 6, 'UTC'));
 5100
 SELECT age('millisecond', toDateTime64('2015-08-18 20:30:36.450299', 6, 'UTC'), toDateTime64('2015-08-18 20:30:41.550298', 6, 'UTC'));
diff --git a/tests/queries/0_stateless/02814_age_datediff.sql b/tests/queries/0_stateless/02814_age_datediff.sql
index 934a95c035f..64e329b2fc5 100644
--- a/tests/queries/0_stateless/02814_age_datediff.sql
+++ b/tests/queries/0_stateless/02814_age_datediff.sql
@@ -1,6 +1,9 @@
 -- { echo }
 
 -- DateTime64 vs DateTime64 with fractional part
+SELECT age('nanosecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400005', 9, 'UTC'));
+SELECT age('nanosecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400004', 9, 'UTC'));
+
 SELECT age('microsecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400005', 9, 'UTC'));
 SELECT age('microsecond', toDateTime64('2015-08-18 20:30:36.100200005', 9, 'UTC'), toDateTime64('2015-08-18 20:30:41.200400004', 9, 'UTC'));
 
diff --git a/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.reference b/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.reference
new file mode 100644
index 00000000000..84119736fe9
--- /dev/null
+++ b/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.reference
@@ -0,0 +1,526 @@
+set optimize_aggregators_of_group_by_keys = 1
+0	0
+0	1
+0	2
+1	0
+1	1
+1	2
+0	0
+0	1
+0	2
+1	0
+1	1
+1	2
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+2
+2
+3
+3
+4
+4
+4
+5
+6
+6
+6
+8
+8
+9
+10
+12
+12
+12
+15
+16
+18
+20
+24
+0
+0
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt8
+    b UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 9, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 5, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 10, nodes: 1
+          CONSTANT id: 11, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 12, nodes: 2
+      FUNCTION id: 13, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 14, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 15, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 16, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 17, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 19, nodes: 2
+      SORT id: 20, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: modulo, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 3, nodes: 2
+                COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+      SORT id: 21, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 7, function_name: modulo, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                CONSTANT id: 9, constant_value: UInt64_3, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt8
+    b UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 7, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 8, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 9, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 5, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 10, nodes: 1
+          CONSTANT id: 11, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 12, nodes: 2
+      FUNCTION id: 13, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 14, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 15, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 16, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 17, nodes: 2
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+            CONSTANT id: 18, constant_value: UInt64_3, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 19, nodes: 2
+      SORT id: 20, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: modulo, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 3, nodes: 2
+                COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+      SORT id: 21, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 7, function_name: modulo, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 8, nodes: 2
+                COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                CONSTANT id: 9, constant_value: UInt64_3, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt16
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: multiply, function_type: ordinary, result_type: UInt16
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 8, constant_value: UInt64_5, constant_value_type: UInt8
+            FUNCTION id: 9, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 10, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 11, constant_value: UInt64_7, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 12, nodes: 1
+          CONSTANT id: 13, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 14, nodes: 2
+      FUNCTION id: 15, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 16, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 17, constant_value: UInt64_7, constant_value_type: UInt8
+      FUNCTION id: 18, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 19, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 20, constant_value: UInt64_5, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 21, nodes: 1
+      SORT id: 22, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: multiply, function_type: ordinary, result_type: UInt16
+            ARGUMENTS
+              LIST id: 3, nodes: 2
+                FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 5, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 8, constant_value: UInt64_5, constant_value_type: UInt8
+                FUNCTION id: 9, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 10, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 11, constant_value: UInt64_7, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    foo UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: foo, result_type: UInt64, source_id: 3
+  JOIN TREE
+    QUERY id: 3, alias: __table1, is_subquery: 1
+      PROJECTION COLUMNS
+        foo UInt64
+      PROJECTION
+        LIST id: 4, nodes: 1
+          COLUMN id: 5, column_name: number, result_type: UInt64, source_id: 6
+      JOIN TREE
+        TABLE_FUNCTION id: 6, alias: __table2, table_function_name: numbers
+          ARGUMENTS
+            LIST id: 7, nodes: 1
+              CONSTANT id: 8, constant_value: UInt64_1, constant_value_type: UInt8
+      GROUP BY
+        LIST id: 9, nodes: 1
+          COLUMN id: 5, column_name: number, result_type: UInt64, source_id: 6
+QUERY id: 0
+  PROJECTION COLUMNS
+    min(number) OVER (PARTITION BY modulo(number, 2)) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: min, function_type: window, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+        WINDOW
+          WINDOW id: 6, frame_type: RANGE, frame_begin_type: unbounded preceding, frame_end_type: current
+            PARTITION BY
+              LIST id: 7, nodes: 1
+                FUNCTION id: 8, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 9, nodes: 2
+                      COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                      CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 5, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 11, nodes: 1
+          CONSTANT id: 12, constant_value: UInt64_3, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 13, nodes: 1
+      COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+set optimize_aggregators_of_group_by_keys = 0
+0	0
+0	1
+0	2
+1	0
+1	1
+1	2
+0	0
+0	1
+0	2
+1	0
+1	1
+1	2
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
+2
+2
+3
+3
+4
+4
+4
+5
+6
+6
+6
+8
+8
+9
+10
+12
+12
+12
+15
+16
+18
+20
+24
+0
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt8
+    b UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: min, function_type: aggregate, result_type: UInt8
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 9, function_name: max, function_type: aggregate, result_type: UInt8
+        ARGUMENTS
+          LIST id: 10, nodes: 1
+            FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 12, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 13, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 14, nodes: 1
+          CONSTANT id: 15, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 16, nodes: 2
+      FUNCTION id: 17, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 18, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 19, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 20, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 21, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 22, constant_value: UInt64_3, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 23, nodes: 2
+      SORT id: 24, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: min, function_type: aggregate, result_type: UInt8
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 5, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+      SORT id: 25, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 9, function_name: max, function_type: aggregate, result_type: UInt8
+            ARGUMENTS
+              LIST id: 10, nodes: 1
+                FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 12, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 13, constant_value: UInt64_3, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt8
+    b UInt8
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: any, function_type: aggregate, result_type: UInt8
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 9, function_name: anyLast, function_type: aggregate, result_type: UInt8
+        ARGUMENTS
+          LIST id: 10, nodes: 1
+            FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+              ARGUMENTS
+                LIST id: 12, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 13, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 14, nodes: 1
+          CONSTANT id: 15, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 16, nodes: 2
+      FUNCTION id: 17, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 18, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 19, constant_value: UInt64_2, constant_value_type: UInt8
+      FUNCTION id: 20, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 21, nodes: 2
+            COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            CONSTANT id: 22, constant_value: UInt64_3, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 23, nodes: 2
+      SORT id: 24, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: any, function_type: aggregate, result_type: UInt8
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 5, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+      SORT id: 25, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 9, function_name: anyLast, function_type: aggregate, result_type: UInt8
+            ARGUMENTS
+              LIST id: 10, nodes: 1
+                FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 12, nodes: 2
+                      COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                      CONSTANT id: 13, constant_value: UInt64_3, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    a UInt16
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: max, function_type: aggregate, result_type: UInt16
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt16
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: modulo, function_type: ordinary, result_type: UInt8
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                        CONSTANT id: 10, constant_value: UInt64_5, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+                    ARGUMENTS
+                      LIST id: 12, nodes: 2
+                        COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                        CONSTANT id: 13, constant_value: UInt64_7, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 9, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 14, nodes: 1
+          CONSTANT id: 15, constant_value: UInt64_10000000, constant_value_type: UInt32
+  GROUP BY
+    LIST id: 16, nodes: 2
+      FUNCTION id: 17, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 18, nodes: 2
+            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+            CONSTANT id: 19, constant_value: UInt64_7, constant_value_type: UInt8
+      FUNCTION id: 20, function_name: modulo, function_type: ordinary, result_type: UInt8
+        ARGUMENTS
+          LIST id: 21, nodes: 2
+            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+            CONSTANT id: 22, constant_value: UInt64_5, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 23, nodes: 1
+      SORT id: 24, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: max, function_type: aggregate, result_type: UInt16
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 5, nodes: 2
+                      FUNCTION id: 6, function_name: modulo, function_type: ordinary, result_type: UInt8
+                        ARGUMENTS
+                          LIST id: 7, nodes: 2
+                            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                            CONSTANT id: 10, constant_value: UInt64_5, constant_value_type: UInt8
+                      FUNCTION id: 11, function_name: modulo, function_type: ordinary, result_type: UInt8
+                        ARGUMENTS
+                          LIST id: 12, nodes: 2
+                            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                            CONSTANT id: 13, constant_value: UInt64_7, constant_value_type: UInt8
+QUERY id: 0
+  PROJECTION COLUMNS
+    foo UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      COLUMN id: 2, column_name: foo, result_type: UInt64, source_id: 3
+  JOIN TREE
+    QUERY id: 3, alias: __table1, is_subquery: 1
+      PROJECTION COLUMNS
+        foo UInt64
+      PROJECTION
+        LIST id: 4, nodes: 1
+          FUNCTION id: 5, function_name: anyLast, function_type: aggregate, result_type: UInt64
+            ARGUMENTS
+              LIST id: 6, nodes: 1
+                COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
+      JOIN TREE
+        TABLE_FUNCTION id: 8, alias: __table2, table_function_name: numbers
+          ARGUMENTS
+            LIST id: 9, nodes: 1
+              CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+      GROUP BY
+        LIST id: 11, nodes: 1
+          COLUMN id: 7, column_name: number, result_type: UInt64, source_id: 8
+QUERY id: 0
+  PROJECTION COLUMNS
+    min(number) OVER (PARTITION BY modulo(number, 2)) UInt64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: min, function_type: window, result_type: UInt64
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+        WINDOW
+          WINDOW id: 6, frame_type: RANGE, frame_begin_type: unbounded preceding, frame_end_type: current
+            PARTITION BY
+              LIST id: 7, nodes: 1
+                FUNCTION id: 8, function_name: modulo, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 9, nodes: 2
+                      COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
+                      CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 5, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 11, nodes: 1
+          CONSTANT id: 12, constant_value: UInt64_3, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 13, nodes: 1
+      COLUMN id: 4, column_name: number, result_type: UInt64, source_id: 5
diff --git a/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.sql b/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.sql
new file mode 100644
index 00000000000..ca03cbb6f9f
--- /dev/null
+++ b/tests/queries/0_stateless/02815_analyzer_aggregate_functions_of_group_by_keys.sql
@@ -0,0 +1,39 @@
+set allow_experimental_analyzer = 1;
+set optimize_move_functions_out_of_any = 0;
+
+SELECT 'set optimize_aggregators_of_group_by_keys = 1';
+set optimize_aggregators_of_group_by_keys = 1;
+
+SELECT min(number % 2) AS a, max(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+SELECT any(number % 2) AS a, anyLast(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+SELECT max((number % 5) * (number % 7)) AS a FROM numbers(10000000) GROUP BY number % 7, number % 5 ORDER BY a;
+SELECT foo FROM (SELECT anyLast(number) AS foo FROM numbers(1) GROUP BY number);
+SELECT anyLast(number) FROM numbers(1) GROUP BY number;
+
+EXPLAIN QUERY TREE SELECT min(number % 2) AS a, max(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+EXPLAIN QUERY TREE SELECT any(number % 2) AS a, anyLast(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+EXPLAIN QUERY TREE SELECT max((number % 5) * (number % 7)) AS a FROM numbers(10000000) GROUP BY number % 7, number % 5 ORDER BY a;
+EXPLAIN QUERY TREE SELECT foo FROM (SELECT anyLast(number) AS foo FROM numbers(1) GROUP BY number);
+
+EXPLAIN QUERY TREE
+SELECT min(number) OVER (PARTITION BY number % 2)
+FROM numbers(3)
+GROUP BY number;
+
+SELECT 'set optimize_aggregators_of_group_by_keys = 0';
+set optimize_aggregators_of_group_by_keys = 0;
+
+SELECT min(number % 2) AS a, max(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+SELECT any(number % 2) AS a, anyLast(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+SELECT max((number % 5) * (number % 7)) AS a FROM numbers(10000000) GROUP BY number % 7, number % 5 ORDER BY a;
+SELECT foo FROM (SELECT anyLast(number) AS foo FROM numbers(1) GROUP BY number);
+
+EXPLAIN QUERY TREE SELECT min(number % 2) AS a, max(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+EXPLAIN QUERY TREE SELECT any(number % 2) AS a, anyLast(number % 3) AS b FROM numbers(10000000) GROUP BY number % 2, number % 3 ORDER BY a, b;
+EXPLAIN QUERY TREE SELECT max((number % 5) * (number % 7)) AS a FROM numbers(10000000) GROUP BY number % 7, number % 5 ORDER BY a;
+EXPLAIN QUERY TREE SELECT foo FROM (SELECT anyLast(number) AS foo FROM numbers(1) GROUP BY number);
+
+EXPLAIN QUERY TREE
+SELECT min(number) OVER (PARTITION BY number % 2)
+FROM numbers(3)
+GROUP BY number;
diff --git a/tests/queries/0_stateless/02818_memory_profiler_sample_min_max_allocation_size.sh b/tests/queries/0_stateless/02818_memory_profiler_sample_min_max_allocation_size.sh
index b1fbea26da7..9234c428147 100755
--- a/tests/queries/0_stateless/02818_memory_profiler_sample_min_max_allocation_size.sh
+++ b/tests/queries/0_stateless/02818_memory_profiler_sample_min_max_allocation_size.sh
@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-cpu-aarch64, no-random-settings
-# requires TraceCollector, does not available under sanitizers and aarch64
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-random-settings
 
 CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
diff --git a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
index 546c54a4de9..a3b0d17f1be 100755
--- a/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
+++ b/tests/queries/0_stateless/02832_alter_max_sessions_for_user.sh
@@ -23,14 +23,14 @@ function test_alter_profile()
 
     ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${max_session_count}"
 
-    # Create sesssions with $max_session_count resriction
+    # Create sessions with $max_session_count restriction
     for ((i = 1 ; i <= ${max_session_count} ; i++)); do
         local session_id="${SESSION_ID_PREFIX}_${i}"
          # Skip output from this query 
          ${CLICKHOUSE_CURL} -sS -X POST "${CLICKHOUSE_URL}&user=${USER}&session_id=${session_id}&session_check=0" --data-binary "SELECT 1" > /dev/null
     done
 
-    # Update resriction to $alter_sessions_count
+    # Update restriction to $alter_sessions_count
     ${CLICKHOUSE_CLIENT} -q $"ALTER SETTINGS PROFILE ${PROFILE} SETTINGS max_sessions_for_user = ${alter_sessions_count}"
 
     # Simultaneous sessions should use max settings from profile ($alter_sessions_count)
diff --git a/tests/queries/0_stateless/02833_url_without_path_encoding.sh b/tests/queries/0_stateless/02833_url_without_path_encoding.sh
index b71586099cf..eb845c6b45b 100755
--- a/tests/queries/0_stateless/02833_url_without_path_encoding.sh
+++ b/tests/queries/0_stateless/02833_url_without_path_encoding.sh
@@ -8,5 +8,5 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 $CLICKHOUSE_CLIENT -q "select count() from url('http://localhost:11111/test%2Fa.tsv') settings enable_url_encoding=1"
 
 # Grep 'test%2Fa.tsv' to ensure that path wasn't encoded/decoded
-$CLICKHOUSE_CLIENT -q "select count() from url('http://localhost:11111/test%2Fa.tsv') settings enable_url_encoding=0" 2>&1 | grep -o "test%2Fa.tsv" -m1
-
+$CLICKHOUSE_CLIENT -q "select count() from url('http://localhost:11111/test%2Fa.tsv') settings enable_url_encoding=0" 2>&1 | \
+ grep -o "test%2Fa.tsv" -m1 | head -n 1
diff --git a/tests/queries/0_stateless/02841_group_array_sorted.reference b/tests/queries/0_stateless/02841_group_array_sorted.reference
new file mode 100644
index 00000000000..1043f949590
--- /dev/null
+++ b/tests/queries/0_stateless/02841_group_array_sorted.reference
@@ -0,0 +1,12 @@
+[0,1,2,3,4]
+[0,1,2,3,4]
+[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,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99]
+['0','1','10','11','12','13','14','15','16','17','18','19','2','20','21','22','23','24','25','26','27','28','29','3','4','5','6','7','8','9']
+[0,0,1,1,2,2,3,3,4,4]
+[[1,2,3,4],[2,3,4,5],[3,4,5,6]]
+[(2,1),(15,25),(30,60),(100,200)]
+[0.2,2.2,6.6,12.5]
+['AAA','Aaa','aaa','abc','bbc']
+1000000
+1000000
+[0,1]
diff --git a/tests/queries/0_stateless/02841_group_array_sorted.sql b/tests/queries/0_stateless/02841_group_array_sorted.sql
new file mode 100644
index 00000000000..a8cd6791ff3
--- /dev/null
+++ b/tests/queries/0_stateless/02841_group_array_sorted.sql
@@ -0,0 +1,41 @@
+SELECT groupArraySorted(5)(number) FROM numbers(100);
+
+SELECT groupArraySorted(10)(number) FROM numbers(5);
+
+SELECT groupArraySorted(100)(number) FROM numbers(1000);
+
+SELECT groupArraySorted(30)(str) FROM (SELECT toString(number) as str FROM numbers(30));
+
+SELECT groupArraySorted(10)(toInt64(number/2)) FROM numbers(100);
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Array(UInt64)) engine=MergeTree ORDER BY a;
+INSERT INTO test VALUES ([3,4,5,6]), ([1,2,3,4]), ([2,3,4,5]);
+SELECT groupArraySorted(3)(a) FROM test;
+DROP TABLE test;
+
+CREATE TABLE IF NOT EXISTS test (id Int32, data Tuple(Int32, Int32)) ENGINE = MergeTree() ORDER BY id;
+INSERT INTO test (id, data) VALUES (1, (100, 200)), (2, (15, 25)), (3, (2, 1)), (4, (30, 60));
+SELECT groupArraySorted(4)(data) FROM test;
+DROP TABLE test;
+
+CREATE TABLE IF NOT EXISTS test (id Int32, data Decimal32(2)) ENGINE = MergeTree() ORDER BY id;
+INSERT INTO test (id, data) VALUES (1, 12.5), (2, 0.2), (3, 6.6), (4, 2.2);
+SELECT groupArraySorted(4)(data) FROM test;
+DROP TABLE test;
+
+CREATE TABLE IF NOT EXISTS test (id Int32, data FixedString(3)) ENGINE = MergeTree() ORDER BY id;
+INSERT INTO test (id, data) VALUES (1, 'AAA'), (2, 'bbc'), (3, 'abc'), (4, 'aaa'), (5, 'Aaa');
+SELECT groupArraySorted(5)(data) FROM test;
+DROP TABLE test;
+
+CREATE TABLE test (id Decimal(76, 53), str String) ENGINE = MergeTree ORDER BY id;
+INSERT INTO test SELECT number, 'test' FROM numbers(1000000);
+SELECT count(id) FROM test;
+SELECT count(concat(toString(id), 'a')) FROM test;
+DROP TABLE test;
+
+CREATE TABLE test (id UInt64, agg AggregateFunction(groupArraySorted(2), UInt64)) engine=MergeTree ORDER BY id;
+INSERT INTO test SELECT 1, groupArraySortedState(2)(number) FROM numbers(10);
+SELECT groupArraySortedMerge(2)(agg) FROM test;
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02841_not_ready_set_bug.sh b/tests/queries/0_stateless/02841_not_ready_set_bug.sh
index fd7f62d28bf..9b2f3b0698e 100755
--- a/tests/queries/0_stateless/02841_not_ready_set_bug.sh
+++ b/tests/queries/0_stateless/02841_not_ready_set_bug.sh
@@ -9,3 +9,5 @@ $CLICKHOUSE_CLIENT -q "create table t1 (number UInt64) engine = MergeTree order
 $CLICKHOUSE_CLIENT -q "insert into t1 select number from numbers(10);"
 $CLICKHOUSE_CLIENT --max_threads=2 --max_result_rows=1 --result_overflow_mode=break -q "with tab as (select min(number) from t1 prewhere number in (select number from view(select number, row_number() OVER (partition by number % 2 ORDER BY number DESC) from numbers_mt(1e4)) where number != 2 order by number)) select number from t1 union all select * from tab;" > /dev/null
 
+$CLICKHOUSE_CLIENT -q "SELECT * FROM system.tables WHERE 1 in (SELECT number from numbers(2)) AND database = currentDatabase() format Null"
+$CLICKHOUSE_CLIENT -q "SELECT xor(1, 0) FROM system.parts WHERE 1 IN (SELECT 1) FORMAT Null"
diff --git a/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.reference b/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.reference
index 1818ca7b5f2..2cfba492361 100644
--- a/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.reference
+++ b/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.reference
@@ -1,3 +1,4 @@
+wait_end_of_query=0
 One block
 Parallel formatting: 0
 JSON
@@ -430,3 +431,350 @@ Test 2
 Test 3
 1
 1
+wait_end_of_query=1
+One block
+Parallel formatting: 0
+JSON
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONEachRow
+{"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "}
+JSONCompact
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONCompactEachRow
+["Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "]
+JSONObjectEachRow
+{
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+XML
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>number</name>
+				<type>UInt64</type>
+			</column>
+			<column>
+				<name>res</name>
+				<type>UInt8</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+	</data>
+	<rows>0</rows>
+	<exception>Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) </exception>
+</result>
+Parallel formatting: 1
+JSON
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONEachRow
+{"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "}
+JSONCompact
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONCompactEachRow
+["Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "]
+JSONObjectEachRow
+{
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+XML
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>number</name>
+				<type>UInt64</type>
+			</column>
+			<column>
+				<name>res</name>
+				<type>UInt8</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+	</data>
+	<rows>0</rows>
+	<exception>Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) </exception>
+</result>
+Several blocks
+Without parallel formatting
+JSON
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONEachRow
+{"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "}
+JSONCompact
+{
+	"meta":
+	[
+		{
+			"name": "number",
+			"type": "UInt64"
+		},
+		{
+			"name": "res",
+			"type": "UInt8"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+JSONCompactEachRow
+["Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "]
+JSONObjectEachRow
+{
+	"exception": "Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) "
+}
+XML
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>number</name>
+				<type>UInt64</type>
+			</column>
+			<column>
+				<name>res</name>
+				<type>UInt8</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+	</data>
+	<rows>0</rows>
+	<exception>Code: 395. : Value passed to 'throwIf' function is non-zero: while executing 'FUNCTION throwIf(greater(number, 3) :: 2) -> throwIf(greater(number, 3)) UInt8 : 1'. (FUNCTION_THROW_IF_VALUE_IS_NON_ZERO) </exception>
+</result>
+With parallel formatting
+JSON
+1
+JSONCompact
+1
+JSONObjectEachRow
+1
+JSONEachRow
+1
+JSONCompactEachRow
+1
+Formatting error
+Without parallel formatting
+JSON
+{
+	"meta":
+	[
+		{
+			"name": "x",
+			"type": "UInt32"
+		},
+		{
+			"name": "s",
+			"type": "String"
+		},
+		{
+			"name": "y",
+			"type": "Enum8('a' = 1)"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 36. : Unexpected value 99 in enum: While executing JSONRowOutputFormat. (BAD_ARGUMENTS) "
+}
+JSONEachRow
+{"exception": "Code: 36. : Unexpected value 99 in enum: While executing JSONEachRowRowOutputFormat. (BAD_ARGUMENTS) "}
+JSONCompact
+{
+	"meta":
+	[
+		{
+			"name": "x",
+			"type": "UInt32"
+		},
+		{
+			"name": "s",
+			"type": "String"
+		},
+		{
+			"name": "y",
+			"type": "Enum8('a' = 1)"
+		}
+	],
+
+	"data":
+	[
+
+	],
+
+	"rows": 0,
+
+	"exception": "Code: 36. : Unexpected value 99 in enum: While executing JSONCompactRowOutputFormat. (BAD_ARGUMENTS) "
+}
+JSONCompactEachRow
+["Code: 36. : Unexpected value 99 in enum: While executing JSONCompactEachRowRowOutputFormat. (BAD_ARGUMENTS) "]
+JSONObjectEachRow
+{
+	"exception": "Code: 36. : Unexpected value 99 in enum: While executing JSONObjectEachRowRowOutputFormat. (BAD_ARGUMENTS) "
+}
+XML
+<?xml version='1.0' encoding='UTF-8' ?>
+<result>
+	<meta>
+		<columns>
+			<column>
+				<name>x</name>
+				<type>UInt32</type>
+			</column>
+			<column>
+				<name>s</name>
+				<type>String</type>
+			</column>
+			<column>
+				<name>y</name>
+				<type>Enum8('a' = 1)</type>
+			</column>
+		</columns>
+	</meta>
+	<data>
+	</data>
+	<rows>0</rows>
+	<exception>Code: 36. : Unexpected value 99 in enum: While executing XMLRowOutputFormat. (BAD_ARGUMENTS) </exception>
+</result>
+With parallel formatting
+JSON
+1
+JSONCompact
+1
+JSONObjectEachRow
+1
+JSONEachRow
+1
+JSONCompactEachRow
+1
+Test 1
+1
+1
+Test 2
+1
+1
+Test 3
+1
+1
diff --git a/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.sh b/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.sh
index 26b3ef64d61..c47fe5c7e94 100755
--- a/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.sh
+++ b/tests/queries/0_stateless/02841_valid_json_and_xml_on_http_exception.sh
@@ -4,7 +4,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-CH_URL="$CLICKHOUSE_URL&http_write_exception_in_output_format=1&allow_experimental_analyzer=0"
+CH_URL_BASE="$CLICKHOUSE_URL&http_write_exception_in_output_format=1&allow_experimental_analyzer=0"
+
+for wait_end_of_query in 0 1
+do
+echo "wait_end_of_query=$wait_end_of_query"
+CH_URL="$CH_URL_BASE&wait_end_of_query=$wait_end_of_query"
 
 echo "One block"
 for parallel in 0 1
@@ -106,3 +111,4 @@ ${CLICKHOUSE_CURL} -sS "$CH_URL" -d "select * from test_02841 format JSON settin
 
 $CLICKHOUSE_CLIENT -q "drop table test_02841"
 
+done
diff --git a/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.reference b/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.reference
index 6e04d969e67..b91a4dd2f68 100644
--- a/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.reference
+++ b/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.reference
@@ -1,20 +1,15 @@
-SELECT count()
-FROM t_02848_mt1
-PREWHERE notEmpty(v) AND (k = 3)
+          Prewhere filter
+          Prewhere filter column: and(notEmpty(v), equals(k, 3)) (removed)
 1
-SELECT count()
-FROM t_02848_mt2
-PREWHERE (d LIKE \'%es%\') AND (c < 20) AND (b = \'3\') AND (a = 3)
+          Prewhere filter
+          Prewhere filter column: and(like(d, \'%es%\'), less(c, 20), equals(b, \'3\'), equals(a, 3)) (removed)
 1
-SELECT count()
-FROM t_02848_mt2
-PREWHERE (d LIKE \'%es%\') AND (c < 20) AND (c > 0) AND (a = 3)
+          Prewhere filter
+          Prewhere filter column: and(like(d, \'%es%\'), less(c, 20), greater(c, 0), equals(a, 3)) (removed)
 1
-SELECT count()
-FROM t_02848_mt2
-PREWHERE (d LIKE \'%es%\') AND (b = \'3\') AND (c < 20)
+          Prewhere filter
+          Prewhere filter column: and(like(d, \'%es%\'), equals(b, \'3\'), less(c, 20)) (removed)
 1
-SELECT count()
-FROM t_02848_mt2
-PREWHERE (d LIKE \'%es%\') AND (b = \'3\') AND (a = 3)
+          Prewhere filter
+          Prewhere filter column: and(like(d, \'%es%\'), equals(b, \'3\'), equals(a, 3)) (removed)
 1
diff --git a/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.sql b/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.sql
index bc9d7e5664e..f863d765798 100644
--- a/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.sql
+++ b/tests/queries/0_stateless/02842_move_pk_to_end_of_prewhere.sql
@@ -8,7 +8,7 @@ CREATE TABLE t_02848_mt1 (k UInt32, v String) ENGINE = MergeTree ORDER BY k SETT
 
 INSERT INTO t_02848_mt1 SELECT number, toString(number) FROM numbers(100);
 
-EXPLAIN SYNTAX SELECT count() FROM t_02848_mt1 WHERE k = 3 AND notEmpty(v);
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02848_mt1 WHERE k = 3 AND notEmpty(v)) WHERE explain LIKE '%Prewhere filter%' OR explain LIKE '%Filter%';
 SELECT count() FROM t_02848_mt1 WHERE k = 3 AND notEmpty(v);
 
 CREATE TABLE t_02848_mt2 (a UInt32, b String, c Int32, d String) ENGINE = MergeTree ORDER BY (a,b,c) SETTINGS min_bytes_for_wide_part=0;
@@ -18,16 +18,16 @@ INSERT INTO t_02848_mt2 SELECT number, toString(number), number, 'aaaabbbbccccdd
 -- the estimated column sizes are: {a: 428, b: 318, c: 428, d: 73}
 -- it's not correct but let's fix it in the future.
 
-EXPLAIN SYNTAX SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND c < 20 AND d like '%es%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_String', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND c < 20 AND d like '%es%') WHERE explain LIKE '%Prewhere filter%' OR explain LIKE '%Filter%';
 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND c < 20 AND d like '%es%';
 
-EXPLAIN SYNTAX SELECT count() FROM t_02848_mt2 WHERE a = 3 AND c < 20 AND c > 0 AND d like '%es%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_String', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND c < 20 AND c > 0 AND d like '%es%') WHERE explain LIKE '%Prewhere filter%' OR explain LIKE '%Filter%';
 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND c < 20 AND c > 0 AND d like '%es%';
 
-EXPLAIN SYNTAX SELECT count() FROM t_02848_mt2 WHERE  b == '3' AND c < 20 AND d like '%es%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_String', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02848_mt2 WHERE b == '3' AND c < 20 AND d like '%es%') WHERE explain LIKE '%Prewhere filter%' OR explain LIKE '%Filter%';
 SELECT count() FROM t_02848_mt2 WHERE b == '3' AND c < 20 AND d like '%es%';
 
-EXPLAIN SYNTAX SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND d like '%es%';
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8|_String', '') FROM (EXPLAIN actions=1 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND d like '%es%') WHERE explain LIKE '%Prewhere filter%' OR explain LIKE '%Filter%';
 SELECT count() FROM t_02848_mt2 WHERE a = 3 AND b == '3' AND d like '%es%';
 
 DROP TABLE t_02848_mt1;
diff --git a/tests/queries/0_stateless/02860_distributed_flush_on_detach.reference b/tests/queries/0_stateless/02860_distributed_flush_on_detach.reference
index 8e5815188e7..2bb78f92948 100644
--- a/tests/queries/0_stateless/02860_distributed_flush_on_detach.reference
+++ b/tests/queries/0_stateless/02860_distributed_flush_on_detach.reference
@@ -1,7 +1,7 @@
 -- { echoOn }
 
 create table data (key Int) engine=Memory();
-create table dist (key Int) engine=Distributed(default, currentDatabase(), data);
+create table dist (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data);
 system stop distributed sends dist;
 -- check that FLUSH DISTRIBUTED does flushing anyway
 insert into dist values (1);
@@ -19,7 +19,7 @@ attach table dist;
 truncate table data;
 -- check flush_on_detach=0
 drop table dist;
-create table dist (key Int) engine=Distributed(default, currentDatabase(), data) settings flush_on_detach=0;
+create table dist (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data) settings flush_on_detach=0;
 system stop distributed sends dist;
 insert into dist values (1);
 detach table dist;
diff --git a/tests/queries/0_stateless/02860_distributed_flush_on_detach.sql b/tests/queries/0_stateless/02860_distributed_flush_on_detach.sql
index 5ba45d72c08..10442650478 100644
--- a/tests/queries/0_stateless/02860_distributed_flush_on_detach.sql
+++ b/tests/queries/0_stateless/02860_distributed_flush_on_detach.sql
@@ -6,7 +6,7 @@ drop table if exists dist;
 -- { echoOn }
 
 create table data (key Int) engine=Memory();
-create table dist (key Int) engine=Distributed(default, currentDatabase(), data);
+create table dist (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data);
 system stop distributed sends dist;
 
 -- check that FLUSH DISTRIBUTED does flushing anyway
@@ -25,7 +25,7 @@ truncate table data;
 
 -- check flush_on_detach=0
 drop table dist;
-create table dist (key Int) engine=Distributed(default, currentDatabase(), data) settings flush_on_detach=0;
+create table dist (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data) settings flush_on_detach=0;
 system stop distributed sends dist;
 insert into dist values (1);
 detach table dist;
diff --git a/tests/queries/0_stateless/02862_sorted_distinct_sparse_fix.sql b/tests/queries/0_stateless/02862_sorted_distinct_sparse_fix.sql
index 2bcdb3d43ff..d303a53fc39 100644
--- a/tests/queries/0_stateless/02862_sorted_distinct_sparse_fix.sql
+++ b/tests/queries/0_stateless/02862_sorted_distinct_sparse_fix.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS t_sparse_distinct;
 
 CREATE TABLE t_sparse_distinct (id UInt32, v String)
diff --git a/tests/queries/0_stateless/02864_restore_table_with_broken_part.reference b/tests/queries/0_stateless/02864_restore_table_with_broken_part.reference
index 9a8dcda81df..9247a7d6ab6 100644
--- a/tests/queries/0_stateless/02864_restore_table_with_broken_part.reference
+++ b/tests/queries/0_stateless/02864_restore_table_with_broken_part.reference
@@ -1,4 +1,4 @@
-data.bin doesn't exist: while restoring part all_2_2_0
+OK
 RESTORED
 1
 3
diff --git a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
index cf99c7e9284..d3252b29eb7 100755
--- a/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
+++ b/tests/queries/0_stateless/02864_restore_table_with_broken_part.sh
@@ -26,7 +26,7 @@ ln -s "$SRC_BACKUP_DIR/$SRC_BACKUP_FILENAME" "$BACKUPS_DIR/$BACKUP_FILENAME"
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
 # First try to restore with the setting `restore_broken_parts_as_detached` set to false.
-$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM $BACKUP_NAME" 2>&1 | grep -o -m 1 "data.bin doesn't exist: while restoring part all_2_2_0"
+$CLICKHOUSE_CLIENT --query "RESTORE TABLE default.tbl AS tbl FROM $BACKUP_NAME" 2>&1 | tr -d \\n | grep "data.bin doesn't exist" | grep "while restoring part all_2_2_0" > /dev/null && echo "OK" || echo "FAILED"
 
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS tbl"
 
diff --git a/tests/queries/0_stateless/02864_statistic_operate.reference b/tests/queries/0_stateless/02864_statistic_operate.reference
index 7fad7c810c1..3e291485031 100644
--- a/tests/queries/0_stateless/02864_statistic_operate.reference
+++ b/tests/queries/0_stateless/02864_statistic_operate.reference
@@ -1,31 +1,31 @@
 CREATE TABLE default.t1\n(\n    `a` Float64 STATISTIC(tdigest),\n    `b` Int64 STATISTIC(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 After insert
-SELECT count()
-FROM t1
-PREWHERE (a < 10) AND (b < 10)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
 10
 0
 After drop statistic
-SELECT count()
-FROM t1
-PREWHERE (b < 10) AND (a < 10)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(b, 10), less(a, 10)) (removed)
 10
 CREATE TABLE default.t1\n(\n    `a` Float64,\n    `b` Int64,\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 After add statistic
 CREATE TABLE default.t1\n(\n    `a` Float64 STATISTIC(tdigest),\n    `b` Int64 STATISTIC(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 After materialize statistic
-SELECT count()
-FROM t1
-PREWHERE (a < 10) AND (b < 10)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
 20
 After merge
-SELECT count()
-FROM t1
-PREWHERE (a < 10) AND (b < 10)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(b, 10)) (removed)
 20
 CREATE TABLE default.t1\n(\n    `a` Float64 STATISTIC(tdigest),\n    `c` Int64 STATISTIC(tdigest),\n    `pk` String\n)\nENGINE = MergeTree\nORDER BY pk\nSETTINGS min_bytes_for_wide_part = 0, index_granularity = 8192
 After rename
-SELECT count()
-FROM t1
-PREWHERE (a < 10) AND (c < 10)
+        Prewhere info
+          Prewhere filter
+          Prewhere filter column: and(less(a, 10), less(c, 10)) (removed)
 20
diff --git a/tests/queries/0_stateless/02864_statistic_operate.sql b/tests/queries/0_stateless/02864_statistic_operate.sql
index 29bd213f04a..5f1c30f8eec 100644
--- a/tests/queries/0_stateless/02864_statistic_operate.sql
+++ b/tests/queries/0_stateless/02864_statistic_operate.sql
@@ -3,7 +3,7 @@ DROP TABLE IF EXISTS t1;
 SET allow_experimental_statistic = 1;
 SET allow_statistic_optimize = 1;
 
-CREATE TABLE t1 
+CREATE TABLE t1
 (
     a Float64 STATISTIC(tdigest),
     b Int64 STATISTIC(tdigest),
@@ -16,14 +16,14 @@ SHOW CREATE TABLE t1;
 INSERT INTO t1 select number, -number, generateUUIDv4() FROM system.numbers LIMIT 10000;
 
 SELECT 'After insert';
-EXPLAIN SYNTAX SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
 SELECT count(*) FROM t1 WHERE b < NULL and a < '10';
 
 ALTER TABLE t1 DROP STATISTIC a, b TYPE tdigest;
 
 SELECT 'After drop statistic';
-EXPLAIN SYNTAX SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
 
 SHOW CREATE TABLE t1;
@@ -38,20 +38,20 @@ ALTER TABLE t1 MATERIALIZE STATISTIC a, b TYPE tdigest;
 INSERT INTO t1 select number, -number, generateUUIDv4() FROM system.numbers LIMIT 10000;
 
 SELECT 'After materialize statistic';
-EXPLAIN SYNTAX SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
 
 OPTIMIZE TABLE t1 FINAL;
 
 SELECT 'After merge';
-EXPLAIN SYNTAX SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE b < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count(*) FROM t1 WHERE b < 10 and a < 10;
 
 ALTER TABLE t1 RENAME COLUMN b TO c;
 SHOW CREATE TABLE t1;
 
 SELECT 'After rename';
-EXPLAIN SYNTAX SELECT count(*) FROM t1 WHERE c < 10 and a < 10;
+SELECT replaceRegexpAll(explain, '__table1\.|_UInt8', '') FROM (EXPLAIN actions=1 SELECT count(*) FROM t1 WHERE c < 10 and a < 10) WHERE explain LIKE '%Prewhere%' OR explain LIKE '%Filter column%';
 SELECT count(*) FROM t1 WHERE c < 10 and a < 10;
 
 DROP TABLE IF EXISTS t1;
diff --git a/tests/queries/0_stateless/02867_create_user_ssh.sql b/tests/queries/0_stateless/02867_create_user_ssh.sql
index 08236bdbcfe..3e3cb30a601 100644
--- a/tests/queries/0_stateless/02867_create_user_ssh.sql
+++ b/tests/queries/0_stateless/02867_create_user_ssh.sql
@@ -1,10 +1,16 @@
 -- Tags: no-fasttest, no-parallel
 
+-- Tests user authentication with SSH public keys
+
 DROP USER IF EXISTS test_user_02867;
 
-CREATE USER test_user_02867 IDENTIFIED WITH ssh_key BY KEY 'clickhouse' TYPE 'ssh-rsa'; -- { serverError LIBSSH_ERROR }
-CREATE USER test_user_02867 IDENTIFIED WITH ssh_key BY KEY 'clickhouse' TYPE 'clickhouse'; -- { serverError LIBSSH_ERROR }
-CREATE USER test_user_02867 IDENTIFIED WITH ssh_key BY KEY 'key1' TYPE 'ssh-rsa', KEY 'key2' TYPE 'ssh-rsa'; -- { serverError LIBSSH_ERROR }
+-- negative tests
+CREATE USER test_user_02867 IDENTIFIED WITH ssh_key BY KEY 'invalid_key' TYPE 'ssh-rsa'; -- { serverError LIBSSH_ERROR }
+CREATE USER test_user_02867 IDENTIFIED WITH ssh_key BY KEY 'invalid_key' TYPE 'ssh-rsa', KEY 'invalid_key' TYPE 'ssh-rsa'; -- { serverError LIBSSH_ERROR }
+CREATE USER test_user_02867 IDENTIFIED WITH ssh_key
+BY KEY 'AAAAB3NzaC1yc2EAAAADAQABAAABgQCVTUso7/LQcBljfsHwyuL6fWfIvS3BaVpYB8lwf/ZylSOltBy6YlABtTU3mIb197d2DW99RcLKk174f5Zj5rUukXbV0fnufWvwd37fbb1eKM8zxBYvXs53EI5QBPZgKACIzMpYYZeJnAP0oZhUfWWtKXpy/SQ5CHiEIGD9RNYDL+uXZejMwC5r/+f2AmrATBo+Y+WJFZIvhj4uznFYvyvNTUz/YDvZCk+vwwIgiv4BpFCaZm2TeETTj6SvK567bZznLP5HXrkVbB5lhxjAkahc2w/Yjm//Fwto3xsMoJwROxJEU8L1kZ40QWPqjo7Tmr6C/hL2cKDNgWOEqrjLKQmh576s1+PfxwXpVPjLK4PHVSvuJLV88sn0iPdspLlKlDCdc7T9MqIrjJfxuhqnaoFQ7U+oBte8vkm1wGu76+WEC3iNWVAiIVZxLx9rUEsDqj3OovqfLiRsTmNLeY94p2asZjkx7rU48ZwuYN5XGafYsArPscj9Ve6RoRrof+5Q7cc='
+TYPE 'invalid_algorithm'; -- { serverError LIBSSH_ERROR }
+
 CREATE USER test_user_02867 IDENTIFIED WITH ssh_key
 BY KEY 'AAAAB3NzaC1yc2EAAAADAQABAAABgQCVTUso7/LQcBljfsHwyuL6fWfIvS3BaVpYB8lwf/ZylSOltBy6YlABtTU3mIb197d2DW99RcLKk174f5Zj5rUukXbV0fnufWvwd37fbb1eKM8zxBYvXs53EI5QBPZgKACIzMpYYZeJnAP0oZhUfWWtKXpy/SQ5CHiEIGD9RNYDL+uXZejMwC5r/+f2AmrATBo+Y+WJFZIvhj4uznFYvyvNTUz/YDvZCk+vwwIgiv4BpFCaZm2TeETTj6SvK567bZznLP5HXrkVbB5lhxjAkahc2w/Yjm//Fwto3xsMoJwROxJEU8L1kZ40QWPqjo7Tmr6C/hL2cKDNgWOEqrjLKQmh576s1+PfxwXpVPjLK4PHVSvuJLV88sn0iPdspLlKlDCdc7T9MqIrjJfxuhqnaoFQ7U+oBte8vkm1wGu76+WEC3iNWVAiIVZxLx9rUEsDqj3OovqfLiRsTmNLeY94p2asZjkx7rU48ZwuYN5XGafYsArPscj9Ve6RoRrof+5Q7cc='
 TYPE 'ssh-rsa';
diff --git a/tests/queries/0_stateless/02867_page_cache.reference b/tests/queries/0_stateless/02867_page_cache.reference
new file mode 100644
index 00000000000..c3d6484a175
--- /dev/null
+++ b/tests/queries/0_stateless/02867_page_cache.reference
@@ -0,0 +1,21 @@
+cold read	54975576145920
+PageCacheBytesUnpinnedRoundedToHugePages	1
+PageCacheBytesUnpinnedRoundedToPages	1
+PageCacheChunkMisses	1
+ReadBufferFromS3Bytes	1
+repeat read 1	54975576145920
+PageCacheBytesUnpinnedRoundedToHugePages	1
+PageCacheBytesUnpinnedRoundedToPages	1
+PageCacheChunkDataHits	1
+dropped and bypassed cache	54975576145920
+PageCacheChunkMisses	1
+ReadBufferFromS3Bytes	1
+repeat read 2	54975576145920
+PageCacheBytesUnpinnedRoundedToHugePages	1
+PageCacheBytesUnpinnedRoundedToPages	1
+PageCacheChunkMisses	1
+ReadBufferFromS3Bytes	1
+repeat read 3	54975576145920
+PageCacheBytesUnpinnedRoundedToHugePages	1
+PageCacheBytesUnpinnedRoundedToPages	1
+PageCacheChunkDataHits	1
diff --git a/tests/queries/0_stateless/02867_page_cache.sql b/tests/queries/0_stateless/02867_page_cache.sql
new file mode 100644
index 00000000000..f1882de4af6
--- /dev/null
+++ b/tests/queries/0_stateless/02867_page_cache.sql
@@ -0,0 +1,106 @@
+-- Tags: no-fasttest, no-parallel
+-- no-fasttest because we need an S3 storage policy
+-- no-parallel because we look at server-wide counters about page cache usage
+
+set use_page_cache_for_disks_without_file_cache = 1;
+set page_cache_inject_eviction = 0;
+set enable_filesystem_cache = 0;
+set use_uncompressed_cache = 0;
+
+create table events_snapshot engine Memory as select * from system.events;
+create view events_diff as
+    -- round all stats to 70 MiB to leave a lot of leeway for overhead
+    with if(event like '%Bytes%', 70*1024*1024, 35) as granularity,
+    -- cache hits counter can vary a lot depending on other settings:
+    -- e.g. if merge_tree_min_bytes_for_concurrent_read is small, multiple threads will read each chunk
+    -- so we just check that the value is not too low
+         if(event in (
+            'PageCacheBytesUnpinnedRoundedToPages', 'PageCacheBytesUnpinnedRoundedToHugePages',
+            'PageCacheChunkDataHits'), 1, 1000) as clamp
+    select event, min2(intDiv(new.value - old.value, granularity), clamp) as diff
+    from system.events new
+    left outer join events_snapshot old
+    on old.event = new.event
+    where diff != 0 and
+          event in (
+            'ReadBufferFromS3Bytes', 'PageCacheChunkMisses', 'PageCacheChunkDataMisses',
+            'PageCacheChunkDataHits', 'PageCacheChunkDataPartialHits',
+            'PageCacheBytesUnpinnedRoundedToPages', 'PageCacheBytesUnpinnedRoundedToHugePages')
+    order by event;
+
+drop table if exists page_cache_03055;
+create table page_cache_03055 (k Int64 CODEC(NONE)) engine MergeTree order by k settings storage_policy = 's3_cache';
+
+-- Write an 80 MiB file (40 x 2 MiB chunks), and a few small files.
+system stop merges page_cache_03055;
+insert into page_cache_03055 select * from numbers(10485760) settings max_block_size=100000000, preferred_block_size_bytes=1000000000;
+
+select * from events_diff;
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+system start merges page_cache_03055;
+optimize table page_cache_03055 final;
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+-- Cold read, should miss cache. (Populating cache on write is not implemented yet.)
+
+select 'cold read', sum(k) from page_cache_03055;
+
+select * from events_diff where event not in ('PageCacheChunkDataHits');
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+-- Repeat read, should hit cache.
+
+select 'repeat read 1', sum(k) from page_cache_03055;
+
+select * from events_diff;
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+-- Drop cache and read again, should miss. Also don't write to cache.
+
+system drop page cache;
+
+select 'dropped and bypassed cache', sum(k) from page_cache_03055 settings read_from_page_cache_if_exists_otherwise_bypass_cache = 1;
+
+-- Data could be read multiple times because we're not writing to cache.
+-- (Not checking PageCacheBytesUnpinned* because it's unreliable in this case because of an intentional race condition, see PageCache::evictChunk.)
+select event, if(event in ('PageCacheChunkMisses', 'ReadBufferFromS3Bytes'), diff >= 1, diff) from events_diff where event not in ('PageCacheChunkDataHits', 'PageCacheBytesUnpinnedRoundedToPages', 'PageCacheBytesUnpinnedRoundedToHugePages');
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+-- Repeat read, should still miss, but populate cache.
+
+select 'repeat read 2', sum(k) from page_cache_03055;
+
+select * from events_diff where event not in ('PageCacheChunkDataHits');
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+-- Read again, hit the cache.
+
+select 'repeat read 3', sum(k) from page_cache_03055 settings read_from_page_cache_if_exists_otherwise_bypass_cache = 1;
+
+select * from events_diff;
+truncate table events_snapshot;
+insert into events_snapshot select * from system.events;
+
+
+-- Known limitation: cache is not invalidated if a table is dropped and created again at the same path.
+-- set allow_deprecated_database_ordinary=1;
+-- create database test_03055 engine = Ordinary;
+-- create table test_03055.t (k Int64) engine MergeTree order by k settings storage_policy = 's3_cache';
+-- insert into test_03055.t values (1);
+-- select * from test_03055.t;
+-- drop table test_03055.t;
+-- create table test_03055.t (k Int64) engine MergeTree order by k settings storage_policy = 's3_cache';
+-- insert into test_03055.t values (2);
+-- select * from test_03055.t;
+
+
+drop table events_snapshot;
+drop table page_cache_03055;
+drop view events_diff;
diff --git a/tests/queries/0_stateless/02868_select_support_from_keywords.reference b/tests/queries/0_stateless/02868_select_support_from_keywords.reference
index d2dcb047cf0..6782e51e0e9 100644
--- a/tests/queries/0_stateless/02868_select_support_from_keywords.reference
+++ b/tests/queries/0_stateless/02868_select_support_from_keywords.reference
@@ -1 +1 @@
-CREATE VIEW default.test_view\n(\n    `date` Date,\n    `__sign` Int8,\n    `from` Float64,\n    `to` Float64\n) AS\nWITH cte AS\n    (\n        SELECT\n            date,\n            __sign,\n            from,\n            to\n        FROM default.test_table\n        FINAL\n    )\nSELECT\n    date,\n    __sign,\n    from,\n    to\nFROM cte
+CREATE VIEW default.test_view\n(\n    `date` Date,\n    `__sign` Int8,\n    `from` Float64,\n    `to` Float64\n)\nAS WITH cte AS\n    (\n        SELECT\n            date,\n            __sign,\n            from,\n            to\n        FROM default.test_table\n        FINAL\n    )\nSELECT\n    date,\n    __sign,\n    from,\n    to\nFROM cte
diff --git a/tests/queries/0_stateless/02870_per_column_settings.reference b/tests/queries/0_stateless/02870_per_column_settings.reference
new file mode 100644
index 00000000000..c2ae34928bd
--- /dev/null
+++ b/tests/queries/0_stateless/02870_per_column_settings.reference
@@ -0,0 +1,22 @@
+CREATE TABLE default.tab\n(\n    `id` UInt64,\n    `long_string` String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840),\n    `v1` String,\n    `v2` UInt64,\n    `v3` Float32,\n    `v4` Float64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/tab/2870\', \'r1\')\nORDER BY id\nSETTINGS min_bytes_for_wide_part = 1, index_granularity = 8192
+1000
+ALTER TABLE tab\n    MODIFY COLUMN `long_string` MODIFY SETTING min_compress_block_size = 8192
+CREATE TABLE default.tab\n(\n    `id` UInt64,\n    `long_string` String SETTINGS (min_compress_block_size = 8192, max_compress_block_size = 163840),\n    `v1` String,\n    `v2` UInt64,\n    `v3` Float32,\n    `v4` Float64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/tab/2870\', \'r1\')\nORDER BY id\nSETTINGS min_bytes_for_wide_part = 1, index_granularity = 8192
+ALTER TABLE tab\n    MODIFY COLUMN `long_string` RESET SETTING min_compress_block_size
+CREATE TABLE default.tab\n(\n    `id` UInt64,\n    `long_string` String SETTINGS (max_compress_block_size = 163840),\n    `v1` String,\n    `v2` UInt64,\n    `v3` Float32,\n    `v4` Float64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/tab/2870\', \'r1\')\nORDER BY id\nSETTINGS min_bytes_for_wide_part = 1, index_granularity = 8192
+ALTER TABLE tab\n    MODIFY COLUMN `long_string` REMOVE SETTINGS
+CREATE TABLE default.tab\n(\n    `id` UInt64,\n    `long_string` String,\n    `v1` String,\n    `v2` UInt64,\n    `v3` Float32,\n    `v4` Float64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/tab/2870\', \'r1\')\nORDER BY id\nSETTINGS min_bytes_for_wide_part = 1, index_granularity = 8192
+ALTER TABLE tab\n    MODIFY COLUMN `long_string` String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840)
+CREATE TABLE default.tab\n(\n    `id` UInt64,\n    `long_string` String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840),\n    `v1` String,\n    `v2` UInt64,\n    `v3` Float32,\n    `v4` Float64\n)\nENGINE = ReplicatedMergeTree(\'/clickhouse/tables/default/tab/2870\', \'r1\')\nORDER BY id\nSETTINGS min_bytes_for_wide_part = 1, index_granularity = 8192
+---
+(0,0)	0
+(1,1)	1
+(2,2)	2
+(3,3)	3
+(4,4)	4
+(5,5)	5
+(6,6)	6
+(7,7)	7
+(8,8)	8
+(9,9)	9
+---
diff --git a/tests/queries/0_stateless/02870_per_column_settings.sql b/tests/queries/0_stateless/02870_per_column_settings.sql
new file mode 100644
index 00000000000..d242ebe6c61
--- /dev/null
+++ b/tests/queries/0_stateless/02870_per_column_settings.sql
@@ -0,0 +1,73 @@
+-- Tags: no-random-merge-tree-settings, no-replicated-database
+-- Tag no-replicated-database: Old syntax is not allowed
+-- The test use replicated table to test serialize and deserialize column with settings declaration on zookeeper
+-- Tests column-level settings for MergeTree* tables
+
+DROP TABLE IF EXISTS tab;
+
+CREATE TABLE tab
+(
+    id UInt64,
+    long_string String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840),
+    v1 String,
+    v2 UInt64,
+    v3 Float32,
+    v4 Float64
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/tab/2870', 'r1')
+ORDER BY id
+SETTINGS min_bytes_for_wide_part = 1;
+
+SHOW CREATE tab;
+
+INSERT INTO TABLE tab SELECT number, randomPrintableASCII(1000), randomPrintableASCII(10), rand(number), rand(number+1), rand(number+2) FROM numbers(1000);
+SELECT count() FROM tab;
+
+SELECT formatQuery('ALTER TABLE tab MODIFY COLUMN long_string MODIFY SETTING min_compress_block_size = 8192;');
+ALTER TABLE tab MODIFY COLUMN long_string MODIFY SETTING min_compress_block_size = 8192;
+SHOW CREATE tab;
+
+SELECT formatQuery('ALTER TABLE tab MODIFY COLUMN long_string RESET SETTING min_compress_block_size;');
+ALTER TABLE tab MODIFY COLUMN long_string RESET SETTING min_compress_block_size;
+SHOW CREATE tab;
+
+SELECT formatQuery('ALTER TABLE tab MODIFY COLUMN long_string REMOVE SETTINGS;');
+ALTER TABLE tab MODIFY COLUMN long_string REMOVE SETTINGS;
+SHOW CREATE tab;
+
+SELECT formatQuery('ALTER TABLE tab MODIFY COLUMN long_string String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840);');
+ALTER TABLE tab MODIFY COLUMN long_string String SETTINGS (min_compress_block_size = 163840, max_compress_block_size = 163840);
+SHOW CREATE tab;
+
+DROP TABLE tab;
+
+SELECT '---';
+
+SET allow_experimental_object_type = 1;
+
+CREATE TABLE tab
+(
+    id UInt64,
+    tup Tuple(UInt64, UInt64) SETTINGS (min_compress_block_size = 81920, max_compress_block_size = 163840),
+    json JSON SETTINGS (min_compress_block_size = 81920, max_compress_block_size = 163840),
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS min_bytes_for_wide_part = 1;
+
+INSERT INTO TABLE tab SELECT number, tuple(number, number), concat('{"key": ', toString(number), ' ,"value": ', toString(rand(number+1)), '}') FROM numbers(1000);
+SELECT tup, json.key AS key FROM tab ORDER BY key LIMIT 10;
+
+DROP TABLE tab;
+
+SELECT '---';
+
+-- Unsupported column-level settings are rejected
+CREATE TABLE tab
+(
+    id UInt64,
+    long_string String SETTINGS (min_block_size = 81920, max_compress_block_size = 163840),
+)
+ENGINE = MergeTree
+ORDER BY id
+SETTINGS min_bytes_for_wide_part = 1; -- {serverError UNKNOWN_SETTING}
diff --git a/tests/queries/0_stateless/02880_indexHint__partition_id.reference b/tests/queries/0_stateless/02880_indexHint__partition_id.reference
index 365e7b676c7..2cdd2cc1954 100644
--- a/tests/queries/0_stateless/02880_indexHint__partition_id.reference
+++ b/tests/queries/0_stateless/02880_indexHint__partition_id.reference
@@ -1,9 +1,10 @@
 -- { echoOn }
 select * from data prewhere indexHint(_partition_id = '1');
 1
-select count() from data prewhere indexHint(_partition_id = '1');
+-- TODO: optimize_use_implicit_projections ignores indexHint (with analyzer) because source columns might be aliased.
+select count() from data prewhere indexHint(_partition_id = '1') settings optimize_use_implicit_projections = 0;
 1
 select * from data where indexHint(_partition_id = '1');
 1
-select count() from data where indexHint(_partition_id = '1');
+select count() from data where indexHint(_partition_id = '1') settings optimize_use_implicit_projections = 0;
 1
diff --git a/tests/queries/0_stateless/02880_indexHint__partition_id.sql b/tests/queries/0_stateless/02880_indexHint__partition_id.sql
index d15b3f4ccea..9d5dc7bcbc2 100644
--- a/tests/queries/0_stateless/02880_indexHint__partition_id.sql
+++ b/tests/queries/0_stateless/02880_indexHint__partition_id.sql
@@ -4,6 +4,7 @@ insert into data values (1)(2);
 
 -- { echoOn }
 select * from data prewhere indexHint(_partition_id = '1');
-select count() from data prewhere indexHint(_partition_id = '1');
+-- TODO: optimize_use_implicit_projections ignores indexHint (with analyzer) because source columns might be aliased.
+select count() from data prewhere indexHint(_partition_id = '1') settings optimize_use_implicit_projections = 0;
 select * from data where indexHint(_partition_id = '1');
-select count() from data where indexHint(_partition_id = '1');
+select count() from data where indexHint(_partition_id = '1') settings optimize_use_implicit_projections = 0;
diff --git a/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.reference b/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.reference
index f34aad737d4..8999deae9f6 100644
--- a/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.reference
+++ b/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.reference
@@ -1,88 +1,96 @@
-CreatingSets (Create sets before main query execution)
-  Expression ((Projection + Before ORDER BY))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 1-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Projection + Before ORDER BY))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 1-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Projection + Before ORDER BY))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 5-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Projection + Before ORDER BY))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 5-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Project names + Projection))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 1-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Project names + Projection))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 1-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Project names + Projection))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 5-element set))
-        Parts: 1/1
-        Granules: 1/1
-CreatingSets (Create sets before main query execution)
-  Expression ((Project names + Projection))
-    ReadFromMergeTree (default.test_table)
-    Indexes:
-      PrimaryKey
-        Keys: 
-          id
-          value
-        Condition: and((id in (-Inf, 10]), (value in 5-element set))
-        Parts: 1/1
-        Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 1-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 1-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 5-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 5-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 1-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 1-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 5-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
+CreatingSets
+  Expression
+    Expression
+      ReadFromMergeTree
+      Indexes:
+        PrimaryKey
+          Keys: 
+            id
+            value
+          Condition: and((value in 5-element set), (id in (-Inf, 10]))
+          Parts: 1/1
+          Granules: 1/1
diff --git a/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.sql b/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.sql
index 077c49fb22e..1b1a7607344 100644
--- a/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.sql
+++ b/tests/queries/0_stateless/02882_primary_key_index_in_function_different_types.sql
@@ -7,18 +7,18 @@ CREATE TABLE test_table
 
 INSERT INTO test_table SELECT number, number FROM numbers(10);
 
-SET allow_experimental_analyzer = 0;
+set allow_experimental_analyzer = 0;
 
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT 5);
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT '5');
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toUInt8(number) FROM numbers(5));
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toString(number) FROM numbers(5));
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT 5);
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT '5');
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toUInt8(number) FROM numbers(5));
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toString(number) FROM numbers(5));
 
-SET allow_experimental_analyzer = 1;
+set allow_experimental_analyzer = 1;
 
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT 5);
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT '5');
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toUInt8(number) FROM numbers(5));
-EXPLAIN indexes = 1 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toString(number) FROM numbers(5));
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT 5);
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT '5');
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toUInt8(number) FROM numbers(5));
+EXPLAIN indexes = 1, description=0 SELECT id FROM test_table WHERE id <= 10 AND value IN (SELECT toString(number) FROM numbers(5));
 
 DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02884_async_insert_native_protocol_1.sh b/tests/queries/0_stateless/02884_async_insert_native_protocol_1.sh
index 82e2bb709f9..7f583087336 100755
--- a/tests/queries/0_stateless/02884_async_insert_native_protocol_1.sh
+++ b/tests/queries/0_stateless/02884_async_insert_native_protocol_1.sh
@@ -12,7 +12,7 @@ $CLICKHOUSE_CLIENT -n -q "
     CREATE TABLE t_async_insert_native_1 (id UInt64, s String) ENGINE = MergeTree ORDER BY id;
 "
 
-async_insert_options="--async_insert 1 --wait_for_async_insert 0 --async_insert_busy_timeout_ms 1000000"
+async_insert_options="--async_insert 1 --wait_for_async_insert 0 --async_insert_busy_timeout_min_ms 1000000 --async_insert_busy_timeout_max_ms 10000000"
 
 echo '{"id": 1, "s": "aaa"} {"id": 2, "s": "bbb"}' | $CLICKHOUSE_CLIENT $async_insert_options -q 'INSERT INTO t_async_insert_native_1 FORMAT JSONEachRow'
 $CLICKHOUSE_CLIENT $async_insert_options  -q 'INSERT INTO t_async_insert_native_1 FORMAT JSONEachRow {"id": 3, "s": "ccc"}'
diff --git a/tests/queries/0_stateless/02884_async_insert_native_protocol_3.sh b/tests/queries/0_stateless/02884_async_insert_native_protocol_3.sh
index abe6be9e2bc..c9d399607d0 100755
--- a/tests/queries/0_stateless/02884_async_insert_native_protocol_3.sh
+++ b/tests/queries/0_stateless/02884_async_insert_native_protocol_3.sh
@@ -12,7 +12,7 @@ $CLICKHOUSE_CLIENT -n -q "
     CREATE TABLE t_async_insert_native_3 (id UInt64, s String) ENGINE = MergeTree ORDER BY id;
 "
 
-async_insert_options="--async_insert 1 --wait_for_async_insert 0 --async_insert_busy_timeout_ms 1000000"
+async_insert_options="--async_insert 1 --wait_for_async_insert 0 --async_insert_busy_timeout_min_ms 1000000 --async_insert_busy_timeout_max_ms 10000000"
 
 echo '{"id": 1, "s": "aaa"} {"id": 2, "s": "bbb"}' | $CLICKHOUSE_CLIENT $async_insert_options -q 'INSERT INTO t_async_insert_native_3 FORMAT JSONEachRow'
 echo "(3, 'ccc') (4, 'ddd') (5, 'eee')" | $CLICKHOUSE_CLIENT $async_insert_options -q 'INSERT INTO t_async_insert_native_3 FORMAT Values'
diff --git a/tests/queries/0_stateless/02884_async_insert_skip_settings.sql b/tests/queries/0_stateless/02884_async_insert_skip_settings.sql
index facd39d1079..9bc689fb4ec 100644
--- a/tests/queries/0_stateless/02884_async_insert_skip_settings.sql
+++ b/tests/queries/0_stateless/02884_async_insert_skip_settings.sql
@@ -9,7 +9,8 @@ ORDER BY id;
 SET async_insert = 1;
 SET async_insert_deduplicate = 1;
 SET wait_for_async_insert = 0;
-SET async_insert_busy_timeout_ms = 100000;
+SET async_insert_busy_timeout_min_ms = 100000;
+SET async_insert_busy_timeout_max_ms = 1000000;
 
 SET insert_deduplication_token = '1';
 SET log_comment = 'async_insert_skip_settings_1';
diff --git a/tests/queries/0_stateless/02884_authentication_quota.reference b/tests/queries/0_stateless/02884_authentication_quota.reference
new file mode 100644
index 00000000000..638034bab82
--- /dev/null
+++ b/tests/queries/0_stateless/02884_authentication_quota.reference
@@ -0,0 +1,54 @@
+> Drop the user, quota, and role if those were created.
+> Create the user with quota with the maximum single authentication attempt.
+> Check if the quota has been created.
+1
+> Try to login to the user account with correct password
+> Login to the user account using the wrong password.
+password is incorrect
+> Quota is exceeded 1 >= 1. Login with correct password should fail.
+QUOTA_EXCEEDED
+> Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+2	1
+> Alter the quota with MAX FAILED SEQUENTIAL AUTHENTICATIONS = 4
+> Try to login to the user account with correct password
+> Successfull login should reset failed authentications counter. Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+0	4
+> Login to the user account using the wrong password before exeeding the quota.
+password is incorrect
+password is incorrect
+password is incorrect
+password is incorrect
+QUOTA_EXCEEDED
+> Also try to login with correct password. Quota should stay exceeded.
+QUOTA_EXCEEDED
+> Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+6	4
+> Reset the quota by increasing MAX FAILED SEQUENTIAL AUTHENTICATIONS and succesfull login
+> and check failed_sequential_authentications, max_failed_sequential_authentications.
+0	7
+ ---------------------------------------------------------------------------
+> Create the role with quota with the maximum single authentication attempt.
+> Try to login to the user account with correct password
+> Login to the user account using the wrong password.
+password is incorrect
+> Quota is exceeded 1 >= 1. Login with correct password should fail.
+QUOTA_EXCEEDED
+> Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+2	1
+> Alter the quota with MAX FAILED SEQUENTIAL AUTHENTICATIONS = 4
+> Try to login to the user account with correct password
+> Successfull login should reset failed authentications counter. Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+0	4
+> Login to the user account using the wrong password before exeeding the quota.
+password is incorrect
+password is incorrect
+password is incorrect
+password is incorrect
+QUOTA_EXCEEDED
+> Also try to login with correct password. Quota should stay exceeded.
+QUOTA_EXCEEDED
+> Check the failed_sequential_authentications, max_failed_sequential_authentications fields.
+6	4
+> Reset the quota by increasing MAX FAILED SEQUENTIAL AUTHENTICATIONS and succesfull login
+> and check failed_sequential_authentications, max_failed_sequential_authentications.
+0	7
diff --git a/tests/queries/0_stateless/02884_authentication_quota.sh b/tests/queries/0_stateless/02884_authentication_quota.sh
new file mode 100755
index 00000000000..f013bb4d639
--- /dev/null
+++ b/tests/queries/0_stateless/02884_authentication_quota.sh
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+QUOTA="2884_quota_$$"
+USER="2884_user_$$"
+ROLE="2884_role_$$"
+
+
+function login_test()
+{
+    echo "> Try to login to the user account with correct password"
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "pass" --query "select 1 format Null"
+
+    echo "> Login to the user account using the wrong password."
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'password is incorrect'
+
+    echo "> Quota is exceeded 1 >= 1. Login with correct password should fail."
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'QUOTA_EXCEEDED'
+
+    echo "> Check the failed_sequential_authentications, max_failed_sequential_authentications fields."
+    ${CLICKHOUSE_CLIENT} -q "SELECT failed_sequential_authentications, max_failed_sequential_authentications FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+
+    echo "> Alter the quota with MAX FAILED SEQUENTIAL AUTHENTICATIONS = 4"
+    ${CLICKHOUSE_CLIENT} -q "ALTER QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX FAILED SEQUENTIAL AUTHENTICATIONS = 4 TO ${USER}"
+    
+    echo "> Try to login to the user account with correct password"
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "pass" --query "select 1 format Null"
+    
+    echo "> Successfull login should reset failed authentications counter. Check the failed_sequential_authentications, max_failed_sequential_authentications fields."
+    ${CLICKHOUSE_CLIENT} -q "SELECT failed_sequential_authentications, max_failed_sequential_authentications FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+
+    echo "> Login to the user account using the wrong password before exeeding the quota."
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'password is incorrect'
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'password is incorrect'
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'password is incorrect'
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'password is incorrect'
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "wrong_pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'QUOTA_EXCEEDED'
+    
+    echo "> Also try to login with correct password. Quota should stay exceeded."
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "pass" --query "select 1 format Null" 2>&1 | grep -m1 -o 'QUOTA_EXCEEDED'
+
+    echo "> Check the failed_sequential_authentications, max_failed_sequential_authentications fields."
+    ${CLICKHOUSE_CLIENT} -q "SELECT failed_sequential_authentications, max_failed_sequential_authentications FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+
+    echo "> Reset the quota by increasing MAX FAILED SEQUENTIAL AUTHENTICATIONS and succesfull login"
+    echo "> and check failed_sequential_authentications, max_failed_sequential_authentications."
+    ${CLICKHOUSE_CLIENT} -q "ALTER QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX FAILED SEQUENTIAL AUTHENTICATIONS = 7 TO ${USER}"
+    ${CLICKHOUSE_CLIENT} --user ${USER} --password "pass" --query "select 1 format Null"
+    ${CLICKHOUSE_CLIENT} -q "SELECT failed_sequential_authentications, max_failed_sequential_authentications FROM system.quotas_usage WHERE quota_name = '${QUOTA}'"
+}
+
+echo "> Drop the user, quota, and role if those were created."
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS ${USER}"
+${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS ${QUOTA}"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS ${ROLE}"
+
+echo "> Create the user with quota with the maximum single authentication attempt."
+${CLICKHOUSE_CLIENT} -q "CREATE USER ${USER} IDENTIFIED WITH plaintext_password BY 'pass'"
+${CLICKHOUSE_CLIENT} -q "CREATE QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX FAILED SEQUENTIAL AUTHENTICATIONS = 1 TO ${USER}"
+
+echo "> Check if the quota has been created."
+${CLICKHOUSE_CLIENT} -q "SELECT COUNT(*) FROM system.quotas WHERE name = '${QUOTA}'"
+
+login_test
+
+echo " ---------------------------------------------------------------------------"
+echo "> Create the role with quota with the maximum single authentication attempt."
+${CLICKHOUSE_CLIENT} -q "CREATE ROLE ${ROLE}"
+${CLICKHOUSE_CLIENT} -q "GRANT ALL ON *.* TO ${ROLE}"
+${CLICKHOUSE_CLIENT} -q "GRANT ${ROLE} to ${USER}"
+${CLICKHOUSE_CLIENT} -q "ALTER QUOTA ${QUOTA} FOR INTERVAL 100 YEAR MAX FAILED SEQUENTIAL AUTHENTICATIONS = 1 TO ${ROLE}"
+
+login_test
+
+${CLICKHOUSE_CLIENT} -q "DROP USER IF EXISTS ${USER}"
+${CLICKHOUSE_CLIENT} -q "DROP QUOTA IF EXISTS ${QUOTA}"
+${CLICKHOUSE_CLIENT} -q "DROP ROLE IF EXISTS ${ROLE}"
diff --git a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.reference b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.reference
new file mode 100644
index 00000000000..6d9d1f07ec2
--- /dev/null
+++ b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.reference
@@ -0,0 +1,34 @@
+===== StorageView =====
+OK
+OK
+OK
+2
+2
+OK
+OK
+2
+2
+OK
+2
+2
+OK
+1
+===== MaterializedView =====
+OK
+1
+0
+0
+OK
+OK
+OK
+2
+OK
+OK
+===== TestGrants =====
+OK
+OK
+===== TestRowPolicy =====
+1	1
+2	2
+6	6
+9	9
diff --git a/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
new file mode 100755
index 00000000000..bead7db8450
--- /dev/null
+++ b/tests/queries/0_stateless/02884_create_view_with_sql_security_option.sh
@@ -0,0 +1,225 @@
+#!/usr/bin/env bash
+# Tags: no-replicated-database
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+user1="user02884_1_${CLICKHOUSE_DATABASE}_$RANDOM"
+user2="user02884_2_${CLICKHOUSE_DATABASE}_$RANDOM"
+user3="user02884_3_${CLICKHOUSE_DATABASE}_$RANDOM"
+db=${CLICKHOUSE_DATABASE}
+
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+CREATE TABLE $db.test_table (s String) ENGINE = MergeTree ORDER BY s;
+
+DROP USER IF EXISTS $user1, $user2, $user3;
+CREATE USER $user1, $user2, $user3;
+GRANT SELECT ON $db.* TO $user1;
+EOF
+
+echo "===== StorageView ====="
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+CREATE VIEW $db.test_view_1 (s String)
+AS SELECT * FROM $db.test_table;
+
+CREATE DEFINER $user1 VIEW $db.test_view_2 (s String)
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_3 (s String)
+DEFINER = $user1 SQL SECURITY DEFINER
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_4 (s String)
+DEFINER = $user1 SQL SECURITY INVOKER
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_5 (s String)
+SQL SECURITY INVOKER
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_6 (s String)
+SQL SECURITY DEFINER
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_7 (s String)
+DEFINER CURRENT_USER
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_8 (s String)
+DEFINER $user3
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_9 (s String)
+SQL SECURITY NONE
+AS SELECT * FROM $db.test_table;
+
+CREATE VIEW $db.test_view_10 (s String)
+SQL SECURITY DEFINER
+AS SELECT * FROM $db.test_table;
+EOF
+
+(( $(${CLICKHOUSE_CLIENT} --query "SHOW TABLE $db.test_view_5" 2>&1 | grep -c "INVOKER") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --query "SHOW TABLE $db.test_view_2" 2>&1 | grep -c "DEFINER = $user1") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+GRANT SELECT ON $db.test_view_1 TO $user2;
+GRANT SELECT ON $db.test_view_2 TO $user2;
+GRANT SELECT ON $db.test_view_3 TO $user2;
+GRANT SELECT ON $db.test_view_4 TO $user2;
+GRANT SELECT ON $db.test_view_5 TO $user2;
+GRANT SELECT ON $db.test_view_6 TO $user2;
+GRANT SELECT ON $db.test_view_7 TO $user2;
+GRANT SELECT ON $db.test_view_8 TO $user2;
+GRANT SELECT ON $db.test_view_9 TO $user2;
+GRANT SELECT ON $db.test_view_10 TO $user2;
+EOF
+
+${CLICKHOUSE_CLIENT} --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');"
+
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_1" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_2"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_3"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_4" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_5" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_6"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_7"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_8" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_9"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_view_10"
+
+${CLICKHOUSE_CLIENT} --query "ALTER TABLE $db.test_view_10 MODIFY SQL SECURITY INVOKER"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_10" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE $db.test_view_10" | grep -c "SQL SECURITY INVOKER"
+
+
+echo "===== MaterializedView ====="
+${CLICKHOUSE_CLIENT} --query "
+  CREATE MATERIALIZED VIEW $db.test_mv_1 (s String)
+  ENGINE = MergeTree ORDER BY s
+  DEFINER = $user1 SQL SECURITY DEFINER
+  AS SELECT * FROM $db.test_table;
+"
+
+(( $(${CLICKHOUSE_CLIENT} --query "
+  CREATE MATERIALIZED VIEW $db.test_mv_2 (s String)
+  ENGINE = MergeTree ORDER BY s
+  SQL SECURITY INVOKER
+  AS SELECT * FROM $db.test_table;
+" 2>&1 | grep -c "SQL SECURITY INVOKER can't be specified for MATERIALIZED VIEW") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --query "
+  CREATE MATERIALIZED VIEW $db.test_mv_3 (s String)
+  ENGINE = MergeTree ORDER BY s
+  SQL SECURITY NONE
+  AS SELECT * FROM $db.test_table;
+"
+
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE $db.test_mv_data (s String) ENGINE = MergeTree ORDER BY s;"
+
+${CLICKHOUSE_CLIENT} --query "
+  CREATE MATERIALIZED VIEW $db.test_mv_4
+  TO $db.test_mv_data
+  DEFINER = $user1 SQL SECURITY DEFINER
+  AS SELECT * FROM $db.test_table;
+"
+
+${CLICKHOUSE_CLIENT} --query "
+  CREATE MATERIALIZED VIEW $db.test_mv_5 (s String)
+  ENGINE = MergeTree ORDER BY s
+  DEFINER = $user2 SQL SECURITY DEFINER
+  AS SELECT * FROM $db.test_table;
+"
+
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_mv_5 TO $user2"
+
+${CLICKHOUSE_CLIENT} --query "ALTER TABLE $db.test_mv_5 MODIFY SQL SECURITY NONE"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_5"
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE $db.test_mv_5" | grep -c "SQL SECURITY NONE"
+
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_mv_1 TO $user2"
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_mv_3 TO $user2"
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_mv_4 TO $user2"
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_mv_1"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_mv_3"
+
+${CLICKHOUSE_CLIENT} --query "REVOKE SELECT ON $db.test_mv_data FROM $user1"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_4" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --materialized_views_ignore_errors 1 --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');" 2>&1 | grep -c "Failed to push block to view") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --query "GRANT INSERT ON $db.test_mv_data TO $user1"
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_mv_data TO $user1"
+${CLICKHOUSE_CLIENT} --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');"
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT count() FROM $db.test_mv_4"
+
+${CLICKHOUSE_CLIENT} --query "REVOKE SELECT ON $db.test_table FROM $user1"
+(( $(${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_4" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+(( $(${CLICKHOUSE_CLIENT} --query "INSERT INTO $db.test_table VALUES ('foo'), ('bar');" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+
+echo "===== TestGrants ====="
+${CLICKHOUSE_CLIENT} --query "GRANT CREATE ON *.* TO $user1"
+${CLICKHOUSE_CLIENT} --query "GRANT SELECT ON $db.test_table TO $user1, $user2"
+
+${CLICKHOUSE_CLIENT} --user $user1 --query "
+  CREATE VIEW $db.test_view_g_1
+  DEFINER = CURRENT_USER SQL SECURITY DEFINER
+  AS SELECT * FROM $db.test_table;
+"
+
+(( $(${CLICKHOUSE_CLIENT} --user $user1 --query "
+  CREATE VIEW $db.test_view_g_2
+  DEFINER = $user2
+  AS SELECT * FROM $db.test_table;
+" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --query "GRANT SET DEFINER ON $user2 TO $user1"
+
+${CLICKHOUSE_CLIENT} --user $user1 --query "
+  CREATE VIEW $db.test_view_g_2
+  DEFINER = $user2
+  AS SELECT * FROM $db.test_table;
+"
+
+(( $(${CLICKHOUSE_CLIENT} --user $user1 --query "
+  CREATE VIEW $db.test_view_g_3
+  SQL SECURITY NONE
+  AS SELECT * FROM $db.test_table;
+" 2>&1 | grep -c "Not enough privileges") >= 1 )) && echo "OK" || echo "UNEXPECTED"
+
+${CLICKHOUSE_CLIENT} --query "GRANT SET DEFINER ON $user2 TO $user1"
+
+
+echo "===== TestRowPolicy ====="
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+CREATE TABLE $db.test_row_t (x Int32, y Int32) ENGINE = MergeTree ORDER BY x;
+
+CREATE VIEW $db.test_view_row_1 DEFINER = $user1 SQL SECURITY DEFINER AS SELECT x, y AS z FROM $db.test_row_t;
+CREATE ROW POLICY r1 ON $db.test_row_t FOR SELECT USING x <= y TO $user1;
+CREATE ROW POLICY r2 ON $db.test_view_row_1 FOR SELECT USING x >= z TO $user2;
+
+INSERT INTO $db.test_row_t VALUES (1, 2), (1, 1), (2, 2), (3, 2), (4, 0);
+
+GRANT SELECT ON $db.test_view_row_1 to $user2;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_view_row_1"
+
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+CREATE TABLE $db.test_row_t2 (x Int32, y Int32) ENGINE = MergeTree ORDER BY x;
+
+CREATE VIEW $db.test_mv_row_2 DEFINER = $user1 SQL SECURITY DEFINER AS SELECT x, y AS z FROM $db.test_row_t2;
+CREATE ROW POLICY r1 ON $db.test_row_t2 FOR SELECT USING x <= y TO $user1;
+CREATE ROW POLICY r2 ON $db.test_mv_row_2 FOR SELECT USING x >= z TO $user2;
+
+INSERT INTO $db.test_row_t2 VALUES (5, 6), (6, 5), (6, 6), (8, 7), (9, 9);
+
+GRANT SELECT ON $db.test_mv_row_2 to $user2;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "SELECT * FROM $db.test_mv_row_2"
+
+${CLICKHOUSE_CLIENT} --query "DROP USER IF EXISTS $user1, $user2, $user3";
diff --git a/tests/queries/0_stateless/02885_arg_min_max_combinator.reference b/tests/queries/0_stateless/02885_arg_min_max_combinator.reference
index c4e850c0b99..f7ae9e7d104 100644
--- a/tests/queries/0_stateless/02885_arg_min_max_combinator.reference
+++ b/tests/queries/0_stateless/02885_arg_min_max_combinator.reference
@@ -1,3 +1,4 @@
 200	295
 200	245
 200	290
+999
diff --git a/tests/queries/0_stateless/02885_arg_min_max_combinator.sql b/tests/queries/0_stateless/02885_arg_min_max_combinator.sql
index 86ee73d8f3b..8502234acfc 100644
--- a/tests/queries/0_stateless/02885_arg_min_max_combinator.sql
+++ b/tests/queries/0_stateless/02885_arg_min_max_combinator.sql
@@ -1,3 +1,10 @@
 select sumArgMin(number, number % 20), sumArgMax(number, number % 20) from numbers(100);
 select sumArgMin(number, toString(number % 20)), sumArgMax(number, toString(number % 20)) from numbers(100);
 select sumArgMinIf(number, number % 20, number % 2 = 0), sumArgMaxIf(number, number % 20, number % 2 = 0) from numbers(100);
+select sumArgMin() from numbers(100); -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+select sumArgMin(number) from numbers(100); -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+-- Try passing a non comparable type, for example an AggregationState
+select sumArgMin(number, unhex('0000000000000000')::AggregateFunction(sum, UInt64)) from numbers(100); -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+-- ASAN (data leak)
+SELECT sumArgMax(number, tuple(number, repeat('a', (10 * (number % 100))::Int32))) FROM numbers(1000);
diff --git a/tests/queries/0_stateless/02887_mutations_subcolumns.reference b/tests/queries/0_stateless/02887_mutations_subcolumns.reference
index c2d6cbbd225..1ccc83b48a3 100644
--- a/tests/queries/0_stateless/02887_mutations_subcolumns.reference
+++ b/tests/queries/0_stateless/02887_mutations_subcolumns.reference
@@ -5,6 +5,6 @@
 4	ttt
 5	ttt
 6	ttt
-{"a":"1","obj":{"k1":1,"k2":null,"k3":null}}
-{"a":"3","obj":{"k1":null,"k2":null,"k3":1}}
-{"a":"1","obj":{"k1":1,"k2":null,"k3":null}}
+1	[('k1',1)]
+3	[('k3',1)]
+1	[('k1',1)]
diff --git a/tests/queries/0_stateless/02887_mutations_subcolumns.sql b/tests/queries/0_stateless/02887_mutations_subcolumns.sql
index a01158e1b06..87b3009e929 100644
--- a/tests/queries/0_stateless/02887_mutations_subcolumns.sql
+++ b/tests/queries/0_stateless/02887_mutations_subcolumns.sql
@@ -40,9 +40,9 @@ INSERT INTO t_mutations_subcolumns VALUES (2, '{"k2": 1}');
 INSERT INTO t_mutations_subcolumns VALUES (3, '{"k3": 1}');
 
 ALTER TABLE t_mutations_subcolumns DELETE WHERE obj.k2 = 1;
-SELECT * FROM t_mutations_subcolumns ORDER BY a FORMAT JSONEachRow;
+SELECT a, arrayFilter(x -> not isNull(x.2), tupleToNameValuePairs(obj)) FROM t_mutations_subcolumns ORDER BY a;
 
 ALTER TABLE t_mutations_subcolumns DELETE WHERE isNull(obj.k1);
-SELECT * FROM t_mutations_subcolumns ORDER BY a FORMAT JSONEachRow;
+SELECT a, arrayFilter(x -> not isNull(x.2), tupleToNameValuePairs(obj)) FROM t_mutations_subcolumns ORDER BY a;
 
 DROP TABLE t_mutations_subcolumns;
diff --git a/tests/queries/0_stateless/02890_describe_table_options.reference b/tests/queries/0_stateless/02890_describe_table_options.reference
index 5d99df36bb4..9181cb27cb0 100644
--- a/tests/queries/0_stateless/02890_describe_table_options.reference
+++ b/tests/queries/0_stateless/02890_describe_table_options.reference
@@ -1,238 +1,182 @@
 -- { echoOn }
 
 SET describe_compact_output = 0, describe_include_virtual_columns = 0, describe_include_subcolumns = 0;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─�
-│ id   │ UInt64                           │              │                    │ index column │                  │                │
-│ arr  │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │
-│ t    │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │
-└──────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name─┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─�
-│ id   │ UInt64                           │              │                    │ index column │                  │                │
-│ arr  │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │
-│ t    │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │
-└──────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64			index column		
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)	
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)	
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64			index column		
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)	
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)	
 SET describe_compact_output = 0, describe_include_virtual_columns = 0, describe_include_subcolumns = 1;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name──────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_subcolumn─�
-│ id        │ UInt64                           │              │                    │ index column │                  │                │            0 │
-│ arr       │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │            0 │
-│ t         │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │            0 │
-│ arr.size0 │ UInt64                           │              │                    │              │                  │                │            1 │
-│ t.a       │ String                           │              │                    │              │ ZSTD(1)          │                │            1 │
-│ t.b       │ UInt64                           │              │                    │              │ ZSTD(1)          │                │            1 │
-└───────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴──────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name──────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_subcolumn─�
-│ id        │ UInt64                           │              │                    │ index column │                  │                │            0 │
-│ arr       │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │            0 │
-│ t         │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │            0 │
-│ arr.size0 │ UInt64                           │              │                    │              │                  │                │            1 │
-│ t.a       │ String                           │              │                    │              │ ZSTD(1)          │                │            1 │
-│ t.b       │ UInt64                           │              │                    │              │ ZSTD(1)          │                │            1 │
-└───────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴──────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64			index column			0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0
+arr.size0	UInt64						1
+t.a	String				ZSTD(1)		1
+t.b	UInt64				ZSTD(1)		1
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64			index column			0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0
+arr.size0	UInt64						1
+t.a	String				ZSTD(1)		1
+t.b	UInt64				ZSTD(1)		1
 SET describe_compact_output = 0, describe_include_virtual_columns = 1, describe_include_subcolumns = 0;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─────────────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_virtual─�
-│ id               │ UInt64                           │              │                    │ index column │                  │                │          0 │
-│ arr              │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │          0 │
-│ t                │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │          0 │
-│ _part            │ LowCardinality(String)           │              │                    │              │                  │                │          1 │
-│ _part_index      │ UInt64                           │              │                    │              │                  │                │          1 │
-│ _part_uuid       │ UUID                             │              │                    │              │                  │                │          1 │
-│ _partition_id    │ LowCardinality(String)           │              │                    │              │                  │                │          1 │
-│ _partition_value │ UInt8                            │              │                    │              │                  │                │          1 │
-│ _sample_factor   │ Float64                          │              │                    │              │                  │                │          1 │
-│ _part_offset     │ UInt64                           │              │                    │              │                  │                │          1 │
-│ _row_exists      │ UInt8                            │              │                    │              │                  │                │          1 │
-│ _block_number    │ UInt64                           │              │                    │              │                  │                │          1 │
-└──────────────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name───────────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_virtual─�
-│ id             │ UInt64                           │              │                    │ index column │                  │                │          0 │
-│ arr            │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │          0 │
-│ t              │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │          0 │
-│ _table         │ LowCardinality(String)           │              │                    │              │                  │                │          1 │
-│ _part          │ LowCardinality(String)           │              │                    │              │                  │                │          1 │
-│ _part_index    │ UInt64                           │              │                    │              │                  │                │          1 │
-│ _part_uuid     │ UUID                             │              │                    │              │                  │                │          1 │
-│ _partition_id  │ LowCardinality(String)           │              │                    │              │                  │                │          1 │
-│ _sample_factor │ Float64                          │              │                    │              │                  │                │          1 │
-│ _part_offset   │ UInt64                           │              │                    │              │                  │                │          1 │
-│ _row_exists    │ UInt8                            │              │                    │              │                  │                │          1 │
-│ _block_number  │ UInt64                           │              │                    │              │                  │                │          1 │
-│ _shard_num     │ UInt32                           │              │                    │              │                  │                │          1 │
-└────────────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64			index column			0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0
+_part	LowCardinality(String)			Name of part			1
+_part_index	UInt64			Sequential index of the part in the query result			1
+_part_uuid	UUID			Unique part identifier (if enabled MergeTree setting assign_part_uuids)			1
+_partition_id	LowCardinality(String)			Name of partition			1
+_sample_factor	Float64			Sample factor (from the query)			1
+_part_offset	UInt64			Number of row in the part			1
+_part_data_version	UInt64			Data version of part (either min block number or mutation version)			1
+_row_exists	UInt8			Persisted mask created by lightweight delete that show whether row exists or is deleted			1
+_block_number	UInt64			Persisted original number of block that was assigned at insert	Delta, LZ4		1
+_block_offset	UInt64			Persisted original number of row in block that was assigned at insert	Delta, LZ4		1
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64			index column			0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0
+_part	LowCardinality(String)			Name of part			1
+_part_index	UInt64			Sequential index of the part in the query result			1
+_part_uuid	UUID			Unique part identifier (if enabled MergeTree setting assign_part_uuids)			1
+_partition_id	LowCardinality(String)			Name of partition			1
+_sample_factor	Float64			Sample factor (from the query)			1
+_part_offset	UInt64			Number of row in the part			1
+_part_data_version	UInt64			Data version of part (either min block number or mutation version)			1
+_row_exists	UInt8			Persisted mask created by lightweight delete that show whether row exists or is deleted			1
+_block_number	UInt64			Persisted original number of block that was assigned at insert	Delta, LZ4		1
+_block_offset	UInt64			Persisted original number of row in block that was assigned at insert	Delta, LZ4		1
+_shard_num	UInt32			Deprecated. Use function shardNum instead			1
 SET describe_compact_output = 0, describe_include_virtual_columns = 1, describe_include_subcolumns = 1;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─────────────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_subcolumn─┬─is_virtual─�
-│ id               │ UInt64                           │              │                    │ index column │                  │                │            0 │          0 │
-│ arr              │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │            0 │          0 │
-│ t                │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │            0 │          0 │
-│ _part            │ LowCardinality(String)           │              │                    │              │                  │                │            0 │          1 │
-│ _part_index      │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ _part_uuid       │ UUID                             │              │                    │              │                  │                │            0 │          1 │
-│ _partition_id    │ LowCardinality(String)           │              │                    │              │                  │                │            0 │          1 │
-│ _partition_value │ UInt8                            │              │                    │              │                  │                │            0 │          1 │
-│ _sample_factor   │ Float64                          │              │                    │              │                  │                │            0 │          1 │
-│ _part_offset     │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ _row_exists      │ UInt8                            │              │                    │              │                  │                │            0 │          1 │
-│ _block_number    │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ arr.size0        │ UInt64                           │              │                    │              │                  │                │            1 │          0 │
-│ t.a              │ String                           │              │                    │              │ ZSTD(1)          │                │            1 │          0 │
-│ t.b              │ UInt64                           │              │                    │              │ ZSTD(1)          │                │            1 │          0 │
-└──────────────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴──────────────┴────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name───────────┬─type─────────────────────────────┬─default_type─┬─default_expression─┬─comment──────┬─codec_expression─┬─ttl_expression─┬─is_subcolumn─┬─is_virtual─�
-│ id             │ UInt64                           │              │                    │ index column │                  │                │            0 │          0 │
-│ arr            │ Array(UInt64)                    │ DEFAULT      │ [10, 20]           │              │ ZSTD(1)          │                │            0 │          0 │
-│ t              │ Tuple(
-    a String,
-    b UInt64) │ DEFAULT      │ ('foo', 0)         │              │ ZSTD(1)          │                │            0 │          0 │
-│ _table         │ LowCardinality(String)           │              │                    │              │                  │                │            0 │          1 │
-│ _part          │ LowCardinality(String)           │              │                    │              │                  │                │            0 │          1 │
-│ _part_index    │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ _part_uuid     │ UUID                             │              │                    │              │                  │                │            0 │          1 │
-│ _partition_id  │ LowCardinality(String)           │              │                    │              │                  │                │            0 │          1 │
-│ _sample_factor │ Float64                          │              │                    │              │                  │                │            0 │          1 │
-│ _part_offset   │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ _row_exists    │ UInt8                            │              │                    │              │                  │                │            0 │          1 │
-│ _block_number  │ UInt64                           │              │                    │              │                  │                │            0 │          1 │
-│ _shard_num     │ UInt32                           │              │                    │              │                  │                │            0 │          1 │
-│ arr.size0      │ UInt64                           │              │                    │              │                  │                │            1 │          0 │
-│ t.a            │ String                           │              │                    │              │ ZSTD(1)          │                │            1 │          0 │
-│ t.b            │ UInt64                           │              │                    │              │ ZSTD(1)          │                │            1 │          0 │
-└────────────────┴──────────────────────────────────┴──────────────┴────────────────────┴──────────────┴──────────────────┴────────────────┴──────────────┴────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64			index column			0	0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0	0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0	0
+_part	LowCardinality(String)			Name of part			0	1
+_part_index	UInt64			Sequential index of the part in the query result			0	1
+_part_uuid	UUID			Unique part identifier (if enabled MergeTree setting assign_part_uuids)			0	1
+_partition_id	LowCardinality(String)			Name of partition			0	1
+_sample_factor	Float64			Sample factor (from the query)			0	1
+_part_offset	UInt64			Number of row in the part			0	1
+_part_data_version	UInt64			Data version of part (either min block number or mutation version)			0	1
+_row_exists	UInt8			Persisted mask created by lightweight delete that show whether row exists or is deleted			0	1
+_block_number	UInt64			Persisted original number of block that was assigned at insert	Delta, LZ4		0	1
+_block_offset	UInt64			Persisted original number of row in block that was assigned at insert	Delta, LZ4		0	1
+arr.size0	UInt64						1	0
+t.a	String				ZSTD(1)		1	0
+t.b	UInt64				ZSTD(1)		1	0
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64			index column			0	0
+arr	Array(UInt64)	DEFAULT	[10, 20]		ZSTD(1)		0	0
+t	Tuple(a String, b UInt64)	DEFAULT	(\'foo\', 0)		ZSTD(1)		0	0
+_part	LowCardinality(String)			Name of part			0	1
+_part_index	UInt64			Sequential index of the part in the query result			0	1
+_part_uuid	UUID			Unique part identifier (if enabled MergeTree setting assign_part_uuids)			0	1
+_partition_id	LowCardinality(String)			Name of partition			0	1
+_sample_factor	Float64			Sample factor (from the query)			0	1
+_part_offset	UInt64			Number of row in the part			0	1
+_part_data_version	UInt64			Data version of part (either min block number or mutation version)			0	1
+_row_exists	UInt8			Persisted mask created by lightweight delete that show whether row exists or is deleted			0	1
+_block_number	UInt64			Persisted original number of block that was assigned at insert	Delta, LZ4		0	1
+_block_offset	UInt64			Persisted original number of row in block that was assigned at insert	Delta, LZ4		0	1
+_shard_num	UInt32			Deprecated. Use function shardNum instead			0	1
+arr.size0	UInt64						1	0
+t.a	String				ZSTD(1)		1	0
+t.b	UInt64				ZSTD(1)		1	0
 SET describe_compact_output = 1, describe_include_virtual_columns = 0, describe_include_subcolumns = 0;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─┬─type─────────────────────────────�
-│ id   │ UInt64                           │
-│ arr  │ Array(UInt64)                    │
-│ t    │ Tuple(
-    a String,
-    b UInt64) │
-└──────┴──────────────────────────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name─┬─type─────────────────────────────�
-│ id   │ UInt64                           │
-│ arr  │ Array(UInt64)                    │
-│ t    │ Tuple(
-    a String,
-    b UInt64) │
-└──────┴──────────────────────────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64
+arr	Array(UInt64)
+t	Tuple(a String, b UInt64)
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64
+arr	Array(UInt64)
+t	Tuple(a String, b UInt64)
 SET describe_compact_output = 1, describe_include_virtual_columns = 0, describe_include_subcolumns = 1;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name──────┬─type─────────────────────────────┬─is_subcolumn─�
-│ id        │ UInt64                           │            0 │
-│ arr       │ Array(UInt64)                    │            0 │
-│ t         │ Tuple(
-    a String,
-    b UInt64) │            0 │
-│ arr.size0 │ UInt64                           │            1 │
-│ t.a       │ String                           │            1 │
-│ t.b       │ UInt64                           │            1 │
-└───────────┴──────────────────────────────────┴──────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name──────┬─type─────────────────────────────┬─is_subcolumn─�
-│ id        │ UInt64                           │            0 │
-│ arr       │ Array(UInt64)                    │            0 │
-│ t         │ Tuple(
-    a String,
-    b UInt64) │            0 │
-│ arr.size0 │ UInt64                           │            1 │
-│ t.a       │ String                           │            1 │
-│ t.b       │ UInt64                           │            1 │
-└───────────┴──────────────────────────────────┴──────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64	0
+arr	Array(UInt64)	0
+t	Tuple(a String, b UInt64)	0
+arr.size0	UInt64	1
+t.a	String	1
+t.b	UInt64	1
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64	0
+arr	Array(UInt64)	0
+t	Tuple(a String, b UInt64)	0
+arr.size0	UInt64	1
+t.a	String	1
+t.b	UInt64	1
 SET describe_compact_output = 1, describe_include_virtual_columns = 1, describe_include_subcolumns = 0;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─────────────┬─type─────────────────────────────┬─is_virtual─�
-│ id               │ UInt64                           │          0 │
-│ arr              │ Array(UInt64)                    │          0 │
-│ t                │ Tuple(
-    a String,
-    b UInt64) │          0 │
-│ _part            │ LowCardinality(String)           │          1 │
-│ _part_index      │ UInt64                           │          1 │
-│ _part_uuid       │ UUID                             │          1 │
-│ _partition_id    │ LowCardinality(String)           │          1 │
-│ _partition_value │ UInt8                            │          1 │
-│ _sample_factor   │ Float64                          │          1 │
-│ _part_offset     │ UInt64                           │          1 │
-│ _row_exists      │ UInt8                            │          1 │
-│ _block_number    │ UInt64                           │          1 │
-└──────────────────┴──────────────────────────────────┴────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name───────────┬─type─────────────────────────────┬─is_virtual─�
-│ id             │ UInt64                           │          0 │
-│ arr            │ Array(UInt64)                    │          0 │
-│ t              │ Tuple(
-    a String,
-    b UInt64) │          0 │
-│ _table         │ LowCardinality(String)           │          1 │
-│ _part          │ LowCardinality(String)           │          1 │
-│ _part_index    │ UInt64                           │          1 │
-│ _part_uuid     │ UUID                             │          1 │
-│ _partition_id  │ LowCardinality(String)           │          1 │
-│ _sample_factor │ Float64                          │          1 │
-│ _part_offset   │ UInt64                           │          1 │
-│ _row_exists    │ UInt8                            │          1 │
-│ _block_number  │ UInt64                           │          1 │
-│ _shard_num     │ UInt32                           │          1 │
-└────────────────┴──────────────────────────────────┴────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64	0
+arr	Array(UInt64)	0
+t	Tuple(a String, b UInt64)	0
+_part	LowCardinality(String)	1
+_part_index	UInt64	1
+_part_uuid	UUID	1
+_partition_id	LowCardinality(String)	1
+_sample_factor	Float64	1
+_part_offset	UInt64	1
+_part_data_version	UInt64	1
+_row_exists	UInt8	1
+_block_number	UInt64	1
+_block_offset	UInt64	1
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64	0
+arr	Array(UInt64)	0
+t	Tuple(a String, b UInt64)	0
+_part	LowCardinality(String)	1
+_part_index	UInt64	1
+_part_uuid	UUID	1
+_partition_id	LowCardinality(String)	1
+_sample_factor	Float64	1
+_part_offset	UInt64	1
+_part_data_version	UInt64	1
+_row_exists	UInt8	1
+_block_number	UInt64	1
+_block_offset	UInt64	1
+_shard_num	UInt32	1
 SET describe_compact_output = 1, describe_include_virtual_columns = 1, describe_include_subcolumns = 1;
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-┌─name─────────────┬─type─────────────────────────────┬─is_subcolumn─┬─is_virtual─�
-│ id               │ UInt64                           │            0 │          0 │
-│ arr              │ Array(UInt64)                    │            0 │          0 │
-│ t                │ Tuple(
-    a String,
-    b UInt64) │            0 │          0 │
-│ _part            │ LowCardinality(String)           │            0 │          1 │
-│ _part_index      │ UInt64                           │            0 │          1 │
-│ _part_uuid       │ UUID                             │            0 │          1 │
-│ _partition_id    │ LowCardinality(String)           │            0 │          1 │
-│ _partition_value │ UInt8                            │            0 │          1 │
-│ _sample_factor   │ Float64                          │            0 │          1 │
-│ _part_offset     │ UInt64                           │            0 │          1 │
-│ _row_exists      │ UInt8                            │            0 │          1 │
-│ _block_number    │ UInt64                           │            0 │          1 │
-│ arr.size0        │ UInt64                           │            1 │          0 │
-│ t.a              │ String                           │            1 │          0 │
-│ t.b              │ UInt64                           │            1 │          0 │
-└──────────────────┴──────────────────────────────────┴──────────────┴────────────┘
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
-┌─name───────────┬─type─────────────────────────────┬─is_subcolumn─┬─is_virtual─�
-│ id             │ UInt64                           │            0 │          0 │
-│ arr            │ Array(UInt64)                    │            0 │          0 │
-│ t              │ Tuple(
-    a String,
-    b UInt64) │            0 │          0 │
-│ _table         │ LowCardinality(String)           │            0 │          1 │
-│ _part          │ LowCardinality(String)           │            0 │          1 │
-│ _part_index    │ UInt64                           │            0 │          1 │
-│ _part_uuid     │ UUID                             │            0 │          1 │
-│ _partition_id  │ LowCardinality(String)           │            0 │          1 │
-│ _sample_factor │ Float64                          │            0 │          1 │
-│ _part_offset   │ UInt64                           │            0 │          1 │
-│ _row_exists    │ UInt8                            │            0 │          1 │
-│ _block_number  │ UInt64                           │            0 │          1 │
-│ _shard_num     │ UInt32                           │            0 │          1 │
-│ arr.size0      │ UInt64                           │            1 │          0 │
-│ t.a            │ String                           │            1 │          0 │
-│ t.b            │ UInt64                           │            1 │          0 │
-└────────────────┴──────────────────────────────────┴──────────────┴────────────┘
+DESCRIBE TABLE t_describe_options;
+id	UInt64	0	0
+arr	Array(UInt64)	0	0
+t	Tuple(a String, b UInt64)	0	0
+_part	LowCardinality(String)	0	1
+_part_index	UInt64	0	1
+_part_uuid	UUID	0	1
+_partition_id	LowCardinality(String)	0	1
+_sample_factor	Float64	0	1
+_part_offset	UInt64	0	1
+_part_data_version	UInt64	0	1
+_row_exists	UInt8	0	1
+_block_number	UInt64	0	1
+_block_offset	UInt64	0	1
+arr.size0	UInt64	1	0
+t.a	String	1	0
+t.b	UInt64	1	0
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
+id	UInt64	0	0
+arr	Array(UInt64)	0	0
+t	Tuple(a String, b UInt64)	0	0
+_part	LowCardinality(String)	0	1
+_part_index	UInt64	0	1
+_part_uuid	UUID	0	1
+_partition_id	LowCardinality(String)	0	1
+_sample_factor	Float64	0	1
+_part_offset	UInt64	0	1
+_part_data_version	UInt64	0	1
+_row_exists	UInt8	0	1
+_block_number	UInt64	0	1
+_block_offset	UInt64	0	1
+_shard_num	UInt32	0	1
+arr.size0	UInt64	1	0
+t.a	String	1	0
+t.b	UInt64	1	0
diff --git a/tests/queries/0_stateless/02890_describe_table_options.sql b/tests/queries/0_stateless/02890_describe_table_options.sql
index 236100148ff..74ecfa9a33f 100644
--- a/tests/queries/0_stateless/02890_describe_table_options.sql
+++ b/tests/queries/0_stateless/02890_describe_table_options.sql
@@ -1,5 +1,7 @@
 DROP TABLE IF EXISTS t_describe_options;
 
+SET print_pretty_type_names = 0;
+
 CREATE TABLE t_describe_options (
     id UInt64 COMMENT 'index column',
     arr Array(UInt64) DEFAULT [10, 20] CODEC(ZSTD),
@@ -11,43 +13,43 @@ ORDER BY id;
 
 SET describe_compact_output = 0, describe_include_virtual_columns = 0, describe_include_subcolumns = 0;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 0, describe_include_virtual_columns = 0, describe_include_subcolumns = 1;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 0, describe_include_virtual_columns = 1, describe_include_subcolumns = 0;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 0, describe_include_virtual_columns = 1, describe_include_subcolumns = 1;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 1, describe_include_virtual_columns = 0, describe_include_subcolumns = 0;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 1, describe_include_virtual_columns = 0, describe_include_subcolumns = 1;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 1, describe_include_virtual_columns = 1, describe_include_subcolumns = 0;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 SET describe_compact_output = 1, describe_include_virtual_columns = 1, describe_include_subcolumns = 1;
 
-DESCRIBE TABLE t_describe_options FORMAT PrettyCompactNoEscapes;
-DESCRIBE remote(default, currentDatabase(), t_describe_options) FORMAT PrettyCompactNoEscapes;
+DESCRIBE TABLE t_describe_options;
+DESCRIBE remote(test_shard_localhost, currentDatabase(), t_describe_options);
 
 -- { echoOff }
 
diff --git a/tests/queries/0_stateless/02891_array_shingles.reference b/tests/queries/0_stateless/02891_array_shingles.reference
new file mode 100644
index 00000000000..00bd9f6bb41
--- /dev/null
+++ b/tests/queries/0_stateless/02891_array_shingles.reference
@@ -0,0 +1,11 @@
+-- negative tests
+-- const and non-const inputs
+[1,2,3,4,5]	1	[[1],[2],[3],[4],[5]]	[[1],[2],[3],[4],[5]]
+[1,2,3,4,5]	3	[[1,2,3],[2,3,4],[3,4,5]]	[[1,2,3],[2,3,4],[3,4,5]]
+[1,2,3,4,5]	5	[[1,2,3,4,5]]	[[1,2,3,4,5]]
+['ab','c','de','','hi']	1	[['ab'],['c'],['de'],[''],['hi']]	[['ab'],['c'],['de'],[''],['hi']]
+['ab','c','de','','hi']	3	[['ab','c','de'],['c','de',''],['de','','hi']]	[['ab','c','de'],['c','de',''],['de','','hi']]
+['ab','c','de','','hi']	5	[['ab','c','de','','hi']]	[['ab','c','de','','hi']]
+-- special cases
+[[2],[1]]
+[[2],[1]]
diff --git a/tests/queries/0_stateless/02891_array_shingles.sql b/tests/queries/0_stateless/02891_array_shingles.sql
new file mode 100644
index 00000000000..e2b5cde880f
--- /dev/null
+++ b/tests/queries/0_stateless/02891_array_shingles.sql
@@ -0,0 +1,23 @@
+SELECT '-- negative tests';
+SELECT arrayShingles(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT arrayShingles([1, 2, 3, 4, 5]); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT arrayShingles([1, 2, 3, 4, 5], 2, 3); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT arrayShingles([1, 2, 3, 4, 5], 'str'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayShingles((1, 2, 3, 4, 5), 0); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayShingles([1, 2, 3, 4, 5], 0); -- { serverError BAD_ARGUMENTS }
+SELECT arrayShingles([1, 2, 3, 4, 5], -2); -- { serverError BAD_ARGUMENTS }
+SELECT arrayShingles([1, 2, 3, 4, 5], 6); -- { serverError BAD_ARGUMENTS }
+SELECT arrayShingles([], 1); -- { serverError BAD_ARGUMENTS }
+
+SELECT '-- const and non-const inputs';
+SELECT [1, 2, 3, 4, 5] AS arr, 1 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+SELECT [1, 2, 3, 4, 5] AS arr, 3 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+SELECT [1, 2 ,3, 4, 5] AS arr, 5 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+
+SELECT ['ab', 'c', 'de', '', 'hi'] AS arr, 1 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+SELECT ['ab', 'c', 'de', '', 'hi'] AS arr, 3 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+SELECT ['ab', 'c', 'de', '', 'hi'] AS arr, 5 AS len, arrayShingles(arr, len), arrayShingles(materialize(arr), len);
+
+SELECT '-- special cases';
+SELECT arrayShingles([toNullable(2), toNullable(1)], 1);
+SELECT arrayShingles([toLowCardinality(2), toLowCardinality(1)], 1);
diff --git a/tests/queries/0_stateless/02893_vertical_final_array_join.reference b/tests/queries/0_stateless/02893_vertical_final_array_join.reference
new file mode 100644
index 00000000000..27b54a2e42e
--- /dev/null
+++ b/tests/queries/0_stateless/02893_vertical_final_array_join.reference
@@ -0,0 +1,15 @@
+-- { echo ON }
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 1 ORDER BY row SETTINGS enable_vertical_final = 0;
+(1,4)	1
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 1 ORDER BY row SETTINGS enable_vertical_final = 1;
+(1,4)	1
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 2 ORDER BY row SETTINGS enable_vertical_final = 0;
+(2,4)	2
+(2,5)	2
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 2 ORDER BY row SETTINGS enable_vertical_final = 1;
+(2,4)	2
+(2,5)	2
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 3 ORDER BY row SETTINGS enable_vertical_final = 0;
+(3,5)	3
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 3 ORDER BY row SETTINGS enable_vertical_final = 1;
+(3,5)	3
diff --git a/tests/queries/0_stateless/02893_vertical_final_array_join.sql b/tests/queries/0_stateless/02893_vertical_final_array_join.sql
new file mode 100644
index 00000000000..cc2e37fdc6e
--- /dev/null
+++ b/tests/queries/0_stateless/02893_vertical_final_array_join.sql
@@ -0,0 +1,10 @@
+CREATE TABLE t (k1 UInt64, k2 UInt64, v UInt64) ENGINE = ReplacingMergeTree() ORDER BY (k1, k2);
+SET optimize_on_insert = 0;
+INSERT INTO t VALUES (1, 2, 3) (1, 2, 4) (2, 3, 4), (2, 3, 5);
+-- { echo ON }
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 1 ORDER BY row SETTINGS enable_vertical_final = 0;
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 1 ORDER BY row SETTINGS enable_vertical_final = 1;
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 2 ORDER BY row SETTINGS enable_vertical_final = 0;
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 2 ORDER BY row SETTINGS enable_vertical_final = 1;
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 3 ORDER BY row SETTINGS enable_vertical_final = 0;
+SELECT arrayJoin([(k1, v), (k2, v)]) AS row, row.1 as k FROM t FINAL WHERE k1 != 3 AND k = 3 ORDER BY row SETTINGS enable_vertical_final = 1;
diff --git a/tests/queries/0_stateless/02896_leading_zeroes_no_octal.reference b/tests/queries/0_stateless/02896_leading_zeroes_no_octal.reference
index 5b932f50824..7c69b7e02aa 100644
--- a/tests/queries/0_stateless/02896_leading_zeroes_no_octal.reference
+++ b/tests/queries/0_stateless/02896_leading_zeroes_no_octal.reference
@@ -1,35 +1,154 @@
-Leading zeroes into INTEGER
-1	1	00000	0	0
-1	2	0	0	0
-1	3	00	0	0
-1	4	01	1	1
-1	5	+01	1	1
-1	6	-01	-1	-1
-1	7	0001	1	1
-1	8	0005	5	5
-1	9	0008	8	8
-1	10	0017	17	17
-1	11	0021	21	21
-1	12	0051	51	51
-1	13	00000123	123	123
-1	14	0b10000	16	16
-1	15	0x0abcd	43981	43981
-1	16	0000.008	0	0
-1	17	1000.0008	1000	1000
-1	18	0008.0008	8	8
-Leading zeroes into Float32
-1	1	00000	0	0
-1	2	00009.00009	9.00009	9.00009
-1	3	00009e9	9000000000	9000000000
-1	4	00009e09	9000000000	9000000000
-1	5	00009e0009	9000000000	9000000000
-1	6	-00000	-0.1	-0.1
-1	7	-00009.00009	-9.00009	-9.00009
-1	8	-00009e9	-9000000000	-9000000000
-1	9	-00009e09	-9000000000	-9000000000
-1	10	-00009e0009	-9000000000	-9000000000
-1	11	+00000	0	0
-1	12	+00009.00009	9.00009	9.00009
-1	13	+00009e9	9000000000	9000000000
-1	14	+00009e09	9000000000	9000000000
-1	15	+00009e0009	9000000000	9000000000
+Leading zeroes into Int64 (1XXX without input_format_values_interpret_expressions and 1XXXX with)
+1	1000	0	0	0	Single zero
+1	1001	00	0	0	Double zero
+1	1002	000000000000000	0	0	Mutliple redundant zeroes
+1	1003	01	1	1	Octal like, interpret as decimal
+1	1004	08	8	8	Octal like, interpret as decimal
+1	1005	0100	100	100	Octal like, interpret as decimal
+1	1006	0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes
+1	1010	-0	0	0	Single zero negative
+1	1011	-00	0	0	Double zero negative
+1	1012	-000000000000000	0	0	Mutliple redundant zeroes negative
+1	1013	-01	-1	-1	Octal like, interpret as decimal negative
+1	1014	-08	-8	-8	Octal like, interpret as decimal negative
+1	1015	-0100	-100	-100	Octal like, interpret as decimal negative
+1	1016	-0000000000100	-100	-100	Octal like, interpret as decimal, multiple leading zeroes negative
+1	1020	+0	0	0	Single zero positive
+1	1021	+00	0	0	Double zero negpositiveative
+1	1022	+000000000000000	0	0	Mutliple redundant zeroes positive
+1	1023	+01	1	1	Octal like, interpret as decimal positive
+1	1024	+08	8	8	Octal like, interpret as decimal positive
+1	1025	+0100	100	100	Octal like, interpret as decimal positive
+1	1026	+0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes positive
+1	1030	0000.008	0	0	Floating point should work...
+1	1031	-0000.008	0	0	Floating point should work...
+1	1032	+0000.008	0	0	Floating point should work...
+1	1033	0000.008e3	8	8	Floating point should work...
+1	1034	-0000.008e3	-8	-8	Floating point should work...
+1	1035	+0000.008e3	8	8	Floating point should work...
+1	1036	08000.008e-3	8	8	Floating point should work...
+1	1037	-08000.008e-3	-8	-8	Floating point should work...
+1	1038	+08000.008e-3	8	8	Floating point should work...
+1	1060	0x0abcd	43981	43981	Hex should be parsed
+1	1061	-0x0abcd	-43981	-43981	Hex should be parsed
+1	1062	+0x0abcd	43981	43981	Hex should be parsed
+1	1063	0x0abcdP1	87962	87962	Hex should be parsed
+1	1064	0x0abcdP+1	87962	87962	Hex should be parsed
+1	1065	0x0abcdP-1	21990	21990	Hex should be parsed
+1	1066	0x0abcdP01	87962	87962	Hex should be parsed
+1	1067	0x0abcdP+01	87962	87962	Hex should be parsed
+1	1068	0x0abcdP-01	21990	21990	Hex should be parsed
+1	11000	0	0	0	Single zero
+1	11001	00	0	0	Double zero
+1	11002	000000000000000	0	0	Mutliple redundant zeroes
+1	11003	01	1	1	Octal like, interpret as decimal
+1	11004	08	8	8	Octal like, interpret as decimal
+1	11005	0100	100	100	Octal like, interpret as decimal
+1	11006	0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes
+1	11010	-0	0	0	Single zero negative
+1	11011	-00	0	0	Double zero negative
+1	11012	-000000000000000	0	0	Mutliple redundant zeroes negative
+1	11013	-01	-1	-1	Octal like, interpret as decimal negative
+1	11014	-08	-8	-8	Octal like, interpret as decimal negative
+1	11015	-0100	-100	-100	Octal like, interpret as decimal negative
+1	11016	-0000000000100	-100	-100	Octal like, interpret as decimal, multiple leading zeroes negative
+1	11020	+0	0	0	Single zero positive
+1	11021	+00	0	0	Double zero negpositiveative
+1	11022	+000000000000000	0	0	Mutliple redundant zeroes positive
+1	11023	+01	1	1	Octal like, interpret as decimal positive
+1	11024	+08	8	8	Octal like, interpret as decimal positive
+1	11025	+0100	100	100	Octal like, interpret as decimal positive
+1	11026	+0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes positive
+1	11030	0000.008	0	0	Floating point should work...
+1	11031	-0000.008	0	0	Floating point should work...
+1	11032	+0000.008	0	0	Floating point should work...
+1	11033	0000.008e3	8	8	Floating point should work...
+1	11034	-0000.008e3	-8	-8	Floating point should work...
+1	11035	+0000.008e3	8	8	Floating point should work...
+1	11036	08000.008e-3	8	8	Floating point should work...
+1	11037	-08000.008e-3	-8	-8	Floating point should work...
+1	11038	+08000.008e-3	8	8	Floating point should work...
+1	11050	0b10000	16	16	Binary should be parsed
+1	11051	-0b10000	-16	-16	Binary should be parsed
+1	11052	+0b10000	16	16	Binary should be parsed
+1	11060	0x0abcd	43981	43981	Hex should be parsed
+1	11061	-0x0abcd	-43981	-43981	Hex should be parsed
+1	11062	+0x0abcd	43981	43981	Hex should be parsed
+1	11063	0x0abcdP1	87962	87962	Hex should be parsed
+1	11064	0x0abcdP+1	87962	87962	Hex should be parsed
+1	11065	0x0abcdP-1	21990	21990	Hex should be parsed
+1	11066	0x0abcdP01	87962	87962	Hex should be parsed
+1	11067	0x0abcdP+01	87962	87962	Hex should be parsed
+1	11068	0x0abcdP-01	21990	21990	Hex should be parsed
+Leading zeroes into Float64 (2XXX without input_format_values_interpret_expressions and 2XXXX with)
+1	2000	0	0	0	Single zero
+1	2001	00	0	0	Double zero
+1	2002	000000000000000	0	0	Mutliple redundant zeroes
+1	2003	01	1	1	Octal like, interpret as decimal
+1	2004	08	8	8	Octal like, interpret as decimal
+1	2005	0100	100	100	Octal like, interpret as decimal
+1	2006	0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes
+1	2013	-01	-1	-1	Octal like, interpret as decimal negative
+1	2014	-08	-8	-8	Octal like, interpret as decimal negative
+1	2015	-0100	-100	-100	Octal like, interpret as decimal negative
+1	2016	-0000000000100	-100	-100	Octal like, interpret as decimal, multiple leading zeroes negative
+1	2020	+0	0	0	Single zero positive
+1	2021	+00	0	0	Double zero negpositiveative
+1	2022	+000000000000000	0	0	Mutliple redundant zeroes positive
+1	2023	+01	1	1	Octal like, interpret as decimal positive
+1	2024	+08	8	8	Octal like, interpret as decimal positive
+1	2025	+0100	100	100	Octal like, interpret as decimal positive
+1	2026	+0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes positive
+1	2030	0000.008	0.008	0.008	Floating point should work...
+1	2031	-0000.008	-0.008	-0.008	Floating point should work...
+1	2032	+0000.008	0.008	0.008	Floating point should work...
+1	2033	0000.008e3	8	8	Floating point should work...
+1	2034	-0000.008e3	-8	-8	Floating point should work...
+1	2035	+0000.008e3	8	8	Floating point should work...
+1	2036	08.5e-3	0.0085	0.0085	Floating point should work...
+1	2037	-08.5e-3	-0.0085	-0.0085	Floating point should work...
+1	2038	+08.5e-3	0.0085	0.0085	Floating point should work...
+1	2063	0x0abcdP1	87962	87962	Hex should be parsed
+1	2064	0x0abcdP+1	87962	87962	Hex should be parsed
+1	2065	0x0abcdP-1	21990.5	21990.5	Hex should be parsed
+1	2066	0x0abcdP01	87962	87962	Hex should be parsed
+1	2067	0x0abcdP+01	87962	87962	Hex should be parsed
+1	2068	0x0abcdP-01	21990.5	21990.5	Hex should be parsed
+1	2069	0x01P-01	0.5	0.5	Hex should be parsed
+1	12000	0	0	0	Single zero
+1	12001	00	0	0	Double zero
+1	12002	000000000000000	0	0	Mutliple redundant zeroes
+1	12003	01	1	1	Octal like, interpret as decimal
+1	12004	08	8	8	Octal like, interpret as decimal
+1	12005	0100	100	100	Octal like, interpret as decimal
+1	12006	0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes
+1	12013	-01	-1	-1	Octal like, interpret as decimal negative
+1	12014	-08	-8	-8	Octal like, interpret as decimal negative
+1	12015	-0100	-100	-100	Octal like, interpret as decimal negative
+1	12016	-0000000000100	-100	-100	Octal like, interpret as decimal, multiple leading zeroes negative
+1	12020	+0	0	0	Single zero positive
+1	12021	+00	0	0	Double zero negpositiveative
+1	12022	+000000000000000	0	0	Mutliple redundant zeroes positive
+1	12023	+01	1	1	Octal like, interpret as decimal positive
+1	12024	+08	8	8	Octal like, interpret as decimal positive
+1	12025	+0100	100	100	Octal like, interpret as decimal positive
+1	12026	+0000000000100	100	100	Octal like, interpret as decimal, multiple leading zeroes positive
+1	12030	0000.008	0.008	0.008	Floating point should work...
+1	12031	-0000.008	-0.008	-0.008	Floating point should work...
+1	12032	+0000.008	0.008	0.008	Floating point should work...
+1	12033	0000.008e3	8	8	Floating point should work...
+1	12034	-0000.008e3	-8	-8	Floating point should work...
+1	12035	+0000.008e3	8	8	Floating point should work...
+1	12036	08.5e-3	0.0085	0.0085	Floating point should work...
+1	12037	-08.5e-3	-0.0085	-0.0085	Floating point should work...
+1	12038	+08.5e-3	0.0085	0.0085	Floating point should work...
+1	12050	0b10000	16	16	Binary should be parsed
+1	12051	-0b10000	-16	-16	Binary should be parsed
+1	12052	+0b10000	16	16	Binary should be parsed
+1	12063	0x0abcdP1	87962	87962	Hex should be parsed
+1	12064	0x0abcdP+1	87962	87962	Hex should be parsed
+1	12065	0x0abcdP-1	21990.5	21990.5	Hex should be parsed
+1	12066	0x0abcdP01	87962	87962	Hex should be parsed
+1	12067	0x0abcdP+01	87962	87962	Hex should be parsed
+1	12068	0x0abcdP-01	21990.5	21990.5	Hex should be parsed
+1	12069	0x01P-01	0.5	0.5	Hex should be parsed
diff --git a/tests/queries/0_stateless/02896_leading_zeroes_no_octal.sql b/tests/queries/0_stateless/02896_leading_zeroes_no_octal.sql
index 69cc06a46f8..05d841ce01f 100644
--- a/tests/queries/0_stateless/02896_leading_zeroes_no_octal.sql
+++ b/tests/queries/0_stateless/02896_leading_zeroes_no_octal.sql
@@ -1,28 +1,223 @@
 DROP TABLE IF EXISTS t_leading_zeroes;
 DROP TABLE IF EXISTS t_leading_zeroes_f;
 
-CREATE TABLE t_leading_zeroes(id INTEGER, input String, val INTEGER, expected INTEGER) ENGINE=MergeTree ORDER BY id;
+CREATE TABLE t_leading_zeroes(id Int64, input String, val Int64, expected Int64, comment String) ENGINE=MergeTree ORDER BY id;
+CREATE TABLE t_leading_zeroes_f(id Int64, input String, val Float64, expected Float64, comment String) ENGINE=MergeTree ORDER BY id;
 
-INSERT INTO t_leading_zeroes VALUES (1, '00000', 00000, 0), (2, '0', 0, 0), (3, '00', 00, 0), (4, '01', 01, 1), (5, '+01', +01, 1);
-INSERT INTO t_leading_zeroes VALUES (6, '-01', -01, -1), (7, '0001', 0001, 1), (8, '0005', 0005, 5), (9, '0008', 0008, 8);
-INSERT INTO t_leading_zeroes VALUES (10, '0017', 0017, 17), (11, '0021', 0021, 21), (12, '0051', 0051, 51), (13, '00000123', 00000123, 123);
-INSERT INTO t_leading_zeroes VALUES (14, '0b10000', 0b10000, 16), (15, '0x0abcd', 0x0abcd, 43981), (16, '0000.008', 0000.008, 0)
-INSERT INTO t_leading_zeroes VALUES (17, '1000.0008', 1000.0008, 1000), (18, '0008.0008', 0008.0008, 8);
+SET input_format_values_interpret_expressions = 0;
 
-SELECT 'Leading zeroes into INTEGER';
-SELECT t.val == t.expected AS ok, * FROM t_leading_zeroes t ORDER BY id;
+INSERT INTO t_leading_zeroes VALUES (1000, '0', 0, 0, 'Single zero');
+INSERT INTO t_leading_zeroes VALUES (1001, '00', 00, 0, 'Double zero');
+INSERT INTO t_leading_zeroes VALUES (1002, '000000000000000', 000000000000000, 0, 'Mutliple redundant zeroes');
+INSERT INTO t_leading_zeroes VALUES (1003, '01', 01, 1, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (1004, '08', 08, 8, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (1005, '0100', 0100, 100, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (1006, '0000000000100', 0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes');
+
+INSERT INTO t_leading_zeroes VALUES (1010, '-0', -0, 0, 'Single zero negative');
+INSERT INTO t_leading_zeroes VALUES (1011, '-00', -00, 0, 'Double zero negative');
+INSERT INTO t_leading_zeroes VALUES (1012, '-000000000000000', -000000000000000, 0, 'Mutliple redundant zeroes negative');
+INSERT INTO t_leading_zeroes VALUES (1013, '-01', -01, -1, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (1014, '-08', -08, -8, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (1015, '-0100', -0100, -100, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (1016, '-0000000000100', -0000000000100, -100, 'Octal like, interpret as decimal, multiple leading zeroes negative');
+
+INSERT INTO t_leading_zeroes VALUES (1020, '+0', +0, 0, 'Single zero positive');
+INSERT INTO t_leading_zeroes VALUES (1021, '+00', +00, 0, 'Double zero negpositiveative');
+INSERT INTO t_leading_zeroes VALUES (1022, '+000000000000000', +000000000000000, 0, 'Mutliple redundant zeroes positive');
+INSERT INTO t_leading_zeroes VALUES (1023, '+01', +01, 1, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (1024, '+08', +08, 8, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (1025, '+0100', +0100, 100, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (1026, '+0000000000100', +0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes positive');
+
+INSERT INTO t_leading_zeroes VALUES (1030, '0000.008', 0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1031, '-0000.008', -0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1032, '+0000.008', +0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1033, '0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1034, '-0000.008e3', -0000.008e3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1035, '+0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1036, '08000.008e-3', 08000.008e-3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1037, '-08000.008e-3', -08000.008e-3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (1038, '+08000.008e-3', 08000.008e-3, 8, 'Floating point should work...');
+
+INSERT INTO t_leading_zeroes VALUES (1060, '0x0abcd', 0x0abcd, 43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1061, '-0x0abcd', -0x0abcd, -43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1062, '+0x0abcd', +0x0abcd, 43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1063, '0x0abcdP1', 0x0abcdP1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1064, '0x0abcdP+1', 0x0abcdP+1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1065, '0x0abcdP-1', 0x0abcdP-1, 21990, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1066, '0x0abcdP01', 0x0abcdP01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1067, '0x0abcdP+01', 0x0abcdP+01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (1068, '0x0abcdP-01', 0x0abcdP-01, 21990, 'Hex should be parsed');
+
+
+-- Floating point numbers go via readFloatTextFastImpl - so should not be affected
+
+INSERT INTO t_leading_zeroes_f VALUES (2000, '0', 0, 0, 'Single zero');
+INSERT INTO t_leading_zeroes_f VALUES (2001, '00', 00, 0, 'Double zero');
+INSERT INTO t_leading_zeroes_f VALUES (2002, '000000000000000', 000000000000000, 0, 'Mutliple redundant zeroes');
+INSERT INTO t_leading_zeroes_f VALUES (2003, '01', 01, 1, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (2004, '08', 08, 8, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (2005, '0100', 0100, 100, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (2006, '0000000000100', 0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes');
+
+-- Float negative zero is machine/context dependent
+-- INSERT INTO t_leading_zeroes_f VALUES (2010, '-0', -0, 0, 'Single zero negative');
+-- INSERT INTO t_leading_zeroes_f VALUES (2011, '-00', -00, 0, 'Double zero negative');
+-- INSERT INTO t_leading_zeroes_f VALUES (2012, '-000000000000000', -000000000000000, 0, 'Mutliple redundant zeroes negative');
+INSERT INTO t_leading_zeroes_f VALUES (2013, '-01', -01, -1, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (2014, '-08', -08, -8, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (2015, '-0100', -0100, -100, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (2016, '-0000000000100', -0000000000100, -100, 'Octal like, interpret as decimal, multiple leading zeroes negative');
+
+INSERT INTO t_leading_zeroes_f VALUES (2020, '+0', +0, 0, 'Single zero positive');
+INSERT INTO t_leading_zeroes_f VALUES (2021, '+00', +00, 0, 'Double zero negpositiveative');
+INSERT INTO t_leading_zeroes_f VALUES (2022, '+000000000000000', +000000000000000, 0, 'Mutliple redundant zeroes positive');
+INSERT INTO t_leading_zeroes_f VALUES (2023, '+01', +01, 1, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (2024, '+08', +08, 8, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (2025, '+0100', +0100, 100, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (2026, '+0000000000100', +0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes positive');
+
+INSERT INTO t_leading_zeroes_f VALUES (2030, '0000.008', 0000.008, 0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2031, '-0000.008', -0000.008, -0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2032, '+0000.008', +0000.008, 0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2033, '0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2034, '-0000.008e3', -0000.008e3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2035, '+0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2036, '08.5e-3', 08.5e-3, 0.0085, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2037, '-08.5e-3', -08.5e-3, -0.0085, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (2038, '+08.5e-3', 08.5e-3, 0.0085, 'Floating point should work...');
+
+INSERT INTO t_leading_zeroes_f VALUES (2063, '0x0abcdP1', 0x0abcdP1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2064, '0x0abcdP+1', 0x0abcdP+1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2065, '0x0abcdP-1', 0x0abcdP-1, 21990.5, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2066, '0x0abcdP01', 0x0abcdP01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2067, '0x0abcdP+01', 0x0abcdP+01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2068, '0x0abcdP-01', 0x0abcdP-01, 21990.5, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (2069, '0x01P-01', 0x01P-01, 0.5, 'Hex should be parsed');
 
--- Floats don't go via the weird octal path:
-CREATE TABLE t_leading_zeroes_f(id INTEGER, input String, val Float32, expected Float32) ENGINE=MergeTree ORDER BY id;
-INSERT INTO t_leading_zeroes_f VALUES (1, '00000', 00000, 0), (2, '00009.00009', 00009.00009, 9.00009), (3, '00009e9', 00009e9, 9e9), (4, '00009e09', 00009e09, 9e9), (5, '00009e0009', 00009e0009, 9e9);
-INSERT INTO t_leading_zeroes_f VALUES (6, '-00000', -00000.1, -0.1), (7, '-00009.00009', -00009.00009, -9.00009), (8, '-00009e9', -00009e9, -9e9), (9, '-00009e09', -00009e09, -9e9), (10, '-00009e0009', -00009e0009, -9e9);
-INSERT INTO t_leading_zeroes_f VALUES (11, '+00000', +00000., 0), (12, '+00009.00009', +00009.00009, 9.00009), (13, '+00009e9', +00009e9, 9e9), (14, '+00009e09', +00009e09, 9e9), (15, '+00009e0009', +00009e0009, 9e9);
 -- Coincidentally, the following result in 9 rather than 9e9 because of readFloatTextFastImpl
 -- using readUIntTextUpToNSignificantDigits<4>(exponent, in)
--- INSERT INTO t_leading_zeroes_f VALUES (100, '00009e00009', 00009e00009, 9e9), (101, '-00009e00009', -00009e00009, -9e9), (102, '+00009e00009', +00009e00009, 9e9)
+-- INSERT INTO t_leading_zeroes_f VALUES (2070, '00009e00009', 00009e00009, 9e9, '???');
 
-SELECT 'Leading zeroes into Float32';
+-- Binary should not work with input_format_values_interpret_expressions = 0
+
+INSERT INTO t_leading_zeroes_f VALUES (2050, '0b10000', 0b10000, 16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+INSERT INTO t_leading_zeroes_f VALUES (2051, '-0b10000', -0b10000, -16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+INSERT INTO t_leading_zeroes_f VALUES (2052, '+0b10000', +0b10000, 16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+
+INSERT INTO t_leading_zeroes VALUES (1050, '0b10000', 0b10000, 16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+INSERT INTO t_leading_zeroes VALUES (1051, '-0b10000', -0b10000, -16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+INSERT INTO t_leading_zeroes VALUES (1052, '+0b10000', +0b10000, 16, 'Binary should not be parsed'); -- { clientError SYNTAX_ERROR }
+
+
+
+SET input_format_values_interpret_expressions = 1;
+
+INSERT INTO t_leading_zeroes VALUES (11000, '0', 0, 0, 'Single zero');
+INSERT INTO t_leading_zeroes VALUES (11001, '00', 00, 0, 'Double zero');
+INSERT INTO t_leading_zeroes VALUES (11002, '000000000000000', 000000000000000, 0, 'Mutliple redundant zeroes');
+INSERT INTO t_leading_zeroes VALUES (11003, '01', 01, 1, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (11004, '08', 08, 8, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (11005, '0100', 0100, 100, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes VALUES (11006, '0000000000100', 0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes');
+
+INSERT INTO t_leading_zeroes VALUES (11010, '-0', -0, 0, 'Single zero negative');
+INSERT INTO t_leading_zeroes VALUES (11011, '-00', -00, 0, 'Double zero negative');
+INSERT INTO t_leading_zeroes VALUES (11012, '-000000000000000', -000000000000000, 0, 'Mutliple redundant zeroes negative');
+INSERT INTO t_leading_zeroes VALUES (11013, '-01', -01, -1, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (11014, '-08', -08, -8, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (11015, '-0100', -0100, -100, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes VALUES (11016, '-0000000000100', -0000000000100, -100, 'Octal like, interpret as decimal, multiple leading zeroes negative');
+
+INSERT INTO t_leading_zeroes VALUES (11020, '+0', +0, 0, 'Single zero positive');
+INSERT INTO t_leading_zeroes VALUES (11021, '+00', +00, 0, 'Double zero negpositiveative');
+INSERT INTO t_leading_zeroes VALUES (11022, '+000000000000000', +000000000000000, 0, 'Mutliple redundant zeroes positive');
+INSERT INTO t_leading_zeroes VALUES (11023, '+01', +01, 1, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (11024, '+08', +08, 8, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (11025, '+0100', +0100, 100, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes VALUES (11026, '+0000000000100', +0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes positive');
+
+INSERT INTO t_leading_zeroes VALUES (11030, '0000.008', 0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11031, '-0000.008', -0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11032, '+0000.008', +0000.008, 0, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11033, '0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11034, '-0000.008e3', -0000.008e3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11035, '+0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11036, '08000.008e-3', 08000.008e-3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11037, '-08000.008e-3', -08000.008e-3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes VALUES (11038, '+08000.008e-3', 08000.008e-3, 8, 'Floating point should work...');
+
+INSERT INTO t_leading_zeroes VALUES (11050, '0b10000', 0b10000, 16, 'Binary should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11051, '-0b10000', -0b10000, -16, 'Binary should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11052, '+0b10000', +0b10000, 16, 'Binary should be parsed');
+
+INSERT INTO t_leading_zeroes VALUES (11060, '0x0abcd', 0x0abcd, 43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11061, '-0x0abcd', -0x0abcd, -43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11062, '+0x0abcd', +0x0abcd, 43981, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11063, '0x0abcdP1', 0x0abcdP1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11064, '0x0abcdP+1', 0x0abcdP+1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11065, '0x0abcdP-1', 0x0abcdP-1, 21990, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11066, '0x0abcdP01', 0x0abcdP01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11067, '0x0abcdP+01', 0x0abcdP+01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes VALUES (11068, '0x0abcdP-01', 0x0abcdP-01, 21990, 'Hex should be parsed');
+
+-- Floating point numbers go via readFloatTextFastImpl - so should not be affected
+
+INSERT INTO t_leading_zeroes_f VALUES (12000, '0', 0, 0, 'Single zero');
+INSERT INTO t_leading_zeroes_f VALUES (12001, '00', 00, 0, 'Double zero');
+INSERT INTO t_leading_zeroes_f VALUES (12002, '000000000000000', 000000000000000, 0, 'Mutliple redundant zeroes');
+INSERT INTO t_leading_zeroes_f VALUES (12003, '01', 01, 1, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (12004, '08', 08, 8, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (12005, '0100', 0100, 100, 'Octal like, interpret as decimal');
+INSERT INTO t_leading_zeroes_f VALUES (12006, '0000000000100', 0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes');
+
+-- Float negative zero is machine/context dependent
+-- INSERT INTO t_leading_zeroes_f VALUES (12010, '-0', -0, 0, 'Single zero negative');
+-- INSERT INTO t_leading_zeroes_f VALUES (12011, '-00', -00, 0, 'Double zero negative');
+-- INSERT INTO t_leading_zeroes_f VALUES (12012, '-000000000000000', -000000000000000, 0, 'Mutliple redundant zeroes negative');
+INSERT INTO t_leading_zeroes_f VALUES (12013, '-01', -01, -1, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (12014, '-08', -08, -8, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (12015, '-0100', -0100, -100, 'Octal like, interpret as decimal negative');
+INSERT INTO t_leading_zeroes_f VALUES (12016, '-0000000000100', -0000000000100, -100, 'Octal like, interpret as decimal, multiple leading zeroes negative');
+
+INSERT INTO t_leading_zeroes_f VALUES (12020, '+0', +0, 0, 'Single zero positive');
+INSERT INTO t_leading_zeroes_f VALUES (12021, '+00', +00, 0, 'Double zero negpositiveative');
+INSERT INTO t_leading_zeroes_f VALUES (12022, '+000000000000000', +000000000000000, 0, 'Mutliple redundant zeroes positive');
+INSERT INTO t_leading_zeroes_f VALUES (12023, '+01', +01, 1, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (12024, '+08', +08, 8, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (12025, '+0100', +0100, 100, 'Octal like, interpret as decimal positive');
+INSERT INTO t_leading_zeroes_f VALUES (12026, '+0000000000100', +0000000000100, 100, 'Octal like, interpret as decimal, multiple leading zeroes positive');
+
+INSERT INTO t_leading_zeroes_f VALUES (12030, '0000.008', 0000.008, 0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12031, '-0000.008', -0000.008, -0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12032, '+0000.008', +0000.008, 0.008, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12033, '0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12034, '-0000.008e3', -0000.008e3, -8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12035, '+0000.008e3', 0000.008e3, 8, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12036, '08.5e-3', 08.5e-3, 0.0085, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12037, '-08.5e-3', -08.5e-3, -0.0085, 'Floating point should work...');
+INSERT INTO t_leading_zeroes_f VALUES (12038, '+08.5e-3', 08.5e-3, 0.0085, 'Floating point should work...');
+
+INSERT INTO t_leading_zeroes_f VALUES (12050, '0b10000', 0b10000, 16, 'Binary should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12051, '-0b10000', -0b10000, -16, 'Binary should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12052, '+0b10000', +0b10000, 16, 'Binary should be parsed');
+
+INSERT INTO t_leading_zeroes_f VALUES (12063, '0x0abcdP1', 0x0abcdP1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12064, '0x0abcdP+1', 0x0abcdP+1, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12065, '0x0abcdP-1', 0x0abcdP-1, 21990.5, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12066, '0x0abcdP01', 0x0abcdP01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12067, '0x0abcdP+01', 0x0abcdP+01, 87962, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12068, '0x0abcdP-01', 0x0abcdP-01, 21990.5, 'Hex should be parsed');
+INSERT INTO t_leading_zeroes_f VALUES (12069, '0x01P-01', 0x01P-01, 0.5, 'Hex should be parsed');
+
+SELECT 'Leading zeroes into Int64 (1XXX without input_format_values_interpret_expressions and 1XXXX with)';
+SELECT t.val == t.expected AS ok, * FROM t_leading_zeroes t ORDER BY id;
+
+
+SELECT 'Leading zeroes into Float64 (2XXX without input_format_values_interpret_expressions and 2XXXX with)';
 SELECT t.val == t.expected AS ok, * FROM t_leading_zeroes_f t ORDER BY id;
 
+
 DROP TABLE IF EXISTS t_leading_zeroes;
-DROP TABLE IF EXISTS t_leading_zeroes_f;
\ No newline at end of file
+DROP TABLE IF EXISTS t_leading_zeroes_f;
diff --git a/tests/queries/0_stateless/02896_max_execution_time_with_break_overflow_mode.sql b/tests/queries/0_stateless/02896_max_execution_time_with_break_overflow_mode.sql
index 439b8b3f032..ec86a66c7dd 100644
--- a/tests/queries/0_stateless/02896_max_execution_time_with_break_overflow_mode.sql
+++ b/tests/queries/0_stateless/02896_max_execution_time_with_break_overflow_mode.sql
@@ -1,10 +1,10 @@
 -- Tags: no-fasttest
 
 -- Query stops after timeout without an error
-SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, max_execution_time=13, timeout_overflow_mode='break' FORMAT Null;
+SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, max_execution_time=2, timeout_overflow_mode='break' FORMAT Null;
 
--- Query returns an error when runtime is estimated after 10 sec of execution
-SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, max_execution_time=13, timeout_overflow_mode='throw' FORMAT Null; -- { serverError TOO_SLOW }
+-- Query returns an error when runtime is estimated after timeout_before_checking_execution_speed passed
+SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, timeout_before_checking_execution_speed=1, max_estimated_execution_time=2, timeout_overflow_mode='throw' FORMAT Null; -- { serverError TOO_SLOW }
 
 -- Query returns timeout error before its full execution time is estimated
-SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, max_execution_time=2, timeout_overflow_mode='throw' FORMAT Null; -- { serverError TIMEOUT_EXCEEDED }
+SELECT * FROM numbers(100000000) SETTINGS max_block_size=1, timeout_before_checking_execution_speed=1, max_execution_time=2, timeout_overflow_mode='throw' FORMAT Null; -- { serverError TIMEOUT_EXCEEDED }
diff --git a/tests/queries/0_stateless/02896_union_distinct_http_format.reference b/tests/queries/0_stateless/02896_union_distinct_http_format.reference
index 3a68ab6dc9f..406c89021c1 100644
--- a/tests/queries/0_stateless/02896_union_distinct_http_format.reference
+++ b/tests/queries/0_stateless/02896_union_distinct_http_format.reference
@@ -1,7 +1,7 @@
-┌─1─�
-│ 1 │
-└───┘
-┌─a─�
-│ 1 │
-│ 2 │
-└───┘
+   ┌─1─�
+1. │ 1 │
+   └───┘
+   ┌─a─�
+1. │ 1 │
+2. │ 2 │
+   └───┘
diff --git a/tests/queries/0_stateless/02896_union_distinct_http_format.sh b/tests/queries/0_stateless/02896_union_distinct_http_format.sh
index bb35800e39d..9426321e62f 100755
--- a/tests/queries/0_stateless/02896_union_distinct_http_format.sh
+++ b/tests/queries/0_stateless/02896_union_distinct_http_format.sh
@@ -4,5 +4,5 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
-curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT 1 UNION DISTINCT SELECT 1 FORMAT PrettyCompactMonoBlock'
-curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT * FROM (SELECT 1 as a UNION DISTINCT SELECT 2 as a) ORDER BY a FORMAT PrettyCompactMonoBlock'
+curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT 1 UNION DISTINCT SELECT 1 SETTINGS output_format_pretty_color=1 FORMAT PrettyCompactMonoBlock'
+curl -d@- -sS "${CLICKHOUSE_URL}" <<< 'SELECT * FROM (SELECT 1 as a UNION DISTINCT SELECT 2 as a) ORDER BY a SETTINGS output_format_pretty_color=1 FORMAT PrettyCompactMonoBlock'
diff --git a/tests/queries/0_stateless/02897_alter_partition_parameters.reference b/tests/queries/0_stateless/02897_alter_partition_parameters.reference
index bc6ff2b709c..d4b70c58ae5 100644
--- a/tests/queries/0_stateless/02897_alter_partition_parameters.reference
+++ b/tests/queries/0_stateless/02897_alter_partition_parameters.reference
@@ -7,3 +7,8 @@
 0
 0
 0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/02897_alter_partition_parameters.sql b/tests/queries/0_stateless/02897_alter_partition_parameters.sql
index 62ceb9d9768..0be7308ed1a 100644
--- a/tests/queries/0_stateless/02897_alter_partition_parameters.sql
+++ b/tests/queries/0_stateless/02897_alter_partition_parameters.sql
@@ -10,6 +10,24 @@ PARTITION BY toMonday(EventDate);
 
 INSERT INTO test VALUES(toDate('2023-10-09'));
 
+ALTER TABLE test DROP PARTITION ('2023-10-09');
+
+SELECT count() FROM test;
+
+INSERT INTO test VALUES(toDate('2023-10-09'));
+
+ALTER TABLE test DROP PARTITION (('2023-10-09'));
+
+SELECT count() FROM test;
+
+INSERT INTO test VALUES(toDate('2023-10-09'));
+
+ALTER TABLE test DROP PARTITION '2023-10-09';
+
+SELECT count() FROM test;
+
+INSERT INTO test VALUES(toDate('2023-10-09'));
+
 SET param_partition='2023-10-09';
 
 ALTER TABLE test DROP PARTITION {partition:String};
@@ -51,6 +69,17 @@ ENGINE = MergeTree
 ORDER BY tuple()
 PARTITION BY (a * b, b * b);
 
+INSERT INTO test2 VALUES(1, 2);
+
+ALTER TABLE test2 DROP PARTITION tuple(2, 4);
+
+SELECT count() FROM test2;
+
+INSERT INTO test2 VALUES(1, 2);
+
+ALTER TABLE test2 DROP PARTITION (2, 4);
+
+SELECT count() FROM test2;
 
 INSERT INTO test2 VALUES(1, 2);
 
diff --git a/tests/queries/0_stateless/02899_indexing_by_space_filling_curves.sql b/tests/queries/0_stateless/02899_indexing_by_space_filling_curves.sql
index c7325b2478d..a3989039f50 100644
--- a/tests/queries/0_stateless/02899_indexing_by_space_filling_curves.sql
+++ b/tests/queries/0_stateless/02899_indexing_by_space_filling_curves.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS test;
 
 CREATE TABLE test (x UInt32, y UInt32) ENGINE = MergeTree ORDER BY mortonEncode(x, y) SETTINGS index_granularity = 8192, index_granularity_bytes = '1Mi';
diff --git a/tests/queries/0_stateless/02899_use_default_format_on_http_exception.reference b/tests/queries/0_stateless/02899_use_default_format_on_http_exception.reference
index a943df06764..624bcf80c71 100644
--- a/tests/queries/0_stateless/02899_use_default_format_on_http_exception.reference
+++ b/tests/queries/0_stateless/02899_use_default_format_on_http_exception.reference
@@ -1,25 +1,47 @@
+SELECT missing column WITH default_format=JSON
+404NotFound
+Content-Type:application/json;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:47
+"exception":"Code:47.
+
 INSERT WITH default_format=JSON
-Content-Type:application/json;charset=UTF-8
-"exception":"Code:62.
+501NotImplemented
+Content-Type:application/json;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+"exception":"Code:48.
 
 INSERT WITH default_format=XML
-Content-Type:application/xml;charset=UTF-8
-<exception>Code:62.DB::Ex---tion:
+501NotImplemented
+Content-Type:application/xml;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+<exception>Code:48.DB::Ex---tion:
 
 INSERT WITH default_format=BADFORMAT
-Content-Type:text/plain;charset=UTF-8
-X-ClickHouse-Ex---tion-Code:62
-Code:62.DB::Ex---tion:
+501NotImplemented
+Content-Type:text/plain;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+Code:48.DB::Ex---tion:
+
+SELECT missing column WITH X-ClickHouse-Format: JSON
+404NotFound
+Content-Type:application/json;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:47
+"exception":"Code:47.
 
 INSERT WITH X-ClickHouse-Format: JSON
-Content-Type:application/json;charset=UTF-8
-"exception":"Code:62.
+501NotImplemented
+Content-Type:application/json;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+"exception":"Code:48.
 
 INSERT WITH X-ClickHouse-Format: XML
-Content-Type:application/xml;charset=UTF-8
-<exception>Code:62.DB::Ex---tion:
+501NotImplemented
+Content-Type:application/xml;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+<exception>Code:48.DB::Ex---tion:
 
 INSERT WITH X-ClickHouse-Format: BADFORMAT
-Content-Type:text/plain;charset=UTF-8
-X-ClickHouse-Ex---tion-Code:62
-Code:62.DB::Ex---tion:
+501NotImplemented
+Content-Type:text/plain;charset=UTF-8
+X-ClickHouse-Ex---tion-Code:48
+Code:48.DB::Ex---tion:
diff --git a/tests/queries/0_stateless/02899_use_default_format_on_http_exception.sh b/tests/queries/0_stateless/02899_use_default_format_on_http_exception.sh
index f92ab7db4fb..5e91fa13e91 100755
--- a/tests/queries/0_stateless/02899_use_default_format_on_http_exception.sh
+++ b/tests/queries/0_stateless/02899_use_default_format_on_http_exception.sh
@@ -6,28 +6,44 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 
 CH_URL="$CLICKHOUSE_URL&http_write_exception_in_output_format=1"
 
+echo "SELECT missing column WITH default_format=JSON"
+echo "SELECT x FROM system.numbers LIMIT 1;"\
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=JSON" -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
+echo ""
 echo "INSERT WITH default_format=JSON"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=JSON" -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=JSON" -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 echo ""
 echo "INSERT WITH default_format=XML"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=XML" -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=XML" -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 echo ""
 echo "INSERT WITH default_format=BADFORMAT"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=BADFORMAT" -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}&default_format=BADFORMAT" -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 
 
+echo ""
+echo "SELECT missing column WITH X-ClickHouse-Format: JSON"
+echo "SELECT x FROM system.numbers LIMIT 1;"\
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: JSON' -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 echo ""
 echo "INSERT WITH X-ClickHouse-Format: JSON"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: JSON' -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: JSON' -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 echo ""
 echo "INSERT WITH X-ClickHouse-Format: XML"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: XML' -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: XML' -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
 echo ""
 echo "INSERT WITH X-ClickHouse-Format: BADFORMAT"
 echo "INSERT INTO system.numbers Select * from numbers(10);" \
-  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: BADFORMAT' -i | grep 'xception\|Content-Type' | sed 's/Exception/Ex---tion/' | awk '{ print $1 $2 $3 }'
+  | ${CLICKHOUSE_CURL} -sS "${CH_URL}" -H 'X-ClickHouse-Format: BADFORMAT' -i --data-binary @- \
+  | grep 'HTTP/1.1\|xception\|Content-Type' | sed 's/Exception/Ex---tion/;s/HTTP\/1.1//;s/\r//' | awk '{ print $1 $2 $3 }'
diff --git a/tests/queries/0_stateless/02900_union_schema_inference_mode.sh b/tests/queries/0_stateless/02900_union_schema_inference_mode.sh
index dc0dd8ae1f4..a0fdb5276e0 100755
--- a/tests/queries/0_stateless/02900_union_schema_inference_mode.sh
+++ b/tests/queries/0_stateless/02900_union_schema_inference_mode.sh
@@ -39,13 +39,13 @@ desc file('$CLICKHOUSE_TEST_UNIQUE_NAME/archive.tar :: data{1,2,3}.jsonl');
 "
 
 echo 'Error' > $CLICKHOUSE_TEST_UNIQUE_NAME/data4.jsonl
-$CLICKHOUSE_LOCAL -q "desc file('$CLICKHOUSE_TEST_UNIQUE_NAME/data{1,2,3,4}.jsonl') settings schema_inference_mode='union'" 2>&1 | grep -c -F "Cannot extract table structure"
+$CLICKHOUSE_LOCAL -q "desc file('$CLICKHOUSE_TEST_UNIQUE_NAME/data{1,2,3,4}.jsonl') settings schema_inference_mode='union'" 2>&1 | grep -c -F "CANNOT_EXTRACT_TABLE_STRUCTURE"
 
 $CLICKHOUSE_LOCAL -nm -q "
 set schema_inference_mode = 'union';
 desc file('$CLICKHOUSE_TEST_UNIQUE_NAME/data{2,3}.jsonl');
 desc file('$CLICKHOUSE_TEST_UNIQUE_NAME/data{1,2,3,4}.jsonl');
-" 2>&1 | grep -c -F "Cannot extract table structure"
+" 2>&1 | grep -c -F "CANNOT_EXTRACT_TABLE_STRUCTURE"
 
 echo 42 > $CLICKHOUSE_TEST_UNIQUE_NAME/data1.csv
 echo 42, 43 > $CLICKHOUSE_TEST_UNIQUE_NAME/data2.csv
diff --git a/tests/queries/0_stateless/02901_parallel_replicas_rollup.reference b/tests/queries/0_stateless/02901_parallel_replicas_rollup.reference
index 29004fde9d4..c7f78cd74c2 100644
--- a/tests/queries/0_stateless/02901_parallel_replicas_rollup.reference
+++ b/tests/queries/0_stateless/02901_parallel_replicas_rollup.reference
@@ -1,5 +1,7 @@
 1
 02901_parallel_replicas_rollup-default	Used parallel replicas: true
+Distributed query with analyzer
+1
 0	0	0	6
 2019	0	0	2
 2019	1	0	2
diff --git a/tests/queries/0_stateless/02901_parallel_replicas_rollup.sh b/tests/queries/0_stateless/02901_parallel_replicas_rollup.sh
index 029b4d07ee2..def813c17b4 100755
--- a/tests/queries/0_stateless/02901_parallel_replicas_rollup.sh
+++ b/tests/queries/0_stateless/02901_parallel_replicas_rollup.sh
@@ -39,6 +39,11 @@ $CLICKHOUSE_CLIENT \
   ORDER BY max((SELECT 1 WHERE 0));
 ";
 were_parallel_replicas_used $query_id
+
+# It was a bug in analyzer distributed header.
+echo "Distributed query with analyzer"
+$CLICKHOUSE_CLIENT --query "SELECT 1 FROM remote('127.0.0.{2,3}', currentDatabase(), nested) GROUP BY 1 WITH ROLLUP ORDER BY max((SELECT 1 WHERE 0))"
+
 $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS nested"
 
 
diff --git a/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh b/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh
index 095239954f4..5065da371a8 100755
--- a/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh
+++ b/tests/queries/0_stateless/02903_rmt_retriable_merge_exception.sh
@@ -10,7 +10,7 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # (i.e. "No active replica has part X or covering part")
 # does not appears as errors (level=Error), only as info message (level=Information).
 
-cluster=default
+cluster=test_shard_localhost
 if [[ $($CLICKHOUSE_CLIENT -q "select count()>0 from system.clusters where cluster = 'test_cluster_database_replicated'") = 1 ]]; then
     cluster=test_cluster_database_replicated
 fi
diff --git a/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.reference b/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.reference
index fc7383b32bc..0694f895e38 100644
--- a/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.reference
+++ b/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.reference
@@ -1,8 +1,8 @@
-CREATE TABLE default.dist_monitor_batch_inserts\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS monitor_batch_inserts = 1
-CREATE TABLE default.dist_monitor_split_batch_on_failure\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS monitor_split_batch_on_failure = 1
-CREATE TABLE default.dist_monitor_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS monitor_sleep_time_ms = 1
-CREATE TABLE default.dist_monitor_max_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS monitor_max_sleep_time_ms = 1
-CREATE TABLE default.dist_background_insert_batch\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS background_insert_batch = 1
-CREATE TABLE default.dist_background_insert_split_batch_on_failure\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS background_insert_split_batch_on_failure = 1
-CREATE TABLE default.dist_background_insert_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS background_insert_sleep_time_ms = 1
-CREATE TABLE default.dist_background_insert_max_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'default\', \'system\', \'one\')\nSETTINGS background_insert_max_sleep_time_ms = 1
+CREATE TABLE default.dist_monitor_batch_inserts\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS monitor_batch_inserts = 1
+CREATE TABLE default.dist_monitor_split_batch_on_failure\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS monitor_split_batch_on_failure = 1
+CREATE TABLE default.dist_monitor_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS monitor_sleep_time_ms = 1
+CREATE TABLE default.dist_monitor_max_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS monitor_max_sleep_time_ms = 1
+CREATE TABLE default.dist_background_insert_batch\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS background_insert_batch = 1
+CREATE TABLE default.dist_background_insert_split_batch_on_failure\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS background_insert_split_batch_on_failure = 1
+CREATE TABLE default.dist_background_insert_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS background_insert_sleep_time_ms = 1
+CREATE TABLE default.dist_background_insert_max_sleep_time_ms\n(\n    `dummy` UInt8\n)\nENGINE = Distributed(\'test_shard_localhost\', \'system\', \'one\')\nSETTINGS background_insert_max_sleep_time_ms = 1
diff --git a/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.sql.j2 b/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.sql.j2
index 3116f0f5973..20e848baa88 100644
--- a/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.sql.j2
+++ b/tests/queries/0_stateless/02904_distributed_settings_background_insert_compatibility.sql.j2
@@ -10,13 +10,13 @@
     'background_insert_max_sleep_time_ms',
 ] %}
 drop table if exists dist_{{ table_setting }};
-create table dist_{{ table_setting }} as system.one engine=Distributed(default, system, one) settings {{ table_setting }}=1;
+create table dist_{{ table_setting }} as system.one engine=Distributed(test_shard_localhost, system, one) settings {{ table_setting }}=1;
 show create dist_{{ table_setting }};
 drop table dist_{{ table_setting }};
 {% endfor %}
 
 create table data (key Int) engine=Null();
-create table dist (key Int) engine=Distributed(default, currentDatabase(), data, key);
+create table dist (key Int) engine=Distributed(test_shard_localhost, currentDatabase(), data, key);
 {% for query_setting in [
     'distributed_directory_monitor_sleep_time_ms',
     'distributed_directory_monitor_max_sleep_time_ms',
diff --git a/tests/queries/0_stateless/02907_suggestions_readonly_user.expect b/tests/queries/0_stateless/02907_suggestions_readonly_user.expect
index e329c8ee376..025ccbfbae8 100755
--- a/tests/queries/0_stateless/02907_suggestions_readonly_user.expect
+++ b/tests/queries/0_stateless/02907_suggestions_readonly_user.expect
@@ -3,8 +3,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02908_many_requests_to_system_replicas.reference b/tests/queries/0_stateless/02908_many_requests_to_system_replicas.reference
index af0e50ec332..f376bb87044 100644
--- a/tests/queries/0_stateless/02908_many_requests_to_system_replicas.reference
+++ b/tests/queries/0_stateless/02908_many_requests_to_system_replicas.reference
@@ -1,5 +1,10 @@
 Creating 300 tables
-Making making 200 requests to system.replicas
+900	1	1
+900	1	1
+900	1	1
+900	1	1
+Making 200 requests to system.replicas
 Query system.replicas while waiting for other concurrent requests to finish
 0
 900
+1
diff --git a/tests/queries/0_stateless/02908_many_requests_to_system_replicas.sh b/tests/queries/0_stateless/02908_many_requests_to_system_replicas.sh
index f93175529c0..144831a2cdc 100755
--- a/tests/queries/0_stateless/02908_many_requests_to_system_replicas.sh
+++ b/tests/queries/0_stateless/02908_many_requests_to_system_replicas.sh
@@ -12,38 +12,66 @@ CONCURRENCY=200
 
 echo "Creating $NUM_TABLES tables"
 
+function get_done_or_die_trying()
+{
+  # Sometimes curl produces errors like 'Recv failure: Connection reset by peer' and fails test, let's add a little bit of retries
+  for _ in $(seq 1 10)
+  do
+    curl "$CLICKHOUSE_URL" --silent --fail --show-error --data "$1" &>/dev/null && return
+  done
+
+  echo "Cannot successfully make request"
+  exit 1
+}
+
 function init_table()
 {
     set -e
     i=$1
-    curl $CLICKHOUSE_URL --silent --fail --show-error --data "CREATE TABLE test_02908_r1_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r1') ORDER BY tuple()" 2>&1
-    curl $CLICKHOUSE_URL --silent --fail --show-error --data "CREATE TABLE test_02908_r2_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r2') ORDER BY tuple()" 2>&1
-    curl $CLICKHOUSE_URL --silent --fail --show-error --data "CREATE TABLE test_02908_r3_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r3') ORDER BY tuple()" 2>&1
+    get_done_or_die_trying "CREATE TABLE test_02908_r1_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r1') ORDER BY tuple()"
+    get_done_or_die_trying "CREATE TABLE test_02908_r2_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r2') ORDER BY tuple()"
+    get_done_or_die_trying "CREATE TABLE test_02908_r3_$i (a UInt64) ENGINE=ReplicatedMergeTree('/02908/{database}/test_$i', 'r3') ORDER BY tuple()"
 
-    curl $CLICKHOUSE_URL --silent --fail --show-error --data "INSERT INTO test_02908_r1_$i  SELECT rand64() FROM numbers(5);" 2>&1
+    get_done_or_die_trying "INSERT INTO test_02908_r1_$i  SELECT rand64() FROM numbers(5);"
 }
 
 export init_table;
 
-for i in `seq 1 $NUM_TABLES`;
+for i in $(seq 1 $NUM_TABLES)
 do
-    init_table $i &
+    init_table "$i" &
 done
 
 wait;
 
 
-echo "Making making $CONCURRENCY requests to system.replicas"
+# Check results with different max_block_size
+$CLICKHOUSE_CLIENT -q 'SELECT count(), sum(total_replicas) >= 2700, sum(active_replicas) >= 2700 FROM system.replicas WHERE database=currentDatabase()'
+$CLICKHOUSE_CLIENT -q 'SELECT count(), sum(total_replicas) >= 2700, sum(active_replicas) >= 2700 FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=1'
+$CLICKHOUSE_CLIENT -q 'SELECT count(), sum(total_replicas) >= 2700, sum(active_replicas) >= 2700 FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=77'
+$CLICKHOUSE_CLIENT -q 'SELECT count(), sum(total_replicas) >= 2700, sum(active_replicas) >= 2700 FROM system.replicas WHERE database=currentDatabase() SETTINGS max_block_size=11111'
 
-for i in `seq 1 $CONCURRENCY`;
+
+echo "Making $CONCURRENCY requests to system.replicas"
+
+for i in $(seq 1 $CONCURRENCY)
 do
-    curl $CLICKHOUSE_URL --silent --fail --show-error --data "SELECT * FROM system.replicas WHERE database=currentDatabase() FORMAT Null;" 2>&1 || echo "query $i failed" &
+    curl "$CLICKHOUSE_URL" --silent --fail --show-error --data "SELECT * FROM system.replicas WHERE database=currentDatabase() FORMAT Null SETTINGS log_comment='02908_many_requests';" &>/dev/null &
 done
 
 echo "Query system.replicas while waiting for other concurrent requests to finish"
 # lost_part_count column is read from ZooKeeper
-curl $CLICKHOUSE_URL --silent --fail --show-error --data "SELECT sum(lost_part_count) FROM system.replicas WHERE database=currentDatabase();" 2>&1;
+curl "$CLICKHOUSE_URL" --silent --fail --show-error --data "SELECT sum(lost_part_count) FROM system.replicas WHERE database=currentDatabase();" 2>&1;
 # is_leader column is filled without ZooKeeper
-curl $CLICKHOUSE_URL --silent --fail --show-error --data "SELECT sum(is_leader) FROM system.replicas WHERE database=currentDatabase();" 2>&1;
+curl "$CLICKHOUSE_URL" --silent --fail --show-error --data "SELECT sum(is_leader) FROM system.replicas WHERE database=currentDatabase();" 2>&1;
 
 wait;
+
+$CLICKHOUSE_CLIENT -nq "
+SYSTEM FLUSH LOGS;
+
+-- without optimisation there are ~350K zk requests
+SELECT sum(ProfileEvents['ZooKeeperTransactions']) < 30000
+  FROM system.query_log
+ WHERE current_database=currentDatabase() AND log_comment='02908_many_requests';
+"
diff --git a/tests/queries/0_stateless/02911_support_alias_column_in_indices.reference b/tests/queries/0_stateless/02911_support_alias_column_in_indices.reference
index 883966ce6b5..b867a31dcc3 100644
--- a/tests/queries/0_stateless/02911_support_alias_column_in_indices.reference
+++ b/tests/queries/0_stateless/02911_support_alias_column_in_indices.reference
@@ -14,13 +14,13 @@ Expression ((Projection + Before ORDER BY))
         Parts: 1/1
         Granules: 1/1
 Expression ((Project names + Projection))
-  Filter ((WHERE + Change column names to column identifiers))
+  Filter ((WHERE + (Change column names to column identifiers + Compute alias columns)))
     ReadFromMergeTree (02911_support_alias_column_in_indices.test1)
     Indexes:
       PrimaryKey
         Keys: 
           c
-        Condition: (_CAST(plus(c, \'UInt64\'), 1) in [11, +Inf))
+        Condition: (plus(c, 1) in [11, +Inf))
         Parts: 1/2
         Granules: 1/2
       Skip
@@ -44,12 +44,17 @@ Expression ((Projection + Before ORDER BY))
         Parts: 1/1
         Granules: 1/1
 Expression ((Project names + Projection))
-  Filter ((WHERE + Change column names to column identifiers))
+  Filter ((WHERE + (Change column names to column identifiers + Compute alias columns)))
     ReadFromMergeTree (02911_support_alias_column_in_indices.test2)
     Indexes:
       PrimaryKey
         Keys: 
           c
-        Condition: (_CAST(plus(_CAST(plus(c, \'UInt64\'), 1), \'UInt64\'), 1) in [16, +Inf))
+        Condition: (plus(plus(c, 1), 1) in [16, +Inf))
         Parts: 1/2
         Granules: 1/2
+      Skip
+        Name: i
+        Description: minmax GRANULARITY 1
+        Parts: 1/1
+        Granules: 1/1
diff --git a/tests/queries/0_stateless/02916_move_partition_inactive_replica.reference b/tests/queries/0_stateless/02916_move_partition_inactive_replica.reference
new file mode 100644
index 00000000000..361a0d1e9bb
--- /dev/null
+++ b/tests/queries/0_stateless/02916_move_partition_inactive_replica.reference
@@ -0,0 +1,4 @@
+all_0_1_1	1
+all_2_3_1	1
+0
+40	1580
diff --git a/tests/queries/0_stateless/02916_move_partition_inactive_replica.sql b/tests/queries/0_stateless/02916_move_partition_inactive_replica.sql
new file mode 100644
index 00000000000..b0699539ac1
--- /dev/null
+++ b/tests/queries/0_stateless/02916_move_partition_inactive_replica.sql
@@ -0,0 +1,47 @@
+-- Tags: no-parallel
+
+create database if not exists shard_0;
+create database if not exists shard_1;
+
+drop table if exists shard_0.from_1;
+drop table if exists shard_1.from_1;
+drop table if exists shard_0.to;
+drop table if exists shard_1.to;
+
+create table shard_0.from_1 (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/from_1_' || currentDatabase(), '0') order by x settings old_parts_lifetime=1, max_cleanup_delay_period=1, cleanup_delay_period=1, shared_merge_tree_disable_merges_and_mutations_assignment=1;
+create table shard_1.from_1 (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/from_1_' || currentDatabase(), '1') order by x settings old_parts_lifetime=1, max_cleanup_delay_period=1, cleanup_delay_period=1, shared_merge_tree_disable_merges_and_mutations_assignment=1;
+
+system stop merges shard_0.from_1;
+system stop merges shard_1.from_1;
+insert into shard_0.from_1 select number + 20 from numbers(10);
+insert into shard_0.from_1 select number + 30 from numbers(10);
+
+insert into shard_0.from_1 select number + 40 from numbers(10);
+insert into shard_0.from_1 select number + 50 from numbers(10);
+
+system sync replica shard_1.from_1;
+
+create table shard_0.to (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/to_' || currentDatabase(), '0') order by x settings old_parts_lifetime=1, max_cleanup_delay_period=1, cleanup_delay_period=1, max_parts_to_merge_at_once=2, shared_merge_tree_disable_merges_and_mutations_assignment=1;
+
+create table shard_1.to (x UInt32) engine = ReplicatedMergeTree('/clickhouse/tables/to_' || currentDatabase(), '1') order by x settings old_parts_lifetime=1, max_cleanup_delay_period=1, cleanup_delay_period=1, max_parts_to_merge_at_once=2;
+
+detach table shard_1.to;
+
+alter table shard_0.from_1 on cluster test_cluster_two_shards_different_databases move partition tuple() to table shard_0.to format Null settings distributed_ddl_output_mode='never_throw', distributed_ddl_task_timeout = 1;
+
+drop table if exists shard_0.from_1;
+drop table if exists shard_1.from_1;
+OPTIMIZE TABLE shard_0.to;
+OPTIMIZE TABLE shard_0.to;
+select name, active from system.parts where database='shard_0' and table='to' and active order by name;
+
+system restart replica shard_0.to;
+
+select sleep(3);
+
+attach table shard_1.to;
+system sync replica shard_1.to;
+select count(), sum(x) from shard_1.to;
+
+drop table if exists shard_0.to;
+drop table if exists shard_1.to;
diff --git a/tests/queries/0_stateless/02916_set_formatting.reference b/tests/queries/0_stateless/02916_set_formatting.reference
index 34ff52365f9..46d30053970 100644
--- a/tests/queries/0_stateless/02916_set_formatting.reference
+++ b/tests/queries/0_stateless/02916_set_formatting.reference
@@ -5,7 +5,7 @@ Row 1:
 statement: CREATE VIEW default.v1
 (
     `v` UInt64
-) AS
-SELECT v
+)
+AS SELECT v
 FROM default.t1
 SETTINGS additional_table_filters = {'default.t1':'s != \'s1%\''}
diff --git a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
index 3f5700b6d63..786a6b3bf25 100644
--- a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
+++ b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
@@ -7,3 +7,6 @@ Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       ReadFromMerge
+        ReadFromMergeTree (default.mt1)
+        ReadFromMergeTree (default.mt2)
+        ReadFromStorage (TinyLog)
diff --git a/tests/queries/0_stateless/02919_ddsketch_quantile.reference b/tests/queries/0_stateless/02919_ddsketch_quantile.reference
new file mode 100644
index 00000000000..9615f717e85
--- /dev/null
+++ b/tests/queries/0_stateless/02919_ddsketch_quantile.reference
@@ -0,0 +1,22 @@
+1
+98.5
+344.02
+83.01
+503.02
+2
+-1.01
+0
+3
+-5.99
+4
+4.01
+5
+1.99
+6
+5.99
+7
+4.01
+8
+139082109.85
+9
+[1799.03]
diff --git a/tests/queries/0_stateless/02919_ddsketch_quantile.sql b/tests/queries/0_stateless/02919_ddsketch_quantile.sql
new file mode 100644
index 00000000000..d98978c117e
--- /dev/null
+++ b/tests/queries/0_stateless/02919_ddsketch_quantile.sql
@@ -0,0 +1,73 @@
+SELECT '1'; -- simple test
+SELECT round(quantileDD(0.01, 0.5)(number), 2) FROM numbers(200);
+SELECT round(quantileDD(0.0001, 0.69)(number), 2) FROM numbers(500);
+SELECT round(quantileDD(0.003, 0.42)(number), 2) FROM numbers(200);
+SELECT round(quantileDD(0.02, 0.99)(number), 2) FROM numbers(500);
+
+SELECT '2'; -- median is close to 0
+SELECT round(quantileDD(0.01, 0.5)(number), 2)
+FROM
+(
+    SELECT arrayJoin([toInt64(number), number - 10]) AS number
+    FROM numbers(0, 10)
+);
+SELECT round(quantileDD(0.01, 0.5)(number - 10), 2) FROM numbers(21);
+
+SELECT '3'; -- all values are negative
+SELECT round(quantileDD(0.01, 0.99)(-number), 2) FROM numbers(1, 500);
+
+SELECT '4'; -- min and max values of integer types (-2^63, 2^63-1)
+SELECT round(quantileDD(0.01, 0.5)(number), 2)
+FROM
+(
+    SELECT arrayJoin([toInt64(number), number - 9223372036854775808, toInt64(number + 9223372036854775798)]) AS number
+    FROM numbers(0, 10)
+);
+
+SELECT '5'; -- min and max values of floating point types
+SELECT round(quantileDD(0.01, 0.42)(number), 2)
+FROM
+(
+    SELECT arrayJoin([toFloat32(number), number - 3.4028235e+38, toFloat32(number + 3.4028235e+38)]) AS number
+    FROM numbers(0, 10)
+);
+
+SELECT '6'; -- denormalized floats
+SELECT round(quantileDD(0.01, 0.69)(number), 2)
+FROM
+(
+    SELECT arrayJoin([toFloat32(number), number - 1.1754944e-38, toFloat32(number + 1.1754944e-38)]) AS number
+    FROM numbers(0, 10)
+);
+
+SELECT '7'; -- NaNs
+SELECT round(quantileDD(0.01, 0.5)(number), 2)
+FROM
+(
+    SELECT arrayJoin([toFloat32(number), NaN * number]) AS number
+    FROM numbers(0, 10)
+);
+
+SELECT '8'; -- sparse sketch
+
+SELECT round(quantileDD(0.01, 0.75)(number), 2)
+FROM
+(
+    SELECT number * 1e7 AS number
+    FROM numbers(20)
+);
+
+SELECT '9'; -- ser/deser
+
+DROP TABLE IF EXISTS `02919_ddsketch_quantile`;
+
+CREATE TABLE `02919_ddsketch_quantile`
+ENGINE = Log AS
+SELECT quantilesDDState(0.001, 0.9)(number) AS sketch
+FROM numbers(1000);
+
+INSERT INTO `02919_ddsketch_quantile` SELECT quantilesDDState(0.001, 0.9)(number + 1000)
+FROM numbers(1000);
+
+SELECT arrayMap(a -> round(a, 2), (quantilesDDMerge(0.001, 0.9)(sketch)))
+FROM `02919_ddsketch_quantile`;
diff --git a/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.reference b/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.reference
index f9c7b26d245..feebf7dbf49 100644
--- a/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.reference
+++ b/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.reference
@@ -1,13 +1,97 @@
+\N
+\N
+[nan,nan]
+\N	[nan,nan]	0	\N
 0
 0
 
 0
+\N
+\N
+
+\N
+[nan,nan]
+[nan,nan]
+
+[nan,nan]
+-- notinhgs:
+\N	Nullable(Nothing)
+0	UInt8
+\N	Nullable(Nothing)
+0	UInt64
+0	UInt64
+0	UInt64
+\N	Nullable(Nothing)
+\N	Nullable(Nothing)
+\N	Nullable(Nothing)
+-- quantile:
+\N
+\N
+\N
+\N
+1
+1
+1
+-- quantiles:
+[nan,nan]
+[nan,nan]
+[nan,nan]
+[nan,nan]
+[1,1]
+[1,1]
+[1,1]
+-- nothing:
+\N
+\N
+\N
+\N
+0
+0
+0
+-- nothing(UInt64):
+0
+0
+0
+0
+0
+0
+0
+-- nothing(Nullable(Nothing)):
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+-- sum:
+\N
+\N
+\N
+\N
+6
+6
+6
+-- count:
+0
+0
+0
+0
+6
+6
+6
 0
 
 0
 0	\N
 
+0	\N
+0	\N
+
 0	\N
 0
 
 0
+\N	\N	[nan,nan]
+
+\N	\N	[nan,nan]
diff --git a/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.sql b/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.sql
index a064c091df0..5b9343c6e13 100644
--- a/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.sql
+++ b/tests/queries/0_stateless/02922_analyzer_aggregate_nothing_type.sql
@@ -1,7 +1,87 @@
-#!/usr/bin/env -S ${HOME}/clickhouse-client --progress --queries-file
 
+select sum(NULL);
+select quantile(0.5)(NULL);
+select quantiles(0.1, 0.2)(NULL :: Nullable(UInt32));
+select quantile(0.5)(NULL), quantiles(0.1, 0.2)(NULL :: Nullable(UInt32)), count(NULL), sum(NULL);
 
 SELECT count(NULL) FROM remote('127.0.0.{1,2}', numbers(3)) GROUP BY number % 2 WITH TOTALS;
+SELECT quantile(0.5)(NULL) FROM remote('127.0.0.{1,2}', numbers(3)) GROUP BY number % 2 WITH TOTALS;
+SELECT quantiles(0.1, 0.2)(NULL :: Nullable(UInt32)) FROM remote('127.0.0.{1,2}', numbers(3)) GROUP BY number % 2 WITH TOTALS;
+
+SELECT '-- notinhgs:';
+SELECT nothing() as n, toTypeName(n);
+SELECT nothing(1) as n, toTypeName(n);
+SELECT nothing(NULL) as n, toTypeName(n);
+SELECT nothingUInt64() as n, toTypeName(n);
+SELECT nothingUInt64(1) as n, toTypeName(n);
+SELECT nothingUInt64(NULL) as n, toTypeName(n);
+SELECT nothingNull() as n, toTypeName(n);
+SELECT nothingNull(1) as n, toTypeName(n);
+SELECT nothingNull(NULL) as n, toTypeName(n);
+
+SELECT '-- quantile:';
+SELECT quantileArray(0.5)([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileArrayIf(0.5)([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileArrayIf(0.5)([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileIfArray(0.5)([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileIfArray(0.5)([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileIfArrayIf(0.5)([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantileIfArrayArray(0.5)([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- quantiles:';
+select quantilesArray(0.5, 0.9)([NULL :: Nullable(UInt64), NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesArrayIf(0.5, 0.9)([NULL :: Nullable(UInt64)], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesArrayIf(0.5, 0.9)([NULL :: Nullable(UInt64)], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesIfArray(0.5, 0.9)([NULL :: Nullable(UInt64), NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesIfArray(0.5, 0.9)([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesIfArrayIf(0.5, 0.9)([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT quantilesIfArrayArray(0.5, 0.9)([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- nothing:';
+SELECT nothingArray([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingArrayIf([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingArrayIf([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingIfArray([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingIfArray([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingIfArrayIf([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingIfArrayArray([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- nothing(UInt64):';
+SELECT nothingUInt64Array([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64ArrayIf([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64ArrayIf([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64IfArray([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64IfArray([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64IfArrayIf([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingUInt64IfArrayArray([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- nothing(Nullable(Nothing)):';
+SELECT nothingNullArray([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullArrayIf([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullArrayIf([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullIfArray([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullIfArray([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullIfArrayIf([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT nothingNullIfArrayArray([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- sum:';
+SELECT sumArray([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumArrayIf([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumArrayIf([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumIfArray([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumIfArray([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumIfArrayIf([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT sumIfArrayArray([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
+SELECT '-- count:';
+SELECT countArray([NULL, NULL]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countArrayIf([NULL], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countArrayIf([NULL], 0) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countIfArray([NULL, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countIfArray([1, NULL], [1, 0]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countIfArrayIf([1, NULL], [1, 0], 1) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+SELECT countIfArrayArray([[1, NULL]], [[1, 0]]) AS x FROM remote('127.0.0.{1,2}', numbers(3));
+
 
 DROP TABLE IF EXISTS t1;
 CREATE TABLE t1 (`n` UInt64) ENGINE = MergeTree ORDER BY tuple();
@@ -18,7 +98,7 @@ SET
 SELECT count(NULL) FROM t1 WITH TOTALS;
 SELECT count(NULL as a), a FROM t1 WITH TOTALS;
 
--- result differs in old and new analyzer:
--- SELECT count(NULL as a), sum(a) FROM t1 WITH TOTALS;
+SELECT count(NULL as a), sum(a) FROM t1 WITH TOTALS;
 
 SELECT uniq(NULL) FROM t1 WITH TOTALS;
+SELECT quantile(0.5)(NULL), quantile(0.9)(NULL), quantiles(0.1, 0.2)(NULL :: Nullable(UInt32)) FROM t1 WITH TOTALS;
diff --git a/tests/queries/0_stateless/02922_deduplication_with_zero_copy.reference b/tests/queries/0_stateless/02922_deduplication_with_zero_copy.reference
index e69de29bb2d..29376f82128 100644
--- a/tests/queries/0_stateless/02922_deduplication_with_zero_copy.reference
+++ b/tests/queries/0_stateless/02922_deduplication_with_zero_copy.reference
@@ -0,0 +1,6 @@
+zero_copy:
+<table_shared_id>
+tables:
+table
+zero_copy:
+tables:
diff --git a/tests/queries/0_stateless/02922_deduplication_with_zero_copy.sh b/tests/queries/0_stateless/02922_deduplication_with_zero_copy.sh
index e9deed2a7cd..bb013dccb65 100755
--- a/tests/queries/0_stateless/02922_deduplication_with_zero_copy.sh
+++ b/tests/queries/0_stateless/02922_deduplication_with_zero_copy.sh
@@ -3,7 +3,7 @@
 
 set -e
 
-CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+CURDIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 # shellcheck source=../shell_config.sh
 . "$CURDIR"/../shell_config.sh
 
@@ -27,6 +27,7 @@ create table r2 (n int)
         allow_remote_fs_zero_copy_replication=1;
 "
 
+
 function get_shared_locks()
 {
   table_shared_id="$1"
@@ -42,11 +43,12 @@ function get_shared_locks()
   done
 }
 
+
 function filter_temporary_locks()
 {
   while read -r lock
   do
-    owner=$($CLICKHOUSE_KEEPER_CLIENT -q "get_stat ${lock}" | grep 'ephemeralOwner' | sed 's/.*= //')
+    owner="$($CLICKHOUSE_KEEPER_CLIENT -q "get_stat ${lock}" | grep 'ephemeralOwner' | sed 's/.*= //')"
     if [[ "${owner}" -eq "0" ]]
     then
       echo "${lock}"
@@ -63,10 +65,11 @@ function insert_duplicates() {
   wait
 
   $CLICKHOUSE_CLIENT -nm -q "
+system sync replica r1;
 system sync replica r2;
 "
 
-  count=$($CLICKHOUSE_CLIENT -q "select count() from r2;")
+  count="$($CLICKHOUSE_CLIENT -q "select count() from r2;")"
 
   [[ "${count}" -eq "1" ]]
 }
@@ -75,7 +78,7 @@ function loop()
 {
   set -e
 
-  table_shared_id=$($CLICKHOUSE_KEEPER_CLIENT -q "get /test/02922/${CLICKHOUSE_DATABASE}/table/table_shared_id")
+  table_shared_id="$1"
 
   while :
   do
@@ -89,8 +92,8 @@ system sync replica r2;
 "
     done
 
-    persistent_locks="$(get_shared_locks ${table_shared_id} | filter_temporary_locks)"
-    num=$(echo "${persistent_locks}" | wc -w)
+    persistent_locks="$(get_shared_locks "${table_shared_id}" | filter_temporary_locks)"
+    num="$(echo "${persistent_locks}" | wc -w)"
 
     if [[ "${num}" -ne "2" ]]
     then
@@ -101,24 +104,41 @@ system sync replica r2;
 
 }
 
+
 export -f query_with_retry
 export -f filter_temporary_locks
 export -f insert_duplicates
 export -f get_shared_locks
 export -f loop
 
+table_shared_id="$($CLICKHOUSE_KEEPER_CLIENT -q "get /test/02922/${CLICKHOUSE_DATABASE}/table/table_shared_id")"
 
 exit_code=0
-timeout 60 bash -c loop || exit_code="${?}"
+timeout 40 bash -c "loop '${table_shared_id}'" || exit_code="${?}"
 
 if [[ "${exit_code}" -ne "124" ]]
 then
   echo "timeout expected, but loop exited with code: ${exit_code}."
   echo "the error is found if loop ends with 0."
+  echo "table_shared_id=${table_shared_id}"
   exit 1
 fi
 
-$CLICKHOUSE_CLIENT -nm -q "
-drop table r1;
-drop table r2;
-"
+function list_keeper_nodes() {
+  table_shared_id=$1
+
+  echo "zero_copy:"
+  $CLICKHOUSE_KEEPER_CLIENT -q "ls /clickhouse/zero_copy/zero_copy_s3" | grep -o "${table_shared_id}" | \
+    sed "s/${table_shared_id}/<table_shared_id>/g" || :
+
+  echo "tables:"
+  $CLICKHOUSE_KEEPER_CLIENT -q "ls /test/02922/${CLICKHOUSE_DATABASE}" | grep -o "table" || :
+}
+
+list_keeper_nodes "${table_shared_id}"
+
+$CLICKHOUSE_CLIENT -nm -q "drop table r1;" --send_logs_level="error"  &
+$CLICKHOUSE_CLIENT -nm -q "drop table r2;" --send_logs_level="error"  &
+wait
+
+list_keeper_nodes "${table_shared_id}"
diff --git a/tests/queries/0_stateless/02931_alter_materialized_view_query_inconsistent.reference b/tests/queries/0_stateless/02931_alter_materialized_view_query_inconsistent.reference
index 45e4b958f4b..0d6874fbb59 100644
--- a/tests/queries/0_stateless/02931_alter_materialized_view_query_inconsistent.reference
+++ b/tests/queries/0_stateless/02931_alter_materialized_view_query_inconsistent.reference
@@ -1,3 +1,3 @@
 v	UInt64					
 v2	UInt8					
-CREATE MATERIALIZED VIEW default.pipe TO default.dest\n(\n    `v` UInt64,\n    `v2` UInt8\n) AS\nSELECT\n    v * 2 AS v,\n    1 AS v2\nFROM default.src
+CREATE MATERIALIZED VIEW default.pipe TO default.dest\n(\n    `v` UInt64,\n    `v2` UInt8\n)\nAS SELECT\n    v * 2 AS v,\n    1 AS v2\nFROM default.src
diff --git a/tests/queries/0_stateless/02931_client_fuzzy_search_crash.expect b/tests/queries/0_stateless/02931_client_fuzzy_search_crash.expect
index 18acaf86a4b..992ff85ca1e 100755
--- a/tests/queries/0_stateless/02931_client_fuzzy_search_crash.expect
+++ b/tests/queries/0_stateless/02931_client_fuzzy_search_crash.expect
@@ -2,8 +2,13 @@
 
 set basedir [file dirname $argv0]
 set basename [file tail $argv0]
-exp_internal -f $env(CLICKHOUSE_TMP)/$basename.debuglog 0
-set history_file $env(CLICKHOUSE_TMP)/$basename.history
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
 
 log_user 0
 set timeout 60
diff --git a/tests/queries/0_stateless/02931_max_num_to_warn.reference b/tests/queries/0_stateless/02931_max_num_to_warn.reference
index c0ad7354039..7de998eebfa 100644
--- a/tests/queries/0_stateless/02931_max_num_to_warn.reference
+++ b/tests/queries/0_stateless/02931_max_num_to_warn.reference
@@ -1,3 +1,3 @@
-The number of attached tables is more than 10
-The number of attached databases is more than 10
+The number of attached tables is more than 5
+The number of attached databases is more than 2
 The number of active parts is more than 10
diff --git a/tests/queries/0_stateless/02931_max_num_to_warn.sql b/tests/queries/0_stateless/02931_max_num_to_warn.sql
index 49b981fc355..23f04816d5a 100644
--- a/tests/queries/0_stateless/02931_max_num_to_warn.sql
+++ b/tests/queries/0_stateless/02931_max_num_to_warn.sql
@@ -37,7 +37,7 @@ INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_9 VALUES (1, 'Hello'
 INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_10 VALUES (1, 'Hello');
 INSERT INTO test_max_num_to_warn_02931.test_max_num_to_warn_11 VALUES (1, 'Hello');
 
-SELECT * FROM system.warnings where message in ('The number of attached tables is more than 10', 'The number of attached databases is more than 10', 'The number of active parts is more than 10');
+SELECT * FROM system.warnings where message in ('The number of attached tables is more than 5', 'The number of attached databases is more than 2', 'The number of active parts is more than 10');
 
 DROP DATABASE IF EXISTS test_max_num_to_warn_02931;
 DROP DATABASE IF EXISTS test_max_num_to_warn_1;
diff --git a/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.reference b/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.reference
new file mode 100644
index 00000000000..3124698d218
--- /dev/null
+++ b/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.reference
@@ -0,0 +1,484 @@
+-- { echoOn }
+Select sum(number + 1) from numbers(10);
+55
+Select sum(1 + number) from numbers(10);
+55
+Select sum(number - 1) from numbers(10);
+35
+Select sum(1 - number) from numbers(10);
+-35
+EXPLAIN SYNTAX (Select sum(number + 1) from numbers(10));
+SELECT sum(number) + (1 * count(number))
+FROM numbers(10)
+EXPLAIN SYNTAX (Select sum(1 + number) from numbers(10));
+SELECT (1 * count(number)) + sum(number)
+FROM numbers(10)
+EXPLAIN SYNTAX (Select sum(number - 1) from numbers(10));
+SELECT sum(number) - (1 * count(number))
+FROM numbers(10)
+EXPLAIN SYNTAX (Select sum(1 - number) from numbers(10));
+SELECT (1 * count(number)) - sum(number)
+FROM numbers(10)
+WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0);
+\N
+WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0);
+0
+EXPLAIN SYNTAX (WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0));
+WITH CAST(\'1\', \'Nullable(UInt64)\') AS my_literal
+SELECT sum(number + my_literal)
+FROM numbers(0)
+EXPLAIN SYNTAX (WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0));
+WITH CAST(\'1\', \'Nullable(UInt64)\') AS my_literal
+SELECT sum(number) + (my_literal * count())
+FROM numbers(0)
+-- { echoOn }
+SELECT sum(uint64 + 1 AS i) from test_table where i > 0;
+20
+SELECT sum(uint64 + 1) AS j from test_table having j > 0;
+20
+SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0;
+20
+SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+20
+SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+20
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1 AS i) from test_table where i > 0);
+SELECT sum(uint64) + (1 * count(uint64))
+FROM test_table
+WHERE ((uint64 + 1) AS i) > 0
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1) AS j from test_table having j > 0);
+SELECT sum(uint64) + (1 * count(uint64)) AS j
+FROM test_table
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0);
+SELECT sum(uint64) + (1 * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 + 1) AS i) > 0
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+SELECT sum(uint64) + ((1 AS n) * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 AS m) > 0) AND (n > 0)
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+SELECT sum(uint64) + ((1 AS n) * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 AS m) > 0) AND (n > 0) AND (((m + n) AS i) > 0)
+HAVING j > 0
+SELECT sum(1 + uint64 AS i) from test_table where i > 0;
+20
+SELECT sum(1 + uint64) AS j from test_table having j > 0;
+20
+SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0;
+20
+SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+20
+SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+20
+EXPLAIN SYNTAX (SELECT sum(1 + uint64 AS i) from test_table where i > 0);
+SELECT (1 * count(uint64)) + sum(uint64)
+FROM test_table
+WHERE ((1 + uint64) AS i) > 0
+EXPLAIN SYNTAX (SELECT sum(1 + uint64) AS j from test_table having j > 0);
+SELECT (1 * count(uint64)) + sum(uint64) AS j
+FROM test_table
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0);
+SELECT (1 * count(uint64)) + sum(uint64) AS j
+FROM test_table
+WHERE ((1 + uint64) AS i) > 0
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+SELECT ((1 AS m) * count(uint64)) + sum(uint64) AS j
+FROM test_table
+WHERE (m > 0) AND ((uint64 AS n) > 0)
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+SELECT ((1 AS m) * count(uint64)) + sum(uint64) AS j
+FROM test_table
+WHERE (m > 0) AND ((uint64 AS n) > 0) AND (((m + n) AS i) > 0)
+HAVING j > 0
+SELECT sum(uint64 - 1 AS i) from test_table where i > 0;
+10
+SELECT sum(uint64 - 1) AS j from test_table having j > 0;
+10
+SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0;
+10
+SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+10
+SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+10
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1 AS i) from test_table where i > 0);
+SELECT sum(uint64) - (1 * count(uint64))
+FROM test_table
+WHERE ((uint64 - 1) AS i) > 0
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1) AS j from test_table having j > 0);
+SELECT sum(uint64) - (1 * count(uint64)) AS j
+FROM test_table
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0);
+SELECT sum(uint64) - (1 * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 - 1) AS i) > 0
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+SELECT sum(uint64) - ((1 AS n) * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 AS m) > 0) AND (n > 0)
+HAVING j > 0
+EXPLAIN SYNTAX (SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+SELECT sum(uint64) - ((1 AS n) * count(uint64)) AS j
+FROM test_table
+WHERE ((uint64 AS m) > 0) AND (n > 0) AND (((m - n) AS i) > 0)
+HAVING j > 0
+SELECT sum(1 - uint64 AS i) from test_table;
+-10
+SELECT sum(1 - uint64) AS j from test_table;
+-10
+SELECT sum(1 - uint64 AS i) j from test_table;
+-10
+SELECT sum((1 AS m) - (uint64 AS n)) j from test_table;
+-10
+SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table;
+-10
+EXPLAIN SYNTAX (SELECT sum(1 - uint64 AS i) from test_table where i > 0);
+SELECT (1 * count(uint64)) - sum(uint64)
+FROM test_table
+WHERE ((1 - uint64) AS i) > 0
+EXPLAIN SYNTAX (SELECT sum(1 - uint64) AS j from test_table having j < 0);
+SELECT (1 * count(uint64)) - sum(uint64) AS j
+FROM test_table
+HAVING j < 0
+EXPLAIN SYNTAX (SELECT sum(1 - uint64 AS i) j from test_table where i > 0 having j < 0);
+SELECT (1 * count(uint64)) - sum(uint64) AS j
+FROM test_table
+WHERE ((1 - uint64) AS i) > 0
+HAVING j < 0
+EXPLAIN SYNTAX (SELECT sum((1 AS m) - (uint64 AS n)) j from test_table where m > 0 and n > 0 having j < 0);
+SELECT ((1 AS m) * count(uint64)) - sum(uint64) AS j
+FROM test_table
+WHERE (m > 0) AND ((uint64 AS n) > 0)
+HAVING j < 0
+EXPLAIN SYNTAX (SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i < 0 having j < 0);
+SELECT ((1 AS m) * count(uint64)) - sum(uint64) AS j
+FROM test_table
+WHERE (m > 0) AND ((uint64 AS n) > 0) AND (((m - n) AS i) < 0)
+HAVING j < 0
+SELECT sum(uint64 + 2.11) From test_table;
+25.549999999999997
+SELECT sum(2.11 + uint64) From test_table;
+25.549999999999997
+SELECT sum(uint64 - 2.11) From test_table;
+4.450000000000001
+SELECT sum(2.11 - uint64) From test_table;
+-4.450000000000001
+SELECT sum(uint64) + 2.11 * count(uint64) From test_table;
+25.549999999999997
+SELECT 2.11 * count(uint64) + sum(uint64) From test_table;
+25.549999999999997
+SELECT sum(uint64) - 2.11 * count(uint64) From test_table;
+4.450000000000001
+SELECT 2.11 * count(uint64) - sum(uint64) From test_table;
+-4.450000000000001
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2.11) From test_table);
+SELECT sum(uint64) + (2.11 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2.11 + uint64) From test_table);
+SELECT (2.11 * count(uint64)) + sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2.11) From test_table);
+SELECT sum(uint64) - (2.11 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2.11 - uint64) From test_table);
+SELECT (2.11 * count(uint64)) - sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64) + 2.11 * count(uint64) From test_table);
+SELECT sum(uint64) + (2.11 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2.11 * count(uint64) + sum(uint64) From test_table);
+SELECT (2.11 * count(uint64)) + sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64) - 2.11 * count(uint64) From test_table);
+SELECT sum(uint64) - (2.11 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2.11 * count(uint64) - sum(uint64) From test_table);
+SELECT (2.11 * count(uint64)) - sum(uint64)
+FROM test_table
+SELECT sum(uint64 + 2) From test_table;
+25
+SELECT sum(2 + uint64) From test_table;
+25
+SELECT sum(uint64 - 2) From test_table;
+5
+SELECT sum(2 - uint64) From test_table;
+-5
+SELECT sum(uint64) + 2 * count(uint64) From test_table;
+25
+SELECT 2 * count(uint64) + sum(uint64) From test_table;
+25
+SELECT sum(uint64) - 2 * count(uint64) From test_table;
+5
+SELECT 2 * count(uint64) - sum(uint64) From test_table;
+-5
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) From test_table);
+SELECT sum(uint64) + (2 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 + uint64) From test_table);
+SELECT (2 * count(uint64)) + sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) From test_table);
+SELECT sum(uint64) - (2 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - uint64) From test_table);
+SELECT (2 * count(uint64)) - sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64) + 2 * count(uint64) From test_table);
+SELECT sum(uint64) + (2 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(uint64) + sum(uint64) From test_table);
+SELECT (2 * count(uint64)) + sum(uint64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64) - 2 * count(uint64) From test_table);
+SELECT sum(uint64) - (2 * count(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(uint64) - sum(uint64) From test_table);
+SELECT (2 * count(uint64)) - sum(uint64)
+FROM test_table
+SELECT sum(float64 + 2) From test_table;
+26.5
+SELECT sum(2 + float64) From test_table;
+26.5
+SELECT sum(float64 - 2) From test_table;
+6.5
+SELECT sum(2 - float64) From test_table;
+-6.5
+SELECT sum(float64) + 2 * count(float64) From test_table;
+26.5
+SELECT 2 * count(float64) + sum(float64) From test_table;
+26.5
+SELECT sum(float64) - 2 * count(float64) From test_table;
+6.5
+SELECT 2 * count(float64) - sum(float64) From test_table;
+-6.5
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) From test_table);
+SELECT sum(float64) + (2 * count(float64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 + float64) From test_table);
+SELECT (2 * count(float64)) + sum(float64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) From test_table);
+SELECT sum(float64) - (2 * count(float64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - float64) From test_table);
+SELECT (2 * count(float64)) - sum(float64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64) + 2 * count(float64) From test_table);
+SELECT sum(float64) + (2 * count(float64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(float64) + sum(float64) From test_table);
+SELECT (2 * count(float64)) + sum(float64)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64) - 2 * count(float64) From test_table);
+SELECT sum(float64) - (2 * count(float64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(float64) - sum(float64) From test_table);
+SELECT (2 * count(float64)) - sum(float64)
+FROM test_table
+SELECT sum(decimal32 + 2) From test_table;
+26.65
+SELECT sum(2 + decimal32) From test_table;
+26.65
+SELECT sum(decimal32 - 2) From test_table;
+6.65
+SELECT sum(2 - decimal32) From test_table;
+-6.65
+SELECT sum(decimal32) + 2 * count(decimal32) From test_table;
+26.65
+SELECT 2 * count(decimal32) + sum(decimal32) From test_table;
+26.65
+SELECT sum(decimal32) - 2 * count(decimal32) From test_table;
+6.65
+SELECT 2 * count(decimal32) - sum(decimal32) From test_table;
+-6.65
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) From test_table);
+SELECT sum(decimal32) + (2 * count(decimal32))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 + decimal32) From test_table);
+SELECT (2 * count(decimal32)) + sum(decimal32)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) From test_table);
+SELECT sum(decimal32) - (2 * count(decimal32))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - decimal32) From test_table);
+SELECT (2 * count(decimal32)) - sum(decimal32)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32) + 2 * count(decimal32) From test_table);
+SELECT sum(decimal32) + (2 * count(decimal32))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(decimal32) + sum(decimal32) From test_table);
+SELECT (2 * count(decimal32)) + sum(decimal32)
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32) - 2 * count(decimal32) From test_table);
+SELECT sum(decimal32) - (2 * count(decimal32))
+FROM test_table
+EXPLAIN SYNTAX (SELECT 2 * count(decimal32) - sum(decimal32) From test_table);
+SELECT (2 * count(decimal32)) - sum(decimal32)
+FROM test_table
+SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table;
+55
+SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table;
+-5
+SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table;
+5
+SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table;
+5
+SELECT sum(2 - uint64) - sum(3 - uint64) From test_table;
+-5
+SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table;
+55
+SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table;
+-5
+SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table;
+5
+SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table;
+5
+SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table;
+-5
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table);
+SELECT (sum(uint64) + (2 * count(uint64))) + (sum(uint64) + (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table);
+SELECT (sum(uint64) + (2 * count(uint64))) - (sum(uint64) + (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table);
+SELECT (sum(uint64) - (2 * count(uint64))) + (sum(uint64) - (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table);
+SELECT (sum(uint64) - (2 * count(uint64))) - (sum(uint64) - (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - uint64) - sum(3 - uint64) From test_table);
+SELECT ((2 * count(uint64)) - sum(uint64)) - ((3 * count(uint64)) - sum(uint64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table);
+SELECT (sum(uint64) + (2 * count(uint64))) + (sum(uint64) + (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table);
+SELECT (sum(uint64) + (2 * count(uint64))) - (sum(uint64) + (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table);
+SELECT (sum(uint64) - (2 * count(uint64))) + (sum(uint64) - (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table);
+SELECT (sum(uint64) - (2 * count(uint64))) - (sum(uint64) - (3 * count(uint64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table);
+SELECT ((2 * count(uint64)) - sum(uint64)) + ((3 * count(uint64)) - sum(uint64))
+FROM test_table
+SELECT sum(float64 + 2) + sum(float64 + 3) From test_table;
+58
+SELECT sum(float64 + 2) - sum(float64 + 3) From test_table;
+-5
+SELECT sum(float64 - 2) + sum(float64 - 3) From test_table;
+8
+SELECT sum(float64 - 2) - sum(float64 - 3) From test_table;
+5
+SELECT sum(2 - float64) - sum(3 - float64) From test_table;
+-5
+SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table;
+58
+SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table;
+-5
+SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table;
+8
+SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table;
+5
+SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table;
+-8
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) + sum(float64 + 3) From test_table);
+SELECT (sum(float64) + (2 * count(float64))) + (sum(float64) + (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) - sum(float64 + 3) From test_table);
+SELECT (sum(float64) + (2 * count(float64))) - (sum(float64) + (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) + sum(float64 - 3) From test_table);
+SELECT (sum(float64) - (2 * count(float64))) + (sum(float64) - (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) - sum(float64 - 3) From test_table);
+SELECT (sum(float64) - (2 * count(float64))) - (sum(float64) - (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - float64) - sum(3 - float64) From test_table);
+SELECT ((2 * count(float64)) - sum(float64)) - ((3 * count(float64)) - sum(float64))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table);
+SELECT (sum(float64) + (2 * count(float64))) + (sum(float64) + (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table);
+SELECT (sum(float64) + (2 * count(float64))) - (sum(float64) + (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table);
+SELECT (sum(float64) - (2 * count(float64))) + (sum(float64) - (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table);
+SELECT (sum(float64) - (2 * count(float64))) - (sum(float64) - (3 * count(float64)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table);
+SELECT ((2 * count(float64)) - sum(float64)) + ((3 * count(float64)) - sum(float64))
+FROM test_table
+SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table;
+58.3
+SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table;
+-5
+SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table;
+8.3
+SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table;
+5
+SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table;
+-5
+SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table;
+58.3
+SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table;
+-5
+SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table;
+8.3
+SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table;
+5
+SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table;
+-8.3
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table);
+SELECT (sum(decimal32) + (2 * count(decimal32))) + (sum(decimal32) + (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table);
+SELECT (sum(decimal32) + (2 * count(decimal32))) - (sum(decimal32) + (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table);
+SELECT (sum(decimal32) - (2 * count(decimal32))) + (sum(decimal32) - (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table);
+SELECT (sum(decimal32) - (2 * count(decimal32))) - (sum(decimal32) - (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table);
+SELECT ((2 * count(decimal32)) - sum(decimal32)) - ((3 * count(decimal32)) - sum(decimal32))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table);
+SELECT (sum(decimal32) + (2 * count(decimal32))) + (sum(decimal32) + (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table);
+SELECT (sum(decimal32) + (2 * count(decimal32))) - (sum(decimal32) + (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table);
+SELECT (sum(decimal32) - (2 * count(decimal32))) + (sum(decimal32) - (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table);
+SELECT (sum(decimal32) - (2 * count(decimal32))) - (sum(decimal32) - (3 * count(decimal32)))
+FROM test_table
+EXPLAIN SYNTAX (SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table);
+SELECT ((2 * count(decimal32)) - sum(decimal32)) + ((3 * count(decimal32)) - sum(decimal32))
+FROM test_table
+-- https://github.com/ClickHouse/ClickHouse/issues/59414
+SELECT sum(uint64 + 2) as j, j + 5 as t from test_table;
+25	30
+EXPLAIN SYNTAX SELECT sum(uint64 + 2) as j, j + 5 as t from test_table;
+SELECT
+    sum(uint64) + (2 * count(uint64)) AS j,
+    j + 5 AS t
+FROM test_table
diff --git a/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.sql b/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.sql
new file mode 100644
index 00000000000..c7b0ff82442
--- /dev/null
+++ b/tests/queries/0_stateless/02931_rewrite_sum_column_and_constant.sql
@@ -0,0 +1,214 @@
+-- { echoOn }
+Select sum(number + 1) from numbers(10);
+Select sum(1 + number) from numbers(10);
+Select sum(number - 1) from numbers(10);
+Select sum(1 - number) from numbers(10);
+EXPLAIN SYNTAX (Select sum(number + 1) from numbers(10));
+EXPLAIN SYNTAX (Select sum(1 + number) from numbers(10));
+EXPLAIN SYNTAX (Select sum(number - 1) from numbers(10));
+EXPLAIN SYNTAX (Select sum(1 - number) from numbers(10));
+
+WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0);
+WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0);
+EXPLAIN SYNTAX (WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0));
+EXPLAIN SYNTAX (WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0));
+-- { echoOff }
+
+DROP TABLE IF EXISTS test_table;
+
+CREATE TABLE test_table
+(
+    uint64 UInt64,
+    float64 Float64,
+    decimal32 Decimal32(5),
+) ENGINE=MergeTree ORDER BY uint64;
+
+INSERT INTO test_table VALUES (1, 1.1, 1.11);
+INSERT INTO test_table VALUES (2, 2.2, 2.22);
+INSERT INTO test_table VALUES (3, 3.3, 3.33);
+INSERT INTO test_table VALUES (4, 4.4, 4.44);
+INSERT INTO test_table VALUES (5, 5.5, 5.55);
+
+-- { echoOn }
+SELECT sum(uint64 + 1 AS i) from test_table where i > 0;
+SELECT sum(uint64 + 1) AS j from test_table having j > 0;
+SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1 AS i) from test_table where i > 0);
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1) AS j from test_table having j > 0);
+EXPLAIN SYNTAX (SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(1 + uint64 AS i) from test_table where i > 0;
+SELECT sum(1 + uint64) AS j from test_table having j > 0;
+SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN SYNTAX (SELECT sum(1 + uint64 AS i) from test_table where i > 0);
+EXPLAIN SYNTAX (SELECT sum(1 + uint64) AS j from test_table having j > 0);
+EXPLAIN SYNTAX (SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(uint64 - 1 AS i) from test_table where i > 0;
+SELECT sum(uint64 - 1) AS j from test_table having j > 0;
+SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1 AS i) from test_table where i > 0);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1) AS j from test_table having j > 0);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN SYNTAX (SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(1 - uint64 AS i) from test_table;
+SELECT sum(1 - uint64) AS j from test_table;
+SELECT sum(1 - uint64 AS i) j from test_table;
+SELECT sum((1 AS m) - (uint64 AS n)) j from test_table;
+SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table;
+EXPLAIN SYNTAX (SELECT sum(1 - uint64 AS i) from test_table where i > 0);
+EXPLAIN SYNTAX (SELECT sum(1 - uint64) AS j from test_table having j < 0);
+EXPLAIN SYNTAX (SELECT sum(1 - uint64 AS i) j from test_table where i > 0 having j < 0);
+EXPLAIN SYNTAX (SELECT sum((1 AS m) - (uint64 AS n)) j from test_table where m > 0 and n > 0 having j < 0);
+EXPLAIN SYNTAX (SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i < 0 having j < 0);
+
+SELECT sum(uint64 + 2.11) From test_table;
+SELECT sum(2.11 + uint64) From test_table;
+SELECT sum(uint64 - 2.11) From test_table;
+SELECT sum(2.11 - uint64) From test_table;
+SELECT sum(uint64) + 2.11 * count(uint64) From test_table;
+SELECT 2.11 * count(uint64) + sum(uint64) From test_table;
+SELECT sum(uint64) - 2.11 * count(uint64) From test_table;
+SELECT 2.11 * count(uint64) - sum(uint64) From test_table;
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2.11) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2.11 + uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2.11) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2.11 - uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64) + 2.11 * count(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT 2.11 * count(uint64) + sum(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64) - 2.11 * count(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT 2.11 * count(uint64) - sum(uint64) From test_table);
+
+SELECT sum(uint64 + 2) From test_table;
+SELECT sum(2 + uint64) From test_table;
+SELECT sum(uint64 - 2) From test_table;
+SELECT sum(2 - uint64) From test_table;
+SELECT sum(uint64) + 2 * count(uint64) From test_table;
+SELECT 2 * count(uint64) + sum(uint64) From test_table;
+SELECT sum(uint64) - 2 * count(uint64) From test_table;
+SELECT 2 * count(uint64) - sum(uint64) From test_table;
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 + uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64) + 2 * count(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(uint64) + sum(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64) - 2 * count(uint64) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(uint64) - sum(uint64) From test_table);
+
+SELECT sum(float64 + 2) From test_table;
+SELECT sum(2 + float64) From test_table;
+SELECT sum(float64 - 2) From test_table;
+SELECT sum(2 - float64) From test_table;
+SELECT sum(float64) + 2 * count(float64) From test_table;
+SELECT 2 * count(float64) + sum(float64) From test_table;
+SELECT sum(float64) - 2 * count(float64) From test_table;
+SELECT 2 * count(float64) - sum(float64) From test_table;
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 + float64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - float64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64) + 2 * count(float64) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(float64) + sum(float64) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64) - 2 * count(float64) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(float64) - sum(float64) From test_table);
+
+SELECT sum(decimal32 + 2) From test_table;
+SELECT sum(2 + decimal32) From test_table;
+SELECT sum(decimal32 - 2) From test_table;
+SELECT sum(2 - decimal32) From test_table;
+SELECT sum(decimal32) + 2 * count(decimal32) From test_table;
+SELECT 2 * count(decimal32) + sum(decimal32) From test_table;
+SELECT sum(decimal32) - 2 * count(decimal32) From test_table;
+SELECT 2 * count(decimal32) - sum(decimal32) From test_table;
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 + decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32) + 2 * count(decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(decimal32) + sum(decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32) - 2 * count(decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT 2 * count(decimal32) - sum(decimal32) From test_table);
+
+SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table;
+SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table;
+SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table;
+SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table;
+SELECT sum(2 - uint64) - sum(3 - uint64) From test_table;
+SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table;
+SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table;
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - uint64) - sum(3 - uint64) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table);
+EXPLAIN SYNTAX (SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table);
+
+SELECT sum(float64 + 2) + sum(float64 + 3) From test_table;
+SELECT sum(float64 + 2) - sum(float64 + 3) From test_table;
+SELECT sum(float64 - 2) + sum(float64 - 3) From test_table;
+SELECT sum(float64 - 2) - sum(float64 - 3) From test_table;
+SELECT sum(2 - float64) - sum(3 - float64) From test_table;
+SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table;
+SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table;
+SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table;
+SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table;
+SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table;
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) + sum(float64 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64 + 2) - sum(float64 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) + sum(float64 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(float64 - 2) - sum(float64 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - float64) - sum(3 - float64) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table);
+EXPLAIN SYNTAX (SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table);
+
+SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table;
+SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table;
+SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table;
+SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table;
+SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table;
+SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table;
+SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table;
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table);
+EXPLAIN SYNTAX (SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table);
+EXPLAIN SYNTAX (SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table);
+EXPLAIN SYNTAX (SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table);
+
+-- https://github.com/ClickHouse/ClickHouse/issues/59414
+SELECT sum(uint64 + 2) as j, j + 5 as t from test_table;
+EXPLAIN SYNTAX SELECT sum(uint64 + 2) as j, j + 5 as t from test_table;
+-- { echoOff }
+
+
+DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.reference b/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.reference
new file mode 100644
index 00000000000..802d920aaef
--- /dev/null
+++ b/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.reference
@@ -0,0 +1,3324 @@
+-- { echoOn }
+Select sum(number + 1) from numbers(10);
+55
+Select sum(1 + number) from numbers(10);
+55
+Select sum(number - 1) from numbers(10);
+35
+Select sum(1 - number) from numbers(10);
+-35
+EXPLAIN QUERY TREE (Select sum(number + 1) from numbers(10));
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(number, 1)) 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 13, nodes: 1
+          CONSTANT id: 14, constant_value: UInt64_10, constant_value_type: UInt8
+EXPLAIN QUERY TREE (Select sum(1 + number) from numbers(10));
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(1, number)) 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: number, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: number, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE_FUNCTION id: 10, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 13, nodes: 1
+          CONSTANT id: 14, constant_value: UInt64_10, constant_value_type: UInt8
+EXPLAIN QUERY TREE (Select sum(number - 1) from numbers(10));
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(number, 1)) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 13, nodes: 1
+          CONSTANT id: 14, constant_value: UInt64_10, constant_value_type: UInt8
+EXPLAIN QUERY TREE (Select sum(1 - number) from numbers(10));
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(1, number)) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: number, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: number, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE_FUNCTION id: 10, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 13, nodes: 1
+          CONSTANT id: 14, constant_value: UInt64_10, constant_value_type: UInt8
+WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0);
+\N
+WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0);
+0
+EXPLAIN QUERY TREE (WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0));
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(number, my_literal)) Nullable(UInt64)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: sum, function_type: aggregate, result_type: Nullable(UInt64)
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Nullable(UInt64)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+                  CONSTANT id: 8, constant_value: UInt64_1, constant_value_type: Nullable(UInt64)
+                    EXPRESSION
+                      FUNCTION id: 9, alias: my_literal, function_name: CAST, function_type: ordinary, result_type: Nullable(UInt64)
+                        ARGUMENTS
+                          LIST id: 10, nodes: 2
+                            CONSTANT id: 11, constant_value: \'1\', constant_value_type: String
+                            CONSTANT id: 12, constant_value: \'Nullable(UInt64)\', constant_value_type: String
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 13, nodes: 1
+          CONSTANT id: 14, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0));
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(number), multiply(my_literal, count())) Nullable(UInt64)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Nullable(UInt64)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: number, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: Nullable(UInt64)
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: Nullable(UInt64)
+                    EXPRESSION
+                      FUNCTION id: 11, alias: my_literal, function_name: CAST, function_type: ordinary, result_type: Nullable(UInt64)
+                        ARGUMENTS
+                          LIST id: 12, nodes: 2
+                            CONSTANT id: 13, constant_value: \'1\', constant_value_type: String
+                            CONSTANT id: 14, constant_value: \'Nullable(UInt64)\', constant_value_type: String
+                  FUNCTION id: 15, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE_FUNCTION id: 7, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 16, nodes: 1
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+-- { echoOn }
+SELECT sum(uint64 + 1 AS i) from test_table where i > 0;
+20
+SELECT sum(uint64 + 1) AS j from test_table having j > 0;
+20
+SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0;
+20
+SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+20
+SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+20
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1 AS i) from test_table where i > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(i) 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1) AS j from test_table having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  HAVING
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 18, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 20, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 21, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 22, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 23, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 18, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 19, nodes: 2
+          FUNCTION id: 20, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 21, nodes: 2
+                FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 23, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 24, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 26, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 27, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 28, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+          CONSTANT id: 18, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 20, nodes: 2
+                    CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 23, nodes: 2
+          FUNCTION id: 24, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 25, nodes: 2
+                FUNCTION id: 26, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 28, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 29, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 30, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 31, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 32, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 3
+          FUNCTION id: 15, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+          CONSTANT id: 18, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 20, nodes: 2
+                    CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 23, nodes: 2
+                FUNCTION id: 24, function_name: plus, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                CONSTANT id: 26, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 27, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 28, nodes: 2
+          FUNCTION id: 29, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 30, nodes: 2
+                FUNCTION id: 31, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 32, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 33, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 34, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 35, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 36, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 37, constant_value: UInt64_0, constant_value_type: UInt8
+SELECT sum(1 + uint64 AS i) from test_table where i > 0;
+20
+SELECT sum(1 + uint64) AS j from test_table having j > 0;
+20
+SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0;
+20
+SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+20
+SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+20
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64 AS i) from test_table where i > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(i) 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64) AS j from test_table having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  HAVING
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 18, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 19, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 20, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 21, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 22, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 23, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 18, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 19, nodes: 2
+          FUNCTION id: 20, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 21, nodes: 2
+                FUNCTION id: 22, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 23, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 24, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 25, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 26, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 28, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          CONSTANT id: 15, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 16, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 17, nodes: 2
+                    CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 18, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 20, nodes: 2
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 23, nodes: 2
+          FUNCTION id: 24, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 25, nodes: 2
+                FUNCTION id: 26, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 28, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 29, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 30, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 31, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 32, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 3
+          CONSTANT id: 15, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 16, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 17, nodes: 2
+                    CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 18, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 20, nodes: 2
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 23, nodes: 2
+                FUNCTION id: 24, function_name: plus, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 26, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 27, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 28, nodes: 2
+          FUNCTION id: 29, function_name: plus, function_type: ordinary, result_type: UInt64
+            ARGUMENTS
+              LIST id: 30, nodes: 2
+                FUNCTION id: 31, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 32, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 33, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 34, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 35, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 36, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 37, constant_value: UInt64_0, constant_value_type: UInt8
+SELECT sum(uint64 - 1 AS i) from test_table where i > 0;
+10
+SELECT sum(uint64 - 1) AS j from test_table having j > 0;
+10
+SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0;
+10
+SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+10
+SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+10
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1 AS i) from test_table where i > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(i) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1) AS j from test_table having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  HAVING
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 18, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 20, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 21, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 22, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 23, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 18, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 19, nodes: 2
+          FUNCTION id: 20, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 21, nodes: 2
+                FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 23, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 24, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 26, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 27, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 28, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+          CONSTANT id: 18, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 20, nodes: 2
+                    CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 23, nodes: 2
+          FUNCTION id: 24, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 25, nodes: 2
+                FUNCTION id: 26, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 28, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 29, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 30, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 31, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 32, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 3
+          FUNCTION id: 15, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+          CONSTANT id: 18, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 20, nodes: 2
+                    CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 22, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 23, nodes: 2
+                FUNCTION id: 24, function_name: minus, function_type: ordinary, result_type: Int64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                CONSTANT id: 26, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 27, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 28, nodes: 2
+          FUNCTION id: 29, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 30, nodes: 2
+                FUNCTION id: 31, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 32, nodes: 1
+                      COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+                FUNCTION id: 33, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 34, nodes: 2
+                      CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 35, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 36, nodes: 1
+                            COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+          CONSTANT id: 37, constant_value: UInt64_0, constant_value_type: UInt8
+SELECT sum(1 - uint64 AS i) from test_table;
+-10
+SELECT sum(1 - uint64) AS j from test_table;
+-10
+SELECT sum(1 - uint64 AS i) j from test_table;
+-10
+SELECT sum((1 AS m) - (uint64 AS n)) j from test_table;
+-10
+SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table;
+-10
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64 AS i) from test_table where i > 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(i) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64) AS j from test_table having j < 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  HAVING
+    FUNCTION id: 13, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 18, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 19, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 20, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 21, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 22, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 23, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64 AS i) j from test_table where i > 0 having j < 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: greater, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 16, nodes: 2
+                CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 18, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 19, nodes: 2
+          FUNCTION id: 20, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 21, nodes: 2
+                FUNCTION id: 22, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 23, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 24, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 25, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 26, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 28, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum((1 AS m) - (uint64 AS n)) j from test_table where m > 0 and n > 0 having j < 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 2
+          CONSTANT id: 15, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 16, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 17, nodes: 2
+                    CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 18, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 20, nodes: 2
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 22, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 23, nodes: 2
+          FUNCTION id: 24, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 25, nodes: 2
+                FUNCTION id: 26, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 27, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 28, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 29, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 30, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 31, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 32, constant_value: UInt64_0, constant_value_type: UInt8
+EXPLAIN QUERY TREE (SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i < 0 having j < 0);
+QUERY id: 0
+  PROJECTION COLUMNS
+    j Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+  WHERE
+    FUNCTION id: 13, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 14, nodes: 3
+          CONSTANT id: 15, constant_value: UInt64_1, constant_value_type: UInt8
+            EXPRESSION
+              FUNCTION id: 16, function_name: greater, function_type: ordinary, result_type: UInt8
+                ARGUMENTS
+                  LIST id: 17, nodes: 2
+                    CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                    CONSTANT id: 18, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 19, function_name: greater, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 20, nodes: 2
+                COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+          FUNCTION id: 22, function_name: less, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 23, nodes: 2
+                FUNCTION id: 24, function_name: minus, function_type: ordinary, result_type: Int64
+                  ARGUMENTS
+                    LIST id: 25, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                CONSTANT id: 26, constant_value: UInt64_0, constant_value_type: UInt8
+  HAVING
+    FUNCTION id: 27, function_name: less, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 28, nodes: 2
+          FUNCTION id: 29, function_name: minus, function_type: ordinary, result_type: Int64
+            ARGUMENTS
+              LIST id: 30, nodes: 2
+                FUNCTION id: 31, function_name: multiply, function_type: ordinary, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 32, nodes: 2
+                      CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: UInt8
+                      FUNCTION id: 33, function_name: count, function_type: aggregate, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 34, nodes: 1
+                            COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+                FUNCTION id: 35, function_name: sum, function_type: aggregate, result_type: UInt64
+                  ARGUMENTS
+                    LIST id: 36, nodes: 1
+                      COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+          CONSTANT id: 37, constant_value: UInt64_0, constant_value_type: UInt8
+SELECT sum(uint64 + 2.11) From test_table;
+25.549999999999997
+SELECT sum(2.11 + uint64) From test_table;
+25.549999999999997
+SELECT sum(uint64 - 2.11) From test_table;
+4.450000000000001
+SELECT sum(2.11 - uint64) From test_table;
+-4.450000000000001
+SELECT sum(uint64) + 2.11 * count(uint64) From test_table;
+25.549999999999997
+SELECT 2.11 * count(uint64) + sum(uint64) From test_table;
+25.549999999999997
+SELECT sum(uint64) - 2.11 * count(uint64) From test_table;
+4.450000000000001
+SELECT 2.11 * count(uint64) - sum(uint64) From test_table;
+-4.450000000000001
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2.11) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(uint64, 2.11)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2.11 + uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(2.11, uint64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2.11) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(uint64, 2.11)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2.11 - uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(2.11, uint64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64) + 2.11 * count(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(uint64), multiply(2.11, count(uint64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2.11 * count(uint64) + sum(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(multiply(2.11, count(uint64)), sum(uint64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64) - 2.11 * count(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(uint64), multiply(2.11, count(uint64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2.11 * count(uint64) - sum(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(multiply(2.11, count(uint64)), sum(uint64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: Float64_2.11, constant_value_type: Float64
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+SELECT sum(uint64 + 2) From test_table;
+25
+SELECT sum(2 + uint64) From test_table;
+25
+SELECT sum(uint64 - 2) From test_table;
+5
+SELECT sum(2 - uint64) From test_table;
+-5
+SELECT sum(uint64) + 2 * count(uint64) From test_table;
+25
+SELECT 2 * count(uint64) + sum(uint64) From test_table;
+25
+SELECT sum(uint64) - 2 * count(uint64) From test_table;
+5
+SELECT 2 * count(uint64) - sum(uint64) From test_table;
+-5
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(uint64, 2)) 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 + uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(2, uint64)) 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(uint64, 2)) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(2, uint64)) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64) + 2 * count(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(uint64), multiply(2, count(uint64))) 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
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(uint64) + sum(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(multiply(2, count(uint64)), sum(uint64)) 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
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64) - 2 * count(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(uint64), multiply(2, count(uint64))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: uint64, result_type: UInt64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(uint64) - sum(uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(multiply(2, count(uint64)), sum(uint64)) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: UInt64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: uint64, result_type: UInt64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+SELECT sum(float64 + 2) From test_table;
+26.5
+SELECT sum(2 + float64) From test_table;
+26.5
+SELECT sum(float64 - 2) From test_table;
+6.5
+SELECT sum(2 - float64) From test_table;
+-6.5
+SELECT sum(float64) + 2 * count(float64) From test_table;
+26.5
+SELECT 2 * count(float64) + sum(float64) From test_table;
+26.5
+SELECT sum(float64) - 2 * count(float64) From test_table;
+6.5
+SELECT 2 * count(float64) - sum(float64) From test_table;
+-6.5
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(float64, 2)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 + float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(2, float64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(float64, 2)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(2, float64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64) + 2 * count(float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(float64), multiply(2, count(float64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(float64) + sum(float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(multiply(2, count(float64)), sum(float64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64) - 2 * count(float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(float64), multiply(2, count(float64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: float64, result_type: Float64, source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(float64) - sum(float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(multiply(2, count(float64)), sum(float64)) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Float64
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: float64, result_type: Float64, source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+SELECT sum(decimal32 + 2) From test_table;
+26.65
+SELECT sum(2 + decimal32) From test_table;
+26.65
+SELECT sum(decimal32 - 2) From test_table;
+6.65
+SELECT sum(2 - decimal32) From test_table;
+-6.65
+SELECT sum(decimal32) + 2 * count(decimal32) From test_table;
+26.65
+SELECT 2 * count(decimal32) + sum(decimal32) From test_table;
+26.65
+SELECT sum(decimal32) - 2 * count(decimal32) From test_table;
+6.65
+SELECT 2 * count(decimal32) - sum(decimal32) From test_table;
+-6.65
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(decimal32, 2)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 + decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(plus(2, decimal32)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(decimal32, 2)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    sum(minus(2, decimal32)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32) + 2 * count(decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(decimal32), multiply(2, count(decimal32))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(decimal32) + sum(decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(multiply(2, count(decimal32)), sum(decimal32)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32) - 2 * count(decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(decimal32), multiply(2, count(decimal32))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+            FUNCTION id: 8, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 9, nodes: 2
+                  CONSTANT id: 10, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 12, nodes: 1
+                        COLUMN id: 6, column_name: decimal32, result_type: Decimal(9, 5), source_id: 7
+  JOIN TREE
+    TABLE id: 7, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT 2 * count(decimal32) - sum(decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(multiply(2, count(decimal32)), sum(decimal32)) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: multiply, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_2, constant_value_type: UInt8
+                  FUNCTION id: 7, function_name: count, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 8, nodes: 1
+                        COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+            FUNCTION id: 11, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 12, nodes: 1
+                  COLUMN id: 9, column_name: decimal32, result_type: Decimal(9, 5), source_id: 10
+  JOIN TREE
+    TABLE id: 10, alias: __table1, table_name: default.test_table
+SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table;
+55
+SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table;
+-5
+SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table;
+5
+SELECT sum(2 - uint64) - sum(3 - uint64) From test_table;
+-5
+SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table;
+55
+SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table;
+-5
+SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table;
+5
+SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table;
+5
+SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table;
+-5
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(plus(uint64, 2)), sum(plus(uint64, 3))) 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
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(plus(uint64, 2)), sum(plus(uint64, 3))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(minus(uint64, 2)), sum(minus(uint64, 3))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(uint64, 2)), sum(minus(uint64, 3))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - uint64) - sum(3 - uint64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(2, uint64)), sum(minus(3, uint64))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(plus(sum(uint64), multiply(2, count(uint64))), plus(sum(uint64), multiply(3, count(uint64)))) 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
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(plus(sum(uint64), multiply(2, count(uint64))), plus(sum(uint64), multiply(3, count(uint64)))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: UInt64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(sum(uint64), multiply(2, count(uint64))), minus(sum(uint64), multiply(3, count(uint64)))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(minus(sum(uint64), multiply(2, count(uint64))), minus(sum(uint64), multiply(3, count(uint64)))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: uint64, result_type: UInt64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(multiply(2, count(uint64)), sum(uint64)), minus(multiply(3, count(uint64)), sum(uint64))) Int64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Int64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Int64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: uint64, result_type: UInt64, source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
+SELECT sum(float64 + 2) + sum(float64 + 3) From test_table;
+58
+SELECT sum(float64 + 2) - sum(float64 + 3) From test_table;
+-5
+SELECT sum(float64 - 2) + sum(float64 - 3) From test_table;
+8
+SELECT sum(float64 - 2) - sum(float64 - 3) From test_table;
+5
+SELECT sum(2 - float64) - sum(3 - float64) From test_table;
+-5
+SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table;
+58
+SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table;
+-5
+SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table;
+8
+SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table;
+5
+SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table;
+-8
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) + sum(float64 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(plus(float64, 2)), sum(plus(float64, 3))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) - sum(float64 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(plus(float64, 2)), sum(plus(float64, 3))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) + sum(float64 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(minus(float64, 2)), sum(minus(float64, 3))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) - sum(float64 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(float64, 2)), sum(minus(float64, 3))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - float64) - sum(3 - float64) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(2, float64)), sum(minus(3, float64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(plus(sum(float64), multiply(2, count(float64))), plus(sum(float64), multiply(3, count(float64)))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(plus(sum(float64), multiply(2, count(float64))), plus(sum(float64), multiply(3, count(float64)))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(sum(float64), multiply(2, count(float64))), minus(sum(float64), multiply(3, count(float64)))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(minus(sum(float64), multiply(2, count(float64))), minus(sum(float64), multiply(3, count(float64)))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: float64, result_type: Float64, source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(multiply(2, count(float64)), sum(float64)), minus(multiply(3, count(float64)), sum(float64))) Float64
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Float64
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Float64
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: Float64
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: float64, result_type: Float64, source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
+SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table;
+58.3
+SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table;
+-5
+SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table;
+8.3
+SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table;
+5
+SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table;
+-5
+SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table;
+58.3
+SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table;
+-5
+SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table;
+8.3
+SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table;
+5
+SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table;
+-8.3
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(plus(decimal32, 2)), sum(plus(decimal32, 3))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(plus(decimal32, 2)), sum(plus(decimal32, 3))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(sum(minus(decimal32, 2)), sum(minus(decimal32, 3))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(decimal32, 2)), sum(minus(decimal32, 3))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(sum(minus(2, decimal32)), sum(minus(3, decimal32))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(plus(sum(decimal32), multiply(2, count(decimal32))), plus(sum(decimal32), multiply(3, count(decimal32)))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(plus(sum(decimal32), multiply(2, count(decimal32))), plus(sum(decimal32), multiply(3, count(decimal32)))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(sum(decimal32), multiply(2, count(decimal32))), minus(sum(decimal32), multiply(3, count(decimal32)))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    minus(minus(sum(decimal32), multiply(2, count(decimal32))), minus(sum(decimal32), multiply(3, count(decimal32)))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 10, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        CONSTANT id: 12, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 13, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 14, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 18, nodes: 1
+                        COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+                  FUNCTION id: 19, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 20, nodes: 2
+                        CONSTANT id: 21, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 22, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 23, nodes: 1
+                              COLUMN id: 8, column_name: decimal32, result_type: Decimal(9, 5), source_id: 9
+  JOIN TREE
+    TABLE id: 9, alias: __table1, table_name: default.test_table
+EXPLAIN QUERY TREE (SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table);
+QUERY id: 0
+  PROJECTION COLUMNS
+    plus(minus(multiply(2, count(decimal32)), sum(decimal32)), minus(multiply(3, count(decimal32)), sum(decimal32))) Decimal(38, 5)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: plus, function_type: ordinary, result_type: Decimal(38, 5)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  FUNCTION id: 6, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        CONSTANT id: 8, constant_value: UInt64_2, constant_value_type: UInt8
+                        FUNCTION id: 9, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 10, nodes: 1
+                              COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+                  FUNCTION id: 13, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 14, nodes: 1
+                        COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+            FUNCTION id: 15, function_name: minus, function_type: ordinary, result_type: Decimal(38, 5)
+              ARGUMENTS
+                LIST id: 16, nodes: 2
+                  FUNCTION id: 17, function_name: multiply, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 18, nodes: 2
+                        CONSTANT id: 19, constant_value: UInt64_3, constant_value_type: UInt8
+                        FUNCTION id: 20, function_name: count, function_type: aggregate, result_type: UInt64
+                          ARGUMENTS
+                            LIST id: 21, nodes: 1
+                              COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+                  FUNCTION id: 22, function_name: sum, function_type: aggregate, result_type: Decimal(38, 5)
+                    ARGUMENTS
+                      LIST id: 23, nodes: 1
+                        COLUMN id: 11, column_name: decimal32, result_type: Decimal(9, 5), source_id: 12
+  JOIN TREE
+    TABLE id: 12, alias: __table1, table_name: default.test_table
diff --git a/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.sql b/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.sql
new file mode 100644
index 00000000000..43dad8eb8e0
--- /dev/null
+++ b/tests/queries/0_stateless/02932_analyzer_rewrite_sum_column_and_constant.sql
@@ -0,0 +1,210 @@
+SET allow_experimental_analyzer=1;
+
+-- { echoOn }
+Select sum(number + 1) from numbers(10);
+Select sum(1 + number) from numbers(10);
+Select sum(number - 1) from numbers(10);
+Select sum(1 - number) from numbers(10);
+EXPLAIN QUERY TREE (Select sum(number + 1) from numbers(10));
+EXPLAIN QUERY TREE (Select sum(1 + number) from numbers(10));
+EXPLAIN QUERY TREE (Select sum(number - 1) from numbers(10));
+EXPLAIN QUERY TREE (Select sum(1 - number) from numbers(10));
+
+WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0);
+WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0);
+EXPLAIN QUERY TREE (WITH 1::Nullable(UInt64) as my_literal Select sum(number + my_literal) from numbers(0));
+EXPLAIN QUERY TREE (WITH 1::Nullable(UInt64) as my_literal Select sum(number) + my_literal * count() from numbers(0));
+-- { echoOff }
+
+DROP TABLE IF EXISTS test_table;
+
+CREATE TABLE test_table
+(
+    uint64 UInt64,
+    float64 Float64,
+    decimal32 Decimal32(5),
+) ENGINE=MergeTree ORDER BY uint64;
+
+INSERT INTO test_table VALUES (1, 1.1, 1.11);
+INSERT INTO test_table VALUES (2, 2.2, 2.22);
+INSERT INTO test_table VALUES (3, 3.3, 3.33);
+INSERT INTO test_table VALUES (4, 4.4, 4.44);
+INSERT INTO test_table VALUES (5, 5.5, 5.55);
+
+-- { echoOn }
+SELECT sum(uint64 + 1 AS i) from test_table where i > 0;
+SELECT sum(uint64 + 1) AS j from test_table having j > 0;
+SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1 AS i) from test_table where i > 0);
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1) AS j from test_table having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 1 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum((uint64 AS m) + (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(((uint64 AS m) + (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(1 + uint64 AS i) from test_table where i > 0;
+SELECT sum(1 + uint64) AS j from test_table having j > 0;
+SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64 AS i) from test_table where i > 0);
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64) AS j from test_table having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(1 + uint64 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum((1 AS m) + (uint64 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(((1 AS m) + (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(uint64 - 1 AS i) from test_table where i > 0;
+SELECT sum(uint64 - 1) AS j from test_table having j > 0;
+SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0;
+SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0;
+SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0;
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1 AS i) from test_table where i > 0);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1) AS j from test_table having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 1 AS i) j from test_table where i > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum((uint64 AS m) - (1 AS n)) j from test_table where m > 0 and n > 0 having j > 0);
+EXPLAIN QUERY TREE (SELECT sum(((uint64 AS m) - (1 AS n)) AS i) j from test_table where m > 0 and n > 0 and i > 0 having j > 0);
+
+SELECT sum(1 - uint64 AS i) from test_table;
+SELECT sum(1 - uint64) AS j from test_table;
+SELECT sum(1 - uint64 AS i) j from test_table;
+SELECT sum((1 AS m) - (uint64 AS n)) j from test_table;
+SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table;
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64 AS i) from test_table where i > 0);
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64) AS j from test_table having j < 0);
+EXPLAIN QUERY TREE (SELECT sum(1 - uint64 AS i) j from test_table where i > 0 having j < 0);
+EXPLAIN QUERY TREE (SELECT sum((1 AS m) - (uint64 AS n)) j from test_table where m > 0 and n > 0 having j < 0);
+EXPLAIN QUERY TREE (SELECT sum(((1 AS m) - (uint64 AS n)) AS i) j from test_table where m > 0 and n > 0 and i < 0 having j < 0);
+
+SELECT sum(uint64 + 2.11) From test_table;
+SELECT sum(2.11 + uint64) From test_table;
+SELECT sum(uint64 - 2.11) From test_table;
+SELECT sum(2.11 - uint64) From test_table;
+SELECT sum(uint64) + 2.11 * count(uint64) From test_table;
+SELECT 2.11 * count(uint64) + sum(uint64) From test_table;
+SELECT sum(uint64) - 2.11 * count(uint64) From test_table;
+SELECT 2.11 * count(uint64) - sum(uint64) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2.11) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2.11 + uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2.11) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2.11 - uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64) + 2.11 * count(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2.11 * count(uint64) + sum(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64) - 2.11 * count(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2.11 * count(uint64) - sum(uint64) From test_table);
+
+SELECT sum(uint64 + 2) From test_table;
+SELECT sum(2 + uint64) From test_table;
+SELECT sum(uint64 - 2) From test_table;
+SELECT sum(2 - uint64) From test_table;
+SELECT sum(uint64) + 2 * count(uint64) From test_table;
+SELECT 2 * count(uint64) + sum(uint64) From test_table;
+SELECT sum(uint64) - 2 * count(uint64) From test_table;
+SELECT 2 * count(uint64) - sum(uint64) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 + uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64) + 2 * count(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(uint64) + sum(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64) - 2 * count(uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(uint64) - sum(uint64) From test_table);
+
+SELECT sum(float64 + 2) From test_table;
+SELECT sum(2 + float64) From test_table;
+SELECT sum(float64 - 2) From test_table;
+SELECT sum(2 - float64) From test_table;
+SELECT sum(float64) + 2 * count(float64) From test_table;
+SELECT 2 * count(float64) + sum(float64) From test_table;
+SELECT sum(float64) - 2 * count(float64) From test_table;
+SELECT 2 * count(float64) - sum(float64) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 + float64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - float64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64) + 2 * count(float64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(float64) + sum(float64) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64) - 2 * count(float64) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(float64) - sum(float64) From test_table);
+
+SELECT sum(decimal32 + 2) From test_table;
+SELECT sum(2 + decimal32) From test_table;
+SELECT sum(decimal32 - 2) From test_table;
+SELECT sum(2 - decimal32) From test_table;
+SELECT sum(decimal32) + 2 * count(decimal32) From test_table;
+SELECT 2 * count(decimal32) + sum(decimal32) From test_table;
+SELECT sum(decimal32) - 2 * count(decimal32) From test_table;
+SELECT 2 * count(decimal32) - sum(decimal32) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 + decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32) + 2 * count(decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(decimal32) + sum(decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32) - 2 * count(decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT 2 * count(decimal32) - sum(decimal32) From test_table);
+
+SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table;
+SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table;
+SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table;
+SELECT sum(2 - uint64) - sum(3 - uint64) From test_table;
+SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table;
+SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table;
+SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) + sum(uint64 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64 + 2) - sum(uint64 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) + sum(uint64 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(uint64 - 2) - sum(uint64 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - uint64) - sum(3 - uint64) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(uint64) + 2 * count(uint64)) + (sum(uint64) + 3 * count(uint64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(uint64) + 2 * count(uint64)) - (sum(uint64) + 3 * count(uint64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(uint64) - 2 * count(uint64)) + (sum(uint64) - 3 * count(uint64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(uint64) - 2 * count(uint64)) - (sum(uint64) - 3 * count(uint64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (2 * count(uint64) - sum(uint64)) + (3 * count(uint64) - sum(uint64)) From test_table);
+
+SELECT sum(float64 + 2) + sum(float64 + 3) From test_table;
+SELECT sum(float64 + 2) - sum(float64 + 3) From test_table;
+SELECT sum(float64 - 2) + sum(float64 - 3) From test_table;
+SELECT sum(float64 - 2) - sum(float64 - 3) From test_table;
+SELECT sum(2 - float64) - sum(3 - float64) From test_table;
+SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table;
+SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table;
+SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table;
+SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table;
+SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) + sum(float64 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64 + 2) - sum(float64 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) + sum(float64 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(float64 - 2) - sum(float64 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - float64) - sum(3 - float64) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(float64) + 2 * count(float64)) + (sum(float64) + 3 * count(float64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(float64) + 2 * count(float64)) - (sum(float64) + 3 * count(float64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(float64) - 2 * count(float64)) + (sum(float64) - 3 * count(float64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(float64) - 2 * count(float64)) - (sum(float64) - 3 * count(float64)) From test_table);
+EXPLAIN QUERY TREE (SELECT (2 * count(float64) - sum(float64)) + (3 * count(float64) - sum(float64)) From test_table);
+
+SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table;
+SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table;
+SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table;
+SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table;
+SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table;
+SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table;
+SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table;
+SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table;
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) + sum(decimal32 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32 + 2) - sum(decimal32 + 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) + sum(decimal32 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(decimal32 - 2) - sum(decimal32 - 3) From test_table);
+EXPLAIN QUERY TREE (SELECT sum(2 - decimal32) - sum(3 - decimal32) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) + 2 * count(decimal32)) + (sum(decimal32) + 3 * count(decimal32)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) + 2 * count(decimal32)) - (sum(decimal32) + 3 * count(decimal32)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) - 2 * count(decimal32)) + (sum(decimal32) - 3 * count(decimal32)) From test_table);
+EXPLAIN QUERY TREE (SELECT (sum(decimal32) - 2 * count(decimal32)) - (sum(decimal32) - 3 * count(decimal32)) From test_table);
+EXPLAIN QUERY TREE (SELECT (2 * count(decimal32) - sum(decimal32)) + (3 * count(decimal32) - sum(decimal32)) From test_table);
+-- { echoOff }
+
+DROP TABLE IF EXISTS test_table;
diff --git a/tests/queries/0_stateless/02932_group_by_null_fuzzer.sql b/tests/queries/0_stateless/02932_group_by_null_fuzzer.sql
index 0c28c120d40..603c7783ef8 100644
--- a/tests/queries/0_stateless/02932_group_by_null_fuzzer.sql
+++ b/tests/queries/0_stateless/02932_group_by_null_fuzzer.sql
@@ -1,5 +1,6 @@
 -- https://github.com/ClickHouse/ClickHouse/issues/43202
 -- Queries are generated by the fuzzer, so don't expect them to make sense
+SET enable_positional_arguments=0;
 SELECT NULL, '' FROM (SELECT toNullable(''), NULL AS key GROUP BY GROUPING SETS ((NULL))) AS s1 ALL LEFT JOIN (SELECT '' AS key, NULL AS value GROUP BY GROUPING SETS (('')) WITH TOTALS UNION ALL SELECT NULL AS key, toNullable(NULL) AS value GROUP BY '', NULL, '' WITH TOTALS) AS s2 USING (key);
 SELECT NULL GROUP BY NULL WITH TOTALS;
 SELECT 1048575, NULL, b FROM (SELECT '25.5' AS a, NULL, NULL AS b GROUP BY GROUPING SETS ((0.0001)) WITH TOTALS) AS js1 ANY RIGHT JOIN (SELECT NULL AS a, NULL AS b WHERE NULL GROUP BY NULL, -9223372036854775807 WITH CUBE WITH TOTALS UNION ALL SELECT NULL AS a, NULL AS b GROUP BY 1, '21474836.46' WITH TOTALS) AS js2 USING (a, b) ORDER BY nan DESC NULLS LAST, '9223372036854775807' DESC NULLS LAST, a ASC NULLS LAST;
diff --git a/tests/queries/0_stateless/02932_kill_query_sleep.sh b/tests/queries/0_stateless/02932_kill_query_sleep.sh
index 84e84204aa1..5ae47755722 100755
--- a/tests/queries/0_stateless/02932_kill_query_sleep.sh
+++ b/tests/queries/0_stateless/02932_kill_query_sleep.sh
@@ -10,7 +10,7 @@ function wait_query_started()
     local query_id="$1"
     timeout=60
     start=$EPOCHSECONDS
-    while [[ $($CLICKHOUSE_CLIENT --query="SELECT count() FROM system.processes WHERE query_id='$query_id'") == 0 ]]; do
+    while [[ $($CLICKHOUSE_CLIENT --query="SELECT count() FROM system.processes WHERE query_id='$query_id' SETTINGS use_query_cache=0") == 0 ]]; do
           if ((EPOCHSECONDS-start > timeout )); then
              echo "Timeout while waiting for query $query_id to start"
              exit 1
@@ -26,7 +26,7 @@ function kill_query()
     $CLICKHOUSE_CLIENT --query "KILL QUERY WHERE query_id='$query_id'" >/dev/null
     timeout=60
     start=$EPOCHSECONDS
-    while [[ $($CLICKHOUSE_CLIENT --query="SELECT count() FROM system.processes WHERE query_id='$query_id'") != 0 ]]; do
+    while [[ $($CLICKHOUSE_CLIENT --query="SELECT count() FROM system.processes WHERE query_id='$query_id' SETTINGS use_query_cache=0") != 0 ]]; do
           if ((EPOCHSECONDS-start > timeout )); then
              echo "Timeout while waiting for query $query_id to cancel"
              exit 1
@@ -49,4 +49,4 @@ echo "Cancelling query"
 kill_query "$sleep_query_id"
 
 $CLICKHOUSE_CLIENT --query "SYSTEM FLUSH LOGS;"
-$CLICKHOUSE_CLIENT --query "SELECT exception FROM system.query_log WHERE query_id='$sleep_query_id' AND current_database = currentDatabase()" | grep -oF "QUERY_WAS_CANCELLED"
+$CLICKHOUSE_CLIENT --query "SELECT exception FROM system.query_log WHERE query_id='$sleep_query_id' AND current_database = '$CLICKHOUSE_DATABASE'" | grep -oF "QUERY_WAS_CANCELLED"
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views.reference b/tests/queries/0_stateless/02932_refreshable_materialized_views.reference
index 4c5b678cfa5..2eb41590af1 100644
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views.reference
+++ b/tests/queries/0_stateless/02932_refreshable_materialized_views.reference
@@ -1,14 +1,14 @@
 <1: created view>	a	[]		1
-CREATE MATERIALIZED VIEW default.a\nREFRESH AFTER 1 SECOND\n(\n    `x` UInt64\n)\nENGINE = Memory AS\nSELECT number AS x\nFROM numbers(2)\nUNION ALL\nSELECT rand64() AS x
+CREATE MATERIALIZED VIEW default.a\nREFRESH AFTER 2 SECOND\n(\n    `x` UInt64\n)\nENGINE = Memory\nAS SELECT number AS x\nFROM numbers(2)\nUNION ALL\nSELECT rand64() AS x
 <2: refreshed>	3	1	1
-<3: time difference at least>	500
-<4: next refresh in>	1
+<3: time difference at least>	1000
+<4: next refresh in>	2
 <4.5: altered>	Scheduled	Finished	2052-01-01 00:00:00
-CREATE MATERIALIZED VIEW default.a\nREFRESH EVERY 2 YEAR\n(\n    `x` Int16\n)\nENGINE = Memory AS\nSELECT x * 2 AS x\nFROM default.src
+CREATE MATERIALIZED VIEW default.a\nREFRESH EVERY 2 YEAR\n(\n    `x` UInt64\n)\nENGINE = Memory\nAS SELECT x * 2 AS x\nFROM default.src
 <5: no refresh>	3
 <6: refreshed>	2
 <7: refreshed>	Scheduled	Finished	2054-01-01 00:00:00
-CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR DEPENDS ON default.a\n(\n    `y` Int32\n)\nENGINE = MergeTree\nORDER BY y\nSETTINGS index_granularity = 8192 AS\nSELECT x * 10 AS y\nFROM default.a
+CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR DEPENDS ON default.a\n(\n    `y` Int32\n)\nENGINE = MergeTree\nORDER BY y\nSETTINGS index_granularity = 8192\nAS SELECT x * 10 AS y\nFROM default.a
 <8: refreshed>	20
 <9: refreshed>	a	Scheduled	Finished	2054-01-01 00:00:00
 <9: refreshed>	b	Scheduled	Finished	2054-01-01 00:00:00
@@ -25,7 +25,7 @@ CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR DEPENDS ON default.a\n(
 <17: chain-refreshed>	a	Scheduled	2062-01-01 00:00:00
 <17: chain-refreshed>	b	Scheduled	2062-01-01 00:00:00
 <18: removed dependency>	b	Scheduled	[]	2062-03-03 03:03:03	2064-01-01 00:00:00	5
-CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR\n(\n    `y` Int32\n)\nENGINE = MergeTree\nORDER BY y\nSETTINGS index_granularity = 8192 AS\nSELECT x * 10 AS y\nFROM default.a
+CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR\n(\n    `y` Int32\n)\nENGINE = MergeTree\nORDER BY y\nSETTINGS index_granularity = 8192\nAS SELECT x * 10 AS y\nFROM default.a
 <19: exception>	1
 <20: unexception>	1
 <21: rename>	1
@@ -34,9 +34,9 @@ CREATE MATERIALIZED VIEW default.b\nREFRESH EVERY 2 YEAR\n(\n    `y` Int32\n)\nE
 <24: rename during refresh>	1
 <25: rename during refresh>	f	Running
 <27: cancelled>	f	Scheduled
-CREATE MATERIALIZED VIEW default.g\nREFRESH EVERY 1 WEEK OFFSET 3 DAY 4 HOUR RANDOMIZE FOR 4 DAY 1 HOUR\n(\n    `x` Int64\n)\nENGINE = Memory AS\nSELECT 42
+CREATE MATERIALIZED VIEW default.g\nREFRESH EVERY 1 WEEK OFFSET 3 DAY 4 HOUR RANDOMIZE FOR 4 DAY 1 HOUR\n(\n    `x` Int64\n)\nENGINE = Memory\nAS SELECT 42
 <29: randomize>	1	1
-CREATE MATERIALIZED VIEW default.h\nREFRESH EVERY 1 SECOND TO default.dest\n(\n    `x` Int64\n) AS\nSELECT x * 10 AS x\nFROM default.src
+CREATE MATERIALIZED VIEW default.h\nREFRESH EVERY 1 SECOND TO default.dest\n(\n    `x` Int64\n)\nAS SELECT x * 10 AS x\nFROM default.src
 <30: to existing table>	10
 <31: to existing table>	10
 <31: to existing table>	20
diff --git a/tests/queries/0_stateless/02932_refreshable_materialized_views.sh b/tests/queries/0_stateless/02932_refreshable_materialized_views.sh
index 8daea063fc5..89942e25b67 100755
--- a/tests/queries/0_stateless/02932_refreshable_materialized_views.sh
+++ b/tests/queries/0_stateless/02932_refreshable_materialized_views.sh
@@ -18,7 +18,7 @@ $CLICKHOUSE_CLIENT -nq "create view refreshes as select * from system.view_refre
 # Basic refreshing.
 $CLICKHOUSE_CLIENT -nq "
     create materialized view a
-        refresh after 1 second
+        refresh after 2 second
         engine Memory
         empty
         as select number as x from numbers(2) union all select rand64() as x"
@@ -29,6 +29,7 @@ while [ "`$CLICKHOUSE_CLIENT -nq "select last_refresh_result from refreshes -- $
 do
     sleep 0.1
 done
+start_time="`$CLICKHOUSE_CLIENT -nq "select reinterpret(now64(), 'Int64')"`"
 # Check table contents.
 $CLICKHOUSE_CLIENT -nq "select '<2: refreshed>', count(), sum(x=0), sum(x=1) from a"
 # Wait for table contents to change.
@@ -39,7 +40,6 @@ do
     [ "$res2" == "$res1" ] || break
     sleep 0.1
 done
-time2="`$CLICKHOUSE_CLIENT -nq "select reinterpret(now64(), 'Int64')"`"
 # Wait for another change.
 while :
 do
@@ -47,11 +47,11 @@ do
     [ "$res3" == "$res2" ] || break
     sleep 0.1
 done
-# Check that the two changes were at least 500ms apart, in particular that we're not refreshing
+# Check that the two changes were at least 1 second apart, in particular that we're not refreshing
 # like crazy. This is potentially flaky, but we need at least one test that uses non-mocked timer
 # to make sure the clock+timer code works at all. If it turns out flaky, increase refresh period above.
 $CLICKHOUSE_CLIENT -nq "
-    select '<3: time difference at least>', min2(reinterpret(now64(), 'Int64') - $time2, 500);
+    select '<3: time difference at least>', min2(reinterpret(now64(), 'Int64') - $start_time, 1000);
     select '<4: next refresh in>', next_refresh_time-last_refresh_time from refreshes;"
 
 # Create a source table from which views will read.
@@ -61,7 +61,7 @@ $CLICKHOUSE_CLIENT -nq "
 # Switch to fake clock, change refresh schedule, change query.
 $CLICKHOUSE_CLIENT -nq "
     system test view a set fake time '2050-01-01 00:00:01';"
-while [ "`$CLICKHOUSE_CLIENT -nq "select status, last_refresh_time, next_refresh_time from refreshes -- $LINENO" | xargs`" != 'Scheduled 2050-01-01 00:00:01 2050-01-01 00:00:02' ]
+while [ "`$CLICKHOUSE_CLIENT -nq "select status, last_refresh_time, next_refresh_time from refreshes -- $LINENO" | xargs`" != 'Scheduled 2050-01-01 00:00:01 2050-01-01 00:00:03' ]
 do
     sleep 0.1
 done
diff --git a/tests/queries/0_stateless/02932_set_ttl_where.reference b/tests/queries/0_stateless/02932_set_ttl_where.reference
new file mode 100644
index 00000000000..bb0b1cf658d
--- /dev/null
+++ b/tests/queries/0_stateless/02932_set_ttl_where.reference
@@ -0,0 +1,3 @@
+0
+0
+0
diff --git a/tests/queries/0_stateless/02932_set_ttl_where.sql b/tests/queries/0_stateless/02932_set_ttl_where.sql
new file mode 100644
index 00000000000..ee8473e1af2
--- /dev/null
+++ b/tests/queries/0_stateless/02932_set_ttl_where.sql
@@ -0,0 +1,18 @@
+-- Tags: no-ordinary-database
+
+create or replace table t_temp (
+    a UInt32,
+    timestamp DateTime
+)
+engine = MergeTree
+order by a
+TTL timestamp + INTERVAL 2 SECOND WHERE a in (select number from system.numbers limit 100_000);
+
+select sleep(1);
+insert into t_temp select rand(), now() from system.numbers limit 1_000_000;
+select sleep(1);
+insert into t_temp select rand(), now() from system.numbers limit 1_000_000;
+select sleep(1);
+optimize table t_temp final;
+
+DROP TABLE t_temp;
diff --git a/tests/queries/0_stateless/02933_compare_with_bool_as_string.reference b/tests/queries/0_stateless/02933_compare_with_bool_as_string.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02933_compare_with_bool_as_string.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02933_compare_with_bool_as_string.sql b/tests/queries/0_stateless/02933_compare_with_bool_as_string.sql
new file mode 100644
index 00000000000..5dbacd5fbbf
--- /dev/null
+++ b/tests/queries/0_stateless/02933_compare_with_bool_as_string.sql
@@ -0,0 +1 @@
+select true = 'true';
diff --git a/tests/queries/0_stateless/02933_paste_join.reference b/tests/queries/0_stateless/02933_paste_join.reference
index 5ff13917957..81a8ac22da4 100644
--- a/tests/queries/0_stateless/02933_paste_join.reference
+++ b/tests/queries/0_stateless/02933_paste_join.reference
@@ -82,3 +82,26 @@ UInt64
 7	2
 8	1
 9	0
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+1	2	3
+0	0
+1	1
+0
+1
diff --git a/tests/queries/0_stateless/02933_paste_join.sql b/tests/queries/0_stateless/02933_paste_join.sql
index b103bf72160..604078d1c3a 100644
--- a/tests/queries/0_stateless/02933_paste_join.sql
+++ b/tests/queries/0_stateless/02933_paste_join.sql
@@ -1,6 +1,6 @@
 select * from (SELECT number as a FROM numbers(10)) t1 PASTE JOIN (select number as a from numbers(10)) t2;
 select * from (SELECT number as a FROM numbers(10)) t1 PASTE JOIN (select number as a from numbers(10) order by a desc) t2;
-create table if not exists test (num UInt64) engine=Memory;
+create table if not exists test (number UInt64) engine=Memory;
 insert into test select number from numbers(6);
 insert into test select number from numbers(5);
 SELECT * FROM (SELECT 1) t1 PASTE JOIN (SELECT 2) SETTINGS joined_subquery_requires_alias=0;
@@ -35,3 +35,21 @@ SET max_threads = 2;
 select * from (SELECT number as a FROM numbers_mt(10)) t1 PASTE JOIN (select number as a from numbers(10) ORDER BY a DESC) t2 SETTINGS max_block_size=10;
 select * from (SELECT number as a FROM numbers(10)) t1 ANY PASTE JOIN (select number as a from numbers(10)) t2; -- { clientError SYNTAX_ERROR }
 select * from (SELECT number as a FROM numbers(10)) t1 ALL PASTE JOIN (select number as a from numbers(10)) t2; -- { clientError SYNTAX_ERROR }
+
+TRUNCATE TABLE test;
+INSERT INTO test SELECT number from numbers(6);
+SELECT * FROM (SELECT number FROM test) PASTE JOIN (SELECT number FROM numbers(6) ORDER BY number) SETTINGS joined_subquery_requires_alias = 0;
+SELECT * FROM (SELECT number FROM test PASTE JOIN (Select number FROM numbers(7))) PASTE JOIN (SELECT number FROM numbers(6) PASTE JOIN (SELECT number FROM test)) SETTINGS joined_subquery_requires_alias = 0;
+SELECT * FROM (SELECT number FROM test PASTE JOIN (SELECT number FROM test PASTE JOIN (Select number FROM numbers(7)))) PASTE JOIN (SELECT number FROM numbers(6) PASTE JOIN (SELECT number FROM test)) SETTINGS joined_subquery_requires_alias = 0;
+SELECT * FROM (SELECT 1 AS a) PASTE JOIN (SELECT 2 AS b) PASTE JOIN (SELECT 3 AS c) SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM (SELECT 1 AS a) PASTE JOIN (SELECT 2 AS b) PASTE JOIN (SELECT 3 AS a) SETTINGS allow_experimental_analyzer = 1; -- { serverError AMBIGUOUS_COLUMN_NAME }
+
+SET allow_experimental_analyzer = 1;
+CREATE TABLE test1 (a Int32) engine=MergeTree order by a;
+INSERT INTO test1 SELECT * FROM numbers(2);
+CREATE TABLE test2 (a Int32) engine=MergeTree order by a;
+INSERT INTO test2 SELECT * FROM numbers(2);
+SELECT * FROM test1 PASTE JOIN (SELECT * FROM test2);
+SELECT a `test2.a` FROM test1 PASTE JOIN test2;
+SELECT * FROM test1 `test2.a` PASTE JOIN test2 `test2.a`; -- { serverError MULTIPLE_EXPRESSIONS_FOR_ALIAS }
+SELECT * FROM test1 PASTE JOIN (SELECT number AS a FROM numbers(2) ORDER BY number DESC); -- { serverError AMBIGUOUS_COLUMN_NAME }
diff --git a/tests/queries/0_stateless/02935_date_trunc_case_unsensitiveness.sql b/tests/queries/0_stateless/02935_date_trunc_case_unsensitiveness.sql
index ecf6877d477..06cda16fb01 100644
--- a/tests/queries/0_stateless/02935_date_trunc_case_unsensitiveness.sql
+++ b/tests/queries/0_stateless/02935_date_trunc_case_unsensitiveness.sql
@@ -7,3 +7,6 @@ SELECT dateTrunc('Week', toDate('2022-03-01'));
 SELECT dateTrunc('day', toDateTime('2022-03-01 12:55:55'));
 SELECT dateTrunc('month', toDateTime64('2022-03-01 12:55:55', 2));
 SELECT dateTrunc('week', toDate('2022-03-01'));
+SELECT dateTrunc('Nanosecond', toDate('2022-03-01')); -- {  serverError 36 }
+SELECT dateTrunc('MicroSecond', toDate('2022-03-01')); -- {  serverError 36 }
+SELECT dateTrunc('MILLISECOND', toDate('2022-03-01')); -- {  serverError 36 }
diff --git a/tests/queries/0_stateless/02935_external_table_enum_type.reference b/tests/queries/0_stateless/02935_external_table_enum_type.reference
new file mode 100644
index 00000000000..d13bb1e990c
--- /dev/null
+++ b/tests/queries/0_stateless/02935_external_table_enum_type.reference
@@ -0,0 +1,10 @@
+foo	1
+bar	2
+foo	1
+bar	2
+true
+true
+true
+[1]
+('foo',1)
+(1,1)
diff --git a/tests/queries/0_stateless/02935_external_table_enum_type.sh b/tests/queries/0_stateless/02935_external_table_enum_type.sh
new file mode 100755
index 00000000000..bbbf79fce4a
--- /dev/null
+++ b/tests/queries/0_stateless/02935_external_table_enum_type.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+http_url="http://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/?"
+
+curl -s "${http_url}temp_structure=x+Enum8('foo'%3D1,'bar'%3D2),y+Int" -F "$(printf 'temp='"foo"'\t1');filename=data1" -F "query=SELECT * FROM temp"
+curl -s "${http_url}temp_types=Enum8('foo'%3D1,'bar'%3D2),Int" -F "$(printf 'temp='"bar"'\t2');filename=data1" -F "query=SELECT * FROM temp"
+echo -ne 'foo\t1' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Enum8('foo'=1,'bar'=2),y Int"
+echo -ne 'bar\t2' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --types="Enum8('foo'=1,'bar'=2),Int"
+
+# https://github.com/ClickHouse/ClickHouse/issues/62108
+echo -ne 'true' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Bool"
+echo -ne 'true' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --types="Bool"
+
+# Test for some complex and custome types
+echo -ne 'true' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Nullable(FixedString(4))"
+echo -ne '[1]' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Array(UInt8)"
+echo -ne '('"'"'foo'"'"',1)' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Tuple(String, UInt8)"
+echo -ne '(1,1)' | ${CLICKHOUSE_CLIENT} --query="select * from tmp" --external --file=- --name=tmp --structure="x Point"
diff --git a/tests/queries/0_stateless/02940_variant_text_deserialization.reference b/tests/queries/0_stateless/02940_variant_text_deserialization.reference
new file mode 100644
index 00000000000..8836e6c4e57
--- /dev/null
+++ b/tests/queries/0_stateless/02940_variant_text_deserialization.reference
@@ -0,0 +1,516 @@
+JSON
+String
+{"v":null,"variantElement(v, 'String')":null}
+{"v":"string","variantElement(v, 'String')":"string"}
+{"v":"42","variantElement(v, 'String')":null}
+FixedString
+{"v":null,"variantElement(v, 'FixedString(4)')":null}
+{"v":"string","variantElement(v, 'FixedString(4)')":null}
+{"v":"abcd","variantElement(v, 'FixedString(4)')":"abcd"}
+Bool
+{"v":null,"variantElement(v, 'Bool')":null}
+{"v":"string","variantElement(v, 'Bool')":null}
+{"v":true,"variantElement(v, 'Bool')":true}
+Integers
+{"v":null,"variantElement(v, 'Int8')":null}
+{"v":"string","variantElement(v, 'Int8')":null}
+{"v":-1,"variantElement(v, 'Int8')":-1}
+{"v":0,"variantElement(v, 'Int8')":0}
+{"v":"10000000000","variantElement(v, 'Int8')":null}
+{"v":null,"variantElement(v, 'UInt8')":null}
+{"v":"string","variantElement(v, 'UInt8')":null}
+{"v":"-1","variantElement(v, 'UInt8')":null}
+{"v":0,"variantElement(v, 'UInt8')":0}
+{"v":"10000000000","variantElement(v, 'UInt8')":null}
+{"v":null,"variantElement(v, 'Int16')":null}
+{"v":"string","variantElement(v, 'Int16')":null}
+{"v":-1,"variantElement(v, 'Int16')":-1}
+{"v":0,"variantElement(v, 'Int16')":0}
+{"v":"10000000000","variantElement(v, 'Int16')":null}
+{"v":null,"variantElement(v, 'UInt16')":null}
+{"v":"string","variantElement(v, 'UInt16')":null}
+{"v":"-1","variantElement(v, 'UInt16')":null}
+{"v":0,"variantElement(v, 'UInt16')":0}
+{"v":"10000000000","variantElement(v, 'UInt16')":null}
+{"v":null,"variantElement(v, 'Int32')":null}
+{"v":"string","variantElement(v, 'Int32')":null}
+{"v":-1,"variantElement(v, 'Int32')":-1}
+{"v":0,"variantElement(v, 'Int32')":0}
+{"v":"10000000000","variantElement(v, 'Int32')":null}
+{"v":null,"variantElement(v, 'UInt32')":null}
+{"v":"string","variantElement(v, 'UInt32')":null}
+{"v":"-1","variantElement(v, 'UInt32')":null}
+{"v":0,"variantElement(v, 'UInt32')":0}
+{"v":"10000000000","variantElement(v, 'UInt32')":null}
+{"v":null,"variantElement(v, 'Int64')":null}
+{"v":"string","variantElement(v, 'Int64')":null}
+{"v":"-1","variantElement(v, 'Int64')":"-1"}
+{"v":"0","variantElement(v, 'Int64')":"0"}
+{"v":"10000000000000000000000","variantElement(v, 'Int64')":null}
+{"v":null,"variantElement(v, 'UInt64')":null}
+{"v":"string","variantElement(v, 'UInt64')":null}
+{"v":"-1","variantElement(v, 'UInt64')":null}
+{"v":"0","variantElement(v, 'UInt64')":"0"}
+{"v":"10000000000000000000000","variantElement(v, 'UInt64')":null}
+{"v":null,"variantElement(v, 'Int128')":null}
+{"v":"string","variantElement(v, 'Int128')":null}
+{"v":"-1","variantElement(v, 'Int128')":"-1"}
+{"v":"0","variantElement(v, 'Int128')":"0"}
+{"v":null,"variantElement(v, 'UInt128')":null}
+{"v":"string","variantElement(v, 'UInt128')":null}
+{"v":"-1","variantElement(v, 'UInt128')":null}
+{"v":"0","variantElement(v, 'UInt128')":"0"}
+Floats
+{"v":null,"variantElement(v, 'Float32')":null}
+{"v":"string","variantElement(v, 'Float32')":null}
+{"v":42.42,"variantElement(v, 'Float32')":42.42}
+{"v":null,"variantElement(v, 'Float64')":null}
+{"v":"string","variantElement(v, 'Float64')":null}
+{"v":42.42,"variantElement(v, 'Float64')":42.42}
+Decimals
+{"v":null,"variantElement(v, 'Decimal32(6)')":null}
+{"v":"string","variantElement(v, 'Decimal32(6)')":null}
+{"v":42.42,"variantElement(v, 'Decimal32(6)')":42.42}
+{"v":"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242","variantElement(v, 'Decimal32(6)')":null}
+{"v":null,"variantElement(v, 'Decimal64(6)')":null}
+{"v":"string","variantElement(v, 'Decimal64(6)')":null}
+{"v":42.42,"variantElement(v, 'Decimal64(6)')":42.42}
+{"v":"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242","variantElement(v, 'Decimal64(6)')":null}
+{"v":null,"variantElement(v, 'Decimal128(6)')":null}
+{"v":"string","variantElement(v, 'Decimal128(6)')":null}
+{"v":42.42,"variantElement(v, 'Decimal128(6)')":42.42}
+{"v":"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242","variantElement(v, 'Decimal128(6)')":null}
+{"v":null,"variantElement(v, 'Decimal256(6)')":null}
+{"v":"string","variantElement(v, 'Decimal256(6)')":null}
+{"v":42.42,"variantElement(v, 'Decimal256(6)')":42.42}
+{"v":"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242","variantElement(v, 'Decimal256(6)')":null}
+Dates and DateTimes
+{"v":null,"variantElement(v, 'Date')":null}
+{"v":"string","variantElement(v, 'Date')":null}
+{"v":"2020-01-01","variantElement(v, 'Date')":"2020-01-01"}
+{"v":"2020-01-01 00:00:00.999","variantElement(v, 'Date')":null}
+{"v":null,"variantElement(v, 'Date32')":null}
+{"v":"string","variantElement(v, 'Date32')":null}
+{"v":"1900-01-01","variantElement(v, 'Date32')":"1900-01-01"}
+{"v":"2020-01-01 00:00:00.999","variantElement(v, 'Date32')":null}
+{"v":null,"variantElement(v, 'DateTime')":null}
+{"v":"string","variantElement(v, 'DateTime')":null}
+{"v":"2020-01-01 00:00:00","variantElement(v, 'DateTime')":"2020-01-01 00:00:00"}
+{"v":"2020-01-01 00:00:00.999","variantElement(v, 'DateTime')":null}
+{"v":null,"variantElement(v, 'DateTime64')":null}
+{"v":"string","variantElement(v, 'DateTime64')":null}
+{"v":"2020-01-01 00:00:00.999","variantElement(v, 'DateTime64')":"2020-01-01 00:00:00.999"}
+{"v":"2020-01-01 00:00:00.999999999 ABC","variantElement(v, 'DateTime64')":null}
+UUID
+{"v":null,"variantElement(v, 'UUID')":null}
+{"v":"string","variantElement(v, 'UUID')":null}
+{"v":"c8619cca-0caa-445e-ae76-1d4f6e0b3927","variantElement(v, 'UUID')":"c8619cca-0caa-445e-ae76-1d4f6e0b3927"}
+IPv4
+{"v":null,"variantElement(v, 'IPv4')":null}
+{"v":"string","variantElement(v, 'IPv4')":null}
+{"v":"127.0.0.1","variantElement(v, 'IPv4')":"127.0.0.1"}
+IPv6
+{"v":null,"variantElement(v, 'IPv6')":null}
+{"v":"string","variantElement(v, 'IPv6')":null}
+{"v":"2001:db8:85a3::8a2e:370:7334","variantElement(v, 'IPv6')":"2001:db8:85a3::8a2e:370:7334"}
+Enum
+{"v":null,"variantElement(v, 'Enum(\\'a\\' = 1)')":null}
+{"v":"string","variantElement(v, 'Enum(\\'a\\' = 1)')":null}
+{"v":"a","variantElement(v, 'Enum(\\'a\\' = 1)')":"a"}
+{"v":"a","variantElement(v, 'Enum(\\'a\\' = 1)')":"a"}
+{"v":2,"variantElement(v, 'Enum(\\'a\\' = 1)')":null}
+Map
+{"v":null,"variantElement(v, 'Map(String, UInt64)')":{}}
+{"v":"string","variantElement(v, 'Map(String, UInt64)')":{}}
+{"v":{"a":"42","b":"43","c":"0"},"variantElement(v, 'Map(String, UInt64)')":{"a":"42","b":"43","c":"0"}}
+{"v":"{\"c\" : 44, \"d\" : [1,2,3]}","variantElement(v, 'Map(String, UInt64)')":{}}
+Tuple
+{"v":null,"variantElement(v, 'Tuple(a UInt64, b UInt64)')":{"a":"0","b":"0"}}
+{"v":"string","variantElement(v, 'Tuple(a UInt64, b UInt64)')":{"a":"0","b":"0"}}
+{"v":{"a":"42","b":"0"},"variantElement(v, 'Tuple(a UInt64, b UInt64)')":{"a":"42","b":"0"}}
+{"v":{"a":"44","b":"0"},"variantElement(v, 'Tuple(a UInt64, b UInt64)')":{"a":"44","b":"0"}}
+\N	(0,0)
+string	(0,0)
+(42,0)	(42,0)
+{"a" : 44, "d" : 32}	(0,0)
+Array
+{"v":null,"variantElement(v, 'Array(UInt64)')":[]}
+{"v":"string","variantElement(v, 'Array(UInt64)')":[]}
+{"v":["1","2","3"],"variantElement(v, 'Array(UInt64)')":["1","2","3"]}
+{"v":["0","0","0"],"variantElement(v, 'Array(UInt64)')":["0","0","0"]}
+{"v":"[1, 2, \"hello\"]","variantElement(v, 'Array(UInt64)')":[]}
+LowCardinality
+{"v":null,"variantElement(v, 'LowCardinality(String)')":null}
+{"v":"string","variantElement(v, 'LowCardinality(String)')":"string"}
+{"v":"42","variantElement(v, 'LowCardinality(String)')":null}
+{"v":null,"variantElement(v, 'Array(LowCardinality(Nullable(String)))')":[]}
+{"v":["string",null],"variantElement(v, 'Array(LowCardinality(Nullable(String)))')":["string",null]}
+{"v":"42","variantElement(v, 'Array(LowCardinality(Nullable(String)))')":[]}
+Nullable
+{"v":null,"variantElement(v, 'Array(Nullable(String))')":[]}
+{"v":"string","variantElement(v, 'Array(Nullable(String))')":[]}
+{"v":["hello",null,"world"],"variantElement(v, 'Array(Nullable(String))')":["hello",null,"world"]}
+{"repeat('-', 80)":"--------------------------------------------------------------------------------"}
+CSV
+String
+\N,\N
+"string","string"
+"string","string"
+42,\N
+FixedString
+\N,\N
+"string",\N
+"string",\N
+"abcd","abcd"
+Bool
+\N,\N
+"Truee",\N
+true,true
+Integers
+\N,\N
+"string",\N
+-1,-1
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,\N
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,-1
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,\N
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,-1
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,\N
+0,0
+10000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,-1
+0,0
+10000000000000000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,\N
+0,0
+10000000000000000000000,\N
+"42d42",\N
+\N,\N
+"string",\N
+-1,-1
+0,0
+"42d42",\N
+\N,\N
+"string",\N
+-1,\N
+0,0
+"42d42",\N
+Floats
+\N,\N
+"string",\N
+42.42,42.42
+"42.d42",\N
+\N,\N
+"string",\N
+42.42,42.42
+"42.d42",\N
+Decimals
+\N,\N
+"string",\N
+42.42,42.42
+"42d42",\N
+"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242",\N
+\N,\N
+"string",\N
+42.42,42.42
+"42d42",\N
+"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242",\N
+\N,\N
+"string",\N
+42.42,42.42
+"42d42",\N
+"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242",\N
+\N,\N
+"string",\N
+42.42,42.42
+"42d42",\N
+"4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242",\N
+Dates and DateTimes
+\N,\N
+"string",\N
+"2020-01-d1",\N
+"2020-01-01","2020-01-01"
+"2020-01-01 00:00:00.999",\N
+\N,\N
+"string",\N
+"2020-01-d1",\N
+"1900-01-01","1900-01-01"
+"2020-01-01 00:00:00.999",\N
+\N,\N
+"string",\N
+"2020-01-d1",\N
+"2020-01-01 00:00:00","2020-01-01 00:00:00"
+"2020-01-01 00:00:00.999",\N
+\N,\N
+"string",\N
+"2020-01-d1",\N
+"2020-01-01 00:00:00.999","2020-01-01 00:00:00.999"
+"2020-01-01 00:00:00.999999999 ABC",\N
+UUID
+\N,\N
+"string",\N
+"c8619cca-0caa-445e-ae76-1d4f6e0b3927","c8619cca-0caa-445e-ae76-1d4f6e0b3927"
+"c8619cca-0caa-445e-ae76-1d4f6e0b3927AAA",\N
+IPv4
+\N,\N
+"string",\N
+"127.0.0.1","127.0.0.1"
+"127.0.0.1AAA",\N
+IPv6
+\N,\N
+"string",\N
+"2001:db8:85a3::8a2e:370:7334","2001:db8:85a3::8a2e:370:7334"
+"2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA",\N
+Enum
+\N,\N
+"string",\N
+"a","a"
+"a","a"
+2,\N
+"aa",\N
+Map
+\N,"{}"
+"string","{}"
+"{'a':42,'b':43,'c':0}","{'a':42,'b':43,'c':0}"
+"{'c' : 44, 'd' : [1,2,3]}","{}"
+"{'c' : 44","{}"
+Array
+\N,"[]"
+"string","[]"
+"[1,2,3]","[1,2,3]"
+"[0,0,0]","[0,0,0]"
+"[1, 2, 'hello']","[]"
+"[1, 2","[]"
+LowCardinality
+\N,\N
+"string","string"
+42,\N
+\N,"[]"
+"['string',NULL]","['string',NULL]"
+"['string', nul]","[]"
+42,"[]"
+Nullable
+\N,"[]"
+"string","[]"
+"['hello',NULL,'world']","['hello',NULL,'world']"
+"['hello', nul]","[]"
+{"repeat('-', 80)":"--------------------------------------------------------------------------------"}
+TSV
+String
+\N	\N
+string	string
+42	\N
+FixedString
+\N	\N
+string	\N
+abcd	abcd
+Bool
+\N	\N
+Truee	\N
+true	true
+Integers
+\N	\N
+string	\N
+-1	-1
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	\N
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	-1
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	\N
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	-1
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	\N
+0	0
+10000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	-1
+0	0
+10000000000000000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	\N
+0	0
+10000000000000000000000	\N
+42d42	\N
+\N	\N
+string	\N
+-1	-1
+0	0
+42d42	\N
+\N	\N
+string	\N
+-1	\N
+0	0
+42d42	\N
+Floats
+\N	\N
+string	\N
+42.42	42.42
+42.d42	\N
+\N	\N
+string	\N
+42.42	42.42
+42.d42	\N
+Decimals
+\N	\N
+string	\N
+42.42	42.42
+42d42	\N
+4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242	\N
+\N	\N
+string	\N
+42.42	42.42
+42d42	\N
+4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242	\N
+\N	\N
+string	\N
+42.42	42.42
+42d42	\N
+4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242	\N
+\N	\N
+string	\N
+42.42	42.42
+42d42	\N
+4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242	\N
+Dates and DateTimes
+\N	\N
+string	\N
+2020-01-d1	\N
+2020-01-01	2020-01-01
+2020-01-01 00:00:00.999	\N
+\N	\N
+string	\N
+2020-01-d1	\N
+1900-01-01	1900-01-01
+2020-01-01 00:00:00.999	\N
+\N	\N
+string	\N
+2020-01-d1	\N
+2020-01-01 00:00:00	2020-01-01 00:00:00
+2020-01-01 00:00:00.999	\N
+\N	\N
+string	\N
+2020-01-d1	\N
+2020-01-01 00:00:00.999	2020-01-01 00:00:00.999
+2020-01-01 00:00:00.999999999 ABC	\N
+UUID
+\N	\N
+string	\N
+c8619cca-0caa-445e-ae76-1d4f6e0b3927	c8619cca-0caa-445e-ae76-1d4f6e0b3927
+c8619cca-0caa-445e-ae76-1d4f6e0b3927AAA	\N
+IPv4
+\N	\N
+string	\N
+127.0.0.1	127.0.0.1
+127.0.0.1AAA	\N
+IPv6
+\N	\N
+string	\N
+2001:db8:85a3::8a2e:370:7334	2001:db8:85a3::8a2e:370:7334
+2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA	\N
+Enum
+\N	\N
+string	\N
+a	a
+a	a
+2	\N
+aa	\N
+Map
+\N	{}
+string	{}
+{'a':42,'b':43,'c':0}	{'a':42,'b':43,'c':0}
+{\'c\' : 44, \'d\' : [1,2,3]}	{}
+{\'c\' : 44	{}
+Array
+\N	[]
+string	[]
+[1,2,3]	[1,2,3]
+[0,0,0]	[0,0,0]
+[1, 2, \'hello\']	[]
+[1, 2	[]
+LowCardinality
+\N	\N
+string	string
+42	\N
+\N	[]
+['string',NULL]	['string',NULL]
+[\'string\', nul]	[]
+42	[]
+Nullable
+\N	[]
+string	[]
+['hello',NULL,'world']	['hello',NULL,'world']
+[\'hello\', nul]	[]
+{"repeat('-', 80)":"--------------------------------------------------------------------------------"}
+Values
+String
+(NULL,NULL),('string','string'),(42,NULL)FixedString
+(NULL,NULL),('string',NULL),('abcd','abcd')Bool
+(NULL,NULL),(true,true)Integers
+(NULL,NULL),('string',NULL),(-1,-1),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,NULL),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,-1),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,NULL),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,-1),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,NULL),(0,0),(10000000000,NULL)(NULL,NULL),('string',NULL),(-1,-1),(0,0),(10000000000000000000000,NULL)(NULL,NULL),('string',NULL),(-1,NULL),(0,0),(10000000000000000000000,NULL)(NULL,NULL),('string',NULL),(-1,-1),(0,0)(NULL,NULL),('string',NULL),(-1,NULL),(0,0)Floats
+(NULL,NULL),('string',NULL),(42.42,42.42)(NULL,NULL),('string',NULL),(42.42,42.42)Decimals
+(NULL,NULL),('string',NULL),(42.42,42.42)(NULL,NULL),('string',NULL),(42.42,42.42)(NULL,NULL),('string',NULL),(42.42,42.42)(NULL,NULL),('string',NULL),(42.42,42.42)Dates and DateTimes
+(NULL,NULL),('string',NULL),('2020-01-d1',NULL),('2020-01-01','2020-01-01'),('2020-01-01 00:00:00.999',NULL)(NULL,NULL),('string',NULL),('2020-01-d1',NULL),('1900-01-01','1900-01-01'),('2020-01-01 00:00:00.999',NULL)(NULL,NULL),('string',NULL),('2020-01-d1',NULL),('2020-01-01 00:00:00','2020-01-01 00:00:00'),('2020-01-01 00:00:00.999',NULL)(NULL,NULL),('string',NULL),('2020-01-d1',NULL),('2020-01-01 00:00:00.999','2020-01-01 00:00:00.999'),('2020-01-01 00:00:00.999999999 ABC',NULL)UUID
+(NULL,NULL),('string',NULL),('c8619cca-0caa-445e-ae76-1d4f6e0b3927','c8619cca-0caa-445e-ae76-1d4f6e0b3927'),('c8619cca-0caa-445e-ae76-1d4f6e0b3927AAA',NULL)IPv4
+(NULL,NULL),('string',NULL),('127.0.0.1','127.0.0.1'),('127.0.0.1AAA',NULL)IPv6
+(NULL,NULL),('string',NULL),('2001:db8:85a3::8a2e:370:7334','2001:db8:85a3::8a2e:370:7334'),('2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA',NULL)Enum
+(NULL,NULL),('string',NULL),('a','a'),(1,NULL),(2,NULL),('aa',NULL)Map
+(NULL,{}),('string',{}),({'a':42,'b':43,'c':0},{'a':42,'b':43,'c':0})Array
+(NULL,[]),('string',[]),([1,2,3],[1,2,3]),([0,0,0],[0,0,0])LowCardinality
+(NULL,NULL),('string','string'),(42,NULL)(NULL,[]),(['string',NULL],['string',NULL]),(42,[])Nullable
+(NULL,[]),('string',[]),(['hello',NULL,'world'],['hello',NULL,'world'])
diff --git a/tests/queries/0_stateless/02940_variant_text_deserialization.sql b/tests/queries/0_stateless/02940_variant_text_deserialization.sql
new file mode 100644
index 00000000000..b909b2b6790
--- /dev/null
+++ b/tests/queries/0_stateless/02940_variant_text_deserialization.sql
@@ -0,0 +1,267 @@
+set allow_experimental_variant_type = 1;
+set allow_suspicious_variant_types = 1;
+set session_timezone = 'UTC';
+
+select 'JSON';
+select 'String';
+select v, variantElement(v, 'String') from format(JSONEachRow, 'v Variant(String, UInt64)', '{"v" : null}, {"v" : "string"}, {"v" : 42}') format JSONEachRow;
+
+select 'FixedString';
+select v, variantElement(v, 'FixedString(4)') from format(JSONEachRow, 'v Variant(String, FixedString(4))', '{"v" : null}, {"v" : "string"}, {"v" : "abcd"}') format JSONEachRow;
+
+select 'Bool';
+select v, variantElement(v, 'Bool') from format(JSONEachRow, 'v Variant(String, Bool)', '{"v" : null}, {"v" : "string"}, {"v" : true}') format JSONEachRow;
+
+select 'Integers';
+select v, variantElement(v, 'Int8') from format(JSONEachRow, 'v Variant(String, Int8, UInt64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'UInt8') from format(JSONEachRow, 'v Variant(String, UInt8, Int64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'Int16') from format(JSONEachRow, 'v Variant(String, Int16, Int64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'UInt16') from format(JSONEachRow, 'v Variant(String, UInt16, Int64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'Int32') from format(JSONEachRow, 'v Variant(String, Int32, Int64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'UInt32') from format(JSONEachRow, 'v Variant(String, UInt32, Int64)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000}') format JSONEachRow;
+select v, variantElement(v, 'Int64') from format(JSONEachRow, 'v Variant(String, Int64, Int128)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000000000000000}') format JSONEachRow;
+select v, variantElement(v, 'UInt64') from format(JSONEachRow, 'v Variant(String, UInt64, Int128)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}, {"v" : 10000000000000000000000}') format JSONEachRow;
+select v, variantElement(v, 'Int128') from format(JSONEachRow, 'v Variant(String, Int128, Int256)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}') format JSONEachRow;
+select v, variantElement(v, 'UInt128') from format(JSONEachRow, 'v Variant(String, UInt128, Int256)', '{"v" : null}, {"v" : "string"}, {"v" : -1}, {"v" : 0}') format JSONEachRow;
+
+select 'Floats';
+select v, variantElement(v, 'Float32') from format(JSONEachRow, 'v Variant(String, Float32)', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}') format JSONEachRow;
+select v, variantElement(v, 'Float64') from format(JSONEachRow, 'v Variant(String, Float64)', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}') format JSONEachRow;
+
+select 'Decimals';
+select v, variantElement(v, 'Decimal32(6)') from format(JSONEachRow, 'v Variant(String, Decimal32(6))', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}, {"v" : 4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242}') format JSONEachRow;
+select v, variantElement(v, 'Decimal64(6)') from format(JSONEachRow, 'v Variant(String, Decimal64(6))', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}, {"v" : 4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242}') format JSONEachRow;
+select v, variantElement(v, 'Decimal128(6)') from format(JSONEachRow, 'v Variant(String, Decimal128(6))', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}, {"v" : 4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242}') format JSONEachRow;
+select v, variantElement(v, 'Decimal256(6)') from format(JSONEachRow, 'v Variant(String, Decimal256(6))', '{"v" : null}, {"v" : "string"}, {"v" : 42.42}, {"v" : 4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242}') format JSONEachRow;
+
+select 'Dates and DateTimes';
+select v, variantElement(v, 'Date') from format(JSONEachRow, 'v Variant(String, Date, DateTime64)', '{"v" : null}, {"v" : "string"}, {"v" : "2020-01-01"}, {"v" : "2020-01-01 00:00:00.999"}') format JSONEachRow;
+select v, variantElement(v, 'Date32') from format(JSONEachRow, 'v Variant(String, Date32, DateTime64)', '{"v" : null}, {"v" : "string"}, {"v" : "1900-01-01"}, {"v" : "2020-01-01 00:00:00.999"}') format JSONEachRow;
+select v, variantElement(v, 'DateTime') from format(JSONEachRow, 'v Variant(String, DateTime, DateTime64)', '{"v" : null}, {"v" : "string"}, {"v" : "2020-01-01 00:00:00"}, {"v" : "2020-01-01 00:00:00.999"}') format JSONEachRow;
+select v, variantElement(v, 'DateTime64') from format(JSONEachRow, 'v Variant(String, DateTime64)', '{"v" : null}, {"v" : "string"}, {"v" : "2020-01-01 00:00:00.999"}, {"v" : "2020-01-01 00:00:00.999999999 ABC"}') format JSONEachRow;
+
+select 'UUID';
+select v, variantElement(v, 'UUID') from format(JSONEachRow, 'v Variant(String, UUID)', '{"v" : null}, {"v" : "string"}, {"v" : "c8619cca-0caa-445e-ae76-1d4f6e0b3927"}') format JSONEachRow;
+
+select 'IPv4';
+select v, variantElement(v, 'IPv4') from format(JSONEachRow, 'v Variant(String, IPv4)', '{"v" : null}, {"v" : "string"}, {"v" : "127.0.0.1"}') format JSONEachRow;
+
+select 'IPv6';
+select v, variantElement(v, 'IPv6') from format(JSONEachRow, 'v Variant(String, IPv6)', '{"v" : null}, {"v" : "string"}, {"v" : "2001:0db8:85a3:0000:0000:8a2e:0370:7334"}') format JSONEachRow;
+
+select 'Enum';
+select v, variantElement(v, 'Enum(''a'' = 1)') from format(JSONEachRow, 'v Variant(String, UInt32, Enum(''a'' = 1))', '{"v" : null}, {"v" : "string"}, {"v" : "a"}, {"v" : 1}, {"v" : 2}') format JSONEachRow;
+
+select 'Map';
+select v, variantElement(v, 'Map(String, UInt64)') from format(JSONEachRow, 'v Variant(String, Map(String, UInt64))', '{"v" : null}, {"v" : "string"}, {"v" : {"a" : 42, "b" : 43, "c" : null}}, {"v" : {"c" : 44, "d" : [1,2,3]}}') format JSONEachRow;
+
+select 'Tuple';
+select v, variantElement(v, 'Tuple(a UInt64, b UInt64)') from format(JSONEachRow, 'v Variant(String, Tuple(a UInt64, b UInt64))', '{"v" : null}, {"v" : "string"}, {"v" : {"a" : 42, "b" : null}}, {"v" : {"a" : 44, "d" : 32}}') format JSONEachRow;
+select v, variantElement(v, 'Tuple(a UInt64, b UInt64)') from format(JSONEachRow, 'v Variant(String, Tuple(a UInt64, b UInt64))', '{"v" : null}, {"v" : "string"}, {"v" : {"a" : 42, "b" : null}}, {"v" : {"a" : 44, "d" : 32}}') settings input_format_json_defaults_for_missing_elements_in_named_tuple=0;
+
+select 'Array';
+select v, variantElement(v, 'Array(UInt64)') from format(JSONEachRow, 'v Variant(String, Array(UInt64))', '{"v" : null}, {"v" : "string"}, {"v" : [1, 2, 3]}, {"v" : [null, null, null]} {"v" : [1, 2, "hello"]}') format JSONEachRow;
+
+select 'LowCardinality';
+select v, variantElement(v, 'LowCardinality(String)') from format(JSONEachRow, 'v Variant(LowCardinality(String), UInt64)', '{"v" : null}, {"v" : "string"}, {"v" : 42}') format JSONEachRow;
+select v, variantElement(v, 'Array(LowCardinality(Nullable(String)))') from format(JSONEachRow, 'v Variant(Array(LowCardinality(Nullable(String))), UInt64)', '{"v" : null}, {"v" : ["string", null]}, {"v" : 42}') format JSONEachRow;
+
+select 'Nullable';
+select v, variantElement(v, 'Array(Nullable(String))') from format(JSONEachRow, 'v Variant(String, Array(Nullable(String)))', '{"v" : null}, {"v" : "string"}, {"v" : ["hello", null, "world"]}') format JSONEachRow;
+
+select repeat('-', 80) format JSONEachRow;
+
+select 'CSV';
+select 'String';
+select v, variantElement(v, 'String') from format(CSV, 'v Variant(String, UInt64)', '\\N\n"string"\nstring\n42') format CSV;
+
+select 'FixedString';
+select v, variantElement(v, 'FixedString(4)') from format(CSV, 'v Variant(String, FixedString(4))', '\\N\n"string"\nstring\n"abcd"') format CSV;
+
+select 'Bool';
+select v, variantElement(v, 'Bool') from format(CSV, 'v Variant(String, Bool)', '\\N\nTruee\nTrue') format CSV;
+
+select 'Integers';
+select v, variantElement(v, 'Int8') from format(CSV, 'v Variant(String, Int8, UInt64)', '\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'UInt8') from format(CSV, 'v Variant(String, UInt8, Int64)', '\\N\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'Int16') from format(CSV, 'v Variant(String, Int16, Int64)', '\\N\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'UInt16') from format(CSV, 'v Variant(String, UInt16, Int64)', '\\N\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'Int32') from format(CSV, 'v Variant(String, Int32, Int64)', '\\N\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'UInt32') from format(CSV, 'v Variant(String, UInt32, Int64)', '\\N\n"string"\n-1\n0\n10000000000\n42d42') format CSV;
+select v, variantElement(v, 'Int64') from format(CSV, 'v Variant(String, Int64, Int128)', '\\N\n"string"\n-1\n0\n10000000000000000000000\n42d42') format CSV;
+select v, variantElement(v, 'UInt64') from format(CSV, 'v Variant(String, UInt64, Int128)', '\\N\n"string"\n-1\n0\n10000000000000000000000\n42d42') format CSV;
+select v, variantElement(v, 'Int128') from format(CSV, 'v Variant(String, Int128, Int256)', '\\N\n"string"\n-1\n0\n42d42') format CSV;
+select v, variantElement(v, 'UInt128') from format(CSV, 'v Variant(String, UInt128, Int256)', '\\N\n"string"\n-1\n0\n42d42') format CSV;
+
+select 'Floats';
+select v, variantElement(v, 'Float32') from format(CSV, 'v Variant(String, Float32)', '\\N\n"string"\n42.42\n42.d42') format CSV;
+select v, variantElement(v, 'Float64') from format(CSV, 'v Variant(String, Float64)', '\\N\n"string"\n42.42\n42.d42') format CSV;
+
+select 'Decimals';
+select v, variantElement(v, 'Decimal32(6)') from format(CSV, 'v Variant(String, Decimal32(6))', '\\N\n"string"\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format CSV;
+select v, variantElement(v, 'Decimal64(6)') from format(CSV, 'v Variant(String, Decimal64(6))', '\\N\n"string"\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format CSV;
+select v, variantElement(v, 'Decimal128(6)') from format(CSV, 'v Variant(String, Decimal128(6))', '\\N\n"string"\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format CSV;
+select v, variantElement(v, 'Decimal256(6)') from format(CSV, 'v Variant(String, Decimal256(6))', '\\N\n"string"\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format CSV;
+
+select 'Dates and DateTimes';
+select v, variantElement(v, 'Date') from format(CSV, 'v Variant(String, Date, DateTime64)', '\\N\n"string"\n"2020-01-d1"\n"2020-01-01"\n"2020-01-01 00:00:00.999"') format CSV;
+select v, variantElement(v, 'Date32') from format(CSV, 'v Variant(String, Date32, DateTime64)', '\\N\n"string"\n"2020-01-d1"\n"1900-01-01"\n"2020-01-01 00:00:00.999"') format CSV;
+select v, variantElement(v, 'DateTime') from format(CSV, 'v Variant(String, DateTime, DateTime64)', '\\N\n"string"\n"2020-01-d1"\n"2020-01-01 00:00:00"\n"2020-01-01 00:00:00.999"') format CSV;
+select v, variantElement(v, 'DateTime64') from format(CSV, 'v Variant(String, DateTime64)', '\\N\n"string"\n"2020-01-d1"\n"2020-01-01 00:00:00.999"\n"2020-01-01 00:00:00.999999999 ABC"') format CSV;
+
+select 'UUID';
+select v, variantElement(v, 'UUID') from format(CSV, 'v Variant(String, UUID)', '\\N\n"string"\n"c8619cca-0caa-445e-ae76-1d4f6e0b3927"\nc8619cca-0caa-445e-ae76-1d4f6e0b3927AAA') format CSV;
+
+select 'IPv4';
+select v, variantElement(v, 'IPv4') from format(CSV, 'v Variant(String, IPv4)', '\\N\n"string"\n"127.0.0.1"\n"127.0.0.1AAA"') format CSV;
+
+select 'IPv6';
+select v, variantElement(v, 'IPv6') from format(CSV, 'v Variant(String, IPv6)', '\\N\n"string"\n"2001:0db8:85a3:0000:0000:8a2e:0370:7334"\n2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA') format CSV;
+
+select 'Enum';
+select v, variantElement(v, 'Enum(''a'' = 1)') from format(CSV, 'v Variant(String, UInt32, Enum(''a'' = 1))', '\\N\n"string"\n"a"\n1\n2\naa') format CSV;
+
+select 'Map';
+select v, variantElement(v, 'Map(String, UInt64)') from format(CSV, 'v Variant(String, Map(String, UInt64))', '\\N\n"string"\n"{''a'' : 42, ''b'' : 43, ''c'' : null}"\n"{''c'' : 44, ''d'' : [1,2,3]}"\n"{''c'' : 44"') format CSV;
+
+select 'Array';
+select v, variantElement(v, 'Array(UInt64)') from format(CSV, 'v Variant(String, Array(UInt64))', '\\N\n"string"\n"[1, 2, 3]"\n"[null, null, null]"\n"[1, 2, ''hello'']"\n"[1, 2"') format CSV;
+
+select 'LowCardinality';
+select v, variantElement(v, 'LowCardinality(String)') from format(CSV, 'v Variant(LowCardinality(String), UInt64)', '\\N\n"string"\n42') format CSV;
+select v, variantElement(v, 'Array(LowCardinality(Nullable(String)))') from format(CSV, 'v Variant(Array(LowCardinality(Nullable(String))), UInt64, String)', '\\N\n"[''string'', null]"\n"[''string'', nul]"\n42') format CSV;
+
+select 'Nullable';
+select v, variantElement(v, 'Array(Nullable(String))') from format(CSV, 'v Variant(String, Array(Nullable(String)))', '\\N\n"string"\n"[''hello'', null, ''world'']"\n"[''hello'', nul]"') format CSV;
+
+select repeat('-', 80) format JSONEachRow;
+
+select 'TSV';
+select 'String';
+select v, variantElement(v, 'String') from format(TSV, 'v Variant(String, UInt64)', '\\N\nstring\n42') format TSV;
+
+select 'FixedString';
+select v, variantElement(v, 'FixedString(4)') from format(TSV, 'v Variant(String, FixedString(4))', '\\N\nstring\nabcd') format TSV;
+
+select 'Bool';
+select v, variantElement(v, 'Bool') from format(TSV, 'v Variant(String, Bool)', '\\N\nTruee\nTrue') format TSV;
+
+select 'Integers';
+select v, variantElement(v, 'Int8') from format(TSV, 'v Variant(String, Int8, UInt64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'UInt8') from format(TSV, 'v Variant(String, UInt8, Int64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'Int16') from format(TSV, 'v Variant(String, Int16, Int64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'UInt16') from format(TSV, 'v Variant(String, UInt16, Int64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'Int32') from format(TSV, 'v Variant(String, Int32, Int64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'UInt32') from format(TSV, 'v Variant(String, UInt32, Int64)', '\\N\nstring\n-1\n0\n10000000000\n42d42') format TSV;
+select v, variantElement(v, 'Int64') from format(TSV, 'v Variant(String, Int64, Int128)', '\\N\nstring\n-1\n0\n10000000000000000000000\n42d42') format TSV;
+select v, variantElement(v, 'UInt64') from format(TSV, 'v Variant(String, UInt64, Int128)', '\\N\nstring\n-1\n0\n10000000000000000000000\n42d42') format TSV;
+select v, variantElement(v, 'Int128') from format(TSV, 'v Variant(String, Int128, Int256)', '\\N\nstring\n-1\n0\n42d42') format TSV;
+select v, variantElement(v, 'UInt128') from format(TSV, 'v Variant(String, UInt128, Int256)', '\\N\nstring\n-1\n0\n42d42') format TSV;
+
+select 'Floats';
+select v, variantElement(v, 'Float32') from format(TSV, 'v Variant(String, Float32)', '\\N\nstring\n42.42\n42.d42') format TSV;
+select v, variantElement(v, 'Float64') from format(TSV, 'v Variant(String, Float64)', '\\N\nstring\n42.42\n42.d42') format TSV;
+
+select 'Decimals';
+select v, variantElement(v, 'Decimal32(6)') from format(TSV, 'v Variant(String, Decimal32(6))', '\\N\nstring\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format TSV;
+select v, variantElement(v, 'Decimal64(6)') from format(TSV, 'v Variant(String, Decimal64(6))', '\\N\nstring\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format TSV;
+select v, variantElement(v, 'Decimal128(6)') from format(TSV, 'v Variant(String, Decimal128(6))', '\\N\nstring\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format TSV;
+select v, variantElement(v, 'Decimal256(6)') from format(TSV, 'v Variant(String, Decimal256(6))', '\\N\nstring\n42.42\n42d42\n4242424242424242424242424242424242424242424242424242424242424242424242424242424242424242424242.424242424242424242') format TSV;
+
+select 'Dates and DateTimes';
+select v, variantElement(v, 'Date') from format(TSV, 'v Variant(String, Date, DateTime64)', '\\N\nstring\n2020-01-d1\n2020-01-01\n2020-01-01 00:00:00.999') format TSV;
+select v, variantElement(v, 'Date32') from format(TSV, 'v Variant(String, Date32, DateTime64)', '\\N\nstring\n2020-01-d1\n1900-01-01\n2020-01-01 00:00:00.999') format TSV;
+select v, variantElement(v, 'DateTime') from format(TSV, 'v Variant(String, DateTime, DateTime64)', '\\N\nstring\n2020-01-d1\n2020-01-01 00:00:00\n2020-01-01 00:00:00.999') format TSV;
+select v, variantElement(v, 'DateTime64') from format(TSV, 'v Variant(String, DateTime64)', '\\N\nstring\n2020-01-d1\n2020-01-01 00:00:00.999\n2020-01-01 00:00:00.999999999 ABC') format TSV;
+
+select 'UUID';
+select v, variantElement(v, 'UUID') from format(TSV, 'v Variant(String, UUID)', '\\N\nstring\nc8619cca-0caa-445e-ae76-1d4f6e0b3927\nc8619cca-0caa-445e-ae76-1d4f6e0b3927AAA') format TSV;
+
+select 'IPv4';
+select v, variantElement(v, 'IPv4') from format(TSV, 'v Variant(String, IPv4)', '\\N\nstring\n127.0.0.1\n127.0.0.1AAA') format TSV;
+
+select 'IPv6';
+select v, variantElement(v, 'IPv6') from format(TSV, 'v Variant(String, IPv6)', '\\N\nstring\n2001:0db8:85a3:0000:0000:8a2e:0370:7334\n2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA') format TSV;
+
+select 'Enum';
+select v, variantElement(v, 'Enum(''a'' = 1)') from format(TSV, 'v Variant(String, UInt32, Enum(''a'' = 1))', '\\N\nstring\na\n1\n2\naa') format TSV;
+
+select 'Map';
+select v, variantElement(v, 'Map(String, UInt64)') from format(TSV, 'v Variant(String, Map(String, UInt64))', '\\N\nstring\n{''a'' : 42, ''b'' : 43, ''c'' : null}\n{''c'' : 44, ''d'' : [1,2,3]}\n{''c'' : 44') format TSV;
+
+select 'Array';
+select v, variantElement(v, 'Array(UInt64)') from format(TSV, 'v Variant(String, Array(UInt64))', '\\N\nstring\n[1, 2, 3]\n[null, null, null]\n[1, 2, ''hello'']\n[1, 2') format TSV;
+
+select 'LowCardinality';
+select v, variantElement(v, 'LowCardinality(String)') from format(TSV, 'v Variant(LowCardinality(String), UInt64)', '\\N\nstring\n42') format TSV;
+select v, variantElement(v, 'Array(LowCardinality(Nullable(String)))') from format(TSV, 'v Variant(Array(LowCardinality(Nullable(String))), UInt64, String)', '\\N\n[''string'', null]\n[''string'', nul]\n42') format TSV;
+
+select 'Nullable';
+select v, variantElement(v, 'Array(Nullable(String))') from format(TSV, 'v Variant(String, Array(Nullable(String)))', '\\N\nstring\n[''hello'', null, ''world'']\n[''hello'', nul]') format TSV;
+
+select repeat('-', 80) format JSONEachRow;
+
+select 'Values';
+select 'String';
+select v, variantElement(v, 'String') from format(Values, 'v Variant(String, UInt64)', '(NULL), (''string''), (42)') format Values;
+
+select 'FixedString';
+select v, variantElement(v, 'FixedString(4)') from format(Values, 'v Variant(String, FixedString(4))', '(NULL), (''string''), (''abcd'')') format Values;
+
+select 'Bool';
+select v, variantElement(v, 'Bool') from format(Values, 'v Variant(String, Bool)', '(NULL), (True)') format Values;
+
+select 'Integers';
+select v, variantElement(v, 'Int8') from format(Values, 'v Variant(String, Int8, UInt64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'UInt8') from format(Values, 'v Variant(String, UInt8, Int64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'Int16') from format(Values, 'v Variant(String, Int16, Int64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'UInt16') from format(Values, 'v Variant(String, UInt16, Int64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'Int32') from format(Values, 'v Variant(String, Int32, Int64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'UInt32') from format(Values, 'v Variant(String, UInt32, Int64)', '(NULL), (''string''), (-1), (0), (10000000000)') format Values;
+select v, variantElement(v, 'Int64') from format(Values, 'v Variant(String, Int64, Int128)', '(NULL), (''string''), (-1), (0), (10000000000000000000000)') format Values;
+select v, variantElement(v, 'UInt64') from format(Values, 'v Variant(String, UInt64, Int128)', '(NULL), (''string''), (-1), (0), (10000000000000000000000)') format Values;
+select v, variantElement(v, 'Int128') from format(Values, 'v Variant(String, Int128, Int256)', '(NULL), (''string''), (-1), (0)') format Values;
+select v, variantElement(v, 'UInt128') from format(Values, 'v Variant(String, UInt128, Int256)', '(NULL), (''string''), (-1), (0)') format Values;
+
+select 'Floats';
+select v, variantElement(v, 'Float32') from format(Values, 'v Variant(String, Float32)', '(NULL), (''string''), (42.42)') format Values;
+select v, variantElement(v, 'Float64') from format(Values, 'v Variant(String, Float64)', '(NULL), (''string''), (42.42)') format Values;
+
+select 'Decimals';
+select v, variantElement(v, 'Decimal32(6)') from format(Values, 'v Variant(String, Decimal32(6))', '(NULL), (''string''), (42.42)') format Values;
+select v, variantElement(v, 'Decimal64(6)') from format(Values, 'v Variant(String, Decimal64(6))', '(NULL), (''string''), (42.42)') format Values;
+select v, variantElement(v, 'Decimal128(6)') from format(Values, 'v Variant(String, Decimal128(6))', '(NULL), (''string''), (42.42)') format Values;
+select v, variantElement(v, 'Decimal256(6)') from format(Values, 'v Variant(String, Decimal256(6))', '(NULL), (''string''), (42.42)') format Values;
+
+select 'Dates and DateTimes';
+select v, variantElement(v, 'Date') from format(Values, 'v Variant(String, Date, DateTime64)', '(NULL), (''string''), (''2020-01-d1''), (''2020-01-01''), (''2020-01-01 00:00:00.999'')') format Values;
+select v, variantElement(v, 'Date32') from format(Values, 'v Variant(String, Date32, DateTime64)', '(NULL), (''string''), (''2020-01-d1''), (''1900-01-01''), (''2020-01-01 00:00:00.999'')') format Values;
+select v, variantElement(v, 'DateTime') from format(Values, 'v Variant(String, DateTime, DateTime64)', '(NULL), (''string''), (''2020-01-d1''), (''2020-01-01 00:00:00''), (''2020-01-01 00:00:00.999'')') format Values;
+select v, variantElement(v, 'DateTime64') from format(Values, 'v Variant(String, DateTime64)', '(NULL), (''string''), (''2020-01-d1''), (''2020-01-01 00:00:00.999''), (''2020-01-01 00:00:00.999999999 ABC'')') format Values;
+
+select 'UUID';
+select v, variantElement(v, 'UUID') from format(Values, 'v Variant(String, UUID)', '(NULL), (''string''), (''c8619cca-0caa-445e-ae76-1d4f6e0b3927''), (''c8619cca-0caa-445e-ae76-1d4f6e0b3927AAA'')') format Values;
+
+select 'IPv4';
+select v, variantElement(v, 'IPv4') from format(Values, 'v Variant(String, IPv4)', '(NULL), (''string''), (''127.0.0.1''), (''127.0.0.1AAA'')') format Values;
+
+select 'IPv6';
+select v, variantElement(v, 'IPv6') from format(Values, 'v Variant(String, IPv6)', '(NULL), (''string''), (''2001:0db8:85a3:0000:0000:8a2e:0370:7334''), (''2001:0db8:85a3:0000:0000:8a2e:0370:7334AAA'')') format Values;
+
+select 'Enum';
+select v, variantElement(v, 'Enum(''a'' = 1)') from format(Values, 'v Variant(String, UInt32, Enum(''a'' = 1))', '(NULL), (''string''), (''a''), (1), (2), (''aa'')') format Values;
+
+select 'Map';
+select v, variantElement(v, 'Map(String, UInt64)') from format(Values, 'v Variant(String, Map(String, UInt64))', '(NULL), (''string''), ({''a'' : 42, ''b'' : 43, ''c'' : null})') format Values;
+
+select 'Array';
+select v, variantElement(v, 'Array(UInt64)') from format(Values, 'v Variant(String, Array(UInt64))', '(NULL), (''string''), ([1, 2, 3]), ([null, null, null])') format Values;
+
+select 'LowCardinality';
+select v, variantElement(v, 'LowCardinality(String)') from format(Values, 'v Variant(LowCardinality(String), UInt64)', '(NULL), (''string''), (42)') format Values;
+select v, variantElement(v, 'Array(LowCardinality(Nullable(String)))') from format(Values, 'v Variant(Array(LowCardinality(Nullable(String))), UInt64, String)', '(NULL), ([''string'', null]), (42)') format Values;
+
+select 'Nullable';
+select v, variantElement(v, 'Array(Nullable(String))') from format(Values, 'v Variant(String, Array(Nullable(String)))', '(NULL), (''string''), ([''hello'', null, ''world''])') format Values;
+
+select '';
diff --git a/tests/queries/0_stateless/02941_variant_type_1.reference b/tests/queries/0_stateless/02941_variant_type_1.reference
new file mode 100644
index 00000000000..8a6e77d4f6d
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_1.reference
@@ -0,0 +1,2472 @@
+Memory
+test1 insert
+test1 select
+\N
+\N
+\N
+0
+1
+2
+str_0
+str_1
+str_2
+lc_str_0
+lc_str_1
+lc_str_2
+(0,1)
+(1,2)
+(2,3)
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+str_1
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+lc_str_1
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(1,2)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+\N
+\N
+\N
+0
+\N
+2
+str_0
+\N
+str_2
+lc_str_0
+\N
+lc_str_2
+(0,1)
+\N
+(2,3)
+[0]
+\N
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+\N
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(0,0)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+-----------------------------------------------------------------------------------------------------------
+test3 insert
+test3 select
+\N
+str_1
+2
+lc_str_3
+(4,5)
+[0,1,2,3,4,5]
+\N
+str_7
+8
+lc_str_9
+(10,11)
+[0,1,2,3,4,5,6,7,8,9,10,11]
+\N
+str_13
+14
+lc_str_15
+(16,17)
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+str_1
+\N
+\N
+\N
+\N
+\N
+str_7
+\N
+\N
+\N
+\N
+\N
+str_13
+\N
+\N
+\N
+\N
+\N
+\N
+2
+\N
+\N
+\N
+\N
+\N
+8
+\N
+\N
+\N
+\N
+\N
+14
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_3
+\N
+\N
+\N
+\N
+\N
+lc_str_9
+\N
+\N
+\N
+\N
+\N
+lc_str_15
+\N
+\N
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(4,5)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(10,11)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(16,17)
+(0,0)
+\N
+\N
+\N
+\N
+4
+\N
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+\N
+16
+\N
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+\N
+11
+\N
+\N
+\N
+\N
+\N
+17
+\N
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+\N
+\N
+\N
+\N
+6
+\N
+\N
+\N
+\N
+\N
+12
+\N
+\N
+\N
+\N
+\N
+18
+-----------------------------------------------------------------------------------------------------------
+MergeTree compact
+test1 insert
+test1 select
+\N
+\N
+\N
+0
+1
+2
+str_0
+str_1
+str_2
+lc_str_0
+lc_str_1
+lc_str_2
+(0,1)
+(1,2)
+(2,3)
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+str_1
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+lc_str_1
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(1,2)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+-----------------------------------------------------------------------------------------------------------
+test1 select
+\N
+\N
+\N
+0
+1
+2
+str_0
+str_1
+str_2
+lc_str_0
+lc_str_1
+lc_str_2
+(0,1)
+(1,2)
+(2,3)
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+str_1
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+lc_str_1
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(1,2)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+\N
+\N
+\N
+0
+\N
+2
+str_0
+\N
+str_2
+lc_str_0
+\N
+lc_str_2
+(0,1)
+\N
+(2,3)
+[0]
+\N
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+\N
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(0,0)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+-----------------------------------------------------------------------------------------------------------
+test2 select
+\N
+\N
+\N
+0
+\N
+2
+str_0
+\N
+str_2
+lc_str_0
+\N
+lc_str_2
+(0,1)
+\N
+(2,3)
+[0]
+\N
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+\N
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(0,0)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+-----------------------------------------------------------------------------------------------------------
+test3 insert
+test3 select
+\N
+str_1
+2
+lc_str_3
+(4,5)
+[0,1,2,3,4,5]
+\N
+str_7
+8
+lc_str_9
+(10,11)
+[0,1,2,3,4,5,6,7,8,9,10,11]
+\N
+str_13
+14
+lc_str_15
+(16,17)
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+str_1
+\N
+\N
+\N
+\N
+\N
+str_7
+\N
+\N
+\N
+\N
+\N
+str_13
+\N
+\N
+\N
+\N
+\N
+\N
+2
+\N
+\N
+\N
+\N
+\N
+8
+\N
+\N
+\N
+\N
+\N
+14
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_3
+\N
+\N
+\N
+\N
+\N
+lc_str_9
+\N
+\N
+\N
+\N
+\N
+lc_str_15
+\N
+\N
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(4,5)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(10,11)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(16,17)
+(0,0)
+\N
+\N
+\N
+\N
+4
+\N
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+\N
+16
+\N
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+\N
+11
+\N
+\N
+\N
+\N
+\N
+17
+\N
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+\N
+\N
+\N
+\N
+6
+\N
+\N
+\N
+\N
+\N
+12
+\N
+\N
+\N
+\N
+\N
+18
+-----------------------------------------------------------------------------------------------------------
+test3 select
+\N
+str_1
+2
+lc_str_3
+(4,5)
+[0,1,2,3,4,5]
+\N
+str_7
+8
+lc_str_9
+(10,11)
+[0,1,2,3,4,5,6,7,8,9,10,11]
+\N
+str_13
+14
+lc_str_15
+(16,17)
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+str_1
+\N
+\N
+\N
+\N
+\N
+str_7
+\N
+\N
+\N
+\N
+\N
+str_13
+\N
+\N
+\N
+\N
+\N
+\N
+2
+\N
+\N
+\N
+\N
+\N
+8
+\N
+\N
+\N
+\N
+\N
+14
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_3
+\N
+\N
+\N
+\N
+\N
+lc_str_9
+\N
+\N
+\N
+\N
+\N
+lc_str_15
+\N
+\N
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(4,5)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(10,11)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(16,17)
+(0,0)
+\N
+\N
+\N
+\N
+4
+\N
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+\N
+16
+\N
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+\N
+11
+\N
+\N
+\N
+\N
+\N
+17
+\N
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+\N
+\N
+\N
+\N
+6
+\N
+\N
+\N
+\N
+\N
+12
+\N
+\N
+\N
+\N
+\N
+18
+-----------------------------------------------------------------------------------------------------------
+MergeTree wide
+test1 insert
+test1 select
+\N
+\N
+\N
+0
+1
+2
+str_0
+str_1
+str_2
+lc_str_0
+lc_str_1
+lc_str_2
+(0,1)
+(1,2)
+(2,3)
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+str_1
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+lc_str_1
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(1,2)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+-----------------------------------------------------------------------------------------------------------
+test1 select
+\N
+\N
+\N
+0
+1
+2
+str_0
+str_1
+str_2
+lc_str_0
+lc_str_1
+lc_str_2
+(0,1)
+(1,2)
+(2,3)
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+str_1
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+lc_str_1
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(1,2)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+1
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[0,1]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+2
+3
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+\N
+\N
+\N
+0
+\N
+2
+str_0
+\N
+str_2
+lc_str_0
+\N
+lc_str_2
+(0,1)
+\N
+(2,3)
+[0]
+\N
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+\N
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(0,0)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+-----------------------------------------------------------------------------------------------------------
+test2 select
+\N
+\N
+\N
+0
+\N
+2
+str_0
+\N
+str_2
+lc_str_0
+\N
+lc_str_2
+(0,1)
+\N
+(2,3)
+[0]
+\N
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_0
+\N
+lc_str_2
+\N
+\N
+\N
+\N
+\N
+\N
+(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,1)
+(0,0)
+(2,3)
+(0,0)
+(0,0)
+(0,0)
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+1
+\N
+3
+-----------------------------------------------------------------------------------------------------------
+test3 insert
+test3 select
+\N
+str_1
+2
+lc_str_3
+(4,5)
+[0,1,2,3,4,5]
+\N
+str_7
+8
+lc_str_9
+(10,11)
+[0,1,2,3,4,5,6,7,8,9,10,11]
+\N
+str_13
+14
+lc_str_15
+(16,17)
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+str_1
+\N
+\N
+\N
+\N
+\N
+str_7
+\N
+\N
+\N
+\N
+\N
+str_13
+\N
+\N
+\N
+\N
+\N
+\N
+2
+\N
+\N
+\N
+\N
+\N
+8
+\N
+\N
+\N
+\N
+\N
+14
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_3
+\N
+\N
+\N
+\N
+\N
+lc_str_9
+\N
+\N
+\N
+\N
+\N
+lc_str_15
+\N
+\N
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(4,5)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(10,11)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(16,17)
+(0,0)
+\N
+\N
+\N
+\N
+4
+\N
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+\N
+16
+\N
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+\N
+11
+\N
+\N
+\N
+\N
+\N
+17
+\N
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+\N
+\N
+\N
+\N
+6
+\N
+\N
+\N
+\N
+\N
+12
+\N
+\N
+\N
+\N
+\N
+18
+-----------------------------------------------------------------------------------------------------------
+test3 select
+\N
+str_1
+2
+lc_str_3
+(4,5)
+[0,1,2,3,4,5]
+\N
+str_7
+8
+lc_str_9
+(10,11)
+[0,1,2,3,4,5,6,7,8,9,10,11]
+\N
+str_13
+14
+lc_str_15
+(16,17)
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+str_1
+\N
+\N
+\N
+\N
+\N
+str_7
+\N
+\N
+\N
+\N
+\N
+str_13
+\N
+\N
+\N
+\N
+\N
+\N
+2
+\N
+\N
+\N
+\N
+\N
+8
+\N
+\N
+\N
+\N
+\N
+14
+\N
+\N
+\N
+\N
+\N
+\N
+lc_str_3
+\N
+\N
+\N
+\N
+\N
+lc_str_9
+\N
+\N
+\N
+\N
+\N
+lc_str_15
+\N
+\N
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(4,5)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(10,11)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(0,0)
+(16,17)
+(0,0)
+\N
+\N
+\N
+\N
+4
+\N
+\N
+\N
+\N
+\N
+10
+\N
+\N
+\N
+\N
+\N
+16
+\N
+\N
+\N
+\N
+\N
+5
+\N
+\N
+\N
+\N
+\N
+11
+\N
+\N
+\N
+\N
+\N
+17
+\N
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11]
+[]
+[]
+[]
+[]
+[]
+[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17]
+\N
+\N
+\N
+\N
+\N
+6
+\N
+\N
+\N
+\N
+\N
+12
+\N
+\N
+\N
+\N
+\N
+18
+-----------------------------------------------------------------------------------------------------------
diff --git a/tests/queries/0_stateless/02941_variant_type_1.sh b/tests/queries/0_stateless/02941_variant_type_1.sh
new file mode 100755
index 00000000000..4fb76532a05
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_1.sh
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --allow_suspicious_variant_types=1"
+
+function test1_insert()
+{
+    echo "test1 insert"
+    $CH_CLIENT -nmq "insert into test select number, NULL from numbers(3);
+insert into test select number + 3, number from numbers(3);
+insert into test select number + 6, ('str_' || toString(number))::Variant(String) from numbers(3);
+insert into test select number + 9, ('lc_str_' || toString(number))::LowCardinality(String) from numbers(3);
+insert into test select number + 12, tuple(number, number + 1)::Tuple(a UInt32, b UInt32) from numbers(3);
+insert into test select number + 15, range(number + 1)::Array(UInt64) from numbers(3);"
+}
+
+function test1_select()
+{
+    echo "test1 select"
+    $CH_CLIENT -nmq "select v from test order by id;
+select v.String from test order by id;
+select v.UInt64 from test order by id;
+select v.\`LowCardinality(String)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.a from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.b from test order by id;
+select v.\`Array(UInt64)\` from test order by id;
+select v.\`Array(UInt64)\`.size0 from test order by id;"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function test2_insert()
+{
+    echo "test2 insert"
+    $CH_CLIENT -nmq "insert into test select number, NULL from numbers(3);
+insert into test select number + 3, number % 2 ? NULL : number from numbers(3);
+insert into test select number + 6, number % 2 ? NULL : ('str_' || toString(number))::Variant(String) from numbers(3);
+insert into test select number + 9, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(('lc_str_' || toString(number))::LowCardinality(String), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(3);
+insert into test select number + 12, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(tuple(number, number + 1)::Tuple(a UInt32, b UInt32), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(3);
+insert into test select number + 15, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(range(number + 1)::Array(UInt64), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(3);"
+}
+
+function test2_select()
+{
+    echo "test2 select"
+    $CH_CLIENT -nmq "select v from test order by id;
+select v.String from test order by id;
+select v.UInt64 from test order by id;
+select v.\`LowCardinality(String)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.a from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.b from test order by id;
+select v.\`Array(UInt64)\` from test order by id;
+select v.\`Array(UInt64)\`.size0 from test order by id;"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function test3_insert()
+{
+    echo "test3 insert"
+    $CH_CLIENT -q "insert into test with 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))' as type select number, multiIf(number % 6 == 0, CAST(NULL, type), number % 6 == 1, CAST(('str_' || toString(number))::Variant(String), type), number % 6 == 2, CAST(number, type), number % 6 == 3, CAST(('lc_str_' || toString(number))::LowCardinality(String), type), number % 6 == 4, CAST(tuple(number, number + 1)::Tuple(a UInt32, b UInt32), type), CAST(range(number + 1)::Array(UInt64), type)) as res from numbers(18);"
+}
+
+function test3_select()
+{
+    echo "test3 select"
+    $CH_CLIENT -nmq "select v from test order by id;
+select v.String from test order by id;
+select v.UInt64 from test order by id;
+select v.\`LowCardinality(String)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\` from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.a from test order by id;
+select v.\`Tuple(a UInt32, b UInt32)\`.b from test order by id;
+select v.\`Array(UInt64)\` from test order by id;
+select v.\`Array(UInt64)\`.size0 from test order by id;"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function run()
+{
+    test1_insert
+    test1_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test1_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+    test2_insert
+    test2_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test2_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+    test3_insert
+    test3_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test3_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=Memory;"
+run 0
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;"
+run 1
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+run 1
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02941_variant_type_2.reference b/tests/queries/0_stateless/02941_variant_type_2.reference
new file mode 100644
index 00000000000..20a5176cb5e
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_2.reference
@@ -0,0 +1,51 @@
+Memory
+test4 insert
+test4 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+MergeTree compact
+test4 insert
+test4 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+test4 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+MergeTree wide
+test4 insert
+test4 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+test4 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
diff --git a/tests/queries/0_stateless/02941_variant_type_2.sh b/tests/queries/0_stateless/02941_variant_type_2.sh
new file mode 100755
index 00000000000..995b622b6bf
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_2.sh
@@ -0,0 +1,71 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --allow_suspicious_variant_types=1"
+
+function test4_insert()
+{
+    echo "test4 insert"
+    $CH_CLIENT -nmq "insert into test select number, NULL from numbers(100000);
+insert into test select number + 100000, number from numbers(100000);
+insert into test select number + 200000, ('str_' || toString(number))::Variant(String) from numbers(100000);
+insert into test select number + 300000, ('lc_str_' || toString(number))::LowCardinality(String) from numbers(100000);
+insert into test select number + 400000, tuple(number, number + 1)::Tuple(a UInt32, b UInt32) from numbers(100000);
+insert into test select number + 500000, range(number % 20 + 1)::Array(UInt64) from numbers(100000);"
+}
+
+function test4_select
+{
+    echo "test4 select"
+    $CH_CLIENT -nmq "select v from test format Null;
+select count() from test where isNotNull(v);
+select v.String from test format Null;
+select count() from test where isNotNull(v.String);
+select v.UInt64 from test format Null;
+select count() from test where isNotNull(v.UInt64);
+select v.\`LowCardinality(String)\` from test format Null;
+select count() from test where isNotNull(v.\`LowCardinality(String)\`);
+select v.\`Tuple(a UInt32, b UInt32)\` from test format Null;
+select v.\`Tuple(a UInt32, b UInt32)\`.a from test format Null;
+select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.a);
+select v.\`Tuple(a UInt32, b UInt32)\`.b from test format Null;
+select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.b);
+select v.\`Array(UInt64)\` from test format Null;
+select count() from test where not empty(v.\`Array(UInt64)\`);
+select v.\`Array(UInt64)\`.size0 from test format Null;
+select count() from test where isNotNull(v.\`Array(UInt64)\`.size0);"
+}
+
+function run()
+{
+    test4_insert
+    test4_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test4_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=Memory;"
+run 0
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;"
+run 1
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+run 1
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02941_variant_type_3.reference b/tests/queries/0_stateless/02941_variant_type_3.reference
new file mode 100644
index 00000000000..1ccdb3acdff
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_3.reference
@@ -0,0 +1,51 @@
+Memory
+test5 insert
+test5 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+MergeTree compact
+test5 insert
+test5 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+test5 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+MergeTree wide
+test5 insert
+test5 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
+test5 select
+500000
+100000
+100000
+100000
+100000
+100000
+100000
+100000
diff --git a/tests/queries/0_stateless/02941_variant_type_3.sh b/tests/queries/0_stateless/02941_variant_type_3.sh
new file mode 100755
index 00000000000..9fbdf6de8a7
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_3.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --allow_suspicious_variant_types=1"
+
+function test5_insert()
+{
+    echo "test5 insert"
+    $CH_CLIENT -nmq "
+insert into test select number, NULL from numbers(200000);
+insert into test select number + 200000, number % 2 ? NULL : number from numbers(200000);
+insert into test select number + 400000, number % 2 ? NULL : ('str_' || toString(number))::Variant(String) from numbers(200000);
+insert into test select number + 600000, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(('lc_str_' || toString(number))::LowCardinality(String), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(200000);
+insert into test select number + 800000, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(tuple(number, number + 1)::Tuple(a UInt32, b UInt32), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(200000);
+insert into test select number + 1000000, number % 2 ? CAST(NULL, 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') : CAST(range(number % 20 + 1)::Array(UInt64), 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))') from numbers(200000);"
+}
+
+function test5_select()
+{
+    echo "test5 select"
+        $CH_CLIENT -nmq "
+select v from test format Null;
+select count() from test where isNotNull(v);
+select v.String from test format Null;
+select count() from test where isNotNull(v.String);
+select v.UInt64 from test format Null;
+select count() from test where isNotNull(v.UInt64);
+select v.\`LowCardinality(String)\` from test format Null;
+select count() from test where isNotNull(v.\`LowCardinality(String)\`);
+select v.\`Tuple(a UInt32, b UInt32)\` from test format Null;
+select v.\`Tuple(a UInt32, b UInt32)\`.a from test format Null;
+select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.a);
+select v.\`Tuple(a UInt32, b UInt32)\`.b from test format Null;
+select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.b);
+select v.\`Array(UInt64)\` from test format Null;
+select count() from test where not empty(v.\`Array(UInt64)\`);
+select v.\`Array(UInt64)\`.size0 from test format Null;
+select count() from test where isNotNull(v.\`Array(UInt64)\`.size0);"
+}
+
+function run()
+{
+    test5_insert
+    test5_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test5_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=Memory;"
+run 0
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;"
+run 1
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+run 1
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02941_variant_type_4.reference b/tests/queries/0_stateless/02941_variant_type_4.reference
new file mode 100644
index 00000000000..e13d5820343
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_4.reference
@@ -0,0 +1,56 @@
+Memory
+test6 insert
+test6 select
+1000000
+200000
+200000
+200000
+200000
+200000
+200000
+200000
+-----------------------------------------------------------------------------------------------------------
+MergeTree compact
+test6 insert
+test6 select
+1000000
+200000
+200000
+200000
+200000
+200000
+200000
+200000
+-----------------------------------------------------------------------------------------------------------
+test6 select
+1000000
+200000
+200000
+200000
+200000
+200000
+200000
+200000
+-----------------------------------------------------------------------------------------------------------
+MergeTree wide
+test6 insert
+test6 select
+1000000
+200000
+200000
+200000
+200000
+200000
+200000
+200000
+-----------------------------------------------------------------------------------------------------------
+test6 select
+1000000
+200000
+200000
+200000
+200000
+200000
+200000
+200000
+-----------------------------------------------------------------------------------------------------------
diff --git a/tests/queries/0_stateless/02941_variant_type_4.sh b/tests/queries/0_stateless/02941_variant_type_4.sh
new file mode 100755
index 00000000000..f6eaf2fcc9a
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_4.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --allow_suspicious_variant_types=1"
+
+function test6_insert()
+{
+    echo "test6 insert"
+    $CH_CLIENT -q "insert into test with 'Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))' as type select number, multiIf(number % 6 == 0, CAST(NULL, type), number % 6 == 1, CAST(('str_' || toString(number))::Variant(String), type), number % 6 == 2, CAST(number, type), number % 6 == 3, CAST(('lc_str_' || toString(number))::LowCardinality(String), type), number % 6 == 4, CAST(tuple(number, number + 1)::Tuple(a UInt32, b UInt32), type), CAST(range(number % 20 + 1)::Array(UInt64), type)) as res from numbers(1200000);"
+}
+
+function test6_select()
+{
+    echo "test6 select"
+    $CH_CLIENT -nmq "select v from test format Null;
+    select count() from test where isNotNull(v);
+    select v.String from test format Null;
+    select count() from test where isNotNull(v.String);
+    select v.UInt64 from test format Null;
+    select count() from test where isNotNull(v.UInt64);
+    select v.\`LowCardinality(String)\` from test format Null;
+    select count() from test where isNotNull(v.\`LowCardinality(String)\`);
+    select v.\`Tuple(a UInt32, b UInt32)\` from test format Null;
+    select v.\`Tuple(a UInt32, b UInt32)\`.a from test format Null;
+    select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.a);
+    select v.\`Tuple(a UInt32, b UInt32)\`.b from test format Null;
+    select count() from test where isNotNull(v.\`Tuple(a UInt32, b UInt32)\`.b);
+    select v.\`Array(UInt64)\` from test format Null;
+    select count() from test where not empty(v.\`Array(UInt64)\`);
+    select v.\`Array(UInt64)\`.size0 from test format Null;
+    select count() from test where isNotNull(v.\`Array(UInt64)\`.size0);"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function run()
+{
+    test6_insert
+    test6_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test6_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=Memory;"
+run 0
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;"
+run 1
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(String, UInt64, LowCardinality(String), Tuple(a UInt32, b UInt32), Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+run 1
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02941_variant_type_alters.reference b/tests/queries/0_stateless/02941_variant_type_alters.reference
new file mode 100644
index 00000000000..52c834e455b
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_alters.reference
@@ -0,0 +1,330 @@
+Memory
+initial insert
+alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+insert after alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+3	3	3	\N	3
+4	4	4	\N	4
+5	5	5	\N	5
+6	6	str_6	str_6	\N
+7	7	str_7	str_7	\N
+8	8	str_8	str_8	\N
+9	9	\N	\N	\N
+10	10	\N	\N	\N
+11	11	\N	\N	\N
+12	12	12	\N	12
+13	13	str_13	str_13	\N
+14	14	\N	\N	\N
+alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+insert after alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+15	15	1970-01-16	\N	\N	1970-01-16
+16	16	1970-01-17	\N	\N	1970-01-17
+17	17	1970-01-18	\N	\N	1970-01-18
+18	18	1970-01-19	\N	\N	1970-01-19
+19	19	\N	\N	\N	\N
+20	20	20	\N	20	\N
+21	21	str_21	str_21	\N	\N
+alter modify column 2
+0	0	\N	\N	\N	\N	\N	\N
+1	1	\N	\N	\N	\N	\N	\N
+2	2	\N	\N	\N	\N	\N	\N
+3	3	\N	\N	3	\N	3	\N
+4	4	\N	\N	4	\N	4	\N
+5	5	\N	\N	5	\N	5	\N
+6	6	\N	\N	str_6	str_6	\N	\N
+7	7	\N	\N	str_7	str_7	\N	\N
+8	8	\N	\N	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N	\N	\N
+10	10	\N	\N	\N	\N	\N	\N
+11	11	\N	\N	\N	\N	\N	\N
+12	12	\N	\N	12	\N	12	\N
+13	13	\N	\N	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N	\N	\N
+15	15	\N	\N	1970-01-16	\N	\N	1970-01-16
+16	16	\N	\N	1970-01-17	\N	\N	1970-01-17
+17	17	\N	\N	1970-01-18	\N	\N	1970-01-18
+18	18	\N	\N	1970-01-19	\N	\N	1970-01-19
+19	19	\N	\N	\N	\N	\N	\N
+20	20	\N	\N	20	\N	20	\N
+21	21	\N	\N	str_21	str_21	\N	\N
+insert after alter modify column 2
+0	0	\N	\N	\N	\N	\N	\N
+1	1	\N	\N	\N	\N	\N	\N
+2	2	\N	\N	\N	\N	\N	\N
+3	3	\N	\N	3	\N	3	\N
+4	4	\N	\N	4	\N	4	\N
+5	5	\N	\N	5	\N	5	\N
+6	6	\N	\N	str_6	str_6	\N	\N
+7	7	\N	\N	str_7	str_7	\N	\N
+8	8	\N	\N	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N	\N	\N
+10	10	\N	\N	\N	\N	\N	\N
+11	11	\N	\N	\N	\N	\N	\N
+12	12	\N	\N	12	\N	12	\N
+13	13	\N	\N	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N	\N	\N
+15	15	\N	\N	1970-01-16	\N	\N	1970-01-16
+16	16	\N	\N	1970-01-17	\N	\N	1970-01-17
+17	17	\N	\N	1970-01-18	\N	\N	1970-01-18
+18	18	\N	\N	1970-01-19	\N	\N	1970-01-19
+19	19	\N	\N	\N	\N	\N	\N
+20	20	\N	\N	20	\N	20	\N
+21	21	\N	\N	str_21	str_21	\N	\N
+22	str_22	\N	str_22	\N	\N	\N	\N
+23	\N	\N	\N	\N	\N	\N	\N
+24	24	24	\N	\N	\N	\N	\N
+MergeTree compact
+initial insert
+alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+insert after alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+3	3	3	\N	3
+4	4	4	\N	4
+5	5	5	\N	5
+6	6	str_6	str_6	\N
+7	7	str_7	str_7	\N
+8	8	str_8	str_8	\N
+9	9	\N	\N	\N
+10	10	\N	\N	\N
+11	11	\N	\N	\N
+12	12	12	\N	12
+13	13	str_13	str_13	\N
+14	14	\N	\N	\N
+alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+insert after alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+15	15	1970-01-16	\N	\N	1970-01-16
+16	16	1970-01-17	\N	\N	1970-01-17
+17	17	1970-01-18	\N	\N	1970-01-18
+18	18	1970-01-19	\N	\N	1970-01-19
+19	19	\N	\N	\N	\N
+20	20	20	\N	20	\N
+21	21	str_21	str_21	\N	\N
+alter modify column 2
+0	0	0	\N	\N	\N	\N	\N
+1	1	1	\N	\N	\N	\N	\N
+2	2	2	\N	\N	\N	\N	\N
+3	3	3	\N	3	\N	3	\N
+4	4	4	\N	4	\N	4	\N
+5	5	5	\N	5	\N	5	\N
+6	6	6	\N	str_6	str_6	\N	\N
+7	7	7	\N	str_7	str_7	\N	\N
+8	8	8	\N	str_8	str_8	\N	\N
+9	9	9	\N	\N	\N	\N	\N
+10	10	10	\N	\N	\N	\N	\N
+11	11	11	\N	\N	\N	\N	\N
+12	12	12	\N	12	\N	12	\N
+13	13	13	\N	str_13	str_13	\N	\N
+14	14	14	\N	\N	\N	\N	\N
+15	15	15	\N	1970-01-16	\N	\N	1970-01-16
+16	16	16	\N	1970-01-17	\N	\N	1970-01-17
+17	17	17	\N	1970-01-18	\N	\N	1970-01-18
+18	18	18	\N	1970-01-19	\N	\N	1970-01-19
+19	19	19	\N	\N	\N	\N	\N
+20	20	20	\N	20	\N	20	\N
+21	21	21	\N	str_21	str_21	\N	\N
+insert after alter modify column 2
+0	0	0	\N	\N	\N	\N	\N
+1	1	1	\N	\N	\N	\N	\N
+2	2	2	\N	\N	\N	\N	\N
+3	3	3	\N	3	\N	3	\N
+4	4	4	\N	4	\N	4	\N
+5	5	5	\N	5	\N	5	\N
+6	6	6	\N	str_6	str_6	\N	\N
+7	7	7	\N	str_7	str_7	\N	\N
+8	8	8	\N	str_8	str_8	\N	\N
+9	9	9	\N	\N	\N	\N	\N
+10	10	10	\N	\N	\N	\N	\N
+11	11	11	\N	\N	\N	\N	\N
+12	12	12	\N	12	\N	12	\N
+13	13	13	\N	str_13	str_13	\N	\N
+14	14	14	\N	\N	\N	\N	\N
+15	15	15	\N	1970-01-16	\N	\N	1970-01-16
+16	16	16	\N	1970-01-17	\N	\N	1970-01-17
+17	17	17	\N	1970-01-18	\N	\N	1970-01-18
+18	18	18	\N	1970-01-19	\N	\N	1970-01-19
+19	19	19	\N	\N	\N	\N	\N
+20	20	20	\N	20	\N	20	\N
+21	21	21	\N	str_21	str_21	\N	\N
+22	str_22	\N	str_22	\N	\N	\N	\N
+23	\N	\N	\N	\N	\N	\N	\N
+24	24	24	\N	\N	\N	\N	\N
+MergeTree wide
+initial insert
+alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+insert after alter add column 1
+0	0	\N	\N	\N
+1	1	\N	\N	\N
+2	2	\N	\N	\N
+3	3	3	\N	3
+4	4	4	\N	4
+5	5	5	\N	5
+6	6	str_6	str_6	\N
+7	7	str_7	str_7	\N
+8	8	str_8	str_8	\N
+9	9	\N	\N	\N
+10	10	\N	\N	\N
+11	11	\N	\N	\N
+12	12	12	\N	12
+13	13	str_13	str_13	\N
+14	14	\N	\N	\N
+alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+insert after alter modify column 1
+0	0	\N	\N	\N	\N
+1	1	\N	\N	\N	\N
+2	2	\N	\N	\N	\N
+3	3	3	\N	3	\N
+4	4	4	\N	4	\N
+5	5	5	\N	5	\N
+6	6	str_6	str_6	\N	\N
+7	7	str_7	str_7	\N	\N
+8	8	str_8	str_8	\N	\N
+9	9	\N	\N	\N	\N
+10	10	\N	\N	\N	\N
+11	11	\N	\N	\N	\N
+12	12	12	\N	12	\N
+13	13	str_13	str_13	\N	\N
+14	14	\N	\N	\N	\N
+15	15	1970-01-16	\N	\N	1970-01-16
+16	16	1970-01-17	\N	\N	1970-01-17
+17	17	1970-01-18	\N	\N	1970-01-18
+18	18	1970-01-19	\N	\N	1970-01-19
+19	19	\N	\N	\N	\N
+20	20	20	\N	20	\N
+21	21	str_21	str_21	\N	\N
+alter modify column 2
+0	0	0	\N	\N	\N	\N	\N
+1	1	1	\N	\N	\N	\N	\N
+2	2	2	\N	\N	\N	\N	\N
+3	3	3	\N	3	\N	3	\N
+4	4	4	\N	4	\N	4	\N
+5	5	5	\N	5	\N	5	\N
+6	6	6	\N	str_6	str_6	\N	\N
+7	7	7	\N	str_7	str_7	\N	\N
+8	8	8	\N	str_8	str_8	\N	\N
+9	9	9	\N	\N	\N	\N	\N
+10	10	10	\N	\N	\N	\N	\N
+11	11	11	\N	\N	\N	\N	\N
+12	12	12	\N	12	\N	12	\N
+13	13	13	\N	str_13	str_13	\N	\N
+14	14	14	\N	\N	\N	\N	\N
+15	15	15	\N	1970-01-16	\N	\N	1970-01-16
+16	16	16	\N	1970-01-17	\N	\N	1970-01-17
+17	17	17	\N	1970-01-18	\N	\N	1970-01-18
+18	18	18	\N	1970-01-19	\N	\N	1970-01-19
+19	19	19	\N	\N	\N	\N	\N
+20	20	20	\N	20	\N	20	\N
+21	21	21	\N	str_21	str_21	\N	\N
+insert after alter modify column 2
+0	0	0	\N	\N	\N	\N	\N
+1	1	1	\N	\N	\N	\N	\N
+2	2	2	\N	\N	\N	\N	\N
+3	3	3	\N	3	\N	3	\N
+4	4	4	\N	4	\N	4	\N
+5	5	5	\N	5	\N	5	\N
+6	6	6	\N	str_6	str_6	\N	\N
+7	7	7	\N	str_7	str_7	\N	\N
+8	8	8	\N	str_8	str_8	\N	\N
+9	9	9	\N	\N	\N	\N	\N
+10	10	10	\N	\N	\N	\N	\N
+11	11	11	\N	\N	\N	\N	\N
+12	12	12	\N	12	\N	12	\N
+13	13	13	\N	str_13	str_13	\N	\N
+14	14	14	\N	\N	\N	\N	\N
+15	15	15	\N	1970-01-16	\N	\N	1970-01-16
+16	16	16	\N	1970-01-17	\N	\N	1970-01-17
+17	17	17	\N	1970-01-18	\N	\N	1970-01-18
+18	18	18	\N	1970-01-19	\N	\N	1970-01-19
+19	19	19	\N	\N	\N	\N	\N
+20	20	20	\N	20	\N	20	\N
+21	21	21	\N	str_21	str_21	\N	\N
+22	str_22	\N	str_22	\N	\N	\N	\N
+23	\N	\N	\N	\N	\N	\N	\N
+24	24	24	\N	\N	\N	\N	\N
diff --git a/tests/queries/0_stateless/02941_variant_type_alters.sh b/tests/queries/0_stateless/02941_variant_type_alters.sh
new file mode 100755
index 00000000000..7c151d1fe9e
--- /dev/null
+++ b/tests/queries/0_stateless/02941_variant_type_alters.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 "
+
+function run()
+{
+    echo "initial insert"
+    $CH_CLIENT -q "insert into test select number, number from numbers(3)"
+
+    echo "alter add column 1"
+    $CH_CLIENT -q "alter table test add column v Variant(UInt64, String) settings mutations_sync=1"
+    $CH_CLIENT -q "select x, y, v, v.String, v.UInt64 from test order by x"
+
+    echo "insert after alter add column 1"
+    $CH_CLIENT -q "insert into test select number, number, number from numbers(3, 3)"
+    $CH_CLIENT -q "insert into test select number, number, 'str_' || toString(number) from numbers(6, 3)"
+    $CH_CLIENT -q "insert into test select number, number, NULL from numbers(9, 3)"
+    $CH_CLIENT -q "insert into test select number, number, multiIf(number % 3 == 0, number, number % 3 == 1, 'str_' || toString(number), NULL) from numbers(12, 3)"
+    $CH_CLIENT -q "select x, y, v, v.String, v.UInt64 from test order by x"
+
+    echo "alter modify column 1"
+    $CH_CLIENT -q "alter table test modify column v Variant(UInt64, String, Date) settings mutations_sync=1"
+    $CH_CLIENT -q "select x, y, v, v.String, v.UInt64, v.Date from test order by x"
+
+    echo "insert after alter modify column 1"
+    $CH_CLIENT -q "insert into test select number, number, toDate(number) from numbers(15, 3)"
+    $CH_CLIENT -q "insert into test select number, number, multiIf(number % 4 == 0, number, number % 4 == 1, 'str_' || toString(number), number % 4 == 2, toDate(number), NULL) from numbers(18, 4)"
+    $CH_CLIENT -q "select x, y, v, v.String, v.UInt64, v.Date from test order by x"
+
+    echo "alter modify column 2"
+    $CH_CLIENT -q "alter table test modify column y Variant(UInt64, String) settings mutations_sync=1"
+    $CH_CLIENT -q "select x, y, y.UInt64, y.String, v, v.String, v.UInt64, v.Date from test order by x"
+
+    echo "insert after alter modify column 2"
+    $CH_CLIENT -q "insert into test select number, multiIf(number % 3 == 0, number, number % 3 == 1, 'str_' || toString(number), NULL), NULL from numbers(22, 3)"
+    $CH_CLIENT -q "select x, y, y.UInt64, y.String, v, v.String, v.UInt64, v.Date from test order by x"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (x UInt64, y UInt64) engine=Memory"
+run
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (x UInt64, y UInt64) engine=MergeTree order by x settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000;"
+run
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (x UInt64, y UInt64 ) engine=MergeTree order by x settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+run
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02942_variant_cast.reference b/tests/queries/0_stateless/02942_variant_cast.reference
new file mode 100644
index 00000000000..d300ca655a6
--- /dev/null
+++ b/tests/queries/0_stateless/02942_variant_cast.reference
@@ -0,0 +1,25 @@
+\N
+42
+0
+\N
+2
+\N
+Hello
+Hello
+\N
+Hello
+Hello
+\N
+Hello
+\N
+0
+\N
+42
+\N
+Hello
+2
+\N
+Hello
+5
+0
+1
diff --git a/tests/queries/0_stateless/02942_variant_cast.sql b/tests/queries/0_stateless/02942_variant_cast.sql
new file mode 100644
index 00000000000..fc2d1d63657
--- /dev/null
+++ b/tests/queries/0_stateless/02942_variant_cast.sql
@@ -0,0 +1,24 @@
+set allow_experimental_variant_type=1;
+set allow_experimental_analyzer=0; -- It's currently doesn't work with analyzer because of the way it works with constants, but it will be refactored and fixed in future
+
+select NULL::Variant(String, UInt64);
+select 42::UInt64::Variant(String, UInt64);
+select 42::UInt32::Variant(String, UInt64); -- {serverError CANNOT_CONVERT_TYPE}
+select now()::Variant(String, UInt64); -- {serverError CANNOT_CONVERT_TYPE}
+select CAST(number % 2 ? NULL : number, 'Variant(String, UInt64)') from numbers(4);
+select 'Hello'::LowCardinality(String)::Variant(LowCardinality(String), UInt64);
+select 'Hello'::LowCardinality(Nullable(String))::Variant(LowCardinality(String), UInt64);
+select 'NULL'::LowCardinality(Nullable(String))::Variant(LowCardinality(String), UInt64);
+select 'Hello'::LowCardinality(Nullable(String))::Variant(LowCardinality(String), UInt64);
+select CAST(CAST(number % 2 ? NULL : 'Hello', 'LowCardinality(Nullable(String))'), 'Variant(LowCardinality(String), UInt64)') from numbers(4);
+
+select NULL::Variant(String, UInt64)::UInt64;
+select NULL::Variant(String, UInt64)::Nullable(UInt64);
+select '42'::Variant(String, UInt64)::UInt64;
+select 'str'::Variant(String, UInt64)::UInt64; -- {serverError CANNOT_PARSE_TEXT}
+select CAST(multiIf(number % 3 == 0, NULL::Variant(String, UInt64), number % 3 == 1, 'Hello'::Variant(String, UInt64), number::Variant(String, UInt64)), 'Nullable(String)') from numbers(6);
+select CAST(multiIf(number == 1, NULL::Variant(String, UInt64), number == 2, 'Hello'::Variant(String, UInt64), number::Variant(String, UInt64)), 'UInt64') from numbers(6); -- {serverError CANNOT_PARSE_TEXT}
+
+
+select number::Variant(UInt64)::Variant(String, UInt64)::Variant(Array(String), String, UInt64) from numbers(2);
+select 'str'::Variant(String, UInt64)::Variant(String, Array(UInt64)); -- {serverError CANNOT_CONVERT_TYPE}
diff --git a/tests/queries/0_stateless/02943_order_by_all.reference b/tests/queries/0_stateless/02943_order_by_all.reference
index 48d828b6924..9cfed61bdaf 100644
--- a/tests/queries/0_stateless/02943_order_by_all.reference
+++ b/tests/queries/0_stateless/02943_order_by_all.reference
@@ -49,7 +49,25 @@ A	2
 2	A
 3	B
 \N	C
--- what happens if some column "all" already exists?
+-- SELECT *
+A	2
+B	3
+C	\N
+D	1
+A	2
+B	3
+C	\N
+D	1
+-- the trouble starts when "order by all is all" is ambiguous
+  -- columns
+B	3	10
+D	1	20
+A	2	30
+C	\N	40
+B
+D
+A
+C
 B	3	10
 D	1	20
 A	2	30
@@ -58,6 +76,15 @@ B	3	10
 D	1	20
 A	2	30
 C	\N	40
+B
+D
+A
+C
+B	3	10
+D	1	20
+A	2	30
+C	\N	40
+  -- column aliases
 D	1
 A	2
 B	3
@@ -66,6 +93,7 @@ D	1
 A	2
 B	3
 C	\N
+  -- expressions
 A 2
 B 3
 D 1
@@ -74,6 +102,7 @@ A 2
 B 3
 D 1
 \N
+  -- ORDER BY ALL loses its special meaning when used in conjunction with other columns
 B	3	10
 D	1	20
 A	2	30
diff --git a/tests/queries/0_stateless/02943_order_by_all.sql b/tests/queries/0_stateless/02943_order_by_all.sql
index 0756563946c..0d5e0ea52e4 100644
--- a/tests/queries/0_stateless/02943_order_by_all.sql
+++ b/tests/queries/0_stateless/02943_order_by_all.sql
@@ -5,12 +5,11 @@ DROP TABLE IF EXISTS order_by_all;
 CREATE TABLE order_by_all
 (
     a String,
-    b Nullable(Int32),
-    all UInt64,
+    b Nullable(Int32)
 )
 ENGINE = Memory;
 
-INSERT INTO order_by_all VALUES ('B', 3, 10), ('C', NULL, 40), ('D', 1, 20), ('A', 2, 30);
+INSERT INTO order_by_all VALUES ('B', 3), ('C', NULL), ('D', 1), ('A', 2);
 
 SELECT '-- no modifiers';
 
@@ -42,44 +41,71 @@ SET allow_experimental_analyzer = 1;
 SELECT b, a FROM order_by_all ORDER BY ALL NULLS FIRST;
 SELECT b, a FROM order_by_all ORDER BY ALL NULLS LAST;
 
-SELECT '-- what happens if some column "all" already exists?';
+SELECT '-- SELECT *';
 
--- columns
+SET allow_experimental_analyzer = 0;
+SELECT * FROM order_by_all ORDER BY all;
+
+SET allow_experimental_analyzer = 1;
+SELECT * FROM order_by_all ORDER BY all;
+
+DROP TABLE order_by_all;
+
+SELECT '-- the trouble starts when "order by all is all" is ambiguous';
+
+CREATE TABLE order_by_all
+(
+    a String,
+    b Nullable(Int32),
+    all UInt64
+)
+ENGINE = Memory;
+
+INSERT INTO order_by_all VALUES ('B', 3, 10), ('C', NULL, 40), ('D', 1, 20), ('A', 2, 30);
+
+SELECT '  -- columns';
 
 SET allow_experimental_analyzer = 0;
 SELECT a, b, all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT a, b, all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
+SELECT a FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
+SELECT a FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
+SELECT * FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
+SELECT * FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
 SET allow_experimental_analyzer = 1;
 SELECT a, b, all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT a, b, all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT a, b, all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
+SELECT a FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
+-- SELECT * FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION } -- (*) see below
+SELECT * FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
+-- SELECT a FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION } -- (*) see below
 
--- column aliases
+-- (*) These queries show the expected behavior for analyzer. Unfortunately, it is not implemented that way yet,
+-- which is not wrong but a bit unintuitive (some may say a landmine). Keeping the queries for now for reference.
+
+SELECT '  -- column aliases';
 
 SET allow_experimental_analyzer = 0;
 SELECT a, b AS all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT a, b AS all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT a, b AS all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
 SET allow_experimental_analyzer = 1;
 SELECT a, b AS all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT a, b AS all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT a, b AS all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
--- expressions
+SELECT '  -- expressions';
 
 SET allow_experimental_analyzer = 0;
 SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
 SET allow_experimental_analyzer = 1;
 SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY all;  -- { serverError UNEXPECTED_EXPRESSION }
-SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY ALL;  -- { serverError UNEXPECTED_EXPRESSION }
 SELECT format('{} {}', a, b) AS all FROM order_by_all ORDER BY all SETTINGS enable_order_by_all = false;
 
+SELECT '  -- ORDER BY ALL loses its special meaning when used in conjunction with other columns';
+
 SET allow_experimental_analyzer = 0;
 SELECT a, b, all FROM order_by_all ORDER BY all, a;
 
diff --git a/tests/queries/0_stateless/02943_positional_arguments_bugs.reference b/tests/queries/0_stateless/02943_positional_arguments_bugs.reference
index 702e1261186..08310b7cf27 100644
--- a/tests/queries/0_stateless/02943_positional_arguments_bugs.reference
+++ b/tests/queries/0_stateless/02943_positional_arguments_bugs.reference
@@ -1,2 +1,12 @@
+0	0
+1	1
+2	2
+3	3
+4	4
+5	5
+6	6
+7	7
+8	8
+9	9
 45	1
 processed	99	0
diff --git a/tests/queries/0_stateless/02943_positional_arguments_bugs.sql b/tests/queries/0_stateless/02943_positional_arguments_bugs.sql
index b8cf73da42d..9b1b872ae40 100644
--- a/tests/queries/0_stateless/02943_positional_arguments_bugs.sql
+++ b/tests/queries/0_stateless/02943_positional_arguments_bugs.sql
@@ -2,18 +2,21 @@
 DROP TABLE IF EXISTS t;
 CREATE TABLE t
 (
-    `n` int
+    `n` int,
+    `__unused_group_by_column` int
 )
-    ENGINE = MergeTree
-        ORDER BY n AS
-SELECT *
+ENGINE = MergeTree
+ORDER BY n AS
+SELECT number, number
 FROM numbers(10);
 
 SELECT
     sum(n),
-    1 AS x
+    __unused_group_by_column 
 FROM t
-GROUP BY x;
+GROUP BY __unused_group_by_column ORDER BY __unused_group_by_column;
+
+SELECT sum(n), 1 as x from t group by x;
 
 SELECT
     'processed' AS type,
diff --git a/tests/queries/0_stateless/02943_rmt_alter_metadata_merge_checksum_mismatch.sh b/tests/queries/0_stateless/02943_rmt_alter_metadata_merge_checksum_mismatch.sh
index 431f59d7918..27950866e81 100755
--- a/tests/queries/0_stateless/02943_rmt_alter_metadata_merge_checksum_mismatch.sh
+++ b/tests/queries/0_stateless/02943_rmt_alter_metadata_merge_checksum_mismatch.sh
@@ -82,6 +82,8 @@ $CLICKHOUSE_CLIENT -q "optimize table $success_replica final settings optimize_t
 
 $CLICKHOUSE_CLIENT -nm --insert_keeper_fault_injection_probability=0 -q "
     insert into $success_replica (key) values (2); -- part all_2_2_0
+    -- Avoid 'Cannot select parts for optimization: Entry for part all_2_2_0 hasn't been read from the replication log yet'
+    system sync replica $success_replica pull;
     optimize table $success_replica final settings optimize_throw_if_noop=1, alter_sync=1; -- part all_0_2_2_1
     system sync replica $failed_replica pull;
 "
@@ -95,4 +97,4 @@ trap '' EXIT
 
 $CLICKHOUSE_CLIENT -q "system flush logs"
 # check for error "Different number of files: 5 compressed (expected 3) and 2 uncompressed ones (expected 2). (CHECKSUM_DOESNT_MATCH)"
-$CLICKHOUSE_CLIENT -q "select part_name, merge_reason, event_type, errorCodeToName(error) from system.part_log where database = '$CLICKHOUSE_DATABASE' and error != 0 order by event_time_microseconds"
+$CLICKHOUSE_CLIENT -q "select part_name, merge_reason, event_type, errorCodeToName(error) from system.part_log where database = '$CLICKHOUSE_DATABASE' and error != 0 and errorCodeToName(error) != 'NO_REPLICA_HAS_PART' order by event_time_microseconds"
diff --git a/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.reference b/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.reference
index 1cf1644fe0a..0e1954cde62 100644
--- a/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.reference
+++ b/tests/queries/0_stateless/02943_tokenbf_and_ngrambf_indexes_support_match_function.reference
@@ -2,12 +2,12 @@
 2	Hello World
 1	Hello ClickHouse
 2	Hello World
-          Granules: 6/6
-          Granules: 2/6
             Granules: 6/6
             Granules: 2/6
-          Granules: 6/6
-          Granules: 2/6
+            Granules: 6/6
+            Granules: 2/6
+            Granules: 6/6
+            Granules: 2/6
             Granules: 6/6
             Granules: 2/6
 ---
@@ -17,22 +17,22 @@
 1	Hello ClickHouse
 2	Hello World
 6	World Champion
-          Granules: 6/6
-          Granules: 3/6
             Granules: 6/6
             Granules: 3/6
-          Granules: 6/6
-          Granules: 3/6
+            Granules: 6/6
+            Granules: 3/6
+            Granules: 6/6
+            Granules: 3/6
             Granules: 6/6
             Granules: 3/6
 ---
 5	OLAP Database
 5	OLAP Database
-          Granules: 6/6
-          Granules: 1/6
             Granules: 6/6
             Granules: 1/6
-          Granules: 6/6
-          Granules: 1/6
+            Granules: 6/6
+            Granules: 1/6
+            Granules: 6/6
+            Granules: 1/6
             Granules: 6/6
             Granules: 1/6
diff --git a/tests/queries/0_stateless/02943_variant_element.reference b/tests/queries/0_stateless/02943_variant_element.reference
new file mode 100644
index 00000000000..ab8aaa8fdef
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_element.reference
@@ -0,0 +1,44 @@
+\N
+\N
+\N
+\N
+0
+1
+2
+3
+\N
+\N
+\N
+\N
+0
+\N
+2
+\N
+\N
+\N
+\N
+\N
+str_0
+\N
+str_2
+\N
+\N
+\N
+\N
+\N
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[]
+[0]
+[]
+[0,1,2]
+[]
+[[0]]
+[[NULL]]
+[[2]]
+[[NULL]]
diff --git a/tests/queries/0_stateless/02943_variant_element.sql b/tests/queries/0_stateless/02943_variant_element.sql
new file mode 100644
index 00000000000..556c0147e56
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_element.sql
@@ -0,0 +1,16 @@
+set allow_experimental_variant_type=1;
+set use_variant_as_common_type=1;
+
+select variantElement(NULL::Variant(String, UInt64), 'UInt64') from numbers(4);
+select variantElement(number::Variant(String, UInt64), 'UInt64') from numbers(4);
+select variantElement(number::Variant(String, UInt64), 'String') from numbers(4);
+select variantElement((number % 2 ? NULL : number)::Variant(String, UInt64), 'UInt64') from numbers(4);
+select variantElement((number % 2 ? NULL : number)::Variant(String, UInt64), 'String') from numbers(4);
+select variantElement((number % 2 ? NULL : 'str_' || toString(number))::LowCardinality(Nullable(String))::Variant(LowCardinality(String), UInt64), 'LowCardinality(String)') from numbers(4);
+select variantElement(NULL::LowCardinality(Nullable(String))::Variant(LowCardinality(String), UInt64), 'LowCardinality(String)') from numbers(4);
+select variantElement((number % 2 ? NULL : number)::Variant(Array(UInt64), UInt64), 'Array(UInt64)') from numbers(4);
+select variantElement(NULL::Variant(Array(UInt64), UInt64), 'Array(UInt64)') from numbers(4);
+select variantElement(number % 2 ? NULL : range(number + 1), 'Array(UInt64)') from numbers(4);
+
+select variantElement([[(number % 2 ? NULL : number)::Variant(String, UInt64)]], 'UInt64') from numbers(4);
+
diff --git a/tests/queries/0_stateless/02943_variant_read_subcolumns.reference b/tests/queries/0_stateless/02943_variant_read_subcolumns.reference
new file mode 100644
index 00000000000..4b93782cddf
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_read_subcolumns.reference
@@ -0,0 +1,6 @@
+Memory
+test
+MergeTree compact
+test
+MergeTree wide
+test
diff --git a/tests/queries/0_stateless/02943_variant_read_subcolumns.sh b/tests/queries/0_stateless/02943_variant_read_subcolumns.sh
new file mode 100755
index 00000000000..b816a20c818
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_read_subcolumns.sh
@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# Tags: long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 --allow_suspicious_variant_types=1"
+
+
+function test()
+{
+    echo "test"
+    $CH_CLIENT -q "insert into test select number, multiIf(number % 3 == 2, NULL, number % 3 == 1, number, arrayMap(x -> multiIf(number % 9 == 0, NULL, number % 9 == 3, 'str_' || toString(number), number), range(number % 10))) from numbers(1000000) settings min_insert_block_size_rows=100000"
+    $CH_CLIENT -q "select v, v.UInt64, v.\`Array(Variant(String, UInt64))\`,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64 from test order by id format Null"
+    $CH_CLIENT -q "select v.UInt64, v.\`Array(Variant(String, UInt64))\`,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64 from test order by id format Null"
+    $CH_CLIENT -q "select v.\`Array(Variant(String, UInt64))\`,  v.\`Array(Variant(String, UInt64))\`.size0, v.\`Array(Variant(String, UInt64))\`.UInt64, v.\`Array(Variant(String, UInt64))\`.String from test order by id format Null"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, Array(Variant(String, UInt64)))) engine=Memory"
+test
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, Array(Variant(String, UInt64)))) engine=MergeTree order by id settings min_rows_for_wide_part=1000000000, min_bytes_for_wide_part=10000000000;"
+test
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, Array(Variant(String, UInt64)))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1;"
+test
+$CH_CLIENT -q "drop table test;"
+
diff --git a/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.reference b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.reference
new file mode 100644
index 00000000000..4109a88997c
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.reference
@@ -0,0 +1,244 @@
+Memory
+test1 insert
+test1 select
+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
+10	\N	10
+\N	\N	\N
+12	\N	12
+\N	\N	\N
+14	\N	14
+\N	\N	\N
+16	\N	16
+\N	\N	\N
+18	\N	18
+\N	\N	\N
+str_20	str_20	\N
+\N	\N	\N
+str_22	str_22	\N
+\N	\N	\N
+str_24	str_24	\N
+\N	\N	\N
+str_26	str_26	\N
+\N	\N	\N
+str_28	str_28	\N
+\N	\N	\N
+30	\N	30
+\N	\N	\N
+32	\N	32
+\N	\N	\N
+34	\N	34
+\N	\N	\N
+str_36	str_36	\N
+\N	\N	\N
+str_38	str_38	\N
+\N	\N	\N
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+500000
+100000
+400000
+-----------------------------------------------------------------------------------------------------------
+MergeTree compact
+test1 insert
+test1 select
+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
+10	\N	10
+\N	\N	\N
+12	\N	12
+\N	\N	\N
+14	\N	14
+\N	\N	\N
+16	\N	16
+\N	\N	\N
+18	\N	18
+\N	\N	\N
+str_20	str_20	\N
+\N	\N	\N
+str_22	str_22	\N
+\N	\N	\N
+str_24	str_24	\N
+\N	\N	\N
+str_26	str_26	\N
+\N	\N	\N
+str_28	str_28	\N
+\N	\N	\N
+30	\N	30
+\N	\N	\N
+32	\N	32
+\N	\N	\N
+34	\N	34
+\N	\N	\N
+str_36	str_36	\N
+\N	\N	\N
+str_38	str_38	\N
+\N	\N	\N
+-----------------------------------------------------------------------------------------------------------
+test1 select
+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
+10	\N	10
+\N	\N	\N
+12	\N	12
+\N	\N	\N
+14	\N	14
+\N	\N	\N
+16	\N	16
+\N	\N	\N
+18	\N	18
+\N	\N	\N
+str_20	str_20	\N
+\N	\N	\N
+str_22	str_22	\N
+\N	\N	\N
+str_24	str_24	\N
+\N	\N	\N
+str_26	str_26	\N
+\N	\N	\N
+str_28	str_28	\N
+\N	\N	\N
+30	\N	30
+\N	\N	\N
+32	\N	32
+\N	\N	\N
+34	\N	34
+\N	\N	\N
+str_36	str_36	\N
+\N	\N	\N
+str_38	str_38	\N
+\N	\N	\N
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+500000
+100000
+400000
+-----------------------------------------------------------------------------------------------------------
+test2 select
+500000
+100000
+400000
+-----------------------------------------------------------------------------------------------------------
+MergeTree wide
+test1 insert
+test1 select
+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
+10	\N	10
+\N	\N	\N
+12	\N	12
+\N	\N	\N
+14	\N	14
+\N	\N	\N
+16	\N	16
+\N	\N	\N
+18	\N	18
+\N	\N	\N
+str_20	str_20	\N
+\N	\N	\N
+str_22	str_22	\N
+\N	\N	\N
+str_24	str_24	\N
+\N	\N	\N
+str_26	str_26	\N
+\N	\N	\N
+str_28	str_28	\N
+\N	\N	\N
+30	\N	30
+\N	\N	\N
+32	\N	32
+\N	\N	\N
+34	\N	34
+\N	\N	\N
+str_36	str_36	\N
+\N	\N	\N
+str_38	str_38	\N
+\N	\N	\N
+-----------------------------------------------------------------------------------------------------------
+test1 select
+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
+10	\N	10
+\N	\N	\N
+12	\N	12
+\N	\N	\N
+14	\N	14
+\N	\N	\N
+16	\N	16
+\N	\N	\N
+18	\N	18
+\N	\N	\N
+str_20	str_20	\N
+\N	\N	\N
+str_22	str_22	\N
+\N	\N	\N
+str_24	str_24	\N
+\N	\N	\N
+str_26	str_26	\N
+\N	\N	\N
+str_28	str_28	\N
+\N	\N	\N
+30	\N	30
+\N	\N	\N
+32	\N	32
+\N	\N	\N
+34	\N	34
+\N	\N	\N
+str_36	str_36	\N
+\N	\N	\N
+str_38	str_38	\N
+\N	\N	\N
+-----------------------------------------------------------------------------------------------------------
+test2 insert
+test2 select
+500000
+100000
+400000
+-----------------------------------------------------------------------------------------------------------
+test2 select
+500000
+100000
+400000
+-----------------------------------------------------------------------------------------------------------
diff --git a/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh
new file mode 100755
index 00000000000..1d88757a5d6
--- /dev/null
+++ b/tests/queries/0_stateless/02943_variant_type_with_different_local_and_global_order.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+# Tags: long, no-debug
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# reset --log_comment
+CLICKHOUSE_LOG_COMMENT=
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+CH_CLIENT="$CLICKHOUSE_CLIENT --allow_experimental_variant_type=1 --use_variant_as_common_type=1 --allow_suspicious_variant_types=1"
+
+
+function test1_insert()
+{
+    echo "test1 insert"
+    $CH_CLIENT -q "insert into test select number, number::Variant(UInt64)::Variant(UInt64, Array(UInt64)) from numbers(10) settings max_block_size=3"
+    $CH_CLIENT -q "insert into test select number, if(number % 2, NULL, number)::Variant(UInt64)::Variant(UInt64, String, Array(UInt64)) as res from numbers(10, 10) settings max_block_size=3"
+    $CH_CLIENT -q "insert into test select number, if(number % 2, NULL, 'str_' || toString(number))::Variant(String)::Variant(UInt64, String, Array(UInt64)) as res from numbers(20, 10) settings max_block_size=3"
+    $CH_CLIENT -q "insert into test select number, if(number < 35, if(number % 2, NULL, number)::Variant(UInt64)::Variant(UInt64, String, Array(UInt64)), if(number % 2, NULL, 'str_' || toString(number))::Variant(String)::Variant(UInt64, String, Array(UInt64))) from numbers(30, 10) settings max_block_size=3"
+}
+
+function test1_select()
+{
+    echo "test1 select"
+    $CH_CLIENT -q "select v, v.String, v.UInt64 from test order by id;"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function test2_insert()
+{
+    echo "test2 insert"
+    $CH_CLIENT -q "insert into test select number, number::Variant(UInt64)::Variant(UInt64, Array(UInt64)) from numbers(200000) settings max_insert_block_size = 10000, min_insert_block_size_rows=10000"
+    $CH_CLIENT -q "insert into test select number, if(number % 2, NULL, number)::Variant(UInt64)::Variant(UInt64, String, Array(UInt64)) as res from numbers(200000, 200000) settings max_insert_block_size = 10000, min_insert_block_size_rows=10000"
+    $CH_CLIENT -q "insert into test select number, if(number % 2, NULL, 'str_' || toString(number))::Variant(String)::Variant(UInt64, String, Array(UInt64)) as res from numbers(400000, 200000) settings max_insert_block_size = 10000, min_insert_block_size_rows=10000"
+    $CH_CLIENT -q "insert into test select number, if(number < 3500000, if(number % 2, NULL, number)::Variant(UInt64)::Variant(UInt64, String, Array(UInt64)), if(number % 2, NULL, 'str_' || toString(number))::Variant(String)::Variant(UInt64, String, Array(UInt64))) from numbers(600000, 200000) settings max_insert_block_size = 10000, min_insert_block_size_rows=10000"
+}
+
+function test2_select()
+{
+    echo "test2 select"
+    $CH_CLIENT -q "select v, v.String, v.UInt64 from test format Null;"
+    $CH_CLIENT -q "select v from test format Null;"
+    $CH_CLIENT -q "select count() from test where isNotNull(v);"
+    $CH_CLIENT -q "select v.String from test format Null;"
+    $CH_CLIENT -q "select count() from test where isNotNull(v.String);"
+    $CH_CLIENT -q "select v.UInt64 from test format Null;"
+    $CH_CLIENT -q "select count() from test where isNotNull(v.UInt64);"
+    echo "-----------------------------------------------------------------------------------------------------------"
+}
+
+function run()
+{
+    test1_insert
+    test1_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test1_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+    test2_insert
+    test2_select
+    if [ $1 == 1 ]; then
+        $CH_CLIENT -q "optimize table test final;"
+        test2_select
+    fi
+    $CH_CLIENT -q "truncate table test;"
+}
+
+$CH_CLIENT -q "drop table if exists test;"
+
+echo "Memory"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=Memory;"
+run 0
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree compact"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=100000000, min_bytes_for_wide_part=1000000000, index_granularity = 8192, index_granularity_bytes = '10Mi';"
+run 1
+$CH_CLIENT -q "drop table test;"
+
+echo "MergeTree wide"
+$CH_CLIENT -q "create table test (id UInt64, v Variant(UInt64, String, Array(UInt64))) engine=MergeTree order by id settings min_rows_for_wide_part=1, min_bytes_for_wide_part=1, index_granularity = 8192, index_granularity_bytes = '10Mi';"
+run 1
+$CH_CLIENT -q "drop table test;"
diff --git a/tests/queries/0_stateless/02944_variant_as_common_type.reference b/tests/queries/0_stateless/02944_variant_as_common_type.reference
new file mode 100644
index 00000000000..0425a8cfa30
--- /dev/null
+++ b/tests/queries/0_stateless/02944_variant_as_common_type.reference
@@ -0,0 +1,103 @@
+Array(UInt8)	[1,2,3]
+Array(UInt8)	[1,2,3]
+String	str_1
+Nullable(String)	str_1
+String	str_1
+Nullable(String)	str_1
+Variant(Array(UInt8), String)	str_1
+Variant(Array(UInt8), String)	str_1
+Array(UInt8)	[1,2,3]
+Array(UInt8)	[1,2,3]
+String	str_1
+Nullable(String)	str_1
+String	str_1
+Nullable(String)	str_1
+Variant(Array(UInt8), String)	str_1
+Variant(Array(UInt8), String)	str_1
+Array(UInt8)	[1,2,3]
+Array(UInt8)	[1,2,3]
+String	str_1
+Nullable(String)	str_1
+String	str_1
+Nullable(String)	str_1
+Variant(Array(UInt8), String)	str_1
+Variant(Array(UInt8), String)	str_1
+String	str_0
+String	str_1
+String	str_2
+String	str_3
+Nullable(String)	str_0
+Nullable(String)	str_1
+Nullable(String)	str_2
+Nullable(String)	str_3
+Array(UInt64)	[0]
+Array(UInt64)	[0,1]
+Array(UInt64)	[0,1,2]
+Array(UInt64)	[0,1,2,3]
+Array(UInt64)	[0]
+Array(UInt64)	[0,1]
+Array(UInt64)	[0,1,2]
+Array(UInt64)	[0,1,2,3]
+String	str_0
+String	str_1
+String	str_2
+String	str_3
+Nullable(String)	str_0
+Nullable(String)	str_1
+Nullable(String)	str_2
+Nullable(String)	str_3
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	str_1
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	str_3
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	str_1
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	str_3
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	[0,1]
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	[0,1,2,3]
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	[0,1]
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	[0,1,2,3]
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	[0,1]
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	[0,1,2,3]
+Variant(Array(UInt64), String)	str_0
+Variant(Array(UInt64), String)	[0,1]
+Variant(Array(UInt64), String)	str_2
+Variant(Array(UInt64), String)	[0,1,2,3]
+Variant(Array(UInt64), String, UInt64)	[0]
+Variant(Array(UInt64), String, UInt64)	1
+Variant(Array(UInt64), String, UInt64)	str_2
+Variant(Array(UInt64), String, UInt64)	[0,1,2,3]
+Variant(Array(UInt64), String, UInt64)	4
+Variant(Array(UInt64), String, UInt64)	str_5
+Variant(Array(UInt64), String, UInt64)	[0]
+Variant(Array(UInt64), String, UInt64)	1
+Variant(Array(UInt64), String, UInt64)	str_2
+Variant(Array(UInt64), String, UInt64)	[0,1,2,3]
+Variant(Array(UInt64), String, UInt64)	4
+Variant(Array(UInt64), String, UInt64)	str_5
+Variant(Array(UInt64), String, UInt64)	[0]
+Variant(Array(UInt64), String, UInt64)	1
+Variant(Array(UInt64), String, UInt64)	str_2
+Variant(Array(UInt64), String, UInt64)	[0,1,2,3]
+Variant(Array(UInt64), String, UInt64)	4
+Variant(Array(UInt64), String, UInt64)	str_5
+Variant(Array(UInt64), String, UInt64)	[0]
+Variant(Array(UInt64), String, UInt64)	1
+Variant(Array(UInt64), String, UInt64)	str_2
+Variant(Array(UInt64), String, UInt64)	[0,1,2,3]
+Variant(Array(UInt64), String, UInt64)	4
+Variant(Array(UInt64), String, UInt64)	str_5
+Array(Variant(String, UInt8))	[1,'str_1',2,'str_2']
+Array(Variant(Array(String), Array(UInt8)))	[[1,2,3],['str_1','str_2','str_3']]
+Array(Variant(Array(UInt8), Array(Variant(Array(String), Array(UInt8)))))	[[[1,2,3],['str_1','str_2','str_3']],[1,2,3]]
+Array(Variant(Array(Array(UInt8)), Array(UInt8)))	[[1,2,3],[[1,2,3]]]
+Map(String, Variant(String, UInt8))	{'a':1,'b':'str_1'}
+Map(String, Variant(Map(String, Variant(String, UInt8)), UInt8))	{'a':1,'b':{'c':2,'d':'str_1'}}
+Map(String, Variant(Array(Array(UInt8)), Array(UInt8), UInt8))	{'a':1,'b':[1,2,3],'c':[[4,5,6]]}
diff --git a/tests/queries/0_stateless/02944_variant_as_common_type.sql b/tests/queries/0_stateless/02944_variant_as_common_type.sql
new file mode 100644
index 00000000000..e985cf365dd
--- /dev/null
+++ b/tests/queries/0_stateless/02944_variant_as_common_type.sql
@@ -0,0 +1,76 @@
+set allow_experimental_analyzer=0; -- The result type for if function with constant is different with analyzer. It wil be fixed after refactoring around constants in analyzer.
+
+set allow_experimental_variant_type=1;
+set use_variant_as_common_type=1;
+
+select toTypeName(res), if(1, [1,2,3], 'str_1') as res;
+select toTypeName(res), if(1, [1,2,3], 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(0, [1,2,3], 'str_1') as res;
+select toTypeName(res), if(0, [1,2,3], 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(NULL, [1,2,3], 'str_1') as res;
+select toTypeName(res), if(NULL, [1,2,3], 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), [1,2,3], 'str_1') as res;
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), [1,2,3], 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(1, materialize([1,2,3]), 'str_1') as res;
+select toTypeName(res), if(1, materialize([1,2,3]), 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(0, materialize([1,2,3]), 'str_1') as res;
+select toTypeName(res), if(0, materialize([1,2,3]), 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(NULL, materialize([1,2,3]), 'str_1') as res;
+select toTypeName(res), if(NULL, materialize([1,2,3]), 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), materialize([1,2,3]), 'str_1') as res;
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), materialize([1,2,3]), 'str_1'::Nullable(String)) as res;
+
+select toTypeName(res), if(1, [1,2,3], materialize('str_1')) as res;
+select toTypeName(res), if(1, [1,2,3], materialize('str_1')::Nullable(String)) as res;
+
+select toTypeName(res), if(0, [1,2,3], materialize('str_1')) as res;
+select toTypeName(res), if(0, [1,2,3], materialize('str_1')::Nullable(String)) as res;
+
+select toTypeName(res), if(NULL, [1,2,3], materialize('str_1')) as res;
+select toTypeName(res), if(NULL, [1,2,3], materialize('str_1')::Nullable(String)) as res;
+
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), [1,2,3], materialize('str_1')) as res;
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), [1,2,3], materialize('str_1')::Nullable(String)) as res;
+
+
+select toTypeName(res), if(0, range(number + 1), 'str_' || toString(number)) as res from numbers(4);
+select toTypeName(res), if(0, range(number + 1), ('str_' || toString(number))::Nullable(String)) as res from numbers(4);
+
+select toTypeName(res), if(1, range(number + 1), 'str_' || toString(number)) as res from numbers(4);
+select toTypeName(res), if(1, range(number + 1), ('str_' || toString(number))::Nullable(String)) as res from numbers(4);
+
+select toTypeName(res), if(NULL, range(number + 1), 'str_' || toString(number)) as res from numbers(4);
+select toTypeName(res), if(NULL, range(number + 1), ('str_' || toString(number))::Nullable(String)) as res from numbers(4);
+
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), range(number + 1), 'str_' || toString(number)) as res from numbers(4);
+select toTypeName(res), if(materialize(NULL::Nullable(UInt8)), range(number + 1), ('str_' || toString(number))::Nullable(String)) as res from numbers(4);
+
+select toTypeName(res), if(number % 2, range(number + 1), 'str_' || toString(number)) as res from numbers(4);
+select toTypeName(res), if(number % 2, range(number + 1), ('str_' || toString(number))::Nullable(String)) as res from numbers(4);
+
+select toTypeName(res), if(number % 2, range(number + 1), ('str_' || toString(number))::LowCardinality(String)) as res from numbers(4);
+select toTypeName(res), if(number % 2, range(number + 1), ('str_' || toString(number))::LowCardinality(Nullable(String))) as res from numbers(4);
+
+
+select toTypeName(res), multiIf(number % 3 == 0, range(number + 1), number % 3 == 1, number, 'str_' || toString(number)) as res from numbers(6);
+select toTypeName(res), multiIf(number % 3 == 0, range(number + 1), number % 3 == 1, number,  ('str_' || toString(number))::Nullable(String)) as res from numbers(6);
+select toTypeName(res), multiIf(number % 3 == 0, range(number + 1), number % 3 == 1, number, ('str_' || toString(number))::LowCardinality(String)) as res from numbers(6);
+select toTypeName(res), multiIf(number % 3 == 0, range(number + 1), number % 3 == 1, number, ('str_' || toString(number))::LowCardinality(Nullable(String))) as res from numbers(6);
+
+
+select toTypeName(res), array(1, 'str_1', 2, 'str_2') as res;
+select toTypeName(res), array([1, 2, 3], ['str_1', 'str_2', 'str_3']) as res;
+select toTypeName(res), array(array([1, 2, 3], ['str_1', 'str_2', 'str_3']), [1, 2, 3]) as res;
+select toTypeName(res), array([1, 2, 3], [[1, 2, 3]]) as res;
+
+select toTypeName(res), map('a', 1, 'b', 'str_1') as res;
+select toTypeName(res), map('a', 1, 'b', map('c', 2, 'd', 'str_1')) as res;
+select toTypeName(res), map('a', 1, 'b', [1, 2, 3], 'c', [[4, 5, 6]]) as res;
+
diff --git a/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.reference b/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.reference
new file mode 100644
index 00000000000..461075e9607
--- /dev/null
+++ b/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.reference
@@ -0,0 +1,45 @@
+DEFAULT expressions
+-- Compact parts
+Before materialize
+1	1
+2	54321
+After materialize
+1	1
+2	54321
+-- Wide parts
+Before materialize
+1	1
+2	54321
+After materialize
+1	1
+2	54321
+-- Nullable column != physically absent
+Before materialize
+1	1
+2	\N
+3	54321
+After materialize
+1	1
+2	\N
+3	54321
+-- Parts with renamed column
+Before materialize
+1	1
+2	54321
+After rename
+1	1
+2	54321
+After materialize
+1	1
+2	54321
+MATERIALIZED expressions
+-- Compact parts
+Before materialize
+1	54321
+After materialize
+1	65432
+-- Compact parts
+Before materialize
+1	54321
+After materialize
+1	65432
diff --git a/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.sql b/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.sql
new file mode 100644
index 00000000000..cfdde287712
--- /dev/null
+++ b/tests/queries/0_stateless/02946_materialize_column_must_not_override_past_values.sql
@@ -0,0 +1,85 @@
+SET mutations_sync = 2;
+
+DROP TABLE IF EXISTS tab;
+
+-- Tests that existing parts which contain a non-default value in columns with DEFAULT expression remain unchanged by MATERIALIZE COLUMN>
+SELECT 'DEFAULT expressions';
+
+SELECT '-- Compact parts';
+
+CREATE TABLE tab (id Int64, dflt Int64 DEFAULT 54321) ENGINE MergeTree ORDER BY id;
+INSERT INTO tab (id, dflt) VALUES (1, 1);
+INSERT INTO tab (id) VALUES (2);
+SELECT 'Before materialize';
+SELECT * FROM tab ORDER BY id;
+ALTER TABLE tab MATERIALIZE COLUMN dflt;
+SELECT 'After materialize';
+SELECT * FROM tab ORDER BY id;
+DROP TABLE tab;
+
+SELECT '-- Wide parts';
+
+CREATE TABLE tab (id Int64, dflt Int64 DEFAULT 54321) ENGINE MergeTree ORDER BY id SETTINGS min_bytes_for_wide_part = 1;
+INSERT INTO tab (id, dflt) VALUES (1, 1);
+INSERT INTO tab (id) VALUES (2);
+SELECT 'Before materialize';
+SELECT * FROM tab ORDER BY id;
+ALTER TABLE tab MATERIALIZE COLUMN dflt;
+SELECT 'After materialize';
+SELECT * FROM tab ORDER BY id;
+DROP TABLE tab;
+
+SELECT '-- Nullable column != physically absent';
+
+CREATE TABLE tab (id Int64, dflt Nullable(Int64) DEFAULT 54321) ENGINE MergeTree ORDER BY id SETTINGS min_bytes_for_wide_part = 1;
+INSERT INTO tab (id, dflt) VALUES (1, 1);
+INSERT INTO tab (id, dflt) VALUES (2, NULL);
+INSERT INTO tab (id) VALUES (3);
+SELECT 'Before materialize';
+SELECT * FROM tab ORDER BY id;
+ALTER TABLE tab MATERIALIZE COLUMN dflt;
+SELECT 'After materialize';
+SELECT * FROM tab ORDER BY id;
+DROP TABLE tab;
+
+SELECT '-- Parts with renamed column';
+
+CREATE TABLE tab (id Int64, dflt Int64 DEFAULT 54321) ENGINE MergeTree ORDER BY id;
+INSERT INTO tab (id, dflt) VALUES (1, 1);
+INSERT INTO tab (id) VALUES (2);
+SELECT 'Before materialize';
+SELECT * FROM tab ORDER BY id;
+ALTER TABLE tab RENAME COLUMN dflt TO dflt2;
+SELECT 'After rename';
+SELECT * FROM tab ORDER BY id;
+ALTER TABLE tab MATERIALIZE COLUMN dflt2;
+SELECT 'After materialize';
+SELECT * FROM tab ORDER BY id;
+DROP TABLE tab;
+
+-- But for columns with MATERIALIZED expression, all existing parts should be rewritten in case a new expression was set in the meantime.
+SELECT 'MATERIALIZED expressions';
+
+SELECT '-- Compact parts';
+
+CREATE TABLE tab (id Int64, mtrl Int64 MATERIALIZED 54321) ENGINE MergeTree ORDER BY id;
+INSERT INTO tab (id) VALUES (1);
+SELECT 'Before materialize';
+SELECT id, mtrl FROM tab ORDER BY id;
+ALTER TABLE tab MODIFY COLUMN mtrl Int64 MATERIALIZED 65432;
+ALTER TABLE tab MATERIALIZE COLUMN mtrl;
+SELECT 'After materialize';
+SELECT id, mtrl FROM tab ORDER BY id;
+DROP TABLE tab;
+
+SELECT '-- Compact parts';
+
+CREATE TABLE tab (id Int64, mtrl Int64 MATERIALIZED 54321) ENGINE MergeTree ORDER BY id SETTINGS min_bytes_for_wide_part = 1;
+INSERT INTO tab (id) VALUES (1);
+SELECT 'Before materialize';
+SELECT id, mtrl FROM tab ORDER BY id;
+ALTER TABLE tab MODIFY COLUMN mtrl Int64 MATERIALIZED 65432;
+ALTER TABLE tab MATERIALIZE COLUMN mtrl;
+SELECT 'After materialize';
+SELECT id, mtrl FROM tab ORDER BY id;
+DROP TABLE tab;
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_1.reference b/tests/queries/0_stateless/02947_merge_tree_index_table_1.reference
new file mode 100644
index 00000000000..b897f6e50ed
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_1.reference
@@ -0,0 +1,84 @@
+0	0	v0
+0	5	v25
+1	1	v1
+1	6	v36
+2	2	v4
+2	7	v49
+3	3	v9
+3	8	v64
+4	4	v16
+4	9	v81
+0	10	v100
+0	15	v225
+1	11	v121
+1	16	v256
+2	12	v144
+2	17	v289
+3	13	v169
+3	18	v324
+4	14	v196
+4	19	v361
+    ┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬──b─�
+ 1. │ all_1_1_0 │           0 │               3 │ 0 │  0 │
+ 2. │ all_1_1_0 │           1 │               3 │ 1 │  6 │
+ 3. │ all_1_1_0 │           2 │               3 │ 3 │  3 │
+ 4. │ all_1_1_0 │           3 │               1 │ 4 │  9 │
+ 5. │ all_1_1_0 │           4 │               0 │ 4 │  9 │
+ 6. │ all_2_2_0 │           0 │               3 │ 0 │ 10 │
+ 7. │ all_2_2_0 │           1 │               3 │ 1 │ 16 │
+ 8. │ all_2_2_0 │           2 │               3 │ 3 │ 13 │
+ 9. │ all_2_2_0 │           3 │               1 │ 4 │ 19 │
+10. │ all_2_2_0 │           4 │               0 │ 4 │ 19 │
+    └───────────┴─────────────┴─────────────────┴───┴────┘
+    ┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬──b─┬─a.mark─┬─b.mark─┬─s.mark─�
+ 1. │ all_1_1_0 │           0 │               3 │ 0 │  0 │ (0,0)  │ (0,0)  │ (0,0)  │
+ 2. │ all_1_1_0 │           1 │               3 │ 1 │  6 │ (0,24) │ (0,24) │ (0,10) │
+ 3. │ all_1_1_0 │           2 │               3 │ 3 │  3 │ (0,48) │ (0,48) │ (0,21) │
+ 4. │ all_1_1_0 │           3 │               1 │ 4 │  9 │ (0,72) │ (0,72) │ (0,32) │
+ 5. │ all_1_1_0 │           4 │               0 │ 4 │  9 │ (0,80) │ (0,80) │ (0,36) │
+ 6. │ all_2_2_0 │           0 │               3 │ 0 │ 10 │ (0,0)  │ (0,0)  │ (0,0)  │
+ 7. │ all_2_2_0 │           1 │               3 │ 1 │ 16 │ (0,24) │ (0,24) │ (0,15) │
+ 8. │ all_2_2_0 │           2 │               3 │ 3 │ 13 │ (0,48) │ (0,48) │ (0,30) │
+ 9. │ all_2_2_0 │           3 │               1 │ 4 │ 19 │ (0,72) │ (0,72) │ (0,45) │
+10. │ all_2_2_0 │           4 │               0 │ 4 │ 19 │ (0,80) │ (0,80) │ (0,50) │
+    └───────────┴─────────────┴─────────────────┴───┴────┴────────┴────────┴────────┘
+0	0	v0
+0	4	v16
+0	8	v64
+1	1	v1
+1	5	v25
+1	9	v81
+2	2	v4
+2	6	v36
+3	3	v9
+3	7	v49
+0	12	v144
+0	16	v256
+1	13	v169
+1	17	v289
+2	10	v100
+2	14	v196
+2	18	v324
+3	11	v121
+3	15	v225
+3	19	v361
+   ┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬──b─�
+1. │ all_1_1_0 │           0 │               3 │ 0 │  0 │
+2. │ all_1_1_0 │           1 │               3 │ 1 │  1 │
+3. │ all_1_1_0 │           2 │               4 │ 2 │  2 │
+4. │ all_1_1_0 │           3 │               0 │ 3 │  7 │
+5. │ all_2_2_0 │           0 │               3 │ 0 │ 12 │
+6. │ all_2_2_0 │           1 │               3 │ 1 │ 17 │
+7. │ all_2_2_0 │           2 │               4 │ 2 │ 18 │
+8. │ all_2_2_0 │           3 │               0 │ 3 │ 19 │
+   └───────────┴─────────────┴─────────────────┴───┴────┘
+   ┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬──b─┬─a.mark──┬─b.mark──┬─s.mark──�
+1. │ all_1_1_0 │           0 │               3 │ 0 │  0 │ (0,0)   │ (35,0)  │ (77,0)  │
+2. │ all_1_1_0 │           1 │               3 │ 1 │  1 │ (114,0) │ (153,0) │ (197,0) │
+3. │ all_1_1_0 │           2 │               4 │ 2 │  2 │ (234,0) │ (281,0) │ (329,0) │
+4. │ all_1_1_0 │           3 │               0 │ 3 │  7 │ (369,0) │ (369,0) │ (369,0) │
+5. │ all_2_2_0 │           0 │               3 │ 0 │ 12 │ (0,0)   │ (38,0)  │ (82,0)  │
+6. │ all_2_2_0 │           1 │               3 │ 1 │ 17 │ (124,0) │ (168,0) │ (212,0) │
+7. │ all_2_2_0 │           2 │               4 │ 2 │ 18 │ (254,0) │ (297,0) │ (345,0) │
+8. │ all_2_2_0 │           3 │               0 │ 3 │ 19 │ (392,0) │ (392,0) │ (392,0) │
+   └───────────┴─────────────┴─────────────────┴───┴────┴─────────┴─────────┴─────────┘
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_1.sql b/tests/queries/0_stateless/02947_merge_tree_index_table_1.sql
new file mode 100644
index 00000000000..84993de352b
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_1.sql
@@ -0,0 +1,39 @@
+-- Tags: no-random-settings
+
+DROP TABLE IF EXISTS t_merge_tree_index;
+
+CREATE TABLE t_merge_tree_index (a UInt64 CODEC(LZ4), b UInt64 CODEC(LZ4), s String CODEC(LZ4))
+ENGINE = MergeTree ORDER BY (a, b)
+SETTINGS
+    index_granularity = 3,
+    min_bytes_for_wide_part = 0,
+    ratio_of_defaults_for_sparse_serialization = 1.0;
+
+SYSTEM STOP MERGES t_merge_tree_index;
+
+INSERT INTO t_merge_tree_index SELECT number % 5, number, 'v' || toString(number * number) FROM numbers(10);
+INSERT INTO t_merge_tree_index SELECT number % 5, number, 'v' || toString(number * number) FROM numbers(10, 10);
+
+SELECT * FROM t_merge_tree_index ORDER BY _part, a, b;
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+
+DROP TABLE t_merge_tree_index;
+
+CREATE TABLE t_merge_tree_index (a UInt64 CODEC(LZ4), b UInt64 CODEC(LZ4), s String CODEC(LZ4))
+ENGINE = MergeTree ORDER BY (a, b)
+SETTINGS
+    index_granularity = 3,
+    min_bytes_for_wide_part = '1G',
+    ratio_of_defaults_for_sparse_serialization = 1.0;
+
+SYSTEM STOP MERGES t_merge_tree_index;
+
+INSERT INTO t_merge_tree_index SELECT number % 4, number, 'v' || toString(number * number) FROM numbers(10);
+INSERT INTO t_merge_tree_index SELECT number % 4, number, 'v' || toString(number * number) FROM numbers(10, 10);
+
+SELECT * FROM t_merge_tree_index ORDER BY _part, a, b;
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+
+DROP TABLE t_merge_tree_index;
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_2.reference b/tests/queries/0_stateless/02947_merge_tree_index_table_2.reference
new file mode 100644
index 00000000000..7bfcb7b2822
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_2.reference
@@ -0,0 +1,51 @@
+┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬─b─┬─modulo(sipHash64(sp), 100)─�
+│ all_1_1_0 │           0 │               3 │ 0 │ 0 │                         19 │
+│ all_1_1_0 │           1 │               3 │ 1 │ 6 │                         19 │
+│ all_1_1_0 │           2 │               3 │ 3 │ 3 │                         19 │
+│ all_1_1_0 │           3 │               1 │ 4 │ 9 │                         19 │
+│ all_1_1_0 │           4 │               0 │ 4 │ 9 │                         19 │
+│ all_2_2_0 │           0 │               3 │ 0 │ 0 │                         96 │
+│ all_2_2_0 │           1 │               2 │ 3 │ 3 │                         96 │
+│ all_2_2_0 │           2 │               0 │ 4 │ 4 │                         96 │
+│ all_3_3_0 │           0 │               3 │ 0 │ 0 │                         96 │
+│ all_3_3_0 │           1 │               3 │ 1 │ 6 │                         96 │
+│ all_3_3_0 │           2 │               3 │ 3 │ 3 │                         96 │
+│ all_3_3_0 │           3 │               1 │ 4 │ 9 │                         96 │
+│ all_3_3_0 │           4 │               0 │ 4 │ 9 │                         96 │
+└───────────┴─────────────┴─────────────────┴───┴───┴────────────────────────────┘
+┌─part_name─┬─mark_number─┬─rows_in_granule─┬─a─┬─b─┬─modulo(sipHash64(sp), 100)─┬─a.mark──┬─b.mark──┬─c.mark──────┬─sp.sparse.idx.mark─┬─sp.mark─┬─arr.size0.mark─┬─arr.dict.mark─┬─arr.mark─┬─n.size0.mark─┬─n%2Ec1.mark─┬─n%2Ec2.mark─┬─t%2Ec2.mark─┬─t%2Ec1.mark─┬─t.mark──────┬─column%2Ewith%2Edots.mark─�
+│ all_1_1_0 │           0 │               3 │ 0 │ 0 │                         19 │ (0,0)   │ (0,0)   │ (NULL,NULL) │ (0,0)              │ (0,0)   │ (0,0)          │ (0,8)         │ (0,0)    │ (0,0)        │ (0,0)       │ (0,0)       │ (0,0)       │ (0,0)       │ (NULL,NULL) │ (0,0)                     │
+│ all_1_1_0 │           1 │               3 │ 1 │ 6 │                         19 │ (0,24)  │ (0,24)  │ (NULL,NULL) │ (0,9)              │ (0,0)   │ (0,24)         │ (0,8)         │ (0,22)   │ (0,24)       │ (0,36)      │ (0,72)      │ (0,24)      │ (0,24)      │ (NULL,NULL) │ (0,24)                    │
+│ all_1_1_0 │           2 │               3 │ 3 │ 3 │                         19 │ (0,48)  │ (0,48)  │ (NULL,NULL) │ (0,18)             │ (0,0)   │ (0,48)         │ (0,8)         │ (0,44)   │ (0,48)       │ (0,72)      │ (0,144)     │ (0,48)      │ (0,48)      │ (NULL,NULL) │ (0,48)                    │
+│ all_1_1_0 │           3 │               1 │ 4 │ 9 │                         19 │ (0,72)  │ (0,72)  │ (NULL,NULL) │ (0,27)             │ (0,0)   │ (0,72)         │ (0,8)         │ (0,66)   │ (0,72)       │ (0,108)     │ (0,216)     │ (0,72)      │ (0,72)      │ (NULL,NULL) │ (0,72)                    │
+│ all_1_1_0 │           4 │               0 │ 4 │ 9 │                         19 │ (0,80)  │ (0,80)  │ (NULL,NULL) │ (0,36)             │ (0,0)   │ (0,80)         │ (0,25)        │ (0,84)   │ (0,80)       │ (0,120)     │ (0,240)     │ (0,80)      │ (0,80)      │ (NULL,NULL) │ (0,80)                    │
+│ all_2_2_0 │           0 │               3 │ 0 │ 0 │                         96 │ (0,0)   │ (42,0)  │ (84,0)      │ (NULL,NULL)        │ (126,0) │ (NULL,NULL)    │ (NULL,NULL)   │ (165,0)  │ (NULL,NULL)  │ (232,0)     │ (286,0)     │ (NULL,NULL) │ (NULL,NULL) │ (342,0)     │ (391,0)                   │
+│ all_2_2_0 │           1 │               2 │ 3 │ 3 │                         96 │ (433,0) │ (472,0) │ (511,0)     │ (NULL,NULL)        │ (550,0) │ (NULL,NULL)    │ (NULL,NULL)   │ (589,0)  │ (NULL,NULL)  │ (659,0)     │ (717,0)     │ (NULL,NULL) │ (NULL,NULL) │ (773,0)     │ (817,0)                   │
+│ all_2_2_0 │           2 │               0 │ 4 │ 4 │                         96 │ (856,0) │ (856,0) │ (856,0)     │ (NULL,NULL)        │ (856,0) │ (NULL,NULL)    │ (NULL,NULL)   │ (856,0)  │ (NULL,NULL)  │ (856,0)     │ (856,0)     │ (NULL,NULL) │ (NULL,NULL) │ (856,0)     │ (856,0)                   │
+│ all_3_3_0 │           0 │               3 │ 0 │ 0 │                         96 │ (0,0)   │ (0,0)   │ (0,0)       │ (NULL,NULL)        │ (0,0)   │ (0,0)          │ (0,8)         │ (0,0)    │ (0,0)        │ (0,0)       │ (0,0)       │ (0,0)       │ (0,0)       │ (NULL,NULL) │ (0,0)                     │
+│ all_3_3_0 │           1 │               3 │ 1 │ 6 │                         96 │ (0,24)  │ (0,24)  │ (0,24)      │ (NULL,NULL)        │ (0,24)  │ (0,24)         │ (0,8)         │ (0,22)   │ (0,24)       │ (0,36)      │ (0,72)      │ (0,24)      │ (0,24)      │ (NULL,NULL) │ (0,24)                    │
+│ all_3_3_0 │           2 │               3 │ 3 │ 3 │                         96 │ (0,48)  │ (0,48)  │ (0,48)      │ (NULL,NULL)        │ (0,48)  │ (0,48)         │ (0,8)         │ (0,44)   │ (0,48)       │ (0,72)      │ (0,144)     │ (0,48)      │ (0,48)      │ (NULL,NULL) │ (0,48)                    │
+│ all_3_3_0 │           3 │               1 │ 4 │ 9 │                         96 │ (0,72)  │ (0,72)  │ (0,72)      │ (NULL,NULL)        │ (0,72)  │ (0,72)         │ (0,8)         │ (0,66)   │ (0,72)       │ (0,108)     │ (0,216)     │ (0,72)      │ (0,72)      │ (NULL,NULL) │ (0,72)                    │
+│ all_3_3_0 │           4 │               0 │ 4 │ 9 │                         96 │ (0,80)  │ (0,80)  │ (0,80)      │ (NULL,NULL)        │ (0,80)  │ (0,80)         │ (0,25)        │ (0,84)   │ (0,80)       │ (0,120)     │ (0,240)     │ (0,80)      │ (0,80)      │ (NULL,NULL) │ (0,80)                    │
+└───────────┴─────────────┴─────────────────┴───┴───┴────────────────────────────┴─────────┴─────────┴─────────────┴────────────────────┴─────────┴────────────────┴───────────────┴──────────┴──────────────┴─────────────┴─────────────┴─────────────┴─────────────┴─────────────┴───────────────────────────┘
+part_name	String
+mark_number	UInt64
+rows_in_granule	UInt64
+a	UInt64
+b	UInt64
+modulo(sipHash64(sp), 100)	UInt8
+a.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+b.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+c.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+sp.sparse.idx.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+sp.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+arr.size0.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+arr.dict.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+arr.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+n.size0.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+n%2Ec1.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+n%2Ec2.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+t%2Ec2.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+t%2Ec1.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+t.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
+column%2Ewith%2Edots.mark	Tuple(offset_in_compressed_file Nullable(UInt64), offset_in_decompressed_block Nullable(UInt64))
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_2.sql b/tests/queries/0_stateless/02947_merge_tree_index_table_2.sql
new file mode 100644
index 00000000000..09c9a41e4d6
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_2.sql
@@ -0,0 +1,41 @@
+-- Tags: no-random-settings
+
+DROP TABLE IF EXISTS t_merge_tree_index;
+
+SET output_format_pretty_row_numbers = 0;
+SET print_pretty_type_names = 0;
+
+CREATE TABLE t_merge_tree_index
+(
+    `a` UInt64,
+    `b` UInt64,
+    `sp` UInt64,
+    `arr` Array(LowCardinality(String)),
+    `n` Nested(c1 String, c2 UInt64),
+    `t` Tuple(c1 UInt64, c2 UInt64),
+    `column.with.dots` UInt64
+)
+ENGINE = MergeTree
+ORDER BY (a, b, sipHash64(sp) % 100)
+SETTINGS
+    index_granularity = 3,
+    min_bytes_for_wide_part = 0,
+    min_rows_for_wide_part = 6,
+    ratio_of_defaults_for_sparse_serialization = 0.9;
+
+SYSTEM STOP MERGES t_merge_tree_index;
+
+INSERT INTO t_merge_tree_index SELECT number % 5, number, 0, ['foo', 'bar'], ['aaa', 'bbb', 'ccc'], [11, 22, 33], (number, number), number FROM numbers(10);
+
+ALTER TABLE t_merge_tree_index ADD COLUMN c UInt64 AFTER b;
+
+INSERT INTO t_merge_tree_index SELECT number % 5, number, number, 10, ['foo', 'bar'], ['aaa', 'bbb', 'ccc'], [11, 22, 33], (number, number), number FROM numbers(5);
+INSERT INTO t_merge_tree_index SELECT number % 5, number, number, 10, ['foo', 'bar'], ['aaa', 'bbb', 'ccc'], [11, 22, 33], (number, number), number FROM numbers(10);
+
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT * FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true) ORDER BY part_name, mark_number FORMAT PrettyCompactNoEscapesMonoBlock;
+
+SET describe_compact_output = 1;
+DESCRIBE mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true);
+
+DROP TABLE t_merge_tree_index;
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_3.reference b/tests/queries/0_stateless/02947_merge_tree_index_table_3.reference
new file mode 100644
index 00000000000..7f508505ab8
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_3.reference
@@ -0,0 +1,10 @@
+ACCESS_DENIED
+ACCESS_DENIED
+ACCESS_DENIED
+OK
+ACCESS_DENIED
+ACCESS_DENIED
+ACCESS_DENIED
+ACCESS_DENIED
+OK
+OK
diff --git a/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh b/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh
new file mode 100755
index 00000000000..6cb184cb1fe
--- /dev/null
+++ b/tests/queries/0_stateless/02947_merge_tree_index_table_3.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+user_name="${CLICKHOUSE_DATABASE}_test_user_02947"
+
+$CLICKHOUSE_CLIENT -n -q "
+DROP TABLE IF EXISTS t_merge_tree_index;
+DROP USER IF EXISTS $user_name;
+
+CREATE TABLE t_merge_tree_index
+(
+    a UInt64,
+    b UInt64,
+    arr Array(LowCardinality(String)),
+)
+ENGINE = MergeTree
+ORDER BY (a, b)
+SETTINGS
+    index_granularity = 3,
+    min_bytes_for_wide_part = 0,
+    min_rows_for_wide_part = 6,
+    ratio_of_defaults_for_sparse_serialization = 0.9;
+
+INSERT INTO t_merge_tree_index (a) VALUES (1);
+
+CREATE USER $user_name IDENTIFIED WITH plaintext_password BY 'password';
+REVOKE SELECT ON $CLICKHOUSE_DATABASE.t_merge_tree_index FROM $user_name;
+GRANT SELECT (b) ON $CLICKHOUSE_DATABASE.t_merge_tree_index TO $user_name;
+"
+
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT a FROM t_merge_tree_index" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT arr FROM t_merge_tree_index" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT arr.size0 FROM t_merge_tree_index" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT b FROM t_merge_tree_index" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT a FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT a.mark FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT arr.mark FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT arr.size0.mark FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT b FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+$CLICKHOUSE_CLIENT --user "$user_name" --password "password" -q "SELECT b.mark FROM mergeTreeIndex(currentDatabase(), t_merge_tree_index, with_marks = true)" 2>&1 | grep -m1 -o "ACCESS_DENIED" || echo "OK"
+
+$CLICKHOUSE_CLIENT -n -q "
+DROP TABLE IF EXISTS t_merge_tree_index;
+DROP USER IF EXISTS $user_name;
+"
diff --git a/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.reference b/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.reference
index 4d33751c699..8ae3cdf8f3a 100644
--- a/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.reference
+++ b/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.reference
@@ -2,7 +2,12 @@
 2	test2	8
 3	test3	8
 4	test4	1985
+2	test2	8
+3	test3	8
+4	test4	1985
 ---
 1	test1	42
+1	test1	42
 ---
 3	test3
+3	test3
diff --git a/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.sql b/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.sql
index 53b8a761cda..ab6e1532299 100644
--- a/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.sql
+++ b/tests/queries/0_stateless/02949_parallel_replicas_in_subquery.sql
@@ -8,19 +8,23 @@ INSERT INTO merge_tree_in_subqueries VALUES(5, 'test5', 0);
 
 SET max_parallel_replicas=3, cluster_for_parallel_replicas='test_cluster_one_shard_three_replicas_localhost', parallel_replicas_for_non_replicated_merge_tree=1;
 
-SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 0) SETTINGS allow_experimental_parallel_reading_from_replicas=2; -- { serverError SUPPORT_IS_DISABLED }
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 0) SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=0; -- { serverError SUPPORT_IS_DISABLED }
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 0) SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=1;
 SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 0) SETTINGS allow_experimental_parallel_reading_from_replicas=1;
 
 SELECT '---';
-SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 2, 3) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2; -- { serverError SUPPORT_IS_DISABLED };
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 2, 3) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=0; -- { serverError SUPPORT_IS_DISABLED };
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 2, 3) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=1;
 SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT * FROM system.numbers LIMIT 2, 3) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=1;
 
 SELECT '---';
-SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT 1) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2; -- { serverError SUPPORT_IS_DISABLED };
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT 1) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=0; -- { serverError SUPPORT_IS_DISABLED };
+SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT 1) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=1;
 SELECT * FROM merge_tree_in_subqueries WHERE id IN (SELECT 1) ORDER BY id SETTINGS allow_experimental_parallel_reading_from_replicas=1;
 
 -- IN with tuples is allowed
 SELECT '---';
-SELECT id, name FROM merge_tree_in_subqueries WHERE (id, name)  IN (3, 'test3') SETTINGS allow_experimental_parallel_reading_from_replicas=2;
+SELECT id, name FROM merge_tree_in_subqueries WHERE (id, name)  IN (3, 'test3') SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=0;
+SELECT id, name FROM merge_tree_in_subqueries WHERE (id, name)  IN (3, 'test3') SETTINGS allow_experimental_parallel_reading_from_replicas=2, parallel_replicas_allow_in_with_subquery=1;
 
 DROP TABLE IF EXISTS merge_tree_in_subqueries;
diff --git a/tests/queries/0_stateless/02949_ttl_group_by_bug.sql b/tests/queries/0_stateless/02949_ttl_group_by_bug.sql
index 2888f6e7d66..83776cc9d85 100644
--- a/tests/queries/0_stateless/02949_ttl_group_by_bug.sql
+++ b/tests/queries/0_stateless/02949_ttl_group_by_bug.sql
@@ -1,8 +1,10 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 DROP TABLE IF EXISTS ttl_group_by_bug;
 
 CREATE TABLE ttl_group_by_bug
 (key UInt32, ts DateTime, value UInt32, min_value UInt32 default value, max_value UInt32 default value)
-ENGINE = MergeTree() PARTITION BY toYYYYMM(ts)
+ENGINE = MergeTree()
 ORDER BY (key, toStartOfInterval(ts, toIntervalMinute(3)), ts)
 TTL ts + INTERVAL 5 MINUTE GROUP BY key, toStartOfInterval(ts, toIntervalMinute(3))
 SET value = sum(value), min_value = min(min_value), max_value = max(max_value),  ts=min(toStartOfInterval(ts, toIntervalMinute(3)));
diff --git a/tests/queries/0_stateless/02950_dictionary_short_circuit.reference b/tests/queries/0_stateless/02950_dictionary_short_circuit.reference
new file mode 100644
index 00000000000..69ac2e5197b
--- /dev/null
+++ b/tests/queries/0_stateless/02950_dictionary_short_circuit.reference
@@ -0,0 +1,54 @@
+Flat dictionary
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
+Hashed dictionary
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
+\N
+\N
+Hashed array dictionary
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
+Range hashed dictionary
+\N
+\N
+Cache dictionary
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
+Direct dictionary
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
+IP TRIE dictionary
+NP
+NP
+NP
+(13238,'RU')
+(13238,'RU')
+(13238,'RU')
+POLYGON dictionary
+(0.5,0)	East
+(-0.5,0)	West
+(10,10)	0
+Regular Expression Tree dictionary
+Android
+Android
diff --git a/tests/queries/0_stateless/02950_dictionary_short_circuit.sql b/tests/queries/0_stateless/02950_dictionary_short_circuit.sql
new file mode 100644
index 00000000000..f4575bcd115
--- /dev/null
+++ b/tests/queries/0_stateless/02950_dictionary_short_circuit.sql
@@ -0,0 +1,264 @@
+-- Tags: no-parallel
+
+DROP TABLE IF EXISTS dictionary_source_table;
+CREATE TABLE dictionary_source_table
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String),
+    v3 Nullable(UInt64)
+) ENGINE=TinyLog;
+
+INSERT INTO dictionary_source_table VALUES (0, 'zero', 'zero', 0), (1, 'one', NULL, 1);
+
+DROP DICTIONARY IF EXISTS flat_dictionary;
+CREATE DICTIONARY flat_dictionary
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'dictionary_source_table'))
+LIFETIME(MIN 0 MAX 0)
+LAYOUT(FLAT());
+
+SELECT 'Flat dictionary';
+SELECT dictGetOrDefault('flat_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id)))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('flat_dictionary', 'v2', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('flat_dictionary', 'v3', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+DROP DICTIONARY flat_dictionary;
+
+
+DROP DICTIONARY IF EXISTS hashed_dictionary;
+CREATE DICTIONARY hashed_dictionary
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'dictionary_source_table'))
+LIFETIME(MIN 0 MAX 0)
+LAYOUT(HASHED());
+
+SELECT 'Hashed dictionary';
+SELECT dictGetOrDefault('hashed_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id)))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('hashed_dictionary', 'v2', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('hashed_dictionary', 'v3', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('hashed_dictionary', 'v2', 1, intDiv(1, id))
+FROM dictionary_source_table;
+DROP DICTIONARY hashed_dictionary;
+
+
+DROP DICTIONARY IF EXISTS hashed_array_dictionary;
+CREATE DICTIONARY hashed_array_dictionary
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'dictionary_source_table'))
+LIFETIME(MIN 0 MAX 0)
+LAYOUT(HASHED_ARRAY());
+
+SELECT 'Hashed array dictionary';
+SELECT dictGetOrDefault('hashed_array_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id)))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('hashed_array_dictionary', 'v2', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('hashed_array_dictionary', 'v3', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+DROP DICTIONARY hashed_array_dictionary;
+
+
+DROP TABLE IF EXISTS range_dictionary_source_table;
+CREATE TABLE range_dictionary_source_table
+(
+    id UInt64,
+    start Date,
+    end Nullable(Date),
+    val Nullable(UInt64)
+) ENGINE=TinyLog;
+
+INSERT INTO range_dictionary_source_table VALUES (0, '2023-01-01', Null, Null), (1, '2022-11-09', '2022-12-08', 1);
+
+DROP DICTIONARY IF EXISTS range_hashed_dictionary;
+CREATE DICTIONARY range_hashed_dictionary
+(
+    id UInt64,
+    start Date,
+    end Nullable(Date),
+    val Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'range_dictionary_source_table'))
+LIFETIME(MIN 0 MAX 0)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN start MAX end);
+
+SELECT 'Range hashed dictionary';
+SELECT dictGetOrDefault('range_hashed_dictionary', 'val', id, toDate('2023-01-02'), intDiv(NULL, id))
+FROM range_dictionary_source_table;
+DROP DICTIONARY range_hashed_dictionary;
+DROP TABLE range_dictionary_source_table;
+
+
+DROP DICTIONARY IF EXISTS cache_dictionary;
+CREATE DICTIONARY cache_dictionary
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'dictionary_source_table'))
+LIFETIME(MIN 0 MAX 0)
+LAYOUT(CACHE(SIZE_IN_CELLS 10));
+
+SELECT 'Cache dictionary';
+SELECT dictGetOrDefault('cache_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id)))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('cache_dictionary', 'v2', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('cache_dictionary', 'v3', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+DROP DICTIONARY cache_dictionary;
+
+
+DROP DICTIONARY IF EXISTS direct_dictionary;
+CREATE DICTIONARY direct_dictionary
+(
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+)
+PRIMARY KEY id
+SOURCE(CLICKHOUSE(TABLE 'dictionary_source_table'))
+LAYOUT(DIRECT());
+
+SELECT 'Direct dictionary';
+SELECT dictGetOrDefault('direct_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id)))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('direct_dictionary', 'v2', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+SELECT dictGetOrDefault('direct_dictionary', 'v3', id+1, intDiv(NULL, id))
+FROM dictionary_source_table;
+DROP DICTIONARY direct_dictionary;
+
+
+DROP TABLE dictionary_source_table;
+
+
+DROP TABLE IF EXISTS ip_dictionary_source_table;
+CREATE TABLE ip_dictionary_source_table
+(
+    id UInt64,
+    prefix String,
+    asn UInt32,
+    cca2 String
+) ENGINE=TinyLog;
+
+INSERT INTO ip_dictionary_source_table VALUES (0, '202.79.32.0/20', 17501, 'NP'), (1, '2620:0:870::/48', 3856, 'US'), (2, '2a02:6b8:1::/48', 13238, 'RU');
+
+DROP DICTIONARY IF EXISTS ip_dictionary;
+CREATE DICTIONARY ip_dictionary
+(
+    id UInt64,
+    prefix String,
+    asn UInt32,
+    cca2 String
+)
+PRIMARY KEY prefix
+SOURCE(CLICKHOUSE(TABLE 'ip_dictionary_source_table'))
+LAYOUT(IP_TRIE)
+LIFETIME(3600);
+
+SELECT 'IP TRIE dictionary';
+SELECT dictGetOrDefault('ip_dictionary', 'cca2', toIPv4('202.79.32.10'), intDiv(0, id))
+FROM ip_dictionary_source_table;
+SELECT dictGetOrDefault('ip_dictionary', ('asn', 'cca2'), IPv6StringToNum('2a02:6b8:1::1'), 
+(intDiv(1, id), intDiv(1, id))) FROM ip_dictionary_source_table;
+DROP DICTIONARY ip_dictionary;
+
+
+DROP TABLE IF EXISTS polygon_dictionary_source_table;
+CREATE TABLE polygon_dictionary_source_table 
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))), 
+    name Nullable(String)
+) ENGINE=TinyLog;
+
+INSERT INTO polygon_dictionary_source_table VALUES([[[(3, 1), (0, 1), (0, -1), (3, -1)]]], 'East'), ([[[(-3, 1), (-3, -1), (0, -1), (0, 1)]]], 'West');
+
+DROP DICTIONARY IF EXISTS polygon_dictionary;
+CREATE DICTIONARY polygon_dictionary
+(
+    key Array(Array(Array(Tuple(Float64, Float64)))),
+    name Nullable(String)
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(TABLE 'polygon_dictionary_source_table'))
+LIFETIME(0)
+LAYOUT(POLYGON());
+
+DROP TABLE IF EXISTS points;
+CREATE TABLE points (x Float64, y Float64) ENGINE=TinyLog;
+INSERT INTO points VALUES (0.5, 0), (-0.5, 0), (10,10);
+
+SELECT 'POLYGON dictionary';
+SELECT tuple(x, y) as key, dictGetOrDefault('polygon_dictionary', 'name', key, intDiv(1, y))
+FROM points;
+
+DROP TABLE points;
+DROP DICTIONARY polygon_dictionary;
+DROP TABLE polygon_dictionary_source_table;
+
+
+DROP TABLE IF EXISTS regexp_dictionary_source_table;
+CREATE TABLE regexp_dictionary_source_table
+(
+    id UInt64,
+    parent_id UInt64,
+    regexp String,
+    keys   Array(String),
+    values Array(String),
+) ENGINE=TinyLog;
+
+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'], ['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'])
+INSERT INTO regexp_dictionary_source_table VALUES (6, 2, '3[12]/tclwebkit', ['version'], ['10'])
+
+DROP DICTIONARY IF EXISTS regexp_dict;
+create dictionary regexp_dict
+(
+    regexp String,
+    name String,
+    version Nullable(UInt64),
+    comment String default 'nothing'
+)
+PRIMARY KEY(regexp)
+SOURCE(CLICKHOUSE(TABLE 'regexp_dictionary_source_table'))
+LIFETIME(0)
+LAYOUT(regexp_tree);
+
+SELECT 'Regular Expression Tree dictionary';
+SELECT dictGetOrDefault('regexp_dict', 'name', concat(toString(number), '/tclwebkit', toString(number)), 
+intDiv(1,number)) FROM numbers(2);
+DROP DICTIONARY regexp_dict;
+DROP TABLE regexp_dictionary_source_table;
diff --git a/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.reference b/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.reference
new file mode 100644
index 00000000000..246d6f59274
--- /dev/null
+++ b/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.reference
@@ -0,0 +1,6 @@
+('zero','zero')
+('zero','zero')
+\N
+\N
+1
+\N
diff --git a/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.sh b/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.sh
new file mode 100755
index 00000000000..a02bdd0a1d2
--- /dev/null
+++ b/tests/queries/0_stateless/02950_dictionary_ssd_cache_short_circuit.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+USER_FILES_PATH=$($CLICKHOUSE_CLIENT_BINARY --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+$CLICKHOUSE_CLIENT -n --query="
+    DROP DATABASE IF EXISTS 02950_database_for_ssd_cache_dictionary;
+    CREATE DATABASE 02950_database_for_ssd_cache_dictionary;
+
+    CREATE TABLE 02950_database_for_ssd_cache_dictionary.source_table
+    (
+    id UInt64,
+    v1 String,
+    v2 Nullable(String),
+    v3 Nullable(UInt64)
+    )
+    ENGINE = TinyLog;
+
+    INSERT INTO 02950_database_for_ssd_cache_dictionary.source_table VALUES (0, 'zero', 'zero', 0), (1, 'one', NULL, 1);
+
+    CREATE DICTIONARY 02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary
+    (
+    id UInt64,
+    v1 String,
+    v2 Nullable(String) DEFAULT NULL,
+    v3 Nullable(UInt64)
+    )
+    PRIMARY KEY id
+    SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() USER 'default' TABLE 'source_table'))
+    LIFETIME(MIN 1 MAX 1000)
+    LAYOUT(SSD_CACHE(BLOCK_SIZE 4096 FILE_SIZE 8192 PATH '$USER_FILES_PATH/0d'));
+
+    SELECT dictGetOrDefault('02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary', ('v1', 'v2'), 0, (intDiv(1, id), intDiv(1, id))) FROM 02950_database_for_ssd_cache_dictionary.source_table;
+    SELECT dictGetOrDefault('02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary', 'v2', id+1, intDiv(NULL, id)) FROM 02950_database_for_ssd_cache_dictionary.source_table;
+    SELECT dictGetOrDefault('02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary', 'v3', id+1, intDiv(NULL, id)) FROM 02950_database_for_ssd_cache_dictionary.source_table;
+
+    DROP DICTIONARY 02950_database_for_ssd_cache_dictionary.ssd_cache_dictionary;
+    DROP TABLE 02950_database_for_ssd_cache_dictionary.source_table;
+    DROP DATABASE 02950_database_for_ssd_cache_dictionary;"
diff --git a/tests/queries/0_stateless/02950_distributed_initial_query_event.reference b/tests/queries/0_stateless/02950_distributed_initial_query_event.reference
new file mode 100644
index 00000000000..cf10427e9b3
--- /dev/null
+++ b/tests/queries/0_stateless/02950_distributed_initial_query_event.reference
@@ -0,0 +1,6 @@
+Local situation
+Initial Query Difference: 1
+Query Difference: 1
+Distributed situation
+Initial Query Difference: 1
+Query Difference: 3
diff --git a/tests/queries/0_stateless/02950_distributed_initial_query_event.sh b/tests/queries/0_stateless/02950_distributed_initial_query_event.sh
new file mode 100755
index 00000000000..7f690a681c4
--- /dev/null
+++ b/tests/queries/0_stateless/02950_distributed_initial_query_event.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# Tags:no-parallel,shard
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+# CREATE TABLE local (x UInt8) Engine=Memory;
+# CREATE TABLE distributed ON CLUSTER cluster (p Date, i Int32) ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), x)
+$CLICKHOUSE_CLIENT -n -q "
+DROP TABLE IF EXISTS local;
+DROP TABLE IF EXISTS distributed;
+CREATE TABLE local (x UInt8) Engine=Memory;
+CREATE TABLE distributed AS local ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), local, x);
+INSERT INTO distributed SELECT number FROM numbers(10);
+SYSTEM FLUSH DISTRIBUTED distributed;
+"
+echo "Local situation"
+# before SELECT * FROM local
+query_countI=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'InitialQuery'")
+query_countQ=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'Query'")
+
+# Execute SELECT * FROM local
+$CLICKHOUSE_CLIENT -q "SELECT * FROM local" > /dev/null
+
+# Counts after SELECT * FROM local
+After_query_countI=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'InitialQuery'")
+After_query_countQ=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'Query'")
+
+# Calculate the differences
+Initial_query_diff=$(($After_query_countI-$query_countI-2))
+query_diff=$(($After_query_countQ-$query_countQ-2))
+
+echo "Initial Query Difference: $Initial_query_diff"
+echo "Query Difference: $query_diff"
+echo "Distributed situation"
+
+# before SELECT * FROM distributed
+query_countI=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'InitialQuery'")
+query_countQ=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'Query'")
+
+# Execute SELECT * FROM distributed
+$CLICKHOUSE_CLIENT -q "SELECT * FROM distributed SETTINGS prefer_localhost_replica = 0" > /dev/null
+
+# Counts after SELECT * FROM distributed
+After_query_countI=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'InitialQuery'")
+After_query_countQ=$($CLICKHOUSE_CLIENT -q "SELECT value FROM system.events WHERE event = 'Query'")
+
+# Calculate the differences
+Initial_query_diff=$(($After_query_countI-$query_countI-2))
+query_diff=$(($After_query_countQ-$query_countQ-2))
+
+echo "Initial Query Difference: $Initial_query_diff"
+echo "Query Difference: $query_diff"
diff --git a/tests/queries/0_stateless/02950_part_offset_as_primary_key.sql b/tests/queries/0_stateless/02950_part_offset_as_primary_key.sql
index 736d54023ce..31a82cce1cd 100644
--- a/tests/queries/0_stateless/02950_part_offset_as_primary_key.sql
+++ b/tests/queries/0_stateless/02950_part_offset_as_primary_key.sql
@@ -1,3 +1,5 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
 drop table if exists a;
 
 create table a (i int) engine MergeTree order by i settings index_granularity = 2;
diff --git a/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference.j2 b/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference.j2
new file mode 100644
index 00000000000..e0c6a439112
--- /dev/null
+++ b/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference.j2
@@ -0,0 +1,92 @@
+{% for column_expression_type in ['ALIAS', 'MATERIALIZED'] -%}
+{{ column_expression_type }}
+1
+1
+369	124	123	b
+369	124	123	b
+124
+3693	1231	a	1231
+3693	1232	1231	1231	a
+a
+-- { echoOn }
+-- USING alias column contains default in old analyzer (but both queries below should have the same result)
+SELECT y * 2, s || 'a' FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+738	ba
+7386	aa
+13332	a
+SELECT y * 2, s || 'a' FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+738	ba
+7386	aa
+13332	a
+SELECT (1, *) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+(1,369,123,'b',124)
+(1,3693,1231,'a',0)
+(1,6666,0,'',48)
+SELECT (1, *) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+(1,369,'b')
+(1,3693,'a')
+(1,6666,'')
+SELECT (1, t1.*) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+(1,0,'')
+(1,123,'b')
+(1,1231,'a')
+SELECT (1, t1.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+(1,'',6666)
+(1,'a',3693)
+(1,'b',369)
+SELECT (1, t1.*, t2.*) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+(1,0,'',6666,48)
+(1,123,'b',369,124)
+(1,1231,'a',0,0)
+SELECT (1, t1.*, t2.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+(1,'',0,6666)
+(1,'a',3693,0)
+(1,'b',369,369)
+SELECT t1.z, t2.z, t3.z FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+0	0	43
+0	48	0
+124	124	0
+1232	0	1232
+SELECT * FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+126	0		0	42
+369	123	b	124	0
+3693	1231	a	0	1231
+6666	0		48	0
+SELECT t1.*, t2.*, t3.* FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+0		126	0	42
+0		6666	48	0
+123	b	369	124	0
+1231	a	3693	0	1231
+SELECT (1, t1.*, t2.*, t3.*) FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1 SETTINGS allow_experimental_analyzer = 1;
+(1,0,'',126,0,42)
+(1,0,'',6666,48,0)
+(1,123,'b',369,124,0)
+(1,1231,'a',3693,0,1231)
+SELECT y FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+369
+3693
+6666
+SELECT y FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+369
+3693
+6666
+SELECT s FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+
+a
+b
+SELECT s FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+a
+b
+SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1, join_use_nulls = 0;
+369
+3693
+6666
+SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1, join_use_nulls = 1;
+369
+3693
+6666
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql b/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql
deleted file mode 100644
index 7983b43d7e5..00000000000
--- a/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql
+++ /dev/null
@@ -1,12 +0,0 @@
-CREATE TABLE t1 (x Int16, y ALIAS x + x * 2) ENGINE=MergeTree() ORDER BY x;
-CREATE TABLE t2 (y Int16, z Int16) ENGINE=MergeTree() ORDER BY y;
-
-INSERT INTO t1 VALUES (1231), (123);
-INSERT INTO t2 VALUES (6666, 48);
-INSERT INTO t2 VALUES (369, 50);
-
-SELECT count() FROM t1 INNER JOIN t2 USING (y);
-SELECT count() FROM t2 INNER JOIN t1 USING (y);
-
-DROP TABLE IF EXISTS t1;
-DROP TABLE IF EXISTS t2;
diff --git a/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql.j2 b/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql.j2
new file mode 100644
index 00000000000..f5b81231afe
--- /dev/null
+++ b/tests/queries/0_stateless/02955_analyzer_using_functional_args.sql.j2
@@ -0,0 +1,67 @@
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+{% for column_expression_type in ['ALIAS', 'MATERIALIZED'] %}
+
+-- { echoOff }
+
+SELECT '{{ column_expression_type }}';
+
+CREATE TABLE t1 (x Int16, y Int64 {{ column_expression_type }} x + x * 2, z {{ column_expression_type }} x + 1, s String) ENGINE=MergeTree() ORDER BY x;
+CREATE TABLE t2 (y Int128, z Int16) ENGINE=MergeTree() ORDER BY y;
+
+CREATE TABLE t3 (x Int16, y Int64 {{ column_expression_type }} x + x * 2, z {{ column_expression_type }} x + 1) ENGINE=MergeTree() ORDER BY x;
+
+INSERT INTO t1 VALUES (1231, 'a'), (123, 'b');
+
+INSERT INTO t2 VALUES (6666, 48);
+INSERT INTO t2 VALUES (369, 124);
+
+INSERT INTO t3 VALUES (1231), (42);
+
+SELECT count() FROM t1 INNER JOIN t2 USING (y);
+SELECT count() FROM t2 INNER JOIN t1 USING (y);
+
+-- `SELECT *` works differently for ALIAS columns with analyzer
+SELECT * FROM t1 INNER JOIN t2 USING (y, z) SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t2 INNER JOIN t1 USING (y, z) SETTINGS allow_experimental_analyzer = 1;
+SELECT t2.z FROM t1 INNER JOIN t2 USING (y);
+
+SELECT * FROM t1 INNER JOIN t3 USING (y) SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t3 INNER JOIN t1 USING (y, z) SETTINGS allow_experimental_analyzer = 1;
+SELECT s FROM t1 INNER JOIN t3 USING (y);
+
+-- { echoOn }
+-- USING alias column contains default in old analyzer (but both queries below should have the same result)
+SELECT y * 2, s || 'a' FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT y * 2, s || 'a' FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+SELECT (1, *) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT (1, *) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+
+SELECT (1, t1.*) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+SELECT (1, t1.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+SELECT (1, t1.*, t2.*) FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+SELECT (1, t1.*, t2.*) FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+SELECT t1.z, t2.z, t3.z FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+SELECT * FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+SELECT t1.*, t2.*, t3.* FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1,2,3 SETTINGS allow_experimental_analyzer = 1;
+SELECT (1, t1.*, t2.*, t3.*) FROM t1 FULL JOIN t2 USING (y) FULL JOIN t3 USING (y) ORDER BY 1 SETTINGS allow_experimental_analyzer = 1;
+
+SELECT y FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT y FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+SELECT s FROM t1 FULL JOIN t2 USING (y) ORDER BY ALL;
+SELECT s FROM (SELECT s, y FROM t1) t1 FULL JOIN (SELECT y FROM t2) t2 USING (y) ORDER BY ALL;
+
+SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1, join_use_nulls = 0;
+SELECT y FROM t1 FULL JOIN t2 USING (y) PREWHERE y * 2 > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1, join_use_nulls = 1;
+
+DROP TABLE IF EXISTS t1;
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+{% endfor %}
diff --git a/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.reference b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.reference
new file mode 100644
index 00000000000..ea90ee31980
--- /dev/null
+++ b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.reference
@@ -0,0 +1 @@
+45
diff --git a/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql
new file mode 100644
index 00000000000..b88e1dbcccc
--- /dev/null
+++ b/tests/queries/0_stateless/02955_avro_format_zstd_encode_support.sql
@@ -0,0 +1,16 @@
+-- Tags: no-fasttest
+DROP TABLE IF EXISTS t;
+CREATE TABLE t
+(
+    `n1` Int32
+)
+ENGINE = File(Avro)
+SETTINGS output_format_avro_codec = 'zstd';
+
+INSERT INTO t SELECT *
+FROM numbers(10);
+
+SELECT sum(n1) 
+FROM t;
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.reference b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.reference
index 30365d83930..b33c7b90245 100644
--- a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.reference
+++ b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.reference
@@ -1 +1,2 @@
 test	all_1_1_0	1
+test2	all_1_1_0	1
diff --git a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
index e9d8eb081fb..dac0cc2b865 100755
--- a/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
+++ b/tests/queries/0_stateless/02956_clickhouse_local_system_parts.sh
@@ -5,4 +5,12 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 # shellcheck source=../shell_config.sh
 . "$CUR_DIR"/../shell_config.sh
 
-$CLICKHOUSE_LOCAL --multiquery "CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY (); INSERT INTO test SELECT 1; SELECT table, name, rows FROM system.parts WHERE database = currentDatabase();"
+$CLICKHOUSE_LOCAL --multiquery "
+    CREATE TABLE test (x UInt8) ENGINE = MergeTree ORDER BY ();
+    INSERT INTO test SELECT 1;
+
+    CREATE TABLE test2 (x UInt8) ENGINE = MergeTree ORDER BY ();
+    INSERT INTO test2 SELECT 1;
+
+    SELECT table, name, rows FROM system.parts WHERE database = currentDatabase();
+"
diff --git a/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.reference b/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.reference
index dff0c2a9585..b005ce6dfb0 100644
--- a/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.reference
+++ b/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.reference
@@ -2,3 +2,6 @@
 2023-10-09 10:11:12.001000
 2023-10-09 10:11:12.000000
 2023-10-09 10:11:12.000000
+2023-10-09 00:00:00.000000
+2023-10-09 00:00:00.000
+2023-10-09 00:00:00
diff --git a/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.sql b/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.sql
index 178f21a9e63..15753d4532c 100644
--- a/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.sql
+++ b/tests/queries/0_stateless/02956_fix_to_start_of_milli_microsecond.sql
@@ -1,4 +1,7 @@
 SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.000999', 6), toIntervalMillisecond(1));
 SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.000500', 6), toIntervalMillisecond(1));
 SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.000499', 6), toIntervalMillisecond(1));
-SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.000999', 6), toIntervalMillisecond(10));
\ No newline at end of file
+SELECT toStartOfInterval(toDateTime64('2023-10-09 10:11:12.000999', 6), toIntervalMillisecond(10));
+select toStartOfInterval(toDateTime64('2023-10-09 00:01:34', 9), toIntervalMicrosecond(100000000));
+select toStartOfInterval(toDateTime64('2023-10-09 00:01:34', 9), toIntervalMillisecond(100000));
+select toStartOfInterval(toDateTime64('2023-10-09 00:01:34', 9), toIntervalSecond(100));
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02960_alter_table_part_query_parameter.reference b/tests/queries/0_stateless/02960_alter_table_part_query_parameter.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02960_alter_table_part_query_parameter.sql b/tests/queries/0_stateless/02960_alter_table_part_query_parameter.sql
new file mode 100644
index 00000000000..31d3ae10271
--- /dev/null
+++ b/tests/queries/0_stateless/02960_alter_table_part_query_parameter.sql
@@ -0,0 +1,15 @@
+drop table if exists data;
+create table data (key Int) engine=MergeTree() order by key;
+
+insert into data values (1);
+
+set param_part='all_1_1_0';
+alter table data detach part {part:String};
+alter table data attach part {part:String};
+set param_part='all_2_2_0';
+alter table data detach part {part:String};
+alter table data drop detached part {part:String} settings allow_drop_detached=1;
+
+insert into data values (2);
+set param_part='all_3_3_0';
+alter table data drop part {part:String};
diff --git a/tests/queries/0_stateless/02960_polygon_bound_bug.reference b/tests/queries/0_stateless/02960_polygon_bound_bug.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02960_polygon_bound_bug.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02960_polygon_bound_bug.sh b/tests/queries/0_stateless/02960_polygon_bound_bug.sh
new file mode 100755
index 00000000000..0c3db01a77c
--- /dev/null
+++ b/tests/queries/0_stateless/02960_polygon_bound_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 -nm -q "CREATE TABLE test_table (geom MultiPolygon) engine=MergeTree ORDER BY geom;
+INSERT INTO test_table SELECT * FROM file('$CURDIR/data_parquet/02960_polygon_bound_bug.parquet', Parquet);
+CREATE DICTIONARY test_dict (geom MultiPolygon) PRIMARY KEY geom SOURCE (CLICKHOUSE(TABLE 'test_table')) LIFETIME(MIN 0 MAX 0) LAYOUT(POLYGON(STORE_POLYGON_KEY_COLUMN 1));
+SELECT dictHas(test_dict,(174.84729269276494,-36.99524960275426));"
diff --git a/tests/queries/0_stateless/02961_drop_tables.reference b/tests/queries/0_stateless/02961_drop_tables.reference
new file mode 100644
index 00000000000..c0465dc592a
--- /dev/null
+++ b/tests/queries/0_stateless/02961_drop_tables.reference
@@ -0,0 +1,8 @@
+-- check which tables exist in 02961_db1
+-- check which tables exist in 02961_db2
+02961_tb4
+02961_tb5
+Test when deletion of existing table fails
+-- check which tables exist in 02961_db1
+-- check which tables exist in 02961_db2
+02961_tb5
diff --git a/tests/queries/0_stateless/02961_drop_tables.sql b/tests/queries/0_stateless/02961_drop_tables.sql
new file mode 100644
index 00000000000..e91ac4bfe19
--- /dev/null
+++ b/tests/queries/0_stateless/02961_drop_tables.sql
@@ -0,0 +1,32 @@
+-- Tags: no-parallel
+DROP DATABASE IF EXISTS 02961_db1;
+CREATE DATABASE IF NOT EXISTS 02961_db1;
+DROP DATABASE IF EXISTS 02961_db2;
+CREATE DATABASE IF NOT EXISTS 02961_db2;
+
+
+CREATE TABLE IF NOT EXISTS 02961_db1.02961_tb1 (id UInt32) Engine=Memory();
+CREATE TABLE IF NOT EXISTS 02961_db1.02961_tb2 (id UInt32) Engine=Memory();
+
+CREATE TABLE IF NOT EXISTS 02961_db2.02961_tb3 (id UInt32) Engine=Memory();
+CREATE TABLE IF NOT EXISTS 02961_db2.02961_tb4 (id UInt32) Engine=Memory();
+CREATE TABLE IF NOT EXISTS 02961_db2.02961_tb5 (id UInt32) Engine=Memory();
+
+DROP TABLE 02961_db1.02961_tb1, 02961_db1.02961_tb2, 02961_db2.02961_tb3;
+
+SELECT '-- check which tables exist in 02961_db1';
+SHOW TABLES FROM 02961_db1;
+SELECT '-- check which tables exist in 02961_db2';
+SHOW TABLES FROM 02961_db2;
+
+SELECT 'Test when deletion of existing table fails';
+DROP TABLE 02961_db2.02961_tb4, 02961_db1.02961_tb1, 02961_db2.02961_tb5; -- { serverError UNKNOWN_TABLE }
+
+SELECT '-- check which tables exist in 02961_db1';
+SHOW TABLES FROM 02961_db1;
+SELECT '-- check which tables exist in 02961_db2';
+SHOW TABLES FROM 02961_db2;
+
+
+DROP DATABASE IF EXISTS 02961_db1;
+DROP DATABASE IF EXISTS 02961_db2;
diff --git a/tests/queries/0_stateless/02961_storage_config_volume_priority.reference b/tests/queries/0_stateless/02961_storage_config_volume_priority.reference
new file mode 100644
index 00000000000..ba48e75ae25
--- /dev/null
+++ b/tests/queries/0_stateless/02961_storage_config_volume_priority.reference
@@ -0,0 +1,9 @@
+vol2_02961	1
+vol1_02961	2
+vol_untagged2_02961	3
+vol_untagged1_02961	4
+check non-unique values dont work
+1
+check no gaps in range allowed
+1
+restore valid config
diff --git a/tests/queries/0_stateless/02961_storage_config_volume_priority.sh b/tests/queries/0_stateless/02961_storage_config_volume_priority.sh
new file mode 100755
index 00000000000..4e085541a8d
--- /dev/null
+++ b/tests/queries/0_stateless/02961_storage_config_volume_priority.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-random-settings
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT --query "
+SELECT
+    volume_name,
+    volume_priority
+FROM system.storage_policies
+WHERE policy_name = 'policy_02961'
+ORDER BY volume_priority ASC;
+"
+
+config_path=/etc/clickhouse-server/config.d/storage_conf_02961.xml
+config_path_tmp=$config_path.tmp
+
+echo 'check non-unique values dont work'
+cat $config_path \
+| sed "s|<volume_priority>2<\/volume_priority>|<volume_priority>1<\/volume_priority>|" \
+> $config_path_tmp
+mv $config_path_tmp $config_path
+
+$CLICKHOUSE_CLIENT -nm --query "
+set send_logs_level='error';
+SYSTEM RELOAD CONFIG" 2>&1 | grep -c 'volume_priority values must be unique across the policy'
+
+#first, restore original values
+cat $config_path \
+| sed '0,/<volume_priority>1<\/volume_priority>/s//<volume_priority>2<\/volume_priority>/' \
+> $config_path_tmp
+mv $config_path_tmp $config_path
+
+echo 'check no gaps in range allowed'
+cat $config_path \
+| sed '0,/<volume_priority>1<\/volume_priority>/s//<volume_priority>3<\/volume_priority>/' \
+> $config_path_tmp
+mv $config_path_tmp $config_path
+
+$CLICKHOUSE_CLIENT -nm --query "
+set send_logs_level='error';
+SYSTEM RELOAD CONFIG" 2>&1 | grep -c 'volume_priority values must cover the range from 1 to N (lowest priority specified) without gaps'
+
+echo 'restore valid config'
+cat $config_path \
+| sed '0,/<volume_priority>3<\/volume_priority>/s//<volume_priority>1<\/volume_priority>/' \
+> $config_path_tmp
+mv $config_path_tmp $config_path
diff --git a/tests/queries/0_stateless/02962_analyzer_constant_set.reference b/tests/queries/0_stateless/02962_analyzer_constant_set.reference
new file mode 100644
index 00000000000..ec635144f60
--- /dev/null
+++ b/tests/queries/0_stateless/02962_analyzer_constant_set.reference
@@ -0,0 +1 @@
+9
diff --git a/tests/queries/0_stateless/02962_analyzer_constant_set.sql b/tests/queries/0_stateless/02962_analyzer_constant_set.sql
new file mode 100644
index 00000000000..aae2f1c0145
--- /dev/null
+++ b/tests/queries/0_stateless/02962_analyzer_constant_set.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS test_parallel_index;
+
+CREATE TABLE test_parallel_index
+(
+    z UInt64,
+    INDEX i z TYPE set(8)
+)
+ENGINE = MergeTree
+ORDER BY ();
+
+insert into test_parallel_index select number from numbers(10);
+
+select sum(z) from test_parallel_index where z = 2 or z = 7 or z = 13 or z = 17 or z = 19 or z = 23;
+
+DROP TABLE test_parallel_index;
diff --git a/tests/queries/0_stateless/02962_analyzer_resolve_group_by_on_shards.reference b/tests/queries/0_stateless/02962_analyzer_resolve_group_by_on_shards.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02962_analyzer_resolve_group_by_on_shards.sql b/tests/queries/0_stateless/02962_analyzer_resolve_group_by_on_shards.sql
new file mode 100644
index 00000000000..00a80067994
--- /dev/null
+++ b/tests/queries/0_stateless/02962_analyzer_resolve_group_by_on_shards.sql
@@ -0,0 +1,20 @@
+SELECT NULL AND (toDate(-2147483647, NULL) AND NULL)
+FROM remote('127.0.0.{1,2}', view(
+    SELECT
+        NULL AND NULL,
+        NULL,
+        toDate(toDate('0.0001048577', toDate(NULL, 10 AND (toDate(257, 9223372036854775807, NULL) AND NULL AND NULL) AND NULL, 7, NULL), NULL, NULL) AND NULL AND -2147483648, NULL, NULL) AND NULL
+    FROM system.one
+    WHERE toDate(toDate(NULL, NULL, NULL), NULL)
+    GROUP BY
+        GROUPING SETS ((NULL))
+));
+
+SELECT NULL AND (toDate(-2147483647, NULL) AND NULL)
+FROM remote('127.0.0.{1,2}', view(
+    SELECT NULL
+    FROM system.one
+    WHERE toDate(toDate(NULL, NULL, NULL), NULL)
+    GROUP BY
+        GROUPING SETS ((''))
+));
diff --git a/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.reference b/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.reference
new file mode 100644
index 00000000000..98e2ae85655
--- /dev/null
+++ b/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.reference
@@ -0,0 +1,4 @@
+lc: dictionary<values=string, indices=int64, ordered=0> not null
+lc: dictionary<values=string, indices=int32, ordered=0> not null
+lc: dictionary<values=string, indices=uint64, ordered=0> not null
+lc: dictionary<values=string, indices=uint32, ordered=0> not null
diff --git a/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.sh b/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.sh
new file mode 100755
index 00000000000..467c98b47cf
--- /dev/null
+++ b/tests/queries/0_stateless/02962_arrow_dictionary_indexes_types.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.arrow
+
+$CLICKHOUSE_LOCAL -q "select toLowCardinality(toString(number)) as lc from numbers(1000) format Arrow settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_use_signed_indexes_for_dictionary=1, output_format_arrow_use_64_bit_indexes_for_dictionary=1" > $DATA_FILE
+python3 -c "import pyarrow as pa; print(pa.ipc.open_file(pa.OSFile('$DATA_FILE', 'rb')).read_all().schema)"
+
+$CLICKHOUSE_LOCAL -q "select toLowCardinality(toString(number)) as lc from numbers(1000) format Arrow settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_use_signed_indexes_for_dictionary=1, output_format_arrow_use_64_bit_indexes_for_dictionary=0" > $DATA_FILE
+python3 -c "import pyarrow as pa; print(pa.ipc.open_file(pa.OSFile('$DATA_FILE', 'rb')).read_all().schema)"
+
+$CLICKHOUSE_LOCAL -q "select toLowCardinality(toString(number)) as lc from numbers(1000) format Arrow settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_use_signed_indexes_for_dictionary=0, output_format_arrow_use_64_bit_indexes_for_dictionary=1" > $DATA_FILE
+python3 -c "import pyarrow as pa; print(pa.ipc.open_file(pa.OSFile('$DATA_FILE', 'rb')).read_all().schema)"
+
+$CLICKHOUSE_LOCAL -q "select toLowCardinality(toString(number)) as lc from numbers(1000) format Arrow settings output_format_arrow_low_cardinality_as_dictionary=1, output_format_arrow_use_signed_indexes_for_dictionary=0, output_format_arrow_use_64_bit_indexes_for_dictionary=0" > $DATA_FILE
+python3 -c "import pyarrow as pa; print(pa.ipc.open_file(pa.OSFile('$DATA_FILE', 'rb')).read_all().schema)"
+
+rm $DATA_FILE
+
diff --git a/tests/queries/0_stateless/02962_indexHint_rpn_construction.reference b/tests/queries/0_stateless/02962_indexHint_rpn_construction.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02962_indexHint_rpn_construction.sql b/tests/queries/0_stateless/02962_indexHint_rpn_construction.sql
new file mode 100644
index 00000000000..3532bea57fa
--- /dev/null
+++ b/tests/queries/0_stateless/02962_indexHint_rpn_construction.sql
@@ -0,0 +1,20 @@
+CREATE TABLE tab
+(
+    `foo` Array(LowCardinality(String)),
+    INDEX idx foo TYPE bloom_filter GRANULARITY 1
+)
+ENGINE = MergeTree
+PRIMARY KEY tuple();
+
+INSERT INTO tab SELECT if(number % 2, ['value'], [])
+FROM system.numbers
+LIMIT 10000;
+
+SELECT *
+FROM tab
+PREWHERE indexHint(indexHint(-1, 0.))
+WHERE has(foo, 'b');
+
+SELECT *
+FROM tab
+PREWHERE indexHint(0);
diff --git a/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.reference b/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.reference
new file mode 100644
index 00000000000..42d5519df66
--- /dev/null
+++ b/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.reference
@@ -0,0 +1,4 @@
+Replication did not hang: synced all replicas of test_table_
+Consistency: 1
+Test completed
+Data consistency check passed
diff --git a/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.sh b/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.sh
new file mode 100755
index 00000000000..b61be87411d
--- /dev/null
+++ b/tests/queries/0_stateless/02962_system_sync_replica_lightweight_from_modifier.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+# Tags: zookeeper, no-parallel, no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+# shellcheck source=./replication.lib
+. "$CURDIR"/replication.lib
+
+TOTAL_REPLICAS=10
+REPLICAS_TO_DROP=7
+export TOTAL_REPLICAS
+export REPLICAS_TO_DROP
+
+for i in $(seq $TOTAL_REPLICAS); do
+    $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_table_$i"
+    $CLICKHOUSE_CLIENT --query "CREATE TABLE test_table_$i (key UInt64, value UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_table', '$i') ORDER BY key SETTINGS old_parts_lifetime=1"
+done
+
+function insert_thread() {
+    while true; do
+        REPLICA=$(($RANDOM % $TOTAL_REPLICAS + 1))
+        $CLICKHOUSE_CLIENT --query "INSERT INTO test_table_$REPLICA VALUES ($RANDOM, $RANDOM % 255)"
+        sleep 0.$RANDOM
+    done
+}
+
+function sync_and_drop_replicas() {
+    while true; do
+        for i in $(seq $REPLICAS_TO_DROP); do
+            local stable_replica_id=$((i + 1))
+            $CLICKHOUSE_CLIENT --query "ALTER TABLE test_table_$i MODIFY SETTING parts_to_throw_insert = 0"
+            $CLICKHOUSE_CLIENT --query "SYSTEM SYNC REPLICA test_table_$stable_replica_id LIGHTWEIGHT FROM '$i'"
+            $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_table_$i"
+        done
+
+        for i in $(seq $REPLICAS_TO_DROP); do
+            $CLICKHOUSE_CLIENT --query "CREATE TABLE test_table_$i (key UInt64, value UInt8) ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/test_table', '$i') ORDER BY key SETTINGS old_parts_lifetime=1"
+        done
+    done
+}
+
+function optimize_thread() {
+    while true; do
+        REPLICA=$(($RANDOM % $TOTAL_REPLICAS + 1))
+        $CLICKHOUSE_CLIENT --query "OPTIMIZE TABLE test_table_$REPLICA FINAL"
+        sleep 0.$RANDOM
+    done
+}
+
+function mutations_thread() {
+    while true; do
+        REPLICA=$(($RANDOM % $TOTAL_REPLICAS + 1))
+        CONDITION="key % 2 = 0"
+        $CLICKHOUSE_CLIENT --query "ALTER TABLE test_table_$REPLICA DELETE WHERE $CONDITION"
+        sleep 0.$RANDOM
+    done
+}
+
+export -f insert_thread
+export -f sync_and_drop_replicas
+export -f optimize_thread
+export -f mutations_thread
+
+TIMEOUT=60
+
+timeout $TIMEOUT bash -c insert_thread 2> /dev/null &
+timeout $TIMEOUT bash -c sync_and_drop_replicas 2> /dev/null &
+timeout $TIMEOUT bash -c optimize_thread 2> /dev/null &
+timeout $TIMEOUT bash -c mutations_thread 2> /dev/null &
+
+wait
+
+check_replication_consistency "test_table_" "count(), sum(key), sum(value)"
+
+echo "Test completed"
+
+lost_parts_count=$($CLICKHOUSE_CLIENT --query "SELECT SUM(lost_part_count) FROM system.replicas WHERE database=currentDatabase()")
+if [ "$lost_parts_count" -ne 0 ]; then
+    echo "Data consistency check failed: lost parts count is not zero"
+    exit 1
+fi
+
+echo "Data consistency check passed"
+
+for i in $(seq $TOTAL_REPLICAS); do
+    if [ $i -gt $REPLICAS_TO_DROP ]; then
+        $CLICKHOUSE_CLIENT --query "DROP TABLE IF EXISTS test_table_$i"
+    fi
+done
diff --git a/tests/queries/0_stateless/02963_invalid_identifier.reference b/tests/queries/0_stateless/02963_invalid_identifier.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02963_invalid_identifier.sql b/tests/queries/0_stateless/02963_invalid_identifier.sql
new file mode 100644
index 00000000000..64a52364baa
--- /dev/null
+++ b/tests/queries/0_stateless/02963_invalid_identifier.sql
@@ -0,0 +1 @@
+SELECT t.t.t.* FROM system.tables WHERE database = currentDatabase(); --{serverError INVALID_IDENTIFIER}
diff --git a/tests/queries/0_stateless/02963_msan_agg_addBatchLookupTable8.reference b/tests/queries/0_stateless/02963_msan_agg_addBatchLookupTable8.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02963_msan_agg_addBatchLookupTable8.sql b/tests/queries/0_stateless/02963_msan_agg_addBatchLookupTable8.sql
new file mode 100644
index 00000000000..a3a8bd0624a
--- /dev/null
+++ b/tests/queries/0_stateless/02963_msan_agg_addBatchLookupTable8.sql
@@ -0,0 +1,2 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/58727
+SELECT number % 2 AS even, aggThrow(number) FROM numbers(10) GROUP BY even; -- { serverError AGGREGATE_FUNCTION_THROW}
diff --git a/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.reference b/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.sh b/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.sh
new file mode 100755
index 00000000000..24fe964b824
--- /dev/null
+++ b/tests/queries/0_stateless/02963_remote_read_small_buffer_size_bug.sh
@@ -0,0 +1,48 @@
+#!/usr/bin/env bash
+# Tags: no-random-settings, long
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+disk_name="02963_remote_read_bug"
+
+$CLICKHOUSE_CLIENT -nm --query "
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (a Int32, s String)
+ENGINE = MergeTree()
+ORDER BY a
+SETTINGS disk = disk(name = '$disk_name', type = cache, max_size = '10Gi', path = '$disk_name', disk = 's3_disk');
+
+INSERT INTO test SELECT number % 1000000, randomString(1) FROM numbers_mt(1e7) SETTINGS enable_filesystem_cache_on_write_operations = 0;
+
+OPTIMIZE TABLE test FINAL;
+"
+
+query_id=$(random_str 10)
+
+$CLICKHOUSE_CLIENT -nm --query_id "$query_id" --query "
+WITH RANDOM_SET AS (
+    SELECT rand32() % 10000 FROM numbers(100)
+)
+SELECT *
+FROM test
+WHERE a IN RANDOM_SET AND s IN ('x', 'y', 'z')
+FORMAT Null
+SETTINGS
+    max_threads = 10,
+    allow_prefetched_read_pool_for_remote_filesystem = 1, filesystem_prefetch_min_bytes_for_single_read_task = '1Ki',
+    merge_tree_min_bytes_for_concurrent_read = 1, merge_tree_min_rows_for_concurrent_read = 1,
+    merge_tree_min_bytes_for_concurrent_read_for_remote_filesystem = 1, merge_tree_min_rows_for_concurrent_read_for_remote_filesystem = 1;
+"
+
+$CLICKHOUSE_CLIENT -nm --query "
+SYSTEM FLUSH LOGS;
+
+-- This threshold was determined experimentally - before the fix this ratio had values around 50K
+SELECT throwIf(ProfileEvents['WriteBufferFromFileDescriptorWriteBytes'] / ProfileEvents['WriteBufferFromFileDescriptorWrite'] < 200000)
+FROM system.query_log
+WHERE current_database = '$CLICKHOUSE_DATABASE' AND query_id = '$query_id' AND type = 'QueryFinish';
+"
+
diff --git a/tests/queries/0_stateless/02963_single_value_destructor.reference b/tests/queries/0_stateless/02963_single_value_destructor.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02963_single_value_destructor.sql b/tests/queries/0_stateless/02963_single_value_destructor.sql
new file mode 100644
index 00000000000..ee8f9164aef
--- /dev/null
+++ b/tests/queries/0_stateless/02963_single_value_destructor.sql
@@ -0,0 +1,8 @@
+-- When we use SingleValueDataBaseMemoryBlock we must ensure we call the class destructor on destroy
+
+Select argMax((number, number), (number, number)) FROM numbers(100000) format Null;
+Select argMin((number, number), (number, number)) FROM numbers(100000) format Null;
+Select anyHeavy((number, number)) FROM numbers(100000) format Null;
+Select singleValueOrNull(number::Date32) FROM numbers(100000) format Null;
+Select anyArgMax(number, (number, number)) FROM numbers(100000) format Null;
+Select anyArgMin(number, (number, number)) FROM numbers(100000) format Null;
diff --git a/tests/queries/0_stateless/02963_test_flexible_disk_configuration.reference b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
new file mode 100644
index 00000000000..552291b2f83
--- /dev/null
+++ b/tests/queries/0_stateless/02963_test_flexible_disk_configuration.sql
@@ -0,0 +1,56 @@
+-- Tags: no-fasttest
+
+drop table if exists test;
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test1', type = object_storage, object_storage_type = local_blob_storage, path='./02963_test1/');
+
+drop table test;
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk='s3_disk_02963';
+
+drop table test;
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test1',
+                   type = object_storage,
+                   object_storage_type = s3,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse);
+
+drop table test;
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test2',
+                   type = object_storage,
+                   object_storage_type = s3,
+                   metadata_storage_type = local,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse);
+
+drop table test;
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test3',
+                   type = object_storage,
+                   object_storage_type = s3,
+                   metadata_type = lll,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse); -- { serverError UNKNOWN_ELEMENT_IN_CONFIG }
+
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test4',
+                   type = object_storage,
+                   object_storage_type = kkk,
+                   metadata_type = local,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse); -- { serverError UNKNOWN_ELEMENT_IN_CONFIG }
+
+create table test (a Int32) engine = MergeTree() order by tuple()
+settings disk=disk(name='test5',
+                   type = kkk,
+                   object_storage_type = s3,
+                   metadata_type = local,
+                   endpoint = 'http://localhost:11111/test/common/',
+                   access_key_id = clickhouse,
+                   secret_access_key = clickhouse); -- { serverError UNKNOWN_ELEMENT_IN_CONFIG }
diff --git a/tests/queries/0_stateless/02966_float32_promotion.reference b/tests/queries/0_stateless/02966_float32_promotion.reference
new file mode 100644
index 00000000000..086e9795679
--- /dev/null
+++ b/tests/queries/0_stateless/02966_float32_promotion.reference
@@ -0,0 +1 @@
+49.9
diff --git a/tests/queries/0_stateless/02966_float32_promotion.sql b/tests/queries/0_stateless/02966_float32_promotion.sql
new file mode 100644
index 00000000000..df687ca5338
--- /dev/null
+++ b/tests/queries/0_stateless/02966_float32_promotion.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/58680
+DROP TABLE IF EXISTS f32_table;
+CREATE TABLE f32_table (my_field Float32) ENGINE=Memory();
+INSERT INTO f32_table values ('49.9');
+SELECT * FROM f32_table where my_field = '49.9';
+DROP TABLE f32_table;
diff --git a/tests/queries/0_stateless/02966_nested_offsets_subcolumn.reference.j2 b/tests/queries/0_stateless/02966_nested_offsets_subcolumn.reference.j2
new file mode 100644
index 00000000000..055b0466ee2
--- /dev/null
+++ b/tests/queries/0_stateless/02966_nested_offsets_subcolumn.reference.j2
@@ -0,0 +1,11 @@
+{% for engine in ['Memory', 'Log', 'TinyLog', 'MergeTree ORDER BY (a) SETTINGS min_bytes_for_wide_part = 0, min_rows_for_wide_part = 2000'] -%}
+--- {{ engine }} ---
+4500
+4500	4500
+4500
+4500	4500
+94500
+94500	94500
+94500
+94500	94500
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02966_nested_offsets_subcolumn.sql.j2 b/tests/queries/0_stateless/02966_nested_offsets_subcolumn.sql.j2
new file mode 100644
index 00000000000..f9be206e3e7
--- /dev/null
+++ b/tests/queries/0_stateless/02966_nested_offsets_subcolumn.sql.j2
@@ -0,0 +1,36 @@
+
+{% for engine in ['Memory', 'Log', 'TinyLog', 'MergeTree ORDER BY (a) SETTINGS min_bytes_for_wide_part = 0, min_rows_for_wide_part = 2000'] -%}
+
+SELECT '--- {{ engine }} ---';
+
+DROP TABLE IF EXISTS t_nested_offsets;
+
+CREATE TABLE t_nested_offsets
+(
+    `a` String,
+    `e.n` Array(String),
+    `e.t` Array(Int64)
+)
+ENGINE = Log;
+
+SYSTEM STOP MERGES t_nested_offsets;
+
+INSERT INTO t_nested_offsets SELECT number, range(number % 10), range(number % 10) FROM numbers(1000);
+
+SELECT sum(e.n.size0) FROM t_nested_offsets;
+SELECT sum(e.n.size0), sum(e.t.size0) FROM t_nested_offsets;
+
+SELECT sum(length(e.n)) FROM t_nested_offsets SETTINGS optimize_functions_to_subcolumns = 1;
+SELECT sum(length(e.n)), sum(length(e.t)) FROM t_nested_offsets SETTINGS optimize_functions_to_subcolumns = 1;
+
+INSERT INTO t_nested_offsets SELECT number, range(number % 10), range(number % 10) FROM numbers(20000);
+
+SELECT sum(e.n.size0) FROM t_nested_offsets;
+SELECT sum(e.n.size0), sum(e.t.size0) FROM t_nested_offsets;
+
+SELECT sum(length(e.n)) FROM t_nested_offsets SETTINGS optimize_functions_to_subcolumns = 1;
+SELECT sum(length(e.n)), sum(length(e.t)) FROM t_nested_offsets SETTINGS optimize_functions_to_subcolumns = 1;
+
+DROP TABLE t_nested_offsets;
+
+{% endfor -%}
diff --git a/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.reference b/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.reference
new file mode 100644
index 00000000000..0474f8e3fc9
--- /dev/null
+++ b/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.reference
@@ -0,0 +1,2 @@
+[('6_0',476),('6_1',207),('5_0',154),('5_1',63),('4_0',47)]	[('6_0',313208),('6_1',136206),('5_0',32032),('5_1',13104),('4_0',3026)]	[('6_0',476,5),('6_1',207,15),('5_0',154,2)]	[('6_0',313208,0),('6_1',136206,0),('5_0',32032,0)]	[('6_0',476,5),('6_1',207,15),('5_0',154,2)]	[('6_0',476,5),('6_1',207,15),('5_0',154,2)]	[('6_0',313208,0),('6_1',136206,0),('5_0',32032,0)]
+[(6,683,0),(5,217,0),(4,68,0),(3,22,0)]
diff --git a/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.sql b/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.sql
new file mode 100644
index 00000000000..9ed4baba171
--- /dev/null
+++ b/tests/queries/0_stateless/02966_topk_counts_approx_count_sum.sql
@@ -0,0 +1,26 @@
+WITH
+    arraySlice(arrayReverseSort(x -> (x.2, x.1), arrayZip(untuple(sumMap(([k], [1]))))), 1, 5) AS topKExact,
+    arraySlice(arrayReverseSort(x -> (x.2, x.1), arrayZip(untuple(sumMap(([k], [w]))))), 1, 5) AS topKWeightedExact
+SELECT
+    topKExact,
+    topKWeightedExact,
+    topK(3, 2, 'counts')(k) AS topK_counts,
+    topKWeighted(3, 2, 'counts')(k, w) AS topKWeighted_counts,
+    approx_top_count(3, 6)(k) AS approx_top_count,
+    approx_top_k(3, 6)(k) AS approx_top_k,
+    approx_top_sum(3, 6)(k, w) AS approx_top_sum
+FROM
+(
+    SELECT
+        concat(countDigits(number * number), '_', intDiv((number % 10), 7)) AS k,
+        number AS w
+    FROM numbers(1000)
+);
+
+SELECT topKMerge(4, 2, 'counts')(state) FROM ( SELECT topKState(4, 2, 'counts')(countDigits(number * number)) AS state FROM numbers(1000));
+
+SELECT topKMerge(4, 3, 'counts')(state) FROM ( SELECT topKState(4, 2, 'counts')(countDigits(number * number)) AS state FROM numbers(1000)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT topKMerge(4, 2)(state) FROM ( SELECT topKState(4, 2, 'counts')(countDigits(number * number)) AS state FROM numbers(1000)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+SELECT topKMerge(state) FROM ( SELECT topKState(4, 2, 'counts')(countDigits(number * number)) AS state FROM numbers(1000)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02967_analyzer_fuzz.reference b/tests/queries/0_stateless/02967_analyzer_fuzz.reference
new file mode 100644
index 00000000000..0b9dc69ff9e
--- /dev/null
+++ b/tests/queries/0_stateless/02967_analyzer_fuzz.reference
@@ -0,0 +1,4 @@
+2147483647	0
+0
+
+0
diff --git a/tests/queries/0_stateless/02967_analyzer_fuzz.sql b/tests/queries/0_stateless/02967_analyzer_fuzz.sql
new file mode 100644
index 00000000000..7f2d9afcc71
--- /dev/null
+++ b/tests/queries/0_stateless/02967_analyzer_fuzz.sql
@@ -0,0 +1,20 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/57193
+SELECT
+    2147483647,
+    count(pow(NULL, 1.0001))
+FROM remote(test_cluster_two_shards, system, one)
+GROUP BY
+    makeDateTime64(NULL, NULL, pow(NULL, '257') - '-1', '0.2147483647', 257),
+    makeDateTime64(pow(pow(NULL, '21474836.46') - '0.0000065535', 1048577), '922337203685477580.6', NULL, NULL, pow(NULL, 1.0001) - 65536, NULL)
+WITH CUBE
+    SETTINGS allow_experimental_analyzer = 1;
+
+
+CREATE TABLE data_01223 (`key` Int) ENGINE = Memory;
+CREATE TABLE dist_layer_01223 AS data_01223 ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), data_01223);
+CREATE TABLE dist_01223 AS data_01223 ENGINE = Distributed(test_cluster_two_shards, currentDatabase(), dist_layer_01223);
+SELECT count(round('92233720368547758.07', '-0.01', NULL, nan, '25.7', '-92233720368547758.07', NULL))
+FROM dist_01223
+WHERE round(NULL, 1025, 1.1754943508222875e-38, NULL)
+WITH TOTALS
+    SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02967_fuzz_bad_cast.reference b/tests/queries/0_stateless/02967_fuzz_bad_cast.reference
new file mode 100644
index 00000000000..2ad74d50ebd
--- /dev/null
+++ b/tests/queries/0_stateless/02967_fuzz_bad_cast.reference
@@ -0,0 +1 @@
+0	\N
diff --git a/tests/queries/0_stateless/02967_fuzz_bad_cast.sql b/tests/queries/0_stateless/02967_fuzz_bad_cast.sql
new file mode 100644
index 00000000000..8b34cc6e4d3
--- /dev/null
+++ b/tests/queries/0_stateless/02967_fuzz_bad_cast.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS t1__fuzz_4;
+DROP TABLE IF EXISTS t0__fuzz_29;
+
+SET allow_suspicious_low_cardinality_types = 1, join_algorithm = 'partial_merge', join_use_nulls = 1;
+CREATE TABLE t1__fuzz_4 (`x` Nullable(UInt32), `y` Int64) ENGINE = MergeTree ORDER BY (x, y) SETTINGS allow_nullable_key = 1;
+CREATE TABLE t0__fuzz_29 (`x` LowCardinality(UInt256), `y` Array(Array(Date))) ENGINE = MergeTree ORDER BY (x, y);
+SELECT sum(0), NULL FROM t0__fuzz_29 FULL OUTER JOIN t1__fuzz_4 USING (x) PREWHERE NULL;
+
+DROP TABLE t1__fuzz_4;
+DROP TABLE t0__fuzz_29;
diff --git a/tests/queries/0_stateless/02967_http_compressed.reference b/tests/queries/0_stateless/02967_http_compressed.reference
new file mode 100644
index 00000000000..b466312345f
--- /dev/null
+++ b/tests/queries/0_stateless/02967_http_compressed.reference
@@ -0,0 +1,8 @@
+0000000 e6fb dda5 f87b 92ee 2e61 ab3d 12cb 5c84
+0000010 1382 0000 0900 0000 9000 0931 0932 0933
+0000020 3234 000a                              
+0000023
+0000000 e6fb dda5 f87b 92ee 2e61 ab3d 12cb 5c84
+0000010 1382 0000 0900 0000 9000 0931 0932 0933
+0000020 3234 000a                              
+0000023
diff --git a/tests/queries/0_stateless/02967_http_compressed.sh b/tests/queries/0_stateless/02967_http_compressed.sh
new file mode 100755
index 00000000000..9d00969fd5b
--- /dev/null
+++ b/tests/queries/0_stateless/02967_http_compressed.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
+
+curl -sS -d 'SELECT 1,2,3,42' -H 'Accept-Encoding: gzip' -X POST "${CLICKHOUSE_URL}&compress=1&enable_http_compression=1" | gzip -d | hexdump
+curl -sS -d 'SELECT 1,2,3,42' -H 'Accept-Encoding: zstd' -X POST "${CLICKHOUSE_URL}&compress=1&enable_http_compression=1" | zstd -d | hexdump
diff --git a/tests/queries/0_stateless/02967_index_hint_crash.reference b/tests/queries/0_stateless/02967_index_hint_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02967_index_hint_crash.sql b/tests/queries/0_stateless/02967_index_hint_crash.sql
new file mode 100644
index 00000000000..e33a4992c6c
--- /dev/null
+++ b/tests/queries/0_stateless/02967_index_hint_crash.sql
@@ -0,0 +1,16 @@
+CREATE TABLE tab
+(
+    `foo` Array(LowCardinality(String)),
+    INDEX idx foo TYPE bloom_filter GRANULARITY 1
+)
+ENGINE = MergeTree
+PRIMARY KEY tuple();
+
+INSERT INTO tab SELECT if(number % 2, ['value'], [])
+FROM system.numbers
+LIMIT 10000;
+
+SELECT *
+FROM tab
+PREWHERE indexHint()
+FORMAT Null;
diff --git a/tests/queries/0_stateless/02967_mysql_settings_override.reference b/tests/queries/0_stateless/02967_mysql_settings_override.reference
new file mode 100644
index 00000000000..96cf7ecc403
--- /dev/null
+++ b/tests/queries/0_stateless/02967_mysql_settings_override.reference
@@ -0,0 +1,23 @@
+-- Init
+s
+a
+b
+c
+d
+-- Uppercase setting name
+s
+a
+b
+name	value
+send_timeout	22
+name	value
+receive_timeout	33
+-- Lowercase setting name
+s
+a
+b
+c
+name	value
+send_timeout	55
+name	value
+receive_timeout	66
diff --git a/tests/queries/0_stateless/02967_mysql_settings_override.sh b/tests/queries/0_stateless/02967_mysql_settings_override.sh
new file mode 100755
index 00000000000..59a2099190a
--- /dev/null
+++ b/tests/queries/0_stateless/02967_mysql_settings_override.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
+
+# Tests that certain MySQL-proprietary settings are mapped to ClickHouse-native settings.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+CHANGED_SETTINGS_QUERY="SELECT name, value FROM system.settings WHERE name IN ('send_timeout', 'receive_timeout') AND changed;"
+
+TEST_TABLE="mysql_settings_override_test"
+
+DROP_TABLE="DROP TABLE IF EXISTS $TEST_TABLE;"
+CREATE_TABLE="CREATE TABLE $TEST_TABLE (s String) ENGINE MergeTree ORDER BY s;"
+INSERT_STMT="INSERT INTO $TEST_TABLE VALUES ('a'), ('b'), ('c'), ('d');"
+SELECT_STMT="SELECT * FROM $TEST_TABLE ORDER BY s;"
+
+echo "-- Init"
+${MYSQL_CLIENT} --execute "$DROP_TABLE $CREATE_TABLE $INSERT_STMT $SELECT_STMT" # should fetch all 4 records
+
+echo "-- Uppercase setting name"
+${MYSQL_CLIENT} --execute "SET SQL_SELECT_LIMIT = 2; $SELECT_STMT" # should fetch 2 records out of 4
+${MYSQL_CLIENT} --execute "SET NET_WRITE_TIMEOUT = 22; $CHANGED_SETTINGS_QUERY"
+${MYSQL_CLIENT} --execute "SET NET_READ_TIMEOUT = 33; $CHANGED_SETTINGS_QUERY"
+
+echo "-- Lowercase setting name"
+${MYSQL_CLIENT} --execute "set sql_select_limit=3; $SELECT_STMT" # should fetch 3 records out of 4
+${MYSQL_CLIENT} --execute "set net_write_timeout=55; $CHANGED_SETTINGS_QUERY"
+${MYSQL_CLIENT} --execute "set net_read_timeout=66; $CHANGED_SETTINGS_QUERY"
+
+${MYSQL_CLIENT} --execute "$DROP_TABLE"
diff --git a/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.reference b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.reference
new file mode 100644
index 00000000000..d7fa419aeab
--- /dev/null
+++ b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.reference
@@ -0,0 +1,177 @@
+
+simple join with analyzer
+4200000	4200000	4200000	-1400000
+4200006	4200006	4200006	-1400002
+4200012	4200012	4200012	-1400004
+4200018	4200018	4200018	-1400006
+4200024	4200024	4200024	-1400008
+4200030	4200030	4200030	-1400010
+4200036	4200036	4200036	-1400012
+4200042	4200042	4200042	-1400014
+4200048	4200048	4200048	-1400016
+4200054	4200054	4200054	-1400018
+
+simple (global) join with analyzer and parallel replicas
+4200000	4200000	4200000	-1400000
+4200006	4200006	4200006	-1400002
+4200012	4200012	4200012	-1400004
+4200018	4200018	4200018	-1400006
+4200024	4200024	4200024	-1400008
+4200030	4200030	4200030	-1400010
+4200036	4200036	4200036	-1400012
+4200042	4200042	4200042	-1400014
+4200048	4200048	4200048	-1400016
+4200054	4200054	4200054	-1400018
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+
+simple (local) join with analyzer and parallel replicas
+4200000	4200000	4200000	-1400000
+4200006	4200006	4200006	-1400002
+4200012	4200012	4200012	-1400004
+4200018	4200018	4200018	-1400006
+4200024	4200024	4200024	-1400008
+4200030	4200030	4200030	-1400010
+4200036	4200036	4200036	-1400012
+4200042	4200042	4200042	-1400014
+4200048	4200048	4200048	-1400016
+4200054	4200054	4200054	-1400018
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4`) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4`) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+
+simple (local) join with analyzer and parallel replicas and full sorting merge join
+4200000	4200000	4200000	-1400000
+4200006	4200006	4200006	-1400002
+4200012	4200012	4200012	-1400004
+4200018	4200018	4200018	-1400006
+4200024	4200024	4200024	-1400008
+4200030	4200030	4200030	-1400010
+4200036	4200036	4200036	-1400012
+4200042	4200042	4200042	-1400014
+4200048	4200048	4200048	-1400016
+4200054	4200054	4200054	-1400018
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4`) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4`) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(700000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+
+nested join with analyzer
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+
+nested join with analyzer and parallel replicas, both local
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4` ALL INNER JOIN (SELECT `__table6`.`number` * 7 AS `key` FROM numbers(100000.) AS `__table6`) AS `__table5` ON `__table4`.`key` = `__table5`.`key` SETTINGS parallel_replicas_prefer_local_join = 1) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` ALL INNER JOIN (SELECT `__table4`.`key` AS `key`, `__table4`.`value` AS `value` FROM `default`.`num_2` AS `__table4` ALL INNER JOIN (SELECT `__table6`.`number` * 7 AS `key` FROM numbers(100000.) AS `__table6`) AS `__table5` ON `__table4`.`key` = `__table5`.`key` SETTINGS parallel_replicas_prefer_local_join = 1) AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+
+nested join with analyzer and parallel replicas, both global
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+
+nested join with analyzer and parallel replicas, global + local
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` ALL INNER JOIN (SELECT `__table3`.`number` * 7 AS `key` FROM numbers(100000.) AS `__table3`) AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` ALL INNER JOIN (SELECT `__table3`.`number` * 7 AS `key` FROM numbers(100000.) AS `__table3`) AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+
+nested join with analyzer and parallel replicas, both local, both full sorting merge join
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+
+nested join with analyzer and parallel replicas, both local, both full sorting and hash join
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+
+nested join with analyzer and parallel replicas, both local, both full sorting and hash join
+420000	420000	420000	-140000
+420042	420042	420042	-140014
+420084	420084	420084	-140028
+420126	420126	420126	-140042
+420168	420168	420168	-140056
+420210	420210	420210	-140070
+420252	420252	420252	-140084
+420294	420294	420294	-140098
+420336	420336	420336	-140112
+420378	420378	420378	-140126
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value` FROM `default`.`num_2` AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table2` ON `__table1`.`key` = `__table2`.`key` (stage: WithMergeableState)
+<Debug> WithOrderCoordinator: Coordination done
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+SELECT `__table1`.`key` AS `key`, `__table1`.`value` AS `value`, `__table3`.`key` AS `r.key`, `__table3`.`value` AS `r.value` FROM (SELECT `__table2`.`key` AS `key`, `__table2`.`value` AS `value` FROM `default`.`num_1` AS `__table2`) AS `__table1` GLOBAL ALL INNER JOIN `_data_` AS `__table3` ON `__table1`.`key` = `__table3`.`key` ORDER BY `__table1`.`key` ASC LIMIT _CAST(10000, 'UInt64'), _CAST(10, 'UInt64') (stage: WithMergeableState)
+<Debug> DefaultCoordinator: Coordination done
diff --git a/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.sh b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.sh
new file mode 100755
index 00000000000..2840482da6d
--- /dev/null
+++ b/tests/queries/0_stateless/02967_parallel_replicas_join_algo_and_analyzer.sh
@@ -0,0 +1,263 @@
+#!/usr/bin/env bash
+# Tags: long, no-random-settings, no-random-merge-tree-settings
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -nm -q "
+drop table if exists num_1;
+drop table if exists num_2;
+
+create table num_1 (key UInt64, value String) engine = MergeTree order by key;
+create table num_2 (key UInt64, value Int64) engine = MergeTree order by key;
+
+insert into num_1 select number * 2, toString(number * 2) from numbers(1e7);
+insert into num_2 select number * 3, -number from numbers(1.5e6);
+"
+
+##############
+echo
+echo "simple join with analyzer"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1"
+
+##############
+echo
+echo "simple (global) join with analyzer and parallel replicas"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1, allow_experimental_parallel_reading_from_replicas = 2,
+max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1, allow_experimental_parallel_reading_from_replicas = 2, send_logs_level='trace',
+max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+##############
+echo
+echo "simple (local) join with analyzer and parallel replicas"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+
+##############
+echo
+echo "simple (local) join with analyzer and parallel replicas and full sorting merge join"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1, join_algorithm='full_sorting_merge',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2) r on l.key = r.key
+order by l.key limit 10 offset 700000
+SETTINGS allow_experimental_analyzer=1, join_algorithm='full_sorting_merge', send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+
+##############
+echo
+echo "nested join with analyzer"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=1) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1"
+
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, both local"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=1) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=1) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, join_algorithm='full_sorting_merge', send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=1" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, both global"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=0) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=0) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, global + local"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=1) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings parallel_replicas_prefer_local_join=1) r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', parallel_replicas_prefer_local_join=0" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, both local, both full sorting merge join"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='full_sorting_merge') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='full_sorting_merge'"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='full_sorting_merge') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='full_sorting_merge'" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, both local, both full sorting and hash join"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='hash') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='full_sorting_merge'"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='hash') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='full_sorting_merge'" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
+
+##############
+echo
+echo "nested join with analyzer and parallel replicas, both local, both full sorting and hash join"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='full_sorting_merge') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0,
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='hash'"
+
+$CLICKHOUSE_CLIENT -q "
+select * from (select key, value from num_1) l
+inner join (select key, value from num_2 inner join
+  (select number * 7 as key from numbers(1e5)) as nn on num_2.key = nn.key settings join_algorithm='full_sorting_merge') r
+on l.key = r.key order by l.key limit 10 offset 10000
+SETTINGS allow_experimental_analyzer=1, parallel_replicas_prefer_local_join=0, send_logs_level='trace',
+allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1,
+cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', join_algorithm='hash'" 2>&1 |
+grep "executeQuery\|<Debug>.*Coordinator: Coordination done" |
+grep -o "SELECT.*WithMergeableState)\|<Debug>.*Coordinator: Coordination done" |
+sed -re 's/_data_[[:digit:]]+_[[:digit:]]+/_data_/g'
diff --git a/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.reference b/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.reference
new file mode 100644
index 00000000000..100e4e500cd
--- /dev/null
+++ b/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.reference
@@ -0,0 +1,676 @@
+-- { echoOn }
+
+set parallel_replicas_prefer_local_join = 0;
+-- A query with only INNER/LEFT joins is fully send to replicas. JOIN is executed in GLOBAL mode.
+select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0 select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  ReadFromRemoteParallelReplicas
+--
+-- The same query with cte;
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- GROUP BY should work up to WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+54	54	50	50	12	12	0
+64	64	0	0	0	0	1
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      MergingAggregated
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- ORDER BY in sub3 : sub1 is fully pushed, sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- ORDER BY in sub1 : sub1 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          Join
+            Expression
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- RIGHT JOIN in sub3: sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+6	6	6	6	0	0
+8	8	8	8	0	0
+10	10	10	10	0	0
+12	12	12	12	12	12
+14	14	14	14	0	0
+4	4	0	0	0	0
+3	3	0	0	0	0
+5	5	0	0	0	0
+1	1	0	0	0	0
+7	7	0	0	0	0
+9	9	0	0	0	0
+15	15	0	0	0	0
+11	11	0	0	0	0
+13	13	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Join
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- RIGHT JOIN in sub5: sub5 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+0	0	1	1	0	0
+0	0	3	3	0	0
+0	0	4	4	0	0
+0	0	5	5	0	0
+0	0	6	6	6	6
+0	0	7	7	0	0
+0	0	8	8	8	8
+0	0	9	9	0	0
+0	0	10	10	10	10
+0	0	11	11	0	0
+12	12	12	12	12	12
+0	0	13	13	0	0
+0	0	14	14	14	14
+0	0	15	15	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          Join
+            Expression
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+--
+-- Subqueries for IN allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- Subqueries for IN are not allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;-- { echoOn }
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          Join
+            Expression
+              CreatingSets
+                Expression
+                  Expression
+                    ReadFromMergeTree
+                CreatingSet
+                  Expression
+                    Filter
+                      ReadFromSystemNumbers
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+set parallel_replicas_prefer_local_join = 1;
+-- A query with only INNER/LEFT joins is fully send to replicas. JOIN is executed in GLOBAL mode.
+select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0 select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  ReadFromRemoteParallelReplicas
+--
+-- The same query with cte;
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- GROUP BY should work up to WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+54	54	50	50	12	12	0
+64	64	0	0	0	0	1
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      MergingAggregated
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- ORDER BY in sub3 : sub1 is fully pushed, sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- ORDER BY in sub1 : sub1 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          Join
+            Expression
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+--
+-- RIGHT JOIN in sub3: sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+6	6	6	6	0	0
+8	8	8	8	0	0
+10	10	10	10	0	0
+12	12	12	12	12	12
+14	14	14	14	0	0
+4	4	0	0	0	0
+3	3	0	0	0	0
+5	5	0	0	0	0
+1	1	0	0	0	0
+7	7	0	0	0	0
+9	9	0	0	0	0
+15	15	0	0	0	0
+11	11	0	0	0	0
+13	13	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Join
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- RIGHT JOIN in sub5: sub5 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+0	0	1	1	0	0
+0	0	3	3	0	0
+0	0	4	4	0	0
+0	0	5	5	0	0
+0	0	6	6	6	6
+0	0	7	7	0	0
+0	0	8	8	8	8
+0	0	9	9	0	0
+0	0	10	10	10	10
+0	0	11	11	0	0
+12	12	12	12	12	12
+0	0	13	13	0	0
+0	0	14	14	14	14
+0	0	15	15	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          ReadFromRemoteParallelReplicas
+        Expression
+          Join
+            Expression
+              ReadFromRemoteParallelReplicas
+            Expression
+              ReadFromRemoteParallelReplicas
+--
+-- Subqueries for IN allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+Expression
+  Sorting
+    Expression
+      ReadFromRemoteParallelReplicas
+--
+-- Subqueries for IN are not allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+0	0	0	0	0	0
+1	1	0	0	0	0
+3	3	0	0	0	0
+4	4	0	0	0	0
+5	5	0	0	0	0
+6	6	6	6	0	0
+7	7	0	0	0	0
+8	8	8	8	0	0
+9	9	0	0	0	0
+10	10	10	10	0	0
+11	11	0	0	0	0
+12	12	12	12	12	12
+13	13	0	0	0	0
+14	14	14	14	0	0
+15	15	0	0	0	0
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+Expression
+  Sorting
+    Expression
+      Join
+        Expression
+          Join
+            Expression
+              CreatingSets
+                Expression
+                  Expression
+                    ReadFromMergeTree
+                CreatingSet
+                  Expression
+                    Filter
+                      ReadFromSystemNumbers
+            Expression
+              ReadFromRemoteParallelReplicas
+        Expression
+          ReadFromRemoteParallelReplicas
diff --git a/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.sql.j2 b/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.sql.j2
new file mode 100644
index 00000000000..54505b147a3
--- /dev/null
+++ b/tests/queries/0_stateless/02967_parallel_replicas_joins_and_analyzer.sql.j2
@@ -0,0 +1,167 @@
+drop table if exists tab1;
+drop table if exists tab2;
+drop table if exists tab3;
+
+create table tab1 (x UInt32, y UInt32, shard UInt32) engine = MergeTree order by shard;
+create table tab2 (y UInt32, z UInt32) engine = MergeTree order by tuple();
+create table tab3 (z UInt32, a UInt32) engine = MergeTree order by tuple();
+
+insert into tab1 select number, number, number from numbers(16);
+insert into tab2 select number * 2, number * 2 from numbers(8);
+insert into tab3 select number * 4, number * 4 from numbers(4);
+
+{% for use_global_in in [0, 1] -%}
+
+-- { echoOn }
+
+set parallel_replicas_prefer_local_join = {{use_global_in}};
+
+-- A query with only INNER/LEFT joins is fully send to replicas. JOIN is executed in GLOBAL mode.
+select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+explain description=0 select x, y, r.y, z, rr.z, a from (select l.x, l.y, r.y, r.z as z from (select x, y from tab1 where x != 2) l any left join (select y, z from tab2 where y != 4) r on l.y = r.y) ll any left join (select z, a from tab3 where z != 8) rr on ll.z = rr.z SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- The same query with cte;
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- GROUP BY should work up to WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select sum(x), sum(y), sum(r.y), sum(z), sum(rr.z), sum(a), key from sub3 ll any left join sub4 rr on ll.z = rr.z group by x % 2 as key)
+select * from sub5 order by key
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- ORDER BY in sub3 : sub1 is fully pushed, sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y order by l.x),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- ORDER BY in sub1 : sub1 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2 order by y),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- RIGHT JOIN in sub3: sub3 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub2 r any right join sub1 l on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, l.y, y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+--
+-- RIGHT JOIN in sub5: sub5 -> WithMergableStage
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x != 2),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select z, a, x, y, r.y, ll.z from sub4 rr any right join sub3 ll on ll.z = rr.z)
+select * from sub5 order by x SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+--
+-- Subqueries for IN allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 2, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1;
+
+--
+-- Subqueries for IN are not allowed
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+
+explain description=0
+with sub1 as (select x, y from tab1 where x in (select number from numbers(16) where number != 2)),
+sub2 as (select y, z from tab2 where y != 4),
+sub3 as (select l.x, l.y, r.y, r.z as z from sub1 l any left join sub2 r on l.y = r.y),
+sub4 as (select z, a from tab3 where z != 8),
+sub5 as (select x, y, r.y, z, rr.z, a from sub3 ll any left join sub4 rr on ll.z = rr.z)
+select * from sub5 order by x
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, max_parallel_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, prefer_localhost_replica = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', allow_experimental_analyzer=1, parallel_replicas_allow_in_with_subquery=0;
+
+{%- endfor %}
diff --git a/tests/queries/0_stateless/02968_adaptive_async_insert_timeout.reference b/tests/queries/0_stateless/02968_adaptive_async_insert_timeout.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02968_adaptive_async_insert_timeout.sql b/tests/queries/0_stateless/02968_adaptive_async_insert_timeout.sql
new file mode 100644
index 00000000000..f9606cace6e
--- /dev/null
+++ b/tests/queries/0_stateless/02968_adaptive_async_insert_timeout.sql
@@ -0,0 +1,51 @@
+DROP TABLE IF EXISTS async_insert_mt_test;
+CREATE TABLE async_insert_mt_test (a UInt64, b Array(UInt64)) ENGINE=MergeTree() ORDER BY a;
+
+SET async_insert_use_adaptive_busy_timeout = 1;
+
+INSERT INTO async_insert_mt_test
+    SETTINGS
+        async_insert=1,
+        wait_for_async_insert=1,
+        async_insert_busy_timeout_min_ms=10,
+        async_insert_busy_timeout_max_ms=500,
+        async_insert_busy_timeout_increase_rate=1.0,
+        async_insert_busy_timeout_decrease_rate=1.0
+    VALUES (3, []), (1, [1, 3]), (2, [7, 8]), (4, [5, 9]), (5, [2, 6]);
+
+
+INSERT INTO async_insert_mt_test
+    SETTINGS
+        async_insert=1,
+        wait_for_async_insert=1,
+        async_insert_busy_timeout_ms=500,
+        async_insert_busy_timeout_min_ms=500
+    VALUES (3, []), (1, [1, 3]), (2, [7, 8]), (4, [5, 9]), (5, [2, 6]);
+
+
+INSERT INTO async_insert_mt_test
+    SETTINGS
+        async_insert=1,
+        wait_for_async_insert=1,
+        async_insert_busy_timeout_ms=100,
+        async_insert_busy_timeout_min_ms=500
+    VALUES (3, []), (1, [1, 3]), (2, [7, 8]), (4, [5, 9]), (5, [2, 6]);
+
+
+INSERT INTO async_insert_mt_test
+    SETTINGS
+        async_insert=1,
+        wait_for_async_insert=1,
+        async_insert_busy_timeout_increase_rate=-1.0
+    VALUES (3, []), (1, [1, 3]), (2, [7, 8]), (4, [5, 9]), (5, [2, 6]); -- { serverError INVALID_SETTING_VALUE }
+
+
+INSERT INTO async_insert_mt_test
+    SETTINGS
+        async_insert=1,
+        wait_for_async_insert=1,
+        async_insert_busy_timeout_decrease_rate=-1.0
+    VALUES (3, []), (1, [1, 3]), (2, [7, 8]), (4, [5, 9]), (5, [2, 6]); -- { serverError INVALID_SETTING_VALUE }
+
+
+DROP TABLE IF EXISTS async_insert_mt_test;
diff --git a/tests/queries/0_stateless/02968_analyzer_join_column_not_found.reference b/tests/queries/0_stateless/02968_analyzer_join_column_not_found.reference
new file mode 100644
index 00000000000..50d4d226b46
--- /dev/null
+++ b/tests/queries/0_stateless/02968_analyzer_join_column_not_found.reference
@@ -0,0 +1 @@
+1	1	1	1	1
diff --git a/tests/queries/0_stateless/02968_analyzer_join_column_not_found.sql b/tests/queries/0_stateless/02968_analyzer_join_column_not_found.sql
new file mode 100644
index 00000000000..e7c12aac81e
--- /dev/null
+++ b/tests/queries/0_stateless/02968_analyzer_join_column_not_found.sql
@@ -0,0 +1,16 @@
+DROP TABLE IF EXISTS im;
+CREATE TABLE im (id Int32, dd Int32) ENGINE = Memory();
+INSERT INTO im VALUES (1, 1);
+
+DROP TABLE IF EXISTS ts;
+CREATE TABLE ts (tid Int32, id Int32) ENGINE = Memory();
+INSERT INTO ts VALUES (1, 1);
+
+SELECT *
+FROM im AS m
+INNER JOIN (
+    SELECT tid, dd, t.id
+    FROM im AS m
+    INNER JOIN ts AS t ON m.id = t.id
+) AS t ON m.dd = t.dd
+;
diff --git a/tests/queries/0_stateless/02968_file_log_multiple_read.reference b/tests/queries/0_stateless/02968_file_log_multiple_read.reference
new file mode 100644
index 00000000000..40afb2d64f9
--- /dev/null
+++ b/tests/queries/0_stateless/02968_file_log_multiple_read.reference
@@ -0,0 +1,30 @@
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+1
+2
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+13
+14
+15
+16
+17
+18
+19
+20
diff --git a/tests/queries/0_stateless/02968_file_log_multiple_read.sh b/tests/queries/0_stateless/02968_file_log_multiple_read.sh
new file mode 100755
index 00000000000..199893a9428
--- /dev/null
+++ b/tests/queries/0_stateless/02968_file_log_multiple_read.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# Data preparation.
+# Now we can get the user_files_path by use the table file function for trick. also we can get it by query as:
+#  "insert into function file('exist.txt', 'CSV', 'val1 char') values ('aaaa'); select _path from file('exist.txt', 'CSV', 'val1 char')"
+user_files_path=$($CLICKHOUSE_CLIENT_BINARY --query "select _path,_file from file('nonexist.txt', 'CSV', 'val1 char')" 2>&1 | grep Exception | awk '{gsub("/nonexist.txt","",$9); print $9}')
+
+logs_dir=${user_files_path}/${CLICKHOUSE_TEST_UNIQUE_NAME}
+
+rm -rf ${logs_dir}
+
+mkdir -p ${logs_dir}/
+
+for i in {1..10}
+do
+	echo $i >> ${logs_dir}/a.txt
+done
+
+${CLICKHOUSE_CLIENT} -n --query="
+DROP TABLE IF EXISTS file_log;
+DROP TABLE IF EXISTS table_to_store_data;
+DROP TABLE IF EXISTS file_log_mv;
+
+CREATE TABLE file_log (
+    id Int64
+) ENGINE = FileLog('${logs_dir}/', 'CSV');
+
+CREATE TABLE table_to_store_data (
+    id Int64
+) ENGINE = MergeTree
+ORDER BY id;
+
+CREATE MATERIALIZED VIEW file_log_mv TO table_to_store_data AS
+    SELECT id
+    FROM file_log
+    WHERE id NOT IN (
+        SELECT id
+        FROM table_to_store_data
+        WHERE id IN (
+            SELECT id
+            FROM file_log
+        )
+    );
+"
+
+function count()
+{
+	COUNT=$(${CLICKHOUSE_CLIENT} --query "select count() from table_to_store_data;")
+	echo $COUNT
+}
+
+for i in {1..10}
+do
+	[[ $(count) -gt 0 ]] && break
+	sleep 1
+done
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM table_to_store_data ORDER BY id;"
+
+for i in {1..20}
+do
+	echo $i >> ${logs_dir}/a.txt
+done
+
+for i in {1..10}
+do
+	[[ $(count) -gt 10 ]] && break
+	sleep 1
+done
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM table_to_store_data ORDER BY id;"
+
+${CLICKHOUSE_CLIENT} -n --query="
+DROP TABLE file_log;
+DROP TABLE table_to_store_data;
+DROP TABLE file_log_mv;
+"
+
+rm -rf ${logs_dir}
diff --git a/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.reference b/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.reference
new file mode 100644
index 00000000000..2491b55b493
--- /dev/null
+++ b/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.reference
@@ -0,0 +1,2 @@
+b	count()
+2	1
diff --git a/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.sh b/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.sh
new file mode 100755
index 00000000000..4457aafb8b2
--- /dev/null
+++ b/tests/queries/0_stateless/02968_mysql_prefer_column_name_to_alias.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# Some BI tools which connect to ClickHouse's MySQL port, run queries which succeed only with (the analyzer enabled)
+# or (without analyzer and setting prefer_column_name_to_alias = 1). Since the setting is too impactful to enable it
+# globally, it is enabled only by the MySQL handler internally as a workaround. Run a query from Bug 56173 to verify.
+#
+# When the analyzer is the new default, the test and the workaround can be deleted.
+${MYSQL_CLIENT} --execute "select a + b as b, count() from (select 1 as a, 1 as b) group by a + b";
diff --git a/tests/queries/0_stateless/02968_mysql_show_warnings.reference b/tests/queries/0_stateless/02968_mysql_show_warnings.reference
new file mode 100644
index 00000000000..9992883e4d5
--- /dev/null
+++ b/tests/queries/0_stateless/02968_mysql_show_warnings.reference
@@ -0,0 +1,6 @@
+@@session.warning_count
+0
+@@session.warning_count
+0
+@@warning_count
+0
diff --git a/tests/queries/0_stateless/02968_mysql_show_warnings.sh b/tests/queries/0_stateless/02968_mysql_show_warnings.sh
new file mode 100755
index 00000000000..6c58c2e57d5
--- /dev/null
+++ b/tests/queries/0_stateless/02968_mysql_show_warnings.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${MYSQL_CLIENT} --execute "SHOW WARNINGS;"
+${MYSQL_CLIENT} --execute "show warnings;"
+${MYSQL_CLIENT} --execute "SHOW WARNINGS LIMIT 100;"
+${MYSQL_CLIENT} --execute "show warnings limit 100;"
+${MYSQL_CLIENT} --execute "SHOW WARNINGS LIMIT 100 OFFSET 100;"
+${MYSQL_CLIENT} --execute "show warnings limit 100 offset 100;"
+${MYSQL_CLIENT} --execute "SHOW COUNT(*) WARNINGS;"
+${MYSQL_CLIENT} --execute "show count(*) warnings;"
+${MYSQL_CLIENT} --execute "SELECT @@session.warning_count;"
diff --git a/tests/queries/0_stateless/02968_sumMap_with_nan.reference b/tests/queries/0_stateless/02968_sumMap_with_nan.reference
new file mode 100644
index 00000000000..83a2d98375f
--- /dev/null
+++ b/tests/queries/0_stateless/02968_sumMap_with_nan.reference
@@ -0,0 +1,2 @@
+([6.7],[3])
+([1,4,5,6.7,nan],[2.3,5,1,3,inf])
diff --git a/tests/queries/0_stateless/02968_sumMap_with_nan.sql b/tests/queries/0_stateless/02968_sumMap_with_nan.sql
new file mode 100644
index 00000000000..330da94cfea
--- /dev/null
+++ b/tests/queries/0_stateless/02968_sumMap_with_nan.sql
@@ -0,0 +1,4 @@
+SELECT sumMapFiltered([6.7])([x], [y])
+FROM values('x Float64, y Float64', (0, 1), (1, 2.3), (nan, inf), (6.7, 3), (4, 4), (5, 1));
+
+SELECT sumMap([x],[y]) FROM values('x Float64, y Float64', (4, 1), (1, 2.3), (nan,inf), (6.7,3), (4,4), (5, 1));
diff --git a/tests/queries/0_stateless/02968_url_args.reference b/tests/queries/0_stateless/02968_url_args.reference
new file mode 100644
index 00000000000..e7e9e2c0d94
--- /dev/null
+++ b/tests/queries/0_stateless/02968_url_args.reference
@@ -0,0 +1,8 @@
+CREATE TABLE default.a\n(\n    `x` Int64\n)\nENGINE = URL(\'https://example.com/\', \'CSV\', headers(\'foo\' = \'[HIDDEN]\', \'a\' = \'[HIDDEN]\'))
+CREATE TABLE default.b\n(\n    `x` Int64\n)\nENGINE = URL(\'https://example.com/\', \'CSV\', headers())
+CREATE TABLE default.c\n(\n    `x` Int64\n)\nENGINE = S3(\'https://example.s3.amazonaws.com/a.csv\', \'NOSIGN\', \'CSV\', headers(\'foo\' = \'[HIDDEN]\'))
+CREATE TABLE default.d\n(\n    `x` Int64\n)\nENGINE = S3(\'https://example.s3.amazonaws.com/a.csv\', \'NOSIGN\', headers(\'foo\' = \'[HIDDEN]\'))
+CREATE VIEW default.e\n(\n    `x` Int64\n)\nAS SELECT count()\nFROM url(\'https://example.com/\', CSV, headers(\'foo\' = \'[HIDDEN]\', \'a\' = \'[HIDDEN]\'))
+CREATE VIEW default.f\n(\n    `x` Int64\n)\nAS SELECT count()\nFROM url(\'https://example.com/\', CSV, headers())
+CREATE VIEW default.g\n(\n    `x` Int64\n)\nAS SELECT count()\nFROM s3(\'https://example.s3.amazonaws.com/a.csv\', CSV, headers(\'foo\' = \'[HIDDEN]\'))
+CREATE VIEW default.h\n(\n    `x` Int64\n)\nAS SELECT count()\nFROM s3(\'https://example.s3.amazonaws.com/a.csv\', headers(\'foo\' = \'[HIDDEN]\'))
diff --git a/tests/queries/0_stateless/02968_url_args.sql b/tests/queries/0_stateless/02968_url_args.sql
new file mode 100644
index 00000000000..a9ac96970e0
--- /dev/null
+++ b/tests/queries/0_stateless/02968_url_args.sql
@@ -0,0 +1,19 @@
+-- Tags: no-fasttest
+
+create table a (x Int64) engine URL('https://example.com/', CSV, headers('foo' = 'bar', 'a' = '13'));
+show create a;
+create table b (x Int64) engine URL('https://example.com/', CSV, headers());
+show create b;
+create table c (x Int64) engine S3('https://example.s3.amazonaws.com/a.csv', NOSIGN, CSV, headers('foo' = 'bar'));
+show create c;
+create table d (x Int64) engine S3('https://example.s3.amazonaws.com/a.csv', NOSIGN, headers('foo' = 'bar'));
+show create d;
+
+create view e (x Int64) as select count() from url('https://example.com/', CSV, headers('foo' = 'bar', 'a' = '13'));
+show create e;
+create view f (x Int64) as select count() from url('https://example.com/', CSV, headers());
+show create f;
+create view g (x Int64) as select count() from s3('https://example.s3.amazonaws.com/a.csv', CSV, headers('foo' = 'bar'));
+show create g;
+create view h (x Int64) as select count() from s3('https://example.s3.amazonaws.com/a.csv', headers('foo' = 'bar'));
+show create h;
diff --git a/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.reference b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.reference
new file mode 100644
index 00000000000..72d83e5cf6a
--- /dev/null
+++ b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.reference
@@ -0,0 +1,142 @@
+QUERY id: 0
+  PROJECTION COLUMNS
+    val String
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                        CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+      FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE_FUNCTION id: 9, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 12, nodes: 1
+          CONSTANT id: 13, constant_value: UInt64_2, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 14, nodes: 1
+      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 7, nodes: 2
+            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 15, nodes: 1
+      SORT id: 16, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+                  ARGUMENTS
+                    LIST id: 5, nodes: 1
+                      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 7, nodes: 2
+                            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+1	1
+2	1
+QUERY id: 0
+  PROJECTION COLUMNS
+    val String
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                        CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+      FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE_FUNCTION id: 9, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 12, nodes: 1
+          CONSTANT id: 13, constant_value: UInt64_2, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 14, nodes: 1
+      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 7, nodes: 2
+            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 15, nodes: 1
+      SORT id: 16, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+                  ARGUMENTS
+                    LIST id: 5, nodes: 1
+                      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 7, nodes: 2
+                            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+CHECK WITH TOTALS
+QUERY id: 0, is_group_by_with_totals: 1
+  PROJECTION COLUMNS
+    val String
+    count() UInt64
+  PROJECTION
+    LIST id: 1, nodes: 2
+      FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+        ARGUMENTS
+          LIST id: 3, nodes: 1
+            FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                    ARGUMENTS
+                      LIST id: 7, nodes: 2
+                        COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                        CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+      FUNCTION id: 11, function_name: count, function_type: aggregate, result_type: UInt64
+  JOIN TREE
+    TABLE_FUNCTION id: 9, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 12, nodes: 1
+          CONSTANT id: 13, constant_value: UInt64_2, constant_value_type: UInt8
+  GROUP BY
+    LIST id: 14, nodes: 1
+      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+        ARGUMENTS
+          LIST id: 7, nodes: 2
+            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+  ORDER BY
+    LIST id: 15, nodes: 1
+      SORT id: 16, sort_direction: ASCENDING, with_fill: 0
+        EXPRESSION
+          FUNCTION id: 2, function_name: toString, function_type: ordinary, result_type: String
+            ARGUMENTS
+              LIST id: 3, nodes: 1
+                FUNCTION id: 4, function_name: toString, function_type: ordinary, result_type: String
+                  ARGUMENTS
+                    LIST id: 5, nodes: 1
+                      FUNCTION id: 6, function_name: plus, function_type: ordinary, result_type: UInt64
+                        ARGUMENTS
+                          LIST id: 7, nodes: 2
+                            COLUMN id: 8, column_name: number, result_type: UInt64, source_id: 9
+                            CONSTANT id: 10, constant_value: UInt64_1, constant_value_type: UInt8
+1	1
+2	1
+
+0	2
diff --git a/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql
new file mode 100644
index 00000000000..15f2550a63e
--- /dev/null
+++ b/tests/queries/0_stateless/02969_analyzer_eliminate_injective_functions.sql
@@ -0,0 +1,31 @@
+set allow_experimental_analyzer = 1;
+
+EXPLAIN QUERY TREE
+SELECT toString(toString(number + 1)) as val, count()
+FROM numbers(2)
+GROUP BY val
+ORDER BY val;
+
+SELECT toString(toString(number + 1)) as val, count()
+FROM numbers(2)
+GROUP BY ALL
+ORDER BY val;
+
+EXPLAIN QUERY TREE
+SELECT toString(toString(number + 1)) as val, count()
+FROM numbers(2)
+GROUP BY ALL
+ORDER BY val;
+
+SELECT 'CHECK WITH TOTALS';
+
+EXPLAIN QUERY TREE
+SELECT toString(toString(number + 1)) as val, count()
+FROM numbers(2)
+GROUP BY val WITH TOTALS
+ORDER BY val;
+
+SELECT toString(toString(number + 1)) as val, count()
+FROM numbers(2)
+GROUP BY val WITH TOTALS
+ORDER BY val;
diff --git a/tests/queries/0_stateless/02969_archive_seek.reference b/tests/queries/0_stateless/02969_archive_seek.reference
new file mode 100644
index 00000000000..a6937569dc7
--- /dev/null
+++ b/tests/queries/0_stateless/02969_archive_seek.reference
@@ -0,0 +1 @@
+10551038310762432828
diff --git a/tests/queries/0_stateless/02969_archive_seek.sh b/tests/queries/0_stateless/02969_archive_seek.sh
new file mode 100755
index 00000000000..65507aa854a
--- /dev/null
+++ b/tests/queries/0_stateless/02969_archive_seek.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 sum(cityHash64(*)) from file('$CURDIR/data_parquet/02969.zip :: u.parquet') settings max_threads=4, max_read_buffer_size=1000"
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02969_auto_format_detection.reference b/tests/queries/0_stateless/02969_auto_format_detection.reference
new file mode 100644
index 00000000000..865db11defc
--- /dev/null
+++ b/tests/queries/0_stateless/02969_auto_format_detection.reference
@@ -0,0 +1,122 @@
+Parquet
+a	Nullable(UInt64)					
+b	Nullable(String)					
+c	Array(Nullable(UInt64))					
+d	Tuple(\n    a Nullable(UInt64),\n    b Nullable(String))					
+ORC
+a	Nullable(Int64)					
+b	Nullable(String)					
+c	Array(Nullable(Int64))					
+d	Tuple(\n    a Nullable(Int64),\n    b Nullable(String))					
+Arrow
+a	Nullable(UInt64)					
+b	Nullable(String)					
+c	Array(Nullable(UInt64))					
+d	Tuple(\n    a Nullable(UInt64),\n    b Nullable(String))					
+ArrowStream
+a	Nullable(UInt64)					
+b	Nullable(String)					
+c	Array(Nullable(UInt64))					
+d	Tuple(\n    a Nullable(UInt64),\n    b Nullable(String))					
+Avro
+a	Int64					
+b	String					
+c	Array(Int64)					
+d	Tuple(\n    a Int64,\n    b String)					
+Native
+a	UInt64					
+b	String					
+c	Array(UInt64)					
+d	Tuple(\n    a UInt64,\n    b String)					
+BSONEachRow
+a	Nullable(Int64)					
+b	Nullable(String)					
+c	Array(Nullable(Int64))					
+d	Tuple(\n    a Nullable(Int64),\n    b Nullable(String))					
+JSONCompact
+a	UInt64					
+b	String					
+c	Array(UInt64)					
+d	Tuple(\n    a UInt64,\n    b String)					
+Values
+c1	Nullable(UInt64)					
+c2	Nullable(String)					
+c3	Array(Nullable(UInt64))					
+c4	Tuple(Nullable(UInt64), Nullable(String))					
+TSKV
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(UInt64))					
+d	Nullable(String)					
+JSONObjectEachRow
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+JSONColumns
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+JSONCompactColumns
+c1	Nullable(String)					
+c2	Nullable(String)					
+c3	Array(Nullable(String))					
+c4	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+JSONCompact
+a	UInt64					
+b	String					
+c	Array(UInt64)					
+d	Tuple(\n    a UInt64,\n    b String)					
+JSON
+a	UInt64					
+b	String					
+c	Array(UInt64)					
+d	Tuple(\n    a UInt64,\n    b String)					
+TSV
+c1	Nullable(UInt64)					
+c2	Nullable(String)					
+c3	Array(Nullable(UInt64))					
+c4	Tuple(Nullable(UInt64), Nullable(String))					
+CSV
+c1	Nullable(UInt64)					
+c2	Nullable(String)					
+c3	Array(Nullable(UInt64))					
+c4	Tuple(Nullable(UInt64), Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	UInt64					
+b	String					
+c	Array(UInt64)					
+d	Tuple(\n    a UInt64,\n    b String)					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+1
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
+a	Nullable(String)					
+b	Nullable(String)					
+c	Array(Nullable(String))					
+d	Tuple(\n    a Nullable(String),\n    b Nullable(String))					
diff --git a/tests/queries/0_stateless/02969_auto_format_detection.sh b/tests/queries/0_stateless/02969_auto_format_detection.sh
new file mode 100755
index 00000000000..88d6575e499
--- /dev/null
+++ b/tests/queries/0_stateless/02969_auto_format_detection.sh
@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.data
+
+for format in Parquet ORC Arrow ArrowStream Avro Native BSONEachRow JSONCompact Values TSKV JSONObjectEachRow JSONColumns JSONCompactColumns JSONCompact JSON TSV CSV
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('a UInt64, b String, c Array(UInt64), d Tuple(a UInt64, b String)', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE')"
+done
+
+rm $DATA_FILE
+
+$CLICKHOUSE_LOCAL -q "select * from generateRandom('a UInt64, b String, c Array(UInt64), d Tuple(a UInt64, b String)', 42) limit 10 format JSONEachRow" > $DATA_FILE.jsonl
+$CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE*')"
+
+
+$CLICKHOUSE_LOCAL -q "select * from generateRandom('a UInt64, b String, c Array(UInt64), d Tuple(a UInt64, b String)', 42) limit 10 format JSONEachRow" > $DATA_FILE
+
+$CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE', auto, 'a UInt64, b String, c Array(UInt64), d Tuple(a UInt64, b String)')"
+
+$CLICKHOUSE_LOCAL -nmq "
+desc file('$DATA_FILE');
+desc file('$DATA_FILE');
+"
+
+$CLICKHOUSE_LOCAL -nmq "
+desc file('$DATA_FILE', JSONEachRow);
+desc file('$DATA_FILE');
+"
+
+touch $DATA_FILE.1
+$CLICKHOUSE_LOCAL -q "select * from generateRandom('a UInt64, b String, c Array(UInt64), d Tuple(a UInt64, b String)', 42) limit 10 format JSONEachRow" > $DATA_FILE.2
+$CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE.{1,2}')"
+$CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE.{1,2}') settings schema_inference_mode='union'" 2>&1 | grep -c "CANNOT_DETECT_FORMAT"
+
+$CLICKHOUSE_LOCAL -nmq "
+desc file('$DATA_FILE.2');
+desc file('$DATA_FILE.{1,2}');
+"
+
+rm $DATA_FILE*
diff --git a/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.reference b/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.reference
new file mode 100644
index 00000000000..433ef84b3bf
--- /dev/null
+++ b/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.reference
@@ -0,0 +1,4 @@
+10000
+0
+0
+0
diff --git a/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.sql b/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.sql
new file mode 100644
index 00000000000..361fd7c7a4e
--- /dev/null
+++ b/tests/queries/0_stateless/02969_functions_to_subcolumns_if_null.sql
@@ -0,0 +1,27 @@
+DROP TABLE IF EXISTS t_subcolumns_if;
+
+CREATE TABLE t_subcolumns_if (id Nullable(Int64)) ENGINE=MergeTree ORDER BY tuple();
+
+INSERT INTO t_subcolumns_if SELECT number::Nullable(Int64) as number FROM numbers(10000);
+
+SELECT
+    sum(multiIf(id IS NOT NULL, 1, 0))
+FROM t_subcolumns_if
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 1;
+
+SELECT
+    sum(multiIf(id IS NULL, 1, 0))
+FROM t_subcolumns_if
+SETTINGS allow_experimental_analyzer = 0, optimize_functions_to_subcolumns = 1;
+
+SELECT
+    sum(multiIf(id IS NULL, 1, 0))
+FROM t_subcolumns_if
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 0;
+
+SELECT
+    sum(multiIf(id IS NULL, 1, 0))
+FROM t_subcolumns_if
+SETTINGS allow_experimental_analyzer = 1, optimize_functions_to_subcolumns = 1;
+
+DROP TABLE IF EXISTS t_subcolumns_if;
diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
new file mode 100644
index 00000000000..5555c918500
--- /dev/null
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.reference
@@ -0,0 +1,28 @@
+-- Uppercase tests
+Binary(N)	foo	FixedString(3)
+Char	44	String
+Date	2021-02-03	Date
+DateTime	2021-02-03 12:01:02	DateTime
+Decimal	45	Decimal(10, 0)
+Decimal(M)	46	Decimal(4, 0)
+Decimal(M, D)	47.21	Decimal(4, 2)
+Double	48.11	Float64
+JSON	{"foo":"bar"}	Object(\'json\')
+Real	49.22	Float32
+Signed	50	Int64
+Unsigned	52	UInt64
+Year	2007	UInt16
+-- Lowercase tests
+Binary(N)	foo	FixedString(3)
+Char	44	String
+Date	2021-02-03	Date
+DateTime	2021-02-03 12:01:02	DateTime
+Decimal	45	Decimal(10, 0)
+Decimal(M)	46	Decimal(4, 0)
+Decimal(M, D)	47.21	Decimal(4, 2)
+Double	48.11	Float64
+JSON	{"foo":"bar"}	Object(\'json\')
+Real	49.22	Float32
+Signed	50	Int64
+Unsigned	52	UInt64
+Year	2007	UInt16
diff --git a/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
new file mode 100644
index 00000000000..7b5735cdebc
--- /dev/null
+++ b/tests/queries/0_stateless/02969_mysql_cast_type_aliases.sql
@@ -0,0 +1,46 @@
+-- See https://dev.mysql.com/doc/refman/8.0/en/cast-functions.html#function_cast
+-- Tests are in order of the type appearance in the docs
+
+SET allow_experimental_object_type = 1;
+
+SELECT '-- Uppercase tests';
+-- Not supported as it is translated to FixedString without arguments
+-- SELECT 'Binary' AS mysql_type, CAST('' AS BINARY) AS result, toTypeName(result) AS native_type;
+SELECT 'Binary(N)' AS mysql_type, CAST('foo' AS BINARY(3)) AS result, toTypeName(result) AS native_type;
+SELECT 'Char' AS mysql_type, CAST(44 AS CHAR) AS result, toTypeName(result) AS native_type;
+SELECT 'Date' AS mysql_type, CAST('2021-02-03' AS DATE) AS result, toTypeName(result) AS native_type;
+SELECT 'DateTime' AS mysql_type, CAST('2021-02-03 12:01:02' AS DATETIME) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal' AS mysql_type, CAST(45.1 AS DECIMAL) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal(M)' AS mysql_type, CAST(46.2 AS DECIMAL(4)) AS result, toTypeName(result) AS native_type;
+SELECT 'Decimal(M, D)' AS mysql_type, CAST(47.21 AS DECIMAL(4, 2)) AS result, toTypeName(result) AS native_type;
+SELECT 'Double' AS mysql_type, CAST(48.11 AS DOUBLE) AS result, toTypeName(result) AS native_type;
+SELECT 'JSON' AS mysql_type, CAST('{\"foo\":\"bar\"}' AS JSON) AS result, toTypeName(result) AS native_type;
+SELECT 'Real' AS mysql_type, CAST(49.22 AS REAL) AS result, toTypeName(result) AS native_type;
+SELECT 'Signed' AS mysql_type, CAST(50 AS SIGNED) AS result, toTypeName(result) AS native_type;
+SELECT 'Unsigned' AS mysql_type, CAST(52 AS UNSIGNED) AS result, toTypeName(result) AS native_type;
+-- Could be added as an alias, but SIGNED INTEGER in CAST context means UInt64, 
+-- while INTEGER SIGNED as a column definition means UInt32.
+-- SELECT 'Signed integer' AS mysql_type, CAST(51 AS SIGNED INTEGER) AS result, toTypeName(result) AS native_type;
+-- SELECT 'Unsigned integer' AS mysql_type, CAST(53 AS UNSIGNED INTEGER) AS result, toTypeName(result) AS native_type;
+SELECT 'Year' AS mysql_type, CAST(2007 AS YEAR) AS result, toTypeName(result) AS native_type;
+-- Currently, expects UInt64 as an argument
+-- SELECT 'Time' AS mysql_type, CAST('12:45' AS TIME) AS result, toTypeName(result) AS native_type;
+
+SELECT '-- Lowercase tests';
+-- select 'Binary' as mysql_type, cast('' as binary) as result, toTypeName(result) as native_type;
+select 'Binary(N)' as mysql_type, cast('foo' as binary(3)) as result, toTypeName(result) as native_type;
+select 'Char' as mysql_type, cast(44 as char) as result, toTypeName(result) as native_type;
+select 'Date' as mysql_type, cast('2021-02-03' as date) as result, toTypeName(result) as native_type;
+select 'DateTime' as mysql_type, cast('2021-02-03 12:01:02' as datetime) as result, toTypeName(result) as native_type;
+select 'Decimal' as mysql_type, cast(45.1 as decimal) as result, toTypeName(result) as native_type;
+select 'Decimal(M)' as mysql_type, cast(46.2 as decimal(4)) as result, toTypeName(result) as native_type;
+select 'Decimal(M, D)' as mysql_type, cast(47.21 as decimal(4, 2)) as result, toTypeName(result) as native_type;
+select 'Double' as mysql_type, cast(48.11 as double) as result, toTypeName(result) as native_type;
+select 'JSON' as mysql_type, cast('{\"foo\":\"bar\"}' as json) as result, toTypeName(result) as native_type;
+select 'Real' as mysql_type, cast(49.22 as real) as result, toTypeName(result) as native_type;
+select 'Signed' as mysql_type, cast(50 as signed) as result, toTypeName(result) as native_type;
+select 'Unsigned' as mysql_type, cast(52 as unsigned) as result, toTypeName(result) as native_type;
+-- select 'Signed integer' as mysql_type, cast(51 as signed integer) as result, toTypeName(result) as native_type;
+-- select 'Unsigned integer' as mysql_type, cast(53 as unsigned integer) as result, toTypeName(result) as native_type;
+select 'Year' as mysql_type, cast(2007 as year) as result, toTypeName(result) as native_type;
+-- select 'Time' as mysql_type, cast('12:45' as time) as result, toTypeName(result) as native_type;
diff --git a/tests/queries/0_stateless/02970_generate_series.reference b/tests/queries/0_stateless/02970_generate_series.reference
new file mode 100644
index 00000000000..6e6f3c81587
--- /dev/null
+++ b/tests/queries/0_stateless/02970_generate_series.reference
@@ -0,0 +1,28 @@
+0
+1
+4
+8
+501
+50
+17928
+0
+10
+13
+16
+19
+7
+17
+27
+37
+47
+57
+67
+77
+17
+22
+27
+32
+37
+42
+47
+52
diff --git a/tests/queries/0_stateless/02970_generate_series.sql b/tests/queries/0_stateless/02970_generate_series.sql
new file mode 100644
index 00000000000..0844714b3a6
--- /dev/null
+++ b/tests/queries/0_stateless/02970_generate_series.sql
@@ -0,0 +1,14 @@
+SELECT count() FROM generate_series(5, 4);
+SELECT count() FROM generate_series(0, 0);
+SELECT count() FROM generate_series(10, 20, 3);
+SELECT count() FROM generate_series(7, 77, 10);
+SELECT count() FROM generate_series(0, 1000, 2);
+SELECT count() FROM generate_series(0, 999, 20);
+SELECT sum(generate_series) FROM generate_series(4, 1008, 4) WHERE generate_series % 7 = 1;
+
+SELECT * FROM generate_series(5, 4);
+SELECT * FROM generate_series(0, 0);
+SELECT * FROM generate_series(10, 20, 3);
+SELECT * FROM generate_series(7, 77, 10);
+SELECT * FROM generate_series(7, 52, 5) WHERE generate_series >= 13;
+
diff --git a/tests/queries/0_stateless/02970_visible_width_behavior.reference b/tests/queries/0_stateless/02970_visible_width_behavior.reference
new file mode 100644
index 00000000000..006be015ed7
--- /dev/null
+++ b/tests/queries/0_stateless/02970_visible_width_behavior.reference
@@ -0,0 +1,5 @@
+28
+19
+28
+19
+28
diff --git a/tests/queries/0_stateless/02970_visible_width_behavior.sql b/tests/queries/0_stateless/02970_visible_width_behavior.sql
new file mode 100644
index 00000000000..efaa8852c34
--- /dev/null
+++ b/tests/queries/0_stateless/02970_visible_width_behavior.sql
@@ -0,0 +1,6 @@
+SELECT visibleWidth('ClickHouse是一个很好的数�库');
+SELECT visibleWidth('ClickHouse是一个很好的数�库') SETTINGS function_visible_width_behavior = 0;
+SELECT visibleWidth('ClickHouse是一个很好的数�库') SETTINGS function_visible_width_behavior = 1;
+SELECT visibleWidth('ClickHouse是一个很好的数�库') SETTINGS function_visible_width_behavior = 2; -- { serverError BAD_ARGUMENTS }
+SELECT visibleWidth('ClickHouse是一个很好的数�库') SETTINGS compatibility = '23.12';
+SELECT visibleWidth('ClickHouse是一个很好的数�库') SETTINGS compatibility = '24.1';
diff --git a/tests/queries/0_stateless/02971_analyzer_remote_id.reference b/tests/queries/0_stateless/02971_analyzer_remote_id.reference
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/tests/queries/0_stateless/02971_analyzer_remote_id.reference
@@ -0,0 +1 @@
+4
diff --git a/tests/queries/0_stateless/02971_analyzer_remote_id.sh b/tests/queries/0_stateless/02971_analyzer_remote_id.sh
new file mode 100755
index 00000000000..463e4cc1f0c
--- /dev/null
+++ b/tests/queries/0_stateless/02971_analyzer_remote_id.sh
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Tags: no-parallel
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS test_02971"
+${CLICKHOUSE_CLIENT} --query="CREATE DATABASE test_02971"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE test_02971.x ENGINE = MergeTree() ORDER BY number AS SELECT * FROM numbers(2)"
+${CLICKHOUSE_LOCAL} --query="SELECT count() FROM remote('127.0.0.{2,3}', 'test_02971.x') SETTINGS allow_experimental_analyzer = 1" 2>&1 \
+        | grep -av "ASan doesn't fully support makecontext/swapcontext functions"
+
+${CLICKHOUSE_CLIENT} --query="DROP DATABASE IF EXISTS test_02971"
diff --git a/tests/queries/0_stateless/02971_limit_by_distributed.reference b/tests/queries/0_stateless/02971_limit_by_distributed.reference
new file mode 100644
index 00000000000..69c6437d04d
--- /dev/null
+++ b/tests/queries/0_stateless/02971_limit_by_distributed.reference
@@ -0,0 +1,16 @@
+-- { echoOn }
+-- with limit
+SELECT k
+FROM remote('127.0.0.{2,3}', currentDatabase(), tlb)
+ORDER BY k ASC
+LIMIT 1 BY k
+LIMIT 100;
+0
+1
+-- w/o limit
+SELECT k
+FROM remote('127.0.0.{2,3}', currentDatabase(), tlb)
+ORDER BY k ASC
+LIMIT 1 BY k;
+0
+1
diff --git a/tests/queries/0_stateless/02971_limit_by_distributed.sql b/tests/queries/0_stateless/02971_limit_by_distributed.sql
new file mode 100644
index 00000000000..66a85137f32
--- /dev/null
+++ b/tests/queries/0_stateless/02971_limit_by_distributed.sql
@@ -0,0 +1,25 @@
+-- Tags: shard
+
+drop table if exists tlb;
+create table tlb (k UInt64) engine MergeTree order by k;
+
+INSERT INTO tlb (k) SELECT 0 FROM numbers(100);
+INSERT INTO tlb (k) SELECT 1;
+
+-- { echoOn }
+-- with limit
+SELECT k
+FROM remote('127.0.0.{2,3}', currentDatabase(), tlb)
+ORDER BY k ASC
+LIMIT 1 BY k
+LIMIT 100;
+
+-- w/o limit
+SELECT k
+FROM remote('127.0.0.{2,3}', currentDatabase(), tlb)
+ORDER BY k ASC
+LIMIT 1 BY k;
+
+-- { echoOff }
+
+DROP TABLE tlb;
diff --git a/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.reference b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.reference
new file mode 100644
index 00000000000..71c9053d644
--- /dev/null
+++ b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.reference
@@ -0,0 +1,9 @@
+0
+ds_1_1	all_1_1_0	0
+ds_1_2	all_1_1_0	0
+ds_2_1	all_1_1_0	0
+ds_2_1	all_2_2_0	0
+ds_3_1	all_1_1_0	0
+ds_3_1	all_2_2_0	0
+landing	all_1_1_0	0
+10
diff --git a/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.sql b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.sql
new file mode 100644
index 00000000000..242133e9122
--- /dev/null
+++ b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts.sql
@@ -0,0 +1,103 @@
+SET insert_deduplicate = 1;
+SET deduplicate_blocks_in_dependent_materialized_views = 1;
+SET update_insert_deduplication_token_in_dependent_materialized_views = 1;
+SET insert_deduplication_token = 'test';
+
+DROP TABLE IF EXISTS landing;
+CREATE TABLE landing
+(
+    timestamp UInt64,
+    value UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP TABLE IF EXISTS ds_1_1;
+CREATE TABLE ds_1_1
+(
+    t UInt64,
+    v UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP VIEW IF EXISTS mv_1_1;
+CREATE MATERIALIZED VIEW mv_1_1 TO ds_1_1 as
+SELECT
+    timestamp t, sum(value) v
+FROM landing
+GROUP BY t;
+
+DROP TABLE IF EXISTS ds_1_2;
+CREATE TABLE ds_1_2
+(
+    t UInt64,
+    v UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP VIEW IF EXISTS mv_1_2;
+CREATE MATERIALIZED VIEW mv_1_2 TO ds_1_2 as
+SELECT
+    timestamp t, sum(value) v
+FROM landing
+GROUP BY t;
+
+DROP TABLE IF EXISTS ds_2_1;
+CREATE TABLE ds_2_1
+(
+    l String,
+    t DateTime,
+    v UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP VIEW IF EXISTS mv_2_1;
+CREATE MATERIALIZED VIEW mv_2_1 TO ds_2_1 as
+SELECT '2_1' l, t, v
+FROM ds_1_1;
+
+DROP VIEW IF EXISTS mv_2_2;
+CREATE MATERIALIZED VIEW mv_2_2 TO ds_2_1 as
+SELECT '2_2' l, t, v
+FROM ds_1_2;
+
+DROP TABLE IF EXISTS ds_3_1;
+CREATE TABLE ds_3_1
+(
+    l String,
+    t DateTime,
+    v UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP VIEW IF EXISTS mv_3_1;
+CREATE MATERIALIZED VIEW mv_3_1 TO ds_3_1 as
+SELECT '3_1' l, t, v
+FROM ds_2_1;
+
+INSERT INTO landing SELECT 1 as timestamp, 1 AS value FROM numbers(10);
+
+SELECT sleep(3);
+
+INSERT INTO landing SELECT 1 as timestamp, 1 AS value FROM numbers(10);
+
+SYSTEM FLUSH LOGS;
+SELECT table, name, error FROM system.part_log
+WHERE database = currentDatabase()
+ORDER BY table, name;
+
+SELECT count() FROM landing;
+
+DROP TABLE landing;
+
+DROP TABLE ds_1_1;
+DROP VIEW mv_1_1;
+
+DROP TABLE ds_1_2;
+DROP VIEW mv_1_2;
+
+DROP TABLE ds_2_1;
+DROP VIEW mv_2_1;
+DROP VIEW mv_2_2;
+
+DROP TABLE ds_3_1;
+DROP VIEW mv_3_1;
diff --git a/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.reference b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.reference
new file mode 100644
index 00000000000..e1bcc64aaeb
--- /dev/null
+++ b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.reference
@@ -0,0 +1,5 @@
+0
+ds_1_1	all_1_1_0	0
+ds_1_1	all_2_2_0	0
+landing	all_1_1_0	0
+10
diff --git a/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.sql b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.sql
new file mode 100644
index 00000000000..d82ff4afd93
--- /dev/null
+++ b/tests/queries/0_stateless/02972_insert_deduplication_token_hierarchical_inserts_views.sql
@@ -0,0 +1,53 @@
+SET insert_deduplicate = 1;
+SET deduplicate_blocks_in_dependent_materialized_views = 1;
+SET update_insert_deduplication_token_in_dependent_materialized_views = 1;
+SET insert_deduplication_token = 'test';
+
+DROP TABLE IF EXISTS landing;
+CREATE TABLE landing
+(
+    timestamp UInt64,
+    value UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP TABLE IF EXISTS ds_1_1;
+CREATE TABLE ds_1_1
+(
+    t UInt64,
+    v UInt64
+)
+ENGINE = MergeTree ORDER BY tuple() SETTINGS non_replicated_deduplication_window = 1000;
+
+DROP VIEW IF EXISTS mv_1_1;
+CREATE MATERIALIZED VIEW mv_1_1 TO ds_1_1 as
+SELECT
+    timestamp t, sum(value) v
+FROM landing
+GROUP BY t;
+
+DROP VIEW IF EXISTS mv_1_2;
+CREATE MATERIALIZED VIEW mv_1_2 TO ds_1_1 as
+SELECT
+    timestamp t, sum(value) v
+FROM landing
+GROUP BY t;
+
+INSERT INTO landing SELECT 1 as timestamp, 1 AS value FROM numbers(10);
+
+SELECT sleep(3);
+
+INSERT INTO landing SELECT 1 as timestamp, 1 AS value FROM numbers(10);
+
+SYSTEM FLUSH LOGS;
+SELECT table, name, error FROM system.part_log
+WHERE database = currentDatabase()
+ORDER BY table, name;
+
+SELECT count() FROM landing;
+
+DROP TABLE landing;
+
+DROP TABLE ds_1_1;
+DROP VIEW mv_1_1;
+DROP VIEW mv_1_2;
diff --git a/tests/queries/0_stateless/02972_parallel_replicas_cte.reference b/tests/queries/0_stateless/02972_parallel_replicas_cte.reference
new file mode 100644
index 00000000000..bbb5a960463
--- /dev/null
+++ b/tests/queries/0_stateless/02972_parallel_replicas_cte.reference
@@ -0,0 +1,6 @@
+990000
+990000
+10
+990000
+1
+1000000
diff --git a/tests/queries/0_stateless/02972_parallel_replicas_cte.sql b/tests/queries/0_stateless/02972_parallel_replicas_cte.sql
new file mode 100644
index 00000000000..c9ab83ff9ad
--- /dev/null
+++ b/tests/queries/0_stateless/02972_parallel_replicas_cte.sql
@@ -0,0 +1,81 @@
+DROP TABLE IF EXISTS pr_1;
+DROP TABLE IF EXISTS pr_2;
+DROP TABLE IF EXISTS numbers_1e6;
+
+CREATE TABLE pr_1 (`a` UInt32) ENGINE = MergeTree ORDER BY a PARTITION BY a % 10 AS
+SELECT 10 * intDiv(number, 10) + 1 FROM numbers(1_000_000);
+
+CREATE TABLE pr_2 (`a` UInt32) ENGINE = MergeTree ORDER BY a AS
+SELECT * FROM numbers(1_000_000);
+
+WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a;
+
+WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
+
+-- Testing that it is disabled for allow_experimental_analyzer=0. With analyzer it will be supported (with correct result)
+WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
+SETTINGS allow_experimental_analyzer = 0, allow_experimental_parallel_reading_from_replicas = 2, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3; -- { serverError SUPPORT_IS_DISABLED }
+
+-- Disabled for any value of allow_experimental_parallel_reading_from_replicas != 1, not just 2
+WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
+SETTINGS allow_experimental_analyzer = 0, allow_experimental_parallel_reading_from_replicas = 512, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3; -- { serverError SUPPORT_IS_DISABLED }
+
+-- Sanitizer
+SELECT count() FROM pr_2 JOIN numbers(10) as pr_1 ON pr_2.a = pr_1.number
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
+
+-- Parallel replicas detection should work inside subqueries
+SELECT *
+FROM
+(
+    WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+    SELECT count() FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
+)
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
+
+-- Subquery + subquery
+SELECT count()
+FROM
+(
+    SELECT c + 1
+    FROM
+    (
+        WITH filtered_groups AS (SELECT a FROM pr_1 WHERE a >= 10000)
+        SELECT count() as c FROM pr_2 INNER JOIN filtered_groups ON pr_2.a = filtered_groups.a
+    )
+)
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
+
+CREATE TABLE numbers_1e6
+(
+    `n` UInt64
+)
+ENGINE = MergeTree
+ORDER BY n
+AS SELECT * FROM numbers(1_000_000);
+
+-- Same but nested CTE's
+WITH
+    cte1 AS
+    (
+        SELECT n
+        FROM numbers_1e6
+    ),
+    cte2 AS
+    (
+        SELECT n
+        FROM numbers_1e6
+        WHERE n IN (cte1)
+    )
+SELECT count()
+FROM cte2
+SETTINGS allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3;
+
+DROP TABLE IF EXISTS numbers_1e6;
+DROP TABLE IF EXISTS pr_1;
+DROP TABLE IF EXISTS pr_2;
diff --git a/tests/queries/0_stateless/02972_to_string_nullable_timezone.reference b/tests/queries/0_stateless/02972_to_string_nullable_timezone.reference
new file mode 100644
index 00000000000..6c362c0207e
--- /dev/null
+++ b/tests/queries/0_stateless/02972_to_string_nullable_timezone.reference
@@ -0,0 +1,3 @@
+2022-01-01 11:13:14
+2022-01-01 11:13:14
+2022-01-01 11:13:14
diff --git a/tests/queries/0_stateless/02972_to_string_nullable_timezone.sql b/tests/queries/0_stateless/02972_to_string_nullable_timezone.sql
new file mode 100644
index 00000000000..d8cff4f3c00
--- /dev/null
+++ b/tests/queries/0_stateless/02972_to_string_nullable_timezone.sql
@@ -0,0 +1,4 @@
+SET session_timezone='Europe/Amsterdam';
+SELECT toString(toDateTime('2022-01-01 12:13:14'), CAST('UTC', 'Nullable(String)'));
+SELECT toString(toDateTime('2022-01-01 12:13:14'), materialize(CAST('UTC', 'Nullable(String)')));
+SELECT toString(CAST(toDateTime('2022-01-01 12:13:14'), 'Nullable(DateTime)'), materialize(CAST('UTC', 'Nullable(String)')));
diff --git a/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.reference b/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.reference
new file mode 100644
index 00000000000..d53d7235814
--- /dev/null
+++ b/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.reference
@@ -0,0 +1,14 @@
+--
+3
+--
+3
+--
+0
+--
+\N	\N
+--
+	a
+a	a
+--
+a	a
+\N	\N
diff --git a/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.sql b/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.sql
new file mode 100644
index 00000000000..5d1afa2a274
--- /dev/null
+++ b/tests/queries/0_stateless/02973_analyzer_join_use_nulls_column_not_found.sql
@@ -0,0 +1,81 @@
+SET join_use_nulls = 1;
+
+SELECT '--';
+
+select c FROM (
+    select
+        d2.c
+    from ( select 1 as a, 2 as b ) d1
+    FULL join ( select 1 as a, 3 as c ) d2
+        on (d1.a = d2.a)
+)
+;
+
+SELECT '--';
+
+with d1 as (
+    select
+        1 as a,
+        2 as b
+),
+d2 as (
+    select
+        1 as a,
+        3 as c
+),
+joined as (
+    select
+        d1.*,
+        d2.c
+    from d1
+    inner join d2
+        on (d1.a = d2.a)
+)
+select c
+from joined;
+
+SELECT '--';
+
+WITH
+    a AS ( SELECT 0 AS key, 'a' AS acol ),
+    b AS ( SELECT 2 AS key )
+SELECT a.key
+FROM b
+LEFT JOIN a ON 1
+LEFT JOIN a AS a1 ON 1
+;
+
+SELECT '--';
+
+WITH
+    a AS ( SELECT 0 AS key, 'a' AS acol ),
+    b AS ( SELECT 2 AS key )
+SELECT a.acol, a1.acol
+FROM b
+LEFT JOIN a ON a.key = b.key
+LEFT JOIN a AS a1 ON a1.key = a.key
+;
+SELECT '--';
+
+WITH
+    a AS ( SELECT 0 AS key, 'a' AS acol ),
+    b AS ( SELECT 2 AS key )
+SELECT a.acol, a1.acol
+FROM b
+FULL JOIN a ON a.key = b.key
+FULL JOIN a AS a1 ON a1.key = a.key
+ORDER BY 1
+SETTINGS join_use_nulls = 0
+;
+
+SELECT '--';
+
+WITH
+    a AS ( SELECT 0 AS key, 'a' AS acol ),
+    b AS ( SELECT 2 AS key )
+SELECT a.acol, a1.acol
+FROM b
+FULL JOIN a ON a.key = b.key
+FULL JOIN a AS a1 ON a1.key = a.key
+ORDER BY 1
+;
diff --git a/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.reference b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.reference
new file mode 100644
index 00000000000..00479541d22
--- /dev/null
+++ b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.reference
@@ -0,0 +1,2 @@
+0
+1000000	Hello, world	Hello, world
diff --git a/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
new file mode 100755
index 00000000000..b212e42061f
--- /dev/null
+++ b/tests/queries/0_stateless/02973_backup_of_in_memory_compressed.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+# Tags: no-parallel, no-fasttest
+# Because we are creating a backup with fixed path.
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --multiquery "
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (x String) ENGINE = Memory SETTINGS compress = 1;
+INSERT INTO test SELECT 'Hello, world' FROM numbers(1000000);
+"
+
+$CLICKHOUSE_CLIENT --multiquery "
+BACKUP TABLE test TO File('test.zip');
+" --format Null
+
+$CLICKHOUSE_CLIENT --multiquery "
+TRUNCATE TABLE test;
+SELECT count() FROM test;
+"
+
+$CLICKHOUSE_CLIENT --multiquery "
+RESTORE TABLE test FROM File('test.zip');
+" --format Null
+
+$CLICKHOUSE_CLIENT --multiquery "
+SELECT count(), min(x), max(x) FROM test;
+DROP TABLE test;
+"
diff --git a/tests/queries/0_stateless/02973_block_number_sparse_serialization_and_mutation.reference b/tests/queries/0_stateless/02973_block_number_sparse_serialization_and_mutation.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02973_block_number_sparse_serialization_and_mutation.sql b/tests/queries/0_stateless/02973_block_number_sparse_serialization_and_mutation.sql
new file mode 100644
index 00000000000..7a1de2897fb
--- /dev/null
+++ b/tests/queries/0_stateless/02973_block_number_sparse_serialization_and_mutation.sql
@@ -0,0 +1,39 @@
+-- Tags: zookeeper
+
+-- we need exact block-numbers
+SET insert_keeper_fault_injection_probability=0;
+
+DROP TABLE IF EXISTS table_with_some_columns;
+
+CREATE TABLE table_with_some_columns(
+    key UInt64,
+    value0 UInt8
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/table_with_some_columns', '1')
+ORDER BY key
+SETTINGS allow_experimental_block_number_column=1,
+ratio_of_defaults_for_sparse_serialization=0.0001,
+min_bytes_for_wide_part = 0,
+replace_long_file_name_to_hash=0; -- simpler to debug
+
+INSERT INTO table_with_some_columns SELECT rand(), number + 10 from numbers(100000);
+
+INSERT INTO table_with_some_columns SELECT rand(), number + 10 from numbers(1);
+
+OPTIMIZE TABLE table_with_some_columns FINAL;
+
+INSERT INTO table_with_some_columns SELECT rand(), number+222222222 from numbers(1);
+
+OPTIMIZE TABLE table_with_some_columns FINAL;
+
+set alter_sync = 2;
+
+ALTER TABLE table_with_some_columns DROP COLUMN value0;
+
+INSERT INTO table_with_some_columns SELECT rand() from numbers(1);
+
+OPTIMIZE TABLE table_with_some_columns FINAL;
+
+SELECT *, _block_number FROM table_with_some_columns where not ignore(*) Format Null;
+
+DROP TABLE IF EXISTS table_with_some_columns;
diff --git a/tests/queries/0_stateless/02973_dictionary_table_exception_fix.reference b/tests/queries/0_stateless/02973_dictionary_table_exception_fix.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02973_dictionary_table_exception_fix.sql b/tests/queries/0_stateless/02973_dictionary_table_exception_fix.sql
new file mode 100644
index 00000000000..f8061b42670
--- /dev/null
+++ b/tests/queries/0_stateless/02973_dictionary_table_exception_fix.sql
@@ -0,0 +1,6 @@
+CREATE TABLE test_table (i Int64) engine=MergeTree order by i;
+CREATE DICTIONARY test_dict (y String, value UInt64 DEFAULT 0) PRIMARY KEY y SOURCE(CLICKHOUSE(TABLE 'test_table')) LAYOUT(DIRECT());
+CREATE TABLE test_dict (y Int64) engine=MergeTree order by y; -- { serverError DICTIONARY_ALREADY_EXISTS }
+CREATE DICTIONARY test_table (y String, value UInt64 DEFAULT 0) PRIMARY KEY y SOURCE(CLICKHOUSE(TABLE 'test_table')) LAYOUT(DIRECT()); -- { serverError TABLE_ALREADY_EXISTS }
+CREATE DICTIONARY test_dict (y String, value UInt64 DEFAULT 0) PRIMARY KEY y SOURCE(CLICKHOUSE(TABLE 'test_table')) LAYOUT(DIRECT()); -- { serverError DICTIONARY_ALREADY_EXISTS }
+CREATE TABLE test_table (y Int64) engine=MergeTree order by y; -- { serverError TABLE_ALREADY_EXISTS }
diff --git a/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.reference b/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.sh b/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.sh
new file mode 100755
index 00000000000..a4984583637
--- /dev/null
+++ b/tests/queries/0_stateless/02973_s3_compressed_file_in_error_message.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_CLIENT --allow_repeated_settings --send_logs_level=none -q "select * from s3('http://localhost:11111/test/a.tsv', TSV, 'x String', 'gzip')" 2>&1 | grep -c "(in file/uri.*a\.tsv)"
diff --git a/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.reference b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.reference
new file mode 100644
index 00000000000..827c710ef1a
--- /dev/null
+++ b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.reference
@@ -0,0 +1,16 @@
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
+('a',(1,2))	1
+('b',(2,3))	2
diff --git a/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql
new file mode 100644
index 00000000000..14823644b96
--- /dev/null
+++ b/tests/queries/0_stateless/02974_analyzer_array_join_subcolumn.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
+
+CREATE TABLE t2 (id Int32, pe Map(String, Tuple(a UInt64, b UInt64))) ENGINE = MergeTree ORDER BY id;
+INSERT INTO t2 VALUES (1, {'a': (1, 2), 'b': (2, 3)}),
+
+CREATE TABLE t3 (id Int32, c Tuple(v String, pe Map(String, Tuple(a UInt64, b UInt64)))) ENGINE = MergeTree ORDER BY id;
+INSERT INTO t3 VALUES (1, ('A', {'a':(1, 2),'b':(2, 3)}));
+
+SELECT pe, pe.values.a FROM (SELECT * FROM t2) ARRAY JOIN pe SETTINGS allow_experimental_analyzer = 1;
+SELECT p, p.values.a FROM (SELECT * FROM t2) ARRAY JOIN pe AS p SETTINGS allow_experimental_analyzer = 1;
+
+SELECT pe, pe.values.a FROM t2 ARRAY JOIN pe;
+SELECT p, p.values.a FROM t2 ARRAY JOIN pe AS p;
+
+SELECT c.pe, c.pe.values.a FROM (SELECT * FROM t3) ARRAY JOIN c.pe SETTINGS allow_experimental_analyzer = 1;
+SELECT p, p.values.a FROM (SELECT * FROM t3) ARRAY JOIN c.pe as p SETTINGS allow_experimental_analyzer = 1;
+
+SELECT c.pe, c.pe.values.a FROM t3 ARRAY JOIN c.pe SETTINGS allow_experimental_analyzer = 1;
+SELECT p, p.values.a FROM t3 ARRAY JOIN c.pe as p;
+
+
+DROP TABLE IF EXISTS t2;
+DROP TABLE IF EXISTS t3;
diff --git a/tests/queries/0_stateless/02974_backup_query_format_null.reference b/tests/queries/0_stateless/02974_backup_query_format_null.reference
new file mode 100644
index 00000000000..67bfe658c1f
--- /dev/null
+++ b/tests/queries/0_stateless/02974_backup_query_format_null.reference
@@ -0,0 +1,3 @@
+2
+80
+-12345
diff --git a/tests/queries/0_stateless/02974_backup_query_format_null.sh b/tests/queries/0_stateless/02974_backup_query_format_null.sh
new file mode 100755
index 00000000000..ddba2f6de16
--- /dev/null
+++ b/tests/queries/0_stateless/02974_backup_query_format_null.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} -nm --query "
+DROP TABLE IF EXISTS tbl;
+CREATE TABLE tbl (a Int32) ENGINE = MergeTree() ORDER BY tuple();
+INSERT INTO tbl VALUES (2), (80), (-12345);
+"
+
+backup_name="Disk('backups', '${CLICKHOUSE_TEST_UNIQUE_NAME}')"
+
+${CLICKHOUSE_CLIENT} --query "BACKUP TABLE tbl TO ${backup_name} FORMAT Null"
+
+${CLICKHOUSE_CLIENT} -nm --query "
+DROP TABLE tbl;
+RESTORE ALL FROM ${backup_name} FORMAT Null
+"
+
+${CLICKHOUSE_CLIENT} --query "SELECT * FROM tbl"
diff --git a/tests/queries/0_stateless/02974_if_with_map.reference b/tests/queries/0_stateless/02974_if_with_map.reference
new file mode 100644
index 00000000000..a4ebf6a9700
--- /dev/null
+++ b/tests/queries/0_stateless/02974_if_with_map.reference
@@ -0,0 +1,40 @@
+{1:2,3:4}
+{3:4,5:6}
+{1:2,3:4}
+{3:4,5:6}
+{3:4,5:6}
+{1:2,3:4}
+{3:4,5:6}
+{1:2,3:4}
+{1:2,3:4}
+{3:4}
+{1:2,3:4}
+{3:4}
+{3:4,5:6}
+{1:2}
+{3:4,5:6}
+{1:2}
+{1:2,3:4}
+{1:2,3:4}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{1:2,3:4}
+{1:2,3:4}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{3:4,5:6}
+{1:2,3:4}
+{1:2,3:4}
+{1:2,3:4}
+{1:2,3:4}
+{3:4,5:6}
+{3:4,5:6}
+{1:2,3:4}
+{1:2,3:4}
+{1:2,3:4}
+{1:2,3:4}
diff --git a/tests/queries/0_stateless/02974_if_with_map.sql b/tests/queries/0_stateless/02974_if_with_map.sql
new file mode 100644
index 00000000000..2387cffd4bf
--- /dev/null
+++ b/tests/queries/0_stateless/02974_if_with_map.sql
@@ -0,0 +1,20 @@
+select if(number % 2 = 0, map(1,2,3,4), map(3,4,5,6)) from numbers(2);
+select if(number % 2 = 0, materialize(map(1,2,3,4)), map(3,4,5,6)) from numbers(2);
+select if(number % 2 = 0, map(3,4,5,6), materialize(map(1,2,3,4))) from numbers(2);
+select if(number % 2 = 0, materialize(map(3,4,5,6)), materialize(map(1,2,3,4))) from numbers(2);
+select if(number % 2 = 0, map(1,2,3,4), map(3,4)) from numbers(2);
+select if(number % 2 = 0, materialize(map(1,2,3,4)), map(3,4)) from numbers(2);
+select if(number % 2 = 0, map(3,4,5,6), materialize(map(1,2))) from numbers(2);
+select if(number % 2 = 0, materialize(map(3,4,5,6)), materialize(map(1,2))) from numbers(2);
+select if(1, map(1,2,3,4), map(3,4,5,6)) from numbers(2);
+select if(0, map(1,2,3,4), map(3,4,5,6)) from numbers(2);
+select if(null, map(1,2,3,4), map(3,4,5,6)) from numbers(2);
+select if(1, materialize(map(1,2,3,4)), map(3,4,5,6)) from numbers(2);
+select if(0, materialize(map(1,2,3,4)), map(3,4,5,6)) from numbers(2);
+select if(null, materialize(map(1,2,3,4)), map(3,4,5,6)) from numbers(2);
+select if(1, map(3,4,5,6), materialize(map(1,2,3,4))) from numbers(2);
+select if(0, map(3,4,5,6), materialize(map(1,2,3,4))) from numbers(2);
+select if(null, map(3,4,5,6), materialize(map(1,2,3,4))) from numbers(2);
+select if(1, materialize(map(3,4,5,6)), materialize(map(1,2,3,4))) from numbers(2);
+select if(0, materialize(map(3,4,5,6)), materialize(map(1,2,3,4))) from numbers(2);
+select if(null, materialize(map(3,4,5,6)), materialize(map(1,2,3,4))) from numbers(2);
diff --git a/tests/queries/0_stateless/02975_intdiv_with_decimal.reference b/tests/queries/0_stateless/02975_intdiv_with_decimal.reference
new file mode 100644
index 00000000000..5540734ae4c
--- /dev/null
+++ b/tests/queries/0_stateless/02975_intdiv_with_decimal.reference
@@ -0,0 +1,68 @@
+2
+2
+1
+2
+2
+2
+2
+2
+2
+2
+2
+1
+2
+1
+2
+1
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+1
+1
+1
+1
+2
+2
+2
+2
+2
+2
+1
+2
+2
+2
+2
+2
+2
+2
+2
+1
+2
+1
+2
+1
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
+1
+1
+1
+1
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/02975_intdiv_with_decimal.sql b/tests/queries/0_stateless/02975_intdiv_with_decimal.sql
new file mode 100644
index 00000000000..0911a481251
--- /dev/null
+++ b/tests/queries/0_stateless/02975_intdiv_with_decimal.sql
@@ -0,0 +1,70 @@
+--intDiv--
+SELECT intDiv(4,2);
+SELECT intDiv(toDecimal32(4.4, 2), 2);
+SELECT intDiv(4, toDecimal32(2.2, 2));
+SELECT intDiv(toDecimal32(4.4, 2), 2);
+SELECT intDiv(toDecimal32(4.4, 2), toDecimal32(2.2, 2));
+SELECT intDiv(toDecimal64(4.4, 3), 2);
+SELECT intDiv(toDecimal64(4.4, 3), toDecimal32(2.2, 2));
+SELECT intDiv(toDecimal128(4.4, 4), 2);
+SELECT intDiv(toDecimal128(4.4, 4), toDecimal32(2.2, 2));
+SELECT intDiv(toDecimal256(4.4, 5), 2);
+SELECT intDiv(toDecimal256(4.4, 5), toDecimal32(2.2, 2));
+SELECT intDiv(4, toDecimal64(2.2, 2));
+SELECT intDiv(toDecimal32(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDiv(4, toDecimal128(2.2, 3));
+SELECT intDiv(toDecimal32(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDiv(4, toDecimal256(2.2, 4));
+SELECT intDiv(toDecimal32(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDiv(toDecimal64(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDiv(toDecimal128(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDiv(toDecimal256(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDiv(toDecimal64(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDiv(toDecimal128(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDiv(toDecimal256(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDiv(toDecimal64(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDiv(toDecimal128(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDiv(toDecimal256(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDiv(4.2, toDecimal32(2.2, 2));
+SELECT intDiv(4.2, toDecimal64(2.2, 2));
+SELECT intDiv(4.2, toDecimal128(2.2, 2));
+SELECT intDiv(4.2, toDecimal256(2.2, 2));
+SELECT intDiv(toDecimal32(4.4, 2), 2.2);
+SELECT intDiv(toDecimal64(4.4, 2), 2.2);
+SELECT intDiv(toDecimal128(4.4, 2), 2.2);
+SELECT intDiv(toDecimal256(4.4, 2), 2.2);
+--intDivOrZero--
+SELECT intDivOrZero(4,2);
+SELECT intDivOrZero(toDecimal32(4.4, 2), 2);
+SELECT intDivOrZero(4, toDecimal32(2.2, 2));
+SELECT intDivOrZero(toDecimal32(4.4, 2), 2);
+SELECT intDivOrZero(toDecimal32(4.4, 2), toDecimal32(2.2, 2));
+SELECT intDivOrZero(toDecimal64(4.4, 3), 2);
+SELECT intDivOrZero(toDecimal64(4.4, 3), toDecimal32(2.2, 2));
+SELECT intDivOrZero(toDecimal128(4.4, 4), 2);
+SELECT intDivOrZero(toDecimal128(4.4, 4), toDecimal32(2.2, 2));
+SELECT intDivOrZero(toDecimal256(4.4, 5), 2);
+SELECT intDivOrZero(toDecimal256(4.4, 5), toDecimal32(2.2, 2));
+SELECT intDivOrZero(4, toDecimal64(2.2, 2));
+SELECT intDivOrZero(toDecimal32(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDivOrZero(4, toDecimal128(2.2, 3));
+SELECT intDivOrZero(toDecimal32(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDivOrZero(4, toDecimal256(2.2, 4));
+SELECT intDivOrZero(toDecimal32(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDivOrZero(toDecimal64(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDivOrZero(toDecimal128(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDivOrZero(toDecimal256(4.4, 2), toDecimal64(2.2, 2));
+SELECT intDivOrZero(toDecimal64(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDivOrZero(toDecimal128(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDivOrZero(toDecimal256(4.4, 2), toDecimal128(2.2, 2));
+SELECT intDivOrZero(toDecimal64(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDivOrZero(toDecimal128(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDivOrZero(toDecimal256(4.4, 2), toDecimal256(2.2, 2));
+SELECT intDivOrZero(4.2, toDecimal32(2.2, 2));
+SELECT intDivOrZero(4.2, toDecimal64(2.2, 2));
+SELECT intDivOrZero(4.2, toDecimal128(2.2, 2));
+SELECT intDivOrZero(4.2, toDecimal256(2.2, 2));
+SELECT intDivOrZero(toDecimal32(4.4, 2), 2.2);
+SELECT intDivOrZero(toDecimal64(4.4, 2), 2.2);
+SELECT intDivOrZero(toDecimal128(4.4, 2), 2.2);
+SELECT intDivOrZero(toDecimal256(4.4, 2), 2.2);
diff --git a/tests/queries/0_stateless/02975_system_zookeeper_retries.reference b/tests/queries/0_stateless/02975_system_zookeeper_retries.reference
new file mode 100644
index 00000000000..9a636ba56d0
--- /dev/null
+++ b/tests/queries/0_stateless/02975_system_zookeeper_retries.reference
@@ -0,0 +1,3 @@
+/keeper	api_version
+/keeper	feature_flags
+1
diff --git a/tests/queries/0_stateless/02975_system_zookeeper_retries.sql b/tests/queries/0_stateless/02975_system_zookeeper_retries.sql
new file mode 100644
index 00000000000..8b402ec6d65
--- /dev/null
+++ b/tests/queries/0_stateless/02975_system_zookeeper_retries.sql
@@ -0,0 +1,22 @@
+-- Tags: zookeeper, no-parallel, no-fasttest
+
+SELECT path, name
+FROM system.zookeeper
+WHERE path = '/keeper'
+ORDER BY path, name
+SETTINGS
+  insert_keeper_retry_initial_backoff_ms = 1,
+  insert_keeper_retry_max_backoff_ms = 20,
+  insert_keeper_fault_injection_probability=0.3,
+  insert_keeper_fault_injection_seed=4,
+  log_comment='02975_system_zookeeper_retries';
+
+
+SYSTEM FLUSH LOGS;
+
+-- Check that there where zk session failures
+SELECT ProfileEvents['ZooKeeperHardwareExceptions'] > 0
+FROM system.query_log
+WHERE current_database = currentDatabase() AND type = 'QueryFinish' AND log_comment='02975_system_zookeeper_retries'
+ORDER BY event_time_microseconds DESC
+LIMIT 1;
diff --git a/tests/queries/0_stateless/02976_system_zookeeper_filters.reference b/tests/queries/0_stateless/02976_system_zookeeper_filters.reference
new file mode 100644
index 00000000000..a9e2f17562a
--- /dev/null
+++ b/tests/queries/0_stateless/02976_system_zookeeper_filters.reference
@@ -0,0 +1,6 @@
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/02976_system_zookeeper_filters.sql b/tests/queries/0_stateless/02976_system_zookeeper_filters.sql
new file mode 100644
index 00000000000..3664c817da7
--- /dev/null
+++ b/tests/queries/0_stateless/02976_system_zookeeper_filters.sql
@@ -0,0 +1,17 @@
+-- Tags: zookeeper, no-parallel, no-fasttest, long
+
+SET allow_unrestricted_reads_from_keeper = 'false';
+
+SELECT count() > 0 FROM system.zookeeper; -- { serverError BAD_ARGUMENTS }
+SELECT count() > 0 FROM system.zookeeper WHERE name LIKE '%_%'; -- { serverError BAD_ARGUMENTS }
+SELECT count() > 0 FROM system.zookeeper WHERE value LIKE '%'; -- { serverError BAD_ARGUMENTS }
+SELECT count() > 0 FROM system.zookeeper WHERE path LIKE '/%'; -- { serverError BAD_ARGUMENTS }
+SELECT count() > 0 FROM system.zookeeper WHERE path = '/';
+
+SET allow_unrestricted_reads_from_keeper = 'true';
+
+SELECT count() > 0 FROM system.zookeeper;
+SELECT count() > 0 FROM system.zookeeper WHERE name LIKE '%_%';
+SELECT count() > 0 FROM system.zookeeper WHERE value LIKE '%';
+SELECT count() > 0 FROM system.zookeeper WHERE path LIKE '/%';
+SELECT count() > 0 FROM system.zookeeper WHERE path = '/';
diff --git a/tests/queries/0_stateless/02977_csv_format_support_tuple.reference b/tests/queries/0_stateless/02977_csv_format_support_tuple.reference
new file mode 100644
index 00000000000..be68d164cff
--- /dev/null
+++ b/tests/queries/0_stateless/02977_csv_format_support_tuple.reference
@@ -0,0 +1,6 @@
+c1	Nullable(String)					
+c2	Nullable(Int64)					
+c3	Array(Nullable(String))					
+c4	Map(String, Nullable(Int64))					
+c5	Tuple(Nullable(String), Nullable(Int64), Map(String, Nullable(Int64)))					
+20240305	1	['s','d']	{'a':2}	('222',33,{'abc':5})
diff --git a/tests/queries/0_stateless/02977_csv_format_support_tuple.sql b/tests/queries/0_stateless/02977_csv_format_support_tuple.sql
new file mode 100644
index 00000000000..d00cc00e097
--- /dev/null
+++ b/tests/queries/0_stateless/02977_csv_format_support_tuple.sql
@@ -0,0 +1,5 @@
+-- Tags: no-parallel
+
+insert into function file('02977_1.csv') select '20240305', 1, ['s', 'd'], map('a', 2), tuple('222', 33, map('abc', 5)) SETTINGS engine_file_truncate_on_insert=1;
+desc file('02977_1.csv');
+select * from file('02977_1.csv') settings max_threads=1;
diff --git a/tests/queries/0_stateless/02980_dist_insert_readonly_replica.reference b/tests/queries/0_stateless/02980_dist_insert_readonly_replica.reference
new file mode 100644
index 00000000000..2ee76705e90
--- /dev/null
+++ b/tests/queries/0_stateless/02980_dist_insert_readonly_replica.reference
@@ -0,0 +1,3 @@
+shard_0.data	0
+shard_1.data	1
+DistributedConnectionSkipReadOnlyReplica	1	1
diff --git a/tests/queries/0_stateless/02980_dist_insert_readonly_replica.sql.j2 b/tests/queries/0_stateless/02980_dist_insert_readonly_replica.sql.j2
new file mode 100644
index 00000000000..aba742fa64a
--- /dev/null
+++ b/tests/queries/0_stateless/02980_dist_insert_readonly_replica.sql.j2
@@ -0,0 +1,84 @@
+-- Tags: no-parallel, no-fasttest, no-shared-merge-tree
+-- Tag no-parallel - due to static databases
+-- Tag no-fasttest - S3 is required
+-- Tag no-shared-merge-tree - no reliable way to make SMT read-only in stateless test
+
+drop database if exists shard_0;
+drop database if exists shard_1;
+create database shard_0;
+create database shard_1;
+
+drop table if exists dist;
+drop table if exists dist_batch;
+
+-- normal replica
+create table shard_0.data (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', 'write') order by key;
+-- create read-only replica
+create table shard_1.data (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', 'read') order by key;
+
+-- broke replica and leave it read-only
+detach table shard_1.data;
+insert into system.zookeeper (path, name, value) values ('/tables/shard_1/data/replicas/read', 'columns', '');
+attach table shard_1.data;
+select database||'.'||table, is_readonly from system.replicas where database in ('shard_0', 'shard_1') and table = 'data';
+
+create table dist as shard_0.data engine=Distributed('test_cluster_two_replicas_different_databases_internal_replication', '', 'data');
+system stop distributed sends dist;
+
+create table dist_batch as shard_0.data engine=Distributed('test_cluster_two_replicas_different_databases_internal_replication', '', 'data') settings background_insert_batch=1;
+system stop distributed sends dist_batch;
+
+create table dist_single_no_internal_replication_read_only as shard_0.data engine=Distributed('test_shard_localhost', 'shard_1', 'data');
+system stop distributed sends dist_single_no_internal_replication_read_only;
+
+create table dist_single as shard_0.data engine=Distributed('test_cluster_two_replicas_different_databases_internal_replication', 'shard_1', 'data');
+system stop distributed sends dist_single;
+
+set prefer_localhost_replica=0;
+set insert_deduplicate=0;
+-- replica is readonly, avoid too many retries
+set insert_keeper_max_retries=3;
+-- and disable the fault injection to avoid failures
+set insert_keeper_fault_injection_probability=0;
+
+-- for internal_replication==false, distributed_insert_skip_read_only_replicas does not changes anything
+-- because in case of internal_replication=false it cannot skip any replicas, since it need to duplicate the data to all replicas on the initiator
+insert into dist_single_no_internal_replication_read_only settings distributed_foreground_insert=1, distributed_insert_skip_read_only_replicas=0 values (0); -- { serverError TABLE_IS_READ_ONLY }
+insert into dist_single_no_internal_replication_read_only settings distributed_foreground_insert=1, distributed_insert_skip_read_only_replicas=1 values (0); -- { serverError TABLE_IS_READ_ONLY }
+
+-- for internal_replication==true, it does
+insert into dist_single settings distributed_foreground_insert=1, distributed_insert_skip_read_only_replicas=0 values (0); -- { serverError TABLE_IS_READ_ONLY }
+insert into dist_single settings distributed_foreground_insert=1, distributed_insert_skip_read_only_replicas=1 values (0); -- { serverError ALL_CONNECTION_TRIES_FAILED }
+
+-- min_insert_block_size_rows is not enough, since replica will be selected
+-- before, so we need to perform INSERT multiple times to ensure that at least
+-- once read-only replica should be selected (if it wasn't not filtered out)
+{% for i in range(1, 30) %}
+insert into dist settings distributed_foreground_insert=1, distributed_insert_skip_read_only_replicas=1, load_balancing='round_robin' values ({{ i }});
+{% endfor %}
+-- cannot check for background inserts, so only here
+system flush logs;
+select
+    'DistributedConnectionSkipReadOnlyReplica', count() > 0, sum(ProfileEvents['DistributedConnectionSkipReadOnlyReplica']) > 0
+from system.query_log
+where
+    event_date >= yesterday()
+    and current_database = currentDatabase()
+    and query_kind = 'Insert'
+    and type != 'QueryStart'
+    and Settings['distributed_foreground_insert'] = '1';
+
+{% for i in range(1, 30) %}
+insert into dist settings distributed_foreground_insert=0, distributed_insert_skip_read_only_replicas=1 values ({{ i }});
+system flush distributed dist;
+{% endfor %}
+
+{% for i in range(1, 30) %}
+insert into dist_batch settings distributed_foreground_insert=0, distributed_insert_skip_read_only_replicas=1 values ({{ i }});
+system flush distributed dist_batch;
+{% endfor %}
+
+drop database shard_0;
+drop database shard_1;
+
+-- vim: ft=sql
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.reference b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.reference
new file mode 100644
index 00000000000..531163e1d84
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.reference
@@ -0,0 +1,30 @@
+data after INSERT	1
+data after ATTACH	1
+Files before DETACH TABLE
+all_1_1_0
+
+backups/ordinary_default/data/ordinary_default/data/all_1_1_0:
+primary.cidx
+serialization.json
+metadata_version.txt
+default_compression_codec.txt
+data.bin
+data.cmrk3
+count.txt
+columns.txt
+checksums.txt
+
+Files after DETACH TABLE
+all_1_1_0
+
+backups/ordinary_default/data/ordinary_default/data/all_1_1_0:
+primary.cidx
+serialization.json
+metadata_version.txt
+default_compression_codec.txt
+data.bin
+data.cmrk3
+count.txt
+columns.txt
+checksums.txt
+
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.sh b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.sh
new file mode 100755
index 00000000000..12d08159012
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-random-settings, no-random-merge-tree-settings
+# Tag no-fasttest: requires S3
+# Tag no-random-settings, no-random-merge-tree-settings: to avoid creating extra files like serialization.json, this test too exocit anyway
+
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# config for clickhouse-disks (to check leftovers)
+config="${BASH_SOURCE[0]/.sh/.yml}"
+
+# only in Atomic ATTACH from s3_plain works
+new_database="ordinary_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -q "create database $new_database engine=Ordinary"
+CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT/--database=$CLICKHOUSE_DATABASE/--database=$new_database}
+CLICKHOUSE_DATABASE="$new_database"
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data;
+    create table data (key Int) engine=MergeTree() order by key;
+    insert into data values (1);
+    select 'data after INSERT', count() from data;
+"
+
+# suppress output
+$CLICKHOUSE_CLIENT -q "backup table data to S3('http://localhost:11111/test/s3_plain/backups/$CLICKHOUSE_DATABASE', 'test', 'testtest')" > /dev/null
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table data;
+    attach table data (key Int) engine=MergeTree() order by key
+    settings
+        max_suspicious_broken_parts=0,
+        disk=disk(type=s3_plain,
+            endpoint='http://localhost:11111/test/s3_plain/backups/$CLICKHOUSE_DATABASE',
+            access_key_id='test',
+            secret_access_key='testtest');
+    select 'data after ATTACH', count() from data;
+
+    insert into data values (1); -- { serverError TABLE_IS_READ_ONLY }
+    optimize table data final; -- { serverError TABLE_IS_READ_ONLY }
+"
+
+path=$($CLICKHOUSE_CLIENT -q "SELECT replace(data_paths[1], 's3_plain', '') FROM system.tables WHERE database = '$CLICKHOUSE_DATABASE' AND table = 'data'")
+# trim / to fix "Unable to parse ExceptionName: XMinioInvalidObjectName Message: Object name contains unsupported characters."
+path=${path%/}
+
+echo "Files before DETACH TABLE"
+clickhouse-disks -C "$config" --disk s3_plain_disk list --recursive "${path:?}" | tail -n+2
+
+$CLICKHOUSE_CLIENT -q "detach table data"
+echo "Files after DETACH TABLE"
+clickhouse-disks -C "$config" --disk s3_plain_disk list --recursive "$path" | tail -n+2
+
+# metadata file is left
+$CLICKHOUSE_CLIENT --force_remove_data_recursively_on_drop=1 -q "drop database if exists $CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.yml b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.yml
new file mode 100644
index 00000000000..ca5036736d8
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_MergeTree.yml
@@ -0,0 +1,7 @@
+storage_configuration:
+  disks:
+    s3_plain_disk:
+      type: s3_plain
+      endpoint: http://localhost:11111/test/s3_plain/
+      access_key_id: clickhouse
+      secret_access_key: clickhouse
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.reference b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.reference
new file mode 100644
index 00000000000..1e191b719a5
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.reference
@@ -0,0 +1,30 @@
+data after INSERT	1
+data after ATTACH	1
+Files before DETACH TABLE
+all_X_X_X
+
+backups/ordinary_default/data/ordinary_default/data_read/all_X_X_X:
+primary.cidx
+serialization.json
+metadata_version.txt
+default_compression_codec.txt
+data.bin
+data.cmrk3
+count.txt
+columns.txt
+checksums.txt
+
+Files after DETACH TABLE
+all_X_X_X
+
+backups/ordinary_default/data/ordinary_default/data_read/all_X_X_X:
+primary.cidx
+serialization.json
+metadata_version.txt
+default_compression_codec.txt
+data.bin
+data.cmrk3
+count.txt
+columns.txt
+checksums.txt
+
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.sh b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.sh
new file mode 100755
index 00000000000..b079e67a000
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.sh
@@ -0,0 +1,68 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-random-settings, no-random-merge-tree-settings
+# Tag no-fasttest: requires S3
+# Tag no-random-settings, no-random-merge-tree-settings: to avoid creating extra files like serialization.json, this test too exocit anyway
+
+# Creation of a database with Ordinary engine emits a warning.
+CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=fatal
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+config="${BASH_SOURCE[0]/.sh/.yml}"
+
+# only in Atomic ATTACH from s3_plain works
+new_database="ordinary_$CLICKHOUSE_DATABASE"
+$CLICKHOUSE_CLIENT --allow_deprecated_database_ordinary=1 -q "create database $new_database engine=Ordinary"
+CLICKHOUSE_CLIENT=${CLICKHOUSE_CLIENT/--database=$CLICKHOUSE_DATABASE/--database=$new_database}
+CLICKHOUSE_DATABASE="$new_database"
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table if exists data_read;
+    drop table if exists data_write;
+
+    create table data_write (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', 'write') order by key;
+    create table data_read (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', 'read') order by key;
+
+    insert into data_write values (1);
+    system sync replica data_read;
+    select 'data after INSERT', count() from data_read;
+"
+
+# suppress output
+$CLICKHOUSE_CLIENT -q "backup table data_read to S3('http://localhost:11111/test/s3_plain/backups/$CLICKHOUSE_DATABASE', 'test', 'testtest')" > /dev/null
+
+$CLICKHOUSE_CLIENT -nm -q "
+    drop table data_read;
+    attach table data_read (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', 'read') order by key
+    settings
+        max_suspicious_broken_parts=0,
+        disk=disk(type=s3_plain,
+            endpoint='http://localhost:11111/test/s3_plain/backups/$CLICKHOUSE_DATABASE',
+            access_key_id='test',
+            secret_access_key='testtest');
+    select 'data after ATTACH', count() from data_read;
+
+    insert into data_read values (1); -- { serverError TABLE_IS_READ_ONLY }
+    optimize table data_read final; -- { serverError TABLE_IS_READ_ONLY }
+    system sync replica data_read; -- { serverError TABLE_IS_READ_ONLY }
+"
+
+path=$($CLICKHOUSE_CLIENT -q "SELECT replace(data_paths[1], 's3_plain', '') FROM system.tables WHERE database = '$CLICKHOUSE_DATABASE' AND table = 'data_read'")
+# trim / to fix "Unable to parse ExceptionName: XMinioInvalidObjectName Message: Object name contains unsupported characters."
+path=${path%/}
+
+echo "Files before DETACH TABLE"
+# sed to match any part, since in case of fault injection part name may not be all_0_0_0 but all_1_1_0
+clickhouse-disks -C "$config" --disk s3_plain_disk list --recursive "${path:?}" | tail -n+2 | sed 's/all_[^_]*_[^_]*_0/all_X_X_X/g'
+
+$CLICKHOUSE_CLIENT -nm -q "
+    detach table data_read;
+    detach table data_write;
+"
+echo "Files after DETACH TABLE"
+clickhouse-disks -C "$config" --disk s3_plain_disk list --recursive "$path" | tail -n+2 | sed 's/all_[^_]*_[^_]*_0/all_X_X_X/g'
+
+# metadata file is left
+$CLICKHOUSE_CLIENT --force_remove_data_recursively_on_drop=1 -q "drop database if exists $CLICKHOUSE_DATABASE"
diff --git a/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.yml b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.yml
new file mode 100644
index 00000000000..ca5036736d8
--- /dev/null
+++ b/tests/queries/0_stateless/02980_s3_plain_DROP_TABLE_ReplicatedMergeTree.yml
@@ -0,0 +1,7 @@
+storage_configuration:
+  disks:
+    s3_plain_disk:
+      type: s3_plain
+      endpoint: http://localhost:11111/test/s3_plain/
+      access_key_id: clickhouse
+      secret_access_key: clickhouse
diff --git a/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.reference b/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.reference
new file mode 100644
index 00000000000..1c6235170d5
--- /dev/null
+++ b/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.reference
@@ -0,0 +1,6 @@
+inserting into a remote table from local with concurrency equal to max_insert_threads
+9
+inserting into a remote table from remote with concurrency max_insert_threads
+9
+inserting into a remote table from remote (reading with parallel replicas) with concurrency max_insert_threads
+9
diff --git a/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.sh b/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.sh
new file mode 100755
index 00000000000..e65c9654c9c
--- /dev/null
+++ b/tests/queries/0_stateless/02981_insert_select_resize_to_max_insert_threads.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Tags: no-random-settings
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+${CLICKHOUSE_CLIENT} -nq """
+    CREATE TABLE t1_local
+    (
+        n UInt64,
+    )
+    ENGINE = MergeTree
+    ORDER BY n;
+
+    CREATE TABLE t3_dist
+    (
+        n UInt64,
+    )
+    ENGINE = Distributed('test_cluster_two_shards', currentDatabase(), 't1_local', rand());
+
+    CREATE TABLE t4_pr
+    (
+        n UInt64,
+    )
+    ENGINE = ReplicatedMergeTree('/clickhouse/tables/$CLICKHOUSE_TEST_ZOOKEEPER_PREFIX/02981_insert_select', '1')
+    ORDER BY n;
+
+    SYSTEM STOP MERGES t1_local;
+
+    INSERT INTO t1_local SELECT * FROM numbers_mt(1e6);
+"""
+
+max_insert_threads=9
+
+echo "inserting into a remote table from local with concurrency equal to max_insert_threads"
+${CLICKHOUSE_CLIENT} --max_insert_threads "$max_insert_threads" -q """
+    EXPLAIN PIPELINE
+    INSERT INTO t3_dist
+    SELECT * FROM t1_local;
+""" | grep -v EmptySink | grep -c Sink
+
+echo "inserting into a remote table from remote with concurrency max_insert_threads"
+${CLICKHOUSE_CLIENT} --max_insert_threads "$max_insert_threads" --parallel_distributed_insert_select 0 -q """
+    EXPLAIN PIPELINE
+    INSERT INTO t3_dist
+    SELECT * FROM t3_dist;
+""" | grep -v EmptySink | grep -c Sink
+
+echo "inserting into a remote table from remote (reading with parallel replicas) with concurrency max_insert_threads"
+${CLICKHOUSE_CLIENT} --max_insert_threads "$max_insert_threads" --allow_experimental_parallel_reading_from_replicas 2 --cluster_for_parallel_replicas 'parallel_replicas' --max_parallel_replicas 3 -q """
+    EXPLAIN PIPELINE
+    INSERT INTO t3_dist
+    SELECT * FROM t4_pr;
+""" | grep -v EmptySink | grep -c Sink
diff --git a/tests/queries/0_stateless/02981_nested_bad_types.reference b/tests/queries/0_stateless/02981_nested_bad_types.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02981_nested_bad_types.sql b/tests/queries/0_stateless/02981_nested_bad_types.sql
new file mode 100644
index 00000000000..1620eca590d
--- /dev/null
+++ b/tests/queries/0_stateless/02981_nested_bad_types.sql
@@ -0,0 +1,59 @@
+set allow_suspicious_low_cardinality_types=0;
+set allow_suspicious_fixed_string_types=0;
+set allow_experimental_variant_type=0;
+
+
+select [42]::Array(LowCardinality(UInt64)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select [[[42]]]::Array(Array(Array(LowCardinality(UInt64)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select map('a', 42)::Map(String, LowCardinality(UInt64)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select map('a', map('b', [42]))::Map(String, Map(String, Array(LowCardinality(UInt64)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select tuple('a', 42)::Tuple(String, LowCardinality(UInt64)); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select tuple('a', [map('b', 42)])::Tuple(String, Array(Map(String, LowCardinality(UInt64)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+
+create table test (x Array(LowCardinality(UInt64))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Array(Array(LowCardinality(UInt64)))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Map(String, LowCardinality(UInt64))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Map(String, Map(String, LowCardinality(UInt64)))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Tuple(String, LowCardinality(UInt64))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Tuple(String, Array(Map(String, LowCardinality(UInt64))))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+
+
+select ['42']::Array(FixedString(1000000)); -- {serverError ILLEGAL_COLUMN}
+select ['42']::Array(FixedString(1000000)); -- {serverError ILLEGAL_COLUMN}
+select [[['42']]]::Array(Array(Array(FixedString(1000000)))); -- {serverError ILLEGAL_COLUMN}
+select map('a', '42')::Map(String, FixedString(1000000)); -- {serverError ILLEGAL_COLUMN}
+select map('a', map('b', ['42']))::Map(String, Map(String, Array(FixedString(1000000)))); -- {serverError ILLEGAL_COLUMN}
+select tuple('a', '42')::Tuple(String, FixedString(1000000)); -- {serverError ILLEGAL_COLUMN}
+select tuple('a', [map('b', '42')])::Tuple(String, Array(Map(String, FixedString(1000000)))); -- {serverError ILLEGAL_COLUMN}
+
+create table test (x Array(FixedString(1000000))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Array(Array(FixedString(1000000)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Map(String, FixedString(1000000))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Map(String, Map(String, FixedString(1000000)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Tuple(String, FixedString(1000000))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Tuple(String, Array(Map(String, FixedString(1000000))))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+
+select [42]::Array(Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
+select [[[42]]]::Array(Array(Array(Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
+select map('a', 42)::Map(String, Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
+select map('a', map('b', [42]))::Map(String, Map(String, Array(Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
+select tuple('a', 42)::Tuple(String, Variant(String, UInt64)); -- {serverError ILLEGAL_COLUMN}
+select tuple('a', [map('b', 42)])::Tuple(String, Array(Map(String, Variant(String, UInt64)))); -- {serverError ILLEGAL_COLUMN}
+
+create table test (x Array(Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Array(Array(Variant(String, UInt64)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Map(String, Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Map(String, Map(String, Variant(String, UInt64)))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Tuple(String, Variant(String, UInt64))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Tuple(String, Array(Map(String, Variant(String, UInt64))))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+
+set allow_experimental_variant_type=1;
+select 42::Variant(String, LowCardinality(UInt64)) settings allow_experimental_variant_type=1; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+select tuple('a', [map('b', 42)])::Tuple(String, Array(Map(String, Variant(LowCardinality(UInt64), String)))); -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Variant(LowCardinality(UInt64), String)) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+create table test (x Tuple(String, Array(Map(String, Variant(LowCardinality(UInt64), String))))) engine=Memory; -- {serverError SUSPICIOUS_TYPE_FOR_LOW_CARDINALITY}
+
+select '42'::Variant(UInt64, FixedString(1000000)); -- {serverError ILLEGAL_COLUMN}
+select tuple('a', [map('b', '42')])::Tuple(String, Array(Map(String, Variant(UInt32, FixedString(1000000))))); -- {serverError ILLEGAL_COLUMN}
+create table test (x Variant(UInt64, FixedString(1000000))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
+create table test (x Tuple(String, Array(Map(String, FixedString(1000000))))) engine=Memory; -- {serverError ILLEGAL_COLUMN}
diff --git a/tests/queries/0_stateless/02981_translate_fixedstring.reference b/tests/queries/0_stateless/02981_translate_fixedstring.reference
new file mode 100644
index 00000000000..e506d4a22f7
--- /dev/null
+++ b/tests/queries/0_stateless/02981_translate_fixedstring.reference
@@ -0,0 +1,5 @@
+AAA\0\0\0\0\0\0\0
+A
+1
+2
+3
diff --git a/tests/queries/0_stateless/02981_translate_fixedstring.sql b/tests/queries/0_stateless/02981_translate_fixedstring.sql
new file mode 100644
index 00000000000..209efa4ba4a
--- /dev/null
+++ b/tests/queries/0_stateless/02981_translate_fixedstring.sql
@@ -0,0 +1,2 @@
+SELECT translate('aaa'::FixedString(10), 'a','A');
+SELECT translate(number::String::FixedString(1), '0','A') from numbers(4);
diff --git a/tests/queries/0_stateless/02981_variant_type_function.reference b/tests/queries/0_stateless/02981_variant_type_function.reference
new file mode 100644
index 00000000000..4fae89810ef
--- /dev/null
+++ b/tests/queries/0_stateless/02981_variant_type_function.reference
@@ -0,0 +1,10 @@
+None
+UInt64
+String
+Array(UInt64)
+Enum8(\'None\' = -1, \'Array(UInt64)\' = 0, \'String\' = 1, \'UInt64\' = 2)
+None
+UInt64
+String
+Array(UInt64)
+Enum8(\'None\' = -1, \'Array(UInt64)\' = 0, \'Date\' = 1, \'String\' = 2, \'UInt64\' = 3)
diff --git a/tests/queries/0_stateless/02981_variant_type_function.sql b/tests/queries/0_stateless/02981_variant_type_function.sql
new file mode 100644
index 00000000000..cba653d7374
--- /dev/null
+++ b/tests/queries/0_stateless/02981_variant_type_function.sql
@@ -0,0 +1,13 @@
+SET allow_experimental_variant_type = 1;
+CREATE TABLE test (v Variant(UInt64, String, Array(UInt64))) ENGINE = Memory;
+INSERT INTO test VALUES (NULL), (42), ('Hello, World!'), ([1, 2, 3]);
+SELECT variantType(v) as type FROM test;
+SELECT toTypeName(variantType(v)) from test limit 1;
+
+SELECT variantType() FROM test; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+SELECT variantType(v, v) FROM test; -- {serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
+SELECT variantType(v.String) FROM test; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+
+SELECT variantType(v::Variant(UInt64, String, Array(UInt64), Date)) as type FROM test;
+SELECT toTypeName(variantType(v::Variant(UInt64, String, Array(UInt64), Date))) from test limit 1;
+
diff --git a/tests/queries/0_stateless/02981_vertical_merges_memory_usage.reference b/tests/queries/0_stateless/02981_vertical_merges_memory_usage.reference
new file mode 100644
index 00000000000..60c254e152b
--- /dev/null
+++ b/tests/queries/0_stateless/02981_vertical_merges_memory_usage.reference
@@ -0,0 +1 @@
+Vertical	OK
diff --git a/tests/queries/0_stateless/02981_vertical_merges_memory_usage.sql b/tests/queries/0_stateless/02981_vertical_merges_memory_usage.sql
new file mode 100644
index 00000000000..b784e734457
--- /dev/null
+++ b/tests/queries/0_stateless/02981_vertical_merges_memory_usage.sql
@@ -0,0 +1,37 @@
+-- Tags: long, no-random-merge-tree-settings
+
+DROP TABLE IF EXISTS t_vertical_merge_memory;
+
+CREATE TABLE t_vertical_merge_memory (id UInt64, arr Array(String))
+ENGINE = MergeTree ORDER BY id
+SETTINGS
+    min_bytes_for_wide_part = 0,
+    vertical_merge_algorithm_min_rows_to_activate = 1,
+    vertical_merge_algorithm_min_columns_to_activate = 1,
+    index_granularity = 8192,
+    index_granularity_bytes = '10M',
+    merge_max_block_size = 8192,
+    merge_max_block_size_bytes = '10M';
+
+INSERT INTO t_vertical_merge_memory SELECT number, arrayMap(x -> repeat('a', 50), range(1000)) FROM numbers(3000);
+-- Why 3001? - Deduplication, which is off with normal MergeTree by default but on for ReplicatedMergeTree and SharedMergeTree.
+-- We automatically replace MergeTree with SharedMergeTree in ClickHouse Cloud.
+INSERT INTO t_vertical_merge_memory SELECT number, arrayMap(x -> repeat('a', 50), range(1000)) FROM numbers(3001);
+
+OPTIMIZE TABLE t_vertical_merge_memory FINAL;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    merge_algorithm,
+    peak_memory_usage < 500 * 1024 * 1024
+        ? 'OK'
+        : format('FAIL: memory usage: {}', formatReadableSize(peak_memory_usage))
+FROM system.part_log
+WHERE
+    database = currentDatabase()
+    AND table = 't_vertical_merge_memory'
+    AND event_type = 'MergeParts'
+    AND length(merged_from) = 2;
+
+DROP TABLE IF EXISTS t_vertical_merge_memory;
diff --git a/tests/queries/0_stateless/02982_aggregation_states_destruction.reference b/tests/queries/0_stateless/02982_aggregation_states_destruction.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02982_aggregation_states_destruction.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02982_aggregation_states_destruction.sh b/tests/queries/0_stateless/02982_aggregation_states_destruction.sh
new file mode 100755
index 00000000000..1c72cf2b8c1
--- /dev/null
+++ b/tests/queries/0_stateless/02982_aggregation_states_destruction.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Tags: no-random-settings
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+query_id="02982_$RANDOM"
+$CLICKHOUSE_CLIENT --query_id $query_id --log_query_threads 1 --query="select number, uniq(number) from numbers_mt(1e7) group by number limit 100 format Null;"
+
+$CLICKHOUSE_CLIENT -q "system flush logs;"
+
+$CLICKHOUSE_CLIENT -q "select count() > 1 from system.query_thread_log where query_id = '$query_id' and current_database = currentDatabase() and thread_name = 'AggregDestruct';"
diff --git a/tests/queries/0_stateless/02982_comments_in_system_tables.reference b/tests/queries/0_stateless/02982_comments_in_system_tables.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02982_comments_in_system_tables.sh b/tests/queries/0_stateless/02982_comments_in_system_tables.sh
new file mode 100755
index 00000000000..2d7fbf4d35a
--- /dev/null
+++ b/tests/queries/0_stateless/02982_comments_in_system_tables.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+${CLICKHOUSE_LOCAL}  --query "SELECT 'Table ' || database || '.' || name || ' does not have a comment' FROM system.tables WHERE name NOT LIKE '%\_log\_%' AND database='system' AND comment==''"
+${CLICKHOUSE_CLIENT} --query "SELECT 'Table ' || database || '.' || name || ' does not have a comment' FROM system.tables WHERE name NOT LIKE '%\_log\_%' AND database='system' AND comment==''"
diff --git a/tests/queries/0_stateless/02982_dont_infer_exponent_floats.reference b/tests/queries/0_stateless/02982_dont_infer_exponent_floats.reference
new file mode 100644
index 00000000000..47e9b86237a
--- /dev/null
+++ b/tests/queries/0_stateless/02982_dont_infer_exponent_floats.reference
@@ -0,0 +1,3 @@
+c1	Nullable(String)					
+c1	Nullable(Float64)					
+x	Nullable(Float64)					
diff --git a/tests/queries/0_stateless/02982_dont_infer_exponent_floats.sql b/tests/queries/0_stateless/02982_dont_infer_exponent_floats.sql
new file mode 100644
index 00000000000..4f78855f5ce
--- /dev/null
+++ b/tests/queries/0_stateless/02982_dont_infer_exponent_floats.sql
@@ -0,0 +1,5 @@
+DESC format(CSV, '1E20\n1.1E20') settings input_format_try_infer_exponent_floats = 0;
+DESC format(CSV, '1E20\n1.1E20') settings input_format_try_infer_exponent_floats = 1;
+-- This setting should not take affect on JSON formats
+DESC format(JSONEachRow, '{"x" : 1.1e20}') settings input_format_try_infer_exponent_floats = 0;
+
diff --git a/tests/queries/0_stateless/02982_json_columns_with_metadata_http.reference b/tests/queries/0_stateless/02982_json_columns_with_metadata_http.reference
new file mode 100644
index 00000000000..d03bf4df6cb
--- /dev/null
+++ b/tests/queries/0_stateless/02982_json_columns_with_metadata_http.reference
@@ -0,0 +1,3 @@
+1	4
+2	5
+3	6
diff --git a/tests/queries/0_stateless/02982_json_columns_with_metadata_http.sh b/tests/queries/0_stateless/02982_json_columns_with_metadata_http.sh
new file mode 100755
index 00000000000..41c06ceae61
--- /dev/null
+++ b/tests/queries/0_stateless/02982_json_columns_with_metadata_http.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT -q "drop table if exists test"
+$CLICKHOUSE_CLIENT -q "create table test(x UInt32, y UInt32) engine=Memory"
+
+echo -ne '{"meta":[{"name":"x","type":"UInt32"}, {"name":"y", "type":"UInt32"}],"data":{"x":[1,2,3],"y":[4,5,6]}}\n' | ${CLICKHOUSE_CURL} -sS "{$CLICKHOUSE_URL}&query=INSERT%20INTO%20test%20FORMAT%20JSONColumnsWithMetadata" --data-binary @-
+
+$CLICKHOUSE_CLIENT -q "select * from test"
+$CLICKHOUSE_CLIENT -q "drop table test"
+
diff --git a/tests/queries/0_stateless/02982_minmax_nan_null_order.reference b/tests/queries/0_stateless/02982_minmax_nan_null_order.reference
new file mode 100644
index 00000000000..2b3ef0b7733
--- /dev/null
+++ b/tests/queries/0_stateless/02982_minmax_nan_null_order.reference
@@ -0,0 +1,44 @@
+-- { echoOn }
+-- Tuples with NaN
+SELECT min((c1, c2)), max((c1, c2)) FROM values((nan, 0.), (0., 0.), (5., 5.));
+(0,0)	(5,5)
+SELECT minIf((c1, c2), c2 >= 0.0), maxIf((c1, c2), c2 >= 0.0) FROM values((nan, 0.), (0., 0.), (5., 5.));
+(0,0)	(5,5)
+SELECT (c1, c2) as t FROM values((nan, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+(0,0)
+SELECT (c1, c2) as t FROM values((nan, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+(5,5)
+SELECT min((c1, c2)), max((c1, c2)) FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.));
+(-5,0)	(5,5)
+SELECT minIf((c1, c2), c2 >= 0.0), maxIf((c1, c2), c2 >= 0.0) FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.));
+(-5,0)	(5,5)
+SELECT (c1, c2) as t FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+(-5,0)
+SELECT (c1, c2) as t FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+(5,5)
+-- Tuples with NULL
+SELECT min((c1, c2)), max((c1, c2)) FROM values((NULL, 0.), (0., 0.), (5., 5.));
+(0,0)	(5,5)
+SELECT minIf((c1, c2), c2 >= 0), maxIf((c1, c2), c2 >= 0) FROM values((NULL, 0.), (0., 0.), (5., 5.));
+(0,0)	(5,5)
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+(0,0)
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+(5,5)
+SELECT min((c1, c2)), max((c1, c2)) FROM values((0., 0.), (5., 5.), (NULL, 0.));
+(0,0)	(5,5)
+SELECT minIf((c1, c2), c2 >= 0), maxIf((c1, c2), c2 >= 0) FROM values((0., 0.), (5., 5.), (NULL, 0.));
+(0,0)	(5,5)
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.), (NULL, 0.)) ORDER BY t ASC LIMIT 1;
+(0,0)
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.), (NULL, 0.)) ORDER BY t DESC LIMIT 1;
+(5,5)
+-- Map with NULL
+SELECT min(map(0, c1)), max(map(0, c1)) FROM values(NULL, 0, 5., 5.);
+{0:0}	{0:5}
+SELECT minIf(map(0, c1), assumeNotNull(c1) >= 0), maxIf(map(0, c1), assumeNotNull(c1) >= 0) FROM values(NULL, 0, 5., 5.);
+{0:0}	{0:5}
+SELECT map(0, c1) as t FROM values(NULL, 0, 5., 5.) ORDER BY t ASC LIMIT 1;
+{0:0}
+SELECT map(0, c1) as t FROM values(NULL, 0, 5., 5.) ORDER BY t DESC LIMIT 1;
+{0:5}
diff --git a/tests/queries/0_stateless/02982_minmax_nan_null_order.sql b/tests/queries/0_stateless/02982_minmax_nan_null_order.sql
new file mode 100644
index 00000000000..ad9e40874a7
--- /dev/null
+++ b/tests/queries/0_stateless/02982_minmax_nan_null_order.sql
@@ -0,0 +1,28 @@
+-- { echoOn }
+-- Tuples with NaN
+SELECT min((c1, c2)), max((c1, c2)) FROM values((nan, 0.), (0., 0.), (5., 5.));
+SELECT minIf((c1, c2), c2 >= 0.0), maxIf((c1, c2), c2 >= 0.0) FROM values((nan, 0.), (0., 0.), (5., 5.));
+SELECT (c1, c2) as t FROM values((nan, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+SELECT (c1, c2) as t FROM values((nan, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+
+SELECT min((c1, c2)), max((c1, c2)) FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.));
+SELECT minIf((c1, c2), c2 >= 0.0), maxIf((c1, c2), c2 >= 0.0) FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.));
+SELECT (c1, c2) as t FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+SELECT (c1, c2) as t FROM values((-5, 0), (nan, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+
+-- Tuples with NULL
+SELECT min((c1, c2)), max((c1, c2)) FROM values((NULL, 0.), (0., 0.), (5., 5.));
+SELECT minIf((c1, c2), c2 >= 0), maxIf((c1, c2), c2 >= 0) FROM values((NULL, 0.), (0., 0.), (5., 5.));
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.)) ORDER BY t ASC LIMIT 1;
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.)) ORDER BY t DESC LIMIT 1;
+
+SELECT min((c1, c2)), max((c1, c2)) FROM values((0., 0.), (5., 5.), (NULL, 0.));
+SELECT minIf((c1, c2), c2 >= 0), maxIf((c1, c2), c2 >= 0) FROM values((0., 0.), (5., 5.), (NULL, 0.));
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.), (NULL, 0.)) ORDER BY t ASC LIMIT 1;
+SELECT (c1, c2) as t FROM values((NULL, 0.), (0., 0.), (5., 5.), (NULL, 0.)) ORDER BY t DESC LIMIT 1;
+
+-- Map with NULL
+SELECT min(map(0, c1)), max(map(0, c1)) FROM values(NULL, 0, 5., 5.);
+SELECT minIf(map(0, c1), assumeNotNull(c1) >= 0), maxIf(map(0, c1), assumeNotNull(c1) >= 0) FROM values(NULL, 0, 5., 5.);
+SELECT map(0, c1) as t FROM values(NULL, 0, 5., 5.) ORDER BY t ASC LIMIT 1;
+SELECT map(0, c1) as t FROM values(NULL, 0, 5., 5.) ORDER BY t DESC LIMIT 1;
diff --git a/tests/queries/0_stateless/02982_parallel_replicas_unexpected_cluster.reference b/tests/queries/0_stateless/02982_parallel_replicas_unexpected_cluster.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02982_parallel_replicas_unexpected_cluster.sql b/tests/queries/0_stateless/02982_parallel_replicas_unexpected_cluster.sql
new file mode 100644
index 00000000000..210b7d2a18a
--- /dev/null
+++ b/tests/queries/0_stateless/02982_parallel_replicas_unexpected_cluster.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS test_unexpected_cluster;
+CREATE TABLE test_unexpected_cluster (n UInt64) ENGINE=MergeTree() ORDER BY tuple();
+INSERT INTO test_unexpected_cluster SELECT * FROM numbers(10);
+
+SET allow_experimental_parallel_reading_from_replicas=2, max_parallel_replicas=2, cluster_for_parallel_replicas='test_cluster_two_shards', parallel_replicas_for_non_replicated_merge_tree=1;
+SELECT count() FROM test_unexpected_cluster WHERE NOT ignore(*); -- { serverError UNEXPECTED_CLUSTER }
+
+DROP TABLE test_unexpected_cluster;
diff --git a/tests/queries/0_stateless/02982_perf_introspection_for_inserts.reference b/tests/queries/0_stateless/02982_perf_introspection_for_inserts.reference
new file mode 100644
index 00000000000..50d4d226b46
--- /dev/null
+++ b/tests/queries/0_stateless/02982_perf_introspection_for_inserts.reference
@@ -0,0 +1 @@
+1	1	1	1	1
diff --git a/tests/queries/0_stateless/02982_perf_introspection_for_inserts.sh b/tests/queries/0_stateless/02982_perf_introspection_for_inserts.sh
new file mode 100755
index 00000000000..f5fb54b54d3
--- /dev/null
+++ b/tests/queries/0_stateless/02982_perf_introspection_for_inserts.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+$CLICKHOUSE_CLIENT -q """
+CREATE TABLE t02982
+(
+    n UInt64,
+    s Nullable(String),
+    INDEX idx1 n TYPE minmax GRANULARITY 2,
+    INDEX idx2 n * length(s) TYPE set(1000) GRANULARITY 2,
+    PROJECTION pr_sort
+    (
+        SELECT
+            n,
+            sum(length(s))
+        GROUP BY n
+    )
+)
+ENGINE = MergeTree
+ORDER BY n;
+"""
+
+query_id=$RANDOM
+
+$CLICKHOUSE_CLIENT --query_id $query_id -q """
+INSERT INTO t02982 SELECT
+    number,
+    'a'
+FROM numbers_mt(1000000);
+"""
+
+$CLICKHOUSE_CLIENT -q "SYSTEM FLUSH LOGS"
+$CLICKHOUSE_CLIENT -q """
+SELECT
+    ProfileEvents['MergeTreeDataProjectionWriterMergingBlocksMicroseconds'] > 0,
+    ProfileEvents['MergeTreeDataProjectionWriterSortingBlocksMicroseconds'] > 0,
+    ProfileEvents['MergeTreeDataWriterSortingBlocksMicroseconds'] > 0,
+    ProfileEvents['MergeTreeDataWriterProjectionsCalculationMicroseconds'] > 0,
+    ProfileEvents['MergeTreeDataWriterSkipIndicesCalculationMicroseconds'] > 0
+FROM system.query_log
+WHERE current_database = currentDatabase() AND query_id='$query_id' AND type = 'QueryFinish';
+"""
diff --git a/tests/queries/0_stateless/02982_unambiguous_alter_commands.reference b/tests/queries/0_stateless/02982_unambiguous_alter_commands.reference
new file mode 100644
index 00000000000..74d4b631074
--- /dev/null
+++ b/tests/queries/0_stateless/02982_unambiguous_alter_commands.reference
@@ -0,0 +1,6 @@
+--- Alter commands in parens
+ALTER TABLE a\n    MODIFY TTL expr GROUP BY some_key,\n    ADD COLUMN `a` Int64
+ALTER TABLE a\n    MODIFY TTL expr TO VOLUME \'vol1\', expr2 + toIntervalYear(2) TO VOLUME \'vol2\',\n    DROP COLUMN c
+--- Check only consistent parens around alter commands are accepted
+ALTER TABLE a\n    DROP COLUMN b,\n    DROP COLUMN c
+ALTER TABLE a\n    DROP COLUMN b,\n    DROP COLUMN c
diff --git a/tests/queries/0_stateless/02982_unambiguous_alter_commands.sql b/tests/queries/0_stateless/02982_unambiguous_alter_commands.sql
new file mode 100644
index 00000000000..d25bccb65c3
--- /dev/null
+++ b/tests/queries/0_stateless/02982_unambiguous_alter_commands.sql
@@ -0,0 +1,9 @@
+SELECT '--- Alter commands in parens';
+SELECT formatQuery('ALTER TABLE a (MODIFY TTL expr GROUP BY some_key), (ADD COLUMN a Int64)');
+SELECT formatQuery('ALTER TABLE a (MODIFY TTL expr TO VOLUME \'vol1\', expr2 + INTERVAL 2 YEAR TO VOLUME \'vol2\'), (DROP COLUMN c)');
+
+SELECT '--- Check only consistent parens around alter commands are accepted';
+SELECT formatQuery('ALTER TABLE a (DROP COLUMN b), DROP COLUMN c'); -- { serverError SYNTAX_ERROR }
+SELECT formatQuery('ALTER TABLE a DROP COLUMN b, (DROP COLUMN c)'); -- { serverError SYNTAX_ERROR }
+SELECT formatQuery('ALTER TABLE a (DROP COLUMN b), (DROP COLUMN c)');
+SELECT formatQuery('ALTER TABLE a DROP COLUMN b, DROP COLUMN c'); -- Make sure it is backward compatible
diff --git a/tests/queries/0_stateless/02983_const_sharding_key.reference b/tests/queries/0_stateless/02983_const_sharding_key.reference
new file mode 100644
index 00000000000..06e567b11df
--- /dev/null
+++ b/tests/queries/0_stateless/02983_const_sharding_key.reference
@@ -0,0 +1,7 @@
+1
+2
+3
+4
+5
+6
+7
diff --git a/tests/queries/0_stateless/02983_const_sharding_key.sql b/tests/queries/0_stateless/02983_const_sharding_key.sql
new file mode 100644
index 00000000000..339293b8b81
--- /dev/null
+++ b/tests/queries/0_stateless/02983_const_sharding_key.sql
@@ -0,0 +1,26 @@
+-- Tags: distributed, no-parallel
+
+DROP DATABASE IF EXISTS shard_0;
+DROP DATABASE IF EXISTS shard_1;
+DROP TABLE IF EXISTS t_distr;
+
+CREATE DATABASE IF NOT EXISTS shard_0;
+CREATE DATABASE IF NOT EXISTS shard_1;
+
+CREATE TABLE shard_0.t_local (a Int) ENGINE = Memory;
+CREATE TABLE shard_1.t_local (a Int) ENGINE = Memory;
+CREATE TABLE t_distr (a Int) ENGINE = Distributed(test_cluster_two_shards_different_databases, '', 't_local', 1000);
+
+SET distributed_foreground_insert=0;
+INSERT INTO t_distr VALUES (1), (2), (3);
+
+SET distributed_foreground_insert=1;
+INSERT INTO t_distr VALUES (4), (5), (6), (7);
+
+SYSTEM FLUSH DISTRIBUTED t_distr;
+
+SELECT * FROM t_distr ORDER BY a;
+
+DROP TABLE t_distr;
+DROP DATABASE shard_0;
+DROP DATABASE shard_1;
diff --git a/tests/queries/0_stateless/02983_empty_map.reference b/tests/queries/0_stateless/02983_empty_map.reference
new file mode 100644
index 00000000000..fadedaf23ae
--- /dev/null
+++ b/tests/queries/0_stateless/02983_empty_map.reference
@@ -0,0 +1,7 @@
+-- { echoOn }
+SELECT f1, f2['2'], count() FROM t1 GROUP BY 1,2 order by 1,2;
+1		1000111
+SELECT f1, f3['2'], count() FROM t1 GROUP BY 1,2 order by 1,2;
+1		1000111
+SELECT f1, f4[2], count() FROM t1 GROUP BY 1,2 order by 1,2;
+1	0	1000111
diff --git a/tests/queries/0_stateless/02983_empty_map.sql b/tests/queries/0_stateless/02983_empty_map.sql
new file mode 100644
index 00000000000..78bc5d8736f
--- /dev/null
+++ b/tests/queries/0_stateless/02983_empty_map.sql
@@ -0,0 +1,21 @@
+--https://github.com/ClickHouse/ClickHouse/issues/59402
+CREATE TABLE t1
+(
+    f1 Int32,
+    f2 Map(LowCardinality(String),LowCardinality(String)),
+    f3 Map(String,String),
+    f4 Map(Int32,Int32)
+)
+ENGINE=Memory AS
+SELECT 1 as f1,
+       map(number%2,number%10) as f2,
+       f2 as f3,
+       f2 as f4
+from numbers(1000111);
+
+SET max_block_size=10;
+
+-- { echoOn }
+SELECT f1, f2['2'], count() FROM t1 GROUP BY 1,2 order by 1,2;
+SELECT f1, f3['2'], count() FROM t1 GROUP BY 1,2 order by 1,2;
+SELECT f1, f4[2], count() FROM t1 GROUP BY 1,2 order by 1,2;
diff --git a/tests/queries/0_stateless/02983_empty_map_hasToken.reference b/tests/queries/0_stateless/02983_empty_map_hasToken.reference
new file mode 100644
index 00000000000..75378377541
--- /dev/null
+++ b/tests/queries/0_stateless/02983_empty_map_hasToken.reference
@@ -0,0 +1,10 @@
+2
+2
+2
+2
+2
+2
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/02983_empty_map_hasToken.sql b/tests/queries/0_stateless/02983_empty_map_hasToken.sql
new file mode 100644
index 00000000000..6d146150ac8
--- /dev/null
+++ b/tests/queries/0_stateless/02983_empty_map_hasToken.sql
@@ -0,0 +1,27 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/60223
+
+CREATE TABLE test
+(
+    t String,
+    id String,
+    h Map(String, String)   
+)
+ENGINE = MergeTree
+ORDER BY (t, id) SETTINGS index_granularity = 4096 ;
+
+insert into test values ('xxx', 'x', {'content-type':'text/plain','user-agent':'bulk-tests'});
+insert into test values ('xxx', 'y', {'content-type':'application/json','user-agent':'bulk-tests'});
+insert into test select 'xxx', number, map('content-type', 'x' ) FROM numbers(1e2);
+
+optimize table test final;
+
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'bulk')  WHERE hasToken(h['user-agent'], 'tests') and t = 'xxx';
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'tests') WHERE hasToken(h['user-agent'], 'bulk')  and t = 'xxx';
+SELECT count() FROM test WHERE hasToken(h['user-agent'], 'bulk') and hasToken(h['user-agent'], 'tests') and t = 'xxx';
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'bulk') and hasToken(h['user-agent'], 'tests') and t = 'xxx';
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'bulk') and hasToken(h['user-agent'], 'tests') WHERE t = 'xxx';
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'tests') and hasToken(h['user-agent'], 'bulk') WHERE t = 'xxx';
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'tests') and hasToken(h['user-agent'], 'bulk');
+SELECT count() FROM test PREWHERE hasToken(h['user-agent'], 'bulk') and hasToken(h['user-agent'], 'tests');
+SELECT count() FROM test WHERE hasToken(h['user-agent'], 'tests') and hasToken(h['user-agent'], 'bulk');
+SELECT count() FROM test WHERE hasToken(h['user-agent'], 'bulk') and hasToken(h['user-agent'], 'tests');
diff --git a/tests/queries/0_stateless/02984_topk_empty_merge.reference b/tests/queries/0_stateless/02984_topk_empty_merge.reference
new file mode 100644
index 00000000000..fe51488c706
--- /dev/null
+++ b/tests/queries/0_stateless/02984_topk_empty_merge.reference
@@ -0,0 +1 @@
+[]
diff --git a/tests/queries/0_stateless/02984_topk_empty_merge.sql b/tests/queries/0_stateless/02984_topk_empty_merge.sql
new file mode 100644
index 00000000000..754b0cb26a2
--- /dev/null
+++ b/tests/queries/0_stateless/02984_topk_empty_merge.sql
@@ -0,0 +1,2 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/59107
+SELECT topK('102.4') FROM remote('127.0.0.{1,2}', view(SELECT NULL FROM system.one WHERE dummy = 1));
diff --git a/tests/queries/0_stateless/02985_dialects_with_distributed_tables.reference b/tests/queries/0_stateless/02985_dialects_with_distributed_tables.reference
new file mode 100644
index 00000000000..f22e294ce86
--- /dev/null
+++ b/tests/queries/0_stateless/02985_dialects_with_distributed_tables.reference
@@ -0,0 +1,9 @@
+123
+234
+315
+123
+234
+315
+123
+234
+315
diff --git a/tests/queries/0_stateless/02985_dialects_with_distributed_tables.sql b/tests/queries/0_stateless/02985_dialects_with_distributed_tables.sql
new file mode 100644
index 00000000000..6ac36cf5835
--- /dev/null
+++ b/tests/queries/0_stateless/02985_dialects_with_distributed_tables.sql
@@ -0,0 +1,30 @@
+-- Tags: no-fasttest, distributed
+
+DROP TABLE IF EXISTS shared_test_table;
+DROP TABLE IF EXISTS distributed_test_table;
+
+CREATE TABLE shared_test_table (id UInt64)
+ENGINE = MergeTree
+ORDER BY (id);
+
+CREATE TABLE distributed_test_table
+ENGINE = Distributed(test_cluster_two_shard_three_replicas_localhost, currentDatabase(), shared_test_table);
+
+INSERT INTO shared_test_table VALUES (123), (651), (446), (315), (234), (764);
+
+SELECT id FROM distributed_test_table LIMIT 3;
+
+SET dialect = 'kusto';
+
+distributed_test_table | take 3;
+
+SET dialect = 'prql';
+
+from distributed_test_table
+select {id}
+take 1..3;
+
+SET dialect = 'clickhouse';
+
+DROP TABLE distributed_test_table;
+DROP TABLE shared_test_table;
diff --git a/tests/queries/0_stateless/02985_if_over_big_int_decimal.reference b/tests/queries/0_stateless/02985_if_over_big_int_decimal.reference
new file mode 100644
index 00000000000..1dfad945ee2
--- /dev/null
+++ b/tests/queries/0_stateless/02985_if_over_big_int_decimal.reference
@@ -0,0 +1,12 @@
+49500
+49500
+49500
+49500
+49500
+49500
+450000
+450000
+450000
+450000
+450000
+450000
diff --git a/tests/queries/0_stateless/02985_if_over_big_int_decimal.sql b/tests/queries/0_stateless/02985_if_over_big_int_decimal.sql
new file mode 100644
index 00000000000..0295a64a092
--- /dev/null
+++ b/tests/queries/0_stateless/02985_if_over_big_int_decimal.sql
@@ -0,0 +1,14 @@
+select sumIf(number::Int128, number % 10 == 0) from numbers(1000);
+select sumIf(number::UInt128, number % 10 == 0) from numbers(1000);
+select sumIf(number::Int256, number % 10 == 0) from numbers(1000);
+select sumIf(number::UInt256, number % 10 == 0) from numbers(1000);
+select sumIf(number::Decimal128(3), number % 10 == 0) from numbers(1000);
+select sumIf(number::Decimal256(3), number % 10 == 0) from numbers(1000);
+
+-- Test when the condition is neither 0 nor 1
+select sumIf(number::Int128, number % 10) from numbers(1000);
+select sumIf(number::UInt128, number % 10) from numbers(1000);
+select sumIf(number::Int256, number % 10) from numbers(1000);
+select sumIf(number::UInt256, number % 10) from numbers(1000);
+select sumIf(number::Decimal128(3), number % 10) from numbers(1000);
+select sumIf(number::Decimal256(3), number % 10) from numbers(1000);
diff --git a/tests/queries/0_stateless/02985_minmax_index_aggregate_function.reference b/tests/queries/0_stateless/02985_minmax_index_aggregate_function.reference
new file mode 100644
index 00000000000..e71eb4f0d57
--- /dev/null
+++ b/tests/queries/0_stateless/02985_minmax_index_aggregate_function.reference
@@ -0,0 +1,6 @@
+1
+5	10
+6	11
+7	12
+8	13
+9	14
diff --git a/tests/queries/0_stateless/02985_minmax_index_aggregate_function.sql b/tests/queries/0_stateless/02985_minmax_index_aggregate_function.sql
new file mode 100644
index 00000000000..7d35c1b310b
--- /dev/null
+++ b/tests/queries/0_stateless/02985_minmax_index_aggregate_function.sql
@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS t_index_agg_func;
+
+CREATE TABLE t_index_agg_func
+(
+    id UInt64,
+    v AggregateFunction(avg, UInt64),
+    INDEX idx_v v TYPE minmax GRANULARITY 1
+)
+ENGINE = AggregatingMergeTree ORDER BY id
+SETTINGS index_granularity = 4; -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE t_index_agg_func
+(
+    id UInt64,
+    v AggregateFunction(avg, UInt64),
+)
+ENGINE = AggregatingMergeTree ORDER BY id
+SETTINGS index_granularity = 4;
+
+ALTER TABLE t_index_agg_func ADD INDEX idx_v v TYPE minmax GRANULARITY 1; -- { serverError BAD_ARGUMENTS }
+
+ALTER TABLE t_index_agg_func ADD INDEX idx_v finalizeAggregation(v) TYPE minmax GRANULARITY 1;
+
+INSERT INTO t_index_agg_func SELECT number % 10, initializeAggregation('avgState', toUInt64(number % 20)) FROM numbers(1000);
+INSERT INTO t_index_agg_func SELECT number % 10, initializeAggregation('avgState', toUInt64(number % 20)) FROM numbers(1000, 1000);
+
+OPTIMIZE TABLE t_index_agg_func FINAL;
+
+SELECT count() FROM system.parts WHERE table = 't_index_agg_func' AND database = currentDatabase() AND active;
+
+SET force_data_skipping_indices = 'idx_v';
+SET use_skip_indexes_if_final = 1;
+
+SELECT id, finalizeAggregation(v) AS vv FROM t_index_agg_func FINAL WHERE vv >= 10 ORDER BY id;
+
+DROP TABLE t_index_agg_func;
diff --git a/tests/queries/0_stateless/02985_parser_check_stack_size.reference b/tests/queries/0_stateless/02985_parser_check_stack_size.reference
new file mode 100644
index 00000000000..f83e0818db2
--- /dev/null
+++ b/tests/queries/0_stateless/02985_parser_check_stack_size.reference
@@ -0,0 +1 @@
+TOO_DEEP
diff --git a/tests/queries/0_stateless/02985_parser_check_stack_size.sh b/tests/queries/0_stateless/02985_parser_check_stack_size.sh
new file mode 100755
index 00000000000..c91a0a3eacc
--- /dev/null
+++ b/tests/queries/0_stateless/02985_parser_check_stack_size.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+$CLICKHOUSE_CLIENT --query "select 'create table test (x ' || repeat('Array(', 10000) || 'UInt64' || repeat(')', 10000) || ') engine=Memory' format TSVRaw" | $CLICKHOUSE_CURL "${CLICKHOUSE_URL}&max_parser_depth=100000" --data-binary @- | grep -o -F 'TOO_DEEP'
diff --git a/tests/queries/0_stateless/02985_shard_query_start_time.reference b/tests/queries/0_stateless/02985_shard_query_start_time.reference
new file mode 100644
index 00000000000..ff563ea1d53
--- /dev/null
+++ b/tests/queries/0_stateless/02985_shard_query_start_time.reference
@@ -0,0 +1,2 @@
+QueryStart	2	2	2	2
+QueryFinish	2	2	2	2
diff --git a/tests/queries/0_stateless/02985_shard_query_start_time.sql b/tests/queries/0_stateless/02985_shard_query_start_time.sql
new file mode 100644
index 00000000000..c31d81e58ae
--- /dev/null
+++ b/tests/queries/0_stateless/02985_shard_query_start_time.sql
@@ -0,0 +1,34 @@
+DROP TABLE IF EXISTS sharded_table;
+CREATE TABLE sharded_table (dummy UInt8) ENGINE = Distributed('test_cluster_two_shards', 'system', 'one');
+
+SET prefer_localhost_replica=0;
+SELECT * FROM sharded_table FORMAT Null SETTINGS log_comment='02985_shard_query_start_time_query_1';
+
+SYSTEM FLUSH LOGS;
+
+-- Check that there are 2 queries to shards and for each one query_start_time_microseconds is more recent
+-- than initial_query_start_time_microseconds, and initial_query_start_time_microseconds matches the original query
+-- query_start_time_microseconds
+WITH
+(
+    SELECT
+        (query_id, query_start_time, query_start_time_microseconds)
+    FROM
+        system.query_log
+    WHERE
+          event_date >= yesterday()
+      AND current_database = currentDatabase()
+      AND log_comment = '02985_shard_query_start_time_query_1'
+      AND type = 'QueryFinish'
+) AS id_and_start_tuple
+SELECT
+    type,
+    countIf(query_start_time >= initial_query_start_time), -- Using >= because it's comparing seconds
+    countIf(query_start_time_microseconds > initial_query_start_time_microseconds),
+    countIf(initial_query_start_time = id_and_start_tuple.2),
+    countIf(initial_query_start_time_microseconds = id_and_start_tuple.3)
+FROM
+    system.query_log
+WHERE
+    NOT is_initial_query AND initial_query_id = id_and_start_tuple.1
+GROUP BY type;
diff --git a/tests/queries/0_stateless/02986_leftpad_fixedstring.reference b/tests/queries/0_stateless/02986_leftpad_fixedstring.reference
new file mode 100644
index 00000000000..8e51d03d0a8
--- /dev/null
+++ b/tests/queries/0_stateless/02986_leftpad_fixedstring.reference
@@ -0,0 +1,124 @@
+	
+a	String
+	
+a	String
+	1	1	1
+61	1	1	1
+6162	1	1	1
+616263	1	1	1
+61626333	1	1	1
+6162633334	1	1	1
+616263333433	1	1	1
+61626333343332	1	1	1
+6162633334333234	1	1	1
+206162633334333234	1	1	1
+20206162633334333234	1	1	1
+2020206162633334333234	1	1	1
+202020206162633334333234	1	1	1
+20202020206162633334333234	1	1	1
+2020202020206162633334333234	1	1	1
+202020202020206162633334333234	1	1	1
+20202020202020206162633334333234	1	1	1
+2020202020202020206162633334333234	1	1	1
+202020202020202020206162633334333234	1	1	1
+20202020202020202020206162633334333234	1	1	1
+	1	1	1
+61	1	1	1
+6162	1	1	1
+616263	1	1	1
+61626333	1	1	1
+6162633334	1	1	1
+616263333433	1	1	1
+61626333343332	1	1	1
+6162633334333234	1	1	1
+616263333433323420	1	1	1
+61626333343332342020	1	1	1
+6162633334333234202020	1	1	1
+616263333433323420202020	1	1	1
+61626333343332342020202020	1	1	1
+6162633334333234202020202020	1	1	1
+616263333433323420202020202020	1	1	1
+61626333343332342020202020202020	1	1	1
+6162633334333234202020202020202020	1	1	1
+616263333433323420202020202020202020	1	1	1
+61626333343332342020202020202020202020	1	1	1
+	1
+61	1
+6162	1
+616263	1
+61626333	1
+6162633334	1
+616263333433	1
+61626333343332	1
+6162633334333234	1
+F09F87AA6162633334333234	1
+F09F87AAF09F87B86162633334333234	1
+F09F87AAF09F87B8F09F87AA6162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B86162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA6162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B86162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA6162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B86162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA6162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B86162633334333234	1
+F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA6162633334333234	1
+	1
+61	1
+6162	1
+616263	1
+61626333	1
+6162633334	1
+616263333433	1
+61626333343332	1
+6162633334333234	1
+6162633334333234F09F87AA	1
+6162633334333234F09F87AAF09F87B8	1
+6162633334333234F09F87AAF09F87B8F09F87AA	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8	1
+6162633334333234F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AAF09F87B8F09F87AA	1
+	1
+F09F87AA	1
+F09F87AAF09F87B8	1
+C391F09F87AAF09F87B8	1
+C391C391F09F87AAF09F87B8	1
+C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391F09F87AAF09F87B8	1
+	1
+F09F87AA	1
+F09F87AAF09F87B8	1
+F09F87AAF09F87B8C391	1
+F09F87AAF09F87B8C391C391	1
+F09F87AAF09F87B8C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391	1
+F09F87AAF09F87B8C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391C391	1
diff --git a/tests/queries/0_stateless/02986_leftpad_fixedstring.sql b/tests/queries/0_stateless/02986_leftpad_fixedstring.sql
new file mode 100644
index 00000000000..eaed9b3adc6
--- /dev/null
+++ b/tests/queries/0_stateless/02986_leftpad_fixedstring.sql
@@ -0,0 +1,41 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/59604
+SELECT leftPad(toFixedString('abc', 3), 0), leftPad('abc', CAST('0', 'Int32'));
+SELECT leftPad(toFixedString('abc343243424324', 15), 1) as a, toTypeName(a);
+
+SELECT rightPad(toFixedString('abc', 3), 0), rightPad('abc', CAST('0', 'Int32'));
+SELECT rightPad(toFixedString('abc343243424324', 15), 1) as a, toTypeName(a);
+
+SELECT
+    hex(leftPad(toFixedString('abc34324' as s, 8), number)) as result,
+    hex(leftPad(s, number)) = result,
+    hex(leftPadUTF8(toFixedString(s, 8), number)) = result,
+    hex(leftPadUTF8(s, number)) = result
+FROM numbers(20);
+
+SELECT
+    hex(rightPad(toFixedString('abc34324' as s, 8), number)) as result,
+    hex(rightPad(s, number)) = result,
+    hex(rightPadUTF8(toFixedString(s, 8), number)) = result,
+    hex(rightPadUTF8(s, number)) = result
+FROM numbers(20);
+
+-- I'm not confident the behaviour should be like this. I'm only testing memory problems
+SELECT
+    hex(leftPadUTF8(toFixedString('abc34324' as s, 8), number, '🇪🇸')) as result,
+    hex(leftPadUTF8(s, number, '🇪🇸')) = result
+FROM numbers(20);
+
+SELECT
+    hex(rightPadUTF8(toFixedString('abc34324' as s, 8), number, '🇪🇸')) as result,
+    hex(rightPadUTF8(s, number, '🇪🇸')) = result
+FROM numbers(20);
+
+SELECT
+    hex(leftPadUTF8(toFixedString('🇪🇸' as s, 8), number, 'Ñ')) as result,
+    hex(leftPadUTF8(s, number, 'Ñ')) = result
+FROM numbers(20);
+
+SELECT
+    hex(rightPadUTF8(toFixedString('🇪🇸' as s, 8), number, 'Ñ')) as result,
+    hex(rightPadUTF8(s, number, 'Ñ')) = result
+FROM numbers(20);
diff --git a/tests/queries/0_stateless/02987_group_array_intersect.reference b/tests/queries/0_stateless/02987_group_array_intersect.reference
new file mode 100644
index 00000000000..7ec64a889f5
--- /dev/null
+++ b/tests/queries/0_stateless/02987_group_array_intersect.reference
@@ -0,0 +1,21 @@
+[]
+[]
+[NULL]
+[NULL]
+[]
+[[1,2,4,5]]
+[]
+[1,4,5]
+[]
+[]
+1000000
+999999
+[9]
+['a','c']
+1000000
+999999
+['1']
+[]
+['2023-01-01 00:00:00']
+['2023-01-01']
+['2023-01-01']
diff --git a/tests/queries/0_stateless/02987_group_array_intersect.sql b/tests/queries/0_stateless/02987_group_array_intersect.sql
new file mode 100644
index 00000000000..321e860b0a8
--- /dev/null
+++ b/tests/queries/0_stateless/02987_group_array_intersect.sql
@@ -0,0 +1,93 @@
+SET merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability = 0.0;
+
+DROP TABLE IF EXISTS test_empty;
+CREATE TABLE test_empty (a Array(Int64)) engine=MergeTree ORDER BY a;
+INSERT INTO test_empty VALUES ([]);
+SELECT groupArrayIntersect(*) FROM test_empty;
+INSERT INTO test_empty VALUES ([1]);
+SELECT groupArrayIntersect(*) FROM test_empty;
+DROP TABLE test_empty;
+
+DROP TABLE IF EXISTS test_null;
+CREATE TABLE test_null (a Array(Nullable(Int64))) engine=MergeTree ORDER BY a SETTINGS allow_nullable_key=1;
+INSERT INTO test_null VALUES ([NULL, NULL]);
+SELECT groupArrayIntersect(*) FROM test_null;
+INSERT INTO test_null VALUES ([NULL]);
+SELECT groupArrayIntersect(*) FROM test_null;
+INSERT INTO test_null VALUES ([1,2]);
+SELECT groupArrayIntersect(*) FROM test_null;
+DROP TABLE test_null;
+
+DROP TABLE IF EXISTS test_nested_arrays;
+CREATE TABLE test_nested_arrays (a Array(Array(Int64))) engine=MergeTree ORDER BY a;
+INSERT INTO test_nested_arrays VALUES ([[1,2,3,4,5,6], [1,2,4,5]]);
+INSERT INTO test_nested_arrays VALUES ([[1,2,4,5]]);
+SELECT groupArrayIntersect(*) FROM test_nested_arrays;
+INSERT INTO test_nested_arrays VALUES ([[1,4,3,0,5,5,5]]);
+SELECT groupArrayIntersect(*) FROM test_nested_arrays;
+DROP TABLE test_nested_arrays;
+
+DROP TABLE IF EXISTS test_numbers;
+CREATE TABLE test_numbers (a Array(Int64)) engine=MergeTree ORDER BY a;
+INSERT INTO test_numbers VALUES ([1,2,3,4,5,6]);
+INSERT INTO test_numbers VALUES ([1,2,4,5]);
+INSERT INTO test_numbers VALUES ([1,4,3,0,5,5,5]);
+SELECT groupArrayIntersect(*) FROM test_numbers;
+INSERT INTO test_numbers VALUES ([9]);
+SELECT groupArrayIntersect(*) FROM test_numbers;
+DROP TABLE test_numbers;
+
+DROP TABLE IF EXISTS test_big_numbers_sep;
+CREATE TABLE test_big_numbers_sep (a Array(Int64)) engine=MergeTree ORDER BY a;
+INSERT INTO test_big_numbers_sep SELECT array(number) FROM numbers_mt(1000000);
+SELECT groupArrayIntersect(*) FROM test_big_numbers_sep;
+DROP TABLE test_big_numbers_sep;
+
+DROP TABLE IF EXISTS test_big_numbers;
+CREATE TABLE test_big_numbers (a Array(Int64)) engine=MergeTree ORDER BY a;
+INSERT INTO test_big_numbers SELECT range(1000000);
+SELECT length(groupArrayIntersect(*)) FROM test_big_numbers;
+INSERT INTO test_big_numbers SELECT range(999999);
+SELECT length(groupArrayIntersect(*)) FROM test_big_numbers;
+INSERT INTO test_big_numbers VALUES ([9]);
+SELECT groupArrayIntersect(*) FROM test_big_numbers;
+DROP TABLE test_big_numbers;
+
+DROP TABLE IF EXISTS test_string;
+CREATE TABLE test_string (a Array(String)) engine=MergeTree ORDER BY a;
+INSERT INTO test_string VALUES (['a', 'b', 'c', 'd', 'e', 'f']);
+INSERT INTO test_string VALUES (['a', 'aa', 'b', 'bb', 'c', 'cc', 'd', 'dd', 'f', 'ff']);
+INSERT INTO test_string VALUES (['ae', 'ab', 'a', 'bb', 'c']);
+SELECT groupArrayIntersect(*) FROM test_string;
+DROP TABLE test_string;
+
+DROP TABLE IF EXISTS test_big_string;
+CREATE TABLE test_big_string (a Array(String)) engine=MergeTree ORDER BY a;
+INSERT INTO test_big_string SELECT groupArray(toString(number)) FROM numbers_mt(1000000);
+SELECT length(groupArrayIntersect(*)) FROM test_big_string;
+INSERT INTO test_big_string SELECT groupArray(toString(number)) FROM numbers_mt(999999);
+SELECT length(groupArrayIntersect(*)) FROM test_big_string;
+INSERT INTO test_big_string VALUES (['1']);
+SELECT groupArrayIntersect(*) FROM test_big_string;
+INSERT INTO test_big_string VALUES (['a']);
+SELECT groupArrayIntersect(*) FROM test_big_string;
+DROP TABLE test_big_string;
+
+DROP TABLE IF EXISTS test_datetime;
+CREATE TABLE test_datetime (a Array(DateTime)) engine=MergeTree ORDER BY a;
+INSERT INTO test_datetime VALUES ([toDateTime('2023-01-01 00:00:00'), toDateTime('2023-01-01 01:02:03'), toDateTime('2023-01-01 02:03:04')]);
+INSERT INTO test_datetime VALUES ([toDateTime('2023-01-01 00:00:00'), toDateTime('2023-01-01 01:02:04'), toDateTime('2023-01-01 02:03:05')]);
+SELECT groupArrayIntersect(*) from test_datetime;
+DROP TABLE test_datetime;
+
+DROP TABLE IF EXISTS test_date32;
+CREATE TABLE test_date32 (a Array(Date32)) engine=MergeTree ORDER BY a;
+INSERT INTO test_date32 VALUES ([toDate32('2023-01-01 00:00:00'), toDate32('2023-01-01 00:00:01')]);
+SELECT groupArrayIntersect(*) from test_date32;
+DROP TABLE test_date32;
+
+DROP TABLE IF EXISTS test_date;
+CREATE TABLE test_date (a Array(Date)) engine=MergeTree ORDER BY a;
+INSERT INTO test_date VALUES ([toDate('2023-01-01 00:00:00'), toDate('2023-01-01 00:00:01')]);
+SELECT groupArrayIntersect(*) from test_date;
+DROP TABLE test_date;
diff --git a/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.reference b/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql b/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql
new file mode 100644
index 00000000000..be7689025b2
--- /dev/null
+++ b/tests/queries/0_stateless/02987_logical_optimizer_pass_lowcardinality.sql
@@ -0,0 +1,5 @@
+CREATE TABLE 02987_logical_optimizer_table (key Int, value Int) ENGINE=Memory();
+CREATE VIEW v1 AS SELECT * FROM 02987_logical_optimizer_table;
+CREATE TABLE 02987_logical_optimizer_merge AS v1 ENGINE=Merge(currentDatabase(), 'v1');
+
+SELECT _table, key FROM 02987_logical_optimizer_merge WHERE (_table = toFixedString(toFixedString(toFixedString('v1', toNullable(2)), 2), 2)) OR ((value = toLowCardinality(toNullable(10))) AND (_table = toFixedString(toNullable('v3'), 2))) OR ((value = 20) AND (_table = toFixedString(toFixedString(toFixedString('v1', 2), 2), 2)) AND (_table = toFixedString(toLowCardinality(toFixedString('v3', 2)), 2))) SETTINGS allow_experimental_analyzer = true, join_use_nulls = true, convert_query_to_cnf = true;
diff --git a/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.reference b/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.reference
new file mode 100644
index 00000000000..c9bf491872a
--- /dev/null
+++ b/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.reference
@@ -0,0 +1,2 @@
+1	a
+2	b	Int64
diff --git a/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.sql b/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.sql
new file mode 100644
index 00000000000..db49f155d3f
--- /dev/null
+++ b/tests/queries/0_stateless/02988_join_using_prewhere_pushdown.sql
@@ -0,0 +1,24 @@
+DROP TABLE IF EXISTS t;
+
+SET allow_suspicious_low_cardinality_types = 1;
+
+
+CREATE TABLE t (`id` UInt16, `u` LowCardinality(Int32), `s` LowCardinality(String))
+ENGINE = MergeTree ORDER BY id;
+
+INSERT INTO t VALUES (1,1,'a'),(2,2,'b');
+
+SELECT u, s FROM t
+INNER JOIN ( SELECT number :: Int32 AS u FROM numbers(10) ) AS t1
+USING (u)
+WHERE u != 2
+;
+
+SELECT u, s, toTypeName(u) FROM t
+FULL JOIN ( SELECT number :: UInt32 AS u FROM numbers(10) ) AS t1
+USING (u)
+WHERE u == 2
+ORDER BY 1
+;
+
+DROP TABLE IF EXISTS t;
diff --git a/tests/queries/0_stateless/02988_ordinary_database_warning.reference b/tests/queries/0_stateless/02988_ordinary_database_warning.reference
new file mode 100644
index 00000000000..587579af915
--- /dev/null
+++ b/tests/queries/0_stateless/02988_ordinary_database_warning.reference
@@ -0,0 +1 @@
+Ok.
diff --git a/tests/queries/0_stateless/02988_ordinary_database_warning.sql b/tests/queries/0_stateless/02988_ordinary_database_warning.sql
new file mode 100644
index 00000000000..2a9756d6f66
--- /dev/null
+++ b/tests/queries/0_stateless/02988_ordinary_database_warning.sql
@@ -0,0 +1,10 @@
+DROP DATABASE IF EXISTS 02988_ordinary;
+
+SET send_logs_level = 'fatal';
+SET allow_deprecated_database_ordinary = 1;
+-- Creation of a database with Ordinary engine emits a warning.
+CREATE DATABASE 02988_ordinary ENGINE=Ordinary;
+
+SELECT DISTINCT 'Ok.' FROM system.warnings WHERE message ILIKE '%Ordinary%' and message ILIKE '%deprecated%';
+
+DROP DATABASE IF EXISTS 02988_ordinary;
diff --git a/tests/queries/0_stateless/02989_group_by_tuple.reference b/tests/queries/0_stateless/02989_group_by_tuple.reference
new file mode 100644
index 00000000000..4539bbf2d22
--- /dev/null
+++ b/tests/queries/0_stateless/02989_group_by_tuple.reference
@@ -0,0 +1,3 @@
+0
+1
+2
diff --git a/tests/queries/0_stateless/02989_group_by_tuple.sql b/tests/queries/0_stateless/02989_group_by_tuple.sql
new file mode 100644
index 00000000000..d0a205f5edc
--- /dev/null
+++ b/tests/queries/0_stateless/02989_group_by_tuple.sql
@@ -0,0 +1 @@
+SELECT number FROM numbers(3) GROUP BY (number, number % 2) ORDER BY number;
diff --git a/tests/queries/0_stateless/02989_join_using_parent_scope.reference b/tests/queries/0_stateless/02989_join_using_parent_scope.reference
new file mode 100644
index 00000000000..965bfaf7c43
--- /dev/null
+++ b/tests/queries/0_stateless/02989_join_using_parent_scope.reference
@@ -0,0 +1,136 @@
+-- { echoOn }
+SELECT 1 AS a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+1
+1
+1
+1
+SELECT a + 2 AS b FROM ta JOIN tabc USING (b) ORDER BY ALL;
+2
+3
+4
+SELECT b + 2 AS a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+2
+3
+SELECT a + 2 AS c FROM ta JOIN tabc USING (c) ORDER BY ALL;
+2
+3
+4
+5
+SELECT b AS a, a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+0	0
+1	1
+2	2
+3	3
+SELECT 1 AS b FROM tb JOIN ta USING (b); -- { serverError UNKNOWN_IDENTIFIER }
+-- SELECT * returns all columns from both tables in new analyzer
+SELECT 3 AS a, a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+3	3	0	3	abc3
+3	3	1	3	abc3
+3	3	2	3	abc3
+3	3	3	3	abc3
+3	3	\N	0	abc0
+3	3	\N	1	abc1
+3	3	\N	2	abc2
+SELECT b + 1 AS a, * FROM tb JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	abc1
+2	1	2	abc2
+3	2	3	abc3
+SELECT b + 1 AS a, * FROM tb JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	abc1
+2	1	2	abc2
+3	2	3	abc3
+SELECT b + 1 AS a, * FROM tb LEFT JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	abc1
+2	1	2	abc2
+3	2	3	abc3
+4	3	\N	\N
+SELECT b + 1 AS a, * FROM tb RIGHT JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	abc1
+2	1	2	abc2
+3	2	3	abc3
+\N	\N	0	abc0
+SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	abc1
+2	1	2	abc2
+3	2	3	abc3
+4	3	\N	\N
+\N	\N	0	abc0
+SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS asterisk_include_alias_columns = 1, allow_experimental_analyzer = 1;
+1	0	1	abc1	2	3
+2	1	2	abc2	3	4
+3	2	3	abc3	4	5
+4	3	\N	\N	\N	\N
+\N	\N	0	abc0	1	2
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	2
+2	1	2	3
+3	2	3	4
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 LEFT JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	2
+2	1	2	3
+3	2	3	4
+4	3	\N	\N
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 RIGHT JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	2
+2	1	2	3
+3	2	3	4
+\N	\N	0	1
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 FULL JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+1	0	1	2
+2	1	2	3
+3	2	3	4
+4	3	\N	\N
+\N	\N	0	1
+SELECT b + 1 AS a, s FROM tb FULL OUTER JOIN tabc USING (a) PREWHERE a > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+3	abc3
+4	\N
+\N	abc0
+\N	abc1
+\N	abc2
+-- It's a default behavior for old analyzer and new with analyzer_compatibility_join_using_top_level_identifier
+-- Column `b` actually exists in left table, but `b` from USING is resoled to `a + 2` and `a` is not in left table
+-- so we get UNKNOWN_IDENTIFIER error.
+SELECT a + 2 AS b FROM tb JOIN tabc USING (b) ORDER BY ALL
+SETTINGS analyzer_compatibility_join_using_top_level_identifier = 1; -- { serverError UNKNOWN_IDENTIFIER }
+-- In new analyzer with `analyzer_compatibility_join_using_top_level_identifier = 0` we get `b` from left table
+SELECT a + 2 AS b FROM tb JOIN tabc USING (b) ORDER BY ALL
+SETTINGS analyzer_compatibility_join_using_top_level_identifier = 0, allow_experimental_analyzer = 1;
+2
+3
+4
+-- This is example where query may return different results with different `analyzer_compatibility_join_using_top_level_identifier`
+
+DROP TABLE IF EXISTS users;
+CREATE TABLE users (uid Int16, name String, spouse_name String) ENGINE=Memory;
+INSERT INTO users VALUES (1231, 'John', 'Ksenia');
+INSERT INTO users VALUES (6666, 'Ksenia', '');
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 1;
+uid	name	u2.uid	u2.name
+Int16	String	Int16	String
+1231	Ksenia	6666	Ksenia
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 0;
+uid	name	u2.uid	u2.name
+Int16	String	Int16	String
+1231	Ksenia	1231	John
+6666		6666	Ksenia
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 0;
+uid	name	u2.uid	u2.name
+Int16	String	Int16	String
+1231	Ksenia	6666	Ksenia
+DROP TABLE IF EXISTS users;
+DROP TABLE IF EXISTS tabc;
+DROP TABLE IF EXISTS ta;
+DROP TABLE IF EXISTS tb;
+DROP TABLE IF EXISTS tc;
diff --git a/tests/queries/0_stateless/02989_join_using_parent_scope.sql b/tests/queries/0_stateless/02989_join_using_parent_scope.sql
new file mode 100644
index 00000000000..2e4d9f097f7
--- /dev/null
+++ b/tests/queries/0_stateless/02989_join_using_parent_scope.sql
@@ -0,0 +1,86 @@
+DROP TABLE IF EXISTS tabc;
+CREATE TABLE tabc (a UInt32, b UInt32 ALIAS a + 1, c UInt32 ALIAS b + 1, s String) ENGINE = MergeTree ORDER BY a;
+INSERT INTO tabc (a, s) SELECT number, 'abc' || toString(number) FROM numbers(4);
+
+DROP TABLE IF EXISTS ta;
+CREATE TABLE ta (a Int32) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO ta SELECT number FROM numbers(4);
+
+DROP TABLE IF EXISTS tb;
+CREATE TABLE tb (b Int32) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO tb SELECT number FROM numbers(4);
+
+SET join_use_nulls = 1;
+
+SET analyzer_compatibility_join_using_top_level_identifier = 1;
+
+-- { echoOn }
+SELECT 1 AS a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+SELECT a + 2 AS b FROM ta JOIN tabc USING (b) ORDER BY ALL;
+SELECT b + 2 AS a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+SELECT a + 2 AS c FROM ta JOIN tabc USING (c) ORDER BY ALL;
+
+SELECT b AS a, a FROM tb JOIN tabc USING (a) ORDER BY ALL;
+SELECT 1 AS b FROM tb JOIN ta USING (b); -- { serverError UNKNOWN_IDENTIFIER }
+
+-- SELECT * returns all columns from both tables in new analyzer
+SELECT 3 AS a, a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM tb JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+
+SELECT b + 1 AS a, * FROM tb JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM tb LEFT JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM tb RIGHT JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM tb FULL JOIN tabc USING (a) ORDER BY ALL SETTINGS asterisk_include_alias_columns = 1, allow_experimental_analyzer = 1;
+
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 LEFT JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 RIGHT JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+SELECT b + 1 AS a, * FROM (SELECT b FROM tb) t1 FULL JOIN (SELECT a, b FROM tabc) t2 USING (a) ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+
+SELECT b + 1 AS a, s FROM tb FULL OUTER JOIN tabc USING (a) PREWHERE a > 2 ORDER BY ALL SETTINGS allow_experimental_analyzer = 1;
+
+
+-- It's a default behavior for old analyzer and new with analyzer_compatibility_join_using_top_level_identifier
+-- Column `b` actually exists in left table, but `b` from USING is resoled to `a + 2` and `a` is not in left table
+-- so we get UNKNOWN_IDENTIFIER error.
+SELECT a + 2 AS b FROM tb JOIN tabc USING (b) ORDER BY ALL
+SETTINGS analyzer_compatibility_join_using_top_level_identifier = 1; -- { serverError UNKNOWN_IDENTIFIER }
+
+-- In new analyzer with `analyzer_compatibility_join_using_top_level_identifier = 0` we get `b` from left table
+SELECT a + 2 AS b FROM tb JOIN tabc USING (b) ORDER BY ALL
+SETTINGS analyzer_compatibility_join_using_top_level_identifier = 0, allow_experimental_analyzer = 1;
+
+-- This is example where query may return different results with different `analyzer_compatibility_join_using_top_level_identifier`
+
+DROP TABLE IF EXISTS users;
+CREATE TABLE users (uid Int16, name String, spouse_name String) ENGINE=Memory;
+
+INSERT INTO users VALUES (1231, 'John', 'Ksenia');
+INSERT INTO users VALUES (6666, 'Ksenia', '');
+
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 1;
+
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 1, analyzer_compatibility_join_using_top_level_identifier = 0;
+
+SELECT u1.uid, u1.spouse_name as name, u2.uid, u2.name
+FROM users u1 JOIN users u2 USING (name)
+ORDER BY u1.uid
+FORMAT TSVWithNamesAndTypes
+SETTINGS allow_experimental_analyzer = 0;
+
+DROP TABLE IF EXISTS users;
+
+
+DROP TABLE IF EXISTS tabc;
+DROP TABLE IF EXISTS ta;
+DROP TABLE IF EXISTS tb;
+DROP TABLE IF EXISTS tc;
diff --git a/tests/queries/0_stateless/02955_analyzer_using_functional_args.reference b/tests/queries/0_stateless/02989_mysql_transaction_test.reference
similarity index 100%
rename from tests/queries/0_stateless/02955_analyzer_using_functional_args.reference
rename to tests/queries/0_stateless/02989_mysql_transaction_test.reference
diff --git a/tests/queries/0_stateless/02989_mysql_transaction_test.sh b/tests/queries/0_stateless/02989_mysql_transaction_test.sh
new file mode 100755
index 00000000000..ffb113255f7
--- /dev/null
+++ b/tests/queries/0_stateless/02989_mysql_transaction_test.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Tag no-fasttest: requires mysql client
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${MYSQL_CLIENT} --verbose --execute "COMMIT;" | grep -c "COMMIT"
+${MYSQL_CLIENT} --verbose --execute "ROLLBACK;" | grep -c "ROLLBACK"
diff --git a/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.reference b/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.reference
new file mode 100644
index 00000000000..128e3adcc0a
--- /dev/null
+++ b/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.reference
@@ -0,0 +1,14 @@
+Row 1:
+──────
+name:    metadata
+version: 1
+--
+Row 1:
+──────
+name:  metadata_version
+value: 1
+--
+id	UInt64					
+value	String					
+insert_time	DateTime					
+insert_time_updated	DateTime					
diff --git a/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.sql b/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.sql
new file mode 100644
index 00000000000..15633586aa8
--- /dev/null
+++ b/tests/queries/0_stateless/02989_replicated_merge_tree_invalid_metadata_version.sql
@@ -0,0 +1,40 @@
+-- Tags: zookeeper
+
+DROP TABLE IF EXISTS test_table_replicated;
+CREATE TABLE test_table_replicated
+(
+    id UInt64,
+    value String
+) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_table_replicated', '1_replica') ORDER BY id;
+
+ALTER TABLE test_table_replicated ADD COLUMN insert_time DateTime;
+
+SELECT name, version FROM system.zookeeper
+WHERE path = (SELECT zookeeper_path FROM system.replicas WHERE database = currentDatabase() AND table = 'test_table_replicated')
+AND name = 'metadata' FORMAT Vertical;
+
+DROP TABLE IF EXISTS test_table_replicated_second;
+CREATE TABLE test_table_replicated_second
+(
+    id UInt64,
+    value String,
+    insert_time DateTime
+) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_table_replicated', '2_replica') ORDER BY id;
+
+DROP TABLE test_table_replicated;
+
+SELECT '--';
+
+SELECT name, value FROM system.zookeeper
+WHERE path = (SELECT replica_path FROM system.replicas WHERE database = currentDatabase() AND table = 'test_table_replicated_second')
+AND name = 'metadata_version' FORMAT Vertical;
+
+SYSTEM RESTART REPLICA test_table_replicated_second;
+
+ALTER TABLE test_table_replicated_second ADD COLUMN insert_time_updated DateTime;
+
+SELECT '--';
+
+DESCRIBE test_table_replicated_second;
+
+DROP TABLE test_table_replicated_second;
diff --git a/tests/queries/0_stateless/02989_system_tables_metadata_version.reference b/tests/queries/0_stateless/02989_system_tables_metadata_version.reference
new file mode 100644
index 00000000000..73f6a1ad346
--- /dev/null
+++ b/tests/queries/0_stateless/02989_system_tables_metadata_version.reference
@@ -0,0 +1,9 @@
+test_temporary_table_02989	0
+--
+test_table	0
+--
+test_table_replicated	0
+--
+test_table_replicated	1
+--
+test_table_replicated	2
diff --git a/tests/queries/0_stateless/02989_system_tables_metadata_version.sql b/tests/queries/0_stateless/02989_system_tables_metadata_version.sql
new file mode 100644
index 00000000000..9534b1f2e82
--- /dev/null
+++ b/tests/queries/0_stateless/02989_system_tables_metadata_version.sql
@@ -0,0 +1,50 @@
+-- Tags: zookeeper, no-parallel
+
+DROP TABLE IF EXISTS test_temporary_table_02989;
+CREATE TEMPORARY TABLE test_temporary_table_02989
+(
+    id UInt64,
+    value String
+) ENGINE=MergeTree ORDER BY id;
+
+SELECT name, metadata_version FROM system.tables WHERE name = 'test_temporary_table_02989' AND is_temporary;
+
+DROP TABLE test_temporary_table_02989;
+
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    id UInt64,
+    value String
+) ENGINE=MergeTree ORDER BY id;
+
+SELECT '--';
+
+SELECT name, metadata_version FROM system.tables WHERE database = currentDatabase() AND name = 'test_table';
+
+DROP TABLE test_table;
+
+DROP TABLE IF EXISTS test_table_replicated;
+CREATE TABLE test_table_replicated
+(
+    id UInt64,
+    value String
+) ENGINE=ReplicatedMergeTree('/clickhouse/tables/{database}/test_table_replicated', '1_replica') ORDER BY id;
+
+SELECT '--';
+
+SELECT name, metadata_version FROM system.tables WHERE database = currentDatabase() AND name = 'test_table_replicated';
+
+ALTER TABLE test_table_replicated ADD COLUMN insert_time DateTime;
+
+SELECT '--';
+
+SELECT name, metadata_version FROM system.tables WHERE database = currentDatabase() AND name = 'test_table_replicated';
+
+ALTER TABLE test_table_replicated ADD COLUMN insert_time_updated DateTime;
+
+SELECT '--';
+
+SELECT name, metadata_version FROM system.tables WHERE database = currentDatabase() AND name = 'test_table_replicated';
+
+DROP TABLE test_table_replicated;
diff --git a/tests/queries/0_stateless/02989_variant_comparison.reference b/tests/queries/0_stateless/02989_variant_comparison.reference
new file mode 100644
index 00000000000..df192c6fe8c
--- /dev/null
+++ b/tests/queries/0_stateless/02989_variant_comparison.reference
@@ -0,0 +1,299 @@
+order by v1 nulls first
+\N
+\N
+\N
+\N
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,4]
+abc
+abc
+abc
+abc
+abc
+abd
+42
+42
+42
+42
+42
+43
+order by v1 nulls last
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,4]
+abc
+abc
+abc
+abc
+abc
+abd
+42
+42
+42
+42
+42
+43
+\N
+\N
+\N
+\N
+order by v2 nulls first
+\N
+\N
+\N
+\N
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,4]
+abc
+abc
+abc
+abc
+abc
+abd
+42
+42
+42
+42
+42
+43
+order by v2 nulls last
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,3]
+[1,2,4]
+abc
+abc
+abc
+abc
+abc
+abd
+42
+42
+42
+42
+42
+43
+\N
+\N
+\N
+\N
+order by v1, v2 nulls first
+[1,2,3]	\N
+[1,2,3]	[1,2,3]
+[1,2,3]	[1,2,4]
+[1,2,3]	abc
+[1,2,3]	42
+[1,2,4]	[1,2,3]
+abc	\N
+abc	[1,2,3]
+abc	abc
+abc	abd
+abc	42
+abd	abc
+42	\N
+42	[1,2,3]
+42	abc
+42	42
+42	43
+43	42
+\N	\N
+\N	[1,2,3]
+\N	abc
+\N	42
+order by v1, v2 nulls last
+[1,2,3]	[1,2,3]
+[1,2,3]	[1,2,4]
+[1,2,3]	abc
+[1,2,3]	42
+[1,2,3]	\N
+[1,2,4]	[1,2,3]
+abc	[1,2,3]
+abc	abc
+abc	abd
+abc	42
+abc	\N
+abd	abc
+42	[1,2,3]
+42	abc
+42	42
+42	43
+42	\N
+43	42
+\N	[1,2,3]
+\N	abc
+\N	42
+\N	\N
+order by v2, v1 nulls first
+\N	[1,2,3]
+[1,2,3]	[1,2,3]
+[1,2,4]	[1,2,3]
+abc	[1,2,3]
+42	[1,2,3]
+[1,2,3]	[1,2,4]
+\N	abc
+[1,2,3]	abc
+abc	abc
+abd	abc
+42	abc
+abc	abd
+\N	42
+[1,2,3]	42
+abc	42
+42	42
+43	42
+42	43
+\N	\N
+[1,2,3]	\N
+abc	\N
+42	\N
+order by v2, v1 nulls last
+[1,2,3]	[1,2,3]
+[1,2,4]	[1,2,3]
+abc	[1,2,3]
+42	[1,2,3]
+\N	[1,2,3]
+[1,2,3]	[1,2,4]
+[1,2,3]	abc
+abc	abc
+abd	abc
+42	abc
+\N	abc
+abc	abd
+[1,2,3]	42
+abc	42
+42	42
+43	42
+\N	42
+42	43
+[1,2,3]	\N
+abc	\N
+42	\N
+\N	\N
+v1 = v2
+[1,2,3]	[1,2,3]	1
+[1,2,3]	[1,2,4]	0
+[1,2,3]	abc	0
+[1,2,3]	42	0
+[1,2,3]	\N	0
+[1,2,4]	[1,2,3]	0
+abc	[1,2,3]	0
+abc	abc	1
+abc	abd	0
+abc	42	0
+abc	\N	0
+abd	abc	0
+42	[1,2,3]	0
+42	abc	0
+42	42	1
+42	43	0
+42	\N	0
+43	42	0
+\N	[1,2,3]	0
+\N	abc	0
+\N	42	0
+\N	\N	1
+v1 < v2
+[1,2,3]	[1,2,3]	0
+[1,2,3]	[1,2,4]	1
+[1,2,3]	abc	1
+[1,2,3]	42	1
+[1,2,3]	\N	1
+[1,2,4]	[1,2,3]	0
+abc	[1,2,3]	0
+abc	abc	0
+abc	abd	1
+abc	42	1
+abc	\N	1
+abd	abc	0
+42	[1,2,3]	0
+42	abc	0
+42	42	0
+42	43	1
+42	\N	1
+43	42	0
+\N	[1,2,3]	0
+\N	abc	0
+\N	42	0
+\N	\N	0
+v1 <= v2
+[1,2,3]	[1,2,3]	1
+[1,2,3]	[1,2,4]	1
+[1,2,3]	abc	1
+[1,2,3]	42	1
+[1,2,3]	\N	1
+[1,2,4]	[1,2,3]	0
+abc	[1,2,3]	0
+abc	abc	1
+abc	abd	1
+abc	42	1
+abc	\N	1
+abd	abc	0
+42	[1,2,3]	0
+42	abc	0
+42	42	1
+42	43	1
+42	\N	1
+43	42	0
+\N	[1,2,3]	0
+\N	abc	0
+\N	42	0
+\N	\N	1
+v1 > v2
+[1,2,3]	[1,2,3]	0
+[1,2,3]	[1,2,4]	0
+[1,2,3]	abc	0
+[1,2,3]	42	0
+[1,2,3]	\N	0
+[1,2,4]	[1,2,3]	1
+abc	[1,2,3]	1
+abc	abc	0
+abc	abd	0
+abc	42	0
+abc	\N	0
+abd	abc	1
+42	[1,2,3]	1
+42	abc	1
+42	42	0
+42	43	0
+42	\N	0
+43	42	1
+\N	[1,2,3]	1
+\N	abc	1
+\N	42	1
+\N	\N	0
+v1 >= v2
+[1,2,3]	[1,2,3]	1
+[1,2,3]	[1,2,4]	1
+[1,2,3]	abc	1
+[1,2,3]	42	1
+[1,2,3]	\N	1
+[1,2,4]	[1,2,3]	1
+abc	[1,2,3]	1
+abc	abc	1
+abc	abd	1
+abc	42	1
+abc	\N	1
+abd	abc	1
+42	[1,2,3]	1
+42	abc	1
+42	42	1
+42	43	1
+42	\N	1
+43	42	1
+\N	[1,2,3]	1
+\N	abc	1
+\N	42	1
+\N	\N	1
diff --git a/tests/queries/0_stateless/02989_variant_comparison.sql b/tests/queries/0_stateless/02989_variant_comparison.sql
new file mode 100644
index 00000000000..e0dcbc97c27
--- /dev/null
+++ b/tests/queries/0_stateless/02989_variant_comparison.sql
@@ -0,0 +1,79 @@
+set allow_experimental_variant_type=1;
+
+create table test (v1 Variant(String, UInt64, Array(UInt32)), v2 Variant(String, UInt64, Array(UInt32))) engine=Memory;
+
+insert into test values (42, 42);
+insert into test values (42, 43);
+insert into test values (43, 42);
+
+insert into test values ('abc', 'abc');
+insert into test values ('abc', 'abd');
+insert into test values ('abd', 'abc');
+
+insert into test values ([1,2,3], [1,2,3]);
+insert into test values ([1,2,3], [1,2,4]);
+insert into test values ([1,2,4], [1,2,3]);
+
+insert into test values (NULL, NULL);
+
+insert into test values (42, 'abc');
+insert into test values ('abc', 42);
+
+insert into test values (42, [1,2,3]);
+insert into test values ([1,2,3], 42);
+
+insert into test values (42, NULL);
+insert into test values (NULL, 42);
+
+insert into test values ('abc', [1,2,3]);
+insert into test values ([1,2,3], 'abc');
+
+insert into test values ('abc', NULL);
+insert into test values (NULL, 'abc');
+
+insert into test values ([1,2,3], NULL);
+insert into test values (NULL, [1,2,3]);
+
+
+select 'order by v1 nulls first';
+select v1 from test order by v1 nulls first;
+
+select 'order by v1 nulls last';
+select v1 from test order by v1 nulls last;
+
+select 'order by v2 nulls first';
+select v2 from test order by v2 nulls first;
+
+select 'order by v2 nulls last';
+select v2 from test order by v2 nulls last;
+
+
+select 'order by v1, v2 nulls first';
+select * from test order by v1, v2 nulls first;
+
+select 'order by v1, v2 nulls last';
+select * from test order by v1, v2 nulls last;
+
+select 'order by v2, v1 nulls first';
+select * from test order by v2, v1 nulls first;
+
+select 'order by v2, v1 nulls last';
+select * from test order by v2, v1 nulls last;
+
+select 'v1 = v2';
+select v1, v2, v1 = v2 from test order by v1, v2;
+
+select 'v1 < v2';
+select v1, v2, v1 < v2 from test order by v1, v2;
+
+select 'v1 <= v2';
+select v1, v2, v1 <= v2 from test order by v1, v2;
+
+select 'v1 > v2';
+select v1, v2, v1 > v2 from test order by v1, v2;
+
+select 'v1 >= v2';
+select v1, v2, v2 >= v2 from test order by v1, v2;
+
+drop table test;
+
diff --git a/tests/queries/0_stateless/02990_arrayFold_nullable_lc.reference b/tests/queries/0_stateless/02990_arrayFold_nullable_lc.reference
new file mode 100644
index 00000000000..5bd5d7bbd90
--- /dev/null
+++ b/tests/queries/0_stateless/02990_arrayFold_nullable_lc.reference
@@ -0,0 +1,16 @@
+23
+23
+23
+23
+3
+3
+\N
+1
+\N
+\N
+\N
+23
+23
+23
+\N
+\N
diff --git a/tests/queries/0_stateless/02990_arrayFold_nullable_lc.sql b/tests/queries/0_stateless/02990_arrayFold_nullable_lc.sql
new file mode 100644
index 00000000000..280defdfbb4
--- /dev/null
+++ b/tests/queries/0_stateless/02990_arrayFold_nullable_lc.sql
@@ -0,0 +1,35 @@
+SET allow_suspicious_low_cardinality_types=1;
+
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], toInt64(3));
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], toInt64(toNullable(3)));
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], materialize(toInt64(toNullable(3))));
+
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4]::Array(Nullable(Int64)), toInt64(3)); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4]::Array(Nullable(Int64)), toInt64(toNullable(3)));
+
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), []::Array(Int64), toInt64(3));
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), []::Array(Nullable(Int64)), toInt64(toNullable(3)));
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), []::Array(Nullable(Int64)), toInt64(NULL));
+
+SELECT arrayFold((acc, x) -> x, materialize(CAST('[0, 1]', 'Array(Nullable(UInt8))')), toUInt8(toNullable(0)));
+SELECT arrayFold((acc, x) -> x, materialize(CAST([NULL], 'Array(Nullable(UInt8))')), toUInt8(toNullable(0)));
+SELECT arrayFold((acc, x) -> acc + x, materialize(CAST([NULL], 'Array(Nullable(UInt8))')), toUInt64(toNullable(0)));
+SELECT arrayFold((acc, x) -> acc + x, materialize(CAST([1, 2, NULL], 'Array(Nullable(UInt8))')), toUInt64(toNullable(0)));
+
+SELECT arrayFold((acc, x) -> toNullable(acc + (x * 2)), [1, 2, 3, 4], toInt64(3)); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> toNullable(acc + (x * 2)), [1, 2, 3, 4], toNullable(toInt64(3)));
+
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], toLowCardinality(toInt64(3))); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> toLowCardinality(acc + (x * 2)), [1, 2, 3, 4], toLowCardinality(toInt64(3)));
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4]::Array(LowCardinality(Int64)), toInt64(toLowCardinality(3))); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> toLowCardinality(acc + (x * 2)), [1, 2, 3, 4]::Array(LowCardinality(Int64)), toInt64(toLowCardinality(3)));
+
+SELECT arrayFold((acc, x) -> acc + (x * 2), [1, 2, 3, 4]::Array(Nullable(Int64)), toInt64(toLowCardinality(3))); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> toLowCardinality(acc + (x * 2)), [1, 2, 3, 4]::Array(Nullable(Int64)), toInt64(toLowCardinality(3))); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> toLowCardinality(acc + (x * 2)), [1, 2, 3, 4]::Array(Nullable(Int64)), toInt64(toNullable(3))); -- { serverError TYPE_MISMATCH }
+
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], NULL);
+-- It's debatable which one of the following 2 queries should work, but considering the return type must match the
+-- accumulator type it makes sense to be the second one
+SELECT arrayFold((acc, x) -> (acc + (x * 2)), [1, 2, 3, 4], NULL::LowCardinality(Nullable(Int64))); -- { serverError TYPE_MISMATCH }
+SELECT arrayFold((acc, x) -> (acc + (x * 2))::LowCardinality(Nullable(Int64)), [1, 2, 3, 4], NULL::LowCardinality(Nullable(Int64)));
diff --git a/tests/queries/0_stateless/02990_format_lambdas.reference b/tests/queries/0_stateless/02990_format_lambdas.reference
new file mode 100644
index 00000000000..f898d6ffa0e
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_lambdas.reference
@@ -0,0 +1,10 @@
+SELECT lambda(1, 1)
+SELECT lambda(1, 1)
+SELECT x -> 1
+SELECT x -> 1
+SELECT (x, y) -> 1
+SELECT (x, y) -> 1
+SELECT lambda(f(1), 1)
+SELECT lambda(f(1), 1)
+SELECT lambda(f(x), 1)
+SELECT lambda(f(x), 1)
diff --git a/tests/queries/0_stateless/02990_format_lambdas.sh b/tests/queries/0_stateless/02990_format_lambdas.sh
new file mode 100755
index 00000000000..9dc5e0f0461
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_lambdas.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
+
+QUERY="SELECT lambda(1, 1)"; QUERY2=$(${CLICKHOUSE_FORMAT} --query "$QUERY"); echo "$QUERY2"; QUERY3=$(${CLICKHOUSE_FORMAT} --query "$QUERY2"); echo "$QUERY3";
+QUERY="SELECT lambda(x, 1)"; QUERY2=$(${CLICKHOUSE_FORMAT} --query "$QUERY"); echo "$QUERY2"; QUERY3=$(${CLICKHOUSE_FORMAT} --query "$QUERY2"); echo "$QUERY3";
+QUERY="SELECT lambda((x, y), 1)"; QUERY2=$(${CLICKHOUSE_FORMAT} --query "$QUERY"); echo "$QUERY2"; QUERY3=$(${CLICKHOUSE_FORMAT} --query "$QUERY2"); echo "$QUERY3";
+QUERY="SELECT lambda(f(1), 1)"; QUERY2=$(${CLICKHOUSE_FORMAT} --query "$QUERY"); echo "$QUERY2"; QUERY3=$(${CLICKHOUSE_FORMAT} --query "$QUERY2"); echo "$QUERY3";
+QUERY="SELECT lambda(f(x), 1)"; QUERY2=$(${CLICKHOUSE_FORMAT} --query "$QUERY"); echo "$QUERY2"; QUERY3=$(${CLICKHOUSE_FORMAT} --query "$QUERY2"); echo "$QUERY3";
diff --git a/tests/queries/0_stateless/02990_format_not_precedence.reference b/tests/queries/0_stateless/02990_format_not_precedence.reference
new file mode 100644
index 00000000000..f44cf2fdb52
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_not_precedence.reference
@@ -0,0 +1,13 @@
+-- { echoOn }
+SELECT NOT 0 + NOT 0;
+0
+SELECT NOT (0 + (NOT 0));
+0
+SELECT (NOT 0) + (NOT 0);
+2
+SELECT formatQuery('SELECT NOT 0 + NOT 0');
+SELECT NOT (0 + (NOT 0))
+SELECT formatQuery('SELECT NOT (0 + (NOT 0))');
+SELECT NOT (0 + (NOT 0))
+SELECT formatQuery('SELECT (NOT 0) + (NOT 0)');
+SELECT (NOT 0) + (NOT 0)
diff --git a/tests/queries/0_stateless/02990_format_not_precedence.sql b/tests/queries/0_stateless/02990_format_not_precedence.sql
new file mode 100644
index 00000000000..98ef2c9e781
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_not_precedence.sql
@@ -0,0 +1,7 @@
+-- { echoOn }
+SELECT NOT 0 + NOT 0;
+SELECT NOT (0 + (NOT 0));
+SELECT (NOT 0) + (NOT 0);
+SELECT formatQuery('SELECT NOT 0 + NOT 0');
+SELECT formatQuery('SELECT NOT (0 + (NOT 0))');
+SELECT formatQuery('SELECT (NOT 0) + (NOT 0)');
diff --git a/tests/queries/0_stateless/02990_format_select_from_explain.reference b/tests/queries/0_stateless/02990_format_select_from_explain.reference
new file mode 100644
index 00000000000..7c8dcef3824
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_select_from_explain.reference
@@ -0,0 +1,9 @@
+SELECT explain
+FROM
+(
+    SELECT *
+    FROM viewExplain('EXPLAIN AST', '', (
+        SELECT *
+        FROM system.numbers
+    ))
+)
diff --git a/tests/queries/0_stateless/02990_format_select_from_explain.sh b/tests/queries/0_stateless/02990_format_select_from_explain.sh
new file mode 100755
index 00000000000..4955b733788
--- /dev/null
+++ b/tests/queries/0_stateless/02990_format_select_from_explain.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_FORMAT} --query "SELECT explain FROM (EXPLAIN AST SELECT * FROM system.numbers)"
diff --git a/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.reference b/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.reference
new file mode 100644
index 00000000000..e8183f05f5d
--- /dev/null
+++ b/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.reference
@@ -0,0 +1,3 @@
+1
+1
+1
diff --git a/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.sql b/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.sql
new file mode 100644
index 00000000000..54d19264c45
--- /dev/null
+++ b/tests/queries/0_stateless/02990_optimize_uniq_to_count_alias.sql
@@ -0,0 +1,52 @@
+--https://github.com/ClickHouse/ClickHouse/issues/59999
+DROP TABLE IF EXISTS tags;
+CREATE TABLE tags (dev_tag String) ENGINE = Memory AS SELECT '1';
+
+SELECT *
+FROM
+(
+    SELECT countDistinct(dev_tag) AS total_devtags
+    FROM
+    (
+        SELECT dev_tag
+        FROM
+            (
+                SELECT *
+                FROM tags
+            ) AS t
+    GROUP BY dev_tag
+    ) AS t
+) SETTINGS optimize_uniq_to_count=0;
+
+SELECT *
+FROM
+(
+    SELECT countDistinct(dev_tag) AS total_devtags
+    FROM
+    (
+        SELECT dev_tag
+        FROM
+            (
+                SELECT *
+                FROM tags
+            ) AS t
+    GROUP BY dev_tag
+    ) AS t
+) SETTINGS optimize_uniq_to_count=1;
+
+-- https://github.com/ClickHouse/ClickHouse/issues/62298
+DROP TABLE IF EXISTS users;
+CREATE TABLE users
+(
+    `id` Int64,
+    `name` String
+)
+ENGINE = ReplacingMergeTree
+ORDER BY (id, name);
+
+INSERT INTO users VALUES (1, 'pufit'), (1, 'pufit2'), (1, 'pufit3');
+
+SELECT uniqExact(id) FROM ( SELECT id FROM users WHERE id = 1 GROUP BY id, name );
+
+DROP TABLE IF EXISTS users;
+DROP TABLE IF EXISTS tags;
diff --git a/tests/queries/0_stateless/02990_parts_splitter_invalid_ranges.reference b/tests/queries/0_stateless/02990_parts_splitter_invalid_ranges.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02990_parts_splitter_invalid_ranges.sql b/tests/queries/0_stateless/02990_parts_splitter_invalid_ranges.sql
new file mode 100644
index 00000000000..e19c23acc2e
--- /dev/null
+++ b/tests/queries/0_stateless/02990_parts_splitter_invalid_ranges.sql
@@ -0,0 +1,31 @@
+DROP TABLE IF EXISTS test_table;
+CREATE TABLE test_table
+(
+    `eventType` String,
+    `timestamp` UInt64,
+    `key` UInt64
+)
+ENGINE = ReplacingMergeTree
+PRIMARY KEY (eventType, timestamp)
+ORDER BY (eventType, timestamp, key)
+SETTINGS index_granularity = 1;
+
+SYSTEM STOP MERGES test_table;
+
+INSERT INTO test_table VALUES ('1', 1704472004759, 1), ('3', 1704153600000, 2), ('3', 1704153600000, 3), ('5', 1700161822134, 4);
+
+INSERT INTO test_table VALUES ('1', 1704468357009, 1), ('3', 1704153600000, 2), ('3', 1704153600000, 3), ('5', 1701458520878, 4);
+
+INSERT INTO test_table VALUES ('1', 1704470704762, 1), ('3', 1704153600000, 2), ('3', 1704153600000, 3), ('5', 1702609856302, 4);
+
+SELECT eventType, timestamp, key FROM test_table
+WHERE (eventType IN ('2', '4')) AND
+    ((timestamp >= max2(toInt64('1698938519999'), toUnixTimestamp64Milli(now64() - toIntervalDay(90)))) AND
+    (timestamp <= (toInt64('1707143315452') - 1)));
+
+SELECT eventType, timestamp, key FROM test_table FINAL
+WHERE (eventType IN ('2', '4')) AND
+    ((timestamp >= max2(toInt64('1698938519999'), toUnixTimestamp64Milli(now64() - toIntervalDay(90)))) AND
+    (timestamp <= (toInt64('1707143315452') - 1)));
+
+DROP TABLE test_table;
diff --git a/tests/queries/0_stateless/02990_rmt_replica_path_uuid.reference b/tests/queries/0_stateless/02990_rmt_replica_path_uuid.reference
new file mode 100644
index 00000000000..5521c015fcf
--- /dev/null
+++ b/tests/queries/0_stateless/02990_rmt_replica_path_uuid.reference
@@ -0,0 +1,4 @@
+aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa
+/tables/default/aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa/replicas/r1
+aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa
+/tables/default/aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa/replicas/r1
diff --git a/tests/queries/0_stateless/02990_rmt_replica_path_uuid.sql b/tests/queries/0_stateless/02990_rmt_replica_path_uuid.sql
new file mode 100644
index 00000000000..4fcdff2910f
--- /dev/null
+++ b/tests/queries/0_stateless/02990_rmt_replica_path_uuid.sql
@@ -0,0 +1,23 @@
+-- Tags: no-parallel, no-ordinary-database, no-replicated-database
+-- Tag no-parallel: static UUID
+-- Tag no-ordinary-database: requires UUID
+-- Tag no-replicated-database: executes with ON CLUSTER anyway
+
+-- Ignore "ATTACH TABLE query with full table definition is not recommended"
+-- Ignore BAD_ARGUMENTS
+SET send_logs_level='fatal';
+
+DROP TABLE IF EXISTS x;
+
+ATTACH TABLE x UUID 'aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa' (key Int) ENGINE = ReplicatedMergeTree('/tables/{database}/{uuid}', 'r1') ORDER BY tuple();
+SELECT uuid FROM system.tables WHERE database = currentDatabase() and table = 'x';
+SELECT replica_path FROM system.replicas WHERE database = currentDatabase() and table = 'x';
+DROP TABLE x;
+
+-- {uuid} macro forbidden for CREATE TABLE without explicit UUID
+CREATE TABLE x (key Int) ENGINE = ReplicatedMergeTree('/tables/{database}/{uuid}', 'r1') ORDER BY tuple(); -- { serverError BAD_ARGUMENTS }
+
+CREATE TABLE x UUID 'aaaaaaaa-1111-2222-3333-aaaaaaaaaaaa' (key Int) ENGINE = ReplicatedMergeTree('/tables/{database}/{uuid}', 'r1') ORDER BY tuple();
+SELECT uuid FROM system.tables WHERE database = currentDatabase() and table = 'x';
+SELECT replica_path FROM system.replicas WHERE database = currentDatabase() and table = 'x';
+DROP TABLE x;
diff --git a/tests/queries/0_stateless/02990_variant_where_cond.reference b/tests/queries/0_stateless/02990_variant_where_cond.reference
new file mode 100644
index 00000000000..73b397be12d
--- /dev/null
+++ b/tests/queries/0_stateless/02990_variant_where_cond.reference
@@ -0,0 +1,2 @@
+Hello
+42
diff --git a/tests/queries/0_stateless/02990_variant_where_cond.sql b/tests/queries/0_stateless/02990_variant_where_cond.sql
new file mode 100644
index 00000000000..8149988f1f2
--- /dev/null
+++ b/tests/queries/0_stateless/02990_variant_where_cond.sql
@@ -0,0 +1,11 @@
+set allow_experimental_variant_type=1;
+
+create table test (v Variant(String, UInt64)) engine=Memory;
+insert into test values (42), ('Hello'), (NULL);
+
+select * from test where v = 'Hello';
+select * from test where v = 42; -- {serverError ILLEGAL_TYPE_OF_ARGUMENT}
+select * from test where v = 42::UInt64::Variant(String, UInt64);
+
+drop table test;
+
diff --git a/tests/queries/0_stateless/02991_count_rewrite_analyzer.reference b/tests/queries/0_stateless/02991_count_rewrite_analyzer.reference
new file mode 100644
index 00000000000..ccb266fc2b5
--- /dev/null
+++ b/tests/queries/0_stateless/02991_count_rewrite_analyzer.reference
@@ -0,0 +1,4 @@
+Nullable(UInt64)
+UInt64
+Nullable(UInt64)
+UInt64
diff --git a/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql b/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql
new file mode 100644
index 00000000000..b11aeedd225
--- /dev/null
+++ b/tests/queries/0_stateless/02991_count_rewrite_analyzer.sql
@@ -0,0 +1,7 @@
+-- Regression test for https://github.com/ClickHouse/ClickHouse/issues/59919
+SET allow_experimental_analyzer=1;
+
+SELECT toTypeName(sum(toNullable('a') IN toNullable('a'))) AS x;
+SELECT toTypeName(count(toNullable('a') IN toNullable('a'))) AS x;
+SELECT toTypeName(sum(toFixedString('a', toLowCardinality(toNullable(1))) IN toFixedString('a', 1))) AS x;
+SELECT toTypeName(count(toFixedString('a', toLowCardinality(toNullable(1))) IN toFixedString('a', 1))) AS x;
diff --git a/tests/queries/0_stateless/02992_all_columns_should_have_comment.reference b/tests/queries/0_stateless/02992_all_columns_should_have_comment.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02992_all_columns_should_have_comment.sql b/tests/queries/0_stateless/02992_all_columns_should_have_comment.sql
new file mode 100644
index 00000000000..e233f08cc79
--- /dev/null
+++ b/tests/queries/0_stateless/02992_all_columns_should_have_comment.sql
@@ -0,0 +1,4 @@
+SYSTEM FLUSH LOGS;
+SELECT 'Column ' || name || ' from table ' || concat(database, '.', table) || ' should have a comment'
+FROM system.columns
+WHERE (database = 'system') AND (comment = '') AND (table NOT ILIKE '%_log_%') AND (table NOT IN ('numbers', 'numbers_mt', 'one', 'generate_series', 'generateSeries')) AND (default_kind != 'ALIAS');
diff --git a/tests/queries/0_stateless/02992_analyzer_group_by_const.reference b/tests/queries/0_stateless/02992_analyzer_group_by_const.reference
new file mode 100644
index 00000000000..ff61ab0a515
--- /dev/null
+++ b/tests/queries/0_stateless/02992_analyzer_group_by_const.reference
@@ -0,0 +1,6 @@
+b
+a|a
+a|x
+String, Const(size = 1, String(size = 1))
+String, Const(size = 1, String(size = 1))
+5128475243952187658
diff --git a/tests/queries/0_stateless/02992_analyzer_group_by_const.sql b/tests/queries/0_stateless/02992_analyzer_group_by_const.sql
new file mode 100644
index 00000000000..f30a49887c7
--- /dev/null
+++ b/tests/queries/0_stateless/02992_analyzer_group_by_const.sql
@@ -0,0 +1,12 @@
+SET allow_experimental_analyzer=1;
+
+-- Illegal column String of first argument of function concatWithSeparator. Must be a constant String.
+SELECT concatWithSeparator('a', 'b') GROUP BY 'a';
+-- use-of-uninitialized-value
+SELECT concatWithSeparator('|', 'a', concatWithSeparator('|', CAST('a', 'LowCardinality(String)'))) GROUP BY 'a';
+SELECT concatWithSeparator('|', 'a', concatWithSeparator('|', CAST('x', 'LowCardinality(String)'))) GROUP BY 'a';
+-- should be const like for the query w/o GROUP BY
+select dumpColumnStructure('x') GROUP BY 'x';
+select dumpColumnStructure('x');
+-- from https://github.com/ClickHouse/ClickHouse/pull/60046
+SELECT cityHash64('limit', _CAST(materialize('World'), 'LowCardinality(String)')) FROM system.one GROUP BY GROUPING SETS ('limit');
diff --git a/tests/queries/0_stateless/02992_settings_overflow.reference b/tests/queries/0_stateless/02992_settings_overflow.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02992_settings_overflow.sql b/tests/queries/0_stateless/02992_settings_overflow.sql
new file mode 100644
index 00000000000..d120c3400e5
--- /dev/null
+++ b/tests/queries/0_stateless/02992_settings_overflow.sql
@@ -0,0 +1 @@
+SET max_threads = -1; -- { serverError CANNOT_CONVERT_TYPE }
diff --git a/tests/queries/0_stateless/02993_lazy_index_loading.reference b/tests/queries/0_stateless/02993_lazy_index_loading.reference
new file mode 100644
index 00000000000..5bc329ae4eb
--- /dev/null
+++ b/tests/queries/0_stateless/02993_lazy_index_loading.reference
@@ -0,0 +1,4 @@
+100000000	140000000
+0	0
+1
+100000000	100000000
diff --git a/tests/queries/0_stateless/02993_lazy_index_loading.sql b/tests/queries/0_stateless/02993_lazy_index_loading.sql
new file mode 100644
index 00000000000..7de4af9ef0e
--- /dev/null
+++ b/tests/queries/0_stateless/02993_lazy_index_loading.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (s String) ENGINE = MergeTree ORDER BY s SETTINGS index_granularity = 1;
+
+INSERT INTO test SELECT randomString(1000) FROM numbers(100000);
+SELECT round(primary_key_bytes_in_memory, -7), round(primary_key_bytes_in_memory_allocated, -7) FROM system.parts WHERE database = currentDatabase() AND table = 'test';
+
+DETACH TABLE test;
+SET max_memory_usage = '50M';
+ATTACH TABLE test;
+
+SELECT primary_key_bytes_in_memory, primary_key_bytes_in_memory_allocated FROM system.parts WHERE database = currentDatabase() AND table = 'test';
+
+SET max_memory_usage = '200M';
+SELECT s != '' FROM test LIMIT 1;
+
+SELECT round(primary_key_bytes_in_memory, -7), round(primary_key_bytes_in_memory_allocated, -7) FROM system.parts WHERE database = currentDatabase() AND table = 'test';
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02993_values_escape_quote.reference b/tests/queries/0_stateless/02993_values_escape_quote.reference
new file mode 100644
index 00000000000..29d6a133fec
--- /dev/null
+++ b/tests/queries/0_stateless/02993_values_escape_quote.reference
@@ -0,0 +1,3 @@
+('foo')('foo\'bar')('foo\'\'bar')
+output_format_values_escape_quote_with_quote=1
+('foo')('foo''bar')('foo''''bar')
diff --git a/tests/queries/0_stateless/02993_values_escape_quote.sql b/tests/queries/0_stateless/02993_values_escape_quote.sql
new file mode 100644
index 00000000000..e6fc5f1b280
--- /dev/null
+++ b/tests/queries/0_stateless/02993_values_escape_quote.sql
@@ -0,0 +1,12 @@
+select 'foo' format Values;
+select 'foo\'bar' format Values;
+select 'foo\'\'bar' format Values;
+
+select '\noutput_format_values_escape_quote_with_quote=1' format LineAsString;
+set output_format_values_escape_quote_with_quote=1;
+
+select 'foo' format Values;
+select 'foo\'bar' format Values;
+select 'foo\'\'bar' format Values;
+-- fix no newline at end of file
+select '' format LineAsString;
diff --git a/tests/queries/0_stateless/02994_cosineDistanceNullable.reference b/tests/queries/0_stateless/02994_cosineDistanceNullable.reference
new file mode 100644
index 00000000000..e4fe1f97e7e
--- /dev/null
+++ b/tests/queries/0_stateless/02994_cosineDistanceNullable.reference
@@ -0,0 +1,11 @@
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
+\N
diff --git a/tests/queries/0_stateless/02994_cosineDistanceNullable.sql b/tests/queries/0_stateless/02994_cosineDistanceNullable.sql
new file mode 100644
index 00000000000..a62216982f3
--- /dev/null
+++ b/tests/queries/0_stateless/02994_cosineDistanceNullable.sql
@@ -0,0 +1,3 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/59596
+SELECT cosineDistance((1, 1), (toNullable(0.5), 0.1));
+SELECT cosineDistance((1, 1), (toNullable(0.5), 0.1)) from numbers(10);
diff --git a/tests/queries/0_stateless/02994_inconsistent_formatting.reference b/tests/queries/0_stateless/02994_inconsistent_formatting.reference
new file mode 100644
index 00000000000..b9db04e880c
--- /dev/null
+++ b/tests/queries/0_stateless/02994_inconsistent_formatting.reference
@@ -0,0 +1,4 @@
+1
+2
+3
+(1)
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02994_inconsistent_formatting.sql b/tests/queries/0_stateless/02994_inconsistent_formatting.sql
new file mode 100644
index 00000000000..f22f81513f6
--- /dev/null
+++ b/tests/queries/0_stateless/02994_inconsistent_formatting.sql
@@ -0,0 +1,10 @@
+CREATE TEMPORARY TABLE table (x UInt8);
+INSERT INTO `table` FORMAT Values (1);
+INSERT INTO TABLE `table` FORMAT Values (2);
+INSERT INTO TABLE table FORMAT Values (3);
+SELECT * FROM table ORDER BY x;
+DROP TABLE table;
+
+CREATE TEMPORARY TABLE FORMAT (x UInt8);
+INSERT INTO table FORMAT Values (1);
+SELECT * FROM FORMAT FORMAT Values;
diff --git a/tests/queries/0_stateless/02994_libarchive_compression.reference b/tests/queries/0_stateless/02994_libarchive_compression.reference
new file mode 100644
index 00000000000..4e7159c4842
--- /dev/null
+++ b/tests/queries/0_stateless/02994_libarchive_compression.reference
@@ -0,0 +1,14 @@
+1
+4
+1
+4
+1
+4
+1
+4
+1
+4
+1
+4
+Unrecognized archive format
+Unrecognized archive format
diff --git a/tests/queries/0_stateless/02994_libarchive_compression.sh b/tests/queries/0_stateless/02994_libarchive_compression.sh
new file mode 100755
index 00000000000..056647d2c7a
--- /dev/null
+++ b/tests/queries/0_stateless/02994_libarchive_compression.sh
@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+EPOCHTIME=$(date "+%s")
+
+# Test tar format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.tar', 'TabSeparatedRaw', 'column1 String') VALUES (char(116,101,115,116,46,99,115,118,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,0,0,0,0,0,0,0,0,0,0,0,0,0,48,48,48,48,54,54,52,0,48,48,48,49,55,53,48,0,48,48,48,49,55,53,48,0,48,48,48,48,48,48,48,48,48,49,52,0,49,52,53,54,53,53,50,50,54,49,55,0,48,49,50,50,49,50,0,32,48,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,115,116,97,114,32,32,0,117,98,117,110,116,117,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,117,98,117,110,116,117,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,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,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,49,44,50,44,51,10,52,44,53,44,54,10,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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,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));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.tar :: test.csv', CSV);"
+
+
+# Test tar.xz format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.tar.xz', 'TabSeparatedRaw', 'column1 String') VALUES (char(66,90,104,57,49,65,89,38,83,89,108,215,67,197,0,0,78,123,144,210,16,64,128,64,5,127,128,0,64,107,33,159,0,4,0,2,8,32,0,116,34,122,36,122,153,26,13,3,64,105,160,148,130,122,129,160,50,0,3,109,59,133,95,33,76,224,38,15,14,85,232,12,73,69,196,36,202,7,43,99,38,175,117,168,43,2,37,44,198,225,8,84,168,207,149,250,54,189,175,113,182,18,176,221,17,144,10,26,106,176,122,60,177,140,206,103,202,75,191,1,0,142,156,253,249,94,202,93,68,193,140,252,93,201,20,225,66,65,179,93,15,20));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.tar.xz :: test.csv', CSV);"
+
+# Test tar.gz format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.tar.gz', 'TabSeparatedRaw', 'column1 String') VALUES (char(31,139,8,0,230,112,212,101,0,3,237,207,193,10,131,48,12,6,96,207,62,69,30,160,140,164,77,235,243,148,178,194,46,10,166,219,243,91,45,122,146,221,220,16,242,93,126,2,33,252,41,79,41,143,36,159,238,66,136,24,152,97,205,33,248,45,209,182,185,33,6,98,31,60,58,75,132,80,103,55,112,7,120,101,169,221,91,74,156,107,21,137,99,153,227,152,94,146,166,179,189,186,150,243,151,59,237,19,56,242,38,200,88,227,122,54,222,132,254,223,93,148,82,74,253,206,2,148,165,35,158,0,8,0,0));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.tar.gz :: test.csv', CSV);"
+
+
+# Test tar.bz2 format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.tar.bz2', 'TabSeparatedRaw', 'column1 String') VALUES (char(66,90,104,57,49,65,89,38,83,89,108,215,67,197,0,0,78,123,144,210,16,64,128,64,5,127,128,0,64,107,33,159,0,4,0,2,8,32,0,116,34,122,36,122,153,26,13,3,64,105,160,148,130,122,129,160,50,0,3,109,59,133,95,33,76,224,38,15,14,85,232,12,73,69,196,36,202,7,43,99,38,175,117,168,43,2,37,44,198,225,8,84,168,207,149,250,54,189,175,113,182,18,176,221,17,144,10,26,106,176,122,60,177,140,206,103,202,75,191,1,0,142,156,253,249,94,202,93,68,193,140,252,93,201,20,225,66,65,179,93,15,20));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.tar.bz2 :: test.csv', CSV);"
+
+
+# Test 7z format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.7z', 'TabSeparatedRaw', 'column1 String') VALUES (char(55,122,188,175,39,28,0,4,248,166,182,96,16,0,0,0,0,0,0,0,90,0,0,0,0,0,0,0,3,235,205,15,1,0,11,49,44,50,44,51,10,52,44,53,44,54,10,0,1,4,6,0,1,9,16,0,7,11,1,0,1,33,33,1,0,12,12,0,8,10,1,180,193,159,219,0,0,5,1,25,12,0,0,0,0,0,0,0,0,0,0,0,0,17,19,0,116,0,101,0,115,0,116,0,46,0,99,0,115,0,118,0,0,0,25,0,20,10,1,0,188,83,33,33,187,99,218,1,21,6,1,0,32,128,164,129,0,0));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.7z :: test.csv', CSV);"
+
+
+# Test zip format
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.zip', 'TabSeparatedRaw', 'column1 String') VALUES (char(80,75,3,4,10,0,0,0,0,0,80,129,84,88,180,193,159,219,12,0,0,0,12,0,0,0,8,0,28,0,116,101,115,116,46,99,115,118,85,84,9,0,3,72,52,212,101,74,52,212,101,117,120,11,0,1,4,245,1,0,0,4,20,0,0,0,49,44,50,44,51,10,52,44,53,44,54,10,80,75,1,2,30,3,10,0,0,0,0,0,80,129,84,88,180,193,159,219,12,0,0,0,12,0,0,0,8,0,24,0,0,0,0,0,1,0,0,0,164,129,0,0,0,0,116,101,115,116,46,99,115,118,85,84,5,0,3,72,52,212,101,117,120,11,0,1,4,245,1,0,0,4,20,0,0,0,80,75,5,6,0,0,0,0,1,0,1,0,78,0,0,0,78,0,0,0,0,0));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.zip :: test.csv', CSV);"
+
+# Test rar file with 7z extension - this should fail
+$CLICKHOUSE_CLIENT --query  "INSERT INTO TABLE FUNCTION file('02994_file_$EPOCHTIME/test.rar.7z', 'TabSeparatedRaw', 'column1 String') VALUES (char(82,97,114,33,26,7,1,0,51,146,181,229,10,1,5,6,0,5,1,1,128,128,0,235,180,125,92,36,2,3,11,140,0,4,140,0,32,18,67,124,209,128,0,0,8,116,101,115,116,46,99,115,118,10,3,2,18,154,60,112,217,99,218,1,49,44,50,44,51,13,10,52,44,53,44,54,29,119,86,81,3,5,4,0));"
+$CLICKHOUSE_CLIENT --query   "SELECT c1 FROM file('02994_file_$EPOCHTIME/test.rar.7z :: test.csv', CSV);" 2>&1 | grep -o "Unrecognized archive format"
+
+# If the code reach here - return 0 otherwise we might confuse the test result with grep return value.
+exit 0
\ No newline at end of file
diff --git a/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.reference b/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.reference
new file mode 100644
index 00000000000..8a3a458c753
--- /dev/null
+++ b/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.reference
@@ -0,0 +1,4 @@
+mutations after ALTER for data_rmt	1
+mutations after cleanup for data_rmt	1
+mutations after ALTER for data_mt	1
+mutations after cleanup for data_mt	1
diff --git a/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.sql.j2 b/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.sql.j2
new file mode 100644
index 00000000000..1b9be79dbe4
--- /dev/null
+++ b/tests/queries/0_stateless/02994_merge_tree_mutations_cleanup.sql.j2
@@ -0,0 +1,14 @@
+drop table if exists data_rmt;
+drop table if exists data_mt;
+
+create table data_rmt (key Int) engine=ReplicatedMergeTree('/tables/{database}/data', '{table}') order by tuple() settings finished_mutations_to_keep=0, merge_tree_clear_old_parts_interval_seconds=1;
+create table data_mt (key Int) engine=MergeTree() order by tuple() settings finished_mutations_to_keep=0, merge_tree_clear_old_parts_interval_seconds=1;
+
+{% for table in ['data_rmt', 'data_mt'] %}
+alter table {{table}} delete where 1 settings mutations_sync = 1;
+select 'mutations after ALTER for {{table}}', count() from system.mutations where database = currentDatabase() and table = '{{table}}';
+-- merge_tree_clear_old_parts_interval_seconds=1, but wait few seconds more
+select sleep(5) settings function_sleep_max_microseconds_per_block=10e6 format Null;
+select 'mutations after cleanup for {{table}}', count() from system.mutations where database = currentDatabase() and table = '{{table}}';
+drop table {{table}};
+{% endfor %}
diff --git a/tests/queries/0_stateless/02994_sanity_check_settings.reference b/tests/queries/0_stateless/02994_sanity_check_settings.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02994_sanity_check_settings.sql b/tests/queries/0_stateless/02994_sanity_check_settings.sql
new file mode 100644
index 00000000000..073cd9749e6
--- /dev/null
+++ b/tests/queries/0_stateless/02994_sanity_check_settings.sql
@@ -0,0 +1,24 @@
+CREATE TABLE data_02052_1_wide0__fuzz_48
+(
+    `key` Nullable(Int64),
+    `value` UInt8
+)
+    ENGINE = MergeTree
+        ORDER BY key
+        SETTINGS min_bytes_for_wide_part = 0, allow_nullable_key = 1 AS
+SELECT
+    number,
+    repeat(toString(number), 5)
+FROM numbers(1);
+
+SELECT * APPLY max
+FROM data_02052_1_wide0__fuzz_48
+GROUP BY toFixedString(toFixedString(toFixedString(toFixedString(toFixedString(toLowCardinality('UInt256'), toFixedString(toNullable(toNullable(2)), toFixedString(toFixedString(7), 7)), 7), 7), materialize(toNullable(7))), 7), materialize(7))
+WITH CUBE
+    SETTINGS max_read_buffer_size = 7, max_threads = 9223372036854775807; -- { serverError INVALID_SETTING_VALUE }
+
+SELECT zero + 1 AS x
+FROM system.zeros
+    SETTINGS max_block_size = 9223372036854775806, max_rows_to_read = 20, read_overflow_mode = 'break'; -- { serverError INVALID_SETTING_VALUE }
+
+EXPLAIN PIPELINE SELECT zero + 1 AS x FROM system.zeros SETTINGS max_block_size = 9223372036854775806, max_rows_to_read = 20, read_overflow_mode = 'break'; -- { serverError INVALID_SETTING_VALUE }
diff --git a/tests/queries/0_stateless/02995_bad_formatting_union_intersect.reference b/tests/queries/0_stateless/02995_bad_formatting_union_intersect.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/02995_bad_formatting_union_intersect.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/02995_bad_formatting_union_intersect.sql b/tests/queries/0_stateless/02995_bad_formatting_union_intersect.sql
new file mode 100644
index 00000000000..227f407fc5c
--- /dev/null
+++ b/tests/queries/0_stateless/02995_bad_formatting_union_intersect.sql
@@ -0,0 +1,2 @@
+create temporary table t1 engine=MergeTree() order by c as ( select 1 as c intersect (select 1 as c union all  select 2 as c ) );
+SELECT * FROM t1;
diff --git a/tests/queries/0_stateless/02995_baseline_23_12_1.tsv b/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
new file mode 100644
index 00000000000..4c0c9125b46
--- /dev/null
+++ b/tests/queries/0_stateless/02995_baseline_23_12_1.tsv
@@ -0,0 +1,940 @@
+add_http_cors_header	0
+additional_result_filter	
+additional_table_filters	{}
+aggregate_functions_null_for_empty	0
+aggregation_in_order_max_block_bytes	50000000
+aggregation_memory_efficient_merge_threads	0
+allow_aggregate_partitions_independently	0
+allow_asynchronous_read_from_io_pool_for_merge_tree	0
+allow_changing_replica_until_first_data_packet	0
+allow_create_index_without_type	0
+allow_custom_error_code_in_throwif	0
+allow_ddl	1
+allow_deprecated_database_ordinary	0
+allow_deprecated_syntax_for_merge_tree	0
+allow_distributed_ddl	1
+allow_drop_detached	0
+allow_execute_multiif_columnar	1
+allow_experimental_alter_materialized_view_structure	1
+allow_experimental_analyzer	0
+allow_experimental_annoy_index	0
+allow_experimental_bigint_types	1
+allow_experimental_codecs	0
+allow_experimental_database_atomic	1
+allow_experimental_database_materialized_mysql	0
+allow_experimental_database_materialized_postgresql	0
+allow_experimental_database_replicated	0
+allow_experimental_funnel_functions	0
+allow_experimental_geo_types	1
+allow_experimental_hash_functions	0
+allow_experimental_inverted_index	0
+allow_experimental_lightweight_delete	1
+allow_experimental_live_view	0
+allow_experimental_map_type	1
+allow_experimental_materialized_postgresql_table	0
+allow_experimental_nlp_functions	0
+allow_experimental_object_type	0
+allow_experimental_parallel_reading_from_replicas	0
+allow_experimental_projection_optimization	1
+allow_experimental_query_cache	1
+allow_experimental_query_deduplication	0
+allow_experimental_refreshable_materialized_view	0
+allow_experimental_s3queue	1
+allow_experimental_shared_merge_tree	0
+allow_experimental_statistic	0
+allow_experimental_undrop_table_query	1
+allow_experimental_usearch_index	0
+allow_experimental_window_functions	1
+allow_experimental_window_view	0
+allow_hyperscan	1
+allow_introspection_functions	0
+allow_named_collection_override_by_default	1
+allow_non_metadata_alters	1
+allow_nonconst_timezone_arguments	0
+allow_nondeterministic_mutations	0
+allow_nondeterministic_optimize_skip_unused_shards	0
+allow_prefetched_read_pool_for_local_filesystem	0
+allow_prefetched_read_pool_for_remote_filesystem	1
+allow_push_predicate_when_subquery_contains_with	1
+allow_settings_after_format_in_insert	0
+allow_simdjson	1
+allow_statistic_optimize	0
+allow_suspicious_codecs	0
+allow_suspicious_fixed_string_types	0
+allow_suspicious_indices	0
+allow_suspicious_low_cardinality_types	0
+allow_suspicious_ttl_expressions	0
+allow_unrestricted_reads_from_keeper	0
+alter_move_to_space_execute_async	0
+alter_partition_verbose_result	0
+alter_sync	1
+analyze_index_with_space_filling_curves	1
+annoy_index_search_k_nodes	-1
+any_join_distinct_right_table_keys	0
+apply_deleted_mask	1
+apply_mutations_on_fly	0
+asterisk_include_alias_columns	0
+asterisk_include_materialized_columns	0
+async_insert	0
+async_insert_busy_timeout_ms	200
+async_insert_cleanup_timeout_ms	1000
+async_insert_deduplicate	0
+async_insert_max_data_size	1000000
+async_insert_max_query_number	450
+async_insert_stale_timeout_ms	0
+async_insert_threads	16
+async_query_sending_for_remote	1
+async_socket_for_remote	1
+azure_create_new_file_on_insert	0
+azure_list_object_keys_size	1000
+azure_max_single_part_upload_size	104857600
+azure_max_single_read_retries	4
+azure_truncate_on_insert	0
+background_buffer_flush_schedule_pool_size	16
+background_common_pool_size	8
+background_distributed_schedule_pool_size	16
+background_fetches_pool_size	8
+background_merges_mutations_concurrency_ratio	2
+background_message_broker_schedule_pool_size	16
+background_move_pool_size	8
+background_pool_size	16
+background_schedule_pool_size	128
+backup_restore_batch_size_for_keeper_multi	1000
+backup_restore_batch_size_for_keeper_multiread	10000
+backup_restore_keeper_fault_injection_probability	0
+backup_restore_keeper_fault_injection_seed	0
+backup_restore_keeper_max_retries	20
+backup_restore_keeper_retry_initial_backoff_ms	100
+backup_restore_keeper_retry_max_backoff_ms	5000
+backup_restore_keeper_value_max_size	1048576
+backup_threads	16
+bool_false_representation	false
+bool_true_representation	true
+cache_warmer_threads	4
+calculate_text_stack_trace	1
+cancel_http_readonly_queries_on_client_close	0
+cast_ipv4_ipv6_default_on_conversion_error	0
+cast_keep_nullable	0
+check_query_single_value_result	1
+check_referential_table_dependencies	0
+check_table_dependencies	1
+checksum_on_read	1
+cloud_mode	0
+cloud_mode_engine	1
+cluster_for_parallel_replicas	
+collect_hash_table_stats_during_aggregation	1
+column_names_for_schema_inference	
+compatibility	
+compatibility_ignore_auto_increment_in_create_table	0
+compatibility_ignore_collation_in_create_table	1
+compile_aggregate_expressions	1
+compile_expressions	0
+compile_sort_description	1
+connect_timeout	10
+connect_timeout_with_failover_ms	1000
+connect_timeout_with_failover_secure_ms	1000
+connection_pool_max_wait_ms	0
+connections_with_failover_max_tries	3
+convert_query_to_cnf	0
+count_distinct_implementation	uniqExact
+count_distinct_optimization	0
+create_index_ignore_unique	0
+create_replicated_merge_tree_fault_injection_probability	0
+create_table_empty_primary_key_by_default	0
+cross_to_inner_join_rewrite	1
+data_type_default_nullable	0
+database_atomic_wait_for_drop_and_detach_synchronously	0
+database_replicated_allow_only_replicated_engine	0
+database_replicated_allow_replicated_engine_arguments	1
+database_replicated_always_detach_permanently	0
+database_replicated_ddl_output	1
+database_replicated_enforce_synchronous_settings	0
+database_replicated_initial_query_timeout_sec	300
+date_time_input_format	basic
+date_time_output_format	simple
+date_time_overflow_behavior	ignore
+decimal_check_overflow	1
+deduplicate_blocks_in_dependent_materialized_views	0
+default_database_engine	Atomic
+default_max_bytes_in_join	1000000000
+default_table_engine	None
+default_temporary_table_engine	Memory
+describe_compact_output	0
+describe_extend_object_types	0
+describe_include_subcolumns	0
+describe_include_virtual_columns	0
+dialect	clickhouse
+dictionary_use_async_executor	0
+distinct_overflow_mode	throw
+distributed_aggregation_memory_efficient	1
+distributed_background_insert_batch	0
+distributed_background_insert_max_sleep_time_ms	30000
+distributed_background_insert_sleep_time_ms	100
+distributed_background_insert_split_batch_on_failure	0
+distributed_background_insert_timeout	0
+distributed_connections_pool_size	1024
+distributed_ddl_entry_format_version	5
+distributed_ddl_output_mode	throw
+distributed_ddl_task_timeout	180
+distributed_directory_monitor_batch_inserts	0
+distributed_directory_monitor_max_sleep_time_ms	30000
+distributed_directory_monitor_sleep_time_ms	100
+distributed_directory_monitor_split_batch_on_failure	0
+distributed_foreground_insert	0
+distributed_group_by_no_merge	0
+distributed_product_mode	deny
+distributed_push_down_limit	1
+distributed_replica_error_cap	1000
+distributed_replica_error_half_life	60
+distributed_replica_max_ignored_errors	0
+do_not_merge_across_partitions_select_final	0
+drain_timeout	3
+empty_result_for_aggregation_by_constant_keys_on_empty_set	1
+empty_result_for_aggregation_by_empty_set	0
+enable_debug_queries	0
+enable_deflate_qpl_codec	0
+enable_early_constant_folding	1
+enable_extended_results_for_datetime_functions	0
+enable_filesystem_cache	1
+enable_filesystem_cache_log	0
+enable_filesystem_cache_on_write_operations	0
+enable_filesystem_read_prefetches_log	0
+enable_global_with_statement	1
+enable_http_compression	0
+enable_job_stack_trace	0
+enable_lightweight_delete	1
+enable_memory_bound_merging_of_aggregation_results	1
+enable_multiple_prewhere_read_steps	1
+enable_optimize_predicate_expression	1
+enable_optimize_predicate_expression_to_final_subquery	1
+enable_order_by_all	1
+enable_positional_arguments	1
+enable_reads_from_query_cache	1
+enable_s3_requests_logging	0
+enable_scalar_subquery_optimization	1
+enable_sharing_sets_for_mutations	1
+enable_software_prefetch_in_aggregation	1
+enable_unaligned_array_join	0
+enable_url_encoding	1
+enable_writes_to_query_cache	1
+engine_file_allow_create_multiple_files	0
+engine_file_empty_if_not_exists	0
+engine_file_skip_empty_files	0
+engine_file_truncate_on_insert	0
+engine_url_skip_empty_files	0
+errors_output_format	CSV
+exact_rows_before_limit	0
+except_default_mode	ALL
+external_storage_connect_timeout_sec	10
+external_storage_max_read_bytes	0
+external_storage_max_read_rows	0
+external_storage_rw_timeout_sec	300
+external_table_functions_use_nulls	1
+external_table_strict_query	0
+extract_kvp_max_pairs_per_row	1000
+extremes	0
+fallback_to_stale_replicas_for_distributed_queries	1
+filesystem_cache_max_download_size	137438953472
+filesystem_cache_segments_batch_size	20
+filesystem_prefetch_max_memory_usage	1073741824
+filesystem_prefetch_min_bytes_for_single_read_task	2097152
+filesystem_prefetch_step_bytes	0
+filesystem_prefetch_step_marks	0
+filesystem_prefetches_limit	200
+final	0
+flatten_nested	1
+force_aggregate_partitions_independently	0
+force_aggregation_in_order	0
+force_data_skipping_indices	
+force_grouping_standard_compatibility	1
+force_index_by_date	0
+force_optimize_projection	0
+force_optimize_projection_name	
+force_optimize_skip_unused_shards	0
+force_optimize_skip_unused_shards_nesting	0
+force_primary_key	0
+force_remove_data_recursively_on_drop	0
+format_avro_schema_registry_url	
+format_binary_max_array_size	1073741824
+format_binary_max_string_size	1073741824
+format_capn_proto_enum_comparising_mode	by_values
+format_capn_proto_use_autogenerated_schema	1
+format_csv_allow_double_quotes	1
+format_csv_allow_single_quotes	0
+format_csv_delimiter	,
+format_csv_null_representation	\\N
+format_custom_escaping_rule	Escaped
+format_custom_field_delimiter	\t
+format_custom_result_after_delimiter	
+format_custom_result_before_delimiter	
+format_custom_row_after_delimiter	\n
+format_custom_row_before_delimiter	
+format_custom_row_between_delimiter	
+format_display_secrets_in_show_and_select	0
+format_json_object_each_row_column_for_object_name	
+format_protobuf_use_autogenerated_schema	1
+format_regexp	
+format_regexp_escaping_rule	Raw
+format_regexp_skip_unmatched	0
+format_schema	
+format_template_resultset	
+format_template_row	
+format_template_rows_between_delimiter	\n
+format_tsv_null_representation	\\N
+formatdatetime_f_prints_single_zero	0
+formatdatetime_format_without_leading_zeros	0
+formatdatetime_parsedatetime_m_is_month_name	1
+fsync_metadata	1
+function_implementation	
+function_json_value_return_type_allow_complex	0
+function_json_value_return_type_allow_nullable	0
+function_range_max_elements_in_block	500000000
+function_sleep_max_microseconds_per_block	3000000
+glob_expansion_max_elements	1000
+grace_hash_join_initial_buckets	1
+grace_hash_join_max_buckets	1024
+group_by_overflow_mode	throw
+group_by_two_level_threshold	100000
+group_by_two_level_threshold_bytes	50000000
+group_by_use_nulls	0
+handle_kafka_error_mode	default
+handshake_timeout_ms	10000
+hdfs_create_new_file_on_insert	0
+hdfs_replication	0
+hdfs_skip_empty_files	0
+hdfs_truncate_on_insert	0
+hedged_connection_timeout_ms	50
+hsts_max_age	0
+http_connection_timeout	1
+http_headers_progress_interval_ms	100
+http_make_head_request	1
+http_max_chunk_size	107374182400
+http_max_field_name_size	131072
+http_max_field_value_size	131072
+http_max_fields	1000000
+http_max_multipart_form_data_size	1073741824
+http_max_request_param_data_size	10485760
+http_max_tries	10
+http_max_uri_size	1048576
+http_native_compression_disable_checksumming_on_decompress	0
+http_receive_timeout	30
+http_response_buffer_size	0
+http_retry_initial_backoff_ms	100
+http_retry_max_backoff_ms	10000
+http_send_timeout	30
+http_skip_not_found_url_for_globs	1
+http_wait_end_of_query	0
+http_write_exception_in_output_format	1
+http_zlib_compression_level	3
+idle_connection_timeout	3600
+ignore_cold_parts_seconds	0
+ignore_data_skipping_indices	
+ignore_on_cluster_for_replicated_access_entities_queries	0
+ignore_on_cluster_for_replicated_udf_queries	0
+implicit_transaction	0
+input_format_allow_errors_num	0
+input_format_allow_errors_ratio	0
+input_format_allow_seeks	1
+input_format_arrow_allow_missing_columns	1
+input_format_arrow_case_insensitive_column_matching	0
+input_format_arrow_import_nested	0
+input_format_arrow_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_avro_allow_missing_fields	0
+input_format_avro_null_as_default	0
+input_format_bson_skip_fields_with_unsupported_types_in_schema_inference	0
+input_format_capn_proto_skip_fields_with_unsupported_types_in_schema_inference	0
+input_format_csv_allow_cr_end_of_line	0
+input_format_csv_allow_variable_number_of_columns	0
+input_format_csv_allow_whitespace_or_tab_as_delimiter	0
+input_format_csv_arrays_as_nested_csv	0
+input_format_csv_detect_header	1
+input_format_csv_empty_as_default	1
+input_format_csv_enum_as_number	0
+input_format_csv_skip_first_lines	0
+input_format_csv_skip_trailing_empty_lines	0
+input_format_csv_trim_whitespaces	1
+input_format_csv_try_infer_numbers_from_strings	0
+input_format_csv_use_best_effort_in_schema_inference	1
+input_format_csv_use_default_on_bad_values	0
+input_format_custom_allow_variable_number_of_columns	0
+input_format_custom_detect_header	1
+input_format_custom_skip_trailing_empty_lines	0
+input_format_defaults_for_omitted_fields	1
+input_format_hive_text_collection_items_delimiter	
+input_format_hive_text_fields_delimiter	

+input_format_hive_text_map_keys_delimiter	
+input_format_import_nested_json	0
+input_format_ipv4_default_on_conversion_error	0
+input_format_ipv6_default_on_conversion_error	0
+input_format_json_compact_allow_variable_number_of_columns	0
+input_format_json_defaults_for_missing_elements_in_named_tuple	1
+input_format_json_ignore_unknown_keys_in_named_tuple	1
+input_format_json_infer_incomplete_types_as_strings	1
+input_format_json_named_tuples_as_objects	1
+input_format_json_read_arrays_as_strings	1
+input_format_json_read_bools_as_numbers	1
+input_format_json_read_numbers_as_strings	1
+input_format_json_read_objects_as_strings	1
+input_format_json_try_infer_named_tuples_from_objects	1
+input_format_json_try_infer_numbers_from_strings	0
+input_format_json_validate_types_from_metadata	1
+input_format_max_bytes_to_read_for_schema_inference	33554432
+input_format_max_rows_to_read_for_schema_inference	25000
+input_format_msgpack_number_of_columns	0
+input_format_mysql_dump_map_column_names	1
+input_format_mysql_dump_table_name	
+input_format_native_allow_types_conversion	1
+input_format_null_as_default	1
+input_format_orc_allow_missing_columns	1
+input_format_orc_case_insensitive_column_matching	0
+input_format_orc_filter_push_down	1
+input_format_orc_import_nested	0
+input_format_orc_row_batch_size	100000
+input_format_orc_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_orc_use_fast_decoder	1
+input_format_parallel_parsing	1
+input_format_parquet_allow_missing_columns	1
+input_format_parquet_case_insensitive_column_matching	0
+input_format_parquet_filter_push_down	1
+input_format_parquet_import_nested	0
+input_format_parquet_local_file_min_bytes_for_seek	8192
+input_format_parquet_max_block_size	8192
+input_format_parquet_preserve_order	0
+input_format_parquet_skip_columns_with_unsupported_types_in_schema_inference	0
+input_format_protobuf_flatten_google_wrappers	0
+input_format_protobuf_skip_fields_with_unsupported_types_in_schema_inference	0
+input_format_record_errors_file_path	
+input_format_skip_unknown_fields	1
+input_format_try_infer_dates	1
+input_format_try_infer_datetimes	1
+input_format_try_infer_integers	1
+input_format_tsv_allow_variable_number_of_columns	0
+input_format_tsv_detect_header	1
+input_format_tsv_empty_as_default	0
+input_format_tsv_enum_as_number	0
+input_format_tsv_skip_first_lines	0
+input_format_tsv_skip_trailing_empty_lines	0
+input_format_tsv_use_best_effort_in_schema_inference	1
+input_format_values_accurate_types_of_literals	1
+input_format_values_allow_data_after_semicolon	0
+input_format_values_deduce_templates_of_expressions	1
+input_format_values_interpret_expressions	1
+input_format_with_names_use_header	1
+input_format_with_types_use_header	1
+insert_allow_materialized_columns	0
+insert_deduplicate	1
+insert_deduplication_token	
+insert_distributed_one_random_shard	0
+insert_distributed_sync	0
+insert_distributed_timeout	0
+insert_keeper_fault_injection_probability	0
+insert_keeper_fault_injection_seed	0
+insert_keeper_max_retries	20
+insert_keeper_retry_initial_backoff_ms	100
+insert_keeper_retry_max_backoff_ms	10000
+insert_null_as_default	1
+insert_quorum	0
+insert_quorum_parallel	1
+insert_quorum_timeout	600000
+insert_shard_id	0
+interactive_delay	100000
+intersect_default_mode	ALL
+interval_output_format	numeric
+join_algorithm	default
+join_any_take_last_row	0
+join_default_strictness	ALL
+join_on_disk_max_files_to_merge	64
+join_overflow_mode	throw
+join_use_nulls	0
+joined_subquery_requires_alias	1
+kafka_disable_num_consumers_limit	0
+kafka_max_wait_ms	5000
+keeper_map_strict_mode	0
+legacy_column_name_of_tuple_literal	0
+limit	0
+live_view_heartbeat_interval	15
+load_balancing	random
+load_balancing_first_offset	0
+load_marks_asynchronously	0
+local_filesystem_read_method	pread_threadpool
+local_filesystem_read_prefetch	0
+lock_acquire_timeout	120
+log_comment	
+log_formatted_queries	0
+log_processors_profiles	0
+log_profile_events	1
+log_queries	1
+log_queries_cut_to_length	100000
+log_queries_min_query_duration_ms	0
+log_queries_min_type	QUERY_START
+log_queries_probability	1
+log_query_settings	1
+log_query_threads	0
+log_query_views	1
+low_cardinality_allow_in_native_format	1
+low_cardinality_max_dictionary_size	8192
+low_cardinality_use_single_dictionary_for_part	0
+materialize_ttl_after_modify	1
+materialized_views_ignore_errors	0
+max_alter_threads	\'auto(16)\'
+max_analyze_depth	5000
+max_ast_depth	1000
+max_ast_elements	50000
+max_backup_bandwidth	0
+max_block_size	65409
+max_bytes_before_external_group_by	0
+max_bytes_before_external_sort	0
+max_bytes_before_remerge_sort	1000000000
+max_bytes_in_distinct	0
+max_bytes_in_join	0
+max_bytes_in_set	0
+max_bytes_to_read	0
+max_bytes_to_read_leaf	0
+max_bytes_to_sort	0
+max_bytes_to_transfer	0
+max_columns_to_read	0
+max_compress_block_size	1048576
+max_concurrent_queries_for_all_users	0
+max_concurrent_queries_for_user	0
+max_distributed_connections	1024
+max_distributed_depth	5
+max_download_buffer_size	10485760
+max_download_threads	4
+max_entries_for_hash_table_stats	10000
+max_execution_speed	0
+max_execution_speed_bytes	0
+max_execution_time	0
+max_execution_time_leaf	0
+max_expanded_ast_elements	500000
+max_fetch_partition_retries_count	5
+max_final_threads	\'auto(16)\'
+max_http_get_redirects	0
+max_hyperscan_regexp_length	0
+max_hyperscan_regexp_total_length	0
+max_insert_block_size	1048449
+max_insert_delayed_streams_for_parallel_write	0
+max_insert_threads	0
+max_joined_block_size_rows	65409
+max_limit_for_ann_queries	1000000
+max_live_view_insert_blocks_before_refresh	64
+max_local_read_bandwidth	0
+max_local_write_bandwidth	0
+max_memory_usage	0
+max_memory_usage_for_all_queries	0
+max_memory_usage_for_user	0
+max_network_bandwidth	0
+max_network_bandwidth_for_all_users	0
+max_network_bandwidth_for_user	0
+max_network_bytes	0
+max_number_of_partitions_for_independent_aggregation	128
+max_parallel_replicas	1
+max_parser_depth	1000
+max_partition_size_to_drop	50000000000
+max_partitions_per_insert_block	100
+max_partitions_to_read	-1
+max_pipeline_depth	0
+max_query_size	262144
+max_read_buffer_size	1048576
+max_read_buffer_size_local_fs	131072
+max_read_buffer_size_remote_fs	0
+max_remote_read_network_bandwidth	0
+max_remote_read_network_bandwidth_for_server	0
+max_remote_write_network_bandwidth	0
+max_remote_write_network_bandwidth_for_server	0
+max_replica_delay_for_distributed_queries	300
+max_replicated_fetches_network_bandwidth_for_server	0
+max_replicated_sends_network_bandwidth_for_server	0
+max_result_bytes	0
+max_result_rows	0
+max_rows_in_distinct	0
+max_rows_in_join	0
+max_rows_in_set	0
+max_rows_in_set_to_optimize_join	100000
+max_rows_to_group_by	0
+max_rows_to_read	0
+max_rows_to_read_leaf	0
+max_rows_to_sort	0
+max_rows_to_transfer	0
+max_sessions_for_user	0
+max_size_to_preallocate_for_aggregation	100000000
+max_streams_for_merge_tree_reading	0
+max_streams_multiplier_for_merge_tables	5
+max_streams_to_max_threads_ratio	1
+max_subquery_depth	100
+max_table_size_to_drop	50000000000
+max_temporary_columns	0
+max_temporary_data_on_disk_size_for_query	0
+max_temporary_data_on_disk_size_for_user	0
+max_temporary_non_const_columns	0
+max_threads	\'auto(16)\'
+max_threads_for_annoy_index_creation	4
+max_threads_for_indexes	0
+max_untracked_memory	4194304
+memory_overcommit_ratio_denominator	1073741824
+memory_overcommit_ratio_denominator_for_user	1073741824
+memory_profiler_sample_max_allocation_size	0
+memory_profiler_sample_min_allocation_size	0
+memory_profiler_sample_probability	0
+memory_profiler_step	4194304
+memory_tracker_fault_probability	0
+memory_usage_overcommit_max_wait_microseconds	5000000
+merge_tree_clear_old_parts_interval_seconds	1
+merge_tree_clear_old_temporary_directories_interval_seconds	60
+merge_tree_coarse_index_granularity	8
+merge_tree_compact_parts_min_granules_to_multibuffer_read	16
+merge_tree_determine_task_size_by_prewhere_columns	1
+merge_tree_max_bytes_to_use_cache	2013265920
+merge_tree_max_rows_to_use_cache	1048576
+merge_tree_min_bytes_for_concurrent_read	251658240
+merge_tree_min_bytes_for_concurrent_read_for_remote_filesystem	251658240
+merge_tree_min_bytes_for_seek	0
+merge_tree_min_bytes_per_task_for_remote_reading	4194304
+merge_tree_min_rows_for_concurrent_read	163840
+merge_tree_min_rows_for_concurrent_read_for_remote_filesystem	163840
+merge_tree_min_rows_for_seek	0
+merge_tree_use_const_size_tasks_for_remote_reading	1
+metrics_perf_events_enabled	0
+metrics_perf_events_list	
+min_bytes_to_use_direct_io	0
+min_bytes_to_use_mmap_io	0
+min_chunk_bytes_for_parallel_parsing	10485760
+min_compress_block_size	65536
+min_count_to_compile_aggregate_expression	3
+min_count_to_compile_expression	3
+min_count_to_compile_sort_description	3
+min_execution_speed	0
+min_execution_speed_bytes	0
+min_free_disk_space_for_temporary_data	0
+min_hit_rate_to_use_consecutive_keys_optimization	0.5
+min_insert_block_size_bytes	268402944
+min_insert_block_size_bytes_for_materialized_views	0
+min_insert_block_size_rows	1048449
+min_insert_block_size_rows_for_materialized_views	0
+move_all_conditions_to_prewhere	1
+move_primary_key_columns_to_end_of_prewhere	1
+multiple_joins_rewriter_version	0
+multiple_joins_try_to_keep_original_names	0
+mutations_execute_nondeterministic_on_initiator	0
+mutations_execute_subqueries_on_initiator	0
+mutations_max_literal_size_to_replace	16384
+mutations_sync	0
+mysql_datatypes_support_level	
+mysql_map_fixed_string_to_text_in_show_columns	0
+mysql_map_string_to_text_in_show_columns	0
+mysql_max_rows_to_insert	65536
+network_compression_method	LZ4
+network_zstd_compression_level	1
+normalize_function_names	1
+number_of_mutations_to_delay	0
+number_of_mutations_to_throw	0
+odbc_bridge_connection_pool_size	16
+odbc_bridge_use_connection_pooling	1
+odbc_max_field_size	0
+offset	0
+opentelemetry_start_trace_probability	0
+opentelemetry_trace_processors	0
+optimize_aggregation_in_order	0
+optimize_aggregators_of_group_by_keys	1
+optimize_append_index	0
+optimize_arithmetic_operations_in_aggregate_functions	1
+optimize_count_from_files	1
+optimize_distinct_in_order	1
+optimize_distributed_group_by_sharding_key	1
+optimize_duplicate_order_by_and_distinct	0
+optimize_functions_to_subcolumns	0
+optimize_fuse_sum_count_avg	0
+optimize_group_by_constant_keys	1
+optimize_group_by_function_keys	1
+optimize_if_chain_to_multiif	0
+optimize_if_transform_strings_to_enum	0
+optimize_injective_functions_inside_uniq	1
+optimize_min_equality_disjunction_chain_length	3
+optimize_min_inequality_conjunction_chain_length	3
+optimize_monotonous_functions_in_order_by	0
+optimize_move_functions_out_of_any	0
+optimize_move_to_prewhere	1
+optimize_move_to_prewhere_if_final	0
+optimize_multiif_to_if	1
+optimize_normalize_count_variants	1
+optimize_on_insert	1
+optimize_or_like_chain	0
+optimize_read_in_order	1
+optimize_read_in_window_order	1
+optimize_redundant_functions_in_order_by	1
+optimize_respect_aliases	1
+optimize_rewrite_aggregate_function_with_if	1
+optimize_rewrite_array_exists_to_has	0
+optimize_rewrite_sum_if_to_count_if	0
+optimize_skip_merged_partitions	0
+optimize_skip_unused_shards	0
+optimize_skip_unused_shards_limit	1000
+optimize_skip_unused_shards_nesting	0
+optimize_skip_unused_shards_rewrite_in	1
+optimize_sorting_by_input_stream_properties	1
+optimize_substitute_columns	0
+optimize_syntax_fuse_functions	0
+optimize_throw_if_noop	0
+optimize_trivial_approximate_count_query	0
+optimize_trivial_count_query	1
+optimize_trivial_insert_select	1
+optimize_uniq_to_count	1
+optimize_use_implicit_projections	1
+optimize_use_projections	1
+optimize_using_constraints	0
+os_thread_priority	0
+output_format_arrow_compression_method	lz4_frame
+output_format_arrow_fixed_string_as_fixed_byte_array	1
+output_format_arrow_low_cardinality_as_dictionary	0
+output_format_arrow_string_as_string	0
+output_format_avro_codec	
+output_format_avro_rows_in_file	1
+output_format_avro_string_column_pattern	
+output_format_avro_sync_interval	16384
+output_format_bson_string_as_string	0
+output_format_csv_crlf_end_of_line	0
+output_format_decimal_trailing_zeros	0
+output_format_enable_streaming	0
+output_format_json_array_of_rows	0
+output_format_json_escape_forward_slashes	1
+output_format_json_named_tuples_as_objects	1
+output_format_json_quote_64bit_floats	0
+output_format_json_quote_64bit_integers	1
+output_format_json_quote_decimals	0
+output_format_json_quote_denormals	0
+output_format_json_skip_null_value_in_named_tuples	0
+output_format_json_validate_utf8	0
+output_format_markdown_escape_special_characters	0
+output_format_msgpack_uuid_representation	ext
+output_format_orc_compression_method	lz4
+output_format_orc_row_index_stride	10000
+output_format_orc_string_as_string	0
+output_format_parallel_formatting	1
+output_format_parquet_batch_size	1024
+output_format_parquet_compliant_nested_types	1
+output_format_parquet_compression_method	lz4
+output_format_parquet_data_page_size	1048576
+output_format_parquet_fixed_string_as_fixed_byte_array	1
+output_format_parquet_parallel_encoding	1
+output_format_parquet_row_group_size	1000000
+output_format_parquet_row_group_size_bytes	536870912
+output_format_parquet_string_as_string	0
+output_format_parquet_use_custom_encoder	0
+output_format_parquet_version	2.latest
+output_format_pretty_color	1
+output_format_pretty_grid_charset	UTF-8
+output_format_pretty_max_column_pad_width	250
+output_format_pretty_max_rows	10000
+output_format_pretty_max_value_width	10000
+output_format_pretty_row_numbers	0
+output_format_protobuf_nullables_with_google_wrappers	0
+output_format_schema	
+output_format_sql_insert_include_column_names	1
+output_format_sql_insert_max_batch_size	65409
+output_format_sql_insert_quote_names	1
+output_format_sql_insert_table_name	table
+output_format_sql_insert_use_replace	0
+output_format_tsv_crlf_end_of_line	0
+output_format_write_statistics	1
+parallel_distributed_insert_select	0
+parallel_replica_offset	0
+parallel_replicas_count	0
+parallel_replicas_custom_key	
+parallel_replicas_custom_key_filter_type	default
+parallel_replicas_for_non_replicated_merge_tree	0
+parallel_replicas_min_number_of_granules_to_enable	0
+parallel_replicas_min_number_of_rows_per_replica	0
+parallel_replicas_single_task_marks_count_multiplier	2
+parallel_view_processing	0
+parallelize_output_from_storages	1
+parsedatetime_parse_without_leading_zeros	1
+partial_merge_join_left_table_buffer_bytes	0
+partial_merge_join_optimizations	0
+partial_merge_join_rows_in_right_blocks	65536
+partial_result_on_first_cancel	0
+parts_to_delay_insert	0
+parts_to_throw_insert	0
+periodic_live_view_refresh	60
+poll_interval	10
+postgresql_connection_pool_auto_close_connection	0
+postgresql_connection_pool_size	16
+postgresql_connection_pool_wait_timeout	5000
+precise_float_parsing	0
+prefer_column_name_to_alias	0
+prefer_global_in_and_join	0
+prefer_localhost_replica	1
+prefer_warmed_unmerged_parts_seconds	0
+preferred_block_size_bytes	1000000
+preferred_max_column_in_block_size_bytes	0
+preferred_optimize_projection_name	
+prefetch_buffer_size	1048576
+print_pretty_type_names	0
+priority	0
+query_cache_compress_entries	1
+query_cache_max_entries	0
+query_cache_max_size_in_bytes	0
+query_cache_min_query_duration	0
+query_cache_min_query_runs	0
+query_cache_nondeterministic_function_handling	throw
+query_cache_share_between_users	0
+query_cache_squash_partial_results	1
+query_cache_store_results_of_queries_with_nondeterministic_functions	0
+query_cache_ttl	60
+query_plan_aggregation_in_order	1
+query_plan_enable_multithreading_after_window_functions	1
+query_plan_enable_optimizations	1
+query_plan_execute_functions_after_sorting	1
+query_plan_filter_push_down	1
+query_plan_lift_up_array_join	1
+query_plan_lift_up_union	1
+query_plan_max_optimizations_to_apply	10000
+query_plan_merge_expressions	1
+query_plan_optimize_primary_key	1
+query_plan_optimize_projection	1
+query_plan_push_down_limit	1
+query_plan_read_in_order	1
+query_plan_remove_redundant_distinct	1
+query_plan_remove_redundant_sorting	1
+query_plan_reuse_storage_ordering_for_window_functions	1
+query_plan_split_filter	1
+query_profiler_cpu_time_period_ns	1000000000
+query_profiler_real_time_period_ns	1000000000
+queue_max_wait_ms	0
+rabbitmq_max_wait_ms	5000
+read_backoff_max_throughput	1048576
+read_backoff_min_concurrency	1
+read_backoff_min_events	2
+read_backoff_min_interval_between_events_ms	1000
+read_backoff_min_latency_ms	1000
+read_from_filesystem_cache_if_exists_otherwise_bypass_cache	0
+read_in_order_two_level_merge_threshold	100
+read_overflow_mode	throw
+read_overflow_mode_leaf	throw
+read_priority	0
+readonly	0
+receive_data_timeout_ms	2000
+receive_timeout	300
+regexp_dict_allow_hyperscan	1
+regexp_dict_flag_case_insensitive	0
+regexp_dict_flag_dotall	0
+regexp_max_matches_per_row	1000
+reject_expensive_hyperscan_regexps	1
+remerge_sort_lowered_memory_bytes_ratio	2
+remote_filesystem_read_method	threadpool
+remote_filesystem_read_prefetch	1
+remote_fs_read_backoff_max_tries	5
+remote_fs_read_max_backoff_ms	10000
+remote_read_min_bytes_for_seek	4194304
+rename_files_after_processing	
+replace_running_query	0
+replace_running_query_max_wait_ms	5000
+replication_alter_columns_timeout	60
+replication_alter_partitions_sync	1
+replication_wait_for_inactive_replica_timeout	120
+restore_threads	16
+result_overflow_mode	throw
+rewrite_count_distinct_if_with_count_distinct_implementation	0
+s3_allow_parallel_part_upload	1
+s3_check_objects_after_upload	0
+s3_create_new_file_on_insert	0
+s3_disable_checksum	0
+s3_http_connection_pool_size	1000
+s3_list_object_keys_size	1000
+s3_max_connections	1024
+s3_max_get_burst	0
+s3_max_get_rps	0
+s3_max_inflight_parts_for_one_file	20
+s3_max_put_burst	0
+s3_max_put_rps	0
+s3_max_redirects	10
+s3_max_single_part_upload_size	33554432
+s3_max_single_read_retries	4
+s3_max_unexpected_write_error_retries	4
+s3_max_upload_part_size	5368709120
+s3_min_upload_part_size	16777216
+s3_request_timeout_ms	30000
+s3_retry_attempts	100
+s3_skip_empty_files	0
+s3_strict_upload_part_size	0
+s3_throw_on_zero_files_match	0
+s3_truncate_on_insert	0
+s3_upload_part_size_multiply_factor	2
+s3_upload_part_size_multiply_parts_count_threshold	500
+s3_use_adaptive_timeouts	1
+s3queue_default_zookeeper_path	/clickhouse/s3queue/
+s3queue_enable_logging_to_s3queue_log	0
+schema_inference_cache_require_modification_time_for_url	1
+schema_inference_hints	
+schema_inference_make_columns_nullable	1
+schema_inference_mode	default
+schema_inference_use_cache_for_azure	1
+schema_inference_use_cache_for_file	1
+schema_inference_use_cache_for_hdfs	1
+schema_inference_use_cache_for_s3	1
+schema_inference_use_cache_for_url	1
+select_sequential_consistency	0
+send_logs_level	fatal
+send_logs_source_regexp	
+send_progress_in_http_headers	0
+send_timeout	300
+session_timezone	
+set_overflow_mode	throw
+short_circuit_function_evaluation	enable
+show_table_uuid_in_table_create_query_if_not_nil	0
+single_join_prefer_left_table	1
+skip_download_if_exceeds_query_cache	1
+skip_unavailable_shards	0
+sleep_after_receiving_query_ms	0
+sleep_in_send_data_ms	0
+sleep_in_send_tables_status_ms	0
+sort_overflow_mode	throw
+splitby_max_substrings_includes_remaining_string	0
+stop_refreshable_materialized_views_on_startup	0
+storage_file_read_method	pread
+storage_system_stack_trace_pipe_read_timeout_ms	100
+stream_flush_interval_ms	7500
+stream_like_engine_allow_direct_select	0
+stream_like_engine_insert_queue	
+stream_poll_timeout_ms	500
+system_events_show_zero_values	0
+table_function_remote_max_addresses	1000
+tcp_keep_alive_timeout	290
+temporary_files_codec	LZ4
+temporary_live_view_timeout	1
+throw_if_no_data_to_insert	1
+throw_on_error_from_cache_on_write_operations	0
+throw_on_max_partitions_per_insert_block	1
+throw_on_unsupported_query_inside_transaction	1
+timeout_before_checking_execution_speed	10
+timeout_overflow_mode	throw
+timeout_overflow_mode_leaf	throw
+totals_auto_threshold	0.5
+totals_mode	after_having_exclusive
+trace_profile_events	0
+transfer_overflow_mode	throw
+transform_null_in	0
+union_default_mode	
+unknown_packet_in_send_data	0
+use_cache_for_count_from_files	1
+use_client_time_zone	0
+use_compact_format_in_distributed_parts_names	1
+use_concurrency_control	1
+use_hedged_requests	1
+use_index_for_in_with_subqueries	1
+use_index_for_in_with_subqueries_max_values	0
+use_local_cache_for_remote_storage	1
+use_mysql_types_in_show_columns	0
+use_query_cache	0
+use_skip_indexes	1
+use_skip_indexes_if_final	0
+use_structure_from_insertion_table_in_table_functions	2
+use_uncompressed_cache	0
+use_with_fill_by_sorting_prefix	1
+validate_polygons	1
+wait_changes_become_visible_after_commit_mode	wait_unknown
+wait_for_async_insert	1
+wait_for_async_insert_timeout	120
+wait_for_window_view_fire_signal_timeout	10
+window_view_clean_interval	60
+window_view_heartbeat_interval	15
+workload	default
+zstd_window_log_max	0
diff --git a/tests/queries/0_stateless/02995_forget_partition.reference b/tests/queries/0_stateless/02995_forget_partition.reference
new file mode 100644
index 00000000000..b2bc15b7bcb
--- /dev/null
+++ b/tests/queries/0_stateless/02995_forget_partition.reference
@@ -0,0 +1,21 @@
+---before---
+20240101
+20240102
+20240103
+20240104
+20240105
+20240106
+20240107
+20240108
+20240109
+20240110
+---after---
+20240102
+20240103
+20240104
+20240105
+20240106
+20240107
+20240108
+20240109
+20240110
diff --git a/tests/queries/0_stateless/02995_forget_partition.sh b/tests/queries/0_stateless/02995_forget_partition.sh
new file mode 100755
index 00000000000..8ece8d3ddb3
--- /dev/null
+++ b/tests/queries/0_stateless/02995_forget_partition.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Tags: zookeeper, no-replicated-database
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+drop table if exists forget_partition;
+
+create table forget_partition
+(
+    k UInt64,
+    d Date,
+    v String
+)
+engine = ReplicatedMergeTree('/test/02995/{database}/rmt', '1')
+order by (k, d)
+partition by toYYYYMMDD(d);
+
+insert into forget_partition select number, '2024-01-01' + interval number day, randomString(20) from system.numbers limit 10;
+
+alter table forget_partition drop partition '20240101';
+alter table forget_partition drop partition '20240102';
+"""
+
+# DROP PARTITION do not wait for a part to be removed from memory due to possible concurrent SELECTs, so we have to do wait manually here
+while [[ $(${CLICKHOUSE_CLIENT} -q "select count() from system.parts where database=currentDatabase() and table='forget_partition' and partition='20240101'") != 0 ]]; do sleep 0.1; done
+
+${CLICKHOUSE_CLIENT} --multiline --multiquery -q """
+set allow_unrestricted_reads_from_keeper=1;
+
+select '---before---';
+select name from system.zookeeper where path = '/test/02995/' || currentDatabase() || '/rmt/block_numbers' order by name;
+
+alter table forget_partition forget partition '20240103'; -- {serverError CANNOT_FORGET_PARTITION}
+alter table forget_partition forget partition '20240203'; -- {serverError CANNOT_FORGET_PARTITION}
+alter table forget_partition forget partition '20240101';
+
+
+select '---after---';
+select name from system.zookeeper where path = '/test/02995/' || currentDatabase() || '/rmt/block_numbers' order by name;
+
+drop table forget_partition;
+"""
diff --git a/tests/queries/0_stateless/02995_index.reference b/tests/queries/0_stateless/02995_index.reference
new file mode 100644
index 00000000000..1e8639caa88
--- /dev/null
+++ b/tests/queries/0_stateless/02995_index.reference
@@ -0,0 +1,126 @@
+12	4	21722	2209341	4	1415	2333	4	61	64	3
+21	1134	11363	58484	1106	1458	1592	136	26	62	32
+22	210	4504	5729	196	291	767	124	47	54	8
+26	196	1327684	5221	195	4140	5661	161	28	49	19
+28	5	2034378	7102	5	325	3255	2	53	60	4
+29	53	45041	45189	45	1580	211	31	55	84	18
+38	424	1600675	4653	424	562	5944	244	60	65	6
+45	17	62743	674873	17	6239	6494	17	65	76	8
+72	1862	1210073	6200	1677	2498	528	859	51	61	11
+79	2	2255228	2255293	2	5495	7057	2	65	65	1
+85	459	1051571	1829638	459	6402	7131	334	32	61	25
+86	10	1748130	1754217	10	4374	7003	10	56	59	4
+91	165	5718	5802	75	282	7113	112	41	63	22
+94	20	1231916	2050003	20	4802	4917	19	53	59	7
+99	2	3665	36667	2	497	697	2	70	71	2
+103	1	2446615	2446615	1	2498	2498	1	58	58	1
+106	72	6149	6699	67	527	826	40	61	61	1
+111	43	2273186	5272	43	492	4923	4	54	72	15
+120	3129	45117	6735	2868	1030	1625	561	59	64	6
+138	2	49243	49374	2	1428	1519	2	47	48	2
+143	100	23321	63639	100	1115	1624	88	51	51	1
+145	1	2447976	2447976	1	6173	6173	1	44	44	1
+153	16	13748	16881	16	1506	1636	16	54	68	9
+159	19952	1525336	7131	12957	1280	6163	2668	24	66	39
+171	5	15042	16698	5	1302	1608	5	65	65	1
+179	6264	1362341	2686	6244	2554	7132	2705	61	67	7
+192	1	1639623	1639623	1	3406	3406	1	32	32	1
+193	1	1429969	1429969	1	7131	7131	1	45	45	1
+207	12	23057	32500	12	1491	1726	12	32	46	7
+221	5081	1366870	6649	3432	4527	5226	687	24	69	39
+228	73	12281	17929	71	1328	2034	63	49	71	18
+229	2	1617478	1723791	2	4590	5578	2	41	42	2
+230	3916	1332729	6949	3668	1330	4703	845	62	65	4
+238	25	2624456	2625673	24	2535	6465	25	58	75	14
+241	154	2554929	2616444	154	2626	7131	148	34	57	17
+248	276	15529	30987	274	1040	1222	136	37	79	27
+254	3018	33966	6635	2837	1057	1622	539	24	60	33
+255	20	1581774	1811334	20	6068	6301	18	33	57	10
+256	5	5145	6841	5	367	376	5	58	58	1
+270	2	2195579	2262119	2	7102	7123	2	33	34	2
+281	32	2379460	616215	32	6042	6086	23	53	64	12
+282	7	1292651	24244	7	1607	2455	6	46	55	5
+286	123	1521935	5269	123	3793	3940	81	40	66	22
+291	21	2419080	3567	21	297	4731	21	54	55	2
+316	4	5221	5616	4	505	558	4	32	35	3
+319	232	56480	63033	230	1599	313	50	33	64	26
+327	15	51647	51894	14	1292	1585	14	47	57	7
+332	24	23484	54948	24	1609	1726	16	32	49	11
+333	1	14189	14189	1	1550	1550	1	63	63	1
+342	49	2579220	2622432	49	4626	6933	48	34	54	14
+344	1	6486	6486	1	509	509	1	24	24	1
+346	1987	53016	6735	1823	1334	174	294	26	62	32
+358	45	59058	60844	44	6746	722	40	57	84	15
+363	1198	1260033	2568811	1196	5710	5790	82	55	80	26
+384	150	2361175	476024	150	7008	7123	81	38	64	22
+387	277	5200	6553	252	243	521	130	65	65	1
+392	1877	1607428	2030850	1875	1416	7131	1379	54	66	13
+396	8181	1380803	6186	7920	545	798	1743	24	67	39
+398	3	5183	5213	2	291	352	3	53	59	3
+399	62	51494	59203	61	7073	754	42	55	78	18
+412	2141	1360120	2189792	2136	2491	5658	1371	71	75	5
+413	2	2036037	2064917	2	3963	4666	2	43	45	2
+431	33	2302331	2348449	33	4425	6516	32	69	69	1
+447	59	25125	33094	59	1176	1817	56	53	58	6
+456	1	53157	53157	1	1556	1556	1	26	26	1
+462	5	5456	6280	5	348	4337	5	28	40	5
+472	1	1443716	1443716	1	6122	6122	1	42	42	1
+491	34	1066102	1183673	34	6606	6822	32	46	67	15
+498	896	2230163	3054	895	537	7131	714	24	59	28
+504	108	12281	25180	108	1318	1784	94	55	66	12
+515	22	1588883	2640809	22	6554	6571	15	46	59	12
+518	1	37743	37743	1	1558	1558	1	72	72	1
+530	1	3033	3033	1	561	561	1	59	59	1
+532	26	5721	6355	25	549	665	14	44	50	7
+546	156	2577874	48517	156	1105	324	133	44	51	8
+554	12	1665194	2640066	12	1817	2951	12	57	57	1
+564	3865	2028049	2083433	3722	1115	985	2203	44	84	41
+566	4432	50605	57509	3217	1191	267	459	26	72	39
+567	8	5221	5893	7	333	558	8	27	35	4
+582	1172	1320619	2019743	1172	5819	7131	757	26	63	30
+584	43100	2500	5594	22561	134	4573	1660	48	84	37
+589	28	6046	6068	19	345	564	27	55	62	8
+595	139	1585165	1683606	138	2231	3598	132	54	84	28
+615	3	1056081	1116230	3	5794	5796	2	59	62	3
+619	7	1543114	5241	7	2442	3105	7	41	45	3
+634	2722	1221058	4999	2686	2426	7131	1735	54	60	7
+635	237	2119333	4667	237	561	5999	176	49	60	12
+644	5	1774169	2056171	5	5591	6091	4	33	39	3
+647	8	51632	64403	8	1457	1624	8	26	34	5
+651	1325	1620565	6281	1301	528	792	815	62	63	2
+665	13	4598	4789	13	511	558	11	39	46	7
+679	1560	1613200	25940	1552	1569	3118	781	49	84	35
+704	2	14226	15594	2	1086	1116	2	65	71	2
+715	25	1199352	3490	25	5036	5112	23	34	55	13
+716	1253	61989	6735	1050	1203	1625	397	52	65	14
+730	2584	5560	6170	634	2421	627	293	56	69	14
+736	8	1433153	4941	8	339	4594	8	28	36	5
+749	2	1326176	1339862	2	4339	6213	2	49	50	2
+753	1	53157	53157	1	1556	1556	1	26	26	1
+761	63	1443230	6881	63	3154	3204	26	56	73	14
+762	49	1449596	1968154	49	2437	3753	48	54	62	9
+775	35107	5330	769436	2471	447	6607	656	70	81	12
+789	1	1552458	1552458	1	2441	2441	1	62	62	1
+794	158	5585	6585	155	495	929	67	24	50	20
+839	9	29223	46530	9	1336	1465	9	52	52	1
+844	5	2377545	2377635	5	5129	6321	5	53	69	5
+846	50	2172273	2589295	50	1582	3053	48	64	68	5
+847	2577	56656	63658	1582	1444	838	474	26	63	33
+861	1333	5570	6909	839	457	489	37	33	70	34
+873	2360	1519811	50487	2248	1310	1784	316	60	68	9
+879	228	6704	6785	79	279	507	121	35	66	24
+889	5130	2070007	39692	5040	1151	6791	2606	44	66	23
+896	4	511246	859452	4	6554	6561	4	67	71	4
+912	146	1322641	2238040	146	1366	6354	143	59	59	1
+913	82	5495	6870	78	350	565	67	24	43	15
+921	763	1580790	416881	763	6191	7131	509	63	64	2
+925	318	2500952	5025	309	476	6114	182	32	56	21
+931	12	4277	4809	12	238	256	9	63	83	9
+942	954	1331	2228193	952	1121	5047	788	65	70	6
+948	14	1785593	2600431	14	6550	6598	13	34	49	9
+956	5	5755	6023	5	359	411	5	43	48	4
+963	4	3812	3835	4	444	537	4	47	53	4
+978	5	51632	58212	5	1127	1556	5	24	32	5
+980	53	47201	59744	53	1537	1625	36	41	49	9
+987	6033	2020131	763444	4306	256	792	1832	60	64	5
+993	4	1615159	1718339	4	1570	3093	4	62	63	2
diff --git a/tests/queries/0_stateless/02995_index.sh b/tests/queries/0_stateless/02995_index.sh
new file mode 100755
index 00000000000..5125d03904e
--- /dev/null
+++ b/tests/queries/0_stateless/02995_index.sh
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+# Tags: long, no-debug, no-asan, no-tsan, no-msan, no-ubsan, no-sanitize-coverage
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --multiquery "
+
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a String, b String, c String) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 11;
+
+INSERT INTO test
+SELECT round(pow(sipHash64(1, number), 1/4)), round(pow(sipHash64(2, number), 1/6)), round(pow(sipHash64(3, number), 1/10))
+FROM numbers(100000);
+
+INSERT INTO test
+SELECT round(pow(sipHash64(1, number), 1/3)), round(pow(sipHash64(2, number), 1/5)), round(pow(sipHash64(3, number), 1/10))
+FROM numbers(100000);
+
+INSERT INTO test
+SELECT round(pow(sipHash64(1, number), 1/5)), round(pow(sipHash64(2, number), 1/7)), round(pow(sipHash64(3, number), 1/10))
+FROM numbers(100000);
+
+DETACH TABLE test;
+ATTACH TABLE test;
+"
+
+for i in {1..1000}
+do
+    echo "
+WITH ${i} AS try
+SELECT try, count(), min(a), max(a), uniqExact(a), min(b), max(b), uniqExact(b), min(c), max(c), uniqExact(c) FROM test
+WHERE a >= (round(pow(sipHash64(1, try), 1 / (3 + sipHash64(2, try) % 8))) AS a1)::String
+  AND a <= (a1 + round(pow(sipHash64(3, try), 1 / (3 + sipHash64(4, try) % 8))))::String
+  AND b >= (round(pow(sipHash64(5, try), 1 / (3 + sipHash64(6, try) % 8))) AS b1)::String
+  AND b <= (b1 + round(pow(sipHash64(7, try), 1 / (3 + sipHash64(8, try) % 8))))::String
+  AND c >= (round(pow(sipHash64(9, try), 1 / (3 + sipHash64(10, try) % 8))) AS c1)::String
+  AND c <= (c1 + round(pow(sipHash64(11, try), 1 / (3 + sipHash64(12, try) % 8))))::String
+HAVING count() > 0;
+"
+done | ${CLICKHOUSE_CLIENT} --multiquery
+
+${CLICKHOUSE_CLIENT} --multiquery "DROP TABLE test"
diff --git a/tests/queries/0_stateless/02995_new_settings_history.reference b/tests/queries/0_stateless/02995_new_settings_history.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02995_new_settings_history.sh b/tests/queries/0_stateless/02995_new_settings_history.sh
new file mode 100755
index 00000000000..8de98c55b6a
--- /dev/null
+++ b/tests/queries/0_stateless/02995_new_settings_history.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Tags: no-tsan, no-asan, no-ubsan, no-msan, no-cpu-aarch64, no-random-settings
+# Some settings can be different for builds with sanitizers or aarch64
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# Note that this is a broad check. A per version check is done in the upgrade test
+# Baseline generated with 23.12.1
+# clickhouse local --query "select name, default from system.settings order by name format TSV" > 02995_baseline_23_12_1.tsv
+$CLICKHOUSE_LOCAL --query "
+    WITH old_settings AS
+    (
+        SELECT * FROM file('${CUR_DIR}/02995_baseline_23_12_1.tsv', 'TSV', 'name String, default String')
+    ),
+    new_settings AS
+    (
+        -- Ignore settings that depend on the machine config (max_threads and similar)
+        SELECT name, default FROM system.settings WHERE default NOT LIKE '%auto(%'
+    )
+    SELECT * FROM
+    (
+        SELECT 'PLEASE ADD THE NEW SETTING TO SettingsChangesHistory.h: ' || name || ' WAS ADDED',
+        FROM new_settings
+        WHERE (name NOT IN (
+            SELECT name
+            FROM old_settings
+        )) AND (name NOT IN (
+            SELECT arrayJoin(tupleElement(changes, 'name'))
+            FROM system.settings_changes
+            WHERE splitByChar('.', version())[1] >= '24'
+        ))
+        UNION ALL
+        (
+            SELECT 'PLEASE ADD THE SETTING VALUE CHANGE TO SettingsChangesHistory.h: ' || name || ' WAS CHANGED FROM ' || old_settings.default || ' TO ' || new_settings.default,
+            FROM new_settings
+            LEFT JOIN old_settings ON new_settings.name = old_settings.name
+            WHERE (new_settings.default != old_settings.default) AND (name NOT IN (
+                SELECT arrayJoin(tupleElement(changes, 'name'))
+                FROM system.settings_changes
+                WHERE splitByChar('.', version())[1] >= '24'
+            ))
+        )
+    )
+"
diff --git a/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.reference b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.sql b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.sql
new file mode 100644
index 00000000000..060f16f8945
--- /dev/null
+++ b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns.sql
@@ -0,0 +1,6 @@
+-- It is special because actions cannot be reused for SimpleAggregateFunction (see https://github.com/ClickHouse/ClickHouse/pull/54436)
+drop table if exists data;
+create table data (key Int) engine=AggregatingMergeTree() order by tuple();
+insert into data values (0);
+select * from data final prewhere indexHint(_partition_id = 'all') or indexHint(_partition_id = 'all');
+select * from data final prewhere indexHint(_partition_id = 'all') or indexHint(_partition_id = 'all') or indexHint(_partition_id = 'all');
diff --git a/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.reference b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.sql b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.sql
new file mode 100644
index 00000000000..97df883fa48
--- /dev/null
+++ b/tests/queries/0_stateless/02995_preliminary_filters_duplicated_columns_SimpleAggregateFunction.sql
@@ -0,0 +1,5 @@
+-- It is special because actions cannot be reused for SimpleAggregateFunction (see https://github.com/ClickHouse/ClickHouse/pull/54436)
+drop table if exists data;
+create table data (key SimpleAggregateFunction(max, Int)) engine=AggregatingMergeTree() order by tuple();
+insert into data values (0);
+select * from data final prewhere indexHint(_partition_id = 'all') and key >= -1 where key >= 0;
diff --git a/tests/queries/0_stateless/02996_analyzer_prewhere_projection.reference b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.reference
new file mode 100644
index 00000000000..72749c905a3
--- /dev/null
+++ b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.reference
@@ -0,0 +1 @@
+1	1	1
diff --git a/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql
new file mode 100644
index 00000000000..9d676001010
--- /dev/null
+++ b/tests/queries/0_stateless/02996_analyzer_prewhere_projection.sql
@@ -0,0 +1,7 @@
+SET allow_suspicious_low_cardinality_types=1;
+
+CREATE TABLE t__fuzz_0 (`i` LowCardinality(Int32), `j` Int32, `k` Int32, PROJECTION p (SELECT * ORDER BY j)) ENGINE = MergeTree ORDER BY i SETTINGS index_granularity = 1;
+INSERT INTO t__fuzz_0 Select number, number, number FROM numbers(100);
+
+SELECT * FROM t__fuzz_0 PREWHERE 7 AND (i < 2147483647) AND (j IN (2147483646, -2, 1))
+SETTINGS allow_experimental_analyzer = true;
diff --git a/tests/queries/0_stateless/02996_index_compaction_counterexample.reference b/tests/queries/0_stateless/02996_index_compaction_counterexample.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/02996_index_compaction_counterexample.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/02996_index_compaction_counterexample.sql b/tests/queries/0_stateless/02996_index_compaction_counterexample.sql
new file mode 100644
index 00000000000..1545f83c79f
--- /dev/null
+++ b/tests/queries/0_stateless/02996_index_compaction_counterexample.sql
@@ -0,0 +1,8 @@
+DROP TABLE IF EXISTS b;
+create table b (x Int64, y String) engine MergeTree order by (x, y) settings index_granularity=2;
+insert into b values (0, 'a'), (1, 'b'),   (1, 'c');
+select count() from b where x = 1 and y = 'b';
+detach table b;
+attach table b;
+select count() from b where x = 1 and y = 'b';
+DROP TABLE b;
diff --git a/tests/queries/0_stateless/02996_nullable_arrayReduce.reference b/tests/queries/0_stateless/02996_nullable_arrayReduce.reference
new file mode 100644
index 00000000000..96afb8546ef
--- /dev/null
+++ b/tests/queries/0_stateless/02996_nullable_arrayReduce.reference
@@ -0,0 +1,15 @@
+-- { echoOn }
+SELECT arrayReduce('sum', []::Array(UInt8)) as a, toTypeName(a);
+0	UInt64
+SELECT arrayReduce('sumOrNull', []::Array(UInt8)) as a, toTypeName(a);
+\N	Nullable(UInt64)
+SELECT arrayReduce('sum', [NULL]::Array(Nullable(UInt8))) as a, toTypeName(a);
+\N	Nullable(UInt64)
+SELECT arrayReduce('sum', [NULL, 10]::Array(Nullable(UInt8))) as a, toTypeName(a);
+10	Nullable(UInt64)
+SELECT arrayReduce('any_respect_nulls', [NULL, 10]::Array(Nullable(UInt8))) as a, toTypeName(a);
+\N	Nullable(UInt8)
+SELECT arrayReduce('any_respect_nulls', [10, NULL]::Array(Nullable(UInt8))) as a, toTypeName(a);
+10	Nullable(UInt8)
+SELECT arrayReduce('median', [toLowCardinality(toNullable(8))]) as t, toTypeName(t);
+8	Nullable(Float64)
diff --git a/tests/queries/0_stateless/02996_nullable_arrayReduce.sql b/tests/queries/0_stateless/02996_nullable_arrayReduce.sql
new file mode 100644
index 00000000000..8f69296dbe5
--- /dev/null
+++ b/tests/queries/0_stateless/02996_nullable_arrayReduce.sql
@@ -0,0 +1,17 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/59600
+SELECT arrayReduce(toNullable('stddevSampOrNull'), [1]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayReduce(toNullable('median'), [toDecimal32OrNull(toFixedString('1', 1), 2), 8]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT toFixedString('--- Int Empty ---', toLowCardinality(17)), arrayReduce(toNullable('avgOrNull'), [1]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayReduce('any', toNullable(3)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT arrayReduce(toLowCardinality('median'), [toLowCardinality(toNullable(8))]); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+-- { echoOn }
+SELECT arrayReduce('sum', []::Array(UInt8)) as a, toTypeName(a);
+SELECT arrayReduce('sumOrNull', []::Array(UInt8)) as a, toTypeName(a);
+SELECT arrayReduce('sum', [NULL]::Array(Nullable(UInt8))) as a, toTypeName(a);
+SELECT arrayReduce('sum', [NULL, 10]::Array(Nullable(UInt8))) as a, toTypeName(a);
+SELECT arrayReduce('any_respect_nulls', [NULL, 10]::Array(Nullable(UInt8))) as a, toTypeName(a);
+SELECT arrayReduce('any_respect_nulls', [10, NULL]::Array(Nullable(UInt8))) as a, toTypeName(a);
+
+SELECT arrayReduce('median', [toLowCardinality(toNullable(8))]) as t, toTypeName(t);
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.reference b/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.reference
new file mode 100644
index 00000000000..c4ade2ace13
--- /dev/null
+++ b/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.reference
@@ -0,0 +1,100 @@
+2023-01-01 00:00:00
+2023-01-01 00:00:00
+2023-01-01 01:01:01
+2023-01-01 01:01:01
+2023-01-02 02:02:02
+2023-01-02 02:02:02
+2023-01-03 03:03:03
+2023-01-03 03:03:03
+2023-01-04 04:04:04
+2023-01-04 04:04:04
+2023-01-05 05:05:05
+2023-01-05 05:05:05
+2023-01-06 06:06:06
+2023-01-06 06:06:06
+2023-01-07 07:07:07
+2023-01-07 07:07:07
+2023-01-08 08:08:08
+2023-01-08 08:08:08
+2023-01-09 09:09:09
+2023-01-09 09:09:09
+2023-01-01 00:00:00.00
+2023-01-01 00:00:00.00
+2023-01-01 01:01:01.00
+2023-01-01 01:01:01.10
+2023-01-02 02:02:02.00
+2023-01-02 02:02:02.12
+2023-01-03 03:03:03.00
+2023-01-03 03:03:03.12
+2023-01-04 04:04:04.00
+2023-01-04 04:04:04.12
+2023-01-05 05:05:05.00
+2023-01-05 05:05:05.12
+2023-01-06 06:06:06.00
+2023-01-06 06:06:06.12
+2023-01-07 07:07:07.00
+2023-01-07 07:07:07.12
+2023-01-08 08:08:08.00
+2023-01-08 08:08:08.12
+2023-01-09 09:09:09.00
+2023-01-09 09:09:09.12
+2023-01-01 00:00:00.000
+2023-01-01 00:00:00.000
+2023-01-01 01:01:01.000
+2023-01-01 01:01:01.100
+2023-01-02 02:02:02.000
+2023-01-02 02:02:02.120
+2023-01-03 03:03:03.000
+2023-01-03 03:03:03.123
+2023-01-04 04:04:04.000
+2023-01-04 04:04:04.123
+2023-01-05 05:05:05.000
+2023-01-05 05:05:05.123
+2023-01-06 06:06:06.000
+2023-01-06 06:06:06.123
+2023-01-07 07:07:07.000
+2023-01-07 07:07:07.123
+2023-01-08 08:08:08.000
+2023-01-08 08:08:08.123
+2023-01-09 09:09:09.000
+2023-01-09 09:09:09.123
+2023-01-01 00:00:00.000000
+2023-01-01 00:00:00.000000
+2023-01-01 01:01:01.000000
+2023-01-01 01:01:01.100000
+2023-01-02 02:02:02.000000
+2023-01-02 02:02:02.120000
+2023-01-03 03:03:03.000000
+2023-01-03 03:03:03.123000
+2023-01-04 04:04:04.000000
+2023-01-04 04:04:04.123400
+2023-01-05 05:05:05.000000
+2023-01-05 05:05:05.123450
+2023-01-06 06:06:06.000000
+2023-01-06 06:06:06.123456
+2023-01-07 07:07:07.000000
+2023-01-07 07:07:07.123456
+2023-01-08 08:08:08.000000
+2023-01-08 08:08:08.123456
+2023-01-09 09:09:09.000000
+2023-01-09 09:09:09.123456
+2023-01-01 00:00:00.000000
+2023-01-01 00:00:00.000000
+2023-01-01 01:01:01.000000
+2023-01-01 01:01:01.100000
+2023-01-02 02:02:02.000000
+2023-01-02 02:02:02.120000
+2023-01-03 03:03:03.000000
+2023-01-03 03:03:03.123000
+2023-01-04 04:04:04.000000
+2023-01-04 04:04:04.123400
+2023-01-05 05:05:05.000000
+2023-01-05 05:05:05.123450
+2023-01-06 06:06:06.000000
+2023-01-06 06:06:06.123456
+2023-01-07 07:07:07.000000
+2023-01-07 07:07:07.123456
+2023-01-08 08:08:08.000000
+2023-01-08 08:08:08.123456
+2023-01-09 09:09:09.000000
+2023-01-09 09:09:09.123456
diff --git a/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.sql b/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.sql
new file mode 100644
index 00000000000..b905ef2b972
--- /dev/null
+++ b/tests/queries/0_stateless/02997_fix_datetime64_scale_conversion.sql
@@ -0,0 +1,124 @@
+DROP TABLE IF EXISTS test_0;
+CREATE TABLE IF NOT EXISTS test_0 (a DateTime64(0)) engine = MergeTree order by a;
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-01 00:00:00', 0));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-01 00:00:00.123456789', 0));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-01 01:01:01', 1));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-01 01:01:01.123456789', 1));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-02 02:02:02', 2));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-02 02:02:02.123456789', 2));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-03 03:03:03', 3));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-03 03:03:03.123456789', 3));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-04 04:04:04', 4));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-04 04:04:04.123456789', 4));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-05 05:05:05', 5));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-05 05:05:05.123456789', 5));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-06 06:06:06', 6));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-06 06:06:06.123456789', 6));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-07 07:07:07', 7));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-07 07:07:07.123456789', 7));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-08 08:08:08', 8));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-08 08:08:08.123456789', 8));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-09 09:09:09', 9));
+INSERT INTO test_0 VALUES (toDateTime64('2023-01-09 09:09:09.123456789', 9));
+SELECT * FROM test_0 ORDER BY a;
+DROP TABLE test_0;
+
+DROP TABLE IF EXISTS test_2;
+CREATE TABLE IF NOT EXISTS test_2 (a DateTime64(2)) engine = MergeTree order by a;
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-01 00:00:00', 0));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-01 00:00:00.123456789', 0));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-01 01:01:01', 1));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-01 01:01:01.123456789', 1));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-02 02:02:02', 2));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-02 02:02:02.123456789', 2));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-03 03:03:03', 3));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-03 03:03:03.123456789', 3));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-04 04:04:04', 4));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-04 04:04:04.123456789', 4));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-05 05:05:05', 5));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-05 05:05:05.123456789', 5));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-06 06:06:06', 6));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-06 06:06:06.123456789', 6));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-07 07:07:07', 7));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-07 07:07:07.123456789', 7));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-08 08:08:08', 8));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-08 08:08:08.123456789', 8));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-09 09:09:09', 9));
+INSERT INTO test_2 VALUES (toDateTime64('2023-01-09 09:09:09.123456789', 9));
+SELECT * FROM test_2 ORDER BY a;
+DROP TABLE test_2;
+
+DROP TABLE IF EXISTS test_3;
+CREATE TABLE IF NOT EXISTS test_3 (a DateTime64(3)) engine = MergeTree order by a;
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-01 00:00:00', 0));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-01 00:00:00.123456789', 0));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-01 01:01:01', 1));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-01 01:01:01.123456789', 1));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-02 02:02:02', 2));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-02 02:02:02.123456789', 2));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-03 03:03:03', 3));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-03 03:03:03.123456789', 3));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-04 04:04:04', 4));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-04 04:04:04.123456789', 4));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-05 05:05:05', 5));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-05 05:05:05.123456789', 5));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-06 06:06:06', 6));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-06 06:06:06.123456789', 6));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-07 07:07:07', 7));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-07 07:07:07.123456789', 7));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-08 08:08:08', 8));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-08 08:08:08.123456789', 8));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-09 09:09:09', 9));
+INSERT INTO test_3 VALUES (toDateTime64('2023-01-09 09:09:09.123456789', 9));
+SELECT * FROM test_3 ORDER BY a;
+DROP TABLE test_3;
+
+DROP TABLE IF EXISTS test_6;
+CREATE TABLE IF NOT EXISTS test_6 (a DateTime64(6)) engine = MergeTree order by a;
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-01 00:00:00', 0));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-01 00:00:00.123456789', 0));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-01 01:01:01', 1));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-01 01:01:01.123456789', 1));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-02 02:02:02', 2));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-02 02:02:02.123456789', 2));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-03 03:03:03', 3));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-03 03:03:03.123456789', 3));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-04 04:04:04', 4));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-04 04:04:04.123456789', 4));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-05 05:05:05', 5));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-05 05:05:05.123456789', 5));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-06 06:06:06', 6));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-06 06:06:06.123456789', 6));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-07 07:07:07', 7));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-07 07:07:07.123456789', 7));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-08 08:08:08', 8));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-08 08:08:08.123456789', 8));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-09 09:09:09', 9));
+INSERT INTO test_6 VALUES (toDateTime64('2023-01-09 09:09:09.123456789', 9));
+SELECT * FROM test_6 ORDER BY a;
+DROP TABLE test_6;
+
+DROP TABLE IF EXISTS test_9;
+CREATE TABLE IF NOT EXISTS test_9 (a DateTime64(6)) engine = MergeTree order by a;
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-01 00:00:00', 0));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-01 00:00:00.123456789', 0));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-01 01:01:01', 1));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-01 01:01:01.123456789', 1));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-02 02:02:02', 2));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-02 02:02:02.123456789', 2));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-03 03:03:03', 3));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-03 03:03:03.123456789', 3));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-04 04:04:04', 4));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-04 04:04:04.123456789', 4));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-05 05:05:05', 5));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-05 05:05:05.123456789', 5));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-06 06:06:06', 6));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-06 06:06:06.123456789', 6));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-07 07:07:07', 7));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-07 07:07:07.123456789', 7));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-08 08:08:08', 8));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-08 08:08:08.123456789', 8));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-09 09:09:09', 9));
+INSERT INTO test_9 VALUES (toDateTime64('2023-01-09 09:09:09.123456789', 9));
+SELECT * FROM test_9 ORDER BY a;
+DROP TABLE test_9;
diff --git a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference
new file mode 100644
index 00000000000..29d6383b52c
--- /dev/null
+++ b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.reference
@@ -0,0 +1 @@
+100
diff --git a/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
new file mode 100644
index 00000000000..2dfc8094115
--- /dev/null
+++ b/tests/queries/0_stateless/02997_insert_select_too_many_parts_multithread.sql
@@ -0,0 +1,16 @@
+--  Tags: disabled
+-- TODO: Fix parts_to_throw_insert logic for parallel  MergeTreeSink onStart calls
+DROP TABLE IF EXISTS too_many_parts;
+
+CREATE TABLE too_many_parts (x UInt64) ENGINE = MergeTree ORDER BY tuple() SETTINGS parts_to_delay_insert = 5, parts_to_throw_insert = 5;
+
+SYSTEM STOP MERGES too_many_parts;
+SET max_block_size = 1, min_insert_block_size_rows = 0, min_insert_block_size_bytes = 0, max_threads=100, max_insert_threads=100;
+
+-- exception is not thrown if threshold is exceeded when multi-block INSERT is already started.
+INSERT INTO too_many_parts SELECT * FROM numbers_mt(100);
+SELECT count() FROM too_many_parts;
+
+INSERT INTO too_many_parts SELECT * FROM numbers_mt(10); --  { serverError 252 }
+
+DROP TABLE too_many_parts;
diff --git a/tests/queries/0_stateless/02997_projections_formatting.reference b/tests/queries/0_stateless/02997_projections_formatting.reference
new file mode 100644
index 00000000000..6a60da1089a
--- /dev/null
+++ b/tests/queries/0_stateless/02997_projections_formatting.reference
@@ -0,0 +1,26 @@
+CREATE TEMPORARY TABLE t_proj
+(
+    `t` DateTime,
+    `id` UInt64,
+    PROJECTION p
+    (
+        SELECT 
+            id,
+            t
+        ORDER BY toStartOfDay(t)
+    )
+)
+ENGINE = MergeTree
+ORDER BY id
+CREATE TEMPORARY TABLE t_proj2
+(
+    `a` UInt32,
+    `b` UInt32,
+    PROJECTION p
+    (
+        SELECT a
+        ORDER BY b * 2
+    )
+)
+ENGINE = MergeTree
+ORDER BY a
diff --git a/tests/queries/0_stateless/02997_projections_formatting.sql b/tests/queries/0_stateless/02997_projections_formatting.sql
new file mode 100644
index 00000000000..b593c2576b1
--- /dev/null
+++ b/tests/queries/0_stateless/02997_projections_formatting.sql
@@ -0,0 +1,5 @@
+CREATE TEMPORARY TABLE t_proj (t DateTime, id UInt64, PROJECTION p (SELECT id, t ORDER BY toStartOfDay(t))) ENGINE = MergeTree ORDER BY id;
+SHOW CREATE TEMPORARY TABLE t_proj FORMAT TSVRaw;
+
+CREATE TEMPORARY TABLE t_proj2 (a UInt32, b UInt32, PROJECTION p (SELECT a ORDER BY b * 2)) ENGINE = MergeTree ORDER BY a;
+SHOW CREATE TEMPORARY TABLE t_proj2 FORMAT TSVRaw;
diff --git a/tests/queries/0_stateless/02998_analyzer_prewhere_report.reference b/tests/queries/0_stateless/02998_analyzer_prewhere_report.reference
new file mode 100644
index 00000000000..3ae61a44a3f
--- /dev/null
+++ b/tests/queries/0_stateless/02998_analyzer_prewhere_report.reference
@@ -0,0 +1 @@
+2024-01-01	[2,3]
diff --git a/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql b/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql
new file mode 100644
index 00000000000..b3027181901
--- /dev/null
+++ b/tests/queries/0_stateless/02998_analyzer_prewhere_report.sql
@@ -0,0 +1,18 @@
+--https://github.com/ClickHouse/ClickHouse/issues/60232
+CREATE TABLE hits
+(
+    `date` Date,
+    `data` Array(UInt32)
+)
+ENGINE = MergeTree
+PARTITION BY toYYYYMM(date)
+ORDER BY date;
+
+INSERT INTO hits values('2024-01-01', [1, 2, 3]);
+
+SELECT
+    hits.date,
+    arrayFilter(x -> (x IN (2, 3)), data) AS filtered
+FROM hits
+WHERE arrayExists(x -> (x IN (2, 3)), data)
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.reference b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.reference
new file mode 100644
index 00000000000..ffd2f68990b
--- /dev/null
+++ b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.reference
@@ -0,0 +1,71 @@
+-- { echoOn }
+SET allow_experimental_analyzer = 1;
+EXPLAIN QUERY TREE SELECT encrypt('aes-256-ofb', (SELECT 'qwerty'), '12345678901234567890123456789012'), encrypt('aes-256-ofb', (SELECT 'asdf'), '12345678901234567890123456789012');
+QUERY id: 0
+  PROJECTION COLUMNS
+    encrypt(\'aes-256-ofb\', [HIDDEN id: 1], [HIDDEN id: 2]) Nullable(String)
+    encrypt(\'aes-256-ofb\', [HIDDEN id: 3], [HIDDEN id: 2]) Nullable(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      CONSTANT id: 2, constant_value: \'\\nãì&\', constant_value_type: Nullable(String)
+        EXPRESSION
+          FUNCTION id: 3, function_name: encrypt, function_type: ordinary, result_type: Nullable(String)
+            ARGUMENTS
+              LIST id: 4, nodes: 3
+                CONSTANT id: 5, constant_value: \'aes-256-ofb\', constant_value_type: String
+                CONSTANT id: 6, constant_value: [HIDDEN id: 1], constant_value_type: Nullable(String)
+                CONSTANT id: 7, constant_value: [HIDDEN id: 2], constant_value_type: String
+      CONSTANT id: 8, constant_value: \'çø\', constant_value_type: Nullable(String)
+        EXPRESSION
+          FUNCTION id: 9, function_name: encrypt, function_type: ordinary, result_type: Nullable(String)
+            ARGUMENTS
+              LIST id: 10, nodes: 3
+                CONSTANT id: 11, constant_value: \'aes-256-ofb\', constant_value_type: String
+                CONSTANT id: 12, constant_value: [HIDDEN id: 3], constant_value_type: Nullable(String)
+                CONSTANT id: 13, constant_value: [HIDDEN id: 2], constant_value_type: String
+  JOIN TREE
+    TABLE id: 14, alias: __table1, table_name: system.one
+SET format_display_secrets_in_show_and_select = 1;
+EXPLAIN QUERY TREE SELECT encrypt('aes-256-ofb', (SELECT 'qwerty'), '12345678901234567890123456789012'), encrypt('aes-256-ofb', (SELECT 'asdf'), '12345678901234567890123456789012');
+QUERY id: 0
+  PROJECTION COLUMNS
+    encrypt(\'aes-256-ofb\', _subquery_1, \'12345678901234567890123456789012\') Nullable(String)
+    encrypt(\'aes-256-ofb\', _subquery_2, \'12345678901234567890123456789012\') Nullable(String)
+  PROJECTION
+    LIST id: 1, nodes: 2
+      CONSTANT id: 2, constant_value: \'\\nãì&\', constant_value_type: Nullable(String)
+        EXPRESSION
+          FUNCTION id: 3, function_name: encrypt, function_type: ordinary, result_type: Nullable(String)
+            ARGUMENTS
+              LIST id: 4, nodes: 3
+                CONSTANT id: 5, constant_value: \'aes-256-ofb\', constant_value_type: String
+                CONSTANT id: 6, constant_value: \'qwerty\', constant_value_type: Nullable(String)
+                  EXPRESSION
+                    QUERY id: 7, is_subquery: 1
+                      PROJECTION COLUMNS
+                        \'qwerty\' String
+                      PROJECTION
+                        LIST id: 8, nodes: 1
+                          CONSTANT id: 9, constant_value: \'qwerty\', constant_value_type: String
+                      JOIN TREE
+                        TABLE id: 10, table_name: system.one
+                CONSTANT id: 11, constant_value: \'12345678901234567890123456789012\', constant_value_type: String
+      CONSTANT id: 12, constant_value: \'çø\', constant_value_type: Nullable(String)
+        EXPRESSION
+          FUNCTION id: 13, function_name: encrypt, function_type: ordinary, result_type: Nullable(String)
+            ARGUMENTS
+              LIST id: 14, nodes: 3
+                CONSTANT id: 15, constant_value: \'aes-256-ofb\', constant_value_type: String
+                CONSTANT id: 16, constant_value: \'asdf\', constant_value_type: Nullable(String)
+                  EXPRESSION
+                    QUERY id: 17, is_subquery: 1
+                      PROJECTION COLUMNS
+                        \'asdf\' String
+                      PROJECTION
+                        LIST id: 18, nodes: 1
+                          CONSTANT id: 19, constant_value: \'asdf\', constant_value_type: String
+                      JOIN TREE
+                        TABLE id: 20, table_name: system.one
+                CONSTANT id: 21, constant_value: \'12345678901234567890123456789012\', constant_value_type: String
+  JOIN TREE
+    TABLE id: 22, alias: __table1, table_name: system.one
diff --git a/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.sql b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.sql
new file mode 100644
index 00000000000..f40b40b6c8c
--- /dev/null
+++ b/tests/queries/0_stateless/02998_analyzer_secret_args_tree_node.sql
@@ -0,0 +1,12 @@
+-- Tags: no-fasttest
+-- encrypt function doesn't exist in the fastest build
+
+-- { echoOn }
+SET allow_experimental_analyzer = 1;
+
+EXPLAIN QUERY TREE SELECT encrypt('aes-256-ofb', (SELECT 'qwerty'), '12345678901234567890123456789012'), encrypt('aes-256-ofb', (SELECT 'asdf'), '12345678901234567890123456789012');
+
+SET format_display_secrets_in_show_and_select = 1;
+
+EXPLAIN QUERY TREE SELECT encrypt('aes-256-ofb', (SELECT 'qwerty'), '12345678901234567890123456789012'), encrypt('aes-256-ofb', (SELECT 'asdf'), '12345678901234567890123456789012');
+-- { echoOff }
diff --git a/tests/queries/0_stateless/02998_attach_partition_not_allowed_if_structure_differs_due_to_materialized_column.reference b/tests/queries/0_stateless/02998_attach_partition_not_allowed_if_structure_differs_due_to_materialized_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02998_attach_partition_not_allowed_if_structure_differs_due_to_materialized_column.sql b/tests/queries/0_stateless/02998_attach_partition_not_allowed_if_structure_differs_due_to_materialized_column.sql
new file mode 100644
index 00000000000..c92d71893c4
--- /dev/null
+++ b/tests/queries/0_stateless/02998_attach_partition_not_allowed_if_structure_differs_due_to_materialized_column.sql
@@ -0,0 +1,21 @@
+CREATE TABLE attach_partition_t7 (
+                                     a UInt32,
+                                     b UInt32
+)
+    ENGINE = MergeTree
+PARTITION BY a ORDER BY a;
+
+ALTER TABLE attach_partition_t7
+    ADD COLUMN mat_column
+        UInt32 MATERIALIZED a+b;
+
+insert into attach_partition_t7 values (1, 2);
+
+CREATE TABLE attach_partition_t8 (
+                                     a UInt32,
+                                     b UInt32
+)
+    ENGINE = MergeTree
+PARTITION BY a ORDER BY a;
+
+ALTER TABLE attach_partition_t8 ATTACH PARTITION ID '1' FROM attach_partition_t7; -- {serverError INCOMPATIBLE_COLUMNS};
diff --git a/tests/queries/0_stateless/02998_http_redirects.reference b/tests/queries/0_stateless/02998_http_redirects.reference
new file mode 100644
index 00000000000..527e7df71c3
--- /dev/null
+++ b/tests/queries/0_stateless/02998_http_redirects.reference
@@ -0,0 +1,5 @@
+Ok.
+HTTP/1.1 302 Found
+Location: /?query=SELECT+'Pepyaka'
+HTTP/1.1 404 Not Found
+Pepyaka
diff --git a/tests/queries/0_stateless/02998_http_redirects.sh b/tests/queries/0_stateless/02998_http_redirects.sh
new file mode 100755
index 00000000000..8a8df884f9f
--- /dev/null
+++ b/tests/queries/0_stateless/02998_http_redirects.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+URL="${CLICKHOUSE_PORT_HTTP_PROTO}://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}"
+
+# Ping handler
+${CLICKHOUSE_CURL} -s -S "${URL}/"
+
+# A handler that is configured to return a redirect
+${CLICKHOUSE_CURL} -s -S -I "${URL}/upyachka" | grep -i -P '^HTTP|Location'
+
+# This handler is configured to not accept any query string
+${CLICKHOUSE_CURL} -s -S -I "${URL}/upyachka?hello=world" | grep -i -P '^HTTP|Location'
+
+# Check that actual redirect works
+${CLICKHOUSE_CURL} -s -S -L "${URL}/upyachka"
diff --git a/tests/queries/0_stateless/02998_ipv6_hashing.reference b/tests/queries/0_stateless/02998_ipv6_hashing.reference
new file mode 100644
index 00000000000..d9753de02c3
--- /dev/null
+++ b/tests/queries/0_stateless/02998_ipv6_hashing.reference
@@ -0,0 +1,20 @@
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
+fe80::62:5aff:fed1:daf0	÷T—ºÖ÷t{Ö±P¶ö›¢ÞãTñ£K{êaƒ—;xdP
diff --git a/tests/queries/0_stateless/02998_ipv6_hashing.sql b/tests/queries/0_stateless/02998_ipv6_hashing.sql
new file mode 100644
index 00000000000..a836792748c
--- /dev/null
+++ b/tests/queries/0_stateless/02998_ipv6_hashing.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest
+
+SELECT toIPv6(materialize(toLowCardinality('fe80::62:5aff:fed1:daf0'))) AS ipv6, SHA256(ipv6) from numbers(10);
+SELECT toIPv6(materialize('fe80::62:5aff:fed1:daf0')) AS ipv6, SHA256(ipv6) from numbers(10);
+
diff --git a/tests/queries/0_stateless/02998_operator_respect_nulls.reference b/tests/queries/0_stateless/02998_operator_respect_nulls.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02998_operator_respect_nulls.sql b/tests/queries/0_stateless/02998_operator_respect_nulls.sql
new file mode 100644
index 00000000000..240992e1ff8
--- /dev/null
+++ b/tests/queries/0_stateless/02998_operator_respect_nulls.sql
@@ -0,0 +1 @@
+SELECT plus(1, 1) RESPECT NULLS; -- { serverError SYNTAX_ERROR }
diff --git a/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.reference b/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.reference
new file mode 100644
index 00000000000..357b534cf00
--- /dev/null
+++ b/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.reference
@@ -0,0 +1,360 @@
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │
+   └─────────┘
+          a
+
+1.  1000000 
+          a
+
+1.  1000000 
+          a
+
+1.  1000000 
+          a
+
+1.  1000000 
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000000 │ -- 1.00 million
+   └─────────┘
+          a
+
+1.  1000000  -- 1.00 million
+          a
+
+1.  1000000  -- 1.00 million
+          a
+
+1.  1000000  -- 1.00 million
+          a
+
+1.  1000000  -- 1.00 million
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ����������┓
+   ┃       a ┃
+   ┡���������┩
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+   ┌───────a─�
+1. │ 1000001 │ -- 1.00 million
+   └─────────┘
+          a
+
+1.  1000001  -- 1.00 million
+          a
+
+1.  1000001  -- 1.00 million
+          a
+
+1.  1000001  -- 1.00 million
+          a
+
+1.  1000001  -- 1.00 million
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │ -- 1.00 billion
+   └────────────┘
+             a
+
+1.  1000000000  -- 1.00 billion
+             a
+
+1.  1000000000  -- 1.00 billion
+             a
+
+1.  1000000000  -- 1.00 billion
+             a
+
+1.  1000000000  -- 1.00 billion
+   �������������┳������������┓
+   ┃          a ┃          b ┃
+   ┡������������╇������������┩
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   �������������┳������������┓
+   ┃          a ┃          b ┃
+   ┡������������╇������������┩
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   �������������┳������������┓
+   ┃          a ┃          b ┃
+   ┡������������╇������������┩
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   �������������┳������������┓
+   ┃          a ┃          b ┃
+   ┡������������╇������������┩
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   ┌──────────a─┬──────────b─�
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   ┌──────────a─┬──────────b─�
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   ┌──────────a─┬──────────b─�
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+   ┌──────────a─┬──────────b─�
+1. │ 1000000000 │ 1000000000 │
+   └────────────┴────────────┘
+             a            b
+
+1.  1000000000   1000000000 
+             a            b
+
+1.  1000000000   1000000000 
+             a            b
+
+1.  1000000000   1000000000 
+             a            b
+
+1.  1000000000   1000000000 
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │
+   ├────────────┤
+2. │ 1000000000 │
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │
+   ├────────────┤
+2. │ 1000000000 │
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │
+   ├────────────┤
+2. │ 1000000000 │
+   └────────────┘
+   �������������┓
+   ┃          a ┃
+   ┡������������┩
+1. │ 1000000000 │
+   ├────────────┤
+2. │ 1000000000 │
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │
+2. │ 1000000000 │
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │
+2. │ 1000000000 │
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │
+2. │ 1000000000 │
+   └────────────┘
+   ┌──────────a─�
+1. │ 1000000000 │
+2. │ 1000000000 │
+   └────────────┘
+             a
+
+1.  1000000000 
+2.  1000000000 
+             a
+
+1.  1000000000 
+2.  1000000000 
+             a
+
+1.  1000000000 
+2.  1000000000 
+             a
+
+1.  1000000000 
+2.  1000000000 
+   �����������������������������┓
+   ┃ CAST('2024-02-29', 'Date') ┃
+   ┡����������������������������┩
+1. │                 2024-02-29 │
+   └────────────────────────────┘
+   �����������������������������┓
+   ┃ CAST('2024-02-29', 'Date') ┃
+   ┡����������������������������┩
+1. │                 2024-02-29 │
+   └────────────────────────────┘
+   �����������������������������┓
+   ┃ CAST('2024-02-29', 'Date') ┃
+   ┡����������������������������┩
+1. │                 2024-02-29 │
+   └────────────────────────────┘
+   �����������������������������┓
+   ┃ CAST('2024-02-29', 'Date') ┃
+   ┡����������������������������┩
+1. │                 2024-02-29 │
+   └────────────────────────────┘
+   �������������������������������┓
+   ┃ CAST('2024-02-29', 'Date32') ┃
+   ┡������������������������������┩
+1. │                   2024-02-29 │
+   └──────────────────────────────┘
+   �������������������������������┓
+   ┃ CAST('2024-02-29', 'Date32') ┃
+   ┡������������������������������┩
+1. │                   2024-02-29 │
+   └──────────────────────────────┘
+   �������������������������������┓
+   ┃ CAST('2024-02-29', 'Date32') ┃
+   ┡������������������������������┩
+1. │                   2024-02-29 │
+   └──────────────────────────────┘
+   �������������������������������┓
+   ┃ CAST('2024-02-29', 'Date32') ┃
+   ┡������������������������������┩
+1. │                   2024-02-29 │
+   └──────────────────────────────┘
+   ������������������������������������������┓
+   ┃ CAST('2024-02-29 00:00:00', 'DateTime') ┃
+   ┡�����������������������������������������┩
+1. │                     2024-02-29 00:00:00 │
+   └─────────────────────────────────────────┘
+   ������������������������������������������┓
+   ┃ CAST('2024-02-29 00:00:00', 'DateTime') ┃
+   ┡�����������������������������������������┩
+1. │                     2024-02-29 00:00:00 │
+   └─────────────────────────────────────────┘
+   ������������������������������������������┓
+   ┃ CAST('2024-02-29 00:00:00', 'DateTime') ┃
+   ┡�����������������������������������������┩
+1. │                     2024-02-29 00:00:00 │
+   └─────────────────────────────────────────┘
+   ������������������������������������������┓
+   ┃ CAST('2024-02-29 00:00:00', 'DateTime') ┃
+   ┡�����������������������������������������┩
+1. │                     2024-02-29 00:00:00 │
+   └─────────────────────────────────────────┘
+   ��������������������������������������������������������������┓
+   ┃ CAST(CAST('2024-02-29 00:00:00', 'DateTime'), 'DateTime64') ┃
+   ┡�������������������������������������������������������������┩
+1. │                                     2024-02-29 00:00:00.000 │
+   └─────────────────────────────────────────────────────────────┘
+   ��������������������������������������������������������������┓
+   ┃ CAST(CAST('2024-02-29 00:00:00', 'DateTime'), 'DateTime64') ┃
+   ┡�������������������������������������������������������������┩
+1. │                                     2024-02-29 00:00:00.000 │
+   └─────────────────────────────────────────────────────────────┘
+   ��������������������������������������������������������������┓
+   ┃ CAST(CAST('2024-02-29 00:00:00', 'DateTime'), 'DateTime64') ┃
+   ┡�������������������������������������������������������������┩
+1. │                                     2024-02-29 00:00:00.000 │
+   └─────────────────────────────────────────────────────────────┘
+   ��������������������������������������������������������������┓
+   ┃ CAST(CAST('2024-02-29 00:00:00', 'DateTime'), 'DateTime64') ┃
+   ┡�������������������������������������������������������������┩
+1. │                                     2024-02-29 00:00:00.000 │
+   └─────────────────────────────────────────────────────────────┘
diff --git a/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.sql b/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.sql
new file mode 100644
index 00000000000..5dc69488cea
--- /dev/null
+++ b/tests/queries/0_stateless/02998_pretty_format_print_readable_number_on_single_value.sql
@@ -0,0 +1,96 @@
+SELECT 1_000_000 as a FORMAT Pretty;
+SELECT 1_000_000 as a FORMAT PrettyNoEscapes;
+SELECT 1_000_000 as a FORMAT PrettyMonoBlock;
+SELECT 1_000_000 as a FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_000 as a FORMAT PrettyCompact;
+SELECT 1_000_000 as a FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_000 as a FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_000 as a FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_000 as a FORMAT PrettySpace;
+SELECT 1_000_000 as a FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_000 as a FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_000 as a FORMAT PrettySpaceNoEscapesMonoBlock;
+
+
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT Pretty;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyNoEscapes;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyMonoBlock;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyCompact;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettySpace;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_000 as a SETTINGS output_format_pretty_single_large_number_tip_threshold = 1000 FORMAT PrettySpaceNoEscapesMonoBlock;
+
+SELECT 1_000_001 as a FORMAT Pretty;
+SELECT 1_000_001 as a FORMAT PrettyNoEscapes;
+SELECT 1_000_001 as a FORMAT PrettyMonoBlock;
+SELECT 1_000_001 as a FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_001 as a FORMAT PrettyCompact;
+SELECT 1_000_001 as a FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_001 as a FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_001 as a FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_001 as a FORMAT PrettySpace;
+SELECT 1_000_001 as a FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_001 as a FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_001 as a FORMAT PrettySpaceNoEscapesMonoBlock;
+
+SELECT 1_000_000_000 as a FORMAT Pretty;
+SELECT 1_000_000_000 as a FORMAT PrettyNoEscapes;
+SELECT 1_000_000_000 as a FORMAT PrettyMonoBlock;
+SELECT 1_000_000_000 as a FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a FORMAT PrettyCompact;
+SELECT 1_000_000_000 as a FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_000_000 as a FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_000_000 as a FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a FORMAT PrettySpace;
+SELECT 1_000_000_000 as a FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_000_000 as a FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_000_000 as a FORMAT PrettySpaceNoEscapesMonoBlock;
+
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT Pretty;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyNoEscapes;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyMonoBlock;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyCompact;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettySpace;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_000_000 as a, 1_000_000_000 as b FORMAT PrettySpaceNoEscapesMonoBlock;
+
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT Pretty;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyNoEscapes;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyMonoBlock;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyCompact;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyCompactNoEscapes;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyCompactMonoBlock;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettyCompactNoEscapesMonoBlock;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettySpace;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettySpaceNoEscapes;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettySpaceMonoBlock;
+SELECT 1_000_000_000 as a FROM system.numbers LIMIT 2 FORMAT PrettySpaceNoEscapesMonoBlock;
+
+SET output_format_pretty_single_large_number_tip_threshold=1;
+SELECT '2024-02-29'::Date FORMAT Pretty;
+SELECT '2024-02-29'::Date FORMAT PrettyNoEscapes;
+SELECT '2024-02-29'::Date FORMAT PrettyMonoBlock;
+SELECT '2024-02-29'::Date FORMAT PrettyNoEscapesMonoBlock;
+SELECT '2024-02-29'::Date32 FORMAT Pretty;
+SELECT '2024-02-29'::Date32 FORMAT PrettyNoEscapes;
+SELECT '2024-02-29'::Date32 FORMAT PrettyMonoBlock;
+SELECT '2024-02-29'::Date32 FORMAT PrettyNoEscapesMonoBlock;
+SELECT '2024-02-29 00:00:00'::DateTime FORMAT Pretty;
+SELECT '2024-02-29 00:00:00'::DateTime FORMAT PrettyNoEscapes;
+SELECT '2024-02-29 00:00:00'::DateTime FORMAT PrettyMonoBlock;
+SELECT '2024-02-29 00:00:00'::DateTime FORMAT PrettyNoEscapesMonoBlock;
+SELECT '2024-02-29 00:00:00'::DateTime::DateTime64 FORMAT Pretty;
+SELECT '2024-02-29 00:00:00'::DateTime::DateTime64 FORMAT PrettyNoEscapes;
+SELECT '2024-02-29 00:00:00'::DateTime::DateTime64 FORMAT PrettyMonoBlock;
+SELECT '2024-02-29 00:00:00'::DateTime::DateTime64 FORMAT PrettyNoEscapesMonoBlock;
diff --git a/tests/queries/0_stateless/02998_primary_key_skip_columns.reference b/tests/queries/0_stateless/02998_primary_key_skip_columns.reference
new file mode 100644
index 00000000000..f3c4a4f40fe
--- /dev/null
+++ b/tests/queries/0_stateless/02998_primary_key_skip_columns.reference
@@ -0,0 +1,18 @@
+100000
+14954
+798
+15908
+108
+120
+2334
+19
+Key size: 	2400000
+100000
+14954
+798
+15908
+108
+120
+2334
+19
+Key size: 	800000
diff --git a/tests/queries/0_stateless/02998_primary_key_skip_columns.sql b/tests/queries/0_stateless/02998_primary_key_skip_columns.sql
new file mode 100644
index 00000000000..ee558996b52
--- /dev/null
+++ b/tests/queries/0_stateless/02998_primary_key_skip_columns.sql
@@ -0,0 +1,35 @@
+-- Tags: no-asan, no-tsan, no-msan, no-ubsan, no-random-settings, no-debug
+
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (a UInt64, b UInt64, c UInt64) ENGINE = MergeTree ORDER BY (a, b, c) SETTINGS index_granularity = 1, primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns = 1;
+INSERT INTO test SELECT sipHash64(number, 1), sipHash64(number, 2), sipHash64(number, 3) FROM numbers(100000);
+
+SELECT count() FROM test;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760;
+SELECT count() FROM test WHERE b > 7898976344263989848 AND b < 8040320939819153137;
+SELECT count() FROM test WHERE c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND b > 7898976344263989848 AND b < 8040320939819153137;
+SELECT count() FROM test WHERE b > 7898976344263989848 AND b < 8040320939819153137 AND c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND b > 7898976344263989848 AND b < 8040320939819153137 AND c > 13239894303140990071 AND c < 16179795840886947236;
+
+SELECT 'Key size: ', round(sum(primary_key_bytes_in_memory), -5) FROM system.parts WHERE database = currentDatabase() AND table = 'test';
+
+ALTER TABLE test MODIFY SETTING primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns = 0.9;
+
+DETACH TABLE test;
+ATTACH TABLE test;
+
+SELECT count() FROM test;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760;
+SELECT count() FROM test WHERE b > 7898976344263989848 AND b < 8040320939819153137;
+SELECT count() FROM test WHERE c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND b > 7898976344263989848 AND b < 8040320939819153137;
+SELECT count() FROM test WHERE b > 7898976344263989848 AND b < 8040320939819153137 AND c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND c > 13239894303140990071 AND c < 16179795840886947236;
+SELECT count() FROM test WHERE a > 1849813033528774208 AND a < 4594276315503201760 AND b > 7898976344263989848 AND b < 8040320939819153137 AND c > 13239894303140990071 AND c < 16179795840886947236;
+
+SELECT 'Key size: ', round(sum(primary_key_bytes_in_memory), -5) FROM system.parts WHERE database = currentDatabase() AND table = 'test';
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/02998_projection_after_attach_partition.reference b/tests/queries/0_stateless/02998_projection_after_attach_partition.reference
new file mode 100644
index 00000000000..1cb984f0f34
--- /dev/null
+++ b/tests/queries/0_stateless/02998_projection_after_attach_partition.reference
@@ -0,0 +1,31 @@
+-- { echoOn }
+DROP TABLE IF EXISTS visits_order;
+DROP TABLE IF EXISTS visits_order_dst;
+CREATE TABLE visits_order
+(
+    user_id UInt64,
+    user_name String,
+    some_int UInt64
+) ENGINE = MergeTree() PRIMARY KEY user_id PARTITION BY user_id;
+CREATE TABLE visits_order_dst
+(
+    user_id UInt64,
+    user_name String,
+    some_int UInt64
+) ENGINE = MergeTree() PRIMARY KEY user_id PARTITION BY user_id;
+ALTER TABLE visits_order ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+ALTER TABLE visits_order_dst ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+INSERT INTO visits_order SELECT 2, 'user2', number from numbers(1, 10);
+INSERT INTO visits_order SELECT 2, 'another_user2', number*2 from numbers(1, 10);
+INSERT INTO visits_order SELECT 2, 'yet_another_user2', number*3 from numbers(1, 10);
+ALTER TABLE visits_order_dst ATTACH PARTITION ID '2' FROM visits_order;
+SET allow_experimental_analyzer=0;
+EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
+Expression ((Projection + Before ORDER BY))
+  Filter
+    ReadFromMergeTree (user_name_projection)
+SET allow_experimental_analyzer=1;
+EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
+Expression ((Project names + Projection))
+  Filter
+    ReadFromMergeTree (user_name_projection)
diff --git a/tests/queries/0_stateless/02998_projection_after_attach_partition.sql b/tests/queries/0_stateless/02998_projection_after_attach_partition.sql
new file mode 100644
index 00000000000..4e0121dafe9
--- /dev/null
+++ b/tests/queries/0_stateless/02998_projection_after_attach_partition.sql
@@ -0,0 +1,34 @@
+-- { echoOn }
+DROP TABLE IF EXISTS visits_order;
+DROP TABLE IF EXISTS visits_order_dst;
+
+CREATE TABLE visits_order
+(
+    user_id UInt64,
+    user_name String,
+    some_int UInt64
+) ENGINE = MergeTree() PRIMARY KEY user_id PARTITION BY user_id;
+
+CREATE TABLE visits_order_dst
+(
+    user_id UInt64,
+    user_name String,
+    some_int UInt64
+) ENGINE = MergeTree() PRIMARY KEY user_id PARTITION BY user_id;
+
+ALTER TABLE visits_order ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+ALTER TABLE visits_order_dst ADD PROJECTION user_name_projection (SELECT * ORDER BY user_name);
+
+INSERT INTO visits_order SELECT 2, 'user2', number from numbers(1, 10);
+INSERT INTO visits_order SELECT 2, 'another_user2', number*2 from numbers(1, 10);
+INSERT INTO visits_order SELECT 2, 'yet_another_user2', number*3 from numbers(1, 10);
+
+ALTER TABLE visits_order_dst ATTACH PARTITION ID '2' FROM visits_order;
+
+SET allow_experimental_analyzer=0;
+
+EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
+
+SET allow_experimental_analyzer=1;
+
+EXPLAIN SELECT * FROM visits_order_dst WHERE user_name='another_user2';
diff --git a/tests/queries/0_stateless/02998_system_dns_cache_table.reference b/tests/queries/0_stateless/02998_system_dns_cache_table.reference
new file mode 100644
index 00000000000..600d0bc0b39
--- /dev/null
+++ b/tests/queries/0_stateless/02998_system_dns_cache_table.reference
@@ -0,0 +1,2 @@
+hostname	ip_address	ip_family	cached_at
+String	String	Enum8(\'IPv4\' = 0, \'IPv6\' = 1, \'UNIX_LOCAL\' = 2)	DateTime
diff --git a/tests/queries/0_stateless/02998_system_dns_cache_table.sql b/tests/queries/0_stateless/02998_system_dns_cache_table.sql
new file mode 100644
index 00000000000..0ceb3d8a95a
--- /dev/null
+++ b/tests/queries/0_stateless/02998_system_dns_cache_table.sql
@@ -0,0 +1,3 @@
+SELECT hostname, ip_address, ip_family, cached_at FROM system.dns_cache
+LIMIT 0
+FORMAT TSVWithNamesAndTypes;
diff --git a/tests/queries/0_stateless/02998_to_milliseconds.reference b/tests/queries/0_stateless/02998_to_milliseconds.reference
new file mode 100644
index 00000000000..05139c19d1d
--- /dev/null
+++ b/tests/queries/0_stateless/02998_to_milliseconds.reference
@@ -0,0 +1,8 @@
+2023-04-21 10:20:30	0	0
+2023-04-21 10:20:30	0	0
+2023-04-21 10:20:30.123	123	123
+2023-04-21 10:20:30.123456	123	123
+2023-04-21 10:20:30.123456789	123	123
+120
+2023-04-21 10:20:30	0
+2023-04-21 10:20:30	0
diff --git a/tests/queries/0_stateless/02998_to_milliseconds.sql b/tests/queries/0_stateless/02998_to_milliseconds.sql
new file mode 100644
index 00000000000..f159f6aab50
--- /dev/null
+++ b/tests/queries/0_stateless/02998_to_milliseconds.sql
@@ -0,0 +1,17 @@
+-- Negative tests
+SELECT toMillisecond(); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+SELECT toMillisecond('string'); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT toMillisecond(toDate('2024-02-28')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT toMillisecond(toDate32('2024-02-28')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+-- Tests with constant and non-constant arguments
+SELECT toDateTime('2023-04-21 10:20:30') AS dt, toMillisecond(dt), toMillisecond(materialize(dt));
+SELECT toDateTime64('2023-04-21 10:20:30', 0) AS dt64, toMillisecond(dt64), toMillisecond(materialize(dt64));
+SELECT toDateTime64('2023-04-21 10:20:30.123', 3) AS dt64, toMillisecond(dt64), toMillisecond(materialize(dt64));
+SELECT toDateTime64('2023-04-21 10:20:30.123456', 6) AS dt64, toMillisecond(dt64), toMillisecond(materialize(dt64));
+SELECT toDateTime64('2023-04-21 10:20:30.123456789', 9) AS dt64, toMillisecond(dt64), toMillisecond(materialize(dt64));
+
+-- Special cases
+SELECT MILLISECOND(toDateTime64('2023-04-21 10:20:30.123456', 2)); -- Alias
+SELECT toNullable(toDateTime('2023-04-21 10:20:30')) AS dt, toMillisecond(dt); -- Nullable
+SELECT toLowCardinality(toDateTime('2023-04-21 10:20:30')) AS dt, toMillisecond(dt); -- LowCardinality
diff --git a/tests/queries/0_stateless/02999_analyzer_preimage_null.reference b/tests/queries/0_stateless/02999_analyzer_preimage_null.reference
new file mode 100644
index 00000000000..c5eb6b23d0d
--- /dev/null
+++ b/tests/queries/0_stateless/02999_analyzer_preimage_null.reference
@@ -0,0 +1,121 @@
+-- { echoOn }
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != toNullable(1993)) AND (id <= b);
+QUERY id: 0
+  PROJECTION COLUMNS
+    id UInt32
+    value1 String
+    date1 Date
+  PROJECTION
+    LIST id: 1, nodes: 3
+      COLUMN id: 2, column_name: id, result_type: UInt32, source_id: 3
+      COLUMN id: 4, column_name: value1, result_type: String, source_id: 3
+      COLUMN id: 5, column_name: date1, result_type: Date, source_id: 3
+  JOIN TREE
+    TABLE id: 3, alias: __table1, table_name: default.date_t__fuzz_0
+  WHERE
+    FUNCTION id: 6, function_name: and, function_type: ordinary, result_type: Nullable(UInt8)
+      ARGUMENTS
+        LIST id: 7, nodes: 2
+          FUNCTION id: 8, function_name: notEquals, function_type: ordinary, result_type: Nullable(UInt8)
+            ARGUMENTS
+              LIST id: 9, nodes: 2
+                FUNCTION id: 10, function_name: toYear, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 11, nodes: 1
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                CONSTANT id: 13, constant_value: UInt64_1993, constant_value_type: Nullable(UInt16)
+                  EXPRESSION
+                    FUNCTION id: 14, function_name: toNullable, function_type: ordinary, result_type: Nullable(UInt16)
+                      ARGUMENTS
+                        LIST id: 15, nodes: 1
+                          CONSTANT id: 16, constant_value: UInt64_1993, constant_value_type: UInt16
+          FUNCTION id: 17, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 18, nodes: 2
+                COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                FUNCTION id: 10, function_name: toYear, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 11, nodes: 1
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != 1993) AND (id <= b) SETTINGS optimize_time_filter_with_preimage=0;
+QUERY id: 0
+  PROJECTION COLUMNS
+    id UInt32
+    value1 String
+    date1 Date
+  PROJECTION
+    LIST id: 1, nodes: 3
+      COLUMN id: 2, column_name: id, result_type: UInt32, source_id: 3
+      COLUMN id: 4, column_name: value1, result_type: String, source_id: 3
+      COLUMN id: 5, column_name: date1, result_type: Date, source_id: 3
+  JOIN TREE
+    TABLE id: 3, alias: __table1, table_name: default.date_t__fuzz_0
+  WHERE
+    FUNCTION id: 6, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 7, nodes: 2
+          FUNCTION id: 8, function_name: notEquals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 9, nodes: 2
+                FUNCTION id: 10, function_name: toYear, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 11, nodes: 1
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                CONSTANT id: 13, constant_value: UInt64_1993, constant_value_type: UInt16
+          FUNCTION id: 14, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 15, nodes: 2
+                COLUMN id: 16, column_name: id, result_type: UInt32, source_id: 3
+                FUNCTION id: 10, function_name: toYear, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 11, nodes: 1
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+  SETTINGS optimize_time_filter_with_preimage=0
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != 1993) AND (id <= b) SETTINGS optimize_time_filter_with_preimage=1;
+QUERY id: 0
+  PROJECTION COLUMNS
+    id UInt32
+    value1 String
+    date1 Date
+  PROJECTION
+    LIST id: 1, nodes: 3
+      COLUMN id: 2, column_name: id, result_type: UInt32, source_id: 3
+      COLUMN id: 4, column_name: value1, result_type: String, source_id: 3
+      COLUMN id: 5, column_name: date1, result_type: Date, source_id: 3
+  JOIN TREE
+    TABLE id: 3, alias: __table1, table_name: default.date_t__fuzz_0
+  WHERE
+    FUNCTION id: 6, function_name: and, function_type: ordinary, result_type: UInt8
+      ARGUMENTS
+        LIST id: 7, nodes: 2
+          FUNCTION id: 8, function_name: or, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 9, nodes: 2
+                FUNCTION id: 10, function_name: less, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 11, nodes: 2
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 13, constant_value: \'1993-01-01\', constant_value_type: String
+                FUNCTION id: 14, function_name: greaterOrEquals, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 15, nodes: 2
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+                      CONSTANT id: 16, constant_value: \'1994-01-01\', constant_value_type: String
+          FUNCTION id: 17, function_name: lessOrEquals, function_type: ordinary, result_type: UInt8
+            ARGUMENTS
+              LIST id: 18, nodes: 2
+                COLUMN id: 19, column_name: id, result_type: UInt32, source_id: 3
+                FUNCTION id: 20, function_name: toYear, function_type: ordinary, result_type: UInt16
+                  ARGUMENTS
+                    LIST id: 21, nodes: 1
+                      COLUMN id: 12, column_name: date1, result_type: Date, source_id: 3
+  SETTINGS optimize_time_filter_with_preimage=1
diff --git a/tests/queries/0_stateless/02999_analyzer_preimage_null.sql b/tests/queries/0_stateless/02999_analyzer_preimage_null.sql
new file mode 100644
index 00000000000..07d3a0f69c1
--- /dev/null
+++ b/tests/queries/0_stateless/02999_analyzer_preimage_null.sql
@@ -0,0 +1,20 @@
+SET allow_experimental_analyzer=1;
+SET optimize_time_filter_with_preimage=1;
+
+CREATE TABLE date_t__fuzz_0 (`id` UInt32, `value1` String, `date1` Date) ENGINE = ReplacingMergeTree ORDER BY id SETTINGS allow_nullable_key=1;
+
+-- { echoOn }
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != toNullable(1993)) AND (id <= b);
+
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != 1993) AND (id <= b) SETTINGS optimize_time_filter_with_preimage=0;
+
+EXPLAIN QUERY TREE run_passes = 1
+SELECT *
+FROM date_t__fuzz_0
+WHERE ((toYear(date1) AS b) != 1993) AND (id <= b) SETTINGS optimize_time_filter_with_preimage=1;
diff --git a/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.reference b/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.reference
new file mode 100644
index 00000000000..0740afe92c6
--- /dev/null
+++ b/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.reference
@@ -0,0 +1,66 @@
+0	0
+0	0
+0	0
+0	0
+1	\N
+1	\N
+2	\N
+2	\N
+3	\N
+3	\N
+4	\N
+4	\N
+5	\N
+5	\N
+6	\N
+6	\N
+7	\N
+7	\N
+8	\N
+8	\N
+9	\N
+9	\N
+10	10
+10	10
+10	10
+10	10
+11	\N
+11	\N
+12	\N
+12	\N
+13	\N
+13	\N
+14	\N
+14	\N
+15	\N
+15	\N
+16	\N
+16	\N
+17	\N
+17	\N
+18	\N
+18	\N
+19	\N
+19	\N
+20	20
+20	20
+20	20
+20	20
+21	\N
+21	\N
+22	\N
+22	\N
+23	\N
+23	\N
+24	\N
+24	\N
+25	\N
+25	\N
+26	\N
+26	\N
+27	\N
+27	\N
+28	\N
+28	\N
+29	\N
+29	\N
diff --git a/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.sql b/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.sql
new file mode 100644
index 00000000000..88bcdeb7f77
--- /dev/null
+++ b/tests/queries/0_stateless/02999_scalar_subqueries_bug_1.sql
@@ -0,0 +1,8 @@
+drop table if exists t_table_select;
+CREATE TABLE t_table_select (id UInt32) ENGINE = MergeTree ORDER BY id;
+INSERT INTO t_table_select (id) SELECT number FROM numbers(30);
+
+CREATE TEMPORARY TABLE t_test (x UInt32, y Nullable(UInt32)) AS SELECT a.id, b.id FROM remote('127.0.0.{1,2}', currentDatabase(), t_table_select) AS a GLOBAL LEFT JOIN (SELECT id FROM remote('127.0.0.{1,2}', currentDatabase(), t_table_select) AS b WHERE (b.id % 10) = 0) AS b ON b.id = a.id SETTINGS join_use_nulls = 1;
+
+select * from t_test order by x;
+
diff --git a/tests/queries/0_stateless/02999_scalar_subqueries_bug_2.reference b/tests/queries/0_stateless/02999_scalar_subqueries_bug_2.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02999_scalar_subqueries_bug_2.sql b/tests/queries/0_stateless/02999_scalar_subqueries_bug_2.sql
new file mode 100644
index 00000000000..03ac91e401a
--- /dev/null
+++ b/tests/queries/0_stateless/02999_scalar_subqueries_bug_2.sql
@@ -0,0 +1,18 @@
+drop table if exists source;
+drop table if exists target1;
+drop table if exists target2;
+drop table if exists v_heavy;
+
+
+create table source(type String) engine=MergeTree order by type;
+
+create view v_heavy as
+with nums as (select number from numbers(1e5))
+select count(*) n from (select number from numbers(1e5) n1 cross join nums);
+
+create table target1(type String) engine=MergeTree order by type;
+create table target2(type String) engine=MergeTree order by type;
+
+set max_execution_time=2;
+-- we should not execute scalar subquery here
+create materialized view vm_target2 to target2 as select * from source where type='two' and (select sum(sleepEachRow(0.1)) from numbers(30));
diff --git a/tests/queries/0_stateless/02999_ulid_short_circuit.reference b/tests/queries/0_stateless/02999_ulid_short_circuit.reference
new file mode 100644
index 00000000000..51460c40e48
--- /dev/null
+++ b/tests/queries/0_stateless/02999_ulid_short_circuit.reference
@@ -0,0 +1,2 @@
+2024-02-20 16:53:57.105
+2024-02-21 12:00:00.000
diff --git a/tests/queries/0_stateless/02999_ulid_short_circuit.sql b/tests/queries/0_stateless/02999_ulid_short_circuit.sql
new file mode 100644
index 00000000000..4453d9dbe47
--- /dev/null
+++ b/tests/queries/0_stateless/02999_ulid_short_circuit.sql
@@ -0,0 +1,5 @@
+-- Tags: no-fasttest
+
+SET session_timezone='Europe/Madrid'; -- disable time zone randomization in CI
+SELECT if(length(x) = 26, ULIDStringToDateTime(x, 'Europe/Madrid'), toDateTime('2024-02-21 12:00:00', 'Europe/Madrid')) AS datetime
+FROM values('x String', '01HQ3KJJKHRWP357YVYBX32WHY', '01HQ3KJJKH')
diff --git a/tests/queries/0_stateless/02999_variant_suspicious_types.reference b/tests/queries/0_stateless/02999_variant_suspicious_types.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/02999_variant_suspicious_types.sql b/tests/queries/0_stateless/02999_variant_suspicious_types.sql
new file mode 100644
index 00000000000..8cdbfc13adb
--- /dev/null
+++ b/tests/queries/0_stateless/02999_variant_suspicious_types.sql
@@ -0,0 +1,7 @@
+set allow_suspicious_variant_types=0;
+select 42::Variant(UInt32, Int64); -- {serverError ILLEGAL_COLUMN}
+select [42]::Variant(Array(UInt32), Array(Int64)); -- {serverError ILLEGAL_COLUMN}
+select 'Hello'::Variant(String, LowCardinality(String)); -- {serverError ILLEGAL_COLUMN}
+select (1, 'Hello')::Variant(Tuple(UInt32, String), Tuple(Int64, String)); -- {serverError ILLEGAL_COLUMN}
+select map(42, 42)::Variant(Map(UInt64, UInt32), Map(UInt64, Int64)); -- {serverError ILLEGAL_COLUMN}
+
diff --git a/tests/queries/0_stateless/03000_minmax_index_first.reference b/tests/queries/0_stateless/03000_minmax_index_first.reference
new file mode 100644
index 00000000000..7cf792d8ed4
--- /dev/null
+++ b/tests/queries/0_stateless/03000_minmax_index_first.reference
@@ -0,0 +1,2 @@
+Name: v_mm
+Name: v_set
diff --git a/tests/queries/0_stateless/03000_minmax_index_first.sql b/tests/queries/0_stateless/03000_minmax_index_first.sql
new file mode 100644
index 00000000000..d978e6ea8fa
--- /dev/null
+++ b/tests/queries/0_stateless/03000_minmax_index_first.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS skip_table;
+
+CREATE TABLE skip_table
+(
+    k UInt64,
+    v UInt64,
+    INDEX v_set v TYPE set(100) GRANULARITY 2, -- set index is declared before minmax intentionally
+    INDEX v_mm v TYPE minmax GRANULARITY 2
+)
+ENGINE = MergeTree
+PRIMARY KEY k
+SETTINGS index_granularity = 8192;
+
+INSERT INTO skip_table SELECT number, intDiv(number, 4096) FROM numbers(100000);
+
+SELECT trim(explain) FROM ( EXPLAIN indexes = 1 SELECT * FROM skip_table WHERE v = 125) WHERE explain like '%Name%';
+
+DROP TABLE skip_table;
diff --git a/tests/queries/0_stateless/03000_too_big_max_execution_time_setting.reference b/tests/queries/0_stateless/03000_too_big_max_execution_time_setting.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03000_too_big_max_execution_time_setting.sql b/tests/queries/0_stateless/03000_too_big_max_execution_time_setting.sql
new file mode 100644
index 00000000000..7aa86891b42
--- /dev/null
+++ b/tests/queries/0_stateless/03000_too_big_max_execution_time_setting.sql
@@ -0,0 +1,2 @@
+select 1 settings max_execution_time = 9223372036854775808; -- {clientError BAD_ARGUMENTS}
+
diff --git a/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.reference b/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.sh b/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.sh
new file mode 100755
index 00000000000..98575540923
--- /dev/null
+++ b/tests/queries/0_stateless/03000_traverse_shadow_system_data_paths.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+TABLE="03000_traverse_shadow_system_data_path_table"
+BACKUP="03000_traverse_shadow_system_data_path_backup"
+
+${CLICKHOUSE_CLIENT} --query="CREATE TABLE ${TABLE} (
+    id Int64,
+    data String
+) ENGINE=MergeTree()
+ORDER BY id
+SETTINGS storage_policy='s3_cache';"
+
+${CLICKHOUSE_CLIENT} --query="INSERT INTO ${TABLE} VALUES (0, 'data');"
+${CLICKHOUSE_CLIENT} --query "SELECT count() > 0 FROM system.remote_data_paths WHERE disk_name = 's3_cache'"
+
+${CLICKHOUSE_CLIENT} --query="ALTER TABLE ${TABLE} FREEZE WITH NAME '${BACKUP}';"
+${CLICKHOUSE_CLIENT} --query="DROP TABLE ${TABLE} SYNC;"
+
+${CLICKHOUSE_CLIENT} --query "
+    SELECT count() > 0
+    FROM system.remote_data_paths 
+    WHERE disk_name = 's3_cache' AND local_path LIKE '%shadow/${BACKUP}%'
+    SETTINGS traverse_shadow_remote_data_paths=1;"
+${CLICKHOUSE_CLIENT} --query "SYSTEM UNFREEZE WITH NAME '${BACKUP}';" &>/dev/null || true
diff --git a/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.reference b/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.reference
new file mode 100644
index 00000000000..06b63ea6c2f
--- /dev/null
+++ b/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.reference
@@ -0,0 +1 @@
+0	0	0
diff --git a/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.sql b/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.sql
new file mode 100644
index 00000000000..d57db9151b9
--- /dev/null
+++ b/tests/queries/0_stateless/03000_virtual_columns_in_prewhere.sql
@@ -0,0 +1,10 @@
+drop table if exists x;
+
+create table x (i int, j int, k int) engine MergeTree order by tuple() settings index_granularity=8192, index_granularity_bytes = '10Mi',  min_bytes_for_wide_part=0, min_rows_for_wide_part=0, ratio_of_defaults_for_sparse_serialization=1;
+
+insert into x select number, number * 2, number * 3 from numbers(100000);
+
+-- One granule, (_part_offset (8 bytes) + <one minimal physical column> (4 bytes)) * 8192 + <other two physical columns>(8 bytes) * 1 = 98312
+select * from x prewhere _part_offset = 0 settings max_bytes_to_read = 98312;
+
+drop table x;
diff --git a/tests/queries/0_stateless/03001_analyzer_nullable_nothing.reference b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.reference
new file mode 100644
index 00000000000..2ad74d50ebd
--- /dev/null
+++ b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.reference
@@ -0,0 +1 @@
+0	\N
diff --git a/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql
new file mode 100644
index 00000000000..32c378ebf0a
--- /dev/null
+++ b/tests/queries/0_stateless/03001_analyzer_nullable_nothing.sql
@@ -0,0 +1,6 @@
+--https://github.com/ClickHouse/ClickHouse/issues/58906
+SELECT
+    count(_CAST(NULL, 'Nullable(Nothing)')),
+    round(avg(_CAST(NULL, 'Nullable(Nothing)'))) AS k
+FROM numbers(256)
+    SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.reference b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.reference
new file mode 100644
index 00000000000..f59f19d62b3
--- /dev/null
+++ b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.reference
@@ -0,0 +1,16 @@
+mv before:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+BACKUP_CREATED
+RESTORED
+
+mv after:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
diff --git a/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
new file mode 100755
index 00000000000..d49f1c41c69
--- /dev/null
+++ b/tests/queries/0_stateless/03001_backup_matview_after_modify_query.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+# Tags: no-ordinary-database, no-replicated-database
+# Tag no-ordinary-database: TO DO
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+db="$CLICKHOUSE_DATABASE"
+db_2="${db}_2"
+backup_name="${db}_backup"
+
+${CLICKHOUSE_CLIENT} --multiquery "
+DROP TABLE IF EXISTS src;
+DROP TABLE IF EXISTS mv;
+CREATE TABLE src(Timestamp DateTime64(9), c1 String, c2 String) ENGINE=MergeTree ORDER BY Timestamp;
+"
+
+${CLICKHOUSE_CLIENT} -q "CREATE MATERIALIZED VIEW mv(timestamp DateTime, c12 Nullable(String)) ENGINE=MergeTree ORDER BY timestamp AS SELECT Timestamp as timestamp, c1 || c2 as c12 FROM src"
+
+${CLICKHOUSE_CLIENT} -q "INSERT INTO src SELECT '2024-02-22'::DateTime + number, number, number FROM numbers(3)"
+
+echo 'mv before:'
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM ${db}.mv ORDER BY timestamp FORMAT TSVWithNamesAndTypes"
+
+${CLICKHOUSE_CLIENT} -q "ALTER TABLE mv MODIFY QUERY SELECT Timestamp as timestamp, c1 || c2 as c12 FROM src"
+
+echo
+${CLICKHOUSE_CLIENT} -q "BACKUP DATABASE $db TO Disk('backups', '${backup_name}')" | grep -o "BACKUP_CREATED"
+${CLICKHOUSE_CLIENT} -q "RESTORE DATABASE $db AS ${db_2} FROM Disk('backups', '${backup_name}')" | grep -o "RESTORED"
+
+echo $'\nmv after:'
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM ${db_2}.mv ORDER BY timestamp FORMAT TSVWithNamesAndTypes"
+
+${CLICKHOUSE_CLIENT} -q "DROP DATABASE ${db_2}"
diff --git a/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.reference b/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.reference
new file mode 100644
index 00000000000..d4e027274e2
--- /dev/null
+++ b/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.reference
@@ -0,0 +1 @@
+Argument 3 has size 2 which differs with the size of another argument, 3
diff --git a/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.sh b/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.sh
new file mode 100755
index 00000000000..967453fd375
--- /dev/null
+++ b/tests/queries/0_stateless/03001_bad_error_message_higher_order_functions.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --query "SELECT arrayMap((x,y) -> x + y, [1,2,3], [1,2])" 2>&1 | grep -o -F --max-count 1 'Argument 3 has size 2 which differs with the size of another argument, 3'
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03001_block_offset_column.reference.j2 b/tests/queries/0_stateless/03001_block_offset_column.reference.j2
new file mode 100644
index 00000000000..641409167bf
--- /dev/null
+++ b/tests/queries/0_stateless/03001_block_offset_column.reference.j2
@@ -0,0 +1,43 @@
+{% for enable_vertical_merge_algorithm in [0, 1] -%}
+*** BEFORE MUTATION BEFORE MERGE ***
+1	1	1	0	all_1_1_0
+2	2	2	0	all_2_2_0
+3	3	1	1	all_1_1_0
+4	4	1	2	all_1_1_0
+5	5	2	1	all_2_2_0
+6	6	2	2	all_2_2_0
+*** AFTER MUTATION BEFORE MERGE ***
+1	0	1	0	all_1_1_0_3
+2	0	2	0	all_2_2_0_3
+3	0	1	1	all_1_1_0_3
+4	4	1	2	all_1_1_0_3
+5	5	2	1	all_2_2_0_3
+6	6	2	2	all_2_2_0_3
+*** AFTER MUTATION AFTER MERGE ***
+1	0	1	0	all_1_2_1_3
+2	0	2	0	all_1_2_1_3
+3	0	1	1	all_1_2_1_3
+4	4	1	2	all_1_2_1_3
+5	5	2	1	all_1_2_1_3
+6	6	2	2	all_1_2_1_3
+*** AFTER MUTATION AFTER MERGE , NEW BLOCK ***
+1	0	1	0	all_1_2_1_3
+2	0	2	0	all_1_2_1_3
+3	0	1	1	all_1_2_1_3
+4	4	1	2	all_1_2_1_3
+5	5	2	1	all_1_2_1_3
+6	6	2	2	all_1_2_1_3
+7	7	4	0	all_4_4_0
+8	8	4	1	all_4_4_0
+9	9	4	2	all_4_4_0
+*** AFTER MUTATION AFTER MERGE , NEW BLOCK MERGED ***
+1	0	1	0	all_1_4_2_3
+2	0	2	0	all_1_4_2_3
+3	0	1	1	all_1_4_2_3
+4	4	1	2	all_1_4_2_3
+5	5	2	1	all_1_4_2_3
+6	6	2	2	all_1_4_2_3
+7	7	4	0	all_1_4_2_3
+8	8	4	1	all_1_4_2_3
+9	9	4	2	all_1_4_2_3
+{% endfor -%}
diff --git a/tests/queries/0_stateless/03001_block_offset_column.sql.j2 b/tests/queries/0_stateless/03001_block_offset_column.sql.j2
new file mode 100644
index 00000000000..b161183f884
--- /dev/null
+++ b/tests/queries/0_stateless/03001_block_offset_column.sql.j2
@@ -0,0 +1,44 @@
+{% for enable_vertical_merge_algorithm in [0, 1] -%}
+
+DROP TABLE IF EXISTS t_block_offset;
+
+CREATE TABLE t_block_offset (id UInt32, a UInt32) ENGINE = MergeTree
+ORDER BY id
+SETTINGS
+    enable_block_number_column = 1,
+    enable_block_offset_column = 1,
+    index_granularity = 2,
+    vertical_merge_algorithm_min_bytes_to_activate = 1,
+    vertical_merge_algorithm_min_columns_to_activate = 1,
+    enable_vertical_merge_algorithm = {{ enable_vertical_merge_algorithm }};
+
+INSERT INTO t_block_offset(id,a) VALUES (1,1),(3,3),(4,4);
+INSERT INTO t_block_offset(id,a) VALUES (2,2),(5,5),(6,6);
+
+SELECT '*** BEFORE MUTATION BEFORE MERGE ***';
+SELECT id,a,_block_number,_block_offset,_part from t_block_offset ORDER BY id;
+
+set mutations_sync=1;
+ALTER TABLE t_block_offset UPDATE a=0 WHERE id<4;
+
+SELECT '*** AFTER MUTATION BEFORE MERGE ***';
+SELECT id,a,_block_number,_block_offset,_part from t_block_offset ORDER BY id;
+
+OPTIMIZE TABLE t_block_offset FINAL;
+
+SELECT '*** AFTER MUTATION AFTER MERGE ***';
+SELECT *,_block_number,_block_offset,_part from t_block_offset ORDER BY id;
+
+INSERT INTO t_block_offset(id,a) VALUES (7,7),(8,8),(9,9);
+
+SELECT '*** AFTER MUTATION AFTER MERGE , NEW BLOCK ***';
+SELECT *,_block_number,_block_offset,_part from t_block_offset ORDER BY id;
+
+OPTIMIZE TABLE t_block_offset FINAL;
+
+SELECT '*** AFTER MUTATION AFTER MERGE , NEW BLOCK MERGED ***';
+SELECT *,_block_number,_block_offset,_part from t_block_offset ORDER BY id;
+
+DROP TABLE t_block_offset;
+
+{% endfor %}
diff --git a/tests/queries/0_stateless/03001_block_offset_column_2.reference b/tests/queries/0_stateless/03001_block_offset_column_2.reference
new file mode 100644
index 00000000000..a7ad8232678
--- /dev/null
+++ b/tests/queries/0_stateless/03001_block_offset_column_2.reference
@@ -0,0 +1,49 @@
+all_1_2_1	1	0	0	0
+all_1_2_1	1	1	1	2
+all_1_2_1	1	2	2	4
+all_1_2_1	1	3	3	6
+all_1_2_1	1	4	4	8
+all_1_2_1	1	5	5	10
+all_1_2_1	1	6	6	12
+all_1_2_1	1	7	7	14
+all_1_2_1	1	8	8	16
+all_1_2_1	1	9	9	18
+all_1_2_1	1	10	10	20
+all_1_2_1	1	11	11	22
+all_1_2_1	1	12	12	24
+all_1_2_1	1	13	13	26
+all_1_2_1	1	14	14	28
+all_1_2_1	1	15	15	30
+===========
+all_1_3_2	1	0	0	0
+all_1_3_2	1	1	2	2
+all_1_3_2	1	2	4	4
+all_1_3_2	1	3	6	6
+all_1_3_2	1	4	8	8
+all_1_3_2	1	5	10	10
+all_1_3_2	1	6	12	12
+all_1_3_2	1	7	14	14
+all_1_3_2	1	8	16	16
+all_1_3_2	1	9	18	18
+all_1_3_2	1	10	20	20
+all_1_3_2	1	11	22	22
+all_1_3_2	1	12	24	24
+all_1_3_2	1	13	26	26
+all_1_3_2	1	14	28	28
+all_1_3_2	1	15	30	30
+all_1_3_2	3	0	1	1
+all_1_3_2	3	1	3	3
+all_1_3_2	3	2	5	5
+all_1_3_2	3	3	7	7
+all_1_3_2	3	4	9	9
+all_1_3_2	3	5	11	11
+all_1_3_2	3	6	13	13
+all_1_3_2	3	7	15	15
+all_1_3_2	3	8	17	17
+all_1_3_2	3	9	19	19
+all_1_3_2	3	10	21	21
+all_1_3_2	3	11	23	23
+all_1_3_2	3	12	25	25
+all_1_3_2	3	13	27	27
+all_1_3_2	3	14	29	29
+all_1_3_2	3	15	31	31
diff --git a/tests/queries/0_stateless/03001_block_offset_column_2.sql b/tests/queries/0_stateless/03001_block_offset_column_2.sql
new file mode 100644
index 00000000000..b994e37b952
--- /dev/null
+++ b/tests/queries/0_stateless/03001_block_offset_column_2.sql
@@ -0,0 +1,25 @@
+
+DROP TABLE IF EXISTS t_block_offset;
+
+CREATE TABLE t_block_offset (id UInt32) ENGINE = MergeTree ORDER BY id SETTINGS index_granularity = 3;
+
+INSERT INTO t_block_offset SELECT number * 2 FROM numbers(8);
+
+INSERT INTO t_block_offset SELECT number * 2 FROM numbers(8, 8);
+
+OPTIMIZE TABLE t_block_offset FINAL;
+
+SELECT _part, _block_number, _block_offset, _part_offset, id FROM t_block_offset ORDER BY _block_number, _block_offset;
+
+ALTER TABLE t_block_offset MODIFY SETTING enable_block_number_column = 1;
+ALTER TABLE t_block_offset MODIFY SETTING enable_block_offset_column = 1;
+
+INSERT INTO t_block_offset SELECT number * 2 + 1 FROM numbers(16);
+
+OPTIMIZE TABLE t_block_offset FINAL;
+
+SELECT '===========';
+SELECT _part,  _block_number, _block_offset, _part_offset, id FROM t_block_offset ORDER BY _block_number, _block_offset;
+
+
+DROP TABLE t_block_offset;
diff --git a/tests/queries/0_stateless/03001_consider_lwd_when_merge.reference b/tests/queries/0_stateless/03001_consider_lwd_when_merge.reference
new file mode 100644
index 00000000000..19920de3d3c
--- /dev/null
+++ b/tests/queries/0_stateless/03001_consider_lwd_when_merge.reference
@@ -0,0 +1,3 @@
+2
+2
+1
diff --git a/tests/queries/0_stateless/03001_consider_lwd_when_merge.sql b/tests/queries/0_stateless/03001_consider_lwd_when_merge.sql
new file mode 100644
index 00000000000..988d7058f21
--- /dev/null
+++ b/tests/queries/0_stateless/03001_consider_lwd_when_merge.sql
@@ -0,0 +1,26 @@
+DROP TABLE IF EXISTS lwd_merge;
+
+CREATE TABLE lwd_merge (id UInt64 CODEC(NONE))
+    ENGINE = MergeTree ORDER BY id
+SETTINGS max_bytes_to_merge_at_max_space_in_pool = 80000, exclude_deleted_rows_for_part_size_in_merge = 0;
+
+INSERT INTO lwd_merge SELECT number FROM numbers(10000);
+INSERT INTO lwd_merge SELECT number FROM numbers(10000, 10000);
+
+OPTIMIZE TABLE lwd_merge;
+SELECT count() FROM system.parts WHERE database = currentDatabase() AND table = 'lwd_merge' AND active = 1;
+
+DELETE FROM lwd_merge WHERE id % 10 > 0;
+
+OPTIMIZE TABLE lwd_merge;
+SELECT count() FROM system.parts WHERE database = currentDatabase() AND table = 'lwd_merge' AND active = 1;
+
+ALTER TABLE lwd_merge MODIFY SETTING exclude_deleted_rows_for_part_size_in_merge = 1;
+
+-- delete again because deleted rows will be counted in mutation
+DELETE FROM lwd_merge WHERE id % 100 == 0;
+
+OPTIMIZE TABLE lwd_merge;
+SELECT count() FROM system.parts WHERE database = currentDatabase() AND table = 'lwd_merge' AND active = 1;
+
+DROP TABLE IF EXISTS lwd_merge;
diff --git a/tests/queries/0_stateless/03001_data_version_column.reference b/tests/queries/0_stateless/03001_data_version_column.reference
new file mode 100644
index 00000000000..cd85ce9cc63
--- /dev/null
+++ b/tests/queries/0_stateless/03001_data_version_column.reference
@@ -0,0 +1,5 @@
+all_1_1_0	1	1	1
+all_2_2_0	2	2	2
+all_1_1_0_3	3	1	100
+all_2_2_0_3	3	2	200
+all_4_4_0	4	3	3
diff --git a/tests/queries/0_stateless/03001_data_version_column.sql b/tests/queries/0_stateless/03001_data_version_column.sql
new file mode 100644
index 00000000000..4e3377ebf47
--- /dev/null
+++ b/tests/queries/0_stateless/03001_data_version_column.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS t_data_version;
+
+CREATE TABLE t_data_version (a UInt64, b UInt64) ENGINE = MergeTree ORDER BY a;
+
+INSERT INTO t_data_version VALUES (1, 1);
+INSERT INTO t_data_version VALUES (2, 2);
+
+SELECT _part, _part_data_version, * FROM t_data_version ORDER BY a;
+
+ALTER TABLE t_data_version UPDATE b = a * 100 WHERE 1 SETTINGS mutations_sync = 2;
+
+SELECT _part, _part_data_version, * FROM t_data_version ORDER BY a;
+
+INSERT INTO t_data_version VALUES (3, 3);
+
+-- Check parts pruning.
+SELECT _part, _part_data_version, * FROM t_data_version WHERE _part_data_version = 4 ORDER BY a SETTINGS max_rows_to_read = 1;
+
+DROP TABLE t_data_version;
+
diff --git a/tests/queries/0_stateless/03001_insert_threads_deduplication.reference b/tests/queries/0_stateless/03001_insert_threads_deduplication.reference
new file mode 100644
index 00000000000..b6d6006f84c
--- /dev/null
+++ b/tests/queries/0_stateless/03001_insert_threads_deduplication.reference
@@ -0,0 +1,4 @@
+3
+6
+12
+18
diff --git a/tests/queries/0_stateless/03001_insert_threads_deduplication.sql b/tests/queries/0_stateless/03001_insert_threads_deduplication.sql
new file mode 100644
index 00000000000..093d2b3185d
--- /dev/null
+++ b/tests/queries/0_stateless/03001_insert_threads_deduplication.sql
@@ -0,0 +1,69 @@
+-- Tags: distributed
+
+DROP TABLE IF EXISTS landing SYNC;
+DROP TABLE IF EXISTS landing_dist SYNC;
+DROP TABLE IF EXISTS ds SYNC;
+
+CREATE TABLE landing
+(
+    timestamp DateTime64(3),
+    status String,
+    id String
+)
+ENGINE = MergeTree()
+ORDER BY timestamp;
+
+CREATE TABLE landing_dist
+(
+    timestamp DateTime64(3),
+    status String,
+    id String
+)
+ENGINE = Distributed('test_cluster_two_shards', currentDatabase(), 'landing', rand());
+
+SYSTEM STOP MERGES landing; -- Stopping merges to force 3 parts
+
+INSERT INTO landing (status, id, timestamp) SELECT * FROM generateRandom() LIMIT 1;
+INSERT INTO landing (status, id, timestamp) SELECT * FROM generateRandom() LIMIT 1;
+INSERT INTO landing (status, id, timestamp) SELECT * FROM generateRandom() LIMIT 1;
+
+CREATE TABLE ds
+(
+    timestamp DateTime64(3),
+    status String,
+    id String
+)
+ENGINE = MergeTree()
+ORDER BY timestamp
+SETTINGS non_replicated_deduplication_window=1000;
+
+INSERT INTO ds SELECT * FROM landing
+SETTINGS insert_deduplicate=1, insert_deduplication_token='token1',
+         max_insert_threads=5;
+
+SELECT count() FROM ds;
+
+INSERT INTO ds SELECT * FROM landing
+SETTINGS insert_deduplicate=1, insert_deduplication_token='token2',
+         max_insert_threads=1;
+
+SELECT count() FROM ds;
+
+-- When reading from distributed table, 6 rows are going to be retrieved
+-- due to the being using the two shards cluster
+
+INSERT INTO ds SELECT * FROM landing_dist
+SETTINGS insert_deduplicate=1, insert_deduplication_token='token3',
+         max_insert_threads=5;
+
+SELECT count() FROM ds;
+
+INSERT INTO ds SELECT * FROM landing_dist
+SETTINGS insert_deduplicate=1, insert_deduplication_token='token4',
+         max_insert_threads=1;
+
+SELECT count() FROM ds;
+
+DROP TABLE IF EXISTS landing SYNC;
+DROP TABLE IF EXISTS landing_dist SYNC;
+DROP TABLE IF EXISTS ds SYNC;
diff --git a/tests/queries/0_stateless/03001_matview_columns_after_modify_query.reference b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.reference
new file mode 100644
index 00000000000..c9b11e46e26
--- /dev/null
+++ b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.reference
@@ -0,0 +1,86 @@
+src:
+Timestamp	c1	c2
+DateTime64(9)	String	String
+2024-02-22 00:00:00.000000000	0	0
+2024-02-22 00:00:01.000000000	1	1
+2024-02-22 00:00:02.000000000	2	2
+
+mv:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+inner:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+Test 1. MODIFY QUERY doesn't change columns.
+
+mv:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+inner:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+Test 2. MODIFY QUERY with explicit data types doesn't change columns.
+
+mv:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+inner:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+Test 3. MODIFY QUERY can even fix wrong columns.
+
+Before MODIFY QUERY:
+
+mv:
+timestamp	c12
+DateTime64(9)	String
+2024-02-22 00:00:00.000000000	00
+2024-02-22 00:00:01.000000000	11
+2024-02-22 00:00:02.000000000	22
+
+inner:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+After MODIFY QUERY:
+
+mv:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
+
+inner:
+timestamp	c12
+DateTime	Nullable(String)
+2024-02-22 00:00:00	00
+2024-02-22 00:00:01	11
+2024-02-22 00:00:02	22
diff --git a/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
new file mode 100755
index 00000000000..2ec5832fac6
--- /dev/null
+++ b/tests/queries/0_stateless/03001_matview_columns_after_modify_query.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --multiquery "
+DROP TABLE IF EXISTS src;
+DROP TABLE IF EXISTS mv;
+CREATE TABLE src(Timestamp DateTime64(9), c1 String, c2 String) ENGINE=MergeTree ORDER BY Timestamp;
+"
+
+${CLICKHOUSE_CLIENT} -q "CREATE MATERIALIZED VIEW mv(timestamp DateTime, c12 Nullable(String)) ENGINE=MergeTree ORDER BY timestamp AS SELECT Timestamp as timestamp, c1 || c2 as c12 FROM src"
+
+mv_uuid=$(${CLICKHOUSE_CLIENT} -q "SELECT uuid FROM system.tables WHERE table='mv' AND database=currentDatabase()")
+if [ "${mv_uuid}" != "00000000-0000-0000-0000-000000000000" ]; then
+    inner_table_name=".inner_id.${mv_uuid}"
+else
+    inner_table_name=".inner.mv"
+fi
+#echo "inner_table_name=$inner_table_name"
+
+${CLICKHOUSE_CLIENT} -q "INSERT INTO src SELECT '2024-02-22'::DateTime + number, number, number FROM numbers(3)"
+
+echo $'src:'
+${CLICKHOUSE_CLIENT} -q "SELECT * FROM src ORDER BY Timestamp FORMAT TSVWithNamesAndTypes"
+
+function show_mv_and_inner()
+{
+    echo $'\nmv:'
+    ${CLICKHOUSE_CLIENT} -q "SELECT * FROM mv ORDER BY timestamp FORMAT TSVWithNamesAndTypes"
+
+    echo $'\ninner:'
+    ${CLICKHOUSE_CLIENT} -q "SELECT * FROM \`$inner_table_name\` ORDER BY timestamp FORMAT TSVWithNamesAndTypes"
+}
+
+show_mv_and_inner
+
+#################
+
+echo $'\nTest 1. MODIFY QUERY doesn\'t change columns.'
+
+${CLICKHOUSE_CLIENT} -q "ALTER TABLE mv MODIFY QUERY SELECT Timestamp as timestamp, c1 || c2 as c12 FROM src"
+
+show_mv_and_inner
+
+#################
+
+echo $'\nTest 2. MODIFY QUERY with explicit data types doesn\'t change columns.'
+
+${CLICKHOUSE_CLIENT} -q "ALTER TABLE mv MODIFY QUERY SELECT Timestamp::DateTime64(9) as timestamp, (c1 || c2)::String as c12 FROM src"
+
+show_mv_and_inner
+
+#################
+
+echo $'\nTest 3. MODIFY QUERY can even fix wrong columns.' # We need that because of https://github.com/ClickHouse/ClickHouse/issues/60369
+
+mv_metadata_path=$(${CLICKHOUSE_CLIENT} -q "SELECT metadata_path FROM system.tables WHERE table='mv' AND database=currentDatabase()")
+${CLICKHOUSE_CLIENT} -q "DETACH TABLE mv"
+
+#cat $mv_metadata_path
+sed -i -e 's/`timestamp` DateTime,/`timestamp` DateTime64(9),/g' -e 's/`c12` Nullable(String)/`c12` String/g' "$mv_metadata_path"
+#cat $mv_metadata_path
+
+${CLICKHOUSE_CLIENT} -q "ATTACH TABLE mv"
+
+echo $'\nBefore MODIFY QUERY:'
+show_mv_and_inner
+
+${CLICKHOUSE_CLIENT} -q "ALTER TABLE mv MODIFY QUERY SELECT Timestamp as timestamp, c1 || c2 as c12 FROM src"
+
+echo $'\nAfter MODIFY QUERY:'
+show_mv_and_inner
diff --git a/tests/queries/0_stateless/03001_max_parallel_replicas_zero_value.reference b/tests/queries/0_stateless/03001_max_parallel_replicas_zero_value.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03001_max_parallel_replicas_zero_value.sql b/tests/queries/0_stateless/03001_max_parallel_replicas_zero_value.sql
new file mode 100644
index 00000000000..499486713a6
--- /dev/null
+++ b/tests/queries/0_stateless/03001_max_parallel_replicas_zero_value.sql
@@ -0,0 +1,5 @@
+drop table if exists test_d;
+create table test_d engine=Distributed(test_cluster_two_shard_three_replicas_localhost, system, numbers);
+select * from test_d limit 10 settings max_parallel_replicas = 0, prefer_localhost_replica = 0; --{clientError BAD_ARGUMENTS}
+drop table test_d;
+
diff --git a/tests/queries/0_stateless/03001_parallel_parsing_deadlock.reference b/tests/queries/0_stateless/03001_parallel_parsing_deadlock.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03001_parallel_parsing_deadlock.sh b/tests/queries/0_stateless/03001_parallel_parsing_deadlock.sh
new file mode 100755
index 00000000000..6cd5c3b486c
--- /dev/null
+++ b/tests/queries/0_stateless/03001_parallel_parsing_deadlock.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-cpu-aarch64
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.csv
+$CLICKHOUSE_LOCAL -q "select number > 1000000 ? 'error' : toString(number) from numbers(2000000) format CSV" > $DATA_FILE
+$CLICKHOUSE_LOCAL -q "select * from file($DATA_FILE, CSV, 'x UInt64') format Null settings input_format_allow_errors_ratio=1"
+rm $DATA_FILE
diff --git a/tests/queries/0_stateless/03002_analyzer_prewhere.reference b/tests/queries/0_stateless/03002_analyzer_prewhere.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03002_analyzer_prewhere.sql b/tests/queries/0_stateless/03002_analyzer_prewhere.sql
new file mode 100644
index 00000000000..0edf16f1cbe
--- /dev/null
+++ b/tests/queries/0_stateless/03002_analyzer_prewhere.sql
@@ -0,0 +1,12 @@
+SET max_threads = 16, receive_timeout = 10., receive_data_timeout_ms = 10000, allow_suspicious_low_cardinality_types = true, enable_positional_arguments = false, log_queries = true, table_function_remote_max_addresses = 200, any_join_distinct_right_table_keys = true, joined_subquery_requires_alias = false, allow_experimental_analyzer = true, max_execution_time = 10., max_memory_usage = 10000000000, log_comment = '/workspace/ch/tests/queries/0_stateless/01710_projection_in_index.sql', send_logs_level = 'fatal', enable_optimize_predicate_expression = false, prefer_localhost_replica = true, allow_introspection_functions = true, optimize_functions_to_subcolumns = false, transform_null_in = true, optimize_use_projections = true, allow_deprecated_syntax_for_merge_tree = true, parallelize_output_from_storages = false;
+
+CREATE TABLE t__fuzz_0 (`i` Int32, `j` Nullable(Int32), `k` Int32, PROJECTION p (SELECT * ORDER BY j)) ENGINE = MergeTree ORDER BY i SETTINGS index_granularity = 1, allow_nullable_key=1;
+
+INSERT INTO t__fuzz_0 SELECT * FROM generateRandom() LIMIT 3;
+INSERT INTO t__fuzz_0 SELECT * FROM generateRandom() LIMIT 3;
+INSERT INTO t__fuzz_0 SELECT * FROM generateRandom() LIMIT 3;
+INSERT INTO t__fuzz_0 SELECT * FROM generateRandom() LIMIT 3;
+INSERT INTO t__fuzz_0 SELECT * FROM generateRandom() LIMIT 3;
+
+SELECT * FROM t__fuzz_0 PREWHERE (i < 5) AND (j IN (1, 2)) WHERE i < 5;
+DROP TABLE t__fuzz_0;
diff --git a/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.reference b/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.reference
new file mode 100644
index 00000000000..4c9646d6ffa
--- /dev/null
+++ b/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.reference
@@ -0,0 +1,11 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
+1
diff --git a/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.sql b/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.sql
new file mode 100644
index 00000000000..8ccc3cf61da
--- /dev/null
+++ b/tests/queries/0_stateless/03002_filter_skip_virtual_columns_with_non_deterministic_functions.sql
@@ -0,0 +1,5 @@
+create table test (number UInt64) engine=MergeTree order by number;
+insert into test select * from numbers(50000000);
+select ignore(number) from test where RAND() > 4292390314 limit 10;
+select count() > 0 from test where RAND() > 4292390314;
+drop table test;
diff --git a/tests/queries/0_stateless/03002_int_div_decimal_with_date_bug.reference b/tests/queries/0_stateless/03002_int_div_decimal_with_date_bug.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03002_int_div_decimal_with_date_bug.sql b/tests/queries/0_stateless/03002_int_div_decimal_with_date_bug.sql
new file mode 100644
index 00000000000..1668821200c
--- /dev/null
+++ b/tests/queries/0_stateless/03002_int_div_decimal_with_date_bug.sql
@@ -0,0 +1,5 @@
+SELECT intDiv(CAST('1.0', 'Decimal256(3)'), today()); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT intDiv(CAST('1.0', 'Decimal256(3)'), toDate('2023-01-02')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT intDiv(CAST('1.0', 'Decimal256(2)'), toDate32('2023-01-02 12:12:12')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT intDiv(CAST('1.0', 'Decimal256(2)'), toDateTime('2023-01-02 12:12:12')); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+SELECT intDiv(CAST('1.0', 'Decimal256(2)'), toDateTime64('2023-01-02 12:12:12.002', 3)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.reference b/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.sql b/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.sql
new file mode 100644
index 00000000000..8820a433da8
--- /dev/null
+++ b/tests/queries/0_stateless/03002_map_array_functions_with_low_cardinality.sql
@@ -0,0 +1 @@
+SELECT mapContainsKeyLike(map('aa', toLowCardinality(1), 'bb', toLowCardinality(2)), toLowCardinality('a%'));
diff --git a/tests/queries/0_stateless/03002_modify_query_cte.reference b/tests/queries/0_stateless/03002_modify_query_cte.reference
new file mode 100644
index 00000000000..50e4a7c6a07
--- /dev/null
+++ b/tests/queries/0_stateless/03002_modify_query_cte.reference
@@ -0,0 +1,2 @@
+CREATE MATERIALIZED VIEW default.mv_03002 TO default.table_03002\n(\n    `ts` DateTime\n)\nAS SELECT ts\nFROM default.table_03002
+CREATE MATERIALIZED VIEW default.mv_03002 TO default.table_03002\n(\n    `ts` DateTime\n)\nAS WITH MY_CTE AS\n    (\n        SELECT ts\n        FROM default.table_03002\n    )\nSELECT *\nFROM MY_CTE
diff --git a/tests/queries/0_stateless/03002_modify_query_cte.sql b/tests/queries/0_stateless/03002_modify_query_cte.sql
new file mode 100644
index 00000000000..3a36ce7e7fd
--- /dev/null
+++ b/tests/queries/0_stateless/03002_modify_query_cte.sql
@@ -0,0 +1,15 @@
+
+CREATE TABLE table_03002 (ts DateTime, event_type String) ENGINE = MergeTree ORDER BY (event_type, ts);
+
+CREATE MATERIALIZED VIEW mv_03002 TO table_03002 AS SELECT ts FROM table_03002;
+
+SHOW CREATE TABLE mv_03002;
+
+ALTER TABLE mv_03002 MODIFY QUERY
+WITH MY_CTE AS (SELECT ts FROM table_03002)
+SELECT * FROM MY_CTE;
+
+SHOW CREATE TABLE mv_03002;
+
+DROP TABLE mv_03002;
+DROP TABLE table_03002;
diff --git a/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.reference b/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.reference
new file mode 100644
index 00000000000..b19d389d8d0
--- /dev/null
+++ b/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.reference
@@ -0,0 +1,10 @@
+before
+rmt_master	NewPart	0	1
+rmt_master	MergeParts	0	1
+rmt_slave	MergeParts	1	0
+rmt_slave	DownloadPart	0	1
+after
+rmt_master	NewPart	0	1
+rmt_master	MergeParts	0	1
+rmt_slave	MergeParts	1	0
+rmt_slave	DownloadPart	0	2
diff --git a/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.sql b/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.sql
new file mode 100644
index 00000000000..548a8e5570a
--- /dev/null
+++ b/tests/queries/0_stateless/03002_part_log_rmt_fetch_merge_error.sql
@@ -0,0 +1,35 @@
+-- Tags: no-replicated-database, no-parallel, no-shared-merge-tree
+-- SMT: The merge process is completely different from RMT
+
+drop table if exists rmt_master;
+drop table if exists rmt_slave;
+
+create table rmt_master (key Int) engine=ReplicatedMergeTree('/clickhouse/{database}', 'master') order by key settings always_fetch_merged_part=0;
+-- always_fetch_merged_part=1, consider this table as a "slave"
+create table rmt_slave (key Int) engine=ReplicatedMergeTree('/clickhouse/{database}', 'slave') order by key settings always_fetch_merged_part=1;
+
+insert into rmt_master values (1);
+
+system sync replica rmt_master;
+system sync replica rmt_slave;
+system stop replicated sends rmt_master;
+optimize table rmt_master final settings alter_sync=1, optimize_throw_if_noop=1;
+
+select sleep(3) format Null;
+
+system flush logs;
+select 'before';
+select table, event_type, error>0, countIf(error=0) from system.part_log where database = currentDatabase() group by 1, 2, 3 order by 1, 2, 3;
+
+system start replicated sends rmt_master;
+-- sleep few seconds to try rmt_slave to fetch the part and reflect this error
+-- in system.part_log
+select sleep(3) format Null;
+system sync replica rmt_slave;
+
+system flush logs;
+select 'after';
+select table, event_type, error>0, countIf(error=0) from system.part_log where database = currentDatabase() group by 1, 2, 3 order by 1, 2, 3;
+
+drop table rmt_master;
+drop table rmt_slave;
diff --git a/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.reference b/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.reference
new file mode 100644
index 00000000000..aac9e7527d1
--- /dev/null
+++ b/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.reference
@@ -0,0 +1,10 @@
+before
+rmt_master	NewPart	0	1
+rmt_master	MutatePart	0	1
+rmt_slave	DownloadPart	0	1
+rmt_slave	MutatePart	1	0
+after
+rmt_master	NewPart	0	1
+rmt_master	MutatePart	0	1
+rmt_slave	DownloadPart	0	2
+rmt_slave	MutatePart	1	0
diff --git a/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.sql b/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.sql
new file mode 100644
index 00000000000..34ba034f798
--- /dev/null
+++ b/tests/queries/0_stateless/03002_part_log_rmt_fetch_mutate_error.sql
@@ -0,0 +1,41 @@
+-- Tags: no-replicated-database, no-parallel, no-shared-merge-tree
+-- SMT: The merge process is completely different from RMT
+
+drop table if exists rmt_master;
+drop table if exists rmt_slave;
+
+create table rmt_master (key Int) engine=ReplicatedMergeTree('/clickhouse/{database}', 'master') order by tuple() settings always_fetch_merged_part=0;
+-- prefer_fetch_merged_part_*_threshold=0, consider this table as a "slave"
+create table rmt_slave (key Int) engine=ReplicatedMergeTree('/clickhouse/{database}', 'slave') order by tuple() settings prefer_fetch_merged_part_time_threshold=0, prefer_fetch_merged_part_size_threshold=0;
+
+insert into rmt_master values (1);
+
+system sync replica rmt_master;
+system sync replica rmt_slave;
+system stop replicated sends rmt_master;
+system stop pulling replication log rmt_slave;
+alter table rmt_master update key=key+100 where 1 settings alter_sync=1;
+
+-- first we need to make the rmt_master execute mutation so that it will have
+-- the part, and rmt_slave will consider it instead of performing mutation on
+-- it's own, otherwise prefer_fetch_merged_part_*_threshold will be simply ignored
+select sleep(3) format Null;
+system start pulling replication log rmt_slave;
+-- and sleep few more seconds to try rmt_slave to fetch the part and reflect
+-- this error in system.part_log
+select sleep(3) format Null;
+
+system flush logs;
+select 'before';
+select table, event_type, error>0, countIf(error=0) from system.part_log where database = currentDatabase() group by 1, 2, 3 order by 1, 2, 3;
+
+system start replicated sends rmt_master;
+select sleep(3) format Null;
+system sync replica rmt_slave;
+
+system flush logs;
+select 'after';
+select table, event_type, error>0, countIf(error=0) from system.part_log where database = currentDatabase() group by 1, 2, 3 order by 1, 2, 3;
+
+drop table rmt_master;
+drop table rmt_slave;
diff --git a/tests/queries/0_stateless/03002_sample_factor_where.reference b/tests/queries/0_stateless/03002_sample_factor_where.reference
new file mode 100644
index 00000000000..2f0d8589603
--- /dev/null
+++ b/tests/queries/0_stateless/03002_sample_factor_where.reference
@@ -0,0 +1,3 @@
+2
+0
+0
diff --git a/tests/queries/0_stateless/03002_sample_factor_where.sql b/tests/queries/0_stateless/03002_sample_factor_where.sql
new file mode 100644
index 00000000000..6430034349a
--- /dev/null
+++ b/tests/queries/0_stateless/03002_sample_factor_where.sql
@@ -0,0 +1,11 @@
+DROP TABLE IF EXISTS t_sample_factor;
+
+CREATE TABLE t_sample_factor(a UInt64, b UInt64) ENGINE = MergeTree ORDER BY (a, b) SAMPLE BY b;
+INSERT INTO t_sample_factor(a, b) VALUES (1, 2), (3, 4);
+
+SELECT uniq(b) * any(_sample_factor) FROM t_sample_factor SAMPLE 200000;
+
+SELECT uniq(b) * any(_sample_factor) FROM t_sample_factor SAMPLE 200000 WHERE a < -1;
+SELECT uniq(b) * any(_sample_factor) FROM t_sample_factor SAMPLE 200000 PREWHERE a < -1;
+
+DROP TABLE t_sample_factor;
diff --git a/tests/queries/0_stateless/03003_analyzer_setting.reference b/tests/queries/0_stateless/03003_analyzer_setting.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03003_analyzer_setting.sql b/tests/queries/0_stateless/03003_analyzer_setting.sql
new file mode 100644
index 00000000000..2e5cab71277
--- /dev/null
+++ b/tests/queries/0_stateless/03003_analyzer_setting.sql
@@ -0,0 +1,9 @@
+CREATE TABLE test (dummy Int8) ENGINE = Distributed(test_cluster_two_shards, 'system', 'one');
+
+SET allow_experimental_analyzer = 0;
+
+SELECT * FROM (SELECT * FROM test SETTINGS allow_experimental_analyzer = 1); -- { serverError INCORRECT_QUERY }
+
+SET allow_experimental_analyzer = 1;
+
+SELECT * FROM (SELECT * FROM test SETTINGS allow_experimental_analyzer = 0); -- { serverError INCORRECT_QUERY }
diff --git a/tests/queries/0_stateless/03003_arrayEnumerate_crash.reference b/tests/queries/0_stateless/03003_arrayEnumerate_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03003_arrayEnumerate_crash.sql b/tests/queries/0_stateless/03003_arrayEnumerate_crash.sql
new file mode 100644
index 00000000000..21102ddbb6a
--- /dev/null
+++ b/tests/queries/0_stateless/03003_arrayEnumerate_crash.sql
@@ -0,0 +1,2 @@
+SELECT arrayEnumerateUniqRanked(arrayEnumerateUniqRanked([[1, 2, 3], [2, 2, 1], [3]]), materialize(1 AS x) OR toLowCardinality(-9223372036854775808)); -- { serverError BAD_ARGUMENTS }
+SELECT arrayEnumerateUniqRanked([[1, 2, 3], [2, 2, 1], [3]], number) FROM numbers(10); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.reference b/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.reference
new file mode 100644
index 00000000000..93d120dac01
--- /dev/null
+++ b/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.reference
@@ -0,0 +1,2 @@
+Too large
+Wrong data
diff --git a/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.sh b/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.sh
new file mode 100755
index 00000000000..93290f62c58
--- /dev/null
+++ b/tests/queries/0_stateless/03003_codec_multiple_buffer_overflow.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
+
+echo -ne 'checksumchecksum\x91\xa4\x0a\x00\x00\x41\x00\x00\x20\x41\x41\x41\x40\x41\x00\x41\x41\x41\x41\x40\x41\x00\x00\x00\x00\x00\x0c\x00\x20\x41\x41\xbe\x22\x41\x41\x41\x41\x41\x00\x00\x00\x00\x00\x01\xfe\x7f\x00\x00\x41\x00\x00\x00\x41\x92\x6b\x00\x41\x41\x0b\x00\x00\x00\x00\x00\x41\x92\x6b\x00\x41\x41\x0b\x00\x00\x82\x82\x82\x82\x63\x82\xff\xff\xff\xff\xff\xff\xff\xff\x95\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x41\x41\x41\x41\x41\x41\x41\x41\x41\x40\x08\x08\x08\x08\x08\x08\x00\x06\x00\x00\x00\x08\x00\x20\x00\x00\xef\xff\xff\xff\xe1\x40\x26\x41\x00\x1d\x01\x00\x00\x41\x42\x0b\xff\xff\xff\xe4\x41\x41\x4e\x41\x41\x06\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x7e\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x00\x04\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x9c\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x4f\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x31\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x6c\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\xa9\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x4f\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x5c\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x6c\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x9b\x8f\x8f\x8f\x20\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f\x8f' |
+    ${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&decompress=1&http_native_compression_disable_checksumming_on_decompress=1" --data-binary @- | grep -o -F 'Too large'
+
+echo -ne 'checksumchecksum\x91\x2b\x01\x00\x00\xbe\xe1\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x02\x00\x04\x04\x04\x00\x08\x7f\x00\x01\x06\x82\x82\x82\x82\x82\x82\x82\x80\x41\x41\x41\x41\x41\x9a\x75\x6d\x63\x68\x65\x63\x6b\x73\x6d\x63\x68\x65\x63\x6b\x73\x75\x00\x00\x00\x41\x41\x41\x42\x64\x41\x41\x41\x0c\x00\x1c\x41\x41\xbe\x22\x41\x41\x00\x00\x00\x00\x11\x00\x41\x41\x75\x00\x00\x00\x41\x41\x41\x42\x64\x41\x41\x41\x0c\x00\x20\x41\x41\xbe\x22\x41\x41\x41\x41\x41\x00\x00\x00\x00\x00\x01\x14\xff\x7f\x00\x41\x00\x00\x00\x00\x00\x00\x41\x41\x75\x00\x00\x00\x41\x41\x41\x42\x64\x41\x61\x41\x0c\x00\x20\x41\x41\xbe\x22\x41\x41\x41\x00\x41\x14\x14\x41\x14\x14\x14\x14\x14\x14\x14\x14\x14\x14\x14\x0f\x0f\x0f\x0f\x0f\x41\x41\x41\x41\x64\x00\x30\x00\xcf\x00\x00\x00\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x41\x41\x0b\x00\x00\x00\x41\x41\x41\xe8\x1f\xe1\x00\x01\x00\xff\x00\x41\x41\xbf\x41\x41\x40\x40\xe1\x00\x00\x00\x00\x1a\x00\x20\x00\x00\x00\x41\x00\x00\x00\x42\x64\x41\x41\x41\x0c\x00\x1c\x41\x41\xbe\x22\x41\x41\x00\x00\x00\x00\x00\x00\x41\x41\x75\x00\x00\x00\x41\x41\x41\x42\x64\x00\x00\x0b\x00\xe6\xff\x00\x00\x00\x00\x00' |
+    ${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&decompress=1&http_native_compression_disable_checksumming_on_decompress=1" --data-binary @- | grep -o -F 'Wrong data'
diff --git a/tests/queries/0_stateless/03003_compatibility_setting_bad_value.reference b/tests/queries/0_stateless/03003_compatibility_setting_bad_value.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03003_compatibility_setting_bad_value.sql b/tests/queries/0_stateless/03003_compatibility_setting_bad_value.sql
new file mode 100644
index 00000000000..48e98798c51
--- /dev/null
+++ b/tests/queries/0_stateless/03003_compatibility_setting_bad_value.sql
@@ -0,0 +1,2 @@
+select 42 settings compatibility=NULL;  -- {clientError BAD_ARGUMENTS}
+
diff --git a/tests/queries/0_stateless/03003_database_filesystem_format_detection.reference b/tests/queries/0_stateless/03003_database_filesystem_format_detection.reference
new file mode 100644
index 00000000000..87d15e83593
--- /dev/null
+++ b/tests/queries/0_stateless/03003_database_filesystem_format_detection.reference
@@ -0,0 +1,2 @@
+a	Nullable(Int64)					
+42
diff --git a/tests/queries/0_stateless/03003_database_filesystem_format_detection.sh b/tests/queries/0_stateless/03003_database_filesystem_format_detection.sh
new file mode 100755
index 00000000000..8b476a1f82e
--- /dev/null
+++ b/tests/queries/0_stateless/03003_database_filesystem_format_detection.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
+
+
+DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.data
+
+echo '{"a" : 42}' > $DATA_FILE
+$CLICKHOUSE_LOCAL -q "desc table \`$DATA_FILE\`"
+$CLICKHOUSE_LOCAL -q "select * from \`$DATA_FILE\`"
+
+rm $DATA_FILE
+
diff --git a/tests/queries/0_stateless/03003_enum_and_string_compatible.reference b/tests/queries/0_stateless/03003_enum_and_string_compatible.reference
new file mode 100644
index 00000000000..acf5fe0d423
--- /dev/null
+++ b/tests/queries/0_stateless/03003_enum_and_string_compatible.reference
@@ -0,0 +1 @@
+['Hello','Goodbye','test']
diff --git a/tests/queries/0_stateless/03003_enum_and_string_compatible.sql b/tests/queries/0_stateless/03003_enum_and_string_compatible.sql
new file mode 100644
index 00000000000..0abba6741ac
--- /dev/null
+++ b/tests/queries/0_stateless/03003_enum_and_string_compatible.sql
@@ -0,0 +1 @@
+WITH 'Hello'::Enum8('Hello', 'World') AS enum1, 'test'::Enum8('test', 'best') AS enum2 SELECT [enum1, 'Goodbye', enum2];
diff --git a/tests/queries/0_stateless/03003_prql_panic.reference b/tests/queries/0_stateless/03003_prql_panic.reference
new file mode 100644
index 00000000000..8e0782c44f2
--- /dev/null
+++ b/tests/queries/0_stateless/03003_prql_panic.reference
@@ -0,0 +1 @@
+SYNTAX_ERROR
diff --git a/tests/queries/0_stateless/03003_prql_panic.sh b/tests/queries/0_stateless/03003_prql_panic.sh
new file mode 100755
index 00000000000..01d7beed99b
--- /dev/null
+++ b/tests/queries/0_stateless/03003_prql_panic.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+# Requires Rust, which is not built for Fast Test.
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+# Before [1] this causes a panic, but it will be fixed soon, so do not check
+# for panic, but just for SYNTAX_ERROR.
+#
+#   [1]: https://github.com/PRQL/prql/pull/4285
+$CLICKHOUSE_CLIENT --dialect prql -q "SELECT id FROM distributed_test_table GROUP BY x -> concat(concat(materialize(toNullable(NULL)))) LIMIT 3" |& grep -o -m1 SYNTAX_ERROR
diff --git a/tests/queries/0_stateless/03003_sql_json_nonsense.reference b/tests/queries/0_stateless/03003_sql_json_nonsense.reference
new file mode 100644
index 00000000000..8b137891791
--- /dev/null
+++ b/tests/queries/0_stateless/03003_sql_json_nonsense.reference
@@ -0,0 +1 @@
+
diff --git a/tests/queries/0_stateless/03003_sql_json_nonsense.sql b/tests/queries/0_stateless/03003_sql_json_nonsense.sql
new file mode 100644
index 00000000000..9b7beb42cf3
--- /dev/null
+++ b/tests/queries/0_stateless/03003_sql_json_nonsense.sql
@@ -0,0 +1 @@
+SELECT JSON_QUERY('{"x":1}', '$[\'hello\']', materialize(toLowCardinality('x')));
diff --git a/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.reference b/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.reference
new file mode 100644
index 00000000000..0318b136ade
--- /dev/null
+++ b/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.reference
@@ -0,0 +1,3 @@
+obj	Tuple(\n    a Nullable(String))					
+('42')
+('{"b" : 42}')
diff --git a/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.sql b/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.sql
new file mode 100644
index 00000000000..4b986c94868
--- /dev/null
+++ b/tests/queries/0_stateless/03004_json_named_tuples_inference_ambiguous_paths_as_string.sql
@@ -0,0 +1,4 @@
+set input_format_json_use_string_type_for_ambiguous_paths_in_named_tuples_inference_from_objects=1;
+desc format(JSONEachRow, '{"obj" : {"a" : 42}}, {"obj" : {"a" : {"b" : 42}}}');
+select * from format(JSONEachRow, '{"obj" : {"a" : 42}}, {"obj" : {"a" : {"b" : 42}}}');
+
diff --git a/tests/queries/0_stateless/03005_input_function_in_join.reference b/tests/queries/0_stateless/03005_input_function_in_join.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/03005_input_function_in_join.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/03005_input_function_in_join.sql b/tests/queries/0_stateless/03005_input_function_in_join.sql
new file mode 100644
index 00000000000..8a6b4a48a8d
--- /dev/null
+++ b/tests/queries/0_stateless/03005_input_function_in_join.sql
@@ -0,0 +1,14 @@
+drop table if exists test;
+create table test (a Int8) engine = MergeTree order by tuple();
+INSERT INTO test
+SELECT x.number FROM (
+ SELECT number
+ FROM system.numbers
+ LIMIT 10
+) AS x
+INNER JOIN input('a UInt64') AS y ON x.number = y.a
+Format CSV 2
+;
+select * from test;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03006_analyzer_executable_table_function.reference b/tests/queries/0_stateless/03006_analyzer_executable_table_function.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03006_analyzer_executable_table_function.sql b/tests/queries/0_stateless/03006_analyzer_executable_table_function.sql
new file mode 100644
index 00000000000..4edbcc97f50
--- /dev/null
+++ b/tests/queries/0_stateless/03006_analyzer_executable_table_function.sql
@@ -0,0 +1,4 @@
+SELECT
+    toFixedString(toFixedString(toLowCardinality(toFixedString('--------------------', toNullable(20))), toLowCardinality(20)), 20),
+    *
+FROM executable('data String', SETTINGS max_command_execution_time = 100); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH}
diff --git a/tests/queries/0_stateless/03006_async_insert_deadlock_log.reference b/tests/queries/0_stateless/03006_async_insert_deadlock_log.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03006_async_insert_deadlock_log.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03006_async_insert_deadlock_log.sh b/tests/queries/0_stateless/03006_async_insert_deadlock_log.sh
new file mode 100755
index 00000000000..f01c34cdbda
--- /dev/null
+++ b/tests/queries/0_stateless/03006_async_insert_deadlock_log.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_CLIENT --query "CREATE TABLE t_async_insert_deadlock (a UInt64) ENGINE = Log"
+
+echo '{"a": 1}' | $CLICKHOUSE_CLIENT --async_insert 1 --wait_for_async_insert 1 --query "INSERT INTO t_async_insert_deadlock FORMAT JSONEachRow"
+
+$CLICKHOUSE_CLIENT --query "SELECT * FROM t_async_insert_deadlock ORDER BY a"
+$CLICKHOUSE_CLIENT --query "DROP TABLE t_async_insert_deadlock"
diff --git a/tests/queries/0_stateless/03006_buffer_overflow_join.reference b/tests/queries/0_stateless/03006_buffer_overflow_join.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03006_buffer_overflow_join.sql b/tests/queries/0_stateless/03006_buffer_overflow_join.sql
new file mode 100644
index 00000000000..8c1fa3cecc0
--- /dev/null
+++ b/tests/queries/0_stateless/03006_buffer_overflow_join.sql
@@ -0,0 +1,6 @@
+CREATE TABLE 03006_buffer_overflow_l (`a` String, `b` Tuple(String, String)) ENGINE = Memory;
+INSERT INTO 03006_buffer_overflow_l SELECT * FROM generateRandom() limit 1000;
+CREATE TABLE 03006_buffer_overflow_r (`a` LowCardinality(Nullable(String)), `c` Tuple(LowCardinality(String), LowCardinality(String))) ENGINE = Memory;
+INSERT INTO 03006_buffer_overflow_r SELECT * FROM generateRandom() limit 1000;
+
+SELECT a FROM 03006_buffer_overflow_l RIGHT JOIN 03006_buffer_overflow_r USING (a) ORDER BY a ASC NULLS FIRST FORMAT Null;
diff --git a/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.reference b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
new file mode 100755
index 00000000000..8c79dfdbafc
--- /dev/null
+++ b/tests/queries/0_stateless/03006_correct_revoke_for_partial_rights.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+db=${CLICKHOUSE_DATABASE}
+user1="user1_03006_${db}_$RANDOM"
+user2="user2_03006_${db}_$RANDOM"
+
+${CLICKHOUSE_CLIENT} --multiquery <<EOF
+DROP DATABASE IF EXISTS $db;
+CREATE DATABASE $db;
+CREATE USER $user1, $user2;
+
+GRANT SELECT ON *.* TO $user2 WITH GRANT OPTION;
+REVOKE SELECT ON system.* FROM $user2;
+EOF
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "GRANT CURRENT GRANTS ON *.* TO $user1"
+${CLICKHOUSE_CLIENT} --user $user2 --query "REVOKE ALL ON *.* FROM $user1"
+${CLICKHOUSE_CLIENT} --query "SHOW GRANTS FOR $user1"
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "GRANT CURRENT GRANTS ON *.* TO $user1"
+${CLICKHOUSE_CLIENT} --query "REVOKE ALL ON $db.* FROM $user1"
+${CLICKHOUSE_CLIENT} --user $user2 --query "REVOKE ALL ON *.* FROM $user1"
+${CLICKHOUSE_CLIENT} --query "SHOW GRANTS FOR $user1"
+
+${CLICKHOUSE_CLIENT} --user $user2 --query "GRANT CURRENT GRANTS ON *.* TO $user1"
+${CLICKHOUSE_CLIENT} --query "REVOKE ALL ON $db.* FROM $user2"
+${CLICKHOUSE_CLIENT} --user $user2 --query "REVOKE ALL ON *.* FROM $user1" 2>&1 | grep -c "ACCESS_DENIED"
+
+${CLICKHOUSE_CLIENT} --query "DROP DATABASE IF EXISTS $db"
diff --git a/tests/queries/0_stateless/03006_mv_deduplication_throw_if_async_insert.reference b/tests/queries/0_stateless/03006_mv_deduplication_throw_if_async_insert.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03006_mv_deduplication_throw_if_async_insert.sql b/tests/queries/0_stateless/03006_mv_deduplication_throw_if_async_insert.sql
new file mode 100644
index 00000000000..808317c917e
--- /dev/null
+++ b/tests/queries/0_stateless/03006_mv_deduplication_throw_if_async_insert.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS 02985_test;
+
+SET async_insert = 1;
+SET deduplicate_blocks_in_dependent_materialized_views = 1;
+
+CREATE TABLE 03006_test
+(
+    d Date,
+    value UInt64
+)
+ENGINE = MergeTree ORDER BY tuple();
+
+INSERT INTO 03006_test VALUES ('2024-03-05', 1), ('2024-03-05', 2), ('2024-03-05', 1);  -- { serverError SUPPORT_IS_DISABLED  }
+INSERT INTO 03006_test SETTINGS compatibility='24.1' VALUES ('2024-03-05', 1), ('2024-03-05', 2), ('2024-03-05', 1);
+INSERT INTO 03006_test SETTINGS async_insert=0 VALUES ('2024-03-05', 1), ('2024-03-05', 2), ('2024-03-05', 1);
+INSERT INTO 03006_test SETTINGS deduplicate_blocks_in_dependent_materialized_views=0 VALUES ('2024-03-05', 1), ('2024-03-05', 2), ('2024-03-05', 1);
+INSERT INTO 03006_test SETTINGS throw_if_deduplication_in_dependent_materialized_views_enabled_with_async_insert=0 VALUES ('2024-03-05', 1), ('2024-03-05', 2), ('2024-03-05', 1);
+
+DROP TABLE IF EXISTS 02985_test;
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.reference b/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.reference
new file mode 100644
index 00000000000..078890722fd
--- /dev/null
+++ b/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.reference
@@ -0,0 +1,15 @@
+WITH
+    cte1 AS
+    (
+        SELECT n
+        FROM numbers_1e6__fuzz_34
+    ),
+    cte2 AS
+    (
+        SELECT n
+        FROM numbers_1e6__fuzz_33
+        PREWHERE n IN cte1
+    )
+SELECT count()
+FROM
+cte2
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.sql b/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.sql
new file mode 100644
index 00000000000..df4ec9d26a3
--- /dev/null
+++ b/tests/queries/0_stateless/03006_parallel_replicas_cte_explain_syntax_crash.sql
@@ -0,0 +1,43 @@
+DROP TABLE IF EXISTS numbers_1e6__fuzz_34;
+DROP TABLE IF EXISTS numbers_1e6__fuzz_33;
+
+CREATE TABLE numbers_1e6__fuzz_34
+(
+    n UInt64
+)
+ENGINE = MergeTree
+ORDER BY n
+AS SELECT *
+FROM numbers(10);
+
+
+CREATE TABLE numbers_1e6__fuzz_33
+(
+    n UInt64
+)
+ENGINE = MergeTree
+ORDER BY n
+AS SELECT *
+FROM numbers(10);
+
+SET allow_experimental_analyzer = 1;
+SET allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3, parallel_replicas_min_number_of_rows_per_replica=0;
+
+EXPLAIN SYNTAX
+WITH
+    cte1 AS
+    (
+        SELECT n
+        FROM numbers_1e6__fuzz_34
+    ),
+    cte2 AS
+    (
+        SELECT n
+        FROM numbers_1e6__fuzz_33
+        PREWHERE n IN (cte1)
+    )
+SELECT count()
+FROM cte2;
+
+DROP TABLE numbers_1e6__fuzz_34;
+DROP TABLE numbers_1e6__fuzz_33;
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql
new file mode 100644
index 00000000000..4b84646c034
--- /dev/null
+++ b/tests/queries/0_stateless/03006_parallel_replicas_prewhere.sql
@@ -0,0 +1,31 @@
+DROP POLICY IF EXISTS url_na_log_policy0 ON url_na_log;
+DROP TABLE IF EXISTS url_na_log;
+
+CREATE TABLE url_na_log
+(
+    `SiteId` UInt32,
+    `DateVisit` Date
+)
+ENGINE = MergeTree
+PRIMARY KEY SiteId
+ORDER BY (SiteId, DateVisit)
+SETTINGS index_granularity = 1000, min_bytes_for_wide_part = 0;
+
+CREATE ROW POLICY url_na_log_policy0 ON url_na_log FOR SELECT USING (DateVisit < '2022-08-11') OR (DateVisit > '2022-08-19') TO default;
+
+INSERT INTO url_na_log
+SETTINGS max_insert_block_size = 200000
+SELECT
+    209,
+    CAST('2022-08-09', 'Date') + toIntervalDay(intDiv(number, 10000))
+FROM numbers(130000)
+SETTINGS max_insert_block_size = 200000;
+
+EXPLAIN ESTIMATE
+SELECT count()
+FROM url_na_log
+PREWHERE (DateVisit >= toFixedString('2022-08-10', 10)) AND (DateVisit <= '2022-08-20')
+SETTINGS max_block_size = 1048576, max_threads = 1, allow_experimental_parallel_reading_from_replicas = 1, parallel_replicas_for_non_replicated_merge_tree = 1, cluster_for_parallel_replicas = 'test_cluster_one_shard_three_replicas_localhost', max_parallel_replicas = 3, parallel_replicas_min_number_of_rows_per_replica=10000;
+
+DROP POLICY url_na_log_policy0 ON url_na_log;
+DROP TABLE url_na_log;
diff --git a/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.reference b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.reference
new file mode 100644
index 00000000000..bead7ee1474
--- /dev/null
+++ b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.reference
@@ -0,0 +1,3 @@
+\N	1000
+
+\N	1000
diff --git a/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql
new file mode 100644
index 00000000000..9479044e0e0
--- /dev/null
+++ b/tests/queries/0_stateless/03007_column_nullable_uninitialzed_value.sql
@@ -0,0 +1 @@
+SELECT count(NULL) IGNORE NULLS > avg(toDecimal32(NULL)) IGNORE NULLS, count() FROM numbers(1000) WITH TOTALS SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.reference b/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.reference
new file mode 100644
index 00000000000..8233925d609
--- /dev/null
+++ b/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.reference
@@ -0,0 +1,55 @@
+-- count
+100000	all_10_10_0
+100000	all_1_1_0
+100000	all_2_2_0
+100000	all_3_3_0
+100000	all_4_4_0
+100000	all_5_5_0
+100000	all_6_6_0
+100000	all_7_7_0
+100000	all_8_8_0
+100000	all_9_9_0
+-- rand()%2=0:
+1	all_10_10_0
+1	all_1_1_0
+1	all_2_2_0
+1	all_3_3_0
+1	all_4_4_0
+1	all_5_5_0
+1	all_6_6_0
+1	all_7_7_0
+1	all_8_8_0
+1	all_9_9_0
+-- optimize_use_implicit_projections=0
+1	all_10_10_0
+1	all_1_1_0
+1	all_2_2_0
+1	all_3_3_0
+1	all_4_4_0
+1	all_5_5_0
+1	all_6_6_0
+1	all_7_7_0
+1	all_8_8_0
+1	all_9_9_0
+-- optimize_trivial_count_query=0
+1	all_10_10_0
+1	all_1_1_0
+1	all_2_2_0
+1	all_3_3_0
+1	all_4_4_0
+1	all_5_5_0
+1	all_6_6_0
+1	all_7_7_0
+1	all_8_8_0
+1	all_9_9_0
+-- optimize_trivial_count_query=0, optimize_use_implicit_projections=0
+1	all_10_10_0
+1	all_1_1_0
+1	all_2_2_0
+1	all_3_3_0
+1	all_4_4_0
+1	all_5_5_0
+1	all_6_6_0
+1	all_7_7_0
+1	all_8_8_0
+1	all_9_9_0
diff --git a/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.sql b/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.sql
new file mode 100644
index 00000000000..3be9bc3982a
--- /dev/null
+++ b/tests/queries/0_stateless/03008_filter_projections_non_deterministoc_functions.sql
@@ -0,0 +1,28 @@
+create table test (number UInt64) engine=MergeTree order by number;
+system stop merges test;
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+INSERT INTO test select number from numbers(100000);
+
+select '-- count';
+SELECT count(), _part FROM test GROUP BY _part ORDER BY _part;
+
+select '-- rand()%2=0:';
+SELECT count() > 0 AND count() < 100000, _part FROM test WHERE rand(1)%2=1 GROUP BY _part ORDER BY _part;
+
+select '-- optimize_use_implicit_projections=0';
+SELECT count() > 0 AND count() < 100000, _part FROM test WHERE rand(2)%2=1 GROUP BY _part ORDER BY _part settings optimize_use_implicit_projections=0;
+
+select '-- optimize_trivial_count_query=0';
+SELECT count() > 0 AND count() < 100000, _part FROM test WHERE rand(3)%2=1 GROUP BY _part ORDER BY _part settings optimize_trivial_count_query=0;
+
+select '-- optimize_trivial_count_query=0, optimize_use_implicit_projections=0';
+SELECT count() > 0 AND count() < 100000, _part FROM test WHERE rand(4)%2=1 GROUP BY _part ORDER BY _part settings optimize_trivial_count_query=0,optimize_use_implicit_projections=0;
+
diff --git a/tests/queries/0_stateless/03008_groupSortedArray_field.reference b/tests/queries/0_stateless/03008_groupSortedArray_field.reference
new file mode 100644
index 00000000000..a7f89ebcf58
--- /dev/null
+++ b/tests/queries/0_stateless/03008_groupSortedArray_field.reference
@@ -0,0 +1,3 @@
+0A01003C79A557B3C43400C4865AA84C3B4B01000650BC18F7DE0B00FAAF43E708213401008ED706EA0A9F13007228F915F5602C0100C692CA8FB81405003A6D357047EB1A01008416B7C3239EE3FF7BE9483CDC61DC01003E133A7C081AF5FFC1ECC583F7E5EA01000000000000000000000000000000000100C4865AA84C3BCBFF3B79A557B3C4B4010024C46EF500F1ECFFDB3B910AFF0ED301005E2FC14EBAEAE5FFA1D03EB14515DA
+070109000000010600000001080000000103000000010500000001040000000107000000	AggregateFunction(groupArraySorted(10), Nullable(Decimal(3, 0)))
+[3,4,5,6,7,8,9]
diff --git a/tests/queries/0_stateless/03008_groupSortedArray_field.sql b/tests/queries/0_stateless/03008_groupSortedArray_field.sql
new file mode 100644
index 00000000000..6d2aea641a5
--- /dev/null
+++ b/tests/queries/0_stateless/03008_groupSortedArray_field.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61186
+SELECT hex(CAST(unhex('0A01003C79A557B3C43400C4865AA84C3B4B01000650BC18F7DE0B00FAAF43E708213401008ED706EA0A9F13007228F915F5602C0100C692CA8FB81405003A6D357047EB1A01008416B7C3239EE3FF7BE9483CDC61DC01003E133A7C081AF5FFC1ECC583F7E5EA01000000000000000000000000000000000100C4865AA84C3BCBFF3B79A557B3C4B4010024C46EF500F1ECFFDB3B910AFF0ED301005E2FC14EBAEAE5FFA1D03EB14515DA'),
+                'AggregateFunction(groupArraySorted(10), Decimal(38, 38))'));
+
+Select hex(groupArraySortedState(10)((number < 3 ? NULL : number)::Nullable(Decimal(3))) as t), toTypeName(t) from numbers(10);
+Select finalizeAggregation(unhex('070109000000010600000001080000000103000000010500000001040000000107000000')::AggregateFunction(groupArraySorted(10), Nullable(Decimal(3, 0))));
diff --git a/tests/queries/0_stateless/03008_index_small.reference b/tests/queries/0_stateless/03008_index_small.reference
new file mode 100644
index 00000000000..a5c8806279f
--- /dev/null
+++ b/tests/queries/0_stateless/03008_index_small.reference
@@ -0,0 +1,2 @@
+3
+3
diff --git a/tests/queries/0_stateless/03008_index_small.sql b/tests/queries/0_stateless/03008_index_small.sql
new file mode 100644
index 00000000000..72213ed4fc9
--- /dev/null
+++ b/tests/queries/0_stateless/03008_index_small.sql
@@ -0,0 +1,19 @@
+DROP TABLE IF EXISTS test;
+
+CREATE TABLE test (a UInt8, b UInt8) ENGINE = MergeTree ORDER BY (a, b)
+SETTINGS index_granularity = 1, primary_key_ratio_of_unique_prefix_values_to_skip_suffix_columns = 0.01;
+
+SET optimize_move_to_prewhere = 0;
+
+INSERT INTO test
+SELECT number DIV 2, number
+FROM numbers(3);
+
+SELECT count() FROM test WHERE b >= 0;
+
+DETACH TABLE test;
+ATTACH TABLE test;
+
+SELECT count() FROM test WHERE b >= 0;
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/03008_optimize_equal_ranges.reference b/tests/queries/0_stateless/03008_optimize_equal_ranges.reference
new file mode 100644
index 00000000000..fc7a4f3c118
--- /dev/null
+++ b/tests/queries/0_stateless/03008_optimize_equal_ranges.reference
@@ -0,0 +1,16 @@
+0	30000
+1	30000
+2	30000
+0	30000
+1	30000
+2	30000
+0	449985000
+1	449985000
+2	449985000
+0	449985000
+1	449985000
+2	449985000
+sum	1	1
+sum	16	1
+uniqExact	1	1
+uniqExact	16	0
diff --git a/tests/queries/0_stateless/03008_optimize_equal_ranges.sql b/tests/queries/0_stateless/03008_optimize_equal_ranges.sql
new file mode 100644
index 00000000000..6d769c7382a
--- /dev/null
+++ b/tests/queries/0_stateless/03008_optimize_equal_ranges.sql
@@ -0,0 +1,29 @@
+DROP TABLE IF EXISTS t_optimize_equal_ranges;
+
+CREATE TABLE t_optimize_equal_ranges (a UInt64, b String, c UInt64) ENGINE = MergeTree ORDER BY a;
+
+SET max_block_size = 1024;
+SET max_bytes_before_external_group_by = 0;
+SET optimize_aggregation_in_order = 0;
+SET optimize_use_projections = 0;
+
+INSERT INTO t_optimize_equal_ranges SELECT 0, toString(number), number FROM numbers(30000);
+INSERT INTO t_optimize_equal_ranges SELECT 1, toString(number), number FROM numbers(30000);
+INSERT INTO t_optimize_equal_ranges SELECT 2, toString(number), number FROM numbers(30000);
+
+SELECT a, uniqExact(b) FROM t_optimize_equal_ranges GROUP BY a ORDER BY a SETTINGS max_threads = 16;
+SELECT a, uniqExact(b) FROM t_optimize_equal_ranges GROUP BY a ORDER BY a SETTINGS max_threads = 1;
+SELECT a, sum(c) FROM t_optimize_equal_ranges GROUP BY a ORDER BY a SETTINGS max_threads = 16;
+SELECT a, sum(c) FROM t_optimize_equal_ranges GROUP BY a ORDER BY a SETTINGS max_threads = 1;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    used_aggregate_functions[1] AS func,
+    Settings['max_threads'] AS threads,
+    ProfileEvents['AggregationOptimizedEqualRangesOfKeys'] > 0
+FROM system.query_log
+WHERE type = 'QueryFinish' AND current_database = currentDatabase() AND query LIKE '%SELECT%FROM%t_optimize_equal_ranges%'
+ORDER BY func, threads;
+
+DROP TABLE t_optimize_equal_ranges;
diff --git a/tests/queries/0_stateless/03008_uniq_exact_equal_ranges.reference b/tests/queries/0_stateless/03008_uniq_exact_equal_ranges.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03008_uniq_exact_equal_ranges.sql b/tests/queries/0_stateless/03008_uniq_exact_equal_ranges.sql
new file mode 100644
index 00000000000..2e708f28cac
--- /dev/null
+++ b/tests/queries/0_stateless/03008_uniq_exact_equal_ranges.sql
@@ -0,0 +1,36 @@
+DROP TABLE IF EXISTS t_uniq_exact;
+
+CREATE TABLE t_uniq_exact (a UInt64, b String, c UInt64) ENGINE = MergeTree ORDER BY a;
+
+SET group_by_two_level_threshold_bytes = 1;
+SET group_by_two_level_threshold = 1;
+SET max_threads = 4;
+SET max_bytes_before_external_group_by = 0;
+SET optimize_aggregation_in_order = 0;
+
+INSERT INTO t_uniq_exact SELECT 0, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 1, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 2, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 3, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 4, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 5, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 6, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 7, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 8, randomPrintableASCII(5), rand() FROM numbers(300000);
+INSERT INTO t_uniq_exact SELECT 9, randomPrintableASCII(5), rand() FROM numbers(300000);
+
+OPTIMIZE TABLE t_uniq_exact FINAL;
+
+SELECT a, uniqExact(b) FROM t_uniq_exact GROUP BY a ORDER BY a
+SETTINGS min_hit_rate_to_use_consecutive_keys_optimization = 1.0
+EXCEPT
+SELECT a, uniqExact(b) FROM t_uniq_exact GROUP BY a ORDER BY a
+SETTINGS min_hit_rate_to_use_consecutive_keys_optimization = 0.5;
+
+SELECT a, sum(c) FROM t_uniq_exact GROUP BY a ORDER BY a
+SETTINGS min_hit_rate_to_use_consecutive_keys_optimization = 1.0
+EXCEPT
+SELECT a, sum(c) FROM t_uniq_exact GROUP BY a ORDER BY a
+SETTINGS min_hit_rate_to_use_consecutive_keys_optimization = 0.5;
+
+DROP TABLE t_uniq_exact;
diff --git a/tests/queries/0_stateless/03009_consecutive_keys_nullable.reference b/tests/queries/0_stateless/03009_consecutive_keys_nullable.reference
new file mode 100644
index 00000000000..e1b9e0cba62
--- /dev/null
+++ b/tests/queries/0_stateless/03009_consecutive_keys_nullable.reference
@@ -0,0 +1,16 @@
+1	2	0
+\N	1	1
+1	2	0
+\N	1	1
+\N	3	3
+1	3	0
+1	2	0
+\N	1	1
+1	1	0
+\N	2	2
+t_nullable_keys_1	0
+t_nullable_keys_2	0
+t_nullable_keys_3	1
+t_nullable_keys_4	1
+t_nullable_keys_5	0
+t_nullable_keys_6	0
diff --git a/tests/queries/0_stateless/03009_consecutive_keys_nullable.sql b/tests/queries/0_stateless/03009_consecutive_keys_nullable.sql
new file mode 100644
index 00000000000..7650cf14a49
--- /dev/null
+++ b/tests/queries/0_stateless/03009_consecutive_keys_nullable.sql
@@ -0,0 +1,56 @@
+DROP TABLE IF EXISTS t_nullable_keys_1;
+
+CREATE TABLE t_nullable_keys_1 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_1 VALUES (1), (1), (NULL);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_1 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_1;
+
+DROP TABLE IF EXISTS t_nullable_keys_2;
+
+CREATE TABLE t_nullable_keys_2 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_2 VALUES (NULL), (1), (1);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_2 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_2;
+
+DROP TABLE IF EXISTS t_nullable_keys_3;
+
+CREATE TABLE t_nullable_keys_3 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_3 VALUES (NULL), (NULL), (NULL);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_3 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_3;
+
+DROP TABLE IF EXISTS t_nullable_keys_4;
+
+CREATE TABLE t_nullable_keys_4 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_4 VALUES (1), (1), (1);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_4 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_4;
+
+DROP TABLE IF EXISTS t_nullable_keys_5;
+
+CREATE TABLE t_nullable_keys_5 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_5 VALUES (1), (NULL), (1);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_5 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_5;
+
+DROP TABLE IF EXISTS t_nullable_keys_6;
+
+CREATE TABLE t_nullable_keys_6 (x Nullable(Int64)) ENGINE = Memory;
+INSERT INTO t_nullable_keys_6 VALUES (NULL), (1), (NULL);
+SELECT x, count(), countIf(x IS NULL) FROM t_nullable_keys_6 GROUP BY x ORDER BY x;
+
+DROP TABLE t_nullable_keys_6;
+
+SYSTEM FLUSH LOGS;
+
+SELECT
+    splitByChar('.', tables[1])[2] AS table,
+    ProfileEvents['AggregationOptimizedEqualRangesOfKeys'] > 0
+FROM system.query_log
+WHERE type = 'QueryFinish' AND current_database = currentDatabase() AND query LIKE '%SELECT%FROM%t_nullable_keys_%'
+ORDER BY table;
diff --git a/tests/queries/0_stateless/03009_format_show_database.reference b/tests/queries/0_stateless/03009_format_show_database.reference
new file mode 100644
index 00000000000..83cfd4c1a68
--- /dev/null
+++ b/tests/queries/0_stateless/03009_format_show_database.reference
@@ -0,0 +1,2 @@
+CREATE DATABASE default
+UNKNOWN_DATABASE
diff --git a/tests/queries/0_stateless/03009_format_show_database.sh b/tests/queries/0_stateless/03009_format_show_database.sh
new file mode 100755
index 00000000000..7f33ad7b1e1
--- /dev/null
+++ b/tests/queries/0_stateless/03009_format_show_database.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL -q "show database default"
+$CLICKHOUSE_LOCAL -q "show database default2" 2>&1 | grep -o 'UNKNOWN_DATABASE'
diff --git a/tests/queries/0_stateless/03009_range_dict_get_or_default.reference b/tests/queries/0_stateless/03009_range_dict_get_or_default.reference
new file mode 100644
index 00000000000..0cfbf08886f
--- /dev/null
+++ b/tests/queries/0_stateless/03009_range_dict_get_or_default.reference
@@ -0,0 +1 @@
+2
diff --git a/tests/queries/0_stateless/03009_range_dict_get_or_default.sql b/tests/queries/0_stateless/03009_range_dict_get_or_default.sql
new file mode 100644
index 00000000000..1f4b4073b9f
--- /dev/null
+++ b/tests/queries/0_stateless/03009_range_dict_get_or_default.sql
@@ -0,0 +1,34 @@
+DROP DICTIONARY IF EXISTS range_dictionary;
+DROP TABLE IF EXISTS range_dictionary_nullable_source_table;
+
+
+CREATE TABLE range_dictionary_nullable_source_table
+(
+  key UInt64,
+  start_date Date,
+  end_date Date,
+  value Nullable(UInt64)
+)
+ENGINE = TinyLog;
+
+INSERT INTO range_dictionary_nullable_source_table VALUES (0, toDate('2019-05-05'), toDate('2019-05-20'), 0), (1, toDate('2019-05-05'), toDate('2019-05-20'), NULL);
+
+CREATE DICTIONARY range_dictionary
+(
+  key UInt64,
+  start_date Date,
+  end_date Date,
+  value Nullable(UInt64) DEFAULT NULL
+)
+PRIMARY KEY key
+SOURCE(CLICKHOUSE(HOST 'localhost' PORT tcpPort() TABLE 'range_dictionary_nullable_source_table'))
+LIFETIME(MIN 1 MAX 1000)
+LAYOUT(RANGE_HASHED())
+RANGE(MIN start_date MAX end_date);
+
+SELECT dictGetOrDefault('range_dictionary', 'value', toUInt64(2), toDate(toLowCardinality(materialize('2019-05-15'))), 2);
+
+
+DROP DICTIONARY IF EXISTS range_dictionary;
+DROP TABLE IF EXISTS range_dictionary_nullable_source_table;
+
diff --git a/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.reference b/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.reference
new file mode 100644
index 00000000000..20dda4fa15a
--- /dev/null
+++ b/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.reference
@@ -0,0 +1,16 @@
+TESTING BYTES
+8192
+9216
+9216
+65536
+TESTING ROWS
+50
+1000
+1020
+1100
+TESTING NO CIRCULAR-BUFFER
+8192
+9216
+17408
+82944
+TESTING INVALID SETTINGS
diff --git a/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.sql b/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.sql
new file mode 100644
index 00000000000..fa4ba96277d
--- /dev/null
+++ b/tests/queries/0_stateless/03009_storage_memory_circ_buffer_usage.sql
@@ -0,0 +1,63 @@
+SET max_block_size = 65409; -- Default value
+
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_bytes_to_keep = 4096, max_bytes_to_keep = 16384;
+
+SELECT 'TESTING BYTES';
+/* 1. testing oldest block doesn't get deleted because of min-threshold */
+INSERT INTO memory SELECT * FROM numbers(0, 1600);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 2. adding block that doesn't get deleted */
+INSERT INTO memory SELECT * FROM numbers(1000, 100);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 3. testing oldest block gets deleted - 9216 bytes - 1100 */
+INSERT INTO memory SELECT * FROM numbers(9000, 1000);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 4.check large block over-writes all bytes / rows */
+INSERT INTO memory SELECT * FROM numbers(9000, 10000);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_rows_to_keep = 100, max_rows_to_keep = 1000;
+
+SELECT 'TESTING ROWS';
+/* 1. add normal number of rows */
+INSERT INTO memory SELECT * FROM numbers(0, 50);
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 2. table should have 1000 */
+INSERT INTO memory SELECT * FROM numbers(50, 950);
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 3. table should have 1020 - removed first 50 */
+INSERT INTO memory SELECT * FROM numbers(2000, 70);
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+/* 4. check large block over-writes all rows */
+INSERT INTO memory SELECT * FROM numbers(3000, 1100);
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+SELECT 'TESTING NO CIRCULAR-BUFFER';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory;
+
+INSERT INTO memory SELECT * FROM numbers(0, 1600);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+INSERT INTO memory SELECT * FROM numbers(1000, 100);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+INSERT INTO memory SELECT * FROM numbers(9000, 1000);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+INSERT INTO memory SELECT * FROM numbers(9000, 10000);
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+SELECT 'TESTING INVALID SETTINGS';
+CREATE TABLE faulty_memory (i UInt32) ENGINE = Memory SETTINGS min_rows_to_keep = 100;  -- { serverError 452 }
+CREATE TABLE faulty_memory (i UInt32) ENGINE = Memory SETTINGS min_bytes_to_keep = 100; -- { serverError 452 }
+
+DROP TABLE memory;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03010_file_log_large_poll_batch_size.reference b/tests/queries/0_stateless/03010_file_log_large_poll_batch_size.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03010_file_log_large_poll_batch_size.sql b/tests/queries/0_stateless/03010_file_log_large_poll_batch_size.sql
new file mode 100644
index 00000000000..2663011f2ec
--- /dev/null
+++ b/tests/queries/0_stateless/03010_file_log_large_poll_batch_size.sql
@@ -0,0 +1,2 @@
+create table test (number UInt64) engine=FileLog('./user_files/data.jsonl', 'JSONEachRow') settings poll_max_batch_size=18446744073709; -- {serverError INVALID_SETTING_VALUE}
+
diff --git a/tests/queries/0_stateless/03010_read_system_parts_table_test.reference b/tests/queries/0_stateless/03010_read_system_parts_table_test.reference
new file mode 100644
index 00000000000..c2dd177f245
--- /dev/null
+++ b/tests/queries/0_stateless/03010_read_system_parts_table_test.reference
@@ -0,0 +1,10 @@
+00000000-0000-0000-0000-000000000000	1231_1_1_0
+00000000-0000-0000-0000-000000000000	6666_2_2_0
+00000000-0000-0000-0000-000000000000	1231_1_1_0	users
+00000000-0000-0000-0000-000000000000	6666_2_2_0	users
+00000000-0000-0000-0000-000000000000	1231_1_1_0	users	uid
+00000000-0000-0000-0000-000000000000	1231_1_1_0	users	name
+00000000-0000-0000-0000-000000000000	1231_1_1_0	users	age
+00000000-0000-0000-0000-000000000000	6666_2_2_0	users	uid
+00000000-0000-0000-0000-000000000000	6666_2_2_0	users	name
+00000000-0000-0000-0000-000000000000	6666_2_2_0	users	age
diff --git a/tests/queries/0_stateless/03010_read_system_parts_table_test.sql b/tests/queries/0_stateless/03010_read_system_parts_table_test.sql
new file mode 100644
index 00000000000..1f72c2a3d6a
--- /dev/null
+++ b/tests/queries/0_stateless/03010_read_system_parts_table_test.sql
@@ -0,0 +1,13 @@
+-- Tags: no-shared-merge-tree
+-- The parts might named differently with SMT
+DROP TABLE IF EXISTS users;
+CREATE TABLE users (uid Int16, name String, age Int16) ENGINE=MergeTree ORDER BY uid PARTITION BY uid;
+
+INSERT INTO users VALUES (1231, 'John', 33);
+INSERT INTO users VALUES (6666, 'Ksenia', 48);
+
+SELECT uuid, name from system.parts WHERE database = currentDatabase() AND table = 'users';
+
+SELECT uuid, name, table from system.parts WHERE database = currentDatabase() AND table = 'users' AND uuid = '00000000-0000-0000-0000-000000000000';
+SELECT uuid, name, table, column from system.parts_columns WHERE database = currentDatabase() AND table = 'users' AND uuid = '00000000-0000-0000-0000-000000000000';
+DROP TABLE IF EXISTS users;
diff --git a/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.reference b/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.reference
new file mode 100644
index 00000000000..d20634acf93
--- /dev/null
+++ b/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.reference
@@ -0,0 +1,114 @@
+(5,NULL)
+(5,NULL)
+((6150),3)
+(5,NULL)
+QUERY id: 0
+  PROJECTION COLUMNS
+    (sumIf(toNullable(1), equals(modulo(number, 2), 0)), NULL) Tuple(Nullable(UInt64), Nullable(Nothing))
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: tuple, function_type: ordinary, result_type: Tuple(Nullable(UInt64), Nullable(Nothing))
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sumIf, function_type: aggregate, result_type: Nullable(UInt64)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: Nullable(UInt8)
+                    EXPRESSION
+                      FUNCTION id: 7, function_name: toNullable, function_type: ordinary, result_type: Nullable(UInt8)
+                        ARGUMENTS
+                          LIST id: 8, nodes: 1
+                            CONSTANT id: 9, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        FUNCTION id: 12, function_name: modulo, function_type: ordinary, result_type: UInt8
+                          ARGUMENTS
+                            LIST id: 13, nodes: 2
+                              COLUMN id: 14, column_name: number, result_type: UInt64, source_id: 15
+                              CONSTANT id: 16, constant_value: UInt64_2, constant_value_type: UInt8
+                        CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+            CONSTANT id: 18, constant_value: NULL, constant_value_type: Nullable(Nothing)
+  JOIN TREE
+    TABLE_FUNCTION id: 15, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 19, nodes: 1
+          CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt8
+(5,NULL)
+QUERY id: 0
+  PROJECTION COLUMNS
+    (sum(if(equals(modulo(number, 2), 0), toNullable(1), 0)), NULL) Tuple(Nullable(UInt64), Nullable(Nothing))
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: tuple, function_type: ordinary, result_type: Tuple(Nullable(UInt64), Nullable(Nothing))
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: sumOrNullIf, function_type: aggregate, result_type: Nullable(UInt64)
+              ARGUMENTS
+                LIST id: 5, nodes: 2
+                  CONSTANT id: 6, constant_value: UInt64_1, constant_value_type: Nullable(UInt8)
+                    EXPRESSION
+                      FUNCTION id: 7, function_name: toNullable, function_type: ordinary, result_type: Nullable(UInt8)
+                        ARGUMENTS
+                          LIST id: 8, nodes: 1
+                            CONSTANT id: 9, constant_value: UInt64_1, constant_value_type: UInt8
+                  FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+                    ARGUMENTS
+                      LIST id: 11, nodes: 2
+                        FUNCTION id: 12, function_name: modulo, function_type: ordinary, result_type: UInt8
+                          ARGUMENTS
+                            LIST id: 13, nodes: 2
+                              COLUMN id: 14, column_name: number, result_type: UInt64, source_id: 15
+                              CONSTANT id: 16, constant_value: UInt64_2, constant_value_type: UInt8
+                        CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+            CONSTANT id: 18, constant_value: NULL, constant_value_type: Nullable(Nothing)
+  JOIN TREE
+    TABLE_FUNCTION id: 15, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 19, nodes: 1
+          CONSTANT id: 20, constant_value: UInt64_10, constant_value_type: UInt8
+((6150),3)
+QUERY id: 0
+  PROJECTION COLUMNS
+    ((sum(if(equals(modulo(number, 2), 0), toNullable(0), 123))), toUInt8(3)) Tuple(Tuple(Nullable(UInt64)), UInt8)
+  PROJECTION
+    LIST id: 1, nodes: 1
+      FUNCTION id: 2, function_name: tuple, function_type: ordinary, result_type: Tuple(Tuple(Nullable(UInt64)), UInt8)
+        ARGUMENTS
+          LIST id: 3, nodes: 2
+            FUNCTION id: 4, function_name: tuple, function_type: ordinary, result_type: Tuple(Nullable(UInt64))
+              ARGUMENTS
+                LIST id: 5, nodes: 1
+                  FUNCTION id: 6, function_name: sum, function_type: aggregate, nulls_action : IGNORE_NULLS, result_type: Nullable(UInt64)
+                    ARGUMENTS
+                      LIST id: 7, nodes: 1
+                        FUNCTION id: 8, function_name: if, function_type: ordinary, result_type: Nullable(UInt8)
+                          ARGUMENTS
+                            LIST id: 9, nodes: 3
+                              FUNCTION id: 10, function_name: equals, function_type: ordinary, result_type: UInt8
+                                ARGUMENTS
+                                  LIST id: 11, nodes: 2
+                                    FUNCTION id: 12, function_name: modulo, function_type: ordinary, result_type: UInt8
+                                      ARGUMENTS
+                                        LIST id: 13, nodes: 2
+                                          COLUMN id: 14, column_name: number, result_type: UInt64, source_id: 15
+                                          CONSTANT id: 16, constant_value: UInt64_2, constant_value_type: UInt8
+                                    CONSTANT id: 17, constant_value: UInt64_0, constant_value_type: UInt8
+                              CONSTANT id: 18, constant_value: UInt64_0, constant_value_type: Nullable(UInt8)
+                                EXPRESSION
+                                  FUNCTION id: 19, function_name: toNullable, function_type: ordinary, result_type: Nullable(UInt8)
+                                    ARGUMENTS
+                                      LIST id: 20, nodes: 1
+                                        CONSTANT id: 21, constant_value: UInt64_0, constant_value_type: UInt8
+                              CONSTANT id: 22, constant_value: UInt64_123, constant_value_type: UInt8
+            CONSTANT id: 23, constant_value: UInt64_3, constant_value_type: UInt8
+              EXPRESSION
+                FUNCTION id: 24, function_name: toUInt8, function_type: ordinary, result_type: UInt8
+                  ARGUMENTS
+                    LIST id: 25, nodes: 1
+                      CONSTANT id: 26, constant_value: UInt64_3, constant_value_type: UInt8
+  JOIN TREE
+    TABLE_FUNCTION id: 15, alias: __table1, table_function_name: numbers
+      ARGUMENTS
+        LIST id: 27, nodes: 1
+          CONSTANT id: 28, constant_value: UInt64_100, constant_value_type: UInt8
diff --git a/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.sql b/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.sql
new file mode 100644
index 00000000000..71a175faac8
--- /dev/null
+++ b/tests/queries/0_stateless/03010_sum_to_to_count_if_nullable.sql
@@ -0,0 +1,14 @@
+SET optimize_rewrite_sum_if_to_count_if = 1;
+
+SET allow_experimental_analyzer = 0;
+SELECT (sumIf(toNullable(1), (number % 2) = 0), NULL) FROM numbers(10);
+SELECT (sum(if((number % 2) = 0, toNullable(1), 0)), NULL) FROM numbers(10);
+SELECT (tuple(sum(if((number % 2) = 0, toNullable(0), 123)) IGNORE NULLS), toUInt8(3)) FROM numbers(100);
+
+SET allow_experimental_analyzer = 1;
+SELECT (sumIf(toNullable(1), (number % 2) = 0), NULL) FROM numbers(10);
+EXPLAIN QUERY TREE SELECT (sumIf(toNullable(1), (number % 2) = 0), NULL) FROM numbers(10);
+SELECT (sum(if((number % 2) = 0, toNullable(1), 0)), NULL) FROM numbers(10);
+EXPLAIN QUERY TREE SELECT (sum(if((number % 2) = 0, toNullable(1), 0)), NULL) FROM numbers(10);
+SELECT (tuple(sum(if((number % 2) = 0, toNullable(0), 123)) IGNORE NULLS), toUInt8(3)) FROM numbers(100);
+EXPLAIN QUERY TREE SELECT (tuple(sum(if((number % 2) = 0, toNullable(0), 123)) IGNORE NULLS), toUInt8(3)) FROM numbers(100);
diff --git a/tests/queries/0_stateless/03010_view_prewhere_in.reference b/tests/queries/0_stateless/03010_view_prewhere_in.reference
new file mode 100644
index 00000000000..01e79c32a8c
--- /dev/null
+++ b/tests/queries/0_stateless/03010_view_prewhere_in.reference
@@ -0,0 +1,3 @@
+1
+2
+3
diff --git a/tests/queries/0_stateless/03010_view_prewhere_in.sql b/tests/queries/0_stateless/03010_view_prewhere_in.sql
new file mode 100644
index 00000000000..799c07f31ce
--- /dev/null
+++ b/tests/queries/0_stateless/03010_view_prewhere_in.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS v;
+CREATE VIEW v (`date` UInt32,`value` UInt8) AS
+WITH
+    data AS (SELECT '' id LIMIT 0),
+    r AS (SELECT'' as id, 1::UInt8 as value)
+SELECT
+    now() as date,
+    value AND (data.id IN (SELECT '' as d from system.one)) AS value
+FROM data
+         LEFT JOIN r ON data.id = r.id;
+
+SELECT 1;
+SELECT date, value FROM v;
+SELECT 2;
+SELECT date, value FROM v ORDER BY date;
+SELECT 3;
+DROP TABLE v;
diff --git a/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.reference b/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.sql b/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.sql
new file mode 100644
index 00000000000..e9aced83ded
--- /dev/null
+++ b/tests/queries/0_stateless/03010_virtual_memory_mappings_asynchronous_metrics.sql
@@ -0,0 +1,4 @@
+-- Tags: no-replicated-database
+
+SELECT least(value, 0) FROM system.asynchronous_metrics WHERE metric = 'VMMaxMapCount';
+SELECT least(value, 0) FROM system.asynchronous_metrics WHERE metric = 'VMNumMaps';
diff --git a/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.reference b/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.sql b/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.sql
new file mode 100644
index 00000000000..cdd2da0f6d8
--- /dev/null
+++ b/tests/queries/0_stateless/03011_adaptative_timeout_compatibility.sql
@@ -0,0 +1 @@
+SELECT value from system.settings where name = 'async_insert_use_adaptive_busy_timeout' SETTINGS compatibility = '23.12';
diff --git a/tests/queries/0_stateless/03011_definitive_guide_to_cast.reference b/tests/queries/0_stateless/03011_definitive_guide_to_cast.reference
new file mode 100644
index 00000000000..7c875a24b6d
--- /dev/null
+++ b/tests/queries/0_stateless/03011_definitive_guide_to_cast.reference
@@ -0,0 +1,81 @@
+123
+2009-02-14 00:31:30
+[1,2,3]
+123	Nullable(UInt8)
+\N	Nullable(UInt8)
+1
+255
+['Hello','wo\'rld\\']
+Hello	wo\\\'rld\\\\
+wo\'rld\\	wo\\\'rld\\\\
+133	210
+210
+[123,456]
+1	-1
+[]	[]	Array(Nothing)	Array(Array(Array(Tuple(UInt64, String))))
+1970-01-01 01:00:00
+2009-02-14 00:31:30.123456
+1970-01-01 00:59:59.888889
+2009-02-14 00:31:30
+1970-01-01 01:00:00
+2299-12-31 23:59:59.000000
+2009-02-14
+2009-02-14
+123\0\0
+123
+123
+123
+123
+123
+123
+123
+123
+123
+123
+String	123
+123	UInt8
+200	UInt8
+123
+123
+1.1
+1.10000000000000016387
+18446744073709551615
+[1.1,2.3]
+[1.10000000000000016387,2.29999999999999967236]
+Row 1:
+──────
+CAST('1.1', 'Decimal(30, 20)'): 1.1
+CAST('1.1', 'Decimal(30, 20)'): 1.1
+CAST(plus(1, 1), 'UInt8'):      2
+-1
+\N
+0
+0
+1970-01-01 01:00:00
+255
+123
+Hello\0\0\0\0\0
+Hello\0\0\0\0\0
+123.45
+2024-04-25 01:02:03
+2024-04-25 01:02:03.000000
+2024-04-25 01:02:03
+2024-04-25 01:02:03.456789
+2024-03-16 11:01:25
+2024-03-16 19:01:25
+2024-03-16 19:01:25
+2024-03-16 11:01:25
+123	\N	\N	\N
+123	0	0	0
+123	10	10	10
+123	0	0	0
+Nullable(UInt8)	UInt8
+123
+123
+123
+\N
+2024-04-25	2024-01-01 02:03:04	1	12
+2024-04-25	2024-01-01 02:03:04.000000	2009-02-14 00:31:30
+2024-04-25	2024-01-01 02:03:04.000000	2009-02-14 00:31:30
+1986-04-25 13:00:00
+14
diff --git a/tests/queries/0_stateless/03011_definitive_guide_to_cast.sql b/tests/queries/0_stateless/03011_definitive_guide_to_cast.sql
new file mode 100644
index 00000000000..708db0adce0
--- /dev/null
+++ b/tests/queries/0_stateless/03011_definitive_guide_to_cast.sql
@@ -0,0 +1,356 @@
+SET session_timezone = 'Europe/Amsterdam';
+
+-- Type conversion functions and operators.
+
+
+-- 1. SQL standard CAST operator: `CAST(value AS Type)`.
+
+SELECT CAST(123 AS String);
+
+-- It converts between various data types, including parameterized data types
+
+SELECT CAST(1234567890 AS DateTime('Europe/Amsterdam'));
+
+-- and composite data types:
+
+SELECT CAST('[1, 2, 3]' AS Array(UInt8));
+
+-- Its return type depends on the setting `cast_keep_nullable`. If it is enabled, if the source argument type is Nullable, the resulting data type will be also Nullable, even if it is not written explicitly:
+
+SET cast_keep_nullable = 1;
+SELECT CAST(x AS UInt8) AS y, toTypeName(y) FROM VALUES('x Nullable(String)', ('123'), ('NULL'));
+
+SET cast_keep_nullable = 0;
+SELECT CAST(x AS UInt8) AS y, toTypeName(y) FROM VALUES('x Nullable(String)', ('123'), ('NULL')); -- { serverError CANNOT_PARSE_TEXT }
+
+-- There are various type conversion rules, some worth noting.
+
+-- Conversion between numeric types can involve implementation-defined overflow:
+
+SELECT CAST(257 AS UInt8);
+SELECT CAST(-1 AS UInt8);
+
+-- Conversion from string acts like parsing, and for composite data types like Array, Tuple, it works in the same way as from the `Values` data format:
+
+SELECT CAST($$['Hello', 'wo\'rld\\']$$ AS Array(String));
+
+-- '
+-- While for simple data types, it does not interpret escape sequences:
+
+SELECT arrayJoin(CAST($$['Hello', 'wo\'rld\\']$$ AS Array(String))) AS x, CAST($$wo\'rld\\$$ AS FixedString(9)) AS y;
+
+-- As conversion from String is similar to direct parsing rather than conversion from other types,
+-- it can be stricter for numbers by not tolerating overflows in some cases:
+
+SELECT CAST(-123 AS UInt8), CAST(1234 AS UInt8);
+
+SELECT CAST('-123' AS UInt8); -- { serverError CANNOT_PARSE_NUMBER }
+
+-- In some cases it still allows overflows, but it is implementation defined:
+
+SELECT CAST('1234' AS UInt8);
+
+-- Parsing from a string does not tolerate extra whitespace characters:
+
+SELECT CAST(' 123' AS UInt8); -- { serverError CANNOT_PARSE_TEXT }
+SELECT CAST('123 ' AS UInt8); -- { serverError CANNOT_PARSE_TEXT }
+
+-- But for composite data types, it involves a more featured parser, that takes care of whitespace inside the data structures:
+
+SELECT CAST('[ 123 ,456, ]' AS Array(UInt16));
+
+-- Conversion from a floating point value to an integer will involve truncation towards zero:
+
+SELECT CAST(1.9, 'Int64'), CAST(-1.9, 'Int64');
+
+-- Conversion from NULL into a non-Nullable type will throw an exception, as well as conversions from denormal floating point numbers (NaN, inf, -inf) to an integer, or conversion between arrays of different dimensions.
+
+-- However, you might find it amusing that an empty array of Nothing data type can be converted to arrays of any dimensions:
+
+SELECT [] AS x, CAST(x AS Array(Array(Array(Tuple(UInt64, String))))) AS y, toTypeName(x), toTypeName(y);
+
+-- Conversion between numbers and DateTime/Date data types interprets the number as the number of seconds/days from the Unix epoch,
+-- where Unix epoch starts from 1970-01-01T00:00:00Z (the midnight of Gregorian year 1970 in UTC),
+-- and the number of seconds don't count the coordination seconds, as in Unix.
+
+-- For example, it is 1 AM in Amsterdam:
+
+SELECT CAST(0 AS DateTime('Europe/Amsterdam'));
+
+-- The numbers can be fractional and negative (for DateTime64):
+
+SELECT CAST(1234567890.123456 AS DateTime64(6, 'Europe/Amsterdam'));
+SELECT CAST(-0.111111 AS DateTime64(6, 'Europe/Amsterdam'));
+
+-- If the result does not fit in the range of the corresponding time data types, it is truncated and saturated to the boundaries:
+
+SELECT CAST(1234567890.123456 AS DateTime('Europe/Amsterdam'));
+SELECT CAST(-1 AS DateTime('Europe/Amsterdam'));
+
+SELECT CAST(1e20 AS DateTime64(6, 'Europe/Amsterdam'));
+
+-- A special case is DateTime64(9) - the maximum resolution, where is does not cover the usual range,
+-- and in this case, it throws an exception on overflow (I don't mind if we change this behavior in the future):
+
+ SELECT CAST(1e20 AS DateTime64(9, 'Europe/Amsterdam')); -- { serverError DECIMAL_OVERFLOW }
+
+-- If a number is converted to a Date data type, the value is interpreted as the number of days since the Unix epoch,
+-- but if the number is larger than the range of the data type, it is interpreted as a unix timestamp
+-- (the number of seconds since the Unix epoch), similarly how it is done for the DateTime data type,
+-- for convenience (while the internal representation of Date is the number of days,
+-- often people want the unix timestamp to be also parsed into the Date data type):
+
+SELECT CAST(14289 AS Date);
+SELECT CAST(1234567890 AS Date);
+
+-- When converting to a FixedString, if the length of the result data type is larger than the value, the result is padded with zero bytes:
+
+SELECT CAST('123' AS FixedString(5)) FORMAT TSV;
+
+-- But if it does not fit, an exception is thrown:
+
+SELECT CAST('12345' AS FixedString(3)) FORMAT TSV; -- { serverError TOO_LARGE_STRING_SIZE }
+
+-- The operator is case-insensitive:
+
+SELECT CAST(123 AS String);
+SELECT cast(123 AS String);
+SELECT Cast(123 AS String);
+
+
+-- 2. The functional form of this operator: `CAST(value, 'Type')`:
+
+SELECT CAST(123, 'String');
+
+-- This form is equivalent. Keep in mind that the type has to be a constant expression:
+
+SELECT CAST(123, 'Str'||'ing'); -- this works.
+
+-- This does not work: SELECT materialize('String') AS type, CAST(123, type);
+
+-- It is also case-insensitive:
+
+SELECT CasT(123, 'String');
+
+-- The functional form exists for the consistency of implementation (as every operator also exists in the functional form and the functional form is represented in the query's Abstract Syntax Tree). Anyway, the functional form also makes sense for users, when they need to construct a data type name from a constant expression, or when they want to generate a query programmatically.
+
+-- It's worth noting that the operator form does not allow to specify the type name as a string literal:
+
+-- This does not work: SELECT CAST(123 AS 'String');
+
+-- By only allowing it as an identifier, either bare word:
+
+SELECT CAST(123 AS String);
+
+-- Or as a MySQL or PostgreSQL quoted identifiers:
+
+SELECT CAST(123 AS `String`);
+SELECT CAST(123 AS "String");
+
+-- While the functional form only allows the type name as a string literal:
+
+SELECT CAST(123, 'String'); -- works
+SELECT CAST(123, String); -- { serverError UNKNOWN_IDENTIFIER }
+
+-- However, you can cheat:
+
+SELECT 'String' AS String, CAST(123, String);
+
+
+-- 3. The internal function `_CAST` which is different from `CAST` only by being not dependent on the value of `cast_keep_nullable` setting and other settings.
+
+-- This is needed when ClickHouse has to persist an expression for future use, like in table definitions, including primary and partition keys and other indices.
+
+-- The function is not intended to be used directly. When a user uses a regular `CAST` operator or function in a table definition, it is transparently converted to `_CAST` to persist its behavior. However, the user can still use the internal version directly:
+
+SELECT _CAST(x, 'UInt8') AS y, toTypeName(y) FROM VALUES('x Nullable(String)', ('123'), ('456'));
+
+-- There is no operator form of this function:
+
+--  does not work, here UInt8 is interpreted as an alias for the value:
+SELECT _CAST(123 AS UInt8); -- { serverError NUMBER_OF_ARGUMENTS_DOESNT_MATCH }
+
+SELECT CAST(123 AS UInt8); -- works
+
+
+-- 4. PostgreSQL-style cast syntax `::`
+
+SELECT 123::String;
+
+-- It has a difference from the `CAST` operator: if it is applied to a simple literal value, instead of performing a type conversion, it invokes the SQL parser directly on the corresponding text fragment of the query. The most important case will be the floating-point and decimal types.
+
+-- In this example, we parse `1.1` as Decimal and do not involve any type conversion:
+
+SELECT 1.1::Decimal(30, 20);
+
+-- In this example, `1.1` is first parsed as usual, yielding a Float64 value, and then converted to Decimal, producing a wrong result:
+
+SELECT CAST(1.1 AS Decimal(30, 20));
+
+-- We can change this behavior in the future.
+
+-- Another example:
+
+SELECT -1::UInt64; -- { serverError CANNOT_PARSE_NUMBER }
+
+SELECT CAST(-1 AS UInt64); -- conversion with overflow
+
+-- For composite data types, if a value is a literal, it is parsed directly:
+
+SELECT [1.1, 2.3]::Array(Decimal(30, 20));
+
+-- But if the value contains expressions, the usage of the `::` operator will be equivalent to invoking the CAST operator on the expression:
+
+SELECT [1.1, 2.3 + 0]::Array(Decimal(30, 20));
+
+-- The automatic column name for the result of an application of the `::` operator may be the same as for the result of an application of the CAST operator to a string containing the corresponding fragment of the query or to a corresponding expression:
+
+SELECT 1.1::Decimal(30, 20), CAST('1.1' AS Decimal(30, 20)), (1+1)::UInt8 FORMAT Vertical;
+
+-- The operator has the highest priority among others:
+
+SELECT 1-1::String; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+-- But one interesting example is the unary minus. Here the minus is not an operator but part of the numeric literal:
+
+SELECT -1::String;
+
+-- Here it is an operator:
+
+SELECT 1 AS x, -x::String; -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+
+-- 5. Accurate casting functions: `accurateCast`, `accurateCastOrNull`, `accurateCastOrDefault`.
+
+-- These functions check if the value is exactly representable in the target data type.
+
+-- The function `accurateCast` performs the conversion or throws an exception if the value is not exactly representable:
+
+SELECT accurateCast(1.123456789, 'Float32'); -- { serverError CANNOT_CONVERT_TYPE }
+
+-- The function `accurateCastOrNull` always wraps the target type into Nullable, and returns NULL if the value is not exactly representable:
+
+SELECT accurateCastOrNull(1.123456789, 'Float32');
+
+-- The function `accurateCastOrDefault` takes an additional parameter, which must be of the target type, and returns it if the value is not exactly representable:
+
+SELECT accurateCastOrDefault(-1, 'UInt64', 0::UInt64);
+
+-- If this parameter is omitted, it is assumed to be the default value of the corresponding data type:
+
+SELECT accurateCastOrDefault(-1, 'UInt64');
+SELECT accurateCastOrDefault(-1, 'DateTime');
+
+-- Unfortunately, this does not work as expected: SELECT accurateCastOrDefault(-1, $$Enum8('None' = 1, 'Hello' = 2, 'World' = 3)$$);
+-- https://github.com/ClickHouse/ClickHouse/issues/61495
+
+-- These functions are case-sensitive, and there are no corresponding operators:
+
+SELECT ACCURATECAST(1, 'String'); -- { serverError UNKNOWN_FUNCTION }.
+
+
+-- 6. Explicit conversion functions:
+
+-- `toString`, `toFixedString`,
+-- `toUInt8`, `toUInt16`, `toUInt32`, `toUInt64`, `toUInt128`, `toUInt256`,
+-- `toInt8`, `toInt16`, `toInt32`, `toInt64`, `toInt128`, `toInt256`,
+-- `toFloat32`, `toFloat64`,
+-- `toDecimal32`, `toDecimal64`, `toDecimal128`, `toDecimal256`,
+-- `toDate`, `toDate32`, `toDateTime`, `toDateTime64`,
+-- `toUUID`, `toIPv4`, `toIPv6`,
+-- `toIntervalNanosecond`, `toIntervalMicrosecond`, `toIntervalMillisecond`,
+-- `toIntervalSecond`, `toIntervalMinute`, `toIntervalHour`,
+-- `toIntervalDay`, `toIntervalWeek`, `toIntervalMonth`, `toIntervalQuarter`, `toIntervalYear`
+
+-- These functions work under the same rules as the CAST operator and can be thought as elementary implementation parts of that operator. They allow implementation-defined overflow while converting between numeric types.
+
+SELECT toUInt8(-1);
+
+-- These are ClickHouse-native conversion functions. They take an argument with the input value, and for some of the data types (`FixedString`, `DateTime`, `DateTime64`, `Decimal`s), the subsequent arguments are constant expressions, defining the parameters of these data types, or the rules to interpret the source value.
+
+SELECT toFloat64(123); -- no arguments
+SELECT toFixedString('Hello', 10) FORMAT TSV; -- the parameter of the FixedString data type, the function returns FixedString(10)
+SELECT toFixedString('Hello', 5 + 5) FORMAT TSV; -- it can be a constant expression
+
+SELECT toDecimal32('123.456', 2); -- the scale of the Decimal data type
+
+SELECT toDateTime('2024-04-25 01:02:03', 'Europe/Amsterdam'); -- the time zone of DateTime
+SELECT toDateTime64('2024-04-25 01:02:03', 6, 'Europe/Amsterdam'); -- the scale of DateTime64 and its time zone
+
+-- The length of FixedString and the scale of Decimal and DateTime64 types are mandatory arguments, while the time zone of the DateTime data type is optional.
+
+-- If the time zone is not specified, the time zone of the argument's data type is used, and if the argument is not a date time, the session time zone is used.
+
+SELECT toDateTime('2024-04-25 01:02:03');
+SELECT toDateTime64('2024-04-25 01:02:03.456789', 6);
+
+-- Here, the time zone can be specified as the rule of interpretation of the value during conversion:
+
+SELECT toString(1710612085::DateTime, 'America/Los_Angeles');
+SELECT toString(1710612085::DateTime);
+
+-- In the case when the time zone is not the part of the resulting data type, but a rule of interpretation of the source value,
+-- it can be non-constant. Let's clarify: in this example, the resulting data type is a String; it does not have a time zone parameter:
+
+SELECT toString(1710612085::DateTime, tz) FROM Values('tz String', 'Europe/Amsterdam', 'America/Los_Angeles');
+
+-- Functions converting to numeric types, date and datetime, IP and UUID, also have versions with -OrNull, -OrZero, and -OrDefault fallbacks,
+-- that don't throw exceptions on parsing errors.
+-- They use the same rules to the accurateCast operator:
+
+SELECT toUInt8OrNull('123'), toUInt8OrNull('-123'), toUInt8OrNull('1234'), toUInt8OrNull(' 123');
+SELECT toUInt8OrZero('123'), toUInt8OrZero('-123'), toUInt8OrZero('1234'), toUInt8OrZero(' 123');
+SELECT toUInt8OrDefault('123', 10), toUInt8OrDefault('-123', 10), toUInt8OrDefault('1234', 10), toUInt8OrDefault(' 123', 10);
+SELECT toUInt8OrDefault('123'), toUInt8OrDefault('-123'), toUInt8OrDefault('1234'), toUInt8OrDefault(' 123');
+
+SELECT toTypeName(toUInt8OrNull('123')), toTypeName(toUInt8OrZero('123'));
+
+-- These functions are only applicable to string data types.
+-- Although it is a room for extension:
+
+SELECT toUInt8OrNull(123); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
+
+-- String and FixedString work:
+
+SELECT toUInt8OrNull(123::FixedString(3));
+
+-- For the FixedString data type trailing zero bytes are allowed, because they are the padding for FixedString:
+
+SELECT toUInt8OrNull('123'::FixedString(4));
+SELECT toUInt8OrNull('123\0'::FixedString(4));
+
+-- While for String, they don't:
+
+SELECT toUInt8OrNull('123\0');
+
+
+-- 7. SQL-compatibility type-defining operators:
+
+SELECT DATE '2024-04-25', TIMESTAMP '2024-01-01 02:03:04', INTERVAL 1 MINUTE, INTERVAL '12 hour';
+
+-- These operators are interpreted as the corresponding explicit conversion functions.
+
+
+-- 8. SQL-compatibility aliases for explicit conversion functions:
+
+SELECT DATE('2024-04-25'), TIMESTAMP('2024-01-01 02:03:04'), FROM_UNIXTIME(1234567890);
+
+-- These functions exist for compatibility with MySQL. They are case-insensitive.
+
+SELECT date '2024-04-25', timeSTAMP('2024-01-01 02:03:04'), From_Unixtime(1234567890);
+
+
+-- 9. Specialized conversion functions:
+
+-- `parseDateTimeBestEffort`, `parseDateTimeBestEffortUS`, `parseDateTime64BestEffort`, `parseDateTime64BestEffortUS`, `toUnixTimestamp`
+
+-- These functions are similar to explicit conversion functions but provide special rules on how the conversion is performed.
+
+SELECT parseDateTimeBestEffort('25 Apr 1986 1pm');
+
+
+-- 10. Functions for converting between different components or rounding of date and time data types.
+
+SELECT toDayOfMonth(toDateTime(1234567890));
+
+-- These functions are covered in a separate topic.
diff --git a/tests/queries/0_stateless/03012_parser_backtracking.reference b/tests/queries/0_stateless/03012_parser_backtracking.reference
new file mode 100644
index 00000000000..84727754516
--- /dev/null
+++ b/tests/queries/0_stateless/03012_parser_backtracking.reference
@@ -0,0 +1 @@
+TOO_SLOW_PARSING
diff --git a/tests/queries/0_stateless/03012_parser_backtracking.sh b/tests/queries/0_stateless/03012_parser_backtracking.sh
new file mode 100755
index 00000000000..889753fb048
--- /dev/null
+++ b/tests/queries/0_stateless/03012_parser_backtracking.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+$CLICKHOUSE_LOCAL --query "SELECT((((((((((SELECT(((((((((SELECT((((((((((SELECT(((((((((SELECT((((((((((SELECT(((((((((SELECT 1+)))))))))))))))))))))))))))))))))))))))))))))))))))))))))" 2>&1 | grep -o -F 'TOO_SLOW_PARSING'
diff --git a/tests/queries/0_stateless/03013_addDays_with_timezone.reference b/tests/queries/0_stateless/03013_addDays_with_timezone.reference
new file mode 100644
index 00000000000..6a8fa4f8a2c
--- /dev/null
+++ b/tests/queries/0_stateless/03013_addDays_with_timezone.reference
@@ -0,0 +1 @@
+2024-01-11 00:00:00.000000
diff --git a/tests/queries/0_stateless/03013_addDays_with_timezone.sql b/tests/queries/0_stateless/03013_addDays_with_timezone.sql
new file mode 100644
index 00000000000..eb822d53898
--- /dev/null
+++ b/tests/queries/0_stateless/03013_addDays_with_timezone.sql
@@ -0,0 +1 @@
+select addDays(toDateTime64('2024-01-01', 6, 'Asia/Shanghai'), 10, 'Asia/Shanghai');
diff --git a/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.reference b/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.reference
new file mode 100644
index 00000000000..5832f8b7a52
--- /dev/null
+++ b/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.reference
@@ -0,0 +1,14 @@
+[]
+[]
+[1,0]
+[]
+[3,2]
+[]
+[5,4]
+[]
+[]
+[1,0]
+[]
+[3,2]
+[]
+[5,4]
diff --git a/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.sql b/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.sql
new file mode 100644
index 00000000000..f575ae952dd
--- /dev/null
+++ b/tests/queries/0_stateless/03013_fuzz_arrayPartialReverseSort.sql
@@ -0,0 +1,19 @@
+SELECT res
+FROM
+(
+    SELECT
+        arrayPartialReverseSort(2, if(number % 2, emptyArrayUInt64(), range(number))) AS arr,
+        arrayResize(arr, if(empty(arr), 0, 2)) AS res
+    FROM system.numbers
+    LIMIT 7
+);
+
+SELECT res
+FROM
+(
+    SELECT
+        arrayPartialReverseSort(materialize(2), if(number % 2, emptyArrayUInt64(), range(number))) AS arr,
+        arrayResize(arr, if(empty(arr), 0, 2)) AS res
+    FROM system.numbers
+    LIMIT 7
+);
diff --git a/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.reference b/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.reference
new file mode 100644
index 00000000000..2c9c098cea0
--- /dev/null
+++ b/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.reference
@@ -0,0 +1,10 @@
+6
+6
+3
+\N
+0
+\N
+0
+\N
+0
+\N
diff --git a/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.sql b/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.sql
new file mode 100644
index 00000000000..b15593b2abd
--- /dev/null
+++ b/tests/queries/0_stateless/03013_group_by_use_nulls_with_materialize_and_analyzer.sql
@@ -0,0 +1,11 @@
+set allow_experimental_analyzer = 1;
+set group_by_use_nulls = 1;
+set optimize_group_by_function_keys = 1;
+set optimize_injective_functions_in_group_by = 1;
+
+SELECT 3 + 3 from numbers(10) GROUP BY GROUPING SETS (('str'), (3 + 3)) order by all;
+SELECT materialize(3) from numbers(10) GROUP BY GROUPING SETS (('str'), (materialize(3))) order by all;
+SELECT ignore(3) from numbers(10) GROUP BY GROUPING SETS (('str'), (ignore(3))) order by all;
+SELECT materialize(ignore(3)) from numbers(10) GROUP BY GROUPING SETS (('str'), (materialize(ignore(3)))) order by all;
+SELECT ignore(materialize(3)) from numbers(10) GROUP BY GROUPING SETS (('str'), (ignore(materialize(3)))) order by all;
+
diff --git a/tests/queries/0_stateless/03013_hop_infinite_loop.reference b/tests/queries/0_stateless/03013_hop_infinite_loop.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03013_hop_infinite_loop.sql b/tests/queries/0_stateless/03013_hop_infinite_loop.sql
new file mode 100644
index 00000000000..bdac87f5af1
--- /dev/null
+++ b/tests/queries/0_stateless/03013_hop_infinite_loop.sql
@@ -0,0 +1,2 @@
+SET allow_experimental_window_view = 1;
+SELECT hop(toDateTime(0), INTERVAL 1 DAY, INTERVAL 3 DAY); -- { serverError BAD_ARGUMENTS }
diff --git a/tests/queries/0_stateless/03013_parser_regexp_recompilation.reference b/tests/queries/0_stateless/03013_parser_regexp_recompilation.reference
new file mode 100644
index 00000000000..8e0782c44f2
--- /dev/null
+++ b/tests/queries/0_stateless/03013_parser_regexp_recompilation.reference
@@ -0,0 +1 @@
+SYNTAX_ERROR
diff --git a/tests/queries/0_stateless/03013_parser_regexp_recompilation.sh b/tests/queries/0_stateless/03013_parser_regexp_recompilation.sh
new file mode 100755
index 00000000000..ea7a72ce73d
--- /dev/null
+++ b/tests/queries/0_stateless/03013_parser_regexp_recompilation.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
+
+# This query is incorrect, but its parsing should not be slow (tens of seconds):
+
+${CLICKHOUSE_LOCAL} < "$CURDIR"/03013_parser_regexp_recompilation.txt 2>&1 | grep --text -o -F 'SYNTAX_ERROR'
diff --git a/tests/queries/0_stateless/03013_parser_regexp_recompilation.txt b/tests/queries/0_stateless/03013_parser_regexp_recompilation.txt
new file mode 100644
index 00000000000..a861059c3a1
Binary files /dev/null and b/tests/queries/0_stateless/03013_parser_regexp_recompilation.txt differ
diff --git a/tests/queries/0_stateless/03013_position_const_start_pos.reference b/tests/queries/0_stateless/03013_position_const_start_pos.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03013_position_const_start_pos.sql b/tests/queries/0_stateless/03013_position_const_start_pos.sql
new file mode 100644
index 00000000000..0c6da694b6b
--- /dev/null
+++ b/tests/queries/0_stateless/03013_position_const_start_pos.sql
@@ -0,0 +1,3 @@
+CREATE TABLE 03013_position_const_start_pos (n Int16) ENGINE = Memory;
+INSERT INTO 03013_position_const_start_pos SELECT * FROM generateRandom() LIMIT 1000;
+SELECT position(concat(NULLIF(1, 1), materialize(3)), 'ca', 2) FROM 03013_position_const_start_pos FORMAT Null;
diff --git a/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.reference b/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.reference
new file mode 100644
index 00000000000..50cb7002a32
--- /dev/null
+++ b/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.reference
@@ -0,0 +1,4 @@
+000000000000
+000000000000
+000000000000
+000000000000
diff --git a/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.sql b/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.sql
new file mode 100644
index 00000000000..0dbe98994b9
--- /dev/null
+++ b/tests/queries/0_stateless/03013_repeat_with_nonnative_integers.sql
@@ -0,0 +1,4 @@
+SELECT repeat(toString(number), toUInt256(12)) FROM numbers(1);
+SELECT repeat(toString(number), toUInt128(12)) FROM numbers(1);
+SELECT repeat(toString(number), toInt256(12)) FROM numbers(1);
+SELECT repeat(toString(number), toInt128(12)) FROM numbers(1);
diff --git a/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.reference b/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.reference
new file mode 100644
index 00000000000..a3cb6a511e5
--- /dev/null
+++ b/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.reference
@@ -0,0 +1,22 @@
+-- {echoOn}
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Int) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO test VALUES (1), (2), (3);
+OPTIMIZE TABLE test FINAL;
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+all_1_1_1
+ALTER TABLE test DETACH PART 'all_1_1_1';
+ALTER TABLE test ATTACH PART 'all_1_1_1';
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+all_2_2_0
+-- Same as above, but with attach partition (different code path, should be tested as well)
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Int) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO test VALUES (1), (2), (3);
+OPTIMIZE TABLE test FINAL;
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+all_1_1_1
+ALTER TABLE test DETACH PART 'all_1_1_1';
+ALTER TABLE test ATTACH PARTITION tuple();
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+all_2_2_0
diff --git a/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.sql b/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.sql
new file mode 100644
index 00000000000..eb05dfea802
--- /dev/null
+++ b/tests/queries/0_stateless/03013_test_part_level_is_reset_attach_from_disk_mt.sql
@@ -0,0 +1,21 @@
+-- Tags: no-shared-merge-tree
+SET alter_sync = 2;
+-- {echoOn}
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Int) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO test VALUES (1), (2), (3);
+OPTIMIZE TABLE test FINAL;
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+ALTER TABLE test DETACH PART 'all_1_1_1';
+ALTER TABLE test ATTACH PART 'all_1_1_1';
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+
+-- Same as above, but with attach partition (different code path, should be tested as well)
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a Int) ENGINE = MergeTree ORDER BY tuple();
+INSERT INTO test VALUES (1), (2), (3);
+OPTIMIZE TABLE test FINAL;
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
+ALTER TABLE test DETACH PART 'all_1_1_1';
+ALTER TABLE test ATTACH PARTITION tuple();
+SELECT part_name FROM system.parts where table='test' and active and database = currentDatabase();
diff --git a/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.reference b/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.reference
new file mode 100644
index 00000000000..b50fdcee209
--- /dev/null
+++ b/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.reference
@@ -0,0 +1,2 @@
+a	b
+a	b
diff --git a/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.sql b/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.sql
new file mode 100644
index 00000000000..a1c302465de
--- /dev/null
+++ b/tests/queries/0_stateless/03014_analyzer_group_by_use_nulls.sql
@@ -0,0 +1 @@
+SELECT 'a' AS key, 'b' as value GROUP BY key WITH CUBE SETTINGS group_by_use_nulls = 1;
diff --git a/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.reference b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.reference
new file mode 100644
index 00000000000..5e56482a470
--- /dev/null
+++ b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.reference
@@ -0,0 +1,11 @@
+30	30	1970-01-01
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+30	1970-01-01	30	30	1970-01-01	-1980.1
+
+30	1970-01-01	30	30	1970-01-01	-1980.1
diff --git a/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql
new file mode 100644
index 00000000000..094614cb78d
--- /dev/null
+++ b/tests/queries/0_stateless/03014_analyzer_groupby_fuzz_60317.sql
@@ -0,0 +1,27 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/60317
+SELECT
+    toNullable(materialize(_CAST(30, 'LowCardinality(UInt8)'))) as a,
+    _CAST(30, 'LowCardinality(UInt8)') as b,
+    makeDate(materialize(_CAST(30, 'LowCardinality(UInt8)')), 10, _CAST(30, 'Nullable(UInt8)')) as c
+FROM system.one
+GROUP BY
+    _CAST(30, 'Nullable(UInt8)')
+SETTINGS allow_experimental_analyzer = 1;
+
+-- WITH CUBE (note that result is different with the analyzer (analyzer is correct including all combinations)
+SELECT
+    toNullable(toNullable(materialize(_CAST(30, 'LowCardinality(UInt8)')))) AS `toNullable(toNullable(materialize(toLowCardinality(30))))`,
+    _CAST(0, 'Date') AS `makeDate(-1980.1, -1980.1, 10)`,
+    _CAST(30, 'LowCardinality(UInt8)') AS `toLowCardinality(30)`,
+    30 AS `30`,
+    makeDate(materialize(_CAST(30, 'LowCardinality(UInt8)')), 10, _CAST(30, 'Nullable(UInt8)')) AS `makeDate(materialize(toLowCardinality(30)), 10, toNullable(toNullable(30)))`,
+    -1980.1 AS `-1980.1`
+FROM system.one AS __table1
+GROUP BY
+    _CAST(30, 'Nullable(UInt8)'),
+    -1980.1,
+    materialize(30),
+    _CAST(30, 'Nullable(UInt8)')
+WITH CUBE
+WITH TOTALS
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.reference b/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.reference
new file mode 100644
index 00000000000..335c796a9cf
--- /dev/null
+++ b/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.reference
@@ -0,0 +1,5 @@
+-- Inserted part --
+0	1
+-- Deduplicated part --
+0	1
+389	1
diff --git a/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.sql b/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.sql
new file mode 100644
index 00000000000..6b441e951e1
--- /dev/null
+++ b/tests/queries/0_stateless/03014_async_with_dedup_part_log_rmt.sql
@@ -0,0 +1,24 @@
+CREATE TABLE 03014_async_with_dedup_part_log (x UInt64)
+ENGINE=ReplicatedMergeTree('/clickhouse/table/{database}/03014_async_with_dedup_part_log', 'r1') ORDER BY tuple();
+
+SET async_insert = 1;
+SET wait_for_async_insert = 1;
+SET async_insert_deduplicate = 1;
+
+SELECT '-- Inserted part --';
+INSERT INTO 03014_async_with_dedup_part_log VALUES (2);
+
+SYSTEM FLUSH LOGS;
+SELECT error, count() FROM system.part_log
+WHERE table = '03014_async_with_dedup_part_log' AND database = currentDatabase() AND event_type = 'NewPart'
+GROUP BY error
+ORDER BY error;
+
+SELECT '-- Deduplicated part --';
+INSERT INTO 03014_async_with_dedup_part_log VALUES (2);
+
+SYSTEM FLUSH LOGS;
+SELECT error, count() FROM system.part_log
+WHERE table = '03014_async_with_dedup_part_log' AND database = currentDatabase() AND event_type = 'NewPart'
+GROUP BY error
+ORDER BY error;
diff --git a/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.reference b/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.reference
new file mode 100644
index 00000000000..e90d21df61f
--- /dev/null
+++ b/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.reference
@@ -0,0 +1,24 @@
+3
+4
+5
+6
+7
+8
+9
+10
+11
+12
+\N
+(((0)))
+(((0)))
+(((1)))
+(((2)))
+(((3)))
+(((4)))
+(((5)))
+(((6)))
+(((7)))
+(((8)))
+(((9)))
+6
+6
diff --git a/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.sql b/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.sql
new file mode 100644
index 00000000000..e7ea964b876
--- /dev/null
+++ b/tests/queries/0_stateless/03014_group_by_use_nulls_injective_functions_and_analyzer.sql
@@ -0,0 +1,5 @@
+set allow_experimental_analyzer=1, group_by_use_nulls=1, optimize_injective_functions_in_group_by=1;
+SELECT bitNot(bitNot(number)) + 3 FROM numbers(10) GROUP BY GROUPING SETS (('str', bitNot(bitNot(number))), ('str')) order by all;
+SELECT tuple(tuple(tuple(number))) FROM numbers(10) GROUP BY GROUPING SETS (('str', tuple(tuple(number))), ('str')) order by all;
+SELECT materialize(3) + 3 FROM numbers(10) GROUP BY GROUPING SETS (('str', materialize(materialize(3))), ('str')) order by all;
+
diff --git a/tests/queries/0_stateless/03014_invalid_utf8_client.expect b/tests/queries/0_stateless/03014_invalid_utf8_client.expect
new file mode 100755
index 00000000000..6689e1a1179
--- /dev/null
+++ b/tests/queries/0_stateless/03014_invalid_utf8_client.expect
@@ -0,0 +1,32 @@
+#!/usr/bin/expect -f
+
+set basedir [file dirname $argv0]
+set basename [file tail $argv0]
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
+
+log_user 0
+set timeout 60
+match_max 100000
+
+expect_after {
+    # Do not ignore eof from expect
+    -i $any_spawn_id eof { exp_continue }
+    # A default timeout action is to do nothing, change it to fail
+    -i $any_spawn_id timeout { exit 1 }
+}
+
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT_BINARY \$CLICKHOUSE_CLIENT_OPT --disable_suggestion --history_file=$history_file"
+expect ":) "
+
+send -- "SELECT \x99\r"
+
+expect "Syntax error"
+
+send "exit\r"
+expect eof
diff --git a/tests/queries/0_stateless/03014_invalid_utf8_client.reference b/tests/queries/0_stateless/03014_invalid_utf8_client.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03014_msan_parse_date_time.reference b/tests/queries/0_stateless/03014_msan_parse_date_time.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03014_msan_parse_date_time.sql b/tests/queries/0_stateless/03014_msan_parse_date_time.sql
new file mode 100644
index 00000000000..d6daea69cfa
--- /dev/null
+++ b/tests/queries/0_stateless/03014_msan_parse_date_time.sql
@@ -0,0 +1 @@
+SELECT parseDateTimeBestEffort(toFixedString('01/12/2017,', 11)); -- { serverError CANNOT_PARSE_DATETIME }
diff --git a/tests/queries/0_stateless/03014_window_view_crash.reference b/tests/queries/0_stateless/03014_window_view_crash.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03014_window_view_crash.sql b/tests/queries/0_stateless/03014_window_view_crash.sql
new file mode 100644
index 00000000000..ff9835521f5
--- /dev/null
+++ b/tests/queries/0_stateless/03014_window_view_crash.sql
@@ -0,0 +1,2 @@
+SET allow_experimental_window_view = 1;
+SELECT hopEnd(tuple([[[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]], [[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]], [[(20,20),(50,20),(50,50),(20,50)],[(30,30),(50,50),(50,30)]]])::Tuple(MultiPolygon)); -- { serverError ILLEGAL_TYPE_OF_ARGUMENT }
diff --git a/tests/queries/0_stateless/03015_aggregator_empty_data_multiple_blocks.reference b/tests/queries/0_stateless/03015_aggregator_empty_data_multiple_blocks.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03015_aggregator_empty_data_multiple_blocks.sql b/tests/queries/0_stateless/03015_aggregator_empty_data_multiple_blocks.sql
new file mode 100644
index 00000000000..d2c1816f7e8
--- /dev/null
+++ b/tests/queries/0_stateless/03015_aggregator_empty_data_multiple_blocks.sql
@@ -0,0 +1,3 @@
+CREATE TABLE 03015_aggregator_empty_data_multiple_blocks (c0 Int32) ENGINE = Memory();
+INSERT INTO 03015_aggregator_empty_data_multiple_blocks SELECT * FROM generateRandom() LIMIT 1000;
+SELECT radians(t1.c0) FROM 03015_aggregator_empty_data_multiple_blocks AS t1 RIGHT ANTI JOIN 03015_aggregator_empty_data_multiple_blocks AS right_0 ON t1.c0=right_0.c0 GROUP BY t1.c0;
diff --git a/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.reference b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.reference
new file mode 100644
index 00000000000..5cdf256a24a
--- /dev/null
+++ b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.reference
@@ -0,0 +1,9 @@
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
+%W	2018-01-02 22:33:44	1
diff --git a/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql
new file mode 100644
index 00000000000..d3bd9ef0ce3
--- /dev/null
+++ b/tests/queries/0_stateless/03015_analyzer_groupby_fuzz_60772.sql
@@ -0,0 +1,23 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/60772
+SELECT toFixedString(toFixedString(toFixedString(toFixedString(toFixedString(toFixedString('%W', 2), 2), 2),toLowCardinality(toLowCardinality(toNullable(2)))), 2), 2),
+       toFixedString(toFixedString('2018-01-02 22:33:44', 19), 19),
+       hasSubsequence(toNullable(materialize(toLowCardinality('garbage'))), 'gr')
+GROUP BY
+    '2018-01-02 22:33:44',
+    toFixedString(toFixedString('2018-01-02 22:33:44', 19), 19),
+    'gr',
+    '2018-01-02 22:33:44'
+SETTINGS allow_experimental_analyzer = 1;
+
+-- WITH CUBE (note that result is different with the analyzer (analyzer is correct including all combinations)
+SELECT
+    toFixedString(toFixedString(toFixedString(toFixedString(toFixedString(toFixedString('%W', 2), 2), 2), toLowCardinality(toLowCardinality(toNullable(2)))), 2), 2),
+    toFixedString(toFixedString('2018-01-02 22:33:44', 19), 19),
+    hasSubsequence(toNullable(materialize(toLowCardinality('garbage'))), 'gr')
+GROUP BY
+    '2018-01-02 22:33:44',
+    toFixedString(toFixedString('2018-01-02 22:33:44', 19), 19),
+    'gr',
+    '2018-01-02 22:33:44'
+WITH CUBE
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03015_peder1001.reference b/tests/queries/0_stateless/03015_peder1001.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03015_peder1001.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03015_peder1001.sql b/tests/queries/0_stateless/03015_peder1001.sql
new file mode 100644
index 00000000000..810503207f2
--- /dev/null
+++ b/tests/queries/0_stateless/03015_peder1001.sql
@@ -0,0 +1,20 @@
+DROP TABLE IF EXISTS test_data;
+
+CREATE TABLE test_data
+(
+    ShipmentDate Date
+)
+ENGINE = Memory;
+
+INSERT INTO test_data (ShipmentDate) Values ('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'), ('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-02-07'), ('2022-02-11'), ('2022-02-15'), ('2022-02-16'), ('2022-02-18'), ('2022-02-22'), ('2022-02-24'), ('2022-03-02'), ('2022-03-04'), ('2022-03-07'), ('2022-03-09'), ('2022-03-10'), ('2022-03-11'), ('2022-03-14'), ('2022-03-15'), ('2022-03-17'), ('2022-03-18'), ('2022-03-23'), ('2022-04-28'), ('2022-05-24'), ('2022-03-31'), ('2022-04-19'), ('2022-04-25'), ('2022-04-26'), ('2022-05-02'), ('2022-05-04'), ('2022-05-05'), ('2022-05-11'), ('2022-05-12'), ('2022-05-13'), ('2022-05-16'), ('2022-05-18'), ('2022-05-20'), ('2022-05-23'), ('2022-05-27'), ('2022-05-31'), ('2022-05-10'), ('2022-02-17'), ('2022-03-24'), ('2022-05-09'), ('2022-05-30'), ('2022-02-21'), ('2022-01-11'), ('2022-01-28'), ('2022-04-27'), ('2022-05-25'), ('2022-04-18'), ('2022-01-21'), ('2022-03-22'), ('2022-04-01'), ('2022-04-06'), ('2022-04-11'), ('2022-05-19'), ('2022-02-01'), ('2022-02-23'), ('2022-02-09'), ('2022-03-03'), ('2022-04-04'), ('2022-04-05'), ('2022-04-12'), ('2022-04-29'), ('2022-01-06'), ('2022-03-01'), ('2022-03-26'), ('2022-01-10'), ('2022-01-03'), ('2022-05-01'), ('2022-03-21'), ('2022-03-27'), ('2022-01-31'), ('2022-04-13'), ('2022-03-29'), ('2022-02-20'), ('2022-02-06'), ('2022-03-13'), ('2022-02-27'), ('2022-03-20'), ('2022-04-24'), ('2022-05-15'), ('2022-05-22'), ('2022-01-09'), ('2022-04-03'), ('2022-03-12'), ('2022-01-23'), ('2022-05-08'), ('2022-05-29'), ('2022-02-19'), ('2022-05-07'), ('2022-05-26'), ('2022-01-30'), ('2022-03-05'), ('2022-05-21'), ('2022-02-26'), ('2022-01-16'), ('2022-05-17'), ('2022-01-29'), ('2022-02-12'), ('2022-01-02'), ('2022-02-05'),('2022-04-22'), ('2022-02-14'), ('2022-02-28'), ('2022-02-04'), ('2022-02-08'), ('2022-03-16'), ('2022-03-25'), ('2022-02-25'), ('2022-03-08'), ('2022-05-03'), ('2022-05-06'), ('2022-02-10'), ('2022-02-13'), ('2022-03-06'), ('2022-04-07'), ('2022-04-08'), ('2022-04-20'), ('2022-04-21'), ('2022-03-28'), ('2022-03-30'), ('2022-01-04'), ('2022-01-05'), ('2022-01-07'), ('2022-01-12'), ('2022-01-13'), ('2022-01-14'), ('2022-01-17'), ('2022-01-18'), ('2022-01-19'), ('2022-01-20'), ('2022-01-24'), ('2022-01-25'), ('2022-01-26'), ('2022-01-27'), ('2022-02-02'), ('2022-02-03'), ('2022-01-08');
+
+SELECT 
+    toDayOfWeek(ShipmentDate) AS c
+FROM test_data
+WHERE c IS NOT NULL AND lowerUTF8(formatDateTime(date_add(DAY, toInt32(c) - 1, toDate('2024-01-01')), '%W')) LIKE '%m%'
+GROUP BY c
+ORDER BY c ASC
+LIMIT 62
+OFFSET 0;
+
+DROP TABLE test_data;
diff --git a/tests/queries/0_stateless/03015_with_fill_invalid_expression.reference b/tests/queries/0_stateless/03015_with_fill_invalid_expression.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03015_with_fill_invalid_expression.sql b/tests/queries/0_stateless/03015_with_fill_invalid_expression.sql
new file mode 100644
index 00000000000..dbb63c029d6
--- /dev/null
+++ b/tests/queries/0_stateless/03015_with_fill_invalid_expression.sql
@@ -0,0 +1,2 @@
+select number as x, number + 1 as y from numbers(5) where number % 3 == 1 order by y, x with fill from 1 to 4, y with fill from 2 to 5; -- {serverError INVALID_WITH_FILL_EXPRESSION}
+
diff --git a/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.reference b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.reference
new file mode 100644
index 00000000000..6f7389b482b
--- /dev/null
+++ b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.reference
@@ -0,0 +1 @@
+\0\0\0 key="v" \0 key="v"  key="v"  key="v"  key="v" \0 key="v" 
diff --git a/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql
new file mode 100644
index 00000000000..c00a75a631c
--- /dev/null
+++ b/tests/queries/0_stateless/03016_analyzer_groupby_fuzz_59796.sql
@@ -0,0 +1,6 @@
+SELECT
+    concat(concat(unhex('00'), concat(unhex('00'), concat(unhex(toFixedString('00', 2)), toFixedString(toFixedString(' key="v" ', 9), 9), concat(unhex('00'), toFixedString(' key="v" ', 9)), toFixedString(materialize(toLowCardinality(' key="v" ')), 9)), toFixedString(' key="v" ', 9)), toFixedString(' key="v" ', 9)), unhex('00'), ' key="v" ') AS haystack
+GROUP BY
+    concat(unhex('00'), toFixedString(materialize(toFixedString(' key="v" ', 9)), 9), toFixedString(toFixedString('00', 2), toNullable(2)),  toFixedString(toFixedString(toFixedString(' key="v" ', 9), 9), 9)),
+    concat(' key="v" ')
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.reference b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.reference
new file mode 100644
index 00000000000..eaa1097a734
--- /dev/null
+++ b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.reference
@@ -0,0 +1,4 @@
+38	\N
+38	\N
+38	\N
+38	\N
diff --git a/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql
new file mode 100644
index 00000000000..53a5cfe9b1a
--- /dev/null
+++ b/tests/queries/0_stateless/03017_analyzer_groupby_fuzz_61600.sql
@@ -0,0 +1,25 @@
+CREATE TABLE set_index_not__fuzz_0 (`name` String, `status` Enum8('alive' = 0, 'rip' = 1), INDEX idx_status status TYPE set(2) GRANULARITY 1)
+ENGINE = MergeTree ORDER BY name
+SETTINGS index_granularity = 8192;
+
+INSERT INTO set_index_not__fuzz_0 SELECT * from generateRandom() limit 1;
+
+SELECT
+    38,
+    concat(position(concat(concat(position(concat(toUInt256(3)), 'ca', 2), 3),NULLIF(1, materialize(toLowCardinality(1)))), toLowCardinality(toNullable('ca'))), concat(NULLIF(1, 1), concat(3), toNullable(3)))
+FROM set_index_not__fuzz_0
+GROUP BY
+    toNullable(3),
+    concat(concat(NULLIF(1, 1), toNullable(toNullable(3))))
+SETTINGS allow_experimental_analyzer = 1;
+
+-- WITH ROLLUP (note that result is different with the analyzer (analyzer is correct including all combinations)
+SELECT
+    38,
+    concat(position(concat(concat(position(concat(toUInt256(3)), 'ca', 2), 3), NULLIF(1, materialize(toLowCardinality(1)))), toLowCardinality(toNullable('ca'))), concat(NULLIF(1, 1), concat(3), toNullable(3)))
+FROM set_index_not__fuzz_0
+GROUP BY
+    toNullable(3),
+    concat(concat(NULLIF(1, 1), toNullable(toNullable(3))))
+WITH ROLLUP
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03018_analyzer_greater_null.reference b/tests/queries/0_stateless/03018_analyzer_greater_null.reference
new file mode 100644
index 00000000000..1e254619239
--- /dev/null
+++ b/tests/queries/0_stateless/03018_analyzer_greater_null.reference
@@ -0,0 +1 @@
+\N	0
diff --git a/tests/queries/0_stateless/03018_analyzer_greater_null.sql b/tests/queries/0_stateless/03018_analyzer_greater_null.sql
new file mode 100644
index 00000000000..66ea53e451f
--- /dev/null
+++ b/tests/queries/0_stateless/03018_analyzer_greater_null.sql
@@ -0,0 +1,4 @@
+SELECT
+    max(NULL > 255) > NULL AS a,
+    count(NULL > 1.) > 1048577
+FROM numbers(10);
diff --git a/tests/queries/0_stateless/03018_external_with_complex_data_types.reference b/tests/queries/0_stateless/03018_external_with_complex_data_types.reference
new file mode 100644
index 00000000000..11277a62b06
--- /dev/null
+++ b/tests/queries/0_stateless/03018_external_with_complex_data_types.reference
@@ -0,0 +1 @@
+Hello	world
diff --git a/tests/queries/0_stateless/03018_external_with_complex_data_types.sh b/tests/queries/0_stateless/03018_external_with_complex_data_types.sh
new file mode 100755
index 00000000000..fb3a22d9044
--- /dev/null
+++ b/tests/queries/0_stateless/03018_external_with_complex_data_types.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+${CLICKHOUSE_CLIENT} --external --file <(echo "Hello, world") --name test --format CSV --structure "x Enum('Hello' = 1, 'world' = 2), y String" --query "SELECT * FROM test"
diff --git a/tests/queries/0_stateless/03019_numbers_pretty.reference b/tests/queries/0_stateless/03019_numbers_pretty.reference
new file mode 100644
index 00000000000..5b25d3dd092
--- /dev/null
+++ b/tests/queries/0_stateless/03019_numbers_pretty.reference
@@ -0,0 +1,30 @@
+��������������┓
+┃ 1230000000. ┃
+┡�������������┩
+│  1230000000 │ -- 1.23 billion
+└─────────────┘
+���������������┓
+┃ -1230000000. ┃
+┡��������������┩
+│  -1230000000 │ -- -1.23 billion
+└──────────────┘
+������┓
+┃ inf ┃
+┡�����┩
+│ inf │
+└─────┘
+�������┓
+┃ -inf ┃
+┡������┩
+│ -inf │
+└──────┘
+������┓
+┃ nan ┃
+┡�����┩
+│ nan │
+└─────┘
+��������┓
+┃ 1e111 ┃
+┡�������┩
+│ 1e111 │ -- 1000000000000000206105119874289560746212057939968.00 vigintillion
+└───────┘
diff --git a/tests/queries/0_stateless/03019_numbers_pretty.sql b/tests/queries/0_stateless/03019_numbers_pretty.sql
new file mode 100644
index 00000000000..91efbe61d43
--- /dev/null
+++ b/tests/queries/0_stateless/03019_numbers_pretty.sql
@@ -0,0 +1,7 @@
+SET output_format_pretty_row_numbers = 0;
+SELECT 1.23e9 FORMAT Pretty;
+SELECT -1.23e9 FORMAT Pretty;
+SELECT inf FORMAT Pretty;
+SELECT -inf FORMAT Pretty;
+SELECT nan FORMAT Pretty;
+SELECT 1e111 FORMAT Pretty;
diff --git a/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.reference b/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.reference
new file mode 100644
index 00000000000..71f9c301195
--- /dev/null
+++ b/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.reference
@@ -0,0 +1,4 @@
+COMMENT 'Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.' │
+COMMENT 'Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.' │
+COMMENT 'Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.' 
+\nCOMMENT \'Contains history of metrics values from tables system.metrics and system.events, periodically flushed to disk.\'
diff --git a/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.sh b/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.sh
new file mode 100755
index 00000000000..b66951d93f6
--- /dev/null
+++ b/tests/queries/0_stateless/03020_long_values_pretty_are_not_cut_if_single.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# The metric_log table has a large number of columns, so its definition is also large.
+# And it is larger than the default value of `output_format_pretty_max_value_width`.
+# But cutting it in the result of SHOW CREATE TABLE will be bad for a user.
+# That's why we control it with the setting `output_format_pretty_max_value_width_apply_for_single_value`.
+
+# Make sure that system.metric_log exists
+${CLICKHOUSE_CLIENT} --query "SELECT 1 FORMAT Null"
+${CLICKHOUSE_CLIENT} --query "SYSTEM FLUSH LOGS"
+
+
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE system.metric_log" --format Pretty | grep -P '^COMMENT'
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE system.metric_log" --format PrettyCompact | grep -P '^COMMENT'
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE system.metric_log" --format PrettySpace | grep -P '^COMMENT'
+
+# Just in case, non-Pretty format:
+${CLICKHOUSE_CLIENT} --query "SHOW CREATE TABLE system.metric_log" --format TSV | grep -o -P '\\nCOMMENT.+$'
diff --git a/tests/queries/0_stateless/03020_order_by_SimpleAggregateFunction.reference b/tests/queries/0_stateless/03020_order_by_SimpleAggregateFunction.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03020_order_by_SimpleAggregateFunction.sql b/tests/queries/0_stateless/03020_order_by_SimpleAggregateFunction.sql
new file mode 100644
index 00000000000..f1727cb9e5c
--- /dev/null
+++ b/tests/queries/0_stateless/03020_order_by_SimpleAggregateFunction.sql
@@ -0,0 +1,18 @@
+set allow_suspicious_primary_key = 0;
+
+DROP TABLE IF EXISTS data;
+
+create table data (key Int, value AggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() order by (key, value); -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+create table data (key Int, value SimpleAggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() order by (key, value); -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+
+create table data (key Int, value AggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() primary key value; -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+create table data (key Int, value SimpleAggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() primary key value; -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+
+create table data (key Int, value AggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() primary key value order by (value, key); -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+create table data (key Int, value SimpleAggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() primary key value order by (value, key); -- { serverError DATA_TYPE_CANNOT_BE_USED_IN_KEY }
+
+set allow_suspicious_primary_key = 1;
+
+create table data (key Int, value SimpleAggregateFunction(sum, UInt64)) engine=AggregatingMergeTree() primary key value order by (value, key);
+
+DROP TABLE data;
diff --git a/tests/queries/0_stateless/03020_output_format_client.reference b/tests/queries/0_stateless/03020_output_format_client.reference
new file mode 100644
index 00000000000..bcb6161e9a0
--- /dev/null
+++ b/tests/queries/0_stateless/03020_output_format_client.reference
@@ -0,0 +1,20 @@
+| x |
+|:-|
+| Hello, world |
+| x |
+|:-|
+| Hello, world |
+| x |
+|:-|
+| Hello, world |
+| x |
+|:-|
+| Hello, world |
+Row 1:
+──────
+x: Hello, world
+Row 1:
+──────
+x: Hello, world
+Hello, world
+Hello, world
diff --git a/tests/queries/0_stateless/03020_output_format_client.sh b/tests/queries/0_stateless/03020_output_format_client.sh
new file mode 100755
index 00000000000..d9de09ee02a
--- /dev/null
+++ b/tests/queries/0_stateless/03020_output_format_client.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+# clickhouse-local has --input-format and --output-format parameters,
+# and also the --format parameter which is the default for both input and output formats, but has less preference.
+
+# clickhouse-client does not have the --input-format parameter.
+# However, it accepts both --format and --output-format for convenience.
+
+${CLICKHOUSE_LOCAL} --output-format Markdown --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_CLIENT} --output-format Markdown --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_LOCAL} --format Markdown --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_CLIENT} --format Markdown --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_LOCAL} --vertical --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_CLIENT} --vertical --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_LOCAL} --query "SELECT 'Hello, world' AS x"
+${CLICKHOUSE_CLIENT} --query "SELECT 'Hello, world' AS x"
diff --git a/tests/queries/0_stateless/03021_get_client_http_header.reference b/tests/queries/0_stateless/03021_get_client_http_header.reference
new file mode 100644
index 00000000000..099bf1fa4e3
--- /dev/null
+++ b/tests/queries/0_stateless/03021_get_client_http_header.reference
@@ -0,0 +1,26 @@
+-- It works.
+application/x-www-form-urlencoded
+-- It supports non constant arguments.
+application/x-www-form-urlencoded
+*/*
+-- Empty string for non-existent headers.
+application/x-www-form-urlencoded
+
+-- I can use my own headers.
+wtf
+-- Some headers cannot be obtained.
+
+
+-- The setting matters.
+FUNCTION_NOT_ALLOWED
+-- The setting is not enabled by default.
+FUNCTION_NOT_ALLOWED
+-- Are headers case-sentitive?
+application/x-www-form-urlencoded
+
+-- Using it from non-HTTP does not make sense.
+
+
+-- Does it work for distributed queries? (not yet, but maybe it will be needed later)
+
+
diff --git a/tests/queries/0_stateless/03021_get_client_http_header.sh b/tests/queries/0_stateless/03021_get_client_http_header.sh
new file mode 100755
index 00000000000..71486c725b4
--- /dev/null
+++ b/tests/queries/0_stateless/03021_get_client_http_header.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
+
+echo "-- It works."
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader('Content-Type')"
+
+echo "-- It supports non constant arguments."
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader(arrayJoin(['Content-Type', 'Accept']))"
+
+echo "-- Empty string for non-existent headers."
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader(arrayJoin(['Content-Type', 'Upyachka']))"
+
+echo "-- I can use my own headers."
+${CLICKHOUSE_CURL} -H 'Upyachka: wtf' "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader('Upyachka')"
+
+echo "-- Some headers cannot be obtained."
+${CLICKHOUSE_CURL} -H 'X-ClickHouse-WTF: Secret' "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader('X-ClickHouse-WTF')"
+${CLICKHOUSE_CURL} -H 'Authentication: Secret' "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader('Authentication')"
+
+echo "-- The setting matters."
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=0" -d "SELECT getClientHTTPHeader(arrayJoin(['Content-Type', 'Accept']))" | grep -o -F 'FUNCTION_NOT_ALLOWED'
+
+echo "-- The setting is not enabled by default."
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}" -d "SELECT getClientHTTPHeader(arrayJoin(['Content-Type', 'Accept']))" | grep -o -F 'FUNCTION_NOT_ALLOWED'
+
+echo "-- Are headers case-sentitive?"
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=1" -d "SELECT getClientHTTPHeader(arrayJoin(['Content-Type', 'content-type']))"
+
+echo "-- Using it from non-HTTP does not make sense."
+${CLICKHOUSE_CLIENT} --allow_get_client_http_header true --query "SELECT getClientHTTPHeader('Host')"
+${CLICKHOUSE_LOCAL} --allow_get_client_http_header true --query "SELECT getClientHTTPHeader('Host')"
+
+echo "-- Does it work for distributed queries? (not yet, but maybe it will be needed later)"
+${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&allow_get_client_http_header=1&prefer_localhost_replica=0" -d "SELECT getClientHTTPHeader(name) FROM clusterAllReplicas('test_cluster_one_shard_two_replicas', view(SELECT 'Content-Type' AS name))"
diff --git a/tests/queries/0_stateless/03021_output_format_tty.reference b/tests/queries/0_stateless/03021_output_format_tty.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03021_output_format_tty.sh b/tests/queries/0_stateless/03021_output_format_tty.sh
new file mode 100755
index 00000000000..55dedeb6773
--- /dev/null
+++ b/tests/queries/0_stateless/03021_output_format_tty.sh
@@ -0,0 +1,26 @@
+#!/usr/bin/expect -f
+
+set basedir [file dirname $argv0]
+set basename [file tail $argv0]
+if {[info exists env(CLICKHOUSE_TMP)]} {
+    set CLICKHOUSE_TMP $env(CLICKHOUSE_TMP)
+} else {
+    set CLICKHOUSE_TMP "."
+}
+exp_internal -f $CLICKHOUSE_TMP/$basename.debuglog 0
+set history_file $CLICKHOUSE_TMP/$basename.history
+
+log_user 0
+set timeout 60
+match_max 100000
+
+expect_after {
+    # Do not ignore eof from expect
+    -i $any_spawn_id eof { exp_continue }
+    # A default timeout action is to do nothing, change it to fail
+    -i $any_spawn_id timeout { exit 1 }
+}
+
+spawn bash -c "source $basedir/../shell_config.sh ; \$CLICKHOUSE_CLIENT --query 'SELECT 1, 2'"
+expect "1\t2"
+expect eof
diff --git a/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.reference b/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.reference
new file mode 100644
index 00000000000..1191247b6d9
--- /dev/null
+++ b/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.reference
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.sql b/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.sql
new file mode 100644
index 00000000000..cd36be085d8
--- /dev/null
+++ b/tests/queries/0_stateless/03022_alter_materialized_view_query_has_inner_table.sql
@@ -0,0 +1,15 @@
+DROP TABLE IF EXISTS src_table;
+DROP TABLE IF EXISTS mv;
+
+CREATE TABLE src_table (`a` UInt32, `b` UInt32) ENGINE = MergeTree ORDER BY a;
+CREATE MATERIALIZED VIEW mv (`a` UInt32) ENGINE = MergeTree ORDER BY a AS SELECT a FROM src_table;
+
+INSERT INTO src_table (a, b) VALUES (1, 1), (2, 2);
+
+SELECT * FROM mv;
+
+SET allow_experimental_alter_materialized_view_structure = 1;
+ALTER TABLE mv MODIFY QUERY SELECT a, b FROM src_table; -- { serverError NO_SUCH_COLUMN_IN_TABLE }
+
+DROP TABLE src_table;
+DROP TABLE mv;
diff --git a/tests/queries/0_stateless/03022_highlight_digit_groups.reference b/tests/queries/0_stateless/03022_highlight_digit_groups.reference
new file mode 100644
index 00000000000..4e814c36309
--- /dev/null
+++ b/tests/queries/0_stateless/03022_highlight_digit_groups.reference
@@ -0,0 +1,68 @@
+ multiply(exp10(number), if(modulo(number, 2), 1, -1))
+
+                                                    -1 
+                                                    10 
+                                                  -100 
+                                                  1000 
+                                                -10000 
+                                                100000 
+                                              -1000000 
+                                              10000000 
+                                            -100000000 
+                                            1000000000 
+                                          -10000000000 
+                                          100000000000 
+                                        -1000000000000 
+                                        10000000000000 
+                                      -100000000000000 
+                                      1000000000000000 
+                                    -10000000000000000 
+                                    100000000000000000 
+                                  -1000000000000000000 
+                                  10000000000000000000 
+                                -100000000000000000000 
+                                                  1e21 
+                                                 -1e22 
+                                                  1e23 
+                                                 -1e24 
+                                                  1e25 
+                                                 -1e26 
+                                                  1e27 
+                                                 -1e28 
+                                                  1e29 
+ exp10(number)
+
+             1 
+            10 
+           100 
+          1000 
+         10000 
+        100000 
+       1000000 
+      10000000 
+     100000000 
+    1000000000 
+ exp10(number)
+
+             1 
+            10 
+           100 
+          1000 
+         10000 
+        100000 
+       1000000 
+      10000000 
+     100000000 
+    1000000000 
+ plus(exp10(number), exp10(negate(number)))
+
+                                          2 
+                                       10.1 
+                                     100.01 
+                                   1000.001 
+                                 10000.0001 
+                               100000.00001 
+                             1000000.000001 
+                           10000000.0000001 
+                         100000000.00000001 
+                                 1000000000 
diff --git a/tests/queries/0_stateless/03022_highlight_digit_groups.sql b/tests/queries/0_stateless/03022_highlight_digit_groups.sql
new file mode 100644
index 00000000000..c48a02e712f
--- /dev/null
+++ b/tests/queries/0_stateless/03022_highlight_digit_groups.sql
@@ -0,0 +1,8 @@
+SET output_format_pretty_row_numbers = 0;
+
+SELECT exp10(number) * (number % 2 ? 1 : -1) FROM numbers(30) FORMAT PrettySpace SETTINGS output_format_pretty_color = 1;
+
+SELECT exp10(number) FROM numbers(10) FORMAT PrettySpace SETTINGS output_format_pretty_color = 1, output_format_pretty_highlight_digit_groups = 0;
+SELECT exp10(number) FROM numbers(10) FORMAT PrettySpace;
+
+SELECT exp10(number) + exp10(-number) FROM numbers(10) FORMAT PrettySpace SETTINGS output_format_pretty_color = 1;
diff --git a/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.reference b/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.reference
new file mode 100644
index 00000000000..4521d575ff3
--- /dev/null
+++ b/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.reference
@@ -0,0 +1,10 @@
+0
+0
+0
+0
+0
+0
+0
+0
+0
+0
diff --git a/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.sql b/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.sql
new file mode 100644
index 00000000000..f0b60caca36
--- /dev/null
+++ b/tests/queries/0_stateless/03023_analyzer_optimize_group_by_function_keys_with_nulls.sql
@@ -0,0 +1,5 @@
+set allow_experimental_analyzer=1;
+set group_by_use_nulls=1;
+set optimize_group_by_function_keys=1;
+SELECT ignore(toLowCardinality(number)) FROM numbers(10) GROUP BY GROUPING SETS ((ignore(toLowCardinality(number)), toLowCardinality(number)));
+
diff --git a/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.reference b/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.reference
new file mode 100644
index 00000000000..4081b82a8f5
--- /dev/null
+++ b/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.reference
@@ -0,0 +1,62 @@
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((0))
+((1))
+((1))
+((2))
+((2))
+((3))
+((3))
+((4))
+((4))
+((5))
+((5))
+((6))
+((6))
+((7))
+((7))
+((8))
+((8))
+((9))
+((9))
+([])
+([])
+([])
+([])
+([])
+([])
+([])
+([])
+([])
+([])
+([])
+([0])
+([1])
+([2])
+([3])
+([4])
+([5])
+([6])
+([7])
+([8])
+([9])
+(0)
+(1)
+(2)
+(3)
+(4)
+(5)
+(6)
+(7)
+(8)
+(9)
diff --git a/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.sql b/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.sql
new file mode 100644
index 00000000000..012da547581
--- /dev/null
+++ b/tests/queries/0_stateless/03023_group_by_use_nulls_analyzer_crashes.sql
@@ -0,0 +1,7 @@
+set allow_experimental_analyzer = 1, group_by_use_nulls = 1;
+
+SELECT tuple(tuple(number)) as x FROM numbers(10) GROUP BY (number, tuple(number)) with cube order by x;
+
+select tuple(array(number)) as x FROM numbers(10) GROUP BY number, array(number) WITH ROLLUP order by x;
+
+SELECT tuple(number) AS x FROM numbers(10) GROUP BY GROUPING SETS (number) order by x;
diff --git a/tests/queries/0_stateless/03023_remove_unused_column_distinct.reference b/tests/queries/0_stateless/03023_remove_unused_column_distinct.reference
new file mode 100644
index 00000000000..adb11f046e0
--- /dev/null
+++ b/tests/queries/0_stateless/03023_remove_unused_column_distinct.reference
@@ -0,0 +1,6 @@
+product_0
+product_1
+product_0
+product_1
+product_0
+product_1
diff --git a/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql b/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql
new file mode 100644
index 00000000000..c2f32bfe3c1
--- /dev/null
+++ b/tests/queries/0_stateless/03023_remove_unused_column_distinct.sql
@@ -0,0 +1,15 @@
+SELECT product_id
+FROM
+(
+    SELECT DISTINCT
+        product_id,
+        section_id
+    FROM
+    (
+        SELECT
+            concat('product_', number % 2) AS product_id,
+            concat('section_', number % 3) AS section_id
+        FROM numbers(10)
+    )
+)
+SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/0_stateless/03030_system_flush_distributed_settings.reference b/tests/queries/0_stateless/03030_system_flush_distributed_settings.reference
new file mode 100644
index 00000000000..5caff40c4a0
--- /dev/null
+++ b/tests/queries/0_stateless/03030_system_flush_distributed_settings.reference
@@ -0,0 +1 @@
+10000
diff --git a/tests/queries/0_stateless/03030_system_flush_distributed_settings.sql b/tests/queries/0_stateless/03030_system_flush_distributed_settings.sql
new file mode 100644
index 00000000000..da2a387e07c
--- /dev/null
+++ b/tests/queries/0_stateless/03030_system_flush_distributed_settings.sql
@@ -0,0 +1,19 @@
+drop table if exists ephemeral;
+drop table if exists dist_in;
+drop table if exists data;
+drop table if exists mv;
+drop table if exists dist_out;
+
+create table ephemeral (key Int, value Int) engine=Null();
+create table dist_in as ephemeral engine=Distributed(test_shard_localhost, currentDatabase(), ephemeral, key) settings background_insert_batch=1;
+create table data (key Int, uniq_values Int) engine=Memory();
+create materialized view mv to data as select key, uniqExact(value) uniq_values from ephemeral group by key;
+system stop distributed sends dist_in;
+create table dist_out as data engine=Distributed(test_shard_localhost, currentDatabase(), data);
+
+set prefer_localhost_replica=0;
+
+insert into dist_in select number/100, number from system.numbers limit 1e6 settings max_memory_usage='20Mi';
+system flush distributed dist_in; -- { serverError MEMORY_LIMIT_EXCEEDED }
+system flush distributed dist_in settings max_memory_usage=0;
+select count() from dist_out;
diff --git a/tests/queries/0_stateless/03031_filter_float64_logical_error.reference b/tests/queries/0_stateless/03031_filter_float64_logical_error.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03031_filter_float64_logical_error.sql b/tests/queries/0_stateless/03031_filter_float64_logical_error.sql
new file mode 100644
index 00000000000..59d4a06c8f7
--- /dev/null
+++ b/tests/queries/0_stateless/03031_filter_float64_logical_error.sql
@@ -0,0 +1,40 @@
+CREATE TABLE 03031_test
+(
+    `id` UInt64,
+    `value_1` String,
+    `value_2` String,
+    `value_3` String,
+    INDEX value_1_idx value_1 TYPE bloom_filter GRANULARITY 1,
+    INDEX value_2_idx value_2 TYPE ngrambf_v1(3, 512, 2, 0) GRANULARITY 1,
+    INDEX value_3_idx value_3 TYPE tokenbf_v1(512, 3, 0) GRANULARITY 1
+)
+ENGINE = MergeTree
+ORDER BY id;
+
+INSERT INTO 03031_test SELECT
+    number,
+    toString(number),
+    toString(number),
+    toString(number)
+FROM numbers(10);
+
+SELECT
+    count('9223372036854775806'),
+    7
+FROM 03031_test
+PREWHERE (id = NULL) AND 1024
+WHERE 0.0001
+GROUP BY '0.03'
+    WITH ROLLUP
+SETTINGS force_primary_key = 1, force_data_skipping_indices = 'value_1_idx, value_2_idx', allow_experimental_analyzer=0;
+
+
+SELECT
+    count('9223372036854775806'),
+    7
+FROM 03031_test
+PREWHERE (id = NULL) AND 1024
+WHERE 0.0001
+GROUP BY '0.03'
+    WITH ROLLUP
+SETTINGS force_primary_key = 1, force_data_skipping_indices = 'value_1_idx, value_2_idx', allow_experimental_analyzer=1; -- { serverError ILLEGAL_TYPE_OF_COLUMN_FOR_FILTER }
diff --git a/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.reference b/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.reference
new file mode 100644
index 00000000000..50433fd0b12
--- /dev/null
+++ b/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.reference
@@ -0,0 +1 @@
+some string
diff --git a/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.sql b/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.sql
new file mode 100644
index 00000000000..d551a449a8a
--- /dev/null
+++ b/tests/queries/0_stateless/03031_input_format_allow_errors_num_bad_escape_sequence.sql
@@ -0,0 +1,2 @@
+select * from format(JSONEachRow, '{"item" : "some string"}, {"item":"\\\\ \ud83d"}') settings input_format_allow_errors_num=1;
+
diff --git a/tests/queries/0_stateless/03031_low_cardinality_logical_error.reference b/tests/queries/0_stateless/03031_low_cardinality_logical_error.reference
new file mode 100644
index 00000000000..931811041f2
--- /dev/null
+++ b/tests/queries/0_stateless/03031_low_cardinality_logical_error.reference
@@ -0,0 +1,6 @@
+[]	0	['2']
+['0']	2	['0']
+['0']	2	['0']
+['1']	1	[]
+
+[]	3	[]
diff --git a/tests/queries/0_stateless/03031_low_cardinality_logical_error.sql b/tests/queries/0_stateless/03031_low_cardinality_logical_error.sql
new file mode 100644
index 00000000000..02ef0585b00
--- /dev/null
+++ b/tests/queries/0_stateless/03031_low_cardinality_logical_error.sql
@@ -0,0 +1,14 @@
+SELECT *
+FROM (
+  SELECT
+    ([toString(number % 2)] :: Array(LowCardinality(String))) AS item_id,
+    count()
+  FROM numbers(3)
+  GROUP BY item_id WITH TOTALS
+) AS l FULL JOIN (
+  SELECT
+    ([toString((number % 2) * 2)] :: Array(String)) AS item_id
+  FROM numbers(3)
+) AS r
+ON l.item_id = r.item_id
+ORDER BY 1,2,3;
diff --git a/tests/queries/0_stateless/03031_tuple_elimination_analyzer.reference b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.reference
new file mode 100644
index 00000000000..84ab67a85e0
--- /dev/null
+++ b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.reference
@@ -0,0 +1 @@
+(0)
diff --git a/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql
new file mode 100644
index 00000000000..97a19cda7d3
--- /dev/null
+++ b/tests/queries/0_stateless/03031_tuple_elimination_analyzer.sql
@@ -0,0 +1,9 @@
+DROP TABLE IF EXISTS test;
+
+SET allow_suspicious_low_cardinality_types = true, allow_experimental_analyzer = true;
+
+CREATE TABLE test (`id` LowCardinality(UInt32)) ENGINE = MergeTree ORDER BY id AS SELECT 0;
+
+SELECT tuple(tuple(id) = tuple(1048576)) FROM test;
+
+DROP TABLE test;
diff --git a/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.reference b/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.reference
new file mode 100644
index 00000000000..fcb49fa9945
--- /dev/null
+++ b/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.reference
@@ -0,0 +1,7 @@
+1
+1
+1
+1
+1
+1
+1
diff --git a/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.sh b/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.sh
new file mode 100755
index 00000000000..79c43048b89
--- /dev/null
+++ b/tests/queries/0_stateless/03032_dynamically_resize_filesystem_cache_2.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest, no-parallel, no-s3-storage, no-random-settings
+
+CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CUR_DIR"/../shell_config.sh
+
+disk_name="s3_cache"
+
+$CLICKHOUSE_CLIENT -nm --query "
+DROP TABLE IF EXISTS test;
+CREATE TABLE test (a String) engine=MergeTree() ORDER BY tuple() SETTINGS disk = '$disk_name';
+INSERT INTO test SELECT randomString(1000);
+"
+
+$CLICKHOUSE_CLIENT --query "SELECT * FROM test FORMAT Null"
+
+prev_max_size=$($CLICKHOUSE_CLIENT --query "SELECT max_size FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name'")
+$CLICKHOUSE_CLIENT --query "SELECT current_size > 0 FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+
+config_path=/etc/clickhouse-server/config.d/storage_conf.xml
+config_path_tmp=$config_path.tmp
+
+new_max_size=$($CLICKHOUSE_CLIENT --query "SELECT divide(max_size, 2) FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name'")
+sed -i "s|<max_size>$prev_max_size<\/max_size>|<max_size>$new_max_size<\/max_size>|"  $config_path
+
+# echo $prev_max_size
+# echo $new_max_size
+
+$CLICKHOUSE_CLIENT -nm --query "
+set send_logs_level='fatal';
+SYSTEM RELOAD CONFIG"
+
+$CLICKHOUSE_CLIENT --query "SELECT max_size == $new_max_size FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+$CLICKHOUSE_CLIENT --query "SELECT current_size > 0 FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+$CLICKHOUSE_CLIENT --query "SELECT current_size <= max_size FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+
+sed -i "s|<max_size>$new_max_size<\/max_size>|<max_size>$prev_max_size<\/max_size>|"  $config_path
+
+$CLICKHOUSE_CLIENT -nm --query "
+set send_logs_level='fatal';
+SYSTEM RELOAD CONFIG"
+
+$CLICKHOUSE_CLIENT --query "SELECT max_size == $prev_max_size FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+$CLICKHOUSE_CLIENT --query "SELECT current_size > 0 FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
+$CLICKHOUSE_CLIENT --query "SELECT current_size <= max_size FROM system.filesystem_cache_settings WHERE cache_name = '$disk_name' FORMAT TabSeparated"
diff --git a/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.reference b/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.reference
new file mode 100644
index 00000000000..6dda968659d
--- /dev/null
+++ b/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.reference
@@ -0,0 +1,7 @@
+CREATE TABLE default.data_r2
+(
+    `key` Int32
+)
+ENGINE = ReplicatedMergeTree('/tables/default', 'r2')
+ORDER BY tuple()
+SETTINGS index_granularity = 8192
diff --git a/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.sql b/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.sql
new file mode 100644
index 00000000000..e08db0bdacf
--- /dev/null
+++ b/tests/queries/0_stateless/03032_rmt_create_columns_from_replica.sql
@@ -0,0 +1,5 @@
+drop table if exists data_r1;
+drop table if exists data_r2;
+create table data_r1 (key Int) engine=ReplicatedMergeTree('/tables/{database}', 'r1') order by tuple();
+create table data_r2 engine=ReplicatedMergeTree('/tables/{database}', 'r2') order by tuple();
+show create data_r2 format LineAsString;
diff --git a/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.reference b/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.reference
new file mode 100644
index 00000000000..d529e0b2cf8
--- /dev/null
+++ b/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.reference
@@ -0,0 +1,11 @@
+\\u
+\\ud
+\\ud8
+\\ud80
+\\ud800
+\\ud800\\
+\\ud800\\u
+\\ud800\\u1
+\\ud800\\u12
+\\ud800\\u123
+\\ud800\\u1234
diff --git a/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.sql b/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.sql
new file mode 100644
index 00000000000..cdec0f078f9
--- /dev/null
+++ b/tests/queries/0_stateless/03032_save_bad_json_escape_sequences.sql
@@ -0,0 +1,16 @@
+set input_format_json_throw_on_bad_escape_sequence=0;
+
+select * from format(JSONEachRow, $$
+{"key" : "\u"}
+{"key" : "\ud"}
+{"key" : "\ud8"}
+{"key" : "\ud80"}
+{"key" : "\ud800"}
+{"key" : "\ud800\"}
+{"key" : "\ud800\u"}
+{"key" : "\ud800\u1"}
+{"key" : "\ud800\u12"}
+{"key" : "\ud800\u123"}
+{"key" : "\ud800\u1234"}
+$$);
+
diff --git a/tests/queries/0_stateless/03032_scalars_create_as_select.reference b/tests/queries/0_stateless/03032_scalars_create_as_select.reference
new file mode 100644
index 00000000000..2e73a0708a2
--- /dev/null
+++ b/tests/queries/0_stateless/03032_scalars_create_as_select.reference
@@ -0,0 +1 @@
+['a','b']
diff --git a/tests/queries/0_stateless/03032_scalars_create_as_select.sql b/tests/queries/0_stateless/03032_scalars_create_as_select.sql
new file mode 100644
index 00000000000..ae75a30ad8b
--- /dev/null
+++ b/tests/queries/0_stateless/03032_scalars_create_as_select.sql
@@ -0,0 +1,2 @@
+create table query_run_metric_arrays engine Memory as with (with (select groupUniqArrayArray(['a', 'b']) from numbers(1)) as all_names select all_names) as all_metrics select all_metrics;
+select * from query_run_metric_arrays;
diff --git a/tests/queries/0_stateless/03032_storage_memory_modify_settings.reference b/tests/queries/0_stateless/03032_storage_memory_modify_settings.reference
new file mode 100644
index 00000000000..ca772aa7fd0
--- /dev/null
+++ b/tests/queries/0_stateless/03032_storage_memory_modify_settings.reference
@@ -0,0 +1,20 @@
+TESTING MODIFY SMALLER BYTES
+17408
+16384
+65536
+TESTING MODIFY SMALLER ROWS
+1100
+1000
+500
+TESTING ADD SETTINGS
+50
+1000
+1070
+1020
+1100
+TESTING ADD SETTINGS
+50
+1000
+1020
+1100
+TESTING INVALID SETTINGS
diff --git a/tests/queries/0_stateless/03032_storage_memory_modify_settings.sql b/tests/queries/0_stateless/03032_storage_memory_modify_settings.sql
new file mode 100644
index 00000000000..1507107c37f
--- /dev/null
+++ b/tests/queries/0_stateless/03032_storage_memory_modify_settings.sql
@@ -0,0 +1,76 @@
+SET max_block_size = 65409; -- Default value
+
+SELECT 'TESTING MODIFY SMALLER BYTES';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_bytes_to_keep = 8192, max_bytes_to_keep = 32768;
+
+INSERT INTO memory SELECT * FROM numbers(0, 100); -- 1024 bytes
+INSERT INTO memory SELECT * FROM numbers(0, 3000); -- 16384 bytes
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 17408 in total
+
+ALTER TABLE memory MODIFY SETTING min_bytes_to_keep = 4096, max_bytes_to_keep = 16384;
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 16384 in total after deleting
+
+INSERT INTO memory SELECT * FROM numbers(3000, 10000); -- 65536 bytes
+SELECT total_bytes FROM system.tables WHERE name = 'memory' and database = currentDatabase();
+
+SELECT 'TESTING MODIFY SMALLER ROWS';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory SETTINGS min_rows_to_keep = 200, max_rows_to_keep = 2000;
+
+INSERT INTO memory SELECT * FROM numbers(0, 100); -- 100 rows
+INSERT INTO memory SELECT * FROM numbers(100, 1000); -- 1000 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1100 in total
+
+ALTER TABLE memory MODIFY SETTING min_rows_to_keep = 100, max_rows_to_keep = 1000;
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1000 in total after deleting
+
+INSERT INTO memory SELECT * FROM numbers(1000, 500); -- 500 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 500 in total after deleting
+
+SELECT 'TESTING ADD SETTINGS';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory;
+
+INSERT INTO memory SELECT * FROM numbers(0, 50); -- 50 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 50 in total
+
+INSERT INTO memory SELECT * FROM numbers(50, 950); -- 950 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1000 in total
+
+INSERT INTO memory SELECT * FROM numbers(2000, 70); -- 70 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1070 in total
+
+ALTER TABLE memory MODIFY SETTING min_rows_to_keep = 100, max_rows_to_keep = 1000;
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1020 in total after deleting
+
+INSERT INTO memory SELECT * FROM numbers(3000, 1100); -- 1100 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1100 in total after deleting
+
+SELECT 'TESTING ADD SETTINGS';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory;
+ALTER TABLE memory MODIFY SETTING min_rows_to_keep = 100, max_rows_to_keep = 1000;
+
+INSERT INTO memory SELECT * FROM numbers(0, 50); -- 50 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 50 in total
+
+INSERT INTO memory SELECT * FROM numbers(50, 950); -- 950 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1000 in total
+
+INSERT INTO memory SELECT * FROM numbers(2000, 70); -- 70 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1020 in total after deleting
+
+INSERT INTO memory SELECT * FROM numbers(3000, 1100); -- 1100 rows
+SELECT total_rows FROM system.tables WHERE name = 'memory' and database = currentDatabase(); -- 1100 in total after deleting
+
+SELECT 'TESTING INVALID SETTINGS';
+DROP TABLE IF EXISTS memory;
+CREATE TABLE memory (i UInt32) ENGINE = Memory;
+ALTER TABLE memory MODIFY SETTING min_rows_to_keep = 100;  -- { serverError 452 }
+ALTER TABLE memory MODIFY SETTING min_bytes_to_keep = 100; -- { serverError 452 }
+ALTER TABLE memory MODIFY SETTING max_rows_to_keep = 1000;
+ALTER TABLE memory MODIFY SETTING max_bytes_to_keep = 1000;
+
+DROP TABLE memory;
+
diff --git a/tests/queries/0_stateless/03032_string_to_variant_cast.reference b/tests/queries/0_stateless/03032_string_to_variant_cast.reference
new file mode 100644
index 00000000000..6531e2206a5
--- /dev/null
+++ b/tests/queries/0_stateless/03032_string_to_variant_cast.reference
@@ -0,0 +1,13 @@
+42	UInt64
+abc	String
+\N	None
+[1,2,3]	Array(UInt64)
+[1, 2, 3	String
+\N	None
+42	UInt64
+42	UInt64
+42	UInt64
+\N	None
+42	UInt64
+\N	None
+\N	None
diff --git a/tests/queries/0_stateless/03032_string_to_variant_cast.sql b/tests/queries/0_stateless/03032_string_to_variant_cast.sql
new file mode 100644
index 00000000000..67a501b9628
--- /dev/null
+++ b/tests/queries/0_stateless/03032_string_to_variant_cast.sql
@@ -0,0 +1,17 @@
+set allow_experimental_variant_type=1;
+select CAST('42', 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('abc', 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('null', 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('[1, 2, 3]', 'Variant(String, Array(UInt64))') as v, variantType(v);
+select CAST('[1, 2, 3', 'Variant(String, Array(UInt64))') as v, variantType(v);
+select CAST('42', 'Variant(Date)') as v, variantType(v); -- {serverError INCORRECT_DATA}
+select accurateCastOrNull('42', 'Variant(Date)') as v, variantType(v);
+
+select CAST('42'::FixedString(2), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('42'::LowCardinality(String), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('42'::Nullable(String), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST(NULL::Nullable(String), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST('42'::LowCardinality(Nullable(String)), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST(NULL::LowCardinality(Nullable(String)), 'Variant(String, UInt64)') as v, variantType(v);
+select CAST(NULL::LowCardinality(Nullable(FixedString(2))), 'Variant(String, UInt64)') as v, variantType(v);
+
diff --git a/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.reference b/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.reference
new file mode 100644
index 00000000000..27ba77ddaf6
--- /dev/null
+++ b/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.reference
@@ -0,0 +1 @@
+true
diff --git a/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.sql b/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.sql
new file mode 100644
index 00000000000..b7609d34f58
--- /dev/null
+++ b/tests/queries/0_stateless/03032_variant_bool_number_not_suspicious.sql
@@ -0,0 +1,4 @@
+set allow_experimental_variant_type=1;
+set allow_suspicious_variant_types=0;
+select 'true'::Bool::Variant(UInt32, Bool);
+
diff --git a/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.reference b/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.reference
new file mode 100644
index 00000000000..86a00059854
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.reference
@@ -0,0 +1,3 @@
+UInt32	1
+UInt32	2
+UInt32	3
diff --git a/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.sql b/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.sql
new file mode 100644
index 00000000000..9be1152bbbf
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_merge_engine_filter_push_down.sql
@@ -0,0 +1,8 @@
+set allow_suspicious_low_cardinality_types=1;
+drop table if exists test;
+create table test (`x` LowCardinality(Nullable(UInt32)), `y` String) engine = MergeTree order by tuple();
+insert into test values (1, 'a'), (2, 'bb'), (3, 'ccc'), (4, 'dddd');
+create table m_table (x UInt32, y String) engine = Merge(currentDatabase(), 'test*');
+select toTypeName(x), x FROM m_table SETTINGS additional_table_filters = {'m_table':'x != 4'}, optimize_move_to_prewhere=1, allow_experimental_analyzer=1;
+drop table test;
+
diff --git a/tests/queries/0_stateless/03033_analyzer_query_parameters.reference b/tests/queries/0_stateless/03033_analyzer_query_parameters.reference
new file mode 100644
index 00000000000..6ed281c757a
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_query_parameters.reference
@@ -0,0 +1,2 @@
+1
+1
diff --git a/tests/queries/0_stateless/03033_analyzer_query_parameters.sh b/tests/queries/0_stateless/03033_analyzer_query_parameters.sh
new file mode 100755
index 00000000000..cf46067df99
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_query_parameters.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
+
+${CLICKHOUSE_LOCAL} --param_rounding 1 --query "SELECT 1 AS x ORDER BY x WITH FILL STEP {rounding:UInt32} SETTINGS allow_experimental_analyzer = 1"
+${CLICKHOUSE_LOCAL} --param_rounding 1 --query "SELECT 1 AS x ORDER BY x WITH FILL STEP {rounding:UInt32} SETTINGS allow_experimental_analyzer = 0"
diff --git a/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.reference b/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.reference
new file mode 100644
index 00000000000..f599e28b8ab
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.reference
@@ -0,0 +1 @@
+10
diff --git a/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.sql b/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.sql
new file mode 100644
index 00000000000..22f103c9bd5
--- /dev/null
+++ b/tests/queries/0_stateless/03033_analyzer_resolve_from_parent_scope.sql
@@ -0,0 +1,27 @@
+CREATE TABLE vecs_Float32 (v Array(Float32)) ENGINE=Memory;
+INSERT INTO vecs_Float32
+SELECT v FROM (
+    SELECT
+        number AS n,
+        [
+                    rand(n*10), rand(n*10+1), rand(n*10+2), rand(n*10+3), rand(n*10+4), rand(n*10+5), rand(n*10+6), rand(n*10+7), rand(n*10+8), rand(n*10+9),
+                    rand(n*10+10), rand(n*10+11), rand(n*10+12), rand(n*10+13), rand(n*10+14), rand(n*10+15), rand(n*10+16), rand(n*10+17), rand(n*10+18), rand(n*10+19),
+                    rand(n*10+20), rand(n*10+21), rand(n*10+22), rand(n*10+23), rand(n*10+24), rand(n*10+25), rand(n*10+26), rand(n*10+27), rand(n*10+28), rand(n*10+29),
+                    rand(n*10+30), rand(n*10+31), rand(n*10+32), rand(n*10+33), rand(n*10+34), rand(n*10+35), rand(n*10+36), rand(n*10+37), rand(n*10+38), rand(n*10+39),
+                    rand(n*10+40), rand(n*10+41), rand(n*10+42), rand(n*10+43), rand(n*10+44), rand(n*10+45), rand(n*10+46), rand(n*10+47), rand(n*10+48), rand(n*10+49),
+                    rand(n*10+50), rand(n*10+51), rand(n*10+52), rand(n*10+53), rand(n*10+54), rand(n*10+55), rand(n*10+56), rand(n*10+57), rand(n*10+58), rand(n*10+59),
+                    rand(n*10+60), rand(n*10+61), rand(n*10+62), rand(n*10+63), rand(n*10+64), rand(n*10+65), rand(n*10+66), rand(n*10+67), rand(n*10+68), rand(n*10+69),
+                    rand(n*10+70), rand(n*10+71), rand(n*10+72), rand(n*10+73), rand(n*10+74), rand(n*10+75), rand(n*10+76), rand(n*10+77), rand(n*10+78), rand(n*10+79),
+                    rand(n*10+80), rand(n*10+81), rand(n*10+82), rand(n*10+83), rand(n*10+84), rand(n*10+85), rand(n*10+86), rand(n*10+87), rand(n*10+88), rand(n*10+89),
+                    rand(n*10+90), rand(n*10+91), rand(n*10+92), rand(n*10+93), rand(n*10+94), rand(n*10+95), rand(n*10+96), rand(n*10+97), rand(n*10+98), rand(n*10+99),
+                    rand(n*10+100), rand(n*10+101), rand(n*10+102), rand(n*10+103), rand(n*10+104), rand(n*10+105), rand(n*10+106), rand(n*10+107), rand(n*10+108), rand(n*10+109),
+                    rand(n*10+110), rand(n*10+111), rand(n*10+112), rand(n*10+113), rand(n*10+114), rand(n*10+115), rand(n*10+116), rand(n*10+117), rand(n*10+118), rand(n*10+119),
+                    rand(n*10+120), rand(n*10+121), rand(n*10+122), rand(n*10+123), rand(n*10+124), rand(n*10+125), rand(n*10+126), rand(n*10+127), rand(n*10+128), rand(n*10+129),
+                    rand(n*10+130), rand(n*10+131), rand(n*10+132), rand(n*10+133), rand(n*10+134), rand(n*10+135), rand(n*10+136), rand(n*10+137), rand(n*10+138), rand(n*10+139),
+                    rand(n*10+140), rand(n*10+141), rand(n*10+142), rand(n*10+143), rand(n*10+144), rand(n*10+145), rand(n*10+146), rand(n*10+147), rand(n*10+148), rand(n*10+149)
+        ] AS v
+        FROM system.numbers
+        LIMIT 10
+);
+
+WITH (SELECT v FROM vecs_Float32 limit 1) AS a SELECT count(dp) FROM (SELECT dotProduct(a, v) AS dp FROM vecs_Float32);
diff --git a/tests/queries/0_stateless/03033_cte_numbers_memory.reference b/tests/queries/0_stateless/03033_cte_numbers_memory.reference
new file mode 100644
index 00000000000..8d2470dea44
--- /dev/null
+++ b/tests/queries/0_stateless/03033_cte_numbers_memory.reference
@@ -0,0 +1,10 @@
+0
+1
+2
+3
+4
+0
+1
+2
+3
+4
diff --git a/tests/queries/0_stateless/03033_cte_numbers_memory.sql b/tests/queries/0_stateless/03033_cte_numbers_memory.sql
new file mode 100644
index 00000000000..66b11cbfaa5
--- /dev/null
+++ b/tests/queries/0_stateless/03033_cte_numbers_memory.sql
@@ -0,0 +1,16 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61238
+SET allow_experimental_analyzer=1;
+
+WITH
+(SELECT number FROM system.numbers LIMIT 1) as w1,
+(SELECT number FROM system.numbers LIMIT 1) as w2,
+(SELECT number FROM system.numbers LIMIT 1) as w3,
+(SELECT number FROM system.numbers LIMIT 1) as w4,
+(SELECT number FROM system.numbers LIMIT 1) as w5,
+(SELECT number FROM system.numbers LIMIT 1) as w6
+SELECT number FROM (
+    SELECT number FROM system.numbers LIMIT 10
+    UNION ALL
+    SELECT number FROM system.numbers LIMIT 10
+)
+WHERE number < 5;
diff --git a/tests/queries/0_stateless/03033_distinct_transform_const_columns.reference b/tests/queries/0_stateless/03033_distinct_transform_const_columns.reference
new file mode 100644
index 00000000000..d05b1f927f4
--- /dev/null
+++ b/tests/queries/0_stateless/03033_distinct_transform_const_columns.reference
@@ -0,0 +1 @@
+0	0
diff --git a/tests/queries/0_stateless/03033_distinct_transform_const_columns.sql b/tests/queries/0_stateless/03033_distinct_transform_const_columns.sql
new file mode 100644
index 00000000000..41df19ab64e
--- /dev/null
+++ b/tests/queries/0_stateless/03033_distinct_transform_const_columns.sql
@@ -0,0 +1 @@
+SELECT DISTINCT COALESCE(COALESCE('') = toNullable('b3'), toUInt128(toNullable(2)), 2, 2, toLowCardinality(2), 2, 2, 2, toUInt128(toNullable(2)), materialize(2), toUInt128(2), 2, 2), COALESCE(COALESCE(COALESCE(materialize(''))) = 'b3', 2, 2, 2, toLowCardinality(2), toUInt128(2), 2, 2, 2, materialize(toUInt256(2)), 2, 2, 2) FROM numbers(100000);
diff --git a/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.reference b/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.reference
new file mode 100644
index 00000000000..5782593a455
--- /dev/null
+++ b/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.reference
@@ -0,0 +1 @@
+2	2	2
diff --git a/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.sql b/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.sql
new file mode 100644
index 00000000000..84ab1d33c94
--- /dev/null
+++ b/tests/queries/0_stateless/03033_index_definition_sql_udf_bug.sql
@@ -0,0 +1,21 @@
+-- Tags: no-parallel
+
+DROP FUNCTION IF EXISTS test_func_1;
+CREATE FUNCTION test_func_1 AS (a, b, c) -> ((a + b) + c);
+
+DROP TABLE IF EXISTS t4_2;
+CREATE TABLE t4_2
+(
+  `col1` Int64 NOT NULL COMMENT 'test',
+  `col2` Float64 NOT NULL,
+  `col3` Int64 NOT NULL,
+  INDEX ind4 test_func_1(col1, col3, col1) TYPE set(51) GRANULARITY 5
+)
+ENGINE = MergeTree
+ORDER BY col1
+;
+
+INSERT INTO t4_2 (col1, col2, col3) SELECT number, number, number FROM numbers(10);
+
+SELECT * FROM t4_2 WHERE test_func_1(col1, col3, col1) = 6
+SETTINGS force_data_skipping_indices = 'ind4';
diff --git a/tests/queries/0_stateless/03033_lightweight_deletes_sync.reference b/tests/queries/0_stateless/03033_lightweight_deletes_sync.reference
new file mode 100644
index 00000000000..181282ffa9a
--- /dev/null
+++ b/tests/queries/0_stateless/03033_lightweight_deletes_sync.reference
@@ -0,0 +1,4 @@
+2
+0
+2
+1
diff --git a/tests/queries/0_stateless/03033_lightweight_deletes_sync.sql b/tests/queries/0_stateless/03033_lightweight_deletes_sync.sql
new file mode 100644
index 00000000000..bb4bb6dfa3d
--- /dev/null
+++ b/tests/queries/0_stateless/03033_lightweight_deletes_sync.sql
@@ -0,0 +1,18 @@
+DROP TABLE IF EXISTS t_lightweight_deletes;
+
+CREATE TABLE t_lightweight_deletes (a UInt64) ENGINE = MergeTree ORDER BY a;
+
+INSERT INTO t_lightweight_deletes VALUES (1) (2) (3);
+
+DELETE FROM t_lightweight_deletes WHERE a = 1 SETTINGS lightweight_deletes_sync = 2;
+
+SELECT count() FROM t_lightweight_deletes;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_lightweight_deletes' AND NOT is_done;
+
+SYSTEM STOP MERGES t_lightweight_deletes;
+DELETE FROM t_lightweight_deletes WHERE a = 2 SETTINGS lightweight_deletes_sync = 0;
+
+SELECT count() FROM t_lightweight_deletes;
+SELECT count() FROM system.mutations WHERE database = currentDatabase() AND table = 't_lightweight_deletes' AND NOT is_done;
+
+DROP TABLE t_lightweight_deletes;
diff --git a/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.reference b/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.reference
new file mode 100644
index 00000000000..08839f6bb29
--- /dev/null
+++ b/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.reference
@@ -0,0 +1 @@
+200
diff --git a/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.sql b/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.sql
new file mode 100644
index 00000000000..25ec1c8fd80
--- /dev/null
+++ b/tests/queries/0_stateless/03033_parts_splitter_bug_and_index_loading.sql
@@ -0,0 +1,19 @@
+create table t(a UInt32, b UInt32) engine=MergeTree order by (a, b) settings index_granularity=1;
+
+system stop merges t;
+
+-- for this part the first columns is useless, so we have to use both
+insert into t select 42, number from numbers_mt(100);
+
+-- for this part the first columns is enough
+insert into t select number, number from numbers_mt(100);
+
+-- force reloading index
+detach table t;
+attach table t;
+
+set merge_tree_min_bytes_for_concurrent_read=1, merge_tree_min_rows_for_concurrent_read=1, merge_tree_read_split_ranges_into_intersecting_and_non_intersecting_injection_probability=1.0, max_threads=4;
+
+-- the bug happened when we used (a, b) index values for one part and only (a) for another in PartsSplitter. even a simple count query is enough,
+-- because some granules were assinged to wrong layers and hence not returned from the reading step (because they were filtered out by `FilterSortedStreamByRange`)
+select count() from t where not ignore(*);
diff --git a/tests/queries/0_stateless/03033_scalars_context_data_race.reference b/tests/queries/0_stateless/03033_scalars_context_data_race.reference
new file mode 100644
index 00000000000..f96ac067218
--- /dev/null
+++ b/tests/queries/0_stateless/03033_scalars_context_data_race.reference
@@ -0,0 +1 @@
+105
diff --git a/tests/queries/0_stateless/03033_scalars_context_data_race.sql b/tests/queries/0_stateless/03033_scalars_context_data_race.sql
new file mode 100644
index 00000000000..8c72bb53c72
--- /dev/null
+++ b/tests/queries/0_stateless/03033_scalars_context_data_race.sql
@@ -0,0 +1,104 @@
+DROP TABLE IF EXISTS test;
+DROP TABLE IF EXISTS test_tmp;
+DROP TABLE IF EXISTS dst;
+DROP TABLE IF EXISTS view;
+
+CREATE TABLE test 
+(
+    `address` FixedString(20),
+    `deployer` FixedString(20),
+    `block_number` UInt256,
+    `block_hash` FixedString(32),
+    `block_timestamp` DateTime('UTC'),
+    `insertion_time` DateTime('UTC')
+)
+ENGINE = MergeTree
+ORDER BY address
+SETTINGS index_granularity = 8192;
+
+CREATE TABLE test_tmp as test;
+
+CREATE TABLE dst
+(
+    `block_timestamp` AggregateFunction(max, Nullable(DateTime('UTC'))),
+    `block_hash` AggregateFunction(argMax, Nullable(FixedString(32)), DateTime('UTC')),
+    `block_number` AggregateFunction(argMax, Nullable(UInt256), DateTime('UTC')),
+    `deployer` AggregateFunction(argMax, Nullable(FixedString(20)), DateTime('UTC')),
+    `address` FixedString(20),
+    `name` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `symbol` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `decimals` AggregateFunction(argMax, Nullable(UInt8), DateTime('UTC')),
+    `is_proxy` AggregateFunction(argMax, Nullable(Bool), DateTime('UTC')),
+    `blacklist_flags` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `whitelist_flags` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `detected_standards` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `amended_type` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `comment` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `_sources` AggregateFunction(groupUniqArray, String),
+    `_updated_at` AggregateFunction(max, DateTime('UTC')),
+    `_active` AggregateFunction(argMax, Bool, DateTime('UTC'))
+)
+ENGINE = MergeTree
+ORDER BY address
+SETTINGS index_granularity = 8192;
+
+CREATE MATERIALIZED VIEW view TO dst
+(
+    `block_timestamp` AggregateFunction(max, Nullable(DateTime('UTC'))),
+    `block_hash` AggregateFunction(argMax, Nullable(FixedString(32)), DateTime('UTC')),
+    `block_number` AggregateFunction(argMax, Nullable(UInt256), DateTime('UTC')),
+    `deployer` AggregateFunction(argMax, Nullable(FixedString(20)), DateTime('UTC')),
+    `address` FixedString(20),
+    `name` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `symbol` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `decimals` AggregateFunction(argMax, Nullable(UInt8), DateTime('UTC')),
+    `is_proxy` AggregateFunction(argMax, Nullable(Bool), DateTime('UTC')),
+    `blacklist_flags` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `whitelist_flags` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `detected_standards` AggregateFunction(argMax, Array(Nullable(String)), DateTime('UTC')),
+    `amended_type` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `comment` AggregateFunction(argMax, Nullable(String), DateTime('UTC')),
+    `_sources` AggregateFunction(groupUniqArray, String),
+    `_updated_at` AggregateFunction(max, DateTime('UTC')),
+    `_active` AggregateFunction(argMax, Bool, DateTime('UTC'))
+) AS
+(WITH (
+        SELECT toDateTime('1970-01-01 00:00:00')
+    ) AS default_timestamp
+SELECT
+    maxState(CAST(block_timestamp, 'Nullable(DateTime(\'UTC\'))')) AS block_timestamp,
+    argMaxState(CAST(block_hash, 'Nullable(FixedString(32))'), insertion_time) AS block_hash,
+    argMaxState(CAST(block_number, 'Nullable(UInt256)'), insertion_time) AS block_number,
+    argMaxState(CAST(deployer, 'Nullable(FixedString(20))'), insertion_time) AS deployer,
+    address,
+    argMaxState(CAST(NULL, 'Nullable(String)'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS name,
+    argMaxState(CAST(NULL, 'Nullable(String)'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS symbol,
+    argMaxState(CAST(NULL, 'Nullable(UInt8)'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS decimals,
+    argMaxState(CAST(true, 'Nullable(Boolean)'), insertion_time) AS is_proxy,
+    argMaxState(CAST('[]', 'Array(Nullable(String))'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS blacklist_flags,
+    argMaxState(CAST('[]', 'Array(Nullable(String))'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS whitelist_flags,
+    argMaxState(CAST('[]', 'Array(Nullable(String))'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS detected_standards,
+    argMaxState(CAST(NULL, 'Nullable(String)'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS amended_type,
+    argMaxState(CAST(NULL, 'Nullable(String)'), CAST(default_timestamp, 'DateTime(\'UTC\')')) AS comment,
+    groupUniqArrayState('tokens_proxy_deployments') AS _sources,
+    maxState(insertion_time) AS _updated_at,
+    argMaxState(true, CAST(default_timestamp, 'DateTime(\'UTC\')')) AS _active
+FROM test
+WHERE insertion_time > toDateTime('2024-03-14 11:38:09')
+GROUP BY address);
+
+set max_insert_threads=4;
+insert into test_tmp select * from generateRandom() limit 24;
+insert into test_tmp select * from generateRandom() limit 25;
+insert into test_tmp select * from generateRandom() limit 26;
+insert into test_tmp select * from generateRandom() limit 30;
+
+INSERT INTO test(address, deployer, block_number, block_hash, block_timestamp, insertion_time) SELECT * FROM test_tmp;
+
+select count() from test;
+
+DROP TABLE test;
+DROP TABLE test_tmp;
+DROP TABLE dst;
+DROP TABLE view;
+
diff --git a/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.reference b/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.reference
new file mode 100644
index 00000000000..f0ce1649939
--- /dev/null
+++ b/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.reference
@@ -0,0 +1,9 @@
+(3,2,1)
+(2,1,0)
+(0,0,0)
+(3,2,1)
+(2,1,0)
+(3,2,1)
+(0,0,0)
+(0,1,1)
+(1,0,1)
diff --git a/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.sql b/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.sql
new file mode 100644
index 00000000000..2cb7e726a4b
--- /dev/null
+++ b/tests/queries/0_stateless/03033_tupleIntXYZ_and_tupleModulo.sql
@@ -0,0 +1,13 @@
+SELECT tupleIntDiv((15, 10, 5), (0, 0, 0)); -- { serverError ILLEGAL_DIVISION }
+SELECT tupleIntDiv((15, 10, 5), (5, 5, 5));
+SELECT tupleIntDiv((15, 10, 5), (5.5, 5.5, 5.5));
+SELECT tupleIntDivOrZero((5, 10, 15), (0, 0, 0)); -- no error thrown for zero divisors
+SELECT tupleIntDivByNumber((15, 10, 5), 0); -- { serverError ILLEGAL_DIVISION }
+SELECT tupleIntDivByNumber((15, 10, 5), 5);
+SELECT tupleIntDivByNumber((15.2, 10.7, 5.5), 5.8);
+SELECT tupleIntDivOrZeroByNumber((15, 10, 5), 5);
+SELECT tupleIntDivOrZeroByNumber((15, 10, 5), 0); -- no error thrown for zero divisors
+SELECT tupleModulo((15, 10, 5), (0, 3, 2)); -- { serverError ILLEGAL_DIVISION }
+SELECT tupleModulo((15, 10, 5), (5, 3, 2));
+SELECT tupleModuloByNumber((15, 10, 5), 0); -- { serverError ILLEGAL_DIVISION }
+SELECT tupleModuloByNumber((15, 10, 5), 2);
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03033_with_fill_interpolate.reference b/tests/queries/0_stateless/03033_with_fill_interpolate.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03033_with_fill_interpolate.sql b/tests/queries/0_stateless/03033_with_fill_interpolate.sql
new file mode 100644
index 00000000000..0ec0050a922
--- /dev/null
+++ b/tests/queries/0_stateless/03033_with_fill_interpolate.sql
@@ -0,0 +1,28 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/55794
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS 03033_example_table;
+
+CREATE TABLE 03033_example_table
+(
+  ColumnA Int64,
+  ColumnB Int64,
+  ColumnC Int64
+)
+ENGINE = MergeTree()
+ORDER BY ColumnA;
+
+WITH
+helper AS (
+  SELECT
+    *
+  FROM
+    03033_example_table
+  ORDER BY
+    ColumnA WITH FILL INTERPOLATE (
+      ColumnB AS ColumnC,
+      ColumnC AS ColumnA
+    )
+)
+SELECT ColumnB FROM helper;
+
+DROP TABLE IF EXISTS 03033_example_table;
diff --git a/tests/queries/0_stateless/03034_json_extract_variant.reference b/tests/queries/0_stateless/03034_json_extract_variant.reference
new file mode 100644
index 00000000000..8d78d639fd2
--- /dev/null
+++ b/tests/queries/0_stateless/03034_json_extract_variant.reference
@@ -0,0 +1,5 @@
+42	UInt32
+Hello	String
+[1,2,3]	Array(UInt32)
+{'a':42,'b':'Hello','c':[1,2,3]}
+[('a',42),('b','Hello'),('c',[1,2,3])]	Array(Tuple(String, Variant(Array(UInt32), String, UInt32)))
diff --git a/tests/queries/0_stateless/03034_json_extract_variant.sql b/tests/queries/0_stateless/03034_json_extract_variant.sql
new file mode 100644
index 00000000000..54d5bed9582
--- /dev/null
+++ b/tests/queries/0_stateless/03034_json_extract_variant.sql
@@ -0,0 +1,6 @@
+select JSONExtract('{"a" : 42}', 'a', 'Variant(String, UInt32)') as v, variantType(v);
+select JSONExtract('{"a" : "Hello"}', 'a', 'Variant(String, UInt32)') as v, variantType(v);
+select JSONExtract('{"a" : [1, 2, 3]}', 'a', 'Variant(String, Array(UInt32))') as v, variantType(v);
+select JSONExtract('{"obj" : {"a" : 42, "b" : "Hello", "c" : [1,2,3]}}', 'obj', 'Map(String, Variant(UInt32, String, Array(UInt32)))');
+select JSONExtractKeysAndValues('{"a" : 42, "b" : "Hello", "c" : [1,2,3]}', 'Variant(UInt32, String, Array(UInt32))') as v, toTypeName(v);
+
diff --git a/tests/queries/0_stateless/03034_normalized_ast.reference b/tests/queries/0_stateless/03034_normalized_ast.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03034_normalized_ast.sql b/tests/queries/0_stateless/03034_normalized_ast.sql
new file mode 100644
index 00000000000..385af4e2c34
--- /dev/null
+++ b/tests/queries/0_stateless/03034_normalized_ast.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/49472
+SET allow_experimental_analyzer=1;
+SELECT
+    concat(database, table) AS name,
+    count()
+FROM clusterAllReplicas(test_shard_localhost, system.tables)
+WHERE database=currentDatabase()
+GROUP BY name
+FORMAT Null;
diff --git a/tests/queries/0_stateless/03035_alias_column_bug_distributed.reference b/tests/queries/0_stateless/03035_alias_column_bug_distributed.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql b/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql
new file mode 100644
index 00000000000..74463743b01
--- /dev/null
+++ b/tests/queries/0_stateless/03035_alias_column_bug_distributed.sql
@@ -0,0 +1,44 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/44414
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS alias_bug;
+DROP TABLE IF EXISTS alias_bug_dist;
+CREATE TABLE alias_bug
+(
+    `src` String,
+    `theAlias` String ALIAS trimBoth(src)
+)
+ENGINE = MergeTree()
+ORDER BY src;
+
+CREATE TABLE alias_bug_dist
+AS alias_bug
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), 'alias_bug', rand());
+
+INSERT INTO alias_bug VALUES ('SOURCE1');
+
+-- OK
+SELECT theAlias,CAST(NULL, 'Nullable(String)') AS src FROM alias_bug LIMIT 1 FORMAT Null;
+
+-- Not OK
+SELECT theAlias,CAST(NULL, 'Nullable(String)') AS src FROM alias_bug_dist LIMIT 1 FORMAT Null;
+
+DROP TABLE IF EXISTS alias_bug;
+DROP TABLE IF EXISTS alias_bug_dist;
+CREATE TABLE alias_bug
+(
+    `s` String,
+    `src` String,
+    `theAlias` String ALIAS trimBoth(src)
+)
+ENGINE = MergeTree()
+ORDER BY src;
+
+CREATE TABLE alias_bug_dist
+AS alias_bug
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), 'alias_bug', rand());
+
+-- Unknown identifier
+SELECT CAST(123, 'String') AS src,theAlias FROM alias_bug_dist LIMIT 1 FORMAT Null;
+
+DROP TABLE IF EXISTS alias_bug;
+DROP TABLE IF EXISTS alias_bug_dist;
diff --git a/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.reference b/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.reference
new file mode 100644
index 00000000000..be07c950fea
--- /dev/null
+++ b/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.reference
@@ -0,0 +1,12 @@
+Row 1:
+──────
+max(time):                                                                     2021-01-01 00:00:59.000
+max(toNullable(time)):                                                         2021-01-01 00:00:59.000
+min(time):                                                                     2021-01-01 00:00:00.000
+min(toNullable(time)):                                                         2021-01-01 00:00:00.000
+argMax(value, time):                                                           -1
+argMax(value, toNullable(time)):                                               -1
+argMin(value, time):                                                           0
+argMin(value, toNullable(time)):                                               0
+argMinIf(value, toNullable(time), notEquals(time, '2021-01-01 00:00:00.000')): 1
+argMaxIf(value, toNullable(time), notEquals(time, '2021-01-01 00:00:59.000')): -2
diff --git a/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.sql b/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.sql
new file mode 100644
index 00000000000..deb580b9040
--- /dev/null
+++ b/tests/queries/0_stateless/03035_argMinMax_numeric_non_extreme_bug.sql
@@ -0,0 +1,26 @@
+CREATE TABLE IF NOT EXISTS test
+(
+    `value` Float64 CODEC(Delta, LZ4),
+    `uuid` LowCardinality(String),
+    `time` DateTime64(3, 'UTC') CODEC(DoubleDelta, LZ4)
+)
+ENGINE = MergeTree()
+ORDER BY uuid;
+
+
+INSERT INTO test (uuid, time, value)
+VALUES ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:00.000',0), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:09.000',1), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:10.000',2), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:19.000',3), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:20.000',2), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:29.000',1), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:30.000',0),  ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:39.000',-1), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:40.000',-2), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:49.000',-3), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:50.000',-2), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:00:59.000',-1), ('a1000000-0000-0000-0000-0000000000a1','2021-01-01 00:01:00.000',0);
+
+SELECT
+    max(time),
+    max(toNullable(time)),
+    min(time),
+    min(toNullable(time)),
+    argMax(value, time),
+    argMax(value, toNullable(time)),
+    argMin(value, time),
+    argMin(value, toNullable(time)),
+    argMinIf(value, toNullable(time), time != '2021-01-01 00:00:00.000'),
+    argMaxIf(value, toNullable(time), time != '2021-01-01 00:00:59.000'),
+FROM test
+WHERE (time >= fromUnixTimestamp64Milli(1609459200000, 'UTC')) AND (time < fromUnixTimestamp64Milli(1609459260000, 'UTC')) FORMAT Vertical;
diff --git a/tests/queries/0_stateless/03035_morton_encode_no_rows.reference b/tests/queries/0_stateless/03035_morton_encode_no_rows.reference
new file mode 100644
index 00000000000..dc8bb19a028
--- /dev/null
+++ b/tests/queries/0_stateless/03035_morton_encode_no_rows.reference
@@ -0,0 +1,2 @@
+4294967286
+4294967286
diff --git a/tests/queries/0_stateless/03035_morton_encode_no_rows.sql b/tests/queries/0_stateless/03035_morton_encode_no_rows.sql
new file mode 100644
index 00000000000..2663b1ac212
--- /dev/null
+++ b/tests/queries/0_stateless/03035_morton_encode_no_rows.sql
@@ -0,0 +1,2 @@
+SELECT mortonEncode(materialize((1, 1)), 65534, 65533);
+SELECT mortonEncode((1, 1), 65534, 65533);
diff --git a/tests/queries/0_stateless/03036_parquet_arrow_nullable.reference b/tests/queries/0_stateless/03036_parquet_arrow_nullable.reference
new file mode 100644
index 00000000000..8820bb7cb9f
--- /dev/null
+++ b/tests/queries/0_stateless/03036_parquet_arrow_nullable.reference
@@ -0,0 +1,40 @@
+Parquet
+a	UInt64					
+a_nullable	Nullable(UInt64)					
+Arrow
+a	UInt64					
+a_nullable	Nullable(UInt64)					
+Parquet
+b	Array(Nullable(UInt64))					
+b_nullable	Array(Nullable(UInt64))					
+Arrow
+b	Array(Nullable(UInt64))					
+b_nullable	Array(Nullable(UInt64))					
+Parquet
+c	Tuple(\n    a UInt64,\n    b String)					
+c_nullable	Tuple(\n    a Nullable(UInt64),\n    b Nullable(String))					
+Arrow
+c	Tuple(\n    a UInt64,\n    b String)					
+c_nullable	Tuple(\n    a Nullable(UInt64),\n    b Nullable(String))					
+Parquet
+d	Tuple(\n    a UInt64,\n    b Tuple(\n        a UInt64,\n        b String),\n    d_nullable Tuple(\n        a UInt64,\n        b Tuple(\n            a Nullable(UInt64),\n            b Nullable(String))))					
+Arrow
+d	Tuple(\n    a UInt64,\n    b Tuple(\n        a UInt64,\n        b String),\n    d_nullable Tuple(\n        a UInt64,\n        b Tuple(\n            a Nullable(UInt64),\n            b Nullable(String))))					
+Parquet
+e	Map(UInt64, Nullable(String))					
+e_nullable	Map(UInt64, Nullable(String))					
+Arrow
+e	Map(UInt64, Nullable(String))					
+e_nullable	Map(UInt64, Nullable(String))					
+Parquet
+f	Map(UInt64, Map(UInt64, Nullable(String)))					
+f_nullables	Map(UInt64, Map(UInt64, Nullable(String)))					
+Arrow
+f	Map(UInt64, Map(UInt64, Nullable(String)))					
+f_nullables	Map(UInt64, Map(UInt64, Nullable(String)))					
+Parquet
+g	String					
+g_nullable	Nullable(String)					
+Arrow
+g	LowCardinality(String)					
+g_nullable	LowCardinality(String)					
diff --git a/tests/queries/0_stateless/03036_parquet_arrow_nullable.sh b/tests/queries/0_stateless/03036_parquet_arrow_nullable.sh
new file mode 100755
index 00000000000..bdd641e2b94
--- /dev/null
+++ b/tests/queries/0_stateless/03036_parquet_arrow_nullable.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+DATA_FILE=$CLICKHOUSE_TEST_UNIQUE_NAME.data
+
+formats="Parquet Arrow"
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('a UInt64, a_nullable Nullable(UInt64)', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('b Array(UInt64), b_nullable Array(Nullable(UInt64))', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('c Tuple(a UInt64, b String), c_nullable Tuple(a Nullable(UInt64), b Nullable(String))', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('d Tuple(a UInt64, b Tuple(a UInt64, b String), d_nullable Tuple(a UInt64, b Tuple(a Nullable(UInt64), b Nullable(String))))', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('e Map(UInt64, String), e_nullable Map(UInt64, Nullable(String))', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('f Map(UInt64, Map(UInt64, String)), f_nullables Map(UInt64, Map(UInt64, Nullable(String)))', 42) limit 10 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+for format in $formats
+do
+    echo $format
+    $CLICKHOUSE_LOCAL -q "select * from generateRandom('g LowCardinality(String), g_nullable LowCardinality(Nullable(String))', 42) limit 10 settings output_format_arrow_low_cardinality_as_dictionary=1, allow_suspicious_low_cardinality_types=1 format $format" > $DATA_FILE
+    $CLICKHOUSE_LOCAL -q "desc file('$DATA_FILE') SETTINGS schema_inference_make_columns_nullable = 0"
+done
+
+rm $DATA_FILE
+
diff --git a/tests/queries/0_stateless/03036_prewhere_lambda_function.reference b/tests/queries/0_stateless/03036_prewhere_lambda_function.reference
new file mode 100644
index 00000000000..2599763b762
--- /dev/null
+++ b/tests/queries/0_stateless/03036_prewhere_lambda_function.reference
@@ -0,0 +1 @@
+[4,5,6]
diff --git a/tests/queries/0_stateless/03036_prewhere_lambda_function.sql b/tests/queries/0_stateless/03036_prewhere_lambda_function.sql
new file mode 100644
index 00000000000..8b9ebb775a3
--- /dev/null
+++ b/tests/queries/0_stateless/03036_prewhere_lambda_function.sql
@@ -0,0 +1,7 @@
+DROP TABLE IF EXISTS t;
+CREATE TABLE t (A Array(Int64)) Engine = MergeTree ORDER BY tuple();
+INSERT INTO t VALUES ([1,2,3]), ([4,5,6]), ([7,8,9]);
+
+SELECT * FROM t PREWHERE arrayExists(x -> x = 5, A);
+
+DROP TABLE t;
diff --git a/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.reference b/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.reference
new file mode 100644
index 00000000000..251d054748a
--- /dev/null
+++ b/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.reference
@@ -0,0 +1 @@
+Unknown function
diff --git a/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.sh b/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.sh
new file mode 100755
index 00000000000..e0a145d8456
--- /dev/null
+++ b/tests/queries/0_stateless/03036_udf_user_defined_directory_in_client.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} --query "DROP TABLE IF EXISTS test"
+${CLICKHOUSE_CLIENT} --query "CREATE TABLE test (s String) ENGINE = Memory"
+
+# Calling an unknown function should not lead to creation of a 'user_defined' directory in the current directory
+${CLICKHOUSE_CLIENT} --query "INSERT INTO test VALUES (xyz('abc'))" 2>&1 | grep -o -F 'Unknown function'
+
+ls -ld user_defined 2> /dev/null
+
+${CLICKHOUSE_CLIENT} --query "DROP TABLE test"
diff --git a/tests/queries/0_stateless/03036_with_numbers.reference b/tests/queries/0_stateless/03036_with_numbers.reference
new file mode 100644
index 00000000000..7b36cc96f5e
--- /dev/null
+++ b/tests/queries/0_stateless/03036_with_numbers.reference
@@ -0,0 +1,20 @@
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
+0
+1
+2
+3
+4
+5
+6
+7
+8
+9
diff --git a/tests/queries/0_stateless/03036_with_numbers.sql b/tests/queries/0_stateless/03036_with_numbers.sql
new file mode 100644
index 00000000000..3463ce826e2
--- /dev/null
+++ b/tests/queries/0_stateless/03036_with_numbers.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/13843
+SET allow_experimental_analyzer=1;
+WITH 10 AS n
+SELECT *
+FROM numbers(n);
+
+WITH cast(10, 'UInt64') AS n
+SELECT *
+FROM numbers(n);
diff --git a/tests/queries/0_stateless/03037_dot_product_overflow.reference b/tests/queries/0_stateless/03037_dot_product_overflow.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/03037_dot_product_overflow.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/03037_dot_product_overflow.sql b/tests/queries/0_stateless/03037_dot_product_overflow.sql
new file mode 100644
index 00000000000..94d5eba6255
--- /dev/null
+++ b/tests/queries/0_stateless/03037_dot_product_overflow.sql
@@ -0,0 +1,2 @@
+select ignore(dotProduct(materialize([9223372036854775807, 1]), materialize([-3, 1])));
+
diff --git a/tests/queries/0_stateless/03037_union_view.reference b/tests/queries/0_stateless/03037_union_view.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03037_union_view.sql b/tests/queries/0_stateless/03037_union_view.sql
new file mode 100644
index 00000000000..3ea81b829ba
--- /dev/null
+++ b/tests/queries/0_stateless/03037_union_view.sql
@@ -0,0 +1,31 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/55803
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS broken_table;
+DROP TABLE IF EXISTS broken_view;
+
+CREATE TABLE broken_table
+(
+    start DateTime64(6),
+    end DateTime64(6),
+)
+ENGINE = ReplacingMergeTree(start)
+ORDER BY (start);
+
+CREATE VIEW broken_view as
+SELECT
+  t.start as start,
+  t.end as end,
+  cast(datediff('second', t.start, t.end) as float) as total_sec
+FROM broken_table t FINAL
+UNION ALL
+SELECT
+  null as start,
+  null as end,
+  null as total_sec;
+
+SELECT v.start, v.total_sec
+FROM broken_view v FINAL
+WHERE v.start IS NOT NULL;
+
+DROP TABLE IF EXISTS broken_table;
+DROP TABLE IF EXISTS broken_view;
\ No newline at end of file
diff --git a/tests/queries/0_stateless/03037_zero_step_in_numbers_table_function.reference b/tests/queries/0_stateless/03037_zero_step_in_numbers_table_function.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03037_zero_step_in_numbers_table_function.sql b/tests/queries/0_stateless/03037_zero_step_in_numbers_table_function.sql
new file mode 100644
index 00000000000..08fafd6ddfa
--- /dev/null
+++ b/tests/queries/0_stateless/03037_zero_step_in_numbers_table_function.sql
@@ -0,0 +1,2 @@
+select * from numbers(1, 10, 0); -- {serverError BAD_ARGUMENTS}
+
diff --git a/tests/queries/0_stateless/03038_ambiguous_column.reference b/tests/queries/0_stateless/03038_ambiguous_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03038_ambiguous_column.sql b/tests/queries/0_stateless/03038_ambiguous_column.sql
new file mode 100644
index 00000000000..9df3cd9bc9b
--- /dev/null
+++ b/tests/queries/0_stateless/03038_ambiguous_column.sql
@@ -0,0 +1,42 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/48308
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS 03038_table;
+
+CREATE TABLE 03038_table
+(
+    `time` DateTime
+)
+ENGINE = MergeTree
+ORDER BY time;
+
+SELECT *
+FROM
+(
+    SELECT
+        toUInt64(time) AS time,
+        toHour(03038_table.time)
+    FROM 03038_table
+)
+ORDER BY time ASC;
+
+WITH subquery AS (
+    SELECT
+        toUInt64(time) AS time,
+        toHour(03038_table.time)
+    FROM 03038_table
+)
+SELECT *
+FROM subquery
+ORDER BY subquery.time ASC;
+
+SELECT *
+FROM
+(
+    SELECT
+        toUInt64(time) AS time,
+        toHour(03038_table.time) AS hour
+    FROM 03038_table
+)
+ORDER BY time ASC, hour;
+
+DROP TABLE IF EXISTS 03038_table;
diff --git a/tests/queries/0_stateless/03039_unknown_identifier_window_function.reference b/tests/queries/0_stateless/03039_unknown_identifier_window_function.reference
new file mode 100644
index 00000000000..405da28a579
--- /dev/null
+++ b/tests/queries/0_stateless/03039_unknown_identifier_window_function.reference
@@ -0,0 +1,40 @@
+0	10
+1	10
+2	10
+3	10
+4	10
+5	10
+6	10
+7	10
+8	10
+9	10
+0	10
+1	10
+2	10
+3	10
+4	10
+5	10
+6	10
+7	10
+8	10
+9	10
+0	10	0
+1	10	1
+2	10	2
+3	10	3
+4	10	4
+5	10	5
+6	10	6
+7	10	7
+8	10	8
+9	10	9
+0	10
+1	10
+2	10
+3	10
+4	10
+5	10
+6	10
+7	10
+8	10
+9	10
diff --git a/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql b/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql
new file mode 100644
index 00000000000..640d217d2f9
--- /dev/null
+++ b/tests/queries/0_stateless/03039_unknown_identifier_window_function.sql
@@ -0,0 +1,35 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/45535
+SET allow_experimental_analyzer=1;
+
+SELECT
+  *,
+  count() OVER () AS c
+FROM numbers(10)
+ORDER BY toString(number);
+
+
+WITH
+  toString(number) as str
+SELECT
+  *,
+  count() OVER () AS c
+FROM numbers(10)
+ORDER BY str;
+
+SELECT
+  *,
+  count() OVER () AS c,
+  toString(number) as str
+FROM numbers(10)
+ORDER BY str;
+
+
+WITH
+  test AS (
+    SELECT
+      *,
+      count() OVER () AS c
+    FROM numbers(10)
+  )
+SELECT * FROM test
+ORDER BY toString(number);
diff --git a/tests/queries/0_stateless/03040_alias_column_join.reference b/tests/queries/0_stateless/03040_alias_column_join.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03040_alias_column_join.sql b/tests/queries/0_stateless/03040_alias_column_join.sql
new file mode 100644
index 00000000000..54f579c0feb
--- /dev/null
+++ b/tests/queries/0_stateless/03040_alias_column_join.sql
@@ -0,0 +1,14 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/44365
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS 03040_test;
+
+CREATE TABLE 03040_test
+(
+    id           UInt64,
+    val String alias 'value: '||toString(id)
+) ENGINE = MergeTree
+ORDER BY tuple();
+
+SELECT val FROM 03040_test t GROUP BY val;
+
+DROP TABLE IF EXISTS 03040_test;
diff --git a/tests/queries/0_stateless/03040_array_sum_and_join.reference b/tests/queries/0_stateless/03040_array_sum_and_join.reference
new file mode 100644
index 00000000000..d81fd9a2f69
--- /dev/null
+++ b/tests/queries/0_stateless/03040_array_sum_and_join.reference
@@ -0,0 +1,5 @@
+79	name1	42.7027027027027
+62	name2	33.513513513513516
+44	name3	23.783783783783786
+[[1,2],[1,2]]
+[(3,[1,2]),(4,[1,2])]
diff --git a/tests/queries/0_stateless/03040_array_sum_and_join.sql b/tests/queries/0_stateless/03040_array_sum_and_join.sql
new file mode 100644
index 00000000000..9aeddc9f765
--- /dev/null
+++ b/tests/queries/0_stateless/03040_array_sum_and_join.sql
@@ -0,0 +1,27 @@
+SET allow_experimental_analyzer=1;
+
+select t.1 as cnt,
+       t.2 as name,
+       t.3 as percent
+from (
+      select arrayJoin(result) as t
+      from (
+            select [
+                       (79, 'name1'),
+                       (62, 'name2'),
+                       (44, 'name3')
+                       ]                                      as data,
+                   arraySum(arrayMap(t -> t.1, data)) as total,
+                   arrayMap(t ->
+                                tuple(t.1, t.2,
+                                      multiIf(total = 0, 0, t.1 > 0 and t.1 < 10, -1.0,
+                                              (toFloat32(t.1) / toFloat32(total)) * 100)
+                                    ),
+                            data
+                       )                                      as result
+               )
+         );
+
+SELECT arrayMap(x -> arrayMap(x -> (x.1), [(1, 1), (2, 2)]), [(3, 3), (4, 4)]);
+
+SELECT arrayMap(x -> (x.1, arrayMap(x -> (x.1), [(1, 1), (2, 2)])), [(3, 3), (4, 4)]);
diff --git a/tests/queries/0_stateless/03041_analyzer_gigachad_join.reference b/tests/queries/0_stateless/03041_analyzer_gigachad_join.reference
new file mode 100644
index 00000000000..a859a600512
--- /dev/null
+++ b/tests/queries/0_stateless/03041_analyzer_gigachad_join.reference
@@ -0,0 +1 @@
+123456789	111	222
diff --git a/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql b/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql
new file mode 100644
index 00000000000..7906e65f8b8
--- /dev/null
+++ b/tests/queries/0_stateless/03041_analyzer_gigachad_join.sql
@@ -0,0 +1,15 @@
+SET allow_experimental_analyzer=1;
+CREATE TABLE IF NOT EXISTS first engine = MergeTree PARTITION BY (inn, toYYYYMM(received)) ORDER BY (inn, sessionId)
+AS SELECT now() AS received, '123456789' AS inn, '42' AS sessionId;
+
+CREATE TABLE IF NOT EXISTS second engine = MergeTree PARTITION BY (inn, toYYYYMM(received)) ORDER BY (inn, sessionId)
+AS SELECT now() AS received, '123456789' AS inn, '42' AS sessionId, '111' AS serial, '222' AS reg;
+
+SELECT alias_first.inn, arrayFirst(t -> isNotNull(t), regInfo.1), arrayFirst(t -> isNotNull(t), regInfo.2)
+    FROM first AS alias_first
+    INNER JOIN (
+        SELECT alias_second.inn, alias_second.sessionId, groupArray((serial, reg)) AS regInfo
+            FROM second AS alias_second
+            GROUP BY inn, sessionId
+    ) AS resp ON (alias_first.inn = resp.inn) AND (alias_first.sessionId = resp.sessionId)
+WHERE if('123456789' IS NOT NULL, alias_first.inn = '123456789', 1)
diff --git a/tests/queries/0_stateless/03041_select_with_query_result.reference b/tests/queries/0_stateless/03041_select_with_query_result.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03041_select_with_query_result.sql b/tests/queries/0_stateless/03041_select_with_query_result.sql
new file mode 100644
index 00000000000..061223b43e1
--- /dev/null
+++ b/tests/queries/0_stateless/03041_select_with_query_result.sql
@@ -0,0 +1,42 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/44153
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS parent;
+DROP TABLE IF EXISTS join_table_1;
+DROP TABLE IF EXISTS join_table_2;
+
+CREATE TABLE parent(
+    a_id Int64,
+    b_id Int64,
+    c_id Int64,
+    created_at Int64
+)
+ENGINE=MergeTree()
+ORDER BY (a_id, b_id, c_id, created_at);
+
+CREATE TABLE join_table_1(
+    a_id Int64,
+    b_id Int64
+)
+ENGINE=MergeTree()
+ORDER BY (a_id, b_id);
+
+CREATE TABLE join_table_2(
+    c_id Int64,
+    created_at Int64
+)
+ENGINE=MergeTree()
+ORDER BY (c_id, created_at);
+
+WITH with_table as (
+    SELECT p.a_id, p.b_id, p.c_id FROM parent p
+    LEFT JOIN join_table_1 jt1 ON jt1.a_id = p.a_id AND jt1.b_id = p.b_id
+    LEFT JOIN join_table_2 jt2 ON jt2.c_id = p.c_id
+    WHERE
+        p.a_id = 0 AND (jt2.c_id = 0 OR p.created_at = 0)
+)
+SELECT p.a_id, p.b_id, COUNT(*) as f_count FROM with_table
+GROUP BY p.a_id, p.b_id;
+
+DROP TABLE IF EXISTS parent;
+DROP TABLE IF EXISTS join_table_1;
+DROP TABLE IF EXISTS join_table_2;
diff --git a/tests/queries/0_stateless/03042_analyzer_alias_join.reference b/tests/queries/0_stateless/03042_analyzer_alias_join.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03042_analyzer_alias_join.sql b/tests/queries/0_stateless/03042_analyzer_alias_join.sql
new file mode 100644
index 00000000000..dac3b6a4983
--- /dev/null
+++ b/tests/queries/0_stateless/03042_analyzer_alias_join.sql
@@ -0,0 +1,21 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/14978
+SET allow_experimental_analyzer=1;
+CREATE TABLE test1(id UInt64, t1value UInt64) ENGINE=MergeTree ORDER BY tuple();
+CREATE TABLE test2(id UInt64, t2value String) ENGINE=MergeTree ORDER BY tuple();
+
+SELECT NULL AS t2value
+FROM test1 t1
+LEFT JOIN (
+    SELECT id, t2value FROM test2
+) t2
+ON t1.id=t2.id
+WHERE t2.t2value='test';
+
+-- workaround should work too
+SELECT NULL AS _svalue
+FROM test1 t1
+LEFT JOIN (
+    SELECT id, t2value FROM test2
+) t2
+ON t1.id=t2.id
+WHERE t2.t2value='test';
diff --git a/tests/queries/0_stateless/03042_not_found_column_c1.reference b/tests/queries/0_stateless/03042_not_found_column_c1.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03042_not_found_column_c1.sql b/tests/queries/0_stateless/03042_not_found_column_c1.sql
new file mode 100644
index 00000000000..b4dce2af489
--- /dev/null
+++ b/tests/queries/0_stateless/03042_not_found_column_c1.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/42399
+SET allow_experimental_analyzer=1;
+
+CREATE TABLE IF NOT EXISTS t0 (c0 Int32) ENGINE = Memory() ;
+CREATE TABLE t1 (c0 Int32, c1 Int32, c2 Int32) ENGINE = Memory() ;
+CREATE TABLE t2 (c0 String, c1 String MATERIALIZED (c2), c2 Int32) ENGINE = Memory() ;
+CREATE TABLE t3 (c0 String, c1 String, c2 String) ENGINE = Log() ;
+CREATE TABLE IF NOT EXISTS t4 (c0 Int32) ENGINE = Log() ;
+SELECT t3.c1, t3.c2, t1.c1, t1.c0, t2.c2, t0.c0, t1.c2, t2.c1, t4.c0 FROM t3, t0, t1, t2, t4;
diff --git a/tests/queries/0_stateless/03043_group_array_result_is_expected.reference b/tests/queries/0_stateless/03043_group_array_result_is_expected.reference
new file mode 100644
index 00000000000..d43aa556dce
--- /dev/null
+++ b/tests/queries/0_stateless/03043_group_array_result_is_expected.reference
@@ -0,0 +1 @@
+['2021-07-01','2021-07-02','2021-07-03','2021-07-04','2021-07-05','2021-07-06','2021-07-07','2021-07-08','2021-07-09','2021-07-10','2021-07-11','2021-07-12','2021-07-13','2021-07-14','2021-07-15','2021-07-16','2021-07-17','2021-07-18','2021-07-19','2021-07-20','2021-07-21','2021-07-22','2021-07-23','2021-07-24','2021-07-25','2021-07-26','2021-07-27','2021-07-28','2021-07-29']	29
diff --git a/tests/queries/0_stateless/03043_group_array_result_is_expected.sql b/tests/queries/0_stateless/03043_group_array_result_is_expected.sql
new file mode 100644
index 00000000000..5311927ae3c
--- /dev/null
+++ b/tests/queries/0_stateless/03043_group_array_result_is_expected.sql
@@ -0,0 +1,45 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/27115
+SET allow_experimental_analyzer=1;
+drop table if exists fill_ex;
+
+create table fill_ex (
+  eventDate Date ,
+  storeId String
+)
+engine = ReplacingMergeTree()
+partition by toYYYYMM(eventDate)
+order by (storeId,eventDate);
+
+insert into fill_ex (eventDate,storeId) values ('2021-07-16','s') ('2021-07-17','ee');
+
+select
+  groupArray(key) as keys,
+  count() as c
+from
+  (
+  select
+    *,
+    eventDate as key
+  from
+    (
+    select
+      eventDate
+    from
+      (
+      select
+        eventDate
+      from
+        fill_ex final
+      where
+        eventDate >= toDate('2021-07-01')
+        and eventDate<toDate('2021-07-30')
+      order by
+        eventDate )
+    order by
+      eventDate with fill
+    from
+      toDate('2021-07-01') to toDate('2021-07-30') )
+  order by
+    eventDate );
+
+drop table if exists fill_ex;
diff --git a/tests/queries/0_stateless/03044_analyzer_alias_join.reference b/tests/queries/0_stateless/03044_analyzer_alias_join.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03044_analyzer_alias_join.sql b/tests/queries/0_stateless/03044_analyzer_alias_join.sql
new file mode 100644
index 00000000000..3ab8edb005f
--- /dev/null
+++ b/tests/queries/0_stateless/03044_analyzer_alias_join.sql
@@ -0,0 +1,18 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/17319
+SET allow_experimental_analyzer=1;
+CREATE TEMPORARY TABLE hits (date Date, data Float64) engine=Memory();
+
+SELECT
+    subquery1.period AS period,
+    if(1=1, 0, subquery1.data1) AS data,
+    if(1=1, 0, subquery2.data) AS other_data
+FROM
+(
+    SELECT date AS period, data AS data1
+    FROM hits
+) AS subquery1
+LEFT JOIN
+(
+    SELECT date AS period, data AS data
+    FROM hits
+) AS subquery2 ON (subquery1.period = subquery2.period)
diff --git a/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.reference b/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.sql b/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.sql
new file mode 100644
index 00000000000..0cf05763202
--- /dev/null
+++ b/tests/queries/0_stateless/03044_array_join_columns_in_nested_table.sql
@@ -0,0 +1,3 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/11813
+SET allow_experimental_analyzer=1;
+select 1 from (select 1 x) l join (select 1 y, [1] a) r on l.x = r.y array join r.a;
diff --git a/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.reference b/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql b/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql
new file mode 100644
index 00000000000..ee8756b9460
--- /dev/null
+++ b/tests/queries/0_stateless/03045_analyzer_alias_join_with_if.sql
@@ -0,0 +1,34 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/13210
+SET allow_experimental_analyzer=1;
+CREATE TABLE test_a_table (
+    name String,
+    a_col String
+)
+Engine = MergeTree()
+ORDER BY name;
+
+CREATE TABLE test_b_table (
+    name String,
+    b_col String,
+    some_val String
+)
+Engine = MergeTree()
+ORDER BY name;
+
+SELECT
+    b.name name,
+    a.a_col a_col,
+    b.b_col b_col,
+    'N' some_val
+from test_a_table a
+join test_b_table b on a.name = b.name
+where b.some_val = 'Y';
+
+SELECT
+    b.name name,
+    a.a_col a_col,
+    b.b_col b_col,
+    if(1,'N',b.some_val) some_val
+from test_a_table a
+join test_b_table b on a.name = b.name
+where b.some_val = 'Y';
diff --git a/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.reference b/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql b/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql
new file mode 100644
index 00000000000..d97dfc880b3
--- /dev/null
+++ b/tests/queries/0_stateless/03045_unknown_identifier_alias_substitution.sql
@@ -0,0 +1,21 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/23053
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS repl_tbl;
+
+CREATE TEMPORARY TABLE repl_tbl
+(
+    `key` UInt32,
+    `val_1` UInt32,
+    `val_2` String,
+    `val_3` String,
+    `val_4` String,
+    `val_5` UUID,
+    `ts` DateTime
+)
+ENGINE = ReplacingMergeTree(ts)
+ORDER BY `key`;
+set prefer_column_name_to_alias = 1;
+INSERT INTO repl_tbl (key) SELECT number FROM numbers(10);
+WITH 10 as k SELECT k as key, * FROM repl_tbl WHERE key = k;
+
+DROP TABLE IF EXISTS repl_tbl;
diff --git a/tests/queries/0_stateless/03046_column_in_block_array_join.reference b/tests/queries/0_stateless/03046_column_in_block_array_join.reference
new file mode 100644
index 00000000000..f9264f7fbd3
--- /dev/null
+++ b/tests/queries/0_stateless/03046_column_in_block_array_join.reference
@@ -0,0 +1,2 @@
+Hello
+World
diff --git a/tests/queries/0_stateless/03046_column_in_block_array_join.sql b/tests/queries/0_stateless/03046_column_in_block_array_join.sql
new file mode 100644
index 00000000000..c6b4613af3f
--- /dev/null
+++ b/tests/queries/0_stateless/03046_column_in_block_array_join.sql
@@ -0,0 +1,38 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/37729
+SET allow_experimental_analyzer=1;
+
+DROP TABLE IF EXISTS nested_test;
+DROP TABLE IF EXISTS join_test;
+
+CREATE TABLE nested_test
+(
+    s String,
+    nest Nested
+    (
+        x UInt64,
+        y UInt64
+    )
+) ENGINE = MergeTree
+ORDER BY s;
+
+CREATE TABLE join_test
+(
+    id Int64,
+    y UInt64
+)
+ENGINE = MergeTree
+ORDER BY id;
+
+INSERT INTO nested_test
+VALUES ('Hello', [1,2], [10,20]), ('World', [3,4,5], [30,40,50]), ('Goodbye', [], []);
+
+INSERT INTO join_test
+VALUES (1,1),(2,4),(3,20),(4,40);
+
+SELECT s
+FROM nested_test AS t1
+ARRAY JOIN nest
+INNER JOIN join_test AS t2 ON nest.y = t2.y;
+
+DROP TABLE IF EXISTS nested_test;
+DROP TABLE IF EXISTS join_test;
diff --git a/tests/queries/0_stateless/03047_analyzer_alias_join.reference b/tests/queries/0_stateless/03047_analyzer_alias_join.reference
new file mode 100644
index 00000000000..3bb92083849
--- /dev/null
+++ b/tests/queries/0_stateless/03047_analyzer_alias_join.reference
@@ -0,0 +1,2 @@
+1	1	\N
+1	2	1
diff --git a/tests/queries/0_stateless/03047_analyzer_alias_join.sql b/tests/queries/0_stateless/03047_analyzer_alias_join.sql
new file mode 100644
index 00000000000..7d44c92b6f1
--- /dev/null
+++ b/tests/queries/0_stateless/03047_analyzer_alias_join.sql
@@ -0,0 +1,30 @@
+SET allow_experimental_analyzer=1;
+SELECT
+    1 AS value,
+    *
+FROM
+(
+    SELECT 1 AS key
+) AS l
+LEFT JOIN
+(
+    SELECT
+        2 AS key,
+        1 AS value
+) AS r USING (key)
+SETTINGS join_use_nulls = 1;
+
+SELECT
+    1 AS value,
+    *
+FROM
+(
+    SELECT 2 AS key
+) AS l
+LEFT JOIN
+(
+    SELECT
+        2 AS key,
+        1 AS value
+) AS r USING (key)
+SETTINGS join_use_nulls = 1
diff --git a/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.reference b/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.reference
new file mode 100644
index 00000000000..556d825db42
--- /dev/null
+++ b/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.reference
@@ -0,0 +1 @@
+2	1
diff --git a/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.sql b/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.sql
new file mode 100644
index 00000000000..cfaf1df44bd
--- /dev/null
+++ b/tests/queries/0_stateless/03047_group_by_field_identified_aggregation.sql
@@ -0,0 +1,4 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/32639
+SET allow_experimental_analyzer=1;
+
+SELECT 0 AND id ? 1 : 2 AS a, sum(id) FROM (SELECT 1 AS id) GROUP BY a;
diff --git a/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.reference b/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.sql b/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.sql
new file mode 100644
index 00000000000..42fd581e142
--- /dev/null
+++ b/tests/queries/0_stateless/03048_not_found_column_xxx_in_block.sql
@@ -0,0 +1,67 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/41964
+SET allow_experimental_analyzer=1;
+
+DROP TABLE IF EXISTS ab_12_aaa;
+DROP TABLE IF EXISTS ab_12_bbb;
+
+CREATE TABLE ab_12_aaa
+(
+    `id` String,
+    `subid` Int32,
+    `prodcat` String,
+    `prodtype` String,
+    `quality` String,
+    `m1` Float64,
+    `m2` Float64,
+    `r1` Float64,
+    `r2` Float64,
+    `d1` Float64,
+    `d2` Float64,
+    `pcs` Float64,
+    `qty` Float64,
+    `amt` Float64,
+    `amts` Float64,
+    `prc` Float64,
+    `prcs` Float64,
+    `suqty` Float64,
+    `suamt` Float64,
+    `_year` String
+)
+ENGINE = MergeTree
+ORDER BY (_year, prodcat, prodtype, quality, d1, id)
+SETTINGS index_granularity = 8192;
+
+CREATE TABLE ab_12_bbb
+(
+    `id` String,
+    `sales_type` String,
+    `date` Date32,
+    `o1` String,
+    `o2` String,
+    `o3` String,
+    `o4` String,
+    `o5` String,
+    `short` String,
+    `a1` String,
+    `a2` String,
+    `a3` String,
+    `idx` String,
+    `a4` String,
+    `ctx` String,
+    `_year` String,
+    `theyear` UInt16 MATERIALIZED toYear(`date`),
+    `themonth` UInt8 MATERIALIZED toMonth(`date`),
+    `theweek` UInt8 MATERIALIZED toISOWeek(`date`)
+)
+ENGINE = MergeTree
+ORDER BY (theyear, themonth, _year, id, sales_type, date)
+SETTINGS index_granularity = 8192;
+
+SELECT *
+FROM ab_12_aaa aa
+LEFT JOIN ab_12_bbb bb
+ON bb.id = aa.id AND bb.`_year` = aa.`_year`
+WHERE bb.theyear >= 2019;
+
+DROP TABLE IF EXISTS ab_12_aaa;
+DROP TABLE IF EXISTS ab_12_bbb;
diff --git a/tests/queries/0_stateless/03049_analyzer_group_by_alias.reference b/tests/queries/0_stateless/03049_analyzer_group_by_alias.reference
new file mode 100644
index 00000000000..dac5487d445
--- /dev/null
+++ b/tests/queries/0_stateless/03049_analyzer_group_by_alias.reference
@@ -0,0 +1,7 @@
+1	5
+2	4
+1
+2
+1
+1
+2
diff --git a/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql b/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql
new file mode 100644
index 00000000000..d25babe6788
--- /dev/null
+++ b/tests/queries/0_stateless/03049_analyzer_group_by_alias.sql
@@ -0,0 +1,23 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/7520
+SET allow_experimental_analyzer=1;
+CREATE TABLE test (`a` UInt32, `b` UInt32) ENGINE = Memory;
+
+INSERT INTO test VALUES (1,2), (1,3), (2,4);
+
+-- 1	5
+-- 2	4
+
+WITH
+    a as key
+SELECT
+    a as k1,
+    sum(b) as k2
+FROM
+    test
+GROUP BY
+    key
+ORDER BY k1, k2;
+
+WITH a as key SELECT key as k1 FROM test GROUP BY key ORDER BY key;
+
+WITH a as key SELECT key as k1 FROM test ORDER BY key;
diff --git a/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.reference b/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql b/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql
new file mode 100644
index 00000000000..938f270b9e4
--- /dev/null
+++ b/tests/queries/0_stateless/03049_unknown_identifier_materialized_column.sql
@@ -0,0 +1,14 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/54317
+SET allow_experimental_analyzer=1;
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
+
+CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
+USE {CLICKHOUSE_DATABASE:Identifier};
+
+CREATE TABLE l (y String) Engine Memory;
+CREATE TABLE r (d Date, y String, ty UInt16 MATERIALIZED toYear(d)) Engine Memory;
+select * from l L left join r R on  L.y = R.y  where R.ty >= 2019;
+select * from l left join r  on  l.y = r.y  where r.ty >= 2019;
+select * from {CLICKHOUSE_DATABASE:Identifier}.l left join {CLICKHOUSE_DATABASE:Identifier}.r  on  l.y = r.y  where r.ty >= 2019;
+
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
diff --git a/tests/queries/0_stateless/03050_select_one_one_one.reference b/tests/queries/0_stateless/03050_select_one_one_one.reference
new file mode 100644
index 00000000000..85e6138dc5d
--- /dev/null
+++ b/tests/queries/0_stateless/03050_select_one_one_one.reference
@@ -0,0 +1,2 @@
+1	1	1
+1	1	1
diff --git a/tests/queries/0_stateless/03050_select_one_one_one.sql b/tests/queries/0_stateless/03050_select_one_one_one.sql
new file mode 100644
index 00000000000..28a55e0c471
--- /dev/null
+++ b/tests/queries/0_stateless/03050_select_one_one_one.sql
@@ -0,0 +1,4 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/36973
+SET allow_experimental_analyzer=1;
+SELECT 1, 1, 1;
+SELECT * FROM (SELECT 1, 1, 1);
diff --git a/tests/queries/0_stateless/03051_many_ctes.reference b/tests/queries/0_stateless/03051_many_ctes.reference
new file mode 100644
index 00000000000..487b1165348
--- /dev/null
+++ b/tests/queries/0_stateless/03051_many_ctes.reference
@@ -0,0 +1,4 @@
+2
+2
+2
+2
diff --git a/tests/queries/0_stateless/03051_many_ctes.sql b/tests/queries/0_stateless/03051_many_ctes.sql
new file mode 100644
index 00000000000..d4e613bd279
--- /dev/null
+++ b/tests/queries/0_stateless/03051_many_ctes.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/40955
+SET allow_experimental_analyzer=1;
+WITH toInt64(2) AS new_x SELECT new_x AS x FROM (SELECT 1 AS x) t;
+WITH toInt64(2) AS new_x SELECT * replace(new_x as x)  FROM (SELECT 1 AS x) t;
+SELECT 2 AS x FROM (SELECT 1 AS x) t;
+SELECT * replace(2 as x)  FROM (SELECT 1 AS x) t;
diff --git a/tests/queries/0_stateless/03052_query_hash_includes_aliases.reference b/tests/queries/0_stateless/03052_query_hash_includes_aliases.reference
new file mode 100644
index 00000000000..570d7be9c4b
--- /dev/null
+++ b/tests/queries/0_stateless/03052_query_hash_includes_aliases.reference
@@ -0,0 +1,2 @@
+(1,1)	(1,0)
+(3,4)	(3,11)
diff --git a/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql b/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql
new file mode 100644
index 00000000000..24e9ab0f36e
--- /dev/null
+++ b/tests/queries/0_stateless/03052_query_hash_includes_aliases.sql
@@ -0,0 +1,32 @@
+-- https://github.com/ClickHouse/ClickHouse/pull/40065
+SET allow_experimental_analyzer=1;
+
+SELECT
+(
+  SELECT
+      1 AS number,
+      number
+  FROM numbers(1)
+) AS s,
+(
+  SELECT
+      1,
+      number
+  FROM numbers(1)
+) AS s2;
+
+SELECT
+(
+  SELECT
+          1 + 2 AS number,
+          1 + number AS b
+  FROM system.numbers
+  LIMIT 10, 1
+),
+(
+  SELECT
+          1 + 2 AS number2,
+          1 + number AS b
+  FROM system.numbers
+  LIMIT 10, 1
+);
diff --git a/tests/queries/0_stateless/03053_analyzer_join_alias.reference b/tests/queries/0_stateless/03053_analyzer_join_alias.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03053_analyzer_join_alias.sql b/tests/queries/0_stateless/03053_analyzer_join_alias.sql
new file mode 100644
index 00000000000..894b8af7c6f
--- /dev/null
+++ b/tests/queries/0_stateless/03053_analyzer_join_alias.sql
@@ -0,0 +1,44 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/23104
+SET allow_experimental_analyzer=1;
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
+CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
+
+CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.base
+(
+`id` UInt64,
+`id2` UInt64,
+`d` UInt64,
+`value` UInt64
+)
+ENGINE=MergeTree()
+PARTITION BY d
+ORDER BY (id,id2,d);
+
+CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.derived1
+(
+    `id1` UInt64,
+    `d1` UInt64,
+    `value1` UInt64
+)
+ENGINE = MergeTree()
+PARTITION BY d1
+ORDER BY (id1, d1);
+
+CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.derived2
+(
+    `id2` UInt64,
+    `d2` UInt64,
+    `value2` UInt64
+)
+ENGINE = MergeTree()
+PARTITION BY d2
+ORDER BY (id2, d2);
+
+SELECT
+    base.id AS `base.id`,
+    derived2.id2 AS `derived2.id2`,
+    derived2.value2 AS `derived2.value2`,
+    derived1.value1 AS `derived1.value1`
+FROM {CLICKHOUSE_DATABASE:Identifier}.base AS base
+LEFT JOIN {CLICKHOUSE_DATABASE:Identifier}.derived2 AS derived2 ON base.id2 = derived2.id2
+LEFT JOIN {CLICKHOUSE_DATABASE:Identifier}.derived1 AS derived1 ON base.id = derived1.id1;
diff --git a/tests/queries/0_stateless/03054_analyzer_join_alias.reference b/tests/queries/0_stateless/03054_analyzer_join_alias.reference
new file mode 100644
index 00000000000..f599e28b8ab
--- /dev/null
+++ b/tests/queries/0_stateless/03054_analyzer_join_alias.reference
@@ -0,0 +1 @@
+10
diff --git a/tests/queries/0_stateless/03054_analyzer_join_alias.sql b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
new file mode 100644
index 00000000000..e124aa33a9b
--- /dev/null
+++ b/tests/queries/0_stateless/03054_analyzer_join_alias.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/21584
+SET allow_experimental_analyzer=1;
+SELECT count()
+FROM
+(
+    SELECT number AS key_1
+    FROM numbers(15)
+) AS x
+ALL INNER JOIN
+(
+    SELECT number AS key_1
+    FROM numbers(10)
+) AS z ON key_1 = z.key_1;
diff --git a/tests/queries/0_stateless/03055_analyzer_subquery_group_array.reference b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.reference
new file mode 100644
index 00000000000..d05b1f927f4
--- /dev/null
+++ b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.reference
@@ -0,0 +1 @@
+0	0
diff --git a/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql
new file mode 100644
index 00000000000..25b6dcb3564
--- /dev/null
+++ b/tests/queries/0_stateless/03055_analyzer_subquery_group_array.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/23344
+SET allow_experimental_analyzer=1;
+SELECT logTrace(repeat('Hello', 100)), ignore(*)
+FROM (
+    SELECT ignore((SELECT groupArrayState(([number], [number])) FROM numbers(19000)))
+)
diff --git a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference
new file mode 100644
index 00000000000..72749c905a3
--- /dev/null
+++ b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.reference
@@ -0,0 +1 @@
+1	1	1
diff --git a/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql
new file mode 100644
index 00000000000..de471c1a091
--- /dev/null
+++ b/tests/queries/0_stateless/03056_analyzer_double_subquery_alias.sql
@@ -0,0 +1,17 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/22627
+SET allow_experimental_analyzer=1;
+WITH
+    x AS
+    (
+        SELECT 1 AS a
+    ),
+    xx AS
+    (
+        SELECT *
+        FROM x
+        , x AS x1
+        , x AS x2
+    )
+SELECT *
+FROM xx
+WHERE a = 1;
diff --git a/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.reference b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.reference
new file mode 100644
index 00000000000..3e43e6addc0
--- /dev/null
+++ b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.reference
@@ -0,0 +1 @@
+1000	100000
diff --git a/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql
new file mode 100644
index 00000000000..2217af327fa
--- /dev/null
+++ b/tests/queries/0_stateless/03057_analyzer_subquery_alias_join.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/10276
+SET allow_experimental_analyzer=1;
+SELECT
+    sum(x.n) as n,
+    sum(z.n) as n2
+FROM
+(
+    SELECT 1000 AS n,1 as id
+) AS x
+join (select 10000 as n,1 as id) as y
+on x.id = y.id
+left join (select 100000 as n,1 as id) as z
+on x.id = z.id;
diff --git a/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.reference b/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql b/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql
new file mode 100644
index 00000000000..3cce77f0240
--- /dev/null
+++ b/tests/queries/0_stateless/03058_analyzer_ambiguous_columns.sql
@@ -0,0 +1,26 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/4567
+SET allow_experimental_analyzer=1;
+DROP TABLE IF EXISTS fact;
+DROP TABLE IF EXISTS animals;
+DROP TABLE IF EXISTS colors;
+
+create table fact(id Int64, animal_key Int64, color_key Int64) Engine = MergeTree order by tuple();
+insert into fact values (1,1,1),(2,2,2);
+
+create table animals(animal_key UInt64, animal_name String) Engine = MergeTree order by tuple();
+insert into animals values (0, 'unknown');
+
+create table colors(color_key UInt64, color_name String) Engine = MergeTree order by tuple();
+insert into colors values (0, 'unknown');
+
+
+select  id, animal_name, a.animal_key, color_name, color_key
+from fact a
+        left join (select toInt64(animal_key) animal_key, animal_name from animals) b on (a.animal_key = b.animal_key)
+        left join (select toInt64(color_key) color_key, color_name from colors) c on (a.color_key = c.color_key);  -- { serverError AMBIGUOUS_IDENTIFIER }
+
+select  id, animal_name, animal_key, color_name, color_key
+from fact a
+        left join (select toInt64(animal_key) animal_key, animal_name from animals) b on (a.animal_key = b.animal_key)
+        left join (select toInt64(color_key) color_key, color_name from colors) c on (a.color_key = c.color_key);  -- { serverError AMBIGUOUS_IDENTIFIER }
+
diff --git a/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.reference b/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql b/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql
new file mode 100644
index 00000000000..27782462075
--- /dev/null
+++ b/tests/queries/0_stateless/03059_analyzer_join_engine_missing_column.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/17710
+SET allow_experimental_analyzer=1;
+CREATE TABLE id_val(id UInt32, val UInt32) ENGINE = Memory;
+CREATE TABLE id_val_join0(id UInt32, val UInt8) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls = 0;
+CREATE TABLE id_val_join1(id UInt32, val UInt8) ENGINE = Join(ANY, LEFT, id) SETTINGS join_use_nulls = 1;
+
+SELECT * FROM id_val ANY LEFT JOIN id_val_join0 USING (id) SETTINGS join_use_nulls = 0;
+
+SELECT * FROM id_val ANY LEFT JOIN id_val_join1 USING (id) SETTINGS join_use_nulls = 1;
diff --git a/tests/queries/0_stateless/03060_analyzer_regular_view_alias.reference b/tests/queries/0_stateless/03060_analyzer_regular_view_alias.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql b/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql
new file mode 100644
index 00000000000..f8cd8690ee5
--- /dev/null
+++ b/tests/queries/0_stateless/03060_analyzer_regular_view_alias.sql
@@ -0,0 +1,16 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/11068
+SET allow_experimental_analyzer=1;
+create table vt(datetime_value DateTime, value Float64) Engine=Memory;
+
+create view computed_datum_hours as
+SELECT
+        toStartOfHour(b.datetime_value) AS datetime_desc,
+        sum(b.value) AS value
+FROM vt AS b
+GROUP BY toStartOfHour(b.datetime_value);
+
+SELECT
+    toStartOfHour(b.datetime_value) AS datetime_desc,
+    sum(b.value) AS value
+FROM vt AS b
+GROUP BY toStartOfHour(b.datetime_value);
diff --git a/tests/queries/0_stateless/03061_analyzer_alias_as_right_key_in_join.reference b/tests/queries/0_stateless/03061_analyzer_alias_as_right_key_in_join.reference
new file mode 100644
index 00000000000..af98bcd6397
--- /dev/null
+++ b/tests/queries/0_stateless/03061_analyzer_alias_as_right_key_in_join.reference
@@ -0,0 +1,10 @@
+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/03061_analyzer_alias_as_right_key_in_join.sql b/tests/queries/0_stateless/03061_analyzer_alias_as_right_key_in_join.sql
new file mode 100644
index 00000000000..6fee6d1f73d
--- /dev/null
+++ b/tests/queries/0_stateless/03061_analyzer_alias_as_right_key_in_join.sql
@@ -0,0 +1,8 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/24395
+SET allow_experimental_analyzer=1;
+CREATE TABLE xxxx_yyy (key UInt32, key_b ALIAS key) ENGINE=MergeTree() ORDER BY key;
+INSERT INTO xxxx_yyy SELECT number FROM numbers(10);
+
+SELECT *
+FROM xxxx_yyy AS a
+INNER JOIN xxxx_yyy AS b ON a.key = b.key_b;
diff --git a/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.reference b/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.reference
new file mode 100644
index 00000000000..d496ccad6b6
--- /dev/null
+++ b/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.reference
@@ -0,0 +1,2 @@
+abc	0	0	0	1
+abc	0	0	0	1
diff --git a/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.sql b/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.sql
new file mode 100644
index 00000000000..9748175e4d4
--- /dev/null
+++ b/tests/queries/0_stateless/03062_analyzer_join_engine_missing_column.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/23416
+SET allow_experimental_analyzer=1;
+create table test (TOPIC String, PARTITION UInt64, OFFSET UInt64, ID UInt64) ENGINE ReplicatedMergeTree('/clickhouse/tables/{database}/test_03062', 'r2') ORDER BY (TOPIC, PARTITION, OFFSET);
+
+create table test_join (TOPIC String, PARTITION UInt64, OFFSET UInt64)  ENGINE = Join(ANY, LEFT, `TOPIC`, `PARTITION`) SETTINGS join_any_take_last_row = 1;
+
+insert into test values('abc',0,0,0);
+
+insert into test_join values('abc',0,1);
+
+select *, joinGet('test_join', 'OFFSET', TOPIC, PARTITION) from test;
+
+select * from test any left join test_join using (TOPIC, PARTITION);
diff --git a/tests/queries/0_stateless/03063_analyzer_multi_join_wrong_table_specifier.reference b/tests/queries/0_stateless/03063_analyzer_multi_join_wrong_table_specifier.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03063_analyzer_multi_join_wrong_table_specifier.sql b/tests/queries/0_stateless/03063_analyzer_multi_join_wrong_table_specifier.sql
new file mode 100644
index 00000000000..7eab1fa846a
--- /dev/null
+++ b/tests/queries/0_stateless/03063_analyzer_multi_join_wrong_table_specifier.sql
@@ -0,0 +1,17 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/23162
+SET allow_experimental_analyzer=1;
+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 }
+
+SELECT * FROM t1
+INNER JOIN s ON t1.k = s.k
+WHERE (t1.d >= now()); -- { serverError UNKNOWN_IDENTIFIER }
+
diff --git a/tests/queries/0_stateless/03064_analyzer_named_subqueries.reference b/tests/queries/0_stateless/03064_analyzer_named_subqueries.reference
new file mode 100644
index 00000000000..556d825db42
--- /dev/null
+++ b/tests/queries/0_stateless/03064_analyzer_named_subqueries.reference
@@ -0,0 +1 @@
+2	1
diff --git a/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql b/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql
new file mode 100644
index 00000000000..59ebb9d9af3
--- /dev/null
+++ b/tests/queries/0_stateless/03064_analyzer_named_subqueries.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/25655
+SET allow_experimental_analyzer=1;
+SELECT
+  sum(t.b) / 1 a,
+  sum(t.a)
+FROM ( SELECT 1 a, 2 b ) t;
diff --git a/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.reference b/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.reference
new file mode 100644
index 00000000000..594a6a2deeb
--- /dev/null
+++ b/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.reference
@@ -0,0 +1,2 @@
+1	3
+2	4
diff --git a/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.sql b/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.sql
new file mode 100644
index 00000000000..7e6befe181e
--- /dev/null
+++ b/tests/queries/0_stateless/03065_analyzer_cross_join_and_array_join.sql
@@ -0,0 +1,3 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/11757
+SET allow_experimental_analyzer=1;
+select * from (select [1, 2] a) aa cross join (select [3, 4] b) bb array join aa.a, bb.b;
diff --git a/tests/queries/0_stateless/03066_analyzer_global_with_statement.reference b/tests/queries/0_stateless/03066_analyzer_global_with_statement.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03066_analyzer_global_with_statement.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql b/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql
new file mode 100644
index 00000000000..8983be242c3
--- /dev/null
+++ b/tests/queries/0_stateless/03066_analyzer_global_with_statement.sql
@@ -0,0 +1,8 @@
+SET allow_experimental_analyzer=1;
+WITH 0 AS test
+SELECT *
+FROM
+(
+    SELECT 1 AS test
+)
+SETTINGS enable_global_with_statement = 1
diff --git a/tests/queries/0_stateless/03067_analyzer_complex_alias_join.reference b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.reference
new file mode 100644
index 00000000000..6192a595f1e
--- /dev/null
+++ b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.reference
@@ -0,0 +1 @@
+key	\N
diff --git a/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql
new file mode 100644
index 00000000000..052a9eaf734
--- /dev/null
+++ b/tests/queries/0_stateless/03067_analyzer_complex_alias_join.sql
@@ -0,0 +1,10 @@
+SET allow_experimental_analyzer=1;
+with d as (select 'key'::Varchar(255) c, 'x'::Varchar(255) s)
+SELECT r1, c as r2
+FROM (
+       SELECT t as s, c as r1
+       FROM ( SELECT 'y'::Varchar(255) as t, 'x'::Varchar(255) as s) t1
+       LEFT JOIN d USING (s)
+     ) t2
+LEFT JOIN d using (s)
+SETTINGS join_use_nulls=1;
diff --git a/tests/queries/0_stateless/03068_analyzer_distributed_join.reference b/tests/queries/0_stateless/03068_analyzer_distributed_join.reference
new file mode 100644
index 00000000000..1444d39d957
--- /dev/null
+++ b/tests/queries/0_stateless/03068_analyzer_distributed_join.reference
@@ -0,0 +1,2 @@
+localhost	9000	0		0	0
+localhost	9000	0		0	0
diff --git a/tests/queries/0_stateless/03068_analyzer_distributed_join.sql b/tests/queries/0_stateless/03068_analyzer_distributed_join.sql
new file mode 100644
index 00000000000..542380feb7c
--- /dev/null
+++ b/tests/queries/0_stateless/03068_analyzer_distributed_join.sql
@@ -0,0 +1,58 @@
+-- Tags: no-replicated-database
+-- Closes: https://github.com/ClickHouse/ClickHouse/issues/6571
+
+SET allow_experimental_analyzer=1;
+CREATE TABLE LINEITEM_shard ON CLUSTER test_shard_localhost
+(
+    L_ORDERKEY UInt64,
+    L_COMMITDATE UInt32,
+    L_RECEIPTDATE UInt32
+)
+ENGINE = MergeTree()
+ORDER BY L_ORDERKEY;
+
+CREATE TABLE LINEITEM AS LINEITEM_shard
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), LINEITEM_shard, rand());
+
+CREATE TABLE ORDERS_shard ON CLUSTER test_shard_localhost
+(
+    O_ORDERKEY UInt64,
+    O_ORDERPRIORITY UInt32
+)
+ENGINE = MergeTree()
+ORDER BY O_ORDERKEY;
+
+CREATE TABLE ORDERS AS ORDERS_shard
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), ORDERS_shard, rand());
+
+SET joined_subquery_requires_alias=0;
+
+select
+	O_ORDERPRIORITY,
+	count(*) as order_count
+from ORDERS JOIN (
+	select L_ORDERKEY
+	from
+	LINEITEM_shard
+	group by L_ORDERKEY
+	having any(L_COMMITDATE < L_RECEIPTDATE)
+) on O_ORDERKEY=L_ORDERKEY
+group by O_ORDERPRIORITY
+order by O_ORDERPRIORITY
+limit 1;
+
+SET joined_subquery_requires_alias=1;
+
+select
+	O_ORDERPRIORITY,
+	count(*) as order_count
+from ORDERS JOIN (
+	select L_ORDERKEY
+	from
+	LINEITEM_shard
+	group by L_ORDERKEY
+	having any(L_COMMITDATE < L_RECEIPTDATE)
+) AS x on O_ORDERKEY=L_ORDERKEY
+group by O_ORDERPRIORITY
+order by O_ORDERPRIORITY
+limit 1;
diff --git a/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.reference b/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.reference
new file mode 100644
index 00000000000..1191247b6d9
--- /dev/null
+++ b/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.reference
@@ -0,0 +1,2 @@
+1
+2
diff --git a/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.sql b/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.sql
new file mode 100644
index 00000000000..09d2985fe60
--- /dev/null
+++ b/tests/queries/0_stateless/03069_analyzer_with_alias_in_array_join.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/4432
+SET allow_experimental_analyzer=1;
+WITH [1, 2] AS zz
+SELECT x
+FROM system.one
+ARRAY JOIN zz AS x
diff --git a/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.reference b/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.reference
new file mode 100644
index 00000000000..595b4d6b5b8
--- /dev/null
+++ b/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.reference
@@ -0,0 +1,25 @@
+0	25
+1	25
+2	25
+3	25
+4	25
+5	25
+6	25
+7	25
+8	25
+9	25
+10	25
+11	25
+12	25
+13	25
+14	25
+15	25
+16	25
+17	25
+18	25
+19	25
+20	25
+21	25
+22	25
+23	25
+24	25
diff --git a/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.sql b/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.sql
new file mode 100644
index 00000000000..7aadab2ca73
--- /dev/null
+++ b/tests/queries/0_stateless/03070_analyzer_CTE_scalar_as_numbers.sql
@@ -0,0 +1,6 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/8259
+SET allow_experimental_analyzer=1;
+with
+    (select 25) as something
+select *, something
+from numbers(toUInt64(assumeNotNull(something)));
diff --git a/tests/queries/0_stateless/03071_analyzer_array_join_forbid_non_existing_columns.reference b/tests/queries/0_stateless/03071_analyzer_array_join_forbid_non_existing_columns.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03071_analyzer_array_join_forbid_non_existing_columns.sql b/tests/queries/0_stateless/03071_analyzer_array_join_forbid_non_existing_columns.sql
new file mode 100644
index 00000000000..e2eb758d649
--- /dev/null
+++ b/tests/queries/0_stateless/03071_analyzer_array_join_forbid_non_existing_columns.sql
@@ -0,0 +1,12 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/9233
+SET allow_experimental_analyzer=1;
+SELECT *
+FROM
+(
+    SELECT
+        [1, 2, 3] AS x,
+        [4, 5, 6] AS y
+)
+ARRAY JOIN
+    x,
+    Y; -- { serverError UNKNOWN_IDENTIFIER }
diff --git a/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.reference b/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.sql b/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.sql
new file mode 100644
index 00000000000..e2846033913
--- /dev/null
+++ b/tests/queries/0_stateless/03072_analyzer_missing_columns_from_subquery.sql
@@ -0,0 +1,3 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/14699
+SET allow_experimental_analyzer=1;
+select * from (select number from numbers(1)) where not ignore(*);
diff --git a/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.reference b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.reference
new file mode 100644
index 00000000000..ca6280d2dbf
--- /dev/null
+++ b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.reference
@@ -0,0 +1,2 @@
+1	1997-02-01
+2	1997-02-01
diff --git a/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql
new file mode 100644
index 00000000000..5599324c62b
--- /dev/null
+++ b/tests/queries/0_stateless/03073_analyzer_alias_as_column_name.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/27068
+SET allow_experimental_analyzer=1;
+CREATE TABLE test ( id String, create_time DateTime ) ENGINE = MergeTree ORDER BY id;
+
+insert into test values(1,'1970-02-01 00:00:00');
+insert into test values(2,'1970-02-01 00:00:00');
+insert into test values(3,'1970-03-01 00:00:00');
+
+select id,'1997-02-01' as create_time from test where test.create_time='1970-02-01 00:00:00' ORDER BY id
diff --git a/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.reference b/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.reference
new file mode 100644
index 00000000000..aa47d0d46d4
--- /dev/null
+++ b/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.reference
@@ -0,0 +1,2 @@
+0
+0
diff --git a/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.sql b/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.sql
new file mode 100644
index 00000000000..4df5f6f48e6
--- /dev/null
+++ b/tests/queries/0_stateless/03074_analyzer_alias_column_in_view.sql
@@ -0,0 +1,7 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/28687
+SET allow_experimental_analyzer=1;
+create view alias (dummy int, n alias dummy) as select * from system.one;
+
+select n from alias;
+
+select * from alias where n=0;
diff --git a/tests/queries/0_stateless/03075_analyzer_subquery_alias.reference b/tests/queries/0_stateless/03075_analyzer_subquery_alias.reference
new file mode 100644
index 00000000000..556d825db42
--- /dev/null
+++ b/tests/queries/0_stateless/03075_analyzer_subquery_alias.reference
@@ -0,0 +1 @@
+2	1
diff --git a/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql b/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql
new file mode 100644
index 00000000000..416815e761b
--- /dev/null
+++ b/tests/queries/0_stateless/03075_analyzer_subquery_alias.sql
@@ -0,0 +1,11 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/28777
+SET allow_experimental_analyzer=1;
+SELECT
+    sum(q0.a2) AS a1,
+    sum(q0.a1) AS a9
+FROM
+(
+    SELECT
+        1 AS a1,
+        2 AS a2
+) AS q0;
diff --git a/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.reference b/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql b/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql
new file mode 100644
index 00000000000..7ac9fe6b446
--- /dev/null
+++ b/tests/queries/0_stateless/03076_analyzer_multiple_joins_alias.sql
@@ -0,0 +1,52 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/29734
+SET allow_experimental_analyzer=1;
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+) AS a
+INNER JOIN
+(
+    SELECT
+        1 AS x,
+        2 AS y
+) AS b ON (a.x = b.x) AND (a.y = b.y); -- { serverError UNKNOWN_IDENTIFIER }
+
+
+
+SELECT *
+FROM
+(
+    SELECT 1 AS x
+) AS a
+INNER JOIN
+(
+    SELECT
+        1 AS x,
+        2 AS y
+) AS b ON (a.x = b.x) AND (a.y = b.y)
+INNER JOIN
+(
+    SELECT 3 AS x
+) AS c ON a.x = c.x; -- { serverError UNKNOWN_IDENTIFIER }
+
+
+SELECT *
+FROM
+(
+    SELECT number AS x
+    FROM numbers(10)
+) AS a
+INNER JOIN
+(
+    SELECT
+        number AS x,
+        number AS y
+    FROM numbers(10)
+) AS b ON (a.x = b.x) AND (a.y = b.y)
+INNER JOIN
+(
+    SELECT number AS x
+    FROM numbers(10)
+) AS c ON a.x = c.x; -- { serverError UNKNOWN_IDENTIFIER }
+
diff --git a/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.reference b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.reference
new file mode 100644
index 00000000000..6b134f711d4
--- /dev/null
+++ b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.reference
@@ -0,0 +1,21 @@
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+1
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
+9	9	9	9
diff --git a/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql
new file mode 100644
index 00000000000..5a181023c57
--- /dev/null
+++ b/tests/queries/0_stateless/03077_analyzer_multi_scalar_subquery_aliases.sql
@@ -0,0 +1,23 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/33825
+SET allow_experimental_analyzer=1;
+CREATE TABLE t1 (i Int64, j Int64) ENGINE = Memory;
+INSERT INTO t1 SELECT number, number FROM system.numbers LIMIT 10;
+SELECT
+        (SELECT max(i) FROM t1) as i,
+        (SELECT max(i) FROM t1) as j,
+        (SELECT max(i) FROM t1) as k,
+        (SELECT max(i) FROM t1) as l
+FROM t1;
+
+SELECT 1;
+
+WITH (
+        SELECT max(i)
+        FROM t1
+    ) AS value
+SELECT
+    value AS i,
+    value AS j,
+    value AS k,
+    value AS l
+FROM t1;
diff --git a/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.reference b/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.reference
new file mode 100644
index 00000000000..b2c49b655d4
--- /dev/null
+++ b/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.reference
@@ -0,0 +1,21 @@
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+111111111111
+1
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
+2222222222
diff --git a/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.sql b/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.sql
new file mode 100644
index 00000000000..d91a9ed106d
--- /dev/null
+++ b/tests/queries/0_stateless/03078_analyzer_multi_scalar_subquery_aliases.sql
@@ -0,0 +1,17 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/33825
+SET allow_experimental_analyzer=1;
+CREATE TABLE t2 (first_column Int64, second_column Int64) ENGINE = Memory;
+INSERT INTO t2 SELECT number, number FROM system.numbers LIMIT 10;
+
+
+SELECT (
+        SELECT 111111111111
+    ) AS first_column
+FROM t2;
+
+SELECT 1;
+
+SELECT (
+        SELECT 2222222222
+    ) AS second_column
+FROM t2;
diff --git a/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.reference b/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.reference
new file mode 100644
index 00000000000..faff07c519f
--- /dev/null
+++ b/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.reference
@@ -0,0 +1,2 @@
+\N	1
+str
diff --git a/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.sql b/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.sql
new file mode 100644
index 00000000000..955d3b49a00
--- /dev/null
+++ b/tests/queries/0_stateless/03079_analyzer_numeric_literals_as_column_names.sql
@@ -0,0 +1,13 @@
+SET allow_experimental_analyzer=1;
+CREATE TABLE testdata (`1` String) ENGINE=MergeTree ORDER BY tuple();
+INSERT INTO testdata VALUES ('testdata');
+
+SELECT *
+FROM (
+   SELECT if(isValidUTF8(`1`), NULL, 'error!') AS error_message,
+          if(error_message IS NULL, 1, 0) AS valid
+     FROM testdata
+)
+WHERE valid;
+
+select * from (select 'str' as `1`) where 1;
diff --git a/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.reference b/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.reference
new file mode 100644
index 00000000000..ccf161abe8d
--- /dev/null
+++ b/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.reference
@@ -0,0 +1,3 @@
+0	0
+0	0
+	0		0
diff --git a/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.sql b/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.sql
new file mode 100644
index 00000000000..01ab868f9ea
--- /dev/null
+++ b/tests/queries/0_stateless/03080_analyzer_prefer_column_name_to_alias__virtual_columns.sql
@@ -0,0 +1,28 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/35652
+SET allow_experimental_analyzer=1;
+CREATE TABLE test (
+  id UInt64
+)
+ENGINE = MergeTree()
+SAMPLE BY intHash32(id)
+ORDER BY intHash32(id);
+
+SELECT
+  any(id),
+  any(id) AS id
+FROM test
+SETTINGS prefer_column_name_to_alias = 1;
+
+SELECT
+  any(_sample_factor),
+  any(_sample_factor) AS _sample_factor
+FROM test
+SETTINGS prefer_column_name_to_alias = 1;
+
+SELECT
+  any(_partition_id),
+  any(_sample_factor),
+  any(_partition_id) AS _partition_id,
+  any(_sample_factor) AS _sample_factor
+FROM test
+SETTINGS prefer_column_name_to_alias = 1;
diff --git a/tests/queries/0_stateless/03080_incorrect_join_with_merge.reference b/tests/queries/0_stateless/03080_incorrect_join_with_merge.reference
new file mode 100644
index 00000000000..51993f072d5
--- /dev/null
+++ b/tests/queries/0_stateless/03080_incorrect_join_with_merge.reference
@@ -0,0 +1,2 @@
+2
+2
diff --git a/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql b/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql
new file mode 100644
index 00000000000..4985d3abfb6
--- /dev/null
+++ b/tests/queries/0_stateless/03080_incorrect_join_with_merge.sql
@@ -0,0 +1,67 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/29838
+SET allow_experimental_analyzer=1;
+
+CREATE TABLE first_table_lr
+(
+    id String,
+    id2 String
+)
+ENGINE = ReplicatedMergeTree('/clickhouse/tables/{database}/test_03080/alter', 'r1')
+ORDER BY id;
+
+
+CREATE TABLE first_table
+(
+    id String,
+    id2 String
+)
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), 'first_table_lr');
+
+
+CREATE TABLE second_table_lr
+(
+    id String,
+    id2 String
+) ENGINE = MergeTree()
+ORDER BY id;
+
+CREATE TABLE second_table
+(
+    id String,
+    id2 String
+)
+ENGINE = Distributed('test_shard_localhost', currentDatabase(), 'second_table_lr');
+
+INSERT INTO first_table VALUES ('1', '2'), ('3', '4');
+INSERT INTO second_table VALUES ('1', '2'), ('3', '4');
+
+CREATE TABLE two_tables
+(
+    id String,
+    id2 String
+)
+ENGINE = Merge(currentDatabase(), '^(first_table)$');
+
+SELECT
+    count()
+FROM first_table as s
+GLOBAL ANY JOIN second_table as f USING (id)
+WHERE
+    f.id2 GLOBAL IN (
+        SELECT
+            id2
+        FROM second_table
+        GROUP BY id2
+    );
+
+SELECT
+    count()
+FROM two_tables as s
+GLOBAL ANY JOIN second_table as f USING (id)
+WHERE
+    f.id2 GLOBAL IN (
+        SELECT
+            id2
+        FROM second_table
+        GROUP BY id2
+    );
diff --git a/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.reference b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.reference
new file mode 100644
index 00000000000..bf1b8926236
--- /dev/null
+++ b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.reference
@@ -0,0 +1,2 @@
+2020-01-01
+9
diff --git a/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql
new file mode 100644
index 00000000000..e6a540dc5df
--- /dev/null
+++ b/tests/queries/0_stateless/03081_analyzer_agg_func_CTE.sql
@@ -0,0 +1,19 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/36189
+SET allow_experimental_analyzer=1;
+CREATE TABLE test
+(
+    `dt` Date,
+    `text` String
+)
+ENGINE = MergeTree
+ORDER BY dt;
+
+insert into test values ('2020-01-01', 'text1'), ('2019-01-01', 'text2'), ('1900-01-01', 'text3');
+
+WITH max(dt) AS maxDt
+SELECT maxDt
+FROM test;
+
+WITH max(number) AS maxDt
+SELECT maxDt
+FROM numbers(10);
diff --git a/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.reference b/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.reference
new file mode 100644
index 00000000000..ad3f3d53ab5
--- /dev/null
+++ b/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.reference
@@ -0,0 +1,2 @@
+pk1	2
+pk1	2
diff --git a/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.sql b/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.sql
new file mode 100644
index 00000000000..8f17248ed0d
--- /dev/null
+++ b/tests/queries/0_stateless/03082_analyzer_left_join_correct_column.sql
@@ -0,0 +1,31 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/39634
+SET allow_experimental_analyzer=1;
+CREATE TABLE test1
+(
+    `pk` String,
+    `x.y` Decimal(18, 4)
+)
+ENGINE = MergeTree()
+ORDER BY (pk);
+
+CREATE TABLE test2
+(
+    `pk` String,
+    `x.y` Decimal(18, 4)
+)
+ENGINE = MergeTree()
+ORDER BY (pk);
+
+INSERT INTO test1 SELECT 'pk1', 1;
+
+INSERT INTO test2 SELECT 'pk1', 2;
+
+SELECT t1.pk, t2.x.y
+FROM test1 t1
+LEFT JOIN test2 t2
+	on t1.pk = t2.pk;
+
+SELECT t1.pk, t2.`x.y`
+FROM test1 t1
+LEFT JOIN test2 t2
+	on t1.pk = t2.pk;
diff --git a/tests/queries/0_stateless/03084_analyzer_join_column_alias.reference b/tests/queries/0_stateless/03084_analyzer_join_column_alias.reference
new file mode 100644
index 00000000000..acbb8406347
--- /dev/null
+++ b/tests/queries/0_stateless/03084_analyzer_join_column_alias.reference
@@ -0,0 +1 @@
+2023-01-01
diff --git a/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql b/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql
new file mode 100644
index 00000000000..930726898b5
--- /dev/null
+++ b/tests/queries/0_stateless/03084_analyzer_join_column_alias.sql
@@ -0,0 +1,24 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/47432
+SET allow_experimental_analyzer=1;
+create table t1
+engine = MergeTree()
+order by tuple()
+as
+select 1 as user_id, 2 as level;
+
+
+create table t2
+engine = MergeTree()
+order by tuple()
+as
+select 1 as user_id, 'website' as event_source, '2023-01-01 00:00:00'::DateTime as timestamp;
+
+
+alter table t2
+add column date Date alias toDate(timestamp);
+
+SELECT
+  any(t2.date) as any_val
+FROM t1 AS t1
+LEFT JOIN t2 as t2
+  ON (t1.user_id = t2.user_id);
diff --git a/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.reference b/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.reference
new file mode 100644
index 00000000000..804f12662b8
--- /dev/null
+++ b/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.reference
@@ -0,0 +1 @@
+String	1
diff --git a/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.sql b/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.sql
new file mode 100644
index 00000000000..fd67194b08b
--- /dev/null
+++ b/tests/queries/0_stateless/03085_analyzer_alias_column_group_by.sql
@@ -0,0 +1,5 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/54910
+SET allow_experimental_analyzer=1;
+SELECT toTypeName(stat_standard_id) AS stat_standard_id_1, count(1) AS value
+FROM ( SELECT 'string value' AS stat_standard_id )
+GROUP BY stat_standard_id_1 LIMIT 1
diff --git a/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.reference b/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.reference
new file mode 100644
index 00000000000..c8b2d51ae53
--- /dev/null
+++ b/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.reference
@@ -0,0 +1,2 @@
+1	2
+2	2
diff --git a/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.sql b/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.sql
new file mode 100644
index 00000000000..31747328d1f
--- /dev/null
+++ b/tests/queries/0_stateless/03086_analyzer_window_func_part_of_group_by.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/57321
+SET allow_experimental_analyzer=1;
+SELECT
+    ver,
+    max(ver) OVER () AS ver_max
+FROM
+(
+    SELECT 1 AS ver
+    UNION ALL
+    SELECT 2 AS ver
+)
+GROUP BY ver
+ORDER BY ver;
diff --git a/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.reference b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.reference
new file mode 100644
index 00000000000..7660873d103
--- /dev/null
+++ b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.reference
@@ -0,0 +1 @@
+[1]
diff --git a/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql
new file mode 100644
index 00000000000..6546e50c99e
--- /dev/null
+++ b/tests/queries/0_stateless/03087_analyzer_subquery_with_alias.sql
@@ -0,0 +1,16 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/59154
+SET allow_experimental_analyzer=1;
+SELECT *
+FROM
+(
+    WITH
+        assumeNotNull((
+            SELECT 0.9
+        )) AS TUNING,
+        ELEMENT_QUERY AS
+        (
+            SELECT quantiles(TUNING)(1)
+        )
+    SELECT *
+    FROM ELEMENT_QUERY
+);
diff --git a/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.reference b/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.reference
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.sql b/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.sql
new file mode 100644
index 00000000000..e6f1ed81f91
--- /dev/null
+++ b/tests/queries/0_stateless/03088_analyzer_ambiguous_column_multi_call.sql
@@ -0,0 +1,13 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61014
+SET allow_experimental_analyzer=1;
+
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
+create database {CLICKHOUSE_DATABASE:Identifier};
+
+create table {CLICKHOUSE_DATABASE:Identifier}.a (i int) engine = Log();
+
+select
+  {CLICKHOUSE_DATABASE:Identifier}.a.i
+from
+  {CLICKHOUSE_DATABASE:Identifier}.a,
+  {CLICKHOUSE_DATABASE:Identifier}.a as x;
diff --git a/tests/queries/0_stateless/03089_analyzer_alias_replacement.reference b/tests/queries/0_stateless/03089_analyzer_alias_replacement.reference
new file mode 100644
index 00000000000..2f1b638ff54
--- /dev/null
+++ b/tests/queries/0_stateless/03089_analyzer_alias_replacement.reference
@@ -0,0 +1,2 @@
+1
+4
diff --git a/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql b/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql
new file mode 100644
index 00000000000..069da5fdd65
--- /dev/null
+++ b/tests/queries/0_stateless/03089_analyzer_alias_replacement.sql
@@ -0,0 +1,9 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61950
+SET allow_experimental_analyzer=1;
+
+with dummy + 1 as dummy select dummy from system.one;
+
+WITH dummy + 3 AS dummy
+SELECT dummy + 1 AS y
+FROM system.one
+SETTINGS enable_global_with_statement = 1;
diff --git a/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.reference b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.reference
new file mode 100644
index 00000000000..573541ac970
--- /dev/null
+++ b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.reference
@@ -0,0 +1 @@
+0
diff --git a/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql
new file mode 100644
index 00000000000..c35f33782ff
--- /dev/null
+++ b/tests/queries/0_stateless/03090_analyzer_multiple_using_statements.sql
@@ -0,0 +1,17 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/55647
+SET allow_experimental_analyzer=1;
+
+SELECT
+*
+FROM (
+    SELECT *
+    FROM system.one
+) a
+JOIN (
+    SELECT *
+    FROM system.one
+) b USING dummy
+JOIN (
+    SELECT *
+    FROM system.one
+) c USING dummy
diff --git a/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.reference b/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.reference
new file mode 100644
index 00000000000..ce45f6636b2
--- /dev/null
+++ b/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.reference
@@ -0,0 +1,4 @@
+1	0
+
+using asterisk	1	0
+using field name	1	0
diff --git a/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.sql b/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.sql
new file mode 100644
index 00000000000..599275c66e8
--- /dev/null
+++ b/tests/queries/0_stateless/03091_analyzer_same_table_name_in_different_databases.sql
@@ -0,0 +1,31 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61947
+SET allow_experimental_analyzer=1;
+
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE_1:Identifier};
+
+CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
+CREATE DATABASE {CLICKHOUSE_DATABASE_1:Identifier};
+CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.`1-1` (field Int8) ENGINE = Memory;
+CREATE TABLE {CLICKHOUSE_DATABASE_1:Identifier}.`1-1` (field Int8) ENGINE = Memory;
+CREATE TABLE {CLICKHOUSE_DATABASE_1:Identifier}.`2-1` (field Int8) ENGINE = Memory;
+
+INSERT INTO {CLICKHOUSE_DATABASE:Identifier}.`1-1` VALUES (1);
+
+SELECT *
+FROM {CLICKHOUSE_DATABASE:Identifier}.`1-1`
+LEFT JOIN {CLICKHOUSE_DATABASE_1:Identifier}.`1-1` ON {CLICKHOUSE_DATABASE:Identifier}.`1-1`.field = {CLICKHOUSE_DATABASE_1:Identifier}.`1-1`.field;
+
+SELECT '';
+
+SELECT * FROM
+(
+SELECT 'using asterisk', {CLICKHOUSE_DATABASE:Identifier}.`1-1`.*, {CLICKHOUSE_DATABASE_1:Identifier}.`1-1`.*
+FROM {CLICKHOUSE_DATABASE:Identifier}.`1-1`
+LEFT JOIN {CLICKHOUSE_DATABASE_1:Identifier}.`1-1` USING field
+UNION ALL
+SELECT 'using field name', {CLICKHOUSE_DATABASE:Identifier}.`1-1`.field, {CLICKHOUSE_DATABASE_1:Identifier}.`1-1`.field
+FROM {CLICKHOUSE_DATABASE:Identifier}.`1-1`
+LEFT JOIN {CLICKHOUSE_DATABASE_1:Identifier}.`1-1` USING field
+)
+ORDER BY ALL;
diff --git a/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.reference b/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.sql b/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.sql
new file mode 100644
index 00000000000..10d18324c3c
--- /dev/null
+++ b/tests/queries/0_stateless/03092_analyzer_same_table_name_in_different_databases.sql
@@ -0,0 +1,18 @@
+-- https://github.com/ClickHouse/ClickHouse/issues/61947
+SET allow_experimental_analyzer=1;
+
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE:Identifier};
+DROP DATABASE IF EXISTS {CLICKHOUSE_DATABASE_1:Identifier};
+
+CREATE DATABASE {CLICKHOUSE_DATABASE:Identifier};
+CREATE DATABASE {CLICKHOUSE_DATABASE_1:Identifier};
+CREATE TABLE {CLICKHOUSE_DATABASE:Identifier}.`1-1` (field Int8) ENGINE = Memory;
+CREATE TABLE {CLICKHOUSE_DATABASE_1:Identifier}.`2-1` (field Int8) ENGINE = Memory;
+CREATE TABLE {CLICKHOUSE_DATABASE_1:Identifier}.`3-1` (field Int8) ENGINE = Memory;
+
+INSERT INTO {CLICKHOUSE_DATABASE:Identifier}.`1-1` VALUES (1);
+
+SELECT {CLICKHOUSE_DATABASE:Identifier}.`1-1`.*
+FROM {CLICKHOUSE_DATABASE:Identifier}.`1-1`
+LEFT JOIN {CLICKHOUSE_DATABASE_1:Identifier}.`2-1` ON {CLICKHOUSE_DATABASE:Identifier}.`1-1`.field = {CLICKHOUSE_DATABASE_1:Identifier}.`2-1`.field
+LEFT JOIN {CLICKHOUSE_DATABASE_1:Identifier}.`3-1` ON {CLICKHOUSE_DATABASE_1:Identifier}.`2-1`.field = {CLICKHOUSE_DATABASE_1:Identifier}.`3-1`.field;
diff --git a/tests/queries/0_stateless/data_parquet/02960_polygon_bound_bug.parquet b/tests/queries/0_stateless/data_parquet/02960_polygon_bound_bug.parquet
new file mode 100644
index 00000000000..b4aedb8f964
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02960_polygon_bound_bug.parquet differ
diff --git a/tests/queries/0_stateless/data_parquet/02969.zip b/tests/queries/0_stateless/data_parquet/02969.zip
new file mode 100644
index 00000000000..4c4c90261d0
Binary files /dev/null and b/tests/queries/0_stateless/data_parquet/02969.zip differ
diff --git a/tests/queries/0_stateless/replication.lib b/tests/queries/0_stateless/replication.lib
index 143332d9974..2e21f351d2a 100755
--- a/tests/queries/0_stateless/replication.lib
+++ b/tests/queries/0_stateless/replication.lib
@@ -26,12 +26,15 @@ function try_sync_replicas()
         done
     done
 
-    i=0
     for t in "${tables_arr[@]}"
     do
         # 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"
+    done
 
+    i=0
+    for t in "${tables_arr[@]}"
+    do
         $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}]=$!
diff --git a/tests/queries/1_stateful/00037_uniq_state_merge1.sql b/tests/queries/1_stateful/00037_uniq_state_merge1.sql
index c941a14b571..6abaad7297f 100644
--- a/tests/queries/1_stateful/00037_uniq_state_merge1.sql
+++ b/tests/queries/1_stateful/00037_uniq_state_merge1.sql
@@ -1 +1,2 @@
+SET max_bytes_before_external_group_by = '1G';
 SELECT k, any(u) AS u, uniqMerge(us) AS us FROM (SELECT domain(URL) AS k, uniq(UserID) AS u, uniqState(UserID) AS us FROM test.hits GROUP BY k) GROUP BY k ORDER BY u DESC, k ASC LIMIT 100
diff --git a/tests/queries/1_stateful/00038_uniq_state_merge2.sql b/tests/queries/1_stateful/00038_uniq_state_merge2.sql
index 677458daeda..f97395943a1 100644
--- a/tests/queries/1_stateful/00038_uniq_state_merge2.sql
+++ b/tests/queries/1_stateful/00038_uniq_state_merge2.sql
@@ -1 +1,2 @@
+SET max_bytes_before_external_group_by = '1G';
 SELECT topLevelDomain(concat('http://', k)) AS tld, sum(u) AS u, uniqMerge(us) AS us FROM (SELECT domain(URL) AS k, uniq(UserID) AS u, uniqState(UserID) AS us FROM test.hits GROUP BY k) GROUP BY tld ORDER BY u DESC, tld ASC LIMIT 100
diff --git a/tests/queries/1_stateful/00061_storage_buffer.sql b/tests/queries/1_stateful/00061_storage_buffer.sql
index e3cda3de36d..220f4fb3686 100644
--- a/tests/queries/1_stateful/00061_storage_buffer.sql
+++ b/tests/queries/1_stateful/00061_storage_buffer.sql
@@ -1,7 +1,13 @@
 DROP TABLE IF EXISTS test.hits_dst;
 DROP TABLE IF EXISTS test.hits_buffer;
 
-CREATE TABLE test.hits_dst AS test.hits;
+CREATE TABLE test.hits_dst AS test.hits
+ENGINE = MergeTree
+PARTITION BY toYYYYMM(EventDate)
+ORDER BY (CounterID, EventDate, intHash32(UserID))
+SAMPLE BY intHash32(UserID)
+SETTINGS storage_policy = 'default';
+
 CREATE TABLE test.hits_buffer AS test.hits_dst ENGINE = Buffer(test, hits_dst, 8, 600, 600, 1000000, 1000000, 100000000, 1000000000);
 
 INSERT INTO test.hits_buffer SELECT * FROM test.hits WHERE CounterID = 800784;
diff --git a/tests/queries/1_stateful/00082_quantiles.sql b/tests/queries/1_stateful/00082_quantiles.sql
index 3c42b43f3f9..6405a27a050 100644
--- a/tests/queries/1_stateful/00082_quantiles.sql
+++ b/tests/queries/1_stateful/00082_quantiles.sql
@@ -1,3 +1,6 @@
+-- The test uses quite a bit of memory. A low max_bytes_before_external_group_by value will lead to high disk usage
+-- which in CI leads to timeouts
+SET max_bytes_before_external_group_by=0;
 SELECT CounterID AS k, quantileExact(0.5)(ResolutionWidth) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
 SELECT CounterID AS k, quantilesExact(0.1, 0.5, 0.9, 0.99, 0.999)(ResolutionWidth) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
 
diff --git a/tests/queries/1_stateful/00098_primary_key_memory_allocated.reference b/tests/queries/1_stateful/00098_primary_key_memory_allocated.reference
new file mode 100644
index 00000000000..72749c905a3
--- /dev/null
+++ b/tests/queries/1_stateful/00098_primary_key_memory_allocated.reference
@@ -0,0 +1 @@
+1	1	1
diff --git a/tests/queries/1_stateful/00098_primary_key_memory_allocated.sql b/tests/queries/1_stateful/00098_primary_key_memory_allocated.sql
new file mode 100644
index 00000000000..7371678a0f6
--- /dev/null
+++ b/tests/queries/1_stateful/00098_primary_key_memory_allocated.sql
@@ -0,0 +1 @@
+SELECT primary_key_bytes_in_memory < 16000, primary_key_bytes_in_memory_allocated < 16000, primary_key_bytes_in_memory_allocated / primary_key_bytes_in_memory < 1.1 FROM system.parts WHERE database = 'test' AND table = 'hits';
diff --git a/tests/queries/1_stateful/00152_insert_different_granularity.reference b/tests/queries/1_stateful/00152_insert_different_granularity.reference
index c573f1c3072..209e3ef4b62 100644
--- a/tests/queries/1_stateful/00152_insert_different_granularity.reference
+++ b/tests/queries/1_stateful/00152_insert_different_granularity.reference
@@ -1,2 +1 @@
-8873918
-8873998
+20
diff --git a/tests/queries/1_stateful/00152_insert_different_granularity.sql b/tests/queries/1_stateful/00152_insert_different_granularity.sql
index 294d71b384b..b5b3bc18231 100644
--- a/tests/queries/1_stateful/00152_insert_different_granularity.sql
+++ b/tests/queries/1_stateful/00152_insert_different_granularity.sql
@@ -5,54 +5,18 @@ DROP TABLE IF EXISTS fixed_granularity_table;
 
 CREATE TABLE fixed_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, index_granularity_bytes=0, min_bytes_for_wide_part = 0; -- looks like default table before update
 
-ALTER TABLE fixed_granularity_table REPLACE PARTITION 201403 FROM test.hits;
-
 INSERT INTO fixed_granularity_table SELECT * FROM test.hits LIMIT 10; -- should still have non adaptive granularity
-
 INSERT INTO fixed_granularity_table SELECT * FROM test.hits LIMIT 10;
 
 -- We have removed testing of OPTIMIZE because it's too heavy on very slow builds (debug + coverage + thread fuzzer with sleeps)
 -- OPTIMIZE TABLE fixed_granularity_table FINAL; -- and even after optimize
 
 DETACH TABLE fixed_granularity_table;
-
 ATTACH TABLE fixed_granularity_table;
 
 ALTER TABLE fixed_granularity_table DETACH PARTITION 201403;
-
 ALTER TABLE fixed_granularity_table ATTACH PARTITION 201403;
 
 SELECT count() from fixed_granularity_table;
 
 DROP TABLE IF EXISTS fixed_granularity_table;
-
-ALTER TABLE test.hits DETACH PARTITION 201403;
-
-ALTER TABLE test.hits ATTACH PARTITION 201403;
-
-DROP TABLE IF EXISTS hits_copy;
-
-CREATE TABLE hits_copy (`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, min_bytes_for_wide_part = 0;
-
-ALTER TABLE hits_copy REPLACE PARTITION 201403 FROM test.hits;
-
--- It's important to test table, which were created before server update
-INSERT INTO test.hits SELECT * FROM hits_copy LIMIT 100;
-
-ALTER TABLE test.hits DETACH PARTITION 201403;
-
-ALTER TABLE test.hits ATTACH PARTITION 201403;
-
--- OPTIMIZE TABLE test.hits;
-
-SELECT count() FROM test.hits;
-
--- restore hits
-ALTER TABLE test.hits REPLACE PARTITION 201403 FROM hits_copy;
-
-DROP TABLE IF EXISTS hits_copy;
diff --git a/tests/queries/1_stateful/00157_cache_dictionary.sql b/tests/queries/1_stateful/00157_cache_dictionary.sql
index 15bd4cbe6d4..3621ff82126 100644
--- a/tests/queries/1_stateful/00157_cache_dictionary.sql
+++ b/tests/queries/1_stateful/00157_cache_dictionary.sql
@@ -1,7 +1,14 @@
 -- Tags: no-tsan, no-parallel
 
 DROP TABLE IF EXISTS test.hits_1m;
-CREATE TABLE test.hits_1m as test.hits;
+
+CREATE TABLE test.hits_1m AS test.hits
+ENGINE = MergeTree
+PARTITION BY toYYYYMM(EventDate)
+ORDER BY (CounterID, EventDate, intHash32(UserID))
+SAMPLE BY intHash32(UserID)
+SETTINGS storage_policy = 'default';
+
 INSERT INTO test.hits_1m SELECT * FROM test.hits LIMIT 1000000;
 
 CREATE DATABASE IF NOT EXISTS db_dict;
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.reference b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.reference
similarity index 51%
rename from tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.reference
rename to tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.reference
index 787b57ce761..cd425198651 100644
--- a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.reference
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.reference
@@ -14,15 +14,3 @@ JSONCompactEachRowWithNames, false
 e3231b1c8187de4da6752d692b2ddba9  -
 JSONCompactEachRowWithNames, true
 e3231b1c8187de4da6752d692b2ddba9  -
-JSONCompactStringsEachRowWithNames, false
-e3231b1c8187de4da6752d692b2ddba9  -
-JSONCompactStringsEachRowWithNames, true
-e3231b1c8187de4da6752d692b2ddba9  -
-JSONCompactEachRowWithNamesAndTypes, false
-d40c4327c63eded184eee185a5330e12  -
-JSONCompactEachRowWithNamesAndTypes, true
-d40c4327c63eded184eee185a5330e12  -
-JSONCompactStringsEachRowWithNamesAndTypes, false
-d40c4327c63eded184eee185a5330e12  -
-JSONCompactStringsEachRowWithNamesAndTypes, true
-d40c4327c63eded184eee185a5330e12  -
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.sh
similarity index 83%
rename from tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
rename to tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.sh
index 77dd330099a..0cc4636ef5d 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_1.sh
@@ -6,7 +6,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
 . "$CURDIR"/../shell_config.sh
 
 
-FORMATS=('JSONEachRow' 'JSONCompactEachRow' 'JSONCompactStringsEachRow' 'JSONCompactEachRowWithNames' 'JSONCompactStringsEachRowWithNames' 'JSONCompactEachRowWithNamesAndTypes' 'JSONCompactStringsEachRowWithNamesAndTypes')
+FORMATS=('JSONEachRow' 'JSONCompactEachRow' 'JSONCompactStringsEachRow' 'JSONCompactEachRowWithNames')
 
 for format in "${FORMATS[@]}"
 do
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.reference b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.reference
new file mode 100644
index 00000000000..ba7a8ac5fdc
--- /dev/null
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.reference
@@ -0,0 +1,12 @@
+JSONCompactStringsEachRowWithNames, false
+e3231b1c8187de4da6752d692b2ddba9  -
+JSONCompactStringsEachRowWithNames, true
+e3231b1c8187de4da6752d692b2ddba9  -
+JSONCompactEachRowWithNamesAndTypes, false
+d40c4327c63eded184eee185a5330e12  -
+JSONCompactEachRowWithNamesAndTypes, true
+d40c4327c63eded184eee185a5330e12  -
+JSONCompactStringsEachRowWithNamesAndTypes, false
+d40c4327c63eded184eee185a5330e12  -
+JSONCompactStringsEachRowWithNamesAndTypes, true
+d40c4327c63eded184eee185a5330e12  -
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.sh b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.sh
new file mode 100755
index 00000000000..1c49305fe53
--- /dev/null
+++ b/tests/queries/1_stateful/00159_parallel_formatting_json_and_friends_2.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Tags: no-fasttest
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+FORMATS=('JSONCompactStringsEachRowWithNames' 'JSONCompactEachRowWithNamesAndTypes' 'JSONCompactStringsEachRowWithNamesAndTypes')
+
+for format in "${FORMATS[@]}"
+do
+    echo "$format, false";
+    $CLICKHOUSE_CLIENT --max_threads=0 --output_format_parallel_formatting=false -q \
+    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c LIMIT 3000000 Format $format" | md5sum
+
+    echo "$format, true";
+    $CLICKHOUSE_CLIENT --max_threads=0 --output_format_parallel_formatting=true -q \
+    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c LIMIT 3000000 Format $format" | md5sum
+done
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference b/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference
index 91e3af03db8..1131cbb670d 100644
--- a/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference
+++ b/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.reference
@@ -1,12 +1,12 @@
 TSV, false
-194d5061de4cae59489d989373f8effe  -
+2cc7bfde1a2855814c6ea2c8181679c8  -
 TSV, true
-194d5061de4cae59489d989373f8effe  -
+2cc7bfde1a2855814c6ea2c8181679c8  -
 TSVWithNames, false
-a6d327a3611288b3f973d00e6116f16e  -
+c4cb6f9c0d77cd76f2584279993b4438  -
 TSVWithNames, true
-a6d327a3611288b3f973d00e6116f16e  -
+c4cb6f9c0d77cd76f2584279993b4438  -
 TSKV, false
-c2e32a21c08aacf60bda21248ce4f73f  -
+fd9ccbc364c90e1f7682348fe7f11a5a  -
 TSKV, true
-c2e32a21c08aacf60bda21248ce4f73f  -
+fd9ccbc364c90e1f7682348fe7f11a5a  -
diff --git a/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh b/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh
index 02441190b91..393a9fc4282 100755
--- a/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh
+++ b/tests/queries/1_stateful/00159_parallel_formatting_tsv_and_friends.sh
@@ -11,9 +11,9 @@ for format in "${FORMATS[@]}"
 do
     echo "$format, false";
     $CLICKHOUSE_CLIENT --max_threads=0 --output_format_parallel_formatting=false -q \
-    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c Format $format" | md5sum
+    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c LIMIT 3000000 Format $format" | md5sum
 
     echo "$format, true";
     $CLICKHOUSE_CLIENT --max_threads=0 --output_format_parallel_formatting=true -q \
-    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c Format $format" | md5sum
+    "SELECT ClientEventTime::DateTime('Asia/Dubai') as a, MobilePhoneModel as b, ClientIP6 as c FROM test.hits ORDER BY a, b, c LIMIT 3000000 Format $format" | md5sum
 done
diff --git a/tests/queries/1_stateful/00165_jit_aggregate_functions.reference b/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
index fa084170f53..62baba2af8b 100644
--- a/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
+++ b/tests/queries/1_stateful/00165_jit_aggregate_functions.reference
@@ -68,73 +68,3 @@ Simple functions with non compilable function without key
 4611686725751467379	9223371678237104442	3626326766789368100	61384643584599682996279588	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
 Simple functions if combinator without key
 4611687533683519016	9223371678237104442	4124667747700004330	930178817930.5122	321189.2280948817	4434274	9223372036854775806	4611686018427387904	2265422677606390266
-Aggregation without JIT compilation
-Simple functions
-1704509	4611700827100483880	9223360787015464643	10441337359398154812	19954243669348.844	9648741.579254271	523264	9223372036854775807	4611686018427387904	4544239379628300646
-732797	4611701940806302259	9223355550934604746	977192643464016658	2054229034942.3723	51998323.94457991	475698	9223372036854775807	4611686018427387904	4091184823334377716
-598875	4611701407242345792	9223362250391155632	9312163881623734456	27615161624211.875	12261797.824844675	337212	9223372036854775807	4611686018427387904	3725992504798702670
-792887	4611699550286611812	9223290551912005343	6930300520201292824	27479710385933.586	53095331.60360441	252197	9223372036854775807	4611686018427387904	6536441508464694614
-3807842	4611710821592843606	9223326163906184987	16710274896338005145	85240848090850.69	22373416.533275086	196036	9223372036854775807	4611686018427387904	1797862753609257231
-25703952	4611709443519524003	9223353913449113943	9946868158853570839	67568783303242.086	3154349.826950714	147211	9223372036854775807	4611686018427387904	8737124378202300429
-716829	4611852156092872082	9223361623076951140	15381015774917924786	170693446547158.72	201431892.4773785	90109	9223372036854775807	4611686018427387904	8209915323001116338
-59183	4611730685242027332	9223354909338698162	8078812522502896568	94622946187035.42	1425270865.0901496	85379	9223372036854775807	4611686018427387904	8909082036598843562
-33010362	4611704682869732882	9223268545373999677	2064452191838585926	26532987929602.555	3695122.4062526934	77807	9223372036854775807	4611686018427387904	5411365383789552292
-800784	4611752907938305166	9223340418389788041	18082918611792817587	233352070043266.62	36535786.81446395	77492	9223372036854775807	4611686018427387904	2059255810151375435
-20810645	4611712185532639162	9223218900001937412	4996531385439292694	68246505203164.63	6316535.831023813	73213	9223372036854775807	4611686018427387904	8852740550386113674
-25843850	4611690025407720929	9223346023778617822	12755881190906812868	185015319325648.16	9962165.34831339	68945	9223372036854775807	4611686018427387904	7849665866595760148
-23447120	4611796031755620254	9223329309291309758	17231649548755339966	255019232629204.38	7937191.271698021	67570	9223372036854775807	4611686018427387904	3435410911925610424
-14739804	4611692230555590277	9223313509005166531	2458378896777063244	38308020331864.36	14590240.469105456	64174	9223372036854775807	4611686018427387904	511910855240035342
-32077710	4611884228437061959	9223352444952988904	12965822147651192908	214467085941034.7	7257521.096258734	60456	9223372036854775807	4611686018427387904	2256071920672551964
-22446879	4611846229717089436	9223124373140579096	13530160492087688838	231724477077663.4	4737362.521046629	58389	9223372036854775807	4611686018427387904	6236276364886386410
-170282	4611833225706935900	9223371583739401906	8076893424988479310	141657635880324.8	1613795518.1065989	57017	9223372036854775807	4611686018427387904	4755775861151848768
-11482817	4611708000353743073	9223337838355779113	14841435427430843458	283531099960470.8	9938452.835998287	52345	9223372036854775807	4611686018427387904	5371586112642152558
-63469	4611695097019173921	9223353530156141191	6296784708578574520	120762239817777.88	579655378.4603049	52142	9223372036854775807	4611686018427387904	4150567963952988110
-29103473	4611744585914335132	9223333530281362537	5908285283932344933	123712996438970.34	867841.595541967	47758	9223372036854775807	4611686018427387904	3238284030821087319
-Simple functions with non compilable function
-1704509	4611700827100483880	9223360787015464643	10441337359398154812	3620921835565807284859452	19954243669348.844	9648741.579254271	523264	9223372036854775807	4611686018427387904	4544239379628300646
-732797	4611701940806302259	9223355550934604746	977192643464016658	3289442827160604417733394	2054229034942.3723	51998323.94457991	475698	9223372036854775807	4611686018427387904	4091184823334377716
-598875	4611701407242345792	9223362250391155632	9312163881623734456	2330921446573746856380600	27615161624211.875	12261797.824844675	337212	9223372036854775807	4611686018427387904	3725992504798702670
-792887	4611699550286611812	9223290551912005343	6930300520201292824	1745179600137886041476120	27479710385933.586	53095331.60360441	252197	9223372036854775807	4611686018427387904	6536441508464694614
-3807842	4611710821592843606	9223326163906184987	16710274896338005145	1356295121550317411019929	85240848090850.69	22373416.533275086	196036	9223372036854775807	4611686018427387904	1797862753609257231
-25703952	4611709443519524003	9223353913449113943	9946868158853570839	1018731388338768841564439	67568783303242.086	3154349.826950714	147211	9223372036854775807	4611686018427387904	8737124378202300429
-716829	4611852156092872082	9223361623076951140	15381015774917924786	623810478612337115371442	170693446547158.72	201431892.4773785	90109	9223372036854775807	4611686018427387904	8209915323001116338
-59183	4611730685242027332	9223354909338698162	8078812522502896568	589916507545680254024632	94622946187035.42	1425270865.0901496	85379	9223372036854775807	4611686018427387904	8909082036598843562
-33010362	4611704682869732882	9223268545373999677	2064452191838585926	538517864195994778911814	26532987929602.555	3695122.4062526934	77807	9223372036854775807	4611686018427387904	5411365383789552292
-800784	4611752907938305166	9223340418389788041	18082918611792817587	535545510122473785781683	233352070043266.62	36535786.81446395	77492	9223372036854775807	4611686018427387904	2059255810151375435
-20810645	4611712185532639162	9223218900001937412	4996531385439292694	506405014842860050255126	68246505203164.63	6316535.831023813	73213	9223372036854775807	4611686018427387904	8852740550386113674
-25843850	4611690025407720929	9223346023778617822	12755881190906812868	476547495537329753708996	185015319325648.16	9962165.34831339	68945	9223372036854775807	4611686018427387904	7849665866595760148
-23447120	4611796031755620254	9223329309291309758	17231649548755339966	467236365548464278670014	255019232629204.38	7937191.271698021	67570	9223372036854775807	4611686018427387904	3435410911925610424
-14739804	4611692230555590277	9223313509005166531	2458378896777063244	444126268697527941770060	38308020331864.36	14590240.469105456	64174	9223372036854775807	4611686018427387904	511910855240035342
-32077710	4611884228437061959	9223352444952988904	12965822147651192908	417407443977973675608140	214467085941034.7	7257521.096258734	60456	9223372036854775807	4611686018427387904	2256071920672551964
-22446879	4611846229717089436	9223124373140579096	13530160492087688838	403462269796593691082374	231724477077663.4	4737362.521046629	58389	9223372036854775807	4611686018427387904	6236276364886386410
-170282	4611833225706935900	9223371583739401906	8076893424988479310	394417911933408911581006	141657635880324.8	1613795518.1065989	57017	9223372036854775807	4611686018427387904	4755775861151848768
-11482817	4611708000353743073	9223337838355779113	14841435427430843458	361995300393829962204226	283531099960470.8	9938452.835998287	52345	9223372036854775807	4611686018427387904	5371586112642152558
-63469	4611695097019173921	9223353530156141191	6296784708578574520	360843057610541117735096	120762239817777.88	579655378.4603049	52142	9223372036854775807	4611686018427387904	4150567963952988110
-29103473	4611744585914335132	9223333530281362537	5908285283932344933	330534668598011678200421	123712996438970.34	867841.595541967	47758	9223372036854775807	4611686018427387904	3238284030821087319
-Simple functions if combinator
-1704509	4611700827100483880	9223310246721229500	16398241567152875142	62618822667209.71	2224726.7626273884	261874	9223372036854775806	4611686018427387904	4518874482384062894
-732797	4611721382223060002	9223355550934604746	16281585268876620522	68472164943295.68	5898616.931652982	237784	9223372036854775806	4611686018427387904	3641900047478154650
-598875	4611701407242345792	9223362250391155632	3577699408183553052	21300140553347.42	53771550.26565126	167966	9223372036854775806	4611686018427387904	1688477495230210408
-792887	4611699550286611812	9223164887726235740	7088177025760385824	56461952267903.89	92835869.96920013	125539	9223372036854775806	4611686018427387904	4850868151095058072
-3807842	4611710821592843606	9223283397553859544	5756765290752687660	58835559208469.4	39794091.419183925	97845	9223372036854775806	4611686018427387904	6845214684357194564
-25703952	4611784761593342388	9223241341744449690	4782279928971192568	65182094768443.91	9276773.708181158	73368	9223372036854775806	4611686018427387904	1384302533387727316
-716829	4611852156092872082	9223361623076951140	8613712481895484190	191445613359755.62	291083243.75407773	44993	9223372036854775806	4611686018427387904	6344483471397203854
-59183	4611730685242027332	9223354909338698162	18369075291092794110	429013599530392	5925109959.715378	42817	9223372036854775806	4611686018427387904	5909305558020042898
-33010362	4611704682869732882	9223092117352620518	9991152681891671022	257099731913529.5	12412830.045471078	38861	9223372036854775806	4611686018427387904	4672855013852508626
-800784	4611752907938305166	9223309994342931384	5251877538869750510	135472890315726.03	53535427.52018088	38767	9223372036854775806	4611686018427387904	7801864489649220514
-20810645	4611712185532639162	9223218900001937412	11803718472901310700	323593455407553	10496765.20741332	36477	9223372036854775806	4611686018427387904	5941995311893397960
-25843850	4611744529689964352	9223346023778617822	127137885677350808	3700925266420.715	18966925.191309396	34353	9223372036854775806	4611686018427387904	6700111718676827412
-23447120	4611796031755620254	9223329309291309758	1841522159325376278	54534534450526.42	6271211.193812284	33768	9223372036854775806	4611686018427387904	2325654077031843898
-14739804	4611762063154116632	9223007205463222212	16302703534054321116	506987919332451.8	6885575.861759452	32156	9223372036854775806	4611686018427387904	2114922310535979832
-32077710	4612033458080771112	9223352444952988904	421072759851674408	13955745719596.793	12220152.393889504	30172	9223372036854775806	4611686018427387904	4399934528735249092
-22446879	4611846229717089436	9223124373140579096	6577134317587565298	224866980668999.47	2482202.163802278	29249	9223372036854775806	4611686018427387904	8763910740678180498
-170282	4611833225706935900	9223371583739401906	15764226366913732386	551447384017691	2515144222.953728	28587	9223372036854775806	4611686018427387904	8217388408377809010
-11482817	4611990575414646848	9223302669582414438	9828522700609834800	378121905921203.2	34845264.2080656	25993	9223372036854775806	4611686018427387904	4689180182672571856
-63469	4612175339998036670	9222961628400798084	17239621485933250238	663164390134376.5	7825349797.6059	25996	9223372036854775806	4611686018427387904	2067736879306995526
-29103473	4611744585914335132	9223035551850347954	12590190375872647672	525927999326314.7	26049107.15514301	23939	9223372036854775806	4611686018427387904	8318055464870862444
-Simple functions without key
-4611686725751467379	9223371678237104442	3626326766789368100	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
-Simple functions with non compilable function without key
-4611686725751467379	9223371678237104442	3626326766789368100	61384643584599682996279588	408650940859.2896	104735.01095549858	8873898	9223372036854775807	4611686018427387904	3818489297630359920
-Simple functions if combinator without key
-4611687533683519016	9223371678237104442	4124667747700004330	930178817930.5122	321189.2280948817	4434274	9223372036854775806	4611686018427387904	2265422677606390266
diff --git a/tests/queries/1_stateful/00165_jit_aggregate_functions.sql b/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
index 157d5892ad8..03d29601804 100644
--- a/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
+++ b/tests/queries/1_stateful/00165_jit_aggregate_functions.sql
@@ -1,6 +1,7 @@
-SET compile_aggregate_expressions = 1;
 SET min_count_to_compile_aggregate_expression = 0;
-SET max_bytes_before_external_group_by='200M'; -- might be randomized to 1 leading to timeout
+-- The test uses many aggregations. A low max_bytes_before_external_group_by value will lead to high disk usage
+-- which in CI leads to timeouts
+SET max_bytes_before_external_group_by=0;
 
 SELECT 'Aggregation using JIT compilation';
 
@@ -101,104 +102,3 @@ SELECT
 FROM test.hits
 ORDER BY min_watch_id
 DESC LIMIT 20;
-
-SET compile_aggregate_expressions = 0;
-
-SELECT 'Aggregation without JIT compilation';
-
-SELECT 'Simple functions';
-
-SELECT
-    CounterID,
-    min(WatchID),
-    max(WatchID),
-    sum(WatchID),
-    avg(WatchID),
-    avgWeighted(WatchID, CounterID),
-    count(WatchID),
-    groupBitOr(WatchID),
-    groupBitAnd(WatchID),
-    groupBitXor(WatchID)
-FROM test.hits
-GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
-
-SELECT 'Simple functions with non compilable function';
-SELECT
-    CounterID,
-    min(WatchID),
-    max(WatchID),
-    sum(WatchID),
-    sum(toUInt128(WatchID)),
-    avg(WatchID),
-    avgWeighted(WatchID, CounterID),
-    count(WatchID),
-    groupBitOr(WatchID),
-    groupBitAnd(WatchID),
-    groupBitXor(WatchID)
-FROM test.hits
-GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
-
-SELECT 'Simple functions if combinator';
-
-WITH (WatchID % 2 == 0) AS predicate
-SELECT
-    CounterID,
-    minIf(WatchID,predicate),
-    maxIf(WatchID, predicate),
-    sumIf(WatchID, predicate),
-    avgIf(WatchID, predicate),
-    avgWeightedIf(WatchID, CounterID, predicate),
-    countIf(WatchID, predicate),
-    groupBitOrIf(WatchID, predicate),
-    groupBitAndIf(WatchID, predicate),
-    groupBitXorIf(WatchID, predicate)
-FROM test.hits
-GROUP BY CounterID ORDER BY count() DESC LIMIT 20;
-
-SELECT 'Simple functions without key';
-
-SELECT
-    min(WatchID) AS min_watch_id,
-    max(WatchID),
-    sum(WatchID),
-    avg(WatchID),
-    avgWeighted(WatchID, CounterID),
-    count(WatchID),
-    groupBitOr(WatchID),
-    groupBitAnd(WatchID),
-    groupBitXor(WatchID)
-FROM test.hits
-ORDER BY min_watch_id DESC LIMIT 20;
-
-SELECT 'Simple functions with non compilable function without key';
-
-SELECT
-    min(WatchID) AS min_watch_id,
-    max(WatchID),
-    sum(WatchID),
-    sum(toUInt128(WatchID)),
-    avg(WatchID),
-    avgWeighted(WatchID, CounterID),
-    count(WatchID),
-    groupBitOr(WatchID),
-    groupBitAnd(WatchID),
-    groupBitXor(WatchID)
-FROM test.hits
-ORDER BY min_watch_id DESC LIMIT 20;
-
-SELECT 'Simple functions if combinator without key';
-
-WITH (WatchID % 2 == 0) AS predicate
-SELECT
-    minIf(WatchID, predicate) as min_watch_id,
-    maxIf(WatchID, predicate),
-    sumIf(WatchID, predicate),
-    avgIf(WatchID, predicate),
-    avgWeightedIf(WatchID, CounterID, predicate),
-    countIf(WatchID, predicate),
-    groupBitOrIf(WatchID, predicate),
-    groupBitAndIf(WatchID, predicate),
-    groupBitXorIf(WatchID, predicate)
-FROM test.hits
-ORDER BY min_watch_id
-DESC LIMIT 20;
diff --git a/tests/queries/1_stateful/00172_early_constant_folding.reference b/tests/queries/1_stateful/00172_early_constant_folding.reference
index 6b72183c066..50a175942ee 100644
--- a/tests/queries/1_stateful/00172_early_constant_folding.reference
+++ b/tests/queries/1_stateful/00172_early_constant_folding.reference
@@ -7,3 +7,12 @@ ExpressionTransform × 10
       ExpressionTransform
         (ReadFromPreparedSource)
         SourceFromSingleChunk 0 → 1
+(Expression)
+ExpressionTransform × 10
+  (MergingAggregated)
+  Resize 1 → 10
+    MergingAggregatedTransform
+      (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 19f99f107ac..b4b58ba3cb0 100644
--- a/tests/queries/1_stateful/00172_early_constant_folding.sql
+++ b/tests/queries/1_stateful/00172_early_constant_folding.sql
@@ -2,4 +2,5 @@
 
 set max_threads=10;
 set optimize_use_implicit_projections=1;
-EXPLAIN PIPELINE SELECT count(JavaEnable) FROM test.hits WHERE WatchID = 1 OR Title = 'next' OR URL = 'prev' OR URL = '???' OR 1;
+EXPLAIN PIPELINE SELECT count(JavaEnable) FROM test.hits WHERE WatchID = 1 OR Title = 'next' OR URL = 'prev' OR URL = '???' OR 1 SETTINGS allow_experimental_analyzer = 0;
+EXPLAIN PIPELINE SELECT count(JavaEnable) FROM test.hits WHERE WatchID = 1 OR Title = 'next' OR URL = 'prev' OR URL = '???' OR 1 SETTINGS allow_experimental_analyzer = 1;
diff --git a/tests/queries/1_stateful/00178_quantile_ddsketch.reference b/tests/queries/1_stateful/00178_quantile_ddsketch.reference
new file mode 100644
index 00000000000..867a2830aa1
--- /dev/null
+++ b/tests/queries/1_stateful/00178_quantile_ddsketch.reference
@@ -0,0 +1,40 @@
+1704509	1380.49
+732797	1326.35
+598875	1380.49
+792887	1326.35
+3807842	1326.35
+25703952	1326.35
+716829	1380.49
+59183	1326.35
+33010362	1326.35
+800784	1326.35
+1704509	[1300.09,1380.49,1863.48,1978.72,3678.37]
+732797	[1224.38,1326.35,1863.48,1939.53,3678.37]
+598875	[1224.38,1380.49,1863.48,1939.53,3534.13]
+792887	[1300.09,1326.35,1863.48,1901.13,3678.37]
+3807842	[1224.38,1326.35,1863.48,1939.53,2018.69]
+25703952	[1002.43,1326.35,1863.48,1939.53,3678.37]
+716829	[1224.38,1380.49,1863.48,1939.53,3678.37]
+59183	[314.24,1326.35,1863.48,2018.69,2018.69]
+33010362	[1224.38,1326.35,1863.48,1939.53,2018.69]
+800784	[1224.38,1326.35,1863.48,1939.53,2018.69]
+1704509	1380.49
+732797	1326.35
+598875	1380.49
+792887	1326.35
+3807842	1326.35
+25703952	1326.35
+716829	1380.49
+59183	1326.35
+33010362	1326.35
+800784	1326.35
+1704509	[1300.09,1380.49,1863.48,1978.72,3678.37]
+732797	[1224.38,1326.35,1863.48,1939.53,3678.37]
+598875	[1224.38,1380.49,1863.48,1939.53,3534.13]
+792887	[1300.09,1326.35,1863.48,1901.13,3678.37]
+3807842	[1224.38,1326.35,1863.48,1939.53,2018.69]
+25703952	[1002.43,1326.35,1863.48,1939.53,3678.37]
+716829	[1224.38,1380.49,1863.48,1939.53,3678.37]
+59183	[314.24,1326.35,1863.48,2018.69,2018.69]
+33010362	[1224.38,1326.35,1863.48,1939.53,2018.69]
+800784	[1224.38,1326.35,1863.48,1939.53,2018.69]
diff --git a/tests/queries/1_stateful/00178_quantile_ddsketch.sql b/tests/queries/1_stateful/00178_quantile_ddsketch.sql
new file mode 100644
index 00000000000..c1ef4b9f4f2
--- /dev/null
+++ b/tests/queries/1_stateful/00178_quantile_ddsketch.sql
@@ -0,0 +1,5 @@
+SELECT CounterID AS k, round(quantileDD(0.01, 0.5)(ResolutionWidth), 2) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+SELECT CounterID AS k, arrayMap(a -> round(a, 2), quantilesDD(0.01, 0.1, 0.5, 0.9, 0.99, 0.999)(ResolutionWidth)) FROM test.hits GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+
+SELECT CounterID AS k, round(quantileDD(0.01, 0.5)(ResolutionWidth), 2) FROM remote('127.0.0.{1,2}', test.hits) GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
+SELECT CounterID AS k, arrayMap(a -> round(a, 2), quantilesDD(0.01, 0.1, 0.5, 0.9, 0.99, 0.999)(ResolutionWidth)) FROM remote('127.0.0.{1,2}', test.hits) GROUP BY k ORDER BY count() DESC, CounterID LIMIT 10;
diff --git a/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.reference b/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.reference
new file mode 100644
index 00000000000..d05b1f927f4
--- /dev/null
+++ b/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.reference
@@ -0,0 +1 @@
+0	0
diff --git a/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.sh b/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.sh
new file mode 100755
index 00000000000..2e1b807c496
--- /dev/null
+++ b/tests/queries/1_stateful/00180_no_seek_avoiding_when_reading_from_cache.sh
@@ -0,0 +1,36 @@
+#!/usr/bin/env bash
+
+# Tags: no-parallel, no-random-settings, long
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+# shellcheck source=../shell_config.sh
+. "$CURDIR"/../shell_config.sh
+
+
+# Test assumes that the whole table is residing in the cache, but `hits_s3` has only 128Mi of cache.
+# So we need to create a smaller table.
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS hits_s3_sampled"
+$CLICKHOUSE_CLIENT -q "CREATE TABLE hits_s3_sampled AS test.hits_s3"
+$CLICKHOUSE_CLIENT -q "INSERT INTO hits_s3_sampled SELECT * FROM test.hits_s3 SAMPLE 0.01"
+$CLICKHOUSE_CLIENT -q "OPTIMIZE TABLE hits_s3_sampled FINAL"
+
+$CLICKHOUSE_CLIENT -q "SYSTEM DROP FILESYSTEM CACHE"
+
+# Warm up the cache
+$CLICKHOUSE_CLIENT -q "SELECT * FROM hits_s3_sampled WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10 FORMAT Null"
+$CLICKHOUSE_CLIENT -q "SELECT * FROM hits_s3_sampled WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10 FORMAT Null"
+
+query_id=02906_read_from_cache_$RANDOM
+$CLICKHOUSE_CLIENT --query_id ${query_id} -q "SELECT * FROM hits_s3_sampled WHERE URL LIKE '%google%' ORDER BY EventTime LIMIT 10 FORMAT Null"
+
+$CLICKHOUSE_CLIENT -nq "
+  SYSTEM FLUSH LOGS;
+
+  -- AsynchronousReaderIgnoredBytes = 0: no seek-avoiding happened
+  -- CachedReadBufferReadFromSourceBytes = 0: sanity check to ensure we read only from cache
+  SELECT ProfileEvents['AsynchronousReaderIgnoredBytes'], ProfileEvents['CachedReadBufferReadFromSourceBytes']
+  FROM system.query_log
+  WHERE query_id = '$query_id' AND type = 'QueryFinish' AND event_date >= yesterday() AND current_database = currentDatabase()
+"
+
+$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS hits_s3_sampled"
diff --git a/tests/queries/shell_config.sh b/tests/queries/shell_config.sh
index c687a63623f..614bfcece8f 100644
--- a/tests/queries/shell_config.sh
+++ b/tests/queries/shell_config.sh
@@ -4,6 +4,10 @@
 # Don't check for ODR violation, since we may test shared build with ASAN
 export ASAN_OPTIONS=detect_odr_violation=0
 
+# If ClickHouse was built with coverage - dump the coverage information at exit
+# (in other cases this environment variable has no effect)
+export CLICKHOUSE_WRITE_COVERAGE="coverage"
+
 export CLICKHOUSE_DATABASE=${CLICKHOUSE_DATABASE:="test"}
 export CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL=${CLICKHOUSE_CLIENT_SERVER_LOGS_LEVEL:="warning"}
 
diff --git a/tests/sqllogic/connection.py b/tests/sqllogic/connection.py
index 2d5e1f8a9e9..169e0f0f440 100644
--- a/tests/sqllogic/connection.py
+++ b/tests/sqllogic/connection.py
@@ -1,18 +1,15 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import datetime
-import logging
-import pyodbc
-import sqlite3
-import traceback
 import enum
+import logging
 import random
+import sqlite3
 import string
 from contextlib import contextmanager
 
+import pyodbc  # pylint:disable=import-error; for style check
 from exceptions import ProgramError
 
-
 logger = logging.getLogger("connection")
 logger.setLevel(logging.DEBUG)
 
@@ -22,9 +19,7 @@ class OdbcConnectingArgs:
         self._kwargs = kwargs
 
     def __str__(self):
-        conn_str = ";".join(
-            ["{}={}".format(x, y) for x, y in self._kwargs.items() if y]
-        )
+        conn_str = ";".join([f"{x}={y}" for x, y in self._kwargs.items() if y])
         return conn_str
 
     def update_database(self, database):
@@ -49,6 +44,7 @@ class OdbcConnectingArgs:
         for kv in conn_str.split(";"):
             if kv:
                 k, v = kv.split("=", 1)
+                # pylint:disable-next=protected-access
                 args._kwargs[k] = v
         return args
 
@@ -63,7 +59,10 @@ def default_clickhouse_odbc_conn_str():
         OdbcConnectingArgs.create_from_kw(
             dsn="ClickHouse DSN (ANSI)",
             Timeout="300",
-            Url="http://localhost:8123/query?default_format=ODBCDriver2&default_table_engine=MergeTree&union_default_mode=DISTINCT&group_by_use_nulls=1&join_use_nulls=1&allow_create_index_without_type=1&create_index_ignore_unique=1",
+            Url="http://localhost:8123/query?default_format=ODBCDriver2&"
+            "default_table_engine=MergeTree&union_default_mode=DISTINCT&"
+            "group_by_use_nulls=1&join_use_nulls=1&allow_create_index_without_type=1&"
+            "create_index_ignore_unique=1",
         )
     )
 
@@ -82,7 +81,7 @@ class KnownDBMS(str, enum.Enum):
     clickhouse = "ClickHouse"
 
 
-class ConnectionWrap(object):
+class ConnectionWrap:
     def __init__(self, connection=None, factory=None, factory_kwargs=None):
         self._factory = factory
         self._factory_kwargs = factory_kwargs
@@ -126,7 +125,7 @@ class ConnectionWrap(object):
                 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'"
+            list_query = "SELECT name FROM sqlite_master WHERE type='table'"
         else:
             logger.warning(
                 "unable to drop all tables for unknown database: %s", self.DBMS_NAME
@@ -154,7 +153,7 @@ class ConnectionWrap(object):
             self._use_database(database)
             logger.info(
                 "currentDatabase : %s",
-                execute_request(f"SELECT currentDatabase()", self).get_result(),
+                execute_request("SELECT currentDatabase()", self).get_result(),
             )
 
     @contextmanager
@@ -174,7 +173,7 @@ class ConnectionWrap(object):
 
     def __exit__(self, *args):
         if hasattr(self._connection, "close"):
-            return self._connection.close()
+            self._connection.close()
 
 
 def setup_connection(engine, conn_str=None, make_debug_request=True):
@@ -263,7 +262,7 @@ class ExecResult:
     def assert_no_exception(self):
         if self.has_exception():
             raise ProgramError(
-                f"request doesn't have a result set, it has the exception",
+                "request doesn't have a result set, it has the exception",
                 parent=self._exception,
             )
 
diff --git a/tests/sqllogic/exceptions.py b/tests/sqllogic/exceptions.py
index 30c8983d80f..2e4da3fd78b 100644
--- a/tests/sqllogic/exceptions.py
+++ b/tests/sqllogic/exceptions.py
@@ -1,8 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
-from enum import Enum
-
 
 class Error(Exception):
     def __init__(
@@ -45,16 +43,8 @@ class Error(Exception):
 
     @property
     def reason(self):
-        return ", ".join(
-            (
-                str(x)
-                for x in [
-                    super().__str__(),
-                    "details: {}".format(self._details) if self._details else "",
-                ]
-                if x
-            )
-        )
+        details = f"details: {self._details}" if self._details else ""
+        return ", ".join((str(x) for x in [super().__str__(), details] if x))
 
     def set_details(self, file=None, name=None, pos=None, request=None, details=None):
         if file is not None:
@@ -88,16 +78,8 @@ class ErrorWithParent(Error):
 
     @property
     def reason(self):
-        return ", ".join(
-            (
-                str(x)
-                for x in [
-                    super().reason,
-                    "exception: {}".format(str(self._parent)) if self._parent else "",
-                ]
-                if x
-            )
-        )
+        exception = f"exception: {self._parent}" if self._parent else ""
+        return ", ".join((str(x) for x in [super().reason, exception] if x))
 
 
 class ProgramError(ErrorWithParent):
diff --git a/tests/sqllogic/runner.py b/tests/sqllogic/runner.py
index 5f4baf8e59b..2e8e098a099 100755
--- a/tests/sqllogic/runner.py
+++ b/tests/sqllogic/runner.py
@@ -2,20 +2,25 @@
 # -*- coding: utf-8 -*-
 
 import argparse
-import enum
-import os
-import logging
 import csv
+import enum
 import json
+import logging
 import multiprocessing
+import os
 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
+# isort: off
+from deepdiff import DeepDiff  # pylint:disable=import-error; for style check
 
+# isort: on
 
-LEVEL_NAMES = [x.lower() for x in logging._nameToLevel.keys() if x != logging.NOTSET]
+from connection import Engines, default_clickhouse_odbc_conn_str, setup_connection
+from test_runner import RequestType, Status, TestRunner
+
+LEVEL_NAMES = [  # pylint:disable-next=protected-access
+    l.lower() for l, n in logging._nameToLevel.items() if n != logging.NOTSET
+]
 
 
 def setup_logger(args):
@@ -41,7 +46,7 @@ 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:
+    with open(check_status_path, "a", encoding="utf-8") as stream:
         writer = csv.writer(stream, delimiter="\t", lineterminator="\n")
         writer.writerow(status_row)
 
@@ -60,7 +65,7 @@ def __write_test_result(
 ):
     all_stages = reports.keys()
     test_results_path = os.path.join(out_dir, "test_results.tsv")
-    with open(test_results_path, "a") as stream:
+    with open(test_results_path, "a", encoding="utf-8") as stream:
         writer = csv.writer(stream, delimiter="\t", lineterminator="\n")
         for stage in all_stages:
             report = reports[stage]
@@ -182,7 +187,7 @@ def mode_check_statements(parser):
                 input_dir, f"check statements:: not a dir {input_dir}"
             )
 
-        reports = dict()
+        reports = {}
 
         out_stages_dir = os.path.join(out_dir, f"{args.mode}-stages")
 
@@ -242,7 +247,7 @@ def mode_check_complete(parser):
                 input_dir, f"check statements:: not a dir {input_dir}"
             )
 
-        reports = dict()
+        reports = {}
 
         out_stages_dir = os.path.join(out_dir, f"{args.mode}-stages")
 
@@ -286,9 +291,9 @@ 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 write_actual_report(actual, out_dir):
+    with open(os.path.join(out_dir, "actual_report.json"), "w", encoding="utf-8") as f:
+        f.write(json.dumps(actual))
 
 
 def read_canonic_report(input_dir):
@@ -296,13 +301,15 @@ def read_canonic_report(input_dir):
     if not os.path.exists(file):
         return {}
 
-    with open(os.path.join(input_dir, "canonic_report.json"), "r") as f:
+    with open(
+        os.path.join(input_dir, "canonic_report.json"), "r", encoding="utf-8"
+    ) 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:
+    with open(os.path.join(out_dir, "canonic_report.json"), "w", encoding="utf-8") as f:
         f.write(json.dumps(canonic))
 
 
@@ -370,7 +377,7 @@ def mode_self_test(parser):
         if not os.path.isdir(out_dir):
             raise NotADirectoryError(out_dir, f"self test: not a dir {out_dir}")
 
-        reports = dict()
+        reports = {}
 
         out_stages_dir = os.path.join(out_dir, f"{args.mode}-stages")
 
diff --git a/tests/sqllogic/test_parser.py b/tests/sqllogic/test_parser.py
index cb1144d7dd9..648fa9f6bf6 100755
--- a/tests/sqllogic/test_parser.py
+++ b/tests/sqllogic/test_parser.py
@@ -2,24 +2,27 @@
 # -*- coding: utf-8 -*-
 
 import logging
-import os
-
-from itertools import chain
 from enum import Enum
-from hashlib import md5
 from functools import reduce
+from hashlib import md5
+from itertools import chain
+
+# isort: off
+# pylint:disable=import-error; for style check
 import sqlglot
-from sqlglot.expressions import PrimaryKeyColumnConstraint, ColumnDef
+from sqlglot.expressions import ColumnDef, PrimaryKeyColumnConstraint
+
+# pylint:enable=import-error; for style check
+# isort: on
 
 from exceptions import (
-    Error,
-    ProgramError,
-    ErrorWithParent,
     DataResultDiffer,
+    Error,
+    ErrorWithParent,
+    ProgramError,
     QueryExecutionError,
 )
 
-
 logger = logging.getLogger("parser")
 logger.setLevel(logging.DEBUG)
 
@@ -248,6 +251,7 @@ class FileBlockBase:
             )
             block.with_result(result)
             return block
+        raise ValueError(f"Unknown block_type {block_type}")
 
     def dump_to(self, output):
         if output is None:
@@ -258,9 +262,6 @@ class FileBlockBase:
 
 
 class FileBlockComments(FileBlockBase):
-    def __init__(self, parser, start, end):
-        super().__init__(parser, start, end)
-
     def get_block_type(self):
         return BlockType.comments
 
@@ -469,20 +470,18 @@ class QueryResult:
             (
                 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)
+                    f"rows: {self.rows}" if self.rows else "",
+                    f"values_count: {self.values_count}" if self.values_count else "",
+                    f"data_hash: {self.data_hash}" if self.data_hash else "",
+                    f"exception: {self.exception}" if self.exception else "",
+                    f"hash_threshold: {self.hash_threshold}"
                     if self.hash_threshold
                     else "",
                 ]
                 if x
             )
         )
-        return "QueryResult({})".format(params)
+        return f"QueryResult({params})"
 
     def __iter__(self):
         if self.rows is not None:
@@ -491,12 +490,10 @@ class QueryResult:
             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)]]
-            )
+            return iter([[f"{self.values_count} values hashing to {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__()))
+            return iter([[f"exception: {self.exception}"]])
+        raise ProgramError("Query result is empty", details=str(self))
 
     @staticmethod
     def __value_count(rows):
@@ -528,7 +525,7 @@ class QueryResult:
         for row in rows:
             res_row = []
             for c, t in zip(row, types):
-                logger.debug(f"Builging row. c:{c} t:{t}")
+                logger.debug("Builging row. c:%s t:%s", c, t)
                 if c is None:
                     res_row.append("NULL")
                     continue
@@ -541,7 +538,7 @@ class QueryResult:
                 elif t == "I":
                     try:
                         res_row.append(str(int(c)))
-                    except ValueError as ex:
+                    except ValueError:
                         # raise QueryExecutionError(
                         #     f"Got non-integer result '{c}' for I type."
                         # )
@@ -549,7 +546,7 @@ class QueryResult:
                     except OverflowError as ex:
                         raise QueryExecutionError(
                             f"Got overflowed result '{c}' for I type."
-                        )
+                        ) from ex
 
                 elif t == "R":
                     res_row.append(f"{c:.3f}")
@@ -567,6 +564,7 @@ class QueryResult:
             values = list(chain(*rows))
             values.sort()
             return [values] if values else []
+        return []
 
     @staticmethod
     def __calculate_hash(rows):
@@ -595,9 +593,9 @@ class QueryResult:
         # do not print details to the test file
         # but print original exception
         if isinstance(e, ErrorWithParent):
-            message = "{}, original is: {}".format(e, e.get_parent())
+            message = f"{e}, original is: {e.get_parent()}"
         else:
-            message = "{}".format(e)
+            message = str(e)
 
         return QueryResult(exception=message)
 
@@ -616,9 +614,8 @@ class QueryResult:
                         "canonic and actual results have different exceptions",
                         details=f"canonic: {canonic.exception}, actual: {actual.exception}",
                     )
-                else:
-                    # exceptions are the same
-                    return
+                # exceptions are the same
+                return
             elif canonic.exception is not None:
                 raise DataResultDiffer(
                     "canonic result has exception and actual result doesn't",
@@ -639,9 +636,8 @@ class QueryResult:
             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
-                    ),
+                    details=f"canonic values count {canonic.values_count}, "
+                    f"actual {actual.values_count}",
                 )
             if canonic.data_hash != actual.data_hash:
                 raise DataResultDiffer(
@@ -653,9 +649,8 @@ class QueryResult:
             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
-                    ),
+                    details=f"canonic values count {canonic.values_count}, "
+                    f"actual {actual.values_count}",
                 )
             if canonic.rows != actual.rows:
                 raise DataResultDiffer(
@@ -665,5 +660,5 @@ class QueryResult:
 
         raise ProgramError(
             "Unable to compare results",
-            details="actual {}, canonic {}".format(actual, canonic),
+            details=f"actual {actual}, canonic {canonic}",
         )
diff --git a/tests/sqllogic/test_runner.py b/tests/sqllogic/test_runner.py
index baec0dc7924..8f2242a45b9 100644
--- a/tests/sqllogic/test_runner.py
+++ b/tests/sqllogic/test_runner.py
@@ -1,25 +1,23 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import enum
-import logging
-import os
-import traceback
 import io
 import json
+import logging
+import os
 
 import test_parser
+from connection import execute_request
 from exceptions import (
+    DataResultDiffer,
     Error,
     ProgramError,
-    DataResultDiffer,
-    StatementExecutionError,
-    StatementSuccess,
     QueryExecutionError,
     QuerySuccess,
     SchemeResultDiffer,
+    StatementExecutionError,
+    StatementSuccess,
 )
-from connection import execute_request
-
 
 logger = logging.getLogger("parser")
 logger.setLevel(logging.DEBUG)
@@ -55,6 +53,7 @@ class Status(str, enum.Enum):
 
 class TestStatus:
     def __init__(self):
+        self.name = None
         self.status = None
         self.file = None
         self.position = None
@@ -155,7 +154,7 @@ class SimpleStats:
             self.success += 1
 
     def get_map(self):
-        result = dict()
+        result = {}
         result["success"] = self.success
         result["fail"] = self.fail
         return result
@@ -187,7 +186,7 @@ class Stats:
         choose.update(status)
 
     def get_map(self):
-        result = dict()
+        result = {}
         result["statements"] = self.statements.get_map()
         result["queries"] = self.queries.get_map()
         result["total"] = self.total.get_map()
@@ -205,7 +204,7 @@ class OneReport:
         self.test_name = test_name
         self.test_file = test_file
         self.stats = Stats()
-        self.requests = dict()  # type: dict(int, TestStatus)
+        self.requests = {}
 
     def update(self, status):
         if not isinstance(status, TestStatus):
@@ -218,11 +217,11 @@ class OneReport:
         return str(self.get_map())
 
     def get_map(self):
-        result = dict()
+        result = {}
         result["test_name"] = self.test_name
         result["test_file"] = self.test_file
         result["stats"] = self.stats.get_map()
-        result["requests"] = dict()
+        result["requests"] = {}
         requests = result["requests"]
         for pos, status in self.requests.items():
             requests[pos] = status.get_map()
@@ -233,7 +232,7 @@ 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.tests = {}
         self.input_dir = input_dir
         self.output_dir = None
 
@@ -256,7 +255,7 @@ class Report:
         self.output_dir = res_dir
 
     def get_map(self):
-        result = dict()
+        result = {}
         result["dbms_name"] = self.dbms_name
         result["stats"] = self.stats.get_map()
         result["input_dir"] = self.input_dir
@@ -264,7 +263,7 @@ class Report:
             result["input_dir"] = self.input_dir
         if self.output_dir is not None:
             result["output_dir"] = self.output_dir
-        result["tests"] = dict()
+        result["tests"] = {}
         tests = result["tests"]
         for test_name, one_report in self.tests.items():
             tests.update({test_name: one_report.get_map()})
@@ -297,8 +296,8 @@ class Report:
 
     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:
+        logger.info("create file %s", report_path)
+        with open(report_path, "w", encoding="utf-8") as stream:
             stream.write(json.dumps(self.get_map(), indent=4))
 
 
@@ -434,38 +433,34 @@ class TestRunner:
                                     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),
+                            clogger.debug("errors matched")
+                            raise QuerySuccess()
+                        clogger.debug("missed error")
+                        raise QueryExecutionError(
+                            "query is expected to fail with error",
+                            details=f"expected error: {expected_error}",
+                        )
+                    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
                             )
-                    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(),
-                                )
+                            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()
+                        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)
@@ -476,9 +471,8 @@ class TestRunner:
                         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
-                                ),
+                                details=f"expected columns {canonic_columns_count}, "
+                                f"actual columns {actual_columns_count}",
                             )
 
                     actual = test_parser.QueryResult.make_it(
@@ -528,7 +522,7 @@ class TestRunner:
             self.report = Report(self.dbms_name, self._input_dir)
 
         if self.results is None:
-            self.results = dict()
+            self.results = {}
 
         if self.dbms_name == "ClickHouse" and test_name in [
             "test/select5.test",
@@ -536,7 +530,7 @@ class TestRunner:
             "test/evidence/slt_lang_replace.test",
             "test/evidence/slt_lang_droptrigger.test",
         ]:
-            logger.info(f"Let's skip test %s for ClickHouse", test_name)
+            logger.info("Let's skip test %s for ClickHouse", test_name)
             return
 
         with self.connection.with_one_test_scope():
@@ -565,7 +559,7 @@ class TestRunner:
 
         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:
+        with open(test_file, "r", encoding="utf-8") as stream:
             self.run_one_test(stream, test_name, test_file)
 
     def run_all_tests_from_dir(self, input_dir):
@@ -582,10 +576,10 @@ class TestRunner:
 
         for test_name, stream in self.results.items():
             test_file = os.path.join(dir_path, test_name)
-            logger.info(f"create file {test_file}")
+            logger.info("create file %s", test_file)
             result_dir = os.path.dirname(test_file)
             os.makedirs(result_dir, exist_ok=True)
-            with open(test_file, "w") as output:
+            with open(test_file, "w", encoding="utf-8") as output:
                 output.write(stream.getvalue())
 
     def write_report(self, report_dir):
diff --git a/tests/tsan_ignorelist.txt b/tests/tsan_ignorelist.txt
new file mode 100644
index 00000000000..b565cc91411
--- /dev/null
+++ b/tests/tsan_ignorelist.txt
@@ -0,0 +1,10 @@
+# Note, this file is ignorelist file [1] not suppressions [2].
+#
+#  [1]: https://clang.llvm.org/docs/SanitizerSpecialCaseList.html
+#  [2]: https://github.com/google/sanitizers/wiki/ThreadSanitizerSuppressions
+#
+
+# https://github.com/ClickHouse/ClickHouse/issues/55629
+fun:rd_kafka_broker_set_nodename
+# https://github.com/ClickHouse/ClickHouse/issues/60443
+fun:rd_kafka_stats_emit_all
diff --git a/tests/tsan_suppressions.txt b/tests/tsan_suppressions.txt
deleted file mode 100644
index 67c7eae08f3..00000000000
--- a/tests/tsan_suppressions.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://github.com/ClickHouse/ClickHouse/issues/55629
-race:rd_kafka_broker_set_nodename
diff --git a/tests/ubsan_suppressions.txt b/tests/ubsan_ignorelist.txt
similarity index 50%
rename from tests/ubsan_suppressions.txt
rename to tests/ubsan_ignorelist.txt
index ea2ebe330bf..e89127507c0 100644
--- a/tests/ubsan_suppressions.txt
+++ b/tests/ubsan_ignorelist.txt
@@ -1,4 +1,11 @@
-# https://github.com/llvm-mirror/compiler-rt/blob/master/lib/ubsan/ubsan_checks.inc
+# Note, this file is ignorelist file [1] not suppressions [2].
+#
+#  [1]: https://clang.llvm.org/docs/SanitizerSpecialCaseList.html
+#  [2]: https://clang.llvm.org/docs/UndefinedBehaviorSanitizer.html#runtime-suppressions
+#
+# See also [3] for all UBSan checks.
+#
+#   [3]: https://github.com/llvm-mirror/compiler-rt/blob/master/lib/ubsan/ubsan_checks.inc
 
 # Some value is outside the range of representable values of type 'long' on user-provided data inside boost::geometry - ignore.
 src:*/Functions/pointInPolygon.cpp
diff --git a/utils/check-marks/CMakeLists.txt b/utils/check-marks/CMakeLists.txt
index 05546a2989b..857dc51d40a 100644
--- a/utils/check-marks/CMakeLists.txt
+++ b/utils/check-marks/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable (check-marks main.cpp)
-target_link_libraries(check-marks PRIVATE dbms boost::program_options)
+target_link_libraries(check-marks PRIVATE dbms clickhouse_functions boost::program_options)
diff --git a/utils/check-marks/main.cpp b/utils/check-marks/main.cpp
index df6f6e5267e..b4cd44d6eb7 100644
--- a/utils/check-marks/main.cpp
+++ b/utils/check-marks/main.cpp
@@ -23,7 +23,7 @@ static void checkByCompressedReadBuffer(const std::string & mrk_path, const std:
     DB::CompressedReadBufferFromFile bin_in(DB::createReadBufferFromFileBase(bin_path, /* settings= */ {}));
 
     DB::WriteBufferFromFileDescriptor out(STDOUT_FILENO);
-    bool mrk2_format = boost::algorithm::ends_with(mrk_path, ".mrk2");
+    bool mrk2_format = mrk_path.ends_with(".mrk2");
 
     for (size_t mark_num = 0; !mrk_in.eof(); ++mark_num)
     {
diff --git a/utils/check-mysql-binlog/CMakeLists.txt b/utils/check-mysql-binlog/CMakeLists.txt
index cbbecd456a0..0ece1684e6b 100644
--- a/utils/check-mysql-binlog/CMakeLists.txt
+++ b/utils/check-mysql-binlog/CMakeLists.txt
@@ -1,2 +1,2 @@
 clickhouse_add_executable(check-mysql-binlog main.cpp)
-target_link_libraries(check-mysql-binlog PRIVATE dbms boost::program_options)
+target_link_libraries(check-mysql-binlog PRIVATE dbms clickhouse_functions boost::program_options)
diff --git a/utils/check-style/aspell-ignore/en/aspell-dict.txt b/utils/check-style/aspell-ignore/en/aspell-dict.txt
index 95a6ae50d1f..242c448491c 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 2657 
+personal_ws-1.1 en 2758 
 AArch
 ACLs
 ALTERs
@@ -12,6 +12,7 @@ ARMv
 ASLR
 ASOF
 ASan
+AWND
 AWST
 Actian
 ActionsMenu
@@ -111,6 +112,7 @@ CDMA
 CESU
 CIDR
 CIDRToRange
+CKMAN
 CLOB
 CLion
 CMPLNT
@@ -159,7 +161,10 @@ ClickHouseNIO
 ClickHouseVapor
 ClickVisual
 ClickableSquare
+CloudAvailableBadge
 CloudDetails
+CloudNotSupportedBadge
+CloudStorage
 CodeBlock
 CodeLLDB
 Codecs
@@ -189,6 +194,7 @@ CustomSeparatedWithNamesAndTypes
 DBAs
 DBMSs
 DBeaver
+DD
 DDLWORKER
 DDLWorker
 DDLWorkerThreads
@@ -237,6 +243,7 @@ DistributedSend
 DockerHub
 DoubleDelta
 Doxygen
+Durre
 ECMA
 Ecto
 EdgeAngle
@@ -256,6 +263,7 @@ ExactEdgeLengthRads
 ExecutablePool
 ExtType
 ExternalDistributed
+FFFFFFFF
 FFFD
 FIPS
 FOSDEM
@@ -282,11 +290,13 @@ FilesystemMainPathTotalINodes
 FilesystemMainPathUsedBytes
 FilesystemMainPathUsedINodes
 FixedString
+FlameGraph
 Flink
 ForEach
 FreeBSD
 Fuzzer
 Fuzzers
+GHCN
 GTID
 GTest
 Gb
@@ -442,6 +452,10 @@ Khanna
 KittenHouse
 Klickhouse
 Kolmogorov
+Konstantin
+kostik
+kostikConsistentHash
+Korzeniewski
 Kubernetes
 LDAP
 LGPL
@@ -452,6 +466,7 @@ LOCALTIME
 LOCALTIMESTAMP
 LONGLONG
 Levenshtein
+Liao
 LibFuzzer
 LightHouse
 LineAsString
@@ -501,6 +516,7 @@ MaxMind
 MaxPartCountForPartition
 MaxPushedDDLEntryID
 Mbps
+McNeal
 Memcheck
 MemoryCode
 MemoryDataAndStack
@@ -510,6 +526,7 @@ MemorySanitizer
 MemoryShared
 MemoryTracking
 MemoryVirtual
+Menne
 MergeJoin
 MergeState
 MergeTree
@@ -537,7 +554,20 @@ MinIO
 MinMax
 MindsDB
 Mongodb
+mortonDecode
+mortonEncode
 MsgPack
+multiSearchAllPositionsCaseInsensitive
+multiSearchAllPositionsCaseInsensitiveUTF
+multiSearchAnyCaseInsensitive
+multiSearchAnyCaseInsensitiveUTF
+multiSearchAnyUTF
+multiSearchFirstIndexCaseInsensitive
+multiSearchFirstIndexCaseInsensitiveUTF
+multiSearchFirstIndexUTF
+multiSearchFirstPositionCaseInsensitive
+multiSearchFirstPositionCaseInsensitiveUTF
+multiSearchFirstPositionUTF
 MultiPolygon
 Multiline
 Multiqueries
@@ -554,6 +584,7 @@ NEWDATE
 NEWDECIMAL
 NFKC
 NFKD
+NOAA
 NULLIF
 NVME
 NVMe
@@ -574,6 +605,7 @@ NetworkSendBytes
 NetworkSendDrop
 NetworkSendErrors
 NetworkSendPackets
+Noaa
 NodeJs
 NuRaft
 NumHexagons
@@ -637,6 +669,7 @@ OTLP
 OUTFILE
 ObjectId
 Observability
+Oblakov
 Octonica
 Ok
 OnTime
@@ -654,8 +687,10 @@ OrZero
 OvercommitTracker
 PAAMAYIM
 PCRE
+PRCP
 PREWHERE
 PROCESSLIST
+PSUN
 PagerDuty
 ParallelFormattingOutputFormatThreads
 ParallelFormattingOutputFormatThreadsActive
@@ -672,7 +707,6 @@ PartsCommitted
 PartsCompact
 PartsDeleteOnDestroy
 PartsDeleting
-PartsInMemory
 PartsOutdated
 PartsPreActive
 PartsPreCommitted
@@ -800,6 +834,7 @@ SIMD
 SLES
 SLRU
 SMALLINT
+SNWD
 SPNEGO
 SQEs
 SQLAlchemy
@@ -827,6 +862,8 @@ Sematext
 SendExternalTables
 SendScalars
 ShareAlike
+SharedMergeTree
+Shortkeys
 SimHash
 Simhash
 SimpleAggregateFunction
@@ -838,6 +875,7 @@ Soundex
 SpanKind
 Spearman's
 SquaredDistance
+SquaredNorm
 StartTLS
 StartTime
 StartupSystemTables
@@ -872,11 +910,14 @@ SupersetDocker
 SystemReplicasThreads
 SystemReplicasThreadsActive
 TABLUM
+TAVG
 TCPConnection
 TCPThreads
 TDigest
 TINYINT
 TLSv
+TMAX
+TMIN
 TPCH
 TSDB
 TSVRaw
@@ -937,6 +978,8 @@ TotalRowsOfMergeTreeTables
 TotalTemporaryFiles
 Tradeoff
 Transactional
+Tsai
+Tukey
 TwoColumnList
 UBSan
 UDFs
@@ -974,12 +1017,15 @@ VIEWs
 Vadim
 Valgrind
 Vectorized
+VersionBadge
 VersionInteger
 VersionedCollapsingMergeTree
 VideoContainer
 ViewAllLink
 VirtualBox
+Vose
 WALs
+WSFG
 Welch's
 Werror
 Wether
@@ -998,6 +1044,7 @@ Xeon
 YAML
 YAMLRegExpTree
 YYYY
+YYYYMMDD
 YYYYMMDDToDate
 YYYYMMDDhhmmssToDateTime
 Yandex
@@ -1056,6 +1103,8 @@ anyheavy
 anylast
 appendTrailingCharIfAbsent
 approximative
+approxtopk
+approxtopsum
 argMax
 argMin
 argmax
@@ -1108,6 +1157,7 @@ arrayRotateLeft
 arrayRotateRight
 arrayShiftLeft
 arrayShiftRight
+arrayShingles
 arraySlice
 arraySort
 arraySplit
@@ -1131,6 +1181,7 @@ authenticators
 autocompletion
 autodetect
 autodetected
+autogen
 autogenerate
 autogenerated
 autogeneration
@@ -1214,6 +1265,7 @@ buildable
 builtins
 byteHammingDistance
 byteSize
+byteSlice
 byteSwap
 bytebase
 bytesToCutForIPv
@@ -1243,6 +1295,8 @@ centroid
 certificateFile
 cetera
 cfg
+cgroup
+cgroups
 chadmin
 changelog
 changelogs
@@ -1262,6 +1316,7 @@ cipherList
 ciphertext
 cityHash
 cityhash
+ckman
 clangd
 cli
 clickcache
@@ -1304,6 +1359,7 @@ cosineDistance
 countDigits
 countEqual
 countMatches
+countMatchesCaseInsensitive
 countSubstrings
 covarPop
 covarSamp
@@ -1328,6 +1384,7 @@ cryptographic
 csv
 csvwithnames
 csvwithnamesandtypes
+ctukey
 curdate
 currentDatabase
 currentProfiles
@@ -1546,6 +1603,7 @@ gccMurmurHash
 gcem
 generateRandom
 generateRandomStructure
+generateSeries
 generateULID
 generateUUIDv
 geoDistance
@@ -1560,6 +1618,7 @@ geohashEncode
 geohashesInBox
 geoip
 geospatial
+getClientHTTPHeader
 getMacro
 getOSKernelVersion
 getServerPort
@@ -1567,6 +1626,7 @@ getSetting
 getSizeOfEnumType
 getblockinfo
 getevents
+ghcnd
 github
 glibc
 globalIn
@@ -1586,10 +1646,12 @@ greaterorequals
 greenspace
 groupArray
 groupArrayInsertAt
+groupArrayIntersect
 groupArrayLast
 groupArrayMovingAvg
 groupArrayMovingSum
 groupArraySample
+groupArraySorted
 groupBitAnd
 groupBitOr
 groupBitXor
@@ -1600,10 +1662,12 @@ groupBitmapXor
 groupUniqArray
 grouparray
 grouparrayinsertat
+grouparrayintersect
 grouparraylast
 grouparraymovingavg
 grouparraymovingsum
 grouparraysample
+grouparraysorted
 groupbitand
 groupbitmap
 groupbitmapand
@@ -1633,6 +1697,7 @@ hasSubsequenceCaseInsensitiveUTF
 hasSubsequenceUTF
 hasSubstr
 hasToken
+hasThreadFuzzer
 hasTokenCaseInsensitive
 hasTokenCaseInsensitiveOrNull
 hasTokenOrNull
@@ -1663,6 +1728,7 @@ hudi
 hyperscan
 hypot
 hyvor
+iTerm
 icosahedron
 icudata
 idempotency
@@ -1719,6 +1785,7 @@ javaHashUTF
 jbod
 jdbc
 jemalloc
+jeprof
 joinGet
 json
 jsonMergePatch
@@ -1804,6 +1871,7 @@ linearized
 lineasstring
 linefeeds
 lineorder
+linestring
 linux
 llvm
 loadDefaultCAFile
@@ -1859,6 +1927,7 @@ mdadm
 meanZTest
 meanztest
 mebibytes
+mergeTreeIndex
 mergeable
 mergetree
 messageID
@@ -1883,6 +1952,7 @@ mmap
 mmapped
 modularization
 moduloOrZero
+moduli
 mongodb
 monthName
 moscow
@@ -1933,6 +2003,9 @@ nestjs
 netloc
 ngram
 ngramDistance
+ngramDistanceCaseInsensitive
+ngramDistanceCaseInsensitiveUTF
+ngramDistanceUTF
 ngramMinHash
 ngramMinHashArg
 ngramMinHashArgCaseInsensitive
@@ -1942,12 +2015,16 @@ ngramMinHashCaseInsensitive
 ngramMinHashCaseInsensitiveUTF
 ngramMinHashUTF
 ngramSearch
+ngramSearchCaseInsensitive
+ngramSearchCaseInsensitiveUTF
+ngramSearchUTF
 ngramSimHash
 ngramSimHashCaseInsensitive
 ngramSimHashCaseInsensitiveUTF
 ngramSimHashUTF
 ngrambf
 ngrams
+noaa
 nonNegativeDerivative
 noop
 normalizeQuery
@@ -2056,7 +2133,6 @@ prebuild
 prebuilt
 preemptable
 preferServerCiphers
-prefertch
 prefetch
 prefetchsize
 preloaded
@@ -2106,6 +2182,7 @@ py
 qryn
 quantile
 quantileBFloat
+quantileDD
 quantileDeterministic
 quantileExact
 quantileExactExclusive
@@ -2120,6 +2197,7 @@ quantileTDigestWeighted
 quantileTiming
 quantileTimingWeighted
 quantilebfloat
+quantileddsketch
 quantiledeterministic
 quantileexact
 quantileexactweighted
@@ -2159,7 +2237,9 @@ rankCorr
 rapidjson
 rawblob
 readWKTMultiPolygon
+readWKTPoint
 readWKTPolygon
+readWKTRing
 readahead
 readline
 readme
@@ -2203,6 +2283,7 @@ reinterpretAsString
 reinterpretAsUInt
 reinterpretAsUUID
 remoteSecure
+repivot
 replaceAll
 replaceOne
 replaceRegexpAll
@@ -2264,6 +2345,7 @@ sequenceCount
 sequenceMatch
 sequenceNextNode
 seriesDecomposeSTL
+seriesOutliersDetectTukey
 seriesPeriodDetectFFT
 serverTimeZone
 serverTimezone
@@ -2277,8 +2359,17 @@ shardNum
 sharded
 sharding
 shortcircuit
+shortkeys
 shoutout
 simdjson
+simpleJSON
+simpleJSONExtractBool
+simpleJSONExtractFloat
+simpleJSONExtractInt
+simpleJSONExtractRaw
+simpleJSONExtractString
+simpleJSONExtractUInt
+simpleJSONHas
 simpleLinearRegression
 simpleaggregatefunction
 simplelinearregression
@@ -2317,6 +2408,7 @@ sqlinsert
 sqlite
 sqrt
 src
+srcReplicas
 stacktrace
 stacktraces
 startsWith
@@ -2380,6 +2472,7 @@ subranges
 subreddits
 subseconds
 subsequence
+substreams
 substring
 substringIndex
 substringIndexUTF
@@ -2443,6 +2536,7 @@ theilsu
 themself
 threadpool
 throwIf
+timeDiff
 timeSlot
 timeSlots
 timeZone
@@ -2494,6 +2588,7 @@ toRelativeSecondNum
 toRelativeWeekNum
 toRelativeYearNum
 toSecond
+toMillisecond
 toStartOfDay
 toStartOfFifteenMinutes
 toStartOfFiveMinutes
@@ -2555,6 +2650,7 @@ tryPunycodeDecode
 tskv
 tsv
 tui
+tukey
 tumbleEnd
 tumbleStart
 tupleConcat
@@ -2568,6 +2664,12 @@ tupleMultiplyByNumber
 tupleNegate
 tuplePlus
 tupleToNameValuePairs
+tupleIntDiv
+tupleIntDivByNumber
+tupleIntDivOrZero
+tupleIntDivOrZeroByNumber
+tupleModulo
+tupleModuloByNumber
 turbostat
 txt
 typename
@@ -2628,8 +2730,12 @@ userver
 utils
 uuid
 varPop
+varPopStable
 varSamp
+varSampStable
 variadic
+variantElement
+variantType
 varint
 varpop
 varsamp
@@ -2676,7 +2782,9 @@ wordShingleSimHashCaseInsensitive
 wordShingleSimHashCaseInsensitiveUTF
 wordShingleSimHashUTF
 wordshingleMinHash
+writability
 wrt
+wyHash
 xcode
 xeus
 xkcd
@@ -2687,6 +2795,7 @@ xz
 yaml
 yandex
 youtube
+ZCurve
 zLib
 zLinux
 zabbix
diff --git a/utils/check-style/check-duplicate-includes.sh b/utils/check-style/check-duplicate-includes.sh
index 64aca4d180d..ca8b98d9537 100755
--- a/utils/check-style/check-duplicate-includes.sh
+++ b/utils/check-style/check-duplicate-includes.sh
@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 
 ROOT_PATH=$(git rev-parse --show-toplevel)
+NPROC=$(($(nproc) + 3))
 
 # Find duplicate include directives
-find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' | while read file; do grep -P '^#include ' $file | sort | uniq -c | grep -v -P '^\s+1\s' && echo $file; done | sed '/^[[:space:]]*$/d'
+find "$ROOT_PATH"/{src,base,programs,utils} -type f '(' -name '*.h' -or -name '*.cpp' ')' -print0 | \
+  xargs -0 -I {} -P "$NPROC" bash -c 'grep -P "^#include " "{}" | sort | uniq -c | grep -v -P "^\s+1\s" && echo "{}" '| \
+  sed '/^\s*$/d'
diff --git a/utils/check-style/check-large-objects.sh b/utils/check-style/check-large-objects.sh
index 6b3fe86d310..2122cca911e 100755
--- a/utils/check-style/check-large-objects.sh
+++ b/utils/check-style/check-large-objects.sh
@@ -1,20 +1,15 @@
 #!/usr/bin/env bash
 
+export LC_ALL=C # The "total" should be printed without localization
+
 # Check that there are no new translation units compiled to an object file larger than a certain size.
 
 TU_EXCLUDES=(
-    CastOverloadResolver
-    AggregateFunctionMax
-    AggregateFunctionMin
     AggregateFunctionUniq
-    FunctionsConversion
-
-    RangeHashedDictionary
-
     Aggregator
 )
 
-if find $1 -name '*.o' | xargs wc -c | grep -v total | sort -rn | awk '{ if ($1 > 50000000) print }' \
+if find $1 -name '*.o' | xargs wc -c | grep --regexp='\.o$' | sort -rn | awk '{ if ($1 > 50000000) print }' \
     | grep -v -f <(printf "%s\n" "${TU_EXCLUDES[@]}")
 then
     echo "^ It's not allowed to have so large translation units."
diff --git a/utils/check-style/check-pylint b/utils/check-style/check-pylint
new file mode 100755
index 00000000000..7959a414023
--- /dev/null
+++ b/utils/check-style/check-pylint
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+
+
+LC_ALL="en_US.UTF-8"
+ROOT_PATH=$(git rev-parse --show-toplevel)
+
+function xargs-pylint {
+  # $1 is number maximum arguments per pylint process
+  sort | awk '$2=="text/x-script.python" {print $1}' | \
+  xargs -P "$(nproc)" -n "$1" pylint --rcfile="$ROOT_PATH/pyproject.toml" --persistent=no --score=n
+}
+
+find "$ROOT_PATH/tests" -maxdepth 2 -type f -exec file -F' ' --mime-type {} + | xargs-pylint 50
+# Beware, there lambdas are checked. All of them contain `app`, and it causes brain-cucumber-zalgo
+find "$ROOT_PATH/tests/ci" -mindepth 2 -type f -exec file -F' ' --mime-type {} + | xargs-pylint 1
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index daee2e7fb00..23e8b6b2bc4 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -50,11 +50,6 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/n
 # Broken symlinks
 find -L $ROOT_PATH -type l 2>/dev/null | grep -v contrib && echo "^ Broken symlinks found"
 
-# Double whitespaces
-find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
-    grep -vP $EXCLUDE_DIRS |
-    while read i; do $ROOT_PATH/utils/check-style/double-whitespaces.pl < $i || echo -e "^ File $i contains double whitespaces\n"; done
-
 # Unused/Undefined/Duplicates ErrorCodes/ProfileEvents/CurrentMetrics
 declare -A EXTERN_TYPES
 EXTERN_TYPES[ErrorCodes]=int
@@ -76,6 +71,7 @@ EXTERN_TYPES_EXCLUDES=(
     ProfileEvents::getProfileEvents
     ProfileEvents::ThreadIdToCountersSnapshot
     ProfileEvents::LOCAL_NAME
+    ProfileEvents::keeper_profile_events
     ProfileEvents::CountersIncrement
 
     CurrentMetrics::add
@@ -87,6 +83,7 @@ EXTERN_TYPES_EXCLUDES=(
     CurrentMetrics::Metric
     CurrentMetrics::values
     CurrentMetrics::Value
+    CurrentMetrics::keeper_metrics
 
     ErrorCodes::ErrorCode
     ErrorCodes::getName
@@ -106,7 +103,7 @@ for extern_type in ${!EXTERN_TYPES[@]}; do
     find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' | {
         # NOTE: the check is pretty dumb and distinguish only by the type_of_extern,
         # and this matches with zkutil::CreateMode
-        grep -v 'src/Common/ZooKeeper/Types.h'
+        grep -v -e 'src/Common/ZooKeeper/Types.h' -e 'src/Coordination/KeeperConstants.cpp'
     } | {
         grep -vP $EXCLUDE_DIRS | xargs grep -l -P "extern const $type_of_extern $allowed_chars"
     } | while read file; do
@@ -155,9 +152,6 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.xml' |
     grep -vP $EXCLUDE_DIRS |
     xargs xmllint --noout --nonet
 
-# FIXME: for now only clickhouse-test
-pylint --rcfile=$ROOT_PATH/.pylintrc --persistent=no --score=n $ROOT_PATH/tests/clickhouse-test $ROOT_PATH/tests/ci/*.py
-
 find $ROOT_PATH -not -path $ROOT_PATH'/contrib*' \( -name '*.yaml' -or -name '*.yml' \) -type f |
     grep -vP $EXCLUDE_DIRS |
     xargs yamllint --config-file=$ROOT_PATH/.yamllint
@@ -178,6 +172,8 @@ 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
 
+grep -iE 'SYSTEM STOP MERGES;?$' -R $ROOT_PATH/tests/queries && echo "Merges cannot be disabled globally in fast/stateful/stateless tests, because it will break concurrently running queries"
+
 # 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' |
@@ -274,6 +270,11 @@ find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
     grep -vP $EXCLUDE_DIRS |
     xargs grep -F '!!!' | grep -P '.' && echo "Too many exclamation marks (looks dirty, unconfident)."
 
+# Exclamation mark in a message
+find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
+    grep -vP $EXCLUDE_DIRS |
+    xargs grep -F '!",' | grep -P '.' && echo "No need for an exclamation mark (looks dirty, unconfident)."
+
 # Trailing whitespaces
 find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
     grep -vP $EXCLUDE_DIRS |
@@ -341,7 +342,7 @@ done
 
 expect_tests=( $(find $ROOT_PATH/tests/queries -name '*.expect') )
 for test_case in "${expect_tests[@]}"; do
-    pattern="^exp_internal -f \$env(CLICKHOUSE_TMP)/\$basename.debuglog 0$"
+    pattern="^exp_internal -f \$CLICKHOUSE_TMP/\$basename.debuglog 0$"
     grep -q "$pattern" "$test_case" || echo "Missing '$pattern' in '$test_case'"
 
     if grep -q "^spawn.*CLICKHOUSE_CLIENT_BINARY$" "$test_case"; then
@@ -435,3 +436,14 @@ ls -1d $ROOT_PATH/contrib/*-cmake | xargs -I@ find @ -name 'CMakeLists.txt' -or
 
 # DOS/Windows newlines
 find $ROOT_PATH/{base,src,programs,utils,docs} -name '*.md' -or -name '*.h' -or -name '*.cpp' -or -name '*.js' -or -name '*.py' -or -name '*.html' | xargs grep -l -P '\r$' && echo "^ Files contain DOS/Windows newlines (\r\n instead of \n)."
+
+# Wrong spelling of abbreviations, e.g. SQL is right, Sql is wrong. XMLHttpRequest is very wrong.
+find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
+    grep -vP $EXCLUDE_DIRS |
+    xargs grep -P 'Sql|Html|Xml|Cpu|Tcp|Udp|Http|Db|Json|Yaml' | grep -v -P 'RabbitMQ|Azure|Aws|aws|Avro|IO/S3' &&
+    echo "Abbreviations such as SQL, XML, HTTP, should be in all caps. For example, SQL is right, Sql is wrong. XMLHttpRequest is very wrong."
+
+find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' |
+    grep -vP $EXCLUDE_DIRS |
+    xargs grep -F -i 'ErrorCodes::LOGICAL_ERROR, "Logical error:' &&
+    echo "If an exception has LOGICAL_ERROR code, there is no need to include the text 'Logical error' in the exception message, because then the phrase 'Logical error' will be printed twice."
diff --git a/utils/check-style/check-whitespaces b/utils/check-style/check-whitespaces
index 5a20569868d..507b1dd2ede 100755
--- a/utils/check-style/check-whitespaces
+++ b/utils/check-style/check-whitespaces
@@ -2,8 +2,9 @@
 
 ROOT_PATH=$(git rev-parse --show-toplevel)
 EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing/|Parsers/New'
+NPROC=$(($(nproc) + 3))
 
 # Double whitespaces
 find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |
     grep -vP $EXCLUDE_DIRS |
-    while read i; do $ROOT_PATH/utils/check-style/double-whitespaces.pl < $i || echo -e "^ File $i contains double whitespaces\n"; done
+    xargs -P "$NPROC" -n 20 "${ROOT_PATH}/utils/check-style/double-whitespaces.pl"
diff --git a/utils/check-style/check_cpp.sh b/utils/check-style/check_cpp.sh
new file mode 100755
index 00000000000..d647f5eefe1
--- /dev/null
+++ b/utils/check-style/check_cpp.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# yaml check is not the best one
+
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
+
+start_total=$(date +%s)
+
+# We decided to have the regexp-based check disabled in favor of clang-tidy
+# start=$(date +%s)
+# ./check-duplicate-includes.sh |& tee /test_output/duplicate_includes_output.txt
+# runtime=$(($(date +%s)-start))
+# echo "Check duplicates. Done. $runtime seconds."
+
+start=$(date +%s)
+./check-style -n              |& tee /test_output/style_output.txt
+runtime=$(($(date +%s)-start))
+echo "Check style. Done. $runtime seconds."
+
+start=$(date +%s)
+./check-whitespaces -n        |& tee /test_output/whitespaces_output.txt
+runtime=$(($(date +%s)-start))
+echo "Check whitespaces. Done. $runtime seconds."
+
+start=$(date +%s)
+./check-workflows             |& tee /test_output/workflows_output.txt
+runtime=$(($(date +%s)-start))
+echo "Check workflows. Done. $runtime seconds."
+
+start=$(date +%s)
+./check-submodules            |& tee /test_output/submodules_output.txt
+runtime=$(($(date +%s)-start))
+echo "Check submodules. Done. $runtime seconds."
+
+runtime=$(($(date +%s)-start_total))
+echo "Check style total. Done. $runtime seconds."
diff --git a/utils/check-style/check_docs.sh b/utils/check-style/check_docs.sh
new file mode 100755
index 00000000000..78b8a402ea0
--- /dev/null
+++ b/utils/check-style/check_docs.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+# yaml check is not the best one
+
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
+
+start_total=`date +%s`
+
+start=`date +%s`
+./check-typos                 |& tee /test_output/typos_output.txt
+runtime=$((`date +%s`-start))
+echo "Check typos. Done. $runtime seconds."
+
+start=`date +%s`
+./check-doc-aspell            |& tee /test_output/docs_spelling_output.txt
+runtime=$((`date +%s`-start))
+echo "Check docs spelling. Done. $runtime seconds."
+
+runtime=$((`date +%s`-start_total))
+echo "Check Docs, total. Done. $runtime seconds."
diff --git a/utils/check-style/check_py.sh b/utils/check-style/check_py.sh
new file mode 100755
index 00000000000..2e645d2f19a
--- /dev/null
+++ b/utils/check-style/check_py.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
+
+start_total=`date +%s`
+
+start=`date +%s`
+echo "Check " | ts
+./check-black -n              |& tee /test_output/black_output.txt
+runtime=$((`date +%s`-start))
+echo "Check python formatting with black. Done. $runtime seconds."
+
+start=`date +%s`
+./check-pylint -n               |& tee /test_output/pylint_output.txt
+runtime=$((`date +%s`-start))
+echo "Check pylint. Done. $runtime seconds."
+
+start=`date +%s`
+./check-mypy -n               |& tee /test_output/mypy_output.txt
+runtime=$((`date +%s`-start))
+echo "Check python type hinting with mypy. Done. $runtime seconds."
+
+runtime=$((`date +%s`-start_total))
+echo "Check python total. Done. $runtime seconds."
diff --git a/utils/check-style/check_shell.sh b/utils/check-style/check_shell.sh
new file mode 100755
index 00000000000..94f06220f88
--- /dev/null
+++ b/utils/check-style/check_shell.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+cd /ClickHouse/utils/check-style || echo -e "failure\tRepo not found" > /test_output/check_status.tsv
+
+start_total=$(date +%s)
+
+start=$(date +%s)
+./shellcheck-run.sh |& tee /test_output/shellcheck.txt
+runtime=$(($(date +%s)-start))
+echo "Check shellcheck. Done. $runtime seconds."
+
+runtime=$(($(date +%s)-start_total))
+echo "Check style total. Done. $runtime seconds."
diff --git a/utils/check-style/double-whitespaces.pl b/utils/check-style/double-whitespaces.pl
index 47b03cb74ab..daeddecbd27 100755
--- a/utils/check-style/double-whitespaces.pl
+++ b/utils/check-style/double-whitespaces.pl
@@ -5,27 +5,31 @@ use strict;
 # Find double whitespace such as "a,  b, c" that looks very ugly and annoying.
 # But skip double whitespaces if they are used as an alignment - by comparing to surrounding lines.
 
-my @array;
-
-while (<>)
-{
-    push @array, $_;
-}
-
 my $ret = 0;
 
-for (my $i = 1; $i < $#array; ++$i)
+foreach my $file (@ARGV)
 {
-    if ($array[$i] =~ ',( {2,3})[^ /]')
-    {
-        # https://stackoverflow.com/questions/87380/how-can-i-find-the-location-of-a-regex-match-in-perl
+    my @array;
 
-        if ((substr($array[$i - 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/) # whitespaces are not part of alignment
-         && (substr($array[$i + 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/)
-         && $array[$i] !~ /(-?\d+\w*,\s+){3,}/) # this is not a number table like { 10, -1,  2 }
+    open (FH,'<',$file);
+    while (<FH>)
+    {
+        push @array, $_;
+    }
+
+    for (my $i = 1; $i < $#array; ++$i)
+    {
+        if ($array[$i] =~ ',( {2,3})[^ /]')
         {
-            print(($i + 1) . ":" . $array[$i]);
-            $ret = 1;
+            # https://stackoverflow.com/questions/87380/how-can-i-find-the-location-of-a-regex-match-in-perl
+
+            if ((substr($array[$i - 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/) # whitespaces are not part of alignment
+             && (substr($array[$i + 1], $+[1] - 1, 2) !~ /^[ -][^ ]$/)
+             && $array[$i] !~ /(-?\d+\w*,\s+){3,}/) # this is not a number table like { 10, -1,  2 }
+            {
+                print($file . ":" . ($i + 1) . $array[$i]);
+                $ret = 1;
+            }
         }
     }
 }
diff --git a/docker/test/style/process_style_check_result.py b/utils/check-style/process_style_check_result.py
similarity index 80%
rename from docker/test/style/process_style_check_result.py
rename to utils/check-style/process_style_check_result.py
index bc06df1af31..e603084732d 100755
--- a/docker/test/style/process_style_check_result.py
+++ b/utils/check-style/process_style_check_result.py
@@ -1,9 +1,9 @@
 #!/usr/bin/env python3
 
-import os
-import logging
 import argparse
 import csv
+import logging
+import os
 
 
 # TODO: add typing and log files to the fourth column, think about launching
@@ -13,9 +13,10 @@ def process_result(result_folder):
     description = ""
     test_results = []
     checks = (
-        "duplicate includes",
+        # "duplicate includes",  # disabled in favor of clang-tidy
         "shellcheck",
         "style",
+        "pylint",
         "black",
         "mypy",
         "typos",
@@ -29,11 +30,15 @@ def process_result(result_folder):
         out_file = name.replace(" ", "_") + "_output.txt"
         full_path = os.path.join(result_folder, out_file)
         if not os.path.exists(full_path):
-            logging.info("No %s check log on path %s", name, full_path)
-            return "exception", f"No {name} check log", []
+            test_results.append((f"Check {name}", "SKIPPED"))
         elif os.stat(full_path).st_size != 0:
+            with open(full_path, "r") as file:
+                lines = file.readlines()
+                if len(lines) > 100:
+                    lines = lines[:100] + ["====TRIMMED===="]
+                content = "\n".join(lines)
             description += f"Check {name} failed. "
-            test_results.append((f"Check {name}", "FAIL"))
+            test_results.append((f"Check {name}", "FAIL", None, content))
             status = "failure"
         else:
             test_results.append((f"Check {name}", "OK"))
@@ -41,6 +46,8 @@ def process_result(result_folder):
     if not description:
         description += "Style check success"
 
+    assert test_results, "No single style-check output found"
+
     return status, description, test_results
 
 
diff --git a/utils/check-style/shellcheck-run.sh b/utils/check-style/shellcheck-run.sh
index bdb0f681c31..5930e537703 100755
--- a/utils/check-style/shellcheck-run.sh
+++ b/utils/check-style/shellcheck-run.sh
@@ -2,13 +2,13 @@
 ROOT_PATH=$(git rev-parse --show-toplevel)
 NPROC=$(($(nproc) + 3))
 # Check sh tests with Shellcheck
-( 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
-)
+find "$ROOT_PATH/tests/queries/"{0_stateless,1_stateful} -name '*.sh' -print0 | \
+  xargs -0 -P "$NPROC" -n 20 shellcheck --check-sourced --external-sources --source-path=SCRIPTDIR \
+  --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}' | \
+# Do not check sourced files, since it causes broken --source-path=SCRIPTDIR
+find "$ROOT_PATH/docker" -type f -exec file -F' ' --mime-type {} + | \
+  awk '$2=="text/x-shellscript" {print $1}' | \
   grep -v "compare.sh" | \
-  xargs -P "$NPROC" -n 20 shellcheck
+  xargs -P "$NPROC" -n 20 shellcheck --external-sources --source-path=SCRIPTDIR
diff --git a/utils/clickhouse-diagnostics/README.md b/utils/clickhouse-diagnostics/README.md
index 9a86ad535fd..01bb543c9a5 100644
--- a/utils/clickhouse-diagnostics/README.md
+++ b/utils/clickhouse-diagnostics/README.md
@@ -318,7 +318,7 @@ SHOW ACCESS
 ```
 **result**
 ```
-CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE default
+CREATE USER default IDENTIFIED WITH plaintext_password SETTINGS PROFILE `default`
 CREATE SETTINGS PROFILE default SETTINGS max_memory_usage = 10000000000, load_balancing = 'random'
 CREATE SETTINGS PROFILE readonly SETTINGS readonly = 1
 CREATE QUOTA default KEYED BY user_name FOR INTERVAL 1 hour TRACKING ONLY TO default
diff --git a/utils/durability-test/durability-test.sh b/utils/durability-test/durability-test.sh
index 97c39473b69..188ef3452e7 100755
--- a/utils/durability-test/durability-test.sh
+++ b/utils/durability-test/durability-test.sh
@@ -15,7 +15,6 @@ Usage:
 URL=http://cloud-images.ubuntu.com/bionic/current
 IMAGE=bionic-server-cloudimg-amd64.img
 SSH_PORT=11022
-CLICKHOUSE_PORT=9090
 PASSWORD=root
 
 TABLE_NAME=$1
@@ -34,19 +33,18 @@ function run()
 
 function copy()
 {
-    sshpass -p $PASSWORD scp -r -P $SSH_PORT $1 root@localhost:$2 2>/dev/null
+    sshpass -p $PASSWORD scp -r -P $SSH_PORT "$1" "root@localhost:$2" 2>/dev/null
 }
 
 function wait_vm_for_start()
 {
     echo "Waiting until VM started..."
     started=0
-    for i in {0..100}; do
-        run "exit"
-        if [ $? -eq 0 ]; then
+    for _ in {0..100}; do
+        if run "exit"; then
             started=1
             break
-        fi 
+        fi
         sleep 1s
     done
 
@@ -62,9 +60,8 @@ function wait_clickhouse_for_start()
 {
     echo "Waiting until ClickHouse started..."
     started=0
-    for i in {0..30}; do
-        run "clickhouse client --query 'select 1'" > /dev/null
-        if [ $? -eq 0 ]; then
+    for _ in {0..30}; do
+        if run "clickhouse client --query 'select 1'" > /dev/null; then
             started=1
             break
         fi
@@ -105,11 +102,11 @@ if [[ -z $CLICKHOUSE_CONFIG_DIR ]]; then
     CLICKHOUSE_CONFIG_DIR=/etc/clickhouse-server
 fi
 
-echo "Using ClickHouse binary:" $CLICKHOUSE_BINARY
-echo "Using ClickHouse config from:" $CLICKHOUSE_CONFIG_DIR
+echo "Using ClickHouse binary: $CLICKHOUSE_BINARY"
+echo "Using ClickHouse config from: $CLICKHOUSE_CONFIG_DIR"
 
-copy $CLICKHOUSE_BINARY /usr/bin
-copy $CLICKHOUSE_CONFIG_DIR /etc
+copy "$CLICKHOUSE_BINARY" /usr/bin
+copy "$CLICKHOUSE_CONFIG_DIR" /etc
 run "mv /etc/$CLICKHOUSE_CONFIG_DIR /etc/clickhouse-server"
 
 echo "Prepared VM"
@@ -118,23 +115,23 @@ echo "Starting ClickHouse"
 run "clickhouse server --config-file=/etc/clickhouse-server/config.xml > clickhouse-server.log 2>&1" &
 wait_clickhouse_for_start
 
-query=`cat $CREATE_QUERY`
-echo "Executing query:" $query
+query=$(cat "$CREATE_QUERY")
+echo "Executing query: $query"
 run "clickhouse client --query '$query'"
 
-query=`cat $INSERT_QUERY`
-echo "Will run in a loop query: " $query
+query=$(cat "$INSERT_QUERY")
+echo "Will run in a loop query:  $query"
 run "clickhouse benchmark <<< '$query' -c 8" &
 echo "Running queries"
 
-pid=`pidof qemu-system-x86_64`
+pid=$(pidof qemu-system-x86_64)
 sec=$(( (RANDOM % 5) + 25 ))
 ms=$(( RANDOM % 1000 ))
 
 echo "Will kill VM in $sec.$ms sec"
 
 sleep $sec.$ms
-kill -9 $pid
+kill -9 "$pid"
 
 echo "Restarting"
 
@@ -147,22 +144,22 @@ run "rm -r *data/system"
 run "clickhouse server --config-file=/etc/clickhouse-server/config.xml > clickhouse-server.log 2>&1" &
 wait_clickhouse_for_start
 
-pid=`pidof qemu-system-x86_64`
-result=`run "grep $TABLE_NAME clickhouse-server.log | grep 'Caught exception while loading metadata'"`
+pid=$(pidof qemu-system-x86_64)
+result=$(run "grep $TABLE_NAME clickhouse-server.log | grep 'Caught exception while loading metadata'")
 if [[ -n $result ]]; then
     echo "FAIL. Can't attach table:"
-    echo $result
-    kill -9 $pid
+    echo "$result"
+    kill -9 "$pid"
     exit 1
 fi
 
-result=`run "grep $TABLE_NAME clickhouse-server.log | grep 'Considering to remove broken part'"`
+result=$(run "grep $TABLE_NAME clickhouse-server.log | grep 'Considering to remove broken part'")
 if [[ -n $result ]]; then
     echo "FAIL. Have broken parts:"
-    echo $result
-    kill -9 $pid
+    echo "$result"
+    kill -9 "$pid"
     exit 1
 fi
 
-kill -9 $pid
+kill -9 "$pid"
 echo OK
diff --git a/utils/keeper-data-dumper/CMakeLists.txt b/utils/keeper-data-dumper/CMakeLists.txt
index 136d6f2268c..71f29781b73 100644
--- a/utils/keeper-data-dumper/CMakeLists.txt
+++ b/utils/keeper-data-dumper/CMakeLists.txt
@@ -4,4 +4,4 @@ if (NOT TARGET ch_contrib::nuraft)
 endif ()
 
 clickhouse_add_executable(keeper-data-dumper main.cpp)
-target_link_libraries(keeper-data-dumper PRIVATE dbms)
+target_link_libraries(keeper-data-dumper PRIVATE dbms clickhouse_functions)
diff --git a/utils/keeper-data-dumper/main.cpp b/utils/keeper-data-dumper/main.cpp
index aa8c0efbb26..21626665a42 100644
--- a/utils/keeper-data-dumper/main.cpp
+++ b/utils/keeper-data-dumper/main.cpp
@@ -25,13 +25,13 @@ void dumpMachine(std::shared_ptr<KeeperStateMachine> machine)
         keys.pop();
         std::cout << key << "\n";
         auto value = storage.container.getValue(key);
-        std::cout << "\tStat: {version: " << value.stat.version <<
-            ", mtime: " << value.stat.mtime <<
-            ", emphemeralOwner: " << value.stat.ephemeralOwner <<
-            ", czxid: " << value.stat.czxid <<
-            ", mzxid: " << value.stat.mzxid <<
-            ", numChildren: " << value.stat.numChildren <<
-            ", dataLength: " << value.stat.dataLength <<
+        std::cout << "\tStat: {version: " << value.version <<
+            ", mtime: " << value.mtime <<
+            ", emphemeralOwner: " << value.ephemeralOwner() <<
+            ", czxid: " << value.czxid <<
+            ", mzxid: " << value.mzxid <<
+            ", numChildren: " << value.numChildren() <<
+            ", dataLength: " << value.data_size <<
             "}" << std::endl;
         std::cout << "\tData: " << storage.container.getValue(key).getData() << std::endl;
 
@@ -59,15 +59,15 @@ int main(int argc, char *argv[])
         Poco::Logger::root().setChannel(channel);
         Poco::Logger::root().setLevel("trace");
     }
-    auto * logger = &Poco::Logger::get("keeper-dumper");
+    auto logger = getLogger("keeper-dumper");
     ResponsesQueue queue(std::numeric_limits<size_t>::max());
     SnapshotsQueue snapshots_queue{1};
     CoordinationSettingsPtr settings = std::make_shared<CoordinationSettings>();
-    KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true);
+    KeeperContextPtr keeper_context = std::make_shared<DB::KeeperContext>(true, settings);
     keeper_context->setLogDisk(std::make_shared<DB::DiskLocal>("LogDisk", argv[2]));
     keeper_context->setSnapshotDisk(std::make_shared<DB::DiskLocal>("SnapshotDisk", argv[1]));
 
-    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, settings, keeper_context, nullptr);
+    auto state_machine = std::make_shared<KeeperStateMachine>(queue, snapshots_queue, keeper_context, nullptr);
     state_machine->init();
     size_t last_commited_index = state_machine->last_commit_index();
 
diff --git a/utils/keeper-overload/keeper-overload.py b/utils/keeper-overload/keeper-overload.py
index 0a059b10588..1032ea656bc 100755
--- a/utils/keeper-overload/keeper-overload.py
+++ b/utils/keeper-overload/keeper-overload.py
@@ -102,7 +102,7 @@ class Keeper:
         if self.with_thread_fuzzer:
             env["THREAD_FUZZER_CPU_TIME_PERIOD_US"] = "1000"
             env["THREAD_FUZZER_SLEEP_PROBABILITY"] = "0.1"
-            env["THREAD_FUZZER_SLEEP_TIME_US"] = "100000"
+            env["THREAD_FUZZER_SLEEP_TIME_US_MAX"] = "100000"
             env["THREAD_FUZZER_pthread_mutex_lock_BEFORE_MIGRATE_PROBABILITY"] = "1"
             env["THREAD_FUZZER_pthread_mutex_lock_AFTER_MIGRATE_PROBABILITY"] = "1"
             env["THREAD_FUZZER_pthread_mutex_unlock_BEFORE_MIGRATE_PROBABILITY"] = "1"
@@ -112,10 +112,10 @@ class Keeper:
             env["THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_PROBABILITY"] = "0.001"
             env["THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_PROBABILITY"] = "0.001"
             env["THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_PROBABILITY"] = "0.001"
-            env["THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US"] = "10000"
-            env["THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US"] = "10000"
-            env["THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US"] = "10000"
-            env["THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US"] = "10000"
+            env["THREAD_FUZZER_pthread_mutex_lock_BEFORE_SLEEP_TIME_US_MAX"] = "10000"
+            env["THREAD_FUZZER_pthread_mutex_lock_AFTER_SLEEP_TIME_US_MAX"] = "10000"
+            env["THREAD_FUZZER_pthread_mutex_unlock_BEFORE_SLEEP_TIME_US_MAX"] = "10000"
+            env["THREAD_FUZZER_pthread_mutex_unlock_AFTER_SLEEP_TIME_US_MAX"] = "10000"
 
         self.process = subprocess.Popen(
             [
diff --git a/utils/list-licenses/list-licenses.sh b/utils/list-licenses/list-licenses.sh
index f09168a0596..cc730464e8e 100755
--- a/utils/list-licenses/list-licenses.sh
+++ b/utils/list-licenses/list-licenses.sh
@@ -5,15 +5,16 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
     GREP_CMD=ggrep
     FIND_CMD=gfind
 else
-    FIND_CMD=find
-    GREP_CMD=grep
+    FIND_CMD='find'
+    GREP_CMD='grep'
 fi
 
 ROOT_PATH="$(git rev-parse --show-toplevel)"
 LIBS_PATH="${ROOT_PATH}/contrib"
 
-ls -1 -d ${LIBS_PATH}/*/ "${ROOT_PATH}/base/poco" | ${GREP_CMD} -F -v -- '-cmake' | LC_ALL=C sort | while read LIB; do
-    LIB_NAME=$(basename $LIB)
+mapfile -t libs < <(echo "${ROOT_PATH}/base/poco"; find "${LIBS_PATH}" -type d -maxdepth 1 ! -name '*-cmake' | LC_ALL=C sort)
+for LIB in "${libs[@]}"; do
+    LIB_NAME=$(basename "$LIB")
 
     LIB_LICENSE=$(
         LC_ALL=C ${FIND_CMD} "$LIB" -type f -and '(' -iname 'LICENSE*' -or -iname 'COPYING*' -or -iname 'COPYRIGHT*' ')' -and -not '(' -iname '*.html' -or -iname '*.htm' -or -iname '*.rtf' -or -name '*.cpp' -or -name '*.h' -or -iname '*.json' ')' -printf "%d\t%p\n" |
diff --git a/utils/list-versions/version_date.tsv b/utils/list-versions/version_date.tsv
index b2983033e44..060a0107c1e 100644
--- a/utils/list-versions/version_date.tsv
+++ b/utils/list-versions/version_date.tsv
@@ -1,5 +1,22 @@
+v24.3.2.23-lts	2024-04-03
+v24.3.1.2672-lts	2024-03-27
+v24.2.2.71-stable	2024-03-15
+v24.2.1.2248-stable	2024-02-29
+v24.1.8.22-stable	2024-03-26
+v24.1.7.18-stable	2024-03-15
+v24.1.6.52-stable	2024-03-07
+v24.1.5.6-stable	2024-02-14
+v24.1.4.20-stable	2024-02-14
+v24.1.3.31-stable	2024-02-09
+v24.1.2.5-stable	2024-02-02
+v24.1.1.2048-stable	2024-01-30
+v23.12.6.19-stable	2024-03-26
+v23.12.5.81-stable	2024-03-15
+v23.12.4.15-stable	2024-02-09
+v23.12.3.40-stable	2024-02-02
 v23.12.2.59-stable	2024-01-05
 v23.12.1.1368-stable	2023-12-28
+v23.11.5.29-stable	2024-02-02
 v23.11.4.24-stable	2024-01-05
 v23.11.3.23-stable	2023-12-21
 v23.11.2.11-stable	2023-12-13
@@ -16,6 +33,9 @@ v23.9.4.11-stable	2023-11-08
 v23.9.3.12-stable	2023-10-31
 v23.9.2.56-stable	2023-10-19
 v23.9.1.1854-stable	2023-09-29
+v23.8.12.13-lts	2024-03-26
+v23.8.11.28-lts	2024-03-15
+v23.8.10.43-lts	2024-03-05
 v23.8.9.54-lts	2024-01-05
 v23.8.8.20-lts	2023-11-25
 v23.8.7.24-lts	2023-11-17
@@ -45,6 +65,9 @@ v23.4.4.16-stable	2023-06-17
 v23.4.3.48-stable	2023-06-12
 v23.4.2.11-stable	2023-05-02
 v23.4.1.1943-stable	2023-04-27
+v23.3.22.3-lts	2024-03-26
+v23.3.21.26-lts	2024-03-15
+v23.3.20.27-lts	2024-03-05
 v23.3.19.32-lts	2024-01-05
 v23.3.18.15-lts	2023-11-25
 v23.3.17.13-lts	2023-11-17
diff --git a/utils/memcpy-bench/FastMemcpy.h b/utils/memcpy-bench/FastMemcpy.h
index 85d09c5f53e..650a6761771 100644
--- a/utils/memcpy-bench/FastMemcpy.h
+++ b/utils/memcpy-bench/FastMemcpy.h
@@ -33,9 +33,11 @@
 #endif
 #endif
 
+/// NOLINTBEGIN(modernize-use-using)
 typedef __attribute__((__aligned__(1))) uint16_t uint16_unaligned_t;
 typedef __attribute__((__aligned__(1))) uint32_t uint32_unaligned_t;
 typedef __attribute__((__aligned__(1))) uint64_t uint64_unaligned_t;
+/// NOLINTEND(modernize-use-using)
 
 //---------------------------------------------------------------------
 // fast copy for different sizes
@@ -98,7 +100,7 @@ __attribute__((__no_sanitize__("undefined"))) inline void *memcpy_tiny(void * __
     unsigned char *dd = ((unsigned char*)dst) + size;
     const unsigned char *ss = ((const unsigned char*)src) + size;
 
-    switch (size)
+    switch (size) /// NOLINT(bugprone-switch-missing-default-case)
     {
     case 64:
         memcpy_sse2_64(dd - 64, ss - 64);
@@ -652,7 +654,7 @@ __attribute__((__no_sanitize__("undefined"))) inline void *memcpy_tiny(void * __
 //---------------------------------------------------------------------
 // main routine
 //---------------------------------------------------------------------
-void* memcpy_fast_sse(void * __restrict destination, const void * __restrict source, size_t size)
+void* memcpy_fast_sse(void * __restrict destination, const void * __restrict source, size_t size) /// NOLINT(misc-definitions-in-headers)
 {
     unsigned char *dst = (unsigned char*)destination;
     const unsigned char *src = (const unsigned char*)source;
diff --git a/utils/memcpy-bench/FastMemcpy_Avx.h b/utils/memcpy-bench/FastMemcpy_Avx.h
index ee7d4e19536..aecf8abbe03 100644
--- a/utils/memcpy-bench/FastMemcpy_Avx.h
+++ b/utils/memcpy-bench/FastMemcpy_Avx.h
@@ -103,7 +103,7 @@ static INLINE void *memcpy_tiny_avx(void * __restrict dst, const void * __restri
     unsigned char *dd = reinterpret_cast<unsigned char *>(dst) + size;
     const unsigned char *ss = reinterpret_cast<const unsigned char*>(src) + size;
 
-    switch (size)
+    switch (size) /// NOLINT(bugprone-switch-missing-default-case)
     {
     case 128: memcpy_avx_128(dd - 128, ss - 128); [[fallthrough]];
     case 0:  break;
@@ -371,7 +371,7 @@ static INLINE void *memcpy_tiny_avx(void * __restrict dst, const void * __restri
 //---------------------------------------------------------------------
 // main routine
 //---------------------------------------------------------------------
-void* memcpy_fast_avx(void * __restrict destination, const void * __restrict source, size_t size)
+void* memcpy_fast_avx(void * __restrict destination, const void * __restrict source, size_t size) /// NOLINT(misc-definitions-in-headers)
 {
     unsigned char *dst = reinterpret_cast<unsigned char*>(destination);
     const unsigned char *src = reinterpret_cast<const unsigned char*>(source);
diff --git a/utils/postprocess-traces/postprocess-traces.pl b/utils/postprocess-traces/postprocess-traces.pl
index 476fb46418f..1c198908580 100755
--- a/utils/postprocess-traces/postprocess-traces.pl
+++ b/utils/postprocess-traces/postprocess-traces.pl
@@ -8,6 +8,19 @@ use Data::Dumper;
 my @current_stack = ();
 my $grouped_stacks = {};
 
+sub process_stacktrace
+{
+    my $group = \$grouped_stacks;
+    for my $frame (reverse @current_stack)
+    {
+        $group = \$$group->{children}{$frame};
+        $$group->{count} ||= 0;
+        ++$$group->{count};
+    }
+
+    @current_stack = ();
+}
+
 while (my $line = <>)
 {
     chomp $line;
@@ -21,18 +34,12 @@ while (my $line = <>)
 
     if ($line eq '')
     {
-        my $group = \$grouped_stacks;
-        for my $frame (reverse @current_stack)
-        {
-            $$group->{count} ||= 0;
-            ++$$group->{count};
-            $group = \$$group->{children}{$frame};
-        }
-
-        @current_stack = ();
+        process_stacktrace();
     }
 }
 
+process_stacktrace();
+
 sub print_group
 {
     my $group = shift;
@@ -40,7 +47,7 @@ sub print_group
 
     for my $key (sort { $group->{children}{$b}{count} <=> $group->{children}{$a}{count} } keys %{$group->{children}})
     {
-        my $count = $group->{count};
+        my $count = $group->{children}{$key}{count};
         print(('| ' x $level) . $count . (' ' x (5 - (length $count))) . $key . "\n");
         print_group($group->{children}{$key}, $level + 1);
     }
diff --git a/utils/s3tools/s3uploader b/utils/s3tools/s3uploader
deleted file mode 100755
index d53661614c0..00000000000
--- a/utils/s3tools/s3uploader
+++ /dev/null
@@ -1,222 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-import os
-import logging
-import argparse
-import tarfile
-import math
-
-try:
-    from boto.s3.connection import S3Connection
-    from boto.s3.key import Key
-except ImportError:
-    raise ImportError("You have to install boto package 'pip install boto'")
-
-
-class S3API(object):
-    def __init__(self, access_key, secret_access_key, mds_api, mds_url):
-        self.connection = S3Connection(
-            host=mds_api,
-            aws_access_key_id=access_key,
-            aws_secret_access_key=secret_access_key,
-        )
-        self.mds_url = mds_url
-
-    def upload_file(self, bucket_name, file_path, s3_path):
-        logging.info("Start uploading file to bucket %s", bucket_name)
-
-        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
-        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:
-                    fp.seek(offset)
-                    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
-        )
-
-    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,
-        )
-
-        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):
-        bucket = self.connection.get_bucket(bucket_name)
-        if s3_path.endswith("/"):
-            s3_path += "store/"
-        else:
-            s3_path += "/store/"
-        print(s3_path)
-        for root, dirs, files in os.walk(directory_path):
-            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_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
-        )
-
-    def list_bucket_keys(self, bucket_name):
-        bucket = self.connection.get_bucket(bucket_name)
-        for obj in bucket.get_all_keys():
-            print(obj.key)
-
-    def remove_folder_from_bucket(self, bucket_name, folder_path):
-        bucket = self.connection.get_bucket(bucket_name)
-        bucket.get_all_keys()
-        for obj in bucket.get_all_keys():
-            if obj.key.startswith(folder_path):
-                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")
-    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)
-    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 = """
-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")
-
-    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"
-    )
-    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"
-    )
-    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",
-        )
-
-    s3_conn = S3API(
-        args.access_key_id, args.secret_access_key, args.s3_api_url, args.s3_common_url
-    )
-
-    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)
-        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
-        )
-        logging.info("Data uploaded: %s", url)
-    else:
-        if args.table_name is not None:
-            if "." not in args.table_name:
-                db_name = "default"
-            else:
-                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
-            )
-        else:
-            file_path = args.file_path
-
-        if "tsv" in file_path:
-            s3_path = os.path.join(
-                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)
-            )
-        elif args.s3_path is not None:
-            s3_path = os.path.join(
-                args.dataset_name, args.s3_path, os.path.basename(file_path)
-            )
-        else:
-            raise Exception("Don't know s3-path to upload")
-
-        url = s3_conn.upload_file(args.bucket_name, file_path, s3_path)
-        logging.info("Data uploaded: %s", url)
diff --git a/utils/self-extracting-executable/decompressor.cpp b/utils/self-extracting-executable/decompressor.cpp
index 1f19a349d65..071ecb066cb 100644
--- a/utils/self-extracting-executable/decompressor.cpp
+++ b/utils/self-extracting-executable/decompressor.cpp
@@ -322,6 +322,8 @@ int decompressFiles(int input_fd, char * path, char * name, bool & have_compress
             return 1;
         }
 
+        if (0 != munmap(output, le64toh(file_info.uncompressed_size)))
+            perror("munmap");
         if (0 != fsync(output_fd))
             perror("fsync");
         if (0 != close(output_fd))
@@ -527,6 +529,8 @@ int main(int/* argc*/, char* argv[])
         char decompressed_name[decompressed_name_len + 1];
         (void)snprintf(decompressed_name, decompressed_name_len + 1, decompressed_name_fmt, self, decompressed_suffix);
 
+#if defined(OS_DARWIN)
+        // We can't just rename it on Mac due to security issues, so we copy it...
         std::error_code ec;
         std::filesystem::copy_file(static_cast<char *>(decompressed_name), static_cast<char *>(self), ec);
         if (ec)
@@ -534,7 +538,13 @@ int main(int/* argc*/, char* argv[])
             std::cerr << ec.message() << std::endl;
             return 1;
         }
-
+#else
+        if (link(decompressed_name, self))
+        {
+            perror("link");
+            return 1;
+        }
+#endif
         if (chmod(self, static_cast<uint32_t>(decompressed_umask)))
         {
             perror("chmod");
diff --git a/utils/zookeeper-cli/zookeeper-cli.cpp b/utils/zookeeper-cli/zookeeper-cli.cpp
index fe11c66ea9c..4aef29847ce 100644
--- a/utils/zookeeper-cli/zookeeper-cli.cpp
+++ b/utils/zookeeper-cli/zookeeper-cli.cpp
@@ -69,7 +69,7 @@ int main(int argc, char ** argv)
         Poco::Logger::root().setChannel(channel);
         Poco::Logger::root().setLevel("trace");
 
-        zkutil::ZooKeeper zk{zkutil::ZooKeeperArgs(argv[1])};
+        auto zk = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(zkutil::ZooKeeperArgs(argv[1]));
         DB::LineReader lr({}, false, {"\\"}, {});
 
         do
@@ -96,7 +96,7 @@ int main(int argc, char ** argv)
                     ss >> w;
                     bool watch = w == "w";
                     zkutil::EventPtr event = watch ? std::make_shared<Poco::Event>() : nullptr;
-                    std::vector<std::string> v = zk.getChildren(path, nullptr, event);
+                    std::vector<std::string> v = zk->getChildren(path, nullptr, event);
                     for (const auto & child : v)
                         std::cout << child << std::endl;
                     if (watch)
@@ -132,15 +132,15 @@ int main(int argc, char ** argv)
                         std::cout << "Bad create mode" << std::endl;
                         continue;
                     }
-                    std::cout << zk.create(path, data, m) << std::endl;
+                    std::cout << zk->create(path, data, m) << std::endl;
                 }
                 else if (cmd == "remove")
                 {
-                    zk.remove(path);
+                    zk->remove(path);
                 }
                 else if (cmd == "rmr")
                 {
-                    zk.removeRecursive(path);
+                    zk->removeRecursive(path);
                 }
                 else if (cmd == "exists")
                 {
@@ -149,7 +149,7 @@ int main(int argc, char ** argv)
                     bool watch = w == "w";
                     zkutil::EventPtr event = watch ? std::make_shared<Poco::Event>() : nullptr;
                     Coordination::Stat stat;
-                    bool e = zk.exists(path, &stat, event);
+                    bool e = zk->exists(path, &stat, event);
                     if (e)
                         printStat(stat);
                     else
@@ -164,7 +164,7 @@ int main(int argc, char ** argv)
                     bool watch = w == "w";
                     zkutil::EventPtr event = watch ? std::make_shared<Poco::Event>() : nullptr;
                     Coordination::Stat stat;
-                    std::string data = zk.get(path, &stat, event);
+                    std::string data = zk->get(path, &stat, event);
                     std::cout << "Data: " << data << std::endl;
                     printStat(stat);
                     if (watch)
@@ -188,7 +188,7 @@ int main(int argc, char ** argv)
                         DB::readText(version, in);
 
                     Coordination::Stat stat;
-                    zk.set(path, data, version, &stat);
+                    zk->set(path, data, version, &stat);
                     printStat(stat);
                 }
                 else if (!cmd.empty())
diff --git a/utils/zookeeper-dump-tree/main.cpp b/utils/zookeeper-dump-tree/main.cpp
index d85762df640..798eeeaebae 100644
--- a/utils/zookeeper-dump-tree/main.cpp
+++ b/utils/zookeeper-dump-tree/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char ** argv)
 
         bool dump_ctime = options.count("ctime");
 
-        zkutil::ZooKeeperPtr zookeeper = std::make_shared<zkutil::ZooKeeper>(options.at("address").as<std::string>());
+        zkutil::ZooKeeperPtr zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(options.at("address").as<std::string>());
 
         std::string initial_path = options.at("path").as<std::string>();
 
diff --git a/utils/zookeeper-remove-by-list/main.cpp b/utils/zookeeper-remove-by-list/main.cpp
index cf194bd4861..4de300ca98a 100644
--- a/utils/zookeeper-remove-by-list/main.cpp
+++ b/utils/zookeeper-remove-by-list/main.cpp
@@ -26,7 +26,7 @@ try
         return 1;
     }
 
-    zkutil::ZooKeeper zookeeper(options.at("address").as<std::string>());
+    auto zookeeper = zkutil::ZooKeeper::createWithoutKillingPreviousSessions(options.at("address").as<std::string>());
 
     DB::ReadBufferFromFileDescriptor in(STDIN_FILENO);
     std::list<std::future<Coordination::RemoveResponse>> futures;
@@ -37,7 +37,7 @@ try
         std::string path;
         DB::readEscapedString(path, in);
         DB::assertString("\n", in);
-        futures.emplace_back(zookeeper.asyncRemove(path));
+        futures.emplace_back(zookeeper->asyncRemove(path));
         std::cerr << ".";
     }
     std::cerr << "\n";